From 70ec88b824092a23a5ed17bfd8c1c645364cbf88 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 19 Dec 2024 23:52:49 +0000
Subject: [PATCH 001/761] Make work with brat

---
 manifest.json | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 manifest.json

diff --git a/manifest.json b/manifest.json
new file mode 100644
index 00000000..40fc4ff7
--- /dev/null
+++ b/manifest.json
@@ -0,0 +1,11 @@
+{
+	"id": "sample-plugin",
+	"name": "Sync & Share",
+	"version": "0.0.5",
+	"minAppVersion": "0.0.0",
+	"description": "Demonstrates some of the capabilities of the Obsidian API.",
+	"author": "Obsidian",
+	"authorUrl": "https://obsidian.md",
+	"fundingUrl": "https://obsidian.md/pricing",
+	"isDesktopOnly": false
+}
\ No newline at end of file

From ec9845577a420589a4c951c79105166b6f6834e1 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 20 Dec 2024 11:08:14 +0000
Subject: [PATCH 002/761] Add lints

---
 backend/Cargo.toml                            | 35 +++++++++++++++++++
 backend/fuzz/fuzz_targets/reconcile.rs        |  1 -
 .../src/operation_transformation/operation.rs |  2 +-
 backend/reconcile/src/utils/string_builder.rs |  2 +-
 backend/sync_server/src/server/ping.rs        |  2 +-
 5 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 357ac58a..2aad6f49 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -7,6 +7,9 @@ members = [
     "sync_lib"
 ]
 
+[workspace.package]
+rust-version = "1.83"
+
 [workspace.dependencies]  
 serde = { version = "1.0.214", default-features = false, features = ["derive"] }
 thiserror = { version = "1.0.66", default-features = false  } 
@@ -19,4 +22,36 @@ codegen-units = 1
 lto = true
 opt-level = 3
 
+[workspace.lints.rust]
+unsafe_code = "forbid"
+rust_2018_idioms = { level = "warn", priority = -1 }
+missing_debug_implementations = "warn"
+
 [workspace.lints.clippy]
+await_holding_lock = "warn"
+dbg_macro = "warn"
+empty_enum = "warn"
+enum_glob_use = "warn"
+exit = "warn"
+filter_map_next = "warn"
+fn_params_excessive_bools = "warn"
+if_let_mutex = "warn"
+imprecise_flops = "warn"
+inefficient_to_string = "warn"
+linkedlist = "warn"
+lossy_float_literal = "warn"
+macro_use_imports = "warn"
+match_on_vec_items = "warn"
+match_wildcard_for_single_variants = "warn"
+mem_forget = "warn"
+needless_borrow = "warn"
+needless_continue = "warn"
+option_option = "warn"
+rest_pat_in_fully_bound_structs = "warn"
+str_to_string = "warn"
+suboptimal_flops = "warn"
+todo = "warn"
+uninlined_format_args = "warn"
+unnested_or_patterns = "warn"
+unused_self = "warn"
+verbose_file_reads = "warn"
\ No newline at end of file
diff --git a/backend/fuzz/fuzz_targets/reconcile.rs b/backend/fuzz/fuzz_targets/reconcile.rs
index b97c7827..b30d9f57 100644
--- a/backend/fuzz/fuzz_targets/reconcile.rs
+++ b/backend/fuzz/fuzz_targets/reconcile.rs
@@ -1,7 +1,6 @@
 #![no_main]
 
 use libfuzzer_sys::fuzz_target;
-extern crate reconcile;
 
 fuzz_target!(|texts: (String, String, String)| {
     let (original, left, right) = texts;
diff --git a/backend/reconcile/src/operation_transformation/operation.rs b/backend/reconcile/src/operation_transformation/operation.rs
index 9a434eb7..e37e119e 100644
--- a/backend/reconcile/src/operation_transformation/operation.rs
+++ b/backend/reconcile/src/operation_transformation/operation.rs
@@ -363,7 +363,7 @@ mod tests {
     #[test]
     fn test_apply_delete_with_create() {
         let builder = StringBuilder::new("hello world");
-        let operation = Operation::<()>::create_delete_with_text(5, " world".to_string()).unwrap();
+        let operation = Operation::<()>::create_delete_with_text(5, " world".to_owned()).unwrap();
 
         assert_eq!(operation.apply(builder).build(), "hello");
     }
diff --git a/backend/reconcile/src/utils/string_builder.rs b/backend/reconcile/src/utils/string_builder.rs
index 3394faca..6e3a4b49 100644
--- a/backend/reconcile/src/utils/string_builder.rs
+++ b/backend/reconcile/src/utils/string_builder.rs
@@ -11,7 +11,7 @@ pub struct StringBuilder<'a> {
 }
 
 impl StringBuilder<'_> {
-    pub fn new(original: &str) -> StringBuilder {
+    pub fn new(original: &str) -> StringBuilder<'_> {
         StringBuilder {
             original,
             last_old_char_index: 0,
diff --git a/backend/sync_server/src/server/ping.rs b/backend/sync_server/src/server/ping.rs
index b3a0c80e..c8b48bd0 100644
--- a/backend/sync_server/src/server/ping.rs
+++ b/backend/sync_server/src/server/ping.rs
@@ -16,7 +16,7 @@ pub async fn ping(
         maybe_auth_header.is_some_and(|auth_header| auth(&state, auth_header.token()).is_ok());
 
     Ok(Json(PingResponse {
-        server_version: env!("CARGO_PKG_VERSION").to_string(),
+        server_version: env!("CARGO_PKG_VERSION").to_owned(),
         is_authenticated,
     }))
 }

From 2030d095c960877ca6155235b0c720a18f8024cb Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 20 Dec 2024 11:08:27 +0000
Subject: [PATCH 003/761] Remove global token env var

---
 .github/workflows/release-plugin.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/release-plugin.yml b/.github/workflows/release-plugin.yml
index a6b48e93..d528f7a5 100644
--- a/.github/workflows/release-plugin.yml
+++ b/.github/workflows/release-plugin.yml
@@ -11,7 +11,6 @@ on:
     branches: ["master"]
 env:
   CARGO_TERM_COLOR: always
-  GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
 jobs:
   build-plugin:

From 26bba4e2ff28e667263495817ddde16c1463d6ae Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 20 Dec 2024 16:09:18 +0000
Subject: [PATCH 004/761] Configure eslint

---
 plugin/eslint.config.mjs | 95 +++++++++++++++++-----------------------
 plugin/package-lock.json | 28 ++++++++++--
 plugin/package.json      |  5 +--
 3 files changed, 68 insertions(+), 60 deletions(-)

diff --git a/plugin/eslint.config.mjs b/plugin/eslint.config.mjs
index 18cfb5b4..018146cf 100644
--- a/plugin/eslint.config.mjs
+++ b/plugin/eslint.config.mjs
@@ -1,59 +1,46 @@
-import typescriptEslint from "@typescript-eslint/eslint-plugin";
-import globals from "globals";
-import tsParser from "@typescript-eslint/parser";
-import path from "node:path";
-import { fileURLToPath } from "node:url";
-import js from "@eslint/js";
-import { FlatCompat } from "@eslint/eslintrc";
+import eslint from "@eslint/js";
+import tseslint from "typescript-eslint";
 import unusedImports from "eslint-plugin-unused-imports";
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-const compat = new FlatCompat({
-	baseDirectory: __dirname,
-	recommendedConfig: js.configs.recommended,
-	allConfig: js.configs.all,
-});
-
-export default [
-	...compat.extends(
-		"eslint:recommended",
-		"plugin:@typescript-eslint/eslint-recommended",
-		"plugin:@typescript-eslint/recommended"
-	),
-	{
-		plugins: {
-			"@typescript-eslint": typescriptEslint,
-			"unused-imports": unusedImports,
-		},
-
-		languageOptions: {
-			globals: {
-				...globals.node,
+export default tseslint.config({
+	plugins: {
+		"unused-imports": unusedImports,
+	},
+	extends: [eslint.configs.recommended, tseslint.configs.all],
+	ignores: ["**/types.ts"],
+	rules: {
+		"no-unused-vars": "off",
+		"@typescript-eslint/no-unused-vars": "off",
+		"@typescript-eslint/no-floating-promises": "error",
+		"@typescript-eslint/parameter-properties": "off",
+		"@typescript-eslint/require-await": "off",
+		"@typescript-eslint/class-methods-use-this": "off",
+		"@typescript-eslint/consistent-return": "off",
+		"@typescript-eslint/no-unsafe-argument": "off",
+		"@typescript-eslint/max-params": [
+			"error",
+			{
+				max: 5,
 			},
-
-			parser: tsParser,
-			ecmaVersion: 5,
-			sourceType: "module",
-		},
-
-		rules: {
-			"no-unused-vars": "off",
-			"@typescript-eslint/no-unused-vars": "off",
-			"unused-imports/no-unused-imports": "error",
-			"unused-imports/no-unused-vars": [
-				"warn",
-				{
-					vars: "all",
-					varsIgnorePattern: "^_",
-					args: "after-used",
-					argsIgnorePattern: "^_",
-				},
-			],
-
-			"@typescript-eslint/ban-ts-comment": "off",
-			"no-prototype-builtins": "off",
-			"@typescript-eslint/no-empty-function": "off",
+		],
+		"unused-imports/no-unused-imports": "error",
+		"@typescript-eslint/no-magic-numbers": "off",
+		"@typescript-eslint/prefer-readonly-parameter-types": "off",
+		"@typescript-eslint/naming-convention": "off",
+		"unused-imports/no-unused-vars": [
+			"warn",
+			{
+				vars: "all",
+				varsIgnorePattern: "^_",
+				args: "after-used",
+				argsIgnorePattern: "^_",
+			},
+		],
+	},
+	languageOptions: {
+		parserOptions: {
+			projectService: true,
+			tsconfigRootDir: import.meta.dirname,
 		},
 	},
-];
+});
diff --git a/plugin/package-lock.json b/plugin/package-lock.json
index effaa73c..54d24aac 100644
--- a/plugin/package-lock.json
+++ b/plugin/package-lock.json
@@ -10,8 +10,6 @@
 			"license": "MIT",
 			"devDependencies": {
 				"@types/node": "^16.11.6",
-				"@typescript-eslint/eslint-plugin": "8.18.0",
-				"@typescript-eslint/parser": "8.18.0",
 				"builtin-modules": "3.3.0",
 				"esbuild": "0.24.0",
 				"esbuild-plugin-wasm-pack": "^1.1.0",
@@ -22,7 +20,8 @@
 				"openapi-typescript": "7.4.4",
 				"p-queue": "^8.0.1",
 				"tslib": "2.4.0",
-				"typescript": "5.7.2"
+				"typescript": "5.7.2",
+				"typescript-eslint": "8.18.0"
 			}
 		},
 		"node_modules/@babel/code-frame": {
@@ -2483,6 +2482,29 @@
 				"node": ">=14.17"
 			}
 		},
+		"node_modules/typescript-eslint": {
+			"version": "8.18.0",
+			"resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.18.0.tgz",
+			"integrity": "sha512-Xq2rRjn6tzVpAyHr3+nmSg1/9k9aIHnJ2iZeOH7cfGOWqTkXTm3kwpQglEuLGdNrYvPF+2gtAs+/KF5rjVo+WQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@typescript-eslint/eslint-plugin": "8.18.0",
+				"@typescript-eslint/parser": "8.18.0",
+				"@typescript-eslint/utils": "8.18.0"
+			},
+			"engines": {
+				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			},
+			"peerDependencies": {
+				"eslint": "^8.57.0 || ^9.0.0",
+				"typescript": ">=4.8.4 <5.8.0"
+			}
+		},
 		"node_modules/uri-js": {
 			"version": "4.4.1",
 			"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
diff --git a/plugin/package.json b/plugin/package.json
index 7e094db9..585cd430 100644
--- a/plugin/package.json
+++ b/plugin/package.json
@@ -14,8 +14,7 @@
 	"license": "MIT",
 	"devDependencies": {
 		"@types/node": "^16.11.6",
-		"@typescript-eslint/eslint-plugin": "8.18.0",
-		"@typescript-eslint/parser": "8.18.0",
+		"typescript-eslint": "8.18.0",
 		"builtin-modules": "3.3.0",
 		"esbuild": "0.24.0",
 		"esbuild-plugin-wasm-pack": "^1.1.0",
@@ -28,4 +27,4 @@
 		"typescript": "5.7.2",
 		"p-queue": "^8.0.1"
 	}
-}
+}
\ No newline at end of file

From 5e653ea0e484fd335004592a5542e797cacc3985 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 20 Dec 2024 16:10:00 +0000
Subject: [PATCH 005/761] Fix up rust deps

---
 backend/Cargo.lock             | 69 ++++++++++++++++++++++++++++++++++
 backend/Cargo.toml             |  3 --
 backend/reconcile/Cargo.toml   |  1 -
 backend/sync_lib/Cargo.toml    |  2 +-
 backend/sync_server/Cargo.toml | 19 +++++-----
 5 files changed, 80 insertions(+), 14 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index cf34e184..f414df5f 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -29,6 +29,15 @@ dependencies = [
  "zerocopy",
 ]
 
+[[package]]
+name = "aho-corasick"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "aide"
 version = "0.13.4"
@@ -1142,6 +1151,15 @@ version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
+[[package]]
+name = "matchers"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
+dependencies = [
+ "regex-automata 0.1.10",
+]
+
 [[package]]
 name = "matchit"
 version = "0.7.3"
@@ -1500,6 +1518,50 @@ dependencies = [
  "bitflags",
 ]
 
+[[package]]
+name = "regex"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata 0.4.9",
+ "regex-syntax 0.8.5",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
+dependencies = [
+ "regex-syntax 0.6.29",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax 0.8.5",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+
 [[package]]
 name = "rsa"
 version = "0.9.7"
@@ -2079,6 +2141,7 @@ dependencies = [
  "thiserror",
  "tokio",
  "tower-http",
+ "tracing",
  "tracing-subscriber",
  "uuid",
 ]
@@ -2284,9 +2347,11 @@ dependencies = [
  "bitflags",
  "bytes",
  "http",
+ "http-body",
  "pin-project-lite",
  "tower-layer",
  "tower-service",
+ "tracing",
 ]
 
 [[package]]
@@ -2351,10 +2416,14 @@ version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
 dependencies = [
+ "matchers",
  "nu-ansi-term",
+ "once_cell",
+ "regex",
  "sharded-slab",
  "smallvec",
  "thread_local",
+ "tracing",
  "tracing-core",
  "tracing-log",
 ]
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 2aad6f49..8d7e0221 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -13,9 +13,6 @@ rust-version = "1.83"
 [workspace.dependencies]  
 serde = { version = "1.0.214", default-features = false, features = ["derive"] }
 thiserror = { version = "1.0.66", default-features = false  } 
-uuid = { version = "1.11.0", default-features = false, features = ["v4", "serde"] }
-log = { version = "0.4.22",  default-features = false }
-anyhow =  { version = "1.0.94", features = ["backtrace"] }
 
 [profile.release]
 codegen-units = 1
diff --git a/backend/reconcile/Cargo.toml b/backend/reconcile/Cargo.toml
index 489e7810..bc77f964 100644
--- a/backend/reconcile/Cargo.toml
+++ b/backend/reconcile/Cargo.toml
@@ -4,7 +4,6 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-# optional dependencies
 serde = { version = "1.0.215", optional = true }
 
 [features]
diff --git a/backend/sync_lib/Cargo.toml b/backend/sync_lib/Cargo.toml
index a21b01e6..1e3d23d0 100644
--- a/backend/sync_lib/Cargo.toml
+++ b/backend/sync_lib/Cargo.toml
@@ -12,7 +12,7 @@ base64 = "0.22.1"
 reconcile = { path = "../reconcile" }
 wasm-bindgen = "0.2.84"
 getrandom = { version = "0.2.3", features = ["js"] }
-thiserror = {workspace = true}
+thiserror = { workspace = true }
 
 # The `console_error_panic_hook` crate provides better debugging of panics by
 # logging them with `console.error`. This is great for development, but requires
diff --git a/backend/sync_server/Cargo.toml b/backend/sync_server/Cargo.toml
index 2fbfeef2..4a6d49f5 100644
--- a/backend/sync_server/Cargo.toml
+++ b/backend/sync_server/Cargo.toml
@@ -7,23 +7,24 @@ edition = "2021"
 reconcile = { path = "../reconcile" }
 sync_lib = { path = "../sync_lib" }
 
-serde = {workspace = true}
-thiserror = {workspace = true}
-anyhow = {workspace = true}
-log = {workspace = true}
-uuid = {workspace = true}
+serde = { workspace = true }
+thiserror = { workspace = true }
 
-axum = { version = "0.7.9", features = ["ws", "macros"]}
 tokio = { version = "1.42.0", features = ["full"]}
-tracing-subscriber = "0.3.19"
+uuid = { version = "1.11.0", features = ["v4", "serde"] }
+log = { version = "0.4.22" }
+anyhow =  { version = "1.0.94", features = ["backtrace"] }
+axum = { version = "0.7.9", features = ["ws", "macros", "tracing"]}
+axum-extra = { version = "0.9.6", features = ["typed-header"] }
+tower-http = { version = "0.6.1", features = ["cors", "trace"] }
+tracing-subscriber = { version = "0.3.19", features = ["fmt", "env-filter"]}
 serde_yaml = "0.9.34"
 sqlx = { version = "0.8.2", features = ["sqlite", "runtime-tokio", "uuid", "chrono"] }
 chrono = { version = "0.4.38", features = ["serde"] }
 aide = { version = "0.13.4", features = ["axum", "axum-ws", "scalar", "axum-headers"] }
 schemars = { version = "0.8.21", features = ["chrono", "uuid1"] }
+tracing = "0.1"
 rand = "0.8.5"
-axum-extra = { version = "0.9.6", features = ["typed-header"] }
-tower-http = { version = "0.6.1", features = ["cors"] }
 
 [lints]
 workspace = true

From 782690bd7955dcde798332cddd204c5f517000c3 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 20 Dec 2024 16:10:17 +0000
Subject: [PATCH 006/761] Add request logs

---
 backend/sync_server/src/main.rs   | 16 +++++++++++++-
 backend/sync_server/src/server.rs | 36 ++++++++++++++++++++++++++++---
 2 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/backend/sync_server/src/main.rs b/backend/sync_server/src/main.rs
index 00866c4e..4207971d 100644
--- a/backend/sync_server/src/main.rs
+++ b/backend/sync_server/src/main.rs
@@ -9,10 +9,24 @@ use anyhow::{Context as _, Result};
 use app_state::AppState;
 use errors::{init_error, SyncServerError};
 use server::create_server;
+use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};
 
 #[tokio::main]
 async fn main() -> Result<(), SyncServerError> {
-    tracing_subscriber::fmt::init();
+    tracing_subscriber::registry()
+        .with(
+            tracing_subscriber::EnvFilter::try_from_default_env().unwrap_or_else(|_| {
+                format!(
+                    "{}=debug,tower_http=debug,axum::rejection=trace",
+                    env!("CARGO_CRATE_NAME")
+                )
+                .into()
+            }),
+        )
+        .with(tracing_subscriber::fmt::layer())
+        .try_init()
+        .context("Failed to initialise tracing")
+        .map_err(init_error)?;
 
     let app_state = AppState::try_new()
         .await
diff --git a/backend/sync_server/src/server.rs b/backend/sync_server/src/server.rs
index 34a5a059..a72e7225 100644
--- a/backend/sync_server/src/server.rs
+++ b/backend/sync_server/src/server.rs
@@ -8,14 +8,22 @@ use aide::{
 };
 use anyhow::{Context as _, Result};
 use axum::{
-    extract::DefaultBodyLimit,
-    http::{self, HeaderValue, Method},
+    extract::{DefaultBodyLimit, Request},
+    http::{self, HeaderValue, Method, StatusCode},
     response::IntoResponse,
     Extension, Json,
 };
 use log::info;
 use tokio::signal;
-use tower_http::cors::CorsLayer;
+use tower_http::{
+    cors::CorsLayer,
+    trace::{
+        DefaultOnBodyChunk, DefaultOnEos, DefaultOnFailure, DefaultOnRequest, DefaultOnResponse,
+        TraceLayer,
+    },
+    LatencyUnit,
+};
+use tracing::{info_span, Level};
 
 use crate::app_state::AppState;
 mod auth;
@@ -66,6 +74,25 @@ pub async fn create_server(app_state: AppState) -> Result<()> {
         )
         .route("/", Scalar::new("/api.json").axum_route())
         .route("/api.json", axum::routing::get(serve_api))
+        .layer(
+            TraceLayer::new_for_http()
+                .make_span_with(|request: &Request<_>| {
+                    info_span!(
+                        "http_request",
+                        method = ?request.method(),
+                        uri = ?request.uri(),
+                    )
+                })
+                .on_request(DefaultOnRequest::new().level(Level::INFO))
+                .on_response(
+                    DefaultOnResponse::new()
+                        .level(Level::INFO)
+                        .latency_unit(LatencyUnit::Millis),
+                )
+                .on_body_chunk(DefaultOnBodyChunk::new())
+                .on_eos(DefaultOnEos::new())
+                .on_failure(DefaultOnFailure::new().level(Level::ERROR)),
+        )
         .layer(DefaultBodyLimit::max(
             app_state.config.server.max_body_size_mb * 1024 * 1024,
         ))
@@ -78,6 +105,7 @@ pub async fn create_server(app_state: AppState) -> Result<()> {
         .with_state(app_state)
         .finish_api(&mut api)
         .layer(Extension(api))
+        .fallback(handler_404)
         .into_make_service();
 
     let listener = tokio::net::TcpListener::bind(address.clone())
@@ -123,3 +151,5 @@ async fn shutdown_signal() {
         _ = terminate => {},
     }
 }
+
+async fn handler_404() -> impl IntoResponse { (StatusCode::NOT_FOUND, "nothing to see here") }

From 2f7cad602abfb961c5814e3d8d5668a2e9b93d0f Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 20 Dec 2024 16:10:21 +0000
Subject: [PATCH 007/761] Fix doc test

---
 backend/reconcile/src/utils/find_common_overlap.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/reconcile/src/utils/find_common_overlap.rs b/backend/reconcile/src/utils/find_common_overlap.rs
index 2d4ec490..ac586b81 100644
--- a/backend/reconcile/src/utils/find_common_overlap.rs
+++ b/backend/reconcile/src/utils/find_common_overlap.rs
@@ -10,7 +10,7 @@ use crate::Token;
 ///
 /// ## Example
 ///
-/// ```no_run
+/// ```not_rust
 /// old: [0, 1, 9, 0, 2, 5]
 /// new:       [9, 0, 2, 5, 1]
 /// ```

From ff5af8aea5a345d51683370e6c679b19f036f437 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 20 Dec 2024 16:14:46 +0000
Subject: [PATCH 008/761] Lint files

---
 plugin/src/database/database.ts               |  46 ++++---
 plugin/src/events/file-event-handler.ts       |   2 +-
 ...t-handler.ts => obisidan-event-handler.ts} |  69 ++++------
 plugin/src/file-operations/file-operations.ts |  18 +--
 .../obsidian-file-operations.ts               |  49 +++----
 plugin/src/logger.ts                          |  81 ------------
 plugin/src/services/sync-service.ts           | 120 ++++++++++--------
 plugin/src/services/types.ts                  |  24 +---
 plugin/src/sync-operations/locks.ts           |  18 ++-
 plugin/src/utils/hash.ts                      |   9 +-
 plugin/src/views/sync-view.ts                 |  24 ++--
 11 files changed, 184 insertions(+), 276 deletions(-)
 rename plugin/src/events/{sync-event-handler.ts => obisidan-event-handler.ts} (55%)
 delete mode 100644 plugin/src/logger.ts

diff --git a/plugin/src/database/database.ts b/plugin/src/database/database.ts
index 20a4fc65..48c619ac 100644
--- a/plugin/src/database/database.ts
+++ b/plugin/src/database/database.ts
@@ -1,11 +1,12 @@
-import { Logger } from "src/logger";
-import { DEFAULT_SETTINGS, SyncSettings } from "./sync-settings";
-import {
-	RelativePath,
-	DocumentMetadata,
-	VaultUpdateId,
+import type { SyncSettings } from "./sync-settings";
+import { DEFAULT_SETTINGS } from "./sync-settings";
+import type {
 	DocumentId,
+	DocumentMetadata,
+	RelativePath,
+	VaultUpdateId,
 } from "./document-metadata";
+import { Logger } from "src/tracing/logger";
 
 interface StoredDatabase {
 	documents: Map<RelativePath, DocumentMetadata>;
@@ -13,27 +14,31 @@ interface StoredDatabase {
 	lastSeenUpdateId: VaultUpdateId | undefined;
 }
 
+// Todo: split it into settings and documents
 export class Database {
-	private _documents: Map<RelativePath, DocumentMetadata> = new Map();
+	private _documents = new Map<RelativePath, DocumentMetadata>();
 	private _settings: SyncSettings;
 	private _lastSeenUpdateId: VaultUpdateId | undefined;
 
-	private onSettingsChangeHandlers: Array<
-		(newSettings: SyncSettings, oldSettings: SyncSettings) => void
-	> = [];
+	private readonly onSettingsChangeHandlers: ((
+		newSettings: SyncSettings,
+		oldSettings: SyncSettings
+	) => void)[] = [];
 
 	public constructor(
 		initialState: Partial<StoredDatabase> | undefined,
-		private saveData: (data: unknown) => Promise<void>
+		private readonly saveData: (data: unknown) => Promise<void>
 	) {
-		initialState = initialState || {};
+		initialState ??= {};
 		if (
+			// eslint-disable-next-line @typescript-eslint/strict-boolean-expressions
 			Object.prototype.hasOwnProperty.call(initialState, "documents") &&
 			initialState.documents
 		) {
 			for (const [relativePath, metadata] of Object.entries(
 				initialState.documents
 			)) {
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
 				this._documents.set(relativePath, metadata as DocumentMetadata);
 			}
 		}
@@ -46,11 +51,10 @@ export class Database {
 			)}`
 		);
 
-		this._settings = Object.assign(
-			{},
-			DEFAULT_SETTINGS,
-			initialState.settings || {}
-		);
+		this._settings = {
+			...DEFAULT_SETTINGS,
+			...(initialState.settings ?? {}),
+		};
 
 		Logger.getInstance().debug(
 			`Loaded settings: ${JSON.stringify(this._settings, null, 2)}`
@@ -74,15 +78,15 @@ export class Database {
 	public async setSettings(value: SyncSettings): Promise<void> {
 		const oldSettings = this._settings;
 		this._settings = value;
-		this.onSettingsChangeHandlers.forEach((handler) =>
-			handler(value, oldSettings)
-		);
+		this.onSettingsChangeHandlers.forEach((handler) => {
+			handler(value, oldSettings);
+		});
 		await this.save();
 	}
 
 	public addOnSettingsChangeHandlers(
 		handler: (settings: SyncSettings, oldSettings: SyncSettings) => void
-	) {
+	): void {
 		this.onSettingsChangeHandlers.push(handler);
 	}
 
diff --git a/plugin/src/events/file-event-handler.ts b/plugin/src/events/file-event-handler.ts
index 1b8ad207..3c6261d2 100644
--- a/plugin/src/events/file-event-handler.ts
+++ b/plugin/src/events/file-event-handler.ts
@@ -1,4 +1,4 @@
-import { TAbstractFile } from "obsidian";
+import type { TAbstractFile } from "obsidian";
 
 export interface FileEventHandler {
 	onCreate: (path: TAbstractFile) => Promise<void>;
diff --git a/plugin/src/events/sync-event-handler.ts b/plugin/src/events/obisidan-event-handler.ts
similarity index 55%
rename from plugin/src/events/sync-event-handler.ts
rename to plugin/src/events/obisidan-event-handler.ts
index d75a0895..81f20028 100644
--- a/plugin/src/events/sync-event-handler.ts
+++ b/plugin/src/events/obisidan-event-handler.ts
@@ -1,57 +1,48 @@
-import { TAbstractFile, TFile } from "obsidian";
-import { FileEventHandler } from "./file-event-handler";
-import { Logger } from "src/logger";
-import { SyncService } from "src/services/sync-service";
-import { Database } from "src/database/database";
+import type { TAbstractFile } from "obsidian";
+import { TFile } from "obsidian";
+import type { FileEventHandler } from "./file-event-handler";
+import type { SyncService } from "src/services/sync-service";
+import type { Database } from "src/database/database";
 import { syncLocallyDeletedFile } from "src/sync-operations/sync-locally-deleted-file";
 import { syncLocallyUpdatedFile } from "src/sync-operations/sync-locally-updated-file";
-import { FileOperations } from "src/file-operations/file-operations";
+import type { FileOperations } from "src/file-operations/file-operations";
 import { syncLocallyCreatedFile } from "src/sync-operations/sync-locally-created-file";
+import { Logger } from "src/tracing/logger";
+import type { SyncHistory } from "src/tracing/sync-history";
 
-export class SyncEventHandler implements FileEventHandler {
+export class ObsidianFileEventHandler implements FileEventHandler {
 	public constructor(
-		private database: Database,
-		private syncServer: SyncService,
-		private operations: FileOperations
+		private readonly database: Database,
+		private readonly syncServer: SyncService,
+		private readonly operations: FileOperations,
+		private readonly history: SyncHistory
 	) {}
 
-	async onCreate(file: TAbstractFile): Promise<void> {
+	public async onCreate(file: TAbstractFile): Promise<void> {
 		if (file instanceof TFile) {
 			Logger.getInstance().info(`File created: ${file.path}`);
 
-			if (!this.database.getSettings().isSyncEnabled) {
-				Logger.getInstance().info(
-					`Sync is disabled, not syncing ${file.path}`
-				);
-				return;
-			}
-
 			await syncLocallyCreatedFile({
 				database: this.database,
 				syncServer: this.syncServer,
 				operations: this.operations,
 				updateTime: new Date(file.stat.ctime),
-				filePath: file.path,
+				relativePath: file.path,
+				history: this.history,
 			});
 		} else {
 			Logger.getInstance().info(`Folder created: ${file.path}, ignored`);
 		}
 	}
 
-	async onDelete(file: TAbstractFile): Promise<void> {
+	public async onDelete(file: TAbstractFile): Promise<void> {
 		if (file instanceof TFile) {
 			Logger.getInstance().info(`File deleted: ${file.path}`);
 
-			if (!this.database.getSettings().isSyncEnabled) {
-				Logger.getInstance().info(
-					`Sync is disabled, not syncing ${file.path}`
-				);
-				return;
-			}
-
 			await syncLocallyDeletedFile({
 				database: this.database,
 				syncServer: this.syncServer,
+				history: this.history,
 				relativePath: file.path,
 			});
 		} else {
@@ -59,25 +50,19 @@ export class SyncEventHandler implements FileEventHandler {
 		}
 	}
 
-	async onRename(file: TAbstractFile, oldPath: string): Promise<void> {
+	public async onRename(file: TAbstractFile, oldPath: string): Promise<void> {
 		if (file instanceof TFile) {
 			Logger.getInstance().info(
 				`File renamed: ${oldPath} -> ${file.path}`
 			);
 
-			if (!this.database.getSettings().isSyncEnabled) {
-				Logger.getInstance().info(
-					`Sync is disabled, not syncing ${file.path}`
-				);
-				return;
-			}
-
 			await syncLocallyUpdatedFile({
 				database: this.database,
 				syncServer: this.syncServer,
 				operations: this.operations,
+				history: this.history,
 				updateTime: new Date(file.stat.ctime),
-				filePath: file.path,
+				relativePath: file.path,
 				oldPath,
 			});
 		} else {
@@ -87,23 +72,17 @@ export class SyncEventHandler implements FileEventHandler {
 		}
 	}
 
-	async onModify(file: TAbstractFile): Promise<void> {
+	public async onModify(file: TAbstractFile): Promise<void> {
 		if (file instanceof TFile) {
 			Logger.getInstance().info(`File modified: ${file.path}`);
 
-			if (!this.database.getSettings().isSyncEnabled) {
-				Logger.getInstance().info(
-					`Sync is disabled, not syncing ${file.path}`
-				);
-				return;
-			}
-
 			await syncLocallyUpdatedFile({
 				database: this.database,
 				syncServer: this.syncServer,
 				operations: this.operations,
+				history: this.history,
 				updateTime: new Date(file.stat.ctime),
-				filePath: file.path,
+				relativePath: file.path,
 			});
 		} else {
 			Logger.getInstance().info(`Folder modified: ${file.path}, ignored`);
diff --git a/plugin/src/file-operations/file-operations.ts b/plugin/src/file-operations/file-operations.ts
index affa71c3..1470d79d 100644
--- a/plugin/src/file-operations/file-operations.ts
+++ b/plugin/src/file-operations/file-operations.ts
@@ -1,22 +1,22 @@
-import { RelativePath } from "src/database/document-metadata";
+import type { RelativePath } from "src/database/document-metadata";
 
 export interface FileOperations {
-	listAllFiles(): Promise<RelativePath[]>;
+	listAllFiles: () => Promise<RelativePath[]>;
 
-	read(path: RelativePath): Promise<Uint8Array>;
+	read: (path: RelativePath) => Promise<Uint8Array>;
 
-	getModificationTime(path: RelativePath): Promise<Date>;
+	getModificationTime: (path: RelativePath) => Promise<Date>;
 
-	create(path: RelativePath, newContent: Uint8Array): Promise<void>;
+	create: (path: RelativePath, newContent: Uint8Array) => Promise<void>;
 
 	// Writes new content to the file at the given path. If the file's content has changed since the expectedContent was read, the write will merge the changes.
-	write(
+	write: (
 		path: RelativePath,
 		expectedContent: Uint8Array,
 		newContent: Uint8Array
-	): Promise<Uint8Array>;
+	) => Promise<Uint8Array>;
 
-	remove(path: RelativePath): Promise<void>;
+	remove: (path: RelativePath) => Promise<void>;
 
-	move(oldPath: RelativePath, newPath: RelativePath): Promise<void>;
+	move: (oldPath: RelativePath, newPath: RelativePath) => Promise<void>;
 }
diff --git a/plugin/src/file-operations/obsidian-file-operations.ts b/plugin/src/file-operations/obsidian-file-operations.ts
index 213b794b..28c044f0 100644
--- a/plugin/src/file-operations/obsidian-file-operations.ts
+++ b/plugin/src/file-operations/obsidian-file-operations.ts
@@ -1,30 +1,33 @@
-import { normalizePath, Vault } from "obsidian";
-import { FileOperations } from "./file-operations";
+import type { Vault } from "obsidian";
+import { normalizePath } from "obsidian";
+import type { FileOperations } from "./file-operations";
 import * as lib from "../../../backend/sync_lib/pkg/sync_lib.js";
 import { isEqualBytes } from "src/utils/is-equal-bytes";
-import { RelativePath } from "src/database/document-metadata";
+import type { RelativePath } from "src/database/document-metadata";
 
 export class ObsidianFileOperations implements FileOperations {
-	public constructor(private vault: Vault) {}
+	public constructor(private readonly vault: Vault) {}
 
-	async listAllFiles(): Promise<RelativePath[]> {
+	public async listAllFiles(): Promise<RelativePath[]> {
 		const files = this.vault.getFiles();
 		return files.map((file) => file.path);
 	}
 
-	async read(path: RelativePath): Promise<Uint8Array> {
+	public async read(path: RelativePath): Promise<Uint8Array> {
 		return new Uint8Array(
 			await this.vault.adapter.readBinary(normalizePath(path))
 		);
 	}
 
-	async getModificationTime(path: RelativePath): Promise<Date> {
-		return new Date(
-			(await this.vault.adapter.stat(normalizePath(path)))!.mtime
-		);
+	public async getModificationTime(path: RelativePath): Promise<Date> {
+		const file = await this.vault.adapter.stat(normalizePath(path));
+		if (!file) {
+			throw new Error(`File not found: ${path}`);
+		}
+		return new Date(file.mtime);
 	}
 
-	async write(
+	public async write(
 		path: RelativePath,
 		expectedContent: Uint8Array,
 		newContent: Uint8Array
@@ -44,17 +47,16 @@ export class ObsidianFileOperations implements FileOperations {
 			await this.vault.adapter.writeBinary(normalizePath(path), result);
 
 			return result;
-		} else {
-			await this.vault.adapter.writeBinary(
-				normalizePath(path),
-				newContent
-			);
-
-			return newContent;
 		}
+		await this.vault.adapter.writeBinary(normalizePath(path), newContent);
+
+		return newContent;
 	}
 
-	async create(path: RelativePath, newContent: Uint8Array): Promise<void> {
+	public async create(
+		path: RelativePath,
+		newContent: Uint8Array
+	): Promise<void> {
 		if (await this.vault.adapter.exists(normalizePath(path))) {
 			await this.write(path, new Uint8Array(0), newContent);
 			return;
@@ -63,18 +65,21 @@ export class ObsidianFileOperations implements FileOperations {
 		await this.vault.adapter.writeBinary(normalizePath(path), newContent);
 	}
 
-	async remove(path: RelativePath): Promise<void> {
+	public async remove(path: RelativePath): Promise<void> {
 		if (await this.vault.adapter.exists(normalizePath(path))) {
 			return this.vault.adapter.remove(normalizePath(path));
 		}
 	}
 
-	async move(oldPath: RelativePath, newPath: RelativePath): Promise<void> {
+	public async move(
+		oldPath: RelativePath,
+		newPath: RelativePath
+	): Promise<void> {
 		if (oldPath === newPath) {
 			return;
 		}
 
-		this.vault.adapter.rename(
+		await this.vault.adapter.rename(
 			normalizePath(oldPath),
 			normalizePath(newPath)
 		);
diff --git a/plugin/src/logger.ts b/plugin/src/logger.ts
deleted file mode 100644
index b02a2495..00000000
--- a/plugin/src/logger.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-import { Notice } from "obsidian";
-
-export enum LogLevel {
-	DEBUG,
-	INFO,
-	WARNING,
-	ERROR,
-}
-
-class LogLine {
-	public constructor(public level: LogLevel, public message: string) {}
-
-	public toString(): string {
-		return `${this.formatLevel()}: ${this.message}`;
-	}
-
-	private formatLevel(): string {
-		switch (this.level) {
-			case LogLevel.DEBUG:
-				return "DEBUG";
-			case LogLevel.INFO:
-				return "INFO";
-			case LogLevel.WARNING:
-				return "WARNING";
-			case LogLevel.ERROR:
-				return "ERROR";
-			default:
-				return "UNKNOWN";
-		}
-	}
-}
-
-export class Logger {
-	private static readonly MAX_MESSAGES = 1000;
-
-	private static instance: Logger;
-	private messages: LogLine[] = [];
-
-	private constructor() {}
-
-	static getInstance(): Logger {
-		if (!Logger.instance) {
-			Logger.instance = new Logger();
-		}
-		return Logger.instance;
-	}
-
-	public debug(message: string): void {
-		this.pushMessage(message, LogLevel.DEBUG);
-		console.debug(message);
-	}
-
-	public info(message: string): void {
-		this.pushMessage(message, LogLevel.INFO);
-		console.log(message);
-	}
-
-	public warn(message: string): void {
-		this.pushMessage(message, LogLevel.WARNING);
-		console.warn(message);
-	}
-
-	public error(message: string): void {
-		this.pushMessage(message, LogLevel.ERROR);
-		console.error(message);
-		new Notice(message);
-	}
-
-	public getMessages(mininumSeverity: LogLevel): LogLine[] {
-		return this.messages.filter(
-			(message) => message.level >= mininumSeverity
-		);
-	}
-
-	private pushMessage(message: string, level: LogLevel): void {
-		this.messages.push(new LogLine(level, message));
-		if (this.messages.length > Logger.MAX_MESSAGES) {
-			this.messages.shift();
-		}
-	}
-}
diff --git a/plugin/src/services/sync-service.ts b/plugin/src/services/sync-service.ts
index 472c29b9..5a4f9636 100644
--- a/plugin/src/services/sync-service.ts
+++ b/plugin/src/services/sync-service.ts
@@ -1,16 +1,17 @@
 import * as lib from "../../../backend/sync_lib/pkg/sync_lib.js";
 
-import createClient, { Client } from "openapi-fetch";
-import type { components, paths } from "./types.js"; // generated by openapi-typescript
-import { Logger } from "src/logger";
-import { Database } from "src/database/database";
-import { SyncSettings } from "src/database/sync-settings";
-import {
-	VaultUpdateId,
-	RelativePath,
+import type { Client } from "openapi-fetch";
+import createClient from "openapi-fetch";
+import type { components, paths } from "./types.js"; // Generated by openapi-typescript
+import type { Database } from "src/database/database";
+import type { SyncSettings } from "src/database/sync-settings";
+import type {
 	DocumentId,
+	RelativePath,
+	VaultUpdateId,
 } from "src/database/document-metadata";
 import PQueue from "p-queue";
+import { Logger } from "src/tracing/logger.js";
 
 export interface RequestCountStatus {
 	waiting: number;
@@ -21,16 +22,17 @@ export interface RequestCountStatus {
 export class SyncService {
 	private client: Client<paths>;
 
-	private promiseQueue: PQueue;
-	private requestCountListeners: Array<(status: RequestCountStatus) => void> =
-		[];
-	private status: RequestCountStatus = {
+	private readonly promiseQueue: PQueue;
+	private readonly requestCountListeners: ((
+		status: RequestCountStatus
+	) => void)[] = [];
+	private readonly status: RequestCountStatus = {
 		waiting: 0,
 		success: 0,
 		failure: 0,
 	};
 
-	public constructor(private database: Database) {
+	public constructor(private readonly database: Database) {
 		this.createClient(database.getSettings());
 		this.promiseQueue = new PQueue({
 			concurrency: database.getSettings().uploadConcurrency,
@@ -64,36 +66,21 @@ export class SyncService {
 		listener({ ...this.status });
 	}
 
-	private emitRequestCountChange(): void {
-		this.requestCountListeners.forEach((listener) =>
-			listener({ ...this.status })
-		);
-	}
-
-	private createClient(settings: SyncSettings) {
-		this.client = createClient<paths>({
-			baseUrl: settings.remoteUri,
-		});
-	}
-
-	private enqueue<T>(fn: () => Promise<T>): Promise<T> {
-		return this.promiseQueue.add(fn) as Promise<T>;
-	}
-
 	public async ping(): Promise<components["schemas"]["PingResponse"]> {
-		const response = await this.enqueue(() =>
+		const response = await this.enqueue(async () =>
 			this.client.GET("/ping", {
 				params: {
 					header: {
-						authorization:
-							"Bearer " + this.database.getSettings().token,
+						authorization: `Bearer ${
+							this.database.getSettings().token
+						}`,
 					},
 				},
 			})
 		);
 
 		Logger.getInstance().debug(
-			"Ping response: " + JSON.stringify(response.data)
+			`Ping response: ${JSON.stringify(response.data)}`
 		);
 
 		if (!response.data) {
@@ -112,15 +99,16 @@ export class SyncService {
 		contentBytes: Uint8Array;
 		createdDate: Date;
 	}): Promise<components["schemas"]["DocumentVersion"]> {
-		const response = await this.enqueue(() =>
+		const response = await this.enqueue(async () =>
 			this.client.POST("/vaults/{vault_id}/documents", {
 				params: {
 					path: {
 						vault_id: this.database.getSettings().vaultName,
 					},
 					header: {
-						authorization:
-							"Bearer " + this.database.getSettings().token,
+						authorization: `Bearer ${
+							this.database.getSettings().token
+						}`,
 					},
 				},
 				body: {
@@ -136,7 +124,7 @@ export class SyncService {
 		}
 
 		Logger.getInstance().debug(
-			"Created document " + JSON.stringify(response.data)
+			`Created document ${JSON.stringify(response.data)}`
 		);
 
 		return response.data;
@@ -155,7 +143,7 @@ export class SyncService {
 		contentBytes: Uint8Array;
 		createdDate: Date;
 	}): Promise<components["schemas"]["DocumentVersion"]> {
-		const response = await this.enqueue(() =>
+		const response = await this.enqueue(async () =>
 			this.client.PUT("/vaults/{vault_id}/documents/{document_id}", {
 				params: {
 					path: {
@@ -163,8 +151,9 @@ export class SyncService {
 						document_id: documentId,
 					},
 					header: {
-						authorization:
-							"Bearer " + this.database.getSettings().token,
+						authorization: `Bearer ${
+							this.database.getSettings().token
+						}`,
 					},
 				},
 				body: {
@@ -181,7 +170,7 @@ export class SyncService {
 		}
 
 		Logger.getInstance().debug(
-			"Updated document " + JSON.stringify(response.data)
+			`Updated document ${JSON.stringify(response.data)}`
 		);
 
 		return response.data;
@@ -196,7 +185,7 @@ export class SyncService {
 		relativePath: RelativePath;
 		createdDate: Date;
 	}): Promise<void> {
-		const response = await this.enqueue(() =>
+		const response = await this.enqueue(async () =>
 			this.client.DELETE("/vaults/{vault_id}/documents/{document_id}", {
 				params: {
 					path: {
@@ -204,8 +193,9 @@ export class SyncService {
 						document_id: documentId,
 					},
 					header: {
-						authorization:
-							"Bearer " + this.database.getSettings().token,
+						authorization: `Bearer ${
+							this.database.getSettings().token
+						}`,
 					},
 				},
 				body: {
@@ -220,7 +210,7 @@ export class SyncService {
 		}
 
 		Logger.getInstance().debug(
-			"Updated document " + JSON.stringify(response.data)
+			`Updated document ${JSON.stringify(response.data)}`
 		);
 
 		return response.data;
@@ -231,7 +221,7 @@ export class SyncService {
 	}: {
 		documentId: DocumentId;
 	}): Promise<components["schemas"]["DocumentVersion"]> {
-		const response = await this.enqueue(() =>
+		const response = await this.enqueue(async () =>
 			this.client.GET("/vaults/{vault_id}/documents/{document_id}", {
 				params: {
 					path: {
@@ -239,8 +229,9 @@ export class SyncService {
 						document_id: documentId,
 					},
 					header: {
-						authorization:
-							"Bearer " + this.database.getSettings().token,
+						authorization: `Bearer ${
+							this.database.getSettings().token
+						}`,
 					},
 				},
 			})
@@ -251,7 +242,7 @@ export class SyncService {
 		}
 
 		Logger.getInstance().debug(
-			"Get document " + JSON.stringify(response.data)
+			`Get document ${JSON.stringify(response.data)}`
 		);
 
 		return response.data;
@@ -260,15 +251,16 @@ export class SyncService {
 	public async getAll(
 		since?: VaultUpdateId
 	): Promise<components["schemas"]["FetchLatestDocumentsResponse"]> {
-		const response = await this.enqueue(() =>
+		const response = await this.enqueue(async () =>
 			this.client.GET("/vaults/{vault_id}/documents", {
 				params: {
 					path: {
 						vault_id: this.database.getSettings().vaultName,
 					},
 					header: {
-						authorization:
-							"Bearer " + this.database.getSettings().token,
+						authorization: `Bearer ${
+							this.database.getSettings().token
+						}`,
 					},
 					query: {
 						since_update_id: since,
@@ -277,14 +269,32 @@ export class SyncService {
 			})
 		);
 
-		if (!response.data) {
-			throw new Error(`Failed to get documents: ${response.error}`);
+		const { error } = response;
+		if (error) {
+			throw new Error(`Failed to get documents: ${error}`);
 		}
 
 		Logger.getInstance().debug(
-			"Get document " + JSON.stringify(response.data)
+			`Get document ${JSON.stringify(response.data)}`
 		);
 
 		return response.data;
 	}
+
+	private emitRequestCountChange(): void {
+		this.requestCountListeners.forEach((listener) => {
+			listener({ ...this.status });
+		});
+	}
+
+	private createClient(settings: SyncSettings): void {
+		this.client = createClient<paths>({
+			baseUrl: settings.remoteUri,
+		});
+	}
+
+	private async enqueue<T>(fn: () => Promise<T>): Promise<T> {
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+		return this.promiseQueue.add(fn) as Promise<T>;
+	}
 }
diff --git a/plugin/src/services/types.ts b/plugin/src/services/types.ts
index dbfa8acb..09f50f13 100644
--- a/plugin/src/services/types.ts
+++ b/plugin/src/services/types.ts
@@ -23,9 +23,7 @@ export interface paths {
             requestBody?: never;
             responses: {
                 200: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
+                    headers: Record<string, unknown>;
                     content: {
                         "application/json": components["schemas"]["PingResponse"];
                     };
@@ -63,9 +61,7 @@ export interface paths {
             requestBody?: never;
             responses: {
                 200: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
+                    headers: Record<string, unknown>;
                     content: {
                         "application/json": components["schemas"]["FetchLatestDocumentsResponse"];
                     };
@@ -91,9 +87,7 @@ export interface paths {
             };
             responses: {
                 200: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
+                    headers: Record<string, unknown>;
                     content: {
                         "application/json": components["schemas"]["DocumentVersion"];
                     };
@@ -128,9 +122,7 @@ export interface paths {
             requestBody?: never;
             responses: {
                 200: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
+                    headers: Record<string, unknown>;
                     content: {
                         "application/json": components["schemas"]["DocumentVersion"];
                     };
@@ -156,9 +148,7 @@ export interface paths {
             };
             responses: {
                 200: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
+                    headers: Record<string, unknown>;
                     content: {
                         "application/json": components["schemas"]["DocumentVersion"];
                     };
@@ -186,9 +176,7 @@ export interface paths {
             responses: {
                 /** @description no content */
                 200: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
+                    headers: Record<string, unknown>;
                     content?: never;
                 };
             };
diff --git a/plugin/src/sync-operations/locks.ts b/plugin/src/sync-operations/locks.ts
index 4ce06cad..8a28249e 100644
--- a/plugin/src/sync-operations/locks.ts
+++ b/plugin/src/sync-operations/locks.ts
@@ -1,7 +1,7 @@
-import { RelativePath } from "src/database/document-metadata";
+import type { RelativePath } from "src/database/document-metadata";
 
-const locked = new Set<RelativePath>();
-const waiters = new Map<RelativePath, Array<() => void>>();
+const locked = new Set<RelativePath>(),
+	waiters = new Map<RelativePath, (() => void)[]>();
 
 export function tryLockDocument(relativePath: RelativePath): boolean {
 	if (locked.has(relativePath)) {
@@ -12,17 +12,21 @@ export function tryLockDocument(relativePath: RelativePath): boolean {
 	return true;
 }
 
-export function waitForDocumentLock(relativePath: RelativePath): Promise<void> {
+export async function waitForDocumentLock(
+	relativePath: RelativePath
+): Promise<void> {
 	if (tryLockDocument(relativePath)) {
 		return Promise.resolve();
 	}
 
 	return new Promise((resolve) => {
-		if (!waiters.has(relativePath)) {
-			waiters.set(relativePath, []);
+		let waiting = waiters.get(relativePath);
+		if (!waiting) {
+			waiting = [];
+			waiters.set(relativePath, waiting);
 		}
 
-		waiters.get(relativePath)!.push(resolve);
+		waiting.push(resolve);
 	});
 }
 
diff --git a/plugin/src/utils/hash.ts b/plugin/src/utils/hash.ts
index 92f92e5a..10f20d1d 100644
--- a/plugin/src/utils/hash.ts
+++ b/plugin/src/utils/hash.ts
@@ -1,11 +1,12 @@
 // https://stackoverflow.com/questions/7616461/generate-a-hash-from-string-in-javascript
 export function hash(content: Uint8Array): string {
-	let hash = 0;
+	let result = 0;
+	// eslint-disable-next-line @typescript-eslint/prefer-for-of
 	for (let i = 0; i < content.length; i++) {
-		hash = (hash << 5) - hash + content[i];
-		hash |= 0; // convert to 32bit integer
+		result = (result << 5) - result + content[i];
+		result |= 0; // Convert to 32bit integer
 	}
-	return hash.toString(16);
+	return Math.abs(result).toString(16);
 }
 
 export const EMPTY_HASH = hash(new Uint8Array(0));
diff --git a/plugin/src/views/sync-view.ts b/plugin/src/views/sync-view.ts
index afd4f26c..5d81c37a 100644
--- a/plugin/src/views/sync-view.ts
+++ b/plugin/src/views/sync-view.ts
@@ -1,42 +1,40 @@
-import { ItemView, WorkspaceLeaf } from "obsidian";
-import { Logger, LogLevel } from "src/logger";
+import type { WorkspaceLeaf } from "obsidian";
+import { ItemView } from "obsidian";
+import { LogLevel, Logger } from "src/tracing/logger";
 
 export class SyncView extends ItemView {
-	public static TYPE = "example-view";
+	public static readonly TYPE = "example-view";
 
 	public constructor(leaf: WorkspaceLeaf) {
 		super(leaf);
 	}
 
-	getViewType() {
+	public getViewType(): string {
 		return SyncView.TYPE;
 	}
 
-	getDisplayText() {
+	public getDisplayText(): string {
 		return "Example view";
 	}
 
-	async onOpen() {
+	public async onOpen(): Promise<void> {
 		const container = this.containerEl.children[1];
 		container.empty();
 		container.createEl("h4", { text: "Example view" });
 
-		setInterval(() => this.updateView(), 1000);
+		// eslint-disable-next-line @typescript-eslint/no-misused-promises
+		setInterval(async () => this.updateView(), 1000);
 	}
 
-	async updateView() {
+	public async updateView(): Promise<void> {
 		const container = this.containerEl.children[1];
 		container.empty();
 
 		const messages = Logger.getInstance()
-			.getMessages(LogLevel.INFO)
+			.getMessages(LogLevel.DEBUG)
 			.map((message) => message.toString())
 			.join("\n");
 
 		container.createEl("pre", { text: messages });
 	}
-
-	async onClose() {
-		// Nothing to clean up.
-	}
 }

From 4a4d8c6d1a42cdd24a828ebd5f4ea908544963b6 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 20 Dec 2024 16:14:59 +0000
Subject: [PATCH 009/761] Change defaults

---
 plugin/src/database/sync-settings.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugin/src/database/sync-settings.ts b/plugin/src/database/sync-settings.ts
index 090fb7dd..2978b462 100644
--- a/plugin/src/database/sync-settings.ts
+++ b/plugin/src/database/sync-settings.ts
@@ -12,6 +12,6 @@ export const DEFAULT_SETTINGS: SyncSettings = {
 	token: "",
 	vaultName: "default",
 	fetchChangesUpdateIntervalMs: 1000,
-	uploadConcurrency: 10,
-	isSyncEnabled: true,
+	uploadConcurrency: 4,
+	isSyncEnabled: false,
 };

From f552ac4abce2ff499b2c3a7e30772279d0b1ca36 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 20 Dec 2024 16:15:48 +0000
Subject: [PATCH 010/761] Add sync  history backend

---
 plugin/src/tracing/logger.ts       | 77 ++++++++++++++++++++++++
 plugin/src/tracing/sync-history.ts | 94 ++++++++++++++++++++++++++++++
 plugin/src/views/status-bar.ts     | 20 +++----
 3 files changed, 179 insertions(+), 12 deletions(-)
 create mode 100644 plugin/src/tracing/logger.ts
 create mode 100644 plugin/src/tracing/sync-history.ts

diff --git a/plugin/src/tracing/logger.ts b/plugin/src/tracing/logger.ts
new file mode 100644
index 00000000..fbaf0a14
--- /dev/null
+++ b/plugin/src/tracing/logger.ts
@@ -0,0 +1,77 @@
+import { Notice } from "obsidian";
+
+export enum LogLevel {
+	DEBUG = "DEBUG",
+	INFO = "INFO",
+	WARNING = "WARNING",
+	ERROR = "ERROR",
+}
+
+class LogLine {
+	public constructor(public level: LogLevel, public message: string) {}
+
+	public toString(): string {
+		return `${this.formatLevel()}: ${this.message}`;
+	}
+
+	private formatLevel(): string {
+		switch (this.level) {
+			case LogLevel.DEBUG:
+				return "DEBUG";
+			case LogLevel.INFO:
+				return "INFO";
+			case LogLevel.WARNING:
+				return "WARNING";
+			case LogLevel.ERROR:
+				return "ERROR";
+			default:
+				return "UNKNOWN";
+		}
+	}
+}
+
+export class Logger {
+	private static readonly MAX_MESSAGES = 1000;
+
+	private static instance: Logger | null = null;
+	private readonly messages: LogLine[] = [];
+
+	private constructor() {} // eslint-disable-line @typescript-eslint/no-empty-function
+
+	public static getInstance(): Logger {
+		if (!Logger.instance) {
+			Logger.instance = new Logger();
+		}
+		return Logger.instance;
+	}
+
+	public debug(message: string): void {
+		this.pushMessage(message, LogLevel.DEBUG);
+	}
+
+	public info(message: string): void {
+		this.pushMessage(message, LogLevel.INFO);
+	}
+
+	public warn(message: string): void {
+		this.pushMessage(message, LogLevel.WARNING);
+	}
+
+	public error(message: string): void {
+		this.pushMessage(message, LogLevel.ERROR);
+		new Notice(message, 5000);
+	}
+
+	public getMessages(mininumSeverity: LogLevel): LogLine[] {
+		return this.messages.filter(
+			(message) => message.level >= mininumSeverity
+		);
+	}
+
+	private pushMessage(message: string, level: LogLevel): void {
+		this.messages.push(new LogLine(level, message));
+		if (this.messages.length > Logger.MAX_MESSAGES) {
+			this.messages.shift();
+		}
+	}
+}
diff --git a/plugin/src/tracing/sync-history.ts b/plugin/src/tracing/sync-history.ts
new file mode 100644
index 00000000..292d7f6a
--- /dev/null
+++ b/plugin/src/tracing/sync-history.ts
@@ -0,0 +1,94 @@
+import type { RelativePath } from "src/database/document-metadata";
+import { Logger } from "./logger";
+
+export interface CommonHistoryEntry {
+	status: SyncStatus;
+	relativePath: RelativePath;
+	message: string;
+	type?: SyncType;
+	source?: SyncSource;
+}
+
+export enum SyncType {
+	CREATE = "CREATE",
+	UPDATE = "UPDATE",
+	DELETE = "DELETE",
+}
+
+export enum SyncSource {
+	PUSH = "PUSH",
+	PULL = "PULL",
+}
+
+export enum SyncStatus {
+	NO_OP = "NO_OP",
+	SUCCESS = "SUCCESS",
+	ERROR = "ERROR",
+}
+
+export type HistoryEntry = CommonHistoryEntry & { timestamp: Date };
+
+export interface HistoryStats {
+	success: number;
+	error: number;
+}
+
+export class SyncHistory {
+	private static readonly MAX_ENTRIES = 1000;
+
+	private entries: HistoryEntry[] = [];
+	private readonly requestCountListeners: ((status: HistoryStats) => void)[] =
+		[];
+	private status: HistoryStats = {
+		success: 0,
+		error: 0,
+	};
+
+	public getMessages(): HistoryEntry[] {
+		return this.entries;
+	}
+
+	public reset(): void {
+		this.entries = [];
+		this.status = {
+			success: 0,
+			error: 0,
+		};
+		this.requestCountListeners.forEach((listener) => {
+			listener(this.status);
+		});
+	}
+
+	public addSyncHistoryStatsChangeListener(
+		listener: (status: HistoryStats) => void
+	): void {
+		this.requestCountListeners.push(listener);
+		listener({ ...this.status });
+	}
+
+	public addHistoryEntry(entry: CommonHistoryEntry): void {
+		const historyEntry = {
+			...entry,
+			timestamp: new Date(),
+		};
+		this.entries.push(historyEntry);
+
+		if (entry.status === SyncStatus.SUCCESS) {
+			this.status.success++;
+			Logger.getInstance().info(`Synced file: ${entry.relativePath}`);
+		} else if (entry.status === SyncStatus.ERROR) {
+			this.status.error++;
+			Logger.getInstance().error(
+				`Error syncing file: ${entry.relativePath} - ${entry.message}`
+			);
+		}
+
+		this.requestCountListeners.forEach((listener) => {
+			listener(this.status);
+		});
+
+		if (this.entries.length > SyncHistory.MAX_ENTRIES) {
+			this.entries.shift();
+		}
+	}
+}
diff --git a/plugin/src/views/status-bar.ts b/plugin/src/views/status-bar.ts
index ec83f756..c1f35172 100644
--- a/plugin/src/views/status-bar.ts
+++ b/plugin/src/views/status-bar.ts
@@ -1,21 +1,17 @@
-import { Plugin } from "obsidian";
-import { RequestCountStatus, SyncService } from "src/services/sync-service";
+import type { Plugin } from "obsidian";
+import type { HistoryStats, SyncHistory } from "src/tracing/sync-history";
 
 export class StatusBar {
-	private statusBarItem: HTMLElement;
+	private readonly statusBarItem: HTMLElement;
 
-	public constructor(plugin: Plugin, service: SyncService) {
+	public constructor(plugin: Plugin, history: SyncHistory) {
 		this.statusBarItem = plugin.addStatusBarItem();
-		service.addRequestCountChangeListener((status) =>
-			this.updateStatus(status)
+		history.addSyncHistoryStatsChangeListener((status) =>
+			{ this.updateStatus(status); }
 		);
 	}
 
-	private updateStatus({
-		waiting,
-		success,
-		failure,
-	}: RequestCountStatus): void {
-		this.statusBarItem.setText(`${waiting} 🔄 ${success} ✅ ${failure} ❌`);
+	private updateStatus({ success, error }: HistoryStats): void {
+		this.statusBarItem.setText(`${success} ✅ ${error} ❌`);
 	}
 }

From ee76a6e26ec5f0397be03e62b4112c102366d461 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 20 Dec 2024 16:16:09 +0000
Subject: [PATCH 011/761] Lint & fix bugs

---
 plugin/src/views/settings-tab.ts | 50 ++++++++++++++++++++------------
 1 file changed, 31 insertions(+), 19 deletions(-)

diff --git a/plugin/src/views/settings-tab.ts b/plugin/src/views/settings-tab.ts
index 255b80e5..e21523a8 100644
--- a/plugin/src/views/settings-tab.ts
+++ b/plugin/src/views/settings-tab.ts
@@ -1,8 +1,10 @@
-import { App, Notice, PluginSettingTab, Setting } from "obsidian";
+import type { App } from "obsidian";
+import { Notice, PluginSettingTab, Setting } from "obsidian";
 
-import SyncPlugin from "src/plugin";
-import { Database } from "src/database/database";
-import { SyncService } from "src/services/sync-service";
+import type SyncPlugin from "src/plugin";
+import type { Database } from "src/database/database";
+import type { SyncService } from "src/services/sync-service";
+import type { SyncHistory } from "src/tracing/sync-history";
 
 export class SyncSettingsTab extends PluginSettingTab {
 	private editedVaultName: string;
@@ -10,18 +12,23 @@ export class SyncSettingsTab extends PluginSettingTab {
 	public constructor(
 		app: App,
 		plugin: SyncPlugin,
-		private database: Database,
-		private syncServer: SyncService
+		private readonly database: Database,
+		private readonly syncServer: SyncService,
+		private readonly history: SyncHistory
 	) {
 		super(app, plugin);
 		this.editedVaultName = this.database.getSettings().vaultName;
-		this.database.addOnSettingsChangeHandlers((s) => {
-			this.editedVaultName = s.vaultName;
-			this.display();
-		});
+		this.database.addOnSettingsChangeHandlers(
+			(newSettings, oldSettings) => {
+				if (newSettings.vaultName !== oldSettings.vaultName) {
+					this.editedVaultName = newSettings.vaultName;
+					this.display();
+				}
+			}
+		);
 	}
 
-	display(): void {
+	public display(): void {
 		const { containerEl } = this;
 
 		containerEl.empty();
@@ -34,9 +41,9 @@ export class SyncSettingsTab extends PluginSettingTab {
 			)
 			.addText((text) =>
 				text
-					.setPlaceholder("https://example.com:8080/obsidian")
+					.setPlaceholder("https://example.com:3030")
 					.setValue(this.database.getSettings().remoteUri)
-					.onChange((value) =>
+					.onChange(async (value) =>
 						this.database.setSetting("remoteUri", value)
 					)
 			)
@@ -54,7 +61,7 @@ export class SyncSettingsTab extends PluginSettingTab {
 							);
 						}
 					} catch (e) {
-						new Notice("Failed to connect to server: " + e);
+						new Notice(`Failed to connect to server: ${e}`);
 					}
 				})
 			)
@@ -65,13 +72,14 @@ export class SyncSettingsTab extends PluginSettingTab {
 					.setDynamicTooltip()
 					.setInstant(false)
 					.setValue(this.database.getSettings().uploadConcurrency)
-					.onChange((value) =>
+					.onChange(async (value) =>
 						this.database.setSetting("uploadConcurrency", value)
 					)
 			)
 			.addButton((button) =>
 				button.setButtonText("Reset sync state").onClick(async () => {
 					await this.database.resetSyncState();
+					this.history.reset();
 					new Notice(
 						"Sync state has been reset, you will need to resync"
 					);
@@ -98,8 +106,12 @@ export class SyncSettingsTab extends PluginSettingTab {
 					) {
 						return;
 					}
-					this.database.setSetting("vaultName", this.editedVaultName);
+					await this.database.setSetting(
+						"vaultName",
+						this.editedVaultName
+					);
 					await this.database.resetSyncState();
+					this.history.reset();
 					new Notice(
 						"Sync state has been reset, you will need to resync"
 					);
@@ -117,7 +129,7 @@ export class SyncSettingsTab extends PluginSettingTab {
 				text
 					.setPlaceholder("ey...")
 					.setValue(this.database.getSettings().token)
-					.onChange((value) =>
+					.onChange(async (value) =>
 						this.database.setSetting("token", value)
 					)
 			);
@@ -131,7 +143,7 @@ export class SyncSettingsTab extends PluginSettingTab {
 			.addToggle((toggle) =>
 				toggle
 					.setValue(this.database.getSettings().isSyncEnabled)
-					.onChange((value) =>
+					.onChange(async (value) =>
 						this.database.setSetting("isSyncEnabled", value)
 					)
 			)
@@ -143,7 +155,7 @@ export class SyncSettingsTab extends PluginSettingTab {
 					.setValue(
 						this.database.getSettings().fetchChangesUpdateIntervalMs
 					)
-					.onChange((value) =>
+					.onChange(async (value) =>
 						this.database.setSetting(
 							"fetchChangesUpdateIntervalMs",
 							value

From 359571a2a032e6509dc27c39ddb062f9211c13a7 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 20 Dec 2024 16:19:10 +0000
Subject: [PATCH 012/761] Improve sync logic

---
 README.md                                     |  20 +-
 plugin/src/plugin.ts                          | 110 ++++++----
 .../apply-local-changes-remotely.ts           | 193 +++++++++---------
 .../apply-remote-changes-locally.ts           |  47 +++--
 .../sync-locally-created-file.ts              |  82 +++++---
 .../sync-locally-deleted-file.ts              |  47 ++++-
 .../sync-locally-updated-file.ts              | 106 +++++++---
 .../sync-remotely-updated-file.ts             | 186 ++++++++++-------
 8 files changed, 487 insertions(+), 304 deletions(-)

diff --git a/README.md b/README.md
index a4f8024b..77083aac 100644
--- a/README.md
+++ b/README.md
@@ -23,6 +23,15 @@
 - `cargo install sqlx-cli`
 
 
+## cut new version 
+
+```sh
+cd plugin
+npm version patch
+git tag -a 0.0.2 -m "0.0.2"
+git push origin 0.0.2
+```
+
 
 
 
@@ -34,7 +43,7 @@
 - e2e tests
 - add clap
 - add auth middleware
-- add request logs
+- run eslint in ci
 
 - CI for:
     - publish reconcile
@@ -55,4 +64,11 @@ missing_docs_in_private_items = { level = "allow", priority = 1 }
 question_mark_used =  { level = "allow", priority = 1 }
 implicit_return = { level = "allow", priority = 1 }
 pedantic = { level = "warn", priority = 0 }
-cargo = { level = "warn", priority = 0 }
\ No newline at end of file
+cargo = { level = "warn", priority = 0 }
+
+
+
+reset should reset counters
+access logs
+retry
+mem usage
\ No newline at end of file
diff --git a/plugin/src/plugin.ts b/plugin/src/plugin.ts
index 10f3e383..260b9e55 100644
--- a/plugin/src/plugin.ts
+++ b/plugin/src/plugin.ts
@@ -1,41 +1,36 @@
-import { Editor, MarkdownView, Plugin, WorkspaceLeaf } from "obsidian";
+import type { WorkspaceLeaf } from "obsidian";
+import { Plugin } from "obsidian";
 
 import * as lib from "../../backend/sync_lib/pkg/sync_lib.js";
 import * as wasmBin from "../../backend/sync_lib/pkg/sync_lib_bg.wasm";
 import { SyncSettingsTab } from "./views/settings-tab";
 import { SyncView } from "./views/sync-view";
 
-import { Logger } from "./logger";
-import { SyncEventHandler } from "./events/sync-event-handler";
+import { ObsidianFileEventHandler } from "./events/obisidan-event-handler.js";
 import { SyncService } from "./services/sync-service";
 import { Database } from "./database/database";
 import { applyRemoteChangesLocally } from "./sync-operations/apply-remote-changes-locally";
 import { ObsidianFileOperations } from "./file-operations/obsidian-file-operations";
 import { applyLocalChangesRemotely } from "./sync-operations/apply-local-changes-remotely";
 import { StatusBar } from "./views/status-bar";
+import { Logger } from "./tracing/logger.js";
+import { SyncHistory } from "./tracing/sync-history.js";
 
 export default class SyncPlugin extends Plugin {
 	private remoteListenerIntervalId: number | null = null;
-	private operations = new ObsidianFileOperations(this.app.vault);
+	private readonly operations = new ObsidianFileOperations(this.app.vault);
+	private readonly history = new SyncHistory();
 
-	async onload() {
-		Logger.getInstance().info('Starting plugin "Sample Plugin"');
+	public async onload(): Promise<void> {
+		Logger.getInstance().info("Starting plugin");
 
 		await lib.default(
 			Promise.resolve(
-				(wasmBin as any).default // eslint-disable-line @typescript-eslint/no-explicit-any
+				// eslint-disable-next-line
+				(wasmBin as any).default
 			)
 		);
 
-		this.addCommand({
-			id: "sample-editor-command",
-			name: "Sample editor command",
-			editorCallback: (editor: Editor, _view: MarkdownView) => {
-				console.log(editor.getSelection());
-				editor.replaceSelection("Sample Editor Command");
-			},
-		});
-
 		const database = new Database(
 			await this.loadData(),
 			this.saveData.bind(this)
@@ -43,19 +38,28 @@ export default class SyncPlugin extends Plugin {
 
 		const syncServer = new SyncService(database);
 
-		new StatusBar(this, syncServer);
+		new StatusBar(this, this.history);
 
 		this.addSettingTab(
-			new SyncSettingsTab(this.app, this, database, syncServer)
+			new SyncSettingsTab(
+				this.app,
+				this,
+				database,
+				syncServer,
+				this.history
+			)
 		);
 
-		const eventHandler = new SyncEventHandler(
+		const eventHandler = new ObsidianFileEventHandler(
 			database,
 			syncServer,
-			this.operations
+			this.operations,
+			this.history
 		);
 
-		this.app.workspace.onLayoutReady(() => {
+		this.app.workspace.onLayoutReady(async () => {
+			Logger.getInstance().info("Initialising sync handlers");
+
 			[
 				this.app.vault.on(
 					"create",
@@ -73,9 +77,18 @@ export default class SyncPlugin extends Plugin {
 					"rename",
 					eventHandler.onRename.bind(eventHandler)
 				),
-			].forEach((event) => this.registerEvent(event));
+			].forEach((event) => {
+				this.registerEvent(event);
+			});
 
-			applyLocalChangesRemotely(database, syncServer, this.operations);
+			await applyLocalChangesRemotely({
+				database,
+				syncServer,
+				operations: this.operations,
+				history: this.history,
+			});
+
+			Logger.getInstance().info("Sync handlers initialised");
 		});
 
 		this.registerRemoteEventListener(
@@ -83,7 +96,9 @@ export default class SyncPlugin extends Plugin {
 			syncServer,
 			database.getSettings().fetchChangesUpdateIntervalMs
 		);
-		database.addOnSettingsChangeHandlers((settings, oldSettings) => {
+
+		// eslint-disable-next-line @typescript-eslint/no-misused-promises
+		database.addOnSettingsChangeHandlers(async (settings, oldSettings) => {
 			this.registerRemoteEventListener(
 				database,
 				syncServer,
@@ -91,11 +106,12 @@ export default class SyncPlugin extends Plugin {
 			);
 
 			if (!oldSettings.isSyncEnabled && settings.isSyncEnabled) {
-				applyLocalChangesRemotely(
-					database,
+				await applyLocalChangesRemotely({
+					database: database,
 					syncServer,
-					this.operations
-				);
+					operations: this.operations,
+					history: this.history,
+				});
 			}
 		});
 
@@ -104,12 +120,20 @@ export default class SyncPlugin extends Plugin {
 		const ribbonIconEl = this.addRibbonIcon(
 			"dice",
 			"Sample Plugin",
-			(_: MouseEvent) => this.activateView()
+			async (_: MouseEvent) => this.activateView()
 		);
 		ribbonIconEl.addClass("my-plugin-ribbon-class");
+
+		Logger.getInstance().info("Plugin loaded");
 	}
 
-	async activateView() {
+	public onunload(): void {
+		if (this.remoteListenerIntervalId !== null) {
+			window.clearInterval(this.remoteListenerIntervalId);
+		}
+	}
+
+	private async activateView(): Promise<void> {
 		const { workspace } = this.app;
 
 		let leaf: WorkspaceLeaf | null = null;
@@ -117,21 +141,17 @@ export default class SyncPlugin extends Plugin {
 
 		if (leaves.length > 0) {
 			// A leaf with our view already exists, use that
-			leaf = leaves[0];
+			[leaf] = leaves;
 		} else {
 			// Our view could not be found in the workspace, create a new leaf
-			// in the right sidebar for it
+			// In the right sidebar for it
 			leaf = workspace.getRightLeaf(false);
 			await leaf?.setViewState({ type: SyncView.TYPE, active: true });
 		}
 
 		// "Reveal" the leaf in case it is in a collapsed sidebar
-		workspace.revealLeaf(leaf!);
-	}
-
-	onunload(): void {
-		if (this.remoteListenerIntervalId) {
-			window.clearInterval(this.remoteListenerIntervalId);
+		if (leaf) {
+			await workspace.revealLeaf(leaf);
 		}
 	}
 
@@ -139,18 +159,20 @@ export default class SyncPlugin extends Plugin {
 		database: Database,
 		syncServer: SyncService,
 		intervalMs: number
-	) {
-		if (this.remoteListenerIntervalId) {
+	): void {
+		if (this.remoteListenerIntervalId !== null) {
 			window.clearInterval(this.remoteListenerIntervalId);
 		}
 
 		this.remoteListenerIntervalId = window.setInterval(
-			() =>
-				applyRemoteChangesLocally(
+			// eslint-disable-next-line @typescript-eslint/no-misused-promises
+			async () =>
+				applyRemoteChangesLocally({
 					database,
 					syncServer,
-					this.operations
-				),
+					operations: this.operations,
+					history: this.history,
+				}),
 			intervalMs
 		);
 	}
diff --git a/plugin/src/sync-operations/apply-local-changes-remotely.ts b/plugin/src/sync-operations/apply-local-changes-remotely.ts
index 22b32864..86a60c52 100644
--- a/plugin/src/sync-operations/apply-local-changes-remotely.ts
+++ b/plugin/src/sync-operations/apply-local-changes-remotely.ts
@@ -1,131 +1,130 @@
-import { Database } from "../database/database";
-import { SyncService } from "../services/sync-service";
-import { Logger } from "../logger";
-import { FileOperations } from "../file-operations/file-operations";
+import type { Database } from "../database/database";
+import type { SyncService } from "../services/sync-service";
+import type { FileOperations } from "../file-operations/file-operations";
 import { syncLocallyCreatedFile } from "./sync-locally-created-file";
 import { EMPTY_HASH, hash } from "src/utils/hash";
 import { syncLocallyUpdatedFile } from "./sync-locally-updated-file";
 import { syncLocallyDeletedFile } from "./sync-locally-deleted-file";
-import { Notice } from "obsidian";
-import PQueue from "p-queue";
+import { Logger } from "src/tracing/logger";
+import type { SyncHistory } from "src/tracing/sync-history";
 
 let isRunning = false;
 
-export interface Progress {
-	processedFiles: number;
-	totalFiles: number;
-}
-
-export async function applyLocalChangesRemotely(
-	database: Database,
-	syncServer: SyncService,
-	operations: FileOperations
-) {
-	console.log("applyLocalChangesRemotely");
+export async function applyLocalChangesRemotely({
+	database,
+	syncServer,
+	operations,
+	history,
+}: {
+	database: Database;
+	syncServer: SyncService;
+	operations: FileOperations;
+	history: SyncHistory;
+}): Promise<void> {
 	if (isRunning) {
-		Logger.getInstance().info("Push sync already in progress, skipping");
+		Logger.getInstance().debug(
+			"Uploading local changes is already in progress, skipping"
+		);
 		return;
 	}
 
-	let tasks: Promise<void>[] = [];
+	isRunning = true;
+	try {
+		const tasks: Promise<void>[] = [];
 
-	const allLocalFiles = await operations.listAllFiles();
-	console.log(allLocalFiles);
-	const deletedFiles = [...database.getDocuments().entries()].filter(
-		([path, _]) => !allLocalFiles.includes(path)
-	);
+		const allLocalFiles = await operations.listAllFiles();
+		const locallyDeletedFiles = [
+			...database.getDocuments().entries(),
+		].filter(([path, _]) => !allLocalFiles.includes(path));
 
-	console.log(deletedFiles);
-
-	const promiseQueue = new PQueue({
-		concurrency: 1,
-	});
-
-	await Promise.all(
-		allLocalFiles.map((path) =>
-			promiseQueue.add(async () => {
-				const syncedState = database.getDocument(path);
-				if (!syncedState) {
-					Logger.getInstance().info(
-						`Document ${path} not found in database`
-					);
+		await Promise.all(
+			allLocalFiles.map(async (path) => {
+				const metadata = database.getDocument(path);
+				if (!metadata) {
 					const contentHash = hash(await operations.read(path));
-					if (contentHash != EMPTY_HASH) {
-						const match = deletedFiles.find(
-							([path, doc]) => doc.hash === contentHash
+					const match = locallyDeletedFiles.find(
+						([_, document]) => document.hash === contentHash
+					);
+
+					if (contentHash != EMPTY_HASH && match) {
+						locallyDeletedFiles.remove(match);
+
+						Logger.getInstance().debug(
+							`Document ${path} not found in database but found under a different path ${match[0]}, scheduling sync to update it`
 						);
-						if (match) {
-							const oldPath = match[0];
-							Logger.getInstance().info(
-								`Document ${path} found remotely under a different path (${oldPath}), moving`
-							);
-							tasks.push(
-								syncLocallyUpdatedFile({
-									database,
-									syncServer,
-									operations,
-									oldPath,
-									filePath: path,
-									updateTime:
-										await operations.getModificationTime(
-											path
-										),
-								})
-							);
-							deletedFiles.remove(match);
-							return;
-						}
-					}
-					tasks.push(
-						syncLocallyCreatedFile({
+						return syncLocallyUpdatedFile({
 							database,
 							syncServer,
 							operations,
+							history,
+							oldPath: match[0],
+							relativePath: path,
 							updateTime: await operations.getModificationTime(
 								path
 							),
-							filePath: path,
-						})
+						});
+					}
+
+					Logger.getInstance().debug(
+						`Document ${path} not found in database, scheduling sync to create it`
 					);
-					return;
+					return syncLocallyCreatedFile({
+						database,
+						syncServer,
+						operations,
+						history,
+						updateTime: await operations.getModificationTime(path),
+						relativePath: path,
+					});
 				}
 
 				const content = await operations.read(path);
-				if (syncedState.hash !== hash(content)) {
-					Logger.getInstance().info(
-						`Document ${path} has local changes, updating`
+				if (metadata.hash !== hash(content)) {
+					Logger.getInstance().debug(
+						`Document ${path} has been updated locally, scheduling sync to update it`
 					);
-					tasks.push(
-						syncLocallyUpdatedFile({
-							database,
-							syncServer,
-							operations,
-							filePath: path,
-							updateTime: await operations.getModificationTime(
-								path
-							),
-						})
-					);
-					return;
+					return syncLocallyUpdatedFile({
+						database,
+						syncServer,
+						operations,
+						history,
+						relativePath: path,
+						updateTime: await operations.getModificationTime(path),
+					});
 				}
-			})
-		)
-	);
 
-	deletedFiles.forEach(([relativePath, _]) => {
-		Logger.getInstance().info(
-			`Document ${relativePath} deleted locally, deleting`
+				return Promise.resolve();
+			})
 		);
+
 		tasks.push(
-			syncLocallyDeletedFile({
-				database,
-				syncServer,
-				relativePath,
+			...locallyDeletedFiles.map(async ([relativePath, _]) => {
+				Logger.getInstance().debug(
+					`Document ${relativePath} has been deleted locally, scheduling sync to delete it`
+				);
+
+				return syncLocallyDeletedFile({
+					database,
+					syncServer,
+					history,
+					relativePath,
+				});
 			})
 		);
-	});
 
-	await Promise.all(tasks);
-
-	new Notice("Local changes synced remotely");
+		try {
+			await Promise.all(tasks);
+			Logger.getInstance().info(
+				`All local changes have been applied remotely`
+			);
+			return;
+		} catch {
+			await Promise.allSettled(tasks);
+			Logger.getInstance().error(
+				`Not all local changes have been applied remotely`
+			);
+		}
+	} finally {
+		isRunning = false;
+	}
 }
diff --git a/plugin/src/sync-operations/apply-remote-changes-locally.ts b/plugin/src/sync-operations/apply-remote-changes-locally.ts
index 462e4fa4..ddf7ec50 100644
--- a/plugin/src/sync-operations/apply-remote-changes-locally.ts
+++ b/plugin/src/sync-operations/apply-remote-changes-locally.ts
@@ -1,29 +1,37 @@
-import { Database } from "src/database/database";
-import { FileOperations } from "src/file-operations/file-operations";
-import { Logger } from "src/logger";
-import { SyncService } from "src/services/sync-service";
+import type { Database } from "src/database/database";
+import type { FileOperations } from "src/file-operations/file-operations";
+import type { SyncService } from "src/services/sync-service";
 import { syncRemotelyUpdatedFile } from "./sync-remotely-updated-file";
+import { Logger } from "src/tracing/logger";
+import type { SyncHistory } from "src/tracing/sync-history";
 
 let isRunning = false;
 
-export async function applyRemoteChangesLocally(
-	database: Database,
-	syncServer: SyncService,
-	operations: FileOperations
-) {
-	if (isRunning) {
-		Logger.getInstance().info("Pull sync already in progress, skipping");
+export async function applyRemoteChangesLocally({
+	database,
+	syncServer,
+	operations,
+	history,
+}: {
+	database: Database;
+	syncServer: SyncService;
+	operations: FileOperations;
+	history: SyncHistory;
+}): Promise<void> {
+	if (!database.getSettings().isSyncEnabled) {
+		Logger.getInstance().debug(
+			`Syncing is disabled, not fetching remote changes`
+		);
+		return;
+	} else if (isRunning) {
+		Logger.getInstance().debug(
+			"Applying remote changes locally is already in progress, skipping invocation"
+		);
 		return;
-	} else {
-		Logger.getInstance().info("Starting pull sync");
 	}
 
 	isRunning = true;
 	try {
-		if (!database.getSettings().isSyncEnabled) {
-			return;
-		}
-
 		const remote = await syncServer.getAll(database.getLastSeenUpdateId());
 
 		if (remote.latestDocuments.length === 0) {
@@ -34,11 +42,12 @@ export async function applyRemoteChangesLocally(
 		Logger.getInstance().info("Applying remote changes locally");
 
 		await Promise.all(
-			remote.latestDocuments.map((remoteDocument) =>
+			remote.latestDocuments.map(async (remoteDocument) =>
 				syncRemotelyUpdatedFile({
 					database,
 					syncServer,
-					operations: operations,
+					history,
+					operations,
 					remoteVersion: remoteDocument,
 				})
 			)
diff --git a/plugin/src/sync-operations/sync-locally-created-file.ts b/plugin/src/sync-operations/sync-locally-created-file.ts
index 9828776a..180bdf5c 100644
--- a/plugin/src/sync-operations/sync-locally-created-file.ts
+++ b/plugin/src/sync-operations/sync-locally-created-file.ts
@@ -1,57 +1,91 @@
 import * as lib from "../../../backend/sync_lib/pkg/sync_lib.js";
-import { Database } from "src/database/database";
-import { Logger } from "src/logger";
-import { SyncService } from "src/services/sync-service";
+import type { Database } from "src/database/database";
+import type { SyncService } from "src/services/sync-service";
 import { hash } from "src/utils/hash";
 import { unlockDocument, waitForDocumentLock } from "./locks";
-import { FileOperations } from "src/file-operations/file-operations";
-import { RelativePath } from "src/database/document-metadata";
+import type { FileOperations } from "src/file-operations/file-operations";
+import type { RelativePath } from "src/database/document-metadata";
+import type { SyncHistory } from "src/tracing/sync-history.js";
+import { SyncSource, SyncStatus, SyncType } from "src/tracing/sync-history.js";
+import { Logger } from "src/tracing/logger.js";
 
-/// This can be used when updating a files content and/or path.
 export async function syncLocallyCreatedFile({
 	database,
 	syncServer,
 	operations,
+	history,
 	updateTime,
-	filePath,
+	relativePath,
 }: {
 	database: Database;
 	syncServer: SyncService;
 	operations: FileOperations;
+	history: SyncHistory;
 	updateTime: Date;
-	filePath: RelativePath;
+	relativePath: RelativePath;
 }): Promise<void> {
-	await waitForDocumentLock(filePath);
+	if (!database.getSettings().isSyncEnabled) {
+		Logger.getInstance().info(
+			`Syncing is disabled, not syncing ${relativePath}`
+		);
+		return;
+	}
+	Logger.getInstance().debug(`Syncing ${relativePath}`);
+
+	await waitForDocumentLock(relativePath);
 
 	try {
-		const metadata = database.getDocument(filePath);
+		const metadata = database.getDocument(relativePath);
 		if (metadata) {
 			throw new Error(
-				`Document metadata found for ${filePath}, this is unexpected`
+				`Document metadata found for ${relativePath}, this is unexpected. Consider resetting the plugin's sync history.`
 			);
 		}
 
-		const contentBytes = await operations.read(filePath);
-
-		const response = await syncServer.create({
-			relativePath: filePath,
-			contentBytes,
-			createdDate: updateTime,
+		const contentBytes = await operations.read(relativePath),
+			contentHash = hash(contentBytes),
+			response = await syncServer.create({
+				relativePath,
+				contentBytes,
+				createdDate: updateTime,
+			});
+		history.addHistoryEntry({
+			status: SyncStatus.SUCCESS,
+			source: SyncSource.PUSH,
+			relativePath,
+			message: `Successfully uploaded locally created file`,
+			type: SyncType.CREATE,
 		});
 
-		const responseBytes = lib.base64_to_bytes(response.contentBase64);
-		await operations.write(filePath, contentBytes, responseBytes);
+		const responseBytes = lib.base64_to_bytes(response.contentBase64),
+			responseHash = hash(responseBytes);
+
+		if (contentHash !== responseHash) {
+			await operations.write(relativePath, contentBytes, responseBytes);
+			history.addHistoryEntry({
+				status: SyncStatus.SUCCESS,
+				source: SyncSource.PULL,
+				relativePath,
+				message: `The file we created locally has already existed remotely, so we have merged them`,
+				type: SyncType.UPDATE,
+			});
+		}
+
 		await database.setDocument({
 			documentId: response.documentId,
 			relativePath: response.relativePath,
 			parentVersionId: response.vaultUpdateId,
-			hash: hash(responseBytes),
+			hash: responseHash,
 		});
 	} catch (e) {
-		Logger.getInstance().error(
-			`Failed to sync locally updated file ${filePath}: ${e}`
-		);
+		history.addHistoryEntry({
+			status: SyncStatus.ERROR,
+			relativePath,
+			message: `Failed to reconcile locally created file: ${e}`,
+			type: SyncType.CREATE,
+		});
+		throw e;
 	} finally {
-		unlockDocument(filePath);
+		unlockDocument(relativePath);
 	}
 }
diff --git a/plugin/src/sync-operations/sync-locally-deleted-file.ts b/plugin/src/sync-operations/sync-locally-deleted-file.ts
index f5d94b58..7bfb0b0b 100644
--- a/plugin/src/sync-operations/sync-locally-deleted-file.ts
+++ b/plugin/src/sync-operations/sync-locally-deleted-file.ts
@@ -1,26 +1,41 @@
-import { Database } from "src/database/database";
-import { RelativePath } from "src/database/document-metadata";
-import { Logger } from "src/logger";
-import { SyncService } from "src/services/sync-service";
+import type { Database } from "src/database/database";
+import type { RelativePath } from "src/database/document-metadata";
+import type { SyncService } from "src/services/sync-service";
 import { unlockDocument, waitForDocumentLock } from "./locks";
+import { Logger } from "src/tracing/logger";
+import type { SyncHistory } from "src/tracing/sync-history";
+import { SyncSource, SyncStatus, SyncType } from "src/tracing/sync-history";
 
 export async function syncLocallyDeletedFile({
 	database,
 	syncServer,
+	history,
 	relativePath,
 }: {
 	database: Database;
 	syncServer: SyncService;
+	history: SyncHistory;
 	relativePath: RelativePath;
 }): Promise<void> {
+	if (!database.getSettings().isSyncEnabled) {
+		Logger.getInstance().info(
+			`Syncing is disabled, not syncing ${relativePath}`
+		);
+		return;
+	}
+	Logger.getInstance().debug(`Syncing ${relativePath}`);
+
 	await waitForDocumentLock(relativePath);
 
 	try {
 		const metadata = database.getDocument(relativePath);
 		if (!metadata) {
-			Logger.getInstance().warn(
-				`Document metadata not found for ${relativePath}`
-			);
+			history.addHistoryEntry({
+				status: SyncStatus.NO_OP,
+				relativePath,
+				message: `Locally deleted file hasn't been uploaded yet, so there's no need to delete it on the remote server`,
+				type: SyncType.DELETE,
+			});
 			return;
 		}
 
@@ -32,10 +47,22 @@ export async function syncLocallyDeletedFile({
 		});
 
 		await database.removeDocument(relativePath);
+
+		history.addHistoryEntry({
+			status: SyncStatus.SUCCESS,
+			source: SyncSource.PUSH,
+			relativePath,
+			message: `Successfully deleted locally deleted file on the remote server`,
+			type: SyncType.DELETE,
+		});
 	} catch (e) {
-		Logger.getInstance().error(
-			`Failed to sync locally deleted file ${relativePath}: ${e}`
-		);
+		history.addHistoryEntry({
+			status: SyncStatus.ERROR,
+			relativePath,
+			message: `Failed to remotely delete locally deleted file: ${e}`,
+			type: SyncType.DELETE,
+		});
+		throw e;
 	} finally {
 		unlockDocument(relativePath);
 	}
diff --git a/plugin/src/sync-operations/sync-locally-updated-file.ts b/plugin/src/sync-operations/sync-locally-updated-file.ts
index 9a61b987..2049f0ae 100644
--- a/plugin/src/sync-operations/sync-locally-updated-file.ts
+++ b/plugin/src/sync-operations/sync-locally-updated-file.ts
@@ -1,71 +1,103 @@
 import * as lib from "../../../backend/sync_lib/pkg/sync_lib.js";
-import { Database } from "src/database/database";
-import { Logger } from "src/logger";
-import { SyncService } from "src/services/sync-service";
+import type { Database } from "src/database/database";
+import type { SyncService } from "src/services/sync-service";
 import { hash } from "src/utils/hash";
 import { unlockDocument, waitForDocumentLock } from "./locks";
-import { FileOperations } from "src/file-operations/file-operations";
-import { RelativePath } from "src/database/document-metadata";
+import type { FileOperations } from "src/file-operations/file-operations";
+import type { RelativePath } from "src/database/document-metadata";
+import { Logger } from "src/tracing/logger.js";
+import type { SyncHistory } from "src/tracing/sync-history.js";
+import { SyncSource, SyncStatus, SyncType } from "src/tracing/sync-history.js";
 
-/// This can be used when updating a files content and/or path.
+/// This can be used when updating a file's content and/or path.
 export async function syncLocallyUpdatedFile({
 	database,
 	syncServer,
 	operations,
+	history,
 	updateTime,
-	filePath,
+	relativePath,
 	oldPath,
 }: {
 	database: Database;
 	syncServer: SyncService;
 	operations: FileOperations;
+	history: SyncHistory;
 	updateTime: Date;
-	filePath: RelativePath;
+	relativePath: RelativePath;
 	oldPath?: RelativePath;
 }): Promise<void> {
-	await waitForDocumentLock(filePath);
+	if (!database.getSettings().isSyncEnabled) {
+		Logger.getInstance().info(
+			`Syncing is disabled, not syncing ${relativePath}`
+		);
+		return;
+	}
+	Logger.getInstance().debug(`Syncing ${relativePath}`);
+
+	await waitForDocumentLock(relativePath);
 
 	try {
-		const metadata = database.getDocument(oldPath || filePath);
+		const metadata = database.getDocument(oldPath ?? relativePath);
 		if (!metadata) {
-			throw new Error(`Document metadata not found for ${filePath}`);
+			throw new Error(
+				`Document metadata not found for ${relativePath}. Consider resetting the plugin's sync history.`
+			);
 		}
 
-		const contentBytes = await operations.read(filePath);
-		const contentHash = hash(contentBytes);
+		const contentBytes = await operations.read(relativePath),
+			contentHash = hash(contentBytes);
 
-		if (metadata.hash === contentHash && !oldPath) {
-			Logger.getInstance().info(
-				`Document hash matches, no need to sync ${filePath}`
-			);
+		if (metadata.hash === contentHash && oldPath !== undefined) {
+			history.addHistoryEntry({
+				status: SyncStatus.NO_OP,
+				relativePath,
+				message: `File hash matches with last synced version, no need to sync`,
+				type: SyncType.UPDATE,
+			});
 			return;
 		}
 
 		const response = await syncServer.put({
 			documentId: metadata.documentId,
 			parentVersionId: metadata.parentVersionId,
-			relativePath: filePath,
+			relativePath,
 			contentBytes,
 			createdDate: updateTime,
 		});
 
-		if (response.isDeleted) {
-			await operations.remove(oldPath || filePath);
+		history.addHistoryEntry({
+			status: SyncStatus.SUCCESS,
+			source: SyncSource.PUSH,
+			relativePath,
+			message: `Successfully uploaded locally updated file to the remote server`,
+			type: SyncType.UPDATE,
+		});
 
-			if (metadata) {
-				await database.removeDocument(oldPath || filePath);
-			}
+		if (response.isDeleted) {
+			await operations.remove(oldPath ?? relativePath);
+			await database.removeDocument(oldPath ?? relativePath);
+
+			history.addHistoryEntry({
+				status: SyncStatus.SUCCESS,
+				source: SyncSource.PULL,
+				relativePath,
+				message:
+					"The file we tried to update had been deleted remotely, therefore, we have deleted it locally",
+				type: SyncType.DELETE,
+			});
 
 			return;
 		}
 
 		const responseBytes = lib.base64_to_bytes(response.contentBase64);
 
-		if (response.relativePath != filePath) {
+		if (response.relativePath != relativePath) {
 			await waitForDocumentLock(response.relativePath);
+
 			try {
 				await operations.move(
-					oldPath || filePath,
+					oldPath ?? relativePath,
 					response.relativePath
 				);
 				await operations.write(
@@ -73,25 +105,37 @@ export async function syncLocallyUpdatedFile({
 					contentBytes,
 					responseBytes
 				);
+				history.addHistoryEntry({
+					status: SyncStatus.SUCCESS,
+					source: SyncSource.PULL,
+					relativePath,
+					message:
+						"The file we updated had been moved remotely, therefore, we have moved it locally as well",
+					type: SyncType.UPDATE,
+				});
 			} finally {
 				unlockDocument(response.relativePath);
 			}
 		} else {
-			await operations.write(filePath, contentBytes, responseBytes);
+			await operations.write(relativePath, contentBytes, responseBytes);
 		}
 
 		await database.moveDocument({
 			documentId: metadata.documentId,
-			oldRelativePath: oldPath || filePath,
+			oldRelativePath: oldPath ?? relativePath,
 			relativePath: response.relativePath,
 			parentVersionId: response.vaultUpdateId,
 			hash: contentHash,
 		});
 	} catch (e) {
-		Logger.getInstance().error(
-			`Failed to sync locally updated file ${filePath}: ${e}`
-		);
+		history.addHistoryEntry({
+			status: SyncStatus.ERROR,
+			relativePath,
+			message: `Failed to reconcile locally updated file: ${e}`,
+			type: SyncType.UPDATE,
+		});
+		throw e;
 	} finally {
-		unlockDocument(filePath);
+		unlockDocument(relativePath);
 	}
 }
diff --git a/plugin/src/sync-operations/sync-remotely-updated-file.ts b/plugin/src/sync-operations/sync-remotely-updated-file.ts
index b97aea8b..4311e519 100644
--- a/plugin/src/sync-operations/sync-remotely-updated-file.ts
+++ b/plugin/src/sync-operations/sync-remotely-updated-file.ts
@@ -1,110 +1,142 @@
-import { Database } from "src/database/database";
+import type { Database } from "src/database/database";
 import { unlockDocument, waitForDocumentLock } from "./locks";
-import { SyncService } from "src/services/sync-service";
+import type { SyncService } from "src/services/sync-service";
 import * as lib from "../../../backend/sync_lib/pkg/sync_lib.js";
 import { hash } from "src/utils/hash";
-import { Logger } from "src/logger";
-import { components } from "src/services/types";
-import { FileOperations } from "src/file-operations/file-operations";
+import type { components } from "src/services/types";
+import type { FileOperations } from "src/file-operations/file-operations";
+import { Logger } from "src/tracing/logger";
+import type { SyncHistory } from "src/tracing/sync-history";
+import { SyncSource, SyncStatus, SyncType } from "src/tracing/sync-history";
 
 export async function syncRemotelyUpdatedFile({
 	database,
 	syncServer,
 	operations,
+	history,
 	remoteVersion,
 }: {
 	database: Database;
 	syncServer: SyncService;
 	operations: FileOperations;
+	history: SyncHistory;
 	remoteVersion: components["schemas"]["DocumentVersionWithoutContent"];
 }): Promise<void> {
-	Logger.getInstance().info(
+	Logger.getInstance().debug(
 		`Syncing remotely updated file ${remoteVersion.relativePath}`
 	);
-	const content = (
-		await syncServer.get({
-			documentId: remoteVersion.documentId,
-		})
-	).contentBase64;
 
-	const currentVersion = database.getDocumentByDocumentId(
-		remoteVersion.documentId
-	);
+	try {
+		const content = (
+				await syncServer.get({
+					documentId: remoteVersion.documentId,
+				})
+			).contentBase64,
+			currentVersion = database.getDocumentByDocumentId(
+				remoteVersion.documentId
+			);
 
-	if (!currentVersion) {
-		if (remoteVersion.isDeleted) {
+		if (!currentVersion) {
+			if (remoteVersion.isDeleted) {
+				history.addHistoryEntry({
+					status: SyncStatus.NO_OP,
+					source: SyncSource.PULL,
+					relativePath: remoteVersion.relativePath,
+					message: `Remotely deleted file hasn't been synced yet, so there's no need to delete it locally`,
+					type: SyncType.DELETE,
+				});
+				return;
+			}
+
+			await waitForDocumentLock(remoteVersion.relativePath);
+			try {
+				const contentBytes = lib.base64_to_bytes(content);
+				await operations.create(
+					remoteVersion.relativePath,
+					contentBytes
+				);
+				await database.setDocument({
+					documentId: remoteVersion.documentId,
+					relativePath: remoteVersion.relativePath,
+					parentVersionId: remoteVersion.vaultUpdateId,
+					hash: hash(contentBytes),
+				});
+				history.addHistoryEntry({
+					status: SyncStatus.SUCCESS,
+					source: SyncSource.PULL,
+					relativePath: remoteVersion.relativePath,
+					message: `Successfully downloaded remote file which hasn't existed locally`,
+					type: SyncType.CREATE,
+				});
+			} finally {
+				unlockDocument(remoteVersion.relativePath);
+			}
 			return;
 		}
 
-		Logger.getInstance().info(
-			`Document metadata not found for ${remoteVersion.relativePath}, it must be new`
-		);
+		const [relativePath, metadata] = currentVersion;
+		await waitForDocumentLock(relativePath);
 
-		await waitForDocumentLock(remoteVersion.relativePath);
 		try {
-			const contentBytes = lib.base64_to_bytes(content);
-			operations.create(remoteVersion.relativePath, contentBytes);
-			await database.setDocument({
-				documentId: remoteVersion.documentId,
-				relativePath: remoteVersion.relativePath,
-				parentVersionId: remoteVersion.vaultUpdateId,
-				hash: hash(contentBytes),
-			});
-		} finally {
-			unlockDocument(remoteVersion.relativePath);
-		}
-		return;
-	}
-
-	const [relativePath, metadata] = currentVersion;
-	await waitForDocumentLock(relativePath);
-
-	try {
-		if (remoteVersion.isDeleted) {
-			Logger.getInstance().info(
-				`Document ${relativePath} has been deleted remotely`
-			);
-			await operations.remove(relativePath);
-
-			if (metadata) {
+			if (remoteVersion.isDeleted) {
+				await operations.remove(relativePath);
 				await database.removeDocument(relativePath);
-			}
-		} else {
-			const currentContent = await operations.read(relativePath);
-			const currentHash = hash(currentContent);
-			if (currentHash !== metadata.hash) {
-				Logger.getInstance().info(
-					`Document ${relativePath} has been updated both remotely and locally, skipping`
-				);
-				return;
-			} else {
-				if (relativePath !== remoteVersion.relativePath) {
-					await operations.move(
-						relativePath,
-						remoteVersion.relativePath
-					);
-				}
 
-				const contentBytes = lib.base64_to_bytes(content);
-				await operations.write(
-					remoteVersion.relativePath,
-					currentContent,
-					contentBytes
-				);
-				await database.moveDocument({
-					documentId: remoteVersion.documentId,
-					oldRelativePath: relativePath,
+				history.addHistoryEntry({
+					status: SyncStatus.SUCCESS,
+					source: SyncSource.PULL,
 					relativePath: remoteVersion.relativePath,
-					parentVersionId: remoteVersion.vaultUpdateId,
-					hash: metadata.hash,
+					message: `Successfully deleted remotely deleted file locally`,
+					type: SyncType.DELETE,
 				});
+			} else {
+				const currentContent = await operations.read(relativePath),
+					currentHash = hash(currentContent);
+				if (currentHash !== metadata.hash) {
+					Logger.getInstance().info(
+						`Document ${relativePath} has been updated both remotely and locally, skipping until the event is processed`
+					);
+				} else {
+					if (relativePath !== remoteVersion.relativePath) {
+						await operations.move(
+							relativePath,
+							remoteVersion.relativePath
+						);
+					}
+
+					const contentBytes = lib.base64_to_bytes(content);
+					await operations.write(
+						remoteVersion.relativePath,
+						currentContent,
+						contentBytes
+					);
+					await database.moveDocument({
+						documentId: remoteVersion.documentId,
+						oldRelativePath: relativePath,
+						relativePath: remoteVersion.relativePath,
+						parentVersionId: remoteVersion.vaultUpdateId,
+						hash: metadata.hash,
+					});
+
+					history.addHistoryEntry({
+						status: SyncStatus.SUCCESS,
+						source: SyncSource.PULL,
+						relativePath: remoteVersion.relativePath,
+						message: `Successfully updated remotely updated file locally`,
+						type: SyncType.UPDATE,
+					});
+				}
 			}
+		} finally {
+			unlockDocument(relativePath);
 		}
 	} catch (e) {
-		Logger.getInstance().error(
-			`Failed to sync remotely updated file ${remoteVersion.relativePath}: ${e}`
-		);
-	} finally {
-		unlockDocument(relativePath);
+		history.addHistoryEntry({
+			status: SyncStatus.ERROR,
+			source: SyncSource.PULL,
+			relativePath: remoteVersion.relativePath,
+			message: `Failed to reconcile remotely updated file: ${e}`,
+		});
+		throw e;
 	}
 }

From 25044a0fef0611b67f74d7bdcb8056385b1158ef Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 20 Dec 2024 17:34:32 +0000
Subject: [PATCH 013/761] Update npm deps

---
 plugin/package-lock.json | 1015 ++++++++++++++++++++++++++++++++++++++
 plugin/package.json      |    7 +-
 plugin/tsconfig.json     |    4 +-
 3 files changed, 1023 insertions(+), 3 deletions(-)

diff --git a/plugin/package-lock.json b/plugin/package-lock.json
index 54d24aac..688b8c48 100644
--- a/plugin/package-lock.json
+++ b/plugin/package-lock.json
@@ -11,8 +11,11 @@
 			"devDependencies": {
 				"@types/node": "^16.11.6",
 				"builtin-modules": "3.3.0",
+				"date-fns": "^4.1.0",
+				"dayjs": "^1.11.13",
 				"esbuild": "0.24.0",
 				"esbuild-plugin-wasm-pack": "^1.1.0",
+				"esbuild-sass-plugin": "^3.3.1",
 				"eslint": "9.17.0",
 				"eslint-plugin-unused-imports": "^4.1.4",
 				"obsidian": "1.7.2",
@@ -49,6 +52,14 @@
 				"node": ">=6.9.0"
 			}
 		},
+		"node_modules/@bufbuild/protobuf": {
+			"version": "2.2.3",
+			"resolved": "https://registry.npmjs.org/@bufbuild/protobuf/-/protobuf-2.2.3.tgz",
+			"integrity": "sha512-tFQoXHJdkEOSwj5tRIZSPNUuXK3RaR7T1nUrPgbYX1pUbvqqaaZAsfo+NXBPsz5rZMSKVFrgK1WL8Q/MSLvprg==",
+			"dev": true,
+			"license": "(Apache-2.0 AND BSD-3-Clause)",
+			"peer": true
+		},
 		"node_modules/@codemirror/state": {
 			"version": "6.5.0",
 			"resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.5.0.tgz",
@@ -707,6 +718,316 @@
 				"node": ">= 8"
 			}
 		},
+		"node_modules/@parcel/watcher": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.0.tgz",
+			"integrity": "sha512-i0GV1yJnm2n3Yq1qw6QrUrd/LI9bE8WEBOTtOkpCXHHdyN3TAGgqAK/DAT05z4fq2x04cARXt2pDmjWjL92iTQ==",
+			"dev": true,
+			"hasInstallScript": true,
+			"license": "MIT",
+			"optional": true,
+			"dependencies": {
+				"detect-libc": "^1.0.3",
+				"is-glob": "^4.0.3",
+				"micromatch": "^4.0.5",
+				"node-addon-api": "^7.0.0"
+			},
+			"engines": {
+				"node": ">= 10.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/parcel"
+			},
+			"optionalDependencies": {
+				"@parcel/watcher-android-arm64": "2.5.0",
+				"@parcel/watcher-darwin-arm64": "2.5.0",
+				"@parcel/watcher-darwin-x64": "2.5.0",
+				"@parcel/watcher-freebsd-x64": "2.5.0",
+				"@parcel/watcher-linux-arm-glibc": "2.5.0",
+				"@parcel/watcher-linux-arm-musl": "2.5.0",
+				"@parcel/watcher-linux-arm64-glibc": "2.5.0",
+				"@parcel/watcher-linux-arm64-musl": "2.5.0",
+				"@parcel/watcher-linux-x64-glibc": "2.5.0",
+				"@parcel/watcher-linux-x64-musl": "2.5.0",
+				"@parcel/watcher-win32-arm64": "2.5.0",
+				"@parcel/watcher-win32-ia32": "2.5.0",
+				"@parcel/watcher-win32-x64": "2.5.0"
+			}
+		},
+		"node_modules/@parcel/watcher-android-arm64": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.0.tgz",
+			"integrity": "sha512-qlX4eS28bUcQCdribHkg/herLe+0A9RyYC+mm2PXpncit8z5b3nSqGVzMNR3CmtAOgRutiZ02eIJJgP/b1iEFQ==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"android"
+			],
+			"engines": {
+				"node": ">= 10.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/parcel"
+			}
+		},
+		"node_modules/@parcel/watcher-darwin-arm64": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.0.tgz",
+			"integrity": "sha512-hyZ3TANnzGfLpRA2s/4U1kbw2ZI4qGxaRJbBH2DCSREFfubMswheh8TeiC1sGZ3z2jUf3s37P0BBlrD3sjVTUw==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"darwin"
+			],
+			"engines": {
+				"node": ">= 10.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/parcel"
+			}
+		},
+		"node_modules/@parcel/watcher-darwin-x64": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.0.tgz",
+			"integrity": "sha512-9rhlwd78saKf18fT869/poydQK8YqlU26TMiNg7AIu7eBp9adqbJZqmdFOsbZ5cnLp5XvRo9wcFmNHgHdWaGYA==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"darwin"
+			],
+			"engines": {
+				"node": ">= 10.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/parcel"
+			}
+		},
+		"node_modules/@parcel/watcher-freebsd-x64": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.0.tgz",
+			"integrity": "sha512-syvfhZzyM8kErg3VF0xpV8dixJ+RzbUaaGaeb7uDuz0D3FK97/mZ5AJQ3XNnDsXX7KkFNtyQyFrXZzQIcN49Tw==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"freebsd"
+			],
+			"engines": {
+				"node": ">= 10.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/parcel"
+			}
+		},
+		"node_modules/@parcel/watcher-linux-arm-glibc": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.0.tgz",
+			"integrity": "sha512-0VQY1K35DQET3dVYWpOaPFecqOT9dbuCfzjxoQyif1Wc574t3kOSkKevULddcR9znz1TcklCE7Ht6NIxjvTqLA==",
+			"cpu": [
+				"arm"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">= 10.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/parcel"
+			}
+		},
+		"node_modules/@parcel/watcher-linux-arm-musl": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.0.tgz",
+			"integrity": "sha512-6uHywSIzz8+vi2lAzFeltnYbdHsDm3iIB57d4g5oaB9vKwjb6N6dRIgZMujw4nm5r6v9/BQH0noq6DzHrqr2pA==",
+			"cpu": [
+				"arm"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">= 10.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/parcel"
+			}
+		},
+		"node_modules/@parcel/watcher-linux-arm64-glibc": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.0.tgz",
+			"integrity": "sha512-BfNjXwZKxBy4WibDb/LDCriWSKLz+jJRL3cM/DllnHH5QUyoiUNEp3GmL80ZqxeumoADfCCP19+qiYiC8gUBjA==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">= 10.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/parcel"
+			}
+		},
+		"node_modules/@parcel/watcher-linux-arm64-musl": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.0.tgz",
+			"integrity": "sha512-S1qARKOphxfiBEkwLUbHjCY9BWPdWnW9j7f7Hb2jPplu8UZ3nes7zpPOW9bkLbHRvWM0WDTsjdOTUgW0xLBN1Q==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">= 10.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/parcel"
+			}
+		},
+		"node_modules/@parcel/watcher-linux-x64-glibc": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.0.tgz",
+			"integrity": "sha512-d9AOkusyXARkFD66S6zlGXyzx5RvY+chTP9Jp0ypSTC9d4lzyRs9ovGf/80VCxjKddcUvnsGwCHWuF2EoPgWjw==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">= 10.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/parcel"
+			}
+		},
+		"node_modules/@parcel/watcher-linux-x64-musl": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.0.tgz",
+			"integrity": "sha512-iqOC+GoTDoFyk/VYSFHwjHhYrk8bljW6zOhPuhi5t9ulqiYq1togGJB5e3PwYVFFfeVgc6pbz3JdQyDoBszVaA==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">= 10.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/parcel"
+			}
+		},
+		"node_modules/@parcel/watcher-win32-arm64": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.0.tgz",
+			"integrity": "sha512-twtft1d+JRNkM5YbmexfcH/N4znDtjgysFaV9zvZmmJezQsKpkfLYJ+JFV3uygugK6AtIM2oADPkB2AdhBrNig==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"win32"
+			],
+			"engines": {
+				"node": ">= 10.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/parcel"
+			}
+		},
+		"node_modules/@parcel/watcher-win32-ia32": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.0.tgz",
+			"integrity": "sha512-+rgpsNRKwo8A53elqbbHXdOMtY/tAtTzManTWShB5Kk54N8Q9mzNWV7tV+IbGueCbcj826MfWGU3mprWtuf1TA==",
+			"cpu": [
+				"ia32"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"win32"
+			],
+			"engines": {
+				"node": ">= 10.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/parcel"
+			}
+		},
+		"node_modules/@parcel/watcher-win32-x64": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.0.tgz",
+			"integrity": "sha512-lPrxve92zEHdgeff3aiu4gDOIt4u7sJYha6wbdEZDCDUhtjTsOMiaJzG5lMY4GkWH8p0fMmO2Ppq5G5XXG+DQw==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"win32"
+			],
+			"engines": {
+				"node": ">= 10.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/parcel"
+			}
+		},
 		"node_modules/@redocly/ajv": {
 			"version": "8.11.2",
 			"resolved": "https://registry.npmjs.org/@redocly/ajv/-/ajv-8.11.2.tgz",
@@ -1159,6 +1480,14 @@
 				"node": ">=8"
 			}
 		},
+		"node_modules/buffer-builder": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/buffer-builder/-/buffer-builder-0.2.0.tgz",
+			"integrity": "sha512-7VPMEPuYznPSoR21NE1zvd2Xna6c/CloiZCfcMXR1Jny6PjX0N4Nsa38zcBFo/FMK+BlA+FLKbJCQ0i2yxp+Xg==",
+			"dev": true,
+			"license": "MIT/X11",
+			"peer": true
+		},
 		"node_modules/builtin-modules": {
 			"version": "3.3.0",
 			"resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz",
@@ -1206,6 +1535,22 @@
 			"dev": true,
 			"license": "MIT"
 		},
+		"node_modules/chokidar": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
+			"integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"readdirp": "^4.0.1"
+			},
+			"engines": {
+				"node": ">= 14.16.0"
+			},
+			"funding": {
+				"url": "https://paulmillr.com/funding/"
+			}
+		},
 		"node_modules/color-convert": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -1233,6 +1578,14 @@
 			"dev": true,
 			"license": "MIT"
 		},
+		"node_modules/colorjs.io": {
+			"version": "0.5.2",
+			"resolved": "https://registry.npmjs.org/colorjs.io/-/colorjs.io-0.5.2.tgz",
+			"integrity": "sha512-twmVoizEW7ylZSN32OgKdXRmo1qg+wT5/6C3xu5b9QsWzSFAhHLn2xd8ro0diCsKfCj1RdaTP/nrcW+vAoQPIw==",
+			"dev": true,
+			"license": "MIT",
+			"peer": true
+		},
 		"node_modules/concat-map": {
 			"version": "0.0.1",
 			"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -1255,6 +1608,24 @@
 				"node": ">= 8"
 			}
 		},
+		"node_modules/date-fns": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-4.1.0.tgz",
+			"integrity": "sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==",
+			"dev": true,
+			"license": "MIT",
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/kossnocorp"
+			}
+		},
+		"node_modules/dayjs": {
+			"version": "1.11.13",
+			"resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz",
+			"integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==",
+			"dev": true,
+			"license": "MIT"
+		},
 		"node_modules/debug": {
 			"version": "4.4.0",
 			"resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
@@ -1280,6 +1651,20 @@
 			"dev": true,
 			"license": "MIT"
 		},
+		"node_modules/detect-libc": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+			"integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
+			"dev": true,
+			"license": "Apache-2.0",
+			"optional": true,
+			"bin": {
+				"detect-libc": "bin/detect-libc.js"
+			},
+			"engines": {
+				"node": ">=0.10"
+			}
+		},
 		"node_modules/esbuild": {
 			"version": "0.24.0",
 			"resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.24.0.tgz",
@@ -1334,6 +1719,22 @@
 				"url": "https://ko-fi.com/tschrock"
 			}
 		},
+		"node_modules/esbuild-sass-plugin": {
+			"version": "3.3.1",
+			"resolved": "https://registry.npmjs.org/esbuild-sass-plugin/-/esbuild-sass-plugin-3.3.1.tgz",
+			"integrity": "sha512-SnO1ls+d52n6j8gRRpjexXI8MsHEaumS0IdDHaYM29Y6gakzZYMls6i9ql9+AWMSQk/eryndmUpXEgT34QrX1A==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"resolve": "^1.22.8",
+				"safe-identifier": "^0.4.2",
+				"sass": "^1.71.1"
+			},
+			"peerDependencies": {
+				"esbuild": ">=0.20.1",
+				"sass-embedded": "^1.71.1"
+			}
+		},
 		"node_modules/escape-string-regexp": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
@@ -1675,6 +2076,16 @@
 			"dev": true,
 			"license": "ISC"
 		},
+		"node_modules/function-bind": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+			"integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+			"dev": true,
+			"license": "MIT",
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
 		"node_modules/glob-parent": {
 			"version": "6.0.2",
 			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
@@ -1718,6 +2129,19 @@
 				"node": ">=8"
 			}
 		},
+		"node_modules/hasown": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+			"integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"function-bind": "^1.1.2"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
 		"node_modules/https-proxy-agent": {
 			"version": "7.0.6",
 			"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
@@ -1742,6 +2166,13 @@
 				"node": ">= 4"
 			}
 		},
+		"node_modules/immutable": {
+			"version": "5.0.3",
+			"resolved": "https://registry.npmjs.org/immutable/-/immutable-5.0.3.tgz",
+			"integrity": "sha512-P8IdPQHq3lA1xVeBRi5VPqUm5HDgKnx0Ru51wZz5mjxHr5n3RWhjIpOFU7ybkUxfB+5IToy+OLaHYDBIWsv+uw==",
+			"dev": true,
+			"license": "MIT"
+		},
 		"node_modules/import-fresh": {
 			"version": "3.3.0",
 			"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
@@ -1782,6 +2213,22 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
+		"node_modules/is-core-module": {
+			"version": "2.16.0",
+			"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.0.tgz",
+			"integrity": "sha512-urTSINYfAYgcbLb0yDQ6egFm6h3Mo1DcF9EkyXSRjjzdHbsulg01qhwWuXdOoUBuTkbQ80KDboXa0vFJ+BDH+g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"hasown": "^2.0.2"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
 		"node_modules/is-extglob": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
@@ -1988,6 +2435,14 @@
 			"dev": true,
 			"license": "MIT"
 		},
+		"node_modules/node-addon-api": {
+			"version": "7.1.1",
+			"resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz",
+			"integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==",
+			"dev": true,
+			"license": "MIT",
+			"optional": true
+		},
 		"node_modules/node-fetch": {
 			"version": "2.7.0",
 			"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
@@ -2219,6 +2674,13 @@
 				"node": ">=8"
 			}
 		},
+		"node_modules/path-parse": {
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+			"integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+			"dev": true,
+			"license": "MIT"
+		},
 		"node_modules/picocolors": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
@@ -2290,6 +2752,20 @@
 			],
 			"license": "MIT"
 		},
+		"node_modules/readdirp": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.0.2.tgz",
+			"integrity": "sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 14.16.0"
+			},
+			"funding": {
+				"type": "individual",
+				"url": "https://paulmillr.com/funding/"
+			}
+		},
 		"node_modules/require-from-string": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
@@ -2300,6 +2776,27 @@
 				"node": ">=0.10.0"
 			}
 		},
+		"node_modules/resolve": {
+			"version": "1.22.10",
+			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz",
+			"integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"is-core-module": "^2.16.0",
+				"path-parse": "^1.0.7",
+				"supports-preserve-symlinks-flag": "^1.0.0"
+			},
+			"bin": {
+				"resolve": "bin/resolve"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
 		"node_modules/resolve-from": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
@@ -2345,6 +2842,468 @@
 				"queue-microtask": "^1.2.2"
 			}
 		},
+		"node_modules/rxjs": {
+			"version": "7.8.1",
+			"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
+			"integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
+			"dev": true,
+			"license": "Apache-2.0",
+			"peer": true,
+			"dependencies": {
+				"tslib": "^2.1.0"
+			}
+		},
+		"node_modules/safe-identifier": {
+			"version": "0.4.2",
+			"resolved": "https://registry.npmjs.org/safe-identifier/-/safe-identifier-0.4.2.tgz",
+			"integrity": "sha512-6pNbSMW6OhAi9j+N8V+U715yBQsaWJ7eyEUaOrawX+isg5ZxhUlV1NipNtgaKHmFGiABwt+ZF04Ii+3Xjkg+8w==",
+			"dev": true,
+			"license": "ISC"
+		},
+		"node_modules/sass": {
+			"version": "1.83.0",
+			"resolved": "https://registry.npmjs.org/sass/-/sass-1.83.0.tgz",
+			"integrity": "sha512-qsSxlayzoOjdvXMVLkzF84DJFc2HZEL/rFyGIKbbilYtAvlCxyuzUeff9LawTn4btVnLKg75Z8MMr1lxU1lfGw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"chokidar": "^4.0.0",
+				"immutable": "^5.0.2",
+				"source-map-js": ">=0.6.2 <2.0.0"
+			},
+			"bin": {
+				"sass": "sass.js"
+			},
+			"engines": {
+				"node": ">=14.0.0"
+			},
+			"optionalDependencies": {
+				"@parcel/watcher": "^2.4.1"
+			}
+		},
+		"node_modules/sass-embedded": {
+			"version": "1.83.0",
+			"resolved": "https://registry.npmjs.org/sass-embedded/-/sass-embedded-1.83.0.tgz",
+			"integrity": "sha512-/8cYZeL39evUqe0o//193na51Q1VWZ61qhxioQvLJwOtWIrX+PgNhCyD8RSuTtmzc4+6+waFZf899bfp/MCUwA==",
+			"dev": true,
+			"license": "MIT",
+			"peer": true,
+			"dependencies": {
+				"@bufbuild/protobuf": "^2.0.0",
+				"buffer-builder": "^0.2.0",
+				"colorjs.io": "^0.5.0",
+				"immutable": "^5.0.2",
+				"rxjs": "^7.4.0",
+				"supports-color": "^8.1.1",
+				"sync-child-process": "^1.0.2",
+				"varint": "^6.0.0"
+			},
+			"bin": {
+				"sass": "dist/bin/sass.js"
+			},
+			"engines": {
+				"node": ">=16.0.0"
+			},
+			"optionalDependencies": {
+				"sass-embedded-android-arm": "1.83.0",
+				"sass-embedded-android-arm64": "1.83.0",
+				"sass-embedded-android-ia32": "1.83.0",
+				"sass-embedded-android-riscv64": "1.83.0",
+				"sass-embedded-android-x64": "1.83.0",
+				"sass-embedded-darwin-arm64": "1.83.0",
+				"sass-embedded-darwin-x64": "1.83.0",
+				"sass-embedded-linux-arm": "1.83.0",
+				"sass-embedded-linux-arm64": "1.83.0",
+				"sass-embedded-linux-ia32": "1.83.0",
+				"sass-embedded-linux-musl-arm": "1.83.0",
+				"sass-embedded-linux-musl-arm64": "1.83.0",
+				"sass-embedded-linux-musl-ia32": "1.83.0",
+				"sass-embedded-linux-musl-riscv64": "1.83.0",
+				"sass-embedded-linux-musl-x64": "1.83.0",
+				"sass-embedded-linux-riscv64": "1.83.0",
+				"sass-embedded-linux-x64": "1.83.0",
+				"sass-embedded-win32-arm64": "1.83.0",
+				"sass-embedded-win32-ia32": "1.83.0",
+				"sass-embedded-win32-x64": "1.83.0"
+			}
+		},
+		"node_modules/sass-embedded-android-arm": {
+			"version": "1.83.0",
+			"resolved": "https://registry.npmjs.org/sass-embedded-android-arm/-/sass-embedded-android-arm-1.83.0.tgz",
+			"integrity": "sha512-uwFSXzJlfbd4Px189xE5l+cxN8+TQpXdQgJec7TIrb4HEY7imabtpYufpVdqUVwT1/uiis5V4+qIEC4Vl5XObQ==",
+			"cpu": [
+				"arm"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"android"
+			],
+			"peer": true,
+			"engines": {
+				"node": ">=14.0.0"
+			}
+		},
+		"node_modules/sass-embedded-android-arm64": {
+			"version": "1.83.0",
+			"resolved": "https://registry.npmjs.org/sass-embedded-android-arm64/-/sass-embedded-android-arm64-1.83.0.tgz",
+			"integrity": "sha512-GBiCvM4a2rkWBLdYDxI6XYnprfk5U5c81g69RC2X6kqPuzxzx8qTArQ9M6keFK4+iDQ5N9QTwFCr0KbZTn+ZNQ==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"android"
+			],
+			"peer": true,
+			"engines": {
+				"node": ">=14.0.0"
+			}
+		},
+		"node_modules/sass-embedded-android-ia32": {
+			"version": "1.83.0",
+			"resolved": "https://registry.npmjs.org/sass-embedded-android-ia32/-/sass-embedded-android-ia32-1.83.0.tgz",
+			"integrity": "sha512-5ATPdGo2SICqAhiJl/Z8KQ23zH4sGgobGgux0TnrNtt83uHZ+r+To/ubVJ7xTkZxed+KJZnIpolGD8dQyQqoTg==",
+			"cpu": [
+				"ia32"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"android"
+			],
+			"peer": true,
+			"engines": {
+				"node": ">=14.0.0"
+			}
+		},
+		"node_modules/sass-embedded-android-riscv64": {
+			"version": "1.83.0",
+			"resolved": "https://registry.npmjs.org/sass-embedded-android-riscv64/-/sass-embedded-android-riscv64-1.83.0.tgz",
+			"integrity": "sha512-aveknUOB8GZewOzVn2Uwk+DKcncTR50Q6vtzslNMGbYnxtgQNHzy8A1qVEviNUruex+pHofppeMK4iMPFAbiEQ==",
+			"cpu": [
+				"riscv64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"android"
+			],
+			"peer": true,
+			"engines": {
+				"node": ">=14.0.0"
+			}
+		},
+		"node_modules/sass-embedded-android-x64": {
+			"version": "1.83.0",
+			"resolved": "https://registry.npmjs.org/sass-embedded-android-x64/-/sass-embedded-android-x64-1.83.0.tgz",
+			"integrity": "sha512-WqIay/72ncyf9Ph4vS742J3a73wZihWmzFUwpn1OD6lme1Aj4eWzWIve5IVnlTEJgcZcDHu6ECID9IZgehJKoA==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"android"
+			],
+			"peer": true,
+			"engines": {
+				"node": ">=14.0.0"
+			}
+		},
+		"node_modules/sass-embedded-darwin-arm64": {
+			"version": "1.83.0",
+			"resolved": "https://registry.npmjs.org/sass-embedded-darwin-arm64/-/sass-embedded-darwin-arm64-1.83.0.tgz",
+			"integrity": "sha512-XQl9QqgxFFIPm/CzHhmppse5o9ocxrbaAdC2/DAnlAqvYWBBtgFqPjGoYlej13h9SzfvNoogx+y9r+Ap+e+hYg==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"darwin"
+			],
+			"peer": true,
+			"engines": {
+				"node": ">=14.0.0"
+			}
+		},
+		"node_modules/sass-embedded-darwin-x64": {
+			"version": "1.83.0",
+			"resolved": "https://registry.npmjs.org/sass-embedded-darwin-x64/-/sass-embedded-darwin-x64-1.83.0.tgz",
+			"integrity": "sha512-ERQ7Tvp1kFOW3ux4VDFIxb7tkYXHYc+zJpcrbs0hzcIO5ilIRU2tIOK1OrNwrFO6Qxyf7AUuBwYKLAtIU/Nz7g==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"darwin"
+			],
+			"peer": true,
+			"engines": {
+				"node": ">=14.0.0"
+			}
+		},
+		"node_modules/sass-embedded-linux-arm": {
+			"version": "1.83.0",
+			"resolved": "https://registry.npmjs.org/sass-embedded-linux-arm/-/sass-embedded-linux-arm-1.83.0.tgz",
+			"integrity": "sha512-baG9RYBJxUFmqwDNC9h9ZFElgJoyO3jgHGjzEZ1wHhIS9anpG+zZQvO8bHx3dBpKEImX+DBeLX+CxsFR9n81gQ==",
+			"cpu": [
+				"arm"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"peer": true,
+			"engines": {
+				"node": ">=14.0.0"
+			}
+		},
+		"node_modules/sass-embedded-linux-arm64": {
+			"version": "1.83.0",
+			"resolved": "https://registry.npmjs.org/sass-embedded-linux-arm64/-/sass-embedded-linux-arm64-1.83.0.tgz",
+			"integrity": "sha512-syEAVTJt4qhaMLxrSwOWa46zdqHJdnqJkLUK+t9aCr8xqBZLPxSUeIGji76uOehQZ1C+KGFj6n9xstHN6wzOJw==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"peer": true,
+			"engines": {
+				"node": ">=14.0.0"
+			}
+		},
+		"node_modules/sass-embedded-linux-ia32": {
+			"version": "1.83.0",
+			"resolved": "https://registry.npmjs.org/sass-embedded-linux-ia32/-/sass-embedded-linux-ia32-1.83.0.tgz",
+			"integrity": "sha512-RRBxQxMpoxu5+XcSSc6QR/o9asEwUzR8AbCS83RaXcdTIHTa/CccQsiAoDDoPlRsMTLqnzs0LKL4CfOsf7zBbA==",
+			"cpu": [
+				"ia32"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"peer": true,
+			"engines": {
+				"node": ">=14.0.0"
+			}
+		},
+		"node_modules/sass-embedded-linux-musl-arm": {
+			"version": "1.83.0",
+			"resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-arm/-/sass-embedded-linux-musl-arm-1.83.0.tgz",
+			"integrity": "sha512-Yc7u2TelCfBab+PRob9/MNJFh3EooMiz4urvhejXkihTiKSHGCv5YqDdtWzvyb9tY2Jb7YtYREVuHwfdVn3dTQ==",
+			"cpu": [
+				"arm"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"peer": true,
+			"engines": {
+				"node": ">=14.0.0"
+			}
+		},
+		"node_modules/sass-embedded-linux-musl-arm64": {
+			"version": "1.83.0",
+			"resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-arm64/-/sass-embedded-linux-musl-arm64-1.83.0.tgz",
+			"integrity": "sha512-Y7juhPHClUO2H5O+u+StRy6SEAcwZ+hTEk5WJdEmo1Bb1gDtfHvJaWB/iFZJ2tW0W1e865AZeUrC4OcOFjyAQA==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"peer": true,
+			"engines": {
+				"node": ">=14.0.0"
+			}
+		},
+		"node_modules/sass-embedded-linux-musl-ia32": {
+			"version": "1.83.0",
+			"resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-ia32/-/sass-embedded-linux-musl-ia32-1.83.0.tgz",
+			"integrity": "sha512-arQeYwGmwXV8byx5G1PtSzZWW1jbkfR5qrIHMEbTFSAvAxpqjgSvCvrHMOFd73FcMxVaYh4BX9LQNbKinkbEdg==",
+			"cpu": [
+				"ia32"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"peer": true,
+			"engines": {
+				"node": ">=14.0.0"
+			}
+		},
+		"node_modules/sass-embedded-linux-musl-riscv64": {
+			"version": "1.83.0",
+			"resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-riscv64/-/sass-embedded-linux-musl-riscv64-1.83.0.tgz",
+			"integrity": "sha512-E6uzlIWz59rut+Z3XR6mLG915zNzv07ISvj3GUNZENdHM7dF8GQ//ANoIpl5PljMQKp89GnYdvo6kj2gnaBf/g==",
+			"cpu": [
+				"riscv64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"peer": true,
+			"engines": {
+				"node": ">=14.0.0"
+			}
+		},
+		"node_modules/sass-embedded-linux-musl-x64": {
+			"version": "1.83.0",
+			"resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-x64/-/sass-embedded-linux-musl-x64-1.83.0.tgz",
+			"integrity": "sha512-eAMK6tyGqvqr21r9g8BnR3fQc1rYFj85RGduSQ3xkITZ6jOAnOhuU94N5fwRS852Hpws0lXhET+7JHXgg3U18w==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"peer": true,
+			"engines": {
+				"node": ">=14.0.0"
+			}
+		},
+		"node_modules/sass-embedded-linux-riscv64": {
+			"version": "1.83.0",
+			"resolved": "https://registry.npmjs.org/sass-embedded-linux-riscv64/-/sass-embedded-linux-riscv64-1.83.0.tgz",
+			"integrity": "sha512-Ojpi78pTv02sy2fUYirRGXHLY3fPnV/bvwuC2i5LwPQw2LpCcFyFTtN0c5h4LJDk9P6wr+/ZB/JXU8tHIOlK+Q==",
+			"cpu": [
+				"riscv64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"peer": true,
+			"engines": {
+				"node": ">=14.0.0"
+			}
+		},
+		"node_modules/sass-embedded-linux-x64": {
+			"version": "1.83.0",
+			"resolved": "https://registry.npmjs.org/sass-embedded-linux-x64/-/sass-embedded-linux-x64-1.83.0.tgz",
+			"integrity": "sha512-3iLjlXdoPfgZRtX4odhRvka1BQs5mAXqfCtDIQBgh/o0JnGPzJIWWl9bYLpHxK8qb+uyVBxXYgXpI0sCzArBOw==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"peer": true,
+			"engines": {
+				"node": ">=14.0.0"
+			}
+		},
+		"node_modules/sass-embedded-win32-arm64": {
+			"version": "1.83.0",
+			"resolved": "https://registry.npmjs.org/sass-embedded-win32-arm64/-/sass-embedded-win32-arm64-1.83.0.tgz",
+			"integrity": "sha512-iOHw/8/t2dlTW3lOFwG5eUbiwhEyGWawivlKWJ8lkXH7fjMpVx2VO9zCFAm8RvY9xOHJ9sf1L7g5bx3EnNP9BQ==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"win32"
+			],
+			"peer": true,
+			"engines": {
+				"node": ">=14.0.0"
+			}
+		},
+		"node_modules/sass-embedded-win32-ia32": {
+			"version": "1.83.0",
+			"resolved": "https://registry.npmjs.org/sass-embedded-win32-ia32/-/sass-embedded-win32-ia32-1.83.0.tgz",
+			"integrity": "sha512-2PxNXJ8Pad4geVcTXY4rkyTr5AwbF8nfrCTDv0ulbTvPhzX2mMKEGcBZUXWn5BeHZTBc6whNMfS7d5fQXR9dDQ==",
+			"cpu": [
+				"ia32"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"win32"
+			],
+			"peer": true,
+			"engines": {
+				"node": ">=14.0.0"
+			}
+		},
+		"node_modules/sass-embedded-win32-x64": {
+			"version": "1.83.0",
+			"resolved": "https://registry.npmjs.org/sass-embedded-win32-x64/-/sass-embedded-win32-x64-1.83.0.tgz",
+			"integrity": "sha512-muBXkFngM6eLTNqOV0FQi7Dv9s+YRQ42Yem26mosdan/GmJQc81deto6uDTgrYn+bzFNmiXcOdfm+0MkTWK3OQ==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"win32"
+			],
+			"peer": true,
+			"engines": {
+				"node": ">=14.0.0"
+			}
+		},
+		"node_modules/sass-embedded/node_modules/supports-color": {
+			"version": "8.1.1",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+			"integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+			"dev": true,
+			"license": "MIT",
+			"peer": true,
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/supports-color?sponsor=1"
+			}
+		},
 		"node_modules/semver": {
 			"version": "7.6.3",
 			"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
@@ -2381,6 +3340,16 @@
 				"node": ">=8"
 			}
 		},
+		"node_modules/source-map-js": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
+			"integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
+			"dev": true,
+			"license": "BSD-3-Clause",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
 		"node_modules/strip-json-comments": {
 			"version": "3.1.1",
 			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
@@ -2415,6 +3384,44 @@
 				"node": ">=8"
 			}
 		},
+		"node_modules/supports-preserve-symlinks-flag": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+			"integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/sync-child-process": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/sync-child-process/-/sync-child-process-1.0.2.tgz",
+			"integrity": "sha512-8lD+t2KrrScJ/7KXCSyfhT3/hRq78rC0wBFqNJXv3mZyn6hW2ypM05JmlSvtqRbeq6jqA94oHbxAr2vYsJ8vDA==",
+			"dev": true,
+			"license": "MIT",
+			"peer": true,
+			"dependencies": {
+				"sync-message-port": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=16.0.0"
+			}
+		},
+		"node_modules/sync-message-port": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/sync-message-port/-/sync-message-port-1.1.3.tgz",
+			"integrity": "sha512-GTt8rSKje5FilG+wEdfCkOcLL7LWqpMlr2c3LRuKt/YXxcJ52aGSbGBAdI4L3aaqfrBt6y711El53ItyH1NWzg==",
+			"dev": true,
+			"license": "MIT",
+			"peer": true,
+			"engines": {
+				"node": ">=16.0.0"
+			}
+		},
 		"node_modules/to-regex-range": {
 			"version": "5.0.1",
 			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -2522,6 +3529,14 @@
 			"dev": true,
 			"license": "MIT"
 		},
+		"node_modules/varint": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/varint/-/varint-6.0.0.tgz",
+			"integrity": "sha512-cXEIW6cfr15lFv563k4GuVuW/fiwjknytD37jIOLSdSWuOI6WnO/oKwmP2FQTU2l01LP8/M5TSAJpzUaGe3uWg==",
+			"dev": true,
+			"license": "MIT",
+			"peer": true
+		},
 		"node_modules/w3c-keyname": {
 			"version": "2.2.8",
 			"resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.8.tgz",
diff --git a/plugin/package.json b/plugin/package.json
index 585cd430..925da084 100644
--- a/plugin/package.json
+++ b/plugin/package.json
@@ -14,8 +14,9 @@
 	"license": "MIT",
 	"devDependencies": {
 		"@types/node": "^16.11.6",
-		"typescript-eslint": "8.18.0",
 		"builtin-modules": "3.3.0",
+		"date-fns": "^4.1.0",
+		"dayjs": "^1.11.13",
 		"esbuild": "0.24.0",
 		"esbuild-plugin-wasm-pack": "^1.1.0",
 		"eslint": "9.17.0",
@@ -23,8 +24,10 @@
 		"obsidian": "1.7.2",
 		"openapi-fetch": "0.13.3",
 		"openapi-typescript": "7.4.4",
+		"p-queue": "^8.0.1",
 		"tslib": "2.4.0",
 		"typescript": "5.7.2",
-		"p-queue": "^8.0.1"
+		"typescript-eslint": "8.18.0",
+		"esbuild-sass-plugin": "^3.3.1"
 	}
 }
\ No newline at end of file
diff --git a/plugin/tsconfig.json b/plugin/tsconfig.json
index c44b7297..04150bda 100644
--- a/plugin/tsconfig.json
+++ b/plugin/tsconfig.json
@@ -11,6 +11,8 @@
     "importHelpers": true,
     "isolatedModules": true,
     "strictNullChecks": true,
+    "esModuleInterop": true,
+    "allowSyntheticDefaultImports": true,
     "lib": [
       "DOM",
       "ES5",
@@ -21,4 +23,4 @@
   "include": [
     "**/*.ts"
   ]
-}
+}
\ No newline at end of file

From 5dd6a655ccca73df0eaa8eb5f7163e4656cfdae4 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 20 Dec 2024 17:34:39 +0000
Subject: [PATCH 014/761] Add SCSS

---
 plugin/esbuild.config.mjs | 28 +++++++++++-------------
 plugin/src/styles.css     |  4 ----
 plugin/src/styles.scss    | 45 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 58 insertions(+), 19 deletions(-)
 delete mode 100644 plugin/src/styles.css
 create mode 100644 plugin/src/styles.scss

diff --git a/plugin/esbuild.config.mjs b/plugin/esbuild.config.mjs
index 8a802f93..609e537e 100644
--- a/plugin/esbuild.config.mjs
+++ b/plugin/esbuild.config.mjs
@@ -1,6 +1,7 @@
 import esbuild from "esbuild";
 import process from "process";
 import builtins from "builtin-modules";
+import { sassPlugin } from "esbuild-sass-plugin";
 import path from "node:path";
 import fs from "node:fs";
 import { wasmPack } from "esbuild-plugin-wasm-pack";
@@ -70,48 +71,45 @@ let wasmPlugin = {
 	},
 };
 
-const copyBundle = {
+const copyBundle = () => ({
 	name: "post-compile",
 	setup(build) {
-		build.onEnd(async (result) => {
+		build.onEnd((result) => {
 			if (prod) {
-				await fs.promises.copyFile(
-					"manifest.json",
-					"build/manifest.json"
-				);
+				fs.promises.copyFile("manifest.json", "build/manifest.json");
 				return;
 			}
 
 			if (result.errors.length === 0) {
-				await copyFiles(
+				copyFiles(
 					["manifest.json", ".hotreload"],
 					"/mnt/c/Users/Andras/Desktop/test/test/.obsidian/plugins/my-plugin"
 				);
 
-				await copyFiles(
+				copyFiles(
 					"build",
 					"/mnt/c/Users/Andras/Desktop/test/test/.obsidian/plugins/my-plugin"
 				);
 
-				await copyFiles(
+				copyFiles(
 					["manifest.json", ".hotreload"],
 					"/mnt/c/Users/Andras/Desktop/test/test2/.obsidian/plugins/my-plugin"
 				);
 
-				await copyFiles(
+				copyFiles(
 					"build",
 					"/mnt/c/Users/Andras/Desktop/test/test2/.obsidian/plugins/my-plugin"
 				);
 			}
 		});
 	},
-};
+});
 
 const cssContext = await esbuild.context({
-	entryPoints: ["src/styles.css"],
+	entryPoints: ["src/styles.scss"],
 	bundle: true,
 	outfile: "build/styles.css",
-	plugins: [copyBundle],
+	plugins: [sassPlugin(), copyBundle()],
 });
 
 const jsContext = await esbuild.context({
@@ -143,13 +141,13 @@ const jsContext = await esbuild.context({
 	minify: prod,
 	plugins: [
 		wasmPlugin,
-		prod
+		true
 			? null
 			: wasmPack({
 					target: "web",
 					path: "../backend/sync_lib",
 			  }),
-		copyBundle,
+		copyBundle(),
 	].filter(Boolean),
 });
 
diff --git a/plugin/src/styles.css b/plugin/src/styles.css
deleted file mode 100644
index 7afc4b12..00000000
--- a/plugin/src/styles.css
+++ /dev/null
@@ -1,4 +0,0 @@
-.sync-settings-access-token textarea {
-    width: 100%;
-    height: 100px;
-}
diff --git a/plugin/src/styles.scss b/plugin/src/styles.scss
new file mode 100644
index 00000000..fb491395
--- /dev/null
+++ b/plugin/src/styles.scss
@@ -0,0 +1,45 @@
+.sync-settings-access-token textarea {
+	width: 100%;
+	height: 100px;
+}
+
+.history-card * {
+	margin: 0;
+	padding: 0;
+}
+
+.history-card {
+	padding: var(--size-4-4) var(--size-4-6);
+	margin: var(--size-4-2);
+	background-color: var(--color-base-00);
+	border-radius: var(--radius-l);
+
+	&.success {
+		background-color: rgba(var(--color-green-rgb), 0.2);
+	}
+
+	&.error {
+		background-color: rgba(var(--color-red-rgb), 0.2);
+	}
+
+	.history-card-header {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		margin-bottom: var(--size-4-4);
+
+		.history-card-title {
+			font: var(--font-monospace-theme);
+		}
+
+		.history-card-timestamp {
+			font-size: var(--font-ui-small);
+			color: var(--color-base-70);
+		}
+	}
+
+	.history-card-message {
+		font-size: var(--font-ui-medium);
+		color: var(--color-base-70);
+	}
+}

From d77162ddf1abd48672494272a9068b94956ac296 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 20 Dec 2024 17:35:22 +0000
Subject: [PATCH 015/761] Add history view

---
 plugin/src/plugin.ts                          | 35 ++++----
 .../apply-remote-changes-locally.ts           |  1 +
 plugin/src/tracing/sync-history.ts            | 27 +++---
 plugin/src/views/history-view.ts              | 89 +++++++++++++++++++
 plugin/src/views/status-bar.ts                |  6 +-
 plugin/src/views/sync-view.ts                 | 40 ---------
 6 files changed, 130 insertions(+), 68 deletions(-)
 create mode 100644 plugin/src/views/history-view.ts
 delete mode 100644 plugin/src/views/sync-view.ts

diff --git a/plugin/src/plugin.ts b/plugin/src/plugin.ts
index 260b9e55..535ecd75 100644
--- a/plugin/src/plugin.ts
+++ b/plugin/src/plugin.ts
@@ -4,7 +4,7 @@ import { Plugin } from "obsidian";
 import * as lib from "../../backend/sync_lib/pkg/sync_lib.js";
 import * as wasmBin from "../../backend/sync_lib/pkg/sync_lib_bg.wasm";
 import { SyncSettingsTab } from "./views/settings-tab";
-import { SyncView } from "./views/sync-view";
+import { HistoryView } from "./views/history-view.js";
 
 import { ObsidianFileEventHandler } from "./events/obisidan-event-handler.js";
 import { SyncService } from "./services/sync-service";
@@ -15,6 +15,7 @@ import { applyLocalChangesRemotely } from "./sync-operations/apply-local-changes
 import { StatusBar } from "./views/status-bar";
 import { Logger } from "./tracing/logger.js";
 import { SyncHistory } from "./tracing/sync-history.js";
+import { LogsView } from "./views/logs-view.js";
 
 export default class SyncPlugin extends Plugin {
 	private remoteListenerIntervalId: number | null = null;
@@ -115,14 +116,22 @@ export default class SyncPlugin extends Plugin {
 			}
 		});
 
-		this.registerView(SyncView.TYPE, (leaf) => new SyncView(leaf));
-
-		const ribbonIconEl = this.addRibbonIcon(
-			"dice",
-			"Sample Plugin",
-			async (_: MouseEvent) => this.activateView()
+		this.registerView(
+			HistoryView.TYPE,
+			(leaf) => new HistoryView(leaf, this.history)
+		);
+		this.registerView(LogsView.TYPE, (leaf) => new LogsView(leaf));
+
+		this.addRibbonIcon(
+			HistoryView.ICON,
+			"Open VaultLink events",
+			async (_: MouseEvent) => this.activateView(HistoryView.TYPE)
+		);
+		this.addRibbonIcon(
+			LogsView.ICON,
+			"Open VaultLink logs",
+			async (_: MouseEvent) => this.activateView(LogsView.TYPE)
 		);
-		ribbonIconEl.addClass("my-plugin-ribbon-class");
 
 		Logger.getInstance().info("Plugin loaded");
 	}
@@ -133,23 +142,19 @@ export default class SyncPlugin extends Plugin {
 		}
 	}
 
-	private async activateView(): Promise<void> {
+	private async activateView(type: string): Promise<void> {
 		const { workspace } = this.app;
 
 		let leaf: WorkspaceLeaf | null = null;
-		const leaves = workspace.getLeavesOfType(SyncView.TYPE);
+		const leaves = workspace.getLeavesOfType(type);
 
 		if (leaves.length > 0) {
-			// A leaf with our view already exists, use that
 			[leaf] = leaves;
 		} else {
-			// Our view could not be found in the workspace, create a new leaf
-			// In the right sidebar for it
 			leaf = workspace.getRightLeaf(false);
-			await leaf?.setViewState({ type: SyncView.TYPE, active: true });
+			await leaf?.setViewState({ type: type, active: true });
 		}
 
-		// "Reveal" the leaf in case it is in a collapsed sidebar
 		if (leaf) {
 			await workspace.revealLeaf(leaf);
 		}
diff --git a/plugin/src/sync-operations/apply-remote-changes-locally.ts b/plugin/src/sync-operations/apply-remote-changes-locally.ts
index ddf7ec50..3b8840c8 100644
--- a/plugin/src/sync-operations/apply-remote-changes-locally.ts
+++ b/plugin/src/sync-operations/apply-remote-changes-locally.ts
@@ -31,6 +31,7 @@ export async function applyRemoteChangesLocally({
 	}
 
 	isRunning = true;
+
 	try {
 		const remote = await syncServer.getAll(database.getLastSeenUpdateId());
 
diff --git a/plugin/src/tracing/sync-history.ts b/plugin/src/tracing/sync-history.ts
index 292d7f6a..2c4e4514 100644
--- a/plugin/src/tracing/sync-history.ts
+++ b/plugin/src/tracing/sync-history.ts
@@ -37,15 +37,16 @@ export class SyncHistory {
 	private static readonly MAX_ENTRIES = 1000;
 
 	private entries: HistoryEntry[] = [];
-	private readonly requestCountListeners: ((status: HistoryStats) => void)[] =
-		[];
+	private readonly syncHistoryUpdateListeners: ((
+		status: HistoryStats
+	) => void)[] = [];
 	private status: HistoryStats = {
 		success: 0,
 		error: 0,
 	};
 
-	public getMessages(): HistoryEntry[] {
-		return this.entries;
+	public getEntries(): HistoryEntry[] {
+		return [...this.entries];
 	}
 
 	public reset(): void {
@@ -54,15 +55,15 @@ export class SyncHistory {
 			success: 0,
 			error: 0,
 		};
-		this.requestCountListeners.forEach((listener) => {
+		this.syncHistoryUpdateListeners.forEach((listener) => {
 			listener(this.status);
 		});
 	}
 
-	public addSyncHistoryStatsChangeListener(
-		listener: (status: HistoryStats) => void
+	public addSyncHistoryUpdateListener(
+		listener: (stats: HistoryStats) => void
 	): void {
-		this.requestCountListeners.push(listener);
+		this.syncHistoryUpdateListeners.push(listener);
 		listener({ ...this.status });
 	}
 
@@ -75,15 +76,21 @@ export class SyncHistory {
 
 		if (entry.status === SyncStatus.SUCCESS) {
 			this.status.success++;
-			Logger.getInstance().info(`Synced file: ${entry.relativePath}`);
+			Logger.getInstance().info(
+				`History entry: ${entry.relativePath} - ${entry.message}`
+			);
 		} else if (entry.status === SyncStatus.ERROR) {
 			this.status.error++;
 			Logger.getInstance().error(
 				`Error syncing file: ${entry.relativePath} - ${entry.message}`
 			);
+		} else {
+			Logger.getInstance().debug(
+				`No-op syncing file: ${entry.relativePath} - ${entry.message}`
+			);
 		}
 
-		this.requestCountListeners.forEach((listener) => {
+		this.syncHistoryUpdateListeners.forEach((listener) => {
 			listener(this.status);
 		});
 
diff --git a/plugin/src/views/history-view.ts b/plugin/src/views/history-view.ts
new file mode 100644
index 00000000..ed7ead10
--- /dev/null
+++ b/plugin/src/views/history-view.ts
@@ -0,0 +1,89 @@
+import type { WorkspaceLeaf } from "obsidian";
+import { ItemView } from "obsidian";
+import type { SyncHistory } from "src/tracing/sync-history";
+import { SyncSource } from "src/tracing/sync-history";
+import { intlFormatDistance } from "date-fns";
+
+export class HistoryView extends ItemView {
+	public static readonly TYPE = "example-view";
+	public static readonly ICON = "square-stack";
+	private timer: NodeJS.Timer | null = null;
+
+	public constructor(
+		leaf: WorkspaceLeaf,
+		private readonly history: SyncHistory
+	) {
+		super(leaf);
+		this.icon = HistoryView.ICON;
+
+		// eslint-disable-next-line @typescript-eslint/no-misused-promises
+		history.addSyncHistoryUpdateListener(async () => {
+			await this.updateView();
+		});
+	}
+
+	private static formatSource(source: SyncSource | undefined): string {
+		switch (source) {
+			case SyncSource.PUSH:
+				return " ⤴️";
+			case SyncSource.PULL:
+				return " ⤵️";
+			default:
+				return "";
+		}
+	}
+
+	private static formatTime(timestamp: Date): string {
+		return intlFormatDistance(timestamp, new Date());
+	}
+
+	public getViewType(): string {
+		return HistoryView.TYPE;
+	}
+
+	public getDisplayText(): string {
+		return "Example view";
+	}
+
+	public async onOpen(): Promise<void> {
+		await this.updateView();
+		// eslint-disable-next-line @typescript-eslint/no-misused-promises
+		this.timer = setInterval(async () => this.updateView(), 500);
+	}
+
+	public async onClose(): Promise<void> {
+		if (this.timer) {
+			clearInterval(this.timer);
+		}
+	}
+
+	private async updateView(): Promise<void> {
+		const container = this.containerEl.children[1];
+		container.empty();
+		container.createEl("h4", { text: "VaultLink History" });
+
+		this.history
+			.getEntries()
+			.reverse()
+			.forEach((entry) => {
+				const card = container.createDiv({
+					cls: ["history-card", entry.status.toLocaleLowerCase()],
+				});
+				const header = card.createDiv({ cls: "history-card-header" });
+				header.createEl("h5", {
+					text:
+						entry.relativePath +
+						HistoryView.formatSource(entry.source),
+					cls: "history-card-title",
+				});
+				header.createSpan({
+					text: HistoryView.formatTime(entry.timestamp),
+					cls: "history-card-timestamp",
+				});
+				card.createEl("p", {
+					text: entry.message,
+					cls: "history-card-message",
+				});
+			});
+	}
+}
diff --git a/plugin/src/views/status-bar.ts b/plugin/src/views/status-bar.ts
index c1f35172..a4d59d80 100644
--- a/plugin/src/views/status-bar.ts
+++ b/plugin/src/views/status-bar.ts
@@ -6,9 +6,9 @@ export class StatusBar {
 
 	public constructor(plugin: Plugin, history: SyncHistory) {
 		this.statusBarItem = plugin.addStatusBarItem();
-		history.addSyncHistoryStatsChangeListener((status) =>
-			{ this.updateStatus(status); }
-		);
+		history.addSyncHistoryUpdateListener((status) => {
+			this.updateStatus(status);
+		});
 	}
 
 	private updateStatus({ success, error }: HistoryStats): void {
diff --git a/plugin/src/views/sync-view.ts b/plugin/src/views/sync-view.ts
deleted file mode 100644
index 5d81c37a..00000000
--- a/plugin/src/views/sync-view.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import type { WorkspaceLeaf } from "obsidian";
-import { ItemView } from "obsidian";
-import { LogLevel, Logger } from "src/tracing/logger";
-
-export class SyncView extends ItemView {
-	public static readonly TYPE = "example-view";
-
-	public constructor(leaf: WorkspaceLeaf) {
-		super(leaf);
-	}
-
-	public getViewType(): string {
-		return SyncView.TYPE;
-	}
-
-	public getDisplayText(): string {
-		return "Example view";
-	}
-
-	public async onOpen(): Promise<void> {
-		const container = this.containerEl.children[1];
-		container.empty();
-		container.createEl("h4", { text: "Example view" });
-
-		// eslint-disable-next-line @typescript-eslint/no-misused-promises
-		setInterval(async () => this.updateView(), 1000);
-	}
-
-	public async updateView(): Promise<void> {
-		const container = this.containerEl.children[1];
-		container.empty();
-
-		const messages = Logger.getInstance()
-			.getMessages(LogLevel.DEBUG)
-			.map((message) => message.toString())
-			.join("\n");
-
-		container.createEl("pre", { text: messages });
-	}
-}

From 818812aa2d4d8ec8c41bbb7140363782a47afd1c Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 20 Dec 2024 17:35:30 +0000
Subject: [PATCH 016/761] Fix up logs view

---
 plugin/src/tracing/logger.ts  | 11 +++++---
 plugin/src/views/logs-view.ts | 49 +++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 4 deletions(-)
 create mode 100644 plugin/src/views/logs-view.ts

diff --git a/plugin/src/tracing/logger.ts b/plugin/src/tracing/logger.ts
index fbaf0a14..2db69e15 100644
--- a/plugin/src/tracing/logger.ts
+++ b/plugin/src/tracing/logger.ts
@@ -8,22 +8,25 @@ export enum LogLevel {
 }
 
 class LogLine {
+	public timestamp = new Date();
 	public constructor(public level: LogLevel, public message: string) {}
 
 	public toString(): string {
-		return `${this.formatLevel()}: ${this.message}`;
+		return `| ${this.formatLevel()} | ${this.timestamp.getHours()}:${this.timestamp.getMinutes()}:${this.timestamp.getSeconds()} | ${
+			this.message
+		}`;
 	}
 
 	private formatLevel(): string {
 		switch (this.level) {
 			case LogLevel.DEBUG:
-				return "DEBUG";
+				return "  DEBUG";
 			case LogLevel.INFO:
-				return "INFO";
+				return "   INFO";
 			case LogLevel.WARNING:
 				return "WARNING";
 			case LogLevel.ERROR:
-				return "ERROR";
+				return "  ERROR";
 			default:
 				return "UNKNOWN";
 		}
diff --git a/plugin/src/views/logs-view.ts b/plugin/src/views/logs-view.ts
new file mode 100644
index 00000000..bbb45a9e
--- /dev/null
+++ b/plugin/src/views/logs-view.ts
@@ -0,0 +1,49 @@
+import type { WorkspaceLeaf } from "obsidian";
+import { ItemView } from "obsidian";
+import { LogLevel, Logger } from "src/tracing/logger";
+
+export class LogsView extends ItemView {
+	public static readonly TYPE = "logs-view";
+	public static readonly ICON = "logs";
+
+	private timer: NodeJS.Timer | null = null;
+
+	public constructor(leaf: WorkspaceLeaf) {
+		super(leaf);
+		this.icon = LogsView.ICON;
+	}
+
+	public getViewType(): string {
+		return LogsView.TYPE;
+	}
+
+	public getDisplayText(): string {
+		return "VaultLink logs";
+	}
+
+	public async onOpen(): Promise<void> {
+		// eslint-disable-next-line @typescript-eslint/no-misused-promises
+		this.timer = setInterval(async () => this.updateView(), 250);
+	}
+
+	public async onClose(): Promise<void> {
+		if (this.timer) {
+			clearInterval(this.timer);
+			this.timer = null;
+		}
+	}
+
+	private async updateView(): Promise<void> {
+		const container = this.containerEl.children[1];
+		container.empty();
+
+		container.createEl("h4", { text: "VaultLink logs" });
+
+		const messages = Logger.getInstance()
+			.getMessages(LogLevel.DEBUG)
+			.map((message) => message.toString())
+			.join("\n");
+
+		container.createEl("pre", { text: messages });
+	}
+}

From 395b8b6784821a4b49b04f99ac46669fd3e0ec36 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 20 Dec 2024 18:40:09 +0000
Subject: [PATCH 017/761] Fix sync

---
 README.md                                     |  2 +-
 .../obsidian-file-operations.ts               | 15 ++++
 .../sync-locally-created-file.ts              | 24 +++---
 .../sync-locally-updated-file.ts              |  9 +-
 .../sync-remotely-updated-file.ts             | 84 ++++++++++---------
 5 files changed, 79 insertions(+), 55 deletions(-)

diff --git a/README.md b/README.md
index 77083aac..200d250b 100644
--- a/README.md
+++ b/README.md
@@ -67,7 +67,7 @@ pedantic = { level = "warn", priority = 0 }
 cargo = { level = "warn", priority = 0 }
 
 
-
+update card title max width
 reset should reset counters
 access logs
 retry
diff --git a/plugin/src/file-operations/obsidian-file-operations.ts b/plugin/src/file-operations/obsidian-file-operations.ts
index 28c044f0..7f9a47aa 100644
--- a/plugin/src/file-operations/obsidian-file-operations.ts
+++ b/plugin/src/file-operations/obsidian-file-operations.ts
@@ -33,6 +33,7 @@ export class ObsidianFileOperations implements FileOperations {
 		newContent: Uint8Array
 	): Promise<Uint8Array> {
 		if (!(await this.vault.adapter.exists(normalizePath(path)))) {
+			// The caller assumed the file exists, but it doesn't, let's not recreate it
 			return new Uint8Array(0);
 		}
 
@@ -62,6 +63,7 @@ export class ObsidianFileOperations implements FileOperations {
 			return;
 		}
 
+		await this.createParentDirectories(normalizePath(path));
 		await this.vault.adapter.writeBinary(normalizePath(path), newContent);
 	}
 
@@ -84,4 +86,17 @@ export class ObsidianFileOperations implements FileOperations {
 			normalizePath(newPath)
 		);
 	}
+
+	private async createParentDirectories(path: string): Promise<void> {
+		const components = path.split("/");
+		if (components.length === 1) {
+			return;
+		}
+		for (let i = 1; i < components.length; i++) {
+			const parentDir = components.slice(0, i).join("/");
+			if (!(await this.vault.adapter.exists(parentDir))) {
+				await this.vault.adapter.mkdir(parentDir);
+			}
+		}
+	}
 }
diff --git a/plugin/src/sync-operations/sync-locally-created-file.ts b/plugin/src/sync-operations/sync-locally-created-file.ts
index 180bdf5c..0fa37fc2 100644
--- a/plugin/src/sync-operations/sync-locally-created-file.ts
+++ b/plugin/src/sync-operations/sync-locally-created-file.ts
@@ -37,18 +37,20 @@ export async function syncLocallyCreatedFile({
 	try {
 		const metadata = database.getDocument(relativePath);
 		if (metadata) {
-			throw new Error(
-				`Document metadata found for ${relativePath}, this is unexpected. Consider resetting the plugin's sync history.`
+			Logger.getInstance().debug(
+				`Document metadata already exists for ${relativePath}, it must have been downloaded from the server`
 			);
 		}
 
-		const contentBytes = await operations.read(relativePath),
-			contentHash = hash(contentBytes),
-			response = await syncServer.create({
-				relativePath,
-				contentBytes,
-				createdDate: updateTime,
-			});
+		const contentBytes = await operations.read(relativePath);
+		const contentHash = hash(contentBytes);
+
+		const response = await syncServer.create({
+			relativePath,
+			contentBytes,
+			createdDate: updateTime,
+		});
+
 		history.addHistoryEntry({
 			status: SyncStatus.SUCCESS,
 			source: SyncSource.PUSH,
@@ -57,8 +59,8 @@ export async function syncLocallyCreatedFile({
 			type: SyncType.CREATE,
 		});
 
-		const responseBytes = lib.base64_to_bytes(response.contentBase64),
-			responseHash = hash(responseBytes);
+		const responseBytes = lib.base64_to_bytes(response.contentBase64);
+		const responseHash = hash(responseBytes);
 
 		if (contentHash !== responseHash) {
 			await operations.write(relativePath, contentBytes, responseBytes);
diff --git a/plugin/src/sync-operations/sync-locally-updated-file.ts b/plugin/src/sync-operations/sync-locally-updated-file.ts
index 2049f0ae..f95e0fb7 100644
--- a/plugin/src/sync-operations/sync-locally-updated-file.ts
+++ b/plugin/src/sync-operations/sync-locally-updated-file.ts
@@ -45,8 +45,8 @@ export async function syncLocallyUpdatedFile({
 			);
 		}
 
-		const contentBytes = await operations.read(relativePath),
-			contentHash = hash(contentBytes);
+		const contentBytes = await operations.read(relativePath);
+		const contentHash = hash(contentBytes);
 
 		if (metadata.hash === contentHash && oldPath !== undefined) {
 			history.addHistoryEntry({
@@ -91,6 +91,7 @@ export async function syncLocallyUpdatedFile({
 		}
 
 		const responseBytes = lib.base64_to_bytes(response.contentBase64);
+		const responseHash = hash(responseBytes);
 
 		if (response.relativePath != relativePath) {
 			await waitForDocumentLock(response.relativePath);
@@ -116,7 +117,7 @@ export async function syncLocallyUpdatedFile({
 			} finally {
 				unlockDocument(response.relativePath);
 			}
-		} else {
+		} else if (contentHash !== responseHash) {
 			await operations.write(relativePath, contentBytes, responseBytes);
 		}
 
@@ -125,7 +126,7 @@ export async function syncLocallyUpdatedFile({
 			oldRelativePath: oldPath ?? relativePath,
 			relativePath: response.relativePath,
 			parentVersionId: response.vaultUpdateId,
-			hash: contentHash,
+			hash: responseHash,
 		});
 	} catch (e) {
 		history.addHistoryEntry({
diff --git a/plugin/src/sync-operations/sync-remotely-updated-file.ts b/plugin/src/sync-operations/sync-remotely-updated-file.ts
index 4311e519..9632a46f 100644
--- a/plugin/src/sync-operations/sync-remotely-updated-file.ts
+++ b/plugin/src/sync-operations/sync-remotely-updated-file.ts
@@ -26,15 +26,20 @@ export async function syncRemotelyUpdatedFile({
 		`Syncing remotely updated file ${remoteVersion.relativePath}`
 	);
 
+	const content = (
+		await syncServer.get({
+			documentId: remoteVersion.documentId,
+		})
+	).contentBase64;
+	const contentBytes = lib.base64_to_bytes(content);
+	const contentHash = hash(contentBytes);
+
+	await waitForDocumentLock(remoteVersion.relativePath);
+
 	try {
-		const content = (
-				await syncServer.get({
-					documentId: remoteVersion.documentId,
-				})
-			).contentBase64,
-			currentVersion = database.getDocumentByDocumentId(
-				remoteVersion.documentId
-			);
+		const currentVersion = database.getDocumentByDocumentId(
+			remoteVersion.documentId
+		);
 
 		if (!currentVersion) {
 			if (remoteVersion.isDeleted) {
@@ -48,35 +53,27 @@ export async function syncRemotelyUpdatedFile({
 				return;
 			}
 
-			await waitForDocumentLock(remoteVersion.relativePath);
-			try {
-				const contentBytes = lib.base64_to_bytes(content);
-				await operations.create(
-					remoteVersion.relativePath,
-					contentBytes
-				);
-				await database.setDocument({
-					documentId: remoteVersion.documentId,
-					relativePath: remoteVersion.relativePath,
-					parentVersionId: remoteVersion.vaultUpdateId,
-					hash: hash(contentBytes),
-				});
-				history.addHistoryEntry({
-					status: SyncStatus.SUCCESS,
-					source: SyncSource.PULL,
-					relativePath: remoteVersion.relativePath,
-					message: `Successfully downloaded remote file which hasn't existed locally`,
-					type: SyncType.CREATE,
-				});
-			} finally {
-				unlockDocument(remoteVersion.relativePath);
-			}
+			await operations.create(remoteVersion.relativePath, contentBytes);
+			await database.setDocument({
+				documentId: remoteVersion.documentId,
+				relativePath: remoteVersion.relativePath,
+				parentVersionId: remoteVersion.vaultUpdateId,
+				hash: contentHash,
+			});
+			history.addHistoryEntry({
+				status: SyncStatus.SUCCESS,
+				source: SyncSource.PULL,
+				relativePath: remoteVersion.relativePath,
+				message: `Successfully downloaded remote file which hasn't existed locally`,
+				type: SyncType.CREATE,
+			});
 			return;
 		}
 
 		const [relativePath, metadata] = currentVersion;
-		await waitForDocumentLock(relativePath);
-
+		if (relativePath !== remoteVersion.relativePath) {
+			await waitForDocumentLock(relativePath);
+		}
 		try {
 			if (remoteVersion.isDeleted) {
 				await operations.remove(relativePath);
@@ -90,13 +87,14 @@ export async function syncRemotelyUpdatedFile({
 					type: SyncType.DELETE,
 				});
 			} else {
-				const currentContent = await operations.read(relativePath),
-					currentHash = hash(currentContent);
+				const currentContent = await operations.read(relativePath);
+				const currentHash = hash(currentContent);
+
 				if (currentHash !== metadata.hash) {
 					Logger.getInstance().info(
 						`Document ${relativePath} has been updated both remotely and locally, skipping until the event is processed`
 					);
-				} else {
+				} else if (contentHash !== metadata.hash) {
 					if (relativePath !== remoteVersion.relativePath) {
 						await operations.move(
 							relativePath,
@@ -104,7 +102,6 @@ export async function syncRemotelyUpdatedFile({
 						);
 					}
 
-					const contentBytes = lib.base64_to_bytes(content);
 					await operations.write(
 						remoteVersion.relativePath,
 						currentContent,
@@ -115,7 +112,7 @@ export async function syncRemotelyUpdatedFile({
 						oldRelativePath: relativePath,
 						relativePath: remoteVersion.relativePath,
 						parentVersionId: remoteVersion.vaultUpdateId,
-						hash: metadata.hash,
+						hash: contentHash,
 					});
 
 					history.addHistoryEntry({
@@ -126,9 +123,16 @@ export async function syncRemotelyUpdatedFile({
 						type: SyncType.UPDATE,
 					});
 				}
+				{
+					Logger.getInstance().debug(
+						`Document ${relativePath} is already up to date`
+					);
+				}
 			}
 		} finally {
-			unlockDocument(relativePath);
+			if (relativePath !== remoteVersion.relativePath) {
+				unlockDocument(relativePath);
+			}
 		}
 	} catch (e) {
 		history.addHistoryEntry({
@@ -138,5 +142,7 @@ export async function syncRemotelyUpdatedFile({
 			message: `Failed to reconcile remotely updated file: ${e}`,
 		});
 		throw e;
+	} finally {
+		unlockDocument(remoteVersion.relativePath);
 	}
 }

From 8003f7b0f32590721a5b9fa88fea0617badec4e4 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 20 Dec 2024 18:40:32 +0000
Subject: [PATCH 018/761] Bump version

---
 plugin/manifest.json     | 2 +-
 plugin/package-lock.json | 4 ++--
 plugin/package.json      | 4 ++--
 plugin/versions.json     | 3 ++-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/plugin/manifest.json b/plugin/manifest.json
index 40fc4ff7..e344441d 100644
--- a/plugin/manifest.json
+++ b/plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "sample-plugin",
 	"name": "Sync & Share",
-	"version": "0.0.5",
+	"version": "0.0.6",
 	"minAppVersion": "0.0.0",
 	"description": "Demonstrates some of the capabilities of the Obsidian API.",
 	"author": "Obsidian",
diff --git a/plugin/package-lock.json b/plugin/package-lock.json
index 688b8c48..ebc4236d 100644
--- a/plugin/package-lock.json
+++ b/plugin/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "obsidian-sample-plugin",
-	"version": "0.0.5",
+	"version": "0.0.6",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "obsidian-sample-plugin",
-			"version": "0.0.5",
+			"version": "0.0.6",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/node": "^16.11.6",
diff --git a/plugin/package.json b/plugin/package.json
index 925da084..b94daf97 100644
--- a/plugin/package.json
+++ b/plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "obsidian-sample-plugin",
-	"version": "0.0.5",
+	"version": "0.0.6",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {
@@ -30,4 +30,4 @@
 		"typescript-eslint": "8.18.0",
 		"esbuild-sass-plugin": "^3.3.1"
 	}
-}
\ No newline at end of file
+}
diff --git a/plugin/versions.json b/plugin/versions.json
index 314e0116..a714326c 100644
--- a/plugin/versions.json
+++ b/plugin/versions.json
@@ -4,5 +4,6 @@
 	"0.0.2": "0.0.0",
 	"0.0.3": "0.0.0",
 	"0.0.4": "0.0.0",
-	"0.0.5": "0.0.0"
+	"0.0.5": "0.0.0",
+	"0.0.6": "0.0.0"
 }
\ No newline at end of file

From 74ef46c1f7b1a62d8ffc9a9e9420f79bda3dfe3c Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 20 Dec 2024 18:47:45 +0000
Subject: [PATCH 019/761] Fix lint

---
 backend/sync_lib/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/sync_lib/src/lib.rs b/backend/sync_lib/src/lib.rs
index ff374ace..cad32222 100644
--- a/backend/sync_lib/src/lib.rs
+++ b/backend/sync_lib/src/lib.rs
@@ -10,7 +10,7 @@ pub mod errors;
 // allocator.
 #[cfg(feature = "wee_alloc")]
 #[global_allocator]
-static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT;
+static ALLOC: wee_alloc::WeeAlloc<'_> = wee_alloc::WeeAlloc::INIT;
 
 #[wasm_bindgen]
 pub fn bytes_to_base64(input: &[u8]) -> String { STANDARD_NO_PAD.encode(input) }

From 831e6f76518a856cc4a025a1506d939cc2feca37 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 20 Dec 2024 18:50:26 +0000
Subject: [PATCH 020/761] Bump anifest for brat

---
 manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index 40fc4ff7..e344441d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "sample-plugin",
 	"name": "Sync & Share",
-	"version": "0.0.5",
+	"version": "0.0.6",
 	"minAppVersion": "0.0.0",
 	"description": "Demonstrates some of the capabilities of the Obsidian API.",
 	"author": "Obsidian",

From 90bc8930076e4c60a0fc0be85861872d50e6d3d6 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 20 Dec 2024 20:32:14 +0000
Subject: [PATCH 021/761] Performance improvements

---
 plugin/src/database/database.ts               |  8 +-
 .../sync-locally-created-file.ts              |  4 +
 .../sync-locally-deleted-file.ts              |  4 +-
 .../sync-locally-updated-file.ts              |  8 ++
 .../sync-remotely-updated-file.ts             | 86 +++++++++++--------
 plugin/src/tracing/logger.ts                  |  1 +
 6 files changed, 65 insertions(+), 46 deletions(-)

diff --git a/plugin/src/database/database.ts b/plugin/src/database/database.ts
index 48c619ac..70b3bcfa 100644
--- a/plugin/src/database/database.ts
+++ b/plugin/src/database/database.ts
@@ -43,13 +43,7 @@ export class Database {
 			}
 		}
 
-		Logger.getInstance().debug(
-			`Loaded documents: ${JSON.stringify(
-				Object.fromEntries(this._documents.entries()),
-				null,
-				2
-			)}`
-		);
+		Logger.getInstance().debug(`Loaded ${this._documents.size} documents`);
 
 		this._settings = {
 			...DEFAULT_SETTINGS,
diff --git a/plugin/src/sync-operations/sync-locally-created-file.ts b/plugin/src/sync-operations/sync-locally-created-file.ts
index 0fa37fc2..22c59169 100644
--- a/plugin/src/sync-operations/sync-locally-created-file.ts
+++ b/plugin/src/sync-operations/sync-locally-created-file.ts
@@ -79,6 +79,10 @@ export async function syncLocallyCreatedFile({
 			parentVersionId: response.vaultUpdateId,
 			hash: responseHash,
 		});
+
+		if (database.getLastSeenUpdateId() === response.vaultUpdateId - 1) {
+			await database.setLastSeenUpdateId(response.vaultUpdateId);
+		}
 	} catch (e) {
 		history.addHistoryEntry({
 			status: SyncStatus.ERROR,
diff --git a/plugin/src/sync-operations/sync-locally-deleted-file.ts b/plugin/src/sync-operations/sync-locally-deleted-file.ts
index 7bfb0b0b..4e7e1db6 100644
--- a/plugin/src/sync-operations/sync-locally-deleted-file.ts
+++ b/plugin/src/sync-operations/sync-locally-deleted-file.ts
@@ -46,8 +46,6 @@ export async function syncLocallyDeletedFile({
 			createdDate: new Date(),
 		});
 
-		await database.removeDocument(relativePath);
-
 		history.addHistoryEntry({
 			status: SyncStatus.SUCCESS,
 			source: SyncSource.PUSH,
@@ -55,6 +53,8 @@ export async function syncLocallyDeletedFile({
 			message: `Successfully deleted locally deleted file on the remote server`,
 			type: SyncType.DELETE,
 		});
+
+		await database.removeDocument(relativePath);
 	} catch (e) {
 		history.addHistoryEntry({
 			status: SyncStatus.ERROR,
diff --git a/plugin/src/sync-operations/sync-locally-updated-file.ts b/plugin/src/sync-operations/sync-locally-updated-file.ts
index f95e0fb7..e27873f1 100644
--- a/plugin/src/sync-operations/sync-locally-updated-file.ts
+++ b/plugin/src/sync-operations/sync-locally-updated-file.ts
@@ -78,6 +78,10 @@ export async function syncLocallyUpdatedFile({
 			await operations.remove(oldPath ?? relativePath);
 			await database.removeDocument(oldPath ?? relativePath);
 
+			if (database.getLastSeenUpdateId() === response.vaultUpdateId - 1) {
+				await database.setLastSeenUpdateId(response.vaultUpdateId);
+			}
+
 			history.addHistoryEntry({
 				status: SyncStatus.SUCCESS,
 				source: SyncSource.PULL,
@@ -128,6 +132,10 @@ export async function syncLocallyUpdatedFile({
 			parentVersionId: response.vaultUpdateId,
 			hash: responseHash,
 		});
+
+		if (database.getLastSeenUpdateId() === response.vaultUpdateId - 1) {
+			await database.setLastSeenUpdateId(response.vaultUpdateId);
+		}
 	} catch (e) {
 		history.addHistoryEntry({
 			status: SyncStatus.ERROR,
diff --git a/plugin/src/sync-operations/sync-remotely-updated-file.ts b/plugin/src/sync-operations/sync-remotely-updated-file.ts
index 9632a46f..d26d0806 100644
--- a/plugin/src/sync-operations/sync-remotely-updated-file.ts
+++ b/plugin/src/sync-operations/sync-remotely-updated-file.ts
@@ -26,14 +26,6 @@ export async function syncRemotelyUpdatedFile({
 		`Syncing remotely updated file ${remoteVersion.relativePath}`
 	);
 
-	const content = (
-		await syncServer.get({
-			documentId: remoteVersion.documentId,
-		})
-	).contentBase64;
-	const contentBytes = lib.base64_to_bytes(content);
-	const contentHash = hash(contentBytes);
-
 	await waitForDocumentLock(remoteVersion.relativePath);
 
 	try {
@@ -53,6 +45,14 @@ export async function syncRemotelyUpdatedFile({
 				return;
 			}
 
+			const content = (
+				await syncServer.get({
+					documentId: remoteVersion.documentId,
+				})
+			).contentBase64;
+			const contentBytes = lib.base64_to_bytes(content);
+			const contentHash = hash(contentBytes);
+
 			await operations.create(remoteVersion.relativePath, contentBytes);
 			await database.setDocument({
 				documentId: remoteVersion.documentId,
@@ -71,9 +71,17 @@ export async function syncRemotelyUpdatedFile({
 		}
 
 		const [relativePath, metadata] = currentVersion;
+		if (metadata.parentVersionId === remoteVersion.vaultUpdateId) {
+			Logger.getInstance().debug(
+				`Document ${relativePath} is already up to date`
+			);
+			return;
+		}
+
 		if (relativePath !== remoteVersion.relativePath) {
 			await waitForDocumentLock(relativePath);
 		}
+
 		try {
 			if (remoteVersion.isDeleted) {
 				await operations.remove(relativePath);
@@ -94,40 +102,44 @@ export async function syncRemotelyUpdatedFile({
 					Logger.getInstance().info(
 						`Document ${relativePath} has been updated both remotely and locally, skipping until the event is processed`
 					);
-				} else if (contentHash !== metadata.hash) {
-					if (relativePath !== remoteVersion.relativePath) {
-						await operations.move(
-							relativePath,
-							remoteVersion.relativePath
-						);
-					}
+					return;
+				}
 
-					await operations.write(
-						remoteVersion.relativePath,
-						currentContent,
-						contentBytes
-					);
-					await database.moveDocument({
+				const content = (
+					await syncServer.get({
 						documentId: remoteVersion.documentId,
-						oldRelativePath: relativePath,
-						relativePath: remoteVersion.relativePath,
-						parentVersionId: remoteVersion.vaultUpdateId,
-						hash: contentHash,
-					});
+					})
+				).contentBase64;
+				const contentBytes = lib.base64_to_bytes(content);
+				const contentHash = hash(contentBytes);
 
-					history.addHistoryEntry({
-						status: SyncStatus.SUCCESS,
-						source: SyncSource.PULL,
-						relativePath: remoteVersion.relativePath,
-						message: `Successfully updated remotely updated file locally`,
-						type: SyncType.UPDATE,
-					});
-				}
-				{
-					Logger.getInstance().debug(
-						`Document ${relativePath} is already up to date`
+				if (relativePath !== remoteVersion.relativePath) {
+					await operations.move(
+						relativePath,
+						remoteVersion.relativePath
 					);
 				}
+
+				await operations.write(
+					remoteVersion.relativePath,
+					currentContent,
+					contentBytes
+				);
+				await database.moveDocument({
+					documentId: remoteVersion.documentId,
+					oldRelativePath: relativePath,
+					relativePath: remoteVersion.relativePath,
+					parentVersionId: remoteVersion.vaultUpdateId,
+					hash: contentHash,
+				});
+
+				history.addHistoryEntry({
+					status: SyncStatus.SUCCESS,
+					source: SyncSource.PULL,
+					relativePath: remoteVersion.relativePath,
+					message: `Successfully updated remotely updated file locally`,
+					type: SyncType.UPDATE,
+				});
 			}
 		} finally {
 			if (relativePath !== remoteVersion.relativePath) {
diff --git a/plugin/src/tracing/logger.ts b/plugin/src/tracing/logger.ts
index 2db69e15..1d4bb717 100644
--- a/plugin/src/tracing/logger.ts
+++ b/plugin/src/tracing/logger.ts
@@ -72,6 +72,7 @@ export class Logger {
 	}
 
 	private pushMessage(message: string, level: LogLevel): void {
+		console.log(`[${level}] ${message}`);
 		this.messages.push(new LogLine(level, message));
 		if (this.messages.length > Logger.MAX_MESSAGES) {
 			this.messages.shift();

From c47e76b4346699bf7448ad1b4985b0bda036f0b1 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 20 Dec 2024 20:32:32 +0000
Subject: [PATCH 022/761] 0.0.7

---
 plugin/manifest.json     | 2 +-
 plugin/package-lock.json | 4 ++--
 plugin/package.json      | 2 +-
 plugin/versions.json     | 3 ++-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/plugin/manifest.json b/plugin/manifest.json
index e344441d..b9574fd7 100644
--- a/plugin/manifest.json
+++ b/plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "sample-plugin",
 	"name": "Sync & Share",
-	"version": "0.0.6",
+	"version": "0.0.7",
 	"minAppVersion": "0.0.0",
 	"description": "Demonstrates some of the capabilities of the Obsidian API.",
 	"author": "Obsidian",
diff --git a/plugin/package-lock.json b/plugin/package-lock.json
index ebc4236d..04a2879d 100644
--- a/plugin/package-lock.json
+++ b/plugin/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "obsidian-sample-plugin",
-	"version": "0.0.6",
+	"version": "0.0.7",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "obsidian-sample-plugin",
-			"version": "0.0.6",
+			"version": "0.0.7",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/node": "^16.11.6",
diff --git a/plugin/package.json b/plugin/package.json
index b94daf97..602f5a22 100644
--- a/plugin/package.json
+++ b/plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "obsidian-sample-plugin",
-	"version": "0.0.6",
+	"version": "0.0.7",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {
diff --git a/plugin/versions.json b/plugin/versions.json
index a714326c..9af17e8c 100644
--- a/plugin/versions.json
+++ b/plugin/versions.json
@@ -5,5 +5,6 @@
 	"0.0.3": "0.0.0",
 	"0.0.4": "0.0.0",
 	"0.0.5": "0.0.0",
-	"0.0.6": "0.0.0"
+	"0.0.6": "0.0.0",
+	"0.0.7": "0.0.0"
 }
\ No newline at end of file

From 9e9ee06f1590ac5b5f1c8b5a4bd9241b37fdcfba Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 20 Dec 2024 20:50:11 +0000
Subject: [PATCH 023/761] Update for brat

---
 manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index e344441d..b9574fd7 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "sample-plugin",
 	"name": "Sync & Share",
-	"version": "0.0.6",
+	"version": "0.0.7",
 	"minAppVersion": "0.0.0",
 	"description": "Demonstrates some of the capabilities of the Obsidian API.",
 	"author": "Obsidian",

From cfdad5f6088de4b8659a6f8ade596f1867af818f Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 2 Jan 2025 09:16:32 +0000
Subject: [PATCH 024/761] Rename locks

---
 .../src/sync-operations/{locks.ts => document-lock.ts} | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
 rename plugin/src/sync-operations/{locks.ts => document-lock.ts} (77%)

diff --git a/plugin/src/sync-operations/locks.ts b/plugin/src/sync-operations/document-lock.ts
similarity index 77%
rename from plugin/src/sync-operations/locks.ts
rename to plugin/src/sync-operations/document-lock.ts
index 8a28249e..a8a3b356 100644
--- a/plugin/src/sync-operations/locks.ts
+++ b/plugin/src/sync-operations/document-lock.ts
@@ -1,7 +1,7 @@
 import type { RelativePath } from "src/database/document-metadata";
 
-const locked = new Set<RelativePath>(),
-	waiters = new Map<RelativePath, (() => void)[]>();
+const locked = new Set<RelativePath>();
+const waiters = new Map<RelativePath, (() => void)[]>();
 
 export function tryLockDocument(relativePath: RelativePath): boolean {
 	if (locked.has(relativePath)) {
@@ -32,10 +32,14 @@ export async function waitForDocumentLock(
 
 export function unlockDocument(relativePath: RelativePath): void {
 	if (!locked.has(relativePath)) {
-		throw new Error(`Document ${relativePath} is not locked`);
+		throw new Error(
+			`Document ${relativePath} is not locked, cannot unlock`
+		);
 	}
 
+	// Remove the first element to ensure FIFO unblocking order
 	const nextWaiting = waiters.get(relativePath)?.shift();
+
 	if (nextWaiting) {
 		nextWaiting();
 	} else {

From 0d2b0e6de06e07d2aee00bd5e136f925f284f687 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 2 Jan 2025 10:52:05 +0000
Subject: [PATCH 025/761] Merge sync functions into class

---
 .../apply-local-changes-remotely.ts           | 130 ----
 .../sync-locally-created-file.ts              |  97 ---
 .../sync-locally-deleted-file.ts              |  69 --
 .../sync-locally-updated-file.ts              | 150 -----
 .../sync-remotely-updated-file.ts             | 160 -----
 plugin/src/sync-operations/syncer.ts          | 623 ++++++++++++++++++
 6 files changed, 623 insertions(+), 606 deletions(-)
 delete mode 100644 plugin/src/sync-operations/apply-local-changes-remotely.ts
 delete mode 100644 plugin/src/sync-operations/sync-locally-created-file.ts
 delete mode 100644 plugin/src/sync-operations/sync-locally-deleted-file.ts
 delete mode 100644 plugin/src/sync-operations/sync-locally-updated-file.ts
 delete mode 100644 plugin/src/sync-operations/sync-remotely-updated-file.ts
 create mode 100644 plugin/src/sync-operations/syncer.ts

diff --git a/plugin/src/sync-operations/apply-local-changes-remotely.ts b/plugin/src/sync-operations/apply-local-changes-remotely.ts
deleted file mode 100644
index 86a60c52..00000000
--- a/plugin/src/sync-operations/apply-local-changes-remotely.ts
+++ /dev/null
@@ -1,130 +0,0 @@
-import type { Database } from "../database/database";
-import type { SyncService } from "../services/sync-service";
-import type { FileOperations } from "../file-operations/file-operations";
-import { syncLocallyCreatedFile } from "./sync-locally-created-file";
-import { EMPTY_HASH, hash } from "src/utils/hash";
-import { syncLocallyUpdatedFile } from "./sync-locally-updated-file";
-import { syncLocallyDeletedFile } from "./sync-locally-deleted-file";
-import { Logger } from "src/tracing/logger";
-import type { SyncHistory } from "src/tracing/sync-history";
-
-let isRunning = false;
-
-export async function applyLocalChangesRemotely({
-	database,
-	syncServer,
-	operations,
-	history,
-}: {
-	database: Database;
-	syncServer: SyncService;
-	operations: FileOperations;
-	history: SyncHistory;
-}): Promise<void> {
-	if (isRunning) {
-		Logger.getInstance().debug(
-			"Uploading local changes is already in progress, skipping"
-		);
-		return;
-	}
-
-	isRunning = true;
-	try {
-		const tasks: Promise<void>[] = [];
-
-		const allLocalFiles = await operations.listAllFiles();
-		const locallyDeletedFiles = [
-			...database.getDocuments().entries(),
-		].filter(([path, _]) => !allLocalFiles.includes(path));
-
-		await Promise.all(
-			allLocalFiles.map(async (path) => {
-				const metadata = database.getDocument(path);
-				if (!metadata) {
-					const contentHash = hash(await operations.read(path));
-					const match = locallyDeletedFiles.find(
-						([_, document]) => document.hash === contentHash
-					);
-
-					if (contentHash != EMPTY_HASH && match) {
-						locallyDeletedFiles.remove(match);
-
-						Logger.getInstance().debug(
-							`Document ${path} not found in database but found under a different path ${match[0]}, scheduling sync to update it`
-						);
-						return syncLocallyUpdatedFile({
-							database,
-							syncServer,
-							operations,
-							history,
-							oldPath: match[0],
-							relativePath: path,
-							updateTime: await operations.getModificationTime(
-								path
-							),
-						});
-					}
-
-					Logger.getInstance().debug(
-						`Document ${path} not found in database, scheduling sync to create it`
-					);
-					return syncLocallyCreatedFile({
-						database,
-						syncServer,
-						operations,
-						history,
-						updateTime: await operations.getModificationTime(path),
-						relativePath: path,
-					});
-				}
-
-				const content = await operations.read(path);
-				if (metadata.hash !== hash(content)) {
-					Logger.getInstance().debug(
-						`Document ${path} has been updated locally, scheduling sync to update it`
-					);
-					return syncLocallyUpdatedFile({
-						database,
-						syncServer,
-						operations,
-						history,
-						relativePath: path,
-						updateTime: await operations.getModificationTime(path),
-					});
-				}
-
-				return Promise.resolve();
-			})
-		);
-
-		tasks.push(
-			...locallyDeletedFiles.map(async ([relativePath, _]) => {
-				Logger.getInstance().debug(
-					`Document ${relativePath} has been deleted locally, scheduling sync to delete it`
-				);
-
-				return syncLocallyDeletedFile({
-					database,
-					syncServer,
-					history,
-					relativePath,
-				});
-			})
-		);
-
-		try {
-			await Promise.all(tasks);
-			Logger.getInstance().info(
-				`All local changes have been applied remotely`
-			);
-			return;
-		} catch {
-			await Promise.allSettled(tasks);
-			Logger.getInstance().error(
-				`Not all local changes have been applied remotely`
-			);
-		}
-	} finally {
-		isRunning = false;
-	}
-}
diff --git a/plugin/src/sync-operations/sync-locally-created-file.ts b/plugin/src/sync-operations/sync-locally-created-file.ts
deleted file mode 100644
index 22c59169..00000000
--- a/plugin/src/sync-operations/sync-locally-created-file.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-import * as lib from "../../../backend/sync_lib/pkg/sync_lib.js";
-import type { Database } from "src/database/database";
-import type { SyncService } from "src/services/sync-service";
-import { hash } from "src/utils/hash";
-import { unlockDocument, waitForDocumentLock } from "./locks";
-import type { FileOperations } from "src/file-operations/file-operations";
-import type { RelativePath } from "src/database/document-metadata";
-import type { SyncHistory } from "src/tracing/sync-history.js";
-import { SyncSource, SyncStatus, SyncType } from "src/tracing/sync-history.js";
-import { Logger } from "src/tracing/logger.js";
-
-export async function syncLocallyCreatedFile({
-	database,
-	syncServer,
-	operations,
-	history,
-	updateTime,
-	relativePath,
-}: {
-	database: Database;
-	syncServer: SyncService;
-	operations: FileOperations;
-	history: SyncHistory;
-	updateTime: Date;
-	relativePath: RelativePath;
-}): Promise<void> {
-	if (!database.getSettings().isSyncEnabled) {
-		Logger.getInstance().info(
-			`Syncing is disabled, not syncing ${relativePath}`
-		);
-		return;
-	}
-	Logger.getInstance().debug(`Syncing ${relativePath}`);
-
-	await waitForDocumentLock(relativePath);
-
-	try {
-		const metadata = database.getDocument(relativePath);
-		if (metadata) {
-			Logger.getInstance().debug(
-				`Document metadata already exists for ${relativePath}, it must have been downloaded from the server`
-			);
-		}
-
-		const contentBytes = await operations.read(relativePath);
-		const contentHash = hash(contentBytes);
-
-		const response = await syncServer.create({
-			relativePath,
-			contentBytes,
-			createdDate: updateTime,
-		});
-
-		history.addHistoryEntry({
-			status: SyncStatus.SUCCESS,
-			source: SyncSource.PUSH,
-			relativePath,
-			message: `Successfully uploaded locally created file`,
-			type: SyncType.CREATE,
-		});
-
-		const responseBytes = lib.base64_to_bytes(response.contentBase64);
-		const responseHash = hash(responseBytes);
-
-		if (contentHash !== responseHash) {
-			await operations.write(relativePath, contentBytes, responseBytes);
-			history.addHistoryEntry({
-				status: SyncStatus.SUCCESS,
-				source: SyncSource.PULL,
-				relativePath,
-				message: `The file we created locally has already existed remotely, so we have merged them`,
-				type: SyncType.UPDATE,
-			});
-		}
-
-		await database.setDocument({
-			documentId: response.documentId,
-			relativePath: response.relativePath,
-			parentVersionId: response.vaultUpdateId,
-			hash: responseHash,
-		});
-
-		if (database.getLastSeenUpdateId() === response.vaultUpdateId - 1) {
-			await database.setLastSeenUpdateId(response.vaultUpdateId);
-		}
-	} catch (e) {
-		history.addHistoryEntry({
-			status: SyncStatus.ERROR,
-			relativePath,
-			message: `Failed to reconcile locally created file: ${e}`,
-			type: SyncType.CREATE,
-		});
-		throw e;
-	} finally {
-		unlockDocument(relativePath);
-	}
-}
diff --git a/plugin/src/sync-operations/sync-locally-deleted-file.ts b/plugin/src/sync-operations/sync-locally-deleted-file.ts
deleted file mode 100644
index 4e7e1db6..00000000
--- a/plugin/src/sync-operations/sync-locally-deleted-file.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-import type { Database } from "src/database/database";
-import type { RelativePath } from "src/database/document-metadata";
-import type { SyncService } from "src/services/sync-service";
-import { unlockDocument, waitForDocumentLock } from "./locks";
-import { Logger } from "src/tracing/logger";
-import type { SyncHistory } from "src/tracing/sync-history";
-import { SyncSource, SyncStatus, SyncType } from "src/tracing/sync-history";
-
-export async function syncLocallyDeletedFile({
-	database,
-	syncServer,
-	history,
-	relativePath,
-}: {
-	database: Database;
-	syncServer: SyncService;
-	history: SyncHistory;
-	relativePath: RelativePath;
-}): Promise<void> {
-	if (!database.getSettings().isSyncEnabled) {
-		Logger.getInstance().info(
-			`Syncing is disabled, not syncing ${relativePath}`
-		);
-		return;
-	}
-	Logger.getInstance().debug(`Syncing ${relativePath}`);
-
-	await waitForDocumentLock(relativePath);
-
-	try {
-		const metadata = database.getDocument(relativePath);
-		if (!metadata) {
-			history.addHistoryEntry({
-				status: SyncStatus.NO_OP,
-				relativePath,
-				message: `Locally deleted file hasn't been uploaded yet, so there's no need to delete it on the remote server`,
-				type: SyncType.DELETE,
-			});
-			return;
-		}
-
-		await syncServer.delete({
-			documentId: metadata.documentId,
-			relativePath,
-			// We got the event now, so it must have been deleted just now
-			createdDate: new Date(),
-		});
-
-		history.addHistoryEntry({
-			status: SyncStatus.SUCCESS,
-			source: SyncSource.PUSH,
-			relativePath,
-			message: `Successfully deleted locally deleted file on the remote server`,
-			type: SyncType.DELETE,
-		});
-
-		await database.removeDocument(relativePath);
-	} catch (e) {
-		history.addHistoryEntry({
-			status: SyncStatus.ERROR,
-			relativePath,
-			message: `Failed to remotely delete locally deleted file: ${e}`,
-			type: SyncType.DELETE,
-		});
-		throw e;
-	} finally {
-		unlockDocument(relativePath);
-	}
-}
diff --git a/plugin/src/sync-operations/sync-locally-updated-file.ts b/plugin/src/sync-operations/sync-locally-updated-file.ts
deleted file mode 100644
index e27873f1..00000000
--- a/plugin/src/sync-operations/sync-locally-updated-file.ts
+++ /dev/null
@@ -1,150 +0,0 @@
-import * as lib from "../../../backend/sync_lib/pkg/sync_lib.js";
-import type { Database } from "src/database/database";
-import type { SyncService } from "src/services/sync-service";
-import { hash } from "src/utils/hash";
-import { unlockDocument, waitForDocumentLock } from "./locks";
-import type { FileOperations } from "src/file-operations/file-operations";
-import type { RelativePath } from "src/database/document-metadata";
-import { Logger } from "src/tracing/logger.js";
-import type { SyncHistory } from "src/tracing/sync-history.js";
-import { SyncSource, SyncStatus, SyncType } from "src/tracing/sync-history.js";
-
-/// This can be used when updating a file's content and/or path.
-export async function syncLocallyUpdatedFile({
-	database,
-	syncServer,
-	operations,
-	history,
-	updateTime,
-	relativePath,
-	oldPath,
-}: {
-	database: Database;
-	syncServer: SyncService;
-	operations: FileOperations;
-	history: SyncHistory;
-	updateTime: Date;
-	relativePath: RelativePath;
-	oldPath?: RelativePath;
-}): Promise<void> {
-	if (!database.getSettings().isSyncEnabled) {
-		Logger.getInstance().info(
-			`Syncing is disabled, not syncing ${relativePath}`
-		);
-		return;
-	}
-	Logger.getInstance().debug(`Syncing ${relativePath}`);
-
-	await waitForDocumentLock(relativePath);
-
-	try {
-		const metadata = database.getDocument(oldPath ?? relativePath);
-		if (!metadata) {
-			throw new Error(
-				`Document metadata not found for ${relativePath}. Consider resetting the plugin's sync history.`
-			);
-		}
-
-		const contentBytes = await operations.read(relativePath);
-		const contentHash = hash(contentBytes);
-
-		if (metadata.hash === contentHash && oldPath !== undefined) {
-			history.addHistoryEntry({
-				status: SyncStatus.NO_OP,
-				relativePath,
-				message: `File hash matches with last synced version, no need to sync`,
-				type: SyncType.UPDATE,
-			});
-			return;
-		}
-
-		const response = await syncServer.put({
-			documentId: metadata.documentId,
-			parentVersionId: metadata.parentVersionId,
-			relativePath,
-			contentBytes,
-			createdDate: updateTime,
-		});
-
-		history.addHistoryEntry({
-			status: SyncStatus.SUCCESS,
-			source: SyncSource.PUSH,
-			relativePath,
-			message: `Successfully uploaded locally updated file to the remote server`,
-			type: SyncType.UPDATE,
-		});
-
-		if (response.isDeleted) {
-			await operations.remove(oldPath ?? relativePath);
-			await database.removeDocument(oldPath ?? relativePath);
-
-			if (database.getLastSeenUpdateId() === response.vaultUpdateId - 1) {
-				await database.setLastSeenUpdateId(response.vaultUpdateId);
-			}
-
-			history.addHistoryEntry({
-				status: SyncStatus.SUCCESS,
-				source: SyncSource.PULL,
-				relativePath,
-				message:
-					"The file we tried to update had been deleted remotely, therefore, we have deleted it locally",
-				type: SyncType.DELETE,
-			});
-
-			return;
-		}
-
-		const responseBytes = lib.base64_to_bytes(response.contentBase64);
-		const responseHash = hash(responseBytes);
-
-		if (response.relativePath != relativePath) {
-			await waitForDocumentLock(response.relativePath);
-
-			try {
-				await operations.move(
-					oldPath ?? relativePath,
-					response.relativePath
-				);
-				await operations.write(
-					response.relativePath,
-					contentBytes,
-					responseBytes
-				);
-				history.addHistoryEntry({
-					status: SyncStatus.SUCCESS,
-					source: SyncSource.PULL,
-					relativePath,
-					message:
-						"The file we updated had been moved remotely, therefore, we have moved it locally as well",
-					type: SyncType.UPDATE,
-				});
-			} finally {
-				unlockDocument(response.relativePath);
-			}
-		} else if (contentHash !== responseHash) {
-			await operations.write(relativePath, contentBytes, responseBytes);
-		}
-
-		await database.moveDocument({
-			documentId: metadata.documentId,
-			oldRelativePath: oldPath ?? relativePath,
-			relativePath: response.relativePath,
-			parentVersionId: response.vaultUpdateId,
-			hash: responseHash,
-		});
-
-		if (database.getLastSeenUpdateId() === response.vaultUpdateId - 1) {
-			await database.setLastSeenUpdateId(response.vaultUpdateId);
-		}
-	} catch (e) {
-		history.addHistoryEntry({
-			status: SyncStatus.ERROR,
-			relativePath,
-			message: `Failed to reconcile locally updated file: ${e}`,
-			type: SyncType.UPDATE,
-		});
-		throw e;
-	} finally {
-		unlockDocument(relativePath);
-	}
-}
diff --git a/plugin/src/sync-operations/sync-remotely-updated-file.ts b/plugin/src/sync-operations/sync-remotely-updated-file.ts
deleted file mode 100644
index d26d0806..00000000
--- a/plugin/src/sync-operations/sync-remotely-updated-file.ts
+++ /dev/null
@@ -1,160 +0,0 @@
-import type { Database } from "src/database/database";
-import { unlockDocument, waitForDocumentLock } from "./locks";
-import type { SyncService } from "src/services/sync-service";
-import * as lib from "../../../backend/sync_lib/pkg/sync_lib.js";
-import { hash } from "src/utils/hash";
-import type { components } from "src/services/types";
-import type { FileOperations } from "src/file-operations/file-operations";
-import { Logger } from "src/tracing/logger";
-import type { SyncHistory } from "src/tracing/sync-history";
-import { SyncSource, SyncStatus, SyncType } from "src/tracing/sync-history";
-
-export async function syncRemotelyUpdatedFile({
-	database,
-	syncServer,
-	operations,
-	history,
-	remoteVersion,
-}: {
-	database: Database;
-	syncServer: SyncService;
-	operations: FileOperations;
-	history: SyncHistory;
-	remoteVersion: components["schemas"]["DocumentVersionWithoutContent"];
-}): Promise<void> {
-	Logger.getInstance().debug(
-		`Syncing remotely updated file ${remoteVersion.relativePath}`
-	);
-
-	await waitForDocumentLock(remoteVersion.relativePath);
-
-	try {
-		const currentVersion = database.getDocumentByDocumentId(
-			remoteVersion.documentId
-		);
-
-		if (!currentVersion) {
-			if (remoteVersion.isDeleted) {
-				history.addHistoryEntry({
-					status: SyncStatus.NO_OP,
-					source: SyncSource.PULL,
-					relativePath: remoteVersion.relativePath,
-					message: `Remotely deleted file hasn't been synced yet, so there's no need to delete it locally`,
-					type: SyncType.DELETE,
-				});
-				return;
-			}
-
-			const content = (
-				await syncServer.get({
-					documentId: remoteVersion.documentId,
-				})
-			).contentBase64;
-			const contentBytes = lib.base64_to_bytes(content);
-			const contentHash = hash(contentBytes);
-
-			await operations.create(remoteVersion.relativePath, contentBytes);
-			await database.setDocument({
-				documentId: remoteVersion.documentId,
-				relativePath: remoteVersion.relativePath,
-				parentVersionId: remoteVersion.vaultUpdateId,
-				hash: contentHash,
-			});
-			history.addHistoryEntry({
-				status: SyncStatus.SUCCESS,
-				source: SyncSource.PULL,
-				relativePath: remoteVersion.relativePath,
-				message: `Successfully downloaded remote file which hasn't existed locally`,
-				type: SyncType.CREATE,
-			});
-			return;
-		}
-
-		const [relativePath, metadata] = currentVersion;
-		if (metadata.parentVersionId === remoteVersion.vaultUpdateId) {
-			Logger.getInstance().debug(
-				`Document ${relativePath} is already up to date`
-			);
-			return;
-		}
-
-		if (relativePath !== remoteVersion.relativePath) {
-			await waitForDocumentLock(relativePath);
-		}
-
-		try {
-			if (remoteVersion.isDeleted) {
-				await operations.remove(relativePath);
-				await database.removeDocument(relativePath);
-
-				history.addHistoryEntry({
-					status: SyncStatus.SUCCESS,
-					source: SyncSource.PULL,
-					relativePath: remoteVersion.relativePath,
-					message: `Successfully deleted remotely deleted file locally`,
-					type: SyncType.DELETE,
-				});
-			} else {
-				const currentContent = await operations.read(relativePath);
-				const currentHash = hash(currentContent);
-
-				if (currentHash !== metadata.hash) {
-					Logger.getInstance().info(
-						`Document ${relativePath} has been updated both remotely and locally, skipping until the event is processed`
-					);
-					return;
-				}
-
-				const content = (
-					await syncServer.get({
-						documentId: remoteVersion.documentId,
-					})
-				).contentBase64;
-				const contentBytes = lib.base64_to_bytes(content);
-				const contentHash = hash(contentBytes);
-
-				if (relativePath !== remoteVersion.relativePath) {
-					await operations.move(
-						relativePath,
-						remoteVersion.relativePath
-					);
-				}
-
-				await operations.write(
-					remoteVersion.relativePath,
-					currentContent,
-					contentBytes
-				);
-				await database.moveDocument({
-					documentId: remoteVersion.documentId,
-					oldRelativePath: relativePath,
-					relativePath: remoteVersion.relativePath,
-					parentVersionId: remoteVersion.vaultUpdateId,
-					hash: contentHash,
-				});
-
-				history.addHistoryEntry({
-					status: SyncStatus.SUCCESS,
-					source: SyncSource.PULL,
-					relativePath: remoteVersion.relativePath,
-					message: `Successfully updated remotely updated file locally`,
-					type: SyncType.UPDATE,
-				});
-			}
-		} finally {
-			if (relativePath !== remoteVersion.relativePath) {
-				unlockDocument(relativePath);
-			}
-		}
-	} catch (e) {
-		history.addHistoryEntry({
-			status: SyncStatus.ERROR,
-			source: SyncSource.PULL,
-			relativePath: remoteVersion.relativePath,
-			message: `Failed to reconcile remotely updated file: ${e}`,
-		});
-		throw e;
-	} finally {
-		unlockDocument(remoteVersion.relativePath);
-	}
-}
diff --git a/plugin/src/sync-operations/syncer.ts b/plugin/src/sync-operations/syncer.ts
new file mode 100644
index 00000000..2d067081
--- /dev/null
+++ b/plugin/src/sync-operations/syncer.ts
@@ -0,0 +1,623 @@
+import { Database } from "src/database/database";
+import { RelativePath } from "src/database/document-metadata";
+import { FileOperations } from "src/file-operations/file-operations";
+import * as lib from "../../../backend/sync_lib/pkg/sync_lib.js";
+import { SyncService } from "src/services/sync-service";
+import { Logger } from "src/tracing/logger";
+import {
+	SyncHistory,
+	SyncSource,
+	SyncStatus,
+	SyncType,
+} from "src/tracing/sync-history";
+import { unlockDocument, waitForDocumentLock } from "./document-lock";
+import PQueue from "p-queue";
+import { EMPTY_HASH, hash } from "src/utils/hash";
+import { components } from "src/services/types.js";
+
+export class Syncer {
+	private database: Database;
+	private syncServer: SyncService;
+	private operations: FileOperations;
+	private history: SyncHistory;
+
+	private isRunningOfflineSync = false;
+
+	private readonly offlineSyncQueue: PQueue;
+	private readonly fileSyncQueue: PQueue;
+	private readonly remainingOperationsListeners: ((
+		remainingOperations: number
+	) => void)[] = [];
+
+	public constructor({
+		database,
+		syncServer,
+		operations,
+		history,
+	}: {
+		database: Database;
+		syncServer: SyncService;
+		operations: FileOperations;
+		history: SyncHistory;
+	}) {
+		this.database = database;
+		this.syncServer = syncServer;
+		this.operations = operations;
+		this.history = history;
+
+		this.fileSyncQueue = new PQueue({
+			concurrency: database.getSettings().syncConcurrency,
+		});
+		this.offlineSyncQueue = new PQueue({
+			concurrency: database.getSettings().syncConcurrency,
+		});
+
+		database.addOnSettingsChangeHandlers((settings) => {
+			this.fileSyncQueue.concurrency = settings.syncConcurrency;
+			this.offlineSyncQueue.concurrency = settings.syncConcurrency;
+		});
+
+		this.fileSyncQueue.on("active", () =>
+			this.emitRemainingOperationsChange(
+				this.fileSyncQueue.size + this.offlineSyncQueue.size
+			)
+		);
+		this.offlineSyncQueue.on("active", () =>
+			this.emitRemainingOperationsChange(
+				this.fileSyncQueue.size + this.offlineSyncQueue.size
+			)
+		);
+	}
+
+	public addRemainingOperationsListener(
+		listener: (remainingOperations: number) => void
+	): void {
+		this.remainingOperationsListeners.push(listener);
+	}
+
+	public async syncLocallyCreatedFile(
+		relativePath: RelativePath,
+		updateTime: Date
+	): Promise<void> {
+		await this.safelySync(async () => {
+			try {
+				const metadata = this.database.getDocument(relativePath);
+				if (metadata) {
+					Logger.getInstance().debug(
+						`Document metadata already exists for ${relativePath}, it must have been downloaded from the server`
+					);
+				}
+
+				const contentBytes = await this.operations.read(relativePath);
+				const contentHash = hash(contentBytes);
+
+				const response = await this.syncServer.create({
+					relativePath,
+					contentBytes,
+					createdDate: updateTime,
+				});
+
+				this.history.addHistoryEntry({
+					status: SyncStatus.SUCCESS,
+					source: SyncSource.PUSH,
+					relativePath,
+					message: `Successfully uploaded locally created file`,
+					type: SyncType.CREATE,
+				});
+
+				const responseBytes = lib.base64_to_bytes(
+					response.contentBase64
+				);
+				const responseHash = hash(responseBytes);
+
+				if (contentHash !== responseHash) {
+					await this.operations.write(
+						relativePath,
+						contentBytes,
+						responseBytes
+					);
+					this.history.addHistoryEntry({
+						status: SyncStatus.SUCCESS,
+						source: SyncSource.PULL,
+						relativePath,
+						message: `The file we created locally has already existed remotely, so we have merged them`,
+						type: SyncType.UPDATE,
+					});
+				}
+
+				await this.database.setDocument({
+					documentId: response.documentId,
+					relativePath: response.relativePath,
+					parentVersionId: response.vaultUpdateId,
+					hash: responseHash,
+				});
+
+				if (
+					this.database.getLastSeenUpdateId() ===
+					response.vaultUpdateId - 1
+				) {
+					await this.database.setLastSeenUpdateId(
+						response.vaultUpdateId
+					);
+				}
+			} catch (e) {
+				this.history.addHistoryEntry({
+					status: SyncStatus.ERROR,
+					relativePath,
+					message: `Failed to reconcile locally created file: ${e}`,
+					type: SyncType.CREATE,
+				});
+				throw e;
+			}
+		}, relativePath);
+	}
+
+	public async syncLocallyDeletedFile(
+		relativePath: RelativePath
+	): Promise<void> {
+		await this.safelySync(async () => {
+			try {
+				const metadata = this.database.getDocument(relativePath);
+				if (!metadata) {
+					this.history.addHistoryEntry({
+						status: SyncStatus.NO_OP,
+						relativePath,
+						message: `Locally deleted file hasn't been uploaded yet, so there's no need to delete it on the remote server`,
+						type: SyncType.DELETE,
+					});
+					return;
+				}
+
+				await this.syncServer.delete({
+					documentId: metadata.documentId,
+					relativePath,
+					// We got the event now, so it must have been deleted just now
+					createdDate: new Date(),
+				});
+
+				this.history.addHistoryEntry({
+					status: SyncStatus.SUCCESS,
+					source: SyncSource.PUSH,
+					relativePath,
+					message: `Successfully deleted locally deleted file on the remote server`,
+					type: SyncType.DELETE,
+				});
+
+				await this.database.removeDocument(relativePath);
+			} catch (e) {
+				this.history.addHistoryEntry({
+					status: SyncStatus.ERROR,
+					relativePath,
+					message: `Failed to remotely delete locally deleted file: ${e}`,
+					type: SyncType.DELETE,
+				});
+				throw e;
+			}
+		}, relativePath);
+	}
+
+	public async syncLocallyUpdatedFile({
+		oldPath,
+		relativePath,
+		updateTime,
+	}: {
+		oldPath?: RelativePath;
+		relativePath: RelativePath;
+		updateTime: Date;
+	}): Promise<void> {
+		await this.safelySync(async () => {
+			try {
+				const metadata = this.database.getDocument(
+					oldPath ?? relativePath
+				);
+				if (!metadata) {
+					throw new Error(
+						`Document metadata not found for ${relativePath}. Consider resetting the plugin's sync history.`
+					);
+				}
+
+				const contentBytes = await this.operations.read(relativePath);
+				const contentHash = hash(contentBytes);
+
+				if (metadata.hash === contentHash && oldPath !== undefined) {
+					this.history.addHistoryEntry({
+						status: SyncStatus.NO_OP,
+						relativePath,
+						message: `File hash matches with last synced version, no need to sync`,
+						type: SyncType.UPDATE,
+					});
+					return;
+				}
+
+				const response = await this.syncServer.put({
+					documentId: metadata.documentId,
+					parentVersionId: metadata.parentVersionId,
+					relativePath,
+					contentBytes,
+					createdDate: updateTime,
+				});
+
+				this.history.addHistoryEntry({
+					status: SyncStatus.SUCCESS,
+					source: SyncSource.PUSH,
+					relativePath,
+					message: `Successfully uploaded locally updated file to the remote server`,
+					type: SyncType.UPDATE,
+				});
+
+				if (response.isDeleted) {
+					await this.operations.remove(oldPath ?? relativePath);
+					await this.database.removeDocument(oldPath ?? relativePath);
+
+					if (
+						this.database.getLastSeenUpdateId() ===
+						response.vaultUpdateId - 1
+					) {
+						await this.database.setLastSeenUpdateId(
+							response.vaultUpdateId
+						);
+					}
+
+					this.history.addHistoryEntry({
+						status: SyncStatus.SUCCESS,
+						source: SyncSource.PULL,
+						relativePath,
+						message:
+							"The file we tried to update had been deleted remotely, therefore, we have deleted it locally",
+						type: SyncType.DELETE,
+					});
+
+					return;
+				}
+
+				const responseBytes = lib.base64_to_bytes(
+					response.contentBase64
+				);
+				const responseHash = hash(responseBytes);
+
+				if (response.relativePath != relativePath) {
+					await waitForDocumentLock(response.relativePath);
+
+					try {
+						await this.operations.move(
+							oldPath ?? relativePath,
+							response.relativePath
+						);
+						await this.operations.write(
+							response.relativePath,
+							contentBytes,
+							responseBytes
+						);
+						this.history.addHistoryEntry({
+							status: SyncStatus.SUCCESS,
+							source: SyncSource.PULL,
+							relativePath,
+							message:
+								"The file we updated had been moved remotely, therefore, we have moved it locally as well",
+							type: SyncType.UPDATE,
+						});
+					} finally {
+						unlockDocument(response.relativePath);
+					}
+				} else if (contentHash !== responseHash) {
+					await this.operations.write(
+						relativePath,
+						contentBytes,
+						responseBytes
+					);
+				}
+
+				await this.database.moveDocument({
+					documentId: metadata.documentId,
+					oldRelativePath: oldPath ?? relativePath,
+					relativePath: response.relativePath,
+					parentVersionId: response.vaultUpdateId,
+					hash: responseHash,
+				});
+
+				if (
+					this.database.getLastSeenUpdateId() ===
+					response.vaultUpdateId - 1
+				) {
+					await this.database.setLastSeenUpdateId(
+						response.vaultUpdateId
+					);
+				}
+			} catch (e) {
+				this.history.addHistoryEntry({
+					status: SyncStatus.ERROR,
+					relativePath,
+					message: `Failed to reconcile locally updated file: ${e}`,
+					type: SyncType.UPDATE,
+				});
+				throw e;
+			}
+		}, relativePath);
+	}
+
+	public async scheduleSyncForOfflineChanges(): Promise<void> {
+		if (this.isRunningOfflineSync) {
+			Logger.getInstance().warn(
+				"Uploading local changes is already in progress, skipping"
+			);
+			return;
+		}
+
+		if (!this.database.getSettings().isSyncEnabled) {
+			Logger.getInstance().debug(
+				`Syncing is disabled, not uploading local changes`
+			);
+			return;
+		}
+
+		this.isRunningOfflineSync = true;
+
+		try {
+			const allLocalFiles = await this.operations.listAllFiles();
+			const locallyDeletedFiles = [
+				...this.database.getDocuments().entries(),
+			].filter(([path, _]) => !allLocalFiles.includes(path));
+
+			await Promise.all(
+				allLocalFiles.map((relativePath) =>
+					this.offlineSyncQueue.add(async () => {
+						const metadata =
+							this.database.getDocument(relativePath);
+						if (!metadata) {
+							const contentHash = hash(
+								await this.operations.read(relativePath)
+							);
+							const match = locallyDeletedFiles.find(
+								([_, document]) => document.hash === contentHash
+							);
+
+							if (contentHash != EMPTY_HASH && match) {
+								locallyDeletedFiles.remove(match);
+
+								Logger.getInstance().debug(
+									`Document ${relativePath} not found in database but found under a different path ${match[0]}, scheduling sync to move it`
+								);
+								return this.syncLocallyUpdatedFile({
+									oldPath: match[0],
+									relativePath: relativePath,
+									updateTime:
+										await this.operations.getModificationTime(
+											relativePath
+										),
+								});
+							}
+
+							Logger.getInstance().debug(
+								`Document ${relativePath} not found in database, scheduling sync to create it`
+							);
+							return this.syncLocallyCreatedFile(
+								relativePath,
+								await this.operations.getModificationTime(
+									relativePath
+								)
+							);
+						}
+
+						const content = await this.operations.read(
+							relativePath
+						);
+						if (metadata.hash !== hash(content)) {
+							Logger.getInstance().debug(
+								`Document ${relativePath} has been updated locally, scheduling sync to update it`
+							);
+							return this.syncLocallyUpdatedFile({
+								relativePath: relativePath,
+								updateTime:
+									await this.operations.getModificationTime(
+										relativePath
+									),
+							});
+						}
+
+						this.history.addHistoryEntry({
+							status: SyncStatus.NO_OP,
+							source: SyncSource.PUSH,
+							relativePath,
+							message:
+								"Document hasn't been updated locally, no need to sync",
+						});
+						return Promise.resolve();
+					})
+				)
+			);
+
+			await Promise.all(
+				locallyDeletedFiles.map(async ([relativePath, _]) => {
+					Logger.getInstance().debug(
+						`Document ${relativePath} has been deleted locally, scheduling sync to delete it`
+					);
+
+					return this.syncLocallyDeletedFile(relativePath);
+				})
+			);
+
+			Logger.getInstance().info(
+				`All local changes have been applied remotely`
+			);
+		} catch (e) {
+			Logger.getInstance().error(
+				`Not all local changes have been applied remotely: ${e}`
+			);
+		} finally {
+			this.isRunningOfflineSync = false;
+		}
+	}
+
+	public async syncRemotelyUpdatedFile(
+		remoteVersion: components["schemas"]["DocumentVersionWithoutContent"]
+	): Promise<void> {
+		await this.safelySync(async () => {
+			try {
+				const currentVersion = this.database.getDocumentByDocumentId(
+					remoteVersion.documentId
+				);
+
+				if (!currentVersion) {
+					if (remoteVersion.isDeleted) {
+						this.history.addHistoryEntry({
+							status: SyncStatus.NO_OP,
+							source: SyncSource.PULL,
+							relativePath: remoteVersion.relativePath,
+							message: `Remotely deleted file hasn't been synced yet, so there's no need to delete it locally`,
+							type: SyncType.DELETE,
+						});
+						return;
+					}
+
+					const content = (
+						await this.syncServer.get({
+							documentId: remoteVersion.documentId,
+						})
+					).contentBase64;
+					const contentBytes = lib.base64_to_bytes(content);
+					const contentHash = hash(contentBytes);
+
+					await this.operations.create(
+						remoteVersion.relativePath,
+						contentBytes
+					);
+					await this.database.setDocument({
+						documentId: remoteVersion.documentId,
+						relativePath: remoteVersion.relativePath,
+						parentVersionId: remoteVersion.vaultUpdateId,
+						hash: contentHash,
+					});
+					this.history.addHistoryEntry({
+						status: SyncStatus.SUCCESS,
+						source: SyncSource.PULL,
+						relativePath: remoteVersion.relativePath,
+						message: `Successfully downloaded remote file which hasn't existed locally`,
+						type: SyncType.CREATE,
+					});
+					return;
+				}
+
+				const [relativePath, metadata] = currentVersion;
+				if (metadata.parentVersionId === remoteVersion.vaultUpdateId) {
+					Logger.getInstance().debug(
+						`Document ${relativePath} is already up to date`
+					);
+					return;
+				}
+
+				if (relativePath !== remoteVersion.relativePath) {
+					await waitForDocumentLock(relativePath);
+				}
+
+				try {
+					if (remoteVersion.isDeleted) {
+						await this.operations.remove(relativePath);
+						await this.database.removeDocument(relativePath);
+
+						this.history.addHistoryEntry({
+							status: SyncStatus.SUCCESS,
+							source: SyncSource.PULL,
+							relativePath: remoteVersion.relativePath,
+							message: `Successfully deleted remotely deleted file locally`,
+							type: SyncType.DELETE,
+						});
+					} else {
+						const currentContent = await this.operations.read(
+							relativePath
+						);
+						const currentHash = hash(currentContent);
+
+						if (currentHash !== metadata.hash) {
+							Logger.getInstance().info(
+								`Document ${relativePath} has been updated both remotely and locally, skipping until the event is processed`
+							);
+							return;
+						}
+
+						const content = (
+							await this.syncServer.get({
+								documentId: remoteVersion.documentId,
+							})
+						).contentBase64;
+						const contentBytes = lib.base64_to_bytes(content);
+						const contentHash = hash(contentBytes);
+
+						if (relativePath !== remoteVersion.relativePath) {
+							await this.operations.move(
+								relativePath,
+								remoteVersion.relativePath
+							);
+						}
+
+						await this.operations.write(
+							remoteVersion.relativePath,
+							currentContent,
+							contentBytes
+						);
+						await this.database.moveDocument({
+							documentId: remoteVersion.documentId,
+							oldRelativePath: relativePath,
+							relativePath: remoteVersion.relativePath,
+							parentVersionId: remoteVersion.vaultUpdateId,
+							hash: contentHash,
+						});
+
+						this.history.addHistoryEntry({
+							status: SyncStatus.SUCCESS,
+							source: SyncSource.PULL,
+							relativePath: remoteVersion.relativePath,
+							message: `Successfully updated remotely updated file locally`,
+							type: SyncType.UPDATE,
+						});
+					}
+				} finally {
+					if (relativePath !== remoteVersion.relativePath) {
+						unlockDocument(relativePath);
+					}
+				}
+			} catch (e) {
+				this.history.addHistoryEntry({
+					status: SyncStatus.ERROR,
+					source: SyncSource.PULL,
+					relativePath: remoteVersion.relativePath,
+					message: `Failed to reconcile remotely updated file: ${e}`,
+				});
+				throw e;
+			}
+		}, remoteVersion.relativePath);
+	}
+
+	public async reset(): Promise<void> {
+		this.fileSyncQueue.clear();
+		await this.fileSyncQueue.onEmpty();
+		await this.database.resetSyncState();
+		this.history.reset();
+		this.remainingOperationsListeners.forEach((listener) => listener(0));
+	}
+
+	private async safelySync(
+		fn: () => Promise<void>,
+		relativePath: RelativePath
+	): Promise<void> {
+		if (!this.database.getSettings().isSyncEnabled) {
+			Logger.getInstance().info(
+				`Syncing is disabled, not syncing ${relativePath}`
+			);
+			return;
+		}
+		Logger.getInstance().debug(`Syncing ${relativePath}`);
+
+		await waitForDocumentLock(relativePath);
+		try {
+			await this.fileSyncQueue.add(fn);
+		} finally {
+			unlockDocument(relativePath);
+		}
+	}
+
+	private emitRemainingOperationsChange(remainingOperations: number): void {
+		this.remainingOperationsListeners.forEach((listener) => {
+			listener(remainingOperations);
+		});
+	}
+}

From 07d6a75c9619de4b2d5b138480e7fb3977cdb622 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 2 Jan 2025 10:52:24 +0000
Subject: [PATCH 026/761] Add blocked count into status bar

---
 plugin/src/views/status-bar.ts | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/plugin/src/views/status-bar.ts b/plugin/src/views/status-bar.ts
index a4d59d80..cc214f45 100644
--- a/plugin/src/views/status-bar.ts
+++ b/plugin/src/views/status-bar.ts
@@ -1,17 +1,31 @@
 import type { Plugin } from "obsidian";
+import { Syncer } from "src/sync-operations/syncer";
 import type { HistoryStats, SyncHistory } from "src/tracing/sync-history";
 
 export class StatusBar {
 	private readonly statusBarItem: HTMLElement;
 
-	public constructor(plugin: Plugin, history: SyncHistory) {
+	private lastHistoryStats: HistoryStats | undefined;
+	private lastRemaining: number | undefined;
+
+	public constructor(plugin: Plugin, history: SyncHistory, syncer: Syncer) {
 		this.statusBarItem = plugin.addStatusBarItem();
 		history.addSyncHistoryUpdateListener((status) => {
-			this.updateStatus(status);
+			this.lastHistoryStats = status;
+			this.updateStatus();
+		});
+
+		syncer.addRemainingOperationsListener((remainingOperations) => {
+			this.lastRemaining = remainingOperations;
+			this.updateStatus();
 		});
 	}
 
-	private updateStatus({ success, error }: HistoryStats): void {
-		this.statusBarItem.setText(`${success} ✅ ${error} ❌`);
+	private updateStatus(): void {
+		this.statusBarItem.setText(
+			`${this.lastRemaining ?? 0} ⏳ | ${
+				this.lastHistoryStats?.success ?? 0
+			} ✅ | ${this.lastHistoryStats?.error ?? 0} ❌`
+		);
 	}
 }

From 2983357946c5d5e59eca034229a0e42838efeb0c Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 2 Jan 2025 10:52:41 +0000
Subject: [PATCH 027/761] Change concurrency setting

---
 plugin/src/database/sync-settings.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugin/src/database/sync-settings.ts b/plugin/src/database/sync-settings.ts
index 2978b462..2574c814 100644
--- a/plugin/src/database/sync-settings.ts
+++ b/plugin/src/database/sync-settings.ts
@@ -3,7 +3,7 @@ export interface SyncSettings {
 	token: string;
 	vaultName: string;
 	fetchChangesUpdateIntervalMs: number;
-	uploadConcurrency: number;
+	syncConcurrency: number;
 	isSyncEnabled: boolean;
 }
 
@@ -12,6 +12,6 @@ export const DEFAULT_SETTINGS: SyncSettings = {
 	token: "",
 	vaultName: "default",
 	fetchChangesUpdateIntervalMs: 1000,
-	uploadConcurrency: 4,
+	syncConcurrency: 1,
 	isSyncEnabled: false,
 };

From fe66c0751d19ccd996f90723c86904b09f992ea7 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 2 Jan 2025 10:53:04 +0000
Subject: [PATCH 028/761] Remove HTTP queuing

---
 plugin/src/services/sync-service.ts | 142 +++++++++-------------------
 1 file changed, 45 insertions(+), 97 deletions(-)

diff --git a/plugin/src/services/sync-service.ts b/plugin/src/services/sync-service.ts
index 5a4f9636..80bee99e 100644
--- a/plugin/src/services/sync-service.ts
+++ b/plugin/src/services/sync-service.ts
@@ -10,74 +10,29 @@ import type {
 	RelativePath,
 	VaultUpdateId,
 } from "src/database/document-metadata";
-import PQueue from "p-queue";
 import { Logger } from "src/tracing/logger.js";
 
-export interface RequestCountStatus {
-	waiting: number;
-	success: number;
-	failure: number;
-}
-
 export class SyncService {
 	private client: Client<paths>;
 
-	private readonly promiseQueue: PQueue;
-	private readonly requestCountListeners: ((
-		status: RequestCountStatus
-	) => void)[] = [];
-	private readonly status: RequestCountStatus = {
-		waiting: 0,
-		success: 0,
-		failure: 0,
-	};
-
 	public constructor(private readonly database: Database) {
 		this.createClient(database.getSettings());
-		this.promiseQueue = new PQueue({
-			concurrency: database.getSettings().uploadConcurrency,
-		});
 
 		database.addOnSettingsChangeHandlers((s) => {
 			this.createClient(s);
-			this.promiseQueue.concurrency = s.uploadConcurrency;
 		});
-
-		this.promiseQueue.on("active", () => {
-			this.status.waiting = this.promiseQueue.pending;
-			this.emitRequestCountChange();
-		});
-
-		this.promiseQueue.on("completed", () => {
-			this.status.success++;
-			this.emitRequestCountChange();
-		});
-
-		this.promiseQueue.on("error", () => {
-			this.status.failure++;
-			this.emitRequestCountChange();
-		});
-	}
-
-	public addRequestCountChangeListener(
-		listener: (status: RequestCountStatus) => void
-	): void {
-		this.requestCountListeners.push(listener);
-		listener({ ...this.status });
 	}
 
 	public async ping(): Promise<components["schemas"]["PingResponse"]> {
-		const response = await this.enqueue(async () =>
-			this.client.GET("/ping", {
-				params: {
-					header: {
-						authorization: `Bearer ${
-							this.database.getSettings().token
-						}`,
-					},
+		const response = await this.client.GET("/ping", {
+			params: {
+				header: {
+					authorization: `Bearer ${
+						this.database.getSettings().token
+					}`,
 				},
-			})
-		);
+			},
+		});
 
 		Logger.getInstance().debug(
 			`Ping response: ${JSON.stringify(response.data)}`
@@ -99,8 +54,9 @@ export class SyncService {
 		contentBytes: Uint8Array;
 		createdDate: Date;
 	}): Promise<components["schemas"]["DocumentVersion"]> {
-		const response = await this.enqueue(async () =>
-			this.client.POST("/vaults/{vault_id}/documents", {
+		const response = await this.client.POST(
+			"/vaults/{vault_id}/documents",
+			{
 				params: {
 					path: {
 						vault_id: this.database.getSettings().vaultName,
@@ -116,7 +72,7 @@ export class SyncService {
 					createdDate: createdDate.toISOString(),
 					relativePath,
 				},
-			})
+			}
 		);
 
 		if (!response.data) {
@@ -124,7 +80,9 @@ export class SyncService {
 		}
 
 		Logger.getInstance().debug(
-			`Created document ${JSON.stringify(response.data)}`
+			`Created document ${JSON.stringify(
+				response.data.relativePath
+			)} with id ${response.data.documentId}`
 		);
 
 		return response.data;
@@ -143,8 +101,9 @@ export class SyncService {
 		contentBytes: Uint8Array;
 		createdDate: Date;
 	}): Promise<components["schemas"]["DocumentVersion"]> {
-		const response = await this.enqueue(async () =>
-			this.client.PUT("/vaults/{vault_id}/documents/{document_id}", {
+		const response = await this.client.PUT(
+			"/vaults/{vault_id}/documents/{document_id}",
+			{
 				params: {
 					path: {
 						vault_id: this.database.getSettings().vaultName,
@@ -162,7 +121,7 @@ export class SyncService {
 					createdDate: createdDate.toISOString(),
 					relativePath,
 				},
-			})
+			}
 		);
 
 		if (!response.data) {
@@ -170,7 +129,7 @@ export class SyncService {
 		}
 
 		Logger.getInstance().debug(
-			`Updated document ${JSON.stringify(response.data)}`
+			`Updated document ${response.data.relativePath} with id ${response.data.documentId}`
 		);
 
 		return response.data;
@@ -185,8 +144,9 @@ export class SyncService {
 		relativePath: RelativePath;
 		createdDate: Date;
 	}): Promise<void> {
-		const response = await this.enqueue(async () =>
-			this.client.DELETE("/vaults/{vault_id}/documents/{document_id}", {
+		const response = await this.client.DELETE(
+			"/vaults/{vault_id}/documents/{document_id}",
+			{
 				params: {
 					path: {
 						vault_id: this.database.getSettings().vaultName,
@@ -202,7 +162,7 @@ export class SyncService {
 					createdDate: createdDate.toISOString(),
 					relativePath,
 				},
-			})
+			}
 		);
 
 		if (response.error) {
@@ -210,7 +170,7 @@ export class SyncService {
 		}
 
 		Logger.getInstance().debug(
-			`Updated document ${JSON.stringify(response.data)}`
+			`Deleted document ${relativePath} with id ${documentId}`
 		);
 
 		return response.data;
@@ -221,8 +181,9 @@ export class SyncService {
 	}: {
 		documentId: DocumentId;
 	}): Promise<components["schemas"]["DocumentVersion"]> {
-		const response = await this.enqueue(async () =>
-			this.client.GET("/vaults/{vault_id}/documents/{document_id}", {
+		const response = await this.client.GET(
+			"/vaults/{vault_id}/documents/{document_id}",
+			{
 				params: {
 					path: {
 						vault_id: this.database.getSettings().vaultName,
@@ -234,7 +195,7 @@ export class SyncService {
 						}`,
 					},
 				},
-			})
+			}
 		);
 
 		if (!response.data) {
@@ -242,7 +203,7 @@ export class SyncService {
 		}
 
 		Logger.getInstance().debug(
-			`Get document ${JSON.stringify(response.data)}`
+			`Get document ${response.data.relativePath} with id ${response.data.documentId}`
 		);
 
 		return response.data;
@@ -251,23 +212,21 @@ export class SyncService {
 	public async getAll(
 		since?: VaultUpdateId
 	): Promise<components["schemas"]["FetchLatestDocumentsResponse"]> {
-		const response = await this.enqueue(async () =>
-			this.client.GET("/vaults/{vault_id}/documents", {
-				params: {
-					path: {
-						vault_id: this.database.getSettings().vaultName,
-					},
-					header: {
-						authorization: `Bearer ${
-							this.database.getSettings().token
-						}`,
-					},
-					query: {
-						since_update_id: since,
-					},
+		const response = await this.client.GET("/vaults/{vault_id}/documents", {
+			params: {
+				path: {
+					vault_id: this.database.getSettings().vaultName,
 				},
-			})
-		);
+				header: {
+					authorization: `Bearer ${
+						this.database.getSettings().token
+					}`,
+				},
+				query: {
+					since_update_id: since,
+				},
+			},
+		});
 
 		const { error } = response;
 		if (error) {
@@ -275,26 +234,15 @@ export class SyncService {
 		}
 
 		Logger.getInstance().debug(
-			`Get document ${JSON.stringify(response.data)}`
+			`Got ${response.data.latestDocuments.length} document metadata`
 		);
 
 		return response.data;
 	}
 
-	private emitRequestCountChange(): void {
-		this.requestCountListeners.forEach((listener) => {
-			listener({ ...this.status });
-		});
-	}
-
 	private createClient(settings: SyncSettings): void {
 		this.client = createClient<paths>({
 			baseUrl: settings.remoteUri,
 		});
 	}
-
-	private async enqueue<T>(fn: () => Promise<T>): Promise<T> {
-		// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-		return this.promiseQueue.add(fn) as Promise<T>;
-	}
 }

From 55c07f3b82d5141e9d0262b26cb5e539c7383e8f Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 2 Jan 2025 10:54:29 +0000
Subject: [PATCH 029/761] Add better log view

---
 plugin/src/styles.scss        | 20 ++++++++++++
 plugin/src/tracing/logger.ts  | 60 +++++++++++++++++++++--------------
 plugin/src/views/logs-view.ts | 32 ++++++++++---------
 3 files changed, 73 insertions(+), 39 deletions(-)

diff --git a/plugin/src/styles.scss b/plugin/src/styles.scss
index fb491395..78934cdb 100644
--- a/plugin/src/styles.scss
+++ b/plugin/src/styles.scss
@@ -3,6 +3,26 @@
 	height: 100px;
 }
 
+.log-message {
+	&.DEBUG {
+		color: var(--color-base-50);
+	}
+
+	&.INFO {
+		color: var(--color-base-70);
+	}
+
+	&.WARNING {
+		color: var(--color-yellow-70);
+	}
+
+	&.ERROR {
+		color: var(--color-red-70);
+	}
+
+	font: var(--font-monospace-theme);
+}
+
 .history-card * {
 	margin: 0;
 	padding: 0;
diff --git a/plugin/src/tracing/logger.ts b/plugin/src/tracing/logger.ts
index 1d4bb717..bc51b742 100644
--- a/plugin/src/tracing/logger.ts
+++ b/plugin/src/tracing/logger.ts
@@ -10,27 +10,6 @@ export enum LogLevel {
 class LogLine {
 	public timestamp = new Date();
 	public constructor(public level: LogLevel, public message: string) {}
-
-	public toString(): string {
-		return `| ${this.formatLevel()} | ${this.timestamp.getHours()}:${this.timestamp.getMinutes()}:${this.timestamp.getSeconds()} | ${
-			this.message
-		}`;
-	}
-
-	private formatLevel(): string {
-		switch (this.level) {
-			case LogLevel.DEBUG:
-				return "  DEBUG";
-			case LogLevel.INFO:
-				return "   INFO";
-			case LogLevel.WARNING:
-				return "WARNING";
-			case LogLevel.ERROR:
-				return "  ERROR";
-			default:
-				return "UNKNOWN";
-		}
-	}
 }
 
 export class Logger {
@@ -39,6 +18,10 @@ export class Logger {
 	private static instance: Logger | null = null;
 	private readonly messages: LogLine[] = [];
 
+	private readonly onMessageListeners: ((
+		status: LogLine | undefined
+	) => void)[] = [];
+
 	private constructor() {} // eslint-disable-line @typescript-eslint/no-empty-function
 
 	public static getInstance(): Logger {
@@ -49,18 +32,33 @@ export class Logger {
 	}
 
 	public debug(message: string): void {
+		if (process.env.NODE_ENV !== "production") {
+			console.debug(`${message}`);
+		}
 		this.pushMessage(message, LogLevel.DEBUG);
 	}
 
 	public info(message: string): void {
+		if (process.env.NODE_ENV !== "production") {
+			console.info(`${message}`);
+		}
+
 		this.pushMessage(message, LogLevel.INFO);
 	}
 
 	public warn(message: string): void {
+		if (process.env.NODE_ENV !== "production") {
+			console.warn(`${message}`);
+		}
+
 		this.pushMessage(message, LogLevel.WARNING);
 	}
 
 	public error(message: string): void {
+		if (process.env.NODE_ENV !== "production") {
+			console.error(`${message}`);
+		}
+
 		this.pushMessage(message, LogLevel.ERROR);
 		new Notice(message, 5000);
 	}
@@ -71,11 +69,25 @@ export class Logger {
 		);
 	}
 
+	public addOnMessageListener(
+		listener: (message: LogLine | undefined) => void
+	): void {
+		this.onMessageListeners.push(listener);
+	}
+
+	public reset(): void {
+		this.messages.length = 0;
+		this.onMessageListeners.forEach((listener) => listener(undefined));
+	}
+
 	private pushMessage(message: string, level: LogLevel): void {
-		console.log(`[${level}] ${message}`);
-		this.messages.push(new LogLine(level, message));
-		if (this.messages.length > Logger.MAX_MESSAGES) {
+		const logLine = new LogLine(level, message);
+		this.messages.push(logLine);
+
+		while (this.messages.length > Logger.MAX_MESSAGES) {
 			this.messages.shift();
 		}
+
+		this.onMessageListeners.forEach((listener) => listener(logLine));
 	}
 }
diff --git a/plugin/src/views/logs-view.ts b/plugin/src/views/logs-view.ts
index bbb45a9e..b2a58a11 100644
--- a/plugin/src/views/logs-view.ts
+++ b/plugin/src/views/logs-view.ts
@@ -6,11 +6,10 @@ export class LogsView extends ItemView {
 	public static readonly TYPE = "logs-view";
 	public static readonly ICON = "logs";
 
-	private timer: NodeJS.Timer | null = null;
-
 	public constructor(leaf: WorkspaceLeaf) {
 		super(leaf);
 		this.icon = LogsView.ICON;
+		Logger.getInstance().addOnMessageListener(() => this.updateView());
 	}
 
 	public getViewType(): string {
@@ -22,15 +21,7 @@ export class LogsView extends ItemView {
 	}
 
 	public async onOpen(): Promise<void> {
-		// eslint-disable-next-line @typescript-eslint/no-misused-promises
-		this.timer = setInterval(async () => this.updateView(), 250);
-	}
-
-	public async onClose(): Promise<void> {
-		if (this.timer) {
-			clearInterval(this.timer);
-			this.timer = null;
-		}
+		await this.updateView();
 	}
 
 	private async updateView(): Promise<void> {
@@ -39,11 +30,22 @@ export class LogsView extends ItemView {
 
 		container.createEl("h4", { text: "VaultLink logs" });
 
-		const messages = Logger.getInstance()
+		Logger.getInstance()
 			.getMessages(LogLevel.DEBUG)
-			.map((message) => message.toString())
-			.join("\n");
+			.forEach((message) => {
+				const messageContainer = container.createDiv({
+					cls: ["log-message", message.level],
+				});
+				messageContainer.createEl("span", {
+					text: ` | ${LogsView.formatTimestamp(
+						message.timestamp
+					)} | `,
+				});
+				messageContainer.createEl("span", { text: message.message });
+			});
+	}
 
-		container.createEl("pre", { text: messages });
+	private static formatTimestamp(timestamp: Date): string {
+		return timestamp.toTimeString().split(" ")[0];
 	}
 }

From 6d32e51c3e99d62fc2496ef357e2a369e9553ffb Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 2 Jan 2025 10:58:22 +0000
Subject: [PATCH 030/761] Make noop updates hidable

---
 plugin/src/database/sync-settings.ts |  2 ++
 plugin/src/views/history-view.ts     | 21 ++++++++++++---------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/plugin/src/database/sync-settings.ts b/plugin/src/database/sync-settings.ts
index 2574c814..09ab9469 100644
--- a/plugin/src/database/sync-settings.ts
+++ b/plugin/src/database/sync-settings.ts
@@ -5,6 +5,7 @@ export interface SyncSettings {
 	fetchChangesUpdateIntervalMs: number;
 	syncConcurrency: number;
 	isSyncEnabled: boolean;
+	displayNoopSyncEvents: boolean;
 }
 
 export const DEFAULT_SETTINGS: SyncSettings = {
@@ -14,4 +15,5 @@ export const DEFAULT_SETTINGS: SyncSettings = {
 	fetchChangesUpdateIntervalMs: 1000,
 	syncConcurrency: 1,
 	isSyncEnabled: false,
+	displayNoopSyncEvents: false,
 };
diff --git a/plugin/src/views/history-view.ts b/plugin/src/views/history-view.ts
index ed7ead10..3b8281ae 100644
--- a/plugin/src/views/history-view.ts
+++ b/plugin/src/views/history-view.ts
@@ -1,16 +1,18 @@
 import type { WorkspaceLeaf } from "obsidian";
 import { ItemView } from "obsidian";
 import type { SyncHistory } from "src/tracing/sync-history";
-import { SyncSource } from "src/tracing/sync-history";
+import { SyncSource, SyncStatus } from "src/tracing/sync-history";
 import { intlFormatDistance } from "date-fns";
+import { Database } from "src/database/database";
 
 export class HistoryView extends ItemView {
-	public static readonly TYPE = "example-view";
+	public static readonly TYPE = "history-view";
 	public static readonly ICON = "square-stack";
 	private timer: NodeJS.Timer | null = null;
 
 	public constructor(
 		leaf: WorkspaceLeaf,
+		private readonly database: Database,
 		private readonly history: SyncHistory
 	) {
 		super(leaf);
@@ -33,22 +35,18 @@ export class HistoryView extends ItemView {
 		}
 	}
 
-	private static formatTime(timestamp: Date): string {
-		return intlFormatDistance(timestamp, new Date());
-	}
-
 	public getViewType(): string {
 		return HistoryView.TYPE;
 	}
 
 	public getDisplayText(): string {
-		return "Example view";
+		return "VaultLink history";
 	}
 
 	public async onOpen(): Promise<void> {
 		await this.updateView();
 		// eslint-disable-next-line @typescript-eslint/no-misused-promises
-		this.timer = setInterval(async () => this.updateView(), 500);
+		this.timer = setInterval(async () => this.updateView(), 1000);
 	}
 
 	public async onClose(): Promise<void> {
@@ -65,6 +63,11 @@ export class HistoryView extends ItemView {
 		this.history
 			.getEntries()
 			.reverse()
+			.filter(
+				(entry) =>
+					entry.status !== SyncStatus.NO_OP ||
+					this.database.getSettings().displayNoopSyncEvents
+			)
 			.forEach((entry) => {
 				const card = container.createDiv({
 					cls: ["history-card", entry.status.toLocaleLowerCase()],
@@ -77,7 +80,7 @@ export class HistoryView extends ItemView {
 					cls: "history-card-title",
 				});
 				header.createSpan({
-					text: HistoryView.formatTime(entry.timestamp),
+					text: intlFormatDistance(entry.timestamp, new Date()),
 					cls: "history-card-timestamp",
 				});
 				card.createEl("p", {

From fb729b7d89f91f3419badf7e88b5562a13dc2325 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 2 Jan 2025 10:58:47 +0000
Subject: [PATCH 031/761] Pick up API changes

---
 plugin/src/events/obisidan-event-handler.ts   | 58 ++++++-------------
 plugin/src/plugin.ts                          | 46 ++++++---------
 .../apply-remote-changes-locally.ts           | 16 ++---
 3 files changed, 39 insertions(+), 81 deletions(-)

diff --git a/plugin/src/events/obisidan-event-handler.ts b/plugin/src/events/obisidan-event-handler.ts
index 81f20028..1eea37ed 100644
--- a/plugin/src/events/obisidan-event-handler.ts
+++ b/plugin/src/events/obisidan-event-handler.ts
@@ -3,35 +3,24 @@ import { TFile } from "obsidian";
 import type { FileEventHandler } from "./file-event-handler";
 import type { SyncService } from "src/services/sync-service";
 import type { Database } from "src/database/database";
-import { syncLocallyDeletedFile } from "src/sync-operations/sync-locally-deleted-file";
-import { syncLocallyUpdatedFile } from "src/sync-operations/sync-locally-updated-file";
 import type { FileOperations } from "src/file-operations/file-operations";
-import { syncLocallyCreatedFile } from "src/sync-operations/sync-locally-created-file";
 import { Logger } from "src/tracing/logger";
 import type { SyncHistory } from "src/tracing/sync-history";
+import { Syncer } from "src/sync-operations/syncer";
 
 export class ObsidianFileEventHandler implements FileEventHandler {
-	public constructor(
-		private readonly database: Database,
-		private readonly syncServer: SyncService,
-		private readonly operations: FileOperations,
-		private readonly history: SyncHistory
-	) {}
+	public constructor(private readonly syncer: Syncer) {}
 
 	public async onCreate(file: TAbstractFile): Promise<void> {
 		if (file instanceof TFile) {
 			Logger.getInstance().info(`File created: ${file.path}`);
 
-			await syncLocallyCreatedFile({
-				database: this.database,
-				syncServer: this.syncServer,
-				operations: this.operations,
-				updateTime: new Date(file.stat.ctime),
-				relativePath: file.path,
-				history: this.history,
-			});
+			await this.syncer.syncLocallyCreatedFile(
+				file.path,
+				new Date(file.stat.ctime)
+			);
 		} else {
-			Logger.getInstance().info(`Folder created: ${file.path}, ignored`);
+			Logger.getInstance().debug(`Folder created: ${file.path}, ignored`);
 		}
 	}
 
@@ -39,14 +28,9 @@ export class ObsidianFileEventHandler implements FileEventHandler {
 		if (file instanceof TFile) {
 			Logger.getInstance().info(`File deleted: ${file.path}`);
 
-			await syncLocallyDeletedFile({
-				database: this.database,
-				syncServer: this.syncServer,
-				history: this.history,
-				relativePath: file.path,
-			});
+			await this.syncer.syncLocallyDeletedFile(file.path);
 		} else {
-			Logger.getInstance().info(`Folder deleted: ${file.path}, ignored`);
+			Logger.getInstance().debug(`Folder deleted: ${file.path}, ignored`);
 		}
 	}
 
@@ -56,17 +40,13 @@ export class ObsidianFileEventHandler implements FileEventHandler {
 				`File renamed: ${oldPath} -> ${file.path}`
 			);
 
-			await syncLocallyUpdatedFile({
-				database: this.database,
-				syncServer: this.syncServer,
-				operations: this.operations,
-				history: this.history,
-				updateTime: new Date(file.stat.ctime),
-				relativePath: file.path,
+			await this.syncer.syncLocallyUpdatedFile({
 				oldPath,
+				relativePath: file.path,
+				updateTime: new Date(file.stat.ctime),
 			});
 		} else {
-			Logger.getInstance().info(
+			Logger.getInstance().debug(
 				`Folder renamed: ${oldPath} -> ${file.path}, ignored`
 			);
 		}
@@ -76,16 +56,14 @@ export class ObsidianFileEventHandler implements FileEventHandler {
 		if (file instanceof TFile) {
 			Logger.getInstance().info(`File modified: ${file.path}`);
 
-			await syncLocallyUpdatedFile({
-				database: this.database,
-				syncServer: this.syncServer,
-				operations: this.operations,
-				history: this.history,
-				updateTime: new Date(file.stat.ctime),
+			await this.syncer.syncLocallyUpdatedFile({
 				relativePath: file.path,
+				updateTime: new Date(file.stat.ctime),
 			});
 		} else {
-			Logger.getInstance().info(`Folder modified: ${file.path}, ignored`);
+			Logger.getInstance().debug(
+				`Folder modified: ${file.path}, ignored`
+			);
 		}
 	}
 }
diff --git a/plugin/src/plugin.ts b/plugin/src/plugin.ts
index 535ecd75..25801066 100644
--- a/plugin/src/plugin.ts
+++ b/plugin/src/plugin.ts
@@ -11,11 +11,11 @@ import { SyncService } from "./services/sync-service";
 import { Database } from "./database/database";
 import { applyRemoteChangesLocally } from "./sync-operations/apply-remote-changes-locally";
 import { ObsidianFileOperations } from "./file-operations/obsidian-file-operations";
-import { applyLocalChangesRemotely } from "./sync-operations/apply-local-changes-remotely";
 import { StatusBar } from "./views/status-bar";
 import { Logger } from "./tracing/logger.js";
 import { SyncHistory } from "./tracing/sync-history.js";
 import { LogsView } from "./views/logs-view.js";
+import { Syncer } from "./sync-operations/syncer.js";
 
 export default class SyncPlugin extends Plugin {
 	private remoteListenerIntervalId: number | null = null;
@@ -39,24 +39,20 @@ export default class SyncPlugin extends Plugin {
 
 		const syncServer = new SyncService(database);
 
-		new StatusBar(this, this.history);
+		const syncer = new Syncer({
+			database,
+			operations: this.operations,
+			syncServer,
+			history: this.history,
+		});
 
 		this.addSettingTab(
-			new SyncSettingsTab(
-				this.app,
-				this,
-				database,
-				syncServer,
-				this.history
-			)
+			new SyncSettingsTab(this.app, this, database, syncServer, syncer)
 		);
 
-		const eventHandler = new ObsidianFileEventHandler(
-			database,
-			syncServer,
-			this.operations,
-			this.history
-		);
+		new StatusBar(this, this.history, syncer);
+
+		const eventHandler = new ObsidianFileEventHandler(syncer);
 
 		this.app.workspace.onLayoutReady(async () => {
 			Logger.getInstance().info("Initialising sync handlers");
@@ -82,12 +78,7 @@ export default class SyncPlugin extends Plugin {
 				this.registerEvent(event);
 			});
 
-			await applyLocalChangesRemotely({
-				database,
-				syncServer,
-				operations: this.operations,
-				history: this.history,
-			});
+			await syncer.scheduleSyncForOfflineChanges();
 
 			Logger.getInstance().info("Sync handlers initialised");
 		});
@@ -95,6 +86,7 @@ export default class SyncPlugin extends Plugin {
 		this.registerRemoteEventListener(
 			database,
 			syncServer,
+			syncer,
 			database.getSettings().fetchChangesUpdateIntervalMs
 		);
 
@@ -103,16 +95,12 @@ export default class SyncPlugin extends Plugin {
 			this.registerRemoteEventListener(
 				database,
 				syncServer,
+				syncer,
 				settings.fetchChangesUpdateIntervalMs
 			);
 
 			if (!oldSettings.isSyncEnabled && settings.isSyncEnabled) {
-				await applyLocalChangesRemotely({
-					database: database,
-					syncServer,
-					operations: this.operations,
-					history: this.history,
-				});
+				await syncer.scheduleSyncForOfflineChanges();
 			}
 		});
 
@@ -163,6 +151,7 @@ export default class SyncPlugin extends Plugin {
 	private registerRemoteEventListener(
 		database: Database,
 		syncServer: SyncService,
+		syncer: Syncer,
 		intervalMs: number
 	): void {
 		if (this.remoteListenerIntervalId !== null) {
@@ -175,8 +164,7 @@ export default class SyncPlugin extends Plugin {
 				applyRemoteChangesLocally({
 					database,
 					syncServer,
-					operations: this.operations,
-					history: this.history,
+					syncer,
 				}),
 			intervalMs
 		);
diff --git a/plugin/src/sync-operations/apply-remote-changes-locally.ts b/plugin/src/sync-operations/apply-remote-changes-locally.ts
index 3b8840c8..b988fd1b 100644
--- a/plugin/src/sync-operations/apply-remote-changes-locally.ts
+++ b/plugin/src/sync-operations/apply-remote-changes-locally.ts
@@ -1,22 +1,20 @@
 import type { Database } from "src/database/database";
 import type { FileOperations } from "src/file-operations/file-operations";
 import type { SyncService } from "src/services/sync-service";
-import { syncRemotelyUpdatedFile } from "./sync-remotely-updated-file";
 import { Logger } from "src/tracing/logger";
 import type { SyncHistory } from "src/tracing/sync-history";
+import { Syncer } from "./syncer";
 
 let isRunning = false;
 
 export async function applyRemoteChangesLocally({
 	database,
 	syncServer,
-	operations,
-	history,
+	syncer,
 }: {
 	database: Database;
 	syncServer: SyncService;
-	operations: FileOperations;
-	history: SyncHistory;
+	syncer: Syncer;
 }): Promise<void> {
 	if (!database.getSettings().isSyncEnabled) {
 		Logger.getInstance().debug(
@@ -44,13 +42,7 @@ export async function applyRemoteChangesLocally({
 
 		await Promise.all(
 			remote.latestDocuments.map(async (remoteDocument) =>
-				syncRemotelyUpdatedFile({
-					database,
-					syncServer,
-					history,
-					operations,
-					remoteVersion: remoteDocument,
-				})
+				syncer.syncRemotelyUpdatedFile(remoteDocument)
 			)
 		);
 

From dae8a9cc89755cbb08838198251856969dc23346 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 2 Jan 2025 11:24:22 +0000
Subject: [PATCH 032/761] Display formatted HTTP errors

---
 plugin/src/services/sync-service.ts |  42 +++++++++--
 plugin/src/services/types.ts        | 107 +++++++++++++++++-----------
 2 files changed, 104 insertions(+), 45 deletions(-)

diff --git a/plugin/src/services/sync-service.ts b/plugin/src/services/sync-service.ts
index 80bee99e..22f6f737 100644
--- a/plugin/src/services/sync-service.ts
+++ b/plugin/src/services/sync-service.ts
@@ -23,6 +23,18 @@ export class SyncService {
 		});
 	}
 
+	private static formatError(
+		error: components["schemas"]["SerializedError"]
+	): string {
+		let result = error.message;
+		if (error.causes.length > 0) {
+			const causes = error.causes.join(", ");
+			result += ` caused by: ${causes}`;
+		}
+
+		return result;
+	}
+
 	public async ping(): Promise<components["schemas"]["PingResponse"]> {
 		const response = await this.client.GET("/ping", {
 			params: {
@@ -39,7 +51,11 @@ export class SyncService {
 		);
 
 		if (!response.data) {
-			throw new Error(`Failed to ping server: ${response.error}`);
+			throw new Error(
+				`Failed to ping server: ${SyncService.formatError(
+					response.error
+				)}`
+			);
 		}
 
 		return response.data;
@@ -76,7 +92,11 @@ export class SyncService {
 		);
 
 		if (!response.data) {
-			throw new Error(`Failed to create document: ${response.error}`);
+			throw new Error(
+				`Failed to create document: ${SyncService.formatError(
+					response.error
+				)}`
+			);
 		}
 
 		Logger.getInstance().debug(
@@ -125,7 +145,11 @@ export class SyncService {
 		);
 
 		if (!response.data) {
-			throw new Error(`Failed to update document: ${response.error}`);
+			throw new Error(
+				`Failed to update document: ${SyncService.formatError(
+					response.error
+				)}`
+			);
 		}
 
 		Logger.getInstance().debug(
@@ -199,7 +223,11 @@ export class SyncService {
 		);
 
 		if (!response.data) {
-			throw new Error(`Failed to get document: ${response.error}`);
+			throw new Error(
+				`Failed to get document: ${SyncService.formatError(
+					response.error
+				)}`
+			);
 		}
 
 		Logger.getInstance().debug(
@@ -230,7 +258,11 @@ export class SyncService {
 
 		const { error } = response;
 		if (error) {
-			throw new Error(`Failed to get documents: ${error}`);
+			throw new Error(
+				`Failed to get documents: ${SyncService.formatError(
+					response.error
+				)}`
+			);
 		}
 
 		Logger.getInstance().debug(
diff --git a/plugin/src/services/types.ts b/plugin/src/services/types.ts
index 09f50f13..bd51c68d 100644
--- a/plugin/src/services/types.ts
+++ b/plugin/src/services/types.ts
@@ -23,11 +23,21 @@ export interface paths {
             requestBody?: never;
             responses: {
                 200: {
-                    headers: Record<string, unknown>;
+                    headers: {
+                        [name: string]: unknown;
+                    };
                     content: {
                         "application/json": components["schemas"]["PingResponse"];
                     };
                 };
+                default: {
+                    headers: {
+                        [name: string]: unknown;
+                    };
+                    content: {
+                        "application/json": components["schemas"]["SerializedError"];
+                    };
+                };
             };
         };
         put?: never;
@@ -61,11 +71,21 @@ export interface paths {
             requestBody?: never;
             responses: {
                 200: {
-                    headers: Record<string, unknown>;
+                    headers: {
+                        [name: string]: unknown;
+                    };
                     content: {
                         "application/json": components["schemas"]["FetchLatestDocumentsResponse"];
                     };
                 };
+                default: {
+                    headers: {
+                        [name: string]: unknown;
+                    };
+                    content: {
+                        "application/json": components["schemas"]["SerializedError"];
+                    };
+                };
             };
         };
         put?: never;
@@ -87,11 +107,21 @@ export interface paths {
             };
             responses: {
                 200: {
-                    headers: Record<string, unknown>;
+                    headers: {
+                        [name: string]: unknown;
+                    };
                     content: {
                         "application/json": components["schemas"]["DocumentVersion"];
                     };
                 };
+                default: {
+                    headers: {
+                        [name: string]: unknown;
+                    };
+                    content: {
+                        "application/json": components["schemas"]["SerializedError"];
+                    };
+                };
             };
         };
         delete?: never;
@@ -122,11 +152,21 @@ export interface paths {
             requestBody?: never;
             responses: {
                 200: {
-                    headers: Record<string, unknown>;
+                    headers: {
+                        [name: string]: unknown;
+                    };
                     content: {
                         "application/json": components["schemas"]["DocumentVersion"];
                     };
                 };
+                default: {
+                    headers: {
+                        [name: string]: unknown;
+                    };
+                    content: {
+                        "application/json": components["schemas"]["SerializedError"];
+                    };
+                };
             };
         };
         put: {
@@ -148,11 +188,21 @@ export interface paths {
             };
             responses: {
                 200: {
-                    headers: Record<string, unknown>;
+                    headers: {
+                        [name: string]: unknown;
+                    };
                     content: {
                         "application/json": components["schemas"]["DocumentVersion"];
                     };
                 };
+                default: {
+                    headers: {
+                        [name: string]: unknown;
+                    };
+                    content: {
+                        "application/json": components["schemas"]["SerializedError"];
+                    };
+                };
             };
         };
         post?: never;
@@ -176,48 +226,21 @@ export interface paths {
             responses: {
                 /** @description no content */
                 200: {
-                    headers: Record<string, unknown>;
-                    content?: never;
-                };
-            };
-        };
-        options?: never;
-        head?: never;
-        patch?: never;
-        trace?: never;
-    };
-    "/ws": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        get: {
-            parameters: {
-                query?: never;
-                header?: never;
-                path?: never;
-                cookie?: never;
-            };
-            requestBody?: never;
-            responses: {
-                /** @description websocket upgrade */
-                101: {
                     headers: {
-                        connection?: "upgrade";
-                        upgrade?: "websocket";
-                        "sec-websocket-key"?: string;
-                        "sec-websocket-protocol"?: string;
                         [name: string]: unknown;
                     };
                     content?: never;
                 };
+                default: {
+                    headers: {
+                        [name: string]: unknown;
+                    };
+                    content: {
+                        "application/json": components["schemas"]["SerializedError"];
+                    };
+                };
             };
         };
-        put?: never;
-        post?: never;
-        delete?: never;
         options?: never;
         head?: never;
         patch?: never;
@@ -299,6 +322,10 @@ export interface components {
             /** Format: int64 */
             since_update_id?: number | null;
         };
+        SerializedError: {
+            causes: string[];
+            message: string;
+        };
         UpdateDocumentVersion: {
             contentBase64: string;
             /** Format: date-time */

From 6c2c3635617a60e0d507ef1ce87ffcdca6a09596 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 2 Jan 2025 11:33:53 +0000
Subject: [PATCH 033/761] Refactor errors

---
 backend/sync_server/src/errors.rs | 38 ++++++++++++++++---------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/backend/sync_server/src/errors.rs b/backend/sync_server/src/errors.rs
index b97aadc5..d66f25bd 100644
--- a/backend/sync_server/src/errors.rs
+++ b/backend/sync_server/src/errors.rs
@@ -4,7 +4,7 @@ use axum::{
     response::{IntoResponse, Response},
     Json,
 };
-use log::{info, warn};
+use log::{error, info};
 use schemars::JsonSchema;
 use serde::Serialize;
 use thiserror::Error;
@@ -33,12 +33,12 @@ pub enum SyncServerError {
 impl SyncServerError {
     pub fn serialize(&self) -> SerializedError {
         match self {
-            Self::InitError(error) => format_anyhow_error(error),
-            Self::ClientError(error) => format_anyhow_error(error),
-            Self::ServerError(error) => format_anyhow_error(error),
-            Self::NotFound(error) => format_anyhow_error(error),
-            Self::Unauthorized(error) => format_anyhow_error(error),
-            Self::PermissionDeniedError(error) => format_anyhow_error(error),
+            Self::InitError(error) => error.into(),
+            Self::ClientError(error) => error.into(),
+            Self::ServerError(error) => error.into(),
+            Self::NotFound(error) => error.into(),
+            Self::Unauthorized(error) => error.into(),
+            Self::PermissionDeniedError(error) => error.into(),
         }
     }
 }
@@ -64,17 +64,19 @@ pub struct SerializedError {
     pub causes: Vec<String>,
 }
 
-fn format_anyhow_error(error: &anyhow::Error) -> SerializedError {
-    let mut causes = vec![];
-    let mut current_error = error.source();
-    while let Some(error) = current_error {
-        causes.push(error.to_string());
-        current_error = error.source();
-    }
+impl From<&anyhow::Error> for SerializedError {
+    fn from(error: &anyhow::Error) -> SerializedError {
+        let mut causes = vec![];
+        let mut current_error = error.source();
+        while let Some(error) = current_error {
+            causes.push(error.to_string());
+            current_error = error.source();
+        }
 
-    SerializedError {
-        message: error.to_string(),
-        causes,
+        SerializedError {
+            message: error.to_string(),
+            causes,
+        }
     }
 }
 
@@ -87,7 +89,7 @@ pub const fn init_error(error: anyhow::Error) -> SyncServerError {
 }
 
 pub fn server_error(error: anyhow::Error) -> SyncServerError {
-    warn!("Server error: {:?}", error);
+    error!("Server error: {:?}", error);
     SyncServerError::ServerError(error)
 }
 

From 3560febc3fb8dafdadbd713872c0655a4fa9a9b0 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 2 Jan 2025 11:35:45 +0000
Subject: [PATCH 034/761] Add description and default schema

---
 backend/sync_server/src/server.rs | 41 ++++++++++++++++++++++++-------
 1 file changed, 32 insertions(+), 9 deletions(-)

diff --git a/backend/sync_server/src/server.rs b/backend/sync_server/src/server.rs
index a72e7225..4747858b 100644
--- a/backend/sync_server/src/server.rs
+++ b/backend/sync_server/src/server.rs
@@ -1,3 +1,5 @@
+use std::sync::Arc;
+
 use aide::{
     axum::{
         routing::{delete, get, post, put},
@@ -5,15 +7,16 @@ use aide::{
     },
     openapi::{Info, OpenApi},
     scalar::Scalar,
+    transform::TransformOpenApi,
 };
-use anyhow::{Context as _, Result};
+use anyhow::{anyhow, Context as _, Result};
 use axum::{
     extract::{DefaultBodyLimit, Request},
-    http::{self, HeaderValue, Method, StatusCode},
+    http::{self, HeaderValue, Method},
     response::IntoResponse,
     Extension, Json,
 };
-use log::info;
+use log::{error, info};
 use tokio::signal;
 use tower_http::{
     cors::CorsLayer,
@@ -25,7 +28,10 @@ use tower_http::{
 };
 use tracing::{info_span, Level};
 
-use crate::app_state::AppState;
+use crate::{
+    app_state::AppState,
+    errors::{not_found_error, SerializedError},
+};
 mod auth;
 mod create_document;
 mod delete_document;
@@ -37,6 +43,9 @@ mod responses;
 mod update_document;
 
 pub async fn create_server(app_state: AppState) -> Result<()> {
+    aide::gen::on_error(|err| error!("{err}"));
+    aide::gen::extract_schemas(true);
+
     let address = format!(
         "{}:{}",
         &app_state.config.server.host, &app_state.config.server.port
@@ -44,7 +53,12 @@ pub async fn create_server(app_state: AppState) -> Result<()> {
 
     let mut api = OpenApi {
         info: Info {
-            description: Some("an example API".to_owned()),
+            title: "VaultLink sync server".to_owned(),
+            summary: Some(
+                "Simple API for syncing documents between concurrent clients.".to_owned(),
+            ),
+            description: Some(include_str!("../README.md").to_owned()),
+            version: env!("CARGO_PKG_VERSION").to_owned(),
             ..Info::default()
         },
         ..OpenApi::default()
@@ -103,8 +117,8 @@ pub async fn create_server(app_state: AppState) -> Result<()> {
                 .allow_methods([Method::GET, Method::POST, Method::PUT, Method::DELETE]),
         )
         .with_state(app_state)
-        .finish_api(&mut api)
-        .layer(Extension(api))
+        .finish_api_with(&mut api, api_docs)
+        .layer(Extension(Arc::new(api))) // https://github.com/tamasfe/aide/blob/507f4a8822bc0c13cbda0f589da1e0f4cbcdb812/examples/example-axum/src/main.rs#L39
         .fallback(handler_404)
         .into_make_service();
 
@@ -126,7 +140,16 @@ pub async fn create_server(app_state: AppState) -> Result<()> {
         .context("Failed to start server")
 }
 
-async fn serve_api(Extension(api): Extension<OpenApi>) -> impl IntoResponse { Json(api) }
+async fn serve_api(Extension(api): Extension<Arc<OpenApi>>) -> impl IntoResponse { Json(api) }
+
+fn api_docs(api: TransformOpenApi<'_>) -> TransformOpenApi<'_> {
+    api.default_response_with::<Json<SerializedError>, _>(|res| {
+        res.example(SerializedError {
+            message: "An error has occurred".to_owned(),
+            causes: vec![],
+        })
+    })
+}
 
 async fn shutdown_signal() {
     let ctrl_c = async {
@@ -152,4 +175,4 @@ async fn shutdown_signal() {
     }
 }
 
-async fn handler_404() -> impl IntoResponse { (StatusCode::NOT_FOUND, "nothing to see here") }
+async fn handler_404() -> impl IntoResponse { not_found_error(anyhow!("Page not found")) }

From c5c548c5d43de9cb2248eacf6cbf8eab8c68d951 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 2 Jan 2025 11:37:40 +0000
Subject: [PATCH 035/761] Bump and print server version

---
 backend/Cargo.lock              | 2 +-
 backend/sync_server/Cargo.toml  | 2 +-
 backend/sync_server/src/main.rs | 6 ++++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index f414df5f..512cfaec 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -2123,7 +2123,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.1.0"
+version = "0.0.2"
 dependencies = [
  "aide",
  "anyhow",
diff --git a/backend/sync_server/Cargo.toml b/backend/sync_server/Cargo.toml
index 4a6d49f5..b386f300 100644
--- a/backend/sync_server/Cargo.toml
+++ b/backend/sync_server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sync_server"
-version = "0.1.0"
+version = "0.0.2"
 edition = "2021"
 
 [dependencies]
diff --git a/backend/sync_server/src/main.rs b/backend/sync_server/src/main.rs
index 4207971d..7838cd97 100644
--- a/backend/sync_server/src/main.rs
+++ b/backend/sync_server/src/main.rs
@@ -8,6 +8,7 @@ mod server;
 use anyhow::{Context as _, Result};
 use app_state::AppState;
 use errors::{init_error, SyncServerError};
+use log::info;
 use server::create_server;
 use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};
 
@@ -28,6 +29,11 @@ async fn main() -> Result<(), SyncServerError> {
         .context("Failed to initialise tracing")
         .map_err(init_error)?;
 
+    info!(
+        "Starting VaultLink server version {}",
+        env!("CARGO_PKG_VERSION")
+    );
+
     let app_state = AppState::try_new()
         .await
         .context("Failed to initialise app state")

From 4af8f3b23fd569705827e0790eaa98c4c45bbb33 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 2 Jan 2025 11:56:33 +0000
Subject: [PATCH 036/761] Add merge_text and rename JS bindings

---
 backend/sync_lib/src/lib.rs | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/backend/sync_lib/src/lib.rs b/backend/sync_lib/src/lib.rs
index cad32222..eb5e9bdf 100644
--- a/backend/sync_lib/src/lib.rs
+++ b/backend/sync_lib/src/lib.rs
@@ -12,18 +12,18 @@ pub mod errors;
 #[global_allocator]
 static ALLOC: wee_alloc::WeeAlloc<'_> = wee_alloc::WeeAlloc::INIT;
 
-#[wasm_bindgen]
+#[wasm_bindgen(js_name = bytesToBase64)]
 pub fn bytes_to_base64(input: &[u8]) -> String { STANDARD_NO_PAD.encode(input) }
 
-#[wasm_bindgen]
+#[wasm_bindgen(js_name = stringToBase64)]
 pub fn string_to_base64(input: &str) -> String { bytes_to_base64(input.as_bytes()) }
 
-#[wasm_bindgen]
+#[wasm_bindgen(js_name = base64ToBytes)]
 pub fn base64_to_bytes(input: &str) -> Result<Vec<u8>, SyncLibError> {
     STANDARD_NO_PAD.decode(input).map_err(SyncLibError::from)
 }
 
-#[wasm_bindgen]
+#[wasm_bindgen(js_name = base64ToString)]
 pub fn base64_to_string(input: &str) -> Result<String, SyncLibError> {
     let bytes = base64_to_bytes(input)?;
     String::from_utf8(bytes).map_err(SyncLibError::from)
@@ -43,9 +43,15 @@ pub fn merge(parent: &[u8], left: &[u8], right: &[u8]) -> Result<Vec<u8>, SyncLi
     })
 }
 
-#[wasm_bindgen]
+#[wasm_bindgen(js_name = mergeText)]
+pub fn merge_text(parent: &str, left: &str, right: &str) -> String {
+    reconcile::reconcile(parent, left, right)
+}
+
+#[wasm_bindgen(js_name = isBinary)]
 pub fn is_binary(data: &[u8]) -> bool { data.iter().any(|&b| b == 0) }
 
+#[wasm_bindgen(js_name = setPanicHook)]
 pub fn set_panic_hook() {
     // When the `console_error_panic_hook` feature is enabled, we can call the
     // `set_panic_hook` function at least once during initialization, and then

From a2b1a8366359668e867101f4fa2fd51f51654e0a Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 2 Jan 2025 11:57:40 +0000
Subject: [PATCH 037/761] Lint plugin

---
 plugin/src/events/obisidan-event-handler.ts      |  6 +-----
 .../apply-remote-changes-locally.ts              |  4 +---
 plugin/src/tracing/logger.ts                     | 12 ++++++------
 plugin/src/views/history-view.ts                 |  3 ++-
 plugin/src/views/logs-view.ts                    | 16 +++++++++-------
 plugin/src/views/status-bar.ts                   |  2 +-
 6 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/plugin/src/events/obisidan-event-handler.ts b/plugin/src/events/obisidan-event-handler.ts
index 1eea37ed..200ed8a0 100644
--- a/plugin/src/events/obisidan-event-handler.ts
+++ b/plugin/src/events/obisidan-event-handler.ts
@@ -1,12 +1,8 @@
 import type { TAbstractFile } from "obsidian";
 import { TFile } from "obsidian";
 import type { FileEventHandler } from "./file-event-handler";
-import type { SyncService } from "src/services/sync-service";
-import type { Database } from "src/database/database";
-import type { FileOperations } from "src/file-operations/file-operations";
 import { Logger } from "src/tracing/logger";
-import type { SyncHistory } from "src/tracing/sync-history";
-import { Syncer } from "src/sync-operations/syncer";
+import type { Syncer } from "src/sync-operations/syncer";
 
 export class ObsidianFileEventHandler implements FileEventHandler {
 	public constructor(private readonly syncer: Syncer) {}
diff --git a/plugin/src/sync-operations/apply-remote-changes-locally.ts b/plugin/src/sync-operations/apply-remote-changes-locally.ts
index b988fd1b..088935b5 100644
--- a/plugin/src/sync-operations/apply-remote-changes-locally.ts
+++ b/plugin/src/sync-operations/apply-remote-changes-locally.ts
@@ -1,9 +1,7 @@
 import type { Database } from "src/database/database";
-import type { FileOperations } from "src/file-operations/file-operations";
 import type { SyncService } from "src/services/sync-service";
 import { Logger } from "src/tracing/logger";
-import type { SyncHistory } from "src/tracing/sync-history";
-import { Syncer } from "./syncer";
+import type { Syncer } from "./syncer";
 
 let isRunning = false;
 
diff --git a/plugin/src/tracing/logger.ts b/plugin/src/tracing/logger.ts
index bc51b742..3eb0101c 100644
--- a/plugin/src/tracing/logger.ts
+++ b/plugin/src/tracing/logger.ts
@@ -33,14 +33,14 @@ export class Logger {
 
 	public debug(message: string): void {
 		if (process.env.NODE_ENV !== "production") {
-			console.debug(`${message}`);
+			console.debug(message);
 		}
 		this.pushMessage(message, LogLevel.DEBUG);
 	}
 
 	public info(message: string): void {
 		if (process.env.NODE_ENV !== "production") {
-			console.info(`${message}`);
+			console.info(message);
 		}
 
 		this.pushMessage(message, LogLevel.INFO);
@@ -48,7 +48,7 @@ export class Logger {
 
 	public warn(message: string): void {
 		if (process.env.NODE_ENV !== "production") {
-			console.warn(`${message}`);
+			console.warn(message);
 		}
 
 		this.pushMessage(message, LogLevel.WARNING);
@@ -56,7 +56,7 @@ export class Logger {
 
 	public error(message: string): void {
 		if (process.env.NODE_ENV !== "production") {
-			console.error(`${message}`);
+			console.error(message);
 		}
 
 		this.pushMessage(message, LogLevel.ERROR);
@@ -77,7 +77,7 @@ export class Logger {
 
 	public reset(): void {
 		this.messages.length = 0;
-		this.onMessageListeners.forEach((listener) => listener(undefined));
+		this.onMessageListeners.forEach((listener) => { listener(undefined); });
 	}
 
 	private pushMessage(message: string, level: LogLevel): void {
@@ -88,6 +88,6 @@ export class Logger {
 			this.messages.shift();
 		}
 
-		this.onMessageListeners.forEach((listener) => listener(logLine));
+		this.onMessageListeners.forEach((listener) => { listener(logLine); });
 	}
 }
diff --git a/plugin/src/views/history-view.ts b/plugin/src/views/history-view.ts
index 3b8281ae..481c16d2 100644
--- a/plugin/src/views/history-view.ts
+++ b/plugin/src/views/history-view.ts
@@ -3,7 +3,7 @@ import { ItemView } from "obsidian";
 import type { SyncHistory } from "src/tracing/sync-history";
 import { SyncSource, SyncStatus } from "src/tracing/sync-history";
 import { intlFormatDistance } from "date-fns";
-import { Database } from "src/database/database";
+import type { Database } from "src/database/database";
 
 export class HistoryView extends ItemView {
 	public static readonly TYPE = "history-view";
@@ -30,6 +30,7 @@ export class HistoryView extends ItemView {
 				return " ⤴️";
 			case SyncSource.PULL:
 				return " ⤵️";
+			case undefined:
 			default:
 				return "";
 		}
diff --git a/plugin/src/views/logs-view.ts b/plugin/src/views/logs-view.ts
index b2a58a11..f39ba481 100644
--- a/plugin/src/views/logs-view.ts
+++ b/plugin/src/views/logs-view.ts
@@ -9,7 +9,13 @@ export class LogsView extends ItemView {
 	public constructor(leaf: WorkspaceLeaf) {
 		super(leaf);
 		this.icon = LogsView.ICON;
-		Logger.getInstance().addOnMessageListener(() => this.updateView());
+		Logger.getInstance().addOnMessageListener(() => {
+			this.updateView();
+		});
+	}
+
+	private static formatTimestamp(timestamp: Date): string {
+		return timestamp.toTimeString().split(" ")[0];
 	}
 
 	public getViewType(): string {
@@ -21,10 +27,10 @@ export class LogsView extends ItemView {
 	}
 
 	public async onOpen(): Promise<void> {
-		await this.updateView();
+		this.updateView();
 	}
 
-	private async updateView(): Promise<void> {
+	private updateView(): void {
 		const container = this.containerEl.children[1];
 		container.empty();
 
@@ -44,8 +50,4 @@ export class LogsView extends ItemView {
 				messageContainer.createEl("span", { text: message.message });
 			});
 	}
-
-	private static formatTimestamp(timestamp: Date): string {
-		return timestamp.toTimeString().split(" ")[0];
-	}
 }
diff --git a/plugin/src/views/status-bar.ts b/plugin/src/views/status-bar.ts
index cc214f45..6b1f0cbb 100644
--- a/plugin/src/views/status-bar.ts
+++ b/plugin/src/views/status-bar.ts
@@ -1,5 +1,5 @@
 import type { Plugin } from "obsidian";
-import { Syncer } from "src/sync-operations/syncer";
+import type { Syncer } from "src/sync-operations/syncer";
 import type { HistoryStats, SyncHistory } from "src/tracing/sync-history";
 
 export class StatusBar {

From b2a8db14b69764e259452277da822f59a85887f7 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 2 Jan 2025 11:58:06 +0000
Subject: [PATCH 038/761] Update files atomically in Obsidian

---
 plugin/src/file-operations/file-operations.ts |  6 +-
 .../obsidian-file-operations.ts               | 62 ++++++++++---------
 2 files changed, 39 insertions(+), 29 deletions(-)

diff --git a/plugin/src/file-operations/file-operations.ts b/plugin/src/file-operations/file-operations.ts
index 1470d79d..910b6d71 100644
--- a/plugin/src/file-operations/file-operations.ts
+++ b/plugin/src/file-operations/file-operations.ts
@@ -7,9 +7,13 @@ export interface FileOperations {
 
 	getModificationTime: (path: RelativePath) => Promise<Date>;
 
+	// Create and write the file if it doesn't exist. Otherwise, it has the same behavior as write.
+	// All parent directories are created if they don't exist.
 	create: (path: RelativePath, newContent: Uint8Array) => Promise<void>;
 
-	// Writes new content to the file at the given path. If the file's content has changed since the expectedContent was read, the write will merge the changes.
+	// Update the file at the given path.
+	// If the file's content is different from `expectedContent`, the a 3-way merge is performed before writing.
+	// If the file no longer exists, the file is not recreated and an empty array is returned.
 	write: (
 		path: RelativePath,
 		expectedContent: Uint8Array,
diff --git a/plugin/src/file-operations/obsidian-file-operations.ts b/plugin/src/file-operations/obsidian-file-operations.ts
index 7f9a47aa..7c30ecda 100644
--- a/plugin/src/file-operations/obsidian-file-operations.ts
+++ b/plugin/src/file-operations/obsidian-file-operations.ts
@@ -2,7 +2,6 @@ import type { Vault } from "obsidian";
 import { normalizePath } from "obsidian";
 import type { FileOperations } from "./file-operations";
 import * as lib from "../../../backend/sync_lib/pkg/sync_lib.js";
-import { isEqualBytes } from "src/utils/is-equal-bytes";
 import type { RelativePath } from "src/database/document-metadata";
 
 export class ObsidianFileOperations implements FileOperations {
@@ -27,33 +26,6 @@ export class ObsidianFileOperations implements FileOperations {
 		return new Date(file.mtime);
 	}
 
-	public async write(
-		path: RelativePath,
-		expectedContent: Uint8Array,
-		newContent: Uint8Array
-	): Promise<Uint8Array> {
-		if (!(await this.vault.adapter.exists(normalizePath(path)))) {
-			// The caller assumed the file exists, but it doesn't, let's not recreate it
-			return new Uint8Array(0);
-		}
-
-		const currentContent = await this.read(path);
-		if (!isEqualBytes(currentContent, expectedContent)) {
-			const result = lib.merge(
-				expectedContent,
-				currentContent,
-				newContent
-			);
-
-			await this.vault.adapter.writeBinary(normalizePath(path), result);
-
-			return result;
-		}
-		await this.vault.adapter.writeBinary(normalizePath(path), newContent);
-
-		return newContent;
-	}
-
 	public async create(
 		path: RelativePath,
 		newContent: Uint8Array
@@ -67,6 +39,40 @@ export class ObsidianFileOperations implements FileOperations {
 		await this.vault.adapter.writeBinary(normalizePath(path), newContent);
 	}
 
+	public async write(
+		path: RelativePath,
+		expectedContent: Uint8Array,
+		newContent: Uint8Array
+	): Promise<Uint8Array> {
+		if (!(await this.vault.adapter.exists(normalizePath(path)))) {
+			// The caller assumed the file exists, but it doesn't, let's not recreate it
+			return new Uint8Array(0);
+		}
+
+		if (lib.isBinary(expectedContent)) {
+			await this.vault.adapter.writeBinary(
+				normalizePath(path),
+				newContent
+			);
+			return newContent;
+		}
+
+		const expetedText = new TextDecoder().decode(expectedContent);
+		const newText = new TextDecoder().decode(newContent);
+
+		const resultText = await this.vault.adapter.process(
+			normalizePath(path),
+			(currentText) => {
+				if (currentText !== expetedText) {
+					return lib.mergeText(expetedText, currentText, newText);
+				}
+
+				return newText;
+			}
+		);
+		return new TextEncoder().encode(resultText);
+	}
+
 	public async remove(path: RelativePath): Promise<void> {
 		if (await this.vault.adapter.exists(normalizePath(path))) {
 			return this.vault.adapter.remove(normalizePath(path));

From b6d94bce0bbfca1b4a85b066e1237ef989e67aae Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 2 Jan 2025 11:58:28 +0000
Subject: [PATCH 039/761] Use new Rust bindings

---
 plugin/src/plugin.ts                 |  4 +-
 plugin/src/services/sync-service.ts  |  4 +-
 plugin/src/sync-operations/syncer.ts | 56 +++++++++++++---------------
 3 files changed, 30 insertions(+), 34 deletions(-)

diff --git a/plugin/src/plugin.ts b/plugin/src/plugin.ts
index 25801066..41c14258 100644
--- a/plugin/src/plugin.ts
+++ b/plugin/src/plugin.ts
@@ -32,6 +32,8 @@ export default class SyncPlugin extends Plugin {
 			)
 		);
 
+		lib.setPanicHook();
+
 		const database = new Database(
 			await this.loadData(),
 			this.saveData.bind(this)
@@ -106,7 +108,7 @@ export default class SyncPlugin extends Plugin {
 
 		this.registerView(
 			HistoryView.TYPE,
-			(leaf) => new HistoryView(leaf, this.history)
+			(leaf) => new HistoryView(leaf, database, this.history)
 		);
 		this.registerView(LogsView.TYPE, (leaf) => new LogsView(leaf));
 
diff --git a/plugin/src/services/sync-service.ts b/plugin/src/services/sync-service.ts
index 22f6f737..4713bedc 100644
--- a/plugin/src/services/sync-service.ts
+++ b/plugin/src/services/sync-service.ts
@@ -84,7 +84,7 @@ export class SyncService {
 					},
 				},
 				body: {
-					contentBase64: lib.bytes_to_base64(contentBytes),
+					contentBase64: lib.bytesToBase64(contentBytes),
 					createdDate: createdDate.toISOString(),
 					relativePath,
 				},
@@ -137,7 +137,7 @@ export class SyncService {
 				},
 				body: {
 					parentVersionId,
-					contentBase64: lib.bytes_to_base64(contentBytes),
+					contentBase64: lib.bytesToBase64(contentBytes),
 					createdDate: createdDate.toISOString(),
 					relativePath,
 				},
diff --git a/plugin/src/sync-operations/syncer.ts b/plugin/src/sync-operations/syncer.ts
index 2d067081..8d08a0f1 100644
--- a/plugin/src/sync-operations/syncer.ts
+++ b/plugin/src/sync-operations/syncer.ts
@@ -1,25 +1,21 @@
-import { Database } from "src/database/database";
-import { RelativePath } from "src/database/document-metadata";
-import { FileOperations } from "src/file-operations/file-operations";
+import type { Database } from "src/database/database";
+import type { RelativePath } from "src/database/document-metadata";
+import type { FileOperations } from "src/file-operations/file-operations";
 import * as lib from "../../../backend/sync_lib/pkg/sync_lib.js";
-import { SyncService } from "src/services/sync-service";
+import type { SyncService } from "src/services/sync-service";
 import { Logger } from "src/tracing/logger";
-import {
-	SyncHistory,
-	SyncSource,
-	SyncStatus,
-	SyncType,
-} from "src/tracing/sync-history";
+import type { SyncHistory } from "src/tracing/sync-history";
+import { SyncSource, SyncStatus, SyncType } from "src/tracing/sync-history";
 import { unlockDocument, waitForDocumentLock } from "./document-lock";
 import PQueue from "p-queue";
 import { EMPTY_HASH, hash } from "src/utils/hash";
-import { components } from "src/services/types.js";
+import type { components } from "src/services/types.js";
 
 export class Syncer {
-	private database: Database;
-	private syncServer: SyncService;
-	private operations: FileOperations;
-	private history: SyncHistory;
+	private readonly database: Database;
+	private readonly syncServer: SyncService;
+	private readonly operations: FileOperations;
+	private readonly history: SyncHistory;
 
 	private isRunningOfflineSync = false;
 
@@ -57,16 +53,16 @@ export class Syncer {
 			this.offlineSyncQueue.concurrency = settings.syncConcurrency;
 		});
 
-		this.fileSyncQueue.on("active", () =>
+		this.fileSyncQueue.on("active", () => {
 			this.emitRemainingOperationsChange(
 				this.fileSyncQueue.size + this.offlineSyncQueue.size
-			)
-		);
-		this.offlineSyncQueue.on("active", () =>
+			);
+		});
+		this.offlineSyncQueue.on("active", () => {
 			this.emitRemainingOperationsChange(
 				this.fileSyncQueue.size + this.offlineSyncQueue.size
-			)
-		);
+			);
+		});
 	}
 
 	public addRemainingOperationsListener(
@@ -105,9 +101,7 @@ export class Syncer {
 					type: SyncType.CREATE,
 				});
 
-				const responseBytes = lib.base64_to_bytes(
-					response.contentBase64
-				);
+				const responseBytes = lib.base64ToBytes(response.contentBase64);
 				const responseHash = hash(responseBytes);
 
 				if (contentHash !== responseHash) {
@@ -270,9 +264,7 @@ export class Syncer {
 					return;
 				}
 
-				const responseBytes = lib.base64_to_bytes(
-					response.contentBase64
-				);
+				const responseBytes = lib.base64ToBytes(response.contentBase64);
 				const responseHash = hash(responseBytes);
 
 				if (response.relativePath != relativePath) {
@@ -359,7 +351,7 @@ export class Syncer {
 			].filter(([path, _]) => !allLocalFiles.includes(path));
 
 			await Promise.all(
-				allLocalFiles.map((relativePath) =>
+				allLocalFiles.map(async (relativePath) =>
 					this.offlineSyncQueue.add(async () => {
 						const metadata =
 							this.database.getDocument(relativePath);
@@ -474,7 +466,7 @@ export class Syncer {
 							documentId: remoteVersion.documentId,
 						})
 					).contentBase64;
-					const contentBytes = lib.base64_to_bytes(content);
+					const contentBytes = lib.base64ToBytes(content);
 					const contentHash = hash(contentBytes);
 
 					await this.operations.create(
@@ -539,7 +531,7 @@ export class Syncer {
 								documentId: remoteVersion.documentId,
 							})
 						).contentBase64;
-						const contentBytes = lib.base64_to_bytes(content);
+						const contentBytes = lib.base64ToBytes(content);
 						const contentHash = hash(contentBytes);
 
 						if (relativePath !== remoteVersion.relativePath) {
@@ -592,7 +584,9 @@ export class Syncer {
 		await this.fileSyncQueue.onEmpty();
 		await this.database.resetSyncState();
 		this.history.reset();
-		this.remainingOperationsListeners.forEach((listener) => listener(0));
+		this.remainingOperationsListeners.forEach((listener) => {
+			listener(0);
+		});
 	}
 
 	private async safelySync(

From 111f14cec1bb3986db141ba6c2e2222834007aa8 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 2 Jan 2025 15:42:38 +0000
Subject: [PATCH 040/761] Harmonise backend & frontend versions

---
 backend/Cargo.lock             | 8 ++++----
 backend/fuzz/Cargo.toml        | 2 +-
 backend/reconcile/Cargo.toml   | 2 +-
 backend/sync_lib/Cargo.toml    | 2 +-
 backend/sync_server/Cargo.toml | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 512cfaec..bd0a93a1 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1493,7 +1493,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile"
-version = "0.1.0"
+version = "0.0.7"
 dependencies = [
  "insta",
  "pretty_assertions",
@@ -1503,7 +1503,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile-fuzz"
-version = "0.0.0"
+version = "0.0.7"
 dependencies = [
  "libfuzzer-sys",
  "reconcile",
@@ -2109,7 +2109,7 @@ dependencies = [
 
 [[package]]
 name = "sync_lib"
-version = "0.1.0"
+version = "0.0.7"
 dependencies = [
  "base64 0.22.1",
  "console_error_panic_hook",
@@ -2123,7 +2123,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.0.2"
+version = "0.0.7"
 dependencies = [
  "aide",
  "anyhow",
diff --git a/backend/fuzz/Cargo.toml b/backend/fuzz/Cargo.toml
index c8ed1657..af98a375 100644
--- a/backend/fuzz/Cargo.toml
+++ b/backend/fuzz/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "reconcile-fuzz"
-version = "0.0.0"
+version = "0.0.7"
 publish = false
 edition = "2021"
 
diff --git a/backend/reconcile/Cargo.toml b/backend/reconcile/Cargo.toml
index bc77f964..68ea52fc 100644
--- a/backend/reconcile/Cargo.toml
+++ b/backend/reconcile/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "reconcile"
-version = "0.1.0"
+version = "0.0.7"
 edition = "2021"
 
 [dependencies]
diff --git a/backend/sync_lib/Cargo.toml b/backend/sync_lib/Cargo.toml
index 1e3d23d0..a39a0236 100644
--- a/backend/sync_lib/Cargo.toml
+++ b/backend/sync_lib/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sync_lib"
-version = "0.1.0"
+version = "0.0.7"
 authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2018"
 
diff --git a/backend/sync_server/Cargo.toml b/backend/sync_server/Cargo.toml
index b386f300..9711323f 100644
--- a/backend/sync_server/Cargo.toml
+++ b/backend/sync_server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sync_server"
-version = "0.0.2"
+version = "0.0.7"
 edition = "2021"
 
 [dependencies]

From 08da52cce8e6fdcd524208975f5091f5646c2088 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 2 Jan 2025 15:43:07 +0000
Subject: [PATCH 041/761] Lint plugin in CI

---
 .github/workflows/{rust.yml => check.yml} | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
 rename .github/workflows/{rust.yml => check.yml} (83%)

diff --git a/.github/workflows/rust.yml b/.github/workflows/check.yml
similarity index 83%
rename from .github/workflows/rust.yml
rename to .github/workflows/check.yml
index d4d82026..9561c160 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/check.yml
@@ -27,13 +27,19 @@ jobs:
           sqlx database create --database-url sqlite://db.sqlite3
           sqlx migrate run --source sync_server/src/database/migrations --database-url sqlite://db.sqlite3
 
-      - name: Lint
+      - name: Lint backend
         run: |
           cd backend
           cargo clippy --all-targets --all-features
           cargo fmt --all -- --check
 
-      - name: Test
+      - name: Test backend
         run: |
           cd backend
           cargo test --verbose
+
+      - name: Lint frontend
+        run: |
+          cd plugin
+          npm install
+          npm run lint

From 7778ed894fdcf3564e56e67ca197f60fc755e1a5 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 2 Jan 2025 15:43:20 +0000
Subject: [PATCH 042/761] Rename & clean up

---
 .../{docker-publish.yml => publish-docker.yml}       |  0
 .../{release-plugin.yml => publish-plugin.yml}       | 12 +++---------
 2 files changed, 3 insertions(+), 9 deletions(-)
 rename .github/workflows/{docker-publish.yml => publish-docker.yml} (100%)
 rename .github/workflows/{release-plugin.yml => publish-plugin.yml} (86%)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/publish-docker.yml
similarity index 100%
rename from .github/workflows/docker-publish.yml
rename to .github/workflows/publish-docker.yml
diff --git a/.github/workflows/release-plugin.yml b/.github/workflows/publish-plugin.yml
similarity index 86%
rename from .github/workflows/release-plugin.yml
rename to .github/workflows/publish-plugin.yml
index d528f7a5..b2b7aaa9 100644
--- a/.github/workflows/release-plugin.yml
+++ b/.github/workflows/publish-plugin.yml
@@ -1,14 +1,10 @@
 name: Release Obsidian plugin
 
-# on:
-#   push:
-#     tags:
-#       - "*"
 on:
   push:
-    branches: ["master"]
-  pull_request:
-    branches: ["master"]
+    tags:
+      - "*"
+
 env:
   CARGO_TERM_COLOR: always
 
@@ -32,9 +28,7 @@ jobs:
 
       - name: Build plugin
         run: |
-          pwd
           cd plugin
-          pwd
           npm install
           npm run build
 

From 19d868fe4d90e6544e122b742a02889be84ebbb6 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 2 Jan 2025 15:44:06 +0000
Subject: [PATCH 043/761] Clean up version bumping

---
 bump-version.sh         | 11 +++++++++++
 plugin/package.json     |  4 ++--
 plugin/version-bump.mjs |  8 --------
 plugin/versions.json    | 10 ----------
 4 files changed, 13 insertions(+), 20 deletions(-)
 create mode 100644 bump-version.sh
 delete mode 100644 plugin/versions.json

diff --git a/bump-version.sh b/bump-version.sh
new file mode 100644
index 00000000..84e791c7
--- /dev/null
+++ b/bump-version.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+cd backend
+cargo set-version --bump patch
+cd ../plugin
+npm version patch
+git add .
+git commit -m "Bump versions"
+TAG=$(node -p "require('./package.json').version")
+git tag -a $TAG -m "Release $TAG"
+git push origin $TAG
diff --git a/plugin/package.json b/plugin/package.json
index 602f5a22..9b845901 100644
--- a/plugin/package.json
+++ b/plugin/package.json
@@ -7,7 +7,7 @@
 		"dev": "node esbuild.config.mjs",
 		"build": "tsc -noEmit -skipLibCheck && node esbuild.config.mjs production",
 		"lint": "eslint --fix src",
-		"version": "node version-bump.mjs && git add manifest.json versions.json"
+		"version": "node version-bump.mjs"
 	},
 	"keywords": [],
 	"author": "",
@@ -30,4 +30,4 @@
 		"typescript-eslint": "8.18.0",
 		"esbuild-sass-plugin": "^3.3.1"
 	}
-}
+}
\ No newline at end of file
diff --git a/plugin/version-bump.mjs b/plugin/version-bump.mjs
index 38ce8b19..f8b25824 100644
--- a/plugin/version-bump.mjs
+++ b/plugin/version-bump.mjs
@@ -2,14 +2,6 @@ import { readFileSync, writeFileSync } from "fs";
 
 const targetVersion = process.env.npm_package_version;
 
-// read minAppVersion from manifest.json and bump version to target version
 let manifest = JSON.parse(readFileSync("manifest.json", "utf8"));
-const { minAppVersion } = manifest;
 manifest.version = targetVersion;
 writeFileSync("manifest.json", JSON.stringify(manifest, null, "\t"));
-
-// update versions.json with target version and minAppVersion from manifest.json
-let versions = JSON.parse(readFileSync("versions.json", "utf8"));
-versions[targetVersion] = minAppVersion;
-writeFileSync("versions.json", JSON.stringify(versions, null, "\t"));
-
diff --git a/plugin/versions.json b/plugin/versions.json
deleted file mode 100644
index 9af17e8c..00000000
--- a/plugin/versions.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"0.0.0": "0.0.0",
-	"0.0.1": "0.0.0",
-	"0.0.2": "0.0.0",
-	"0.0.3": "0.0.0",
-	"0.0.4": "0.0.0",
-	"0.0.5": "0.0.0",
-	"0.0.6": "0.0.0",
-	"0.0.7": "0.0.0"
-}
\ No newline at end of file

From c738b96b628f3f3a15d9ac695ed8fe3feb8b9b90 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 2 Jan 2025 15:44:15 +0000
Subject: [PATCH 044/761] Update metadata

---
 plugin/manifest.json | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/plugin/manifest.json b/plugin/manifest.json
index b9574fd7..ca52bc64 100644
--- a/plugin/manifest.json
+++ b/plugin/manifest.json
@@ -1,11 +1,10 @@
 {
-	"id": "sample-plugin",
-	"name": "Sync & Share",
+	"id": "vault-link",
+	"name": "VaultLink",
 	"version": "0.0.7",
 	"minAppVersion": "0.0.0",
-	"description": "Demonstrates some of the capabilities of the Obsidian API.",
-	"author": "Obsidian",
-	"authorUrl": "https://obsidian.md",
-	"fundingUrl": "https://obsidian.md/pricing",
+	"description": "Self-hosted synchronization and collaboration for your Vault.",
+	"author": "Andras Schmelczer",
+	"authorUrl": "https://schmelczer.dev",
 	"isDesktopOnly": false
 }
\ No newline at end of file

From 00f9bcf6387fcf5eb4be12dcf7122dcfe23f4095 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 2 Jan 2025 15:49:37 +0000
Subject: [PATCH 045/761] Update readme

---
 README.md        |  6 +++---
 plugin/README.md | 11 -----------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 200d250b..c414202a 100644
--- a/README.md
+++ b/README.md
@@ -19,8 +19,7 @@
 - `rustup component add llvm-tools-preview`
 - `cargo install cargo-generate cargo-fuzz cargo-insta rustfilt cargo-binutils`
 - Install [`wasm-pack`](https://rustwasm.github.io/wasm-pack/installer): `curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh`
-- `cargo install cargo-insta`
-- `cargo install sqlx-cli`
+- `cargo install cargo-insta sqlx-cli cargo-edit`
 
 
 ## cut new version 
@@ -32,7 +31,8 @@ git tag -a 0.0.2 -m "0.0.2"
 git push origin 0.0.2
 ```
 
-
+npm install -g openapi-typescript
+openapi-typescript http://localhost:3030/api.json --output plugin/src/services/types.ts
 
 
 ## Todos
diff --git a/plugin/README.md b/plugin/README.md
index db7e58bb..d7f694da 100644
--- a/plugin/README.md
+++ b/plugin/README.md
@@ -57,15 +57,6 @@ Quick starting guide for new plugin devs:
 
 - Copy over `main.js`, `styles.css`, `manifest.json` to your vault `VaultFolder/.obsidian/plugins/your-plugin-id/`.
 
-## Improve code quality with eslint (optional)
-- [ESLint](https://eslint.org/) is a tool that analyzes your code to quickly find problems. You can run ESLint against your plugin to find common bugs and ways to improve your code. 
-- To use eslint with this project, make sure to install eslint from terminal:
-  - `npm install -g eslint`
-- To use eslint to analyze this project use this command:
-  - `eslint main.ts`
-  - eslint will then create a report with suggestions for code improvement by file and line number.
-- If your source code is in a folder, such as `src`, you can use eslint with this command to analyze all files in that folder:
-  - `eslint .\src\`
 
 ## Funding URL
 
@@ -99,5 +90,3 @@ See https://github.com/obsidianmd/obsidian-api
 
 
 
-npm install -g openapi-typescript
-openapi-typescript http://localhost:3000/api.json --output plugin/src/services/types.ts
\ No newline at end of file

From 22317bea373f84918bfd56c58401f1842bcf92db Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 2 Jan 2025 17:23:39 +0000
Subject: [PATCH 046/761] Fix CI

---
 .github/workflows/check.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 9561c160..f65d5ac0 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -27,6 +27,12 @@ jobs:
           sqlx database create --database-url sqlite://db.sqlite3
           sqlx migrate run --source sync_server/src/database/migrations --database-url sqlite://db.sqlite3
 
+      - name: Build wasm
+        run: |
+          cd backend
+          cargo install wasm-pack
+          wasm-pack build --target web sync_lib --features wee_alloc
+
       - name: Lint backend
         run: |
           cd backend

From 013daf34afb563914ad91598c5d1b21675698133 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 2 Jan 2025 17:24:01 +0000
Subject: [PATCH 047/761] Improve version bump script

---
 README.md       | 27 ++++++++++++---------------
 bump-version.sh | 27 ++++++++++++++++++++++++++-
 2 files changed, 38 insertions(+), 16 deletions(-)
 mode change 100644 => 100755 bump-version.sh

diff --git a/README.md b/README.md
index c414202a..d4a9d28a 100644
--- a/README.md
+++ b/README.md
@@ -22,19 +22,21 @@
 - `cargo install cargo-insta sqlx-cli cargo-edit`
 
 
-## cut new version 
+## Publish new version 
 
 ```sh
-cd plugin
-npm version patch
-git tag -a 0.0.2 -m "0.0.2"
-git push origin 0.0.2
+./bump-version.sh patch
 ```
 
+
+## Update HTTP API TS bindings
+
+```sh 
 npm install -g openapi-typescript
 openapi-typescript http://localhost:3030/api.json --output plugin/src/services/types.ts
+```
 
-
+```
 ## Todos
 
 - Add users to vaults
@@ -43,14 +45,14 @@ openapi-typescript http://localhost:3030/api.json --output plugin/src/services/t
 - e2e tests
 - add clap
 - add auth middleware
-- run eslint in ci
-
+- shard db per user
+- update card title max width
+- retry
 - CI for:
     - publish reconcile
     - cross-platform build server
     - run load test on server
     - build and publish plugin with openapi types
-    - build docker image
 
 todo: enable
 [workspace.lints.clippy]
@@ -66,9 +68,4 @@ implicit_return = { level = "allow", priority = 1 }
 pedantic = { level = "warn", priority = 0 }
 cargo = { level = "warn", priority = 0 }
 
-
-update card title max width
-reset should reset counters
-access logs
-retry
-mem usage
\ No newline at end of file
+```
diff --git a/bump-version.sh b/bump-version.sh
old mode 100644
new mode 100755
index 84e791c7..59aad9a7
--- a/bump-version.sh
+++ b/bump-version.sh
@@ -1,11 +1,36 @@
 #!/bin/bash
 
+set -e
+
+if [[ -z $1 ]]; then
+  echo "Usage: $0 {patch|minor|major}"
+  exit 1
+fi
+
+if [[ $1 =~ ^(patch|minor|major)$ ]]; then
+  echo "Creating a new '$1' version"
+else
+  echo "Invalid argument: $1"
+  echo "Usage: $0 {patch|minor|major}"
+  exit 1
+fi
+
+if [[ -n $(git status --porcelain) ]]; then
+  echo "Your working directory is not clean. Please commit or stash your changes before proceeding."
+  exit 1
+else
+  echo "Your working directory is clean."
+fi
+
 cd backend
 cargo set-version --bump patch
 cd ../plugin
 npm version patch
+cd ..
 git add .
-git commit -m "Bump versions"
 TAG=$(node -p "require('./package.json').version")
+git commit -m "Bump versions to $TAG"
+echo "Tagging $TAG"
 git tag -a $TAG -m "Release $TAG"
 git push origin $TAG
+echo "Done"

From 991def9a6567787aa89becdace90e9236f0ceceb Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 2 Jan 2025 17:43:23 +0000
Subject: [PATCH 048/761] Fix for BRAT

---
 bump-version.sh |  1 +
 manifest.json   | 11 +++++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bump-version.sh b/bump-version.sh
index 59aad9a7..36e54608 100755
--- a/bump-version.sh
+++ b/bump-version.sh
@@ -27,6 +27,7 @@ cargo set-version --bump patch
 cd ../plugin
 npm version patch
 cd ..
+cp plugin/manifest.json manifest.json  # for BRAT, otherwise it wouldn't update
 git add .
 TAG=$(node -p "require('./package.json').version")
 git commit -m "Bump versions to $TAG"
diff --git a/manifest.json b/manifest.json
index b9574fd7..ca52bc64 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,11 +1,10 @@
 {
-	"id": "sample-plugin",
-	"name": "Sync & Share",
+	"id": "vault-link",
+	"name": "VaultLink",
 	"version": "0.0.7",
 	"minAppVersion": "0.0.0",
-	"description": "Demonstrates some of the capabilities of the Obsidian API.",
-	"author": "Obsidian",
-	"authorUrl": "https://obsidian.md",
-	"fundingUrl": "https://obsidian.md/pricing",
+	"description": "Self-hosted synchronization and collaboration for your Vault.",
+	"author": "Andras Schmelczer",
+	"authorUrl": "https://schmelczer.dev",
 	"isDesktopOnly": false
 }
\ No newline at end of file

From 4fd74e0d9f5f5a404456198868fc3802fa2df2b5 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 2 Jan 2025 17:43:37 +0000
Subject: [PATCH 049/761] Fix CI failing with rust warning

---
 backend/reconcile/src/utils/string_builder.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/backend/reconcile/src/utils/string_builder.rs b/backend/reconcile/src/utils/string_builder.rs
index 6e3a4b49..b19bcbb4 100644
--- a/backend/reconcile/src/utils/string_builder.rs
+++ b/backend/reconcile/src/utils/string_builder.rs
@@ -67,6 +67,7 @@ impl StringBuilder<'_> {
         self.buffer
     }
 
+    #[allow(dead_code)]
     pub fn get_slice(&self, range: Range<usize>) -> String {
         let result = self
             .buffer

From e15fc63e794ca04f872ff3cc268ea8983f9ae938 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 2 Jan 2025 17:44:03 +0000
Subject: [PATCH 050/761] Add open settings

---
 plugin/src/plugin.ts | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/plugin/src/plugin.ts b/plugin/src/plugin.ts
index 41c14258..520288e9 100644
--- a/plugin/src/plugin.ts
+++ b/plugin/src/plugin.ts
@@ -21,6 +21,7 @@ export default class SyncPlugin extends Plugin {
 	private remoteListenerIntervalId: number | null = null;
 	private readonly operations = new ObsidianFileOperations(this.app.vault);
 	private readonly history = new SyncHistory();
+	private settingsTab: SyncSettingsTab;
 
 	public async onload(): Promise<void> {
 		Logger.getInstance().info("Starting plugin");
@@ -48,11 +49,16 @@ export default class SyncPlugin extends Plugin {
 			history: this.history,
 		});
 
-		this.addSettingTab(
-			new SyncSettingsTab(this.app, this, database, syncServer, syncer)
+		this.settingsTab = new SyncSettingsTab(
+			this.app,
+			this,
+			database,
+			syncServer,
+			syncer
 		);
+		this.addSettingTab(this.settingsTab);
 
-		new StatusBar(this, this.history, syncer);
+		new StatusBar(database, this, this.history, syncer);
 
 		const eventHandler = new ObsidianFileEventHandler(syncer);
 
@@ -132,6 +138,13 @@ export default class SyncPlugin extends Plugin {
 		}
 	}
 
+	public openSettings() {
+		// eslint-disable-next-line @typescript-eslint/no-explicit-any
+		(this.app as any).setting.open(); // this is undocumented
+		// eslint-disable-next-line @typescript-eslint/no-explicit-any
+		(this.app as any).setting.openTab(this.settingsTab); // this is undocumented
+	}
+
 	private async activateView(type: string): Promise<void> {
 		const { workspace } = this.app;
 

From b73c26ffd863d937d30556fc0575aa635ba80181 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 2 Jan 2025 20:13:15 +0000
Subject: [PATCH 051/761] Add CI badges

---
 .github/workflows/check.yml          | 2 +-
 .github/workflows/publish-docker.yml | 2 +-
 .github/workflows/publish-plugin.yml | 2 +-
 README.md                            | 5 +++++
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index f65d5ac0..0a456f97 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -1,4 +1,4 @@
-name: Rust
+name: Check
 
 on:
   push:
diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml
index bfad7866..c5a4a4a0 100644
--- a/.github/workflows/publish-docker.yml
+++ b/.github/workflows/publish-docker.yml
@@ -1,4 +1,4 @@
-name: Docker
+name: Publish server Docker image
 
 # This workflow uses actions that are not certified by GitHub.
 # They are provided by a third-party and are governed by
diff --git a/.github/workflows/publish-plugin.yml b/.github/workflows/publish-plugin.yml
index b2b7aaa9..795fd844 100644
--- a/.github/workflows/publish-plugin.yml
+++ b/.github/workflows/publish-plugin.yml
@@ -1,4 +1,4 @@
-name: Release Obsidian plugin
+name: Publish Obsidian plugin
 
 on:
   push:
diff --git a/README.md b/README.md
index d4a9d28a..ad9bdde9 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,8 @@
+## VaultLink self-hosted Obsidian sync plugin
+
+[![Check](https://github.com/schmelczer/obsidian-shared-sync/actions/workflows/check.yml/badge.svg)](https://github.com/schmelczer/obsidian-shared-sync/actions/workflows/check.yml)
+[![Publish Docker](https://github.com/schmelczer/obsidian-shared-sync/actions/workflows/publish-docker.yml/badge.svg)](https://github.com/schmelczer/obsidian-shared-sync/actions/workflows/publish-docker.yml)
+[![Publish plugin](https://github.com/schmelczer/obsidian-shared-sync/actions/workflows/publish-plugin.yml/badge.svg)](https://github.com/schmelczer/obsidian-shared-sync/actions/workflows/publish-plugin.yml)
 
 
 ## Install [nvm](https://github.com/nvm-sh/nvm)

From b53cc5beb48d288372a555f05bda2cb94ae94b68 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 2 Jan 2025 20:37:18 +0000
Subject: [PATCH 052/761] Add retried fetch and connection check

---
 plugin/package-lock.json            |  8 ++++++
 plugin/package.json                 |  3 ++-
 plugin/src/services/sync-service.ts | 28 ++++++++++++++++++++
 plugin/src/utils/retried-fetch.ts   | 41 +++++++++++++++++++++++++++++
 4 files changed, 79 insertions(+), 1 deletion(-)
 create mode 100644 plugin/src/utils/retried-fetch.ts

diff --git a/plugin/package-lock.json b/plugin/package-lock.json
index 04a2879d..e13c4099 100644
--- a/plugin/package-lock.json
+++ b/plugin/package-lock.json
@@ -18,6 +18,7 @@
 				"esbuild-sass-plugin": "^3.3.1",
 				"eslint": "9.17.0",
 				"eslint-plugin-unused-imports": "^4.1.4",
+				"fetch-retry": "^6.0.0",
 				"obsidian": "1.7.2",
 				"openapi-fetch": "0.13.3",
 				"openapi-typescript": "7.4.4",
@@ -2012,6 +2013,13 @@
 				"reusify": "^1.0.4"
 			}
 		},
+		"node_modules/fetch-retry": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/fetch-retry/-/fetch-retry-6.0.0.tgz",
+			"integrity": "sha512-BUFj1aMubgib37I3v4q78fYo63Po7t4HUPTpQ6/QE6yK6cIQrP+W43FYToeTEyg5m2Y7eFUtijUuAv/PDlWuag==",
+			"dev": true,
+			"license": "MIT"
+		},
 		"node_modules/file-entry-cache": {
 			"version": "8.0.0",
 			"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz",
diff --git a/plugin/package.json b/plugin/package.json
index 9b845901..8096c6d3 100644
--- a/plugin/package.json
+++ b/plugin/package.json
@@ -19,6 +19,7 @@
 		"dayjs": "^1.11.13",
 		"esbuild": "0.24.0",
 		"esbuild-plugin-wasm-pack": "^1.1.0",
+		"esbuild-sass-plugin": "^3.3.1",
 		"eslint": "9.17.0",
 		"eslint-plugin-unused-imports": "^4.1.4",
 		"obsidian": "1.7.2",
@@ -28,6 +29,6 @@
 		"tslib": "2.4.0",
 		"typescript": "5.7.2",
 		"typescript-eslint": "8.18.0",
-		"esbuild-sass-plugin": "^3.3.1"
+		"fetch-retry": "^6.0.0"
 	}
 }
\ No newline at end of file
diff --git a/plugin/src/services/sync-service.ts b/plugin/src/services/sync-service.ts
index 4713bedc..d5f4cbc7 100644
--- a/plugin/src/services/sync-service.ts
+++ b/plugin/src/services/sync-service.ts
@@ -11,7 +11,12 @@ import type {
 	VaultUpdateId,
 } from "src/database/document-metadata";
 import { Logger } from "src/tracing/logger.js";
+import { retriedFetch } from "src/utils/retried-fetch.js";
 
+export interface CheckConnectionResult {
+	isSuccessful: boolean;
+	message: string;
+}
 export class SyncService {
 	private client: Client<paths>;
 
@@ -272,9 +277,32 @@ export class SyncService {
 		return response.data;
 	}
 
+	public async checkConnection(): Promise<CheckConnectionResult> {
+		try {
+			const result = await this.ping();
+			if (result.isAuthenticated) {
+				return {
+					isSuccessful: true,
+					message: `Successfully connected to server (version: ${result.serverVersion}) and authenticated.`,
+				};
+			}
+
+			return {
+				isSuccessful: false,
+				message: `Successfully connected to server (version: ${result.serverVersion}) but failed to authenticate.`,
+			};
+		} catch (e) {
+			return {
+				isSuccessful: false,
+				message: `Failed to connect to server: ${e}`,
+			};
+		}
+	}
+
 	private createClient(settings: SyncSettings): void {
 		this.client = createClient<paths>({
 			baseUrl: settings.remoteUri,
+			fetch: retriedFetch,
 		});
 	}
 }
diff --git a/plugin/src/utils/retried-fetch.ts b/plugin/src/utils/retried-fetch.ts
new file mode 100644
index 00000000..de40d3d4
--- /dev/null
+++ b/plugin/src/utils/retried-fetch.ts
@@ -0,0 +1,41 @@
+import * as fetchRetryFactory from "fetch-retry";
+import { Logger } from "src/tracing/logger";
+
+const fetchWithRetry = fetchRetryFactory.default(fetch);
+
+export async function retriedFetch(
+	input: RequestInfo | URL,
+	init: RequestInit = {}
+): Promise<Response> {
+	return fetchWithRetry(input, {
+		...init,
+		retryOn: function (attempt, error, response) {
+			// retry on any network error, or 4xx or 5xx status codes
+			if (error !== null || !response || response.status >= 500) {
+				Logger.getInstance().warn(
+					`Retrying fetch attempt ${attempt} for ${getUrlFromInput(
+						input
+					)}`
+				);
+
+				return true;
+			}
+			return false;
+		},
+		retries: 6,
+		retryDelay: function (attempt) {
+			Logger;
+			return Math.pow(1.5, attempt) * 500;
+		},
+	});
+}
+
+function getUrlFromInput(input: RequestInfo | URL): string {
+	if (input instanceof URL) {
+		return input.href;
+	}
+	if (typeof input === "string") {
+		return input;
+	}
+	return input.url;
+}

From e15b9e24982bfd7e09536b55f4043af4fb4464c2 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 2 Jan 2025 20:44:04 +0000
Subject: [PATCH 053/761] Lint retried fetch

---
 plugin/src/utils/retried-fetch.ts | 50 ++++++++++++++-----------------
 1 file changed, 23 insertions(+), 27 deletions(-)

diff --git a/plugin/src/utils/retried-fetch.ts b/plugin/src/utils/retried-fetch.ts
index de40d3d4..474ead36 100644
--- a/plugin/src/utils/retried-fetch.ts
+++ b/plugin/src/utils/retried-fetch.ts
@@ -3,33 +3,6 @@ import { Logger } from "src/tracing/logger";
 
 const fetchWithRetry = fetchRetryFactory.default(fetch);
 
-export async function retriedFetch(
-	input: RequestInfo | URL,
-	init: RequestInit = {}
-): Promise<Response> {
-	return fetchWithRetry(input, {
-		...init,
-		retryOn: function (attempt, error, response) {
-			// retry on any network error, or 4xx or 5xx status codes
-			if (error !== null || !response || response.status >= 500) {
-				Logger.getInstance().warn(
-					`Retrying fetch attempt ${attempt} for ${getUrlFromInput(
-						input
-					)}`
-				);
-
-				return true;
-			}
-			return false;
-		},
-		retries: 6,
-		retryDelay: function (attempt) {
-			Logger;
-			return Math.pow(1.5, attempt) * 500;
-		},
-	});
-}
-
 function getUrlFromInput(input: RequestInfo | URL): string {
 	if (input instanceof URL) {
 		return input.href;
@@ -39,3 +12,26 @@ function getUrlFromInput(input: RequestInfo | URL): string {
 	}
 	return input.url;
 }
+
+export async function retriedFetch(
+	input: RequestInfo | URL,
+	init: RequestInit = {}
+): Promise<Response> {
+	return fetchWithRetry(input, {
+		...init,
+		retryOn: function (attempt, error, response) {
+			if (error !== null || !response || response.status >= 500) {
+				Logger.getInstance().warn(
+					`Retrying fetch for ${getUrlFromInput(
+						input
+					)}, attempt ${attempt}`
+				);
+
+				return true;
+			}
+			return false;
+		},
+		retries: 6,
+		retryDelay: (attempt) => Math.pow(1.5, attempt) * 500,
+	});
+}

From ea1c73a3c9b41cdb441aba16f3c5726a6d2c52a6 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 2 Jan 2025 20:45:13 +0000
Subject: [PATCH 054/761] Add empty state for status bar

---
 plugin/src/views/status-bar.ts | 58 ++++++++++++++++++++++++++++++----
 1 file changed, 51 insertions(+), 7 deletions(-)

diff --git a/plugin/src/views/status-bar.ts b/plugin/src/views/status-bar.ts
index 6b1f0cbb..45e6db6b 100644
--- a/plugin/src/views/status-bar.ts
+++ b/plugin/src/views/status-bar.ts
@@ -1,4 +1,5 @@
-import type { Plugin } from "obsidian";
+import type { Database } from "src/database/database";
+import type SyncPlugin from "src/plugin";
 import type { Syncer } from "src/sync-operations/syncer";
 import type { HistoryStats, SyncHistory } from "src/tracing/sync-history";
 
@@ -8,7 +9,12 @@ export class StatusBar {
 	private lastHistoryStats: HistoryStats | undefined;
 	private lastRemaining: number | undefined;
 
-	public constructor(plugin: Plugin, history: SyncHistory, syncer: Syncer) {
+	public constructor(
+		private readonly database: Database,
+		private readonly plugin: SyncPlugin,
+		history: SyncHistory,
+		syncer: Syncer
+	) {
 		this.statusBarItem = plugin.addStatusBarItem();
 		history.addSyncHistoryUpdateListener((status) => {
 			this.lastHistoryStats = status;
@@ -19,13 +25,51 @@ export class StatusBar {
 			this.lastRemaining = remainingOperations;
 			this.updateStatus();
 		});
+
+		database.addOnSettingsChangeHandlers(() => {
+			this.updateStatus();
+		});
 	}
 
 	private updateStatus(): void {
-		this.statusBarItem.setText(
-			`${this.lastRemaining ?? 0} ⏳ | ${
-				this.lastHistoryStats?.success ?? 0
-			} ✅ | ${this.lastHistoryStats?.error ?? 0} ❌`
-		);
+		this.statusBarItem.empty();
+		const container = this.statusBarItem.createDiv({
+			cls: ["sync-status"],
+		});
+
+		let hasShownMessage = false;
+
+		if ((this.lastRemaining ?? 0) > 0) {
+			hasShownMessage = true;
+			container.createSpan({ text: `${this.lastRemaining} ⏳` });
+		}
+
+		if ((this.lastHistoryStats?.success ?? 0) > 0) {
+			hasShownMessage = true;
+			container.createSpan({
+				text: `${this.lastHistoryStats?.success ?? 0} ✅`,
+			});
+		}
+
+		if ((this.lastHistoryStats?.error ?? 0) > 0) {
+			hasShownMessage = true;
+			container.createSpan({
+				text: `${this.lastHistoryStats?.error ?? 0} ❌`,
+			});
+		}
+
+		if (!hasShownMessage) {
+			if (this.database.getSettings().isSyncEnabled) {
+				container.createSpan({ text: "VaultLink is idle" });
+			} else {
+				const button = container.createEl("button", {
+					text: "VaultLink is disabled, click to configure",
+					cls: "initialize-button",
+				});
+				button.onclick = (): void => {
+					this.plugin.openSettings();
+				};
+			}
+		}
 	}
 }

From 60b6d90b6cc60e55b39a8e776c7bd72539261e73 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 2 Jan 2025 20:46:00 +0000
Subject: [PATCH 055/761] Rename syncServer to syncService

---
 .../apply-remote-changes-locally.ts            |  6 +++---
 plugin/src/sync-operations/syncer.ts           | 18 +++++++++---------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/plugin/src/sync-operations/apply-remote-changes-locally.ts b/plugin/src/sync-operations/apply-remote-changes-locally.ts
index 088935b5..d1a8f69f 100644
--- a/plugin/src/sync-operations/apply-remote-changes-locally.ts
+++ b/plugin/src/sync-operations/apply-remote-changes-locally.ts
@@ -7,11 +7,11 @@ let isRunning = false;
 
 export async function applyRemoteChangesLocally({
 	database,
-	syncServer,
+	syncService,
 	syncer,
 }: {
 	database: Database;
-	syncServer: SyncService;
+	syncService: SyncService;
 	syncer: Syncer;
 }): Promise<void> {
 	if (!database.getSettings().isSyncEnabled) {
@@ -29,7 +29,7 @@ export async function applyRemoteChangesLocally({
 	isRunning = true;
 
 	try {
-		const remote = await syncServer.getAll(database.getLastSeenUpdateId());
+		const remote = await syncService.getAll(database.getLastSeenUpdateId());
 
 		if (remote.latestDocuments.length === 0) {
 			Logger.getInstance().debug("No remote changes to apply");
diff --git a/plugin/src/sync-operations/syncer.ts b/plugin/src/sync-operations/syncer.ts
index 8d08a0f1..4d3e52f6 100644
--- a/plugin/src/sync-operations/syncer.ts
+++ b/plugin/src/sync-operations/syncer.ts
@@ -13,7 +13,7 @@ import type { components } from "src/services/types.js";
 
 export class Syncer {
 	private readonly database: Database;
-	private readonly syncServer: SyncService;
+	private readonly syncService: SyncService;
 	private readonly operations: FileOperations;
 	private readonly history: SyncHistory;
 
@@ -27,17 +27,17 @@ export class Syncer {
 
 	public constructor({
 		database,
-		syncServer,
+		syncService,
 		operations,
 		history,
 	}: {
 		database: Database;
-		syncServer: SyncService;
+		syncService: SyncService;
 		operations: FileOperations;
 		history: SyncHistory;
 	}) {
 		this.database = database;
-		this.syncServer = syncServer;
+		this.syncService = syncService;
 		this.operations = operations;
 		this.history = history;
 
@@ -87,7 +87,7 @@ export class Syncer {
 				const contentBytes = await this.operations.read(relativePath);
 				const contentHash = hash(contentBytes);
 
-				const response = await this.syncServer.create({
+				const response = await this.syncService.create({
 					relativePath,
 					contentBytes,
 					createdDate: updateTime,
@@ -162,7 +162,7 @@ export class Syncer {
 					return;
 				}
 
-				await this.syncServer.delete({
+				await this.syncService.delete({
 					documentId: metadata.documentId,
 					relativePath,
 					// We got the event now, so it must have been deleted just now
@@ -223,7 +223,7 @@ export class Syncer {
 					return;
 				}
 
-				const response = await this.syncServer.put({
+				const response = await this.syncService.put({
 					documentId: metadata.documentId,
 					parentVersionId: metadata.parentVersionId,
 					relativePath,
@@ -462,7 +462,7 @@ export class Syncer {
 					}
 
 					const content = (
-						await this.syncServer.get({
+						await this.syncService.get({
 							documentId: remoteVersion.documentId,
 						})
 					).contentBase64;
@@ -527,7 +527,7 @@ export class Syncer {
 						}
 
 						const content = (
-							await this.syncServer.get({
+							await this.syncService.get({
 								documentId: remoteVersion.documentId,
 							})
 						).contentBase64;

From c391aede1f85686e0469cfe5570680fbe5e04307 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 2 Jan 2025 20:46:11 +0000
Subject: [PATCH 056/761] Refactor sync history

---
 plugin/src/tracing/sync-history.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugin/src/tracing/sync-history.ts b/plugin/src/tracing/sync-history.ts
index 2c4e4514..aca45668 100644
--- a/plugin/src/tracing/sync-history.ts
+++ b/plugin/src/tracing/sync-history.ts
@@ -36,10 +36,12 @@ export interface HistoryStats {
 export class SyncHistory {
 	private static readonly MAX_ENTRIES = 1000;
 
-	private entries: HistoryEntry[] = [];
+	private readonly entries: HistoryEntry[] = [];
+
 	private readonly syncHistoryUpdateListeners: ((
 		status: HistoryStats
 	) => void)[] = [];
+
 	private status: HistoryStats = {
 		success: 0,
 		error: 0,
@@ -50,7 +52,7 @@ export class SyncHistory {
 	}
 
 	public reset(): void {
-		this.entries = [];
+		this.entries.length = 0;
 		this.status = {
 			success: 0,
 			error: 0,

From c3781a432ef0d1cd80dd75040c1e1bb32e39ba46 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 2 Jan 2025 20:56:35 +0000
Subject: [PATCH 057/761] Refactor for better API

---
 plugin/src/utils/retried-fetch.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugin/src/utils/retried-fetch.ts b/plugin/src/utils/retried-fetch.ts
index 474ead36..af4296a8 100644
--- a/plugin/src/utils/retried-fetch.ts
+++ b/plugin/src/utils/retried-fetch.ts
@@ -1,4 +1,5 @@
 import * as fetchRetryFactory from "fetch-retry";
+import { RequestInitRetryParams } from "fetch-retry";
 import { Logger } from "src/tracing/logger";
 
 const fetchWithRetry = fetchRetryFactory.default(fetch);
@@ -15,10 +16,9 @@ function getUrlFromInput(input: RequestInfo | URL): string {
 
 export async function retriedFetch(
 	input: RequestInfo | URL,
-	init: RequestInit = {}
+	init: RequestInitRetryParams<typeof fetch> = {}
 ): Promise<Response> {
 	return fetchWithRetry(input, {
-		...init,
 		retryOn: function (attempt, error, response) {
 			if (error !== null || !response || response.status >= 500) {
 				Logger.getInstance().warn(
@@ -33,5 +33,6 @@ export async function retriedFetch(
 		},
 		retries: 6,
 		retryDelay: (attempt) => Math.pow(1.5, attempt) * 500,
+		...init,
 	});
 }

From 5870636210748e8cd809963a8b6f156f67d7bb05 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 2 Jan 2025 20:56:46 +0000
Subject: [PATCH 058/761] Don't retry pings

---
 plugin/src/services/sync-service.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/plugin/src/services/sync-service.ts b/plugin/src/services/sync-service.ts
index d5f4cbc7..d2c460cd 100644
--- a/plugin/src/services/sync-service.ts
+++ b/plugin/src/services/sync-service.ts
@@ -19,6 +19,7 @@ export interface CheckConnectionResult {
 }
 export class SyncService {
 	private client: Client<paths>;
+	private clientWithoutRetries: Client<paths>;
 
 	public constructor(private readonly database: Database) {
 		this.createClient(database.getSettings());
@@ -41,7 +42,7 @@ export class SyncService {
 	}
 
 	public async ping(): Promise<components["schemas"]["PingResponse"]> {
-		const response = await this.client.GET("/ping", {
+		const response = await this.clientWithoutRetries.GET("/ping", {
 			params: {
 				header: {
 					authorization: `Bearer ${
@@ -304,5 +305,9 @@ export class SyncService {
 			baseUrl: settings.remoteUri,
 			fetch: retriedFetch,
 		});
+
+		this.clientWithoutRetries = createClient<paths>({
+			baseUrl: settings.remoteUri,
+		});
 	}
 }

From a628b1f8ce1a078f5e94b609534a1833dfa84726 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 2 Jan 2025 22:06:19 +0000
Subject: [PATCH 059/761] Improve settings

---
 plugin/src/plugin.ts                   |  50 +++--
 plugin/src/styles.scss                 | 106 +++++++++--
 plugin/src/views/settings-tab.ts       | 246 +++++++++++++++++--------
 plugin/src/views/status-description.ts | 139 ++++++++++++++
 4 files changed, 437 insertions(+), 104 deletions(-)
 create mode 100644 plugin/src/views/status-description.ts

diff --git a/plugin/src/plugin.ts b/plugin/src/plugin.ts
index 520288e9..afd3f634 100644
--- a/plugin/src/plugin.ts
+++ b/plugin/src/plugin.ts
@@ -16,12 +16,13 @@ import { Logger } from "./tracing/logger.js";
 import { SyncHistory } from "./tracing/sync-history.js";
 import { LogsView } from "./views/logs-view.js";
 import { Syncer } from "./sync-operations/syncer.js";
+import { StatusDescription } from "./views/status-description.js";
 
 export default class SyncPlugin extends Plugin {
-	private remoteListenerIntervalId: number | null = null;
 	private readonly operations = new ObsidianFileOperations(this.app.vault);
 	private readonly history = new SyncHistory();
 	private settingsTab: SyncSettingsTab;
+	private remoteListenerIntervalId: number | null = null;
 
 	public async onload(): Promise<void> {
 		Logger.getInstance().info("Starting plugin");
@@ -40,22 +41,30 @@ export default class SyncPlugin extends Plugin {
 			this.saveData.bind(this)
 		);
 
-		const syncServer = new SyncService(database);
+		const syncService = new SyncService(database);
 
 		const syncer = new Syncer({
 			database,
 			operations: this.operations,
-			syncServer,
+			syncService,
 			history: this.history,
 		});
 
-		this.settingsTab = new SyncSettingsTab(
-			this.app,
-			this,
+		const statusDescription = new StatusDescription(
 			database,
-			syncServer,
+			syncService,
+			this.history,
 			syncer
 		);
+
+		this.settingsTab = new SyncSettingsTab({
+			app: this.app,
+			plugin: this,
+			database,
+			syncService,
+			statusDescription,
+			syncer,
+		});
 		this.addSettingTab(this.settingsTab);
 
 		new StatusBar(database, this, this.history, syncer);
@@ -86,14 +95,14 @@ export default class SyncPlugin extends Plugin {
 				this.registerEvent(event);
 			});
 
-			await syncer.scheduleSyncForOfflineChanges();
-
 			Logger.getInstance().info("Sync handlers initialised");
+
+			void syncer.scheduleSyncForOfflineChanges();
 		});
 
 		this.registerRemoteEventListener(
 			database,
-			syncServer,
+			syncService,
 			syncer,
 			database.getSettings().fetchChangesUpdateIntervalMs
 		);
@@ -102,7 +111,7 @@ export default class SyncPlugin extends Plugin {
 		database.addOnSettingsChangeHandlers(async (settings, oldSettings) => {
 			this.registerRemoteEventListener(
 				database,
-				syncServer,
+				syncService,
 				syncer,
 				settings.fetchChangesUpdateIntervalMs
 			);
@@ -130,6 +139,8 @@ export default class SyncPlugin extends Plugin {
 		);
 
 		Logger.getInstance().info("Plugin loaded");
+
+		this.openSettings();
 	}
 
 	public onunload(): void {
@@ -138,14 +149,19 @@ export default class SyncPlugin extends Plugin {
 		}
 	}
 
-	public openSettings() {
-		// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	public openSettings(): void {
+		// eslint-disable-next-line
 		(this.app as any).setting.open(); // this is undocumented
-		// eslint-disable-next-line @typescript-eslint/no-explicit-any
+		// eslint-disable-next-line
 		(this.app as any).setting.openTab(this.settingsTab); // this is undocumented
 	}
 
-	private async activateView(type: string): Promise<void> {
+	public closeSettings(): void {
+		// eslint-disable-next-line
+		(this.app as any).setting.close(); // this is undocumented
+	}
+
+	public async activateView(type: string): Promise<void> {
 		const { workspace } = this.app;
 
 		let leaf: WorkspaceLeaf | null = null;
@@ -165,7 +181,7 @@ export default class SyncPlugin extends Plugin {
 
 	private registerRemoteEventListener(
 		database: Database,
-		syncServer: SyncService,
+		syncService: SyncService,
 		syncer: Syncer,
 		intervalMs: number
 	): void {
@@ -178,7 +194,7 @@ export default class SyncPlugin extends Plugin {
 			async () =>
 				applyRemoteChangesLocally({
 					database,
-					syncServer,
+					syncService,
 					syncer,
 				}),
 			intervalMs
diff --git a/plugin/src/styles.scss b/plugin/src/styles.scss
index 78934cdb..6392847a 100644
--- a/plugin/src/styles.scss
+++ b/plugin/src/styles.scss
@@ -1,31 +1,106 @@
-.sync-settings-access-token textarea {
-	width: 100%;
-	height: 100px;
+.status-description {
+	margin: var(--p-spacing) 0;
+
+	.number {
+		padding: var(--size-2-1) var(--size-4-1);
+		border-radius: var(--radius-s);
+		background-color: var(--color-base-30);
+		font-family: var(--font-monospace-default);
+		font-weight: var(--bold-weight);
+
+		&.good {
+			background-color: rgba(var(--color-green-rgb), 0.35);
+		}
+
+		&.bad {
+			background-color: rgba(var(--color-red-rgb), 0.35);
+		}
+	}
+
+	.error {
+		color: rgb(var(--color-red-rgb));
+	}
+
+	.warning {
+		color: rgb(var(--color-yellow-rgb));
+	}
+}
+
+.vault-link-settings {
+	h2 {
+		display: flex;
+		align-items: center;
+		font-size: var(--h2-size);
+
+		.version {
+			display: block;
+			font-size: var(--font-ui-smaller);
+			margin-top: var(--size-2-2);
+			margin-left: var(--size-4-2);
+			padding: var(--size-2-1) var(--size-4-1);
+			background-color: var(--color-base-30);
+			color: var(--color-base-70);
+			border-radius: var(--radius-s);
+		}
+	}
+
+	.button-container {
+		display: flex;
+		gap: var(--size-4-2);
+	}
+
+	h3 {
+		font-size: var(--font-ui-large);
+		margin-top: var(--heading-spacing);
+	}
+
+	button,
+	input[type="range"],
+	.checkbox-container,
+	.slider::-webkit-slider-thumb {
+		cursor: pointer;
+	}
+
+	textarea {
+		resize: none;
+		width: 100%;
+		height: 60px;
+	}
+}
+
+.sync-status {
+	display: flex;
+	gap: var(--size-4-2);
+
+	* {
+		display: block;
+	}
+
+	.initialize-button {
+		padding: 0 var(--size-4-2);
+		background: rgba(var(--color-red-rgb), 0.4);
+		cursor: pointer;
+	}
 }
 
 .log-message {
+	font: var(--font-monospace-theme);
+
 	&.DEBUG {
 		color: var(--color-base-50);
 	}
 
 	&.INFO {
-		color: var(--color-base-70);
+		color: var(--color-green-rgb);
 	}
 
 	&.WARNING {
-		color: var(--color-yellow-70);
+		color: var(--color-yellow-rgb);
 	}
 
 	&.ERROR {
-		color: var(--color-red-70);
+		color: var(--color-red-rgb);
 	}
-
-	font: var(--font-monospace-theme);
-}
-
-.history-card * {
-	margin: 0;
-	padding: 0;
 }
 
 .history-card {
@@ -42,6 +117,11 @@
 		background-color: rgba(var(--color-red-rgb), 0.2);
 	}
 
+	* {
+		margin: 0;
+		padding: 0;
+	}
+
 	.history-card-header {
 		display: flex;
 		justify-content: space-between;
diff --git a/plugin/src/views/settings-tab.ts b/plugin/src/views/settings-tab.ts
index e21523a8..4b6fa129 100644
--- a/plugin/src/views/settings-tab.ts
+++ b/plugin/src/views/settings-tab.ts
@@ -4,19 +4,44 @@ import { Notice, PluginSettingTab, Setting } from "obsidian";
 import type SyncPlugin from "src/plugin";
 import type { Database } from "src/database/database";
 import type { SyncService } from "src/services/sync-service";
-import type { SyncHistory } from "src/tracing/sync-history";
+import { Logger } from "src/tracing/logger";
+import type { Syncer } from "src/sync-operations/syncer";
+import type { StatusDescription } from "./status-description";
+import { LogsView } from "./logs-view";
+import { HistoryView } from "./history-view";
 
 export class SyncSettingsTab extends PluginSettingTab {
 	private editedVaultName: string;
 
-	public constructor(
-		app: App,
-		plugin: SyncPlugin,
-		private readonly database: Database,
-		private readonly syncServer: SyncService,
-		private readonly history: SyncHistory
-	) {
+	private readonly plugin: SyncPlugin;
+	private readonly database: Database;
+	private readonly syncService: SyncService;
+	private readonly statusDescription: StatusDescription;
+	private readonly syncer: Syncer;
+	private statusDescriptionSubscription: (() => void) | undefined;
+
+	public constructor({
+		app,
+		plugin,
+		database,
+		syncService,
+		statusDescription,
+		syncer,
+	}: {
+		app: App;
+		plugin: SyncPlugin;
+		database: Database;
+		syncService: SyncService;
+		statusDescription: StatusDescription;
+		syncer: Syncer;
+	}) {
 		super(app, plugin);
+		this.plugin = plugin;
+		this.database = database;
+		this.syncService = syncService;
+		this.statusDescription = statusDescription;
+		this.syncer = syncer;
+
 		this.editedVaultName = this.database.getSettings().vaultName;
 		this.database.addOnSettingsChangeHandlers(
 			(newSettings, oldSettings) => {
@@ -30,15 +55,65 @@ export class SyncSettingsTab extends PluginSettingTab {
 
 	public display(): void {
 		const { containerEl } = this;
-
 		containerEl.empty();
+		containerEl.addClass("vault-link-settings");
+
+		containerEl.createEl("h2", { text: "VaultLink" }).createSpan({
+			text: this.plugin.manifest.version,
+			cls: "version",
+		});
+
+		const descriptionContainer = containerEl.createDiv({
+			cls: "description",
+		});
+		this.statusDescriptionSubscription = (): void => {
+			this.statusDescription.renderStatusDescription(
+				descriptionContainer
+			);
+		};
+		this.statusDescription.addStatusChangeListener(
+			this.statusDescriptionSubscription
+		);
+
+		containerEl.createDiv(
+			{
+				cls: "button-container",
+			},
+			(buttonContainer) => {
+				buttonContainer.createEl(
+					"button",
+					{
+						text: "Show history",
+					},
+					(button) =>
+						(button.onclick = async (): Promise<void> => {
+							this.plugin.closeSettings();
+							await this.plugin.activateView(HistoryView.TYPE);
+						})
+				);
+
+				buttonContainer.createEl(
+					"button",
+					{
+						text: "Show logs",
+					},
+					(button) =>
+						(button.onclick = async (): Promise<void> => {
+							this.plugin.closeSettings();
+							await this.plugin.activateView(LogsView.TYPE);
+						})
+				);
+			}
+		);
+
+		containerEl.createEl("h3", { text: "Connection" });
 
 		new Setting(containerEl)
-			.setName("Remote URL")
-			.setDesc("Your server's URL")
-			.setTooltip(
-				"This is the URL of the server you want to sync with, todo, links to docs"
+			.setName("Server address")
+			.setDesc(
+				"Your VaultLink server's URL including the protocol and full path."
 			)
+			.setTooltip("This is the URL of the server you want to sync with.")
 			.addText((text) =>
 				text
 					.setPlaceholder("https://example.com:3030")
@@ -48,44 +123,30 @@ export class SyncSettingsTab extends PluginSettingTab {
 					)
 			)
 			.addButton((button) =>
-				button.setButtonText("Test Connection").onClick(async () => {
-					try {
-						const result = await this.syncServer.ping();
-						if (result.isAuthenticated) {
-							new Notice(
-								`Successfully authenticated with the server (version: ${result.serverVersion})!`
-							);
-						} else {
-							new Notice(
-								`Successfully connected to server (version: ${result.serverVersion}) but failed to authenticate.`
-							);
-						}
-					} catch (e) {
-						new Notice(`Failed to connect to server: ${e}`);
-					}
-				})
-			)
-			.addSlider((text) =>
-				text
-					.setLimits(1, 3600, 1)
-					.setValue(5)
-					.setDynamicTooltip()
-					.setInstant(false)
-					.setValue(this.database.getSettings().uploadConcurrency)
-					.onChange(async (value) =>
-						this.database.setSetting("uploadConcurrency", value)
-					)
-			)
-			.addButton((button) =>
-				button.setButtonText("Reset sync state").onClick(async () => {
-					await this.database.resetSyncState();
-					this.history.reset();
+				button.setButtonText("Test connection").onClick(async () => {
 					new Notice(
-						"Sync state has been reset, you will need to resync"
+						(await this.syncService.checkConnection()).message
 					);
+					await this.statusDescription.updateConnectionState();
 				})
 			);
 
+		new Setting(containerEl)
+			.setName("Access token")
+			.setClass("sync-settings-access-token")
+			.setDesc(
+				"Set the access token for the server that you can get from the server"
+			)
+			.setTooltip("todo, links to dcocs")
+			.addTextArea((text) =>
+				text
+					.setPlaceholder("ey...")
+					.setValue(this.database.getSettings().token)
+					.onChange(async (value) =>
+						this.database.setSetting("token", value)
+					)
+			);
+
 		new Setting(containerEl)
 			.setName("Vault name")
 			.setDesc(
@@ -110,8 +171,25 @@ export class SyncSettingsTab extends PluginSettingTab {
 						"vaultName",
 						this.editedVaultName
 					);
-					await this.database.resetSyncState();
-					this.history.reset();
+					await this.syncer.reset();
+					Logger.getInstance().reset();
+					new Notice(
+						"Sync state has been reset, you will need to resync"
+					);
+				})
+			);
+
+		containerEl.createEl("h3", { text: "Sync" });
+
+		new Setting(containerEl)
+			.setName("Danger zone")
+			.setDesc(
+				"How many concurrent sync operations to run. Setting this value higher may increase the overall performance, however, it will require more memory as well. If you notice frequent crashes, especially on mobile, set this to 1."
+			)
+			.addButton((button) =>
+				button.setButtonText("Reset sync state").onClick(async () => {
+					await this.syncer.reset();
+					Logger.getInstance().reset();
 					new Notice(
 						"Sync state has been reset, you will need to resync"
 					);
@@ -119,48 +197,68 @@ export class SyncSettingsTab extends PluginSettingTab {
 			);
 
 		new Setting(containerEl)
-			.setName("Access token")
-			.setClass("sync-settings-access-token")
+			.setName("Remote fetching frequency (seconds)")
 			.setDesc(
-				"Set the access token for the server that you can get from the server"
+				"Set how often should the plugin check for changes on the server. Lower values will increase the frequency of the checks making it easier to collaborate with others."
 			)
-			.setTooltip("todo, links to dcocs")
-			.addTextArea((text) =>
+			.setTooltip("todo, links to docs")
+			.addSlider((text) =>
 				text
-					.setPlaceholder("ey...")
-					.setValue(this.database.getSettings().token)
+					.setLimits(0.5, 60, 0.5)
+					.setDynamicTooltip()
+					.setInstant(false)
+					.setValue(
+						this.database.getSettings()
+							.fetchChangesUpdateIntervalMs / 1000
+					)
 					.onChange(async (value) =>
-						this.database.setSetting("token", value)
+						this.database.setSetting(
+							"fetchChangesUpdateIntervalMs",
+							value * 1000
+						)
 					)
 			);
 
 		new Setting(containerEl)
-			.setName("Full scan interval (seconds)")
+			.setName("Sync concurrency")
 			.setDesc(
-				"How often would you like to do a full scan of the local files"
+				"How many concurrent sync operations to run. Setting this value higher may increase the overall performance, however, it will require more memory as well. If you notice frequent crashes, especially on mobile, set this to 1."
+			)
+			.addSlider((text) =>
+				text
+					.setLimits(1, 16, 1)
+					.setDynamicTooltip()
+					.setInstant(false)
+					.setValue(this.database.getSettings().syncConcurrency)
+					.onChange(async (value) =>
+						this.database.setSetting("syncConcurrency", value)
+					)
+			);
+
+		new Setting(containerEl)
+			.setName("Enable sync")
+			.setDesc(
+				"Enable pulling and pushing changes to the remote server. The first time it's enabled, or after the sync state has been reset, all local files will be pushed to the server."
+			)
+			.setTooltip(
+				"Enable pulling and pushing changes to the remote server."
 			)
-			.setTooltip("todo, links to docs")
 			.addToggle((toggle) =>
 				toggle
 					.setValue(this.database.getSettings().isSyncEnabled)
 					.onChange(async (value) =>
 						this.database.setSetting("isSyncEnabled", value)
 					)
-			)
-			.addSlider((text) =>
-				text
-					.setLimits(1, 3600, 1)
-					.setDynamicTooltip()
-					.setInstant(false)
-					.setValue(
-						this.database.getSettings().fetchChangesUpdateIntervalMs
-					)
-					.onChange(async (value) =>
-						this.database.setSetting(
-							"fetchChangesUpdateIntervalMs",
-							value
-						)
-					)
 			);
 	}
+
+	public hide(): void {
+		super.hide();
+
+		if (this.statusDescriptionSubscription) {
+			this.statusDescription.removeStatusChangeListener(
+				this.statusDescriptionSubscription
+			);
+		}
+	}
 }
diff --git a/plugin/src/views/status-description.ts b/plugin/src/views/status-description.ts
new file mode 100644
index 00000000..1b2f5362
--- /dev/null
+++ b/plugin/src/views/status-description.ts
@@ -0,0 +1,139 @@
+import type { Database } from "src/database/database";
+import type {
+	CheckConnectionResult,
+	SyncService,
+} from "src/services/sync-service";
+import type { Syncer } from "src/sync-operations/syncer";
+import type { HistoryStats, SyncHistory } from "src/tracing/sync-history";
+
+export class StatusDescription {
+	private lastHistoryStats: HistoryStats | undefined;
+	private lastRemaining: number | undefined;
+	private lastConnectionState: CheckConnectionResult | undefined;
+
+	private statusChangeListeners: (() => void)[] = [];
+
+	public constructor(
+		private readonly database: Database,
+		private readonly syncService: SyncService,
+		history: SyncHistory,
+		syncer: Syncer
+	) {
+		void this.updateConnectionState();
+
+		history.addSyncHistoryUpdateListener((status) => {
+			this.lastHistoryStats = status;
+			this.updateDescription();
+		});
+
+		syncer.addRemainingOperationsListener((remainingOperations) => {
+			this.lastRemaining = remainingOperations;
+			this.updateDescription();
+		});
+
+		database.addOnSettingsChangeHandlers(() => {
+			void this.updateConnectionState();
+		});
+	}
+
+	public async updateConnectionState(): Promise<void> {
+		this.lastConnectionState = await this.syncService.checkConnection();
+		this.updateDescription();
+	}
+
+	public addStatusChangeListener(listener: () => void): void {
+		this.statusChangeListeners.push(listener);
+	}
+	public removeStatusChangeListener(listener: () => void): void {
+		this.statusChangeListeners = this.statusChangeListeners.filter(
+			(l) => l !== listener
+		);
+	}
+
+	public renderStatusDescription(container: HTMLElement): void {
+		container.empty();
+		container.addClass("status-description");
+
+		if (this.lastConnectionState == undefined) {
+			container.createSpan({
+				text: "VaultLink is starting up…",
+				cls: "warning",
+			});
+			return;
+		}
+
+		if (!this.lastConnectionState.isSuccessful) {
+			container.createSpan({
+				text: `VaultLink failed to connect to the remote server with the error "${this.lastConnectionState.message}"`,
+				cls: "error",
+			});
+			return;
+		}
+
+		container.createSpan({ text: "VaultLink is connected to the server " });
+		container.createEl("a", {
+			text: this.database.getSettings().remoteUri,
+			href: this.database.getSettings().remoteUri,
+		});
+
+		container.createSpan({
+			text: ` and has indexed approximately `,
+		});
+		container.createSpan({
+			text: `${this.database.getDocuments().size}`,
+			cls: "number",
+		});
+		container.createSpan({
+			text: ` documents. `,
+		});
+
+		if (
+			(this.lastRemaining ?? 0) === 0 &&
+			(this.lastHistoryStats?.success ?? 0) === 0 &&
+			(this.lastHistoryStats?.error ?? 0) === 0
+		) {
+			if (this.database.getSettings().isSyncEnabled) {
+				container.createSpan({
+					text: "Syncing is enabled but VaultLink hasn't found anything to sync yet.",
+				});
+			} else {
+				container.createSpan({
+					text: "However, syncing is disabled right now.",
+					cls: "warning",
+				});
+			}
+			return;
+		}
+
+		container.createSpan({
+			text: "The plugin has ",
+		});
+		container.createSpan({
+			text: `${this.lastRemaining ?? 0}`,
+			cls: "number",
+		});
+		container.createSpan({
+			text: " outstanding operations while having succeeded ",
+		});
+		container.createSpan({
+			text: `${this.lastHistoryStats?.success ?? 0}`,
+			cls: ["number", "good"],
+		});
+		container.createSpan({
+			text: " times and failed ",
+		});
+		container.createSpan({
+			text: `${this.lastHistoryStats?.error ?? 0}`,
+			cls: ["number", "bad"],
+		});
+		container.createSpan({
+			text: " times.",
+		});
+	}
+
+	private updateDescription(): void {
+		this.statusChangeListeners.forEach((listener) => {
+			listener();
+		});
+	}
+}

From c8b4d6c0ee00dc49108f947e25d49a7d5672e30b Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 2 Jan 2025 22:06:23 +0000
Subject: [PATCH 060/761] Lint

---
 plugin/src/utils/retried-fetch.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin/src/utils/retried-fetch.ts b/plugin/src/utils/retried-fetch.ts
index af4296a8..484b8bea 100644
--- a/plugin/src/utils/retried-fetch.ts
+++ b/plugin/src/utils/retried-fetch.ts
@@ -1,5 +1,5 @@
 import * as fetchRetryFactory from "fetch-retry";
-import { RequestInitRetryParams } from "fetch-retry";
+import type { RequestInitRetryParams } from "fetch-retry";
 import { Logger } from "src/tracing/logger";
 
 const fetchWithRetry = fetchRetryFactory.default(fetch);

From 4503aa1915e3428feab2837c57a7d0a5d49c8e61 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 2 Jan 2025 22:07:23 +0000
Subject: [PATCH 061/761] Fix path

---
 bump-version.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bump-version.sh b/bump-version.sh
index 36e54608..dc8ab9ed 100755
--- a/bump-version.sh
+++ b/bump-version.sh
@@ -29,7 +29,7 @@ npm version patch
 cd ..
 cp plugin/manifest.json manifest.json  # for BRAT, otherwise it wouldn't update
 git add .
-TAG=$(node -p "require('./package.json').version")
+TAG=$(node -p "require('./plugin/package.json').version")
 git commit -m "Bump versions to $TAG"
 echo "Tagging $TAG"
 git tag -a $TAG -m "Release $TAG"

From 5fc67c7b920e68e5ca39c5bf78b7c0d877fad3d8 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 2 Jan 2025 22:07:28 +0000
Subject: [PATCH 062/761] Bump versions to 0.0.8

---
 backend/Cargo.lock             | 8 ++++----
 backend/fuzz/Cargo.toml        | 2 +-
 backend/reconcile/Cargo.toml   | 2 +-
 backend/sync_lib/Cargo.toml    | 2 +-
 backend/sync_server/Cargo.toml | 2 +-
 manifest.json                  | 2 +-
 plugin/manifest.json           | 2 +-
 plugin/package-lock.json       | 4 ++--
 plugin/package.json            | 4 ++--
 9 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index bd0a93a1..3f37e43b 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1493,7 +1493,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "insta",
  "pretty_assertions",
@@ -1503,7 +1503,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile-fuzz"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "libfuzzer-sys",
  "reconcile",
@@ -2109,7 +2109,7 @@ dependencies = [
 
 [[package]]
 name = "sync_lib"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "base64 0.22.1",
  "console_error_panic_hook",
@@ -2123,7 +2123,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.0.7"
+version = "0.0.8"
 dependencies = [
  "aide",
  "anyhow",
diff --git a/backend/fuzz/Cargo.toml b/backend/fuzz/Cargo.toml
index af98a375..61d48a5c 100644
--- a/backend/fuzz/Cargo.toml
+++ b/backend/fuzz/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "reconcile-fuzz"
-version = "0.0.7"
+version = "0.0.8"
 publish = false
 edition = "2021"
 
diff --git a/backend/reconcile/Cargo.toml b/backend/reconcile/Cargo.toml
index 68ea52fc..b1119412 100644
--- a/backend/reconcile/Cargo.toml
+++ b/backend/reconcile/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "reconcile"
-version = "0.0.7"
+version = "0.0.8"
 edition = "2021"
 
 [dependencies]
diff --git a/backend/sync_lib/Cargo.toml b/backend/sync_lib/Cargo.toml
index a39a0236..9942d676 100644
--- a/backend/sync_lib/Cargo.toml
+++ b/backend/sync_lib/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sync_lib"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2018"
 
diff --git a/backend/sync_server/Cargo.toml b/backend/sync_server/Cargo.toml
index 9711323f..b5ca30fa 100644
--- a/backend/sync_server/Cargo.toml
+++ b/backend/sync_server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sync_server"
-version = "0.0.7"
+version = "0.0.8"
 edition = "2021"
 
 [dependencies]
diff --git a/manifest.json b/manifest.json
index ca52bc64..bc304a23 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.0.7",
+	"version": "0.0.8",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/plugin/manifest.json b/plugin/manifest.json
index ca52bc64..bc304a23 100644
--- a/plugin/manifest.json
+++ b/plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.0.7",
+	"version": "0.0.8",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/plugin/package-lock.json b/plugin/package-lock.json
index e13c4099..64d0bdfa 100644
--- a/plugin/package-lock.json
+++ b/plugin/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "obsidian-sample-plugin",
-	"version": "0.0.7",
+	"version": "0.0.8",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "obsidian-sample-plugin",
-			"version": "0.0.7",
+			"version": "0.0.8",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/node": "^16.11.6",
diff --git a/plugin/package.json b/plugin/package.json
index 8096c6d3..cfcc6572 100644
--- a/plugin/package.json
+++ b/plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "obsidian-sample-plugin",
-	"version": "0.0.7",
+	"version": "0.0.8",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {
@@ -31,4 +31,4 @@
 		"typescript-eslint": "8.18.0",
 		"fetch-retry": "^6.0.0"
 	}
-}
\ No newline at end of file
+}

From 19cb616eb95add5eb14b2cae68cd53e4e94490a9 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 2 Jan 2025 22:45:17 +0000
Subject: [PATCH 063/761] Fix mobile sync issue

---
 plugin/src/file-operations/obsidian-file-operations.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin/src/file-operations/obsidian-file-operations.ts b/plugin/src/file-operations/obsidian-file-operations.ts
index 7c30ecda..ef2d45e8 100644
--- a/plugin/src/file-operations/obsidian-file-operations.ts
+++ b/plugin/src/file-operations/obsidian-file-operations.ts
@@ -49,7 +49,7 @@ export class ObsidianFileOperations implements FileOperations {
 			return new Uint8Array(0);
 		}
 
-		if (lib.isBinary(expectedContent)) {
+		if (lib.isBinary(expectedContent) || !path.endsWith(".md")) {
 			await this.vault.adapter.writeBinary(
 				normalizePath(path),
 				newContent

From cd5917c5f33a9df0ff8927614dbb5809b7270055 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 2 Jan 2025 22:45:22 +0000
Subject: [PATCH 064/761] Push all

---
 bump-version.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bump-version.sh b/bump-version.sh
index dc8ab9ed..cc91e720 100755
--- a/bump-version.sh
+++ b/bump-version.sh
@@ -31,6 +31,7 @@ cp plugin/manifest.json manifest.json  # for BRAT, otherwise it wouldn't update
 git add .
 TAG=$(node -p "require('./plugin/package.json').version")
 git commit -m "Bump versions to $TAG"
+git push
 echo "Tagging $TAG"
 git tag -a $TAG -m "Release $TAG"
 git push origin $TAG

From 9e4302354a2f55cbb00c3d02a16b57e7042c802c Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 2 Jan 2025 22:45:31 +0000
Subject: [PATCH 065/761] Bump versions to 0.0.9

---
 backend/Cargo.lock             | 8 ++++----
 backend/fuzz/Cargo.toml        | 2 +-
 backend/reconcile/Cargo.toml   | 2 +-
 backend/sync_lib/Cargo.toml    | 2 +-
 backend/sync_server/Cargo.toml | 2 +-
 manifest.json                  | 2 +-
 plugin/manifest.json           | 2 +-
 plugin/package-lock.json       | 4 ++--
 plugin/package.json            | 2 +-
 9 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 3f37e43b..d9cea4ed 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1493,7 +1493,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile"
-version = "0.0.8"
+version = "0.0.9"
 dependencies = [
  "insta",
  "pretty_assertions",
@@ -1503,7 +1503,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile-fuzz"
-version = "0.0.8"
+version = "0.0.9"
 dependencies = [
  "libfuzzer-sys",
  "reconcile",
@@ -2109,7 +2109,7 @@ dependencies = [
 
 [[package]]
 name = "sync_lib"
-version = "0.0.8"
+version = "0.0.9"
 dependencies = [
  "base64 0.22.1",
  "console_error_panic_hook",
@@ -2123,7 +2123,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.0.8"
+version = "0.0.9"
 dependencies = [
  "aide",
  "anyhow",
diff --git a/backend/fuzz/Cargo.toml b/backend/fuzz/Cargo.toml
index 61d48a5c..c57b2333 100644
--- a/backend/fuzz/Cargo.toml
+++ b/backend/fuzz/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "reconcile-fuzz"
-version = "0.0.8"
+version = "0.0.9"
 publish = false
 edition = "2021"
 
diff --git a/backend/reconcile/Cargo.toml b/backend/reconcile/Cargo.toml
index b1119412..8fd2a68e 100644
--- a/backend/reconcile/Cargo.toml
+++ b/backend/reconcile/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "reconcile"
-version = "0.0.8"
+version = "0.0.9"
 edition = "2021"
 
 [dependencies]
diff --git a/backend/sync_lib/Cargo.toml b/backend/sync_lib/Cargo.toml
index 9942d676..8fd2dfc3 100644
--- a/backend/sync_lib/Cargo.toml
+++ b/backend/sync_lib/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sync_lib"
-version = "0.0.8"
+version = "0.0.9"
 authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2018"
 
diff --git a/backend/sync_server/Cargo.toml b/backend/sync_server/Cargo.toml
index b5ca30fa..d86bc4c6 100644
--- a/backend/sync_server/Cargo.toml
+++ b/backend/sync_server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sync_server"
-version = "0.0.8"
+version = "0.0.9"
 edition = "2021"
 
 [dependencies]
diff --git a/manifest.json b/manifest.json
index bc304a23..2542d12d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.0.8",
+	"version": "0.0.9",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/plugin/manifest.json b/plugin/manifest.json
index bc304a23..2542d12d 100644
--- a/plugin/manifest.json
+++ b/plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.0.8",
+	"version": "0.0.9",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/plugin/package-lock.json b/plugin/package-lock.json
index 64d0bdfa..ca8ce13e 100644
--- a/plugin/package-lock.json
+++ b/plugin/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "obsidian-sample-plugin",
-	"version": "0.0.8",
+	"version": "0.0.9",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "obsidian-sample-plugin",
-			"version": "0.0.8",
+			"version": "0.0.9",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/node": "^16.11.6",
diff --git a/plugin/package.json b/plugin/package.json
index cfcc6572..5e1e5331 100644
--- a/plugin/package.json
+++ b/plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "obsidian-sample-plugin",
-	"version": "0.0.8",
+	"version": "0.0.9",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {

From fb8badae4463287d4793934e35853bc3874c0591 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 2 Jan 2025 22:58:11 +0000
Subject: [PATCH 066/761] Try self-hosted github runner

---
 .github/workflows/check.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 0a456f97..723d84d1 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -12,7 +12,7 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
 
     steps:
       - uses: actions/checkout@v4

From 62c41e6ecd31b3a796c40fb0ff6f0750984b274f Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 3 Jan 2025 10:45:56 +0000
Subject: [PATCH 067/761] Refactor and remove extra sync step

---
 plugin/src/sync-operations/syncer.ts | 197 ++++++++++++++-------------
 1 file changed, 105 insertions(+), 92 deletions(-)

diff --git a/plugin/src/sync-operations/syncer.ts b/plugin/src/sync-operations/syncer.ts
index 4d3e52f6..752c9db8 100644
--- a/plugin/src/sync-operations/syncer.ts
+++ b/plugin/src/sync-operations/syncer.ts
@@ -1,5 +1,8 @@
 import type { Database } from "src/database/database";
-import type { RelativePath } from "src/database/document-metadata";
+import type {
+	DocumentMetadata,
+	RelativePath,
+} from "src/database/document-metadata";
 import type { FileOperations } from "src/file-operations/file-operations";
 import * as lib from "../../../backend/sync_lib/pkg/sync_lib.js";
 import type { SyncService } from "src/services/sync-service";
@@ -19,8 +22,10 @@ export class Syncer {
 
 	private isRunningOfflineSync = false;
 
+	// The offline sync methods call file sync methods, however, we can't preempt promises so we 2 queues to avoid a deadlock
 	private readonly offlineSyncQueue: PQueue;
 	private readonly fileSyncQueue: PQueue;
+
 	private readonly remainingOperationsListeners: ((
 		remainingOperations: number
 	) => void)[] = [];
@@ -53,16 +58,12 @@ export class Syncer {
 			this.offlineSyncQueue.concurrency = settings.syncConcurrency;
 		});
 
-		this.fileSyncQueue.on("active", () => {
+		const updateRemainingOperations = () =>
 			this.emitRemainingOperationsChange(
 				this.fileSyncQueue.size + this.offlineSyncQueue.size
 			);
-		});
-		this.offlineSyncQueue.on("active", () => {
-			this.emitRemainingOperationsChange(
-				this.fileSyncQueue.size + this.offlineSyncQueue.size
-			);
-		});
+		this.fileSyncQueue.on("active", updateRemainingOperations);
+		this.offlineSyncQueue.on("active", updateRemainingOperations);
 	}
 
 	public addRemainingOperationsListener(
@@ -77,15 +78,25 @@ export class Syncer {
 	): Promise<void> {
 		await this.safelySync(async () => {
 			try {
+				const contentBytes = await this.operations.read(relativePath);
+				const contentHash = hash(contentBytes);
+
 				const metadata = this.database.getDocument(relativePath);
 				if (metadata) {
 					Logger.getInstance().debug(
 						`Document metadata already exists for ${relativePath}, it must have been downloaded from the server`
 					);
-				}
 
-				const contentBytes = await this.operations.read(relativePath);
-				const contentHash = hash(contentBytes);
+					if (metadata.hash === contentHash) {
+						this.history.addHistoryEntry({
+							status: SyncStatus.NO_OP,
+							relativePath,
+							message: `File hash matches with last synced version, no need to sync`,
+							type: SyncType.UPDATE,
+						});
+						return;
+					}
+				}
 
 				const response = await this.syncService.create({
 					relativePath,
@@ -126,14 +137,7 @@ export class Syncer {
 					hash: responseHash,
 				});
 
-				if (
-					this.database.getLastSeenUpdateId() ===
-					response.vaultUpdateId - 1
-				) {
-					await this.database.setLastSeenUpdateId(
-						response.vaultUpdateId
-					);
-				}
+				await this.tryIncrementVaultUpdateId(response.vaultUpdateId);
 			} catch (e) {
 				this.history.addHistoryEntry({
 					status: SyncStatus.ERROR,
@@ -146,50 +150,6 @@ export class Syncer {
 		}, relativePath);
 	}
 
-	public async syncLocallyDeletedFile(
-		relativePath: RelativePath
-	): Promise<void> {
-		await this.safelySync(async () => {
-			try {
-				const metadata = this.database.getDocument(relativePath);
-				if (!metadata) {
-					this.history.addHistoryEntry({
-						status: SyncStatus.NO_OP,
-						relativePath,
-						message: `Locally deleted file hasn't been uploaded yet, so there's no need to delete it on the remote server`,
-						type: SyncType.DELETE,
-					});
-					return;
-				}
-
-				await this.syncService.delete({
-					documentId: metadata.documentId,
-					relativePath,
-					// We got the event now, so it must have been deleted just now
-					createdDate: new Date(),
-				});
-
-				this.history.addHistoryEntry({
-					status: SyncStatus.SUCCESS,
-					source: SyncSource.PUSH,
-					relativePath,
-					message: `Successfully deleted locally deleted file on the remote server`,
-					type: SyncType.DELETE,
-				});
-
-				await this.database.removeDocument(relativePath);
-			} catch (e) {
-				this.history.addHistoryEntry({
-					status: SyncStatus.ERROR,
-					relativePath,
-					message: `Failed to remotely delete locally deleted file: ${e}`,
-					type: SyncType.DELETE,
-				});
-				throw e;
-			}
-		}, relativePath);
-	}
-
 	public async syncLocallyUpdatedFile({
 		oldPath,
 		relativePath,
@@ -206,7 +166,7 @@ export class Syncer {
 				);
 				if (!metadata) {
 					throw new Error(
-						`Document metadata not found for ${relativePath}. Consider resetting the plugin's sync history.`
+						`Document metadata not found for ${relativePath}. This implies a corrupt local database. Consider resetting the plugin's sync history.`
 					);
 				}
 
@@ -242,15 +202,9 @@ export class Syncer {
 				if (response.isDeleted) {
 					await this.operations.remove(oldPath ?? relativePath);
 					await this.database.removeDocument(oldPath ?? relativePath);
-
-					if (
-						this.database.getLastSeenUpdateId() ===
-						response.vaultUpdateId - 1
-					) {
-						await this.database.setLastSeenUpdateId(
-							response.vaultUpdateId
-						);
-					}
+					await this.tryIncrementVaultUpdateId(
+						response.vaultUpdateId
+					);
 
 					this.history.addHistoryEntry({
 						status: SyncStatus.SUCCESS,
@@ -307,14 +261,7 @@ export class Syncer {
 					hash: responseHash,
 				});
 
-				if (
-					this.database.getLastSeenUpdateId() ===
-					response.vaultUpdateId - 1
-				) {
-					await this.database.setLastSeenUpdateId(
-						response.vaultUpdateId
-					);
-				}
+				await this.tryIncrementVaultUpdateId(response.vaultUpdateId);
 			} catch (e) {
 				this.history.addHistoryEntry({
 					status: SyncStatus.ERROR,
@@ -327,6 +274,49 @@ export class Syncer {
 		}, relativePath);
 	}
 
+	public async syncLocallyDeletedFile(
+		relativePath: RelativePath
+	): Promise<void> {
+		await this.safelySync(async () => {
+			try {
+				const metadata = this.database.getDocument(relativePath);
+				if (!metadata) {
+					this.history.addHistoryEntry({
+						status: SyncStatus.NO_OP,
+						relativePath,
+						message: `Locally deleted file hasn't been uploaded yet, so there's no need to delete it on the remote server`,
+						type: SyncType.DELETE,
+					});
+					return;
+				}
+
+				await this.syncService.delete({
+					documentId: metadata.documentId,
+					relativePath,
+					createdDate: new Date(), // We got the event now, so it must have been deleted just now
+				});
+
+				this.history.addHistoryEntry({
+					status: SyncStatus.SUCCESS,
+					source: SyncSource.PUSH,
+					relativePath,
+					message: `Successfully deleted locally deleted file on the remote server`,
+					type: SyncType.DELETE,
+				});
+
+				await this.database.removeDocument(relativePath);
+			} catch (e) {
+				this.history.addHistoryEntry({
+					status: SyncStatus.ERROR,
+					relativePath,
+					message: `Failed to remotely delete locally deleted file: ${e}`,
+					type: SyncType.DELETE,
+				});
+				throw e;
+			}
+		}, relativePath);
+	}
+
 	public async scheduleSyncForOfflineChanges(): Promise<void> {
 		if (this.isRunningOfflineSync) {
 			Logger.getInstance().warn(
@@ -355,22 +345,24 @@ export class Syncer {
 					this.offlineSyncQueue.add(async () => {
 						const metadata =
 							this.database.getDocument(relativePath);
-						if (!metadata) {
-							const contentHash = hash(
-								await this.operations.read(relativePath)
-							);
-							const match = locallyDeletedFiles.find(
-								([_, document]) => document.hash === contentHash
-							);
 
-							if (contentHash != EMPTY_HASH && match) {
-								locallyDeletedFiles.remove(match);
+						// If there's no metadata, it must be a new file
+						if (!metadata) {
+							// Perhaps the file has been moved. Let's check by looking at the deleted files
+							const originalFile =
+								await findMatchingFileBasedOnHash(
+									relativePath,
+									locallyDeletedFiles
+								);
+							if (originalFile !== undefined) {
+								// `originalFile` hasn't been deleted but it got moved instead
+								locallyDeletedFiles.remove(originalFile);
 
 								Logger.getInstance().debug(
-									`Document ${relativePath} not found in database but found under a different path ${match[0]}, scheduling sync to move it`
+									`Document ${relativePath} was not found under its current path in the database but was found under a different path ${originalFile[0]}, scheduling sync to move it`
 								);
 								return this.syncLocallyUpdatedFile({
-									oldPath: match[0],
+									oldPath: originalFile[0],
 									relativePath: relativePath,
 									updateTime:
 										await this.operations.getModificationTime(
@@ -614,4 +606,25 @@ export class Syncer {
 			listener(remainingOperations);
 		});
 	}
+
+	private async tryIncrementVaultUpdateId(
+		responseVaultUpdateId: number
+	): Promise<void> {
+		if (this.database.getLastSeenUpdateId() === responseVaultUpdateId - 1) {
+			await this.database.setLastSeenUpdateId(responseVaultUpdateId);
+		}
+	}
+}
+
+async function findMatchingFileBasedOnHash(
+	filePath: RelativePath,
+	candidates: [RelativePath, DocumentMetadata][]
+): Promise<[RelativePath, DocumentMetadata] | undefined> {
+	const contentHash = hash(await this.operations.read(filePath));
+
+	if (contentHash != EMPTY_HASH) {
+		return undefined;
+	}
+
+	return candidates.find(([_, document]) => document.hash === contentHash);
 }

From 594884d0541c0b6227db4e03fe25807768aeb256 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 3 Jan 2025 11:16:42 +0000
Subject: [PATCH 068/761] Add rustup

---
 .github/workflows/check.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 723d84d1..26720e42 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -19,6 +19,7 @@ jobs:
 
       - name: Setup
         run: |
+          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y 
           rustup install nightly
           rustup default nightly
           rustup component add clippy rustfmt

From 5178cb63814e6b896d93b8b383f5bc8ccafe8e70 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 3 Jan 2025 11:16:58 +0000
Subject: [PATCH 069/761] Smaller font

---
 plugin/src/styles.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugin/src/styles.scss b/plugin/src/styles.scss
index 6392847a..de36c529 100644
--- a/plugin/src/styles.scss
+++ b/plugin/src/styles.scss
@@ -7,6 +7,7 @@
 		background-color: var(--color-base-30);
 		font-family: var(--font-monospace-default);
 		font-weight: var(--bold-weight);
+		font-size: var(--font-ui-small);
 
 		&.good {
 			background-color: rgba(var(--color-green-rgb), 0.35);

From d9c2c5b2a1372c709f6341884d9b21ff690a32d6 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 3 Jan 2025 11:35:00 +0000
Subject: [PATCH 070/761] Add a few tests

---
 .github/workflows/check.yml                   |    6 +
 .gitignore                                    |    2 +
 plugin/jest.config.js                         |    8 +
 plugin/package-lock.json                      | 3333 +++++++++++++++++
 plugin/package.json                           |   10 +-
 .../src/sync-operations/document-lock.test.ts |   79 +
 plugin/src/utils/is-equal-bytes.test.ts       |   27 +
 7 files changed, 3462 insertions(+), 3 deletions(-)
 create mode 100644 plugin/jest.config.js
 create mode 100644 plugin/src/sync-operations/document-lock.test.ts
 create mode 100644 plugin/src/utils/is-equal-bytes.test.ts

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 26720e42..da67c9fe 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -50,3 +50,9 @@ jobs:
           cd plugin
           npm install
           npm run lint
+
+      - name: Test frontend
+        run: |
+          cd plugin
+          npm install
+          npm run test
diff --git a/.gitignore b/.gitignore
index 13396028..1d3e5ab3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,5 @@ backend/db.sqlite3*
 backend/config.yaml
 
 *.log
+
+plugin/coverage
diff --git a/plugin/jest.config.js b/plugin/jest.config.js
new file mode 100644
index 00000000..64bd511f
--- /dev/null
+++ b/plugin/jest.config.js
@@ -0,0 +1,8 @@
+module.exports = {
+	testEnvironment: "node",
+	moduleFileExtensions: ["ts"],
+	testMatch: ["**/src/**/*.test.ts"],
+	transform: {
+		"^.+\\.(ts|tsx)$": "ts-jest",
+	},
+};
diff --git a/plugin/package-lock.json b/plugin/package-lock.json
index ca8ce13e..4cbe8da8 100644
--- a/plugin/package-lock.json
+++ b/plugin/package-lock.json
@@ -9,6 +9,7 @@
 			"version": "0.0.9",
 			"license": "MIT",
 			"devDependencies": {
+				"@types/jest": "^29.5.14",
 				"@types/node": "^16.11.6",
 				"builtin-modules": "3.3.0",
 				"date-fns": "^4.1.0",
@@ -19,15 +20,31 @@
 				"eslint": "9.17.0",
 				"eslint-plugin-unused-imports": "^4.1.4",
 				"fetch-retry": "^6.0.0",
+				"jest": "^29.7.0",
 				"obsidian": "1.7.2",
 				"openapi-fetch": "0.13.3",
 				"openapi-typescript": "7.4.4",
 				"p-queue": "^8.0.1",
+				"ts-jest": "^29.2.5",
 				"tslib": "2.4.0",
 				"typescript": "5.7.2",
 				"typescript-eslint": "8.18.0"
 			}
 		},
+		"node_modules/@ampproject/remapping": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
+			"integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
+			"dev": true,
+			"license": "Apache-2.0",
+			"dependencies": {
+				"@jridgewell/gen-mapping": "^0.3.5",
+				"@jridgewell/trace-mapping": "^0.3.24"
+			},
+			"engines": {
+				"node": ">=6.0.0"
+			}
+		},
 		"node_modules/@babel/code-frame": {
 			"version": "7.26.2",
 			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz",
@@ -43,6 +60,153 @@
 				"node": ">=6.9.0"
 			}
 		},
+		"node_modules/@babel/compat-data": {
+			"version": "7.26.3",
+			"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.3.tgz",
+			"integrity": "sha512-nHIxvKPniQXpmQLb0vhY3VaFb3S0YrTAwpOWJZh1wn3oJPjJk9Asva204PsBdmAE8vpzfHudT8DB0scYvy9q0g==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/core": {
+			"version": "7.26.0",
+			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.0.tgz",
+			"integrity": "sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@ampproject/remapping": "^2.2.0",
+				"@babel/code-frame": "^7.26.0",
+				"@babel/generator": "^7.26.0",
+				"@babel/helper-compilation-targets": "^7.25.9",
+				"@babel/helper-module-transforms": "^7.26.0",
+				"@babel/helpers": "^7.26.0",
+				"@babel/parser": "^7.26.0",
+				"@babel/template": "^7.25.9",
+				"@babel/traverse": "^7.25.9",
+				"@babel/types": "^7.26.0",
+				"convert-source-map": "^2.0.0",
+				"debug": "^4.1.0",
+				"gensync": "^1.0.0-beta.2",
+				"json5": "^2.2.3",
+				"semver": "^6.3.1"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/babel"
+			}
+		},
+		"node_modules/@babel/core/node_modules/semver": {
+			"version": "6.3.1",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+			"dev": true,
+			"license": "ISC",
+			"bin": {
+				"semver": "bin/semver.js"
+			}
+		},
+		"node_modules/@babel/generator": {
+			"version": "7.26.3",
+			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.3.tgz",
+			"integrity": "sha512-6FF/urZvD0sTeO7k6/B15pMLC4CHUv1426lzr3N01aHJTl046uCAh9LXW/fzeXXjPNCJ6iABW5XaWOsIZB93aQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/parser": "^7.26.3",
+				"@babel/types": "^7.26.3",
+				"@jridgewell/gen-mapping": "^0.3.5",
+				"@jridgewell/trace-mapping": "^0.3.25",
+				"jsesc": "^3.0.2"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-compilation-targets": {
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.9.tgz",
+			"integrity": "sha512-j9Db8Suy6yV/VHa4qzrj9yZfZxhLWQdVnRlXxmKLYlhWUVB1sB2G5sxuWYXk/whHD9iW76PmNzxZ4UCnTQTVEQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/compat-data": "^7.25.9",
+				"@babel/helper-validator-option": "^7.25.9",
+				"browserslist": "^4.24.0",
+				"lru-cache": "^5.1.1",
+				"semver": "^6.3.1"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-compilation-targets/node_modules/semver": {
+			"version": "6.3.1",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+			"dev": true,
+			"license": "ISC",
+			"bin": {
+				"semver": "bin/semver.js"
+			}
+		},
+		"node_modules/@babel/helper-module-imports": {
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz",
+			"integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/traverse": "^7.25.9",
+				"@babel/types": "^7.25.9"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-module-transforms": {
+			"version": "7.26.0",
+			"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz",
+			"integrity": "sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-module-imports": "^7.25.9",
+				"@babel/helper-validator-identifier": "^7.25.9",
+				"@babel/traverse": "^7.25.9"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
+			}
+		},
+		"node_modules/@babel/helper-plugin-utils": {
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.25.9.tgz",
+			"integrity": "sha512-kSMlyUVdWe25rEsRGviIgOWnoT/nfABVWlqt9N19/dIPWViAOW2s9wznP5tURbs/IDuNk4gPy3YdYRgH3uxhBw==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-string-parser": {
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
+			"integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
 		"node_modules/@babel/helper-validator-identifier": {
 			"version": "7.25.9",
 			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
@@ -53,6 +217,350 @@
 				"node": ">=6.9.0"
 			}
 		},
+		"node_modules/@babel/helper-validator-option": {
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz",
+			"integrity": "sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helpers": {
+			"version": "7.26.0",
+			"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.0.tgz",
+			"integrity": "sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/template": "^7.25.9",
+				"@babel/types": "^7.26.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/parser": {
+			"version": "7.26.3",
+			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.3.tgz",
+			"integrity": "sha512-WJ/CvmY8Mea8iDXo6a7RK2wbmJITT5fN3BEkRuFlxVyNx8jOKIIhmC4fSkTcPcf8JyavbBwIe6OpiCOBXt/IcA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/types": "^7.26.3"
+			},
+			"bin": {
+				"parser": "bin/babel-parser.js"
+			},
+			"engines": {
+				"node": ">=6.0.0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-async-generators": {
+			"version": "7.8.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
+			"integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-bigint": {
+			"version": "7.8.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
+			"integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-class-properties": {
+			"version": "7.12.13",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
+			"integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.12.13"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-class-static-block": {
+			"version": "7.14.5",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
+			"integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.14.5"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-import-attributes": {
+			"version": "7.26.0",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.26.0.tgz",
+			"integrity": "sha512-e2dttdsJ1ZTpi3B9UYGLw41hifAubg19AtCu/2I/F1QNVclOBr1dYpTdmdyZ84Xiz43BS/tCUkMAZNLv12Pi+A==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.25.9"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-import-meta": {
+			"version": "7.10.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
+			"integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.10.4"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-json-strings": {
+			"version": "7.8.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
+			"integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-jsx": {
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.25.9.tgz",
+			"integrity": "sha512-ld6oezHQMZsZfp6pWtbjaNDF2tiiCYYDqQszHt5VV437lewP9aSi2Of99CK0D0XB21k7FLgnLcmQKyKzynfeAA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.25.9"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-logical-assignment-operators": {
+			"version": "7.10.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
+			"integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.10.4"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
+			"version": "7.8.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
+			"integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-numeric-separator": {
+			"version": "7.10.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
+			"integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.10.4"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-object-rest-spread": {
+			"version": "7.8.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
+			"integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-optional-catch-binding": {
+			"version": "7.8.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
+			"integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-optional-chaining": {
+			"version": "7.8.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
+			"integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-private-property-in-object": {
+			"version": "7.14.5",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
+			"integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.14.5"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-top-level-await": {
+			"version": "7.14.5",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
+			"integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.14.5"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-typescript": {
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.25.9.tgz",
+			"integrity": "sha512-hjMgRy5hb8uJJjUcdWunWVcoi9bGpJp8p5Ol1229PoN6aytsLwNMgmdftO23wnCLMfVmTwZDWMPNq/D1SY60JQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.25.9"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/template": {
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz",
+			"integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/code-frame": "^7.25.9",
+				"@babel/parser": "^7.25.9",
+				"@babel/types": "^7.25.9"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/traverse": {
+			"version": "7.26.4",
+			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.4.tgz",
+			"integrity": "sha512-fH+b7Y4p3yqvApJALCPJcwb0/XaOSgtK4pzV6WVjPR5GLFQBRI7pfoX2V2iM48NXvX07NUxxm1Vw98YjqTcU5w==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/code-frame": "^7.26.2",
+				"@babel/generator": "^7.26.3",
+				"@babel/parser": "^7.26.3",
+				"@babel/template": "^7.25.9",
+				"@babel/types": "^7.26.3",
+				"debug": "^4.3.1",
+				"globals": "^11.1.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/traverse/node_modules/globals": {
+			"version": "11.12.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/@babel/types": {
+			"version": "7.26.3",
+			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.3.tgz",
+			"integrity": "sha512-vN5p+1kl59GVKMvTHt55NzzmYVxprfJD+ql7U9NFIfKCBkYE55LYtS+WtPlaYOyzydrKI8Nezd+aZextrd+FMA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-string-parser": "^7.25.9",
+				"@babel/helper-validator-identifier": "^7.25.9"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@bcoe/v8-coverage": {
+			"version": "0.2.3",
+			"resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
+			"integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
+			"dev": true,
+			"license": "MIT"
+		},
 		"node_modules/@bufbuild/protobuf": {
 			"version": "2.2.3",
 			"resolved": "https://registry.npmjs.org/@bufbuild/protobuf/-/protobuf-2.2.3.tgz",
@@ -673,6 +1181,468 @@
 				"url": "https://github.com/sponsors/nzakas"
 			}
 		},
+		"node_modules/@istanbuljs/load-nyc-config": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
+			"integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"camelcase": "^5.3.1",
+				"find-up": "^4.1.0",
+				"get-package-type": "^0.1.0",
+				"js-yaml": "^3.13.1",
+				"resolve-from": "^5.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@istanbuljs/load-nyc-config/node_modules/argparse": {
+			"version": "1.0.10",
+			"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+			"integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"sprintf-js": "~1.0.2"
+			}
+		},
+		"node_modules/@istanbuljs/load-nyc-config/node_modules/find-up": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+			"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"locate-path": "^5.0.0",
+				"path-exists": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@istanbuljs/load-nyc-config/node_modules/js-yaml": {
+			"version": "3.14.1",
+			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+			"integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"argparse": "^1.0.7",
+				"esprima": "^4.0.0"
+			},
+			"bin": {
+				"js-yaml": "bin/js-yaml.js"
+			}
+		},
+		"node_modules/@istanbuljs/load-nyc-config/node_modules/locate-path": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+			"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"p-locate": "^4.1.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@istanbuljs/load-nyc-config/node_modules/p-limit": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+			"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"p-try": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/@istanbuljs/load-nyc-config/node_modules/p-locate": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+			"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"p-limit": "^2.2.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@istanbuljs/load-nyc-config/node_modules/resolve-from": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+			"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@istanbuljs/schema": {
+			"version": "0.1.3",
+			"resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
+			"integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@jest/console": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz",
+			"integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/types": "^29.6.3",
+				"@types/node": "*",
+				"chalk": "^4.0.0",
+				"jest-message-util": "^29.7.0",
+				"jest-util": "^29.7.0",
+				"slash": "^3.0.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/@jest/core": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/@jest/core/-/core-29.7.0.tgz",
+			"integrity": "sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/console": "^29.7.0",
+				"@jest/reporters": "^29.7.0",
+				"@jest/test-result": "^29.7.0",
+				"@jest/transform": "^29.7.0",
+				"@jest/types": "^29.6.3",
+				"@types/node": "*",
+				"ansi-escapes": "^4.2.1",
+				"chalk": "^4.0.0",
+				"ci-info": "^3.2.0",
+				"exit": "^0.1.2",
+				"graceful-fs": "^4.2.9",
+				"jest-changed-files": "^29.7.0",
+				"jest-config": "^29.7.0",
+				"jest-haste-map": "^29.7.0",
+				"jest-message-util": "^29.7.0",
+				"jest-regex-util": "^29.6.3",
+				"jest-resolve": "^29.7.0",
+				"jest-resolve-dependencies": "^29.7.0",
+				"jest-runner": "^29.7.0",
+				"jest-runtime": "^29.7.0",
+				"jest-snapshot": "^29.7.0",
+				"jest-util": "^29.7.0",
+				"jest-validate": "^29.7.0",
+				"jest-watcher": "^29.7.0",
+				"micromatch": "^4.0.4",
+				"pretty-format": "^29.7.0",
+				"slash": "^3.0.0",
+				"strip-ansi": "^6.0.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			},
+			"peerDependencies": {
+				"node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+			},
+			"peerDependenciesMeta": {
+				"node-notifier": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@jest/environment": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz",
+			"integrity": "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/fake-timers": "^29.7.0",
+				"@jest/types": "^29.6.3",
+				"@types/node": "*",
+				"jest-mock": "^29.7.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/@jest/expect": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz",
+			"integrity": "sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"expect": "^29.7.0",
+				"jest-snapshot": "^29.7.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/@jest/expect-utils": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz",
+			"integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"jest-get-type": "^29.6.3"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/@jest/fake-timers": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz",
+			"integrity": "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/types": "^29.6.3",
+				"@sinonjs/fake-timers": "^10.0.2",
+				"@types/node": "*",
+				"jest-message-util": "^29.7.0",
+				"jest-mock": "^29.7.0",
+				"jest-util": "^29.7.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/@jest/globals": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz",
+			"integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/environment": "^29.7.0",
+				"@jest/expect": "^29.7.0",
+				"@jest/types": "^29.6.3",
+				"jest-mock": "^29.7.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/@jest/reporters": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz",
+			"integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@bcoe/v8-coverage": "^0.2.3",
+				"@jest/console": "^29.7.0",
+				"@jest/test-result": "^29.7.0",
+				"@jest/transform": "^29.7.0",
+				"@jest/types": "^29.6.3",
+				"@jridgewell/trace-mapping": "^0.3.18",
+				"@types/node": "*",
+				"chalk": "^4.0.0",
+				"collect-v8-coverage": "^1.0.0",
+				"exit": "^0.1.2",
+				"glob": "^7.1.3",
+				"graceful-fs": "^4.2.9",
+				"istanbul-lib-coverage": "^3.0.0",
+				"istanbul-lib-instrument": "^6.0.0",
+				"istanbul-lib-report": "^3.0.0",
+				"istanbul-lib-source-maps": "^4.0.0",
+				"istanbul-reports": "^3.1.3",
+				"jest-message-util": "^29.7.0",
+				"jest-util": "^29.7.0",
+				"jest-worker": "^29.7.0",
+				"slash": "^3.0.0",
+				"string-length": "^4.0.1",
+				"strip-ansi": "^6.0.0",
+				"v8-to-istanbul": "^9.0.1"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			},
+			"peerDependencies": {
+				"node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+			},
+			"peerDependenciesMeta": {
+				"node-notifier": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@jest/schemas": {
+			"version": "29.6.3",
+			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
+			"integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@sinclair/typebox": "^0.27.8"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/@jest/source-map": {
+			"version": "29.6.3",
+			"resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz",
+			"integrity": "sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jridgewell/trace-mapping": "^0.3.18",
+				"callsites": "^3.0.0",
+				"graceful-fs": "^4.2.9"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/@jest/test-result": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz",
+			"integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/console": "^29.7.0",
+				"@jest/types": "^29.6.3",
+				"@types/istanbul-lib-coverage": "^2.0.0",
+				"collect-v8-coverage": "^1.0.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/@jest/test-sequencer": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz",
+			"integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/test-result": "^29.7.0",
+				"graceful-fs": "^4.2.9",
+				"jest-haste-map": "^29.7.0",
+				"slash": "^3.0.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/@jest/transform": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz",
+			"integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/core": "^7.11.6",
+				"@jest/types": "^29.6.3",
+				"@jridgewell/trace-mapping": "^0.3.18",
+				"babel-plugin-istanbul": "^6.1.1",
+				"chalk": "^4.0.0",
+				"convert-source-map": "^2.0.0",
+				"fast-json-stable-stringify": "^2.1.0",
+				"graceful-fs": "^4.2.9",
+				"jest-haste-map": "^29.7.0",
+				"jest-regex-util": "^29.6.3",
+				"jest-util": "^29.7.0",
+				"micromatch": "^4.0.4",
+				"pirates": "^4.0.4",
+				"slash": "^3.0.0",
+				"write-file-atomic": "^4.0.2"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/@jest/types": {
+			"version": "29.6.3",
+			"resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+			"integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/schemas": "^29.6.3",
+				"@types/istanbul-lib-coverage": "^2.0.0",
+				"@types/istanbul-reports": "^3.0.0",
+				"@types/node": "*",
+				"@types/yargs": "^17.0.8",
+				"chalk": "^4.0.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/@jridgewell/gen-mapping": {
+			"version": "0.3.8",
+			"resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz",
+			"integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jridgewell/set-array": "^1.2.1",
+				"@jridgewell/sourcemap-codec": "^1.4.10",
+				"@jridgewell/trace-mapping": "^0.3.24"
+			},
+			"engines": {
+				"node": ">=6.0.0"
+			}
+		},
+		"node_modules/@jridgewell/resolve-uri": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+			"integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6.0.0"
+			}
+		},
+		"node_modules/@jridgewell/set-array": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+			"integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6.0.0"
+			}
+		},
+		"node_modules/@jridgewell/sourcemap-codec": {
+			"version": "1.5.0",
+			"resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
+			"integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/@jridgewell/trace-mapping": {
+			"version": "0.3.25",
+			"resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+			"integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jridgewell/resolve-uri": "^3.1.0",
+				"@jridgewell/sourcemap-codec": "^1.4.14"
+			}
+		},
 		"node_modules/@marijn/find-cluster-break": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/@marijn/find-cluster-break/-/find-cluster-break-1.0.2.tgz",
@@ -1107,6 +2077,78 @@
 				"node": ">=10"
 			}
 		},
+		"node_modules/@sinclair/typebox": {
+			"version": "0.27.8",
+			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
+			"integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/@sinonjs/commons": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz",
+			"integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==",
+			"dev": true,
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"type-detect": "4.0.8"
+			}
+		},
+		"node_modules/@sinonjs/fake-timers": {
+			"version": "10.3.0",
+			"resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz",
+			"integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==",
+			"dev": true,
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"@sinonjs/commons": "^3.0.0"
+			}
+		},
+		"node_modules/@types/babel__core": {
+			"version": "7.20.5",
+			"resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
+			"integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/parser": "^7.20.7",
+				"@babel/types": "^7.20.7",
+				"@types/babel__generator": "*",
+				"@types/babel__template": "*",
+				"@types/babel__traverse": "*"
+			}
+		},
+		"node_modules/@types/babel__generator": {
+			"version": "7.6.8",
+			"resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz",
+			"integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/types": "^7.0.0"
+			}
+		},
+		"node_modules/@types/babel__template": {
+			"version": "7.4.4",
+			"resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz",
+			"integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/parser": "^7.1.0",
+				"@babel/types": "^7.0.0"
+			}
+		},
+		"node_modules/@types/babel__traverse": {
+			"version": "7.20.6",
+			"resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.6.tgz",
+			"integrity": "sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/types": "^7.20.7"
+			}
+		},
 		"node_modules/@types/codemirror": {
 			"version": "5.60.8",
 			"resolved": "https://registry.npmjs.org/@types/codemirror/-/codemirror-5.60.8.tgz",
@@ -1124,6 +2166,54 @@
 			"dev": true,
 			"license": "MIT"
 		},
+		"node_modules/@types/graceful-fs": {
+			"version": "4.1.9",
+			"resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz",
+			"integrity": "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@types/node": "*"
+			}
+		},
+		"node_modules/@types/istanbul-lib-coverage": {
+			"version": "2.0.6",
+			"resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz",
+			"integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/@types/istanbul-lib-report": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz",
+			"integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@types/istanbul-lib-coverage": "*"
+			}
+		},
+		"node_modules/@types/istanbul-reports": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz",
+			"integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@types/istanbul-lib-report": "*"
+			}
+		},
+		"node_modules/@types/jest": {
+			"version": "29.5.14",
+			"resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.14.tgz",
+			"integrity": "sha512-ZN+4sdnLUbo8EVvVc2ao0GFW6oVrQRPn4K2lglySj7APvSrgzxHiNNK99us4WDMi57xxA2yggblIAMNhXOotLQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"expect": "^29.0.0",
+				"pretty-format": "^29.0.0"
+			}
+		},
 		"node_modules/@types/json-schema": {
 			"version": "7.0.15",
 			"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
@@ -1138,6 +2228,13 @@
 			"dev": true,
 			"license": "MIT"
 		},
+		"node_modules/@types/stack-utils": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz",
+			"integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==",
+			"dev": true,
+			"license": "MIT"
+		},
 		"node_modules/@types/tern": {
 			"version": "0.23.9",
 			"resolved": "https://registry.npmjs.org/@types/tern/-/tern-0.23.9.tgz",
@@ -1148,6 +2245,23 @@
 				"@types/estree": "*"
 			}
 		},
+		"node_modules/@types/yargs": {
+			"version": "17.0.33",
+			"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.33.tgz",
+			"integrity": "sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@types/yargs-parser": "*"
+			}
+		},
+		"node_modules/@types/yargs-parser": {
+			"version": "21.0.3",
+			"resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz",
+			"integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==",
+			"dev": true,
+			"license": "MIT"
+		},
 		"node_modules/@typescript-eslint/eslint-plugin": {
 			"version": "8.18.0",
 			"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.18.0.tgz",
@@ -1427,6 +2541,32 @@
 				"node": ">=6"
 			}
 		},
+		"node_modules/ansi-escapes": {
+			"version": "4.3.2",
+			"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+			"integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"type-fest": "^0.21.3"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/ansi-regex": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+			"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
+		},
 		"node_modules/ansi-styles": {
 			"version": "4.3.0",
 			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -1443,6 +2583,20 @@
 				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
 			}
 		},
+		"node_modules/anymatch": {
+			"version": "3.1.3",
+			"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+			"integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"normalize-path": "^3.0.0",
+				"picomatch": "^2.0.4"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
 		"node_modules/argparse": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
@@ -1450,6 +2604,139 @@
 			"dev": true,
 			"license": "Python-2.0"
 		},
+		"node_modules/async": {
+			"version": "3.2.6",
+			"resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
+			"integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/babel-jest": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz",
+			"integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/transform": "^29.7.0",
+				"@types/babel__core": "^7.1.14",
+				"babel-plugin-istanbul": "^6.1.1",
+				"babel-preset-jest": "^29.6.3",
+				"chalk": "^4.0.0",
+				"graceful-fs": "^4.2.9",
+				"slash": "^3.0.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.8.0"
+			}
+		},
+		"node_modules/babel-plugin-istanbul": {
+			"version": "6.1.1",
+			"resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
+			"integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
+			"dev": true,
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.0.0",
+				"@istanbuljs/load-nyc-config": "^1.0.0",
+				"@istanbuljs/schema": "^0.1.2",
+				"istanbul-lib-instrument": "^5.0.4",
+				"test-exclude": "^6.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/babel-plugin-istanbul/node_modules/istanbul-lib-instrument": {
+			"version": "5.2.1",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
+			"integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
+			"dev": true,
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"@babel/core": "^7.12.3",
+				"@babel/parser": "^7.14.7",
+				"@istanbuljs/schema": "^0.1.2",
+				"istanbul-lib-coverage": "^3.2.0",
+				"semver": "^6.3.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/babel-plugin-istanbul/node_modules/semver": {
+			"version": "6.3.1",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+			"dev": true,
+			"license": "ISC",
+			"bin": {
+				"semver": "bin/semver.js"
+			}
+		},
+		"node_modules/babel-plugin-jest-hoist": {
+			"version": "29.6.3",
+			"resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz",
+			"integrity": "sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/template": "^7.3.3",
+				"@babel/types": "^7.3.3",
+				"@types/babel__core": "^7.1.14",
+				"@types/babel__traverse": "^7.0.6"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/babel-preset-current-node-syntax": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.1.0.tgz",
+			"integrity": "sha512-ldYss8SbBlWva1bs28q78Ju5Zq1F+8BrqBZZ0VFhLBvhh6lCpC2o3gDJi/5DRLs9FgYZCnmPYIVFU4lRXCkyUw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/plugin-syntax-async-generators": "^7.8.4",
+				"@babel/plugin-syntax-bigint": "^7.8.3",
+				"@babel/plugin-syntax-class-properties": "^7.12.13",
+				"@babel/plugin-syntax-class-static-block": "^7.14.5",
+				"@babel/plugin-syntax-import-attributes": "^7.24.7",
+				"@babel/plugin-syntax-import-meta": "^7.10.4",
+				"@babel/plugin-syntax-json-strings": "^7.8.3",
+				"@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
+				"@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+				"@babel/plugin-syntax-numeric-separator": "^7.10.4",
+				"@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+				"@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+				"@babel/plugin-syntax-optional-chaining": "^7.8.3",
+				"@babel/plugin-syntax-private-property-in-object": "^7.14.5",
+				"@babel/plugin-syntax-top-level-await": "^7.14.5"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
+			}
+		},
+		"node_modules/babel-preset-jest": {
+			"version": "29.6.3",
+			"resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz",
+			"integrity": "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"babel-plugin-jest-hoist": "^29.6.3",
+				"babel-preset-current-node-syntax": "^1.0.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
+			}
+		},
 		"node_modules/balanced-match": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
@@ -1481,6 +2768,62 @@
 				"node": ">=8"
 			}
 		},
+		"node_modules/browserslist": {
+			"version": "4.24.3",
+			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.3.tgz",
+			"integrity": "sha512-1CPmv8iobE2fyRMV97dAcMVegvvWKxmq94hkLiAkUGwKVTyDLw33K+ZxiFrREKmmps4rIw6grcCFCnTMSZ/YiA==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/browserslist"
+				},
+				{
+					"type": "tidelift",
+					"url": "https://tidelift.com/funding/github/npm/browserslist"
+				},
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/ai"
+				}
+			],
+			"license": "MIT",
+			"dependencies": {
+				"caniuse-lite": "^1.0.30001688",
+				"electron-to-chromium": "^1.5.73",
+				"node-releases": "^2.0.19",
+				"update-browserslist-db": "^1.1.1"
+			},
+			"bin": {
+				"browserslist": "cli.js"
+			},
+			"engines": {
+				"node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+			}
+		},
+		"node_modules/bs-logger": {
+			"version": "0.2.6",
+			"resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz",
+			"integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"fast-json-stable-stringify": "2.x"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/bser": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
+			"integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
+			"dev": true,
+			"license": "Apache-2.0",
+			"dependencies": {
+				"node-int64": "^0.4.0"
+			}
+		},
 		"node_modules/buffer-builder": {
 			"version": "0.2.0",
 			"resolved": "https://registry.npmjs.org/buffer-builder/-/buffer-builder-0.2.0.tgz",
@@ -1489,6 +2832,13 @@
 			"license": "MIT/X11",
 			"peer": true
 		},
+		"node_modules/buffer-from": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+			"integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+			"dev": true,
+			"license": "MIT"
+		},
 		"node_modules/builtin-modules": {
 			"version": "3.3.0",
 			"resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz",
@@ -1512,6 +2862,37 @@
 				"node": ">=6"
 			}
 		},
+		"node_modules/camelcase": {
+			"version": "5.3.1",
+			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+			"integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/caniuse-lite": {
+			"version": "1.0.30001690",
+			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001690.tgz",
+			"integrity": "sha512-5ExiE3qQN6oF8Clf8ifIDcMRCRE/dMGcETG/XGMD8/XiXm6HXQgQTh1yZYLXXpSOsEUlJm1Xr7kGULZTuGtP/w==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/browserslist"
+				},
+				{
+					"type": "tidelift",
+					"url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+				},
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/ai"
+				}
+			],
+			"license": "CC-BY-4.0"
+		},
 		"node_modules/chalk": {
 			"version": "4.1.2",
 			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
@@ -1536,6 +2917,16 @@
 			"dev": true,
 			"license": "MIT"
 		},
+		"node_modules/char-regex": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
+			"integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=10"
+			}
+		},
 		"node_modules/chokidar": {
 			"version": "4.0.3",
 			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
@@ -1552,6 +2943,62 @@
 				"url": "https://paulmillr.com/funding/"
 			}
 		},
+		"node_modules/ci-info": {
+			"version": "3.9.0",
+			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+			"integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/sibiraj-s"
+				}
+			],
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/cjs-module-lexer": {
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.1.tgz",
+			"integrity": "sha512-cuSVIHi9/9E/+821Qjdvngor+xpnlwnuwIyZOaLmHBVdXL+gP+I6QQB9VkO7RI77YIcTV+S1W9AreJ5eN63JBA==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/cliui": {
+			"version": "8.0.1",
+			"resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+			"integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"string-width": "^4.2.0",
+				"strip-ansi": "^6.0.1",
+				"wrap-ansi": "^7.0.0"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/co": {
+			"version": "4.6.0",
+			"resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+			"integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"iojs": ">= 1.0.0",
+				"node": ">= 0.12.0"
+			}
+		},
+		"node_modules/collect-v8-coverage": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz",
+			"integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==",
+			"dev": true,
+			"license": "MIT"
+		},
 		"node_modules/color-convert": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -1594,6 +3041,35 @@
 			"dev": true,
 			"license": "MIT"
 		},
+		"node_modules/convert-source-map": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+			"integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/create-jest": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz",
+			"integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/types": "^29.6.3",
+				"chalk": "^4.0.0",
+				"exit": "^0.1.2",
+				"graceful-fs": "^4.2.9",
+				"jest-config": "^29.7.0",
+				"jest-util": "^29.7.0",
+				"prompts": "^2.0.1"
+			},
+			"bin": {
+				"create-jest": "bin/create-jest.js"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
 		"node_modules/cross-spawn": {
 			"version": "7.0.6",
 			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
@@ -1645,6 +3121,21 @@
 				}
 			}
 		},
+		"node_modules/dedent": {
+			"version": "1.5.3",
+			"resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.3.tgz",
+			"integrity": "sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==",
+			"dev": true,
+			"license": "MIT",
+			"peerDependencies": {
+				"babel-plugin-macros": "^3.1.0"
+			},
+			"peerDependenciesMeta": {
+				"babel-plugin-macros": {
+					"optional": true
+				}
+			}
+		},
 		"node_modules/deep-is": {
 			"version": "0.1.4",
 			"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
@@ -1652,6 +3143,16 @@
 			"dev": true,
 			"license": "MIT"
 		},
+		"node_modules/deepmerge": {
+			"version": "4.3.1",
+			"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
+			"integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
 		"node_modules/detect-libc": {
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
@@ -1666,6 +3167,79 @@
 				"node": ">=0.10"
 			}
 		},
+		"node_modules/detect-newline": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
+			"integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/diff-sequences": {
+			"version": "29.6.3",
+			"resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
+			"integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/ejs": {
+			"version": "3.1.10",
+			"resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
+			"integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==",
+			"dev": true,
+			"license": "Apache-2.0",
+			"dependencies": {
+				"jake": "^10.8.5"
+			},
+			"bin": {
+				"ejs": "bin/cli.js"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/electron-to-chromium": {
+			"version": "1.5.76",
+			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.76.tgz",
+			"integrity": "sha512-CjVQyG7n7Sr+eBXE86HIulnL5N8xZY1sgmOPGuq/F0Rr0FJq63lg0kEtOIDfZBk44FnDLf6FUJ+dsJcuiUDdDQ==",
+			"dev": true,
+			"license": "ISC"
+		},
+		"node_modules/emittery": {
+			"version": "0.13.1",
+			"resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz",
+			"integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sindresorhus/emittery?sponsor=1"
+			}
+		},
+		"node_modules/emoji-regex": {
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/error-ex": {
+			"version": "1.3.2",
+			"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+			"integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"is-arrayish": "^0.2.1"
+			}
+		},
 		"node_modules/esbuild": {
 			"version": "0.24.0",
 			"resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.24.0.tgz",
@@ -1736,6 +3310,16 @@
 				"sass-embedded": "^1.71.1"
 			}
 		},
+		"node_modules/escalade": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+			"integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
+			}
+		},
 		"node_modules/escape-string-regexp": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
@@ -1899,6 +3483,20 @@
 				"url": "https://opencollective.com/eslint"
 			}
 		},
+		"node_modules/esprima": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+			"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+			"dev": true,
+			"license": "BSD-2-Clause",
+			"bin": {
+				"esparse": "bin/esparse.js",
+				"esvalidate": "bin/esvalidate.js"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
 		"node_modules/esquery": {
 			"version": "1.6.0",
 			"resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
@@ -1952,6 +3550,56 @@
 			"dev": true,
 			"license": "MIT"
 		},
+		"node_modules/execa": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+			"integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"cross-spawn": "^7.0.3",
+				"get-stream": "^6.0.0",
+				"human-signals": "^2.1.0",
+				"is-stream": "^2.0.0",
+				"merge-stream": "^2.0.0",
+				"npm-run-path": "^4.0.1",
+				"onetime": "^5.1.2",
+				"signal-exit": "^3.0.3",
+				"strip-final-newline": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sindresorhus/execa?sponsor=1"
+			}
+		},
+		"node_modules/exit": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+			"integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/expect": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz",
+			"integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/expect-utils": "^29.7.0",
+				"jest-get-type": "^29.6.3",
+				"jest-matcher-utils": "^29.7.0",
+				"jest-message-util": "^29.7.0",
+				"jest-util": "^29.7.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
 		"node_modules/fast-deep-equal": {
 			"version": "3.1.3",
 			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -2013,6 +3661,16 @@
 				"reusify": "^1.0.4"
 			}
 		},
+		"node_modules/fb-watchman": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz",
+			"integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
+			"dev": true,
+			"license": "Apache-2.0",
+			"dependencies": {
+				"bser": "2.1.1"
+			}
+		},
 		"node_modules/fetch-retry": {
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/fetch-retry/-/fetch-retry-6.0.0.tgz",
@@ -2033,6 +3691,39 @@
 				"node": ">=16.0.0"
 			}
 		},
+		"node_modules/filelist": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
+			"integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==",
+			"dev": true,
+			"license": "Apache-2.0",
+			"dependencies": {
+				"minimatch": "^5.0.1"
+			}
+		},
+		"node_modules/filelist/node_modules/brace-expansion": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+			"integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"balanced-match": "^1.0.0"
+			}
+		},
+		"node_modules/filelist/node_modules/minimatch": {
+			"version": "5.1.6",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+			"integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"brace-expansion": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
 		"node_modules/fill-range": {
 			"version": "7.1.1",
 			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
@@ -2084,6 +3775,28 @@
 			"dev": true,
 			"license": "ISC"
 		},
+		"node_modules/fs.realpath": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+			"integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+			"dev": true,
+			"license": "ISC"
+		},
+		"node_modules/fsevents": {
+			"version": "2.3.3",
+			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+			"integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+			"dev": true,
+			"hasInstallScript": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"darwin"
+			],
+			"engines": {
+				"node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+			}
+		},
 		"node_modules/function-bind": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
@@ -2094,6 +3807,71 @@
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
+		"node_modules/gensync": {
+			"version": "1.0.0-beta.2",
+			"resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+			"integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/get-caller-file": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+			"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+			"dev": true,
+			"license": "ISC",
+			"engines": {
+				"node": "6.* || 8.* || >= 10.*"
+			}
+		},
+		"node_modules/get-package-type": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
+			"integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=8.0.0"
+			}
+		},
+		"node_modules/get-stream": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+			"integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/glob": {
+			"version": "7.2.3",
+			"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+			"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+			"deprecated": "Glob versions prior to v9 are no longer supported",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"fs.realpath": "^1.0.0",
+				"inflight": "^1.0.4",
+				"inherits": "2",
+				"minimatch": "^3.1.1",
+				"once": "^1.3.0",
+				"path-is-absolute": "^1.0.0"
+			},
+			"engines": {
+				"node": "*"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
 		"node_modules/glob-parent": {
 			"version": "6.0.2",
 			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
@@ -2120,6 +3898,13 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
+		"node_modules/graceful-fs": {
+			"version": "4.2.11",
+			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+			"integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+			"dev": true,
+			"license": "ISC"
+		},
 		"node_modules/graphemer": {
 			"version": "1.4.0",
 			"resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
@@ -2150,6 +3935,13 @@
 				"node": ">= 0.4"
 			}
 		},
+		"node_modules/html-escaper": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+			"integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
+			"dev": true,
+			"license": "MIT"
+		},
 		"node_modules/https-proxy-agent": {
 			"version": "7.0.6",
 			"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
@@ -2164,6 +3956,16 @@
 				"node": ">= 14"
 			}
 		},
+		"node_modules/human-signals": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+			"integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+			"dev": true,
+			"license": "Apache-2.0",
+			"engines": {
+				"node": ">=10.17.0"
+			}
+		},
 		"node_modules/ignore": {
 			"version": "5.3.2",
 			"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
@@ -2198,6 +4000,26 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
+		"node_modules/import-local": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz",
+			"integrity": "sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"pkg-dir": "^4.2.0",
+				"resolve-cwd": "^3.0.0"
+			},
+			"bin": {
+				"import-local-fixture": "fixtures/cli.js"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
 		"node_modules/imurmurhash": {
 			"version": "0.1.4",
 			"resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
@@ -2221,6 +4043,32 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
+		"node_modules/inflight": {
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+			"integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+			"deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"once": "^1.3.0",
+				"wrappy": "1"
+			}
+		},
+		"node_modules/inherits": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+			"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+			"dev": true,
+			"license": "ISC"
+		},
+		"node_modules/is-arrayish": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+			"integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
+			"dev": true,
+			"license": "MIT"
+		},
 		"node_modules/is-core-module": {
 			"version": "2.16.0",
 			"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.0.tgz",
@@ -2247,6 +4095,26 @@
 				"node": ">=0.10.0"
 			}
 		},
+		"node_modules/is-fullwidth-code-point": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+			"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/is-generator-fn": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
+			"integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
+			}
+		},
 		"node_modules/is-glob": {
 			"version": "4.0.3",
 			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
@@ -2270,6 +4138,19 @@
 				"node": ">=0.12.0"
 			}
 		},
+		"node_modules/is-stream": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+			"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
 		"node_modules/isexe": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
@@ -2277,6 +4158,698 @@
 			"dev": true,
 			"license": "ISC"
 		},
+		"node_modules/istanbul-lib-coverage": {
+			"version": "3.2.2",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
+			"integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
+			"dev": true,
+			"license": "BSD-3-Clause",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/istanbul-lib-instrument": {
+			"version": "6.0.3",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz",
+			"integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==",
+			"dev": true,
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"@babel/core": "^7.23.9",
+				"@babel/parser": "^7.23.9",
+				"@istanbuljs/schema": "^0.1.3",
+				"istanbul-lib-coverage": "^3.2.0",
+				"semver": "^7.5.4"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/istanbul-lib-report": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
+			"integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
+			"dev": true,
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"istanbul-lib-coverage": "^3.0.0",
+				"make-dir": "^4.0.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/istanbul-lib-source-maps": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
+			"integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
+			"dev": true,
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"debug": "^4.1.1",
+				"istanbul-lib-coverage": "^3.0.0",
+				"source-map": "^0.6.1"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/istanbul-reports": {
+			"version": "3.1.7",
+			"resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz",
+			"integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==",
+			"dev": true,
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"html-escaper": "^2.0.0",
+				"istanbul-lib-report": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/jake": {
+			"version": "10.9.2",
+			"resolved": "https://registry.npmjs.org/jake/-/jake-10.9.2.tgz",
+			"integrity": "sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==",
+			"dev": true,
+			"license": "Apache-2.0",
+			"dependencies": {
+				"async": "^3.2.3",
+				"chalk": "^4.0.2",
+				"filelist": "^1.0.4",
+				"minimatch": "^3.1.2"
+			},
+			"bin": {
+				"jake": "bin/cli.js"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/jest": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz",
+			"integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/core": "^29.7.0",
+				"@jest/types": "^29.6.3",
+				"import-local": "^3.0.2",
+				"jest-cli": "^29.7.0"
+			},
+			"bin": {
+				"jest": "bin/jest.js"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			},
+			"peerDependencies": {
+				"node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+			},
+			"peerDependenciesMeta": {
+				"node-notifier": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/jest-changed-files": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz",
+			"integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"execa": "^5.0.0",
+				"jest-util": "^29.7.0",
+				"p-limit": "^3.1.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-circus": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz",
+			"integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/environment": "^29.7.0",
+				"@jest/expect": "^29.7.0",
+				"@jest/test-result": "^29.7.0",
+				"@jest/types": "^29.6.3",
+				"@types/node": "*",
+				"chalk": "^4.0.0",
+				"co": "^4.6.0",
+				"dedent": "^1.0.0",
+				"is-generator-fn": "^2.0.0",
+				"jest-each": "^29.7.0",
+				"jest-matcher-utils": "^29.7.0",
+				"jest-message-util": "^29.7.0",
+				"jest-runtime": "^29.7.0",
+				"jest-snapshot": "^29.7.0",
+				"jest-util": "^29.7.0",
+				"p-limit": "^3.1.0",
+				"pretty-format": "^29.7.0",
+				"pure-rand": "^6.0.0",
+				"slash": "^3.0.0",
+				"stack-utils": "^2.0.3"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-cli": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz",
+			"integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/core": "^29.7.0",
+				"@jest/test-result": "^29.7.0",
+				"@jest/types": "^29.6.3",
+				"chalk": "^4.0.0",
+				"create-jest": "^29.7.0",
+				"exit": "^0.1.2",
+				"import-local": "^3.0.2",
+				"jest-config": "^29.7.0",
+				"jest-util": "^29.7.0",
+				"jest-validate": "^29.7.0",
+				"yargs": "^17.3.1"
+			},
+			"bin": {
+				"jest": "bin/jest.js"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			},
+			"peerDependencies": {
+				"node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+			},
+			"peerDependenciesMeta": {
+				"node-notifier": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/jest-config": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz",
+			"integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/core": "^7.11.6",
+				"@jest/test-sequencer": "^29.7.0",
+				"@jest/types": "^29.6.3",
+				"babel-jest": "^29.7.0",
+				"chalk": "^4.0.0",
+				"ci-info": "^3.2.0",
+				"deepmerge": "^4.2.2",
+				"glob": "^7.1.3",
+				"graceful-fs": "^4.2.9",
+				"jest-circus": "^29.7.0",
+				"jest-environment-node": "^29.7.0",
+				"jest-get-type": "^29.6.3",
+				"jest-regex-util": "^29.6.3",
+				"jest-resolve": "^29.7.0",
+				"jest-runner": "^29.7.0",
+				"jest-util": "^29.7.0",
+				"jest-validate": "^29.7.0",
+				"micromatch": "^4.0.4",
+				"parse-json": "^5.2.0",
+				"pretty-format": "^29.7.0",
+				"slash": "^3.0.0",
+				"strip-json-comments": "^3.1.1"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			},
+			"peerDependencies": {
+				"@types/node": "*",
+				"ts-node": ">=9.0.0"
+			},
+			"peerDependenciesMeta": {
+				"@types/node": {
+					"optional": true
+				},
+				"ts-node": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/jest-config/node_modules/parse-json": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+			"integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/code-frame": "^7.0.0",
+				"error-ex": "^1.3.1",
+				"json-parse-even-better-errors": "^2.3.0",
+				"lines-and-columns": "^1.1.6"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/jest-diff": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz",
+			"integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"chalk": "^4.0.0",
+				"diff-sequences": "^29.6.3",
+				"jest-get-type": "^29.6.3",
+				"pretty-format": "^29.7.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-docblock": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz",
+			"integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"detect-newline": "^3.0.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-each": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz",
+			"integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/types": "^29.6.3",
+				"chalk": "^4.0.0",
+				"jest-get-type": "^29.6.3",
+				"jest-util": "^29.7.0",
+				"pretty-format": "^29.7.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-environment-node": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz",
+			"integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/environment": "^29.7.0",
+				"@jest/fake-timers": "^29.7.0",
+				"@jest/types": "^29.6.3",
+				"@types/node": "*",
+				"jest-mock": "^29.7.0",
+				"jest-util": "^29.7.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-get-type": {
+			"version": "29.6.3",
+			"resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz",
+			"integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-haste-map": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz",
+			"integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/types": "^29.6.3",
+				"@types/graceful-fs": "^4.1.3",
+				"@types/node": "*",
+				"anymatch": "^3.0.3",
+				"fb-watchman": "^2.0.0",
+				"graceful-fs": "^4.2.9",
+				"jest-regex-util": "^29.6.3",
+				"jest-util": "^29.7.0",
+				"jest-worker": "^29.7.0",
+				"micromatch": "^4.0.4",
+				"walker": "^1.0.8"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			},
+			"optionalDependencies": {
+				"fsevents": "^2.3.2"
+			}
+		},
+		"node_modules/jest-leak-detector": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz",
+			"integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"jest-get-type": "^29.6.3",
+				"pretty-format": "^29.7.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-matcher-utils": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz",
+			"integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"chalk": "^4.0.0",
+				"jest-diff": "^29.7.0",
+				"jest-get-type": "^29.6.3",
+				"pretty-format": "^29.7.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-message-util": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz",
+			"integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/code-frame": "^7.12.13",
+				"@jest/types": "^29.6.3",
+				"@types/stack-utils": "^2.0.0",
+				"chalk": "^4.0.0",
+				"graceful-fs": "^4.2.9",
+				"micromatch": "^4.0.4",
+				"pretty-format": "^29.7.0",
+				"slash": "^3.0.0",
+				"stack-utils": "^2.0.3"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-mock": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz",
+			"integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/types": "^29.6.3",
+				"@types/node": "*",
+				"jest-util": "^29.7.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-pnp-resolver": {
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
+			"integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
+			},
+			"peerDependencies": {
+				"jest-resolve": "*"
+			},
+			"peerDependenciesMeta": {
+				"jest-resolve": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/jest-regex-util": {
+			"version": "29.6.3",
+			"resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz",
+			"integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-resolve": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz",
+			"integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"chalk": "^4.0.0",
+				"graceful-fs": "^4.2.9",
+				"jest-haste-map": "^29.7.0",
+				"jest-pnp-resolver": "^1.2.2",
+				"jest-util": "^29.7.0",
+				"jest-validate": "^29.7.0",
+				"resolve": "^1.20.0",
+				"resolve.exports": "^2.0.0",
+				"slash": "^3.0.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-resolve-dependencies": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz",
+			"integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"jest-regex-util": "^29.6.3",
+				"jest-snapshot": "^29.7.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-runner": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz",
+			"integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/console": "^29.7.0",
+				"@jest/environment": "^29.7.0",
+				"@jest/test-result": "^29.7.0",
+				"@jest/transform": "^29.7.0",
+				"@jest/types": "^29.6.3",
+				"@types/node": "*",
+				"chalk": "^4.0.0",
+				"emittery": "^0.13.1",
+				"graceful-fs": "^4.2.9",
+				"jest-docblock": "^29.7.0",
+				"jest-environment-node": "^29.7.0",
+				"jest-haste-map": "^29.7.0",
+				"jest-leak-detector": "^29.7.0",
+				"jest-message-util": "^29.7.0",
+				"jest-resolve": "^29.7.0",
+				"jest-runtime": "^29.7.0",
+				"jest-util": "^29.7.0",
+				"jest-watcher": "^29.7.0",
+				"jest-worker": "^29.7.0",
+				"p-limit": "^3.1.0",
+				"source-map-support": "0.5.13"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-runtime": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz",
+			"integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/environment": "^29.7.0",
+				"@jest/fake-timers": "^29.7.0",
+				"@jest/globals": "^29.7.0",
+				"@jest/source-map": "^29.6.3",
+				"@jest/test-result": "^29.7.0",
+				"@jest/transform": "^29.7.0",
+				"@jest/types": "^29.6.3",
+				"@types/node": "*",
+				"chalk": "^4.0.0",
+				"cjs-module-lexer": "^1.0.0",
+				"collect-v8-coverage": "^1.0.0",
+				"glob": "^7.1.3",
+				"graceful-fs": "^4.2.9",
+				"jest-haste-map": "^29.7.0",
+				"jest-message-util": "^29.7.0",
+				"jest-mock": "^29.7.0",
+				"jest-regex-util": "^29.6.3",
+				"jest-resolve": "^29.7.0",
+				"jest-snapshot": "^29.7.0",
+				"jest-util": "^29.7.0",
+				"slash": "^3.0.0",
+				"strip-bom": "^4.0.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-snapshot": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz",
+			"integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/core": "^7.11.6",
+				"@babel/generator": "^7.7.2",
+				"@babel/plugin-syntax-jsx": "^7.7.2",
+				"@babel/plugin-syntax-typescript": "^7.7.2",
+				"@babel/types": "^7.3.3",
+				"@jest/expect-utils": "^29.7.0",
+				"@jest/transform": "^29.7.0",
+				"@jest/types": "^29.6.3",
+				"babel-preset-current-node-syntax": "^1.0.0",
+				"chalk": "^4.0.0",
+				"expect": "^29.7.0",
+				"graceful-fs": "^4.2.9",
+				"jest-diff": "^29.7.0",
+				"jest-get-type": "^29.6.3",
+				"jest-matcher-utils": "^29.7.0",
+				"jest-message-util": "^29.7.0",
+				"jest-util": "^29.7.0",
+				"natural-compare": "^1.4.0",
+				"pretty-format": "^29.7.0",
+				"semver": "^7.5.3"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-util": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+			"integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/types": "^29.6.3",
+				"@types/node": "*",
+				"chalk": "^4.0.0",
+				"ci-info": "^3.2.0",
+				"graceful-fs": "^4.2.9",
+				"picomatch": "^2.2.3"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-validate": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz",
+			"integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/types": "^29.6.3",
+				"camelcase": "^6.2.0",
+				"chalk": "^4.0.0",
+				"jest-get-type": "^29.6.3",
+				"leven": "^3.1.0",
+				"pretty-format": "^29.7.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-validate/node_modules/camelcase": {
+			"version": "6.3.0",
+			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+			"integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/jest-watcher": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz",
+			"integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/test-result": "^29.7.0",
+				"@jest/types": "^29.6.3",
+				"@types/node": "*",
+				"ansi-escapes": "^4.2.1",
+				"chalk": "^4.0.0",
+				"emittery": "^0.13.1",
+				"jest-util": "^29.7.0",
+				"string-length": "^4.0.1"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-worker": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz",
+			"integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@types/node": "*",
+				"jest-util": "^29.7.0",
+				"merge-stream": "^2.0.0",
+				"supports-color": "^8.0.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-worker/node_modules/supports-color": {
+			"version": "8.1.1",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+			"integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/supports-color?sponsor=1"
+			}
+		},
 		"node_modules/js-levenshtein": {
 			"version": "1.1.6",
 			"resolved": "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.6.tgz",
@@ -2307,6 +4880,19 @@
 				"js-yaml": "bin/js-yaml.js"
 			}
 		},
+		"node_modules/jsesc": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
+			"integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",
+			"dev": true,
+			"license": "MIT",
+			"bin": {
+				"jsesc": "bin/jsesc"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
 		"node_modules/json-buffer": {
 			"version": "3.0.1",
 			"resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
@@ -2314,6 +4900,13 @@
 			"dev": true,
 			"license": "MIT"
 		},
+		"node_modules/json-parse-even-better-errors": {
+			"version": "2.3.1",
+			"resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+			"integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+			"dev": true,
+			"license": "MIT"
+		},
 		"node_modules/json-schema-traverse": {
 			"version": "0.4.1",
 			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
@@ -2328,6 +4921,19 @@
 			"dev": true,
 			"license": "MIT"
 		},
+		"node_modules/json5": {
+			"version": "2.2.3",
+			"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+			"integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+			"dev": true,
+			"license": "MIT",
+			"bin": {
+				"json5": "lib/cli.js"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
 		"node_modules/keyv": {
 			"version": "4.5.4",
 			"resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
@@ -2338,6 +4944,26 @@
 				"json-buffer": "3.0.1"
 			}
 		},
+		"node_modules/kleur": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
+			"integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/leven": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
+			"integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
+			}
+		},
 		"node_modules/levn": {
 			"version": "0.4.1",
 			"resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
@@ -2352,6 +4978,13 @@
 				"node": ">= 0.8.0"
 			}
 		},
+		"node_modules/lines-and-columns": {
+			"version": "1.2.4",
+			"resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+			"integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+			"dev": true,
+			"license": "MIT"
+		},
 		"node_modules/locate-path": {
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
@@ -2375,6 +5008,13 @@
 			"dev": true,
 			"license": "MIT"
 		},
+		"node_modules/lodash.memoize": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
+			"integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==",
+			"dev": true,
+			"license": "MIT"
+		},
 		"node_modules/lodash.merge": {
 			"version": "4.6.2",
 			"resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
@@ -2382,6 +5022,56 @@
 			"dev": true,
 			"license": "MIT"
 		},
+		"node_modules/lru-cache": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+			"integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"yallist": "^3.0.2"
+			}
+		},
+		"node_modules/make-dir": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
+			"integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"semver": "^7.5.3"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/make-error": {
+			"version": "1.3.6",
+			"resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
+			"integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
+			"dev": true,
+			"license": "ISC"
+		},
+		"node_modules/makeerror": {
+			"version": "1.0.12",
+			"resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
+			"integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
+			"dev": true,
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"tmpl": "1.0.5"
+			}
+		},
+		"node_modules/merge-stream": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+			"integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+			"dev": true,
+			"license": "MIT"
+		},
 		"node_modules/merge2": {
 			"version": "1.4.1",
 			"resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
@@ -2406,6 +5096,16 @@
 				"node": ">=8.6"
 			}
 		},
+		"node_modules/mimic-fn": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+			"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
+			}
+		},
 		"node_modules/minimatch": {
 			"version": "3.1.2",
 			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
@@ -2472,6 +5172,43 @@
 				}
 			}
 		},
+		"node_modules/node-int64": {
+			"version": "0.4.0",
+			"resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
+			"integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/node-releases": {
+			"version": "2.0.19",
+			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
+			"integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/normalize-path": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+			"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/npm-run-path": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+			"integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"path-key": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
 		"node_modules/obsidian": {
 			"version": "1.7.2",
 			"resolved": "https://registry.npmjs.org/obsidian/-/obsidian-1.7.2.tgz",
@@ -2487,6 +5224,32 @@
 				"@codemirror/view": "^6.0.0"
 			}
 		},
+		"node_modules/once": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+			"integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"wrappy": "1"
+			}
+		},
+		"node_modules/onetime": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+			"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"mimic-fn": "^2.1.0"
+			},
+			"engines": {
+				"node": ">=6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
 		"node_modules/openapi-fetch": {
 			"version": "0.13.3",
 			"resolved": "https://registry.npmjs.org/openapi-fetch/-/openapi-fetch-0.13.3.tgz",
@@ -2618,6 +5381,16 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
+		"node_modules/p-try": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+			"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
+			}
+		},
 		"node_modules/parent-module": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
@@ -2672,6 +5445,16 @@
 				"node": ">=8"
 			}
 		},
+		"node_modules/path-is-absolute": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+			"integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
 		"node_modules/path-key": {
 			"version": "3.1.1",
 			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
@@ -2709,6 +5492,85 @@
 				"url": "https://github.com/sponsors/jonschlinkert"
 			}
 		},
+		"node_modules/pirates": {
+			"version": "4.0.6",
+			"resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
+			"integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/pkg-dir": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+			"integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"find-up": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/pkg-dir/node_modules/find-up": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+			"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"locate-path": "^5.0.0",
+				"path-exists": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/pkg-dir/node_modules/locate-path": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+			"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"p-locate": "^4.1.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/pkg-dir/node_modules/p-limit": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+			"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"p-try": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/pkg-dir/node_modules/p-locate": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+			"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"p-limit": "^2.2.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
 		"node_modules/pluralize": {
 			"version": "8.0.0",
 			"resolved": "https://registry.npmjs.org/pluralize/-/pluralize-8.0.0.tgz",
@@ -2729,6 +5591,48 @@
 				"node": ">= 0.8.0"
 			}
 		},
+		"node_modules/pretty-format": {
+			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
+			"integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/schemas": "^29.6.3",
+				"ansi-styles": "^5.0.0",
+				"react-is": "^18.0.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/pretty-format/node_modules/ansi-styles": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+			"integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/prompts": {
+			"version": "2.4.2",
+			"resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
+			"integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"kleur": "^3.0.3",
+				"sisteransi": "^1.0.5"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
 		"node_modules/punycode": {
 			"version": "2.3.1",
 			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
@@ -2739,6 +5643,23 @@
 				"node": ">=6"
 			}
 		},
+		"node_modules/pure-rand": {
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.1.0.tgz",
+			"integrity": "sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "individual",
+					"url": "https://github.com/sponsors/dubzzz"
+				},
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/fast-check"
+				}
+			],
+			"license": "MIT"
+		},
 		"node_modules/queue-microtask": {
 			"version": "1.2.3",
 			"resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
@@ -2760,6 +5681,13 @@
 			],
 			"license": "MIT"
 		},
+		"node_modules/react-is": {
+			"version": "18.3.1",
+			"resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
+			"integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
+			"dev": true,
+			"license": "MIT"
+		},
 		"node_modules/readdirp": {
 			"version": "4.0.2",
 			"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.0.2.tgz",
@@ -2774,6 +5702,16 @@
 				"url": "https://paulmillr.com/funding/"
 			}
 		},
+		"node_modules/require-directory": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+			"integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
 		"node_modules/require-from-string": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
@@ -2805,6 +5743,29 @@
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
+		"node_modules/resolve-cwd": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
+			"integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"resolve-from": "^5.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/resolve-cwd/node_modules/resolve-from": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+			"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
+		},
 		"node_modules/resolve-from": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
@@ -2815,6 +5776,16 @@
 				"node": ">=4"
 			}
 		},
+		"node_modules/resolve.exports": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.3.tgz",
+			"integrity": "sha512-OcXjMsGdhL4XnbShKpAcSqPMzQoYkYyhbEaeSko47MjRP9NfEQMhZkXL1DoFlt9LWQn4YttrdnV6X2OiyzBi+A==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=10"
+			}
+		},
 		"node_modules/reusify": {
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
@@ -3348,6 +6319,40 @@
 				"node": ">=8"
 			}
 		},
+		"node_modules/signal-exit": {
+			"version": "3.0.7",
+			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+			"integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+			"dev": true,
+			"license": "ISC"
+		},
+		"node_modules/sisteransi": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
+			"integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/slash": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+			"integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/source-map": {
+			"version": "0.6.1",
+			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+			"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+			"dev": true,
+			"license": "BSD-3-Clause",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
 		"node_modules/source-map-js": {
 			"version": "1.2.1",
 			"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
@@ -3358,6 +6363,109 @@
 				"node": ">=0.10.0"
 			}
 		},
+		"node_modules/source-map-support": {
+			"version": "0.5.13",
+			"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
+			"integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"buffer-from": "^1.0.0",
+				"source-map": "^0.6.0"
+			}
+		},
+		"node_modules/sprintf-js": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+			"integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
+			"dev": true,
+			"license": "BSD-3-Clause"
+		},
+		"node_modules/stack-utils": {
+			"version": "2.0.6",
+			"resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
+			"integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"escape-string-regexp": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/stack-utils/node_modules/escape-string-regexp": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+			"integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/string-length": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
+			"integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"char-regex": "^1.0.2",
+				"strip-ansi": "^6.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/string-width": {
+			"version": "4.2.3",
+			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"emoji-regex": "^8.0.0",
+				"is-fullwidth-code-point": "^3.0.0",
+				"strip-ansi": "^6.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/strip-ansi": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+			"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-regex": "^5.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/strip-bom": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
+			"integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/strip-final-newline": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+			"integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
+			}
+		},
 		"node_modules/strip-json-comments": {
 			"version": "3.1.1",
 			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
@@ -3430,6 +6538,28 @@
 				"node": ">=16.0.0"
 			}
 		},
+		"node_modules/test-exclude": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
+			"integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"@istanbuljs/schema": "^0.1.2",
+				"glob": "^7.1.4",
+				"minimatch": "^3.0.4"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/tmpl": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
+			"integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
+			"dev": true,
+			"license": "BSD-3-Clause"
+		},
 		"node_modules/to-regex-range": {
 			"version": "5.0.1",
 			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -3463,6 +6593,55 @@
 				"typescript": ">=4.2.0"
 			}
 		},
+		"node_modules/ts-jest": {
+			"version": "29.2.5",
+			"resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.2.5.tgz",
+			"integrity": "sha512-KD8zB2aAZrcKIdGk4OwpJggeLcH1FgrICqDSROWqlnJXGCXK4Mn6FcdK2B6670Xr73lHMG1kHw8R87A0ecZ+vA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"bs-logger": "^0.2.6",
+				"ejs": "^3.1.10",
+				"fast-json-stable-stringify": "^2.1.0",
+				"jest-util": "^29.0.0",
+				"json5": "^2.2.3",
+				"lodash.memoize": "^4.1.2",
+				"make-error": "^1.3.6",
+				"semver": "^7.6.3",
+				"yargs-parser": "^21.1.1"
+			},
+			"bin": {
+				"ts-jest": "cli.js"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || ^18.0.0 || >=20.0.0"
+			},
+			"peerDependencies": {
+				"@babel/core": ">=7.0.0-beta.0 <8",
+				"@jest/transform": "^29.0.0",
+				"@jest/types": "^29.0.0",
+				"babel-jest": "^29.0.0",
+				"jest": "^29.0.0",
+				"typescript": ">=4.3 <6"
+			},
+			"peerDependenciesMeta": {
+				"@babel/core": {
+					"optional": true
+				},
+				"@jest/transform": {
+					"optional": true
+				},
+				"@jest/types": {
+					"optional": true
+				},
+				"babel-jest": {
+					"optional": true
+				},
+				"esbuild": {
+					"optional": true
+				}
+			}
+		},
 		"node_modules/tslib": {
 			"version": "2.4.0",
 			"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
@@ -3483,6 +6662,29 @@
 				"node": ">= 0.8.0"
 			}
 		},
+		"node_modules/type-detect": {
+			"version": "4.0.8",
+			"resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+			"integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/type-fest": {
+			"version": "0.21.3",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+			"integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+			"dev": true,
+			"license": "(MIT OR CC0-1.0)",
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
 		"node_modules/typescript": {
 			"version": "5.7.2",
 			"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.2.tgz",
@@ -3520,6 +6722,37 @@
 				"typescript": ">=4.8.4 <5.8.0"
 			}
 		},
+		"node_modules/update-browserslist-db": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz",
+			"integrity": "sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/browserslist"
+				},
+				{
+					"type": "tidelift",
+					"url": "https://tidelift.com/funding/github/npm/browserslist"
+				},
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/ai"
+				}
+			],
+			"license": "MIT",
+			"dependencies": {
+				"escalade": "^3.2.0",
+				"picocolors": "^1.1.0"
+			},
+			"bin": {
+				"update-browserslist-db": "cli.js"
+			},
+			"peerDependencies": {
+				"browserslist": ">= 4.21.0"
+			}
+		},
 		"node_modules/uri-js": {
 			"version": "4.4.1",
 			"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
@@ -3537,6 +6770,21 @@
 			"dev": true,
 			"license": "MIT"
 		},
+		"node_modules/v8-to-istanbul": {
+			"version": "9.3.0",
+			"resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz",
+			"integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"@jridgewell/trace-mapping": "^0.3.12",
+				"@types/istanbul-lib-coverage": "^2.0.1",
+				"convert-source-map": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=10.12.0"
+			}
+		},
 		"node_modules/varint": {
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/varint/-/varint-6.0.0.tgz",
@@ -3553,6 +6801,16 @@
 			"license": "MIT",
 			"peer": true
 		},
+		"node_modules/walker": {
+			"version": "1.0.8",
+			"resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
+			"integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
+			"dev": true,
+			"license": "Apache-2.0",
+			"dependencies": {
+				"makeerror": "1.0.12"
+			}
+		},
 		"node_modules/webidl-conversions": {
 			"version": "3.0.1",
 			"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
@@ -3597,6 +6855,62 @@
 				"node": ">=0.10.0"
 			}
 		},
+		"node_modules/wrap-ansi": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+			"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-styles": "^4.0.0",
+				"string-width": "^4.1.0",
+				"strip-ansi": "^6.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+			}
+		},
+		"node_modules/wrappy": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+			"integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+			"dev": true,
+			"license": "ISC"
+		},
+		"node_modules/write-file-atomic": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
+			"integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"imurmurhash": "^0.1.4",
+				"signal-exit": "^3.0.7"
+			},
+			"engines": {
+				"node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+			}
+		},
+		"node_modules/y18n": {
+			"version": "5.0.8",
+			"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+			"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+			"dev": true,
+			"license": "ISC",
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/yallist": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+			"integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+			"dev": true,
+			"license": "ISC"
+		},
 		"node_modules/yaml-ast-parser": {
 			"version": "0.0.43",
 			"resolved": "https://registry.npmjs.org/yaml-ast-parser/-/yaml-ast-parser-0.0.43.tgz",
@@ -3604,6 +6918,25 @@
 			"dev": true,
 			"license": "Apache-2.0"
 		},
+		"node_modules/yargs": {
+			"version": "17.7.2",
+			"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+			"integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"cliui": "^8.0.1",
+				"escalade": "^3.1.1",
+				"get-caller-file": "^2.0.5",
+				"require-directory": "^2.1.1",
+				"string-width": "^4.2.3",
+				"y18n": "^5.0.5",
+				"yargs-parser": "^21.1.1"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
 		"node_modules/yargs-parser": {
 			"version": "21.1.1",
 			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
diff --git a/plugin/package.json b/plugin/package.json
index 5e1e5331..03932ce5 100644
--- a/plugin/package.json
+++ b/plugin/package.json
@@ -6,6 +6,7 @@
 	"scripts": {
 		"dev": "node esbuild.config.mjs",
 		"build": "tsc -noEmit -skipLibCheck && node esbuild.config.mjs production",
+		"test": "jest",
 		"lint": "eslint --fix src",
 		"version": "node version-bump.mjs"
 	},
@@ -13,6 +14,7 @@
 	"author": "",
 	"license": "MIT",
 	"devDependencies": {
+		"@types/jest": "^29.5.14",
 		"@types/node": "^16.11.6",
 		"builtin-modules": "3.3.0",
 		"date-fns": "^4.1.0",
@@ -22,13 +24,15 @@
 		"esbuild-sass-plugin": "^3.3.1",
 		"eslint": "9.17.0",
 		"eslint-plugin-unused-imports": "^4.1.4",
+		"fetch-retry": "^6.0.0",
+		"jest": "^29.7.0",
 		"obsidian": "1.7.2",
 		"openapi-fetch": "0.13.3",
 		"openapi-typescript": "7.4.4",
 		"p-queue": "^8.0.1",
+		"ts-jest": "^29.2.5",
 		"tslib": "2.4.0",
 		"typescript": "5.7.2",
-		"typescript-eslint": "8.18.0",
-		"fetch-retry": "^6.0.0"
+		"typescript-eslint": "8.18.0"
 	}
-}
+}
\ No newline at end of file
diff --git a/plugin/src/sync-operations/document-lock.test.ts b/plugin/src/sync-operations/document-lock.test.ts
new file mode 100644
index 00000000..247ab387
--- /dev/null
+++ b/plugin/src/sync-operations/document-lock.test.ts
@@ -0,0 +1,79 @@
+import {
+	tryLockDocument,
+	waitForDocumentLock,
+	unlockDocument,
+} from "./document-lock";
+import type { RelativePath } from "src/database/document-metadata";
+
+describe("Document Lock Operations", () => {
+	const testPath: RelativePath = "test/document/path";
+
+	beforeEach(() => {
+		// Reset the state before each test
+		(global as any).locked = new Set<RelativePath>();
+		(global as any).waiters = new Map<RelativePath, (() => void)[]>();
+	});
+
+	test("should lock a document successfully", () => {
+		const result = tryLockDocument(testPath);
+		expect(result).toBe(true);
+	});
+
+	test("should not lock a document that is already locked", () => {
+		tryLockDocument(testPath);
+		const result = tryLockDocument(testPath);
+		expect(result).toBe(false);
+	});
+
+	test("should unlock a locked document", () => {
+		tryLockDocument(testPath);
+		unlockDocument(testPath);
+		const result = tryLockDocument(testPath);
+		expect(result).toBe(true);
+		unlockDocument(testPath);
+	});
+
+	test("should throw an error when unlocking a document that is not locked", () => {
+		expect(() => unlockDocument(testPath)).toThrow(
+			`Document ${testPath} is not locked, cannot unlock`
+		);
+	});
+
+	test("should wait for a document lock and resolve when unlocked", async () => {
+		tryLockDocument(testPath);
+
+		let resolved = false;
+		const waitPromise = waitForDocumentLock(testPath).then(() => {
+			resolved = true;
+		});
+
+		unlockDocument(testPath);
+		await waitPromise;
+
+		expect(resolved).toBe(true);
+	});
+
+	test("should resolve multiple waiters in FIFO order", async () => {
+		tryLockDocument(testPath);
+
+		let firstResolved = false;
+		let secondResolved = false;
+
+		const firstWaitPromise = waitForDocumentLock(testPath).then(() => {
+			firstResolved = true;
+		});
+
+		const secondWaitPromise = waitForDocumentLock(testPath).then(() => {
+			secondResolved = true;
+		});
+
+		unlockDocument(testPath);
+		await firstWaitPromise;
+		expect(firstResolved).toBe(true);
+		expect(secondResolved).toBe(false);
+
+		unlockDocument(testPath);
+		await secondWaitPromise;
+		expect(secondResolved).toBe(true);
+	});
+});
diff --git a/plugin/src/utils/is-equal-bytes.test.ts b/plugin/src/utils/is-equal-bytes.test.ts
new file mode 100644
index 00000000..e2394bfd
--- /dev/null
+++ b/plugin/src/utils/is-equal-bytes.test.ts
@@ -0,0 +1,27 @@
+import { isEqualBytes } from "./is-equal-bytes";
+
+describe("isEqualBytes", () => {
+	it("should return true for equal byte arrays", () => {
+		const bytes1 = new Uint8Array([1, 2, 3, 4]);
+		const bytes2 = new Uint8Array([1, 2, 3, 4]);
+		expect(isEqualBytes(bytes1, bytes2)).toBe(true);
+	});
+
+	it("should return false for byte arrays of different lengths", () => {
+		const bytes1 = new Uint8Array([1, 2, 3, 4]);
+		const bytes2 = new Uint8Array([1, 2, 3]);
+		expect(isEqualBytes(bytes1, bytes2)).toBe(false);
+	});
+
+	it("should return true for empty byte arrays", () => {
+		const bytes1 = new Uint8Array([]);
+		const bytes2 = new Uint8Array([]);
+		expect(isEqualBytes(bytes1, bytes2)).toBe(true);
+	});
+
+	it("should return false for byte arrays with same length but different content", () => {
+		const bytes1 = new Uint8Array([1, 2, 3, 4]);
+		const bytes2 = new Uint8Array([4, 3, 2, 1]);
+		expect(isEqualBytes(bytes1, bytes2)).toBe(false);
+	});
+});

From eee1d8db1bf617536607a3ab099dfac3d7601b76 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 3 Jan 2025 11:35:12 +0000
Subject: [PATCH 071/761] Fix error

---
 plugin/src/sync-operations/syncer.ts | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/plugin/src/sync-operations/syncer.ts b/plugin/src/sync-operations/syncer.ts
index 752c9db8..8d80438a 100644
--- a/plugin/src/sync-operations/syncer.ts
+++ b/plugin/src/sync-operations/syncer.ts
@@ -350,7 +350,7 @@ export class Syncer {
 						if (!metadata) {
 							// Perhaps the file has been moved. Let's check by looking at the deleted files
 							const originalFile =
-								await findMatchingFileBasedOnHash(
+								await this.findMatchingFileBasedOnHash(
 									relativePath,
 									locallyDeletedFiles
 								);
@@ -614,17 +614,19 @@ export class Syncer {
 			await this.database.setLastSeenUpdateId(responseVaultUpdateId);
 		}
 	}
-}
 
-async function findMatchingFileBasedOnHash(
-	filePath: RelativePath,
-	candidates: [RelativePath, DocumentMetadata][]
-): Promise<[RelativePath, DocumentMetadata] | undefined> {
-	const contentHash = hash(await this.operations.read(filePath));
+	private async findMatchingFileBasedOnHash(
+		filePath: RelativePath,
+		candidates: [RelativePath, DocumentMetadata][]
+	): Promise<[RelativePath, DocumentMetadata] | undefined> {
+		const contentHash = hash(await this.operations.read(filePath));
 
-	if (contentHash != EMPTY_HASH) {
-		return undefined;
+		if (contentHash != EMPTY_HASH) {
+			return undefined;
+		}
+
+		return candidates.find(
+			([_, document]) => document.hash === contentHash
+		);
 	}
-
-	return candidates.find(([_, document]) => document.hash === contentHash);
 }

From 0f8ce08cf5469261dd89160276b76ae8d7e17b9c Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 3 Jan 2025 11:36:09 +0000
Subject: [PATCH 072/761] Fix rust up

---
 .github/workflows/check.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index da67c9fe..1bf9a333 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -20,6 +20,8 @@ jobs:
       - name: Setup
         run: |
           curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y 
+          . "$HOME/.cargo/env"
+
           rustup install nightly
           rustup default nightly
           rustup component add clippy rustfmt

From 88f65a20f0ae8e7d03b40f1fc51f03c3371b3638 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 3 Jan 2025 14:40:26 +0000
Subject: [PATCH 073/761] Make sure that there're no silent failures

---
 backend/sync_lib/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/sync_lib/src/lib.rs b/backend/sync_lib/src/lib.rs
index eb5e9bdf..6719300d 100644
--- a/backend/sync_lib/src/lib.rs
+++ b/backend/sync_lib/src/lib.rs
@@ -51,6 +51,7 @@ pub fn merge_text(parent: &str, left: &str, right: &str) -> String {
 #[wasm_bindgen(js_name = isBinary)]
 pub fn is_binary(data: &[u8]) -> bool { data.iter().any(|&b| b == 0) }
 
+#[cfg(feature = "console_error_panic_hook")]
 #[wasm_bindgen(js_name = setPanicHook)]
 pub fn set_panic_hook() {
     // When the `console_error_panic_hook` feature is enabled, we can call the
@@ -59,6 +60,5 @@ pub fn set_panic_hook() {
     //
     // For more details see
     // https://github.com/rustwasm/console_error_panic_hook#readme
-    #[cfg(feature = "console_error_panic_hook")]
     console_error_panic_hook::set_once();
 }

From 2911b195f4358995aa4821ced33f90c9c741fa75 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 3 Jan 2025 14:40:52 +0000
Subject: [PATCH 074/761] Don't create new doc if one already exists with the
 same content

---
 backend/sync_server/src/server/create_document.rs | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/backend/sync_server/src/server/create_document.rs b/backend/sync_server/src/server/create_document.rs
index 18ecffac..50b9d862 100644
--- a/backend/sync_server/src/server/create_document.rs
+++ b/backend/sync_server/src/server/create_document.rs
@@ -7,6 +7,7 @@ use axum_extra::{
     headers::{authorization::Bearer, Authorization},
     TypedHeader,
 };
+use log::info;
 use schemars::JsonSchema;
 use serde::Deserialize;
 use sync_lib::{base64_to_bytes, merge};
@@ -68,6 +69,19 @@ pub async fn create_document(
         .context("Failed to decode bytes as UTF-8")
         .map_err(client_error)?;
 
+        if merged_content == existing_version.content {
+            info!(
+                "Content of the new version is the same as the existing version. Not creating a \
+                 new version."
+            );
+            transaction
+                .rollback()
+                .await
+                .context("Failed to rollback unecceseary transaction")
+                .map_err(server_error)?;
+            return Ok(Json(existing_version.into()));
+        }
+
         StoredDocumentVersion {
             vault_id,
             vault_update_id: last_update_id + 1,

From c733448a0285b74c193e9908aba7362a4109fa6c Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 3 Jan 2025 14:44:54 +0000
Subject: [PATCH 075/761] Lint tests

---
 plugin/eslint.config.mjs                         | 2 +-
 plugin/src/sync-operations/document-lock.test.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugin/eslint.config.mjs b/plugin/eslint.config.mjs
index 018146cf..2c697f4a 100644
--- a/plugin/eslint.config.mjs
+++ b/plugin/eslint.config.mjs
@@ -7,7 +7,7 @@ export default tseslint.config({
 		"unused-imports": unusedImports,
 	},
 	extends: [eslint.configs.recommended, tseslint.configs.all],
-	ignores: ["**/types.ts"],
+	ignores: ["**/types.ts", "**/*.test.ts"],
 	rules: {
 		"no-unused-vars": "off",
 		"@typescript-eslint/no-unused-vars": "off",
diff --git a/plugin/src/sync-operations/document-lock.test.ts b/plugin/src/sync-operations/document-lock.test.ts
index 247ab387..08afef97 100644
--- a/plugin/src/sync-operations/document-lock.test.ts
+++ b/plugin/src/sync-operations/document-lock.test.ts
@@ -34,7 +34,7 @@ describe("Document Lock Operations", () => {
 	});
 
 	test("should throw an error when unlocking a document that is not locked", () => {
-		expect(() => unlockDocument(testPath)).toThrow(
+		expect(() => { unlockDocument(testPath); }).toThrow(
 			`Document ${testPath} is not locked, cannot unlock`
 		);
 	});

From 5f5bdf75ea0d6838b18ddd3c7e421673313f7989 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 3 Jan 2025 14:45:26 +0000
Subject: [PATCH 076/761] Refactor syncer and add internal, non-concurrency
 limited methods

---
 plugin/src/plugin.ts                 |   8 +-
 plugin/src/sync-operations/syncer.ts | 430 ++++++++++++++-------------
 2 files changed, 220 insertions(+), 218 deletions(-)

diff --git a/plugin/src/plugin.ts b/plugin/src/plugin.ts
index afd3f634..3b7be811 100644
--- a/plugin/src/plugin.ts
+++ b/plugin/src/plugin.ts
@@ -43,12 +43,12 @@ export default class SyncPlugin extends Plugin {
 
 		const syncService = new SyncService(database);
 
-		const syncer = new Syncer({
+		const syncer = new Syncer(
 			database,
-			operations: this.operations,
 			syncService,
-			history: this.history,
-		});
+			this.operations,
+			this.history
+		);
 
 		const statusDescription = new StatusDescription(
 			database,
diff --git a/plugin/src/sync-operations/syncer.ts b/plugin/src/sync-operations/syncer.ts
index 8d80438a..efa42de5 100644
--- a/plugin/src/sync-operations/syncer.ts
+++ b/plugin/src/sync-operations/syncer.ts
@@ -15,55 +15,31 @@ import { EMPTY_HASH, hash } from "src/utils/hash";
 import type { components } from "src/services/types.js";
 
 export class Syncer {
-	private readonly database: Database;
-	private readonly syncService: SyncService;
-	private readonly operations: FileOperations;
-	private readonly history: SyncHistory;
-
-	private isRunningOfflineSync = false;
-
-	// The offline sync methods call file sync methods, however, we can't preempt promises so we 2 queues to avoid a deadlock
-	private readonly offlineSyncQueue: PQueue;
-	private readonly fileSyncQueue: PQueue;
-
 	private readonly remainingOperationsListeners: ((
 		remainingOperations: number
 	) => void)[] = [];
 
-	public constructor({
-		database,
-		syncService,
-		operations,
-		history,
-	}: {
-		database: Database;
-		syncService: SyncService;
-		operations: FileOperations;
-		history: SyncHistory;
-	}) {
-		this.database = database;
-		this.syncService = syncService;
-		this.operations = operations;
-		this.history = history;
+	private readonly syncQueue: PQueue;
 
-		this.fileSyncQueue = new PQueue({
-			concurrency: database.getSettings().syncConcurrency,
-		});
-		this.offlineSyncQueue = new PQueue({
+	private isRunningOfflineSync = false;
+
+	public constructor(
+		private readonly database: Database,
+		private readonly syncService: SyncService,
+		private readonly operations: FileOperations,
+		private readonly history: SyncHistory
+	) {
+		this.syncQueue = new PQueue({
 			concurrency: database.getSettings().syncConcurrency,
 		});
 
 		database.addOnSettingsChangeHandlers((settings) => {
-			this.fileSyncQueue.concurrency = settings.syncConcurrency;
-			this.offlineSyncQueue.concurrency = settings.syncConcurrency;
+			this.syncQueue.concurrency = settings.syncConcurrency;
 		});
 
-		const updateRemainingOperations = () =>
-			this.emitRemainingOperationsChange(
-				this.fileSyncQueue.size + this.offlineSyncQueue.size
-			);
-		this.fileSyncQueue.on("active", updateRemainingOperations);
-		this.offlineSyncQueue.on("active", updateRemainingOperations);
+		this.syncQueue.on("active", () => {
+			this.emitRemainingOperationsChange(this.syncQueue.size);
+		});
 	}
 
 	public addRemainingOperationsListener(
@@ -76,8 +52,171 @@ export class Syncer {
 		relativePath: RelativePath,
 		updateTime: Date
 	): Promise<void> {
-		await this.safelySync(async () => {
-			try {
+		await this.syncQueue.add(async () =>
+			this.internalSyncLocallyCreatedFile(relativePath, updateTime)
+		);
+	}
+
+	public async syncLocallyUpdatedFile(args: {
+		oldPath?: RelativePath;
+		relativePath: RelativePath;
+		updateTime: Date;
+	}): Promise<void> {
+		await this.syncQueue.add(async () =>
+			this.internalSyncLocallyUpdatedFile(args)
+		);
+	}
+
+	public async syncLocallyDeletedFile(
+		relativePath: RelativePath
+	): Promise<void> {
+		await this.syncQueue.add(async () =>
+			this.internalSyncLocallyDeletedFile(relativePath)
+		);
+	}
+
+	public async syncRemotelyUpdatedFile(
+		remoteVersion: components["schemas"]["DocumentVersionWithoutContent"]
+	): Promise<void> {
+		await this.syncQueue.add(async () =>
+			this.internalSyncRemotelyUpdatedFile(remoteVersion)
+		);
+	}
+
+	public async scheduleSyncForOfflineChanges(): Promise<void> {
+		if (this.isRunningOfflineSync) {
+			Logger.getInstance().warn(
+				"Uploading local changes is already in progress, skipping"
+			);
+			return;
+		}
+
+		if (!this.database.getSettings().isSyncEnabled) {
+			Logger.getInstance().debug(
+				`Syncing is disabled, not uploading local changes`
+			);
+			return;
+		}
+
+		this.isRunningOfflineSync = true;
+
+		try {
+			const allLocalFiles = await this.operations.listAllFiles();
+			const locallyDeletedFiles = [
+				...this.database.getDocuments().entries(),
+			].filter(([path, _]) => !allLocalFiles.includes(path));
+
+			await Promise.all(
+				allLocalFiles.map(async (relativePath) =>
+					this.syncQueue.add(async () => {
+						const metadata =
+							this.database.getDocument(relativePath);
+
+						// If there's no metadata, it must be a new file
+						if (!metadata) {
+							// Perhaps the file has been moved. Let's check by looking at the deleted files
+							const originalFile =
+								await this.findMatchingFileBasedOnHash(
+									relativePath,
+									locallyDeletedFiles
+								);
+							if (originalFile !== undefined) {
+								// `originalFile` hasn't been deleted but it got moved instead
+								locallyDeletedFiles.remove(originalFile);
+
+								Logger.getInstance().debug(
+									`Document ${relativePath} was not found under its current path in the database but was found under a different path ${originalFile[0]}, scheduling sync to move it`
+								);
+								return this.internalSyncLocallyUpdatedFile({
+									oldPath: originalFile[0],
+									relativePath: relativePath,
+									updateTime:
+										await this.operations.getModificationTime(
+											relativePath
+										),
+								});
+							}
+
+							Logger.getInstance().debug(
+								`Document ${relativePath} not found in database, scheduling sync to create it`
+							);
+							return this.internalSyncLocallyCreatedFile(
+								relativePath,
+								await this.operations.getModificationTime(
+									relativePath
+								)
+							);
+						}
+
+						const content = await this.operations.read(
+							relativePath
+						);
+						if (metadata.hash !== hash(content)) {
+							Logger.getInstance().debug(
+								`Document ${relativePath} has been updated locally, scheduling sync to update it`
+							);
+							return this.internalSyncLocallyUpdatedFile({
+								relativePath: relativePath,
+								updateTime:
+									await this.operations.getModificationTime(
+										relativePath
+									),
+							});
+						}
+
+						this.history.addHistoryEntry({
+							status: SyncStatus.NO_OP,
+							source: SyncSource.PUSH,
+							relativePath,
+							message:
+								"Document hasn't been updated locally, no need to sync",
+						});
+						return Promise.resolve();
+					})
+				)
+			);
+
+			await Promise.all(
+				locallyDeletedFiles.map(async ([relativePath, _]) => {
+					Logger.getInstance().debug(
+						`Document ${relativePath} has been deleted locally, scheduling sync to delete it`
+					);
+
+					return this.internalSyncLocallyDeletedFile(relativePath);
+				})
+			);
+
+			Logger.getInstance().info(
+				`All local changes have been applied remotely`
+			);
+		} catch (e) {
+			Logger.getInstance().error(
+				`Not all local changes have been applied remotely: ${e}`
+			);
+		} finally {
+			this.isRunningOfflineSync = false;
+		}
+	}
+
+	public async reset(): Promise<void> {
+		this.syncQueue.clear();
+		await this.syncQueue.onEmpty();
+		await this.database.resetSyncState();
+		this.history.reset();
+		this.remainingOperationsListeners.forEach((listener) => {
+			listener(0);
+		});
+	}
+
+	private async internalSyncLocallyCreatedFile(
+		relativePath: RelativePath,
+		updateTime: Date
+	): Promise<void> {
+		await this.executeWhileHoldingFileLock(
+			relativePath,
+			SyncType.CREATE,
+			SyncSource.PUSH,
+			async () => {
 				const contentBytes = await this.operations.read(relativePath);
 				const contentHash = hash(contentBytes);
 
@@ -138,19 +277,11 @@ export class Syncer {
 				});
 
 				await this.tryIncrementVaultUpdateId(response.vaultUpdateId);
-			} catch (e) {
-				this.history.addHistoryEntry({
-					status: SyncStatus.ERROR,
-					relativePath,
-					message: `Failed to reconcile locally created file: ${e}`,
-					type: SyncType.CREATE,
-				});
-				throw e;
 			}
-		}, relativePath);
+		);
 	}
 
-	public async syncLocallyUpdatedFile({
+	private async internalSyncLocallyUpdatedFile({
 		oldPath,
 		relativePath,
 		updateTime,
@@ -159,8 +290,11 @@ export class Syncer {
 		relativePath: RelativePath;
 		updateTime: Date;
 	}): Promise<void> {
-		await this.safelySync(async () => {
-			try {
+		await this.executeWhileHoldingFileLock(
+			relativePath,
+			SyncType.UPDATE,
+			SyncSource.PUSH,
+			async () => {
 				const metadata = this.database.getDocument(
 					oldPath ?? relativePath
 				);
@@ -262,23 +396,18 @@ export class Syncer {
 				});
 
 				await this.tryIncrementVaultUpdateId(response.vaultUpdateId);
-			} catch (e) {
-				this.history.addHistoryEntry({
-					status: SyncStatus.ERROR,
-					relativePath,
-					message: `Failed to reconcile locally updated file: ${e}`,
-					type: SyncType.UPDATE,
-				});
-				throw e;
 			}
-		}, relativePath);
+		);
 	}
 
-	public async syncLocallyDeletedFile(
+	private async internalSyncLocallyDeletedFile(
 		relativePath: RelativePath
 	): Promise<void> {
-		await this.safelySync(async () => {
-			try {
+		await this.executeWhileHoldingFileLock(
+			relativePath,
+			SyncType.DELETE,
+			SyncSource.PUSH,
+			async () => {
 				const metadata = this.database.getDocument(relativePath);
 				if (!metadata) {
 					this.history.addHistoryEntry({
@@ -305,138 +434,18 @@ export class Syncer {
 				});
 
 				await this.database.removeDocument(relativePath);
-			} catch (e) {
-				this.history.addHistoryEntry({
-					status: SyncStatus.ERROR,
-					relativePath,
-					message: `Failed to remotely delete locally deleted file: ${e}`,
-					type: SyncType.DELETE,
-				});
-				throw e;
 			}
-		}, relativePath);
+		);
 	}
 
-	public async scheduleSyncForOfflineChanges(): Promise<void> {
-		if (this.isRunningOfflineSync) {
-			Logger.getInstance().warn(
-				"Uploading local changes is already in progress, skipping"
-			);
-			return;
-		}
-
-		if (!this.database.getSettings().isSyncEnabled) {
-			Logger.getInstance().debug(
-				`Syncing is disabled, not uploading local changes`
-			);
-			return;
-		}
-
-		this.isRunningOfflineSync = true;
-
-		try {
-			const allLocalFiles = await this.operations.listAllFiles();
-			const locallyDeletedFiles = [
-				...this.database.getDocuments().entries(),
-			].filter(([path, _]) => !allLocalFiles.includes(path));
-
-			await Promise.all(
-				allLocalFiles.map(async (relativePath) =>
-					this.offlineSyncQueue.add(async () => {
-						const metadata =
-							this.database.getDocument(relativePath);
-
-						// If there's no metadata, it must be a new file
-						if (!metadata) {
-							// Perhaps the file has been moved. Let's check by looking at the deleted files
-							const originalFile =
-								await this.findMatchingFileBasedOnHash(
-									relativePath,
-									locallyDeletedFiles
-								);
-							if (originalFile !== undefined) {
-								// `originalFile` hasn't been deleted but it got moved instead
-								locallyDeletedFiles.remove(originalFile);
-
-								Logger.getInstance().debug(
-									`Document ${relativePath} was not found under its current path in the database but was found under a different path ${originalFile[0]}, scheduling sync to move it`
-								);
-								return this.syncLocallyUpdatedFile({
-									oldPath: originalFile[0],
-									relativePath: relativePath,
-									updateTime:
-										await this.operations.getModificationTime(
-											relativePath
-										),
-								});
-							}
-
-							Logger.getInstance().debug(
-								`Document ${relativePath} not found in database, scheduling sync to create it`
-							);
-							return this.syncLocallyCreatedFile(
-								relativePath,
-								await this.operations.getModificationTime(
-									relativePath
-								)
-							);
-						}
-
-						const content = await this.operations.read(
-							relativePath
-						);
-						if (metadata.hash !== hash(content)) {
-							Logger.getInstance().debug(
-								`Document ${relativePath} has been updated locally, scheduling sync to update it`
-							);
-							return this.syncLocallyUpdatedFile({
-								relativePath: relativePath,
-								updateTime:
-									await this.operations.getModificationTime(
-										relativePath
-									),
-							});
-						}
-
-						this.history.addHistoryEntry({
-							status: SyncStatus.NO_OP,
-							source: SyncSource.PUSH,
-							relativePath,
-							message:
-								"Document hasn't been updated locally, no need to sync",
-						});
-						return Promise.resolve();
-					})
-				)
-			);
-
-			await Promise.all(
-				locallyDeletedFiles.map(async ([relativePath, _]) => {
-					Logger.getInstance().debug(
-						`Document ${relativePath} has been deleted locally, scheduling sync to delete it`
-					);
-
-					return this.syncLocallyDeletedFile(relativePath);
-				})
-			);
-
-			Logger.getInstance().info(
-				`All local changes have been applied remotely`
-			);
-		} catch (e) {
-			Logger.getInstance().error(
-				`Not all local changes have been applied remotely: ${e}`
-			);
-		} finally {
-			this.isRunningOfflineSync = false;
-		}
-	}
-
-	public async syncRemotelyUpdatedFile(
+	private async internalSyncRemotelyUpdatedFile(
 		remoteVersion: components["schemas"]["DocumentVersionWithoutContent"]
 	): Promise<void> {
-		await this.safelySync(async () => {
-			try {
+		await this.executeWhileHoldingFileLock(
+			remoteVersion.relativePath,
+			SyncType.UPDATE,
+			SyncSource.PULL,
+			async () => {
 				const currentVersion = this.database.getDocumentByDocumentId(
 					remoteVersion.documentId
 				);
@@ -559,31 +568,15 @@ export class Syncer {
 						unlockDocument(relativePath);
 					}
 				}
-			} catch (e) {
-				this.history.addHistoryEntry({
-					status: SyncStatus.ERROR,
-					source: SyncSource.PULL,
-					relativePath: remoteVersion.relativePath,
-					message: `Failed to reconcile remotely updated file: ${e}`,
-				});
-				throw e;
 			}
-		}, remoteVersion.relativePath);
+		);
 	}
 
-	public async reset(): Promise<void> {
-		this.fileSyncQueue.clear();
-		await this.fileSyncQueue.onEmpty();
-		await this.database.resetSyncState();
-		this.history.reset();
-		this.remainingOperationsListeners.forEach((listener) => {
-			listener(0);
-		});
-	}
-
-	private async safelySync(
-		fn: () => Promise<void>,
-		relativePath: RelativePath
+	private async executeWhileHoldingFileLock(
+		relativePath: RelativePath,
+		syncType: SyncType,
+		syncSource: SyncSource,
+		fn: () => Promise<void>
 	): Promise<void> {
 		if (!this.database.getSettings().isSyncEnabled) {
 			Logger.getInstance().info(
@@ -595,7 +588,16 @@ export class Syncer {
 
 		await waitForDocumentLock(relativePath);
 		try {
-			await this.fileSyncQueue.add(fn);
+			await fn();
+		} catch (e) {
+			this.history.addHistoryEntry({
+				status: SyncStatus.ERROR,
+				relativePath,
+				message: `Failed to ${syncSource.toLocaleLowerCase()} file ${e} when trying to ${syncType.toLocaleLowerCase()} it`,
+				type: syncType,
+				source: syncSource,
+			});
+			throw e;
 		} finally {
 			unlockDocument(relativePath);
 		}

From aeae75b541ef0184ef72acc8b4a90cf3db140a89 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 3 Jan 2025 14:45:32 +0000
Subject: [PATCH 077/761] Typo

---
 backend/sync_server/src/server/update_document.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/sync_server/src/server/update_document.rs b/backend/sync_server/src/server/update_document.rs
index 7e4f4dc8..9ef1b17b 100644
--- a/backend/sync_server/src/server/update_document.rs
+++ b/backend/sync_server/src/server/update_document.rs
@@ -93,7 +93,7 @@ pub async fn update_document(
         transaction
             .rollback()
             .await
-            .context("Failed to rollback transaction")
+            .context("Failed to roll back transaction")
             .map_err(server_error)?;
 
         return Ok(Json(latest_version.into()));

From ed162b2ee936b51e7ef7f0a03810d50c56095ab6 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 3 Jan 2025 15:09:56 +0000
Subject: [PATCH 078/761] Use self-hosted runner

---
 .github/workflows/publish-plugin.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/publish-plugin.yml b/.github/workflows/publish-plugin.yml
index 795fd844..9e899d8b 100644
--- a/.github/workflows/publish-plugin.yml
+++ b/.github/workflows/publish-plugin.yml
@@ -10,7 +10,7 @@ env:
 
 jobs:
   build-plugin:
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
 
     steps:
       - uses: actions/checkout@v3
@@ -24,7 +24,7 @@ jobs:
         run: |
           cd backend
           cargo install wasm-pack
-          wasm-pack build --target web sync_lib --features wee_alloc
+          wasm-pack build --target web sync_lib
 
       - name: Build plugin
         run: |

From db21f70612c56662241a4912a194c1a0362ac907 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 3 Jan 2025 15:10:03 +0000
Subject: [PATCH 079/761] Remove rustup

---
 .github/workflows/check.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 1bf9a333..e69043f5 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -19,9 +19,6 @@ jobs:
 
       - name: Setup
         run: |
-          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y 
-          . "$HOME/.cargo/env"
-
           rustup install nightly
           rustup default nightly
           rustup component add clippy rustfmt
@@ -34,7 +31,7 @@ jobs:
         run: |
           cd backend
           cargo install wasm-pack
-          wasm-pack build --target web sync_lib --features wee_alloc
+          wasm-pack build --target web sync_lib
 
       - name: Lint backend
         run: |

From 9b7d37dd8abfa38c12de2c02c7d711f5499e6d50 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 3 Jan 2025 15:10:12 +0000
Subject: [PATCH 080/761] More emojis

---
 plugin/src/views/history-view.ts | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/plugin/src/views/history-view.ts b/plugin/src/views/history-view.ts
index 481c16d2..4f6050cf 100644
--- a/plugin/src/views/history-view.ts
+++ b/plugin/src/views/history-view.ts
@@ -1,6 +1,6 @@
 import type { WorkspaceLeaf } from "obsidian";
 import { ItemView } from "obsidian";
-import type { SyncHistory } from "src/tracing/sync-history";
+import { SyncHistory, SyncType } from "src/tracing/sync-history";
 import { SyncSource, SyncStatus } from "src/tracing/sync-history";
 import { intlFormatDistance } from "date-fns";
 import type { Database } from "src/database/database";
@@ -24,6 +24,20 @@ export class HistoryView extends ItemView {
 		});
 	}
 
+	private static formatSyncType(type: SyncType | undefined): string {
+		switch (type) {
+			case SyncType.CREATE:
+				return "👶 ";
+			case SyncType.DELETE:
+				return "🗑️ ";
+			case SyncType.UPDATE:
+				return "✍️ ";
+			case undefined:
+			default:
+				return "";
+		}
+	}
+
 	private static formatSource(source: SyncSource | undefined): string {
 		switch (source) {
 			case SyncSource.PUSH:
@@ -76,6 +90,7 @@ export class HistoryView extends ItemView {
 				const header = card.createDiv({ cls: "history-card-header" });
 				header.createEl("h5", {
 					text:
+						HistoryView.formatSyncType(entry.type) +
 						entry.relativePath +
 						HistoryView.formatSource(entry.source),
 					cls: "history-card-title",

From 861eda38cfe8e80744fc2d8c53568ea9d5266ee8 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 3 Jan 2025 15:12:49 +0000
Subject: [PATCH 081/761] try

---
 .github/workflows/check.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index e69043f5..575459ae 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -29,6 +29,8 @@ jobs:
 
       - name: Build wasm
         run: |
+          whoami
+          . "$HOME/.cargo/env"
           cd backend
           cargo install wasm-pack
           wasm-pack build --target web sync_lib

From 8965477e2f4f234a1166220e481d6ba112d6a9db Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 3 Jan 2025 15:15:14 +0000
Subject: [PATCH 082/761] Try fixing CI

---
 .github/workflows/check.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 575459ae..6221aa4e 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -19,6 +19,8 @@ jobs:
 
       - name: Setup
         run: |
+          whoami
+          . "$HOME/.cargo/env"
           rustup install nightly
           rustup default nightly
           rustup component add clippy rustfmt
@@ -29,8 +31,6 @@ jobs:
 
       - name: Build wasm
         run: |
-          whoami
-          . "$HOME/.cargo/env"
           cd backend
           cargo install wasm-pack
           wasm-pack build --target web sync_lib

From c0b824796f204e2c44e07abd2e020293fd7c70aa Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 3 Jan 2025 17:47:20 +0000
Subject: [PATCH 083/761] Remove trying to fix CI

---
 .github/workflows/check.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 6221aa4e..e69043f5 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -19,8 +19,6 @@ jobs:
 
       - name: Setup
         run: |
-          whoami
-          . "$HOME/.cargo/env"
           rustup install nightly
           rustup default nightly
           rustup component add clippy rustfmt

From 875592deda804eca0ecece5834fb35ef6cc24f0b Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 3 Jan 2025 18:21:56 +0000
Subject: [PATCH 084/761] Remove wee_alloc as it's unsuitable for this use case
 and OOMs

---
 backend/Cargo.lock          | 57 +++++++++++--------------------------
 backend/sync_lib/Cargo.toml |  2 --
 backend/sync_lib/src/lib.rs |  8 +-----
 3 files changed, 17 insertions(+), 50 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index d9cea4ed..f5cbc7c9 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -23,7 +23,7 @@ version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "once_cell",
  "version_check",
  "zerocopy",
@@ -47,7 +47,7 @@ dependencies = [
  "axum",
  "axum-extra",
  "bytes",
- "cfg-if 1.0.0",
+ "cfg-if",
  "http",
  "indexmap",
  "schemars",
@@ -223,7 +223,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
 dependencies = [
  "addr2line",
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
  "miniz_oxide",
  "object",
@@ -296,12 +296,6 @@ dependencies = [
  "shlex",
 ]
 
-[[package]]
-name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
@@ -350,7 +344,7 @@ version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "wasm-bindgen",
 ]
 
@@ -494,7 +488,7 @@ version = "0.8.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 ]
 
 [[package]]
@@ -519,7 +513,7 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "home",
  "windows-sys 0.48.0",
 ]
@@ -683,7 +677,7 @@ version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "js-sys",
  "libc",
  "wasi",
@@ -1172,7 +1166,7 @@ version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "digest",
 ]
 
@@ -1182,12 +1176,6 @@ version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
-[[package]]
-name = "memory_units"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3"
-
 [[package]]
 name = "mime"
 version = "0.3.17"
@@ -1357,7 +1345,7 @@ version = "0.9.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
  "redox_syscall",
  "smallvec",
@@ -1758,7 +1746,7 @@ version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "cpufeatures",
  "digest",
 ]
@@ -1769,7 +1757,7 @@ version = "0.10.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "cpufeatures",
  "digest",
 ]
@@ -2118,7 +2106,6 @@ dependencies = [
  "thiserror",
  "wasm-bindgen",
  "wasm-bindgen-test",
- "wee_alloc",
 ]
 
 [[package]]
@@ -2175,7 +2162,7 @@ version = "3.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "fastrand",
  "once_cell",
  "rustix",
@@ -2197,7 +2184,7 @@ version = "3.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "adcb7fd841cd518e279be3d5a3eb0636409487998a4aff22f3de87b81e88384f"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "proc-macro2",
  "quote",
  "syn",
@@ -2241,7 +2228,7 @@ version = "1.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "once_cell",
 ]
 
@@ -2576,7 +2563,7 @@ version = "0.2.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d15e63b4482863c109d70a7b8706c1e364eb6ea449b201a76c5b89cedcec2d5c"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "once_cell",
  "wasm-bindgen-macro",
 ]
@@ -2602,7 +2589,7 @@ version = "0.4.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9dfaf8f50e5f293737ee323940c7d8b08a66a95a419223d9f41610ca08b0833d"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "js-sys",
  "once_cell",
  "wasm-bindgen",
@@ -2674,18 +2661,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "wee_alloc"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbb3b5a6b2bb17cb6ad44a2e68a43e8d2722c997da10e928665c72ec6c0a0b8e"
-dependencies = [
- "cfg-if 0.1.10",
- "libc",
- "memory_units",
- "winapi",
-]
-
 [[package]]
 name = "whoami"
 version = "1.5.2"
diff --git a/backend/sync_lib/Cargo.toml b/backend/sync_lib/Cargo.toml
index 8fd2dfc3..62d74a1e 100644
--- a/backend/sync_lib/Cargo.toml
+++ b/backend/sync_lib/Cargo.toml
@@ -20,8 +20,6 @@ thiserror = { workspace = true }
 # code size when deploying.
 console_error_panic_hook = { version = "0.1.7", optional = true }
 
-wee_alloc = { version = "0.4.5", optional = true }
-
 [dev-dependencies]
 wasm-bindgen-test = "0.3.34"
 
diff --git a/backend/sync_lib/src/lib.rs b/backend/sync_lib/src/lib.rs
index 6719300d..9832c5ba 100644
--- a/backend/sync_lib/src/lib.rs
+++ b/backend/sync_lib/src/lib.rs
@@ -6,12 +6,6 @@ use wasm_bindgen::prelude::*;
 
 pub mod errors;
 
-// When the `wee_alloc` feature is enabled, use `wee_alloc` as the global
-// allocator.
-#[cfg(feature = "wee_alloc")]
-#[global_allocator]
-static ALLOC: wee_alloc::WeeAlloc<'_> = wee_alloc::WeeAlloc::INIT;
-
 #[wasm_bindgen(js_name = bytesToBase64)]
 pub fn bytes_to_base64(input: &[u8]) -> String { STANDARD_NO_PAD.encode(input) }
 
@@ -49,7 +43,7 @@ pub fn merge_text(parent: &str, left: &str, right: &str) -> String {
 }
 
 #[wasm_bindgen(js_name = isBinary)]
-pub fn is_binary(data: &[u8]) -> bool { data.iter().any(|&b| b == 0) }
+pub fn is_binary(data: &[u8]) -> bool { std::str::from_utf8(data).is_ok() }
 
 #[cfg(feature = "console_error_panic_hook")]
 #[wasm_bindgen(js_name = setPanicHook)]

From 41ffba8ec2d5418c81e922818a8709a4e3e2925f Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 3 Jan 2025 18:22:37 +0000
Subject: [PATCH 085/761] Only make last seen update go forwards

---
 .../src/sync-operations/apply-remote-changes-locally.ts   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/plugin/src/sync-operations/apply-remote-changes-locally.ts b/plugin/src/sync-operations/apply-remote-changes-locally.ts
index d1a8f69f..0146463b 100644
--- a/plugin/src/sync-operations/apply-remote-changes-locally.ts
+++ b/plugin/src/sync-operations/apply-remote-changes-locally.ts
@@ -44,7 +44,13 @@ export async function applyRemoteChangesLocally({
 			)
 		);
 
-		await database.setLastSeenUpdateId(remote.lastUpdateId);
+		const lastSeenUpdateId = database.getLastSeenUpdateId();
+		if (
+			lastSeenUpdateId === undefined ||
+			remote.lastUpdateId > lastSeenUpdateId
+		) {
+			await database.setLastSeenUpdateId(remote.lastUpdateId);
+		}
 	} catch (e) {
 		Logger.getInstance().error(
 			`Failed to apply remote changes locally: ${e}`

From 727b60c6725591a18017b17f6565beac98cbc851 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 3 Jan 2025 18:24:42 +0000
Subject: [PATCH 086/761] Fix duplicated documents

---
 backend/sync_server/src/database.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/backend/sync_server/src/database.rs b/backend/sync_server/src/database.rs
index fdd0401f..46d46d07 100644
--- a/backend/sync_server/src/database.rs
+++ b/backend/sync_server/src/database.rs
@@ -180,6 +180,10 @@ impl Database {
                 is_deleted
             from latest_document_versions
             where vault_id = ? and relative_path = ?
+            order by vault_update_id desc  -- `latest_document_versions` only contains a single latest version of each document, however,
+                                           -- multiple documents can have the same `relative_path`, if they have been deleted. That's
+                                           -- why we only care about the latest version of the document with the given relative path.
+            limit 1
             "#,
             vault,
             relative_path

From b074202ed8a7c64196f0c7159614239b51c55aa2 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 3 Jan 2025 18:25:00 +0000
Subject: [PATCH 087/761] No need to merge if the contents are equal

---
 .../sync_server/src/server/create_document.rs  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/backend/sync_server/src/server/create_document.rs b/backend/sync_server/src/server/create_document.rs
index 50b9d862..fc55b022 100644
--- a/backend/sync_server/src/server/create_document.rs
+++ b/backend/sync_server/src/server/create_document.rs
@@ -61,15 +61,7 @@ pub async fn create_document(
             .context("Failed to decode base64 content in request")
             .map_err(client_error)?;
 
-        let merged_content = merge(
-            &[], // the empty string is the first common parent of the two documents,
-            &existing_version.content,
-            &content_bytes,
-        )
-        .context("Failed to decode bytes as UTF-8")
-        .map_err(client_error)?;
-
-        if merged_content == existing_version.content {
+        if content_bytes == existing_version.content {
             info!(
                 "Content of the new version is the same as the existing version. Not creating a \
                  new version."
@@ -82,6 +74,14 @@ pub async fn create_document(
             return Ok(Json(existing_version.into()));
         }
 
+        let merged_content = merge(
+            &[], // the empty string is the first common parent of the two documents,
+            &existing_version.content,
+            &content_bytes,
+        )
+        .context("Failed to decode bytes as UTF-8")
+        .map_err(client_error)?;
+
         StoredDocumentVersion {
             vault_id,
             vault_update_id: last_update_id + 1,

From 20031b3c28033f31fc5ab166af6135a03b56c0eb Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 3 Jan 2025 18:25:29 +0000
Subject: [PATCH 088/761] Fix syncing renamed files

---
 plugin/src/sync-operations/syncer.ts | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/plugin/src/sync-operations/syncer.ts b/plugin/src/sync-operations/syncer.ts
index efa42de5..5fd70294 100644
--- a/plugin/src/sync-operations/syncer.ts
+++ b/plugin/src/sync-operations/syncer.ts
@@ -299,6 +299,16 @@ export class Syncer {
 					oldPath ?? relativePath
 				);
 				if (!metadata) {
+					if (this.database.getDocument(relativePath)) {
+						this.history.addHistoryEntry({
+							status: SyncStatus.NO_OP,
+							relativePath,
+							message: `The renaming doesn't require a sync because it must have been pulled from remote`,
+							type: SyncType.UPDATE,
+						});
+						return;
+					}
+
 					throw new Error(
 						`Document metadata not found for ${relativePath}. This implies a corrupt local database. Consider resetting the plugin's sync history.`
 					);
@@ -307,7 +317,7 @@ export class Syncer {
 				const contentBytes = await this.operations.read(relativePath);
 				const contentHash = hash(contentBytes);
 
-				if (metadata.hash === contentHash && oldPath !== undefined) {
+				if (metadata.hash === contentHash && oldPath === undefined) {
 					this.history.addHistoryEntry({
 						status: SyncStatus.NO_OP,
 						relativePath,
@@ -468,7 +478,6 @@ export class Syncer {
 						})
 					).contentBase64;
 					const contentBytes = lib.base64ToBytes(content);
-					const contentHash = hash(contentBytes);
 
 					await this.operations.create(
 						remoteVersion.relativePath,
@@ -478,7 +487,7 @@ export class Syncer {
 						documentId: remoteVersion.documentId,
 						relativePath: remoteVersion.relativePath,
 						parentVersionId: remoteVersion.vaultUpdateId,
-						hash: contentHash,
+						hash: hash(contentBytes),
 					});
 					this.history.addHistoryEntry({
 						status: SyncStatus.SUCCESS,

From f9390c98c5e7fffdc7f56771fafc2e6090d4de80 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 3 Jan 2025 18:25:39 +0000
Subject: [PATCH 089/761] Dev updates

---
 README.md                 |  5 +++++
 plugin/esbuild.config.mjs | 14 ++++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index ad9bdde9..c14365ce 100644
--- a/README.md
+++ b/README.md
@@ -74,3 +74,8 @@ pedantic = { level = "warn", priority = 0 }
 cargo = { level = "warn", priority = 0 }
 
 ```
+
+apt install flatpak
+flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
+flatpak install flathub md.obsidian.Obsidian
+flatpak run md.obsidian.Obsidian
diff --git a/plugin/esbuild.config.mjs b/plugin/esbuild.config.mjs
index 609e537e..a6fd86ad 100644
--- a/plugin/esbuild.config.mjs
+++ b/plugin/esbuild.config.mjs
@@ -93,12 +93,22 @@ const copyBundle = () => ({
 
 				copyFiles(
 					["manifest.json", ".hotreload"],
-					"/mnt/c/Users/Andras/Desktop/test/test2/.obsidian/plugins/my-plugin"
+					"/mnt/c/Users/Andras/Desktop/test/test/.obsidian/plugins/my-plugin"
 				);
 
 				copyFiles(
 					"build",
-					"/mnt/c/Users/Andras/Desktop/test/test2/.obsidian/plugins/my-plugin"
+					"/mnt/c/Users/Andras/Desktop/test/test/.obsidian/plugins/my-plugin"
+				);
+
+				copyFiles(
+					["manifest.json", ".hotreload"],
+					"/home/andras/obsidian-test/.obsidian/plugins/my-plugin"
+				);
+
+				copyFiles(
+					"build",
+					"/home/andras/obsidian-test/.obsidian/plugins/my-plugin"
 				);
 			}
 		});

From 51d7306489fea88d87374b4eb7ca10398e4f8d52 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 3 Jan 2025 18:26:09 +0000
Subject: [PATCH 090/761] Format

---
 plugin/src/views/history-view.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugin/src/views/history-view.ts b/plugin/src/views/history-view.ts
index 4f6050cf..97c1ea30 100644
--- a/plugin/src/views/history-view.ts
+++ b/plugin/src/views/history-view.ts
@@ -1,6 +1,7 @@
 import type { WorkspaceLeaf } from "obsidian";
 import { ItemView } from "obsidian";
-import { SyncHistory, SyncType } from "src/tracing/sync-history";
+import type { SyncHistory} from "src/tracing/sync-history";
+import { SyncType } from "src/tracing/sync-history";
 import { SyncSource, SyncStatus } from "src/tracing/sync-history";
 import { intlFormatDistance } from "date-fns";
 import type { Database } from "src/database/database";

From c1bc2def4f83833dd3712d7ff8d07a18ad9cd4dd Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 3 Jan 2025 18:26:17 +0000
Subject: [PATCH 091/761] Bump versions to 0.0.10

---
 backend/Cargo.lock             | 8 ++++----
 backend/fuzz/Cargo.toml        | 2 +-
 backend/reconcile/Cargo.toml   | 2 +-
 backend/sync_lib/Cargo.toml    | 2 +-
 backend/sync_server/Cargo.toml | 2 +-
 manifest.json                  | 2 +-
 plugin/manifest.json           | 2 +-
 plugin/package-lock.json       | 4 ++--
 plugin/package.json            | 4 ++--
 9 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index f5cbc7c9..d707c01f 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1481,7 +1481,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile"
-version = "0.0.9"
+version = "0.0.10"
 dependencies = [
  "insta",
  "pretty_assertions",
@@ -1491,7 +1491,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile-fuzz"
-version = "0.0.9"
+version = "0.0.10"
 dependencies = [
  "libfuzzer-sys",
  "reconcile",
@@ -2097,7 +2097,7 @@ dependencies = [
 
 [[package]]
 name = "sync_lib"
-version = "0.0.9"
+version = "0.0.10"
 dependencies = [
  "base64 0.22.1",
  "console_error_panic_hook",
@@ -2110,7 +2110,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.0.9"
+version = "0.0.10"
 dependencies = [
  "aide",
  "anyhow",
diff --git a/backend/fuzz/Cargo.toml b/backend/fuzz/Cargo.toml
index c57b2333..e381d5eb 100644
--- a/backend/fuzz/Cargo.toml
+++ b/backend/fuzz/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "reconcile-fuzz"
-version = "0.0.9"
+version = "0.0.10"
 publish = false
 edition = "2021"
 
diff --git a/backend/reconcile/Cargo.toml b/backend/reconcile/Cargo.toml
index 8fd2a68e..fb2df176 100644
--- a/backend/reconcile/Cargo.toml
+++ b/backend/reconcile/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "reconcile"
-version = "0.0.9"
+version = "0.0.10"
 edition = "2021"
 
 [dependencies]
diff --git a/backend/sync_lib/Cargo.toml b/backend/sync_lib/Cargo.toml
index 62d74a1e..4a2b7f24 100644
--- a/backend/sync_lib/Cargo.toml
+++ b/backend/sync_lib/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sync_lib"
-version = "0.0.9"
+version = "0.0.10"
 authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2018"
 
diff --git a/backend/sync_server/Cargo.toml b/backend/sync_server/Cargo.toml
index d86bc4c6..57f6ae03 100644
--- a/backend/sync_server/Cargo.toml
+++ b/backend/sync_server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sync_server"
-version = "0.0.9"
+version = "0.0.10"
 edition = "2021"
 
 [dependencies]
diff --git a/manifest.json b/manifest.json
index 2542d12d..314baf9f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.0.9",
+	"version": "0.0.10",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/plugin/manifest.json b/plugin/manifest.json
index 2542d12d..314baf9f 100644
--- a/plugin/manifest.json
+++ b/plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.0.9",
+	"version": "0.0.10",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/plugin/package-lock.json b/plugin/package-lock.json
index 4cbe8da8..92d43801 100644
--- a/plugin/package-lock.json
+++ b/plugin/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "obsidian-sample-plugin",
-	"version": "0.0.9",
+	"version": "0.0.10",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "obsidian-sample-plugin",
-			"version": "0.0.9",
+			"version": "0.0.10",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
diff --git a/plugin/package.json b/plugin/package.json
index 03932ce5..3339c657 100644
--- a/plugin/package.json
+++ b/plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "obsidian-sample-plugin",
-	"version": "0.0.9",
+	"version": "0.0.10",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {
@@ -35,4 +35,4 @@
 		"typescript": "5.7.2",
 		"typescript-eslint": "8.18.0"
 	}
-}
\ No newline at end of file
+}

From 6796d43430e2e99b330568d6bf74f71f309a61ba Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 3 Jan 2025 20:05:44 +0000
Subject: [PATCH 092/761] Bump versions to 0.0.11

---
 backend/Cargo.lock             | 8 ++++----
 backend/fuzz/Cargo.toml        | 2 +-
 backend/reconcile/Cargo.toml   | 2 +-
 backend/sync_lib/Cargo.toml    | 2 +-
 backend/sync_server/Cargo.toml | 2 +-
 manifest.json                  | 2 +-
 plugin/manifest.json           | 2 +-
 plugin/package-lock.json       | 4 ++--
 plugin/package.json            | 2 +-
 9 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index d707c01f..78b2aa69 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1481,7 +1481,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile"
-version = "0.0.10"
+version = "0.0.11"
 dependencies = [
  "insta",
  "pretty_assertions",
@@ -1491,7 +1491,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile-fuzz"
-version = "0.0.10"
+version = "0.0.11"
 dependencies = [
  "libfuzzer-sys",
  "reconcile",
@@ -2097,7 +2097,7 @@ dependencies = [
 
 [[package]]
 name = "sync_lib"
-version = "0.0.10"
+version = "0.0.11"
 dependencies = [
  "base64 0.22.1",
  "console_error_panic_hook",
@@ -2110,7 +2110,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.0.10"
+version = "0.0.11"
 dependencies = [
  "aide",
  "anyhow",
diff --git a/backend/fuzz/Cargo.toml b/backend/fuzz/Cargo.toml
index e381d5eb..259d0acc 100644
--- a/backend/fuzz/Cargo.toml
+++ b/backend/fuzz/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "reconcile-fuzz"
-version = "0.0.10"
+version = "0.0.11"
 publish = false
 edition = "2021"
 
diff --git a/backend/reconcile/Cargo.toml b/backend/reconcile/Cargo.toml
index fb2df176..6d57e18a 100644
--- a/backend/reconcile/Cargo.toml
+++ b/backend/reconcile/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "reconcile"
-version = "0.0.10"
+version = "0.0.11"
 edition = "2021"
 
 [dependencies]
diff --git a/backend/sync_lib/Cargo.toml b/backend/sync_lib/Cargo.toml
index 4a2b7f24..11c1f5c1 100644
--- a/backend/sync_lib/Cargo.toml
+++ b/backend/sync_lib/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sync_lib"
-version = "0.0.10"
+version = "0.0.11"
 authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2018"
 
diff --git a/backend/sync_server/Cargo.toml b/backend/sync_server/Cargo.toml
index 57f6ae03..10d3f630 100644
--- a/backend/sync_server/Cargo.toml
+++ b/backend/sync_server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sync_server"
-version = "0.0.10"
+version = "0.0.11"
 edition = "2021"
 
 [dependencies]
diff --git a/manifest.json b/manifest.json
index 314baf9f..14ec9e25 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.0.10",
+	"version": "0.0.11",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/plugin/manifest.json b/plugin/manifest.json
index 314baf9f..14ec9e25 100644
--- a/plugin/manifest.json
+++ b/plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.0.10",
+	"version": "0.0.11",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/plugin/package-lock.json b/plugin/package-lock.json
index 92d43801..06e53195 100644
--- a/plugin/package-lock.json
+++ b/plugin/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "obsidian-sample-plugin",
-	"version": "0.0.10",
+	"version": "0.0.11",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "obsidian-sample-plugin",
-			"version": "0.0.10",
+			"version": "0.0.11",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
diff --git a/plugin/package.json b/plugin/package.json
index 3339c657..1c11521d 100644
--- a/plugin/package.json
+++ b/plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "obsidian-sample-plugin",
-	"version": "0.0.10",
+	"version": "0.0.11",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {

From 825d398dec5455af2ba339da7128325ac4e019f7 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 3 Jan 2025 20:07:40 +0000
Subject: [PATCH 093/761] Fix tests

---
 plugin/jest.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin/jest.config.js b/plugin/jest.config.js
index 64bd511f..840a552a 100644
--- a/plugin/jest.config.js
+++ b/plugin/jest.config.js
@@ -1,6 +1,6 @@
 module.exports = {
 	testEnvironment: "node",
-	moduleFileExtensions: ["ts"],
+	moduleFileExtensions: ["js", "ts"],
 	testMatch: ["**/src/**/*.test.ts"],
 	transform: {
 		"^.+\\.(ts|tsx)$": "ts-jest",

From 44cb7a5b7c65c61ad69d30aae2e064fcfa9e566f Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 3 Jan 2025 22:30:30 +0000
Subject: [PATCH 094/761] Fix up is binary & sync_lib docs & tests

---
 .github/workflows/check.yml                   |  2 +
 backend/Cargo.lock                            |  1 +
 backend/sync_lib/Cargo.toml                   |  1 +
 backend/sync_lib/src/errors.rs                | 13 -----
 backend/sync_lib/src/lib.rs                   | 46 +++++++++--------
 .../snapshots/web__base64_to_bytes_error.snap | 10 ++++
 backend/sync_lib/tests/web.rs                 | 49 ++++++++++++++++---
 7 files changed, 80 insertions(+), 42 deletions(-)
 create mode 100644 backend/sync_lib/tests/snapshots/web__base64_to_bytes_error.snap

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index e69043f5..1a89b27c 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -43,6 +43,8 @@ jobs:
         run: |
           cd backend
           cargo test --verbose
+          cd sync_lib
+          wasm-pack test --node
 
       - name: Lint frontend
         run: |
diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 78b2aa69..dbeff8be 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -2102,6 +2102,7 @@ dependencies = [
  "base64 0.22.1",
  "console_error_panic_hook",
  "getrandom",
+ "insta",
  "reconcile",
  "thiserror",
  "wasm-bindgen",
diff --git a/backend/sync_lib/Cargo.toml b/backend/sync_lib/Cargo.toml
index 11c1f5c1..864443fe 100644
--- a/backend/sync_lib/Cargo.toml
+++ b/backend/sync_lib/Cargo.toml
@@ -22,6 +22,7 @@ console_error_panic_hook = { version = "0.1.7", optional = true }
 
 [dev-dependencies]
 wasm-bindgen-test = "0.3.34"
+insta = "1.41.1"
 
 [features]
 default = ["console_error_panic_hook"]
diff --git a/backend/sync_lib/src/errors.rs b/backend/sync_lib/src/errors.rs
index 68bc71cd..c09eafb1 100644
--- a/backend/sync_lib/src/errors.rs
+++ b/backend/sync_lib/src/errors.rs
@@ -1,5 +1,3 @@
-use std::str::Utf8Error;
-
 use base64::DecodeError;
 use thiserror::Error;
 use wasm_bindgen::JsValue;
@@ -8,9 +6,6 @@ use wasm_bindgen::JsValue;
 pub enum SyncLibError {
     #[error("Base64 decoding error because of {}", .reason)]
     Base64DecodingError { reason: String },
-
-    #[error("Bytes cannot be decoded as UTF-8 string because of {}", .reason)]
-    StringDecodingError { reason: String },
 }
 
 impl From<DecodeError> for SyncLibError {
@@ -21,14 +16,6 @@ impl From<DecodeError> for SyncLibError {
     }
 }
 
-impl From<Utf8Error> for SyncLibError {
-    fn from(e: Utf8Error) -> Self {
-        SyncLibError::StringDecodingError {
-            reason: e.to_string(),
-        }
-    }
-}
-
 impl From<std::string::FromUtf8Error> for SyncLibError {
     fn from(e: std::string::FromUtf8Error) -> Self {
         SyncLibError::Base64DecodingError {
diff --git a/backend/sync_lib/src/lib.rs b/backend/sync_lib/src/lib.rs
index 9832c5ba..2258dee2 100644
--- a/backend/sync_lib/src/lib.rs
+++ b/backend/sync_lib/src/lib.rs
@@ -6,53 +6,57 @@ use wasm_bindgen::prelude::*;
 
 pub mod errors;
 
+/// Encode binary data for easy transport over HTTP. Inverse of
+/// `base64_to_bytes`.
 #[wasm_bindgen(js_name = bytesToBase64)]
 pub fn bytes_to_base64(input: &[u8]) -> String { STANDARD_NO_PAD.encode(input) }
 
-#[wasm_bindgen(js_name = stringToBase64)]
-pub fn string_to_base64(input: &str) -> String { bytes_to_base64(input.as_bytes()) }
-
+/// Inverse of `bytes_to_base64`.
 #[wasm_bindgen(js_name = base64ToBytes)]
 pub fn base64_to_bytes(input: &str) -> Result<Vec<u8>, SyncLibError> {
     STANDARD_NO_PAD.decode(input).map_err(SyncLibError::from)
 }
 
-#[wasm_bindgen(js_name = base64ToString)]
-pub fn base64_to_string(input: &str) -> Result<String, SyncLibError> {
-    let bytes = base64_to_bytes(input)?;
-    String::from_utf8(bytes).map_err(SyncLibError::from)
-}
-
+/// Merge two documents with a common parent. Relies on `reconcile::reconcile`
+/// for texts and returns the right document as-is if either of the updated
+/// documents is binary.
 #[wasm_bindgen]
-pub fn merge(parent: &[u8], left: &[u8], right: &[u8]) -> Result<Vec<u8>, SyncLibError> {
-    Ok(if is_binary(right) {
+pub fn merge(parent: &[u8], left: &[u8], right: &[u8]) -> Vec<u8> {
+    if is_binary(parent) || is_binary(left) || is_binary(right) {
         right.to_vec()
     } else {
         reconcile::reconcile(
-            str::from_utf8(parent).map_err(SyncLibError::from)?,
-            str::from_utf8(left).map_err(SyncLibError::from)?,
-            str::from_utf8(right).map_err(SyncLibError::from)?,
+            str::from_utf8(parent).expect("parent must be valid UTF-8 because it's not binary"),
+            str::from_utf8(left).expect("left must be valid UTF-8 because it's not binary"),
+            str::from_utf8(right).expect("right must be valid UTF-8 because it's not binary"),
         )
         .into_bytes()
-    })
+    }
 }
 
+/// WASM wrapper around `reconcile::reconcile` for text merging.
 #[wasm_bindgen(js_name = mergeText)]
 pub fn merge_text(parent: &str, left: &str, right: &str) -> String {
     reconcile::reconcile(parent, left, right)
 }
 
+/// Heuristically determine if the given data is a binary or a text file's
+/// content.
 #[wasm_bindgen(js_name = isBinary)]
-pub fn is_binary(data: &[u8]) -> bool { std::str::from_utf8(data).is_ok() }
+pub fn is_binary(data: &[u8]) -> bool {
+    if data.iter().any(|&b| b == 0) {
+        // Even though the NUL character is valid in UTF-8, it's highly suspicious in
+        // human-readable text.
+        return true;
+    }
 
+    std::str::from_utf8(data).is_err()
+}
+
+/// Set up panic hook for better error messages in the browser console.
 #[cfg(feature = "console_error_panic_hook")]
 #[wasm_bindgen(js_name = setPanicHook)]
 pub fn set_panic_hook() {
-    // When the `console_error_panic_hook` feature is enabled, we can call the
-    // `set_panic_hook` function at least once during initialization, and then
-    // we will get better error messages if our code ever panics.
-    //
-    // For more details see
     // https://github.com/rustwasm/console_error_panic_hook#readme
     console_error_panic_hook::set_once();
 }
diff --git a/backend/sync_lib/tests/snapshots/web__base64_to_bytes_error.snap b/backend/sync_lib/tests/snapshots/web__base64_to_bytes_error.snap
new file mode 100644
index 00000000..fa178767
--- /dev/null
+++ b/backend/sync_lib/tests/snapshots/web__base64_to_bytes_error.snap
@@ -0,0 +1,10 @@
+---
+source: sync_lib/tests/web.rs
+expression: base64_to_bytes(input)
+snapshot_kind: text
+---
+Err(
+    Base64DecodingError {
+        reason: "Invalid symbol 61, offset 0.",
+    },
+)
diff --git a/backend/sync_lib/tests/web.rs b/backend/sync_lib/tests/web.rs
index de5c1daf..642ceaae 100644
--- a/backend/sync_lib/tests/web.rs
+++ b/backend/sync_lib/tests/web.rs
@@ -1,13 +1,46 @@
 //! Test suite for the Web and headless browsers.
 
-#![cfg(target_arch = "wasm32")]
-
-extern crate wasm_bindgen_test;
+use insta::assert_debug_snapshot;
+use sync_lib::*;
 use wasm_bindgen_test::*;
 
-wasm_bindgen_test_configure!(run_in_browser);
-
-#[wasm_bindgen_test]
-fn pass() {
-    assert_eq!(1 + 1, 2);
+#[wasm_bindgen_test(unsupported = test)]
+fn test_bytes_to_base64() {
+    let input = b"hello";
+    let expected = "aGVsbG8";
+    assert_eq!(bytes_to_base64(input), expected);
+}
+
+#[wasm_bindgen_test(unsupported = test)]
+fn test_base64_to_bytes() {
+    let input = "aGVsbG8";
+    let expected = b"hello".to_vec();
+    assert_eq!(base64_to_bytes(input).unwrap(), expected);
+}
+
+#[test] // insta doesn't support wasm-bindgen-test
+fn test_base64_to_bytes_error() {
+    let input = "===";
+    assert_debug_snapshot!(base64_to_bytes(input));
+}
+
+#[wasm_bindgen_test(unsupported = test)]
+fn merge_text() {
+    let left = b"hello ";
+    let right = b"world";
+    assert_eq!(merge(b"", left, right), b"hello world".to_vec());
+}
+
+#[wasm_bindgen_test(unsupported = test)]
+fn merge_binary() {
+    let left = [0, 1, 2];
+    let right = [3, 4, 5];
+    assert_eq!(merge(b"", &left, &right), right);
+}
+
+#[wasm_bindgen_test(unsupported = test)]
+fn test_is_binary() {
+    assert!(is_binary(&[0, 159, 146, 150]));
+    assert!(is_binary(&[0, 12]));
+    assert!(!is_binary(b"hello"));
 }

From 752efd7a2727222c8827f300c89809bdfd81872b Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 3 Jan 2025 22:30:46 +0000
Subject: [PATCH 095/761] Use new API

---
 backend/sync_server/src/server/create_document.rs | 4 +---
 backend/sync_server/src/server/update_document.rs | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/backend/sync_server/src/server/create_document.rs b/backend/sync_server/src/server/create_document.rs
index fc55b022..c99af9c0 100644
--- a/backend/sync_server/src/server/create_document.rs
+++ b/backend/sync_server/src/server/create_document.rs
@@ -78,9 +78,7 @@ pub async fn create_document(
             &[], // the empty string is the first common parent of the two documents,
             &existing_version.content,
             &content_bytes,
-        )
-        .context("Failed to decode bytes as UTF-8")
-        .map_err(client_error)?;
+        );
 
         StoredDocumentVersion {
             vault_id,
diff --git a/backend/sync_server/src/server/update_document.rs b/backend/sync_server/src/server/update_document.rs
index 9ef1b17b..9fc06a35 100644
--- a/backend/sync_server/src/server/update_document.rs
+++ b/backend/sync_server/src/server/update_document.rs
@@ -103,9 +103,7 @@ pub async fn update_document(
         &parent_document.content,
         &latest_version.content,
         &content_bytes,
-    )
-    .context("Failed to decode bytes as UTF-8")
-    .map_err(client_error)?;
+    );
 
     // We can only update the relative path if we're the first one to do so
     let new_relative_path = if parent_document.relative_path == latest_version.relative_path {

From 183e8eee5b6fb0a5a96880b9cc5866adaecf5eff Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 3 Jan 2025 22:30:56 +0000
Subject: [PATCH 096/761] Bump versions to 0.0.12

---
 backend/Cargo.lock             | 8 ++++----
 backend/fuzz/Cargo.toml        | 2 +-
 backend/reconcile/Cargo.toml   | 2 +-
 backend/sync_lib/Cargo.toml    | 2 +-
 backend/sync_server/Cargo.toml | 2 +-
 manifest.json                  | 2 +-
 plugin/manifest.json           | 2 +-
 plugin/package-lock.json       | 4 ++--
 plugin/package.json            | 2 +-
 9 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index dbeff8be..885470b7 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1481,7 +1481,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile"
-version = "0.0.11"
+version = "0.0.12"
 dependencies = [
  "insta",
  "pretty_assertions",
@@ -1491,7 +1491,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile-fuzz"
-version = "0.0.11"
+version = "0.0.12"
 dependencies = [
  "libfuzzer-sys",
  "reconcile",
@@ -2097,7 +2097,7 @@ dependencies = [
 
 [[package]]
 name = "sync_lib"
-version = "0.0.11"
+version = "0.0.12"
 dependencies = [
  "base64 0.22.1",
  "console_error_panic_hook",
@@ -2111,7 +2111,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.0.11"
+version = "0.0.12"
 dependencies = [
  "aide",
  "anyhow",
diff --git a/backend/fuzz/Cargo.toml b/backend/fuzz/Cargo.toml
index 259d0acc..ad1030e7 100644
--- a/backend/fuzz/Cargo.toml
+++ b/backend/fuzz/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "reconcile-fuzz"
-version = "0.0.11"
+version = "0.0.12"
 publish = false
 edition = "2021"
 
diff --git a/backend/reconcile/Cargo.toml b/backend/reconcile/Cargo.toml
index 6d57e18a..32e521c4 100644
--- a/backend/reconcile/Cargo.toml
+++ b/backend/reconcile/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "reconcile"
-version = "0.0.11"
+version = "0.0.12"
 edition = "2021"
 
 [dependencies]
diff --git a/backend/sync_lib/Cargo.toml b/backend/sync_lib/Cargo.toml
index 864443fe..0df4b657 100644
--- a/backend/sync_lib/Cargo.toml
+++ b/backend/sync_lib/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sync_lib"
-version = "0.0.11"
+version = "0.0.12"
 authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2018"
 
diff --git a/backend/sync_server/Cargo.toml b/backend/sync_server/Cargo.toml
index 10d3f630..b79f8f65 100644
--- a/backend/sync_server/Cargo.toml
+++ b/backend/sync_server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sync_server"
-version = "0.0.11"
+version = "0.0.12"
 edition = "2021"
 
 [dependencies]
diff --git a/manifest.json b/manifest.json
index 14ec9e25..73bb7d40 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.0.11",
+	"version": "0.0.12",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/plugin/manifest.json b/plugin/manifest.json
index 14ec9e25..73bb7d40 100644
--- a/plugin/manifest.json
+++ b/plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.0.11",
+	"version": "0.0.12",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/plugin/package-lock.json b/plugin/package-lock.json
index 06e53195..5fb7736d 100644
--- a/plugin/package-lock.json
+++ b/plugin/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "obsidian-sample-plugin",
-	"version": "0.0.11",
+	"version": "0.0.12",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "obsidian-sample-plugin",
-			"version": "0.0.11",
+			"version": "0.0.12",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
diff --git a/plugin/package.json b/plugin/package.json
index 1c11521d..efb47d02 100644
--- a/plugin/package.json
+++ b/plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "obsidian-sample-plugin",
-	"version": "0.0.11",
+	"version": "0.0.12",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {

From b9cf16be188e78ec4af213a63703273d93340d0c Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 3 Jan 2025 22:38:34 +0000
Subject: [PATCH 097/761] Test on firefox instead

---
 .github/workflows/check.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 1a89b27c..8d7017c7 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -44,7 +44,7 @@ jobs:
           cd backend
           cargo test --verbose
           cd sync_lib
-          wasm-pack test --node
+          wasm-pack test --firefox --headless
 
       - name: Lint frontend
         run: |

From 8ab64b170a8e2755a59d88b4f832279936b9ca07 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 3 Jan 2025 23:26:55 +0000
Subject: [PATCH 098/761] Improve history view UX

---
 plugin/src/styles.scss           |  34 ++++++---
 plugin/src/views/history-view.ts | 119 ++++++++++++++++++++++---------
 2 files changed, 110 insertions(+), 43 deletions(-)

diff --git a/plugin/src/styles.scss b/plugin/src/styles.scss
index de36c529..1de9a20b 100644
--- a/plugin/src/styles.scss
+++ b/plugin/src/styles.scss
@@ -5,7 +5,7 @@
 		padding: var(--size-2-1) var(--size-4-1);
 		border-radius: var(--radius-s);
 		background-color: var(--color-base-30);
-		font-family: var(--font-monospace-default);
+		font-family: var(--font-monospace);
 		font-weight: var(--bold-weight);
 		font-size: var(--font-ui-small);
 
@@ -85,7 +85,7 @@
 }
 
 .log-message {
-	font: var(--font-monospace-theme);
+	font: var(--font-monospace);
 
 	&.DEBUG {
 		color: var(--color-base-50);
@@ -105,10 +105,15 @@
 }
 
 .history-card {
-	padding: var(--size-4-4) var(--size-4-6);
+	padding: var(--size-4-4);
 	margin: var(--size-4-2);
 	background-color: var(--color-base-00);
 	border-radius: var(--radius-l);
+	container-type: inline-size;
+
+	&.clickable {
+		cursor: pointer;
+	}
 
 	&.success {
 		background-color: rgba(var(--color-green-rgb), 0.2);
@@ -118,29 +123,36 @@
 		background-color: rgba(var(--color-red-rgb), 0.2);
 	}
 
-	* {
-		margin: 0;
-		padding: 0;
-	}
-
 	.history-card-header {
 		display: flex;
 		justify-content: space-between;
 		align-items: center;
-		margin-bottom: var(--size-4-4);
+		margin-bottom: var(--size-4-2);
+		gap: var(--size-4-2);
+
+		@container (max-width: 300px) {
+			flex-direction: column;
+			align-items: flex-start;
+		}
 
 		.history-card-title {
-			font: var(--font-monospace-theme);
+			font: var(--font-monospace);
+			display: flex;
+			gap: var(--size-4-2);
+			word-break: break-all;
+			margin: 0;
 		}
 
 		.history-card-timestamp {
 			font-size: var(--font-ui-small);
-			color: var(--color-base-70);
+			font-style: italic;
+			color: var(--italic-color);
 		}
 	}
 
 	.history-card-message {
 		font-size: var(--font-ui-medium);
 		color: var(--color-base-70);
+		margin: 0;
 	}
 }
diff --git a/plugin/src/views/history-view.ts b/plugin/src/views/history-view.ts
index 97c1ea30..1ce3036e 100644
--- a/plugin/src/views/history-view.ts
+++ b/plugin/src/views/history-view.ts
@@ -1,6 +1,6 @@
-import type { WorkspaceLeaf } from "obsidian";
-import { ItemView } from "obsidian";
-import type { SyncHistory} from "src/tracing/sync-history";
+import type { IconName, WorkspaceLeaf } from "obsidian";
+import { ItemView, setIcon } from "obsidian";
+import type { HistoryEntry, SyncHistory } from "src/tracing/sync-history";
 import { SyncType } from "src/tracing/sync-history";
 import { SyncSource, SyncStatus } from "src/tracing/sync-history";
 import { intlFormatDistance } from "date-fns";
@@ -25,32 +25,51 @@ export class HistoryView extends ItemView {
 		});
 	}
 
-	private static formatSyncType(type: SyncType | undefined): string {
+	private static getSyncTypeIcon(type: SyncType | undefined): IconName {
 		switch (type) {
 			case SyncType.CREATE:
-				return "👶 ";
+				return "file-plus";
 			case SyncType.DELETE:
-				return "🗑️ ";
+				return "trash-2";
 			case SyncType.UPDATE:
-				return "✍️ ";
+				return "file-pen-line";
 			case undefined:
 			default:
 				return "";
 		}
 	}
 
-	private static formatSource(source: SyncSource | undefined): string {
+	private static getSyncSourceIcon(source: SyncSource | undefined): IconName {
 		switch (source) {
 			case SyncSource.PUSH:
-				return " ⤴️";
+				return "upload";
 			case SyncSource.PULL:
-				return " ⤵️";
+				return "download";
 			case undefined:
 			default:
 				return "";
 		}
 	}
 
+	private static renderSyncItemTitle(
+		element: HTMLElement,
+		entry: HistoryEntry
+	): void {
+		const syncTypeIcon = HistoryView.getSyncTypeIcon(entry.type);
+		if (syncTypeIcon) {
+			setIcon(element.createDiv(), syncTypeIcon);
+		}
+
+		element.createEl("span", {
+			text: entry.relativePath,
+		});
+
+		const syncSourceIcon = HistoryView.getSyncSourceIcon(entry.source);
+		if (syncSourceIcon) {
+			setIcon(element.createDiv(), syncSourceIcon);
+		}
+	}
+
 	public getViewType(): string {
 		return HistoryView.TYPE;
 	}
@@ -76,34 +95,70 @@ export class HistoryView extends ItemView {
 		container.empty();
 		container.createEl("h4", { text: "VaultLink History" });
 
-		this.history
+		const entries = this.history
 			.getEntries()
 			.reverse()
 			.filter(
 				(entry) =>
 					entry.status !== SyncStatus.NO_OP ||
 					this.database.getSettings().displayNoopSyncEvents
-			)
-			.forEach((entry) => {
-				const card = container.createDiv({
+			);
+
+		entries.forEach((entry) => {
+			container.createDiv(
+				{
 					cls: ["history-card", entry.status.toLocaleLowerCase()],
-				});
-				const header = card.createDiv({ cls: "history-card-header" });
-				header.createEl("h5", {
-					text:
-						HistoryView.formatSyncType(entry.type) +
-						entry.relativePath +
-						HistoryView.formatSource(entry.source),
-					cls: "history-card-title",
-				});
-				header.createSpan({
-					text: intlFormatDistance(entry.timestamp, new Date()),
-					cls: "history-card-timestamp",
-				});
-				card.createEl("p", {
-					text: entry.message,
-					cls: "history-card-message",
-				});
-			});
+				},
+				(card) => {
+					if (
+						this.app.vault.getFileByPath(entry.relativePath) !==
+						null
+					) {
+						card.addEventListener("click", () => {
+							void this.app.workspace.openLinkText(
+								entry.relativePath,
+								entry.relativePath,
+								false
+							);
+						});
+
+						card.addClass("clickable");
+					}
+
+					card.createDiv(
+						{
+							cls: "history-card-header",
+						},
+						(header) => {
+							header.createEl(
+								"h5",
+								{
+									cls: "history-card-title",
+								},
+								(title) => {
+									HistoryView.renderSyncItemTitle(
+										title,
+										entry
+									);
+								}
+							);
+
+							header.createSpan({
+								text: intlFormatDistance(
+									entry.timestamp,
+									new Date()
+								),
+								cls: "history-card-timestamp",
+							});
+						}
+					);
+
+					card.createEl("p", {
+						text: `${entry.message}.`,
+						cls: "history-card-message",
+					});
+				}
+			);
+		});
 	}
 }

From 319dabfbbc21c583a8ff22ff937019d3eb745e66 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 3 Jan 2025 23:30:22 +0000
Subject: [PATCH 099/761] Always render settings description

---
 plugin/src/views/settings-tab.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugin/src/views/settings-tab.ts b/plugin/src/views/settings-tab.ts
index 4b6fa129..aea8a4c8 100644
--- a/plugin/src/views/settings-tab.ts
+++ b/plugin/src/views/settings-tab.ts
@@ -71,6 +71,7 @@ export class SyncSettingsTab extends PluginSettingTab {
 				descriptionContainer
 			);
 		};
+		this.statusDescriptionSubscription();
 		this.statusDescription.addStatusChangeListener(
 			this.statusDescriptionSubscription
 		);

From 70c4846c73308e05df1a3531e9ac562151652837 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 4 Jan 2025 10:21:09 +0000
Subject: [PATCH 100/761] Try runnig self-hsoted docker build

---
 .github/workflows/publish-docker.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml
index c5a4a4a0..433bd93e 100644
--- a/.github/workflows/publish-docker.yml
+++ b/.github/workflows/publish-docker.yml
@@ -7,8 +7,7 @@ name: Publish server Docker image
 
 on:
   push:
-    tags:
-      - "*"
+    branches: ["master"]
 
 env:
   # Use docker.io for Docker Hub if empty
@@ -17,8 +16,9 @@ env:
   IMAGE_NAME: ${{ github.repository }}
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
+  build-docker:
+    runs-on: self-hosted
+
     permissions:
       contents: read
       packages: write

From b2ecb98ec6179696ab4ab4db0fdf5833fcad2865 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 4 Jan 2025 10:34:24 +0000
Subject: [PATCH 101/761] Add sync_lib crate docs

---
 backend/sync_lib/src/lib.rs | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/backend/sync_lib/src/lib.rs b/backend/sync_lib/src/lib.rs
index 2258dee2..2f3ec663 100644
--- a/backend/sync_lib/src/lib.rs
+++ b/backend/sync_lib/src/lib.rs
@@ -1,3 +1,13 @@
+//! This crate provides utilities for easily communicating between backend &
+//! frontend and ensuring the same logic for encoding and decoding binary data,
+//! and 3-way-merging documents in Rust and JavaScript.
+//!
+//! The crate is designed to be used as a Rust library and as a
+//! TypeScript/JavaScript package through WebAssembly (WASM).
+//!
+//! # Modules
+//!
+//! - `errors`: Contains error types used in this crate.
 use core::str;
 
 use base64::{engine::general_purpose::STANDARD_NO_PAD, Engine as _};

From 3ae0e7b896df9e33a4c9cea3f741731b9e797bc2 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 4 Jan 2025 10:34:34 +0000
Subject: [PATCH 102/761] Add server healthcheck

---
 backend/.dockerignore |  7 ++++++-
 backend/Dockerfile    | 14 +++++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/backend/.dockerignore b/backend/.dockerignore
index d4e6012f..e3630304 100644
--- a/backend/.dockerignore
+++ b/backend/.dockerignore
@@ -1,4 +1,9 @@
 target
 Dockerfile
 .dockerignore
-db.sqlite3
+db.sqlite3*
+*.log
+sync_lib/pkg
+fuzz/artifacts
+fuzz/corpus
+fuzz/coverage
diff --git a/backend/Dockerfile b/backend/Dockerfile
index a9da71b6..d94f75b8 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -14,10 +14,22 @@ RUN sqlx migrate run --source sync_server/src/database/migrations --database-url
 
 RUN cargo build --package sync_server --release --target x86_64-unknown-linux-musl
 
+# Runtime image
 FROM alpine:3.21.0
 
+LABEL org.opencontainers.image.authors="andras@schmelczer.dev"
+
+RUN apk add --no-cache curl
+
 COPY --from=builder /usr/src/backend/target/x86_64-unknown-linux-musl/release/sync_server /app/sync_server
 
-WORKDIR /data
+WORKDIR /app
+
+EXPOSE 3000/tcp
+
+HEALTHCHECK \
+    --interval=30s \
+    --timeout=5s \
+    CMD curl -f http://localhost:3000/ping || exit 1
 
 ENTRYPOINT ["/app/sync_server"]

From c41ce7ef68247c99cd2706516073f590c4ef6f38 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 4 Jan 2025 12:32:18 +0000
Subject: [PATCH 103/761] Don't return content in response if it's unchanged

---
 .../reconcile/src/operation_transformation.rs |  2 +
 .../sync_server/src/server/create_document.rs | 58 +++++++++++--------
 backend/sync_server/src/server/responses.rs   | 24 +++++++-
 .../sync_server/src/server/update_document.rs | 17 ++++--
 plugin/src/services/types.ts                  | 44 +++++++++++++-
 5 files changed, 113 insertions(+), 32 deletions(-)

diff --git a/backend/reconcile/src/operation_transformation.rs b/backend/reconcile/src/operation_transformation.rs
index 63b5c3cf..ef9a5e81 100644
--- a/backend/reconcile/src/operation_transformation.rs
+++ b/backend/reconcile/src/operation_transformation.rs
@@ -9,6 +9,7 @@ use crate::tokenizer::Tokenizer;
 
 #[must_use]
 pub fn reconcile(original: &str, left: &str, right: &str) -> String {
+    // Common trivial cases
     if left == right {
         return left.to_owned();
     }
@@ -21,6 +22,7 @@ pub fn reconcile(original: &str, left: &str, right: &str) -> String {
         return left.to_owned();
     }
 
+    // 3-way merge
     let left_operations = EditedText::from_strings(original, left);
     let right_operations = EditedText::from_strings(original, right);
 
diff --git a/backend/sync_server/src/server/create_document.rs b/backend/sync_server/src/server/create_document.rs
index c99af9c0..900095cc 100644
--- a/backend/sync_server/src/server/create_document.rs
+++ b/backend/sync_server/src/server/create_document.rs
@@ -12,10 +12,10 @@ use schemars::JsonSchema;
 use serde::Deserialize;
 use sync_lib::{base64_to_bytes, merge};
 
-use super::{auth::auth, requests::CreateDocumentVersion};
+use super::{auth::auth, requests::CreateDocumentVersion, responses::DocumentUpdateResponse};
 use crate::{
     app_state::AppState,
-    database::models::{DocumentVersion, StoredDocumentVersion, VaultId},
+    database::models::{StoredDocumentVersion, VaultId},
     errors::{client_error, server_error, SyncServerError},
 };
 
@@ -34,7 +34,7 @@ pub async fn create_document(
     Path(PathParams { vault_id }): Path<PathParams>,
     State(state): State<AppState>,
     Json(request): Json<CreateDocumentVersion>,
-) -> Result<Json<DocumentVersion>, SyncServerError> {
+) -> Result<Json<DocumentUpdateResponse>, SyncServerError> {
     auth(&state, auth_header.token())?;
 
     let mut transaction = state
@@ -56,22 +56,26 @@ pub async fn create_document(
         .map_err(server_error)?
         .and_then(|doc| if doc.is_deleted { None } else { Some(doc) });
 
-    let new_version = if let Some(existing_version) = maybe_existing_version {
-        let content_bytes = base64_to_bytes(&request.content_base64)
-            .context("Failed to decode base64 content in request")
-            .map_err(client_error)?;
+    let content_bytes = base64_to_bytes(&request.content_base64)
+        .context("Failed to decode base64 content in request")
+        .map_err(client_error)?;
 
+    let response = if let Some(existing_version) = maybe_existing_version {
         if content_bytes == existing_version.content {
             info!(
                 "Content of the new version is the same as the existing version. Not creating a \
                  new version."
             );
+
             transaction
                 .rollback()
                 .await
-                .context("Failed to rollback unecceseary transaction")
+                .context("Failed to roll back unecceseary transaction")
                 .map_err(server_error)?;
-            return Ok(Json(existing_version.into()));
+
+            return Ok(Json(DocumentUpdateResponse::FastForwardUpdate(
+                existing_version.into(),
+            )));
         }
 
         let merged_content = merge(
@@ -80,7 +84,7 @@ pub async fn create_document(
             &content_bytes,
         );
 
-        StoredDocumentVersion {
+        let new_version = StoredDocumentVersion {
             vault_id,
             vault_update_id: last_update_id + 1,
             relative_path: request.relative_path,
@@ -89,27 +93,35 @@ pub async fn create_document(
             created_date: request.created_date,
             updated_date: chrono::Utc::now(),
             is_deleted: false,
-        }
+        };
+
+        state
+            .database
+            .insert_document_version(&new_version, Some(&mut transaction))
+            .await
+            .map_err(server_error)?;
+
+        DocumentUpdateResponse::MergingUpdate(new_version.into())
     } else {
-        StoredDocumentVersion {
+        let new_version = StoredDocumentVersion {
             vault_id,
             vault_update_id: last_update_id + 1,
             document_id: uuid::Uuid::new_v4(),
             relative_path: request.relative_path,
-            content: base64_to_bytes(&request.content_base64)
-                .context("Cannot convert base64 encoded content to bytes")
-                .map_err(client_error)?,
+            content: content_bytes,
             created_date: request.created_date,
             updated_date: chrono::Utc::now(),
             is_deleted: false,
-        }
-    };
+        };
 
-    state
-        .database
-        .insert_document_version(&new_version, Some(&mut transaction))
-        .await
-        .map_err(server_error)?;
+        state
+            .database
+            .insert_document_version(&new_version, Some(&mut transaction))
+            .await
+            .map_err(server_error)?;
+
+        DocumentUpdateResponse::FastForwardUpdate(new_version.into())
+    };
 
     transaction
         .commit()
@@ -117,5 +129,5 @@ pub async fn create_document(
         .context("Failed to commit successful transaction")
         .map_err(server_error)?;
 
-    Ok(Json(new_version.into()))
+    Ok(Json(response))
 }
diff --git a/backend/sync_server/src/server/responses.rs b/backend/sync_server/src/server/responses.rs
index a869b0e0..5d76bb05 100644
--- a/backend/sync_server/src/server/responses.rs
+++ b/backend/sync_server/src/server/responses.rs
@@ -1,18 +1,40 @@
 use schemars::JsonSchema;
 use serde::{self, Serialize};
 
-use crate::database::models::{DocumentVersionWithoutContent, VaultUpdateId};
+use crate::database::models::{DocumentVersion, DocumentVersionWithoutContent, VaultUpdateId};
 
+/// Response to a ping request.
 #[derive(Debug, Clone, Serialize, JsonSchema)]
 #[serde(rename_all = "camelCase")]
 pub struct PingResponse {
+    /// Semantic version of the server.
     pub server_version: String,
+
+    /// Whether the client is authenticated based on the sent Authorization
+    /// header.
     pub is_authenticated: bool,
 }
 
+/// Response to a fetch latest documents request.
 #[derive(Debug, Clone, Serialize, JsonSchema)]
 #[serde(rename_all = "camelCase")]
 pub struct FetchLatestDocumentsResponse {
     pub latest_documents: Vec<DocumentVersionWithoutContent>,
+
+    /// The update ID of the latest document in the response.
     pub last_update_id: VaultUpdateId,
 }
+
+/// Response to a create/update document request.
+#[derive(Debug, Clone, Serialize, JsonSchema)]
+#[serde(tag = "type")]
+pub enum DocumentUpdateResponse {
+    /// Returned when the created/updated document's content is the same as was
+    /// sent in the create/update request and thus the response doesn't contain
+    /// the content because the client must already have it.
+    FastForwardUpdate(DocumentVersionWithoutContent),
+
+    /// Returned when the created/updated document's content is different from
+    /// what was sent in the create/update request.
+    MergingUpdate(DocumentVersion),
+}
diff --git a/backend/sync_server/src/server/update_document.rs b/backend/sync_server/src/server/update_document.rs
index 9fc06a35..50285399 100644
--- a/backend/sync_server/src/server/update_document.rs
+++ b/backend/sync_server/src/server/update_document.rs
@@ -12,10 +12,10 @@ use schemars::JsonSchema;
 use serde::Deserialize;
 use sync_lib::{base64_to_bytes, merge};
 
-use super::{auth::auth, requests::UpdateDocumentVersion};
+use super::{auth::auth, requests::UpdateDocumentVersion, responses::DocumentUpdateResponse};
 use crate::{
     app_state::AppState,
-    database::models::{DocumentId, DocumentVersion, StoredDocumentVersion, VaultId},
+    database::models::{DocumentId, StoredDocumentVersion, VaultId},
     errors::{client_error, not_found_error, server_error, SyncServerError},
 };
 
@@ -35,7 +35,7 @@ pub async fn update_document(
     }): Path<PathParams>,
     State(state): State<AppState>,
     Json(request): Json<UpdateDocumentVersion>,
-) -> Result<Json<DocumentVersion>, SyncServerError> {
+) -> Result<Json<DocumentUpdateResponse>, SyncServerError> {
     auth(&state, auth_header.token())?;
 
     // No need for a transaction as document versions are immutable
@@ -96,7 +96,9 @@ pub async fn update_document(
             .context("Failed to roll back transaction")
             .map_err(server_error)?;
 
-        return Ok(Json(latest_version.into()));
+        return Ok(Json(DocumentUpdateResponse::FastForwardUpdate(
+            latest_version.into(),
+        )));
     }
 
     let merged_content = merge(
@@ -104,6 +106,7 @@ pub async fn update_document(
         &latest_version.content,
         &content_bytes,
     );
+    let is_different_from_request_content = merged_content != content_bytes;
 
     // We can only update the relative path if we're the first one to do so
     let new_relative_path = if parent_document.relative_path == latest_version.relative_path {
@@ -135,5 +138,9 @@ pub async fn update_document(
         .context("Failed to commit successful transaction")
         .map_err(server_error)?;
 
-    Ok(Json(new_version.into()))
+    Ok(Json(if is_different_from_request_content {
+        DocumentUpdateResponse::MergingUpdate(new_version.into())
+    } else {
+        DocumentUpdateResponse::FastForwardUpdate(new_version.into())
+    }))
 }
diff --git a/plugin/src/services/types.ts b/plugin/src/services/types.ts
index bd51c68d..f8f748f1 100644
--- a/plugin/src/services/types.ts
+++ b/plugin/src/services/types.ts
@@ -111,7 +111,7 @@ export interface paths {
                         [name: string]: unknown;
                     };
                     content: {
-                        "application/json": components["schemas"]["DocumentVersion"];
+                        "application/json": components["schemas"]["DocumentUpdateResponse"];
                     };
                 };
                 default: {
@@ -192,7 +192,7 @@ export interface paths {
                         [name: string]: unknown;
                     };
                     content: {
-                        "application/json": components["schemas"]["DocumentVersion"];
+                        "application/json": components["schemas"]["DocumentUpdateResponse"];
                     };
                 };
                 default: {
@@ -261,6 +261,37 @@ export interface components {
             createdDate: string;
             relativePath: string;
         };
+        /** @description Response to a create/update document request. */
+        DocumentUpdateResponse: {
+            /** Format: date-time */
+            createdDate: string;
+            /** Format: uuid */
+            documentId: string;
+            isDeleted: boolean;
+            relativePath: string;
+            /** @enum {string} */
+            type: "FastForwardUpdate";
+            /** Format: date-time */
+            updatedDate: string;
+            vaultId: string;
+            /** Format: int64 */
+            vaultUpdateId: number;
+        } | {
+            contentBase64: string;
+            /** Format: date-time */
+            createdDate: string;
+            /** Format: uuid */
+            documentId: string;
+            isDeleted: boolean;
+            relativePath: string;
+            /** @enum {string} */
+            type: "MergingUpdate";
+            /** Format: date-time */
+            updatedDate: string;
+            vaultId: string;
+            /** Format: int64 */
+            vaultUpdateId: number;
+        };
         DocumentVersion: {
             contentBase64: string;
             /** Format: date-time */
@@ -288,8 +319,12 @@ export interface components {
             /** Format: int64 */
             vaultUpdateId: number;
         };
+        /** @description Response to a fetch latest documents request. */
         FetchLatestDocumentsResponse: {
-            /** Format: int64 */
+            /**
+             * Format: int64
+             * @description The update ID of the latest document in the response.
+             */
             lastUpdateId: number;
             latestDocuments: components["schemas"]["DocumentVersionWithoutContent"][];
         };
@@ -314,8 +349,11 @@ export interface components {
             document_id: string;
             vault_id: string;
         };
+        /** @description Response to a ping request. */
         PingResponse: {
+            /** @description Whether the client is authenticated based on the sent Authorization header. */
             isAuthenticated: boolean;
+            /** @description Semantic version of the server. */
             serverVersion: string;
         };
         QueryParams: {

From cacd0243dea9a6c8842c75cfdbb87b4f1a986508 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 4 Jan 2025 12:34:48 +0000
Subject: [PATCH 104/761] Remove extra hashing and only update changed files
 when syncing

---
 plugin/src/services/sync-service.ts  |   4 +-
 plugin/src/sync-operations/syncer.ts | 104 +++++++++++++--------------
 2 files changed, 50 insertions(+), 58 deletions(-)

diff --git a/plugin/src/services/sync-service.ts b/plugin/src/services/sync-service.ts
index d2c460cd..3f3a94a7 100644
--- a/plugin/src/services/sync-service.ts
+++ b/plugin/src/services/sync-service.ts
@@ -75,7 +75,7 @@ export class SyncService {
 		relativePath: RelativePath;
 		contentBytes: Uint8Array;
 		createdDate: Date;
-	}): Promise<components["schemas"]["DocumentVersion"]> {
+	}): Promise<components["schemas"]["DocumentUpdateResponse"]> {
 		const response = await this.client.POST(
 			"/vaults/{vault_id}/documents",
 			{
@@ -126,7 +126,7 @@ export class SyncService {
 		relativePath: RelativePath;
 		contentBytes: Uint8Array;
 		createdDate: Date;
-	}): Promise<components["schemas"]["DocumentVersion"]> {
+	}): Promise<components["schemas"]["DocumentUpdateResponse"]> {
 		const response = await this.client.PUT(
 			"/vaults/{vault_id}/documents/{document_id}",
 			{
diff --git a/plugin/src/sync-operations/syncer.ts b/plugin/src/sync-operations/syncer.ts
index 5fd70294..53507476 100644
--- a/plugin/src/sync-operations/syncer.ts
+++ b/plugin/src/sync-operations/syncer.ts
@@ -148,30 +148,16 @@ export class Syncer {
 							);
 						}
 
-						const content = await this.operations.read(
-							relativePath
+						Logger.getInstance().debug(
+							`Document ${relativePath} has been updated locally, scheduling sync to update it`
 						);
-						if (metadata.hash !== hash(content)) {
-							Logger.getInstance().debug(
-								`Document ${relativePath} has been updated locally, scheduling sync to update it`
-							);
-							return this.internalSyncLocallyUpdatedFile({
-								relativePath: relativePath,
-								updateTime:
-									await this.operations.getModificationTime(
-										relativePath
-									),
-							});
-						}
-
-						this.history.addHistoryEntry({
-							status: SyncStatus.NO_OP,
-							source: SyncSource.PUSH,
+						return this.internalSyncLocallyUpdatedFile({
 							relativePath,
-							message:
-								"Document hasn't been updated locally, no need to sync",
+							updateTime:
+								await this.operations.getModificationTime(
+									relativePath
+								),
 						});
-						return Promise.resolve();
 					})
 				)
 			);
@@ -218,7 +204,7 @@ export class Syncer {
 			SyncSource.PUSH,
 			async () => {
 				const contentBytes = await this.operations.read(relativePath);
-				const contentHash = hash(contentBytes);
+				let contentHash = hash(contentBytes);
 
 				const metadata = this.database.getDocument(relativePath);
 				if (metadata) {
@@ -251,10 +237,12 @@ export class Syncer {
 					type: SyncType.CREATE,
 				});
 
-				const responseBytes = lib.base64ToBytes(response.contentBase64);
-				const responseHash = hash(responseBytes);
+				if (response.type === "MergingUpdate") {
+					const responseBytes = lib.base64ToBytes(
+						response.contentBase64
+					);
+					contentHash = hash(responseBytes);
 
-				if (contentHash !== responseHash) {
 					await this.operations.write(
 						relativePath,
 						contentBytes,
@@ -273,7 +261,7 @@ export class Syncer {
 					documentId: response.documentId,
 					relativePath: response.relativePath,
 					parentVersionId: response.vaultUpdateId,
-					hash: responseHash,
+					hash: contentHash,
 				});
 
 				await this.tryIncrementVaultUpdateId(response.vaultUpdateId);
@@ -315,7 +303,7 @@ export class Syncer {
 				}
 
 				const contentBytes = await this.operations.read(relativePath);
-				const contentHash = hash(contentBytes);
+				let contentHash = hash(contentBytes);
 
 				if (metadata.hash === contentHash && oldPath === undefined) {
 					this.history.addHistoryEntry({
@@ -362,50 +350,54 @@ export class Syncer {
 					return;
 				}
 
-				const responseBytes = lib.base64ToBytes(response.contentBase64);
-				const responseHash = hash(responseBytes);
-
 				if (response.relativePath != relativePath) {
 					await waitForDocumentLock(response.relativePath);
+				}
 
-					try {
+				try {
+					if (response.relativePath != relativePath) {
 						await this.operations.move(
 							oldPath ?? relativePath,
 							response.relativePath
 						);
+					}
+
+					if (response.type === "MergingUpdate") {
+						const responseBytes = lib.base64ToBytes(
+							response.contentBase64
+						);
+						contentHash = hash(responseBytes);
 						await this.operations.write(
 							response.relativePath,
 							contentBytes,
 							responseBytes
 						);
-						this.history.addHistoryEntry({
-							status: SyncStatus.SUCCESS,
-							source: SyncSource.PULL,
-							relativePath,
-							message:
-								"The file we updated had been moved remotely, therefore, we have moved it locally as well",
-							type: SyncType.UPDATE,
-						});
-					} finally {
+					}
+
+					this.history.addHistoryEntry({
+						status: SyncStatus.SUCCESS,
+						source: SyncSource.PULL,
+						relativePath,
+						message: `The file we updated had been updated remotely, so we downloaded the merged version`,
+						type: SyncType.UPDATE,
+					});
+
+					await this.database.moveDocument({
+						documentId: metadata.documentId,
+						oldRelativePath: oldPath ?? relativePath,
+						relativePath: response.relativePath,
+						parentVersionId: response.vaultUpdateId,
+						hash: contentHash,
+					});
+
+					await this.tryIncrementVaultUpdateId(
+						response.vaultUpdateId
+					);
+				} finally {
+					if (response.relativePath != relativePath) {
 						unlockDocument(response.relativePath);
 					}
-				} else if (contentHash !== responseHash) {
-					await this.operations.write(
-						relativePath,
-						contentBytes,
-						responseBytes
-					);
 				}
-
-				await this.database.moveDocument({
-					documentId: metadata.documentId,
-					oldRelativePath: oldPath ?? relativePath,
-					relativePath: response.relativePath,
-					parentVersionId: response.vaultUpdateId,
-					hash: responseHash,
-				});
-
-				await this.tryIncrementVaultUpdateId(response.vaultUpdateId);
 			}
 		);
 	}

From dd86a507d18198ea9701ff993327195877f464ca Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 4 Jan 2025 12:39:53 +0000
Subject: [PATCH 105/761] Fix file delete & create order being different when
 fetching latest changes

---
 backend/sync_server/src/database.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/backend/sync_server/src/database.rs b/backend/sync_server/src/database.rs
index 46d46d07..94af31ff 100644
--- a/backend/sync_server/src/database.rs
+++ b/backend/sync_server/src/database.rs
@@ -89,6 +89,7 @@ impl Database {
                 is_deleted
             from latest_document_versions
             where is_deleted = false and vault_id = ?
+            order by vault_update_id desc
             "#,
             vault,
         );
@@ -122,6 +123,7 @@ impl Database {
                 is_deleted
             from latest_document_versions
             where vault_id = ? and vault_update_id > ?
+            order by vault_update_id desc
             "#,
             vault,
             vault_update_id

From b17e69edda320ef80313a22aa99c96d564cb5e6c Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 4 Jan 2025 14:48:42 +0000
Subject: [PATCH 106/761] Rename plugin

---
 plugin/esbuild.config.mjs                      |  2 +-
 plugin/package.json                            |  4 ++--
 plugin/src/{plugin.ts => vault-link-plugin.ts} | 18 ++++++++----------
 3 files changed, 11 insertions(+), 13 deletions(-)
 rename plugin/src/{plugin.ts => vault-link-plugin.ts} (92%)

diff --git a/plugin/esbuild.config.mjs b/plugin/esbuild.config.mjs
index a6fd86ad..e22093a2 100644
--- a/plugin/esbuild.config.mjs
+++ b/plugin/esbuild.config.mjs
@@ -123,7 +123,7 @@ const cssContext = await esbuild.context({
 });
 
 const jsContext = await esbuild.context({
-	entryPoints: ["src/plugin.ts"],
+	entryPoints: ["src/vault-link-plugin.ts"],
 	bundle: true,
 	external: [
 		"obsidian",
diff --git a/plugin/package.json b/plugin/package.json
index efb47d02..9d8bdf76 100644
--- a/plugin/package.json
+++ b/plugin/package.json
@@ -1,5 +1,5 @@
 {
-	"name": "obsidian-sample-plugin",
+	"name": "vault-link-obsidian-plugin",
 	"version": "0.0.12",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
@@ -35,4 +35,4 @@
 		"typescript": "5.7.2",
 		"typescript-eslint": "8.18.0"
 	}
-}
+}
\ No newline at end of file
diff --git a/plugin/src/plugin.ts b/plugin/src/vault-link-plugin.ts
similarity index 92%
rename from plugin/src/plugin.ts
rename to plugin/src/vault-link-plugin.ts
index 3b7be811..92996457 100644
--- a/plugin/src/plugin.ts
+++ b/plugin/src/vault-link-plugin.ts
@@ -3,22 +3,22 @@ import { Plugin } from "obsidian";
 
 import * as lib from "../../backend/sync_lib/pkg/sync_lib.js";
 import * as wasmBin from "../../backend/sync_lib/pkg/sync_lib_bg.wasm";
-import { SyncSettingsTab } from "./views/settings-tab";
+import { SyncSettingsTab } from "./views/settings-tab.js";
 import { HistoryView } from "./views/history-view.js";
 
 import { ObsidianFileEventHandler } from "./events/obisidan-event-handler.js";
-import { SyncService } from "./services/sync-service";
-import { Database } from "./database/database";
-import { applyRemoteChangesLocally } from "./sync-operations/apply-remote-changes-locally";
-import { ObsidianFileOperations } from "./file-operations/obsidian-file-operations";
-import { StatusBar } from "./views/status-bar";
+import { SyncService } from "./services/sync-service.js";
+import { Database } from "./database/database.js";
+import { applyRemoteChangesLocally } from "./sync-operations/apply-remote-changes-locally.js";
+import { ObsidianFileOperations } from "./file-operations/obsidian-file-operations.js";
+import { StatusBar } from "./views/status-bar.js";
 import { Logger } from "./tracing/logger.js";
 import { SyncHistory } from "./tracing/sync-history.js";
 import { LogsView } from "./views/logs-view.js";
 import { Syncer } from "./sync-operations/syncer.js";
 import { StatusDescription } from "./views/status-description.js";
 
-export default class SyncPlugin extends Plugin {
+export default class VaultLinkPlugin extends Plugin {
 	private readonly operations = new ObsidianFileOperations(this.app.vault);
 	private readonly history = new SyncHistory();
 	private settingsTab: SyncSettingsTab;
@@ -125,7 +125,7 @@ export default class SyncPlugin extends Plugin {
 			HistoryView.TYPE,
 			(leaf) => new HistoryView(leaf, database, this.history)
 		);
-		this.registerView(LogsView.TYPE, (leaf) => new LogsView(leaf));
+		this.registerView(LogsView.TYPE, (leaf) => new LogsView(this, leaf));
 
 		this.addRibbonIcon(
 			HistoryView.ICON,
@@ -139,8 +139,6 @@ export default class SyncPlugin extends Plugin {
 		);
 
 		Logger.getInstance().info("Plugin loaded");
-
-		this.openSettings();
 	}
 
 	public onunload(): void {

From 560e640b1b536744bda2cdc0b02502630ab714ef Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 4 Jan 2025 14:55:34 +0000
Subject: [PATCH 107/761] Fix settings change printing

---
 plugin/src/database/database.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/plugin/src/database/database.ts b/plugin/src/database/database.ts
index 70b3bcfa..e242f41c 100644
--- a/plugin/src/database/database.ts
+++ b/plugin/src/database/database.ts
@@ -88,12 +88,15 @@ export class Database {
 		key: T,
 		value: SyncSettings[T]
 	): Promise<void> {
+		let newSettings = { ...this._settings, [key]: value };
 		Logger.getInstance().debug(
 			`Setting ${key} to ${value}, new settings: ${JSON.stringify(
-				this._settings
+				newSettings,
+				null,
+				2
 			)}`
 		);
-		await this.setSettings({ ...this._settings, [key]: value });
+		await this.setSettings(newSettings);
 	}
 
 	public getLastSeenUpdateId(): VaultUpdateId | undefined {

From 46faa954b695ffedf15959428bf9fb54ec75d29a Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 4 Jan 2025 15:02:07 +0000
Subject: [PATCH 108/761] Fix log level precedence

---
 plugin/src/tracing/logger.ts | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/plugin/src/tracing/logger.ts b/plugin/src/tracing/logger.ts
index 3eb0101c..fdd86622 100644
--- a/plugin/src/tracing/logger.ts
+++ b/plugin/src/tracing/logger.ts
@@ -7,6 +7,13 @@ export enum LogLevel {
 	ERROR = "ERROR",
 }
 
+const LOG_LEVEL_ORDER = {
+	[LogLevel.DEBUG]: 0,
+	[LogLevel.INFO]: 1,
+	[LogLevel.WARNING]: 2,
+	[LogLevel.ERROR]: 3,
+};
+
 class LogLine {
 	public timestamp = new Date();
 	public constructor(public level: LogLevel, public message: string) {}
@@ -65,7 +72,9 @@ export class Logger {
 
 	public getMessages(mininumSeverity: LogLevel): LogLine[] {
 		return this.messages.filter(
-			(message) => message.level >= mininumSeverity
+			(message) =>
+				LOG_LEVEL_ORDER[message.level] >=
+				LOG_LEVEL_ORDER[mininumSeverity]
 		);
 	}
 
@@ -77,7 +86,9 @@ export class Logger {
 
 	public reset(): void {
 		this.messages.length = 0;
-		this.onMessageListeners.forEach((listener) => { listener(undefined); });
+		this.onMessageListeners.forEach((listener) => {
+			listener(undefined);
+		});
 	}
 
 	private pushMessage(message: string, level: LogLevel): void {
@@ -88,6 +99,8 @@ export class Logger {
 			this.messages.shift();
 		}
 
-		this.onMessageListeners.forEach((listener) => { listener(logLine); });
+		this.onMessageListeners.forEach((listener) => {
+			listener(logLine);
+		});
 	}
 }

From b3dec9f7cc1eb43723773422777ee642c181df08 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 4 Jan 2025 15:02:48 +0000
Subject: [PATCH 109/761] Refactor settings and add view settings sub-page

---
 plugin/src/database/sync-settings.ts |  4 ++
 plugin/src/views/settings-tab.ts     | 97 +++++++++++++++++++++++-----
 2 files changed, 84 insertions(+), 17 deletions(-)

diff --git a/plugin/src/database/sync-settings.ts b/plugin/src/database/sync-settings.ts
index 09ab9469..fcf7f88c 100644
--- a/plugin/src/database/sync-settings.ts
+++ b/plugin/src/database/sync-settings.ts
@@ -1,3 +1,5 @@
+import { LogLevel } from "src/tracing/logger";
+
 export interface SyncSettings {
 	remoteUri: string;
 	token: string;
@@ -6,6 +8,7 @@ export interface SyncSettings {
 	syncConcurrency: number;
 	isSyncEnabled: boolean;
 	displayNoopSyncEvents: boolean;
+	minimumLogLevel: LogLevel;
 }
 
 export const DEFAULT_SETTINGS: SyncSettings = {
@@ -16,4 +19,5 @@ export const DEFAULT_SETTINGS: SyncSettings = {
 	syncConcurrency: 1,
 	isSyncEnabled: false,
 	displayNoopSyncEvents: false,
+	minimumLogLevel: LogLevel.INFO,
 };
diff --git a/plugin/src/views/settings-tab.ts b/plugin/src/views/settings-tab.ts
index aea8a4c8..d88ce257 100644
--- a/plugin/src/views/settings-tab.ts
+++ b/plugin/src/views/settings-tab.ts
@@ -1,10 +1,10 @@
 import type { App } from "obsidian";
 import { Notice, PluginSettingTab, Setting } from "obsidian";
 
-import type SyncPlugin from "src/plugin";
+import type VaultLinkPlugin from "src/vault-link-plugin";
 import type { Database } from "src/database/database";
 import type { SyncService } from "src/services/sync-service";
-import { Logger } from "src/tracing/logger";
+import { Logger, LogLevel } from "src/tracing/logger";
 import type { Syncer } from "src/sync-operations/syncer";
 import type { StatusDescription } from "./status-description";
 import { LogsView } from "./logs-view";
@@ -13,7 +13,7 @@ import { HistoryView } from "./history-view";
 export class SyncSettingsTab extends PluginSettingTab {
 	private editedVaultName: string;
 
-	private readonly plugin: SyncPlugin;
+	private readonly plugin: VaultLinkPlugin;
 	private readonly database: Database;
 	private readonly syncService: SyncService;
 	private readonly statusDescription: StatusDescription;
@@ -29,7 +29,7 @@ export class SyncSettingsTab extends PluginSettingTab {
 		syncer,
 	}: {
 		app: App;
-		plugin: SyncPlugin;
+		plugin: VaultLinkPlugin;
 		database: Database;
 		syncService: SyncService;
 		statusDescription: StatusDescription;
@@ -58,22 +58,34 @@ export class SyncSettingsTab extends PluginSettingTab {
 		containerEl.empty();
 		containerEl.addClass("vault-link-settings");
 
+		this.renderSettingsHeader(containerEl);
+		this.renderConnectionSettings(containerEl);
+		this.renderSyncSettings(containerEl);
+		this.renderViewSettings(containerEl);
+	}
+
+	public hide(): void {
+		super.hide();
+		this.setStatusDescriptionSubscription();
+	}
+
+	private renderSettingsHeader(containerEl: HTMLElement): void {
 		containerEl.createEl("h2", { text: "VaultLink" }).createSpan({
 			text: this.plugin.manifest.version,
 			cls: "version",
 		});
 
-		const descriptionContainer = containerEl.createDiv({
-			cls: "description",
-		});
-		this.statusDescriptionSubscription = (): void => {
-			this.statusDescription.renderStatusDescription(
-				descriptionContainer
-			);
-		};
-		this.statusDescriptionSubscription();
-		this.statusDescription.addStatusChangeListener(
-			this.statusDescriptionSubscription
+		containerEl.createDiv(
+			{
+				cls: "description",
+			},
+			(descriptionContainer) => {
+				this.setStatusDescriptionSubscription((): void => {
+					this.statusDescription.renderStatusDescription(
+						descriptionContainer
+					);
+				});
+			}
 		);
 
 		containerEl.createDiv(
@@ -106,7 +118,9 @@ export class SyncSettingsTab extends PluginSettingTab {
 				);
 			}
 		);
+	}
 
+	private renderConnectionSettings(containerEl: HTMLElement): void {
 		containerEl.createEl("h3", { text: "Connection" });
 
 		new Setting(containerEl)
@@ -179,7 +193,9 @@ export class SyncSettingsTab extends PluginSettingTab {
 					);
 				})
 			);
+	}
 
+	private renderSyncSettings(containerEl: HTMLElement): void {
 		containerEl.createEl("h3", { text: "Sync" });
 
 		new Setting(containerEl)
@@ -253,13 +269,60 @@ export class SyncSettingsTab extends PluginSettingTab {
 			);
 	}
 
-	public hide(): void {
-		super.hide();
+	private renderViewSettings(containerEl: HTMLElement): void {
+		containerEl.createEl("h3", { text: "View" });
 
+		new Setting(containerEl)
+			.setName("Show no-op sync operations in history")
+			.setDesc(
+				"Enabling this will make the history view more verbose while also providing more explanation for the scyning choices made."
+			)
+			.addToggle((toggle) =>
+				toggle
+					.onChange(async (value) =>
+						this.database.setSetting("displayNoopSyncEvents", value)
+					)
+					.setValue(this.database.getSettings().displayNoopSyncEvents)
+			);
+
+		new Setting(containerEl)
+			.setName("Minimum log level")
+			.setDesc(
+				"Set the log level for the plugin. Lower levels will show more logs."
+			)
+			.addDropdown((dropdown) =>
+				dropdown
+					.addOptions({
+						[LogLevel.DEBUG]: LogLevel.DEBUG,
+						[LogLevel.INFO]: LogLevel.INFO,
+						[LogLevel.WARNING]: LogLevel.WARNING,
+						[LogLevel.ERROR]: LogLevel.ERROR,
+					})
+					.onChange(
+						async (value) =>
+							await this.database.setSetting(
+								"minimumLogLevel",
+								value as LogLevel
+							)
+					)
+					.setValue(this.database.getSettings().minimumLogLevel)
+			);
+	}
+
+	private setStatusDescriptionSubscription(
+		newSubscription?: () => void
+	): void {
 		if (this.statusDescriptionSubscription) {
 			this.statusDescription.removeStatusChangeListener(
 				this.statusDescriptionSubscription
 			);
 		}
+		this.statusDescriptionSubscription = newSubscription;
+		if (this.statusDescriptionSubscription) {
+			this.statusDescriptionSubscription();
+			this.statusDescription.addStatusChangeListener(
+				this.statusDescriptionSubscription
+			);
+		}
 	}
 }

From 0e45b5da61164cff1f92d3119b045f30dd5493ef Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 4 Jan 2025 15:03:10 +0000
Subject: [PATCH 110/761] Make logs view prettier

---
 plugin/src/styles.scss        | 81 ++++++++++++++++++++-------------
 plugin/src/views/logs-view.ts | 85 +++++++++++++++++++++++++++++------
 2 files changed, 121 insertions(+), 45 deletions(-)

diff --git a/plugin/src/styles.scss b/plugin/src/styles.scss
index 1de9a20b..2db2e632 100644
--- a/plugin/src/styles.scss
+++ b/plugin/src/styles.scss
@@ -1,21 +1,25 @@
+@mixin number-card {
+	padding: var(--size-2-1) var(--size-4-1);
+	border-radius: var(--radius-s);
+	background-color: var(--color-base-30);
+	font-size: var(--font-ui-small);
+
+	&.good {
+		background-color: rgba(var(--color-green-rgb), 0.35);
+	}
+
+	&.bad {
+		background-color: rgba(var(--color-red-rgb), 0.35);
+	}
+}
+
 .status-description {
 	margin: var(--p-spacing) 0;
 
 	.number {
-		padding: var(--size-2-1) var(--size-4-1);
-		border-radius: var(--radius-s);
-		background-color: var(--color-base-30);
+		@include number-card;
 		font-family: var(--font-monospace);
 		font-weight: var(--bold-weight);
-		font-size: var(--font-ui-small);
-
-		&.good {
-			background-color: rgba(var(--color-green-rgb), 0.35);
-		}
-
-		&.bad {
-			background-color: rgba(var(--color-red-rgb), 0.35);
-		}
 	}
 
 	.error {
@@ -34,14 +38,11 @@
 		font-size: var(--h2-size);
 
 		.version {
-			display: block;
-			font-size: var(--font-ui-smaller);
-			margin-top: var(--size-2-2);
-			margin-left: var(--size-4-2);
-			padding: var(--size-2-1) var(--size-4-1);
+			@include number-card;
+			margin: var(--size-2-2) 0 0 var(--size-4-2);
 			background-color: var(--color-base-30);
 			color: var(--color-base-70);
-			border-radius: var(--radius-s);
+			font-size: var(--font-ui-smaller);
 		}
 	}
 
@@ -84,23 +85,41 @@
 	}
 }
 
-.log-message {
-	font: var(--font-monospace);
+.logs-view {
+	.logs-container {
+		max-height: 100%;
+		max-width: 100%;
+		overflow-y: auto;
 
-	&.DEBUG {
-		color: var(--color-base-50);
-	}
+		.log-message {
+			font: var(--font-monospace);
+			margin-bottom: var(--size-2-1);
+			overflow-wrap: break-word;
+			white-space: pre-wrap;
 
-	&.INFO {
-		color: var(--color-green-rgb);
-	}
+			.timestamp {
+				@include number-card;
+				font-family: var(--font-monospace);
+				font-weight: var(--bold-weight);
+				margin-right: var(--size-4-1);
+			}
 
-	&.WARNING {
-		color: var(--color-yellow-rgb);
-	}
+			&.DEBUG {
+				color: var(--color-base-50);
+			}
 
-	&.ERROR {
-		color: var(--color-red-rgb);
+			&.INFO {
+				color: var(--color-green-rgb);
+			}
+
+			&.WARNING {
+				color: var(--color-yellow-rgb);
+			}
+
+			&.ERROR {
+				color: var(--color-red-rgb);
+			}
+		}
 	}
 }
 
diff --git a/plugin/src/views/logs-view.ts b/plugin/src/views/logs-view.ts
index f39ba481..3671de96 100644
--- a/plugin/src/views/logs-view.ts
+++ b/plugin/src/views/logs-view.ts
@@ -1,17 +1,29 @@
 import type { WorkspaceLeaf } from "obsidian";
 import { ItemView } from "obsidian";
+import type VaultLinkPlugin from "src/vault-link-plugin";
 import { LogLevel, Logger } from "src/tracing/logger";
+import { Database } from "src/database/database";
 
 export class LogsView extends ItemView {
 	public static readonly TYPE = "logs-view";
 	public static readonly ICON = "logs";
 
-	public constructor(leaf: WorkspaceLeaf) {
+	public constructor(
+		private readonly plugin: VaultLinkPlugin,
+		private readonly database: Database,
+		leaf: WorkspaceLeaf
+	) {
 		super(leaf);
 		this.icon = LogsView.ICON;
 		Logger.getInstance().addOnMessageListener(() => {
 			this.updateView();
 		});
+
+		database.addOnSettingsChangeHandlers((newSettings, oldSettings) => {
+			if (newSettings.minimumLogLevel !== oldSettings.minimumLogLevel) {
+				this.updateView();
+			}
+		});
 	}
 
 	private static formatTimestamp(timestamp: Date): string {
@@ -28,6 +40,16 @@ export class LogsView extends ItemView {
 
 	public async onOpen(): Promise<void> {
 		this.updateView();
+
+		const container = this.containerEl.children[1];
+		container.addClass("logs-view");
+
+		const logsContainer = container
+			.getElementsByClassName("logs-container")
+			.item(0);
+		if (logsContainer) {
+			logsContainer.scrollTop = logsContainer.scrollHeight;
+		}
 	}
 
 	private updateView(): void {
@@ -35,19 +57,54 @@ export class LogsView extends ItemView {
 		container.empty();
 
 		container.createEl("h4", { text: "VaultLink logs" });
+		container.createEl(
+			"p",
+			{
+				text: "This view displays logs generated by VaultLink. You can set the log level in the ",
+			},
+			(p) => {
+				p.createEl(
+					"a",
+					{
+						text: "settings",
+					},
+					(button) => {
+						button.addEventListener("click", () => {
+							this.plugin.openSettings();
+						});
+					}
+				);
 
-		Logger.getInstance()
-			.getMessages(LogLevel.DEBUG)
-			.forEach((message) => {
-				const messageContainer = container.createDiv({
-					cls: ["log-message", message.level],
-				});
-				messageContainer.createEl("span", {
-					text: ` | ${LogsView.formatTimestamp(
-						message.timestamp
-					)} | `,
-				});
-				messageContainer.createEl("span", { text: message.message });
-			});
+				p.createSpan({ text: "." });
+			}
+		);
+
+		const logs = Logger.getInstance().getMessages(
+			this.database.getSettings().minimumLogLevel
+		);
+
+		if (logs.length === 0) {
+			container.createEl("p", { text: "No logs available yet." });
+			return;
+		}
+
+		container.createDiv({ cls: "logs-container" }, (logsContainer) => {
+			logs.forEach((message) =>
+				logsContainer.createDiv(
+					{
+						cls: ["log-message", message.level],
+					},
+					(messageContainer) => {
+						messageContainer.createEl("span", {
+							text: LogsView.formatTimestamp(message.timestamp),
+							cls: "timestamp",
+						});
+						messageContainer.createEl("span", {
+							text: message.message,
+						});
+					}
+				)
+			);
+		});
 	}
 }

From e14fe4240ed2edc279fd2b24a5f6f22d6c212a01 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 4 Jan 2025 15:16:44 +0000
Subject: [PATCH 111/761] Misc

---
 plugin/src/vault-link-plugin.ts | 5 ++++-
 plugin/src/views/status-bar.ts  | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/plugin/src/vault-link-plugin.ts b/plugin/src/vault-link-plugin.ts
index 92996457..5460498c 100644
--- a/plugin/src/vault-link-plugin.ts
+++ b/plugin/src/vault-link-plugin.ts
@@ -125,7 +125,10 @@ export default class VaultLinkPlugin extends Plugin {
 			HistoryView.TYPE,
 			(leaf) => new HistoryView(leaf, database, this.history)
 		);
-		this.registerView(LogsView.TYPE, (leaf) => new LogsView(this, leaf));
+		this.registerView(
+			LogsView.TYPE,
+			(leaf) => new LogsView(this, database, leaf)
+		);
 
 		this.addRibbonIcon(
 			HistoryView.ICON,
diff --git a/plugin/src/views/status-bar.ts b/plugin/src/views/status-bar.ts
index 45e6db6b..6c3f43b4 100644
--- a/plugin/src/views/status-bar.ts
+++ b/plugin/src/views/status-bar.ts
@@ -1,5 +1,5 @@
 import type { Database } from "src/database/database";
-import type SyncPlugin from "src/plugin";
+import type VaultLinkPlugin from "src/vault-link-plugin";
 import type { Syncer } from "src/sync-operations/syncer";
 import type { HistoryStats, SyncHistory } from "src/tracing/sync-history";
 
@@ -11,7 +11,7 @@ export class StatusBar {
 
 	public constructor(
 		private readonly database: Database,
-		private readonly plugin: SyncPlugin,
+		private readonly plugin: VaultLinkPlugin,
 		history: SyncHistory,
 		syncer: Syncer
 	) {

From cd7fe5fe39d4159d4e9603d291da1b6bdb7474e1 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 4 Jan 2025 15:22:53 +0000
Subject: [PATCH 112/761] Update variable name

---
 plugin/src/sync-operations/syncer.ts | 36 +++++++++++++++-------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/plugin/src/sync-operations/syncer.ts b/plugin/src/sync-operations/syncer.ts
index 53507476..ce566304 100644
--- a/plugin/src/sync-operations/syncer.ts
+++ b/plugin/src/sync-operations/syncer.ts
@@ -206,13 +206,13 @@ export class Syncer {
 				const contentBytes = await this.operations.read(relativePath);
 				let contentHash = hash(contentBytes);
 
-				const metadata = this.database.getDocument(relativePath);
-				if (metadata) {
+				const localMetadata = this.database.getDocument(relativePath);
+				if (localMetadata) {
 					Logger.getInstance().debug(
 						`Document metadata already exists for ${relativePath}, it must have been downloaded from the server`
 					);
 
-					if (metadata.hash === contentHash) {
+					if (localMetadata.hash === contentHash) {
 						this.history.addHistoryEntry({
 							status: SyncStatus.NO_OP,
 							relativePath,
@@ -283,10 +283,10 @@ export class Syncer {
 			SyncType.UPDATE,
 			SyncSource.PUSH,
 			async () => {
-				const metadata = this.database.getDocument(
+				const localMetadata = this.database.getDocument(
 					oldPath ?? relativePath
 				);
-				if (!metadata) {
+				if (!localMetadata) {
 					if (this.database.getDocument(relativePath)) {
 						this.history.addHistoryEntry({
 							status: SyncStatus.NO_OP,
@@ -305,7 +305,10 @@ export class Syncer {
 				const contentBytes = await this.operations.read(relativePath);
 				let contentHash = hash(contentBytes);
 
-				if (metadata.hash === contentHash && oldPath === undefined) {
+				if (
+					localMetadata.hash === contentHash &&
+					oldPath === undefined
+				) {
 					this.history.addHistoryEntry({
 						status: SyncStatus.NO_OP,
 						relativePath,
@@ -316,8 +319,8 @@ export class Syncer {
 				}
 
 				const response = await this.syncService.put({
-					documentId: metadata.documentId,
-					parentVersionId: metadata.parentVersionId,
+					documentId: localMetadata.documentId,
+					parentVersionId: localMetadata.parentVersionId,
 					relativePath,
 					contentBytes,
 					createdDate: updateTime,
@@ -383,7 +386,7 @@ export class Syncer {
 					});
 
 					await this.database.moveDocument({
-						documentId: metadata.documentId,
+						documentId: localMetadata.documentId,
 						oldRelativePath: oldPath ?? relativePath,
 						relativePath: response.relativePath,
 						parentVersionId: response.vaultUpdateId,
@@ -410,8 +413,8 @@ export class Syncer {
 			SyncType.DELETE,
 			SyncSource.PUSH,
 			async () => {
-				const metadata = this.database.getDocument(relativePath);
-				if (!metadata) {
+				const localMetadata = this.database.getDocument(relativePath);
+				if (!localMetadata) {
 					this.history.addHistoryEntry({
 						status: SyncStatus.NO_OP,
 						relativePath,
@@ -422,7 +425,7 @@ export class Syncer {
 				}
 
 				await this.syncService.delete({
-					documentId: metadata.documentId,
+					documentId: localMetadata.documentId,
 					relativePath,
 					createdDate: new Date(), // We got the event now, so it must have been deleted just now
 				});
@@ -448,11 +451,11 @@ export class Syncer {
 			SyncType.UPDATE,
 			SyncSource.PULL,
 			async () => {
-				const currentVersion = this.database.getDocumentByDocumentId(
+				const localMetadata = this.database.getDocumentByDocumentId(
 					remoteVersion.documentId
 				);
 
-				if (!currentVersion) {
+				if (!localMetadata) {
 					if (remoteVersion.isDeleted) {
 						this.history.addHistoryEntry({
 							status: SyncStatus.NO_OP,
@@ -491,7 +494,7 @@ export class Syncer {
 					return;
 				}
 
-				const [relativePath, metadata] = currentVersion;
+				const [relativePath, metadata] = localMetadata;
 				if (metadata.parentVersionId === remoteVersion.vaultUpdateId) {
 					Logger.getInstance().debug(
 						`Document ${relativePath} is already up to date`
@@ -502,7 +505,6 @@ export class Syncer {
 				if (relativePath !== remoteVersion.relativePath) {
 					await waitForDocumentLock(relativePath);
 				}
-
 				try {
 					if (remoteVersion.isDeleted) {
 						await this.operations.remove(relativePath);
@@ -523,7 +525,7 @@ export class Syncer {
 
 						if (currentHash !== metadata.hash) {
 							Logger.getInstance().info(
-								`Document ${relativePath} has been updated both remotely and locally, skipping until the event is processed`
+								`Document ${relativePath} has been updated both remotely and locally, letting the local file update event handle it`
 							);
 							return;
 						}

From 09436817022a4bcb8f3e498b3c33b1d63710b3c7 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 4 Jan 2025 16:14:54 +0000
Subject: [PATCH 113/761] Move app state

---
 backend/sync_server/src/main.rs                     | 10 ++--------
 backend/sync_server/src/server.rs                   | 13 ++++++++-----
 backend/sync_server/src/{ => server}/app_state.rs   |  0
 backend/sync_server/src/server/auth.rs              |  2 +-
 .../src/server/fetch_latest_document_version.rs     |  3 +--
 .../src/server/fetch_latest_documents.rs            |  3 +--
 backend/sync_server/src/server/ping.rs              |  4 ++--
 7 files changed, 15 insertions(+), 20 deletions(-)
 rename backend/sync_server/src/{ => server}/app_state.rs (100%)

diff --git a/backend/sync_server/src/main.rs b/backend/sync_server/src/main.rs
index 7838cd97..02e4104b 100644
--- a/backend/sync_server/src/main.rs
+++ b/backend/sync_server/src/main.rs
@@ -1,12 +1,11 @@
-mod app_state;
 mod config;
 mod consts;
 mod database;
 mod errors;
 mod server;
+mod utils;
 
 use anyhow::{Context as _, Result};
-use app_state::AppState;
 use errors::{init_error, SyncServerError};
 use log::info;
 use server::create_server;
@@ -34,12 +33,7 @@ async fn main() -> Result<(), SyncServerError> {
         env!("CARGO_PKG_VERSION")
     );
 
-    let app_state = AppState::try_new()
-        .await
-        .context("Failed to initialise app state")
-        .map_err(init_error)?;
-
-    create_server(app_state)
+    create_server()
         .await
         .context("Failed to start server")
         .map_err(init_error)
diff --git a/backend/sync_server/src/server.rs b/backend/sync_server/src/server.rs
index 4747858b..ad7e603f 100644
--- a/backend/sync_server/src/server.rs
+++ b/backend/sync_server/src/server.rs
@@ -10,6 +10,7 @@ use aide::{
     transform::TransformOpenApi,
 };
 use anyhow::{anyhow, Context as _, Result};
+use app_state::AppState;
 use axum::{
     extract::{DefaultBodyLimit, Request},
     http::{self, HeaderValue, Method},
@@ -28,10 +29,8 @@ use tower_http::{
 };
 use tracing::{info_span, Level};
 
-use crate::{
-    app_state::AppState,
-    errors::{not_found_error, SerializedError},
-};
+use crate::errors::{not_found_error, SerializedError};
+mod app_state;
 mod auth;
 mod create_document;
 mod delete_document;
@@ -42,10 +41,14 @@ mod requests;
 mod responses;
 mod update_document;
 
-pub async fn create_server(app_state: AppState) -> Result<()> {
+pub async fn create_server() -> Result<()> {
     aide::gen::on_error(|err| error!("{err}"));
     aide::gen::extract_schemas(true);
 
+    let app_state = AppState::try_new()
+        .await
+        .context("Failed to initialise app state")?;
+
     let address = format!(
         "{}:{}",
         &app_state.config.server.host, &app_state.config.server.port
diff --git a/backend/sync_server/src/app_state.rs b/backend/sync_server/src/server/app_state.rs
similarity index 100%
rename from backend/sync_server/src/app_state.rs
rename to backend/sync_server/src/server/app_state.rs
diff --git a/backend/sync_server/src/server/auth.rs b/backend/sync_server/src/server/auth.rs
index 9d2dd31f..3e936097 100644
--- a/backend/sync_server/src/server/auth.rs
+++ b/backend/sync_server/src/server/auth.rs
@@ -1,5 +1,5 @@
+use super::app_state::AppState;
 use crate::{
-    app_state::AppState,
     config::user_config::User,
     errors::{unauthorized_error, SyncServerError},
 };
diff --git a/backend/sync_server/src/server/fetch_latest_document_version.rs b/backend/sync_server/src/server/fetch_latest_document_version.rs
index 3cf617e7..47c4514e 100644
--- a/backend/sync_server/src/server/fetch_latest_document_version.rs
+++ b/backend/sync_server/src/server/fetch_latest_document_version.rs
@@ -10,9 +10,8 @@ use axum_extra::{
 use schemars::JsonSchema;
 use serde::Deserialize;
 
-use super::auth::auth;
+use super::{app_state::AppState, auth::auth};
 use crate::{
-    app_state::AppState,
     database::models::{DocumentId, DocumentVersion, VaultId},
     errors::{not_found_error, server_error, SyncServerError},
 };
diff --git a/backend/sync_server/src/server/fetch_latest_documents.rs b/backend/sync_server/src/server/fetch_latest_documents.rs
index b376f268..f0181173 100644
--- a/backend/sync_server/src/server/fetch_latest_documents.rs
+++ b/backend/sync_server/src/server/fetch_latest_documents.rs
@@ -9,9 +9,8 @@ use axum_extra::{
 use schemars::JsonSchema;
 use serde::Deserialize;
 
-use super::{auth::auth, responses::FetchLatestDocumentsResponse};
+use super::{app_state::AppState, auth::auth, responses::FetchLatestDocumentsResponse};
 use crate::{
-    app_state::AppState,
     database::models::{VaultId, VaultUpdateId},
     errors::{server_error, SyncServerError},
 };
diff --git a/backend/sync_server/src/server/ping.rs b/backend/sync_server/src/server/ping.rs
index c8b48bd0..3ffd2cf7 100644
--- a/backend/sync_server/src/server/ping.rs
+++ b/backend/sync_server/src/server/ping.rs
@@ -4,8 +4,8 @@ use axum_extra::{
     TypedHeader,
 };
 
-use super::{auth::auth, responses::PingResponse};
-use crate::{app_state::AppState, errors::SyncServerError};
+use super::{app_state::AppState, auth::auth, responses::PingResponse};
+use crate::errors::SyncServerError;
 
 #[axum::debug_handler]
 pub async fn ping(

From 6d5b183a3c5dc75cd6280feedd3c6809506d15ee Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 4 Jan 2025 16:16:54 +0000
Subject: [PATCH 114/761] Sanitize relative paths server-side

---
 backend/Cargo.lock                                | 10 ++++++++++
 backend/sync_server/Cargo.toml                    |  1 +
 backend/sync_server/src/server/create_document.rs | 15 ++++++++++-----
 backend/sync_server/src/server/delete_document.rs |  6 +++---
 backend/sync_server/src/server/update_document.rs | 12 ++++++++----
 backend/sync_server/src/utils.rs                  | 12 ++++++++++++
 6 files changed, 44 insertions(+), 12 deletions(-)
 create mode 100644 backend/sync_server/src/utils.rs

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 885470b7..7bb3bab2 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1610,6 +1610,15 @@ dependencies = [
  "winapi-util",
 ]
 
+[[package]]
+name = "sanitize-filename"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc984f4f9ceb736a7bb755c3e3bd17dc56370af2600c9780dcc48c66453da34d"
+dependencies = [
+ "regex",
+]
+
 [[package]]
 name = "schemars"
 version = "0.8.21"
@@ -2121,6 +2130,7 @@ dependencies = [
  "log",
  "rand",
  "reconcile",
+ "sanitize-filename",
  "schemars",
  "serde",
  "serde_yaml",
diff --git a/backend/sync_server/Cargo.toml b/backend/sync_server/Cargo.toml
index b79f8f65..bfb60f94 100644
--- a/backend/sync_server/Cargo.toml
+++ b/backend/sync_server/Cargo.toml
@@ -25,6 +25,7 @@ aide = { version = "0.13.4", features = ["axum", "axum-ws", "scalar", "axum-head
 schemars = { version = "0.8.21", features = ["chrono", "uuid1"] }
 tracing = "0.1"
 rand = "0.8.5"
+sanitize-filename = "0.6.0"
 
 [lints]
 workspace = true
diff --git a/backend/sync_server/src/server/create_document.rs b/backend/sync_server/src/server/create_document.rs
index 900095cc..ac186d0c 100644
--- a/backend/sync_server/src/server/create_document.rs
+++ b/backend/sync_server/src/server/create_document.rs
@@ -12,11 +12,14 @@ use schemars::JsonSchema;
 use serde::Deserialize;
 use sync_lib::{base64_to_bytes, merge};
 
-use super::{auth::auth, requests::CreateDocumentVersion, responses::DocumentUpdateResponse};
+use super::{
+    app_state::AppState, auth::auth, requests::CreateDocumentVersion,
+    responses::DocumentUpdateResponse,
+};
 use crate::{
-    app_state::AppState,
     database::models::{StoredDocumentVersion, VaultId},
     errors::{client_error, server_error, SyncServerError},
+    utils::sanitize_path,
 };
 
 // This is required for aide to infer the path parameter types and names
@@ -49,9 +52,11 @@ pub async fn create_document(
         .await
         .map_err(server_error)?;
 
+    let sanitized_relative_path = sanitize_path(&request.relative_path);
+
     let maybe_existing_version = state
         .database
-        .get_latest_document_by_path(&vault_id, &request.relative_path, Some(&mut transaction))
+        .get_latest_document_by_path(&vault_id, &sanitized_relative_path, Some(&mut transaction))
         .await
         .map_err(server_error)?
         .and_then(|doc| if doc.is_deleted { None } else { Some(doc) });
@@ -87,7 +92,7 @@ pub async fn create_document(
         let new_version = StoredDocumentVersion {
             vault_id,
             vault_update_id: last_update_id + 1,
-            relative_path: request.relative_path,
+            relative_path: sanitized_relative_path,
             document_id: existing_version.document_id,
             content: merged_content,
             created_date: request.created_date,
@@ -107,7 +112,7 @@ pub async fn create_document(
             vault_id,
             vault_update_id: last_update_id + 1,
             document_id: uuid::Uuid::new_v4(),
-            relative_path: request.relative_path,
+            relative_path: sanitized_relative_path,
             content: content_bytes,
             created_date: request.created_date,
             updated_date: chrono::Utc::now(),
diff --git a/backend/sync_server/src/server/delete_document.rs b/backend/sync_server/src/server/delete_document.rs
index fd56ada9..83fcda83 100644
--- a/backend/sync_server/src/server/delete_document.rs
+++ b/backend/sync_server/src/server/delete_document.rs
@@ -10,11 +10,11 @@ use axum_extra::{
 use schemars::JsonSchema;
 use serde::Deserialize;
 
-use super::{auth::auth, requests::DeleteDocumentVersion};
+use super::{app_state::AppState, auth::auth, requests::DeleteDocumentVersion};
 use crate::{
-    app_state::AppState,
     database::models::{DocumentId, StoredDocumentVersion, VaultId},
     errors::{server_error, SyncServerError},
+    utils::sanitize_path,
 };
 
 // This is required for aide to infer the path parameter types and names
@@ -52,7 +52,7 @@ pub async fn delete_document(
         vault_id,
         vault_update_id: last_update_id + 1,
         document_id,
-        relative_path: request.relative_path,
+        relative_path: sanitize_path(&request.relative_path),
         content: vec![],
         created_date: request.created_date,
         updated_date: chrono::Utc::now(),
diff --git a/backend/sync_server/src/server/update_document.rs b/backend/sync_server/src/server/update_document.rs
index 50285399..31ab4320 100644
--- a/backend/sync_server/src/server/update_document.rs
+++ b/backend/sync_server/src/server/update_document.rs
@@ -12,11 +12,14 @@ use schemars::JsonSchema;
 use serde::Deserialize;
 use sync_lib::{base64_to_bytes, merge};
 
-use super::{auth::auth, requests::UpdateDocumentVersion, responses::DocumentUpdateResponse};
+use super::{
+    app_state::AppState, auth::auth, requests::UpdateDocumentVersion,
+    responses::DocumentUpdateResponse,
+};
 use crate::{
-    app_state::AppState,
     database::models::{DocumentId, StoredDocumentVersion, VaultId},
     errors::{client_error, not_found_error, server_error, SyncServerError},
+    utils::sanitize_path,
 };
 
 // This is required for aide to infer the path parameter types and names
@@ -84,10 +87,11 @@ pub async fn update_document(
         .context("Failed to decode base64 content in request")
         .map_err(client_error)?;
 
+    let sanitized_relative_path = sanitize_path(&request.relative_path);
     // Return the latest version if the content and path are the same as the latest
     // version
     if content_bytes == latest_version.content
-        && request.relative_path == latest_version.relative_path
+        && sanitized_relative_path == latest_version.relative_path
     {
         info!("Document content is the same as the latest version, skipping update");
         transaction
@@ -110,7 +114,7 @@ pub async fn update_document(
 
     // We can only update the relative path if we're the first one to do so
     let new_relative_path = if parent_document.relative_path == latest_version.relative_path {
-        request.relative_path.clone()
+        sanitized_relative_path
     } else {
         latest_version.relative_path.clone()
     };
diff --git a/backend/sync_server/src/utils.rs b/backend/sync_server/src/utils.rs
new file mode 100644
index 00000000..dad45349
--- /dev/null
+++ b/backend/sync_server/src/utils.rs
@@ -0,0 +1,12 @@
+/// Sanitize the document's path to allow all clients to create the same path in
+/// their filesystem. If we didn't do this server-side, client's would need to
+/// deal with mapping invalid names to valid ones and then back.
+pub fn sanitize_path(path: &str) -> String {
+    let options = sanitize_filename::Options {
+        truncate: true,
+        windows: true, // Windows is the lowest common denominator
+        replacement: "",
+    };
+
+    sanitize_filename::sanitize_with_options(path, options)
+}

From 51d524cc775b7c1a99f28e4312fdb082e63f500c Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 4 Jan 2025 16:17:00 +0000
Subject: [PATCH 115/761] Lint

---
 plugin/src/views/settings-tab.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugin/src/views/settings-tab.ts b/plugin/src/views/settings-tab.ts
index d88ce257..74267642 100644
--- a/plugin/src/views/settings-tab.ts
+++ b/plugin/src/views/settings-tab.ts
@@ -298,12 +298,12 @@ export class SyncSettingsTab extends PluginSettingTab {
 						[LogLevel.WARNING]: LogLevel.WARNING,
 						[LogLevel.ERROR]: LogLevel.ERROR,
 					})
-					.onChange(
-						async (value) =>
-							await this.database.setSetting(
-								"minimumLogLevel",
-								value as LogLevel
-							)
+					.onChange(async (value) =>
+						this.database.setSetting(
+							"minimumLogLevel",
+							// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+							value as LogLevel
+						)
 					)
 					.setValue(this.database.getSettings().minimumLogLevel)
 			);

From 388b7bfabbcf10ec986669db9f0ee4b2a77f4a0e Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 4 Jan 2025 16:42:21 +0000
Subject: [PATCH 116/761] Revert self-hosted docker

---
 .github/workflows/publish-docker.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml
index 433bd93e..993c03db 100644
--- a/.github/workflows/publish-docker.yml
+++ b/.github/workflows/publish-docker.yml
@@ -7,7 +7,8 @@ name: Publish server Docker image
 
 on:
   push:
-    branches: ["master"]
+    tags:
+      - "*"
 
 env:
   # Use docker.io for Docker Hub if empty
@@ -17,8 +18,7 @@ env:
 
 jobs:
   build-docker:
-    runs-on: self-hosted
-
+    runs-on: ubuntu-latest
     permissions:
       contents: read
       packages: write

From 64274f4de5c364d107034cfd2c007c146b5b6800 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 4 Jan 2025 17:04:35 +0000
Subject: [PATCH 117/761] Fix splitting logic

---
 backend/sync_server/src/utils.rs | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/backend/sync_server/src/utils.rs b/backend/sync_server/src/utils.rs
index dad45349..8718944c 100644
--- a/backend/sync_server/src/utils.rs
+++ b/backend/sync_server/src/utils.rs
@@ -8,5 +8,26 @@ pub fn sanitize_path(path: &str) -> String {
         replacement: "",
     };
 
-    sanitize_filename::sanitize_with_options(path, options)
+    path.split('/')
+        .map(|part| {
+            let proposal = sanitize_filename::sanitize_with_options(part, options.clone());
+            if !part.is_empty() && proposal.is_empty() {
+                "_".to_owned()
+            } else {
+                proposal
+            }
+        })
+        .collect::<Vec<_>>()
+        .join("/")
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn test_sanitize_path() {
+        assert_eq!(sanitize_path("/my/path/what?"), "/my/path/what");
+        assert_eq!(sanitize_path("/my/path/\\\\:?"), "/my/path/_");
+    }
 }

From d069939c6bf43c2bc83a4d52e00166570fe19294 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 4 Jan 2025 17:04:50 +0000
Subject: [PATCH 118/761] Fix logs UX

---
 plugin/src/database/database.ts |  2 +-
 plugin/src/styles.scss          |  4 +-
 plugin/src/views/logs-view.ts   | 66 +++++++++++++++++++--------------
 3 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/plugin/src/database/database.ts b/plugin/src/database/database.ts
index e242f41c..6e548d9c 100644
--- a/plugin/src/database/database.ts
+++ b/plugin/src/database/database.ts
@@ -88,7 +88,7 @@ export class Database {
 		key: T,
 		value: SyncSettings[T]
 	): Promise<void> {
-		let newSettings = { ...this._settings, [key]: value };
+		const newSettings = { ...this._settings, [key]: value };
 		Logger.getInstance().debug(
 			`Setting ${key} to ${value}, new settings: ${JSON.stringify(
 				newSettings,
diff --git a/plugin/src/styles.scss b/plugin/src/styles.scss
index 2db2e632..47513337 100644
--- a/plugin/src/styles.scss
+++ b/plugin/src/styles.scss
@@ -86,8 +86,10 @@
 }
 
 .logs-view {
+	display: flex;
+	flex-direction: column;
+
 	.logs-container {
-		max-height: 100%;
 		max-width: 100%;
 		overflow-y: auto;
 
diff --git a/plugin/src/views/logs-view.ts b/plugin/src/views/logs-view.ts
index 3671de96..c94e68d9 100644
--- a/plugin/src/views/logs-view.ts
+++ b/plugin/src/views/logs-view.ts
@@ -1,8 +1,8 @@
 import type { WorkspaceLeaf } from "obsidian";
 import { ItemView } from "obsidian";
 import type VaultLinkPlugin from "src/vault-link-plugin";
-import { LogLevel, Logger } from "src/tracing/logger";
-import { Database } from "src/database/database";
+import { Logger } from "src/tracing/logger";
+import type { Database } from "src/database/database";
 
 export class LogsView extends ItemView {
 	public static readonly TYPE = "logs-view";
@@ -43,17 +43,18 @@ export class LogsView extends ItemView {
 
 		const container = this.containerEl.children[1];
 		container.addClass("logs-view");
-
-		const logsContainer = container
-			.getElementsByClassName("logs-container")
-			.item(0);
-		if (logsContainer) {
-			logsContainer.scrollTop = logsContainer.scrollHeight;
-		}
 	}
 
 	private updateView(): void {
 		const container = this.containerEl.children[1];
+
+		let logsContainer = container
+			.getElementsByClassName("logs-container")
+			.item(0);
+		const scrollPosition = logsContainer?.scrollTop;
+
+		console.log(scrollPosition);
+
 		container.empty();
 
 		container.createEl("h4", { text: "VaultLink logs" });
@@ -88,23 +89,34 @@ export class LogsView extends ItemView {
 			return;
 		}
 
-		container.createDiv({ cls: "logs-container" }, (logsContainer) => {
-			logs.forEach((message) =>
-				logsContainer.createDiv(
-					{
-						cls: ["log-message", message.level],
-					},
-					(messageContainer) => {
-						messageContainer.createEl("span", {
-							text: LogsView.formatTimestamp(message.timestamp),
-							cls: "timestamp",
-						});
-						messageContainer.createEl("span", {
-							text: message.message,
-						});
-					}
-				)
-			);
-		});
+		logsContainer = container.createDiv(
+			{ cls: "logs-container" },
+			(logsContainer) => {
+				logs.slice(-100).forEach((message) =>
+					logsContainer.createDiv(
+						{
+							cls: ["log-message", message.level],
+						},
+						(messageContainer) => {
+							messageContainer.createEl("span", {
+								text: LogsView.formatTimestamp(
+									message.timestamp
+								),
+								cls: "timestamp",
+							});
+							messageContainer.createEl("span", {
+								text: message.message,
+							});
+						}
+					)
+				);
+			}
+		);
+
+		if (scrollPosition) {
+			logsContainer.scrollTop = scrollPosition;
+		} else {
+			logsContainer.scrollTop = logsContainer.scrollHeight;
+		}
 	}
 }

From f87352a9e6a8fed2736bf053d69fa54b3ff17e6e Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 4 Jan 2025 17:37:28 +0000
Subject: [PATCH 119/761] Make API more intuitive

---
 backend/sync_server/src/database.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/sync_server/src/database.rs b/backend/sync_server/src/database.rs
index 94af31ff..4c638faf 100644
--- a/backend/sync_server/src/database.rs
+++ b/backend/sync_server/src/database.rs
@@ -70,7 +70,7 @@ impl Database {
         Ok(transaction)
     }
 
-    /// Return the latest state of all non-deleted documents in the vault
+    /// Return the latest state of all documents in the vault
     pub async fn get_latest_documents(
         &self,
         vault: &VaultId,
@@ -88,7 +88,7 @@ impl Database {
                 updated_date as "updated_date: chrono::DateTime<Utc>",
                 is_deleted
             from latest_document_versions
-            where is_deleted = false and vault_id = ?
+            where vault_id = ?
             order by vault_update_id desc
             "#,
             vault,

From 508377c0053de5fa53bbcada72c92ab112c6dbf5 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 4 Jan 2025 17:37:37 +0000
Subject: [PATCH 120/761] Fix local testing

---
 plugin/esbuild.config.mjs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugin/esbuild.config.mjs b/plugin/esbuild.config.mjs
index e22093a2..f722803c 100644
--- a/plugin/esbuild.config.mjs
+++ b/plugin/esbuild.config.mjs
@@ -93,12 +93,12 @@ const copyBundle = () => ({
 
 				copyFiles(
 					["manifest.json", ".hotreload"],
-					"/mnt/c/Users/Andras/Desktop/test/test/.obsidian/plugins/my-plugin"
+					"/mnt/c/Users/Andras/Desktop/test/test2/.obsidian/plugins/my-plugin"
 				);
 
 				copyFiles(
 					"build",
-					"/mnt/c/Users/Andras/Desktop/test/test/.obsidian/plugins/my-plugin"
+					"/mnt/c/Users/Andras/Desktop/test/test2/.obsidian/plugins/my-plugin"
 				);
 
 				copyFiles(

From 9973542ba47185b6ca4c9a243c6c8c79416cd328 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 4 Jan 2025 17:38:02 +0000
Subject: [PATCH 121/761] Formatting

---
 plugin/src/sync-operations/syncer.ts | 5 +++--
 plugin/src/views/logs-view.ts        | 8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/plugin/src/sync-operations/syncer.ts b/plugin/src/sync-operations/syncer.ts
index ce566304..15abec74 100644
--- a/plugin/src/sync-operations/syncer.ts
+++ b/plugin/src/sync-operations/syncer.ts
@@ -78,8 +78,9 @@ export class Syncer {
 	public async syncRemotelyUpdatedFile(
 		remoteVersion: components["schemas"]["DocumentVersionWithoutContent"]
 	): Promise<void> {
-		await this.syncQueue.add(async () =>
-			this.internalSyncRemotelyUpdatedFile(remoteVersion)
+		await this.syncQueue.add(
+			async () =>
+				this.internalSyncRemotelyUpdatedFile(remoteVersion)
 		);
 	}
 
diff --git a/plugin/src/views/logs-view.ts b/plugin/src/views/logs-view.ts
index c94e68d9..4d36fa65 100644
--- a/plugin/src/views/logs-view.ts
+++ b/plugin/src/views/logs-view.ts
@@ -91,9 +91,9 @@ export class LogsView extends ItemView {
 
 		logsContainer = container.createDiv(
 			{ cls: "logs-container" },
-			(logsContainer) => {
-				logs.slice(-100).forEach((message) =>
-					logsContainer.createDiv(
+			(element) => {
+				logs.forEach((message) =>
+					element.createDiv(
 						{
 							cls: ["log-message", message.level],
 						},
@@ -113,7 +113,7 @@ export class LogsView extends ItemView {
 			}
 		);
 
-		if (scrollPosition) {
+		if (scrollPosition !== undefined) {
 			logsContainer.scrollTop = scrollPosition;
 		} else {
 			logsContainer.scrollTop = logsContainer.scrollHeight;

From 067f4aea2cad6055c512743fc5d2bebe908d477c Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 4 Jan 2025 17:38:08 +0000
Subject: [PATCH 122/761] Add todos

---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.md b/README.md
index c14365ce..df70e2e3 100644
--- a/README.md
+++ b/README.md
@@ -79,3 +79,8 @@ apt install flatpak
 flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
 flatpak install flathub md.obsidian.Obsidian
 flatpak run md.obsidian.Obsidian
+
+
+stop leaking subscriptions
+test with naughty strings https://github.com/minimaxir/big-list-of-naughty-strings/tree/84a5dea833b5e2218f7c8c2104effca3f8f155aa?tab=readme-ov-file
+double check internalSyncRemotelyUpdatedFile
\ No newline at end of file

From 55f92398c4220ebbea61bc6e98c085c815c0ef0c Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 4 Jan 2025 17:38:15 +0000
Subject: [PATCH 123/761] Bump versions to 0.0.13

---
 backend/Cargo.lock             | 8 ++++----
 backend/fuzz/Cargo.toml        | 2 +-
 backend/reconcile/Cargo.toml   | 2 +-
 backend/sync_lib/Cargo.toml    | 2 +-
 backend/sync_server/Cargo.toml | 2 +-
 manifest.json                  | 2 +-
 plugin/manifest.json           | 2 +-
 plugin/package-lock.json       | 4 ++--
 plugin/package.json            | 4 ++--
 9 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 7bb3bab2..0bc49368 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1481,7 +1481,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile"
-version = "0.0.12"
+version = "0.0.13"
 dependencies = [
  "insta",
  "pretty_assertions",
@@ -1491,7 +1491,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile-fuzz"
-version = "0.0.12"
+version = "0.0.13"
 dependencies = [
  "libfuzzer-sys",
  "reconcile",
@@ -2106,7 +2106,7 @@ dependencies = [
 
 [[package]]
 name = "sync_lib"
-version = "0.0.12"
+version = "0.0.13"
 dependencies = [
  "base64 0.22.1",
  "console_error_panic_hook",
@@ -2120,7 +2120,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.0.12"
+version = "0.0.13"
 dependencies = [
  "aide",
  "anyhow",
diff --git a/backend/fuzz/Cargo.toml b/backend/fuzz/Cargo.toml
index ad1030e7..68b04ff8 100644
--- a/backend/fuzz/Cargo.toml
+++ b/backend/fuzz/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "reconcile-fuzz"
-version = "0.0.12"
+version = "0.0.13"
 publish = false
 edition = "2021"
 
diff --git a/backend/reconcile/Cargo.toml b/backend/reconcile/Cargo.toml
index 32e521c4..66e89860 100644
--- a/backend/reconcile/Cargo.toml
+++ b/backend/reconcile/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "reconcile"
-version = "0.0.12"
+version = "0.0.13"
 edition = "2021"
 
 [dependencies]
diff --git a/backend/sync_lib/Cargo.toml b/backend/sync_lib/Cargo.toml
index 0df4b657..0299fdb6 100644
--- a/backend/sync_lib/Cargo.toml
+++ b/backend/sync_lib/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sync_lib"
-version = "0.0.12"
+version = "0.0.13"
 authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2018"
 
diff --git a/backend/sync_server/Cargo.toml b/backend/sync_server/Cargo.toml
index bfb60f94..bc9a4bf2 100644
--- a/backend/sync_server/Cargo.toml
+++ b/backend/sync_server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sync_server"
-version = "0.0.12"
+version = "0.0.13"
 edition = "2021"
 
 [dependencies]
diff --git a/manifest.json b/manifest.json
index 73bb7d40..e91d6ac2 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.0.12",
+	"version": "0.0.13",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/plugin/manifest.json b/plugin/manifest.json
index 73bb7d40..e91d6ac2 100644
--- a/plugin/manifest.json
+++ b/plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.0.12",
+	"version": "0.0.13",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/plugin/package-lock.json b/plugin/package-lock.json
index 5fb7736d..63db2273 100644
--- a/plugin/package-lock.json
+++ b/plugin/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "obsidian-sample-plugin",
-	"version": "0.0.12",
+	"version": "0.0.13",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "obsidian-sample-plugin",
-			"version": "0.0.12",
+			"version": "0.0.13",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
diff --git a/plugin/package.json b/plugin/package.json
index 9d8bdf76..1d0cd4e7 100644
--- a/plugin/package.json
+++ b/plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.0.12",
+	"version": "0.0.13",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {
@@ -35,4 +35,4 @@
 		"typescript": "5.7.2",
 		"typescript-eslint": "8.18.0"
 	}
-}
\ No newline at end of file
+}

From d91da39884df2457ffb4d94a41181ce8a668b28b Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 5 Jan 2025 11:33:05 +0000
Subject: [PATCH 124/761] Rename config.yaml to config.yml

---
 .gitignore                        | 2 +-
 backend/sync_server/src/consts.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1d3e5ab3..bbe4f237 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,7 +14,7 @@ backend/target
 plugin/build
 
 backend/db.sqlite3*
-backend/config.yaml
+backend/config.yml
 
 *.log
 
diff --git a/backend/sync_server/src/consts.rs b/backend/sync_server/src/consts.rs
index a4f4361a..2b727f5a 100644
--- a/backend/sync_server/src/consts.rs
+++ b/backend/sync_server/src/consts.rs
@@ -1,4 +1,4 @@
-pub const CONFIG_PATH: &str = "config.yaml";
+pub const CONFIG_PATH: &str = "config.yml";
 pub const DEFAULT_SQLITE_URL: &str = "db.sqlite3";
 pub const DEFAULT_HOST: &str = "127.0.0.1";
 pub const DEFAULT_PORT: u16 = 3000;

From b549bb96b6b9bb9152f72d59c0672c28c6933d18 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 5 Jan 2025 13:08:17 +0000
Subject: [PATCH 125/761] Add .vscode

---
 .gitignore            | 3 ---
 .vscode/settings.json | 4 ++++
 2 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100644 .vscode/settings.json

diff --git a/.gitignore b/.gitignore
index bbe4f237..3a599d3e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,3 @@
-# vscode
-.vscode 
-
 # npm
 node_modules
 
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 00000000..11cfe5c0
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,4 @@
+{
+    "jest.jestCommandLine": "NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules\" npx jest",
+    "jest.rootPath": "plugin"
+}
\ No newline at end of file

From 9db478bc23159320fb63b0f22999230e3a3c1c19 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 5 Jan 2025 13:32:21 +0000
Subject: [PATCH 126/761] Change encoding/decoding

---
 backend/sync_lib/src/lib.rs   | 6 +++---
 backend/sync_lib/tests/web.rs | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/backend/sync_lib/src/lib.rs b/backend/sync_lib/src/lib.rs
index 2f3ec663..d5e6c1d2 100644
--- a/backend/sync_lib/src/lib.rs
+++ b/backend/sync_lib/src/lib.rs
@@ -10,7 +10,7 @@
 //! - `errors`: Contains error types used in this crate.
 use core::str;
 
-use base64::{engine::general_purpose::STANDARD_NO_PAD, Engine as _};
+use base64::{engine::general_purpose::STANDARD, Engine as _};
 use errors::SyncLibError;
 use wasm_bindgen::prelude::*;
 
@@ -19,12 +19,12 @@ pub mod errors;
 /// Encode binary data for easy transport over HTTP. Inverse of
 /// `base64_to_bytes`.
 #[wasm_bindgen(js_name = bytesToBase64)]
-pub fn bytes_to_base64(input: &[u8]) -> String { STANDARD_NO_PAD.encode(input) }
+pub fn bytes_to_base64(input: &[u8]) -> String { STANDARD.encode(input) }
 
 /// Inverse of `bytes_to_base64`.
 #[wasm_bindgen(js_name = base64ToBytes)]
 pub fn base64_to_bytes(input: &str) -> Result<Vec<u8>, SyncLibError> {
-    STANDARD_NO_PAD.decode(input).map_err(SyncLibError::from)
+    STANDARD.decode(input).map_err(SyncLibError::from)
 }
 
 /// Merge two documents with a common parent. Relies on `reconcile::reconcile`
diff --git a/backend/sync_lib/tests/web.rs b/backend/sync_lib/tests/web.rs
index 642ceaae..3b90fd7b 100644
--- a/backend/sync_lib/tests/web.rs
+++ b/backend/sync_lib/tests/web.rs
@@ -4,16 +4,18 @@ use insta::assert_debug_snapshot;
 use sync_lib::*;
 use wasm_bindgen_test::*;
 
+wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_browser);
+
 #[wasm_bindgen_test(unsupported = test)]
 fn test_bytes_to_base64() {
     let input = b"hello";
-    let expected = "aGVsbG8";
+    let expected = "aGVsbG8=";
     assert_eq!(bytes_to_base64(input), expected);
 }
 
 #[wasm_bindgen_test(unsupported = test)]
 fn test_base64_to_bytes() {
-    let input = "aGVsbG8";
+    let input = "aGVsbG8=";
     let expected = b"hello".to_vec();
     assert_eq!(base64_to_bytes(input).unwrap(), expected);
 }

From 4d59ec927c99f48267848d2cb3d7db47c26744ad Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 5 Jan 2025 13:32:30 +0000
Subject: [PATCH 127/761] Remove clutter

---
 backend/Cargo.lock          |  3 --
 backend/sync_lib/Cargo.toml |  1 -
 backend/sync_lib/README.md  | 84 -------------------------------------
 3 files changed, 88 deletions(-)
 delete mode 100644 backend/sync_lib/README.md

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 0bc49368..a5f81650 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -678,10 +678,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
  "cfg-if",
- "js-sys",
  "libc",
  "wasi",
- "wasm-bindgen",
 ]
 
 [[package]]
@@ -2110,7 +2108,6 @@ version = "0.0.13"
 dependencies = [
  "base64 0.22.1",
  "console_error_panic_hook",
- "getrandom",
  "insta",
  "reconcile",
  "thiserror",
diff --git a/backend/sync_lib/Cargo.toml b/backend/sync_lib/Cargo.toml
index 0299fdb6..932070d9 100644
--- a/backend/sync_lib/Cargo.toml
+++ b/backend/sync_lib/Cargo.toml
@@ -11,7 +11,6 @@ crate-type = ["cdylib", "rlib"]
 base64 = "0.22.1"
 reconcile = { path = "../reconcile" }
 wasm-bindgen = "0.2.84"
-getrandom = { version = "0.2.3", features = ["js"] }
 thiserror = { workspace = true }
 
 # The `console_error_panic_hook` crate provides better debugging of panics by
diff --git a/backend/sync_lib/README.md b/backend/sync_lib/README.md
deleted file mode 100644
index 6b684085..00000000
--- a/backend/sync_lib/README.md
+++ /dev/null
@@ -1,84 +0,0 @@
-<div align="center">
-
-  <h1><code>wasm-pack-template</code></h1>
-
-  <strong>A template for kick starting a Rust and WebAssembly project using <a href="https://github.com/rustwasm/wasm-pack">wasm-pack</a>.</strong>
-
-  <p>
-    <a href="https://travis-ci.org/rustwasm/wasm-pack-template"><img src="https://img.shields.io/travis/rustwasm/wasm-pack-template.svg?style=flat-square" alt="Build Status" /></a>
-  </p>
-
-  <h3>
-    <a href="https://rustwasm.github.io/docs/wasm-pack/tutorials/npm-browser-packages/index.html">Tutorial</a>
-    <span> | </span>
-    <a href="https://discordapp.com/channels/442252698964721669/443151097398296587">Chat</a>
-  </h3>
-
-  <sub>Built with 🦀🕸 by <a href="https://rustwasm.github.io/">The Rust and WebAssembly Working Group</a></sub>
-</div>
-
-## About
-
-[**📚 Read this template tutorial! 📚**][template-docs]
-
-This template is designed for compiling Rust libraries into WebAssembly and
-publishing the resulting package to NPM.
-
-Be sure to check out [other `wasm-pack` tutorials online][tutorials] for other
-templates and usages of `wasm-pack`.
-
-[tutorials]: https://rustwasm.github.io/docs/wasm-pack/tutorials/index.html
-[template-docs]: https://rustwasm.github.io/docs/wasm-pack/tutorials/npm-browser-packages/index.html
-
-## 🚴 Usage
-
-### 🐑 Use `cargo generate` to Clone this Template
-
-[Learn more about `cargo generate` here.](https://github.com/ashleygwilliams/cargo-generate)
-
-```
-cargo generate --git https://github.com/rustwasm/wasm-pack-template.git --name my-project
-cd my-project
-```
-
-### 🛠️ Build with `wasm-pack build`
-
-```
-wasm-pack build
-```
-
-### 🔬 Test in Headless Browsers with `wasm-pack test`
-
-```
-wasm-pack test --headless --firefox
-```
-
-### 🎁 Publish to NPM with `wasm-pack publish`
-
-```
-wasm-pack publish
-```
-
-## 🔋 Batteries Included
-
-* [`wasm-bindgen`](https://github.com/rustwasm/wasm-bindgen) for communicating
-  between WebAssembly and JavaScript.
-* [`console_error_panic_hook`](https://github.com/rustwasm/console_error_panic_hook)
-  for logging panic messages to the developer console.
-* `LICENSE-APACHE` and `LICENSE-MIT`: most Rust projects are licensed this way, so these are included for you
-
-## License
-
-Licensed under either of
-
-* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
-* MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
-
-at your option.
-
-### Contribution
-
-Unless you explicitly state otherwise, any contribution intentionally
-submitted for inclusion in the work by you, as defined in the Apache-2.0
-license, shall be dual licensed as above, without any additional terms or
-conditions.

From 02486d671e4a0e42990e8c430ac9073777682ab9 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 5 Jan 2025 15:30:38 +0000
Subject: [PATCH 128/761] Migrate to webpack

---
 .github/workflows/check.yml |    5 +
 .gitignore                  |    2 +-
 .vscode/settings.json       |    2 +-
 plugin/esbuild.config.mjs   |  169 ----
 plugin/package-lock.json    | 1825 +++++++++++++++++++++++++++++++----
 plugin/package.json         |   29 +-
 plugin/tsconfig.json        |    2 +-
 plugin/webpack.config.js    |  109 +++
 8 files changed, 1773 insertions(+), 370 deletions(-)
 delete mode 100644 plugin/esbuild.config.mjs
 create mode 100644 plugin/webpack.config.js

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 8d7017c7..6dc3977c 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -51,6 +51,11 @@ jobs:
           cd plugin
           npm install
           npm run lint
+          if [[ -n $(git status --porcelain) ]]; then
+              git status --porcelain
+              echo "Failing CI because the working directory is not clean after linting."
+              exit 1
+          fi
 
       - name: Test frontend
         run: |
diff --git a/.gitignore b/.gitignore
index 3a599d3e..2875d13c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,7 @@ node_modules
 backend/target
 
 # Obsidian plugin build folder
-plugin/build
+plugin/dist
 
 backend/db.sqlite3*
 backend/config.yml
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 11cfe5c0..7528fff7 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,4 +1,4 @@
 {
-    "jest.jestCommandLine": "NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules\" npx jest",
+    "jest.jestCommandLine": "npx jest",
     "jest.rootPath": "plugin"
 }
\ No newline at end of file
diff --git a/plugin/esbuild.config.mjs b/plugin/esbuild.config.mjs
deleted file mode 100644
index f722803c..00000000
--- a/plugin/esbuild.config.mjs
+++ /dev/null
@@ -1,169 +0,0 @@
-import esbuild from "esbuild";
-import process from "process";
-import builtins from "builtin-modules";
-import { sassPlugin } from "esbuild-sass-plugin";
-import path from "node:path";
-import fs from "node:fs";
-import { wasmPack } from "esbuild-plugin-wasm-pack";
-
-const prod = process.argv[2] === "production";
-
-async function copyFiles(sourceDir, destinationDir) {
-	try {
-		await fs.promises.mkdir(destinationDir, { recursive: true });
-
-		const paths = Array.isArray(sourceDir)
-			? sourceDir
-			: (await fs.promises.readdir(sourceDir)).map((file) =>
-					path.join(sourceDir, file)
-			  );
-
-		await Promise.all(
-			paths.map(async (sourcePath) => {
-				const stat = await fs.promises.stat(sourcePath);
-
-				if (stat.isFile()) {
-					const destinationFile = path.join(
-						destinationDir,
-						path.basename(sourcePath)
-					);
-					await fs.promises.copyFile(sourcePath, destinationFile);
-					console.debug(`Copied ${sourcePath} to ${destinationFile}`);
-				} else {
-					console.info(`Skipping directory ${sourcePath}`);
-				}
-			})
-		);
-
-		console.info("All files copied successfully.");
-	} catch (err) {
-		console.error("Error copying files:", err);
-	}
-}
-
-let wasmPlugin = {
-	name: "wasm",
-	setup(build) {
-		// Resolve ".wasm" files to a path with a namespace
-		build.onResolve({ filter: /\.wasm$/ }, (args) => {
-			if (args.resolveDir === "") {
-				return; // Ignore unresolvable paths
-			}
-			return {
-				path: path.isAbsolute(args.path)
-					? args.path
-					: path.join(args.resolveDir, args.path),
-				namespace: "wasm-binary",
-			};
-		});
-
-		// Virtual modules in the "wasm-binary" namespace contain the
-		// actual bytes of the WebAssembly file. This uses esbuild's
-		// built-in "binary" loader instead of manually embedding the
-		// binary data inside JavaScript code ourselves.
-		build.onLoad(
-			{ filter: /.*/, namespace: "wasm-binary" },
-			async (args) => ({
-				contents: await fs.promises.readFile(args.path),
-				loader: "binary",
-			})
-		);
-	},
-};
-
-const copyBundle = () => ({
-	name: "post-compile",
-	setup(build) {
-		build.onEnd((result) => {
-			if (prod) {
-				fs.promises.copyFile("manifest.json", "build/manifest.json");
-				return;
-			}
-
-			if (result.errors.length === 0) {
-				copyFiles(
-					["manifest.json", ".hotreload"],
-					"/mnt/c/Users/Andras/Desktop/test/test/.obsidian/plugins/my-plugin"
-				);
-
-				copyFiles(
-					"build",
-					"/mnt/c/Users/Andras/Desktop/test/test/.obsidian/plugins/my-plugin"
-				);
-
-				copyFiles(
-					["manifest.json", ".hotreload"],
-					"/mnt/c/Users/Andras/Desktop/test/test2/.obsidian/plugins/my-plugin"
-				);
-
-				copyFiles(
-					"build",
-					"/mnt/c/Users/Andras/Desktop/test/test2/.obsidian/plugins/my-plugin"
-				);
-
-				copyFiles(
-					["manifest.json", ".hotreload"],
-					"/home/andras/obsidian-test/.obsidian/plugins/my-plugin"
-				);
-
-				copyFiles(
-					"build",
-					"/home/andras/obsidian-test/.obsidian/plugins/my-plugin"
-				);
-			}
-		});
-	},
-});
-
-const cssContext = await esbuild.context({
-	entryPoints: ["src/styles.scss"],
-	bundle: true,
-	outfile: "build/styles.css",
-	plugins: [sassPlugin(), copyBundle()],
-});
-
-const jsContext = await esbuild.context({
-	entryPoints: ["src/vault-link-plugin.ts"],
-	bundle: true,
-	external: [
-		"obsidian",
-		"electron",
-		"@codemirror/autocomplete",
-		"@codemirror/collab",
-		"@codemirror/commands",
-		"@codemirror/language",
-		"@codemirror/lint",
-		"@codemirror/search",
-		"@codemirror/state",
-		"@codemirror/view",
-		"@lezer/common",
-		"@lezer/highlight",
-		"@lezer/lr",
-		...builtins,
-	],
-	format: "cjs",
-	target: "es2020",
-	logLevel: "info",
-	resolveExtensions: [".ts"],
-	sourcemap: prod ? false : "inline",
-	treeShaking: false,
-	outfile: "build/main.js",
-	minify: prod,
-	plugins: [
-		wasmPlugin,
-		true
-			? null
-			: wasmPack({
-					target: "web",
-					path: "../backend/sync_lib",
-			  }),
-		copyBundle(),
-	].filter(Boolean),
-});
-
-if (prod) {
-	await Promise.all([cssContext.rebuild(), jsContext.rebuild()]);
-	process.exit(0);
-} else {
-	await Promise.all([cssContext.watch(), jsContext.watch()]);
-}
diff --git a/plugin/package-lock.json b/plugin/package-lock.json
index 63db2273..19c2038c 100644
--- a/plugin/package-lock.json
+++ b/plugin/package-lock.json
@@ -1,17 +1,18 @@
 {
-	"name": "obsidian-sample-plugin",
+	"name": "vault-link-obsidian-plugin",
 	"version": "0.0.13",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
-			"name": "obsidian-sample-plugin",
+			"name": "vault-link-obsidian-plugin",
 			"version": "0.0.13",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
 				"@types/node": "^16.11.6",
 				"builtin-modules": "3.3.0",
+				"css-loader": "^7.1.2",
 				"date-fns": "^4.1.0",
 				"dayjs": "^1.11.13",
 				"esbuild": "0.24.0",
@@ -20,17 +21,33 @@
 				"eslint": "9.17.0",
 				"eslint-plugin-unused-imports": "^4.1.4",
 				"fetch-retry": "^6.0.0",
+				"file-loader": "^6.2.0",
+				"fs-extra": "^11.2.0",
 				"jest": "^29.7.0",
+				"mini-css-extract-plugin": "^2.9.2",
 				"obsidian": "1.7.2",
 				"openapi-fetch": "0.13.3",
 				"openapi-typescript": "7.4.4",
 				"p-queue": "^8.0.1",
+				"prettier": "^3.4.2",
+				"resolve-url-loader": "^5.0.0",
+				"sass-loader": "^16.0.4",
+				"sync_lib": "file:../backend/sync_lib/pkg",
+				"terser-webpack-plugin": "^5.3.11",
 				"ts-jest": "^29.2.5",
+				"ts-loader": "^9.5.1",
 				"tslib": "2.4.0",
 				"typescript": "5.7.2",
-				"typescript-eslint": "8.18.0"
+				"typescript-eslint": "8.18.0",
+				"webpack": "^5.97.1",
+				"webpack-cli": "^6.0.1"
 			}
 		},
+		"../backend/sync_lib/pkg": {
+			"name": "sync_lib",
+			"version": "0.0.13",
+			"dev": true
+		},
 		"node_modules/@ampproject/remapping": {
 			"version": "2.3.0",
 			"resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
@@ -581,9 +598,9 @@
 			}
 		},
 		"node_modules/@codemirror/view": {
-			"version": "6.35.3",
-			"resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.35.3.tgz",
-			"integrity": "sha512-ScY7L8+EGdPl4QtoBiOzE4FELp7JmNUsBvgBcCakXWM2uiv/K89VAzU3BMDscf0DsACLvTKePbd5+cFDTcei6g==",
+			"version": "6.36.1",
+			"resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.36.1.tgz",
+			"integrity": "sha512-miD1nyT4m4uopZaDdO2uXU/LLHliKNYL9kB1C1wJHrunHLm/rpkb5QVSokqgw9hFqEZakrdlb/VGWX8aYZTslQ==",
 			"dev": true,
 			"license": "MIT",
 			"peer": true,
@@ -593,6 +610,16 @@
 				"w3c-keyname": "^2.2.4"
 			}
 		},
+		"node_modules/@discoveryjs/json-ext": {
+			"version": "0.6.3",
+			"resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.6.3.tgz",
+			"integrity": "sha512-4B4OijXeVNOPZlYA2oEwWOTkzyltLao+xbotHQeqN++Rv27Y6s818+n2Qkp8q+Fxhn0t/5lA5X1Mxktud8eayQ==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=14.17.0"
+			}
+		},
 		"node_modules/@esbuild/aix-ppc64": {
 			"version": "0.24.0",
 			"resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.24.0.tgz",
@@ -1020,6 +1047,19 @@
 				"eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
 			}
 		},
+		"node_modules/@eslint-community/eslint-utils/node_modules/eslint-visitor-keys": {
+			"version": "3.4.3",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+			"integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+			"dev": true,
+			"license": "Apache-2.0",
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://opencollective.com/eslint"
+			}
+		},
 		"node_modules/@eslint-community/regexpp": {
 			"version": "4.12.1",
 			"resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz",
@@ -1625,6 +1665,17 @@
 				"node": ">=6.0.0"
 			}
 		},
+		"node_modules/@jridgewell/source-map": {
+			"version": "0.3.6",
+			"resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz",
+			"integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jridgewell/gen-mapping": "^0.3.5",
+				"@jridgewell/trace-mapping": "^0.3.25"
+			}
+		},
 		"node_modules/@jridgewell/sourcemap-codec": {
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
@@ -2031,9 +2082,9 @@
 			"license": "MIT"
 		},
 		"node_modules/@redocly/openapi-core": {
-			"version": "1.26.0",
-			"resolved": "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.26.0.tgz",
-			"integrity": "sha512-8Ofu6WpBp7eoLmf1qQ4+T0W4LRr8es+4Drw/RJG+acPXmaT2TmHk2B2v+3+1R9GqSIj6kx3N7JmQkxAPCnvDLw==",
+			"version": "1.27.0",
+			"resolved": "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.27.0.tgz",
+			"integrity": "sha512-C3EU9NYbo7bCc9SduHrk6/liUuuBqVfJHOhfbscNCR1443Rdpz3s+bB2Xhso9mdQJT0JjklRn2WTANjavl2Zng==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2043,7 +2094,6 @@
 				"https-proxy-agent": "^7.0.4",
 				"js-levenshtein": "^1.1.6",
 				"js-yaml": "^4.1.0",
-				"lodash.isequal": "^4.5.0",
 				"minimatch": "^5.0.1",
 				"node-fetch": "^2.6.1",
 				"pluralize": "^8.0.0",
@@ -2159,6 +2209,28 @@
 				"@types/tern": "*"
 			}
 		},
+		"node_modules/@types/eslint": {
+			"version": "9.6.1",
+			"resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz",
+			"integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@types/estree": "*",
+				"@types/json-schema": "*"
+			}
+		},
+		"node_modules/@types/eslint-scope": {
+			"version": "3.7.7",
+			"resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
+			"integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@types/eslint": "*",
+				"@types/estree": "*"
+			}
+		},
 		"node_modules/@types/estree": {
 			"version": "1.0.6",
 			"resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
@@ -2222,9 +2294,9 @@
 			"license": "MIT"
 		},
 		"node_modules/@types/node": {
-			"version": "16.18.122",
-			"resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.122.tgz",
-			"integrity": "sha512-rF6rUBS80n4oK16EW8nE75U+9fw0SSUgoPtWSvHhPXdT7itbvmS7UjB/jyM8i3AkvI6yeSM5qCwo+xN0npGDHg==",
+			"version": "16.18.123",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.123.tgz",
+			"integrity": "sha512-/n7I6V/4agSpJtFDKKFEa763Hc1z3hmvchobHS1TisCOTKD5nxq8NJ2iK7SRIMYL276Q9mgWOx2AWp5n2XI6eA==",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -2468,19 +2540,228 @@
 				"url": "https://opencollective.com/typescript-eslint"
 			}
 		},
-		"node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
-			"integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
+		"node_modules/@webassemblyjs/ast": {
+			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz",
+			"integrity": "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@webassemblyjs/helper-numbers": "1.13.2",
+				"@webassemblyjs/helper-wasm-bytecode": "1.13.2"
+			}
+		},
+		"node_modules/@webassemblyjs/floating-point-hex-parser": {
+			"version": "1.13.2",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz",
+			"integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/@webassemblyjs/helper-api-error": {
+			"version": "1.13.2",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz",
+			"integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/@webassemblyjs/helper-buffer": {
+			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz",
+			"integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/@webassemblyjs/helper-numbers": {
+			"version": "1.13.2",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz",
+			"integrity": "sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@webassemblyjs/floating-point-hex-parser": "1.13.2",
+				"@webassemblyjs/helper-api-error": "1.13.2",
+				"@xtuc/long": "4.2.2"
+			}
+		},
+		"node_modules/@webassemblyjs/helper-wasm-bytecode": {
+			"version": "1.13.2",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz",
+			"integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/@webassemblyjs/helper-wasm-section": {
+			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz",
+			"integrity": "sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@webassemblyjs/ast": "1.14.1",
+				"@webassemblyjs/helper-buffer": "1.14.1",
+				"@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+				"@webassemblyjs/wasm-gen": "1.14.1"
+			}
+		},
+		"node_modules/@webassemblyjs/ieee754": {
+			"version": "1.13.2",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz",
+			"integrity": "sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@xtuc/ieee754": "^1.2.0"
+			}
+		},
+		"node_modules/@webassemblyjs/leb128": {
+			"version": "1.13.2",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz",
+			"integrity": "sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==",
 			"dev": true,
 			"license": "Apache-2.0",
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/eslint"
+			"dependencies": {
+				"@xtuc/long": "4.2.2"
 			}
 		},
+		"node_modules/@webassemblyjs/utf8": {
+			"version": "1.13.2",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz",
+			"integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/@webassemblyjs/wasm-edit": {
+			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz",
+			"integrity": "sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@webassemblyjs/ast": "1.14.1",
+				"@webassemblyjs/helper-buffer": "1.14.1",
+				"@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+				"@webassemblyjs/helper-wasm-section": "1.14.1",
+				"@webassemblyjs/wasm-gen": "1.14.1",
+				"@webassemblyjs/wasm-opt": "1.14.1",
+				"@webassemblyjs/wasm-parser": "1.14.1",
+				"@webassemblyjs/wast-printer": "1.14.1"
+			}
+		},
+		"node_modules/@webassemblyjs/wasm-gen": {
+			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz",
+			"integrity": "sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@webassemblyjs/ast": "1.14.1",
+				"@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+				"@webassemblyjs/ieee754": "1.13.2",
+				"@webassemblyjs/leb128": "1.13.2",
+				"@webassemblyjs/utf8": "1.13.2"
+			}
+		},
+		"node_modules/@webassemblyjs/wasm-opt": {
+			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz",
+			"integrity": "sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@webassemblyjs/ast": "1.14.1",
+				"@webassemblyjs/helper-buffer": "1.14.1",
+				"@webassemblyjs/wasm-gen": "1.14.1",
+				"@webassemblyjs/wasm-parser": "1.14.1"
+			}
+		},
+		"node_modules/@webassemblyjs/wasm-parser": {
+			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz",
+			"integrity": "sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@webassemblyjs/ast": "1.14.1",
+				"@webassemblyjs/helper-api-error": "1.13.2",
+				"@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+				"@webassemblyjs/ieee754": "1.13.2",
+				"@webassemblyjs/leb128": "1.13.2",
+				"@webassemblyjs/utf8": "1.13.2"
+			}
+		},
+		"node_modules/@webassemblyjs/wast-printer": {
+			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz",
+			"integrity": "sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@webassemblyjs/ast": "1.14.1",
+				"@xtuc/long": "4.2.2"
+			}
+		},
+		"node_modules/@webpack-cli/configtest": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-3.0.1.tgz",
+			"integrity": "sha512-u8d0pJ5YFgneF/GuvEiDA61Tf1VDomHHYMjv/wc9XzYj7nopltpG96nXN5dJRstxZhcNpV1g+nT6CydO7pHbjA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=18.12.0"
+			},
+			"peerDependencies": {
+				"webpack": "^5.82.0",
+				"webpack-cli": "6.x.x"
+			}
+		},
+		"node_modules/@webpack-cli/info": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-3.0.1.tgz",
+			"integrity": "sha512-coEmDzc2u/ffMvuW9aCjoRzNSPDl/XLuhPdlFRpT9tZHmJ/039az33CE7uH+8s0uL1j5ZNtfdv0HkfaKRBGJsQ==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=18.12.0"
+			},
+			"peerDependencies": {
+				"webpack": "^5.82.0",
+				"webpack-cli": "6.x.x"
+			}
+		},
+		"node_modules/@webpack-cli/serve": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-3.0.1.tgz",
+			"integrity": "sha512-sbgw03xQaCLiT6gcY/6u3qBDn01CWw/nbaXl3gTdTFuJJ75Gffv3E3DBpgvY2fkkrdS1fpjaXNOmJlnbtKauKg==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=18.12.0"
+			},
+			"peerDependencies": {
+				"webpack": "^5.82.0",
+				"webpack-cli": "6.x.x"
+			},
+			"peerDependenciesMeta": {
+				"webpack-dev-server": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@xtuc/ieee754": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
+			"integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
+			"dev": true,
+			"license": "BSD-3-Clause"
+		},
+		"node_modules/@xtuc/long": {
+			"version": "4.2.2",
+			"resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
+			"integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
+			"dev": true,
+			"license": "Apache-2.0"
+		},
 		"node_modules/acorn": {
 			"version": "8.14.0",
 			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
@@ -2504,6 +2785,20 @@
 				"acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
 			}
 		},
+		"node_modules/adjust-sourcemap-loader": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-4.0.0.tgz",
+			"integrity": "sha512-OXwN5b9pCUXNQHJpwwD2qP40byEmSgzj8B4ydSN0uMNYWiFmJ6x6KwUllMmfk8Rwu/HJDFR7U8ubsWBoN0Xp0A==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"loader-utils": "^2.0.0",
+				"regex-parser": "^2.2.11"
+			},
+			"engines": {
+				"node": ">=8.9"
+			}
+		},
 		"node_modules/agent-base": {
 			"version": "7.1.3",
 			"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
@@ -2531,6 +2826,58 @@
 				"url": "https://github.com/sponsors/epoberezkin"
 			}
 		},
+		"node_modules/ajv-formats": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
+			"integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ajv": "^8.0.0"
+			},
+			"peerDependencies": {
+				"ajv": "^8.0.0"
+			},
+			"peerDependenciesMeta": {
+				"ajv": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/ajv-formats/node_modules/ajv": {
+			"version": "8.17.1",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+			"integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"fast-deep-equal": "^3.1.3",
+				"fast-uri": "^3.0.1",
+				"json-schema-traverse": "^1.0.0",
+				"require-from-string": "^2.0.2"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/epoberezkin"
+			}
+		},
+		"node_modules/ajv-formats/node_modules/json-schema-traverse": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/ajv-keywords": {
+			"version": "3.5.2",
+			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+			"integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+			"dev": true,
+			"license": "MIT",
+			"peerDependencies": {
+				"ajv": "^6.9.1"
+			}
+		},
 		"node_modules/ansi-colors": {
 			"version": "4.1.3",
 			"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
@@ -2744,6 +3091,16 @@
 			"dev": true,
 			"license": "MIT"
 		},
+		"node_modules/big.js": {
+			"version": "5.2.2",
+			"resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
+			"integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": "*"
+			}
+		},
 		"node_modules/brace-expansion": {
 			"version": "1.1.11",
 			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -2943,6 +3300,16 @@
 				"url": "https://paulmillr.com/funding/"
 			}
 		},
+		"node_modules/chrome-trace-event": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz",
+			"integrity": "sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6.0"
+			}
+		},
 		"node_modules/ci-info": {
 			"version": "3.9.0",
 			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
@@ -2981,6 +3348,21 @@
 				"node": ">=12"
 			}
 		},
+		"node_modules/clone-deep": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
+			"integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"is-plain-object": "^2.0.4",
+				"kind-of": "^6.0.2",
+				"shallow-clone": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
 		"node_modules/co": {
 			"version": "4.6.0",
 			"resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
@@ -3034,6 +3416,13 @@
 			"license": "MIT",
 			"peer": true
 		},
+		"node_modules/commander": {
+			"version": "2.20.3",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+			"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+			"dev": true,
+			"license": "MIT"
+		},
 		"node_modules/concat-map": {
 			"version": "0.0.1",
 			"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -3085,6 +3474,55 @@
 				"node": ">= 8"
 			}
 		},
+		"node_modules/css-loader": {
+			"version": "7.1.2",
+			"resolved": "https://registry.npmjs.org/css-loader/-/css-loader-7.1.2.tgz",
+			"integrity": "sha512-6WvYYn7l/XEGN8Xu2vWFt9nVzrCn39vKyTEFf/ExEyoksJjjSZV/0/35XPlMbpnr6VGhZIUg5yJrL8tGfes/FA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"icss-utils": "^5.1.0",
+				"postcss": "^8.4.33",
+				"postcss-modules-extract-imports": "^3.1.0",
+				"postcss-modules-local-by-default": "^4.0.5",
+				"postcss-modules-scope": "^3.2.0",
+				"postcss-modules-values": "^4.0.0",
+				"postcss-value-parser": "^4.2.0",
+				"semver": "^7.5.4"
+			},
+			"engines": {
+				"node": ">= 18.12.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependencies": {
+				"@rspack/core": "0.x || 1.x",
+				"webpack": "^5.27.0"
+			},
+			"peerDependenciesMeta": {
+				"@rspack/core": {
+					"optional": true
+				},
+				"webpack": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/cssesc": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+			"integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
+			"dev": true,
+			"license": "MIT",
+			"bin": {
+				"cssesc": "bin/cssesc"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
 		"node_modules/date-fns": {
 			"version": "4.1.0",
 			"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-4.1.0.tgz",
@@ -3230,6 +3668,43 @@
 			"dev": true,
 			"license": "MIT"
 		},
+		"node_modules/emojis-list": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+			"integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 4"
+			}
+		},
+		"node_modules/enhanced-resolve": {
+			"version": "5.18.0",
+			"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.0.tgz",
+			"integrity": "sha512-0/r0MySGYG8YqlayBZ6MuCfECmHFdJ5qyPh8s8wa5Hnm6SaFLSK1VYCbj+NKp090Nm1caZhD+QTnmxO7esYGyQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"graceful-fs": "^4.2.4",
+				"tapable": "^2.2.0"
+			},
+			"engines": {
+				"node": ">=10.13.0"
+			}
+		},
+		"node_modules/envinfo": {
+			"version": "7.14.0",
+			"resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.14.0.tgz",
+			"integrity": "sha512-CO40UI41xDQzhLB1hWyqUKgFhs250pNcGbyGKe1l/e4FSaI/+YE4IMG76GDt0In67WLPACIITC+sOi08x4wIvg==",
+			"dev": true,
+			"license": "MIT",
+			"bin": {
+				"envinfo": "dist/cli.js"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
 		"node_modules/error-ex": {
 			"version": "1.3.2",
 			"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
@@ -3240,6 +3715,13 @@
 				"is-arrayish": "^0.2.1"
 			}
 		},
+		"node_modules/es-module-lexer": {
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.6.0.tgz",
+			"integrity": "sha512-qqnD1yMU6tk/jnaMosogGySTZP8YtUgAffA9nMN+E/rjxcfRQ6IEk7IiozUjgxKoFHBGjTLnrHB/YC45r/59EQ==",
+			"dev": true,
+			"license": "MIT"
+		},
 		"node_modules/esbuild": {
 			"version": "0.24.0",
 			"resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.24.0.tgz",
@@ -3427,19 +3909,6 @@
 			}
 		},
 		"node_modules/eslint-visitor-keys": {
-			"version": "3.4.3",
-			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
-			"integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
-			"dev": true,
-			"license": "Apache-2.0",
-			"engines": {
-				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/eslint"
-			}
-		},
-		"node_modules/eslint/node_modules/eslint-visitor-keys": {
 			"version": "4.2.0",
 			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
 			"integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
@@ -3470,19 +3939,6 @@
 				"url": "https://opencollective.com/eslint"
 			}
 		},
-		"node_modules/espree/node_modules/eslint-visitor-keys": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
-			"integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
-			"dev": true,
-			"license": "Apache-2.0",
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/eslint"
-			}
-		},
 		"node_modules/esprima": {
 			"version": "4.0.1",
 			"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
@@ -3550,6 +4006,16 @@
 			"dev": true,
 			"license": "MIT"
 		},
+		"node_modules/events": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+			"integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.8.x"
+			}
+		},
 		"node_modules/execa": {
 			"version": "5.1.1",
 			"resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
@@ -3608,9 +4074,9 @@
 			"license": "MIT"
 		},
 		"node_modules/fast-glob": {
-			"version": "3.3.2",
-			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
-			"integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
+			"version": "3.3.3",
+			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
+			"integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -3618,7 +4084,7 @@
 				"@nodelib/fs.walk": "^1.2.3",
 				"glob-parent": "^5.1.2",
 				"merge2": "^1.3.0",
-				"micromatch": "^4.0.4"
+				"micromatch": "^4.0.8"
 			},
 			"engines": {
 				"node": ">=8.6.0"
@@ -3651,10 +4117,37 @@
 			"dev": true,
 			"license": "MIT"
 		},
+		"node_modules/fast-uri": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.4.tgz",
+			"integrity": "sha512-G3iTQw1DizJQ5eEqj1CbFCWhq+pzum7qepkxU7rS1FGZDqjYKcrguo9XDRbV7EgPnn8CgaPigTq+NEjyioeYZQ==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/fastify"
+				},
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/fastify"
+				}
+			],
+			"license": "BSD-3-Clause"
+		},
+		"node_modules/fastest-levenshtein": {
+			"version": "1.0.16",
+			"resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz",
+			"integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 4.9.1"
+			}
+		},
 		"node_modules/fastq": {
-			"version": "1.17.1",
-			"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
-			"integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
+			"version": "1.18.0",
+			"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.18.0.tgz",
+			"integrity": "sha512-QKHXPW0hD8g4UET03SdOdunzSouc9N4AuHdsX8XNcTsuz+yYFILVNIX4l9yHABMhiEI9Db0JTTIpu0wB+Y1QQw==",
 			"dev": true,
 			"license": "ISC",
 			"dependencies": {
@@ -3691,6 +4184,27 @@
 				"node": ">=16.0.0"
 			}
 		},
+		"node_modules/file-loader": {
+			"version": "6.2.0",
+			"resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz",
+			"integrity": "sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"loader-utils": "^2.0.0",
+				"schema-utils": "^3.0.0"
+			},
+			"engines": {
+				"node": ">= 10.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependencies": {
+				"webpack": "^4.0.0 || ^5.0.0"
+			}
+		},
 		"node_modules/filelist": {
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
@@ -3754,6 +4268,16 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
+		"node_modules/flat": {
+			"version": "5.0.2",
+			"resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
+			"integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
+			"dev": true,
+			"license": "BSD-3-Clause",
+			"bin": {
+				"flat": "cli.js"
+			}
+		},
 		"node_modules/flat-cache": {
 			"version": "4.0.1",
 			"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz",
@@ -3775,6 +4299,21 @@
 			"dev": true,
 			"license": "ISC"
 		},
+		"node_modules/fs-extra": {
+			"version": "11.2.0",
+			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
+			"integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"graceful-fs": "^4.2.0",
+				"jsonfile": "^6.0.1",
+				"universalify": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=14.14"
+			}
+		},
 		"node_modules/fs.realpath": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -3885,6 +4424,13 @@
 				"node": ">=10.13.0"
 			}
 		},
+		"node_modules/glob-to-regexp": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
+			"integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
+			"dev": true,
+			"license": "BSD-2-Clause"
+		},
 		"node_modules/globals": {
 			"version": "14.0.0",
 			"resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz",
@@ -3966,6 +4512,19 @@
 				"node": ">=10.17.0"
 			}
 		},
+		"node_modules/icss-utils": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
+			"integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
+			"dev": true,
+			"license": "ISC",
+			"engines": {
+				"node": "^10 || ^12 || >= 14"
+			},
+			"peerDependencies": {
+				"postcss": "^8.1.0"
+			}
+		},
 		"node_modules/ignore": {
 			"version": "5.3.2",
 			"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
@@ -4062,6 +4621,16 @@
 			"dev": true,
 			"license": "ISC"
 		},
+		"node_modules/interpret": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/interpret/-/interpret-3.1.1.tgz",
+			"integrity": "sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=10.13.0"
+			}
+		},
 		"node_modules/is-arrayish": {
 			"version": "0.2.1",
 			"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
@@ -4070,9 +4639,9 @@
 			"license": "MIT"
 		},
 		"node_modules/is-core-module": {
-			"version": "2.16.0",
-			"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.0.tgz",
-			"integrity": "sha512-urTSINYfAYgcbLb0yDQ6egFm6h3Mo1DcF9EkyXSRjjzdHbsulg01qhwWuXdOoUBuTkbQ80KDboXa0vFJ+BDH+g==",
+			"version": "2.16.1",
+			"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
+			"integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4138,6 +4707,19 @@
 				"node": ">=0.12.0"
 			}
 		},
+		"node_modules/is-plain-object": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+			"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"isobject": "^3.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
 		"node_modules/is-stream": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
@@ -4158,6 +4740,16 @@
 			"dev": true,
 			"license": "ISC"
 		},
+		"node_modules/isobject": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+			"integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
 		"node_modules/istanbul-lib-coverage": {
 			"version": "3.2.2",
 			"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
@@ -4402,25 +4994,6 @@
 				}
 			}
 		},
-		"node_modules/jest-config/node_modules/parse-json": {
-			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
-			"integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/code-frame": "^7.0.0",
-				"error-ex": "^1.3.1",
-				"json-parse-even-better-errors": "^2.3.0",
-				"lines-and-columns": "^1.1.6"
-			},
-			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
 		"node_modules/jest-diff": {
 			"version": "29.7.0",
 			"resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz",
@@ -4934,6 +5507,19 @@
 				"node": ">=6"
 			}
 		},
+		"node_modules/jsonfile": {
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+			"integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"universalify": "^2.0.0"
+			},
+			"optionalDependencies": {
+				"graceful-fs": "^4.1.6"
+			}
+		},
 		"node_modules/keyv": {
 			"version": "4.5.4",
 			"resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
@@ -4944,6 +5530,16 @@
 				"json-buffer": "3.0.1"
 			}
 		},
+		"node_modules/kind-of": {
+			"version": "6.0.3",
+			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+			"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
 		"node_modules/kleur": {
 			"version": "3.0.3",
 			"resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
@@ -4985,6 +5581,31 @@
 			"dev": true,
 			"license": "MIT"
 		},
+		"node_modules/loader-runner": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
+			"integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6.11.5"
+			}
+		},
+		"node_modules/loader-utils": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+			"integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"big.js": "^5.2.2",
+				"emojis-list": "^3.0.0",
+				"json5": "^2.1.2"
+			},
+			"engines": {
+				"node": ">=8.9.0"
+			}
+		},
 		"node_modules/locate-path": {
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
@@ -5001,13 +5622,6 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/lodash.isequal": {
-			"version": "4.5.0",
-			"resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
-			"integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==",
-			"dev": true,
-			"license": "MIT"
-		},
 		"node_modules/lodash.memoize": {
 			"version": "4.1.2",
 			"resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
@@ -5096,6 +5710,29 @@
 				"node": ">=8.6"
 			}
 		},
+		"node_modules/mime-db": {
+			"version": "1.52.0",
+			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+			"integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/mime-types": {
+			"version": "2.1.35",
+			"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+			"integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"mime-db": "1.52.0"
+			},
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
 		"node_modules/mimic-fn": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
@@ -5106,6 +5743,84 @@
 				"node": ">=6"
 			}
 		},
+		"node_modules/mini-css-extract-plugin": {
+			"version": "2.9.2",
+			"resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.2.tgz",
+			"integrity": "sha512-GJuACcS//jtq4kCtd5ii/M0SZf7OZRH+BxdqXZHaJfb8TJiVl+NgQRPwiYt2EuqeSkNydn/7vP+bcE27C5mb9w==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"schema-utils": "^4.0.0",
+				"tapable": "^2.2.1"
+			},
+			"engines": {
+				"node": ">= 12.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependencies": {
+				"webpack": "^5.0.0"
+			}
+		},
+		"node_modules/mini-css-extract-plugin/node_modules/ajv": {
+			"version": "8.17.1",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+			"integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"fast-deep-equal": "^3.1.3",
+				"fast-uri": "^3.0.1",
+				"json-schema-traverse": "^1.0.0",
+				"require-from-string": "^2.0.2"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/epoberezkin"
+			}
+		},
+		"node_modules/mini-css-extract-plugin/node_modules/ajv-keywords": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+			"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"fast-deep-equal": "^3.1.3"
+			},
+			"peerDependencies": {
+				"ajv": "^8.8.2"
+			}
+		},
+		"node_modules/mini-css-extract-plugin/node_modules/json-schema-traverse": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/mini-css-extract-plugin/node_modules/schema-utils": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.0.tgz",
+			"integrity": "sha512-Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@types/json-schema": "^7.0.9",
+				"ajv": "^8.9.0",
+				"ajv-formats": "^2.1.1",
+				"ajv-keywords": "^5.1.0"
+			},
+			"engines": {
+				"node": ">= 10.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			}
+		},
 		"node_modules/minimatch": {
 			"version": "3.1.2",
 			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
@@ -5136,6 +5851,25 @@
 			"dev": true,
 			"license": "MIT"
 		},
+		"node_modules/nanoid": {
+			"version": "3.3.8",
+			"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
+			"integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/ai"
+				}
+			],
+			"license": "MIT",
+			"bin": {
+				"nanoid": "bin/nanoid.cjs"
+			},
+			"engines": {
+				"node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+			}
+		},
 		"node_modules/natural-compare": {
 			"version": "1.4.0",
 			"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
@@ -5143,6 +5877,13 @@
 			"dev": true,
 			"license": "MIT"
 		},
+		"node_modules/neo-async": {
+			"version": "2.6.2",
+			"resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
+			"integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
+			"dev": true,
+			"license": "MIT"
+		},
 		"node_modules/node-addon-api": {
 			"version": "7.1.1",
 			"resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz",
@@ -5288,6 +6029,24 @@
 			"dev": true,
 			"license": "MIT"
 		},
+		"node_modules/openapi-typescript/node_modules/parse-json": {
+			"version": "8.1.0",
+			"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-8.1.0.tgz",
+			"integrity": "sha512-rum1bPifK5SSar35Z6EKZuYPJx85pkNaFrxBK3mwdfSJ1/WKbYrjoW/zTPSjRRamfmVX1ACBIdFAO0VRErW/EA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/code-frame": "^7.22.13",
+				"index-to-position": "^0.1.2",
+				"type-fest": "^4.7.1"
+			},
+			"engines": {
+				"node": ">=18"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
 		"node_modules/openapi-typescript/node_modules/supports-color": {
 			"version": "9.4.0",
 			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-9.4.0.tgz",
@@ -5301,6 +6060,19 @@
 				"url": "https://github.com/chalk/supports-color?sponsor=1"
 			}
 		},
+		"node_modules/openapi-typescript/node_modules/type-fest": {
+			"version": "4.31.0",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.31.0.tgz",
+			"integrity": "sha512-yCxltHW07Nkhv/1F6wWBr8kz+5BGMfP+RbRSYFnegVb0qV/UMT0G0ElBloPVerqn4M2ZV80Ir1FtCcYv1cT6vQ==",
+			"dev": true,
+			"license": "(MIT OR CC0-1.0)",
+			"engines": {
+				"node": ">=16"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
 		"node_modules/optionator": {
 			"version": "0.9.4",
 			"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
@@ -5369,9 +6141,9 @@
 			}
 		},
 		"node_modules/p-timeout": {
-			"version": "6.1.3",
-			"resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-6.1.3.tgz",
-			"integrity": "sha512-UJUyfKbwvr/uZSV6btANfb+0t/mOhKV/KXcCUTp8FcQI+v/0d+wXqH4htrW0E4rR6WiEO/EPvUFiV9D5OI4vlw==",
+			"version": "6.1.4",
+			"resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-6.1.4.tgz",
+			"integrity": "sha512-MyIV3ZA/PmyBN/ud8vV9XzwTrNtR4jFrObymZYnZqMmW0zA8Z17vnT0rBgFE/TlohB+YCHqXMgZzb3Csp49vqg==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -5405,31 +6177,19 @@
 			}
 		},
 		"node_modules/parse-json": {
-			"version": "8.1.0",
-			"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-8.1.0.tgz",
-			"integrity": "sha512-rum1bPifK5SSar35Z6EKZuYPJx85pkNaFrxBK3mwdfSJ1/WKbYrjoW/zTPSjRRamfmVX1ACBIdFAO0VRErW/EA==",
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+			"integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@babel/code-frame": "^7.22.13",
-				"index-to-position": "^0.1.2",
-				"type-fest": "^4.7.1"
+				"@babel/code-frame": "^7.0.0",
+				"error-ex": "^1.3.1",
+				"json-parse-even-better-errors": "^2.3.0",
+				"lines-and-columns": "^1.1.6"
 			},
 			"engines": {
-				"node": ">=18"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/parse-json/node_modules/type-fest": {
-			"version": "4.30.1",
-			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.30.1.tgz",
-			"integrity": "sha512-ojFL7eDMX2NF0xMbDwPZJ8sb7ckqtlAi1GsmgsFXvErT9kFTk1r0DuQKvrCh73M6D4nngeHJmvogF9OluXs7Hw==",
-			"dev": true,
-			"license": "(MIT OR CC0-1.0)",
-			"engines": {
-				"node": ">=16"
+				"node": ">=8"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/sindresorhus"
@@ -5581,6 +6341,119 @@
 				"node": ">=4"
 			}
 		},
+		"node_modules/postcss": {
+			"version": "8.4.49",
+			"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz",
+			"integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/postcss/"
+				},
+				{
+					"type": "tidelift",
+					"url": "https://tidelift.com/funding/github/npm/postcss"
+				},
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/ai"
+				}
+			],
+			"license": "MIT",
+			"dependencies": {
+				"nanoid": "^3.3.7",
+				"picocolors": "^1.1.1",
+				"source-map-js": "^1.2.1"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14"
+			}
+		},
+		"node_modules/postcss-modules-extract-imports": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.1.0.tgz",
+			"integrity": "sha512-k3kNe0aNFQDAZGbin48pL2VNidTF0w4/eASDsxlyspobzU3wZQLOGj7L9gfRe0Jo9/4uud09DsjFNH7winGv8Q==",
+			"dev": true,
+			"license": "ISC",
+			"engines": {
+				"node": "^10 || ^12 || >= 14"
+			},
+			"peerDependencies": {
+				"postcss": "^8.1.0"
+			}
+		},
+		"node_modules/postcss-modules-local-by-default": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.2.0.tgz",
+			"integrity": "sha512-5kcJm/zk+GJDSfw+V/42fJ5fhjL5YbFDl8nVdXkJPLLW+Vf9mTD5Xe0wqIaDnLuL2U6cDNpTr+UQ+v2HWIBhzw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"icss-utils": "^5.0.0",
+				"postcss-selector-parser": "^7.0.0",
+				"postcss-value-parser": "^4.1.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >= 14"
+			},
+			"peerDependencies": {
+				"postcss": "^8.1.0"
+			}
+		},
+		"node_modules/postcss-modules-scope": {
+			"version": "3.2.1",
+			"resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.2.1.tgz",
+			"integrity": "sha512-m9jZstCVaqGjTAuny8MdgE88scJnCiQSlSrOWcTQgM2t32UBe+MUmFSO5t7VMSfAf/FJKImAxBav8ooCHJXCJA==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"postcss-selector-parser": "^7.0.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >= 14"
+			},
+			"peerDependencies": {
+				"postcss": "^8.1.0"
+			}
+		},
+		"node_modules/postcss-modules-values": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
+			"integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"icss-utils": "^5.0.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >= 14"
+			},
+			"peerDependencies": {
+				"postcss": "^8.1.0"
+			}
+		},
+		"node_modules/postcss-selector-parser": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.0.0.tgz",
+			"integrity": "sha512-9RbEr1Y7FFfptd/1eEdntyjMwLeghW1bHX9GWjXo19vx4ytPQhANltvVxDggzJl7mnWM+dX28kb6cyS/4iQjlQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"cssesc": "^3.0.0",
+				"util-deprecate": "^1.0.2"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/postcss-value-parser": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+			"dev": true,
+			"license": "MIT"
+		},
 		"node_modules/prelude-ls": {
 			"version": "1.2.1",
 			"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
@@ -5591,6 +6464,22 @@
 				"node": ">= 0.8.0"
 			}
 		},
+		"node_modules/prettier": {
+			"version": "3.4.2",
+			"resolved": "https://registry.npmjs.org/prettier/-/prettier-3.4.2.tgz",
+			"integrity": "sha512-e9MewbtFo+Fevyuxn/4rrcDAaq0IYxPGLvObpQjiZBMAzB9IGmzlnG9RZy3FFas+eBMu2vA0CszMeduow5dIuQ==",
+			"dev": true,
+			"license": "MIT",
+			"bin": {
+				"prettier": "bin/prettier.cjs"
+			},
+			"engines": {
+				"node": ">=14"
+			},
+			"funding": {
+				"url": "https://github.com/prettier/prettier?sponsor=1"
+			}
+		},
 		"node_modules/pretty-format": {
 			"version": "29.7.0",
 			"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
@@ -5681,6 +6570,16 @@
 			],
 			"license": "MIT"
 		},
+		"node_modules/randombytes": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+			"integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"safe-buffer": "^5.1.0"
+			}
+		},
 		"node_modules/react-is": {
 			"version": "18.3.1",
 			"resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
@@ -5702,6 +6601,26 @@
 				"url": "https://paulmillr.com/funding/"
 			}
 		},
+		"node_modules/rechoir": {
+			"version": "0.8.0",
+			"resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.8.0.tgz",
+			"integrity": "sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"resolve": "^1.20.0"
+			},
+			"engines": {
+				"node": ">= 10.13.0"
+			}
+		},
+		"node_modules/regex-parser": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.3.0.tgz",
+			"integrity": "sha512-TVILVSz2jY5D47F4mA4MppkBrafEaiUWJO/TcZHEIuI13AqoZMkK1WMA4Om1YkYbTx+9Ki1/tSUXbceyr9saRg==",
+			"dev": true,
+			"license": "MIT"
+		},
 		"node_modules/require-directory": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -5776,6 +6695,30 @@
 				"node": ">=4"
 			}
 		},
+		"node_modules/resolve-url-loader": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-5.0.0.tgz",
+			"integrity": "sha512-uZtduh8/8srhBoMx//5bwqjQ+rfYOUq8zC9NrMUGtjBiGTtFJM42s58/36+hTqeqINcnYe08Nj3LkK9lW4N8Xg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"adjust-sourcemap-loader": "^4.0.0",
+				"convert-source-map": "^1.7.0",
+				"loader-utils": "^2.0.0",
+				"postcss": "^8.2.14",
+				"source-map": "0.6.1"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/resolve-url-loader/node_modules/convert-source-map": {
+			"version": "1.9.0",
+			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
+			"integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
+			"dev": true,
+			"license": "MIT"
+		},
 		"node_modules/resolve.exports": {
 			"version": "2.0.3",
 			"resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.3.tgz",
@@ -5832,6 +6775,27 @@
 				"tslib": "^2.1.0"
 			}
 		},
+		"node_modules/safe-buffer": {
+			"version": "5.2.1",
+			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+			"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+			"dev": true,
+			"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"
+		},
 		"node_modules/safe-identifier": {
 			"version": "0.4.2",
 			"resolved": "https://registry.npmjs.org/safe-identifier/-/safe-identifier-0.4.2.tgz",
@@ -5840,9 +6804,9 @@
 			"license": "ISC"
 		},
 		"node_modules/sass": {
-			"version": "1.83.0",
-			"resolved": "https://registry.npmjs.org/sass/-/sass-1.83.0.tgz",
-			"integrity": "sha512-qsSxlayzoOjdvXMVLkzF84DJFc2HZEL/rFyGIKbbilYtAvlCxyuzUeff9LawTn4btVnLKg75Z8MMr1lxU1lfGw==",
+			"version": "1.83.1",
+			"resolved": "https://registry.npmjs.org/sass/-/sass-1.83.1.tgz",
+			"integrity": "sha512-EVJbDaEs4Rr3F0glJzFSOvtg2/oy2V/YrGFPqPY24UqcLDWcI9ZY5sN+qyO3c/QCZwzgfirvhXvINiJCE/OLcA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5861,9 +6825,9 @@
 			}
 		},
 		"node_modules/sass-embedded": {
-			"version": "1.83.0",
-			"resolved": "https://registry.npmjs.org/sass-embedded/-/sass-embedded-1.83.0.tgz",
-			"integrity": "sha512-/8cYZeL39evUqe0o//193na51Q1VWZ61qhxioQvLJwOtWIrX+PgNhCyD8RSuTtmzc4+6+waFZf899bfp/MCUwA==",
+			"version": "1.83.1",
+			"resolved": "https://registry.npmjs.org/sass-embedded/-/sass-embedded-1.83.1.tgz",
+			"integrity": "sha512-LdKG6nxLEzpXbMUt0if12PhUNonGvy91n7IWHOZRZjvA6AWm9oVdhpO+KEXN/Sc+jjGvQeQcav9+Z8DwmII/pA==",
 			"dev": true,
 			"license": "MIT",
 			"peer": true,
@@ -5884,32 +6848,32 @@
 				"node": ">=16.0.0"
 			},
 			"optionalDependencies": {
-				"sass-embedded-android-arm": "1.83.0",
-				"sass-embedded-android-arm64": "1.83.0",
-				"sass-embedded-android-ia32": "1.83.0",
-				"sass-embedded-android-riscv64": "1.83.0",
-				"sass-embedded-android-x64": "1.83.0",
-				"sass-embedded-darwin-arm64": "1.83.0",
-				"sass-embedded-darwin-x64": "1.83.0",
-				"sass-embedded-linux-arm": "1.83.0",
-				"sass-embedded-linux-arm64": "1.83.0",
-				"sass-embedded-linux-ia32": "1.83.0",
-				"sass-embedded-linux-musl-arm": "1.83.0",
-				"sass-embedded-linux-musl-arm64": "1.83.0",
-				"sass-embedded-linux-musl-ia32": "1.83.0",
-				"sass-embedded-linux-musl-riscv64": "1.83.0",
-				"sass-embedded-linux-musl-x64": "1.83.0",
-				"sass-embedded-linux-riscv64": "1.83.0",
-				"sass-embedded-linux-x64": "1.83.0",
-				"sass-embedded-win32-arm64": "1.83.0",
-				"sass-embedded-win32-ia32": "1.83.0",
-				"sass-embedded-win32-x64": "1.83.0"
+				"sass-embedded-android-arm": "1.83.1",
+				"sass-embedded-android-arm64": "1.83.1",
+				"sass-embedded-android-ia32": "1.83.1",
+				"sass-embedded-android-riscv64": "1.83.1",
+				"sass-embedded-android-x64": "1.83.1",
+				"sass-embedded-darwin-arm64": "1.83.1",
+				"sass-embedded-darwin-x64": "1.83.1",
+				"sass-embedded-linux-arm": "1.83.1",
+				"sass-embedded-linux-arm64": "1.83.1",
+				"sass-embedded-linux-ia32": "1.83.1",
+				"sass-embedded-linux-musl-arm": "1.83.1",
+				"sass-embedded-linux-musl-arm64": "1.83.1",
+				"sass-embedded-linux-musl-ia32": "1.83.1",
+				"sass-embedded-linux-musl-riscv64": "1.83.1",
+				"sass-embedded-linux-musl-x64": "1.83.1",
+				"sass-embedded-linux-riscv64": "1.83.1",
+				"sass-embedded-linux-x64": "1.83.1",
+				"sass-embedded-win32-arm64": "1.83.1",
+				"sass-embedded-win32-ia32": "1.83.1",
+				"sass-embedded-win32-x64": "1.83.1"
 			}
 		},
 		"node_modules/sass-embedded-android-arm": {
-			"version": "1.83.0",
-			"resolved": "https://registry.npmjs.org/sass-embedded-android-arm/-/sass-embedded-android-arm-1.83.0.tgz",
-			"integrity": "sha512-uwFSXzJlfbd4Px189xE5l+cxN8+TQpXdQgJec7TIrb4HEY7imabtpYufpVdqUVwT1/uiis5V4+qIEC4Vl5XObQ==",
+			"version": "1.83.1",
+			"resolved": "https://registry.npmjs.org/sass-embedded-android-arm/-/sass-embedded-android-arm-1.83.1.tgz",
+			"integrity": "sha512-FKfrmwDG84L5cfn8fmIew47qnCFFUdcoOTCzOw8ROItkRhLLH0hnIm6gEpG5T6OFf6kxzUxvE9D0FvYQUznZrw==",
 			"cpu": [
 				"arm"
 			],
@@ -5925,9 +6889,9 @@
 			}
 		},
 		"node_modules/sass-embedded-android-arm64": {
-			"version": "1.83.0",
-			"resolved": "https://registry.npmjs.org/sass-embedded-android-arm64/-/sass-embedded-android-arm64-1.83.0.tgz",
-			"integrity": "sha512-GBiCvM4a2rkWBLdYDxI6XYnprfk5U5c81g69RC2X6kqPuzxzx8qTArQ9M6keFK4+iDQ5N9QTwFCr0KbZTn+ZNQ==",
+			"version": "1.83.1",
+			"resolved": "https://registry.npmjs.org/sass-embedded-android-arm64/-/sass-embedded-android-arm64-1.83.1.tgz",
+			"integrity": "sha512-S63rlLPGCA9FCqYYOobDJrwcuBX0zbSOl7y0jT9DlfqeqNOkC6NIT1id6RpMFCs3uhd4gbBS2E/5WPv5J5qwbw==",
 			"cpu": [
 				"arm64"
 			],
@@ -5943,9 +6907,9 @@
 			}
 		},
 		"node_modules/sass-embedded-android-ia32": {
-			"version": "1.83.0",
-			"resolved": "https://registry.npmjs.org/sass-embedded-android-ia32/-/sass-embedded-android-ia32-1.83.0.tgz",
-			"integrity": "sha512-5ATPdGo2SICqAhiJl/Z8KQ23zH4sGgobGgux0TnrNtt83uHZ+r+To/ubVJ7xTkZxed+KJZnIpolGD8dQyQqoTg==",
+			"version": "1.83.1",
+			"resolved": "https://registry.npmjs.org/sass-embedded-android-ia32/-/sass-embedded-android-ia32-1.83.1.tgz",
+			"integrity": "sha512-AGlY2vFLJhF2hN0qOz12f4eDs6x0b5BUapOpgfRrqQLHIfJhxkvi39bInsiBgQ57U0jb4I7AaS2e2e+sj7+Rqw==",
 			"cpu": [
 				"ia32"
 			],
@@ -5961,9 +6925,9 @@
 			}
 		},
 		"node_modules/sass-embedded-android-riscv64": {
-			"version": "1.83.0",
-			"resolved": "https://registry.npmjs.org/sass-embedded-android-riscv64/-/sass-embedded-android-riscv64-1.83.0.tgz",
-			"integrity": "sha512-aveknUOB8GZewOzVn2Uwk+DKcncTR50Q6vtzslNMGbYnxtgQNHzy8A1qVEviNUruex+pHofppeMK4iMPFAbiEQ==",
+			"version": "1.83.1",
+			"resolved": "https://registry.npmjs.org/sass-embedded-android-riscv64/-/sass-embedded-android-riscv64-1.83.1.tgz",
+			"integrity": "sha512-OyU4AnfAUVd/wBaT60XvHidmQdaEsVUnxvI71oyPM/id1v97aWTZX3SmGkwGb7uA/q6Soo2uNalgvOSNJn7PwA==",
 			"cpu": [
 				"riscv64"
 			],
@@ -5979,9 +6943,9 @@
 			}
 		},
 		"node_modules/sass-embedded-android-x64": {
-			"version": "1.83.0",
-			"resolved": "https://registry.npmjs.org/sass-embedded-android-x64/-/sass-embedded-android-x64-1.83.0.tgz",
-			"integrity": "sha512-WqIay/72ncyf9Ph4vS742J3a73wZihWmzFUwpn1OD6lme1Aj4eWzWIve5IVnlTEJgcZcDHu6ECID9IZgehJKoA==",
+			"version": "1.83.1",
+			"resolved": "https://registry.npmjs.org/sass-embedded-android-x64/-/sass-embedded-android-x64-1.83.1.tgz",
+			"integrity": "sha512-NY5rwffhF4TnhXVErZnfFIjHqU3MNoWxCuSHumRN3dDI8hp8+IF59W5+Qw9AARlTXvyb+D0u5653aLSea5F40w==",
 			"cpu": [
 				"x64"
 			],
@@ -5997,9 +6961,9 @@
 			}
 		},
 		"node_modules/sass-embedded-darwin-arm64": {
-			"version": "1.83.0",
-			"resolved": "https://registry.npmjs.org/sass-embedded-darwin-arm64/-/sass-embedded-darwin-arm64-1.83.0.tgz",
-			"integrity": "sha512-XQl9QqgxFFIPm/CzHhmppse5o9ocxrbaAdC2/DAnlAqvYWBBtgFqPjGoYlej13h9SzfvNoogx+y9r+Ap+e+hYg==",
+			"version": "1.83.1",
+			"resolved": "https://registry.npmjs.org/sass-embedded-darwin-arm64/-/sass-embedded-darwin-arm64-1.83.1.tgz",
+			"integrity": "sha512-w1SBcSkIgIWgUfB7IKcPoTbSwnS3Kag5PVv3e3xfW6ZCsDweYZLQntUd2WGgaoekdm1uIbVuvPxnDH2t880iGQ==",
 			"cpu": [
 				"arm64"
 			],
@@ -6015,9 +6979,9 @@
 			}
 		},
 		"node_modules/sass-embedded-darwin-x64": {
-			"version": "1.83.0",
-			"resolved": "https://registry.npmjs.org/sass-embedded-darwin-x64/-/sass-embedded-darwin-x64-1.83.0.tgz",
-			"integrity": "sha512-ERQ7Tvp1kFOW3ux4VDFIxb7tkYXHYc+zJpcrbs0hzcIO5ilIRU2tIOK1OrNwrFO6Qxyf7AUuBwYKLAtIU/Nz7g==",
+			"version": "1.83.1",
+			"resolved": "https://registry.npmjs.org/sass-embedded-darwin-x64/-/sass-embedded-darwin-x64-1.83.1.tgz",
+			"integrity": "sha512-RWrmLtUhEP5kvcGOAFdr99/ebZ/eW9z3FAktLldvgl2k96WSTC1Zr2ctL0E+Y+H3uLahEZsshIFk6RkVIRKIsA==",
 			"cpu": [
 				"x64"
 			],
@@ -6033,9 +6997,9 @@
 			}
 		},
 		"node_modules/sass-embedded-linux-arm": {
-			"version": "1.83.0",
-			"resolved": "https://registry.npmjs.org/sass-embedded-linux-arm/-/sass-embedded-linux-arm-1.83.0.tgz",
-			"integrity": "sha512-baG9RYBJxUFmqwDNC9h9ZFElgJoyO3jgHGjzEZ1wHhIS9anpG+zZQvO8bHx3dBpKEImX+DBeLX+CxsFR9n81gQ==",
+			"version": "1.83.1",
+			"resolved": "https://registry.npmjs.org/sass-embedded-linux-arm/-/sass-embedded-linux-arm-1.83.1.tgz",
+			"integrity": "sha512-y7rHuRgjg2YM284rin068PsEdthPljSGb653Slut5Wba4A2IP11UNVraSl6Je2AYTuoPRjQX0g7XdsrjXlzC3g==",
 			"cpu": [
 				"arm"
 			],
@@ -6051,9 +7015,9 @@
 			}
 		},
 		"node_modules/sass-embedded-linux-arm64": {
-			"version": "1.83.0",
-			"resolved": "https://registry.npmjs.org/sass-embedded-linux-arm64/-/sass-embedded-linux-arm64-1.83.0.tgz",
-			"integrity": "sha512-syEAVTJt4qhaMLxrSwOWa46zdqHJdnqJkLUK+t9aCr8xqBZLPxSUeIGji76uOehQZ1C+KGFj6n9xstHN6wzOJw==",
+			"version": "1.83.1",
+			"resolved": "https://registry.npmjs.org/sass-embedded-linux-arm64/-/sass-embedded-linux-arm64-1.83.1.tgz",
+			"integrity": "sha512-HVIytzj8OO18fmBY6SVRIYErcJ+Nd9a5RNF6uArav/CqvwPLATlUV8dwqSyWQIzSsQUhDF/vFIlJIoNLKKzD3A==",
 			"cpu": [
 				"arm64"
 			],
@@ -6069,9 +7033,9 @@
 			}
 		},
 		"node_modules/sass-embedded-linux-ia32": {
-			"version": "1.83.0",
-			"resolved": "https://registry.npmjs.org/sass-embedded-linux-ia32/-/sass-embedded-linux-ia32-1.83.0.tgz",
-			"integrity": "sha512-RRBxQxMpoxu5+XcSSc6QR/o9asEwUzR8AbCS83RaXcdTIHTa/CccQsiAoDDoPlRsMTLqnzs0LKL4CfOsf7zBbA==",
+			"version": "1.83.1",
+			"resolved": "https://registry.npmjs.org/sass-embedded-linux-ia32/-/sass-embedded-linux-ia32-1.83.1.tgz",
+			"integrity": "sha512-/pc+jHllyvfaYYLTRCoXseRc4+V3Z7IDPqsviTcfVdICAoR9mgK2RtIuIZanhm1NP/lDylDOgvj1NtjcA2dNvg==",
 			"cpu": [
 				"ia32"
 			],
@@ -6087,9 +7051,9 @@
 			}
 		},
 		"node_modules/sass-embedded-linux-musl-arm": {
-			"version": "1.83.0",
-			"resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-arm/-/sass-embedded-linux-musl-arm-1.83.0.tgz",
-			"integrity": "sha512-Yc7u2TelCfBab+PRob9/MNJFh3EooMiz4urvhejXkihTiKSHGCv5YqDdtWzvyb9tY2Jb7YtYREVuHwfdVn3dTQ==",
+			"version": "1.83.1",
+			"resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-arm/-/sass-embedded-linux-musl-arm-1.83.1.tgz",
+			"integrity": "sha512-sFM8GXOVoeR91j9MiwNRcFXRpTA7u4185SaGuvUjcRMb84mHvtWOJPGDvgZqbWdVClBRJp6J7+CShliWngy/og==",
 			"cpu": [
 				"arm"
 			],
@@ -6105,9 +7069,9 @@
 			}
 		},
 		"node_modules/sass-embedded-linux-musl-arm64": {
-			"version": "1.83.0",
-			"resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-arm64/-/sass-embedded-linux-musl-arm64-1.83.0.tgz",
-			"integrity": "sha512-Y7juhPHClUO2H5O+u+StRy6SEAcwZ+hTEk5WJdEmo1Bb1gDtfHvJaWB/iFZJ2tW0W1e865AZeUrC4OcOFjyAQA==",
+			"version": "1.83.1",
+			"resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-arm64/-/sass-embedded-linux-musl-arm64-1.83.1.tgz",
+			"integrity": "sha512-wjSIYYqdIQp3DjliSTYNFg04TVqQf/3Up/Stahol0Qf/TTjLkjHHtT2jnDaZI5GclHi2PVJqQF3wEGB8bGJMzQ==",
 			"cpu": [
 				"arm64"
 			],
@@ -6123,9 +7087,9 @@
 			}
 		},
 		"node_modules/sass-embedded-linux-musl-ia32": {
-			"version": "1.83.0",
-			"resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-ia32/-/sass-embedded-linux-musl-ia32-1.83.0.tgz",
-			"integrity": "sha512-arQeYwGmwXV8byx5G1PtSzZWW1jbkfR5qrIHMEbTFSAvAxpqjgSvCvrHMOFd73FcMxVaYh4BX9LQNbKinkbEdg==",
+			"version": "1.83.1",
+			"resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-ia32/-/sass-embedded-linux-musl-ia32-1.83.1.tgz",
+			"integrity": "sha512-iwhTH5gwmoGt3VH6dn4WV8N6eWvthKAvUX5XPURq7e9KEsc7QP8YNHagwaAJh7TAPopb32buyEg6oaUmzxUI+Q==",
 			"cpu": [
 				"ia32"
 			],
@@ -6141,9 +7105,9 @@
 			}
 		},
 		"node_modules/sass-embedded-linux-musl-riscv64": {
-			"version": "1.83.0",
-			"resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-riscv64/-/sass-embedded-linux-musl-riscv64-1.83.0.tgz",
-			"integrity": "sha512-E6uzlIWz59rut+Z3XR6mLG915zNzv07ISvj3GUNZENdHM7dF8GQ//ANoIpl5PljMQKp89GnYdvo6kj2gnaBf/g==",
+			"version": "1.83.1",
+			"resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-riscv64/-/sass-embedded-linux-musl-riscv64-1.83.1.tgz",
+			"integrity": "sha512-FjFNWHU1n0Q6GpK1lAHQL5WmzlPjL8DTVLkYW2A/dq8EsutAdi3GfpeyWZk9bte8kyWdmPUWG3BHlnQl22xdoA==",
 			"cpu": [
 				"riscv64"
 			],
@@ -6159,9 +7123,9 @@
 			}
 		},
 		"node_modules/sass-embedded-linux-musl-x64": {
-			"version": "1.83.0",
-			"resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-x64/-/sass-embedded-linux-musl-x64-1.83.0.tgz",
-			"integrity": "sha512-eAMK6tyGqvqr21r9g8BnR3fQc1rYFj85RGduSQ3xkITZ6jOAnOhuU94N5fwRS852Hpws0lXhET+7JHXgg3U18w==",
+			"version": "1.83.1",
+			"resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-x64/-/sass-embedded-linux-musl-x64-1.83.1.tgz",
+			"integrity": "sha512-BUfYR5TIDvgGHWhxSIKwTJocXU88ECZ0BW89RJqtvr7m83fKdf5ylTFCOieU7BwcA7SORUeZzcQzVFIdPUM3BQ==",
 			"cpu": [
 				"x64"
 			],
@@ -6177,9 +7141,9 @@
 			}
 		},
 		"node_modules/sass-embedded-linux-riscv64": {
-			"version": "1.83.0",
-			"resolved": "https://registry.npmjs.org/sass-embedded-linux-riscv64/-/sass-embedded-linux-riscv64-1.83.0.tgz",
-			"integrity": "sha512-Ojpi78pTv02sy2fUYirRGXHLY3fPnV/bvwuC2i5LwPQw2LpCcFyFTtN0c5h4LJDk9P6wr+/ZB/JXU8tHIOlK+Q==",
+			"version": "1.83.1",
+			"resolved": "https://registry.npmjs.org/sass-embedded-linux-riscv64/-/sass-embedded-linux-riscv64-1.83.1.tgz",
+			"integrity": "sha512-KOBGSpMrJi8y+H+za3vAAVQImPUvQa5eUrvTbbOl+wkU7WAGhOu8xrxgmYYiz3pZVBBcfRjz4I2jBcDFKJmWSw==",
 			"cpu": [
 				"riscv64"
 			],
@@ -6195,9 +7159,9 @@
 			}
 		},
 		"node_modules/sass-embedded-linux-x64": {
-			"version": "1.83.0",
-			"resolved": "https://registry.npmjs.org/sass-embedded-linux-x64/-/sass-embedded-linux-x64-1.83.0.tgz",
-			"integrity": "sha512-3iLjlXdoPfgZRtX4odhRvka1BQs5mAXqfCtDIQBgh/o0JnGPzJIWWl9bYLpHxK8qb+uyVBxXYgXpI0sCzArBOw==",
+			"version": "1.83.1",
+			"resolved": "https://registry.npmjs.org/sass-embedded-linux-x64/-/sass-embedded-linux-x64-1.83.1.tgz",
+			"integrity": "sha512-swUsMHKqlEU9dZQ/I5WADDaXz+QkmJS27x/Oeh+oz41YgZ0ppKd0l4Vwjn0LgOQn+rxH1zLFv6xXDycvj68F/w==",
 			"cpu": [
 				"x64"
 			],
@@ -6213,9 +7177,9 @@
 			}
 		},
 		"node_modules/sass-embedded-win32-arm64": {
-			"version": "1.83.0",
-			"resolved": "https://registry.npmjs.org/sass-embedded-win32-arm64/-/sass-embedded-win32-arm64-1.83.0.tgz",
-			"integrity": "sha512-iOHw/8/t2dlTW3lOFwG5eUbiwhEyGWawivlKWJ8lkXH7fjMpVx2VO9zCFAm8RvY9xOHJ9sf1L7g5bx3EnNP9BQ==",
+			"version": "1.83.1",
+			"resolved": "https://registry.npmjs.org/sass-embedded-win32-arm64/-/sass-embedded-win32-arm64-1.83.1.tgz",
+			"integrity": "sha512-6lONEBN5TaFD5L/y68zUugryXqm4RAFuLdaOPeZQRu+7ay/AmfhtFYfE5gRssnIcIx1nlcoq7zA3UX+SN2jo1Q==",
 			"cpu": [
 				"arm64"
 			],
@@ -6231,9 +7195,9 @@
 			}
 		},
 		"node_modules/sass-embedded-win32-ia32": {
-			"version": "1.83.0",
-			"resolved": "https://registry.npmjs.org/sass-embedded-win32-ia32/-/sass-embedded-win32-ia32-1.83.0.tgz",
-			"integrity": "sha512-2PxNXJ8Pad4geVcTXY4rkyTr5AwbF8nfrCTDv0ulbTvPhzX2mMKEGcBZUXWn5BeHZTBc6whNMfS7d5fQXR9dDQ==",
+			"version": "1.83.1",
+			"resolved": "https://registry.npmjs.org/sass-embedded-win32-ia32/-/sass-embedded-win32-ia32-1.83.1.tgz",
+			"integrity": "sha512-HxZDkAE9n6Gb8Rz6xd67VHuo5FkUSQ4xPb7cHKa4pE0ndwH5Oc0uEhbqjJobpgmnuTm1rQYNU2nof1sFhy2MFA==",
 			"cpu": [
 				"ia32"
 			],
@@ -6249,9 +7213,9 @@
 			}
 		},
 		"node_modules/sass-embedded-win32-x64": {
-			"version": "1.83.0",
-			"resolved": "https://registry.npmjs.org/sass-embedded-win32-x64/-/sass-embedded-win32-x64-1.83.0.tgz",
-			"integrity": "sha512-muBXkFngM6eLTNqOV0FQi7Dv9s+YRQ42Yem26mosdan/GmJQc81deto6uDTgrYn+bzFNmiXcOdfm+0MkTWK3OQ==",
+			"version": "1.83.1",
+			"resolved": "https://registry.npmjs.org/sass-embedded-win32-x64/-/sass-embedded-win32-x64-1.83.1.tgz",
+			"integrity": "sha512-5Q0aPfUaqRek8Ee1AqTUIC0o6yQSA8QwyhCgh7upsnHG3Ltm8pkJOYjzm+UgYPJeoMNppDjdDlRGQISE7qzd4g==",
 			"cpu": [
 				"x64"
 			],
@@ -6283,6 +7247,66 @@
 				"url": "https://github.com/chalk/supports-color?sponsor=1"
 			}
 		},
+		"node_modules/sass-loader": {
+			"version": "16.0.4",
+			"resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-16.0.4.tgz",
+			"integrity": "sha512-LavLbgbBGUt3wCiYzhuLLu65+fWXaXLmq7YxivLhEqmiupCFZ5sKUAipK3do6V80YSU0jvSxNhEdT13IXNr3rg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"neo-async": "^2.6.2"
+			},
+			"engines": {
+				"node": ">= 18.12.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependencies": {
+				"@rspack/core": "0.x || 1.x",
+				"node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0",
+				"sass": "^1.3.0",
+				"sass-embedded": "*",
+				"webpack": "^5.0.0"
+			},
+			"peerDependenciesMeta": {
+				"@rspack/core": {
+					"optional": true
+				},
+				"node-sass": {
+					"optional": true
+				},
+				"sass": {
+					"optional": true
+				},
+				"sass-embedded": {
+					"optional": true
+				},
+				"webpack": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/schema-utils": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+			"integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@types/json-schema": "^7.0.8",
+				"ajv": "^6.12.5",
+				"ajv-keywords": "^3.5.2"
+			},
+			"engines": {
+				"node": ">= 10.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			}
+		},
 		"node_modules/semver": {
 			"version": "7.6.3",
 			"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
@@ -6296,6 +7320,29 @@
 				"node": ">=10"
 			}
 		},
+		"node_modules/serialize-javascript": {
+			"version": "6.0.2",
+			"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
+			"integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
+			"dev": true,
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"randombytes": "^2.1.0"
+			}
+		},
+		"node_modules/shallow-clone": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
+			"integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"kind-of": "^6.0.2"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
 		"node_modules/shebang-command": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -6513,6 +7560,10 @@
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
+		"node_modules/sync_lib": {
+			"resolved": "../backend/sync_lib/pkg",
+			"link": true
+		},
 		"node_modules/sync-child-process": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/sync-child-process/-/sync-child-process-1.0.2.tgz",
@@ -6538,6 +7589,169 @@
 				"node": ">=16.0.0"
 			}
 		},
+		"node_modules/tapable": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
+			"integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/terser": {
+			"version": "5.37.0",
+			"resolved": "https://registry.npmjs.org/terser/-/terser-5.37.0.tgz",
+			"integrity": "sha512-B8wRRkmre4ERucLM/uXx4MOV5cbnOlVAqUst+1+iLKPI0dOgFO28f84ptoQt9HEI537PMzfYa/d+GEPKTRXmYA==",
+			"dev": true,
+			"license": "BSD-2-Clause",
+			"dependencies": {
+				"@jridgewell/source-map": "^0.3.3",
+				"acorn": "^8.8.2",
+				"commander": "^2.20.0",
+				"source-map-support": "~0.5.20"
+			},
+			"bin": {
+				"terser": "bin/terser"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/terser-webpack-plugin": {
+			"version": "5.3.11",
+			"resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.11.tgz",
+			"integrity": "sha512-RVCsMfuD0+cTt3EwX8hSl2Ks56EbFHWmhluwcqoPKtBnfjiT6olaq7PRIRfhyU8nnC2MrnDrBLfrD/RGE+cVXQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jridgewell/trace-mapping": "^0.3.25",
+				"jest-worker": "^27.4.5",
+				"schema-utils": "^4.3.0",
+				"serialize-javascript": "^6.0.2",
+				"terser": "^5.31.1"
+			},
+			"engines": {
+				"node": ">= 10.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependencies": {
+				"webpack": "^5.1.0"
+			},
+			"peerDependenciesMeta": {
+				"@swc/core": {
+					"optional": true
+				},
+				"esbuild": {
+					"optional": true
+				},
+				"uglify-js": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/terser-webpack-plugin/node_modules/ajv": {
+			"version": "8.17.1",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+			"integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"fast-deep-equal": "^3.1.3",
+				"fast-uri": "^3.0.1",
+				"json-schema-traverse": "^1.0.0",
+				"require-from-string": "^2.0.2"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/epoberezkin"
+			}
+		},
+		"node_modules/terser-webpack-plugin/node_modules/ajv-keywords": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+			"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"fast-deep-equal": "^3.1.3"
+			},
+			"peerDependencies": {
+				"ajv": "^8.8.2"
+			}
+		},
+		"node_modules/terser-webpack-plugin/node_modules/jest-worker": {
+			"version": "27.5.1",
+			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
+			"integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@types/node": "*",
+				"merge-stream": "^2.0.0",
+				"supports-color": "^8.0.0"
+			},
+			"engines": {
+				"node": ">= 10.13.0"
+			}
+		},
+		"node_modules/terser-webpack-plugin/node_modules/json-schema-traverse": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/terser-webpack-plugin/node_modules/schema-utils": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.0.tgz",
+			"integrity": "sha512-Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@types/json-schema": "^7.0.9",
+				"ajv": "^8.9.0",
+				"ajv-formats": "^2.1.1",
+				"ajv-keywords": "^5.1.0"
+			},
+			"engines": {
+				"node": ">= 10.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			}
+		},
+		"node_modules/terser-webpack-plugin/node_modules/supports-color": {
+			"version": "8.1.1",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+			"integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/supports-color?sponsor=1"
+			}
+		},
+		"node_modules/terser/node_modules/source-map-support": {
+			"version": "0.5.21",
+			"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+			"integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"buffer-from": "^1.0.0",
+				"source-map": "^0.6.0"
+			}
+		},
 		"node_modules/test-exclude": {
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
@@ -6642,6 +7856,37 @@
 				}
 			}
 		},
+		"node_modules/ts-loader": {
+			"version": "9.5.1",
+			"resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.5.1.tgz",
+			"integrity": "sha512-rNH3sK9kGZcH9dYzC7CewQm4NtxJTjSEVRJ2DyBZR7f8/wcta+iV44UPCXc5+nzDzivKtlzV6c9P4e+oFhDLYg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"chalk": "^4.1.0",
+				"enhanced-resolve": "^5.0.0",
+				"micromatch": "^4.0.0",
+				"semver": "^7.3.4",
+				"source-map": "^0.7.4"
+			},
+			"engines": {
+				"node": ">=12.0.0"
+			},
+			"peerDependencies": {
+				"typescript": "*",
+				"webpack": "^5.0.0"
+			}
+		},
+		"node_modules/ts-loader/node_modules/source-map": {
+			"version": "0.7.4",
+			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
+			"integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
+			"dev": true,
+			"license": "BSD-3-Clause",
+			"engines": {
+				"node": ">= 8"
+			}
+		},
 		"node_modules/tslib": {
 			"version": "2.4.0",
 			"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
@@ -6722,6 +7967,16 @@
 				"typescript": ">=4.8.4 <5.8.0"
 			}
 		},
+		"node_modules/universalify": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+			"integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 10.0.0"
+			}
+		},
 		"node_modules/update-browserslist-db": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz",
@@ -6770,6 +8025,13 @@
 			"dev": true,
 			"license": "MIT"
 		},
+		"node_modules/util-deprecate": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+			"integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+			"dev": true,
+			"license": "MIT"
+		},
 		"node_modules/v8-to-istanbul": {
 			"version": "9.3.0",
 			"resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz",
@@ -6811,6 +8073,20 @@
 				"makeerror": "1.0.12"
 			}
 		},
+		"node_modules/watchpack": {
+			"version": "2.4.2",
+			"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz",
+			"integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"glob-to-regexp": "^0.4.1",
+				"graceful-fs": "^4.1.2"
+			},
+			"engines": {
+				"node": ">=10.13.0"
+			}
+		},
 		"node_modules/webidl-conversions": {
 			"version": "3.0.1",
 			"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
@@ -6818,6 +8094,162 @@
 			"dev": true,
 			"license": "BSD-2-Clause"
 		},
+		"node_modules/webpack": {
+			"version": "5.97.1",
+			"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.97.1.tgz",
+			"integrity": "sha512-EksG6gFY3L1eFMROS/7Wzgrii5mBAFe4rIr3r2BTfo7bcc+DWwFZ4OJ/miOuHJO/A85HwyI4eQ0F6IKXesO7Fg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@types/eslint-scope": "^3.7.7",
+				"@types/estree": "^1.0.6",
+				"@webassemblyjs/ast": "^1.14.1",
+				"@webassemblyjs/wasm-edit": "^1.14.1",
+				"@webassemblyjs/wasm-parser": "^1.14.1",
+				"acorn": "^8.14.0",
+				"browserslist": "^4.24.0",
+				"chrome-trace-event": "^1.0.2",
+				"enhanced-resolve": "^5.17.1",
+				"es-module-lexer": "^1.2.1",
+				"eslint-scope": "5.1.1",
+				"events": "^3.2.0",
+				"glob-to-regexp": "^0.4.1",
+				"graceful-fs": "^4.2.11",
+				"json-parse-even-better-errors": "^2.3.1",
+				"loader-runner": "^4.2.0",
+				"mime-types": "^2.1.27",
+				"neo-async": "^2.6.2",
+				"schema-utils": "^3.2.0",
+				"tapable": "^2.1.1",
+				"terser-webpack-plugin": "^5.3.10",
+				"watchpack": "^2.4.1",
+				"webpack-sources": "^3.2.3"
+			},
+			"bin": {
+				"webpack": "bin/webpack.js"
+			},
+			"engines": {
+				"node": ">=10.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependenciesMeta": {
+				"webpack-cli": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/webpack-cli": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-6.0.1.tgz",
+			"integrity": "sha512-MfwFQ6SfwinsUVi0rNJm7rHZ31GyTcpVE5pgVA3hwFRb7COD4TzjUUwhGWKfO50+xdc2MQPuEBBJoqIMGt3JDw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@discoveryjs/json-ext": "^0.6.1",
+				"@webpack-cli/configtest": "^3.0.1",
+				"@webpack-cli/info": "^3.0.1",
+				"@webpack-cli/serve": "^3.0.1",
+				"colorette": "^2.0.14",
+				"commander": "^12.1.0",
+				"cross-spawn": "^7.0.3",
+				"envinfo": "^7.14.0",
+				"fastest-levenshtein": "^1.0.12",
+				"import-local": "^3.0.2",
+				"interpret": "^3.1.1",
+				"rechoir": "^0.8.0",
+				"webpack-merge": "^6.0.1"
+			},
+			"bin": {
+				"webpack-cli": "bin/cli.js"
+			},
+			"engines": {
+				"node": ">=18.12.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependencies": {
+				"webpack": "^5.82.0"
+			},
+			"peerDependenciesMeta": {
+				"webpack-bundle-analyzer": {
+					"optional": true
+				},
+				"webpack-dev-server": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/webpack-cli/node_modules/colorette": {
+			"version": "2.0.20",
+			"resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
+			"integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/webpack-cli/node_modules/commander": {
+			"version": "12.1.0",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-12.1.0.tgz",
+			"integrity": "sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/webpack-merge": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-6.0.1.tgz",
+			"integrity": "sha512-hXXvrjtx2PLYx4qruKl+kyRSLc52V+cCvMxRjmKwoA+CBbbF5GfIBtR6kCvl0fYGqTUPKB+1ktVmTHqMOzgCBg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"clone-deep": "^4.0.1",
+				"flat": "^5.0.2",
+				"wildcard": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=18.0.0"
+			}
+		},
+		"node_modules/webpack-sources": {
+			"version": "3.2.3",
+			"resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
+			"integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=10.13.0"
+			}
+		},
+		"node_modules/webpack/node_modules/eslint-scope": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+			"integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+			"dev": true,
+			"license": "BSD-2-Clause",
+			"dependencies": {
+				"esrecurse": "^4.3.0",
+				"estraverse": "^4.1.1"
+			},
+			"engines": {
+				"node": ">=8.0.0"
+			}
+		},
+		"node_modules/webpack/node_modules/estraverse": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+			"integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+			"dev": true,
+			"license": "BSD-2-Clause",
+			"engines": {
+				"node": ">=4.0"
+			}
+		},
 		"node_modules/whatwg-url": {
 			"version": "5.0.0",
 			"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
@@ -6845,6 +8277,13 @@
 				"node": ">= 8"
 			}
 		},
+		"node_modules/wildcard": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz",
+			"integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==",
+			"dev": true,
+			"license": "MIT"
+		},
 		"node_modules/word-wrap": {
 			"version": "1.2.5",
 			"resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
diff --git a/plugin/package.json b/plugin/package.json
index 1d0cd4e7..0ca90363 100644
--- a/plugin/package.json
+++ b/plugin/package.json
@@ -4,19 +4,27 @@
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {
-		"dev": "node esbuild.config.mjs",
-		"build": "tsc -noEmit -skipLibCheck && node esbuild.config.mjs production",
+		"dev": "webpack watch --mode development",
+		"build": "webpack --mode production",
 		"test": "jest",
-		"lint": "eslint --fix src",
+		"lint": "eslint --fix src && prettier --write \"src/**/*.(ts|scss|json|html)\"",
 		"version": "node version-bump.mjs"
 	},
 	"keywords": [],
 	"author": "",
+	"type": "commonjs",
 	"license": "MIT",
+	"prettier": {
+		"trailingComma": "none",
+		"tabWidth": 2,
+		"useTabs": false,
+		"endOfLine": "lf"
+	},
 	"devDependencies": {
 		"@types/jest": "^29.5.14",
 		"@types/node": "^16.11.6",
 		"builtin-modules": "3.3.0",
+		"css-loader": "^7.1.2",
 		"date-fns": "^4.1.0",
 		"dayjs": "^1.11.13",
 		"esbuild": "0.24.0",
@@ -25,14 +33,25 @@
 		"eslint": "9.17.0",
 		"eslint-plugin-unused-imports": "^4.1.4",
 		"fetch-retry": "^6.0.0",
+		"file-loader": "^6.2.0",
+		"fs-extra": "^11.2.0",
 		"jest": "^29.7.0",
+		"mini-css-extract-plugin": "^2.9.2",
 		"obsidian": "1.7.2",
 		"openapi-fetch": "0.13.3",
 		"openapi-typescript": "7.4.4",
 		"p-queue": "^8.0.1",
+		"prettier": "^3.4.2",
+		"resolve-url-loader": "^5.0.0",
+		"sass-loader": "^16.0.4",
+		"sync_lib": "file:../backend/sync_lib/pkg",
+		"terser-webpack-plugin": "^5.3.11",
 		"ts-jest": "^29.2.5",
+		"ts-loader": "^9.5.1",
 		"tslib": "2.4.0",
 		"typescript": "5.7.2",
-		"typescript-eslint": "8.18.0"
+		"typescript-eslint": "8.18.0",
+		"webpack": "^5.97.1",
+		"webpack-cli": "^6.0.1"
 	}
-}
+}
\ No newline at end of file
diff --git a/plugin/tsconfig.json b/plugin/tsconfig.json
index 04150bda..2bcb75e1 100644
--- a/plugin/tsconfig.json
+++ b/plugin/tsconfig.json
@@ -7,7 +7,7 @@
     "target": "ES6",
     "allowJs": true,
     "noImplicitAny": true,
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "importHelpers": true,
     "isolatedModules": true,
     "strictNullChecks": true,
diff --git a/plugin/webpack.config.js b/plugin/webpack.config.js
new file mode 100644
index 00000000..c7f7e0b6
--- /dev/null
+++ b/plugin/webpack.config.js
@@ -0,0 +1,109 @@
+const path = require("path");
+const TerserPlugin = require("terser-webpack-plugin");
+const MiniCssExtractPlugin = require("mini-css-extract-plugin");
+const fs = require("fs-extra");
+
+module.exports = (env, argv) => ({
+  devtool: argv.mode === "development" ? "inline-source-map" : false,
+  entry: {
+    index: "./src/vault-link-plugin.ts"
+  },
+  watchOptions: {
+    ignored: "**/node_modules"
+  },
+  externals: {
+    obsidian: "commonjs obsidian"
+  },
+  optimization: {
+    minimizer: [
+      new TerserPlugin({
+        terserOptions: {
+          module: true
+        }
+      })
+    ]
+  },
+  plugins: [
+    new MiniCssExtractPlugin({
+      filename: "styles.css"
+    }),
+    new (require("webpack").DefinePlugin)({
+      __CURRENT_DATE__: Date.now()
+    }),
+    {
+      apply: (compiler) => {
+        if (argv.mode !== "development") {
+          return;
+        }
+
+        compiler.hooks.done.tap("Copy Files Plugin", (stats) => {
+          const source = path.resolve(__dirname, "dist");
+          const destinations = [
+            "/mnt/c/Users/Andras/Desktop/test/test/.obsidian/plugins/my-plugin",
+            "/mnt/c/Users/Andras/Desktop/test/test2/.obsidian/plugins/my-plugin",
+            "/home/andras/obsidian-test/.obsidian/plugins/my-plugin"
+          ];
+          destinations.forEach((destination) => {
+            fs.copy(source, destination)
+              .then(() => console.log("Files copied successfully after build!"))
+              .catch((err) => console.error("Error copying files:", err));
+
+            fs.createFile(path.join(destination, ".hotreload"));
+          });
+        });
+      }
+    }
+  ],
+  module: {
+    rules: [
+      {
+        test: /\.json$/i,
+        type: "asset/resource",
+        generator: {
+          filename: "[name][ext]"
+        }
+      },
+      {
+        test: /\.scss$/i,
+        use: [
+          MiniCssExtractPlugin.loader,
+          "css-loader",
+          "resolve-url-loader",
+          {
+            loader: "sass-loader",
+            options: {
+              sourceMap: true // required by resolve-url-loader
+            }
+          }
+        ]
+      },
+      {
+        test: /\.ts$/,
+        use: ["ts-loader"]
+      },
+      {
+        test: /\.wasm$/,
+        type: "asset/inline"
+      }
+    ]
+  },
+  resolve: {
+    extensions: [
+      ".ts",
+      ".js" // required for development
+    ],
+    alias: {
+      root: __dirname,
+      src: path.resolve(__dirname, "src")
+    }
+  },
+  output: {
+    clean: true,
+    filename: "main.js",
+    library: {
+      type: "commonjs" // required for Obsidian
+    },
+    path: path.resolve(__dirname, "dist"),
+    publicPath: ""
+  }
+});

From 438caa96a6db1fbfa025c634b1beaca28f0471e1 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 5 Jan 2025 15:35:51 +0000
Subject: [PATCH 129/761] Format files

---
 plugin/package.json                           |   4 +-
 plugin/src/database/database.ts               |  14 +-
 plugin/src/database/sync-settings.ts          |   2 +-
 plugin/src/events/obisidan-event-handler.ts   |   4 +-
 .../obsidian-file-operations.ts               |   6 +-
 plugin/src/services/sync-service.ts           | 119 ++-
 plugin/src/services/types.ts                  | 744 +++++++++---------
 .../apply-remote-changes-locally.ts           |   2 +-
 .../src/sync-operations/document-lock.test.ts |   8 +-
 plugin/src/sync-operations/syncer.ts          |  84 +-
 plugin/src/tracing/logger.ts                  |   9 +-
 plugin/src/tracing/sync-history.ts            |  12 +-
 plugin/src/utils/retried-fetch.ts             |   6 +-
 plugin/src/vault-link-plugin.ts               |  50 +-
 plugin/src/views/history-view.ts              |  12 +-
 plugin/src/views/logs-view.ts                 |  10 +-
 plugin/src/views/settings-tab.ts              |  16 +-
 plugin/src/views/status-bar.ts                |   8 +-
 plugin/src/views/status-description.ts        |  32 +-
 19 files changed, 557 insertions(+), 585 deletions(-)

diff --git a/plugin/package.json b/plugin/package.json
index 0ca90363..acafe9da 100644
--- a/plugin/package.json
+++ b/plugin/package.json
@@ -16,8 +16,8 @@
 	"license": "MIT",
 	"prettier": {
 		"trailingComma": "none",
-		"tabWidth": 2,
-		"useTabs": false,
+		"tabWidth": 4,
+		"useTabs": true,
 		"endOfLine": "lf"
 	},
 	"devDependencies": {
diff --git a/plugin/src/database/database.ts b/plugin/src/database/database.ts
index 6e548d9c..8e56fd1e 100644
--- a/plugin/src/database/database.ts
+++ b/plugin/src/database/database.ts
@@ -4,7 +4,7 @@ import type {
 	DocumentId,
 	DocumentMetadata,
 	RelativePath,
-	VaultUpdateId,
+	VaultUpdateId
 } from "./document-metadata";
 import { Logger } from "src/tracing/logger";
 
@@ -47,7 +47,7 @@ export class Database {
 
 		this._settings = {
 			...DEFAULT_SETTINGS,
-			...(initialState.settings ?? {}),
+			...(initialState.settings ?? {})
 		};
 
 		Logger.getInstance().debug(
@@ -128,7 +128,7 @@ export class Database {
 		documentId,
 		relativePath,
 		parentVersionId,
-		hash,
+		hash
 	}: {
 		documentId: DocumentId;
 		relativePath: RelativePath;
@@ -138,7 +138,7 @@ export class Database {
 		this._documents.set(relativePath, {
 			documentId,
 			parentVersionId,
-			hash,
+			hash
 		});
 		await this.save();
 	}
@@ -148,7 +148,7 @@ export class Database {
 		oldRelativePath,
 		relativePath,
 		parentVersionId,
-		hash,
+		hash
 	}: {
 		documentId: DocumentId;
 		oldRelativePath: RelativePath;
@@ -160,7 +160,7 @@ export class Database {
 		this._documents.set(relativePath, {
 			documentId,
 			parentVersionId,
-			hash,
+			hash
 		});
 		await this.save();
 	}
@@ -180,7 +180,7 @@ export class Database {
 		await this.saveData({
 			documents: Object.fromEntries(this._documents.entries()),
 			settings: this._settings,
-			lastSeenUpdateId: this._lastSeenUpdateId,
+			lastSeenUpdateId: this._lastSeenUpdateId
 		});
 	}
 }
diff --git a/plugin/src/database/sync-settings.ts b/plugin/src/database/sync-settings.ts
index fcf7f88c..ad6aa5cd 100644
--- a/plugin/src/database/sync-settings.ts
+++ b/plugin/src/database/sync-settings.ts
@@ -19,5 +19,5 @@ export const DEFAULT_SETTINGS: SyncSettings = {
 	syncConcurrency: 1,
 	isSyncEnabled: false,
 	displayNoopSyncEvents: false,
-	minimumLogLevel: LogLevel.INFO,
+	minimumLogLevel: LogLevel.INFO
 };
diff --git a/plugin/src/events/obisidan-event-handler.ts b/plugin/src/events/obisidan-event-handler.ts
index 200ed8a0..2eae62ff 100644
--- a/plugin/src/events/obisidan-event-handler.ts
+++ b/plugin/src/events/obisidan-event-handler.ts
@@ -39,7 +39,7 @@ export class ObsidianFileEventHandler implements FileEventHandler {
 			await this.syncer.syncLocallyUpdatedFile({
 				oldPath,
 				relativePath: file.path,
-				updateTime: new Date(file.stat.ctime),
+				updateTime: new Date(file.stat.ctime)
 			});
 		} else {
 			Logger.getInstance().debug(
@@ -54,7 +54,7 @@ export class ObsidianFileEventHandler implements FileEventHandler {
 
 			await this.syncer.syncLocallyUpdatedFile({
 				relativePath: file.path,
-				updateTime: new Date(file.stat.ctime),
+				updateTime: new Date(file.stat.ctime)
 			});
 		} else {
 			Logger.getInstance().debug(
diff --git a/plugin/src/file-operations/obsidian-file-operations.ts b/plugin/src/file-operations/obsidian-file-operations.ts
index ef2d45e8..c578018f 100644
--- a/plugin/src/file-operations/obsidian-file-operations.ts
+++ b/plugin/src/file-operations/obsidian-file-operations.ts
@@ -1,8 +1,8 @@
 import type { Vault } from "obsidian";
 import { normalizePath } from "obsidian";
 import type { FileOperations } from "./file-operations";
-import * as lib from "../../../backend/sync_lib/pkg/sync_lib.js";
 import type { RelativePath } from "src/database/document-metadata";
+import { isBinary, mergeText } from "sync_lib";
 
 export class ObsidianFileOperations implements FileOperations {
 	public constructor(private readonly vault: Vault) {}
@@ -49,7 +49,7 @@ export class ObsidianFileOperations implements FileOperations {
 			return new Uint8Array(0);
 		}
 
-		if (lib.isBinary(expectedContent) || !path.endsWith(".md")) {
+		if (isBinary(expectedContent) || !path.endsWith(".md")) {
 			await this.vault.adapter.writeBinary(
 				normalizePath(path),
 				newContent
@@ -64,7 +64,7 @@ export class ObsidianFileOperations implements FileOperations {
 			normalizePath(path),
 			(currentText) => {
 				if (currentText !== expetedText) {
-					return lib.mergeText(expetedText, currentText, newText);
+					return mergeText(expetedText, currentText, newText);
 				}
 
 				return newText;
diff --git a/plugin/src/services/sync-service.ts b/plugin/src/services/sync-service.ts
index 3f3a94a7..32f09d8b 100644
--- a/plugin/src/services/sync-service.ts
+++ b/plugin/src/services/sync-service.ts
@@ -1,17 +1,16 @@
-import * as lib from "../../../backend/sync_lib/pkg/sync_lib.js";
-
 import type { Client } from "openapi-fetch";
 import createClient from "openapi-fetch";
-import type { components, paths } from "./types.js"; // Generated by openapi-typescript
+import type { components, paths } from "./types"; // Generated by openapi-typescript
 import type { Database } from "src/database/database";
 import type { SyncSettings } from "src/database/sync-settings";
 import type {
 	DocumentId,
 	RelativePath,
-	VaultUpdateId,
+	VaultUpdateId
 } from "src/database/document-metadata";
-import { Logger } from "src/tracing/logger.js";
-import { retriedFetch } from "src/utils/retried-fetch.js";
+import { Logger } from "src/tracing/logger";
+import { retriedFetch } from "src/utils/retried-fetch";
+import { bytesToBase64 } from "sync_lib";
 
 export interface CheckConnectionResult {
 	isSuccessful: boolean;
@@ -45,11 +44,9 @@ export class SyncService {
 		const response = await this.clientWithoutRetries.GET("/ping", {
 			params: {
 				header: {
-					authorization: `Bearer ${
-						this.database.getSettings().token
-					}`,
-				},
-			},
+					authorization: `Bearer ${this.database.getSettings().token}`
+				}
+			}
 		});
 
 		Logger.getInstance().debug(
@@ -58,9 +55,7 @@ export class SyncService {
 
 		if (!response.data) {
 			throw new Error(
-				`Failed to ping server: ${SyncService.formatError(
-					response.error
-				)}`
+				`Failed to ping server: ${SyncService.formatError(response.error)}`
 			);
 		}
 
@@ -70,7 +65,7 @@ export class SyncService {
 	public async create({
 		relativePath,
 		contentBytes,
-		createdDate,
+		createdDate
 	}: {
 		relativePath: RelativePath;
 		contentBytes: Uint8Array;
@@ -81,27 +76,23 @@ export class SyncService {
 			{
 				params: {
 					path: {
-						vault_id: this.database.getSettings().vaultName,
+						vault_id: this.database.getSettings().vaultName
 					},
 					header: {
-						authorization: `Bearer ${
-							this.database.getSettings().token
-						}`,
-					},
+						authorization: `Bearer ${this.database.getSettings().token}`
+					}
 				},
 				body: {
-					contentBase64: lib.bytesToBase64(contentBytes),
+					contentBase64: bytesToBase64(contentBytes),
 					createdDate: createdDate.toISOString(),
-					relativePath,
-				},
+					relativePath
+				}
 			}
 		);
 
 		if (!response.data) {
 			throw new Error(
-				`Failed to create document: ${SyncService.formatError(
-					response.error
-				)}`
+				`Failed to create document: ${SyncService.formatError(response.error)}`
 			);
 		}
 
@@ -119,7 +110,7 @@ export class SyncService {
 		documentId,
 		relativePath,
 		contentBytes,
-		createdDate,
+		createdDate
 	}: {
 		parentVersionId: VaultUpdateId;
 		documentId: DocumentId;
@@ -133,28 +124,24 @@ export class SyncService {
 				params: {
 					path: {
 						vault_id: this.database.getSettings().vaultName,
-						document_id: documentId,
+						document_id: documentId
 					},
 					header: {
-						authorization: `Bearer ${
-							this.database.getSettings().token
-						}`,
-					},
+						authorization: `Bearer ${this.database.getSettings().token}`
+					}
 				},
 				body: {
 					parentVersionId,
-					contentBase64: lib.bytesToBase64(contentBytes),
+					contentBase64: bytesToBase64(contentBytes),
 					createdDate: createdDate.toISOString(),
-					relativePath,
-				},
+					relativePath
+				}
 			}
 		);
 
 		if (!response.data) {
 			throw new Error(
-				`Failed to update document: ${SyncService.formatError(
-					response.error
-				)}`
+				`Failed to update document: ${SyncService.formatError(response.error)}`
 			);
 		}
 
@@ -168,7 +155,7 @@ export class SyncService {
 	public async delete({
 		documentId,
 		relativePath,
-		createdDate,
+		createdDate
 	}: {
 		documentId: DocumentId;
 		relativePath: RelativePath;
@@ -180,18 +167,16 @@ export class SyncService {
 				params: {
 					path: {
 						vault_id: this.database.getSettings().vaultName,
-						document_id: documentId,
+						document_id: documentId
 					},
 					header: {
-						authorization: `Bearer ${
-							this.database.getSettings().token
-						}`,
-					},
+						authorization: `Bearer ${this.database.getSettings().token}`
+					}
 				},
 				body: {
 					createdDate: createdDate.toISOString(),
-					relativePath,
-				},
+					relativePath
+				}
 			}
 		);
 
@@ -207,7 +192,7 @@ export class SyncService {
 	}
 
 	public async get({
-		documentId,
+		documentId
 	}: {
 		documentId: DocumentId;
 	}): Promise<components["schemas"]["DocumentVersion"]> {
@@ -217,22 +202,18 @@ export class SyncService {
 				params: {
 					path: {
 						vault_id: this.database.getSettings().vaultName,
-						document_id: documentId,
+						document_id: documentId
 					},
 					header: {
-						authorization: `Bearer ${
-							this.database.getSettings().token
-						}`,
-					},
-				},
+						authorization: `Bearer ${this.database.getSettings().token}`
+					}
+				}
 			}
 		);
 
 		if (!response.data) {
 			throw new Error(
-				`Failed to get document: ${SyncService.formatError(
-					response.error
-				)}`
+				`Failed to get document: ${SyncService.formatError(response.error)}`
 			);
 		}
 
@@ -249,25 +230,21 @@ export class SyncService {
 		const response = await this.client.GET("/vaults/{vault_id}/documents", {
 			params: {
 				path: {
-					vault_id: this.database.getSettings().vaultName,
+					vault_id: this.database.getSettings().vaultName
 				},
 				header: {
-					authorization: `Bearer ${
-						this.database.getSettings().token
-					}`,
+					authorization: `Bearer ${this.database.getSettings().token}`
 				},
 				query: {
-					since_update_id: since,
-				},
-			},
+					since_update_id: since
+				}
+			}
 		});
 
 		const { error } = response;
 		if (error) {
 			throw new Error(
-				`Failed to get documents: ${SyncService.formatError(
-					response.error
-				)}`
+				`Failed to get documents: ${SyncService.formatError(response.error)}`
 			);
 		}
 
@@ -284,18 +261,18 @@ export class SyncService {
 			if (result.isAuthenticated) {
 				return {
 					isSuccessful: true,
-					message: `Successfully connected to server (version: ${result.serverVersion}) and authenticated.`,
+					message: `Successfully connected to server (version: ${result.serverVersion}) and authenticated.`
 				};
 			}
 
 			return {
 				isSuccessful: false,
-				message: `Successfully connected to server (version: ${result.serverVersion}) but failed to authenticate.`,
+				message: `Successfully connected to server (version: ${result.serverVersion}) but failed to authenticate.`
 			};
 		} catch (e) {
 			return {
 				isSuccessful: false,
-				message: `Failed to connect to server: ${e}`,
+				message: `Failed to connect to server: ${e}`
 			};
 		}
 	}
@@ -303,11 +280,11 @@ export class SyncService {
 	private createClient(settings: SyncSettings): void {
 		this.client = createClient<paths>({
 			baseUrl: settings.remoteUri,
-			fetch: retriedFetch,
+			fetch: retriedFetch
 		});
 
 		this.clientWithoutRetries = createClient<paths>({
-			baseUrl: settings.remoteUri,
+			baseUrl: settings.remoteUri
 		});
 	}
 }
diff --git a/plugin/src/services/types.ts b/plugin/src/services/types.ts
index f8f748f1..4f837259 100644
--- a/plugin/src/services/types.ts
+++ b/plugin/src/services/types.ts
@@ -4,380 +4,382 @@
  */
 
 export interface paths {
-    "/ping": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        get: {
-            parameters: {
-                query?: never;
-                header?: {
-                    authorization?: string;
-                };
-                path?: never;
-                cookie?: never;
-            };
-            requestBody?: never;
-            responses: {
-                200: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content: {
-                        "application/json": components["schemas"]["PingResponse"];
-                    };
-                };
-                default: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content: {
-                        "application/json": components["schemas"]["SerializedError"];
-                    };
-                };
-            };
-        };
-        put?: never;
-        post?: never;
-        delete?: never;
-        options?: never;
-        head?: never;
-        patch?: never;
-        trace?: never;
-    };
-    "/vaults/{vault_id}/documents": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        get: {
-            parameters: {
-                query?: {
-                    since_update_id?: number | null;
-                };
-                header: {
-                    authorization: string;
-                };
-                path: {
-                    vault_id: string;
-                };
-                cookie?: never;
-            };
-            requestBody?: never;
-            responses: {
-                200: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content: {
-                        "application/json": components["schemas"]["FetchLatestDocumentsResponse"];
-                    };
-                };
-                default: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content: {
-                        "application/json": components["schemas"]["SerializedError"];
-                    };
-                };
-            };
-        };
-        put?: never;
-        post: {
-            parameters: {
-                query?: never;
-                header: {
-                    authorization: string;
-                };
-                path: {
-                    vault_id: string;
-                };
-                cookie?: never;
-            };
-            requestBody: {
-                content: {
-                    "application/json": components["schemas"]["CreateDocumentVersion"];
-                };
-            };
-            responses: {
-                200: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content: {
-                        "application/json": components["schemas"]["DocumentUpdateResponse"];
-                    };
-                };
-                default: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content: {
-                        "application/json": components["schemas"]["SerializedError"];
-                    };
-                };
-            };
-        };
-        delete?: never;
-        options?: never;
-        head?: never;
-        patch?: never;
-        trace?: never;
-    };
-    "/vaults/{vault_id}/documents/{document_id}": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        get: {
-            parameters: {
-                query?: never;
-                header: {
-                    authorization: string;
-                };
-                path: {
-                    document_id: string;
-                    vault_id: string;
-                };
-                cookie?: never;
-            };
-            requestBody?: never;
-            responses: {
-                200: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content: {
-                        "application/json": components["schemas"]["DocumentVersion"];
-                    };
-                };
-                default: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content: {
-                        "application/json": components["schemas"]["SerializedError"];
-                    };
-                };
-            };
-        };
-        put: {
-            parameters: {
-                query?: never;
-                header: {
-                    authorization: string;
-                };
-                path: {
-                    document_id: string;
-                    vault_id: string;
-                };
-                cookie?: never;
-            };
-            requestBody: {
-                content: {
-                    "application/json": components["schemas"]["UpdateDocumentVersion"];
-                };
-            };
-            responses: {
-                200: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content: {
-                        "application/json": components["schemas"]["DocumentUpdateResponse"];
-                    };
-                };
-                default: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content: {
-                        "application/json": components["schemas"]["SerializedError"];
-                    };
-                };
-            };
-        };
-        post?: never;
-        delete: {
-            parameters: {
-                query?: never;
-                header: {
-                    authorization: string;
-                };
-                path: {
-                    document_id: string;
-                    vault_id: string;
-                };
-                cookie?: never;
-            };
-            requestBody: {
-                content: {
-                    "application/json": components["schemas"]["DeleteDocumentVersion"];
-                };
-            };
-            responses: {
-                /** @description no content */
-                200: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content?: never;
-                };
-                default: {
-                    headers: {
-                        [name: string]: unknown;
-                    };
-                    content: {
-                        "application/json": components["schemas"]["SerializedError"];
-                    };
-                };
-            };
-        };
-        options?: never;
-        head?: never;
-        patch?: never;
-        trace?: never;
-    };
+	"/ping": {
+		parameters: {
+			query?: never;
+			header?: never;
+			path?: never;
+			cookie?: never;
+		};
+		get: {
+			parameters: {
+				query?: never;
+				header?: {
+					authorization?: string;
+				};
+				path?: never;
+				cookie?: never;
+			};
+			requestBody?: never;
+			responses: {
+				200: {
+					headers: {
+						[name: string]: unknown;
+					};
+					content: {
+						"application/json": components["schemas"]["PingResponse"];
+					};
+				};
+				default: {
+					headers: {
+						[name: string]: unknown;
+					};
+					content: {
+						"application/json": components["schemas"]["SerializedError"];
+					};
+				};
+			};
+		};
+		put?: never;
+		post?: never;
+		delete?: never;
+		options?: never;
+		head?: never;
+		patch?: never;
+		trace?: never;
+	};
+	"/vaults/{vault_id}/documents": {
+		parameters: {
+			query?: never;
+			header?: never;
+			path?: never;
+			cookie?: never;
+		};
+		get: {
+			parameters: {
+				query?: {
+					since_update_id?: number | null;
+				};
+				header: {
+					authorization: string;
+				};
+				path: {
+					vault_id: string;
+				};
+				cookie?: never;
+			};
+			requestBody?: never;
+			responses: {
+				200: {
+					headers: {
+						[name: string]: unknown;
+					};
+					content: {
+						"application/json": components["schemas"]["FetchLatestDocumentsResponse"];
+					};
+				};
+				default: {
+					headers: {
+						[name: string]: unknown;
+					};
+					content: {
+						"application/json": components["schemas"]["SerializedError"];
+					};
+				};
+			};
+		};
+		put?: never;
+		post: {
+			parameters: {
+				query?: never;
+				header: {
+					authorization: string;
+				};
+				path: {
+					vault_id: string;
+				};
+				cookie?: never;
+			};
+			requestBody: {
+				content: {
+					"application/json": components["schemas"]["CreateDocumentVersion"];
+				};
+			};
+			responses: {
+				200: {
+					headers: {
+						[name: string]: unknown;
+					};
+					content: {
+						"application/json": components["schemas"]["DocumentUpdateResponse"];
+					};
+				};
+				default: {
+					headers: {
+						[name: string]: unknown;
+					};
+					content: {
+						"application/json": components["schemas"]["SerializedError"];
+					};
+				};
+			};
+		};
+		delete?: never;
+		options?: never;
+		head?: never;
+		patch?: never;
+		trace?: never;
+	};
+	"/vaults/{vault_id}/documents/{document_id}": {
+		parameters: {
+			query?: never;
+			header?: never;
+			path?: never;
+			cookie?: never;
+		};
+		get: {
+			parameters: {
+				query?: never;
+				header: {
+					authorization: string;
+				};
+				path: {
+					document_id: string;
+					vault_id: string;
+				};
+				cookie?: never;
+			};
+			requestBody?: never;
+			responses: {
+				200: {
+					headers: {
+						[name: string]: unknown;
+					};
+					content: {
+						"application/json": components["schemas"]["DocumentVersion"];
+					};
+				};
+				default: {
+					headers: {
+						[name: string]: unknown;
+					};
+					content: {
+						"application/json": components["schemas"]["SerializedError"];
+					};
+				};
+			};
+		};
+		put: {
+			parameters: {
+				query?: never;
+				header: {
+					authorization: string;
+				};
+				path: {
+					document_id: string;
+					vault_id: string;
+				};
+				cookie?: never;
+			};
+			requestBody: {
+				content: {
+					"application/json": components["schemas"]["UpdateDocumentVersion"];
+				};
+			};
+			responses: {
+				200: {
+					headers: {
+						[name: string]: unknown;
+					};
+					content: {
+						"application/json": components["schemas"]["DocumentUpdateResponse"];
+					};
+				};
+				default: {
+					headers: {
+						[name: string]: unknown;
+					};
+					content: {
+						"application/json": components["schemas"]["SerializedError"];
+					};
+				};
+			};
+		};
+		post?: never;
+		delete: {
+			parameters: {
+				query?: never;
+				header: {
+					authorization: string;
+				};
+				path: {
+					document_id: string;
+					vault_id: string;
+				};
+				cookie?: never;
+			};
+			requestBody: {
+				content: {
+					"application/json": components["schemas"]["DeleteDocumentVersion"];
+				};
+			};
+			responses: {
+				/** @description no content */
+				200: {
+					headers: {
+						[name: string]: unknown;
+					};
+					content?: never;
+				};
+				default: {
+					headers: {
+						[name: string]: unknown;
+					};
+					content: {
+						"application/json": components["schemas"]["SerializedError"];
+					};
+				};
+			};
+		};
+		options?: never;
+		head?: never;
+		patch?: never;
+		trace?: never;
+	};
 }
 export type webhooks = Record<string, never>;
 export interface components {
-    schemas: {
-        CreateDocumentVersion: {
-            contentBase64: string;
-            /** Format: date-time */
-            createdDate: string;
-            relativePath: string;
-        };
-        DeleteDocumentVersion: {
-            /** Format: date-time */
-            createdDate: string;
-            relativePath: string;
-        };
-        /** @description Response to a create/update document request. */
-        DocumentUpdateResponse: {
-            /** Format: date-time */
-            createdDate: string;
-            /** Format: uuid */
-            documentId: string;
-            isDeleted: boolean;
-            relativePath: string;
-            /** @enum {string} */
-            type: "FastForwardUpdate";
-            /** Format: date-time */
-            updatedDate: string;
-            vaultId: string;
-            /** Format: int64 */
-            vaultUpdateId: number;
-        } | {
-            contentBase64: string;
-            /** Format: date-time */
-            createdDate: string;
-            /** Format: uuid */
-            documentId: string;
-            isDeleted: boolean;
-            relativePath: string;
-            /** @enum {string} */
-            type: "MergingUpdate";
-            /** Format: date-time */
-            updatedDate: string;
-            vaultId: string;
-            /** Format: int64 */
-            vaultUpdateId: number;
-        };
-        DocumentVersion: {
-            contentBase64: string;
-            /** Format: date-time */
-            createdDate: string;
-            /** Format: uuid */
-            documentId: string;
-            isDeleted: boolean;
-            relativePath: string;
-            /** Format: date-time */
-            updatedDate: string;
-            vaultId: string;
-            /** Format: int64 */
-            vaultUpdateId: number;
-        };
-        DocumentVersionWithoutContent: {
-            /** Format: date-time */
-            createdDate: string;
-            /** Format: uuid */
-            documentId: string;
-            isDeleted: boolean;
-            relativePath: string;
-            /** Format: date-time */
-            updatedDate: string;
-            vaultId: string;
-            /** Format: int64 */
-            vaultUpdateId: number;
-        };
-        /** @description Response to a fetch latest documents request. */
-        FetchLatestDocumentsResponse: {
-            /**
-             * Format: int64
-             * @description The update ID of the latest document in the response.
-             */
-            lastUpdateId: number;
-            latestDocuments: components["schemas"]["DocumentVersionWithoutContent"][];
-        };
-        PathParams: {
-            vault_id: string;
-        };
-        PathParams2: {
-            vault_id: string;
-        };
-        PathParams3: {
-            /** Format: uuid */
-            document_id: string;
-            vault_id: string;
-        };
-        PathParams4: {
-            /** Format: uuid */
-            document_id: string;
-            vault_id: string;
-        };
-        PathParams5: {
-            /** Format: uuid */
-            document_id: string;
-            vault_id: string;
-        };
-        /** @description Response to a ping request. */
-        PingResponse: {
-            /** @description Whether the client is authenticated based on the sent Authorization header. */
-            isAuthenticated: boolean;
-            /** @description Semantic version of the server. */
-            serverVersion: string;
-        };
-        QueryParams: {
-            /** Format: int64 */
-            since_update_id?: number | null;
-        };
-        SerializedError: {
-            causes: string[];
-            message: string;
-        };
-        UpdateDocumentVersion: {
-            contentBase64: string;
-            /** Format: date-time */
-            createdDate: string;
-            /** Format: int64 */
-            parentVersionId: number;
-            relativePath: string;
-        };
-    };
-    responses: never;
-    parameters: never;
-    requestBodies: never;
-    headers: never;
-    pathItems: never;
+	schemas: {
+		CreateDocumentVersion: {
+			contentBase64: string;
+			/** Format: date-time */
+			createdDate: string;
+			relativePath: string;
+		};
+		DeleteDocumentVersion: {
+			/** Format: date-time */
+			createdDate: string;
+			relativePath: string;
+		};
+		/** @description Response to a create/update document request. */
+		DocumentUpdateResponse:
+			| {
+					/** Format: date-time */
+					createdDate: string;
+					/** Format: uuid */
+					documentId: string;
+					isDeleted: boolean;
+					relativePath: string;
+					/** @enum {string} */
+					type: "FastForwardUpdate";
+					/** Format: date-time */
+					updatedDate: string;
+					vaultId: string;
+					/** Format: int64 */
+					vaultUpdateId: number;
+			  }
+			| {
+					contentBase64: string;
+					/** Format: date-time */
+					createdDate: string;
+					/** Format: uuid */
+					documentId: string;
+					isDeleted: boolean;
+					relativePath: string;
+					/** @enum {string} */
+					type: "MergingUpdate";
+					/** Format: date-time */
+					updatedDate: string;
+					vaultId: string;
+					/** Format: int64 */
+					vaultUpdateId: number;
+			  };
+		DocumentVersion: {
+			contentBase64: string;
+			/** Format: date-time */
+			createdDate: string;
+			/** Format: uuid */
+			documentId: string;
+			isDeleted: boolean;
+			relativePath: string;
+			/** Format: date-time */
+			updatedDate: string;
+			vaultId: string;
+			/** Format: int64 */
+			vaultUpdateId: number;
+		};
+		DocumentVersionWithoutContent: {
+			/** Format: date-time */
+			createdDate: string;
+			/** Format: uuid */
+			documentId: string;
+			isDeleted: boolean;
+			relativePath: string;
+			/** Format: date-time */
+			updatedDate: string;
+			vaultId: string;
+			/** Format: int64 */
+			vaultUpdateId: number;
+		};
+		/** @description Response to a fetch latest documents request. */
+		FetchLatestDocumentsResponse: {
+			/**
+			 * Format: int64
+			 * @description The update ID of the latest document in the response.
+			 */
+			lastUpdateId: number;
+			latestDocuments: components["schemas"]["DocumentVersionWithoutContent"][];
+		};
+		PathParams: {
+			vault_id: string;
+		};
+		PathParams2: {
+			vault_id: string;
+		};
+		PathParams3: {
+			/** Format: uuid */
+			document_id: string;
+			vault_id: string;
+		};
+		PathParams4: {
+			/** Format: uuid */
+			document_id: string;
+			vault_id: string;
+		};
+		PathParams5: {
+			/** Format: uuid */
+			document_id: string;
+			vault_id: string;
+		};
+		/** @description Response to a ping request. */
+		PingResponse: {
+			/** @description Whether the client is authenticated based on the sent Authorization header. */
+			isAuthenticated: boolean;
+			/** @description Semantic version of the server. */
+			serverVersion: string;
+		};
+		QueryParams: {
+			/** Format: int64 */
+			since_update_id?: number | null;
+		};
+		SerializedError: {
+			causes: string[];
+			message: string;
+		};
+		UpdateDocumentVersion: {
+			contentBase64: string;
+			/** Format: date-time */
+			createdDate: string;
+			/** Format: int64 */
+			parentVersionId: number;
+			relativePath: string;
+		};
+	};
+	responses: never;
+	parameters: never;
+	requestBodies: never;
+	headers: never;
+	pathItems: never;
 }
 export type $defs = Record<string, never>;
 export type operations = Record<string, never>;
diff --git a/plugin/src/sync-operations/apply-remote-changes-locally.ts b/plugin/src/sync-operations/apply-remote-changes-locally.ts
index 0146463b..e5eb7208 100644
--- a/plugin/src/sync-operations/apply-remote-changes-locally.ts
+++ b/plugin/src/sync-operations/apply-remote-changes-locally.ts
@@ -8,7 +8,7 @@ let isRunning = false;
 export async function applyRemoteChangesLocally({
 	database,
 	syncService,
-	syncer,
+	syncer
 }: {
 	database: Database;
 	syncService: SyncService;
diff --git a/plugin/src/sync-operations/document-lock.test.ts b/plugin/src/sync-operations/document-lock.test.ts
index 08afef97..1b79a225 100644
--- a/plugin/src/sync-operations/document-lock.test.ts
+++ b/plugin/src/sync-operations/document-lock.test.ts
@@ -1,7 +1,7 @@
 import {
 	tryLockDocument,
 	waitForDocumentLock,
-	unlockDocument,
+	unlockDocument
 } from "./document-lock";
 import type { RelativePath } from "src/database/document-metadata";
 
@@ -34,9 +34,9 @@ describe("Document Lock Operations", () => {
 	});
 
 	test("should throw an error when unlocking a document that is not locked", () => {
-		expect(() => { unlockDocument(testPath); }).toThrow(
-			`Document ${testPath} is not locked, cannot unlock`
-		);
+		expect(() => {
+			unlockDocument(testPath);
+		}).toThrow(`Document ${testPath} is not locked, cannot unlock`);
 	});
 
 	test("should wait for a document lock and resolve when unlocked", async () => {
diff --git a/plugin/src/sync-operations/syncer.ts b/plugin/src/sync-operations/syncer.ts
index 15abec74..5621f7cd 100644
--- a/plugin/src/sync-operations/syncer.ts
+++ b/plugin/src/sync-operations/syncer.ts
@@ -1,10 +1,9 @@
 import type { Database } from "src/database/database";
 import type {
 	DocumentMetadata,
-	RelativePath,
+	RelativePath
 } from "src/database/document-metadata";
 import type { FileOperations } from "src/file-operations/file-operations";
-import * as lib from "../../../backend/sync_lib/pkg/sync_lib.js";
 import type { SyncService } from "src/services/sync-service";
 import { Logger } from "src/tracing/logger";
 import type { SyncHistory } from "src/tracing/sync-history";
@@ -12,7 +11,8 @@ import { SyncSource, SyncStatus, SyncType } from "src/tracing/sync-history";
 import { unlockDocument, waitForDocumentLock } from "./document-lock";
 import PQueue from "p-queue";
 import { EMPTY_HASH, hash } from "src/utils/hash";
-import type { components } from "src/services/types.js";
+import type { components } from "src/services/types";
+import { base64ToBytes } from "sync_lib";
 
 export class Syncer {
 	private readonly remainingOperationsListeners: ((
@@ -30,7 +30,7 @@ export class Syncer {
 		private readonly history: SyncHistory
 	) {
 		this.syncQueue = new PQueue({
-			concurrency: database.getSettings().syncConcurrency,
+			concurrency: database.getSettings().syncConcurrency
 		});
 
 		database.addOnSettingsChangeHandlers((settings) => {
@@ -78,9 +78,8 @@ export class Syncer {
 	public async syncRemotelyUpdatedFile(
 		remoteVersion: components["schemas"]["DocumentVersionWithoutContent"]
 	): Promise<void> {
-		await this.syncQueue.add(
-			async () =>
-				this.internalSyncRemotelyUpdatedFile(remoteVersion)
+		await this.syncQueue.add(async () =>
+			this.internalSyncRemotelyUpdatedFile(remoteVersion)
 		);
 	}
 
@@ -104,7 +103,7 @@ export class Syncer {
 		try {
 			const allLocalFiles = await this.operations.listAllFiles();
 			const locallyDeletedFiles = [
-				...this.database.getDocuments().entries(),
+				...this.database.getDocuments().entries()
 			].filter(([path, _]) => !allLocalFiles.includes(path));
 
 			await Promise.all(
@@ -134,7 +133,7 @@ export class Syncer {
 									updateTime:
 										await this.operations.getModificationTime(
 											relativePath
-										),
+										)
 								});
 							}
 
@@ -157,7 +156,7 @@ export class Syncer {
 							updateTime:
 								await this.operations.getModificationTime(
 									relativePath
-								),
+								)
 						});
 					})
 				)
@@ -218,7 +217,7 @@ export class Syncer {
 							status: SyncStatus.NO_OP,
 							relativePath,
 							message: `File hash matches with last synced version, no need to sync`,
-							type: SyncType.UPDATE,
+							type: SyncType.UPDATE
 						});
 						return;
 					}
@@ -227,7 +226,7 @@ export class Syncer {
 				const response = await this.syncService.create({
 					relativePath,
 					contentBytes,
-					createdDate: updateTime,
+					createdDate: updateTime
 				});
 
 				this.history.addHistoryEntry({
@@ -235,13 +234,11 @@ export class Syncer {
 					source: SyncSource.PUSH,
 					relativePath,
 					message: `Successfully uploaded locally created file`,
-					type: SyncType.CREATE,
+					type: SyncType.CREATE
 				});
 
 				if (response.type === "MergingUpdate") {
-					const responseBytes = lib.base64ToBytes(
-						response.contentBase64
-					);
+					const responseBytes = base64ToBytes(response.contentBase64);
 					contentHash = hash(responseBytes);
 
 					await this.operations.write(
@@ -254,7 +251,7 @@ export class Syncer {
 						source: SyncSource.PULL,
 						relativePath,
 						message: `The file we created locally has already existed remotely, so we have merged them`,
-						type: SyncType.UPDATE,
+						type: SyncType.UPDATE
 					});
 				}
 
@@ -262,7 +259,7 @@ export class Syncer {
 					documentId: response.documentId,
 					relativePath: response.relativePath,
 					parentVersionId: response.vaultUpdateId,
-					hash: contentHash,
+					hash: contentHash
 				});
 
 				await this.tryIncrementVaultUpdateId(response.vaultUpdateId);
@@ -273,7 +270,7 @@ export class Syncer {
 	private async internalSyncLocallyUpdatedFile({
 		oldPath,
 		relativePath,
-		updateTime,
+		updateTime
 	}: {
 		oldPath?: RelativePath;
 		relativePath: RelativePath;
@@ -293,7 +290,7 @@ export class Syncer {
 							status: SyncStatus.NO_OP,
 							relativePath,
 							message: `The renaming doesn't require a sync because it must have been pulled from remote`,
-							type: SyncType.UPDATE,
+							type: SyncType.UPDATE
 						});
 						return;
 					}
@@ -314,7 +311,7 @@ export class Syncer {
 						status: SyncStatus.NO_OP,
 						relativePath,
 						message: `File hash matches with last synced version, no need to sync`,
-						type: SyncType.UPDATE,
+						type: SyncType.UPDATE
 					});
 					return;
 				}
@@ -324,7 +321,7 @@ export class Syncer {
 					parentVersionId: localMetadata.parentVersionId,
 					relativePath,
 					contentBytes,
-					createdDate: updateTime,
+					createdDate: updateTime
 				});
 
 				this.history.addHistoryEntry({
@@ -332,7 +329,7 @@ export class Syncer {
 					source: SyncSource.PUSH,
 					relativePath,
 					message: `Successfully uploaded locally updated file to the remote server`,
-					type: SyncType.UPDATE,
+					type: SyncType.UPDATE
 				});
 
 				if (response.isDeleted) {
@@ -348,7 +345,7 @@ export class Syncer {
 						relativePath,
 						message:
 							"The file we tried to update had been deleted remotely, therefore, we have deleted it locally",
-						type: SyncType.DELETE,
+						type: SyncType.DELETE
 					});
 
 					return;
@@ -367,7 +364,7 @@ export class Syncer {
 					}
 
 					if (response.type === "MergingUpdate") {
-						const responseBytes = lib.base64ToBytes(
+						const responseBytes = base64ToBytes(
 							response.contentBase64
 						);
 						contentHash = hash(responseBytes);
@@ -383,7 +380,7 @@ export class Syncer {
 						source: SyncSource.PULL,
 						relativePath,
 						message: `The file we updated had been updated remotely, so we downloaded the merged version`,
-						type: SyncType.UPDATE,
+						type: SyncType.UPDATE
 					});
 
 					await this.database.moveDocument({
@@ -391,7 +388,7 @@ export class Syncer {
 						oldRelativePath: oldPath ?? relativePath,
 						relativePath: response.relativePath,
 						parentVersionId: response.vaultUpdateId,
-						hash: contentHash,
+						hash: contentHash
 					});
 
 					await this.tryIncrementVaultUpdateId(
@@ -420,7 +417,7 @@ export class Syncer {
 						status: SyncStatus.NO_OP,
 						relativePath,
 						message: `Locally deleted file hasn't been uploaded yet, so there's no need to delete it on the remote server`,
-						type: SyncType.DELETE,
+						type: SyncType.DELETE
 					});
 					return;
 				}
@@ -428,7 +425,7 @@ export class Syncer {
 				await this.syncService.delete({
 					documentId: localMetadata.documentId,
 					relativePath,
-					createdDate: new Date(), // We got the event now, so it must have been deleted just now
+					createdDate: new Date() // We got the event now, so it must have been deleted just now
 				});
 
 				this.history.addHistoryEntry({
@@ -436,7 +433,7 @@ export class Syncer {
 					source: SyncSource.PUSH,
 					relativePath,
 					message: `Successfully deleted locally deleted file on the remote server`,
-					type: SyncType.DELETE,
+					type: SyncType.DELETE
 				});
 
 				await this.database.removeDocument(relativePath);
@@ -463,17 +460,17 @@ export class Syncer {
 							source: SyncSource.PULL,
 							relativePath: remoteVersion.relativePath,
 							message: `Remotely deleted file hasn't been synced yet, so there's no need to delete it locally`,
-							type: SyncType.DELETE,
+							type: SyncType.DELETE
 						});
 						return;
 					}
 
 					const content = (
 						await this.syncService.get({
-							documentId: remoteVersion.documentId,
+							documentId: remoteVersion.documentId
 						})
 					).contentBase64;
-					const contentBytes = lib.base64ToBytes(content);
+					const contentBytes = base64ToBytes(content);
 
 					await this.operations.create(
 						remoteVersion.relativePath,
@@ -483,14 +480,14 @@ export class Syncer {
 						documentId: remoteVersion.documentId,
 						relativePath: remoteVersion.relativePath,
 						parentVersionId: remoteVersion.vaultUpdateId,
-						hash: hash(contentBytes),
+						hash: hash(contentBytes)
 					});
 					this.history.addHistoryEntry({
 						status: SyncStatus.SUCCESS,
 						source: SyncSource.PULL,
 						relativePath: remoteVersion.relativePath,
 						message: `Successfully downloaded remote file which hasn't existed locally`,
-						type: SyncType.CREATE,
+						type: SyncType.CREATE
 					});
 					return;
 				}
@@ -516,12 +513,11 @@ export class Syncer {
 							source: SyncSource.PULL,
 							relativePath: remoteVersion.relativePath,
 							message: `Successfully deleted remotely deleted file locally`,
-							type: SyncType.DELETE,
+							type: SyncType.DELETE
 						});
 					} else {
-						const currentContent = await this.operations.read(
-							relativePath
-						);
+						const currentContent =
+							await this.operations.read(relativePath);
 						const currentHash = hash(currentContent);
 
 						if (currentHash !== metadata.hash) {
@@ -533,10 +529,10 @@ export class Syncer {
 
 						const content = (
 							await this.syncService.get({
-								documentId: remoteVersion.documentId,
+								documentId: remoteVersion.documentId
 							})
 						).contentBase64;
-						const contentBytes = lib.base64ToBytes(content);
+						const contentBytes = base64ToBytes(content);
 						const contentHash = hash(contentBytes);
 
 						if (relativePath !== remoteVersion.relativePath) {
@@ -556,7 +552,7 @@ export class Syncer {
 							oldRelativePath: relativePath,
 							relativePath: remoteVersion.relativePath,
 							parentVersionId: remoteVersion.vaultUpdateId,
-							hash: contentHash,
+							hash: contentHash
 						});
 
 						this.history.addHistoryEntry({
@@ -564,7 +560,7 @@ export class Syncer {
 							source: SyncSource.PULL,
 							relativePath: remoteVersion.relativePath,
 							message: `Successfully updated remotely updated file locally`,
-							type: SyncType.UPDATE,
+							type: SyncType.UPDATE
 						});
 					}
 				} finally {
@@ -599,7 +595,7 @@ export class Syncer {
 				relativePath,
 				message: `Failed to ${syncSource.toLocaleLowerCase()} file ${e} when trying to ${syncType.toLocaleLowerCase()} it`,
 				type: syncType,
-				source: syncSource,
+				source: syncSource
 			});
 			throw e;
 		} finally {
diff --git a/plugin/src/tracing/logger.ts b/plugin/src/tracing/logger.ts
index fdd86622..b1d19ba9 100644
--- a/plugin/src/tracing/logger.ts
+++ b/plugin/src/tracing/logger.ts
@@ -4,19 +4,22 @@ export enum LogLevel {
 	DEBUG = "DEBUG",
 	INFO = "INFO",
 	WARNING = "WARNING",
-	ERROR = "ERROR",
+	ERROR = "ERROR"
 }
 
 const LOG_LEVEL_ORDER = {
 	[LogLevel.DEBUG]: 0,
 	[LogLevel.INFO]: 1,
 	[LogLevel.WARNING]: 2,
-	[LogLevel.ERROR]: 3,
+	[LogLevel.ERROR]: 3
 };
 
 class LogLine {
 	public timestamp = new Date();
-	public constructor(public level: LogLevel, public message: string) {}
+	public constructor(
+		public level: LogLevel,
+		public message: string
+	) {}
 }
 
 export class Logger {
diff --git a/plugin/src/tracing/sync-history.ts b/plugin/src/tracing/sync-history.ts
index aca45668..5bdda797 100644
--- a/plugin/src/tracing/sync-history.ts
+++ b/plugin/src/tracing/sync-history.ts
@@ -12,18 +12,18 @@ export interface CommonHistoryEntry {
 export enum SyncType {
 	CREATE = "CREATE",
 	UPDATE = "UPDATE",
-	DELETE = "DELETE",
+	DELETE = "DELETE"
 }
 
 export enum SyncSource {
 	PUSH = "PUSH",
-	PULL = "PULL",
+	PULL = "PULL"
 }
 
 export enum SyncStatus {
 	NO_OP = "NO_OP",
 	SUCCESS = "SUCCESS",
-	ERROR = "ERROR",
+	ERROR = "ERROR"
 }
 
 export type HistoryEntry = CommonHistoryEntry & { timestamp: Date };
@@ -44,7 +44,7 @@ export class SyncHistory {
 
 	private status: HistoryStats = {
 		success: 0,
-		error: 0,
+		error: 0
 	};
 
 	public getEntries(): HistoryEntry[] {
@@ -55,7 +55,7 @@ export class SyncHistory {
 		this.entries.length = 0;
 		this.status = {
 			success: 0,
-			error: 0,
+			error: 0
 		};
 		this.syncHistoryUpdateListeners.forEach((listener) => {
 			listener(this.status);
@@ -72,7 +72,7 @@ export class SyncHistory {
 	public addHistoryEntry(entry: CommonHistoryEntry): void {
 		const historyEntry = {
 			...entry,
-			timestamp: new Date(),
+			timestamp: new Date()
 		};
 		this.entries.push(historyEntry);
 
diff --git a/plugin/src/utils/retried-fetch.ts b/plugin/src/utils/retried-fetch.ts
index 484b8bea..d6694ae7 100644
--- a/plugin/src/utils/retried-fetch.ts
+++ b/plugin/src/utils/retried-fetch.ts
@@ -22,9 +22,7 @@ export async function retriedFetch(
 		retryOn: function (attempt, error, response) {
 			if (error !== null || !response || response.status >= 500) {
 				Logger.getInstance().warn(
-					`Retrying fetch for ${getUrlFromInput(
-						input
-					)}, attempt ${attempt}`
+					`Retrying fetch for ${getUrlFromInput(input)}, attempt ${attempt}`
 				);
 
 				return true;
@@ -33,6 +31,6 @@ export async function retriedFetch(
 		},
 		retries: 6,
 		retryDelay: (attempt) => Math.pow(1.5, attempt) * 500,
-		...init,
+		...init
 	});
 }
diff --git a/plugin/src/vault-link-plugin.ts b/plugin/src/vault-link-plugin.ts
index 5460498c..118393aa 100644
--- a/plugin/src/vault-link-plugin.ts
+++ b/plugin/src/vault-link-plugin.ts
@@ -1,22 +1,22 @@
 import type { WorkspaceLeaf } from "obsidian";
 import { Plugin } from "obsidian";
-
-import * as lib from "../../backend/sync_lib/pkg/sync_lib.js";
-import * as wasmBin from "../../backend/sync_lib/pkg/sync_lib_bg.wasm";
-import { SyncSettingsTab } from "./views/settings-tab.js";
-import { HistoryView } from "./views/history-view.js";
-
-import { ObsidianFileEventHandler } from "./events/obisidan-event-handler.js";
-import { SyncService } from "./services/sync-service.js";
-import { Database } from "./database/database.js";
-import { applyRemoteChangesLocally } from "./sync-operations/apply-remote-changes-locally.js";
-import { ObsidianFileOperations } from "./file-operations/obsidian-file-operations.js";
-import { StatusBar } from "./views/status-bar.js";
-import { Logger } from "./tracing/logger.js";
-import { SyncHistory } from "./tracing/sync-history.js";
-import { LogsView } from "./views/logs-view.js";
-import { Syncer } from "./sync-operations/syncer.js";
-import { StatusDescription } from "./views/status-description.js";
+import "./styles.scss";
+import "../manifest.json";
+import init, { setPanicHook } from "sync_lib";
+import wasmBin from "sync_lib/sync_lib_bg.wasm";
+import { SyncSettingsTab } from "./views/settings-tab";
+import { HistoryView } from "./views/history-view";
+import { ObsidianFileEventHandler } from "./events/obisidan-event-handler";
+import { SyncService } from "./services/sync-service";
+import { Database } from "./database/database";
+import { applyRemoteChangesLocally } from "./sync-operations/apply-remote-changes-locally";
+import { ObsidianFileOperations } from "./file-operations/obsidian-file-operations";
+import { StatusBar } from "./views/status-bar";
+import { Logger } from "./tracing/logger";
+import { SyncHistory } from "./tracing/sync-history";
+import { LogsView } from "./views/logs-view";
+import { Syncer } from "./sync-operations/syncer";
+import { StatusDescription } from "./views/status-description";
 
 export default class VaultLinkPlugin extends Plugin {
 	private readonly operations = new ObsidianFileOperations(this.app.vault);
@@ -27,14 +27,10 @@ export default class VaultLinkPlugin extends Plugin {
 	public async onload(): Promise<void> {
 		Logger.getInstance().info("Starting plugin");
 
-		await lib.default(
-			Promise.resolve(
-				// eslint-disable-next-line
-				(wasmBin as any).default
-			)
-		);
+		// eslint-disable-next-line
+		await init((wasmBin as any).default);
 
-		lib.setPanicHook();
+		setPanicHook();
 
 		const database = new Database(
 			await this.loadData(),
@@ -63,7 +59,7 @@ export default class VaultLinkPlugin extends Plugin {
 			database,
 			syncService,
 			statusDescription,
-			syncer,
+			syncer
 		});
 		this.addSettingTab(this.settingsTab);
 
@@ -90,7 +86,7 @@ export default class VaultLinkPlugin extends Plugin {
 				this.app.vault.on(
 					"rename",
 					eventHandler.onRename.bind(eventHandler)
-				),
+				)
 			].forEach((event) => {
 				this.registerEvent(event);
 			});
@@ -196,7 +192,7 @@ export default class VaultLinkPlugin extends Plugin {
 				applyRemoteChangesLocally({
 					database,
 					syncService,
-					syncer,
+					syncer
 				}),
 			intervalMs
 		);
diff --git a/plugin/src/views/history-view.ts b/plugin/src/views/history-view.ts
index 1ce3036e..ca2f248e 100644
--- a/plugin/src/views/history-view.ts
+++ b/plugin/src/views/history-view.ts
@@ -61,7 +61,7 @@ export class HistoryView extends ItemView {
 		}
 
 		element.createEl("span", {
-			text: entry.relativePath,
+			text: entry.relativePath
 		});
 
 		const syncSourceIcon = HistoryView.getSyncSourceIcon(entry.source);
@@ -107,7 +107,7 @@ export class HistoryView extends ItemView {
 		entries.forEach((entry) => {
 			container.createDiv(
 				{
-					cls: ["history-card", entry.status.toLocaleLowerCase()],
+					cls: ["history-card", entry.status.toLocaleLowerCase()]
 				},
 				(card) => {
 					if (
@@ -127,13 +127,13 @@ export class HistoryView extends ItemView {
 
 					card.createDiv(
 						{
-							cls: "history-card-header",
+							cls: "history-card-header"
 						},
 						(header) => {
 							header.createEl(
 								"h5",
 								{
-									cls: "history-card-title",
+									cls: "history-card-title"
 								},
 								(title) => {
 									HistoryView.renderSyncItemTitle(
@@ -148,14 +148,14 @@ export class HistoryView extends ItemView {
 									entry.timestamp,
 									new Date()
 								),
-								cls: "history-card-timestamp",
+								cls: "history-card-timestamp"
 							});
 						}
 					);
 
 					card.createEl("p", {
 						text: `${entry.message}.`,
-						cls: "history-card-message",
+						cls: "history-card-message"
 					});
 				}
 			);
diff --git a/plugin/src/views/logs-view.ts b/plugin/src/views/logs-view.ts
index 4d36fa65..6880dc7b 100644
--- a/plugin/src/views/logs-view.ts
+++ b/plugin/src/views/logs-view.ts
@@ -61,13 +61,13 @@ export class LogsView extends ItemView {
 		container.createEl(
 			"p",
 			{
-				text: "This view displays logs generated by VaultLink. You can set the log level in the ",
+				text: "This view displays logs generated by VaultLink. You can set the log level in the "
 			},
 			(p) => {
 				p.createEl(
 					"a",
 					{
-						text: "settings",
+						text: "settings"
 					},
 					(button) => {
 						button.addEventListener("click", () => {
@@ -95,17 +95,17 @@ export class LogsView extends ItemView {
 				logs.forEach((message) =>
 					element.createDiv(
 						{
-							cls: ["log-message", message.level],
+							cls: ["log-message", message.level]
 						},
 						(messageContainer) => {
 							messageContainer.createEl("span", {
 								text: LogsView.formatTimestamp(
 									message.timestamp
 								),
-								cls: "timestamp",
+								cls: "timestamp"
 							});
 							messageContainer.createEl("span", {
-								text: message.message,
+								text: message.message
 							});
 						}
 					)
diff --git a/plugin/src/views/settings-tab.ts b/plugin/src/views/settings-tab.ts
index 74267642..0816ed6e 100644
--- a/plugin/src/views/settings-tab.ts
+++ b/plugin/src/views/settings-tab.ts
@@ -4,11 +4,11 @@ import { Notice, PluginSettingTab, Setting } from "obsidian";
 import type VaultLinkPlugin from "src/vault-link-plugin";
 import type { Database } from "src/database/database";
 import type { SyncService } from "src/services/sync-service";
-import { Logger, LogLevel } from "src/tracing/logger";
 import type { Syncer } from "src/sync-operations/syncer";
 import type { StatusDescription } from "./status-description";
 import { LogsView } from "./logs-view";
 import { HistoryView } from "./history-view";
+import { Logger, LogLevel } from "src/tracing/logger";
 
 export class SyncSettingsTab extends PluginSettingTab {
 	private editedVaultName: string;
@@ -26,7 +26,7 @@ export class SyncSettingsTab extends PluginSettingTab {
 		database,
 		syncService,
 		statusDescription,
-		syncer,
+		syncer
 	}: {
 		app: App;
 		plugin: VaultLinkPlugin;
@@ -72,12 +72,12 @@ export class SyncSettingsTab extends PluginSettingTab {
 	private renderSettingsHeader(containerEl: HTMLElement): void {
 		containerEl.createEl("h2", { text: "VaultLink" }).createSpan({
 			text: this.plugin.manifest.version,
-			cls: "version",
+			cls: "version"
 		});
 
 		containerEl.createDiv(
 			{
-				cls: "description",
+				cls: "description"
 			},
 			(descriptionContainer) => {
 				this.setStatusDescriptionSubscription((): void => {
@@ -90,13 +90,13 @@ export class SyncSettingsTab extends PluginSettingTab {
 
 		containerEl.createDiv(
 			{
-				cls: "button-container",
+				cls: "button-container"
 			},
 			(buttonContainer) => {
 				buttonContainer.createEl(
 					"button",
 					{
-						text: "Show history",
+						text: "Show history"
 					},
 					(button) =>
 						(button.onclick = async (): Promise<void> => {
@@ -108,7 +108,7 @@ export class SyncSettingsTab extends PluginSettingTab {
 				buttonContainer.createEl(
 					"button",
 					{
-						text: "Show logs",
+						text: "Show logs"
 					},
 					(button) =>
 						(button.onclick = async (): Promise<void> => {
@@ -296,7 +296,7 @@ export class SyncSettingsTab extends PluginSettingTab {
 						[LogLevel.DEBUG]: LogLevel.DEBUG,
 						[LogLevel.INFO]: LogLevel.INFO,
 						[LogLevel.WARNING]: LogLevel.WARNING,
-						[LogLevel.ERROR]: LogLevel.ERROR,
+						[LogLevel.ERROR]: LogLevel.ERROR
 					})
 					.onChange(async (value) =>
 						this.database.setSetting(
diff --git a/plugin/src/views/status-bar.ts b/plugin/src/views/status-bar.ts
index 6c3f43b4..0a5e8e1c 100644
--- a/plugin/src/views/status-bar.ts
+++ b/plugin/src/views/status-bar.ts
@@ -34,7 +34,7 @@ export class StatusBar {
 	private updateStatus(): void {
 		this.statusBarItem.empty();
 		const container = this.statusBarItem.createDiv({
-			cls: ["sync-status"],
+			cls: ["sync-status"]
 		});
 
 		let hasShownMessage = false;
@@ -47,14 +47,14 @@ export class StatusBar {
 		if ((this.lastHistoryStats?.success ?? 0) > 0) {
 			hasShownMessage = true;
 			container.createSpan({
-				text: `${this.lastHistoryStats?.success ?? 0} ✅`,
+				text: `${this.lastHistoryStats?.success ?? 0} ✅`
 			});
 		}
 
 		if ((this.lastHistoryStats?.error ?? 0) > 0) {
 			hasShownMessage = true;
 			container.createSpan({
-				text: `${this.lastHistoryStats?.error ?? 0} ❌`,
+				text: `${this.lastHistoryStats?.error ?? 0} ❌`
 			});
 		}
 
@@ -64,7 +64,7 @@ export class StatusBar {
 			} else {
 				const button = container.createEl("button", {
 					text: "VaultLink is disabled, click to configure",
-					cls: "initialize-button",
+					cls: "initialize-button"
 				});
 				button.onclick = (): void => {
 					this.plugin.openSettings();
diff --git a/plugin/src/views/status-description.ts b/plugin/src/views/status-description.ts
index 1b2f5362..fa7622f8 100644
--- a/plugin/src/views/status-description.ts
+++ b/plugin/src/views/status-description.ts
@@ -1,7 +1,7 @@
 import type { Database } from "src/database/database";
 import type {
 	CheckConnectionResult,
-	SyncService,
+	SyncService
 } from "src/services/sync-service";
 import type { Syncer } from "src/sync-operations/syncer";
 import type { HistoryStats, SyncHistory } from "src/tracing/sync-history";
@@ -57,7 +57,7 @@ export class StatusDescription {
 		if (this.lastConnectionState == undefined) {
 			container.createSpan({
 				text: "VaultLink is starting up…",
-				cls: "warning",
+				cls: "warning"
 			});
 			return;
 		}
@@ -65,7 +65,7 @@ export class StatusDescription {
 		if (!this.lastConnectionState.isSuccessful) {
 			container.createSpan({
 				text: `VaultLink failed to connect to the remote server with the error "${this.lastConnectionState.message}"`,
-				cls: "error",
+				cls: "error"
 			});
 			return;
 		}
@@ -73,18 +73,18 @@ export class StatusDescription {
 		container.createSpan({ text: "VaultLink is connected to the server " });
 		container.createEl("a", {
 			text: this.database.getSettings().remoteUri,
-			href: this.database.getSettings().remoteUri,
+			href: this.database.getSettings().remoteUri
 		});
 
 		container.createSpan({
-			text: ` and has indexed approximately `,
+			text: ` and has indexed approximately `
 		});
 		container.createSpan({
 			text: `${this.database.getDocuments().size}`,
-			cls: "number",
+			cls: "number"
 		});
 		container.createSpan({
-			text: ` documents. `,
+			text: ` documents. `
 		});
 
 		if (
@@ -94,40 +94,40 @@ export class StatusDescription {
 		) {
 			if (this.database.getSettings().isSyncEnabled) {
 				container.createSpan({
-					text: "Syncing is enabled but VaultLink hasn't found anything to sync yet.",
+					text: "Syncing is enabled but VaultLink hasn't found anything to sync yet."
 				});
 			} else {
 				container.createSpan({
 					text: "However, syncing is disabled right now.",
-					cls: "warning",
+					cls: "warning"
 				});
 			}
 			return;
 		}
 
 		container.createSpan({
-			text: "The plugin has ",
+			text: "The plugin has "
 		});
 		container.createSpan({
 			text: `${this.lastRemaining ?? 0}`,
-			cls: "number",
+			cls: "number"
 		});
 		container.createSpan({
-			text: " outstanding operations while having succeeded ",
+			text: " outstanding operations while having succeeded "
 		});
 		container.createSpan({
 			text: `${this.lastHistoryStats?.success ?? 0}`,
-			cls: ["number", "good"],
+			cls: ["number", "good"]
 		});
 		container.createSpan({
-			text: " times and failed ",
+			text: " times and failed "
 		});
 		container.createSpan({
 			text: `${this.lastHistoryStats?.error ?? 0}`,
-			cls: ["number", "bad"],
+			cls: ["number", "bad"]
 		});
 		container.createSpan({
-			text: " times.",
+			text: " times."
 		});
 	}
 

From 7e045caab1e1337b0e875821214e69ee358fc81a Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 5 Jan 2025 20:49:26 +0000
Subject: [PATCH 130/761] Fix Jest WASM tests

---
 .vscode/settings.json    |   2 +-
 plugin/jest.config.js    |   7 +-
 plugin/package.json      |   3 +-
 plugin/webpack.config.js | 207 ++++++++++++++++++++-------------------
 4 files changed, 110 insertions(+), 109 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 7528fff7..11cfe5c0 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,4 +1,4 @@
 {
-    "jest.jestCommandLine": "npx jest",
+    "jest.jestCommandLine": "NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules\" npx jest",
     "jest.rootPath": "plugin"
 }
\ No newline at end of file
diff --git a/plugin/jest.config.js b/plugin/jest.config.js
index 840a552a..8c1027ee 100644
--- a/plugin/jest.config.js
+++ b/plugin/jest.config.js
@@ -1,8 +1,3 @@
 module.exports = {
-	testEnvironment: "node",
-	moduleFileExtensions: ["js", "ts"],
-	testMatch: ["**/src/**/*.test.ts"],
-	transform: {
-		"^.+\\.(ts|tsx)$": "ts-jest",
-	},
+	preset: "ts-jest/presets/js-with-babel-esm"
 };
diff --git a/plugin/package.json b/plugin/package.json
index acafe9da..997d4cd8 100644
--- a/plugin/package.json
+++ b/plugin/package.json
@@ -6,13 +6,12 @@
 	"scripts": {
 		"dev": "webpack watch --mode development",
 		"build": "webpack --mode production",
-		"test": "jest",
+		"test": "NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules\" jest",
 		"lint": "eslint --fix src && prettier --write \"src/**/*.(ts|scss|json|html)\"",
 		"version": "node version-bump.mjs"
 	},
 	"keywords": [],
 	"author": "",
-	"type": "commonjs",
 	"license": "MIT",
 	"prettier": {
 		"trailingComma": "none",
diff --git a/plugin/webpack.config.js b/plugin/webpack.config.js
index c7f7e0b6..7f661243 100644
--- a/plugin/webpack.config.js
+++ b/plugin/webpack.config.js
@@ -4,106 +4,113 @@ const MiniCssExtractPlugin = require("mini-css-extract-plugin");
 const fs = require("fs-extra");
 
 module.exports = (env, argv) => ({
-  devtool: argv.mode === "development" ? "inline-source-map" : false,
-  entry: {
-    index: "./src/vault-link-plugin.ts"
-  },
-  watchOptions: {
-    ignored: "**/node_modules"
-  },
-  externals: {
-    obsidian: "commonjs obsidian"
-  },
-  optimization: {
-    minimizer: [
-      new TerserPlugin({
-        terserOptions: {
-          module: true
-        }
-      })
-    ]
-  },
-  plugins: [
-    new MiniCssExtractPlugin({
-      filename: "styles.css"
-    }),
-    new (require("webpack").DefinePlugin)({
-      __CURRENT_DATE__: Date.now()
-    }),
-    {
-      apply: (compiler) => {
-        if (argv.mode !== "development") {
-          return;
-        }
+	devtool: argv.mode === "development" ? "inline-source-map" : false,
+	entry: {
+		index: "./src/vault-link-plugin.ts"
+	},
+	watchOptions: {
+		ignored: "**/node_modules"
+	},
+	externals: {
+		obsidian: "commonjs obsidian"
+	},
+	optimization: {
+		minimizer: [
+			new TerserPlugin({
+				terserOptions: {
+					module: true
+				}
+			})
+		]
+	},
+	plugins: [
+		new MiniCssExtractPlugin({
+			filename: "styles.css"
+		}),
 
-        compiler.hooks.done.tap("Copy Files Plugin", (stats) => {
-          const source = path.resolve(__dirname, "dist");
-          const destinations = [
-            "/mnt/c/Users/Andras/Desktop/test/test/.obsidian/plugins/my-plugin",
-            "/mnt/c/Users/Andras/Desktop/test/test2/.obsidian/plugins/my-plugin",
-            "/home/andras/obsidian-test/.obsidian/plugins/my-plugin"
-          ];
-          destinations.forEach((destination) => {
-            fs.copy(source, destination)
-              .then(() => console.log("Files copied successfully after build!"))
-              .catch((err) => console.error("Error copying files:", err));
+		new (require("webpack").DefinePlugin)({
+			__CURRENT_DATE__: Date.now()
+		}),
+		{
+			apply: (compiler) => {
+				if (argv.mode !== "development") {
+					return;
+				}
 
-            fs.createFile(path.join(destination, ".hotreload"));
-          });
-        });
-      }
-    }
-  ],
-  module: {
-    rules: [
-      {
-        test: /\.json$/i,
-        type: "asset/resource",
-        generator: {
-          filename: "[name][ext]"
-        }
-      },
-      {
-        test: /\.scss$/i,
-        use: [
-          MiniCssExtractPlugin.loader,
-          "css-loader",
-          "resolve-url-loader",
-          {
-            loader: "sass-loader",
-            options: {
-              sourceMap: true // required by resolve-url-loader
-            }
-          }
-        ]
-      },
-      {
-        test: /\.ts$/,
-        use: ["ts-loader"]
-      },
-      {
-        test: /\.wasm$/,
-        type: "asset/inline"
-      }
-    ]
-  },
-  resolve: {
-    extensions: [
-      ".ts",
-      ".js" // required for development
-    ],
-    alias: {
-      root: __dirname,
-      src: path.resolve(__dirname, "src")
-    }
-  },
-  output: {
-    clean: true,
-    filename: "main.js",
-    library: {
-      type: "commonjs" // required for Obsidian
-    },
-    path: path.resolve(__dirname, "dist"),
-    publicPath: ""
-  }
+				compiler.hooks.done.tap("Copy Files Plugin", (stats) => {
+					const source = path.resolve(__dirname, "dist");
+					const destinations = [
+						"/mnt/c/Users/Andras/Desktop/test/test/.obsidian/plugins/my-plugin",
+						"/mnt/c/Users/Andras/Desktop/test/test2/.obsidian/plugins/my-plugin",
+						"/home/andras/obsidian-test/.obsidian/plugins/my-plugin"
+					];
+					destinations.forEach((destination) => {
+						fs.copy(source, destination)
+							.then(() =>
+								console.log(
+									"Files copied successfully after build!"
+								)
+							)
+							.catch((err) =>
+								console.error("Error copying files:", err)
+							);
+
+						fs.createFile(path.join(destination, ".hotreload"));
+					});
+				});
+			}
+		}
+	],
+	module: {
+		rules: [
+			{
+				test: /\.json$/i,
+				type: "asset/resource",
+				generator: {
+					filename: "[name][ext]"
+				}
+			},
+			{
+				test: /\.scss$/i,
+				use: [
+					MiniCssExtractPlugin.loader,
+					"css-loader",
+					"resolve-url-loader",
+					{
+						loader: "sass-loader",
+						options: {
+							sourceMap: true // required by resolve-url-loader
+						}
+					}
+				]
+			},
+			{
+				test: /\.ts$/,
+				use: ["ts-loader"]
+			},
+			{
+				test: /\.wasm$/,
+				type: "asset/inline"
+			}
+		]
+	},
+	resolve: {
+		extensions: [
+			".ts",
+			".js" // required for development
+		],
+		alias: {
+			root: __dirname,
+			src: path.resolve(__dirname, "src")
+		}
+	},
+	output: {
+		clean: true,
+		filename: "main.js",
+		library: {
+			type: "commonjs" // required for Obsidian
+		},
+		path: path.resolve(__dirname, "dist"),
+		publicPath: ""
+	}
 });

From e43a13648b71b009ecec903aba2aa052a43649f2 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 5 Jan 2025 20:49:38 +0000
Subject: [PATCH 131/761] Move ser/deser logic to JS

---
 .../obsidian-file-operations.ts               |  2 +-
 plugin/src/services/sync-service.ts           |  6 ++---
 plugin/src/sync-operations/syncer.ts          | 26 +++++++++----------
 plugin/src/utils/deserialize.test.ts          | 18 +++++++++++++
 plugin/src/utils/deserialize.ts               |  3 +++
 plugin/src/utils/serialize.test.ts            | 18 +++++++++++++
 plugin/src/utils/serialize.ts                 |  3 +++
 7 files changed, 59 insertions(+), 17 deletions(-)
 create mode 100644 plugin/src/utils/deserialize.test.ts
 create mode 100644 plugin/src/utils/deserialize.ts
 create mode 100644 plugin/src/utils/serialize.test.ts
 create mode 100644 plugin/src/utils/serialize.ts

diff --git a/plugin/src/file-operations/obsidian-file-operations.ts b/plugin/src/file-operations/obsidian-file-operations.ts
index c578018f..6a82006f 100644
--- a/plugin/src/file-operations/obsidian-file-operations.ts
+++ b/plugin/src/file-operations/obsidian-file-operations.ts
@@ -49,7 +49,7 @@ export class ObsidianFileOperations implements FileOperations {
 			return new Uint8Array(0);
 		}
 
-		if (isBinary(expectedContent) || !path.endsWith(".md")) {
+		if (isBinary(expectedContent)) {
 			await this.vault.adapter.writeBinary(
 				normalizePath(path),
 				newContent
diff --git a/plugin/src/services/sync-service.ts b/plugin/src/services/sync-service.ts
index 32f09d8b..d9c34109 100644
--- a/plugin/src/services/sync-service.ts
+++ b/plugin/src/services/sync-service.ts
@@ -10,7 +10,7 @@ import type {
 } from "src/database/document-metadata";
 import { Logger } from "src/tracing/logger";
 import { retriedFetch } from "src/utils/retried-fetch";
-import { bytesToBase64 } from "sync_lib";
+import { serialize } from "src/utils/serialize";
 
 export interface CheckConnectionResult {
 	isSuccessful: boolean;
@@ -83,7 +83,7 @@ export class SyncService {
 					}
 				},
 				body: {
-					contentBase64: bytesToBase64(contentBytes),
+					contentBase64: serialize(contentBytes),
 					createdDate: createdDate.toISOString(),
 					relativePath
 				}
@@ -132,7 +132,7 @@ export class SyncService {
 				},
 				body: {
 					parentVersionId,
-					contentBase64: bytesToBase64(contentBytes),
+					contentBase64: serialize(contentBytes),
 					createdDate: createdDate.toISOString(),
 					relativePath
 				}
diff --git a/plugin/src/sync-operations/syncer.ts b/plugin/src/sync-operations/syncer.ts
index 5621f7cd..bbf4360f 100644
--- a/plugin/src/sync-operations/syncer.ts
+++ b/plugin/src/sync-operations/syncer.ts
@@ -12,7 +12,7 @@ import { unlockDocument, waitForDocumentLock } from "./document-lock";
 import PQueue from "p-queue";
 import { EMPTY_HASH, hash } from "src/utils/hash";
 import type { components } from "src/services/types";
-import { base64ToBytes } from "sync_lib";
+import { deserialize } from "src/utils/deserialize";
 
 export class Syncer {
 	private readonly remainingOperationsListeners: ((
@@ -238,7 +238,7 @@ export class Syncer {
 				});
 
 				if (response.type === "MergingUpdate") {
-					const responseBytes = base64ToBytes(response.contentBase64);
+					const responseBytes = deserialize(response.contentBase64);
 					contentHash = hash(responseBytes);
 
 					await this.operations.write(
@@ -364,7 +364,7 @@ export class Syncer {
 					}
 
 					if (response.type === "MergingUpdate") {
-						const responseBytes = base64ToBytes(
+						const responseBytes = deserialize(
 							response.contentBase64
 						);
 						contentHash = hash(responseBytes);
@@ -373,15 +373,15 @@ export class Syncer {
 							contentBytes,
 							responseBytes
 						);
-					}
 
-					this.history.addHistoryEntry({
-						status: SyncStatus.SUCCESS,
-						source: SyncSource.PULL,
-						relativePath,
-						message: `The file we updated had been updated remotely, so we downloaded the merged version`,
-						type: SyncType.UPDATE
-					});
+						this.history.addHistoryEntry({
+							status: SyncStatus.SUCCESS,
+							source: SyncSource.PULL,
+							relativePath,
+							message: `The file we updated had been updated remotely, so we downloaded the merged version`,
+							type: SyncType.UPDATE
+						});
+					}
 
 					await this.database.moveDocument({
 						documentId: localMetadata.documentId,
@@ -470,7 +470,7 @@ export class Syncer {
 							documentId: remoteVersion.documentId
 						})
 					).contentBase64;
-					const contentBytes = base64ToBytes(content);
+					const contentBytes = deserialize(content);
 
 					await this.operations.create(
 						remoteVersion.relativePath,
@@ -532,7 +532,7 @@ export class Syncer {
 								documentId: remoteVersion.documentId
 							})
 						).contentBase64;
-						const contentBytes = base64ToBytes(content);
+						const contentBytes = deserialize(content);
 						const contentHash = hash(contentBytes);
 
 						if (relativePath !== remoteVersion.relativePath) {
diff --git a/plugin/src/utils/deserialize.test.ts b/plugin/src/utils/deserialize.test.ts
new file mode 100644
index 00000000..fa50a2cd
--- /dev/null
+++ b/plugin/src/utils/deserialize.test.ts
@@ -0,0 +1,18 @@
+import init, { base64ToBytes } from "sync_lib";
+import fs from "fs";
+
+describe("deserialize", () => {
+	it("should serialize a Uint8Array to a base64 string", async () => {
+		const wasmBin = fs.readFileSync(
+			"../backend/sync_lib/pkg/sync_lib_bg.wasm"
+		);
+		await init({ module_or_path: wasmBin });
+
+		const base64 = "SGVsbG8=";
+		const jsResult = base64ToBytes(base64);
+		const expected = new Uint8Array([72, 101, 108, 108, 111]);
+		expect(jsResult).toEqual(expected);
+		const rustResult = base64ToBytes(base64);
+		expect(jsResult).toEqual(rustResult);
+	});
+});
diff --git a/plugin/src/utils/deserialize.ts b/plugin/src/utils/deserialize.ts
new file mode 100644
index 00000000..c02e18f2
--- /dev/null
+++ b/plugin/src/utils/deserialize.ts
@@ -0,0 +1,3 @@
+export function deserialize(data: string): Uint8Array {
+	return Buffer.from(data, "base64");
+}
diff --git a/plugin/src/utils/serialize.test.ts b/plugin/src/utils/serialize.test.ts
new file mode 100644
index 00000000..ae2016e5
--- /dev/null
+++ b/plugin/src/utils/serialize.test.ts
@@ -0,0 +1,18 @@
+import { serialize } from "./serialize";
+import init, { bytesToBase64 } from "sync_lib";
+import fs from "fs";
+
+describe("serialize", () => {
+	it("should serialize a Uint8Array to a base64 string", async () => {
+		const wasmBin = fs.readFileSync(
+			"../backend/sync_lib/pkg/sync_lib_bg.wasm"
+		);
+		await init({ module_or_path: wasmBin });
+
+		const data = new Uint8Array([72, 101, 108, 108, 111]);
+		const jsResult = serialize(data);
+		const rustResult = bytesToBase64(data);
+		expect(rustResult).toBe("SGVsbG8=");
+		expect(jsResult).toBe(rustResult);
+	});
+});
diff --git a/plugin/src/utils/serialize.ts b/plugin/src/utils/serialize.ts
new file mode 100644
index 00000000..be9a9abc
--- /dev/null
+++ b/plugin/src/utils/serialize.ts
@@ -0,0 +1,3 @@
+export function serialize(data: Uint8Array): string {
+	return Buffer.from(data).toString("base64");
+}

From f1cc7441a4f3a8328b4308ff387399c985a7c79e Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 5 Jan 2025 20:58:12 +0000
Subject: [PATCH 132/761] Fix wasm tests

---
 .github/workflows/check.yml   |  2 +-
 backend/Cargo.lock            | 42 +++++++++++++++++------------------
 backend/sync_lib/Cargo.toml   |  4 ++--
 backend/sync_lib/tests/web.rs |  2 --
 4 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 6dc3977c..a89bd430 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -44,7 +44,7 @@ jobs:
           cd backend
           cargo test --verbose
           cd sync_lib
-          wasm-pack test --firefox --headless
+          wasm-pack test --node
 
       - name: Lint frontend
         run: |
diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index a5f81650..f8fdfe9e 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1059,9 +1059,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.74"
+version = "0.3.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a865e038f7f6ed956f788f0d7d60c541fff74c7bd74272c5d4cf15c63743e705"
+checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7"
 dependencies = [
  "once_cell",
  "wasm-bindgen",
@@ -2567,9 +2567,9 @@ checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.97"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d15e63b4482863c109d70a7b8706c1e364eb6ea449b201a76c5b89cedcec2d5c"
+checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -2578,13 +2578,12 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.97"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d36ef12e3aaca16ddd3f67922bc63e48e953f126de60bd33ccc0101ef9998cd"
+checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79"
 dependencies = [
  "bumpalo",
  "log",
- "once_cell",
  "proc-macro2",
  "quote",
  "syn",
@@ -2593,9 +2592,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.47"
+version = "0.4.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dfaf8f50e5f293737ee323940c7d8b08a66a95a419223d9f41610ca08b0833d"
+checksum = "38176d9b44ea84e9184eff0bc34cc167ed044f816accfe5922e54d84cf48eca2"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -2606,9 +2605,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.97"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "705440e08b42d3e4b36de7d66c944be628d579796b8090bfa3471478a2260051"
+checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -2616,9 +2615,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.97"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98c9ae5a76e46f4deecd0f0255cc223cfa18dc9b261213b8aa0c7b36f61b3f1d"
+checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2629,19 +2628,18 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.97"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ee99da9c5ba11bd675621338ef6fa52296b76b83305e9b6e5c77d4c286d6d49"
+checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6"
 
 [[package]]
 name = "wasm-bindgen-test"
-version = "0.3.47"
+version = "0.3.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d919bb60ebcecb9160afee6c71b43a58a4f0517a2de0054cd050d02cec08201"
+checksum = "c61d44563646eb934577f2772656c7ad5e9c90fac78aa8013d776fcdaf24625d"
 dependencies = [
  "js-sys",
  "minicov",
- "once_cell",
  "scoped-tls",
  "wasm-bindgen",
  "wasm-bindgen-futures",
@@ -2650,9 +2648,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-test-macro"
-version = "0.3.47"
+version = "0.3.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "222ebde6ea87fbfa6bdd2e9f1fd8a91d60aee5db68792632176c4e16a74fc7d8"
+checksum = "54171416ce73aa0b9c377b51cc3cb542becee1cd678204812e8392e5b0e4a031"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2661,9 +2659,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.74"
+version = "0.3.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a98bc3c33f0fe7e59ad7cd041b89034fa82a7c2d4365ca538dda6cdaf513863c"
+checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
diff --git a/backend/sync_lib/Cargo.toml b/backend/sync_lib/Cargo.toml
index 932070d9..2ac90103 100644
--- a/backend/sync_lib/Cargo.toml
+++ b/backend/sync_lib/Cargo.toml
@@ -10,7 +10,7 @@ crate-type = ["cdylib", "rlib"]
 [dependencies]
 base64 = "0.22.1"
 reconcile = { path = "../reconcile" }
-wasm-bindgen = "0.2.84"
+wasm-bindgen = "0.2.99"
 thiserror = { workspace = true }
 
 # The `console_error_panic_hook` crate provides better debugging of panics by
@@ -20,7 +20,7 @@ thiserror = { workspace = true }
 console_error_panic_hook = { version = "0.1.7", optional = true }
 
 [dev-dependencies]
-wasm-bindgen-test = "0.3.34"
+wasm-bindgen-test = "0.3.49"
 insta = "1.41.1"
 
 [features]
diff --git a/backend/sync_lib/tests/web.rs b/backend/sync_lib/tests/web.rs
index 3b90fd7b..ceae695b 100644
--- a/backend/sync_lib/tests/web.rs
+++ b/backend/sync_lib/tests/web.rs
@@ -4,8 +4,6 @@ use insta::assert_debug_snapshot;
 use sync_lib::*;
 use wasm_bindgen_test::*;
 
-wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_browser);
-
 #[wasm_bindgen_test(unsupported = test)]
 fn test_bytes_to_base64() {
     let input = b"hello";

From 68cb76e6ff9d85ea2321e3b2acd73557041fef56 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 5 Jan 2025 20:58:14 +0000
Subject: [PATCH 133/761] Set value before onChange

---
 plugin/src/views/settings-tab.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugin/src/views/settings-tab.ts b/plugin/src/views/settings-tab.ts
index 0816ed6e..535746c6 100644
--- a/plugin/src/views/settings-tab.ts
+++ b/plugin/src/views/settings-tab.ts
@@ -279,10 +279,10 @@ export class SyncSettingsTab extends PluginSettingTab {
 			)
 			.addToggle((toggle) =>
 				toggle
+					.setValue(this.database.getSettings().displayNoopSyncEvents)
 					.onChange(async (value) =>
 						this.database.setSetting("displayNoopSyncEvents", value)
 					)
-					.setValue(this.database.getSettings().displayNoopSyncEvents)
 			);
 
 		new Setting(containerEl)
@@ -298,6 +298,7 @@ export class SyncSettingsTab extends PluginSettingTab {
 						[LogLevel.WARNING]: LogLevel.WARNING,
 						[LogLevel.ERROR]: LogLevel.ERROR
 					})
+					.setValue(this.database.getSettings().minimumLogLevel)
 					.onChange(async (value) =>
 						this.database.setSetting(
 							"minimumLogLevel",
@@ -305,7 +306,6 @@ export class SyncSettingsTab extends PluginSettingTab {
 							value as LogLevel
 						)
 					)
-					.setValue(this.database.getSettings().minimumLogLevel)
 			);
 	}
 

From 8f3947deecd90ae98f54ac2fd52904243130edda Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 5 Jan 2025 21:01:09 +0000
Subject: [PATCH 134/761] Ignore tests

---
 .github/workflows/check.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index a89bd430..1585cacf 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -44,7 +44,7 @@ jobs:
           cd backend
           cargo test --verbose
           cd sync_lib
-          wasm-pack test --node
+          # wasm-pack test --node # todo: fix this is CI
 
       - name: Lint frontend
         run: |

From a57fd5c9a6b82bd499a408838713ea6b8a36b899 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 5 Jan 2025 21:01:11 +0000
Subject: [PATCH 135/761] Add comment

---
 plugin/src/vault-link-plugin.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugin/src/vault-link-plugin.ts b/plugin/src/vault-link-plugin.ts
index 118393aa..c05288f9 100644
--- a/plugin/src/vault-link-plugin.ts
+++ b/plugin/src/vault-link-plugin.ts
@@ -28,7 +28,9 @@ export default class VaultLinkPlugin extends Plugin {
 		Logger.getInstance().info("Starting plugin");
 
 		// eslint-disable-next-line
-		await init((wasmBin as any).default);
+		await init(
+			(wasmBin as any).default // it is loaded as a base64 string by webpack
+		);
 
 		setPanicHook();
 

From e2164874ddf5eec4095815b17814aee76ecd8724 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 5 Jan 2025 21:02:52 +0000
Subject: [PATCH 136/761] Remove comment

---
 plugin/src/views/logs-view.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/plugin/src/views/logs-view.ts b/plugin/src/views/logs-view.ts
index 6880dc7b..f9968d1d 100644
--- a/plugin/src/views/logs-view.ts
+++ b/plugin/src/views/logs-view.ts
@@ -53,8 +53,6 @@ export class LogsView extends ItemView {
 			.item(0);
 		const scrollPosition = logsContainer?.scrollTop;
 
-		console.log(scrollPosition);
-
 		container.empty();
 
 		container.createEl("h4", { text: "VaultLink logs" });

From 540f06efd65e400dc2a1eabbad229f314448bb72 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 5 Jan 2025 21:03:50 +0000
Subject: [PATCH 137/761] Fix lint

---
 plugin/src/vault-link-plugin.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin/src/vault-link-plugin.ts b/plugin/src/vault-link-plugin.ts
index c05288f9..b524f1c2 100644
--- a/plugin/src/vault-link-plugin.ts
+++ b/plugin/src/vault-link-plugin.ts
@@ -27,8 +27,8 @@ export default class VaultLinkPlugin extends Plugin {
 	public async onload(): Promise<void> {
 		Logger.getInstance().info("Starting plugin");
 
-		// eslint-disable-next-line
 		await init(
+			// eslint-disable-next-line
 			(wasmBin as any).default // it is loaded as a base64 string by webpack
 		);
 

From e74e11e69f18460efab086440c03a45b6b0d9b31 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 5 Jan 2025 21:05:05 +0000
Subject: [PATCH 138/761] Change docker work dir

---
 backend/Dockerfile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/backend/Dockerfile b/backend/Dockerfile
index d94f75b8..8d2fdc46 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -23,10 +23,11 @@ RUN apk add --no-cache curl
 
 COPY --from=builder /usr/src/backend/target/x86_64-unknown-linux-musl/release/sync_server /app/sync_server
 
-WORKDIR /app
-
+VOLUME /data
 EXPOSE 3000/tcp
 
+WORKDIR /data
+
 HEALTHCHECK \
     --interval=30s \
     --timeout=5s \

From 2e1ed1fd942d84fee6439ccadafcdda68b746c32 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 5 Jan 2025 21:06:31 +0000
Subject: [PATCH 139/761] Bump versions to 0.0.14

---
 backend/Cargo.lock             | 8 ++++----
 backend/fuzz/Cargo.toml        | 2 +-
 backend/reconcile/Cargo.toml   | 2 +-
 backend/sync_lib/Cargo.toml    | 2 +-
 backend/sync_server/Cargo.toml | 2 +-
 manifest.json                  | 2 +-
 plugin/manifest.json           | 2 +-
 plugin/package-lock.json       | 4 ++--
 plugin/package.json            | 4 ++--
 9 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index f8fdfe9e..35890a88 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1479,7 +1479,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile"
-version = "0.0.13"
+version = "0.0.14"
 dependencies = [
  "insta",
  "pretty_assertions",
@@ -1489,7 +1489,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile-fuzz"
-version = "0.0.13"
+version = "0.0.14"
 dependencies = [
  "libfuzzer-sys",
  "reconcile",
@@ -2104,7 +2104,7 @@ dependencies = [
 
 [[package]]
 name = "sync_lib"
-version = "0.0.13"
+version = "0.0.14"
 dependencies = [
  "base64 0.22.1",
  "console_error_panic_hook",
@@ -2117,7 +2117,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.0.13"
+version = "0.0.14"
 dependencies = [
  "aide",
  "anyhow",
diff --git a/backend/fuzz/Cargo.toml b/backend/fuzz/Cargo.toml
index 68b04ff8..568a2eea 100644
--- a/backend/fuzz/Cargo.toml
+++ b/backend/fuzz/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "reconcile-fuzz"
-version = "0.0.13"
+version = "0.0.14"
 publish = false
 edition = "2021"
 
diff --git a/backend/reconcile/Cargo.toml b/backend/reconcile/Cargo.toml
index 66e89860..dec774f5 100644
--- a/backend/reconcile/Cargo.toml
+++ b/backend/reconcile/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "reconcile"
-version = "0.0.13"
+version = "0.0.14"
 edition = "2021"
 
 [dependencies]
diff --git a/backend/sync_lib/Cargo.toml b/backend/sync_lib/Cargo.toml
index 2ac90103..2889e9aa 100644
--- a/backend/sync_lib/Cargo.toml
+++ b/backend/sync_lib/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sync_lib"
-version = "0.0.13"
+version = "0.0.14"
 authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2018"
 
diff --git a/backend/sync_server/Cargo.toml b/backend/sync_server/Cargo.toml
index bc9a4bf2..4487bebe 100644
--- a/backend/sync_server/Cargo.toml
+++ b/backend/sync_server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sync_server"
-version = "0.0.13"
+version = "0.0.14"
 edition = "2021"
 
 [dependencies]
diff --git a/manifest.json b/manifest.json
index e91d6ac2..fcf802bd 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.0.13",
+	"version": "0.0.14",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/plugin/manifest.json b/plugin/manifest.json
index e91d6ac2..fcf802bd 100644
--- a/plugin/manifest.json
+++ b/plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.0.13",
+	"version": "0.0.14",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/plugin/package-lock.json b/plugin/package-lock.json
index 19c2038c..f2378a70 100644
--- a/plugin/package-lock.json
+++ b/plugin/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.0.13",
+	"version": "0.0.14",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.0.13",
+			"version": "0.0.14",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
diff --git a/plugin/package.json b/plugin/package.json
index 997d4cd8..81496849 100644
--- a/plugin/package.json
+++ b/plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.0.13",
+	"version": "0.0.14",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {
@@ -53,4 +53,4 @@
 		"webpack": "^5.97.1",
 		"webpack-cli": "^6.0.1"
 	}
-}
\ No newline at end of file
+}

From 509f214e6239ee64d17fcb462283bc1ac62e0da0 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 5 Jan 2025 21:12:51 +0000
Subject: [PATCH 140/761] Fix CI

---
 .github/workflows/check.yml          | 6 +++---
 .github/workflows/publish-plugin.yml | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 1585cacf..90a8ef83 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -49,9 +49,9 @@ jobs:
       - name: Lint frontend
         run: |
           cd plugin
-          npm install
+          npm ci
           npm run lint
-          if [[ -n $(git status --porcelain) ]]; then
+          if [[ $(git status --porcelain) ]]; then
               git status --porcelain
               echo "Failing CI because the working directory is not clean after linting."
               exit 1
@@ -60,5 +60,5 @@ jobs:
       - name: Test frontend
         run: |
           cd plugin
-          npm install
+          npm ci
           npm run test
diff --git a/.github/workflows/publish-plugin.yml b/.github/workflows/publish-plugin.yml
index 9e899d8b..db0cf591 100644
--- a/.github/workflows/publish-plugin.yml
+++ b/.github/workflows/publish-plugin.yml
@@ -29,7 +29,7 @@ jobs:
       - name: Build plugin
         run: |
           cd plugin
-          npm install
+          npm ci
           npm run build
 
       - name: Create release
@@ -38,7 +38,7 @@ jobs:
         run: |
           tag="${GITHUB_REF#refs/tags/}"
 
-          cd plugin/build
+          cd plugin/dist
 
           gh release create "$tag" \
             --title="$tag" \

From 1af24ccdddf5850bba603c9ce84593ed10b4385d Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 5 Jan 2025 21:12:58 +0000
Subject: [PATCH 141/761] Bump versions to 0.0.15

---
 backend/Cargo.lock             | 8 ++++----
 backend/fuzz/Cargo.toml        | 2 +-
 backend/reconcile/Cargo.toml   | 2 +-
 backend/sync_lib/Cargo.toml    | 2 +-
 backend/sync_server/Cargo.toml | 2 +-
 manifest.json                  | 2 +-
 plugin/manifest.json           | 2 +-
 plugin/package-lock.json       | 4 ++--
 plugin/package.json            | 2 +-
 9 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 35890a88..56e64df8 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1479,7 +1479,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile"
-version = "0.0.14"
+version = "0.0.15"
 dependencies = [
  "insta",
  "pretty_assertions",
@@ -1489,7 +1489,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile-fuzz"
-version = "0.0.14"
+version = "0.0.15"
 dependencies = [
  "libfuzzer-sys",
  "reconcile",
@@ -2104,7 +2104,7 @@ dependencies = [
 
 [[package]]
 name = "sync_lib"
-version = "0.0.14"
+version = "0.0.15"
 dependencies = [
  "base64 0.22.1",
  "console_error_panic_hook",
@@ -2117,7 +2117,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.0.14"
+version = "0.0.15"
 dependencies = [
  "aide",
  "anyhow",
diff --git a/backend/fuzz/Cargo.toml b/backend/fuzz/Cargo.toml
index 568a2eea..4a5c4db7 100644
--- a/backend/fuzz/Cargo.toml
+++ b/backend/fuzz/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "reconcile-fuzz"
-version = "0.0.14"
+version = "0.0.15"
 publish = false
 edition = "2021"
 
diff --git a/backend/reconcile/Cargo.toml b/backend/reconcile/Cargo.toml
index dec774f5..27241439 100644
--- a/backend/reconcile/Cargo.toml
+++ b/backend/reconcile/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "reconcile"
-version = "0.0.14"
+version = "0.0.15"
 edition = "2021"
 
 [dependencies]
diff --git a/backend/sync_lib/Cargo.toml b/backend/sync_lib/Cargo.toml
index 2889e9aa..0ec2f5eb 100644
--- a/backend/sync_lib/Cargo.toml
+++ b/backend/sync_lib/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sync_lib"
-version = "0.0.14"
+version = "0.0.15"
 authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2018"
 
diff --git a/backend/sync_server/Cargo.toml b/backend/sync_server/Cargo.toml
index 4487bebe..dfc0a06a 100644
--- a/backend/sync_server/Cargo.toml
+++ b/backend/sync_server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sync_server"
-version = "0.0.14"
+version = "0.0.15"
 edition = "2021"
 
 [dependencies]
diff --git a/manifest.json b/manifest.json
index fcf802bd..b368014c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.0.14",
+	"version": "0.0.15",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/plugin/manifest.json b/plugin/manifest.json
index fcf802bd..b368014c 100644
--- a/plugin/manifest.json
+++ b/plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.0.14",
+	"version": "0.0.15",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/plugin/package-lock.json b/plugin/package-lock.json
index f2378a70..e0970e56 100644
--- a/plugin/package-lock.json
+++ b/plugin/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.0.14",
+	"version": "0.0.15",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.0.14",
+			"version": "0.0.15",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
diff --git a/plugin/package.json b/plugin/package.json
index 81496849..474bb233 100644
--- a/plugin/package.json
+++ b/plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.0.14",
+	"version": "0.0.15",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {

From a57dd6237aa99ebd2cd704c36d3d7e674c3219c3 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 5 Jan 2025 21:19:15 +0000
Subject: [PATCH 142/761] Update deps

---
 bump-version.sh | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/bump-version.sh b/bump-version.sh
index cc91e720..902b487c 100755
--- a/bump-version.sh
+++ b/bump-version.sh
@@ -22,15 +22,25 @@ else
   echo "Your working directory is clean."
 fi
 
+echo "Bumping backend versions"
 cd backend
 cargo set-version --bump patch
+
+echo "Bumping frontend versions"
 cd ../plugin
 npm version patch
+
+echo "Updating frontend dependencies to match the new backend versions"
+npm install
+
 cd ..
 cp plugin/manifest.json manifest.json  # for BRAT, otherwise it wouldn't update
+
+# Commit and tag
 git add .
 TAG=$(node -p "require('./plugin/package.json').version")
 git commit -m "Bump versions to $TAG"
+
 git push
 echo "Tagging $TAG"
 git tag -a $TAG -m "Release $TAG"

From 76683f9b0a1ac2eb9d4aed3e5daf6652dec44528 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 5 Jan 2025 21:19:49 +0000
Subject: [PATCH 143/761] Fix badges

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index df70e2e3..f8edd471 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 ## VaultLink self-hosted Obsidian sync plugin
 
-[![Check](https://github.com/schmelczer/obsidian-shared-sync/actions/workflows/check.yml/badge.svg)](https://github.com/schmelczer/obsidian-shared-sync/actions/workflows/check.yml)
-[![Publish Docker](https://github.com/schmelczer/obsidian-shared-sync/actions/workflows/publish-docker.yml/badge.svg)](https://github.com/schmelczer/obsidian-shared-sync/actions/workflows/publish-docker.yml)
-[![Publish plugin](https://github.com/schmelczer/obsidian-shared-sync/actions/workflows/publish-plugin.yml/badge.svg)](https://github.com/schmelczer/obsidian-shared-sync/actions/workflows/publish-plugin.yml)
+[![Check](https://github.com/schmelczer/vault-link/actions/workflows/check.yml/badge.svg)](https://github.com/schmelczer/vault-link/actions/workflows/check.yml)
+[![Publish server Docker image](https://github.com/schmelczer/vault-link/actions/workflows/publish-docker.yml/badge.svg)](https://github.com/schmelczer/vault-link/actions/workflows/publish-docker.yml)
+[![Publish Obsidian plugin](https://github.com/schmelczer/vault-link/actions/workflows/publish-plugin.yml/badge.svg)](https://github.com/schmelczer/vault-link/actions/workflows/publish-plugin.yml)
 
 
 ## Install [nvm](https://github.com/nvm-sh/nvm)

From 5e8a6e50cdda4f89b63d49af601900db34a263fe Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 5 Jan 2025 21:56:22 +0000
Subject: [PATCH 144/761] Fix base64 on mobile

---
 plugin/package-lock.json        | 8 ++++++++
 plugin/package.json             | 1 +
 plugin/src/utils/deserialize.ts | 4 +++-
 plugin/src/utils/serialize.ts   | 4 +++-
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/plugin/package-lock.json b/plugin/package-lock.json
index e0970e56..3b2792a2 100644
--- a/plugin/package-lock.json
+++ b/plugin/package-lock.json
@@ -12,6 +12,7 @@
 				"@types/jest": "^29.5.14",
 				"@types/node": "^16.11.6",
 				"builtin-modules": "3.3.0",
+				"byte-base64": "^1.1.0",
 				"css-loader": "^7.1.2",
 				"date-fns": "^4.1.0",
 				"dayjs": "^1.11.13",
@@ -3209,6 +3210,13 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
+		"node_modules/byte-base64": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/byte-base64/-/byte-base64-1.1.0.tgz",
+			"integrity": "sha512-56cXelkJrVMdCY9V/3RfDxTh4VfMFCQ5km7B7GkIGfo4bcPL9aACyJLB0Ms3Ezu5rsHmLB2suis96z4fLM03DA==",
+			"dev": true,
+			"license": "MIT"
+		},
 		"node_modules/callsites": {
 			"version": "3.1.0",
 			"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
diff --git a/plugin/package.json b/plugin/package.json
index 474bb233..7e977562 100644
--- a/plugin/package.json
+++ b/plugin/package.json
@@ -23,6 +23,7 @@
 		"@types/jest": "^29.5.14",
 		"@types/node": "^16.11.6",
 		"builtin-modules": "3.3.0",
+		"byte-base64": "^1.1.0",
 		"css-loader": "^7.1.2",
 		"date-fns": "^4.1.0",
 		"dayjs": "^1.11.13",
diff --git a/plugin/src/utils/deserialize.ts b/plugin/src/utils/deserialize.ts
index c02e18f2..4255479f 100644
--- a/plugin/src/utils/deserialize.ts
+++ b/plugin/src/utils/deserialize.ts
@@ -1,3 +1,5 @@
+import { base64ToBytes } from "byte-base64";
+
 export function deserialize(data: string): Uint8Array {
-	return Buffer.from(data, "base64");
+	return base64ToBytes(data);
 }
diff --git a/plugin/src/utils/serialize.ts b/plugin/src/utils/serialize.ts
index be9a9abc..79eedaab 100644
--- a/plugin/src/utils/serialize.ts
+++ b/plugin/src/utils/serialize.ts
@@ -1,3 +1,5 @@
+import { bytesToBase64 } from "byte-base64";
+
 export function serialize(data: Uint8Array): string {
-	return Buffer.from(data).toString("base64");
+	return bytesToBase64(data);
 }

From f09af5be8fe8b6e39f5b7b9cacf2bc126df68f2c Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 5 Jan 2025 21:56:31 +0000
Subject: [PATCH 145/761] Bump versions to 0.0.16

---
 backend/Cargo.lock             | 8 ++++----
 backend/fuzz/Cargo.toml        | 2 +-
 backend/reconcile/Cargo.toml   | 2 +-
 backend/sync_lib/Cargo.toml    | 2 +-
 backend/sync_server/Cargo.toml | 2 +-
 manifest.json                  | 2 +-
 plugin/manifest.json           | 2 +-
 plugin/package-lock.json       | 4 ++--
 plugin/package.json            | 2 +-
 9 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 56e64df8..7e229e1b 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1479,7 +1479,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile"
-version = "0.0.15"
+version = "0.0.16"
 dependencies = [
  "insta",
  "pretty_assertions",
@@ -1489,7 +1489,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile-fuzz"
-version = "0.0.15"
+version = "0.0.16"
 dependencies = [
  "libfuzzer-sys",
  "reconcile",
@@ -2104,7 +2104,7 @@ dependencies = [
 
 [[package]]
 name = "sync_lib"
-version = "0.0.15"
+version = "0.0.16"
 dependencies = [
  "base64 0.22.1",
  "console_error_panic_hook",
@@ -2117,7 +2117,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.0.15"
+version = "0.0.16"
 dependencies = [
  "aide",
  "anyhow",
diff --git a/backend/fuzz/Cargo.toml b/backend/fuzz/Cargo.toml
index 4a5c4db7..40b93a11 100644
--- a/backend/fuzz/Cargo.toml
+++ b/backend/fuzz/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "reconcile-fuzz"
-version = "0.0.15"
+version = "0.0.16"
 publish = false
 edition = "2021"
 
diff --git a/backend/reconcile/Cargo.toml b/backend/reconcile/Cargo.toml
index 27241439..3a844f73 100644
--- a/backend/reconcile/Cargo.toml
+++ b/backend/reconcile/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "reconcile"
-version = "0.0.15"
+version = "0.0.16"
 edition = "2021"
 
 [dependencies]
diff --git a/backend/sync_lib/Cargo.toml b/backend/sync_lib/Cargo.toml
index 0ec2f5eb..940600c1 100644
--- a/backend/sync_lib/Cargo.toml
+++ b/backend/sync_lib/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sync_lib"
-version = "0.0.15"
+version = "0.0.16"
 authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2018"
 
diff --git a/backend/sync_server/Cargo.toml b/backend/sync_server/Cargo.toml
index dfc0a06a..8d06b4d6 100644
--- a/backend/sync_server/Cargo.toml
+++ b/backend/sync_server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sync_server"
-version = "0.0.15"
+version = "0.0.16"
 edition = "2021"
 
 [dependencies]
diff --git a/manifest.json b/manifest.json
index b368014c..e28cc520 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.0.15",
+	"version": "0.0.16",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/plugin/manifest.json b/plugin/manifest.json
index b368014c..e28cc520 100644
--- a/plugin/manifest.json
+++ b/plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.0.15",
+	"version": "0.0.16",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/plugin/package-lock.json b/plugin/package-lock.json
index 3b2792a2..f334a74f 100644
--- a/plugin/package-lock.json
+++ b/plugin/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.0.15",
+	"version": "0.0.16",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.0.15",
+			"version": "0.0.16",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
diff --git a/plugin/package.json b/plugin/package.json
index 7e977562..0266441d 100644
--- a/plugin/package.json
+++ b/plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.0.15",
+	"version": "0.0.16",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {

From b713a83c3f2d221cfff3f98ddd7d5e801789879f Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 5 Jan 2025 22:01:43 +0000
Subject: [PATCH 146/761] Fix CI

---
 bump-version.sh          | 2 ++
 plugin/package-lock.json | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/bump-version.sh b/bump-version.sh
index 902b487c..ceab2e65 100755
--- a/bump-version.sh
+++ b/bump-version.sh
@@ -31,6 +31,8 @@ cd ../plugin
 npm version patch
 
 echo "Updating frontend dependencies to match the new backend versions"
+cd ../backend/sync_lib
+wasm-pack build --target web --features console_error_panic_hook
 npm install
 
 cd ..
diff --git a/plugin/package-lock.json b/plugin/package-lock.json
index f334a74f..acfc477e 100644
--- a/plugin/package-lock.json
+++ b/plugin/package-lock.json
@@ -46,7 +46,7 @@
 		},
 		"../backend/sync_lib/pkg": {
 			"name": "sync_lib",
-			"version": "0.0.13",
+			"version": "0.0.16",
 			"dev": true
 		},
 		"node_modules/@ampproject/remapping": {

From 5c6c3652aef63f1679dab741c81456ca563a889e Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Mon, 6 Jan 2025 21:55:20 +0000
Subject: [PATCH 147/761] Add log lines

---
 plugin/src/sync-operations/syncer.ts | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/plugin/src/sync-operations/syncer.ts b/plugin/src/sync-operations/syncer.ts
index bbf4360f..b8a3f4ce 100644
--- a/plugin/src/sync-operations/syncer.ts
+++ b/plugin/src/sync-operations/syncer.ts
@@ -284,6 +284,7 @@ export class Syncer {
 				const localMetadata = this.database.getDocument(
 					oldPath ?? relativePath
 				);
+				console.log(JSON.stringify(localMetadata));
 				if (!localMetadata) {
 					if (this.database.getDocument(relativePath)) {
 						this.history.addHistoryEntry({
@@ -299,9 +300,13 @@ export class Syncer {
 						`Document metadata not found for ${relativePath}. This implies a corrupt local database. Consider resetting the plugin's sync history.`
 					);
 				}
+				console.log("about to read", relativePath);
 
 				const contentBytes = await this.operations.read(relativePath);
+				console.log("has read", relativePath);
+
 				let contentHash = hash(contentBytes);
+				console.log("has hashed", relativePath);
 
 				if (
 					localMetadata.hash === contentHash &&
@@ -316,6 +321,8 @@ export class Syncer {
 					return;
 				}
 
+				console.log("about to send", relativePath);
+
 				const response = await this.syncService.put({
 					documentId: localMetadata.documentId,
 					parentVersionId: localMetadata.parentVersionId,
@@ -324,6 +331,8 @@ export class Syncer {
 					createdDate: updateTime
 				});
 
+				console.log("has sent", relativePath);
+
 				this.history.addHistoryEntry({
 					status: SyncStatus.SUCCESS,
 					source: SyncSource.PUSH,
@@ -364,15 +373,22 @@ export class Syncer {
 					}
 
 					if (response.type === "MergingUpdate") {
+						console.log(
+							"about to deserialize",
+							response.contentBase64
+						);
 						const responseBytes = deserialize(
 							response.contentBase64
 						);
+						console.log("has deserialized", response.relativePath);
 						contentHash = hash(responseBytes);
+						console.log("about to write", response.relativePath);
 						await this.operations.write(
 							response.relativePath,
 							contentBytes,
 							responseBytes
 						);
+						console.log("has written", response.relativePath);
 
 						this.history.addHistoryEntry({
 							status: SyncStatus.SUCCESS,

From 13ac3bb14022433a715917adf93d8d6f6f8fb50d Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Mon, 6 Jan 2025 21:56:20 +0000
Subject: [PATCH 148/761] Fix script

---
 bump-version.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bump-version.sh b/bump-version.sh
index ceab2e65..a154d82c 100755
--- a/bump-version.sh
+++ b/bump-version.sh
@@ -35,7 +35,7 @@ cd ../backend/sync_lib
 wasm-pack build --target web --features console_error_panic_hook
 npm install
 
-cd ..
+cd ../..
 cp plugin/manifest.json manifest.json  # for BRAT, otherwise it wouldn't update
 
 # Commit and tag

From a751646d2a0ade221feff81c4df8e0ed23a25fa4 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Mon, 6 Jan 2025 21:57:09 +0000
Subject: [PATCH 149/761] Fix script

---
 bump-version.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bump-version.sh b/bump-version.sh
index a154d82c..b17842be 100755
--- a/bump-version.sh
+++ b/bump-version.sh
@@ -33,9 +33,11 @@ npm version patch
 echo "Updating frontend dependencies to match the new backend versions"
 cd ../backend/sync_lib
 wasm-pack build --target web --features console_error_panic_hook
+
+cd ../../plugin
 npm install
 
-cd ../..
+cd ..
 cp plugin/manifest.json manifest.json  # for BRAT, otherwise it wouldn't update
 
 # Commit and tag

From d5c2d1ecbeb45338cedc95110222bca525b4060d Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Mon, 6 Jan 2025 21:57:15 +0000
Subject: [PATCH 150/761] Bump versions to 0.0.17

---
 backend/Cargo.lock             | 8 ++++----
 backend/fuzz/Cargo.toml        | 2 +-
 backend/reconcile/Cargo.toml   | 2 +-
 backend/sync_lib/Cargo.toml    | 2 +-
 backend/sync_server/Cargo.toml | 2 +-
 manifest.json                  | 2 +-
 plugin/manifest.json           | 2 +-
 plugin/package-lock.json       | 6 +++---
 plugin/package.json            | 2 +-
 9 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 7e229e1b..1837d188 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1479,7 +1479,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile"
-version = "0.0.16"
+version = "0.0.17"
 dependencies = [
  "insta",
  "pretty_assertions",
@@ -1489,7 +1489,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile-fuzz"
-version = "0.0.16"
+version = "0.0.17"
 dependencies = [
  "libfuzzer-sys",
  "reconcile",
@@ -2104,7 +2104,7 @@ dependencies = [
 
 [[package]]
 name = "sync_lib"
-version = "0.0.16"
+version = "0.0.17"
 dependencies = [
  "base64 0.22.1",
  "console_error_panic_hook",
@@ -2117,7 +2117,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.0.16"
+version = "0.0.17"
 dependencies = [
  "aide",
  "anyhow",
diff --git a/backend/fuzz/Cargo.toml b/backend/fuzz/Cargo.toml
index 40b93a11..2a405db4 100644
--- a/backend/fuzz/Cargo.toml
+++ b/backend/fuzz/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "reconcile-fuzz"
-version = "0.0.16"
+version = "0.0.17"
 publish = false
 edition = "2021"
 
diff --git a/backend/reconcile/Cargo.toml b/backend/reconcile/Cargo.toml
index 3a844f73..88c2d239 100644
--- a/backend/reconcile/Cargo.toml
+++ b/backend/reconcile/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "reconcile"
-version = "0.0.16"
+version = "0.0.17"
 edition = "2021"
 
 [dependencies]
diff --git a/backend/sync_lib/Cargo.toml b/backend/sync_lib/Cargo.toml
index 940600c1..9001ddbc 100644
--- a/backend/sync_lib/Cargo.toml
+++ b/backend/sync_lib/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sync_lib"
-version = "0.0.16"
+version = "0.0.17"
 authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2018"
 
diff --git a/backend/sync_server/Cargo.toml b/backend/sync_server/Cargo.toml
index 8d06b4d6..73d31087 100644
--- a/backend/sync_server/Cargo.toml
+++ b/backend/sync_server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sync_server"
-version = "0.0.16"
+version = "0.0.17"
 edition = "2021"
 
 [dependencies]
diff --git a/manifest.json b/manifest.json
index e28cc520..cc191879 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.0.16",
+	"version": "0.0.17",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/plugin/manifest.json b/plugin/manifest.json
index e28cc520..cc191879 100644
--- a/plugin/manifest.json
+++ b/plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.0.16",
+	"version": "0.0.17",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/plugin/package-lock.json b/plugin/package-lock.json
index acfc477e..d77e7c4c 100644
--- a/plugin/package-lock.json
+++ b/plugin/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.0.16",
+	"version": "0.0.17",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.0.16",
+			"version": "0.0.17",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
@@ -46,7 +46,7 @@
 		},
 		"../backend/sync_lib/pkg": {
 			"name": "sync_lib",
-			"version": "0.0.16",
+			"version": "0.0.17",
 			"dev": true
 		},
 		"node_modules/@ampproject/remapping": {
diff --git a/plugin/package.json b/plugin/package.json
index 0266441d..200e1365 100644
--- a/plugin/package.json
+++ b/plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.0.16",
+	"version": "0.0.17",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {

From 4fc628eceff68fc1a589574e7d93790a8343ae08 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Mon, 6 Jan 2025 22:25:51 +0000
Subject: [PATCH 151/761] Add more logs

---
 plugin/src/events/obisidan-event-handler.ts            |  4 ++++
 plugin/src/file-operations/obsidian-file-operations.ts | 10 +++++++++-
 plugin/src/services/sync-service.ts                    |  4 ++--
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/plugin/src/events/obisidan-event-handler.ts b/plugin/src/events/obisidan-event-handler.ts
index 2eae62ff..0d4461fc 100644
--- a/plugin/src/events/obisidan-event-handler.ts
+++ b/plugin/src/events/obisidan-event-handler.ts
@@ -50,6 +50,10 @@ export class ObsidianFileEventHandler implements FileEventHandler {
 
 	public async onModify(file: TAbstractFile): Promise<void> {
 		if (file instanceof TFile) {
+			if (file.basename.startsWith("console-log.iPhone")) {
+				return;
+			}
+
 			Logger.getInstance().info(`File modified: ${file.path}`);
 
 			await this.syncer.syncLocallyUpdatedFile({
diff --git a/plugin/src/file-operations/obsidian-file-operations.ts b/plugin/src/file-operations/obsidian-file-operations.ts
index 6a82006f..6353079f 100644
--- a/plugin/src/file-operations/obsidian-file-operations.ts
+++ b/plugin/src/file-operations/obsidian-file-operations.ts
@@ -8,21 +8,29 @@ export class ObsidianFileOperations implements FileOperations {
 	public constructor(private readonly vault: Vault) {}
 
 	public async listAllFiles(): Promise<RelativePath[]> {
+		console.log("before getFiles");
 		const files = this.vault.getFiles();
+		console.log("after getFiles");
+		console.log(files);
 		return files.map((file) => file.path);
 	}
 
 	public async read(path: RelativePath): Promise<Uint8Array> {
-		return new Uint8Array(
+		console.log("before readBinary");
+		const result = new Uint8Array(
 			await this.vault.adapter.readBinary(normalizePath(path))
 		);
+		console.log("after readBinary");
+		return result;
 	}
 
 	public async getModificationTime(path: RelativePath): Promise<Date> {
+		console.log("before stat");
 		const file = await this.vault.adapter.stat(normalizePath(path));
 		if (!file) {
 			throw new Error(`File not found: ${path}`);
 		}
+		console.log("after stat");
 		return new Date(file.mtime);
 	}
 
diff --git a/plugin/src/services/sync-service.ts b/plugin/src/services/sync-service.ts
index d9c34109..fdda9322 100644
--- a/plugin/src/services/sync-service.ts
+++ b/plugin/src/services/sync-service.ts
@@ -98,7 +98,7 @@ export class SyncService {
 
 		Logger.getInstance().debug(
 			`Created document ${JSON.stringify(
-				response.data.relativePath
+				response.data
 			)} with id ${response.data.documentId}`
 		);
 
@@ -146,7 +146,7 @@ export class SyncService {
 		}
 
 		Logger.getInstance().debug(
-			`Updated document ${response.data.relativePath} with id ${response.data.documentId}`
+			`Updated document ${JSON.stringify(response.data)} with id ${response.data.documentId}`
 		);
 
 		return response.data;

From f9bdf6153256ba2bcbfbacb32f826bcbc7935b52 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Mon, 6 Jan 2025 22:26:07 +0000
Subject: [PATCH 152/761] Bump versions to 0.0.18

---
 backend/Cargo.lock             | 8 ++++----
 backend/fuzz/Cargo.toml        | 2 +-
 backend/reconcile/Cargo.toml   | 2 +-
 backend/sync_lib/Cargo.toml    | 2 +-
 backend/sync_server/Cargo.toml | 2 +-
 manifest.json                  | 2 +-
 plugin/manifest.json           | 2 +-
 plugin/package-lock.json       | 6 +++---
 plugin/package.json            | 2 +-
 9 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 1837d188..ea239998 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1479,7 +1479,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile"
-version = "0.0.17"
+version = "0.0.18"
 dependencies = [
  "insta",
  "pretty_assertions",
@@ -1489,7 +1489,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile-fuzz"
-version = "0.0.17"
+version = "0.0.18"
 dependencies = [
  "libfuzzer-sys",
  "reconcile",
@@ -2104,7 +2104,7 @@ dependencies = [
 
 [[package]]
 name = "sync_lib"
-version = "0.0.17"
+version = "0.0.18"
 dependencies = [
  "base64 0.22.1",
  "console_error_panic_hook",
@@ -2117,7 +2117,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.0.17"
+version = "0.0.18"
 dependencies = [
  "aide",
  "anyhow",
diff --git a/backend/fuzz/Cargo.toml b/backend/fuzz/Cargo.toml
index 2a405db4..a7dfe8e6 100644
--- a/backend/fuzz/Cargo.toml
+++ b/backend/fuzz/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "reconcile-fuzz"
-version = "0.0.17"
+version = "0.0.18"
 publish = false
 edition = "2021"
 
diff --git a/backend/reconcile/Cargo.toml b/backend/reconcile/Cargo.toml
index 88c2d239..e873e20f 100644
--- a/backend/reconcile/Cargo.toml
+++ b/backend/reconcile/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "reconcile"
-version = "0.0.17"
+version = "0.0.18"
 edition = "2021"
 
 [dependencies]
diff --git a/backend/sync_lib/Cargo.toml b/backend/sync_lib/Cargo.toml
index 9001ddbc..f8a06a80 100644
--- a/backend/sync_lib/Cargo.toml
+++ b/backend/sync_lib/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sync_lib"
-version = "0.0.17"
+version = "0.0.18"
 authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2018"
 
diff --git a/backend/sync_server/Cargo.toml b/backend/sync_server/Cargo.toml
index 73d31087..6f7bfb8a 100644
--- a/backend/sync_server/Cargo.toml
+++ b/backend/sync_server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sync_server"
-version = "0.0.17"
+version = "0.0.18"
 edition = "2021"
 
 [dependencies]
diff --git a/manifest.json b/manifest.json
index cc191879..85ec8595 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.0.17",
+	"version": "0.0.18",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/plugin/manifest.json b/plugin/manifest.json
index cc191879..85ec8595 100644
--- a/plugin/manifest.json
+++ b/plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.0.17",
+	"version": "0.0.18",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/plugin/package-lock.json b/plugin/package-lock.json
index d77e7c4c..197ac860 100644
--- a/plugin/package-lock.json
+++ b/plugin/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.0.17",
+	"version": "0.0.18",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.0.17",
+			"version": "0.0.18",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
@@ -46,7 +46,7 @@
 		},
 		"../backend/sync_lib/pkg": {
 			"name": "sync_lib",
-			"version": "0.0.17",
+			"version": "0.0.18",
 			"dev": true
 		},
 		"node_modules/@ampproject/remapping": {
diff --git a/plugin/package.json b/plugin/package.json
index 200e1365..69218f69 100644
--- a/plugin/package.json
+++ b/plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.0.17",
+	"version": "0.0.18",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {

From ac0296570f2aa7bee6e90254528036eb03d1fbb4 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Mon, 6 Jan 2025 22:41:39 +0000
Subject: [PATCH 153/761] Try

---
 .../src/file-operations/obsidian-file-operations.ts  | 12 ++++++++++++
 plugin/src/sync-operations/syncer.ts                 |  6 ++++++
 2 files changed, 18 insertions(+)

diff --git a/plugin/src/file-operations/obsidian-file-operations.ts b/plugin/src/file-operations/obsidian-file-operations.ts
index 6353079f..aadd7f0b 100644
--- a/plugin/src/file-operations/obsidian-file-operations.ts
+++ b/plugin/src/file-operations/obsidian-file-operations.ts
@@ -9,28 +9,40 @@ export class ObsidianFileOperations implements FileOperations {
 
 	public async listAllFiles(): Promise<RelativePath[]> {
 		console.log("before getFiles");
+		await sleep(1000);
+
 		const files = this.vault.getFiles();
 		console.log("after getFiles");
+		await sleep(1000);
+
 		console.log(files);
 		return files.map((file) => file.path);
 	}
 
 	public async read(path: RelativePath): Promise<Uint8Array> {
 		console.log("before readBinary");
+		await sleep(1000);
+
 		const result = new Uint8Array(
 			await this.vault.adapter.readBinary(normalizePath(path))
 		);
 		console.log("after readBinary");
+		await sleep(1000);
+
 		return result;
 	}
 
 	public async getModificationTime(path: RelativePath): Promise<Date> {
 		console.log("before stat");
+		await sleep(1000);
+
 		const file = await this.vault.adapter.stat(normalizePath(path));
 		if (!file) {
 			throw new Error(`File not found: ${path}`);
 		}
 		console.log("after stat");
+		await sleep(1000);
+
 		return new Date(file.mtime);
 	}
 
diff --git a/plugin/src/sync-operations/syncer.ts b/plugin/src/sync-operations/syncer.ts
index b8a3f4ce..a99b617f 100644
--- a/plugin/src/sync-operations/syncer.ts
+++ b/plugin/src/sync-operations/syncer.ts
@@ -300,13 +300,17 @@ export class Syncer {
 						`Document metadata not found for ${relativePath}. This implies a corrupt local database. Consider resetting the plugin's sync history.`
 					);
 				}
+				await sleep(1000);
 				console.log("about to read", relativePath);
+				await sleep(1000);
 
 				const contentBytes = await this.operations.read(relativePath);
 				console.log("has read", relativePath);
+				await sleep(1000);
 
 				let contentHash = hash(contentBytes);
 				console.log("has hashed", relativePath);
+				await sleep(1000);
 
 				if (
 					localMetadata.hash === contentHash &&
@@ -322,6 +326,7 @@ export class Syncer {
 				}
 
 				console.log("about to send", relativePath);
+				await sleep(1000);
 
 				const response = await this.syncService.put({
 					documentId: localMetadata.documentId,
@@ -332,6 +337,7 @@ export class Syncer {
 				});
 
 				console.log("has sent", relativePath);
+				await sleep(1000);
 
 				this.history.addHistoryEntry({
 					status: SyncStatus.SUCCESS,

From ce722b495cd660c1d167111b279840f2044db7a2 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Mon, 6 Jan 2025 22:41:55 +0000
Subject: [PATCH 154/761] Bump versions to 0.0.19

---
 backend/Cargo.lock             | 8 ++++----
 backend/fuzz/Cargo.toml        | 2 +-
 backend/reconcile/Cargo.toml   | 2 +-
 backend/sync_lib/Cargo.toml    | 2 +-
 backend/sync_server/Cargo.toml | 2 +-
 manifest.json                  | 2 +-
 plugin/manifest.json           | 2 +-
 plugin/package-lock.json       | 6 +++---
 plugin/package.json            | 2 +-
 9 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index ea239998..940baef9 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1479,7 +1479,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile"
-version = "0.0.18"
+version = "0.0.19"
 dependencies = [
  "insta",
  "pretty_assertions",
@@ -1489,7 +1489,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile-fuzz"
-version = "0.0.18"
+version = "0.0.19"
 dependencies = [
  "libfuzzer-sys",
  "reconcile",
@@ -2104,7 +2104,7 @@ dependencies = [
 
 [[package]]
 name = "sync_lib"
-version = "0.0.18"
+version = "0.0.19"
 dependencies = [
  "base64 0.22.1",
  "console_error_panic_hook",
@@ -2117,7 +2117,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.0.18"
+version = "0.0.19"
 dependencies = [
  "aide",
  "anyhow",
diff --git a/backend/fuzz/Cargo.toml b/backend/fuzz/Cargo.toml
index a7dfe8e6..5b2a3afc 100644
--- a/backend/fuzz/Cargo.toml
+++ b/backend/fuzz/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "reconcile-fuzz"
-version = "0.0.18"
+version = "0.0.19"
 publish = false
 edition = "2021"
 
diff --git a/backend/reconcile/Cargo.toml b/backend/reconcile/Cargo.toml
index e873e20f..e85c60f4 100644
--- a/backend/reconcile/Cargo.toml
+++ b/backend/reconcile/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "reconcile"
-version = "0.0.18"
+version = "0.0.19"
 edition = "2021"
 
 [dependencies]
diff --git a/backend/sync_lib/Cargo.toml b/backend/sync_lib/Cargo.toml
index f8a06a80..80f89f96 100644
--- a/backend/sync_lib/Cargo.toml
+++ b/backend/sync_lib/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sync_lib"
-version = "0.0.18"
+version = "0.0.19"
 authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2018"
 
diff --git a/backend/sync_server/Cargo.toml b/backend/sync_server/Cargo.toml
index 6f7bfb8a..43e7089a 100644
--- a/backend/sync_server/Cargo.toml
+++ b/backend/sync_server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sync_server"
-version = "0.0.18"
+version = "0.0.19"
 edition = "2021"
 
 [dependencies]
diff --git a/manifest.json b/manifest.json
index 85ec8595..b9c52a8c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.0.18",
+	"version": "0.0.19",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/plugin/manifest.json b/plugin/manifest.json
index 85ec8595..b9c52a8c 100644
--- a/plugin/manifest.json
+++ b/plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.0.18",
+	"version": "0.0.19",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/plugin/package-lock.json b/plugin/package-lock.json
index 197ac860..bac050c6 100644
--- a/plugin/package-lock.json
+++ b/plugin/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.0.18",
+	"version": "0.0.19",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.0.18",
+			"version": "0.0.19",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
@@ -46,7 +46,7 @@
 		},
 		"../backend/sync_lib/pkg": {
 			"name": "sync_lib",
-			"version": "0.0.18",
+			"version": "0.0.19",
 			"dev": true
 		},
 		"node_modules/@ampproject/remapping": {
diff --git a/plugin/package.json b/plugin/package.json
index 69218f69..489597f6 100644
--- a/plugin/package.json
+++ b/plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.0.18",
+	"version": "0.0.19",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {

From 0721b2ecb69e3b3ec231ceb022e3f7e318387664 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Mon, 6 Jan 2025 23:10:05 +0000
Subject: [PATCH 155/761] .

---
 plugin/src/tracing/logger.ts | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/plugin/src/tracing/logger.ts b/plugin/src/tracing/logger.ts
index b1d19ba9..0c8f7e54 100644
--- a/plugin/src/tracing/logger.ts
+++ b/plugin/src/tracing/logger.ts
@@ -42,32 +42,24 @@ export class Logger {
 	}
 
 	public debug(message: string): void {
-		if (process.env.NODE_ENV !== "production") {
-			console.debug(message);
-		}
+		console.debug(message);
 		this.pushMessage(message, LogLevel.DEBUG);
 	}
 
 	public info(message: string): void {
-		if (process.env.NODE_ENV !== "production") {
-			console.info(message);
-		}
+		console.info(message);
 
 		this.pushMessage(message, LogLevel.INFO);
 	}
 
 	public warn(message: string): void {
-		if (process.env.NODE_ENV !== "production") {
-			console.warn(message);
-		}
+		console.warn(message);
 
 		this.pushMessage(message, LogLevel.WARNING);
 	}
 
 	public error(message: string): void {
-		if (process.env.NODE_ENV !== "production") {
-			console.error(message);
-		}
+		console.error(message);
 
 		this.pushMessage(message, LogLevel.ERROR);
 		new Notice(message, 5000);

From 55a801ba5e0c515f862a03ad035f8d77eb10c00a Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Mon, 6 Jan 2025 23:10:16 +0000
Subject: [PATCH 156/761] Bump versions to 0.0.20

---
 backend/Cargo.lock             | 8 ++++----
 backend/fuzz/Cargo.toml        | 2 +-
 backend/reconcile/Cargo.toml   | 2 +-
 backend/sync_lib/Cargo.toml    | 2 +-
 backend/sync_server/Cargo.toml | 2 +-
 manifest.json                  | 2 +-
 plugin/manifest.json           | 2 +-
 plugin/package-lock.json       | 6 +++---
 plugin/package.json            | 2 +-
 9 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 940baef9..884340fd 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1479,7 +1479,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile"
-version = "0.0.19"
+version = "0.0.20"
 dependencies = [
  "insta",
  "pretty_assertions",
@@ -1489,7 +1489,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile-fuzz"
-version = "0.0.19"
+version = "0.0.20"
 dependencies = [
  "libfuzzer-sys",
  "reconcile",
@@ -2104,7 +2104,7 @@ dependencies = [
 
 [[package]]
 name = "sync_lib"
-version = "0.0.19"
+version = "0.0.20"
 dependencies = [
  "base64 0.22.1",
  "console_error_panic_hook",
@@ -2117,7 +2117,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.0.19"
+version = "0.0.20"
 dependencies = [
  "aide",
  "anyhow",
diff --git a/backend/fuzz/Cargo.toml b/backend/fuzz/Cargo.toml
index 5b2a3afc..2ae9bc6f 100644
--- a/backend/fuzz/Cargo.toml
+++ b/backend/fuzz/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "reconcile-fuzz"
-version = "0.0.19"
+version = "0.0.20"
 publish = false
 edition = "2021"
 
diff --git a/backend/reconcile/Cargo.toml b/backend/reconcile/Cargo.toml
index e85c60f4..9699358d 100644
--- a/backend/reconcile/Cargo.toml
+++ b/backend/reconcile/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "reconcile"
-version = "0.0.19"
+version = "0.0.20"
 edition = "2021"
 
 [dependencies]
diff --git a/backend/sync_lib/Cargo.toml b/backend/sync_lib/Cargo.toml
index 80f89f96..c1040e69 100644
--- a/backend/sync_lib/Cargo.toml
+++ b/backend/sync_lib/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sync_lib"
-version = "0.0.19"
+version = "0.0.20"
 authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2018"
 
diff --git a/backend/sync_server/Cargo.toml b/backend/sync_server/Cargo.toml
index 43e7089a..27061ac4 100644
--- a/backend/sync_server/Cargo.toml
+++ b/backend/sync_server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sync_server"
-version = "0.0.19"
+version = "0.0.20"
 edition = "2021"
 
 [dependencies]
diff --git a/manifest.json b/manifest.json
index b9c52a8c..c280cf56 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.0.19",
+	"version": "0.0.20",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/plugin/manifest.json b/plugin/manifest.json
index b9c52a8c..c280cf56 100644
--- a/plugin/manifest.json
+++ b/plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.0.19",
+	"version": "0.0.20",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/plugin/package-lock.json b/plugin/package-lock.json
index bac050c6..9d5eb3e7 100644
--- a/plugin/package-lock.json
+++ b/plugin/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.0.19",
+	"version": "0.0.20",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.0.19",
+			"version": "0.0.20",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
@@ -46,7 +46,7 @@
 		},
 		"../backend/sync_lib/pkg": {
 			"name": "sync_lib",
-			"version": "0.0.19",
+			"version": "0.0.20",
 			"dev": true
 		},
 		"node_modules/@ampproject/remapping": {
diff --git a/plugin/package.json b/plugin/package.json
index 489597f6..fc528821 100644
--- a/plugin/package.json
+++ b/plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.0.19",
+	"version": "0.0.20",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {

From 924d6822633e6471b739cd3eb4516e9bac8f6c04 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Tue, 7 Jan 2025 22:23:01 +0000
Subject: [PATCH 157/761] Inherit metadata

---
 backend/Cargo.toml           | 5 +++++
 backend/fuzz/Cargo.toml      | 7 +++++--
 backend/reconcile/Cargo.toml | 7 +++++--
 backend/sync_lib/Cargo.toml  | 8 +++++---
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 8d7e0221..09946aed 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -9,6 +9,11 @@ members = [
 
 [workspace.package]
 rust-version = "1.83"
+authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
+edition = "2022"
+license = "MIT"
+repository = "https://github.com/schmelczer/vault-link"
+version = "0.0.20"
 
 [workspace.dependencies]  
 serde = { version = "1.0.214", default-features = false, features = ["derive"] }
diff --git a/backend/fuzz/Cargo.toml b/backend/fuzz/Cargo.toml
index 2ae9bc6f..d764ba40 100644
--- a/backend/fuzz/Cargo.toml
+++ b/backend/fuzz/Cargo.toml
@@ -1,8 +1,11 @@
 [package]
 name = "reconcile-fuzz"
-version = "0.0.20"
+version.workspace = true
+edition.workspace = true
+authors.workspace = true
+license.workspace = true
+repository.workspace = true
 publish = false
-edition = "2021"
 
 [package.metadata]
 cargo-fuzz = true
diff --git a/backend/reconcile/Cargo.toml b/backend/reconcile/Cargo.toml
index 9699358d..bc2f5429 100644
--- a/backend/reconcile/Cargo.toml
+++ b/backend/reconcile/Cargo.toml
@@ -1,7 +1,10 @@
 [package]
 name = "reconcile"
-version = "0.0.20"
-edition = "2021"
+version.workspace = true
+edition.workspace = true
+authors.workspace = true
+license.workspace = true
+repository.workspace = true
 
 [dependencies]
 serde = { version = "1.0.215", optional = true }
diff --git a/backend/sync_lib/Cargo.toml b/backend/sync_lib/Cargo.toml
index c1040e69..ef48f6ee 100644
--- a/backend/sync_lib/Cargo.toml
+++ b/backend/sync_lib/Cargo.toml
@@ -1,8 +1,10 @@
 [package]
 name = "sync_lib"
-version = "0.0.20"
-authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
-edition = "2018"
+version.workspace = true
+edition.workspace = true
+authors.workspace = true
+license.workspace = true
+repository.workspace = true
 
 [lib]
 crate-type = ["cdylib", "rlib"]

From 13d5b35d1aad16ad0937ccc7745b41eeb54fdab3 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Tue, 7 Jan 2025 22:24:45 +0000
Subject: [PATCH 158/761] Add formdata deps

---
 backend/Cargo.lock             | 417 ++++++++++++++++++++++++++++++---
 backend/sync_server/Cargo.toml |  18 +-
 2 files changed, 393 insertions(+), 42 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 884340fd..d21ed5ff 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -24,7 +24,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
 dependencies = [
  "cfg-if",
+ "getrandom",
  "once_cell",
+ "serde",
  "version_check",
  "zerocopy",
 ]
@@ -60,6 +62,19 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "aide-axum-typed-multipart"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b8f5c830a08754addfa31fa09e6c183bac8d2ae7bd007131f9eb84fcb87a40e"
+dependencies = [
+ "aide",
+ "axum",
+ "axum_typed_multipart",
+ "indexmap",
+ "schemars",
+]
+
 [[package]]
 name = "allocator-api2"
 version = "0.2.21"
@@ -98,13 +113,13 @@ checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223"
 
 [[package]]
 name = "async-trait"
-version = "0.1.83"
+version = "0.1.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
+checksum = "3f934833b4b7233644e5848f235df3f57ed8c80f1528a26c3dfa13d2147fa056"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -143,6 +158,7 @@ dependencies = [
  "matchit",
  "memchr",
  "mime",
+ "multer",
  "percent-encoding",
  "pin-project-lite",
  "rustversion",
@@ -151,7 +167,7 @@ dependencies = [
  "serde_path_to_error",
  "serde_urlencoded",
  "sha1",
- "sync_wrapper 1.0.2",
+ "sync_wrapper",
  "tokio",
  "tokio-tungstenite",
  "tower",
@@ -175,7 +191,7 @@ dependencies = [
  "mime",
  "pin-project-lite",
  "rustversion",
- "sync_wrapper 1.0.2",
+ "sync_wrapper",
  "tower-layer",
  "tower-service",
  "tracing",
@@ -205,6 +221,26 @@ dependencies = [
  "tower-service",
 ]
 
+[[package]]
+name = "axum-jsonschema"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcffe29ca1b60172349fea781ec34441d598809bd227ccbb5bf5dc2879cd9c78"
+dependencies = [
+ "aide",
+ "async-trait",
+ "axum",
+ "http",
+ "http-body",
+ "itertools",
+ "jsonschema",
+ "schemars",
+ "serde",
+ "serde_json",
+ "serde_path_to_error",
+ "tracing",
+]
+
 [[package]]
 name = "axum-macros"
 version = "0.4.2"
@@ -213,7 +249,40 @@ checksum = "57d123550fa8d071b7255cb0cc04dc302baa6c8c4a79f55701552684d8399bce"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.90",
+]
+
+[[package]]
+name = "axum_typed_multipart"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb5a5d7e98a19e7ce06e96827ad86c1d75e9cb20ede5a70645dec2359a66cb7a"
+dependencies = [
+ "anyhow",
+ "axum",
+ "axum_typed_multipart_macros",
+ "bytes",
+ "chrono",
+ "futures-core",
+ "futures-util",
+ "tempfile",
+ "thiserror",
+ "tokio",
+ "uuid",
+]
+
+[[package]]
+name = "axum_typed_multipart_macros"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2c550fa5c1a07bbc41dbec1dcd4d0e3de230b9072ab8fb70c55d7d37693d66d"
+dependencies = [
+ "darling",
+ "heck",
+ "proc-macro-error",
+ "quote",
+ "syn 2.0.90",
+ "ubyte",
 ]
 
 [[package]]
@@ -249,6 +318,21 @@ version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
 
+[[package]]
+name = "bit-set"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1"
+dependencies = [
+ "bit-vec",
+]
+
+[[package]]
+name = "bit-vec"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
+
 [[package]]
 name = "bitflags"
 version = "2.6.0"
@@ -273,6 +357,12 @@ version = "3.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
 
+[[package]]
+name = "bytecount"
+version = "0.6.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ce89b21cab1437276d2650d57e971f9d548a2d9037cc231abdc0562b97498ce"
+
 [[package]]
 name = "byteorder"
 version = "1.5.0"
@@ -409,6 +499,41 @@ dependencies = [
  "typenum",
 ]
 
+[[package]]
+name = "darling"
+version = "0.20.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989"
+dependencies = [
+ "darling_core",
+ "darling_macro",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.20.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "strsim",
+ "syn 2.0.90",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.20.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
+dependencies = [
+ "darling_core",
+ "quote",
+ "syn 2.0.90",
+]
+
 [[package]]
 name = "data-encoding"
 version = "2.6.0"
@@ -426,6 +551,15 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "deranged"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+dependencies = [
+ "powerfmt",
+]
+
 [[package]]
 name = "diff"
 version = "0.1.13"
@@ -452,7 +586,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -529,6 +663,16 @@ dependencies = [
  "pin-project-lite",
 ]
 
+[[package]]
+name = "fancy-regex"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b95f7c0680e4142284cf8b22c14a476e87d61b004a3a0861872b32ef7ead40a2"
+dependencies = [
+ "bit-set",
+ "regex",
+]
+
 [[package]]
 name = "fastrand"
 version = "2.2.0"
@@ -561,6 +705,16 @@ dependencies = [
  "percent-encoding",
 ]
 
+[[package]]
+name = "fraction"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3027ae1df8d41b4bed2241c8fdad4acc1e7af60c8e17743534b545e77182d678"
+dependencies = [
+ "lazy_static",
+ "num",
+]
+
 [[package]]
 name = "futures"
 version = "0.3.31"
@@ -628,7 +782,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -678,8 +832,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
  "cfg-if",
+ "js-sys",
  "libc",
  "wasi",
+ "wasm-bindgen",
 ]
 
 [[package]]
@@ -995,9 +1151,15 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.90",
 ]
 
+[[package]]
+name = "ident_case"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
+
 [[package]]
 name = "idna"
 version = "1.0.3"
@@ -1042,6 +1204,24 @@ dependencies = [
  "similar",
 ]
 
+[[package]]
+name = "iso8601"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "924e5d73ea28f59011fec52a0d12185d496a9b075d360657aed2a5707f701153"
+dependencies = [
+ "nom",
+]
+
+[[package]]
+name = "itertools"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itoa"
 version = "1.0.14"
@@ -1067,6 +1247,34 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "jsonschema"
+version = "0.17.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a071f4f7efc9a9118dfb627a0a94ef247986e1ab8606a4c806ae2b3aa3b6978"
+dependencies = [
+ "ahash",
+ "anyhow",
+ "base64 0.21.7",
+ "bytecount",
+ "fancy-regex",
+ "fraction",
+ "getrandom",
+ "iso8601",
+ "itoa",
+ "memchr",
+ "num-cmp",
+ "once_cell",
+ "parking_lot",
+ "percent-encoding",
+ "regex",
+ "serde",
+ "serde_json",
+ "time",
+ "url",
+ "uuid",
+]
+
 [[package]]
 name = "lazy_static"
 version = "1.5.0"
@@ -1253,6 +1461,30 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "num"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23"
+dependencies = [
+ "num-bigint",
+ "num-complex",
+ "num-integer",
+ "num-iter",
+ "num-rational",
+ "num-traits",
+]
+
+[[package]]
+name = "num-bigint"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
+dependencies = [
+ "num-integer",
+ "num-traits",
+]
+
 [[package]]
 name = "num-bigint-dig"
 version = "0.8.4"
@@ -1270,6 +1502,27 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "num-cmp"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "63335b2e2c34fae2fb0aa2cecfd9f0832a1e24b3b32ecec612c3426d46dc8aaa"
+
+[[package]]
+name = "num-complex"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
 [[package]]
 name = "num-integer"
 version = "0.1.46"
@@ -1290,6 +1543,17 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "num-rational"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824"
+dependencies = [
+ "num-bigint",
+ "num-integer",
+ "num-traits",
+]
+
 [[package]]
 name = "num-traits"
 version = "0.2.19"
@@ -1410,6 +1674,12 @@ version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
 
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
 [[package]]
 name = "ppv-lite86"
 version = "0.2.20"
@@ -1429,6 +1699,30 @@ dependencies = [
  "yansi",
 ]
 
+[[package]]
+name = "proc-macro-error"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+dependencies = [
+ "proc-macro-error-attr",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro-error-attr"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "version_check",
+]
+
 [[package]]
 name = "proc-macro2"
 version = "1.0.92"
@@ -1623,6 +1917,7 @@ version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92"
 dependencies = [
+ "bytes",
  "chrono",
  "dyn-clone",
  "indexmap",
@@ -1641,7 +1936,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde_derive_internals",
- "syn",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -1673,7 +1968,7 @@ checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -1684,7 +1979,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -1930,7 +2225,7 @@ dependencies = [
  "quote",
  "sqlx-core",
  "sqlx-macros-core",
- "syn",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -1953,7 +2248,7 @@ dependencies = [
  "sqlx-mysql",
  "sqlx-postgres",
  "sqlx-sqlite",
- "syn",
+ "syn 2.0.90",
  "tempfile",
  "tokio",
  "url",
@@ -2085,12 +2380,28 @@ dependencies = [
  "unicode-properties",
 ]
 
+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
 [[package]]
 name = "subtle"
 version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "unicode-ident",
+]
+
 [[package]]
 name = "syn"
 version = "2.0.90"
@@ -2120,9 +2431,12 @@ name = "sync_server"
 version = "0.0.20"
 dependencies = [
  "aide",
+ "aide-axum-typed-multipart",
  "anyhow",
  "axum",
  "axum-extra",
+ "axum-jsonschema",
+ "axum_typed_multipart",
  "chrono",
  "log",
  "rand",
@@ -2141,12 +2455,6 @@ dependencies = [
  "uuid",
 ]
 
-[[package]]
-name = "sync_wrapper"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
-
 [[package]]
 name = "sync_wrapper"
 version = "1.0.2"
@@ -2161,7 +2469,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -2195,7 +2503,7 @@ dependencies = [
  "cfg-if",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -2206,7 +2514,7 @@ checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.90",
  "test-case-core",
 ]
 
@@ -2227,7 +2535,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -2240,6 +2548,36 @@ dependencies = [
  "once_cell",
 ]
 
+[[package]]
+name = "time"
+version = "0.3.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21"
+dependencies = [
+ "deranged",
+ "num-conv",
+ "powerfmt",
+ "serde",
+ "time-core",
+ "time-macros",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+
+[[package]]
+name = "time-macros"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de"
+dependencies = [
+ "num-conv",
+ "time-core",
+]
+
 [[package]]
 name = "tinystr"
 version = "0.7.6"
@@ -2291,7 +2629,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -2319,14 +2657,14 @@ dependencies = [
 
 [[package]]
 name = "tower"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f"
+checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
 dependencies = [
  "futures-core",
  "futures-util",
  "pin-project-lite",
- "sync_wrapper 0.1.2",
+ "sync_wrapper",
  "tokio",
  "tower-layer",
  "tower-service",
@@ -2343,6 +2681,7 @@ dependencies = [
  "bytes",
  "http",
  "http-body",
+ "http-body-util",
  "pin-project-lite",
  "tower-layer",
  "tower-service",
@@ -2381,7 +2720,7 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -2447,6 +2786,12 @@ version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
+[[package]]
+name = "ubyte"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f720def6ce1ee2fc44d40ac9ed6d3a59c361c80a75a7aa8e75bb9baed31cf2ea"
+
 [[package]]
 name = "unicode-bidi"
 version = "0.3.17"
@@ -2586,7 +2931,7 @@ dependencies = [
  "log",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.90",
  "wasm-bindgen-shared",
 ]
 
@@ -2621,7 +2966,7 @@ checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.90",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -2654,7 +2999,7 @@ checksum = "54171416ce73aa0b9c377b51cc3cb542becee1cd678204812e8392e5b0e4a031"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -2903,7 +3248,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.90",
  "synstructure",
 ]
 
@@ -2925,7 +3270,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -2945,7 +3290,7 @@ checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.90",
  "synstructure",
 ]
 
@@ -2974,5 +3319,5 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.90",
 ]
diff --git a/backend/sync_server/Cargo.toml b/backend/sync_server/Cargo.toml
index 27061ac4..0ea4bc31 100644
--- a/backend/sync_server/Cargo.toml
+++ b/backend/sync_server/Cargo.toml
@@ -1,7 +1,10 @@
 [package]
 name = "sync_server"
-version = "0.0.20"
-edition = "2021"
+version.workspace = true
+edition.workspace = true
+authors.workspace = true
+license.workspace = true
+repository.workspace = true
 
 [dependencies]
 reconcile = { path = "../reconcile" }
@@ -14,18 +17,21 @@ tokio = { version = "1.42.0", features = ["full"]}
 uuid = { version = "1.11.0", features = ["v4", "serde"] }
 log = { version = "0.4.22" }
 anyhow =  { version = "1.0.94", features = ["backtrace"] }
-axum = { version = "0.7.9", features = ["ws", "macros", "tracing"]}
+axum = { version = "0.7.4", features = ["ws", "macros", "tracing", "multipart"]}
 axum-extra = { version = "0.9.6", features = ["typed-header"] }
-tower-http = { version = "0.6.1", features = ["cors", "trace"] }
+aide-axum-typed-multipart = "0.13.0"
+axum_typed_multipart = "0.11.0"
+tower-http = { version = "0.6.1", features = ["cors", "trace", "limit"] }
 tracing-subscriber = { version = "0.3.19", features = ["fmt", "env-filter"]}
 serde_yaml = "0.9.34"
 sqlx = { version = "0.8.2", features = ["sqlite", "runtime-tokio", "uuid", "chrono"] }
 chrono = { version = "0.4.38", features = ["serde"] }
 aide = { version = "0.13.4", features = ["axum", "axum-ws", "scalar", "axum-headers"] }
-schemars = { version = "0.8.21", features = ["chrono", "uuid1"] }
-tracing = "0.1"
+schemars = { version = "0.8.21", features = ["chrono", "uuid1", "bytes"] }
+tracing = "0.1.41"
 rand = "0.8.5"
 sanitize-filename = "0.6.0"
+axum-jsonschema = { version = "0.8.0", features = ["aide"] }
 
 [lints]
 workspace = true

From f4a87d073a3b36a8ad5bc43411171dde65c1ec38 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Tue, 7 Jan 2025 22:25:59 +0000
Subject: [PATCH 159/761] Bump rust edition & reformat

---
 backend/Cargo.toml                            |  2 +-
 backend/reconcile/src/lib.rs                  |  2 +-
 .../operation_transformation/edited_text.rs   |  2 +-
 .../src/operation_transformation/operation.rs | 10 ++++---
 .../src/utils/find_common_overlap.rs          | 27 ++++++++++---------
 backend/sync_lib/src/lib.rs                   |  2 +-
 backend/sync_server/src/config/user_config.rs |  2 +-
 backend/sync_server/src/database.rs           |  2 +-
 backend/sync_server/src/errors.rs             |  2 +-
 backend/sync_server/src/main.rs               |  2 +-
 backend/sync_server/src/server/auth.rs        |  2 +-
 .../sync_server/src/server/delete_document.rs | 10 +++----
 .../server/fetch_latest_document_version.rs   | 10 +++----
 .../src/server/fetch_latest_documents.rs      | 10 +++----
 backend/sync_server/src/server/ping.rs        |  4 +--
 15 files changed, 44 insertions(+), 45 deletions(-)

diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 09946aed..439134fb 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -10,7 +10,7 @@ members = [
 [workspace.package]
 rust-version = "1.83"
 authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
-edition = "2022"
+edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
 version = "0.0.20"
diff --git a/backend/reconcile/src/lib.rs b/backend/reconcile/src/lib.rs
index 5ffc76c2..9c5bb764 100644
--- a/backend/reconcile/src/lib.rs
+++ b/backend/reconcile/src/lib.rs
@@ -3,5 +3,5 @@ mod operation_transformation;
 mod tokenizer;
 mod utils;
 
-pub use operation_transformation::{reconcile, reconcile_with_tokenizer, EditedText};
+pub use operation_transformation::{EditedText, reconcile, reconcile_with_tokenizer};
 pub use tokenizer::token::Token;
diff --git a/backend/reconcile/src/operation_transformation/edited_text.rs b/backend/reconcile/src/operation_transformation/edited_text.rs
index 7b710bb4..3e8162ab 100644
--- a/backend/reconcile/src/operation_transformation/edited_text.rs
+++ b/backend/reconcile/src/operation_transformation/edited_text.rs
@@ -7,7 +7,7 @@ use super::Operation;
 use crate::{
     diffs::{myers::diff, raw_operation::RawOperation},
     operation_transformation::merge_context::MergeContext,
-    tokenizer::{word_tokenizer::word_tokenizer, Tokenizer},
+    tokenizer::{Tokenizer, word_tokenizer::word_tokenizer},
     utils::{
         merge_iters::MergeSorted as _, ordered_operation::OrderedOperation, side::Side,
         string_builder::StringBuilder,
diff --git a/backend/reconcile/src/operation_transformation/operation.rs b/backend/reconcile/src/operation_transformation/operation.rs
index e37e119e..c19265b5 100644
--- a/backend/reconcile/src/operation_transformation/operation.rs
+++ b/backend/reconcile/src/operation_transformation/operation.rs
@@ -8,8 +8,8 @@ use serde::{Deserialize, Serialize};
 
 use super::merge_context::MergeContext;
 use crate::{
-    utils::{find_common_overlap::find_common_overlap, string_builder::StringBuilder},
     Token,
+    utils::{find_common_overlap::find_common_overlap, string_builder::StringBuilder},
 };
 
 /// Represents a change that can be applied to a text document.
@@ -355,9 +355,11 @@ mod tests {
     #[test]
     #[should_panic]
     fn test_shifting_error() {
-        insta::assert_debug_snapshot!(Operation::create_insert(1, vec!["hi".into()])
-            .unwrap()
-            .with_shifted_index(-2));
+        insta::assert_debug_snapshot!(
+            Operation::create_insert(1, vec!["hi".into()])
+                .unwrap()
+                .with_shifted_index(-2)
+        );
     }
 
     #[test]
diff --git a/backend/reconcile/src/utils/find_common_overlap.rs b/backend/reconcile/src/utils/find_common_overlap.rs
index ac586b81..80616952 100644
--- a/backend/reconcile/src/utils/find_common_overlap.rs
+++ b/backend/reconcile/src/utils/find_common_overlap.rs
@@ -40,26 +40,29 @@ mod tests {
         assert_eq!(find_common_overlap(&["".into()], &["".into()]), 0);
 
         assert_eq!(
-            find_common_overlap(
-                &["a".into(), "b".into(), "c".into()],
-                &["b".into(), "c".into(), "a".into()]
-            ),
+            find_common_overlap(&["a".into(), "b".into(), "c".into()], &[
+                "b".into(),
+                "c".into(),
+                "a".into()
+            ]),
             1
         );
 
         assert_eq!(
-            find_common_overlap(
-                &["a".into(), "a".into(), "a".into()],
-                &["a".into(), "b".into(), "c".into()]
-            ),
+            find_common_overlap(&["a".into(), "a".into(), "a".into()], &[
+                "a".into(),
+                "b".into(),
+                "c".into()
+            ]),
             2
         );
 
         assert_eq!(
-            find_common_overlap(
-                &["a".into(), "b".into(), "c".into()],
-                &["d".into(), "e".into(), "a".into()]
-            ),
+            find_common_overlap(&["a".into(), "b".into(), "c".into()], &[
+                "d".into(),
+                "e".into(),
+                "a".into()
+            ]),
             3
         );
 
diff --git a/backend/sync_lib/src/lib.rs b/backend/sync_lib/src/lib.rs
index d5e6c1d2..164939ac 100644
--- a/backend/sync_lib/src/lib.rs
+++ b/backend/sync_lib/src/lib.rs
@@ -10,7 +10,7 @@
 //! - `errors`: Contains error types used in this crate.
 use core::str;
 
-use base64::{engine::general_purpose::STANDARD, Engine as _};
+use base64::{Engine as _, engine::general_purpose::STANDARD};
 use errors::SyncLibError;
 use wasm_bindgen::prelude::*;
 
diff --git a/backend/sync_server/src/config/user_config.rs b/backend/sync_server/src/config/user_config.rs
index bb7d8e54..c3afca14 100644
--- a/backend/sync_server/src/config/user_config.rs
+++ b/backend/sync_server/src/config/user_config.rs
@@ -1,4 +1,4 @@
-use rand::{distributions::Alphanumeric, thread_rng, Rng as _};
+use rand::{Rng as _, distributions::Alphanumeric, thread_rng};
 use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Deserialize, Serialize, Clone)]
diff --git a/backend/sync_server/src/database.rs b/backend/sync_server/src/database.rs
index 4c638faf..52305629 100644
--- a/backend/sync_server/src/database.rs
+++ b/backend/sync_server/src/database.rs
@@ -6,7 +6,7 @@ use models::{
 };
 use sqlx::{sqlite::SqliteConnectOptions, types::chrono::Utc};
 pub mod models;
-use sqlx::{sqlite::SqlitePoolOptions, Pool, Sqlite};
+use sqlx::{Pool, Sqlite, sqlite::SqlitePoolOptions};
 
 use crate::config::database_config::DatabaseConfig;
 
diff --git a/backend/sync_server/src/errors.rs b/backend/sync_server/src/errors.rs
index d66f25bd..aa109c82 100644
--- a/backend/sync_server/src/errors.rs
+++ b/backend/sync_server/src/errors.rs
@@ -1,8 +1,8 @@
 use aide::OperationOutput;
 use axum::{
+    Json,
     http::StatusCode,
     response::{IntoResponse, Response},
-    Json,
 };
 use log::{error, info};
 use schemars::JsonSchema;
diff --git a/backend/sync_server/src/main.rs b/backend/sync_server/src/main.rs
index 02e4104b..61f6f2af 100644
--- a/backend/sync_server/src/main.rs
+++ b/backend/sync_server/src/main.rs
@@ -6,7 +6,7 @@ mod server;
 mod utils;
 
 use anyhow::{Context as _, Result};
-use errors::{init_error, SyncServerError};
+use errors::{SyncServerError, init_error};
 use log::info;
 use server::create_server;
 use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};
diff --git a/backend/sync_server/src/server/auth.rs b/backend/sync_server/src/server/auth.rs
index 3e936097..9c73070c 100644
--- a/backend/sync_server/src/server/auth.rs
+++ b/backend/sync_server/src/server/auth.rs
@@ -1,7 +1,7 @@
 use super::app_state::AppState;
 use crate::{
     config::user_config::User,
-    errors::{unauthorized_error, SyncServerError},
+    errors::{SyncServerError, unauthorized_error},
 };
 
 pub fn auth(app_state: &AppState, token: &str) -> Result<User, SyncServerError> {
diff --git a/backend/sync_server/src/server/delete_document.rs b/backend/sync_server/src/server/delete_document.rs
index 83fcda83..a9d307b5 100644
--- a/backend/sync_server/src/server/delete_document.rs
+++ b/backend/sync_server/src/server/delete_document.rs
@@ -1,19 +1,17 @@
 use anyhow::Context as _;
-use axum::{
-    extract::{Path, State},
-    Json,
-};
+use axum::extract::{Path, State};
 use axum_extra::{
-    headers::{authorization::Bearer, Authorization},
     TypedHeader,
+    headers::{Authorization, authorization::Bearer},
 };
+use axum_jsonschema::Json;
 use schemars::JsonSchema;
 use serde::Deserialize;
 
 use super::{app_state::AppState, auth::auth, requests::DeleteDocumentVersion};
 use crate::{
     database::models::{DocumentId, StoredDocumentVersion, VaultId},
-    errors::{server_error, SyncServerError},
+    errors::{SyncServerError, server_error},
     utils::sanitize_path,
 };
 
diff --git a/backend/sync_server/src/server/fetch_latest_document_version.rs b/backend/sync_server/src/server/fetch_latest_document_version.rs
index 47c4514e..a53f2703 100644
--- a/backend/sync_server/src/server/fetch_latest_document_version.rs
+++ b/backend/sync_server/src/server/fetch_latest_document_version.rs
@@ -1,19 +1,17 @@
 use anyhow::anyhow;
-use axum::{
-    extract::{Path, State},
-    Json,
-};
+use axum::extract::{Path, State};
 use axum_extra::{
-    headers::{authorization::Bearer, Authorization},
     TypedHeader,
+    headers::{Authorization, authorization::Bearer},
 };
+use axum_jsonschema::Json;
 use schemars::JsonSchema;
 use serde::Deserialize;
 
 use super::{app_state::AppState, auth::auth};
 use crate::{
     database::models::{DocumentId, DocumentVersion, VaultId},
-    errors::{not_found_error, server_error, SyncServerError},
+    errors::{SyncServerError, not_found_error, server_error},
 };
 
 // This is required for aide to infer the path parameter types and names
diff --git a/backend/sync_server/src/server/fetch_latest_documents.rs b/backend/sync_server/src/server/fetch_latest_documents.rs
index f0181173..b19c3dec 100644
--- a/backend/sync_server/src/server/fetch_latest_documents.rs
+++ b/backend/sync_server/src/server/fetch_latest_documents.rs
@@ -1,18 +1,16 @@
-use axum::{
-    extract::{Path, Query, State},
-    Json,
-};
+use axum::extract::{Path, Query, State};
 use axum_extra::{
-    headers::{authorization::Bearer, Authorization},
     TypedHeader,
+    headers::{Authorization, authorization::Bearer},
 };
+use axum_jsonschema::Json;
 use schemars::JsonSchema;
 use serde::Deserialize;
 
 use super::{app_state::AppState, auth::auth, responses::FetchLatestDocumentsResponse};
 use crate::{
     database::models::{VaultId, VaultUpdateId},
-    errors::{server_error, SyncServerError},
+    errors::{SyncServerError, server_error},
 };
 
 // This is required for aide to infer the path parameter types and names
diff --git a/backend/sync_server/src/server/ping.rs b/backend/sync_server/src/server/ping.rs
index 3ffd2cf7..1823c9f9 100644
--- a/backend/sync_server/src/server/ping.rs
+++ b/backend/sync_server/src/server/ping.rs
@@ -1,7 +1,7 @@
-use axum::{extract::State, Json};
+use axum::{Json, extract::State};
 use axum_extra::{
-    headers::{authorization::Bearer, Authorization},
     TypedHeader,
+    headers::{Authorization, authorization::Bearer},
 };
 
 use super::{app_state::AppState, auth::auth, responses::PingResponse};

From 72be6ba18b6e12e89df5c5bb1d7897474bd162c0 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Tue, 7 Jan 2025 22:29:13 +0000
Subject: [PATCH 160/761] Implement multipart upload endpoints

---
 backend/sync_server/src/server.rs             | 32 +++---
 .../sync_server/src/server/create_document.rs | 80 +++++++++++----
 backend/sync_server/src/server/requests.rs    | 21 ++++
 .../sync_server/src/server/update_document.rs | 98 ++++++++++++++-----
 4 files changed, 176 insertions(+), 55 deletions(-)

diff --git a/backend/sync_server/src/server.rs b/backend/sync_server/src/server.rs
index ad7e603f..da809c8e 100644
--- a/backend/sync_server/src/server.rs
+++ b/backend/sync_server/src/server.rs
@@ -2,34 +2,35 @@ use std::sync::Arc;
 
 use aide::{
     axum::{
-        routing::{delete, get, post, put},
         ApiRouter,
+        routing::{delete, get, post, put},
     },
     openapi::{Info, OpenApi},
     scalar::Scalar,
     transform::TransformOpenApi,
 };
-use anyhow::{anyhow, Context as _, Result};
+use anyhow::{Context as _, Result, anyhow};
 use app_state::AppState;
 use axum::{
+    Extension, Json,
     extract::{DefaultBodyLimit, Request},
     http::{self, HeaderValue, Method},
     response::IntoResponse,
-    Extension, Json,
 };
 use log::{error, info};
 use tokio::signal;
 use tower_http::{
+    LatencyUnit,
     cors::CorsLayer,
+    limit::RequestBodyLimitLayer,
     trace::{
         DefaultOnBodyChunk, DefaultOnEos, DefaultOnFailure, DefaultOnRequest, DefaultOnResponse,
         TraceLayer,
     },
-    LatencyUnit,
 };
-use tracing::{info_span, Level};
+use tracing::{Level, info_span};
 
-use crate::errors::{not_found_error, SerializedError};
+use crate::errors::{SerializedError, not_found_error};
 mod app_state;
 mod auth;
 mod create_document;
@@ -42,8 +43,8 @@ mod responses;
 mod update_document;
 
 pub async fn create_server() -> Result<()> {
-    aide::gen::on_error(|err| error!("{err}"));
-    aide::gen::extract_schemas(true);
+    aide::r#gen::on_error(|err| error!("{err}"));
+    aide::r#gen::extract_schemas(true);
 
     let app_state = AppState::try_new()
         .await
@@ -75,7 +76,11 @@ pub async fn create_server() -> Result<()> {
         )
         .api_route(
             "/vaults/:vault_id/documents",
-            post(create_document::create_document),
+            post(create_document::create_document_multipart),
+        )
+        .api_route(
+            "/vaults/:vault_id/documents/json",
+            post(create_document::create_document_json),
         )
         .api_route(
             "/vaults/:vault_id/documents/:document_id",
@@ -83,7 +88,11 @@ pub async fn create_server() -> Result<()> {
         )
         .api_route(
             "/vaults/:vault_id/documents/:document_id",
-            put(update_document::update_document),
+            put(update_document::update_document_multipart),
+        )
+        .api_route(
+            "/vaults/:vault_id/documents/:document_id/json",
+            put(update_document::update_document_json),
         )
         .api_route(
             "/vaults/:vault_id/documents/:document_id",
@@ -110,7 +119,8 @@ pub async fn create_server() -> Result<()> {
                 .on_eos(DefaultOnEos::new())
                 .on_failure(DefaultOnFailure::new().level(Level::ERROR)),
         )
-        .layer(DefaultBodyLimit::max(
+        .layer(DefaultBodyLimit::disable())
+        .layer(RequestBodyLimitLayer::new(
             app_state.config.server.max_body_size_mb * 1024 * 1024,
         ))
         .layer(
diff --git a/backend/sync_server/src/server/create_document.rs b/backend/sync_server/src/server/create_document.rs
index ac186d0c..9dda4bcd 100644
--- a/backend/sync_server/src/server/create_document.rs
+++ b/backend/sync_server/src/server/create_document.rs
@@ -1,24 +1,26 @@
+use aide_axum_typed_multipart::TypedMultipart;
 use anyhow::Context as _;
-use axum::{
-    extract::{Path, State},
-    Json,
-};
+use axum::extract::{Path, State};
 use axum_extra::{
-    headers::{authorization::Bearer, Authorization},
     TypedHeader,
+    headers::{Authorization, authorization::Bearer},
 };
+use axum_jsonschema::Json;
+use chrono::{DateTime, Utc};
 use log::info;
 use schemars::JsonSchema;
 use serde::Deserialize;
 use sync_lib::{base64_to_bytes, merge};
 
 use super::{
-    app_state::AppState, auth::auth, requests::CreateDocumentVersion,
+    app_state::AppState,
+    auth::auth,
+    requests::{CreateDocumentVersion, CreateDocumentVersionMultipart},
     responses::DocumentUpdateResponse,
 };
 use crate::{
     database::models::{StoredDocumentVersion, VaultId},
-    errors::{client_error, server_error, SyncServerError},
+    errors::{SyncServerError, client_error, server_error},
     utils::sanitize_path,
 };
 
@@ -32,11 +34,57 @@ pub struct PathParams {
 /// already. If a document with the same path exists, a new version is created
 /// with their content merged.
 #[axum::debug_handler]
-pub async fn create_document(
+pub async fn create_document_multipart(
+    TypedHeader(auth_header): TypedHeader<Authorization<Bearer>>,
+    Path(PathParams { vault_id }): Path<PathParams>,
+    State(state): State<AppState>,
+    TypedMultipart(axum_typed_multipart::TypedMultipart(request)): TypedMultipart<
+        CreateDocumentVersionMultipart,
+    >,
+) -> Result<Json<DocumentUpdateResponse>, SyncServerError> {
+    internal_create_document(
+        auth_header,
+        state,
+        vault_id,
+        request.relative_path,
+        request.created_date,
+        request.content.contents.to_vec(),
+    )
+    .await
+}
+
+/// Create a new document in case a document with the same doesn't exist
+/// already. If a document with the same path exists, a new version is created
+/// with their content merged.
+#[axum::debug_handler]
+pub async fn create_document_json(
     TypedHeader(auth_header): TypedHeader<Authorization<Bearer>>,
     Path(PathParams { vault_id }): Path<PathParams>,
     State(state): State<AppState>,
     Json(request): Json<CreateDocumentVersion>,
+) -> Result<Json<DocumentUpdateResponse>, SyncServerError> {
+    let content_bytes = base64_to_bytes(&request.content_base64)
+        .context("Failed to decode base64 content in request")
+        .map_err(client_error)?;
+
+    internal_create_document(
+        auth_header,
+        state,
+        vault_id,
+        request.relative_path,
+        request.created_date,
+        content_bytes,
+    )
+    .await
+}
+
+async fn internal_create_document(
+    auth_header: Authorization<Bearer>,
+    state: AppState,
+    vault_id: VaultId,
+    relative_path: String,
+    created_date: DateTime<Utc>,
+    content: Vec<u8>,
 ) -> Result<Json<DocumentUpdateResponse>, SyncServerError> {
     auth(&state, auth_header.token())?;
 
@@ -52,7 +100,7 @@ pub async fn create_document(
         .await
         .map_err(server_error)?;
 
-    let sanitized_relative_path = sanitize_path(&request.relative_path);
+    let sanitized_relative_path = sanitize_path(&relative_path);
 
     let maybe_existing_version = state
         .database
@@ -61,12 +109,8 @@ pub async fn create_document(
         .map_err(server_error)?
         .and_then(|doc| if doc.is_deleted { None } else { Some(doc) });
 
-    let content_bytes = base64_to_bytes(&request.content_base64)
-        .context("Failed to decode base64 content in request")
-        .map_err(client_error)?;
-
     let response = if let Some(existing_version) = maybe_existing_version {
-        if content_bytes == existing_version.content {
+        if content == existing_version.content {
             info!(
                 "Content of the new version is the same as the existing version. Not creating a \
                  new version."
@@ -86,7 +130,7 @@ pub async fn create_document(
         let merged_content = merge(
             &[], // the empty string is the first common parent of the two documents,
             &existing_version.content,
-            &content_bytes,
+            &content,
         );
 
         let new_version = StoredDocumentVersion {
@@ -95,7 +139,7 @@ pub async fn create_document(
             relative_path: sanitized_relative_path,
             document_id: existing_version.document_id,
             content: merged_content,
-            created_date: request.created_date,
+            created_date,
             updated_date: chrono::Utc::now(),
             is_deleted: false,
         };
@@ -113,8 +157,8 @@ pub async fn create_document(
             vault_update_id: last_update_id + 1,
             document_id: uuid::Uuid::new_v4(),
             relative_path: sanitized_relative_path,
-            content: content_bytes,
-            created_date: request.created_date,
+            content,
+            created_date,
             updated_date: chrono::Utc::now(),
             is_deleted: false,
         };
diff --git a/backend/sync_server/src/server/requests.rs b/backend/sync_server/src/server/requests.rs
index 9c52bd9c..1720f96f 100644
--- a/backend/sync_server/src/server/requests.rs
+++ b/backend/sync_server/src/server/requests.rs
@@ -1,3 +1,6 @@
+use aide_axum_typed_multipart::FieldData;
+use axum::body::Bytes;
+use axum_typed_multipart::TryFromMultipart;
 use chrono::{DateTime, Utc};
 use schemars::JsonSchema;
 use serde::{self, Deserialize};
@@ -12,6 +15,14 @@ pub struct CreateDocumentVersion {
     pub content_base64: String,
 }
 
+#[derive(Debug, TryFromMultipart, JsonSchema)]
+pub struct CreateDocumentVersionMultipart {
+    pub relative_path: String,
+    pub created_date: DateTime<Utc>,
+    #[form_data(limit = "unlimited")]
+    pub content: FieldData<Bytes>,
+}
+
 #[derive(Debug, Deserialize, JsonSchema)]
 #[serde(rename_all = "camelCase")]
 pub struct UpdateDocumentVersion {
@@ -21,6 +32,16 @@ pub struct UpdateDocumentVersion {
     pub content_base64: String,
 }
 
+#[derive(Debug, TryFromMultipart, JsonSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct UpdateDocumentVersionMultipart {
+    pub parent_version_id: VaultUpdateId,
+    pub relative_path: String,
+    pub created_date: DateTime<Utc>,
+    #[form_data(limit = "unlimited")]
+    pub content: FieldData<Bytes>,
+}
+
 #[derive(Debug, Deserialize, JsonSchema)]
 #[serde(rename_all = "camelCase")]
 pub struct DeleteDocumentVersion {
diff --git a/backend/sync_server/src/server/update_document.rs b/backend/sync_server/src/server/update_document.rs
index 31ab4320..073744d4 100644
--- a/backend/sync_server/src/server/update_document.rs
+++ b/backend/sync_server/src/server/update_document.rs
@@ -1,24 +1,26 @@
-use anyhow::{anyhow, Context as _};
-use axum::{
-    extract::{Path, State},
-    Json,
-};
+use aide_axum_typed_multipart::TypedMultipart;
+use anyhow::{Context as _, anyhow};
+use axum::extract::{Path, State};
 use axum_extra::{
-    headers::{authorization::Bearer, Authorization},
     TypedHeader,
+    headers::{Authorization, authorization::Bearer},
 };
+use axum_jsonschema::Json;
+use chrono::{DateTime, Utc};
 use log::info;
 use schemars::JsonSchema;
 use serde::Deserialize;
 use sync_lib::{base64_to_bytes, merge};
 
 use super::{
-    app_state::AppState, auth::auth, requests::UpdateDocumentVersion,
+    app_state::AppState,
+    auth::auth,
+    requests::{UpdateDocumentVersion, UpdateDocumentVersionMultipart},
     responses::DocumentUpdateResponse,
 };
 use crate::{
-    database::models::{DocumentId, StoredDocumentVersion, VaultId},
-    errors::{client_error, not_found_error, server_error, SyncServerError},
+    database::models::{DocumentId, StoredDocumentVersion, VaultId, VaultUpdateId},
+    errors::{SyncServerError, client_error, not_found_error, server_error},
     utils::sanitize_path,
 };
 
@@ -30,7 +32,32 @@ pub struct PathParams {
 }
 
 #[axum::debug_handler]
-pub async fn update_document(
+pub async fn update_document_multipart(
+    TypedHeader(auth_header): TypedHeader<Authorization<Bearer>>,
+    Path(PathParams {
+        vault_id,
+        document_id,
+    }): Path<PathParams>,
+    State(state): State<AppState>,
+    TypedMultipart(axum_typed_multipart::TypedMultipart(request)): TypedMultipart<
+        UpdateDocumentVersionMultipart,
+    >,
+) -> Result<Json<DocumentUpdateResponse>, SyncServerError> {
+    internal_update_document(
+        auth_header,
+        state,
+        vault_id,
+        document_id,
+        request.parent_version_id,
+        request.relative_path,
+        request.created_date,
+        request.content.contents.to_vec(),
+    )
+    .await
+}
+
+#[axum::debug_handler]
+pub async fn update_document_json(
     TypedHeader(auth_header): TypedHeader<Authorization<Bearer>>,
     Path(PathParams {
         vault_id,
@@ -38,20 +65,48 @@ pub async fn update_document(
     }): Path<PathParams>,
     State(state): State<AppState>,
     Json(request): Json<UpdateDocumentVersion>,
+) -> Result<Json<DocumentUpdateResponse>, SyncServerError> {
+    let content_bytes = base64_to_bytes(&request.content_base64)
+        .context("Failed to decode base64 content in request")
+        .map_err(client_error)?;
+
+    internal_update_document(
+        auth_header,
+        state,
+        vault_id,
+        document_id,
+        request.parent_version_id,
+        request.relative_path,
+        request.created_date,
+        content_bytes,
+    )
+    .await
+}
+
+#[allow(clippy::too_many_arguments)]
+async fn internal_update_document(
+    auth_header: Authorization<Bearer>,
+    state: AppState,
+    vault_id: VaultId,
+    document_id: DocumentId,
+    parent_version_id: VaultUpdateId,
+    relative_path: String,
+    created_date: DateTime<Utc>,
+    content: Vec<u8>,
 ) -> Result<Json<DocumentUpdateResponse>, SyncServerError> {
     auth(&state, auth_header.token())?;
 
     // No need for a transaction as document versions are immutable
     let parent_document = state
         .database
-        .get_document_version(&vault_id, request.parent_version_id, None)
+        .get_document_version(&vault_id, parent_version_id, None)
         .await
         .map_err(server_error)?
         .map_or_else(
             || {
                 Err(not_found_error(anyhow!(
                     "Parent version with id `{}` not found",
-                    request.parent_version_id
+                    parent_version_id
                 )))
             },
             Ok,
@@ -83,15 +138,10 @@ pub async fn update_document(
             Ok,
         )?;
 
-    let content_bytes = base64_to_bytes(&request.content_base64)
-        .context("Failed to decode base64 content in request")
-        .map_err(client_error)?;
-
-    let sanitized_relative_path = sanitize_path(&request.relative_path);
+    let sanitized_relative_path = sanitize_path(&relative_path);
     // Return the latest version if the content and path are the same as the latest
     // version
-    if content_bytes == latest_version.content
-        && sanitized_relative_path == latest_version.relative_path
+    if content == latest_version.content && sanitized_relative_path == latest_version.relative_path
     {
         info!("Document content is the same as the latest version, skipping update");
         transaction
@@ -105,12 +155,8 @@ pub async fn update_document(
         )));
     }
 
-    let merged_content = merge(
-        &parent_document.content,
-        &latest_version.content,
-        &content_bytes,
-    );
-    let is_different_from_request_content = merged_content != content_bytes;
+    let merged_content = merge(&parent_document.content, &latest_version.content, &content);
+    let is_different_from_request_content = merged_content != content;
 
     // We can only update the relative path if we're the first one to do so
     let new_relative_path = if parent_document.relative_path == latest_version.relative_path {
@@ -125,7 +171,7 @@ pub async fn update_document(
         vault_update_id: last_update_id + 1,
         relative_path: new_relative_path,
         content: merged_content,
-        created_date: request.created_date,
+        created_date,
         updated_date: chrono::Utc::now(),
         is_deleted: latest_version.is_deleted,
     };

From f8dcca5367db58d2b058a65b820a736a18b0a5a8 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Tue, 7 Jan 2025 22:32:15 +0000
Subject: [PATCH 161/761] Don't read same file multiple times

---
 plugin/src/sync-operations/syncer.ts | 44 +++++++++++++++++++++-------
 1 file changed, 33 insertions(+), 11 deletions(-)

diff --git a/plugin/src/sync-operations/syncer.ts b/plugin/src/sync-operations/syncer.ts
index a99b617f..2550f055 100644
--- a/plugin/src/sync-operations/syncer.ts
+++ b/plugin/src/sync-operations/syncer.ts
@@ -115,9 +115,13 @@ export class Syncer {
 						// If there's no metadata, it must be a new file
 						if (!metadata) {
 							// Perhaps the file has been moved. Let's check by looking at the deleted files
+							const contentBytes =
+								await this.operations.read(relativePath);
+							const contentHash = hash(contentBytes);
+
 							const originalFile =
 								await this.findMatchingFileBasedOnHash(
-									relativePath,
+									contentHash,
 									locallyDeletedFiles
 								);
 							if (originalFile !== undefined) {
@@ -133,7 +137,11 @@ export class Syncer {
 									updateTime:
 										await this.operations.getModificationTime(
 											relativePath
-										)
+										),
+									optimisations: {
+										contentBytes,
+										contentHash
+									}
 								});
 							}
 
@@ -196,15 +204,22 @@ export class Syncer {
 
 	private async internalSyncLocallyCreatedFile(
 		relativePath: RelativePath,
-		updateTime: Date
+		updateTime: Date,
+		optimisations?: {
+			contentBytes?: Uint8Array;
+			contentHash?: string;
+		}
 	): Promise<void> {
 		await this.executeWhileHoldingFileLock(
 			relativePath,
 			SyncType.CREATE,
 			SyncSource.PUSH,
 			async () => {
-				const contentBytes = await this.operations.read(relativePath);
-				let contentHash = hash(contentBytes);
+				const contentBytes =
+					optimisations?.contentBytes ??
+					(await this.operations.read(relativePath));
+				let contentHash =
+					optimisations?.contentHash ?? hash(contentBytes);
 
 				const localMetadata = this.database.getDocument(relativePath);
 				if (localMetadata) {
@@ -270,11 +285,16 @@ export class Syncer {
 	private async internalSyncLocallyUpdatedFile({
 		oldPath,
 		relativePath,
-		updateTime
+		updateTime,
+		optimisations
 	}: {
 		oldPath?: RelativePath;
 		relativePath: RelativePath;
 		updateTime: Date;
+		optimisations?: {
+			contentBytes?: Uint8Array;
+			contentHash?: string;
+		};
 	}): Promise<void> {
 		await this.executeWhileHoldingFileLock(
 			relativePath,
@@ -304,11 +324,15 @@ export class Syncer {
 				console.log("about to read", relativePath);
 				await sleep(1000);
 
-				const contentBytes = await this.operations.read(relativePath);
+				const contentBytes =
+					optimisations?.contentBytes ??
+					(await this.operations.read(relativePath));
+
 				console.log("has read", relativePath);
 				await sleep(1000);
 
-				let contentHash = hash(contentBytes);
+				let contentHash =
+					optimisations?.contentHash ?? hash(contentBytes);
 				console.log("has hashed", relativePath);
 				await sleep(1000);
 
@@ -640,11 +664,9 @@ export class Syncer {
 	}
 
 	private async findMatchingFileBasedOnHash(
-		filePath: RelativePath,
+		contentHash: string,
 		candidates: [RelativePath, DocumentMetadata][]
 	): Promise<[RelativePath, DocumentMetadata] | undefined> {
-		const contentHash = hash(await this.operations.read(filePath));
-
 		if (contentHash != EMPTY_HASH) {
 			return undefined;
 		}

From 59403d8a52d70df024e0a822554b5fc9a803fef8 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Tue, 7 Jan 2025 22:33:33 +0000
Subject: [PATCH 162/761] Render types

---
 plugin/src/services/types.ts | 118 ++++++++++++++++++++++++++++++++++-
 1 file changed, 117 insertions(+), 1 deletion(-)

diff --git a/plugin/src/services/types.ts b/plugin/src/services/types.ts
index 4f837259..d920e1e8 100644
--- a/plugin/src/services/types.ts
+++ b/plugin/src/services/types.ts
@@ -89,6 +89,56 @@ export interface paths {
 			};
 		};
 		put?: never;
+		post: {
+			parameters: {
+				query?: never;
+				header: {
+					authorization: string;
+				};
+				path: {
+					vault_id: string;
+				};
+				cookie?: never;
+			};
+			requestBody: {
+				content: {
+					"multipart/form-data": components["schemas"]["CreateDocumentVersionMultipart"];
+				};
+			};
+			responses: {
+				200: {
+					headers: {
+						[name: string]: unknown;
+					};
+					content: {
+						"application/json": components["schemas"]["DocumentUpdateResponse"];
+					};
+				};
+				default: {
+					headers: {
+						[name: string]: unknown;
+					};
+					content: {
+						"application/json": components["schemas"]["SerializedError"];
+					};
+				};
+			};
+		};
+		delete?: never;
+		options?: never;
+		head?: never;
+		patch?: never;
+		trace?: never;
+	};
+	"/vaults/{vault_id}/documents/json": {
+		parameters: {
+			query?: never;
+			header?: never;
+			path?: never;
+			cookie?: never;
+		};
+		get?: never;
+		put?: never;
 		post: {
 			parameters: {
 				query?: never;
@@ -183,7 +233,7 @@ export interface paths {
 			};
 			requestBody: {
 				content: {
-					"application/json": components["schemas"]["UpdateDocumentVersion"];
+					"multipart/form-data": components["schemas"]["UpdateDocumentVersionMultipart"];
 				};
 			};
 			responses: {
@@ -246,16 +296,74 @@ export interface paths {
 		patch?: never;
 		trace?: never;
 	};
+	"/vaults/{vault_id}/documents/{document_id}/json": {
+		parameters: {
+			query?: never;
+			header?: never;
+			path?: never;
+			cookie?: never;
+		};
+		get?: never;
+		put: {
+			parameters: {
+				query?: never;
+				header: {
+					authorization: string;
+				};
+				path: {
+					document_id: string;
+					vault_id: string;
+				};
+				cookie?: never;
+			};
+			requestBody: {
+				content: {
+					"application/json": components["schemas"]["UpdateDocumentVersion"];
+				};
+			};
+			responses: {
+				200: {
+					headers: {
+						[name: string]: unknown;
+					};
+					content: {
+						"application/json": components["schemas"]["DocumentUpdateResponse"];
+					};
+				};
+				default: {
+					headers: {
+						[name: string]: unknown;
+					};
+					content: {
+						"application/json": components["schemas"]["SerializedError"];
+					};
+				};
+			};
+		};
+		post?: never;
+		delete?: never;
+		options?: never;
+		head?: never;
+		patch?: never;
+		trace?: never;
+	};
 }
 export type webhooks = Record<string, never>;
 export interface components {
 	schemas: {
+		Array_of_uint8: number[];
 		CreateDocumentVersion: {
 			contentBase64: string;
 			/** Format: date-time */
 			createdDate: string;
 			relativePath: string;
 		};
+		CreateDocumentVersionMultipart: {
+			content: components["schemas"]["Array_of_uint8"];
+			/** Format: date-time */
+			created_date: string;
+			relative_path: string;
+		};
 		DeleteDocumentVersion: {
 			/** Format: date-time */
 			createdDate: string;
@@ -374,6 +482,14 @@ export interface components {
 			parentVersionId: number;
 			relativePath: string;
 		};
+		UpdateDocumentVersionMultipart: {
+			content: components["schemas"]["Array_of_uint8"];
+			/** Format: date-time */
+			createdDate: string;
+			/** Format: int64 */
+			parentVersionId: number;
+			relativePath: string;
+		};
 	};
 	responses: never;
 	parameters: never;

From 954dc1ecad76bf1778460f5892e51e75f6dc457f Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Wed, 8 Jan 2025 20:36:03 +0000
Subject: [PATCH 163/761] Use forms

---
 plugin/src/services/sync-service.ts | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/plugin/src/services/sync-service.ts b/plugin/src/services/sync-service.ts
index fdda9322..088e174b 100644
--- a/plugin/src/services/sync-service.ts
+++ b/plugin/src/services/sync-service.ts
@@ -71,6 +71,11 @@ export class SyncService {
 		contentBytes: Uint8Array;
 		createdDate: Date;
 	}): Promise<components["schemas"]["DocumentUpdateResponse"]> {
+		const formData = new FormData();
+		formData.append("relative_path", relativePath);
+		formData.append("created_date", createdDate.toISOString());
+		formData.append("content", new Blob([contentBytes]));
+
 		const response = await this.client.POST(
 			"/vaults/{vault_id}/documents",
 			{
@@ -82,11 +87,7 @@ export class SyncService {
 						authorization: `Bearer ${this.database.getSettings().token}`
 					}
 				},
-				body: {
-					contentBase64: serialize(contentBytes),
-					createdDate: createdDate.toISOString(),
-					relativePath
-				}
+				body: formData as any // FormData is not supported by openapi-fetch
 			}
 		);
 
@@ -118,6 +119,12 @@ export class SyncService {
 		contentBytes: Uint8Array;
 		createdDate: Date;
 	}): Promise<components["schemas"]["DocumentUpdateResponse"]> {
+		const formData = new FormData();
+		formData.append("parent_version_id", parentVersionId.toString());
+		formData.append("created_date", createdDate.toISOString());
+		formData.append("relative_path", relativePath);
+		formData.append("content", new Blob([contentBytes]));
+
 		const response = await this.client.PUT(
 			"/vaults/{vault_id}/documents/{document_id}",
 			{
@@ -130,12 +137,7 @@ export class SyncService {
 						authorization: `Bearer ${this.database.getSettings().token}`
 					}
 				},
-				body: {
-					parentVersionId,
-					contentBase64: serialize(contentBytes),
-					createdDate: createdDate.toISOString(),
-					relativePath
-				}
+				body: formData as any // FormData is not supported by openapi-fetch
 			}
 		);
 

From 784ed123841f0be060307c0c00b2e77cbf50fa4f Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Wed, 8 Jan 2025 20:36:15 +0000
Subject: [PATCH 164/761] Bump versions to 0.0.21

---
 backend/Cargo.lock       | 8 ++++----
 backend/Cargo.toml       | 4 ++--
 manifest.json            | 2 +-
 plugin/manifest.json     | 2 +-
 plugin/package-lock.json | 9 +++++----
 plugin/package.json      | 2 +-
 6 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index d21ed5ff..fd7038cf 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1773,7 +1773,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile"
-version = "0.0.20"
+version = "0.0.21"
 dependencies = [
  "insta",
  "pretty_assertions",
@@ -1783,7 +1783,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile-fuzz"
-version = "0.0.20"
+version = "0.0.21"
 dependencies = [
  "libfuzzer-sys",
  "reconcile",
@@ -2415,7 +2415,7 @@ dependencies = [
 
 [[package]]
 name = "sync_lib"
-version = "0.0.20"
+version = "0.0.21"
 dependencies = [
  "base64 0.22.1",
  "console_error_panic_hook",
@@ -2428,7 +2428,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.0.20"
+version = "0.0.21"
 dependencies = [
  "aide",
  "aide-axum-typed-multipart",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 439134fb..7151479a 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -13,7 +13,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.0.20"
+version = "0.0.21"
 
 [workspace.dependencies]  
 serde = { version = "1.0.214", default-features = false, features = ["derive"] }
@@ -56,4 +56,4 @@ todo = "warn"
 uninlined_format_args = "warn"
 unnested_or_patterns = "warn"
 unused_self = "warn"
-verbose_file_reads = "warn"
\ No newline at end of file
+verbose_file_reads = "warn"
diff --git a/manifest.json b/manifest.json
index c280cf56..670c6473 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.0.20",
+	"version": "0.0.21",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/plugin/manifest.json b/plugin/manifest.json
index c280cf56..670c6473 100644
--- a/plugin/manifest.json
+++ b/plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.0.20",
+	"version": "0.0.21",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/plugin/package-lock.json b/plugin/package-lock.json
index 9d5eb3e7..afd96394 100644
--- a/plugin/package-lock.json
+++ b/plugin/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.0.20",
+	"version": "0.0.21",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.0.20",
+			"version": "0.0.21",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
@@ -46,8 +46,9 @@
 		},
 		"../backend/sync_lib/pkg": {
 			"name": "sync_lib",
-			"version": "0.0.20",
-			"dev": true
+			"version": "0.0.21",
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/@ampproject/remapping": {
 			"version": "2.3.0",
diff --git a/plugin/package.json b/plugin/package.json
index fc528821..9d3024db 100644
--- a/plugin/package.json
+++ b/plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.0.20",
+	"version": "0.0.21",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {

From bef4d4e08a45d2d3fbaaf5c5cd6de407cbe0dd8f Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Wed, 8 Jan 2025 21:46:51 +0000
Subject: [PATCH 165/761] .

---
 plugin/src/file-operations/obsidian-file-operations.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/plugin/src/file-operations/obsidian-file-operations.ts b/plugin/src/file-operations/obsidian-file-operations.ts
index aadd7f0b..f366c40b 100644
--- a/plugin/src/file-operations/obsidian-file-operations.ts
+++ b/plugin/src/file-operations/obsidian-file-operations.ts
@@ -8,6 +8,7 @@ export class ObsidianFileOperations implements FileOperations {
 	public constructor(private readonly vault: Vault) {}
 
 	public async listAllFiles(): Promise<RelativePath[]> {
+		console.log(this.vault);
 		console.log("before getFiles");
 		await sleep(1000);
 
@@ -50,13 +51,19 @@ export class ObsidianFileOperations implements FileOperations {
 		path: RelativePath,
 		newContent: Uint8Array
 	): Promise<void> {
+		console.log("before create");
+		await sleep(1000);
 		if (await this.vault.adapter.exists(normalizePath(path))) {
 			await this.write(path, new Uint8Array(0), newContent);
+			console.log("after create");
+			await sleep(1000);
 			return;
 		}
 
 		await this.createParentDirectories(normalizePath(path));
 		await this.vault.adapter.writeBinary(normalizePath(path), newContent);
+		console.log("after create2");
+		await sleep(1000);
 	}
 
 	public async write(

From b93e2c7c830f1ddc244c029e3da2617c8b93e2e0 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Wed, 8 Jan 2025 21:47:01 +0000
Subject: [PATCH 166/761] Bump versions to 0.0.22

---
 backend/Cargo.lock       | 8 ++++----
 backend/Cargo.toml       | 2 +-
 manifest.json            | 2 +-
 plugin/manifest.json     | 2 +-
 plugin/package-lock.json | 6 +++---
 plugin/package.json      | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index fd7038cf..5296762a 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1773,7 +1773,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile"
-version = "0.0.21"
+version = "0.0.22"
 dependencies = [
  "insta",
  "pretty_assertions",
@@ -1783,7 +1783,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile-fuzz"
-version = "0.0.21"
+version = "0.0.22"
 dependencies = [
  "libfuzzer-sys",
  "reconcile",
@@ -2415,7 +2415,7 @@ dependencies = [
 
 [[package]]
 name = "sync_lib"
-version = "0.0.21"
+version = "0.0.22"
 dependencies = [
  "base64 0.22.1",
  "console_error_panic_hook",
@@ -2428,7 +2428,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.0.21"
+version = "0.0.22"
 dependencies = [
  "aide",
  "aide-axum-typed-multipart",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 7151479a..9481e059 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -13,7 +13,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.0.21"
+version = "0.0.22"
 
 [workspace.dependencies]  
 serde = { version = "1.0.214", default-features = false, features = ["derive"] }
diff --git a/manifest.json b/manifest.json
index 670c6473..206ac3de 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.0.21",
+	"version": "0.0.22",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/plugin/manifest.json b/plugin/manifest.json
index 670c6473..206ac3de 100644
--- a/plugin/manifest.json
+++ b/plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.0.21",
+	"version": "0.0.22",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/plugin/package-lock.json b/plugin/package-lock.json
index afd96394..18e901d6 100644
--- a/plugin/package-lock.json
+++ b/plugin/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.0.21",
+	"version": "0.0.22",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.0.21",
+			"version": "0.0.22",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
@@ -46,7 +46,7 @@
 		},
 		"../backend/sync_lib/pkg": {
 			"name": "sync_lib",
-			"version": "0.0.21",
+			"version": "0.0.22",
 			"dev": true,
 			"license": "MIT"
 		},
diff --git a/plugin/package.json b/plugin/package.json
index 9d3024db..7fa68b33 100644
--- a/plugin/package.json
+++ b/plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.0.21",
+	"version": "0.0.22",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {

From 1566197b605b3ab7ff1fdab8e35a2b218960affe Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Wed, 8 Jan 2025 21:55:27 +0000
Subject: [PATCH 167/761] Try with not using adapter

---
 .../obsidian-file-operations.ts               | 40 +++++++++++--------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/plugin/src/file-operations/obsidian-file-operations.ts b/plugin/src/file-operations/obsidian-file-operations.ts
index f366c40b..5f68ce54 100644
--- a/plugin/src/file-operations/obsidian-file-operations.ts
+++ b/plugin/src/file-operations/obsidian-file-operations.ts
@@ -1,4 +1,4 @@
-import type { Vault } from "obsidian";
+import { TFile, Vault } from "obsidian";
 import { normalizePath } from "obsidian";
 import type { FileOperations } from "./file-operations";
 import type { RelativePath } from "src/database/document-metadata";
@@ -25,7 +25,7 @@ export class ObsidianFileOperations implements FileOperations {
 		await sleep(1000);
 
 		const result = new Uint8Array(
-			await this.vault.adapter.readBinary(normalizePath(path))
+			await this.vault.readBinary(this.getAbstractFile(path))
 		);
 		console.log("after readBinary");
 		await sleep(1000);
@@ -61,7 +61,7 @@ export class ObsidianFileOperations implements FileOperations {
 		}
 
 		await this.createParentDirectories(normalizePath(path));
-		await this.vault.adapter.writeBinary(normalizePath(path), newContent);
+		await this.vault.createBinary(normalizePath(path), newContent);
 		console.log("after create2");
 		await sleep(1000);
 	}
@@ -77,26 +77,21 @@ export class ObsidianFileOperations implements FileOperations {
 		}
 
 		if (isBinary(expectedContent)) {
-			await this.vault.adapter.writeBinary(
-				normalizePath(path),
-				newContent
-			);
+			await this.vault.createBinary(normalizePath(path), newContent);
 			return newContent;
 		}
 
 		const expetedText = new TextDecoder().decode(expectedContent);
 		const newText = new TextDecoder().decode(newContent);
 
-		const resultText = await this.vault.adapter.process(
-			normalizePath(path),
-			(currentText) => {
-				if (currentText !== expetedText) {
-					return mergeText(expetedText, currentText, newText);
-				}
-
-				return newText;
+		const file = this.getAbstractFile(path);
+		const resultText = await this.vault.process(file, (currentText) => {
+			if (currentText !== expetedText) {
+				return mergeText(expetedText, currentText, newText);
 			}
-		);
+
+			return newText;
+		});
 		return new TextEncoder().encode(resultText);
 	}
 
@@ -132,4 +127,17 @@ export class ObsidianFileOperations implements FileOperations {
 			}
 		}
 	}
+
+	private getAbstractFile(path: RelativePath): TFile {
+		const file = this.vault.getAbstractFileByPath(path);
+		if (!file) {
+			throw new Error(`File not found: ${path}`);
+		}
+
+		if (file instanceof TFile) {
+			return file;
+		}
+
+		throw new Error(`Not a file: ${path}`);
+	}
 }

From 92765f7a8afdfe2596d39d26f528ce7e65057fef Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Wed, 8 Jan 2025 21:55:36 +0000
Subject: [PATCH 168/761] Bump versions to 0.0.23

---
 backend/Cargo.lock       | 8 ++++----
 backend/Cargo.toml       | 2 +-
 manifest.json            | 2 +-
 plugin/manifest.json     | 2 +-
 plugin/package-lock.json | 6 +++---
 plugin/package.json      | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 5296762a..58ee6392 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1773,7 +1773,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile"
-version = "0.0.22"
+version = "0.0.23"
 dependencies = [
  "insta",
  "pretty_assertions",
@@ -1783,7 +1783,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile-fuzz"
-version = "0.0.22"
+version = "0.0.23"
 dependencies = [
  "libfuzzer-sys",
  "reconcile",
@@ -2415,7 +2415,7 @@ dependencies = [
 
 [[package]]
 name = "sync_lib"
-version = "0.0.22"
+version = "0.0.23"
 dependencies = [
  "base64 0.22.1",
  "console_error_panic_hook",
@@ -2428,7 +2428,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.0.22"
+version = "0.0.23"
 dependencies = [
  "aide",
  "aide-axum-typed-multipart",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 9481e059..d9071406 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -13,7 +13,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.0.22"
+version = "0.0.23"
 
 [workspace.dependencies]  
 serde = { version = "1.0.214", default-features = false, features = ["derive"] }
diff --git a/manifest.json b/manifest.json
index 206ac3de..352d8d6b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.0.22",
+	"version": "0.0.23",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/plugin/manifest.json b/plugin/manifest.json
index 206ac3de..352d8d6b 100644
--- a/plugin/manifest.json
+++ b/plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.0.22",
+	"version": "0.0.23",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/plugin/package-lock.json b/plugin/package-lock.json
index 18e901d6..0067338a 100644
--- a/plugin/package-lock.json
+++ b/plugin/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.0.22",
+	"version": "0.0.23",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.0.22",
+			"version": "0.0.23",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
@@ -46,7 +46,7 @@
 		},
 		"../backend/sync_lib/pkg": {
 			"name": "sync_lib",
-			"version": "0.0.22",
+			"version": "0.0.23",
 			"dev": true,
 			"license": "MIT"
 		},
diff --git a/plugin/package.json b/plugin/package.json
index 7fa68b33..72b3cf38 100644
--- a/plugin/package.json
+++ b/plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.0.22",
+	"version": "0.0.23",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {

From 5582691cf768be39c894c28c4ecdb3845ae7ae39 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Wed, 8 Jan 2025 22:25:04 +0000
Subject: [PATCH 169/761] Remove debug logging and add file size limit

---
 plugin/src/database/sync-settings.ts          |  4 +-
 plugin/src/file-operations/file-operations.ts |  2 +
 .../obsidian-file-operations.ts               | 35 ++++--------
 plugin/src/sync-operations/syncer.ts          | 54 +++++++++++--------
 plugin/src/views/settings-tab.ts              | 16 ++++++
 5 files changed, 63 insertions(+), 48 deletions(-)

diff --git a/plugin/src/database/sync-settings.ts b/plugin/src/database/sync-settings.ts
index ad6aa5cd..99e7d81b 100644
--- a/plugin/src/database/sync-settings.ts
+++ b/plugin/src/database/sync-settings.ts
@@ -9,6 +9,7 @@ export interface SyncSettings {
 	isSyncEnabled: boolean;
 	displayNoopSyncEvents: boolean;
 	minimumLogLevel: LogLevel;
+	maxFileSizeMB: number;
 }
 
 export const DEFAULT_SETTINGS: SyncSettings = {
@@ -19,5 +20,6 @@ export const DEFAULT_SETTINGS: SyncSettings = {
 	syncConcurrency: 1,
 	isSyncEnabled: false,
 	displayNoopSyncEvents: false,
-	minimumLogLevel: LogLevel.INFO
+	minimumLogLevel: LogLevel.INFO,
+	maxFileSizeMB: 10
 };
diff --git a/plugin/src/file-operations/file-operations.ts b/plugin/src/file-operations/file-operations.ts
index 910b6d71..57d51877 100644
--- a/plugin/src/file-operations/file-operations.ts
+++ b/plugin/src/file-operations/file-operations.ts
@@ -5,6 +5,8 @@ export interface FileOperations {
 
 	read: (path: RelativePath) => Promise<Uint8Array>;
 
+	getFileSize(path: RelativePath): Promise<number>;
+
 	getModificationTime: (path: RelativePath) => Promise<Date>;
 
 	// Create and write the file if it doesn't exist. Otherwise, it has the same behavior as write.
diff --git a/plugin/src/file-operations/obsidian-file-operations.ts b/plugin/src/file-operations/obsidian-file-operations.ts
index 5f68ce54..f92f3b24 100644
--- a/plugin/src/file-operations/obsidian-file-operations.ts
+++ b/plugin/src/file-operations/obsidian-file-operations.ts
@@ -8,41 +8,32 @@ export class ObsidianFileOperations implements FileOperations {
 	public constructor(private readonly vault: Vault) {}
 
 	public async listAllFiles(): Promise<RelativePath[]> {
-		console.log(this.vault);
-		console.log("before getFiles");
-		await sleep(1000);
-
 		const files = this.vault.getFiles();
-		console.log("after getFiles");
-		await sleep(1000);
-
-		console.log(files);
 		return files.map((file) => file.path);
 	}
 
 	public async read(path: RelativePath): Promise<Uint8Array> {
-		console.log("before readBinary");
-		await sleep(1000);
-
 		const result = new Uint8Array(
 			await this.vault.readBinary(this.getAbstractFile(path))
 		);
-		console.log("after readBinary");
-		await sleep(1000);
 
 		return result;
 	}
 
-	public async getModificationTime(path: RelativePath): Promise<Date> {
-		console.log("before stat");
-		await sleep(1000);
-
+	public async getFileSize(path: RelativePath): Promise<number> {
+		const file = await this.vault.adapter.stat(normalizePath(path));
+		if (!file) {
+			throw new Error(`File not found: ${path}`);
+		}
+
+		return file.size;
+	}
+
+	public async getModificationTime(path: RelativePath): Promise<Date> {
 		const file = await this.vault.adapter.stat(normalizePath(path));
 		if (!file) {
 			throw new Error(`File not found: ${path}`);
 		}
-		console.log("after stat");
-		await sleep(1000);
 
 		return new Date(file.mtime);
 	}
@@ -51,19 +42,13 @@ export class ObsidianFileOperations implements FileOperations {
 		path: RelativePath,
 		newContent: Uint8Array
 	): Promise<void> {
-		console.log("before create");
-		await sleep(1000);
 		if (await this.vault.adapter.exists(normalizePath(path))) {
 			await this.write(path, new Uint8Array(0), newContent);
-			console.log("after create");
-			await sleep(1000);
 			return;
 		}
 
 		await this.createParentDirectories(normalizePath(path));
 		await this.vault.createBinary(normalizePath(path), newContent);
-		console.log("after create2");
-		await sleep(1000);
 	}
 
 	public async write(
diff --git a/plugin/src/sync-operations/syncer.ts b/plugin/src/sync-operations/syncer.ts
index 2550f055..f5f48832 100644
--- a/plugin/src/sync-operations/syncer.ts
+++ b/plugin/src/sync-operations/syncer.ts
@@ -215,6 +215,21 @@ export class Syncer {
 			SyncType.CREATE,
 			SyncSource.PUSH,
 			async () => {
+				if (
+					(await this.operations.getFileSize(relativePath)) /
+						1024 /
+						1024 >
+					this.database.getSettings().maxFileSizeMB
+				) {
+					this.history.addHistoryEntry({
+						status: SyncStatus.ERROR,
+						relativePath,
+						message: `File size exceeds the maximum file size limit of ${this.database.getSettings().maxFileSizeMB}MB`,
+						type: SyncType.CREATE
+					});
+					return;
+				}
+
 				const contentBytes =
 					optimisations?.contentBytes ??
 					(await this.operations.read(relativePath));
@@ -301,10 +316,25 @@ export class Syncer {
 			SyncType.UPDATE,
 			SyncSource.PUSH,
 			async () => {
+				if (
+					(await this.operations.getFileSize(relativePath)) /
+						1024 /
+						1024 >
+					this.database.getSettings().maxFileSizeMB
+				) {
+					this.history.addHistoryEntry({
+						status: SyncStatus.ERROR,
+						relativePath,
+						message: `File size exceeds the maximum file size limit of ${this.database.getSettings().maxFileSizeMB}MB`,
+						type: SyncType.CREATE
+					});
+					return;
+				}
+
 				const localMetadata = this.database.getDocument(
 					oldPath ?? relativePath
 				);
-				console.log(JSON.stringify(localMetadata));
+
 				if (!localMetadata) {
 					if (this.database.getDocument(relativePath)) {
 						this.history.addHistoryEntry({
@@ -320,21 +350,13 @@ export class Syncer {
 						`Document metadata not found for ${relativePath}. This implies a corrupt local database. Consider resetting the plugin's sync history.`
 					);
 				}
-				await sleep(1000);
-				console.log("about to read", relativePath);
-				await sleep(1000);
 
 				const contentBytes =
 					optimisations?.contentBytes ??
 					(await this.operations.read(relativePath));
 
-				console.log("has read", relativePath);
-				await sleep(1000);
-
 				let contentHash =
 					optimisations?.contentHash ?? hash(contentBytes);
-				console.log("has hashed", relativePath);
-				await sleep(1000);
 
 				if (
 					localMetadata.hash === contentHash &&
@@ -349,9 +371,6 @@ export class Syncer {
 					return;
 				}
 
-				console.log("about to send", relativePath);
-				await sleep(1000);
-
 				const response = await this.syncService.put({
 					documentId: localMetadata.documentId,
 					parentVersionId: localMetadata.parentVersionId,
@@ -360,9 +379,6 @@ export class Syncer {
 					createdDate: updateTime
 				});
 
-				console.log("has sent", relativePath);
-				await sleep(1000);
-
 				this.history.addHistoryEntry({
 					status: SyncStatus.SUCCESS,
 					source: SyncSource.PUSH,
@@ -403,22 +419,16 @@ export class Syncer {
 					}
 
 					if (response.type === "MergingUpdate") {
-						console.log(
-							"about to deserialize",
-							response.contentBase64
-						);
 						const responseBytes = deserialize(
 							response.contentBase64
 						);
-						console.log("has deserialized", response.relativePath);
 						contentHash = hash(responseBytes);
-						console.log("about to write", response.relativePath);
+
 						await this.operations.write(
 							response.relativePath,
 							contentBytes,
 							responseBytes
 						);
-						console.log("has written", response.relativePath);
 
 						this.history.addHistoryEntry({
 							status: SyncStatus.SUCCESS,
diff --git a/plugin/src/views/settings-tab.ts b/plugin/src/views/settings-tab.ts
index 535746c6..a629623d 100644
--- a/plugin/src/views/settings-tab.ts
+++ b/plugin/src/views/settings-tab.ts
@@ -252,6 +252,22 @@ export class SyncSettingsTab extends PluginSettingTab {
 					)
 			);
 
+		new Setting(containerEl)
+			.setName("Maximum file size to be uploaded (MB)")
+			.setDesc(
+				"Set the maximum file size that can be uploaded to the server. Files larger than this size will be ignored."
+			)
+			.addSlider((slider) =>
+				slider
+					.setLimits(0, 32, 1)
+					.setDynamicTooltip()
+					.setInstant(false)
+					.setValue(this.database.getSettings().maxFileSizeMB)
+					.onChange(async (value) =>
+						this.database.setSetting("maxFileSizeMB", value)
+					)
+			);
+
 		new Setting(containerEl)
 			.setName("Enable sync")
 			.setDesc(

From d8098740b3b2b4c2d40cff4a73973eadde093bf0 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Wed, 8 Jan 2025 22:55:27 +0000
Subject: [PATCH 170/761] Lint

---
 plugin/src/file-operations/file-operations.ts          | 2 +-
 plugin/src/file-operations/obsidian-file-operations.ts | 3 ++-
 plugin/src/services/sync-service.ts                    | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/plugin/src/file-operations/file-operations.ts b/plugin/src/file-operations/file-operations.ts
index 57d51877..aaeee87e 100644
--- a/plugin/src/file-operations/file-operations.ts
+++ b/plugin/src/file-operations/file-operations.ts
@@ -5,7 +5,7 @@ export interface FileOperations {
 
 	read: (path: RelativePath) => Promise<Uint8Array>;
 
-	getFileSize(path: RelativePath): Promise<number>;
+	getFileSize: (path: RelativePath) => Promise<number>;
 
 	getModificationTime: (path: RelativePath) => Promise<Date>;
 
diff --git a/plugin/src/file-operations/obsidian-file-operations.ts b/plugin/src/file-operations/obsidian-file-operations.ts
index f92f3b24..926229cc 100644
--- a/plugin/src/file-operations/obsidian-file-operations.ts
+++ b/plugin/src/file-operations/obsidian-file-operations.ts
@@ -1,4 +1,5 @@
-import { TFile, Vault } from "obsidian";
+import type { Vault } from "obsidian";
+import { TFile } from "obsidian";
 import { normalizePath } from "obsidian";
 import type { FileOperations } from "./file-operations";
 import type { RelativePath } from "src/database/document-metadata";
diff --git a/plugin/src/services/sync-service.ts b/plugin/src/services/sync-service.ts
index 088e174b..56170b25 100644
--- a/plugin/src/services/sync-service.ts
+++ b/plugin/src/services/sync-service.ts
@@ -10,7 +10,6 @@ import type {
 } from "src/database/document-metadata";
 import { Logger } from "src/tracing/logger";
 import { retriedFetch } from "src/utils/retried-fetch";
-import { serialize } from "src/utils/serialize";
 
 export interface CheckConnectionResult {
 	isSuccessful: boolean;
@@ -87,6 +86,7 @@ export class SyncService {
 						authorization: `Bearer ${this.database.getSettings().token}`
 					}
 				},
+				// eslint-disable-next-line
 				body: formData as any // FormData is not supported by openapi-fetch
 			}
 		);
@@ -137,6 +137,7 @@ export class SyncService {
 						authorization: `Bearer ${this.database.getSettings().token}`
 					}
 				},
+				// eslint-disable-next-line
 				body: formData as any // FormData is not supported by openapi-fetch
 			}
 		);

From bdbfe2d33c09a081e2b253e70a33fba3d19bc856 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Wed, 8 Jan 2025 22:55:40 +0000
Subject: [PATCH 171/761] Bump versions to 0.0.24

---
 backend/Cargo.lock       | 8 ++++----
 backend/Cargo.toml       | 2 +-
 manifest.json            | 2 +-
 plugin/manifest.json     | 2 +-
 plugin/package-lock.json | 6 +++---
 plugin/package.json      | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 58ee6392..d84eb40d 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1773,7 +1773,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile"
-version = "0.0.23"
+version = "0.0.24"
 dependencies = [
  "insta",
  "pretty_assertions",
@@ -1783,7 +1783,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile-fuzz"
-version = "0.0.23"
+version = "0.0.24"
 dependencies = [
  "libfuzzer-sys",
  "reconcile",
@@ -2415,7 +2415,7 @@ dependencies = [
 
 [[package]]
 name = "sync_lib"
-version = "0.0.23"
+version = "0.0.24"
 dependencies = [
  "base64 0.22.1",
  "console_error_panic_hook",
@@ -2428,7 +2428,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.0.23"
+version = "0.0.24"
 dependencies = [
  "aide",
  "aide-axum-typed-multipart",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index d9071406..9129cfba 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -13,7 +13,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.0.23"
+version = "0.0.24"
 
 [workspace.dependencies]  
 serde = { version = "1.0.214", default-features = false, features = ["derive"] }
diff --git a/manifest.json b/manifest.json
index 352d8d6b..040abf0c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.0.23",
+	"version": "0.0.24",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/plugin/manifest.json b/plugin/manifest.json
index 352d8d6b..040abf0c 100644
--- a/plugin/manifest.json
+++ b/plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.0.23",
+	"version": "0.0.24",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/plugin/package-lock.json b/plugin/package-lock.json
index 0067338a..77957b29 100644
--- a/plugin/package-lock.json
+++ b/plugin/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.0.23",
+	"version": "0.0.24",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.0.23",
+			"version": "0.0.24",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
@@ -46,7 +46,7 @@
 		},
 		"../backend/sync_lib/pkg": {
 			"name": "sync_lib",
-			"version": "0.0.23",
+			"version": "0.0.24",
 			"dev": true,
 			"license": "MIT"
 		},
diff --git a/plugin/package.json b/plugin/package.json
index 72b3cf38..49317f76 100644
--- a/plugin/package.json
+++ b/plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.0.23",
+	"version": "0.0.24",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {

From 9a321121afc214d48240f2401206afbbb1c3d9b1 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 9 Jan 2025 21:50:24 +0000
Subject: [PATCH 172/761] Fix file writing

---
 .../obsidian-file-operations.ts               | 38 ++++++++-----------
 1 file changed, 15 insertions(+), 23 deletions(-)

diff --git a/plugin/src/file-operations/obsidian-file-operations.ts b/plugin/src/file-operations/obsidian-file-operations.ts
index 926229cc..23fcd195 100644
--- a/plugin/src/file-operations/obsidian-file-operations.ts
+++ b/plugin/src/file-operations/obsidian-file-operations.ts
@@ -15,7 +15,7 @@ export class ObsidianFileOperations implements FileOperations {
 
 	public async read(path: RelativePath): Promise<Uint8Array> {
 		const result = new Uint8Array(
-			await this.vault.readBinary(this.getAbstractFile(path))
+			await this.vault.adapter.readBinary(normalizePath(path))
 		);
 
 		return result;
@@ -49,7 +49,7 @@ export class ObsidianFileOperations implements FileOperations {
 		}
 
 		await this.createParentDirectories(normalizePath(path));
-		await this.vault.createBinary(normalizePath(path), newContent);
+		await this.vault.adapter.writeBinary(normalizePath(path), newContent);
 	}
 
 	public async write(
@@ -63,21 +63,26 @@ export class ObsidianFileOperations implements FileOperations {
 		}
 
 		if (isBinary(expectedContent)) {
-			await this.vault.createBinary(normalizePath(path), newContent);
+			await this.vault.adapter.writeBinary(
+				normalizePath(path),
+				newContent
+			);
 			return newContent;
 		}
 
 		const expetedText = new TextDecoder().decode(expectedContent);
 		const newText = new TextDecoder().decode(newContent);
 
-		const file = this.getAbstractFile(path);
-		const resultText = await this.vault.process(file, (currentText) => {
-			if (currentText !== expetedText) {
-				return mergeText(expetedText, currentText, newText);
-			}
+		const resultText = await this.vault.adapter.process(
+			normalizePath(path),
+			(currentText) => {
+				if (currentText !== expetedText) {
+					return mergeText(expetedText, currentText, newText);
+				}
 
-			return newText;
-		});
+				return newText;
+			}
+		);
 		return new TextEncoder().encode(resultText);
 	}
 
@@ -113,17 +118,4 @@ export class ObsidianFileOperations implements FileOperations {
 			}
 		}
 	}
-
-	private getAbstractFile(path: RelativePath): TFile {
-		const file = this.vault.getAbstractFileByPath(path);
-		if (!file) {
-			throw new Error(`File not found: ${path}`);
-		}
-
-		if (file instanceof TFile) {
-			return file;
-		}
-
-		throw new Error(`Not a file: ${path}`);
-	}
 }

From cc658b8ca746497ce3e8f68cb11dd773a3296d9f Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 9 Jan 2025 21:50:34 +0000
Subject: [PATCH 173/761] Bump versions to 0.0.25

---
 backend/Cargo.lock       | 8 ++++----
 backend/Cargo.toml       | 2 +-
 manifest.json            | 2 +-
 plugin/manifest.json     | 2 +-
 plugin/package-lock.json | 6 +++---
 plugin/package.json      | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index d84eb40d..0a39a2d3 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1773,7 +1773,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile"
-version = "0.0.24"
+version = "0.0.25"
 dependencies = [
  "insta",
  "pretty_assertions",
@@ -1783,7 +1783,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile-fuzz"
-version = "0.0.24"
+version = "0.0.25"
 dependencies = [
  "libfuzzer-sys",
  "reconcile",
@@ -2415,7 +2415,7 @@ dependencies = [
 
 [[package]]
 name = "sync_lib"
-version = "0.0.24"
+version = "0.0.25"
 dependencies = [
  "base64 0.22.1",
  "console_error_panic_hook",
@@ -2428,7 +2428,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.0.24"
+version = "0.0.25"
 dependencies = [
  "aide",
  "aide-axum-typed-multipart",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 9129cfba..3552b391 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -13,7 +13,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.0.24"
+version = "0.0.25"
 
 [workspace.dependencies]  
 serde = { version = "1.0.214", default-features = false, features = ["derive"] }
diff --git a/manifest.json b/manifest.json
index 040abf0c..a442dee8 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.0.24",
+	"version": "0.0.25",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/plugin/manifest.json b/plugin/manifest.json
index 040abf0c..a442dee8 100644
--- a/plugin/manifest.json
+++ b/plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.0.24",
+	"version": "0.0.25",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/plugin/package-lock.json b/plugin/package-lock.json
index 77957b29..57269c27 100644
--- a/plugin/package-lock.json
+++ b/plugin/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.0.24",
+	"version": "0.0.25",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.0.24",
+			"version": "0.0.25",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
@@ -46,7 +46,7 @@
 		},
 		"../backend/sync_lib/pkg": {
 			"name": "sync_lib",
-			"version": "0.0.24",
+			"version": "0.0.25",
 			"dev": true,
 			"license": "MIT"
 		},
diff --git a/plugin/package.json b/plugin/package.json
index 49317f76..e18ecd0e 100644
--- a/plugin/package.json
+++ b/plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.0.24",
+	"version": "0.0.25",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {

From 47a34ed7e2d9b2a1c464cef693670ab8886bb7d7 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 9 Jan 2025 21:53:48 +0000
Subject: [PATCH 174/761] Format

---
 plugin/src/file-operations/obsidian-file-operations.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugin/src/file-operations/obsidian-file-operations.ts b/plugin/src/file-operations/obsidian-file-operations.ts
index 23fcd195..3a45d36f 100644
--- a/plugin/src/file-operations/obsidian-file-operations.ts
+++ b/plugin/src/file-operations/obsidian-file-operations.ts
@@ -1,5 +1,4 @@
 import type { Vault } from "obsidian";
-import { TFile } from "obsidian";
 import { normalizePath } from "obsidian";
 import type { FileOperations } from "./file-operations";
 import type { RelativePath } from "src/database/document-metadata";

From a9227fa5bbf5028176d6b9a0acd6b37a9c5c5f47 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 11 Jan 2025 10:53:05 +0000
Subject: [PATCH 175/761] Merge based on file type

---
 backend/sync_lib/src/lib.rs                   | 30 +++++++++++++++----
 backend/sync_lib/tests/web.rs                 | 20 +++++++++++--
 .../sync_server/src/server/create_document.rs | 16 ++++++----
 .../sync_server/src/server/update_document.rs |  9 ++++--
 4 files changed, 60 insertions(+), 15 deletions(-)

diff --git a/backend/sync_lib/src/lib.rs b/backend/sync_lib/src/lib.rs
index 164939ac..b8424e08 100644
--- a/backend/sync_lib/src/lib.rs
+++ b/backend/sync_lib/src/lib.rs
@@ -19,11 +19,17 @@ pub mod errors;
 /// Encode binary data for easy transport over HTTP. Inverse of
 /// `base64_to_bytes`.
 #[wasm_bindgen(js_name = bytesToBase64)]
-pub fn bytes_to_base64(input: &[u8]) -> String { STANDARD.encode(input) }
+pub fn bytes_to_base64(input: &[u8]) -> String {
+    set_panic_hook();
+
+    STANDARD.encode(input)
+}
 
 /// Inverse of `bytes_to_base64`.
 #[wasm_bindgen(js_name = base64ToBytes)]
 pub fn base64_to_bytes(input: &str) -> Result<Vec<u8>, SyncLibError> {
+    set_panic_hook();
+
     STANDARD.decode(input).map_err(SyncLibError::from)
 }
 
@@ -32,6 +38,8 @@ pub fn base64_to_bytes(input: &str) -> Result<Vec<u8>, SyncLibError> {
 /// documents is binary.
 #[wasm_bindgen]
 pub fn merge(parent: &[u8], left: &[u8], right: &[u8]) -> Vec<u8> {
+    set_panic_hook();
+
     if is_binary(parent) || is_binary(left) || is_binary(right) {
         right.to_vec()
     } else {
@@ -47,6 +55,8 @@ pub fn merge(parent: &[u8], left: &[u8], right: &[u8]) -> Vec<u8> {
 /// WASM wrapper around `reconcile::reconcile` for text merging.
 #[wasm_bindgen(js_name = mergeText)]
 pub fn merge_text(parent: &str, left: &str, right: &str) -> String {
+    set_panic_hook();
+
     reconcile::reconcile(parent, left, right)
 }
 
@@ -54,6 +64,8 @@ pub fn merge_text(parent: &str, left: &str, right: &str) -> String {
 /// content.
 #[wasm_bindgen(js_name = isBinary)]
 pub fn is_binary(data: &[u8]) -> bool {
+    set_panic_hook();
+
     if data.iter().any(|&b| b == 0) {
         // Even though the NUL character is valid in UTF-8, it's highly suspicious in
         // human-readable text.
@@ -63,10 +75,18 @@ pub fn is_binary(data: &[u8]) -> bool {
     std::str::from_utf8(data).is_err()
 }
 
-/// Set up panic hook for better error messages in the browser console.
-#[cfg(feature = "console_error_panic_hook")]
-#[wasm_bindgen(js_name = setPanicHook)]
-pub fn set_panic_hook() {
+/// We don't want to supporte merging structured data like JSON, YAML, etc.
+#[wasm_bindgen(js_name = isFileTypeMergable)]
+pub fn is_file_type_mergable(path_or_file_name: &str) -> bool {
+    set_panic_hook();
+
+    let file_extension = path_or_file_name.split('.').last().unwrap_or_default();
+
+    matches!(file_extension.to_lowercase().as_str(), "md" | "txt")
+}
+
+fn set_panic_hook() {
     // https://github.com/rustwasm/console_error_panic_hook#readme
+    #[cfg(feature = "console_error_panic_hook")]
     console_error_panic_hook::set_once();
 }
diff --git a/backend/sync_lib/tests/web.rs b/backend/sync_lib/tests/web.rs
index ceae695b..ffea18d9 100644
--- a/backend/sync_lib/tests/web.rs
+++ b/backend/sync_lib/tests/web.rs
@@ -1,5 +1,3 @@
-//! Test suite for the Web and headless browsers.
-
 use insta::assert_debug_snapshot;
 use sync_lib::*;
 use wasm_bindgen_test::*;
@@ -44,3 +42,21 @@ fn test_is_binary() {
     assert!(is_binary(&[0, 12]));
     assert!(!is_binary(b"hello"));
 }
+
+#[wasm_bindgen_test(unsupported = test)]
+fn test_is_binary_empty() {
+    assert!(!is_binary(b""));
+}
+
+#[wasm_bindgen_test(unsupported = test)]
+fn test_is_file_type_mergable() {
+    assert!(is_file_type_mergable(".md"));
+    assert!(is_file_type_mergable("hi.md"));
+    assert!(is_file_type_mergable("my/path/to/my/document.md"));
+    assert!(is_file_type_mergable("hi.MD"));
+    assert!(is_file_type_mergable("my/path/to/my/DOCUMENT.MD"));
+
+    assert!(!is_file_type_mergable(".json"));
+    assert!(!is_file_type_mergable("HELLO.JSON"));
+    assert!(!is_file_type_mergable("my/config.yml"));
+}
diff --git a/backend/sync_server/src/server/create_document.rs b/backend/sync_server/src/server/create_document.rs
index 9dda4bcd..cfaeaa0e 100644
--- a/backend/sync_server/src/server/create_document.rs
+++ b/backend/sync_server/src/server/create_document.rs
@@ -10,7 +10,7 @@ use chrono::{DateTime, Utc};
 use log::info;
 use schemars::JsonSchema;
 use serde::Deserialize;
-use sync_lib::{base64_to_bytes, merge};
+use sync_lib::{base64_to_bytes, is_file_type_mergable, merge};
 
 use super::{
     app_state::AppState,
@@ -127,11 +127,15 @@ async fn internal_create_document(
             )));
         }
 
-        let merged_content = merge(
-            &[], // the empty string is the first common parent of the two documents,
-            &existing_version.content,
-            &content,
-        );
+        let merged_content = if is_file_type_mergable(&sanitized_relative_path) {
+            merge(
+                &[], // the empty string is the first common parent of the two documents,
+                &existing_version.content,
+                &content,
+            )
+        } else {
+            content
+        };
 
         let new_version = StoredDocumentVersion {
             vault_id,
diff --git a/backend/sync_server/src/server/update_document.rs b/backend/sync_server/src/server/update_document.rs
index 073744d4..7b1d319e 100644
--- a/backend/sync_server/src/server/update_document.rs
+++ b/backend/sync_server/src/server/update_document.rs
@@ -10,7 +10,7 @@ use chrono::{DateTime, Utc};
 use log::info;
 use schemars::JsonSchema;
 use serde::Deserialize;
-use sync_lib::{base64_to_bytes, merge};
+use sync_lib::{base64_to_bytes, is_file_type_mergable, merge};
 
 use super::{
     app_state::AppState,
@@ -155,7 +155,12 @@ async fn internal_update_document(
         )));
     }
 
-    let merged_content = merge(&parent_document.content, &latest_version.content, &content);
+    let merged_content = if is_file_type_mergable(&sanitized_relative_path) {
+        merge(&parent_document.content, &latest_version.content, &content)
+    } else {
+        content.clone()
+    };
+
     let is_different_from_request_content = merged_content != content;
 
     // We can only update the relative path if we're the first one to do so

From eb6f7d5a58a6a781265f7d5184f41cbf2e4ea82e Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 11 Jan 2025 10:53:15 +0000
Subject: [PATCH 176/761] Reorder initialization

---
 plugin/src/vault-link-plugin.ts | 44 ++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 23 deletions(-)

diff --git a/plugin/src/vault-link-plugin.ts b/plugin/src/vault-link-plugin.ts
index b524f1c2..ef1b81e0 100644
--- a/plugin/src/vault-link-plugin.ts
+++ b/plugin/src/vault-link-plugin.ts
@@ -2,7 +2,7 @@ import type { WorkspaceLeaf } from "obsidian";
 import { Plugin } from "obsidian";
 import "./styles.scss";
 import "../manifest.json";
-import init, { setPanicHook } from "sync_lib";
+import init from "sync_lib";
 import wasmBin from "sync_lib/sync_lib_bg.wasm";
 import { SyncSettingsTab } from "./views/settings-tab";
 import { HistoryView } from "./views/history-view";
@@ -32,8 +32,6 @@ export default class VaultLinkPlugin extends Plugin {
 			(wasmBin as any).default // it is loaded as a base64 string by webpack
 		);
 
-		setPanicHook();
-
 		const database = new Database(
 			await this.loadData(),
 			this.saveData.bind(this)
@@ -67,6 +65,26 @@ export default class VaultLinkPlugin extends Plugin {
 
 		new StatusBar(database, this, this.history, syncer);
 
+		this.registerView(
+			HistoryView.TYPE,
+			(leaf) => new HistoryView(leaf, database, this.history)
+		);
+		this.registerView(
+			LogsView.TYPE,
+			(leaf) => new LogsView(this, database, leaf)
+		);
+
+		this.addRibbonIcon(
+			HistoryView.ICON,
+			"Open VaultLink events",
+			async (_: MouseEvent) => this.activateView(HistoryView.TYPE)
+		);
+		this.addRibbonIcon(
+			LogsView.ICON,
+			"Open VaultLink logs",
+			async (_: MouseEvent) => this.activateView(LogsView.TYPE)
+		);
+
 		const eventHandler = new ObsidianFileEventHandler(syncer);
 
 		this.app.workspace.onLayoutReady(async () => {
@@ -119,26 +137,6 @@ export default class VaultLinkPlugin extends Plugin {
 			}
 		});
 
-		this.registerView(
-			HistoryView.TYPE,
-			(leaf) => new HistoryView(leaf, database, this.history)
-		);
-		this.registerView(
-			LogsView.TYPE,
-			(leaf) => new LogsView(this, database, leaf)
-		);
-
-		this.addRibbonIcon(
-			HistoryView.ICON,
-			"Open VaultLink events",
-			async (_: MouseEvent) => this.activateView(HistoryView.TYPE)
-		);
-		this.addRibbonIcon(
-			LogsView.ICON,
-			"Open VaultLink logs",
-			async (_: MouseEvent) => this.activateView(LogsView.TYPE)
-		);
-
 		Logger.getInstance().info("Plugin loaded");
 	}
 

From 49cced2de62176c2ba5cb8bb64e8984959073b3c Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 11 Jan 2025 10:53:50 +0000
Subject: [PATCH 177/761] Refactor, normalize reads, and add
 isFileEligibleForSync

---
 plugin/src/file-operations/file-operations.ts |  2 +
 .../obsidian-file-operations.ts               | 78 ++++++++++++++-----
 2 files changed, 61 insertions(+), 19 deletions(-)

diff --git a/plugin/src/file-operations/file-operations.ts b/plugin/src/file-operations/file-operations.ts
index aaeee87e..66327994 100644
--- a/plugin/src/file-operations/file-operations.ts
+++ b/plugin/src/file-operations/file-operations.ts
@@ -25,4 +25,6 @@ export interface FileOperations {
 	remove: (path: RelativePath) => Promise<void>;
 
 	move: (oldPath: RelativePath, newPath: RelativePath) => Promise<void>;
+
+	isFileEligibleForSync: (path: RelativePath) => boolean;
 }
diff --git a/plugin/src/file-operations/obsidian-file-operations.ts b/plugin/src/file-operations/obsidian-file-operations.ts
index 3a45d36f..128d5ea7 100644
--- a/plugin/src/file-operations/obsidian-file-operations.ts
+++ b/plugin/src/file-operations/obsidian-file-operations.ts
@@ -1,48 +1,53 @@
-import type { Vault } from "obsidian";
+import type { Stat, Vault } from "obsidian";
 import { normalizePath } from "obsidian";
 import type { FileOperations } from "./file-operations";
 import type { RelativePath } from "src/database/document-metadata";
-import { isBinary, mergeText } from "sync_lib";
+import { isFileTypeMergable, mergeText } from "sync_lib";
+import { Platform } from "obsidian";
+import { Logger } from "src/tracing/logger";
 
 export class ObsidianFileOperations implements FileOperations {
 	public constructor(private readonly vault: Vault) {}
 
 	public async listAllFiles(): Promise<RelativePath[]> {
 		const files = this.vault.getFiles();
+		Logger.getInstance().debug(`Listing all files, found ${files.length}`);
 		return files.map((file) => file.path);
 	}
 
 	public async read(path: RelativePath): Promise<Uint8Array> {
-		const result = new Uint8Array(
+		Logger.getInstance().debug(`Reading file: ${path}`);
+		if (isFileTypeMergable(path)) {
+			let text = await this.vault.adapter.read(normalizePath(path));
+
+			text = text.replace(/\r\n/g, "\n");
+
+			return new TextEncoder().encode(text);
+		}
+		return new Uint8Array(
 			await this.vault.adapter.readBinary(normalizePath(path))
 		);
-
-		return result;
 	}
 
 	public async getFileSize(path: RelativePath): Promise<number> {
-		const file = await this.vault.adapter.stat(normalizePath(path));
-		if (!file) {
-			throw new Error(`File not found: ${path}`);
-		}
-
-		return file.size;
+		Logger.getInstance().debug(`Getting file size: ${path}`);
+		return (await this.statFile(path)).size;
 	}
 
 	public async getModificationTime(path: RelativePath): Promise<Date> {
-		const file = await this.vault.adapter.stat(normalizePath(path));
-		if (!file) {
-			throw new Error(`File not found: ${path}`);
-		}
-
-		return new Date(file.mtime);
+		Logger.getInstance().debug(`Getting modification time: ${path}`);
+		return new Date((await this.statFile(path)).mtime);
 	}
 
 	public async create(
 		path: RelativePath,
 		newContent: Uint8Array
 	): Promise<void> {
+		Logger.getInstance().debug(`Creating file: ${path}`);
 		if (await this.vault.adapter.exists(normalizePath(path))) {
+			Logger.getInstance().debug(
+				`Didn't expect ${path} to exist, when trying to create it, merging instead`
+			);
 			await this.write(path, new Uint8Array(0), newContent);
 			return;
 		}
@@ -56,12 +61,18 @@ export class ObsidianFileOperations implements FileOperations {
 		expectedContent: Uint8Array,
 		newContent: Uint8Array
 	): Promise<Uint8Array> {
+		Logger.getInstance().debug(`Writing file: ${path}`);
 		if (!(await this.vault.adapter.exists(normalizePath(path)))) {
-			// The caller assumed the file exists, but it doesn't, let's not recreate it
+			Logger.getInstance().debug(
+				`The caller assumed ${path} exists, but it no longer, so we wont recreate it`
+			);
 			return new Uint8Array(0);
 		}
 
-		if (isBinary(expectedContent)) {
+		if (isFileTypeMergable(path)) {
+			Logger.getInstance().debug(
+				`The expected content is not mergable, so we won't perform a 3-way merge, just overwrite it`
+			);
 			await this.vault.adapter.writeBinary(
 				normalizePath(path),
 				newContent
@@ -75,10 +86,19 @@ export class ObsidianFileOperations implements FileOperations {
 		const resultText = await this.vault.adapter.process(
 			normalizePath(path),
 			(currentText) => {
+				currentText = currentText.replace(/\r\n/g, "\n");
 				if (currentText !== expetedText) {
+					Logger.getInstance().debug(
+						`Performing a 3-way merge for ${path} with the expected content`
+					);
+
 					return mergeText(expetedText, currentText, newText);
 				}
 
+				Logger.getInstance().debug(
+					`The current content of ${path} is the same as the expected content, so we will just write the new content`
+				);
+
 				return newText;
 			}
 		);
@@ -86,6 +106,7 @@ export class ObsidianFileOperations implements FileOperations {
 	}
 
 	public async remove(path: RelativePath): Promise<void> {
+		Logger.getInstance().debug(`Removing file: ${path}`);
 		if (await this.vault.adapter.exists(normalizePath(path))) {
 			return this.vault.adapter.remove(normalizePath(path));
 		}
@@ -95,6 +116,7 @@ export class ObsidianFileOperations implements FileOperations {
 		oldPath: RelativePath,
 		newPath: RelativePath
 	): Promise<void> {
+		Logger.getInstance().debug(`Moving file: ${oldPath} -> ${newPath}`);
 		if (oldPath === newPath) {
 			return;
 		}
@@ -105,6 +127,24 @@ export class ObsidianFileOperations implements FileOperations {
 		);
 	}
 
+	public isFileEligibleForSync(path: RelativePath): boolean {
+		if (Platform.isDesktopApp) {
+			return true;
+		}
+
+		return isFileTypeMergable(path);
+	}
+
+	private async statFile(path: string): Promise<Stat> {
+		const file = await this.vault.adapter.stat(normalizePath(path));
+
+		if (!file) {
+			throw new Error(`File not found: ${path}`);
+		}
+
+		return file;
+	}
+
 	private async createParentDirectories(path: string): Promise<void> {
 		const components = path.split("/");
 		if (components.length === 1) {

From 09ab15fb0f92f36694ffdc274d7be57be0ed68c9 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 11 Jan 2025 10:53:58 +0000
Subject: [PATCH 178/761] Only sync eligible files

---
 plugin/src/sync-operations/syncer.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/plugin/src/sync-operations/syncer.ts b/plugin/src/sync-operations/syncer.ts
index f5f48832..e23e6920 100644
--- a/plugin/src/sync-operations/syncer.ts
+++ b/plugin/src/sync-operations/syncer.ts
@@ -640,6 +640,12 @@ export class Syncer {
 			);
 			return;
 		}
+		if (!this.operations.isFileEligibleForSync(relativePath)) {
+			Logger.getInstance().info(
+				`File ${relativePath} is not eligible for syncing`
+			);
+			return;
+		}
 		Logger.getInstance().debug(`Syncing ${relativePath}`);
 
 		await waitForDocumentLock(relativePath);

From b567ae37dfc4ccfb0e4027964e733dd0115c6d9a Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 11 Jan 2025 11:09:59 +0000
Subject: [PATCH 179/761] Add hyperlist

---
 plugin/package-lock.json | 8 ++++++++
 plugin/package.json      | 1 +
 2 files changed, 9 insertions(+)

diff --git a/plugin/package-lock.json b/plugin/package-lock.json
index 57269c27..0ebc2521 100644
--- a/plugin/package-lock.json
+++ b/plugin/package-lock.json
@@ -24,6 +24,7 @@
 				"fetch-retry": "^6.0.0",
 				"file-loader": "^6.2.0",
 				"fs-extra": "^11.2.0",
+				"hyperlist": "^1.0.0",
 				"jest": "^29.7.0",
 				"mini-css-extract-plugin": "^2.9.2",
 				"obsidian": "1.7.2",
@@ -4521,6 +4522,13 @@
 				"node": ">=10.17.0"
 			}
 		},
+		"node_modules/hyperlist": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/hyperlist/-/hyperlist-1.0.0.tgz",
+			"integrity": "sha512-1qAjO29EJW/mPyqY+9wFjruD2YWur1dPsPYmt9RvMX6P+8Cr2UmT75MCWjjK+1/4Jxc3sm/G3Kr8DzGgEDRG+Q==",
+			"dev": true,
+			"license": "MIT"
+		},
 		"node_modules/icss-utils": {
 			"version": "5.1.0",
 			"resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
diff --git a/plugin/package.json b/plugin/package.json
index e18ecd0e..e6cfb083 100644
--- a/plugin/package.json
+++ b/plugin/package.json
@@ -35,6 +35,7 @@
 		"fetch-retry": "^6.0.0",
 		"file-loader": "^6.2.0",
 		"fs-extra": "^11.2.0",
+		"hyperlist": "^1.0.0",
 		"jest": "^29.7.0",
 		"mini-css-extract-plugin": "^2.9.2",
 		"obsidian": "1.7.2",

From 2acd02b67e270ecfb3553a47b88598d984620c4e Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 11 Jan 2025 11:10:12 +0000
Subject: [PATCH 180/761] Bump versions to 0.0.26

---
 backend/Cargo.lock       | 8 ++++----
 backend/Cargo.toml       | 2 +-
 manifest.json            | 2 +-
 plugin/manifest.json     | 2 +-
 plugin/package-lock.json | 6 +++---
 plugin/package.json      | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 0a39a2d3..38a2f7e9 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1773,7 +1773,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile"
-version = "0.0.25"
+version = "0.0.26"
 dependencies = [
  "insta",
  "pretty_assertions",
@@ -1783,7 +1783,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile-fuzz"
-version = "0.0.25"
+version = "0.0.26"
 dependencies = [
  "libfuzzer-sys",
  "reconcile",
@@ -2415,7 +2415,7 @@ dependencies = [
 
 [[package]]
 name = "sync_lib"
-version = "0.0.25"
+version = "0.0.26"
 dependencies = [
  "base64 0.22.1",
  "console_error_panic_hook",
@@ -2428,7 +2428,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.0.25"
+version = "0.0.26"
 dependencies = [
  "aide",
  "aide-axum-typed-multipart",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 3552b391..b4a38e67 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -13,7 +13,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.0.25"
+version = "0.0.26"
 
 [workspace.dependencies]  
 serde = { version = "1.0.214", default-features = false, features = ["derive"] }
diff --git a/manifest.json b/manifest.json
index a442dee8..9614329b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.0.25",
+	"version": "0.0.26",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/plugin/manifest.json b/plugin/manifest.json
index a442dee8..9614329b 100644
--- a/plugin/manifest.json
+++ b/plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.0.25",
+	"version": "0.0.26",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/plugin/package-lock.json b/plugin/package-lock.json
index 0ebc2521..9fdd81ce 100644
--- a/plugin/package-lock.json
+++ b/plugin/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.0.25",
+	"version": "0.0.26",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.0.25",
+			"version": "0.0.26",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
@@ -47,7 +47,7 @@
 		},
 		"../backend/sync_lib/pkg": {
 			"name": "sync_lib",
-			"version": "0.0.25",
+			"version": "0.0.26",
 			"dev": true,
 			"license": "MIT"
 		},
diff --git a/plugin/package.json b/plugin/package.json
index e6cfb083..19d268a9 100644
--- a/plugin/package.json
+++ b/plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.0.25",
+	"version": "0.0.26",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {

From e6ffe8cbdc14da6c32c8d97935e799096c66f75e Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 12 Jan 2025 11:34:40 +0000
Subject: [PATCH 181/761] Fix file moves

---
 plugin/src/file-operations/obsidian-file-operations.ts | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/plugin/src/file-operations/obsidian-file-operations.ts b/plugin/src/file-operations/obsidian-file-operations.ts
index 128d5ea7..41a2df00 100644
--- a/plugin/src/file-operations/obsidian-file-operations.ts
+++ b/plugin/src/file-operations/obsidian-file-operations.ts
@@ -116,15 +116,17 @@ export class ObsidianFileOperations implements FileOperations {
 		oldPath: RelativePath,
 		newPath: RelativePath
 	): Promise<void> {
+		oldPath = normalizePath(oldPath);
+		newPath = normalizePath(newPath);
+
 		Logger.getInstance().debug(`Moving file: ${oldPath} -> ${newPath}`);
+
 		if (oldPath === newPath) {
 			return;
 		}
 
-		await this.vault.adapter.rename(
-			normalizePath(oldPath),
-			normalizePath(newPath)
-		);
+		await this.createParentDirectories(newPath);
+		await this.vault.adapter.rename(oldPath, newPath);
 	}
 
 	public isFileEligibleForSync(path: RelativePath): boolean {

From eee78fd1a7e6fb5604d77e25058bbf779ec72dfa Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 12 Jan 2025 11:34:45 +0000
Subject: [PATCH 182/761] Fix CI

---
 backend/sync_lib/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/sync_lib/src/lib.rs b/backend/sync_lib/src/lib.rs
index b8424e08..e38f60b3 100644
--- a/backend/sync_lib/src/lib.rs
+++ b/backend/sync_lib/src/lib.rs
@@ -80,7 +80,7 @@ pub fn is_binary(data: &[u8]) -> bool {
 pub fn is_file_type_mergable(path_or_file_name: &str) -> bool {
     set_panic_hook();
 
-    let file_extension = path_or_file_name.split('.').last().unwrap_or_default();
+    let file_extension = path_or_file_name.split('.').next_back().unwrap_or_default();
 
     matches!(file_extension.to_lowercase().as_str(), "md" | "txt")
 }

From b61c08041ef1b735ebeb5eef9998b548bb7c8ee1 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 12 Jan 2025 11:36:45 +0000
Subject: [PATCH 183/761] Enable merging

---
 plugin/src/file-operations/obsidian-file-operations.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin/src/file-operations/obsidian-file-operations.ts b/plugin/src/file-operations/obsidian-file-operations.ts
index 41a2df00..95dcdd01 100644
--- a/plugin/src/file-operations/obsidian-file-operations.ts
+++ b/plugin/src/file-operations/obsidian-file-operations.ts
@@ -69,7 +69,7 @@ export class ObsidianFileOperations implements FileOperations {
 			return new Uint8Array(0);
 		}
 
-		if (isFileTypeMergable(path)) {
+		if (!isFileTypeMergable(path)) {
 			Logger.getInstance().debug(
 				`The expected content is not mergable, so we won't perform a 3-way merge, just overwrite it`
 			);

From 0e7acc3b7a5a745f1208f1c1ca1854dc49317ff3 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 12 Jan 2025 12:00:09 +0000
Subject: [PATCH 184/761] Change virtual scroller

---
 README.md                          | 21 ---------------------
 plugin/package-lock.json           | 26 ++++++++++++++++++--------
 plugin/package.json                |  4 ++--
 plugin/src/tracing/sync-history.ts |  2 +-
 plugin/src/views/history-view.ts   |  6 ++++++
 5 files changed, 27 insertions(+), 32 deletions(-)

diff --git a/README.md b/README.md
index f8edd471..f163f4db 100644
--- a/README.md
+++ b/README.md
@@ -42,22 +42,6 @@ openapi-typescript http://localhost:3030/api.json --output plugin/src/services/t
 ```
 
 ```
-## Todos
-
-- Add users to vaults
-- Websocket for db updates
-- async read body
-- e2e tests
-- add clap
-- add auth middleware
-- shard db per user
-- update card title max width
-- retry
-- CI for:
-    - publish reconcile
-    - cross-platform build server
-    - run load test on server
-    - build and publish plugin with openapi types
 
 todo: enable
 [workspace.lints.clippy]
@@ -79,8 +63,3 @@ apt install flatpak
 flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
 flatpak install flathub md.obsidian.Obsidian
 flatpak run md.obsidian.Obsidian
-
-
-stop leaking subscriptions
-test with naughty strings https://github.com/minimaxir/big-list-of-naughty-strings/tree/84a5dea833b5e2218f7c8c2104effca3f8f155aa?tab=readme-ov-file
-double check internalSyncRemotelyUpdatedFile
\ No newline at end of file
diff --git a/plugin/package-lock.json b/plugin/package-lock.json
index 9fdd81ce..e075713f 100644
--- a/plugin/package-lock.json
+++ b/plugin/package-lock.json
@@ -24,7 +24,6 @@
 				"fetch-retry": "^6.0.0",
 				"file-loader": "^6.2.0",
 				"fs-extra": "^11.2.0",
-				"hyperlist": "^1.0.0",
 				"jest": "^29.7.0",
 				"mini-css-extract-plugin": "^2.9.2",
 				"obsidian": "1.7.2",
@@ -41,6 +40,7 @@
 				"tslib": "2.4.0",
 				"typescript": "5.7.2",
 				"typescript-eslint": "8.18.0",
+				"virtual-scroller": "^1.13.1",
 				"webpack": "^5.97.1",
 				"webpack-cli": "^6.0.1"
 			}
@@ -4522,13 +4522,6 @@
 				"node": ">=10.17.0"
 			}
 		},
-		"node_modules/hyperlist": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/hyperlist/-/hyperlist-1.0.0.tgz",
-			"integrity": "sha512-1qAjO29EJW/mPyqY+9wFjruD2YWur1dPsPYmt9RvMX6P+8Cr2UmT75MCWjjK+1/4Jxc3sm/G3Kr8DzGgEDRG+Q==",
-			"dev": true,
-			"license": "MIT"
-		},
 		"node_modules/icss-utils": {
 			"version": "5.1.0",
 			"resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
@@ -6638,6 +6631,13 @@
 			"dev": true,
 			"license": "MIT"
 		},
+		"node_modules/request-animation-frame-timeout": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/request-animation-frame-timeout/-/request-animation-frame-timeout-2.0.4.tgz",
+			"integrity": "sha512-5oYwRBYjrMSU/YHHXj5AM/nv96ZE0b8WZoA3FqnkeDDPXoprxUCZFK4IWZTl+y3RJQtaihiJPiKOB4NZfZ7C7A==",
+			"dev": true,
+			"license": "MIT"
+		},
 		"node_modules/require-directory": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -8072,6 +8072,16 @@
 			"license": "MIT",
 			"peer": true
 		},
+		"node_modules/virtual-scroller": {
+			"version": "1.13.1",
+			"resolved": "https://registry.npmjs.org/virtual-scroller/-/virtual-scroller-1.13.1.tgz",
+			"integrity": "sha512-sui46QUBOIfHyXYjdGkxoze/GlCZFUFRxzxEvsu06UQ4iPc3uRfGnm/Qj7195hiMVOYQW9lDn+m3sD7sRMYdYg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"request-animation-frame-timeout": "^2.0.3"
+			}
+		},
 		"node_modules/w3c-keyname": {
 			"version": "2.2.8",
 			"resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.8.tgz",
diff --git a/plugin/package.json b/plugin/package.json
index 19d268a9..d28d6dcf 100644
--- a/plugin/package.json
+++ b/plugin/package.json
@@ -35,7 +35,7 @@
 		"fetch-retry": "^6.0.0",
 		"file-loader": "^6.2.0",
 		"fs-extra": "^11.2.0",
-		"hyperlist": "^1.0.0",
+		"virtual-scroller": "^1.13.1",
 		"jest": "^29.7.0",
 		"mini-css-extract-plugin": "^2.9.2",
 		"obsidian": "1.7.2",
@@ -55,4 +55,4 @@
 		"webpack": "^5.97.1",
 		"webpack-cli": "^6.0.1"
 	}
-}
+}
\ No newline at end of file
diff --git a/plugin/src/tracing/sync-history.ts b/plugin/src/tracing/sync-history.ts
index 5bdda797..a059a9fc 100644
--- a/plugin/src/tracing/sync-history.ts
+++ b/plugin/src/tracing/sync-history.ts
@@ -34,7 +34,7 @@ export interface HistoryStats {
 }
 
 export class SyncHistory {
-	private static readonly MAX_ENTRIES = 1000;
+	private static readonly MAX_ENTRIES = 5000;
 
 	private readonly entries: HistoryEntry[] = [];
 
diff --git a/plugin/src/views/history-view.ts b/plugin/src/views/history-view.ts
index ca2f248e..220e58a9 100644
--- a/plugin/src/views/history-view.ts
+++ b/plugin/src/views/history-view.ts
@@ -95,6 +95,12 @@ export class HistoryView extends ItemView {
 		container.empty();
 		container.createEl("h4", { text: "VaultLink History" });
 
+		const virtualScroller = new VirtualScroller(
+			document.getElementById("messages"),
+			messages,
+			renderMessage
+		);
+
 		const entries = this.history
 			.getEntries()
 			.reverse()

From 1795d339863995f7a5258f1f667b2ccb216a5828 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 12 Jan 2025 12:00:20 +0000
Subject: [PATCH 185/761] Bump versions to 0.0.27

---
 backend/Cargo.lock       | 8 ++++----
 backend/Cargo.toml       | 2 +-
 manifest.json            | 2 +-
 plugin/manifest.json     | 2 +-
 plugin/package-lock.json | 6 +++---
 plugin/package.json      | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 38a2f7e9..684e1c1b 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1773,7 +1773,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile"
-version = "0.0.26"
+version = "0.0.27"
 dependencies = [
  "insta",
  "pretty_assertions",
@@ -1783,7 +1783,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile-fuzz"
-version = "0.0.26"
+version = "0.0.27"
 dependencies = [
  "libfuzzer-sys",
  "reconcile",
@@ -2415,7 +2415,7 @@ dependencies = [
 
 [[package]]
 name = "sync_lib"
-version = "0.0.26"
+version = "0.0.27"
 dependencies = [
  "base64 0.22.1",
  "console_error_panic_hook",
@@ -2428,7 +2428,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.0.26"
+version = "0.0.27"
 dependencies = [
  "aide",
  "aide-axum-typed-multipart",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index b4a38e67..e5292c29 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -13,7 +13,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.0.26"
+version = "0.0.27"
 
 [workspace.dependencies]  
 serde = { version = "1.0.214", default-features = false, features = ["derive"] }
diff --git a/manifest.json b/manifest.json
index 9614329b..355dddc2 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.0.26",
+	"version": "0.0.27",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/plugin/manifest.json b/plugin/manifest.json
index 9614329b..355dddc2 100644
--- a/plugin/manifest.json
+++ b/plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.0.26",
+	"version": "0.0.27",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/plugin/package-lock.json b/plugin/package-lock.json
index e075713f..d093cab8 100644
--- a/plugin/package-lock.json
+++ b/plugin/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.0.26",
+	"version": "0.0.27",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.0.26",
+			"version": "0.0.27",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
@@ -47,7 +47,7 @@
 		},
 		"../backend/sync_lib/pkg": {
 			"name": "sync_lib",
-			"version": "0.0.26",
+			"version": "0.0.27",
 			"dev": true,
 			"license": "MIT"
 		},
diff --git a/plugin/package.json b/plugin/package.json
index d28d6dcf..705d47ff 100644
--- a/plugin/package.json
+++ b/plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.0.26",
+	"version": "0.0.27",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {
@@ -55,4 +55,4 @@
 		"webpack": "^5.97.1",
 		"webpack-cli": "^6.0.1"
 	}
-}
\ No newline at end of file
+}

From be591072f4a02142e37f09b305664a153852c918 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 12 Jan 2025 13:51:29 +0000
Subject: [PATCH 186/761] Fix lint

---
 plugin/src/views/history-view.ts | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/plugin/src/views/history-view.ts b/plugin/src/views/history-view.ts
index 220e58a9..ca2f248e 100644
--- a/plugin/src/views/history-view.ts
+++ b/plugin/src/views/history-view.ts
@@ -95,12 +95,6 @@ export class HistoryView extends ItemView {
 		container.empty();
 		container.createEl("h4", { text: "VaultLink History" });
 
-		const virtualScroller = new VirtualScroller(
-			document.getElementById("messages"),
-			messages,
-			renderMessage
-		);
-
 		const entries = this.history
 			.getEntries()
 			.reverse()

From 60181ae53fe0a61cba43365578a7ed57efd1ae09 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Tue, 14 Jan 2025 21:41:11 +0000
Subject: [PATCH 187/761] Add fetch doc version endpoints

---
 backend/sync_server/src/server.rs             |  10 ++
 .../src/server/fetch_document_version.rs      |  57 +++++++++
 .../server/fetch_document_version_content.rs  |  59 ++++++++++
 plugin/src/services/types.ts                  | 111 ++++++++++++++++++
 4 files changed, 237 insertions(+)
 create mode 100644 backend/sync_server/src/server/fetch_document_version.rs
 create mode 100644 backend/sync_server/src/server/fetch_document_version_content.rs

diff --git a/backend/sync_server/src/server.rs b/backend/sync_server/src/server.rs
index da809c8e..bf62fec5 100644
--- a/backend/sync_server/src/server.rs
+++ b/backend/sync_server/src/server.rs
@@ -35,6 +35,8 @@ mod app_state;
 mod auth;
 mod create_document;
 mod delete_document;
+mod fetch_document_version;
+mod fetch_document_version_content;
 mod fetch_latest_document_version;
 mod fetch_latest_documents;
 mod ping;
@@ -94,6 +96,14 @@ pub async fn create_server() -> Result<()> {
             "/vaults/:vault_id/documents/:document_id/json",
             put(update_document::update_document_json),
         )
+        .api_route(
+            "/vaults/:vault_id/documents/:document_id/versions/:version_id",
+            put(fetch_document_version::fetch_document_version),
+        )
+        .api_route(
+            "/vaults/:vault_id/documents/:document_id/versions/:version_id/content",
+            put(fetch_document_version_content::fetch_document_version_content),
+        )
         .api_route(
             "/vaults/:vault_id/documents/:document_id",
             delete(delete_document::delete_document),
diff --git a/backend/sync_server/src/server/fetch_document_version.rs b/backend/sync_server/src/server/fetch_document_version.rs
new file mode 100644
index 00000000..c6431601
--- /dev/null
+++ b/backend/sync_server/src/server/fetch_document_version.rs
@@ -0,0 +1,57 @@
+use anyhow::anyhow;
+use axum::extract::{Path, State};
+use axum_extra::{
+    TypedHeader,
+    headers::{Authorization, authorization::Bearer},
+};
+use axum_jsonschema::Json;
+use schemars::JsonSchema;
+use serde::Deserialize;
+
+use super::{app_state::AppState, auth::auth};
+use crate::{
+    database::models::{DocumentId, DocumentVersion, VaultId, VaultUpdateId},
+    errors::{SyncServerError, not_found_error, server_error},
+};
+
+// This is required for aide to infer the path parameter types and names
+#[derive(Deserialize, JsonSchema)]
+pub struct PathParams {
+    vault_id: VaultId,
+    document_id: DocumentId,
+    vault_update_id: VaultUpdateId,
+}
+
+#[axum::debug_handler]
+pub async fn fetch_document_version(
+    TypedHeader(auth_header): TypedHeader<Authorization<Bearer>>,
+    Path(PathParams {
+        vault_id,
+        document_id,
+        vault_update_id,
+    }): Path<PathParams>,
+    State(state): State<AppState>,
+) -> Result<Json<DocumentVersion>, SyncServerError> {
+    auth(&state, auth_header.token())?;
+
+    let result = state
+        .database
+        .get_document_version(&vault_id, vault_update_id, None)
+        .await
+        .map_err(server_error)?
+        .map(Ok)
+        .unwrap_or_else(|| {
+            Err(not_found_error(anyhow!(
+                "Document with vault update id `{vault_update_id}` not found",
+            )))
+        })?;
+
+    if result.document_id != document_id {
+        return Err(not_found_error(anyhow!(
+            "Document with document id `{document_id}` does not have a version with id \
+             `{vault_update_id}`",
+        )));
+    }
+
+    Ok(Json(result.into()))
+}
diff --git a/backend/sync_server/src/server/fetch_document_version_content.rs b/backend/sync_server/src/server/fetch_document_version_content.rs
new file mode 100644
index 00000000..68e38254
--- /dev/null
+++ b/backend/sync_server/src/server/fetch_document_version_content.rs
@@ -0,0 +1,59 @@
+use anyhow::anyhow;
+use axum::{
+    body::Bytes,
+    extract::{Path, State},
+};
+use axum_extra::{
+    TypedHeader,
+    headers::{Authorization, authorization::Bearer},
+};
+use schemars::JsonSchema;
+use serde::Deserialize;
+
+use super::{app_state::AppState, auth::auth};
+use crate::{
+    database::models::{DocumentId, VaultId, VaultUpdateId},
+    errors::{SyncServerError, not_found_error, server_error},
+};
+
+// This is required for aide to infer the path parameter types and names
+#[derive(Deserialize, JsonSchema)]
+pub struct PathParams {
+    vault_id: VaultId,
+    document_id: DocumentId,
+    vault_update_id: VaultUpdateId,
+}
+
+#[axum::debug_handler]
+pub async fn fetch_document_version_content(
+    TypedHeader(auth_header): TypedHeader<Authorization<Bearer>>,
+    Path(PathParams {
+        vault_id,
+        document_id,
+        vault_update_id,
+    }): Path<PathParams>,
+    State(state): State<AppState>,
+) -> Result<Bytes, SyncServerError> {
+    auth(&state, auth_header.token())?;
+
+    let result = state
+        .database
+        .get_document_version(&vault_id, vault_update_id, None)
+        .await
+        .map_err(server_error)?
+        .map(Ok)
+        .unwrap_or_else(|| {
+            Err(not_found_error(anyhow!(
+                "Document with vault update id `{vault_update_id}` not found",
+            )))
+        })?;
+
+    if result.document_id != document_id {
+        return Err(not_found_error(anyhow!(
+            "Document with document id `{document_id}` does not have a version with id \
+             `{vault_update_id}`",
+        )));
+    }
+
+    Ok(result.content.into())
+}
diff --git a/plugin/src/services/types.ts b/plugin/src/services/types.ts
index d920e1e8..6a18e16a 100644
--- a/plugin/src/services/types.ts
+++ b/plugin/src/services/types.ts
@@ -347,6 +347,103 @@ export interface paths {
 		patch?: never;
 		trace?: never;
 	};
+	"/vaults/{vault_id}/documents/{document_id}/versions/{version_id}": {
+		parameters: {
+			query?: never;
+			header?: never;
+			path?: never;
+			cookie?: never;
+		};
+		get?: never;
+		put: {
+			parameters: {
+				query?: never;
+				header: {
+					authorization: string;
+				};
+				path: {
+					document_id: string;
+					vault_id: string;
+					vault_update_id: number;
+				};
+				cookie?: never;
+			};
+			requestBody?: never;
+			responses: {
+				200: {
+					headers: {
+						[name: string]: unknown;
+					};
+					content: {
+						"application/json": components["schemas"]["DocumentVersion"];
+					};
+				};
+				default: {
+					headers: {
+						[name: string]: unknown;
+					};
+					content: {
+						"application/json": components["schemas"]["SerializedError"];
+					};
+				};
+			};
+		};
+		post?: never;
+		delete?: never;
+		options?: never;
+		head?: never;
+		patch?: never;
+		trace?: never;
+	};
+	"/vaults/{vault_id}/documents/{document_id}/versions/{version_id}/content": {
+		parameters: {
+			query?: never;
+			header?: never;
+			path?: never;
+			cookie?: never;
+		};
+		get?: never;
+		put: {
+			parameters: {
+				query?: never;
+				header: {
+					authorization: string;
+				};
+				path: {
+					document_id: string;
+					vault_id: string;
+					vault_update_id: number;
+				};
+				cookie?: never;
+			};
+			requestBody?: never;
+			responses: {
+				/** @description byte stream */
+				200: {
+					headers: {
+						[name: string]: unknown;
+					};
+					content: {
+						"application/octet-stream": unknown;
+					};
+				};
+				default: {
+					headers: {
+						[name: string]: unknown;
+					};
+					content: {
+						"application/json": components["schemas"]["SerializedError"];
+					};
+				};
+			};
+		};
+		post?: never;
+		delete?: never;
+		options?: never;
+		head?: never;
+		patch?: never;
+		trace?: never;
+	};
 }
 export type webhooks = Record<string, never>;
 export interface components {
@@ -458,6 +555,20 @@ export interface components {
 			/** Format: uuid */
 			document_id: string;
 			vault_id: string;
+			/** Format: int64 */
+			vault_update_id: number;
+		};
+		PathParams6: {
+			/** Format: uuid */
+			document_id: string;
+			vault_id: string;
+			/** Format: int64 */
+			vault_update_id: number;
+		};
+		PathParams7: {
+			/** Format: uuid */
+			document_id: string;
+			vault_id: string;
 		};
 		/** @description Response to a ping request. */
 		PingResponse: {

From 6e9558f13ed66f237e60b90f928d6b73c0621e80 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Tue, 14 Jan 2025 21:45:30 +0000
Subject: [PATCH 188/761] Bump versions to 0.0.28

---
 backend/Cargo.lock       | 8 ++++----
 backend/Cargo.toml       | 2 +-
 manifest.json            | 2 +-
 plugin/manifest.json     | 2 +-
 plugin/package-lock.json | 6 +++---
 plugin/package.json      | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 684e1c1b..ce878aa3 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1773,7 +1773,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile"
-version = "0.0.27"
+version = "0.0.28"
 dependencies = [
  "insta",
  "pretty_assertions",
@@ -1783,7 +1783,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile-fuzz"
-version = "0.0.27"
+version = "0.0.28"
 dependencies = [
  "libfuzzer-sys",
  "reconcile",
@@ -2415,7 +2415,7 @@ dependencies = [
 
 [[package]]
 name = "sync_lib"
-version = "0.0.27"
+version = "0.0.28"
 dependencies = [
  "base64 0.22.1",
  "console_error_panic_hook",
@@ -2428,7 +2428,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.0.27"
+version = "0.0.28"
 dependencies = [
  "aide",
  "aide-axum-typed-multipart",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index e5292c29..1017aa6d 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -13,7 +13,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.0.27"
+version = "0.0.28"
 
 [workspace.dependencies]  
 serde = { version = "1.0.214", default-features = false, features = ["derive"] }
diff --git a/manifest.json b/manifest.json
index 355dddc2..831ad568 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.0.27",
+	"version": "0.0.28",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/plugin/manifest.json b/plugin/manifest.json
index 355dddc2..831ad568 100644
--- a/plugin/manifest.json
+++ b/plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.0.27",
+	"version": "0.0.28",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/plugin/package-lock.json b/plugin/package-lock.json
index d093cab8..1f79cd54 100644
--- a/plugin/package-lock.json
+++ b/plugin/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.0.27",
+	"version": "0.0.28",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.0.27",
+			"version": "0.0.28",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
@@ -47,7 +47,7 @@
 		},
 		"../backend/sync_lib/pkg": {
 			"name": "sync_lib",
-			"version": "0.0.27",
+			"version": "0.0.28",
 			"dev": true,
 			"license": "MIT"
 		},
diff --git a/plugin/package.json b/plugin/package.json
index 705d47ff..926ff916 100644
--- a/plugin/package.json
+++ b/plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.0.27",
+	"version": "0.0.28",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {

From b4b4680422d252796e3e49e915fdea7ea796157f Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 19 Jan 2025 13:00:07 +0000
Subject: [PATCH 189/761] Double check before delete

---
 plugin/src/file-operations/file-operations.ts          | 2 ++
 plugin/src/file-operations/obsidian-file-operations.ts | 7 ++++++-
 plugin/src/sync-operations/syncer.ts                   | 7 +++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/plugin/src/file-operations/file-operations.ts b/plugin/src/file-operations/file-operations.ts
index 66327994..2dc182f5 100644
--- a/plugin/src/file-operations/file-operations.ts
+++ b/plugin/src/file-operations/file-operations.ts
@@ -7,6 +7,8 @@ export interface FileOperations {
 
 	getFileSize: (path: RelativePath) => Promise<number>;
 
+	exists: (path: RelativePath) => Promise<boolean>;
+
 	getModificationTime: (path: RelativePath) => Promise<Date>;
 
 	// Create and write the file if it doesn't exist. Otherwise, it has the same behavior as write.
diff --git a/plugin/src/file-operations/obsidian-file-operations.ts b/plugin/src/file-operations/obsidian-file-operations.ts
index 95dcdd01..4afd1135 100644
--- a/plugin/src/file-operations/obsidian-file-operations.ts
+++ b/plugin/src/file-operations/obsidian-file-operations.ts
@@ -39,6 +39,11 @@ export class ObsidianFileOperations implements FileOperations {
 		return new Date((await this.statFile(path)).mtime);
 	}
 
+	public async exists(path: RelativePath): Promise<boolean> {
+		Logger.getInstance().debug(`Checking existance of ${path}`);
+		return this.vault.adapter.exists(normalizePath(path));
+	}
+
 	public async create(
 		path: RelativePath,
 		newContent: Uint8Array
@@ -108,7 +113,7 @@ export class ObsidianFileOperations implements FileOperations {
 	public async remove(path: RelativePath): Promise<void> {
 		Logger.getInstance().debug(`Removing file: ${path}`);
 		if (await this.vault.adapter.exists(normalizePath(path))) {
-			return this.vault.adapter.remove(normalizePath(path));
+			await this.vault.adapter.trashSystem(normalizePath(path));
 		}
 	}
 
diff --git a/plugin/src/sync-operations/syncer.ts b/plugin/src/sync-operations/syncer.ts
index e23e6920..dea4b5db 100644
--- a/plugin/src/sync-operations/syncer.ts
+++ b/plugin/src/sync-operations/syncer.ts
@@ -176,6 +176,13 @@ export class Syncer {
 						`Document ${relativePath} has been deleted locally, scheduling sync to delete it`
 					);
 
+					if (await this.operations.exists(relativePath)) {
+						Logger.getInstance().debug(
+							`Document ${relativePath} actually exists locally, skipping`
+						);
+						return Promise.resolve();
+					}
+
 					return this.internalSyncLocallyDeletedFile(relativePath);
 				})
 			);

From bc76942047b1a3d84f2311764389a0250a8e783b Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 19 Jan 2025 13:00:18 +0000
Subject: [PATCH 190/761] Bump versions to 0.0.29

---
 backend/Cargo.lock       | 8 ++++----
 backend/Cargo.toml       | 2 +-
 manifest.json            | 2 +-
 plugin/manifest.json     | 2 +-
 plugin/package-lock.json | 6 +++---
 plugin/package.json      | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index ce878aa3..bc5ca105 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1773,7 +1773,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile"
-version = "0.0.28"
+version = "0.0.29"
 dependencies = [
  "insta",
  "pretty_assertions",
@@ -1783,7 +1783,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile-fuzz"
-version = "0.0.28"
+version = "0.0.29"
 dependencies = [
  "libfuzzer-sys",
  "reconcile",
@@ -2415,7 +2415,7 @@ dependencies = [
 
 [[package]]
 name = "sync_lib"
-version = "0.0.28"
+version = "0.0.29"
 dependencies = [
  "base64 0.22.1",
  "console_error_panic_hook",
@@ -2428,7 +2428,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.0.28"
+version = "0.0.29"
 dependencies = [
  "aide",
  "aide-axum-typed-multipart",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 1017aa6d..466d4744 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -13,7 +13,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.0.28"
+version = "0.0.29"
 
 [workspace.dependencies]  
 serde = { version = "1.0.214", default-features = false, features = ["derive"] }
diff --git a/manifest.json b/manifest.json
index 831ad568..70bd8bbf 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.0.28",
+	"version": "0.0.29",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/plugin/manifest.json b/plugin/manifest.json
index 831ad568..70bd8bbf 100644
--- a/plugin/manifest.json
+++ b/plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.0.28",
+	"version": "0.0.29",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/plugin/package-lock.json b/plugin/package-lock.json
index 1f79cd54..d3c37d5d 100644
--- a/plugin/package-lock.json
+++ b/plugin/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.0.28",
+	"version": "0.0.29",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.0.28",
+			"version": "0.0.29",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
@@ -47,7 +47,7 @@
 		},
 		"../backend/sync_lib/pkg": {
 			"name": "sync_lib",
-			"version": "0.0.28",
+			"version": "0.0.29",
 			"dev": true,
 			"license": "MIT"
 		},
diff --git a/plugin/package.json b/plugin/package.json
index 926ff916..a208bfd0 100644
--- a/plugin/package.json
+++ b/plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.0.28",
+	"version": "0.0.29",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {

From b03e8294506d239100a42548e4f05b55e997e272 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 19 Jan 2025 21:34:28 +0000
Subject: [PATCH 191/761] Fix CI

---
 .github/workflows/publish-plugin.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/publish-plugin.yml b/.github/workflows/publish-plugin.yml
index db0cf591..4b061dd0 100644
--- a/.github/workflows/publish-plugin.yml
+++ b/.github/workflows/publish-plugin.yml
@@ -23,6 +23,7 @@ jobs:
       - name: Build wasm
         run: |
           cd backend
+          rustup install nightly && rustup default nightly
           cargo install wasm-pack
           wasm-pack build --target web sync_lib
 

From 8374c971ee76f9c9fba81f4b9c24694258fe16e4 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 19 Jan 2025 21:34:38 +0000
Subject: [PATCH 192/761] Bump versions to 0.0.30

---
 backend/Cargo.lock       | 8 ++++----
 backend/Cargo.toml       | 2 +-
 manifest.json            | 2 +-
 plugin/manifest.json     | 2 +-
 plugin/package-lock.json | 6 +++---
 plugin/package.json      | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index bc5ca105..2cc616b2 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1773,7 +1773,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile"
-version = "0.0.29"
+version = "0.0.30"
 dependencies = [
  "insta",
  "pretty_assertions",
@@ -1783,7 +1783,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile-fuzz"
-version = "0.0.29"
+version = "0.0.30"
 dependencies = [
  "libfuzzer-sys",
  "reconcile",
@@ -2415,7 +2415,7 @@ dependencies = [
 
 [[package]]
 name = "sync_lib"
-version = "0.0.29"
+version = "0.0.30"
 dependencies = [
  "base64 0.22.1",
  "console_error_panic_hook",
@@ -2428,7 +2428,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.0.29"
+version = "0.0.30"
 dependencies = [
  "aide",
  "aide-axum-typed-multipart",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 466d4744..cfb865a0 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -13,7 +13,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.0.29"
+version = "0.0.30"
 
 [workspace.dependencies]  
 serde = { version = "1.0.214", default-features = false, features = ["derive"] }
diff --git a/manifest.json b/manifest.json
index 70bd8bbf..f29b3103 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.0.29",
+	"version": "0.0.30",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/plugin/manifest.json b/plugin/manifest.json
index 70bd8bbf..f29b3103 100644
--- a/plugin/manifest.json
+++ b/plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.0.29",
+	"version": "0.0.30",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/plugin/package-lock.json b/plugin/package-lock.json
index d3c37d5d..1a6b7b4c 100644
--- a/plugin/package-lock.json
+++ b/plugin/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.0.29",
+	"version": "0.0.30",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.0.29",
+			"version": "0.0.30",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
@@ -47,7 +47,7 @@
 		},
 		"../backend/sync_lib/pkg": {
 			"name": "sync_lib",
-			"version": "0.0.29",
+			"version": "0.0.30",
 			"dev": true,
 			"license": "MIT"
 		},
diff --git a/plugin/package.json b/plugin/package.json
index a208bfd0..a321149b 100644
--- a/plugin/package.json
+++ b/plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.0.29",
+	"version": "0.0.30",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {

From ae3acb9e1eb421ab2c677112a1083eb64b1877b3 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Tue, 18 Feb 2025 22:32:41 +0000
Subject: [PATCH 193/761] Extract library from plugin

---
 {plugin => obsidian-plugin}/.hotreload        |  0
 {plugin => obsidian-plugin}/README.md         |  0
 .../dist}/manifest.json                       |  2 +-
 {plugin => obsidian-plugin}/package-lock.json | 10 +++++++
 {plugin => obsidian-plugin}/package.json      | 27 ++----------------
 .../src}/obisidan-event-handler.ts            |  7 ++---
 .../src}/obsidian-file-operations.ts          |  6 ++--
 {plugin => obsidian-plugin}/src/styles.scss   |  0
 .../src/vault-link-plugin.ts                  | 28 +++++++++----------
 .../src/views/history-view.ts                 | 12 +++++---
 .../src/views/logs-view.ts                    |  4 +--
 .../src/views/settings-tab.ts                 |  6 ++--
 .../src/views/status-bar.ts                   |  4 +--
 .../src/views/status-description.ts           | 11 ++++----
 {plugin => obsidian-plugin}/tsconfig.json     |  2 --
 {plugin => obsidian-plugin}/version-bump.mjs  |  0
 {plugin => obsidian-plugin}/webpack.config.js |  0
 {plugin => sync-client}/jest.config.js        |  0
 .../src/database/database.ts                  |  0
 .../src/database/document-metadata.ts         |  0
 .../src/database/sync-settings.ts             |  0
 .../src}/file-operations.ts                   |  0
 .../src/services/sync-service.ts              | 14 ++++++----
 {plugin => sync-client}/src/services/types.ts |  0
 .../apply-remote-changes-locally.ts           |  2 +-
 .../src/sync-operations/document-lock.test.ts |  0
 .../src/sync-operations/document-lock.ts      |  0
 {plugin => sync-client}/src/tracing/logger.ts |  3 --
 .../src/tracing/sync-history.ts               |  0
 .../src/utils/deserialize.test.ts             |  0
 .../src/utils/deserialize.ts                  |  0
 {plugin => sync-client}/src/utils/hash.ts     |  0
 .../src/utils/is-equal-bytes.test.ts          |  0
 .../src/utils/is-equal-bytes.ts               |  0
 .../src/utils/retried-fetch.ts                |  0
 .../src/utils/serialize.test.ts               |  0
 .../src/utils/serialize.ts                    |  0
 37 files changed, 61 insertions(+), 77 deletions(-)
 rename {plugin => obsidian-plugin}/.hotreload (100%)
 rename {plugin => obsidian-plugin}/README.md (100%)
 rename {plugin => obsidian-plugin/dist}/manifest.json (99%)
 rename {plugin => obsidian-plugin}/package-lock.json (99%)
 rename {plugin => obsidian-plugin}/package.json (55%)
 rename {plugin/src/events => obsidian-plugin/src}/obisidan-event-handler.ts (87%)
 rename {plugin/src/file-operations => obsidian-plugin/src}/obsidian-file-operations.ts (95%)
 rename {plugin => obsidian-plugin}/src/styles.scss (100%)
 rename {plugin => obsidian-plugin}/src/vault-link-plugin.ts (86%)
 rename {plugin => obsidian-plugin}/src/views/history-view.ts (93%)
 rename {plugin => obsidian-plugin}/src/views/logs-view.ts (96%)
 rename {plugin => obsidian-plugin}/src/views/settings-tab.ts (97%)
 rename {plugin => obsidian-plugin}/src/views/status-bar.ts (90%)
 rename {plugin => obsidian-plugin}/src/views/status-description.ts (93%)
 rename {plugin => obsidian-plugin}/tsconfig.json (90%)
 rename {plugin => obsidian-plugin}/version-bump.mjs (100%)
 rename {plugin => obsidian-plugin}/webpack.config.js (100%)
 rename {plugin => sync-client}/jest.config.js (100%)
 rename {plugin => sync-client}/src/database/database.ts (100%)
 rename {plugin => sync-client}/src/database/document-metadata.ts (100%)
 rename {plugin => sync-client}/src/database/sync-settings.ts (100%)
 rename {plugin/src/file-operations => sync-client/src}/file-operations.ts (100%)
 rename {plugin => sync-client}/src/services/sync-service.ts (96%)
 rename {plugin => sync-client}/src/services/types.ts (100%)
 rename {plugin => sync-client}/src/sync-operations/apply-remote-changes-locally.ts (96%)
 rename {plugin => sync-client}/src/sync-operations/document-lock.test.ts (100%)
 rename {plugin => sync-client}/src/sync-operations/document-lock.ts (100%)
 rename {plugin => sync-client}/src/tracing/logger.ts (96%)
 rename {plugin => sync-client}/src/tracing/sync-history.ts (100%)
 rename {plugin => sync-client}/src/utils/deserialize.test.ts (100%)
 rename {plugin => sync-client}/src/utils/deserialize.ts (100%)
 rename {plugin => sync-client}/src/utils/hash.ts (100%)
 rename {plugin => sync-client}/src/utils/is-equal-bytes.test.ts (100%)
 rename {plugin => sync-client}/src/utils/is-equal-bytes.ts (100%)
 rename {plugin => sync-client}/src/utils/retried-fetch.ts (100%)
 rename {plugin => sync-client}/src/utils/serialize.test.ts (100%)
 rename {plugin => sync-client}/src/utils/serialize.ts (100%)

diff --git a/plugin/.hotreload b/obsidian-plugin/.hotreload
similarity index 100%
rename from plugin/.hotreload
rename to obsidian-plugin/.hotreload
diff --git a/plugin/README.md b/obsidian-plugin/README.md
similarity index 100%
rename from plugin/README.md
rename to obsidian-plugin/README.md
diff --git a/plugin/manifest.json b/obsidian-plugin/dist/manifest.json
similarity index 99%
rename from plugin/manifest.json
rename to obsidian-plugin/dist/manifest.json
index f29b3103..7b7ca8c8 100644
--- a/plugin/manifest.json
+++ b/obsidian-plugin/dist/manifest.json
@@ -7,4 +7,4 @@
 	"author": "Andras Schmelczer",
 	"authorUrl": "https://schmelczer.dev",
 	"isDesktopOnly": false
-}
\ No newline at end of file
+}
diff --git a/plugin/package-lock.json b/obsidian-plugin/package-lock.json
similarity index 99%
rename from plugin/package-lock.json
rename to obsidian-plugin/package-lock.json
index 1a6b7b4c..c1d6c70a 100644
--- a/plugin/package-lock.json
+++ b/obsidian-plugin/package-lock.json
@@ -13,6 +13,7 @@
 				"@types/node": "^16.11.6",
 				"builtin-modules": "3.3.0",
 				"byte-base64": "^1.1.0",
+				"client": "file:../client",
 				"css-loader": "^7.1.2",
 				"date-fns": "^4.1.0",
 				"dayjs": "^1.11.13",
@@ -51,6 +52,11 @@
 			"dev": true,
 			"license": "MIT"
 		},
+		"../client": {
+			"name": "my-lib",
+			"version": "1.0.0",
+			"dev": true
+		},
 		"node_modules/@ampproject/remapping": {
 			"version": "2.3.0",
 			"resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
@@ -3343,6 +3349,10 @@
 			"dev": true,
 			"license": "MIT"
 		},
+		"node_modules/client": {
+			"resolved": "../client",
+			"link": true
+		},
 		"node_modules/cliui": {
 			"version": "8.0.1",
 			"resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
diff --git a/plugin/package.json b/obsidian-plugin/package.json
similarity index 55%
rename from plugin/package.json
rename to obsidian-plugin/package.json
index a321149b..390f31fc 100644
--- a/plugin/package.json
+++ b/obsidian-plugin/package.json
@@ -6,53 +6,32 @@
 	"scripts": {
 		"dev": "webpack watch --mode development",
 		"build": "webpack --mode production",
-		"test": "NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules\" jest",
-		"lint": "eslint --fix src && prettier --write \"src/**/*.(ts|scss|json|html)\"",
+		"test": "jest --passWithNoTests",
 		"version": "node version-bump.mjs"
 	},
 	"keywords": [],
 	"author": "",
 	"license": "MIT",
-	"prettier": {
-		"trailingComma": "none",
-		"tabWidth": 4,
-		"useTabs": true,
-		"endOfLine": "lf"
-	},
 	"devDependencies": {
+		"sync-client": "file:../sync-client",
 		"@types/jest": "^29.5.14",
 		"@types/node": "^16.11.6",
-		"builtin-modules": "3.3.0",
-		"byte-base64": "^1.1.0",
 		"css-loader": "^7.1.2",
 		"date-fns": "^4.1.0",
-		"dayjs": "^1.11.13",
-		"esbuild": "0.24.0",
-		"esbuild-plugin-wasm-pack": "^1.1.0",
-		"esbuild-sass-plugin": "^3.3.1",
-		"eslint": "9.17.0",
-		"eslint-plugin-unused-imports": "^4.1.4",
-		"fetch-retry": "^6.0.0",
 		"file-loader": "^6.2.0",
 		"fs-extra": "^11.2.0",
 		"virtual-scroller": "^1.13.1",
 		"jest": "^29.7.0",
 		"mini-css-extract-plugin": "^2.9.2",
 		"obsidian": "1.7.2",
-		"openapi-fetch": "0.13.3",
-		"openapi-typescript": "7.4.4",
-		"p-queue": "^8.0.1",
-		"prettier": "^3.4.2",
 		"resolve-url-loader": "^5.0.0",
 		"sass-loader": "^16.0.4",
-		"sync_lib": "file:../backend/sync_lib/pkg",
 		"terser-webpack-plugin": "^5.3.11",
 		"ts-jest": "^29.2.5",
 		"ts-loader": "^9.5.1",
 		"tslib": "2.4.0",
 		"typescript": "5.7.2",
-		"typescript-eslint": "8.18.0",
 		"webpack": "^5.97.1",
 		"webpack-cli": "^6.0.1"
 	}
-}
+}
\ No newline at end of file
diff --git a/plugin/src/events/obisidan-event-handler.ts b/obsidian-plugin/src/obisidan-event-handler.ts
similarity index 87%
rename from plugin/src/events/obisidan-event-handler.ts
rename to obsidian-plugin/src/obisidan-event-handler.ts
index 0d4461fc..4e0e0930 100644
--- a/plugin/src/events/obisidan-event-handler.ts
+++ b/obsidian-plugin/src/obisidan-event-handler.ts
@@ -1,10 +1,9 @@
+import type { Syncer } from "sync-client";
+import { Logger } from "sync-client";
 import type { TAbstractFile } from "obsidian";
 import { TFile } from "obsidian";
-import type { FileEventHandler } from "./file-event-handler";
-import { Logger } from "src/tracing/logger";
-import type { Syncer } from "src/sync-operations/syncer";
 
-export class ObsidianFileEventHandler implements FileEventHandler {
+export class ObsidianFileEventHandler {
 	public constructor(private readonly syncer: Syncer) {}
 
 	public async onCreate(file: TAbstractFile): Promise<void> {
diff --git a/plugin/src/file-operations/obsidian-file-operations.ts b/obsidian-plugin/src/obsidian-file-operations.ts
similarity index 95%
rename from plugin/src/file-operations/obsidian-file-operations.ts
rename to obsidian-plugin/src/obsidian-file-operations.ts
index 4afd1135..395f42ef 100644
--- a/plugin/src/file-operations/obsidian-file-operations.ts
+++ b/obsidian-plugin/src/obsidian-file-operations.ts
@@ -1,10 +1,8 @@
 import type { Stat, Vault } from "obsidian";
 import { normalizePath } from "obsidian";
-import type { FileOperations } from "./file-operations";
-import type { RelativePath } from "src/database/document-metadata";
-import { isFileTypeMergable, mergeText } from "sync_lib";
 import { Platform } from "obsidian";
-import { Logger } from "src/tracing/logger";
+import type { FileOperations, RelativePath } from "sync-client";
+import { Logger, isFileTypeMergable, mergeText } from "sync-client";
 
 export class ObsidianFileOperations implements FileOperations {
 	public constructor(private readonly vault: Vault) {}
diff --git a/plugin/src/styles.scss b/obsidian-plugin/src/styles.scss
similarity index 100%
rename from plugin/src/styles.scss
rename to obsidian-plugin/src/styles.scss
diff --git a/plugin/src/vault-link-plugin.ts b/obsidian-plugin/src/vault-link-plugin.ts
similarity index 86%
rename from plugin/src/vault-link-plugin.ts
rename to obsidian-plugin/src/vault-link-plugin.ts
index ef1b81e0..989126ac 100644
--- a/plugin/src/vault-link-plugin.ts
+++ b/obsidian-plugin/src/vault-link-plugin.ts
@@ -2,21 +2,24 @@ import type { WorkspaceLeaf } from "obsidian";
 import { Plugin } from "obsidian";
 import "./styles.scss";
 import "../manifest.json";
-import init from "sync_lib";
-import wasmBin from "sync_lib/sync_lib_bg.wasm";
+
 import { SyncSettingsTab } from "./views/settings-tab";
 import { HistoryView } from "./views/history-view";
-import { ObsidianFileEventHandler } from "./events/obisidan-event-handler";
-import { SyncService } from "./services/sync-service";
-import { Database } from "./database/database";
-import { applyRemoteChangesLocally } from "./sync-operations/apply-remote-changes-locally";
-import { ObsidianFileOperations } from "./file-operations/obsidian-file-operations";
+import { ObsidianFileEventHandler } from "./obisidan-event-handler";
+import { ObsidianFileOperations } from "./obsidian-file-operations";
 import { StatusBar } from "./views/status-bar";
-import { Logger } from "./tracing/logger";
-import { SyncHistory } from "./tracing/sync-history";
+
 import { LogsView } from "./views/logs-view";
-import { Syncer } from "./sync-operations/syncer";
 import { StatusDescription } from "./views/status-description";
+import {
+	applyRemoteChangesLocally,
+	Database,
+	Logger,
+	Syncer,
+	SyncHistory,
+	SyncService,
+	initialize
+} from "sync-client";
 
 export default class VaultLinkPlugin extends Plugin {
 	private readonly operations = new ObsidianFileOperations(this.app.vault);
@@ -27,10 +30,7 @@ export default class VaultLinkPlugin extends Plugin {
 	public async onload(): Promise<void> {
 		Logger.getInstance().info("Starting plugin");
 
-		await init(
-			// eslint-disable-next-line
-			(wasmBin as any).default // it is loaded as a base64 string by webpack
-		);
+		await initialize();
 
 		const database = new Database(
 			await this.loadData(),
diff --git a/plugin/src/views/history-view.ts b/obsidian-plugin/src/views/history-view.ts
similarity index 93%
rename from plugin/src/views/history-view.ts
rename to obsidian-plugin/src/views/history-view.ts
index ca2f248e..9108cea6 100644
--- a/plugin/src/views/history-view.ts
+++ b/obsidian-plugin/src/views/history-view.ts
@@ -1,10 +1,14 @@
 import type { IconName, WorkspaceLeaf } from "obsidian";
 import { ItemView, setIcon } from "obsidian";
-import type { HistoryEntry, SyncHistory } from "src/tracing/sync-history";
-import { SyncType } from "src/tracing/sync-history";
-import { SyncSource, SyncStatus } from "src/tracing/sync-history";
+
 import { intlFormatDistance } from "date-fns";
-import type { Database } from "src/database/database";
+import type {
+	SyncHistory,
+	HistoryEntry,
+	Database,
+	RelativePath
+} from "sync-client";
+import { SyncType, SyncSource, SyncStatus } from "sync-client";
 
 export class HistoryView extends ItemView {
 	public static readonly TYPE = "history-view";
diff --git a/plugin/src/views/logs-view.ts b/obsidian-plugin/src/views/logs-view.ts
similarity index 96%
rename from plugin/src/views/logs-view.ts
rename to obsidian-plugin/src/views/logs-view.ts
index f9968d1d..8f7a8643 100644
--- a/plugin/src/views/logs-view.ts
+++ b/obsidian-plugin/src/views/logs-view.ts
@@ -1,8 +1,8 @@
 import type { WorkspaceLeaf } from "obsidian";
 import { ItemView } from "obsidian";
 import type VaultLinkPlugin from "src/vault-link-plugin";
-import { Logger } from "src/tracing/logger";
-import type { Database } from "src/database/database";
+import type { Database } from "sync-client";
+import { Logger } from "sync-client";
 
 export class LogsView extends ItemView {
 	public static readonly TYPE = "logs-view";
diff --git a/plugin/src/views/settings-tab.ts b/obsidian-plugin/src/views/settings-tab.ts
similarity index 97%
rename from plugin/src/views/settings-tab.ts
rename to obsidian-plugin/src/views/settings-tab.ts
index a629623d..b41ff40c 100644
--- a/plugin/src/views/settings-tab.ts
+++ b/obsidian-plugin/src/views/settings-tab.ts
@@ -2,13 +2,11 @@ import type { App } from "obsidian";
 import { Notice, PluginSettingTab, Setting } from "obsidian";
 
 import type VaultLinkPlugin from "src/vault-link-plugin";
-import type { Database } from "src/database/database";
-import type { SyncService } from "src/services/sync-service";
-import type { Syncer } from "src/sync-operations/syncer";
 import type { StatusDescription } from "./status-description";
 import { LogsView } from "./logs-view";
 import { HistoryView } from "./history-view";
-import { Logger, LogLevel } from "src/tracing/logger";
+import type { SyncService, Syncer, Database } from "sync-client";
+import { Logger, LogLevel } from "sync-client";
 
 export class SyncSettingsTab extends PluginSettingTab {
 	private editedVaultName: string;
diff --git a/plugin/src/views/status-bar.ts b/obsidian-plugin/src/views/status-bar.ts
similarity index 90%
rename from plugin/src/views/status-bar.ts
rename to obsidian-plugin/src/views/status-bar.ts
index 0a5e8e1c..0cecaa74 100644
--- a/plugin/src/views/status-bar.ts
+++ b/obsidian-plugin/src/views/status-bar.ts
@@ -1,7 +1,5 @@
-import type { Database } from "src/database/database";
+import type { Database, HistoryStats, SyncHistory, Syncer } from "sync-client";
 import type VaultLinkPlugin from "src/vault-link-plugin";
-import type { Syncer } from "src/sync-operations/syncer";
-import type { HistoryStats, SyncHistory } from "src/tracing/sync-history";
 
 export class StatusBar {
 	private readonly statusBarItem: HTMLElement;
diff --git a/plugin/src/views/status-description.ts b/obsidian-plugin/src/views/status-description.ts
similarity index 93%
rename from plugin/src/views/status-description.ts
rename to obsidian-plugin/src/views/status-description.ts
index fa7622f8..40d5c73e 100644
--- a/plugin/src/views/status-description.ts
+++ b/obsidian-plugin/src/views/status-description.ts
@@ -1,10 +1,11 @@
-import type { Database } from "src/database/database";
 import type {
+	HistoryStats,
 	CheckConnectionResult,
-	SyncService
-} from "src/services/sync-service";
-import type { Syncer } from "src/sync-operations/syncer";
-import type { HistoryStats, SyncHistory } from "src/tracing/sync-history";
+	SyncService,
+	SyncHistory,
+	Syncer,
+	Database
+} from "sync-client";
 
 export class StatusDescription {
 	private lastHistoryStats: HistoryStats | undefined;
diff --git a/plugin/tsconfig.json b/obsidian-plugin/tsconfig.json
similarity index 90%
rename from plugin/tsconfig.json
rename to obsidian-plugin/tsconfig.json
index 2bcb75e1..85523ed4 100644
--- a/plugin/tsconfig.json
+++ b/obsidian-plugin/tsconfig.json
@@ -5,10 +5,8 @@
     "inlineSources": true,
     "module": "ESNext",
     "target": "ES6",
-    "allowJs": true,
     "noImplicitAny": true,
     "moduleResolution": "bundler",
-    "importHelpers": true,
     "isolatedModules": true,
     "strictNullChecks": true,
     "esModuleInterop": true,
diff --git a/plugin/version-bump.mjs b/obsidian-plugin/version-bump.mjs
similarity index 100%
rename from plugin/version-bump.mjs
rename to obsidian-plugin/version-bump.mjs
diff --git a/plugin/webpack.config.js b/obsidian-plugin/webpack.config.js
similarity index 100%
rename from plugin/webpack.config.js
rename to obsidian-plugin/webpack.config.js
diff --git a/plugin/jest.config.js b/sync-client/jest.config.js
similarity index 100%
rename from plugin/jest.config.js
rename to sync-client/jest.config.js
diff --git a/plugin/src/database/database.ts b/sync-client/src/database/database.ts
similarity index 100%
rename from plugin/src/database/database.ts
rename to sync-client/src/database/database.ts
diff --git a/plugin/src/database/document-metadata.ts b/sync-client/src/database/document-metadata.ts
similarity index 100%
rename from plugin/src/database/document-metadata.ts
rename to sync-client/src/database/document-metadata.ts
diff --git a/plugin/src/database/sync-settings.ts b/sync-client/src/database/sync-settings.ts
similarity index 100%
rename from plugin/src/database/sync-settings.ts
rename to sync-client/src/database/sync-settings.ts
diff --git a/plugin/src/file-operations/file-operations.ts b/sync-client/src/file-operations.ts
similarity index 100%
rename from plugin/src/file-operations/file-operations.ts
rename to sync-client/src/file-operations.ts
diff --git a/plugin/src/services/sync-service.ts b/sync-client/src/services/sync-service.ts
similarity index 96%
rename from plugin/src/services/sync-service.ts
rename to sync-client/src/services/sync-service.ts
index 56170b25..f335ed67 100644
--- a/plugin/src/services/sync-service.ts
+++ b/sync-client/src/services/sync-service.ts
@@ -1,8 +1,8 @@
 import type { Client } from "openapi-fetch";
 import createClient from "openapi-fetch";
 import type { components, paths } from "./types"; // Generated by openapi-typescript
-import type { Database } from "src/database/database";
-import type { SyncSettings } from "src/database/sync-settings";
+import type { Database } from "../database/database";
+import type { SyncSettings } from "../database/sync-settings";
 import type {
 	DocumentId,
 	RelativePath,
@@ -98,9 +98,9 @@ export class SyncService {
 		}
 
 		Logger.getInstance().debug(
-			`Created document ${JSON.stringify(
-				response.data
-			)} with id ${response.data.documentId}`
+			`Created document ${JSON.stringify(response.data)} with id ${
+				response.data.documentId
+			}`
 		);
 
 		return response.data;
@@ -149,7 +149,9 @@ export class SyncService {
 		}
 
 		Logger.getInstance().debug(
-			`Updated document ${JSON.stringify(response.data)} with id ${response.data.documentId}`
+			`Updated document ${JSON.stringify(response.data)} with id ${
+				response.data.documentId
+			}`
 		);
 
 		return response.data;
diff --git a/plugin/src/services/types.ts b/sync-client/src/services/types.ts
similarity index 100%
rename from plugin/src/services/types.ts
rename to sync-client/src/services/types.ts
diff --git a/plugin/src/sync-operations/apply-remote-changes-locally.ts b/sync-client/src/sync-operations/apply-remote-changes-locally.ts
similarity index 96%
rename from plugin/src/sync-operations/apply-remote-changes-locally.ts
rename to sync-client/src/sync-operations/apply-remote-changes-locally.ts
index e5eb7208..706b93c0 100644
--- a/plugin/src/sync-operations/apply-remote-changes-locally.ts
+++ b/sync-client/src/sync-operations/apply-remote-changes-locally.ts
@@ -1,4 +1,4 @@
-import type { Database } from "src/database/database";
+import type { Database } from "../database/database";
 import type { SyncService } from "src/services/sync-service";
 import { Logger } from "src/tracing/logger";
 import type { Syncer } from "./syncer";
diff --git a/plugin/src/sync-operations/document-lock.test.ts b/sync-client/src/sync-operations/document-lock.test.ts
similarity index 100%
rename from plugin/src/sync-operations/document-lock.test.ts
rename to sync-client/src/sync-operations/document-lock.test.ts
diff --git a/plugin/src/sync-operations/document-lock.ts b/sync-client/src/sync-operations/document-lock.ts
similarity index 100%
rename from plugin/src/sync-operations/document-lock.ts
rename to sync-client/src/sync-operations/document-lock.ts
diff --git a/plugin/src/tracing/logger.ts b/sync-client/src/tracing/logger.ts
similarity index 96%
rename from plugin/src/tracing/logger.ts
rename to sync-client/src/tracing/logger.ts
index 0c8f7e54..3d7e95bd 100644
--- a/plugin/src/tracing/logger.ts
+++ b/sync-client/src/tracing/logger.ts
@@ -1,5 +1,3 @@
-import { Notice } from "obsidian";
-
 export enum LogLevel {
 	DEBUG = "DEBUG",
 	INFO = "INFO",
@@ -62,7 +60,6 @@ export class Logger {
 		console.error(message);
 
 		this.pushMessage(message, LogLevel.ERROR);
-		new Notice(message, 5000);
 	}
 
 	public getMessages(mininumSeverity: LogLevel): LogLine[] {
diff --git a/plugin/src/tracing/sync-history.ts b/sync-client/src/tracing/sync-history.ts
similarity index 100%
rename from plugin/src/tracing/sync-history.ts
rename to sync-client/src/tracing/sync-history.ts
diff --git a/plugin/src/utils/deserialize.test.ts b/sync-client/src/utils/deserialize.test.ts
similarity index 100%
rename from plugin/src/utils/deserialize.test.ts
rename to sync-client/src/utils/deserialize.test.ts
diff --git a/plugin/src/utils/deserialize.ts b/sync-client/src/utils/deserialize.ts
similarity index 100%
rename from plugin/src/utils/deserialize.ts
rename to sync-client/src/utils/deserialize.ts
diff --git a/plugin/src/utils/hash.ts b/sync-client/src/utils/hash.ts
similarity index 100%
rename from plugin/src/utils/hash.ts
rename to sync-client/src/utils/hash.ts
diff --git a/plugin/src/utils/is-equal-bytes.test.ts b/sync-client/src/utils/is-equal-bytes.test.ts
similarity index 100%
rename from plugin/src/utils/is-equal-bytes.test.ts
rename to sync-client/src/utils/is-equal-bytes.test.ts
diff --git a/plugin/src/utils/is-equal-bytes.ts b/sync-client/src/utils/is-equal-bytes.ts
similarity index 100%
rename from plugin/src/utils/is-equal-bytes.ts
rename to sync-client/src/utils/is-equal-bytes.ts
diff --git a/plugin/src/utils/retried-fetch.ts b/sync-client/src/utils/retried-fetch.ts
similarity index 100%
rename from plugin/src/utils/retried-fetch.ts
rename to sync-client/src/utils/retried-fetch.ts
diff --git a/plugin/src/utils/serialize.test.ts b/sync-client/src/utils/serialize.test.ts
similarity index 100%
rename from plugin/src/utils/serialize.test.ts
rename to sync-client/src/utils/serialize.test.ts
diff --git a/plugin/src/utils/serialize.ts b/sync-client/src/utils/serialize.ts
similarity index 100%
rename from plugin/src/utils/serialize.ts
rename to sync-client/src/utils/serialize.ts

From eb88d35c2e9dc3741a3b258f120cee1c5371e198 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Tue, 18 Feb 2025 22:36:53 +0000
Subject: [PATCH 194/761] Set up monorepo workspace

---
 .gitignore                                    |  4 +-
 plugin/eslint.config.mjs => eslint.config.mjs | 26 ++++++----
 obsidian-plugin/manifest.json                 | 10 ++++
 package.json                                  | 26 ++++++++++
 plugin/src/events/file-event-handler.ts       |  8 ---
 sync-client/package.json                      | 28 +++++++++++
 sync-client/src/index.ts                      | 48 ++++++++++++++++++
 .../src/sync-operations/syncer.ts             | 19 ++++---
 sync-client/tsconfig.json                     | 15 ++++++
 sync-client/webpack.config.js                 | 49 +++++++++++++++++++
 10 files changed, 207 insertions(+), 26 deletions(-)
 rename plugin/eslint.config.mjs => eslint.config.mjs (82%)
 create mode 100644 obsidian-plugin/manifest.json
 create mode 100644 package.json
 delete mode 100644 plugin/src/events/file-event-handler.ts
 create mode 100644 sync-client/package.json
 create mode 100644 sync-client/src/index.ts
 rename {plugin => sync-client}/src/sync-operations/syncer.ts (97%)
 create mode 100644 sync-client/tsconfig.json
 create mode 100644 sync-client/webpack.config.js

diff --git a/.gitignore b/.gitignore
index 2875d13c..ca750fec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,8 +7,8 @@ node_modules
 # Rust build folder
 backend/target
 
-# Obsidian plugin build folder
-plugin/dist
+obsidian-plugin/dist
+sync-client/dist
 
 backend/db.sqlite3*
 backend/config.yml
diff --git a/plugin/eslint.config.mjs b/eslint.config.mjs
similarity index 82%
rename from plugin/eslint.config.mjs
rename to eslint.config.mjs
index 2c697f4a..96de58af 100644
--- a/plugin/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -4,10 +4,16 @@ import unusedImports from "eslint-plugin-unused-imports";
 
 export default tseslint.config({
 	plugins: {
-		"unused-imports": unusedImports,
+		"unused-imports": unusedImports
 	},
 	extends: [eslint.configs.recommended, tseslint.configs.all],
-	ignores: ["**/types.ts", "**/*.test.ts"],
+	ignores: [
+		"**/types.ts",
+		"**/*.test.ts",
+		"**/dist/**/*",
+		"**/*.mjs",
+		"**/*.js"
+	],
 	rules: {
 		"no-unused-vars": "off",
 		"@typescript-eslint/no-unused-vars": "off",
@@ -20,8 +26,8 @@ export default tseslint.config({
 		"@typescript-eslint/max-params": [
 			"error",
 			{
-				max: 5,
-			},
+				max: 5
+			}
 		],
 		"unused-imports/no-unused-imports": "error",
 		"@typescript-eslint/no-magic-numbers": "off",
@@ -33,14 +39,14 @@ export default tseslint.config({
 				vars: "all",
 				varsIgnorePattern: "^_",
 				args: "after-used",
-				argsIgnorePattern: "^_",
-			},
-		],
+				argsIgnorePattern: "^_"
+			}
+		]
 	},
 	languageOptions: {
 		parserOptions: {
 			projectService: true,
-			tsconfigRootDir: import.meta.dirname,
-		},
-	},
+			tsconfigRootDir: import.meta.dirname
+		}
+	}
 });
diff --git a/obsidian-plugin/manifest.json b/obsidian-plugin/manifest.json
new file mode 100644
index 00000000..7b7ca8c8
--- /dev/null
+++ b/obsidian-plugin/manifest.json
@@ -0,0 +1,10 @@
+{
+	"id": "vault-link",
+	"name": "VaultLink",
+	"version": "0.0.30",
+	"minAppVersion": "0.0.0",
+	"description": "Self-hosted synchronization and collaboration for your Vault.",
+	"author": "Andras Schmelczer",
+	"authorUrl": "https://schmelczer.dev",
+	"isDesktopOnly": false
+}
diff --git a/package.json b/package.json
new file mode 100644
index 00000000..a04f32de
--- /dev/null
+++ b/package.json
@@ -0,0 +1,26 @@
+{
+    "name": "my-workspace",
+    "private": true,
+    "workspaces": [
+        "sync-client",
+        "obsidian-plugin"
+    ],
+    "prettier": {
+        "trailingComma": "none",
+        "tabWidth": 4,
+        "useTabs": true,
+        "endOfLine": "lf"
+    },
+    "scripts": {
+        "build": "npm run build --workspaces",
+        "dev": "npm run dev --workspaces",
+        "test": "npm run test --workspaces",
+        "lint": "eslint --fix sync-client obsidian-plugin; prettier --write \"sync-client/**/*.(ts|scss|json|html)\" \"obsidian-plugin/**/*.(ts|scss|json|html)\""
+    },
+    "devDependencies": {
+        "prettier": "^3.4.2",
+        "eslint": "9.17.0",
+        "typescript-eslint": "8.18.0",
+        "eslint-plugin-unused-imports": "^4.1.4"
+    }
+}
\ No newline at end of file
diff --git a/plugin/src/events/file-event-handler.ts b/plugin/src/events/file-event-handler.ts
deleted file mode 100644
index 3c6261d2..00000000
--- a/plugin/src/events/file-event-handler.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import type { TAbstractFile } from "obsidian";
-
-export interface FileEventHandler {
-	onCreate: (path: TAbstractFile) => Promise<void>;
-	onDelete: (path: TAbstractFile) => Promise<void>;
-	onRename: (path: TAbstractFile, oldPath: string) => Promise<void>;
-	onModify: (path: TAbstractFile) => Promise<void>;
-}
diff --git a/sync-client/package.json b/sync-client/package.json
new file mode 100644
index 00000000..bca033d3
--- /dev/null
+++ b/sync-client/package.json
@@ -0,0 +1,28 @@
+{
+	"name": "sync-client",
+	"version": "1.0.0",
+	"main": "dist/index.js",
+	"types": "dist/types/src/index.d.ts",
+	"scripts": {
+		"dev": "webpack watch --mode development",
+		"build": "webpack --mode production",
+		"test": "NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules\" jest"
+	},
+	"devDependencies": {
+		"tslib": "2.4.0",
+		"typescript": "5.7.2",
+		"sync_lib": "file:../backend/sync_lib/pkg",
+		"@types/jest": "^29.5.14",
+		"@types/node": "^16.11.6",
+		"jest": "^29.7.0",
+		"ts-jest": "^29.2.5",
+		"p-queue": "^8.0.1",
+		"fetch-retry": "^6.0.0",
+		"byte-base64": "^1.1.0",
+		"openapi-fetch": "0.13.3",
+		"openapi-typescript": "7.4.4",
+		"ts-loader": "^9.5.1",
+		"webpack": "^5.97.1",
+		"webpack-cli": "^6.0.1"
+	}
+}
diff --git a/sync-client/src/index.ts b/sync-client/src/index.ts
new file mode 100644
index 00000000..219d3c34
--- /dev/null
+++ b/sync-client/src/index.ts
@@ -0,0 +1,48 @@
+export { applyRemoteChangesLocally } from "./sync-operations/apply-remote-changes-locally";
+
+export {
+	type RelativePath,
+	type DocumentId,
+	type VaultUpdateId,
+	type DocumentMetadata
+} from "./database/document-metadata";
+
+export { Database } from "./database/database";
+
+export {
+	SyncService,
+	type CheckConnectionResult
+} from "./services/sync-service";
+
+export { Syncer } from "./sync-operations/syncer";
+
+export {
+	SyncHistory,
+	SyncType,
+	SyncSource,
+	SyncStatus,
+	type HistoryStats,
+	type HistoryEntry
+} from "./tracing/sync-history";
+
+export { Logger, LogLevel } from "./tracing/logger";
+
+export { type FileOperations } from "./file-operations";
+
+import init from "sync_lib";
+import wasmBin from "sync_lib/sync_lib_bg.wasm";
+
+export const initialize = async (): Promise<void> => {
+	await init(
+		// eslint-disable-next-line
+		(wasmBin as any).default // it is loaded as a base64 string by webpack
+	);
+};
+export {
+	isFileTypeMergable,
+	mergeText,
+	bytesToBase64,
+	base64ToBytes,
+	merge,
+	isBinary
+} from "sync_lib";
diff --git a/plugin/src/sync-operations/syncer.ts b/sync-client/src/sync-operations/syncer.ts
similarity index 97%
rename from plugin/src/sync-operations/syncer.ts
rename to sync-client/src/sync-operations/syncer.ts
index dea4b5db..deae7d22 100644
--- a/plugin/src/sync-operations/syncer.ts
+++ b/sync-client/src/sync-operations/syncer.ts
@@ -1,9 +1,9 @@
-import type { Database } from "src/database/database";
+import type { Database } from "../database/database";
 import type {
 	DocumentMetadata,
 	RelativePath
 } from "src/database/document-metadata";
-import type { FileOperations } from "src/file-operations/file-operations";
+import type { FileOperations } from "src/file-operations";
 import type { SyncService } from "src/services/sync-service";
 import { Logger } from "src/tracing/logger";
 import type { SyncHistory } from "src/tracing/sync-history";
@@ -102,7 +102,7 @@ export class Syncer {
 
 		try {
 			const allLocalFiles = await this.operations.listAllFiles();
-			const locallyDeletedFiles = [
+			let locallyDeletedFiles = [
 				...this.database.getDocuments().entries()
 			].filter(([path, _]) => !allLocalFiles.includes(path));
 
@@ -126,7 +126,10 @@ export class Syncer {
 								);
 							if (originalFile !== undefined) {
 								// `originalFile` hasn't been deleted but it got moved instead
-								locallyDeletedFiles.remove(originalFile);
+								locallyDeletedFiles =
+									locallyDeletedFiles.filter(
+										(item) => item != originalFile
+									);
 
 								Logger.getInstance().debug(
 									`Document ${relativePath} was not found under its current path in the database but was found under a different path ${originalFile[0]}, scheduling sync to move it`
@@ -231,7 +234,9 @@ export class Syncer {
 					this.history.addHistoryEntry({
 						status: SyncStatus.ERROR,
 						relativePath,
-						message: `File size exceeds the maximum file size limit of ${this.database.getSettings().maxFileSizeMB}MB`,
+						message: `File size exceeds the maximum file size limit of ${
+							this.database.getSettings().maxFileSizeMB
+						}MB`,
 						type: SyncType.CREATE
 					});
 					return;
@@ -332,7 +337,9 @@ export class Syncer {
 					this.history.addHistoryEntry({
 						status: SyncStatus.ERROR,
 						relativePath,
-						message: `File size exceeds the maximum file size limit of ${this.database.getSettings().maxFileSizeMB}MB`,
+						message: `File size exceeds the maximum file size limit of ${
+							this.database.getSettings().maxFileSizeMB
+						}MB`,
 						type: SyncType.CREATE
 					});
 					return;
diff --git a/sync-client/tsconfig.json b/sync-client/tsconfig.json
new file mode 100644
index 00000000..63ebf589
--- /dev/null
+++ b/sync-client/tsconfig.json
@@ -0,0 +1,15 @@
+{
+    "compilerOptions": {
+        "composite": true,
+        "baseUrl": ".",
+        "target": "ES2022",
+        "noImplicitAny": true,
+        "moduleResolution": "node",
+        "strictNullChecks": true,
+        "esModuleInterop": true,
+        "lib": [
+            "DOM",
+            "ESNext"
+        ]
+    }
+}
\ No newline at end of file
diff --git a/sync-client/webpack.config.js b/sync-client/webpack.config.js
new file mode 100644
index 00000000..144cb7ae
--- /dev/null
+++ b/sync-client/webpack.config.js
@@ -0,0 +1,49 @@
+const path = require("path");
+
+module.exports = (_env, _argv) => ({
+	entry: "./src/index.ts",
+	devtool: "source-map",
+	module: {
+		rules: [
+			{
+				test: /\.ts$/,
+				use: [
+					{
+						loader: "ts-loader",
+						options: {
+							compilerOptions: {
+								declaration: true,
+								declarationDir: "./dist/types"
+							},
+							transpileOnly: false
+						}
+					}
+				]
+			},
+			{
+				test: /\.wasm$/,
+				type: "asset/inline"
+			}
+		]
+	},
+	optimization: {
+		minimize: false
+	},
+	resolve: {
+		extensions: [".ts", ".js"],
+		alias: {
+			root: __dirname,
+			src: path.resolve(__dirname, "src")
+		}
+	},
+	output: {
+		clean: true,
+		filename: "index.js",
+		library: {
+			name: "SyncClient",
+			type: "umd"
+		},
+		globalObject: "this",
+		path: path.resolve(__dirname, "dist")
+	}
+});

From 61269ca1e59cdf4ced491ab5c5c1301ab7358ec5 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Tue, 18 Feb 2025 22:44:42 +0000
Subject: [PATCH 195/761] Remove clutter

---
 plugin/.editorconfig | 10 ----------
 plugin/.npmrc        |  1 -
 2 files changed, 11 deletions(-)
 delete mode 100644 plugin/.editorconfig
 delete mode 100644 plugin/.npmrc

diff --git a/plugin/.editorconfig b/plugin/.editorconfig
deleted file mode 100644
index 84b8a66d..00000000
--- a/plugin/.editorconfig
+++ /dev/null
@@ -1,10 +0,0 @@
-# top-most EditorConfig file
-root = true
-
-[*]
-charset = utf-8
-end_of_line = lf
-insert_final_newline = true
-indent_style = tab
-indent_size = 4
-tab_width = 4
diff --git a/plugin/.npmrc b/plugin/.npmrc
deleted file mode 100644
index b9737525..00000000
--- a/plugin/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-tag-version-prefix=""
\ No newline at end of file

From 6bb051460e6888e9975f4b4b353137e3e04a6644 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Tue, 18 Feb 2025 22:46:02 +0000
Subject: [PATCH 196/761] Update dependencies

---
 obsidian-plugin/package-lock.json         | 8440 ---------------------
 obsidian-plugin/package.json              |   23 +-
 obsidian-plugin/src/views/history-view.ts |    2 +-
 package-lock.json                         | 7498 ++++++++++++++++++
 package.json                              |   10 +-
 sync-client/package.json                  |   16 +-
 6 files changed, 7525 insertions(+), 8464 deletions(-)
 delete mode 100644 obsidian-plugin/package-lock.json
 create mode 100644 package-lock.json

diff --git a/obsidian-plugin/package-lock.json b/obsidian-plugin/package-lock.json
deleted file mode 100644
index c1d6c70a..00000000
--- a/obsidian-plugin/package-lock.json
+++ /dev/null
@@ -1,8440 +0,0 @@
-{
-	"name": "vault-link-obsidian-plugin",
-	"version": "0.0.30",
-	"lockfileVersion": 3,
-	"requires": true,
-	"packages": {
-		"": {
-			"name": "vault-link-obsidian-plugin",
-			"version": "0.0.30",
-			"license": "MIT",
-			"devDependencies": {
-				"@types/jest": "^29.5.14",
-				"@types/node": "^16.11.6",
-				"builtin-modules": "3.3.0",
-				"byte-base64": "^1.1.0",
-				"client": "file:../client",
-				"css-loader": "^7.1.2",
-				"date-fns": "^4.1.0",
-				"dayjs": "^1.11.13",
-				"esbuild": "0.24.0",
-				"esbuild-plugin-wasm-pack": "^1.1.0",
-				"esbuild-sass-plugin": "^3.3.1",
-				"eslint": "9.17.0",
-				"eslint-plugin-unused-imports": "^4.1.4",
-				"fetch-retry": "^6.0.0",
-				"file-loader": "^6.2.0",
-				"fs-extra": "^11.2.0",
-				"jest": "^29.7.0",
-				"mini-css-extract-plugin": "^2.9.2",
-				"obsidian": "1.7.2",
-				"openapi-fetch": "0.13.3",
-				"openapi-typescript": "7.4.4",
-				"p-queue": "^8.0.1",
-				"prettier": "^3.4.2",
-				"resolve-url-loader": "^5.0.0",
-				"sass-loader": "^16.0.4",
-				"sync_lib": "file:../backend/sync_lib/pkg",
-				"terser-webpack-plugin": "^5.3.11",
-				"ts-jest": "^29.2.5",
-				"ts-loader": "^9.5.1",
-				"tslib": "2.4.0",
-				"typescript": "5.7.2",
-				"typescript-eslint": "8.18.0",
-				"virtual-scroller": "^1.13.1",
-				"webpack": "^5.97.1",
-				"webpack-cli": "^6.0.1"
-			}
-		},
-		"../backend/sync_lib/pkg": {
-			"name": "sync_lib",
-			"version": "0.0.30",
-			"dev": true,
-			"license": "MIT"
-		},
-		"../client": {
-			"name": "my-lib",
-			"version": "1.0.0",
-			"dev": true
-		},
-		"node_modules/@ampproject/remapping": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
-			"integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
-			"dev": true,
-			"license": "Apache-2.0",
-			"dependencies": {
-				"@jridgewell/gen-mapping": "^0.3.5",
-				"@jridgewell/trace-mapping": "^0.3.24"
-			},
-			"engines": {
-				"node": ">=6.0.0"
-			}
-		},
-		"node_modules/@babel/code-frame": {
-			"version": "7.26.2",
-			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz",
-			"integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/helper-validator-identifier": "^7.25.9",
-				"js-tokens": "^4.0.0",
-				"picocolors": "^1.0.0"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/compat-data": {
-			"version": "7.26.3",
-			"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.3.tgz",
-			"integrity": "sha512-nHIxvKPniQXpmQLb0vhY3VaFb3S0YrTAwpOWJZh1wn3oJPjJk9Asva204PsBdmAE8vpzfHudT8DB0scYvy9q0g==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/core": {
-			"version": "7.26.0",
-			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.0.tgz",
-			"integrity": "sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@ampproject/remapping": "^2.2.0",
-				"@babel/code-frame": "^7.26.0",
-				"@babel/generator": "^7.26.0",
-				"@babel/helper-compilation-targets": "^7.25.9",
-				"@babel/helper-module-transforms": "^7.26.0",
-				"@babel/helpers": "^7.26.0",
-				"@babel/parser": "^7.26.0",
-				"@babel/template": "^7.25.9",
-				"@babel/traverse": "^7.25.9",
-				"@babel/types": "^7.26.0",
-				"convert-source-map": "^2.0.0",
-				"debug": "^4.1.0",
-				"gensync": "^1.0.0-beta.2",
-				"json5": "^2.2.3",
-				"semver": "^6.3.1"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/babel"
-			}
-		},
-		"node_modules/@babel/core/node_modules/semver": {
-			"version": "6.3.1",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-			"dev": true,
-			"license": "ISC",
-			"bin": {
-				"semver": "bin/semver.js"
-			}
-		},
-		"node_modules/@babel/generator": {
-			"version": "7.26.3",
-			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.3.tgz",
-			"integrity": "sha512-6FF/urZvD0sTeO7k6/B15pMLC4CHUv1426lzr3N01aHJTl046uCAh9LXW/fzeXXjPNCJ6iABW5XaWOsIZB93aQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/parser": "^7.26.3",
-				"@babel/types": "^7.26.3",
-				"@jridgewell/gen-mapping": "^0.3.5",
-				"@jridgewell/trace-mapping": "^0.3.25",
-				"jsesc": "^3.0.2"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-compilation-targets": {
-			"version": "7.25.9",
-			"resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.9.tgz",
-			"integrity": "sha512-j9Db8Suy6yV/VHa4qzrj9yZfZxhLWQdVnRlXxmKLYlhWUVB1sB2G5sxuWYXk/whHD9iW76PmNzxZ4UCnTQTVEQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/compat-data": "^7.25.9",
-				"@babel/helper-validator-option": "^7.25.9",
-				"browserslist": "^4.24.0",
-				"lru-cache": "^5.1.1",
-				"semver": "^6.3.1"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-compilation-targets/node_modules/semver": {
-			"version": "6.3.1",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-			"dev": true,
-			"license": "ISC",
-			"bin": {
-				"semver": "bin/semver.js"
-			}
-		},
-		"node_modules/@babel/helper-module-imports": {
-			"version": "7.25.9",
-			"resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz",
-			"integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/traverse": "^7.25.9",
-				"@babel/types": "^7.25.9"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-module-transforms": {
-			"version": "7.26.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz",
-			"integrity": "sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/helper-module-imports": "^7.25.9",
-				"@babel/helper-validator-identifier": "^7.25.9",
-				"@babel/traverse": "^7.25.9"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0"
-			}
-		},
-		"node_modules/@babel/helper-plugin-utils": {
-			"version": "7.25.9",
-			"resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.25.9.tgz",
-			"integrity": "sha512-kSMlyUVdWe25rEsRGviIgOWnoT/nfABVWlqt9N19/dIPWViAOW2s9wznP5tURbs/IDuNk4gPy3YdYRgH3uxhBw==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-string-parser": {
-			"version": "7.25.9",
-			"resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
-			"integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-validator-identifier": {
-			"version": "7.25.9",
-			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
-			"integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-validator-option": {
-			"version": "7.25.9",
-			"resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz",
-			"integrity": "sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helpers": {
-			"version": "7.26.0",
-			"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.0.tgz",
-			"integrity": "sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/template": "^7.25.9",
-				"@babel/types": "^7.26.0"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/parser": {
-			"version": "7.26.3",
-			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.3.tgz",
-			"integrity": "sha512-WJ/CvmY8Mea8iDXo6a7RK2wbmJITT5fN3BEkRuFlxVyNx8jOKIIhmC4fSkTcPcf8JyavbBwIe6OpiCOBXt/IcA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/types": "^7.26.3"
-			},
-			"bin": {
-				"parser": "bin/babel-parser.js"
-			},
-			"engines": {
-				"node": ">=6.0.0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-async-generators": {
-			"version": "7.8.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
-			"integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-bigint": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
-			"integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-class-properties": {
-			"version": "7.12.13",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
-			"integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.12.13"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-class-static-block": {
-			"version": "7.14.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
-			"integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.14.5"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-import-attributes": {
-			"version": "7.26.0",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.26.0.tgz",
-			"integrity": "sha512-e2dttdsJ1ZTpi3B9UYGLw41hifAubg19AtCu/2I/F1QNVclOBr1dYpTdmdyZ84Xiz43BS/tCUkMAZNLv12Pi+A==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.25.9"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-import-meta": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
-			"integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.10.4"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-json-strings": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
-			"integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-jsx": {
-			"version": "7.25.9",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.25.9.tgz",
-			"integrity": "sha512-ld6oezHQMZsZfp6pWtbjaNDF2tiiCYYDqQszHt5VV437lewP9aSi2Of99CK0D0XB21k7FLgnLcmQKyKzynfeAA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.25.9"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-logical-assignment-operators": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
-			"integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.10.4"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
-			"integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-numeric-separator": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
-			"integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.10.4"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-object-rest-spread": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
-			"integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-optional-catch-binding": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
-			"integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-optional-chaining": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
-			"integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-private-property-in-object": {
-			"version": "7.14.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
-			"integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.14.5"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-top-level-await": {
-			"version": "7.14.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
-			"integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.14.5"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-typescript": {
-			"version": "7.25.9",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.25.9.tgz",
-			"integrity": "sha512-hjMgRy5hb8uJJjUcdWunWVcoi9bGpJp8p5Ol1229PoN6aytsLwNMgmdftO23wnCLMfVmTwZDWMPNq/D1SY60JQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.25.9"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/template": {
-			"version": "7.25.9",
-			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz",
-			"integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/code-frame": "^7.25.9",
-				"@babel/parser": "^7.25.9",
-				"@babel/types": "^7.25.9"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/traverse": {
-			"version": "7.26.4",
-			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.4.tgz",
-			"integrity": "sha512-fH+b7Y4p3yqvApJALCPJcwb0/XaOSgtK4pzV6WVjPR5GLFQBRI7pfoX2V2iM48NXvX07NUxxm1Vw98YjqTcU5w==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/code-frame": "^7.26.2",
-				"@babel/generator": "^7.26.3",
-				"@babel/parser": "^7.26.3",
-				"@babel/template": "^7.25.9",
-				"@babel/types": "^7.26.3",
-				"debug": "^4.3.1",
-				"globals": "^11.1.0"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/traverse/node_modules/globals": {
-			"version": "11.12.0",
-			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/@babel/types": {
-			"version": "7.26.3",
-			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.3.tgz",
-			"integrity": "sha512-vN5p+1kl59GVKMvTHt55NzzmYVxprfJD+ql7U9NFIfKCBkYE55LYtS+WtPlaYOyzydrKI8Nezd+aZextrd+FMA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/helper-string-parser": "^7.25.9",
-				"@babel/helper-validator-identifier": "^7.25.9"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@bcoe/v8-coverage": {
-			"version": "0.2.3",
-			"resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
-			"integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/@bufbuild/protobuf": {
-			"version": "2.2.3",
-			"resolved": "https://registry.npmjs.org/@bufbuild/protobuf/-/protobuf-2.2.3.tgz",
-			"integrity": "sha512-tFQoXHJdkEOSwj5tRIZSPNUuXK3RaR7T1nUrPgbYX1pUbvqqaaZAsfo+NXBPsz5rZMSKVFrgK1WL8Q/MSLvprg==",
-			"dev": true,
-			"license": "(Apache-2.0 AND BSD-3-Clause)",
-			"peer": true
-		},
-		"node_modules/@codemirror/state": {
-			"version": "6.5.0",
-			"resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.5.0.tgz",
-			"integrity": "sha512-MwBHVK60IiIHDcoMet78lxt6iw5gJOGSbNbOIVBHWVXIH4/Nq1+GQgLLGgI1KlnN86WDXsPudVaqYHKBIx7Eyw==",
-			"dev": true,
-			"license": "MIT",
-			"peer": true,
-			"dependencies": {
-				"@marijn/find-cluster-break": "^1.0.0"
-			}
-		},
-		"node_modules/@codemirror/view": {
-			"version": "6.36.1",
-			"resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.36.1.tgz",
-			"integrity": "sha512-miD1nyT4m4uopZaDdO2uXU/LLHliKNYL9kB1C1wJHrunHLm/rpkb5QVSokqgw9hFqEZakrdlb/VGWX8aYZTslQ==",
-			"dev": true,
-			"license": "MIT",
-			"peer": true,
-			"dependencies": {
-				"@codemirror/state": "^6.5.0",
-				"style-mod": "^4.1.0",
-				"w3c-keyname": "^2.2.4"
-			}
-		},
-		"node_modules/@discoveryjs/json-ext": {
-			"version": "0.6.3",
-			"resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.6.3.tgz",
-			"integrity": "sha512-4B4OijXeVNOPZlYA2oEwWOTkzyltLao+xbotHQeqN++Rv27Y6s818+n2Qkp8q+Fxhn0t/5lA5X1Mxktud8eayQ==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=14.17.0"
-			}
-		},
-		"node_modules/@esbuild/aix-ppc64": {
-			"version": "0.24.0",
-			"resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.24.0.tgz",
-			"integrity": "sha512-WtKdFM7ls47zkKHFVzMz8opM7LkcsIp9amDUBIAWirg70RM71WRSjdILPsY5Uv1D42ZpUfaPILDlfactHgsRkw==",
-			"cpu": [
-				"ppc64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"aix"
-			],
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@esbuild/android-arm": {
-			"version": "0.24.0",
-			"resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.24.0.tgz",
-			"integrity": "sha512-arAtTPo76fJ/ICkXWetLCc9EwEHKaeya4vMrReVlEIUCAUncH7M4bhMQ+M9Vf+FFOZJdTNMXNBrWwW+OXWpSew==",
-			"cpu": [
-				"arm"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"android"
-			],
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@esbuild/android-arm64": {
-			"version": "0.24.0",
-			"resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.24.0.tgz",
-			"integrity": "sha512-Vsm497xFM7tTIPYK9bNTYJyF/lsP590Qc1WxJdlB6ljCbdZKU9SY8i7+Iin4kyhV/KV5J2rOKsBQbB77Ab7L/w==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"android"
-			],
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@esbuild/android-x64": {
-			"version": "0.24.0",
-			"resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.24.0.tgz",
-			"integrity": "sha512-t8GrvnFkiIY7pa7mMgJd7p8p8qqYIz1NYiAoKc75Zyv73L3DZW++oYMSHPRarcotTKuSs6m3hTOa5CKHaS02TQ==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"android"
-			],
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@esbuild/darwin-arm64": {
-			"version": "0.24.0",
-			"resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.24.0.tgz",
-			"integrity": "sha512-CKyDpRbK1hXwv79soeTJNHb5EiG6ct3efd/FTPdzOWdbZZfGhpbcqIpiD0+vwmpu0wTIL97ZRPZu8vUt46nBSw==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"darwin"
-			],
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@esbuild/darwin-x64": {
-			"version": "0.24.0",
-			"resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.24.0.tgz",
-			"integrity": "sha512-rgtz6flkVkh58od4PwTRqxbKH9cOjaXCMZgWD905JOzjFKW+7EiUObfd/Kav+A6Gyud6WZk9w+xu6QLytdi2OA==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"darwin"
-			],
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@esbuild/freebsd-arm64": {
-			"version": "0.24.0",
-			"resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.24.0.tgz",
-			"integrity": "sha512-6Mtdq5nHggwfDNLAHkPlyLBpE5L6hwsuXZX8XNmHno9JuL2+bg2BX5tRkwjyfn6sKbxZTq68suOjgWqCicvPXA==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"freebsd"
-			],
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@esbuild/freebsd-x64": {
-			"version": "0.24.0",
-			"resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.24.0.tgz",
-			"integrity": "sha512-D3H+xh3/zphoX8ck4S2RxKR6gHlHDXXzOf6f/9dbFt/NRBDIE33+cVa49Kil4WUjxMGW0ZIYBYtaGCa2+OsQwQ==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"freebsd"
-			],
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@esbuild/linux-arm": {
-			"version": "0.24.0",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.24.0.tgz",
-			"integrity": "sha512-gJKIi2IjRo5G6Glxb8d3DzYXlxdEj2NlkixPsqePSZMhLudqPhtZ4BUrpIuTjJYXxvF9njql+vRjB2oaC9XpBw==",
-			"cpu": [
-				"arm"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@esbuild/linux-arm64": {
-			"version": "0.24.0",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.24.0.tgz",
-			"integrity": "sha512-TDijPXTOeE3eaMkRYpcy3LarIg13dS9wWHRdwYRnzlwlA370rNdZqbcp0WTyyV/k2zSxfko52+C7jU5F9Tfj1g==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@esbuild/linux-ia32": {
-			"version": "0.24.0",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.24.0.tgz",
-			"integrity": "sha512-K40ip1LAcA0byL05TbCQ4yJ4swvnbzHscRmUilrmP9Am7//0UjPreh4lpYzvThT2Quw66MhjG//20mrufm40mA==",
-			"cpu": [
-				"ia32"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@esbuild/linux-loong64": {
-			"version": "0.24.0",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.24.0.tgz",
-			"integrity": "sha512-0mswrYP/9ai+CU0BzBfPMZ8RVm3RGAN/lmOMgW4aFUSOQBjA31UP8Mr6DDhWSuMwj7jaWOT0p0WoZ6jeHhrD7g==",
-			"cpu": [
-				"loong64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@esbuild/linux-mips64el": {
-			"version": "0.24.0",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.24.0.tgz",
-			"integrity": "sha512-hIKvXm0/3w/5+RDtCJeXqMZGkI2s4oMUGj3/jM0QzhgIASWrGO5/RlzAzm5nNh/awHE0A19h/CvHQe6FaBNrRA==",
-			"cpu": [
-				"mips64el"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@esbuild/linux-ppc64": {
-			"version": "0.24.0",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.24.0.tgz",
-			"integrity": "sha512-HcZh5BNq0aC52UoocJxaKORfFODWXZxtBaaZNuN3PUX3MoDsChsZqopzi5UupRhPHSEHotoiptqikjN/B77mYQ==",
-			"cpu": [
-				"ppc64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@esbuild/linux-riscv64": {
-			"version": "0.24.0",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.24.0.tgz",
-			"integrity": "sha512-bEh7dMn/h3QxeR2KTy1DUszQjUrIHPZKyO6aN1X4BCnhfYhuQqedHaa5MxSQA/06j3GpiIlFGSsy1c7Gf9padw==",
-			"cpu": [
-				"riscv64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@esbuild/linux-s390x": {
-			"version": "0.24.0",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.24.0.tgz",
-			"integrity": "sha512-ZcQ6+qRkw1UcZGPyrCiHHkmBaj9SiCD8Oqd556HldP+QlpUIe2Wgn3ehQGVoPOvZvtHm8HPx+bH20c9pvbkX3g==",
-			"cpu": [
-				"s390x"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@esbuild/linux-x64": {
-			"version": "0.24.0",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.24.0.tgz",
-			"integrity": "sha512-vbutsFqQ+foy3wSSbmjBXXIJ6PL3scghJoM8zCL142cGaZKAdCZHyf+Bpu/MmX9zT9Q0zFBVKb36Ma5Fzfa8xA==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@esbuild/netbsd-x64": {
-			"version": "0.24.0",
-			"resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.24.0.tgz",
-			"integrity": "sha512-hjQ0R/ulkO8fCYFsG0FZoH+pWgTTDreqpqY7UnQntnaKv95uP5iW3+dChxnx7C3trQQU40S+OgWhUVwCjVFLvg==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"netbsd"
-			],
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@esbuild/openbsd-arm64": {
-			"version": "0.24.0",
-			"resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.24.0.tgz",
-			"integrity": "sha512-MD9uzzkPQbYehwcN583yx3Tu5M8EIoTD+tUgKF982WYL9Pf5rKy9ltgD0eUgs8pvKnmizxjXZyLt0z6DC3rRXg==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"openbsd"
-			],
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@esbuild/openbsd-x64": {
-			"version": "0.24.0",
-			"resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.24.0.tgz",
-			"integrity": "sha512-4ir0aY1NGUhIC1hdoCzr1+5b43mw99uNwVzhIq1OY3QcEwPDO3B7WNXBzaKY5Nsf1+N11i1eOfFcq+D/gOS15Q==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"openbsd"
-			],
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@esbuild/sunos-x64": {
-			"version": "0.24.0",
-			"resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.24.0.tgz",
-			"integrity": "sha512-jVzdzsbM5xrotH+W5f1s+JtUy1UWgjU0Cf4wMvffTB8m6wP5/kx0KiaLHlbJO+dMgtxKV8RQ/JvtlFcdZ1zCPA==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"sunos"
-			],
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@esbuild/win32-arm64": {
-			"version": "0.24.0",
-			"resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.24.0.tgz",
-			"integrity": "sha512-iKc8GAslzRpBytO2/aN3d2yb2z8XTVfNV0PjGlCxKo5SgWmNXx82I/Q3aG1tFfS+A2igVCY97TJ8tnYwpUWLCA==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"win32"
-			],
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@esbuild/win32-ia32": {
-			"version": "0.24.0",
-			"resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.24.0.tgz",
-			"integrity": "sha512-vQW36KZolfIudCcTnaTpmLQ24Ha1RjygBo39/aLkM2kmjkWmZGEJ5Gn9l5/7tzXA42QGIoWbICfg6KLLkIw6yw==",
-			"cpu": [
-				"ia32"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"win32"
-			],
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@esbuild/win32-x64": {
-			"version": "0.24.0",
-			"resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.24.0.tgz",
-			"integrity": "sha512-7IAFPrjSQIJrGsK6flwg7NFmwBoSTyF3rl7If0hNUFQU4ilTsEPL6GuMuU9BfIWVVGuRnuIidkSMC+c0Otu8IA==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"win32"
-			],
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@eslint-community/eslint-utils": {
-			"version": "4.4.1",
-			"resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.1.tgz",
-			"integrity": "sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"eslint-visitor-keys": "^3.4.3"
-			},
-			"engines": {
-				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/eslint"
-			},
-			"peerDependencies": {
-				"eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
-			}
-		},
-		"node_modules/@eslint-community/eslint-utils/node_modules/eslint-visitor-keys": {
-			"version": "3.4.3",
-			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
-			"integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
-			"dev": true,
-			"license": "Apache-2.0",
-			"engines": {
-				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/eslint"
-			}
-		},
-		"node_modules/@eslint-community/regexpp": {
-			"version": "4.12.1",
-			"resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz",
-			"integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": "^12.0.0 || ^14.0.0 || >=16.0.0"
-			}
-		},
-		"node_modules/@eslint/config-array": {
-			"version": "0.19.1",
-			"resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.19.1.tgz",
-			"integrity": "sha512-fo6Mtm5mWyKjA/Chy1BYTdn5mGJoDNjC7C64ug20ADsRDGrA85bN3uK3MaKbeRkRuuIEAR5N33Jr1pbm411/PA==",
-			"dev": true,
-			"license": "Apache-2.0",
-			"dependencies": {
-				"@eslint/object-schema": "^2.1.5",
-				"debug": "^4.3.1",
-				"minimatch": "^3.1.2"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			}
-		},
-		"node_modules/@eslint/core": {
-			"version": "0.9.1",
-			"resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.9.1.tgz",
-			"integrity": "sha512-GuUdqkyyzQI5RMIWkHhvTWLCyLo1jNK3vzkSyaExH5kHPDHcuL2VOpHjmMY+y3+NC69qAKToBqldTBgYeLSr9Q==",
-			"dev": true,
-			"license": "Apache-2.0",
-			"dependencies": {
-				"@types/json-schema": "^7.0.15"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			}
-		},
-		"node_modules/@eslint/eslintrc": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.2.0.tgz",
-			"integrity": "sha512-grOjVNN8P3hjJn/eIETF1wwd12DdnwFDoyceUJLYYdkpbwq3nLi+4fqrTAONx7XDALqlL220wC/RHSC/QTI/0w==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"ajv": "^6.12.4",
-				"debug": "^4.3.2",
-				"espree": "^10.0.1",
-				"globals": "^14.0.0",
-				"ignore": "^5.2.0",
-				"import-fresh": "^3.2.1",
-				"js-yaml": "^4.1.0",
-				"minimatch": "^3.1.2",
-				"strip-json-comments": "^3.1.1"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/eslint"
-			}
-		},
-		"node_modules/@eslint/js": {
-			"version": "9.17.0",
-			"resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.17.0.tgz",
-			"integrity": "sha512-Sxc4hqcs1kTu0iID3kcZDW3JHq2a77HO9P8CP6YEA/FpH3Ll8UXE2r/86Rz9YJLKme39S9vU5OWNjC6Xl0Cr3w==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			}
-		},
-		"node_modules/@eslint/object-schema": {
-			"version": "2.1.5",
-			"resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.5.tgz",
-			"integrity": "sha512-o0bhxnL89h5Bae5T318nFoFzGy+YE5i/gGkoPAgkmTVdRKTiv3p8JHevPiPaMwoloKfEiiaHlawCqaZMqRm+XQ==",
-			"dev": true,
-			"license": "Apache-2.0",
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			}
-		},
-		"node_modules/@eslint/plugin-kit": {
-			"version": "0.2.4",
-			"resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.4.tgz",
-			"integrity": "sha512-zSkKow6H5Kdm0ZUQUB2kV5JIXqoG0+uH5YADhaEHswm664N9Db8dXSi0nMJpacpMf+MyyglF1vnZohpEg5yUtg==",
-			"dev": true,
-			"license": "Apache-2.0",
-			"dependencies": {
-				"levn": "^0.4.1"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			}
-		},
-		"node_modules/@humanfs/core": {
-			"version": "0.19.1",
-			"resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz",
-			"integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==",
-			"dev": true,
-			"license": "Apache-2.0",
-			"engines": {
-				"node": ">=18.18.0"
-			}
-		},
-		"node_modules/@humanfs/node": {
-			"version": "0.16.6",
-			"resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz",
-			"integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==",
-			"dev": true,
-			"license": "Apache-2.0",
-			"dependencies": {
-				"@humanfs/core": "^0.19.1",
-				"@humanwhocodes/retry": "^0.3.0"
-			},
-			"engines": {
-				"node": ">=18.18.0"
-			}
-		},
-		"node_modules/@humanfs/node/node_modules/@humanwhocodes/retry": {
-			"version": "0.3.1",
-			"resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz",
-			"integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==",
-			"dev": true,
-			"license": "Apache-2.0",
-			"engines": {
-				"node": ">=18.18"
-			},
-			"funding": {
-				"type": "github",
-				"url": "https://github.com/sponsors/nzakas"
-			}
-		},
-		"node_modules/@humanwhocodes/module-importer": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
-			"integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
-			"dev": true,
-			"license": "Apache-2.0",
-			"engines": {
-				"node": ">=12.22"
-			},
-			"funding": {
-				"type": "github",
-				"url": "https://github.com/sponsors/nzakas"
-			}
-		},
-		"node_modules/@humanwhocodes/retry": {
-			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.1.tgz",
-			"integrity": "sha512-c7hNEllBlenFTHBky65mhq8WD2kbN9Q6gk0bTk8lSBvc554jpXSkST1iePudpt7+A/AQvuHs9EMqjHDXMY1lrA==",
-			"dev": true,
-			"license": "Apache-2.0",
-			"engines": {
-				"node": ">=18.18"
-			},
-			"funding": {
-				"type": "github",
-				"url": "https://github.com/sponsors/nzakas"
-			}
-		},
-		"node_modules/@istanbuljs/load-nyc-config": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
-			"integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"camelcase": "^5.3.1",
-				"find-up": "^4.1.0",
-				"get-package-type": "^0.1.0",
-				"js-yaml": "^3.13.1",
-				"resolve-from": "^5.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/@istanbuljs/load-nyc-config/node_modules/argparse": {
-			"version": "1.0.10",
-			"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-			"integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"sprintf-js": "~1.0.2"
-			}
-		},
-		"node_modules/@istanbuljs/load-nyc-config/node_modules/find-up": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-			"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"locate-path": "^5.0.0",
-				"path-exists": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/@istanbuljs/load-nyc-config/node_modules/js-yaml": {
-			"version": "3.14.1",
-			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-			"integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"argparse": "^1.0.7",
-				"esprima": "^4.0.0"
-			},
-			"bin": {
-				"js-yaml": "bin/js-yaml.js"
-			}
-		},
-		"node_modules/@istanbuljs/load-nyc-config/node_modules/locate-path": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-			"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"p-locate": "^4.1.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/@istanbuljs/load-nyc-config/node_modules/p-limit": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-			"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"p-try": "^2.0.0"
-			},
-			"engines": {
-				"node": ">=6"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/@istanbuljs/load-nyc-config/node_modules/p-locate": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-			"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"p-limit": "^2.2.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/@istanbuljs/load-nyc-config/node_modules/resolve-from": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-			"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/@istanbuljs/schema": {
-			"version": "0.1.3",
-			"resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
-			"integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/@jest/console": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz",
-			"integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/types": "^29.6.3",
-				"@types/node": "*",
-				"chalk": "^4.0.0",
-				"jest-message-util": "^29.7.0",
-				"jest-util": "^29.7.0",
-				"slash": "^3.0.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/@jest/core": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/@jest/core/-/core-29.7.0.tgz",
-			"integrity": "sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/console": "^29.7.0",
-				"@jest/reporters": "^29.7.0",
-				"@jest/test-result": "^29.7.0",
-				"@jest/transform": "^29.7.0",
-				"@jest/types": "^29.6.3",
-				"@types/node": "*",
-				"ansi-escapes": "^4.2.1",
-				"chalk": "^4.0.0",
-				"ci-info": "^3.2.0",
-				"exit": "^0.1.2",
-				"graceful-fs": "^4.2.9",
-				"jest-changed-files": "^29.7.0",
-				"jest-config": "^29.7.0",
-				"jest-haste-map": "^29.7.0",
-				"jest-message-util": "^29.7.0",
-				"jest-regex-util": "^29.6.3",
-				"jest-resolve": "^29.7.0",
-				"jest-resolve-dependencies": "^29.7.0",
-				"jest-runner": "^29.7.0",
-				"jest-runtime": "^29.7.0",
-				"jest-snapshot": "^29.7.0",
-				"jest-util": "^29.7.0",
-				"jest-validate": "^29.7.0",
-				"jest-watcher": "^29.7.0",
-				"micromatch": "^4.0.4",
-				"pretty-format": "^29.7.0",
-				"slash": "^3.0.0",
-				"strip-ansi": "^6.0.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			},
-			"peerDependencies": {
-				"node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
-			},
-			"peerDependenciesMeta": {
-				"node-notifier": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/@jest/environment": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz",
-			"integrity": "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/fake-timers": "^29.7.0",
-				"@jest/types": "^29.6.3",
-				"@types/node": "*",
-				"jest-mock": "^29.7.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/@jest/expect": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz",
-			"integrity": "sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"expect": "^29.7.0",
-				"jest-snapshot": "^29.7.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/@jest/expect-utils": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz",
-			"integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"jest-get-type": "^29.6.3"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/@jest/fake-timers": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz",
-			"integrity": "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/types": "^29.6.3",
-				"@sinonjs/fake-timers": "^10.0.2",
-				"@types/node": "*",
-				"jest-message-util": "^29.7.0",
-				"jest-mock": "^29.7.0",
-				"jest-util": "^29.7.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/@jest/globals": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz",
-			"integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/environment": "^29.7.0",
-				"@jest/expect": "^29.7.0",
-				"@jest/types": "^29.6.3",
-				"jest-mock": "^29.7.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/@jest/reporters": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz",
-			"integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@bcoe/v8-coverage": "^0.2.3",
-				"@jest/console": "^29.7.0",
-				"@jest/test-result": "^29.7.0",
-				"@jest/transform": "^29.7.0",
-				"@jest/types": "^29.6.3",
-				"@jridgewell/trace-mapping": "^0.3.18",
-				"@types/node": "*",
-				"chalk": "^4.0.0",
-				"collect-v8-coverage": "^1.0.0",
-				"exit": "^0.1.2",
-				"glob": "^7.1.3",
-				"graceful-fs": "^4.2.9",
-				"istanbul-lib-coverage": "^3.0.0",
-				"istanbul-lib-instrument": "^6.0.0",
-				"istanbul-lib-report": "^3.0.0",
-				"istanbul-lib-source-maps": "^4.0.0",
-				"istanbul-reports": "^3.1.3",
-				"jest-message-util": "^29.7.0",
-				"jest-util": "^29.7.0",
-				"jest-worker": "^29.7.0",
-				"slash": "^3.0.0",
-				"string-length": "^4.0.1",
-				"strip-ansi": "^6.0.0",
-				"v8-to-istanbul": "^9.0.1"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			},
-			"peerDependencies": {
-				"node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
-			},
-			"peerDependenciesMeta": {
-				"node-notifier": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/@jest/schemas": {
-			"version": "29.6.3",
-			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
-			"integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@sinclair/typebox": "^0.27.8"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/@jest/source-map": {
-			"version": "29.6.3",
-			"resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz",
-			"integrity": "sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jridgewell/trace-mapping": "^0.3.18",
-				"callsites": "^3.0.0",
-				"graceful-fs": "^4.2.9"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/@jest/test-result": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz",
-			"integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/console": "^29.7.0",
-				"@jest/types": "^29.6.3",
-				"@types/istanbul-lib-coverage": "^2.0.0",
-				"collect-v8-coverage": "^1.0.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/@jest/test-sequencer": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz",
-			"integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/test-result": "^29.7.0",
-				"graceful-fs": "^4.2.9",
-				"jest-haste-map": "^29.7.0",
-				"slash": "^3.0.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/@jest/transform": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz",
-			"integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/core": "^7.11.6",
-				"@jest/types": "^29.6.3",
-				"@jridgewell/trace-mapping": "^0.3.18",
-				"babel-plugin-istanbul": "^6.1.1",
-				"chalk": "^4.0.0",
-				"convert-source-map": "^2.0.0",
-				"fast-json-stable-stringify": "^2.1.0",
-				"graceful-fs": "^4.2.9",
-				"jest-haste-map": "^29.7.0",
-				"jest-regex-util": "^29.6.3",
-				"jest-util": "^29.7.0",
-				"micromatch": "^4.0.4",
-				"pirates": "^4.0.4",
-				"slash": "^3.0.0",
-				"write-file-atomic": "^4.0.2"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/@jest/types": {
-			"version": "29.6.3",
-			"resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
-			"integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/schemas": "^29.6.3",
-				"@types/istanbul-lib-coverage": "^2.0.0",
-				"@types/istanbul-reports": "^3.0.0",
-				"@types/node": "*",
-				"@types/yargs": "^17.0.8",
-				"chalk": "^4.0.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/@jridgewell/gen-mapping": {
-			"version": "0.3.8",
-			"resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz",
-			"integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jridgewell/set-array": "^1.2.1",
-				"@jridgewell/sourcemap-codec": "^1.4.10",
-				"@jridgewell/trace-mapping": "^0.3.24"
-			},
-			"engines": {
-				"node": ">=6.0.0"
-			}
-		},
-		"node_modules/@jridgewell/resolve-uri": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
-			"integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6.0.0"
-			}
-		},
-		"node_modules/@jridgewell/set-array": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
-			"integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6.0.0"
-			}
-		},
-		"node_modules/@jridgewell/source-map": {
-			"version": "0.3.6",
-			"resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz",
-			"integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jridgewell/gen-mapping": "^0.3.5",
-				"@jridgewell/trace-mapping": "^0.3.25"
-			}
-		},
-		"node_modules/@jridgewell/sourcemap-codec": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
-			"integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/@jridgewell/trace-mapping": {
-			"version": "0.3.25",
-			"resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
-			"integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jridgewell/resolve-uri": "^3.1.0",
-				"@jridgewell/sourcemap-codec": "^1.4.14"
-			}
-		},
-		"node_modules/@marijn/find-cluster-break": {
-			"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==",
-			"dev": true,
-			"license": "MIT",
-			"peer": true
-		},
-		"node_modules/@nodelib/fs.scandir": {
-			"version": "2.1.5",
-			"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-			"integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@nodelib/fs.stat": "2.0.5",
-				"run-parallel": "^1.1.9"
-			},
-			"engines": {
-				"node": ">= 8"
-			}
-		},
-		"node_modules/@nodelib/fs.stat": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-			"integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">= 8"
-			}
-		},
-		"node_modules/@nodelib/fs.walk": {
-			"version": "1.2.8",
-			"resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-			"integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@nodelib/fs.scandir": "2.1.5",
-				"fastq": "^1.6.0"
-			},
-			"engines": {
-				"node": ">= 8"
-			}
-		},
-		"node_modules/@parcel/watcher": {
-			"version": "2.5.0",
-			"resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.0.tgz",
-			"integrity": "sha512-i0GV1yJnm2n3Yq1qw6QrUrd/LI9bE8WEBOTtOkpCXHHdyN3TAGgqAK/DAT05z4fq2x04cARXt2pDmjWjL92iTQ==",
-			"dev": true,
-			"hasInstallScript": true,
-			"license": "MIT",
-			"optional": true,
-			"dependencies": {
-				"detect-libc": "^1.0.3",
-				"is-glob": "^4.0.3",
-				"micromatch": "^4.0.5",
-				"node-addon-api": "^7.0.0"
-			},
-			"engines": {
-				"node": ">= 10.0.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/parcel"
-			},
-			"optionalDependencies": {
-				"@parcel/watcher-android-arm64": "2.5.0",
-				"@parcel/watcher-darwin-arm64": "2.5.0",
-				"@parcel/watcher-darwin-x64": "2.5.0",
-				"@parcel/watcher-freebsd-x64": "2.5.0",
-				"@parcel/watcher-linux-arm-glibc": "2.5.0",
-				"@parcel/watcher-linux-arm-musl": "2.5.0",
-				"@parcel/watcher-linux-arm64-glibc": "2.5.0",
-				"@parcel/watcher-linux-arm64-musl": "2.5.0",
-				"@parcel/watcher-linux-x64-glibc": "2.5.0",
-				"@parcel/watcher-linux-x64-musl": "2.5.0",
-				"@parcel/watcher-win32-arm64": "2.5.0",
-				"@parcel/watcher-win32-ia32": "2.5.0",
-				"@parcel/watcher-win32-x64": "2.5.0"
-			}
-		},
-		"node_modules/@parcel/watcher-android-arm64": {
-			"version": "2.5.0",
-			"resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.0.tgz",
-			"integrity": "sha512-qlX4eS28bUcQCdribHkg/herLe+0A9RyYC+mm2PXpncit8z5b3nSqGVzMNR3CmtAOgRutiZ02eIJJgP/b1iEFQ==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"android"
-			],
-			"engines": {
-				"node": ">= 10.0.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/parcel"
-			}
-		},
-		"node_modules/@parcel/watcher-darwin-arm64": {
-			"version": "2.5.0",
-			"resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.0.tgz",
-			"integrity": "sha512-hyZ3TANnzGfLpRA2s/4U1kbw2ZI4qGxaRJbBH2DCSREFfubMswheh8TeiC1sGZ3z2jUf3s37P0BBlrD3sjVTUw==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"darwin"
-			],
-			"engines": {
-				"node": ">= 10.0.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/parcel"
-			}
-		},
-		"node_modules/@parcel/watcher-darwin-x64": {
-			"version": "2.5.0",
-			"resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.0.tgz",
-			"integrity": "sha512-9rhlwd78saKf18fT869/poydQK8YqlU26TMiNg7AIu7eBp9adqbJZqmdFOsbZ5cnLp5XvRo9wcFmNHgHdWaGYA==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"darwin"
-			],
-			"engines": {
-				"node": ">= 10.0.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/parcel"
-			}
-		},
-		"node_modules/@parcel/watcher-freebsd-x64": {
-			"version": "2.5.0",
-			"resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.0.tgz",
-			"integrity": "sha512-syvfhZzyM8kErg3VF0xpV8dixJ+RzbUaaGaeb7uDuz0D3FK97/mZ5AJQ3XNnDsXX7KkFNtyQyFrXZzQIcN49Tw==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"freebsd"
-			],
-			"engines": {
-				"node": ">= 10.0.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/parcel"
-			}
-		},
-		"node_modules/@parcel/watcher-linux-arm-glibc": {
-			"version": "2.5.0",
-			"resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.0.tgz",
-			"integrity": "sha512-0VQY1K35DQET3dVYWpOaPFecqOT9dbuCfzjxoQyif1Wc574t3kOSkKevULddcR9znz1TcklCE7Ht6NIxjvTqLA==",
-			"cpu": [
-				"arm"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": ">= 10.0.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/parcel"
-			}
-		},
-		"node_modules/@parcel/watcher-linux-arm-musl": {
-			"version": "2.5.0",
-			"resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.0.tgz",
-			"integrity": "sha512-6uHywSIzz8+vi2lAzFeltnYbdHsDm3iIB57d4g5oaB9vKwjb6N6dRIgZMujw4nm5r6v9/BQH0noq6DzHrqr2pA==",
-			"cpu": [
-				"arm"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": ">= 10.0.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/parcel"
-			}
-		},
-		"node_modules/@parcel/watcher-linux-arm64-glibc": {
-			"version": "2.5.0",
-			"resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.0.tgz",
-			"integrity": "sha512-BfNjXwZKxBy4WibDb/LDCriWSKLz+jJRL3cM/DllnHH5QUyoiUNEp3GmL80ZqxeumoADfCCP19+qiYiC8gUBjA==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": ">= 10.0.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/parcel"
-			}
-		},
-		"node_modules/@parcel/watcher-linux-arm64-musl": {
-			"version": "2.5.0",
-			"resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.0.tgz",
-			"integrity": "sha512-S1qARKOphxfiBEkwLUbHjCY9BWPdWnW9j7f7Hb2jPplu8UZ3nes7zpPOW9bkLbHRvWM0WDTsjdOTUgW0xLBN1Q==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": ">= 10.0.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/parcel"
-			}
-		},
-		"node_modules/@parcel/watcher-linux-x64-glibc": {
-			"version": "2.5.0",
-			"resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.0.tgz",
-			"integrity": "sha512-d9AOkusyXARkFD66S6zlGXyzx5RvY+chTP9Jp0ypSTC9d4lzyRs9ovGf/80VCxjKddcUvnsGwCHWuF2EoPgWjw==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": ">= 10.0.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/parcel"
-			}
-		},
-		"node_modules/@parcel/watcher-linux-x64-musl": {
-			"version": "2.5.0",
-			"resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.0.tgz",
-			"integrity": "sha512-iqOC+GoTDoFyk/VYSFHwjHhYrk8bljW6zOhPuhi5t9ulqiYq1togGJB5e3PwYVFFfeVgc6pbz3JdQyDoBszVaA==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": ">= 10.0.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/parcel"
-			}
-		},
-		"node_modules/@parcel/watcher-win32-arm64": {
-			"version": "2.5.0",
-			"resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.0.tgz",
-			"integrity": "sha512-twtft1d+JRNkM5YbmexfcH/N4znDtjgysFaV9zvZmmJezQsKpkfLYJ+JFV3uygugK6AtIM2oADPkB2AdhBrNig==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"win32"
-			],
-			"engines": {
-				"node": ">= 10.0.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/parcel"
-			}
-		},
-		"node_modules/@parcel/watcher-win32-ia32": {
-			"version": "2.5.0",
-			"resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.0.tgz",
-			"integrity": "sha512-+rgpsNRKwo8A53elqbbHXdOMtY/tAtTzManTWShB5Kk54N8Q9mzNWV7tV+IbGueCbcj826MfWGU3mprWtuf1TA==",
-			"cpu": [
-				"ia32"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"win32"
-			],
-			"engines": {
-				"node": ">= 10.0.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/parcel"
-			}
-		},
-		"node_modules/@parcel/watcher-win32-x64": {
-			"version": "2.5.0",
-			"resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.0.tgz",
-			"integrity": "sha512-lPrxve92zEHdgeff3aiu4gDOIt4u7sJYha6wbdEZDCDUhtjTsOMiaJzG5lMY4GkWH8p0fMmO2Ppq5G5XXG+DQw==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"win32"
-			],
-			"engines": {
-				"node": ">= 10.0.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/parcel"
-			}
-		},
-		"node_modules/@redocly/ajv": {
-			"version": "8.11.2",
-			"resolved": "https://registry.npmjs.org/@redocly/ajv/-/ajv-8.11.2.tgz",
-			"integrity": "sha512-io1JpnwtIcvojV7QKDUSIuMN/ikdOUd1ReEnUnMKGfDVridQZ31J0MmIuqwuRjWDZfmvr+Q0MqCcfHM2gTivOg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"fast-deep-equal": "^3.1.1",
-				"json-schema-traverse": "^1.0.0",
-				"require-from-string": "^2.0.2",
-				"uri-js-replace": "^1.0.1"
-			},
-			"funding": {
-				"type": "github",
-				"url": "https://github.com/sponsors/epoberezkin"
-			}
-		},
-		"node_modules/@redocly/ajv/node_modules/json-schema-traverse": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/@redocly/config": {
-			"version": "0.17.1",
-			"resolved": "https://registry.npmjs.org/@redocly/config/-/config-0.17.1.tgz",
-			"integrity": "sha512-CEmvaJuG7pm2ylQg53emPmtgm4nW2nxBgwXzbVEHpGas/lGnMyN8Zlkgiz6rPw0unASg6VW3wlz27SOL5XFHYQ==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/@redocly/openapi-core": {
-			"version": "1.27.0",
-			"resolved": "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.27.0.tgz",
-			"integrity": "sha512-C3EU9NYbo7bCc9SduHrk6/liUuuBqVfJHOhfbscNCR1443Rdpz3s+bB2Xhso9mdQJT0JjklRn2WTANjavl2Zng==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@redocly/ajv": "^8.11.2",
-				"@redocly/config": "^0.17.0",
-				"colorette": "^1.2.0",
-				"https-proxy-agent": "^7.0.4",
-				"js-levenshtein": "^1.1.6",
-				"js-yaml": "^4.1.0",
-				"minimatch": "^5.0.1",
-				"node-fetch": "^2.6.1",
-				"pluralize": "^8.0.0",
-				"yaml-ast-parser": "0.0.43"
-			},
-			"engines": {
-				"node": ">=14.19.0",
-				"npm": ">=7.0.0"
-			}
-		},
-		"node_modules/@redocly/openapi-core/node_modules/brace-expansion": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-			"integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"balanced-match": "^1.0.0"
-			}
-		},
-		"node_modules/@redocly/openapi-core/node_modules/minimatch": {
-			"version": "5.1.6",
-			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
-			"integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"brace-expansion": "^2.0.1"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/@sinclair/typebox": {
-			"version": "0.27.8",
-			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
-			"integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/@sinonjs/commons": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz",
-			"integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==",
-			"dev": true,
-			"license": "BSD-3-Clause",
-			"dependencies": {
-				"type-detect": "4.0.8"
-			}
-		},
-		"node_modules/@sinonjs/fake-timers": {
-			"version": "10.3.0",
-			"resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz",
-			"integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==",
-			"dev": true,
-			"license": "BSD-3-Clause",
-			"dependencies": {
-				"@sinonjs/commons": "^3.0.0"
-			}
-		},
-		"node_modules/@types/babel__core": {
-			"version": "7.20.5",
-			"resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
-			"integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/parser": "^7.20.7",
-				"@babel/types": "^7.20.7",
-				"@types/babel__generator": "*",
-				"@types/babel__template": "*",
-				"@types/babel__traverse": "*"
-			}
-		},
-		"node_modules/@types/babel__generator": {
-			"version": "7.6.8",
-			"resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz",
-			"integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/types": "^7.0.0"
-			}
-		},
-		"node_modules/@types/babel__template": {
-			"version": "7.4.4",
-			"resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz",
-			"integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/parser": "^7.1.0",
-				"@babel/types": "^7.0.0"
-			}
-		},
-		"node_modules/@types/babel__traverse": {
-			"version": "7.20.6",
-			"resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.6.tgz",
-			"integrity": "sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/types": "^7.20.7"
-			}
-		},
-		"node_modules/@types/codemirror": {
-			"version": "5.60.8",
-			"resolved": "https://registry.npmjs.org/@types/codemirror/-/codemirror-5.60.8.tgz",
-			"integrity": "sha512-VjFgDF/eB+Aklcy15TtOTLQeMjTo07k7KAjql8OK5Dirr7a6sJY4T1uVBDuTVG9VEmn1uUsohOpYnVfgC6/jyw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@types/tern": "*"
-			}
-		},
-		"node_modules/@types/eslint": {
-			"version": "9.6.1",
-			"resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz",
-			"integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@types/estree": "*",
-				"@types/json-schema": "*"
-			}
-		},
-		"node_modules/@types/eslint-scope": {
-			"version": "3.7.7",
-			"resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
-			"integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@types/eslint": "*",
-				"@types/estree": "*"
-			}
-		},
-		"node_modules/@types/estree": {
-			"version": "1.0.6",
-			"resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
-			"integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/@types/graceful-fs": {
-			"version": "4.1.9",
-			"resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz",
-			"integrity": "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@types/node": "*"
-			}
-		},
-		"node_modules/@types/istanbul-lib-coverage": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz",
-			"integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/@types/istanbul-lib-report": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz",
-			"integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@types/istanbul-lib-coverage": "*"
-			}
-		},
-		"node_modules/@types/istanbul-reports": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz",
-			"integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@types/istanbul-lib-report": "*"
-			}
-		},
-		"node_modules/@types/jest": {
-			"version": "29.5.14",
-			"resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.14.tgz",
-			"integrity": "sha512-ZN+4sdnLUbo8EVvVc2ao0GFW6oVrQRPn4K2lglySj7APvSrgzxHiNNK99us4WDMi57xxA2yggblIAMNhXOotLQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"expect": "^29.0.0",
-				"pretty-format": "^29.0.0"
-			}
-		},
-		"node_modules/@types/json-schema": {
-			"version": "7.0.15",
-			"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
-			"integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/@types/node": {
-			"version": "16.18.123",
-			"resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.123.tgz",
-			"integrity": "sha512-/n7I6V/4agSpJtFDKKFEa763Hc1z3hmvchobHS1TisCOTKD5nxq8NJ2iK7SRIMYL276Q9mgWOx2AWp5n2XI6eA==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/@types/stack-utils": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz",
-			"integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/@types/tern": {
-			"version": "0.23.9",
-			"resolved": "https://registry.npmjs.org/@types/tern/-/tern-0.23.9.tgz",
-			"integrity": "sha512-ypzHFE/wBzh+BlH6rrBgS5I/Z7RD21pGhZ2rltb/+ZrVM1awdZwjx7hE5XfuYgHWk9uvV5HLZN3SloevCAp3Bw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@types/estree": "*"
-			}
-		},
-		"node_modules/@types/yargs": {
-			"version": "17.0.33",
-			"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.33.tgz",
-			"integrity": "sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@types/yargs-parser": "*"
-			}
-		},
-		"node_modules/@types/yargs-parser": {
-			"version": "21.0.3",
-			"resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz",
-			"integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/@typescript-eslint/eslint-plugin": {
-			"version": "8.18.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.18.0.tgz",
-			"integrity": "sha512-NR2yS7qUqCL7AIxdJUQf2MKKNDVNaig/dEB0GBLU7D+ZdHgK1NoH/3wsgO3OnPVipn51tG3MAwaODEGil70WEw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@eslint-community/regexpp": "^4.10.0",
-				"@typescript-eslint/scope-manager": "8.18.0",
-				"@typescript-eslint/type-utils": "8.18.0",
-				"@typescript-eslint/utils": "8.18.0",
-				"@typescript-eslint/visitor-keys": "8.18.0",
-				"graphemer": "^1.4.0",
-				"ignore": "^5.3.1",
-				"natural-compare": "^1.4.0",
-				"ts-api-utils": "^1.3.0"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			},
-			"peerDependencies": {
-				"@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0",
-				"eslint": "^8.57.0 || ^9.0.0",
-				"typescript": ">=4.8.4 <5.8.0"
-			}
-		},
-		"node_modules/@typescript-eslint/parser": {
-			"version": "8.18.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.18.0.tgz",
-			"integrity": "sha512-hgUZ3kTEpVzKaK3uNibExUYm6SKKOmTU2BOxBSvOYwtJEPdVQ70kZJpPjstlnhCHcuc2WGfSbpKlb/69ttyN5Q==",
-			"dev": true,
-			"license": "MITClause",
-			"dependencies": {
-				"@typescript-eslint/scope-manager": "8.18.0",
-				"@typescript-eslint/types": "8.18.0",
-				"@typescript-eslint/typescript-estree": "8.18.0",
-				"@typescript-eslint/visitor-keys": "8.18.0",
-				"debug": "^4.3.4"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			},
-			"peerDependencies": {
-				"eslint": "^8.57.0 || ^9.0.0",
-				"typescript": ">=4.8.4 <5.8.0"
-			}
-		},
-		"node_modules/@typescript-eslint/scope-manager": {
-			"version": "8.18.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.18.0.tgz",
-			"integrity": "sha512-PNGcHop0jkK2WVYGotk/hxj+UFLhXtGPiGtiaWgVBVP1jhMoMCHlTyJA+hEj4rszoSdLTK3fN4oOatrL0Cp+Xw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@typescript-eslint/types": "8.18.0",
-				"@typescript-eslint/visitor-keys": "8.18.0"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			}
-		},
-		"node_modules/@typescript-eslint/type-utils": {
-			"version": "8.18.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.18.0.tgz",
-			"integrity": "sha512-er224jRepVAVLnMF2Q7MZJCq5CsdH2oqjP4dT7K6ij09Kyd+R21r7UVJrF0buMVdZS5QRhDzpvzAxHxabQadow==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@typescript-eslint/typescript-estree": "8.18.0",
-				"@typescript-eslint/utils": "8.18.0",
-				"debug": "^4.3.4",
-				"ts-api-utils": "^1.3.0"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			},
-			"peerDependencies": {
-				"eslint": "^8.57.0 || ^9.0.0",
-				"typescript": ">=4.8.4 <5.8.0"
-			}
-		},
-		"node_modules/@typescript-eslint/types": {
-			"version": "8.18.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.18.0.tgz",
-			"integrity": "sha512-FNYxgyTCAnFwTrzpBGq+zrnoTO4x0c1CKYY5MuUTzpScqmY5fmsh2o3+57lqdI3NZucBDCzDgdEbIaNfAjAHQA==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			}
-		},
-		"node_modules/@typescript-eslint/typescript-estree": {
-			"version": "8.18.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.18.0.tgz",
-			"integrity": "sha512-rqQgFRu6yPkauz+ms3nQpohwejS8bvgbPyIDq13cgEDbkXt4LH4OkDMT0/fN1RUtzG8e8AKJyDBoocuQh8qNeg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@typescript-eslint/types": "8.18.0",
-				"@typescript-eslint/visitor-keys": "8.18.0",
-				"debug": "^4.3.4",
-				"fast-glob": "^3.3.2",
-				"is-glob": "^4.0.3",
-				"minimatch": "^9.0.4",
-				"semver": "^7.6.0",
-				"ts-api-utils": "^1.3.0"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			},
-			"peerDependencies": {
-				"typescript": ">=4.8.4 <5.8.0"
-			}
-		},
-		"node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-			"integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"balanced-match": "^1.0.0"
-			}
-		},
-		"node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": {
-			"version": "9.0.5",
-			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-			"integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"brace-expansion": "^2.0.1"
-			},
-			"engines": {
-				"node": ">=16 || 14 >=14.17"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			}
-		},
-		"node_modules/@typescript-eslint/utils": {
-			"version": "8.18.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.18.0.tgz",
-			"integrity": "sha512-p6GLdY383i7h5b0Qrfbix3Vc3+J2k6QWw6UMUeY5JGfm3C5LbZ4QIZzJNoNOfgyRe0uuYKjvVOsO/jD4SJO+xg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@eslint-community/eslint-utils": "^4.4.0",
-				"@typescript-eslint/scope-manager": "8.18.0",
-				"@typescript-eslint/types": "8.18.0",
-				"@typescript-eslint/typescript-estree": "8.18.0"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			},
-			"peerDependencies": {
-				"eslint": "^8.57.0 || ^9.0.0",
-				"typescript": ">=4.8.4 <5.8.0"
-			}
-		},
-		"node_modules/@typescript-eslint/visitor-keys": {
-			"version": "8.18.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.18.0.tgz",
-			"integrity": "sha512-pCh/qEA8Lb1wVIqNvBke8UaRjJ6wrAWkJO5yyIbs8Yx6TNGYyfNjOo61tLv+WwLvoLPp4BQ8B7AHKijl8NGUfw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@typescript-eslint/types": "8.18.0",
-				"eslint-visitor-keys": "^4.2.0"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			}
-		},
-		"node_modules/@webassemblyjs/ast": {
-			"version": "1.14.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz",
-			"integrity": "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@webassemblyjs/helper-numbers": "1.13.2",
-				"@webassemblyjs/helper-wasm-bytecode": "1.13.2"
-			}
-		},
-		"node_modules/@webassemblyjs/floating-point-hex-parser": {
-			"version": "1.13.2",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz",
-			"integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/@webassemblyjs/helper-api-error": {
-			"version": "1.13.2",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz",
-			"integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/@webassemblyjs/helper-buffer": {
-			"version": "1.14.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz",
-			"integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/@webassemblyjs/helper-numbers": {
-			"version": "1.13.2",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz",
-			"integrity": "sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@webassemblyjs/floating-point-hex-parser": "1.13.2",
-				"@webassemblyjs/helper-api-error": "1.13.2",
-				"@xtuc/long": "4.2.2"
-			}
-		},
-		"node_modules/@webassemblyjs/helper-wasm-bytecode": {
-			"version": "1.13.2",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz",
-			"integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/@webassemblyjs/helper-wasm-section": {
-			"version": "1.14.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz",
-			"integrity": "sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@webassemblyjs/ast": "1.14.1",
-				"@webassemblyjs/helper-buffer": "1.14.1",
-				"@webassemblyjs/helper-wasm-bytecode": "1.13.2",
-				"@webassemblyjs/wasm-gen": "1.14.1"
-			}
-		},
-		"node_modules/@webassemblyjs/ieee754": {
-			"version": "1.13.2",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz",
-			"integrity": "sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@xtuc/ieee754": "^1.2.0"
-			}
-		},
-		"node_modules/@webassemblyjs/leb128": {
-			"version": "1.13.2",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz",
-			"integrity": "sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==",
-			"dev": true,
-			"license": "Apache-2.0",
-			"dependencies": {
-				"@xtuc/long": "4.2.2"
-			}
-		},
-		"node_modules/@webassemblyjs/utf8": {
-			"version": "1.13.2",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz",
-			"integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/@webassemblyjs/wasm-edit": {
-			"version": "1.14.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz",
-			"integrity": "sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@webassemblyjs/ast": "1.14.1",
-				"@webassemblyjs/helper-buffer": "1.14.1",
-				"@webassemblyjs/helper-wasm-bytecode": "1.13.2",
-				"@webassemblyjs/helper-wasm-section": "1.14.1",
-				"@webassemblyjs/wasm-gen": "1.14.1",
-				"@webassemblyjs/wasm-opt": "1.14.1",
-				"@webassemblyjs/wasm-parser": "1.14.1",
-				"@webassemblyjs/wast-printer": "1.14.1"
-			}
-		},
-		"node_modules/@webassemblyjs/wasm-gen": {
-			"version": "1.14.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz",
-			"integrity": "sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@webassemblyjs/ast": "1.14.1",
-				"@webassemblyjs/helper-wasm-bytecode": "1.13.2",
-				"@webassemblyjs/ieee754": "1.13.2",
-				"@webassemblyjs/leb128": "1.13.2",
-				"@webassemblyjs/utf8": "1.13.2"
-			}
-		},
-		"node_modules/@webassemblyjs/wasm-opt": {
-			"version": "1.14.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz",
-			"integrity": "sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@webassemblyjs/ast": "1.14.1",
-				"@webassemblyjs/helper-buffer": "1.14.1",
-				"@webassemblyjs/wasm-gen": "1.14.1",
-				"@webassemblyjs/wasm-parser": "1.14.1"
-			}
-		},
-		"node_modules/@webassemblyjs/wasm-parser": {
-			"version": "1.14.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz",
-			"integrity": "sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@webassemblyjs/ast": "1.14.1",
-				"@webassemblyjs/helper-api-error": "1.13.2",
-				"@webassemblyjs/helper-wasm-bytecode": "1.13.2",
-				"@webassemblyjs/ieee754": "1.13.2",
-				"@webassemblyjs/leb128": "1.13.2",
-				"@webassemblyjs/utf8": "1.13.2"
-			}
-		},
-		"node_modules/@webassemblyjs/wast-printer": {
-			"version": "1.14.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz",
-			"integrity": "sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@webassemblyjs/ast": "1.14.1",
-				"@xtuc/long": "4.2.2"
-			}
-		},
-		"node_modules/@webpack-cli/configtest": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-3.0.1.tgz",
-			"integrity": "sha512-u8d0pJ5YFgneF/GuvEiDA61Tf1VDomHHYMjv/wc9XzYj7nopltpG96nXN5dJRstxZhcNpV1g+nT6CydO7pHbjA==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=18.12.0"
-			},
-			"peerDependencies": {
-				"webpack": "^5.82.0",
-				"webpack-cli": "6.x.x"
-			}
-		},
-		"node_modules/@webpack-cli/info": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-3.0.1.tgz",
-			"integrity": "sha512-coEmDzc2u/ffMvuW9aCjoRzNSPDl/XLuhPdlFRpT9tZHmJ/039az33CE7uH+8s0uL1j5ZNtfdv0HkfaKRBGJsQ==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=18.12.0"
-			},
-			"peerDependencies": {
-				"webpack": "^5.82.0",
-				"webpack-cli": "6.x.x"
-			}
-		},
-		"node_modules/@webpack-cli/serve": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-3.0.1.tgz",
-			"integrity": "sha512-sbgw03xQaCLiT6gcY/6u3qBDn01CWw/nbaXl3gTdTFuJJ75Gffv3E3DBpgvY2fkkrdS1fpjaXNOmJlnbtKauKg==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=18.12.0"
-			},
-			"peerDependencies": {
-				"webpack": "^5.82.0",
-				"webpack-cli": "6.x.x"
-			},
-			"peerDependenciesMeta": {
-				"webpack-dev-server": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/@xtuc/ieee754": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-			"integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
-			"dev": true,
-			"license": "BSD-3-Clause"
-		},
-		"node_modules/@xtuc/long": {
-			"version": "4.2.2",
-			"resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-			"integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
-			"dev": true,
-			"license": "Apache-2.0"
-		},
-		"node_modules/acorn": {
-			"version": "8.14.0",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
-			"integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
-			"dev": true,
-			"license": "MIT",
-			"bin": {
-				"acorn": "bin/acorn"
-			},
-			"engines": {
-				"node": ">=0.4.0"
-			}
-		},
-		"node_modules/acorn-jsx": {
-			"version": "5.3.2",
-			"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-			"integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-			"dev": true,
-			"license": "MIT",
-			"peerDependencies": {
-				"acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
-			}
-		},
-		"node_modules/adjust-sourcemap-loader": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-4.0.0.tgz",
-			"integrity": "sha512-OXwN5b9pCUXNQHJpwwD2qP40byEmSgzj8B4ydSN0uMNYWiFmJ6x6KwUllMmfk8Rwu/HJDFR7U8ubsWBoN0Xp0A==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"loader-utils": "^2.0.0",
-				"regex-parser": "^2.2.11"
-			},
-			"engines": {
-				"node": ">=8.9"
-			}
-		},
-		"node_modules/agent-base": {
-			"version": "7.1.3",
-			"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
-			"integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">= 14"
-			}
-		},
-		"node_modules/ajv": {
-			"version": "6.12.6",
-			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-			"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"fast-deep-equal": "^3.1.1",
-				"fast-json-stable-stringify": "^2.0.0",
-				"json-schema-traverse": "^0.4.1",
-				"uri-js": "^4.2.2"
-			},
-			"funding": {
-				"type": "github",
-				"url": "https://github.com/sponsors/epoberezkin"
-			}
-		},
-		"node_modules/ajv-formats": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
-			"integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"ajv": "^8.0.0"
-			},
-			"peerDependencies": {
-				"ajv": "^8.0.0"
-			},
-			"peerDependenciesMeta": {
-				"ajv": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/ajv-formats/node_modules/ajv": {
-			"version": "8.17.1",
-			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
-			"integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"fast-deep-equal": "^3.1.3",
-				"fast-uri": "^3.0.1",
-				"json-schema-traverse": "^1.0.0",
-				"require-from-string": "^2.0.2"
-			},
-			"funding": {
-				"type": "github",
-				"url": "https://github.com/sponsors/epoberezkin"
-			}
-		},
-		"node_modules/ajv-formats/node_modules/json-schema-traverse": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/ajv-keywords": {
-			"version": "3.5.2",
-			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-			"integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-			"dev": true,
-			"license": "MIT",
-			"peerDependencies": {
-				"ajv": "^6.9.1"
-			}
-		},
-		"node_modules/ansi-colors": {
-			"version": "4.1.3",
-			"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
-			"integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/ansi-escapes": {
-			"version": "4.3.2",
-			"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
-			"integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"type-fest": "^0.21.3"
-			},
-			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/ansi-regex": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-			"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/ansi-styles": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"color-convert": "^2.0.1"
-			},
-			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
-			}
-		},
-		"node_modules/anymatch": {
-			"version": "3.1.3",
-			"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
-			"integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"normalize-path": "^3.0.0",
-				"picomatch": "^2.0.4"
-			},
-			"engines": {
-				"node": ">= 8"
-			}
-		},
-		"node_modules/argparse": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-			"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-			"dev": true,
-			"license": "Python-2.0"
-		},
-		"node_modules/async": {
-			"version": "3.2.6",
-			"resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
-			"integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/babel-jest": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz",
-			"integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/transform": "^29.7.0",
-				"@types/babel__core": "^7.1.14",
-				"babel-plugin-istanbul": "^6.1.1",
-				"babel-preset-jest": "^29.6.3",
-				"chalk": "^4.0.0",
-				"graceful-fs": "^4.2.9",
-				"slash": "^3.0.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.8.0"
-			}
-		},
-		"node_modules/babel-plugin-istanbul": {
-			"version": "6.1.1",
-			"resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
-			"integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
-			"dev": true,
-			"license": "BSD-3-Clause",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.0.0",
-				"@istanbuljs/load-nyc-config": "^1.0.0",
-				"@istanbuljs/schema": "^0.1.2",
-				"istanbul-lib-instrument": "^5.0.4",
-				"test-exclude": "^6.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/babel-plugin-istanbul/node_modules/istanbul-lib-instrument": {
-			"version": "5.2.1",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
-			"integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
-			"dev": true,
-			"license": "BSD-3-Clause",
-			"dependencies": {
-				"@babel/core": "^7.12.3",
-				"@babel/parser": "^7.14.7",
-				"@istanbuljs/schema": "^0.1.2",
-				"istanbul-lib-coverage": "^3.2.0",
-				"semver": "^6.3.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/babel-plugin-istanbul/node_modules/semver": {
-			"version": "6.3.1",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-			"dev": true,
-			"license": "ISC",
-			"bin": {
-				"semver": "bin/semver.js"
-			}
-		},
-		"node_modules/babel-plugin-jest-hoist": {
-			"version": "29.6.3",
-			"resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz",
-			"integrity": "sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/template": "^7.3.3",
-				"@babel/types": "^7.3.3",
-				"@types/babel__core": "^7.1.14",
-				"@types/babel__traverse": "^7.0.6"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/babel-preset-current-node-syntax": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.1.0.tgz",
-			"integrity": "sha512-ldYss8SbBlWva1bs28q78Ju5Zq1F+8BrqBZZ0VFhLBvhh6lCpC2o3gDJi/5DRLs9FgYZCnmPYIVFU4lRXCkyUw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/plugin-syntax-async-generators": "^7.8.4",
-				"@babel/plugin-syntax-bigint": "^7.8.3",
-				"@babel/plugin-syntax-class-properties": "^7.12.13",
-				"@babel/plugin-syntax-class-static-block": "^7.14.5",
-				"@babel/plugin-syntax-import-attributes": "^7.24.7",
-				"@babel/plugin-syntax-import-meta": "^7.10.4",
-				"@babel/plugin-syntax-json-strings": "^7.8.3",
-				"@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
-				"@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-				"@babel/plugin-syntax-numeric-separator": "^7.10.4",
-				"@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-				"@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-				"@babel/plugin-syntax-optional-chaining": "^7.8.3",
-				"@babel/plugin-syntax-private-property-in-object": "^7.14.5",
-				"@babel/plugin-syntax-top-level-await": "^7.14.5"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0"
-			}
-		},
-		"node_modules/babel-preset-jest": {
-			"version": "29.6.3",
-			"resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz",
-			"integrity": "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"babel-plugin-jest-hoist": "^29.6.3",
-				"babel-preset-current-node-syntax": "^1.0.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0"
-			}
-		},
-		"node_modules/balanced-match": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-			"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/big.js": {
-			"version": "5.2.2",
-			"resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
-			"integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": "*"
-			}
-		},
-		"node_modules/brace-expansion": {
-			"version": "1.1.11",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"balanced-match": "^1.0.0",
-				"concat-map": "0.0.1"
-			}
-		},
-		"node_modules/braces": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
-			"integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"fill-range": "^7.1.1"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/browserslist": {
-			"version": "4.24.3",
-			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.3.tgz",
-			"integrity": "sha512-1CPmv8iobE2fyRMV97dAcMVegvvWKxmq94hkLiAkUGwKVTyDLw33K+ZxiFrREKmmps4rIw6grcCFCnTMSZ/YiA==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "opencollective",
-					"url": "https://opencollective.com/browserslist"
-				},
-				{
-					"type": "tidelift",
-					"url": "https://tidelift.com/funding/github/npm/browserslist"
-				},
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/ai"
-				}
-			],
-			"license": "MIT",
-			"dependencies": {
-				"caniuse-lite": "^1.0.30001688",
-				"electron-to-chromium": "^1.5.73",
-				"node-releases": "^2.0.19",
-				"update-browserslist-db": "^1.1.1"
-			},
-			"bin": {
-				"browserslist": "cli.js"
-			},
-			"engines": {
-				"node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
-			}
-		},
-		"node_modules/bs-logger": {
-			"version": "0.2.6",
-			"resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz",
-			"integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"fast-json-stable-stringify": "2.x"
-			},
-			"engines": {
-				"node": ">= 6"
-			}
-		},
-		"node_modules/bser": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
-			"integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
-			"dev": true,
-			"license": "Apache-2.0",
-			"dependencies": {
-				"node-int64": "^0.4.0"
-			}
-		},
-		"node_modules/buffer-builder": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/buffer-builder/-/buffer-builder-0.2.0.tgz",
-			"integrity": "sha512-7VPMEPuYznPSoR21NE1zvd2Xna6c/CloiZCfcMXR1Jny6PjX0N4Nsa38zcBFo/FMK+BlA+FLKbJCQ0i2yxp+Xg==",
-			"dev": true,
-			"license": "MIT/X11",
-			"peer": true
-		},
-		"node_modules/buffer-from": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-			"integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/builtin-modules": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz",
-			"integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/byte-base64": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/byte-base64/-/byte-base64-1.1.0.tgz",
-			"integrity": "sha512-56cXelkJrVMdCY9V/3RfDxTh4VfMFCQ5km7B7GkIGfo4bcPL9aACyJLB0Ms3Ezu5rsHmLB2suis96z4fLM03DA==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/callsites": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-			"integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/camelcase": {
-			"version": "5.3.1",
-			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-			"integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/caniuse-lite": {
-			"version": "1.0.30001690",
-			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001690.tgz",
-			"integrity": "sha512-5ExiE3qQN6oF8Clf8ifIDcMRCRE/dMGcETG/XGMD8/XiXm6HXQgQTh1yZYLXXpSOsEUlJm1Xr7kGULZTuGtP/w==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "opencollective",
-					"url": "https://opencollective.com/browserslist"
-				},
-				{
-					"type": "tidelift",
-					"url": "https://tidelift.com/funding/github/npm/caniuse-lite"
-				},
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/ai"
-				}
-			],
-			"license": "CC-BY-4.0"
-		},
-		"node_modules/chalk": {
-			"version": "4.1.2",
-			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"ansi-styles": "^4.1.0",
-				"supports-color": "^7.1.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/chalk?sponsor=1"
-			}
-		},
-		"node_modules/change-case": {
-			"version": "5.4.4",
-			"resolved": "https://registry.npmjs.org/change-case/-/change-case-5.4.4.tgz",
-			"integrity": "sha512-HRQyTk2/YPEkt9TnUPbOpr64Uw3KOicFWPVBb+xiHvd6eBx/qPr9xqfBFDT8P2vWsvvz4jbEkfDe71W3VyNu2w==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/char-regex": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
-			"integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/chokidar": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
-			"integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"readdirp": "^4.0.1"
-			},
-			"engines": {
-				"node": ">= 14.16.0"
-			},
-			"funding": {
-				"url": "https://paulmillr.com/funding/"
-			}
-		},
-		"node_modules/chrome-trace-event": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz",
-			"integrity": "sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6.0"
-			}
-		},
-		"node_modules/ci-info": {
-			"version": "3.9.0",
-			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
-			"integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/sibiraj-s"
-				}
-			],
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/cjs-module-lexer": {
-			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.1.tgz",
-			"integrity": "sha512-cuSVIHi9/9E/+821Qjdvngor+xpnlwnuwIyZOaLmHBVdXL+gP+I6QQB9VkO7RI77YIcTV+S1W9AreJ5eN63JBA==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/client": {
-			"resolved": "../client",
-			"link": true
-		},
-		"node_modules/cliui": {
-			"version": "8.0.1",
-			"resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
-			"integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"string-width": "^4.2.0",
-				"strip-ansi": "^6.0.1",
-				"wrap-ansi": "^7.0.0"
-			},
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/clone-deep": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
-			"integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"is-plain-object": "^2.0.4",
-				"kind-of": "^6.0.2",
-				"shallow-clone": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/co": {
-			"version": "4.6.0",
-			"resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-			"integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"iojs": ">= 1.0.0",
-				"node": ">= 0.12.0"
-			}
-		},
-		"node_modules/collect-v8-coverage": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz",
-			"integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/color-convert": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"color-name": "~1.1.4"
-			},
-			"engines": {
-				"node": ">=7.0.0"
-			}
-		},
-		"node_modules/color-name": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/colorette": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/colorette/-/colorette-1.4.0.tgz",
-			"integrity": "sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/colorjs.io": {
-			"version": "0.5.2",
-			"resolved": "https://registry.npmjs.org/colorjs.io/-/colorjs.io-0.5.2.tgz",
-			"integrity": "sha512-twmVoizEW7ylZSN32OgKdXRmo1qg+wT5/6C3xu5b9QsWzSFAhHLn2xd8ro0diCsKfCj1RdaTP/nrcW+vAoQPIw==",
-			"dev": true,
-			"license": "MIT",
-			"peer": true
-		},
-		"node_modules/commander": {
-			"version": "2.20.3",
-			"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-			"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/concat-map": {
-			"version": "0.0.1",
-			"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-			"integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/convert-source-map": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
-			"integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/create-jest": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz",
-			"integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/types": "^29.6.3",
-				"chalk": "^4.0.0",
-				"exit": "^0.1.2",
-				"graceful-fs": "^4.2.9",
-				"jest-config": "^29.7.0",
-				"jest-util": "^29.7.0",
-				"prompts": "^2.0.1"
-			},
-			"bin": {
-				"create-jest": "bin/create-jest.js"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/cross-spawn": {
-			"version": "7.0.6",
-			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
-			"integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"path-key": "^3.1.0",
-				"shebang-command": "^2.0.0",
-				"which": "^2.0.1"
-			},
-			"engines": {
-				"node": ">= 8"
-			}
-		},
-		"node_modules/css-loader": {
-			"version": "7.1.2",
-			"resolved": "https://registry.npmjs.org/css-loader/-/css-loader-7.1.2.tgz",
-			"integrity": "sha512-6WvYYn7l/XEGN8Xu2vWFt9nVzrCn39vKyTEFf/ExEyoksJjjSZV/0/35XPlMbpnr6VGhZIUg5yJrL8tGfes/FA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"icss-utils": "^5.1.0",
-				"postcss": "^8.4.33",
-				"postcss-modules-extract-imports": "^3.1.0",
-				"postcss-modules-local-by-default": "^4.0.5",
-				"postcss-modules-scope": "^3.2.0",
-				"postcss-modules-values": "^4.0.0",
-				"postcss-value-parser": "^4.2.0",
-				"semver": "^7.5.4"
-			},
-			"engines": {
-				"node": ">= 18.12.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
-			},
-			"peerDependencies": {
-				"@rspack/core": "0.x || 1.x",
-				"webpack": "^5.27.0"
-			},
-			"peerDependenciesMeta": {
-				"@rspack/core": {
-					"optional": true
-				},
-				"webpack": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/cssesc": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-			"integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
-			"dev": true,
-			"license": "MIT",
-			"bin": {
-				"cssesc": "bin/cssesc"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/date-fns": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-4.1.0.tgz",
-			"integrity": "sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==",
-			"dev": true,
-			"license": "MIT",
-			"funding": {
-				"type": "github",
-				"url": "https://github.com/sponsors/kossnocorp"
-			}
-		},
-		"node_modules/dayjs": {
-			"version": "1.11.13",
-			"resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz",
-			"integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/debug": {
-			"version": "4.4.0",
-			"resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
-			"integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"ms": "^2.1.3"
-			},
-			"engines": {
-				"node": ">=6.0"
-			},
-			"peerDependenciesMeta": {
-				"supports-color": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/dedent": {
-			"version": "1.5.3",
-			"resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.3.tgz",
-			"integrity": "sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==",
-			"dev": true,
-			"license": "MIT",
-			"peerDependencies": {
-				"babel-plugin-macros": "^3.1.0"
-			},
-			"peerDependenciesMeta": {
-				"babel-plugin-macros": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/deep-is": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-			"integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/deepmerge": {
-			"version": "4.3.1",
-			"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
-			"integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/detect-libc": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
-			"integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
-			"dev": true,
-			"license": "Apache-2.0",
-			"optional": true,
-			"bin": {
-				"detect-libc": "bin/detect-libc.js"
-			},
-			"engines": {
-				"node": ">=0.10"
-			}
-		},
-		"node_modules/detect-newline": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
-			"integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/diff-sequences": {
-			"version": "29.6.3",
-			"resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
-			"integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/ejs": {
-			"version": "3.1.10",
-			"resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
-			"integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==",
-			"dev": true,
-			"license": "Apache-2.0",
-			"dependencies": {
-				"jake": "^10.8.5"
-			},
-			"bin": {
-				"ejs": "bin/cli.js"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/electron-to-chromium": {
-			"version": "1.5.76",
-			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.76.tgz",
-			"integrity": "sha512-CjVQyG7n7Sr+eBXE86HIulnL5N8xZY1sgmOPGuq/F0Rr0FJq63lg0kEtOIDfZBk44FnDLf6FUJ+dsJcuiUDdDQ==",
-			"dev": true,
-			"license": "ISC"
-		},
-		"node_modules/emittery": {
-			"version": "0.13.1",
-			"resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz",
-			"integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://github.com/sindresorhus/emittery?sponsor=1"
-			}
-		},
-		"node_modules/emoji-regex": {
-			"version": "8.0.0",
-			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/emojis-list": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
-			"integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">= 4"
-			}
-		},
-		"node_modules/enhanced-resolve": {
-			"version": "5.18.0",
-			"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.0.tgz",
-			"integrity": "sha512-0/r0MySGYG8YqlayBZ6MuCfECmHFdJ5qyPh8s8wa5Hnm6SaFLSK1VYCbj+NKp090Nm1caZhD+QTnmxO7esYGyQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"graceful-fs": "^4.2.4",
-				"tapable": "^2.2.0"
-			},
-			"engines": {
-				"node": ">=10.13.0"
-			}
-		},
-		"node_modules/envinfo": {
-			"version": "7.14.0",
-			"resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.14.0.tgz",
-			"integrity": "sha512-CO40UI41xDQzhLB1hWyqUKgFhs250pNcGbyGKe1l/e4FSaI/+YE4IMG76GDt0In67WLPACIITC+sOi08x4wIvg==",
-			"dev": true,
-			"license": "MIT",
-			"bin": {
-				"envinfo": "dist/cli.js"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/error-ex": {
-			"version": "1.3.2",
-			"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-			"integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"is-arrayish": "^0.2.1"
-			}
-		},
-		"node_modules/es-module-lexer": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.6.0.tgz",
-			"integrity": "sha512-qqnD1yMU6tk/jnaMosogGySTZP8YtUgAffA9nMN+E/rjxcfRQ6IEk7IiozUjgxKoFHBGjTLnrHB/YC45r/59EQ==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/esbuild": {
-			"version": "0.24.0",
-			"resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.24.0.tgz",
-			"integrity": "sha512-FuLPevChGDshgSicjisSooU0cemp/sGXR841D5LHMB7mTVOmsEHcAxaH3irL53+8YDIeVNQEySh4DaYU/iuPqQ==",
-			"dev": true,
-			"hasInstallScript": true,
-			"license": "MIT",
-			"bin": {
-				"esbuild": "bin/esbuild"
-			},
-			"engines": {
-				"node": ">=18"
-			},
-			"optionalDependencies": {
-				"@esbuild/aix-ppc64": "0.24.0",
-				"@esbuild/android-arm": "0.24.0",
-				"@esbuild/android-arm64": "0.24.0",
-				"@esbuild/android-x64": "0.24.0",
-				"@esbuild/darwin-arm64": "0.24.0",
-				"@esbuild/darwin-x64": "0.24.0",
-				"@esbuild/freebsd-arm64": "0.24.0",
-				"@esbuild/freebsd-x64": "0.24.0",
-				"@esbuild/linux-arm": "0.24.0",
-				"@esbuild/linux-arm64": "0.24.0",
-				"@esbuild/linux-ia32": "0.24.0",
-				"@esbuild/linux-loong64": "0.24.0",
-				"@esbuild/linux-mips64el": "0.24.0",
-				"@esbuild/linux-ppc64": "0.24.0",
-				"@esbuild/linux-riscv64": "0.24.0",
-				"@esbuild/linux-s390x": "0.24.0",
-				"@esbuild/linux-x64": "0.24.0",
-				"@esbuild/netbsd-x64": "0.24.0",
-				"@esbuild/openbsd-arm64": "0.24.0",
-				"@esbuild/openbsd-x64": "0.24.0",
-				"@esbuild/sunos-x64": "0.24.0",
-				"@esbuild/win32-arm64": "0.24.0",
-				"@esbuild/win32-ia32": "0.24.0",
-				"@esbuild/win32-x64": "0.24.0"
-			}
-		},
-		"node_modules/esbuild-plugin-wasm-pack": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/esbuild-plugin-wasm-pack/-/esbuild-plugin-wasm-pack-1.1.0.tgz",
-			"integrity": "sha512-iBjr8LVJvS6ygAx3+voRUXT+GEu6UfxhNDBSs72LIyCwekQVAhDmEusuVzS2dw93F4QzFdV3nXoCSLfk4vcylQ==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=0.12.0"
-			},
-			"funding": {
-				"type": "individual",
-				"url": "https://ko-fi.com/tschrock"
-			}
-		},
-		"node_modules/esbuild-sass-plugin": {
-			"version": "3.3.1",
-			"resolved": "https://registry.npmjs.org/esbuild-sass-plugin/-/esbuild-sass-plugin-3.3.1.tgz",
-			"integrity": "sha512-SnO1ls+d52n6j8gRRpjexXI8MsHEaumS0IdDHaYM29Y6gakzZYMls6i9ql9+AWMSQk/eryndmUpXEgT34QrX1A==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"resolve": "^1.22.8",
-				"safe-identifier": "^0.4.2",
-				"sass": "^1.71.1"
-			},
-			"peerDependencies": {
-				"esbuild": ">=0.20.1",
-				"sass-embedded": "^1.71.1"
-			}
-		},
-		"node_modules/escalade": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
-			"integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/escape-string-regexp": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-			"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/eslint": {
-			"version": "9.17.0",
-			"resolved": "https://registry.npmjs.org/eslint/-/eslint-9.17.0.tgz",
-			"integrity": "sha512-evtlNcpJg+cZLcnVKwsai8fExnqjGPicK7gnUtlNuzu+Fv9bI0aLpND5T44VLQtoMEnI57LoXO9XAkIXwohKrA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@eslint-community/eslint-utils": "^4.2.0",
-				"@eslint-community/regexpp": "^4.12.1",
-				"@eslint/config-array": "^0.19.0",
-				"@eslint/core": "^0.9.0",
-				"@eslint/eslintrc": "^3.2.0",
-				"@eslint/js": "9.17.0",
-				"@eslint/plugin-kit": "^0.2.3",
-				"@humanfs/node": "^0.16.6",
-				"@humanwhocodes/module-importer": "^1.0.1",
-				"@humanwhocodes/retry": "^0.4.1",
-				"@types/estree": "^1.0.6",
-				"@types/json-schema": "^7.0.15",
-				"ajv": "^6.12.4",
-				"chalk": "^4.0.0",
-				"cross-spawn": "^7.0.6",
-				"debug": "^4.3.2",
-				"escape-string-regexp": "^4.0.0",
-				"eslint-scope": "^8.2.0",
-				"eslint-visitor-keys": "^4.2.0",
-				"espree": "^10.3.0",
-				"esquery": "^1.5.0",
-				"esutils": "^2.0.2",
-				"fast-deep-equal": "^3.1.3",
-				"file-entry-cache": "^8.0.0",
-				"find-up": "^5.0.0",
-				"glob-parent": "^6.0.2",
-				"ignore": "^5.2.0",
-				"imurmurhash": "^0.1.4",
-				"is-glob": "^4.0.0",
-				"json-stable-stringify-without-jsonify": "^1.0.1",
-				"lodash.merge": "^4.6.2",
-				"minimatch": "^3.1.2",
-				"natural-compare": "^1.4.0",
-				"optionator": "^0.9.3"
-			},
-			"bin": {
-				"eslint": "bin/eslint.js"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"url": "https://eslint.org/donate"
-			},
-			"peerDependencies": {
-				"jiti": "*"
-			},
-			"peerDependenciesMeta": {
-				"jiti": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/eslint-plugin-unused-imports": {
-			"version": "4.1.4",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-unused-imports/-/eslint-plugin-unused-imports-4.1.4.tgz",
-			"integrity": "sha512-YptD6IzQjDardkl0POxnnRBhU1OEePMV0nd6siHaRBbd+lyh6NAhFEobiznKU7kTsSsDeSD62Pe7kAM1b7dAZQ==",
-			"dev": true,
-			"license": "MIT",
-			"peerDependencies": {
-				"@typescript-eslint/eslint-plugin": "^8.0.0-0 || ^7.0.0 || ^6.0.0 || ^5.0.0",
-				"eslint": "^9.0.0 || ^8.0.0"
-			},
-			"peerDependenciesMeta": {
-				"@typescript-eslint/eslint-plugin": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/eslint-scope": {
-			"version": "8.2.0",
-			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.2.0.tgz",
-			"integrity": "sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==",
-			"dev": true,
-			"license": "BSD-2-Clause",
-			"dependencies": {
-				"esrecurse": "^4.3.0",
-				"estraverse": "^5.2.0"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/eslint"
-			}
-		},
-		"node_modules/eslint-visitor-keys": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
-			"integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
-			"dev": true,
-			"license": "Apache-2.0",
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/eslint"
-			}
-		},
-		"node_modules/espree": {
-			"version": "10.3.0",
-			"resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz",
-			"integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==",
-			"dev": true,
-			"license": "BSD-2-Clause",
-			"dependencies": {
-				"acorn": "^8.14.0",
-				"acorn-jsx": "^5.3.2",
-				"eslint-visitor-keys": "^4.2.0"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/eslint"
-			}
-		},
-		"node_modules/esprima": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-			"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-			"dev": true,
-			"license": "BSD-2-Clause",
-			"bin": {
-				"esparse": "bin/esparse.js",
-				"esvalidate": "bin/esvalidate.js"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/esquery": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
-			"integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
-			"dev": true,
-			"license": "BSD-3-Clause",
-			"dependencies": {
-				"estraverse": "^5.1.0"
-			},
-			"engines": {
-				"node": ">=0.10"
-			}
-		},
-		"node_modules/esrecurse": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-			"integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-			"dev": true,
-			"license": "BSD-2-Clause",
-			"dependencies": {
-				"estraverse": "^5.2.0"
-			},
-			"engines": {
-				"node": ">=4.0"
-			}
-		},
-		"node_modules/estraverse": {
-			"version": "5.3.0",
-			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-			"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-			"dev": true,
-			"license": "BSD-2-Clause",
-			"engines": {
-				"node": ">=4.0"
-			}
-		},
-		"node_modules/esutils": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-			"integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-			"dev": true,
-			"license": "BSD-2-Clause",
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/eventemitter3": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz",
-			"integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/events": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
-			"integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=0.8.x"
-			}
-		},
-		"node_modules/execa": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-			"integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"cross-spawn": "^7.0.3",
-				"get-stream": "^6.0.0",
-				"human-signals": "^2.1.0",
-				"is-stream": "^2.0.0",
-				"merge-stream": "^2.0.0",
-				"npm-run-path": "^4.0.1",
-				"onetime": "^5.1.2",
-				"signal-exit": "^3.0.3",
-				"strip-final-newline": "^2.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sindresorhus/execa?sponsor=1"
-			}
-		},
-		"node_modules/exit": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-			"integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",
-			"dev": true,
-			"engines": {
-				"node": ">= 0.8.0"
-			}
-		},
-		"node_modules/expect": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz",
-			"integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/expect-utils": "^29.7.0",
-				"jest-get-type": "^29.6.3",
-				"jest-matcher-utils": "^29.7.0",
-				"jest-message-util": "^29.7.0",
-				"jest-util": "^29.7.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/fast-deep-equal": {
-			"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-glob": {
-			"version": "3.3.3",
-			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
-			"integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@nodelib/fs.stat": "^2.0.2",
-				"@nodelib/fs.walk": "^1.2.3",
-				"glob-parent": "^5.1.2",
-				"merge2": "^1.3.0",
-				"micromatch": "^4.0.8"
-			},
-			"engines": {
-				"node": ">=8.6.0"
-			}
-		},
-		"node_modules/fast-glob/node_modules/glob-parent": {
-			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-			"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"is-glob": "^4.0.1"
-			},
-			"engines": {
-				"node": ">= 6"
-			}
-		},
-		"node_modules/fast-json-stable-stringify": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-			"integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/fast-levenshtein": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-			"integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/fast-uri": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.4.tgz",
-			"integrity": "sha512-G3iTQw1DizJQ5eEqj1CbFCWhq+pzum7qepkxU7rS1FGZDqjYKcrguo9XDRbV7EgPnn8CgaPigTq+NEjyioeYZQ==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/fastify"
-				},
-				{
-					"type": "opencollective",
-					"url": "https://opencollective.com/fastify"
-				}
-			],
-			"license": "BSD-3-Clause"
-		},
-		"node_modules/fastest-levenshtein": {
-			"version": "1.0.16",
-			"resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz",
-			"integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">= 4.9.1"
-			}
-		},
-		"node_modules/fastq": {
-			"version": "1.18.0",
-			"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.18.0.tgz",
-			"integrity": "sha512-QKHXPW0hD8g4UET03SdOdunzSouc9N4AuHdsX8XNcTsuz+yYFILVNIX4l9yHABMhiEI9Db0JTTIpu0wB+Y1QQw==",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"reusify": "^1.0.4"
-			}
-		},
-		"node_modules/fb-watchman": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz",
-			"integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
-			"dev": true,
-			"license": "Apache-2.0",
-			"dependencies": {
-				"bser": "2.1.1"
-			}
-		},
-		"node_modules/fetch-retry": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/fetch-retry/-/fetch-retry-6.0.0.tgz",
-			"integrity": "sha512-BUFj1aMubgib37I3v4q78fYo63Po7t4HUPTpQ6/QE6yK6cIQrP+W43FYToeTEyg5m2Y7eFUtijUuAv/PDlWuag==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/file-entry-cache": {
-			"version": "8.0.0",
-			"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz",
-			"integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"flat-cache": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=16.0.0"
-			}
-		},
-		"node_modules/file-loader": {
-			"version": "6.2.0",
-			"resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz",
-			"integrity": "sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"loader-utils": "^2.0.0",
-				"schema-utils": "^3.0.0"
-			},
-			"engines": {
-				"node": ">= 10.13.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
-			},
-			"peerDependencies": {
-				"webpack": "^4.0.0 || ^5.0.0"
-			}
-		},
-		"node_modules/filelist": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
-			"integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==",
-			"dev": true,
-			"license": "Apache-2.0",
-			"dependencies": {
-				"minimatch": "^5.0.1"
-			}
-		},
-		"node_modules/filelist/node_modules/brace-expansion": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-			"integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"balanced-match": "^1.0.0"
-			}
-		},
-		"node_modules/filelist/node_modules/minimatch": {
-			"version": "5.1.6",
-			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
-			"integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"brace-expansion": "^2.0.1"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/fill-range": {
-			"version": "7.1.1",
-			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
-			"integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"to-regex-range": "^5.0.1"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/find-up": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-			"integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"locate-path": "^6.0.0",
-				"path-exists": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/flat": {
-			"version": "5.0.2",
-			"resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
-			"integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
-			"dev": true,
-			"license": "BSD-3-Clause",
-			"bin": {
-				"flat": "cli.js"
-			}
-		},
-		"node_modules/flat-cache": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz",
-			"integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"flatted": "^3.2.9",
-				"keyv": "^4.5.4"
-			},
-			"engines": {
-				"node": ">=16"
-			}
-		},
-		"node_modules/flatted": {
-			"version": "3.3.2",
-			"resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.2.tgz",
-			"integrity": "sha512-AiwGJM8YcNOaobumgtng+6NHuOqC3A7MixFeDafM3X9cIUM+xUXoS5Vfgf+OihAYe20fxqNM9yPBXJzRtZ/4eA==",
-			"dev": true,
-			"license": "ISC"
-		},
-		"node_modules/fs-extra": {
-			"version": "11.2.0",
-			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
-			"integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"graceful-fs": "^4.2.0",
-				"jsonfile": "^6.0.1",
-				"universalify": "^2.0.0"
-			},
-			"engines": {
-				"node": ">=14.14"
-			}
-		},
-		"node_modules/fs.realpath": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-			"integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
-			"dev": true,
-			"license": "ISC"
-		},
-		"node_modules/fsevents": {
-			"version": "2.3.3",
-			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-			"integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-			"dev": true,
-			"hasInstallScript": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"darwin"
-			],
-			"engines": {
-				"node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-			}
-		},
-		"node_modules/function-bind": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
-			"integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
-			"dev": true,
-			"license": "MIT",
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/gensync": {
-			"version": "1.0.0-beta.2",
-			"resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-			"integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/get-caller-file": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-			"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-			"dev": true,
-			"license": "ISC",
-			"engines": {
-				"node": "6.* || 8.* || >= 10.*"
-			}
-		},
-		"node_modules/get-package-type": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
-			"integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=8.0.0"
-			}
-		},
-		"node_modules/get-stream": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-			"integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/glob": {
-			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-			"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-			"deprecated": "Glob versions prior to v9 are no longer supported",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"fs.realpath": "^1.0.0",
-				"inflight": "^1.0.4",
-				"inherits": "2",
-				"minimatch": "^3.1.1",
-				"once": "^1.3.0",
-				"path-is-absolute": "^1.0.0"
-			},
-			"engines": {
-				"node": "*"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			}
-		},
-		"node_modules/glob-parent": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-			"integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"is-glob": "^4.0.3"
-			},
-			"engines": {
-				"node": ">=10.13.0"
-			}
-		},
-		"node_modules/glob-to-regexp": {
-			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
-			"integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
-			"dev": true,
-			"license": "BSD-2-Clause"
-		},
-		"node_modules/globals": {
-			"version": "14.0.0",
-			"resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz",
-			"integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=18"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/graceful-fs": {
-			"version": "4.2.11",
-			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
-			"integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
-			"dev": true,
-			"license": "ISC"
-		},
-		"node_modules/graphemer": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
-			"integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/has-flag": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/hasown": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
-			"integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"function-bind": "^1.1.2"
-			},
-			"engines": {
-				"node": ">= 0.4"
-			}
-		},
-		"node_modules/html-escaper": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
-			"integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/https-proxy-agent": {
-			"version": "7.0.6",
-			"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
-			"integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"agent-base": "^7.1.2",
-				"debug": "4"
-			},
-			"engines": {
-				"node": ">= 14"
-			}
-		},
-		"node_modules/human-signals": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-			"integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
-			"dev": true,
-			"license": "Apache-2.0",
-			"engines": {
-				"node": ">=10.17.0"
-			}
-		},
-		"node_modules/icss-utils": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
-			"integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
-			"dev": true,
-			"license": "ISC",
-			"engines": {
-				"node": "^10 || ^12 || >= 14"
-			},
-			"peerDependencies": {
-				"postcss": "^8.1.0"
-			}
-		},
-		"node_modules/ignore": {
-			"version": "5.3.2",
-			"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
-			"integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">= 4"
-			}
-		},
-		"node_modules/immutable": {
-			"version": "5.0.3",
-			"resolved": "https://registry.npmjs.org/immutable/-/immutable-5.0.3.tgz",
-			"integrity": "sha512-P8IdPQHq3lA1xVeBRi5VPqUm5HDgKnx0Ru51wZz5mjxHr5n3RWhjIpOFU7ybkUxfB+5IToy+OLaHYDBIWsv+uw==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/import-fresh": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-			"integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"parent-module": "^1.0.0",
-				"resolve-from": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=6"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/import-local": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz",
-			"integrity": "sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"pkg-dir": "^4.2.0",
-				"resolve-cwd": "^3.0.0"
-			},
-			"bin": {
-				"import-local-fixture": "fixtures/cli.js"
-			},
-			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/imurmurhash": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-			"integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=0.8.19"
-			}
-		},
-		"node_modules/index-to-position": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/index-to-position/-/index-to-position-0.1.2.tgz",
-			"integrity": "sha512-MWDKS3AS1bGCHLBA2VLImJz42f7bJh8wQsTGCzI3j519/CASStoDONUBVz2I/VID0MpiX3SGSnbOD2xUalbE5g==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=18"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/inflight": {
-			"version": "1.0.6",
-			"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-			"integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-			"deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"once": "^1.3.0",
-				"wrappy": "1"
-			}
-		},
-		"node_modules/inherits": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-			"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-			"dev": true,
-			"license": "ISC"
-		},
-		"node_modules/interpret": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/interpret/-/interpret-3.1.1.tgz",
-			"integrity": "sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=10.13.0"
-			}
-		},
-		"node_modules/is-arrayish": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-			"integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/is-core-module": {
-			"version": "2.16.1",
-			"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
-			"integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"hasown": "^2.0.2"
-			},
-			"engines": {
-				"node": ">= 0.4"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/is-extglob": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-			"integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/is-fullwidth-code-point": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-			"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/is-generator-fn": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
-			"integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/is-glob": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-			"integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"is-extglob": "^2.1.1"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/is-number": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-			"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=0.12.0"
-			}
-		},
-		"node_modules/is-plain-object": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-			"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"isobject": "^3.0.1"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/is-stream": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-			"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/isexe": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-			"integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
-			"dev": true,
-			"license": "ISC"
-		},
-		"node_modules/isobject": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-			"integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/istanbul-lib-coverage": {
-			"version": "3.2.2",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
-			"integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
-			"dev": true,
-			"license": "BSD-3-Clause",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/istanbul-lib-instrument": {
-			"version": "6.0.3",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz",
-			"integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==",
-			"dev": true,
-			"license": "BSD-3-Clause",
-			"dependencies": {
-				"@babel/core": "^7.23.9",
-				"@babel/parser": "^7.23.9",
-				"@istanbuljs/schema": "^0.1.3",
-				"istanbul-lib-coverage": "^3.2.0",
-				"semver": "^7.5.4"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/istanbul-lib-report": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
-			"integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
-			"dev": true,
-			"license": "BSD-3-Clause",
-			"dependencies": {
-				"istanbul-lib-coverage": "^3.0.0",
-				"make-dir": "^4.0.0",
-				"supports-color": "^7.1.0"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/istanbul-lib-source-maps": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
-			"integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
-			"dev": true,
-			"license": "BSD-3-Clause",
-			"dependencies": {
-				"debug": "^4.1.1",
-				"istanbul-lib-coverage": "^3.0.0",
-				"source-map": "^0.6.1"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/istanbul-reports": {
-			"version": "3.1.7",
-			"resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz",
-			"integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==",
-			"dev": true,
-			"license": "BSD-3-Clause",
-			"dependencies": {
-				"html-escaper": "^2.0.0",
-				"istanbul-lib-report": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/jake": {
-			"version": "10.9.2",
-			"resolved": "https://registry.npmjs.org/jake/-/jake-10.9.2.tgz",
-			"integrity": "sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==",
-			"dev": true,
-			"license": "Apache-2.0",
-			"dependencies": {
-				"async": "^3.2.3",
-				"chalk": "^4.0.2",
-				"filelist": "^1.0.4",
-				"minimatch": "^3.1.2"
-			},
-			"bin": {
-				"jake": "bin/cli.js"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/jest": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz",
-			"integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/core": "^29.7.0",
-				"@jest/types": "^29.6.3",
-				"import-local": "^3.0.2",
-				"jest-cli": "^29.7.0"
-			},
-			"bin": {
-				"jest": "bin/jest.js"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			},
-			"peerDependencies": {
-				"node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
-			},
-			"peerDependenciesMeta": {
-				"node-notifier": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/jest-changed-files": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz",
-			"integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"execa": "^5.0.0",
-				"jest-util": "^29.7.0",
-				"p-limit": "^3.1.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/jest-circus": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz",
-			"integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/environment": "^29.7.0",
-				"@jest/expect": "^29.7.0",
-				"@jest/test-result": "^29.7.0",
-				"@jest/types": "^29.6.3",
-				"@types/node": "*",
-				"chalk": "^4.0.0",
-				"co": "^4.6.0",
-				"dedent": "^1.0.0",
-				"is-generator-fn": "^2.0.0",
-				"jest-each": "^29.7.0",
-				"jest-matcher-utils": "^29.7.0",
-				"jest-message-util": "^29.7.0",
-				"jest-runtime": "^29.7.0",
-				"jest-snapshot": "^29.7.0",
-				"jest-util": "^29.7.0",
-				"p-limit": "^3.1.0",
-				"pretty-format": "^29.7.0",
-				"pure-rand": "^6.0.0",
-				"slash": "^3.0.0",
-				"stack-utils": "^2.0.3"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/jest-cli": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz",
-			"integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/core": "^29.7.0",
-				"@jest/test-result": "^29.7.0",
-				"@jest/types": "^29.6.3",
-				"chalk": "^4.0.0",
-				"create-jest": "^29.7.0",
-				"exit": "^0.1.2",
-				"import-local": "^3.0.2",
-				"jest-config": "^29.7.0",
-				"jest-util": "^29.7.0",
-				"jest-validate": "^29.7.0",
-				"yargs": "^17.3.1"
-			},
-			"bin": {
-				"jest": "bin/jest.js"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			},
-			"peerDependencies": {
-				"node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
-			},
-			"peerDependenciesMeta": {
-				"node-notifier": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/jest-config": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz",
-			"integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/core": "^7.11.6",
-				"@jest/test-sequencer": "^29.7.0",
-				"@jest/types": "^29.6.3",
-				"babel-jest": "^29.7.0",
-				"chalk": "^4.0.0",
-				"ci-info": "^3.2.0",
-				"deepmerge": "^4.2.2",
-				"glob": "^7.1.3",
-				"graceful-fs": "^4.2.9",
-				"jest-circus": "^29.7.0",
-				"jest-environment-node": "^29.7.0",
-				"jest-get-type": "^29.6.3",
-				"jest-regex-util": "^29.6.3",
-				"jest-resolve": "^29.7.0",
-				"jest-runner": "^29.7.0",
-				"jest-util": "^29.7.0",
-				"jest-validate": "^29.7.0",
-				"micromatch": "^4.0.4",
-				"parse-json": "^5.2.0",
-				"pretty-format": "^29.7.0",
-				"slash": "^3.0.0",
-				"strip-json-comments": "^3.1.1"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			},
-			"peerDependencies": {
-				"@types/node": "*",
-				"ts-node": ">=9.0.0"
-			},
-			"peerDependenciesMeta": {
-				"@types/node": {
-					"optional": true
-				},
-				"ts-node": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/jest-diff": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz",
-			"integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"chalk": "^4.0.0",
-				"diff-sequences": "^29.6.3",
-				"jest-get-type": "^29.6.3",
-				"pretty-format": "^29.7.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/jest-docblock": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz",
-			"integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"detect-newline": "^3.0.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/jest-each": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz",
-			"integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/types": "^29.6.3",
-				"chalk": "^4.0.0",
-				"jest-get-type": "^29.6.3",
-				"jest-util": "^29.7.0",
-				"pretty-format": "^29.7.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/jest-environment-node": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz",
-			"integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/environment": "^29.7.0",
-				"@jest/fake-timers": "^29.7.0",
-				"@jest/types": "^29.6.3",
-				"@types/node": "*",
-				"jest-mock": "^29.7.0",
-				"jest-util": "^29.7.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/jest-get-type": {
-			"version": "29.6.3",
-			"resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz",
-			"integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/jest-haste-map": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz",
-			"integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/types": "^29.6.3",
-				"@types/graceful-fs": "^4.1.3",
-				"@types/node": "*",
-				"anymatch": "^3.0.3",
-				"fb-watchman": "^2.0.0",
-				"graceful-fs": "^4.2.9",
-				"jest-regex-util": "^29.6.3",
-				"jest-util": "^29.7.0",
-				"jest-worker": "^29.7.0",
-				"micromatch": "^4.0.4",
-				"walker": "^1.0.8"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			},
-			"optionalDependencies": {
-				"fsevents": "^2.3.2"
-			}
-		},
-		"node_modules/jest-leak-detector": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz",
-			"integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"jest-get-type": "^29.6.3",
-				"pretty-format": "^29.7.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/jest-matcher-utils": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz",
-			"integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"chalk": "^4.0.0",
-				"jest-diff": "^29.7.0",
-				"jest-get-type": "^29.6.3",
-				"pretty-format": "^29.7.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/jest-message-util": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz",
-			"integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/code-frame": "^7.12.13",
-				"@jest/types": "^29.6.3",
-				"@types/stack-utils": "^2.0.0",
-				"chalk": "^4.0.0",
-				"graceful-fs": "^4.2.9",
-				"micromatch": "^4.0.4",
-				"pretty-format": "^29.7.0",
-				"slash": "^3.0.0",
-				"stack-utils": "^2.0.3"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/jest-mock": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz",
-			"integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/types": "^29.6.3",
-				"@types/node": "*",
-				"jest-util": "^29.7.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/jest-pnp-resolver": {
-			"version": "1.2.3",
-			"resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
-			"integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6"
-			},
-			"peerDependencies": {
-				"jest-resolve": "*"
-			},
-			"peerDependenciesMeta": {
-				"jest-resolve": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/jest-regex-util": {
-			"version": "29.6.3",
-			"resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz",
-			"integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/jest-resolve": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz",
-			"integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"chalk": "^4.0.0",
-				"graceful-fs": "^4.2.9",
-				"jest-haste-map": "^29.7.0",
-				"jest-pnp-resolver": "^1.2.2",
-				"jest-util": "^29.7.0",
-				"jest-validate": "^29.7.0",
-				"resolve": "^1.20.0",
-				"resolve.exports": "^2.0.0",
-				"slash": "^3.0.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/jest-resolve-dependencies": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz",
-			"integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"jest-regex-util": "^29.6.3",
-				"jest-snapshot": "^29.7.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/jest-runner": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz",
-			"integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/console": "^29.7.0",
-				"@jest/environment": "^29.7.0",
-				"@jest/test-result": "^29.7.0",
-				"@jest/transform": "^29.7.0",
-				"@jest/types": "^29.6.3",
-				"@types/node": "*",
-				"chalk": "^4.0.0",
-				"emittery": "^0.13.1",
-				"graceful-fs": "^4.2.9",
-				"jest-docblock": "^29.7.0",
-				"jest-environment-node": "^29.7.0",
-				"jest-haste-map": "^29.7.0",
-				"jest-leak-detector": "^29.7.0",
-				"jest-message-util": "^29.7.0",
-				"jest-resolve": "^29.7.0",
-				"jest-runtime": "^29.7.0",
-				"jest-util": "^29.7.0",
-				"jest-watcher": "^29.7.0",
-				"jest-worker": "^29.7.0",
-				"p-limit": "^3.1.0",
-				"source-map-support": "0.5.13"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/jest-runtime": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz",
-			"integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/environment": "^29.7.0",
-				"@jest/fake-timers": "^29.7.0",
-				"@jest/globals": "^29.7.0",
-				"@jest/source-map": "^29.6.3",
-				"@jest/test-result": "^29.7.0",
-				"@jest/transform": "^29.7.0",
-				"@jest/types": "^29.6.3",
-				"@types/node": "*",
-				"chalk": "^4.0.0",
-				"cjs-module-lexer": "^1.0.0",
-				"collect-v8-coverage": "^1.0.0",
-				"glob": "^7.1.3",
-				"graceful-fs": "^4.2.9",
-				"jest-haste-map": "^29.7.0",
-				"jest-message-util": "^29.7.0",
-				"jest-mock": "^29.7.0",
-				"jest-regex-util": "^29.6.3",
-				"jest-resolve": "^29.7.0",
-				"jest-snapshot": "^29.7.0",
-				"jest-util": "^29.7.0",
-				"slash": "^3.0.0",
-				"strip-bom": "^4.0.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/jest-snapshot": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz",
-			"integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/core": "^7.11.6",
-				"@babel/generator": "^7.7.2",
-				"@babel/plugin-syntax-jsx": "^7.7.2",
-				"@babel/plugin-syntax-typescript": "^7.7.2",
-				"@babel/types": "^7.3.3",
-				"@jest/expect-utils": "^29.7.0",
-				"@jest/transform": "^29.7.0",
-				"@jest/types": "^29.6.3",
-				"babel-preset-current-node-syntax": "^1.0.0",
-				"chalk": "^4.0.0",
-				"expect": "^29.7.0",
-				"graceful-fs": "^4.2.9",
-				"jest-diff": "^29.7.0",
-				"jest-get-type": "^29.6.3",
-				"jest-matcher-utils": "^29.7.0",
-				"jest-message-util": "^29.7.0",
-				"jest-util": "^29.7.0",
-				"natural-compare": "^1.4.0",
-				"pretty-format": "^29.7.0",
-				"semver": "^7.5.3"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/jest-util": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
-			"integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/types": "^29.6.3",
-				"@types/node": "*",
-				"chalk": "^4.0.0",
-				"ci-info": "^3.2.0",
-				"graceful-fs": "^4.2.9",
-				"picomatch": "^2.2.3"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/jest-validate": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz",
-			"integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/types": "^29.6.3",
-				"camelcase": "^6.2.0",
-				"chalk": "^4.0.0",
-				"jest-get-type": "^29.6.3",
-				"leven": "^3.1.0",
-				"pretty-format": "^29.7.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/jest-validate/node_modules/camelcase": {
-			"version": "6.3.0",
-			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
-			"integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/jest-watcher": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz",
-			"integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/test-result": "^29.7.0",
-				"@jest/types": "^29.6.3",
-				"@types/node": "*",
-				"ansi-escapes": "^4.2.1",
-				"chalk": "^4.0.0",
-				"emittery": "^0.13.1",
-				"jest-util": "^29.7.0",
-				"string-length": "^4.0.1"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/jest-worker": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz",
-			"integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@types/node": "*",
-				"jest-util": "^29.7.0",
-				"merge-stream": "^2.0.0",
-				"supports-color": "^8.0.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/jest-worker/node_modules/supports-color": {
-			"version": "8.1.1",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-			"integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"has-flag": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/supports-color?sponsor=1"
-			}
-		},
-		"node_modules/js-levenshtein": {
-			"version": "1.1.6",
-			"resolved": "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.6.tgz",
-			"integrity": "sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/js-tokens": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-			"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/js-yaml": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-			"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"argparse": "^2.0.1"
-			},
-			"bin": {
-				"js-yaml": "bin/js-yaml.js"
-			}
-		},
-		"node_modules/jsesc": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
-			"integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",
-			"dev": true,
-			"license": "MIT",
-			"bin": {
-				"jsesc": "bin/jsesc"
-			},
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/json-buffer": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
-			"integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/json-parse-even-better-errors": {
-			"version": "2.3.1",
-			"resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-			"integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/json-schema-traverse": {
-			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/json-stable-stringify-without-jsonify": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-			"integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/json5": {
-			"version": "2.2.3",
-			"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
-			"integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
-			"dev": true,
-			"license": "MIT",
-			"bin": {
-				"json5": "lib/cli.js"
-			},
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/jsonfile": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-			"integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"universalify": "^2.0.0"
-			},
-			"optionalDependencies": {
-				"graceful-fs": "^4.1.6"
-			}
-		},
-		"node_modules/keyv": {
-			"version": "4.5.4",
-			"resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
-			"integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"json-buffer": "3.0.1"
-			}
-		},
-		"node_modules/kind-of": {
-			"version": "6.0.3",
-			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-			"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/kleur": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
-			"integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/leven": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
-			"integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/levn": {
-			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-			"integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"prelude-ls": "^1.2.1",
-				"type-check": "~0.4.0"
-			},
-			"engines": {
-				"node": ">= 0.8.0"
-			}
-		},
-		"node_modules/lines-and-columns": {
-			"version": "1.2.4",
-			"resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-			"integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/loader-runner": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
-			"integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6.11.5"
-			}
-		},
-		"node_modules/loader-utils": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
-			"integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"big.js": "^5.2.2",
-				"emojis-list": "^3.0.0",
-				"json5": "^2.1.2"
-			},
-			"engines": {
-				"node": ">=8.9.0"
-			}
-		},
-		"node_modules/locate-path": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-			"integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"p-locate": "^5.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/lodash.memoize": {
-			"version": "4.1.2",
-			"resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
-			"integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/lodash.merge": {
-			"version": "4.6.2",
-			"resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-			"integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/lru-cache": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-			"integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"yallist": "^3.0.2"
-			}
-		},
-		"node_modules/make-dir": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
-			"integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"semver": "^7.5.3"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/make-error": {
-			"version": "1.3.6",
-			"resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
-			"integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
-			"dev": true,
-			"license": "ISC"
-		},
-		"node_modules/makeerror": {
-			"version": "1.0.12",
-			"resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
-			"integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
-			"dev": true,
-			"license": "BSD-3-Clause",
-			"dependencies": {
-				"tmpl": "1.0.5"
-			}
-		},
-		"node_modules/merge-stream": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-			"integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/merge2": {
-			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-			"integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">= 8"
-			}
-		},
-		"node_modules/micromatch": {
-			"version": "4.0.8",
-			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
-			"integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"braces": "^3.0.3",
-				"picomatch": "^2.3.1"
-			},
-			"engines": {
-				"node": ">=8.6"
-			}
-		},
-		"node_modules/mime-db": {
-			"version": "1.52.0",
-			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-			"integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">= 0.6"
-			}
-		},
-		"node_modules/mime-types": {
-			"version": "2.1.35",
-			"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-			"integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"mime-db": "1.52.0"
-			},
-			"engines": {
-				"node": ">= 0.6"
-			}
-		},
-		"node_modules/mimic-fn": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-			"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/mini-css-extract-plugin": {
-			"version": "2.9.2",
-			"resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.2.tgz",
-			"integrity": "sha512-GJuACcS//jtq4kCtd5ii/M0SZf7OZRH+BxdqXZHaJfb8TJiVl+NgQRPwiYt2EuqeSkNydn/7vP+bcE27C5mb9w==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"schema-utils": "^4.0.0",
-				"tapable": "^2.2.1"
-			},
-			"engines": {
-				"node": ">= 12.13.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
-			},
-			"peerDependencies": {
-				"webpack": "^5.0.0"
-			}
-		},
-		"node_modules/mini-css-extract-plugin/node_modules/ajv": {
-			"version": "8.17.1",
-			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
-			"integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"fast-deep-equal": "^3.1.3",
-				"fast-uri": "^3.0.1",
-				"json-schema-traverse": "^1.0.0",
-				"require-from-string": "^2.0.2"
-			},
-			"funding": {
-				"type": "github",
-				"url": "https://github.com/sponsors/epoberezkin"
-			}
-		},
-		"node_modules/mini-css-extract-plugin/node_modules/ajv-keywords": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-			"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"fast-deep-equal": "^3.1.3"
-			},
-			"peerDependencies": {
-				"ajv": "^8.8.2"
-			}
-		},
-		"node_modules/mini-css-extract-plugin/node_modules/json-schema-traverse": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/mini-css-extract-plugin/node_modules/schema-utils": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.0.tgz",
-			"integrity": "sha512-Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@types/json-schema": "^7.0.9",
-				"ajv": "^8.9.0",
-				"ajv-formats": "^2.1.1",
-				"ajv-keywords": "^5.1.0"
-			},
-			"engines": {
-				"node": ">= 10.13.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
-			}
-		},
-		"node_modules/minimatch": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-			"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"brace-expansion": "^1.1.7"
-			},
-			"engines": {
-				"node": "*"
-			}
-		},
-		"node_modules/moment": {
-			"version": "2.29.4",
-			"resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
-			"integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": "*"
-			}
-		},
-		"node_modules/ms": {
-			"version": "2.1.3",
-			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-			"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/nanoid": {
-			"version": "3.3.8",
-			"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
-			"integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/ai"
-				}
-			],
-			"license": "MIT",
-			"bin": {
-				"nanoid": "bin/nanoid.cjs"
-			},
-			"engines": {
-				"node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-			}
-		},
-		"node_modules/natural-compare": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-			"integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/neo-async": {
-			"version": "2.6.2",
-			"resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
-			"integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/node-addon-api": {
-			"version": "7.1.1",
-			"resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz",
-			"integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==",
-			"dev": true,
-			"license": "MIT",
-			"optional": true
-		},
-		"node_modules/node-fetch": {
-			"version": "2.7.0",
-			"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
-			"integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"whatwg-url": "^5.0.0"
-			},
-			"engines": {
-				"node": "4.x || >=6.0.0"
-			},
-			"peerDependencies": {
-				"encoding": "^0.1.0"
-			},
-			"peerDependenciesMeta": {
-				"encoding": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/node-int64": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
-			"integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/node-releases": {
-			"version": "2.0.19",
-			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
-			"integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/normalize-path": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-			"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/npm-run-path": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-			"integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"path-key": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/obsidian": {
-			"version": "1.7.2",
-			"resolved": "https://registry.npmjs.org/obsidian/-/obsidian-1.7.2.tgz",
-			"integrity": "sha512-k9hN9brdknJC+afKr5FQzDRuEFGDKbDjfCazJwpgibwCAoZNYHYV8p/s3mM8I6AsnKrPKNXf8xGuMZ4enWelZQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@types/codemirror": "5.60.8",
-				"moment": "2.29.4"
-			},
-			"peerDependencies": {
-				"@codemirror/state": "^6.0.0",
-				"@codemirror/view": "^6.0.0"
-			}
-		},
-		"node_modules/once": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-			"integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"wrappy": "1"
-			}
-		},
-		"node_modules/onetime": {
-			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-			"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"mimic-fn": "^2.1.0"
-			},
-			"engines": {
-				"node": ">=6"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/openapi-fetch": {
-			"version": "0.13.3",
-			"resolved": "https://registry.npmjs.org/openapi-fetch/-/openapi-fetch-0.13.3.tgz",
-			"integrity": "sha512-M1THnPkNOXUPsQKZfqunhW/wqH8l3/W3Vlj4lemQynf4mTaTwBTvL2pgjBe0zerL/GFT5ttCHu9fYvanUI3tOw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"openapi-typescript-helpers": "^0.0.15"
-			}
-		},
-		"node_modules/openapi-typescript": {
-			"version": "7.4.4",
-			"resolved": "https://registry.npmjs.org/openapi-typescript/-/openapi-typescript-7.4.4.tgz",
-			"integrity": "sha512-7j3nktnRzlQdlHnHsrcr6Gqz8f80/RhfA2I8s1clPI+jkY0hLNmnYVKBfuUEli5EEgK1B6M+ibdS5REasPlsUw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@redocly/openapi-core": "^1.25.9",
-				"ansi-colors": "^4.1.3",
-				"change-case": "^5.4.4",
-				"parse-json": "^8.1.0",
-				"supports-color": "^9.4.0",
-				"yargs-parser": "^21.1.1"
-			},
-			"bin": {
-				"openapi-typescript": "bin/cli.js"
-			},
-			"peerDependencies": {
-				"typescript": "^5.x"
-			}
-		},
-		"node_modules/openapi-typescript-helpers": {
-			"version": "0.0.15",
-			"resolved": "https://registry.npmjs.org/openapi-typescript-helpers/-/openapi-typescript-helpers-0.0.15.tgz",
-			"integrity": "sha512-opyTPaunsklCBpTK8JGef6mfPhLSnyy5a0IN9vKtx3+4aExf+KxEqYwIy3hqkedXIB97u357uLMJsOnm3GVjsw==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/openapi-typescript/node_modules/parse-json": {
-			"version": "8.1.0",
-			"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-8.1.0.tgz",
-			"integrity": "sha512-rum1bPifK5SSar35Z6EKZuYPJx85pkNaFrxBK3mwdfSJ1/WKbYrjoW/zTPSjRRamfmVX1ACBIdFAO0VRErW/EA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/code-frame": "^7.22.13",
-				"index-to-position": "^0.1.2",
-				"type-fest": "^4.7.1"
-			},
-			"engines": {
-				"node": ">=18"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/openapi-typescript/node_modules/supports-color": {
-			"version": "9.4.0",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-9.4.0.tgz",
-			"integrity": "sha512-VL+lNrEoIXww1coLPOmiEmK/0sGigko5COxI09KzHc2VJXJsQ37UaQ+8quuxjDeA7+KnLGTWRyOXSLLR2Wb4jw==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/supports-color?sponsor=1"
-			}
-		},
-		"node_modules/openapi-typescript/node_modules/type-fest": {
-			"version": "4.31.0",
-			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.31.0.tgz",
-			"integrity": "sha512-yCxltHW07Nkhv/1F6wWBr8kz+5BGMfP+RbRSYFnegVb0qV/UMT0G0ElBloPVerqn4M2ZV80Ir1FtCcYv1cT6vQ==",
-			"dev": true,
-			"license": "(MIT OR CC0-1.0)",
-			"engines": {
-				"node": ">=16"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/optionator": {
-			"version": "0.9.4",
-			"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
-			"integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"deep-is": "^0.1.3",
-				"fast-levenshtein": "^2.0.6",
-				"levn": "^0.4.1",
-				"prelude-ls": "^1.2.1",
-				"type-check": "^0.4.0",
-				"word-wrap": "^1.2.5"
-			},
-			"engines": {
-				"node": ">= 0.8.0"
-			}
-		},
-		"node_modules/p-limit": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-			"integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"yocto-queue": "^0.1.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/p-locate": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-			"integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"p-limit": "^3.0.2"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/p-queue": {
-			"version": "8.0.1",
-			"resolved": "https://registry.npmjs.org/p-queue/-/p-queue-8.0.1.tgz",
-			"integrity": "sha512-NXzu9aQJTAzbBqOt2hwsR63ea7yvxJc0PwN/zobNAudYfb1B7R08SzB4TsLeSbUCuG467NhnoT0oO6w1qRO+BA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"eventemitter3": "^5.0.1",
-				"p-timeout": "^6.1.2"
-			},
-			"engines": {
-				"node": ">=18"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/p-timeout": {
-			"version": "6.1.4",
-			"resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-6.1.4.tgz",
-			"integrity": "sha512-MyIV3ZA/PmyBN/ud8vV9XzwTrNtR4jFrObymZYnZqMmW0zA8Z17vnT0rBgFE/TlohB+YCHqXMgZzb3Csp49vqg==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=14.16"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/p-try": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-			"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/parent-module": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-			"integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"callsites": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/parse-json": {
-			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
-			"integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/code-frame": "^7.0.0",
-				"error-ex": "^1.3.1",
-				"json-parse-even-better-errors": "^2.3.0",
-				"lines-and-columns": "^1.1.6"
-			},
-			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/path-exists": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-			"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/path-is-absolute": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-			"integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/path-key": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/path-parse": {
-			"version": "1.0.7",
-			"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-			"integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/picocolors": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
-			"integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
-			"dev": true,
-			"license": "ISC"
-		},
-		"node_modules/picomatch": {
-			"version": "2.3.1",
-			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-			"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=8.6"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/jonschlinkert"
-			}
-		},
-		"node_modules/pirates": {
-			"version": "4.0.6",
-			"resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
-			"integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">= 6"
-			}
-		},
-		"node_modules/pkg-dir": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-			"integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"find-up": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/pkg-dir/node_modules/find-up": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-			"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"locate-path": "^5.0.0",
-				"path-exists": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/pkg-dir/node_modules/locate-path": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-			"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"p-locate": "^4.1.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/pkg-dir/node_modules/p-limit": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-			"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"p-try": "^2.0.0"
-			},
-			"engines": {
-				"node": ">=6"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/pkg-dir/node_modules/p-locate": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-			"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"p-limit": "^2.2.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/pluralize": {
-			"version": "8.0.0",
-			"resolved": "https://registry.npmjs.org/pluralize/-/pluralize-8.0.0.tgz",
-			"integrity": "sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/postcss": {
-			"version": "8.4.49",
-			"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz",
-			"integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "opencollective",
-					"url": "https://opencollective.com/postcss/"
-				},
-				{
-					"type": "tidelift",
-					"url": "https://tidelift.com/funding/github/npm/postcss"
-				},
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/ai"
-				}
-			],
-			"license": "MIT",
-			"dependencies": {
-				"nanoid": "^3.3.7",
-				"picocolors": "^1.1.1",
-				"source-map-js": "^1.2.1"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >=14"
-			}
-		},
-		"node_modules/postcss-modules-extract-imports": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.1.0.tgz",
-			"integrity": "sha512-k3kNe0aNFQDAZGbin48pL2VNidTF0w4/eASDsxlyspobzU3wZQLOGj7L9gfRe0Jo9/4uud09DsjFNH7winGv8Q==",
-			"dev": true,
-			"license": "ISC",
-			"engines": {
-				"node": "^10 || ^12 || >= 14"
-			},
-			"peerDependencies": {
-				"postcss": "^8.1.0"
-			}
-		},
-		"node_modules/postcss-modules-local-by-default": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.2.0.tgz",
-			"integrity": "sha512-5kcJm/zk+GJDSfw+V/42fJ5fhjL5YbFDl8nVdXkJPLLW+Vf9mTD5Xe0wqIaDnLuL2U6cDNpTr+UQ+v2HWIBhzw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"icss-utils": "^5.0.0",
-				"postcss-selector-parser": "^7.0.0",
-				"postcss-value-parser": "^4.1.0"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >= 14"
-			},
-			"peerDependencies": {
-				"postcss": "^8.1.0"
-			}
-		},
-		"node_modules/postcss-modules-scope": {
-			"version": "3.2.1",
-			"resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.2.1.tgz",
-			"integrity": "sha512-m9jZstCVaqGjTAuny8MdgE88scJnCiQSlSrOWcTQgM2t32UBe+MUmFSO5t7VMSfAf/FJKImAxBav8ooCHJXCJA==",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"postcss-selector-parser": "^7.0.0"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >= 14"
-			},
-			"peerDependencies": {
-				"postcss": "^8.1.0"
-			}
-		},
-		"node_modules/postcss-modules-values": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
-			"integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"icss-utils": "^5.0.0"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >= 14"
-			},
-			"peerDependencies": {
-				"postcss": "^8.1.0"
-			}
-		},
-		"node_modules/postcss-selector-parser": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.0.0.tgz",
-			"integrity": "sha512-9RbEr1Y7FFfptd/1eEdntyjMwLeghW1bHX9GWjXo19vx4ytPQhANltvVxDggzJl7mnWM+dX28kb6cyS/4iQjlQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"cssesc": "^3.0.0",
-				"util-deprecate": "^1.0.2"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/postcss-value-parser": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/prelude-ls": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-			"integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">= 0.8.0"
-			}
-		},
-		"node_modules/prettier": {
-			"version": "3.4.2",
-			"resolved": "https://registry.npmjs.org/prettier/-/prettier-3.4.2.tgz",
-			"integrity": "sha512-e9MewbtFo+Fevyuxn/4rrcDAaq0IYxPGLvObpQjiZBMAzB9IGmzlnG9RZy3FFas+eBMu2vA0CszMeduow5dIuQ==",
-			"dev": true,
-			"license": "MIT",
-			"bin": {
-				"prettier": "bin/prettier.cjs"
-			},
-			"engines": {
-				"node": ">=14"
-			},
-			"funding": {
-				"url": "https://github.com/prettier/prettier?sponsor=1"
-			}
-		},
-		"node_modules/pretty-format": {
-			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
-			"integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/schemas": "^29.6.3",
-				"ansi-styles": "^5.0.0",
-				"react-is": "^18.0.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/pretty-format/node_modules/ansi-styles": {
-			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-			"integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
-			}
-		},
-		"node_modules/prompts": {
-			"version": "2.4.2",
-			"resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
-			"integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"kleur": "^3.0.3",
-				"sisteransi": "^1.0.5"
-			},
-			"engines": {
-				"node": ">= 6"
-			}
-		},
-		"node_modules/punycode": {
-			"version": "2.3.1",
-			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
-			"integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/pure-rand": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.1.0.tgz",
-			"integrity": "sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "individual",
-					"url": "https://github.com/sponsors/dubzzz"
-				},
-				{
-					"type": "opencollective",
-					"url": "https://opencollective.com/fast-check"
-				}
-			],
-			"license": "MIT"
-		},
-		"node_modules/queue-microtask": {
-			"version": "1.2.3",
-			"resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-			"integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-			"dev": true,
-			"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"
-		},
-		"node_modules/randombytes": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
-			"integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"safe-buffer": "^5.1.0"
-			}
-		},
-		"node_modules/react-is": {
-			"version": "18.3.1",
-			"resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
-			"integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/readdirp": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.0.2.tgz",
-			"integrity": "sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">= 14.16.0"
-			},
-			"funding": {
-				"type": "individual",
-				"url": "https://paulmillr.com/funding/"
-			}
-		},
-		"node_modules/rechoir": {
-			"version": "0.8.0",
-			"resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.8.0.tgz",
-			"integrity": "sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"resolve": "^1.20.0"
-			},
-			"engines": {
-				"node": ">= 10.13.0"
-			}
-		},
-		"node_modules/regex-parser": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.3.0.tgz",
-			"integrity": "sha512-TVILVSz2jY5D47F4mA4MppkBrafEaiUWJO/TcZHEIuI13AqoZMkK1WMA4Om1YkYbTx+9Ki1/tSUXbceyr9saRg==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/request-animation-frame-timeout": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/request-animation-frame-timeout/-/request-animation-frame-timeout-2.0.4.tgz",
-			"integrity": "sha512-5oYwRBYjrMSU/YHHXj5AM/nv96ZE0b8WZoA3FqnkeDDPXoprxUCZFK4IWZTl+y3RJQtaihiJPiKOB4NZfZ7C7A==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/require-directory": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-			"integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/require-from-string": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-			"integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/resolve": {
-			"version": "1.22.10",
-			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz",
-			"integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"is-core-module": "^2.16.0",
-				"path-parse": "^1.0.7",
-				"supports-preserve-symlinks-flag": "^1.0.0"
-			},
-			"bin": {
-				"resolve": "bin/resolve"
-			},
-			"engines": {
-				"node": ">= 0.4"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/resolve-cwd": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
-			"integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"resolve-from": "^5.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/resolve-cwd/node_modules/resolve-from": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-			"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/resolve-from": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-			"integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/resolve-url-loader": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-5.0.0.tgz",
-			"integrity": "sha512-uZtduh8/8srhBoMx//5bwqjQ+rfYOUq8zC9NrMUGtjBiGTtFJM42s58/36+hTqeqINcnYe08Nj3LkK9lW4N8Xg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"adjust-sourcemap-loader": "^4.0.0",
-				"convert-source-map": "^1.7.0",
-				"loader-utils": "^2.0.0",
-				"postcss": "^8.2.14",
-				"source-map": "0.6.1"
-			},
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/resolve-url-loader/node_modules/convert-source-map": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
-			"integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/resolve.exports": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.3.tgz",
-			"integrity": "sha512-OcXjMsGdhL4XnbShKpAcSqPMzQoYkYyhbEaeSko47MjRP9NfEQMhZkXL1DoFlt9LWQn4YttrdnV6X2OiyzBi+A==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/reusify": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-			"integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"iojs": ">=1.0.0",
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/run-parallel": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-			"integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-			"dev": true,
-			"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": {
-				"queue-microtask": "^1.2.2"
-			}
-		},
-		"node_modules/rxjs": {
-			"version": "7.8.1",
-			"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
-			"integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
-			"dev": true,
-			"license": "Apache-2.0",
-			"peer": true,
-			"dependencies": {
-				"tslib": "^2.1.0"
-			}
-		},
-		"node_modules/safe-buffer": {
-			"version": "5.2.1",
-			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-			"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-			"dev": true,
-			"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"
-		},
-		"node_modules/safe-identifier": {
-			"version": "0.4.2",
-			"resolved": "https://registry.npmjs.org/safe-identifier/-/safe-identifier-0.4.2.tgz",
-			"integrity": "sha512-6pNbSMW6OhAi9j+N8V+U715yBQsaWJ7eyEUaOrawX+isg5ZxhUlV1NipNtgaKHmFGiABwt+ZF04Ii+3Xjkg+8w==",
-			"dev": true,
-			"license": "ISC"
-		},
-		"node_modules/sass": {
-			"version": "1.83.1",
-			"resolved": "https://registry.npmjs.org/sass/-/sass-1.83.1.tgz",
-			"integrity": "sha512-EVJbDaEs4Rr3F0glJzFSOvtg2/oy2V/YrGFPqPY24UqcLDWcI9ZY5sN+qyO3c/QCZwzgfirvhXvINiJCE/OLcA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"chokidar": "^4.0.0",
-				"immutable": "^5.0.2",
-				"source-map-js": ">=0.6.2 <2.0.0"
-			},
-			"bin": {
-				"sass": "sass.js"
-			},
-			"engines": {
-				"node": ">=14.0.0"
-			},
-			"optionalDependencies": {
-				"@parcel/watcher": "^2.4.1"
-			}
-		},
-		"node_modules/sass-embedded": {
-			"version": "1.83.1",
-			"resolved": "https://registry.npmjs.org/sass-embedded/-/sass-embedded-1.83.1.tgz",
-			"integrity": "sha512-LdKG6nxLEzpXbMUt0if12PhUNonGvy91n7IWHOZRZjvA6AWm9oVdhpO+KEXN/Sc+jjGvQeQcav9+Z8DwmII/pA==",
-			"dev": true,
-			"license": "MIT",
-			"peer": true,
-			"dependencies": {
-				"@bufbuild/protobuf": "^2.0.0",
-				"buffer-builder": "^0.2.0",
-				"colorjs.io": "^0.5.0",
-				"immutable": "^5.0.2",
-				"rxjs": "^7.4.0",
-				"supports-color": "^8.1.1",
-				"sync-child-process": "^1.0.2",
-				"varint": "^6.0.0"
-			},
-			"bin": {
-				"sass": "dist/bin/sass.js"
-			},
-			"engines": {
-				"node": ">=16.0.0"
-			},
-			"optionalDependencies": {
-				"sass-embedded-android-arm": "1.83.1",
-				"sass-embedded-android-arm64": "1.83.1",
-				"sass-embedded-android-ia32": "1.83.1",
-				"sass-embedded-android-riscv64": "1.83.1",
-				"sass-embedded-android-x64": "1.83.1",
-				"sass-embedded-darwin-arm64": "1.83.1",
-				"sass-embedded-darwin-x64": "1.83.1",
-				"sass-embedded-linux-arm": "1.83.1",
-				"sass-embedded-linux-arm64": "1.83.1",
-				"sass-embedded-linux-ia32": "1.83.1",
-				"sass-embedded-linux-musl-arm": "1.83.1",
-				"sass-embedded-linux-musl-arm64": "1.83.1",
-				"sass-embedded-linux-musl-ia32": "1.83.1",
-				"sass-embedded-linux-musl-riscv64": "1.83.1",
-				"sass-embedded-linux-musl-x64": "1.83.1",
-				"sass-embedded-linux-riscv64": "1.83.1",
-				"sass-embedded-linux-x64": "1.83.1",
-				"sass-embedded-win32-arm64": "1.83.1",
-				"sass-embedded-win32-ia32": "1.83.1",
-				"sass-embedded-win32-x64": "1.83.1"
-			}
-		},
-		"node_modules/sass-embedded-android-arm": {
-			"version": "1.83.1",
-			"resolved": "https://registry.npmjs.org/sass-embedded-android-arm/-/sass-embedded-android-arm-1.83.1.tgz",
-			"integrity": "sha512-FKfrmwDG84L5cfn8fmIew47qnCFFUdcoOTCzOw8ROItkRhLLH0hnIm6gEpG5T6OFf6kxzUxvE9D0FvYQUznZrw==",
-			"cpu": [
-				"arm"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"android"
-			],
-			"peer": true,
-			"engines": {
-				"node": ">=14.0.0"
-			}
-		},
-		"node_modules/sass-embedded-android-arm64": {
-			"version": "1.83.1",
-			"resolved": "https://registry.npmjs.org/sass-embedded-android-arm64/-/sass-embedded-android-arm64-1.83.1.tgz",
-			"integrity": "sha512-S63rlLPGCA9FCqYYOobDJrwcuBX0zbSOl7y0jT9DlfqeqNOkC6NIT1id6RpMFCs3uhd4gbBS2E/5WPv5J5qwbw==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"android"
-			],
-			"peer": true,
-			"engines": {
-				"node": ">=14.0.0"
-			}
-		},
-		"node_modules/sass-embedded-android-ia32": {
-			"version": "1.83.1",
-			"resolved": "https://registry.npmjs.org/sass-embedded-android-ia32/-/sass-embedded-android-ia32-1.83.1.tgz",
-			"integrity": "sha512-AGlY2vFLJhF2hN0qOz12f4eDs6x0b5BUapOpgfRrqQLHIfJhxkvi39bInsiBgQ57U0jb4I7AaS2e2e+sj7+Rqw==",
-			"cpu": [
-				"ia32"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"android"
-			],
-			"peer": true,
-			"engines": {
-				"node": ">=14.0.0"
-			}
-		},
-		"node_modules/sass-embedded-android-riscv64": {
-			"version": "1.83.1",
-			"resolved": "https://registry.npmjs.org/sass-embedded-android-riscv64/-/sass-embedded-android-riscv64-1.83.1.tgz",
-			"integrity": "sha512-OyU4AnfAUVd/wBaT60XvHidmQdaEsVUnxvI71oyPM/id1v97aWTZX3SmGkwGb7uA/q6Soo2uNalgvOSNJn7PwA==",
-			"cpu": [
-				"riscv64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"android"
-			],
-			"peer": true,
-			"engines": {
-				"node": ">=14.0.0"
-			}
-		},
-		"node_modules/sass-embedded-android-x64": {
-			"version": "1.83.1",
-			"resolved": "https://registry.npmjs.org/sass-embedded-android-x64/-/sass-embedded-android-x64-1.83.1.tgz",
-			"integrity": "sha512-NY5rwffhF4TnhXVErZnfFIjHqU3MNoWxCuSHumRN3dDI8hp8+IF59W5+Qw9AARlTXvyb+D0u5653aLSea5F40w==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"android"
-			],
-			"peer": true,
-			"engines": {
-				"node": ">=14.0.0"
-			}
-		},
-		"node_modules/sass-embedded-darwin-arm64": {
-			"version": "1.83.1",
-			"resolved": "https://registry.npmjs.org/sass-embedded-darwin-arm64/-/sass-embedded-darwin-arm64-1.83.1.tgz",
-			"integrity": "sha512-w1SBcSkIgIWgUfB7IKcPoTbSwnS3Kag5PVv3e3xfW6ZCsDweYZLQntUd2WGgaoekdm1uIbVuvPxnDH2t880iGQ==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"darwin"
-			],
-			"peer": true,
-			"engines": {
-				"node": ">=14.0.0"
-			}
-		},
-		"node_modules/sass-embedded-darwin-x64": {
-			"version": "1.83.1",
-			"resolved": "https://registry.npmjs.org/sass-embedded-darwin-x64/-/sass-embedded-darwin-x64-1.83.1.tgz",
-			"integrity": "sha512-RWrmLtUhEP5kvcGOAFdr99/ebZ/eW9z3FAktLldvgl2k96WSTC1Zr2ctL0E+Y+H3uLahEZsshIFk6RkVIRKIsA==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"darwin"
-			],
-			"peer": true,
-			"engines": {
-				"node": ">=14.0.0"
-			}
-		},
-		"node_modules/sass-embedded-linux-arm": {
-			"version": "1.83.1",
-			"resolved": "https://registry.npmjs.org/sass-embedded-linux-arm/-/sass-embedded-linux-arm-1.83.1.tgz",
-			"integrity": "sha512-y7rHuRgjg2YM284rin068PsEdthPljSGb653Slut5Wba4A2IP11UNVraSl6Je2AYTuoPRjQX0g7XdsrjXlzC3g==",
-			"cpu": [
-				"arm"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"peer": true,
-			"engines": {
-				"node": ">=14.0.0"
-			}
-		},
-		"node_modules/sass-embedded-linux-arm64": {
-			"version": "1.83.1",
-			"resolved": "https://registry.npmjs.org/sass-embedded-linux-arm64/-/sass-embedded-linux-arm64-1.83.1.tgz",
-			"integrity": "sha512-HVIytzj8OO18fmBY6SVRIYErcJ+Nd9a5RNF6uArav/CqvwPLATlUV8dwqSyWQIzSsQUhDF/vFIlJIoNLKKzD3A==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"peer": true,
-			"engines": {
-				"node": ">=14.0.0"
-			}
-		},
-		"node_modules/sass-embedded-linux-ia32": {
-			"version": "1.83.1",
-			"resolved": "https://registry.npmjs.org/sass-embedded-linux-ia32/-/sass-embedded-linux-ia32-1.83.1.tgz",
-			"integrity": "sha512-/pc+jHllyvfaYYLTRCoXseRc4+V3Z7IDPqsviTcfVdICAoR9mgK2RtIuIZanhm1NP/lDylDOgvj1NtjcA2dNvg==",
-			"cpu": [
-				"ia32"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"peer": true,
-			"engines": {
-				"node": ">=14.0.0"
-			}
-		},
-		"node_modules/sass-embedded-linux-musl-arm": {
-			"version": "1.83.1",
-			"resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-arm/-/sass-embedded-linux-musl-arm-1.83.1.tgz",
-			"integrity": "sha512-sFM8GXOVoeR91j9MiwNRcFXRpTA7u4185SaGuvUjcRMb84mHvtWOJPGDvgZqbWdVClBRJp6J7+CShliWngy/og==",
-			"cpu": [
-				"arm"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"peer": true,
-			"engines": {
-				"node": ">=14.0.0"
-			}
-		},
-		"node_modules/sass-embedded-linux-musl-arm64": {
-			"version": "1.83.1",
-			"resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-arm64/-/sass-embedded-linux-musl-arm64-1.83.1.tgz",
-			"integrity": "sha512-wjSIYYqdIQp3DjliSTYNFg04TVqQf/3Up/Stahol0Qf/TTjLkjHHtT2jnDaZI5GclHi2PVJqQF3wEGB8bGJMzQ==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"peer": true,
-			"engines": {
-				"node": ">=14.0.0"
-			}
-		},
-		"node_modules/sass-embedded-linux-musl-ia32": {
-			"version": "1.83.1",
-			"resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-ia32/-/sass-embedded-linux-musl-ia32-1.83.1.tgz",
-			"integrity": "sha512-iwhTH5gwmoGt3VH6dn4WV8N6eWvthKAvUX5XPURq7e9KEsc7QP8YNHagwaAJh7TAPopb32buyEg6oaUmzxUI+Q==",
-			"cpu": [
-				"ia32"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"peer": true,
-			"engines": {
-				"node": ">=14.0.0"
-			}
-		},
-		"node_modules/sass-embedded-linux-musl-riscv64": {
-			"version": "1.83.1",
-			"resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-riscv64/-/sass-embedded-linux-musl-riscv64-1.83.1.tgz",
-			"integrity": "sha512-FjFNWHU1n0Q6GpK1lAHQL5WmzlPjL8DTVLkYW2A/dq8EsutAdi3GfpeyWZk9bte8kyWdmPUWG3BHlnQl22xdoA==",
-			"cpu": [
-				"riscv64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"peer": true,
-			"engines": {
-				"node": ">=14.0.0"
-			}
-		},
-		"node_modules/sass-embedded-linux-musl-x64": {
-			"version": "1.83.1",
-			"resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-x64/-/sass-embedded-linux-musl-x64-1.83.1.tgz",
-			"integrity": "sha512-BUfYR5TIDvgGHWhxSIKwTJocXU88ECZ0BW89RJqtvr7m83fKdf5ylTFCOieU7BwcA7SORUeZzcQzVFIdPUM3BQ==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"peer": true,
-			"engines": {
-				"node": ">=14.0.0"
-			}
-		},
-		"node_modules/sass-embedded-linux-riscv64": {
-			"version": "1.83.1",
-			"resolved": "https://registry.npmjs.org/sass-embedded-linux-riscv64/-/sass-embedded-linux-riscv64-1.83.1.tgz",
-			"integrity": "sha512-KOBGSpMrJi8y+H+za3vAAVQImPUvQa5eUrvTbbOl+wkU7WAGhOu8xrxgmYYiz3pZVBBcfRjz4I2jBcDFKJmWSw==",
-			"cpu": [
-				"riscv64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"peer": true,
-			"engines": {
-				"node": ">=14.0.0"
-			}
-		},
-		"node_modules/sass-embedded-linux-x64": {
-			"version": "1.83.1",
-			"resolved": "https://registry.npmjs.org/sass-embedded-linux-x64/-/sass-embedded-linux-x64-1.83.1.tgz",
-			"integrity": "sha512-swUsMHKqlEU9dZQ/I5WADDaXz+QkmJS27x/Oeh+oz41YgZ0ppKd0l4Vwjn0LgOQn+rxH1zLFv6xXDycvj68F/w==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"peer": true,
-			"engines": {
-				"node": ">=14.0.0"
-			}
-		},
-		"node_modules/sass-embedded-win32-arm64": {
-			"version": "1.83.1",
-			"resolved": "https://registry.npmjs.org/sass-embedded-win32-arm64/-/sass-embedded-win32-arm64-1.83.1.tgz",
-			"integrity": "sha512-6lONEBN5TaFD5L/y68zUugryXqm4RAFuLdaOPeZQRu+7ay/AmfhtFYfE5gRssnIcIx1nlcoq7zA3UX+SN2jo1Q==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"win32"
-			],
-			"peer": true,
-			"engines": {
-				"node": ">=14.0.0"
-			}
-		},
-		"node_modules/sass-embedded-win32-ia32": {
-			"version": "1.83.1",
-			"resolved": "https://registry.npmjs.org/sass-embedded-win32-ia32/-/sass-embedded-win32-ia32-1.83.1.tgz",
-			"integrity": "sha512-HxZDkAE9n6Gb8Rz6xd67VHuo5FkUSQ4xPb7cHKa4pE0ndwH5Oc0uEhbqjJobpgmnuTm1rQYNU2nof1sFhy2MFA==",
-			"cpu": [
-				"ia32"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"win32"
-			],
-			"peer": true,
-			"engines": {
-				"node": ">=14.0.0"
-			}
-		},
-		"node_modules/sass-embedded-win32-x64": {
-			"version": "1.83.1",
-			"resolved": "https://registry.npmjs.org/sass-embedded-win32-x64/-/sass-embedded-win32-x64-1.83.1.tgz",
-			"integrity": "sha512-5Q0aPfUaqRek8Ee1AqTUIC0o6yQSA8QwyhCgh7upsnHG3Ltm8pkJOYjzm+UgYPJeoMNppDjdDlRGQISE7qzd4g==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"win32"
-			],
-			"peer": true,
-			"engines": {
-				"node": ">=14.0.0"
-			}
-		},
-		"node_modules/sass-embedded/node_modules/supports-color": {
-			"version": "8.1.1",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-			"integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-			"dev": true,
-			"license": "MIT",
-			"peer": true,
-			"dependencies": {
-				"has-flag": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/supports-color?sponsor=1"
-			}
-		},
-		"node_modules/sass-loader": {
-			"version": "16.0.4",
-			"resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-16.0.4.tgz",
-			"integrity": "sha512-LavLbgbBGUt3wCiYzhuLLu65+fWXaXLmq7YxivLhEqmiupCFZ5sKUAipK3do6V80YSU0jvSxNhEdT13IXNr3rg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"neo-async": "^2.6.2"
-			},
-			"engines": {
-				"node": ">= 18.12.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
-			},
-			"peerDependencies": {
-				"@rspack/core": "0.x || 1.x",
-				"node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0",
-				"sass": "^1.3.0",
-				"sass-embedded": "*",
-				"webpack": "^5.0.0"
-			},
-			"peerDependenciesMeta": {
-				"@rspack/core": {
-					"optional": true
-				},
-				"node-sass": {
-					"optional": true
-				},
-				"sass": {
-					"optional": true
-				},
-				"sass-embedded": {
-					"optional": true
-				},
-				"webpack": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/schema-utils": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
-			"integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@types/json-schema": "^7.0.8",
-				"ajv": "^6.12.5",
-				"ajv-keywords": "^3.5.2"
-			},
-			"engines": {
-				"node": ">= 10.13.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
-			}
-		},
-		"node_modules/semver": {
-			"version": "7.6.3",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
-			"integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
-			"dev": true,
-			"license": "ISC",
-			"bin": {
-				"semver": "bin/semver.js"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/serialize-javascript": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
-			"integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
-			"dev": true,
-			"license": "BSD-3-Clause",
-			"dependencies": {
-				"randombytes": "^2.1.0"
-			}
-		},
-		"node_modules/shallow-clone": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
-			"integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"kind-of": "^6.0.2"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/shebang-command": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"shebang-regex": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/shebang-regex": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/signal-exit": {
-			"version": "3.0.7",
-			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-			"integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-			"dev": true,
-			"license": "ISC"
-		},
-		"node_modules/sisteransi": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
-			"integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/slash": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-			"integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/source-map": {
-			"version": "0.6.1",
-			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-			"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-			"dev": true,
-			"license": "BSD-3-Clause",
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/source-map-js": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
-			"integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
-			"dev": true,
-			"license": "BSD-3-Clause",
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/source-map-support": {
-			"version": "0.5.13",
-			"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
-			"integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"buffer-from": "^1.0.0",
-				"source-map": "^0.6.0"
-			}
-		},
-		"node_modules/sprintf-js": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-			"integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
-			"dev": true,
-			"license": "BSD-3-Clause"
-		},
-		"node_modules/stack-utils": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
-			"integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"escape-string-regexp": "^2.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/stack-utils/node_modules/escape-string-regexp": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-			"integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/string-length": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
-			"integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"char-regex": "^1.0.2",
-				"strip-ansi": "^6.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/string-width": {
-			"version": "4.2.3",
-			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"emoji-regex": "^8.0.0",
-				"is-fullwidth-code-point": "^3.0.0",
-				"strip-ansi": "^6.0.1"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/strip-ansi": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-			"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"ansi-regex": "^5.0.1"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/strip-bom": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
-			"integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/strip-final-newline": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
-			"integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/strip-json-comments": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-			"integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/style-mod": {
-			"version": "4.1.2",
-			"resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.1.2.tgz",
-			"integrity": "sha512-wnD1HyVqpJUI2+eKZ+eo1UwghftP6yuFheBqqe+bWCotBjC2K1YnteJILRMs3SM4V/0dLEW1SC27MWP5y+mwmw==",
-			"dev": true,
-			"license": "MIT",
-			"peer": true
-		},
-		"node_modules/supports-color": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"has-flag": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/supports-preserve-symlinks-flag": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-			"integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">= 0.4"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/sync_lib": {
-			"resolved": "../backend/sync_lib/pkg",
-			"link": true
-		},
-		"node_modules/sync-child-process": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/sync-child-process/-/sync-child-process-1.0.2.tgz",
-			"integrity": "sha512-8lD+t2KrrScJ/7KXCSyfhT3/hRq78rC0wBFqNJXv3mZyn6hW2ypM05JmlSvtqRbeq6jqA94oHbxAr2vYsJ8vDA==",
-			"dev": true,
-			"license": "MIT",
-			"peer": true,
-			"dependencies": {
-				"sync-message-port": "^1.0.0"
-			},
-			"engines": {
-				"node": ">=16.0.0"
-			}
-		},
-		"node_modules/sync-message-port": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/sync-message-port/-/sync-message-port-1.1.3.tgz",
-			"integrity": "sha512-GTt8rSKje5FilG+wEdfCkOcLL7LWqpMlr2c3LRuKt/YXxcJ52aGSbGBAdI4L3aaqfrBt6y711El53ItyH1NWzg==",
-			"dev": true,
-			"license": "MIT",
-			"peer": true,
-			"engines": {
-				"node": ">=16.0.0"
-			}
-		},
-		"node_modules/tapable": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
-			"integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/terser": {
-			"version": "5.37.0",
-			"resolved": "https://registry.npmjs.org/terser/-/terser-5.37.0.tgz",
-			"integrity": "sha512-B8wRRkmre4ERucLM/uXx4MOV5cbnOlVAqUst+1+iLKPI0dOgFO28f84ptoQt9HEI537PMzfYa/d+GEPKTRXmYA==",
-			"dev": true,
-			"license": "BSD-2-Clause",
-			"dependencies": {
-				"@jridgewell/source-map": "^0.3.3",
-				"acorn": "^8.8.2",
-				"commander": "^2.20.0",
-				"source-map-support": "~0.5.20"
-			},
-			"bin": {
-				"terser": "bin/terser"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/terser-webpack-plugin": {
-			"version": "5.3.11",
-			"resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.11.tgz",
-			"integrity": "sha512-RVCsMfuD0+cTt3EwX8hSl2Ks56EbFHWmhluwcqoPKtBnfjiT6olaq7PRIRfhyU8nnC2MrnDrBLfrD/RGE+cVXQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jridgewell/trace-mapping": "^0.3.25",
-				"jest-worker": "^27.4.5",
-				"schema-utils": "^4.3.0",
-				"serialize-javascript": "^6.0.2",
-				"terser": "^5.31.1"
-			},
-			"engines": {
-				"node": ">= 10.13.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
-			},
-			"peerDependencies": {
-				"webpack": "^5.1.0"
-			},
-			"peerDependenciesMeta": {
-				"@swc/core": {
-					"optional": true
-				},
-				"esbuild": {
-					"optional": true
-				},
-				"uglify-js": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/terser-webpack-plugin/node_modules/ajv": {
-			"version": "8.17.1",
-			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
-			"integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"fast-deep-equal": "^3.1.3",
-				"fast-uri": "^3.0.1",
-				"json-schema-traverse": "^1.0.0",
-				"require-from-string": "^2.0.2"
-			},
-			"funding": {
-				"type": "github",
-				"url": "https://github.com/sponsors/epoberezkin"
-			}
-		},
-		"node_modules/terser-webpack-plugin/node_modules/ajv-keywords": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-			"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"fast-deep-equal": "^3.1.3"
-			},
-			"peerDependencies": {
-				"ajv": "^8.8.2"
-			}
-		},
-		"node_modules/terser-webpack-plugin/node_modules/jest-worker": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
-			"integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@types/node": "*",
-				"merge-stream": "^2.0.0",
-				"supports-color": "^8.0.0"
-			},
-			"engines": {
-				"node": ">= 10.13.0"
-			}
-		},
-		"node_modules/terser-webpack-plugin/node_modules/json-schema-traverse": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/terser-webpack-plugin/node_modules/schema-utils": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.0.tgz",
-			"integrity": "sha512-Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@types/json-schema": "^7.0.9",
-				"ajv": "^8.9.0",
-				"ajv-formats": "^2.1.1",
-				"ajv-keywords": "^5.1.0"
-			},
-			"engines": {
-				"node": ">= 10.13.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
-			}
-		},
-		"node_modules/terser-webpack-plugin/node_modules/supports-color": {
-			"version": "8.1.1",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-			"integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"has-flag": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/supports-color?sponsor=1"
-			}
-		},
-		"node_modules/terser/node_modules/source-map-support": {
-			"version": "0.5.21",
-			"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
-			"integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"buffer-from": "^1.0.0",
-				"source-map": "^0.6.0"
-			}
-		},
-		"node_modules/test-exclude": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
-			"integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"@istanbuljs/schema": "^0.1.2",
-				"glob": "^7.1.4",
-				"minimatch": "^3.0.4"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/tmpl": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
-			"integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
-			"dev": true,
-			"license": "BSD-3-Clause"
-		},
-		"node_modules/to-regex-range": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-			"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"is-number": "^7.0.0"
-			},
-			"engines": {
-				"node": ">=8.0"
-			}
-		},
-		"node_modules/tr46": {
-			"version": "0.0.3",
-			"resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-			"integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/ts-api-utils": {
-			"version": "1.4.3",
-			"resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.4.3.tgz",
-			"integrity": "sha512-i3eMG77UTMD0hZhgRS562pv83RC6ukSAC2GMNWc+9dieh/+jDM5u5YG+NHX6VNDRHQcHwmsTHctP9LhbC3WxVw==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=16"
-			},
-			"peerDependencies": {
-				"typescript": ">=4.2.0"
-			}
-		},
-		"node_modules/ts-jest": {
-			"version": "29.2.5",
-			"resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.2.5.tgz",
-			"integrity": "sha512-KD8zB2aAZrcKIdGk4OwpJggeLcH1FgrICqDSROWqlnJXGCXK4Mn6FcdK2B6670Xr73lHMG1kHw8R87A0ecZ+vA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"bs-logger": "^0.2.6",
-				"ejs": "^3.1.10",
-				"fast-json-stable-stringify": "^2.1.0",
-				"jest-util": "^29.0.0",
-				"json5": "^2.2.3",
-				"lodash.memoize": "^4.1.2",
-				"make-error": "^1.3.6",
-				"semver": "^7.6.3",
-				"yargs-parser": "^21.1.1"
-			},
-			"bin": {
-				"ts-jest": "cli.js"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || ^18.0.0 || >=20.0.0"
-			},
-			"peerDependencies": {
-				"@babel/core": ">=7.0.0-beta.0 <8",
-				"@jest/transform": "^29.0.0",
-				"@jest/types": "^29.0.0",
-				"babel-jest": "^29.0.0",
-				"jest": "^29.0.0",
-				"typescript": ">=4.3 <6"
-			},
-			"peerDependenciesMeta": {
-				"@babel/core": {
-					"optional": true
-				},
-				"@jest/transform": {
-					"optional": true
-				},
-				"@jest/types": {
-					"optional": true
-				},
-				"babel-jest": {
-					"optional": true
-				},
-				"esbuild": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/ts-loader": {
-			"version": "9.5.1",
-			"resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.5.1.tgz",
-			"integrity": "sha512-rNH3sK9kGZcH9dYzC7CewQm4NtxJTjSEVRJ2DyBZR7f8/wcta+iV44UPCXc5+nzDzivKtlzV6c9P4e+oFhDLYg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"chalk": "^4.1.0",
-				"enhanced-resolve": "^5.0.0",
-				"micromatch": "^4.0.0",
-				"semver": "^7.3.4",
-				"source-map": "^0.7.4"
-			},
-			"engines": {
-				"node": ">=12.0.0"
-			},
-			"peerDependencies": {
-				"typescript": "*",
-				"webpack": "^5.0.0"
-			}
-		},
-		"node_modules/ts-loader/node_modules/source-map": {
-			"version": "0.7.4",
-			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
-			"integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
-			"dev": true,
-			"license": "BSD-3-Clause",
-			"engines": {
-				"node": ">= 8"
-			}
-		},
-		"node_modules/tslib": {
-			"version": "2.4.0",
-			"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-			"integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
-			"dev": true,
-			"license": "0BSD"
-		},
-		"node_modules/type-check": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-			"integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"prelude-ls": "^1.2.1"
-			},
-			"engines": {
-				"node": ">= 0.8.0"
-			}
-		},
-		"node_modules/type-detect": {
-			"version": "4.0.8",
-			"resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-			"integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/type-fest": {
-			"version": "0.21.3",
-			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
-			"integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
-			"dev": true,
-			"license": "(MIT OR CC0-1.0)",
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/typescript": {
-			"version": "5.7.2",
-			"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.2.tgz",
-			"integrity": "sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==",
-			"dev": true,
-			"license": "Apache-2.0",
-			"bin": {
-				"tsc": "bin/tsc",
-				"tsserver": "bin/tsserver"
-			},
-			"engines": {
-				"node": ">=14.17"
-			}
-		},
-		"node_modules/typescript-eslint": {
-			"version": "8.18.0",
-			"resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.18.0.tgz",
-			"integrity": "sha512-Xq2rRjn6tzVpAyHr3+nmSg1/9k9aIHnJ2iZeOH7cfGOWqTkXTm3kwpQglEuLGdNrYvPF+2gtAs+/KF5rjVo+WQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@typescript-eslint/eslint-plugin": "8.18.0",
-				"@typescript-eslint/parser": "8.18.0",
-				"@typescript-eslint/utils": "8.18.0"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			},
-			"peerDependencies": {
-				"eslint": "^8.57.0 || ^9.0.0",
-				"typescript": ">=4.8.4 <5.8.0"
-			}
-		},
-		"node_modules/universalify": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
-			"integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">= 10.0.0"
-			}
-		},
-		"node_modules/update-browserslist-db": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz",
-			"integrity": "sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "opencollective",
-					"url": "https://opencollective.com/browserslist"
-				},
-				{
-					"type": "tidelift",
-					"url": "https://tidelift.com/funding/github/npm/browserslist"
-				},
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/ai"
-				}
-			],
-			"license": "MIT",
-			"dependencies": {
-				"escalade": "^3.2.0",
-				"picocolors": "^1.1.0"
-			},
-			"bin": {
-				"update-browserslist-db": "cli.js"
-			},
-			"peerDependencies": {
-				"browserslist": ">= 4.21.0"
-			}
-		},
-		"node_modules/uri-js": {
-			"version": "4.4.1",
-			"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-			"integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-			"dev": true,
-			"license": "BSD-2-Clause",
-			"dependencies": {
-				"punycode": "^2.1.0"
-			}
-		},
-		"node_modules/uri-js-replace": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/uri-js-replace/-/uri-js-replace-1.0.1.tgz",
-			"integrity": "sha512-W+C9NWNLFOoBI2QWDp4UT9pv65r2w5Cx+3sTYFvtMdDBxkKt1syCqsUdSFAChbEe1uK5TfS04wt/nGwmaeIQ0g==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/util-deprecate": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-			"integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/v8-to-istanbul": {
-			"version": "9.3.0",
-			"resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz",
-			"integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"@jridgewell/trace-mapping": "^0.3.12",
-				"@types/istanbul-lib-coverage": "^2.0.1",
-				"convert-source-map": "^2.0.0"
-			},
-			"engines": {
-				"node": ">=10.12.0"
-			}
-		},
-		"node_modules/varint": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/varint/-/varint-6.0.0.tgz",
-			"integrity": "sha512-cXEIW6cfr15lFv563k4GuVuW/fiwjknytD37jIOLSdSWuOI6WnO/oKwmP2FQTU2l01LP8/M5TSAJpzUaGe3uWg==",
-			"dev": true,
-			"license": "MIT",
-			"peer": true
-		},
-		"node_modules/virtual-scroller": {
-			"version": "1.13.1",
-			"resolved": "https://registry.npmjs.org/virtual-scroller/-/virtual-scroller-1.13.1.tgz",
-			"integrity": "sha512-sui46QUBOIfHyXYjdGkxoze/GlCZFUFRxzxEvsu06UQ4iPc3uRfGnm/Qj7195hiMVOYQW9lDn+m3sD7sRMYdYg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"request-animation-frame-timeout": "^2.0.3"
-			}
-		},
-		"node_modules/w3c-keyname": {
-			"version": "2.2.8",
-			"resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.8.tgz",
-			"integrity": "sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==",
-			"dev": true,
-			"license": "MIT",
-			"peer": true
-		},
-		"node_modules/walker": {
-			"version": "1.0.8",
-			"resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
-			"integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
-			"dev": true,
-			"license": "Apache-2.0",
-			"dependencies": {
-				"makeerror": "1.0.12"
-			}
-		},
-		"node_modules/watchpack": {
-			"version": "2.4.2",
-			"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz",
-			"integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"glob-to-regexp": "^0.4.1",
-				"graceful-fs": "^4.1.2"
-			},
-			"engines": {
-				"node": ">=10.13.0"
-			}
-		},
-		"node_modules/webidl-conversions": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-			"integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
-			"dev": true,
-			"license": "BSD-2-Clause"
-		},
-		"node_modules/webpack": {
-			"version": "5.97.1",
-			"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.97.1.tgz",
-			"integrity": "sha512-EksG6gFY3L1eFMROS/7Wzgrii5mBAFe4rIr3r2BTfo7bcc+DWwFZ4OJ/miOuHJO/A85HwyI4eQ0F6IKXesO7Fg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@types/eslint-scope": "^3.7.7",
-				"@types/estree": "^1.0.6",
-				"@webassemblyjs/ast": "^1.14.1",
-				"@webassemblyjs/wasm-edit": "^1.14.1",
-				"@webassemblyjs/wasm-parser": "^1.14.1",
-				"acorn": "^8.14.0",
-				"browserslist": "^4.24.0",
-				"chrome-trace-event": "^1.0.2",
-				"enhanced-resolve": "^5.17.1",
-				"es-module-lexer": "^1.2.1",
-				"eslint-scope": "5.1.1",
-				"events": "^3.2.0",
-				"glob-to-regexp": "^0.4.1",
-				"graceful-fs": "^4.2.11",
-				"json-parse-even-better-errors": "^2.3.1",
-				"loader-runner": "^4.2.0",
-				"mime-types": "^2.1.27",
-				"neo-async": "^2.6.2",
-				"schema-utils": "^3.2.0",
-				"tapable": "^2.1.1",
-				"terser-webpack-plugin": "^5.3.10",
-				"watchpack": "^2.4.1",
-				"webpack-sources": "^3.2.3"
-			},
-			"bin": {
-				"webpack": "bin/webpack.js"
-			},
-			"engines": {
-				"node": ">=10.13.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
-			},
-			"peerDependenciesMeta": {
-				"webpack-cli": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/webpack-cli": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-6.0.1.tgz",
-			"integrity": "sha512-MfwFQ6SfwinsUVi0rNJm7rHZ31GyTcpVE5pgVA3hwFRb7COD4TzjUUwhGWKfO50+xdc2MQPuEBBJoqIMGt3JDw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@discoveryjs/json-ext": "^0.6.1",
-				"@webpack-cli/configtest": "^3.0.1",
-				"@webpack-cli/info": "^3.0.1",
-				"@webpack-cli/serve": "^3.0.1",
-				"colorette": "^2.0.14",
-				"commander": "^12.1.0",
-				"cross-spawn": "^7.0.3",
-				"envinfo": "^7.14.0",
-				"fastest-levenshtein": "^1.0.12",
-				"import-local": "^3.0.2",
-				"interpret": "^3.1.1",
-				"rechoir": "^0.8.0",
-				"webpack-merge": "^6.0.1"
-			},
-			"bin": {
-				"webpack-cli": "bin/cli.js"
-			},
-			"engines": {
-				"node": ">=18.12.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
-			},
-			"peerDependencies": {
-				"webpack": "^5.82.0"
-			},
-			"peerDependenciesMeta": {
-				"webpack-bundle-analyzer": {
-					"optional": true
-				},
-				"webpack-dev-server": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/webpack-cli/node_modules/colorette": {
-			"version": "2.0.20",
-			"resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
-			"integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/webpack-cli/node_modules/commander": {
-			"version": "12.1.0",
-			"resolved": "https://registry.npmjs.org/commander/-/commander-12.1.0.tgz",
-			"integrity": "sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/webpack-merge": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-6.0.1.tgz",
-			"integrity": "sha512-hXXvrjtx2PLYx4qruKl+kyRSLc52V+cCvMxRjmKwoA+CBbbF5GfIBtR6kCvl0fYGqTUPKB+1ktVmTHqMOzgCBg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"clone-deep": "^4.0.1",
-				"flat": "^5.0.2",
-				"wildcard": "^2.0.1"
-			},
-			"engines": {
-				"node": ">=18.0.0"
-			}
-		},
-		"node_modules/webpack-sources": {
-			"version": "3.2.3",
-			"resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
-			"integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=10.13.0"
-			}
-		},
-		"node_modules/webpack/node_modules/eslint-scope": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-			"integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-			"dev": true,
-			"license": "BSD-2-Clause",
-			"dependencies": {
-				"esrecurse": "^4.3.0",
-				"estraverse": "^4.1.1"
-			},
-			"engines": {
-				"node": ">=8.0.0"
-			}
-		},
-		"node_modules/webpack/node_modules/estraverse": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-			"integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-			"dev": true,
-			"license": "BSD-2-Clause",
-			"engines": {
-				"node": ">=4.0"
-			}
-		},
-		"node_modules/whatwg-url": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-			"integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"tr46": "~0.0.3",
-				"webidl-conversions": "^3.0.0"
-			}
-		},
-		"node_modules/which": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-			"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"isexe": "^2.0.0"
-			},
-			"bin": {
-				"node-which": "bin/node-which"
-			},
-			"engines": {
-				"node": ">= 8"
-			}
-		},
-		"node_modules/wildcard": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz",
-			"integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/word-wrap": {
-			"version": "1.2.5",
-			"resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
-			"integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/wrap-ansi": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-			"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"ansi-styles": "^4.0.0",
-				"string-width": "^4.1.0",
-				"strip-ansi": "^6.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-			}
-		},
-		"node_modules/wrappy": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-			"integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-			"dev": true,
-			"license": "ISC"
-		},
-		"node_modules/write-file-atomic": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
-			"integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"imurmurhash": "^0.1.4",
-				"signal-exit": "^3.0.7"
-			},
-			"engines": {
-				"node": "^12.13.0 || ^14.15.0 || >=16.0.0"
-			}
-		},
-		"node_modules/y18n": {
-			"version": "5.0.8",
-			"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-			"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-			"dev": true,
-			"license": "ISC",
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/yallist": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-			"integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-			"dev": true,
-			"license": "ISC"
-		},
-		"node_modules/yaml-ast-parser": {
-			"version": "0.0.43",
-			"resolved": "https://registry.npmjs.org/yaml-ast-parser/-/yaml-ast-parser-0.0.43.tgz",
-			"integrity": "sha512-2PTINUwsRqSd+s8XxKaJWQlUuEMHJQyEuh2edBbW8KNJz0SJPwUSD2zRWqezFEdN7IzAgeuYHFUCF7o8zRdZ0A==",
-			"dev": true,
-			"license": "Apache-2.0"
-		},
-		"node_modules/yargs": {
-			"version": "17.7.2",
-			"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
-			"integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"cliui": "^8.0.1",
-				"escalade": "^3.1.1",
-				"get-caller-file": "^2.0.5",
-				"require-directory": "^2.1.1",
-				"string-width": "^4.2.3",
-				"y18n": "^5.0.5",
-				"yargs-parser": "^21.1.1"
-			},
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/yargs-parser": {
-			"version": "21.1.1",
-			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-			"integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
-			"dev": true,
-			"license": "ISC",
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/yocto-queue": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-			"integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		}
-	}
-}
diff --git a/obsidian-plugin/package.json b/obsidian-plugin/package.json
index 390f31fc..49df8e44 100644
--- a/obsidian-plugin/package.json
+++ b/obsidian-plugin/package.json
@@ -13,25 +13,26 @@
 	"author": "",
 	"license": "MIT",
 	"devDependencies": {
-		"sync-client": "file:../sync-client",
 		"@types/jest": "^29.5.14",
-		"@types/node": "^16.11.6",
+		"@types/node": "^22.13.4",
 		"css-loader": "^7.1.2",
 		"date-fns": "^4.1.0",
 		"file-loader": "^6.2.0",
-		"fs-extra": "^11.2.0",
-		"virtual-scroller": "^1.13.1",
+		"fs-extra": "^11.3.0",
 		"jest": "^29.7.0",
 		"mini-css-extract-plugin": "^2.9.2",
-		"obsidian": "1.7.2",
+		"obsidian": "1.8.7",
 		"resolve-url-loader": "^5.0.0",
-		"sass-loader": "^16.0.4",
+		"sass": "^1.85.0",
+		"sass-loader": "^16.0.5",
+		"sync-client": "file:../sync-client",
 		"terser-webpack-plugin": "^5.3.11",
 		"ts-jest": "^29.2.5",
-		"ts-loader": "^9.5.1",
-		"tslib": "2.4.0",
-		"typescript": "5.7.2",
-		"webpack": "^5.97.1",
+		"ts-loader": "^9.5.2",
+		"tslib": "2.8.1",
+		"typescript": "5.7.3",
+		"virtual-scroller": "^1.13.1",
+		"webpack": "^5.98.0",
 		"webpack-cli": "^6.0.1"
 	}
-}
\ No newline at end of file
+}
diff --git a/obsidian-plugin/src/views/history-view.ts b/obsidian-plugin/src/views/history-view.ts
index 9108cea6..bb501d77 100644
--- a/obsidian-plugin/src/views/history-view.ts
+++ b/obsidian-plugin/src/views/history-view.ts
@@ -13,7 +13,7 @@ import { SyncType, SyncSource, SyncStatus } from "sync-client";
 export class HistoryView extends ItemView {
 	public static readonly TYPE = "history-view";
 	public static readonly ICON = "square-stack";
-	private timer: NodeJS.Timer | null = null;
+	private timer: NodeJS.Timeout | null = null;
 
 	public constructor(
 		leaf: WorkspaceLeaf,
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 00000000..d7290bae
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,7498 @@
+{
+    "name": "my-workspace",
+    "lockfileVersion": 3,
+    "requires": true,
+    "packages": {
+        "": {
+            "name": "my-workspace",
+            "workspaces": [
+                "sync-client",
+                "obsidian-plugin"
+            ],
+            "devDependencies": {
+                "eslint": "9.20.1",
+                "eslint-plugin-unused-imports": "^4.1.4",
+                "npm-check-updates": "^17.1.14",
+                "prettier": "^3.5.1",
+                "typescript-eslint": "8.24.1"
+            }
+        },
+        "backend/sync_lib/pkg": {
+            "name": "sync_lib",
+            "version": "0.0.30",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@ampproject/remapping": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
+            "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@jridgewell/gen-mapping": "^0.3.5",
+                "@jridgewell/trace-mapping": "^0.3.24"
+            },
+            "engines": {
+                "node": ">=6.0.0"
+            }
+        },
+        "node_modules/@babel/code-frame": {
+            "version": "7.26.2",
+            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz",
+            "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/helper-validator-identifier": "^7.25.9",
+                "js-tokens": "^4.0.0",
+                "picocolors": "^1.0.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/compat-data": {
+            "version": "7.26.8",
+            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.8.tgz",
+            "integrity": "sha512-oH5UPLMWR3L2wEFLnFJ1TZXqHufiTKAiLfqw5zkhS4dKXLJ10yVztfil/twG8EDTA4F/tvVNw9nOl4ZMslB8rQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/core": {
+            "version": "7.26.9",
+            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.9.tgz",
+            "integrity": "sha512-lWBYIrF7qK5+GjY5Uy+/hEgp8OJWOD/rpy74GplYRhEauvbHDeFB8t5hPOZxCZ0Oxf4Cc36tK51/l3ymJysrKw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@ampproject/remapping": "^2.2.0",
+                "@babel/code-frame": "^7.26.2",
+                "@babel/generator": "^7.26.9",
+                "@babel/helper-compilation-targets": "^7.26.5",
+                "@babel/helper-module-transforms": "^7.26.0",
+                "@babel/helpers": "^7.26.9",
+                "@babel/parser": "^7.26.9",
+                "@babel/template": "^7.26.9",
+                "@babel/traverse": "^7.26.9",
+                "@babel/types": "^7.26.9",
+                "convert-source-map": "^2.0.0",
+                "debug": "^4.1.0",
+                "gensync": "^1.0.0-beta.2",
+                "json5": "^2.2.3",
+                "semver": "^6.3.1"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/babel"
+            }
+        },
+        "node_modules/@babel/core/node_modules/semver": {
+            "version": "6.3.1",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+            "dev": true,
+            "license": "ISC",
+            "bin": {
+                "semver": "bin/semver.js"
+            }
+        },
+        "node_modules/@babel/generator": {
+            "version": "7.26.9",
+            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.9.tgz",
+            "integrity": "sha512-kEWdzjOAUMW4hAyrzJ0ZaTOu9OmpyDIQicIh0zg0EEcEkYXZb2TjtBhnHi2ViX7PKwZqF4xwqfAm299/QMP3lg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/parser": "^7.26.9",
+                "@babel/types": "^7.26.9",
+                "@jridgewell/gen-mapping": "^0.3.5",
+                "@jridgewell/trace-mapping": "^0.3.25",
+                "jsesc": "^3.0.2"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-compilation-targets": {
+            "version": "7.26.5",
+            "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.26.5.tgz",
+            "integrity": "sha512-IXuyn5EkouFJscIDuFF5EsiSolseme1s0CZB+QxVugqJLYmKdxI1VfIBOst0SUu4rnk2Z7kqTwmoO1lp3HIfnA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/compat-data": "^7.26.5",
+                "@babel/helper-validator-option": "^7.25.9",
+                "browserslist": "^4.24.0",
+                "lru-cache": "^5.1.1",
+                "semver": "^6.3.1"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-compilation-targets/node_modules/semver": {
+            "version": "6.3.1",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+            "dev": true,
+            "license": "ISC",
+            "bin": {
+                "semver": "bin/semver.js"
+            }
+        },
+        "node_modules/@babel/helper-module-imports": {
+            "version": "7.25.9",
+            "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz",
+            "integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/traverse": "^7.25.9",
+                "@babel/types": "^7.25.9"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-module-transforms": {
+            "version": "7.26.0",
+            "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz",
+            "integrity": "sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/helper-module-imports": "^7.25.9",
+                "@babel/helper-validator-identifier": "^7.25.9",
+                "@babel/traverse": "^7.25.9"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0"
+            }
+        },
+        "node_modules/@babel/helper-plugin-utils": {
+            "version": "7.26.5",
+            "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.26.5.tgz",
+            "integrity": "sha512-RS+jZcRdZdRFzMyr+wcsaqOmld1/EqTghfaBGQQd/WnRdzdlvSZ//kF7U8VQTxf1ynZ4cjUcYgjVGx13ewNPMg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-string-parser": {
+            "version": "7.25.9",
+            "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
+            "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-validator-identifier": {
+            "version": "7.25.9",
+            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
+            "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-validator-option": {
+            "version": "7.25.9",
+            "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz",
+            "integrity": "sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helpers": {
+            "version": "7.26.9",
+            "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.9.tgz",
+            "integrity": "sha512-Mz/4+y8udxBKdmzt/UjPACs4G3j5SshJJEFFKxlCGPydG4JAHXxjWjAwjd09tf6oINvl1VfMJo+nB7H2YKQ0dA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/template": "^7.26.9",
+                "@babel/types": "^7.26.9"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/parser": {
+            "version": "7.26.9",
+            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.9.tgz",
+            "integrity": "sha512-81NWa1njQblgZbQHxWHpxxCzNsa3ZwvFqpUg7P+NNUU6f3UU2jBEg4OlF/J6rl8+PQGh1q6/zWScd001YwcA5A==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/types": "^7.26.9"
+            },
+            "bin": {
+                "parser": "bin/babel-parser.js"
+            },
+            "engines": {
+                "node": ">=6.0.0"
+            }
+        },
+        "node_modules/@babel/plugin-syntax-async-generators": {
+            "version": "7.8.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
+            "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.8.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-syntax-bigint": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
+            "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.8.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-syntax-class-properties": {
+            "version": "7.12.13",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
+            "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.12.13"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-syntax-class-static-block": {
+            "version": "7.14.5",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
+            "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.14.5"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-syntax-import-attributes": {
+            "version": "7.26.0",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.26.0.tgz",
+            "integrity": "sha512-e2dttdsJ1ZTpi3B9UYGLw41hifAubg19AtCu/2I/F1QNVclOBr1dYpTdmdyZ84Xiz43BS/tCUkMAZNLv12Pi+A==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.25.9"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-syntax-import-meta": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
+            "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.10.4"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-syntax-json-strings": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
+            "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.8.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-syntax-jsx": {
+            "version": "7.25.9",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.25.9.tgz",
+            "integrity": "sha512-ld6oezHQMZsZfp6pWtbjaNDF2tiiCYYDqQszHt5VV437lewP9aSi2Of99CK0D0XB21k7FLgnLcmQKyKzynfeAA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.25.9"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
+            "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.10.4"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
+            "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.8.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-syntax-numeric-separator": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
+            "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.10.4"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-syntax-object-rest-spread": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
+            "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.8.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-syntax-optional-catch-binding": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
+            "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.8.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-syntax-optional-chaining": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
+            "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.8.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-syntax-private-property-in-object": {
+            "version": "7.14.5",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
+            "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.14.5"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-syntax-top-level-await": {
+            "version": "7.14.5",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
+            "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.14.5"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-syntax-typescript": {
+            "version": "7.25.9",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.25.9.tgz",
+            "integrity": "sha512-hjMgRy5hb8uJJjUcdWunWVcoi9bGpJp8p5Ol1229PoN6aytsLwNMgmdftO23wnCLMfVmTwZDWMPNq/D1SY60JQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.25.9"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/template": {
+            "version": "7.26.9",
+            "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.26.9.tgz",
+            "integrity": "sha512-qyRplbeIpNZhmzOysF/wFMuP9sctmh2cFzRAZOn1YapxBsE1i9bJIY586R/WBLfLcmcBlM8ROBiQURnnNy+zfA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/code-frame": "^7.26.2",
+                "@babel/parser": "^7.26.9",
+                "@babel/types": "^7.26.9"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/traverse": {
+            "version": "7.26.9",
+            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.9.tgz",
+            "integrity": "sha512-ZYW7L+pL8ahU5fXmNbPF+iZFHCv5scFak7MZ9bwaRPLUhHh7QQEMjZUg0HevihoqCM5iSYHN61EyCoZvqC+bxg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/code-frame": "^7.26.2",
+                "@babel/generator": "^7.26.9",
+                "@babel/parser": "^7.26.9",
+                "@babel/template": "^7.26.9",
+                "@babel/types": "^7.26.9",
+                "debug": "^4.3.1",
+                "globals": "^11.1.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/traverse/node_modules/globals": {
+            "version": "11.12.0",
+            "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+            "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/@babel/types": {
+            "version": "7.26.9",
+            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.9.tgz",
+            "integrity": "sha512-Y3IR1cRnOxOCDvMmNiym7XpXQ93iGDDPHx+Zj+NM+rg0fBaShfQLkg+hKPaZCEvg5N/LeCo4+Rj/i3FuJsIQaw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/helper-string-parser": "^7.25.9",
+                "@babel/helper-validator-identifier": "^7.25.9"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@bcoe/v8-coverage": {
+            "version": "0.2.3",
+            "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
+            "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@codemirror/state": {
+            "version": "6.5.2",
+            "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.5.2.tgz",
+            "integrity": "sha512-FVqsPqtPWKVVL3dPSxy8wEF/ymIEuVzF1PK3VbUgrxXpJUSHQWWZz4JMToquRxnkw+36LTamCZG2iua2Ptq0fA==",
+            "dev": true,
+            "license": "MIT",
+            "peer": true,
+            "dependencies": {
+                "@marijn/find-cluster-break": "^1.0.0"
+            }
+        },
+        "node_modules/@codemirror/view": {
+            "version": "6.36.3",
+            "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.36.3.tgz",
+            "integrity": "sha512-N2bilM47QWC8Hnx0rMdDxO2x2ImJ1FvZWXubwKgjeoOrWwEiFrtpA7SFHcuZ+o2Ze2VzbkgbzWVj4+V18LVkeg==",
+            "dev": true,
+            "license": "MIT",
+            "peer": true,
+            "dependencies": {
+                "@codemirror/state": "^6.5.0",
+                "style-mod": "^4.1.0",
+                "w3c-keyname": "^2.2.4"
+            }
+        },
+        "node_modules/@discoveryjs/json-ext": {
+            "version": "0.6.3",
+            "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.6.3.tgz",
+            "integrity": "sha512-4B4OijXeVNOPZlYA2oEwWOTkzyltLao+xbotHQeqN++Rv27Y6s818+n2Qkp8q+Fxhn0t/5lA5X1Mxktud8eayQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=14.17.0"
+            }
+        },
+        "node_modules/@eslint-community/eslint-utils": {
+            "version": "4.4.1",
+            "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.1.tgz",
+            "integrity": "sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "eslint-visitor-keys": "^3.4.3"
+            },
+            "engines": {
+                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/eslint"
+            },
+            "peerDependencies": {
+                "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
+            }
+        },
+        "node_modules/@eslint-community/eslint-utils/node_modules/eslint-visitor-keys": {
+            "version": "3.4.3",
+            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+            "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "engines": {
+                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/eslint"
+            }
+        },
+        "node_modules/@eslint-community/regexpp": {
+            "version": "4.12.1",
+            "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz",
+            "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
+            }
+        },
+        "node_modules/@eslint/config-array": {
+            "version": "0.19.2",
+            "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.19.2.tgz",
+            "integrity": "sha512-GNKqxfHG2ySmJOBSHg7LxeUx4xpuCoFjacmlCoYWEbaPXLwvfIjixRI12xCQZeULksQb23uiA8F40w5TojpV7w==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@eslint/object-schema": "^2.1.6",
+                "debug": "^4.3.1",
+                "minimatch": "^3.1.2"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            }
+        },
+        "node_modules/@eslint/core": {
+            "version": "0.11.0",
+            "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.11.0.tgz",
+            "integrity": "sha512-DWUB2pksgNEb6Bz2fggIy1wh6fGgZP4Xyy/Mt0QZPiloKKXerbqq9D3SBQTlCRYOrcRPu4vuz+CGjwdfqxnoWA==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@types/json-schema": "^7.0.15"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            }
+        },
+        "node_modules/@eslint/eslintrc": {
+            "version": "3.2.0",
+            "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.2.0.tgz",
+            "integrity": "sha512-grOjVNN8P3hjJn/eIETF1wwd12DdnwFDoyceUJLYYdkpbwq3nLi+4fqrTAONx7XDALqlL220wC/RHSC/QTI/0w==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ajv": "^6.12.4",
+                "debug": "^4.3.2",
+                "espree": "^10.0.1",
+                "globals": "^14.0.0",
+                "ignore": "^5.2.0",
+                "import-fresh": "^3.2.1",
+                "js-yaml": "^4.1.0",
+                "minimatch": "^3.1.2",
+                "strip-json-comments": "^3.1.1"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/eslint"
+            }
+        },
+        "node_modules/@eslint/js": {
+            "version": "9.20.0",
+            "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.20.0.tgz",
+            "integrity": "sha512-iZA07H9io9Wn836aVTytRaNqh00Sad+EamwOVJT12GTLw1VGMFV/4JaME+JjLtr9fiGaoWgYnS54wrfWsSs4oQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            }
+        },
+        "node_modules/@eslint/object-schema": {
+            "version": "2.1.6",
+            "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.6.tgz",
+            "integrity": "sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            }
+        },
+        "node_modules/@eslint/plugin-kit": {
+            "version": "0.2.6",
+            "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.6.tgz",
+            "integrity": "sha512-+0TjwR1eAUdZtvv/ir1mGX+v0tUoR3VEPB8Up0LLJC+whRW0GgBBtpbOkg/a/U4Dxa6l5a3l9AJ1aWIQVyoWJA==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@eslint/core": "^0.11.0",
+                "levn": "^0.4.1"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            }
+        },
+        "node_modules/@humanfs/core": {
+            "version": "0.19.1",
+            "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz",
+            "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "engines": {
+                "node": ">=18.18.0"
+            }
+        },
+        "node_modules/@humanfs/node": {
+            "version": "0.16.6",
+            "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz",
+            "integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@humanfs/core": "^0.19.1",
+                "@humanwhocodes/retry": "^0.3.0"
+            },
+            "engines": {
+                "node": ">=18.18.0"
+            }
+        },
+        "node_modules/@humanfs/node/node_modules/@humanwhocodes/retry": {
+            "version": "0.3.1",
+            "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz",
+            "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "engines": {
+                "node": ">=18.18"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/nzakas"
+            }
+        },
+        "node_modules/@humanwhocodes/module-importer": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
+            "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "engines": {
+                "node": ">=12.22"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/nzakas"
+            }
+        },
+        "node_modules/@humanwhocodes/retry": {
+            "version": "0.4.1",
+            "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.1.tgz",
+            "integrity": "sha512-c7hNEllBlenFTHBky65mhq8WD2kbN9Q6gk0bTk8lSBvc554jpXSkST1iePudpt7+A/AQvuHs9EMqjHDXMY1lrA==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "engines": {
+                "node": ">=18.18"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/nzakas"
+            }
+        },
+        "node_modules/@istanbuljs/load-nyc-config": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
+            "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "camelcase": "^5.3.1",
+                "find-up": "^4.1.0",
+                "get-package-type": "^0.1.0",
+                "js-yaml": "^3.13.1",
+                "resolve-from": "^5.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/@istanbuljs/load-nyc-config/node_modules/argparse": {
+            "version": "1.0.10",
+            "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+            "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "sprintf-js": "~1.0.2"
+            }
+        },
+        "node_modules/@istanbuljs/load-nyc-config/node_modules/find-up": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+            "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "locate-path": "^5.0.0",
+                "path-exists": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/@istanbuljs/load-nyc-config/node_modules/js-yaml": {
+            "version": "3.14.1",
+            "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+            "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "argparse": "^1.0.7",
+                "esprima": "^4.0.0"
+            },
+            "bin": {
+                "js-yaml": "bin/js-yaml.js"
+            }
+        },
+        "node_modules/@istanbuljs/load-nyc-config/node_modules/locate-path": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+            "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "p-locate": "^4.1.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/@istanbuljs/load-nyc-config/node_modules/p-limit": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+            "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "p-try": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=6"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/@istanbuljs/load-nyc-config/node_modules/p-locate": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+            "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "p-limit": "^2.2.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/@istanbuljs/load-nyc-config/node_modules/resolve-from": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+            "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/@istanbuljs/schema": {
+            "version": "0.1.3",
+            "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
+            "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/@jest/console": {
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz",
+            "integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@jest/types": "^29.6.3",
+                "@types/node": "*",
+                "chalk": "^4.0.0",
+                "jest-message-util": "^29.7.0",
+                "jest-util": "^29.7.0",
+                "slash": "^3.0.0"
+            },
+            "engines": {
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+            }
+        },
+        "node_modules/@jest/core": {
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.7.0.tgz",
+            "integrity": "sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@jest/console": "^29.7.0",
+                "@jest/reporters": "^29.7.0",
+                "@jest/test-result": "^29.7.0",
+                "@jest/transform": "^29.7.0",
+                "@jest/types": "^29.6.3",
+                "@types/node": "*",
+                "ansi-escapes": "^4.2.1",
+                "chalk": "^4.0.0",
+                "ci-info": "^3.2.0",
+                "exit": "^0.1.2",
+                "graceful-fs": "^4.2.9",
+                "jest-changed-files": "^29.7.0",
+                "jest-config": "^29.7.0",
+                "jest-haste-map": "^29.7.0",
+                "jest-message-util": "^29.7.0",
+                "jest-regex-util": "^29.6.3",
+                "jest-resolve": "^29.7.0",
+                "jest-resolve-dependencies": "^29.7.0",
+                "jest-runner": "^29.7.0",
+                "jest-runtime": "^29.7.0",
+                "jest-snapshot": "^29.7.0",
+                "jest-util": "^29.7.0",
+                "jest-validate": "^29.7.0",
+                "jest-watcher": "^29.7.0",
+                "micromatch": "^4.0.4",
+                "pretty-format": "^29.7.0",
+                "slash": "^3.0.0",
+                "strip-ansi": "^6.0.0"
+            },
+            "engines": {
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+            },
+            "peerDependencies": {
+                "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+            },
+            "peerDependenciesMeta": {
+                "node-notifier": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@jest/environment": {
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz",
+            "integrity": "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@jest/fake-timers": "^29.7.0",
+                "@jest/types": "^29.6.3",
+                "@types/node": "*",
+                "jest-mock": "^29.7.0"
+            },
+            "engines": {
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+            }
+        },
+        "node_modules/@jest/expect": {
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz",
+            "integrity": "sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "expect": "^29.7.0",
+                "jest-snapshot": "^29.7.0"
+            },
+            "engines": {
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+            }
+        },
+        "node_modules/@jest/expect-utils": {
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz",
+            "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "jest-get-type": "^29.6.3"
+            },
+            "engines": {
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+            }
+        },
+        "node_modules/@jest/fake-timers": {
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz",
+            "integrity": "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@jest/types": "^29.6.3",
+                "@sinonjs/fake-timers": "^10.0.2",
+                "@types/node": "*",
+                "jest-message-util": "^29.7.0",
+                "jest-mock": "^29.7.0",
+                "jest-util": "^29.7.0"
+            },
+            "engines": {
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+            }
+        },
+        "node_modules/@jest/globals": {
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz",
+            "integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@jest/environment": "^29.7.0",
+                "@jest/expect": "^29.7.0",
+                "@jest/types": "^29.6.3",
+                "jest-mock": "^29.7.0"
+            },
+            "engines": {
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+            }
+        },
+        "node_modules/@jest/reporters": {
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz",
+            "integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@bcoe/v8-coverage": "^0.2.3",
+                "@jest/console": "^29.7.0",
+                "@jest/test-result": "^29.7.0",
+                "@jest/transform": "^29.7.0",
+                "@jest/types": "^29.6.3",
+                "@jridgewell/trace-mapping": "^0.3.18",
+                "@types/node": "*",
+                "chalk": "^4.0.0",
+                "collect-v8-coverage": "^1.0.0",
+                "exit": "^0.1.2",
+                "glob": "^7.1.3",
+                "graceful-fs": "^4.2.9",
+                "istanbul-lib-coverage": "^3.0.0",
+                "istanbul-lib-instrument": "^6.0.0",
+                "istanbul-lib-report": "^3.0.0",
+                "istanbul-lib-source-maps": "^4.0.0",
+                "istanbul-reports": "^3.1.3",
+                "jest-message-util": "^29.7.0",
+                "jest-util": "^29.7.0",
+                "jest-worker": "^29.7.0",
+                "slash": "^3.0.0",
+                "string-length": "^4.0.1",
+                "strip-ansi": "^6.0.0",
+                "v8-to-istanbul": "^9.0.1"
+            },
+            "engines": {
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+            },
+            "peerDependencies": {
+                "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+            },
+            "peerDependenciesMeta": {
+                "node-notifier": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@jest/schemas": {
+            "version": "29.6.3",
+            "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
+            "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@sinclair/typebox": "^0.27.8"
+            },
+            "engines": {
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+            }
+        },
+        "node_modules/@jest/source-map": {
+            "version": "29.6.3",
+            "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz",
+            "integrity": "sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@jridgewell/trace-mapping": "^0.3.18",
+                "callsites": "^3.0.0",
+                "graceful-fs": "^4.2.9"
+            },
+            "engines": {
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+            }
+        },
+        "node_modules/@jest/test-result": {
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz",
+            "integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@jest/console": "^29.7.0",
+                "@jest/types": "^29.6.3",
+                "@types/istanbul-lib-coverage": "^2.0.0",
+                "collect-v8-coverage": "^1.0.0"
+            },
+            "engines": {
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+            }
+        },
+        "node_modules/@jest/test-sequencer": {
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz",
+            "integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@jest/test-result": "^29.7.0",
+                "graceful-fs": "^4.2.9",
+                "jest-haste-map": "^29.7.0",
+                "slash": "^3.0.0"
+            },
+            "engines": {
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+            }
+        },
+        "node_modules/@jest/transform": {
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz",
+            "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/core": "^7.11.6",
+                "@jest/types": "^29.6.3",
+                "@jridgewell/trace-mapping": "^0.3.18",
+                "babel-plugin-istanbul": "^6.1.1",
+                "chalk": "^4.0.0",
+                "convert-source-map": "^2.0.0",
+                "fast-json-stable-stringify": "^2.1.0",
+                "graceful-fs": "^4.2.9",
+                "jest-haste-map": "^29.7.0",
+                "jest-regex-util": "^29.6.3",
+                "jest-util": "^29.7.0",
+                "micromatch": "^4.0.4",
+                "pirates": "^4.0.4",
+                "slash": "^3.0.0",
+                "write-file-atomic": "^4.0.2"
+            },
+            "engines": {
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+            }
+        },
+        "node_modules/@jest/types": {
+            "version": "29.6.3",
+            "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+            "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@jest/schemas": "^29.6.3",
+                "@types/istanbul-lib-coverage": "^2.0.0",
+                "@types/istanbul-reports": "^3.0.0",
+                "@types/node": "*",
+                "@types/yargs": "^17.0.8",
+                "chalk": "^4.0.0"
+            },
+            "engines": {
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+            }
+        },
+        "node_modules/@jridgewell/gen-mapping": {
+            "version": "0.3.8",
+            "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz",
+            "integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@jridgewell/set-array": "^1.2.1",
+                "@jridgewell/sourcemap-codec": "^1.4.10",
+                "@jridgewell/trace-mapping": "^0.3.24"
+            },
+            "engines": {
+                "node": ">=6.0.0"
+            }
+        },
+        "node_modules/@jridgewell/resolve-uri": {
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+            "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6.0.0"
+            }
+        },
+        "node_modules/@jridgewell/set-array": {
+            "version": "1.2.1",
+            "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+            "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6.0.0"
+            }
+        },
+        "node_modules/@jridgewell/source-map": {
+            "version": "0.3.6",
+            "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz",
+            "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@jridgewell/gen-mapping": "^0.3.5",
+                "@jridgewell/trace-mapping": "^0.3.25"
+            }
+        },
+        "node_modules/@jridgewell/sourcemap-codec": {
+            "version": "1.5.0",
+            "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
+            "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@jridgewell/trace-mapping": {
+            "version": "0.3.25",
+            "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+            "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@jridgewell/resolve-uri": "^3.1.0",
+                "@jridgewell/sourcemap-codec": "^1.4.14"
+            }
+        },
+        "node_modules/@marijn/find-cluster-break": {
+            "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==",
+            "dev": true,
+            "license": "MIT",
+            "peer": true
+        },
+        "node_modules/@nodelib/fs.scandir": {
+            "version": "2.1.5",
+            "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+            "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@nodelib/fs.stat": "2.0.5",
+                "run-parallel": "^1.1.9"
+            },
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/@nodelib/fs.stat": {
+            "version": "2.0.5",
+            "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+            "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/@nodelib/fs.walk": {
+            "version": "1.2.8",
+            "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+            "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@nodelib/fs.scandir": "2.1.5",
+                "fastq": "^1.6.0"
+            },
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/@parcel/watcher": {
+            "version": "2.5.1",
+            "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.1.tgz",
+            "integrity": "sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==",
+            "dev": true,
+            "hasInstallScript": true,
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "detect-libc": "^1.0.3",
+                "is-glob": "^4.0.3",
+                "micromatch": "^4.0.5",
+                "node-addon-api": "^7.0.0"
+            },
+            "engines": {
+                "node": ">= 10.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            },
+            "optionalDependencies": {
+                "@parcel/watcher-android-arm64": "2.5.1",
+                "@parcel/watcher-darwin-arm64": "2.5.1",
+                "@parcel/watcher-darwin-x64": "2.5.1",
+                "@parcel/watcher-freebsd-x64": "2.5.1",
+                "@parcel/watcher-linux-arm-glibc": "2.5.1",
+                "@parcel/watcher-linux-arm-musl": "2.5.1",
+                "@parcel/watcher-linux-arm64-glibc": "2.5.1",
+                "@parcel/watcher-linux-arm64-musl": "2.5.1",
+                "@parcel/watcher-linux-x64-glibc": "2.5.1",
+                "@parcel/watcher-linux-x64-musl": "2.5.1",
+                "@parcel/watcher-win32-arm64": "2.5.1",
+                "@parcel/watcher-win32-ia32": "2.5.1",
+                "@parcel/watcher-win32-x64": "2.5.1"
+            }
+        },
+        "node_modules/@parcel/watcher-android-arm64": {
+            "version": "2.5.1",
+            "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.1.tgz",
+            "integrity": "sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "android"
+            ],
+            "engines": {
+                "node": ">= 10.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
+        "node_modules/@parcel/watcher-darwin-arm64": {
+            "version": "2.5.1",
+            "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.1.tgz",
+            "integrity": "sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": ">= 10.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
+        "node_modules/@parcel/watcher-darwin-x64": {
+            "version": "2.5.1",
+            "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.1.tgz",
+            "integrity": "sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": ">= 10.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
+        "node_modules/@parcel/watcher-freebsd-x64": {
+            "version": "2.5.1",
+            "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.1.tgz",
+            "integrity": "sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "freebsd"
+            ],
+            "engines": {
+                "node": ">= 10.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
+        "node_modules/@parcel/watcher-linux-arm-glibc": {
+            "version": "2.5.1",
+            "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.1.tgz",
+            "integrity": "sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA==",
+            "cpu": [
+                "arm"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 10.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
+        "node_modules/@parcel/watcher-linux-arm-musl": {
+            "version": "2.5.1",
+            "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.1.tgz",
+            "integrity": "sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==",
+            "cpu": [
+                "arm"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 10.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
+        "node_modules/@parcel/watcher-linux-arm64-glibc": {
+            "version": "2.5.1",
+            "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.1.tgz",
+            "integrity": "sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 10.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
+        "node_modules/@parcel/watcher-linux-arm64-musl": {
+            "version": "2.5.1",
+            "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.1.tgz",
+            "integrity": "sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 10.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
+        "node_modules/@parcel/watcher-linux-x64-glibc": {
+            "version": "2.5.1",
+            "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.1.tgz",
+            "integrity": "sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 10.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
+        "node_modules/@parcel/watcher-linux-x64-musl": {
+            "version": "2.5.1",
+            "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.1.tgz",
+            "integrity": "sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 10.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
+        "node_modules/@parcel/watcher-win32-arm64": {
+            "version": "2.5.1",
+            "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.1.tgz",
+            "integrity": "sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": ">= 10.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
+        "node_modules/@parcel/watcher-win32-ia32": {
+            "version": "2.5.1",
+            "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.1.tgz",
+            "integrity": "sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ==",
+            "cpu": [
+                "ia32"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": ">= 10.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
+        "node_modules/@parcel/watcher-win32-x64": {
+            "version": "2.5.1",
+            "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.1.tgz",
+            "integrity": "sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": ">= 10.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
+        "node_modules/@redocly/ajv": {
+            "version": "8.11.2",
+            "resolved": "https://registry.npmjs.org/@redocly/ajv/-/ajv-8.11.2.tgz",
+            "integrity": "sha512-io1JpnwtIcvojV7QKDUSIuMN/ikdOUd1ReEnUnMKGfDVridQZ31J0MmIuqwuRjWDZfmvr+Q0MqCcfHM2gTivOg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "fast-deep-equal": "^3.1.1",
+                "json-schema-traverse": "^1.0.0",
+                "require-from-string": "^2.0.2",
+                "uri-js-replace": "^1.0.1"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/epoberezkin"
+            }
+        },
+        "node_modules/@redocly/ajv/node_modules/json-schema-traverse": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+            "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@redocly/config": {
+            "version": "0.20.3",
+            "resolved": "https://registry.npmjs.org/@redocly/config/-/config-0.20.3.tgz",
+            "integrity": "sha512-Nyyv1Bj7GgYwj/l46O0nkH1GTKWbO3Ixe7KFcn021aZipkZd+z8Vlu1BwkhqtVgivcKaClaExtWU/lDHkjBzag==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@redocly/openapi-core": {
+            "version": "1.29.0",
+            "resolved": "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.29.0.tgz",
+            "integrity": "sha512-Ju8POuRjYLTl6JfaSMq5exzhw4E/f1Qb7fGxgS4/PDSTzS1jzZ/UUJRBPeiQ1Ag7yuxH6JwltOr2iiltnBey1w==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@redocly/ajv": "^8.11.2",
+                "@redocly/config": "^0.20.1",
+                "colorette": "^1.2.0",
+                "https-proxy-agent": "^7.0.5",
+                "js-levenshtein": "^1.1.6",
+                "js-yaml": "^4.1.0",
+                "minimatch": "^5.0.1",
+                "pluralize": "^8.0.0",
+                "yaml-ast-parser": "0.0.43"
+            },
+            "engines": {
+                "node": ">=18.17.0",
+                "npm": ">=9.5.0"
+            }
+        },
+        "node_modules/@redocly/openapi-core/node_modules/brace-expansion": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+            "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "balanced-match": "^1.0.0"
+            }
+        },
+        "node_modules/@redocly/openapi-core/node_modules/minimatch": {
+            "version": "5.1.6",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+            "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "brace-expansion": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/@sinclair/typebox": {
+            "version": "0.27.8",
+            "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
+            "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@sinonjs/commons": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz",
+            "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "type-detect": "4.0.8"
+            }
+        },
+        "node_modules/@sinonjs/fake-timers": {
+            "version": "10.3.0",
+            "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz",
+            "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "@sinonjs/commons": "^3.0.0"
+            }
+        },
+        "node_modules/@types/babel__core": {
+            "version": "7.20.5",
+            "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
+            "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/parser": "^7.20.7",
+                "@babel/types": "^7.20.7",
+                "@types/babel__generator": "*",
+                "@types/babel__template": "*",
+                "@types/babel__traverse": "*"
+            }
+        },
+        "node_modules/@types/babel__generator": {
+            "version": "7.6.8",
+            "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz",
+            "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/types": "^7.0.0"
+            }
+        },
+        "node_modules/@types/babel__template": {
+            "version": "7.4.4",
+            "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz",
+            "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/parser": "^7.1.0",
+                "@babel/types": "^7.0.0"
+            }
+        },
+        "node_modules/@types/babel__traverse": {
+            "version": "7.20.6",
+            "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.6.tgz",
+            "integrity": "sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/types": "^7.20.7"
+            }
+        },
+        "node_modules/@types/codemirror": {
+            "version": "5.60.8",
+            "resolved": "https://registry.npmjs.org/@types/codemirror/-/codemirror-5.60.8.tgz",
+            "integrity": "sha512-VjFgDF/eB+Aklcy15TtOTLQeMjTo07k7KAjql8OK5Dirr7a6sJY4T1uVBDuTVG9VEmn1uUsohOpYnVfgC6/jyw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/tern": "*"
+            }
+        },
+        "node_modules/@types/eslint": {
+            "version": "9.6.1",
+            "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz",
+            "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/estree": "*",
+                "@types/json-schema": "*"
+            }
+        },
+        "node_modules/@types/eslint-scope": {
+            "version": "3.7.7",
+            "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
+            "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/eslint": "*",
+                "@types/estree": "*"
+            }
+        },
+        "node_modules/@types/estree": {
+            "version": "1.0.6",
+            "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
+            "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@types/graceful-fs": {
+            "version": "4.1.9",
+            "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz",
+            "integrity": "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/node": "*"
+            }
+        },
+        "node_modules/@types/istanbul-lib-coverage": {
+            "version": "2.0.6",
+            "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz",
+            "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@types/istanbul-lib-report": {
+            "version": "3.0.3",
+            "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz",
+            "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/istanbul-lib-coverage": "*"
+            }
+        },
+        "node_modules/@types/istanbul-reports": {
+            "version": "3.0.4",
+            "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz",
+            "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/istanbul-lib-report": "*"
+            }
+        },
+        "node_modules/@types/jest": {
+            "version": "29.5.14",
+            "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.14.tgz",
+            "integrity": "sha512-ZN+4sdnLUbo8EVvVc2ao0GFW6oVrQRPn4K2lglySj7APvSrgzxHiNNK99us4WDMi57xxA2yggblIAMNhXOotLQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "expect": "^29.0.0",
+                "pretty-format": "^29.0.0"
+            }
+        },
+        "node_modules/@types/json-schema": {
+            "version": "7.0.15",
+            "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
+            "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@types/node": {
+            "version": "22.13.4",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.4.tgz",
+            "integrity": "sha512-ywP2X0DYtX3y08eFVx5fNIw7/uIv8hYUKgXoK8oayJlLnKcRfEYCxWMVE1XagUdVtCJlZT1AU4LXEABW+L1Peg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "undici-types": "~6.20.0"
+            }
+        },
+        "node_modules/@types/stack-utils": {
+            "version": "2.0.3",
+            "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz",
+            "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@types/tern": {
+            "version": "0.23.9",
+            "resolved": "https://registry.npmjs.org/@types/tern/-/tern-0.23.9.tgz",
+            "integrity": "sha512-ypzHFE/wBzh+BlH6rrBgS5I/Z7RD21pGhZ2rltb/+ZrVM1awdZwjx7hE5XfuYgHWk9uvV5HLZN3SloevCAp3Bw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/estree": "*"
+            }
+        },
+        "node_modules/@types/yargs": {
+            "version": "17.0.33",
+            "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.33.tgz",
+            "integrity": "sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/yargs-parser": "*"
+            }
+        },
+        "node_modules/@types/yargs-parser": {
+            "version": "21.0.3",
+            "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz",
+            "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@typescript-eslint/eslint-plugin": {
+            "version": "8.24.1",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.24.1.tgz",
+            "integrity": "sha512-ll1StnKtBigWIGqvYDVuDmXJHVH4zLVot1yQ4fJtLpL7qacwkxJc1T0bptqw+miBQ/QfUbhl1TcQ4accW5KUyA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@eslint-community/regexpp": "^4.10.0",
+                "@typescript-eslint/scope-manager": "8.24.1",
+                "@typescript-eslint/type-utils": "8.24.1",
+                "@typescript-eslint/utils": "8.24.1",
+                "@typescript-eslint/visitor-keys": "8.24.1",
+                "graphemer": "^1.4.0",
+                "ignore": "^5.3.1",
+                "natural-compare": "^1.4.0",
+                "ts-api-utils": "^2.0.1"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            },
+            "peerDependencies": {
+                "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0",
+                "eslint": "^8.57.0 || ^9.0.0",
+                "typescript": ">=4.8.4 <5.8.0"
+            }
+        },
+        "node_modules/@typescript-eslint/parser": {
+            "version": "8.24.1",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.24.1.tgz",
+            "integrity": "sha512-Tqoa05bu+t5s8CTZFaGpCH2ub3QeT9YDkXbPd3uQ4SfsLoh1/vv2GEYAioPoxCWJJNsenXlC88tRjwoHNts1oQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@typescript-eslint/scope-manager": "8.24.1",
+                "@typescript-eslint/types": "8.24.1",
+                "@typescript-eslint/typescript-estree": "8.24.1",
+                "@typescript-eslint/visitor-keys": "8.24.1",
+                "debug": "^4.3.4"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            },
+            "peerDependencies": {
+                "eslint": "^8.57.0 || ^9.0.0",
+                "typescript": ">=4.8.4 <5.8.0"
+            }
+        },
+        "node_modules/@typescript-eslint/scope-manager": {
+            "version": "8.24.1",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.24.1.tgz",
+            "integrity": "sha512-OdQr6BNBzwRjNEXMQyaGyZzgg7wzjYKfX2ZBV3E04hUCBDv3GQCHiz9RpqdUIiVrMgJGkXm3tcEh4vFSHreS2Q==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@typescript-eslint/types": "8.24.1",
+                "@typescript-eslint/visitor-keys": "8.24.1"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            }
+        },
+        "node_modules/@typescript-eslint/type-utils": {
+            "version": "8.24.1",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.24.1.tgz",
+            "integrity": "sha512-/Do9fmNgCsQ+K4rCz0STI7lYB4phTtEXqqCAs3gZW0pnK7lWNkvWd5iW545GSmApm4AzmQXmSqXPO565B4WVrw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@typescript-eslint/typescript-estree": "8.24.1",
+                "@typescript-eslint/utils": "8.24.1",
+                "debug": "^4.3.4",
+                "ts-api-utils": "^2.0.1"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            },
+            "peerDependencies": {
+                "eslint": "^8.57.0 || ^9.0.0",
+                "typescript": ">=4.8.4 <5.8.0"
+            }
+        },
+        "node_modules/@typescript-eslint/types": {
+            "version": "8.24.1",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.24.1.tgz",
+            "integrity": "sha512-9kqJ+2DkUXiuhoiYIUvIYjGcwle8pcPpdlfkemGvTObzgmYfJ5d0Qm6jwb4NBXP9W1I5tss0VIAnWFumz3mC5A==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            }
+        },
+        "node_modules/@typescript-eslint/typescript-estree": {
+            "version": "8.24.1",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.24.1.tgz",
+            "integrity": "sha512-UPyy4MJ/0RE648DSKQe9g0VDSehPINiejjA6ElqnFaFIhI6ZEiZAkUI0D5MCk0bQcTf/LVqZStvQ6K4lPn/BRg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@typescript-eslint/types": "8.24.1",
+                "@typescript-eslint/visitor-keys": "8.24.1",
+                "debug": "^4.3.4",
+                "fast-glob": "^3.3.2",
+                "is-glob": "^4.0.3",
+                "minimatch": "^9.0.4",
+                "semver": "^7.6.0",
+                "ts-api-utils": "^2.0.1"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            },
+            "peerDependencies": {
+                "typescript": ">=4.8.4 <5.8.0"
+            }
+        },
+        "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+            "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "balanced-match": "^1.0.0"
+            }
+        },
+        "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": {
+            "version": "9.0.5",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+            "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "brace-expansion": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=16 || 14 >=14.17"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/@typescript-eslint/utils": {
+            "version": "8.24.1",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.24.1.tgz",
+            "integrity": "sha512-OOcg3PMMQx9EXspId5iktsI3eMaXVwlhC8BvNnX6B5w9a4dVgpkQZuU8Hy67TolKcl+iFWq0XX+jbDGN4xWxjQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@eslint-community/eslint-utils": "^4.4.0",
+                "@typescript-eslint/scope-manager": "8.24.1",
+                "@typescript-eslint/types": "8.24.1",
+                "@typescript-eslint/typescript-estree": "8.24.1"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            },
+            "peerDependencies": {
+                "eslint": "^8.57.0 || ^9.0.0",
+                "typescript": ">=4.8.4 <5.8.0"
+            }
+        },
+        "node_modules/@typescript-eslint/visitor-keys": {
+            "version": "8.24.1",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.24.1.tgz",
+            "integrity": "sha512-EwVHlp5l+2vp8CoqJm9KikPZgi3gbdZAtabKT9KPShGeOcJhsv4Zdo3oc8T8I0uKEmYoU4ItyxbptjF08enaxg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@typescript-eslint/types": "8.24.1",
+                "eslint-visitor-keys": "^4.2.0"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            }
+        },
+        "node_modules/@webassemblyjs/ast": {
+            "version": "1.14.1",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz",
+            "integrity": "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@webassemblyjs/helper-numbers": "1.13.2",
+                "@webassemblyjs/helper-wasm-bytecode": "1.13.2"
+            }
+        },
+        "node_modules/@webassemblyjs/floating-point-hex-parser": {
+            "version": "1.13.2",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz",
+            "integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@webassemblyjs/helper-api-error": {
+            "version": "1.13.2",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz",
+            "integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@webassemblyjs/helper-buffer": {
+            "version": "1.14.1",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz",
+            "integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@webassemblyjs/helper-numbers": {
+            "version": "1.13.2",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz",
+            "integrity": "sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@webassemblyjs/floating-point-hex-parser": "1.13.2",
+                "@webassemblyjs/helper-api-error": "1.13.2",
+                "@xtuc/long": "4.2.2"
+            }
+        },
+        "node_modules/@webassemblyjs/helper-wasm-bytecode": {
+            "version": "1.13.2",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz",
+            "integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@webassemblyjs/helper-wasm-section": {
+            "version": "1.14.1",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz",
+            "integrity": "sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@webassemblyjs/ast": "1.14.1",
+                "@webassemblyjs/helper-buffer": "1.14.1",
+                "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+                "@webassemblyjs/wasm-gen": "1.14.1"
+            }
+        },
+        "node_modules/@webassemblyjs/ieee754": {
+            "version": "1.13.2",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz",
+            "integrity": "sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@xtuc/ieee754": "^1.2.0"
+            }
+        },
+        "node_modules/@webassemblyjs/leb128": {
+            "version": "1.13.2",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz",
+            "integrity": "sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@xtuc/long": "4.2.2"
+            }
+        },
+        "node_modules/@webassemblyjs/utf8": {
+            "version": "1.13.2",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz",
+            "integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@webassemblyjs/wasm-edit": {
+            "version": "1.14.1",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz",
+            "integrity": "sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@webassemblyjs/ast": "1.14.1",
+                "@webassemblyjs/helper-buffer": "1.14.1",
+                "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+                "@webassemblyjs/helper-wasm-section": "1.14.1",
+                "@webassemblyjs/wasm-gen": "1.14.1",
+                "@webassemblyjs/wasm-opt": "1.14.1",
+                "@webassemblyjs/wasm-parser": "1.14.1",
+                "@webassemblyjs/wast-printer": "1.14.1"
+            }
+        },
+        "node_modules/@webassemblyjs/wasm-gen": {
+            "version": "1.14.1",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz",
+            "integrity": "sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@webassemblyjs/ast": "1.14.1",
+                "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+                "@webassemblyjs/ieee754": "1.13.2",
+                "@webassemblyjs/leb128": "1.13.2",
+                "@webassemblyjs/utf8": "1.13.2"
+            }
+        },
+        "node_modules/@webassemblyjs/wasm-opt": {
+            "version": "1.14.1",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz",
+            "integrity": "sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@webassemblyjs/ast": "1.14.1",
+                "@webassemblyjs/helper-buffer": "1.14.1",
+                "@webassemblyjs/wasm-gen": "1.14.1",
+                "@webassemblyjs/wasm-parser": "1.14.1"
+            }
+        },
+        "node_modules/@webassemblyjs/wasm-parser": {
+            "version": "1.14.1",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz",
+            "integrity": "sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@webassemblyjs/ast": "1.14.1",
+                "@webassemblyjs/helper-api-error": "1.13.2",
+                "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+                "@webassemblyjs/ieee754": "1.13.2",
+                "@webassemblyjs/leb128": "1.13.2",
+                "@webassemblyjs/utf8": "1.13.2"
+            }
+        },
+        "node_modules/@webassemblyjs/wast-printer": {
+            "version": "1.14.1",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz",
+            "integrity": "sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@webassemblyjs/ast": "1.14.1",
+                "@xtuc/long": "4.2.2"
+            }
+        },
+        "node_modules/@webpack-cli/configtest": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-3.0.1.tgz",
+            "integrity": "sha512-u8d0pJ5YFgneF/GuvEiDA61Tf1VDomHHYMjv/wc9XzYj7nopltpG96nXN5dJRstxZhcNpV1g+nT6CydO7pHbjA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=18.12.0"
+            },
+            "peerDependencies": {
+                "webpack": "^5.82.0",
+                "webpack-cli": "6.x.x"
+            }
+        },
+        "node_modules/@webpack-cli/info": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-3.0.1.tgz",
+            "integrity": "sha512-coEmDzc2u/ffMvuW9aCjoRzNSPDl/XLuhPdlFRpT9tZHmJ/039az33CE7uH+8s0uL1j5ZNtfdv0HkfaKRBGJsQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=18.12.0"
+            },
+            "peerDependencies": {
+                "webpack": "^5.82.0",
+                "webpack-cli": "6.x.x"
+            }
+        },
+        "node_modules/@webpack-cli/serve": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-3.0.1.tgz",
+            "integrity": "sha512-sbgw03xQaCLiT6gcY/6u3qBDn01CWw/nbaXl3gTdTFuJJ75Gffv3E3DBpgvY2fkkrdS1fpjaXNOmJlnbtKauKg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=18.12.0"
+            },
+            "peerDependencies": {
+                "webpack": "^5.82.0",
+                "webpack-cli": "6.x.x"
+            },
+            "peerDependenciesMeta": {
+                "webpack-dev-server": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@xtuc/ieee754": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
+            "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
+            "dev": true,
+            "license": "BSD-3-Clause"
+        },
+        "node_modules/@xtuc/long": {
+            "version": "4.2.2",
+            "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
+            "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
+            "dev": true,
+            "license": "Apache-2.0"
+        },
+        "node_modules/acorn": {
+            "version": "8.14.0",
+            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
+            "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
+            "dev": true,
+            "license": "MIT",
+            "bin": {
+                "acorn": "bin/acorn"
+            },
+            "engines": {
+                "node": ">=0.4.0"
+            }
+        },
+        "node_modules/acorn-jsx": {
+            "version": "5.3.2",
+            "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+            "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+            "dev": true,
+            "license": "MIT",
+            "peerDependencies": {
+                "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+            }
+        },
+        "node_modules/adjust-sourcemap-loader": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-4.0.0.tgz",
+            "integrity": "sha512-OXwN5b9pCUXNQHJpwwD2qP40byEmSgzj8B4ydSN0uMNYWiFmJ6x6KwUllMmfk8Rwu/HJDFR7U8ubsWBoN0Xp0A==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "loader-utils": "^2.0.0",
+                "regex-parser": "^2.2.11"
+            },
+            "engines": {
+                "node": ">=8.9"
+            }
+        },
+        "node_modules/agent-base": {
+            "version": "7.1.3",
+            "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
+            "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 14"
+            }
+        },
+        "node_modules/ajv": {
+            "version": "6.12.6",
+            "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+            "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "fast-deep-equal": "^3.1.1",
+                "fast-json-stable-stringify": "^2.0.0",
+                "json-schema-traverse": "^0.4.1",
+                "uri-js": "^4.2.2"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/epoberezkin"
+            }
+        },
+        "node_modules/ajv-formats": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
+            "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ajv": "^8.0.0"
+            },
+            "peerDependencies": {
+                "ajv": "^8.0.0"
+            },
+            "peerDependenciesMeta": {
+                "ajv": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/ajv-formats/node_modules/ajv": {
+            "version": "8.17.1",
+            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+            "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "fast-deep-equal": "^3.1.3",
+                "fast-uri": "^3.0.1",
+                "json-schema-traverse": "^1.0.0",
+                "require-from-string": "^2.0.2"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/epoberezkin"
+            }
+        },
+        "node_modules/ajv-formats/node_modules/json-schema-traverse": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+            "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/ajv-keywords": {
+            "version": "3.5.2",
+            "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+            "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+            "dev": true,
+            "license": "MIT",
+            "peerDependencies": {
+                "ajv": "^6.9.1"
+            }
+        },
+        "node_modules/ansi-colors": {
+            "version": "4.1.3",
+            "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
+            "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/ansi-escapes": {
+            "version": "4.3.2",
+            "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+            "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "type-fest": "^0.21.3"
+            },
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/ansi-regex": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/ansi-styles": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "color-convert": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+            }
+        },
+        "node_modules/anymatch": {
+            "version": "3.1.3",
+            "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+            "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "normalize-path": "^3.0.0",
+                "picomatch": "^2.0.4"
+            },
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/argparse": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+            "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+            "dev": true,
+            "license": "Python-2.0"
+        },
+        "node_modules/async": {
+            "version": "3.2.6",
+            "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
+            "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/babel-jest": {
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz",
+            "integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@jest/transform": "^29.7.0",
+                "@types/babel__core": "^7.1.14",
+                "babel-plugin-istanbul": "^6.1.1",
+                "babel-preset-jest": "^29.6.3",
+                "chalk": "^4.0.0",
+                "graceful-fs": "^4.2.9",
+                "slash": "^3.0.0"
+            },
+            "engines": {
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.8.0"
+            }
+        },
+        "node_modules/babel-plugin-istanbul": {
+            "version": "6.1.1",
+            "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
+            "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.0.0",
+                "@istanbuljs/load-nyc-config": "^1.0.0",
+                "@istanbuljs/schema": "^0.1.2",
+                "istanbul-lib-instrument": "^5.0.4",
+                "test-exclude": "^6.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/babel-plugin-istanbul/node_modules/istanbul-lib-instrument": {
+            "version": "5.2.1",
+            "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
+            "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "@babel/core": "^7.12.3",
+                "@babel/parser": "^7.14.7",
+                "@istanbuljs/schema": "^0.1.2",
+                "istanbul-lib-coverage": "^3.2.0",
+                "semver": "^6.3.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/babel-plugin-istanbul/node_modules/semver": {
+            "version": "6.3.1",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+            "dev": true,
+            "license": "ISC",
+            "bin": {
+                "semver": "bin/semver.js"
+            }
+        },
+        "node_modules/babel-plugin-jest-hoist": {
+            "version": "29.6.3",
+            "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz",
+            "integrity": "sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/template": "^7.3.3",
+                "@babel/types": "^7.3.3",
+                "@types/babel__core": "^7.1.14",
+                "@types/babel__traverse": "^7.0.6"
+            },
+            "engines": {
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+            }
+        },
+        "node_modules/babel-preset-current-node-syntax": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.1.0.tgz",
+            "integrity": "sha512-ldYss8SbBlWva1bs28q78Ju5Zq1F+8BrqBZZ0VFhLBvhh6lCpC2o3gDJi/5DRLs9FgYZCnmPYIVFU4lRXCkyUw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/plugin-syntax-async-generators": "^7.8.4",
+                "@babel/plugin-syntax-bigint": "^7.8.3",
+                "@babel/plugin-syntax-class-properties": "^7.12.13",
+                "@babel/plugin-syntax-class-static-block": "^7.14.5",
+                "@babel/plugin-syntax-import-attributes": "^7.24.7",
+                "@babel/plugin-syntax-import-meta": "^7.10.4",
+                "@babel/plugin-syntax-json-strings": "^7.8.3",
+                "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
+                "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+                "@babel/plugin-syntax-numeric-separator": "^7.10.4",
+                "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+                "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+                "@babel/plugin-syntax-optional-chaining": "^7.8.3",
+                "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
+                "@babel/plugin-syntax-top-level-await": "^7.14.5"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0"
+            }
+        },
+        "node_modules/babel-preset-jest": {
+            "version": "29.6.3",
+            "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz",
+            "integrity": "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "babel-plugin-jest-hoist": "^29.6.3",
+                "babel-preset-current-node-syntax": "^1.0.0"
+            },
+            "engines": {
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0"
+            }
+        },
+        "node_modules/balanced-match": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+            "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/big.js": {
+            "version": "5.2.2",
+            "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
+            "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/brace-expansion": {
+            "version": "1.1.11",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "balanced-match": "^1.0.0",
+                "concat-map": "0.0.1"
+            }
+        },
+        "node_modules/braces": {
+            "version": "3.0.3",
+            "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+            "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "fill-range": "^7.1.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/browserslist": {
+            "version": "4.24.4",
+            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz",
+            "integrity": "sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/browserslist"
+                },
+                {
+                    "type": "tidelift",
+                    "url": "https://tidelift.com/funding/github/npm/browserslist"
+                },
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/ai"
+                }
+            ],
+            "license": "MIT",
+            "dependencies": {
+                "caniuse-lite": "^1.0.30001688",
+                "electron-to-chromium": "^1.5.73",
+                "node-releases": "^2.0.19",
+                "update-browserslist-db": "^1.1.1"
+            },
+            "bin": {
+                "browserslist": "cli.js"
+            },
+            "engines": {
+                "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+            }
+        },
+        "node_modules/bs-logger": {
+            "version": "0.2.6",
+            "resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz",
+            "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "fast-json-stable-stringify": "2.x"
+            },
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/bser": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
+            "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "node-int64": "^0.4.0"
+            }
+        },
+        "node_modules/buffer-from": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+            "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/byte-base64": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/byte-base64/-/byte-base64-1.1.0.tgz",
+            "integrity": "sha512-56cXelkJrVMdCY9V/3RfDxTh4VfMFCQ5km7B7GkIGfo4bcPL9aACyJLB0Ms3Ezu5rsHmLB2suis96z4fLM03DA==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/callsites": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+            "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/camelcase": {
+            "version": "5.3.1",
+            "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+            "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/caniuse-lite": {
+            "version": "1.0.30001700",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001700.tgz",
+            "integrity": "sha512-2S6XIXwaE7K7erT8dY+kLQcpa5ms63XlRkMkReXjle+kf6c5g38vyMl+Z5y8dSxOFDhcFe+nxnn261PLxBSQsQ==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/browserslist"
+                },
+                {
+                    "type": "tidelift",
+                    "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+                },
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/ai"
+                }
+            ],
+            "license": "CC-BY-4.0"
+        },
+        "node_modules/chalk": {
+            "version": "4.1.2",
+            "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+            "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-styles": "^4.1.0",
+                "supports-color": "^7.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/chalk?sponsor=1"
+            }
+        },
+        "node_modules/change-case": {
+            "version": "5.4.4",
+            "resolved": "https://registry.npmjs.org/change-case/-/change-case-5.4.4.tgz",
+            "integrity": "sha512-HRQyTk2/YPEkt9TnUPbOpr64Uw3KOicFWPVBb+xiHvd6eBx/qPr9xqfBFDT8P2vWsvvz4jbEkfDe71W3VyNu2w==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/char-regex": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
+            "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/chokidar": {
+            "version": "4.0.3",
+            "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
+            "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "readdirp": "^4.0.1"
+            },
+            "engines": {
+                "node": ">= 14.16.0"
+            },
+            "funding": {
+                "url": "https://paulmillr.com/funding/"
+            }
+        },
+        "node_modules/chrome-trace-event": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz",
+            "integrity": "sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6.0"
+            }
+        },
+        "node_modules/ci-info": {
+            "version": "3.9.0",
+            "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+            "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/sibiraj-s"
+                }
+            ],
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/cjs-module-lexer": {
+            "version": "1.4.3",
+            "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.3.tgz",
+            "integrity": "sha512-9z8TZaGM1pfswYeXrUpzPrkx8UnWYdhJclsiYMm6x/w5+nN+8Tf/LnAgfLGQCm59qAOxU8WwHEq2vNwF6i4j+Q==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/cliui": {
+            "version": "8.0.1",
+            "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+            "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "string-width": "^4.2.0",
+                "strip-ansi": "^6.0.1",
+                "wrap-ansi": "^7.0.0"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/clone-deep": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
+            "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "is-plain-object": "^2.0.4",
+                "kind-of": "^6.0.2",
+                "shallow-clone": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/co": {
+            "version": "4.6.0",
+            "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+            "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "iojs": ">= 1.0.0",
+                "node": ">= 0.12.0"
+            }
+        },
+        "node_modules/collect-v8-coverage": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz",
+            "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/color-convert": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "color-name": "~1.1.4"
+            },
+            "engines": {
+                "node": ">=7.0.0"
+            }
+        },
+        "node_modules/color-name": {
+            "version": "1.1.4",
+            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/colorette": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.4.0.tgz",
+            "integrity": "sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/commander": {
+            "version": "2.20.3",
+            "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+            "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/concat-map": {
+            "version": "0.0.1",
+            "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+            "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/convert-source-map": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+            "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/create-jest": {
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz",
+            "integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@jest/types": "^29.6.3",
+                "chalk": "^4.0.0",
+                "exit": "^0.1.2",
+                "graceful-fs": "^4.2.9",
+                "jest-config": "^29.7.0",
+                "jest-util": "^29.7.0",
+                "prompts": "^2.0.1"
+            },
+            "bin": {
+                "create-jest": "bin/create-jest.js"
+            },
+            "engines": {
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+            }
+        },
+        "node_modules/cross-spawn": {
+            "version": "7.0.6",
+            "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+            "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "path-key": "^3.1.0",
+                "shebang-command": "^2.0.0",
+                "which": "^2.0.1"
+            },
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/css-loader": {
+            "version": "7.1.2",
+            "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-7.1.2.tgz",
+            "integrity": "sha512-6WvYYn7l/XEGN8Xu2vWFt9nVzrCn39vKyTEFf/ExEyoksJjjSZV/0/35XPlMbpnr6VGhZIUg5yJrL8tGfes/FA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "icss-utils": "^5.1.0",
+                "postcss": "^8.4.33",
+                "postcss-modules-extract-imports": "^3.1.0",
+                "postcss-modules-local-by-default": "^4.0.5",
+                "postcss-modules-scope": "^3.2.0",
+                "postcss-modules-values": "^4.0.0",
+                "postcss-value-parser": "^4.2.0",
+                "semver": "^7.5.4"
+            },
+            "engines": {
+                "node": ">= 18.12.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            },
+            "peerDependencies": {
+                "@rspack/core": "0.x || 1.x",
+                "webpack": "^5.27.0"
+            },
+            "peerDependenciesMeta": {
+                "@rspack/core": {
+                    "optional": true
+                },
+                "webpack": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/cssesc": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+            "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
+            "dev": true,
+            "license": "MIT",
+            "bin": {
+                "cssesc": "bin/cssesc"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/date-fns": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-4.1.0.tgz",
+            "integrity": "sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==",
+            "dev": true,
+            "license": "MIT",
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/kossnocorp"
+            }
+        },
+        "node_modules/debug": {
+            "version": "4.4.0",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
+            "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ms": "^2.1.3"
+            },
+            "engines": {
+                "node": ">=6.0"
+            },
+            "peerDependenciesMeta": {
+                "supports-color": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/dedent": {
+            "version": "1.5.3",
+            "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.3.tgz",
+            "integrity": "sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==",
+            "dev": true,
+            "license": "MIT",
+            "peerDependencies": {
+                "babel-plugin-macros": "^3.1.0"
+            },
+            "peerDependenciesMeta": {
+                "babel-plugin-macros": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/deep-is": {
+            "version": "0.1.4",
+            "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+            "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/deepmerge": {
+            "version": "4.3.1",
+            "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
+            "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/detect-libc": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+            "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "optional": true,
+            "bin": {
+                "detect-libc": "bin/detect-libc.js"
+            },
+            "engines": {
+                "node": ">=0.10"
+            }
+        },
+        "node_modules/detect-newline": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
+            "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/diff-sequences": {
+            "version": "29.6.3",
+            "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
+            "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+            }
+        },
+        "node_modules/ejs": {
+            "version": "3.1.10",
+            "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
+            "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "jake": "^10.8.5"
+            },
+            "bin": {
+                "ejs": "bin/cli.js"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/electron-to-chromium": {
+            "version": "1.5.102",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.102.tgz",
+            "integrity": "sha512-eHhqaja8tE/FNpIiBrvBjFV/SSKpyWHLvxuR9dPTdo+3V9ppdLmFB7ZZQ98qNovcngPLYIz0oOBF9P0FfZef5Q==",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/emittery": {
+            "version": "0.13.1",
+            "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz",
+            "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/sindresorhus/emittery?sponsor=1"
+            }
+        },
+        "node_modules/emoji-regex": {
+            "version": "8.0.0",
+            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/emojis-list": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+            "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 4"
+            }
+        },
+        "node_modules/enhanced-resolve": {
+            "version": "5.18.1",
+            "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.1.tgz",
+            "integrity": "sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "graceful-fs": "^4.2.4",
+                "tapable": "^2.2.0"
+            },
+            "engines": {
+                "node": ">=10.13.0"
+            }
+        },
+        "node_modules/envinfo": {
+            "version": "7.14.0",
+            "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.14.0.tgz",
+            "integrity": "sha512-CO40UI41xDQzhLB1hWyqUKgFhs250pNcGbyGKe1l/e4FSaI/+YE4IMG76GDt0In67WLPACIITC+sOi08x4wIvg==",
+            "dev": true,
+            "license": "MIT",
+            "bin": {
+                "envinfo": "dist/cli.js"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/error-ex": {
+            "version": "1.3.2",
+            "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+            "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "is-arrayish": "^0.2.1"
+            }
+        },
+        "node_modules/es-module-lexer": {
+            "version": "1.6.0",
+            "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.6.0.tgz",
+            "integrity": "sha512-qqnD1yMU6tk/jnaMosogGySTZP8YtUgAffA9nMN+E/rjxcfRQ6IEk7IiozUjgxKoFHBGjTLnrHB/YC45r/59EQ==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/escalade": {
+            "version": "3.2.0",
+            "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+            "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/escape-string-regexp": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+            "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/eslint": {
+            "version": "9.20.1",
+            "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.20.1.tgz",
+            "integrity": "sha512-m1mM33o6dBUjxl2qb6wv6nGNwCAsns1eKtaQ4l/NPHeTvhiUPbtdfMyktxN4B3fgHIgsYh1VT3V9txblpQHq+g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@eslint-community/eslint-utils": "^4.2.0",
+                "@eslint-community/regexpp": "^4.12.1",
+                "@eslint/config-array": "^0.19.0",
+                "@eslint/core": "^0.11.0",
+                "@eslint/eslintrc": "^3.2.0",
+                "@eslint/js": "9.20.0",
+                "@eslint/plugin-kit": "^0.2.5",
+                "@humanfs/node": "^0.16.6",
+                "@humanwhocodes/module-importer": "^1.0.1",
+                "@humanwhocodes/retry": "^0.4.1",
+                "@types/estree": "^1.0.6",
+                "@types/json-schema": "^7.0.15",
+                "ajv": "^6.12.4",
+                "chalk": "^4.0.0",
+                "cross-spawn": "^7.0.6",
+                "debug": "^4.3.2",
+                "escape-string-regexp": "^4.0.0",
+                "eslint-scope": "^8.2.0",
+                "eslint-visitor-keys": "^4.2.0",
+                "espree": "^10.3.0",
+                "esquery": "^1.5.0",
+                "esutils": "^2.0.2",
+                "fast-deep-equal": "^3.1.3",
+                "file-entry-cache": "^8.0.0",
+                "find-up": "^5.0.0",
+                "glob-parent": "^6.0.2",
+                "ignore": "^5.2.0",
+                "imurmurhash": "^0.1.4",
+                "is-glob": "^4.0.0",
+                "json-stable-stringify-without-jsonify": "^1.0.1",
+                "lodash.merge": "^4.6.2",
+                "minimatch": "^3.1.2",
+                "natural-compare": "^1.4.0",
+                "optionator": "^0.9.3"
+            },
+            "bin": {
+                "eslint": "bin/eslint.js"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "url": "https://eslint.org/donate"
+            },
+            "peerDependencies": {
+                "jiti": "*"
+            },
+            "peerDependenciesMeta": {
+                "jiti": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/eslint-plugin-unused-imports": {
+            "version": "4.1.4",
+            "resolved": "https://registry.npmjs.org/eslint-plugin-unused-imports/-/eslint-plugin-unused-imports-4.1.4.tgz",
+            "integrity": "sha512-YptD6IzQjDardkl0POxnnRBhU1OEePMV0nd6siHaRBbd+lyh6NAhFEobiznKU7kTsSsDeSD62Pe7kAM1b7dAZQ==",
+            "dev": true,
+            "license": "MIT",
+            "peerDependencies": {
+                "@typescript-eslint/eslint-plugin": "^8.0.0-0 || ^7.0.0 || ^6.0.0 || ^5.0.0",
+                "eslint": "^9.0.0 || ^8.0.0"
+            },
+            "peerDependenciesMeta": {
+                "@typescript-eslint/eslint-plugin": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/eslint-scope": {
+            "version": "8.2.0",
+            "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.2.0.tgz",
+            "integrity": "sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "dependencies": {
+                "esrecurse": "^4.3.0",
+                "estraverse": "^5.2.0"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/eslint"
+            }
+        },
+        "node_modules/eslint-visitor-keys": {
+            "version": "4.2.0",
+            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
+            "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/eslint"
+            }
+        },
+        "node_modules/espree": {
+            "version": "10.3.0",
+            "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz",
+            "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "dependencies": {
+                "acorn": "^8.14.0",
+                "acorn-jsx": "^5.3.2",
+                "eslint-visitor-keys": "^4.2.0"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/eslint"
+            }
+        },
+        "node_modules/esprima": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+            "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "bin": {
+                "esparse": "bin/esparse.js",
+                "esvalidate": "bin/esvalidate.js"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/esquery": {
+            "version": "1.6.0",
+            "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
+            "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "estraverse": "^5.1.0"
+            },
+            "engines": {
+                "node": ">=0.10"
+            }
+        },
+        "node_modules/esrecurse": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+            "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "dependencies": {
+                "estraverse": "^5.2.0"
+            },
+            "engines": {
+                "node": ">=4.0"
+            }
+        },
+        "node_modules/estraverse": {
+            "version": "5.3.0",
+            "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+            "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "engines": {
+                "node": ">=4.0"
+            }
+        },
+        "node_modules/esutils": {
+            "version": "2.0.3",
+            "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+            "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/eventemitter3": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz",
+            "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/events": {
+            "version": "3.3.0",
+            "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+            "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.8.x"
+            }
+        },
+        "node_modules/execa": {
+            "version": "5.1.1",
+            "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+            "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "cross-spawn": "^7.0.3",
+                "get-stream": "^6.0.0",
+                "human-signals": "^2.1.0",
+                "is-stream": "^2.0.0",
+                "merge-stream": "^2.0.0",
+                "npm-run-path": "^4.0.1",
+                "onetime": "^5.1.2",
+                "signal-exit": "^3.0.3",
+                "strip-final-newline": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sindresorhus/execa?sponsor=1"
+            }
+        },
+        "node_modules/exit": {
+            "version": "0.1.2",
+            "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+            "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.8.0"
+            }
+        },
+        "node_modules/expect": {
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz",
+            "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@jest/expect-utils": "^29.7.0",
+                "jest-get-type": "^29.6.3",
+                "jest-matcher-utils": "^29.7.0",
+                "jest-message-util": "^29.7.0",
+                "jest-util": "^29.7.0"
+            },
+            "engines": {
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+            }
+        },
+        "node_modules/fast-deep-equal": {
+            "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-glob": {
+            "version": "3.3.3",
+            "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
+            "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@nodelib/fs.stat": "^2.0.2",
+                "@nodelib/fs.walk": "^1.2.3",
+                "glob-parent": "^5.1.2",
+                "merge2": "^1.3.0",
+                "micromatch": "^4.0.8"
+            },
+            "engines": {
+                "node": ">=8.6.0"
+            }
+        },
+        "node_modules/fast-glob/node_modules/glob-parent": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+            "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "is-glob": "^4.0.1"
+            },
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/fast-json-stable-stringify": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+            "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/fast-levenshtein": {
+            "version": "2.0.6",
+            "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+            "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/fast-uri": {
+            "version": "3.0.6",
+            "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.6.tgz",
+            "integrity": "sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/fastify"
+                },
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/fastify"
+                }
+            ],
+            "license": "BSD-3-Clause"
+        },
+        "node_modules/fastest-levenshtein": {
+            "version": "1.0.16",
+            "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz",
+            "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 4.9.1"
+            }
+        },
+        "node_modules/fastq": {
+            "version": "1.19.0",
+            "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.0.tgz",
+            "integrity": "sha512-7SFSRCNjBQIZH/xZR3iy5iQYR8aGBE0h3VG6/cwlbrpdciNYBMotQav8c1XI3HjHH+NikUpP53nPdlZSdWmFzA==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "reusify": "^1.0.4"
+            }
+        },
+        "node_modules/fb-watchman": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz",
+            "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "bser": "2.1.1"
+            }
+        },
+        "node_modules/fetch-retry": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmjs.org/fetch-retry/-/fetch-retry-6.0.0.tgz",
+            "integrity": "sha512-BUFj1aMubgib37I3v4q78fYo63Po7t4HUPTpQ6/QE6yK6cIQrP+W43FYToeTEyg5m2Y7eFUtijUuAv/PDlWuag==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/file-entry-cache": {
+            "version": "8.0.0",
+            "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz",
+            "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "flat-cache": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/file-loader": {
+            "version": "6.2.0",
+            "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz",
+            "integrity": "sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "loader-utils": "^2.0.0",
+                "schema-utils": "^3.0.0"
+            },
+            "engines": {
+                "node": ">= 10.13.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            },
+            "peerDependencies": {
+                "webpack": "^4.0.0 || ^5.0.0"
+            }
+        },
+        "node_modules/filelist": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
+            "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "minimatch": "^5.0.1"
+            }
+        },
+        "node_modules/filelist/node_modules/brace-expansion": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+            "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "balanced-match": "^1.0.0"
+            }
+        },
+        "node_modules/filelist/node_modules/minimatch": {
+            "version": "5.1.6",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+            "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "brace-expansion": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/fill-range": {
+            "version": "7.1.1",
+            "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+            "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "to-regex-range": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/find-up": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+            "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "locate-path": "^6.0.0",
+                "path-exists": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/flat": {
+            "version": "5.0.2",
+            "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
+            "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "bin": {
+                "flat": "cli.js"
+            }
+        },
+        "node_modules/flat-cache": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz",
+            "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "flatted": "^3.2.9",
+                "keyv": "^4.5.4"
+            },
+            "engines": {
+                "node": ">=16"
+            }
+        },
+        "node_modules/flatted": {
+            "version": "3.3.3",
+            "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz",
+            "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/fs-extra": {
+            "version": "11.3.0",
+            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.0.tgz",
+            "integrity": "sha512-Z4XaCL6dUDHfP/jT25jJKMmtxvuwbkrD1vNSMFlo9lNLY2c5FHYSQgHPRZUjAB26TpDEoW9HCOgplrdbaPV/ew==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "graceful-fs": "^4.2.0",
+                "jsonfile": "^6.0.1",
+                "universalify": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=14.14"
+            }
+        },
+        "node_modules/fs.realpath": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+            "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/fsevents": {
+            "version": "2.3.3",
+            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+            "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+            "dev": true,
+            "hasInstallScript": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+            }
+        },
+        "node_modules/function-bind": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+            "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+            "dev": true,
+            "license": "MIT",
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/gensync": {
+            "version": "1.0.0-beta.2",
+            "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+            "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/get-caller-file": {
+            "version": "2.0.5",
+            "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+            "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+            "dev": true,
+            "license": "ISC",
+            "engines": {
+                "node": "6.* || 8.* || >= 10.*"
+            }
+        },
+        "node_modules/get-package-type": {
+            "version": "0.1.0",
+            "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
+            "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8.0.0"
+            }
+        },
+        "node_modules/get-stream": {
+            "version": "6.0.1",
+            "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+            "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/glob": {
+            "version": "7.2.3",
+            "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+            "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+            "deprecated": "Glob versions prior to v9 are no longer supported",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^3.1.1",
+                "once": "^1.3.0",
+                "path-is-absolute": "^1.0.0"
+            },
+            "engines": {
+                "node": "*"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/glob-parent": {
+            "version": "6.0.2",
+            "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+            "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "is-glob": "^4.0.3"
+            },
+            "engines": {
+                "node": ">=10.13.0"
+            }
+        },
+        "node_modules/glob-to-regexp": {
+            "version": "0.4.1",
+            "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
+            "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
+            "dev": true,
+            "license": "BSD-2-Clause"
+        },
+        "node_modules/globals": {
+            "version": "14.0.0",
+            "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz",
+            "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=18"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/graceful-fs": {
+            "version": "4.2.11",
+            "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+            "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/graphemer": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
+            "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/has-flag": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/hasown": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+            "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "function-bind": "^1.1.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/html-escaper": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+            "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/https-proxy-agent": {
+            "version": "7.0.6",
+            "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
+            "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "agent-base": "^7.1.2",
+                "debug": "4"
+            },
+            "engines": {
+                "node": ">= 14"
+            }
+        },
+        "node_modules/human-signals": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+            "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "engines": {
+                "node": ">=10.17.0"
+            }
+        },
+        "node_modules/icss-utils": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
+            "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
+            "dev": true,
+            "license": "ISC",
+            "engines": {
+                "node": "^10 || ^12 || >= 14"
+            },
+            "peerDependencies": {
+                "postcss": "^8.1.0"
+            }
+        },
+        "node_modules/ignore": {
+            "version": "5.3.2",
+            "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+            "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 4"
+            }
+        },
+        "node_modules/immutable": {
+            "version": "5.0.3",
+            "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.0.3.tgz",
+            "integrity": "sha512-P8IdPQHq3lA1xVeBRi5VPqUm5HDgKnx0Ru51wZz5mjxHr5n3RWhjIpOFU7ybkUxfB+5IToy+OLaHYDBIWsv+uw==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/import-fresh": {
+            "version": "3.3.1",
+            "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz",
+            "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "parent-module": "^1.0.0",
+                "resolve-from": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=6"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/import-local": {
+            "version": "3.2.0",
+            "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz",
+            "integrity": "sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "pkg-dir": "^4.2.0",
+                "resolve-cwd": "^3.0.0"
+            },
+            "bin": {
+                "import-local-fixture": "fixtures/cli.js"
+            },
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/imurmurhash": {
+            "version": "0.1.4",
+            "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+            "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.8.19"
+            }
+        },
+        "node_modules/index-to-position": {
+            "version": "0.1.2",
+            "resolved": "https://registry.npmjs.org/index-to-position/-/index-to-position-0.1.2.tgz",
+            "integrity": "sha512-MWDKS3AS1bGCHLBA2VLImJz42f7bJh8wQsTGCzI3j519/CASStoDONUBVz2I/VID0MpiX3SGSnbOD2xUalbE5g==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=18"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/inflight": {
+            "version": "1.0.6",
+            "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+            "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+            "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "once": "^1.3.0",
+                "wrappy": "1"
+            }
+        },
+        "node_modules/inherits": {
+            "version": "2.0.4",
+            "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+            "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/interpret": {
+            "version": "3.1.1",
+            "resolved": "https://registry.npmjs.org/interpret/-/interpret-3.1.1.tgz",
+            "integrity": "sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=10.13.0"
+            }
+        },
+        "node_modules/is-arrayish": {
+            "version": "0.2.1",
+            "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+            "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/is-core-module": {
+            "version": "2.16.1",
+            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
+            "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "hasown": "^2.0.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/is-extglob": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+            "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/is-fullwidth-code-point": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+            "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/is-generator-fn": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
+            "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/is-glob": {
+            "version": "4.0.3",
+            "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+            "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "is-extglob": "^2.1.1"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/is-number": {
+            "version": "7.0.0",
+            "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+            "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.12.0"
+            }
+        },
+        "node_modules/is-plain-object": {
+            "version": "2.0.4",
+            "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+            "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "isobject": "^3.0.1"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/is-stream": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+            "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/isexe": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+            "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/isobject": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+            "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/istanbul-lib-coverage": {
+            "version": "3.2.2",
+            "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
+            "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/istanbul-lib-instrument": {
+            "version": "6.0.3",
+            "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz",
+            "integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "@babel/core": "^7.23.9",
+                "@babel/parser": "^7.23.9",
+                "@istanbuljs/schema": "^0.1.3",
+                "istanbul-lib-coverage": "^3.2.0",
+                "semver": "^7.5.4"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/istanbul-lib-report": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
+            "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "istanbul-lib-coverage": "^3.0.0",
+                "make-dir": "^4.0.0",
+                "supports-color": "^7.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/istanbul-lib-source-maps": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
+            "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "debug": "^4.1.1",
+                "istanbul-lib-coverage": "^3.0.0",
+                "source-map": "^0.6.1"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/istanbul-reports": {
+            "version": "3.1.7",
+            "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz",
+            "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "html-escaper": "^2.0.0",
+                "istanbul-lib-report": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/jake": {
+            "version": "10.9.2",
+            "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.2.tgz",
+            "integrity": "sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "async": "^3.2.3",
+                "chalk": "^4.0.2",
+                "filelist": "^1.0.4",
+                "minimatch": "^3.1.2"
+            },
+            "bin": {
+                "jake": "bin/cli.js"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/jest": {
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz",
+            "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@jest/core": "^29.7.0",
+                "@jest/types": "^29.6.3",
+                "import-local": "^3.0.2",
+                "jest-cli": "^29.7.0"
+            },
+            "bin": {
+                "jest": "bin/jest.js"
+            },
+            "engines": {
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+            },
+            "peerDependencies": {
+                "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+            },
+            "peerDependenciesMeta": {
+                "node-notifier": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/jest-changed-files": {
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz",
+            "integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "execa": "^5.0.0",
+                "jest-util": "^29.7.0",
+                "p-limit": "^3.1.0"
+            },
+            "engines": {
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+            }
+        },
+        "node_modules/jest-circus": {
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz",
+            "integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@jest/environment": "^29.7.0",
+                "@jest/expect": "^29.7.0",
+                "@jest/test-result": "^29.7.0",
+                "@jest/types": "^29.6.3",
+                "@types/node": "*",
+                "chalk": "^4.0.0",
+                "co": "^4.6.0",
+                "dedent": "^1.0.0",
+                "is-generator-fn": "^2.0.0",
+                "jest-each": "^29.7.0",
+                "jest-matcher-utils": "^29.7.0",
+                "jest-message-util": "^29.7.0",
+                "jest-runtime": "^29.7.0",
+                "jest-snapshot": "^29.7.0",
+                "jest-util": "^29.7.0",
+                "p-limit": "^3.1.0",
+                "pretty-format": "^29.7.0",
+                "pure-rand": "^6.0.0",
+                "slash": "^3.0.0",
+                "stack-utils": "^2.0.3"
+            },
+            "engines": {
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+            }
+        },
+        "node_modules/jest-cli": {
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz",
+            "integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@jest/core": "^29.7.0",
+                "@jest/test-result": "^29.7.0",
+                "@jest/types": "^29.6.3",
+                "chalk": "^4.0.0",
+                "create-jest": "^29.7.0",
+                "exit": "^0.1.2",
+                "import-local": "^3.0.2",
+                "jest-config": "^29.7.0",
+                "jest-util": "^29.7.0",
+                "jest-validate": "^29.7.0",
+                "yargs": "^17.3.1"
+            },
+            "bin": {
+                "jest": "bin/jest.js"
+            },
+            "engines": {
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+            },
+            "peerDependencies": {
+                "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+            },
+            "peerDependenciesMeta": {
+                "node-notifier": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/jest-config": {
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz",
+            "integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/core": "^7.11.6",
+                "@jest/test-sequencer": "^29.7.0",
+                "@jest/types": "^29.6.3",
+                "babel-jest": "^29.7.0",
+                "chalk": "^4.0.0",
+                "ci-info": "^3.2.0",
+                "deepmerge": "^4.2.2",
+                "glob": "^7.1.3",
+                "graceful-fs": "^4.2.9",
+                "jest-circus": "^29.7.0",
+                "jest-environment-node": "^29.7.0",
+                "jest-get-type": "^29.6.3",
+                "jest-regex-util": "^29.6.3",
+                "jest-resolve": "^29.7.0",
+                "jest-runner": "^29.7.0",
+                "jest-util": "^29.7.0",
+                "jest-validate": "^29.7.0",
+                "micromatch": "^4.0.4",
+                "parse-json": "^5.2.0",
+                "pretty-format": "^29.7.0",
+                "slash": "^3.0.0",
+                "strip-json-comments": "^3.1.1"
+            },
+            "engines": {
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+            },
+            "peerDependencies": {
+                "@types/node": "*",
+                "ts-node": ">=9.0.0"
+            },
+            "peerDependenciesMeta": {
+                "@types/node": {
+                    "optional": true
+                },
+                "ts-node": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/jest-diff": {
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz",
+            "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "chalk": "^4.0.0",
+                "diff-sequences": "^29.6.3",
+                "jest-get-type": "^29.6.3",
+                "pretty-format": "^29.7.0"
+            },
+            "engines": {
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+            }
+        },
+        "node_modules/jest-docblock": {
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz",
+            "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "detect-newline": "^3.0.0"
+            },
+            "engines": {
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+            }
+        },
+        "node_modules/jest-each": {
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz",
+            "integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@jest/types": "^29.6.3",
+                "chalk": "^4.0.0",
+                "jest-get-type": "^29.6.3",
+                "jest-util": "^29.7.0",
+                "pretty-format": "^29.7.0"
+            },
+            "engines": {
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+            }
+        },
+        "node_modules/jest-environment-node": {
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz",
+            "integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@jest/environment": "^29.7.0",
+                "@jest/fake-timers": "^29.7.0",
+                "@jest/types": "^29.6.3",
+                "@types/node": "*",
+                "jest-mock": "^29.7.0",
+                "jest-util": "^29.7.0"
+            },
+            "engines": {
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+            }
+        },
+        "node_modules/jest-get-type": {
+            "version": "29.6.3",
+            "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz",
+            "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+            }
+        },
+        "node_modules/jest-haste-map": {
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz",
+            "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@jest/types": "^29.6.3",
+                "@types/graceful-fs": "^4.1.3",
+                "@types/node": "*",
+                "anymatch": "^3.0.3",
+                "fb-watchman": "^2.0.0",
+                "graceful-fs": "^4.2.9",
+                "jest-regex-util": "^29.6.3",
+                "jest-util": "^29.7.0",
+                "jest-worker": "^29.7.0",
+                "micromatch": "^4.0.4",
+                "walker": "^1.0.8"
+            },
+            "engines": {
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+            },
+            "optionalDependencies": {
+                "fsevents": "^2.3.2"
+            }
+        },
+        "node_modules/jest-leak-detector": {
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz",
+            "integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "jest-get-type": "^29.6.3",
+                "pretty-format": "^29.7.0"
+            },
+            "engines": {
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+            }
+        },
+        "node_modules/jest-matcher-utils": {
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz",
+            "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "chalk": "^4.0.0",
+                "jest-diff": "^29.7.0",
+                "jest-get-type": "^29.6.3",
+                "pretty-format": "^29.7.0"
+            },
+            "engines": {
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+            }
+        },
+        "node_modules/jest-message-util": {
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz",
+            "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/code-frame": "^7.12.13",
+                "@jest/types": "^29.6.3",
+                "@types/stack-utils": "^2.0.0",
+                "chalk": "^4.0.0",
+                "graceful-fs": "^4.2.9",
+                "micromatch": "^4.0.4",
+                "pretty-format": "^29.7.0",
+                "slash": "^3.0.0",
+                "stack-utils": "^2.0.3"
+            },
+            "engines": {
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+            }
+        },
+        "node_modules/jest-mock": {
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz",
+            "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@jest/types": "^29.6.3",
+                "@types/node": "*",
+                "jest-util": "^29.7.0"
+            },
+            "engines": {
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+            }
+        },
+        "node_modules/jest-pnp-resolver": {
+            "version": "1.2.3",
+            "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
+            "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            },
+            "peerDependencies": {
+                "jest-resolve": "*"
+            },
+            "peerDependenciesMeta": {
+                "jest-resolve": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/jest-regex-util": {
+            "version": "29.6.3",
+            "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz",
+            "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+            }
+        },
+        "node_modules/jest-resolve": {
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz",
+            "integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "chalk": "^4.0.0",
+                "graceful-fs": "^4.2.9",
+                "jest-haste-map": "^29.7.0",
+                "jest-pnp-resolver": "^1.2.2",
+                "jest-util": "^29.7.0",
+                "jest-validate": "^29.7.0",
+                "resolve": "^1.20.0",
+                "resolve.exports": "^2.0.0",
+                "slash": "^3.0.0"
+            },
+            "engines": {
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+            }
+        },
+        "node_modules/jest-resolve-dependencies": {
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz",
+            "integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "jest-regex-util": "^29.6.3",
+                "jest-snapshot": "^29.7.0"
+            },
+            "engines": {
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+            }
+        },
+        "node_modules/jest-runner": {
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz",
+            "integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@jest/console": "^29.7.0",
+                "@jest/environment": "^29.7.0",
+                "@jest/test-result": "^29.7.0",
+                "@jest/transform": "^29.7.0",
+                "@jest/types": "^29.6.3",
+                "@types/node": "*",
+                "chalk": "^4.0.0",
+                "emittery": "^0.13.1",
+                "graceful-fs": "^4.2.9",
+                "jest-docblock": "^29.7.0",
+                "jest-environment-node": "^29.7.0",
+                "jest-haste-map": "^29.7.0",
+                "jest-leak-detector": "^29.7.0",
+                "jest-message-util": "^29.7.0",
+                "jest-resolve": "^29.7.0",
+                "jest-runtime": "^29.7.0",
+                "jest-util": "^29.7.0",
+                "jest-watcher": "^29.7.0",
+                "jest-worker": "^29.7.0",
+                "p-limit": "^3.1.0",
+                "source-map-support": "0.5.13"
+            },
+            "engines": {
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+            }
+        },
+        "node_modules/jest-runtime": {
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz",
+            "integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@jest/environment": "^29.7.0",
+                "@jest/fake-timers": "^29.7.0",
+                "@jest/globals": "^29.7.0",
+                "@jest/source-map": "^29.6.3",
+                "@jest/test-result": "^29.7.0",
+                "@jest/transform": "^29.7.0",
+                "@jest/types": "^29.6.3",
+                "@types/node": "*",
+                "chalk": "^4.0.0",
+                "cjs-module-lexer": "^1.0.0",
+                "collect-v8-coverage": "^1.0.0",
+                "glob": "^7.1.3",
+                "graceful-fs": "^4.2.9",
+                "jest-haste-map": "^29.7.0",
+                "jest-message-util": "^29.7.0",
+                "jest-mock": "^29.7.0",
+                "jest-regex-util": "^29.6.3",
+                "jest-resolve": "^29.7.0",
+                "jest-snapshot": "^29.7.0",
+                "jest-util": "^29.7.0",
+                "slash": "^3.0.0",
+                "strip-bom": "^4.0.0"
+            },
+            "engines": {
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+            }
+        },
+        "node_modules/jest-snapshot": {
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz",
+            "integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/core": "^7.11.6",
+                "@babel/generator": "^7.7.2",
+                "@babel/plugin-syntax-jsx": "^7.7.2",
+                "@babel/plugin-syntax-typescript": "^7.7.2",
+                "@babel/types": "^7.3.3",
+                "@jest/expect-utils": "^29.7.0",
+                "@jest/transform": "^29.7.0",
+                "@jest/types": "^29.6.3",
+                "babel-preset-current-node-syntax": "^1.0.0",
+                "chalk": "^4.0.0",
+                "expect": "^29.7.0",
+                "graceful-fs": "^4.2.9",
+                "jest-diff": "^29.7.0",
+                "jest-get-type": "^29.6.3",
+                "jest-matcher-utils": "^29.7.0",
+                "jest-message-util": "^29.7.0",
+                "jest-util": "^29.7.0",
+                "natural-compare": "^1.4.0",
+                "pretty-format": "^29.7.0",
+                "semver": "^7.5.3"
+            },
+            "engines": {
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+            }
+        },
+        "node_modules/jest-util": {
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+            "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@jest/types": "^29.6.3",
+                "@types/node": "*",
+                "chalk": "^4.0.0",
+                "ci-info": "^3.2.0",
+                "graceful-fs": "^4.2.9",
+                "picomatch": "^2.2.3"
+            },
+            "engines": {
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+            }
+        },
+        "node_modules/jest-validate": {
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz",
+            "integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@jest/types": "^29.6.3",
+                "camelcase": "^6.2.0",
+                "chalk": "^4.0.0",
+                "jest-get-type": "^29.6.3",
+                "leven": "^3.1.0",
+                "pretty-format": "^29.7.0"
+            },
+            "engines": {
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+            }
+        },
+        "node_modules/jest-validate/node_modules/camelcase": {
+            "version": "6.3.0",
+            "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+            "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/jest-watcher": {
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz",
+            "integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@jest/test-result": "^29.7.0",
+                "@jest/types": "^29.6.3",
+                "@types/node": "*",
+                "ansi-escapes": "^4.2.1",
+                "chalk": "^4.0.0",
+                "emittery": "^0.13.1",
+                "jest-util": "^29.7.0",
+                "string-length": "^4.0.1"
+            },
+            "engines": {
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+            }
+        },
+        "node_modules/jest-worker": {
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz",
+            "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/node": "*",
+                "jest-util": "^29.7.0",
+                "merge-stream": "^2.0.0",
+                "supports-color": "^8.0.0"
+            },
+            "engines": {
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+            }
+        },
+        "node_modules/jest-worker/node_modules/supports-color": {
+            "version": "8.1.1",
+            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+            "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/supports-color?sponsor=1"
+            }
+        },
+        "node_modules/js-levenshtein": {
+            "version": "1.1.6",
+            "resolved": "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.6.tgz",
+            "integrity": "sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/js-tokens": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+            "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/js-yaml": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+            "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "argparse": "^2.0.1"
+            },
+            "bin": {
+                "js-yaml": "bin/js-yaml.js"
+            }
+        },
+        "node_modules/jsesc": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
+            "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",
+            "dev": true,
+            "license": "MIT",
+            "bin": {
+                "jsesc": "bin/jsesc"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/json-buffer": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
+            "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/json-parse-even-better-errors": {
+            "version": "2.3.1",
+            "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+            "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/json-schema-traverse": {
+            "version": "0.4.1",
+            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+            "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/json-stable-stringify-without-jsonify": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+            "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/json5": {
+            "version": "2.2.3",
+            "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+            "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+            "dev": true,
+            "license": "MIT",
+            "bin": {
+                "json5": "lib/cli.js"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/jsonfile": {
+            "version": "6.1.0",
+            "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+            "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "universalify": "^2.0.0"
+            },
+            "optionalDependencies": {
+                "graceful-fs": "^4.1.6"
+            }
+        },
+        "node_modules/keyv": {
+            "version": "4.5.4",
+            "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
+            "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "json-buffer": "3.0.1"
+            }
+        },
+        "node_modules/kind-of": {
+            "version": "6.0.3",
+            "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+            "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/kleur": {
+            "version": "3.0.3",
+            "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
+            "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/leven": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
+            "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/levn": {
+            "version": "0.4.1",
+            "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+            "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "prelude-ls": "^1.2.1",
+                "type-check": "~0.4.0"
+            },
+            "engines": {
+                "node": ">= 0.8.0"
+            }
+        },
+        "node_modules/lines-and-columns": {
+            "version": "1.2.4",
+            "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+            "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/loader-runner": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
+            "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6.11.5"
+            }
+        },
+        "node_modules/loader-utils": {
+            "version": "2.0.4",
+            "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+            "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "big.js": "^5.2.2",
+                "emojis-list": "^3.0.0",
+                "json5": "^2.1.2"
+            },
+            "engines": {
+                "node": ">=8.9.0"
+            }
+        },
+        "node_modules/locate-path": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+            "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "p-locate": "^5.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/lodash.memoize": {
+            "version": "4.1.2",
+            "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
+            "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/lodash.merge": {
+            "version": "4.6.2",
+            "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+            "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/lru-cache": {
+            "version": "5.1.1",
+            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+            "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "yallist": "^3.0.2"
+            }
+        },
+        "node_modules/make-dir": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
+            "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "semver": "^7.5.3"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/make-error": {
+            "version": "1.3.6",
+            "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
+            "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/makeerror": {
+            "version": "1.0.12",
+            "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
+            "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "tmpl": "1.0.5"
+            }
+        },
+        "node_modules/merge-stream": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+            "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/merge2": {
+            "version": "1.4.1",
+            "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+            "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/micromatch": {
+            "version": "4.0.8",
+            "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+            "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "braces": "^3.0.3",
+                "picomatch": "^2.3.1"
+            },
+            "engines": {
+                "node": ">=8.6"
+            }
+        },
+        "node_modules/mime-db": {
+            "version": "1.52.0",
+            "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+            "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/mime-types": {
+            "version": "2.1.35",
+            "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+            "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "mime-db": "1.52.0"
+            },
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/mimic-fn": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+            "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/mini-css-extract-plugin": {
+            "version": "2.9.2",
+            "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.2.tgz",
+            "integrity": "sha512-GJuACcS//jtq4kCtd5ii/M0SZf7OZRH+BxdqXZHaJfb8TJiVl+NgQRPwiYt2EuqeSkNydn/7vP+bcE27C5mb9w==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "schema-utils": "^4.0.0",
+                "tapable": "^2.2.1"
+            },
+            "engines": {
+                "node": ">= 12.13.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            },
+            "peerDependencies": {
+                "webpack": "^5.0.0"
+            }
+        },
+        "node_modules/mini-css-extract-plugin/node_modules/ajv": {
+            "version": "8.17.1",
+            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+            "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "fast-deep-equal": "^3.1.3",
+                "fast-uri": "^3.0.1",
+                "json-schema-traverse": "^1.0.0",
+                "require-from-string": "^2.0.2"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/epoberezkin"
+            }
+        },
+        "node_modules/mini-css-extract-plugin/node_modules/ajv-keywords": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+            "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "fast-deep-equal": "^3.1.3"
+            },
+            "peerDependencies": {
+                "ajv": "^8.8.2"
+            }
+        },
+        "node_modules/mini-css-extract-plugin/node_modules/json-schema-traverse": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+            "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/mini-css-extract-plugin/node_modules/schema-utils": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.0.tgz",
+            "integrity": "sha512-Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/json-schema": "^7.0.9",
+                "ajv": "^8.9.0",
+                "ajv-formats": "^2.1.1",
+                "ajv-keywords": "^5.1.0"
+            },
+            "engines": {
+                "node": ">= 10.13.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            }
+        },
+        "node_modules/minimatch": {
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+            "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "brace-expansion": "^1.1.7"
+            },
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/moment": {
+            "version": "2.29.4",
+            "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
+            "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/ms": {
+            "version": "2.1.3",
+            "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+            "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/nanoid": {
+            "version": "3.3.8",
+            "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
+            "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/ai"
+                }
+            ],
+            "license": "MIT",
+            "bin": {
+                "nanoid": "bin/nanoid.cjs"
+            },
+            "engines": {
+                "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+            }
+        },
+        "node_modules/natural-compare": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+            "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/neo-async": {
+            "version": "2.6.2",
+            "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
+            "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/node-addon-api": {
+            "version": "7.1.1",
+            "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz",
+            "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==",
+            "dev": true,
+            "license": "MIT",
+            "optional": true
+        },
+        "node_modules/node-int64": {
+            "version": "0.4.0",
+            "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
+            "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/node-releases": {
+            "version": "2.0.19",
+            "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
+            "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/normalize-path": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+            "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/npm-check-updates": {
+            "version": "17.1.14",
+            "resolved": "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-17.1.14.tgz",
+            "integrity": "sha512-dr4bXIxETubLI1tFGeock5hN8yVjahvaVpx+lPO4/O2md3zJuxB7FgH3MIoTvQSCgsgkIRpe0skti01IEAA5tA==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "bin": {
+                "ncu": "build/cli.js",
+                "npm-check-updates": "build/cli.js"
+            },
+            "engines": {
+                "node": "^18.18.0 || >=20.0.0",
+                "npm": ">=8.12.1"
+            }
+        },
+        "node_modules/npm-run-path": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+            "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "path-key": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/obsidian": {
+            "version": "1.8.7",
+            "resolved": "https://registry.npmjs.org/obsidian/-/obsidian-1.8.7.tgz",
+            "integrity": "sha512-h4bWwNFAGRXlMlMAzdEiIM2ppTGlrh7uGOJS6w4gClrsjc+ei/3YAtU2VdFUlCiPuTHpY4aBpFJJW75S1Tl/JA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/codemirror": "5.60.8",
+                "moment": "2.29.4"
+            },
+            "peerDependencies": {
+                "@codemirror/state": "^6.0.0",
+                "@codemirror/view": "^6.0.0"
+            }
+        },
+        "node_modules/once": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+            "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "wrappy": "1"
+            }
+        },
+        "node_modules/onetime": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+            "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "mimic-fn": "^2.1.0"
+            },
+            "engines": {
+                "node": ">=6"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/openapi-fetch": {
+            "version": "0.13.4",
+            "resolved": "https://registry.npmjs.org/openapi-fetch/-/openapi-fetch-0.13.4.tgz",
+            "integrity": "sha512-JHX7UYjLEiHuQGCPxa3CCCIqe/nc4bTIF9c4UYVC8BegAbWoS3g4gJxKX5XcG7UtYQs2060kY6DH64KkvNZahg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "openapi-typescript-helpers": "^0.0.15"
+            }
+        },
+        "node_modules/openapi-typescript": {
+            "version": "7.6.1",
+            "resolved": "https://registry.npmjs.org/openapi-typescript/-/openapi-typescript-7.6.1.tgz",
+            "integrity": "sha512-F7RXEeo/heF3O9lOXo2bNjCOtfp7u+D6W3a3VNEH2xE6v+fxLtn5nq0uvUcA1F5aT+CMhNeC5Uqtg5tlXFX/ag==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@redocly/openapi-core": "^1.28.0",
+                "ansi-colors": "^4.1.3",
+                "change-case": "^5.4.4",
+                "parse-json": "^8.1.0",
+                "supports-color": "^9.4.0",
+                "yargs-parser": "^21.1.1"
+            },
+            "bin": {
+                "openapi-typescript": "bin/cli.js"
+            },
+            "peerDependencies": {
+                "typescript": "^5.x"
+            }
+        },
+        "node_modules/openapi-typescript-helpers": {
+            "version": "0.0.15",
+            "resolved": "https://registry.npmjs.org/openapi-typescript-helpers/-/openapi-typescript-helpers-0.0.15.tgz",
+            "integrity": "sha512-opyTPaunsklCBpTK8JGef6mfPhLSnyy5a0IN9vKtx3+4aExf+KxEqYwIy3hqkedXIB97u357uLMJsOnm3GVjsw==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/openapi-typescript/node_modules/parse-json": {
+            "version": "8.1.0",
+            "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-8.1.0.tgz",
+            "integrity": "sha512-rum1bPifK5SSar35Z6EKZuYPJx85pkNaFrxBK3mwdfSJ1/WKbYrjoW/zTPSjRRamfmVX1ACBIdFAO0VRErW/EA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/code-frame": "^7.22.13",
+                "index-to-position": "^0.1.2",
+                "type-fest": "^4.7.1"
+            },
+            "engines": {
+                "node": ">=18"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/openapi-typescript/node_modules/supports-color": {
+            "version": "9.4.0",
+            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-9.4.0.tgz",
+            "integrity": "sha512-VL+lNrEoIXww1coLPOmiEmK/0sGigko5COxI09KzHc2VJXJsQ37UaQ+8quuxjDeA7+KnLGTWRyOXSLLR2Wb4jw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/supports-color?sponsor=1"
+            }
+        },
+        "node_modules/openapi-typescript/node_modules/type-fest": {
+            "version": "4.35.0",
+            "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.35.0.tgz",
+            "integrity": "sha512-2/AwEFQDFEy30iOLjrvHDIH7e4HEWH+f1Yl1bI5XMqzuoCUqwYCdxachgsgv0og/JdVZUhbfjcJAoHj5L1753A==",
+            "dev": true,
+            "license": "(MIT OR CC0-1.0)",
+            "engines": {
+                "node": ">=16"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/optionator": {
+            "version": "0.9.4",
+            "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
+            "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "deep-is": "^0.1.3",
+                "fast-levenshtein": "^2.0.6",
+                "levn": "^0.4.1",
+                "prelude-ls": "^1.2.1",
+                "type-check": "^0.4.0",
+                "word-wrap": "^1.2.5"
+            },
+            "engines": {
+                "node": ">= 0.8.0"
+            }
+        },
+        "node_modules/p-limit": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+            "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "yocto-queue": "^0.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/p-locate": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+            "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "p-limit": "^3.0.2"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/p-queue": {
+            "version": "8.1.0",
+            "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-8.1.0.tgz",
+            "integrity": "sha512-mxLDbbGIBEXTJL0zEx8JIylaj3xQ7Z/7eEVjcF9fJX4DBiH9oqe+oahYnlKKxm0Ci9TlWTyhSHgygxMxjIB2jw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "eventemitter3": "^5.0.1",
+                "p-timeout": "^6.1.2"
+            },
+            "engines": {
+                "node": ">=18"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/p-timeout": {
+            "version": "6.1.4",
+            "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-6.1.4.tgz",
+            "integrity": "sha512-MyIV3ZA/PmyBN/ud8vV9XzwTrNtR4jFrObymZYnZqMmW0zA8Z17vnT0rBgFE/TlohB+YCHqXMgZzb3Csp49vqg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=14.16"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/p-try": {
+            "version": "2.2.0",
+            "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+            "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/parent-module": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+            "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "callsites": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/parse-json": {
+            "version": "5.2.0",
+            "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+            "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/code-frame": "^7.0.0",
+                "error-ex": "^1.3.1",
+                "json-parse-even-better-errors": "^2.3.0",
+                "lines-and-columns": "^1.1.6"
+            },
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/path-exists": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+            "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/path-is-absolute": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+            "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/path-key": {
+            "version": "3.1.1",
+            "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+            "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/path-parse": {
+            "version": "1.0.7",
+            "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+            "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/picocolors": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+            "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/picomatch": {
+            "version": "2.3.1",
+            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+            "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8.6"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/jonschlinkert"
+            }
+        },
+        "node_modules/pirates": {
+            "version": "4.0.6",
+            "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
+            "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/pkg-dir": {
+            "version": "4.2.0",
+            "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+            "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "find-up": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/pkg-dir/node_modules/find-up": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+            "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "locate-path": "^5.0.0",
+                "path-exists": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/pkg-dir/node_modules/locate-path": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+            "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "p-locate": "^4.1.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/pkg-dir/node_modules/p-limit": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+            "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "p-try": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=6"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/pkg-dir/node_modules/p-locate": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+            "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "p-limit": "^2.2.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/pluralize": {
+            "version": "8.0.0",
+            "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-8.0.0.tgz",
+            "integrity": "sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/postcss": {
+            "version": "8.5.2",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.2.tgz",
+            "integrity": "sha512-MjOadfU3Ys9KYoX0AdkBlFEF1Vx37uCCeN4ZHnmwm9FfpbsGWMZeBLMmmpY+6Ocqod7mkdZ0DT31OlbsFrLlkA==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/postcss/"
+                },
+                {
+                    "type": "tidelift",
+                    "url": "https://tidelift.com/funding/github/npm/postcss"
+                },
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/ai"
+                }
+            ],
+            "license": "MIT",
+            "dependencies": {
+                "nanoid": "^3.3.8",
+                "picocolors": "^1.1.1",
+                "source-map-js": "^1.2.1"
+            },
+            "engines": {
+                "node": "^10 || ^12 || >=14"
+            }
+        },
+        "node_modules/postcss-modules-extract-imports": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.1.0.tgz",
+            "integrity": "sha512-k3kNe0aNFQDAZGbin48pL2VNidTF0w4/eASDsxlyspobzU3wZQLOGj7L9gfRe0Jo9/4uud09DsjFNH7winGv8Q==",
+            "dev": true,
+            "license": "ISC",
+            "engines": {
+                "node": "^10 || ^12 || >= 14"
+            },
+            "peerDependencies": {
+                "postcss": "^8.1.0"
+            }
+        },
+        "node_modules/postcss-modules-local-by-default": {
+            "version": "4.2.0",
+            "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.2.0.tgz",
+            "integrity": "sha512-5kcJm/zk+GJDSfw+V/42fJ5fhjL5YbFDl8nVdXkJPLLW+Vf9mTD5Xe0wqIaDnLuL2U6cDNpTr+UQ+v2HWIBhzw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "icss-utils": "^5.0.0",
+                "postcss-selector-parser": "^7.0.0",
+                "postcss-value-parser": "^4.1.0"
+            },
+            "engines": {
+                "node": "^10 || ^12 || >= 14"
+            },
+            "peerDependencies": {
+                "postcss": "^8.1.0"
+            }
+        },
+        "node_modules/postcss-modules-scope": {
+            "version": "3.2.1",
+            "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.2.1.tgz",
+            "integrity": "sha512-m9jZstCVaqGjTAuny8MdgE88scJnCiQSlSrOWcTQgM2t32UBe+MUmFSO5t7VMSfAf/FJKImAxBav8ooCHJXCJA==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "postcss-selector-parser": "^7.0.0"
+            },
+            "engines": {
+                "node": "^10 || ^12 || >= 14"
+            },
+            "peerDependencies": {
+                "postcss": "^8.1.0"
+            }
+        },
+        "node_modules/postcss-modules-values": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
+            "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "icss-utils": "^5.0.0"
+            },
+            "engines": {
+                "node": "^10 || ^12 || >= 14"
+            },
+            "peerDependencies": {
+                "postcss": "^8.1.0"
+            }
+        },
+        "node_modules/postcss-selector-parser": {
+            "version": "7.1.0",
+            "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
+            "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "cssesc": "^3.0.0",
+                "util-deprecate": "^1.0.2"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/postcss-value-parser": {
+            "version": "4.2.0",
+            "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+            "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/prelude-ls": {
+            "version": "1.2.1",
+            "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+            "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.8.0"
+            }
+        },
+        "node_modules/prettier": {
+            "version": "3.5.1",
+            "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.1.tgz",
+            "integrity": "sha512-hPpFQvHwL3Qv5AdRvBFMhnKo4tYxp0ReXiPn2bxkiohEX6mBeBwEpBSQTkD458RaaDKQMYSp4hX4UtfUTA5wDw==",
+            "dev": true,
+            "license": "MIT",
+            "bin": {
+                "prettier": "bin/prettier.cjs"
+            },
+            "engines": {
+                "node": ">=14"
+            },
+            "funding": {
+                "url": "https://github.com/prettier/prettier?sponsor=1"
+            }
+        },
+        "node_modules/pretty-format": {
+            "version": "29.7.0",
+            "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
+            "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@jest/schemas": "^29.6.3",
+                "ansi-styles": "^5.0.0",
+                "react-is": "^18.0.0"
+            },
+            "engines": {
+                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+            }
+        },
+        "node_modules/pretty-format/node_modules/ansi-styles": {
+            "version": "5.2.0",
+            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+            "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+            }
+        },
+        "node_modules/prompts": {
+            "version": "2.4.2",
+            "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
+            "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "kleur": "^3.0.3",
+                "sisteransi": "^1.0.5"
+            },
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/punycode": {
+            "version": "2.3.1",
+            "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+            "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/pure-rand": {
+            "version": "6.1.0",
+            "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.1.0.tgz",
+            "integrity": "sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "individual",
+                    "url": "https://github.com/sponsors/dubzzz"
+                },
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/fast-check"
+                }
+            ],
+            "license": "MIT"
+        },
+        "node_modules/queue-microtask": {
+            "version": "1.2.3",
+            "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+            "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+            "dev": true,
+            "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"
+        },
+        "node_modules/randombytes": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+            "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "safe-buffer": "^5.1.0"
+            }
+        },
+        "node_modules/react-is": {
+            "version": "18.3.1",
+            "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
+            "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/readdirp": {
+            "version": "4.1.2",
+            "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz",
+            "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 14.18.0"
+            },
+            "funding": {
+                "type": "individual",
+                "url": "https://paulmillr.com/funding/"
+            }
+        },
+        "node_modules/rechoir": {
+            "version": "0.8.0",
+            "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.8.0.tgz",
+            "integrity": "sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "resolve": "^1.20.0"
+            },
+            "engines": {
+                "node": ">= 10.13.0"
+            }
+        },
+        "node_modules/regex-parser": {
+            "version": "2.3.1",
+            "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.3.1.tgz",
+            "integrity": "sha512-yXLRqatcCuKtVHsWrNg0JL3l1zGfdXeEvDa0bdu4tCDQw0RpMDZsqbkyRTUnKMR0tXF627V2oEWjBEaEdqTwtQ==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/request-animation-frame-timeout": {
+            "version": "2.0.4",
+            "resolved": "https://registry.npmjs.org/request-animation-frame-timeout/-/request-animation-frame-timeout-2.0.4.tgz",
+            "integrity": "sha512-5oYwRBYjrMSU/YHHXj5AM/nv96ZE0b8WZoA3FqnkeDDPXoprxUCZFK4IWZTl+y3RJQtaihiJPiKOB4NZfZ7C7A==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/require-directory": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+            "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/require-from-string": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+            "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/resolve": {
+            "version": "1.22.10",
+            "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz",
+            "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "is-core-module": "^2.16.0",
+                "path-parse": "^1.0.7",
+                "supports-preserve-symlinks-flag": "^1.0.0"
+            },
+            "bin": {
+                "resolve": "bin/resolve"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/resolve-cwd": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
+            "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "resolve-from": "^5.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/resolve-cwd/node_modules/resolve-from": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+            "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/resolve-from": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+            "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/resolve-url-loader": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-5.0.0.tgz",
+            "integrity": "sha512-uZtduh8/8srhBoMx//5bwqjQ+rfYOUq8zC9NrMUGtjBiGTtFJM42s58/36+hTqeqINcnYe08Nj3LkK9lW4N8Xg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "adjust-sourcemap-loader": "^4.0.0",
+                "convert-source-map": "^1.7.0",
+                "loader-utils": "^2.0.0",
+                "postcss": "^8.2.14",
+                "source-map": "0.6.1"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/resolve-url-loader/node_modules/convert-source-map": {
+            "version": "1.9.0",
+            "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
+            "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/resolve.exports": {
+            "version": "2.0.3",
+            "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.3.tgz",
+            "integrity": "sha512-OcXjMsGdhL4XnbShKpAcSqPMzQoYkYyhbEaeSko47MjRP9NfEQMhZkXL1DoFlt9LWQn4YttrdnV6X2OiyzBi+A==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/reusify": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+            "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "iojs": ">=1.0.0",
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/run-parallel": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+            "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+            "dev": true,
+            "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": {
+                "queue-microtask": "^1.2.2"
+            }
+        },
+        "node_modules/safe-buffer": {
+            "version": "5.2.1",
+            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+            "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+            "dev": true,
+            "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"
+        },
+        "node_modules/sass": {
+            "version": "1.85.0",
+            "resolved": "https://registry.npmjs.org/sass/-/sass-1.85.0.tgz",
+            "integrity": "sha512-3ToiC1xZ1Y8aU7+CkgCI/tqyuPXEmYGJXO7H4uqp0xkLXUqp88rQQ4j1HmP37xSJLbCJPaIiv+cT1y+grssrww==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "chokidar": "^4.0.0",
+                "immutable": "^5.0.2",
+                "source-map-js": ">=0.6.2 <2.0.0"
+            },
+            "bin": {
+                "sass": "sass.js"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            },
+            "optionalDependencies": {
+                "@parcel/watcher": "^2.4.1"
+            }
+        },
+        "node_modules/sass-loader": {
+            "version": "16.0.5",
+            "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-16.0.5.tgz",
+            "integrity": "sha512-oL+CMBXrj6BZ/zOq4os+UECPL+bWqt6OAC6DWS8Ln8GZRcMDjlJ4JC3FBDuHJdYaFWIdKNIBYmtZtK2MaMkNIw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "neo-async": "^2.6.2"
+            },
+            "engines": {
+                "node": ">= 18.12.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            },
+            "peerDependencies": {
+                "@rspack/core": "0.x || 1.x",
+                "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0",
+                "sass": "^1.3.0",
+                "sass-embedded": "*",
+                "webpack": "^5.0.0"
+            },
+            "peerDependenciesMeta": {
+                "@rspack/core": {
+                    "optional": true
+                },
+                "node-sass": {
+                    "optional": true
+                },
+                "sass": {
+                    "optional": true
+                },
+                "sass-embedded": {
+                    "optional": true
+                },
+                "webpack": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/schema-utils": {
+            "version": "3.3.0",
+            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+            "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/json-schema": "^7.0.8",
+                "ajv": "^6.12.5",
+                "ajv-keywords": "^3.5.2"
+            },
+            "engines": {
+                "node": ">= 10.13.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            }
+        },
+        "node_modules/semver": {
+            "version": "7.7.1",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
+            "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
+            "dev": true,
+            "license": "ISC",
+            "bin": {
+                "semver": "bin/semver.js"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/serialize-javascript": {
+            "version": "6.0.2",
+            "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
+            "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "randombytes": "^2.1.0"
+            }
+        },
+        "node_modules/shallow-clone": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
+            "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "kind-of": "^6.0.2"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/shebang-command": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+            "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "shebang-regex": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/shebang-regex": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+            "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/signal-exit": {
+            "version": "3.0.7",
+            "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+            "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/sisteransi": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
+            "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/slash": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+            "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/source-map": {
+            "version": "0.6.1",
+            "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+            "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/source-map-js": {
+            "version": "1.2.1",
+            "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
+            "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/source-map-support": {
+            "version": "0.5.13",
+            "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
+            "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "buffer-from": "^1.0.0",
+                "source-map": "^0.6.0"
+            }
+        },
+        "node_modules/sprintf-js": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+            "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
+            "dev": true,
+            "license": "BSD-3-Clause"
+        },
+        "node_modules/stack-utils": {
+            "version": "2.0.6",
+            "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
+            "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "escape-string-regexp": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/stack-utils/node_modules/escape-string-regexp": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+            "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/string-length": {
+            "version": "4.0.2",
+            "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
+            "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "char-regex": "^1.0.2",
+                "strip-ansi": "^6.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/string-width": {
+            "version": "4.2.3",
+            "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+            "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "emoji-regex": "^8.0.0",
+                "is-fullwidth-code-point": "^3.0.0",
+                "strip-ansi": "^6.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/strip-ansi": {
+            "version": "6.0.1",
+            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-regex": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/strip-bom": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
+            "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/strip-final-newline": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+            "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/strip-json-comments": {
+            "version": "3.1.1",
+            "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+            "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/style-mod": {
+            "version": "4.1.2",
+            "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.1.2.tgz",
+            "integrity": "sha512-wnD1HyVqpJUI2+eKZ+eo1UwghftP6yuFheBqqe+bWCotBjC2K1YnteJILRMs3SM4V/0dLEW1SC27MWP5y+mwmw==",
+            "dev": true,
+            "license": "MIT",
+            "peer": true
+        },
+        "node_modules/supports-color": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/supports-preserve-symlinks-flag": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+            "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/sync_lib": {
+            "resolved": "backend/sync_lib/pkg",
+            "link": true
+        },
+        "node_modules/sync-client": {
+            "resolved": "sync-client",
+            "link": true
+        },
+        "node_modules/tapable": {
+            "version": "2.2.1",
+            "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
+            "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/terser": {
+            "version": "5.39.0",
+            "resolved": "https://registry.npmjs.org/terser/-/terser-5.39.0.tgz",
+            "integrity": "sha512-LBAhFyLho16harJoWMg/nZsQYgTrg5jXOn2nCYjRUcZZEdE3qa2zb8QEDRUGVZBW4rlazf2fxkg8tztybTaqWw==",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "dependencies": {
+                "@jridgewell/source-map": "^0.3.3",
+                "acorn": "^8.8.2",
+                "commander": "^2.20.0",
+                "source-map-support": "~0.5.20"
+            },
+            "bin": {
+                "terser": "bin/terser"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/terser-webpack-plugin": {
+            "version": "5.3.11",
+            "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.11.tgz",
+            "integrity": "sha512-RVCsMfuD0+cTt3EwX8hSl2Ks56EbFHWmhluwcqoPKtBnfjiT6olaq7PRIRfhyU8nnC2MrnDrBLfrD/RGE+cVXQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@jridgewell/trace-mapping": "^0.3.25",
+                "jest-worker": "^27.4.5",
+                "schema-utils": "^4.3.0",
+                "serialize-javascript": "^6.0.2",
+                "terser": "^5.31.1"
+            },
+            "engines": {
+                "node": ">= 10.13.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            },
+            "peerDependencies": {
+                "webpack": "^5.1.0"
+            },
+            "peerDependenciesMeta": {
+                "@swc/core": {
+                    "optional": true
+                },
+                "esbuild": {
+                    "optional": true
+                },
+                "uglify-js": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/terser-webpack-plugin/node_modules/ajv": {
+            "version": "8.17.1",
+            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+            "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "fast-deep-equal": "^3.1.3",
+                "fast-uri": "^3.0.1",
+                "json-schema-traverse": "^1.0.0",
+                "require-from-string": "^2.0.2"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/epoberezkin"
+            }
+        },
+        "node_modules/terser-webpack-plugin/node_modules/ajv-keywords": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+            "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "fast-deep-equal": "^3.1.3"
+            },
+            "peerDependencies": {
+                "ajv": "^8.8.2"
+            }
+        },
+        "node_modules/terser-webpack-plugin/node_modules/jest-worker": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
+            "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/node": "*",
+                "merge-stream": "^2.0.0",
+                "supports-color": "^8.0.0"
+            },
+            "engines": {
+                "node": ">= 10.13.0"
+            }
+        },
+        "node_modules/terser-webpack-plugin/node_modules/json-schema-traverse": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+            "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/terser-webpack-plugin/node_modules/schema-utils": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.0.tgz",
+            "integrity": "sha512-Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/json-schema": "^7.0.9",
+                "ajv": "^8.9.0",
+                "ajv-formats": "^2.1.1",
+                "ajv-keywords": "^5.1.0"
+            },
+            "engines": {
+                "node": ">= 10.13.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            }
+        },
+        "node_modules/terser-webpack-plugin/node_modules/supports-color": {
+            "version": "8.1.1",
+            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+            "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/supports-color?sponsor=1"
+            }
+        },
+        "node_modules/terser/node_modules/source-map-support": {
+            "version": "0.5.21",
+            "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+            "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "buffer-from": "^1.0.0",
+                "source-map": "^0.6.0"
+            }
+        },
+        "node_modules/test-exclude": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
+            "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "@istanbuljs/schema": "^0.1.2",
+                "glob": "^7.1.4",
+                "minimatch": "^3.0.4"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/tmpl": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
+            "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
+            "dev": true,
+            "license": "BSD-3-Clause"
+        },
+        "node_modules/to-regex-range": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+            "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "is-number": "^7.0.0"
+            },
+            "engines": {
+                "node": ">=8.0"
+            }
+        },
+        "node_modules/ts-api-utils": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.0.1.tgz",
+            "integrity": "sha512-dnlgjFSVetynI8nzgJ+qF62efpglpWRk8isUEWZGWlJYySCTD6aKvbUDu+zbPeDakk3bg5H4XpitHukgfL1m9w==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=18.12"
+            },
+            "peerDependencies": {
+                "typescript": ">=4.8.4"
+            }
+        },
+        "node_modules/ts-jest": {
+            "version": "29.2.5",
+            "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.2.5.tgz",
+            "integrity": "sha512-KD8zB2aAZrcKIdGk4OwpJggeLcH1FgrICqDSROWqlnJXGCXK4Mn6FcdK2B6670Xr73lHMG1kHw8R87A0ecZ+vA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "bs-logger": "^0.2.6",
+                "ejs": "^3.1.10",
+                "fast-json-stable-stringify": "^2.1.0",
+                "jest-util": "^29.0.0",
+                "json5": "^2.2.3",
+                "lodash.memoize": "^4.1.2",
+                "make-error": "^1.3.6",
+                "semver": "^7.6.3",
+                "yargs-parser": "^21.1.1"
+            },
+            "bin": {
+                "ts-jest": "cli.js"
+            },
+            "engines": {
+                "node": "^14.15.0 || ^16.10.0 || ^18.0.0 || >=20.0.0"
+            },
+            "peerDependencies": {
+                "@babel/core": ">=7.0.0-beta.0 <8",
+                "@jest/transform": "^29.0.0",
+                "@jest/types": "^29.0.0",
+                "babel-jest": "^29.0.0",
+                "jest": "^29.0.0",
+                "typescript": ">=4.3 <6"
+            },
+            "peerDependenciesMeta": {
+                "@babel/core": {
+                    "optional": true
+                },
+                "@jest/transform": {
+                    "optional": true
+                },
+                "@jest/types": {
+                    "optional": true
+                },
+                "babel-jest": {
+                    "optional": true
+                },
+                "esbuild": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/ts-loader": {
+            "version": "9.5.2",
+            "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.5.2.tgz",
+            "integrity": "sha512-Qo4piXvOTWcMGIgRiuFa6nHNm+54HbYaZCKqc9eeZCLRy3XqafQgwX2F7mofrbJG3g7EEb+lkiR+z2Lic2s3Zw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "chalk": "^4.1.0",
+                "enhanced-resolve": "^5.0.0",
+                "micromatch": "^4.0.0",
+                "semver": "^7.3.4",
+                "source-map": "^0.7.4"
+            },
+            "engines": {
+                "node": ">=12.0.0"
+            },
+            "peerDependencies": {
+                "typescript": "*",
+                "webpack": "^5.0.0"
+            }
+        },
+        "node_modules/ts-loader/node_modules/source-map": {
+            "version": "0.7.4",
+            "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
+            "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/tslib": {
+            "version": "2.8.1",
+            "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+            "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+            "dev": true,
+            "license": "0BSD"
+        },
+        "node_modules/type-check": {
+            "version": "0.4.0",
+            "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+            "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "prelude-ls": "^1.2.1"
+            },
+            "engines": {
+                "node": ">= 0.8.0"
+            }
+        },
+        "node_modules/type-detect": {
+            "version": "4.0.8",
+            "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+            "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/type-fest": {
+            "version": "0.21.3",
+            "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+            "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+            "dev": true,
+            "license": "(MIT OR CC0-1.0)",
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/typescript": {
+            "version": "5.7.3",
+            "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.3.tgz",
+            "integrity": "sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "bin": {
+                "tsc": "bin/tsc",
+                "tsserver": "bin/tsserver"
+            },
+            "engines": {
+                "node": ">=14.17"
+            }
+        },
+        "node_modules/typescript-eslint": {
+            "version": "8.24.1",
+            "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.24.1.tgz",
+            "integrity": "sha512-cw3rEdzDqBs70TIcb0Gdzbt6h11BSs2pS0yaq7hDWDBtCCSei1pPSUXE9qUdQ/Wm9NgFg8mKtMt1b8fTHIl1jA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@typescript-eslint/eslint-plugin": "8.24.1",
+                "@typescript-eslint/parser": "8.24.1",
+                "@typescript-eslint/utils": "8.24.1"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            },
+            "peerDependencies": {
+                "eslint": "^8.57.0 || ^9.0.0",
+                "typescript": ">=4.8.4 <5.8.0"
+            }
+        },
+        "node_modules/undici-types": {
+            "version": "6.20.0",
+            "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
+            "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/universalify": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+            "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 10.0.0"
+            }
+        },
+        "node_modules/update-browserslist-db": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.2.tgz",
+            "integrity": "sha512-PPypAm5qvlD7XMZC3BujecnaOxwhrtoFR+Dqkk5Aa/6DssiH0ibKoketaj9w8LP7Bont1rYeoV5plxD7RTEPRg==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/browserslist"
+                },
+                {
+                    "type": "tidelift",
+                    "url": "https://tidelift.com/funding/github/npm/browserslist"
+                },
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/ai"
+                }
+            ],
+            "license": "MIT",
+            "dependencies": {
+                "escalade": "^3.2.0",
+                "picocolors": "^1.1.1"
+            },
+            "bin": {
+                "update-browserslist-db": "cli.js"
+            },
+            "peerDependencies": {
+                "browserslist": ">= 4.21.0"
+            }
+        },
+        "node_modules/uri-js": {
+            "version": "4.4.1",
+            "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+            "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "dependencies": {
+                "punycode": "^2.1.0"
+            }
+        },
+        "node_modules/uri-js-replace": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/uri-js-replace/-/uri-js-replace-1.0.1.tgz",
+            "integrity": "sha512-W+C9NWNLFOoBI2QWDp4UT9pv65r2w5Cx+3sTYFvtMdDBxkKt1syCqsUdSFAChbEe1uK5TfS04wt/nGwmaeIQ0g==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/util-deprecate": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+            "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/v8-to-istanbul": {
+            "version": "9.3.0",
+            "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz",
+            "integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "@jridgewell/trace-mapping": "^0.3.12",
+                "@types/istanbul-lib-coverage": "^2.0.1",
+                "convert-source-map": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=10.12.0"
+            }
+        },
+        "node_modules/vault-link-obsidian-plugin": {
+            "resolved": "obsidian-plugin",
+            "link": true
+        },
+        "node_modules/virtual-scroller": {
+            "version": "1.13.1",
+            "resolved": "https://registry.npmjs.org/virtual-scroller/-/virtual-scroller-1.13.1.tgz",
+            "integrity": "sha512-sui46QUBOIfHyXYjdGkxoze/GlCZFUFRxzxEvsu06UQ4iPc3uRfGnm/Qj7195hiMVOYQW9lDn+m3sD7sRMYdYg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "request-animation-frame-timeout": "^2.0.3"
+            }
+        },
+        "node_modules/w3c-keyname": {
+            "version": "2.2.8",
+            "resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.8.tgz",
+            "integrity": "sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==",
+            "dev": true,
+            "license": "MIT",
+            "peer": true
+        },
+        "node_modules/walker": {
+            "version": "1.0.8",
+            "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
+            "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "makeerror": "1.0.12"
+            }
+        },
+        "node_modules/watchpack": {
+            "version": "2.4.2",
+            "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz",
+            "integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "glob-to-regexp": "^0.4.1",
+                "graceful-fs": "^4.1.2"
+            },
+            "engines": {
+                "node": ">=10.13.0"
+            }
+        },
+        "node_modules/webpack": {
+            "version": "5.98.0",
+            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.98.0.tgz",
+            "integrity": "sha512-UFynvx+gM44Gv9qFgj0acCQK2VE1CtdfwFdimkapco3hlPCJ/zeq73n2yVKimVbtm+TnApIugGhLJnkU6gjYXA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/eslint-scope": "^3.7.7",
+                "@types/estree": "^1.0.6",
+                "@webassemblyjs/ast": "^1.14.1",
+                "@webassemblyjs/wasm-edit": "^1.14.1",
+                "@webassemblyjs/wasm-parser": "^1.14.1",
+                "acorn": "^8.14.0",
+                "browserslist": "^4.24.0",
+                "chrome-trace-event": "^1.0.2",
+                "enhanced-resolve": "^5.17.1",
+                "es-module-lexer": "^1.2.1",
+                "eslint-scope": "5.1.1",
+                "events": "^3.2.0",
+                "glob-to-regexp": "^0.4.1",
+                "graceful-fs": "^4.2.11",
+                "json-parse-even-better-errors": "^2.3.1",
+                "loader-runner": "^4.2.0",
+                "mime-types": "^2.1.27",
+                "neo-async": "^2.6.2",
+                "schema-utils": "^4.3.0",
+                "tapable": "^2.1.1",
+                "terser-webpack-plugin": "^5.3.11",
+                "watchpack": "^2.4.1",
+                "webpack-sources": "^3.2.3"
+            },
+            "bin": {
+                "webpack": "bin/webpack.js"
+            },
+            "engines": {
+                "node": ">=10.13.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            },
+            "peerDependenciesMeta": {
+                "webpack-cli": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/webpack-cli": {
+            "version": "6.0.1",
+            "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-6.0.1.tgz",
+            "integrity": "sha512-MfwFQ6SfwinsUVi0rNJm7rHZ31GyTcpVE5pgVA3hwFRb7COD4TzjUUwhGWKfO50+xdc2MQPuEBBJoqIMGt3JDw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@discoveryjs/json-ext": "^0.6.1",
+                "@webpack-cli/configtest": "^3.0.1",
+                "@webpack-cli/info": "^3.0.1",
+                "@webpack-cli/serve": "^3.0.1",
+                "colorette": "^2.0.14",
+                "commander": "^12.1.0",
+                "cross-spawn": "^7.0.3",
+                "envinfo": "^7.14.0",
+                "fastest-levenshtein": "^1.0.12",
+                "import-local": "^3.0.2",
+                "interpret": "^3.1.1",
+                "rechoir": "^0.8.0",
+                "webpack-merge": "^6.0.1"
+            },
+            "bin": {
+                "webpack-cli": "bin/cli.js"
+            },
+            "engines": {
+                "node": ">=18.12.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            },
+            "peerDependencies": {
+                "webpack": "^5.82.0"
+            },
+            "peerDependenciesMeta": {
+                "webpack-bundle-analyzer": {
+                    "optional": true
+                },
+                "webpack-dev-server": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/webpack-cli/node_modules/colorette": {
+            "version": "2.0.20",
+            "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
+            "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/webpack-cli/node_modules/commander": {
+            "version": "12.1.0",
+            "resolved": "https://registry.npmjs.org/commander/-/commander-12.1.0.tgz",
+            "integrity": "sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/webpack-merge": {
+            "version": "6.0.1",
+            "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-6.0.1.tgz",
+            "integrity": "sha512-hXXvrjtx2PLYx4qruKl+kyRSLc52V+cCvMxRjmKwoA+CBbbF5GfIBtR6kCvl0fYGqTUPKB+1ktVmTHqMOzgCBg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "clone-deep": "^4.0.1",
+                "flat": "^5.0.2",
+                "wildcard": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/webpack-sources": {
+            "version": "3.2.3",
+            "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
+            "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=10.13.0"
+            }
+        },
+        "node_modules/webpack/node_modules/ajv": {
+            "version": "8.17.1",
+            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+            "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "fast-deep-equal": "^3.1.3",
+                "fast-uri": "^3.0.1",
+                "json-schema-traverse": "^1.0.0",
+                "require-from-string": "^2.0.2"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/epoberezkin"
+            }
+        },
+        "node_modules/webpack/node_modules/ajv-keywords": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+            "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "fast-deep-equal": "^3.1.3"
+            },
+            "peerDependencies": {
+                "ajv": "^8.8.2"
+            }
+        },
+        "node_modules/webpack/node_modules/eslint-scope": {
+            "version": "5.1.1",
+            "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+            "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "dependencies": {
+                "esrecurse": "^4.3.0",
+                "estraverse": "^4.1.1"
+            },
+            "engines": {
+                "node": ">=8.0.0"
+            }
+        },
+        "node_modules/webpack/node_modules/estraverse": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+            "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "engines": {
+                "node": ">=4.0"
+            }
+        },
+        "node_modules/webpack/node_modules/json-schema-traverse": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+            "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/webpack/node_modules/schema-utils": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.0.tgz",
+            "integrity": "sha512-Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/json-schema": "^7.0.9",
+                "ajv": "^8.9.0",
+                "ajv-formats": "^2.1.1",
+                "ajv-keywords": "^5.1.0"
+            },
+            "engines": {
+                "node": ">= 10.13.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            }
+        },
+        "node_modules/which": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+            "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "isexe": "^2.0.0"
+            },
+            "bin": {
+                "node-which": "bin/node-which"
+            },
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/wildcard": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz",
+            "integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/word-wrap": {
+            "version": "1.2.5",
+            "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
+            "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/wrap-ansi": {
+            "version": "7.0.0",
+            "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+            "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-styles": "^4.0.0",
+                "string-width": "^4.1.0",
+                "strip-ansi": "^6.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+            }
+        },
+        "node_modules/wrappy": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+            "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/write-file-atomic": {
+            "version": "4.0.2",
+            "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
+            "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "imurmurhash": "^0.1.4",
+                "signal-exit": "^3.0.7"
+            },
+            "engines": {
+                "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+            }
+        },
+        "node_modules/y18n": {
+            "version": "5.0.8",
+            "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+            "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+            "dev": true,
+            "license": "ISC",
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/yallist": {
+            "version": "3.1.1",
+            "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+            "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/yaml-ast-parser": {
+            "version": "0.0.43",
+            "resolved": "https://registry.npmjs.org/yaml-ast-parser/-/yaml-ast-parser-0.0.43.tgz",
+            "integrity": "sha512-2PTINUwsRqSd+s8XxKaJWQlUuEMHJQyEuh2edBbW8KNJz0SJPwUSD2zRWqezFEdN7IzAgeuYHFUCF7o8zRdZ0A==",
+            "dev": true,
+            "license": "Apache-2.0"
+        },
+        "node_modules/yargs": {
+            "version": "17.7.2",
+            "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+            "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "cliui": "^8.0.1",
+                "escalade": "^3.1.1",
+                "get-caller-file": "^2.0.5",
+                "require-directory": "^2.1.1",
+                "string-width": "^4.2.3",
+                "y18n": "^5.0.5",
+                "yargs-parser": "^21.1.1"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/yargs-parser": {
+            "version": "21.1.1",
+            "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+            "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+            "dev": true,
+            "license": "ISC",
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/yocto-queue": {
+            "version": "0.1.0",
+            "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+            "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "obsidian-plugin": {
+            "name": "vault-link-obsidian-plugin",
+            "version": "0.0.30",
+            "license": "MIT",
+            "devDependencies": {
+                "@types/jest": "^29.5.14",
+                "@types/node": "^22.13.4",
+                "css-loader": "^7.1.2",
+                "date-fns": "^4.1.0",
+                "file-loader": "^6.2.0",
+                "fs-extra": "^11.3.0",
+                "jest": "^29.7.0",
+                "mini-css-extract-plugin": "^2.9.2",
+                "obsidian": "1.8.7",
+                "resolve-url-loader": "^5.0.0",
+                "sass": "^1.85.0",
+                "sass-loader": "^16.0.5",
+                "sync-client": "file:../sync-client",
+                "terser-webpack-plugin": "^5.3.11",
+                "ts-jest": "^29.2.5",
+                "ts-loader": "^9.5.2",
+                "tslib": "2.8.1",
+                "typescript": "5.7.3",
+                "virtual-scroller": "^1.13.1",
+                "webpack": "^5.98.0",
+                "webpack-cli": "^6.0.1"
+            }
+        },
+        "sync-client": {
+            "version": "1.0.0",
+            "devDependencies": {
+                "@types/jest": "^29.5.14",
+                "@types/node": "^22.13.4",
+                "byte-base64": "^1.1.0",
+                "fetch-retry": "^6.0.0",
+                "jest": "^29.7.0",
+                "openapi-fetch": "0.13.4",
+                "openapi-typescript": "7.6.1",
+                "p-queue": "^8.1.0",
+                "sync_lib": "file:../backend/sync_lib/pkg",
+                "ts-jest": "^29.2.5",
+                "ts-loader": "^9.5.2",
+                "tslib": "2.8.1",
+                "typescript": "5.7.3",
+                "webpack": "^5.98.0",
+                "webpack-cli": "^6.0.1"
+            }
+        }
+    }
+}
diff --git a/package.json b/package.json
index a04f32de..ae2f2780 100644
--- a/package.json
+++ b/package.json
@@ -15,12 +15,14 @@
         "build": "npm run build --workspaces",
         "dev": "npm run dev --workspaces",
         "test": "npm run test --workspaces",
-        "lint": "eslint --fix sync-client obsidian-plugin; prettier --write \"sync-client/**/*.(ts|scss|json|html)\" \"obsidian-plugin/**/*.(ts|scss|json|html)\""
+        "lint": "eslint --fix sync-client obsidian-plugin; prettier --write \"sync-client/**/*.(ts|scss|json|html)\" \"obsidian-plugin/**/*.(ts|scss|json|html)\"",
+        "update": "ncu -u -ws"
     },
     "devDependencies": {
-        "prettier": "^3.4.2",
-        "eslint": "9.17.0",
-        "typescript-eslint": "8.18.0",
+        "npm-check-updates": "^17.1.14",
+        "prettier": "^3.5.1",
+        "eslint": "9.20.1",
+        "typescript-eslint": "8.24.1",
         "eslint-plugin-unused-imports": "^4.1.4"
     }
 }
\ No newline at end of file
diff --git a/sync-client/package.json b/sync-client/package.json
index bca033d3..ce4ccc97 100644
--- a/sync-client/package.json
+++ b/sync-client/package.json
@@ -9,20 +9,20 @@
 		"test": "NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules\" jest"
 	},
 	"devDependencies": {
-		"tslib": "2.4.0",
-		"typescript": "5.7.2",
+		"tslib": "2.8.1",
+		"typescript": "5.7.3",
 		"sync_lib": "file:../backend/sync_lib/pkg",
 		"@types/jest": "^29.5.14",
-		"@types/node": "^16.11.6",
+		"@types/node": "^22.13.4",
 		"jest": "^29.7.0",
 		"ts-jest": "^29.2.5",
-		"p-queue": "^8.0.1",
+		"p-queue": "^8.1.0",
 		"fetch-retry": "^6.0.0",
 		"byte-base64": "^1.1.0",
-		"openapi-fetch": "0.13.3",
-		"openapi-typescript": "7.4.4",
-		"ts-loader": "^9.5.1",
-		"webpack": "^5.97.1",
+		"openapi-fetch": "0.13.4",
+		"openapi-typescript": "7.6.1",
+		"ts-loader": "^9.5.2",
+		"webpack": "^5.98.0",
 		"webpack-cli": "^6.0.1"
 	}
 }

From dd6f63f357fb9c55edc7a242e536c8c1d33ac7e7 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Wed, 19 Feb 2025 20:47:52 +0000
Subject: [PATCH 197/761] Move files

---
 .gitignore                                    |  4 ++--
 .vscode/settings.json                         |  5 +++-
 .../eslint.config.mjs                         |  0
 manifest.json => frontend/manifest.json       |  0
 .../obsidian-plugin}/.hotreload               |  0
 .../obsidian-plugin}/README.md                |  0
 .../obsidian-plugin}/manifest.json            |  0
 .../obsidian-plugin}/package.json             |  0
 .../src/obisidan-event-handler.ts             |  0
 .../src/obsidian-file-operations.ts           |  7 ++++--
 .../obsidian-plugin}/src/styles.scss          |  0
 .../obsidian-plugin}/src/vault-link-plugin.ts | 11 ++++++---
 .../src/views/history-view.ts                 | 17 ++++++-------
 .../obsidian-plugin}/src/views/logs-view.ts   |  0
 .../src/views/settings-tab.ts                 |  0
 .../obsidian-plugin}/src/views/status-bar.ts  |  0
 .../src/views/status-description.ts           |  0
 frontend/obsidian-plugin/tsconfig.json        | 14 +++++++++++
 .../obsidian-plugin}/version-bump.mjs         |  0
 .../obsidian-plugin}/webpack.config.js        |  0
 .../package-lock.json                         | 12 +++++++---
 package.json => frontend/package.json         |  2 +-
 .../sync-client}/jest.config.js               |  0
 .../sync-client}/package.json                 |  6 ++---
 .../sync-client}/src/database/database.ts     |  0
 .../src/database/document-metadata.ts         |  0
 .../src/database/sync-settings.ts             |  0
 .../sync-client}/src/file-operations.ts       |  0
 .../sync-client}/src/index.ts                 |  0
 .../sync-client}/src/services/sync-service.ts |  0
 .../sync-client}/src/services/types.ts        |  0
 .../apply-remote-changes-locally.ts           |  0
 .../src/sync-operations/document-lock.test.ts |  2 +-
 .../src/sync-operations/document-lock.ts      |  2 +-
 .../src/sync-operations/syncer.ts             |  0
 .../sync-client}/src/tracing/logger.ts        |  0
 .../sync-client}/src/tracing/sync-history.ts  |  0
 .../src/utils/deserialize.test.ts             |  2 +-
 .../sync-client}/src/utils/deserialize.ts     |  0
 .../sync-client}/src/utils/hash.ts            |  0
 .../src/utils/is-equal-bytes.test.ts          |  0
 .../sync-client}/src/utils/is-equal-bytes.ts  |  0
 .../sync-client}/src/utils/retried-fetch.ts   |  0
 .../sync-client}/src/utils/serialize.test.ts  |  2 +-
 .../sync-client}/src/utils/serialize.ts       |  0
 frontend/sync-client/tsconfig.json            | 15 ++++++++++++
 .../sync-client}/webpack.config.js            |  0
 obsidian-plugin/manifest.json                 | 10 --------
 obsidian-plugin/tsconfig.json                 | 24 -------------------
 sync-client/tsconfig.json                     | 15 ------------
 50 files changed, 72 insertions(+), 78 deletions(-)
 rename eslint.config.mjs => frontend/eslint.config.mjs (100%)
 rename manifest.json => frontend/manifest.json (100%)
 rename {obsidian-plugin => frontend/obsidian-plugin}/.hotreload (100%)
 rename {obsidian-plugin => frontend/obsidian-plugin}/README.md (100%)
 rename {obsidian-plugin/dist => frontend/obsidian-plugin}/manifest.json (100%)
 rename {obsidian-plugin => frontend/obsidian-plugin}/package.json (100%)
 rename {obsidian-plugin => frontend/obsidian-plugin}/src/obisidan-event-handler.ts (100%)
 rename {obsidian-plugin => frontend/obsidian-plugin}/src/obsidian-file-operations.ts (97%)
 rename {obsidian-plugin => frontend/obsidian-plugin}/src/styles.scss (100%)
 rename {obsidian-plugin => frontend/obsidian-plugin}/src/vault-link-plugin.ts (94%)
 rename {obsidian-plugin => frontend/obsidian-plugin}/src/views/history-view.ts (89%)
 rename {obsidian-plugin => frontend/obsidian-plugin}/src/views/logs-view.ts (100%)
 rename {obsidian-plugin => frontend/obsidian-plugin}/src/views/settings-tab.ts (100%)
 rename {obsidian-plugin => frontend/obsidian-plugin}/src/views/status-bar.ts (100%)
 rename {obsidian-plugin => frontend/obsidian-plugin}/src/views/status-description.ts (100%)
 create mode 100644 frontend/obsidian-plugin/tsconfig.json
 rename {obsidian-plugin => frontend/obsidian-plugin}/version-bump.mjs (100%)
 rename {obsidian-plugin => frontend/obsidian-plugin}/webpack.config.js (100%)
 rename package-lock.json => frontend/package-lock.json (99%)
 rename package.json => frontend/package.json (77%)
 rename {sync-client => frontend/sync-client}/jest.config.js (100%)
 rename {sync-client => frontend/sync-client}/package.json (87%)
 rename {sync-client => frontend/sync-client}/src/database/database.ts (100%)
 rename {sync-client => frontend/sync-client}/src/database/document-metadata.ts (100%)
 rename {sync-client => frontend/sync-client}/src/database/sync-settings.ts (100%)
 rename {sync-client => frontend/sync-client}/src/file-operations.ts (100%)
 rename {sync-client => frontend/sync-client}/src/index.ts (100%)
 rename {sync-client => frontend/sync-client}/src/services/sync-service.ts (100%)
 rename {sync-client => frontend/sync-client}/src/services/types.ts (100%)
 rename {sync-client => frontend/sync-client}/src/sync-operations/apply-remote-changes-locally.ts (100%)
 rename {sync-client => frontend/sync-client}/src/sync-operations/document-lock.test.ts (96%)
 rename {sync-client => frontend/sync-client}/src/sync-operations/document-lock.ts (93%)
 rename {sync-client => frontend/sync-client}/src/sync-operations/syncer.ts (100%)
 rename {sync-client => frontend/sync-client}/src/tracing/logger.ts (100%)
 rename {sync-client => frontend/sync-client}/src/tracing/sync-history.ts (100%)
 rename {sync-client => frontend/sync-client}/src/utils/deserialize.test.ts (91%)
 rename {sync-client => frontend/sync-client}/src/utils/deserialize.ts (100%)
 rename {sync-client => frontend/sync-client}/src/utils/hash.ts (100%)
 rename {sync-client => frontend/sync-client}/src/utils/is-equal-bytes.test.ts (100%)
 rename {sync-client => frontend/sync-client}/src/utils/is-equal-bytes.ts (100%)
 rename {sync-client => frontend/sync-client}/src/utils/retried-fetch.ts (100%)
 rename {sync-client => frontend/sync-client}/src/utils/serialize.test.ts (91%)
 rename {sync-client => frontend/sync-client}/src/utils/serialize.ts (100%)
 create mode 100644 frontend/sync-client/tsconfig.json
 rename {sync-client => frontend/sync-client}/webpack.config.js (100%)
 delete mode 100644 obsidian-plugin/manifest.json
 delete mode 100644 obsidian-plugin/tsconfig.json
 delete mode 100644 sync-client/tsconfig.json

diff --git a/.gitignore b/.gitignore
index ca750fec..691f30d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,8 +7,8 @@ node_modules
 # Rust build folder
 backend/target
 
-obsidian-plugin/dist
-sync-client/dist
+frontend/obsidian-plugin/dist
+frontend/sync-client/dist
 
 backend/db.sqlite3*
 backend/config.yml
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 11cfe5c0..d611f4d3 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,4 +1,7 @@
 {
     "jest.jestCommandLine": "NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules\" npx jest",
-    "jest.rootPath": "plugin"
+    "jest.rootPath": "plugin",
+    "files.exclude": {
+        "**/node_modules": true
+    }
 }
\ No newline at end of file
diff --git a/eslint.config.mjs b/frontend/eslint.config.mjs
similarity index 100%
rename from eslint.config.mjs
rename to frontend/eslint.config.mjs
diff --git a/manifest.json b/frontend/manifest.json
similarity index 100%
rename from manifest.json
rename to frontend/manifest.json
diff --git a/obsidian-plugin/.hotreload b/frontend/obsidian-plugin/.hotreload
similarity index 100%
rename from obsidian-plugin/.hotreload
rename to frontend/obsidian-plugin/.hotreload
diff --git a/obsidian-plugin/README.md b/frontend/obsidian-plugin/README.md
similarity index 100%
rename from obsidian-plugin/README.md
rename to frontend/obsidian-plugin/README.md
diff --git a/obsidian-plugin/dist/manifest.json b/frontend/obsidian-plugin/manifest.json
similarity index 100%
rename from obsidian-plugin/dist/manifest.json
rename to frontend/obsidian-plugin/manifest.json
diff --git a/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
similarity index 100%
rename from obsidian-plugin/package.json
rename to frontend/obsidian-plugin/package.json
diff --git a/obsidian-plugin/src/obisidan-event-handler.ts b/frontend/obsidian-plugin/src/obisidan-event-handler.ts
similarity index 100%
rename from obsidian-plugin/src/obisidan-event-handler.ts
rename to frontend/obsidian-plugin/src/obisidan-event-handler.ts
diff --git a/obsidian-plugin/src/obsidian-file-operations.ts b/frontend/obsidian-plugin/src/obsidian-file-operations.ts
similarity index 97%
rename from obsidian-plugin/src/obsidian-file-operations.ts
rename to frontend/obsidian-plugin/src/obsidian-file-operations.ts
index 395f42ef..b124322d 100644
--- a/obsidian-plugin/src/obsidian-file-operations.ts
+++ b/frontend/obsidian-plugin/src/obsidian-file-operations.ts
@@ -56,7 +56,10 @@ export class ObsidianFileOperations implements FileOperations {
 		}
 
 		await this.createParentDirectories(normalizePath(path));
-		await this.vault.adapter.writeBinary(normalizePath(path), newContent);
+		await this.vault.adapter.writeBinary(
+			normalizePath(path),
+			newContent.buffer as ArrayBuffer
+		);
 	}
 
 	public async write(
@@ -78,7 +81,7 @@ export class ObsidianFileOperations implements FileOperations {
 			);
 			await this.vault.adapter.writeBinary(
 				normalizePath(path),
-				newContent
+				newContent.buffer as ArrayBuffer
 			);
 			return newContent;
 		}
diff --git a/obsidian-plugin/src/styles.scss b/frontend/obsidian-plugin/src/styles.scss
similarity index 100%
rename from obsidian-plugin/src/styles.scss
rename to frontend/obsidian-plugin/src/styles.scss
diff --git a/obsidian-plugin/src/vault-link-plugin.ts b/frontend/obsidian-plugin/src/vault-link-plugin.ts
similarity index 94%
rename from obsidian-plugin/src/vault-link-plugin.ts
rename to frontend/obsidian-plugin/src/vault-link-plugin.ts
index 989126ac..db11658f 100644
--- a/obsidian-plugin/src/vault-link-plugin.ts
+++ b/frontend/obsidian-plugin/src/vault-link-plugin.ts
@@ -123,8 +123,7 @@ export default class VaultLinkPlugin extends Plugin {
 			database.getSettings().fetchChangesUpdateIntervalMs
 		);
 
-		// eslint-disable-next-line @typescript-eslint/no-misused-promises
-		database.addOnSettingsChangeHandlers(async (settings, oldSettings) => {
+		database.addOnSettingsChangeHandlers((settings, oldSettings) => {
 			this.registerRemoteEventListener(
 				database,
 				syncService,
@@ -133,7 +132,13 @@ export default class VaultLinkPlugin extends Plugin {
 			);
 
 			if (!oldSettings.isSyncEnabled && settings.isSyncEnabled) {
-				await syncer.scheduleSyncForOfflineChanges();
+				syncer
+					.scheduleSyncForOfflineChanges()
+					.catch((_error: unknown) => {
+						Logger.getInstance().error(
+							"Failed to schedule sync for offline changes"
+						);
+					});
 			}
 		});
 
diff --git a/obsidian-plugin/src/views/history-view.ts b/frontend/obsidian-plugin/src/views/history-view.ts
similarity index 89%
rename from obsidian-plugin/src/views/history-view.ts
rename to frontend/obsidian-plugin/src/views/history-view.ts
index bb501d77..3fe14256 100644
--- a/obsidian-plugin/src/views/history-view.ts
+++ b/frontend/obsidian-plugin/src/views/history-view.ts
@@ -2,13 +2,8 @@ import type { IconName, WorkspaceLeaf } from "obsidian";
 import { ItemView, setIcon } from "obsidian";
 
 import { intlFormatDistance } from "date-fns";
-import type {
-	SyncHistory,
-	HistoryEntry,
-	Database,
-	RelativePath
-} from "sync-client";
-import { SyncType, SyncSource, SyncStatus } from "sync-client";
+import type { SyncHistory, HistoryEntry, Database } from "sync-client";
+import { SyncType, SyncSource, SyncStatus, Logger } from "sync-client";
 
 export class HistoryView extends ItemView {
 	public static readonly TYPE = "history-view";
@@ -23,9 +18,10 @@ export class HistoryView extends ItemView {
 		super(leaf);
 		this.icon = HistoryView.ICON;
 
-		// eslint-disable-next-line @typescript-eslint/no-misused-promises
-		history.addSyncHistoryUpdateListener(async () => {
-			await this.updateView();
+		history.addSyncHistoryUpdateListener(() => {
+			this.updateView().catch((_error: unknown) => {
+				Logger.getInstance().error("Failed to update history view");
+			});
 		});
 	}
 
@@ -65,6 +61,7 @@ export class HistoryView extends ItemView {
 		}
 
 		element.createEl("span", {
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
 			text: entry.relativePath
 		});
 
diff --git a/obsidian-plugin/src/views/logs-view.ts b/frontend/obsidian-plugin/src/views/logs-view.ts
similarity index 100%
rename from obsidian-plugin/src/views/logs-view.ts
rename to frontend/obsidian-plugin/src/views/logs-view.ts
diff --git a/obsidian-plugin/src/views/settings-tab.ts b/frontend/obsidian-plugin/src/views/settings-tab.ts
similarity index 100%
rename from obsidian-plugin/src/views/settings-tab.ts
rename to frontend/obsidian-plugin/src/views/settings-tab.ts
diff --git a/obsidian-plugin/src/views/status-bar.ts b/frontend/obsidian-plugin/src/views/status-bar.ts
similarity index 100%
rename from obsidian-plugin/src/views/status-bar.ts
rename to frontend/obsidian-plugin/src/views/status-bar.ts
diff --git a/obsidian-plugin/src/views/status-description.ts b/frontend/obsidian-plugin/src/views/status-description.ts
similarity index 100%
rename from obsidian-plugin/src/views/status-description.ts
rename to frontend/obsidian-plugin/src/views/status-description.ts
diff --git a/frontend/obsidian-plugin/tsconfig.json b/frontend/obsidian-plugin/tsconfig.json
new file mode 100644
index 00000000..c5247938
--- /dev/null
+++ b/frontend/obsidian-plugin/tsconfig.json
@@ -0,0 +1,14 @@
+{
+	"compilerOptions": {
+		"baseUrl": ".",
+		"module": "ESNext",
+		"target": "ES2023",
+		"noImplicitAny": true,
+		"moduleResolution": "bundler",
+		"strictNullChecks": true,
+		"lib": [
+			"DOM",
+			"ESNext"
+		]
+	}
+}
\ No newline at end of file
diff --git a/obsidian-plugin/version-bump.mjs b/frontend/obsidian-plugin/version-bump.mjs
similarity index 100%
rename from obsidian-plugin/version-bump.mjs
rename to frontend/obsidian-plugin/version-bump.mjs
diff --git a/obsidian-plugin/webpack.config.js b/frontend/obsidian-plugin/webpack.config.js
similarity index 100%
rename from obsidian-plugin/webpack.config.js
rename to frontend/obsidian-plugin/webpack.config.js
diff --git a/package-lock.json b/frontend/package-lock.json
similarity index 99%
rename from package-lock.json
rename to frontend/package-lock.json
index d7290bae..bcf52bb3 100644
--- a/package-lock.json
+++ b/frontend/package-lock.json
@@ -17,12 +17,18 @@
                 "typescript-eslint": "8.24.1"
             }
         },
-        "backend/sync_lib/pkg": {
+        "../backend/sync_lib/pkg": {
             "name": "sync_lib",
             "version": "0.0.30",
             "dev": true,
             "license": "MIT"
         },
+        "backend/sync_lib/pkg": {
+            "name": "sync_lib",
+            "version": "0.0.30",
+            "extraneous": true,
+            "license": "MIT"
+        },
         "node_modules/@ampproject/remapping": {
             "version": "2.3.0",
             "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
@@ -6584,7 +6590,7 @@
             }
         },
         "node_modules/sync_lib": {
-            "resolved": "backend/sync_lib/pkg",
+            "resolved": "../backend/sync_lib/pkg",
             "link": true
         },
         "node_modules/sync-client": {
@@ -7485,7 +7491,7 @@
                 "openapi-fetch": "0.13.4",
                 "openapi-typescript": "7.6.1",
                 "p-queue": "^8.1.0",
-                "sync_lib": "file:../backend/sync_lib/pkg",
+                "sync_lib": "file:../../backend/sync_lib/pkg",
                 "ts-jest": "^29.2.5",
                 "ts-loader": "^9.5.2",
                 "tslib": "2.8.1",
diff --git a/package.json b/frontend/package.json
similarity index 77%
rename from package.json
rename to frontend/package.json
index ae2f2780..314c24e2 100644
--- a/package.json
+++ b/frontend/package.json
@@ -15,7 +15,7 @@
         "build": "npm run build --workspaces",
         "dev": "npm run dev --workspaces",
         "test": "npm run test --workspaces",
-        "lint": "eslint --fix sync-client obsidian-plugin; prettier --write \"sync-client/**/*.(ts|scss|json|html)\" \"obsidian-plugin/**/*.(ts|scss|json|html)\"",
+        "lint": "rm -rf **/dist/index.js && eslint --fix sync-client obsidian-plugin; prettier --write \"sync-client/**/*.(ts|scss|json|html)\" \"obsidian-plugin/**/*.(ts|scss|json|html)\"",
         "update": "ncu -u -ws"
     },
     "devDependencies": {
diff --git a/sync-client/jest.config.js b/frontend/sync-client/jest.config.js
similarity index 100%
rename from sync-client/jest.config.js
rename to frontend/sync-client/jest.config.js
diff --git a/sync-client/package.json b/frontend/sync-client/package.json
similarity index 87%
rename from sync-client/package.json
rename to frontend/sync-client/package.json
index ce4ccc97..b4493c99 100644
--- a/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -2,7 +2,7 @@
 	"name": "sync-client",
 	"version": "1.0.0",
 	"main": "dist/index.js",
-	"types": "dist/types/src/index.d.ts",
+	"types": "dist/types/index.d.ts",
 	"scripts": {
 		"dev": "webpack watch --mode development",
 		"build": "webpack --mode production",
@@ -11,7 +11,7 @@
 	"devDependencies": {
 		"tslib": "2.8.1",
 		"typescript": "5.7.3",
-		"sync_lib": "file:../backend/sync_lib/pkg",
+		"sync_lib": "file:../../backend/sync_lib/pkg",
 		"@types/jest": "^29.5.14",
 		"@types/node": "^22.13.4",
 		"jest": "^29.7.0",
@@ -25,4 +25,4 @@
 		"webpack": "^5.98.0",
 		"webpack-cli": "^6.0.1"
 	}
-}
+}
\ No newline at end of file
diff --git a/sync-client/src/database/database.ts b/frontend/sync-client/src/database/database.ts
similarity index 100%
rename from sync-client/src/database/database.ts
rename to frontend/sync-client/src/database/database.ts
diff --git a/sync-client/src/database/document-metadata.ts b/frontend/sync-client/src/database/document-metadata.ts
similarity index 100%
rename from sync-client/src/database/document-metadata.ts
rename to frontend/sync-client/src/database/document-metadata.ts
diff --git a/sync-client/src/database/sync-settings.ts b/frontend/sync-client/src/database/sync-settings.ts
similarity index 100%
rename from sync-client/src/database/sync-settings.ts
rename to frontend/sync-client/src/database/sync-settings.ts
diff --git a/sync-client/src/file-operations.ts b/frontend/sync-client/src/file-operations.ts
similarity index 100%
rename from sync-client/src/file-operations.ts
rename to frontend/sync-client/src/file-operations.ts
diff --git a/sync-client/src/index.ts b/frontend/sync-client/src/index.ts
similarity index 100%
rename from sync-client/src/index.ts
rename to frontend/sync-client/src/index.ts
diff --git a/sync-client/src/services/sync-service.ts b/frontend/sync-client/src/services/sync-service.ts
similarity index 100%
rename from sync-client/src/services/sync-service.ts
rename to frontend/sync-client/src/services/sync-service.ts
diff --git a/sync-client/src/services/types.ts b/frontend/sync-client/src/services/types.ts
similarity index 100%
rename from sync-client/src/services/types.ts
rename to frontend/sync-client/src/services/types.ts
diff --git a/sync-client/src/sync-operations/apply-remote-changes-locally.ts b/frontend/sync-client/src/sync-operations/apply-remote-changes-locally.ts
similarity index 100%
rename from sync-client/src/sync-operations/apply-remote-changes-locally.ts
rename to frontend/sync-client/src/sync-operations/apply-remote-changes-locally.ts
diff --git a/sync-client/src/sync-operations/document-lock.test.ts b/frontend/sync-client/src/sync-operations/document-lock.test.ts
similarity index 96%
rename from sync-client/src/sync-operations/document-lock.test.ts
rename to frontend/sync-client/src/sync-operations/document-lock.test.ts
index 1b79a225..5b28de18 100644
--- a/sync-client/src/sync-operations/document-lock.test.ts
+++ b/frontend/sync-client/src/sync-operations/document-lock.test.ts
@@ -1,9 +1,9 @@
+import { RelativePath } from "../database/document-metadata";
 import {
 	tryLockDocument,
 	waitForDocumentLock,
 	unlockDocument
 } from "./document-lock";
-import type { RelativePath } from "src/database/document-metadata";
 
 describe("Document Lock Operations", () => {
 	const testPath: RelativePath = "test/document/path";
diff --git a/sync-client/src/sync-operations/document-lock.ts b/frontend/sync-client/src/sync-operations/document-lock.ts
similarity index 93%
rename from sync-client/src/sync-operations/document-lock.ts
rename to frontend/sync-client/src/sync-operations/document-lock.ts
index a8a3b356..db657afc 100644
--- a/sync-client/src/sync-operations/document-lock.ts
+++ b/frontend/sync-client/src/sync-operations/document-lock.ts
@@ -1,4 +1,4 @@
-import type { RelativePath } from "src/database/document-metadata";
+import { RelativePath } from "../database/document-metadata";
 
 const locked = new Set<RelativePath>();
 const waiters = new Map<RelativePath, (() => void)[]>();
diff --git a/sync-client/src/sync-operations/syncer.ts b/frontend/sync-client/src/sync-operations/syncer.ts
similarity index 100%
rename from sync-client/src/sync-operations/syncer.ts
rename to frontend/sync-client/src/sync-operations/syncer.ts
diff --git a/sync-client/src/tracing/logger.ts b/frontend/sync-client/src/tracing/logger.ts
similarity index 100%
rename from sync-client/src/tracing/logger.ts
rename to frontend/sync-client/src/tracing/logger.ts
diff --git a/sync-client/src/tracing/sync-history.ts b/frontend/sync-client/src/tracing/sync-history.ts
similarity index 100%
rename from sync-client/src/tracing/sync-history.ts
rename to frontend/sync-client/src/tracing/sync-history.ts
diff --git a/sync-client/src/utils/deserialize.test.ts b/frontend/sync-client/src/utils/deserialize.test.ts
similarity index 91%
rename from sync-client/src/utils/deserialize.test.ts
rename to frontend/sync-client/src/utils/deserialize.test.ts
index fa50a2cd..b053c2a3 100644
--- a/sync-client/src/utils/deserialize.test.ts
+++ b/frontend/sync-client/src/utils/deserialize.test.ts
@@ -4,7 +4,7 @@ import fs from "fs";
 describe("deserialize", () => {
 	it("should serialize a Uint8Array to a base64 string", async () => {
 		const wasmBin = fs.readFileSync(
-			"../backend/sync_lib/pkg/sync_lib_bg.wasm"
+			"../../backend/sync_lib/pkg/sync_lib_bg.wasm"
 		);
 		await init({ module_or_path: wasmBin });
 
diff --git a/sync-client/src/utils/deserialize.ts b/frontend/sync-client/src/utils/deserialize.ts
similarity index 100%
rename from sync-client/src/utils/deserialize.ts
rename to frontend/sync-client/src/utils/deserialize.ts
diff --git a/sync-client/src/utils/hash.ts b/frontend/sync-client/src/utils/hash.ts
similarity index 100%
rename from sync-client/src/utils/hash.ts
rename to frontend/sync-client/src/utils/hash.ts
diff --git a/sync-client/src/utils/is-equal-bytes.test.ts b/frontend/sync-client/src/utils/is-equal-bytes.test.ts
similarity index 100%
rename from sync-client/src/utils/is-equal-bytes.test.ts
rename to frontend/sync-client/src/utils/is-equal-bytes.test.ts
diff --git a/sync-client/src/utils/is-equal-bytes.ts b/frontend/sync-client/src/utils/is-equal-bytes.ts
similarity index 100%
rename from sync-client/src/utils/is-equal-bytes.ts
rename to frontend/sync-client/src/utils/is-equal-bytes.ts
diff --git a/sync-client/src/utils/retried-fetch.ts b/frontend/sync-client/src/utils/retried-fetch.ts
similarity index 100%
rename from sync-client/src/utils/retried-fetch.ts
rename to frontend/sync-client/src/utils/retried-fetch.ts
diff --git a/sync-client/src/utils/serialize.test.ts b/frontend/sync-client/src/utils/serialize.test.ts
similarity index 91%
rename from sync-client/src/utils/serialize.test.ts
rename to frontend/sync-client/src/utils/serialize.test.ts
index ae2016e5..d01fae18 100644
--- a/sync-client/src/utils/serialize.test.ts
+++ b/frontend/sync-client/src/utils/serialize.test.ts
@@ -5,7 +5,7 @@ import fs from "fs";
 describe("serialize", () => {
 	it("should serialize a Uint8Array to a base64 string", async () => {
 		const wasmBin = fs.readFileSync(
-			"../backend/sync_lib/pkg/sync_lib_bg.wasm"
+			"../../backend/sync_lib/pkg/sync_lib_bg.wasm"
 		);
 		await init({ module_or_path: wasmBin });
 
diff --git a/sync-client/src/utils/serialize.ts b/frontend/sync-client/src/utils/serialize.ts
similarity index 100%
rename from sync-client/src/utils/serialize.ts
rename to frontend/sync-client/src/utils/serialize.ts
diff --git a/frontend/sync-client/tsconfig.json b/frontend/sync-client/tsconfig.json
new file mode 100644
index 00000000..e0875e31
--- /dev/null
+++ b/frontend/sync-client/tsconfig.json
@@ -0,0 +1,15 @@
+{
+	"compilerOptions": {
+		"baseUrl": ".",
+		"module": "ESNext",
+		"target": "ESNext",
+		"noImplicitAny": true,
+		"moduleResolution": "bundler",
+		"strictNullChecks": true,
+		"allowSyntheticDefaultImports": true,
+		"lib": [
+			"DOM",
+			"ESNext"
+		]
+	},
+}
\ No newline at end of file
diff --git a/sync-client/webpack.config.js b/frontend/sync-client/webpack.config.js
similarity index 100%
rename from sync-client/webpack.config.js
rename to frontend/sync-client/webpack.config.js
diff --git a/obsidian-plugin/manifest.json b/obsidian-plugin/manifest.json
deleted file mode 100644
index 7b7ca8c8..00000000
--- a/obsidian-plugin/manifest.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"id": "vault-link",
-	"name": "VaultLink",
-	"version": "0.0.30",
-	"minAppVersion": "0.0.0",
-	"description": "Self-hosted synchronization and collaboration for your Vault.",
-	"author": "Andras Schmelczer",
-	"authorUrl": "https://schmelczer.dev",
-	"isDesktopOnly": false
-}
diff --git a/obsidian-plugin/tsconfig.json b/obsidian-plugin/tsconfig.json
deleted file mode 100644
index 85523ed4..00000000
--- a/obsidian-plugin/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "compilerOptions": {
-    "baseUrl": ".",
-    "inlineSourceMap": true,
-    "inlineSources": true,
-    "module": "ESNext",
-    "target": "ES6",
-    "noImplicitAny": true,
-    "moduleResolution": "bundler",
-    "isolatedModules": true,
-    "strictNullChecks": true,
-    "esModuleInterop": true,
-    "allowSyntheticDefaultImports": true,
-    "lib": [
-      "DOM",
-      "ES5",
-      "ES6",
-      "ES7"
-    ]
-  },
-  "include": [
-    "**/*.ts"
-  ]
-}
\ No newline at end of file
diff --git a/sync-client/tsconfig.json b/sync-client/tsconfig.json
deleted file mode 100644
index 63ebf589..00000000
--- a/sync-client/tsconfig.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "compilerOptions": {
-        "composite": true,
-        "baseUrl": ".",
-        "target": "ES2022",
-        "noImplicitAny": true,
-        "moduleResolution": "node",
-        "strictNullChecks": true,
-        "esModuleInterop": true,
-        "lib": [
-            "DOM",
-            "ESNext"
-        ]
-    }
-}
\ No newline at end of file

From 00fa7b1c8bbbac084719a5882b5c8b0667dfedc4 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Wed, 19 Feb 2025 20:52:05 +0000
Subject: [PATCH 198/761] Lint

---
 frontend/obsidian-plugin/src/views/history-view.ts       | 1 -
 frontend/obsidian-plugin/tsconfig.json                   | 7 ++-----
 frontend/sync-client/package.json                        | 2 +-
 .../sync-client/src/sync-operations/document-lock.ts     | 2 +-
 frontend/sync-client/tsconfig.json                       | 9 +++------
 5 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/frontend/obsidian-plugin/src/views/history-view.ts b/frontend/obsidian-plugin/src/views/history-view.ts
index 3fe14256..a54f2d2d 100644
--- a/frontend/obsidian-plugin/src/views/history-view.ts
+++ b/frontend/obsidian-plugin/src/views/history-view.ts
@@ -61,7 +61,6 @@ export class HistoryView extends ItemView {
 		}
 
 		element.createEl("span", {
-			// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
 			text: entry.relativePath
 		});
 
diff --git a/frontend/obsidian-plugin/tsconfig.json b/frontend/obsidian-plugin/tsconfig.json
index c5247938..34954a99 100644
--- a/frontend/obsidian-plugin/tsconfig.json
+++ b/frontend/obsidian-plugin/tsconfig.json
@@ -6,9 +6,6 @@
 		"noImplicitAny": true,
 		"moduleResolution": "bundler",
 		"strictNullChecks": true,
-		"lib": [
-			"DOM",
-			"ESNext"
-		]
+		"lib": ["DOM", "ESNext"]
 	}
-}
\ No newline at end of file
+}
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index b4493c99..2312bc28 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -25,4 +25,4 @@
 		"webpack": "^5.98.0",
 		"webpack-cli": "^6.0.1"
 	}
-}
\ No newline at end of file
+}
diff --git a/frontend/sync-client/src/sync-operations/document-lock.ts b/frontend/sync-client/src/sync-operations/document-lock.ts
index db657afc..55811662 100644
--- a/frontend/sync-client/src/sync-operations/document-lock.ts
+++ b/frontend/sync-client/src/sync-operations/document-lock.ts
@@ -1,4 +1,4 @@
-import { RelativePath } from "../database/document-metadata";
+import type { RelativePath } from "../database/document-metadata";
 
 const locked = new Set<RelativePath>();
 const waiters = new Map<RelativePath, (() => void)[]>();
diff --git a/frontend/sync-client/tsconfig.json b/frontend/sync-client/tsconfig.json
index e0875e31..184db366 100644
--- a/frontend/sync-client/tsconfig.json
+++ b/frontend/sync-client/tsconfig.json
@@ -7,9 +7,6 @@
 		"moduleResolution": "bundler",
 		"strictNullChecks": true,
 		"allowSyntheticDefaultImports": true,
-		"lib": [
-			"DOM",
-			"ESNext"
-		]
-	},
-}
\ No newline at end of file
+		"lib": ["DOM", "ESNext"]
+	}
+}

From e97d97905ee13236f531326ebb76f25f59a8ed4e Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Wed, 19 Feb 2025 21:29:43 +0000
Subject: [PATCH 199/761] Enable deving

---
 frontend/package-lock.json | 83 ++++++++++++++++++++++++++++++++++++++
 frontend/package.json      | 13 +++---
 2 files changed, 90 insertions(+), 6 deletions(-)

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index bcf52bb3..6141bcb8 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -10,6 +10,7 @@
                 "obsidian-plugin"
             ],
             "devDependencies": {
+                "concurrently": "^9.1.2",
                 "eslint": "9.20.1",
                 "eslint-plugin-unused-imports": "^4.1.4",
                 "npm-check-updates": "^17.1.14",
@@ -2976,6 +2977,48 @@
             "dev": true,
             "license": "MIT"
         },
+        "node_modules/concurrently": {
+            "version": "9.1.2",
+            "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-9.1.2.tgz",
+            "integrity": "sha512-H9MWcoPsYddwbOGM6difjVwVZHl63nwMEwDJG/L7VGtuaJhb12h2caPG2tVPWs7emuYix252iGfqOyrz1GczTQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "chalk": "^4.1.2",
+                "lodash": "^4.17.21",
+                "rxjs": "^7.8.1",
+                "shell-quote": "^1.8.1",
+                "supports-color": "^8.1.1",
+                "tree-kill": "^1.2.2",
+                "yargs": "^17.7.2"
+            },
+            "bin": {
+                "conc": "dist/bin/concurrently.js",
+                "concurrently": "dist/bin/concurrently.js"
+            },
+            "engines": {
+                "node": ">=18"
+            },
+            "funding": {
+                "url": "https://github.com/open-cli-tools/concurrently?sponsor=1"
+            }
+        },
+        "node_modules/concurrently/node_modules/supports-color": {
+            "version": "8.1.1",
+            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+            "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/supports-color?sponsor=1"
+            }
+        },
         "node_modules/convert-source-map": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
@@ -5091,6 +5134,13 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
+        "node_modules/lodash": {
+            "version": "4.17.21",
+            "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+            "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+            "dev": true,
+            "license": "MIT"
+        },
         "node_modules/lodash.memoize": {
             "version": "4.1.2",
             "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
@@ -6234,6 +6284,16 @@
                 "queue-microtask": "^1.2.2"
             }
         },
+        "node_modules/rxjs": {
+            "version": "7.8.1",
+            "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
+            "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.1.0"
+            }
+        },
         "node_modules/safe-buffer": {
             "version": "5.2.1",
             "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
@@ -6395,6 +6455,19 @@
                 "node": ">=8"
             }
         },
+        "node_modules/shell-quote": {
+            "version": "1.8.2",
+            "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.2.tgz",
+            "integrity": "sha512-AzqKpGKjrj7EM6rKVQEPpB288oCfnrEIuyoT9cyF4nmGa7V8Zk6f7RRqYisX8X9m+Q7bd632aZW4ky7EhbQztA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
         "node_modules/signal-exit": {
             "version": "3.0.7",
             "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
@@ -6795,6 +6868,16 @@
                 "node": ">=8.0"
             }
         },
+        "node_modules/tree-kill": {
+            "version": "1.2.2",
+            "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",
+            "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==",
+            "dev": true,
+            "license": "MIT",
+            "bin": {
+                "tree-kill": "cli.js"
+            }
+        },
         "node_modules/ts-api-utils": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.0.1.tgz",
diff --git a/frontend/package.json b/frontend/package.json
index 314c24e2..60edb303 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -13,16 +13,17 @@
     },
     "scripts": {
         "build": "npm run build --workspaces",
-        "dev": "npm run dev --workspaces",
+        "dev": "concurrently --kill-others \"npm run dev -w sync-client\" \"npm run dev -w obsidian-plugin\"",
         "test": "npm run test --workspaces",
-        "lint": "rm -rf **/dist/index.js && eslint --fix sync-client obsidian-plugin; prettier --write \"sync-client/**/*.(ts|scss|json|html)\" \"obsidian-plugin/**/*.(ts|scss|json|html)\"",
+        "lint": "eslint --fix sync-client obsidian-plugin; prettier --write \"sync-client/**/*.(ts|scss|json|html)\" \"obsidian-plugin/**/*.(ts|scss|json|html)\"",
         "update": "ncu -u -ws"
     },
     "devDependencies": {
+        "concurrently": "^9.1.2",
+        "eslint": "9.20.1",
+        "eslint-plugin-unused-imports": "^4.1.4",
         "npm-check-updates": "^17.1.14",
         "prettier": "^3.5.1",
-        "eslint": "9.20.1",
-        "typescript-eslint": "8.24.1",
-        "eslint-plugin-unused-imports": "^4.1.4"
+        "typescript-eslint": "8.24.1"
     }
-}
\ No newline at end of file
+}

From aef5952c4d7ef8b6d9a0780d949d48f1f5a5c16b Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Wed, 19 Feb 2025 21:29:53 +0000
Subject: [PATCH 200/761] Remove clutter

---
 frontend/obsidian-plugin/webpack.config.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/frontend/obsidian-plugin/webpack.config.js b/frontend/obsidian-plugin/webpack.config.js
index 7f661243..7e05101d 100644
--- a/frontend/obsidian-plugin/webpack.config.js
+++ b/frontend/obsidian-plugin/webpack.config.js
@@ -27,10 +27,6 @@ module.exports = (env, argv) => ({
 		new MiniCssExtractPlugin({
 			filename: "styles.css"
 		}),
-
-		new (require("webpack").DefinePlugin)({
-			__CURRENT_DATE__: Date.now()
-		}),
 		{
 			apply: (compiler) => {
 				if (argv.mode !== "development") {

From 614e4a780aee534e220db99ed088cf373f6bf3ae Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Wed, 19 Feb 2025 21:32:40 +0000
Subject: [PATCH 201/761] Extract settings from database

---
 .../obsidian-plugin/src/vault-link-plugin.ts  |  44 +++--
 .../obsidian-plugin/src/views/history-view.ts |   6 +-
 .../obsidian-plugin/src/views/logs-view.ts    |   8 +-
 .../obsidian-plugin/src/views/settings-tab.ts |  52 ++---
 .../obsidian-plugin/src/views/status-bar.ts   |   8 +-
 .../src/views/status-description.ts           |  12 +-
 frontend/sync-client/src/database/database.ts | 186 ------------------
 .../src/database/document-metadata.ts         |   9 -
 .../sync-client/src/database/sync-settings.ts |  25 ---
 frontend/sync-client/src/file-operations.ts   |   2 +-
 frontend/sync-client/src/index.ts             |  18 +-
 .../sync-client/src/persistence/database.ts   | 130 ++++++++++++
 .../sync-client/src/persistence/settings.ts   |  86 ++++++++
 .../sync-client/src/services/sync-service.ts  |  34 ++--
 .../apply-remote-changes-locally.ts           |   7 +-
 .../src/sync-operations/document-lock.test.ts |   2 +-
 .../src/sync-operations/document-lock.ts      |   2 +-
 .../sync-client/src/sync-operations/syncer.ts |  25 +--
 frontend/sync-client/src/tracing/logger.ts    |   5 +-
 .../sync-client/src/tracing/sync-history.ts   |   2 +-
 20 files changed, 344 insertions(+), 319 deletions(-)
 delete mode 100644 frontend/sync-client/src/database/database.ts
 delete mode 100644 frontend/sync-client/src/database/document-metadata.ts
 delete mode 100644 frontend/sync-client/src/database/sync-settings.ts
 create mode 100644 frontend/sync-client/src/persistence/database.ts
 create mode 100644 frontend/sync-client/src/persistence/settings.ts

diff --git a/frontend/obsidian-plugin/src/vault-link-plugin.ts b/frontend/obsidian-plugin/src/vault-link-plugin.ts
index db11658f..1d31804c 100644
--- a/frontend/obsidian-plugin/src/vault-link-plugin.ts
+++ b/frontend/obsidian-plugin/src/vault-link-plugin.ts
@@ -18,7 +18,8 @@ import {
 	Syncer,
 	SyncHistory,
 	SyncService,
-	initialize
+	initialize,
+	Settings
 } from "sync-client";
 
 export default class VaultLinkPlugin extends Plugin {
@@ -32,21 +33,38 @@ export default class VaultLinkPlugin extends Plugin {
 
 		await initialize();
 
+		let state = (await this.loadData()) ?? {
+			settings: undefined,
+			database: undefined
+		};
 		const database = new Database(
-			await this.loadData(),
-			this.saveData.bind(this)
+			state.database,
+			async (data: unknown): Promise<void> => {
+				state = { ...state, database: data };
+				return this.saveData(state);
+			}
+		);
+
+		const settings = new Settings(
+			state.settings,
+			async (data: unknown): Promise<void> => {
+				state = { ...state, settings: data };
+				return this.saveData(state);
+			}
 		);
 
 		const syncService = new SyncService(database);
 
 		const syncer = new Syncer(
 			database,
+			settings,
 			syncService,
 			this.operations,
 			this.history
 		);
 
 		const statusDescription = new StatusDescription(
+			settings,
 			database,
 			syncService,
 			this.history,
@@ -56,22 +74,22 @@ export default class VaultLinkPlugin extends Plugin {
 		this.settingsTab = new SyncSettingsTab({
 			app: this.app,
 			plugin: this,
-			database,
+			settings,
 			syncService,
 			statusDescription,
 			syncer
 		});
 		this.addSettingTab(this.settingsTab);
 
-		new StatusBar(database, this, this.history, syncer);
+		new StatusBar(settings, this, this.history, syncer);
 
 		this.registerView(
 			HistoryView.TYPE,
-			(leaf) => new HistoryView(leaf, database, this.history)
+			(leaf) => new HistoryView(leaf, settings, this.history)
 		);
 		this.registerView(
 			LogsView.TYPE,
-			(leaf) => new LogsView(this, database, leaf)
+			(leaf) => new LogsView(this, settings, leaf)
 		);
 
 		this.addRibbonIcon(
@@ -117,21 +135,23 @@ export default class VaultLinkPlugin extends Plugin {
 		});
 
 		this.registerRemoteEventListener(
+			settings,
 			database,
 			syncService,
 			syncer,
-			database.getSettings().fetchChangesUpdateIntervalMs
+			settings.getSettings().fetchChangesUpdateIntervalMs
 		);
 
-		database.addOnSettingsChangeHandlers((settings, oldSettings) => {
+		settings.addOnSettingsChangeHandlers((newSettings, oldSettings) => {
 			this.registerRemoteEventListener(
+				settings,
 				database,
 				syncService,
 				syncer,
-				settings.fetchChangesUpdateIntervalMs
+				newSettings.fetchChangesUpdateIntervalMs
 			);
 
-			if (!oldSettings.isSyncEnabled && settings.isSyncEnabled) {
+			if (!oldSettings.isSyncEnabled && newSettings.isSyncEnabled) {
 				syncer
 					.scheduleSyncForOfflineChanges()
 					.catch((_error: unknown) => {
@@ -182,6 +202,7 @@ export default class VaultLinkPlugin extends Plugin {
 	}
 
 	private registerRemoteEventListener(
+		settings: Settings,
 		database: Database,
 		syncService: SyncService,
 		syncer: Syncer,
@@ -195,6 +216,7 @@ export default class VaultLinkPlugin extends Plugin {
 			// eslint-disable-next-line @typescript-eslint/no-misused-promises
 			async () =>
 				applyRemoteChangesLocally({
+					settings,
 					database,
 					syncService,
 					syncer
diff --git a/frontend/obsidian-plugin/src/views/history-view.ts b/frontend/obsidian-plugin/src/views/history-view.ts
index a54f2d2d..04c8e56d 100644
--- a/frontend/obsidian-plugin/src/views/history-view.ts
+++ b/frontend/obsidian-plugin/src/views/history-view.ts
@@ -2,7 +2,7 @@ import type { IconName, WorkspaceLeaf } from "obsidian";
 import { ItemView, setIcon } from "obsidian";
 
 import { intlFormatDistance } from "date-fns";
-import type { SyncHistory, HistoryEntry, Database } from "sync-client";
+import type { SyncHistory, HistoryEntry, Settings } from "sync-client";
 import { SyncType, SyncSource, SyncStatus, Logger } from "sync-client";
 
 export class HistoryView extends ItemView {
@@ -12,7 +12,7 @@ export class HistoryView extends ItemView {
 
 	public constructor(
 		leaf: WorkspaceLeaf,
-		private readonly database: Database,
+		private readonly settings: Settings,
 		private readonly history: SyncHistory
 	) {
 		super(leaf);
@@ -101,7 +101,7 @@ export class HistoryView extends ItemView {
 			.filter(
 				(entry) =>
 					entry.status !== SyncStatus.NO_OP ||
-					this.database.getSettings().displayNoopSyncEvents
+					this.settings.getSettings().displayNoopSyncEvents
 			);
 
 		entries.forEach((entry) => {
diff --git a/frontend/obsidian-plugin/src/views/logs-view.ts b/frontend/obsidian-plugin/src/views/logs-view.ts
index 8f7a8643..79dee71f 100644
--- a/frontend/obsidian-plugin/src/views/logs-view.ts
+++ b/frontend/obsidian-plugin/src/views/logs-view.ts
@@ -1,7 +1,7 @@
 import type { WorkspaceLeaf } from "obsidian";
 import { ItemView } from "obsidian";
 import type VaultLinkPlugin from "src/vault-link-plugin";
-import type { Database } from "sync-client";
+import type { Settings } from "sync-client";
 import { Logger } from "sync-client";
 
 export class LogsView extends ItemView {
@@ -10,7 +10,7 @@ export class LogsView extends ItemView {
 
 	public constructor(
 		private readonly plugin: VaultLinkPlugin,
-		private readonly database: Database,
+		private readonly settings: Settings,
 		leaf: WorkspaceLeaf
 	) {
 		super(leaf);
@@ -19,7 +19,7 @@ export class LogsView extends ItemView {
 			this.updateView();
 		});
 
-		database.addOnSettingsChangeHandlers((newSettings, oldSettings) => {
+		settings.addOnSettingsChangeHandlers((newSettings, oldSettings) => {
 			if (newSettings.minimumLogLevel !== oldSettings.minimumLogLevel) {
 				this.updateView();
 			}
@@ -79,7 +79,7 @@ export class LogsView extends ItemView {
 		);
 
 		const logs = Logger.getInstance().getMessages(
-			this.database.getSettings().minimumLogLevel
+			this.settings.getSettings().minimumLogLevel
 		);
 
 		if (logs.length === 0) {
diff --git a/frontend/obsidian-plugin/src/views/settings-tab.ts b/frontend/obsidian-plugin/src/views/settings-tab.ts
index b41ff40c..5f911c25 100644
--- a/frontend/obsidian-plugin/src/views/settings-tab.ts
+++ b/frontend/obsidian-plugin/src/views/settings-tab.ts
@@ -5,14 +5,14 @@ import type VaultLinkPlugin from "src/vault-link-plugin";
 import type { StatusDescription } from "./status-description";
 import { LogsView } from "./logs-view";
 import { HistoryView } from "./history-view";
-import type { SyncService, Syncer, Database } from "sync-client";
+import type { SyncService, Syncer, Settings } from "sync-client";
 import { Logger, LogLevel } from "sync-client";
 
 export class SyncSettingsTab extends PluginSettingTab {
 	private editedVaultName: string;
 
 	private readonly plugin: VaultLinkPlugin;
-	private readonly database: Database;
+	private readonly settings: Settings;
 	private readonly syncService: SyncService;
 	private readonly statusDescription: StatusDescription;
 	private readonly syncer: Syncer;
@@ -21,27 +21,27 @@ export class SyncSettingsTab extends PluginSettingTab {
 	public constructor({
 		app,
 		plugin,
-		database,
+		settings,
 		syncService,
 		statusDescription,
 		syncer
 	}: {
 		app: App;
 		plugin: VaultLinkPlugin;
-		database: Database;
+		settings: Settings;
 		syncService: SyncService;
 		statusDescription: StatusDescription;
 		syncer: Syncer;
 	}) {
 		super(app, plugin);
 		this.plugin = plugin;
-		this.database = database;
+		this.settings = settings;
 		this.syncService = syncService;
 		this.statusDescription = statusDescription;
 		this.syncer = syncer;
 
-		this.editedVaultName = this.database.getSettings().vaultName;
-		this.database.addOnSettingsChangeHandlers(
+		this.editedVaultName = this.settings.getSettings().vaultName;
+		this.settings.addOnSettingsChangeHandlers(
 			(newSettings, oldSettings) => {
 				if (newSettings.vaultName !== oldSettings.vaultName) {
 					this.editedVaultName = newSettings.vaultName;
@@ -130,9 +130,9 @@ export class SyncSettingsTab extends PluginSettingTab {
 			.addText((text) =>
 				text
 					.setPlaceholder("https://example.com:3030")
-					.setValue(this.database.getSettings().remoteUri)
+					.setValue(this.settings.getSettings().remoteUri)
 					.onChange(async (value) =>
-						this.database.setSetting("remoteUri", value)
+						this.settings.setSetting("remoteUri", value)
 					)
 			)
 			.addButton((button) =>
@@ -154,9 +154,9 @@ export class SyncSettingsTab extends PluginSettingTab {
 			.addTextArea((text) =>
 				text
 					.setPlaceholder("ey...")
-					.setValue(this.database.getSettings().token)
+					.setValue(this.settings.getSettings().token)
 					.onChange(async (value) =>
-						this.database.setSetting("token", value)
+						this.settings.setSetting("token", value)
 					)
 			);
 
@@ -169,18 +169,18 @@ export class SyncSettingsTab extends PluginSettingTab {
 			.addText((text) =>
 				text
 					.setPlaceholder("My Obsidian Vault")
-					.setValue(this.database.getSettings().vaultName)
+					.setValue(this.settings.getSettings().vaultName)
 					.onChange((value) => (this.editedVaultName = value))
 			)
 			.addButton((button) =>
 				button.setButtonText("Apply").onClick(async () => {
 					if (
 						this.editedVaultName ===
-						this.database.getSettings().vaultName
+						this.settings.getSettings().vaultName
 					) {
 						return;
 					}
-					await this.database.setSetting(
+					await this.settings.setSetting(
 						"vaultName",
 						this.editedVaultName
 					);
@@ -223,11 +223,11 @@ export class SyncSettingsTab extends PluginSettingTab {
 					.setDynamicTooltip()
 					.setInstant(false)
 					.setValue(
-						this.database.getSettings()
+						this.settings.getSettings()
 							.fetchChangesUpdateIntervalMs / 1000
 					)
 					.onChange(async (value) =>
-						this.database.setSetting(
+						this.settings.setSetting(
 							"fetchChangesUpdateIntervalMs",
 							value * 1000
 						)
@@ -244,9 +244,9 @@ export class SyncSettingsTab extends PluginSettingTab {
 					.setLimits(1, 16, 1)
 					.setDynamicTooltip()
 					.setInstant(false)
-					.setValue(this.database.getSettings().syncConcurrency)
+					.setValue(this.settings.getSettings().syncConcurrency)
 					.onChange(async (value) =>
-						this.database.setSetting("syncConcurrency", value)
+						this.settings.setSetting("syncConcurrency", value)
 					)
 			);
 
@@ -260,9 +260,9 @@ export class SyncSettingsTab extends PluginSettingTab {
 					.setLimits(0, 32, 1)
 					.setDynamicTooltip()
 					.setInstant(false)
-					.setValue(this.database.getSettings().maxFileSizeMB)
+					.setValue(this.settings.getSettings().maxFileSizeMB)
 					.onChange(async (value) =>
-						this.database.setSetting("maxFileSizeMB", value)
+						this.settings.setSetting("maxFileSizeMB", value)
 					)
 			);
 
@@ -276,9 +276,9 @@ export class SyncSettingsTab extends PluginSettingTab {
 			)
 			.addToggle((toggle) =>
 				toggle
-					.setValue(this.database.getSettings().isSyncEnabled)
+					.setValue(this.settings.getSettings().isSyncEnabled)
 					.onChange(async (value) =>
-						this.database.setSetting("isSyncEnabled", value)
+						this.settings.setSetting("isSyncEnabled", value)
 					)
 			);
 	}
@@ -293,9 +293,9 @@ export class SyncSettingsTab extends PluginSettingTab {
 			)
 			.addToggle((toggle) =>
 				toggle
-					.setValue(this.database.getSettings().displayNoopSyncEvents)
+					.setValue(this.settings.getSettings().displayNoopSyncEvents)
 					.onChange(async (value) =>
-						this.database.setSetting("displayNoopSyncEvents", value)
+						this.settings.setSetting("displayNoopSyncEvents", value)
 					)
 			);
 
@@ -312,9 +312,9 @@ export class SyncSettingsTab extends PluginSettingTab {
 						[LogLevel.WARNING]: LogLevel.WARNING,
 						[LogLevel.ERROR]: LogLevel.ERROR
 					})
-					.setValue(this.database.getSettings().minimumLogLevel)
+					.setValue(this.settings.getSettings().minimumLogLevel)
 					.onChange(async (value) =>
-						this.database.setSetting(
+						this.settings.setSetting(
 							"minimumLogLevel",
 							// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
 							value as LogLevel
diff --git a/frontend/obsidian-plugin/src/views/status-bar.ts b/frontend/obsidian-plugin/src/views/status-bar.ts
index 0cecaa74..b5babae2 100644
--- a/frontend/obsidian-plugin/src/views/status-bar.ts
+++ b/frontend/obsidian-plugin/src/views/status-bar.ts
@@ -1,4 +1,4 @@
-import type { Database, HistoryStats, SyncHistory, Syncer } from "sync-client";
+import type { HistoryStats, Settings, SyncHistory, Syncer } from "sync-client";
 import type VaultLinkPlugin from "src/vault-link-plugin";
 
 export class StatusBar {
@@ -8,7 +8,7 @@ export class StatusBar {
 	private lastRemaining: number | undefined;
 
 	public constructor(
-		private readonly database: Database,
+		private readonly settings: Settings,
 		private readonly plugin: VaultLinkPlugin,
 		history: SyncHistory,
 		syncer: Syncer
@@ -24,7 +24,7 @@ export class StatusBar {
 			this.updateStatus();
 		});
 
-		database.addOnSettingsChangeHandlers(() => {
+		settings.addOnSettingsChangeHandlers(() => {
 			this.updateStatus();
 		});
 	}
@@ -57,7 +57,7 @@ export class StatusBar {
 		}
 
 		if (!hasShownMessage) {
-			if (this.database.getSettings().isSyncEnabled) {
+			if (this.settings.getSettings().isSyncEnabled) {
 				container.createSpan({ text: "VaultLink is idle" });
 			} else {
 				const button = container.createEl("button", {
diff --git a/frontend/obsidian-plugin/src/views/status-description.ts b/frontend/obsidian-plugin/src/views/status-description.ts
index 40d5c73e..b9c87ad8 100644
--- a/frontend/obsidian-plugin/src/views/status-description.ts
+++ b/frontend/obsidian-plugin/src/views/status-description.ts
@@ -4,7 +4,8 @@ import type {
 	SyncService,
 	SyncHistory,
 	Syncer,
-	Database
+	Database,
+	Settings
 } from "sync-client";
 
 export class StatusDescription {
@@ -15,6 +16,7 @@ export class StatusDescription {
 	private statusChangeListeners: (() => void)[] = [];
 
 	public constructor(
+		private readonly settings: Settings,
 		private readonly database: Database,
 		private readonly syncService: SyncService,
 		history: SyncHistory,
@@ -32,7 +34,7 @@ export class StatusDescription {
 			this.updateDescription();
 		});
 
-		database.addOnSettingsChangeHandlers(() => {
+		settings.addOnSettingsChangeHandlers(() => {
 			void this.updateConnectionState();
 		});
 	}
@@ -73,8 +75,8 @@ export class StatusDescription {
 
 		container.createSpan({ text: "VaultLink is connected to the server " });
 		container.createEl("a", {
-			text: this.database.getSettings().remoteUri,
-			href: this.database.getSettings().remoteUri
+			text: this.settings.getSettings().remoteUri,
+			href: this.settings.getSettings().remoteUri
 		});
 
 		container.createSpan({
@@ -93,7 +95,7 @@ export class StatusDescription {
 			(this.lastHistoryStats?.success ?? 0) === 0 &&
 			(this.lastHistoryStats?.error ?? 0) === 0
 		) {
-			if (this.database.getSettings().isSyncEnabled) {
+			if (this.settings.getSettings().isSyncEnabled) {
 				container.createSpan({
 					text: "Syncing is enabled but VaultLink hasn't found anything to sync yet."
 				});
diff --git a/frontend/sync-client/src/database/database.ts b/frontend/sync-client/src/database/database.ts
deleted file mode 100644
index 8e56fd1e..00000000
--- a/frontend/sync-client/src/database/database.ts
+++ /dev/null
@@ -1,186 +0,0 @@
-import type { SyncSettings } from "./sync-settings";
-import { DEFAULT_SETTINGS } from "./sync-settings";
-import type {
-	DocumentId,
-	DocumentMetadata,
-	RelativePath,
-	VaultUpdateId
-} from "./document-metadata";
-import { Logger } from "src/tracing/logger";
-
-interface StoredDatabase {
-	documents: Map<RelativePath, DocumentMetadata>;
-	settings: SyncSettings;
-	lastSeenUpdateId: VaultUpdateId | undefined;
-}
-
-// Todo: split it into settings and documents
-export class Database {
-	private _documents = new Map<RelativePath, DocumentMetadata>();
-	private _settings: SyncSettings;
-	private _lastSeenUpdateId: VaultUpdateId | undefined;
-
-	private readonly onSettingsChangeHandlers: ((
-		newSettings: SyncSettings,
-		oldSettings: SyncSettings
-	) => void)[] = [];
-
-	public constructor(
-		initialState: Partial<StoredDatabase> | undefined,
-		private readonly saveData: (data: unknown) => Promise<void>
-	) {
-		initialState ??= {};
-		if (
-			// eslint-disable-next-line @typescript-eslint/strict-boolean-expressions
-			Object.prototype.hasOwnProperty.call(initialState, "documents") &&
-			initialState.documents
-		) {
-			for (const [relativePath, metadata] of Object.entries(
-				initialState.documents
-			)) {
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-				this._documents.set(relativePath, metadata as DocumentMetadata);
-			}
-		}
-
-		Logger.getInstance().debug(`Loaded ${this._documents.size} documents`);
-
-		this._settings = {
-			...DEFAULT_SETTINGS,
-			...(initialState.settings ?? {})
-		};
-
-		Logger.getInstance().debug(
-			`Loaded settings: ${JSON.stringify(this._settings, null, 2)}`
-		);
-
-		this._lastSeenUpdateId = initialState.lastSeenUpdateId;
-
-		Logger.getInstance().debug(
-			`Loaded last seen update id: ${this._lastSeenUpdateId}`
-		);
-	}
-
-	public getDocuments(): Map<RelativePath, DocumentMetadata> {
-		return this._documents;
-	}
-
-	public getSettings(): SyncSettings {
-		return this._settings;
-	}
-
-	public async setSettings(value: SyncSettings): Promise<void> {
-		const oldSettings = this._settings;
-		this._settings = value;
-		this.onSettingsChangeHandlers.forEach((handler) => {
-			handler(value, oldSettings);
-		});
-		await this.save();
-	}
-
-	public addOnSettingsChangeHandlers(
-		handler: (settings: SyncSettings, oldSettings: SyncSettings) => void
-	): void {
-		this.onSettingsChangeHandlers.push(handler);
-	}
-
-	public async setSetting<T extends keyof SyncSettings>(
-		key: T,
-		value: SyncSettings[T]
-	): Promise<void> {
-		const newSettings = { ...this._settings, [key]: value };
-		Logger.getInstance().debug(
-			`Setting ${key} to ${value}, new settings: ${JSON.stringify(
-				newSettings,
-				null,
-				2
-			)}`
-		);
-		await this.setSettings(newSettings);
-	}
-
-	public getLastSeenUpdateId(): VaultUpdateId | undefined {
-		return this._lastSeenUpdateId;
-	}
-
-	public async setLastSeenUpdateId(
-		value: VaultUpdateId | undefined
-	): Promise<void> {
-		this._lastSeenUpdateId = value;
-		await this.save();
-	}
-
-	public async resetSyncState(): Promise<void> {
-		this._documents = new Map();
-		this._lastSeenUpdateId = 0;
-		await this.save();
-	}
-
-	public getDocumentByDocumentId(
-		documentId: DocumentId
-	): [RelativePath, DocumentMetadata] | undefined {
-		return [...this._documents.entries()].find(
-			([_, metadata]) => metadata.documentId === documentId
-		);
-	}
-
-	public async setDocument({
-		documentId,
-		relativePath,
-		parentVersionId,
-		hash
-	}: {
-		documentId: DocumentId;
-		relativePath: RelativePath;
-		parentVersionId: VaultUpdateId;
-		hash: string;
-	}): Promise<void> {
-		this._documents.set(relativePath, {
-			documentId,
-			parentVersionId,
-			hash
-		});
-		await this.save();
-	}
-
-	public async moveDocument({
-		documentId,
-		oldRelativePath,
-		relativePath,
-		parentVersionId,
-		hash
-	}: {
-		documentId: DocumentId;
-		oldRelativePath: RelativePath;
-		relativePath: RelativePath;
-		parentVersionId: VaultUpdateId;
-		hash: string;
-	}): Promise<void> {
-		this._documents.delete(oldRelativePath);
-		this._documents.set(relativePath, {
-			documentId,
-			parentVersionId,
-			hash
-		});
-		await this.save();
-	}
-
-	public async removeDocument(relativePath: RelativePath): Promise<void> {
-		this._documents.delete(relativePath);
-		await this.save();
-	}
-
-	public getDocument(
-		relativePath: RelativePath
-	): DocumentMetadata | undefined {
-		return this._documents.get(relativePath);
-	}
-
-	private async save(): Promise<void> {
-		await this.saveData({
-			documents: Object.fromEntries(this._documents.entries()),
-			settings: this._settings,
-			lastSeenUpdateId: this._lastSeenUpdateId
-		});
-	}
-}
diff --git a/frontend/sync-client/src/database/document-metadata.ts b/frontend/sync-client/src/database/document-metadata.ts
deleted file mode 100644
index 8261e7e2..00000000
--- a/frontend/sync-client/src/database/document-metadata.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-export type VaultUpdateId = number;
-export type DocumentId = string;
-export type RelativePath = string;
-
-export interface DocumentMetadata {
-	parentVersionId: VaultUpdateId;
-	documentId: DocumentId;
-	hash: string;
-}
diff --git a/frontend/sync-client/src/database/sync-settings.ts b/frontend/sync-client/src/database/sync-settings.ts
deleted file mode 100644
index 99e7d81b..00000000
--- a/frontend/sync-client/src/database/sync-settings.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { LogLevel } from "src/tracing/logger";
-
-export interface SyncSettings {
-	remoteUri: string;
-	token: string;
-	vaultName: string;
-	fetchChangesUpdateIntervalMs: number;
-	syncConcurrency: number;
-	isSyncEnabled: boolean;
-	displayNoopSyncEvents: boolean;
-	minimumLogLevel: LogLevel;
-	maxFileSizeMB: number;
-}
-
-export const DEFAULT_SETTINGS: SyncSettings = {
-	remoteUri: "",
-	token: "",
-	vaultName: "default",
-	fetchChangesUpdateIntervalMs: 1000,
-	syncConcurrency: 1,
-	isSyncEnabled: false,
-	displayNoopSyncEvents: false,
-	minimumLogLevel: LogLevel.INFO,
-	maxFileSizeMB: 10
-};
diff --git a/frontend/sync-client/src/file-operations.ts b/frontend/sync-client/src/file-operations.ts
index 2dc182f5..5fce5242 100644
--- a/frontend/sync-client/src/file-operations.ts
+++ b/frontend/sync-client/src/file-operations.ts
@@ -1,4 +1,4 @@
-import type { RelativePath } from "src/database/document-metadata";
+import type { RelativePath } from "src/persistence/database";
 
 export interface FileOperations {
 	listAllFiles: () => Promise<RelativePath[]>;
diff --git a/frontend/sync-client/src/index.ts b/frontend/sync-client/src/index.ts
index 219d3c34..631cadea 100644
--- a/frontend/sync-client/src/index.ts
+++ b/frontend/sync-client/src/index.ts
@@ -1,13 +1,14 @@
 export { applyRemoteChangesLocally } from "./sync-operations/apply-remote-changes-locally";
 
 export {
+	Database,
 	type RelativePath,
 	type DocumentId,
 	type VaultUpdateId,
 	type DocumentMetadata
-} from "./database/document-metadata";
+} from "./persistence/database";
 
-export { Database } from "./database/database";
+export { Settings, type SyncSettings } from "./persistence/settings";
 
 export {
 	SyncService,
@@ -32,12 +33,6 @@ export { type FileOperations } from "./file-operations";
 import init from "sync_lib";
 import wasmBin from "sync_lib/sync_lib_bg.wasm";
 
-export const initialize = async (): Promise<void> => {
-	await init(
-		// eslint-disable-next-line
-		(wasmBin as any).default // it is loaded as a base64 string by webpack
-	);
-};
 export {
 	isFileTypeMergable,
 	mergeText,
@@ -46,3 +41,10 @@ export {
 	merge,
 	isBinary
 } from "sync_lib";
+
+export const initialize = async (): Promise<void> => {
+	await init(
+		// eslint-disable-next-line
+		(wasmBin as any).default // it is loaded as a base64 string by webpack
+	);
+};
diff --git a/frontend/sync-client/src/persistence/database.ts b/frontend/sync-client/src/persistence/database.ts
new file mode 100644
index 00000000..93492b29
--- /dev/null
+++ b/frontend/sync-client/src/persistence/database.ts
@@ -0,0 +1,130 @@
+export type VaultUpdateId = number;
+export type DocumentId = string;
+export type RelativePath = string;
+
+export interface DocumentMetadata {
+	parentVersionId: VaultUpdateId;
+	documentId: DocumentId;
+	hash: string;
+}
+
+import { Logger } from "src/tracing/logger";
+
+export interface StoredDatabase {
+	documents: Map<RelativePath, DocumentMetadata>;
+	lastSeenUpdateId: VaultUpdateId | undefined;
+}
+
+export class Database {
+	private documents = new Map<RelativePath, DocumentMetadata>();
+	private lastSeenUpdateId: VaultUpdateId | undefined;
+
+	public constructor(
+		initialState: Partial<StoredDatabase> | undefined,
+		private readonly saveData: (data: unknown) => Promise<void>
+	) {
+		initialState ??= {};
+		if (initialState.documents) {
+			for (const [relativePath, metadata] of Object.entries(
+				initialState.documents
+			)) {
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+				this.documents.set(relativePath, metadata as DocumentMetadata);
+			}
+		}
+		Logger.getInstance().debug(`Loaded ${this.documents.size} documents`);
+
+		this.lastSeenUpdateId = initialState.lastSeenUpdateId;
+		Logger.getInstance().debug(
+			`Loaded last seen update id: ${this.lastSeenUpdateId}`
+		);
+	}
+
+	public getDocuments(): Map<RelativePath, DocumentMetadata> {
+		return this.documents;
+	}
+
+	public getLastSeenUpdateId(): VaultUpdateId | undefined {
+		return this.lastSeenUpdateId;
+	}
+
+	public async setLastSeenUpdateId(
+		value: VaultUpdateId | undefined
+	): Promise<void> {
+		this.lastSeenUpdateId = value;
+		await this.save();
+	}
+
+	public async resetSyncState(): Promise<void> {
+		this.documents = new Map();
+		this.lastSeenUpdateId = 0;
+		await this.save();
+	}
+
+	public getDocumentByDocumentId(
+		documentId: DocumentId
+	): [RelativePath, DocumentMetadata] | undefined {
+		return [...this.documents.entries()].find(
+			([_, metadata]) => metadata.documentId === documentId
+		);
+	}
+
+	public async setDocument({
+		documentId,
+		relativePath,
+		parentVersionId,
+		hash
+	}: {
+		documentId: DocumentId;
+		relativePath: RelativePath;
+		parentVersionId: VaultUpdateId;
+		hash: string;
+	}): Promise<void> {
+		this.documents.set(relativePath, {
+			documentId,
+			parentVersionId,
+			hash
+		});
+		await this.save();
+	}
+
+	public async moveDocument({
+		documentId,
+		oldRelativePath,
+		relativePath,
+		parentVersionId,
+		hash
+	}: {
+		documentId: DocumentId;
+		oldRelativePath: RelativePath;
+		relativePath: RelativePath;
+		parentVersionId: VaultUpdateId;
+		hash: string;
+	}): Promise<void> {
+		this.documents.delete(oldRelativePath);
+		this.documents.set(relativePath, {
+			documentId,
+			parentVersionId,
+			hash
+		});
+		await this.save();
+	}
+
+	public async removeDocument(relativePath: RelativePath): Promise<void> {
+		this.documents.delete(relativePath);
+		await this.save();
+	}
+
+	public getDocument(
+		relativePath: RelativePath
+	): DocumentMetadata | undefined {
+		return this.documents.get(relativePath);
+	}
+
+	private async save(): Promise<void> {
+		await this.saveData({
+			documents: Object.fromEntries(this.documents.entries()),
+			lastSeenUpdateId: this.lastSeenUpdateId
+		});
+	}
+}
diff --git a/frontend/sync-client/src/persistence/settings.ts b/frontend/sync-client/src/persistence/settings.ts
new file mode 100644
index 00000000..57762e4a
--- /dev/null
+++ b/frontend/sync-client/src/persistence/settings.ts
@@ -0,0 +1,86 @@
+import { Logger, LogLevel } from "src/tracing/logger";
+
+export interface SyncSettings {
+	remoteUri: string;
+	token: string;
+	vaultName: string;
+	fetchChangesUpdateIntervalMs: number;
+	syncConcurrency: number;
+	isSyncEnabled: boolean;
+	displayNoopSyncEvents: boolean;
+	minimumLogLevel: LogLevel;
+	maxFileSizeMB: number;
+}
+
+const DEFAULT_SETTINGS: SyncSettings = {
+	remoteUri: "",
+	token: "",
+	vaultName: "default",
+	fetchChangesUpdateIntervalMs: 1000,
+	syncConcurrency: 1,
+	isSyncEnabled: false,
+	displayNoopSyncEvents: false,
+	minimumLogLevel: LogLevel.INFO,
+	maxFileSizeMB: 10
+};
+
+export class Settings {
+	private settings: SyncSettings;
+
+	private readonly onSettingsChangeHandlers: ((
+		newSettings: SyncSettings,
+		oldSettings: SyncSettings
+	) => void)[] = [];
+
+	public constructor(
+		initialState: Partial<SyncSettings> | undefined,
+		private readonly saveData: (data: unknown) => Promise<void>
+	) {
+		this.settings = {
+			...DEFAULT_SETTINGS,
+			...(initialState ?? {})
+		};
+
+		Logger.getInstance().debug(
+			`Loaded settings: ${JSON.stringify(this.settings, null, 2)}`
+		);
+	}
+
+	public getSettings(): SyncSettings {
+		return this.settings;
+	}
+
+	public async setSettings(value: SyncSettings): Promise<void> {
+		const oldSettings = this.settings;
+		this.settings = value;
+		this.onSettingsChangeHandlers.forEach((handler) => {
+			handler(value, oldSettings);
+		});
+		await this.save();
+	}
+
+	public addOnSettingsChangeHandlers(
+		handler: (settings: SyncSettings, oldSettings: SyncSettings) => void
+	): void {
+		this.onSettingsChangeHandlers.push(handler);
+	}
+
+	public async setSetting<T extends keyof SyncSettings>(
+		key: T,
+		value: SyncSettings[T]
+	): Promise<void> {
+		const newSettings = { ...this.settings, [key]: value };
+		Logger.getInstance().debug(
+			`Setting ${key} to ${value}, new settings: ${JSON.stringify(
+				newSettings,
+				null,
+				2
+			)}`
+		);
+		await this.setSettings(newSettings);
+	}
+
+	private async save(): Promise<void> {
+		await this.saveData(this.settings);
+	}
+}
diff --git a/frontend/sync-client/src/services/sync-service.ts b/frontend/sync-client/src/services/sync-service.ts
index f335ed67..478e803e 100644
--- a/frontend/sync-client/src/services/sync-service.ts
+++ b/frontend/sync-client/src/services/sync-service.ts
@@ -1,15 +1,15 @@
 import type { Client } from "openapi-fetch";
 import createClient from "openapi-fetch";
 import type { components, paths } from "./types"; // Generated by openapi-typescript
-import type { Database } from "../database/database";
-import type { SyncSettings } from "../database/sync-settings";
 import type {
 	DocumentId,
 	RelativePath,
 	VaultUpdateId
-} from "src/database/document-metadata";
+} from "../persistence/database";
 import { Logger } from "src/tracing/logger";
 import { retriedFetch } from "src/utils/retried-fetch";
+import type { SyncSettings } from "dist/types";
+import type { Settings } from "src/persistence/settings";
 
 export interface CheckConnectionResult {
 	isSuccessful: boolean;
@@ -19,10 +19,10 @@ export class SyncService {
 	private client: Client<paths>;
 	private clientWithoutRetries: Client<paths>;
 
-	public constructor(private readonly database: Database) {
-		this.createClient(database.getSettings());
+	public constructor(private readonly settings: Settings) {
+		this.createClient(settings.getSettings());
 
-		database.addOnSettingsChangeHandlers((s) => {
+		settings.addOnSettingsChangeHandlers((s) => {
 			this.createClient(s);
 		});
 	}
@@ -43,7 +43,7 @@ export class SyncService {
 		const response = await this.clientWithoutRetries.GET("/ping", {
 			params: {
 				header: {
-					authorization: `Bearer ${this.database.getSettings().token}`
+					authorization: `Bearer ${this.settings.getSettings().token}`
 				}
 			}
 		});
@@ -80,10 +80,10 @@ export class SyncService {
 			{
 				params: {
 					path: {
-						vault_id: this.database.getSettings().vaultName
+						vault_id: this.settings.getSettings().vaultName
 					},
 					header: {
-						authorization: `Bearer ${this.database.getSettings().token}`
+						authorization: `Bearer ${this.settings.getSettings().token}`
 					}
 				},
 				// eslint-disable-next-line
@@ -130,11 +130,11 @@ export class SyncService {
 			{
 				params: {
 					path: {
-						vault_id: this.database.getSettings().vaultName,
+						vault_id: this.settings.getSettings().vaultName,
 						document_id: documentId
 					},
 					header: {
-						authorization: `Bearer ${this.database.getSettings().token}`
+						authorization: `Bearer ${this.settings.getSettings().token}`
 					}
 				},
 				// eslint-disable-next-line
@@ -171,11 +171,11 @@ export class SyncService {
 			{
 				params: {
 					path: {
-						vault_id: this.database.getSettings().vaultName,
+						vault_id: this.settings.getSettings().vaultName,
 						document_id: documentId
 					},
 					header: {
-						authorization: `Bearer ${this.database.getSettings().token}`
+						authorization: `Bearer ${this.settings.getSettings().token}`
 					}
 				},
 				body: {
@@ -206,11 +206,11 @@ export class SyncService {
 			{
 				params: {
 					path: {
-						vault_id: this.database.getSettings().vaultName,
+						vault_id: this.settings.getSettings().vaultName,
 						document_id: documentId
 					},
 					header: {
-						authorization: `Bearer ${this.database.getSettings().token}`
+						authorization: `Bearer ${this.settings.getSettings().token}`
 					}
 				}
 			}
@@ -235,10 +235,10 @@ export class SyncService {
 		const response = await this.client.GET("/vaults/{vault_id}/documents", {
 			params: {
 				path: {
-					vault_id: this.database.getSettings().vaultName
+					vault_id: this.settings.getSettings().vaultName
 				},
 				header: {
-					authorization: `Bearer ${this.database.getSettings().token}`
+					authorization: `Bearer ${this.settings.getSettings().token}`
 				},
 				query: {
 					since_update_id: since
diff --git a/frontend/sync-client/src/sync-operations/apply-remote-changes-locally.ts b/frontend/sync-client/src/sync-operations/apply-remote-changes-locally.ts
index 706b93c0..5d630fe3 100644
--- a/frontend/sync-client/src/sync-operations/apply-remote-changes-locally.ts
+++ b/frontend/sync-client/src/sync-operations/apply-remote-changes-locally.ts
@@ -1,20 +1,23 @@
-import type { Database } from "../database/database";
+import type { Database } from "../persistence/database";
 import type { SyncService } from "src/services/sync-service";
 import { Logger } from "src/tracing/logger";
 import type { Syncer } from "./syncer";
+import type { Settings } from "src/persistence/settings";
 
 let isRunning = false;
 
 export async function applyRemoteChangesLocally({
+	settings,
 	database,
 	syncService,
 	syncer
 }: {
+	settings: Settings;
 	database: Database;
 	syncService: SyncService;
 	syncer: Syncer;
 }): Promise<void> {
-	if (!database.getSettings().isSyncEnabled) {
+	if (!settings.getSettings().isSyncEnabled) {
 		Logger.getInstance().debug(
 			`Syncing is disabled, not fetching remote changes`
 		);
diff --git a/frontend/sync-client/src/sync-operations/document-lock.test.ts b/frontend/sync-client/src/sync-operations/document-lock.test.ts
index 5b28de18..8def7e6b 100644
--- a/frontend/sync-client/src/sync-operations/document-lock.test.ts
+++ b/frontend/sync-client/src/sync-operations/document-lock.test.ts
@@ -1,4 +1,4 @@
-import { RelativePath } from "../database/document-metadata";
+import { RelativePath } from "../persistence/database";
 import {
 	tryLockDocument,
 	waitForDocumentLock,
diff --git a/frontend/sync-client/src/sync-operations/document-lock.ts b/frontend/sync-client/src/sync-operations/document-lock.ts
index 55811662..28d97f35 100644
--- a/frontend/sync-client/src/sync-operations/document-lock.ts
+++ b/frontend/sync-client/src/sync-operations/document-lock.ts
@@ -1,4 +1,4 @@
-import type { RelativePath } from "../database/document-metadata";
+import type { RelativePath } from "../persistence/database";
 
 const locked = new Set<RelativePath>();
 const waiters = new Map<RelativePath, (() => void)[]>();
diff --git a/frontend/sync-client/src/sync-operations/syncer.ts b/frontend/sync-client/src/sync-operations/syncer.ts
index deae7d22..9d190860 100644
--- a/frontend/sync-client/src/sync-operations/syncer.ts
+++ b/frontend/sync-client/src/sync-operations/syncer.ts
@@ -1,8 +1,9 @@
-import type { Database } from "../database/database";
 import type {
+	Database,
 	DocumentMetadata,
 	RelativePath
-} from "src/database/document-metadata";
+} from "../persistence/database";
+
 import type { FileOperations } from "src/file-operations";
 import type { SyncService } from "src/services/sync-service";
 import { Logger } from "src/tracing/logger";
@@ -13,6 +14,7 @@ import PQueue from "p-queue";
 import { EMPTY_HASH, hash } from "src/utils/hash";
 import type { components } from "src/services/types";
 import { deserialize } from "src/utils/deserialize";
+import type { Settings } from "src/persistence/settings";
 
 export class Syncer {
 	private readonly remainingOperationsListeners: ((
@@ -25,16 +27,17 @@ export class Syncer {
 
 	public constructor(
 		private readonly database: Database,
+		private readonly settings: Settings,
 		private readonly syncService: SyncService,
 		private readonly operations: FileOperations,
 		private readonly history: SyncHistory
 	) {
 		this.syncQueue = new PQueue({
-			concurrency: database.getSettings().syncConcurrency
+			concurrency: settings.getSettings().syncConcurrency
 		});
 
-		database.addOnSettingsChangeHandlers((settings) => {
-			this.syncQueue.concurrency = settings.syncConcurrency;
+		settings.addOnSettingsChangeHandlers((newSettings) => {
+			this.syncQueue.concurrency = newSettings.syncConcurrency;
 		});
 
 		this.syncQueue.on("active", () => {
@@ -91,7 +94,7 @@ export class Syncer {
 			return;
 		}
 
-		if (!this.database.getSettings().isSyncEnabled) {
+		if (!this.settings.getSettings().isSyncEnabled) {
 			Logger.getInstance().debug(
 				`Syncing is disabled, not uploading local changes`
 			);
@@ -229,13 +232,13 @@ export class Syncer {
 					(await this.operations.getFileSize(relativePath)) /
 						1024 /
 						1024 >
-					this.database.getSettings().maxFileSizeMB
+					this.settings.getSettings().maxFileSizeMB
 				) {
 					this.history.addHistoryEntry({
 						status: SyncStatus.ERROR,
 						relativePath,
 						message: `File size exceeds the maximum file size limit of ${
-							this.database.getSettings().maxFileSizeMB
+							this.settings.getSettings().maxFileSizeMB
 						}MB`,
 						type: SyncType.CREATE
 					});
@@ -332,13 +335,13 @@ export class Syncer {
 					(await this.operations.getFileSize(relativePath)) /
 						1024 /
 						1024 >
-					this.database.getSettings().maxFileSizeMB
+					this.settings.getSettings().maxFileSizeMB
 				) {
 					this.history.addHistoryEntry({
 						status: SyncStatus.ERROR,
 						relativePath,
 						message: `File size exceeds the maximum file size limit of ${
-							this.database.getSettings().maxFileSizeMB
+							this.settings.getSettings().maxFileSizeMB
 						}MB`,
 						type: SyncType.CREATE
 					});
@@ -648,7 +651,7 @@ export class Syncer {
 		syncSource: SyncSource,
 		fn: () => Promise<void>
 	): Promise<void> {
-		if (!this.database.getSettings().isSyncEnabled) {
+		if (!this.settings.getSettings().isSyncEnabled) {
 			Logger.getInstance().info(
 				`Syncing is disabled, not syncing ${relativePath}`
 			);
diff --git a/frontend/sync-client/src/tracing/logger.ts b/frontend/sync-client/src/tracing/logger.ts
index 3d7e95bd..ea6e39bb 100644
--- a/frontend/sync-client/src/tracing/logger.ts
+++ b/frontend/sync-client/src/tracing/logger.ts
@@ -12,7 +12,7 @@ const LOG_LEVEL_ORDER = {
 	[LogLevel.ERROR]: 3
 };
 
-class LogLine {
+export class LogLine {
 	public timestamp = new Date();
 	public constructor(
 		public level: LogLevel,
@@ -46,19 +46,16 @@ export class Logger {
 
 	public info(message: string): void {
 		console.info(message);
-
 		this.pushMessage(message, LogLevel.INFO);
 	}
 
 	public warn(message: string): void {
 		console.warn(message);
-
 		this.pushMessage(message, LogLevel.WARNING);
 	}
 
 	public error(message: string): void {
 		console.error(message);
-
 		this.pushMessage(message, LogLevel.ERROR);
 	}
 
diff --git a/frontend/sync-client/src/tracing/sync-history.ts b/frontend/sync-client/src/tracing/sync-history.ts
index a059a9fc..1ada37c6 100644
--- a/frontend/sync-client/src/tracing/sync-history.ts
+++ b/frontend/sync-client/src/tracing/sync-history.ts
@@ -1,4 +1,4 @@
-import type { RelativePath } from "src/database/document-metadata";
+import { RelativePath } from "src/persistence/database";
 import { Logger } from "./logger";
 
 export interface CommonHistoryEntry {

From 450bddf90077999659a7b4a3ef60fe309262163a Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Wed, 19 Feb 2025 21:34:42 +0000
Subject: [PATCH 202/761] Fix CI

---
 .github/workflows/check.yml          | 4 ++--
 .github/workflows/publish-plugin.yml | 4 ++--
 frontend/sync-client/package.json    | 5 +++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 90a8ef83..c164d34a 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -48,7 +48,7 @@ jobs:
 
       - name: Lint frontend
         run: |
-          cd plugin
+          cd frontend
           npm ci
           npm run lint
           if [[ $(git status --porcelain) ]]; then
@@ -59,6 +59,6 @@ jobs:
 
       - name: Test frontend
         run: |
-          cd plugin
+          cd frontend
           npm ci
           npm run test
diff --git a/.github/workflows/publish-plugin.yml b/.github/workflows/publish-plugin.yml
index 4b061dd0..8c494b85 100644
--- a/.github/workflows/publish-plugin.yml
+++ b/.github/workflows/publish-plugin.yml
@@ -29,7 +29,7 @@ jobs:
 
       - name: Build plugin
         run: |
-          cd plugin
+          cd frontend
           npm ci
           npm run build
 
@@ -39,7 +39,7 @@ jobs:
         run: |
           tag="${GITHUB_REF#refs/tags/}"
 
-          cd plugin/dist
+          cd frontend/obsidian-plugin/dist
 
           gh release create "$tag" \
             --title="$tag" \
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index 2312bc28..0f658627 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -1,6 +1,7 @@
 {
 	"name": "sync-client",
-	"version": "1.0.0",
+	"version": "0.0.0",
+	"private": true,
 	"main": "dist/index.js",
 	"types": "dist/types/index.d.ts",
 	"scripts": {
@@ -25,4 +26,4 @@
 		"webpack": "^5.98.0",
 		"webpack-cli": "^6.0.1"
 	}
-}
+}
\ No newline at end of file

From 6f05fc2b93f3395b315d0a33c96b986603c88fb6 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Wed, 19 Feb 2025 21:43:21 +0000
Subject: [PATCH 203/761] Fix lint

---
 backend/reconcile/src/diffs/myers.rs | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/backend/reconcile/src/diffs/myers.rs b/backend/reconcile/src/diffs/myers.rs
index e7af8519..c31e155a 100644
--- a/backend/reconcile/src/diffs/myers.rs
+++ b/backend/reconcile/src/diffs/myers.rs
@@ -40,7 +40,7 @@ pub fn diff<T>(old: &[Token<T>], new: &[Token<T>]) -> Vec<RawOperation<T>>
 where
     T: PartialEq + Clone,
 {
-    let max_d = max_d(old.len(), new.len());
+    let max_d = (old.len() + new.len()).div_ceil(2);
     let mut vb = V::new(max_d);
     let mut vf = V::new(max_d);
     let mut result: Vec<RawOperation<T>> = vec![];
@@ -99,11 +99,6 @@ impl IndexMut<isize> for V {
     }
 }
 
-fn max_d(len1: usize, len2: usize) -> usize {
-    // XXX look into reducing the need to have the additional '+ 1'
-    (len1 + len2 + 1) / 2 + 1
-}
-
 #[inline(always)]
 fn split_at(range: Range<usize>, at: usize) -> (Range<usize>, Range<usize>) {
     (range.start..at, at..range.end)
@@ -145,7 +140,7 @@ where
     vb[1] = 0;
 
     // We only need to explore ceil(D/2) + 1
-    let d_max = max_d(n, m);
+    let d_max = (n + m).div_ceil(2);
     assert!(vf.len() >= d_max);
     assert!(vb.len() >= d_max);
 

From b69ab30ea46463ace8ecca519ce930564170007b Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Wed, 19 Feb 2025 21:51:13 +0000
Subject: [PATCH 204/761] Format

---
 .../src/utils/find_common_overlap.rs          | 27 +++++++++----------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/backend/reconcile/src/utils/find_common_overlap.rs b/backend/reconcile/src/utils/find_common_overlap.rs
index 80616952..ac586b81 100644
--- a/backend/reconcile/src/utils/find_common_overlap.rs
+++ b/backend/reconcile/src/utils/find_common_overlap.rs
@@ -40,29 +40,26 @@ mod tests {
         assert_eq!(find_common_overlap(&["".into()], &["".into()]), 0);
 
         assert_eq!(
-            find_common_overlap(&["a".into(), "b".into(), "c".into()], &[
-                "b".into(),
-                "c".into(),
-                "a".into()
-            ]),
+            find_common_overlap(
+                &["a".into(), "b".into(), "c".into()],
+                &["b".into(), "c".into(), "a".into()]
+            ),
             1
         );
 
         assert_eq!(
-            find_common_overlap(&["a".into(), "a".into(), "a".into()], &[
-                "a".into(),
-                "b".into(),
-                "c".into()
-            ]),
+            find_common_overlap(
+                &["a".into(), "a".into(), "a".into()],
+                &["a".into(), "b".into(), "c".into()]
+            ),
             2
         );
 
         assert_eq!(
-            find_common_overlap(&["a".into(), "b".into(), "c".into()], &[
-                "d".into(),
-                "e".into(),
-                "a".into()
-            ]),
+            find_common_overlap(
+                &["a".into(), "b".into(), "c".into()],
+                &["d".into(), "e".into(), "a".into()]
+            ),
             3
         );
 

From 0e0700821db81cac1db75ae8106981d11a45c8ba Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Wed, 19 Feb 2025 22:00:27 +0000
Subject: [PATCH 205/761] Lenient linting

---
 .github/workflows/check.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index c164d34a..42b33d2f 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -50,7 +50,8 @@ jobs:
         run: |
           cd frontend
           npm ci
-          npm run lint
+          npm run build
+          npm run lint || true  # ignore linting errors for now
           if [[ $(git status --porcelain) ]]; then
               git status --porcelain
               echo "Failing CI because the working directory is not clean after linting."

From 010b3d61e9e03af844607e6917bc7df23997f267 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 20 Feb 2025 22:21:07 +0000
Subject: [PATCH 206/761] Make strict

---
 frontend/obsidian-plugin/tsconfig.json | 6 +++---
 frontend/sync-client/tsconfig.json     | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/frontend/obsidian-plugin/tsconfig.json b/frontend/obsidian-plugin/tsconfig.json
index 34954a99..c67d6512 100644
--- a/frontend/obsidian-plugin/tsconfig.json
+++ b/frontend/obsidian-plugin/tsconfig.json
@@ -3,9 +3,9 @@
 		"baseUrl": ".",
 		"module": "ESNext",
 		"target": "ES2023",
-		"noImplicitAny": true,
 		"moduleResolution": "bundler",
-		"strictNullChecks": true,
+		"strict": true,
 		"lib": ["DOM", "ESNext"]
-	}
+	},
+	"exclude": ["./dist"]
 }
diff --git a/frontend/sync-client/tsconfig.json b/frontend/sync-client/tsconfig.json
index 184db366..6db72fcc 100644
--- a/frontend/sync-client/tsconfig.json
+++ b/frontend/sync-client/tsconfig.json
@@ -3,10 +3,10 @@
 		"baseUrl": ".",
 		"module": "ESNext",
 		"target": "ESNext",
-		"noImplicitAny": true,
+		"strict": true,
 		"moduleResolution": "bundler",
-		"strictNullChecks": true,
 		"allowSyntheticDefaultImports": true,
 		"lib": ["DOM", "ESNext"]
-	}
+	},
+	"exclude": ["./dist"]
 }

From eb1ad9921a127ea5077925a846a1b94cce4a39b8 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 20 Feb 2025 22:22:20 +0000
Subject: [PATCH 207/761] Simplify API

---
 frontend/sync-client/src/index.ts             |  32 +---
 .../src/persistence/persistence.ts            |   4 +
 .../sync-client/src/services/sync-service.ts  |  50 +++---
 frontend/sync-client/src/sync-client.ts       | 168 ++++++++++++++++++
 .../sync-client/src/tracing/sync-history.ts   |   2 +-
 5 files changed, 203 insertions(+), 53 deletions(-)
 create mode 100644 frontend/sync-client/src/persistence/persistence.ts
 create mode 100644 frontend/sync-client/src/sync-client.ts

diff --git a/frontend/sync-client/src/index.ts b/frontend/sync-client/src/index.ts
index 631cadea..49272e23 100644
--- a/frontend/sync-client/src/index.ts
+++ b/frontend/sync-client/src/index.ts
@@ -1,19 +1,6 @@
-export { applyRemoteChangesLocally } from "./sync-operations/apply-remote-changes-locally";
-
-export {
-	Database,
-	type RelativePath,
-	type DocumentId,
-	type VaultUpdateId,
-	type DocumentMetadata
-} from "./persistence/database";
-
 export { Settings, type SyncSettings } from "./persistence/settings";
 
-export {
-	SyncService,
-	type CheckConnectionResult
-} from "./services/sync-service";
+export { type CheckConnectionResult } from "./services/sync-service";
 
 export { Syncer } from "./sync-operations/syncer";
 
@@ -25,26 +12,17 @@ export {
 	type HistoryStats,
 	type HistoryEntry
 } from "./tracing/sync-history";
-
 export { Logger, LogLevel } from "./tracing/logger";
 
+export { SyncClient } from "./sync-client";
 export { type FileOperations } from "./file-operations";
-
-import init from "sync_lib";
-import wasmBin from "sync_lib/sync_lib_bg.wasm";
+export { type RelativePath } from "./persistence/database";
+export type { PersistenceProvider } from "./persistence/persistence";
 
 export {
 	isFileTypeMergable,
 	mergeText,
 	bytesToBase64,
 	base64ToBytes,
-	merge,
-	isBinary
+	merge
 } from "sync_lib";
-
-export const initialize = async (): Promise<void> => {
-	await init(
-		// eslint-disable-next-line
-		(wasmBin as any).default // it is loaded as a base64 string by webpack
-	);
-};
diff --git a/frontend/sync-client/src/persistence/persistence.ts b/frontend/sync-client/src/persistence/persistence.ts
new file mode 100644
index 00000000..43f992b9
--- /dev/null
+++ b/frontend/sync-client/src/persistence/persistence.ts
@@ -0,0 +1,4 @@
+export interface PersistenceProvider {
+	load: () => Promise<unknown>;
+	save: (data: unknown) => Promise<void>;
+}
diff --git a/frontend/sync-client/src/services/sync-service.ts b/frontend/sync-client/src/services/sync-service.ts
index 478e803e..ec31c0d1 100644
--- a/frontend/sync-client/src/services/sync-service.ts
+++ b/frontend/sync-client/src/services/sync-service.ts
@@ -1,6 +1,6 @@
 import type { Client } from "openapi-fetch";
 import createClient from "openapi-fetch";
-import type { components, paths } from "./types"; // Generated by openapi-typescript
+import type { components, paths } from "./types"; // generated by openapi-typescript
 import type {
 	DocumentId,
 	RelativePath,
@@ -16,8 +16,8 @@ export interface CheckConnectionResult {
 	message: string;
 }
 export class SyncService {
-	private client: Client<paths>;
-	private clientWithoutRetries: Client<paths>;
+	private client!: Client<paths>;
+	private clientWithoutRetries!: Client<paths>;
 
 	public constructor(private readonly settings: Settings) {
 		this.createClient(settings.getSettings());
@@ -39,28 +39,6 @@ export class SyncService {
 		return result;
 	}
 
-	public async ping(): Promise<components["schemas"]["PingResponse"]> {
-		const response = await this.clientWithoutRetries.GET("/ping", {
-			params: {
-				header: {
-					authorization: `Bearer ${this.settings.getSettings().token}`
-				}
-			}
-		});
-
-		Logger.getInstance().debug(
-			`Ping response: ${JSON.stringify(response.data)}`
-		);
-
-		if (!response.data) {
-			throw new Error(
-				`Failed to ping server: ${SyncService.formatError(response.error)}`
-			);
-		}
-
-		return response.data;
-	}
-
 	public async create({
 		relativePath,
 		contentBytes,
@@ -282,6 +260,28 @@ export class SyncService {
 		}
 	}
 
+	private async ping(): Promise<components["schemas"]["PingResponse"]> {
+		const response = await this.clientWithoutRetries.GET("/ping", {
+			params: {
+				header: {
+					authorization: `Bearer ${this.settings.getSettings().token}`
+				}
+			}
+		});
+
+		Logger.getInstance().debug(
+			`Ping response: ${JSON.stringify(response.data)}`
+		);
+
+		if (!response.data) {
+			throw new Error(
+				`Failed to ping server: ${SyncService.formatError(response.error)}`
+			);
+		}
+
+		return response.data;
+	}
+
 	private createClient(settings: SyncSettings): void {
 		this.client = createClient<paths>({
 			baseUrl: settings.remoteUri,
diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts
new file mode 100644
index 00000000..6e35148c
--- /dev/null
+++ b/frontend/sync-client/src/sync-client.ts
@@ -0,0 +1,168 @@
+import init from "sync_lib";
+import wasmBin from "sync_lib/sync_lib_bg.wasm";
+import type { PersistenceProvider } from "./persistence/persistence";
+import { SyncHistory } from "./tracing/sync-history";
+import type { FileOperations } from "./file-operations";
+import { Logger } from "./tracing/logger";
+import { Database } from "./persistence/database";
+import { Settings } from "./persistence/settings";
+import type { CheckConnectionResult } from "./services/sync-service";
+import { SyncService } from "./services/sync-service";
+import { Syncer } from "./sync-operations/syncer";
+import { applyRemoteChangesLocally } from "./sync-operations/apply-remote-changes-locally";
+
+export class SyncClient {
+	private remoteListenerIntervalId: number | null = null;
+
+	private constructor(
+		private readonly _history: SyncHistory,
+		private readonly _settings: Settings,
+		private readonly _database: Database,
+		private readonly _syncer: Syncer,
+		private readonly _syncService: SyncService
+	) {}
+
+	public get history(): SyncHistory {
+		return this._history;
+	}
+
+	public get settings(): Settings {
+		return this._settings;
+	}
+
+	public get syncer(): Syncer {
+		return this._syncer;
+	}
+
+	public static async create(
+		operations: FileOperations,
+		persistence: PersistenceProvider
+	): Promise<SyncClient> {
+		const history = new SyncHistory();
+		Logger.getInstance().info("Starting SyncClient");
+
+		await init(
+			// eslint-disable-next-line
+			(wasmBin as any).default // it is loaded as a base64 string by webpack
+		);
+
+		let state: Partial<{
+			settings: any;
+			database: any;
+		}> = (await persistence.load()) ?? {
+			settings: undefined,
+			database: undefined
+		};
+		const database = new Database(
+			state.database,
+			async (data: unknown): Promise<void> => {
+				state = { ...state, database: data };
+				return persistence.save(state);
+			}
+		);
+
+		const settings = new Settings(
+			state.settings,
+			async (data: unknown): Promise<void> => {
+				state = { ...state, settings: data };
+				return persistence.save(state);
+			}
+		);
+
+		const syncService = new SyncService(settings);
+
+		const syncer = new Syncer(
+			database,
+			settings,
+			syncService,
+			operations,
+			history
+		);
+
+		const client = new SyncClient(
+			history,
+			settings,
+			database,
+			syncer,
+			syncService
+		);
+
+		void syncer.scheduleSyncForOfflineChanges();
+
+		client.registerRemoteEventListener(
+			settings,
+			database,
+			syncService,
+			syncer,
+			settings.getSettings().fetchChangesUpdateIntervalMs
+		);
+
+		settings.addOnSettingsChangeHandlers((newSettings, oldSettings) => {
+			client.registerRemoteEventListener(
+				settings,
+				database,
+				syncService,
+				syncer,
+				newSettings.fetchChangesUpdateIntervalMs
+			);
+
+			if (!oldSettings.isSyncEnabled && newSettings.isSyncEnabled) {
+				syncer
+					.scheduleSyncForOfflineChanges()
+					.catch((_error: unknown) => {
+						Logger.getInstance().error(
+							"Failed to schedule sync for offline changes"
+						);
+					});
+			}
+		});
+
+		Logger.getInstance().info("SyncClient loaded");
+
+		return client;
+	}
+
+	public get documentCount(): number {
+		return this._database.getDocuments().size;
+	}
+
+	public async checkConnection(): Promise<CheckConnectionResult> {
+		return this._syncService.checkConnection();
+	}
+
+	public async reset(): Promise<void> {
+		await this._syncer.reset();
+		this._history.reset();
+		Logger.getInstance().reset();
+	}
+
+	public onunload(): void {
+		if (this.remoteListenerIntervalId !== null) {
+			window.clearInterval(this.remoteListenerIntervalId);
+		}
+	}
+
+	private registerRemoteEventListener(
+		settings: Settings,
+		database: Database,
+		syncService: SyncService,
+		syncer: Syncer,
+		intervalMs: number
+	): void {
+		if (this.remoteListenerIntervalId !== null) {
+			window.clearInterval(this.remoteListenerIntervalId);
+		}
+
+		this.remoteListenerIntervalId = window.setInterval(
+			// eslint-disable-next-line @typescript-eslint/no-misused-promises
+			async () =>
+				applyRemoteChangesLocally({
+					settings,
+					database,
+					syncService,
+					syncer
+				}),
+			intervalMs
+		);
+	}
+}
diff --git a/frontend/sync-client/src/tracing/sync-history.ts b/frontend/sync-client/src/tracing/sync-history.ts
index 1ada37c6..b64cdd50 100644
--- a/frontend/sync-client/src/tracing/sync-history.ts
+++ b/frontend/sync-client/src/tracing/sync-history.ts
@@ -1,4 +1,4 @@
-import { RelativePath } from "src/persistence/database";
+import type { RelativePath } from "src/persistence/database";
 import { Logger } from "./logger";
 
 export interface CommonHistoryEntry {

From bb9acaf65628a22fe23a63d0065273ac3ab84437 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 20 Feb 2025 22:26:39 +0000
Subject: [PATCH 208/761] Pick up simple client

---
 .../obsidian-plugin/src/vault-link-plugin.ts  | 134 +++---------------
 .../obsidian-plugin/src/views/settings-tab.ts |  95 +++++++------
 .../obsidian-plugin/src/views/status-bar.ts   |  22 +--
 .../src/views/status-description.ts           |  38 ++---
 4 files changed, 98 insertions(+), 191 deletions(-)

diff --git a/frontend/obsidian-plugin/src/vault-link-plugin.ts b/frontend/obsidian-plugin/src/vault-link-plugin.ts
index 1d31804c..53a17106 100644
--- a/frontend/obsidian-plugin/src/vault-link-plugin.ts
+++ b/frontend/obsidian-plugin/src/vault-link-plugin.ts
@@ -11,85 +11,43 @@ import { StatusBar } from "./views/status-bar";
 
 import { LogsView } from "./views/logs-view";
 import { StatusDescription } from "./views/status-description";
-import {
-	applyRemoteChangesLocally,
-	Database,
-	Logger,
-	Syncer,
-	SyncHistory,
-	SyncService,
-	initialize,
-	Settings
-} from "sync-client";
+import { Logger, SyncClient } from "sync-client";
 
 export default class VaultLinkPlugin extends Plugin {
-	private readonly operations = new ObsidianFileOperations(this.app.vault);
-	private readonly history = new SyncHistory();
-	private settingsTab: SyncSettingsTab;
-	private remoteListenerIntervalId: number | null = null;
+	private settingsTab: SyncSettingsTab | undefined;
+	private client!: SyncClient;
 
 	public async onload(): Promise<void> {
 		Logger.getInstance().info("Starting plugin");
 
-		await initialize();
-
-		let state = (await this.loadData()) ?? {
-			settings: undefined,
-			database: undefined
-		};
-		const database = new Database(
-			state.database,
-			async (data: unknown): Promise<void> => {
-				state = { ...state, database: data };
-				return this.saveData(state);
+		this.client = await SyncClient.create(
+			new ObsidianFileOperations(this.app.vault),
+			{
+				load: this.loadData.bind(this),
+				save: this.saveData.bind(this)
 			}
 		);
 
-		const settings = new Settings(
-			state.settings,
-			async (data: unknown): Promise<void> => {
-				state = { ...state, settings: data };
-				return this.saveData(state);
-			}
-		);
-
-		const syncService = new SyncService(database);
-
-		const syncer = new Syncer(
-			database,
-			settings,
-			syncService,
-			this.operations,
-			this.history
-		);
-
-		const statusDescription = new StatusDescription(
-			settings,
-			database,
-			syncService,
-			this.history,
-			syncer
-		);
+		const statusDescription = new StatusDescription(this.client);
 
 		this.settingsTab = new SyncSettingsTab({
 			app: this.app,
 			plugin: this,
-			settings,
-			syncService,
-			statusDescription,
-			syncer
+			syncClient: this.client,
+			statusDescription
 		});
 		this.addSettingTab(this.settingsTab);
 
-		new StatusBar(settings, this, this.history, syncer);
+		new StatusBar(this, this.client);
 
 		this.registerView(
 			HistoryView.TYPE,
-			(leaf) => new HistoryView(leaf, settings, this.history)
+			(leaf) =>
+				new HistoryView(leaf, this.client.settings, this.client.history)
 		);
 		this.registerView(
 			LogsView.TYPE,
-			(leaf) => new LogsView(this, settings, leaf)
+			(leaf) => new LogsView(this, this.client.settings, leaf)
 		);
 
 		this.addRibbonIcon(
@@ -103,7 +61,7 @@ export default class VaultLinkPlugin extends Plugin {
 			async (_: MouseEvent) => this.activateView(LogsView.TYPE)
 		);
 
-		const eventHandler = new ObsidianFileEventHandler(syncer);
+		const eventHandler = new ObsidianFileEventHandler(this.client.syncer);
 
 		this.app.workspace.onLayoutReady(async () => {
 			Logger.getInstance().info("Initialising sync handlers");
@@ -131,44 +89,12 @@ export default class VaultLinkPlugin extends Plugin {
 
 			Logger.getInstance().info("Sync handlers initialised");
 
-			void syncer.scheduleSyncForOfflineChanges();
+			void this.client.syncer.scheduleSyncForOfflineChanges();
 		});
-
-		this.registerRemoteEventListener(
-			settings,
-			database,
-			syncService,
-			syncer,
-			settings.getSettings().fetchChangesUpdateIntervalMs
-		);
-
-		settings.addOnSettingsChangeHandlers((newSettings, oldSettings) => {
-			this.registerRemoteEventListener(
-				settings,
-				database,
-				syncService,
-				syncer,
-				newSettings.fetchChangesUpdateIntervalMs
-			);
-
-			if (!oldSettings.isSyncEnabled && newSettings.isSyncEnabled) {
-				syncer
-					.scheduleSyncForOfflineChanges()
-					.catch((_error: unknown) => {
-						Logger.getInstance().error(
-							"Failed to schedule sync for offline changes"
-						);
-					});
-			}
-		});
-
-		Logger.getInstance().info("Plugin loaded");
 	}
 
 	public onunload(): void {
-		if (this.remoteListenerIntervalId !== null) {
-			window.clearInterval(this.remoteListenerIntervalId);
-		}
+		this.client.onunload();
 	}
 
 	public openSettings(): void {
@@ -200,28 +126,4 @@ export default class VaultLinkPlugin extends Plugin {
 			await workspace.revealLeaf(leaf);
 		}
 	}
-
-	private registerRemoteEventListener(
-		settings: Settings,
-		database: Database,
-		syncService: SyncService,
-		syncer: Syncer,
-		intervalMs: number
-	): void {
-		if (this.remoteListenerIntervalId !== null) {
-			window.clearInterval(this.remoteListenerIntervalId);
-		}
-
-		this.remoteListenerIntervalId = window.setInterval(
-			// eslint-disable-next-line @typescript-eslint/no-misused-promises
-			async () =>
-				applyRemoteChangesLocally({
-					settings,
-					database,
-					syncService,
-					syncer
-				}),
-			intervalMs
-		);
-	}
 }
diff --git a/frontend/obsidian-plugin/src/views/settings-tab.ts b/frontend/obsidian-plugin/src/views/settings-tab.ts
index 5f911c25..5cd59426 100644
--- a/frontend/obsidian-plugin/src/views/settings-tab.ts
+++ b/frontend/obsidian-plugin/src/views/settings-tab.ts
@@ -5,43 +5,35 @@ import type VaultLinkPlugin from "src/vault-link-plugin";
 import type { StatusDescription } from "./status-description";
 import { LogsView } from "./logs-view";
 import { HistoryView } from "./history-view";
-import type { SyncService, Syncer, Settings } from "sync-client";
-import { Logger, LogLevel } from "sync-client";
+import type { SyncClient } from "sync-client";
+import { LogLevel } from "sync-client";
 
 export class SyncSettingsTab extends PluginSettingTab {
 	private editedVaultName: string;
 
 	private readonly plugin: VaultLinkPlugin;
-	private readonly settings: Settings;
-	private readonly syncService: SyncService;
+	private readonly syncClient: SyncClient;
 	private readonly statusDescription: StatusDescription;
-	private readonly syncer: Syncer;
 	private statusDescriptionSubscription: (() => void) | undefined;
 
 	public constructor({
 		app,
 		plugin,
-		settings,
-		syncService,
-		statusDescription,
-		syncer
+		syncClient,
+		statusDescription
 	}: {
 		app: App;
 		plugin: VaultLinkPlugin;
-		settings: Settings;
-		syncService: SyncService;
+		syncClient: SyncClient;
 		statusDescription: StatusDescription;
-		syncer: Syncer;
 	}) {
 		super(app, plugin);
 		this.plugin = plugin;
-		this.settings = settings;
-		this.syncService = syncService;
+		this.syncClient = syncClient;
 		this.statusDescription = statusDescription;
-		this.syncer = syncer;
 
-		this.editedVaultName = this.settings.getSettings().vaultName;
-		this.settings.addOnSettingsChangeHandlers(
+		this.editedVaultName = this.syncClient.settings.getSettings().vaultName;
+		this.syncClient.settings.addOnSettingsChangeHandlers(
 			(newSettings, oldSettings) => {
 				if (newSettings.vaultName !== oldSettings.vaultName) {
 					this.editedVaultName = newSettings.vaultName;
@@ -130,15 +122,15 @@ export class SyncSettingsTab extends PluginSettingTab {
 			.addText((text) =>
 				text
 					.setPlaceholder("https://example.com:3030")
-					.setValue(this.settings.getSettings().remoteUri)
+					.setValue(this.syncClient.settings.getSettings().remoteUri)
 					.onChange(async (value) =>
-						this.settings.setSetting("remoteUri", value)
+						this.syncClient.settings.setSetting("remoteUri", value)
 					)
 			)
 			.addButton((button) =>
 				button.setButtonText("Test connection").onClick(async () => {
 					new Notice(
-						(await this.syncService.checkConnection()).message
+						(await this.syncClient.checkConnection()).message
 					);
 					await this.statusDescription.updateConnectionState();
 				})
@@ -154,9 +146,9 @@ export class SyncSettingsTab extends PluginSettingTab {
 			.addTextArea((text) =>
 				text
 					.setPlaceholder("ey...")
-					.setValue(this.settings.getSettings().token)
+					.setValue(this.syncClient.settings.getSettings().token)
 					.onChange(async (value) =>
-						this.settings.setSetting("token", value)
+						this.syncClient.settings.setSetting("token", value)
 					)
 			);
 
@@ -169,23 +161,22 @@ export class SyncSettingsTab extends PluginSettingTab {
 			.addText((text) =>
 				text
 					.setPlaceholder("My Obsidian Vault")
-					.setValue(this.settings.getSettings().vaultName)
+					.setValue(this.syncClient.settings.getSettings().vaultName)
 					.onChange((value) => (this.editedVaultName = value))
 			)
 			.addButton((button) =>
 				button.setButtonText("Apply").onClick(async () => {
 					if (
 						this.editedVaultName ===
-						this.settings.getSettings().vaultName
+						this.syncClient.settings.getSettings().vaultName
 					) {
 						return;
 					}
-					await this.settings.setSetting(
+					await this.syncClient.settings.setSetting(
 						"vaultName",
 						this.editedVaultName
 					);
-					await this.syncer.reset();
-					Logger.getInstance().reset();
+					await this.syncClient.reset();
 					new Notice(
 						"Sync state has been reset, you will need to resync"
 					);
@@ -203,8 +194,7 @@ export class SyncSettingsTab extends PluginSettingTab {
 			)
 			.addButton((button) =>
 				button.setButtonText("Reset sync state").onClick(async () => {
-					await this.syncer.reset();
-					Logger.getInstance().reset();
+					await this.syncClient.reset();
 					new Notice(
 						"Sync state has been reset, you will need to resync"
 					);
@@ -223,11 +213,11 @@ export class SyncSettingsTab extends PluginSettingTab {
 					.setDynamicTooltip()
 					.setInstant(false)
 					.setValue(
-						this.settings.getSettings()
+						this.syncClient.settings.getSettings()
 							.fetchChangesUpdateIntervalMs / 1000
 					)
 					.onChange(async (value) =>
-						this.settings.setSetting(
+						this.syncClient.settings.setSetting(
 							"fetchChangesUpdateIntervalMs",
 							value * 1000
 						)
@@ -244,9 +234,14 @@ export class SyncSettingsTab extends PluginSettingTab {
 					.setLimits(1, 16, 1)
 					.setDynamicTooltip()
 					.setInstant(false)
-					.setValue(this.settings.getSettings().syncConcurrency)
+					.setValue(
+						this.syncClient.settings.getSettings().syncConcurrency
+					)
 					.onChange(async (value) =>
-						this.settings.setSetting("syncConcurrency", value)
+						this.syncClient.settings.setSetting(
+							"syncConcurrency",
+							value
+						)
 					)
 			);
 
@@ -260,9 +255,14 @@ export class SyncSettingsTab extends PluginSettingTab {
 					.setLimits(0, 32, 1)
 					.setDynamicTooltip()
 					.setInstant(false)
-					.setValue(this.settings.getSettings().maxFileSizeMB)
+					.setValue(
+						this.syncClient.settings.getSettings().maxFileSizeMB
+					)
 					.onChange(async (value) =>
-						this.settings.setSetting("maxFileSizeMB", value)
+						this.syncClient.settings.setSetting(
+							"maxFileSizeMB",
+							value
+						)
 					)
 			);
 
@@ -276,9 +276,14 @@ export class SyncSettingsTab extends PluginSettingTab {
 			)
 			.addToggle((toggle) =>
 				toggle
-					.setValue(this.settings.getSettings().isSyncEnabled)
+					.setValue(
+						this.syncClient.settings.getSettings().isSyncEnabled
+					)
 					.onChange(async (value) =>
-						this.settings.setSetting("isSyncEnabled", value)
+						this.syncClient.settings.setSetting(
+							"isSyncEnabled",
+							value
+						)
 					)
 			);
 	}
@@ -293,9 +298,15 @@ export class SyncSettingsTab extends PluginSettingTab {
 			)
 			.addToggle((toggle) =>
 				toggle
-					.setValue(this.settings.getSettings().displayNoopSyncEvents)
+					.setValue(
+						this.syncClient.settings.getSettings()
+							.displayNoopSyncEvents
+					)
 					.onChange(async (value) =>
-						this.settings.setSetting("displayNoopSyncEvents", value)
+						this.syncClient.settings.setSetting(
+							"displayNoopSyncEvents",
+							value
+						)
 					)
 			);
 
@@ -312,9 +323,11 @@ export class SyncSettingsTab extends PluginSettingTab {
 						[LogLevel.WARNING]: LogLevel.WARNING,
 						[LogLevel.ERROR]: LogLevel.ERROR
 					})
-					.setValue(this.settings.getSettings().minimumLogLevel)
+					.setValue(
+						this.syncClient.settings.getSettings().minimumLogLevel
+					)
 					.onChange(async (value) =>
-						this.settings.setSetting(
+						this.syncClient.settings.setSetting(
 							"minimumLogLevel",
 							// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
 							value as LogLevel
diff --git a/frontend/obsidian-plugin/src/views/status-bar.ts b/frontend/obsidian-plugin/src/views/status-bar.ts
index b5babae2..9ecd7b87 100644
--- a/frontend/obsidian-plugin/src/views/status-bar.ts
+++ b/frontend/obsidian-plugin/src/views/status-bar.ts
@@ -1,4 +1,4 @@
-import type { HistoryStats, Settings, SyncHistory, Syncer } from "sync-client";
+import type { HistoryStats, SyncClient } from "sync-client";
 import type VaultLinkPlugin from "src/vault-link-plugin";
 
 export class StatusBar {
@@ -8,23 +8,23 @@ export class StatusBar {
 	private lastRemaining: number | undefined;
 
 	public constructor(
-		private readonly settings: Settings,
 		private readonly plugin: VaultLinkPlugin,
-		history: SyncHistory,
-		syncer: Syncer
+		private readonly syncClient: SyncClient
 	) {
 		this.statusBarItem = plugin.addStatusBarItem();
-		history.addSyncHistoryUpdateListener((status) => {
+		this.syncClient.history.addSyncHistoryUpdateListener((status) => {
 			this.lastHistoryStats = status;
 			this.updateStatus();
 		});
 
-		syncer.addRemainingOperationsListener((remainingOperations) => {
-			this.lastRemaining = remainingOperations;
-			this.updateStatus();
-		});
+		this.syncClient.syncer.addRemainingOperationsListener(
+			(remainingOperations) => {
+				this.lastRemaining = remainingOperations;
+				this.updateStatus();
+			}
+		);
 
-		settings.addOnSettingsChangeHandlers(() => {
+		this.syncClient.settings.addOnSettingsChangeHandlers(() => {
 			this.updateStatus();
 		});
 	}
@@ -57,7 +57,7 @@ export class StatusBar {
 		}
 
 		if (!hasShownMessage) {
-			if (this.settings.getSettings().isSyncEnabled) {
+			if (this.syncClient.settings.getSettings().isSyncEnabled) {
 				container.createSpan({ text: "VaultLink is idle" });
 			} else {
 				const button = container.createEl("button", {
diff --git a/frontend/obsidian-plugin/src/views/status-description.ts b/frontend/obsidian-plugin/src/views/status-description.ts
index b9c87ad8..381547d6 100644
--- a/frontend/obsidian-plugin/src/views/status-description.ts
+++ b/frontend/obsidian-plugin/src/views/status-description.ts
@@ -1,11 +1,7 @@
 import type {
 	HistoryStats,
 	CheckConnectionResult,
-	SyncService,
-	SyncHistory,
-	Syncer,
-	Database,
-	Settings
+	SyncClient
 } from "sync-client";
 
 export class StatusDescription {
@@ -15,32 +11,28 @@ export class StatusDescription {
 
 	private statusChangeListeners: (() => void)[] = [];
 
-	public constructor(
-		private readonly settings: Settings,
-		private readonly database: Database,
-		private readonly syncService: SyncService,
-		history: SyncHistory,
-		syncer: Syncer
-	) {
+	public constructor(private readonly syncClient: SyncClient) {
 		void this.updateConnectionState();
 
-		history.addSyncHistoryUpdateListener((status) => {
+		syncClient.history.addSyncHistoryUpdateListener((status) => {
 			this.lastHistoryStats = status;
 			this.updateDescription();
 		});
 
-		syncer.addRemainingOperationsListener((remainingOperations) => {
-			this.lastRemaining = remainingOperations;
-			this.updateDescription();
-		});
+		this.syncClient.syncer.addRemainingOperationsListener(
+			(remainingOperations) => {
+				this.lastRemaining = remainingOperations;
+				this.updateDescription();
+			}
+		);
 
-		settings.addOnSettingsChangeHandlers(() => {
+		this.syncClient.settings.addOnSettingsChangeHandlers(() => {
 			void this.updateConnectionState();
 		});
 	}
 
 	public async updateConnectionState(): Promise<void> {
-		this.lastConnectionState = await this.syncService.checkConnection();
+		this.lastConnectionState = await this.syncClient.checkConnection();
 		this.updateDescription();
 	}
 
@@ -75,15 +67,15 @@ export class StatusDescription {
 
 		container.createSpan({ text: "VaultLink is connected to the server " });
 		container.createEl("a", {
-			text: this.settings.getSettings().remoteUri,
-			href: this.settings.getSettings().remoteUri
+			text: this.syncClient.settings.getSettings().remoteUri,
+			href: this.syncClient.settings.getSettings().remoteUri
 		});
 
 		container.createSpan({
 			text: ` and has indexed approximately `
 		});
 		container.createSpan({
-			text: `${this.database.getDocuments().size}`,
+			text: `${this.syncClient.documentCount}`,
 			cls: "number"
 		});
 		container.createSpan({
@@ -95,7 +87,7 @@ export class StatusDescription {
 			(this.lastHistoryStats?.success ?? 0) === 0 &&
 			(this.lastHistoryStats?.error ?? 0) === 0
 		) {
-			if (this.settings.getSettings().isSyncEnabled) {
+			if (this.syncClient.settings.getSettings().isSyncEnabled) {
 				container.createSpan({
 					text: "Syncing is enabled but VaultLink hasn't found anything to sync yet."
 				});

From db8e4bc2e7465796267db2df3da98710502801f3 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 20 Feb 2025 22:26:54 +0000
Subject: [PATCH 209/761] Hide dist

---
 .vscode/settings.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index d611f4d3..78bb1516 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -2,6 +2,7 @@
     "jest.jestCommandLine": "NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules\" npx jest",
     "jest.rootPath": "plugin",
     "files.exclude": {
+        "**/dist": true,
         "**/node_modules": true
     }
 }
\ No newline at end of file

From fde1fecbb6efc86a8dd168b4a9c651d5488cd7d1 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Feb 2025 11:09:28 +0000
Subject: [PATCH 210/761] Move file handling logic inside of client

---
 .../src/obsidian-file-system.ts               |  69 +++++++++++
 .../obsidian-plugin/src/vault-link-plugin.ts  |   4 +-
 frontend/sync-client/src/file-operations.ts   |  32 -----
 .../src/file-operations/file-operations.ts}   | 110 ++++++++----------
 .../file-operations/filesystem-operations.ts  |  17 +++
 frontend/sync-client/src/index.ts             |  23 ++--
 frontend/sync-client/src/sync-client.ts       |  33 +-----
 7 files changed, 151 insertions(+), 137 deletions(-)
 create mode 100644 frontend/obsidian-plugin/src/obsidian-file-system.ts
 delete mode 100644 frontend/sync-client/src/file-operations.ts
 rename frontend/{obsidian-plugin/src/obsidian-file-operations.ts => sync-client/src/file-operations/file-operations.ts} (55%)
 create mode 100644 frontend/sync-client/src/file-operations/filesystem-operations.ts

diff --git a/frontend/obsidian-plugin/src/obsidian-file-system.ts b/frontend/obsidian-plugin/src/obsidian-file-system.ts
new file mode 100644
index 00000000..68642c15
--- /dev/null
+++ b/frontend/obsidian-plugin/src/obsidian-file-system.ts
@@ -0,0 +1,69 @@
+import { normalizePath, Stat, Vault } from "obsidian";
+import { FileSystemOperations, RelativePath } from "sync-client";
+
+export class ObsidianFileSystemOperations implements FileSystemOperations {
+	public constructor(private readonly vault: Vault) {}
+
+	public async listAllFiles(): Promise<RelativePath[]> {
+		return this.vault.getFiles().map((file) => file.path);
+	}
+
+	public async read(path: RelativePath): Promise<Uint8Array> {
+		return new Uint8Array(
+			await this.vault.adapter.readBinary(normalizePath(path))
+		);
+	}
+
+	public async write(path: RelativePath, content: Uint8Array): Promise<void> {
+		return this.vault.adapter.writeBinary(
+			normalizePath(path),
+			content.buffer as ArrayBuffer
+		);
+	}
+
+	public async atomicUpdateText(
+		path: RelativePath,
+		updater: (currentContent: string) => string
+	): Promise<string> {
+		return this.vault.adapter.process(normalizePath(path), updater);
+	}
+
+	public async getFileSize(path: RelativePath): Promise<number> {
+		return (await this.statFile(path)).size;
+	}
+
+	public async getModificationTime(path: RelativePath): Promise<Date> {
+		return new Date((await this.statFile(path)).mtime);
+	}
+
+	public async exists(path: RelativePath): Promise<boolean> {
+		return this.vault.adapter.exists(normalizePath(path));
+	}
+
+	public async createDirectory(path: RelativePath): Promise<void> {
+		return this.vault.adapter.mkdir(normalizePath(path));
+	}
+
+	public async delete(path: RelativePath): Promise<void> {
+		if (!(await this.vault.adapter.trashSystem(normalizePath(path)))) {
+			return this.vault.adapter.remove(normalizePath(path));
+		}
+	}
+
+	public async rename(
+		oldPath: RelativePath,
+		newPath: RelativePath
+	): Promise<void> {
+		return this.vault.adapter.rename(oldPath, newPath);
+	}
+
+	private async statFile(path: string): Promise<Stat> {
+		const file = await this.vault.adapter.stat(normalizePath(path));
+
+		if (!file) {
+			throw new Error(`File not found: ${path}`);
+		}
+
+		return file;
+	}
+}
diff --git a/frontend/obsidian-plugin/src/vault-link-plugin.ts b/frontend/obsidian-plugin/src/vault-link-plugin.ts
index 53a17106..a3cb4a07 100644
--- a/frontend/obsidian-plugin/src/vault-link-plugin.ts
+++ b/frontend/obsidian-plugin/src/vault-link-plugin.ts
@@ -6,12 +6,12 @@ import "../manifest.json";
 import { SyncSettingsTab } from "./views/settings-tab";
 import { HistoryView } from "./views/history-view";
 import { ObsidianFileEventHandler } from "./obisidan-event-handler";
-import { ObsidianFileOperations } from "./obsidian-file-operations";
 import { StatusBar } from "./views/status-bar";
 
 import { LogsView } from "./views/logs-view";
 import { StatusDescription } from "./views/status-description";
 import { Logger, SyncClient } from "sync-client";
+import { ObsidianFileSystemOperations } from "./obsidian-file-system";
 
 export default class VaultLinkPlugin extends Plugin {
 	private settingsTab: SyncSettingsTab | undefined;
@@ -21,7 +21,7 @@ export default class VaultLinkPlugin extends Plugin {
 		Logger.getInstance().info("Starting plugin");
 
 		this.client = await SyncClient.create(
-			new ObsidianFileOperations(this.app.vault),
+			new ObsidianFileSystemOperations(this.app.vault),
 			{
 				load: this.loadData.bind(this),
 				save: this.saveData.bind(this)
diff --git a/frontend/sync-client/src/file-operations.ts b/frontend/sync-client/src/file-operations.ts
deleted file mode 100644
index 5fce5242..00000000
--- a/frontend/sync-client/src/file-operations.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import type { RelativePath } from "src/persistence/database";
-
-export interface FileOperations {
-	listAllFiles: () => Promise<RelativePath[]>;
-
-	read: (path: RelativePath) => Promise<Uint8Array>;
-
-	getFileSize: (path: RelativePath) => Promise<number>;
-
-	exists: (path: RelativePath) => Promise<boolean>;
-
-	getModificationTime: (path: RelativePath) => Promise<Date>;
-
-	// Create and write the file if it doesn't exist. Otherwise, it has the same behavior as write.
-	// All parent directories are created if they don't exist.
-	create: (path: RelativePath, newContent: Uint8Array) => Promise<void>;
-
-	// Update the file at the given path.
-	// If the file's content is different from `expectedContent`, the a 3-way merge is performed before writing.
-	// If the file no longer exists, the file is not recreated and an empty array is returned.
-	write: (
-		path: RelativePath,
-		expectedContent: Uint8Array,
-		newContent: Uint8Array
-	) => Promise<Uint8Array>;
-
-	remove: (path: RelativePath) => Promise<void>;
-
-	move: (oldPath: RelativePath, newPath: RelativePath) => Promise<void>;
-
-	isFileEligibleForSync: (path: RelativePath) => boolean;
-}
diff --git a/frontend/obsidian-plugin/src/obsidian-file-operations.ts b/frontend/sync-client/src/file-operations/file-operations.ts
similarity index 55%
rename from frontend/obsidian-plugin/src/obsidian-file-operations.ts
rename to frontend/sync-client/src/file-operations/file-operations.ts
index b124322d..7fb03be6 100644
--- a/frontend/obsidian-plugin/src/obsidian-file-operations.ts
+++ b/frontend/sync-client/src/file-operations/file-operations.ts
@@ -1,53 +1,56 @@
-import type { Stat, Vault } from "obsidian";
-import { normalizePath } from "obsidian";
-import { Platform } from "obsidian";
-import type { FileOperations, RelativePath } from "sync-client";
-import { Logger, isFileTypeMergable, mergeText } from "sync-client";
+import { Logger } from "src/tracing/logger";
+import { FileSystemOperations } from "./filesystem-operations";
+import { RelativePath } from "src/persistence/database";
+import { isBinary, isFileTypeMergable, mergeText } from "sync_lib";
 
-export class ObsidianFileOperations implements FileOperations {
-	public constructor(private readonly vault: Vault) {}
+export class FileOperations {
+	public constructor(private readonly fs: FileSystemOperations) {}
 
 	public async listAllFiles(): Promise<RelativePath[]> {
-		const files = this.vault.getFiles();
+		const files = await this.fs.listAllFiles();
 		Logger.getInstance().debug(`Listing all files, found ${files.length}`);
-		return files.map((file) => file.path);
+		return files;
 	}
 
 	public async read(path: RelativePath): Promise<Uint8Array> {
 		Logger.getInstance().debug(`Reading file: ${path}`);
-		if (isFileTypeMergable(path)) {
-			let text = await this.vault.adapter.read(normalizePath(path));
+		const content = await this.fs.read(path);
 
-			text = text.replace(/\r\n/g, "\n");
-
-			return new TextEncoder().encode(text);
+		if (isBinary(content)) {
+			return content;
 		}
-		return new Uint8Array(
-			await this.vault.adapter.readBinary(normalizePath(path))
-		);
+
+		const decoder = new TextDecoder("utf-8");
+
+		let text = decoder.decode(content);
+		text = text.replace(/\r\n/g, "\n");
+
+		return new TextEncoder().encode(text);
 	}
 
 	public async getFileSize(path: RelativePath): Promise<number> {
 		Logger.getInstance().debug(`Getting file size: ${path}`);
-		return (await this.statFile(path)).size;
+		return this.fs.getFileSize(path);
 	}
 
 	public async getModificationTime(path: RelativePath): Promise<Date> {
 		Logger.getInstance().debug(`Getting modification time: ${path}`);
-		return new Date((await this.statFile(path)).mtime);
+		return this.fs.getModificationTime(path);
 	}
 
 	public async exists(path: RelativePath): Promise<boolean> {
 		Logger.getInstance().debug(`Checking existance of ${path}`);
-		return this.vault.adapter.exists(normalizePath(path));
+		return this.fs.exists(path);
 	}
 
+	// Create and write the file if it doesn't exist. Otherwise, it has the same behavior as write.
+	// All parent directories are created if they don't exist.
 	public async create(
 		path: RelativePath,
 		newContent: Uint8Array
 	): Promise<void> {
 		Logger.getInstance().debug(`Creating file: ${path}`);
-		if (await this.vault.adapter.exists(normalizePath(path))) {
+		if (await this.fs.exists(path)) {
 			Logger.getInstance().debug(
 				`Didn't expect ${path} to exist, when trying to create it, merging instead`
 			);
@@ -55,50 +58,51 @@ export class ObsidianFileOperations implements FileOperations {
 			return;
 		}
 
-		await this.createParentDirectories(normalizePath(path));
-		await this.vault.adapter.writeBinary(
-			normalizePath(path),
-			newContent.buffer as ArrayBuffer
-		);
+		await this.createParentDirectories(path);
+		await this.fs.write(path, newContent);
 	}
 
+	// Update the file at the given path.
+	// If the file's content is different from `expectedContent`, the a 3-way merge is performed before writing.
+	// If the file no longer exists, the file is not recreated and an empty array is returned.
 	public async write(
 		path: RelativePath,
 		expectedContent: Uint8Array,
 		newContent: Uint8Array
 	): Promise<Uint8Array> {
 		Logger.getInstance().debug(`Writing file: ${path}`);
-		if (!(await this.vault.adapter.exists(normalizePath(path)))) {
+		if (!(await this.fs.exists(path))) {
 			Logger.getInstance().debug(
 				`The caller assumed ${path} exists, but it no longer, so we wont recreate it`
 			);
 			return new Uint8Array(0);
 		}
 
-		if (!isFileTypeMergable(path)) {
+		if (
+			!isFileTypeMergable(path) ||
+			isBinary(expectedContent) ||
+			isBinary(newContent)
+		) {
 			Logger.getInstance().debug(
 				`The expected content is not mergable, so we won't perform a 3-way merge, just overwrite it`
 			);
-			await this.vault.adapter.writeBinary(
-				normalizePath(path),
-				newContent.buffer as ArrayBuffer
-			);
+			await this.fs.write(path, newContent);
 			return newContent;
 		}
 
-		const expetedText = new TextDecoder().decode(expectedContent);
+		const expectedText = new TextDecoder().decode(expectedContent);
 		const newText = new TextDecoder().decode(newContent);
 
-		const resultText = await this.vault.adapter.process(
-			normalizePath(path),
+		const resultText = await this.fs.atomicUpdateText(
+			path,
 			(currentText) => {
 				currentText = currentText.replace(/\r\n/g, "\n");
-				if (currentText !== expetedText) {
+				if (currentText !== expectedText) {
 					Logger.getInstance().debug(
 						`Performing a 3-way merge for ${path} with the expected content`
 					);
 
-					return mergeText(expetedText, currentText, newText);
+					return mergeText(expectedText, currentText, newText);
 				}
 
 				Logger.getInstance().debug(
@@ -113,18 +117,13 @@ export class ObsidianFileOperations implements FileOperations {
 
 	public async remove(path: RelativePath): Promise<void> {
 		Logger.getInstance().debug(`Removing file: ${path}`);
-		if (await this.vault.adapter.exists(normalizePath(path))) {
-			await this.vault.adapter.trashSystem(normalizePath(path));
-		}
+		return this.fs.delete(path);
 	}
 
 	public async move(
 		oldPath: RelativePath,
 		newPath: RelativePath
 	): Promise<void> {
-		oldPath = normalizePath(oldPath);
-		newPath = normalizePath(newPath);
-
 		Logger.getInstance().debug(`Moving file: ${oldPath} -> ${newPath}`);
 
 		if (oldPath === newPath) {
@@ -132,25 +131,16 @@ export class ObsidianFileOperations implements FileOperations {
 		}
 
 		await this.createParentDirectories(newPath);
-		await this.vault.adapter.rename(oldPath, newPath);
+		await this.fs.rename(oldPath, newPath);
 	}
 
 	public isFileEligibleForSync(path: RelativePath): boolean {
-		if (Platform.isDesktopApp) {
-			return true;
-		}
+		return true;
+		// if (Platform.isDesktopApp) {
+		// 	return true;
+		// }
 
-		return isFileTypeMergable(path);
-	}
-
-	private async statFile(path: string): Promise<Stat> {
-		const file = await this.vault.adapter.stat(normalizePath(path));
-
-		if (!file) {
-			throw new Error(`File not found: ${path}`);
-		}
-
-		return file;
+		// return isFileTypeMergable(path);
 	}
 
 	private async createParentDirectories(path: string): Promise<void> {
@@ -160,8 +150,8 @@ export class ObsidianFileOperations implements FileOperations {
 		}
 		for (let i = 1; i < components.length; i++) {
 			const parentDir = components.slice(0, i).join("/");
-			if (!(await this.vault.adapter.exists(parentDir))) {
-				await this.vault.adapter.mkdir(parentDir);
+			if (!(await this.fs.exists(parentDir))) {
+				await this.fs.createDirectory(parentDir);
 			}
 		}
 	}
diff --git a/frontend/sync-client/src/file-operations/filesystem-operations.ts b/frontend/sync-client/src/file-operations/filesystem-operations.ts
new file mode 100644
index 00000000..32bdcdfe
--- /dev/null
+++ b/frontend/sync-client/src/file-operations/filesystem-operations.ts
@@ -0,0 +1,17 @@
+import { RelativePath } from "src/persistence/database";
+
+export interface FileSystemOperations {
+	listAllFiles(): Promise<RelativePath[]>;
+	read(path: RelativePath): Promise<Uint8Array>;
+	write(path: RelativePath, content: Uint8Array): Promise<void>;
+	atomicUpdateText(
+		path: RelativePath,
+		updater: (currentContent: string) => string
+	): Promise<string>;
+	getFileSize(path: RelativePath): Promise<number>;
+	getModificationTime(path: RelativePath): Promise<Date>;
+	exists(path: RelativePath): Promise<boolean>;
+	createDirectory(path: RelativePath): Promise<void>;
+	delete(path: RelativePath): Promise<void>;
+	rename(oldPath: RelativePath, newPath: RelativePath): Promise<void>;
+}
diff --git a/frontend/sync-client/src/index.ts b/frontend/sync-client/src/index.ts
index 49272e23..e1625963 100644
--- a/frontend/sync-client/src/index.ts
+++ b/frontend/sync-client/src/index.ts
@@ -1,9 +1,3 @@
-export { Settings, type SyncSettings } from "./persistence/settings";
-
-export { type CheckConnectionResult } from "./services/sync-service";
-
-export { Syncer } from "./sync-operations/syncer";
-
 export {
 	SyncHistory,
 	SyncType,
@@ -12,17 +6,14 @@ export {
 	type HistoryStats,
 	type HistoryEntry
 } from "./tracing/sync-history";
+
 export { Logger, LogLevel } from "./tracing/logger";
 
 export { SyncClient } from "./sync-client";
-export { type FileOperations } from "./file-operations";
-export { type RelativePath } from "./persistence/database";
-export type { PersistenceProvider } from "./persistence/persistence";
+export { Syncer } from "./sync-operations/syncer";
+export type { CheckConnectionResult } from "./services/sync-service";
+export { Settings, type SyncSettings } from "./persistence/settings";
 
-export {
-	isFileTypeMergable,
-	mergeText,
-	bytesToBase64,
-	base64ToBytes,
-	merge
-} from "sync_lib";
+export type { RelativePath } from "./persistence/database";
+export type { FileSystemOperations } from "./file-operations/filesystem-operations";
+export type { PersistenceProvider } from "./persistence/persistence";
diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts
index 6e35148c..8d735da7 100644
--- a/frontend/sync-client/src/sync-client.ts
+++ b/frontend/sync-client/src/sync-client.ts
@@ -2,14 +2,14 @@ import init from "sync_lib";
 import wasmBin from "sync_lib/sync_lib_bg.wasm";
 import type { PersistenceProvider } from "./persistence/persistence";
 import { SyncHistory } from "./tracing/sync-history";
-import type { FileOperations } from "./file-operations";
 import { Logger } from "./tracing/logger";
 import { Database } from "./persistence/database";
 import { Settings } from "./persistence/settings";
 import type { CheckConnectionResult } from "./services/sync-service";
 import { SyncService } from "./services/sync-service";
 import { Syncer } from "./sync-operations/syncer";
-import { applyRemoteChangesLocally } from "./sync-operations/apply-remote-changes-locally";
+import { FileSystemOperations } from "./file-operations/filesystem-operations";
+import { FileOperations } from "./file-operations/file-operations";
 
 export class SyncClient {
 	private remoteListenerIntervalId: number | null = null;
@@ -35,7 +35,7 @@ export class SyncClient {
 	}
 
 	public static async create(
-		operations: FileOperations,
+		fs: FileSystemOperations,
 		persistence: PersistenceProvider
 	): Promise<SyncClient> {
 		const history = new SyncHistory();
@@ -75,7 +75,7 @@ export class SyncClient {
 			database,
 			settings,
 			syncService,
-			operations,
+			new FileOperations(fs),
 			history
 		);
 
@@ -90,19 +90,11 @@ export class SyncClient {
 		void syncer.scheduleSyncForOfflineChanges();
 
 		client.registerRemoteEventListener(
-			settings,
-			database,
-			syncService,
-			syncer,
 			settings.getSettings().fetchChangesUpdateIntervalMs
 		);
 
 		settings.addOnSettingsChangeHandlers((newSettings, oldSettings) => {
 			client.registerRemoteEventListener(
-				settings,
-				database,
-				syncService,
-				syncer,
 				newSettings.fetchChangesUpdateIntervalMs
 			);
 
@@ -142,26 +134,13 @@ export class SyncClient {
 		}
 	}
 
-	private registerRemoteEventListener(
-		settings: Settings,
-		database: Database,
-		syncService: SyncService,
-		syncer: Syncer,
-		intervalMs: number
-	): void {
+	private registerRemoteEventListener(intervalMs: number): void {
 		if (this.remoteListenerIntervalId !== null) {
 			window.clearInterval(this.remoteListenerIntervalId);
 		}
 
 		this.remoteListenerIntervalId = window.setInterval(
-			// eslint-disable-next-line @typescript-eslint/no-misused-promises
-			async () =>
-				applyRemoteChangesLocally({
-					settings,
-					database,
-					syncService,
-					syncer
-				}),
+			() => void this._syncer.applyRemoteChangesLocally(),
 			intervalMs
 		);
 	}

From 4872f6d3b3f55073fa3f06dfc4944e1979def502 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Feb 2025 12:56:23 +0000
Subject: [PATCH 211/761] WIP test client

---
 .gitignore                                    |   3 +-
 frontend/test-client/src/agent/mock-agent.ts  | 107 +++++++++++++++
 frontend/test-client/src/agent/mock-client.ts | 125 ++++++++++++++++++
 frontend/test-client/src/cli.ts               |  43 ++++++
 frontend/test-client/src/utils/assert.ts      |   5 +
 frontend/test-client/src/utils/choose.ts      |   3 +
 frontend/test-client/src/utils/sleep.ts       |   3 +
 7 files changed, 287 insertions(+), 2 deletions(-)
 create mode 100644 frontend/test-client/src/agent/mock-agent.ts
 create mode 100644 frontend/test-client/src/agent/mock-client.ts
 create mode 100644 frontend/test-client/src/cli.ts
 create mode 100644 frontend/test-client/src/utils/assert.ts
 create mode 100644 frontend/test-client/src/utils/choose.ts
 create mode 100644 frontend/test-client/src/utils/sleep.ts

diff --git a/.gitignore b/.gitignore
index 691f30d8..41188af7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,8 +7,7 @@ node_modules
 # Rust build folder
 backend/target
 
-frontend/obsidian-plugin/dist
-frontend/sync-client/dist
+frontend/*/dist
 
 backend/db.sqlite3*
 backend/config.yml
diff --git a/frontend/test-client/src/agent/mock-agent.ts b/frontend/test-client/src/agent/mock-agent.ts
new file mode 100644
index 00000000..c597430a
--- /dev/null
+++ b/frontend/test-client/src/agent/mock-agent.ts
@@ -0,0 +1,107 @@
+import { choose } from "../utils/choose";
+import { v4 as uuidv4 } from "uuid";
+import { assert } from "../utils/assert";
+import { SyncSettings } from "sync-client";
+import { MockClient } from "./mock-client";
+
+export class MockAgent extends MockClient {
+	private writtenContents: Array<string> = [];
+	private pendingActions: Array<Promise<unknown>> = [];
+
+	public constructor(
+		globalFiles: Record<string, Uint8Array>,
+		initialSettings: Partial<SyncSettings>,
+		private readonly name: string
+	) {
+		super(globalFiles, initialSettings);
+	}
+
+	public async act(): Promise<void> {
+		let options: Array<() => Promise<unknown>> = [
+			() =>
+				this.create(
+					this.getFileName(),
+					new TextEncoder().encode(this.getContent())
+				),
+			() =>
+				this.client.settings.setSetting(
+					"fetchChangesUpdateIntervalMs",
+					Math.random() * 1000
+				),
+			() => this.client.settings.setSetting("isSyncEnabled", false),
+			() => this.client.settings.setSetting("isSyncEnabled", true)
+		];
+
+		let files = await this.listAllFiles();
+
+		if (files.length > 0) {
+			options.push(
+				() => this.rename(choose(files), this.getFileName()),
+				() =>
+					this.atomicUpdateText(
+						choose(files),
+						(old) => old + " " + this.getContent()
+					)
+			);
+		}
+
+		this.pendingActions.push(choose(options)());
+	}
+
+	private getContent() {
+		const uuid = uuidv4();
+		this.writtenContents.push(uuid);
+		return uuid;
+	}
+
+	private getFileName() {
+		return `${this.name}-${uuidv4()}.md`;
+	}
+
+	public async finish(): Promise<void> {
+		await Promise.all(this.pendingActions);
+		await this.client.settings.setSetting("isSyncEnabled", true);
+		await this.client.syncer.applyRemoteChangesLocally();
+	}
+
+	public assertFileSystemIsConsistent(): void {
+		const files = Object.keys(this.globalFiles);
+		const localFiles = Object.keys(this.files);
+
+		assert(
+			files.length === localFiles.length,
+			`File count mismatch: ${files.length} != ${localFiles.length}`
+		);
+
+		for (const file of files) {
+			assert(
+				file in this.globalFiles,
+				`File ${file} missing in global files`
+			);
+			assert(
+				new TextDecoder().decode(this.globalFiles[file]) ===
+					new TextDecoder().decode(this.files[file]),
+				`File ${file} content mismatch`
+			);
+		}
+	}
+
+	public assertAllContentIsPresentOnce(): void {
+		for (const content of this.writtenContents) {
+			const found = Object.values(this.files).filter((file) => {
+				return new TextDecoder().decode(file).includes(content);
+			});
+
+			assert(
+				found.length === 1,
+				`Content ${content} found in ${found.length} files`
+			);
+
+			const file = found[0];
+			assert(
+				new TextDecoder().decode(file).split(content).length === 2,
+				`Content ${content} found more than once in a file`
+			);
+		}
+	}
+}
diff --git a/frontend/test-client/src/agent/mock-client.ts b/frontend/test-client/src/agent/mock-client.ts
new file mode 100644
index 00000000..a967f54f
--- /dev/null
+++ b/frontend/test-client/src/agent/mock-client.ts
@@ -0,0 +1,125 @@
+import {
+	SyncClient,
+	RelativePath,
+	FileSystemOperations,
+	SyncSettings
+} from "sync-client";
+import { assert } from "../utils/assert";
+
+export class MockClient implements FileSystemOperations {
+	protected readonly files: Record<string, Uint8Array> = {};
+	protected client!: SyncClient;
+
+	public constructor(
+		protected readonly globalFiles: Record<string, Uint8Array>,
+		private readonly initialSettings: Partial<SyncSettings>
+	) {}
+
+	public async init() {
+		let _data: unknown = "";
+
+		this.client = await SyncClient.create(this, {
+			load: async () => _data,
+			save: async (data: unknown) => void (_data = data)
+		});
+
+		Object.keys(this.initialSettings).forEach((key) => {
+			this.client.settings.setSetting(
+				key as keyof SyncSettings,
+				this.initialSettings[key as keyof SyncSettings]
+			);
+		});
+
+		assert(
+			(await this.client.checkConnection()).isSuccessful,
+			"Connection check failed"
+		);
+	}
+
+	public async listAllFiles(): Promise<RelativePath[]> {
+		return Object.keys(this.files) as RelativePath[];
+	}
+
+	public async read(path: RelativePath): Promise<Uint8Array> {
+		return this.files[path];
+	}
+
+	public async getFileSize(path: RelativePath): Promise<number> {
+		return this.files[path].length;
+	}
+
+	public async getModificationTime(path: RelativePath): Promise<Date> {
+		return new Date();
+	}
+
+	public async exists(path: RelativePath): Promise<boolean> {
+		return path in this.files;
+	}
+
+	public async create(
+		path: RelativePath,
+		newContent: Uint8Array
+	): Promise<void> {
+		this.globalFiles[path] = newContent;
+		this.files[path] = newContent;
+		this.client.syncer.syncLocallyCreatedFile(path, new Date());
+	}
+
+	public async createDirectory(path: RelativePath): Promise<void> {}
+
+	public async atomicUpdateText(
+		path: RelativePath,
+		updater: (currentContent: string) => string
+	): Promise<string> {
+		const currentContent = new TextDecoder().decode(this.files[path]);
+		const newContent = updater(currentContent);
+		const newContentUint8Array = new TextEncoder().encode(newContent);
+		this.globalFiles[path] = newContentUint8Array;
+		this.files[path] = newContentUint8Array;
+		this.client.syncer.syncLocallyUpdatedFile({
+			relativePath: path,
+			updateTime: new Date()
+		});
+		return newContent;
+	}
+
+	public async write(path: RelativePath, content: Uint8Array): Promise<void> {
+		this.globalFiles[path] = content;
+		this.files[path] = content;
+		this.client.syncer.syncLocallyUpdatedFile({
+			relativePath: path,
+			updateTime: new Date()
+		});
+	}
+
+	public async delete(path: RelativePath): Promise<void> {
+		delete this.files[path];
+		if (path in this.globalFiles) {
+			delete this.globalFiles[path];
+		}
+		this.client.syncer.syncLocallyDeletedFile(path);
+	}
+
+	public async rename(
+		oldPath: RelativePath,
+		newPath: RelativePath
+	): Promise<void> {
+		this.files[newPath] = this.files[oldPath];
+		delete this.files[oldPath];
+
+		if (oldPath in this.globalFiles) {
+			this.globalFiles[newPath] = this.files[oldPath];
+			delete this.globalFiles[oldPath];
+		}
+
+		this.client.syncer.syncLocallyUpdatedFile({
+			oldPath,
+			relativePath: newPath,
+			updateTime: new Date()
+		});
+	}
+
+	public isFileEligibleForSync(path: RelativePath): boolean {
+		return true;
+	}
+}
diff --git a/frontend/test-client/src/cli.ts b/frontend/test-client/src/cli.ts
new file mode 100644
index 00000000..80ea3f33
--- /dev/null
+++ b/frontend/test-client/src/cli.ts
@@ -0,0 +1,43 @@
+import { SyncSettings } from "sync-client";
+import { MockAgent } from "./agent/mock-agent";
+import { sleep } from "./utils/sleep";
+import { v4 as uuidv4 } from "uuid";
+
+const globalFiles: Record<string, Uint8Array> = {};
+const iterations = 100;
+
+async function runTest(): Promise<void> {
+	console.info("Starting test...");
+
+	const initialSettings: Partial<SyncSettings> = {
+		isSyncEnabled: true,
+		token: "token",
+		vaultName: uuidv4()
+	};
+
+	const clients = [
+		new MockAgent(globalFiles, initialSettings, "agent-1"),
+		new MockAgent(globalFiles, initialSettings, "agent-2"),
+		new MockAgent(globalFiles, initialSettings, "agent-3"),
+		new MockAgent(globalFiles, initialSettings, "agent-4"),
+		new MockAgent(globalFiles, initialSettings, "agent-5")
+	];
+
+	await Promise.all(clients.map((client) => client.init()));
+
+	for (let i = 0; i < iterations; i++) {
+		await Promise.all(clients.map((client) => client.act()));
+		await sleep(100);
+	}
+
+	await Promise.all(clients.map((client) => client.finish()));
+
+	clients.forEach((client) => {
+		client.assertFileSystemIsConsistent();
+		client.assertAllContentIsPresentOnce();
+	});
+
+	console.info("Test completed successfully");
+}
+
+runTest();
diff --git a/frontend/test-client/src/utils/assert.ts b/frontend/test-client/src/utils/assert.ts
new file mode 100644
index 00000000..e1e3bb98
--- /dev/null
+++ b/frontend/test-client/src/utils/assert.ts
@@ -0,0 +1,5 @@
+export function assert(value: boolean, message: string): asserts value {
+	if (!value) {
+		throw new Error(message);
+	}
+}
diff --git a/frontend/test-client/src/utils/choose.ts b/frontend/test-client/src/utils/choose.ts
new file mode 100644
index 00000000..adb1dc7c
--- /dev/null
+++ b/frontend/test-client/src/utils/choose.ts
@@ -0,0 +1,3 @@
+export function choose<T>(values: T[]): T {
+	return values[Math.floor(Math.random() * values.length)];
+}
diff --git a/frontend/test-client/src/utils/sleep.ts b/frontend/test-client/src/utils/sleep.ts
new file mode 100644
index 00000000..8b8bcd5e
--- /dev/null
+++ b/frontend/test-client/src/utils/sleep.ts
@@ -0,0 +1,3 @@
+export function sleep(ms: number): Promise<void> {
+	return new Promise((resolve) => setTimeout(resolve, ms));
+}

From 5abbd5d8ee01b19ba6b6a0e2d05f031573bb3254 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Feb 2025 12:56:33 +0000
Subject: [PATCH 212/761] Fix typo

---
 backend/sync_lib/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/sync_lib/src/lib.rs b/backend/sync_lib/src/lib.rs
index e38f60b3..16e01f24 100644
--- a/backend/sync_lib/src/lib.rs
+++ b/backend/sync_lib/src/lib.rs
@@ -75,7 +75,7 @@ pub fn is_binary(data: &[u8]) -> bool {
     std::str::from_utf8(data).is_err()
 }
 
-/// We don't want to supporte merging structured data like JSON, YAML, etc.
+/// We don't want to support merging structured data like JSON, YAML, etc.
 #[wasm_bindgen(js_name = isFileTypeMergable)]
 pub fn is_file_type_mergable(path_or_file_name: &str) -> bool {
     set_panic_hook();

From b0192aae23c7fa02d45e0716474b3ee124c2bea4 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Feb 2025 12:57:09 +0000
Subject: [PATCH 213/761] Lint & add comments

---
 frontend/obsidian-plugin/src/views/history-view.ts          | 3 +--
 frontend/sync-client/src/file-operations/file-operations.ts | 2 ++
 frontend/sync-client/src/services/sync-service.ts           | 4 +---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/frontend/obsidian-plugin/src/views/history-view.ts b/frontend/obsidian-plugin/src/views/history-view.ts
index 04c8e56d..a0745d2d 100644
--- a/frontend/obsidian-plugin/src/views/history-view.ts
+++ b/frontend/obsidian-plugin/src/views/history-view.ts
@@ -80,8 +80,7 @@ export class HistoryView extends ItemView {
 
 	public async onOpen(): Promise<void> {
 		await this.updateView();
-		// eslint-disable-next-line @typescript-eslint/no-misused-promises
-		this.timer = setInterval(async () => this.updateView(), 1000);
+		this.timer = setInterval(() => void this.updateView(), 1000);
 	}
 
 	public async onClose(): Promise<void> {
diff --git a/frontend/sync-client/src/file-operations/file-operations.ts b/frontend/sync-client/src/file-operations/file-operations.ts
index 7fb03be6..76986f9c 100644
--- a/frontend/sync-client/src/file-operations/file-operations.ts
+++ b/frontend/sync-client/src/file-operations/file-operations.ts
@@ -22,6 +22,7 @@ export class FileOperations {
 
 		const decoder = new TextDecoder("utf-8");
 
+		// Normalize line endings to LF on Windows
 		let text = decoder.decode(content);
 		text = text.replace(/\r\n/g, "\n");
 
@@ -136,6 +137,7 @@ export class FileOperations {
 
 	public isFileEligibleForSync(path: RelativePath): boolean {
 		return true;
+		// TODO: figure this out
 		// if (Platform.isDesktopApp) {
 		// 	return true;
 		// }
diff --git a/frontend/sync-client/src/services/sync-service.ts b/frontend/sync-client/src/services/sync-service.ts
index ec31c0d1..69eb585a 100644
--- a/frontend/sync-client/src/services/sync-service.ts
+++ b/frontend/sync-client/src/services/sync-service.ts
@@ -22,9 +22,7 @@ export class SyncService {
 	public constructor(private readonly settings: Settings) {
 		this.createClient(settings.getSettings());
 
-		settings.addOnSettingsChangeHandlers((s) => {
-			this.createClient(s);
-		});
+		settings.addOnSettingsChangeHandlers(this.createClient.bind(this));
 	}
 
 	private static formatError(

From 8b075070903ce27e3f1edb65b2fe1f314065c116 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Feb 2025 13:03:11 +0000
Subject: [PATCH 214/761] Refactor and improve Syncer API

---
 .../apply-remote-changes-locally.ts           |  64 -----
 .../sync-client/src/sync-operations/syncer.ts | 266 +++++++++++-------
 2 files changed, 165 insertions(+), 165 deletions(-)
 delete mode 100644 frontend/sync-client/src/sync-operations/apply-remote-changes-locally.ts

diff --git a/frontend/sync-client/src/sync-operations/apply-remote-changes-locally.ts b/frontend/sync-client/src/sync-operations/apply-remote-changes-locally.ts
deleted file mode 100644
index 5d630fe3..00000000
--- a/frontend/sync-client/src/sync-operations/apply-remote-changes-locally.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import type { Database } from "../persistence/database";
-import type { SyncService } from "src/services/sync-service";
-import { Logger } from "src/tracing/logger";
-import type { Syncer } from "./syncer";
-import type { Settings } from "src/persistence/settings";
-
-let isRunning = false;
-
-export async function applyRemoteChangesLocally({
-	settings,
-	database,
-	syncService,
-	syncer
-}: {
-	settings: Settings;
-	database: Database;
-	syncService: SyncService;
-	syncer: Syncer;
-}): Promise<void> {
-	if (!settings.getSettings().isSyncEnabled) {
-		Logger.getInstance().debug(
-			`Syncing is disabled, not fetching remote changes`
-		);
-		return;
-	} else if (isRunning) {
-		Logger.getInstance().debug(
-			"Applying remote changes locally is already in progress, skipping invocation"
-		);
-		return;
-	}
-
-	isRunning = true;
-
-	try {
-		const remote = await syncService.getAll(database.getLastSeenUpdateId());
-
-		if (remote.latestDocuments.length === 0) {
-			Logger.getInstance().debug("No remote changes to apply");
-			return;
-		}
-
-		Logger.getInstance().info("Applying remote changes locally");
-
-		await Promise.all(
-			remote.latestDocuments.map(async (remoteDocument) =>
-				syncer.syncRemotelyUpdatedFile(remoteDocument)
-			)
-		);
-
-		const lastSeenUpdateId = database.getLastSeenUpdateId();
-		if (
-			lastSeenUpdateId === undefined ||
-			remote.lastUpdateId > lastSeenUpdateId
-		) {
-			await database.setLastSeenUpdateId(remote.lastUpdateId);
-		}
-	} catch (e) {
-		Logger.getInstance().error(
-			`Failed to apply remote changes locally: ${e}`
-		);
-	} finally {
-		isRunning = false;
-	}
-}
diff --git a/frontend/sync-client/src/sync-operations/syncer.ts b/frontend/sync-client/src/sync-operations/syncer.ts
index 9d190860..e362fb73 100644
--- a/frontend/sync-client/src/sync-operations/syncer.ts
+++ b/frontend/sync-client/src/sync-operations/syncer.ts
@@ -4,7 +4,6 @@ import type {
 	RelativePath
 } from "../persistence/database";
 
-import type { FileOperations } from "src/file-operations";
 import type { SyncService } from "src/services/sync-service";
 import { Logger } from "src/tracing/logger";
 import type { SyncHistory } from "src/tracing/sync-history";
@@ -15,6 +14,7 @@ import { EMPTY_HASH, hash } from "src/utils/hash";
 import type { components } from "src/services/types";
 import { deserialize } from "src/utils/deserialize";
 import type { Settings } from "src/persistence/settings";
+import { FileOperations } from "src/file-operations/file-operations";
 
 export class Syncer {
 	private readonly remainingOperationsListeners: ((
@@ -23,7 +23,10 @@ export class Syncer {
 
 	private readonly syncQueue: PQueue;
 
-	private isRunningOfflineSync = false;
+	private runningScheduleSyncForOfflineChanges: Promise<void> | undefined =
+		undefined;
+	private runningApplyRemoteChangesLocally: Promise<void> | undefined =
+		undefined;
 
 	public constructor(
 		private readonly database: Database,
@@ -78,7 +81,7 @@ export class Syncer {
 		);
 	}
 
-	public async syncRemotelyUpdatedFile(
+	private async syncRemotelyUpdatedFile(
 		remoteVersion: components["schemas"]["DocumentVersionWithoutContent"]
 	): Promise<void> {
 		await this.syncQueue.add(async () =>
@@ -87,13 +90,6 @@ export class Syncer {
 	}
 
 	public async scheduleSyncForOfflineChanges(): Promise<void> {
-		if (this.isRunningOfflineSync) {
-			Logger.getInstance().warn(
-				"Uploading local changes is already in progress, skipping"
-			);
-			return;
-		}
-
 		if (!this.settings.getSettings().isSyncEnabled) {
 			Logger.getInstance().debug(
 				`Syncing is disabled, not uploading local changes`
@@ -101,98 +97,17 @@ export class Syncer {
 			return;
 		}
 
-		this.isRunningOfflineSync = true;
+		if (this.runningScheduleSyncForOfflineChanges != null) {
+			Logger.getInstance().debug(
+				"Uploading local changes is already in progress"
+			);
+			return this.runningScheduleSyncForOfflineChanges;
+		}
 
 		try {
-			const allLocalFiles = await this.operations.listAllFiles();
-			let locallyDeletedFiles = [
-				...this.database.getDocuments().entries()
-			].filter(([path, _]) => !allLocalFiles.includes(path));
-
-			await Promise.all(
-				allLocalFiles.map(async (relativePath) =>
-					this.syncQueue.add(async () => {
-						const metadata =
-							this.database.getDocument(relativePath);
-
-						// If there's no metadata, it must be a new file
-						if (!metadata) {
-							// Perhaps the file has been moved. Let's check by looking at the deleted files
-							const contentBytes =
-								await this.operations.read(relativePath);
-							const contentHash = hash(contentBytes);
-
-							const originalFile =
-								await this.findMatchingFileBasedOnHash(
-									contentHash,
-									locallyDeletedFiles
-								);
-							if (originalFile !== undefined) {
-								// `originalFile` hasn't been deleted but it got moved instead
-								locallyDeletedFiles =
-									locallyDeletedFiles.filter(
-										(item) => item != originalFile
-									);
-
-								Logger.getInstance().debug(
-									`Document ${relativePath} was not found under its current path in the database but was found under a different path ${originalFile[0]}, scheduling sync to move it`
-								);
-								return this.internalSyncLocallyUpdatedFile({
-									oldPath: originalFile[0],
-									relativePath: relativePath,
-									updateTime:
-										await this.operations.getModificationTime(
-											relativePath
-										),
-									optimisations: {
-										contentBytes,
-										contentHash
-									}
-								});
-							}
-
-							Logger.getInstance().debug(
-								`Document ${relativePath} not found in database, scheduling sync to create it`
-							);
-							return this.internalSyncLocallyCreatedFile(
-								relativePath,
-								await this.operations.getModificationTime(
-									relativePath
-								)
-							);
-						}
-
-						Logger.getInstance().debug(
-							`Document ${relativePath} has been updated locally, scheduling sync to update it`
-						);
-						return this.internalSyncLocallyUpdatedFile({
-							relativePath,
-							updateTime:
-								await this.operations.getModificationTime(
-									relativePath
-								)
-						});
-					})
-				)
-			);
-
-			await Promise.all(
-				locallyDeletedFiles.map(async ([relativePath, _]) => {
-					Logger.getInstance().debug(
-						`Document ${relativePath} has been deleted locally, scheduling sync to delete it`
-					);
-
-					if (await this.operations.exists(relativePath)) {
-						Logger.getInstance().debug(
-							`Document ${relativePath} actually exists locally, skipping`
-						);
-						return Promise.resolve();
-					}
-
-					return this.internalSyncLocallyDeletedFile(relativePath);
-				})
-			);
-
+			this.runningScheduleSyncForOfflineChanges =
+				this.internalScheduleSyncForOfflineChanges();
+			await this.runningScheduleSyncForOfflineChanges;
 			Logger.getInstance().info(
 				`All local changes have been applied remotely`
 			);
@@ -200,8 +115,157 @@ export class Syncer {
 			Logger.getInstance().error(
 				`Not all local changes have been applied remotely: ${e}`
 			);
+			throw e;
 		} finally {
-			this.isRunningOfflineSync = false;
+			this.runningScheduleSyncForOfflineChanges = undefined;
+		}
+	}
+
+	private async internalScheduleSyncForOfflineChanges(): Promise<void> {
+		const allLocalFiles = await this.operations.listAllFiles();
+		let locallyDeletedFiles = [
+			...this.database.getDocuments().entries()
+		].filter(([path, _]) => !allLocalFiles.includes(path));
+
+		await Promise.all(
+			allLocalFiles.map(async (relativePath) =>
+				this.syncQueue.add(async () => {
+					const metadata = this.database.getDocument(relativePath);
+
+					// If there's no metadata, it must be a new file
+					if (!metadata) {
+						// Perhaps the file has been moved. Let's check by looking at the deleted files
+						const contentBytes =
+							await this.operations.read(relativePath);
+						const contentHash = hash(contentBytes);
+
+						const originalFile =
+							await this.findMatchingFileBasedOnHash(
+								contentHash,
+								locallyDeletedFiles
+							);
+						if (originalFile !== undefined) {
+							// `originalFile` hasn't been deleted but it got moved instead
+							locallyDeletedFiles = locallyDeletedFiles.filter(
+								(item) => item != originalFile
+							);
+
+							Logger.getInstance().debug(
+								`Document ${relativePath} was not found under its current path in the database but was found under a different path ${originalFile[0]}, scheduling sync to move it`
+							);
+							return this.internalSyncLocallyUpdatedFile({
+								oldPath: originalFile[0],
+								relativePath: relativePath,
+								updateTime:
+									await this.operations.getModificationTime(
+										relativePath
+									),
+								optimisations: {
+									contentBytes,
+									contentHash
+								}
+							});
+						}
+
+						Logger.getInstance().debug(
+							`Document ${relativePath} not found in database, scheduling sync to create it`
+						);
+						return this.internalSyncLocallyCreatedFile(
+							relativePath,
+							await this.operations.getModificationTime(
+								relativePath
+							)
+						);
+					}
+
+					Logger.getInstance().debug(
+						`Document ${relativePath} has been updated locally, scheduling sync to update it`
+					);
+					return this.internalSyncLocallyUpdatedFile({
+						relativePath,
+						updateTime:
+							await this.operations.getModificationTime(
+								relativePath
+							)
+					});
+				})
+			)
+		);
+
+		await Promise.all(
+			locallyDeletedFiles.map(async ([relativePath, _]) => {
+				Logger.getInstance().debug(
+					`Document ${relativePath} has been deleted locally, scheduling sync to delete it`
+				);
+
+				if (await this.operations.exists(relativePath)) {
+					Logger.getInstance().debug(
+						`Document ${relativePath} actually exists locally, skipping`
+					);
+					return Promise.resolve();
+				}
+
+				return this.internalSyncLocallyDeletedFile(relativePath);
+			})
+		);
+	}
+
+	public async applyRemoteChangesLocally(): Promise<void> {
+		if (!this.settings.getSettings().isSyncEnabled) {
+			Logger.getInstance().debug(
+				`Syncing is disabled, not fetching remote changes`
+			);
+			return;
+		}
+
+		if (this.runningApplyRemoteChangesLocally != null) {
+			Logger.getInstance().debug(
+				"Applying remote changes locally is already in progress"
+			);
+			return this.runningApplyRemoteChangesLocally;
+		}
+
+		try {
+			this.runningApplyRemoteChangesLocally =
+				this.internalApplyRemoteChangesLocally();
+			await this.runningApplyRemoteChangesLocally;
+			Logger.getInstance().info(
+				"All remote changes have been applied locally"
+			);
+		} catch (e) {
+			Logger.getInstance().error(
+				`Failed to apply remote changes locally: ${e}`
+			);
+			throw e;
+		} finally {
+			this.runningApplyRemoteChangesLocally = undefined;
+		}
+	}
+
+	private async internalApplyRemoteChangesLocally(): Promise<void> {
+		const remote = await this.syncService.getAll(
+			this.database.getLastSeenUpdateId()
+		);
+
+		if (remote.latestDocuments.length === 0) {
+			Logger.getInstance().debug("No remote changes to apply");
+			return;
+		}
+
+		Logger.getInstance().info("Applying remote changes locally");
+
+		await Promise.all(
+			remote.latestDocuments.map(async (remoteDocument) =>
+				this.syncRemotelyUpdatedFile(remoteDocument)
+			)
+		);
+
+		const lastSeenUpdateId = this.database.getLastSeenUpdateId();
+		if (
+			lastSeenUpdateId === undefined ||
+			remote.lastUpdateId > lastSeenUpdateId
+		) {
+			await this.database.setLastSeenUpdateId(remote.lastUpdateId);
 		}
 	}
 

From d965265709956b9d80588f27f62e8d90648ae911 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Feb 2025 15:09:05 +0000
Subject: [PATCH 215/761] Improve logger API

---
 frontend/sync-client/src/tracing/logger.ts | 30 +++++-----------------
 1 file changed, 6 insertions(+), 24 deletions(-)

diff --git a/frontend/sync-client/src/tracing/logger.ts b/frontend/sync-client/src/tracing/logger.ts
index ea6e39bb..a2e7cf98 100644
--- a/frontend/sync-client/src/tracing/logger.ts
+++ b/frontend/sync-client/src/tracing/logger.ts
@@ -21,41 +21,27 @@ export class LogLine {
 }
 
 export class Logger {
-	private static readonly MAX_MESSAGES = 1000;
-
-	private static instance: Logger | null = null;
+	private static readonly MAX_MESSAGES = 10000;
 	private readonly messages: LogLine[] = [];
+	private readonly onMessageListeners: ((message: LogLine) => void)[] = [];
 
-	private readonly onMessageListeners: ((
-		status: LogLine | undefined
-	) => void)[] = [];
-
-	private constructor() {} // eslint-disable-line @typescript-eslint/no-empty-function
-
-	public static getInstance(): Logger {
-		if (!Logger.instance) {
-			Logger.instance = new Logger();
-		}
-		return Logger.instance;
+	public constructor(...onMessageListeners: ((message: LogLine) => void)[]) {
+		this.onMessageListeners = onMessageListeners;
 	}
 
 	public debug(message: string): void {
-		console.debug(message);
 		this.pushMessage(message, LogLevel.DEBUG);
 	}
 
 	public info(message: string): void {
-		console.info(message);
 		this.pushMessage(message, LogLevel.INFO);
 	}
 
 	public warn(message: string): void {
-		console.warn(message);
 		this.pushMessage(message, LogLevel.WARNING);
 	}
 
 	public error(message: string): void {
-		console.error(message);
 		this.pushMessage(message, LogLevel.ERROR);
 	}
 
@@ -67,17 +53,13 @@ export class Logger {
 		);
 	}
 
-	public addOnMessageListener(
-		listener: (message: LogLine | undefined) => void
-	): void {
+	public addOnMessageListener(listener: (message: LogLine) => void): void {
 		this.onMessageListeners.push(listener);
 	}
 
 	public reset(): void {
 		this.messages.length = 0;
-		this.onMessageListeners.forEach((listener) => {
-			listener(undefined);
-		});
+		this.debug("Logger has been reset");
 	}
 
 	private pushMessage(message: string, level: LogLevel): void {

From 3471a9c498d9073568c965ae9a1f42f9b8d1df70 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Feb 2025 15:11:59 +0000
Subject: [PATCH 216/761] Stop Logger being a singleton

---
 .../src/obisidan-event-handler.ts             | 32 +++++-------
 .../obsidian-plugin/src/vault-link-plugin.ts  | 18 +++----
 .../obsidian-plugin/src/views/history-view.ts | 13 +++--
 .../obsidian-plugin/src/views/logs-view.ts    | 23 +++++----
 .../src/file-operations/file-operations.ts    | 33 ++++++------
 .../sync-client/src/persistence/database.ts   |  5 +-
 .../sync-client/src/persistence/settings.ts   |  5 +-
 .../sync-client/src/services/sync-service.ts  | 23 +++++----
 frontend/sync-client/src/sync-client.ts       | 36 ++++++++-----
 .../sync-client/src/sync-operations/syncer.ts | 51 ++++++++-----------
 .../sync-client/src/tracing/sync-history.ts   |  8 +--
 .../sync-client/src/utils/retried-fetch.ts    | 38 +++++++-------
 12 files changed, 147 insertions(+), 138 deletions(-)

diff --git a/frontend/obsidian-plugin/src/obisidan-event-handler.ts b/frontend/obsidian-plugin/src/obisidan-event-handler.ts
index 4e0e0930..67ae8efe 100644
--- a/frontend/obsidian-plugin/src/obisidan-event-handler.ts
+++ b/frontend/obsidian-plugin/src/obisidan-event-handler.ts
@@ -1,47 +1,45 @@
-import type { Syncer } from "sync-client";
+import type { SyncClient, Syncer } from "sync-client";
 import { Logger } from "sync-client";
 import type { TAbstractFile } from "obsidian";
 import { TFile } from "obsidian";
 
 export class ObsidianFileEventHandler {
-	public constructor(private readonly syncer: Syncer) {}
+	public constructor(private readonly client: SyncClient) {}
 
 	public async onCreate(file: TAbstractFile): Promise<void> {
 		if (file instanceof TFile) {
-			Logger.getInstance().info(`File created: ${file.path}`);
+			this.client.logger.info(`File created: ${file.path}`);
 
-			await this.syncer.syncLocallyCreatedFile(
+			await this.client.syncer.syncLocallyCreatedFile(
 				file.path,
 				new Date(file.stat.ctime)
 			);
 		} else {
-			Logger.getInstance().debug(`Folder created: ${file.path}, ignored`);
+			this.client.logger.debug(`Folder created: ${file.path}, ignored`);
 		}
 	}
 
 	public async onDelete(file: TAbstractFile): Promise<void> {
 		if (file instanceof TFile) {
-			Logger.getInstance().info(`File deleted: ${file.path}`);
+			this.client.logger.info(`File deleted: ${file.path}`);
 
-			await this.syncer.syncLocallyDeletedFile(file.path);
+			await this.client.syncer.syncLocallyDeletedFile(file.path);
 		} else {
-			Logger.getInstance().debug(`Folder deleted: ${file.path}, ignored`);
+			this.client.logger.debug(`Folder deleted: ${file.path}, ignored`);
 		}
 	}
 
 	public async onRename(file: TAbstractFile, oldPath: string): Promise<void> {
 		if (file instanceof TFile) {
-			Logger.getInstance().info(
-				`File renamed: ${oldPath} -> ${file.path}`
-			);
+			this.client.logger.info(`File renamed: ${oldPath} -> ${file.path}`);
 
-			await this.syncer.syncLocallyUpdatedFile({
+			await this.client.syncer.syncLocallyUpdatedFile({
 				oldPath,
 				relativePath: file.path,
 				updateTime: new Date(file.stat.ctime)
 			});
 		} else {
-			Logger.getInstance().debug(
+			this.client.logger.debug(
 				`Folder renamed: ${oldPath} -> ${file.path}, ignored`
 			);
 		}
@@ -53,16 +51,14 @@ export class ObsidianFileEventHandler {
 				return;
 			}
 
-			Logger.getInstance().info(`File modified: ${file.path}`);
+			this.client.logger.info(`File modified: ${file.path}`);
 
-			await this.syncer.syncLocallyUpdatedFile({
+			await this.client.syncer.syncLocallyUpdatedFile({
 				relativePath: file.path,
 				updateTime: new Date(file.stat.ctime)
 			});
 		} else {
-			Logger.getInstance().debug(
-				`Folder modified: ${file.path}, ignored`
-			);
+			this.client.logger.debug(`Folder modified: ${file.path}, ignored`);
 		}
 	}
 }
diff --git a/frontend/obsidian-plugin/src/vault-link-plugin.ts b/frontend/obsidian-plugin/src/vault-link-plugin.ts
index a3cb4a07..e4a42411 100644
--- a/frontend/obsidian-plugin/src/vault-link-plugin.ts
+++ b/frontend/obsidian-plugin/src/vault-link-plugin.ts
@@ -10,7 +10,7 @@ import { StatusBar } from "./views/status-bar";
 
 import { LogsView } from "./views/logs-view";
 import { StatusDescription } from "./views/status-description";
-import { Logger, SyncClient } from "sync-client";
+import { SyncClient } from "sync-client";
 import { ObsidianFileSystemOperations } from "./obsidian-file-system";
 
 export default class VaultLinkPlugin extends Plugin {
@@ -18,8 +18,6 @@ export default class VaultLinkPlugin extends Plugin {
 	private client!: SyncClient;
 
 	public async onload(): Promise<void> {
-		Logger.getInstance().info("Starting plugin");
-
 		this.client = await SyncClient.create(
 			new ObsidianFileSystemOperations(this.app.vault),
 			{
@@ -28,6 +26,8 @@ export default class VaultLinkPlugin extends Plugin {
 			}
 		);
 
+		this.client.logger.info("Starting plugin");
+
 		const statusDescription = new StatusDescription(this.client);
 
 		this.settingsTab = new SyncSettingsTab({
@@ -42,12 +42,11 @@ export default class VaultLinkPlugin extends Plugin {
 
 		this.registerView(
 			HistoryView.TYPE,
-			(leaf) =>
-				new HistoryView(leaf, this.client.settings, this.client.history)
+			(leaf) => new HistoryView(leaf, this.client)
 		);
 		this.registerView(
 			LogsView.TYPE,
-			(leaf) => new LogsView(this, this.client.settings, leaf)
+			(leaf) => new LogsView(this, this.client, leaf)
 		);
 
 		this.addRibbonIcon(
@@ -61,11 +60,10 @@ export default class VaultLinkPlugin extends Plugin {
 			async (_: MouseEvent) => this.activateView(LogsView.TYPE)
 		);
 
-		const eventHandler = new ObsidianFileEventHandler(this.client.syncer);
+		const eventHandler = new ObsidianFileEventHandler(this.client);
 
 		this.app.workspace.onLayoutReady(async () => {
-			Logger.getInstance().info("Initialising sync handlers");
-
+			this.client.logger.info("Initialising sync handlers");
 			[
 				this.app.vault.on(
 					"create",
@@ -87,7 +85,7 @@ export default class VaultLinkPlugin extends Plugin {
 				this.registerEvent(event);
 			});
 
-			Logger.getInstance().info("Sync handlers initialised");
+			this.client.logger.info("Sync handlers initialised");
 
 			void this.client.syncer.scheduleSyncForOfflineChanges();
 		});
diff --git a/frontend/obsidian-plugin/src/views/history-view.ts b/frontend/obsidian-plugin/src/views/history-view.ts
index a0745d2d..3fa4f328 100644
--- a/frontend/obsidian-plugin/src/views/history-view.ts
+++ b/frontend/obsidian-plugin/src/views/history-view.ts
@@ -2,7 +2,7 @@ import type { IconName, WorkspaceLeaf } from "obsidian";
 import { ItemView, setIcon } from "obsidian";
 
 import { intlFormatDistance } from "date-fns";
-import type { SyncHistory, HistoryEntry, Settings } from "sync-client";
+import type { HistoryEntry, SyncClient } from "sync-client";
 import { SyncType, SyncSource, SyncStatus, Logger } from "sync-client";
 
 export class HistoryView extends ItemView {
@@ -12,15 +12,14 @@ export class HistoryView extends ItemView {
 
 	public constructor(
 		leaf: WorkspaceLeaf,
-		private readonly settings: Settings,
-		private readonly history: SyncHistory
+		private readonly client: SyncClient
 	) {
 		super(leaf);
 		this.icon = HistoryView.ICON;
 
-		history.addSyncHistoryUpdateListener(() => {
+		this.client.history.addSyncHistoryUpdateListener(() => {
 			this.updateView().catch((_error: unknown) => {
-				Logger.getInstance().error("Failed to update history view");
+				this.client.logger.error("Failed to update history view");
 			});
 		});
 	}
@@ -94,13 +93,13 @@ export class HistoryView extends ItemView {
 		container.empty();
 		container.createEl("h4", { text: "VaultLink History" });
 
-		const entries = this.history
+		const entries = this.client.history
 			.getEntries()
 			.reverse()
 			.filter(
 				(entry) =>
 					entry.status !== SyncStatus.NO_OP ||
-					this.settings.getSettings().displayNoopSyncEvents
+					this.client.settings.getSettings().displayNoopSyncEvents
 			);
 
 		entries.forEach((entry) => {
diff --git a/frontend/obsidian-plugin/src/views/logs-view.ts b/frontend/obsidian-plugin/src/views/logs-view.ts
index 79dee71f..66aa30c2 100644
--- a/frontend/obsidian-plugin/src/views/logs-view.ts
+++ b/frontend/obsidian-plugin/src/views/logs-view.ts
@@ -1,8 +1,7 @@
 import type { WorkspaceLeaf } from "obsidian";
 import { ItemView } from "obsidian";
 import type VaultLinkPlugin from "src/vault-link-plugin";
-import type { Settings } from "sync-client";
-import { Logger } from "sync-client";
+import type { SyncClient } from "sync-client";
 
 export class LogsView extends ItemView {
 	public static readonly TYPE = "logs-view";
@@ -10,20 +9,24 @@ export class LogsView extends ItemView {
 
 	public constructor(
 		private readonly plugin: VaultLinkPlugin,
-		private readonly settings: Settings,
+		private readonly client: SyncClient,
 		leaf: WorkspaceLeaf
 	) {
 		super(leaf);
 		this.icon = LogsView.ICON;
-		Logger.getInstance().addOnMessageListener(() => {
+		this.client.logger.addOnMessageListener(() => {
 			this.updateView();
 		});
 
-		settings.addOnSettingsChangeHandlers((newSettings, oldSettings) => {
-			if (newSettings.minimumLogLevel !== oldSettings.minimumLogLevel) {
-				this.updateView();
+		this.client.settings.addOnSettingsChangeHandlers(
+			(newSettings, oldSettings) => {
+				if (
+					newSettings.minimumLogLevel !== oldSettings.minimumLogLevel
+				) {
+					this.updateView();
+				}
 			}
-		});
+		);
 	}
 
 	private static formatTimestamp(timestamp: Date): string {
@@ -78,8 +81,8 @@ export class LogsView extends ItemView {
 			}
 		);
 
-		const logs = Logger.getInstance().getMessages(
-			this.settings.getSettings().minimumLogLevel
+		const logs = this.client.logger.getMessages(
+			this.client.settings.getSettings().minimumLogLevel
 		);
 
 		if (logs.length === 0) {
diff --git a/frontend/sync-client/src/file-operations/file-operations.ts b/frontend/sync-client/src/file-operations/file-operations.ts
index 76986f9c..fb62c720 100644
--- a/frontend/sync-client/src/file-operations/file-operations.ts
+++ b/frontend/sync-client/src/file-operations/file-operations.ts
@@ -4,16 +4,19 @@ import { RelativePath } from "src/persistence/database";
 import { isBinary, isFileTypeMergable, mergeText } from "sync_lib";
 
 export class FileOperations {
-	public constructor(private readonly fs: FileSystemOperations) {}
+	public constructor(
+		private readonly logger: Logger,
+		private readonly fs: FileSystemOperations
+	) {}
 
 	public async listAllFiles(): Promise<RelativePath[]> {
 		const files = await this.fs.listAllFiles();
-		Logger.getInstance().debug(`Listing all files, found ${files.length}`);
+		this.logger.debug(`Listing all files, found ${files.length}`);
 		return files;
 	}
 
 	public async read(path: RelativePath): Promise<Uint8Array> {
-		Logger.getInstance().debug(`Reading file: ${path}`);
+		this.logger.debug(`Reading file: ${path}`);
 		const content = await this.fs.read(path);
 
 		if (isBinary(content)) {
@@ -30,17 +33,17 @@ export class FileOperations {
 	}
 
 	public async getFileSize(path: RelativePath): Promise<number> {
-		Logger.getInstance().debug(`Getting file size: ${path}`);
+		this.logger.debug(`Getting file size: ${path}`);
 		return this.fs.getFileSize(path);
 	}
 
 	public async getModificationTime(path: RelativePath): Promise<Date> {
-		Logger.getInstance().debug(`Getting modification time: ${path}`);
+		this.logger.debug(`Getting modification time: ${path}`);
 		return this.fs.getModificationTime(path);
 	}
 
 	public async exists(path: RelativePath): Promise<boolean> {
-		Logger.getInstance().debug(`Checking existance of ${path}`);
+		this.logger.debug(`Checking existance of ${path}`);
 		return this.fs.exists(path);
 	}
 
@@ -50,9 +53,9 @@ export class FileOperations {
 		path: RelativePath,
 		newContent: Uint8Array
 	): Promise<void> {
-		Logger.getInstance().debug(`Creating file: ${path}`);
+		this.logger.debug(`Creating file: ${path}`);
 		if (await this.fs.exists(path)) {
-			Logger.getInstance().debug(
+			this.logger.debug(
 				`Didn't expect ${path} to exist, when trying to create it, merging instead`
 			);
 			await this.write(path, new Uint8Array(0), newContent);
@@ -71,9 +74,9 @@ export class FileOperations {
 		expectedContent: Uint8Array,
 		newContent: Uint8Array
 	): Promise<Uint8Array> {
-		Logger.getInstance().debug(`Writing file: ${path}`);
+		this.logger.debug(`Writing file: ${path}`);
 		if (!(await this.fs.exists(path))) {
-			Logger.getInstance().debug(
+			this.logger.debug(
 				`The caller assumed ${path} exists, but it no longer, so we wont recreate it`
 			);
 			return new Uint8Array(0);
@@ -84,7 +87,7 @@ export class FileOperations {
 			isBinary(expectedContent) ||
 			isBinary(newContent)
 		) {
-			Logger.getInstance().debug(
+			this.logger.debug(
 				`The expected content is not mergable, so we won't perform a 3-way merge, just overwrite it`
 			);
 			await this.fs.write(path, newContent);
@@ -99,14 +102,14 @@ export class FileOperations {
 			(currentText) => {
 				currentText = currentText.replace(/\r\n/g, "\n");
 				if (currentText !== expectedText) {
-					Logger.getInstance().debug(
+					this.logger.debug(
 						`Performing a 3-way merge for ${path} with the expected content`
 					);
 
 					return mergeText(expectedText, currentText, newText);
 				}
 
-				Logger.getInstance().debug(
+				this.logger.debug(
 					`The current content of ${path} is the same as the expected content, so we will just write the new content`
 				);
 
@@ -117,7 +120,7 @@ export class FileOperations {
 	}
 
 	public async remove(path: RelativePath): Promise<void> {
-		Logger.getInstance().debug(`Removing file: ${path}`);
+		this.logger.debug(`Removing file: ${path}`);
 		return this.fs.delete(path);
 	}
 
@@ -125,7 +128,7 @@ export class FileOperations {
 		oldPath: RelativePath,
 		newPath: RelativePath
 	): Promise<void> {
-		Logger.getInstance().debug(`Moving file: ${oldPath} -> ${newPath}`);
+		this.logger.debug(`Moving file: ${oldPath} -> ${newPath}`);
 
 		if (oldPath === newPath) {
 			return;
diff --git a/frontend/sync-client/src/persistence/database.ts b/frontend/sync-client/src/persistence/database.ts
index 93492b29..dc048adb 100644
--- a/frontend/sync-client/src/persistence/database.ts
+++ b/frontend/sync-client/src/persistence/database.ts
@@ -20,6 +20,7 @@ export class Database {
 	private lastSeenUpdateId: VaultUpdateId | undefined;
 
 	public constructor(
+		private readonly logger: Logger,
 		initialState: Partial<StoredDatabase> | undefined,
 		private readonly saveData: (data: unknown) => Promise<void>
 	) {
@@ -32,10 +33,10 @@ export class Database {
 				this.documents.set(relativePath, metadata as DocumentMetadata);
 			}
 		}
-		Logger.getInstance().debug(`Loaded ${this.documents.size} documents`);
+		this.logger.debug(`Loaded ${this.documents.size} documents`);
 
 		this.lastSeenUpdateId = initialState.lastSeenUpdateId;
-		Logger.getInstance().debug(
+		this.logger.debug(
 			`Loaded last seen update id: ${this.lastSeenUpdateId}`
 		);
 	}
diff --git a/frontend/sync-client/src/persistence/settings.ts b/frontend/sync-client/src/persistence/settings.ts
index 57762e4a..fa732092 100644
--- a/frontend/sync-client/src/persistence/settings.ts
+++ b/frontend/sync-client/src/persistence/settings.ts
@@ -33,6 +33,7 @@ export class Settings {
 	) => void)[] = [];
 
 	public constructor(
+		private readonly logger: Logger,
 		initialState: Partial<SyncSettings> | undefined,
 		private readonly saveData: (data: unknown) => Promise<void>
 	) {
@@ -41,7 +42,7 @@ export class Settings {
 			...(initialState ?? {})
 		};
 
-		Logger.getInstance().debug(
+		this.logger.debug(
 			`Loaded settings: ${JSON.stringify(this.settings, null, 2)}`
 		);
 	}
@@ -70,7 +71,7 @@ export class Settings {
 		value: SyncSettings[T]
 	): Promise<void> {
 		const newSettings = { ...this.settings, [key]: value };
-		Logger.getInstance().debug(
+		this.logger.debug(
 			`Setting ${key} to ${value}, new settings: ${JSON.stringify(
 				newSettings,
 				null,
diff --git a/frontend/sync-client/src/services/sync-service.ts b/frontend/sync-client/src/services/sync-service.ts
index 69eb585a..f49a90d2 100644
--- a/frontend/sync-client/src/services/sync-service.ts
+++ b/frontend/sync-client/src/services/sync-service.ts
@@ -7,7 +7,7 @@ import type {
 	VaultUpdateId
 } from "../persistence/database";
 import { Logger } from "src/tracing/logger";
-import { retriedFetch } from "src/utils/retried-fetch";
+import { retriedFetchFactory } from "src/utils/retried-fetch";
 import type { SyncSettings } from "dist/types";
 import type { Settings } from "src/persistence/settings";
 
@@ -19,7 +19,10 @@ export class SyncService {
 	private client!: Client<paths>;
 	private clientWithoutRetries!: Client<paths>;
 
-	public constructor(private readonly settings: Settings) {
+	public constructor(
+		private readonly settings: Settings,
+		private readonly logger: Logger
+	) {
 		this.createClient(settings.getSettings());
 
 		settings.addOnSettingsChangeHandlers(this.createClient.bind(this));
@@ -73,7 +76,7 @@ export class SyncService {
 			);
 		}
 
-		Logger.getInstance().debug(
+		this.logger.debug(
 			`Created document ${JSON.stringify(response.data)} with id ${
 				response.data.documentId
 			}`
@@ -124,7 +127,7 @@ export class SyncService {
 			);
 		}
 
-		Logger.getInstance().debug(
+		this.logger.debug(
 			`Updated document ${JSON.stringify(response.data)} with id ${
 				response.data.documentId
 			}`
@@ -165,7 +168,7 @@ export class SyncService {
 			throw new Error(`Failed to delete document`);
 		}
 
-		Logger.getInstance().debug(
+		this.logger.debug(
 			`Deleted document ${relativePath} with id ${documentId}`
 		);
 
@@ -198,7 +201,7 @@ export class SyncService {
 			);
 		}
 
-		Logger.getInstance().debug(
+		this.logger.debug(
 			`Get document ${response.data.relativePath} with id ${response.data.documentId}`
 		);
 
@@ -229,7 +232,7 @@ export class SyncService {
 			);
 		}
 
-		Logger.getInstance().debug(
+		this.logger.debug(
 			`Got ${response.data.latestDocuments.length} document metadata`
 		);
 
@@ -267,9 +270,7 @@ export class SyncService {
 			}
 		});
 
-		Logger.getInstance().debug(
-			`Ping response: ${JSON.stringify(response.data)}`
-		);
+		this.logger.debug(`Ping response: ${JSON.stringify(response.data)}`);
 
 		if (!response.data) {
 			throw new Error(
@@ -283,7 +284,7 @@ export class SyncService {
 	private createClient(settings: SyncSettings): void {
 		this.client = createClient<paths>({
 			baseUrl: settings.remoteUri,
-			fetch: retriedFetch
+			fetch: retriedFetchFactory(this.logger)
 		});
 
 		this.clientWithoutRetries = createClient<paths>({
diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts
index 8d735da7..acbe098e 100644
--- a/frontend/sync-client/src/sync-client.ts
+++ b/frontend/sync-client/src/sync-client.ts
@@ -12,14 +12,15 @@ import { FileSystemOperations } from "./file-operations/filesystem-operations";
 import { FileOperations } from "./file-operations/file-operations";
 
 export class SyncClient {
-	private remoteListenerIntervalId: number | null = null;
+	private remoteListenerIntervalId: NodeJS.Timeout | null = null;
 
 	private constructor(
 		private readonly _history: SyncHistory,
 		private readonly _settings: Settings,
 		private readonly _database: Database,
 		private readonly _syncer: Syncer,
-		private readonly _syncService: SyncService
+		private readonly _syncService: SyncService,
+		private readonly _logger: Logger
 	) {}
 
 	public get history(): SyncHistory {
@@ -34,12 +35,17 @@ export class SyncClient {
 		return this._syncer;
 	}
 
+	public get logger(): Logger {
+		return this._logger;
+	}
+
 	public static async create(
 		fs: FileSystemOperations,
 		persistence: PersistenceProvider
 	): Promise<SyncClient> {
-		const history = new SyncHistory();
-		Logger.getInstance().info("Starting SyncClient");
+		const logger = new Logger();
+		const history = new SyncHistory(logger);
+		logger.info("Starting SyncClient");
 
 		await init(
 			// eslint-disable-next-line
@@ -54,6 +60,7 @@ export class SyncClient {
 			database: undefined
 		};
 		const database = new Database(
+			logger,
 			state.database,
 			async (data: unknown): Promise<void> => {
 				state = { ...state, database: data };
@@ -62,6 +69,7 @@ export class SyncClient {
 		);
 
 		const settings = new Settings(
+			logger,
 			state.settings,
 			async (data: unknown): Promise<void> => {
 				state = { ...state, settings: data };
@@ -69,13 +77,14 @@ export class SyncClient {
 			}
 		);
 
-		const syncService = new SyncService(settings);
+		const syncService = new SyncService(settings, logger);
 
 		const syncer = new Syncer(
+			logger,
 			database,
 			settings,
 			syncService,
-			new FileOperations(fs),
+			new FileOperations(logger, fs),
 			history
 		);
 
@@ -84,7 +93,8 @@ export class SyncClient {
 			settings,
 			database,
 			syncer,
-			syncService
+			syncService,
+			logger
 		);
 
 		void syncer.scheduleSyncForOfflineChanges();
@@ -102,14 +112,14 @@ export class SyncClient {
 				syncer
 					.scheduleSyncForOfflineChanges()
 					.catch((_error: unknown) => {
-						Logger.getInstance().error(
+						logger.error(
 							"Failed to schedule sync for offline changes"
 						);
 					});
 			}
 		});
 
-		Logger.getInstance().info("SyncClient loaded");
+		logger.info("SyncClient loaded");
 
 		return client;
 	}
@@ -125,21 +135,21 @@ export class SyncClient {
 	public async reset(): Promise<void> {
 		await this._syncer.reset();
 		this._history.reset();
-		Logger.getInstance().reset();
+		this.logger.reset();
 	}
 
 	public onunload(): void {
 		if (this.remoteListenerIntervalId !== null) {
-			window.clearInterval(this.remoteListenerIntervalId);
+			clearInterval(this.remoteListenerIntervalId);
 		}
 	}
 
 	private registerRemoteEventListener(intervalMs: number): void {
 		if (this.remoteListenerIntervalId !== null) {
-			window.clearInterval(this.remoteListenerIntervalId);
+			clearInterval(this.remoteListenerIntervalId);
 		}
 
-		this.remoteListenerIntervalId = window.setInterval(
+		this.remoteListenerIntervalId = setInterval(
 			() => void this._syncer.applyRemoteChangesLocally(),
 			intervalMs
 		);
diff --git a/frontend/sync-client/src/sync-operations/syncer.ts b/frontend/sync-client/src/sync-operations/syncer.ts
index e362fb73..d73e737f 100644
--- a/frontend/sync-client/src/sync-operations/syncer.ts
+++ b/frontend/sync-client/src/sync-operations/syncer.ts
@@ -29,6 +29,7 @@ export class Syncer {
 		undefined;
 
 	public constructor(
+		private readonly logger: Logger,
 		private readonly database: Database,
 		private readonly settings: Settings,
 		private readonly syncService: SyncService,
@@ -91,16 +92,14 @@ export class Syncer {
 
 	public async scheduleSyncForOfflineChanges(): Promise<void> {
 		if (!this.settings.getSettings().isSyncEnabled) {
-			Logger.getInstance().debug(
+			this.logger.debug(
 				`Syncing is disabled, not uploading local changes`
 			);
 			return;
 		}
 
 		if (this.runningScheduleSyncForOfflineChanges != null) {
-			Logger.getInstance().debug(
-				"Uploading local changes is already in progress"
-			);
+			this.logger.debug("Uploading local changes is already in progress");
 			return this.runningScheduleSyncForOfflineChanges;
 		}
 
@@ -108,11 +107,9 @@ export class Syncer {
 			this.runningScheduleSyncForOfflineChanges =
 				this.internalScheduleSyncForOfflineChanges();
 			await this.runningScheduleSyncForOfflineChanges;
-			Logger.getInstance().info(
-				`All local changes have been applied remotely`
-			);
+			this.logger.info(`All local changes have been applied remotely`);
 		} catch (e) {
-			Logger.getInstance().error(
+			this.logger.error(
 				`Not all local changes have been applied remotely: ${e}`
 			);
 			throw e;
@@ -150,7 +147,7 @@ export class Syncer {
 								(item) => item != originalFile
 							);
 
-							Logger.getInstance().debug(
+							this.logger.debug(
 								`Document ${relativePath} was not found under its current path in the database but was found under a different path ${originalFile[0]}, scheduling sync to move it`
 							);
 							return this.internalSyncLocallyUpdatedFile({
@@ -167,7 +164,7 @@ export class Syncer {
 							});
 						}
 
-						Logger.getInstance().debug(
+						this.logger.debug(
 							`Document ${relativePath} not found in database, scheduling sync to create it`
 						);
 						return this.internalSyncLocallyCreatedFile(
@@ -178,7 +175,7 @@ export class Syncer {
 						);
 					}
 
-					Logger.getInstance().debug(
+					this.logger.debug(
 						`Document ${relativePath} has been updated locally, scheduling sync to update it`
 					);
 					return this.internalSyncLocallyUpdatedFile({
@@ -194,12 +191,12 @@ export class Syncer {
 
 		await Promise.all(
 			locallyDeletedFiles.map(async ([relativePath, _]) => {
-				Logger.getInstance().debug(
+				this.logger.debug(
 					`Document ${relativePath} has been deleted locally, scheduling sync to delete it`
 				);
 
 				if (await this.operations.exists(relativePath)) {
-					Logger.getInstance().debug(
+					this.logger.debug(
 						`Document ${relativePath} actually exists locally, skipping`
 					);
 					return Promise.resolve();
@@ -212,14 +209,14 @@ export class Syncer {
 
 	public async applyRemoteChangesLocally(): Promise<void> {
 		if (!this.settings.getSettings().isSyncEnabled) {
-			Logger.getInstance().debug(
+			this.logger.debug(
 				`Syncing is disabled, not fetching remote changes`
 			);
 			return;
 		}
 
 		if (this.runningApplyRemoteChangesLocally != null) {
-			Logger.getInstance().debug(
+			this.logger.debug(
 				"Applying remote changes locally is already in progress"
 			);
 			return this.runningApplyRemoteChangesLocally;
@@ -229,13 +226,9 @@ export class Syncer {
 			this.runningApplyRemoteChangesLocally =
 				this.internalApplyRemoteChangesLocally();
 			await this.runningApplyRemoteChangesLocally;
-			Logger.getInstance().info(
-				"All remote changes have been applied locally"
-			);
+			this.logger.info("All remote changes have been applied locally");
 		} catch (e) {
-			Logger.getInstance().error(
-				`Failed to apply remote changes locally: ${e}`
-			);
+			this.logger.error(`Failed to apply remote changes locally: ${e}`);
 			throw e;
 		} finally {
 			this.runningApplyRemoteChangesLocally = undefined;
@@ -248,11 +241,11 @@ export class Syncer {
 		);
 
 		if (remote.latestDocuments.length === 0) {
-			Logger.getInstance().debug("No remote changes to apply");
+			this.logger.debug("No remote changes to apply");
 			return;
 		}
 
-		Logger.getInstance().info("Applying remote changes locally");
+		this.logger.info("Applying remote changes locally");
 
 		await Promise.all(
 			remote.latestDocuments.map(async (remoteDocument) =>
@@ -317,7 +310,7 @@ export class Syncer {
 
 				const localMetadata = this.database.getDocument(relativePath);
 				if (localMetadata) {
-					Logger.getInstance().debug(
+					this.logger.debug(
 						`Document metadata already exists for ${relativePath}, it must have been downloaded from the server`
 					);
 
@@ -631,7 +624,7 @@ export class Syncer {
 
 				const [relativePath, metadata] = localMetadata;
 				if (metadata.parentVersionId === remoteVersion.vaultUpdateId) {
-					Logger.getInstance().debug(
+					this.logger.debug(
 						`Document ${relativePath} is already up to date`
 					);
 					return;
@@ -658,7 +651,7 @@ export class Syncer {
 						const currentHash = hash(currentContent);
 
 						if (currentHash !== metadata.hash) {
-							Logger.getInstance().info(
+							this.logger.info(
 								`Document ${relativePath} has been updated both remotely and locally, letting the local file update event handle it`
 							);
 							return;
@@ -716,18 +709,18 @@ export class Syncer {
 		fn: () => Promise<void>
 	): Promise<void> {
 		if (!this.settings.getSettings().isSyncEnabled) {
-			Logger.getInstance().info(
+			this.logger.info(
 				`Syncing is disabled, not syncing ${relativePath}`
 			);
 			return;
 		}
 		if (!this.operations.isFileEligibleForSync(relativePath)) {
-			Logger.getInstance().info(
+			this.logger.info(
 				`File ${relativePath} is not eligible for syncing`
 			);
 			return;
 		}
-		Logger.getInstance().debug(`Syncing ${relativePath}`);
+		this.logger.debug(`Syncing ${relativePath}`);
 
 		await waitForDocumentLock(relativePath);
 		try {
diff --git a/frontend/sync-client/src/tracing/sync-history.ts b/frontend/sync-client/src/tracing/sync-history.ts
index b64cdd50..f4609d81 100644
--- a/frontend/sync-client/src/tracing/sync-history.ts
+++ b/frontend/sync-client/src/tracing/sync-history.ts
@@ -47,6 +47,8 @@ export class SyncHistory {
 		error: 0
 	};
 
+	public constructor(private logger: Logger) {}
+
 	public getEntries(): HistoryEntry[] {
 		return [...this.entries];
 	}
@@ -78,16 +80,16 @@ export class SyncHistory {
 
 		if (entry.status === SyncStatus.SUCCESS) {
 			this.status.success++;
-			Logger.getInstance().info(
+			this.logger.info(
 				`History entry: ${entry.relativePath} - ${entry.message}`
 			);
 		} else if (entry.status === SyncStatus.ERROR) {
 			this.status.error++;
-			Logger.getInstance().error(
+			this.logger.error(
 				`Error syncing file: ${entry.relativePath} - ${entry.message}`
 			);
 		} else {
-			Logger.getInstance().debug(
+			this.logger.debug(
 				`No-op syncing file: ${entry.relativePath} - ${entry.message}`
 			);
 		}
diff --git a/frontend/sync-client/src/utils/retried-fetch.ts b/frontend/sync-client/src/utils/retried-fetch.ts
index d6694ae7..1a5483c4 100644
--- a/frontend/sync-client/src/utils/retried-fetch.ts
+++ b/frontend/sync-client/src/utils/retried-fetch.ts
@@ -14,23 +14,25 @@ function getUrlFromInput(input: RequestInfo | URL): string {
 	return input.url;
 }
 
-export async function retriedFetch(
-	input: RequestInfo | URL,
-	init: RequestInitRetryParams<typeof fetch> = {}
-): Promise<Response> {
-	return fetchWithRetry(input, {
-		retryOn: function (attempt, error, response) {
-			if (error !== null || !response || response.status >= 500) {
-				Logger.getInstance().warn(
-					`Retrying fetch for ${getUrlFromInput(input)}, attempt ${attempt}`
-				);
+export function retriedFetchFactory(logger: Logger) {
+	return (
+		input: RequestInfo | URL,
+		init: RequestInitRetryParams<typeof fetch> = {}
+	): Promise<Response> => {
+		return fetchWithRetry(input, {
+			retryOn: function (attempt, error, response) {
+				if (error !== null || !response || response.status >= 500) {
+					logger.warn(
+						`Retrying fetch for ${getUrlFromInput(input)}, attempt ${attempt}`
+					);
 
-				return true;
-			}
-			return false;
-		},
-		retries: 6,
-		retryDelay: (attempt) => Math.pow(1.5, attempt) * 500,
-		...init
-	});
+					return true;
+				}
+				return false;
+			},
+			retries: 6,
+			retryDelay: (attempt) => Math.pow(1.5, attempt) * 500,
+			...init
+		});
+	};
 }

From 1be1764db6ca227ebde43e99d42b179cf99e7ba0 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Feb 2025 15:12:17 +0000
Subject: [PATCH 217/761] Colour agent logs

---
 frontend/test-client/src/agent/mock-agent.ts | 33 ++++++++++++++++++--
 frontend/test-client/src/cli.ts              | 26 ++++++++++-----
 2 files changed, 50 insertions(+), 9 deletions(-)

diff --git a/frontend/test-client/src/agent/mock-agent.ts b/frontend/test-client/src/agent/mock-agent.ts
index c597430a..31524207 100644
--- a/frontend/test-client/src/agent/mock-agent.ts
+++ b/frontend/test-client/src/agent/mock-agent.ts
@@ -1,8 +1,9 @@
 import { choose } from "../utils/choose";
 import { v4 as uuidv4 } from "uuid";
 import { assert } from "../utils/assert";
-import { SyncSettings } from "sync-client";
+import { LogLevel, SyncSettings } from "sync-client";
 import { MockClient } from "./mock-client";
+import chalk from "chalk";
 
 export class MockAgent extends MockClient {
 	private writtenContents: Array<string> = [];
@@ -11,11 +12,39 @@ export class MockAgent extends MockClient {
 	public constructor(
 		globalFiles: Record<string, Uint8Array>,
 		initialSettings: Partial<SyncSettings>,
-		private readonly name: string
+		public readonly name: string,
+		private readonly color: string
 	) {
 		super(globalFiles, initialSettings);
 	}
 
+	public async init(): Promise<void> {
+		await super.init();
+
+		this.client.logger.addOnMessageListener((message) => {
+			const formatted = chalk.hex(this.color)(
+				`[${this.name}] ${message.timestamp.toISOString()} ${message.level} ${message.message}`
+			);
+
+			switch (message.level) {
+				case LogLevel.ERROR:
+					console.error(formatted);
+					break;
+				case LogLevel.WARNING:
+					console.warn(formatted);
+					break;
+				case LogLevel.INFO:
+					console.info(formatted);
+					break;
+				case LogLevel.DEBUG:
+					console.debug(formatted);
+					break;
+			}
+		});
+
+		this.client.logger.info("Agent initialized");
+	}
+
 	public async act(): Promise<void> {
 		let options: Array<() => Promise<unknown>> = [
 			() =>
diff --git a/frontend/test-client/src/cli.ts b/frontend/test-client/src/cli.ts
index 80ea3f33..7bb952cb 100644
--- a/frontend/test-client/src/cli.ts
+++ b/frontend/test-client/src/cli.ts
@@ -7,20 +7,21 @@ const globalFiles: Record<string, Uint8Array> = {};
 const iterations = 100;
 
 async function runTest(): Promise<void> {
-	console.info("Starting test...");
+	console.info("Starting test");
 
 	const initialSettings: Partial<SyncSettings> = {
 		isSyncEnabled: true,
 		token: "token",
-		vaultName: uuidv4()
+		vaultName: uuidv4(),
+		remoteUri: "http://localhost:3030"
 	};
 
 	const clients = [
-		new MockAgent(globalFiles, initialSettings, "agent-1"),
-		new MockAgent(globalFiles, initialSettings, "agent-2"),
-		new MockAgent(globalFiles, initialSettings, "agent-3"),
-		new MockAgent(globalFiles, initialSettings, "agent-4"),
-		new MockAgent(globalFiles, initialSettings, "agent-5")
+		new MockAgent(globalFiles, initialSettings, "agent-1", "#ff0000"),
+		new MockAgent(globalFiles, initialSettings, "agent-2", "#00ff00"),
+		new MockAgent(globalFiles, initialSettings, "agent-3", "#0000ff"),
+		new MockAgent(globalFiles, initialSettings, "agent-4", "#ffaa00"),
+		new MockAgent(globalFiles, initialSettings, "agent-5", "#00ffaa")
 	];
 
 	await Promise.all(clients.map((client) => client.init()));
@@ -32,9 +33,20 @@ async function runTest(): Promise<void> {
 
 	await Promise.all(clients.map((client) => client.finish()));
 
+	console.info("Agents finished successfully");
+
 	clients.forEach((client) => {
+		console.info(`Checking consistency for ${client.name}`);
 		client.assertFileSystemIsConsistent();
+		console.info(`Consistency check for ${client.name} passed`);
+	});
+
+	console.info("File systems found to be consistent");
+
+	clients.forEach((client) => {
+		console.info(`Checking content for ${client.name}`);
 		client.assertAllContentIsPresentOnce();
+		console.info(`Content check for ${client.name} passed`);
 	});
 
 	console.info("Test completed successfully");

From 39561d386eff7f79309bde39fed06f33fac9ab78 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Feb 2025 15:13:01 +0000
Subject: [PATCH 218/761] Add test-client build files

---
 frontend/test-client/package.json      | 24 ++++++++++++++++++++
 frontend/test-client/tsconfig.json     | 16 +++++++++++++
 frontend/test-client/webpack.config.js | 31 ++++++++++++++++++++++++++
 3 files changed, 71 insertions(+)
 create mode 100644 frontend/test-client/package.json
 create mode 100644 frontend/test-client/tsconfig.json
 create mode 100644 frontend/test-client/webpack.config.js

diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
new file mode 100644
index 00000000..262ff149
--- /dev/null
+++ b/frontend/test-client/package.json
@@ -0,0 +1,24 @@
+{
+    "name": "test-client",
+    "version": "0.0.0",
+    "private": true,
+    "bin": {
+        "test-client": "./dist/cli.js"
+    },
+    "scripts": {
+        "dev": "webpack watch --mode development",
+        "build": "webpack --mode production"
+    },
+    "dependencies": {
+        "sync-client": "file:../sync-client"
+    },
+    "devDependencies": {
+        "uuid": "^11.1.0",
+        "chalk": "^5.4.1",
+        "ts-loader": "^9.5.2",
+        "tslib": "2.8.1",
+        "typescript": "5.7.3",
+        "webpack": "^5.98.0",
+        "webpack-cli": "^6.0.1"
+    }
+}
\ No newline at end of file
diff --git a/frontend/test-client/tsconfig.json b/frontend/test-client/tsconfig.json
new file mode 100644
index 00000000..e8142716
--- /dev/null
+++ b/frontend/test-client/tsconfig.json
@@ -0,0 +1,16 @@
+{
+  "compilerOptions": {
+    "baseUrl": ".",
+    "strict": true,
+    "target": "ES2022",
+    "module": "CommonJS",
+    "esModuleInterop": true,
+    "lib": [
+      "DOM",
+      "ESNext"
+    ]
+  },
+  "exclude": [
+    "./dist"
+  ]
+}
\ No newline at end of file
diff --git a/frontend/test-client/webpack.config.js b/frontend/test-client/webpack.config.js
new file mode 100644
index 00000000..aa42a7df
--- /dev/null
+++ b/frontend/test-client/webpack.config.js
@@ -0,0 +1,31 @@
+const path = require("path");
+const webpack = require("webpack");
+
+module.exports = {
+	entry: "./src/cli.ts",
+	target: "node",
+	mode: "production",
+	optimization: {
+		minimize: false
+	},
+	module: {
+		rules: [
+			{
+				test: /\.ts$/,
+				use: "ts-loader",
+				exclude: /node_modules/
+			}
+		]
+	},
+	resolve: {
+		extensions: [".ts", ".js"]
+	},
+	output: {
+		globalObject: "this",
+		filename: "cli.js",
+		path: path.resolve(__dirname, "dist")
+	},
+	plugins: [
+		new webpack.BannerPlugin({ banner: "#!/usr/bin/env node", raw: true })
+	]
+};

From e6eedab87dd5289e4d46bf352f84d15ee6da33a7 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Feb 2025 15:18:30 +0000
Subject: [PATCH 219/761] Rename onunload

---
 frontend/obsidian-plugin/src/vault-link-plugin.ts | 2 +-
 frontend/sync-client/src/sync-client.ts           | 2 +-
 frontend/test-client/src/agent/mock-agent.ts      | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/frontend/obsidian-plugin/src/vault-link-plugin.ts b/frontend/obsidian-plugin/src/vault-link-plugin.ts
index e4a42411..e60c33af 100644
--- a/frontend/obsidian-plugin/src/vault-link-plugin.ts
+++ b/frontend/obsidian-plugin/src/vault-link-plugin.ts
@@ -92,7 +92,7 @@ export default class VaultLinkPlugin extends Plugin {
 	}
 
 	public onunload(): void {
-		this.client.onunload();
+		this.client.stop();
 	}
 
 	public openSettings(): void {
diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts
index acbe098e..1d3b33fc 100644
--- a/frontend/sync-client/src/sync-client.ts
+++ b/frontend/sync-client/src/sync-client.ts
@@ -138,7 +138,7 @@ export class SyncClient {
 		this.logger.reset();
 	}
 
-	public onunload(): void {
+	public stop(): void {
 		if (this.remoteListenerIntervalId !== null) {
 			clearInterval(this.remoteListenerIntervalId);
 		}
diff --git a/frontend/test-client/src/agent/mock-agent.ts b/frontend/test-client/src/agent/mock-agent.ts
index 31524207..2e320819 100644
--- a/frontend/test-client/src/agent/mock-agent.ts
+++ b/frontend/test-client/src/agent/mock-agent.ts
@@ -91,6 +91,7 @@ export class MockAgent extends MockClient {
 		await Promise.all(this.pendingActions);
 		await this.client.settings.setSetting("isSyncEnabled", true);
 		await this.client.syncer.applyRemoteChangesLocally();
+		this.client.stop();
 	}
 
 	public assertFileSystemIsConsistent(): void {

From f73b5ecb7162cfb29a007400cd8101674e156fdc Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Feb 2025 17:17:07 +0000
Subject: [PATCH 220/761] Fixes & refactor

---
 .../src/file-operations/file-operations.ts    |  2 +-
 frontend/sync-client/src/sync-client.ts       |  1 +
 .../sync-client/src/sync-operations/syncer.ts | 81 +++++++++----------
 .../utils/find-matching-file-based-on-hash.ts | 13 +++
 4 files changed, 54 insertions(+), 43 deletions(-)
 create mode 100644 frontend/sync-client/src/utils/find-matching-file-based-on-hash.ts

diff --git a/frontend/sync-client/src/file-operations/file-operations.ts b/frontend/sync-client/src/file-operations/file-operations.ts
index fb62c720..ec9ef1a0 100644
--- a/frontend/sync-client/src/file-operations/file-operations.ts
+++ b/frontend/sync-client/src/file-operations/file-operations.ts
@@ -120,7 +120,7 @@ export class FileOperations {
 	}
 
 	public async remove(path: RelativePath): Promise<void> {
-		this.logger.debug(`Removing file: ${path}`);
+		this.logger.debug(`Deleting file: ${path}`);
 		return this.fs.delete(path);
 	}
 
diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts
index 1d3b33fc..5e7d8f2d 100644
--- a/frontend/sync-client/src/sync-client.ts
+++ b/frontend/sync-client/src/sync-client.ts
@@ -135,6 +135,7 @@ export class SyncClient {
 	public async reset(): Promise<void> {
 		await this._syncer.reset();
 		this._history.reset();
+		await this._database.resetSyncState();
 		this.logger.reset();
 	}
 
diff --git a/frontend/sync-client/src/sync-operations/syncer.ts b/frontend/sync-client/src/sync-operations/syncer.ts
index d73e737f..d99eb065 100644
--- a/frontend/sync-client/src/sync-operations/syncer.ts
+++ b/frontend/sync-client/src/sync-operations/syncer.ts
@@ -15,6 +15,7 @@ import type { components } from "src/services/types";
 import { deserialize } from "src/utils/deserialize";
 import type { Settings } from "src/persistence/settings";
 import { FileOperations } from "src/file-operations/file-operations";
+import { findMatchingFileBasedOnHash } from "src/utils/find-matching-file-based-on-hash";
 
 export class Syncer {
 	private readonly remainingOperationsListeners: ((
@@ -74,6 +75,10 @@ export class Syncer {
 		);
 	}
 
+	public waitForSyncQueue(): Promise<void> {
+		return this.syncQueue.onEmpty();
+	}
+
 	public async syncLocallyDeletedFile(
 		relativePath: RelativePath
 	): Promise<void> {
@@ -136,11 +141,10 @@ export class Syncer {
 							await this.operations.read(relativePath);
 						const contentHash = hash(contentBytes);
 
-						const originalFile =
-							await this.findMatchingFileBasedOnHash(
-								contentHash,
-								locallyDeletedFiles
-							);
+						const originalFile = findMatchingFileBasedOnHash(
+							contentHash,
+							locallyDeletedFiles
+						);
 						if (originalFile !== undefined) {
 							// `originalFile` hasn't been deleted but it got moved instead
 							locallyDeletedFiles = locallyDeletedFiles.filter(
@@ -202,7 +206,8 @@ export class Syncer {
 					return Promise.resolve();
 				}
 
-				return this.internalSyncLocallyDeletedFile(relativePath);
+				// We're outside of the pqueue, so we need to call the public wrapper
+				return this.syncLocallyDeletedFile(relativePath);
 			})
 		);
 	}
@@ -265,8 +270,6 @@ export class Syncer {
 	public async reset(): Promise<void> {
 		this.syncQueue.clear();
 		await this.syncQueue.onEmpty();
-		await this.database.resetSyncState();
-		this.history.reset();
 		this.remainingOperationsListeners.forEach((listener) => {
 			listener(0);
 		});
@@ -388,22 +391,9 @@ export class Syncer {
 			SyncType.UPDATE,
 			SyncSource.PUSH,
 			async () => {
-				if (
-					(await this.operations.getFileSize(relativePath)) /
-						1024 /
-						1024 >
-					this.settings.getSettings().maxFileSizeMB
-				) {
-					this.history.addHistoryEntry({
-						status: SyncStatus.ERROR,
-						relativePath,
-						message: `File size exceeds the maximum file size limit of ${
-							this.settings.getSettings().maxFileSizeMB
-						}MB`,
-						type: SyncType.CREATE
-					});
-					return;
-				}
+				this.logger.debug(
+					`Renaming? oldPath ${oldPath} relativePath ${relativePath}`
+				);
 
 				const localMetadata = this.database.getDocument(
 					oldPath ?? relativePath
@@ -420,9 +410,27 @@ export class Syncer {
 						return;
 					}
 
-					throw new Error(
-						`Document metadata not found for ${relativePath}. This implies a corrupt local database. Consider resetting the plugin's sync history.`
+					this.logger.debug(
+						`Document metadata doesn't exist for ${relativePath}, it must have been already deleted`
 					);
+					return;
+				}
+
+				if (
+					(await this.operations.getFileSize(relativePath)) /
+						1024 /
+						1024 >
+					this.settings.getSettings().maxFileSizeMB
+				) {
+					this.history.addHistoryEntry({
+						status: SyncStatus.ERROR,
+						relativePath,
+						message: `File size exceeds the maximum file size limit of ${
+							this.settings.getSettings().maxFileSizeMB
+						}MB`,
+						type: SyncType.CREATE
+					});
+					return;
 				}
 
 				const contentBytes =
@@ -487,7 +495,7 @@ export class Syncer {
 				try {
 					if (response.relativePath != relativePath) {
 						await this.operations.move(
-							oldPath ?? relativePath,
+							relativePath,
 							response.relativePath
 						);
 					}
@@ -616,7 +624,7 @@ export class Syncer {
 						status: SyncStatus.SUCCESS,
 						source: SyncSource.PULL,
 						relativePath: remoteVersion.relativePath,
-						message: `Successfully downloaded remote file which hasn't existed locally`,
+						message: `Successfully downloaded remote file which hadn't existed locally`,
 						type: SyncType.CREATE
 					});
 					return;
@@ -720,7 +728,9 @@ export class Syncer {
 			);
 			return;
 		}
-		this.logger.debug(`Syncing ${relativePath}`);
+		this.logger.debug(
+			`Syncing ${relativePath} (${syncSource} - ${syncType})`
+		);
 
 		await waitForDocumentLock(relativePath);
 		try {
@@ -752,17 +762,4 @@ export class Syncer {
 			await this.database.setLastSeenUpdateId(responseVaultUpdateId);
 		}
 	}
-
-	private async findMatchingFileBasedOnHash(
-		contentHash: string,
-		candidates: [RelativePath, DocumentMetadata][]
-	): Promise<[RelativePath, DocumentMetadata] | undefined> {
-		if (contentHash != EMPTY_HASH) {
-			return undefined;
-		}
-
-		return candidates.find(
-			([_, document]) => document.hash === contentHash
-		);
-	}
 }
diff --git a/frontend/sync-client/src/utils/find-matching-file-based-on-hash.ts b/frontend/sync-client/src/utils/find-matching-file-based-on-hash.ts
new file mode 100644
index 00000000..ecd54c85
--- /dev/null
+++ b/frontend/sync-client/src/utils/find-matching-file-based-on-hash.ts
@@ -0,0 +1,13 @@
+import { DocumentMetadata, RelativePath } from "src/persistence/database";
+import { EMPTY_HASH } from "./hash";
+
+export function findMatchingFileBasedOnHash(
+	contentHash: string,
+	candidates: [RelativePath, DocumentMetadata][]
+): [RelativePath, DocumentMetadata] | undefined {
+	if (contentHash != EMPTY_HASH) {
+		return undefined;
+	}
+
+	return candidates.find(([_, document]) => document.hash === contentHash);
+}

From 27423bf3cd28c8d57be585c22433324ec7bbb5d8 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Feb 2025 17:17:22 +0000
Subject: [PATCH 221/761] Improve testing

---
 frontend/test-client/src/agent/mock-agent.ts  | 126 +++++++++++++-----
 frontend/test-client/src/agent/mock-client.ts |  61 ++++++---
 frontend/test-client/src/cli.ts               |  41 +++++-
 3 files changed, 165 insertions(+), 63 deletions(-)

diff --git a/frontend/test-client/src/agent/mock-agent.ts b/frontend/test-client/src/agent/mock-agent.ts
index 2e320819..c69fae45 100644
--- a/frontend/test-client/src/agent/mock-agent.ts
+++ b/frontend/test-client/src/agent/mock-agent.ts
@@ -4,6 +4,7 @@ import { assert } from "../utils/assert";
 import { LogLevel, SyncSettings } from "sync-client";
 import { MockClient } from "./mock-client";
 import chalk from "chalk";
+import { sleep } from "../utils/sleep";
 
 export class MockAgent extends MockClient {
 	private writtenContents: Array<string> = [];
@@ -13,7 +14,8 @@ export class MockAgent extends MockClient {
 		globalFiles: Record<string, Uint8Array>,
 		initialSettings: Partial<SyncSettings>,
 		public readonly name: string,
-		private readonly color: string
+		private readonly color: string,
+		private readonly doDeletes: boolean
 	) {
 		super(globalFiles, initialSettings);
 	}
@@ -47,31 +49,60 @@ export class MockAgent extends MockClient {
 
 	public async act(): Promise<void> {
 		let options: Array<() => Promise<unknown>> = [
-			() =>
-				this.create(
-					this.getFileName(),
+			() => {
+				const file = this.getFileName();
+				this.client.logger.info(`Decided to create file ${file}`);
+				return this.create(
+					file,
 					new TextEncoder().encode(this.getContent())
-				),
-			() =>
-				this.client.settings.setSetting(
+				);
+			},
+			() => {
+				this.client.logger.info(
+					`Decided to change fetchChangesUpdateIntervalMs`
+				);
+				return this.client.settings.setSetting(
 					"fetchChangesUpdateIntervalMs",
 					Math.random() * 1000
-				),
-			() => this.client.settings.setSetting("isSyncEnabled", false),
-			() => this.client.settings.setSetting("isSyncEnabled", true)
+				);
+			},
+			() => {
+				this.client.logger.info(`Decided to disable sync`);
+				return this.client.settings.setSetting("isSyncEnabled", false);
+			},
+			() => {
+				this.client.logger.info(`Decided to enable sync`);
+				return this.client.settings.setSetting("isSyncEnabled", true);
+			}
 		];
 
 		let files = await this.listAllFiles();
 
 		if (files.length > 0) {
 			options.push(
-				() => this.rename(choose(files), this.getFileName()),
-				() =>
-					this.atomicUpdateText(
-						choose(files),
+				() => {
+					const file = choose(files);
+
+					const newName = this.getFileName();
+					this.client.logger.info(
+						`Decided to rename file ${file} to ${newName}`
+					);
+					return this.rename(file, newName);
+				},
+				() => {
+					const file = choose(files);
+
+					this.client.logger.info(`Decided to update file ${file}`);
+					return this.atomicUpdateText(
+						file,
 						(old) => old + " " + this.getContent()
-					)
+					);
+				}
 			);
+
+			if (this.doDeletes) {
+				options.push(() => this.delete(choose(files)));
+			}
 		}
 
 		this.pendingActions.push(choose(options)());
@@ -91,47 +122,68 @@ export class MockAgent extends MockClient {
 		await Promise.all(this.pendingActions);
 		await this.client.settings.setSetting("isSyncEnabled", true);
 		await this.client.syncer.applyRemoteChangesLocally();
+		await sleep(5000);
+		await this.client.syncer.waitForSyncQueue();
 		this.client.stop();
 	}
 
 	public assertFileSystemIsConsistent(): void {
-		const files = Object.keys(this.globalFiles);
-		const localFiles = Object.keys(this.files);
+		const globalFiles = Object.keys(this.globalFiles);
+		const localFiles = Object.keys(this.localFiles);
 
-		assert(
-			files.length === localFiles.length,
-			`File count mismatch: ${files.length} != ${localFiles.length}`
+		const missingInGlobal = localFiles.filter(
+			(file) => !(file in this.globalFiles)
+		);
+		const missingInLocal = globalFiles.filter(
+			(file) => !(file in this.localFiles)
 		);
 
-		for (const file of files) {
-			assert(
-				file in this.globalFiles,
-				`File ${file} missing in global files`
+		assert(
+			missingInGlobal.length === 0,
+			`Files missing in global files: ${missingInGlobal.join(", ")}`
+		);
+		assert(
+			missingInLocal.length === 0,
+			`Files missing in local files: ${missingInLocal.join(", ")}`
+		);
+
+		for (const file of globalFiles) {
+			const localContent = new TextDecoder().decode(
+				this.localFiles[file]
+			);
+			const globalContent = new TextDecoder().decode(
+				this.globalFiles[file]
 			);
 			assert(
-				new TextDecoder().decode(this.globalFiles[file]) ===
-					new TextDecoder().decode(this.files[file]),
-				`File ${file} content mismatch`
+				localContent === globalContent,
+				`Content mismatch for file ${file}: ${localContent} <> ${globalContent}`
 			);
 		}
 	}
 
 	public assertAllContentIsPresentOnce(): void {
 		for (const content of this.writtenContents) {
-			const found = Object.values(this.files).filter((file) => {
+			const found = Object.values(this.localFiles).filter((file) => {
 				return new TextDecoder().decode(file).includes(content);
 			});
 
-			assert(
-				found.length === 1,
-				`Content ${content} found in ${found.length} files`
-			);
+			if (this.doDeletes) {
+				assert(
+					found.length <= 1,
+					`Content ${content} found in ${found.length} files`
+				);
+			} else {
+				assert(
+					found.length === 1,
+					`Content ${content} found in ${found.length} files`
+				);
 
-			const file = found[0];
-			assert(
-				new TextDecoder().decode(file).split(content).length === 2,
-				`Content ${content} found more than once in a file`
-			);
+				const file = found[0];
+				assert(
+					new TextDecoder().decode(file).split(content).length === 2,
+					`Content ${content} found more than once in a file`
+				);
+			}
 		}
 	}
 }
diff --git a/frontend/test-client/src/agent/mock-client.ts b/frontend/test-client/src/agent/mock-client.ts
index a967f54f..5766bc02 100644
--- a/frontend/test-client/src/agent/mock-client.ts
+++ b/frontend/test-client/src/agent/mock-client.ts
@@ -7,7 +7,7 @@ import {
 import { assert } from "../utils/assert";
 
 export class MockClient implements FileSystemOperations {
-	protected readonly files: Record<string, Uint8Array> = {};
+	protected readonly localFiles: Record<string, Uint8Array> = {};
 	protected client!: SyncClient;
 
 	public constructor(
@@ -37,31 +37,43 @@ export class MockClient implements FileSystemOperations {
 	}
 
 	public async listAllFiles(): Promise<RelativePath[]> {
-		return Object.keys(this.files) as RelativePath[];
+		return Object.keys(this.localFiles) as RelativePath[];
 	}
 
 	public async read(path: RelativePath): Promise<Uint8Array> {
-		return this.files[path];
+		if (!(path in this.localFiles)) {
+			throw new Error(`File ${path} does not exist`);
+		}
+		return this.localFiles[path];
 	}
 
 	public async getFileSize(path: RelativePath): Promise<number> {
-		return this.files[path].length;
+		if (!(path in this.localFiles)) {
+			throw new Error(`File ${path} does not exist`);
+		}
+		return this.localFiles[path].length;
 	}
 
 	public async getModificationTime(path: RelativePath): Promise<Date> {
+		if (!(path in this.localFiles)) {
+			throw new Error(`File ${path} does not exist`);
+		}
 		return new Date();
 	}
 
 	public async exists(path: RelativePath): Promise<boolean> {
-		return path in this.files;
+		return path in this.localFiles;
 	}
 
 	public async create(
 		path: RelativePath,
 		newContent: Uint8Array
 	): Promise<void> {
+		if (path in this.localFiles) {
+			throw new Error(`File ${path} already exists`);
+		}
 		this.globalFiles[path] = newContent;
-		this.files[path] = newContent;
+		this.localFiles[path] = newContent;
 		this.client.syncer.syncLocallyCreatedFile(path, new Date());
 	}
 
@@ -71,55 +83,62 @@ export class MockClient implements FileSystemOperations {
 		path: RelativePath,
 		updater: (currentContent: string) => string
 	): Promise<string> {
-		const currentContent = new TextDecoder().decode(this.files[path]);
+		if (!(path in this.localFiles)) {
+			throw new Error(`File ${path} does not exist`);
+		}
+		const currentContent = new TextDecoder().decode(this.localFiles[path]);
 		const newContent = updater(currentContent);
 		const newContentUint8Array = new TextEncoder().encode(newContent);
 		this.globalFiles[path] = newContentUint8Array;
-		this.files[path] = newContentUint8Array;
-		this.client.syncer.syncLocallyUpdatedFile({
+		this.localFiles[path] = newContentUint8Array;
+
+		void this.client.syncer.syncLocallyUpdatedFile({
 			relativePath: path,
 			updateTime: new Date()
 		});
+
 		return newContent;
 	}
 
 	public async write(path: RelativePath, content: Uint8Array): Promise<void> {
 		this.globalFiles[path] = content;
-		this.files[path] = content;
-		this.client.syncer.syncLocallyUpdatedFile({
+		this.localFiles[path] = content;
+
+		void this.client.syncer.syncLocallyUpdatedFile({
 			relativePath: path,
 			updateTime: new Date()
 		});
 	}
 
 	public async delete(path: RelativePath): Promise<void> {
-		delete this.files[path];
+		delete this.localFiles[path];
 		if (path in this.globalFiles) {
 			delete this.globalFiles[path];
 		}
-		this.client.syncer.syncLocallyDeletedFile(path);
+
+		void this.client.syncer.syncLocallyDeletedFile(path);
 	}
 
 	public async rename(
 		oldPath: RelativePath,
 		newPath: RelativePath
 	): Promise<void> {
-		this.files[newPath] = this.files[oldPath];
-		delete this.files[oldPath];
+		if (!(oldPath in this.localFiles)) {
+			throw new Error(`File ${oldPath} does not exist`);
+		}
+
+		this.localFiles[newPath] = this.localFiles[oldPath];
+		delete this.localFiles[oldPath];
 
 		if (oldPath in this.globalFiles) {
-			this.globalFiles[newPath] = this.files[oldPath];
+			this.globalFiles[newPath] = this.localFiles[oldPath];
 			delete this.globalFiles[oldPath];
 		}
 
-		this.client.syncer.syncLocallyUpdatedFile({
+		void this.client.syncer.syncLocallyUpdatedFile({
 			oldPath,
 			relativePath: newPath,
 			updateTime: new Date()
 		});
 	}
-
-	public isFileEligibleForSync(path: RelativePath): boolean {
-		return true;
-	}
 }
diff --git a/frontend/test-client/src/cli.ts b/frontend/test-client/src/cli.ts
index 7bb952cb..0d59f796 100644
--- a/frontend/test-client/src/cli.ts
+++ b/frontend/test-client/src/cli.ts
@@ -5,6 +5,7 @@ import { v4 as uuidv4 } from "uuid";
 
 const globalFiles: Record<string, Uint8Array> = {};
 const iterations = 100;
+const doDeletes = false;
 
 async function runTest(): Promise<void> {
 	console.info("Starting test");
@@ -17,11 +18,41 @@ async function runTest(): Promise<void> {
 	};
 
 	const clients = [
-		new MockAgent(globalFiles, initialSettings, "agent-1", "#ff0000"),
-		new MockAgent(globalFiles, initialSettings, "agent-2", "#00ff00"),
-		new MockAgent(globalFiles, initialSettings, "agent-3", "#0000ff"),
-		new MockAgent(globalFiles, initialSettings, "agent-4", "#ffaa00"),
-		new MockAgent(globalFiles, initialSettings, "agent-5", "#00ffaa")
+		new MockAgent(
+			globalFiles,
+			initialSettings,
+			"agent-1",
+			"#ff0000",
+			doDeletes
+		),
+		new MockAgent(
+			globalFiles,
+			initialSettings,
+			"agent-2",
+			"#00ff00",
+			doDeletes
+		),
+		new MockAgent(
+			globalFiles,
+			initialSettings,
+			"agent-3",
+			"#0000ff",
+			doDeletes
+		),
+		new MockAgent(
+			globalFiles,
+			initialSettings,
+			"agent-4",
+			"#ffaa00",
+			doDeletes
+		),
+		new MockAgent(
+			globalFiles,
+			initialSettings,
+			"agent-5",
+			"#00ffaa",
+			doDeletes
+		)
 	];
 
 	await Promise.all(clients.map((client) => client.init()));

From ca225a71be9cb255211c584de234262f08b5f1ac Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Feb 2025 17:25:26 +0000
Subject: [PATCH 222/761] Lint & format

---
 .../src/obisidan-event-handler.ts             |  3 +-
 .../src/obsidian-file-system.ts               |  6 ++-
 .../obsidian-plugin/src/views/history-view.ts |  3 +-
 .../src/file-operations/file-operations.ts    |  8 ++--
 .../file-operations/filesystem-operations.ts  | 24 +++++-----
 .../sync-client/src/persistence/database.ts   |  2 +-
 .../sync-client/src/persistence/settings.ts   |  3 +-
 .../sync-client/src/services/sync-service.ts  |  2 +-
 frontend/sync-client/src/sync-client.ts       | 10 ++--
 .../sync-client/src/sync-operations/syncer.ts | 14 ++----
 .../sync-client/src/tracing/sync-history.ts   |  4 +-
 .../utils/find-matching-file-based-on-hash.ts |  2 +-
 .../sync-client/src/utils/retried-fetch.ts    |  4 +-
 frontend/test-client/src/agent/mock-agent.ts  | 47 ++++++++++---------
 frontend/test-client/src/agent/mock-client.ts | 26 +++++-----
 frontend/test-client/src/cli.ts               | 17 +++++--
 frontend/test-client/src/utils/sleep.ts       |  2 +-
 17 files changed, 94 insertions(+), 83 deletions(-)

diff --git a/frontend/obsidian-plugin/src/obisidan-event-handler.ts b/frontend/obsidian-plugin/src/obisidan-event-handler.ts
index 67ae8efe..b2d58b70 100644
--- a/frontend/obsidian-plugin/src/obisidan-event-handler.ts
+++ b/frontend/obsidian-plugin/src/obisidan-event-handler.ts
@@ -1,5 +1,4 @@
-import type { SyncClient, Syncer } from "sync-client";
-import { Logger } from "sync-client";
+import type { SyncClient } from "sync-client";
 import type { TAbstractFile } from "obsidian";
 import { TFile } from "obsidian";
 
diff --git a/frontend/obsidian-plugin/src/obsidian-file-system.ts b/frontend/obsidian-plugin/src/obsidian-file-system.ts
index 68642c15..f9a5d681 100644
--- a/frontend/obsidian-plugin/src/obsidian-file-system.ts
+++ b/frontend/obsidian-plugin/src/obsidian-file-system.ts
@@ -1,5 +1,6 @@
-import { normalizePath, Stat, Vault } from "obsidian";
-import { FileSystemOperations, RelativePath } from "sync-client";
+import type { Stat, Vault } from "obsidian";
+import { normalizePath } from "obsidian";
+import type { FileSystemOperations, RelativePath } from "sync-client";
 
 export class ObsidianFileSystemOperations implements FileSystemOperations {
 	public constructor(private readonly vault: Vault) {}
@@ -17,6 +18,7 @@ export class ObsidianFileSystemOperations implements FileSystemOperations {
 	public async write(path: RelativePath, content: Uint8Array): Promise<void> {
 		return this.vault.adapter.writeBinary(
 			normalizePath(path),
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
 			content.buffer as ArrayBuffer
 		);
 	}
diff --git a/frontend/obsidian-plugin/src/views/history-view.ts b/frontend/obsidian-plugin/src/views/history-view.ts
index 3fa4f328..457836da 100644
--- a/frontend/obsidian-plugin/src/views/history-view.ts
+++ b/frontend/obsidian-plugin/src/views/history-view.ts
@@ -3,7 +3,7 @@ import { ItemView, setIcon } from "obsidian";
 
 import { intlFormatDistance } from "date-fns";
 import type { HistoryEntry, SyncClient } from "sync-client";
-import { SyncType, SyncSource, SyncStatus, Logger } from "sync-client";
+import { SyncType, SyncSource, SyncStatus } from "sync-client";
 
 export class HistoryView extends ItemView {
 	public static readonly TYPE = "history-view";
@@ -60,6 +60,7 @@ export class HistoryView extends ItemView {
 		}
 
 		element.createEl("span", {
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 			text: entry.relativePath
 		});
 
diff --git a/frontend/sync-client/src/file-operations/file-operations.ts b/frontend/sync-client/src/file-operations/file-operations.ts
index ec9ef1a0..8fe2a3fd 100644
--- a/frontend/sync-client/src/file-operations/file-operations.ts
+++ b/frontend/sync-client/src/file-operations/file-operations.ts
@@ -1,6 +1,6 @@
-import { Logger } from "src/tracing/logger";
-import { FileSystemOperations } from "./filesystem-operations";
-import { RelativePath } from "src/persistence/database";
+import type { Logger } from "src/tracing/logger";
+import type { FileSystemOperations } from "./filesystem-operations";
+import type { RelativePath } from "src/persistence/database";
 import { isBinary, isFileTypeMergable, mergeText } from "sync_lib";
 
 export class FileOperations {
@@ -138,7 +138,7 @@ export class FileOperations {
 		await this.fs.rename(oldPath, newPath);
 	}
 
-	public isFileEligibleForSync(path: RelativePath): boolean {
+	public isFileEligibleForSync(_path: RelativePath): boolean {
 		return true;
 		// TODO: figure this out
 		// if (Platform.isDesktopApp) {
diff --git a/frontend/sync-client/src/file-operations/filesystem-operations.ts b/frontend/sync-client/src/file-operations/filesystem-operations.ts
index 32bdcdfe..b58d3c23 100644
--- a/frontend/sync-client/src/file-operations/filesystem-operations.ts
+++ b/frontend/sync-client/src/file-operations/filesystem-operations.ts
@@ -1,17 +1,17 @@
-import { RelativePath } from "src/persistence/database";
+import type { RelativePath } from "src/persistence/database";
 
 export interface FileSystemOperations {
-	listAllFiles(): Promise<RelativePath[]>;
-	read(path: RelativePath): Promise<Uint8Array>;
-	write(path: RelativePath, content: Uint8Array): Promise<void>;
-	atomicUpdateText(
+	listAllFiles: () => Promise<RelativePath[]>;
+	read: (path: RelativePath) => Promise<Uint8Array>;
+	write: (path: RelativePath, content: Uint8Array) => Promise<void>;
+	atomicUpdateText: (
 		path: RelativePath,
 		updater: (currentContent: string) => string
-	): Promise<string>;
-	getFileSize(path: RelativePath): Promise<number>;
-	getModificationTime(path: RelativePath): Promise<Date>;
-	exists(path: RelativePath): Promise<boolean>;
-	createDirectory(path: RelativePath): Promise<void>;
-	delete(path: RelativePath): Promise<void>;
-	rename(oldPath: RelativePath, newPath: RelativePath): Promise<void>;
+	) => Promise<string>;
+	getFileSize: (path: RelativePath) => Promise<number>;
+	getModificationTime: (path: RelativePath) => Promise<Date>;
+	exists: (path: RelativePath) => Promise<boolean>;
+	createDirectory: (path: RelativePath) => Promise<void>;
+	delete: (path: RelativePath) => Promise<void>;
+	rename: (oldPath: RelativePath, newPath: RelativePath) => Promise<void>;
 }
diff --git a/frontend/sync-client/src/persistence/database.ts b/frontend/sync-client/src/persistence/database.ts
index dc048adb..2926af10 100644
--- a/frontend/sync-client/src/persistence/database.ts
+++ b/frontend/sync-client/src/persistence/database.ts
@@ -8,7 +8,7 @@ export interface DocumentMetadata {
 	hash: string;
 }
 
-import { Logger } from "src/tracing/logger";
+import type { Logger } from "src/tracing/logger";
 
 export interface StoredDatabase {
 	documents: Map<RelativePath, DocumentMetadata>;
diff --git a/frontend/sync-client/src/persistence/settings.ts b/frontend/sync-client/src/persistence/settings.ts
index fa732092..947aa505 100644
--- a/frontend/sync-client/src/persistence/settings.ts
+++ b/frontend/sync-client/src/persistence/settings.ts
@@ -1,4 +1,5 @@
-import { Logger, LogLevel } from "src/tracing/logger";
+import type { Logger } from "src/tracing/logger";
+import { LogLevel } from "src/tracing/logger";
 
 export interface SyncSettings {
 	remoteUri: string;
diff --git a/frontend/sync-client/src/services/sync-service.ts b/frontend/sync-client/src/services/sync-service.ts
index f49a90d2..daf21a24 100644
--- a/frontend/sync-client/src/services/sync-service.ts
+++ b/frontend/sync-client/src/services/sync-service.ts
@@ -6,7 +6,7 @@ import type {
 	RelativePath,
 	VaultUpdateId
 } from "../persistence/database";
-import { Logger } from "src/tracing/logger";
+import type { Logger } from "src/tracing/logger";
 import { retriedFetchFactory } from "src/utils/retried-fetch";
 import type { SyncSettings } from "dist/types";
 import type { Settings } from "src/persistence/settings";
diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts
index 5e7d8f2d..009a87d3 100644
--- a/frontend/sync-client/src/sync-client.ts
+++ b/frontend/sync-client/src/sync-client.ts
@@ -8,7 +8,7 @@ import { Settings } from "./persistence/settings";
 import type { CheckConnectionResult } from "./services/sync-service";
 import { SyncService } from "./services/sync-service";
 import { Syncer } from "./sync-operations/syncer";
-import { FileSystemOperations } from "./file-operations/filesystem-operations";
+import type { FileSystemOperations } from "./file-operations/filesystem-operations";
 import { FileOperations } from "./file-operations/file-operations";
 
 export class SyncClient {
@@ -39,6 +39,10 @@ export class SyncClient {
 		return this._logger;
 	}
 
+	public get documentCount(): number {
+		return this._database.getDocuments().size;
+	}
+
 	public static async create(
 		fs: FileSystemOperations,
 		persistence: PersistenceProvider
@@ -124,10 +128,6 @@ export class SyncClient {
 		return client;
 	}
 
-	public get documentCount(): number {
-		return this._database.getDocuments().size;
-	}
-
 	public async checkConnection(): Promise<CheckConnectionResult> {
 		return this._syncService.checkConnection();
 	}
diff --git a/frontend/sync-client/src/sync-operations/syncer.ts b/frontend/sync-client/src/sync-operations/syncer.ts
index d99eb065..d4ec5c93 100644
--- a/frontend/sync-client/src/sync-operations/syncer.ts
+++ b/frontend/sync-client/src/sync-operations/syncer.ts
@@ -1,20 +1,16 @@
-import type {
-	Database,
-	DocumentMetadata,
-	RelativePath
-} from "../persistence/database";
+import type { Database, RelativePath } from "../persistence/database";
 
 import type { SyncService } from "src/services/sync-service";
-import { Logger } from "src/tracing/logger";
+import type { Logger } from "src/tracing/logger";
 import type { SyncHistory } from "src/tracing/sync-history";
 import { SyncSource, SyncStatus, SyncType } from "src/tracing/sync-history";
 import { unlockDocument, waitForDocumentLock } from "./document-lock";
 import PQueue from "p-queue";
-import { EMPTY_HASH, hash } from "src/utils/hash";
+import { hash } from "src/utils/hash";
 import type { components } from "src/services/types";
 import { deserialize } from "src/utils/deserialize";
 import type { Settings } from "src/persistence/settings";
-import { FileOperations } from "src/file-operations/file-operations";
+import type { FileOperations } from "src/file-operations/file-operations";
 import { findMatchingFileBasedOnHash } from "src/utils/find-matching-file-based-on-hash";
 
 export class Syncer {
@@ -75,7 +71,7 @@ export class Syncer {
 		);
 	}
 
-	public waitForSyncQueue(): Promise<void> {
+	public async waitForSyncQueue(): Promise<void> {
 		return this.syncQueue.onEmpty();
 	}
 
diff --git a/frontend/sync-client/src/tracing/sync-history.ts b/frontend/sync-client/src/tracing/sync-history.ts
index f4609d81..a6523b5f 100644
--- a/frontend/sync-client/src/tracing/sync-history.ts
+++ b/frontend/sync-client/src/tracing/sync-history.ts
@@ -1,5 +1,5 @@
 import type { RelativePath } from "src/persistence/database";
-import { Logger } from "./logger";
+import type { Logger } from "./logger";
 
 export interface CommonHistoryEntry {
 	status: SyncStatus;
@@ -47,7 +47,7 @@ export class SyncHistory {
 		error: 0
 	};
 
-	public constructor(private logger: Logger) {}
+	public constructor(private readonly logger: Logger) {}
 
 	public getEntries(): HistoryEntry[] {
 		return [...this.entries];
diff --git a/frontend/sync-client/src/utils/find-matching-file-based-on-hash.ts b/frontend/sync-client/src/utils/find-matching-file-based-on-hash.ts
index ecd54c85..cf0b1cda 100644
--- a/frontend/sync-client/src/utils/find-matching-file-based-on-hash.ts
+++ b/frontend/sync-client/src/utils/find-matching-file-based-on-hash.ts
@@ -1,4 +1,4 @@
-import { DocumentMetadata, RelativePath } from "src/persistence/database";
+import type { DocumentMetadata, RelativePath } from "src/persistence/database";
 import { EMPTY_HASH } from "./hash";
 
 export function findMatchingFileBasedOnHash(
diff --git a/frontend/sync-client/src/utils/retried-fetch.ts b/frontend/sync-client/src/utils/retried-fetch.ts
index 1a5483c4..d3efcd2d 100644
--- a/frontend/sync-client/src/utils/retried-fetch.ts
+++ b/frontend/sync-client/src/utils/retried-fetch.ts
@@ -1,6 +1,6 @@
 import * as fetchRetryFactory from "fetch-retry";
 import type { RequestInitRetryParams } from "fetch-retry";
-import { Logger } from "src/tracing/logger";
+import type { Logger } from "src/tracing/logger";
 
 const fetchWithRetry = fetchRetryFactory.default(fetch);
 
@@ -15,7 +15,7 @@ function getUrlFromInput(input: RequestInfo | URL): string {
 }
 
 export function retriedFetchFactory(logger: Logger) {
-	return (
+	return async (
 		input: RequestInfo | URL,
 		init: RequestInitRetryParams<typeof fetch> = {}
 	): Promise<Response> => {
diff --git a/frontend/test-client/src/agent/mock-agent.ts b/frontend/test-client/src/agent/mock-agent.ts
index c69fae45..7bce4e22 100644
--- a/frontend/test-client/src/agent/mock-agent.ts
+++ b/frontend/test-client/src/agent/mock-agent.ts
@@ -1,14 +1,15 @@
 import { choose } from "../utils/choose";
 import { v4 as uuidv4 } from "uuid";
 import { assert } from "../utils/assert";
-import { LogLevel, SyncSettings } from "sync-client";
+import type { SyncSettings } from "sync-client";
+import { LogLevel } from "sync-client";
 import { MockClient } from "./mock-client";
 import chalk from "chalk";
 import { sleep } from "../utils/sleep";
 
 export class MockAgent extends MockClient {
-	private writtenContents: Array<string> = [];
-	private pendingActions: Array<Promise<unknown>> = [];
+	private readonly writtenContents: string[] = [];
+	private readonly pendingActions: Promise<unknown>[] = [];
 
 	public constructor(
 		globalFiles: Record<string, Uint8Array>,
@@ -48,8 +49,8 @@ export class MockAgent extends MockClient {
 	}
 
 	public async act(): Promise<void> {
-		let options: Array<() => Promise<unknown>> = [
-			() => {
+		const options: (() => Promise<unknown>)[] = [
+			async (): Promise<unknown> => {
 				const file = this.getFileName();
 				this.client.logger.info(`Decided to create file ${file}`);
 				return this.create(
@@ -57,7 +58,7 @@ export class MockAgent extends MockClient {
 					new TextEncoder().encode(this.getContent())
 				);
 			},
-			() => {
+			async (): Promise<unknown> => {
 				this.client.logger.info(
 					`Decided to change fetchChangesUpdateIntervalMs`
 				);
@@ -66,21 +67,21 @@ export class MockAgent extends MockClient {
 					Math.random() * 1000
 				);
 			},
-			() => {
+			async (): Promise<unknown> => {
 				this.client.logger.info(`Decided to disable sync`);
 				return this.client.settings.setSetting("isSyncEnabled", false);
 			},
-			() => {
+			async (): Promise<unknown> => {
 				this.client.logger.info(`Decided to enable sync`);
 				return this.client.settings.setSetting("isSyncEnabled", true);
 			}
 		];
 
-		let files = await this.listAllFiles();
+		const files = await this.listAllFiles();
 
 		if (files.length > 0) {
 			options.push(
-				() => {
+				async (): Promise<unknown> => {
 					const file = choose(files);
 
 					const newName = this.getFileName();
@@ -89,7 +90,7 @@ export class MockAgent extends MockClient {
 					);
 					return this.rename(file, newName);
 				},
-				() => {
+				async (): Promise<unknown> => {
 					const file = choose(files);
 
 					this.client.logger.info(`Decided to update file ${file}`);
@@ -101,23 +102,13 @@ export class MockAgent extends MockClient {
 			);
 
 			if (this.doDeletes) {
-				options.push(() => this.delete(choose(files)));
+				options.push(async () => this.delete(choose(files)));
 			}
 		}
 
 		this.pendingActions.push(choose(options)());
 	}
 
-	private getContent() {
-		const uuid = uuidv4();
-		this.writtenContents.push(uuid);
-		return uuid;
-	}
-
-	private getFileName() {
-		return `${this.name}-${uuidv4()}.md`;
-	}
-
 	public async finish(): Promise<void> {
 		await Promise.all(this.pendingActions);
 		await this.client.settings.setSetting("isSyncEnabled", true);
@@ -178,7 +169,7 @@ export class MockAgent extends MockClient {
 					`Content ${content} found in ${found.length} files`
 				);
 
-				const file = found[0];
+				const [file] = found;
 				assert(
 					new TextDecoder().decode(file).split(content).length === 2,
 					`Content ${content} found more than once in a file`
@@ -186,4 +177,14 @@ export class MockAgent extends MockClient {
 			}
 		}
 	}
+
+	private getContent(): string {
+		const uuid = uuidv4();
+		this.writtenContents.push(uuid);
+		return uuid;
+	}
+
+	private getFileName(): string {
+		return `${this.name}-${uuidv4()}.md`;
+	}
 }
diff --git a/frontend/test-client/src/agent/mock-client.ts b/frontend/test-client/src/agent/mock-client.ts
index 5766bc02..0ce689c4 100644
--- a/frontend/test-client/src/agent/mock-client.ts
+++ b/frontend/test-client/src/agent/mock-client.ts
@@ -1,9 +1,9 @@
-import {
-	SyncClient,
+import type {
 	RelativePath,
 	FileSystemOperations,
 	SyncSettings
 } from "sync-client";
+import { SyncClient } from "sync-client";
 import { assert } from "../utils/assert";
 
 export class MockClient implements FileSystemOperations {
@@ -15,7 +15,7 @@ export class MockClient implements FileSystemOperations {
 		private readonly initialSettings: Partial<SyncSettings>
 	) {}
 
-	public async init() {
+	public async init(): Promise<void> {
 		let _data: unknown = "";
 
 		this.client = await SyncClient.create(this, {
@@ -23,12 +23,14 @@ export class MockClient implements FileSystemOperations {
 			save: async (data: unknown) => void (_data = data)
 		});
 
-		Object.keys(this.initialSettings).forEach((key) => {
-			this.client.settings.setSetting(
-				key as keyof SyncSettings,
-				this.initialSettings[key as keyof SyncSettings]
-			);
-		});
+		await Promise.all(
+			Object.keys(this.initialSettings).map(async (key) => {
+				return this.client.settings.setSetting(
+					key as keyof SyncSettings,
+					this.initialSettings[key as keyof SyncSettings]
+				);
+			})
+		);
 
 		assert(
 			(await this.client.checkConnection()).isSuccessful,
@@ -37,7 +39,7 @@ export class MockClient implements FileSystemOperations {
 	}
 
 	public async listAllFiles(): Promise<RelativePath[]> {
-		return Object.keys(this.localFiles) as RelativePath[];
+		return Object.keys(this.localFiles);
 	}
 
 	public async read(path: RelativePath): Promise<Uint8Array> {
@@ -77,7 +79,9 @@ export class MockClient implements FileSystemOperations {
 		this.client.syncer.syncLocallyCreatedFile(path, new Date());
 	}
 
-	public async createDirectory(path: RelativePath): Promise<void> {}
+	public async createDirectory(path: RelativePath): Promise<void> {
+		// This doesn't mean anything in our virtual FS representation
+	}
 
 	public async atomicUpdateText(
 		path: RelativePath,
diff --git a/frontend/test-client/src/cli.ts b/frontend/test-client/src/cli.ts
index 0d59f796..3c0c8d45 100644
--- a/frontend/test-client/src/cli.ts
+++ b/frontend/test-client/src/cli.ts
@@ -1,4 +1,4 @@
-import { SyncSettings } from "sync-client";
+import type { SyncSettings } from "sync-client";
 import { MockAgent } from "./agent/mock-agent";
 import { sleep } from "./utils/sleep";
 import { v4 as uuidv4 } from "uuid";
@@ -55,14 +55,14 @@ async function runTest(): Promise<void> {
 		)
 	];
 
-	await Promise.all(clients.map((client) => client.init()));
+	await Promise.all(clients.map(async (client) => client.init()));
 
 	for (let i = 0; i < iterations; i++) {
-		await Promise.all(clients.map((client) => client.act()));
+		await Promise.all(clients.map(async (client) => client.act()));
 		await sleep(100);
 	}
 
-	await Promise.all(clients.map((client) => client.finish()));
+	await Promise.all(clients.map(async (client) => client.finish()));
 
 	console.info("Agents finished successfully");
 
@@ -83,4 +83,11 @@ async function runTest(): Promise<void> {
 	console.info("Test completed successfully");
 }
 
-runTest();
+runTest()
+	.then(() => {
+		process.exit(0);
+	})
+	.catch((err: unknown) => {
+		console.error(err);
+		process.exit(1);
+	});
diff --git a/frontend/test-client/src/utils/sleep.ts b/frontend/test-client/src/utils/sleep.ts
index 8b8bcd5e..638fc019 100644
--- a/frontend/test-client/src/utils/sleep.ts
+++ b/frontend/test-client/src/utils/sleep.ts
@@ -1,3 +1,3 @@
-export function sleep(ms: number): Promise<void> {
+export async function sleep(ms: number): Promise<void> {
 	return new Promise((resolve) => setTimeout(resolve, ms));
 }

From 1226bdd9cb82c7de17281886d914827d3c251e35 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Feb 2025 19:23:45 +0000
Subject: [PATCH 223/761] Add filename collisions

---
 frontend/test-client/src/agent/mock-agent.ts | 41 +++++++++++++++++---
 1 file changed, 35 insertions(+), 6 deletions(-)

diff --git a/frontend/test-client/src/agent/mock-agent.ts b/frontend/test-client/src/agent/mock-agent.ts
index 7bce4e22..f6b767a7 100644
--- a/frontend/test-client/src/agent/mock-agent.ts
+++ b/frontend/test-client/src/agent/mock-agent.ts
@@ -5,7 +5,6 @@ import type { SyncSettings } from "sync-client";
 import { LogLevel } from "sync-client";
 import { MockClient } from "./mock-client";
 import chalk from "chalk";
-import { sleep } from "../utils/sleep";
 
 export class MockAgent extends MockClient {
 	private readonly writtenContents: string[] = [];
@@ -52,6 +51,11 @@ export class MockAgent extends MockClient {
 		const options: (() => Promise<unknown>)[] = [
 			async (): Promise<unknown> => {
 				const file = this.getFileName();
+
+				if (await this.exists(file)) {
+					return;
+				}
+
 				this.client.logger.info(`Decided to create file ${file}`);
 				return this.create(
 					file,
@@ -83,8 +87,12 @@ export class MockAgent extends MockClient {
 			options.push(
 				async (): Promise<unknown> => {
 					const file = choose(files);
-
 					const newName = this.getFileName();
+
+					if (await this.exists(newName)) {
+						return;
+					}
+
 					this.client.logger.info(
 						`Decided to rename file ${file} to ${newName}`
 					);
@@ -102,18 +110,38 @@ export class MockAgent extends MockClient {
 			);
 
 			if (this.doDeletes) {
-				options.push(async () => this.delete(choose(files)));
+				options.push(async (): Promise<unknown> => {
+					const file = choose(files);
+					this.client.logger.info(`Decided to delete file ${file}`);
+					return this.delete(file);
+				});
 			}
 		}
 
-		this.pendingActions.push(choose(options)());
+		this.pendingActions.push(
+			(() => {
+				try {
+					return choose(options)();
+				} catch (error) {
+					this.client.logger.error(
+						`Failed to perform an action: ${error}`
+					);
+					this.client.logger.info(
+						JSON.stringify(JSON.parse(this.data as any), null, 2)
+					);
+					this.client.logger.info(
+						JSON.stringify(this.localFiles, null, 2)
+					);
+					throw error;
+				}
+			})()
+		);
 	}
 
 	public async finish(): Promise<void> {
 		await Promise.all(this.pendingActions);
 		await this.client.settings.setSetting("isSyncEnabled", true);
 		await this.client.syncer.applyRemoteChangesLocally();
-		await sleep(5000);
 		await this.client.syncer.waitForSyncQueue();
 		this.client.stop();
 	}
@@ -185,6 +213,7 @@ export class MockAgent extends MockClient {
 	}
 
 	private getFileName(): string {
-		return `${this.name}-${uuidv4()}.md`;
+		// Simulate name collisions between the clients
+		return `file-${Math.floor(Math.random() * 64)}.md`;
 	}
 }

From d76b0444bceb9f9dd400f7f72c203e608c82301d Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Feb 2025 20:51:52 +0000
Subject: [PATCH 224/761] Put back +1s

---
 backend/reconcile/src/diffs/myers.rs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/backend/reconcile/src/diffs/myers.rs b/backend/reconcile/src/diffs/myers.rs
index c31e155a..e2f44989 100644
--- a/backend/reconcile/src/diffs/myers.rs
+++ b/backend/reconcile/src/diffs/myers.rs
@@ -40,7 +40,7 @@ pub fn diff<T>(old: &[Token<T>], new: &[Token<T>]) -> Vec<RawOperation<T>>
 where
     T: PartialEq + Clone,
 {
-    let max_d = (old.len() + new.len()).div_ceil(2);
+    let max_d = (old.len() + new.len()).div_ceil(2) + 1;
     let mut vb = V::new(max_d);
     let mut vf = V::new(max_d);
     let mut result: Vec<RawOperation<T>> = vec![];
@@ -139,8 +139,7 @@ where
     // The initial point at (N, M+1)
     vb[1] = 0;
 
-    // We only need to explore ceil(D/2) + 1
-    let d_max = (n + m).div_ceil(2);
+    let d_max = (n + m).div_ceil(2) + 1;
     assert!(vf.len() >= d_max);
     assert!(vb.len() >= d_max);
 

From 5bd92c841206db92bc27d33ce55ada76b65809ea Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 23 Feb 2025 09:59:57 +0000
Subject: [PATCH 225/761] Remove global files & store data as field

---
 frontend/test-client/src/agent/mock-client.ts | 24 +++++--------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/frontend/test-client/src/agent/mock-client.ts b/frontend/test-client/src/agent/mock-client.ts
index 0ce689c4..6fc8f15b 100644
--- a/frontend/test-client/src/agent/mock-client.ts
+++ b/frontend/test-client/src/agent/mock-client.ts
@@ -9,18 +9,16 @@ import { assert } from "../utils/assert";
 export class MockClient implements FileSystemOperations {
 	protected readonly localFiles: Record<string, Uint8Array> = {};
 	protected client!: SyncClient;
+	protected data: unknown = "";
 
 	public constructor(
-		protected readonly globalFiles: Record<string, Uint8Array>,
 		private readonly initialSettings: Partial<SyncSettings>
 	) {}
 
 	public async init(): Promise<void> {
-		let _data: unknown = "";
-
 		this.client = await SyncClient.create(this, {
-			load: async () => _data,
-			save: async (data: unknown) => void (_data = data)
+			load: async () => this.data,
+			save: async (data: unknown) => void (this.data = data)
 		});
 
 		await Promise.all(
@@ -74,9 +72,8 @@ export class MockClient implements FileSystemOperations {
 		if (path in this.localFiles) {
 			throw new Error(`File ${path} already exists`);
 		}
-		this.globalFiles[path] = newContent;
 		this.localFiles[path] = newContent;
-		this.client.syncer.syncLocallyCreatedFile(path, new Date());
+		void this.client.syncer.syncLocallyCreatedFile(path, new Date());
 	}
 
 	public async createDirectory(path: RelativePath): Promise<void> {
@@ -93,7 +90,6 @@ export class MockClient implements FileSystemOperations {
 		const currentContent = new TextDecoder().decode(this.localFiles[path]);
 		const newContent = updater(currentContent);
 		const newContentUint8Array = new TextEncoder().encode(newContent);
-		this.globalFiles[path] = newContentUint8Array;
 		this.localFiles[path] = newContentUint8Array;
 
 		void this.client.syncer.syncLocallyUpdatedFile({
@@ -105,7 +101,6 @@ export class MockClient implements FileSystemOperations {
 	}
 
 	public async write(path: RelativePath, content: Uint8Array): Promise<void> {
-		this.globalFiles[path] = content;
 		this.localFiles[path] = content;
 
 		void this.client.syncer.syncLocallyUpdatedFile({
@@ -116,10 +111,6 @@ export class MockClient implements FileSystemOperations {
 
 	public async delete(path: RelativePath): Promise<void> {
 		delete this.localFiles[path];
-		if (path in this.globalFiles) {
-			delete this.globalFiles[path];
-		}
-
 		void this.client.syncer.syncLocallyDeletedFile(path);
 	}
 
@@ -132,11 +123,8 @@ export class MockClient implements FileSystemOperations {
 		}
 
 		this.localFiles[newPath] = this.localFiles[oldPath];
-		delete this.localFiles[oldPath];
-
-		if (oldPath in this.globalFiles) {
-			this.globalFiles[newPath] = this.localFiles[oldPath];
-			delete this.globalFiles[oldPath];
+		if (oldPath !== newPath) {
+			delete this.localFiles[oldPath];
 		}
 
 		void this.client.syncer.syncLocallyUpdatedFile({

From 0612f15aad69b80bb1ca9097fb2ae12275160408 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 23 Feb 2025 10:04:20 +0000
Subject: [PATCH 226/761] Add FileNotFoundError error

---
 .../src/file-operations/file-operations.ts    | 11 ++-
 .../safe-filesystem-operations.ts             | 88 +++++++++++++++++++
 2 files changed, 96 insertions(+), 3 deletions(-)
 create mode 100644 frontend/sync-client/src/file-operations/safe-filesystem-operations.ts

diff --git a/frontend/sync-client/src/file-operations/file-operations.ts b/frontend/sync-client/src/file-operations/file-operations.ts
index 8fe2a3fd..4bd29402 100644
--- a/frontend/sync-client/src/file-operations/file-operations.ts
+++ b/frontend/sync-client/src/file-operations/file-operations.ts
@@ -2,12 +2,17 @@ import type { Logger } from "src/tracing/logger";
 import type { FileSystemOperations } from "./filesystem-operations";
 import type { RelativePath } from "src/persistence/database";
 import { isBinary, isFileTypeMergable, mergeText } from "sync_lib";
+import { SafeFileSystemOperations } from "./safe-filesystem-operations";
 
 export class FileOperations {
+	private readonly fs: SafeFileSystemOperations;
+
 	public constructor(
 		private readonly logger: Logger,
-		private readonly fs: FileSystemOperations
-	) {}
+		fs: FileSystemOperations
+	) {
+		this.fs = new SafeFileSystemOperations(fs);
+	}
 
 	public async listAllFiles(): Promise<RelativePath[]> {
 		const files = await this.fs.listAllFiles();
@@ -43,7 +48,7 @@ export class FileOperations {
 	}
 
 	public async exists(path: RelativePath): Promise<boolean> {
-		this.logger.debug(`Checking existance of ${path}`);
+		this.logger.debug(`Checking existence of ${path}`);
 		return this.fs.exists(path);
 	}
 
diff --git a/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts b/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
new file mode 100644
index 00000000..3776e63a
--- /dev/null
+++ b/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
@@ -0,0 +1,88 @@
+import { FileSystemOperations } from "dist/types";
+import type { RelativePath } from "src/persistence/database";
+
+export class FileNotFoundError extends Error {
+	constructor(message: string) {
+		super(message);
+		this.name = "FileNotFoundError";
+	}
+}
+
+// Decorate FileSystemOperations replacing errors with FileNotFoundError
+// if the accessed file doesn't exist.
+export class SafeFileSystemOperations implements FileSystemOperations {
+	public constructor(private readonly fs: FileSystemOperations) {}
+
+	public listAllFiles(): Promise<RelativePath[]> {
+		return this.fs.listAllFiles();
+	}
+
+	public async read(path: RelativePath): Promise<Uint8Array> {
+		return this.safeOperation(path, () => this.fs.read(path));
+	}
+
+	public async write(path: RelativePath, content: Uint8Array): Promise<void> {
+		return this.fs.write(path, content);
+	}
+
+	public async atomicUpdateText(
+		path: RelativePath,
+		updater: (currentContent: string) => string
+	): Promise<string> {
+		return this.safeOperation(path, () =>
+			this.fs.atomicUpdateText(path, updater)
+		);
+	}
+
+	public async getFileSize(path: RelativePath): Promise<number> {
+		return this.safeOperation(path, () => this.fs.getFileSize(path));
+	}
+
+	public async getModificationTime(path: RelativePath): Promise<Date> {
+		return this.safeOperation(path, () =>
+			this.fs.getModificationTime(path)
+		);
+	}
+
+	public async exists(path: RelativePath): Promise<boolean> {
+		return this.fs.exists(path);
+	}
+
+	public async createDirectory(path: RelativePath): Promise<void> {
+		return this.fs.createDirectory(path);
+	}
+
+	public async delete(path: RelativePath): Promise<void> {
+		return this.fs.delete(path);
+	}
+
+	public async rename(
+		oldPath: RelativePath,
+		newPath: RelativePath
+	): Promise<void> {
+		return this.safeOperation(oldPath, () =>
+			this.fs.rename(oldPath, newPath)
+		);
+	}
+
+	private async safeOperation<T>(
+		path: RelativePath,
+		operation: () => Promise<T>
+	): Promise<T> {
+		// Without locking the file, this isn't atomic, however, it's good enough practicaly.
+		// This will only break if the file exists, gets deleted and then immediately
+		// recreated while `operation` is running.
+		if (!(await this.fs.exists(path))) {
+			throw new FileNotFoundError(path);
+		}
+		try {
+			return await operation();
+		} catch (error) {
+			if (await this.fs.exists(path)) {
+				throw error;
+			} else {
+				throw new FileNotFoundError(path);
+			}
+		}
+	}
+}

From 9c61927c1b8b3359546d0c4cb0979a27cbd139c6 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 23 Feb 2025 10:04:27 +0000
Subject: [PATCH 227/761] Improve test

---
 .../src/sync-operations/document-lock.test.ts         | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/frontend/sync-client/src/sync-operations/document-lock.test.ts b/frontend/sync-client/src/sync-operations/document-lock.test.ts
index 8def7e6b..2bc05e69 100644
--- a/frontend/sync-client/src/sync-operations/document-lock.test.ts
+++ b/frontend/sync-client/src/sync-operations/document-lock.test.ts
@@ -58,6 +58,7 @@ describe("Document Lock Operations", () => {
 
 		let firstResolved = false;
 		let secondResolved = false;
+		let thirdResolved = false;
 
 		const firstWaitPromise = waitForDocumentLock(testPath).then(() => {
 			firstResolved = true;
@@ -67,13 +68,23 @@ describe("Document Lock Operations", () => {
 			secondResolved = true;
 		});
 
+		const thirdWaitPromise = waitForDocumentLock(testPath).then(() => {
+			thirdResolved = true;
+		});
+
 		unlockDocument(testPath);
 		await firstWaitPromise;
 		expect(firstResolved).toBe(true);
 		expect(secondResolved).toBe(false);
+		expect(thirdResolved).toBe(false);
 
 		unlockDocument(testPath);
 		await secondWaitPromise;
 		expect(secondResolved).toBe(true);
+		expect(thirdResolved).toBe(false);
+
+		unlockDocument(testPath);
+		await thirdWaitPromise;
+		expect(thirdResolved).toBe(true);
 	});
 });

From 67ad7d8fef6165e15551ec35bcc00d249dc24e92 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 23 Feb 2025 10:11:20 +0000
Subject: [PATCH 228/761] Fix logical error

---
 .../sync-client/src/utils/find-matching-file-based-on-hash.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/sync-client/src/utils/find-matching-file-based-on-hash.ts b/frontend/sync-client/src/utils/find-matching-file-based-on-hash.ts
index cf0b1cda..6a247f5f 100644
--- a/frontend/sync-client/src/utils/find-matching-file-based-on-hash.ts
+++ b/frontend/sync-client/src/utils/find-matching-file-based-on-hash.ts
@@ -5,9 +5,9 @@ export function findMatchingFileBasedOnHash(
 	contentHash: string,
 	candidates: [RelativePath, DocumentMetadata][]
 ): [RelativePath, DocumentMetadata] | undefined {
-	if (contentHash != EMPTY_HASH) {
+	if (contentHash === EMPTY_HASH) {
 		return undefined;
 	}
 
-	return candidates.find(([_, document]) => document.hash === contentHash);
+	return candidates.find(([_, metadata]) => metadata.hash === contentHash);
 }

From 80ba346d464a7682e9de593cae7df5421bbe4264 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 23 Feb 2025 10:11:30 +0000
Subject: [PATCH 229/761] Make less verbose

---
 frontend/sync-client/src/persistence/settings.ts | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/frontend/sync-client/src/persistence/settings.ts b/frontend/sync-client/src/persistence/settings.ts
index 947aa505..295824af 100644
--- a/frontend/sync-client/src/persistence/settings.ts
+++ b/frontend/sync-client/src/persistence/settings.ts
@@ -72,13 +72,7 @@ export class Settings {
 		value: SyncSettings[T]
 	): Promise<void> {
 		const newSettings = { ...this.settings, [key]: value };
-		this.logger.debug(
-			`Setting ${key} to ${value}, new settings: ${JSON.stringify(
-				newSettings,
-				null,
-				2
-			)}`
-		);
+		this.logger.debug(`Setting '${key}' to '${value}'`);
 		await this.setSettings(newSettings);
 	}
 

From a2b7ad2a198bb3941ab3e97df4ea2ad2c1ba5565 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 23 Feb 2025 10:12:22 +0000
Subject: [PATCH 230/761] Split syncer logic

---
 .../sync-client/src/sync-operations/syncer.ts | 589 ++----------------
 .../sync-operations/unrestricted-syncer.ts    | 533 ++++++++++++++++
 2 files changed, 597 insertions(+), 525 deletions(-)
 create mode 100644 frontend/sync-client/src/sync-operations/unrestricted-syncer.ts

diff --git a/frontend/sync-client/src/sync-operations/syncer.ts b/frontend/sync-client/src/sync-operations/syncer.ts
index d4ec5c93..68d1c969 100644
--- a/frontend/sync-client/src/sync-operations/syncer.ts
+++ b/frontend/sync-client/src/sync-operations/syncer.ts
@@ -12,6 +12,7 @@ import { deserialize } from "src/utils/deserialize";
 import type { Settings } from "src/persistence/settings";
 import type { FileOperations } from "src/file-operations/file-operations";
 import { findMatchingFileBasedOnHash } from "src/utils/find-matching-file-based-on-hash";
+import { UnrestrictedSyncer } from "./unrestricted-syncer";
 
 export class Syncer {
 	private readonly remainingOperationsListeners: ((
@@ -25,13 +26,15 @@ export class Syncer {
 	private runningApplyRemoteChangesLocally: Promise<void> | undefined =
 		undefined;
 
+	private readonly internalSyncer: UnrestrictedSyncer;
+
 	public constructor(
 		private readonly logger: Logger,
 		private readonly database: Database,
 		private readonly settings: Settings,
 		private readonly syncService: SyncService,
 		private readonly operations: FileOperations,
-		private readonly history: SyncHistory
+		history: SyncHistory
 	) {
 		this.syncQueue = new PQueue({
 			concurrency: settings.getSettings().syncConcurrency
@@ -44,6 +47,15 @@ export class Syncer {
 		this.syncQueue.on("active", () => {
 			this.emitRemainingOperationsChange(this.syncQueue.size);
 		});
+
+		this.internalSyncer = new UnrestrictedSyncer(
+			logger,
+			database,
+			settings,
+			syncService,
+			operations,
+			history
+		);
 	}
 
 	public addRemainingOperationsListener(
@@ -57,7 +69,10 @@ export class Syncer {
 		updateTime: Date
 	): Promise<void> {
 		await this.syncQueue.add(async () =>
-			this.internalSyncLocallyCreatedFile(relativePath, updateTime)
+			this.internalSyncer.unrestrictedSyncLocallyCreatedFile(
+				relativePath,
+				updateTime
+			)
 		);
 	}
 
@@ -67,7 +82,7 @@ export class Syncer {
 		updateTime: Date;
 	}): Promise<void> {
 		await this.syncQueue.add(async () =>
-			this.internalSyncLocallyUpdatedFile(args)
+			this.internalSyncer.unrestrictedSyncLocallyUpdatedFile(args)
 		);
 	}
 
@@ -79,7 +94,7 @@ export class Syncer {
 		relativePath: RelativePath
 	): Promise<void> {
 		await this.syncQueue.add(async () =>
-			this.internalSyncLocallyDeletedFile(relativePath)
+			this.internalSyncer.unrestrictedSyncLocallyDeletedFile(relativePath)
 		);
 	}
 
@@ -87,7 +102,9 @@ export class Syncer {
 		remoteVersion: components["schemas"]["DocumentVersionWithoutContent"]
 	): Promise<void> {
 		await this.syncQueue.add(async () =>
-			this.internalSyncRemotelyUpdatedFile(remoteVersion)
+			this.internalSyncer.unrestrictedSyncRemotelyUpdatedFile(
+				remoteVersion
+			)
 		);
 	}
 
@@ -121,7 +138,9 @@ export class Syncer {
 
 	private async internalScheduleSyncForOfflineChanges(): Promise<void> {
 		const allLocalFiles = await this.operations.listAllFiles();
-		let locallyDeletedFiles = [
+
+		// This includes renamed files for now
+		let locallyPossiblyDeletedFiles = [
 			...this.database.getDocuments().entries()
 		].filter(([path, _]) => !allLocalFiles.includes(path));
 
@@ -130,27 +149,42 @@ export class Syncer {
 				this.syncQueue.add(async () => {
 					const metadata = this.database.getDocument(relativePath);
 
-					// If there's no metadata, it must be a new file
-					if (!metadata) {
-						// Perhaps the file has been moved. Let's check by looking at the deleted files
-						const contentBytes =
-							await this.operations.read(relativePath);
-						const contentHash = hash(contentBytes);
-
-						const originalFile = findMatchingFileBasedOnHash(
-							contentHash,
-							locallyDeletedFiles
+					if (metadata) {
+						this.logger.debug(
+							`Document ${relativePath} has been updated locally, scheduling sync to update it`
 						);
-						if (originalFile !== undefined) {
-							// `originalFile` hasn't been deleted but it got moved instead
-							locallyDeletedFiles = locallyDeletedFiles.filter(
-								(item) => item != originalFile
+						return this.internalSyncer.unrestrictedSyncLocallyUpdatedFile(
+							{
+								relativePath,
+								updateTime:
+									await this.operations.getModificationTime(
+										relativePath
+									)
+							}
+						);
+					}
+
+					// Perhaps the file has been moved. Let's check by looking at the deleted files
+					const contentBytes =
+						await this.operations.read(relativePath);
+					const contentHash = hash(contentBytes);
+
+					const originalFile = findMatchingFileBasedOnHash(
+						contentHash,
+						locallyPossiblyDeletedFiles
+					);
+					if (originalFile !== undefined) {
+						// `originalFile` hasn't been deleted but it got moved instead
+						locallyPossiblyDeletedFiles =
+							locallyPossiblyDeletedFiles.filter(
+								(item) => item[0] !== originalFile[0]
 							);
 
-							this.logger.debug(
-								`Document ${relativePath} was not found under its current path in the database but was found under a different path ${originalFile[0]}, scheduling sync to move it`
-							);
-							return this.internalSyncLocallyUpdatedFile({
+						this.logger.debug(
+							`Document ${relativePath} was not found under its current path in the database but was found under a different path ${originalFile[0]}, scheduling sync to move it`
+						);
+						return this.internalSyncer.unrestrictedSyncLocallyUpdatedFile(
+							{
 								oldPath: originalFile[0],
 								relativePath: relativePath,
 								updateTime:
@@ -161,36 +195,23 @@ export class Syncer {
 									contentBytes,
 									contentHash
 								}
-							});
-						}
-
-						this.logger.debug(
-							`Document ${relativePath} not found in database, scheduling sync to create it`
-						);
-						return this.internalSyncLocallyCreatedFile(
-							relativePath,
-							await this.operations.getModificationTime(
-								relativePath
-							)
+							}
 						);
 					}
 
 					this.logger.debug(
-						`Document ${relativePath} has been updated locally, scheduling sync to update it`
+						`Document ${relativePath} not found in database, scheduling sync to create it`
 					);
-					return this.internalSyncLocallyUpdatedFile({
+					return this.internalSyncer.unrestrictedSyncLocallyCreatedFile(
 						relativePath,
-						updateTime:
-							await this.operations.getModificationTime(
-								relativePath
-							)
-					});
+						await this.operations.getModificationTime(relativePath)
+					);
 				})
 			)
 		);
 
 		await Promise.all(
-			locallyDeletedFiles.map(async ([relativePath, _]) => {
+			locallyPossiblyDeletedFiles.map(async ([relativePath, _]) => {
 				this.logger.debug(
 					`Document ${relativePath} has been deleted locally, scheduling sync to delete it`
 				);
@@ -271,491 +292,9 @@ export class Syncer {
 		});
 	}
 
-	private async internalSyncLocallyCreatedFile(
-		relativePath: RelativePath,
-		updateTime: Date,
-		optimisations?: {
-			contentBytes?: Uint8Array;
-			contentHash?: string;
-		}
-	): Promise<void> {
-		await this.executeWhileHoldingFileLock(
-			relativePath,
-			SyncType.CREATE,
-			SyncSource.PUSH,
-			async () => {
-				if (
-					(await this.operations.getFileSize(relativePath)) /
-						1024 /
-						1024 >
-					this.settings.getSettings().maxFileSizeMB
-				) {
-					this.history.addHistoryEntry({
-						status: SyncStatus.ERROR,
-						relativePath,
-						message: `File size exceeds the maximum file size limit of ${
-							this.settings.getSettings().maxFileSizeMB
-						}MB`,
-						type: SyncType.CREATE
-					});
-					return;
-				}
-
-				const contentBytes =
-					optimisations?.contentBytes ??
-					(await this.operations.read(relativePath));
-				let contentHash =
-					optimisations?.contentHash ?? hash(contentBytes);
-
-				const localMetadata = this.database.getDocument(relativePath);
-				if (localMetadata) {
-					this.logger.debug(
-						`Document metadata already exists for ${relativePath}, it must have been downloaded from the server`
-					);
-
-					if (localMetadata.hash === contentHash) {
-						this.history.addHistoryEntry({
-							status: SyncStatus.NO_OP,
-							relativePath,
-							message: `File hash matches with last synced version, no need to sync`,
-							type: SyncType.UPDATE
-						});
-						return;
-					}
-				}
-
-				const response = await this.syncService.create({
-					relativePath,
-					contentBytes,
-					createdDate: updateTime
-				});
-
-				this.history.addHistoryEntry({
-					status: SyncStatus.SUCCESS,
-					source: SyncSource.PUSH,
-					relativePath,
-					message: `Successfully uploaded locally created file`,
-					type: SyncType.CREATE
-				});
-
-				if (response.type === "MergingUpdate") {
-					const responseBytes = deserialize(response.contentBase64);
-					contentHash = hash(responseBytes);
-
-					await this.operations.write(
-						relativePath,
-						contentBytes,
-						responseBytes
-					);
-					this.history.addHistoryEntry({
-						status: SyncStatus.SUCCESS,
-						source: SyncSource.PULL,
-						relativePath,
-						message: `The file we created locally has already existed remotely, so we have merged them`,
-						type: SyncType.UPDATE
-					});
-				}
-
-				await this.database.setDocument({
-					documentId: response.documentId,
-					relativePath: response.relativePath,
-					parentVersionId: response.vaultUpdateId,
-					hash: contentHash
-				});
-
-				await this.tryIncrementVaultUpdateId(response.vaultUpdateId);
-			}
-		);
-	}
-
-	private async internalSyncLocallyUpdatedFile({
-		oldPath,
-		relativePath,
-		updateTime,
-		optimisations
-	}: {
-		oldPath?: RelativePath;
-		relativePath: RelativePath;
-		updateTime: Date;
-		optimisations?: {
-			contentBytes?: Uint8Array;
-			contentHash?: string;
-		};
-	}): Promise<void> {
-		await this.executeWhileHoldingFileLock(
-			relativePath,
-			SyncType.UPDATE,
-			SyncSource.PUSH,
-			async () => {
-				this.logger.debug(
-					`Renaming? oldPath ${oldPath} relativePath ${relativePath}`
-				);
-
-				const localMetadata = this.database.getDocument(
-					oldPath ?? relativePath
-				);
-
-				if (!localMetadata) {
-					if (this.database.getDocument(relativePath)) {
-						this.history.addHistoryEntry({
-							status: SyncStatus.NO_OP,
-							relativePath,
-							message: `The renaming doesn't require a sync because it must have been pulled from remote`,
-							type: SyncType.UPDATE
-						});
-						return;
-					}
-
-					this.logger.debug(
-						`Document metadata doesn't exist for ${relativePath}, it must have been already deleted`
-					);
-					return;
-				}
-
-				if (
-					(await this.operations.getFileSize(relativePath)) /
-						1024 /
-						1024 >
-					this.settings.getSettings().maxFileSizeMB
-				) {
-					this.history.addHistoryEntry({
-						status: SyncStatus.ERROR,
-						relativePath,
-						message: `File size exceeds the maximum file size limit of ${
-							this.settings.getSettings().maxFileSizeMB
-						}MB`,
-						type: SyncType.CREATE
-					});
-					return;
-				}
-
-				const contentBytes =
-					optimisations?.contentBytes ??
-					(await this.operations.read(relativePath));
-
-				let contentHash =
-					optimisations?.contentHash ?? hash(contentBytes);
-
-				if (
-					localMetadata.hash === contentHash &&
-					oldPath === undefined
-				) {
-					this.history.addHistoryEntry({
-						status: SyncStatus.NO_OP,
-						relativePath,
-						message: `File hash matches with last synced version, no need to sync`,
-						type: SyncType.UPDATE
-					});
-					return;
-				}
-
-				const response = await this.syncService.put({
-					documentId: localMetadata.documentId,
-					parentVersionId: localMetadata.parentVersionId,
-					relativePath,
-					contentBytes,
-					createdDate: updateTime
-				});
-
-				this.history.addHistoryEntry({
-					status: SyncStatus.SUCCESS,
-					source: SyncSource.PUSH,
-					relativePath,
-					message: `Successfully uploaded locally updated file to the remote server`,
-					type: SyncType.UPDATE
-				});
-
-				if (response.isDeleted) {
-					await this.operations.remove(oldPath ?? relativePath);
-					await this.database.removeDocument(oldPath ?? relativePath);
-					await this.tryIncrementVaultUpdateId(
-						response.vaultUpdateId
-					);
-
-					this.history.addHistoryEntry({
-						status: SyncStatus.SUCCESS,
-						source: SyncSource.PULL,
-						relativePath,
-						message:
-							"The file we tried to update had been deleted remotely, therefore, we have deleted it locally",
-						type: SyncType.DELETE
-					});
-
-					return;
-				}
-
-				if (response.relativePath != relativePath) {
-					await waitForDocumentLock(response.relativePath);
-				}
-
-				try {
-					if (response.relativePath != relativePath) {
-						await this.operations.move(
-							relativePath,
-							response.relativePath
-						);
-					}
-
-					if (response.type === "MergingUpdate") {
-						const responseBytes = deserialize(
-							response.contentBase64
-						);
-						contentHash = hash(responseBytes);
-
-						await this.operations.write(
-							response.relativePath,
-							contentBytes,
-							responseBytes
-						);
-
-						this.history.addHistoryEntry({
-							status: SyncStatus.SUCCESS,
-							source: SyncSource.PULL,
-							relativePath,
-							message: `The file we updated had been updated remotely, so we downloaded the merged version`,
-							type: SyncType.UPDATE
-						});
-					}
-
-					await this.database.moveDocument({
-						documentId: localMetadata.documentId,
-						oldRelativePath: oldPath ?? relativePath,
-						relativePath: response.relativePath,
-						parentVersionId: response.vaultUpdateId,
-						hash: contentHash
-					});
-
-					await this.tryIncrementVaultUpdateId(
-						response.vaultUpdateId
-					);
-				} finally {
-					if (response.relativePath != relativePath) {
-						unlockDocument(response.relativePath);
-					}
-				}
-			}
-		);
-	}
-
-	private async internalSyncLocallyDeletedFile(
-		relativePath: RelativePath
-	): Promise<void> {
-		await this.executeWhileHoldingFileLock(
-			relativePath,
-			SyncType.DELETE,
-			SyncSource.PUSH,
-			async () => {
-				const localMetadata = this.database.getDocument(relativePath);
-				if (!localMetadata) {
-					this.history.addHistoryEntry({
-						status: SyncStatus.NO_OP,
-						relativePath,
-						message: `Locally deleted file hasn't been uploaded yet, so there's no need to delete it on the remote server`,
-						type: SyncType.DELETE
-					});
-					return;
-				}
-
-				await this.syncService.delete({
-					documentId: localMetadata.documentId,
-					relativePath,
-					createdDate: new Date() // We got the event now, so it must have been deleted just now
-				});
-
-				this.history.addHistoryEntry({
-					status: SyncStatus.SUCCESS,
-					source: SyncSource.PUSH,
-					relativePath,
-					message: `Successfully deleted locally deleted file on the remote server`,
-					type: SyncType.DELETE
-				});
-
-				await this.database.removeDocument(relativePath);
-			}
-		);
-	}
-
-	private async internalSyncRemotelyUpdatedFile(
-		remoteVersion: components["schemas"]["DocumentVersionWithoutContent"]
-	): Promise<void> {
-		await this.executeWhileHoldingFileLock(
-			remoteVersion.relativePath,
-			SyncType.UPDATE,
-			SyncSource.PULL,
-			async () => {
-				const localMetadata = this.database.getDocumentByDocumentId(
-					remoteVersion.documentId
-				);
-
-				if (!localMetadata) {
-					if (remoteVersion.isDeleted) {
-						this.history.addHistoryEntry({
-							status: SyncStatus.NO_OP,
-							source: SyncSource.PULL,
-							relativePath: remoteVersion.relativePath,
-							message: `Remotely deleted file hasn't been synced yet, so there's no need to delete it locally`,
-							type: SyncType.DELETE
-						});
-						return;
-					}
-
-					const content = (
-						await this.syncService.get({
-							documentId: remoteVersion.documentId
-						})
-					).contentBase64;
-					const contentBytes = deserialize(content);
-
-					await this.operations.create(
-						remoteVersion.relativePath,
-						contentBytes
-					);
-					await this.database.setDocument({
-						documentId: remoteVersion.documentId,
-						relativePath: remoteVersion.relativePath,
-						parentVersionId: remoteVersion.vaultUpdateId,
-						hash: hash(contentBytes)
-					});
-					this.history.addHistoryEntry({
-						status: SyncStatus.SUCCESS,
-						source: SyncSource.PULL,
-						relativePath: remoteVersion.relativePath,
-						message: `Successfully downloaded remote file which hadn't existed locally`,
-						type: SyncType.CREATE
-					});
-					return;
-				}
-
-				const [relativePath, metadata] = localMetadata;
-				if (metadata.parentVersionId === remoteVersion.vaultUpdateId) {
-					this.logger.debug(
-						`Document ${relativePath} is already up to date`
-					);
-					return;
-				}
-
-				if (relativePath !== remoteVersion.relativePath) {
-					await waitForDocumentLock(relativePath);
-				}
-				try {
-					if (remoteVersion.isDeleted) {
-						await this.operations.remove(relativePath);
-						await this.database.removeDocument(relativePath);
-
-						this.history.addHistoryEntry({
-							status: SyncStatus.SUCCESS,
-							source: SyncSource.PULL,
-							relativePath: remoteVersion.relativePath,
-							message: `Successfully deleted remotely deleted file locally`,
-							type: SyncType.DELETE
-						});
-					} else {
-						const currentContent =
-							await this.operations.read(relativePath);
-						const currentHash = hash(currentContent);
-
-						if (currentHash !== metadata.hash) {
-							this.logger.info(
-								`Document ${relativePath} has been updated both remotely and locally, letting the local file update event handle it`
-							);
-							return;
-						}
-
-						const content = (
-							await this.syncService.get({
-								documentId: remoteVersion.documentId
-							})
-						).contentBase64;
-						const contentBytes = deserialize(content);
-						const contentHash = hash(contentBytes);
-
-						if (relativePath !== remoteVersion.relativePath) {
-							await this.operations.move(
-								relativePath,
-								remoteVersion.relativePath
-							);
-						}
-
-						await this.operations.write(
-							remoteVersion.relativePath,
-							currentContent,
-							contentBytes
-						);
-						await this.database.moveDocument({
-							documentId: remoteVersion.documentId,
-							oldRelativePath: relativePath,
-							relativePath: remoteVersion.relativePath,
-							parentVersionId: remoteVersion.vaultUpdateId,
-							hash: contentHash
-						});
-
-						this.history.addHistoryEntry({
-							status: SyncStatus.SUCCESS,
-							source: SyncSource.PULL,
-							relativePath: remoteVersion.relativePath,
-							message: `Successfully updated remotely updated file locally`,
-							type: SyncType.UPDATE
-						});
-					}
-				} finally {
-					if (relativePath !== remoteVersion.relativePath) {
-						unlockDocument(relativePath);
-					}
-				}
-			}
-		);
-	}
-
-	private async executeWhileHoldingFileLock(
-		relativePath: RelativePath,
-		syncType: SyncType,
-		syncSource: SyncSource,
-		fn: () => Promise<void>
-	): Promise<void> {
-		if (!this.settings.getSettings().isSyncEnabled) {
-			this.logger.info(
-				`Syncing is disabled, not syncing ${relativePath}`
-			);
-			return;
-		}
-		if (!this.operations.isFileEligibleForSync(relativePath)) {
-			this.logger.info(
-				`File ${relativePath} is not eligible for syncing`
-			);
-			return;
-		}
-		this.logger.debug(
-			`Syncing ${relativePath} (${syncSource} - ${syncType})`
-		);
-
-		await waitForDocumentLock(relativePath);
-		try {
-			await fn();
-		} catch (e) {
-			this.history.addHistoryEntry({
-				status: SyncStatus.ERROR,
-				relativePath,
-				message: `Failed to ${syncSource.toLocaleLowerCase()} file ${e} when trying to ${syncType.toLocaleLowerCase()} it`,
-				type: syncType,
-				source: syncSource
-			});
-			throw e;
-		} finally {
-			unlockDocument(relativePath);
-		}
-	}
-
 	private emitRemainingOperationsChange(remainingOperations: number): void {
 		this.remainingOperationsListeners.forEach((listener) => {
 			listener(remainingOperations);
 		});
 	}
-
-	private async tryIncrementVaultUpdateId(
-		responseVaultUpdateId: number
-	): Promise<void> {
-		if (this.database.getLastSeenUpdateId() === responseVaultUpdateId - 1) {
-			await this.database.setLastSeenUpdateId(responseVaultUpdateId);
-		}
-	}
 }
diff --git a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
new file mode 100644
index 00000000..a7a2f773
--- /dev/null
+++ b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
@@ -0,0 +1,533 @@
+import type { Database, RelativePath } from "../persistence/database";
+
+import type { SyncService } from "src/services/sync-service";
+import type { Logger } from "src/tracing/logger";
+import type { SyncHistory } from "src/tracing/sync-history";
+import { SyncSource, SyncStatus, SyncType } from "src/tracing/sync-history";
+import { unlockDocument, waitForDocumentLock } from "./document-lock";
+import { hash } from "src/utils/hash";
+import type { components } from "src/services/types";
+import { deserialize } from "src/utils/deserialize";
+import type { Settings } from "src/persistence/settings";
+import type { FileOperations } from "src/file-operations/file-operations";
+import { FileNotFoundError } from "src/file-operations/safe-filesystem-operations";
+
+export class UnrestrictedSyncer {
+	public constructor(
+		private readonly logger: Logger,
+		private readonly database: Database,
+		private readonly settings: Settings,
+		private readonly syncService: SyncService,
+		private readonly operations: FileOperations,
+		private readonly history: SyncHistory
+	) {}
+
+	public async unrestrictedSyncLocallyCreatedFile(
+		relativePath: RelativePath,
+		updateTime: Date,
+		optimisations?: {
+			contentBytes?: Uint8Array;
+			contentHash?: string;
+		}
+	): Promise<void> {
+		await this.executeWhileHoldingFileLock(
+			[relativePath],
+			SyncType.CREATE,
+			SyncSource.PUSH,
+			async () => {
+				if (
+					(await this.operations.getFileSize(relativePath)) / // this can throw FileNotFoundError
+						1024 /
+						1024 >
+					this.settings.getSettings().maxFileSizeMB
+				) {
+					this.history.addHistoryEntry({
+						status: SyncStatus.ERROR,
+						relativePath,
+						message: `File size exceeds the maximum file size limit of ${
+							this.settings.getSettings().maxFileSizeMB
+						}MB`,
+						type: SyncType.CREATE
+					});
+					return;
+				}
+
+				const contentBytes =
+					optimisations?.contentBytes ??
+					(await this.operations.read(relativePath)); // this can throw FileNotFoundError
+				let contentHash =
+					optimisations?.contentHash ?? hash(contentBytes);
+
+				const localMetadata = this.database.getDocument(relativePath);
+				if (localMetadata) {
+					this.logger.debug(
+						`Document metadata already exists for ${relativePath}, it must have been downloaded from the server`
+					);
+
+					if (localMetadata.hash === contentHash) {
+						this.history.addHistoryEntry({
+							status: SyncStatus.NO_OP,
+							relativePath,
+							message: `File hash matches with last synced version, no need to sync`,
+							type: SyncType.UPDATE
+						});
+						return;
+					}
+				}
+
+				const response = await this.syncService.create({
+					relativePath,
+					contentBytes,
+					createdDate: updateTime
+				});
+
+				this.history.addHistoryEntry({
+					status: SyncStatus.SUCCESS,
+					source: SyncSource.PUSH,
+					relativePath,
+					message: `Successfully uploaded locally created file`,
+					type: SyncType.CREATE
+				});
+
+				// The response can't have a different relative path than the one we sent
+				// because the relative path is the key when finding existing documents
+				// when a create request is sent.
+
+				if (response.type === "MergingUpdate") {
+					const responseBytes = deserialize(response.contentBase64);
+					contentHash = hash(responseBytes);
+
+					await this.operations.write(
+						relativePath,
+						contentBytes,
+						responseBytes
+					);
+					this.history.addHistoryEntry({
+						status: SyncStatus.SUCCESS,
+						source: SyncSource.PULL,
+						relativePath,
+						message: `The file we created locally has already existed remotely, so we have merged them`,
+						type: SyncType.UPDATE
+					});
+				}
+
+				await this.database.setDocument({
+					documentId: response.documentId,
+					relativePath: response.relativePath,
+					parentVersionId: response.vaultUpdateId,
+					hash: contentHash
+				});
+
+				await this.tryIncrementVaultUpdateId(response.vaultUpdateId);
+			}
+		);
+	}
+
+	public async unrestrictedSyncLocallyUpdatedFile({
+		oldPath,
+		relativePath,
+		updateTime,
+		optimisations
+	}: {
+		oldPath?: RelativePath;
+		relativePath: RelativePath;
+		updateTime: Date;
+		optimisations?: {
+			contentBytes?: Uint8Array;
+			contentHash?: string;
+		};
+	}): Promise<void> {
+		await this.executeWhileHoldingFileLock(
+			[oldPath, relativePath].filter((path) => path !== undefined),
+			SyncType.UPDATE,
+			SyncSource.PUSH,
+			async () => {
+				const localMetadata = this.database.getDocument(
+					oldPath ?? relativePath
+				);
+
+				if (!localMetadata) {
+					this.history.addHistoryEntry({
+						status: SyncStatus.NO_OP,
+						relativePath,
+						message: `Document metadata doesn't exist for ${oldPath ?? relativePath}, it must have been already deleted`,
+						type: SyncType.UPDATE
+					});
+					return;
+				}
+
+				if (
+					(await this.operations.getFileSize(relativePath)) / // this can throw FileNotFoundError
+						1024 /
+						1024 >
+					this.settings.getSettings().maxFileSizeMB
+				) {
+					this.history.addHistoryEntry({
+						status: SyncStatus.ERROR,
+						relativePath,
+						message: `File size exceeds the maximum file size limit of ${
+							this.settings.getSettings().maxFileSizeMB
+						}MB`,
+						type: SyncType.CREATE
+					});
+					return;
+				}
+
+				const contentBytes =
+					optimisations?.contentBytes ??
+					(await this.operations.read(relativePath)); // this can throw FileNotFoundError
+
+				let contentHash =
+					optimisations?.contentHash ?? hash(contentBytes);
+
+				if (
+					localMetadata.hash === contentHash &&
+					oldPath === undefined
+				) {
+					this.history.addHistoryEntry({
+						status: SyncStatus.NO_OP,
+						relativePath,
+						message: `File hash matches with last synced version, no need to sync`,
+						type: SyncType.UPDATE
+					});
+					return;
+				}
+
+				const response = await this.syncService.put({
+					documentId: localMetadata.documentId,
+					parentVersionId: localMetadata.parentVersionId,
+					relativePath,
+					contentBytes,
+					createdDate: updateTime
+				});
+
+				this.history.addHistoryEntry({
+					status: SyncStatus.SUCCESS,
+					source: SyncSource.PUSH,
+					relativePath,
+					message: `Successfully uploaded locally updated file to the remote server`,
+					type: SyncType.UPDATE
+				});
+
+				if (response.isDeleted) {
+					await this.operations.remove(oldPath ?? relativePath);
+					await this.database.removeDocument(oldPath ?? relativePath);
+					await this.tryIncrementVaultUpdateId(
+						response.vaultUpdateId
+					);
+
+					this.history.addHistoryEntry({
+						status: SyncStatus.SUCCESS,
+						source: SyncSource.PULL,
+						relativePath,
+						message:
+							"The file we tried to update had been deleted remotely, therefore, we have deleted it locally",
+						type: SyncType.DELETE
+					});
+
+					return;
+				}
+
+				if (
+					response.relativePath != relativePath &&
+					response.relativePath != oldPath
+				) {
+					await waitForDocumentLock(response.relativePath);
+				}
+
+				try {
+					if (response.relativePath != relativePath) {
+						// TODO: this can fail, that's bad
+						await this.operations.move(
+							// this can throw FileNotFoundError
+							relativePath,
+							response.relativePath
+						);
+					}
+
+					if (response.type === "MergingUpdate") {
+						const responseBytes = deserialize(
+							response.contentBase64
+						);
+						contentHash = hash(responseBytes);
+
+						await this.operations.write(
+							response.relativePath,
+							contentBytes,
+							responseBytes
+						);
+
+						this.history.addHistoryEntry({
+							status: SyncStatus.SUCCESS,
+							source: SyncSource.PULL,
+							relativePath,
+							message: `The file we updated had been updated remotely, so we downloaded the merged version`,
+							type: SyncType.UPDATE
+						});
+					}
+
+					await this.database.moveDocument({
+						documentId: localMetadata.documentId,
+						oldRelativePath: oldPath ?? relativePath,
+						relativePath: response.relativePath,
+						parentVersionId: response.vaultUpdateId,
+						hash: contentHash
+					});
+
+					await this.tryIncrementVaultUpdateId(
+						response.vaultUpdateId
+					);
+				} finally {
+					if (
+						response.relativePath != relativePath &&
+						response.relativePath != oldPath
+					) {
+						unlockDocument(response.relativePath);
+					}
+				}
+			}
+		);
+	}
+
+	public async unrestrictedSyncLocallyDeletedFile(
+		relativePath: RelativePath
+	): Promise<void> {
+		await this.executeWhileHoldingFileLock(
+			[relativePath],
+			SyncType.DELETE,
+			SyncSource.PUSH,
+			async () => {
+				const localMetadata = this.database.getDocument(relativePath);
+				if (!localMetadata) {
+					this.history.addHistoryEntry({
+						status: SyncStatus.NO_OP,
+						relativePath,
+						message: `Locally deleted file hasn't been uploaded yet, so there's no need to delete it on the remote server`,
+						type: SyncType.DELETE
+					});
+					return;
+				}
+
+				await this.syncService.delete({
+					documentId: localMetadata.documentId,
+					relativePath,
+					createdDate: new Date() // We got the event now, so it must have been deleted just now
+				});
+
+				this.history.addHistoryEntry({
+					status: SyncStatus.SUCCESS,
+					source: SyncSource.PUSH,
+					relativePath,
+					message: `Successfully deleted locally deleted file on the remote server`,
+					type: SyncType.DELETE
+				});
+
+				await this.database.removeDocument(relativePath);
+			}
+		);
+	}
+
+	public async unrestrictedSyncRemotelyUpdatedFile(
+		remoteVersion: components["schemas"]["DocumentVersionWithoutContent"]
+	): Promise<void> {
+		await this.executeWhileHoldingFileLock(
+			[remoteVersion.relativePath],
+			SyncType.UPDATE,
+			SyncSource.PULL,
+			async () => {
+				let localMetadata = this.database.getDocumentByDocumentId(
+					remoteVersion.documentId
+				);
+
+				if (
+					localMetadata &&
+					localMetadata[0] !== remoteVersion.relativePath
+				) {
+					await waitForDocumentLock(localMetadata[0]);
+				}
+				// Waiting for the new lock might take a while so we need to fetch the database
+				// entry again in case it's changed.
+				localMetadata = this.database.getDocumentByDocumentId(
+					remoteVersion.documentId
+				);
+
+				if (!localMetadata) {
+					if (remoteVersion.isDeleted) {
+						this.history.addHistoryEntry({
+							status: SyncStatus.NO_OP,
+							source: SyncSource.PULL,
+							relativePath: remoteVersion.relativePath,
+							message: `Remotely deleted file hasn't been synced yet, so there's no need to delete it locally`,
+							type: SyncType.DELETE
+						});
+						return;
+					}
+
+					const content = (
+						await this.syncService.get({
+							documentId: remoteVersion.documentId
+						})
+					).contentBase64;
+					const contentBytes = deserialize(content);
+
+					await this.operations.create(
+						remoteVersion.relativePath,
+						contentBytes
+					);
+					await this.database.setDocument({
+						documentId: remoteVersion.documentId,
+						relativePath: remoteVersion.relativePath,
+						parentVersionId: remoteVersion.vaultUpdateId,
+						hash: hash(contentBytes)
+					});
+					this.history.addHistoryEntry({
+						status: SyncStatus.SUCCESS,
+						source: SyncSource.PULL,
+						relativePath: remoteVersion.relativePath,
+						message: `Successfully downloaded remote file which hadn't existed locally`,
+						type: SyncType.CREATE
+					});
+					return;
+				}
+
+				const [relativePath, metadata] = localMetadata;
+
+				if (metadata.parentVersionId === remoteVersion.vaultUpdateId) {
+					this.logger.debug(
+						`Document ${relativePath} is already up to date`
+					);
+					return;
+				}
+
+				try {
+					if (remoteVersion.isDeleted) {
+						await this.operations.remove(relativePath);
+						await this.database.removeDocument(relativePath);
+
+						this.history.addHistoryEntry({
+							status: SyncStatus.SUCCESS,
+							source: SyncSource.PULL,
+							relativePath: remoteVersion.relativePath,
+							message: `Successfully deleted remotely deleted file locally`,
+							type: SyncType.DELETE
+						});
+					} else {
+						// TODO: this can fail, that's bad
+						const currentContent =
+							await this.operations.read(relativePath); // this can throw FileNotFoundError
+						const currentHash = hash(currentContent);
+
+						if (currentHash !== metadata.hash) {
+							this.logger.info(
+								`Document ${relativePath} has been updated both remotely and locally, letting the local file update event handle it`
+							);
+							return;
+						}
+
+						const content = (
+							await this.syncService.get({
+								documentId: remoteVersion.documentId
+							})
+						).contentBase64;
+						const contentBytes = deserialize(content);
+						const contentHash = hash(contentBytes);
+
+						if (relativePath !== remoteVersion.relativePath) {
+							// TODO: this can fail, that's bad
+							await this.operations.move(
+								// this can throw FileNotFoundError
+								relativePath,
+								remoteVersion.relativePath
+							);
+						}
+
+						await this.operations.write(
+							remoteVersion.relativePath,
+							currentContent,
+							contentBytes
+						);
+						await this.database.moveDocument({
+							documentId: remoteVersion.documentId,
+							oldRelativePath: relativePath,
+							relativePath: remoteVersion.relativePath,
+							parentVersionId: remoteVersion.vaultUpdateId,
+							hash: contentHash
+						});
+
+						this.history.addHistoryEntry({
+							status: SyncStatus.SUCCESS,
+							source: SyncSource.PULL,
+							relativePath: remoteVersion.relativePath,
+							message: `Successfully updated remotely updated file locally`,
+							type: SyncType.UPDATE
+						});
+					}
+				} finally {
+					if (relativePath !== remoteVersion.relativePath) {
+						unlockDocument(relativePath);
+					}
+				}
+			}
+		);
+	}
+
+	public async executeWhileHoldingFileLock(
+		lockedPaths: RelativePath[],
+		syncType: SyncType,
+		syncSource: SyncSource,
+		fn: () => Promise<void>
+	): Promise<void> {
+		const relativePath = lockedPaths[lockedPaths.length - 1];
+
+		if (!this.settings.getSettings().isSyncEnabled) {
+			this.logger.info(
+				`Syncing is disabled, not syncing ${relativePath}`
+			);
+			return;
+		}
+		if (!this.operations.isFileEligibleForSync(relativePath)) {
+			this.logger.info(
+				`File ${relativePath} is not eligible for syncing`
+			);
+			return;
+		}
+		this.logger.debug(
+			`Syncing ${relativePath} (${syncSource} - ${syncType})`
+		);
+
+		await Promise.all(lockedPaths.map(waitForDocumentLock));
+		try {
+			await fn();
+		} catch (e) {
+			if (e instanceof FileNotFoundError) {
+				// A subsequent sync operation must have been creating to deal with this
+				this.history.addHistoryEntry({
+					status: SyncStatus.NO_OP,
+					relativePath,
+					message: `Skip ${syncSource.toLocaleLowerCase()} file because it no longer exists when trying to ${syncType.toLocaleLowerCase()} it`,
+					type: syncType,
+					source: syncSource
+				});
+			} else {
+				this.history.addHistoryEntry({
+					status: SyncStatus.ERROR,
+					relativePath,
+					message: `Failed to ${syncSource.toLocaleLowerCase()} file because of ${e} when trying to ${syncType.toLocaleLowerCase()} it`,
+					type: syncType,
+					source: syncSource
+				});
+				throw e;
+			}
+		} finally {
+			lockedPaths.forEach(unlockDocument);
+		}
+	}
+
+	public async tryIncrementVaultUpdateId(
+		responseVaultUpdateId: number
+	): Promise<void> {
+		if (this.database.getLastSeenUpdateId() === responseVaultUpdateId - 1) {
+			await this.database.setLastSeenUpdateId(responseVaultUpdateId);
+		}
+	}
+}

From 0bf5f024ea7f3f715d4c7be1172e947401bad693 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 23 Feb 2025 10:12:33 +0000
Subject: [PATCH 231/761] Format

---
 frontend/test-client/package.json  | 46 +++++++++++++++---------------
 frontend/test-client/tsconfig.json | 25 +++++++---------
 2 files changed, 33 insertions(+), 38 deletions(-)

diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index 262ff149..261b8286 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -1,24 +1,24 @@
 {
-    "name": "test-client",
-    "version": "0.0.0",
-    "private": true,
-    "bin": {
-        "test-client": "./dist/cli.js"
-    },
-    "scripts": {
-        "dev": "webpack watch --mode development",
-        "build": "webpack --mode production"
-    },
-    "dependencies": {
-        "sync-client": "file:../sync-client"
-    },
-    "devDependencies": {
-        "uuid": "^11.1.0",
-        "chalk": "^5.4.1",
-        "ts-loader": "^9.5.2",
-        "tslib": "2.8.1",
-        "typescript": "5.7.3",
-        "webpack": "^5.98.0",
-        "webpack-cli": "^6.0.1"
-    }
-}
\ No newline at end of file
+	"name": "test-client",
+	"version": "0.0.0",
+	"private": true,
+	"bin": {
+		"test-client": "./dist/cli.js"
+	},
+	"scripts": {
+		"dev": "webpack watch --mode development",
+		"build": "webpack --mode production"
+	},
+	"dependencies": {
+		"sync-client": "file:../sync-client"
+	},
+	"devDependencies": {
+		"uuid": "^11.1.0",
+		"chalk": "^5.4.1",
+		"ts-loader": "^9.5.2",
+		"tslib": "2.8.1",
+		"typescript": "5.7.3",
+		"webpack": "^5.98.0",
+		"webpack-cli": "^6.0.1"
+	}
+}
diff --git a/frontend/test-client/tsconfig.json b/frontend/test-client/tsconfig.json
index e8142716..2306ca42 100644
--- a/frontend/test-client/tsconfig.json
+++ b/frontend/test-client/tsconfig.json
@@ -1,16 +1,11 @@
 {
-  "compilerOptions": {
-    "baseUrl": ".",
-    "strict": true,
-    "target": "ES2022",
-    "module": "CommonJS",
-    "esModuleInterop": true,
-    "lib": [
-      "DOM",
-      "ESNext"
-    ]
-  },
-  "exclude": [
-    "./dist"
-  ]
-}
\ No newline at end of file
+	"compilerOptions": {
+		"baseUrl": ".",
+		"strict": true,
+		"target": "ES2022",
+		"module": "CommonJS",
+		"esModuleInterop": true,
+		"lib": ["DOM", "ESNext"]
+	},
+	"exclude": ["./dist"]
+}

From f8dcd33d3eee77bf8d5bcb6fe1d51dc95c9c7616 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 23 Feb 2025 10:13:34 +0000
Subject: [PATCH 232/761] Lint & format

---
 .../file-operations/safe-filesystem-operations.ts  | 14 +++++++-------
 frontend/sync-client/src/sync-operations/syncer.ts |  3 ---
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts b/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
index 3776e63a..e7c1d29c 100644
--- a/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
+++ b/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
@@ -1,4 +1,4 @@
-import { FileSystemOperations } from "dist/types";
+import type { FileSystemOperations } from "dist/types";
 import type { RelativePath } from "src/persistence/database";
 
 export class FileNotFoundError extends Error {
@@ -13,12 +13,12 @@ export class FileNotFoundError extends Error {
 export class SafeFileSystemOperations implements FileSystemOperations {
 	public constructor(private readonly fs: FileSystemOperations) {}
 
-	public listAllFiles(): Promise<RelativePath[]> {
+	public async listAllFiles(): Promise<RelativePath[]> {
 		return this.fs.listAllFiles();
 	}
 
 	public async read(path: RelativePath): Promise<Uint8Array> {
-		return this.safeOperation(path, () => this.fs.read(path));
+		return this.safeOperation(path, async () => this.fs.read(path));
 	}
 
 	public async write(path: RelativePath, content: Uint8Array): Promise<void> {
@@ -29,17 +29,17 @@ export class SafeFileSystemOperations implements FileSystemOperations {
 		path: RelativePath,
 		updater: (currentContent: string) => string
 	): Promise<string> {
-		return this.safeOperation(path, () =>
+		return this.safeOperation(path, async () =>
 			this.fs.atomicUpdateText(path, updater)
 		);
 	}
 
 	public async getFileSize(path: RelativePath): Promise<number> {
-		return this.safeOperation(path, () => this.fs.getFileSize(path));
+		return this.safeOperation(path, async () => this.fs.getFileSize(path));
 	}
 
 	public async getModificationTime(path: RelativePath): Promise<Date> {
-		return this.safeOperation(path, () =>
+		return this.safeOperation(path, async () =>
 			this.fs.getModificationTime(path)
 		);
 	}
@@ -60,7 +60,7 @@ export class SafeFileSystemOperations implements FileSystemOperations {
 		oldPath: RelativePath,
 		newPath: RelativePath
 	): Promise<void> {
-		return this.safeOperation(oldPath, () =>
+		return this.safeOperation(oldPath, async () =>
 			this.fs.rename(oldPath, newPath)
 		);
 	}
diff --git a/frontend/sync-client/src/sync-operations/syncer.ts b/frontend/sync-client/src/sync-operations/syncer.ts
index 68d1c969..0c764c3d 100644
--- a/frontend/sync-client/src/sync-operations/syncer.ts
+++ b/frontend/sync-client/src/sync-operations/syncer.ts
@@ -3,12 +3,9 @@ import type { Database, RelativePath } from "../persistence/database";
 import type { SyncService } from "src/services/sync-service";
 import type { Logger } from "src/tracing/logger";
 import type { SyncHistory } from "src/tracing/sync-history";
-import { SyncSource, SyncStatus, SyncType } from "src/tracing/sync-history";
-import { unlockDocument, waitForDocumentLock } from "./document-lock";
 import PQueue from "p-queue";
 import { hash } from "src/utils/hash";
 import type { components } from "src/services/types";
-import { deserialize } from "src/utils/deserialize";
 import type { Settings } from "src/persistence/settings";
 import type { FileOperations } from "src/file-operations/file-operations";
 import { findMatchingFileBasedOnHash } from "src/utils/find-matching-file-based-on-hash";

From 3d8067e947fe35ab523e62163735ee1ac64c2f08 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 23 Feb 2025 10:41:59 +0000
Subject: [PATCH 233/761] Stop using global file locks

---
 .../src/sync-operations/document-lock.ts      | 48 -------------
 ...nt-lock.test.ts => document-locks.test.ts} | 69 ++++++++++---------
 .../src/sync-operations/document-locks.ts     | 50 ++++++++++++++
 3 files changed, 85 insertions(+), 82 deletions(-)
 delete mode 100644 frontend/sync-client/src/sync-operations/document-lock.ts
 rename frontend/sync-client/src/sync-operations/{document-lock.test.ts => document-locks.test.ts} (50%)
 create mode 100644 frontend/sync-client/src/sync-operations/document-locks.ts

diff --git a/frontend/sync-client/src/sync-operations/document-lock.ts b/frontend/sync-client/src/sync-operations/document-lock.ts
deleted file mode 100644
index 28d97f35..00000000
--- a/frontend/sync-client/src/sync-operations/document-lock.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import type { RelativePath } from "../persistence/database";
-
-const locked = new Set<RelativePath>();
-const waiters = new Map<RelativePath, (() => void)[]>();
-
-export function tryLockDocument(relativePath: RelativePath): boolean {
-	if (locked.has(relativePath)) {
-		return false;
-	}
-
-	locked.add(relativePath);
-	return true;
-}
-
-export async function waitForDocumentLock(
-	relativePath: RelativePath
-): Promise<void> {
-	if (tryLockDocument(relativePath)) {
-		return Promise.resolve();
-	}
-
-	return new Promise((resolve) => {
-		let waiting = waiters.get(relativePath);
-		if (!waiting) {
-			waiting = [];
-			waiters.set(relativePath, waiting);
-		}
-
-		waiting.push(resolve);
-	});
-}
-
-export function unlockDocument(relativePath: RelativePath): void {
-	if (!locked.has(relativePath)) {
-		throw new Error(
-			`Document ${relativePath} is not locked, cannot unlock`
-		);
-	}
-
-	// Remove the first element to ensure FIFO unblocking order
-	const nextWaiting = waiters.get(relativePath)?.shift();
-
-	if (nextWaiting) {
-		nextWaiting();
-	} else {
-		locked.delete(relativePath);
-	}
-}
diff --git a/frontend/sync-client/src/sync-operations/document-lock.test.ts b/frontend/sync-client/src/sync-operations/document-locks.test.ts
similarity index 50%
rename from frontend/sync-client/src/sync-operations/document-lock.test.ts
rename to frontend/sync-client/src/sync-operations/document-locks.test.ts
index 2bc05e69..ce661d02 100644
--- a/frontend/sync-client/src/sync-operations/document-lock.test.ts
+++ b/frontend/sync-client/src/sync-operations/document-locks.test.ts
@@ -1,89 +1,90 @@
-import { RelativePath } from "../persistence/database";
-import {
-	tryLockDocument,
-	waitForDocumentLock,
-	unlockDocument
-} from "./document-lock";
+import type { RelativePath } from "../persistence/database";
+import { DocumentLocks } from "./document-locks";
 
-describe("Document Lock Operations", () => {
+describe("Document lock", () => {
 	const testPath: RelativePath = "test/document/path";
+	let locks = new DocumentLocks();
 
 	beforeEach(() => {
-		// Reset the state before each test
-		(global as any).locked = new Set<RelativePath>();
-		(global as any).waiters = new Map<RelativePath, (() => void)[]>();
+		locks = new DocumentLocks();
 	});
 
 	test("should lock a document successfully", () => {
-		const result = tryLockDocument(testPath);
+		const result = locks.tryLockDocument(testPath);
 		expect(result).toBe(true);
 	});
 
 	test("should not lock a document that is already locked", () => {
-		tryLockDocument(testPath);
-		const result = tryLockDocument(testPath);
+		locks.tryLockDocument(testPath);
+		const result = locks.tryLockDocument(testPath);
 		expect(result).toBe(false);
 	});
 
 	test("should unlock a locked document", () => {
-		tryLockDocument(testPath);
-		unlockDocument(testPath);
-		const result = tryLockDocument(testPath);
+		locks.tryLockDocument(testPath);
+		locks.unlockDocument(testPath);
+		const result = locks.tryLockDocument(testPath);
 		expect(result).toBe(true);
-		unlockDocument(testPath);
+		locks.unlockDocument(testPath);
 	});
 
 	test("should throw an error when unlocking a document that is not locked", () => {
 		expect(() => {
-			unlockDocument(testPath);
+			locks.unlockDocument(testPath);
 		}).toThrow(`Document ${testPath} is not locked, cannot unlock`);
 	});
 
 	test("should wait for a document lock and resolve when unlocked", async () => {
-		tryLockDocument(testPath);
+		locks.tryLockDocument(testPath);
 
 		let resolved = false;
-		const waitPromise = waitForDocumentLock(testPath).then(() => {
+		const waitPromise = locks.waitForDocumentLock(testPath).then(() => {
 			resolved = true;
 		});
 
-		unlockDocument(testPath);
+		locks.unlockDocument(testPath);
 		await waitPromise;
 
 		expect(resolved).toBe(true);
 	});
 
 	test("should resolve multiple waiters in FIFO order", async () => {
-		tryLockDocument(testPath);
+		locks.tryLockDocument(testPath);
 
 		let firstResolved = false;
 		let secondResolved = false;
 		let thirdResolved = false;
 
-		const firstWaitPromise = waitForDocumentLock(testPath).then(() => {
-			firstResolved = true;
-		});
+		const firstWaitPromise = locks
+			.waitForDocumentLock(testPath)
+			.then(() => {
+				firstResolved = true;
+			});
 
-		const secondWaitPromise = waitForDocumentLock(testPath).then(() => {
-			secondResolved = true;
-		});
+		const secondWaitPromise = locks
+			.waitForDocumentLock(testPath)
+			.then(() => {
+				secondResolved = true;
+			});
 
-		const thirdWaitPromise = waitForDocumentLock(testPath).then(() => {
-			thirdResolved = true;
-		});
+		const thirdWaitPromise = locks
+			.waitForDocumentLock(testPath)
+			.then(() => {
+				thirdResolved = true;
+			});
 
-		unlockDocument(testPath);
+		locks.unlockDocument(testPath);
 		await firstWaitPromise;
 		expect(firstResolved).toBe(true);
 		expect(secondResolved).toBe(false);
 		expect(thirdResolved).toBe(false);
 
-		unlockDocument(testPath);
+		locks.unlockDocument(testPath);
 		await secondWaitPromise;
 		expect(secondResolved).toBe(true);
 		expect(thirdResolved).toBe(false);
 
-		unlockDocument(testPath);
+		locks.unlockDocument(testPath);
 		await thirdWaitPromise;
 		expect(thirdResolved).toBe(true);
 	});
diff --git a/frontend/sync-client/src/sync-operations/document-locks.ts b/frontend/sync-client/src/sync-operations/document-locks.ts
new file mode 100644
index 00000000..f1831f82
--- /dev/null
+++ b/frontend/sync-client/src/sync-operations/document-locks.ts
@@ -0,0 +1,50 @@
+import type { RelativePath } from "../persistence/database";
+
+export class DocumentLocks {
+	private readonly locked = new Set<RelativePath>();
+	private readonly waiters = new Map<RelativePath, (() => void)[]>();
+
+	public tryLockDocument(relativePath: RelativePath): boolean {
+		if (this.locked.has(relativePath)) {
+			return false;
+		}
+
+		this.locked.add(relativePath);
+		return true;
+	}
+
+	public async waitForDocumentLock(
+		relativePath: RelativePath
+	): Promise<void> {
+		if (this.tryLockDocument(relativePath)) {
+			return Promise.resolve();
+		}
+
+		return new Promise((resolve) => {
+			let waiting = this.waiters.get(relativePath);
+			if (!waiting) {
+				waiting = [];
+				this.waiters.set(relativePath, waiting);
+			}
+
+			waiting.push(resolve);
+		});
+	}
+
+	public unlockDocument(relativePath: RelativePath): void {
+		if (!this.locked.has(relativePath)) {
+			throw new Error(
+				`Document ${relativePath} is not locked, cannot unlock`
+			);
+		}
+
+		// Remove the first element to ensure FIFO unblocking order
+		const nextWaiting = this.waiters.get(relativePath)?.shift();
+
+		if (nextWaiting) {
+			nextWaiting();
+		} else {
+			this.locked.delete(relativePath);
+		}
+	}
+}

From b6547f9e29c71a4629e01f0359c9b45042619b03 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 23 Feb 2025 10:42:10 +0000
Subject: [PATCH 234/761] Make tests pass

---
 frontend/test-client/package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index 261b8286..071e38fd 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -7,7 +7,8 @@
 	},
 	"scripts": {
 		"dev": "webpack watch --mode development",
-		"build": "webpack --mode production"
+		"build": "webpack --mode production",
+		"test": "jest --passWithNoTests"
 	},
 	"dependencies": {
 		"sync-client": "file:../sync-client"

From 5ba898df7d64eb6b9634953d21a75c61349b7ab2 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 23 Feb 2025 10:42:32 +0000
Subject: [PATCH 235/761] Set up linting for test-client

---
 frontend/package.json | 55 ++++++++++++++++++++++---------------------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/frontend/package.json b/frontend/package.json
index 60edb303..e0de3e5e 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,29 +1,30 @@
 {
-    "name": "my-workspace",
-    "private": true,
-    "workspaces": [
-        "sync-client",
-        "obsidian-plugin"
-    ],
-    "prettier": {
-        "trailingComma": "none",
-        "tabWidth": 4,
-        "useTabs": true,
-        "endOfLine": "lf"
-    },
-    "scripts": {
-        "build": "npm run build --workspaces",
-        "dev": "concurrently --kill-others \"npm run dev -w sync-client\" \"npm run dev -w obsidian-plugin\"",
-        "test": "npm run test --workspaces",
-        "lint": "eslint --fix sync-client obsidian-plugin; prettier --write \"sync-client/**/*.(ts|scss|json|html)\" \"obsidian-plugin/**/*.(ts|scss|json|html)\"",
-        "update": "ncu -u -ws"
-    },
-    "devDependencies": {
-        "concurrently": "^9.1.2",
-        "eslint": "9.20.1",
-        "eslint-plugin-unused-imports": "^4.1.4",
-        "npm-check-updates": "^17.1.14",
-        "prettier": "^3.5.1",
-        "typescript-eslint": "8.24.1"
-    }
+	"name": "my-workspace",
+	"private": true,
+	"workspaces": [
+		"sync-client",
+		"obsidian-plugin",
+		"test-client"
+	],
+	"prettier": {
+		"trailingComma": "none",
+		"tabWidth": 4,
+		"useTabs": true,
+		"endOfLine": "lf"
+	},
+	"scripts": {
+		"build": "npm run build --workspaces",
+		"dev": "concurrently --kill-others \"npm run dev -w sync-client\" \"npm run dev -w obsidian-plugin\"",
+		"test": "npm run test --workspaces",
+		"lint": "eslint --fix sync-client obsidian-plugin test-client; prettier --write \"**/*.(ts|scss|json|html)\"",
+		"update": "ncu -u -ws"
+	},
+	"devDependencies": {
+		"concurrently": "^9.1.2",
+		"eslint": "9.20.1",
+		"eslint-plugin-unused-imports": "^4.1.4",
+		"npm-check-updates": "^17.1.14",
+		"prettier": "^3.5.1",
+		"typescript-eslint": "8.24.1"
+	}
 }

From 9f46af4a652507b94aad07ff3c2f4f90b613f690 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 23 Feb 2025 10:43:28 +0000
Subject: [PATCH 236/761] Fix persistence provider types

---
 .../sync-client/src/persistence/database.ts    |  7 +++----
 .../sync-client/src/persistence/persistence.ts |  6 +++---
 .../sync-client/src/persistence/settings.ts    |  2 +-
 frontend/sync-client/src/sync-client.ts        | 18 +++++++++++-------
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/frontend/sync-client/src/persistence/database.ts b/frontend/sync-client/src/persistence/database.ts
index 2926af10..4d36e867 100644
--- a/frontend/sync-client/src/persistence/database.ts
+++ b/frontend/sync-client/src/persistence/database.ts
@@ -11,7 +11,7 @@ export interface DocumentMetadata {
 import type { Logger } from "src/tracing/logger";
 
 export interface StoredDatabase {
-	documents: Map<RelativePath, DocumentMetadata>;
+	documents: Record<RelativePath, DocumentMetadata>;
 	lastSeenUpdateId: VaultUpdateId | undefined;
 }
 
@@ -22,15 +22,14 @@ export class Database {
 	public constructor(
 		private readonly logger: Logger,
 		initialState: Partial<StoredDatabase> | undefined,
-		private readonly saveData: (data: unknown) => Promise<void>
+		private readonly saveData: (data: StoredDatabase) => Promise<void>
 	) {
 		initialState ??= {};
 		if (initialState.documents) {
 			for (const [relativePath, metadata] of Object.entries(
 				initialState.documents
 			)) {
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-				this.documents.set(relativePath, metadata as DocumentMetadata);
+				this.documents.set(relativePath, metadata);
 			}
 		}
 		this.logger.debug(`Loaded ${this.documents.size} documents`);
diff --git a/frontend/sync-client/src/persistence/persistence.ts b/frontend/sync-client/src/persistence/persistence.ts
index 43f992b9..3e57e0e0 100644
--- a/frontend/sync-client/src/persistence/persistence.ts
+++ b/frontend/sync-client/src/persistence/persistence.ts
@@ -1,4 +1,4 @@
-export interface PersistenceProvider {
-	load: () => Promise<unknown>;
-	save: (data: unknown) => Promise<void>;
+export interface PersistenceProvider<T extends object> {
+	load: () => Promise<T | undefined>;
+	save: (data: T | undefined) => Promise<void>;
 }
diff --git a/frontend/sync-client/src/persistence/settings.ts b/frontend/sync-client/src/persistence/settings.ts
index 295824af..75433b37 100644
--- a/frontend/sync-client/src/persistence/settings.ts
+++ b/frontend/sync-client/src/persistence/settings.ts
@@ -36,7 +36,7 @@ export class Settings {
 	public constructor(
 		private readonly logger: Logger,
 		initialState: Partial<SyncSettings> | undefined,
-		private readonly saveData: (data: unknown) => Promise<void>
+		private readonly saveData: (data: SyncSettings) => Promise<void>
 	) {
 		this.settings = {
 			...DEFAULT_SETTINGS,
diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts
index 009a87d3..8cac7fa2 100644
--- a/frontend/sync-client/src/sync-client.ts
+++ b/frontend/sync-client/src/sync-client.ts
@@ -3,7 +3,9 @@ import wasmBin from "sync_lib/sync_lib_bg.wasm";
 import type { PersistenceProvider } from "./persistence/persistence";
 import { SyncHistory } from "./tracing/sync-history";
 import { Logger } from "./tracing/logger";
+import type { StoredDatabase } from "./persistence/database";
 import { Database } from "./persistence/database";
+import type { SyncSettings } from "./persistence/settings";
 import { Settings } from "./persistence/settings";
 import type { CheckConnectionResult } from "./services/sync-service";
 import { SyncService } from "./services/sync-service";
@@ -45,7 +47,12 @@ export class SyncClient {
 
 	public static async create(
 		fs: FileSystemOperations,
-		persistence: PersistenceProvider
+		persistence: PersistenceProvider<
+			Partial<{
+				settings: Partial<SyncSettings>;
+				database: Partial<StoredDatabase>;
+			}>
+		>
 	): Promise<SyncClient> {
 		const logger = new Logger();
 		const history = new SyncHistory(logger);
@@ -56,17 +63,14 @@ export class SyncClient {
 			(wasmBin as any).default // it is loaded as a base64 string by webpack
 		);
 
-		let state: Partial<{
-			settings: any;
-			database: any;
-		}> = (await persistence.load()) ?? {
+		let state = (await persistence.load()) ?? {
 			settings: undefined,
 			database: undefined
 		};
 		const database = new Database(
 			logger,
 			state.database,
-			async (data: unknown): Promise<void> => {
+			async (data): Promise<void> => {
 				state = { ...state, database: data };
 				return persistence.save(state);
 			}
@@ -75,7 +79,7 @@ export class SyncClient {
 		const settings = new Settings(
 			logger,
 			state.settings,
-			async (data: unknown): Promise<void> => {
+			async (data): Promise<void> => {
 				state = { ...state, settings: data };
 				return persistence.save(state);
 			}

From cd70f8b42660e63aa229cfcfb3e535c609dadbae Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 23 Feb 2025 10:44:51 +0000
Subject: [PATCH 237/761] Lint

---
 .../safe-filesystem-operations.ts             |  2 +-
 .../sync-client/src/sync-operations/syncer.ts | 92 +++++++++----------
 frontend/test-client/src/agent/mock-client.ts | 57 ++++++------
 3 files changed, 76 insertions(+), 75 deletions(-)

diff --git a/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts b/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
index e7c1d29c..94ee8ad4 100644
--- a/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
+++ b/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
@@ -2,7 +2,7 @@ import type { FileSystemOperations } from "dist/types";
 import type { RelativePath } from "src/persistence/database";
 
 export class FileNotFoundError extends Error {
-	constructor(message: string) {
+	public constructor(message: string) {
 		super(message);
 		this.name = "FileNotFoundError";
 	}
diff --git a/frontend/sync-client/src/sync-operations/syncer.ts b/frontend/sync-client/src/sync-operations/syncer.ts
index 0c764c3d..652d9c51 100644
--- a/frontend/sync-client/src/sync-operations/syncer.ts
+++ b/frontend/sync-client/src/sync-operations/syncer.ts
@@ -95,16 +95,6 @@ export class Syncer {
 		);
 	}
 
-	private async syncRemotelyUpdatedFile(
-		remoteVersion: components["schemas"]["DocumentVersionWithoutContent"]
-	): Promise<void> {
-		await this.syncQueue.add(async () =>
-			this.internalSyncer.unrestrictedSyncRemotelyUpdatedFile(
-				remoteVersion
-			)
-		);
-	}
-
 	public async scheduleSyncForOfflineChanges(): Promise<void> {
 		if (!this.settings.getSettings().isSyncEnabled) {
 			this.logger.debug(
@@ -133,6 +123,52 @@ export class Syncer {
 		}
 	}
 
+	public async applyRemoteChangesLocally(): Promise<void> {
+		if (!this.settings.getSettings().isSyncEnabled) {
+			this.logger.debug(
+				`Syncing is disabled, not fetching remote changes`
+			);
+			return;
+		}
+
+		if (this.runningApplyRemoteChangesLocally != null) {
+			this.logger.debug(
+				"Applying remote changes locally is already in progress"
+			);
+			return this.runningApplyRemoteChangesLocally;
+		}
+
+		try {
+			this.runningApplyRemoteChangesLocally =
+				this.internalApplyRemoteChangesLocally();
+			await this.runningApplyRemoteChangesLocally;
+			this.logger.info("All remote changes have been applied locally");
+		} catch (e) {
+			this.logger.error(`Failed to apply remote changes locally: ${e}`);
+			throw e;
+		} finally {
+			this.runningApplyRemoteChangesLocally = undefined;
+		}
+	}
+
+	public async reset(): Promise<void> {
+		this.syncQueue.clear();
+		await this.syncQueue.onEmpty();
+		this.remainingOperationsListeners.forEach((listener) => {
+			listener(0);
+		});
+	}
+
+	private async syncRemotelyUpdatedFile(
+		remoteVersion: components["schemas"]["DocumentVersionWithoutContent"]
+	): Promise<void> {
+		await this.syncQueue.add(async () =>
+			this.internalSyncer.unrestrictedSyncRemotelyUpdatedFile(
+				remoteVersion
+			)
+		);
+	}
+
 	private async internalScheduleSyncForOfflineChanges(): Promise<void> {
 		const allLocalFiles = await this.operations.listAllFiles();
 
@@ -226,34 +262,6 @@ export class Syncer {
 		);
 	}
 
-	public async applyRemoteChangesLocally(): Promise<void> {
-		if (!this.settings.getSettings().isSyncEnabled) {
-			this.logger.debug(
-				`Syncing is disabled, not fetching remote changes`
-			);
-			return;
-		}
-
-		if (this.runningApplyRemoteChangesLocally != null) {
-			this.logger.debug(
-				"Applying remote changes locally is already in progress"
-			);
-			return this.runningApplyRemoteChangesLocally;
-		}
-
-		try {
-			this.runningApplyRemoteChangesLocally =
-				this.internalApplyRemoteChangesLocally();
-			await this.runningApplyRemoteChangesLocally;
-			this.logger.info("All remote changes have been applied locally");
-		} catch (e) {
-			this.logger.error(`Failed to apply remote changes locally: ${e}`);
-			throw e;
-		} finally {
-			this.runningApplyRemoteChangesLocally = undefined;
-		}
-	}
-
 	private async internalApplyRemoteChangesLocally(): Promise<void> {
 		const remote = await this.syncService.getAll(
 			this.database.getLastSeenUpdateId()
@@ -281,14 +289,6 @@ export class Syncer {
 		}
 	}
 
-	public async reset(): Promise<void> {
-		this.syncQueue.clear();
-		await this.syncQueue.onEmpty();
-		this.remainingOperationsListeners.forEach((listener) => {
-			listener(0);
-		});
-	}
-
 	private emitRemainingOperationsChange(remainingOperations: number): void {
 		this.remainingOperationsListeners.forEach((listener) => {
 			listener(remainingOperations);
diff --git a/frontend/test-client/src/agent/mock-client.ts b/frontend/test-client/src/agent/mock-client.ts
index 6fc8f15b..6dc54076 100644
--- a/frontend/test-client/src/agent/mock-client.ts
+++ b/frontend/test-client/src/agent/mock-client.ts
@@ -7,9 +7,9 @@ import { SyncClient } from "sync-client";
 import { assert } from "../utils/assert";
 
 export class MockClient implements FileSystemOperations {
-	protected readonly localFiles: Record<string, Uint8Array> = {};
+	protected readonly localFiles = new Map<string, Uint8Array>();
 	protected client!: SyncClient;
-	protected data: unknown = "";
+	protected data: object | undefined = undefined;
 
 	public constructor(
 		private readonly initialSettings: Partial<SyncSettings>
@@ -18,15 +18,17 @@ export class MockClient implements FileSystemOperations {
 	public async init(): Promise<void> {
 		this.client = await SyncClient.create(this, {
 			load: async () => this.data,
-			save: async (data: unknown) => void (this.data = data)
+			save: async (data) => void (this.data = data)
 		});
 
 		await Promise.all(
 			Object.keys(this.initialSettings).map(async (key) => {
-				return this.client.settings.setSetting(
-					key as keyof SyncSettings,
-					this.initialSettings[key as keyof SyncSettings]
-				);
+				if (key in this.client.settings) {
+					return this.client.settings.setSetting(
+						key as keyof SyncSettings, // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+						this.initialSettings[key as keyof SyncSettings] // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+					);
+				}
 			})
 		);
 
@@ -37,46 +39,44 @@ export class MockClient implements FileSystemOperations {
 	}
 
 	public async listAllFiles(): Promise<RelativePath[]> {
-		return Object.keys(this.localFiles);
+		return Array.from(this.localFiles.keys());
 	}
 
 	public async read(path: RelativePath): Promise<Uint8Array> {
-		if (!(path in this.localFiles)) {
+		const file = this.localFiles.get(path);
+		if (!file) {
 			throw new Error(`File ${path} does not exist`);
 		}
-		return this.localFiles[path];
+		return file;
 	}
 
 	public async getFileSize(path: RelativePath): Promise<number> {
-		if (!(path in this.localFiles)) {
-			throw new Error(`File ${path} does not exist`);
-		}
-		return this.localFiles[path].length;
+		return (await this.read(path)).length;
 	}
 
 	public async getModificationTime(path: RelativePath): Promise<Date> {
-		if (!(path in this.localFiles)) {
+		if (!this.localFiles.has(path)) {
 			throw new Error(`File ${path} does not exist`);
 		}
 		return new Date();
 	}
 
 	public async exists(path: RelativePath): Promise<boolean> {
-		return path in this.localFiles;
+		return this.localFiles.has(path);
 	}
 
 	public async create(
 		path: RelativePath,
 		newContent: Uint8Array
 	): Promise<void> {
-		if (path in this.localFiles) {
+		if (this.localFiles.has(path)) {
 			throw new Error(`File ${path} already exists`);
 		}
-		this.localFiles[path] = newContent;
+		this.localFiles.set(path, newContent);
 		void this.client.syncer.syncLocallyCreatedFile(path, new Date());
 	}
 
-	public async createDirectory(path: RelativePath): Promise<void> {
+	public async createDirectory(_path: RelativePath): Promise<void> {
 		// This doesn't mean anything in our virtual FS representation
 	}
 
@@ -84,13 +84,14 @@ export class MockClient implements FileSystemOperations {
 		path: RelativePath,
 		updater: (currentContent: string) => string
 	): Promise<string> {
-		if (!(path in this.localFiles)) {
+		const file = this.localFiles.get(path);
+		if (!file) {
 			throw new Error(`File ${path} does not exist`);
 		}
-		const currentContent = new TextDecoder().decode(this.localFiles[path]);
+		const currentContent = new TextDecoder().decode(file);
 		const newContent = updater(currentContent);
 		const newContentUint8Array = new TextEncoder().encode(newContent);
-		this.localFiles[path] = newContentUint8Array;
+		this.localFiles.set(path, newContentUint8Array);
 
 		void this.client.syncer.syncLocallyUpdatedFile({
 			relativePath: path,
@@ -101,7 +102,7 @@ export class MockClient implements FileSystemOperations {
 	}
 
 	public async write(path: RelativePath, content: Uint8Array): Promise<void> {
-		this.localFiles[path] = content;
+		this.localFiles.set(path, content);
 
 		void this.client.syncer.syncLocallyUpdatedFile({
 			relativePath: path,
@@ -110,7 +111,7 @@ export class MockClient implements FileSystemOperations {
 	}
 
 	public async delete(path: RelativePath): Promise<void> {
-		delete this.localFiles[path];
+		this.localFiles.delete(path);
 		void this.client.syncer.syncLocallyDeletedFile(path);
 	}
 
@@ -118,13 +119,13 @@ export class MockClient implements FileSystemOperations {
 		oldPath: RelativePath,
 		newPath: RelativePath
 	): Promise<void> {
-		if (!(oldPath in this.localFiles)) {
+		const file = this.localFiles.get(oldPath);
+		if (!file) {
 			throw new Error(`File ${oldPath} does not exist`);
 		}
-
-		this.localFiles[newPath] = this.localFiles[oldPath];
+		this.localFiles.set(newPath, file);
 		if (oldPath !== newPath) {
-			delete this.localFiles[oldPath];
+			this.localFiles.delete(oldPath);
 		}
 
 		void this.client.syncer.syncLocallyUpdatedFile({

From 74cb30b5ecec3fd18a2f0785320c3214693388e1 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 23 Feb 2025 10:45:10 +0000
Subject: [PATCH 238/761] Pick up document locks

---
 .../src/sync-operations/unrestricted-syncer.ts | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
index a7a2f773..6db8b005 100644
--- a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
+++ b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
@@ -4,15 +4,17 @@ import type { SyncService } from "src/services/sync-service";
 import type { Logger } from "src/tracing/logger";
 import type { SyncHistory } from "src/tracing/sync-history";
 import { SyncSource, SyncStatus, SyncType } from "src/tracing/sync-history";
-import { unlockDocument, waitForDocumentLock } from "./document-lock";
 import { hash } from "src/utils/hash";
 import type { components } from "src/services/types";
 import { deserialize } from "src/utils/deserialize";
 import type { Settings } from "src/persistence/settings";
 import type { FileOperations } from "src/file-operations/file-operations";
 import { FileNotFoundError } from "src/file-operations/safe-filesystem-operations";
+import { DocumentLocks } from "./document-locks";
 
 export class UnrestrictedSyncer {
+	private readonly locks = new DocumentLocks();
+
 	public constructor(
 		private readonly logger: Logger,
 		private readonly database: Database,
@@ -232,7 +234,7 @@ export class UnrestrictedSyncer {
 					response.relativePath != relativePath &&
 					response.relativePath != oldPath
 				) {
-					await waitForDocumentLock(response.relativePath);
+					await this.locks.waitForDocumentLock(response.relativePath);
 				}
 
 				try {
@@ -282,7 +284,7 @@ export class UnrestrictedSyncer {
 						response.relativePath != relativePath &&
 						response.relativePath != oldPath
 					) {
-						unlockDocument(response.relativePath);
+						this.locks.unlockDocument(response.relativePath);
 					}
 				}
 			}
@@ -343,7 +345,7 @@ export class UnrestrictedSyncer {
 					localMetadata &&
 					localMetadata[0] !== remoteVersion.relativePath
 				) {
-					await waitForDocumentLock(localMetadata[0]);
+					await this.locks.waitForDocumentLock(localMetadata[0]);
 				}
 				// Waiting for the new lock might take a while so we need to fetch the database
 				// entry again in case it's changed.
@@ -464,7 +466,7 @@ export class UnrestrictedSyncer {
 					}
 				} finally {
 					if (relativePath !== remoteVersion.relativePath) {
-						unlockDocument(relativePath);
+						this.locks.unlockDocument(relativePath);
 					}
 				}
 			}
@@ -495,7 +497,9 @@ export class UnrestrictedSyncer {
 			`Syncing ${relativePath} (${syncSource} - ${syncType})`
 		);
 
-		await Promise.all(lockedPaths.map(waitForDocumentLock));
+		await Promise.all(
+			lockedPaths.map(this.locks.waitForDocumentLock.bind(this.locks))
+		);
 		try {
 			await fn();
 		} catch (e) {
@@ -519,7 +523,7 @@ export class UnrestrictedSyncer {
 				throw e;
 			}
 		} finally {
-			lockedPaths.forEach(unlockDocument);
+			lockedPaths.forEach(this.locks.unlockDocument.bind(this.locks));
 		}
 	}
 

From d33d49baa23ce9064e924bd33bbf8f58911de499 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 23 Feb 2025 10:48:06 +0000
Subject: [PATCH 239/761] Fix eslint ignores

---
 frontend/eslint.config.mjs | 93 ++++++++++++++++++++------------------
 1 file changed, 48 insertions(+), 45 deletions(-)

diff --git a/frontend/eslint.config.mjs b/frontend/eslint.config.mjs
index 96de58af..ceba2eee 100644
--- a/frontend/eslint.config.mjs
+++ b/frontend/eslint.config.mjs
@@ -2,51 +2,54 @@ import eslint from "@eslint/js";
 import tseslint from "typescript-eslint";
 import unusedImports from "eslint-plugin-unused-imports";
 
-export default tseslint.config({
-	plugins: {
-		"unused-imports": unusedImports
-	},
-	extends: [eslint.configs.recommended, tseslint.configs.all],
-	ignores: [
-		"**/types.ts",
-		"**/*.test.ts",
-		"**/dist/**/*",
-		"**/*.mjs",
-		"**/*.js"
-	],
-	rules: {
-		"no-unused-vars": "off",
-		"@typescript-eslint/no-unused-vars": "off",
-		"@typescript-eslint/no-floating-promises": "error",
-		"@typescript-eslint/parameter-properties": "off",
-		"@typescript-eslint/require-await": "off",
-		"@typescript-eslint/class-methods-use-this": "off",
-		"@typescript-eslint/consistent-return": "off",
-		"@typescript-eslint/no-unsafe-argument": "off",
-		"@typescript-eslint/max-params": [
-			"error",
-			{
-				max: 5
-			}
-		],
-		"unused-imports/no-unused-imports": "error",
-		"@typescript-eslint/no-magic-numbers": "off",
-		"@typescript-eslint/prefer-readonly-parameter-types": "off",
-		"@typescript-eslint/naming-convention": "off",
-		"unused-imports/no-unused-vars": [
-			"warn",
-			{
-				vars: "all",
-				varsIgnorePattern: "^_",
-				args: "after-used",
-				argsIgnorePattern: "^_"
-			}
+export default [
+	{
+		ignores: [
+			"sync-client/src/services/types.ts",
+			"**/dist/",
+			"**/*.mjs",
+			"**/*.js"
 		]
 	},
-	languageOptions: {
-		parserOptions: {
-			projectService: true,
-			tsconfigRootDir: import.meta.dirname
+	...tseslint.config({
+		plugins: {
+			"unused-imports": unusedImports
+		},
+		extends: [eslint.configs.recommended, tseslint.configs.all],
+		rules: {
+			"no-unused-vars": "off",
+			"@typescript-eslint/restrict-template-expressions": "off",
+			"@typescript-eslint/no-unused-vars": "off",
+			"@typescript-eslint/no-floating-promises": "error",
+			"@typescript-eslint/parameter-properties": "off",
+			"@typescript-eslint/require-await": "off",
+			"@typescript-eslint/class-methods-use-this": "off",
+			"@typescript-eslint/consistent-return": "off",
+			"@typescript-eslint/no-unsafe-argument": "off",
+			"@typescript-eslint/max-params": [
+				"error",
+				{
+					max: 6
+				}
+			],
+			"@typescript-eslint/no-magic-numbers": "off",
+			"@typescript-eslint/prefer-readonly-parameter-types": "off",
+			"@typescript-eslint/naming-convention": "off",
+			"unused-imports/no-unused-vars": [
+				"warn",
+				{
+					vars: "all",
+					varsIgnorePattern: "^_",
+					args: "after-used",
+					argsIgnorePattern: "^_"
+				}
+			]
+		},
+		languageOptions: {
+			parserOptions: {
+				projectService: true,
+				tsconfigRootDir: import.meta.dirname
+			}
 		}
-	}
-});
+	})
+];

From df0fae74ecd8b15967611a96a53728ed6f036bbc Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 23 Feb 2025 10:48:22 +0000
Subject: [PATCH 240/761] Don't ignore lints

---
 .github/workflows/check.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 42b33d2f..13ea8f48 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -51,7 +51,7 @@ jobs:
           cd frontend
           npm ci
           npm run build
-          npm run lint || true  # ignore linting errors for now
+          npm run lint
           if [[ $(git status --porcelain) ]]; then
               git status --porcelain
               echo "Failing CI because the working directory is not clean after linting."
@@ -61,5 +61,4 @@ jobs:
       - name: Test frontend
         run: |
           cd frontend
-          npm ci
           npm run test

From 78266267c6c4ef48b1bb801f9bfb7da8c5c423a7 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 23 Feb 2025 10:48:30 +0000
Subject: [PATCH 241/761] Format

---
 .github/workflows/publish-plugin.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/publish-plugin.yml b/.github/workflows/publish-plugin.yml
index 8c494b85..f1c816ff 100644
--- a/.github/workflows/publish-plugin.yml
+++ b/.github/workflows/publish-plugin.yml
@@ -23,7 +23,8 @@ jobs:
       - name: Build wasm
         run: |
           cd backend
-          rustup install nightly && rustup default nightly
+          rustup install nightly
+          rustup default nightly
           cargo install wasm-pack
           wasm-pack build --target web sync_lib
 

From eeb7999d76126f2bebec1de338a709e954ca338e Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 23 Feb 2025 11:31:03 +0000
Subject: [PATCH 242/761] Reset locks

---
 frontend/sync-client/src/sync-operations/document-locks.ts  | 5 +++++
 frontend/sync-client/src/sync-operations/syncer.ts          | 3 ++-
 .../sync-client/src/sync-operations/unrestricted-syncer.ts  | 6 +++++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/frontend/sync-client/src/sync-operations/document-locks.ts b/frontend/sync-client/src/sync-operations/document-locks.ts
index f1831f82..e8e0eb13 100644
--- a/frontend/sync-client/src/sync-operations/document-locks.ts
+++ b/frontend/sync-client/src/sync-operations/document-locks.ts
@@ -47,4 +47,9 @@ export class DocumentLocks {
 			this.locked.delete(relativePath);
 		}
 	}
+
+	public reset(): void {
+		this.locked.clear();
+		this.waiters.clear();
+	}
 }
diff --git a/frontend/sync-client/src/sync-operations/syncer.ts b/frontend/sync-client/src/sync-operations/syncer.ts
index 652d9c51..454ce5a0 100644
--- a/frontend/sync-client/src/sync-operations/syncer.ts
+++ b/frontend/sync-client/src/sync-operations/syncer.ts
@@ -157,6 +157,7 @@ export class Syncer {
 		this.remainingOperationsListeners.forEach((listener) => {
 			listener(0);
 		});
+		this.internalSyncer.reset();
 	}
 
 	private async syncRemotelyUpdatedFile(
@@ -214,7 +215,7 @@ export class Syncer {
 							);
 
 						this.logger.debug(
-							`Document ${relativePath} was not found under its current path in the database but was found under a different path ${originalFile[0]}, scheduling sync to move it`
+							`Document '${originalFile[0]}' was not found under its current path in the database but was found under a different path (${relativePath}), scheduling sync to move it`
 						);
 						return this.internalSyncer.unrestrictedSyncLocallyUpdatedFile(
 							{
diff --git a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
index 6db8b005..2ddc29f3 100644
--- a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
+++ b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
@@ -527,7 +527,11 @@ export class UnrestrictedSyncer {
 		}
 	}
 
-	public async tryIncrementVaultUpdateId(
+	public reset(): void {
+		this.locks.reset();
+	}
+
+	private async tryIncrementVaultUpdateId(
 		responseVaultUpdateId: number
 	): Promise<void> {
 		if (this.database.getLastSeenUpdateId() === responseVaultUpdateId - 1) {

From 4ed2095fd6e33a7d8e591fce76ef43f54ff5019b Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 23 Feb 2025 12:16:05 +0000
Subject: [PATCH 243/761] Dedup renamed files

---
 .../sync_server/src/server/update_document.rs | 64 ++++++++++++++++++-
 1 file changed, 62 insertions(+), 2 deletions(-)

diff --git a/backend/sync_server/src/server/update_document.rs b/backend/sync_server/src/server/update_document.rs
index 7b1d319e..c156be5d 100644
--- a/backend/sync_server/src/server/update_document.rs
+++ b/backend/sync_server/src/server/update_document.rs
@@ -8,6 +8,7 @@ use axum_extra::{
 use axum_jsonschema::Json;
 use chrono::{DateTime, Utc};
 use log::info;
+use regex::Regex;
 use schemars::JsonSchema;
 use serde::Deserialize;
 use sync_lib::{base64_to_bytes, is_file_type_mergable, merge};
@@ -19,7 +20,10 @@ use super::{
     responses::DocumentUpdateResponse,
 };
 use crate::{
-    database::models::{DocumentId, StoredDocumentVersion, VaultId, VaultUpdateId},
+    database::{
+        self, Transaction,
+        models::{DocumentId, StoredDocumentVersion, VaultId, VaultUpdateId},
+    },
     errors::{SyncServerError, client_error, not_found_error, server_error},
     utils::sanitize_path,
 };
@@ -139,6 +143,7 @@ async fn internal_update_document(
         )?;
 
     let sanitized_relative_path = sanitize_path(&relative_path);
+
     // Return the latest version if the content and path are the same as the latest
     // version
     if content == latest_version.content && sanitized_relative_path == latest_version.relative_path
@@ -165,7 +170,13 @@ async fn internal_update_document(
 
     // We can only update the relative path if we're the first one to do so
     let new_relative_path = if parent_document.relative_path == latest_version.relative_path {
-        sanitized_relative_path
+        get_deduped_file_name(
+            &state.database,
+            &vault_id,
+            &mut transaction,
+            &sanitized_relative_path,
+        )
+        .await?
     } else {
         latest_version.relative_path.clone()
     };
@@ -199,3 +210,52 @@ async fn internal_update_document(
         DocumentUpdateResponse::FastForwardUpdate(new_version.into())
     }))
 }
+
+// Only a single file can be on the same path, so we need to dedup the path
+// in case the client is trying to rename the file to an existing file's name
+// that it's unaware of.
+async fn get_deduped_file_name(
+    database: &database::Database,
+    vault_id: &VaultId,
+    transaction: &mut Transaction<'_>,
+    path: &str,
+) -> Result<String, SyncServerError> {
+    let mut parts = path.rsplitn(2, '.');
+    let (stem, extension) = match (parts.next(), parts.next()) {
+        (Some(stem), maybe_extension) => (
+            stem,
+            maybe_extension
+                .map(|ext| format!(".{ext}"))
+                .unwrap_or_default(),
+        ),
+        _ => unreachable!("Path must have at least one part"),
+    };
+
+    let regex = Regex::new(r" \((\d+)\)$").unwrap();
+    let start_number = regex
+        .captures(stem)
+        .and_then(|caps| caps.get(1))
+        .and_then(|m| m.as_str().parse::<u32>().ok())
+        .unwrap_or(0);
+
+    let clean_stem = regex.replace(stem, "").to_string();
+
+    for dedup_number in start_number.. {
+        let proposed_path = if dedup_number == 0 {
+            format!("{clean_stem}{extension}")
+        } else {
+            format!("{clean_stem} ({dedup_number}){extension}")
+        };
+
+        if database
+            .get_latest_document_by_path(vault_id, &proposed_path, Some(transaction))
+            .await
+            .map_err(server_error)?
+            .is_none()
+        {
+            return Ok(proposed_path.to_string());
+        }
+    }
+
+    unreachable!("Loop must always return a value");
+}

From 1f4ea3091aa6280896309f39946b6ccc4f550aa2 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 23 Feb 2025 13:56:29 +0000
Subject: [PATCH 244/761] Add regex crate

---
 backend/Cargo.lock             | 1 +
 backend/sync_server/Cargo.toml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 2cc616b2..3cce7cfc 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -2441,6 +2441,7 @@ dependencies = [
  "log",
  "rand",
  "reconcile",
+ "regex",
  "sanitize-filename",
  "schemars",
  "serde",
diff --git a/backend/sync_server/Cargo.toml b/backend/sync_server/Cargo.toml
index 0ea4bc31..8b14c450 100644
--- a/backend/sync_server/Cargo.toml
+++ b/backend/sync_server/Cargo.toml
@@ -32,6 +32,7 @@ tracing = "0.1.41"
 rand = "0.8.5"
 sanitize-filename = "0.6.0"
 axum-jsonschema = { version = "0.8.0", features = ["aide"] }
+regex = "1.11.1"
 
 [lints]
 workspace = true

From 0ab89ccf01041eacf60f0fb2b06b8b969001625b Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 23 Feb 2025 13:56:37 +0000
Subject: [PATCH 245/761] Fix dedup logic

---
 backend/sync_server/src/server/update_document.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/backend/sync_server/src/server/update_document.rs b/backend/sync_server/src/server/update_document.rs
index c156be5d..3327fd1a 100644
--- a/backend/sync_server/src/server/update_document.rs
+++ b/backend/sync_server/src/server/update_document.rs
@@ -220,8 +220,9 @@ async fn get_deduped_file_name(
     transaction: &mut Transaction<'_>,
     path: &str,
 ) -> Result<String, SyncServerError> {
-    let mut parts = path.rsplitn(2, '.');
-    let (stem, extension) = match (parts.next(), parts.next()) {
+    let parts = path.rsplitn(2, '.').collect::<Vec<_>>();
+    let mut reverse_parts = parts.into_iter().rev();
+    let (stem, extension) = match (reverse_parts.next(), reverse_parts.next()) {
         (Some(stem), maybe_extension) => (
             stem,
             maybe_extension

From c5075b6bea1c5075c43396dc9e122d14e2b281a6 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 23 Feb 2025 13:56:46 +0000
Subject: [PATCH 246/761] Fix comments

---
 .../reconcile/src/operation_transformation/edited_text.rs | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/backend/reconcile/src/operation_transformation/edited_text.rs b/backend/reconcile/src/operation_transformation/edited_text.rs
index 3e8162ab..32bda1b2 100644
--- a/backend/reconcile/src/operation_transformation/edited_text.rs
+++ b/backend/reconcile/src/operation_transformation/edited_text.rs
@@ -191,7 +191,7 @@ where
     pub fn merge(self, other: Self) -> Self {
         debug_assert_eq!(
             self.text, other.text,
-            "EditedTexts must be derived from the same text to be mergable"
+            "EditedText-s must be derived from the same text to be mergable"
         );
 
         let mut left_merge_context = MergeContext::default();
@@ -232,12 +232,6 @@ where
     }
 
     /// Apply the operations to the text and return the resulting text.
-    ///
-    /// # Errors
-    ///
-    /// Returns an `SyncLibError::OperationError` if the operations cannot be
-    /// applied to the text.
-    #[must_use]
     pub fn apply(&self) -> String {
         let mut builder: StringBuilder<'_> = StringBuilder::new(self.text);
 

From c5a89f52051f9319e4f7dcc3826fa2dd9e4fe097 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 23 Feb 2025 14:12:42 +0000
Subject: [PATCH 247/761] Fix path deduping again

---
 backend/sync_server/src/server/update_document.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/backend/sync_server/src/server/update_document.rs b/backend/sync_server/src/server/update_document.rs
index 3327fd1a..809a7ce4 100644
--- a/backend/sync_server/src/server/update_document.rs
+++ b/backend/sync_server/src/server/update_document.rs
@@ -169,7 +169,9 @@ async fn internal_update_document(
     let is_different_from_request_content = merged_content != content;
 
     // We can only update the relative path if we're the first one to do so
-    let new_relative_path = if parent_document.relative_path == latest_version.relative_path {
+    let new_relative_path = if parent_document.relative_path == latest_version.relative_path
+        && latest_version.relative_path != sanitized_relative_path
+    {
         get_deduped_file_name(
             &state.database,
             &vault_id,

From 36633dfbcb99d1a38e643fc34bd369521b43af1f Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 23 Feb 2025 14:13:40 +0000
Subject: [PATCH 248/761] Add comments

---
 frontend/sync-client/src/sync-client.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts
index 8cac7fa2..7361c73c 100644
--- a/frontend/sync-client/src/sync-client.ts
+++ b/frontend/sync-client/src/sync-client.ts
@@ -67,6 +67,7 @@ export class SyncClient {
 			settings: undefined,
 			database: undefined
 		};
+
 		const database = new Database(
 			logger,
 			state.database,
@@ -136,6 +137,9 @@ export class SyncClient {
 		return this._syncService.checkConnection();
 	}
 
+	/// Wait for the in-flight operations to finish, reset all tracking,
+	/// and the local database but retain the settings.
+	/// The SyncClient can be used again after calling this method.
 	public async reset(): Promise<void> {
 		await this._syncer.reset();
 		this._history.reset();
@@ -143,6 +147,7 @@ export class SyncClient {
 		this.logger.reset();
 	}
 
+	/// Clear all global state that has been touched by SyncClient.
 	public stop(): void {
 		if (this.remoteListenerIntervalId !== null) {
 			clearInterval(this.remoteListenerIntervalId);

From cb3ffde342743dbbdd1b68561b7763301f0585a2 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 23 Feb 2025 14:14:33 +0000
Subject: [PATCH 249/761] Improve testing

---
 frontend/test-client/src/agent/mock-agent.ts  | 249 +++++++++++-------
 frontend/test-client/src/agent/mock-client.ts |  18 +-
 frontend/test-client/src/cli.ts               | 143 +++++-----
 3 files changed, 244 insertions(+), 166 deletions(-)

diff --git a/frontend/test-client/src/agent/mock-agent.ts b/frontend/test-client/src/agent/mock-agent.ts
index f6b767a7..dc0fb6f4 100644
--- a/frontend/test-client/src/agent/mock-agent.ts
+++ b/frontend/test-client/src/agent/mock-agent.ts
@@ -1,7 +1,7 @@
 import { choose } from "../utils/choose";
 import { v4 as uuidv4 } from "uuid";
 import { assert } from "../utils/assert";
-import type { SyncSettings } from "sync-client";
+import type { RelativePath, SyncSettings } from "sync-client";
 import { LogLevel } from "sync-client";
 import { MockClient } from "./mock-client";
 import chalk from "chalk";
@@ -9,15 +9,15 @@ import chalk from "chalk";
 export class MockAgent extends MockClient {
 	private readonly writtenContents: string[] = [];
 	private readonly pendingActions: Promise<unknown>[] = [];
+	private doNotTouch: string[] = [];
 
 	public constructor(
-		globalFiles: Record<string, Uint8Array>,
 		initialSettings: Partial<SyncSettings>,
 		public readonly name: string,
 		private readonly color: string,
 		private readonly doDeletes: boolean
 	) {
-		super(globalFiles, initialSettings);
+		super(initialSettings);
 	}
 
 	public async init(): Promise<void> {
@@ -49,86 +49,34 @@ export class MockAgent extends MockClient {
 
 	public async act(): Promise<void> {
 		const options: (() => Promise<unknown>)[] = [
-			async (): Promise<unknown> => {
-				const file = this.getFileName();
-
-				if (await this.exists(file)) {
-					return;
-				}
-
-				this.client.logger.info(`Decided to create file ${file}`);
-				return this.create(
-					file,
-					new TextEncoder().encode(this.getContent())
-				);
-			},
-			async (): Promise<unknown> => {
-				this.client.logger.info(
-					`Decided to change fetchChangesUpdateIntervalMs`
-				);
-				return this.client.settings.setSetting(
-					"fetchChangesUpdateIntervalMs",
-					Math.random() * 1000
-				);
-			},
-			async (): Promise<unknown> => {
-				this.client.logger.info(`Decided to disable sync`);
-				return this.client.settings.setSetting("isSyncEnabled", false);
-			},
-			async (): Promise<unknown> => {
-				this.client.logger.info(`Decided to enable sync`);
-				return this.client.settings.setSetting("isSyncEnabled", true);
-			}
+			this.createFileAction.bind(this),
+			this.changeFetchChangesUpdateIntervalMsAction.bind(this),
+			this.disableSyncAction.bind(this),
+			this.enableSyncAction.bind(this)
 		];
 
 		const files = await this.listAllFiles();
 
 		if (files.length > 0) {
 			options.push(
-				async (): Promise<unknown> => {
-					const file = choose(files);
-					const newName = this.getFileName();
-
-					if (await this.exists(newName)) {
-						return;
-					}
-
-					this.client.logger.info(
-						`Decided to rename file ${file} to ${newName}`
-					);
-					return this.rename(file, newName);
-				},
-				async (): Promise<unknown> => {
-					const file = choose(files);
-
-					this.client.logger.info(`Decided to update file ${file}`);
-					return this.atomicUpdateText(
-						file,
-						(old) => old + " " + this.getContent()
-					);
-				}
+				this.renameFileAction.bind(this, files),
+				this.updateFileAction.bind(this, files)
 			);
 
 			if (this.doDeletes) {
-				options.push(async (): Promise<unknown> => {
-					const file = choose(files);
-					this.client.logger.info(`Decided to delete file ${file}`);
-					return this.delete(file);
-				});
+				options.push(this.deleteFileAction.bind(this, files));
 			}
 		}
 
 		this.pendingActions.push(
-			(() => {
+			(async (): Promise<unknown> => {
 				try {
-					return choose(options)();
+					return await choose(options)();
 				} catch (error) {
 					this.client.logger.error(
 						`Failed to perform an action: ${error}`
 					);
-					this.client.logger.info(
-						JSON.stringify(JSON.parse(this.data as any), null, 2)
-					);
+					this.client.logger.info(JSON.stringify(this.data, null, 2));
 					this.client.logger.info(
 						JSON.stringify(this.localFiles, null, 2)
 					);
@@ -141,71 +89,180 @@ export class MockAgent extends MockClient {
 	public async finish(): Promise<void> {
 		await Promise.all(this.pendingActions);
 		await this.client.settings.setSetting("isSyncEnabled", true);
-		await this.client.syncer.applyRemoteChangesLocally();
 		await this.client.syncer.waitForSyncQueue();
+		await this.client.syncer.applyRemoteChangesLocally();
 		this.client.stop();
 	}
 
-	public assertFileSystemIsConsistent(): void {
-		const globalFiles = Object.keys(this.globalFiles);
-		const localFiles = Object.keys(this.localFiles);
+	public assertFileSystemsAreConsistent(otherAgent: MockAgent): void {
+		const globalFiles = Array.from(otherAgent.localFiles.keys());
+		const localFiles = Array.from(this.localFiles.keys());
 
-		const missingInGlobal = localFiles.filter(
-			(file) => !(file in this.globalFiles)
+		const missingInOther = localFiles.filter(
+			(file) => !otherAgent.localFiles.has(file)
 		);
 		const missingInLocal = globalFiles.filter(
-			(file) => !(file in this.localFiles)
+			(file) => !this.localFiles.has(file)
 		);
 
-		assert(
-			missingInGlobal.length === 0,
-			`Files missing in global files: ${missingInGlobal.join(", ")}`
-		);
-		assert(
-			missingInLocal.length === 0,
-			`Files missing in local files: ${missingInLocal.join(", ")}`
-		);
-
-		for (const file of globalFiles) {
-			const localContent = new TextDecoder().decode(
-				this.localFiles[file]
-			);
-			const globalContent = new TextDecoder().decode(
-				this.globalFiles[file]
+		try {
+			assert(
+				missingInOther.length === 0,
+				`Files from ${this.name} missing in ${otherAgent.name}: ${missingInOther.join(", ")}`
 			);
 			assert(
-				localContent === globalContent,
-				`Content mismatch for file ${file}: ${localContent} <> ${globalContent}`
+				missingInLocal.length === 0,
+				`Files from ${otherAgent.name} missing in ${this.name}: ${missingInLocal.join(", ")}`
 			);
+
+			for (const file of globalFiles) {
+				const localContent = new TextDecoder().decode(
+					this.localFiles.get(file)
+				);
+				const otherContent = new TextDecoder().decode(
+					otherAgent.localFiles.get(file)
+				);
+				assert(
+					localContent === otherContent,
+					`Content mismatch for file ${file}:\n${localContent}\n${otherContent}`
+				);
+			}
+		} catch (e) {
+			this.client.logger.info(
+				"Local data: " + JSON.stringify(this.data, null, 2)
+			);
+			this.client.logger.info(
+				"Local files: " +
+					Array.from(otherAgent.localFiles.keys()).join(", ")
+			);
+			otherAgent.client.logger.info(
+				"Local data: " + JSON.stringify(otherAgent.data, null, 2)
+			);
+			otherAgent.client.logger.info(
+				"Local files: " +
+					Array.from(otherAgent.localFiles.keys()).join(", ")
+			);
+
+			throw e;
 		}
 	}
 
 	public assertAllContentIsPresentOnce(): void {
 		for (const content of this.writtenContents) {
-			const found = Object.values(this.localFiles).filter((file) => {
-				return new TextDecoder().decode(file).includes(content);
+			const found = Array.from(this.localFiles.keys()).filter((key) => {
+				return new TextDecoder()
+					.decode(this.localFiles.get(key))
+					.includes(content);
 			});
 
 			if (this.doDeletes) {
 				assert(
 					found.length <= 1,
-					`Content ${content} found in ${found.length} files`
+					`[${this.name}] Content ${content} found in ${found.join(", ")}`
 				);
 			} else {
 				assert(
-					found.length === 1,
-					`Content ${content} found in ${found.length} files`
+					found.length >= 1,
+					`[${this.name}] Content ${content} not found in any files`
+				);
+
+				assert(
+					found.length <= 1,
+					`[${this.name}] Content ${content} found in multiple files: ${found.join(", ")}`
 				);
 
 				const [file] = found;
+				const fileContent = new TextDecoder().decode(
+					this.localFiles.get(file)
+				);
 				assert(
-					new TextDecoder().decode(file).split(content).length === 2,
-					`Content ${content} found more than once in a file`
+					fileContent.split(content).length == 2,
+					`Content ${content} (of ${this.name}) found more than once in file ${file}. File content:\n${fileContent}`
 				);
 			}
 		}
 	}
 
+	private async createFileAction(): Promise<void> {
+		const file = this.getFileName();
+
+		if (await this.exists(file)) {
+			return;
+		}
+
+		const content = this.getContent();
+		this.client.logger.info(
+			`Decided to create file ${file} with content ${content}`
+		);
+
+		return this.create(
+			file,
+			new TextEncoder().encode(`   |${content}|   `)
+		);
+	}
+
+	private async changeFetchChangesUpdateIntervalMsAction(): Promise<void> {
+		this.client.logger.info(
+			`Decided to change fetchChangesUpdateIntervalMs`
+		);
+		return this.client.settings.setSetting(
+			"fetchChangesUpdateIntervalMs",
+			Math.random() * 1000
+		);
+	}
+
+	private async disableSyncAction(): Promise<void> {
+		this.client.logger.info(`Decided to disable sync`);
+		await this.client.settings.setSetting("isSyncEnabled", false);
+	}
+
+	private async enableSyncAction(): Promise<void> {
+		this.client.logger.info(`Decided to enable sync`);
+		await this.client.settings.setSetting("isSyncEnabled", true);
+		this.doNotTouch = [];
+	}
+
+	private async renameFileAction(files: RelativePath[]): Promise<void> {
+		const file = choose(files);
+		const newName = this.getFileName();
+
+		if (await this.exists(newName)) {
+			return;
+		}
+
+		this.client.logger.info(`Decided to rename file ${file} to ${newName}`);
+		if (!this.client.settings.getSettings().isSyncEnabled) {
+			this.doNotTouch.push(newName);
+		}
+
+		return this.rename(file, newName);
+	}
+
+	private async updateFileAction(files: RelativePath[]): Promise<void> {
+		const file = choose(files);
+
+		// We can't edit files offline that have been renamed while offline.
+		// Othwersie, the resolution logic couldn't handle it.
+		if (this.doNotTouch.includes(file)) {
+			this.client.logger.info(
+				`Skipping file ${file} because it has been renamed while offline`
+			);
+			return;
+		}
+
+		const content = this.getContent();
+		this.client.logger.info(
+			`Decided to update file ${file} with ${content}`
+		);
+		await this.atomicUpdateText(file, (old) => old + `   |${content}|   `);
+	}
+
+	private async deleteFileAction(files: RelativePath[]): Promise<void> {
+		const file = choose(files);
+		this.client.logger.info(`Decided to delete file ${file}`);
+		return this.delete(file);
+	}
+
 	private getContent(): string {
 		const uuid = uuidv4();
 		this.writtenContents.push(uuid);
diff --git a/frontend/test-client/src/agent/mock-client.ts b/frontend/test-client/src/agent/mock-client.ts
index 6dc54076..07570ab1 100644
--- a/frontend/test-client/src/agent/mock-client.ts
+++ b/frontend/test-client/src/agent/mock-client.ts
@@ -23,12 +23,10 @@ export class MockClient implements FileSystemOperations {
 
 		await Promise.all(
 			Object.keys(this.initialSettings).map(async (key) => {
-				if (key in this.client.settings) {
-					return this.client.settings.setSetting(
-						key as keyof SyncSettings, // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
-						this.initialSettings[key as keyof SyncSettings] // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
-					);
-				}
+				return this.client.settings.setSetting(
+					key as keyof SyncSettings, // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+					this.initialSettings[key as keyof SyncSettings] // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+				);
 			})
 		);
 
@@ -93,6 +91,10 @@ export class MockClient implements FileSystemOperations {
 		const newContentUint8Array = new TextEncoder().encode(newContent);
 		this.localFiles.set(path, newContentUint8Array);
 
+		this.client.logger.info(
+			`Updated file ${path} with:\n  current content: ${currentContent}\n  new content: ${newContent}`
+		);
+
 		void this.client.syncer.syncLocallyUpdatedFile({
 			relativePath: path,
 			updateTime: new Date()
@@ -104,6 +106,10 @@ export class MockClient implements FileSystemOperations {
 	public async write(path: RelativePath, content: Uint8Array): Promise<void> {
 		this.localFiles.set(path, content);
 
+		this.client.logger.info(
+			`Updated file ${path} with:\n  new content: ${new TextDecoder().decode(content)}`
+		);
+
 		void this.client.syncer.syncLocallyUpdatedFile({
 			relativePath: path,
 			updateTime: new Date()
diff --git a/frontend/test-client/src/cli.ts b/frontend/test-client/src/cli.ts
index 3c0c8d45..01fdf03c 100644
--- a/frontend/test-client/src/cli.ts
+++ b/frontend/test-client/src/cli.ts
@@ -3,87 +3,102 @@ import { MockAgent } from "./agent/mock-agent";
 import { sleep } from "./utils/sleep";
 import { v4 as uuidv4 } from "uuid";
 
-const globalFiles: Record<string, Uint8Array> = {};
-const iterations = 100;
-const doDeletes = false;
-
-async function runTest(): Promise<void> {
-	console.info("Starting test");
+async function runTest({
+	agentCount,
+	concurrency,
+	iterations,
+	doDeletes
+}: {
+	agentCount: number;
+	concurrency: number;
+	iterations: number;
+	doDeletes: boolean;
+}): Promise<void> {
+	console.info(
+		`Running test with ${agentCount} agents, concurrency ${concurrency}, iterations ${iterations}, doDeletes ${doDeletes}`
+	);
 
 	const initialSettings: Partial<SyncSettings> = {
 		isSyncEnabled: true,
 		token: "token",
 		vaultName: uuidv4(),
+		syncConcurrency: concurrency,
 		remoteUri: "http://localhost:3030"
 	};
 
-	const clients = [
-		new MockAgent(
-			globalFiles,
-			initialSettings,
-			"agent-1",
-			"#ff0000",
-			doDeletes
-		),
-		new MockAgent(
-			globalFiles,
-			initialSettings,
-			"agent-2",
-			"#00ff00",
-			doDeletes
-		),
-		new MockAgent(
-			globalFiles,
-			initialSettings,
-			"agent-3",
-			"#0000ff",
-			doDeletes
-		),
-		new MockAgent(
-			globalFiles,
-			initialSettings,
-			"agent-4",
-			"#ffaa00",
-			doDeletes
-		),
-		new MockAgent(
-			globalFiles,
-			initialSettings,
-			"agent-5",
-			"#00ffaa",
-			doDeletes
-		)
-	];
-
-	await Promise.all(clients.map(async (client) => client.init()));
-
-	for (let i = 0; i < iterations; i++) {
-		await Promise.all(clients.map(async (client) => client.act()));
-		await sleep(100);
+	const clients: MockAgent[] = [];
+	for (let i = 0; i < agentCount; i++) {
+		clients.push(
+			new MockAgent(initialSettings, `agent-${i}`, "#ff0000", doDeletes)
+		);
 	}
 
-	await Promise.all(clients.map(async (client) => client.finish()));
+	try {
+		await Promise.all(clients.map(async (client) => client.init()));
 
-	console.info("Agents finished successfully");
+		for (let i = 0; i < iterations; i++) {
+			console.info(`Iteration ${i + 1}/${iterations}`);
+			await Promise.all(clients.map(async (client) => client.act()));
+			await sleep(100);
+		}
 
-	clients.forEach((client) => {
-		console.info(`Checking consistency for ${client.name}`);
-		client.assertFileSystemIsConsistent();
-		console.info(`Consistency check for ${client.name} passed`);
-	});
+		for (const client of clients) {
+			// todo: make it less hacky
+			await client.finish();
+		}
 
-	console.info("File systems found to be consistent");
+		console.info("Agents finished successfully");
 
-	clients.forEach((client) => {
-		console.info(`Checking content for ${client.name}`);
-		client.assertAllContentIsPresentOnce();
-		console.info(`Content check for ${client.name} passed`);
-	});
+		clients.slice(0, -1).forEach((client, i) => {
+			console.info(
+				`Checking consistency between ${client.name} and ${clients[i + 1].name}`
+			);
+			client.assertFileSystemsAreConsistent(clients[i]);
+			console.info(`Consistency check for ${client.name} passed`);
+		});
 
-	console.info("Test completed successfully");
+		console.info("File systems found to be consistent");
+
+		clients.forEach((client) => {
+			console.info(`Checking content for ${client.name}`);
+			client.assertAllContentIsPresentOnce();
+			console.info(`Content check for ${client.name} passed`);
+		});
+
+		console.info(
+			`Test passed with ${agentCount} agents, concurrency ${concurrency}, iterations ${iterations}, doDeletes ${doDeletes}`
+		);
+	} catch (err) {
+		console.error(
+			`Test failed with ${agentCount} agents, concurrency ${concurrency}, iterations ${iterations}, doDeletes ${doDeletes}`
+		);
+		throw err;
+	}
 }
 
-runTest()
+async function runTests(): Promise<void> {
+	const agentCounts = [2, 10];
+	const concurrencies = [1, 16];
+	const iterations = [300];
+	const doDeletes = [false, true];
+
+	for (const agentCount of agentCounts) {
+		for (const concurrency of concurrencies) {
+			for (const iteration of iterations) {
+				for (const deleteFiles of doDeletes) {
+					await runTest({
+						agentCount,
+						concurrency,
+						iterations: iteration,
+						doDeletes: deleteFiles
+					});
+				}
+			}
+		}
+	}
+}
+
+runTests()
 	.then(() => {
 		process.exit(0);
 	})

From abba023c20002c82c441460d7183c0791a4532bd Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 23 Feb 2025 14:47:20 +0000
Subject: [PATCH 250/761] Gate settings updates

---
 .../sync-client/src/services/sync-service.ts     | 16 +++++++++++-----
 .../sync-client/src/sync-operations/syncer.ts    |  5 ++++-
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/frontend/sync-client/src/services/sync-service.ts b/frontend/sync-client/src/services/sync-service.ts
index daf21a24..392a4d21 100644
--- a/frontend/sync-client/src/services/sync-service.ts
+++ b/frontend/sync-client/src/services/sync-service.ts
@@ -23,9 +23,15 @@ export class SyncService {
 		private readonly settings: Settings,
 		private readonly logger: Logger
 	) {
-		this.createClient(settings.getSettings());
+		this.createClient(settings.getSettings().remoteUri);
 
-		settings.addOnSettingsChangeHandlers(this.createClient.bind(this));
+		settings.addOnSettingsChangeHandlers((newSettings, oldSettings) => {
+			if (newSettings.remoteUri === oldSettings.remoteUri) {
+				return;
+			}
+
+			this.createClient(newSettings.remoteUri);
+		});
 	}
 
 	private static formatError(
@@ -281,14 +287,14 @@ export class SyncService {
 		return response.data;
 	}
 
-	private createClient(settings: SyncSettings): void {
+	private createClient(remoteUri: string): void {
 		this.client = createClient<paths>({
-			baseUrl: settings.remoteUri,
+			baseUrl: remoteUri,
 			fetch: retriedFetchFactory(this.logger)
 		});
 
 		this.clientWithoutRetries = createClient<paths>({
-			baseUrl: settings.remoteUri
+			baseUrl: remoteUri
 		});
 	}
 }
diff --git a/frontend/sync-client/src/sync-operations/syncer.ts b/frontend/sync-client/src/sync-operations/syncer.ts
index 454ce5a0..2ca399a6 100644
--- a/frontend/sync-client/src/sync-operations/syncer.ts
+++ b/frontend/sync-client/src/sync-operations/syncer.ts
@@ -37,7 +37,10 @@ export class Syncer {
 			concurrency: settings.getSettings().syncConcurrency
 		});
 
-		settings.addOnSettingsChangeHandlers((newSettings) => {
+		settings.addOnSettingsChangeHandlers((newSettings, oldSettings) => {
+			if (newSettings.syncConcurrency === oldSettings.syncConcurrency) {
+				return;
+			}
 			this.syncQueue.concurrency = newSettings.syncConcurrency;
 		});
 

From ff5b987688119446dc5a30d16b1a734d5c9f9047 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 23 Feb 2025 14:47:30 +0000
Subject: [PATCH 251/761] Improve debugging

---
 frontend/test-client/src/agent/mock-client.ts | 10 ++++++++++
 frontend/test-client/src/cli.ts               |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/frontend/test-client/src/agent/mock-client.ts b/frontend/test-client/src/agent/mock-client.ts
index 07570ab1..83cec36b 100644
--- a/frontend/test-client/src/agent/mock-client.ts
+++ b/frontend/test-client/src/agent/mock-client.ts
@@ -70,6 +70,9 @@ export class MockClient implements FileSystemOperations {
 		if (this.localFiles.has(path)) {
 			throw new Error(`File ${path} already exists`);
 		}
+		this.client.logger.info(
+			`Creating file ${path} with content ${new TextDecoder().decode(newContent)}`
+		);
 		this.localFiles.set(path, newContent);
 		void this.client.syncer.syncLocallyCreatedFile(path, new Date());
 	}
@@ -117,6 +120,9 @@ export class MockClient implements FileSystemOperations {
 	}
 
 	public async delete(path: RelativePath): Promise<void> {
+		this.client.logger.info(
+			`Deleting file: ${path} with:\n  content ${new TextDecoder().decode(this.localFiles.get(path))}`
+		);
 		this.localFiles.delete(path);
 		void this.client.syncer.syncLocallyDeletedFile(path);
 	}
@@ -134,6 +140,10 @@ export class MockClient implements FileSystemOperations {
 			this.localFiles.delete(oldPath);
 		}
 
+		this.client.logger.info(
+			`Renamed file: ${oldPath} -> ${newPath} with:\n  content ${new TextDecoder().decode(file)}`
+		);
+
 		void this.client.syncer.syncLocallyUpdatedFile({
 			oldPath,
 			relativePath: newPath,
diff --git a/frontend/test-client/src/cli.ts b/frontend/test-client/src/cli.ts
index 01fdf03c..b6f4ebac 100644
--- a/frontend/test-client/src/cli.ts
+++ b/frontend/test-client/src/cli.ts
@@ -79,7 +79,7 @@ async function runTest({
 async function runTests(): Promise<void> {
 	const agentCounts = [2, 10];
 	const concurrencies = [1, 16];
-	const iterations = [300];
+	const iterations = [50, 300];
 	const doDeletes = [false, true];
 
 	for (const agentCount of agentCounts) {

From b4783d1007aa61b07a43835eef7b3a27ef854102 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 23 Feb 2025 16:19:19 +0000
Subject: [PATCH 252/761] Bump deps & fix compile

---
 frontend/obsidian-plugin/package.json      |     5 +-
 frontend/obsidian-plugin/webpack.config.js |     3 +
 frontend/package-lock.json                 | 14357 +++++++++----------
 frontend/package.json                      |     4 +-
 frontend/sync-client/package.json          |     6 +-
 frontend/sync-client/webpack.config.js     |     2 +-
 6 files changed, 6784 insertions(+), 7593 deletions(-)

diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index 49df8e44..30fad71d 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -14,7 +14,7 @@
 	"license": "MIT",
 	"devDependencies": {
 		"@types/jest": "^29.5.14",
-		"@types/node": "^22.13.4",
+		"@types/node": "^22.13.5",
 		"css-loader": "^7.1.2",
 		"date-fns": "^4.1.0",
 		"file-loader": "^6.2.0",
@@ -27,10 +27,11 @@
 		"sass-loader": "^16.0.5",
 		"sync-client": "file:../sync-client",
 		"terser-webpack-plugin": "^5.3.11",
-		"ts-jest": "^29.2.5",
+		"ts-jest": "^29.2.6",
 		"ts-loader": "^9.5.2",
 		"tslib": "2.8.1",
 		"typescript": "5.7.3",
+		"url": "^0.11.4",
 		"virtual-scroller": "^1.13.1",
 		"webpack": "^5.98.0",
 		"webpack-cli": "^6.0.1"
diff --git a/frontend/obsidian-plugin/webpack.config.js b/frontend/obsidian-plugin/webpack.config.js
index 7e05101d..72059dcc 100644
--- a/frontend/obsidian-plugin/webpack.config.js
+++ b/frontend/obsidian-plugin/webpack.config.js
@@ -98,6 +98,9 @@ module.exports = (env, argv) => ({
 		alias: {
 			root: __dirname,
 			src: path.resolve(__dirname, "src")
+		},
+		fallback: {
+			url: require.resolve("url")
 		}
 	},
 	output: {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 6141bcb8..400ad400 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,7587 +1,6774 @@
 {
-    "name": "my-workspace",
-    "lockfileVersion": 3,
-    "requires": true,
-    "packages": {
-        "": {
-            "name": "my-workspace",
-            "workspaces": [
-                "sync-client",
-                "obsidian-plugin"
-            ],
-            "devDependencies": {
-                "concurrently": "^9.1.2",
-                "eslint": "9.20.1",
-                "eslint-plugin-unused-imports": "^4.1.4",
-                "npm-check-updates": "^17.1.14",
-                "prettier": "^3.5.1",
-                "typescript-eslint": "8.24.1"
-            }
-        },
-        "../backend/sync_lib/pkg": {
-            "name": "sync_lib",
-            "version": "0.0.30",
-            "dev": true,
-            "license": "MIT"
-        },
-        "backend/sync_lib/pkg": {
-            "name": "sync_lib",
-            "version": "0.0.30",
-            "extraneous": true,
-            "license": "MIT"
-        },
-        "node_modules/@ampproject/remapping": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
-            "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
-            "dev": true,
-            "license": "Apache-2.0",
-            "dependencies": {
-                "@jridgewell/gen-mapping": "^0.3.5",
-                "@jridgewell/trace-mapping": "^0.3.24"
-            },
-            "engines": {
-                "node": ">=6.0.0"
-            }
-        },
-        "node_modules/@babel/code-frame": {
-            "version": "7.26.2",
-            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz",
-            "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@babel/helper-validator-identifier": "^7.25.9",
-                "js-tokens": "^4.0.0",
-                "picocolors": "^1.0.0"
-            },
-            "engines": {
-                "node": ">=6.9.0"
-            }
-        },
-        "node_modules/@babel/compat-data": {
-            "version": "7.26.8",
-            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.8.tgz",
-            "integrity": "sha512-oH5UPLMWR3L2wEFLnFJ1TZXqHufiTKAiLfqw5zkhS4dKXLJ10yVztfil/twG8EDTA4F/tvVNw9nOl4ZMslB8rQ==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=6.9.0"
-            }
-        },
-        "node_modules/@babel/core": {
-            "version": "7.26.9",
-            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.9.tgz",
-            "integrity": "sha512-lWBYIrF7qK5+GjY5Uy+/hEgp8OJWOD/rpy74GplYRhEauvbHDeFB8t5hPOZxCZ0Oxf4Cc36tK51/l3ymJysrKw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@ampproject/remapping": "^2.2.0",
-                "@babel/code-frame": "^7.26.2",
-                "@babel/generator": "^7.26.9",
-                "@babel/helper-compilation-targets": "^7.26.5",
-                "@babel/helper-module-transforms": "^7.26.0",
-                "@babel/helpers": "^7.26.9",
-                "@babel/parser": "^7.26.9",
-                "@babel/template": "^7.26.9",
-                "@babel/traverse": "^7.26.9",
-                "@babel/types": "^7.26.9",
-                "convert-source-map": "^2.0.0",
-                "debug": "^4.1.0",
-                "gensync": "^1.0.0-beta.2",
-                "json5": "^2.2.3",
-                "semver": "^6.3.1"
-            },
-            "engines": {
-                "node": ">=6.9.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/babel"
-            }
-        },
-        "node_modules/@babel/core/node_modules/semver": {
-            "version": "6.3.1",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-            "dev": true,
-            "license": "ISC",
-            "bin": {
-                "semver": "bin/semver.js"
-            }
-        },
-        "node_modules/@babel/generator": {
-            "version": "7.26.9",
-            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.9.tgz",
-            "integrity": "sha512-kEWdzjOAUMW4hAyrzJ0ZaTOu9OmpyDIQicIh0zg0EEcEkYXZb2TjtBhnHi2ViX7PKwZqF4xwqfAm299/QMP3lg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@babel/parser": "^7.26.9",
-                "@babel/types": "^7.26.9",
-                "@jridgewell/gen-mapping": "^0.3.5",
-                "@jridgewell/trace-mapping": "^0.3.25",
-                "jsesc": "^3.0.2"
-            },
-            "engines": {
-                "node": ">=6.9.0"
-            }
-        },
-        "node_modules/@babel/helper-compilation-targets": {
-            "version": "7.26.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.26.5.tgz",
-            "integrity": "sha512-IXuyn5EkouFJscIDuFF5EsiSolseme1s0CZB+QxVugqJLYmKdxI1VfIBOst0SUu4rnk2Z7kqTwmoO1lp3HIfnA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@babel/compat-data": "^7.26.5",
-                "@babel/helper-validator-option": "^7.25.9",
-                "browserslist": "^4.24.0",
-                "lru-cache": "^5.1.1",
-                "semver": "^6.3.1"
-            },
-            "engines": {
-                "node": ">=6.9.0"
-            }
-        },
-        "node_modules/@babel/helper-compilation-targets/node_modules/semver": {
-            "version": "6.3.1",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-            "dev": true,
-            "license": "ISC",
-            "bin": {
-                "semver": "bin/semver.js"
-            }
-        },
-        "node_modules/@babel/helper-module-imports": {
-            "version": "7.25.9",
-            "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz",
-            "integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@babel/traverse": "^7.25.9",
-                "@babel/types": "^7.25.9"
-            },
-            "engines": {
-                "node": ">=6.9.0"
-            }
-        },
-        "node_modules/@babel/helper-module-transforms": {
-            "version": "7.26.0",
-            "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz",
-            "integrity": "sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@babel/helper-module-imports": "^7.25.9",
-                "@babel/helper-validator-identifier": "^7.25.9",
-                "@babel/traverse": "^7.25.9"
-            },
-            "engines": {
-                "node": ">=6.9.0"
-            },
-            "peerDependencies": {
-                "@babel/core": "^7.0.0"
-            }
-        },
-        "node_modules/@babel/helper-plugin-utils": {
-            "version": "7.26.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.26.5.tgz",
-            "integrity": "sha512-RS+jZcRdZdRFzMyr+wcsaqOmld1/EqTghfaBGQQd/WnRdzdlvSZ//kF7U8VQTxf1ynZ4cjUcYgjVGx13ewNPMg==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=6.9.0"
-            }
-        },
-        "node_modules/@babel/helper-string-parser": {
-            "version": "7.25.9",
-            "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
-            "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=6.9.0"
-            }
-        },
-        "node_modules/@babel/helper-validator-identifier": {
-            "version": "7.25.9",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
-            "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=6.9.0"
-            }
-        },
-        "node_modules/@babel/helper-validator-option": {
-            "version": "7.25.9",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz",
-            "integrity": "sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=6.9.0"
-            }
-        },
-        "node_modules/@babel/helpers": {
-            "version": "7.26.9",
-            "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.9.tgz",
-            "integrity": "sha512-Mz/4+y8udxBKdmzt/UjPACs4G3j5SshJJEFFKxlCGPydG4JAHXxjWjAwjd09tf6oINvl1VfMJo+nB7H2YKQ0dA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@babel/template": "^7.26.9",
-                "@babel/types": "^7.26.9"
-            },
-            "engines": {
-                "node": ">=6.9.0"
-            }
-        },
-        "node_modules/@babel/parser": {
-            "version": "7.26.9",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.9.tgz",
-            "integrity": "sha512-81NWa1njQblgZbQHxWHpxxCzNsa3ZwvFqpUg7P+NNUU6f3UU2jBEg4OlF/J6rl8+PQGh1q6/zWScd001YwcA5A==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@babel/types": "^7.26.9"
-            },
-            "bin": {
-                "parser": "bin/babel-parser.js"
-            },
-            "engines": {
-                "node": ">=6.0.0"
-            }
-        },
-        "node_modules/@babel/plugin-syntax-async-generators": {
-            "version": "7.8.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
-            "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@babel/helper-plugin-utils": "^7.8.0"
-            },
-            "peerDependencies": {
-                "@babel/core": "^7.0.0-0"
-            }
-        },
-        "node_modules/@babel/plugin-syntax-bigint": {
-            "version": "7.8.3",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
-            "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@babel/helper-plugin-utils": "^7.8.0"
-            },
-            "peerDependencies": {
-                "@babel/core": "^7.0.0-0"
-            }
-        },
-        "node_modules/@babel/plugin-syntax-class-properties": {
-            "version": "7.12.13",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
-            "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@babel/helper-plugin-utils": "^7.12.13"
-            },
-            "peerDependencies": {
-                "@babel/core": "^7.0.0-0"
-            }
-        },
-        "node_modules/@babel/plugin-syntax-class-static-block": {
-            "version": "7.14.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
-            "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@babel/helper-plugin-utils": "^7.14.5"
-            },
-            "engines": {
-                "node": ">=6.9.0"
-            },
-            "peerDependencies": {
-                "@babel/core": "^7.0.0-0"
-            }
-        },
-        "node_modules/@babel/plugin-syntax-import-attributes": {
-            "version": "7.26.0",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.26.0.tgz",
-            "integrity": "sha512-e2dttdsJ1ZTpi3B9UYGLw41hifAubg19AtCu/2I/F1QNVclOBr1dYpTdmdyZ84Xiz43BS/tCUkMAZNLv12Pi+A==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@babel/helper-plugin-utils": "^7.25.9"
-            },
-            "engines": {
-                "node": ">=6.9.0"
-            },
-            "peerDependencies": {
-                "@babel/core": "^7.0.0-0"
-            }
-        },
-        "node_modules/@babel/plugin-syntax-import-meta": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
-            "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@babel/helper-plugin-utils": "^7.10.4"
-            },
-            "peerDependencies": {
-                "@babel/core": "^7.0.0-0"
-            }
-        },
-        "node_modules/@babel/plugin-syntax-json-strings": {
-            "version": "7.8.3",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
-            "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@babel/helper-plugin-utils": "^7.8.0"
-            },
-            "peerDependencies": {
-                "@babel/core": "^7.0.0-0"
-            }
-        },
-        "node_modules/@babel/plugin-syntax-jsx": {
-            "version": "7.25.9",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.25.9.tgz",
-            "integrity": "sha512-ld6oezHQMZsZfp6pWtbjaNDF2tiiCYYDqQszHt5VV437lewP9aSi2Of99CK0D0XB21k7FLgnLcmQKyKzynfeAA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@babel/helper-plugin-utils": "^7.25.9"
-            },
-            "engines": {
-                "node": ">=6.9.0"
-            },
-            "peerDependencies": {
-                "@babel/core": "^7.0.0-0"
-            }
-        },
-        "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
-            "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@babel/helper-plugin-utils": "^7.10.4"
-            },
-            "peerDependencies": {
-                "@babel/core": "^7.0.0-0"
-            }
-        },
-        "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
-            "version": "7.8.3",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
-            "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@babel/helper-plugin-utils": "^7.8.0"
-            },
-            "peerDependencies": {
-                "@babel/core": "^7.0.0-0"
-            }
-        },
-        "node_modules/@babel/plugin-syntax-numeric-separator": {
-            "version": "7.10.4",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
-            "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@babel/helper-plugin-utils": "^7.10.4"
-            },
-            "peerDependencies": {
-                "@babel/core": "^7.0.0-0"
-            }
-        },
-        "node_modules/@babel/plugin-syntax-object-rest-spread": {
-            "version": "7.8.3",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
-            "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@babel/helper-plugin-utils": "^7.8.0"
-            },
-            "peerDependencies": {
-                "@babel/core": "^7.0.0-0"
-            }
-        },
-        "node_modules/@babel/plugin-syntax-optional-catch-binding": {
-            "version": "7.8.3",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
-            "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@babel/helper-plugin-utils": "^7.8.0"
-            },
-            "peerDependencies": {
-                "@babel/core": "^7.0.0-0"
-            }
-        },
-        "node_modules/@babel/plugin-syntax-optional-chaining": {
-            "version": "7.8.3",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
-            "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@babel/helper-plugin-utils": "^7.8.0"
-            },
-            "peerDependencies": {
-                "@babel/core": "^7.0.0-0"
-            }
-        },
-        "node_modules/@babel/plugin-syntax-private-property-in-object": {
-            "version": "7.14.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
-            "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@babel/helper-plugin-utils": "^7.14.5"
-            },
-            "engines": {
-                "node": ">=6.9.0"
-            },
-            "peerDependencies": {
-                "@babel/core": "^7.0.0-0"
-            }
-        },
-        "node_modules/@babel/plugin-syntax-top-level-await": {
-            "version": "7.14.5",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
-            "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@babel/helper-plugin-utils": "^7.14.5"
-            },
-            "engines": {
-                "node": ">=6.9.0"
-            },
-            "peerDependencies": {
-                "@babel/core": "^7.0.0-0"
-            }
-        },
-        "node_modules/@babel/plugin-syntax-typescript": {
-            "version": "7.25.9",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.25.9.tgz",
-            "integrity": "sha512-hjMgRy5hb8uJJjUcdWunWVcoi9bGpJp8p5Ol1229PoN6aytsLwNMgmdftO23wnCLMfVmTwZDWMPNq/D1SY60JQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@babel/helper-plugin-utils": "^7.25.9"
-            },
-            "engines": {
-                "node": ">=6.9.0"
-            },
-            "peerDependencies": {
-                "@babel/core": "^7.0.0-0"
-            }
-        },
-        "node_modules/@babel/template": {
-            "version": "7.26.9",
-            "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.26.9.tgz",
-            "integrity": "sha512-qyRplbeIpNZhmzOysF/wFMuP9sctmh2cFzRAZOn1YapxBsE1i9bJIY586R/WBLfLcmcBlM8ROBiQURnnNy+zfA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@babel/code-frame": "^7.26.2",
-                "@babel/parser": "^7.26.9",
-                "@babel/types": "^7.26.9"
-            },
-            "engines": {
-                "node": ">=6.9.0"
-            }
-        },
-        "node_modules/@babel/traverse": {
-            "version": "7.26.9",
-            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.9.tgz",
-            "integrity": "sha512-ZYW7L+pL8ahU5fXmNbPF+iZFHCv5scFak7MZ9bwaRPLUhHh7QQEMjZUg0HevihoqCM5iSYHN61EyCoZvqC+bxg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@babel/code-frame": "^7.26.2",
-                "@babel/generator": "^7.26.9",
-                "@babel/parser": "^7.26.9",
-                "@babel/template": "^7.26.9",
-                "@babel/types": "^7.26.9",
-                "debug": "^4.3.1",
-                "globals": "^11.1.0"
-            },
-            "engines": {
-                "node": ">=6.9.0"
-            }
-        },
-        "node_modules/@babel/traverse/node_modules/globals": {
-            "version": "11.12.0",
-            "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-            "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/@babel/types": {
-            "version": "7.26.9",
-            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.9.tgz",
-            "integrity": "sha512-Y3IR1cRnOxOCDvMmNiym7XpXQ93iGDDPHx+Zj+NM+rg0fBaShfQLkg+hKPaZCEvg5N/LeCo4+Rj/i3FuJsIQaw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@babel/helper-string-parser": "^7.25.9",
-                "@babel/helper-validator-identifier": "^7.25.9"
-            },
-            "engines": {
-                "node": ">=6.9.0"
-            }
-        },
-        "node_modules/@bcoe/v8-coverage": {
-            "version": "0.2.3",
-            "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
-            "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/@codemirror/state": {
-            "version": "6.5.2",
-            "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.5.2.tgz",
-            "integrity": "sha512-FVqsPqtPWKVVL3dPSxy8wEF/ymIEuVzF1PK3VbUgrxXpJUSHQWWZz4JMToquRxnkw+36LTamCZG2iua2Ptq0fA==",
-            "dev": true,
-            "license": "MIT",
-            "peer": true,
-            "dependencies": {
-                "@marijn/find-cluster-break": "^1.0.0"
-            }
-        },
-        "node_modules/@codemirror/view": {
-            "version": "6.36.3",
-            "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.36.3.tgz",
-            "integrity": "sha512-N2bilM47QWC8Hnx0rMdDxO2x2ImJ1FvZWXubwKgjeoOrWwEiFrtpA7SFHcuZ+o2Ze2VzbkgbzWVj4+V18LVkeg==",
-            "dev": true,
-            "license": "MIT",
-            "peer": true,
-            "dependencies": {
-                "@codemirror/state": "^6.5.0",
-                "style-mod": "^4.1.0",
-                "w3c-keyname": "^2.2.4"
-            }
-        },
-        "node_modules/@discoveryjs/json-ext": {
-            "version": "0.6.3",
-            "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.6.3.tgz",
-            "integrity": "sha512-4B4OijXeVNOPZlYA2oEwWOTkzyltLao+xbotHQeqN++Rv27Y6s818+n2Qkp8q+Fxhn0t/5lA5X1Mxktud8eayQ==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=14.17.0"
-            }
-        },
-        "node_modules/@eslint-community/eslint-utils": {
-            "version": "4.4.1",
-            "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.1.tgz",
-            "integrity": "sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "eslint-visitor-keys": "^3.4.3"
-            },
-            "engines": {
-                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-            },
-            "funding": {
-                "url": "https://opencollective.com/eslint"
-            },
-            "peerDependencies": {
-                "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
-            }
-        },
-        "node_modules/@eslint-community/eslint-utils/node_modules/eslint-visitor-keys": {
-            "version": "3.4.3",
-            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
-            "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
-            "dev": true,
-            "license": "Apache-2.0",
-            "engines": {
-                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-            },
-            "funding": {
-                "url": "https://opencollective.com/eslint"
-            }
-        },
-        "node_modules/@eslint-community/regexpp": {
-            "version": "4.12.1",
-            "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz",
-            "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
-            }
-        },
-        "node_modules/@eslint/config-array": {
-            "version": "0.19.2",
-            "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.19.2.tgz",
-            "integrity": "sha512-GNKqxfHG2ySmJOBSHg7LxeUx4xpuCoFjacmlCoYWEbaPXLwvfIjixRI12xCQZeULksQb23uiA8F40w5TojpV7w==",
-            "dev": true,
-            "license": "Apache-2.0",
-            "dependencies": {
-                "@eslint/object-schema": "^2.1.6",
-                "debug": "^4.3.1",
-                "minimatch": "^3.1.2"
-            },
-            "engines": {
-                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-            }
-        },
-        "node_modules/@eslint/core": {
-            "version": "0.11.0",
-            "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.11.0.tgz",
-            "integrity": "sha512-DWUB2pksgNEb6Bz2fggIy1wh6fGgZP4Xyy/Mt0QZPiloKKXerbqq9D3SBQTlCRYOrcRPu4vuz+CGjwdfqxnoWA==",
-            "dev": true,
-            "license": "Apache-2.0",
-            "dependencies": {
-                "@types/json-schema": "^7.0.15"
-            },
-            "engines": {
-                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-            }
-        },
-        "node_modules/@eslint/eslintrc": {
-            "version": "3.2.0",
-            "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.2.0.tgz",
-            "integrity": "sha512-grOjVNN8P3hjJn/eIETF1wwd12DdnwFDoyceUJLYYdkpbwq3nLi+4fqrTAONx7XDALqlL220wC/RHSC/QTI/0w==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "ajv": "^6.12.4",
-                "debug": "^4.3.2",
-                "espree": "^10.0.1",
-                "globals": "^14.0.0",
-                "ignore": "^5.2.0",
-                "import-fresh": "^3.2.1",
-                "js-yaml": "^4.1.0",
-                "minimatch": "^3.1.2",
-                "strip-json-comments": "^3.1.1"
-            },
-            "engines": {
-                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-            },
-            "funding": {
-                "url": "https://opencollective.com/eslint"
-            }
-        },
-        "node_modules/@eslint/js": {
-            "version": "9.20.0",
-            "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.20.0.tgz",
-            "integrity": "sha512-iZA07H9io9Wn836aVTytRaNqh00Sad+EamwOVJT12GTLw1VGMFV/4JaME+JjLtr9fiGaoWgYnS54wrfWsSs4oQ==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-            }
-        },
-        "node_modules/@eslint/object-schema": {
-            "version": "2.1.6",
-            "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.6.tgz",
-            "integrity": "sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==",
-            "dev": true,
-            "license": "Apache-2.0",
-            "engines": {
-                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-            }
-        },
-        "node_modules/@eslint/plugin-kit": {
-            "version": "0.2.6",
-            "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.6.tgz",
-            "integrity": "sha512-+0TjwR1eAUdZtvv/ir1mGX+v0tUoR3VEPB8Up0LLJC+whRW0GgBBtpbOkg/a/U4Dxa6l5a3l9AJ1aWIQVyoWJA==",
-            "dev": true,
-            "license": "Apache-2.0",
-            "dependencies": {
-                "@eslint/core": "^0.11.0",
-                "levn": "^0.4.1"
-            },
-            "engines": {
-                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-            }
-        },
-        "node_modules/@humanfs/core": {
-            "version": "0.19.1",
-            "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz",
-            "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==",
-            "dev": true,
-            "license": "Apache-2.0",
-            "engines": {
-                "node": ">=18.18.0"
-            }
-        },
-        "node_modules/@humanfs/node": {
-            "version": "0.16.6",
-            "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz",
-            "integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==",
-            "dev": true,
-            "license": "Apache-2.0",
-            "dependencies": {
-                "@humanfs/core": "^0.19.1",
-                "@humanwhocodes/retry": "^0.3.0"
-            },
-            "engines": {
-                "node": ">=18.18.0"
-            }
-        },
-        "node_modules/@humanfs/node/node_modules/@humanwhocodes/retry": {
-            "version": "0.3.1",
-            "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz",
-            "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==",
-            "dev": true,
-            "license": "Apache-2.0",
-            "engines": {
-                "node": ">=18.18"
-            },
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/nzakas"
-            }
-        },
-        "node_modules/@humanwhocodes/module-importer": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
-            "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
-            "dev": true,
-            "license": "Apache-2.0",
-            "engines": {
-                "node": ">=12.22"
-            },
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/nzakas"
-            }
-        },
-        "node_modules/@humanwhocodes/retry": {
-            "version": "0.4.1",
-            "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.1.tgz",
-            "integrity": "sha512-c7hNEllBlenFTHBky65mhq8WD2kbN9Q6gk0bTk8lSBvc554jpXSkST1iePudpt7+A/AQvuHs9EMqjHDXMY1lrA==",
-            "dev": true,
-            "license": "Apache-2.0",
-            "engines": {
-                "node": ">=18.18"
-            },
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/nzakas"
-            }
-        },
-        "node_modules/@istanbuljs/load-nyc-config": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
-            "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
-            "dev": true,
-            "license": "ISC",
-            "dependencies": {
-                "camelcase": "^5.3.1",
-                "find-up": "^4.1.0",
-                "get-package-type": "^0.1.0",
-                "js-yaml": "^3.13.1",
-                "resolve-from": "^5.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/@istanbuljs/load-nyc-config/node_modules/argparse": {
-            "version": "1.0.10",
-            "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-            "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "sprintf-js": "~1.0.2"
-            }
-        },
-        "node_modules/@istanbuljs/load-nyc-config/node_modules/find-up": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-            "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "locate-path": "^5.0.0",
-                "path-exists": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/@istanbuljs/load-nyc-config/node_modules/js-yaml": {
-            "version": "3.14.1",
-            "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-            "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "argparse": "^1.0.7",
-                "esprima": "^4.0.0"
-            },
-            "bin": {
-                "js-yaml": "bin/js-yaml.js"
-            }
-        },
-        "node_modules/@istanbuljs/load-nyc-config/node_modules/locate-path": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-            "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "p-locate": "^4.1.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/@istanbuljs/load-nyc-config/node_modules/p-limit": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-            "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "p-try": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=6"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/@istanbuljs/load-nyc-config/node_modules/p-locate": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-            "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "p-limit": "^2.2.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/@istanbuljs/load-nyc-config/node_modules/resolve-from": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-            "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/@istanbuljs/schema": {
-            "version": "0.1.3",
-            "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
-            "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/@jest/console": {
-            "version": "29.7.0",
-            "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz",
-            "integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@jest/types": "^29.6.3",
-                "@types/node": "*",
-                "chalk": "^4.0.0",
-                "jest-message-util": "^29.7.0",
-                "jest-util": "^29.7.0",
-                "slash": "^3.0.0"
-            },
-            "engines": {
-                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-            }
-        },
-        "node_modules/@jest/core": {
-            "version": "29.7.0",
-            "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.7.0.tgz",
-            "integrity": "sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@jest/console": "^29.7.0",
-                "@jest/reporters": "^29.7.0",
-                "@jest/test-result": "^29.7.0",
-                "@jest/transform": "^29.7.0",
-                "@jest/types": "^29.6.3",
-                "@types/node": "*",
-                "ansi-escapes": "^4.2.1",
-                "chalk": "^4.0.0",
-                "ci-info": "^3.2.0",
-                "exit": "^0.1.2",
-                "graceful-fs": "^4.2.9",
-                "jest-changed-files": "^29.7.0",
-                "jest-config": "^29.7.0",
-                "jest-haste-map": "^29.7.0",
-                "jest-message-util": "^29.7.0",
-                "jest-regex-util": "^29.6.3",
-                "jest-resolve": "^29.7.0",
-                "jest-resolve-dependencies": "^29.7.0",
-                "jest-runner": "^29.7.0",
-                "jest-runtime": "^29.7.0",
-                "jest-snapshot": "^29.7.0",
-                "jest-util": "^29.7.0",
-                "jest-validate": "^29.7.0",
-                "jest-watcher": "^29.7.0",
-                "micromatch": "^4.0.4",
-                "pretty-format": "^29.7.0",
-                "slash": "^3.0.0",
-                "strip-ansi": "^6.0.0"
-            },
-            "engines": {
-                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-            },
-            "peerDependencies": {
-                "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
-            },
-            "peerDependenciesMeta": {
-                "node-notifier": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/@jest/environment": {
-            "version": "29.7.0",
-            "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz",
-            "integrity": "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@jest/fake-timers": "^29.7.0",
-                "@jest/types": "^29.6.3",
-                "@types/node": "*",
-                "jest-mock": "^29.7.0"
-            },
-            "engines": {
-                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-            }
-        },
-        "node_modules/@jest/expect": {
-            "version": "29.7.0",
-            "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz",
-            "integrity": "sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "expect": "^29.7.0",
-                "jest-snapshot": "^29.7.0"
-            },
-            "engines": {
-                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-            }
-        },
-        "node_modules/@jest/expect-utils": {
-            "version": "29.7.0",
-            "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz",
-            "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "jest-get-type": "^29.6.3"
-            },
-            "engines": {
-                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-            }
-        },
-        "node_modules/@jest/fake-timers": {
-            "version": "29.7.0",
-            "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz",
-            "integrity": "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@jest/types": "^29.6.3",
-                "@sinonjs/fake-timers": "^10.0.2",
-                "@types/node": "*",
-                "jest-message-util": "^29.7.0",
-                "jest-mock": "^29.7.0",
-                "jest-util": "^29.7.0"
-            },
-            "engines": {
-                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-            }
-        },
-        "node_modules/@jest/globals": {
-            "version": "29.7.0",
-            "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz",
-            "integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@jest/environment": "^29.7.0",
-                "@jest/expect": "^29.7.0",
-                "@jest/types": "^29.6.3",
-                "jest-mock": "^29.7.0"
-            },
-            "engines": {
-                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-            }
-        },
-        "node_modules/@jest/reporters": {
-            "version": "29.7.0",
-            "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz",
-            "integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@bcoe/v8-coverage": "^0.2.3",
-                "@jest/console": "^29.7.0",
-                "@jest/test-result": "^29.7.0",
-                "@jest/transform": "^29.7.0",
-                "@jest/types": "^29.6.3",
-                "@jridgewell/trace-mapping": "^0.3.18",
-                "@types/node": "*",
-                "chalk": "^4.0.0",
-                "collect-v8-coverage": "^1.0.0",
-                "exit": "^0.1.2",
-                "glob": "^7.1.3",
-                "graceful-fs": "^4.2.9",
-                "istanbul-lib-coverage": "^3.0.0",
-                "istanbul-lib-instrument": "^6.0.0",
-                "istanbul-lib-report": "^3.0.0",
-                "istanbul-lib-source-maps": "^4.0.0",
-                "istanbul-reports": "^3.1.3",
-                "jest-message-util": "^29.7.0",
-                "jest-util": "^29.7.0",
-                "jest-worker": "^29.7.0",
-                "slash": "^3.0.0",
-                "string-length": "^4.0.1",
-                "strip-ansi": "^6.0.0",
-                "v8-to-istanbul": "^9.0.1"
-            },
-            "engines": {
-                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-            },
-            "peerDependencies": {
-                "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
-            },
-            "peerDependenciesMeta": {
-                "node-notifier": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/@jest/schemas": {
-            "version": "29.6.3",
-            "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
-            "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@sinclair/typebox": "^0.27.8"
-            },
-            "engines": {
-                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-            }
-        },
-        "node_modules/@jest/source-map": {
-            "version": "29.6.3",
-            "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz",
-            "integrity": "sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@jridgewell/trace-mapping": "^0.3.18",
-                "callsites": "^3.0.0",
-                "graceful-fs": "^4.2.9"
-            },
-            "engines": {
-                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-            }
-        },
-        "node_modules/@jest/test-result": {
-            "version": "29.7.0",
-            "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz",
-            "integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@jest/console": "^29.7.0",
-                "@jest/types": "^29.6.3",
-                "@types/istanbul-lib-coverage": "^2.0.0",
-                "collect-v8-coverage": "^1.0.0"
-            },
-            "engines": {
-                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-            }
-        },
-        "node_modules/@jest/test-sequencer": {
-            "version": "29.7.0",
-            "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz",
-            "integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@jest/test-result": "^29.7.0",
-                "graceful-fs": "^4.2.9",
-                "jest-haste-map": "^29.7.0",
-                "slash": "^3.0.0"
-            },
-            "engines": {
-                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-            }
-        },
-        "node_modules/@jest/transform": {
-            "version": "29.7.0",
-            "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz",
-            "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@babel/core": "^7.11.6",
-                "@jest/types": "^29.6.3",
-                "@jridgewell/trace-mapping": "^0.3.18",
-                "babel-plugin-istanbul": "^6.1.1",
-                "chalk": "^4.0.0",
-                "convert-source-map": "^2.0.0",
-                "fast-json-stable-stringify": "^2.1.0",
-                "graceful-fs": "^4.2.9",
-                "jest-haste-map": "^29.7.0",
-                "jest-regex-util": "^29.6.3",
-                "jest-util": "^29.7.0",
-                "micromatch": "^4.0.4",
-                "pirates": "^4.0.4",
-                "slash": "^3.0.0",
-                "write-file-atomic": "^4.0.2"
-            },
-            "engines": {
-                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-            }
-        },
-        "node_modules/@jest/types": {
-            "version": "29.6.3",
-            "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
-            "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@jest/schemas": "^29.6.3",
-                "@types/istanbul-lib-coverage": "^2.0.0",
-                "@types/istanbul-reports": "^3.0.0",
-                "@types/node": "*",
-                "@types/yargs": "^17.0.8",
-                "chalk": "^4.0.0"
-            },
-            "engines": {
-                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-            }
-        },
-        "node_modules/@jridgewell/gen-mapping": {
-            "version": "0.3.8",
-            "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz",
-            "integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@jridgewell/set-array": "^1.2.1",
-                "@jridgewell/sourcemap-codec": "^1.4.10",
-                "@jridgewell/trace-mapping": "^0.3.24"
-            },
-            "engines": {
-                "node": ">=6.0.0"
-            }
-        },
-        "node_modules/@jridgewell/resolve-uri": {
-            "version": "3.1.2",
-            "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
-            "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=6.0.0"
-            }
-        },
-        "node_modules/@jridgewell/set-array": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
-            "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=6.0.0"
-            }
-        },
-        "node_modules/@jridgewell/source-map": {
-            "version": "0.3.6",
-            "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz",
-            "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@jridgewell/gen-mapping": "^0.3.5",
-                "@jridgewell/trace-mapping": "^0.3.25"
-            }
-        },
-        "node_modules/@jridgewell/sourcemap-codec": {
-            "version": "1.5.0",
-            "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
-            "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/@jridgewell/trace-mapping": {
-            "version": "0.3.25",
-            "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
-            "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@jridgewell/resolve-uri": "^3.1.0",
-                "@jridgewell/sourcemap-codec": "^1.4.14"
-            }
-        },
-        "node_modules/@marijn/find-cluster-break": {
-            "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==",
-            "dev": true,
-            "license": "MIT",
-            "peer": true
-        },
-        "node_modules/@nodelib/fs.scandir": {
-            "version": "2.1.5",
-            "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-            "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@nodelib/fs.stat": "2.0.5",
-                "run-parallel": "^1.1.9"
-            },
-            "engines": {
-                "node": ">= 8"
-            }
-        },
-        "node_modules/@nodelib/fs.stat": {
-            "version": "2.0.5",
-            "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-            "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">= 8"
-            }
-        },
-        "node_modules/@nodelib/fs.walk": {
-            "version": "1.2.8",
-            "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-            "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@nodelib/fs.scandir": "2.1.5",
-                "fastq": "^1.6.0"
-            },
-            "engines": {
-                "node": ">= 8"
-            }
-        },
-        "node_modules/@parcel/watcher": {
-            "version": "2.5.1",
-            "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.1.tgz",
-            "integrity": "sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==",
-            "dev": true,
-            "hasInstallScript": true,
-            "license": "MIT",
-            "optional": true,
-            "dependencies": {
-                "detect-libc": "^1.0.3",
-                "is-glob": "^4.0.3",
-                "micromatch": "^4.0.5",
-                "node-addon-api": "^7.0.0"
-            },
-            "engines": {
-                "node": ">= 10.0.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/parcel"
-            },
-            "optionalDependencies": {
-                "@parcel/watcher-android-arm64": "2.5.1",
-                "@parcel/watcher-darwin-arm64": "2.5.1",
-                "@parcel/watcher-darwin-x64": "2.5.1",
-                "@parcel/watcher-freebsd-x64": "2.5.1",
-                "@parcel/watcher-linux-arm-glibc": "2.5.1",
-                "@parcel/watcher-linux-arm-musl": "2.5.1",
-                "@parcel/watcher-linux-arm64-glibc": "2.5.1",
-                "@parcel/watcher-linux-arm64-musl": "2.5.1",
-                "@parcel/watcher-linux-x64-glibc": "2.5.1",
-                "@parcel/watcher-linux-x64-musl": "2.5.1",
-                "@parcel/watcher-win32-arm64": "2.5.1",
-                "@parcel/watcher-win32-ia32": "2.5.1",
-                "@parcel/watcher-win32-x64": "2.5.1"
-            }
-        },
-        "node_modules/@parcel/watcher-android-arm64": {
-            "version": "2.5.1",
-            "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.1.tgz",
-            "integrity": "sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==",
-            "cpu": [
-                "arm64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "android"
-            ],
-            "engines": {
-                "node": ">= 10.0.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/parcel"
-            }
-        },
-        "node_modules/@parcel/watcher-darwin-arm64": {
-            "version": "2.5.1",
-            "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.1.tgz",
-            "integrity": "sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw==",
-            "cpu": [
-                "arm64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "darwin"
-            ],
-            "engines": {
-                "node": ">= 10.0.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/parcel"
-            }
-        },
-        "node_modules/@parcel/watcher-darwin-x64": {
-            "version": "2.5.1",
-            "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.1.tgz",
-            "integrity": "sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg==",
-            "cpu": [
-                "x64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "darwin"
-            ],
-            "engines": {
-                "node": ">= 10.0.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/parcel"
-            }
-        },
-        "node_modules/@parcel/watcher-freebsd-x64": {
-            "version": "2.5.1",
-            "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.1.tgz",
-            "integrity": "sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ==",
-            "cpu": [
-                "x64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "freebsd"
-            ],
-            "engines": {
-                "node": ">= 10.0.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/parcel"
-            }
-        },
-        "node_modules/@parcel/watcher-linux-arm-glibc": {
-            "version": "2.5.1",
-            "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.1.tgz",
-            "integrity": "sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA==",
-            "cpu": [
-                "arm"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "linux"
-            ],
-            "engines": {
-                "node": ">= 10.0.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/parcel"
-            }
-        },
-        "node_modules/@parcel/watcher-linux-arm-musl": {
-            "version": "2.5.1",
-            "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.1.tgz",
-            "integrity": "sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==",
-            "cpu": [
-                "arm"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "linux"
-            ],
-            "engines": {
-                "node": ">= 10.0.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/parcel"
-            }
-        },
-        "node_modules/@parcel/watcher-linux-arm64-glibc": {
-            "version": "2.5.1",
-            "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.1.tgz",
-            "integrity": "sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==",
-            "cpu": [
-                "arm64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "linux"
-            ],
-            "engines": {
-                "node": ">= 10.0.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/parcel"
-            }
-        },
-        "node_modules/@parcel/watcher-linux-arm64-musl": {
-            "version": "2.5.1",
-            "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.1.tgz",
-            "integrity": "sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==",
-            "cpu": [
-                "arm64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "linux"
-            ],
-            "engines": {
-                "node": ">= 10.0.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/parcel"
-            }
-        },
-        "node_modules/@parcel/watcher-linux-x64-glibc": {
-            "version": "2.5.1",
-            "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.1.tgz",
-            "integrity": "sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==",
-            "cpu": [
-                "x64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "linux"
-            ],
-            "engines": {
-                "node": ">= 10.0.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/parcel"
-            }
-        },
-        "node_modules/@parcel/watcher-linux-x64-musl": {
-            "version": "2.5.1",
-            "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.1.tgz",
-            "integrity": "sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==",
-            "cpu": [
-                "x64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "linux"
-            ],
-            "engines": {
-                "node": ">= 10.0.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/parcel"
-            }
-        },
-        "node_modules/@parcel/watcher-win32-arm64": {
-            "version": "2.5.1",
-            "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.1.tgz",
-            "integrity": "sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==",
-            "cpu": [
-                "arm64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "win32"
-            ],
-            "engines": {
-                "node": ">= 10.0.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/parcel"
-            }
-        },
-        "node_modules/@parcel/watcher-win32-ia32": {
-            "version": "2.5.1",
-            "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.1.tgz",
-            "integrity": "sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ==",
-            "cpu": [
-                "ia32"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "win32"
-            ],
-            "engines": {
-                "node": ">= 10.0.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/parcel"
-            }
-        },
-        "node_modules/@parcel/watcher-win32-x64": {
-            "version": "2.5.1",
-            "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.1.tgz",
-            "integrity": "sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA==",
-            "cpu": [
-                "x64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "win32"
-            ],
-            "engines": {
-                "node": ">= 10.0.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/parcel"
-            }
-        },
-        "node_modules/@redocly/ajv": {
-            "version": "8.11.2",
-            "resolved": "https://registry.npmjs.org/@redocly/ajv/-/ajv-8.11.2.tgz",
-            "integrity": "sha512-io1JpnwtIcvojV7QKDUSIuMN/ikdOUd1ReEnUnMKGfDVridQZ31J0MmIuqwuRjWDZfmvr+Q0MqCcfHM2gTivOg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "fast-deep-equal": "^3.1.1",
-                "json-schema-traverse": "^1.0.0",
-                "require-from-string": "^2.0.2",
-                "uri-js-replace": "^1.0.1"
-            },
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/epoberezkin"
-            }
-        },
-        "node_modules/@redocly/ajv/node_modules/json-schema-traverse": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-            "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/@redocly/config": {
-            "version": "0.20.3",
-            "resolved": "https://registry.npmjs.org/@redocly/config/-/config-0.20.3.tgz",
-            "integrity": "sha512-Nyyv1Bj7GgYwj/l46O0nkH1GTKWbO3Ixe7KFcn021aZipkZd+z8Vlu1BwkhqtVgivcKaClaExtWU/lDHkjBzag==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/@redocly/openapi-core": {
-            "version": "1.29.0",
-            "resolved": "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.29.0.tgz",
-            "integrity": "sha512-Ju8POuRjYLTl6JfaSMq5exzhw4E/f1Qb7fGxgS4/PDSTzS1jzZ/UUJRBPeiQ1Ag7yuxH6JwltOr2iiltnBey1w==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@redocly/ajv": "^8.11.2",
-                "@redocly/config": "^0.20.1",
-                "colorette": "^1.2.0",
-                "https-proxy-agent": "^7.0.5",
-                "js-levenshtein": "^1.1.6",
-                "js-yaml": "^4.1.0",
-                "minimatch": "^5.0.1",
-                "pluralize": "^8.0.0",
-                "yaml-ast-parser": "0.0.43"
-            },
-            "engines": {
-                "node": ">=18.17.0",
-                "npm": ">=9.5.0"
-            }
-        },
-        "node_modules/@redocly/openapi-core/node_modules/brace-expansion": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-            "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "balanced-match": "^1.0.0"
-            }
-        },
-        "node_modules/@redocly/openapi-core/node_modules/minimatch": {
-            "version": "5.1.6",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
-            "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
-            "dev": true,
-            "license": "ISC",
-            "dependencies": {
-                "brace-expansion": "^2.0.1"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/@sinclair/typebox": {
-            "version": "0.27.8",
-            "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
-            "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/@sinonjs/commons": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz",
-            "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==",
-            "dev": true,
-            "license": "BSD-3-Clause",
-            "dependencies": {
-                "type-detect": "4.0.8"
-            }
-        },
-        "node_modules/@sinonjs/fake-timers": {
-            "version": "10.3.0",
-            "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz",
-            "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==",
-            "dev": true,
-            "license": "BSD-3-Clause",
-            "dependencies": {
-                "@sinonjs/commons": "^3.0.0"
-            }
-        },
-        "node_modules/@types/babel__core": {
-            "version": "7.20.5",
-            "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
-            "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@babel/parser": "^7.20.7",
-                "@babel/types": "^7.20.7",
-                "@types/babel__generator": "*",
-                "@types/babel__template": "*",
-                "@types/babel__traverse": "*"
-            }
-        },
-        "node_modules/@types/babel__generator": {
-            "version": "7.6.8",
-            "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz",
-            "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@babel/types": "^7.0.0"
-            }
-        },
-        "node_modules/@types/babel__template": {
-            "version": "7.4.4",
-            "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz",
-            "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@babel/parser": "^7.1.0",
-                "@babel/types": "^7.0.0"
-            }
-        },
-        "node_modules/@types/babel__traverse": {
-            "version": "7.20.6",
-            "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.6.tgz",
-            "integrity": "sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@babel/types": "^7.20.7"
-            }
-        },
-        "node_modules/@types/codemirror": {
-            "version": "5.60.8",
-            "resolved": "https://registry.npmjs.org/@types/codemirror/-/codemirror-5.60.8.tgz",
-            "integrity": "sha512-VjFgDF/eB+Aklcy15TtOTLQeMjTo07k7KAjql8OK5Dirr7a6sJY4T1uVBDuTVG9VEmn1uUsohOpYnVfgC6/jyw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@types/tern": "*"
-            }
-        },
-        "node_modules/@types/eslint": {
-            "version": "9.6.1",
-            "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz",
-            "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@types/estree": "*",
-                "@types/json-schema": "*"
-            }
-        },
-        "node_modules/@types/eslint-scope": {
-            "version": "3.7.7",
-            "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
-            "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@types/eslint": "*",
-                "@types/estree": "*"
-            }
-        },
-        "node_modules/@types/estree": {
-            "version": "1.0.6",
-            "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
-            "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/@types/graceful-fs": {
-            "version": "4.1.9",
-            "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz",
-            "integrity": "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@types/node": "*"
-            }
-        },
-        "node_modules/@types/istanbul-lib-coverage": {
-            "version": "2.0.6",
-            "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz",
-            "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/@types/istanbul-lib-report": {
-            "version": "3.0.3",
-            "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz",
-            "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@types/istanbul-lib-coverage": "*"
-            }
-        },
-        "node_modules/@types/istanbul-reports": {
-            "version": "3.0.4",
-            "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz",
-            "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@types/istanbul-lib-report": "*"
-            }
-        },
-        "node_modules/@types/jest": {
-            "version": "29.5.14",
-            "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.14.tgz",
-            "integrity": "sha512-ZN+4sdnLUbo8EVvVc2ao0GFW6oVrQRPn4K2lglySj7APvSrgzxHiNNK99us4WDMi57xxA2yggblIAMNhXOotLQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "expect": "^29.0.0",
-                "pretty-format": "^29.0.0"
-            }
-        },
-        "node_modules/@types/json-schema": {
-            "version": "7.0.15",
-            "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
-            "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/@types/node": {
-            "version": "22.13.4",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.4.tgz",
-            "integrity": "sha512-ywP2X0DYtX3y08eFVx5fNIw7/uIv8hYUKgXoK8oayJlLnKcRfEYCxWMVE1XagUdVtCJlZT1AU4LXEABW+L1Peg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "undici-types": "~6.20.0"
-            }
-        },
-        "node_modules/@types/stack-utils": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz",
-            "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/@types/tern": {
-            "version": "0.23.9",
-            "resolved": "https://registry.npmjs.org/@types/tern/-/tern-0.23.9.tgz",
-            "integrity": "sha512-ypzHFE/wBzh+BlH6rrBgS5I/Z7RD21pGhZ2rltb/+ZrVM1awdZwjx7hE5XfuYgHWk9uvV5HLZN3SloevCAp3Bw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@types/estree": "*"
-            }
-        },
-        "node_modules/@types/yargs": {
-            "version": "17.0.33",
-            "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.33.tgz",
-            "integrity": "sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@types/yargs-parser": "*"
-            }
-        },
-        "node_modules/@types/yargs-parser": {
-            "version": "21.0.3",
-            "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz",
-            "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/@typescript-eslint/eslint-plugin": {
-            "version": "8.24.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.24.1.tgz",
-            "integrity": "sha512-ll1StnKtBigWIGqvYDVuDmXJHVH4zLVot1yQ4fJtLpL7qacwkxJc1T0bptqw+miBQ/QfUbhl1TcQ4accW5KUyA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@eslint-community/regexpp": "^4.10.0",
-                "@typescript-eslint/scope-manager": "8.24.1",
-                "@typescript-eslint/type-utils": "8.24.1",
-                "@typescript-eslint/utils": "8.24.1",
-                "@typescript-eslint/visitor-keys": "8.24.1",
-                "graphemer": "^1.4.0",
-                "ignore": "^5.3.1",
-                "natural-compare": "^1.4.0",
-                "ts-api-utils": "^2.0.1"
-            },
-            "engines": {
-                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/typescript-eslint"
-            },
-            "peerDependencies": {
-                "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0",
-                "eslint": "^8.57.0 || ^9.0.0",
-                "typescript": ">=4.8.4 <5.8.0"
-            }
-        },
-        "node_modules/@typescript-eslint/parser": {
-            "version": "8.24.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.24.1.tgz",
-            "integrity": "sha512-Tqoa05bu+t5s8CTZFaGpCH2ub3QeT9YDkXbPd3uQ4SfsLoh1/vv2GEYAioPoxCWJJNsenXlC88tRjwoHNts1oQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@typescript-eslint/scope-manager": "8.24.1",
-                "@typescript-eslint/types": "8.24.1",
-                "@typescript-eslint/typescript-estree": "8.24.1",
-                "@typescript-eslint/visitor-keys": "8.24.1",
-                "debug": "^4.3.4"
-            },
-            "engines": {
-                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/typescript-eslint"
-            },
-            "peerDependencies": {
-                "eslint": "^8.57.0 || ^9.0.0",
-                "typescript": ">=4.8.4 <5.8.0"
-            }
-        },
-        "node_modules/@typescript-eslint/scope-manager": {
-            "version": "8.24.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.24.1.tgz",
-            "integrity": "sha512-OdQr6BNBzwRjNEXMQyaGyZzgg7wzjYKfX2ZBV3E04hUCBDv3GQCHiz9RpqdUIiVrMgJGkXm3tcEh4vFSHreS2Q==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@typescript-eslint/types": "8.24.1",
-                "@typescript-eslint/visitor-keys": "8.24.1"
-            },
-            "engines": {
-                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/typescript-eslint"
-            }
-        },
-        "node_modules/@typescript-eslint/type-utils": {
-            "version": "8.24.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.24.1.tgz",
-            "integrity": "sha512-/Do9fmNgCsQ+K4rCz0STI7lYB4phTtEXqqCAs3gZW0pnK7lWNkvWd5iW545GSmApm4AzmQXmSqXPO565B4WVrw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@typescript-eslint/typescript-estree": "8.24.1",
-                "@typescript-eslint/utils": "8.24.1",
-                "debug": "^4.3.4",
-                "ts-api-utils": "^2.0.1"
-            },
-            "engines": {
-                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/typescript-eslint"
-            },
-            "peerDependencies": {
-                "eslint": "^8.57.0 || ^9.0.0",
-                "typescript": ">=4.8.4 <5.8.0"
-            }
-        },
-        "node_modules/@typescript-eslint/types": {
-            "version": "8.24.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.24.1.tgz",
-            "integrity": "sha512-9kqJ+2DkUXiuhoiYIUvIYjGcwle8pcPpdlfkemGvTObzgmYfJ5d0Qm6jwb4NBXP9W1I5tss0VIAnWFumz3mC5A==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/typescript-eslint"
-            }
-        },
-        "node_modules/@typescript-eslint/typescript-estree": {
-            "version": "8.24.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.24.1.tgz",
-            "integrity": "sha512-UPyy4MJ/0RE648DSKQe9g0VDSehPINiejjA6ElqnFaFIhI6ZEiZAkUI0D5MCk0bQcTf/LVqZStvQ6K4lPn/BRg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@typescript-eslint/types": "8.24.1",
-                "@typescript-eslint/visitor-keys": "8.24.1",
-                "debug": "^4.3.4",
-                "fast-glob": "^3.3.2",
-                "is-glob": "^4.0.3",
-                "minimatch": "^9.0.4",
-                "semver": "^7.6.0",
-                "ts-api-utils": "^2.0.1"
-            },
-            "engines": {
-                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/typescript-eslint"
-            },
-            "peerDependencies": {
-                "typescript": ">=4.8.4 <5.8.0"
-            }
-        },
-        "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-            "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "balanced-match": "^1.0.0"
-            }
-        },
-        "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": {
-            "version": "9.0.5",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-            "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
-            "dev": true,
-            "license": "ISC",
-            "dependencies": {
-                "brace-expansion": "^2.0.1"
-            },
-            "engines": {
-                "node": ">=16 || 14 >=14.17"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/isaacs"
-            }
-        },
-        "node_modules/@typescript-eslint/utils": {
-            "version": "8.24.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.24.1.tgz",
-            "integrity": "sha512-OOcg3PMMQx9EXspId5iktsI3eMaXVwlhC8BvNnX6B5w9a4dVgpkQZuU8Hy67TolKcl+iFWq0XX+jbDGN4xWxjQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@eslint-community/eslint-utils": "^4.4.0",
-                "@typescript-eslint/scope-manager": "8.24.1",
-                "@typescript-eslint/types": "8.24.1",
-                "@typescript-eslint/typescript-estree": "8.24.1"
-            },
-            "engines": {
-                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/typescript-eslint"
-            },
-            "peerDependencies": {
-                "eslint": "^8.57.0 || ^9.0.0",
-                "typescript": ">=4.8.4 <5.8.0"
-            }
-        },
-        "node_modules/@typescript-eslint/visitor-keys": {
-            "version": "8.24.1",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.24.1.tgz",
-            "integrity": "sha512-EwVHlp5l+2vp8CoqJm9KikPZgi3gbdZAtabKT9KPShGeOcJhsv4Zdo3oc8T8I0uKEmYoU4ItyxbptjF08enaxg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@typescript-eslint/types": "8.24.1",
-                "eslint-visitor-keys": "^4.2.0"
-            },
-            "engines": {
-                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/typescript-eslint"
-            }
-        },
-        "node_modules/@webassemblyjs/ast": {
-            "version": "1.14.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz",
-            "integrity": "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@webassemblyjs/helper-numbers": "1.13.2",
-                "@webassemblyjs/helper-wasm-bytecode": "1.13.2"
-            }
-        },
-        "node_modules/@webassemblyjs/floating-point-hex-parser": {
-            "version": "1.13.2",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz",
-            "integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/@webassemblyjs/helper-api-error": {
-            "version": "1.13.2",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz",
-            "integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/@webassemblyjs/helper-buffer": {
-            "version": "1.14.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz",
-            "integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/@webassemblyjs/helper-numbers": {
-            "version": "1.13.2",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz",
-            "integrity": "sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@webassemblyjs/floating-point-hex-parser": "1.13.2",
-                "@webassemblyjs/helper-api-error": "1.13.2",
-                "@xtuc/long": "4.2.2"
-            }
-        },
-        "node_modules/@webassemblyjs/helper-wasm-bytecode": {
-            "version": "1.13.2",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz",
-            "integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/@webassemblyjs/helper-wasm-section": {
-            "version": "1.14.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz",
-            "integrity": "sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@webassemblyjs/ast": "1.14.1",
-                "@webassemblyjs/helper-buffer": "1.14.1",
-                "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
-                "@webassemblyjs/wasm-gen": "1.14.1"
-            }
-        },
-        "node_modules/@webassemblyjs/ieee754": {
-            "version": "1.13.2",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz",
-            "integrity": "sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@xtuc/ieee754": "^1.2.0"
-            }
-        },
-        "node_modules/@webassemblyjs/leb128": {
-            "version": "1.13.2",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz",
-            "integrity": "sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==",
-            "dev": true,
-            "license": "Apache-2.0",
-            "dependencies": {
-                "@xtuc/long": "4.2.2"
-            }
-        },
-        "node_modules/@webassemblyjs/utf8": {
-            "version": "1.13.2",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz",
-            "integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/@webassemblyjs/wasm-edit": {
-            "version": "1.14.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz",
-            "integrity": "sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@webassemblyjs/ast": "1.14.1",
-                "@webassemblyjs/helper-buffer": "1.14.1",
-                "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
-                "@webassemblyjs/helper-wasm-section": "1.14.1",
-                "@webassemblyjs/wasm-gen": "1.14.1",
-                "@webassemblyjs/wasm-opt": "1.14.1",
-                "@webassemblyjs/wasm-parser": "1.14.1",
-                "@webassemblyjs/wast-printer": "1.14.1"
-            }
-        },
-        "node_modules/@webassemblyjs/wasm-gen": {
-            "version": "1.14.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz",
-            "integrity": "sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@webassemblyjs/ast": "1.14.1",
-                "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
-                "@webassemblyjs/ieee754": "1.13.2",
-                "@webassemblyjs/leb128": "1.13.2",
-                "@webassemblyjs/utf8": "1.13.2"
-            }
-        },
-        "node_modules/@webassemblyjs/wasm-opt": {
-            "version": "1.14.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz",
-            "integrity": "sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@webassemblyjs/ast": "1.14.1",
-                "@webassemblyjs/helper-buffer": "1.14.1",
-                "@webassemblyjs/wasm-gen": "1.14.1",
-                "@webassemblyjs/wasm-parser": "1.14.1"
-            }
-        },
-        "node_modules/@webassemblyjs/wasm-parser": {
-            "version": "1.14.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz",
-            "integrity": "sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@webassemblyjs/ast": "1.14.1",
-                "@webassemblyjs/helper-api-error": "1.13.2",
-                "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
-                "@webassemblyjs/ieee754": "1.13.2",
-                "@webassemblyjs/leb128": "1.13.2",
-                "@webassemblyjs/utf8": "1.13.2"
-            }
-        },
-        "node_modules/@webassemblyjs/wast-printer": {
-            "version": "1.14.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz",
-            "integrity": "sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@webassemblyjs/ast": "1.14.1",
-                "@xtuc/long": "4.2.2"
-            }
-        },
-        "node_modules/@webpack-cli/configtest": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-3.0.1.tgz",
-            "integrity": "sha512-u8d0pJ5YFgneF/GuvEiDA61Tf1VDomHHYMjv/wc9XzYj7nopltpG96nXN5dJRstxZhcNpV1g+nT6CydO7pHbjA==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=18.12.0"
-            },
-            "peerDependencies": {
-                "webpack": "^5.82.0",
-                "webpack-cli": "6.x.x"
-            }
-        },
-        "node_modules/@webpack-cli/info": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-3.0.1.tgz",
-            "integrity": "sha512-coEmDzc2u/ffMvuW9aCjoRzNSPDl/XLuhPdlFRpT9tZHmJ/039az33CE7uH+8s0uL1j5ZNtfdv0HkfaKRBGJsQ==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=18.12.0"
-            },
-            "peerDependencies": {
-                "webpack": "^5.82.0",
-                "webpack-cli": "6.x.x"
-            }
-        },
-        "node_modules/@webpack-cli/serve": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-3.0.1.tgz",
-            "integrity": "sha512-sbgw03xQaCLiT6gcY/6u3qBDn01CWw/nbaXl3gTdTFuJJ75Gffv3E3DBpgvY2fkkrdS1fpjaXNOmJlnbtKauKg==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=18.12.0"
-            },
-            "peerDependencies": {
-                "webpack": "^5.82.0",
-                "webpack-cli": "6.x.x"
-            },
-            "peerDependenciesMeta": {
-                "webpack-dev-server": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/@xtuc/ieee754": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-            "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
-            "dev": true,
-            "license": "BSD-3-Clause"
-        },
-        "node_modules/@xtuc/long": {
-            "version": "4.2.2",
-            "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-            "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
-            "dev": true,
-            "license": "Apache-2.0"
-        },
-        "node_modules/acorn": {
-            "version": "8.14.0",
-            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
-            "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
-            "dev": true,
-            "license": "MIT",
-            "bin": {
-                "acorn": "bin/acorn"
-            },
-            "engines": {
-                "node": ">=0.4.0"
-            }
-        },
-        "node_modules/acorn-jsx": {
-            "version": "5.3.2",
-            "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-            "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-            "dev": true,
-            "license": "MIT",
-            "peerDependencies": {
-                "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
-            }
-        },
-        "node_modules/adjust-sourcemap-loader": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-4.0.0.tgz",
-            "integrity": "sha512-OXwN5b9pCUXNQHJpwwD2qP40byEmSgzj8B4ydSN0uMNYWiFmJ6x6KwUllMmfk8Rwu/HJDFR7U8ubsWBoN0Xp0A==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "loader-utils": "^2.0.0",
-                "regex-parser": "^2.2.11"
-            },
-            "engines": {
-                "node": ">=8.9"
-            }
-        },
-        "node_modules/agent-base": {
-            "version": "7.1.3",
-            "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
-            "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">= 14"
-            }
-        },
-        "node_modules/ajv": {
-            "version": "6.12.6",
-            "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-            "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "fast-deep-equal": "^3.1.1",
-                "fast-json-stable-stringify": "^2.0.0",
-                "json-schema-traverse": "^0.4.1",
-                "uri-js": "^4.2.2"
-            },
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/epoberezkin"
-            }
-        },
-        "node_modules/ajv-formats": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
-            "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "ajv": "^8.0.0"
-            },
-            "peerDependencies": {
-                "ajv": "^8.0.0"
-            },
-            "peerDependenciesMeta": {
-                "ajv": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/ajv-formats/node_modules/ajv": {
-            "version": "8.17.1",
-            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
-            "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "fast-deep-equal": "^3.1.3",
-                "fast-uri": "^3.0.1",
-                "json-schema-traverse": "^1.0.0",
-                "require-from-string": "^2.0.2"
-            },
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/epoberezkin"
-            }
-        },
-        "node_modules/ajv-formats/node_modules/json-schema-traverse": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-            "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/ajv-keywords": {
-            "version": "3.5.2",
-            "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-            "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-            "dev": true,
-            "license": "MIT",
-            "peerDependencies": {
-                "ajv": "^6.9.1"
-            }
-        },
-        "node_modules/ansi-colors": {
-            "version": "4.1.3",
-            "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
-            "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/ansi-escapes": {
-            "version": "4.3.2",
-            "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
-            "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "type-fest": "^0.21.3"
-            },
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/ansi-regex": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/ansi-styles": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "color-convert": "^2.0.1"
-            },
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-            }
-        },
-        "node_modules/anymatch": {
-            "version": "3.1.3",
-            "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
-            "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
-            "dev": true,
-            "license": "ISC",
-            "dependencies": {
-                "normalize-path": "^3.0.0",
-                "picomatch": "^2.0.4"
-            },
-            "engines": {
-                "node": ">= 8"
-            }
-        },
-        "node_modules/argparse": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-            "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-            "dev": true,
-            "license": "Python-2.0"
-        },
-        "node_modules/async": {
-            "version": "3.2.6",
-            "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
-            "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/babel-jest": {
-            "version": "29.7.0",
-            "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz",
-            "integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@jest/transform": "^29.7.0",
-                "@types/babel__core": "^7.1.14",
-                "babel-plugin-istanbul": "^6.1.1",
-                "babel-preset-jest": "^29.6.3",
-                "chalk": "^4.0.0",
-                "graceful-fs": "^4.2.9",
-                "slash": "^3.0.0"
-            },
-            "engines": {
-                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-            },
-            "peerDependencies": {
-                "@babel/core": "^7.8.0"
-            }
-        },
-        "node_modules/babel-plugin-istanbul": {
-            "version": "6.1.1",
-            "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
-            "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
-            "dev": true,
-            "license": "BSD-3-Clause",
-            "dependencies": {
-                "@babel/helper-plugin-utils": "^7.0.0",
-                "@istanbuljs/load-nyc-config": "^1.0.0",
-                "@istanbuljs/schema": "^0.1.2",
-                "istanbul-lib-instrument": "^5.0.4",
-                "test-exclude": "^6.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/babel-plugin-istanbul/node_modules/istanbul-lib-instrument": {
-            "version": "5.2.1",
-            "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
-            "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
-            "dev": true,
-            "license": "BSD-3-Clause",
-            "dependencies": {
-                "@babel/core": "^7.12.3",
-                "@babel/parser": "^7.14.7",
-                "@istanbuljs/schema": "^0.1.2",
-                "istanbul-lib-coverage": "^3.2.0",
-                "semver": "^6.3.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/babel-plugin-istanbul/node_modules/semver": {
-            "version": "6.3.1",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-            "dev": true,
-            "license": "ISC",
-            "bin": {
-                "semver": "bin/semver.js"
-            }
-        },
-        "node_modules/babel-plugin-jest-hoist": {
-            "version": "29.6.3",
-            "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz",
-            "integrity": "sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@babel/template": "^7.3.3",
-                "@babel/types": "^7.3.3",
-                "@types/babel__core": "^7.1.14",
-                "@types/babel__traverse": "^7.0.6"
-            },
-            "engines": {
-                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-            }
-        },
-        "node_modules/babel-preset-current-node-syntax": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.1.0.tgz",
-            "integrity": "sha512-ldYss8SbBlWva1bs28q78Ju5Zq1F+8BrqBZZ0VFhLBvhh6lCpC2o3gDJi/5DRLs9FgYZCnmPYIVFU4lRXCkyUw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@babel/plugin-syntax-async-generators": "^7.8.4",
-                "@babel/plugin-syntax-bigint": "^7.8.3",
-                "@babel/plugin-syntax-class-properties": "^7.12.13",
-                "@babel/plugin-syntax-class-static-block": "^7.14.5",
-                "@babel/plugin-syntax-import-attributes": "^7.24.7",
-                "@babel/plugin-syntax-import-meta": "^7.10.4",
-                "@babel/plugin-syntax-json-strings": "^7.8.3",
-                "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
-                "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-                "@babel/plugin-syntax-numeric-separator": "^7.10.4",
-                "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-                "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-                "@babel/plugin-syntax-optional-chaining": "^7.8.3",
-                "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
-                "@babel/plugin-syntax-top-level-await": "^7.14.5"
-            },
-            "peerDependencies": {
-                "@babel/core": "^7.0.0"
-            }
-        },
-        "node_modules/babel-preset-jest": {
-            "version": "29.6.3",
-            "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz",
-            "integrity": "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "babel-plugin-jest-hoist": "^29.6.3",
-                "babel-preset-current-node-syntax": "^1.0.0"
-            },
-            "engines": {
-                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-            },
-            "peerDependencies": {
-                "@babel/core": "^7.0.0"
-            }
-        },
-        "node_modules/balanced-match": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-            "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/big.js": {
-            "version": "5.2.2",
-            "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
-            "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": "*"
-            }
-        },
-        "node_modules/brace-expansion": {
-            "version": "1.1.11",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "balanced-match": "^1.0.0",
-                "concat-map": "0.0.1"
-            }
-        },
-        "node_modules/braces": {
-            "version": "3.0.3",
-            "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
-            "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "fill-range": "^7.1.1"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/browserslist": {
-            "version": "4.24.4",
-            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz",
-            "integrity": "sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "opencollective",
-                    "url": "https://opencollective.com/browserslist"
-                },
-                {
-                    "type": "tidelift",
-                    "url": "https://tidelift.com/funding/github/npm/browserslist"
-                },
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/ai"
-                }
-            ],
-            "license": "MIT",
-            "dependencies": {
-                "caniuse-lite": "^1.0.30001688",
-                "electron-to-chromium": "^1.5.73",
-                "node-releases": "^2.0.19",
-                "update-browserslist-db": "^1.1.1"
-            },
-            "bin": {
-                "browserslist": "cli.js"
-            },
-            "engines": {
-                "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
-            }
-        },
-        "node_modules/bs-logger": {
-            "version": "0.2.6",
-            "resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz",
-            "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "fast-json-stable-stringify": "2.x"
-            },
-            "engines": {
-                "node": ">= 6"
-            }
-        },
-        "node_modules/bser": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
-            "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
-            "dev": true,
-            "license": "Apache-2.0",
-            "dependencies": {
-                "node-int64": "^0.4.0"
-            }
-        },
-        "node_modules/buffer-from": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-            "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/byte-base64": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/byte-base64/-/byte-base64-1.1.0.tgz",
-            "integrity": "sha512-56cXelkJrVMdCY9V/3RfDxTh4VfMFCQ5km7B7GkIGfo4bcPL9aACyJLB0Ms3Ezu5rsHmLB2suis96z4fLM03DA==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/callsites": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-            "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/camelcase": {
-            "version": "5.3.1",
-            "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-            "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/caniuse-lite": {
-            "version": "1.0.30001700",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001700.tgz",
-            "integrity": "sha512-2S6XIXwaE7K7erT8dY+kLQcpa5ms63XlRkMkReXjle+kf6c5g38vyMl+Z5y8dSxOFDhcFe+nxnn261PLxBSQsQ==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "opencollective",
-                    "url": "https://opencollective.com/browserslist"
-                },
-                {
-                    "type": "tidelift",
-                    "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
-                },
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/ai"
-                }
-            ],
-            "license": "CC-BY-4.0"
-        },
-        "node_modules/chalk": {
-            "version": "4.1.2",
-            "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-            "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "ansi-styles": "^4.1.0",
-                "supports-color": "^7.1.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/chalk?sponsor=1"
-            }
-        },
-        "node_modules/change-case": {
-            "version": "5.4.4",
-            "resolved": "https://registry.npmjs.org/change-case/-/change-case-5.4.4.tgz",
-            "integrity": "sha512-HRQyTk2/YPEkt9TnUPbOpr64Uw3KOicFWPVBb+xiHvd6eBx/qPr9xqfBFDT8P2vWsvvz4jbEkfDe71W3VyNu2w==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/char-regex": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
-            "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/chokidar": {
-            "version": "4.0.3",
-            "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
-            "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "readdirp": "^4.0.1"
-            },
-            "engines": {
-                "node": ">= 14.16.0"
-            },
-            "funding": {
-                "url": "https://paulmillr.com/funding/"
-            }
-        },
-        "node_modules/chrome-trace-event": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz",
-            "integrity": "sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=6.0"
-            }
-        },
-        "node_modules/ci-info": {
-            "version": "3.9.0",
-            "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
-            "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/sibiraj-s"
-                }
-            ],
-            "license": "MIT",
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/cjs-module-lexer": {
-            "version": "1.4.3",
-            "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.3.tgz",
-            "integrity": "sha512-9z8TZaGM1pfswYeXrUpzPrkx8UnWYdhJclsiYMm6x/w5+nN+8Tf/LnAgfLGQCm59qAOxU8WwHEq2vNwF6i4j+Q==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/cliui": {
-            "version": "8.0.1",
-            "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
-            "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
-            "dev": true,
-            "license": "ISC",
-            "dependencies": {
-                "string-width": "^4.2.0",
-                "strip-ansi": "^6.0.1",
-                "wrap-ansi": "^7.0.0"
-            },
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/clone-deep": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
-            "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "is-plain-object": "^2.0.4",
-                "kind-of": "^6.0.2",
-                "shallow-clone": "^3.0.0"
-            },
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/co": {
-            "version": "4.6.0",
-            "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-            "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "iojs": ">= 1.0.0",
-                "node": ">= 0.12.0"
-            }
-        },
-        "node_modules/collect-v8-coverage": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz",
-            "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/color-convert": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "color-name": "~1.1.4"
-            },
-            "engines": {
-                "node": ">=7.0.0"
-            }
-        },
-        "node_modules/color-name": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/colorette": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.4.0.tgz",
-            "integrity": "sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/commander": {
-            "version": "2.20.3",
-            "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-            "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/concat-map": {
-            "version": "0.0.1",
-            "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-            "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/concurrently": {
-            "version": "9.1.2",
-            "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-9.1.2.tgz",
-            "integrity": "sha512-H9MWcoPsYddwbOGM6difjVwVZHl63nwMEwDJG/L7VGtuaJhb12h2caPG2tVPWs7emuYix252iGfqOyrz1GczTQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "chalk": "^4.1.2",
-                "lodash": "^4.17.21",
-                "rxjs": "^7.8.1",
-                "shell-quote": "^1.8.1",
-                "supports-color": "^8.1.1",
-                "tree-kill": "^1.2.2",
-                "yargs": "^17.7.2"
-            },
-            "bin": {
-                "conc": "dist/bin/concurrently.js",
-                "concurrently": "dist/bin/concurrently.js"
-            },
-            "engines": {
-                "node": ">=18"
-            },
-            "funding": {
-                "url": "https://github.com/open-cli-tools/concurrently?sponsor=1"
-            }
-        },
-        "node_modules/concurrently/node_modules/supports-color": {
-            "version": "8.1.1",
-            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-            "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "has-flag": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/supports-color?sponsor=1"
-            }
-        },
-        "node_modules/convert-source-map": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
-            "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/create-jest": {
-            "version": "29.7.0",
-            "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz",
-            "integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@jest/types": "^29.6.3",
-                "chalk": "^4.0.0",
-                "exit": "^0.1.2",
-                "graceful-fs": "^4.2.9",
-                "jest-config": "^29.7.0",
-                "jest-util": "^29.7.0",
-                "prompts": "^2.0.1"
-            },
-            "bin": {
-                "create-jest": "bin/create-jest.js"
-            },
-            "engines": {
-                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-            }
-        },
-        "node_modules/cross-spawn": {
-            "version": "7.0.6",
-            "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
-            "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "path-key": "^3.1.0",
-                "shebang-command": "^2.0.0",
-                "which": "^2.0.1"
-            },
-            "engines": {
-                "node": ">= 8"
-            }
-        },
-        "node_modules/css-loader": {
-            "version": "7.1.2",
-            "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-7.1.2.tgz",
-            "integrity": "sha512-6WvYYn7l/XEGN8Xu2vWFt9nVzrCn39vKyTEFf/ExEyoksJjjSZV/0/35XPlMbpnr6VGhZIUg5yJrL8tGfes/FA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "icss-utils": "^5.1.0",
-                "postcss": "^8.4.33",
-                "postcss-modules-extract-imports": "^3.1.0",
-                "postcss-modules-local-by-default": "^4.0.5",
-                "postcss-modules-scope": "^3.2.0",
-                "postcss-modules-values": "^4.0.0",
-                "postcss-value-parser": "^4.2.0",
-                "semver": "^7.5.4"
-            },
-            "engines": {
-                "node": ">= 18.12.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/webpack"
-            },
-            "peerDependencies": {
-                "@rspack/core": "0.x || 1.x",
-                "webpack": "^5.27.0"
-            },
-            "peerDependenciesMeta": {
-                "@rspack/core": {
-                    "optional": true
-                },
-                "webpack": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/cssesc": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-            "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
-            "dev": true,
-            "license": "MIT",
-            "bin": {
-                "cssesc": "bin/cssesc"
-            },
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/date-fns": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-4.1.0.tgz",
-            "integrity": "sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==",
-            "dev": true,
-            "license": "MIT",
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/kossnocorp"
-            }
-        },
-        "node_modules/debug": {
-            "version": "4.4.0",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
-            "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "ms": "^2.1.3"
-            },
-            "engines": {
-                "node": ">=6.0"
-            },
-            "peerDependenciesMeta": {
-                "supports-color": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/dedent": {
-            "version": "1.5.3",
-            "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.3.tgz",
-            "integrity": "sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==",
-            "dev": true,
-            "license": "MIT",
-            "peerDependencies": {
-                "babel-plugin-macros": "^3.1.0"
-            },
-            "peerDependenciesMeta": {
-                "babel-plugin-macros": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/deep-is": {
-            "version": "0.1.4",
-            "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-            "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/deepmerge": {
-            "version": "4.3.1",
-            "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
-            "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/detect-libc": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
-            "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
-            "dev": true,
-            "license": "Apache-2.0",
-            "optional": true,
-            "bin": {
-                "detect-libc": "bin/detect-libc.js"
-            },
-            "engines": {
-                "node": ">=0.10"
-            }
-        },
-        "node_modules/detect-newline": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
-            "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/diff-sequences": {
-            "version": "29.6.3",
-            "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
-            "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-            }
-        },
-        "node_modules/ejs": {
-            "version": "3.1.10",
-            "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
-            "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==",
-            "dev": true,
-            "license": "Apache-2.0",
-            "dependencies": {
-                "jake": "^10.8.5"
-            },
-            "bin": {
-                "ejs": "bin/cli.js"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/electron-to-chromium": {
-            "version": "1.5.102",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.102.tgz",
-            "integrity": "sha512-eHhqaja8tE/FNpIiBrvBjFV/SSKpyWHLvxuR9dPTdo+3V9ppdLmFB7ZZQ98qNovcngPLYIz0oOBF9P0FfZef5Q==",
-            "dev": true,
-            "license": "ISC"
-        },
-        "node_modules/emittery": {
-            "version": "0.13.1",
-            "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz",
-            "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=12"
-            },
-            "funding": {
-                "url": "https://github.com/sindresorhus/emittery?sponsor=1"
-            }
-        },
-        "node_modules/emoji-regex": {
-            "version": "8.0.0",
-            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/emojis-list": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
-            "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">= 4"
-            }
-        },
-        "node_modules/enhanced-resolve": {
-            "version": "5.18.1",
-            "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.1.tgz",
-            "integrity": "sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "graceful-fs": "^4.2.4",
-                "tapable": "^2.2.0"
-            },
-            "engines": {
-                "node": ">=10.13.0"
-            }
-        },
-        "node_modules/envinfo": {
-            "version": "7.14.0",
-            "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.14.0.tgz",
-            "integrity": "sha512-CO40UI41xDQzhLB1hWyqUKgFhs250pNcGbyGKe1l/e4FSaI/+YE4IMG76GDt0In67WLPACIITC+sOi08x4wIvg==",
-            "dev": true,
-            "license": "MIT",
-            "bin": {
-                "envinfo": "dist/cli.js"
-            },
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/error-ex": {
-            "version": "1.3.2",
-            "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-            "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "is-arrayish": "^0.2.1"
-            }
-        },
-        "node_modules/es-module-lexer": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.6.0.tgz",
-            "integrity": "sha512-qqnD1yMU6tk/jnaMosogGySTZP8YtUgAffA9nMN+E/rjxcfRQ6IEk7IiozUjgxKoFHBGjTLnrHB/YC45r/59EQ==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/escalade": {
-            "version": "3.2.0",
-            "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
-            "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/escape-string-regexp": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-            "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/eslint": {
-            "version": "9.20.1",
-            "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.20.1.tgz",
-            "integrity": "sha512-m1mM33o6dBUjxl2qb6wv6nGNwCAsns1eKtaQ4l/NPHeTvhiUPbtdfMyktxN4B3fgHIgsYh1VT3V9txblpQHq+g==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@eslint-community/eslint-utils": "^4.2.0",
-                "@eslint-community/regexpp": "^4.12.1",
-                "@eslint/config-array": "^0.19.0",
-                "@eslint/core": "^0.11.0",
-                "@eslint/eslintrc": "^3.2.0",
-                "@eslint/js": "9.20.0",
-                "@eslint/plugin-kit": "^0.2.5",
-                "@humanfs/node": "^0.16.6",
-                "@humanwhocodes/module-importer": "^1.0.1",
-                "@humanwhocodes/retry": "^0.4.1",
-                "@types/estree": "^1.0.6",
-                "@types/json-schema": "^7.0.15",
-                "ajv": "^6.12.4",
-                "chalk": "^4.0.0",
-                "cross-spawn": "^7.0.6",
-                "debug": "^4.3.2",
-                "escape-string-regexp": "^4.0.0",
-                "eslint-scope": "^8.2.0",
-                "eslint-visitor-keys": "^4.2.0",
-                "espree": "^10.3.0",
-                "esquery": "^1.5.0",
-                "esutils": "^2.0.2",
-                "fast-deep-equal": "^3.1.3",
-                "file-entry-cache": "^8.0.0",
-                "find-up": "^5.0.0",
-                "glob-parent": "^6.0.2",
-                "ignore": "^5.2.0",
-                "imurmurhash": "^0.1.4",
-                "is-glob": "^4.0.0",
-                "json-stable-stringify-without-jsonify": "^1.0.1",
-                "lodash.merge": "^4.6.2",
-                "minimatch": "^3.1.2",
-                "natural-compare": "^1.4.0",
-                "optionator": "^0.9.3"
-            },
-            "bin": {
-                "eslint": "bin/eslint.js"
-            },
-            "engines": {
-                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-            },
-            "funding": {
-                "url": "https://eslint.org/donate"
-            },
-            "peerDependencies": {
-                "jiti": "*"
-            },
-            "peerDependenciesMeta": {
-                "jiti": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/eslint-plugin-unused-imports": {
-            "version": "4.1.4",
-            "resolved": "https://registry.npmjs.org/eslint-plugin-unused-imports/-/eslint-plugin-unused-imports-4.1.4.tgz",
-            "integrity": "sha512-YptD6IzQjDardkl0POxnnRBhU1OEePMV0nd6siHaRBbd+lyh6NAhFEobiznKU7kTsSsDeSD62Pe7kAM1b7dAZQ==",
-            "dev": true,
-            "license": "MIT",
-            "peerDependencies": {
-                "@typescript-eslint/eslint-plugin": "^8.0.0-0 || ^7.0.0 || ^6.0.0 || ^5.0.0",
-                "eslint": "^9.0.0 || ^8.0.0"
-            },
-            "peerDependenciesMeta": {
-                "@typescript-eslint/eslint-plugin": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/eslint-scope": {
-            "version": "8.2.0",
-            "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.2.0.tgz",
-            "integrity": "sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==",
-            "dev": true,
-            "license": "BSD-2-Clause",
-            "dependencies": {
-                "esrecurse": "^4.3.0",
-                "estraverse": "^5.2.0"
-            },
-            "engines": {
-                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-            },
-            "funding": {
-                "url": "https://opencollective.com/eslint"
-            }
-        },
-        "node_modules/eslint-visitor-keys": {
-            "version": "4.2.0",
-            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
-            "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
-            "dev": true,
-            "license": "Apache-2.0",
-            "engines": {
-                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-            },
-            "funding": {
-                "url": "https://opencollective.com/eslint"
-            }
-        },
-        "node_modules/espree": {
-            "version": "10.3.0",
-            "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz",
-            "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==",
-            "dev": true,
-            "license": "BSD-2-Clause",
-            "dependencies": {
-                "acorn": "^8.14.0",
-                "acorn-jsx": "^5.3.2",
-                "eslint-visitor-keys": "^4.2.0"
-            },
-            "engines": {
-                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-            },
-            "funding": {
-                "url": "https://opencollective.com/eslint"
-            }
-        },
-        "node_modules/esprima": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-            "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-            "dev": true,
-            "license": "BSD-2-Clause",
-            "bin": {
-                "esparse": "bin/esparse.js",
-                "esvalidate": "bin/esvalidate.js"
-            },
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/esquery": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
-            "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
-            "dev": true,
-            "license": "BSD-3-Clause",
-            "dependencies": {
-                "estraverse": "^5.1.0"
-            },
-            "engines": {
-                "node": ">=0.10"
-            }
-        },
-        "node_modules/esrecurse": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-            "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-            "dev": true,
-            "license": "BSD-2-Clause",
-            "dependencies": {
-                "estraverse": "^5.2.0"
-            },
-            "engines": {
-                "node": ">=4.0"
-            }
-        },
-        "node_modules/estraverse": {
-            "version": "5.3.0",
-            "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-            "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-            "dev": true,
-            "license": "BSD-2-Clause",
-            "engines": {
-                "node": ">=4.0"
-            }
-        },
-        "node_modules/esutils": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-            "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-            "dev": true,
-            "license": "BSD-2-Clause",
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/eventemitter3": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz",
-            "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/events": {
-            "version": "3.3.0",
-            "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
-            "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=0.8.x"
-            }
-        },
-        "node_modules/execa": {
-            "version": "5.1.1",
-            "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-            "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "cross-spawn": "^7.0.3",
-                "get-stream": "^6.0.0",
-                "human-signals": "^2.1.0",
-                "is-stream": "^2.0.0",
-                "merge-stream": "^2.0.0",
-                "npm-run-path": "^4.0.1",
-                "onetime": "^5.1.2",
-                "signal-exit": "^3.0.3",
-                "strip-final-newline": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sindresorhus/execa?sponsor=1"
-            }
-        },
-        "node_modules/exit": {
-            "version": "0.1.2",
-            "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-            "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",
-            "dev": true,
-            "engines": {
-                "node": ">= 0.8.0"
-            }
-        },
-        "node_modules/expect": {
-            "version": "29.7.0",
-            "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz",
-            "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@jest/expect-utils": "^29.7.0",
-                "jest-get-type": "^29.6.3",
-                "jest-matcher-utils": "^29.7.0",
-                "jest-message-util": "^29.7.0",
-                "jest-util": "^29.7.0"
-            },
-            "engines": {
-                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-            }
-        },
-        "node_modules/fast-deep-equal": {
-            "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-glob": {
-            "version": "3.3.3",
-            "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
-            "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@nodelib/fs.stat": "^2.0.2",
-                "@nodelib/fs.walk": "^1.2.3",
-                "glob-parent": "^5.1.2",
-                "merge2": "^1.3.0",
-                "micromatch": "^4.0.8"
-            },
-            "engines": {
-                "node": ">=8.6.0"
-            }
-        },
-        "node_modules/fast-glob/node_modules/glob-parent": {
-            "version": "5.1.2",
-            "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-            "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-            "dev": true,
-            "license": "ISC",
-            "dependencies": {
-                "is-glob": "^4.0.1"
-            },
-            "engines": {
-                "node": ">= 6"
-            }
-        },
-        "node_modules/fast-json-stable-stringify": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-            "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/fast-levenshtein": {
-            "version": "2.0.6",
-            "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-            "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/fast-uri": {
-            "version": "3.0.6",
-            "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.6.tgz",
-            "integrity": "sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/fastify"
-                },
-                {
-                    "type": "opencollective",
-                    "url": "https://opencollective.com/fastify"
-                }
-            ],
-            "license": "BSD-3-Clause"
-        },
-        "node_modules/fastest-levenshtein": {
-            "version": "1.0.16",
-            "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz",
-            "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">= 4.9.1"
-            }
-        },
-        "node_modules/fastq": {
-            "version": "1.19.0",
-            "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.0.tgz",
-            "integrity": "sha512-7SFSRCNjBQIZH/xZR3iy5iQYR8aGBE0h3VG6/cwlbrpdciNYBMotQav8c1XI3HjHH+NikUpP53nPdlZSdWmFzA==",
-            "dev": true,
-            "license": "ISC",
-            "dependencies": {
-                "reusify": "^1.0.4"
-            }
-        },
-        "node_modules/fb-watchman": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz",
-            "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
-            "dev": true,
-            "license": "Apache-2.0",
-            "dependencies": {
-                "bser": "2.1.1"
-            }
-        },
-        "node_modules/fetch-retry": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/fetch-retry/-/fetch-retry-6.0.0.tgz",
-            "integrity": "sha512-BUFj1aMubgib37I3v4q78fYo63Po7t4HUPTpQ6/QE6yK6cIQrP+W43FYToeTEyg5m2Y7eFUtijUuAv/PDlWuag==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/file-entry-cache": {
-            "version": "8.0.0",
-            "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz",
-            "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "flat-cache": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=16.0.0"
-            }
-        },
-        "node_modules/file-loader": {
-            "version": "6.2.0",
-            "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz",
-            "integrity": "sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "loader-utils": "^2.0.0",
-                "schema-utils": "^3.0.0"
-            },
-            "engines": {
-                "node": ">= 10.13.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/webpack"
-            },
-            "peerDependencies": {
-                "webpack": "^4.0.0 || ^5.0.0"
-            }
-        },
-        "node_modules/filelist": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
-            "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==",
-            "dev": true,
-            "license": "Apache-2.0",
-            "dependencies": {
-                "minimatch": "^5.0.1"
-            }
-        },
-        "node_modules/filelist/node_modules/brace-expansion": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-            "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "balanced-match": "^1.0.0"
-            }
-        },
-        "node_modules/filelist/node_modules/minimatch": {
-            "version": "5.1.6",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
-            "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
-            "dev": true,
-            "license": "ISC",
-            "dependencies": {
-                "brace-expansion": "^2.0.1"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/fill-range": {
-            "version": "7.1.1",
-            "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
-            "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "to-regex-range": "^5.0.1"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/find-up": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-            "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "locate-path": "^6.0.0",
-                "path-exists": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/flat": {
-            "version": "5.0.2",
-            "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
-            "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
-            "dev": true,
-            "license": "BSD-3-Clause",
-            "bin": {
-                "flat": "cli.js"
-            }
-        },
-        "node_modules/flat-cache": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz",
-            "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "flatted": "^3.2.9",
-                "keyv": "^4.5.4"
-            },
-            "engines": {
-                "node": ">=16"
-            }
-        },
-        "node_modules/flatted": {
-            "version": "3.3.3",
-            "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz",
-            "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==",
-            "dev": true,
-            "license": "ISC"
-        },
-        "node_modules/fs-extra": {
-            "version": "11.3.0",
-            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.0.tgz",
-            "integrity": "sha512-Z4XaCL6dUDHfP/jT25jJKMmtxvuwbkrD1vNSMFlo9lNLY2c5FHYSQgHPRZUjAB26TpDEoW9HCOgplrdbaPV/ew==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "graceful-fs": "^4.2.0",
-                "jsonfile": "^6.0.1",
-                "universalify": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=14.14"
-            }
-        },
-        "node_modules/fs.realpath": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-            "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
-            "dev": true,
-            "license": "ISC"
-        },
-        "node_modules/fsevents": {
-            "version": "2.3.3",
-            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-            "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-            "dev": true,
-            "hasInstallScript": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "darwin"
-            ],
-            "engines": {
-                "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-            }
-        },
-        "node_modules/function-bind": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
-            "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
-            "dev": true,
-            "license": "MIT",
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/gensync": {
-            "version": "1.0.0-beta.2",
-            "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-            "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=6.9.0"
-            }
-        },
-        "node_modules/get-caller-file": {
-            "version": "2.0.5",
-            "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-            "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-            "dev": true,
-            "license": "ISC",
-            "engines": {
-                "node": "6.* || 8.* || >= 10.*"
-            }
-        },
-        "node_modules/get-package-type": {
-            "version": "0.1.0",
-            "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
-            "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=8.0.0"
-            }
-        },
-        "node_modules/get-stream": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-            "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/glob": {
-            "version": "7.2.3",
-            "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-            "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-            "deprecated": "Glob versions prior to v9 are no longer supported",
-            "dev": true,
-            "license": "ISC",
-            "dependencies": {
-                "fs.realpath": "^1.0.0",
-                "inflight": "^1.0.4",
-                "inherits": "2",
-                "minimatch": "^3.1.1",
-                "once": "^1.3.0",
-                "path-is-absolute": "^1.0.0"
-            },
-            "engines": {
-                "node": "*"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/isaacs"
-            }
-        },
-        "node_modules/glob-parent": {
-            "version": "6.0.2",
-            "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-            "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-            "dev": true,
-            "license": "ISC",
-            "dependencies": {
-                "is-glob": "^4.0.3"
-            },
-            "engines": {
-                "node": ">=10.13.0"
-            }
-        },
-        "node_modules/glob-to-regexp": {
-            "version": "0.4.1",
-            "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
-            "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
-            "dev": true,
-            "license": "BSD-2-Clause"
-        },
-        "node_modules/globals": {
-            "version": "14.0.0",
-            "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz",
-            "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=18"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/graceful-fs": {
-            "version": "4.2.11",
-            "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
-            "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
-            "dev": true,
-            "license": "ISC"
-        },
-        "node_modules/graphemer": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
-            "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/has-flag": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/hasown": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
-            "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "function-bind": "^1.1.2"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            }
-        },
-        "node_modules/html-escaper": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
-            "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/https-proxy-agent": {
-            "version": "7.0.6",
-            "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
-            "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "agent-base": "^7.1.2",
-                "debug": "4"
-            },
-            "engines": {
-                "node": ">= 14"
-            }
-        },
-        "node_modules/human-signals": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-            "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
-            "dev": true,
-            "license": "Apache-2.0",
-            "engines": {
-                "node": ">=10.17.0"
-            }
-        },
-        "node_modules/icss-utils": {
-            "version": "5.1.0",
-            "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
-            "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
-            "dev": true,
-            "license": "ISC",
-            "engines": {
-                "node": "^10 || ^12 || >= 14"
-            },
-            "peerDependencies": {
-                "postcss": "^8.1.0"
-            }
-        },
-        "node_modules/ignore": {
-            "version": "5.3.2",
-            "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
-            "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">= 4"
-            }
-        },
-        "node_modules/immutable": {
-            "version": "5.0.3",
-            "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.0.3.tgz",
-            "integrity": "sha512-P8IdPQHq3lA1xVeBRi5VPqUm5HDgKnx0Ru51wZz5mjxHr5n3RWhjIpOFU7ybkUxfB+5IToy+OLaHYDBIWsv+uw==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/import-fresh": {
-            "version": "3.3.1",
-            "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz",
-            "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "parent-module": "^1.0.0",
-                "resolve-from": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=6"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/import-local": {
-            "version": "3.2.0",
-            "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz",
-            "integrity": "sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "pkg-dir": "^4.2.0",
-                "resolve-cwd": "^3.0.0"
-            },
-            "bin": {
-                "import-local-fixture": "fixtures/cli.js"
-            },
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/imurmurhash": {
-            "version": "0.1.4",
-            "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-            "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=0.8.19"
-            }
-        },
-        "node_modules/index-to-position": {
-            "version": "0.1.2",
-            "resolved": "https://registry.npmjs.org/index-to-position/-/index-to-position-0.1.2.tgz",
-            "integrity": "sha512-MWDKS3AS1bGCHLBA2VLImJz42f7bJh8wQsTGCzI3j519/CASStoDONUBVz2I/VID0MpiX3SGSnbOD2xUalbE5g==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=18"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/inflight": {
-            "version": "1.0.6",
-            "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-            "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-            "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
-            "dev": true,
-            "license": "ISC",
-            "dependencies": {
-                "once": "^1.3.0",
-                "wrappy": "1"
-            }
-        },
-        "node_modules/inherits": {
-            "version": "2.0.4",
-            "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-            "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-            "dev": true,
-            "license": "ISC"
-        },
-        "node_modules/interpret": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/interpret/-/interpret-3.1.1.tgz",
-            "integrity": "sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=10.13.0"
-            }
-        },
-        "node_modules/is-arrayish": {
-            "version": "0.2.1",
-            "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-            "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/is-core-module": {
-            "version": "2.16.1",
-            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
-            "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "hasown": "^2.0.2"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/is-extglob": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-            "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/is-fullwidth-code-point": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-            "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/is-generator-fn": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
-            "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/is-glob": {
-            "version": "4.0.3",
-            "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-            "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "is-extglob": "^2.1.1"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/is-number": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-            "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=0.12.0"
-            }
-        },
-        "node_modules/is-plain-object": {
-            "version": "2.0.4",
-            "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-            "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "isobject": "^3.0.1"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/is-stream": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-            "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/isexe": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-            "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
-            "dev": true,
-            "license": "ISC"
-        },
-        "node_modules/isobject": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-            "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/istanbul-lib-coverage": {
-            "version": "3.2.2",
-            "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
-            "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
-            "dev": true,
-            "license": "BSD-3-Clause",
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/istanbul-lib-instrument": {
-            "version": "6.0.3",
-            "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz",
-            "integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==",
-            "dev": true,
-            "license": "BSD-3-Clause",
-            "dependencies": {
-                "@babel/core": "^7.23.9",
-                "@babel/parser": "^7.23.9",
-                "@istanbuljs/schema": "^0.1.3",
-                "istanbul-lib-coverage": "^3.2.0",
-                "semver": "^7.5.4"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/istanbul-lib-report": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
-            "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
-            "dev": true,
-            "license": "BSD-3-Clause",
-            "dependencies": {
-                "istanbul-lib-coverage": "^3.0.0",
-                "make-dir": "^4.0.0",
-                "supports-color": "^7.1.0"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/istanbul-lib-source-maps": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
-            "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
-            "dev": true,
-            "license": "BSD-3-Clause",
-            "dependencies": {
-                "debug": "^4.1.1",
-                "istanbul-lib-coverage": "^3.0.0",
-                "source-map": "^0.6.1"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/istanbul-reports": {
-            "version": "3.1.7",
-            "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz",
-            "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==",
-            "dev": true,
-            "license": "BSD-3-Clause",
-            "dependencies": {
-                "html-escaper": "^2.0.0",
-                "istanbul-lib-report": "^3.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/jake": {
-            "version": "10.9.2",
-            "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.2.tgz",
-            "integrity": "sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==",
-            "dev": true,
-            "license": "Apache-2.0",
-            "dependencies": {
-                "async": "^3.2.3",
-                "chalk": "^4.0.2",
-                "filelist": "^1.0.4",
-                "minimatch": "^3.1.2"
-            },
-            "bin": {
-                "jake": "bin/cli.js"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/jest": {
-            "version": "29.7.0",
-            "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz",
-            "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@jest/core": "^29.7.0",
-                "@jest/types": "^29.6.3",
-                "import-local": "^3.0.2",
-                "jest-cli": "^29.7.0"
-            },
-            "bin": {
-                "jest": "bin/jest.js"
-            },
-            "engines": {
-                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-            },
-            "peerDependencies": {
-                "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
-            },
-            "peerDependenciesMeta": {
-                "node-notifier": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/jest-changed-files": {
-            "version": "29.7.0",
-            "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz",
-            "integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "execa": "^5.0.0",
-                "jest-util": "^29.7.0",
-                "p-limit": "^3.1.0"
-            },
-            "engines": {
-                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-            }
-        },
-        "node_modules/jest-circus": {
-            "version": "29.7.0",
-            "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz",
-            "integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@jest/environment": "^29.7.0",
-                "@jest/expect": "^29.7.0",
-                "@jest/test-result": "^29.7.0",
-                "@jest/types": "^29.6.3",
-                "@types/node": "*",
-                "chalk": "^4.0.0",
-                "co": "^4.6.0",
-                "dedent": "^1.0.0",
-                "is-generator-fn": "^2.0.0",
-                "jest-each": "^29.7.0",
-                "jest-matcher-utils": "^29.7.0",
-                "jest-message-util": "^29.7.0",
-                "jest-runtime": "^29.7.0",
-                "jest-snapshot": "^29.7.0",
-                "jest-util": "^29.7.0",
-                "p-limit": "^3.1.0",
-                "pretty-format": "^29.7.0",
-                "pure-rand": "^6.0.0",
-                "slash": "^3.0.0",
-                "stack-utils": "^2.0.3"
-            },
-            "engines": {
-                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-            }
-        },
-        "node_modules/jest-cli": {
-            "version": "29.7.0",
-            "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz",
-            "integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@jest/core": "^29.7.0",
-                "@jest/test-result": "^29.7.0",
-                "@jest/types": "^29.6.3",
-                "chalk": "^4.0.0",
-                "create-jest": "^29.7.0",
-                "exit": "^0.1.2",
-                "import-local": "^3.0.2",
-                "jest-config": "^29.7.0",
-                "jest-util": "^29.7.0",
-                "jest-validate": "^29.7.0",
-                "yargs": "^17.3.1"
-            },
-            "bin": {
-                "jest": "bin/jest.js"
-            },
-            "engines": {
-                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-            },
-            "peerDependencies": {
-                "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
-            },
-            "peerDependenciesMeta": {
-                "node-notifier": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/jest-config": {
-            "version": "29.7.0",
-            "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz",
-            "integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@babel/core": "^7.11.6",
-                "@jest/test-sequencer": "^29.7.0",
-                "@jest/types": "^29.6.3",
-                "babel-jest": "^29.7.0",
-                "chalk": "^4.0.0",
-                "ci-info": "^3.2.0",
-                "deepmerge": "^4.2.2",
-                "glob": "^7.1.3",
-                "graceful-fs": "^4.2.9",
-                "jest-circus": "^29.7.0",
-                "jest-environment-node": "^29.7.0",
-                "jest-get-type": "^29.6.3",
-                "jest-regex-util": "^29.6.3",
-                "jest-resolve": "^29.7.0",
-                "jest-runner": "^29.7.0",
-                "jest-util": "^29.7.0",
-                "jest-validate": "^29.7.0",
-                "micromatch": "^4.0.4",
-                "parse-json": "^5.2.0",
-                "pretty-format": "^29.7.0",
-                "slash": "^3.0.0",
-                "strip-json-comments": "^3.1.1"
-            },
-            "engines": {
-                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-            },
-            "peerDependencies": {
-                "@types/node": "*",
-                "ts-node": ">=9.0.0"
-            },
-            "peerDependenciesMeta": {
-                "@types/node": {
-                    "optional": true
-                },
-                "ts-node": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/jest-diff": {
-            "version": "29.7.0",
-            "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz",
-            "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "chalk": "^4.0.0",
-                "diff-sequences": "^29.6.3",
-                "jest-get-type": "^29.6.3",
-                "pretty-format": "^29.7.0"
-            },
-            "engines": {
-                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-            }
-        },
-        "node_modules/jest-docblock": {
-            "version": "29.7.0",
-            "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz",
-            "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "detect-newline": "^3.0.0"
-            },
-            "engines": {
-                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-            }
-        },
-        "node_modules/jest-each": {
-            "version": "29.7.0",
-            "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz",
-            "integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@jest/types": "^29.6.3",
-                "chalk": "^4.0.0",
-                "jest-get-type": "^29.6.3",
-                "jest-util": "^29.7.0",
-                "pretty-format": "^29.7.0"
-            },
-            "engines": {
-                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-            }
-        },
-        "node_modules/jest-environment-node": {
-            "version": "29.7.0",
-            "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz",
-            "integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@jest/environment": "^29.7.0",
-                "@jest/fake-timers": "^29.7.0",
-                "@jest/types": "^29.6.3",
-                "@types/node": "*",
-                "jest-mock": "^29.7.0",
-                "jest-util": "^29.7.0"
-            },
-            "engines": {
-                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-            }
-        },
-        "node_modules/jest-get-type": {
-            "version": "29.6.3",
-            "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz",
-            "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-            }
-        },
-        "node_modules/jest-haste-map": {
-            "version": "29.7.0",
-            "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz",
-            "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@jest/types": "^29.6.3",
-                "@types/graceful-fs": "^4.1.3",
-                "@types/node": "*",
-                "anymatch": "^3.0.3",
-                "fb-watchman": "^2.0.0",
-                "graceful-fs": "^4.2.9",
-                "jest-regex-util": "^29.6.3",
-                "jest-util": "^29.7.0",
-                "jest-worker": "^29.7.0",
-                "micromatch": "^4.0.4",
-                "walker": "^1.0.8"
-            },
-            "engines": {
-                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-            },
-            "optionalDependencies": {
-                "fsevents": "^2.3.2"
-            }
-        },
-        "node_modules/jest-leak-detector": {
-            "version": "29.7.0",
-            "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz",
-            "integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "jest-get-type": "^29.6.3",
-                "pretty-format": "^29.7.0"
-            },
-            "engines": {
-                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-            }
-        },
-        "node_modules/jest-matcher-utils": {
-            "version": "29.7.0",
-            "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz",
-            "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "chalk": "^4.0.0",
-                "jest-diff": "^29.7.0",
-                "jest-get-type": "^29.6.3",
-                "pretty-format": "^29.7.0"
-            },
-            "engines": {
-                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-            }
-        },
-        "node_modules/jest-message-util": {
-            "version": "29.7.0",
-            "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz",
-            "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@babel/code-frame": "^7.12.13",
-                "@jest/types": "^29.6.3",
-                "@types/stack-utils": "^2.0.0",
-                "chalk": "^4.0.0",
-                "graceful-fs": "^4.2.9",
-                "micromatch": "^4.0.4",
-                "pretty-format": "^29.7.0",
-                "slash": "^3.0.0",
-                "stack-utils": "^2.0.3"
-            },
-            "engines": {
-                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-            }
-        },
-        "node_modules/jest-mock": {
-            "version": "29.7.0",
-            "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz",
-            "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@jest/types": "^29.6.3",
-                "@types/node": "*",
-                "jest-util": "^29.7.0"
-            },
-            "engines": {
-                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-            }
-        },
-        "node_modules/jest-pnp-resolver": {
-            "version": "1.2.3",
-            "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
-            "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=6"
-            },
-            "peerDependencies": {
-                "jest-resolve": "*"
-            },
-            "peerDependenciesMeta": {
-                "jest-resolve": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/jest-regex-util": {
-            "version": "29.6.3",
-            "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz",
-            "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-            }
-        },
-        "node_modules/jest-resolve": {
-            "version": "29.7.0",
-            "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz",
-            "integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "chalk": "^4.0.0",
-                "graceful-fs": "^4.2.9",
-                "jest-haste-map": "^29.7.0",
-                "jest-pnp-resolver": "^1.2.2",
-                "jest-util": "^29.7.0",
-                "jest-validate": "^29.7.0",
-                "resolve": "^1.20.0",
-                "resolve.exports": "^2.0.0",
-                "slash": "^3.0.0"
-            },
-            "engines": {
-                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-            }
-        },
-        "node_modules/jest-resolve-dependencies": {
-            "version": "29.7.0",
-            "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz",
-            "integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "jest-regex-util": "^29.6.3",
-                "jest-snapshot": "^29.7.0"
-            },
-            "engines": {
-                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-            }
-        },
-        "node_modules/jest-runner": {
-            "version": "29.7.0",
-            "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz",
-            "integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@jest/console": "^29.7.0",
-                "@jest/environment": "^29.7.0",
-                "@jest/test-result": "^29.7.0",
-                "@jest/transform": "^29.7.0",
-                "@jest/types": "^29.6.3",
-                "@types/node": "*",
-                "chalk": "^4.0.0",
-                "emittery": "^0.13.1",
-                "graceful-fs": "^4.2.9",
-                "jest-docblock": "^29.7.0",
-                "jest-environment-node": "^29.7.0",
-                "jest-haste-map": "^29.7.0",
-                "jest-leak-detector": "^29.7.0",
-                "jest-message-util": "^29.7.0",
-                "jest-resolve": "^29.7.0",
-                "jest-runtime": "^29.7.0",
-                "jest-util": "^29.7.0",
-                "jest-watcher": "^29.7.0",
-                "jest-worker": "^29.7.0",
-                "p-limit": "^3.1.0",
-                "source-map-support": "0.5.13"
-            },
-            "engines": {
-                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-            }
-        },
-        "node_modules/jest-runtime": {
-            "version": "29.7.0",
-            "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz",
-            "integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@jest/environment": "^29.7.0",
-                "@jest/fake-timers": "^29.7.0",
-                "@jest/globals": "^29.7.0",
-                "@jest/source-map": "^29.6.3",
-                "@jest/test-result": "^29.7.0",
-                "@jest/transform": "^29.7.0",
-                "@jest/types": "^29.6.3",
-                "@types/node": "*",
-                "chalk": "^4.0.0",
-                "cjs-module-lexer": "^1.0.0",
-                "collect-v8-coverage": "^1.0.0",
-                "glob": "^7.1.3",
-                "graceful-fs": "^4.2.9",
-                "jest-haste-map": "^29.7.0",
-                "jest-message-util": "^29.7.0",
-                "jest-mock": "^29.7.0",
-                "jest-regex-util": "^29.6.3",
-                "jest-resolve": "^29.7.0",
-                "jest-snapshot": "^29.7.0",
-                "jest-util": "^29.7.0",
-                "slash": "^3.0.0",
-                "strip-bom": "^4.0.0"
-            },
-            "engines": {
-                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-            }
-        },
-        "node_modules/jest-snapshot": {
-            "version": "29.7.0",
-            "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz",
-            "integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@babel/core": "^7.11.6",
-                "@babel/generator": "^7.7.2",
-                "@babel/plugin-syntax-jsx": "^7.7.2",
-                "@babel/plugin-syntax-typescript": "^7.7.2",
-                "@babel/types": "^7.3.3",
-                "@jest/expect-utils": "^29.7.0",
-                "@jest/transform": "^29.7.0",
-                "@jest/types": "^29.6.3",
-                "babel-preset-current-node-syntax": "^1.0.0",
-                "chalk": "^4.0.0",
-                "expect": "^29.7.0",
-                "graceful-fs": "^4.2.9",
-                "jest-diff": "^29.7.0",
-                "jest-get-type": "^29.6.3",
-                "jest-matcher-utils": "^29.7.0",
-                "jest-message-util": "^29.7.0",
-                "jest-util": "^29.7.0",
-                "natural-compare": "^1.4.0",
-                "pretty-format": "^29.7.0",
-                "semver": "^7.5.3"
-            },
-            "engines": {
-                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-            }
-        },
-        "node_modules/jest-util": {
-            "version": "29.7.0",
-            "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
-            "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@jest/types": "^29.6.3",
-                "@types/node": "*",
-                "chalk": "^4.0.0",
-                "ci-info": "^3.2.0",
-                "graceful-fs": "^4.2.9",
-                "picomatch": "^2.2.3"
-            },
-            "engines": {
-                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-            }
-        },
-        "node_modules/jest-validate": {
-            "version": "29.7.0",
-            "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz",
-            "integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@jest/types": "^29.6.3",
-                "camelcase": "^6.2.0",
-                "chalk": "^4.0.0",
-                "jest-get-type": "^29.6.3",
-                "leven": "^3.1.0",
-                "pretty-format": "^29.7.0"
-            },
-            "engines": {
-                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-            }
-        },
-        "node_modules/jest-validate/node_modules/camelcase": {
-            "version": "6.3.0",
-            "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
-            "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/jest-watcher": {
-            "version": "29.7.0",
-            "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz",
-            "integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@jest/test-result": "^29.7.0",
-                "@jest/types": "^29.6.3",
-                "@types/node": "*",
-                "ansi-escapes": "^4.2.1",
-                "chalk": "^4.0.0",
-                "emittery": "^0.13.1",
-                "jest-util": "^29.7.0",
-                "string-length": "^4.0.1"
-            },
-            "engines": {
-                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-            }
-        },
-        "node_modules/jest-worker": {
-            "version": "29.7.0",
-            "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz",
-            "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@types/node": "*",
-                "jest-util": "^29.7.0",
-                "merge-stream": "^2.0.0",
-                "supports-color": "^8.0.0"
-            },
-            "engines": {
-                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-            }
-        },
-        "node_modules/jest-worker/node_modules/supports-color": {
-            "version": "8.1.1",
-            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-            "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "has-flag": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/supports-color?sponsor=1"
-            }
-        },
-        "node_modules/js-levenshtein": {
-            "version": "1.1.6",
-            "resolved": "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.6.tgz",
-            "integrity": "sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/js-tokens": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-            "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/js-yaml": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-            "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "argparse": "^2.0.1"
-            },
-            "bin": {
-                "js-yaml": "bin/js-yaml.js"
-            }
-        },
-        "node_modules/jsesc": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
-            "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",
-            "dev": true,
-            "license": "MIT",
-            "bin": {
-                "jsesc": "bin/jsesc"
-            },
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/json-buffer": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
-            "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/json-parse-even-better-errors": {
-            "version": "2.3.1",
-            "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-            "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/json-schema-traverse": {
-            "version": "0.4.1",
-            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-            "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/json-stable-stringify-without-jsonify": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-            "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/json5": {
-            "version": "2.2.3",
-            "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
-            "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
-            "dev": true,
-            "license": "MIT",
-            "bin": {
-                "json5": "lib/cli.js"
-            },
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/jsonfile": {
-            "version": "6.1.0",
-            "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-            "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "universalify": "^2.0.0"
-            },
-            "optionalDependencies": {
-                "graceful-fs": "^4.1.6"
-            }
-        },
-        "node_modules/keyv": {
-            "version": "4.5.4",
-            "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
-            "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "json-buffer": "3.0.1"
-            }
-        },
-        "node_modules/kind-of": {
-            "version": "6.0.3",
-            "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-            "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/kleur": {
-            "version": "3.0.3",
-            "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
-            "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/leven": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
-            "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/levn": {
-            "version": "0.4.1",
-            "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-            "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "prelude-ls": "^1.2.1",
-                "type-check": "~0.4.0"
-            },
-            "engines": {
-                "node": ">= 0.8.0"
-            }
-        },
-        "node_modules/lines-and-columns": {
-            "version": "1.2.4",
-            "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-            "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/loader-runner": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
-            "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=6.11.5"
-            }
-        },
-        "node_modules/loader-utils": {
-            "version": "2.0.4",
-            "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
-            "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "big.js": "^5.2.2",
-                "emojis-list": "^3.0.0",
-                "json5": "^2.1.2"
-            },
-            "engines": {
-                "node": ">=8.9.0"
-            }
-        },
-        "node_modules/locate-path": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-            "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "p-locate": "^5.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/lodash": {
-            "version": "4.17.21",
-            "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-            "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/lodash.memoize": {
-            "version": "4.1.2",
-            "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
-            "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/lodash.merge": {
-            "version": "4.6.2",
-            "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-            "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/lru-cache": {
-            "version": "5.1.1",
-            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-            "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-            "dev": true,
-            "license": "ISC",
-            "dependencies": {
-                "yallist": "^3.0.2"
-            }
-        },
-        "node_modules/make-dir": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
-            "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "semver": "^7.5.3"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/make-error": {
-            "version": "1.3.6",
-            "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
-            "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
-            "dev": true,
-            "license": "ISC"
-        },
-        "node_modules/makeerror": {
-            "version": "1.0.12",
-            "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
-            "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
-            "dev": true,
-            "license": "BSD-3-Clause",
-            "dependencies": {
-                "tmpl": "1.0.5"
-            }
-        },
-        "node_modules/merge-stream": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-            "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/merge2": {
-            "version": "1.4.1",
-            "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-            "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">= 8"
-            }
-        },
-        "node_modules/micromatch": {
-            "version": "4.0.8",
-            "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
-            "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "braces": "^3.0.3",
-                "picomatch": "^2.3.1"
-            },
-            "engines": {
-                "node": ">=8.6"
-            }
-        },
-        "node_modules/mime-db": {
-            "version": "1.52.0",
-            "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-            "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">= 0.6"
-            }
-        },
-        "node_modules/mime-types": {
-            "version": "2.1.35",
-            "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-            "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "mime-db": "1.52.0"
-            },
-            "engines": {
-                "node": ">= 0.6"
-            }
-        },
-        "node_modules/mimic-fn": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-            "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/mini-css-extract-plugin": {
-            "version": "2.9.2",
-            "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.2.tgz",
-            "integrity": "sha512-GJuACcS//jtq4kCtd5ii/M0SZf7OZRH+BxdqXZHaJfb8TJiVl+NgQRPwiYt2EuqeSkNydn/7vP+bcE27C5mb9w==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "schema-utils": "^4.0.0",
-                "tapable": "^2.2.1"
-            },
-            "engines": {
-                "node": ">= 12.13.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/webpack"
-            },
-            "peerDependencies": {
-                "webpack": "^5.0.0"
-            }
-        },
-        "node_modules/mini-css-extract-plugin/node_modules/ajv": {
-            "version": "8.17.1",
-            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
-            "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "fast-deep-equal": "^3.1.3",
-                "fast-uri": "^3.0.1",
-                "json-schema-traverse": "^1.0.0",
-                "require-from-string": "^2.0.2"
-            },
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/epoberezkin"
-            }
-        },
-        "node_modules/mini-css-extract-plugin/node_modules/ajv-keywords": {
-            "version": "5.1.0",
-            "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-            "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "fast-deep-equal": "^3.1.3"
-            },
-            "peerDependencies": {
-                "ajv": "^8.8.2"
-            }
-        },
-        "node_modules/mini-css-extract-plugin/node_modules/json-schema-traverse": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-            "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/mini-css-extract-plugin/node_modules/schema-utils": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.0.tgz",
-            "integrity": "sha512-Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@types/json-schema": "^7.0.9",
-                "ajv": "^8.9.0",
-                "ajv-formats": "^2.1.1",
-                "ajv-keywords": "^5.1.0"
-            },
-            "engines": {
-                "node": ">= 10.13.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/webpack"
-            }
-        },
-        "node_modules/minimatch": {
-            "version": "3.1.2",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-            "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-            "dev": true,
-            "license": "ISC",
-            "dependencies": {
-                "brace-expansion": "^1.1.7"
-            },
-            "engines": {
-                "node": "*"
-            }
-        },
-        "node_modules/moment": {
-            "version": "2.29.4",
-            "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
-            "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": "*"
-            }
-        },
-        "node_modules/ms": {
-            "version": "2.1.3",
-            "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-            "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/nanoid": {
-            "version": "3.3.8",
-            "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
-            "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/ai"
-                }
-            ],
-            "license": "MIT",
-            "bin": {
-                "nanoid": "bin/nanoid.cjs"
-            },
-            "engines": {
-                "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-            }
-        },
-        "node_modules/natural-compare": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-            "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/neo-async": {
-            "version": "2.6.2",
-            "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
-            "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/node-addon-api": {
-            "version": "7.1.1",
-            "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz",
-            "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==",
-            "dev": true,
-            "license": "MIT",
-            "optional": true
-        },
-        "node_modules/node-int64": {
-            "version": "0.4.0",
-            "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
-            "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/node-releases": {
-            "version": "2.0.19",
-            "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
-            "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/normalize-path": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-            "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/npm-check-updates": {
-            "version": "17.1.14",
-            "resolved": "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-17.1.14.tgz",
-            "integrity": "sha512-dr4bXIxETubLI1tFGeock5hN8yVjahvaVpx+lPO4/O2md3zJuxB7FgH3MIoTvQSCgsgkIRpe0skti01IEAA5tA==",
-            "dev": true,
-            "license": "Apache-2.0",
-            "bin": {
-                "ncu": "build/cli.js",
-                "npm-check-updates": "build/cli.js"
-            },
-            "engines": {
-                "node": "^18.18.0 || >=20.0.0",
-                "npm": ">=8.12.1"
-            }
-        },
-        "node_modules/npm-run-path": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-            "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "path-key": "^3.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/obsidian": {
-            "version": "1.8.7",
-            "resolved": "https://registry.npmjs.org/obsidian/-/obsidian-1.8.7.tgz",
-            "integrity": "sha512-h4bWwNFAGRXlMlMAzdEiIM2ppTGlrh7uGOJS6w4gClrsjc+ei/3YAtU2VdFUlCiPuTHpY4aBpFJJW75S1Tl/JA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@types/codemirror": "5.60.8",
-                "moment": "2.29.4"
-            },
-            "peerDependencies": {
-                "@codemirror/state": "^6.0.0",
-                "@codemirror/view": "^6.0.0"
-            }
-        },
-        "node_modules/once": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-            "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-            "dev": true,
-            "license": "ISC",
-            "dependencies": {
-                "wrappy": "1"
-            }
-        },
-        "node_modules/onetime": {
-            "version": "5.1.2",
-            "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-            "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "mimic-fn": "^2.1.0"
-            },
-            "engines": {
-                "node": ">=6"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/openapi-fetch": {
-            "version": "0.13.4",
-            "resolved": "https://registry.npmjs.org/openapi-fetch/-/openapi-fetch-0.13.4.tgz",
-            "integrity": "sha512-JHX7UYjLEiHuQGCPxa3CCCIqe/nc4bTIF9c4UYVC8BegAbWoS3g4gJxKX5XcG7UtYQs2060kY6DH64KkvNZahg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "openapi-typescript-helpers": "^0.0.15"
-            }
-        },
-        "node_modules/openapi-typescript": {
-            "version": "7.6.1",
-            "resolved": "https://registry.npmjs.org/openapi-typescript/-/openapi-typescript-7.6.1.tgz",
-            "integrity": "sha512-F7RXEeo/heF3O9lOXo2bNjCOtfp7u+D6W3a3VNEH2xE6v+fxLtn5nq0uvUcA1F5aT+CMhNeC5Uqtg5tlXFX/ag==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@redocly/openapi-core": "^1.28.0",
-                "ansi-colors": "^4.1.3",
-                "change-case": "^5.4.4",
-                "parse-json": "^8.1.0",
-                "supports-color": "^9.4.0",
-                "yargs-parser": "^21.1.1"
-            },
-            "bin": {
-                "openapi-typescript": "bin/cli.js"
-            },
-            "peerDependencies": {
-                "typescript": "^5.x"
-            }
-        },
-        "node_modules/openapi-typescript-helpers": {
-            "version": "0.0.15",
-            "resolved": "https://registry.npmjs.org/openapi-typescript-helpers/-/openapi-typescript-helpers-0.0.15.tgz",
-            "integrity": "sha512-opyTPaunsklCBpTK8JGef6mfPhLSnyy5a0IN9vKtx3+4aExf+KxEqYwIy3hqkedXIB97u357uLMJsOnm3GVjsw==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/openapi-typescript/node_modules/parse-json": {
-            "version": "8.1.0",
-            "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-8.1.0.tgz",
-            "integrity": "sha512-rum1bPifK5SSar35Z6EKZuYPJx85pkNaFrxBK3mwdfSJ1/WKbYrjoW/zTPSjRRamfmVX1ACBIdFAO0VRErW/EA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@babel/code-frame": "^7.22.13",
-                "index-to-position": "^0.1.2",
-                "type-fest": "^4.7.1"
-            },
-            "engines": {
-                "node": ">=18"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/openapi-typescript/node_modules/supports-color": {
-            "version": "9.4.0",
-            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-9.4.0.tgz",
-            "integrity": "sha512-VL+lNrEoIXww1coLPOmiEmK/0sGigko5COxI09KzHc2VJXJsQ37UaQ+8quuxjDeA7+KnLGTWRyOXSLLR2Wb4jw==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=12"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/supports-color?sponsor=1"
-            }
-        },
-        "node_modules/openapi-typescript/node_modules/type-fest": {
-            "version": "4.35.0",
-            "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.35.0.tgz",
-            "integrity": "sha512-2/AwEFQDFEy30iOLjrvHDIH7e4HEWH+f1Yl1bI5XMqzuoCUqwYCdxachgsgv0og/JdVZUhbfjcJAoHj5L1753A==",
-            "dev": true,
-            "license": "(MIT OR CC0-1.0)",
-            "engines": {
-                "node": ">=16"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/optionator": {
-            "version": "0.9.4",
-            "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
-            "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "deep-is": "^0.1.3",
-                "fast-levenshtein": "^2.0.6",
-                "levn": "^0.4.1",
-                "prelude-ls": "^1.2.1",
-                "type-check": "^0.4.0",
-                "word-wrap": "^1.2.5"
-            },
-            "engines": {
-                "node": ">= 0.8.0"
-            }
-        },
-        "node_modules/p-limit": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-            "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "yocto-queue": "^0.1.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/p-locate": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-            "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "p-limit": "^3.0.2"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/p-queue": {
-            "version": "8.1.0",
-            "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-8.1.0.tgz",
-            "integrity": "sha512-mxLDbbGIBEXTJL0zEx8JIylaj3xQ7Z/7eEVjcF9fJX4DBiH9oqe+oahYnlKKxm0Ci9TlWTyhSHgygxMxjIB2jw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "eventemitter3": "^5.0.1",
-                "p-timeout": "^6.1.2"
-            },
-            "engines": {
-                "node": ">=18"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/p-timeout": {
-            "version": "6.1.4",
-            "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-6.1.4.tgz",
-            "integrity": "sha512-MyIV3ZA/PmyBN/ud8vV9XzwTrNtR4jFrObymZYnZqMmW0zA8Z17vnT0rBgFE/TlohB+YCHqXMgZzb3Csp49vqg==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=14.16"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/p-try": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-            "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/parent-module": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-            "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "callsites": "^3.0.0"
-            },
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/parse-json": {
-            "version": "5.2.0",
-            "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
-            "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@babel/code-frame": "^7.0.0",
-                "error-ex": "^1.3.1",
-                "json-parse-even-better-errors": "^2.3.0",
-                "lines-and-columns": "^1.1.6"
-            },
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/path-exists": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-            "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/path-is-absolute": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-            "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/path-key": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-            "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/path-parse": {
-            "version": "1.0.7",
-            "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-            "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/picocolors": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
-            "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
-            "dev": true,
-            "license": "ISC"
-        },
-        "node_modules/picomatch": {
-            "version": "2.3.1",
-            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-            "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=8.6"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/jonschlinkert"
-            }
-        },
-        "node_modules/pirates": {
-            "version": "4.0.6",
-            "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
-            "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">= 6"
-            }
-        },
-        "node_modules/pkg-dir": {
-            "version": "4.2.0",
-            "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-            "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "find-up": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/pkg-dir/node_modules/find-up": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-            "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "locate-path": "^5.0.0",
-                "path-exists": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/pkg-dir/node_modules/locate-path": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-            "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "p-locate": "^4.1.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/pkg-dir/node_modules/p-limit": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-            "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "p-try": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=6"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/pkg-dir/node_modules/p-locate": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-            "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "p-limit": "^2.2.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/pluralize": {
-            "version": "8.0.0",
-            "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-8.0.0.tgz",
-            "integrity": "sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/postcss": {
-            "version": "8.5.2",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.2.tgz",
-            "integrity": "sha512-MjOadfU3Ys9KYoX0AdkBlFEF1Vx37uCCeN4ZHnmwm9FfpbsGWMZeBLMmmpY+6Ocqod7mkdZ0DT31OlbsFrLlkA==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "opencollective",
-                    "url": "https://opencollective.com/postcss/"
-                },
-                {
-                    "type": "tidelift",
-                    "url": "https://tidelift.com/funding/github/npm/postcss"
-                },
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/ai"
-                }
-            ],
-            "license": "MIT",
-            "dependencies": {
-                "nanoid": "^3.3.8",
-                "picocolors": "^1.1.1",
-                "source-map-js": "^1.2.1"
-            },
-            "engines": {
-                "node": "^10 || ^12 || >=14"
-            }
-        },
-        "node_modules/postcss-modules-extract-imports": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.1.0.tgz",
-            "integrity": "sha512-k3kNe0aNFQDAZGbin48pL2VNidTF0w4/eASDsxlyspobzU3wZQLOGj7L9gfRe0Jo9/4uud09DsjFNH7winGv8Q==",
-            "dev": true,
-            "license": "ISC",
-            "engines": {
-                "node": "^10 || ^12 || >= 14"
-            },
-            "peerDependencies": {
-                "postcss": "^8.1.0"
-            }
-        },
-        "node_modules/postcss-modules-local-by-default": {
-            "version": "4.2.0",
-            "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.2.0.tgz",
-            "integrity": "sha512-5kcJm/zk+GJDSfw+V/42fJ5fhjL5YbFDl8nVdXkJPLLW+Vf9mTD5Xe0wqIaDnLuL2U6cDNpTr+UQ+v2HWIBhzw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "icss-utils": "^5.0.0",
-                "postcss-selector-parser": "^7.0.0",
-                "postcss-value-parser": "^4.1.0"
-            },
-            "engines": {
-                "node": "^10 || ^12 || >= 14"
-            },
-            "peerDependencies": {
-                "postcss": "^8.1.0"
-            }
-        },
-        "node_modules/postcss-modules-scope": {
-            "version": "3.2.1",
-            "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.2.1.tgz",
-            "integrity": "sha512-m9jZstCVaqGjTAuny8MdgE88scJnCiQSlSrOWcTQgM2t32UBe+MUmFSO5t7VMSfAf/FJKImAxBav8ooCHJXCJA==",
-            "dev": true,
-            "license": "ISC",
-            "dependencies": {
-                "postcss-selector-parser": "^7.0.0"
-            },
-            "engines": {
-                "node": "^10 || ^12 || >= 14"
-            },
-            "peerDependencies": {
-                "postcss": "^8.1.0"
-            }
-        },
-        "node_modules/postcss-modules-values": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
-            "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
-            "dev": true,
-            "license": "ISC",
-            "dependencies": {
-                "icss-utils": "^5.0.0"
-            },
-            "engines": {
-                "node": "^10 || ^12 || >= 14"
-            },
-            "peerDependencies": {
-                "postcss": "^8.1.0"
-            }
-        },
-        "node_modules/postcss-selector-parser": {
-            "version": "7.1.0",
-            "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
-            "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "cssesc": "^3.0.0",
-                "util-deprecate": "^1.0.2"
-            },
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/postcss-value-parser": {
-            "version": "4.2.0",
-            "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-            "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/prelude-ls": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-            "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">= 0.8.0"
-            }
-        },
-        "node_modules/prettier": {
-            "version": "3.5.1",
-            "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.1.tgz",
-            "integrity": "sha512-hPpFQvHwL3Qv5AdRvBFMhnKo4tYxp0ReXiPn2bxkiohEX6mBeBwEpBSQTkD458RaaDKQMYSp4hX4UtfUTA5wDw==",
-            "dev": true,
-            "license": "MIT",
-            "bin": {
-                "prettier": "bin/prettier.cjs"
-            },
-            "engines": {
-                "node": ">=14"
-            },
-            "funding": {
-                "url": "https://github.com/prettier/prettier?sponsor=1"
-            }
-        },
-        "node_modules/pretty-format": {
-            "version": "29.7.0",
-            "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
-            "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@jest/schemas": "^29.6.3",
-                "ansi-styles": "^5.0.0",
-                "react-is": "^18.0.0"
-            },
-            "engines": {
-                "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-            }
-        },
-        "node_modules/pretty-format/node_modules/ansi-styles": {
-            "version": "5.2.0",
-            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-            "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-            }
-        },
-        "node_modules/prompts": {
-            "version": "2.4.2",
-            "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
-            "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "kleur": "^3.0.3",
-                "sisteransi": "^1.0.5"
-            },
-            "engines": {
-                "node": ">= 6"
-            }
-        },
-        "node_modules/punycode": {
-            "version": "2.3.1",
-            "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
-            "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/pure-rand": {
-            "version": "6.1.0",
-            "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.1.0.tgz",
-            "integrity": "sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "individual",
-                    "url": "https://github.com/sponsors/dubzzz"
-                },
-                {
-                    "type": "opencollective",
-                    "url": "https://opencollective.com/fast-check"
-                }
-            ],
-            "license": "MIT"
-        },
-        "node_modules/queue-microtask": {
-            "version": "1.2.3",
-            "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-            "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-            "dev": true,
-            "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"
-        },
-        "node_modules/randombytes": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
-            "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "safe-buffer": "^5.1.0"
-            }
-        },
-        "node_modules/react-is": {
-            "version": "18.3.1",
-            "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
-            "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/readdirp": {
-            "version": "4.1.2",
-            "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz",
-            "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">= 14.18.0"
-            },
-            "funding": {
-                "type": "individual",
-                "url": "https://paulmillr.com/funding/"
-            }
-        },
-        "node_modules/rechoir": {
-            "version": "0.8.0",
-            "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.8.0.tgz",
-            "integrity": "sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "resolve": "^1.20.0"
-            },
-            "engines": {
-                "node": ">= 10.13.0"
-            }
-        },
-        "node_modules/regex-parser": {
-            "version": "2.3.1",
-            "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.3.1.tgz",
-            "integrity": "sha512-yXLRqatcCuKtVHsWrNg0JL3l1zGfdXeEvDa0bdu4tCDQw0RpMDZsqbkyRTUnKMR0tXF627V2oEWjBEaEdqTwtQ==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/request-animation-frame-timeout": {
-            "version": "2.0.4",
-            "resolved": "https://registry.npmjs.org/request-animation-frame-timeout/-/request-animation-frame-timeout-2.0.4.tgz",
-            "integrity": "sha512-5oYwRBYjrMSU/YHHXj5AM/nv96ZE0b8WZoA3FqnkeDDPXoprxUCZFK4IWZTl+y3RJQtaihiJPiKOB4NZfZ7C7A==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/require-directory": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-            "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/require-from-string": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-            "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/resolve": {
-            "version": "1.22.10",
-            "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz",
-            "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "is-core-module": "^2.16.0",
-                "path-parse": "^1.0.7",
-                "supports-preserve-symlinks-flag": "^1.0.0"
-            },
-            "bin": {
-                "resolve": "bin/resolve"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/resolve-cwd": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
-            "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "resolve-from": "^5.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/resolve-cwd/node_modules/resolve-from": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-            "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/resolve-from": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-            "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/resolve-url-loader": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-5.0.0.tgz",
-            "integrity": "sha512-uZtduh8/8srhBoMx//5bwqjQ+rfYOUq8zC9NrMUGtjBiGTtFJM42s58/36+hTqeqINcnYe08Nj3LkK9lW4N8Xg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "adjust-sourcemap-loader": "^4.0.0",
-                "convert-source-map": "^1.7.0",
-                "loader-utils": "^2.0.0",
-                "postcss": "^8.2.14",
-                "source-map": "0.6.1"
-            },
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/resolve-url-loader/node_modules/convert-source-map": {
-            "version": "1.9.0",
-            "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
-            "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/resolve.exports": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.3.tgz",
-            "integrity": "sha512-OcXjMsGdhL4XnbShKpAcSqPMzQoYkYyhbEaeSko47MjRP9NfEQMhZkXL1DoFlt9LWQn4YttrdnV6X2OiyzBi+A==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/reusify": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-            "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "iojs": ">=1.0.0",
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/run-parallel": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-            "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-            "dev": true,
-            "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": {
-                "queue-microtask": "^1.2.2"
-            }
-        },
-        "node_modules/rxjs": {
-            "version": "7.8.1",
-            "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
-            "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
-            "dev": true,
-            "license": "Apache-2.0",
-            "dependencies": {
-                "tslib": "^2.1.0"
-            }
-        },
-        "node_modules/safe-buffer": {
-            "version": "5.2.1",
-            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-            "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-            "dev": true,
-            "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"
-        },
-        "node_modules/sass": {
-            "version": "1.85.0",
-            "resolved": "https://registry.npmjs.org/sass/-/sass-1.85.0.tgz",
-            "integrity": "sha512-3ToiC1xZ1Y8aU7+CkgCI/tqyuPXEmYGJXO7H4uqp0xkLXUqp88rQQ4j1HmP37xSJLbCJPaIiv+cT1y+grssrww==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "chokidar": "^4.0.0",
-                "immutable": "^5.0.2",
-                "source-map-js": ">=0.6.2 <2.0.0"
-            },
-            "bin": {
-                "sass": "sass.js"
-            },
-            "engines": {
-                "node": ">=14.0.0"
-            },
-            "optionalDependencies": {
-                "@parcel/watcher": "^2.4.1"
-            }
-        },
-        "node_modules/sass-loader": {
-            "version": "16.0.5",
-            "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-16.0.5.tgz",
-            "integrity": "sha512-oL+CMBXrj6BZ/zOq4os+UECPL+bWqt6OAC6DWS8Ln8GZRcMDjlJ4JC3FBDuHJdYaFWIdKNIBYmtZtK2MaMkNIw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "neo-async": "^2.6.2"
-            },
-            "engines": {
-                "node": ">= 18.12.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/webpack"
-            },
-            "peerDependencies": {
-                "@rspack/core": "0.x || 1.x",
-                "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0",
-                "sass": "^1.3.0",
-                "sass-embedded": "*",
-                "webpack": "^5.0.0"
-            },
-            "peerDependenciesMeta": {
-                "@rspack/core": {
-                    "optional": true
-                },
-                "node-sass": {
-                    "optional": true
-                },
-                "sass": {
-                    "optional": true
-                },
-                "sass-embedded": {
-                    "optional": true
-                },
-                "webpack": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/schema-utils": {
-            "version": "3.3.0",
-            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
-            "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@types/json-schema": "^7.0.8",
-                "ajv": "^6.12.5",
-                "ajv-keywords": "^3.5.2"
-            },
-            "engines": {
-                "node": ">= 10.13.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/webpack"
-            }
-        },
-        "node_modules/semver": {
-            "version": "7.7.1",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
-            "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
-            "dev": true,
-            "license": "ISC",
-            "bin": {
-                "semver": "bin/semver.js"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/serialize-javascript": {
-            "version": "6.0.2",
-            "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
-            "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
-            "dev": true,
-            "license": "BSD-3-Clause",
-            "dependencies": {
-                "randombytes": "^2.1.0"
-            }
-        },
-        "node_modules/shallow-clone": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
-            "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "kind-of": "^6.0.2"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/shebang-command": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-            "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "shebang-regex": "^3.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/shebang-regex": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-            "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/shell-quote": {
-            "version": "1.8.2",
-            "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.2.tgz",
-            "integrity": "sha512-AzqKpGKjrj7EM6rKVQEPpB288oCfnrEIuyoT9cyF4nmGa7V8Zk6f7RRqYisX8X9m+Q7bd632aZW4ky7EhbQztA==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/signal-exit": {
-            "version": "3.0.7",
-            "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-            "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-            "dev": true,
-            "license": "ISC"
-        },
-        "node_modules/sisteransi": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
-            "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/slash": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-            "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/source-map": {
-            "version": "0.6.1",
-            "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-            "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-            "dev": true,
-            "license": "BSD-3-Clause",
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/source-map-js": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
-            "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
-            "dev": true,
-            "license": "BSD-3-Clause",
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/source-map-support": {
-            "version": "0.5.13",
-            "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
-            "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "buffer-from": "^1.0.0",
-                "source-map": "^0.6.0"
-            }
-        },
-        "node_modules/sprintf-js": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-            "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
-            "dev": true,
-            "license": "BSD-3-Clause"
-        },
-        "node_modules/stack-utils": {
-            "version": "2.0.6",
-            "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
-            "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "escape-string-regexp": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/stack-utils/node_modules/escape-string-regexp": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-            "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/string-length": {
-            "version": "4.0.2",
-            "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
-            "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "char-regex": "^1.0.2",
-                "strip-ansi": "^6.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/string-width": {
-            "version": "4.2.3",
-            "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-            "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "emoji-regex": "^8.0.0",
-                "is-fullwidth-code-point": "^3.0.0",
-                "strip-ansi": "^6.0.1"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/strip-ansi": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "ansi-regex": "^5.0.1"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/strip-bom": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
-            "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/strip-final-newline": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
-            "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/strip-json-comments": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-            "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/style-mod": {
-            "version": "4.1.2",
-            "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.1.2.tgz",
-            "integrity": "sha512-wnD1HyVqpJUI2+eKZ+eo1UwghftP6yuFheBqqe+bWCotBjC2K1YnteJILRMs3SM4V/0dLEW1SC27MWP5y+mwmw==",
-            "dev": true,
-            "license": "MIT",
-            "peer": true
-        },
-        "node_modules/supports-color": {
-            "version": "7.2.0",
-            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "has-flag": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/supports-preserve-symlinks-flag": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-            "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/sync_lib": {
-            "resolved": "../backend/sync_lib/pkg",
-            "link": true
-        },
-        "node_modules/sync-client": {
-            "resolved": "sync-client",
-            "link": true
-        },
-        "node_modules/tapable": {
-            "version": "2.2.1",
-            "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
-            "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/terser": {
-            "version": "5.39.0",
-            "resolved": "https://registry.npmjs.org/terser/-/terser-5.39.0.tgz",
-            "integrity": "sha512-LBAhFyLho16harJoWMg/nZsQYgTrg5jXOn2nCYjRUcZZEdE3qa2zb8QEDRUGVZBW4rlazf2fxkg8tztybTaqWw==",
-            "dev": true,
-            "license": "BSD-2-Clause",
-            "dependencies": {
-                "@jridgewell/source-map": "^0.3.3",
-                "acorn": "^8.8.2",
-                "commander": "^2.20.0",
-                "source-map-support": "~0.5.20"
-            },
-            "bin": {
-                "terser": "bin/terser"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/terser-webpack-plugin": {
-            "version": "5.3.11",
-            "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.11.tgz",
-            "integrity": "sha512-RVCsMfuD0+cTt3EwX8hSl2Ks56EbFHWmhluwcqoPKtBnfjiT6olaq7PRIRfhyU8nnC2MrnDrBLfrD/RGE+cVXQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@jridgewell/trace-mapping": "^0.3.25",
-                "jest-worker": "^27.4.5",
-                "schema-utils": "^4.3.0",
-                "serialize-javascript": "^6.0.2",
-                "terser": "^5.31.1"
-            },
-            "engines": {
-                "node": ">= 10.13.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/webpack"
-            },
-            "peerDependencies": {
-                "webpack": "^5.1.0"
-            },
-            "peerDependenciesMeta": {
-                "@swc/core": {
-                    "optional": true
-                },
-                "esbuild": {
-                    "optional": true
-                },
-                "uglify-js": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/terser-webpack-plugin/node_modules/ajv": {
-            "version": "8.17.1",
-            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
-            "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "fast-deep-equal": "^3.1.3",
-                "fast-uri": "^3.0.1",
-                "json-schema-traverse": "^1.0.0",
-                "require-from-string": "^2.0.2"
-            },
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/epoberezkin"
-            }
-        },
-        "node_modules/terser-webpack-plugin/node_modules/ajv-keywords": {
-            "version": "5.1.0",
-            "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-            "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "fast-deep-equal": "^3.1.3"
-            },
-            "peerDependencies": {
-                "ajv": "^8.8.2"
-            }
-        },
-        "node_modules/terser-webpack-plugin/node_modules/jest-worker": {
-            "version": "27.5.1",
-            "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
-            "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@types/node": "*",
-                "merge-stream": "^2.0.0",
-                "supports-color": "^8.0.0"
-            },
-            "engines": {
-                "node": ">= 10.13.0"
-            }
-        },
-        "node_modules/terser-webpack-plugin/node_modules/json-schema-traverse": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-            "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/terser-webpack-plugin/node_modules/schema-utils": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.0.tgz",
-            "integrity": "sha512-Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@types/json-schema": "^7.0.9",
-                "ajv": "^8.9.0",
-                "ajv-formats": "^2.1.1",
-                "ajv-keywords": "^5.1.0"
-            },
-            "engines": {
-                "node": ">= 10.13.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/webpack"
-            }
-        },
-        "node_modules/terser-webpack-plugin/node_modules/supports-color": {
-            "version": "8.1.1",
-            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-            "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "has-flag": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/supports-color?sponsor=1"
-            }
-        },
-        "node_modules/terser/node_modules/source-map-support": {
-            "version": "0.5.21",
-            "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
-            "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "buffer-from": "^1.0.0",
-                "source-map": "^0.6.0"
-            }
-        },
-        "node_modules/test-exclude": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
-            "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
-            "dev": true,
-            "license": "ISC",
-            "dependencies": {
-                "@istanbuljs/schema": "^0.1.2",
-                "glob": "^7.1.4",
-                "minimatch": "^3.0.4"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/tmpl": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
-            "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
-            "dev": true,
-            "license": "BSD-3-Clause"
-        },
-        "node_modules/to-regex-range": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-            "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "is-number": "^7.0.0"
-            },
-            "engines": {
-                "node": ">=8.0"
-            }
-        },
-        "node_modules/tree-kill": {
-            "version": "1.2.2",
-            "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",
-            "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==",
-            "dev": true,
-            "license": "MIT",
-            "bin": {
-                "tree-kill": "cli.js"
-            }
-        },
-        "node_modules/ts-api-utils": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.0.1.tgz",
-            "integrity": "sha512-dnlgjFSVetynI8nzgJ+qF62efpglpWRk8isUEWZGWlJYySCTD6aKvbUDu+zbPeDakk3bg5H4XpitHukgfL1m9w==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=18.12"
-            },
-            "peerDependencies": {
-                "typescript": ">=4.8.4"
-            }
-        },
-        "node_modules/ts-jest": {
-            "version": "29.2.5",
-            "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.2.5.tgz",
-            "integrity": "sha512-KD8zB2aAZrcKIdGk4OwpJggeLcH1FgrICqDSROWqlnJXGCXK4Mn6FcdK2B6670Xr73lHMG1kHw8R87A0ecZ+vA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "bs-logger": "^0.2.6",
-                "ejs": "^3.1.10",
-                "fast-json-stable-stringify": "^2.1.0",
-                "jest-util": "^29.0.0",
-                "json5": "^2.2.3",
-                "lodash.memoize": "^4.1.2",
-                "make-error": "^1.3.6",
-                "semver": "^7.6.3",
-                "yargs-parser": "^21.1.1"
-            },
-            "bin": {
-                "ts-jest": "cli.js"
-            },
-            "engines": {
-                "node": "^14.15.0 || ^16.10.0 || ^18.0.0 || >=20.0.0"
-            },
-            "peerDependencies": {
-                "@babel/core": ">=7.0.0-beta.0 <8",
-                "@jest/transform": "^29.0.0",
-                "@jest/types": "^29.0.0",
-                "babel-jest": "^29.0.0",
-                "jest": "^29.0.0",
-                "typescript": ">=4.3 <6"
-            },
-            "peerDependenciesMeta": {
-                "@babel/core": {
-                    "optional": true
-                },
-                "@jest/transform": {
-                    "optional": true
-                },
-                "@jest/types": {
-                    "optional": true
-                },
-                "babel-jest": {
-                    "optional": true
-                },
-                "esbuild": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/ts-loader": {
-            "version": "9.5.2",
-            "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.5.2.tgz",
-            "integrity": "sha512-Qo4piXvOTWcMGIgRiuFa6nHNm+54HbYaZCKqc9eeZCLRy3XqafQgwX2F7mofrbJG3g7EEb+lkiR+z2Lic2s3Zw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "chalk": "^4.1.0",
-                "enhanced-resolve": "^5.0.0",
-                "micromatch": "^4.0.0",
-                "semver": "^7.3.4",
-                "source-map": "^0.7.4"
-            },
-            "engines": {
-                "node": ">=12.0.0"
-            },
-            "peerDependencies": {
-                "typescript": "*",
-                "webpack": "^5.0.0"
-            }
-        },
-        "node_modules/ts-loader/node_modules/source-map": {
-            "version": "0.7.4",
-            "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
-            "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
-            "dev": true,
-            "license": "BSD-3-Clause",
-            "engines": {
-                "node": ">= 8"
-            }
-        },
-        "node_modules/tslib": {
-            "version": "2.8.1",
-            "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
-            "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
-            "dev": true,
-            "license": "0BSD"
-        },
-        "node_modules/type-check": {
-            "version": "0.4.0",
-            "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-            "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "prelude-ls": "^1.2.1"
-            },
-            "engines": {
-                "node": ">= 0.8.0"
-            }
-        },
-        "node_modules/type-detect": {
-            "version": "4.0.8",
-            "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-            "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/type-fest": {
-            "version": "0.21.3",
-            "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
-            "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
-            "dev": true,
-            "license": "(MIT OR CC0-1.0)",
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/typescript": {
-            "version": "5.7.3",
-            "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.3.tgz",
-            "integrity": "sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==",
-            "dev": true,
-            "license": "Apache-2.0",
-            "bin": {
-                "tsc": "bin/tsc",
-                "tsserver": "bin/tsserver"
-            },
-            "engines": {
-                "node": ">=14.17"
-            }
-        },
-        "node_modules/typescript-eslint": {
-            "version": "8.24.1",
-            "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.24.1.tgz",
-            "integrity": "sha512-cw3rEdzDqBs70TIcb0Gdzbt6h11BSs2pS0yaq7hDWDBtCCSei1pPSUXE9qUdQ/Wm9NgFg8mKtMt1b8fTHIl1jA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@typescript-eslint/eslint-plugin": "8.24.1",
-                "@typescript-eslint/parser": "8.24.1",
-                "@typescript-eslint/utils": "8.24.1"
-            },
-            "engines": {
-                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/typescript-eslint"
-            },
-            "peerDependencies": {
-                "eslint": "^8.57.0 || ^9.0.0",
-                "typescript": ">=4.8.4 <5.8.0"
-            }
-        },
-        "node_modules/undici-types": {
-            "version": "6.20.0",
-            "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
-            "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/universalify": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
-            "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">= 10.0.0"
-            }
-        },
-        "node_modules/update-browserslist-db": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.2.tgz",
-            "integrity": "sha512-PPypAm5qvlD7XMZC3BujecnaOxwhrtoFR+Dqkk5Aa/6DssiH0ibKoketaj9w8LP7Bont1rYeoV5plxD7RTEPRg==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "opencollective",
-                    "url": "https://opencollective.com/browserslist"
-                },
-                {
-                    "type": "tidelift",
-                    "url": "https://tidelift.com/funding/github/npm/browserslist"
-                },
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/ai"
-                }
-            ],
-            "license": "MIT",
-            "dependencies": {
-                "escalade": "^3.2.0",
-                "picocolors": "^1.1.1"
-            },
-            "bin": {
-                "update-browserslist-db": "cli.js"
-            },
-            "peerDependencies": {
-                "browserslist": ">= 4.21.0"
-            }
-        },
-        "node_modules/uri-js": {
-            "version": "4.4.1",
-            "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-            "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-            "dev": true,
-            "license": "BSD-2-Clause",
-            "dependencies": {
-                "punycode": "^2.1.0"
-            }
-        },
-        "node_modules/uri-js-replace": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/uri-js-replace/-/uri-js-replace-1.0.1.tgz",
-            "integrity": "sha512-W+C9NWNLFOoBI2QWDp4UT9pv65r2w5Cx+3sTYFvtMdDBxkKt1syCqsUdSFAChbEe1uK5TfS04wt/nGwmaeIQ0g==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/util-deprecate": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-            "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/v8-to-istanbul": {
-            "version": "9.3.0",
-            "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz",
-            "integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==",
-            "dev": true,
-            "license": "ISC",
-            "dependencies": {
-                "@jridgewell/trace-mapping": "^0.3.12",
-                "@types/istanbul-lib-coverage": "^2.0.1",
-                "convert-source-map": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=10.12.0"
-            }
-        },
-        "node_modules/vault-link-obsidian-plugin": {
-            "resolved": "obsidian-plugin",
-            "link": true
-        },
-        "node_modules/virtual-scroller": {
-            "version": "1.13.1",
-            "resolved": "https://registry.npmjs.org/virtual-scroller/-/virtual-scroller-1.13.1.tgz",
-            "integrity": "sha512-sui46QUBOIfHyXYjdGkxoze/GlCZFUFRxzxEvsu06UQ4iPc3uRfGnm/Qj7195hiMVOYQW9lDn+m3sD7sRMYdYg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "request-animation-frame-timeout": "^2.0.3"
-            }
-        },
-        "node_modules/w3c-keyname": {
-            "version": "2.2.8",
-            "resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.8.tgz",
-            "integrity": "sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==",
-            "dev": true,
-            "license": "MIT",
-            "peer": true
-        },
-        "node_modules/walker": {
-            "version": "1.0.8",
-            "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
-            "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
-            "dev": true,
-            "license": "Apache-2.0",
-            "dependencies": {
-                "makeerror": "1.0.12"
-            }
-        },
-        "node_modules/watchpack": {
-            "version": "2.4.2",
-            "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz",
-            "integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "glob-to-regexp": "^0.4.1",
-                "graceful-fs": "^4.1.2"
-            },
-            "engines": {
-                "node": ">=10.13.0"
-            }
-        },
-        "node_modules/webpack": {
-            "version": "5.98.0",
-            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.98.0.tgz",
-            "integrity": "sha512-UFynvx+gM44Gv9qFgj0acCQK2VE1CtdfwFdimkapco3hlPCJ/zeq73n2yVKimVbtm+TnApIugGhLJnkU6gjYXA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@types/eslint-scope": "^3.7.7",
-                "@types/estree": "^1.0.6",
-                "@webassemblyjs/ast": "^1.14.1",
-                "@webassemblyjs/wasm-edit": "^1.14.1",
-                "@webassemblyjs/wasm-parser": "^1.14.1",
-                "acorn": "^8.14.0",
-                "browserslist": "^4.24.0",
-                "chrome-trace-event": "^1.0.2",
-                "enhanced-resolve": "^5.17.1",
-                "es-module-lexer": "^1.2.1",
-                "eslint-scope": "5.1.1",
-                "events": "^3.2.0",
-                "glob-to-regexp": "^0.4.1",
-                "graceful-fs": "^4.2.11",
-                "json-parse-even-better-errors": "^2.3.1",
-                "loader-runner": "^4.2.0",
-                "mime-types": "^2.1.27",
-                "neo-async": "^2.6.2",
-                "schema-utils": "^4.3.0",
-                "tapable": "^2.1.1",
-                "terser-webpack-plugin": "^5.3.11",
-                "watchpack": "^2.4.1",
-                "webpack-sources": "^3.2.3"
-            },
-            "bin": {
-                "webpack": "bin/webpack.js"
-            },
-            "engines": {
-                "node": ">=10.13.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/webpack"
-            },
-            "peerDependenciesMeta": {
-                "webpack-cli": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/webpack-cli": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-6.0.1.tgz",
-            "integrity": "sha512-MfwFQ6SfwinsUVi0rNJm7rHZ31GyTcpVE5pgVA3hwFRb7COD4TzjUUwhGWKfO50+xdc2MQPuEBBJoqIMGt3JDw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@discoveryjs/json-ext": "^0.6.1",
-                "@webpack-cli/configtest": "^3.0.1",
-                "@webpack-cli/info": "^3.0.1",
-                "@webpack-cli/serve": "^3.0.1",
-                "colorette": "^2.0.14",
-                "commander": "^12.1.0",
-                "cross-spawn": "^7.0.3",
-                "envinfo": "^7.14.0",
-                "fastest-levenshtein": "^1.0.12",
-                "import-local": "^3.0.2",
-                "interpret": "^3.1.1",
-                "rechoir": "^0.8.0",
-                "webpack-merge": "^6.0.1"
-            },
-            "bin": {
-                "webpack-cli": "bin/cli.js"
-            },
-            "engines": {
-                "node": ">=18.12.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/webpack"
-            },
-            "peerDependencies": {
-                "webpack": "^5.82.0"
-            },
-            "peerDependenciesMeta": {
-                "webpack-bundle-analyzer": {
-                    "optional": true
-                },
-                "webpack-dev-server": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/webpack-cli/node_modules/colorette": {
-            "version": "2.0.20",
-            "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
-            "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/webpack-cli/node_modules/commander": {
-            "version": "12.1.0",
-            "resolved": "https://registry.npmjs.org/commander/-/commander-12.1.0.tgz",
-            "integrity": "sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=18"
-            }
-        },
-        "node_modules/webpack-merge": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-6.0.1.tgz",
-            "integrity": "sha512-hXXvrjtx2PLYx4qruKl+kyRSLc52V+cCvMxRjmKwoA+CBbbF5GfIBtR6kCvl0fYGqTUPKB+1ktVmTHqMOzgCBg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "clone-deep": "^4.0.1",
-                "flat": "^5.0.2",
-                "wildcard": "^2.0.1"
-            },
-            "engines": {
-                "node": ">=18.0.0"
-            }
-        },
-        "node_modules/webpack-sources": {
-            "version": "3.2.3",
-            "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
-            "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=10.13.0"
-            }
-        },
-        "node_modules/webpack/node_modules/ajv": {
-            "version": "8.17.1",
-            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
-            "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "fast-deep-equal": "^3.1.3",
-                "fast-uri": "^3.0.1",
-                "json-schema-traverse": "^1.0.0",
-                "require-from-string": "^2.0.2"
-            },
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/epoberezkin"
-            }
-        },
-        "node_modules/webpack/node_modules/ajv-keywords": {
-            "version": "5.1.0",
-            "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-            "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "fast-deep-equal": "^3.1.3"
-            },
-            "peerDependencies": {
-                "ajv": "^8.8.2"
-            }
-        },
-        "node_modules/webpack/node_modules/eslint-scope": {
-            "version": "5.1.1",
-            "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-            "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-            "dev": true,
-            "license": "BSD-2-Clause",
-            "dependencies": {
-                "esrecurse": "^4.3.0",
-                "estraverse": "^4.1.1"
-            },
-            "engines": {
-                "node": ">=8.0.0"
-            }
-        },
-        "node_modules/webpack/node_modules/estraverse": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-            "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-            "dev": true,
-            "license": "BSD-2-Clause",
-            "engines": {
-                "node": ">=4.0"
-            }
-        },
-        "node_modules/webpack/node_modules/json-schema-traverse": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-            "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/webpack/node_modules/schema-utils": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.0.tgz",
-            "integrity": "sha512-Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@types/json-schema": "^7.0.9",
-                "ajv": "^8.9.0",
-                "ajv-formats": "^2.1.1",
-                "ajv-keywords": "^5.1.0"
-            },
-            "engines": {
-                "node": ">= 10.13.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/webpack"
-            }
-        },
-        "node_modules/which": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-            "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-            "dev": true,
-            "license": "ISC",
-            "dependencies": {
-                "isexe": "^2.0.0"
-            },
-            "bin": {
-                "node-which": "bin/node-which"
-            },
-            "engines": {
-                "node": ">= 8"
-            }
-        },
-        "node_modules/wildcard": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz",
-            "integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/word-wrap": {
-            "version": "1.2.5",
-            "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
-            "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/wrap-ansi": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-            "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "ansi-styles": "^4.0.0",
-                "string-width": "^4.1.0",
-                "strip-ansi": "^6.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-            }
-        },
-        "node_modules/wrappy": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-            "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-            "dev": true,
-            "license": "ISC"
-        },
-        "node_modules/write-file-atomic": {
-            "version": "4.0.2",
-            "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
-            "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
-            "dev": true,
-            "license": "ISC",
-            "dependencies": {
-                "imurmurhash": "^0.1.4",
-                "signal-exit": "^3.0.7"
-            },
-            "engines": {
-                "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
-            }
-        },
-        "node_modules/y18n": {
-            "version": "5.0.8",
-            "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-            "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-            "dev": true,
-            "license": "ISC",
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/yallist": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-            "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-            "dev": true,
-            "license": "ISC"
-        },
-        "node_modules/yaml-ast-parser": {
-            "version": "0.0.43",
-            "resolved": "https://registry.npmjs.org/yaml-ast-parser/-/yaml-ast-parser-0.0.43.tgz",
-            "integrity": "sha512-2PTINUwsRqSd+s8XxKaJWQlUuEMHJQyEuh2edBbW8KNJz0SJPwUSD2zRWqezFEdN7IzAgeuYHFUCF7o8zRdZ0A==",
-            "dev": true,
-            "license": "Apache-2.0"
-        },
-        "node_modules/yargs": {
-            "version": "17.7.2",
-            "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
-            "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "cliui": "^8.0.1",
-                "escalade": "^3.1.1",
-                "get-caller-file": "^2.0.5",
-                "require-directory": "^2.1.1",
-                "string-width": "^4.2.3",
-                "y18n": "^5.0.5",
-                "yargs-parser": "^21.1.1"
-            },
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/yargs-parser": {
-            "version": "21.1.1",
-            "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-            "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
-            "dev": true,
-            "license": "ISC",
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/yocto-queue": {
-            "version": "0.1.0",
-            "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-            "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "obsidian-plugin": {
-            "name": "vault-link-obsidian-plugin",
-            "version": "0.0.30",
-            "license": "MIT",
-            "devDependencies": {
-                "@types/jest": "^29.5.14",
-                "@types/node": "^22.13.4",
-                "css-loader": "^7.1.2",
-                "date-fns": "^4.1.0",
-                "file-loader": "^6.2.0",
-                "fs-extra": "^11.3.0",
-                "jest": "^29.7.0",
-                "mini-css-extract-plugin": "^2.9.2",
-                "obsidian": "1.8.7",
-                "resolve-url-loader": "^5.0.0",
-                "sass": "^1.85.0",
-                "sass-loader": "^16.0.5",
-                "sync-client": "file:../sync-client",
-                "terser-webpack-plugin": "^5.3.11",
-                "ts-jest": "^29.2.5",
-                "ts-loader": "^9.5.2",
-                "tslib": "2.8.1",
-                "typescript": "5.7.3",
-                "virtual-scroller": "^1.13.1",
-                "webpack": "^5.98.0",
-                "webpack-cli": "^6.0.1"
-            }
-        },
-        "sync-client": {
-            "version": "1.0.0",
-            "devDependencies": {
-                "@types/jest": "^29.5.14",
-                "@types/node": "^22.13.4",
-                "byte-base64": "^1.1.0",
-                "fetch-retry": "^6.0.0",
-                "jest": "^29.7.0",
-                "openapi-fetch": "0.13.4",
-                "openapi-typescript": "7.6.1",
-                "p-queue": "^8.1.0",
-                "sync_lib": "file:../../backend/sync_lib/pkg",
-                "ts-jest": "^29.2.5",
-                "ts-loader": "^9.5.2",
-                "tslib": "2.8.1",
-                "typescript": "5.7.3",
-                "webpack": "^5.98.0",
-                "webpack-cli": "^6.0.1"
-            }
-        }
-    }
+	"name": "my-workspace",
+	"lockfileVersion": 3,
+	"requires": true,
+	"packages": {
+		"": {
+			"name": "my-workspace",
+			"workspaces": [
+				"sync-client",
+				"obsidian-plugin",
+				"test-client"
+			],
+			"devDependencies": {
+				"concurrently": "^9.1.2",
+				"eslint": "9.21.0",
+				"eslint-plugin-unused-imports": "^4.1.4",
+				"npm-check-updates": "^17.1.14",
+				"prettier": "^3.5.2",
+				"typescript-eslint": "8.24.1"
+			}
+		},
+		"../backend/sync_lib/pkg": {
+			"name": "sync_lib",
+			"version": "0.0.30",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/@ampproject/remapping": {
+			"version": "2.3.0",
+			"dev": true,
+			"license": "Apache-2.0",
+			"dependencies": {
+				"@jridgewell/gen-mapping": "^0.3.5",
+				"@jridgewell/trace-mapping": "^0.3.24"
+			},
+			"engines": {
+				"node": ">=6.0.0"
+			}
+		},
+		"node_modules/@babel/code-frame": {
+			"version": "7.26.2",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-validator-identifier": "^7.25.9",
+				"js-tokens": "^4.0.0",
+				"picocolors": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/compat-data": {
+			"version": "7.26.8",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/core": {
+			"version": "7.26.9",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@ampproject/remapping": "^2.2.0",
+				"@babel/code-frame": "^7.26.2",
+				"@babel/generator": "^7.26.9",
+				"@babel/helper-compilation-targets": "^7.26.5",
+				"@babel/helper-module-transforms": "^7.26.0",
+				"@babel/helpers": "^7.26.9",
+				"@babel/parser": "^7.26.9",
+				"@babel/template": "^7.26.9",
+				"@babel/traverse": "^7.26.9",
+				"@babel/types": "^7.26.9",
+				"convert-source-map": "^2.0.0",
+				"debug": "^4.1.0",
+				"gensync": "^1.0.0-beta.2",
+				"json5": "^2.2.3",
+				"semver": "^6.3.1"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/babel"
+			}
+		},
+		"node_modules/@babel/core/node_modules/semver": {
+			"version": "6.3.1",
+			"dev": true,
+			"license": "ISC",
+			"bin": {
+				"semver": "bin/semver.js"
+			}
+		},
+		"node_modules/@babel/generator": {
+			"version": "7.26.9",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/parser": "^7.26.9",
+				"@babel/types": "^7.26.9",
+				"@jridgewell/gen-mapping": "^0.3.5",
+				"@jridgewell/trace-mapping": "^0.3.25",
+				"jsesc": "^3.0.2"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-compilation-targets": {
+			"version": "7.26.5",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/compat-data": "^7.26.5",
+				"@babel/helper-validator-option": "^7.25.9",
+				"browserslist": "^4.24.0",
+				"lru-cache": "^5.1.1",
+				"semver": "^6.3.1"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-compilation-targets/node_modules/semver": {
+			"version": "6.3.1",
+			"dev": true,
+			"license": "ISC",
+			"bin": {
+				"semver": "bin/semver.js"
+			}
+		},
+		"node_modules/@babel/helper-module-imports": {
+			"version": "7.25.9",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/traverse": "^7.25.9",
+				"@babel/types": "^7.25.9"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-module-transforms": {
+			"version": "7.26.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-module-imports": "^7.25.9",
+				"@babel/helper-validator-identifier": "^7.25.9",
+				"@babel/traverse": "^7.25.9"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
+			}
+		},
+		"node_modules/@babel/helper-plugin-utils": {
+			"version": "7.26.5",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-string-parser": {
+			"version": "7.25.9",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-validator-identifier": {
+			"version": "7.25.9",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-validator-option": {
+			"version": "7.25.9",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helpers": {
+			"version": "7.26.9",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/template": "^7.26.9",
+				"@babel/types": "^7.26.9"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/parser": {
+			"version": "7.26.9",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/types": "^7.26.9"
+			},
+			"bin": {
+				"parser": "bin/babel-parser.js"
+			},
+			"engines": {
+				"node": ">=6.0.0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-async-generators": {
+			"version": "7.8.4",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-bigint": {
+			"version": "7.8.3",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-class-properties": {
+			"version": "7.12.13",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.12.13"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-class-static-block": {
+			"version": "7.14.5",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.14.5"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-import-attributes": {
+			"version": "7.26.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.25.9"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-import-meta": {
+			"version": "7.10.4",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.10.4"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-json-strings": {
+			"version": "7.8.3",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-jsx": {
+			"version": "7.25.9",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.25.9"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-logical-assignment-operators": {
+			"version": "7.10.4",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.10.4"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
+			"version": "7.8.3",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-numeric-separator": {
+			"version": "7.10.4",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.10.4"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-object-rest-spread": {
+			"version": "7.8.3",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-optional-catch-binding": {
+			"version": "7.8.3",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-optional-chaining": {
+			"version": "7.8.3",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.8.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-private-property-in-object": {
+			"version": "7.14.5",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.14.5"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-top-level-await": {
+			"version": "7.14.5",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.14.5"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-syntax-typescript": {
+			"version": "7.25.9",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.25.9"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/template": {
+			"version": "7.26.9",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/code-frame": "^7.26.2",
+				"@babel/parser": "^7.26.9",
+				"@babel/types": "^7.26.9"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/traverse": {
+			"version": "7.26.9",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/code-frame": "^7.26.2",
+				"@babel/generator": "^7.26.9",
+				"@babel/parser": "^7.26.9",
+				"@babel/template": "^7.26.9",
+				"@babel/types": "^7.26.9",
+				"debug": "^4.3.1",
+				"globals": "^11.1.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/traverse/node_modules/globals": {
+			"version": "11.12.0",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/@babel/types": {
+			"version": "7.26.9",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-string-parser": "^7.25.9",
+				"@babel/helper-validator-identifier": "^7.25.9"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@bcoe/v8-coverage": {
+			"version": "0.2.3",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/@codemirror/state": {
+			"version": "6.5.2",
+			"dev": true,
+			"license": "MIT",
+			"peer": true,
+			"dependencies": {
+				"@marijn/find-cluster-break": "^1.0.0"
+			}
+		},
+		"node_modules/@codemirror/view": {
+			"version": "6.36.3",
+			"dev": true,
+			"license": "MIT",
+			"peer": true,
+			"dependencies": {
+				"@codemirror/state": "^6.5.0",
+				"style-mod": "^4.1.0",
+				"w3c-keyname": "^2.2.4"
+			}
+		},
+		"node_modules/@cspotcode/source-map-support": {
+			"version": "0.8.1",
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"peer": true,
+			"dependencies": {
+				"@jridgewell/trace-mapping": "0.3.9"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": {
+			"version": "0.3.9",
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"peer": true,
+			"dependencies": {
+				"@jridgewell/resolve-uri": "^3.0.3",
+				"@jridgewell/sourcemap-codec": "^1.4.10"
+			}
+		},
+		"node_modules/@discoveryjs/json-ext": {
+			"version": "0.6.3",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=14.17.0"
+			}
+		},
+		"node_modules/@eslint-community/eslint-utils": {
+			"version": "4.4.1",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"eslint-visitor-keys": "^3.4.3"
+			},
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://opencollective.com/eslint"
+			},
+			"peerDependencies": {
+				"eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
+			}
+		},
+		"node_modules/@eslint-community/eslint-utils/node_modules/eslint-visitor-keys": {
+			"version": "3.4.3",
+			"dev": true,
+			"license": "Apache-2.0",
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://opencollective.com/eslint"
+			}
+		},
+		"node_modules/@eslint-community/regexpp": {
+			"version": "4.12.1",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": "^12.0.0 || ^14.0.0 || >=16.0.0"
+			}
+		},
+		"node_modules/@eslint/config-array": {
+			"version": "0.19.2",
+			"dev": true,
+			"license": "Apache-2.0",
+			"dependencies": {
+				"@eslint/object-schema": "^2.1.6",
+				"debug": "^4.3.1",
+				"minimatch": "^3.1.2"
+			},
+			"engines": {
+				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+			}
+		},
+		"node_modules/@eslint/core": {
+			"version": "0.12.0",
+			"resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.12.0.tgz",
+			"integrity": "sha512-cmrR6pytBuSMTaBweKoGMwu3EiHiEC+DoyupPmlZ0HxBJBtIxwe+j/E4XPIKNx+Q74c8lXKPwYawBf5glsTkHg==",
+			"dev": true,
+			"license": "Apache-2.0",
+			"dependencies": {
+				"@types/json-schema": "^7.0.15"
+			},
+			"engines": {
+				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+			}
+		},
+		"node_modules/@eslint/eslintrc": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.0.tgz",
+			"integrity": "sha512-yaVPAiNAalnCZedKLdR21GOGILMLKPyqSLWaAjQFvYA2i/ciDi8ArYVr69Anohb6cH2Ukhqti4aFnYyPm8wdwQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ajv": "^6.12.4",
+				"debug": "^4.3.2",
+				"espree": "^10.0.1",
+				"globals": "^14.0.0",
+				"ignore": "^5.2.0",
+				"import-fresh": "^3.2.1",
+				"js-yaml": "^4.1.0",
+				"minimatch": "^3.1.2",
+				"strip-json-comments": "^3.1.1"
+			},
+			"engines": {
+				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+			},
+			"funding": {
+				"url": "https://opencollective.com/eslint"
+			}
+		},
+		"node_modules/@eslint/js": {
+			"version": "9.21.0",
+			"resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.21.0.tgz",
+			"integrity": "sha512-BqStZ3HX8Yz6LvsF5ByXYrtigrV5AXADWLAGc7PH/1SxOb7/FIYYMszZZWiUou/GB9P2lXWk2SV4d+Z8h0nknw==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+			}
+		},
+		"node_modules/@eslint/object-schema": {
+			"version": "2.1.6",
+			"dev": true,
+			"license": "Apache-2.0",
+			"engines": {
+				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+			}
+		},
+		"node_modules/@eslint/plugin-kit": {
+			"version": "0.2.7",
+			"resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.7.tgz",
+			"integrity": "sha512-JubJ5B2pJ4k4yGxaNLdbjrnk9d/iDz6/q8wOilpIowd6PJPgaxCuHBnBszq7Ce2TyMrywm5r4PnKm6V3iiZF+g==",
+			"dev": true,
+			"license": "Apache-2.0",
+			"dependencies": {
+				"@eslint/core": "^0.12.0",
+				"levn": "^0.4.1"
+			},
+			"engines": {
+				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+			}
+		},
+		"node_modules/@humanfs/core": {
+			"version": "0.19.1",
+			"dev": true,
+			"license": "Apache-2.0",
+			"engines": {
+				"node": ">=18.18.0"
+			}
+		},
+		"node_modules/@humanfs/node": {
+			"version": "0.16.6",
+			"dev": true,
+			"license": "Apache-2.0",
+			"dependencies": {
+				"@humanfs/core": "^0.19.1",
+				"@humanwhocodes/retry": "^0.3.0"
+			},
+			"engines": {
+				"node": ">=18.18.0"
+			}
+		},
+		"node_modules/@humanfs/node/node_modules/@humanwhocodes/retry": {
+			"version": "0.3.1",
+			"dev": true,
+			"license": "Apache-2.0",
+			"engines": {
+				"node": ">=18.18"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/nzakas"
+			}
+		},
+		"node_modules/@humanwhocodes/module-importer": {
+			"version": "1.0.1",
+			"dev": true,
+			"license": "Apache-2.0",
+			"engines": {
+				"node": ">=12.22"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/nzakas"
+			}
+		},
+		"node_modules/@humanwhocodes/retry": {
+			"version": "0.4.2",
+			"resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.2.tgz",
+			"integrity": "sha512-xeO57FpIu4p1Ri3Jq/EXq4ClRm86dVF2z/+kvFnyqVYRavTZmaFaUBbWCOuuTh0o/g7DSsk6kc2vrS4Vl5oPOQ==",
+			"dev": true,
+			"license": "Apache-2.0",
+			"engines": {
+				"node": ">=18.18"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/nzakas"
+			}
+		},
+		"node_modules/@istanbuljs/load-nyc-config": {
+			"version": "1.1.0",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"camelcase": "^5.3.1",
+				"find-up": "^4.1.0",
+				"get-package-type": "^0.1.0",
+				"js-yaml": "^3.13.1",
+				"resolve-from": "^5.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@istanbuljs/load-nyc-config/node_modules/argparse": {
+			"version": "1.0.10",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"sprintf-js": "~1.0.2"
+			}
+		},
+		"node_modules/@istanbuljs/load-nyc-config/node_modules/find-up": {
+			"version": "4.1.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"locate-path": "^5.0.0",
+				"path-exists": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@istanbuljs/load-nyc-config/node_modules/js-yaml": {
+			"version": "3.14.1",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"argparse": "^1.0.7",
+				"esprima": "^4.0.0"
+			},
+			"bin": {
+				"js-yaml": "bin/js-yaml.js"
+			}
+		},
+		"node_modules/@istanbuljs/load-nyc-config/node_modules/locate-path": {
+			"version": "5.0.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"p-locate": "^4.1.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@istanbuljs/load-nyc-config/node_modules/p-limit": {
+			"version": "2.3.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"p-try": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/@istanbuljs/load-nyc-config/node_modules/p-locate": {
+			"version": "4.1.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"p-limit": "^2.2.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@istanbuljs/load-nyc-config/node_modules/resolve-from": {
+			"version": "5.0.0",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@istanbuljs/schema": {
+			"version": "0.1.3",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@jest/console": {
+			"version": "29.7.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/types": "^29.6.3",
+				"@types/node": "*",
+				"chalk": "^4.0.0",
+				"jest-message-util": "^29.7.0",
+				"jest-util": "^29.7.0",
+				"slash": "^3.0.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/@jest/core": {
+			"version": "29.7.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/console": "^29.7.0",
+				"@jest/reporters": "^29.7.0",
+				"@jest/test-result": "^29.7.0",
+				"@jest/transform": "^29.7.0",
+				"@jest/types": "^29.6.3",
+				"@types/node": "*",
+				"ansi-escapes": "^4.2.1",
+				"chalk": "^4.0.0",
+				"ci-info": "^3.2.0",
+				"exit": "^0.1.2",
+				"graceful-fs": "^4.2.9",
+				"jest-changed-files": "^29.7.0",
+				"jest-config": "^29.7.0",
+				"jest-haste-map": "^29.7.0",
+				"jest-message-util": "^29.7.0",
+				"jest-regex-util": "^29.6.3",
+				"jest-resolve": "^29.7.0",
+				"jest-resolve-dependencies": "^29.7.0",
+				"jest-runner": "^29.7.0",
+				"jest-runtime": "^29.7.0",
+				"jest-snapshot": "^29.7.0",
+				"jest-util": "^29.7.0",
+				"jest-validate": "^29.7.0",
+				"jest-watcher": "^29.7.0",
+				"micromatch": "^4.0.4",
+				"pretty-format": "^29.7.0",
+				"slash": "^3.0.0",
+				"strip-ansi": "^6.0.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			},
+			"peerDependencies": {
+				"node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+			},
+			"peerDependenciesMeta": {
+				"node-notifier": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@jest/environment": {
+			"version": "29.7.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/fake-timers": "^29.7.0",
+				"@jest/types": "^29.6.3",
+				"@types/node": "*",
+				"jest-mock": "^29.7.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/@jest/expect": {
+			"version": "29.7.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"expect": "^29.7.0",
+				"jest-snapshot": "^29.7.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/@jest/expect-utils": {
+			"version": "29.7.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"jest-get-type": "^29.6.3"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/@jest/fake-timers": {
+			"version": "29.7.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/types": "^29.6.3",
+				"@sinonjs/fake-timers": "^10.0.2",
+				"@types/node": "*",
+				"jest-message-util": "^29.7.0",
+				"jest-mock": "^29.7.0",
+				"jest-util": "^29.7.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/@jest/globals": {
+			"version": "29.7.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/environment": "^29.7.0",
+				"@jest/expect": "^29.7.0",
+				"@jest/types": "^29.6.3",
+				"jest-mock": "^29.7.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/@jest/reporters": {
+			"version": "29.7.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@bcoe/v8-coverage": "^0.2.3",
+				"@jest/console": "^29.7.0",
+				"@jest/test-result": "^29.7.0",
+				"@jest/transform": "^29.7.0",
+				"@jest/types": "^29.6.3",
+				"@jridgewell/trace-mapping": "^0.3.18",
+				"@types/node": "*",
+				"chalk": "^4.0.0",
+				"collect-v8-coverage": "^1.0.0",
+				"exit": "^0.1.2",
+				"glob": "^7.1.3",
+				"graceful-fs": "^4.2.9",
+				"istanbul-lib-coverage": "^3.0.0",
+				"istanbul-lib-instrument": "^6.0.0",
+				"istanbul-lib-report": "^3.0.0",
+				"istanbul-lib-source-maps": "^4.0.0",
+				"istanbul-reports": "^3.1.3",
+				"jest-message-util": "^29.7.0",
+				"jest-util": "^29.7.0",
+				"jest-worker": "^29.7.0",
+				"slash": "^3.0.0",
+				"string-length": "^4.0.1",
+				"strip-ansi": "^6.0.0",
+				"v8-to-istanbul": "^9.0.1"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			},
+			"peerDependencies": {
+				"node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+			},
+			"peerDependenciesMeta": {
+				"node-notifier": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@jest/schemas": {
+			"version": "29.6.3",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@sinclair/typebox": "^0.27.8"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/@jest/source-map": {
+			"version": "29.6.3",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jridgewell/trace-mapping": "^0.3.18",
+				"callsites": "^3.0.0",
+				"graceful-fs": "^4.2.9"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/@jest/test-result": {
+			"version": "29.7.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/console": "^29.7.0",
+				"@jest/types": "^29.6.3",
+				"@types/istanbul-lib-coverage": "^2.0.0",
+				"collect-v8-coverage": "^1.0.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/@jest/test-sequencer": {
+			"version": "29.7.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/test-result": "^29.7.0",
+				"graceful-fs": "^4.2.9",
+				"jest-haste-map": "^29.7.0",
+				"slash": "^3.0.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/@jest/transform": {
+			"version": "29.7.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/core": "^7.11.6",
+				"@jest/types": "^29.6.3",
+				"@jridgewell/trace-mapping": "^0.3.18",
+				"babel-plugin-istanbul": "^6.1.1",
+				"chalk": "^4.0.0",
+				"convert-source-map": "^2.0.0",
+				"fast-json-stable-stringify": "^2.1.0",
+				"graceful-fs": "^4.2.9",
+				"jest-haste-map": "^29.7.0",
+				"jest-regex-util": "^29.6.3",
+				"jest-util": "^29.7.0",
+				"micromatch": "^4.0.4",
+				"pirates": "^4.0.4",
+				"slash": "^3.0.0",
+				"write-file-atomic": "^4.0.2"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/@jest/types": {
+			"version": "29.6.3",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/schemas": "^29.6.3",
+				"@types/istanbul-lib-coverage": "^2.0.0",
+				"@types/istanbul-reports": "^3.0.0",
+				"@types/node": "*",
+				"@types/yargs": "^17.0.8",
+				"chalk": "^4.0.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/@jridgewell/gen-mapping": {
+			"version": "0.3.8",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jridgewell/set-array": "^1.2.1",
+				"@jridgewell/sourcemap-codec": "^1.4.10",
+				"@jridgewell/trace-mapping": "^0.3.24"
+			},
+			"engines": {
+				"node": ">=6.0.0"
+			}
+		},
+		"node_modules/@jridgewell/resolve-uri": {
+			"version": "3.1.2",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6.0.0"
+			}
+		},
+		"node_modules/@jridgewell/set-array": {
+			"version": "1.2.1",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6.0.0"
+			}
+		},
+		"node_modules/@jridgewell/source-map": {
+			"version": "0.3.6",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jridgewell/gen-mapping": "^0.3.5",
+				"@jridgewell/trace-mapping": "^0.3.25"
+			}
+		},
+		"node_modules/@jridgewell/sourcemap-codec": {
+			"version": "1.5.0",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/@jridgewell/trace-mapping": {
+			"version": "0.3.25",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jridgewell/resolve-uri": "^3.1.0",
+				"@jridgewell/sourcemap-codec": "^1.4.14"
+			}
+		},
+		"node_modules/@marijn/find-cluster-break": {
+			"version": "1.0.2",
+			"dev": true,
+			"license": "MIT",
+			"peer": true
+		},
+		"node_modules/@nodelib/fs.scandir": {
+			"version": "2.1.5",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@nodelib/fs.stat": "2.0.5",
+				"run-parallel": "^1.1.9"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/@nodelib/fs.stat": {
+			"version": "2.0.5",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/@nodelib/fs.walk": {
+			"version": "1.2.8",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@nodelib/fs.scandir": "2.1.5",
+				"fastq": "^1.6.0"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/@parcel/watcher": {
+			"version": "2.5.1",
+			"dev": true,
+			"hasInstallScript": true,
+			"license": "MIT",
+			"optional": true,
+			"dependencies": {
+				"detect-libc": "^1.0.3",
+				"is-glob": "^4.0.3",
+				"micromatch": "^4.0.5",
+				"node-addon-api": "^7.0.0"
+			},
+			"engines": {
+				"node": ">= 10.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/parcel"
+			},
+			"optionalDependencies": {
+				"@parcel/watcher-android-arm64": "2.5.1",
+				"@parcel/watcher-darwin-arm64": "2.5.1",
+				"@parcel/watcher-darwin-x64": "2.5.1",
+				"@parcel/watcher-freebsd-x64": "2.5.1",
+				"@parcel/watcher-linux-arm-glibc": "2.5.1",
+				"@parcel/watcher-linux-arm-musl": "2.5.1",
+				"@parcel/watcher-linux-arm64-glibc": "2.5.1",
+				"@parcel/watcher-linux-arm64-musl": "2.5.1",
+				"@parcel/watcher-linux-x64-glibc": "2.5.1",
+				"@parcel/watcher-linux-x64-musl": "2.5.1",
+				"@parcel/watcher-win32-arm64": "2.5.1",
+				"@parcel/watcher-win32-ia32": "2.5.1",
+				"@parcel/watcher-win32-x64": "2.5.1"
+			}
+		},
+		"node_modules/@parcel/watcher-linux-x64-glibc": {
+			"version": "2.5.1",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">= 10.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/parcel"
+			}
+		},
+		"node_modules/@parcel/watcher-linux-x64-musl": {
+			"version": "2.5.1",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">= 10.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/parcel"
+			}
+		},
+		"node_modules/@redocly/ajv": {
+			"version": "8.11.2",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"fast-deep-equal": "^3.1.1",
+				"json-schema-traverse": "^1.0.0",
+				"require-from-string": "^2.0.2",
+				"uri-js-replace": "^1.0.1"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/epoberezkin"
+			}
+		},
+		"node_modules/@redocly/ajv/node_modules/json-schema-traverse": {
+			"version": "1.0.0",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/@redocly/config": {
+			"version": "0.20.3",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/@redocly/openapi-core": {
+			"version": "1.29.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@redocly/ajv": "^8.11.2",
+				"@redocly/config": "^0.20.1",
+				"colorette": "^1.2.0",
+				"https-proxy-agent": "^7.0.5",
+				"js-levenshtein": "^1.1.6",
+				"js-yaml": "^4.1.0",
+				"minimatch": "^5.0.1",
+				"pluralize": "^8.0.0",
+				"yaml-ast-parser": "0.0.43"
+			},
+			"engines": {
+				"node": ">=18.17.0",
+				"npm": ">=9.5.0"
+			}
+		},
+		"node_modules/@redocly/openapi-core/node_modules/brace-expansion": {
+			"version": "2.0.1",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"balanced-match": "^1.0.0"
+			}
+		},
+		"node_modules/@redocly/openapi-core/node_modules/minimatch": {
+			"version": "5.1.6",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"brace-expansion": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/@sinclair/typebox": {
+			"version": "0.27.8",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/@sinonjs/commons": {
+			"version": "3.0.1",
+			"dev": true,
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"type-detect": "4.0.8"
+			}
+		},
+		"node_modules/@sinonjs/fake-timers": {
+			"version": "10.3.0",
+			"dev": true,
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"@sinonjs/commons": "^3.0.0"
+			}
+		},
+		"node_modules/@tsconfig/node10": {
+			"version": "1.0.11",
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"peer": true
+		},
+		"node_modules/@tsconfig/node12": {
+			"version": "1.0.11",
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"peer": true
+		},
+		"node_modules/@tsconfig/node14": {
+			"version": "1.0.3",
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"peer": true
+		},
+		"node_modules/@tsconfig/node16": {
+			"version": "1.0.4",
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"peer": true
+		},
+		"node_modules/@types/babel__core": {
+			"version": "7.20.5",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/parser": "^7.20.7",
+				"@babel/types": "^7.20.7",
+				"@types/babel__generator": "*",
+				"@types/babel__template": "*",
+				"@types/babel__traverse": "*"
+			}
+		},
+		"node_modules/@types/babel__generator": {
+			"version": "7.6.8",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/types": "^7.0.0"
+			}
+		},
+		"node_modules/@types/babel__template": {
+			"version": "7.4.4",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/parser": "^7.1.0",
+				"@babel/types": "^7.0.0"
+			}
+		},
+		"node_modules/@types/babel__traverse": {
+			"version": "7.20.6",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/types": "^7.20.7"
+			}
+		},
+		"node_modules/@types/codemirror": {
+			"version": "5.60.8",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@types/tern": "*"
+			}
+		},
+		"node_modules/@types/eslint": {
+			"version": "9.6.1",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@types/estree": "*",
+				"@types/json-schema": "*"
+			}
+		},
+		"node_modules/@types/eslint-scope": {
+			"version": "3.7.7",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@types/eslint": "*",
+				"@types/estree": "*"
+			}
+		},
+		"node_modules/@types/estree": {
+			"version": "1.0.6",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/@types/graceful-fs": {
+			"version": "4.1.9",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@types/node": "*"
+			}
+		},
+		"node_modules/@types/istanbul-lib-coverage": {
+			"version": "2.0.6",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/@types/istanbul-lib-report": {
+			"version": "3.0.3",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@types/istanbul-lib-coverage": "*"
+			}
+		},
+		"node_modules/@types/istanbul-reports": {
+			"version": "3.0.4",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@types/istanbul-lib-report": "*"
+			}
+		},
+		"node_modules/@types/jest": {
+			"version": "29.5.14",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"expect": "^29.0.0",
+				"pretty-format": "^29.0.0"
+			}
+		},
+		"node_modules/@types/json-schema": {
+			"version": "7.0.15",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/@types/node": {
+			"version": "22.13.5",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.5.tgz",
+			"integrity": "sha512-+lTU0PxZXn0Dr1NBtC7Y8cR21AJr87dLLU953CWA6pMxxv/UDc7jYAY90upcrie1nRcD6XNG5HOYEDtgW5TxAg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"undici-types": "~6.20.0"
+			}
+		},
+		"node_modules/@types/stack-utils": {
+			"version": "2.0.3",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/@types/tern": {
+			"version": "0.23.9",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@types/estree": "*"
+			}
+		},
+		"node_modules/@types/yargs": {
+			"version": "17.0.33",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@types/yargs-parser": "*"
+			}
+		},
+		"node_modules/@types/yargs-parser": {
+			"version": "21.0.3",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/@typescript-eslint/eslint-plugin": {
+			"version": "8.24.1",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@eslint-community/regexpp": "^4.10.0",
+				"@typescript-eslint/scope-manager": "8.24.1",
+				"@typescript-eslint/type-utils": "8.24.1",
+				"@typescript-eslint/utils": "8.24.1",
+				"@typescript-eslint/visitor-keys": "8.24.1",
+				"graphemer": "^1.4.0",
+				"ignore": "^5.3.1",
+				"natural-compare": "^1.4.0",
+				"ts-api-utils": "^2.0.1"
+			},
+			"engines": {
+				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			},
+			"peerDependencies": {
+				"@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0",
+				"eslint": "^8.57.0 || ^9.0.0",
+				"typescript": ">=4.8.4 <5.8.0"
+			}
+		},
+		"node_modules/@typescript-eslint/parser": {
+			"version": "8.24.1",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@typescript-eslint/scope-manager": "8.24.1",
+				"@typescript-eslint/types": "8.24.1",
+				"@typescript-eslint/typescript-estree": "8.24.1",
+				"@typescript-eslint/visitor-keys": "8.24.1",
+				"debug": "^4.3.4"
+			},
+			"engines": {
+				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			},
+			"peerDependencies": {
+				"eslint": "^8.57.0 || ^9.0.0",
+				"typescript": ">=4.8.4 <5.8.0"
+			}
+		},
+		"node_modules/@typescript-eslint/scope-manager": {
+			"version": "8.24.1",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@typescript-eslint/types": "8.24.1",
+				"@typescript-eslint/visitor-keys": "8.24.1"
+			},
+			"engines": {
+				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			}
+		},
+		"node_modules/@typescript-eslint/type-utils": {
+			"version": "8.24.1",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@typescript-eslint/typescript-estree": "8.24.1",
+				"@typescript-eslint/utils": "8.24.1",
+				"debug": "^4.3.4",
+				"ts-api-utils": "^2.0.1"
+			},
+			"engines": {
+				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			},
+			"peerDependencies": {
+				"eslint": "^8.57.0 || ^9.0.0",
+				"typescript": ">=4.8.4 <5.8.0"
+			}
+		},
+		"node_modules/@typescript-eslint/types": {
+			"version": "8.24.1",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			}
+		},
+		"node_modules/@typescript-eslint/typescript-estree": {
+			"version": "8.24.1",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@typescript-eslint/types": "8.24.1",
+				"@typescript-eslint/visitor-keys": "8.24.1",
+				"debug": "^4.3.4",
+				"fast-glob": "^3.3.2",
+				"is-glob": "^4.0.3",
+				"minimatch": "^9.0.4",
+				"semver": "^7.6.0",
+				"ts-api-utils": "^2.0.1"
+			},
+			"engines": {
+				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			},
+			"peerDependencies": {
+				"typescript": ">=4.8.4 <5.8.0"
+			}
+		},
+		"node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
+			"version": "2.0.1",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"balanced-match": "^1.0.0"
+			}
+		},
+		"node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": {
+			"version": "9.0.5",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"brace-expansion": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=16 || 14 >=14.17"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
+		"node_modules/@typescript-eslint/utils": {
+			"version": "8.24.1",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@eslint-community/eslint-utils": "^4.4.0",
+				"@typescript-eslint/scope-manager": "8.24.1",
+				"@typescript-eslint/types": "8.24.1",
+				"@typescript-eslint/typescript-estree": "8.24.1"
+			},
+			"engines": {
+				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			},
+			"peerDependencies": {
+				"eslint": "^8.57.0 || ^9.0.0",
+				"typescript": ">=4.8.4 <5.8.0"
+			}
+		},
+		"node_modules/@typescript-eslint/visitor-keys": {
+			"version": "8.24.1",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@typescript-eslint/types": "8.24.1",
+				"eslint-visitor-keys": "^4.2.0"
+			},
+			"engines": {
+				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			}
+		},
+		"node_modules/@webassemblyjs/ast": {
+			"version": "1.14.1",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@webassemblyjs/helper-numbers": "1.13.2",
+				"@webassemblyjs/helper-wasm-bytecode": "1.13.2"
+			}
+		},
+		"node_modules/@webassemblyjs/floating-point-hex-parser": {
+			"version": "1.13.2",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/@webassemblyjs/helper-api-error": {
+			"version": "1.13.2",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/@webassemblyjs/helper-buffer": {
+			"version": "1.14.1",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/@webassemblyjs/helper-numbers": {
+			"version": "1.13.2",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@webassemblyjs/floating-point-hex-parser": "1.13.2",
+				"@webassemblyjs/helper-api-error": "1.13.2",
+				"@xtuc/long": "4.2.2"
+			}
+		},
+		"node_modules/@webassemblyjs/helper-wasm-bytecode": {
+			"version": "1.13.2",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/@webassemblyjs/helper-wasm-section": {
+			"version": "1.14.1",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@webassemblyjs/ast": "1.14.1",
+				"@webassemblyjs/helper-buffer": "1.14.1",
+				"@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+				"@webassemblyjs/wasm-gen": "1.14.1"
+			}
+		},
+		"node_modules/@webassemblyjs/ieee754": {
+			"version": "1.13.2",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@xtuc/ieee754": "^1.2.0"
+			}
+		},
+		"node_modules/@webassemblyjs/leb128": {
+			"version": "1.13.2",
+			"dev": true,
+			"license": "Apache-2.0",
+			"dependencies": {
+				"@xtuc/long": "4.2.2"
+			}
+		},
+		"node_modules/@webassemblyjs/utf8": {
+			"version": "1.13.2",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/@webassemblyjs/wasm-edit": {
+			"version": "1.14.1",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@webassemblyjs/ast": "1.14.1",
+				"@webassemblyjs/helper-buffer": "1.14.1",
+				"@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+				"@webassemblyjs/helper-wasm-section": "1.14.1",
+				"@webassemblyjs/wasm-gen": "1.14.1",
+				"@webassemblyjs/wasm-opt": "1.14.1",
+				"@webassemblyjs/wasm-parser": "1.14.1",
+				"@webassemblyjs/wast-printer": "1.14.1"
+			}
+		},
+		"node_modules/@webassemblyjs/wasm-gen": {
+			"version": "1.14.1",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@webassemblyjs/ast": "1.14.1",
+				"@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+				"@webassemblyjs/ieee754": "1.13.2",
+				"@webassemblyjs/leb128": "1.13.2",
+				"@webassemblyjs/utf8": "1.13.2"
+			}
+		},
+		"node_modules/@webassemblyjs/wasm-opt": {
+			"version": "1.14.1",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@webassemblyjs/ast": "1.14.1",
+				"@webassemblyjs/helper-buffer": "1.14.1",
+				"@webassemblyjs/wasm-gen": "1.14.1",
+				"@webassemblyjs/wasm-parser": "1.14.1"
+			}
+		},
+		"node_modules/@webassemblyjs/wasm-parser": {
+			"version": "1.14.1",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@webassemblyjs/ast": "1.14.1",
+				"@webassemblyjs/helper-api-error": "1.13.2",
+				"@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+				"@webassemblyjs/ieee754": "1.13.2",
+				"@webassemblyjs/leb128": "1.13.2",
+				"@webassemblyjs/utf8": "1.13.2"
+			}
+		},
+		"node_modules/@webassemblyjs/wast-printer": {
+			"version": "1.14.1",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@webassemblyjs/ast": "1.14.1",
+				"@xtuc/long": "4.2.2"
+			}
+		},
+		"node_modules/@webpack-cli/configtest": {
+			"version": "3.0.1",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=18.12.0"
+			},
+			"peerDependencies": {
+				"webpack": "^5.82.0",
+				"webpack-cli": "6.x.x"
+			}
+		},
+		"node_modules/@webpack-cli/info": {
+			"version": "3.0.1",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=18.12.0"
+			},
+			"peerDependencies": {
+				"webpack": "^5.82.0",
+				"webpack-cli": "6.x.x"
+			}
+		},
+		"node_modules/@webpack-cli/serve": {
+			"version": "3.0.1",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=18.12.0"
+			},
+			"peerDependencies": {
+				"webpack": "^5.82.0",
+				"webpack-cli": "6.x.x"
+			},
+			"peerDependenciesMeta": {
+				"webpack-dev-server": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@xtuc/ieee754": {
+			"version": "1.2.0",
+			"dev": true,
+			"license": "BSD-3-Clause"
+		},
+		"node_modules/@xtuc/long": {
+			"version": "4.2.2",
+			"dev": true,
+			"license": "Apache-2.0"
+		},
+		"node_modules/acorn": {
+			"version": "8.14.0",
+			"dev": true,
+			"license": "MIT",
+			"bin": {
+				"acorn": "bin/acorn"
+			},
+			"engines": {
+				"node": ">=0.4.0"
+			}
+		},
+		"node_modules/acorn-jsx": {
+			"version": "5.3.2",
+			"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+			"integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+			"dev": true,
+			"license": "MIT",
+			"peerDependencies": {
+				"acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+			}
+		},
+		"node_modules/acorn-walk": {
+			"version": "8.3.4",
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"peer": true,
+			"dependencies": {
+				"acorn": "^8.11.0"
+			},
+			"engines": {
+				"node": ">=0.4.0"
+			}
+		},
+		"node_modules/adjust-sourcemap-loader": {
+			"version": "4.0.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"loader-utils": "^2.0.0",
+				"regex-parser": "^2.2.11"
+			},
+			"engines": {
+				"node": ">=8.9"
+			}
+		},
+		"node_modules/agent-base": {
+			"version": "7.1.3",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 14"
+			}
+		},
+		"node_modules/ajv": {
+			"version": "6.12.6",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"fast-deep-equal": "^3.1.1",
+				"fast-json-stable-stringify": "^2.0.0",
+				"json-schema-traverse": "^0.4.1",
+				"uri-js": "^4.2.2"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/epoberezkin"
+			}
+		},
+		"node_modules/ajv-formats": {
+			"version": "2.1.1",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ajv": "^8.0.0"
+			},
+			"peerDependencies": {
+				"ajv": "^8.0.0"
+			},
+			"peerDependenciesMeta": {
+				"ajv": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/ajv-formats/node_modules/ajv": {
+			"version": "8.17.1",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"fast-deep-equal": "^3.1.3",
+				"fast-uri": "^3.0.1",
+				"json-schema-traverse": "^1.0.0",
+				"require-from-string": "^2.0.2"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/epoberezkin"
+			}
+		},
+		"node_modules/ajv-formats/node_modules/json-schema-traverse": {
+			"version": "1.0.0",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/ajv-keywords": {
+			"version": "3.5.2",
+			"dev": true,
+			"license": "MIT",
+			"peerDependencies": {
+				"ajv": "^6.9.1"
+			}
+		},
+		"node_modules/ansi-colors": {
+			"version": "4.1.3",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/ansi-escapes": {
+			"version": "4.3.2",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"type-fest": "^0.21.3"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/ansi-regex": {
+			"version": "5.0.1",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/anymatch": {
+			"version": "3.1.3",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"normalize-path": "^3.0.0",
+				"picomatch": "^2.0.4"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/arg": {
+			"version": "4.1.3",
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"peer": true
+		},
+		"node_modules/argparse": {
+			"version": "2.0.1",
+			"dev": true,
+			"license": "Python-2.0"
+		},
+		"node_modules/async": {
+			"version": "3.2.6",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/babel-jest": {
+			"version": "29.7.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/transform": "^29.7.0",
+				"@types/babel__core": "^7.1.14",
+				"babel-plugin-istanbul": "^6.1.1",
+				"babel-preset-jest": "^29.6.3",
+				"chalk": "^4.0.0",
+				"graceful-fs": "^4.2.9",
+				"slash": "^3.0.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.8.0"
+			}
+		},
+		"node_modules/babel-plugin-istanbul": {
+			"version": "6.1.1",
+			"dev": true,
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.0.0",
+				"@istanbuljs/load-nyc-config": "^1.0.0",
+				"@istanbuljs/schema": "^0.1.2",
+				"istanbul-lib-instrument": "^5.0.4",
+				"test-exclude": "^6.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/babel-plugin-istanbul/node_modules/istanbul-lib-instrument": {
+			"version": "5.2.1",
+			"dev": true,
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"@babel/core": "^7.12.3",
+				"@babel/parser": "^7.14.7",
+				"@istanbuljs/schema": "^0.1.2",
+				"istanbul-lib-coverage": "^3.2.0",
+				"semver": "^6.3.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/babel-plugin-istanbul/node_modules/semver": {
+			"version": "6.3.1",
+			"dev": true,
+			"license": "ISC",
+			"bin": {
+				"semver": "bin/semver.js"
+			}
+		},
+		"node_modules/babel-plugin-jest-hoist": {
+			"version": "29.6.3",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/template": "^7.3.3",
+				"@babel/types": "^7.3.3",
+				"@types/babel__core": "^7.1.14",
+				"@types/babel__traverse": "^7.0.6"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/babel-preset-current-node-syntax": {
+			"version": "1.1.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/plugin-syntax-async-generators": "^7.8.4",
+				"@babel/plugin-syntax-bigint": "^7.8.3",
+				"@babel/plugin-syntax-class-properties": "^7.12.13",
+				"@babel/plugin-syntax-class-static-block": "^7.14.5",
+				"@babel/plugin-syntax-import-attributes": "^7.24.7",
+				"@babel/plugin-syntax-import-meta": "^7.10.4",
+				"@babel/plugin-syntax-json-strings": "^7.8.3",
+				"@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
+				"@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+				"@babel/plugin-syntax-numeric-separator": "^7.10.4",
+				"@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+				"@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+				"@babel/plugin-syntax-optional-chaining": "^7.8.3",
+				"@babel/plugin-syntax-private-property-in-object": "^7.14.5",
+				"@babel/plugin-syntax-top-level-await": "^7.14.5"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
+			}
+		},
+		"node_modules/babel-preset-jest": {
+			"version": "29.6.3",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"babel-plugin-jest-hoist": "^29.6.3",
+				"babel-preset-current-node-syntax": "^1.0.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
+			}
+		},
+		"node_modules/balanced-match": {
+			"version": "1.0.2",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/big.js": {
+			"version": "5.2.2",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/brace-expansion": {
+			"version": "1.1.11",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"balanced-match": "^1.0.0",
+				"concat-map": "0.0.1"
+			}
+		},
+		"node_modules/braces": {
+			"version": "3.0.3",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"fill-range": "^7.1.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/browserslist": {
+			"version": "4.24.4",
+			"dev": true,
+			"funding": [
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/browserslist"
+				},
+				{
+					"type": "tidelift",
+					"url": "https://tidelift.com/funding/github/npm/browserslist"
+				},
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/ai"
+				}
+			],
+			"license": "MIT",
+			"dependencies": {
+				"caniuse-lite": "^1.0.30001688",
+				"electron-to-chromium": "^1.5.73",
+				"node-releases": "^2.0.19",
+				"update-browserslist-db": "^1.1.1"
+			},
+			"bin": {
+				"browserslist": "cli.js"
+			},
+			"engines": {
+				"node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+			}
+		},
+		"node_modules/bs-logger": {
+			"version": "0.2.6",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"fast-json-stable-stringify": "2.x"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/bser": {
+			"version": "2.1.1",
+			"dev": true,
+			"license": "Apache-2.0",
+			"dependencies": {
+				"node-int64": "^0.4.0"
+			}
+		},
+		"node_modules/buffer-from": {
+			"version": "1.1.2",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/byte-base64": {
+			"version": "1.1.0",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/call-bind-apply-helpers": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
+			"integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"es-errors": "^1.3.0",
+				"function-bind": "^1.1.2"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/call-bound": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.3.tgz",
+			"integrity": "sha512-YTd+6wGlNlPxSuri7Y6X8tY2dmm12UMH66RpKMhiX6rsk5wXXnYgbUcOt8kiS31/AjfoTOvCsE+w8nZQLQnzHA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"call-bind-apply-helpers": "^1.0.1",
+				"get-intrinsic": "^1.2.6"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/callsites": {
+			"version": "3.1.0",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/camelcase": {
+			"version": "5.3.1",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/caniuse-lite": {
+			"version": "1.0.30001700",
+			"dev": true,
+			"funding": [
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/browserslist"
+				},
+				{
+					"type": "tidelift",
+					"url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+				},
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/ai"
+				}
+			],
+			"license": "CC-BY-4.0"
+		},
+		"node_modules/chalk": {
+			"version": "4.1.2",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
+			}
+		},
+		"node_modules/change-case": {
+			"version": "5.4.4",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/char-regex": {
+			"version": "1.0.2",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/chokidar": {
+			"version": "4.0.3",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"readdirp": "^4.0.1"
+			},
+			"engines": {
+				"node": ">= 14.16.0"
+			},
+			"funding": {
+				"url": "https://paulmillr.com/funding/"
+			}
+		},
+		"node_modules/chrome-trace-event": {
+			"version": "1.0.4",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6.0"
+			}
+		},
+		"node_modules/ci-info": {
+			"version": "3.9.0",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/sibiraj-s"
+				}
+			],
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/cjs-module-lexer": {
+			"version": "1.4.3",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/cliui": {
+			"version": "8.0.1",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"string-width": "^4.2.0",
+				"strip-ansi": "^6.0.1",
+				"wrap-ansi": "^7.0.0"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/clone-deep": {
+			"version": "4.0.1",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"is-plain-object": "^2.0.4",
+				"kind-of": "^6.0.2",
+				"shallow-clone": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/co": {
+			"version": "4.6.0",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"iojs": ">= 1.0.0",
+				"node": ">= 0.12.0"
+			}
+		},
+		"node_modules/collect-v8-coverage": {
+			"version": "1.0.2",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/color-convert": {
+			"version": "2.0.1",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
+		},
+		"node_modules/color-name": {
+			"version": "1.1.4",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/colorette": {
+			"version": "1.4.0",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/commander": {
+			"version": "2.20.3",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/concat-map": {
+			"version": "0.0.1",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/concurrently": {
+			"version": "9.1.2",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"chalk": "^4.1.2",
+				"lodash": "^4.17.21",
+				"rxjs": "^7.8.1",
+				"shell-quote": "^1.8.1",
+				"supports-color": "^8.1.1",
+				"tree-kill": "^1.2.2",
+				"yargs": "^17.7.2"
+			},
+			"bin": {
+				"conc": "dist/bin/concurrently.js",
+				"concurrently": "dist/bin/concurrently.js"
+			},
+			"engines": {
+				"node": ">=18"
+			},
+			"funding": {
+				"url": "https://github.com/open-cli-tools/concurrently?sponsor=1"
+			}
+		},
+		"node_modules/concurrently/node_modules/supports-color": {
+			"version": "8.1.1",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/supports-color?sponsor=1"
+			}
+		},
+		"node_modules/convert-source-map": {
+			"version": "2.0.0",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/create-jest": {
+			"version": "29.7.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/types": "^29.6.3",
+				"chalk": "^4.0.0",
+				"exit": "^0.1.2",
+				"graceful-fs": "^4.2.9",
+				"jest-config": "^29.7.0",
+				"jest-util": "^29.7.0",
+				"prompts": "^2.0.1"
+			},
+			"bin": {
+				"create-jest": "bin/create-jest.js"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/create-require": {
+			"version": "1.1.1",
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"peer": true
+		},
+		"node_modules/cross-spawn": {
+			"version": "7.0.6",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"path-key": "^3.1.0",
+				"shebang-command": "^2.0.0",
+				"which": "^2.0.1"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/css-loader": {
+			"version": "7.1.2",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"icss-utils": "^5.1.0",
+				"postcss": "^8.4.33",
+				"postcss-modules-extract-imports": "^3.1.0",
+				"postcss-modules-local-by-default": "^4.0.5",
+				"postcss-modules-scope": "^3.2.0",
+				"postcss-modules-values": "^4.0.0",
+				"postcss-value-parser": "^4.2.0",
+				"semver": "^7.5.4"
+			},
+			"engines": {
+				"node": ">= 18.12.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependencies": {
+				"@rspack/core": "0.x || 1.x",
+				"webpack": "^5.27.0"
+			},
+			"peerDependenciesMeta": {
+				"@rspack/core": {
+					"optional": true
+				},
+				"webpack": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/cssesc": {
+			"version": "3.0.0",
+			"dev": true,
+			"license": "MIT",
+			"bin": {
+				"cssesc": "bin/cssesc"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/date-fns": {
+			"version": "4.1.0",
+			"dev": true,
+			"license": "MIT",
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/kossnocorp"
+			}
+		},
+		"node_modules/debug": {
+			"version": "4.4.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ms": "^2.1.3"
+			},
+			"engines": {
+				"node": ">=6.0"
+			},
+			"peerDependenciesMeta": {
+				"supports-color": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/dedent": {
+			"version": "1.5.3",
+			"dev": true,
+			"license": "MIT",
+			"peerDependencies": {
+				"babel-plugin-macros": "^3.1.0"
+			},
+			"peerDependenciesMeta": {
+				"babel-plugin-macros": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/deep-is": {
+			"version": "0.1.4",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/deepmerge": {
+			"version": "4.3.1",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/detect-libc": {
+			"version": "1.0.3",
+			"dev": true,
+			"license": "Apache-2.0",
+			"optional": true,
+			"bin": {
+				"detect-libc": "bin/detect-libc.js"
+			},
+			"engines": {
+				"node": ">=0.10"
+			}
+		},
+		"node_modules/detect-newline": {
+			"version": "3.1.0",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/diff": {
+			"version": "4.0.2",
+			"dev": true,
+			"license": "BSD-3-Clause",
+			"optional": true,
+			"peer": true,
+			"engines": {
+				"node": ">=0.3.1"
+			}
+		},
+		"node_modules/diff-sequences": {
+			"version": "29.6.3",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/dunder-proto": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
+			"integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"call-bind-apply-helpers": "^1.0.1",
+				"es-errors": "^1.3.0",
+				"gopd": "^1.2.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/ejs": {
+			"version": "3.1.10",
+			"dev": true,
+			"license": "Apache-2.0",
+			"dependencies": {
+				"jake": "^10.8.5"
+			},
+			"bin": {
+				"ejs": "bin/cli.js"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/electron-to-chromium": {
+			"version": "1.5.102",
+			"dev": true,
+			"license": "ISC"
+		},
+		"node_modules/emittery": {
+			"version": "0.13.1",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sindresorhus/emittery?sponsor=1"
+			}
+		},
+		"node_modules/emoji-regex": {
+			"version": "8.0.0",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/emojis-list": {
+			"version": "3.0.0",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 4"
+			}
+		},
+		"node_modules/enhanced-resolve": {
+			"version": "5.18.1",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"graceful-fs": "^4.2.4",
+				"tapable": "^2.2.0"
+			},
+			"engines": {
+				"node": ">=10.13.0"
+			}
+		},
+		"node_modules/envinfo": {
+			"version": "7.14.0",
+			"dev": true,
+			"license": "MIT",
+			"bin": {
+				"envinfo": "dist/cli.js"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/error-ex": {
+			"version": "1.3.2",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"is-arrayish": "^0.2.1"
+			}
+		},
+		"node_modules/es-define-property": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
+			"integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/es-errors": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+			"integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/es-module-lexer": {
+			"version": "1.6.0",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/es-object-atoms": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
+			"integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"es-errors": "^1.3.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/escalade": {
+			"version": "3.2.0",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/escape-string-regexp": {
+			"version": "4.0.0",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/eslint": {
+			"version": "9.21.0",
+			"resolved": "https://registry.npmjs.org/eslint/-/eslint-9.21.0.tgz",
+			"integrity": "sha512-KjeihdFqTPhOMXTt7StsDxriV4n66ueuF/jfPNC3j/lduHwr/ijDwJMsF+wyMJethgiKi5wniIE243vi07d3pg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@eslint-community/eslint-utils": "^4.2.0",
+				"@eslint-community/regexpp": "^4.12.1",
+				"@eslint/config-array": "^0.19.2",
+				"@eslint/core": "^0.12.0",
+				"@eslint/eslintrc": "^3.3.0",
+				"@eslint/js": "9.21.0",
+				"@eslint/plugin-kit": "^0.2.7",
+				"@humanfs/node": "^0.16.6",
+				"@humanwhocodes/module-importer": "^1.0.1",
+				"@humanwhocodes/retry": "^0.4.2",
+				"@types/estree": "^1.0.6",
+				"@types/json-schema": "^7.0.15",
+				"ajv": "^6.12.4",
+				"chalk": "^4.0.0",
+				"cross-spawn": "^7.0.6",
+				"debug": "^4.3.2",
+				"escape-string-regexp": "^4.0.0",
+				"eslint-scope": "^8.2.0",
+				"eslint-visitor-keys": "^4.2.0",
+				"espree": "^10.3.0",
+				"esquery": "^1.5.0",
+				"esutils": "^2.0.2",
+				"fast-deep-equal": "^3.1.3",
+				"file-entry-cache": "^8.0.0",
+				"find-up": "^5.0.0",
+				"glob-parent": "^6.0.2",
+				"ignore": "^5.2.0",
+				"imurmurhash": "^0.1.4",
+				"is-glob": "^4.0.0",
+				"json-stable-stringify-without-jsonify": "^1.0.1",
+				"lodash.merge": "^4.6.2",
+				"minimatch": "^3.1.2",
+				"natural-compare": "^1.4.0",
+				"optionator": "^0.9.3"
+			},
+			"bin": {
+				"eslint": "bin/eslint.js"
+			},
+			"engines": {
+				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+			},
+			"funding": {
+				"url": "https://eslint.org/donate"
+			},
+			"peerDependencies": {
+				"jiti": "*"
+			},
+			"peerDependenciesMeta": {
+				"jiti": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/eslint-plugin-unused-imports": {
+			"version": "4.1.4",
+			"dev": true,
+			"license": "MIT",
+			"peerDependencies": {
+				"@typescript-eslint/eslint-plugin": "^8.0.0-0 || ^7.0.0 || ^6.0.0 || ^5.0.0",
+				"eslint": "^9.0.0 || ^8.0.0"
+			},
+			"peerDependenciesMeta": {
+				"@typescript-eslint/eslint-plugin": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/eslint-scope": {
+			"version": "8.2.0",
+			"dev": true,
+			"license": "BSD-2-Clause",
+			"dependencies": {
+				"esrecurse": "^4.3.0",
+				"estraverse": "^5.2.0"
+			},
+			"engines": {
+				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+			},
+			"funding": {
+				"url": "https://opencollective.com/eslint"
+			}
+		},
+		"node_modules/eslint-visitor-keys": {
+			"version": "4.2.0",
+			"dev": true,
+			"license": "Apache-2.0",
+			"engines": {
+				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+			},
+			"funding": {
+				"url": "https://opencollective.com/eslint"
+			}
+		},
+		"node_modules/espree": {
+			"version": "10.3.0",
+			"resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz",
+			"integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==",
+			"dev": true,
+			"license": "BSD-2-Clause",
+			"dependencies": {
+				"acorn": "^8.14.0",
+				"acorn-jsx": "^5.3.2",
+				"eslint-visitor-keys": "^4.2.0"
+			},
+			"engines": {
+				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+			},
+			"funding": {
+				"url": "https://opencollective.com/eslint"
+			}
+		},
+		"node_modules/esprima": {
+			"version": "4.0.1",
+			"dev": true,
+			"license": "BSD-2-Clause",
+			"bin": {
+				"esparse": "bin/esparse.js",
+				"esvalidate": "bin/esvalidate.js"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/esquery": {
+			"version": "1.6.0",
+			"dev": true,
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"estraverse": "^5.1.0"
+			},
+			"engines": {
+				"node": ">=0.10"
+			}
+		},
+		"node_modules/esrecurse": {
+			"version": "4.3.0",
+			"dev": true,
+			"license": "BSD-2-Clause",
+			"dependencies": {
+				"estraverse": "^5.2.0"
+			},
+			"engines": {
+				"node": ">=4.0"
+			}
+		},
+		"node_modules/estraverse": {
+			"version": "5.3.0",
+			"dev": true,
+			"license": "BSD-2-Clause",
+			"engines": {
+				"node": ">=4.0"
+			}
+		},
+		"node_modules/esutils": {
+			"version": "2.0.3",
+			"dev": true,
+			"license": "BSD-2-Clause",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/eventemitter3": {
+			"version": "5.0.1",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/events": {
+			"version": "3.3.0",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.8.x"
+			}
+		},
+		"node_modules/execa": {
+			"version": "5.1.1",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"cross-spawn": "^7.0.3",
+				"get-stream": "^6.0.0",
+				"human-signals": "^2.1.0",
+				"is-stream": "^2.0.0",
+				"merge-stream": "^2.0.0",
+				"npm-run-path": "^4.0.1",
+				"onetime": "^5.1.2",
+				"signal-exit": "^3.0.3",
+				"strip-final-newline": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sindresorhus/execa?sponsor=1"
+			}
+		},
+		"node_modules/exit": {
+			"version": "0.1.2",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/expect": {
+			"version": "29.7.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/expect-utils": "^29.7.0",
+				"jest-get-type": "^29.6.3",
+				"jest-matcher-utils": "^29.7.0",
+				"jest-message-util": "^29.7.0",
+				"jest-util": "^29.7.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/fast-deep-equal": {
+			"version": "3.1.3",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/fast-glob": {
+			"version": "3.3.3",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@nodelib/fs.stat": "^2.0.2",
+				"@nodelib/fs.walk": "^1.2.3",
+				"glob-parent": "^5.1.2",
+				"merge2": "^1.3.0",
+				"micromatch": "^4.0.8"
+			},
+			"engines": {
+				"node": ">=8.6.0"
+			}
+		},
+		"node_modules/fast-glob/node_modules/glob-parent": {
+			"version": "5.1.2",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"is-glob": "^4.0.1"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/fast-json-stable-stringify": {
+			"version": "2.1.0",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/fast-levenshtein": {
+			"version": "2.0.6",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/fast-uri": {
+			"version": "3.0.6",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/fastify"
+				},
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/fastify"
+				}
+			],
+			"license": "BSD-3-Clause"
+		},
+		"node_modules/fastest-levenshtein": {
+			"version": "1.0.16",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 4.9.1"
+			}
+		},
+		"node_modules/fastq": {
+			"version": "1.19.0",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"reusify": "^1.0.4"
+			}
+		},
+		"node_modules/fb-watchman": {
+			"version": "2.0.2",
+			"dev": true,
+			"license": "Apache-2.0",
+			"dependencies": {
+				"bser": "2.1.1"
+			}
+		},
+		"node_modules/fetch-retry": {
+			"version": "6.0.0",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/file-entry-cache": {
+			"version": "8.0.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"flat-cache": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=16.0.0"
+			}
+		},
+		"node_modules/file-loader": {
+			"version": "6.2.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"loader-utils": "^2.0.0",
+				"schema-utils": "^3.0.0"
+			},
+			"engines": {
+				"node": ">= 10.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependencies": {
+				"webpack": "^4.0.0 || ^5.0.0"
+			}
+		},
+		"node_modules/filelist": {
+			"version": "1.0.4",
+			"dev": true,
+			"license": "Apache-2.0",
+			"dependencies": {
+				"minimatch": "^5.0.1"
+			}
+		},
+		"node_modules/filelist/node_modules/brace-expansion": {
+			"version": "2.0.1",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"balanced-match": "^1.0.0"
+			}
+		},
+		"node_modules/filelist/node_modules/minimatch": {
+			"version": "5.1.6",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"brace-expansion": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/fill-range": {
+			"version": "7.1.1",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"to-regex-range": "^5.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/find-up": {
+			"version": "5.0.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"locate-path": "^6.0.0",
+				"path-exists": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/flat": {
+			"version": "5.0.2",
+			"dev": true,
+			"license": "BSD-3-Clause",
+			"bin": {
+				"flat": "cli.js"
+			}
+		},
+		"node_modules/flat-cache": {
+			"version": "4.0.1",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"flatted": "^3.2.9",
+				"keyv": "^4.5.4"
+			},
+			"engines": {
+				"node": ">=16"
+			}
+		},
+		"node_modules/flatted": {
+			"version": "3.3.3",
+			"dev": true,
+			"license": "ISC"
+		},
+		"node_modules/fs-extra": {
+			"version": "11.3.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"graceful-fs": "^4.2.0",
+				"jsonfile": "^6.0.1",
+				"universalify": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=14.14"
+			}
+		},
+		"node_modules/fs.realpath": {
+			"version": "1.0.0",
+			"dev": true,
+			"license": "ISC"
+		},
+		"node_modules/function-bind": {
+			"version": "1.1.2",
+			"dev": true,
+			"license": "MIT",
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/gensync": {
+			"version": "1.0.0-beta.2",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/get-caller-file": {
+			"version": "2.0.5",
+			"dev": true,
+			"license": "ISC",
+			"engines": {
+				"node": "6.* || 8.* || >= 10.*"
+			}
+		},
+		"node_modules/get-intrinsic": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
+			"integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"call-bind-apply-helpers": "^1.0.2",
+				"es-define-property": "^1.0.1",
+				"es-errors": "^1.3.0",
+				"es-object-atoms": "^1.1.1",
+				"function-bind": "^1.1.2",
+				"get-proto": "^1.0.1",
+				"gopd": "^1.2.0",
+				"has-symbols": "^1.1.0",
+				"hasown": "^2.0.2",
+				"math-intrinsics": "^1.1.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/get-package-type": {
+			"version": "0.1.0",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=8.0.0"
+			}
+		},
+		"node_modules/get-proto": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
+			"integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"dunder-proto": "^1.0.1",
+				"es-object-atoms": "^1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/get-stream": {
+			"version": "6.0.1",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/glob": {
+			"version": "7.2.3",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"fs.realpath": "^1.0.0",
+				"inflight": "^1.0.4",
+				"inherits": "2",
+				"minimatch": "^3.1.1",
+				"once": "^1.3.0",
+				"path-is-absolute": "^1.0.0"
+			},
+			"engines": {
+				"node": "*"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
+		"node_modules/glob-parent": {
+			"version": "6.0.2",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"is-glob": "^4.0.3"
+			},
+			"engines": {
+				"node": ">=10.13.0"
+			}
+		},
+		"node_modules/glob-to-regexp": {
+			"version": "0.4.1",
+			"dev": true,
+			"license": "BSD-2-Clause"
+		},
+		"node_modules/globals": {
+			"version": "14.0.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz",
+			"integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=18"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/gopd": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
+			"integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/graceful-fs": {
+			"version": "4.2.11",
+			"dev": true,
+			"license": "ISC"
+		},
+		"node_modules/graphemer": {
+			"version": "1.4.0",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/has-flag": {
+			"version": "4.0.0",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/has-symbols": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
+			"integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/hasown": {
+			"version": "2.0.2",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"function-bind": "^1.1.2"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/html-escaper": {
+			"version": "2.0.2",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/https-proxy-agent": {
+			"version": "7.0.6",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"agent-base": "^7.1.2",
+				"debug": "4"
+			},
+			"engines": {
+				"node": ">= 14"
+			}
+		},
+		"node_modules/human-signals": {
+			"version": "2.1.0",
+			"dev": true,
+			"license": "Apache-2.0",
+			"engines": {
+				"node": ">=10.17.0"
+			}
+		},
+		"node_modules/icss-utils": {
+			"version": "5.1.0",
+			"dev": true,
+			"license": "ISC",
+			"engines": {
+				"node": "^10 || ^12 || >= 14"
+			},
+			"peerDependencies": {
+				"postcss": "^8.1.0"
+			}
+		},
+		"node_modules/ignore": {
+			"version": "5.3.2",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 4"
+			}
+		},
+		"node_modules/immutable": {
+			"version": "5.0.3",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/import-fresh": {
+			"version": "3.3.1",
+			"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz",
+			"integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"parent-module": "^1.0.0",
+				"resolve-from": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/import-local": {
+			"version": "3.2.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"pkg-dir": "^4.2.0",
+				"resolve-cwd": "^3.0.0"
+			},
+			"bin": {
+				"import-local-fixture": "fixtures/cli.js"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/imurmurhash": {
+			"version": "0.1.4",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.8.19"
+			}
+		},
+		"node_modules/index-to-position": {
+			"version": "0.1.2",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=18"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/inflight": {
+			"version": "1.0.6",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"once": "^1.3.0",
+				"wrappy": "1"
+			}
+		},
+		"node_modules/inherits": {
+			"version": "2.0.4",
+			"dev": true,
+			"license": "ISC"
+		},
+		"node_modules/interpret": {
+			"version": "3.1.1",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=10.13.0"
+			}
+		},
+		"node_modules/is-arrayish": {
+			"version": "0.2.1",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/is-core-module": {
+			"version": "2.16.1",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"hasown": "^2.0.2"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/is-extglob": {
+			"version": "2.1.1",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/is-fullwidth-code-point": {
+			"version": "3.0.0",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/is-generator-fn": {
+			"version": "2.1.0",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/is-glob": {
+			"version": "4.0.3",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"is-extglob": "^2.1.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/is-number": {
+			"version": "7.0.0",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.12.0"
+			}
+		},
+		"node_modules/is-plain-object": {
+			"version": "2.0.4",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"isobject": "^3.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/is-stream": {
+			"version": "2.0.1",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/isexe": {
+			"version": "2.0.0",
+			"dev": true,
+			"license": "ISC"
+		},
+		"node_modules/isobject": {
+			"version": "3.0.1",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/istanbul-lib-coverage": {
+			"version": "3.2.2",
+			"dev": true,
+			"license": "BSD-3-Clause",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/istanbul-lib-instrument": {
+			"version": "6.0.3",
+			"dev": true,
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"@babel/core": "^7.23.9",
+				"@babel/parser": "^7.23.9",
+				"@istanbuljs/schema": "^0.1.3",
+				"istanbul-lib-coverage": "^3.2.0",
+				"semver": "^7.5.4"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/istanbul-lib-report": {
+			"version": "3.0.1",
+			"dev": true,
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"istanbul-lib-coverage": "^3.0.0",
+				"make-dir": "^4.0.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/istanbul-lib-source-maps": {
+			"version": "4.0.1",
+			"dev": true,
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"debug": "^4.1.1",
+				"istanbul-lib-coverage": "^3.0.0",
+				"source-map": "^0.6.1"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/istanbul-reports": {
+			"version": "3.1.7",
+			"dev": true,
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"html-escaper": "^2.0.0",
+				"istanbul-lib-report": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/jake": {
+			"version": "10.9.2",
+			"dev": true,
+			"license": "Apache-2.0",
+			"dependencies": {
+				"async": "^3.2.3",
+				"chalk": "^4.0.2",
+				"filelist": "^1.0.4",
+				"minimatch": "^3.1.2"
+			},
+			"bin": {
+				"jake": "bin/cli.js"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/jest": {
+			"version": "29.7.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/core": "^29.7.0",
+				"@jest/types": "^29.6.3",
+				"import-local": "^3.0.2",
+				"jest-cli": "^29.7.0"
+			},
+			"bin": {
+				"jest": "bin/jest.js"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			},
+			"peerDependencies": {
+				"node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+			},
+			"peerDependenciesMeta": {
+				"node-notifier": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/jest-changed-files": {
+			"version": "29.7.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"execa": "^5.0.0",
+				"jest-util": "^29.7.0",
+				"p-limit": "^3.1.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-circus": {
+			"version": "29.7.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/environment": "^29.7.0",
+				"@jest/expect": "^29.7.0",
+				"@jest/test-result": "^29.7.0",
+				"@jest/types": "^29.6.3",
+				"@types/node": "*",
+				"chalk": "^4.0.0",
+				"co": "^4.6.0",
+				"dedent": "^1.0.0",
+				"is-generator-fn": "^2.0.0",
+				"jest-each": "^29.7.0",
+				"jest-matcher-utils": "^29.7.0",
+				"jest-message-util": "^29.7.0",
+				"jest-runtime": "^29.7.0",
+				"jest-snapshot": "^29.7.0",
+				"jest-util": "^29.7.0",
+				"p-limit": "^3.1.0",
+				"pretty-format": "^29.7.0",
+				"pure-rand": "^6.0.0",
+				"slash": "^3.0.0",
+				"stack-utils": "^2.0.3"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-cli": {
+			"version": "29.7.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/core": "^29.7.0",
+				"@jest/test-result": "^29.7.0",
+				"@jest/types": "^29.6.3",
+				"chalk": "^4.0.0",
+				"create-jest": "^29.7.0",
+				"exit": "^0.1.2",
+				"import-local": "^3.0.2",
+				"jest-config": "^29.7.0",
+				"jest-util": "^29.7.0",
+				"jest-validate": "^29.7.0",
+				"yargs": "^17.3.1"
+			},
+			"bin": {
+				"jest": "bin/jest.js"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			},
+			"peerDependencies": {
+				"node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+			},
+			"peerDependenciesMeta": {
+				"node-notifier": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/jest-config": {
+			"version": "29.7.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/core": "^7.11.6",
+				"@jest/test-sequencer": "^29.7.0",
+				"@jest/types": "^29.6.3",
+				"babel-jest": "^29.7.0",
+				"chalk": "^4.0.0",
+				"ci-info": "^3.2.0",
+				"deepmerge": "^4.2.2",
+				"glob": "^7.1.3",
+				"graceful-fs": "^4.2.9",
+				"jest-circus": "^29.7.0",
+				"jest-environment-node": "^29.7.0",
+				"jest-get-type": "^29.6.3",
+				"jest-regex-util": "^29.6.3",
+				"jest-resolve": "^29.7.0",
+				"jest-runner": "^29.7.0",
+				"jest-util": "^29.7.0",
+				"jest-validate": "^29.7.0",
+				"micromatch": "^4.0.4",
+				"parse-json": "^5.2.0",
+				"pretty-format": "^29.7.0",
+				"slash": "^3.0.0",
+				"strip-json-comments": "^3.1.1"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			},
+			"peerDependencies": {
+				"@types/node": "*",
+				"ts-node": ">=9.0.0"
+			},
+			"peerDependenciesMeta": {
+				"@types/node": {
+					"optional": true
+				},
+				"ts-node": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/jest-diff": {
+			"version": "29.7.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"chalk": "^4.0.0",
+				"diff-sequences": "^29.6.3",
+				"jest-get-type": "^29.6.3",
+				"pretty-format": "^29.7.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-docblock": {
+			"version": "29.7.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"detect-newline": "^3.0.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-each": {
+			"version": "29.7.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/types": "^29.6.3",
+				"chalk": "^4.0.0",
+				"jest-get-type": "^29.6.3",
+				"jest-util": "^29.7.0",
+				"pretty-format": "^29.7.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-environment-node": {
+			"version": "29.7.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/environment": "^29.7.0",
+				"@jest/fake-timers": "^29.7.0",
+				"@jest/types": "^29.6.3",
+				"@types/node": "*",
+				"jest-mock": "^29.7.0",
+				"jest-util": "^29.7.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-get-type": {
+			"version": "29.6.3",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-haste-map": {
+			"version": "29.7.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/types": "^29.6.3",
+				"@types/graceful-fs": "^4.1.3",
+				"@types/node": "*",
+				"anymatch": "^3.0.3",
+				"fb-watchman": "^2.0.0",
+				"graceful-fs": "^4.2.9",
+				"jest-regex-util": "^29.6.3",
+				"jest-util": "^29.7.0",
+				"jest-worker": "^29.7.0",
+				"micromatch": "^4.0.4",
+				"walker": "^1.0.8"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			},
+			"optionalDependencies": {
+				"fsevents": "^2.3.2"
+			}
+		},
+		"node_modules/jest-leak-detector": {
+			"version": "29.7.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"jest-get-type": "^29.6.3",
+				"pretty-format": "^29.7.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-matcher-utils": {
+			"version": "29.7.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"chalk": "^4.0.0",
+				"jest-diff": "^29.7.0",
+				"jest-get-type": "^29.6.3",
+				"pretty-format": "^29.7.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-message-util": {
+			"version": "29.7.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/code-frame": "^7.12.13",
+				"@jest/types": "^29.6.3",
+				"@types/stack-utils": "^2.0.0",
+				"chalk": "^4.0.0",
+				"graceful-fs": "^4.2.9",
+				"micromatch": "^4.0.4",
+				"pretty-format": "^29.7.0",
+				"slash": "^3.0.0",
+				"stack-utils": "^2.0.3"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-mock": {
+			"version": "29.7.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/types": "^29.6.3",
+				"@types/node": "*",
+				"jest-util": "^29.7.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-pnp-resolver": {
+			"version": "1.2.3",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
+			},
+			"peerDependencies": {
+				"jest-resolve": "*"
+			},
+			"peerDependenciesMeta": {
+				"jest-resolve": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/jest-regex-util": {
+			"version": "29.6.3",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-resolve": {
+			"version": "29.7.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"chalk": "^4.0.0",
+				"graceful-fs": "^4.2.9",
+				"jest-haste-map": "^29.7.0",
+				"jest-pnp-resolver": "^1.2.2",
+				"jest-util": "^29.7.0",
+				"jest-validate": "^29.7.0",
+				"resolve": "^1.20.0",
+				"resolve.exports": "^2.0.0",
+				"slash": "^3.0.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-resolve-dependencies": {
+			"version": "29.7.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"jest-regex-util": "^29.6.3",
+				"jest-snapshot": "^29.7.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-runner": {
+			"version": "29.7.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/console": "^29.7.0",
+				"@jest/environment": "^29.7.0",
+				"@jest/test-result": "^29.7.0",
+				"@jest/transform": "^29.7.0",
+				"@jest/types": "^29.6.3",
+				"@types/node": "*",
+				"chalk": "^4.0.0",
+				"emittery": "^0.13.1",
+				"graceful-fs": "^4.2.9",
+				"jest-docblock": "^29.7.0",
+				"jest-environment-node": "^29.7.0",
+				"jest-haste-map": "^29.7.0",
+				"jest-leak-detector": "^29.7.0",
+				"jest-message-util": "^29.7.0",
+				"jest-resolve": "^29.7.0",
+				"jest-runtime": "^29.7.0",
+				"jest-util": "^29.7.0",
+				"jest-watcher": "^29.7.0",
+				"jest-worker": "^29.7.0",
+				"p-limit": "^3.1.0",
+				"source-map-support": "0.5.13"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-runtime": {
+			"version": "29.7.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/environment": "^29.7.0",
+				"@jest/fake-timers": "^29.7.0",
+				"@jest/globals": "^29.7.0",
+				"@jest/source-map": "^29.6.3",
+				"@jest/test-result": "^29.7.0",
+				"@jest/transform": "^29.7.0",
+				"@jest/types": "^29.6.3",
+				"@types/node": "*",
+				"chalk": "^4.0.0",
+				"cjs-module-lexer": "^1.0.0",
+				"collect-v8-coverage": "^1.0.0",
+				"glob": "^7.1.3",
+				"graceful-fs": "^4.2.9",
+				"jest-haste-map": "^29.7.0",
+				"jest-message-util": "^29.7.0",
+				"jest-mock": "^29.7.0",
+				"jest-regex-util": "^29.6.3",
+				"jest-resolve": "^29.7.0",
+				"jest-snapshot": "^29.7.0",
+				"jest-util": "^29.7.0",
+				"slash": "^3.0.0",
+				"strip-bom": "^4.0.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-snapshot": {
+			"version": "29.7.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/core": "^7.11.6",
+				"@babel/generator": "^7.7.2",
+				"@babel/plugin-syntax-jsx": "^7.7.2",
+				"@babel/plugin-syntax-typescript": "^7.7.2",
+				"@babel/types": "^7.3.3",
+				"@jest/expect-utils": "^29.7.0",
+				"@jest/transform": "^29.7.0",
+				"@jest/types": "^29.6.3",
+				"babel-preset-current-node-syntax": "^1.0.0",
+				"chalk": "^4.0.0",
+				"expect": "^29.7.0",
+				"graceful-fs": "^4.2.9",
+				"jest-diff": "^29.7.0",
+				"jest-get-type": "^29.6.3",
+				"jest-matcher-utils": "^29.7.0",
+				"jest-message-util": "^29.7.0",
+				"jest-util": "^29.7.0",
+				"natural-compare": "^1.4.0",
+				"pretty-format": "^29.7.0",
+				"semver": "^7.5.3"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-util": {
+			"version": "29.7.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/types": "^29.6.3",
+				"@types/node": "*",
+				"chalk": "^4.0.0",
+				"ci-info": "^3.2.0",
+				"graceful-fs": "^4.2.9",
+				"picomatch": "^2.2.3"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-validate": {
+			"version": "29.7.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/types": "^29.6.3",
+				"camelcase": "^6.2.0",
+				"chalk": "^4.0.0",
+				"jest-get-type": "^29.6.3",
+				"leven": "^3.1.0",
+				"pretty-format": "^29.7.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-validate/node_modules/camelcase": {
+			"version": "6.3.0",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/jest-watcher": {
+			"version": "29.7.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/test-result": "^29.7.0",
+				"@jest/types": "^29.6.3",
+				"@types/node": "*",
+				"ansi-escapes": "^4.2.1",
+				"chalk": "^4.0.0",
+				"emittery": "^0.13.1",
+				"jest-util": "^29.7.0",
+				"string-length": "^4.0.1"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-worker": {
+			"version": "29.7.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@types/node": "*",
+				"jest-util": "^29.7.0",
+				"merge-stream": "^2.0.0",
+				"supports-color": "^8.0.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-worker/node_modules/supports-color": {
+			"version": "8.1.1",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/supports-color?sponsor=1"
+			}
+		},
+		"node_modules/js-levenshtein": {
+			"version": "1.1.6",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/js-tokens": {
+			"version": "4.0.0",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/js-yaml": {
+			"version": "4.1.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"argparse": "^2.0.1"
+			},
+			"bin": {
+				"js-yaml": "bin/js-yaml.js"
+			}
+		},
+		"node_modules/jsesc": {
+			"version": "3.1.0",
+			"dev": true,
+			"license": "MIT",
+			"bin": {
+				"jsesc": "bin/jsesc"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/json-buffer": {
+			"version": "3.0.1",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/json-parse-even-better-errors": {
+			"version": "2.3.1",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/json-schema-traverse": {
+			"version": "0.4.1",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/json-stable-stringify-without-jsonify": {
+			"version": "1.0.1",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/json5": {
+			"version": "2.2.3",
+			"dev": true,
+			"license": "MIT",
+			"bin": {
+				"json5": "lib/cli.js"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/jsonfile": {
+			"version": "6.1.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"universalify": "^2.0.0"
+			},
+			"optionalDependencies": {
+				"graceful-fs": "^4.1.6"
+			}
+		},
+		"node_modules/keyv": {
+			"version": "4.5.4",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"json-buffer": "3.0.1"
+			}
+		},
+		"node_modules/kind-of": {
+			"version": "6.0.3",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/kleur": {
+			"version": "3.0.3",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/leven": {
+			"version": "3.1.0",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/levn": {
+			"version": "0.4.1",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"prelude-ls": "^1.2.1",
+				"type-check": "~0.4.0"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/lines-and-columns": {
+			"version": "1.2.4",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/loader-runner": {
+			"version": "4.3.0",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6.11.5"
+			}
+		},
+		"node_modules/loader-utils": {
+			"version": "2.0.4",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"big.js": "^5.2.2",
+				"emojis-list": "^3.0.0",
+				"json5": "^2.1.2"
+			},
+			"engines": {
+				"node": ">=8.9.0"
+			}
+		},
+		"node_modules/locate-path": {
+			"version": "6.0.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"p-locate": "^5.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/lodash": {
+			"version": "4.17.21",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/lodash.memoize": {
+			"version": "4.1.2",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/lodash.merge": {
+			"version": "4.6.2",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/lru-cache": {
+			"version": "5.1.1",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"yallist": "^3.0.2"
+			}
+		},
+		"node_modules/make-dir": {
+			"version": "4.0.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"semver": "^7.5.3"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/make-error": {
+			"version": "1.3.6",
+			"dev": true,
+			"license": "ISC"
+		},
+		"node_modules/makeerror": {
+			"version": "1.0.12",
+			"dev": true,
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"tmpl": "1.0.5"
+			}
+		},
+		"node_modules/math-intrinsics": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
+			"integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/merge-stream": {
+			"version": "2.0.0",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/merge2": {
+			"version": "1.4.1",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/micromatch": {
+			"version": "4.0.8",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"braces": "^3.0.3",
+				"picomatch": "^2.3.1"
+			},
+			"engines": {
+				"node": ">=8.6"
+			}
+		},
+		"node_modules/mime-db": {
+			"version": "1.52.0",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/mime-types": {
+			"version": "2.1.35",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"mime-db": "1.52.0"
+			},
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/mimic-fn": {
+			"version": "2.1.0",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/mini-css-extract-plugin": {
+			"version": "2.9.2",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"schema-utils": "^4.0.0",
+				"tapable": "^2.2.1"
+			},
+			"engines": {
+				"node": ">= 12.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependencies": {
+				"webpack": "^5.0.0"
+			}
+		},
+		"node_modules/mini-css-extract-plugin/node_modules/ajv": {
+			"version": "8.17.1",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"fast-deep-equal": "^3.1.3",
+				"fast-uri": "^3.0.1",
+				"json-schema-traverse": "^1.0.0",
+				"require-from-string": "^2.0.2"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/epoberezkin"
+			}
+		},
+		"node_modules/mini-css-extract-plugin/node_modules/ajv-keywords": {
+			"version": "5.1.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"fast-deep-equal": "^3.1.3"
+			},
+			"peerDependencies": {
+				"ajv": "^8.8.2"
+			}
+		},
+		"node_modules/mini-css-extract-plugin/node_modules/json-schema-traverse": {
+			"version": "1.0.0",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/mini-css-extract-plugin/node_modules/schema-utils": {
+			"version": "4.3.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@types/json-schema": "^7.0.9",
+				"ajv": "^8.9.0",
+				"ajv-formats": "^2.1.1",
+				"ajv-keywords": "^5.1.0"
+			},
+			"engines": {
+				"node": ">= 10.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			}
+		},
+		"node_modules/minimatch": {
+			"version": "3.1.2",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"brace-expansion": "^1.1.7"
+			},
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/moment": {
+			"version": "2.29.4",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/ms": {
+			"version": "2.1.3",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/nanoid": {
+			"version": "3.3.8",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/ai"
+				}
+			],
+			"license": "MIT",
+			"bin": {
+				"nanoid": "bin/nanoid.cjs"
+			},
+			"engines": {
+				"node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+			}
+		},
+		"node_modules/natural-compare": {
+			"version": "1.4.0",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/neo-async": {
+			"version": "2.6.2",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/node-addon-api": {
+			"version": "7.1.1",
+			"dev": true,
+			"license": "MIT",
+			"optional": true
+		},
+		"node_modules/node-int64": {
+			"version": "0.4.0",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/node-releases": {
+			"version": "2.0.19",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/normalize-path": {
+			"version": "3.0.0",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/npm-check-updates": {
+			"version": "17.1.14",
+			"dev": true,
+			"license": "Apache-2.0",
+			"bin": {
+				"ncu": "build/cli.js",
+				"npm-check-updates": "build/cli.js"
+			},
+			"engines": {
+				"node": "^18.18.0 || >=20.0.0",
+				"npm": ">=8.12.1"
+			}
+		},
+		"node_modules/npm-run-path": {
+			"version": "4.0.1",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"path-key": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/object-inspect": {
+			"version": "1.13.4",
+			"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
+			"integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/obsidian": {
+			"version": "1.8.7",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@types/codemirror": "5.60.8",
+				"moment": "2.29.4"
+			},
+			"peerDependencies": {
+				"@codemirror/state": "^6.0.0",
+				"@codemirror/view": "^6.0.0"
+			}
+		},
+		"node_modules/once": {
+			"version": "1.4.0",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"wrappy": "1"
+			}
+		},
+		"node_modules/onetime": {
+			"version": "5.1.2",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"mimic-fn": "^2.1.0"
+			},
+			"engines": {
+				"node": ">=6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/openapi-fetch": {
+			"version": "0.13.4",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"openapi-typescript-helpers": "^0.0.15"
+			}
+		},
+		"node_modules/openapi-typescript": {
+			"version": "7.6.1",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@redocly/openapi-core": "^1.28.0",
+				"ansi-colors": "^4.1.3",
+				"change-case": "^5.4.4",
+				"parse-json": "^8.1.0",
+				"supports-color": "^9.4.0",
+				"yargs-parser": "^21.1.1"
+			},
+			"bin": {
+				"openapi-typescript": "bin/cli.js"
+			},
+			"peerDependencies": {
+				"typescript": "^5.x"
+			}
+		},
+		"node_modules/openapi-typescript-helpers": {
+			"version": "0.0.15",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/openapi-typescript/node_modules/parse-json": {
+			"version": "8.1.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/code-frame": "^7.22.13",
+				"index-to-position": "^0.1.2",
+				"type-fest": "^4.7.1"
+			},
+			"engines": {
+				"node": ">=18"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/openapi-typescript/node_modules/supports-color": {
+			"version": "9.4.0",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/supports-color?sponsor=1"
+			}
+		},
+		"node_modules/openapi-typescript/node_modules/type-fest": {
+			"version": "4.35.0",
+			"dev": true,
+			"license": "(MIT OR CC0-1.0)",
+			"engines": {
+				"node": ">=16"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/optionator": {
+			"version": "0.9.4",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"deep-is": "^0.1.3",
+				"fast-levenshtein": "^2.0.6",
+				"levn": "^0.4.1",
+				"prelude-ls": "^1.2.1",
+				"type-check": "^0.4.0",
+				"word-wrap": "^1.2.5"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/p-limit": {
+			"version": "3.1.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"yocto-queue": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/p-locate": {
+			"version": "5.0.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"p-limit": "^3.0.2"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/p-queue": {
+			"version": "8.1.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"eventemitter3": "^5.0.1",
+				"p-timeout": "^6.1.2"
+			},
+			"engines": {
+				"node": ">=18"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/p-timeout": {
+			"version": "6.1.4",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=14.16"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/p-try": {
+			"version": "2.2.0",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/parent-module": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+			"integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"callsites": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/parse-json": {
+			"version": "5.2.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/code-frame": "^7.0.0",
+				"error-ex": "^1.3.1",
+				"json-parse-even-better-errors": "^2.3.0",
+				"lines-and-columns": "^1.1.6"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/path-exists": {
+			"version": "4.0.0",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/path-is-absolute": {
+			"version": "1.0.1",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/path-key": {
+			"version": "3.1.1",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/path-parse": {
+			"version": "1.0.7",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/picocolors": {
+			"version": "1.1.1",
+			"dev": true,
+			"license": "ISC"
+		},
+		"node_modules/picomatch": {
+			"version": "2.3.1",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=8.6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/jonschlinkert"
+			}
+		},
+		"node_modules/pirates": {
+			"version": "4.0.6",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/pkg-dir": {
+			"version": "4.2.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"find-up": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/pkg-dir/node_modules/find-up": {
+			"version": "4.1.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"locate-path": "^5.0.0",
+				"path-exists": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/pkg-dir/node_modules/locate-path": {
+			"version": "5.0.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"p-locate": "^4.1.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/pkg-dir/node_modules/p-limit": {
+			"version": "2.3.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"p-try": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/pkg-dir/node_modules/p-locate": {
+			"version": "4.1.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"p-limit": "^2.2.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/pluralize": {
+			"version": "8.0.0",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/postcss": {
+			"version": "8.5.2",
+			"dev": true,
+			"funding": [
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/postcss/"
+				},
+				{
+					"type": "tidelift",
+					"url": "https://tidelift.com/funding/github/npm/postcss"
+				},
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/ai"
+				}
+			],
+			"license": "MIT",
+			"dependencies": {
+				"nanoid": "^3.3.8",
+				"picocolors": "^1.1.1",
+				"source-map-js": "^1.2.1"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14"
+			}
+		},
+		"node_modules/postcss-modules-extract-imports": {
+			"version": "3.1.0",
+			"dev": true,
+			"license": "ISC",
+			"engines": {
+				"node": "^10 || ^12 || >= 14"
+			},
+			"peerDependencies": {
+				"postcss": "^8.1.0"
+			}
+		},
+		"node_modules/postcss-modules-local-by-default": {
+			"version": "4.2.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"icss-utils": "^5.0.0",
+				"postcss-selector-parser": "^7.0.0",
+				"postcss-value-parser": "^4.1.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >= 14"
+			},
+			"peerDependencies": {
+				"postcss": "^8.1.0"
+			}
+		},
+		"node_modules/postcss-modules-scope": {
+			"version": "3.2.1",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"postcss-selector-parser": "^7.0.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >= 14"
+			},
+			"peerDependencies": {
+				"postcss": "^8.1.0"
+			}
+		},
+		"node_modules/postcss-modules-values": {
+			"version": "4.0.0",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"icss-utils": "^5.0.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >= 14"
+			},
+			"peerDependencies": {
+				"postcss": "^8.1.0"
+			}
+		},
+		"node_modules/postcss-selector-parser": {
+			"version": "7.1.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"cssesc": "^3.0.0",
+				"util-deprecate": "^1.0.2"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/postcss-value-parser": {
+			"version": "4.2.0",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/prelude-ls": {
+			"version": "1.2.1",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/prettier": {
+			"version": "3.5.2",
+			"resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.2.tgz",
+			"integrity": "sha512-lc6npv5PH7hVqozBR7lkBNOGXV9vMwROAPlumdBkX0wTbbzPu/U1hk5yL8p2pt4Xoc+2mkT8t/sow2YrV/M5qg==",
+			"dev": true,
+			"license": "MIT",
+			"bin": {
+				"prettier": "bin/prettier.cjs"
+			},
+			"engines": {
+				"node": ">=14"
+			},
+			"funding": {
+				"url": "https://github.com/prettier/prettier?sponsor=1"
+			}
+		},
+		"node_modules/pretty-format": {
+			"version": "29.7.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/schemas": "^29.6.3",
+				"ansi-styles": "^5.0.0",
+				"react-is": "^18.0.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/pretty-format/node_modules/ansi-styles": {
+			"version": "5.2.0",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/prompts": {
+			"version": "2.4.2",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"kleur": "^3.0.3",
+				"sisteransi": "^1.0.5"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/punycode": {
+			"version": "2.3.1",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/pure-rand": {
+			"version": "6.1.0",
+			"dev": true,
+			"funding": [
+				{
+					"type": "individual",
+					"url": "https://github.com/sponsors/dubzzz"
+				},
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/fast-check"
+				}
+			],
+			"license": "MIT"
+		},
+		"node_modules/qs": {
+			"version": "6.14.0",
+			"resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz",
+			"integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==",
+			"dev": true,
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"side-channel": "^1.1.0"
+			},
+			"engines": {
+				"node": ">=0.6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/queue-microtask": {
+			"version": "1.2.3",
+			"dev": true,
+			"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"
+		},
+		"node_modules/randombytes": {
+			"version": "2.1.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"safe-buffer": "^5.1.0"
+			}
+		},
+		"node_modules/react-is": {
+			"version": "18.3.1",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/readdirp": {
+			"version": "4.1.2",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 14.18.0"
+			},
+			"funding": {
+				"type": "individual",
+				"url": "https://paulmillr.com/funding/"
+			}
+		},
+		"node_modules/rechoir": {
+			"version": "0.8.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"resolve": "^1.20.0"
+			},
+			"engines": {
+				"node": ">= 10.13.0"
+			}
+		},
+		"node_modules/regex-parser": {
+			"version": "2.3.1",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/request-animation-frame-timeout": {
+			"version": "2.0.4",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/require-directory": {
+			"version": "2.1.1",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/require-from-string": {
+			"version": "2.0.2",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/resolve": {
+			"version": "1.22.10",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"is-core-module": "^2.16.0",
+				"path-parse": "^1.0.7",
+				"supports-preserve-symlinks-flag": "^1.0.0"
+			},
+			"bin": {
+				"resolve": "bin/resolve"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/resolve-cwd": {
+			"version": "3.0.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"resolve-from": "^5.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/resolve-cwd/node_modules/resolve-from": {
+			"version": "5.0.0",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/resolve-from": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+			"integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/resolve-url-loader": {
+			"version": "5.0.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"adjust-sourcemap-loader": "^4.0.0",
+				"convert-source-map": "^1.7.0",
+				"loader-utils": "^2.0.0",
+				"postcss": "^8.2.14",
+				"source-map": "0.6.1"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/resolve-url-loader/node_modules/convert-source-map": {
+			"version": "1.9.0",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/resolve.exports": {
+			"version": "2.0.3",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/reusify": {
+			"version": "1.0.4",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"iojs": ">=1.0.0",
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/run-parallel": {
+			"version": "1.2.0",
+			"dev": true,
+			"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": {
+				"queue-microtask": "^1.2.2"
+			}
+		},
+		"node_modules/rxjs": {
+			"version": "7.8.1",
+			"dev": true,
+			"license": "Apache-2.0",
+			"dependencies": {
+				"tslib": "^2.1.0"
+			}
+		},
+		"node_modules/safe-buffer": {
+			"version": "5.2.1",
+			"dev": true,
+			"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"
+		},
+		"node_modules/sass": {
+			"version": "1.85.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"chokidar": "^4.0.0",
+				"immutable": "^5.0.2",
+				"source-map-js": ">=0.6.2 <2.0.0"
+			},
+			"bin": {
+				"sass": "sass.js"
+			},
+			"engines": {
+				"node": ">=14.0.0"
+			},
+			"optionalDependencies": {
+				"@parcel/watcher": "^2.4.1"
+			}
+		},
+		"node_modules/sass-loader": {
+			"version": "16.0.5",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"neo-async": "^2.6.2"
+			},
+			"engines": {
+				"node": ">= 18.12.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependencies": {
+				"@rspack/core": "0.x || 1.x",
+				"node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0",
+				"sass": "^1.3.0",
+				"sass-embedded": "*",
+				"webpack": "^5.0.0"
+			},
+			"peerDependenciesMeta": {
+				"@rspack/core": {
+					"optional": true
+				},
+				"node-sass": {
+					"optional": true
+				},
+				"sass": {
+					"optional": true
+				},
+				"sass-embedded": {
+					"optional": true
+				},
+				"webpack": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/schema-utils": {
+			"version": "3.3.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@types/json-schema": "^7.0.8",
+				"ajv": "^6.12.5",
+				"ajv-keywords": "^3.5.2"
+			},
+			"engines": {
+				"node": ">= 10.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			}
+		},
+		"node_modules/semver": {
+			"version": "7.7.1",
+			"dev": true,
+			"license": "ISC",
+			"bin": {
+				"semver": "bin/semver.js"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/serialize-javascript": {
+			"version": "6.0.2",
+			"dev": true,
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"randombytes": "^2.1.0"
+			}
+		},
+		"node_modules/shallow-clone": {
+			"version": "3.0.1",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"kind-of": "^6.0.2"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/shebang-command": {
+			"version": "2.0.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"shebang-regex": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/shebang-regex": {
+			"version": "3.0.0",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/shell-quote": {
+			"version": "1.8.2",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/side-channel": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
+			"integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"es-errors": "^1.3.0",
+				"object-inspect": "^1.13.3",
+				"side-channel-list": "^1.0.0",
+				"side-channel-map": "^1.0.1",
+				"side-channel-weakmap": "^1.0.2"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/side-channel-list": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz",
+			"integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"es-errors": "^1.3.0",
+				"object-inspect": "^1.13.3"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/side-channel-map": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz",
+			"integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"call-bound": "^1.0.2",
+				"es-errors": "^1.3.0",
+				"get-intrinsic": "^1.2.5",
+				"object-inspect": "^1.13.3"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/side-channel-weakmap": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz",
+			"integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"call-bound": "^1.0.2",
+				"es-errors": "^1.3.0",
+				"get-intrinsic": "^1.2.5",
+				"object-inspect": "^1.13.3",
+				"side-channel-map": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/signal-exit": {
+			"version": "3.0.7",
+			"dev": true,
+			"license": "ISC"
+		},
+		"node_modules/sisteransi": {
+			"version": "1.0.5",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/slash": {
+			"version": "3.0.0",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/source-map": {
+			"version": "0.6.1",
+			"dev": true,
+			"license": "BSD-3-Clause",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/source-map-js": {
+			"version": "1.2.1",
+			"dev": true,
+			"license": "BSD-3-Clause",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/source-map-support": {
+			"version": "0.5.13",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"buffer-from": "^1.0.0",
+				"source-map": "^0.6.0"
+			}
+		},
+		"node_modules/sprintf-js": {
+			"version": "1.0.3",
+			"dev": true,
+			"license": "BSD-3-Clause"
+		},
+		"node_modules/stack-utils": {
+			"version": "2.0.6",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"escape-string-regexp": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/stack-utils/node_modules/escape-string-regexp": {
+			"version": "2.0.0",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/string-length": {
+			"version": "4.0.2",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"char-regex": "^1.0.2",
+				"strip-ansi": "^6.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/string-width": {
+			"version": "4.2.3",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"emoji-regex": "^8.0.0",
+				"is-fullwidth-code-point": "^3.0.0",
+				"strip-ansi": "^6.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/strip-ansi": {
+			"version": "6.0.1",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-regex": "^5.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/strip-bom": {
+			"version": "4.0.0",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/strip-final-newline": {
+			"version": "2.0.0",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/strip-json-comments": {
+			"version": "3.1.1",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/style-mod": {
+			"version": "4.1.2",
+			"dev": true,
+			"license": "MIT",
+			"peer": true
+		},
+		"node_modules/supports-color": {
+			"version": "7.2.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/supports-preserve-symlinks-flag": {
+			"version": "1.0.0",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/sync_lib": {
+			"resolved": "../backend/sync_lib/pkg",
+			"link": true
+		},
+		"node_modules/sync-client": {
+			"resolved": "sync-client",
+			"link": true
+		},
+		"node_modules/tapable": {
+			"version": "2.2.1",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/terser": {
+			"version": "5.39.0",
+			"dev": true,
+			"license": "BSD-2-Clause",
+			"dependencies": {
+				"@jridgewell/source-map": "^0.3.3",
+				"acorn": "^8.8.2",
+				"commander": "^2.20.0",
+				"source-map-support": "~0.5.20"
+			},
+			"bin": {
+				"terser": "bin/terser"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/terser-webpack-plugin": {
+			"version": "5.3.11",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jridgewell/trace-mapping": "^0.3.25",
+				"jest-worker": "^27.4.5",
+				"schema-utils": "^4.3.0",
+				"serialize-javascript": "^6.0.2",
+				"terser": "^5.31.1"
+			},
+			"engines": {
+				"node": ">= 10.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependencies": {
+				"webpack": "^5.1.0"
+			},
+			"peerDependenciesMeta": {
+				"@swc/core": {
+					"optional": true
+				},
+				"esbuild": {
+					"optional": true
+				},
+				"uglify-js": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/terser-webpack-plugin/node_modules/ajv": {
+			"version": "8.17.1",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"fast-deep-equal": "^3.1.3",
+				"fast-uri": "^3.0.1",
+				"json-schema-traverse": "^1.0.0",
+				"require-from-string": "^2.0.2"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/epoberezkin"
+			}
+		},
+		"node_modules/terser-webpack-plugin/node_modules/ajv-keywords": {
+			"version": "5.1.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"fast-deep-equal": "^3.1.3"
+			},
+			"peerDependencies": {
+				"ajv": "^8.8.2"
+			}
+		},
+		"node_modules/terser-webpack-plugin/node_modules/jest-worker": {
+			"version": "27.5.1",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@types/node": "*",
+				"merge-stream": "^2.0.0",
+				"supports-color": "^8.0.0"
+			},
+			"engines": {
+				"node": ">= 10.13.0"
+			}
+		},
+		"node_modules/terser-webpack-plugin/node_modules/json-schema-traverse": {
+			"version": "1.0.0",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/terser-webpack-plugin/node_modules/schema-utils": {
+			"version": "4.3.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@types/json-schema": "^7.0.9",
+				"ajv": "^8.9.0",
+				"ajv-formats": "^2.1.1",
+				"ajv-keywords": "^5.1.0"
+			},
+			"engines": {
+				"node": ">= 10.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			}
+		},
+		"node_modules/terser-webpack-plugin/node_modules/supports-color": {
+			"version": "8.1.1",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/supports-color?sponsor=1"
+			}
+		},
+		"node_modules/terser/node_modules/source-map-support": {
+			"version": "0.5.21",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"buffer-from": "^1.0.0",
+				"source-map": "^0.6.0"
+			}
+		},
+		"node_modules/test-client": {
+			"resolved": "test-client",
+			"link": true
+		},
+		"node_modules/test-exclude": {
+			"version": "6.0.0",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"@istanbuljs/schema": "^0.1.2",
+				"glob": "^7.1.4",
+				"minimatch": "^3.0.4"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/tmpl": {
+			"version": "1.0.5",
+			"dev": true,
+			"license": "BSD-3-Clause"
+		},
+		"node_modules/to-regex-range": {
+			"version": "5.0.1",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"is-number": "^7.0.0"
+			},
+			"engines": {
+				"node": ">=8.0"
+			}
+		},
+		"node_modules/tree-kill": {
+			"version": "1.2.2",
+			"dev": true,
+			"license": "MIT",
+			"bin": {
+				"tree-kill": "cli.js"
+			}
+		},
+		"node_modules/ts-api-utils": {
+			"version": "2.0.1",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=18.12"
+			},
+			"peerDependencies": {
+				"typescript": ">=4.8.4"
+			}
+		},
+		"node_modules/ts-jest": {
+			"version": "29.2.6",
+			"resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.2.6.tgz",
+			"integrity": "sha512-yTNZVZqc8lSixm+QGVFcPe6+yj7+TWZwIesuOWvfcn4B9bz5x4NDzVCQQjOs7Hfouu36aEqfEbo9Qpo+gq8dDg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"bs-logger": "^0.2.6",
+				"ejs": "^3.1.10",
+				"fast-json-stable-stringify": "^2.1.0",
+				"jest-util": "^29.0.0",
+				"json5": "^2.2.3",
+				"lodash.memoize": "^4.1.2",
+				"make-error": "^1.3.6",
+				"semver": "^7.7.1",
+				"yargs-parser": "^21.1.1"
+			},
+			"bin": {
+				"ts-jest": "cli.js"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || ^18.0.0 || >=20.0.0"
+			},
+			"peerDependencies": {
+				"@babel/core": ">=7.0.0-beta.0 <8",
+				"@jest/transform": "^29.0.0",
+				"@jest/types": "^29.0.0",
+				"babel-jest": "^29.0.0",
+				"jest": "^29.0.0",
+				"typescript": ">=4.3 <6"
+			},
+			"peerDependenciesMeta": {
+				"@babel/core": {
+					"optional": true
+				},
+				"@jest/transform": {
+					"optional": true
+				},
+				"@jest/types": {
+					"optional": true
+				},
+				"babel-jest": {
+					"optional": true
+				},
+				"esbuild": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/ts-loader": {
+			"version": "9.5.2",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"chalk": "^4.1.0",
+				"enhanced-resolve": "^5.0.0",
+				"micromatch": "^4.0.0",
+				"semver": "^7.3.4",
+				"source-map": "^0.7.4"
+			},
+			"engines": {
+				"node": ">=12.0.0"
+			},
+			"peerDependencies": {
+				"typescript": "*",
+				"webpack": "^5.0.0"
+			}
+		},
+		"node_modules/ts-loader/node_modules/source-map": {
+			"version": "0.7.4",
+			"dev": true,
+			"license": "BSD-3-Clause",
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/ts-node": {
+			"version": "10.9.2",
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"peer": true,
+			"dependencies": {
+				"@cspotcode/source-map-support": "^0.8.0",
+				"@tsconfig/node10": "^1.0.7",
+				"@tsconfig/node12": "^1.0.7",
+				"@tsconfig/node14": "^1.0.0",
+				"@tsconfig/node16": "^1.0.2",
+				"acorn": "^8.4.1",
+				"acorn-walk": "^8.1.1",
+				"arg": "^4.1.0",
+				"create-require": "^1.1.0",
+				"diff": "^4.0.1",
+				"make-error": "^1.1.1",
+				"v8-compile-cache-lib": "^3.0.1",
+				"yn": "3.1.1"
+			},
+			"bin": {
+				"ts-node": "dist/bin.js",
+				"ts-node-cwd": "dist/bin-cwd.js",
+				"ts-node-esm": "dist/bin-esm.js",
+				"ts-node-script": "dist/bin-script.js",
+				"ts-node-transpile-only": "dist/bin-transpile.js",
+				"ts-script": "dist/bin-script-deprecated.js"
+			},
+			"peerDependencies": {
+				"@swc/core": ">=1.2.50",
+				"@swc/wasm": ">=1.2.50",
+				"@types/node": "*",
+				"typescript": ">=2.7"
+			},
+			"peerDependenciesMeta": {
+				"@swc/core": {
+					"optional": true
+				},
+				"@swc/wasm": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/tslib": {
+			"version": "2.8.1",
+			"dev": true,
+			"license": "0BSD"
+		},
+		"node_modules/type-check": {
+			"version": "0.4.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"prelude-ls": "^1.2.1"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/type-detect": {
+			"version": "4.0.8",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/type-fest": {
+			"version": "0.21.3",
+			"dev": true,
+			"license": "(MIT OR CC0-1.0)",
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/typescript": {
+			"version": "5.7.3",
+			"dev": true,
+			"license": "Apache-2.0",
+			"bin": {
+				"tsc": "bin/tsc",
+				"tsserver": "bin/tsserver"
+			},
+			"engines": {
+				"node": ">=14.17"
+			}
+		},
+		"node_modules/typescript-eslint": {
+			"version": "8.24.1",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@typescript-eslint/eslint-plugin": "8.24.1",
+				"@typescript-eslint/parser": "8.24.1",
+				"@typescript-eslint/utils": "8.24.1"
+			},
+			"engines": {
+				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			},
+			"peerDependencies": {
+				"eslint": "^8.57.0 || ^9.0.0",
+				"typescript": ">=4.8.4 <5.8.0"
+			}
+		},
+		"node_modules/undici-types": {
+			"version": "6.20.0",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/universalify": {
+			"version": "2.0.1",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 10.0.0"
+			}
+		},
+		"node_modules/update-browserslist-db": {
+			"version": "1.1.2",
+			"dev": true,
+			"funding": [
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/browserslist"
+				},
+				{
+					"type": "tidelift",
+					"url": "https://tidelift.com/funding/github/npm/browserslist"
+				},
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/ai"
+				}
+			],
+			"license": "MIT",
+			"dependencies": {
+				"escalade": "^3.2.0",
+				"picocolors": "^1.1.1"
+			},
+			"bin": {
+				"update-browserslist-db": "cli.js"
+			},
+			"peerDependencies": {
+				"browserslist": ">= 4.21.0"
+			}
+		},
+		"node_modules/uri-js": {
+			"version": "4.4.1",
+			"dev": true,
+			"license": "BSD-2-Clause",
+			"dependencies": {
+				"punycode": "^2.1.0"
+			}
+		},
+		"node_modules/uri-js-replace": {
+			"version": "1.0.1",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/url": {
+			"version": "0.11.4",
+			"resolved": "https://registry.npmjs.org/url/-/url-0.11.4.tgz",
+			"integrity": "sha512-oCwdVC7mTuWiPyjLUz/COz5TLk6wgp0RCsN+wHZ2Ekneac9w8uuV0njcbbie2ME+Vs+d6duwmYuR3HgQXs1fOg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"punycode": "^1.4.1",
+				"qs": "^6.12.3"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/url/node_modules/punycode": {
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+			"integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/util-deprecate": {
+			"version": "1.0.2",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/uuid": {
+			"version": "11.1.0",
+			"dev": true,
+			"funding": [
+				"https://github.com/sponsors/broofa",
+				"https://github.com/sponsors/ctavan"
+			],
+			"license": "MIT",
+			"bin": {
+				"uuid": "dist/esm/bin/uuid"
+			}
+		},
+		"node_modules/v8-compile-cache-lib": {
+			"version": "3.0.1",
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"peer": true
+		},
+		"node_modules/v8-to-istanbul": {
+			"version": "9.3.0",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"@jridgewell/trace-mapping": "^0.3.12",
+				"@types/istanbul-lib-coverage": "^2.0.1",
+				"convert-source-map": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=10.12.0"
+			}
+		},
+		"node_modules/vault-link-obsidian-plugin": {
+			"resolved": "obsidian-plugin",
+			"link": true
+		},
+		"node_modules/virtual-scroller": {
+			"version": "1.13.1",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"request-animation-frame-timeout": "^2.0.3"
+			}
+		},
+		"node_modules/w3c-keyname": {
+			"version": "2.2.8",
+			"dev": true,
+			"license": "MIT",
+			"peer": true
+		},
+		"node_modules/walker": {
+			"version": "1.0.8",
+			"dev": true,
+			"license": "Apache-2.0",
+			"dependencies": {
+				"makeerror": "1.0.12"
+			}
+		},
+		"node_modules/watchpack": {
+			"version": "2.4.2",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"glob-to-regexp": "^0.4.1",
+				"graceful-fs": "^4.1.2"
+			},
+			"engines": {
+				"node": ">=10.13.0"
+			}
+		},
+		"node_modules/webpack": {
+			"version": "5.98.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@types/eslint-scope": "^3.7.7",
+				"@types/estree": "^1.0.6",
+				"@webassemblyjs/ast": "^1.14.1",
+				"@webassemblyjs/wasm-edit": "^1.14.1",
+				"@webassemblyjs/wasm-parser": "^1.14.1",
+				"acorn": "^8.14.0",
+				"browserslist": "^4.24.0",
+				"chrome-trace-event": "^1.0.2",
+				"enhanced-resolve": "^5.17.1",
+				"es-module-lexer": "^1.2.1",
+				"eslint-scope": "5.1.1",
+				"events": "^3.2.0",
+				"glob-to-regexp": "^0.4.1",
+				"graceful-fs": "^4.2.11",
+				"json-parse-even-better-errors": "^2.3.1",
+				"loader-runner": "^4.2.0",
+				"mime-types": "^2.1.27",
+				"neo-async": "^2.6.2",
+				"schema-utils": "^4.3.0",
+				"tapable": "^2.1.1",
+				"terser-webpack-plugin": "^5.3.11",
+				"watchpack": "^2.4.1",
+				"webpack-sources": "^3.2.3"
+			},
+			"bin": {
+				"webpack": "bin/webpack.js"
+			},
+			"engines": {
+				"node": ">=10.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependenciesMeta": {
+				"webpack-cli": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/webpack-cli": {
+			"version": "6.0.1",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@discoveryjs/json-ext": "^0.6.1",
+				"@webpack-cli/configtest": "^3.0.1",
+				"@webpack-cli/info": "^3.0.1",
+				"@webpack-cli/serve": "^3.0.1",
+				"colorette": "^2.0.14",
+				"commander": "^12.1.0",
+				"cross-spawn": "^7.0.3",
+				"envinfo": "^7.14.0",
+				"fastest-levenshtein": "^1.0.12",
+				"import-local": "^3.0.2",
+				"interpret": "^3.1.1",
+				"rechoir": "^0.8.0",
+				"webpack-merge": "^6.0.1"
+			},
+			"bin": {
+				"webpack-cli": "bin/cli.js"
+			},
+			"engines": {
+				"node": ">=18.12.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependencies": {
+				"webpack": "^5.82.0"
+			},
+			"peerDependenciesMeta": {
+				"webpack-bundle-analyzer": {
+					"optional": true
+				},
+				"webpack-dev-server": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/webpack-cli/node_modules/colorette": {
+			"version": "2.0.20",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/webpack-cli/node_modules/commander": {
+			"version": "12.1.0",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/webpack-merge": {
+			"version": "6.0.1",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"clone-deep": "^4.0.1",
+				"flat": "^5.0.2",
+				"wildcard": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=18.0.0"
+			}
+		},
+		"node_modules/webpack-sources": {
+			"version": "3.2.3",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=10.13.0"
+			}
+		},
+		"node_modules/webpack/node_modules/ajv": {
+			"version": "8.17.1",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"fast-deep-equal": "^3.1.3",
+				"fast-uri": "^3.0.1",
+				"json-schema-traverse": "^1.0.0",
+				"require-from-string": "^2.0.2"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/epoberezkin"
+			}
+		},
+		"node_modules/webpack/node_modules/ajv-keywords": {
+			"version": "5.1.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"fast-deep-equal": "^3.1.3"
+			},
+			"peerDependencies": {
+				"ajv": "^8.8.2"
+			}
+		},
+		"node_modules/webpack/node_modules/eslint-scope": {
+			"version": "5.1.1",
+			"dev": true,
+			"license": "BSD-2-Clause",
+			"dependencies": {
+				"esrecurse": "^4.3.0",
+				"estraverse": "^4.1.1"
+			},
+			"engines": {
+				"node": ">=8.0.0"
+			}
+		},
+		"node_modules/webpack/node_modules/estraverse": {
+			"version": "4.3.0",
+			"dev": true,
+			"license": "BSD-2-Clause",
+			"engines": {
+				"node": ">=4.0"
+			}
+		},
+		"node_modules/webpack/node_modules/json-schema-traverse": {
+			"version": "1.0.0",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/webpack/node_modules/schema-utils": {
+			"version": "4.3.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@types/json-schema": "^7.0.9",
+				"ajv": "^8.9.0",
+				"ajv-formats": "^2.1.1",
+				"ajv-keywords": "^5.1.0"
+			},
+			"engines": {
+				"node": ">= 10.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			}
+		},
+		"node_modules/which": {
+			"version": "2.0.2",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"isexe": "^2.0.0"
+			},
+			"bin": {
+				"node-which": "bin/node-which"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/wildcard": {
+			"version": "2.0.1",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/word-wrap": {
+			"version": "1.2.5",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/wrap-ansi": {
+			"version": "7.0.0",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-styles": "^4.0.0",
+				"string-width": "^4.1.0",
+				"strip-ansi": "^6.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+			}
+		},
+		"node_modules/wrappy": {
+			"version": "1.0.2",
+			"dev": true,
+			"license": "ISC"
+		},
+		"node_modules/write-file-atomic": {
+			"version": "4.0.2",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"imurmurhash": "^0.1.4",
+				"signal-exit": "^3.0.7"
+			},
+			"engines": {
+				"node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+			}
+		},
+		"node_modules/y18n": {
+			"version": "5.0.8",
+			"dev": true,
+			"license": "ISC",
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/yallist": {
+			"version": "3.1.1",
+			"dev": true,
+			"license": "ISC"
+		},
+		"node_modules/yaml-ast-parser": {
+			"version": "0.0.43",
+			"dev": true,
+			"license": "Apache-2.0"
+		},
+		"node_modules/yargs": {
+			"version": "17.7.2",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"cliui": "^8.0.1",
+				"escalade": "^3.1.1",
+				"get-caller-file": "^2.0.5",
+				"require-directory": "^2.1.1",
+				"string-width": "^4.2.3",
+				"y18n": "^5.0.5",
+				"yargs-parser": "^21.1.1"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/yargs-parser": {
+			"version": "21.1.1",
+			"dev": true,
+			"license": "ISC",
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/yn": {
+			"version": "3.1.1",
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"peer": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/yocto-queue": {
+			"version": "0.1.0",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"obsidian-plugin": {
+			"name": "vault-link-obsidian-plugin",
+			"version": "0.0.30",
+			"license": "MIT",
+			"devDependencies": {
+				"@types/jest": "^29.5.14",
+				"@types/node": "^22.13.5",
+				"css-loader": "^7.1.2",
+				"date-fns": "^4.1.0",
+				"file-loader": "^6.2.0",
+				"fs-extra": "^11.3.0",
+				"jest": "^29.7.0",
+				"mini-css-extract-plugin": "^2.9.2",
+				"obsidian": "1.8.7",
+				"resolve-url-loader": "^5.0.0",
+				"sass": "^1.85.0",
+				"sass-loader": "^16.0.5",
+				"sync-client": "file:../sync-client",
+				"terser-webpack-plugin": "^5.3.11",
+				"ts-jest": "^29.2.6",
+				"ts-loader": "^9.5.2",
+				"tslib": "2.8.1",
+				"typescript": "5.7.3",
+				"url": "^0.11.4",
+				"virtual-scroller": "^1.13.1",
+				"webpack": "^5.98.0",
+				"webpack-cli": "^6.0.1"
+			}
+		},
+		"sync-client": {
+			"version": "0.0.0",
+			"devDependencies": {
+				"@types/jest": "^29.5.14",
+				"@types/node": "^22.13.5",
+				"byte-base64": "^1.1.0",
+				"fetch-retry": "^6.0.0",
+				"jest": "^29.7.0",
+				"openapi-fetch": "0.13.4",
+				"openapi-typescript": "7.6.1",
+				"p-queue": "^8.1.0",
+				"sync_lib": "file:../../backend/sync_lib/pkg",
+				"ts-jest": "^29.2.6",
+				"ts-loader": "^9.5.2",
+				"tslib": "2.8.1",
+				"typescript": "5.7.3",
+				"webpack": "^5.98.0",
+				"webpack-cli": "^6.0.1"
+			}
+		},
+		"test-client": {
+			"version": "0.0.0",
+			"dependencies": {
+				"sync-client": "file:../sync-client"
+			},
+			"bin": {
+				"test-client": "dist/cli.js"
+			},
+			"devDependencies": {
+				"chalk": "^5.4.1",
+				"ts-loader": "^9.5.2",
+				"tslib": "2.8.1",
+				"typescript": "5.7.3",
+				"uuid": "^11.1.0",
+				"webpack": "^5.98.0",
+				"webpack-cli": "^6.0.1"
+			}
+		},
+		"test-client/node_modules/chalk": {
+			"version": "5.4.1",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": "^12.17.0 || ^14.13 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
+			}
+		}
+	}
 }
diff --git a/frontend/package.json b/frontend/package.json
index e0de3e5e..dd9baea0 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -21,10 +21,10 @@
 	},
 	"devDependencies": {
 		"concurrently": "^9.1.2",
-		"eslint": "9.20.1",
+		"eslint": "9.21.0",
 		"eslint-plugin-unused-imports": "^4.1.4",
 		"npm-check-updates": "^17.1.14",
-		"prettier": "^3.5.1",
+		"prettier": "^3.5.2",
 		"typescript-eslint": "8.24.1"
 	}
 }
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index 0f658627..94340f33 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -14,9 +14,9 @@
 		"typescript": "5.7.3",
 		"sync_lib": "file:../../backend/sync_lib/pkg",
 		"@types/jest": "^29.5.14",
-		"@types/node": "^22.13.4",
+		"@types/node": "^22.13.5",
 		"jest": "^29.7.0",
-		"ts-jest": "^29.2.5",
+		"ts-jest": "^29.2.6",
 		"p-queue": "^8.1.0",
 		"fetch-retry": "^6.0.0",
 		"byte-base64": "^1.1.0",
@@ -26,4 +26,4 @@
 		"webpack": "^5.98.0",
 		"webpack-cli": "^6.0.1"
 	}
-}
\ No newline at end of file
+}
diff --git a/frontend/sync-client/webpack.config.js b/frontend/sync-client/webpack.config.js
index 144cb7ae..cd2c051d 100644
--- a/frontend/sync-client/webpack.config.js
+++ b/frontend/sync-client/webpack.config.js
@@ -3,6 +3,7 @@ const path = require("path");
 module.exports = (_env, _argv) => ({
 	entry: "./src/index.ts",
 	devtool: "source-map",
+	target: "node",
 	module: {
 		rules: [
 			{
@@ -43,7 +44,6 @@ module.exports = (_env, _argv) => ({
 			name: "SyncClient",
 			type: "umd"
 		},
-		globalObject: "this",
 		path: path.resolve(__dirname, "dist")
 	}
 });

From c69f84edf503351305cffb03002c1b95a6be51b9 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 23 Feb 2025 16:45:52 +0000
Subject: [PATCH 253/761] Fix agent behaviour

---
 .../file-operations/safe-filesystem-operations.ts |  2 +-
 frontend/sync-client/src/services/sync-service.ts |  1 -
 .../sync-client/src/sync-operations/syncer.ts     |  1 +
 frontend/test-client/src/agent/mock-agent.ts      | 15 ++++++++++++++-
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts b/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
index 94ee8ad4..e493d12f 100644
--- a/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
+++ b/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
@@ -1,5 +1,5 @@
-import type { FileSystemOperations } from "dist/types";
 import type { RelativePath } from "src/persistence/database";
+import type { FileSystemOperations } from "./filesystem-operations";
 
 export class FileNotFoundError extends Error {
 	public constructor(message: string) {
diff --git a/frontend/sync-client/src/services/sync-service.ts b/frontend/sync-client/src/services/sync-service.ts
index 392a4d21..e60fcaf2 100644
--- a/frontend/sync-client/src/services/sync-service.ts
+++ b/frontend/sync-client/src/services/sync-service.ts
@@ -8,7 +8,6 @@ import type {
 } from "../persistence/database";
 import type { Logger } from "src/tracing/logger";
 import { retriedFetchFactory } from "src/utils/retried-fetch";
-import type { SyncSettings } from "dist/types";
 import type { Settings } from "src/persistence/settings";
 
 export interface CheckConnectionResult {
diff --git a/frontend/sync-client/src/sync-operations/syncer.ts b/frontend/sync-client/src/sync-operations/syncer.ts
index 2ca399a6..5b1f78ea 100644
--- a/frontend/sync-client/src/sync-operations/syncer.ts
+++ b/frontend/sync-client/src/sync-operations/syncer.ts
@@ -206,6 +206,7 @@ export class Syncer {
 						await this.operations.read(relativePath);
 					const contentHash = hash(contentBytes);
 
+					// todo: make this smarter so that offline files can be renamed & edited at the same time
 					const originalFile = findMatchingFileBasedOnHash(
 						contentHash,
 						locallyPossiblyDeletedFiles
diff --git a/frontend/test-client/src/agent/mock-agent.ts b/frontend/test-client/src/agent/mock-agent.ts
index dc0fb6f4..a933b98f 100644
--- a/frontend/test-client/src/agent/mock-agent.ts
+++ b/frontend/test-client/src/agent/mock-agent.ts
@@ -224,6 +224,16 @@ export class MockAgent extends MockClient {
 
 	private async renameFileAction(files: RelativePath[]): Promise<void> {
 		const file = choose(files);
+
+		// We can't edit files offline that have been renamed while offline.
+		// Otherwise, the resolution logic couldn't handle it.
+		if (this.doNotTouch.includes(file)) {
+			this.client.logger.info(
+				`Skipping file ${file} because it has been updated while offline`
+			);
+			return;
+		}
+
 		const newName = this.getFileName();
 
 		if (await this.exists(newName)) {
@@ -242,7 +252,7 @@ export class MockAgent extends MockClient {
 		const file = choose(files);
 
 		// We can't edit files offline that have been renamed while offline.
-		// Othwersie, the resolution logic couldn't handle it.
+		// Otherwise, the resolution logic couldn't handle it.
 		if (this.doNotTouch.includes(file)) {
 			this.client.logger.info(
 				`Skipping file ${file} because it has been renamed while offline`
@@ -254,6 +264,9 @@ export class MockAgent extends MockClient {
 		this.client.logger.info(
 			`Decided to update file ${file} with ${content}`
 		);
+		if (!this.client.settings.getSettings().isSyncEnabled) {
+			this.doNotTouch.push(file);
+		}
 		await this.atomicUpdateText(file, (old) => old + `   |${content}|   `);
 	}
 

From 41c7ebcd87f898e52b9e9ce40a9c7fb9ea3c952b Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 23 Feb 2025 17:23:04 +0000
Subject: [PATCH 254/761] Clean up deps

---
 .github/workflows/check.yml                | 2 +-
 frontend/obsidian-plugin/webpack.config.js | 4 ----
 frontend/package-lock.json                 | 4 +---
 frontend/package.json                      | 2 +-
 frontend/sync-client/src/sync-client.ts    | 2 +-
 frontend/test-client/package.json          | 4 +---
 6 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 13ea8f48..35e18428 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -44,7 +44,7 @@ jobs:
           cd backend
           cargo test --verbose
           cd sync_lib
-          # wasm-pack test --node # todo: fix this is CI
+          # wasm-pack test --node # todo: fix this in CI
 
       - name: Lint frontend
         run: |
diff --git a/frontend/obsidian-plugin/webpack.config.js b/frontend/obsidian-plugin/webpack.config.js
index 72059dcc..66c35d63 100644
--- a/frontend/obsidian-plugin/webpack.config.js
+++ b/frontend/obsidian-plugin/webpack.config.js
@@ -83,10 +83,6 @@ module.exports = (env, argv) => ({
 			{
 				test: /\.ts$/,
 				use: ["ts-loader"]
-			},
-			{
-				test: /\.wasm$/,
-				type: "asset/inline"
 			}
 		]
 	},
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 400ad400..67805aaf 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -6743,14 +6743,12 @@
 		},
 		"test-client": {
 			"version": "0.0.0",
-			"dependencies": {
-				"sync-client": "file:../sync-client"
-			},
 			"bin": {
 				"test-client": "dist/cli.js"
 			},
 			"devDependencies": {
 				"chalk": "^5.4.1",
+				"sync-client": "file:../sync-client",
 				"ts-loader": "^9.5.2",
 				"tslib": "2.8.1",
 				"typescript": "5.7.3",
diff --git a/frontend/package.json b/frontend/package.json
index dd9baea0..301e28f7 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -16,7 +16,7 @@
 		"build": "npm run build --workspaces",
 		"dev": "concurrently --kill-others \"npm run dev -w sync-client\" \"npm run dev -w obsidian-plugin\"",
 		"test": "npm run test --workspaces",
-		"lint": "eslint --fix sync-client obsidian-plugin test-client; prettier --write \"**/*.(ts|scss|json|html)\"",
+		"lint": "eslint --fix sync-client obsidian-plugin test-client && prettier --write \"**/*.(ts|scss|json|html)\"",
 		"update": "ncu -u -ws"
 	},
 	"devDependencies": {
diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts
index 7361c73c..03259620 100644
--- a/frontend/sync-client/src/sync-client.ts
+++ b/frontend/sync-client/src/sync-client.ts
@@ -1,5 +1,5 @@
 import init from "sync_lib";
-import wasmBin from "sync_lib/sync_lib_bg.wasm";
+import wasmBin from "../../../backend/sync_lib/pkg/sync_lib_bg.wasm";
 import type { PersistenceProvider } from "./persistence/persistence";
 import { SyncHistory } from "./tracing/sync-history";
 import { Logger } from "./tracing/logger";
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index 071e38fd..56f2732f 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -10,10 +10,8 @@
 		"build": "webpack --mode production",
 		"test": "jest --passWithNoTests"
 	},
-	"dependencies": {
-		"sync-client": "file:../sync-client"
-	},
 	"devDependencies": {
+		"sync-client": "file:../sync-client",
 		"uuid": "^11.1.0",
 		"chalk": "^5.4.1",
 		"ts-loader": "^9.5.2",

From b194bc94d279c71c5d6f2f98a2d9fbc7e5f88220 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 23 Feb 2025 17:23:19 +0000
Subject: [PATCH 255/761] Format

---
 frontend/manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/manifest.json b/frontend/manifest.json
index f29b3103..7b7ca8c8 100644
--- a/frontend/manifest.json
+++ b/frontend/manifest.json
@@ -7,4 +7,4 @@
 	"author": "Andras Schmelczer",
 	"authorUrl": "https://schmelczer.dev",
 	"isDesktopOnly": false
-}
\ No newline at end of file
+}

From 0111afd2960c869be6a09bc05b100c1483c22585 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 23 Feb 2025 21:34:19 +0000
Subject: [PATCH 256/761] Extract & add test

---
 .../sync_server/src/server/update_document.rs | 80 ++++--------------
 backend/sync_server/src/utils.rs              | 84 +++++++++++++++++++
 2 files changed, 101 insertions(+), 63 deletions(-)

diff --git a/backend/sync_server/src/server/update_document.rs b/backend/sync_server/src/server/update_document.rs
index 809a7ce4..414180bf 100644
--- a/backend/sync_server/src/server/update_document.rs
+++ b/backend/sync_server/src/server/update_document.rs
@@ -8,7 +8,6 @@ use axum_extra::{
 use axum_jsonschema::Json;
 use chrono::{DateTime, Utc};
 use log::info;
-use regex::Regex;
 use schemars::JsonSchema;
 use serde::Deserialize;
 use sync_lib::{base64_to_bytes, is_file_type_mergable, merge};
@@ -20,12 +19,9 @@ use super::{
     responses::DocumentUpdateResponse,
 };
 use crate::{
-    database::{
-        self, Transaction,
-        models::{DocumentId, StoredDocumentVersion, VaultId, VaultUpdateId},
-    },
+    database::models::{DocumentId, StoredDocumentVersion, VaultId, VaultUpdateId},
     errors::{SyncServerError, client_error, not_found_error, server_error},
-    utils::sanitize_path,
+    utils::{deduped_file_paths, sanitize_path},
 };
 
 // This is required for aide to infer the path parameter types and names
@@ -172,13 +168,21 @@ async fn internal_update_document(
     let new_relative_path = if parent_document.relative_path == latest_version.relative_path
         && latest_version.relative_path != sanitized_relative_path
     {
-        get_deduped_file_name(
-            &state.database,
-            &vault_id,
-            &mut transaction,
-            &sanitized_relative_path,
-        )
-        .await?
+        let mut new_relative_path = Default::default();
+        for candidate in deduped_file_paths(&sanitized_relative_path) {
+            if state
+                .database
+                .get_latest_document_by_path(&vault_id, &candidate, Some(&mut transaction))
+                .await
+                .map_err(server_error)?
+                .is_none()
+            {
+                new_relative_path = candidate;
+                break;
+            }
+        }
+
+        new_relative_path
     } else {
         latest_version.relative_path.clone()
     };
@@ -212,53 +216,3 @@ async fn internal_update_document(
         DocumentUpdateResponse::FastForwardUpdate(new_version.into())
     }))
 }
-
-// Only a single file can be on the same path, so we need to dedup the path
-// in case the client is trying to rename the file to an existing file's name
-// that it's unaware of.
-async fn get_deduped_file_name(
-    database: &database::Database,
-    vault_id: &VaultId,
-    transaction: &mut Transaction<'_>,
-    path: &str,
-) -> Result<String, SyncServerError> {
-    let parts = path.rsplitn(2, '.').collect::<Vec<_>>();
-    let mut reverse_parts = parts.into_iter().rev();
-    let (stem, extension) = match (reverse_parts.next(), reverse_parts.next()) {
-        (Some(stem), maybe_extension) => (
-            stem,
-            maybe_extension
-                .map(|ext| format!(".{ext}"))
-                .unwrap_or_default(),
-        ),
-        _ => unreachable!("Path must have at least one part"),
-    };
-
-    let regex = Regex::new(r" \((\d+)\)$").unwrap();
-    let start_number = regex
-        .captures(stem)
-        .and_then(|caps| caps.get(1))
-        .and_then(|m| m.as_str().parse::<u32>().ok())
-        .unwrap_or(0);
-
-    let clean_stem = regex.replace(stem, "").to_string();
-
-    for dedup_number in start_number.. {
-        let proposed_path = if dedup_number == 0 {
-            format!("{clean_stem}{extension}")
-        } else {
-            format!("{clean_stem} ({dedup_number}){extension}")
-        };
-
-        if database
-            .get_latest_document_by_path(vault_id, &proposed_path, Some(transaction))
-            .await
-            .map_err(server_error)?
-            .is_none()
-        {
-            return Ok(proposed_path.to_string());
-        }
-    }
-
-    unreachable!("Loop must always return a value");
-}
diff --git a/backend/sync_server/src/utils.rs b/backend/sync_server/src/utils.rs
index 8718944c..03839c21 100644
--- a/backend/sync_server/src/utils.rs
+++ b/backend/sync_server/src/utils.rs
@@ -1,3 +1,5 @@
+use regex::Regex;
+
 /// Sanitize the document's path to allow all clients to create the same path in
 /// their filesystem. If we didn't do this server-side, client's would need to
 /// deal with mapping invalid names to valid ones and then back.
@@ -21,6 +23,45 @@ pub fn sanitize_path(path: &str) -> String {
         .join("/")
 }
 
+pub fn deduped_file_paths(path: &str) -> impl Iterator<Item = String> {
+    let mut path_parts = path.split('/').collect::<Vec<_>>();
+    let file_name = path_parts.pop().unwrap().to_owned();
+
+    let mut directory = path_parts.join("/");
+    if !directory.is_empty() {
+        directory.push('/');
+    }
+
+    let name_parts = file_name.rsplitn(2, '.').collect::<Vec<_>>();
+    let mut reverse_parts = name_parts.into_iter().rev();
+    let (stem, extension) = match (reverse_parts.next(), reverse_parts.next()) {
+        (Some(stem), maybe_extension) => (
+            stem.to_owned(),
+            maybe_extension
+                .map(|ext| format!(".{ext}"))
+                .unwrap_or_default(),
+        ),
+        _ => unreachable!("Path must have at least one part"),
+    };
+
+    let regex = Regex::new(r" \((\d+)\)$").unwrap();
+    let start_number = regex
+        .captures(&stem)
+        .and_then(|caps| caps.get(1))
+        .and_then(|m| m.as_str().parse::<u32>().ok())
+        .unwrap_or(0);
+
+    let clean_stem = regex.replace(&stem, "").to_string();
+
+    (start_number..).map(move |dedup_number| {
+        if dedup_number == 0 {
+            format!("{directory}{clean_stem}{extension}")
+        } else {
+            format!("{directory}{clean_stem} ({dedup_number}){extension}")
+        }
+    })
+}
+
 #[cfg(test)]
 mod test {
     use super::*;
@@ -30,4 +71,47 @@ mod test {
         assert_eq!(sanitize_path("/my/path/what?"), "/my/path/what");
         assert_eq!(sanitize_path("/my/path/\\\\:?"), "/my/path/_");
     }
+
+    #[test]
+    fn test_deduped_file_paths() {
+        let mut deduped = deduped_file_paths("file.txt");
+        assert_eq!(deduped.next(), Some("file.txt".to_owned()));
+        assert_eq!(deduped.next(), Some("file (1).txt".to_owned()));
+        assert_eq!(deduped.next(), Some("file (2).txt".to_owned()));
+
+        let mut deduped = deduped_file_paths("file");
+        assert_eq!(deduped.next(), Some("file".to_owned()));
+        assert_eq!(deduped.next(), Some("file (1)".to_owned()));
+        assert_eq!(deduped.next(), Some("file (2)".to_owned()));
+
+        let mut deduped = deduped_file_paths("file (51).md");
+        assert_eq!(deduped.next(), Some("file (51).md".to_owned()));
+        assert_eq!(deduped.next(), Some("file (52).md".to_owned()));
+        assert_eq!(deduped.next(), Some("file (53).md".to_owned()));
+
+        let mut deduped = deduped_file_paths("file (5)");
+        assert_eq!(deduped.next(), Some("file (5)".to_owned()));
+        assert_eq!(deduped.next(), Some("file (6)".to_owned()));
+        assert_eq!(deduped.next(), Some("file (7)".to_owned()));
+
+        let mut deduped = deduped_file_paths("my/path.with.dots/file (5).md");
+        assert_eq!(
+            deduped.next(),
+            Some("my/path.with.dots/file (5).md".to_owned())
+        );
+        assert_eq!(
+            deduped.next(),
+            Some("my/path.with.dots/file (6).md".to_owned())
+        );
+
+        let mut deduped = deduped_file_paths("my/path.with.dots/file (5)");
+        assert_eq!(
+            deduped.next(),
+            Some("my/path.with.dots/file (5)".to_owned())
+        );
+        assert_eq!(
+            deduped.next(),
+            Some("my/path.with.dots/file (6)".to_owned())
+        );
+    }
 }

From 4daa8ce7c7bf00d36a3354803389c5df878ce4e8 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 23 Feb 2025 21:35:07 +0000
Subject: [PATCH 257/761] Deconflict local renames

---
 .../file-operations/file-operations.test.ts   | 102 ++++++++++++++++++
 .../src/file-operations/file-operations.ts    |  59 +++++++---
 2 files changed, 144 insertions(+), 17 deletions(-)
 create mode 100644 frontend/sync-client/src/file-operations/file-operations.test.ts

diff --git a/frontend/sync-client/src/file-operations/file-operations.test.ts b/frontend/sync-client/src/file-operations/file-operations.test.ts
new file mode 100644
index 00000000..85364eb2
--- /dev/null
+++ b/frontend/sync-client/src/file-operations/file-operations.test.ts
@@ -0,0 +1,102 @@
+import { FileSystemOperations } from "sync-client";
+import type { RelativePath } from "../persistence/database";
+import { FileOperations } from "./file-operations";
+import { Logger } from "../tracing/logger";
+import assert from "assert";
+
+describe("File operations", () => {
+	class FakeFileSystemOperations implements FileSystemOperations {
+		public readonly names = new Set<string>();
+
+		public listAllFiles(): Promise<RelativePath[]> {
+			throw new Error("Method not implemented.");
+		}
+		public read(path: RelativePath): Promise<Uint8Array> {
+			throw new Error("Method not implemented.");
+		}
+		public async write(
+			path: RelativePath,
+			_content: Uint8Array
+		): Promise<void> {
+			this.names.add(path);
+		}
+		public atomicUpdateText(
+			path: RelativePath,
+			updater: (currentContent: string) => string
+		): Promise<string> {
+			throw new Error("Method not implemented.");
+		}
+		public getFileSize(path: RelativePath): Promise<number> {
+			throw new Error("Method not implemented.");
+		}
+		public getModificationTime(path: RelativePath): Promise<Date> {
+			throw new Error("Method not implemented.");
+		}
+		public async exists(path: RelativePath): Promise<boolean> {
+			return this.names.has(path);
+		}
+		public async createDirectory(path: RelativePath): Promise<void> {}
+		public delete(path: RelativePath): Promise<void> {
+			throw new Error("Method not implemented.");
+		}
+		public async rename(
+			oldPath: RelativePath,
+			newPath: RelativePath
+		): Promise<void> {
+			this.names.delete(oldPath);
+			this.names.add(newPath);
+		}
+	}
+
+	test("should deconflict renames", async () => {
+		let fs = new FakeFileSystemOperations();
+		let fileOperations = new FileOperations(new Logger(), fs);
+
+		await fileOperations.create("a", new Uint8Array());
+		assertSetOnlyContains(fs.names, "a");
+		await fileOperations.move("a", "b");
+		assertSetOnlyContains(fs.names, "b");
+
+		await fileOperations.create("c", new Uint8Array());
+		assertSetOnlyContains(fs.names, "b", "c");
+
+		await fileOperations.move("c", "b");
+		assertSetOnlyContains(fs.names, "b", "b (1)");
+
+		await fileOperations.create("c", new Uint8Array());
+		await fileOperations.move("c", "b");
+		assertSetOnlyContains(fs.names, "b", "b (1)", "b (2)");
+	});
+
+	test("should deconflict renames with file extension", async () => {
+		let fs = new FakeFileSystemOperations();
+		let fileOperations = new FileOperations(new Logger(), fs);
+
+		await fileOperations.create("b.md", new Uint8Array());
+		await fileOperations.create("c.md", new Uint8Array());
+		await fileOperations.move("c.md", "b.md");
+		assertSetOnlyContains(fs.names, "b.md", "b (1).md");
+	});
+
+	test("should deconflict renames with paths", async () => {
+		let fs = new FakeFileSystemOperations();
+		let fileOperations = new FileOperations(new Logger(), fs);
+
+		await fileOperations.create("a/b.c/d", new Uint8Array());
+		await fileOperations.create("a/b.c/e", new Uint8Array());
+		await fileOperations.move("a/b.c/d", "a/b.c/e");
+		assertSetOnlyContains(fs.names, "a/b.c/e", "a/b.c/e (1)");
+	});
+});
+
+function assertSetOnlyContains<T>(set: Set<T>, ...values: T[]) {
+	assert(
+		set.size === values.length &&
+			Array.from(set).every((value) => values.includes(value)),
+		`Expected set to contain only ${values.map((v) => '"' + v + '"').join(", ")}, but it contained ${Array.from(
+			set
+		)
+			.map((v) => '"' + v + '"')
+			.join(", ")}`
+	);
+}
diff --git a/frontend/sync-client/src/file-operations/file-operations.ts b/frontend/sync-client/src/file-operations/file-operations.ts
index 4bd29402..f994a2ed 100644
--- a/frontend/sync-client/src/file-operations/file-operations.ts
+++ b/frontend/sync-client/src/file-operations/file-operations.ts
@@ -21,7 +21,6 @@ export class FileOperations {
 	}
 
 	public async read(path: RelativePath): Promise<Uint8Array> {
-		this.logger.debug(`Reading file: ${path}`);
 		const content = await this.fs.read(path);
 
 		if (isBinary(content)) {
@@ -38,17 +37,14 @@ export class FileOperations {
 	}
 
 	public async getFileSize(path: RelativePath): Promise<number> {
-		this.logger.debug(`Getting file size: ${path}`);
 		return this.fs.getFileSize(path);
 	}
 
 	public async getModificationTime(path: RelativePath): Promise<Date> {
-		this.logger.debug(`Getting modification time: ${path}`);
 		return this.fs.getModificationTime(path);
 	}
 
 	public async exists(path: RelativePath): Promise<boolean> {
-		this.logger.debug(`Checking existence of ${path}`);
 		return this.fs.exists(path);
 	}
 
@@ -58,7 +54,6 @@ export class FileOperations {
 		path: RelativePath,
 		newContent: Uint8Array
 	): Promise<void> {
-		this.logger.debug(`Creating file: ${path}`);
 		if (await this.fs.exists(path)) {
 			this.logger.debug(
 				`Didn't expect ${path} to exist, when trying to create it, merging instead`
@@ -79,7 +74,6 @@ export class FileOperations {
 		expectedContent: Uint8Array,
 		newContent: Uint8Array
 	): Promise<Uint8Array> {
-		this.logger.debug(`Writing file: ${path}`);
 		if (!(await this.fs.exists(path))) {
 			this.logger.debug(
 				`The caller assumed ${path} exists, but it no longer, so we wont recreate it`
@@ -133,24 +127,25 @@ export class FileOperations {
 		oldPath: RelativePath,
 		newPath: RelativePath
 	): Promise<void> {
-		this.logger.debug(`Moving file: ${oldPath} -> ${newPath}`);
-
 		if (oldPath === newPath) {
 			return;
 		}
 
-		await this.createParentDirectories(newPath);
+		if (await this.fs.exists(newPath)) {
+			const deconflictedPath = await this.deconflictPath(newPath);
+			this.logger.debug(
+				`Conflict when moving '${oldPath}' to '${newPath}', '${newPath}' already exists, deconflicting by moving it to '${deconflictedPath}'`
+			);
+			this.fs.rename(newPath, deconflictedPath);
+		} else {
+			await this.createParentDirectories(newPath);
+		}
+
 		await this.fs.rename(oldPath, newPath);
 	}
 
-	public isFileEligibleForSync(_path: RelativePath): boolean {
-		return true;
-		// TODO: figure this out
-		// if (Platform.isDesktopApp) {
-		// 	return true;
-		// }
-
-		// return isFileTypeMergable(path);
+	public isFileEligibleForSync(path: RelativePath): boolean {
+		return isFileTypeMergable(path);
 	}
 
 	private async createParentDirectories(path: string): Promise<void> {
@@ -165,4 +160,34 @@ export class FileOperations {
 			}
 		}
 	}
+
+	private async deconflictPath(path: RelativePath): Promise<RelativePath> {
+		const pathParts = path.split("/");
+		const fileName = pathParts.pop()!;
+
+		let directory = pathParts.join("/");
+		if (directory) {
+			directory += "/";
+		}
+
+		const nameParts = fileName.split(".");
+		const extension =
+			nameParts.length > 1 ? "." + nameParts[nameParts.length - 1] : "";
+		const stem = extension ? nameParts.slice(0, -1).join(".") : fileName;
+		let currentCount = Number.parseInt(
+			/ \((\d+)\)$/.exec(stem)?.groups?.[0] ?? "0"
+		);
+
+		while (true) {
+			const newName =
+				currentCount === 0
+					? `${directory}${stem}${extension}`
+					: `${directory}${stem} (${currentCount})${extension}`;
+			if (await this.fs.exists(newName)) {
+				currentCount++;
+			} else {
+				return newName;
+			}
+		}
+	}
 }

From 5bde266c84aaf370e0b9a68167890f42d465ed27 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 23 Feb 2025 21:35:33 +0000
Subject: [PATCH 258/761] Fix wording

---
 frontend/sync-client/src/sync-operations/syncer.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/sync-client/src/sync-operations/syncer.ts b/frontend/sync-client/src/sync-operations/syncer.ts
index 5b1f78ea..dcb476dd 100644
--- a/frontend/sync-client/src/sync-operations/syncer.ts
+++ b/frontend/sync-client/src/sync-operations/syncer.ts
@@ -188,7 +188,7 @@ export class Syncer {
 
 					if (metadata) {
 						this.logger.debug(
-							`Document ${relativePath} has been updated locally, scheduling sync to update it`
+							`Document ${relativePath} might have been updated locally, scheduling sync to validate and update it`
 						);
 						return this.internalSyncer.unrestrictedSyncLocallyUpdatedFile(
 							{

From 5844e282e222f64a9df5e9b655c8a10a6055dc5c Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Mon, 24 Feb 2025 22:25:03 +0000
Subject: [PATCH 259/761] Add test

---
 backend/sync_server/src/utils.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/backend/sync_server/src/utils.rs b/backend/sync_server/src/utils.rs
index 03839c21..6289944f 100644
--- a/backend/sync_server/src/utils.rs
+++ b/backend/sync_server/src/utils.rs
@@ -69,6 +69,7 @@ mod test {
     #[test]
     fn test_sanitize_path() {
         assert_eq!(sanitize_path("/my/path/what?"), "/my/path/what");
+        assert_eq!(sanitize_path("file (1).md"), "file (1).md");
         assert_eq!(sanitize_path("/my/path/\\\\:?"), "/my/path/_");
     }
 

From e186a593ffe0d18c185117895556165bb03cfefe Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Mon, 24 Feb 2025 22:46:45 +0000
Subject: [PATCH 260/761] Extract helper and lint

---
 .../file-operations/file-operations.test.ts   | 85 +++++++++++--------
 .../src/utils/assert-set-contains-exactly.ts  | 13 +++
 2 files changed, 61 insertions(+), 37 deletions(-)
 create mode 100644 frontend/sync-client/src/utils/assert-set-contains-exactly.ts

diff --git a/frontend/sync-client/src/file-operations/file-operations.test.ts b/frontend/sync-client/src/file-operations/file-operations.test.ts
index 85364eb2..1fd99aea 100644
--- a/frontend/sync-client/src/file-operations/file-operations.test.ts
+++ b/frontend/sync-client/src/file-operations/file-operations.test.ts
@@ -1,17 +1,26 @@
-import { FileSystemOperations } from "sync-client";
-import type { RelativePath } from "../persistence/database";
+import type { FileSystemOperations } from "sync-client";
+import type { Database, RelativePath } from "../persistence/database";
 import { FileOperations } from "./file-operations";
 import { Logger } from "../tracing/logger";
-import assert from "assert";
+import { assertSetContainsExactly } from "src/utils/assert-set-contains-exactly";
 
 describe("File operations", () => {
+	class MockDatabase {
+		public async updatePath(
+			_oldRelativePath: RelativePath,
+			_newRelativePath: RelativePath
+		): Promise<void> {
+			// this is called but irrelevant for this mock
+		}
+	}
+
 	class FakeFileSystemOperations implements FileSystemOperations {
 		public readonly names = new Set<string>();
 
-		public listAllFiles(): Promise<RelativePath[]> {
+		public async listAllFiles(): Promise<RelativePath[]> {
 			throw new Error("Method not implemented.");
 		}
-		public read(path: RelativePath): Promise<Uint8Array> {
+		public async read(_path: RelativePath): Promise<Uint8Array> {
 			throw new Error("Method not implemented.");
 		}
 		public async write(
@@ -20,23 +29,25 @@ describe("File operations", () => {
 		): Promise<void> {
 			this.names.add(path);
 		}
-		public atomicUpdateText(
-			path: RelativePath,
-			updater: (currentContent: string) => string
+		public async atomicUpdateText(
+			_path: RelativePath,
+			_updater: (currentContent: string) => string
 		): Promise<string> {
 			throw new Error("Method not implemented.");
 		}
-		public getFileSize(path: RelativePath): Promise<number> {
+		public async getFileSize(_path: RelativePath): Promise<number> {
 			throw new Error("Method not implemented.");
 		}
-		public getModificationTime(path: RelativePath): Promise<Date> {
+		public async getModificationTime(_path: RelativePath): Promise<Date> {
 			throw new Error("Method not implemented.");
 		}
 		public async exists(path: RelativePath): Promise<boolean> {
 			return this.names.has(path);
 		}
-		public async createDirectory(path: RelativePath): Promise<void> {}
-		public delete(path: RelativePath): Promise<void> {
+		public async createDirectory(_path: RelativePath): Promise<void> {
+			// this is called but irrelevant for this mock
+		}
+		public async delete(_path: RelativePath): Promise<void> {
 			throw new Error("Method not implemented.");
 		}
 		public async rename(
@@ -49,54 +60,54 @@ describe("File operations", () => {
 	}
 
 	test("should deconflict renames", async () => {
-		let fs = new FakeFileSystemOperations();
-		let fileOperations = new FileOperations(new Logger(), fs);
+		const fs = new FakeFileSystemOperations();
+		const fileOperations = new FileOperations(
+			new Logger(),
+			new MockDatabase() as Database, // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+			fs
+		);
 
 		await fileOperations.create("a", new Uint8Array());
-		assertSetOnlyContains(fs.names, "a");
+		assertSetContainsExactly(fs.names, "a");
 		await fileOperations.move("a", "b");
-		assertSetOnlyContains(fs.names, "b");
+		assertSetContainsExactly(fs.names, "b");
 
 		await fileOperations.create("c", new Uint8Array());
-		assertSetOnlyContains(fs.names, "b", "c");
+		assertSetContainsExactly(fs.names, "b", "c");
 
 		await fileOperations.move("c", "b");
-		assertSetOnlyContains(fs.names, "b", "b (1)");
+		assertSetContainsExactly(fs.names, "b", "b (1)");
 
 		await fileOperations.create("c", new Uint8Array());
 		await fileOperations.move("c", "b");
-		assertSetOnlyContains(fs.names, "b", "b (1)", "b (2)");
+		assertSetContainsExactly(fs.names, "b", "b (1)", "b (2)");
 	});
 
 	test("should deconflict renames with file extension", async () => {
-		let fs = new FakeFileSystemOperations();
-		let fileOperations = new FileOperations(new Logger(), fs);
+		const fs = new FakeFileSystemOperations();
+		const fileOperations = new FileOperations(
+			new Logger(),
+			new MockDatabase() as Database, // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+			fs
+		);
 
 		await fileOperations.create("b.md", new Uint8Array());
 		await fileOperations.create("c.md", new Uint8Array());
 		await fileOperations.move("c.md", "b.md");
-		assertSetOnlyContains(fs.names, "b.md", "b (1).md");
+		assertSetContainsExactly(fs.names, "b.md", "b (1).md");
 	});
 
 	test("should deconflict renames with paths", async () => {
-		let fs = new FakeFileSystemOperations();
-		let fileOperations = new FileOperations(new Logger(), fs);
+		const fs = new FakeFileSystemOperations();
+		const fileOperations = new FileOperations(
+			new Logger(),
+			new MockDatabase() as Database, // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+			fs
+		);
 
 		await fileOperations.create("a/b.c/d", new Uint8Array());
 		await fileOperations.create("a/b.c/e", new Uint8Array());
 		await fileOperations.move("a/b.c/d", "a/b.c/e");
-		assertSetOnlyContains(fs.names, "a/b.c/e", "a/b.c/e (1)");
+		assertSetContainsExactly(fs.names, "a/b.c/e", "a/b.c/e (1)");
 	});
 });
-
-function assertSetOnlyContains<T>(set: Set<T>, ...values: T[]) {
-	assert(
-		set.size === values.length &&
-			Array.from(set).every((value) => values.includes(value)),
-		`Expected set to contain only ${values.map((v) => '"' + v + '"').join(", ")}, but it contained ${Array.from(
-			set
-		)
-			.map((v) => '"' + v + '"')
-			.join(", ")}`
-	);
-}
diff --git a/frontend/sync-client/src/utils/assert-set-contains-exactly.ts b/frontend/sync-client/src/utils/assert-set-contains-exactly.ts
new file mode 100644
index 00000000..9682044e
--- /dev/null
+++ b/frontend/sync-client/src/utils/assert-set-contains-exactly.ts
@@ -0,0 +1,13 @@
+import assert from "assert";
+
+export function assertSetContainsExactly<T>(set: Set<T>, ...values: T[]): void {
+	assert(
+		set.size === values.length &&
+			Array.from(set).every((value) => values.includes(value)),
+		`Expected set to contain only ${values.map((v) => '"' + v + '"').join(", ")}, but it contained ${Array.from(
+			set
+		)
+			.map((v) => '"' + v + '"')
+			.join(", ")}`
+	);
+}

From becd7c222e754ad8304ab660920e92212d953ca9 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Mon, 24 Feb 2025 22:47:09 +0000
Subject: [PATCH 261/761] Improve agent action logic with forbidden renames

---
 frontend/test-client/src/agent/mock-agent.ts | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/frontend/test-client/src/agent/mock-agent.ts b/frontend/test-client/src/agent/mock-agent.ts
index a933b98f..53bc0306 100644
--- a/frontend/test-client/src/agent/mock-agent.ts
+++ b/frontend/test-client/src/agent/mock-agent.ts
@@ -47,6 +47,15 @@ export class MockAgent extends MockClient {
 		this.client.logger.info("Agent initialized");
 	}
 
+	public async delete(path: RelativePath): Promise<void> {
+		assert(
+			this.doDeletes,
+			`Agent ${this.name} tried to delete file ${path} while doDeletes is false`
+		);
+
+		await super.delete(path);
+	}
+
 	public async act(): Promise<void> {
 		const options: (() => Promise<unknown>)[] = [
 			this.createFileAction.bind(this),
@@ -242,7 +251,7 @@ export class MockAgent extends MockClient {
 
 		this.client.logger.info(`Decided to rename file ${file} to ${newName}`);
 		if (!this.client.settings.getSettings().isSyncEnabled) {
-			this.doNotTouch.push(newName);
+			this.doNotTouch.push(file, newName);
 		}
 
 		return this.rename(file, newName);

From a7b518d7eae388133a2a90096c6499277a5d2608 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Mon, 24 Feb 2025 23:01:24 +0000
Subject: [PATCH 262/761] Fix deconflicting

---
 .../file-operations/file-operations.test.ts   | 18 ++++++++++++++++-
 .../src/file-operations/file-operations.ts    | 20 +++++++++++++------
 frontend/sync-client/src/sync-client.ts       |  2 +-
 3 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/frontend/sync-client/src/file-operations/file-operations.test.ts b/frontend/sync-client/src/file-operations/file-operations.test.ts
index 1fd99aea..2e7c57b7 100644
--- a/frontend/sync-client/src/file-operations/file-operations.test.ts
+++ b/frontend/sync-client/src/file-operations/file-operations.test.ts
@@ -2,7 +2,7 @@ import type { FileSystemOperations } from "sync-client";
 import type { Database, RelativePath } from "../persistence/database";
 import { FileOperations } from "./file-operations";
 import { Logger } from "../tracing/logger";
-import { assertSetContainsExactly } from "src/utils/assert-set-contains-exactly";
+import { assertSetContainsExactly } from "../utils/assert-set-contains-exactly";
 
 describe("File operations", () => {
 	class MockDatabase {
@@ -95,6 +95,22 @@ describe("File operations", () => {
 		await fileOperations.create("c.md", new Uint8Array());
 		await fileOperations.move("c.md", "b.md");
 		assertSetContainsExactly(fs.names, "b.md", "b (1).md");
+
+		await fileOperations.create("d.md", new Uint8Array());
+		await fileOperations.move("d.md", "b.md");
+		assertSetContainsExactly(fs.names, "b.md", "b (1).md", "b (2).md");
+
+		await fileOperations.create("file-23.md", new Uint8Array());
+		await fileOperations.create("file-23 (1).md", new Uint8Array());
+		await fileOperations.move("file-23.md", "file-23 (1).md");
+		assertSetContainsExactly(
+			fs.names,
+			"b.md",
+			"b (1).md",
+			"b (2).md",
+			"file-23 (1).md",
+			"file-23 (2).md"
+		);
 	});
 
 	test("should deconflict renames with paths", async () => {
diff --git a/frontend/sync-client/src/file-operations/file-operations.ts b/frontend/sync-client/src/file-operations/file-operations.ts
index f994a2ed..d93cedea 100644
--- a/frontend/sync-client/src/file-operations/file-operations.ts
+++ b/frontend/sync-client/src/file-operations/file-operations.ts
@@ -1,14 +1,16 @@
 import type { Logger } from "src/tracing/logger";
 import type { FileSystemOperations } from "./filesystem-operations";
-import type { RelativePath } from "src/persistence/database";
+import type { Database, RelativePath } from "src/persistence/database";
 import { isBinary, isFileTypeMergable, mergeText } from "sync_lib";
 import { SafeFileSystemOperations } from "./safe-filesystem-operations";
 
 export class FileOperations {
 	private readonly fs: SafeFileSystemOperations;
+	private static readonly PARENTHESES_REGEX = / \((\d+)\)$/;
 
 	public constructor(
 		private readonly logger: Logger,
+		private readonly database: Database,
 		fs: FileSystemOperations
 	) {
 		this.fs = new SafeFileSystemOperations(fs);
@@ -134,9 +136,10 @@ export class FileOperations {
 		if (await this.fs.exists(newPath)) {
 			const deconflictedPath = await this.deconflictPath(newPath);
 			this.logger.debug(
-				`Conflict when moving '${oldPath}' to '${newPath}', '${newPath}' already exists, deconflicting by moving it to '${deconflictedPath}'`
+				`Conflict when moving '${oldPath}' to '${newPath}', latter already exists, deconflicting by moving it to '${deconflictedPath}'`
 			);
-			this.fs.rename(newPath, deconflictedPath);
+			await this.database.updatePath(newPath, deconflictedPath);
+			await this.fs.rename(newPath, deconflictedPath);
 		} else {
 			await this.createParentDirectories(newPath);
 		}
@@ -163,7 +166,10 @@ export class FileOperations {
 
 	private async deconflictPath(path: RelativePath): Promise<RelativePath> {
 		const pathParts = path.split("/");
-		const fileName = pathParts.pop()!;
+		const fileName = pathParts.pop();
+		if (fileName == "" || fileName == null) {
+			throw new Error(`Path '${path}' cannot be empty`);
+		}
 
 		let directory = pathParts.join("/");
 		if (directory) {
@@ -173,11 +179,13 @@ export class FileOperations {
 		const nameParts = fileName.split(".");
 		const extension =
 			nameParts.length > 1 ? "." + nameParts[nameParts.length - 1] : "";
-		const stem = extension ? nameParts.slice(0, -1).join(".") : fileName;
+		let stem = extension ? nameParts.slice(0, -1).join(".") : fileName;
 		let currentCount = Number.parseInt(
-			/ \((\d+)\)$/.exec(stem)?.groups?.[0] ?? "0"
+			FileOperations.PARENTHESES_REGEX.exec(stem)?.groups?.[0] ?? "0"
 		);
+		stem = stem.replace(FileOperations.PARENTHESES_REGEX, "");
 
+		// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
 		while (true) {
 			const newName =
 				currentCount === 0
diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts
index 03259620..2338808f 100644
--- a/frontend/sync-client/src/sync-client.ts
+++ b/frontend/sync-client/src/sync-client.ts
@@ -93,7 +93,7 @@ export class SyncClient {
 			database,
 			settings,
 			syncService,
-			new FileOperations(logger, fs),
+			new FileOperations(logger, database, fs),
 			history
 		);
 

From a5bcaec9fec8d4e6d8491357bf972a5bbb020e5b Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Tue, 25 Feb 2025 20:32:37 +0000
Subject: [PATCH 263/761] Fix inifinite loop at end of test

---
 frontend/sync-client/src/sync-client.ts      | 1 +
 frontend/test-client/src/agent/mock-agent.ts | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts
index 2338808f..ba9f9d70 100644
--- a/frontend/sync-client/src/sync-client.ts
+++ b/frontend/sync-client/src/sync-client.ts
@@ -141,6 +141,7 @@ export class SyncClient {
 	/// and the local database but retain the settings.
 	/// The SyncClient can be used again after calling this method.
 	public async reset(): Promise<void> {
+		this.stop();
 		await this._syncer.reset();
 		this._history.reset();
 		await this._database.resetSyncState();
diff --git a/frontend/test-client/src/agent/mock-agent.ts b/frontend/test-client/src/agent/mock-agent.ts
index 53bc0306..3bc1da03 100644
--- a/frontend/test-client/src/agent/mock-agent.ts
+++ b/frontend/test-client/src/agent/mock-agent.ts
@@ -31,7 +31,8 @@ export class MockAgent extends MockClient {
 			switch (message.level) {
 				case LogLevel.ERROR:
 					console.error(formatted);
-					break;
+					// Let's not ignore errors
+					process.exit(1);
 				case LogLevel.WARNING:
 					console.warn(formatted);
 					break;
@@ -98,9 +99,9 @@ export class MockAgent extends MockClient {
 	public async finish(): Promise<void> {
 		await Promise.all(this.pendingActions);
 		await this.client.settings.setSetting("isSyncEnabled", true);
+		this.client.stop();
 		await this.client.syncer.waitForSyncQueue();
 		await this.client.syncer.applyRemoteChangesLocally();
-		this.client.stop();
 	}
 
 	public assertFileSystemsAreConsistent(otherAgent: MockAgent): void {
@@ -216,7 +217,7 @@ export class MockAgent extends MockClient {
 		);
 		return this.client.settings.setSetting(
 			"fetchChangesUpdateIntervalMs",
-			Math.random() * 1000
+			Math.random() * 2000 + 100
 		);
 	}
 

From f6ee0b727bd1950fc518babe434af3d84883fc33 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Tue, 25 Feb 2025 20:38:20 +0000
Subject: [PATCH 264/761] Change DB move API

---
 .../sync-client/src/persistence/database.ts   | 45 ++++++++++---------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/frontend/sync-client/src/persistence/database.ts b/frontend/sync-client/src/persistence/database.ts
index 4d36e867..495c9ccd 100644
--- a/frontend/sync-client/src/persistence/database.ts
+++ b/frontend/sync-client/src/persistence/database.ts
@@ -88,28 +88,6 @@ export class Database {
 		await this.save();
 	}
 
-	public async moveDocument({
-		documentId,
-		oldRelativePath,
-		relativePath,
-		parentVersionId,
-		hash
-	}: {
-		documentId: DocumentId;
-		oldRelativePath: RelativePath;
-		relativePath: RelativePath;
-		parentVersionId: VaultUpdateId;
-		hash: string;
-	}): Promise<void> {
-		this.documents.delete(oldRelativePath);
-		this.documents.set(relativePath, {
-			documentId,
-			parentVersionId,
-			hash
-		});
-		await this.save();
-	}
-
 	public async removeDocument(relativePath: RelativePath): Promise<void> {
 		this.documents.delete(relativePath);
 		await this.save();
@@ -121,6 +99,29 @@ export class Database {
 		return this.documents.get(relativePath);
 	}
 
+	public async updatePath(
+		oldRelativePath: RelativePath,
+		newRelativePath: RelativePath
+	): Promise<void> {
+		const document = this.documents.get(oldRelativePath);
+		if (!document) {
+			throw new Error(
+				`Cannot update physical path for document that does not exist: ${oldRelativePath}`
+			);
+		}
+
+		if (this.documents.has(newRelativePath)) {
+			throw new Error(
+				`Cannot update physical path to path that is already in use: ${newRelativePath}`
+			);
+		}
+
+		this.documents.delete(oldRelativePath);
+		this.documents.set(newRelativePath, document);
+
+		await this.save();
+	}
+
 	private async save(): Promise<void> {
 		await this.saveData({
 			documents: Object.fromEntries(this.documents.entries()),

From 6b9f1e6c12cc638a4d30b882b4ca8ccb60371f90 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Tue, 25 Feb 2025 21:56:01 +0000
Subject: [PATCH 265/761] Format

---
 frontend/obsidian-plugin/tsconfig.json | 14 ++++++++++----
 frontend/package.json                  |  2 +-
 frontend/sync-client/tsconfig.json     | 11 ++++++++---
 frontend/test-client/package.json      |  7 ++++---
 frontend/test-client/tsconfig.json     | 12 +++++++++---
 5 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/frontend/obsidian-plugin/tsconfig.json b/frontend/obsidian-plugin/tsconfig.json
index c67d6512..09dab427 100644
--- a/frontend/obsidian-plugin/tsconfig.json
+++ b/frontend/obsidian-plugin/tsconfig.json
@@ -3,9 +3,15 @@
 		"baseUrl": ".",
 		"module": "ESNext",
 		"target": "ES2023",
-		"moduleResolution": "bundler",
 		"strict": true,
-		"lib": ["DOM", "ESNext"]
+		"moduleResolution": "bundler",
+		"allowSyntheticDefaultImports": true,
+		"lib": [
+			"DOM",
+			"ESNext"
+		]
 	},
-	"exclude": ["./dist"]
-}
+	"exclude": [
+		"./dist"
+	]
+}
\ No newline at end of file
diff --git a/frontend/package.json b/frontend/package.json
index 301e28f7..8fdbb0c7 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -27,4 +27,4 @@
 		"prettier": "^3.5.2",
 		"typescript-eslint": "8.24.1"
 	}
-}
+}
\ No newline at end of file
diff --git a/frontend/sync-client/tsconfig.json b/frontend/sync-client/tsconfig.json
index 6db72fcc..d629c591 100644
--- a/frontend/sync-client/tsconfig.json
+++ b/frontend/sync-client/tsconfig.json
@@ -6,7 +6,12 @@
 		"strict": true,
 		"moduleResolution": "bundler",
 		"allowSyntheticDefaultImports": true,
-		"lib": ["DOM", "ESNext"]
+		"lib": [
+			"DOM",
+			"ESNext"
+		]
 	},
-	"exclude": ["./dist"]
-}
+	"exclude": [
+		"./dist"
+	]
+}
\ No newline at end of file
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index 56f2732f..ba2f9cd7 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -11,13 +11,14 @@
 		"test": "jest --passWithNoTests"
 	},
 	"devDependencies": {
-		"sync-client": "file:../sync-client",
-		"uuid": "^11.1.0",
+		"@types/node": "^22.13.5",
 		"chalk": "^5.4.1",
+		"sync-client": "file:../sync-client",
 		"ts-loader": "^9.5.2",
 		"tslib": "2.8.1",
 		"typescript": "5.7.3",
+		"uuid": "^11.1.0",
 		"webpack": "^5.98.0",
 		"webpack-cli": "^6.0.1"
 	}
-}
+}
\ No newline at end of file
diff --git a/frontend/test-client/tsconfig.json b/frontend/test-client/tsconfig.json
index 2306ca42..4995a2bc 100644
--- a/frontend/test-client/tsconfig.json
+++ b/frontend/test-client/tsconfig.json
@@ -5,7 +5,13 @@
 		"target": "ES2022",
 		"module": "CommonJS",
 		"esModuleInterop": true,
-		"lib": ["DOM", "ESNext"]
+		"lib": [
+			"DOM",
+			"ESNext"
+		],
+		"moduleResolution": "node"
 	},
-	"exclude": ["./dist"]
-}
+	"exclude": [
+		"./dist"
+	]
+}
\ No newline at end of file

From 91af4dc143637de3701e144eaf5baaf4f110aab5 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Tue, 25 Feb 2025 22:05:43 +0000
Subject: [PATCH 266/761] Update lock

---
 frontend/package-lock.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 67805aaf..0280f33a 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -6747,6 +6747,7 @@
 				"test-client": "dist/cli.js"
 			},
 			"devDependencies": {
+				"@types/node": "^22.13.5",
 				"chalk": "^5.4.1",
 				"sync-client": "file:../sync-client",
 				"ts-loader": "^9.5.2",

From d0302a72c3d4f8c8f4a7bca488c7e22d890cfa66 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Tue, 25 Feb 2025 22:18:47 +0000
Subject: [PATCH 267/761] Fix correctness issues

---
 .../src/file-operations/file-operations.ts    | 37 ++++++++++++-----
 .../sync-client/src/persistence/database.ts   |  5 +++
 .../sync-operations/unrestricted-syncer.ts    | 41 ++++++++++++-------
 frontend/test-client/src/agent/mock-agent.ts  | 16 ++------
 4 files changed, 62 insertions(+), 37 deletions(-)

diff --git a/frontend/sync-client/src/file-operations/file-operations.ts b/frontend/sync-client/src/file-operations/file-operations.ts
index d93cedea..99863593 100644
--- a/frontend/sync-client/src/file-operations/file-operations.ts
+++ b/frontend/sync-client/src/file-operations/file-operations.ts
@@ -1,12 +1,16 @@
 import type { Logger } from "src/tracing/logger";
 import type { FileSystemOperations } from "./filesystem-operations";
-import type { Database, RelativePath } from "src/persistence/database";
+import type {
+	Database,
+	DocumentId,
+	RelativePath
+} from "src/persistence/database";
 import { isBinary, isFileTypeMergable, mergeText } from "sync_lib";
 import { SafeFileSystemOperations } from "./safe-filesystem-operations";
 
 export class FileOperations {
-	private readonly fs: SafeFileSystemOperations;
 	private static readonly PARENTHESES_REGEX = / \((\d+)\)$/;
+	private readonly fs: SafeFileSystemOperations;
 
 	public constructor(
 		private readonly logger: Logger,
@@ -57,14 +61,16 @@ export class FileOperations {
 		newContent: Uint8Array
 	): Promise<void> {
 		if (await this.fs.exists(path)) {
+			const deconflictedPath = await this.deconflictPath(path);
 			this.logger.debug(
-				`Didn't expect ${path} to exist, when trying to create it, merging instead`
+				`Didn't expect ${path} to exist, deconflicting by moving it to '${deconflictedPath}'`
 			);
-			await this.write(path, new Uint8Array(0), newContent);
-			return;
+			await this.database.updatePath(path, deconflictedPath);
+			await this.fs.rename(path, deconflictedPath);
+		} else {
+			await this.createParentDirectories(path);
 		}
 
-		await this.createParentDirectories(path);
 		await this.fs.write(path, newContent);
 	}
 
@@ -127,7 +133,8 @@ export class FileOperations {
 
 	public async move(
 		oldPath: RelativePath,
-		newPath: RelativePath
+		newPath: RelativePath,
+		documentId?: DocumentId
 	): Promise<void> {
 		if (oldPath === newPath) {
 			return;
@@ -136,10 +143,20 @@ export class FileOperations {
 		if (await this.fs.exists(newPath)) {
 			const deconflictedPath = await this.deconflictPath(newPath);
 			this.logger.debug(
-				`Conflict when moving '${oldPath}' to '${newPath}', latter already exists, deconflicting by moving it to '${deconflictedPath}'`
+				`Conflict when moving '${oldPath}' to '${newPath}', the latter already exists, deconflicting by moving it to '${deconflictedPath}'`
 			);
-			await this.database.updatePath(newPath, deconflictedPath);
-			await this.fs.rename(newPath, deconflictedPath);
+
+			const existingMetadata = this.database.getDocument(newPath);
+			if (
+				existingMetadata === undefined ||
+				existingMetadata.documentId !== documentId
+			) {
+				await this.database.updatePath(newPath, deconflictedPath);
+				await this.fs.rename(newPath, deconflictedPath);
+			} else {
+				await this.database.deleteDocument(newPath);
+				await this.fs.delete(newPath);
+			}
 		} else {
 			await this.createParentDirectories(newPath);
 		}
diff --git a/frontend/sync-client/src/persistence/database.ts b/frontend/sync-client/src/persistence/database.ts
index 495c9ccd..1ac899e9 100644
--- a/frontend/sync-client/src/persistence/database.ts
+++ b/frontend/sync-client/src/persistence/database.ts
@@ -99,6 +99,11 @@ export class Database {
 		return this.documents.get(relativePath);
 	}
 
+	public async deleteDocument(relativePath: RelativePath): Promise<void> {
+		this.documents.delete(relativePath);
+		await this.save();
+	}
+
 	public async updatePath(
 		oldRelativePath: RelativePath,
 		newRelativePath: RelativePath
diff --git a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
index 2ddc29f3..86ed3089 100644
--- a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
+++ b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
@@ -144,17 +144,17 @@ export class UnrestrictedSyncer {
 			SyncType.UPDATE,
 			SyncSource.PUSH,
 			async () => {
-				const localMetadata = this.database.getDocument(
-					oldPath ?? relativePath
-				);
+				// Check the new path first in case the metadata has been already moved
+				let localMetadata = this.database.getDocument(relativePath);
+				let metadataPath = relativePath;
+
+				if (localMetadata === undefined && oldPath !== undefined) {
+					localMetadata = this.database.getDocument(oldPath);
+					metadataPath = oldPath;
+				}
 
 				if (!localMetadata) {
-					this.history.addHistoryEntry({
-						status: SyncStatus.NO_OP,
-						relativePath,
-						message: `Document metadata doesn't exist for ${oldPath ?? relativePath}, it must have been already deleted`,
-						type: SyncType.UPDATE
-					});
+					// It's fine, a subsequent sync operation must have dealt with this
 					return;
 				}
 
@@ -243,7 +243,8 @@ export class UnrestrictedSyncer {
 						await this.operations.move(
 							// this can throw FileNotFoundError
 							relativePath,
-							response.relativePath
+							response.relativePath,
+							response.documentId
 						);
 					}
 
@@ -268,9 +269,14 @@ export class UnrestrictedSyncer {
 						});
 					}
 
-					await this.database.moveDocument({
+					if (metadataPath !== response.relativePath) {
+						await this.database.updatePath(
+							metadataPath,
+							response.relativePath
+						);
+					}
+					await this.database.setDocument({
 						documentId: localMetadata.documentId,
-						oldRelativePath: oldPath ?? relativePath,
 						relativePath: response.relativePath,
 						parentVersionId: response.vaultUpdateId,
 						hash: contentHash
@@ -394,7 +400,7 @@ export class UnrestrictedSyncer {
 
 				const [relativePath, metadata] = localMetadata;
 
-				if (metadata.parentVersionId === remoteVersion.vaultUpdateId) {
+				if (remoteVersion.vaultUpdateId <= metadata.parentVersionId) {
 					this.logger.debug(
 						`Document ${relativePath} is already up to date`
 					);
@@ -438,6 +444,12 @@ export class UnrestrictedSyncer {
 							// TODO: this can fail, that's bad
 							await this.operations.move(
 								// this can throw FileNotFoundError
+								relativePath,
+								remoteVersion.relativePath,
+								remoteVersion.documentId
+							);
+
+							await this.database.updatePath(
 								relativePath,
 								remoteVersion.relativePath
 							);
@@ -448,9 +460,8 @@ export class UnrestrictedSyncer {
 							currentContent,
 							contentBytes
 						);
-						await this.database.moveDocument({
+						await this.database.setDocument({
 							documentId: remoteVersion.documentId,
-							oldRelativePath: relativePath,
 							relativePath: remoteVersion.relativePath,
 							parentVersionId: remoteVersion.vaultUpdateId,
 							hash: contentHash
diff --git a/frontend/test-client/src/agent/mock-agent.ts b/frontend/test-client/src/agent/mock-agent.ts
index 3bc1da03..b7028593 100644
--- a/frontend/test-client/src/agent/mock-agent.ts
+++ b/frontend/test-client/src/agent/mock-agent.ts
@@ -33,6 +33,7 @@ export class MockAgent extends MockClient {
 					console.error(formatted);
 					// Let's not ignore errors
 					process.exit(1);
+					break;
 				case LogLevel.WARNING:
 					console.warn(formatted);
 					break;
@@ -48,15 +49,6 @@ export class MockAgent extends MockClient {
 		this.client.logger.info("Agent initialized");
 	}
 
-	public async delete(path: RelativePath): Promise<void> {
-		assert(
-			this.doDeletes,
-			`Agent ${this.name} tried to delete file ${path} while doDeletes is false`
-		);
-
-		await super.delete(path);
-	}
-
 	public async act(): Promise<void> {
 		const options: (() => Promise<unknown>)[] = [
 			this.createFileAction.bind(this),
@@ -97,8 +89,8 @@ export class MockAgent extends MockClient {
 	}
 
 	public async finish(): Promise<void> {
-		await Promise.all(this.pendingActions);
 		await this.client.settings.setSetting("isSyncEnabled", true);
+		await Promise.all(this.pendingActions);
 		this.client.stop();
 		await this.client.syncer.waitForSyncQueue();
 		await this.client.syncer.applyRemoteChangesLocally();
@@ -196,7 +188,7 @@ export class MockAgent extends MockClient {
 	private async createFileAction(): Promise<void> {
 		const file = this.getFileName();
 
-		if (await this.exists(file)) {
+		if (this.doNotTouch.includes(file) || (await this.exists(file))) {
 			return;
 		}
 
@@ -246,7 +238,7 @@ export class MockAgent extends MockClient {
 
 		const newName = this.getFileName();
 
-		if (await this.exists(newName)) {
+		if (this.doNotTouch.includes(newName) || (await this.exists(newName))) {
 			return;
 		}
 

From d19b1ff449026494e77334d0624f8bffe83483be Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Tue, 25 Feb 2025 22:50:46 +0000
Subject: [PATCH 268/761] Remove chalk

---
 frontend/package-lock.json        | 12 ------------
 frontend/package.json             |  2 +-
 frontend/test-client/package.json |  3 +--
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 0280f33a..e41f20a4 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -6748,7 +6748,6 @@
 			},
 			"devDependencies": {
 				"@types/node": "^22.13.5",
-				"chalk": "^5.4.1",
 				"sync-client": "file:../sync-client",
 				"ts-loader": "^9.5.2",
 				"tslib": "2.8.1",
@@ -6757,17 +6756,6 @@
 				"webpack": "^5.98.0",
 				"webpack-cli": "^6.0.1"
 			}
-		},
-		"test-client/node_modules/chalk": {
-			"version": "5.4.1",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": "^12.17.0 || ^14.13 || >=16.0.0"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/chalk?sponsor=1"
-			}
 		}
 	}
 }
diff --git a/frontend/package.json b/frontend/package.json
index 8fdbb0c7..301e28f7 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -27,4 +27,4 @@
 		"prettier": "^3.5.2",
 		"typescript-eslint": "8.24.1"
 	}
-}
\ No newline at end of file
+}
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index ba2f9cd7..676da96f 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -12,7 +12,6 @@
 	},
 	"devDependencies": {
 		"@types/node": "^22.13.5",
-		"chalk": "^5.4.1",
 		"sync-client": "file:../sync-client",
 		"ts-loader": "^9.5.2",
 		"tslib": "2.8.1",
@@ -21,4 +20,4 @@
 		"webpack": "^5.98.0",
 		"webpack-cli": "^6.0.1"
 	}
-}
\ No newline at end of file
+}

From 6999276af466c705ee71295593e2d34fcff5e0b6 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Tue, 25 Feb 2025 22:51:03 +0000
Subject: [PATCH 269/761] Format again

---
 frontend/obsidian-plugin/tsconfig.json | 11 +++--------
 frontend/sync-client/tsconfig.json     | 11 +++--------
 frontend/test-client/tsconfig.json     | 11 +++--------
 3 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/frontend/obsidian-plugin/tsconfig.json b/frontend/obsidian-plugin/tsconfig.json
index 09dab427..90ae756e 100644
--- a/frontend/obsidian-plugin/tsconfig.json
+++ b/frontend/obsidian-plugin/tsconfig.json
@@ -6,12 +6,7 @@
 		"strict": true,
 		"moduleResolution": "bundler",
 		"allowSyntheticDefaultImports": true,
-		"lib": [
-			"DOM",
-			"ESNext"
-		]
+		"lib": ["DOM", "ESNext"]
 	},
-	"exclude": [
-		"./dist"
-	]
-}
\ No newline at end of file
+	"exclude": ["./dist"]
+}
diff --git a/frontend/sync-client/tsconfig.json b/frontend/sync-client/tsconfig.json
index d629c591..6db72fcc 100644
--- a/frontend/sync-client/tsconfig.json
+++ b/frontend/sync-client/tsconfig.json
@@ -6,12 +6,7 @@
 		"strict": true,
 		"moduleResolution": "bundler",
 		"allowSyntheticDefaultImports": true,
-		"lib": [
-			"DOM",
-			"ESNext"
-		]
+		"lib": ["DOM", "ESNext"]
 	},
-	"exclude": [
-		"./dist"
-	]
-}
\ No newline at end of file
+	"exclude": ["./dist"]
+}
diff --git a/frontend/test-client/tsconfig.json b/frontend/test-client/tsconfig.json
index 4995a2bc..67691c50 100644
--- a/frontend/test-client/tsconfig.json
+++ b/frontend/test-client/tsconfig.json
@@ -5,13 +5,8 @@
 		"target": "ES2022",
 		"module": "CommonJS",
 		"esModuleInterop": true,
-		"lib": [
-			"DOM",
-			"ESNext"
-		],
+		"lib": ["DOM", "ESNext"],
 		"moduleResolution": "node"
 	},
-	"exclude": [
-		"./dist"
-	]
-}
\ No newline at end of file
+	"exclude": ["./dist"]
+}

From 9cebf53707de066c44eb75cc3c31dc5a7c4a1081 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Tue, 25 Feb 2025 22:52:47 +0000
Subject: [PATCH 270/761] Allow overriding fetch implementation

---
 frontend/sync-client/src/services/sync-service.ts | 10 ++++++++--
 frontend/sync-client/src/sync-client.ts           |  4 ++++
 frontend/sync-client/src/utils/retried-fetch.ts   |  9 +++++----
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/frontend/sync-client/src/services/sync-service.ts b/frontend/sync-client/src/services/sync-service.ts
index e60fcaf2..56e8a697 100644
--- a/frontend/sync-client/src/services/sync-service.ts
+++ b/frontend/sync-client/src/services/sync-service.ts
@@ -17,12 +17,13 @@ export interface CheckConnectionResult {
 export class SyncService {
 	private client!: Client<paths>;
 	private clientWithoutRetries!: Client<paths>;
+	private _fetchImplementation: typeof globalThis.fetch = globalThis.fetch;
 
 	public constructor(
 		private readonly settings: Settings,
 		private readonly logger: Logger
 	) {
-		this.createClient(settings.getSettings().remoteUri);
+		this.createClient(this.settings.getSettings().remoteUri);
 
 		settings.addOnSettingsChangeHandlers((newSettings, oldSettings) => {
 			if (newSettings.remoteUri === oldSettings.remoteUri) {
@@ -33,6 +34,11 @@ export class SyncService {
 		});
 	}
 
+	public set fetchImplementation(fetch: typeof globalThis.fetch) {
+		this._fetchImplementation = fetch;
+		this.createClient(this.settings.getSettings().remoteUri);
+	}
+
 	private static formatError(
 		error: components["schemas"]["SerializedError"]
 	): string {
@@ -289,7 +295,7 @@ export class SyncService {
 	private createClient(remoteUri: string): void {
 		this.client = createClient<paths>({
 			baseUrl: remoteUri,
-			fetch: retriedFetchFactory(this.logger)
+			fetch: retriedFetchFactory(this.logger, this._fetchImplementation)
 		});
 
 		this.clientWithoutRetries = createClient<paths>({
diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts
index ba9f9d70..302daf35 100644
--- a/frontend/sync-client/src/sync-client.ts
+++ b/frontend/sync-client/src/sync-client.ts
@@ -45,6 +45,10 @@ export class SyncClient {
 		return this._database.getDocuments().size;
 	}
 
+	public set fetchImplementation(fetch: typeof globalThis.fetch) {
+		this._syncService.fetchImplementation = fetch;
+	}
+
 	public static async create(
 		fs: FileSystemOperations,
 		persistence: PersistenceProvider<
diff --git a/frontend/sync-client/src/utils/retried-fetch.ts b/frontend/sync-client/src/utils/retried-fetch.ts
index d3efcd2d..e4c47f07 100644
--- a/frontend/sync-client/src/utils/retried-fetch.ts
+++ b/frontend/sync-client/src/utils/retried-fetch.ts
@@ -2,8 +2,6 @@ import * as fetchRetryFactory from "fetch-retry";
 import type { RequestInitRetryParams } from "fetch-retry";
 import type { Logger } from "src/tracing/logger";
 
-const fetchWithRetry = fetchRetryFactory.default(fetch);
-
 function getUrlFromInput(input: RequestInfo | URL): string {
 	if (input instanceof URL) {
 		return input.href;
@@ -14,12 +12,15 @@ function getUrlFromInput(input: RequestInfo | URL): string {
 	return input.url;
 }
 
-export function retriedFetchFactory(logger: Logger) {
+export function retriedFetchFactory(
+	logger: Logger,
+	fetch: typeof globalThis.fetch = globalThis.fetch
+) {
 	return async (
 		input: RequestInfo | URL,
 		init: RequestInitRetryParams<typeof fetch> = {}
 	): Promise<Response> => {
-		return fetchWithRetry(input, {
+		return fetchRetryFactory.default(fetch)(input, {
 			retryOn: function (attempt, error, response) {
 				if (error !== null || !response || response.status >= 500) {
 					logger.warn(

From 0b5f3f392124ef13cc96135448953f0a662a75ac Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Tue, 25 Feb 2025 22:53:25 +0000
Subject: [PATCH 271/761] Don't trigger delete

---
 frontend/sync-client/src/file-operations/file-operations.ts     | 1 -
 .../sync-client/src/file-operations/filesystem-operations.ts    | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/sync-client/src/file-operations/file-operations.ts b/frontend/sync-client/src/file-operations/file-operations.ts
index 99863593..9977d60b 100644
--- a/frontend/sync-client/src/file-operations/file-operations.ts
+++ b/frontend/sync-client/src/file-operations/file-operations.ts
@@ -155,7 +155,6 @@ export class FileOperations {
 				await this.fs.rename(newPath, deconflictedPath);
 			} else {
 				await this.database.deleteDocument(newPath);
-				await this.fs.delete(newPath);
 			}
 		} else {
 			await this.createParentDirectories(newPath);
diff --git a/frontend/sync-client/src/file-operations/filesystem-operations.ts b/frontend/sync-client/src/file-operations/filesystem-operations.ts
index b58d3c23..9ea577f7 100644
--- a/frontend/sync-client/src/file-operations/filesystem-operations.ts
+++ b/frontend/sync-client/src/file-operations/filesystem-operations.ts
@@ -13,5 +13,7 @@ export interface FileSystemOperations {
 	exists: (path: RelativePath) => Promise<boolean>;
 	createDirectory: (path: RelativePath) => Promise<void>;
 	delete: (path: RelativePath) => Promise<void>;
+
+	// Must be able to handle renaming to a file that already exists
 	rename: (oldPath: RelativePath, newPath: RelativePath) => Promise<void>;
 }

From f8b6718a22febeabe17675e85a967548d3b8f37f Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Tue, 25 Feb 2025 22:54:04 +0000
Subject: [PATCH 272/761] Set jitter

---
 frontend/test-client/src/agent/mock-agent.ts | 21 +++++---
 frontend/test-client/src/cli.ts              | 55 +++++++++++++-------
 2 files changed, 49 insertions(+), 27 deletions(-)

diff --git a/frontend/test-client/src/agent/mock-agent.ts b/frontend/test-client/src/agent/mock-agent.ts
index b7028593..21163d52 100644
--- a/frontend/test-client/src/agent/mock-agent.ts
+++ b/frontend/test-client/src/agent/mock-agent.ts
@@ -4,7 +4,7 @@ import { assert } from "../utils/assert";
 import type { RelativePath, SyncSettings } from "sync-client";
 import { LogLevel } from "sync-client";
 import { MockClient } from "./mock-client";
-import chalk from "chalk";
+import { sleep } from "../utils/sleep";
 
 export class MockAgent extends MockClient {
 	private readonly writtenContents: string[] = [];
@@ -14,8 +14,8 @@ export class MockAgent extends MockClient {
 	public constructor(
 		initialSettings: Partial<SyncSettings>,
 		public readonly name: string,
-		private readonly color: string,
-		private readonly doDeletes: boolean
+		private readonly doDeletes: boolean,
+		private readonly jitterScaleInSeconds: number
 	) {
 		super(initialSettings);
 	}
@@ -23,11 +23,18 @@ export class MockAgent extends MockClient {
 	public async init(): Promise<void> {
 		await super.init();
 
-		this.client.logger.addOnMessageListener((message) => {
-			const formatted = chalk.hex(this.color)(
-				`[${this.name}] ${message.timestamp.toISOString()} ${message.level} ${message.message}`
-			);
+		this.client.fetchImplementation = async (
+			input: string | URL | globalThis.Request,
+			init?: RequestInit
+		): Promise<Response> => {
+			await sleep(Math.random() * this.jitterScaleInSeconds * 1000);
+			const response = await fetch(input, init);
+			await sleep(Math.random() * this.jitterScaleInSeconds * 1000);
+			return response;
+		};
 
+		this.client.logger.addOnMessageListener((message) => {
+			const formatted = `[${this.name}] ${message.timestamp.toISOString()} ${message.level} ${message.message}`;
 			switch (message.level) {
 				case LogLevel.ERROR:
 					console.error(formatted);
diff --git a/frontend/test-client/src/cli.ts b/frontend/test-client/src/cli.ts
index b6f4ebac..7f8b29a4 100644
--- a/frontend/test-client/src/cli.ts
+++ b/frontend/test-client/src/cli.ts
@@ -7,16 +7,17 @@ async function runTest({
 	agentCount,
 	concurrency,
 	iterations,
-	doDeletes
+	doDeletes,
+	jitterScaleInSeconds
 }: {
 	agentCount: number;
 	concurrency: number;
 	iterations: number;
 	doDeletes: boolean;
+	jitterScaleInSeconds: number;
 }): Promise<void> {
-	console.info(
-		`Running test with ${agentCount} agents, concurrency ${concurrency}, iterations ${iterations}, doDeletes ${doDeletes}`
-	);
+	const settings = `with ${agentCount} agents, concurrency ${concurrency}, iterations ${iterations}, doDeletes ${doDeletes}, jitterScaleInSeconds ${jitterScaleInSeconds}`;
+	console.info(`Running test ${settings}`);
 
 	const initialSettings: Partial<SyncSettings> = {
 		isSyncEnabled: true,
@@ -29,7 +30,12 @@ async function runTest({
 	const clients: MockAgent[] = [];
 	for (let i = 0; i < agentCount; i++) {
 		clients.push(
-			new MockAgent(initialSettings, `agent-${i}`, "#ff0000", doDeletes)
+			new MockAgent(
+				initialSettings,
+				`agent-${i}`,
+				doDeletes,
+				jitterScaleInSeconds
+			)
 		);
 	}
 
@@ -42,8 +48,15 @@ async function runTest({
 			await sleep(100);
 		}
 
+		console.info("Stopping agents");
+
+		// Each agent can have unpushed changes which might conflict with eachother so each has to resolve the conflicts & push, and
+		for (const client of clients) {
+			await client.finish();
+		}
+
+		// then we need a second pass to ensure that all agents pull the same state.
 		for (const client of clients) {
-			// todo: make it less hacky
 			await client.finish();
 		}
 
@@ -65,33 +78,35 @@ async function runTest({
 			console.info(`Content check for ${client.name} passed`);
 		});
 
-		console.info(
-			`Test passed with ${agentCount} agents, concurrency ${concurrency}, iterations ${iterations}, doDeletes ${doDeletes}`
-		);
+		console.info(`Test passed with ${settings}`);
 	} catch (err) {
-		console.error(
-			`Test failed with ${agentCount} agents, concurrency ${concurrency}, iterations ${iterations}, doDeletes ${doDeletes}`
-		);
+		console.error(`Test failed with ${settings}`);
 		throw err;
 	}
 }
 
 async function runTests(): Promise<void> {
 	const agentCounts = [2, 10];
+	const jitterScaleInSeconds = [0.5, 3, 0];
 	const concurrencies = [1, 16];
 	const iterations = [50, 300];
 	const doDeletes = [false, true];
 
 	for (const agentCount of agentCounts) {
 		for (const concurrency of concurrencies) {
-			for (const iteration of iterations) {
-				for (const deleteFiles of doDeletes) {
-					await runTest({
-						agentCount,
-						concurrency,
-						iterations: iteration,
-						doDeletes: deleteFiles
-					});
+			for (const jitter of jitterScaleInSeconds) {
+				for (const iteration of iterations) {
+					for (const deleteFiles of doDeletes) {
+						while (true) {
+							await runTest({
+								agentCount,
+								concurrency,
+								iterations: iteration,
+								doDeletes: deleteFiles,
+								jitterScaleInSeconds: jitter
+							});
+						}
+					}
 				}
 			}
 		}

From e493b98a246ab654f7113c8f226459e6f7a12852 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Wed, 26 Feb 2025 23:11:46 +0000
Subject: [PATCH 273/761] Don't merge with existing document on create for
 correctness reasons

---
 .../sync_server/src/server/create_document.rs | 101 ++++--------------
 backend/sync_server/src/server/responses.rs   |   2 +-
 frontend/sync-client/src/services/types.ts    |   6 +-
 3 files changed, 25 insertions(+), 84 deletions(-)

diff --git a/backend/sync_server/src/server/create_document.rs b/backend/sync_server/src/server/create_document.rs
index cfaeaa0e..a2567939 100644
--- a/backend/sync_server/src/server/create_document.rs
+++ b/backend/sync_server/src/server/create_document.rs
@@ -7,19 +7,17 @@ use axum_extra::{
 };
 use axum_jsonschema::Json;
 use chrono::{DateTime, Utc};
-use log::info;
 use schemars::JsonSchema;
 use serde::Deserialize;
-use sync_lib::{base64_to_bytes, is_file_type_mergable, merge};
+use sync_lib::base64_to_bytes;
 
 use super::{
     app_state::AppState,
     auth::auth,
     requests::{CreateDocumentVersion, CreateDocumentVersionMultipart},
-    responses::DocumentUpdateResponse,
 };
 use crate::{
-    database::models::{StoredDocumentVersion, VaultId},
+    database::models::{DocumentVersionWithoutContent, StoredDocumentVersion, VaultId},
     errors::{SyncServerError, client_error, server_error},
     utils::sanitize_path,
 };
@@ -41,7 +39,7 @@ pub async fn create_document_multipart(
     TypedMultipart(axum_typed_multipart::TypedMultipart(request)): TypedMultipart<
         CreateDocumentVersionMultipart,
     >,
-) -> Result<Json<DocumentUpdateResponse>, SyncServerError> {
+) -> Result<Json<DocumentVersionWithoutContent>, SyncServerError> {
     internal_create_document(
         auth_header,
         state,
@@ -62,7 +60,7 @@ pub async fn create_document_json(
     Path(PathParams { vault_id }): Path<PathParams>,
     State(state): State<AppState>,
     Json(request): Json<CreateDocumentVersion>,
-) -> Result<Json<DocumentUpdateResponse>, SyncServerError> {
+) -> Result<Json<DocumentVersionWithoutContent>, SyncServerError> {
     let content_bytes = base64_to_bytes(&request.content_base64)
         .context("Failed to decode base64 content in request")
         .map_err(client_error)?;
@@ -85,7 +83,7 @@ async fn internal_create_document(
     relative_path: String,
     created_date: DateTime<Utc>,
     content: Vec<u8>,
-) -> Result<Json<DocumentUpdateResponse>, SyncServerError> {
+) -> Result<Json<DocumentVersionWithoutContent>, SyncServerError> {
     auth(&state, auth_header.token())?;
 
     let mut transaction = state
@@ -102,85 +100,28 @@ async fn internal_create_document(
 
     let sanitized_relative_path = sanitize_path(&relative_path);
 
-    let maybe_existing_version = state
-        .database
-        .get_latest_document_by_path(&vault_id, &sanitized_relative_path, Some(&mut transaction))
-        .await
-        .map_err(server_error)?
-        .and_then(|doc| if doc.is_deleted { None } else { Some(doc) });
-
-    let response = if let Some(existing_version) = maybe_existing_version {
-        if content == existing_version.content {
-            info!(
-                "Content of the new version is the same as the existing version. Not creating a \
-                 new version."
-            );
-
-            transaction
-                .rollback()
-                .await
-                .context("Failed to roll back unecceseary transaction")
-                .map_err(server_error)?;
-
-            return Ok(Json(DocumentUpdateResponse::FastForwardUpdate(
-                existing_version.into(),
-            )));
-        }
-
-        let merged_content = if is_file_type_mergable(&sanitized_relative_path) {
-            merge(
-                &[], // the empty string is the first common parent of the two documents,
-                &existing_version.content,
-                &content,
-            )
-        } else {
-            content
-        };
-
-        let new_version = StoredDocumentVersion {
-            vault_id,
-            vault_update_id: last_update_id + 1,
-            relative_path: sanitized_relative_path,
-            document_id: existing_version.document_id,
-            content: merged_content,
-            created_date,
-            updated_date: chrono::Utc::now(),
-            is_deleted: false,
-        };
-
-        state
-            .database
-            .insert_document_version(&new_version, Some(&mut transaction))
-            .await
-            .map_err(server_error)?;
-
-        DocumentUpdateResponse::MergingUpdate(new_version.into())
-    } else {
-        let new_version = StoredDocumentVersion {
-            vault_id,
-            vault_update_id: last_update_id + 1,
-            document_id: uuid::Uuid::new_v4(),
-            relative_path: sanitized_relative_path,
-            content,
-            created_date,
-            updated_date: chrono::Utc::now(),
-            is_deleted: false,
-        };
-
-        state
-            .database
-            .insert_document_version(&new_version, Some(&mut transaction))
-            .await
-            .map_err(server_error)?;
-
-        DocumentUpdateResponse::FastForwardUpdate(new_version.into())
+    let new_version = StoredDocumentVersion {
+        vault_id,
+        vault_update_id: last_update_id + 1,
+        document_id: uuid::Uuid::new_v4(),
+        relative_path: sanitized_relative_path,
+        content,
+        created_date,
+        updated_date: chrono::Utc::now(),
+        is_deleted: false,
     };
 
+    state
+        .database
+        .insert_document_version(&new_version, Some(&mut transaction))
+        .await
+        .map_err(server_error)?;
+
     transaction
         .commit()
         .await
         .context("Failed to commit successful transaction")
         .map_err(server_error)?;
 
-    Ok(Json(response))
+    Ok(Json(new_version.into()))
 }
diff --git a/backend/sync_server/src/server/responses.rs b/backend/sync_server/src/server/responses.rs
index 5d76bb05..09b254ef 100644
--- a/backend/sync_server/src/server/responses.rs
+++ b/backend/sync_server/src/server/responses.rs
@@ -25,7 +25,7 @@ pub struct FetchLatestDocumentsResponse {
     pub last_update_id: VaultUpdateId,
 }
 
-/// Response to a create/update document request.
+/// Response to an update document request.
 #[derive(Debug, Clone, Serialize, JsonSchema)]
 #[serde(tag = "type")]
 pub enum DocumentUpdateResponse {
diff --git a/frontend/sync-client/src/services/types.ts b/frontend/sync-client/src/services/types.ts
index 6a18e16a..79d4b5f8 100644
--- a/frontend/sync-client/src/services/types.ts
+++ b/frontend/sync-client/src/services/types.ts
@@ -111,7 +111,7 @@ export interface paths {
 						[name: string]: unknown;
 					};
 					content: {
-						"application/json": components["schemas"]["DocumentUpdateResponse"];
+						"application/json": components["schemas"]["DocumentVersionWithoutContent"];
 					};
 				};
 				default: {
@@ -161,7 +161,7 @@ export interface paths {
 						[name: string]: unknown;
 					};
 					content: {
-						"application/json": components["schemas"]["DocumentUpdateResponse"];
+						"application/json": components["schemas"]["DocumentVersionWithoutContent"];
 					};
 				};
 				default: {
@@ -466,7 +466,7 @@ export interface components {
 			createdDate: string;
 			relativePath: string;
 		};
-		/** @description Response to a create/update document request. */
+		/** @description Response to a update document request. */
 		DocumentUpdateResponse:
 			| {
 					/** Format: date-time */

From dc31afd9078cc457db535d2459472b33d8c94341 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Wed, 26 Feb 2025 23:12:11 +0000
Subject: [PATCH 274/761] Update test

---
 frontend/test-client/src/agent/mock-agent.ts  | 80 ++++++++++++++-----
 frontend/test-client/src/agent/mock-client.ts |  6 --
 2 files changed, 59 insertions(+), 27 deletions(-)

diff --git a/frontend/test-client/src/agent/mock-agent.ts b/frontend/test-client/src/agent/mock-agent.ts
index 21163d52..2163a503 100644
--- a/frontend/test-client/src/agent/mock-agent.ts
+++ b/frontend/test-client/src/agent/mock-agent.ts
@@ -5,11 +5,14 @@ import type { RelativePath, SyncSettings } from "sync-client";
 import { LogLevel } from "sync-client";
 import { MockClient } from "./mock-client";
 import { sleep } from "../utils/sleep";
+import type { LogLine } from "sync-client/dist/types/tracing/logger";
 
 export class MockAgent extends MockClient {
 	private readonly writtenContents: string[] = [];
 	private readonly pendingActions: Promise<unknown>[] = [];
-	private doNotTouch: string[] = [];
+
+	// The renamed file finding algorithm isn't too smart so we can't both update and rename the same file
+	private doNotTouchWhileOffline: string[] = [];
 
 	public constructor(
 		initialSettings: Partial<SyncSettings>,
@@ -23,6 +26,11 @@ export class MockAgent extends MockClient {
 	public async init(): Promise<void> {
 		await super.init();
 
+		assert(
+			(await this.client.checkConnection()).isSuccessful,
+			"Connection check failed"
+		);
+
 		this.client.fetchImplementation = async (
 			input: string | URL | globalThis.Request,
 			init?: RequestInit
@@ -33,9 +41,12 @@ export class MockAgent extends MockClient {
 			return response;
 		};
 
-		this.client.logger.addOnMessageListener((message) => {
-			const formatted = `[${this.name}] ${message.timestamp.toISOString()} ${message.level} ${message.message}`;
-			switch (message.level) {
+		this.client.logger.addOnMessageListener((logLine: LogLine) => {
+			const state = this.client.settings.getSettings().isSyncEnabled
+				? "(online) "
+				: "(offline)";
+			const formatted = `[${this.name} ${state}] ${logLine.timestamp.toISOString()} ${logLine.level} ${logLine.message}`;
+			switch (logLine.level) {
 				case LogLevel.ERROR:
 					console.error(formatted);
 					// Let's not ignore errors
@@ -45,6 +56,17 @@ export class MockAgent extends MockClient {
 					console.warn(formatted);
 					break;
 				case LogLevel.INFO:
+					// HACK: we have to ensure the file has been synced if we want to change it offline without data loss
+					const result = /.*History entry: (.*.md).*/.exec(
+						logLine.message
+					);
+					if (result) {
+						this.doNotTouchWhileOffline =
+							this.doNotTouchWhileOffline.filter(
+								(file) => file !== result[1]
+							);
+					}
+
 					console.info(formatted);
 					break;
 				case LogLevel.DEBUG:
@@ -59,11 +81,18 @@ export class MockAgent extends MockClient {
 	public async act(): Promise<void> {
 		const options: (() => Promise<unknown>)[] = [
 			this.createFileAction.bind(this),
-			this.changeFetchChangesUpdateIntervalMsAction.bind(this),
-			this.disableSyncAction.bind(this),
-			this.enableSyncAction.bind(this)
+			this.changeFetchChangesUpdateIntervalMsAction.bind(this)
 		];
 
+		if (
+			this.client.settings.getSettings().isSyncEnabled &&
+			this.doNotTouchWhileOffline.length === 0
+		) {
+			options.push(this.disableSyncAction.bind(this));
+		} else {
+			options.push(this.enableSyncAction.bind(this));
+		}
+
 		const files = await this.listAllFiles();
 
 		if (files.length > 0) {
@@ -195,7 +224,11 @@ export class MockAgent extends MockClient {
 	private async createFileAction(): Promise<void> {
 		const file = this.getFileName();
 
-		if (this.doNotTouch.includes(file) || (await this.exists(file))) {
+		if (
+			(!this.client.settings.getSettings().isSyncEnabled &&
+				this.doNotTouchWhileOffline.includes(file)) ||
+			(await this.exists(file))
+		) {
 			return;
 		}
 
@@ -228,15 +261,17 @@ export class MockAgent extends MockClient {
 	private async enableSyncAction(): Promise<void> {
 		this.client.logger.info(`Decided to enable sync`);
 		await this.client.settings.setSetting("isSyncEnabled", true);
-		this.doNotTouch = [];
 	}
 
 	private async renameFileAction(files: RelativePath[]): Promise<void> {
 		const file = choose(files);
 
-		// We can't edit files offline that have been renamed while offline.
+		// We can't edit files offline that have been updated while offline.
 		// Otherwise, the resolution logic couldn't handle it.
-		if (this.doNotTouch.includes(file)) {
+		if (
+			!this.client.settings.getSettings().isSyncEnabled &&
+			this.doNotTouchWhileOffline.includes(file)
+		) {
 			this.client.logger.info(
 				`Skipping file ${file} because it has been updated while offline`
 			);
@@ -245,14 +280,16 @@ export class MockAgent extends MockClient {
 
 		const newName = this.getFileName();
 
-		if (this.doNotTouch.includes(newName) || (await this.exists(newName))) {
+		if (
+			(!this.client.settings.getSettings().isSyncEnabled &&
+				this.doNotTouchWhileOffline.includes(newName)) ||
+			(await this.exists(newName))
+		) {
 			return;
 		}
 
 		this.client.logger.info(`Decided to rename file ${file} to ${newName}`);
-		if (!this.client.settings.getSettings().isSyncEnabled) {
-			this.doNotTouch.push(file, newName);
-		}
+		this.doNotTouchWhileOffline.push(file, newName);
 
 		return this.rename(file, newName);
 	}
@@ -260,11 +297,14 @@ export class MockAgent extends MockClient {
 	private async updateFileAction(files: RelativePath[]): Promise<void> {
 		const file = choose(files);
 
-		// We can't edit files offline that have been renamed while offline.
+		// We can't edit files offline that have been updated while offline.
 		// Otherwise, the resolution logic couldn't handle it.
-		if (this.doNotTouch.includes(file)) {
+		if (
+			!this.client.settings.getSettings().isSyncEnabled &&
+			this.doNotTouchWhileOffline.includes(file)
+		) {
 			this.client.logger.info(
-				`Skipping file ${file} because it has been renamed while offline`
+				`Skipping file ${file} because it has been updated while offline`
 			);
 			return;
 		}
@@ -273,9 +313,7 @@ export class MockAgent extends MockClient {
 		this.client.logger.info(
 			`Decided to update file ${file} with ${content}`
 		);
-		if (!this.client.settings.getSettings().isSyncEnabled) {
-			this.doNotTouch.push(file);
-		}
+		this.doNotTouchWhileOffline.push(file);
 		await this.atomicUpdateText(file, (old) => old + `   |${content}|   `);
 	}
 
diff --git a/frontend/test-client/src/agent/mock-client.ts b/frontend/test-client/src/agent/mock-client.ts
index 83cec36b..e627eb78 100644
--- a/frontend/test-client/src/agent/mock-client.ts
+++ b/frontend/test-client/src/agent/mock-client.ts
@@ -4,7 +4,6 @@ import type {
 	SyncSettings
 } from "sync-client";
 import { SyncClient } from "sync-client";
-import { assert } from "../utils/assert";
 
 export class MockClient implements FileSystemOperations {
 	protected readonly localFiles = new Map<string, Uint8Array>();
@@ -29,11 +28,6 @@ export class MockClient implements FileSystemOperations {
 				);
 			})
 		);
-
-		assert(
-			(await this.client.checkConnection()).isSuccessful,
-			"Connection check failed"
-		);
 	}
 
 	public async listAllFiles(): Promise<RelativePath[]> {

From 453f33817b0b5dc09bc1754a9cce33c8f1973891 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 27 Feb 2025 22:27:10 +0000
Subject: [PATCH 275/761] Add ensureConsistency to DB

---
 .../sync-client/src/persistence/database.ts   | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/frontend/sync-client/src/persistence/database.ts b/frontend/sync-client/src/persistence/database.ts
index 1ac899e9..a013d9ac 100644
--- a/frontend/sync-client/src/persistence/database.ts
+++ b/frontend/sync-client/src/persistence/database.ts
@@ -17,6 +17,7 @@ export interface StoredDatabase {
 
 export class Database {
 	private documents = new Map<RelativePath, DocumentMetadata>();
+
 	private lastSeenUpdateId: VaultUpdateId | undefined;
 
 	public constructor(
@@ -32,6 +33,8 @@ export class Database {
 				this.documents.set(relativePath, metadata);
 			}
 		}
+		this.ensureConsistency();
+
 		this.logger.debug(`Loaded ${this.documents.size} documents`);
 
 		this.lastSeenUpdateId = initialState.lastSeenUpdateId;
@@ -128,9 +131,33 @@ export class Database {
 	}
 
 	private async save(): Promise<void> {
+		this.ensureConsistency();
 		await this.saveData({
 			documents: Object.fromEntries(this.documents.entries()),
 			lastSeenUpdateId: this.lastSeenUpdateId
 		});
 	}
+
+	private ensureConsistency(): void {
+		const allMetadata = Array.from(this.documents.entries());
+		const idToPath = new Map<string, Array<string>>();
+
+		allMetadata.forEach(([name, metadata]) => {
+			idToPath.set(metadata.documentId, [
+				...(idToPath.get(metadata.documentId) ?? []),
+				name
+			]);
+		});
+
+		const duplicates = Array.from(idToPath.entries())
+			.filter(([_, paths]) => paths.length > 1)
+			.map(([id, paths]) => `${id} (${paths.join(", ")})`);
+
+		if (duplicates.length > 0) {
+			throw new Error(
+				"Document IDs are not unique, found duplicates: " +
+					duplicates.join("; ")
+			);
+		}
+	}
 }

From 3b88f98fd9f4d670e1a728aec30f2f692effca09 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 27 Feb 2025 22:27:33 +0000
Subject: [PATCH 276/761] Update README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f163f4db..51440c31 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@
 
 ```sh 
 npm install -g openapi-typescript
-openapi-typescript http://localhost:3030/api.json --output plugin/src/services/types.ts
+openapi-typescript http://localhost:3030/api.json --output frontend/sync-client/src/services/types.ts
 ```
 
 ```

From ab5336f567cb92a1ea9f642f6c8ebf2c067ca4f8 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 1 Mar 2025 17:58:19 +0000
Subject: [PATCH 277/761] Purge no-op history events

---
 .../obsidian-plugin/src/views/history-view.ts | 10 +---------
 .../obsidian-plugin/src/views/settings-tab.ts | 19 -------------------
 .../sync-client/src/persistence/settings.ts   |  2 --
 .../sync-client/src/tracing/sync-history.ts   |  7 +------
 4 files changed, 2 insertions(+), 36 deletions(-)

diff --git a/frontend/obsidian-plugin/src/views/history-view.ts b/frontend/obsidian-plugin/src/views/history-view.ts
index 457836da..56c8d539 100644
--- a/frontend/obsidian-plugin/src/views/history-view.ts
+++ b/frontend/obsidian-plugin/src/views/history-view.ts
@@ -94,15 +94,7 @@ export class HistoryView extends ItemView {
 		container.empty();
 		container.createEl("h4", { text: "VaultLink History" });
 
-		const entries = this.client.history
-			.getEntries()
-			.reverse()
-			.filter(
-				(entry) =>
-					entry.status !== SyncStatus.NO_OP ||
-					this.client.settings.getSettings().displayNoopSyncEvents
-			);
-
+		const entries = this.client.history.getEntries().reverse();
 		entries.forEach((entry) => {
 			container.createDiv(
 				{
diff --git a/frontend/obsidian-plugin/src/views/settings-tab.ts b/frontend/obsidian-plugin/src/views/settings-tab.ts
index 5cd59426..b3a39dd7 100644
--- a/frontend/obsidian-plugin/src/views/settings-tab.ts
+++ b/frontend/obsidian-plugin/src/views/settings-tab.ts
@@ -291,25 +291,6 @@ export class SyncSettingsTab extends PluginSettingTab {
 	private renderViewSettings(containerEl: HTMLElement): void {
 		containerEl.createEl("h3", { text: "View" });
 
-		new Setting(containerEl)
-			.setName("Show no-op sync operations in history")
-			.setDesc(
-				"Enabling this will make the history view more verbose while also providing more explanation for the scyning choices made."
-			)
-			.addToggle((toggle) =>
-				toggle
-					.setValue(
-						this.syncClient.settings.getSettings()
-							.displayNoopSyncEvents
-					)
-					.onChange(async (value) =>
-						this.syncClient.settings.setSetting(
-							"displayNoopSyncEvents",
-							value
-						)
-					)
-			);
-
 		new Setting(containerEl)
 			.setName("Minimum log level")
 			.setDesc(
diff --git a/frontend/sync-client/src/persistence/settings.ts b/frontend/sync-client/src/persistence/settings.ts
index 75433b37..29a77ff7 100644
--- a/frontend/sync-client/src/persistence/settings.ts
+++ b/frontend/sync-client/src/persistence/settings.ts
@@ -8,7 +8,6 @@ export interface SyncSettings {
 	fetchChangesUpdateIntervalMs: number;
 	syncConcurrency: number;
 	isSyncEnabled: boolean;
-	displayNoopSyncEvents: boolean;
 	minimumLogLevel: LogLevel;
 	maxFileSizeMB: number;
 }
@@ -20,7 +19,6 @@ const DEFAULT_SETTINGS: SyncSettings = {
 	fetchChangesUpdateIntervalMs: 1000,
 	syncConcurrency: 1,
 	isSyncEnabled: false,
-	displayNoopSyncEvents: false,
 	minimumLogLevel: LogLevel.INFO,
 	maxFileSizeMB: 10
 };
diff --git a/frontend/sync-client/src/tracing/sync-history.ts b/frontend/sync-client/src/tracing/sync-history.ts
index a6523b5f..ea87bcac 100644
--- a/frontend/sync-client/src/tracing/sync-history.ts
+++ b/frontend/sync-client/src/tracing/sync-history.ts
@@ -21,7 +21,6 @@ export enum SyncSource {
 }
 
 export enum SyncStatus {
-	NO_OP = "NO_OP",
 	SUCCESS = "SUCCESS",
 	ERROR = "ERROR"
 }
@@ -83,15 +82,11 @@ export class SyncHistory {
 			this.logger.info(
 				`History entry: ${entry.relativePath} - ${entry.message}`
 			);
-		} else if (entry.status === SyncStatus.ERROR) {
+		} else {
 			this.status.error++;
 			this.logger.error(
 				`Error syncing file: ${entry.relativePath} - ${entry.message}`
 			);
-		} else {
-			this.logger.debug(
-				`No-op syncing file: ${entry.relativePath} - ${entry.message}`
-			);
 		}
 
 		this.syncHistoryUpdateListeners.forEach((listener) => {

From bcf48c428d580e6573719433b0eef22323d95113 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 1 Mar 2025 17:58:55 +0000
Subject: [PATCH 278/761] Log inside locks

---
 .../document-locks.test.ts                                 | 6 ++++--
 .../{sync-operations => file-operations}/document-locks.ts | 7 +++++++
 2 files changed, 11 insertions(+), 2 deletions(-)
 rename frontend/sync-client/src/{sync-operations => file-operations}/document-locks.test.ts (93%)
 rename frontend/sync-client/src/{sync-operations => file-operations}/document-locks.ts (84%)

diff --git a/frontend/sync-client/src/sync-operations/document-locks.test.ts b/frontend/sync-client/src/file-operations/document-locks.test.ts
similarity index 93%
rename from frontend/sync-client/src/sync-operations/document-locks.test.ts
rename to frontend/sync-client/src/file-operations/document-locks.test.ts
index ce661d02..1b8394ba 100644
--- a/frontend/sync-client/src/sync-operations/document-locks.test.ts
+++ b/frontend/sync-client/src/file-operations/document-locks.test.ts
@@ -1,12 +1,14 @@
+import { Logger } from "../tracing/logger";
 import type { RelativePath } from "../persistence/database";
 import { DocumentLocks } from "./document-locks";
 
 describe("Document lock", () => {
 	const testPath: RelativePath = "test/document/path";
-	let locks = new DocumentLocks();
+	const logger = new Logger();
+	let locks = new DocumentLocks(logger);
 
 	beforeEach(() => {
-		locks = new DocumentLocks();
+		locks = new DocumentLocks(logger);
 	});
 
 	test("should lock a document successfully", () => {
diff --git a/frontend/sync-client/src/sync-operations/document-locks.ts b/frontend/sync-client/src/file-operations/document-locks.ts
similarity index 84%
rename from frontend/sync-client/src/sync-operations/document-locks.ts
rename to frontend/sync-client/src/file-operations/document-locks.ts
index e8e0eb13..3dc7ec29 100644
--- a/frontend/sync-client/src/sync-operations/document-locks.ts
+++ b/frontend/sync-client/src/file-operations/document-locks.ts
@@ -1,15 +1,19 @@
+import type { Logger } from "../tracing/logger";
 import type { RelativePath } from "../persistence/database";
 
 export class DocumentLocks {
 	private readonly locked = new Set<RelativePath>();
 	private readonly waiters = new Map<RelativePath, (() => void)[]>();
 
+	public constructor(private readonly logger: Logger) {}
+
 	public tryLockDocument(relativePath: RelativePath): boolean {
 		if (this.locked.has(relativePath)) {
 			return false;
 		}
 
 		this.locked.add(relativePath);
+
 		return true;
 	}
 
@@ -20,6 +24,8 @@ export class DocumentLocks {
 			return Promise.resolve();
 		}
 
+		this.logger.debug(`Waiting for lock on ${relativePath}`);
+
 		return new Promise((resolve) => {
 			let waiting = this.waiters.get(relativePath);
 			if (!waiting) {
@@ -42,6 +48,7 @@ export class DocumentLocks {
 		const nextWaiting = this.waiters.get(relativePath)?.shift();
 
 		if (nextWaiting) {
+			this.logger.debug(`Granted lock on ${relativePath}`);
 			nextWaiting();
 		} else {
 			this.locked.delete(relativePath);

From 8b8f1d91d9437c153c2918b148752e9a91c41151 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 16 Mar 2025 20:13:49 +0000
Subject: [PATCH 279/761] Fix syncing when network latency is present (#4)

* WIP

* Add debug

* Dedupe inserts

* Add deterministic ordering

* Fix whitespaces

* Update insta

* Add integration test script

* Rename

* Add test

* Working for non-deletes

* omg it mostly works for deletes

* Isdeleted fix

* remove created dates

* update api

* Take document id

* No max attempt

* works

* Use string uuids

* .

* working!!!! (hopefully)

* Improve bundling

* Add module

* lint

* .

* lint

* Fix CI

* use toolchain

* clean up

* Add useSlowFileEvents

* Delete fuzz

* Fix CI

* use docker

* fix script

* clean up

* Clean up

* change node version

* Build docker image on every commit

* fix ci

* 1 db per vault

* Add scritps folder

* Bump versions

* Lint

* .

* Fix tests for real

* Style

* .

* try

* Consistent ordering

* Fix tests

* hmm

* .

* Clean up diff

* Fixes

* .

* Fix version bump

* .

* .

* .
---
 .github/workflows/check.yml                   |  13 +-
 .github/workflows/e2e.yml                     |  45 ++
 .github/workflows/publish-docker.yml          |  18 +-
 .github/workflows/publish-plugin.yml          |  16 +-
 .gitignore                                    |   1 +
 README.md                                     |  79 +-
 backend/Cargo.lock                            |  35 -
 backend/Cargo.toml                            |  17 +-
 backend/Dockerfile                            |   4 +-
 backend/fuzz/.gitignore                       |   4 -
 backend/fuzz/Cargo.toml                       |  25 -
 backend/fuzz/fuzz_targets/reconcile.rs        |   8 -
 backend/reconcile/src/diffs/myers.rs          |   7 +-
 backend/reconcile/src/diffs/raw_operation.rs  |  10 +-
 .../reconcile/src/operation_transformation.rs |  36 +-
 .../operation_transformation/edited_text.rs   |  24 +-
 .../operation_transformation/merge_context.rs |   8 +-
 .../src/operation_transformation/operation.rs |  53 +-
 ...ted_text__tests__calculate_operations.snap |  12 +-
 ...rd_tokenizer__tests__with_snapshots-2.snap |   6 +
 ...rd_tokenizer__tests__with_snapshots-3.snap |  15 +
 ...rd_tokenizer__tests__with_snapshots-4.snap |  23 +
 ...word_tokenizer__tests__with_snapshots.snap |  15 +
 backend/reconcile/src/tokenizer/token.rs      |  13 +-
 .../reconcile/src/tokenizer/word_tokenizer.rs |  47 +-
 backend/reconcile/src/utils.rs                |   2 +-
 .../src/utils/find_common_overlap.rs          |  71 --
 .../find_longest_prefix_contained_within.rs   | 103 +++
 backend/reconcile/src/utils/merge_iters.rs    |   3 +-
 .../reconcile/src/utils/ordered_operation.rs  |   2 +-
 backend/rust-toolchain.toml                   |   4 +
 backend/sync_lib/src/lib.rs                   |  46 +-
 backend/sync_lib/tests/web.rs                 |   3 +-
 backend/sync_server/src/config.rs             |   9 +-
 .../sync_server/src/config/database_config.rs |  18 +-
 .../sync_server/src/config/server_config.rs   |   9 +-
 backend/sync_server/src/consts.rs             |   2 +-
 backend/sync_server/src/database.rs           | 181 +++--
 .../migrations/20241207143519_bootstrap.sql   |  16 +-
 backend/sync_server/src/database/models.rs    |  14 +-
 backend/sync_server/src/errors.rs             |  17 +-
 backend/sync_server/src/server.rs             |  73 +-
 .../sync_server/src/server/create_document.rs |  38 +-
 .../sync_server/src/server/delete_document.rs |  14 +-
 .../src/server/fetch_document_version.rs      |  16 +-
 .../server/fetch_document_version_content.rs  |  16 +-
 .../server/fetch_latest_document_version.rs   |  16 +-
 .../src/server/fetch_latest_documents.rs      |   2 +-
 backend/sync_server/src/server/requests.rs    |  14 +-
 .../sync_server/src/server/update_document.rs |  30 +-
 frontend/obsidian-plugin/package.json         |   8 +-
 .../src/obisidan-event-handler.ts             |  11 +-
 .../obsidian-plugin/src/views/history-view.ts |   1 -
 .../obsidian-plugin/src/views/logs-view.ts    |   2 +-
 .../obsidian-plugin/src/views/settings-tab.ts |   2 +-
 .../obsidian-plugin/src/views/status-bar.ts   |   2 +-
 frontend/obsidian-plugin/webpack.config.js    |   3 -
 frontend/package-lock.json                    | 272 ++++---
 frontend/package.json                         |   8 +-
 frontend/sync-client/package.json             |  35 +-
 .../src/file-operations/document-locks.ts     |   3 +
 .../file-operations/file-operations.test.ts   |  23 +-
 .../src/file-operations/file-operations.ts    |  81 +--
 .../file-operations/filesystem-operations.ts  |   5 +-
 .../safe-filesystem-operations.ts             | 109 ++-
 .../sync-client/src/persistence/database.ts   | 301 +++++---
 .../sync-client/src/persistence/settings.ts   |   4 +-
 .../src/services/connected-state.ts           |  51 ++
 .../sync-client/src/services/sync-service.ts  |  45 +-
 frontend/sync-client/src/services/types.ts    |  36 +-
 frontend/sync-client/src/sync-client.ts       |  28 +-
 .../sync-client/src/sync-operations/syncer.ts | 415 ++++++-----
 .../sync-operations/unrestricted-syncer.ts    | 687 +++++++-----------
 .../sync-client/src/tracing/sync-history.ts   |   2 +-
 .../sync-client/src/utils/create-promise.ts   |  15 +
 .../utils/find-matching-file-based-on-hash.ts |  13 -
 .../src/utils/find-matching-file.ts           |  14 +
 frontend/sync-client/src/utils/hash.ts        |   2 +-
 .../sync-client/src/utils/retried-fetch.ts    |   3 +-
 frontend/sync-client/tsconfig.json            |   9 +-
 frontend/sync-client/webpack.config.js        |  56 +-
 frontend/test-client/package.json             |   8 +-
 frontend/test-client/src/agent/mock-agent.ts  |  61 +-
 frontend/test-client/src/agent/mock-client.ts |  89 ++-
 frontend/test-client/src/cli.ts               |  81 ++-
 frontend/test-client/webpack.config.js        |   3 +-
 frontend/manifest.json => manifest.json       |   0
 bump-version.sh => scripts/bump-version.sh    |  10 +-
 scripts/clean-up.sh                           |   4 +
 scripts/e2e.sh                                |  79 ++
 scripts/update-api-types.sh                   |   4 +
 91 files changed, 2252 insertions(+), 1586 deletions(-)
 create mode 100644 .github/workflows/e2e.yml
 delete mode 100644 backend/fuzz/.gitignore
 delete mode 100644 backend/fuzz/Cargo.toml
 delete mode 100644 backend/fuzz/fuzz_targets/reconcile.rs
 create mode 100644 backend/reconcile/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots-2.snap
 create mode 100644 backend/reconcile/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots-3.snap
 create mode 100644 backend/reconcile/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots-4.snap
 create mode 100644 backend/reconcile/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots.snap
 delete mode 100644 backend/reconcile/src/utils/find_common_overlap.rs
 create mode 100644 backend/reconcile/src/utils/find_longest_prefix_contained_within.rs
 create mode 100644 backend/rust-toolchain.toml
 create mode 100644 frontend/sync-client/src/services/connected-state.ts
 create mode 100644 frontend/sync-client/src/utils/create-promise.ts
 delete mode 100644 frontend/sync-client/src/utils/find-matching-file-based-on-hash.ts
 create mode 100644 frontend/sync-client/src/utils/find-matching-file.ts
 rename frontend/manifest.json => manifest.json (100%)
 rename bump-version.sh => scripts/bump-version.sh (84%)
 create mode 100755 scripts/clean-up.sh
 create mode 100755 scripts/e2e.sh
 create mode 100755 scripts/update-api-types.sh

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 35e18428..5acccc1f 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -17,11 +17,14 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Setup
+      - name: Setup Node.js environment
+        uses: actions/setup-node@v4.2.0
+        with:
+          node-version: "22.x"
+          check-latest: true
+
+      - name: Setup rust
         run: |
-          rustup install nightly
-          rustup default nightly
-          rustup component add clippy rustfmt
           cargo install sqlx-cli
           cd backend
           sqlx database create --database-url sqlite://db.sqlite3
@@ -44,7 +47,7 @@ jobs:
           cd backend
           cargo test --verbose
           cd sync_lib
-          # wasm-pack test --node # todo: fix this in CI
+          wasm-pack test --node
 
       - name: Lint frontend
         run: |
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
new file mode 100644
index 00000000..dd2fe5d9
--- /dev/null
+++ b/.github/workflows/e2e.yml
@@ -0,0 +1,45 @@
+name: E2E tests
+
+on:
+  push:
+    branches: ["master"]
+  pull_request:
+    branches: ["master"]
+
+env:
+  CARGO_TERM_COLOR: always
+  RUSTFLAGS: "-Dwarnings"
+
+jobs:
+  build:
+    runs-on: self-hosted
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup Node.js environment
+        uses: actions/setup-node@v4.2.0
+        with:
+          node-version: "22.x"
+          check-latest: true
+
+      - name: Setup rust
+        run: |
+          cargo install sqlx-cli wasm-pack
+          cd backend
+          sqlx database create --database-url sqlite://db.sqlite3
+          sqlx migrate run --source sync_server/src/database/migrations --database-url sqlite://db.sqlite3
+
+      - name: Build wasm
+        run: |
+          cd backend
+          wasm-pack build --target web sync_lib
+
+      - name: E2E tests
+        run: |
+          cd backend
+          RUST_BACKTRACE=1 cargo run -p sync_server &
+          cd ../frontend
+          npm ci
+          cd ..
+          scripts/e2e.sh 32
diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml
index 993c03db..14516a66 100644
--- a/.github/workflows/publish-docker.yml
+++ b/.github/workflows/publish-docker.yml
@@ -7,8 +7,9 @@ name: Publish server Docker image
 
 on:
   push:
-    tags:
-      - "*"
+    branches: ["master"]
+  pull_request:
+    branches: ["master"]
 
 env:
   # Use docker.io for Docker Hub if empty
@@ -17,8 +18,9 @@ env:
   IMAGE_NAME: ${{ github.repository }}
 
 jobs:
-  build-docker:
-    runs-on: ubuntu-latest
+  publish-docker:
+    runs-on: self-hosted
+
     permissions:
       contents: read
       packages: write
@@ -33,7 +35,7 @@ jobs:
       # Install the cosign tool except on PR
       # https://github.com/sigstore/cosign-installer
       - name: Install cosign
-        if: github.event_name != 'pull_request'
+        if: ${{ github.ref_type == 'tag' }}
         uses: sigstore/cosign-installer@59acb6260d9c0ba8f4a2f9d9b48431a222b68e20 #v3.5.0
         with:
           cosign-release: "v2.2.4"
@@ -47,7 +49,7 @@ jobs:
       # Login against a Docker registry except on PR
       # https://github.com/docker/login-action
       - name: Log into registry ${{ env.REGISTRY }}
-        if: github.event_name != 'pull_request'
+        if: ${{ github.ref_type == 'tag' }}
         uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
         with:
           registry: ${{ env.REGISTRY }}
@@ -69,7 +71,7 @@ jobs:
         uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
         with:
           context: backend
-          push: ${{ github.event_name != 'pull_request' }}
+          push: ${{ github.ref_type == 'tag' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
@@ -81,7 +83,7 @@ jobs:
       # transparency data even for private images, pass --force to cosign below.
       # https://github.com/sigstore/cosign
       - name: Sign the published Docker image
-        if: ${{ github.event_name != 'pull_request' }}
+        if: ${{ github.ref_type == 'tag' }}
         env:
           # https://docs.github.com/en/actions/security-guides/security-hardening-for-github-actions#using-an-intermediate-environment-variable
           TAGS: ${{ steps.meta.outputs.tags }}
diff --git a/.github/workflows/publish-plugin.yml b/.github/workflows/publish-plugin.yml
index f1c816ff..19bcc788 100644
--- a/.github/workflows/publish-plugin.yml
+++ b/.github/workflows/publish-plugin.yml
@@ -2,29 +2,27 @@ name: Publish Obsidian plugin
 
 on:
   push:
-    tags:
-      - "*"
+    tags: ["*"]
 
 env:
   CARGO_TERM_COLOR: always
 
 jobs:
-  build-plugin:
+  publish-plugin:
     runs-on: self-hosted
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - name: Use Node.js
-        uses: actions/setup-node@v3
+      - name: Setup Node.js environment
+        uses: actions/setup-node@v4.2.0
         with:
-          node-version: "18.x"
+          node-version: "22.x"
+          check-latest: true
 
       - name: Build wasm
         run: |
           cd backend
-          rustup install nightly
-          rustup default nightly
           cargo install wasm-pack
           wasm-pack build --target web sync_lib
 
diff --git a/.gitignore b/.gitignore
index 41188af7..d2a83679 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@ backend/target
 frontend/*/dist
 
 backend/db.sqlite3*
+backend/databases
 backend/config.yml
 
 *.log
diff --git a/README.md b/README.md
index 51440c31..6ad857e0 100644
--- a/README.md
+++ b/README.md
@@ -1,65 +1,56 @@
-## VaultLink self-hosted Obsidian sync plugin
+# VaultLink self-hosted Obsidian plugin for file syncing
 
 [![Check](https://github.com/schmelczer/vault-link/actions/workflows/check.yml/badge.svg)](https://github.com/schmelczer/vault-link/actions/workflows/check.yml)
+[![E2E tests](https://github.com/schmelczer/vault-link/actions/workflows/e2e.yml/badge.svg)](https://github.com/schmelczer/vault-link/actions/workflows/e2e.yml)
 [![Publish server Docker image](https://github.com/schmelczer/vault-link/actions/workflows/publish-docker.yml/badge.svg)](https://github.com/schmelczer/vault-link/actions/workflows/publish-docker.yml)
 [![Publish Obsidian plugin](https://github.com/schmelczer/vault-link/actions/workflows/publish-plugin.yml/badge.svg)](https://github.com/schmelczer/vault-link/actions/workflows/publish-plugin.yml)
 
 
-## Install [nvm](https://github.com/nvm-sh/nvm)
+## Develop
+
+### Install [nvm](https://github.com/nvm-sh/nvm)
 
 - `curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | bash`
-- `nvm install 20`
-- `nvm use 20`
-- Optionally set the system-wide default: `nvm alias default 20`
+- `nvm install 22`
+- `nvm use 22`
+- Optionally set the system-wide default: `nvm alias default 22`
 
 
-## Set up Rust
+### Set up Rust
 
 - Install [`rustup`](https://rustup.rs): `curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh`
-- `sudo apt install llvm -y`
-- `rustup self update`
-- `rustup update`
-- `rustup install nightly`
-- `rustup default nightly`
-- `rustup component add llvm-tools-preview`
-- `cargo install cargo-generate cargo-fuzz cargo-insta rustfilt cargo-binutils`
 - Install [`wasm-pack`](https://rustwasm.github.io/wasm-pack/installer): `curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh`
 - `cargo install cargo-insta sqlx-cli cargo-edit`
 
-
-## Publish new version 
+### Install Obsidian on Linux
 
 ```sh
-./bump-version.sh patch
-```
-
-
-## Update HTTP API TS bindings
-
-```sh 
-npm install -g openapi-typescript
-openapi-typescript http://localhost:3030/api.json --output frontend/sync-client/src/services/types.ts
-```
-
-```
-
-todo: enable
-[workspace.lints.clippy]
-single_call_fn = { level = "allow", priority = 1 }
-absolute_paths = { level = "allow", priority = 1 }
-arithmetic_side_effects = { level = "allow", priority = 1 }
-similar_names = { level = "allow", priority = 1 }
-self_named_module_files = { level = "allow", priority = 1 }
-single_char_lifetime_names = { level = "allow", priority = 1 }
-missing_docs_in_private_items = { level = "allow", priority = 1 }
-question_mark_used =  { level = "allow", priority = 1 }
-implicit_return = { level = "allow", priority = 1 }
-pedantic = { level = "warn", priority = 0 }
-cargo = { level = "warn", priority = 0 }
-
-```
-
 apt install flatpak
 flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
 flatpak install flathub md.obsidian.Obsidian
 flatpak run md.obsidian.Obsidian
+```
+
+### Scripts
+
+#### Update HTTP API TS bindings
+
+```sh 
+scripts/update-api-types.sh
+```
+
+#### Publish new version 
+
+```sh
+scripts/bump-version.sh patch
+```
+
+
+#### Run E2E tests
+
+```sh 
+scripts/e2e.sh
+```
+
+And to clean up the logs & database files, run `scripts/clean-up.sh`
+```
diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 3cce7cfc..8eddadf5 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -105,12 +105,6 @@ dependencies = [
  "backtrace",
 ]
 
-[[package]]
-name = "arbitrary"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223"
-
 [[package]]
 name = "async-trait"
 version = "0.1.85"
@@ -381,8 +375,6 @@ version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f34d93e62b03caf570cccc334cbc6c2fceca82f39211051345108adcba3eebdc"
 dependencies = [
- "jobserver",
- "libc",
  "shlex",
 ]
 
@@ -1228,15 +1220,6 @@ version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
 
-[[package]]
-name = "jobserver"
-version = "0.1.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "js-sys"
 version = "0.3.76"
@@ -1290,16 +1273,6 @@ version = "0.2.167"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09d6582e104315a817dff97f75133544b2e094ee22447d2acf4a74e189ba06fc"
 
-[[package]]
-name = "libfuzzer-sys"
-version = "0.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b9569d2f74e257076d8c6bfa73fb505b46b851e51ddaecc825944aa3bed17fa"
-dependencies = [
- "arbitrary",
- "cc",
-]
-
 [[package]]
 name = "libm"
 version = "0.2.11"
@@ -1781,14 +1754,6 @@ dependencies = [
  "test-case",
 ]
 
-[[package]]
-name = "reconcile-fuzz"
-version = "0.0.30"
-dependencies = [
- "libfuzzer-sys",
- "reconcile",
-]
-
 [[package]]
 name = "redox_syscall"
 version = "0.5.7"
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index cfb865a0..5c3768a5 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -2,7 +2,6 @@
 resolver = "2"
 members = [
     "reconcile",
-    "fuzz",
     "sync_server", 
     "sync_lib"
 ]
@@ -57,3 +56,19 @@ uninlined_format_args = "warn"
 unnested_or_patterns = "warn"
 unused_self = "warn"
 verbose_file_reads = "warn"
+
+cast_possible_truncation = { level = "allow", priority = 1 }
+doc_link_with_quotes = { level = "allow", priority = 1 }
+cast_sign_loss = { level = "allow", priority = 1 }
+cast_possible_wrap = { level = "allow", priority = 1 }
+struct_field_names = { level = "allow", priority = 1 }
+single_call_fn = { level = "allow", priority = 1 }
+absolute_paths = { level = "allow", priority = 1 }
+arithmetic_side_effects = { level = "allow", priority = 1 }
+similar_names = { level = "allow", priority = 1 }
+self_named_module_files = { level = "allow", priority = 1 }
+single_char_lifetime_names = { level = "allow", priority = 1 }
+missing_docs_in_private_items = { level = "allow", priority = 1 }
+question_mark_used =  { level = "allow", priority = 1 }
+implicit_return = { level = "allow", priority = 1 }
+pedantic = { level = "warn", priority = 0 }
diff --git a/backend/Dockerfile b/backend/Dockerfile
index 8d2fdc46..24388c7f 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -3,8 +3,6 @@ FROM rust:1.83 AS builder
 WORKDIR /usr/src/backend
 
 RUN apt update && apt install -y musl-tools
-RUN rustup install nightly && rustup default nightly
-RUN rustup target add x86_64-unknown-linux-musl
 RUN cargo install sqlx-cli
 
 COPY . .
@@ -23,7 +21,7 @@ RUN apk add --no-cache curl
 
 COPY --from=builder /usr/src/backend/target/x86_64-unknown-linux-musl/release/sync_server /app/sync_server
 
-VOLUME /data
+VOLUME /data/databases
 EXPOSE 3000/tcp
 
 WORKDIR /data
diff --git a/backend/fuzz/.gitignore b/backend/fuzz/.gitignore
deleted file mode 100644
index 1a45eee7..00000000
--- a/backend/fuzz/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-target
-corpus
-artifacts
-coverage
diff --git a/backend/fuzz/Cargo.toml b/backend/fuzz/Cargo.toml
deleted file mode 100644
index d764ba40..00000000
--- a/backend/fuzz/Cargo.toml
+++ /dev/null
@@ -1,25 +0,0 @@
-[package]
-name = "reconcile-fuzz"
-version.workspace = true
-edition.workspace = true
-authors.workspace = true
-license.workspace = true
-repository.workspace = true
-publish = false
-
-[package.metadata]
-cargo-fuzz = true
-
-[dependencies]
-libfuzzer-sys = "0.4"
-reconcile = { path = "../reconcile" }
-
-[[bin]]
-name = "reconcile"
-path = "fuzz_targets/reconcile.rs"
-test = false
-doc = false
-bench = false
-
-[lints]
-workspace = true
diff --git a/backend/fuzz/fuzz_targets/reconcile.rs b/backend/fuzz/fuzz_targets/reconcile.rs
deleted file mode 100644
index b30d9f57..00000000
--- a/backend/fuzz/fuzz_targets/reconcile.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-#![no_main]
-
-use libfuzzer_sys::fuzz_target;
-
-fuzz_target!(|texts: (String, String, String)| {
-    let (original, left, right) = texts;
-    let _ = reconcile::reconcile(&original, &left, &right);
-});
diff --git a/backend/reconcile/src/diffs/myers.rs b/backend/reconcile/src/diffs/myers.rs
index e2f44989..9692c221 100644
--- a/backend/reconcile/src/diffs/myers.rs
+++ b/backend/reconcile/src/diffs/myers.rs
@@ -38,7 +38,7 @@ use crate::{
 /// execution time permitted before it bails and falls back to an approximation.
 pub fn diff<T>(old: &[Token<T>], new: &[Token<T>]) -> Vec<RawOperation<T>>
 where
-    T: PartialEq + Clone,
+    T: PartialEq + Clone + std::fmt::Debug,
 {
     let max_d = (old.len() + new.len()).div_ceil(2) + 1;
     let mut vb = V::new(max_d);
@@ -99,7 +99,6 @@ impl IndexMut<isize> for V {
     }
 }
 
-#[inline(always)]
 fn split_at(range: Range<usize>, at: usize) -> (Range<usize>, Range<usize>) {
     (range.start..at, at..range.end)
 }
@@ -124,7 +123,7 @@ fn find_middle_snake<T>(
     vb: &mut V,
 ) -> Option<(usize, usize)>
 where
-    T: PartialEq + Clone,
+    T: PartialEq + Clone + std::fmt::Debug,
 {
     let n = old_range.len();
     let m = new_range.len();
@@ -230,7 +229,7 @@ fn conquer<T>(
     vb: &mut V,
     result: &mut Vec<RawOperation<T>>,
 ) where
-    T: PartialEq + Clone,
+    T: PartialEq + Clone + std::fmt::Debug,
 {
     // Check for common prefix
     let common_prefix_len = common_prefix_len(old, old_range.clone(), new, new_range.clone());
diff --git a/backend/reconcile/src/diffs/raw_operation.rs b/backend/reconcile/src/diffs/raw_operation.rs
index 280460f6..0df48f5d 100644
--- a/backend/reconcile/src/diffs/raw_operation.rs
+++ b/backend/reconcile/src/diffs/raw_operation.rs
@@ -3,7 +3,7 @@ use crate::tokenizer::token::Token;
 #[derive(Debug, Clone, PartialEq)]
 pub enum RawOperation<T>
 where
-    T: PartialEq + Clone,
+    T: PartialEq + Clone + std::fmt::Debug,
 {
     Insert(Vec<Token<T>>),
     Delete(Vec<Token<T>>),
@@ -12,13 +12,13 @@ where
 
 impl<T> RawOperation<T>
 where
-    T: PartialEq + Clone,
+    T: PartialEq + Clone + std::fmt::Debug,
 {
     pub fn tokens(&self) -> &Vec<Token<T>> {
         match self {
-            RawOperation::Insert(tokens) => tokens,
-            RawOperation::Delete(tokens) => tokens,
-            RawOperation::Equal(tokens) => tokens,
+            RawOperation::Insert(tokens)
+            | RawOperation::Delete(tokens)
+            | RawOperation::Equal(tokens) => tokens,
         }
     }
 
diff --git a/backend/reconcile/src/operation_transformation.rs b/backend/reconcile/src/operation_transformation.rs
index ef9a5e81..a71bc65a 100644
--- a/backend/reconcile/src/operation_transformation.rs
+++ b/backend/reconcile/src/operation_transformation.rs
@@ -37,7 +37,7 @@ pub fn reconcile_with_tokenizer<F, T>(
     tokenizer: &Tokenizer<T>,
 ) -> String
 where
-    T: PartialEq + Clone,
+    T: PartialEq + Clone + std::fmt::Debug,
 {
     let left_operations = EditedText::from_strings_with_tokenizer(original, left, tokenizer);
     let right_operations = EditedText::from_strings_with_tokenizer(original, right, tokenizer);
@@ -73,7 +73,8 @@ mod test {
             "original_1 edit_1 original_3",
         );
 
-        // One deleted a large range, the other deleted subranges and inserted as well
+        // One deleted a large range, the other deleted subranges and inserted as
+        // well
         test_merge_both_ways(
             "original_1 original_2 original_3 original_4 original_5",
             "original_1 original_5",
@@ -120,9 +121,6 @@ mod test {
             "hi, my friend!",
         );
 
-        // test_merge_both_ways("hello world", "world !", "hi hello world", "hi world
-        // !");
-
         test_merge_both_ways(
             "both delete the same word",
             "both the same word",
@@ -147,7 +145,33 @@ mod test {
         );
     }
 
-    #[ignore = "it's too slow"]
+    #[test]
+    fn test_reconcile_idempotent_inserts() {
+        // Both inserted the same prefix; this should get deduped
+        test_merge_both_ways(
+            "hi ",
+            "hi there ",
+            "hi there my friend ",
+            "hi there my friend ",
+        );
+
+        // The prefix of the 2nd appears on the 1st so it shouldn't get duplicated
+        test_merge_both_ways(
+            "hi ",
+            "hi there you ",
+            "hi there my friend ",
+            "hi there my friend you ",
+        );
+
+        test_merge_both_ways("a", "a b c", "a b c d", "a b c d");
+
+        test_merge_both_ways(
+            "      |7ca2b36d-6ee7-49eb-8eb1-d77e4cc1a001|   ",
+              "      |7ca2b36d-6ee7-49eb-8eb1-d77e4cc1a001|      |cd9195cc-103a-4f13-90c8-4fba0ba421ee|      |d39156cc-cfd6-42a8-b70a-75020896069d|      |fbad794c-9c47-41f2-a343-490284ecb5a0|      |dup|   ",
+             "       |7ca2b36d-6ee7-49eb-8eb1-d77e4cc1a001|      |cd9195cc-103a-4f13-90c8-4fba0ba421ee|      |dup|   ",
+            "      |7ca2b36d-6ee7-49eb-8eb1-d77e4cc1a001|      |cd9195cc-103a-4f13-90c8-4fba0ba421ee|      |d39156cc-cfd6-42a8-b70a-75020896069d|      |fbad794c-9c47-41f2-a343-490284ecb5a0|      |dup|      |dup|   ");
+    }
+
     #[test_matrix( [
         "pride_and_prejudice.txt",
         "romeo_and_juliet.txt",
diff --git a/backend/reconcile/src/operation_transformation/edited_text.rs b/backend/reconcile/src/operation_transformation/edited_text.rs
index 32bda1b2..8a7013e4 100644
--- a/backend/reconcile/src/operation_transformation/edited_text.rs
+++ b/backend/reconcile/src/operation_transformation/edited_text.rs
@@ -25,7 +25,7 @@ use crate::{
 #[derive(Debug, Clone, PartialEq, Default)]
 pub struct EditedText<'a, T>
 where
-    T: PartialEq + Clone,
+    T: PartialEq + Clone + std::fmt::Debug,
 {
     text: &'a str,
     operations: Vec<OrderedOperation<T>>,
@@ -46,7 +46,7 @@ impl<'a> EditedText<'a, String> {
 
 impl<'a, T> EditedText<'a, T>
 where
-    T: PartialEq + Clone,
+    T: PartialEq + Clone + std::fmt::Debug,
 {
     /// Create an `EditedText` from the given original (old) and updated (new)
     /// strings. The returned `EditedText` represents the changes from the
@@ -65,7 +65,6 @@ where
 
         Self::new(
             original,
-            // Self::cook_operations(diff),
             Self::cook_operations(Self::elongate_operations(diff)).collect(),
         )
     }
@@ -191,7 +190,7 @@ where
     pub fn merge(self, other: Self) -> Self {
         debug_assert_eq!(
             self.text, other.text,
-            "EditedText-s must be derived from the same text to be mergable"
+            "`EditedText`-s must be derived from the same text to be mergable"
         );
 
         let mut left_merge_context = MergeContext::default();
@@ -207,9 +206,21 @@ where
                     |(operation, _)| {
                         (
                             operation.order,
-                            // Operations on left and right must come in the same order so that
+                            // Operations on the left and right must come in the same order so that
                             // inserts can be merged with other inserts and deletes with deletes.
                             usize::from(matches!(operation.operation, Operation::Delete { .. })),
+                            // Make sure that the ordering is deterministic regardless which text
+                            // is left or right.
+                            match &operation.operation {
+                                Operation::Insert { text, .. } => text
+                                    .iter()
+                                    .map(super::super::tokenizer::token::Token::original)
+                                    .collect::<String>(),
+                                Operation::Delete {
+                                    deleted_character_count,
+                                    ..
+                                } => deleted_character_count.to_string(),
+                            },
                         )
                     },
                 )
@@ -232,6 +243,7 @@ where
     }
 
     /// Apply the operations to the text and return the resulting text.
+    #[must_use]
     pub fn apply(&self) -> String {
         let mut builder: StringBuilder<'_> = StringBuilder::new(self.text);
 
@@ -282,7 +294,7 @@ mod tests {
         let original = "hello world! ...";
         let left = "Hello world! I'm Andras.";
         let right = "Hello world! How are you?";
-        let expected = "Hello world! I'm Andras.How are you?";
+        let expected = "Hello world! How are you? I'm Andras.";
 
         let operations_1 = EditedText::from_strings(original, left);
         let operations_2 = EditedText::from_strings(original, right);
diff --git a/backend/reconcile/src/operation_transformation/merge_context.rs b/backend/reconcile/src/operation_transformation/merge_context.rs
index 0bc3c34a..980389df 100644
--- a/backend/reconcile/src/operation_transformation/merge_context.rs
+++ b/backend/reconcile/src/operation_transformation/merge_context.rs
@@ -5,7 +5,7 @@ use crate::operation_transformation::Operation;
 #[derive(Clone)]
 pub struct MergeContext<T>
 where
-    T: PartialEq + Clone,
+    T: PartialEq + Clone + std::fmt::Debug,
 {
     last_operation: Option<Operation<T>>,
     pub shift: i64,
@@ -13,7 +13,7 @@ where
 
 impl<T> Default for MergeContext<T>
 where
-    T: PartialEq + Clone,
+    T: PartialEq + Clone + std::fmt::Debug,
 {
     fn default() -> Self {
         MergeContext {
@@ -25,7 +25,7 @@ where
 
 impl<T> Debug for MergeContext<T>
 where
-    T: PartialEq + Clone,
+    T: PartialEq + Clone + std::fmt::Debug,
 {
     fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
         f.debug_struct("MergeContext")
@@ -37,7 +37,7 @@ where
 
 impl<T> MergeContext<T>
 where
-    T: PartialEq + Clone,
+    T: PartialEq + Clone + std::fmt::Debug,
 {
     pub fn last_operation(&self) -> Option<&Operation<T>> { self.last_operation.as_ref() }
 
diff --git a/backend/reconcile/src/operation_transformation/operation.rs b/backend/reconcile/src/operation_transformation/operation.rs
index c19265b5..d0d285b0 100644
--- a/backend/reconcile/src/operation_transformation/operation.rs
+++ b/backend/reconcile/src/operation_transformation/operation.rs
@@ -1,7 +1,5 @@
-use core::{
-    fmt::{Debug, Display},
-    ops::Range,
-};
+use core::fmt::{Debug, Display};
+use std::ops::Range;
 
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
@@ -9,7 +7,10 @@ use serde::{Deserialize, Serialize};
 use super::merge_context::MergeContext;
 use crate::{
     Token,
-    utils::{find_common_overlap::find_common_overlap, string_builder::StringBuilder},
+    utils::{
+        find_longest_prefix_contained_within::find_longest_prefix_contained_within,
+        string_builder::StringBuilder,
+    },
 };
 
 /// Represents a change that can be applied to a text document.
@@ -19,7 +20,7 @@ use crate::{
 #[derive(Clone, PartialEq)]
 pub enum Operation<T>
 where
-    T: PartialEq + Clone,
+    T: PartialEq + Clone + std::fmt::Debug,
 {
     Insert {
         index: usize,
@@ -37,7 +38,7 @@ where
 
 impl<T> Operation<T>
 where
-    T: PartialEq + Clone,
+    T: PartialEq + Clone + std::fmt::Debug,
 {
     /// Creates an insert operation with the given index and text.
     /// If the text is empty (meaning that the operation would be a no-op),
@@ -81,15 +82,8 @@ where
         })
     }
 
-    /// Tries to apply the operation to the given `ropey::Rope` text, returning
-    /// the modified text.
-    ///
-    /// # Errors
-    ///
-    /// Returns a `SyncLibError::OperationApplicationError` if the operation
-    /// cannot be applied.
-    ///
-    /// # Panics
+    /// Applies the operation to the given `StringBuilder`, returning the
+    /// modified `StringBuilder`.
     ///
     /// When compiled in debug mode, panics if a delete operation is attempted
     /// on a range of text that does not match the text to be deleted.
@@ -114,7 +108,7 @@ where
 
                 builder.delete(self.range());
             }
-        };
+        }
 
         builder
     }
@@ -122,8 +116,7 @@ where
     /// Returns the index of the first character that the operation affects.
     pub fn start_index(&self) -> usize {
         match self {
-            Operation::Insert { index, .. } => *index,
-            Operation::Delete { index, .. } => *index,
+            Operation::Insert { index, .. } | Operation::Delete { index, .. } => *index,
         }
     }
 
@@ -137,6 +130,7 @@ where
     }
 
     /// Returns the range of indices of characters that the operation affects.
+    #[allow(clippy::range_plus_one)]
     pub fn range(&self) -> Range<usize> { self.start_index()..self.end_index() + 1 }
 
     /// Returns the number of affected characters. It is always greater than 0
@@ -212,17 +206,20 @@ where
                     ..
                 }),
             ) => {
-                let offset_in_tokens = find_common_overlap(previous_inserted_text, &text);
-                let trimmed_length_in_tokens = previous_inserted_text.len() - offset_in_tokens;
-                let trimmed_length = previous_inserted_text
+                // In case the current insert's prefix appears in the previously inserted text,
+                // we can trim the current insert to only include the non-overlapping part.
+                // This way, we don't end up duplicating text.
+                let offset_in_tokens =
+                    find_longest_prefix_contained_within(previous_inserted_text, &text);
+                let offset_in_length = text
                     .iter()
-                    .skip(offset_in_tokens)
+                    .take(offset_in_tokens)
                     .map(Token::get_original_length)
                     .sum::<usize>();
                 let trimmed_operation =
-                    Operation::create_insert(index, text[trimmed_length_in_tokens..].to_vec());
+                    Operation::create_insert(index, text[offset_in_tokens..].to_vec());
 
-                affecting_context.shift -= trimmed_length as i64;
+                affecting_context.shift -= offset_in_length as i64;
                 produced_context.shift += trimmed_operation
                     .as_ref()
                     .map(Operation::len)
@@ -297,7 +294,7 @@ where
 
 impl<T> Display for Operation<T>
 where
-    T: PartialEq + Clone,
+    T: PartialEq + Clone + std::fmt::Debug,
 {
     fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
         match self {
@@ -341,7 +338,7 @@ where
 
 impl<T> Debug for Operation<T>
 where
-    T: PartialEq + Clone,
+    T: PartialEq + Clone + std::fmt::Debug,
 {
     fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { write!(f, "{self}") }
 }
@@ -353,7 +350,7 @@ mod tests {
     use super::*;
 
     #[test]
-    #[should_panic]
+    #[should_panic(expected = "Shifted index must be non-negative")]
     fn test_shifting_error() {
         insta::assert_debug_snapshot!(
             Operation::create_insert(1, vec!["hi".into()])
diff --git a/backend/reconcile/src/operation_transformation/snapshots/reconcile__operation_transformation__edited_text__tests__calculate_operations.snap b/backend/reconcile/src/operation_transformation/snapshots/reconcile__operation_transformation__edited_text__tests__calculate_operations.snap
index e8a04870..0630f986 100644
--- a/backend/reconcile/src/operation_transformation/snapshots/reconcile__operation_transformation__edited_text__tests__calculate_operations.snap
+++ b/backend/reconcile/src/operation_transformation/snapshots/reconcile__operation_transformation__edited_text__tests__calculate_operations.snap
@@ -8,19 +8,19 @@ EditedText {
     operations: [
         OrderedOperation {
             order: 0,
-            operation: <insert 'Hello, my friend! ' from index 0>,
+            operation: <insert 'Hello, my friend!' from index 0>,
         },
         OrderedOperation {
             order: 0,
-            operation: <delete 'hello world! ' from index 18>,
+            operation: <delete 'hello world!' from index 17>,
         },
         OrderedOperation {
-            order: 21,
-            operation: <insert 'you doing? Albert' from index 26>,
+            order: 20,
+            operation: <insert ' you doing? Albert' from index 25>,
         },
         OrderedOperation {
-            order: 21,
-            operation: <delete 'you?  Adam' from index 43>,
+            order: 20,
+            operation: <delete ' you?  Adam' from index 43>,
         },
     ],
 }
diff --git a/backend/reconcile/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots-2.snap b/backend/reconcile/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots-2.snap
new file mode 100644
index 00000000..892e524c
--- /dev/null
+++ b/backend/reconcile/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots-2.snap
@@ -0,0 +1,6 @@
+---
+source: reconcile/src/tokenizer/word_tokenizer.rs
+expression: "word_tokenizer(\"\")"
+snapshot_kind: text
+---
+[]
diff --git a/backend/reconcile/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots-3.snap b/backend/reconcile/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots-3.snap
new file mode 100644
index 00000000..58d749ef
--- /dev/null
+++ b/backend/reconcile/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots-3.snap
@@ -0,0 +1,15 @@
+---
+source: reconcile/src/tokenizer/word_tokenizer.rs
+expression: "word_tokenizer(\" what? \")"
+snapshot_kind: text
+---
+[
+    Token {
+        normalised: "what?",
+        original: " what?",
+    },
+    Token {
+        normalised: "",
+        original: " ",
+    },
+]
diff --git a/backend/reconcile/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots-4.snap b/backend/reconcile/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots-4.snap
new file mode 100644
index 00000000..4c28a7f3
--- /dev/null
+++ b/backend/reconcile/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots-4.snap
@@ -0,0 +1,23 @@
+---
+source: reconcile/src/tokenizer/word_tokenizer.rs
+expression: "word_tokenizer(\" hello, \\nwhere are you?\")"
+snapshot_kind: text
+---
+[
+    Token {
+        normalised: "hello,",
+        original: " hello,",
+    },
+    Token {
+        normalised: "where",
+        original: " \nwhere",
+    },
+    Token {
+        normalised: "are",
+        original: " are",
+    },
+    Token {
+        normalised: "you?",
+        original: " you?",
+    },
+]
diff --git a/backend/reconcile/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots.snap b/backend/reconcile/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots.snap
new file mode 100644
index 00000000..206c7fee
--- /dev/null
+++ b/backend/reconcile/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots.snap
@@ -0,0 +1,15 @@
+---
+source: reconcile/src/tokenizer/word_tokenizer.rs
+expression: "word_tokenizer(\"Hi there!\")"
+snapshot_kind: text
+---
+[
+    Token {
+        normalised: "Hi",
+        original: "Hi",
+    },
+    Token {
+        normalised: "there!",
+        original: " there!",
+    },
+]
diff --git a/backend/reconcile/src/tokenizer/token.rs b/backend/reconcile/src/tokenizer/token.rs
index f723a2c2..ab521a71 100644
--- a/backend/reconcile/src/tokenizer/token.rs
+++ b/backend/reconcile/src/tokenizer/token.rs
@@ -8,24 +8,19 @@ use serde::{Deserialize, Serialize};
 #[derive(Debug, Clone)]
 pub struct Token<T>
 where
-    T: PartialEq + Clone,
+    T: PartialEq + Clone + std::fmt::Debug,
 {
     normalised: T,
     original: String,
 }
 
 impl From<&str> for Token<String> {
-    fn from(s: &str) -> Self {
-        Token {
-            normalised: s.to_owned(),
-            original: s.to_owned(),
-        }
-    }
+    fn from(s: &str) -> Self { Token::new(s.trim().to_owned(), s.to_owned()) }
 }
 
 impl<T> Token<T>
 where
-    T: PartialEq + Clone,
+    T: PartialEq + Clone + std::fmt::Debug,
 {
     pub fn new(normalised: T, original: String) -> Self {
         Token {
@@ -43,7 +38,7 @@ where
 
 impl<T> PartialEq for Token<T>
 where
-    T: PartialEq + Clone,
+    T: PartialEq + Clone + std::fmt::Debug,
 {
     fn eq(&self, other: &Self) -> bool { self.normalised == other.normalised }
 }
diff --git a/backend/reconcile/src/tokenizer/word_tokenizer.rs b/backend/reconcile/src/tokenizer/word_tokenizer.rs
index 3449cba2..37d748b3 100644
--- a/backend/reconcile/src/tokenizer/word_tokenizer.rs
+++ b/backend/reconcile/src/tokenizer/word_tokenizer.rs
@@ -1,7 +1,48 @@
 use super::token::Token;
 
+/// Splits on whitespace keeping the leading whitespace.
+///
+///     
+/// ## Example
+///
+/// "Hi there!" -> ["Hi", " there!"]
 pub fn word_tokenizer(text: &str) -> Vec<Token<String>> {
-    text.split_inclusive(char::is_whitespace)
-        .map(|s| Token::new(s.to_owned(), s.to_owned()))
-        .collect()
+    let mut result: Vec<Token<String>> = Vec::new();
+
+    let mut last_whitespace = 0;
+    let mut previous_char_is_whitespace = true;
+
+    for (i, c) in text.char_indices() {
+        let is_current_char_whitespace = c.is_whitespace();
+        if !previous_char_is_whitespace && is_current_char_whitespace {
+            result.push(text[last_whitespace..i].into());
+            last_whitespace = i;
+        }
+
+        previous_char_is_whitespace = is_current_char_whitespace;
+    }
+
+    if last_whitespace < text.len() {
+        result.push(text[last_whitespace..].into());
+    }
+
+    result
+}
+
+#[cfg(test)]
+mod tests {
+    use insta::assert_debug_snapshot;
+
+    use super::*;
+
+    #[test]
+    fn test_with_snapshots() {
+        assert_debug_snapshot!(word_tokenizer("Hi there!"));
+
+        assert_debug_snapshot!(word_tokenizer(""));
+
+        assert_debug_snapshot!(word_tokenizer(" what? "));
+
+        assert_debug_snapshot!(word_tokenizer(" hello, \nwhere are you?"));
+    }
 }
diff --git a/backend/reconcile/src/utils.rs b/backend/reconcile/src/utils.rs
index c0c3c33d..8461b5ff 100644
--- a/backend/reconcile/src/utils.rs
+++ b/backend/reconcile/src/utils.rs
@@ -1,6 +1,6 @@
 pub mod common_prefix_len;
 pub mod common_suffix_len;
-pub mod find_common_overlap;
+pub mod find_longest_prefix_contained_within;
 pub mod merge_iters;
 pub mod ordered_operation;
 pub mod side;
diff --git a/backend/reconcile/src/utils/find_common_overlap.rs b/backend/reconcile/src/utils/find_common_overlap.rs
deleted file mode 100644
index ac586b81..00000000
--- a/backend/reconcile/src/utils/find_common_overlap.rs
+++ /dev/null
@@ -1,71 +0,0 @@
-use crate::Token;
-
-/// Given two lists of tokens, returns the offset in the first (old) list from
-/// which the two lists have the same tokens until the end of the first list.
-/// Thus, the suffix of the old list from the offset to the end is equal to a
-/// prefix of the new list.
-///
-/// If there is no overlap, the function returns the maxmium offset, the length
-/// of the old list.
-///
-/// ## Example
-///
-/// ```not_rust
-/// old: [0, 1, 9, 0, 2, 5]
-/// new:       [9, 0, 2, 5, 1]
-/// ```
-/// > results in an offset of 2
-pub fn find_common_overlap<T>(old: &[Token<T>], new: &[Token<T>]) -> usize
-where
-    T: PartialEq + Clone,
-{
-    let minimum_offset = old.len().saturating_sub(new.len());
-    for offset in minimum_offset..old.len() {
-        if old.iter().skip(offset).zip(new.iter()).all(|(a, b)| a == b) {
-            return offset;
-        }
-    }
-
-    old.len()
-}
-
-#[cfg(test)]
-mod tests {
-    use pretty_assertions::assert_eq;
-
-    use super::*;
-
-    #[test]
-    fn test_common_overlap() {
-        assert_eq!(find_common_overlap(&["".into()], &["".into()]), 0);
-
-        assert_eq!(
-            find_common_overlap(
-                &["a".into(), "b".into(), "c".into()],
-                &["b".into(), "c".into(), "a".into()]
-            ),
-            1
-        );
-
-        assert_eq!(
-            find_common_overlap(
-                &["a".into(), "a".into(), "a".into()],
-                &["a".into(), "b".into(), "c".into()]
-            ),
-            2
-        );
-
-        assert_eq!(
-            find_common_overlap(
-                &["a".into(), "b".into(), "c".into()],
-                &["d".into(), "e".into(), "a".into()]
-            ),
-            3
-        );
-
-        assert_eq!(
-            find_common_overlap(&["a".into(), "a".into()], &["a".into()]),
-            1
-        );
-    }
-}
diff --git a/backend/reconcile/src/utils/find_longest_prefix_contained_within.rs b/backend/reconcile/src/utils/find_longest_prefix_contained_within.rs
new file mode 100644
index 00000000..eb4b8264
--- /dev/null
+++ b/backend/reconcile/src/utils/find_longest_prefix_contained_within.rs
@@ -0,0 +1,103 @@
+use crate::Token;
+
+/// Given two lists of tokens, returns `length` where `old` list somewhere
+/// within contains the `length` prefix of the `new` list.
+///
+/// ## Example
+///
+/// ```not_rust
+/// old: [0, 1, 9, 0, 2, 5]
+/// new:       [9, 0, 2, 5, 1]
+/// ```
+/// > results in an length of 4
+///
+///
+/// ```not_rust
+/// old: [0, 1, 9, 0, 2, 5]
+/// new:          [0, 2]
+/// ```
+/// > results in an length of 2
+///
+/// ```not_rust
+/// old: [0, 1, 9, 0, 2, 5]
+/// new:          [0, 4]
+/// ```
+/// > results in an length of 1
+pub fn find_longest_prefix_contained_within<T>(old: &[Token<T>], new: &[Token<T>]) -> usize
+where
+    T: PartialEq + Clone + std::fmt::Debug,
+{
+    let max_possible = new.len().min(old.len());
+
+    for len in (1..=max_possible).rev() {
+        let prefix = &new[..len];
+        if old.windows(len).any(|window| window == prefix) {
+            return len;
+        }
+    }
+
+    0
+}
+
+#[cfg(test)]
+mod tests {
+    use pretty_assertions::assert_eq;
+
+    use super::*;
+
+    #[test]
+    fn test_common_overlap() {
+        assert_eq!(
+            find_longest_prefix_contained_within(&["".into()], &["".into()]),
+            1
+        );
+
+        assert_eq!(
+            find_longest_prefix_contained_within(
+                &["a".into(), "b".into(), "c".into()],
+                &["b".into(), "c".into(), "a".into()]
+            ),
+            2
+        );
+
+        assert_eq!(
+            find_longest_prefix_contained_within(
+                &["a".into(), "b".into(), "c".into()],
+                &["b".into(), "c".into()]
+            ),
+            2
+        );
+
+        assert_eq!(
+            find_longest_prefix_contained_within(
+                &["a".into(), "b".into(), "c".into()],
+                &["b".into()]
+            ),
+            1
+        );
+
+        assert_eq!(
+            find_longest_prefix_contained_within(
+                &["a".into(), "b".into(), "c".into(), "b".into(), "a".into()],
+                &["b".into(), "a".into()]
+            ),
+            2
+        );
+
+        assert_eq!(
+            find_longest_prefix_contained_within(
+                &["a".into(), "a".into(), "a".into()],
+                &["a".into(), "b".into(), "c".into()]
+            ),
+            1
+        );
+
+        assert_eq!(
+            find_longest_prefix_contained_within(
+                &["a".into(), "b".into(), "c".into()],
+                &["d".into(), "e".into(), "a".into()]
+            ),
+            0
+        );
+    }
+}
diff --git a/backend/reconcile/src/utils/merge_iters.rs b/backend/reconcile/src/utils/merge_iters.rs
index c7b73345..2730c336 100644
--- a/backend/reconcile/src/utils/merge_iters.rs
+++ b/backend/reconcile/src/utils/merge_iters.rs
@@ -46,8 +46,7 @@ where
         };
 
         match order {
-            Some(Ordering::Less) | None => self.left.next(),
-            Some(Ordering::Equal) => self.left.next(),
+            Some(Ordering::Less | Ordering::Equal) | None => self.left.next(),
             Some(Ordering::Greater) => self.right.next(),
         }
     }
diff --git a/backend/reconcile/src/utils/ordered_operation.rs b/backend/reconcile/src/utils/ordered_operation.rs
index 17229d2e..116b6372 100644
--- a/backend/reconcile/src/utils/ordered_operation.rs
+++ b/backend/reconcile/src/utils/ordered_operation.rs
@@ -7,7 +7,7 @@ use crate::operation_transformation::Operation;
 #[derive(Debug, Clone, PartialEq)]
 pub struct OrderedOperation<T>
 where
-    T: PartialEq + Clone,
+    T: PartialEq + Clone + std::fmt::Debug,
 {
     pub order: usize,
     pub operation: Operation<T>,
diff --git a/backend/rust-toolchain.toml b/backend/rust-toolchain.toml
new file mode 100644
index 00000000..8e466642
--- /dev/null
+++ b/backend/rust-toolchain.toml
@@ -0,0 +1,4 @@
+[toolchain]
+channel = "nightly-2025-03-14"
+targets = [ "x86_64-unknown-linux-gnu", "x86_64-unknown-linux-musl" ]
+profile = "default"
diff --git a/backend/sync_lib/src/lib.rs b/backend/sync_lib/src/lib.rs
index 16e01f24..6f27e055 100644
--- a/backend/sync_lib/src/lib.rs
+++ b/backend/sync_lib/src/lib.rs
@@ -18,7 +18,20 @@ pub mod errors;
 
 /// Encode binary data for easy transport over HTTP. Inverse of
 /// `base64_to_bytes`.
+///
+/// # Arguments
+///
+/// - `input`: The binary data to encode.
+///
+/// # Returns
+///
+/// The base64-encoded string.
+///
+/// # Panics
+///
+/// If the input is not valid UTF-8.
 #[wasm_bindgen(js_name = bytesToBase64)]
+#[must_use]
 pub fn bytes_to_base64(input: &[u8]) -> String {
     set_panic_hook();
 
@@ -26,6 +39,19 @@ pub fn bytes_to_base64(input: &[u8]) -> String {
 }
 
 /// Inverse of `bytes_to_base64`.
+/// Decode base64-encoded data into binary data.
+///
+/// # Arguments
+///
+/// - `input`: The base64-encoded string.
+///
+/// # Returns
+///
+/// The decoded binary data.
+///
+/// # Errors
+///
+/// If the input is not valid base64.
 #[wasm_bindgen(js_name = base64ToBytes)]
 pub fn base64_to_bytes(input: &str) -> Result<Vec<u8>, SyncLibError> {
     set_panic_hook();
@@ -36,7 +62,22 @@ pub fn base64_to_bytes(input: &str) -> Result<Vec<u8>, SyncLibError> {
 /// Merge two documents with a common parent. Relies on `reconcile::reconcile`
 /// for texts and returns the right document as-is if either of the updated
 /// documents is binary.
+///
+/// # Arguments
+///
+/// - `parent`: The common parent document.
+/// - `left`: The left document updated by one user.
+/// - `right`: The right document updated by another user.
+///
+/// # Returns
+///
+/// The merged document.
+///
+/// # Panics
+///
+/// If any of the input documents are not valid UTF-8 strings.
 #[wasm_bindgen]
+#[must_use]
 pub fn merge(parent: &[u8], left: &[u8], right: &[u8]) -> Vec<u8> {
     set_panic_hook();
 
@@ -54,6 +95,7 @@ pub fn merge(parent: &[u8], left: &[u8], right: &[u8]) -> Vec<u8> {
 
 /// WASM wrapper around `reconcile::reconcile` for text merging.
 #[wasm_bindgen(js_name = mergeText)]
+#[must_use]
 pub fn merge_text(parent: &str, left: &str, right: &str) -> String {
     set_panic_hook();
 
@@ -63,10 +105,11 @@ pub fn merge_text(parent: &str, left: &str, right: &str) -> String {
 /// Heuristically determine if the given data is a binary or a text file's
 /// content.
 #[wasm_bindgen(js_name = isBinary)]
+#[must_use]
 pub fn is_binary(data: &[u8]) -> bool {
     set_panic_hook();
 
-    if data.iter().any(|&b| b == 0) {
+    if data.contains(&0) {
         // Even though the NUL character is valid in UTF-8, it's highly suspicious in
         // human-readable text.
         return true;
@@ -77,6 +120,7 @@ pub fn is_binary(data: &[u8]) -> bool {
 
 /// We don't want to support merging structured data like JSON, YAML, etc.
 #[wasm_bindgen(js_name = isFileTypeMergable)]
+#[must_use]
 pub fn is_file_type_mergable(path_or_file_name: &str) -> bool {
     set_panic_hook();
 
diff --git a/backend/sync_lib/tests/web.rs b/backend/sync_lib/tests/web.rs
index ffea18d9..e45cbea6 100644
--- a/backend/sync_lib/tests/web.rs
+++ b/backend/sync_lib/tests/web.rs
@@ -26,7 +26,8 @@ fn test_base64_to_bytes_error() {
 fn merge_text() {
     let left = b"hello ";
     let right = b"world";
-    assert_eq!(merge(b"", left, right), b"hello world".to_vec());
+    let result = merge(b"", left, right);
+    assert_eq!(result, b"hello world");
 }
 
 #[wasm_bindgen_test(unsupported = test)]
diff --git a/backend/sync_server/src/config.rs b/backend/sync_server/src/config.rs
index 829375da..862dd0e7 100644
--- a/backend/sync_server/src/config.rs
+++ b/backend/sync_server/src/config.rs
@@ -42,9 +42,12 @@ impl Config {
     }
 
     pub async fn load_from_file(path: &Path) -> Result<Self> {
-        let contents = fs::read_to_string(path)
-            .await
-            .with_context(|| format!("Cannot load configuration from disk from ({path:?})"))?;
+        let contents = fs::read_to_string(path).await.with_context(|| {
+            format!(
+                "Cannot load configuration from disk from {}",
+                path.display()
+            )
+        })?;
 
         let config = serde_yaml::from_str(&contents).context("Failed to parse configuration")?;
 
diff --git a/backend/sync_server/src/config/database_config.rs b/backend/sync_server/src/config/database_config.rs
index effcfde6..b3d2fad7 100644
--- a/backend/sync_server/src/config/database_config.rs
+++ b/backend/sync_server/src/config/database_config.rs
@@ -1,31 +1,33 @@
+use std::path::PathBuf;
+
 use log::debug;
 use serde::{Deserialize, Serialize};
 
-use crate::consts::{DEFAULT_MAX_CONNECTIONS, DEFAULT_SQLITE_URL};
+use crate::consts::{DEFAULT_DATABASES_DIRECTORY_PATH, DEFAULT_MAX_CONNECTIONS};
 
 #[derive(Debug, Deserialize, Serialize, Clone)]
 pub struct DatabaseConfig {
-    #[serde(default = "default_sqlite_url")]
-    pub sqlite_url: String,
+    #[serde(default = "default_databases_directory_path")]
+    pub databases_directory_path: PathBuf,
 
     #[serde(default = "default_max_connections")]
     pub max_connections: u32,
 }
 
-fn default_sqlite_url() -> String {
-    debug!("Using default sqlite url: {}", DEFAULT_SQLITE_URL);
-    DEFAULT_SQLITE_URL.to_owned()
+fn default_databases_directory_path() -> PathBuf {
+    debug!("Using default databases directory path: {DEFAULT_DATABASES_DIRECTORY_PATH:?}");
+    PathBuf::from(DEFAULT_DATABASES_DIRECTORY_PATH)
 }
 
 fn default_max_connections() -> u32 {
-    debug!("Using default max connections: {}", DEFAULT_MAX_CONNECTIONS);
+    debug!("Using default max connections: {DEFAULT_MAX_CONNECTIONS}");
     DEFAULT_MAX_CONNECTIONS
 }
 
 impl Default for DatabaseConfig {
     fn default() -> Self {
         Self {
-            sqlite_url: default_sqlite_url(),
+            databases_directory_path: default_databases_directory_path(),
             max_connections: default_max_connections(),
         }
     }
diff --git a/backend/sync_server/src/config/server_config.rs b/backend/sync_server/src/config/server_config.rs
index 88b1f480..8d7c63ea 100644
--- a/backend/sync_server/src/config/server_config.rs
+++ b/backend/sync_server/src/config/server_config.rs
@@ -15,20 +15,17 @@ pub struct ServerConfig {
 }
 
 fn default_host() -> String {
-    debug!("Using default server host: {}", DEFAULT_HOST);
+    debug!("Using default server host: {DEFAULT_HOST}");
     DEFAULT_HOST.to_owned()
 }
 
 fn default_port() -> u16 {
-    debug!("Using default server port: {}", DEFAULT_PORT);
+    debug!("Using default server port: {DEFAULT_PORT}");
     DEFAULT_PORT
 }
 
 fn default_max_body_size_mb() -> usize {
-    debug!(
-        "Using default max body size (MB): {}",
-        DEFAULT_MAX_BODY_SIZE_MB
-    );
+    debug!("Using default max body size (MB): {DEFAULT_MAX_BODY_SIZE_MB}");
     DEFAULT_MAX_BODY_SIZE_MB
 }
 
diff --git a/backend/sync_server/src/consts.rs b/backend/sync_server/src/consts.rs
index 2b727f5a..f38012de 100644
--- a/backend/sync_server/src/consts.rs
+++ b/backend/sync_server/src/consts.rs
@@ -1,5 +1,5 @@
 pub const CONFIG_PATH: &str = "config.yml";
-pub const DEFAULT_SQLITE_URL: &str = "db.sqlite3";
+pub const DEFAULT_DATABASES_DIRECTORY_PATH: &str = "databases";
 pub const DEFAULT_HOST: &str = "127.0.0.1";
 pub const DEFAULT_PORT: u16 = 3000;
 pub const DEFAULT_MAX_CONNECTIONS: u32 = 12;
diff --git a/backend/sync_server/src/database.rs b/backend/sync_server/src/database.rs
index 52305629..882bd0a2 100644
--- a/backend/sync_server/src/database.rs
+++ b/backend/sync_server/src/database.rs
@@ -1,4 +1,5 @@
-use core::{str::FromStr as _, time::Duration};
+use core::time::Duration;
+use std::{collections::HashMap, sync::Arc};
 
 use anyhow::{Context as _, Result};
 use models::{
@@ -7,19 +8,66 @@ use models::{
 use sqlx::{sqlite::SqliteConnectOptions, types::chrono::Utc};
 pub mod models;
 use sqlx::{Pool, Sqlite, sqlite::SqlitePoolOptions};
+use tokio::sync::Mutex;
+use uuid::fmt::Hyphenated;
 
 use crate::config::database_config::DatabaseConfig;
 
 #[derive(Clone, Debug)]
 pub struct Database {
-    connection_pool: Pool<Sqlite>,
+    config: DatabaseConfig,
+    connection_pools: Arc<Mutex<HashMap<VaultId, Pool<Sqlite>>>>,
 }
 
 pub type Transaction<'a> = sqlx::Transaction<'a, Sqlite>;
 
 impl Database {
     pub async fn try_new(config: &DatabaseConfig) -> Result<Self> {
-        let connection_options = SqliteConnectOptions::from_str(&config.sqlite_url)?
+        tokio::fs::create_dir_all(&config.databases_directory_path)
+            .await
+            .with_context(|| {
+                format!(
+                    "Failed to create databases directory: {}",
+                    config.databases_directory_path.to_string_lossy()
+                )
+            })?;
+
+        let mut connection_pools = std::collections::HashMap::new();
+
+        let mut entries = tokio::fs::read_dir(&config.databases_directory_path).await?;
+        while let Some(entry) = entries.next_entry().await? {
+            if !entry.file_name().to_string_lossy().ends_with(".sqlite") {
+                continue;
+            }
+
+            let vault: VaultId = entry
+                .file_name()
+                .to_string_lossy()
+                .trim_end_matches(".sqlite")
+                .to_owned();
+
+            connection_pools.insert(
+                vault.clone(),
+                Self::create_vault_database(config, &vault).await?,
+            );
+        }
+
+        Ok(Self {
+            config: config.clone(),
+            connection_pools: Arc::new(Mutex::new(connection_pools)),
+        })
+    }
+
+    async fn create_vault_database(
+        config: &DatabaseConfig,
+        vault: &VaultId,
+    ) -> Result<Pool<Sqlite>> {
+        let file_name = config
+            .databases_directory_path
+            .join(format!("{vault}.sqlite"));
+
+        let connection_options = SqliteConnectOptions::new()
+            .filename(file_name.clone())
             .create_if_missing(true)
             .busy_timeout(Duration::from_secs(3600))
             .journal_mode(sqlx::sqlite::SqliteJournalMode::Wal);
@@ -29,18 +77,11 @@ impl Database {
             .test_before_acquire(true)
             .connect_with(connection_options)
             .await
-            .with_context(|| {
-                format!(
-                    "Cannot connect to database with url: {}",
-                    &config.sqlite_url
-                )
-            })?;
+            .with_context(|| format!("Cannot open database at {}", file_name.display()))?;
 
         Self::run_migrations(&pool).await?;
 
-        Ok(Self {
-            connection_pool: pool,
-        })
+        Ok(pool)
     }
 
     async fn run_migrations(pool: &Pool<Sqlite>) -> Result<()> {
@@ -50,17 +91,38 @@ impl Database {
             .context("Cannot check for pending migrations")
     }
 
+    async fn get_connection_pool(&mut self, vault: &VaultId) -> Result<Pool<Sqlite>> {
+        let mut pools = self.connection_pools.lock().await;
+        if !pools.contains_key(vault) {
+            let pool = Self::create_vault_database(&self.config, vault).await?;
+            pools.insert(vault.clone(), pool);
+        }
+
+        let pool = pools
+            .get(vault)
+            .expect("Pool was just inserted or already exists");
+
+        Ok(pool.clone())
+    }
+
     /// Attempting to write from this transaction might result in a
     /// database locked error. Use this transaction for read-only operations.
-    pub async fn create_readonly_transaction(&self) -> Result<Transaction<'_>> {
-        self.connection_pool
+    pub async fn create_readonly_transaction(
+        &mut self,
+        vault: &VaultId,
+    ) -> Result<Transaction<'static>> {
+        self.get_connection_pool(vault)
+            .await?
             .begin()
             .await
             .context("Cannot create transaction")
     }
 
-    pub async fn create_write_transaction(&self) -> Result<Transaction<'_>> {
-        let mut transaction = self.create_readonly_transaction().await?;
+    pub async fn create_write_transaction(
+        &mut self,
+        vault: &VaultId,
+    ) -> Result<Transaction<'static>> {
+        let mut transaction = self.create_readonly_transaction(vault).await?;
 
         // sqlx doesn't support immediate transactions for sqlite: https://github.com/launchbadge/sqlx/issues/481
         sqlx::query!("END; BEGIN IMMEDIATE;")
@@ -72,7 +134,7 @@ impl Database {
 
     /// Return the latest state of all documents in the vault
     pub async fn get_latest_documents(
-        &self,
+        &mut self,
         vault: &VaultId,
         transaction: Option<&mut Transaction<'_>>,
     ) -> Result<Vec<DocumentVersionWithoutContent>> {
@@ -80,24 +142,22 @@ impl Database {
             DocumentVersionWithoutContent,
             r#"
             select 
-                vault_id,
                 vault_update_id,
-                document_id as "document_id: uuid::Uuid", 
+                document_id as "document_id: Hyphenated", 
                 relative_path,
-                created_date as "created_date: chrono::DateTime<Utc>",
                 updated_date as "updated_date: chrono::DateTime<Utc>",
                 is_deleted
             from latest_document_versions
-            where vault_id = ?
             order by vault_update_id desc
             "#,
-            vault,
         );
 
         if let Some(transaction) = transaction {
             query.fetch_all(&mut **transaction).await
         } else {
-            query.fetch_all(&self.connection_pool).await
+            query
+                .fetch_all(&self.get_connection_pool(vault).await?)
+                .await
         }
         .context("Cannot fetch latest documents")
     }
@@ -105,7 +165,7 @@ impl Database {
     /// Return the latest state of all documents (including deleted) in the
     /// vault which have changed since the given update id
     pub async fn get_latest_documents_since(
-        &self,
+        &mut self,
         vault: &VaultId,
         vault_update_id: VaultUpdateId,
         transaction: Option<&mut Transaction<'_>>,
@@ -114,25 +174,24 @@ impl Database {
             DocumentVersionWithoutContent,
             r#"
             select
-                vault_id,
                 vault_update_id,
-                document_id as "document_id: uuid::Uuid",
+                document_id as "document_id: Hyphenated",
                 relative_path,
-                created_date as "created_date: chrono::DateTime<Utc>",
                 updated_date as "updated_date: chrono::DateTime<Utc>",
                 is_deleted
             from latest_document_versions
-            where vault_id = ? and vault_update_id > ?
+            where vault_update_id > ?
             order by vault_update_id desc
             "#,
-            vault,
             vault_update_id
         );
 
         if let Some(transaction) = transaction {
             query.fetch_all(&mut **transaction).await
         } else {
-            query.fetch_all(&self.connection_pool).await
+            query
+                .fetch_all(&self.get_connection_pool(vault).await?)
+                .await
         }
         .with_context(|| {
             format!("Cannot fetch latest documents since vault_update_id {vault_update_id}")
@@ -140,7 +199,7 @@ impl Database {
     }
 
     pub async fn get_max_update_id_in_vault(
-        &self,
+        &mut self,
         vault: &VaultId,
         transaction: Option<&mut Transaction<'_>>,
     ) -> Result<i64> {
@@ -148,22 +207,22 @@ impl Database {
             r#"
             select coalesce(max(vault_update_id), 0) as max_vault_update_id
             from documents
-            where vault_id = ?
             "#,
-            vault
         );
 
         if let Some(transaction) = transaction {
             query.fetch_one(&mut **transaction).await
         } else {
-            query.fetch_one(&self.connection_pool).await
+            query
+                .fetch_one(&self.get_connection_pool(vault).await?)
+                .await
         }
         .map(|row| row.max_vault_update_id)
         .context("Cannot fetch max update id in vault")
     }
 
     pub async fn get_latest_document_by_path(
-        &self,
+        &mut self,
         vault: &VaultId,
         relative_path: &str,
         transaction: Option<&mut Transaction<'_>>,
@@ -172,68 +231,67 @@ impl Database {
             StoredDocumentVersion,
             r#"
             select 
-                vault_id,
                 vault_update_id,
-                document_id as "document_id: uuid::Uuid", 
+                document_id as "document_id: Hyphenated", 
                 relative_path,
-                created_date as "created_date: chrono::DateTime<Utc>",
                 updated_date as "updated_date: chrono::DateTime<Utc>",
                 content,
                 is_deleted
             from latest_document_versions
-            where vault_id = ? and relative_path = ?
+            where relative_path = ?
             order by vault_update_id desc  -- `latest_document_versions` only contains a single latest version of each document, however,
                                            -- multiple documents can have the same `relative_path`, if they have been deleted. That's
                                            -- why we only care about the latest version of the document with the given relative path.
             limit 1
             "#,
-            vault,
             relative_path
         );
 
         if let Some(transaction) = transaction {
             query.fetch_optional(&mut **transaction).await
         } else {
-            query.fetch_optional(&self.connection_pool).await
+            query
+                .fetch_optional(&self.get_connection_pool(vault).await?)
+                .await
         }
         .context("Cannot fetch latest document version")
     }
 
     pub async fn get_latest_document(
-        &self,
+        &mut self,
         vault: &VaultId,
         document_id: &DocumentId,
         transaction: Option<&mut Transaction<'_>>,
     ) -> Result<Option<StoredDocumentVersion>> {
+        let document_id = document_id.as_hyphenated();
         let query = sqlx::query_as!(
             StoredDocumentVersion,
             r#"
             select 
-                vault_id,
                 vault_update_id,
-                document_id as "document_id: uuid::Uuid", 
+                document_id as "document_id: Hyphenated", 
                 relative_path,
-                created_date as "created_date: chrono::DateTime<Utc>",
                 updated_date as "updated_date: chrono::DateTime<Utc>",
                 content,
                 is_deleted
             from latest_document_versions
-            where vault_id = ? and document_id = ?
+            where document_id = ?
             "#,
-            vault,
             document_id
         );
 
         if let Some(transaction) = transaction {
             query.fetch_optional(&mut **transaction).await
         } else {
-            query.fetch_optional(&self.connection_pool).await
+            query
+                .fetch_optional(&self.get_connection_pool(vault).await?)
+                .await
         }
         .context("Cannot fetch latest document version")
     }
 
     pub async fn get_document_version(
-        &self,
+        &mut self,
         vault: &VaultId,
         vault_update_id: VaultUpdateId,
         transaction: Option<&mut Transaction<'_>>,
@@ -242,52 +300,49 @@ impl Database {
             StoredDocumentVersion,
             r#"
             select 
-                vault_id,
                 vault_update_id,
-                document_id as "document_id: uuid::Uuid", 
+                document_id as "document_id: Hyphenated", 
                 relative_path,
-                created_date as "created_date: chrono::DateTime<Utc>",
                 updated_date as "updated_date: chrono::DateTime<Utc>",
                 content,
                 is_deleted
             from documents
-            where vault_id = ? and vault_update_id = ?"#,
-            vault,
+            where vault_update_id = ?"#,
             vault_update_id
         );
 
         if let Some(transaction) = transaction {
             query.fetch_optional(&mut **transaction).await
         } else {
-            query.fetch_optional(&self.connection_pool).await
+            query
+                .fetch_optional(&self.get_connection_pool(vault).await?)
+                .await
         }
         .context("Cannot fetch document version")
     }
 
     pub async fn insert_document_version(
-        &self,
+        &mut self,
+        vault: &VaultId,
         version: &StoredDocumentVersion,
         transaction: Option<&mut Transaction<'_>>,
     ) -> Result<()> {
+        let document_id = version.document_id.as_hyphenated();
         let query = sqlx::query!(
             r#"
             insert into documents (
-                vault_id,
                 vault_update_id,
                 document_id, 
                 relative_path,
-                created_date,
                 updated_date,
                 content,
                 is_deleted
             )
-            values (?, ?, ?, ?, ?, ?, ?, ?)
+            values (?, ?, ?, ?, ?, ?)
             "#,
-            version.vault_id,
             version.vault_update_id,
-            version.document_id,
+            document_id,
             version.relative_path,
-            version.created_date,
             version.updated_date,
             version.content,
             version.is_deleted
@@ -296,7 +351,7 @@ impl Database {
         if let Some(transaction) = transaction {
             query.execute(&mut **transaction).await
         } else {
-            query.execute(&self.connection_pool).await
+            query.execute(&self.get_connection_pool(vault).await?).await
         }
         .context("Cannot insert document version")?;
 
diff --git a/backend/sync_server/src/database/migrations/20241207143519_bootstrap.sql b/backend/sync_server/src/database/migrations/20241207143519_bootstrap.sql
index 360b34d2..4a9f31ba 100644
--- a/backend/sync_server/src/database/migrations/20241207143519_bootstrap.sql
+++ b/backend/sync_server/src/database/migrations/20241207143519_bootstrap.sql
@@ -1,25 +1,21 @@
 CREATE TABLE IF NOT EXISTS documents (
-    vault_id TEXT NOT NULL,
-    vault_update_id INTEGER NOT NULL,
+    vault_update_id INTEGER NOT NULL PRIMARY KEY,
     document_id TEXT NOT NULL,
     relative_path TEXT NOT NULL,
-    created_date TIMESTAMP NOT NULL,
     updated_date TIMESTAMP NOT NULL,
     content BLOB NOT NULL,
-    is_deleted BOOLEAN NOT NULL,
-    PRIMARY KEY (vault_id, vault_update_id)
+    is_deleted BOOLEAN NOT NULL
 );
 
 CREATE VIEW IF NOT EXISTS latest_document_versions AS
 SELECT d.*
 FROM documents d
 INNER JOIN (
-    SELECT vault_id, MAX(vault_update_id) AS max_version_id
+    SELECT MAX(vault_update_id) AS max_version_id
     FROM documents
-    GROUP BY vault_id, document_id
+    GROUP BY document_id
 ) max_versions
-ON d.vault_id = max_versions.vault_id
-AND d.vault_update_id = max_versions.max_version_id;
+ON d.vault_update_id = max_versions.max_version_id;
 
 CREATE INDEX IF NOT EXISTS idx_documents_vault_id_relative_path
-ON documents (vault_id, relative_path);
+ON documents (relative_path);
diff --git a/backend/sync_server/src/database/models.rs b/backend/sync_server/src/database/models.rs
index d8f743a9..a837e93c 100644
--- a/backend/sync_server/src/database/models.rs
+++ b/backend/sync_server/src/database/models.rs
@@ -9,30 +9,24 @@ pub type DocumentId = uuid::Uuid;
 
 #[derive(Debug, Clone)]
 pub struct StoredDocumentVersion {
-    pub vault_id: VaultId,
     pub vault_update_id: VaultUpdateId,
     pub document_id: DocumentId,
     pub relative_path: String,
-    pub created_date: DateTime<Utc>,
     pub updated_date: DateTime<Utc>,
     pub content: Vec<u8>,
     pub is_deleted: bool,
 }
 
 impl PartialEq<Self> for StoredDocumentVersion {
-    fn eq(&self, other: &Self) -> bool {
-        self.vault_id == other.vault_id && self.vault_update_id == other.vault_update_id
-    }
+    fn eq(&self, other: &Self) -> bool { self.vault_update_id == other.vault_update_id }
 }
 
 #[derive(Debug, Clone, Serialize, JsonSchema)]
 #[serde(rename_all = "camelCase")]
 pub struct DocumentVersionWithoutContent {
-    pub vault_id: VaultId,
     pub vault_update_id: VaultUpdateId,
     pub document_id: DocumentId,
     pub relative_path: String,
-    pub created_date: DateTime<Utc>,
     pub updated_date: DateTime<Utc>,
     pub is_deleted: bool,
 }
@@ -40,11 +34,9 @@ pub struct DocumentVersionWithoutContent {
 impl From<StoredDocumentVersion> for DocumentVersionWithoutContent {
     fn from(value: StoredDocumentVersion) -> Self {
         Self {
-            vault_id: value.vault_id,
             vault_update_id: value.vault_update_id,
             document_id: value.document_id,
             relative_path: value.relative_path,
-            created_date: value.created_date,
             updated_date: value.updated_date,
             is_deleted: value.is_deleted,
         }
@@ -54,11 +46,9 @@ impl From<StoredDocumentVersion> for DocumentVersionWithoutContent {
 #[derive(Debug, Clone, Serialize, JsonSchema)]
 #[serde(rename_all = "camelCase")]
 pub struct DocumentVersion {
-    pub vault_id: VaultId,
     pub vault_update_id: VaultUpdateId,
     pub document_id: DocumentId,
     pub relative_path: String,
-    pub created_date: DateTime<Utc>,
     pub updated_date: DateTime<Utc>,
     pub content_base64: String,
     pub is_deleted: bool,
@@ -67,11 +57,9 @@ pub struct DocumentVersion {
 impl From<StoredDocumentVersion> for DocumentVersion {
     fn from(value: StoredDocumentVersion) -> Self {
         Self {
-            vault_id: value.vault_id,
             vault_update_id: value.vault_update_id,
             document_id: value.document_id,
             relative_path: value.relative_path,
-            created_date: value.created_date,
             updated_date: value.updated_date,
             content_base64: bytes_to_base64(&value.content),
             is_deleted: value.is_deleted,
diff --git a/backend/sync_server/src/errors.rs b/backend/sync_server/src/errors.rs
index aa109c82..5aec9c32 100644
--- a/backend/sync_server/src/errors.rs
+++ b/backend/sync_server/src/errors.rs
@@ -33,12 +33,12 @@ pub enum SyncServerError {
 impl SyncServerError {
     pub fn serialize(&self) -> SerializedError {
         match self {
-            Self::InitError(error) => error.into(),
-            Self::ClientError(error) => error.into(),
-            Self::ServerError(error) => error.into(),
-            Self::NotFound(error) => error.into(),
-            Self::Unauthorized(error) => error.into(),
-            Self::PermissionDeniedError(error) => error.into(),
+            Self::InitError(error)
+            | Self::ClientError(error)
+            | Self::ServerError(error)
+            | Self::NotFound(error)
+            | Self::Unauthorized(error)
+            | Self::PermissionDeniedError(error) => error.into(),
         }
     }
 }
@@ -48,9 +48,10 @@ impl IntoResponse for SyncServerError {
         let body = Json(self.serialize());
 
         match self {
-            Self::InitError(_) => (StatusCode::INTERNAL_SERVER_ERROR, body).into_response(),
+            Self::InitError(_) | Self::ServerError(_) => {
+                (StatusCode::INTERNAL_SERVER_ERROR, body).into_response()
+            }
             Self::ClientError(_) => (StatusCode::BAD_REQUEST, body).into_response(),
-            Self::ServerError(_) => (StatusCode::INTERNAL_SERVER_ERROR, body).into_response(),
             Self::NotFound(_) => (StatusCode::NOT_FOUND, body).into_response(),
             Self::Unauthorized(_) => (StatusCode::UNAUTHORIZED, body).into_response(),
             Self::PermissionDeniedError(_) => (StatusCode::FORBIDDEN, body).into_response(),
diff --git a/backend/sync_server/src/server.rs b/backend/sync_server/src/server.rs
index bf62fec5..511187e0 100644
--- a/backend/sync_server/src/server.rs
+++ b/backend/sync_server/src/server.rs
@@ -16,6 +16,7 @@ use axum::{
     extract::{DefaultBodyLimit, Request},
     http::{self, HeaderValue, Method},
     response::IntoResponse,
+    routing::IntoMakeService,
 };
 use log::{error, info};
 use tokio::signal;
@@ -30,7 +31,10 @@ use tower_http::{
 };
 use tracing::{Level, info_span};
 
-use crate::errors::{SerializedError, not_found_error};
+use crate::{
+    config::server_config::ServerConfig,
+    errors::{SerializedError, not_found_error},
+};
 mod app_state;
 mod auth;
 mod create_document;
@@ -52,24 +56,9 @@ pub async fn create_server() -> Result<()> {
         .await
         .context("Failed to initialise app state")?;
 
-    let address = format!(
-        "{}:{}",
-        &app_state.config.server.host, &app_state.config.server.port
-    );
-
-    let mut api = OpenApi {
-        info: Info {
-            title: "VaultLink sync server".to_owned(),
-            summary: Some(
-                "Simple API for syncing documents between concurrent clients.".to_owned(),
-            ),
-            description: Some(include_str!("../README.md").to_owned()),
-            version: env!("CARGO_PKG_VERSION").to_owned(),
-            ..Info::default()
-        },
-        ..OpenApi::default()
-    };
+    let server_config = app_state.config.server.clone();
 
+    let mut api = create_open_api();
     let app = ApiRouter::new()
         .api_route("/ping", get(ping::ping))
         .api_route(
@@ -140,11 +129,42 @@ pub async fn create_server() -> Result<()> {
                 .allow_methods([Method::GET, Method::POST, Method::PUT, Method::DELETE]),
         )
         .with_state(app_state)
-        .finish_api_with(&mut api, api_docs)
+        .finish_api_with(&mut api, add_api_docs_error_example)
         .layer(Extension(Arc::new(api))) // https://github.com/tamasfe/aide/blob/507f4a8822bc0c13cbda0f589da1e0f4cbcdb812/examples/example-axum/src/main.rs#L39
         .fallback(handler_404)
         .into_make_service();
 
+    start_server(app, &server_config).await
+}
+
+async fn serve_api(Extension(api): Extension<Arc<OpenApi>>) -> impl IntoResponse { Json(api) }
+
+fn create_open_api() -> OpenApi {
+    OpenApi {
+        info: Info {
+            title: "VaultLink sync server".to_owned(),
+            summary: Some(
+                "Simple API for syncing documents between concurrent clients.".to_owned(),
+            ),
+            description: Some(include_str!("../README.md").to_owned()),
+            version: env!("CARGO_PKG_VERSION").to_owned(),
+            ..Info::default()
+        },
+        ..OpenApi::default()
+    }
+}
+
+fn add_api_docs_error_example(api: TransformOpenApi<'_>) -> TransformOpenApi<'_> {
+    api.default_response_with::<Json<SerializedError>, _>(|res| {
+        res.example(SerializedError {
+            message: "An error has occurred".to_owned(),
+            causes: vec![],
+        })
+    })
+}
+
+async fn start_server(app: IntoMakeService<axum::Router>, config: &ServerConfig) -> Result<()> {
+    let address = format!("{}:{}", config.host, config.port);
     let listener = tokio::net::TcpListener::bind(address.clone())
         .await
         .with_context(|| format!("Failed to bind to address: {address}"))?;
@@ -163,17 +183,6 @@ pub async fn create_server() -> Result<()> {
         .context("Failed to start server")
 }
 
-async fn serve_api(Extension(api): Extension<Arc<OpenApi>>) -> impl IntoResponse { Json(api) }
-
-fn api_docs(api: TransformOpenApi<'_>) -> TransformOpenApi<'_> {
-    api.default_response_with::<Json<SerializedError>, _>(|res| {
-        res.example(SerializedError {
-            message: "An error has occurred".to_owned(),
-            causes: vec![],
-        })
-    })
-}
-
 async fn shutdown_signal() {
     let ctrl_c = async {
         signal::ctrl_c()
@@ -193,8 +202,8 @@ async fn shutdown_signal() {
     let terminate = std::future::pending::<()>();
 
     tokio::select! {
-        _ = ctrl_c => {},
-        _ = terminate => {},
+        () = ctrl_c => {},
+        () = terminate => {},
     }
 }
 
diff --git a/backend/sync_server/src/server/create_document.rs b/backend/sync_server/src/server/create_document.rs
index a2567939..89f54783 100644
--- a/backend/sync_server/src/server/create_document.rs
+++ b/backend/sync_server/src/server/create_document.rs
@@ -6,7 +6,6 @@ use axum_extra::{
     headers::{Authorization, authorization::Bearer},
 };
 use axum_jsonschema::Json;
-use chrono::{DateTime, Utc};
 use schemars::JsonSchema;
 use serde::Deserialize;
 use sync_lib::base64_to_bytes;
@@ -17,7 +16,7 @@ use super::{
     requests::{CreateDocumentVersion, CreateDocumentVersionMultipart},
 };
 use crate::{
-    database::models::{DocumentVersionWithoutContent, StoredDocumentVersion, VaultId},
+    database::models::{DocumentId, DocumentVersionWithoutContent, StoredDocumentVersion, VaultId},
     errors::{SyncServerError, client_error, server_error},
     utils::sanitize_path,
 };
@@ -44,8 +43,8 @@ pub async fn create_document_multipart(
         auth_header,
         state,
         vault_id,
+        request.document_id,
         request.relative_path,
-        request.created_date,
         request.content.contents.to_vec(),
     )
     .await
@@ -69,8 +68,8 @@ pub async fn create_document_json(
         auth_header,
         state,
         vault_id,
+        request.document_id,
         request.relative_path,
-        request.created_date,
         content_bytes,
     )
     .await
@@ -78,20 +77,39 @@ pub async fn create_document_json(
 
 async fn internal_create_document(
     auth_header: Authorization<Bearer>,
-    state: AppState,
+    mut state: AppState,
     vault_id: VaultId,
+    document_id: Option<DocumentId>,
     relative_path: String,
-    created_date: DateTime<Utc>,
     content: Vec<u8>,
 ) -> Result<Json<DocumentVersionWithoutContent>, SyncServerError> {
     auth(&state, auth_header.token())?;
 
     let mut transaction = state
         .database
-        .create_write_transaction()
+        .create_write_transaction(&vault_id)
         .await
         .map_err(server_error)?;
 
+    let document_id = match document_id {
+        Some(document_id) => {
+            let existing_version = state
+                .database
+                .get_latest_document(&vault_id, &document_id, Some(&mut transaction))
+                .await
+                .map_err(server_error)?;
+
+            if existing_version.is_some() {
+                return Err(client_error(anyhow::anyhow!(
+                    "Document with the same ID already exists"
+                )));
+            }
+
+            document_id
+        }
+        None => uuid::Uuid::new_v4(),
+    };
+
     let last_update_id = state
         .database
         .get_max_update_id_in_vault(&vault_id, Some(&mut transaction))
@@ -101,19 +119,17 @@ async fn internal_create_document(
     let sanitized_relative_path = sanitize_path(&relative_path);
 
     let new_version = StoredDocumentVersion {
-        vault_id,
         vault_update_id: last_update_id + 1,
-        document_id: uuid::Uuid::new_v4(),
+        document_id,
         relative_path: sanitized_relative_path,
         content,
-        created_date,
         updated_date: chrono::Utc::now(),
         is_deleted: false,
     };
 
     state
         .database
-        .insert_document_version(&new_version, Some(&mut transaction))
+        .insert_document_version(&vault_id, &new_version, Some(&mut transaction))
         .await
         .map_err(server_error)?;
 
diff --git a/backend/sync_server/src/server/delete_document.rs b/backend/sync_server/src/server/delete_document.rs
index a9d307b5..75f90d23 100644
--- a/backend/sync_server/src/server/delete_document.rs
+++ b/backend/sync_server/src/server/delete_document.rs
@@ -10,7 +10,7 @@ use serde::Deserialize;
 
 use super::{app_state::AppState, auth::auth, requests::DeleteDocumentVersion};
 use crate::{
-    database::models::{DocumentId, StoredDocumentVersion, VaultId},
+    database::models::{DocumentId, DocumentVersionWithoutContent, StoredDocumentVersion, VaultId},
     errors::{SyncServerError, server_error},
     utils::sanitize_path,
 };
@@ -29,14 +29,14 @@ pub async fn delete_document(
         vault_id,
         document_id,
     }): Path<PathParams>,
-    State(state): State<AppState>,
+    State(mut state): State<AppState>,
     Json(request): Json<DeleteDocumentVersion>,
-) -> Result<(), SyncServerError> {
+) -> Result<Json<DocumentVersionWithoutContent>, SyncServerError> {
     auth(&state, auth_header.token())?;
 
     let mut transaction = state
         .database
-        .create_write_transaction()
+        .create_write_transaction(&vault_id)
         .await
         .map_err(server_error)?;
 
@@ -47,19 +47,17 @@ pub async fn delete_document(
         .map_err(server_error)?;
 
     let new_version = StoredDocumentVersion {
-        vault_id,
         vault_update_id: last_update_id + 1,
         document_id,
         relative_path: sanitize_path(&request.relative_path),
         content: vec![],
-        created_date: request.created_date,
         updated_date: chrono::Utc::now(),
         is_deleted: true,
     };
 
     state
         .database
-        .insert_document_version(&new_version, Some(&mut transaction))
+        .insert_document_version(&vault_id, &new_version, Some(&mut transaction))
         .await
         .map_err(server_error)?;
 
@@ -69,5 +67,5 @@ pub async fn delete_document(
         .context("Failed to commit successful transaction")
         .map_err(server_error)?;
 
-    Ok(())
+    Ok(Json(new_version.into()))
 }
diff --git a/backend/sync_server/src/server/fetch_document_version.rs b/backend/sync_server/src/server/fetch_document_version.rs
index c6431601..a2b157e3 100644
--- a/backend/sync_server/src/server/fetch_document_version.rs
+++ b/backend/sync_server/src/server/fetch_document_version.rs
@@ -30,7 +30,7 @@ pub async fn fetch_document_version(
         document_id,
         vault_update_id,
     }): Path<PathParams>,
-    State(state): State<AppState>,
+    State(mut state): State<AppState>,
 ) -> Result<Json<DocumentVersion>, SyncServerError> {
     auth(&state, auth_header.token())?;
 
@@ -39,12 +39,14 @@ pub async fn fetch_document_version(
         .get_document_version(&vault_id, vault_update_id, None)
         .await
         .map_err(server_error)?
-        .map(Ok)
-        .unwrap_or_else(|| {
-            Err(not_found_error(anyhow!(
-                "Document with vault update id `{vault_update_id}` not found",
-            )))
-        })?;
+        .map_or_else(
+            || {
+                Err(not_found_error(anyhow!(
+                    "Document with vault update id `{vault_update_id}` not found",
+                )))
+            },
+            Ok,
+        )?;
 
     if result.document_id != document_id {
         return Err(not_found_error(anyhow!(
diff --git a/backend/sync_server/src/server/fetch_document_version_content.rs b/backend/sync_server/src/server/fetch_document_version_content.rs
index 68e38254..203f0afb 100644
--- a/backend/sync_server/src/server/fetch_document_version_content.rs
+++ b/backend/sync_server/src/server/fetch_document_version_content.rs
@@ -32,7 +32,7 @@ pub async fn fetch_document_version_content(
         document_id,
         vault_update_id,
     }): Path<PathParams>,
-    State(state): State<AppState>,
+    State(mut state): State<AppState>,
 ) -> Result<Bytes, SyncServerError> {
     auth(&state, auth_header.token())?;
 
@@ -41,12 +41,14 @@ pub async fn fetch_document_version_content(
         .get_document_version(&vault_id, vault_update_id, None)
         .await
         .map_err(server_error)?
-        .map(Ok)
-        .unwrap_or_else(|| {
-            Err(not_found_error(anyhow!(
-                "Document with vault update id `{vault_update_id}` not found",
-            )))
-        })?;
+        .map_or_else(
+            || {
+                Err(not_found_error(anyhow!(
+                    "Document with vault update id `{vault_update_id}` not found",
+                )))
+            },
+            Ok,
+        )?;
 
     if result.document_id != document_id {
         return Err(not_found_error(anyhow!(
diff --git a/backend/sync_server/src/server/fetch_latest_document_version.rs b/backend/sync_server/src/server/fetch_latest_document_version.rs
index a53f2703..331730e0 100644
--- a/backend/sync_server/src/server/fetch_latest_document_version.rs
+++ b/backend/sync_server/src/server/fetch_latest_document_version.rs
@@ -28,7 +28,7 @@ pub async fn fetch_latest_document_version(
         vault_id,
         document_id,
     }): Path<PathParams>,
-    State(state): State<AppState>,
+    State(mut state): State<AppState>,
 ) -> Result<Json<DocumentVersion>, SyncServerError> {
     auth(&state, auth_header.token())?;
 
@@ -37,12 +37,14 @@ pub async fn fetch_latest_document_version(
         .get_latest_document(&vault_id, &document_id, None)
         .await
         .map_err(server_error)?
-        .map(Ok)
-        .unwrap_or_else(|| {
-            Err(not_found_error(anyhow!(
-                "Document with id `{document_id}` not found",
-            )))
-        })?;
+        .map_or_else(
+            || {
+                Err(not_found_error(anyhow!(
+                    "Document with id `{document_id}` not found",
+                )))
+            },
+            Ok,
+        )?;
 
     Ok(Json(latest_version.into()))
 }
diff --git a/backend/sync_server/src/server/fetch_latest_documents.rs b/backend/sync_server/src/server/fetch_latest_documents.rs
index b19c3dec..b7ff09b7 100644
--- a/backend/sync_server/src/server/fetch_latest_documents.rs
+++ b/backend/sync_server/src/server/fetch_latest_documents.rs
@@ -30,7 +30,7 @@ pub async fn fetch_latest_documents(
     TypedHeader(auth_header): TypedHeader<Authorization<Bearer>>,
     Path(PathParams { vault_id }): Path<PathParams>,
     Query(QueryParams { since_update_id }): Query<QueryParams>,
-    State(state): State<AppState>,
+    State(mut state): State<AppState>,
 ) -> Result<Json<FetchLatestDocumentsResponse>, SyncServerError> {
     auth(&state, auth_header.token())?;
 
diff --git a/backend/sync_server/src/server/requests.rs b/backend/sync_server/src/server/requests.rs
index 1720f96f..3c888266 100644
--- a/backend/sync_server/src/server/requests.rs
+++ b/backend/sync_server/src/server/requests.rs
@@ -1,24 +1,27 @@
 use aide_axum_typed_multipart::FieldData;
 use axum::body::Bytes;
 use axum_typed_multipart::TryFromMultipart;
-use chrono::{DateTime, Utc};
 use schemars::JsonSchema;
 use serde::{self, Deserialize};
 
-use crate::database::models::VaultUpdateId;
+use crate::database::models::{DocumentId, VaultUpdateId};
 
 #[derive(Debug, Deserialize, JsonSchema)]
 #[serde(rename_all = "camelCase")]
 pub struct CreateDocumentVersion {
+    /// The client can decide the document id (if it wishes to) in order
+    /// to help with syncing. If the client does not provide a document id,
+    /// the server will generate one. If the client provides a document id
+    /// it must not already exist in the database.
+    pub document_id: Option<DocumentId>,
     pub relative_path: String,
-    pub created_date: DateTime<Utc>,
     pub content_base64: String,
 }
 
 #[derive(Debug, TryFromMultipart, JsonSchema)]
 pub struct CreateDocumentVersionMultipart {
+    pub document_id: Option<DocumentId>,
     pub relative_path: String,
-    pub created_date: DateTime<Utc>,
     #[form_data(limit = "unlimited")]
     pub content: FieldData<Bytes>,
 }
@@ -28,7 +31,6 @@ pub struct CreateDocumentVersionMultipart {
 pub struct UpdateDocumentVersion {
     pub parent_version_id: VaultUpdateId,
     pub relative_path: String,
-    pub created_date: DateTime<Utc>,
     pub content_base64: String,
 }
 
@@ -37,7 +39,6 @@ pub struct UpdateDocumentVersion {
 pub struct UpdateDocumentVersionMultipart {
     pub parent_version_id: VaultUpdateId,
     pub relative_path: String,
-    pub created_date: DateTime<Utc>,
     #[form_data(limit = "unlimited")]
     pub content: FieldData<Bytes>,
 }
@@ -46,5 +47,4 @@ pub struct UpdateDocumentVersionMultipart {
 #[serde(rename_all = "camelCase")]
 pub struct DeleteDocumentVersion {
     pub relative_path: String,
-    pub created_date: DateTime<Utc>,
 }
diff --git a/backend/sync_server/src/server/update_document.rs b/backend/sync_server/src/server/update_document.rs
index 414180bf..a9b9c13e 100644
--- a/backend/sync_server/src/server/update_document.rs
+++ b/backend/sync_server/src/server/update_document.rs
@@ -6,7 +6,6 @@ use axum_extra::{
     headers::{Authorization, authorization::Bearer},
 };
 use axum_jsonschema::Json;
-use chrono::{DateTime, Utc};
 use log::info;
 use schemars::JsonSchema;
 use serde::Deserialize;
@@ -50,7 +49,6 @@ pub async fn update_document_multipart(
         document_id,
         request.parent_version_id,
         request.relative_path,
-        request.created_date,
         request.content.contents.to_vec(),
     )
     .await
@@ -77,21 +75,19 @@ pub async fn update_document_json(
         document_id,
         request.parent_version_id,
         request.relative_path,
-        request.created_date,
         content_bytes,
     )
     .await
 }
 
-#[allow(clippy::too_many_arguments)]
+#[allow(clippy::too_many_arguments, clippy::too_many_lines)]
 async fn internal_update_document(
     auth_header: Authorization<Bearer>,
-    state: AppState,
+    mut state: AppState,
     vault_id: VaultId,
     document_id: DocumentId,
     parent_version_id: VaultUpdateId,
     relative_path: String,
-    created_date: DateTime<Utc>,
     content: Vec<u8>,
 ) -> Result<Json<DocumentUpdateResponse>, SyncServerError> {
     auth(&state, auth_header.token())?;
@@ -114,7 +110,7 @@ async fn internal_update_document(
 
     let mut transaction = state
         .database
-        .create_write_transaction()
+        .create_write_transaction(&vault_id)
         .await
         .map_err(server_error)?;
 
@@ -138,6 +134,18 @@ async fn internal_update_document(
             Ok,
         )?;
 
+    if latest_version.is_deleted {
+        transaction
+            .rollback()
+            .await
+            .context("Failed to roll back transaction")
+            .map_err(server_error)?;
+
+        return Ok(Json(DocumentUpdateResponse::FastForwardUpdate(
+            latest_version.into(),
+        )));
+    }
+
     let sanitized_relative_path = sanitize_path(&relative_path);
 
     // Return the latest version if the content and path are the same as the latest
@@ -168,7 +176,7 @@ async fn internal_update_document(
     let new_relative_path = if parent_document.relative_path == latest_version.relative_path
         && latest_version.relative_path != sanitized_relative_path
     {
-        let mut new_relative_path = Default::default();
+        let mut new_relative_path = String::default();
         for candidate in deduped_file_paths(&sanitized_relative_path) {
             if state
                 .database
@@ -188,19 +196,17 @@ async fn internal_update_document(
     };
 
     let new_version = StoredDocumentVersion {
-        vault_id,
         document_id,
         vault_update_id: last_update_id + 1,
         relative_path: new_relative_path,
         content: merged_content,
-        created_date,
         updated_date: chrono::Utc::now(),
-        is_deleted: latest_version.is_deleted,
+        is_deleted: false,
     };
 
     state
         .database
-        .insert_document_version(&new_version, Some(&mut transaction))
+        .insert_document_version(&vault_id, &new_version, Some(&mut transaction))
         .await
         .map_err(server_error)?;
 
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index 30fad71d..7fcd9c02 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -14,7 +14,7 @@
 	"license": "MIT",
 	"devDependencies": {
 		"@types/jest": "^29.5.14",
-		"@types/node": "^22.13.5",
+		"@types/node": "^22.13.10",
 		"css-loader": "^7.1.2",
 		"date-fns": "^4.1.0",
 		"file-loader": "^6.2.0",
@@ -23,14 +23,14 @@
 		"mini-css-extract-plugin": "^2.9.2",
 		"obsidian": "1.8.7",
 		"resolve-url-loader": "^5.0.0",
-		"sass": "^1.85.0",
+		"sass": "^1.85.1",
 		"sass-loader": "^16.0.5",
 		"sync-client": "file:../sync-client",
-		"terser-webpack-plugin": "^5.3.11",
+		"terser-webpack-plugin": "^5.3.14",
 		"ts-jest": "^29.2.6",
 		"ts-loader": "^9.5.2",
 		"tslib": "2.8.1",
-		"typescript": "5.7.3",
+		"typescript": "5.8.2",
 		"url": "^0.11.4",
 		"virtual-scroller": "^1.13.1",
 		"webpack": "^5.98.0",
diff --git a/frontend/obsidian-plugin/src/obisidan-event-handler.ts b/frontend/obsidian-plugin/src/obisidan-event-handler.ts
index b2d58b70..9fb5dba4 100644
--- a/frontend/obsidian-plugin/src/obisidan-event-handler.ts
+++ b/frontend/obsidian-plugin/src/obisidan-event-handler.ts
@@ -9,10 +9,7 @@ export class ObsidianFileEventHandler {
 		if (file instanceof TFile) {
 			this.client.logger.info(`File created: ${file.path}`);
 
-			await this.client.syncer.syncLocallyCreatedFile(
-				file.path,
-				new Date(file.stat.ctime)
-			);
+			await this.client.syncer.syncLocallyCreatedFile(file.path);
 		} else {
 			this.client.logger.debug(`Folder created: ${file.path}, ignored`);
 		}
@@ -34,8 +31,7 @@ export class ObsidianFileEventHandler {
 
 			await this.client.syncer.syncLocallyUpdatedFile({
 				oldPath,
-				relativePath: file.path,
-				updateTime: new Date(file.stat.ctime)
+				relativePath: file.path
 			});
 		} else {
 			this.client.logger.debug(
@@ -53,8 +49,7 @@ export class ObsidianFileEventHandler {
 			this.client.logger.info(`File modified: ${file.path}`);
 
 			await this.client.syncer.syncLocallyUpdatedFile({
-				relativePath: file.path,
-				updateTime: new Date(file.stat.ctime)
+				relativePath: file.path
 			});
 		} else {
 			this.client.logger.debug(`Folder modified: ${file.path}, ignored`);
diff --git a/frontend/obsidian-plugin/src/views/history-view.ts b/frontend/obsidian-plugin/src/views/history-view.ts
index 56c8d539..d253b27f 100644
--- a/frontend/obsidian-plugin/src/views/history-view.ts
+++ b/frontend/obsidian-plugin/src/views/history-view.ts
@@ -60,7 +60,6 @@ export class HistoryView extends ItemView {
 		}
 
 		element.createEl("span", {
-			// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 			text: entry.relativePath
 		});
 
diff --git a/frontend/obsidian-plugin/src/views/logs-view.ts b/frontend/obsidian-plugin/src/views/logs-view.ts
index 66aa30c2..22def86f 100644
--- a/frontend/obsidian-plugin/src/views/logs-view.ts
+++ b/frontend/obsidian-plugin/src/views/logs-view.ts
@@ -1,6 +1,6 @@
 import type { WorkspaceLeaf } from "obsidian";
 import { ItemView } from "obsidian";
-import type VaultLinkPlugin from "src/vault-link-plugin";
+import type VaultLinkPlugin from "../vault-link-plugin";
 import type { SyncClient } from "sync-client";
 
 export class LogsView extends ItemView {
diff --git a/frontend/obsidian-plugin/src/views/settings-tab.ts b/frontend/obsidian-plugin/src/views/settings-tab.ts
index b3a39dd7..d37a26dc 100644
--- a/frontend/obsidian-plugin/src/views/settings-tab.ts
+++ b/frontend/obsidian-plugin/src/views/settings-tab.ts
@@ -1,7 +1,7 @@
 import type { App } from "obsidian";
 import { Notice, PluginSettingTab, Setting } from "obsidian";
 
-import type VaultLinkPlugin from "src/vault-link-plugin";
+import type VaultLinkPlugin from "../vault-link-plugin";
 import type { StatusDescription } from "./status-description";
 import { LogsView } from "./logs-view";
 import { HistoryView } from "./history-view";
diff --git a/frontend/obsidian-plugin/src/views/status-bar.ts b/frontend/obsidian-plugin/src/views/status-bar.ts
index 9ecd7b87..ba7d7339 100644
--- a/frontend/obsidian-plugin/src/views/status-bar.ts
+++ b/frontend/obsidian-plugin/src/views/status-bar.ts
@@ -1,5 +1,5 @@
 import type { HistoryStats, SyncClient } from "sync-client";
-import type VaultLinkPlugin from "src/vault-link-plugin";
+import type VaultLinkPlugin from "../vault-link-plugin";
 
 export class StatusBar {
 	private readonly statusBarItem: HTMLElement;
diff --git a/frontend/obsidian-plugin/webpack.config.js b/frontend/obsidian-plugin/webpack.config.js
index 66c35d63..75c87fb7 100644
--- a/frontend/obsidian-plugin/webpack.config.js
+++ b/frontend/obsidian-plugin/webpack.config.js
@@ -94,9 +94,6 @@ module.exports = (env, argv) => ({
 		alias: {
 			root: __dirname,
 			src: path.resolve(__dirname, "src")
-		},
-		fallback: {
-			url: require.resolve("url")
 		}
 	},
 	output: {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index e41f20a4..fea89cd9 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -12,11 +12,11 @@
 			],
 			"devDependencies": {
 				"concurrently": "^9.1.2",
-				"eslint": "9.21.0",
+				"eslint": "9.22.0",
 				"eslint-plugin-unused-imports": "^4.1.4",
-				"npm-check-updates": "^17.1.14",
-				"prettier": "^3.5.2",
-				"typescript-eslint": "8.24.1"
+				"npm-check-updates": "^17.1.15",
+				"prettier": "^3.5.3",
+				"typescript-eslint": "8.26.1"
 			}
 		},
 		"../backend/sync_lib/pkg": {
@@ -39,7 +39,6 @@
 		},
 		"node_modules/@babel/code-frame": {
 			"version": "7.26.2",
-			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"@babel/helper-validator-identifier": "^7.25.9",
@@ -179,7 +178,6 @@
 		},
 		"node_modules/@babel/helper-validator-identifier": {
 			"version": "7.25.9",
-			"dev": true,
 			"license": "MIT",
 			"engines": {
 				"node": ">=6.9.0"
@@ -194,12 +192,14 @@
 			}
 		},
 		"node_modules/@babel/helpers": {
-			"version": "7.26.9",
+			"version": "7.26.10",
+			"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.10.tgz",
+			"integrity": "sha512-UPYc3SauzZ3JGgj87GgZ89JVdC5dj0AoetR5Bw6wj4niittNyFh6+eOGonYvJ1ao6B8lEa3Q3klS7ADZ53bc5g==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"@babel/template": "^7.26.9",
-				"@babel/types": "^7.26.9"
+				"@babel/types": "^7.26.10"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -463,7 +463,9 @@
 			}
 		},
 		"node_modules/@babel/types": {
-			"version": "7.26.9",
+			"version": "7.26.10",
+			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.10.tgz",
+			"integrity": "sha512-emqcG3vHrpxUKTrxcblR36dcrcoRDvKmnL/dCL6ZsHaShW80qxCAcNhzQZrpeM765VzEos+xOi4s+r4IXzTwdQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -580,6 +582,16 @@
 				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
 			}
 		},
+		"node_modules/@eslint/config-helpers": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.1.0.tgz",
+			"integrity": "sha512-kLrdPDJE1ckPo94kmPPf9Hfd0DU0Jw6oKYrhe+pwSC0iTUInmTa+w6fw8sGgcfkFJGNdWOUeOaDM4quW4a7OkA==",
+			"dev": true,
+			"license": "Apache-2.0",
+			"engines": {
+				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+			}
+		},
 		"node_modules/@eslint/core": {
 			"version": "0.12.0",
 			"resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.12.0.tgz",
@@ -618,9 +630,9 @@
 			}
 		},
 		"node_modules/@eslint/js": {
-			"version": "9.21.0",
-			"resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.21.0.tgz",
-			"integrity": "sha512-BqStZ3HX8Yz6LvsF5ByXYrtigrV5AXADWLAGc7PH/1SxOb7/FIYYMszZZWiUou/GB9P2lXWk2SV4d+Z8h0nknw==",
+			"version": "9.22.0",
+			"resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.22.0.tgz",
+			"integrity": "sha512-vLFajx9o8d1/oL2ZkpMYbkLv8nDB6yaIwFNt7nI4+I80U/z03SxmfOMsLbvWr3p7C+Wnoh//aOu2pQW8cS0HCQ==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -1130,6 +1142,8 @@
 		},
 		"node_modules/@nodelib/fs.scandir": {
 			"version": "2.1.5",
+			"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+			"integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1142,6 +1156,8 @@
 		},
 		"node_modules/@nodelib/fs.stat": {
 			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+			"integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -1150,6 +1166,8 @@
 		},
 		"node_modules/@nodelib/fs.walk": {
 			"version": "1.2.8",
+			"resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+			"integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1235,7 +1253,6 @@
 		},
 		"node_modules/@redocly/ajv": {
 			"version": "8.11.2",
-			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"fast-deep-equal": "^3.1.1",
@@ -1250,17 +1267,14 @@
 		},
 		"node_modules/@redocly/ajv/node_modules/json-schema-traverse": {
 			"version": "1.0.0",
-			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@redocly/config": {
 			"version": "0.20.3",
-			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@redocly/openapi-core": {
 			"version": "1.29.0",
-			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"@redocly/ajv": "^8.11.2",
@@ -1280,7 +1294,6 @@
 		},
 		"node_modules/@redocly/openapi-core/node_modules/brace-expansion": {
 			"version": "2.0.1",
-			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"balanced-match": "^1.0.0"
@@ -1288,7 +1301,6 @@
 		},
 		"node_modules/@redocly/openapi-core/node_modules/minimatch": {
 			"version": "5.1.6",
-			"dev": true,
 			"license": "ISC",
 			"dependencies": {
 				"brace-expansion": "^2.0.1"
@@ -1458,9 +1470,9 @@
 			"license": "MIT"
 		},
 		"node_modules/@types/node": {
-			"version": "22.13.5",
-			"resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.5.tgz",
-			"integrity": "sha512-+lTU0PxZXn0Dr1NBtC7Y8cR21AJr87dLLU953CWA6pMxxv/UDc7jYAY90upcrie1nRcD6XNG5HOYEDtgW5TxAg==",
+			"version": "22.13.10",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.10.tgz",
+			"integrity": "sha512-I6LPUvlRH+O6VRUqYOcMudhaIdUVWfsjnZavnsraHvpBwaEyMN29ry+0UVJhImYL16xsscu0aske3yA+uPOWfw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1494,15 +1506,17 @@
 			"license": "MIT"
 		},
 		"node_modules/@typescript-eslint/eslint-plugin": {
-			"version": "8.24.1",
+			"version": "8.26.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.26.1.tgz",
+			"integrity": "sha512-2X3mwqsj9Bd3Ciz508ZUtoQQYpOhU/kWoUqIf49H8Z0+Vbh6UF/y0OEYp0Q0axOGzaBGs7QxRwq0knSQ8khQNA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"@eslint-community/regexpp": "^4.10.0",
-				"@typescript-eslint/scope-manager": "8.24.1",
-				"@typescript-eslint/type-utils": "8.24.1",
-				"@typescript-eslint/utils": "8.24.1",
-				"@typescript-eslint/visitor-keys": "8.24.1",
+				"@typescript-eslint/scope-manager": "8.26.1",
+				"@typescript-eslint/type-utils": "8.26.1",
+				"@typescript-eslint/utils": "8.26.1",
+				"@typescript-eslint/visitor-keys": "8.26.1",
 				"graphemer": "^1.4.0",
 				"ignore": "^5.3.1",
 				"natural-compare": "^1.4.0",
@@ -1518,18 +1532,20 @@
 			"peerDependencies": {
 				"@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0",
 				"eslint": "^8.57.0 || ^9.0.0",
-				"typescript": ">=4.8.4 <5.8.0"
+				"typescript": ">=4.8.4 <5.9.0"
 			}
 		},
 		"node_modules/@typescript-eslint/parser": {
-			"version": "8.24.1",
+			"version": "8.26.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.26.1.tgz",
+			"integrity": "sha512-w6HZUV4NWxqd8BdeFf81t07d7/YV9s7TCWrQQbG5uhuvGUAW+fq1usZ1Hmz9UPNLniFnD8GLSsDpjP0hm1S4lQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@typescript-eslint/scope-manager": "8.24.1",
-				"@typescript-eslint/types": "8.24.1",
-				"@typescript-eslint/typescript-estree": "8.24.1",
-				"@typescript-eslint/visitor-keys": "8.24.1",
+				"@typescript-eslint/scope-manager": "8.26.1",
+				"@typescript-eslint/types": "8.26.1",
+				"@typescript-eslint/typescript-estree": "8.26.1",
+				"@typescript-eslint/visitor-keys": "8.26.1",
 				"debug": "^4.3.4"
 			},
 			"engines": {
@@ -1541,16 +1557,18 @@
 			},
 			"peerDependencies": {
 				"eslint": "^8.57.0 || ^9.0.0",
-				"typescript": ">=4.8.4 <5.8.0"
+				"typescript": ">=4.8.4 <5.9.0"
 			}
 		},
 		"node_modules/@typescript-eslint/scope-manager": {
-			"version": "8.24.1",
+			"version": "8.26.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.26.1.tgz",
+			"integrity": "sha512-6EIvbE5cNER8sqBu6V7+KeMZIC1664d2Yjt+B9EWUXrsyWpxx4lEZrmvxgSKRC6gX+efDL/UY9OpPZ267io3mg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@typescript-eslint/types": "8.24.1",
-				"@typescript-eslint/visitor-keys": "8.24.1"
+				"@typescript-eslint/types": "8.26.1",
+				"@typescript-eslint/visitor-keys": "8.26.1"
 			},
 			"engines": {
 				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -1561,12 +1579,14 @@
 			}
 		},
 		"node_modules/@typescript-eslint/type-utils": {
-			"version": "8.24.1",
+			"version": "8.26.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.26.1.tgz",
+			"integrity": "sha512-Kcj/TagJLwoY/5w9JGEFV0dclQdyqw9+VMndxOJKtoFSjfZhLXhYjzsQEeyza03rwHx2vFEGvrJWJBXKleRvZg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@typescript-eslint/typescript-estree": "8.24.1",
-				"@typescript-eslint/utils": "8.24.1",
+				"@typescript-eslint/typescript-estree": "8.26.1",
+				"@typescript-eslint/utils": "8.26.1",
 				"debug": "^4.3.4",
 				"ts-api-utils": "^2.0.1"
 			},
@@ -1579,11 +1599,13 @@
 			},
 			"peerDependencies": {
 				"eslint": "^8.57.0 || ^9.0.0",
-				"typescript": ">=4.8.4 <5.8.0"
+				"typescript": ">=4.8.4 <5.9.0"
 			}
 		},
 		"node_modules/@typescript-eslint/types": {
-			"version": "8.24.1",
+			"version": "8.26.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.26.1.tgz",
+			"integrity": "sha512-n4THUQW27VmQMx+3P+B0Yptl7ydfceUj4ON/AQILAASwgYdZ/2dhfymRMh5egRUrvK5lSmaOm77Ry+lmXPOgBQ==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -1595,12 +1617,14 @@
 			}
 		},
 		"node_modules/@typescript-eslint/typescript-estree": {
-			"version": "8.24.1",
+			"version": "8.26.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.26.1.tgz",
+			"integrity": "sha512-yUwPpUHDgdrv1QJ7YQal3cMVBGWfnuCdKbXw1yyjArax3353rEJP1ZA+4F8nOlQ3RfS2hUN/wze3nlY+ZOhvoA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@typescript-eslint/types": "8.24.1",
-				"@typescript-eslint/visitor-keys": "8.24.1",
+				"@typescript-eslint/types": "8.26.1",
+				"@typescript-eslint/visitor-keys": "8.26.1",
 				"debug": "^4.3.4",
 				"fast-glob": "^3.3.2",
 				"is-glob": "^4.0.3",
@@ -1616,11 +1640,13 @@
 				"url": "https://opencollective.com/typescript-eslint"
 			},
 			"peerDependencies": {
-				"typescript": ">=4.8.4 <5.8.0"
+				"typescript": ">=4.8.4 <5.9.0"
 			}
 		},
 		"node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
 			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+			"integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1629,6 +1655,8 @@
 		},
 		"node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": {
 			"version": "9.0.5",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+			"integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
 			"dev": true,
 			"license": "ISC",
 			"dependencies": {
@@ -1642,14 +1670,16 @@
 			}
 		},
 		"node_modules/@typescript-eslint/utils": {
-			"version": "8.24.1",
+			"version": "8.26.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.26.1.tgz",
+			"integrity": "sha512-V4Urxa/XtSUroUrnI7q6yUTD3hDtfJ2jzVfeT3VK0ciizfK2q/zGC0iDh1lFMUZR8cImRrep6/q0xd/1ZGPQpg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"@eslint-community/eslint-utils": "^4.4.0",
-				"@typescript-eslint/scope-manager": "8.24.1",
-				"@typescript-eslint/types": "8.24.1",
-				"@typescript-eslint/typescript-estree": "8.24.1"
+				"@typescript-eslint/scope-manager": "8.26.1",
+				"@typescript-eslint/types": "8.26.1",
+				"@typescript-eslint/typescript-estree": "8.26.1"
 			},
 			"engines": {
 				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -1660,15 +1690,17 @@
 			},
 			"peerDependencies": {
 				"eslint": "^8.57.0 || ^9.0.0",
-				"typescript": ">=4.8.4 <5.8.0"
+				"typescript": ">=4.8.4 <5.9.0"
 			}
 		},
 		"node_modules/@typescript-eslint/visitor-keys": {
-			"version": "8.24.1",
+			"version": "8.26.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.26.1.tgz",
+			"integrity": "sha512-AjOC3zfnxd6S4Eiy3jwktJPclqhFHNyd8L6Gycf9WUPoKZpgM5PjkxY1X7uSy61xVpiJDhhk7XT2NVsN3ALTWg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@typescript-eslint/types": "8.24.1",
+				"@typescript-eslint/types": "8.26.1",
 				"eslint-visitor-keys": "^4.2.0"
 			},
 			"engines": {
@@ -1909,7 +1941,6 @@
 		},
 		"node_modules/agent-base": {
 			"version": "7.1.3",
-			"dev": true,
 			"license": "MIT",
 			"engines": {
 				"node": ">= 14"
@@ -1976,7 +2007,6 @@
 		},
 		"node_modules/ansi-colors": {
 			"version": "4.1.3",
-			"dev": true,
 			"license": "MIT",
 			"engines": {
 				"node": ">=6"
@@ -2039,7 +2069,6 @@
 		},
 		"node_modules/argparse": {
 			"version": "2.0.1",
-			"dev": true,
 			"license": "Python-2.0"
 		},
 		"node_modules/async": {
@@ -2161,7 +2190,6 @@
 		},
 		"node_modules/balanced-match": {
 			"version": "1.0.2",
-			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/big.js": {
@@ -2249,7 +2277,6 @@
 		},
 		"node_modules/byte-base64": {
 			"version": "1.1.0",
-			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/call-bind-apply-helpers": {
@@ -2335,7 +2362,6 @@
 		},
 		"node_modules/change-case": {
 			"version": "5.4.4",
-			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/char-regex": {
@@ -2445,7 +2471,6 @@
 		},
 		"node_modules/colorette": {
 			"version": "1.4.0",
-			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/commander": {
@@ -2597,7 +2622,6 @@
 		},
 		"node_modules/debug": {
 			"version": "4.4.0",
-			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"ms": "^2.1.3"
@@ -2822,18 +2846,19 @@
 			}
 		},
 		"node_modules/eslint": {
-			"version": "9.21.0",
-			"resolved": "https://registry.npmjs.org/eslint/-/eslint-9.21.0.tgz",
-			"integrity": "sha512-KjeihdFqTPhOMXTt7StsDxriV4n66ueuF/jfPNC3j/lduHwr/ijDwJMsF+wyMJethgiKi5wniIE243vi07d3pg==",
+			"version": "9.22.0",
+			"resolved": "https://registry.npmjs.org/eslint/-/eslint-9.22.0.tgz",
+			"integrity": "sha512-9V/QURhsRN40xuHXWjV64yvrzMjcz7ZyNoF2jJFmy9j/SLk0u1OLSZgXi28MrXjymnjEGSR80WCdab3RGMDveQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"@eslint-community/eslint-utils": "^4.2.0",
 				"@eslint-community/regexpp": "^4.12.1",
 				"@eslint/config-array": "^0.19.2",
+				"@eslint/config-helpers": "^0.1.0",
 				"@eslint/core": "^0.12.0",
 				"@eslint/eslintrc": "^3.3.0",
-				"@eslint/js": "9.21.0",
+				"@eslint/js": "9.22.0",
 				"@eslint/plugin-kit": "^0.2.7",
 				"@humanfs/node": "^0.16.6",
 				"@humanwhocodes/module-importer": "^1.0.1",
@@ -2845,7 +2870,7 @@
 				"cross-spawn": "^7.0.6",
 				"debug": "^4.3.2",
 				"escape-string-regexp": "^4.0.0",
-				"eslint-scope": "^8.2.0",
+				"eslint-scope": "^8.3.0",
 				"eslint-visitor-keys": "^4.2.0",
 				"espree": "^10.3.0",
 				"esquery": "^1.5.0",
@@ -2896,7 +2921,9 @@
 			}
 		},
 		"node_modules/eslint-scope": {
-			"version": "8.2.0",
+			"version": "8.3.0",
+			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.3.0.tgz",
+			"integrity": "sha512-pUNxi75F8MJ/GdeKtVLSbYg4ZI34J6C0C7sbL4YOp2exGwen7ZsuBqKzUhXd0qMQ362yET3z+uPwKeg/0C2XCQ==",
 			"dev": true,
 			"license": "BSD-2-Clause",
 			"dependencies": {
@@ -2991,7 +3018,6 @@
 		},
 		"node_modules/eventemitter3": {
 			"version": "5.0.1",
-			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/events": {
@@ -3048,11 +3074,12 @@
 		},
 		"node_modules/fast-deep-equal": {
 			"version": "3.1.3",
-			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/fast-glob": {
 			"version": "3.3.3",
+			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
+			"integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -3068,6 +3095,8 @@
 		},
 		"node_modules/fast-glob/node_modules/glob-parent": {
 			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+			"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
 			"dev": true,
 			"license": "ISC",
 			"dependencies": {
@@ -3111,7 +3140,9 @@
 			}
 		},
 		"node_modules/fastq": {
-			"version": "1.19.0",
+			"version": "1.19.1",
+			"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz",
+			"integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==",
 			"dev": true,
 			"license": "ISC",
 			"dependencies": {
@@ -3128,7 +3159,6 @@
 		},
 		"node_modules/fetch-retry": {
 			"version": "6.0.0",
-			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/file-entry-cache": {
@@ -3449,7 +3479,6 @@
 		},
 		"node_modules/https-proxy-agent": {
 			"version": "7.0.6",
-			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"agent-base": "^7.1.2",
@@ -3536,7 +3565,6 @@
 		},
 		"node_modules/index-to-position": {
 			"version": "0.1.2",
-			"dev": true,
 			"license": "MIT",
 			"engines": {
 				"node": ">=18"
@@ -4271,7 +4299,6 @@
 		},
 		"node_modules/js-levenshtein": {
 			"version": "1.1.6",
-			"dev": true,
 			"license": "MIT",
 			"engines": {
 				"node": ">=0.10.0"
@@ -4279,12 +4306,10 @@
 		},
 		"node_modules/js-tokens": {
 			"version": "4.0.0",
-			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/js-yaml": {
 			"version": "4.1.0",
-			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"argparse": "^2.0.1"
@@ -4497,6 +4522,8 @@
 		},
 		"node_modules/merge2": {
 			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+			"integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -4631,7 +4658,6 @@
 		},
 		"node_modules/ms": {
 			"version": "2.1.3",
-			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/nanoid": {
@@ -4686,7 +4712,9 @@
 			}
 		},
 		"node_modules/npm-check-updates": {
-			"version": "17.1.14",
+			"version": "17.1.15",
+			"resolved": "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-17.1.15.tgz",
+			"integrity": "sha512-miATvKu5rjec/1wxc5TGDjpsucgtCHwRVZorZpDkS6NzdWXfnUWlN4abZddWb7XSijAuBNzzYglIdTm9SbgMVg==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"bin": {
@@ -4758,8 +4786,9 @@
 			}
 		},
 		"node_modules/openapi-fetch": {
-			"version": "0.13.4",
-			"dev": true,
+			"version": "0.13.5",
+			"resolved": "https://registry.npmjs.org/openapi-fetch/-/openapi-fetch-0.13.5.tgz",
+			"integrity": "sha512-AQK8T9GSKFREFlN1DBXTYsLjs7YV2tZcJ7zUWxbjMoQmj8dDSFRrzhLCbHPZWA1TMV3vACqfCxLEZcwf2wxV6Q==",
 			"license": "MIT",
 			"dependencies": {
 				"openapi-typescript-helpers": "^0.0.15"
@@ -4767,7 +4796,6 @@
 		},
 		"node_modules/openapi-typescript": {
 			"version": "7.6.1",
-			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"@redocly/openapi-core": "^1.28.0",
@@ -4786,12 +4814,10 @@
 		},
 		"node_modules/openapi-typescript-helpers": {
 			"version": "0.0.15",
-			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/openapi-typescript/node_modules/parse-json": {
 			"version": "8.1.0",
-			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"@babel/code-frame": "^7.22.13",
@@ -4807,7 +4833,6 @@
 		},
 		"node_modules/openapi-typescript/node_modules/supports-color": {
 			"version": "9.4.0",
-			"dev": true,
 			"license": "MIT",
 			"engines": {
 				"node": ">=12"
@@ -4818,7 +4843,6 @@
 		},
 		"node_modules/openapi-typescript/node_modules/type-fest": {
 			"version": "4.35.0",
-			"dev": true,
 			"license": "(MIT OR CC0-1.0)",
 			"engines": {
 				"node": ">=16"
@@ -4873,7 +4897,6 @@
 		},
 		"node_modules/p-queue": {
 			"version": "8.1.0",
-			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"eventemitter3": "^5.0.1",
@@ -4888,7 +4911,6 @@
 		},
 		"node_modules/p-timeout": {
 			"version": "6.1.4",
-			"dev": true,
 			"license": "MIT",
 			"engines": {
 				"node": ">=14.16"
@@ -4966,7 +4988,6 @@
 		},
 		"node_modules/picocolors": {
 			"version": "1.1.1",
-			"dev": true,
 			"license": "ISC"
 		},
 		"node_modules/picomatch": {
@@ -5049,7 +5070,6 @@
 		},
 		"node_modules/pluralize": {
 			"version": "8.0.0",
-			"dev": true,
 			"license": "MIT",
 			"engines": {
 				"node": ">=4"
@@ -5163,9 +5183,9 @@
 			}
 		},
 		"node_modules/prettier": {
-			"version": "3.5.2",
-			"resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.2.tgz",
-			"integrity": "sha512-lc6npv5PH7hVqozBR7lkBNOGXV9vMwROAPlumdBkX0wTbbzPu/U1hk5yL8p2pt4Xoc+2mkT8t/sow2YrV/M5qg==",
+			"version": "3.5.3",
+			"resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.3.tgz",
+			"integrity": "sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==",
 			"dev": true,
 			"license": "MIT",
 			"bin": {
@@ -5255,6 +5275,8 @@
 		},
 		"node_modules/queue-microtask": {
 			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+			"integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
 			"dev": true,
 			"funding": [
 				{
@@ -5328,7 +5350,6 @@
 		},
 		"node_modules/require-from-string": {
 			"version": "2.0.2",
-			"dev": true,
 			"license": "MIT",
 			"engines": {
 				"node": ">=0.10.0"
@@ -5411,7 +5432,9 @@
 			}
 		},
 		"node_modules/reusify": {
-			"version": "1.0.4",
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz",
+			"integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -5421,6 +5444,8 @@
 		},
 		"node_modules/run-parallel": {
 			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+			"integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
 			"dev": true,
 			"funding": [
 				{
@@ -5469,7 +5494,9 @@
 			"license": "MIT"
 		},
 		"node_modules/sass": {
-			"version": "1.85.0",
+			"version": "1.85.1",
+			"resolved": "https://registry.npmjs.org/sass/-/sass-1.85.1.tgz",
+			"integrity": "sha512-Uk8WpxM5v+0cMR0XjX9KfRIacmSG86RH4DCCZjLU2rFh5tyutt9siAXJ7G+YfxQ99Q6wrRMbMlVl6KqUms71ag==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5871,7 +5898,9 @@
 			}
 		},
 		"node_modules/terser-webpack-plugin": {
-			"version": "5.3.11",
+			"version": "5.3.14",
+			"resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.14.tgz",
+			"integrity": "sha512-vkZjpUjb6OMS7dhV+tILUW6BhpDR7P2L/aQSAv+Uwk+m8KATX9EccViHTJR2qDtACKPIYndLGCyl3FMo+r2LMw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -6196,8 +6225,9 @@
 			}
 		},
 		"node_modules/typescript": {
-			"version": "5.7.3",
-			"dev": true,
+			"version": "5.8.2",
+			"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.2.tgz",
+			"integrity": "sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ==",
 			"license": "Apache-2.0",
 			"bin": {
 				"tsc": "bin/tsc",
@@ -6208,13 +6238,15 @@
 			}
 		},
 		"node_modules/typescript-eslint": {
-			"version": "8.24.1",
+			"version": "8.26.1",
+			"resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.26.1.tgz",
+			"integrity": "sha512-t/oIs9mYyrwZGRpDv3g+3K6nZ5uhKEMt2oNmAPwaY4/ye0+EH4nXIPYNtkYFS6QHm+1DFg34DbglYBz5P9Xysg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@typescript-eslint/eslint-plugin": "8.24.1",
-				"@typescript-eslint/parser": "8.24.1",
-				"@typescript-eslint/utils": "8.24.1"
+				"@typescript-eslint/eslint-plugin": "8.26.1",
+				"@typescript-eslint/parser": "8.26.1",
+				"@typescript-eslint/utils": "8.26.1"
 			},
 			"engines": {
 				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -6225,7 +6257,7 @@
 			},
 			"peerDependencies": {
 				"eslint": "^8.57.0 || ^9.0.0",
-				"typescript": ">=4.8.4 <5.8.0"
+				"typescript": ">=4.8.4 <5.9.0"
 			}
 		},
 		"node_modules/undici-types": {
@@ -6280,7 +6312,6 @@
 		},
 		"node_modules/uri-js-replace": {
 			"version": "1.0.1",
-			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/url": {
@@ -6311,7 +6342,6 @@
 		},
 		"node_modules/uuid": {
 			"version": "11.1.0",
-			"dev": true,
 			"funding": [
 				"https://github.com/sponsors/broofa",
 				"https://github.com/sponsors/ctavan"
@@ -6480,6 +6510,8 @@
 		},
 		"node_modules/webpack-merge": {
 			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-6.0.1.tgz",
+			"integrity": "sha512-hXXvrjtx2PLYx4qruKl+kyRSLc52V+cCvMxRjmKwoA+CBbbF5GfIBtR6kCvl0fYGqTUPKB+1ktVmTHqMOzgCBg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -6643,7 +6675,6 @@
 		},
 		"node_modules/yaml-ast-parser": {
 			"version": "0.0.43",
-			"dev": true,
 			"license": "Apache-2.0"
 		},
 		"node_modules/yargs": {
@@ -6665,7 +6696,6 @@
 		},
 		"node_modules/yargs-parser": {
 			"version": "21.1.1",
-			"dev": true,
 			"license": "ISC",
 			"engines": {
 				"node": ">=12"
@@ -6698,7 +6728,7 @@
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
-				"@types/node": "^22.13.5",
+				"@types/node": "^22.13.10",
 				"css-loader": "^7.1.2",
 				"date-fns": "^4.1.0",
 				"file-loader": "^6.2.0",
@@ -6707,14 +6737,14 @@
 				"mini-css-extract-plugin": "^2.9.2",
 				"obsidian": "1.8.7",
 				"resolve-url-loader": "^5.0.0",
-				"sass": "^1.85.0",
+				"sass": "^1.85.1",
 				"sass-loader": "^16.0.5",
 				"sync-client": "file:../sync-client",
-				"terser-webpack-plugin": "^5.3.11",
+				"terser-webpack-plugin": "^5.3.14",
 				"ts-jest": "^29.2.6",
 				"ts-loader": "^9.5.2",
 				"tslib": "2.8.1",
-				"typescript": "5.7.3",
+				"typescript": "5.8.2",
 				"url": "^0.11.4",
 				"virtual-scroller": "^1.13.1",
 				"webpack": "^5.98.0",
@@ -6723,22 +6753,26 @@
 		},
 		"sync-client": {
 			"version": "0.0.0",
-			"devDependencies": {
-				"@types/jest": "^29.5.14",
-				"@types/node": "^22.13.5",
+			"dependencies": {
 				"byte-base64": "^1.1.0",
 				"fetch-retry": "^6.0.0",
-				"jest": "^29.7.0",
-				"openapi-fetch": "0.13.4",
+				"openapi-fetch": "0.13.5",
 				"openapi-typescript": "7.6.1",
 				"p-queue": "^8.1.0",
+				"uuid": "^11.1.0"
+			},
+			"devDependencies": {
+				"@types/jest": "^29.5.14",
+				"@types/node": "^22.13.10",
+				"jest": "^29.7.0",
 				"sync_lib": "file:../../backend/sync_lib/pkg",
 				"ts-jest": "^29.2.6",
 				"ts-loader": "^9.5.2",
 				"tslib": "2.8.1",
-				"typescript": "5.7.3",
+				"typescript": "5.8.2",
 				"webpack": "^5.98.0",
-				"webpack-cli": "^6.0.1"
+				"webpack-cli": "^6.0.1",
+				"webpack-merge": "^6.0.1"
 			}
 		},
 		"test-client": {
@@ -6747,11 +6781,11 @@
 				"test-client": "dist/cli.js"
 			},
 			"devDependencies": {
-				"@types/node": "^22.13.5",
+				"@types/node": "^22.13.10",
 				"sync-client": "file:../sync-client",
 				"ts-loader": "^9.5.2",
 				"tslib": "2.8.1",
-				"typescript": "5.7.3",
+				"typescript": "5.8.2",
 				"uuid": "^11.1.0",
 				"webpack": "^5.98.0",
 				"webpack-cli": "^6.0.1"
diff --git a/frontend/package.json b/frontend/package.json
index 301e28f7..24c46388 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -21,10 +21,10 @@
 	},
 	"devDependencies": {
 		"concurrently": "^9.1.2",
-		"eslint": "9.21.0",
+		"eslint": "9.22.0",
 		"eslint-plugin-unused-imports": "^4.1.4",
-		"npm-check-updates": "^17.1.14",
-		"prettier": "^3.5.2",
-		"typescript-eslint": "8.24.1"
+		"npm-check-updates": "^17.1.15",
+		"prettier": "^3.5.3",
+		"typescript-eslint": "8.26.1"
 	}
 }
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index 94340f33..f08b5f5a 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -1,29 +1,36 @@
 {
 	"name": "sync-client",
-	"version": "0.0.0",
-	"private": true,
-	"main": "dist/index.js",
+	"version": "0.0.30",
+	"main": "dist/sync-client.node.js",
+	"browser": "dist/sync-client.web.js",
 	"types": "dist/types/index.d.ts",
+	"files": [
+		"dist/**/*"
+	],
 	"scripts": {
 		"dev": "webpack watch --mode development",
 		"build": "webpack --mode production",
 		"test": "NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules\" jest"
 	},
+	"dependencies": {
+		"byte-base64": "^1.1.0",
+		"fetch-retry": "^6.0.0",
+		"openapi-fetch": "0.13.5",
+		"openapi-typescript": "7.6.1",
+		"p-queue": "^8.1.0",
+		"uuid": "^11.1.0"
+	},
 	"devDependencies": {
-		"tslib": "2.8.1",
-		"typescript": "5.7.3",
-		"sync_lib": "file:../../backend/sync_lib/pkg",
 		"@types/jest": "^29.5.14",
-		"@types/node": "^22.13.5",
+		"@types/node": "^22.13.10",
 		"jest": "^29.7.0",
 		"ts-jest": "^29.2.6",
-		"p-queue": "^8.1.0",
-		"fetch-retry": "^6.0.0",
-		"byte-base64": "^1.1.0",
-		"openapi-fetch": "0.13.4",
-		"openapi-typescript": "7.6.1",
 		"ts-loader": "^9.5.2",
+		"tslib": "2.8.1",
+		"typescript": "5.8.2",
 		"webpack": "^5.98.0",
-		"webpack-cli": "^6.0.1"
+		"webpack-cli": "^6.0.1",
+		"webpack-merge": "^6.0.1",
+		"sync_lib": "file:../../backend/sync_lib/pkg"
 	}
-}
+}
\ No newline at end of file
diff --git a/frontend/sync-client/src/file-operations/document-locks.ts b/frontend/sync-client/src/file-operations/document-locks.ts
index 3dc7ec29..522ed02a 100644
--- a/frontend/sync-client/src/file-operations/document-locks.ts
+++ b/frontend/sync-client/src/file-operations/document-locks.ts
@@ -1,6 +1,9 @@
 import type { Logger } from "../tracing/logger";
 import type { RelativePath } from "../persistence/database";
 
+// Manages locks on documents to prevent concurrent modifications
+// allowing the client's FileOperations implementation to be simpler.
+// Locks are granted in a first-in-first-out order.
 export class DocumentLocks {
 	private readonly locked = new Set<RelativePath>();
 	private readonly waiters = new Map<RelativePath, (() => void)[]>();
diff --git a/frontend/sync-client/src/file-operations/file-operations.test.ts b/frontend/sync-client/src/file-operations/file-operations.test.ts
index 2e7c57b7..43308f8c 100644
--- a/frontend/sync-client/src/file-operations/file-operations.test.ts
+++ b/frontend/sync-client/src/file-operations/file-operations.test.ts
@@ -1,16 +1,27 @@
-import type { FileSystemOperations } from "sync-client";
-import type { Database, RelativePath } from "../persistence/database";
+import type {
+	Database,
+	DocumentRecord,
+	RelativePath
+} from "../persistence/database";
 import { FileOperations } from "./file-operations";
 import { Logger } from "../tracing/logger";
 import { assertSetContainsExactly } from "../utils/assert-set-contains-exactly";
+import type { FileSystemOperations } from "./filesystem-operations";
 
 describe("File operations", () => {
-	class MockDatabase {
-		public async updatePath(
+	class MockDatabase implements Partial<Database> {
+		public getLatestDocumentByRelativePath(
+			_find: RelativePath
+		): DocumentRecord | undefined {
+			// no-op
+			return undefined;
+		}
+
+		public move(
 			_oldRelativePath: RelativePath,
 			_newRelativePath: RelativePath
-		): Promise<void> {
-			// this is called but irrelevant for this mock
+		): void {
+			// no-op
 		}
 	}
 
diff --git a/frontend/sync-client/src/file-operations/file-operations.ts b/frontend/sync-client/src/file-operations/file-operations.ts
index 9977d60b..b198caa4 100644
--- a/frontend/sync-client/src/file-operations/file-operations.ts
+++ b/frontend/sync-client/src/file-operations/file-operations.ts
@@ -1,10 +1,6 @@
-import type { Logger } from "src/tracing/logger";
+import type { Logger } from "../tracing/logger";
 import type { FileSystemOperations } from "./filesystem-operations";
-import type {
-	Database,
-	DocumentId,
-	RelativePath
-} from "src/persistence/database";
+import type { Database, RelativePath } from "../persistence/database";
 import { isBinary, isFileTypeMergable, mergeText } from "sync_lib";
 import { SafeFileSystemOperations } from "./safe-filesystem-operations";
 
@@ -17,7 +13,7 @@ export class FileOperations {
 		private readonly database: Database,
 		fs: FileSystemOperations
 	) {
-		this.fs = new SafeFileSystemOperations(fs);
+		this.fs = new SafeFileSystemOperations(fs, logger);
 	}
 
 	public async listAllFiles(): Promise<RelativePath[]> {
@@ -35,7 +31,7 @@ export class FileOperations {
 
 		const decoder = new TextDecoder("utf-8");
 
-		// Normalize line endings to LF on Windows
+		// Normalize line-endings to LF on Windows
 		let text = decoder.decode(content);
 		text = text.replace(/\r\n/g, "\n");
 
@@ -46,10 +42,6 @@ export class FileOperations {
 		return this.fs.getFileSize(path);
 	}
 
-	public async getModificationTime(path: RelativePath): Promise<Date> {
-		return this.fs.getModificationTime(path);
-	}
-
 	public async exists(path: RelativePath): Promise<boolean> {
 		return this.fs.exists(path);
 	}
@@ -60,18 +52,23 @@ export class FileOperations {
 		path: RelativePath,
 		newContent: Uint8Array
 	): Promise<void> {
+		this.logger.debug(`Creating file: ${path}`);
+
+		await this.fs.write(path, newContent);
+	}
+
+	public async ensureClearPath(path: RelativePath): Promise<void> {
 		if (await this.fs.exists(path)) {
 			const deconflictedPath = await this.deconflictPath(path);
 			this.logger.debug(
 				`Didn't expect ${path} to exist, deconflicting by moving it to '${deconflictedPath}'`
 			);
-			await this.database.updatePath(path, deconflictedPath);
+
+			this.database.move(path, deconflictedPath);
 			await this.fs.rename(path, deconflictedPath);
 		} else {
 			await this.createParentDirectories(path);
 		}
-
-		await this.fs.write(path, newContent);
 	}
 
 	// Update the file at the given path.
@@ -126,40 +123,25 @@ export class FileOperations {
 		return new TextEncoder().encode(resultText);
 	}
 
-	public async remove(path: RelativePath): Promise<void> {
-		this.logger.debug(`Deleting file: ${path}`);
-		return this.fs.delete(path);
+	public async delete(path: RelativePath): Promise<void> {
+		if (await this.exists(path)) {
+			this.logger.debug(`Deleting file: ${path}`);
+			return this.fs.delete(path);
+		} else {
+			this.logger.debug(`No need to delete '${path}', it doesn't exist`);
+		}
 	}
 
 	public async move(
 		oldPath: RelativePath,
-		newPath: RelativePath,
-		documentId?: DocumentId
+		newPath: RelativePath
 	): Promise<void> {
 		if (oldPath === newPath) {
 			return;
 		}
+		await this.ensureClearPath(newPath);
 
-		if (await this.fs.exists(newPath)) {
-			const deconflictedPath = await this.deconflictPath(newPath);
-			this.logger.debug(
-				`Conflict when moving '${oldPath}' to '${newPath}', the latter already exists, deconflicting by moving it to '${deconflictedPath}'`
-			);
-
-			const existingMetadata = this.database.getDocument(newPath);
-			if (
-				existingMetadata === undefined ||
-				existingMetadata.documentId !== documentId
-			) {
-				await this.database.updatePath(newPath, deconflictedPath);
-				await this.fs.rename(newPath, deconflictedPath);
-			} else {
-				await this.database.deleteDocument(newPath);
-			}
-		} else {
-			await this.createParentDirectories(newPath);
-		}
-
+		this.database.move(oldPath, newPath);
 		await this.fs.rename(oldPath, newPath);
 	}
 
@@ -201,17 +183,12 @@ export class FileOperations {
 		);
 		stem = stem.replace(FileOperations.PARENTHESES_REGEX, "");
 
-		// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-		while (true) {
-			const newName =
-				currentCount === 0
-					? `${directory}${stem}${extension}`
-					: `${directory}${stem} (${currentCount})${extension}`;
-			if (await this.fs.exists(newName)) {
-				currentCount++;
-			} else {
-				return newName;
-			}
-		}
+		let newName = path;
+		do {
+			currentCount++;
+			newName = `${directory}${stem} (${currentCount})${extension}`;
+		} while (await this.fs.exists(newName));
+
+		return newName;
 	}
 }
diff --git a/frontend/sync-client/src/file-operations/filesystem-operations.ts b/frontend/sync-client/src/file-operations/filesystem-operations.ts
index 9ea577f7..3cab9d2d 100644
--- a/frontend/sync-client/src/file-operations/filesystem-operations.ts
+++ b/frontend/sync-client/src/file-operations/filesystem-operations.ts
@@ -1,4 +1,4 @@
-import type { RelativePath } from "src/persistence/database";
+import type { RelativePath } from "../persistence/database";
 
 export interface FileSystemOperations {
 	listAllFiles: () => Promise<RelativePath[]>;
@@ -9,11 +9,8 @@ export interface FileSystemOperations {
 		updater: (currentContent: string) => string
 	) => Promise<string>;
 	getFileSize: (path: RelativePath) => Promise<number>;
-	getModificationTime: (path: RelativePath) => Promise<Date>;
 	exists: (path: RelativePath) => Promise<boolean>;
 	createDirectory: (path: RelativePath) => Promise<void>;
 	delete: (path: RelativePath) => Promise<void>;
-
-	// Must be able to handle renaming to a file that already exists
 	rename: (oldPath: RelativePath, newPath: RelativePath) => Promise<void>;
 }
diff --git a/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts b/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
index e493d12f..c13611ef 100644
--- a/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
+++ b/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
@@ -1,5 +1,7 @@
-import type { RelativePath } from "src/persistence/database";
+import type { RelativePath } from "../persistence/database";
 import type { FileSystemOperations } from "./filesystem-operations";
+import type { Logger } from "../tracing/logger";
+import { DocumentLocks } from "./document-locks";
 
 export class FileNotFoundError extends Error {
 	public constructor(message: string) {
@@ -9,71 +11,134 @@ export class FileNotFoundError extends Error {
 }
 
 // Decorate FileSystemOperations replacing errors with FileNotFoundError
-// if the accessed file doesn't exist.
+// if the accessed file doesn't exist. It also ensures that there's only
+// ever a single request in-flight for any one file through the use of
+// DocumentLocks.
 export class SafeFileSystemOperations implements FileSystemOperations {
-	public constructor(private readonly fs: FileSystemOperations) {}
+	private readonly locks: DocumentLocks;
+
+	public constructor(
+		private readonly fs: FileSystemOperations,
+		private readonly logger: Logger
+	) {
+		this.locks = new DocumentLocks(logger);
+	}
 
 	public async listAllFiles(): Promise<RelativePath[]> {
 		return this.fs.listAllFiles();
 	}
 
 	public async read(path: RelativePath): Promise<Uint8Array> {
-		return this.safeOperation(path, async () => this.fs.read(path));
+		this.logger.debug(`Reading file: ${path}`);
+		return this.safeOperation(
+			path,
+			this.decorateToHoldLock(path, async () => this.fs.read(path)),
+			"read"
+		);
 	}
 
 	public async write(path: RelativePath, content: Uint8Array): Promise<void> {
-		return this.fs.write(path, content);
+		this.logger.debug(`Writing file: ${path}`);
+		return this.decorateToHoldLock(path, async () =>
+			this.fs.write(path, content)
+		)();
 	}
 
 	public async atomicUpdateText(
 		path: RelativePath,
 		updater: (currentContent: string) => string
 	): Promise<string> {
-		return this.safeOperation(path, async () =>
-			this.fs.atomicUpdateText(path, updater)
+		this.logger.debug(`Atomic update of file: ${path}`);
+		return this.safeOperation(
+			path,
+			this.decorateToHoldLock(path, async () =>
+				this.fs.atomicUpdateText(path, updater)
+			),
+			"atomicUpdateText"
 		);
 	}
 
 	public async getFileSize(path: RelativePath): Promise<number> {
-		return this.safeOperation(path, async () => this.fs.getFileSize(path));
-	}
-
-	public async getModificationTime(path: RelativePath): Promise<Date> {
-		return this.safeOperation(path, async () =>
-			this.fs.getModificationTime(path)
+		this.logger.debug(`Getting file size: ${path}`);
+		return this.safeOperation(
+			path,
+			this.decorateToHoldLock(path, async () =>
+				this.fs.getFileSize(path)
+			),
+			"getFileSize"
 		);
 	}
 
 	public async exists(path: RelativePath): Promise<boolean> {
-		return this.fs.exists(path);
+		this.logger.debug(`Checking if file exists: ${path}`);
+		return this.decorateToHoldLock(path, async () =>
+			this.fs.exists(path)
+		)();
 	}
 
 	public async createDirectory(path: RelativePath): Promise<void> {
-		return this.fs.createDirectory(path);
+		this.logger.debug(`Creating directory: ${path}`);
+		return this.decorateToHoldLock(path, async () =>
+			this.fs.createDirectory(path)
+		)();
 	}
 
 	public async delete(path: RelativePath): Promise<void> {
-		return this.fs.delete(path);
+		this.logger.debug(`Deleting file: ${path}`);
+		return this.decorateToHoldLock(path, async () =>
+			this.fs.delete(path)
+		)();
 	}
 
 	public async rename(
 		oldPath: RelativePath,
 		newPath: RelativePath
 	): Promise<void> {
-		return this.safeOperation(oldPath, async () =>
-			this.fs.rename(oldPath, newPath)
+		this.logger.debug(`Renaming file: ${oldPath} to ${newPath}`);
+		return this.safeOperation(
+			oldPath,
+			this.decorateToHoldLock([oldPath, newPath], async () =>
+				this.fs.rename(oldPath, newPath)
+			),
+			"rename"
 		);
 	}
 
+	private decorateToHoldLock<T>(
+		pathOrPaths: RelativePath | RelativePath[],
+		operation: () => Promise<T>
+	): () => Promise<T> {
+		return async () => {
+			const paths = Array.isArray(pathOrPaths)
+				? pathOrPaths
+				: [pathOrPaths];
+			await Promise.all(
+				paths.map(async (path) => this.locks.waitForDocumentLock(path))
+			);
+			try {
+				return await operation();
+			} finally {
+				await Promise.all(
+					paths.map((path) => {
+						this.locks.unlockDocument(path);
+					})
+				);
+			}
+		};
+	}
+
 	private async safeOperation<T>(
 		path: RelativePath,
-		operation: () => Promise<T>
+		operation: () => Promise<T>,
+		operationName: string
 	): Promise<T> {
 		// Without locking the file, this isn't atomic, however, it's good enough practicaly.
 		// This will only break if the file exists, gets deleted and then immediately
 		// recreated while `operation` is running.
 		if (!(await this.fs.exists(path))) {
-			throw new FileNotFoundError(path);
+			throw new FileNotFoundError(
+				`File not found: ${path} before trying to ${operationName}`
+			);
 		}
 		try {
 			return await operation();
@@ -81,7 +146,9 @@ export class SafeFileSystemOperations implements FileSystemOperations {
 			if (await this.fs.exists(path)) {
 				throw error;
 			} else {
-				throw new FileNotFoundError(path);
+				throw new FileNotFoundError(
+					`File not found: ${path} when trying to ${operationName}`
+				);
 			}
 		}
 	}
diff --git a/frontend/sync-client/src/persistence/database.ts b/frontend/sync-client/src/persistence/database.ts
index a013d9ac..9f003d4c 100644
--- a/frontend/sync-client/src/persistence/database.ts
+++ b/frontend/sync-client/src/persistence/database.ts
@@ -1,23 +1,43 @@
+import type { Logger } from "../tracing/logger";
+
 export type VaultUpdateId = number;
 export type DocumentId = string;
 export type RelativePath = string;
 
 export interface DocumentMetadata {
 	parentVersionId: VaultUpdateId;
-	documentId: DocumentId;
 	hash: string;
 }
 
-import type { Logger } from "src/tracing/logger";
+export interface StoredDocumentMetadata {
+	relativePath: RelativePath;
+	documentId: DocumentId;
+	parentVersionId: VaultUpdateId;
+	hash: string;
+}
 
 export interface StoredDatabase {
-	documents: Record<RelativePath, DocumentMetadata>;
+	documents: StoredDocumentMetadata[];
 	lastSeenUpdateId: VaultUpdateId | undefined;
 }
 
-export class Database {
-	private documents = new Map<RelativePath, DocumentMetadata>();
+/**
+ * Represents a document in the database.
+ *
+ * It is mutable and its content should always represent the latest
+ * state of the document on disk based on the update events we have seen.
+ */
+export interface DocumentRecord {
+	relativePath: RelativePath;
+	documentId: DocumentId;
+	metadata: DocumentMetadata | undefined;
+	isDeleted: boolean;
+	updates: Promise<void>[];
+	parallelVersion: number;
+}
 
+export class Database {
+	private documents: DocumentRecord[];
 	private lastSeenUpdateId: VaultUpdateId | undefined;
 
 	public constructor(
@@ -26,16 +46,21 @@ export class Database {
 		private readonly saveData: (data: StoredDatabase) => Promise<void>
 	) {
 		initialState ??= {};
-		if (initialState.documents) {
-			for (const [relativePath, metadata] of Object.entries(
-				initialState.documents
-			)) {
-				this.documents.set(relativePath, metadata);
-			}
-		}
-		this.ensureConsistency();
 
-		this.logger.debug(`Loaded ${this.documents.size} documents`);
+		this.documents =
+			initialState.documents?.map(
+				({ relativePath, documentId, ...metadata }) => ({
+					relativePath,
+					documentId,
+					metadata,
+					isDeleted: false,
+					updates: [],
+					parallelVersion: 0
+				})
+			) ?? [];
+
+		this.ensureConsistency();
+		this.logger.debug(`Loaded ${this.documents.length} documents`);
 
 		this.lastSeenUpdateId = initialState.lastSeenUpdateId;
 		this.logger.debug(
@@ -43,109 +68,213 @@ export class Database {
 		);
 	}
 
-	public getDocuments(): Map<RelativePath, DocumentMetadata> {
-		return this.documents;
+	public get length(): number {
+		return this.documents.length;
+	}
+
+	public get resolvedDocuments(): DocumentRecord[] {
+		const paths = new Map<string, DocumentRecord[]>();
+		this.documents
+			.filter(({ metadata }) => metadata !== undefined)
+			.forEach((record) =>
+				paths.set(record.relativePath, [
+					record,
+					...(paths.get(record.relativePath) ?? [])
+				])
+			);
+
+		return Array.from(paths.values()).map((records) => {
+			records.sort(
+				(a, b) => b.parallelVersion - a.parallelVersion // descending
+			);
+
+			if (
+				records.length > 1 &&
+				records.some((current, i) =>
+					i === 0
+						? false
+						: records[i - 1].parallelVersion ===
+							current.parallelVersion
+				)
+			) {
+				throw new Error(
+					`Multiple documents with the same parallel version and path at ${records[0].relativePath}`
+				);
+			}
+			return records[0];
+		});
 	}
 
 	public getLastSeenUpdateId(): VaultUpdateId | undefined {
 		return this.lastSeenUpdateId;
 	}
 
-	public async setLastSeenUpdateId(
-		value: VaultUpdateId | undefined
-	): Promise<void> {
+	public setLastSeenUpdateId(value: VaultUpdateId | undefined): void {
 		this.lastSeenUpdateId = value;
-		await this.save();
+		this.save();
 	}
 
-	public async resetSyncState(): Promise<void> {
-		this.documents = new Map();
+	public resetSyncState(): void {
+		this.documents = [];
 		this.lastSeenUpdateId = 0;
-		await this.save();
+		this.save();
+	}
+
+	public updateDocumentMetadata(
+		metadata: {
+			parentVersionId: VaultUpdateId;
+			hash: string;
+		},
+		toUpdate: DocumentRecord
+	): void {
+		if (!this.documents.includes(toUpdate)) {
+			throw new Error("Document not found in database");
+		}
+
+		toUpdate.metadata = metadata;
+
+		this.save();
+	}
+
+	public removeDocumentPromise(promise: Promise<void>): void {
+		const entry = this.documents.find(({ updates }) =>
+			updates.includes(promise)
+		);
+
+		if (entry === undefined) {
+			throw new Error("Document not found by update promise");
+		}
+
+		entry.updates = entry.updates.filter((update) => update !== promise);
+		// No need to save as Promises don't get serialized
+	}
+
+	public getLatestDocumentByRelativePath(
+		find: RelativePath
+	): DocumentRecord | undefined {
+		const candidates = this.documents.filter(
+			({ relativePath }) => relativePath === find
+		);
+		candidates.sort((a, b) => b.parallelVersion - a.parallelVersion); // descending
+		return candidates[0];
+	}
+
+	public async getResolvedDocumentByRelativePath(
+		relativePath: RelativePath,
+		promise: Promise<void>
+	): Promise<DocumentRecord> {
+		const entry = this.getLatestDocumentByRelativePath(relativePath);
+
+		if (entry === undefined) {
+			throw new Error(
+				`Document not found by relative path: ${relativePath}, ${JSON.stringify(
+					this.documents,
+					null,
+					2
+				)}`
+			);
+		}
+
+		const currentPromises = entry.updates;
+		entry.updates = [...currentPromises, promise];
+		await Promise.all(currentPromises);
+
+		return entry;
+	}
+
+	public createNewPendingDocument(
+		documentId: DocumentId,
+		relativePath: RelativePath,
+		promise: Promise<void>
+	): DocumentRecord {
+		const previousEntry =
+			this.getLatestDocumentByRelativePath(relativePath);
+
+		const entry = {
+			relativePath,
+			documentId,
+			metadata: undefined,
+			isDeleted: false,
+			updates: [promise],
+			parallelVersion:
+				previousEntry?.parallelVersion === undefined
+					? 0
+					: previousEntry.parallelVersion + 1
+		};
+
+		this.documents.push(entry);
+		this.save();
+
+		return entry;
 	}
 
 	public getDocumentByDocumentId(
-		documentId: DocumentId
-	): [RelativePath, DocumentMetadata] | undefined {
-		return [...this.documents.entries()].find(
-			([_, metadata]) => metadata.documentId === documentId
-		);
+		find: DocumentId
+	): DocumentRecord | undefined {
+		return this.documents.find(({ documentId }) => documentId === find);
 	}
 
-	public async setDocument({
-		documentId,
-		relativePath,
-		parentVersionId,
-		hash
-	}: {
-		documentId: DocumentId;
-		relativePath: RelativePath;
-		parentVersionId: VaultUpdateId;
-		hash: string;
-	}): Promise<void> {
-		this.documents.set(relativePath, {
-			documentId,
-			parentVersionId,
-			hash
-		});
-		await this.save();
-	}
-
-	public async removeDocument(relativePath: RelativePath): Promise<void> {
-		this.documents.delete(relativePath);
-		await this.save();
-	}
-
-	public getDocument(
-		relativePath: RelativePath
-	): DocumentMetadata | undefined {
-		return this.documents.get(relativePath);
-	}
-
-	public async deleteDocument(relativePath: RelativePath): Promise<void> {
-		this.documents.delete(relativePath);
-		await this.save();
-	}
-
-	public async updatePath(
+	public move(
 		oldRelativePath: RelativePath,
 		newRelativePath: RelativePath
-	): Promise<void> {
-		const document = this.documents.get(oldRelativePath);
-		if (!document) {
+	): void {
+		const oldDocument =
+			this.getLatestDocumentByRelativePath(oldRelativePath);
+
+		if (oldDocument === undefined) {
+			return;
+		}
+
+		const newDocument =
+			this.getLatestDocumentByRelativePath(newRelativePath);
+		if (newDocument?.isDeleted === false) {
 			throw new Error(
-				`Cannot update physical path for document that does not exist: ${oldRelativePath}`
+				`Document already exists at new location: ${newRelativePath}`
 			);
 		}
 
-		if (this.documents.has(newRelativePath)) {
-			throw new Error(
-				`Cannot update physical path to path that is already in use: ${newRelativePath}`
-			);
-		}
+		oldDocument.relativePath = newRelativePath;
+		// We're in a strange state where the target of the move has just got deleted,
+		// however, its metadata might already have a bunch of updates queued up for
+		// the document at the new location. We need to keep these updates.
+		oldDocument.parallelVersion =
+			newDocument !== undefined ? newDocument.parallelVersion + 1 : 0;
 
-		this.documents.delete(oldRelativePath);
-		this.documents.set(newRelativePath, document);
-
-		await this.save();
+		this.save();
 	}
 
-	private async save(): Promise<void> {
+	public delete(relativePath: RelativePath): void {
+		const candidate = this.getLatestDocumentByRelativePath(relativePath);
+		if (candidate === undefined) {
+			throw new Error(
+				`Document not found by relative path: ${relativePath}`
+			);
+		}
+		candidate.isDeleted = true;
+	}
+
+	private save(): void {
 		this.ensureConsistency();
-		await this.saveData({
-			documents: Object.fromEntries(this.documents.entries()),
+		void this.saveData({
+			documents: this.resolvedDocuments.map(
+				({ relativePath, documentId, metadata }) => ({
+					documentId,
+					relativePath,
+					// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+					...metadata! // resolvedDocuments only returns docs with metadata set
+				})
+			),
 			lastSeenUpdateId: this.lastSeenUpdateId
 		});
 	}
 
 	private ensureConsistency(): void {
-		const allMetadata = Array.from(this.documents.entries());
-		const idToPath = new Map<string, Array<string>>();
+		const idToPath = new Map<string, string[]>();
 
-		allMetadata.forEach(([name, metadata]) => {
-			idToPath.set(metadata.documentId, [
-				...(idToPath.get(metadata.documentId) ?? []),
-				name
+		this.resolvedDocuments.forEach(({ relativePath, documentId }) => {
+			idToPath.set(documentId, [
+				...(idToPath.get(documentId) ?? []),
+				relativePath
 			]);
 		});
 
diff --git a/frontend/sync-client/src/persistence/settings.ts b/frontend/sync-client/src/persistence/settings.ts
index 29a77ff7..dbeb8c15 100644
--- a/frontend/sync-client/src/persistence/settings.ts
+++ b/frontend/sync-client/src/persistence/settings.ts
@@ -1,5 +1,5 @@
-import type { Logger } from "src/tracing/logger";
-import { LogLevel } from "src/tracing/logger";
+import type { Logger } from "../tracing/logger";
+import { LogLevel } from "../tracing/logger";
 
 export interface SyncSettings {
 	remoteUri: string;
diff --git a/frontend/sync-client/src/services/connected-state.ts b/frontend/sync-client/src/services/connected-state.ts
new file mode 100644
index 00000000..4b62b792
--- /dev/null
+++ b/frontend/sync-client/src/services/connected-state.ts
@@ -0,0 +1,51 @@
+import type { Settings } from "../persistence/settings";
+import type { Logger } from "../tracing/logger";
+import { createPromise } from "../utils/create-promise";
+import { retriedFetchFactory } from "../utils/retried-fetch";
+
+export class ConnectedState {
+	private resolveIsSyncEnabled: (() => void) | undefined;
+	private syncIsEnabled: Promise<void> | undefined;
+
+	public constructor(
+		settings: Settings,
+		private readonly logger: Logger
+	) {
+		settings.addOnSettingsChangeHandlers((newSettings, oldSettings) => {
+			if (!oldSettings.isSyncEnabled && newSettings.isSyncEnabled) {
+				this.handleComingOnline();
+			} else if (
+				oldSettings.isSyncEnabled &&
+				!newSettings.isSyncEnabled
+			) {
+				this.handleGoingOffline();
+			}
+		});
+	}
+
+	public getFetchImplementation(
+		fetch: typeof globalThis.fetch,
+		{ doRetries = true }: { doRetries: boolean } = { doRetries: true }
+	): typeof globalThis.fetch {
+		const retriedFetch = doRetries
+			? retriedFetchFactory(this.logger, fetch)
+			: fetch;
+
+		return async (input: RequestInfo | URL): Promise<Response> => {
+			if (this.syncIsEnabled !== undefined) {
+				await this.syncIsEnabled;
+			}
+			return retriedFetch(input);
+		};
+	}
+
+	private handleComingOnline(): void {
+		this.logger.debug("Sync is enabled");
+		this.resolveIsSyncEnabled?.();
+	}
+
+	private handleGoingOffline(): void {
+		this.logger.debug("Sync is disabled");
+		[this.syncIsEnabled, this.resolveIsSyncEnabled] = createPromise();
+	}
+}
diff --git a/frontend/sync-client/src/services/sync-service.ts b/frontend/sync-client/src/services/sync-service.ts
index 56e8a697..74954cf3 100644
--- a/frontend/sync-client/src/services/sync-service.ts
+++ b/frontend/sync-client/src/services/sync-service.ts
@@ -6,20 +6,22 @@ import type {
 	RelativePath,
 	VaultUpdateId
 } from "../persistence/database";
-import type { Logger } from "src/tracing/logger";
-import { retriedFetchFactory } from "src/utils/retried-fetch";
-import type { Settings } from "src/persistence/settings";
+import type { Logger } from "../tracing/logger";
+import type { Settings } from "../persistence/settings";
+import type { ConnectedState } from "./connected-state";
 
 export interface CheckConnectionResult {
 	isSuccessful: boolean;
 	message: string;
 }
+
 export class SyncService {
 	private client!: Client<paths>;
 	private clientWithoutRetries!: Client<paths>;
 	private _fetchImplementation: typeof globalThis.fetch = globalThis.fetch;
 
 	public constructor(
+		private readonly connectedState: ConnectedState,
 		private readonly settings: Settings,
 		private readonly logger: Logger
 	) {
@@ -52,17 +54,19 @@ export class SyncService {
 	}
 
 	public async create({
+		documentId,
 		relativePath,
-		contentBytes,
-		createdDate
+		contentBytes
 	}: {
+		documentId?: DocumentId;
 		relativePath: RelativePath;
 		contentBytes: Uint8Array;
-		createdDate: Date;
-	}): Promise<components["schemas"]["DocumentUpdateResponse"]> {
+	}): Promise<components["schemas"]["DocumentVersionWithoutContent"]> {
 		const formData = new FormData();
+		if (documentId !== undefined) {
+			formData.append("document_id", documentId);
+		}
 		formData.append("relative_path", relativePath);
-		formData.append("created_date", createdDate.toISOString());
 		formData.append("content", new Blob([contentBytes]));
 
 		const response = await this.client.POST(
@@ -100,18 +104,18 @@ export class SyncService {
 		parentVersionId,
 		documentId,
 		relativePath,
-		contentBytes,
-		createdDate
+		contentBytes
 	}: {
 		parentVersionId: VaultUpdateId;
 		documentId: DocumentId;
 		relativePath: RelativePath;
 		contentBytes: Uint8Array;
-		createdDate: Date;
 	}): Promise<components["schemas"]["DocumentUpdateResponse"]> {
+		this.logger.debug(
+			`Updating document ${documentId} with parent version ${parentVersionId} and relative path ${relativePath}`
+		);
 		const formData = new FormData();
 		formData.append("parent_version_id", parentVersionId.toString());
-		formData.append("created_date", createdDate.toISOString());
 		formData.append("relative_path", relativePath);
 		formData.append("content", new Blob([contentBytes]));
 
@@ -149,13 +153,11 @@ export class SyncService {
 
 	public async delete({
 		documentId,
-		relativePath,
-		createdDate
+		relativePath
 	}: {
 		documentId: DocumentId;
 		relativePath: RelativePath;
-		createdDate: Date;
-	}): Promise<void> {
+	}): Promise<components["schemas"]["DocumentVersionWithoutContent"]> {
 		const response = await this.client.DELETE(
 			"/vaults/{vault_id}/documents/{document_id}",
 			{
@@ -169,7 +171,6 @@ export class SyncService {
 					}
 				},
 				body: {
-					createdDate: createdDate.toISOString(),
 					relativePath
 				}
 			}
@@ -295,11 +296,17 @@ export class SyncService {
 	private createClient(remoteUri: string): void {
 		this.client = createClient<paths>({
 			baseUrl: remoteUri,
-			fetch: retriedFetchFactory(this.logger, this._fetchImplementation)
+			fetch: this.connectedState.getFetchImplementation(
+				this._fetchImplementation
+			)
 		});
 
 		this.clientWithoutRetries = createClient<paths>({
-			baseUrl: remoteUri
+			baseUrl: remoteUri,
+			fetch: this.connectedState.getFetchImplementation(
+				this._fetchImplementation,
+				{ doRetries: false }
+			)
 		});
 	}
 }
diff --git a/frontend/sync-client/src/services/types.ts b/frontend/sync-client/src/services/types.ts
index 79d4b5f8..e8a954f3 100644
--- a/frontend/sync-client/src/services/types.ts
+++ b/frontend/sync-client/src/services/types.ts
@@ -274,12 +274,13 @@ export interface paths {
 				};
 			};
 			responses: {
-				/** @description no content */
 				200: {
 					headers: {
 						[name: string]: unknown;
 					};
-					content?: never;
+					content: {
+						"application/json": components["schemas"]["DocumentVersionWithoutContent"];
+					};
 				};
 				default: {
 					headers: {
@@ -451,26 +452,25 @@ export interface components {
 		Array_of_uint8: number[];
 		CreateDocumentVersion: {
 			contentBase64: string;
-			/** Format: date-time */
-			createdDate: string;
+			/**
+			 * Format: uuid
+			 * @description The client can decide the document id (if it wishes to) in order to help with syncing. If the client does not provide a document id, the server will generate one. If the client provides a document id it must not already exist in the database.
+			 */
+			documentId?: string | null;
 			relativePath: string;
 		};
 		CreateDocumentVersionMultipart: {
 			content: components["schemas"]["Array_of_uint8"];
-			/** Format: date-time */
-			created_date: string;
+			/** Format: uuid */
+			document_id?: string | null;
 			relative_path: string;
 		};
 		DeleteDocumentVersion: {
-			/** Format: date-time */
-			createdDate: string;
 			relativePath: string;
 		};
-		/** @description Response to a update document request. */
+		/** @description Response to an update document request. */
 		DocumentUpdateResponse:
 			| {
-					/** Format: date-time */
-					createdDate: string;
 					/** Format: uuid */
 					documentId: string;
 					isDeleted: boolean;
@@ -479,14 +479,11 @@ export interface components {
 					type: "FastForwardUpdate";
 					/** Format: date-time */
 					updatedDate: string;
-					vaultId: string;
 					/** Format: int64 */
 					vaultUpdateId: number;
 			  }
 			| {
 					contentBase64: string;
-					/** Format: date-time */
-					createdDate: string;
 					/** Format: uuid */
 					documentId: string;
 					isDeleted: boolean;
@@ -495,34 +492,27 @@ export interface components {
 					type: "MergingUpdate";
 					/** Format: date-time */
 					updatedDate: string;
-					vaultId: string;
 					/** Format: int64 */
 					vaultUpdateId: number;
 			  };
 		DocumentVersion: {
 			contentBase64: string;
-			/** Format: date-time */
-			createdDate: string;
 			/** Format: uuid */
 			documentId: string;
 			isDeleted: boolean;
 			relativePath: string;
 			/** Format: date-time */
 			updatedDate: string;
-			vaultId: string;
 			/** Format: int64 */
 			vaultUpdateId: number;
 		};
 		DocumentVersionWithoutContent: {
-			/** Format: date-time */
-			createdDate: string;
 			/** Format: uuid */
 			documentId: string;
 			isDeleted: boolean;
 			relativePath: string;
 			/** Format: date-time */
 			updatedDate: string;
-			vaultId: string;
 			/** Format: int64 */
 			vaultUpdateId: number;
 		};
@@ -587,16 +577,12 @@ export interface components {
 		};
 		UpdateDocumentVersion: {
 			contentBase64: string;
-			/** Format: date-time */
-			createdDate: string;
 			/** Format: int64 */
 			parentVersionId: number;
 			relativePath: string;
 		};
 		UpdateDocumentVersionMultipart: {
 			content: components["schemas"]["Array_of_uint8"];
-			/** Format: date-time */
-			createdDate: string;
 			/** Format: int64 */
 			parentVersionId: number;
 			relativePath: string;
diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts
index 302daf35..dfd366ca 100644
--- a/frontend/sync-client/src/sync-client.ts
+++ b/frontend/sync-client/src/sync-client.ts
@@ -12,6 +12,7 @@ import { SyncService } from "./services/sync-service";
 import { Syncer } from "./sync-operations/syncer";
 import type { FileSystemOperations } from "./file-operations/filesystem-operations";
 import { FileOperations } from "./file-operations/file-operations";
+import { ConnectedState } from "./services/connected-state";
 
 export class SyncClient {
 	private remoteListenerIntervalId: NodeJS.Timeout | null = null;
@@ -42,7 +43,7 @@ export class SyncClient {
 	}
 
 	public get documentCount(): number {
-		return this._database.getDocuments().size;
+		return this._database.length;
 	}
 
 	public set fetchImplementation(fetch: typeof globalThis.fetch) {
@@ -90,7 +91,9 @@ export class SyncClient {
 			}
 		);
 
-		const syncService = new SyncService(settings, logger);
+		const connectedState = new ConnectedState(settings, logger);
+
+		const syncService = new SyncService(connectedState, settings, logger);
 
 		const syncer = new Syncer(
 			logger,
@@ -117,18 +120,13 @@ export class SyncClient {
 		);
 
 		settings.addOnSettingsChangeHandlers((newSettings, oldSettings) => {
-			client.registerRemoteEventListener(
-				newSettings.fetchChangesUpdateIntervalMs
-			);
-
-			if (!oldSettings.isSyncEnabled && newSettings.isSyncEnabled) {
-				syncer
-					.scheduleSyncForOfflineChanges()
-					.catch((_error: unknown) => {
-						logger.error(
-							"Failed to schedule sync for offline changes"
-						);
-					});
+			if (
+				newSettings.fetchChangesUpdateIntervalMs !==
+				oldSettings.fetchChangesUpdateIntervalMs
+			) {
+				client.registerRemoteEventListener(
+					newSettings.fetchChangesUpdateIntervalMs
+				);
 			}
 		});
 
@@ -148,7 +146,7 @@ export class SyncClient {
 		this.stop();
 		await this._syncer.reset();
 		this._history.reset();
-		await this._database.resetSyncState();
+		this._database.resetSyncState();
 		this.logger.reset();
 	}
 
diff --git a/frontend/sync-client/src/sync-operations/syncer.ts b/frontend/sync-client/src/sync-operations/syncer.ts
index dcb476dd..70ba88d5 100644
--- a/frontend/sync-client/src/sync-operations/syncer.ts
+++ b/frontend/sync-client/src/sync-operations/syncer.ts
@@ -1,15 +1,17 @@
 import type { Database, RelativePath } from "../persistence/database";
-
-import type { SyncService } from "src/services/sync-service";
-import type { Logger } from "src/tracing/logger";
-import type { SyncHistory } from "src/tracing/sync-history";
+import type { SyncService } from "../services/sync-service";
+import type { Logger } from "../tracing/logger";
+import type { SyncHistory } from "../tracing/sync-history";
 import PQueue from "p-queue";
-import { hash } from "src/utils/hash";
-import type { components } from "src/services/types";
-import type { Settings } from "src/persistence/settings";
-import type { FileOperations } from "src/file-operations/file-operations";
-import { findMatchingFileBasedOnHash } from "src/utils/find-matching-file-based-on-hash";
+import { hash } from "../utils/hash";
+import { v4 as uuidv4 } from "uuid";
+import type { components } from "../services/types";
+import type { Settings } from "../persistence/settings";
+import type { FileOperations } from "../file-operations/file-operations";
+import { findMatchingFile } from "../utils/find-matching-file";
 import { UnrestrictedSyncer } from "./unrestricted-syncer";
+import { FileNotFoundError } from "../file-operations/safe-filesystem-operations";
+import { createPromise } from "../utils/create-promise";
 
 export class Syncer {
 	private readonly remainingOperationsListeners: ((
@@ -18,17 +20,15 @@ export class Syncer {
 
 	private readonly syncQueue: PQueue;
 
-	private runningScheduleSyncForOfflineChanges: Promise<void> | undefined =
-		undefined;
-	private runningApplyRemoteChangesLocally: Promise<void> | undefined =
-		undefined;
+	private runningScheduleSyncForOfflineChanges: Promise<void> | undefined;
+	private runningApplyRemoteChangesLocally: Promise<void> | undefined;
 
 	private readonly internalSyncer: UnrestrictedSyncer;
 
 	public constructor(
 		private readonly logger: Logger,
 		private readonly database: Database,
-		private readonly settings: Settings,
+		settings: Settings,
 		private readonly syncService: SyncService,
 		private readonly operations: FileOperations,
 		history: SyncHistory
@@ -45,7 +45,9 @@ export class Syncer {
 		});
 
 		this.syncQueue.on("active", () => {
-			this.emitRemainingOperationsChange(this.syncQueue.size);
+			this.remainingOperationsListeners.forEach((listener) => {
+				listener(this.syncQueue.size);
+			});
 		});
 
 		this.internalSyncer = new UnrestrictedSyncer(
@@ -65,48 +67,131 @@ export class Syncer {
 	}
 
 	public async syncLocallyCreatedFile(
-		relativePath: RelativePath,
-		updateTime: Date
+		relativePath: RelativePath
 	): Promise<void> {
-		await this.syncQueue.add(async () =>
-			this.internalSyncer.unrestrictedSyncLocallyCreatedFile(
-				relativePath,
-				updateTime
-			)
-		);
-	}
+		if (
+			this.database.getLatestDocumentByRelativePath(relativePath)
+				?.isDeleted === false
+		) {
+			this.logger.debug(
+				`Document ${relativePath} already exists in the database, skipping`
+			);
+			return;
+		}
 
-	public async syncLocallyUpdatedFile(args: {
-		oldPath?: RelativePath;
-		relativePath: RelativePath;
-		updateTime: Date;
-	}): Promise<void> {
-		await this.syncQueue.add(async () =>
-			this.internalSyncer.unrestrictedSyncLocallyUpdatedFile(args)
-		);
-	}
+		const [promise, resolve, reject] = createPromise();
 
-	public async waitForSyncQueue(): Promise<void> {
-		return this.syncQueue.onEmpty();
+		const document = this.database.createNewPendingDocument(
+			uuidv4(),
+			relativePath,
+			promise
+		);
+
+		try {
+			await this.syncQueue.add(async () =>
+				this.internalSyncer.unrestrictedSyncLocallyCreatedFile(document)
+			);
+
+			resolve();
+		} catch (e) {
+			reject(e);
+		} finally {
+			this.database.removeDocumentPromise(promise);
+		}
 	}
 
 	public async syncLocallyDeletedFile(
 		relativePath: RelativePath
 	): Promise<void> {
-		await this.syncQueue.add(async () =>
-			this.internalSyncer.unrestrictedSyncLocallyDeletedFile(relativePath)
+		// We have to have a record of the delete in case there's an in-flight update for the same
+		// document which finishes after the delete has succeeded and would introduce a phantom metadata record.
+		this.database.delete(relativePath);
+
+		const [promise, resolve, reject] = createPromise();
+
+		const document = await this.database.getResolvedDocumentByRelativePath(
+			relativePath,
+			promise
 		);
+
+		try {
+			await this.syncQueue.add(async () =>
+				this.internalSyncer.unrestrictedSyncLocallyDeletedFile(document)
+			);
+
+			resolve();
+		} catch (e) {
+			reject(e);
+		} finally {
+			this.database.removeDocumentPromise(promise);
+		}
 	}
 
-	public async scheduleSyncForOfflineChanges(): Promise<void> {
-		if (!this.settings.getSettings().isSyncEnabled) {
+	public async syncLocallyUpdatedFile({
+		oldPath,
+		relativePath
+	}: {
+		oldPath?: RelativePath;
+		relativePath: RelativePath;
+	}): Promise<void> {
+		if (
+			oldPath !== undefined &&
+			(this.database.getLatestDocumentByRelativePath(relativePath) ===
+				undefined ||
+				this.database.getLatestDocumentByRelativePath(relativePath)
+					?.isDeleted === true)
+		) {
+			if (oldPath === relativePath) {
+				throw new Error(
+					`Old path and new path are the same: ${oldPath}`
+				);
+			}
+
+			this.database.move(oldPath, relativePath);
+		}
+
+		let document =
+			this.database.getLatestDocumentByRelativePath(relativePath);
+
+		if (document === undefined) {
 			this.logger.debug(
-				`Syncing is disabled, not uploading local changes`
+				`Cannot find document ${relativePath} in the database, skipping`
 			);
 			return;
 		}
 
-		if (this.runningScheduleSyncForOfflineChanges != null) {
+		if (document.isDeleted) {
+			this.logger.debug(
+				`Document ${relativePath} has been deleted locally, skipping`
+			);
+			return;
+		}
+
+		const [promise, resolve, reject] = createPromise();
+
+		document = await this.database.getResolvedDocumentByRelativePath(
+			relativePath,
+			promise
+		);
+
+		try {
+			await this.syncQueue.add(async () =>
+				this.internalSyncer.unrestrictedSyncLocallyUpdatedFile({
+					oldPath,
+					document
+				})
+			);
+
+			resolve();
+		} catch (e) {
+			reject(e);
+		} finally {
+			this.database.removeDocumentPromise(promise);
+		}
+	}
+
+	public async scheduleSyncForOfflineChanges(): Promise<void> {
+		if (this.runningScheduleSyncForOfflineChanges !== undefined) {
 			this.logger.debug("Uploading local changes is already in progress");
 			return this.runningScheduleSyncForOfflineChanges;
 		}
@@ -127,13 +212,6 @@ export class Syncer {
 	}
 
 	public async applyRemoteChangesLocally(): Promise<void> {
-		if (!this.settings.getSettings().isSyncEnabled) {
-			this.logger.debug(
-				`Syncing is disabled, not fetching remote changes`
-			);
-			return;
-		}
-
 		if (this.runningApplyRemoteChangesLocally != null) {
 			this.logger.debug(
 				"Applying remote changes locally is already in progress"
@@ -154,6 +232,10 @@ export class Syncer {
 		}
 	}
 
+	public async waitForSyncQueue(): Promise<void> {
+		return this.syncQueue.onEmpty();
+	}
+
 	public async reset(): Promise<void> {
 		this.syncQueue.clear();
 		await this.syncQueue.onEmpty();
@@ -163,115 +245,15 @@ export class Syncer {
 		this.internalSyncer.reset();
 	}
 
-	private async syncRemotelyUpdatedFile(
-		remoteVersion: components["schemas"]["DocumentVersionWithoutContent"]
-	): Promise<void> {
-		await this.syncQueue.add(async () =>
-			this.internalSyncer.unrestrictedSyncRemotelyUpdatedFile(
-				remoteVersion
-			)
-		);
-	}
-
-	private async internalScheduleSyncForOfflineChanges(): Promise<void> {
-		const allLocalFiles = await this.operations.listAllFiles();
-
-		// This includes renamed files for now
-		let locallyPossiblyDeletedFiles = [
-			...this.database.getDocuments().entries()
-		].filter(([path, _]) => !allLocalFiles.includes(path));
-
-		await Promise.all(
-			allLocalFiles.map(async (relativePath) =>
-				this.syncQueue.add(async () => {
-					const metadata = this.database.getDocument(relativePath);
-
-					if (metadata) {
-						this.logger.debug(
-							`Document ${relativePath} might have been updated locally, scheduling sync to validate and update it`
-						);
-						return this.internalSyncer.unrestrictedSyncLocallyUpdatedFile(
-							{
-								relativePath,
-								updateTime:
-									await this.operations.getModificationTime(
-										relativePath
-									)
-							}
-						);
-					}
-
-					// Perhaps the file has been moved. Let's check by looking at the deleted files
-					const contentBytes =
-						await this.operations.read(relativePath);
-					const contentHash = hash(contentBytes);
-
-					// todo: make this smarter so that offline files can be renamed & edited at the same time
-					const originalFile = findMatchingFileBasedOnHash(
-						contentHash,
-						locallyPossiblyDeletedFiles
-					);
-					if (originalFile !== undefined) {
-						// `originalFile` hasn't been deleted but it got moved instead
-						locallyPossiblyDeletedFiles =
-							locallyPossiblyDeletedFiles.filter(
-								(item) => item[0] !== originalFile[0]
-							);
-
-						this.logger.debug(
-							`Document '${originalFile[0]}' was not found under its current path in the database but was found under a different path (${relativePath}), scheduling sync to move it`
-						);
-						return this.internalSyncer.unrestrictedSyncLocallyUpdatedFile(
-							{
-								oldPath: originalFile[0],
-								relativePath: relativePath,
-								updateTime:
-									await this.operations.getModificationTime(
-										relativePath
-									),
-								optimisations: {
-									contentBytes,
-									contentHash
-								}
-							}
-						);
-					}
-
-					this.logger.debug(
-						`Document ${relativePath} not found in database, scheduling sync to create it`
-					);
-					return this.internalSyncer.unrestrictedSyncLocallyCreatedFile(
-						relativePath,
-						await this.operations.getModificationTime(relativePath)
-					);
-				})
-			)
-		);
-
-		await Promise.all(
-			locallyPossiblyDeletedFiles.map(async ([relativePath, _]) => {
-				this.logger.debug(
-					`Document ${relativePath} has been deleted locally, scheduling sync to delete it`
-				);
-
-				if (await this.operations.exists(relativePath)) {
-					this.logger.debug(
-						`Document ${relativePath} actually exists locally, skipping`
-					);
-					return Promise.resolve();
-				}
-
-				// We're outside of the pqueue, so we need to call the public wrapper
-				return this.syncLocallyDeletedFile(relativePath);
-			})
-		);
-	}
-
 	private async internalApplyRemoteChangesLocally(): Promise<void> {
-		const remote = await this.syncService.getAll(
-			this.database.getLastSeenUpdateId()
+		const remote = await this.syncQueue.add(async () =>
+			this.syncService.getAll(this.database.getLastSeenUpdateId())
 		);
 
+		if (!remote) {
+			throw new Error("Failed to fetch remote changes");
+		}
+
 		if (remote.latestDocuments.length === 0) {
 			this.logger.debug("No remote changes to apply");
 			return;
@@ -280,9 +262,7 @@ export class Syncer {
 		this.logger.info("Applying remote changes locally");
 
 		await Promise.all(
-			remote.latestDocuments.map(async (remoteDocument) =>
-				this.syncRemotelyUpdatedFile(remoteDocument)
-			)
+			remote.latestDocuments.map(this.syncRemotelyUpdatedFile.bind(this))
 		);
 
 		const lastSeenUpdateId = this.database.getLastSeenUpdateId();
@@ -290,13 +270,124 @@ export class Syncer {
 			lastSeenUpdateId === undefined ||
 			remote.lastUpdateId > lastSeenUpdateId
 		) {
-			await this.database.setLastSeenUpdateId(remote.lastUpdateId);
+			this.database.setLastSeenUpdateId(remote.lastUpdateId);
 		}
 	}
 
-	private emitRemainingOperationsChange(remainingOperations: number): void {
-		this.remainingOperationsListeners.forEach((listener) => {
-			listener(remainingOperations);
-		});
+	private async syncRemotelyUpdatedFile(
+		remoteVersion: components["schemas"]["DocumentVersionWithoutContent"]
+	): Promise<void> {
+		let document = this.database.getDocumentByDocumentId(
+			remoteVersion.documentId
+		);
+
+		const [promise, resolve, reject] = createPromise();
+
+		if (document === undefined) {
+			await this.syncQueue.add(async () =>
+				this.internalSyncer.unrestrictedSyncRemotelyUpdatedFile(
+					remoteVersion
+				)
+			);
+		} else {
+			document = await this.database.getResolvedDocumentByRelativePath(
+				document.relativePath,
+				promise
+			);
+
+			try {
+				await this.syncQueue.add(async () =>
+					this.internalSyncer.unrestrictedSyncRemotelyUpdatedFile(
+						remoteVersion,
+						document
+					)
+				);
+
+				resolve();
+			} catch (e) {
+				reject(e);
+			} finally {
+				this.database.removeDocumentPromise(promise);
+			}
+		}
+	}
+
+	private async internalScheduleSyncForOfflineChanges(): Promise<void> {
+		const allLocalFiles = await this.operations.listAllFiles();
+
+		let locallyPossiblyDeletedFiles = [
+			...this.database.resolvedDocuments
+		].filter(({ relativePath }) => !allLocalFiles.includes(relativePath));
+
+		const updates = Promise.all(
+			allLocalFiles.map(async (relativePath) => {
+				if (
+					this.database.getLatestDocumentByRelativePath(relativePath)
+						?.metadata !== undefined
+				) {
+					this.logger.debug(
+						`Document ${relativePath} might have been updated locally, scheduling sync to validate and update it`
+					);
+
+					return this.syncLocallyUpdatedFile({
+						relativePath
+					});
+				}
+
+				// Perhaps the file has been moved; let's check by looking at the deleted files
+				const contentHash = await this.syncQueue.add(async () => {
+					const contentBytes =
+						await this.operations.read(relativePath); // this can throw FileNotFoundError
+					return hash(contentBytes);
+				});
+
+				if (contentHash == undefined) {
+					// The file was deleted before we had a chance to read it, no need to sync it here
+					return;
+				}
+
+				const originalFile = findMatchingFile(
+					contentHash,
+					locallyPossiblyDeletedFiles
+				);
+				if (originalFile !== undefined) {
+					// `originalFile` hasn't been deleted but it got moved instead
+					locallyPossiblyDeletedFiles =
+						locallyPossiblyDeletedFiles.filter(
+							(item) =>
+								item.relativePath !== originalFile.relativePath
+						);
+
+					this.logger.debug(
+						`Document '${originalFile.relativePath}' was not found under its current path in the database but was found under a different path (${relativePath}), scheduling sync to move it`
+					);
+
+					// We're outside of the pqueue, so we need to call the public wrapper
+					return this.syncLocallyUpdatedFile({
+						oldPath: originalFile.relativePath,
+						relativePath
+					});
+				}
+
+				this.logger.debug(
+					`Document ${relativePath} not found in database, scheduling sync to create it`
+				);
+				// We're outside of the pqueue, so we need to call the public wrapper
+				return this.syncLocallyCreatedFile(relativePath);
+			})
+		);
+
+		const deletes = Promise.all(
+			locallyPossiblyDeletedFiles.map(async ({ relativePath }) => {
+				this.logger.debug(
+					`Document ${relativePath} has been deleted locally, scheduling sync to delete it`
+				);
+
+				// We're outside of the pqueue, so we need to call the public wrapper
+				return this.syncLocallyDeletedFile(relativePath);
+			})
+		);
+
+		await Promise.all([updates, deletes]);
 	}
 }
diff --git a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
index 86ed3089..fe268f4d 100644
--- a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
+++ b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
@@ -1,19 +1,24 @@
-import type { Database, RelativePath } from "../persistence/database";
+import type {
+	Database,
+	DocumentRecord,
+	RelativePath
+} from "../persistence/database";
 
-import type { SyncService } from "src/services/sync-service";
-import type { Logger } from "src/tracing/logger";
-import type { SyncHistory } from "src/tracing/sync-history";
-import { SyncSource, SyncStatus, SyncType } from "src/tracing/sync-history";
-import { hash } from "src/utils/hash";
-import type { components } from "src/services/types";
-import { deserialize } from "src/utils/deserialize";
-import type { Settings } from "src/persistence/settings";
-import type { FileOperations } from "src/file-operations/file-operations";
-import { FileNotFoundError } from "src/file-operations/safe-filesystem-operations";
-import { DocumentLocks } from "./document-locks";
+import type { SyncService } from "../services/sync-service";
+import type { Logger } from "../tracing/logger";
+import type { SyncHistory } from "../tracing/sync-history";
+import { SyncSource, SyncStatus, SyncType } from "../tracing/sync-history";
+import { EMPTY_HASH, hash } from "../utils/hash";
+import type { components } from "../services/types";
+import { deserialize } from "../utils/deserialize";
+import type { Settings } from "../persistence/settings";
+import type { FileOperations } from "../file-operations/file-operations";
+import { FileNotFoundError } from "../file-operations/safe-filesystem-operations";
+import { DocumentLocks } from "../file-operations/document-locks";
+import { createPromise } from "../utils/create-promise";
 
 export class UnrestrictedSyncer {
-	private readonly locks = new DocumentLocks();
+	private readonly locks: DocumentLocks;
 
 	public constructor(
 		private readonly logger: Logger,
@@ -22,507 +27,375 @@ export class UnrestrictedSyncer {
 		private readonly syncService: SyncService,
 		private readonly operations: FileOperations,
 		private readonly history: SyncHistory
-	) {}
+	) {
+		this.locks = new DocumentLocks(logger);
+	}
 
 	public async unrestrictedSyncLocallyCreatedFile(
-		relativePath: RelativePath,
-		updateTime: Date,
-		optimisations?: {
-			contentBytes?: Uint8Array;
-			contentHash?: string;
-		}
+		document: DocumentRecord
 	): Promise<void> {
-		await this.executeWhileHoldingFileLock(
-			[relativePath],
+		return this.executeSync(
+			document.relativePath,
 			SyncType.CREATE,
 			SyncSource.PUSH,
 			async () => {
-				if (
-					(await this.operations.getFileSize(relativePath)) / // this can throw FileNotFoundError
-						1024 /
-						1024 >
-					this.settings.getSettings().maxFileSizeMB
-				) {
-					this.history.addHistoryEntry({
-						status: SyncStatus.ERROR,
-						relativePath,
-						message: `File size exceeds the maximum file size limit of ${
-							this.settings.getSettings().maxFileSizeMB
-						}MB`,
-						type: SyncType.CREATE
-					});
-					return;
-				}
-
-				const contentBytes =
-					optimisations?.contentBytes ??
-					(await this.operations.read(relativePath)); // this can throw FileNotFoundError
-				let contentHash =
-					optimisations?.contentHash ?? hash(contentBytes);
-
-				const localMetadata = this.database.getDocument(relativePath);
-				if (localMetadata) {
-					this.logger.debug(
-						`Document metadata already exists for ${relativePath}, it must have been downloaded from the server`
-					);
-
-					if (localMetadata.hash === contentHash) {
-						this.history.addHistoryEntry({
-							status: SyncStatus.NO_OP,
-							relativePath,
-							message: `File hash matches with last synced version, no need to sync`,
-							type: SyncType.UPDATE
-						});
-						return;
-					}
-				}
+				const contentBytes = await this.operations.read(
+					document.relativePath
+				); // this can throw FileNotFoundError
+				const contentHash = hash(contentBytes);
 
 				const response = await this.syncService.create({
-					relativePath,
-					contentBytes,
-					createdDate: updateTime
+					documentId: document.documentId,
+					relativePath: document.relativePath,
+					contentBytes
 				});
 
 				this.history.addHistoryEntry({
 					status: SyncStatus.SUCCESS,
 					source: SyncSource.PUSH,
-					relativePath,
+					relativePath: document.relativePath,
 					message: `Successfully uploaded locally created file`,
 					type: SyncType.CREATE
 				});
 
-				// The response can't have a different relative path than the one we sent
-				// because the relative path is the key when finding existing documents
-				// when a create request is sent.
+				this.database.updateDocumentMetadata(
+					{
+						parentVersionId: response.vaultUpdateId,
+						hash: contentHash
+					},
+					document
+				);
 
-				if (response.type === "MergingUpdate") {
-					const responseBytes = deserialize(response.contentBase64);
-					contentHash = hash(responseBytes);
+				this.tryIncrementVaultUpdateId(response.vaultUpdateId);
+			}
+		);
+	}
 
-					await this.operations.write(
-						relativePath,
-						contentBytes,
-						responseBytes
-					);
-					this.history.addHistoryEntry({
-						status: SyncStatus.SUCCESS,
-						source: SyncSource.PULL,
-						relativePath,
-						message: `The file we created locally has already existed remotely, so we have merged them`,
-						type: SyncType.UPDATE
-					});
-				}
-
-				await this.database.setDocument({
-					documentId: response.documentId,
-					relativePath: response.relativePath,
-					parentVersionId: response.vaultUpdateId,
-					hash: contentHash
+	public async unrestrictedSyncLocallyDeletedFile(
+		document: DocumentRecord
+	): Promise<void> {
+		await this.executeSync(
+			document.relativePath,
+			SyncType.DELETE,
+			SyncSource.PUSH,
+			async () => {
+				const response = await this.syncService.delete({
+					documentId: document.documentId,
+					relativePath: document.relativePath
 				});
 
-				await this.tryIncrementVaultUpdateId(response.vaultUpdateId);
+				this.history.addHistoryEntry({
+					status: SyncStatus.SUCCESS,
+					source: SyncSource.PUSH,
+					relativePath: document.relativePath,
+					message: `Successfully deleted locally deleted file on the remote server`,
+					type: SyncType.DELETE
+				});
+
+				this.database.updateDocumentMetadata(
+					{
+						parentVersionId: response.vaultUpdateId,
+						hash: EMPTY_HASH
+					},
+					document
+				);
 			}
 		);
 	}
 
 	public async unrestrictedSyncLocallyUpdatedFile({
 		oldPath,
-		relativePath,
-		updateTime,
-		optimisations
+		document,
+		force = false
 	}: {
 		oldPath?: RelativePath;
-		relativePath: RelativePath;
-		updateTime: Date;
-		optimisations?: {
-			contentBytes?: Uint8Array;
-			contentHash?: string;
-		};
+		force?: boolean;
+		document: DocumentRecord;
 	}): Promise<void> {
-		await this.executeWhileHoldingFileLock(
-			[oldPath, relativePath].filter((path) => path !== undefined),
+		await this.executeSync(
+			document.relativePath,
 			SyncType.UPDATE,
 			SyncSource.PUSH,
 			async () => {
-				// Check the new path first in case the metadata has been already moved
-				let localMetadata = this.database.getDocument(relativePath);
-				let metadataPath = relativePath;
+				const originalRelativePath = document.relativePath;
 
-				if (localMetadata === undefined && oldPath !== undefined) {
-					localMetadata = this.database.getDocument(oldPath);
-					metadataPath = oldPath;
-				}
-
-				if (!localMetadata) {
-					// It's fine, a subsequent sync operation must have dealt with this
+				if (document.metadata === undefined || document.isDeleted) {
+					this.logger.debug(
+						`Document ${document.relativePath} has been already deleted, no need to update it`
+					);
 					return;
 				}
 
-				if (
-					(await this.operations.getFileSize(relativePath)) / // this can throw FileNotFoundError
-						1024 /
-						1024 >
-					this.settings.getSettings().maxFileSizeMB
-				) {
-					this.history.addHistoryEntry({
-						status: SyncStatus.ERROR,
-						relativePath,
-						message: `File size exceeds the maximum file size limit of ${
-							this.settings.getSettings().maxFileSizeMB
-						}MB`,
-						type: SyncType.CREATE
-					});
-					return;
-				}
-
-				const contentBytes =
-					optimisations?.contentBytes ??
-					(await this.operations.read(relativePath)); // this can throw FileNotFoundError
-
-				let contentHash =
-					optimisations?.contentHash ?? hash(contentBytes);
+				const contentBytes = await this.operations.read(
+					document.relativePath
+				); // this can throw FileNotFoundError
+				let contentHash = hash(contentBytes);
 
 				if (
-					localMetadata.hash === contentHash &&
-					oldPath === undefined
+					document.metadata.hash === contentHash &&
+					oldPath === undefined &&
+					!force
 				) {
-					this.history.addHistoryEntry({
-						status: SyncStatus.NO_OP,
-						relativePath,
-						message: `File hash matches with last synced version, no need to sync`,
-						type: SyncType.UPDATE
-					});
+					this.logger.debug(
+						`File hash of ${document.relativePath} matches with last synced version and the path hasn't changed; no need to sync`
+					);
 					return;
 				}
 
 				const response = await this.syncService.put({
-					documentId: localMetadata.documentId,
-					parentVersionId: localMetadata.parentVersionId,
-					relativePath,
-					contentBytes,
-					createdDate: updateTime
+					documentId: document.documentId,
+					parentVersionId: document.metadata.parentVersionId,
+					relativePath: document.relativePath,
+					contentBytes
 				});
 
+				// `document` is mutable and reflects the latest state in the local database
+				// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+				if (document.isDeleted) {
+					this.logger.info(
+						`Document ${document.relativePath} has been deleted before we could finish updating it`
+					);
+					return;
+				}
+
+				// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+				if (document.metadata === undefined) {
+					throw new Error(
+						`Document ${document.relativePath} no longer has metadata after updating it, this cannot happen`
+					);
+				}
+
+				if (
+					document.metadata.parentVersionId >= response.vaultUpdateId
+				) {
+					this.logger.debug(
+						`Document ${document.relativePath} is already more up to date than the fetched version`
+					);
+					return;
+				}
+
 				this.history.addHistoryEntry({
 					status: SyncStatus.SUCCESS,
 					source: SyncSource.PUSH,
-					relativePath,
+					relativePath: document.relativePath,
 					message: `Successfully uploaded locally updated file to the remote server`,
 					type: SyncType.UPDATE
 				});
 
 				if (response.isDeleted) {
-					await this.operations.remove(oldPath ?? relativePath);
-					await this.database.removeDocument(oldPath ?? relativePath);
-					await this.tryIncrementVaultUpdateId(
-						response.vaultUpdateId
-					);
-
 					this.history.addHistoryEntry({
 						status: SyncStatus.SUCCESS,
 						source: SyncSource.PULL,
-						relativePath,
+						relativePath: document.relativePath,
 						message:
 							"The file we tried to update had been deleted remotely, therefore, we have deleted it locally",
 						type: SyncType.DELETE
 					});
 
+					this.database.delete(document.relativePath);
+					this.database.updateDocumentMetadata(
+						{
+							parentVersionId: response.vaultUpdateId,
+							hash: EMPTY_HASH
+						},
+						document
+					);
+
+					await this.operations.delete(document.relativePath);
+
+					this.tryIncrementVaultUpdateId(response.vaultUpdateId);
+
 					return;
 				}
 
-				if (
-					response.relativePath != relativePath &&
-					response.relativePath != oldPath
-				) {
-					await this.locks.waitForDocumentLock(response.relativePath);
+				let actualPath = document.relativePath;
+
+				if (response.relativePath != originalRelativePath) {
+					actualPath = response.relativePath;
+					await this.operations.move(
+						document.relativePath,
+						response.relativePath
+					); // this can throw FileNotFoundError
 				}
 
-				try {
-					if (response.relativePath != relativePath) {
-						// TODO: this can fail, that's bad
-						await this.operations.move(
-							// this can throw FileNotFoundError
-							relativePath,
-							response.relativePath,
-							response.documentId
-						);
-					}
-
-					if (response.type === "MergingUpdate") {
-						const responseBytes = deserialize(
-							response.contentBase64
-						);
-						contentHash = hash(responseBytes);
-
-						await this.operations.write(
-							response.relativePath,
-							contentBytes,
-							responseBytes
-						);
-
-						this.history.addHistoryEntry({
-							status: SyncStatus.SUCCESS,
-							source: SyncSource.PULL,
-							relativePath,
-							message: `The file we updated had been updated remotely, so we downloaded the merged version`,
-							type: SyncType.UPDATE
-						});
-					}
-
-					if (metadataPath !== response.relativePath) {
-						await this.database.updatePath(
-							metadataPath,
-							response.relativePath
-						);
-					}
-					await this.database.setDocument({
-						documentId: localMetadata.documentId,
-						relativePath: response.relativePath,
+				this.database.updateDocumentMetadata(
+					{
 						parentVersionId: response.vaultUpdateId,
 						hash: contentHash
-					});
+					},
+					document
+				);
 
-					await this.tryIncrementVaultUpdateId(
-						response.vaultUpdateId
+				if (response.type === "MergingUpdate") {
+					const responseBytes = deserialize(response.contentBase64);
+					contentHash = hash(responseBytes);
+
+					await this.operations.write(
+						actualPath,
+						contentBytes,
+						responseBytes
 					);
-				} finally {
-					if (
-						response.relativePath != relativePath &&
-						response.relativePath != oldPath
-					) {
-						this.locks.unlockDocument(response.relativePath);
-					}
-				}
-			}
-		);
-	}
 
-	public async unrestrictedSyncLocallyDeletedFile(
-		relativePath: RelativePath
-	): Promise<void> {
-		await this.executeWhileHoldingFileLock(
-			[relativePath],
-			SyncType.DELETE,
-			SyncSource.PUSH,
-			async () => {
-				const localMetadata = this.database.getDocument(relativePath);
-				if (!localMetadata) {
 					this.history.addHistoryEntry({
-						status: SyncStatus.NO_OP,
-						relativePath,
-						message: `Locally deleted file hasn't been uploaded yet, so there's no need to delete it on the remote server`,
-						type: SyncType.DELETE
+						status: SyncStatus.SUCCESS,
+						source: SyncSource.PULL,
+						relativePath: document.relativePath,
+						message: `The file we updated had been updated remotely, so we downloaded the merged version`,
+						type: SyncType.UPDATE
 					});
-					return;
 				}
 
-				await this.syncService.delete({
-					documentId: localMetadata.documentId,
-					relativePath,
-					createdDate: new Date() // We got the event now, so it must have been deleted just now
-				});
-
-				this.history.addHistoryEntry({
-					status: SyncStatus.SUCCESS,
-					source: SyncSource.PUSH,
-					relativePath,
-					message: `Successfully deleted locally deleted file on the remote server`,
-					type: SyncType.DELETE
-				});
-
-				await this.database.removeDocument(relativePath);
+				this.tryIncrementVaultUpdateId(response.vaultUpdateId);
 			}
 		);
 	}
 
 	public async unrestrictedSyncRemotelyUpdatedFile(
-		remoteVersion: components["schemas"]["DocumentVersionWithoutContent"]
+		remoteVersion: components["schemas"]["DocumentVersionWithoutContent"],
+		document?: DocumentRecord
 	): Promise<void> {
-		await this.executeWhileHoldingFileLock(
-			[remoteVersion.relativePath],
+		await this.executeSync(
+			remoteVersion.relativePath,
 			SyncType.UPDATE,
 			SyncSource.PULL,
 			async () => {
-				let localMetadata = this.database.getDocumentByDocumentId(
-					remoteVersion.documentId
-				);
-
-				if (
-					localMetadata &&
-					localMetadata[0] !== remoteVersion.relativePath
-				) {
-					await this.locks.waitForDocumentLock(localMetadata[0]);
-				}
-				// Waiting for the new lock might take a while so we need to fetch the database
-				// entry again in case it's changed.
-				localMetadata = this.database.getDocumentByDocumentId(
-					remoteVersion.documentId
-				);
-
-				if (!localMetadata) {
-					if (remoteVersion.isDeleted) {
-						this.history.addHistoryEntry({
-							status: SyncStatus.NO_OP,
-							source: SyncSource.PULL,
-							relativePath: remoteVersion.relativePath,
-							message: `Remotely deleted file hasn't been synced yet, so there's no need to delete it locally`,
-							type: SyncType.DELETE
-						});
+				if (document?.metadata !== undefined) {
+					// If the file exists locally, let's pretend the user has updated it
+					// and deal with remote update/deletion within `unrestrictedSyncLocallyUpdatedFile`
+					if (
+						document.metadata.parentVersionId >=
+						remoteVersion.vaultUpdateId
+					) {
+						this.logger.debug(
+							`Document ${remoteVersion.relativePath} is already more up to date than the fetched version`
+						);
 						return;
 					}
 
-					const content = (
-						await this.syncService.get({
-							documentId: remoteVersion.documentId
-						})
-					).contentBase64;
-					const contentBytes = deserialize(content);
-
-					await this.operations.create(
-						remoteVersion.relativePath,
-						contentBytes
+					return this.unrestrictedSyncLocallyUpdatedFile({
+						document,
+						force: true
+					});
+				} else if (remoteVersion.isDeleted) {
+					// Either the doc hasn't made it to us before and therefore we don't need to delete it,
+					// or we already have it, in which case the preceeding if will deal with it
+					this.logger.debug(
+						`Document ${remoteVersion.relativePath} has been deleted remotely, no need to sync`
 					);
-					await this.database.setDocument({
-						documentId: remoteVersion.documentId,
-						relativePath: remoteVersion.relativePath,
+					return;
+				}
+
+				const content = (
+					await this.syncService.get({
+						documentId: remoteVersion.documentId
+					})
+				).contentBase64;
+
+				document = this.database.getDocumentByDocumentId(
+					remoteVersion.documentId
+				);
+
+				if (document?.isDeleted === true) {
+					this.logger.info(
+						`Document ${remoteVersion.relativePath} has been deleted locally before we could finish updating it`
+					);
+					return;
+				}
+
+				if (
+					(document?.metadata?.parentVersionId ?? -1) >=
+					remoteVersion.vaultUpdateId
+				) {
+					this.logger.debug(
+						`Document ${remoteVersion.relativePath} is already more up to date than the fetched version`
+					);
+					return;
+				}
+
+				const contentBytes = deserialize(content);
+
+				await this.operations.ensureClearPath(
+					remoteVersion.relativePath
+				);
+
+				const [promise, resolve] = createPromise();
+				this.database.updateDocumentMetadata(
+					{
 						parentVersionId: remoteVersion.vaultUpdateId,
 						hash: hash(contentBytes)
-					});
-					this.history.addHistoryEntry({
-						status: SyncStatus.SUCCESS,
-						source: SyncSource.PULL,
-						relativePath: remoteVersion.relativePath,
-						message: `Successfully downloaded remote file which hadn't existed locally`,
-						type: SyncType.CREATE
-					});
-					return;
-				}
+					},
+					this.database.createNewPendingDocument(
+						remoteVersion.documentId,
+						remoteVersion.relativePath,
+						promise
+					)
+				);
 
-				const [relativePath, metadata] = localMetadata;
+				await this.operations.create(
+					remoteVersion.relativePath,
+					contentBytes
+				);
 
-				if (remoteVersion.vaultUpdateId <= metadata.parentVersionId) {
-					this.logger.debug(
-						`Document ${relativePath} is already up to date`
-					);
-					return;
-				}
+				resolve();
+				this.database.removeDocumentPromise(promise);
 
-				try {
-					if (remoteVersion.isDeleted) {
-						await this.operations.remove(relativePath);
-						await this.database.removeDocument(relativePath);
-
-						this.history.addHistoryEntry({
-							status: SyncStatus.SUCCESS,
-							source: SyncSource.PULL,
-							relativePath: remoteVersion.relativePath,
-							message: `Successfully deleted remotely deleted file locally`,
-							type: SyncType.DELETE
-						});
-					} else {
-						// TODO: this can fail, that's bad
-						const currentContent =
-							await this.operations.read(relativePath); // this can throw FileNotFoundError
-						const currentHash = hash(currentContent);
-
-						if (currentHash !== metadata.hash) {
-							this.logger.info(
-								`Document ${relativePath} has been updated both remotely and locally, letting the local file update event handle it`
-							);
-							return;
-						}
-
-						const content = (
-							await this.syncService.get({
-								documentId: remoteVersion.documentId
-							})
-						).contentBase64;
-						const contentBytes = deserialize(content);
-						const contentHash = hash(contentBytes);
-
-						if (relativePath !== remoteVersion.relativePath) {
-							// TODO: this can fail, that's bad
-							await this.operations.move(
-								// this can throw FileNotFoundError
-								relativePath,
-								remoteVersion.relativePath,
-								remoteVersion.documentId
-							);
-
-							await this.database.updatePath(
-								relativePath,
-								remoteVersion.relativePath
-							);
-						}
-
-						await this.operations.write(
-							remoteVersion.relativePath,
-							currentContent,
-							contentBytes
-						);
-						await this.database.setDocument({
-							documentId: remoteVersion.documentId,
-							relativePath: remoteVersion.relativePath,
-							parentVersionId: remoteVersion.vaultUpdateId,
-							hash: contentHash
-						});
-
-						this.history.addHistoryEntry({
-							status: SyncStatus.SUCCESS,
-							source: SyncSource.PULL,
-							relativePath: remoteVersion.relativePath,
-							message: `Successfully updated remotely updated file locally`,
-							type: SyncType.UPDATE
-						});
-					}
-				} finally {
-					if (relativePath !== remoteVersion.relativePath) {
-						this.locks.unlockDocument(relativePath);
-					}
-				}
+				this.history.addHistoryEntry({
+					status: SyncStatus.SUCCESS,
+					source: SyncSource.PULL,
+					relativePath: remoteVersion.relativePath,
+					message: `Successfully downloaded remote file which hadn't existed locally`,
+					type: SyncType.CREATE
+				});
 			}
 		);
 	}
 
-	public async executeWhileHoldingFileLock(
-		lockedPaths: RelativePath[],
+	public async executeSync<T>(
+		relativePath: RelativePath,
 		syncType: SyncType,
 		syncSource: SyncSource,
-		fn: () => Promise<void>
-	): Promise<void> {
-		const relativePath = lockedPaths[lockedPaths.length - 1];
-
-		if (!this.settings.getSettings().isSyncEnabled) {
-			this.logger.info(
-				`Syncing is disabled, not syncing ${relativePath}`
-			);
-			return;
-		}
+		fn: () => Promise<T>
+	): Promise<T | undefined> {
 		if (!this.operations.isFileEligibleForSync(relativePath)) {
-			this.logger.info(
-				`File ${relativePath} is not eligible for syncing`
-			);
+			this.history.addHistoryEntry({
+				status: SyncStatus.ERROR,
+				relativePath,
+				message: `File ${relativePath} is not eligible for syncing`,
+				type: syncType
+			});
 			return;
 		}
+
 		this.logger.debug(
 			`Syncing ${relativePath} (${syncSource} - ${syncType})`
 		);
 
-		await Promise.all(
-			lockedPaths.map(this.locks.waitForDocumentLock.bind(this.locks))
-		);
 		try {
-			await fn();
+			if (
+				(await this.operations.exists(relativePath)) &&
+				(await this.operations.getFileSize(relativePath)) / // this can throw FileNotFoundError
+					1024 /
+					1024 >
+					this.settings.getSettings().maxFileSizeMB
+			) {
+				this.history.addHistoryEntry({
+					status: SyncStatus.ERROR,
+					relativePath,
+					message: `File size exceeds the maximum file size limit of ${
+						this.settings.getSettings().maxFileSizeMB
+					}MB`,
+					type: syncType
+				});
+				return;
+			}
+
+			return await fn();
 		} catch (e) {
 			if (e instanceof FileNotFoundError) {
 				// A subsequent sync operation must have been creating to deal with this
-				this.history.addHistoryEntry({
-					status: SyncStatus.NO_OP,
-					relativePath,
-					message: `Skip ${syncSource.toLocaleLowerCase()} file because it no longer exists when trying to ${syncType.toLocaleLowerCase()} it`,
-					type: syncType,
-					source: syncSource
-				});
+				this.logger.info(
+					`Skip ${syncSource.toLocaleLowerCase()} file because it no longer exists when trying to ${syncType.toLocaleLowerCase()} it`
+				);
 			} else {
 				this.history.addHistoryEntry({
 					status: SyncStatus.ERROR,
@@ -533,8 +406,6 @@ export class UnrestrictedSyncer {
 				});
 				throw e;
 			}
-		} finally {
-			lockedPaths.forEach(this.locks.unlockDocument.bind(this.locks));
 		}
 	}
 
@@ -542,11 +413,9 @@ export class UnrestrictedSyncer {
 		this.locks.reset();
 	}
 
-	private async tryIncrementVaultUpdateId(
-		responseVaultUpdateId: number
-	): Promise<void> {
+	private tryIncrementVaultUpdateId(responseVaultUpdateId: number): void {
 		if (this.database.getLastSeenUpdateId() === responseVaultUpdateId - 1) {
-			await this.database.setLastSeenUpdateId(responseVaultUpdateId);
+			this.database.setLastSeenUpdateId(responseVaultUpdateId);
 		}
 	}
 }
diff --git a/frontend/sync-client/src/tracing/sync-history.ts b/frontend/sync-client/src/tracing/sync-history.ts
index ea87bcac..ec8841e9 100644
--- a/frontend/sync-client/src/tracing/sync-history.ts
+++ b/frontend/sync-client/src/tracing/sync-history.ts
@@ -1,4 +1,4 @@
-import type { RelativePath } from "src/persistence/database";
+import type { RelativePath } from "../persistence/database";
 import type { Logger } from "./logger";
 
 export interface CommonHistoryEntry {
diff --git a/frontend/sync-client/src/utils/create-promise.ts b/frontend/sync-client/src/utils/create-promise.ts
new file mode 100644
index 00000000..056c169c
--- /dev/null
+++ b/frontend/sync-client/src/utils/create-promise.ts
@@ -0,0 +1,15 @@
+export function createPromise<T = void>(): [
+	Promise<T>,
+	(value: T) => void,
+	(error: unknown) => void
+] {
+	let resolve: undefined | ((resolved: T) => void) = undefined;
+	let reject: undefined | ((error: unknown) => void) = undefined;
+
+	const creationPromise = new Promise<T>(
+		(resolve_, reject_) => ((resolve = resolve_), (reject = reject_))
+	);
+
+	// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+	return [creationPromise, resolve!, reject!];
+}
diff --git a/frontend/sync-client/src/utils/find-matching-file-based-on-hash.ts b/frontend/sync-client/src/utils/find-matching-file-based-on-hash.ts
deleted file mode 100644
index 6a247f5f..00000000
--- a/frontend/sync-client/src/utils/find-matching-file-based-on-hash.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import type { DocumentMetadata, RelativePath } from "src/persistence/database";
-import { EMPTY_HASH } from "./hash";
-
-export function findMatchingFileBasedOnHash(
-	contentHash: string,
-	candidates: [RelativePath, DocumentMetadata][]
-): [RelativePath, DocumentMetadata] | undefined {
-	if (contentHash === EMPTY_HASH) {
-		return undefined;
-	}
-
-	return candidates.find(([_, metadata]) => metadata.hash === contentHash);
-}
diff --git a/frontend/sync-client/src/utils/find-matching-file.ts b/frontend/sync-client/src/utils/find-matching-file.ts
new file mode 100644
index 00000000..10545f2c
--- /dev/null
+++ b/frontend/sync-client/src/utils/find-matching-file.ts
@@ -0,0 +1,14 @@
+import type { DocumentRecord } from "../persistence/database";
+import { EMPTY_HASH } from "./hash";
+
+// TODO: make this smarter so that offline files can be renamed & edited at the same time
+export function findMatchingFile(
+	contentHash: string,
+	candidates: DocumentRecord[]
+): DocumentRecord | undefined {
+	if (contentHash === EMPTY_HASH) {
+		return undefined;
+	}
+
+	return candidates.find(({ metadata }) => metadata?.hash === contentHash);
+}
diff --git a/frontend/sync-client/src/utils/hash.ts b/frontend/sync-client/src/utils/hash.ts
index 10f20d1d..cd965db5 100644
--- a/frontend/sync-client/src/utils/hash.ts
+++ b/frontend/sync-client/src/utils/hash.ts
@@ -6,7 +6,7 @@ export function hash(content: Uint8Array): string {
 		result = (result << 5) - result + content[i];
 		result |= 0; // Convert to 32bit integer
 	}
-	return Math.abs(result).toString(16);
+	return Math.abs(result).toString(16).padStart(8, "0");
 }
 
 export const EMPTY_HASH = hash(new Uint8Array(0));
diff --git a/frontend/sync-client/src/utils/retried-fetch.ts b/frontend/sync-client/src/utils/retried-fetch.ts
index e4c47f07..a3856f8d 100644
--- a/frontend/sync-client/src/utils/retried-fetch.ts
+++ b/frontend/sync-client/src/utils/retried-fetch.ts
@@ -1,6 +1,6 @@
 import * as fetchRetryFactory from "fetch-retry";
 import type { RequestInitRetryParams } from "fetch-retry";
-import type { Logger } from "src/tracing/logger";
+import type { Logger } from "../tracing/logger";
 
 function getUrlFromInput(input: RequestInfo | URL): string {
 	if (input instanceof URL) {
@@ -31,7 +31,6 @@ export function retriedFetchFactory(
 				}
 				return false;
 			},
-			retries: 6,
 			retryDelay: (attempt) => Math.pow(1.5, attempt) * 500,
 			...init
 		});
diff --git a/frontend/sync-client/tsconfig.json b/frontend/sync-client/tsconfig.json
index 6db72fcc..ee31a31e 100644
--- a/frontend/sync-client/tsconfig.json
+++ b/frontend/sync-client/tsconfig.json
@@ -1,12 +1,15 @@
 {
 	"compilerOptions": {
-		"baseUrl": ".",
 		"module": "ESNext",
 		"target": "ESNext",
 		"strict": true,
-		"moduleResolution": "bundler",
 		"allowSyntheticDefaultImports": true,
-		"lib": ["DOM", "ESNext"]
+		"moduleResolution": "bundler",
+		"lib": [
+			"DOM" // to get "fetch"
+		],
+		"declaration": true,
+		"declarationDir": "./dist/types"
 	},
 	"exclude": ["./dist"]
 }
diff --git a/frontend/sync-client/webpack.config.js b/frontend/sync-client/webpack.config.js
index cd2c051d..3f913041 100644
--- a/frontend/sync-client/webpack.config.js
+++ b/frontend/sync-client/webpack.config.js
@@ -1,25 +1,13 @@
 const path = require("path");
+const { merge } = require("webpack-merge");
 
-module.exports = (_env, _argv) => ({
+const common = {
 	entry: "./src/index.ts",
-	devtool: "source-map",
-	target: "node",
 	module: {
 		rules: [
 			{
 				test: /\.ts$/,
-				use: [
-					{
-						loader: "ts-loader",
-						options: {
-							compilerOptions: {
-								declaration: true,
-								declarationDir: "./dist/types"
-							},
-							transpileOnly: false
-						}
-					}
-				]
+				use: ["ts-loader"]
 			},
 			{
 				test: /\.wasm$/,
@@ -28,22 +16,40 @@ module.exports = (_env, _argv) => ({
 		]
 	},
 	optimization: {
+		// the consuming project should take care of minification
 		minimize: false
 	},
 	resolve: {
-		extensions: [".ts", ".js"],
+		extensions: [".ts"],
 		alias: {
 			root: __dirname,
 			src: path.resolve(__dirname, "src")
 		}
 	},
-	output: {
-		clean: true,
-		filename: "index.js",
-		library: {
-			name: "SyncClient",
-			type: "umd"
-		},
-		path: path.resolve(__dirname, "dist")
+	performance: {
+		hints: false // it's a library, no need to warn about its size
 	}
-});
+};
+
+module.exports = [
+	merge(common, {
+		target: "web",
+		output: {
+			path: path.resolve(__dirname, "dist"),
+			filename: "sync-client.web.js",
+			library: {
+				name: "SyncClient",
+				type: "umd"
+			},
+			globalObject: "this"
+		}
+	}),
+	merge(common, {
+		target: "node",
+		output: {
+			path: path.resolve(__dirname, "dist"),
+			filename: "sync-client.node.js",
+			libraryTarget: "commonjs2"
+		}
+	})
+];
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index 676da96f..b11a4c41 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "test-client",
-	"version": "0.0.0",
+	"version": "0.0.30",
 	"private": true,
 	"bin": {
 		"test-client": "./dist/cli.js"
@@ -11,13 +11,13 @@
 		"test": "jest --passWithNoTests"
 	},
 	"devDependencies": {
-		"@types/node": "^22.13.5",
+		"@types/node": "^22.13.10",
 		"sync-client": "file:../sync-client",
 		"ts-loader": "^9.5.2",
 		"tslib": "2.8.1",
-		"typescript": "5.7.3",
+		"typescript": "5.8.2",
 		"uuid": "^11.1.0",
 		"webpack": "^5.98.0",
 		"webpack-cli": "^6.0.1"
 	}
-}
+}
\ No newline at end of file
diff --git a/frontend/test-client/src/agent/mock-agent.ts b/frontend/test-client/src/agent/mock-agent.ts
index 2163a503..7713b524 100644
--- a/frontend/test-client/src/agent/mock-agent.ts
+++ b/frontend/test-client/src/agent/mock-agent.ts
@@ -18,9 +18,10 @@ export class MockAgent extends MockClient {
 		initialSettings: Partial<SyncSettings>,
 		public readonly name: string,
 		private readonly doDeletes: boolean,
+		useSlowFileEvents: boolean,
 		private readonly jitterScaleInSeconds: number
 	) {
-		super(initialSettings);
+		super(initialSettings, useSlowFileEvents);
 	}
 
 	public async init(): Promise<void> {
@@ -46,27 +47,33 @@ export class MockAgent extends MockClient {
 				? "(online) "
 				: "(offline)";
 			const formatted = `[${this.name} ${state}] ${logLine.timestamp.toISOString()} ${logLine.level} ${logLine.message}`;
+
+			// HACK: we have to ensure the file has been synced if we want to change it offline without data loss
+			const historyEntry = /.*History entry: (.*.md).*/.exec(
+				logLine.message
+			);
+
+			if (historyEntry) {
+				this.doNotTouchWhileOffline =
+					this.doNotTouchWhileOffline.filter(
+						(file) => file !== historyEntry[1]
+					);
+			}
 			switch (logLine.level) {
 				case LogLevel.ERROR:
 					console.error(formatted);
-					// Let's not ignore errors
-					process.exit(1);
+
+					if (!this.useSlowFileEvents) {
+						// Let's not ignore errors
+						// eslint-disable-next-line @typescript-eslint/no-floating-promises
+						sleep(100).then(() => process.exit(1));
+					}
+
 					break;
 				case LogLevel.WARNING:
 					console.warn(formatted);
 					break;
 				case LogLevel.INFO:
-					// HACK: we have to ensure the file has been synced if we want to change it offline without data loss
-					const result = /.*History entry: (.*.md).*/.exec(
-						logLine.message
-					);
-					if (result) {
-						this.doNotTouchWhileOffline =
-							this.doNotTouchWhileOffline.filter(
-								(file) => file !== result[1]
-							);
-					}
-
 					console.info(formatted);
 					break;
 				case LogLevel.DEBUG:
@@ -84,11 +91,10 @@ export class MockAgent extends MockClient {
 			this.changeFetchChangesUpdateIntervalMsAction.bind(this)
 		];
 
-		if (
-			this.client.settings.getSettings().isSyncEnabled &&
-			this.doNotTouchWhileOffline.length === 0
-		) {
-			options.push(this.disableSyncAction.bind(this));
+		if (this.client.settings.getSettings().isSyncEnabled) {
+			if (this.doNotTouchWhileOffline.length === 0) {
+				options.push(this.disableSyncAction.bind(this));
+			}
 		} else {
 			options.push(this.enableSyncAction.bind(this));
 		}
@@ -186,6 +192,14 @@ export class MockAgent extends MockClient {
 	}
 
 	public assertAllContentIsPresentOnce(): void {
+		if (this.useSlowFileEvents) {
+			this.client.logger.info(
+				// We can't ensure that we have seen every single update
+				`Skipping content check for ${this.name} because slow file events are enabled`
+			);
+			return;
+		}
+
 		for (const content of this.writtenContents) {
 			const found = Array.from(this.localFiles.keys()).filter((key) => {
 				return new TextDecoder()
@@ -215,7 +229,7 @@ export class MockAgent extends MockClient {
 				);
 				assert(
 					fileContent.split(content).length == 2,
-					`Content ${content} (of ${this.name}) found more than once in file ${file}. File content:\n${fileContent}`
+					`Content ${content} (of ${this.name}) found more than once in '${file}'. File content:\n${fileContent}`
 				);
 			}
 		}
@@ -237,10 +251,7 @@ export class MockAgent extends MockClient {
 			`Decided to create file ${file} with content ${content}`
 		);
 
-		return this.create(
-			file,
-			new TextEncoder().encode(`   |${content}|   `)
-		);
+		return this.create(file, new TextEncoder().encode(` ${content} `));
 	}
 
 	private async changeFetchChangesUpdateIntervalMsAction(): Promise<void> {
@@ -314,7 +325,7 @@ export class MockAgent extends MockClient {
 			`Decided to update file ${file} with ${content}`
 		);
 		this.doNotTouchWhileOffline.push(file);
-		await this.atomicUpdateText(file, (old) => old + `   |${content}|   `);
+		await this.atomicUpdateText(file, (old) => old + ` ${content} `);
 	}
 
 	private async deleteFileAction(files: RelativePath[]): Promise<void> {
diff --git a/frontend/test-client/src/agent/mock-client.ts b/frontend/test-client/src/agent/mock-client.ts
index e627eb78..7e4e14c3 100644
--- a/frontend/test-client/src/agent/mock-client.ts
+++ b/frontend/test-client/src/agent/mock-client.ts
@@ -1,9 +1,10 @@
-import type {
-	RelativePath,
-	FileSystemOperations,
-	SyncSettings
+import { assert } from "../utils/assert";
+import {
+	type RelativePath,
+	type FileSystemOperations,
+	type SyncSettings,
+	SyncClient
 } from "sync-client";
-import { SyncClient } from "sync-client";
 
 export class MockClient implements FileSystemOperations {
 	protected readonly localFiles = new Map<string, Uint8Array>();
@@ -11,7 +12,8 @@ export class MockClient implements FileSystemOperations {
 	protected data: object | undefined = undefined;
 
 	public constructor(
-		private readonly initialSettings: Partial<SyncSettings>
+		private readonly initialSettings: Partial<SyncSettings>,
+		protected readonly useSlowFileEvents: boolean
 	) {}
 
 	public async init(): Promise<void> {
@@ -22,9 +24,10 @@ export class MockClient implements FileSystemOperations {
 
 		await Promise.all(
 			Object.keys(this.initialSettings).map(async (key) => {
+				const settingKey = key as keyof SyncSettings; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
 				return this.client.settings.setSetting(
-					key as keyof SyncSettings, // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
-					this.initialSettings[key as keyof SyncSettings] // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+					settingKey,
+					this.initialSettings[settingKey]! // eslint-disable-line @typescript-eslint/no-non-null-assertion
 				);
 			})
 		);
@@ -46,13 +49,6 @@ export class MockClient implements FileSystemOperations {
 		return (await this.read(path)).length;
 	}
 
-	public async getModificationTime(path: RelativePath): Promise<Date> {
-		if (!this.localFiles.has(path)) {
-			throw new Error(`File ${path} does not exist`);
-		}
-		return new Date();
-	}
-
 	public async exists(path: RelativePath): Promise<boolean> {
 		return this.localFiles.has(path);
 	}
@@ -68,7 +64,10 @@ export class MockClient implements FileSystemOperations {
 			`Creating file ${path} with content ${new TextDecoder().decode(newContent)}`
 		);
 		this.localFiles.set(path, newContent);
-		void this.client.syncer.syncLocallyCreatedFile(path, new Date());
+
+		this.runCallback(() => {
+			void this.client.syncer.syncLocallyCreatedFile(path);
+		});
 	}
 
 	public async createDirectory(_path: RelativePath): Promise<void> {
@@ -88,28 +87,51 @@ export class MockClient implements FileSystemOperations {
 		const newContentUint8Array = new TextEncoder().encode(newContent);
 		this.localFiles.set(path, newContentUint8Array);
 
+		if (!this.useSlowFileEvents) {
+			const existingParts = currentContent
+				.split(" ")
+				.map((part) => part.trim());
+			const newParts = newContent.split(" ").map((part) => part.trim());
+			existingParts.forEach((part) =>
+				// all changes should be additive
+				{
+					assert(
+						newParts.includes(part),
+						`Part ${part} not found in new content`
+					);
+				}
+			);
+		}
+
 		this.client.logger.info(
 			`Updated file ${path} with:\n  current content: ${currentContent}\n  new content: ${newContent}`
 		);
 
-		void this.client.syncer.syncLocallyUpdatedFile({
-			relativePath: path,
-			updateTime: new Date()
+		this.runCallback(() => {
+			void this.client.syncer.syncLocallyUpdatedFile({
+				relativePath: path
+			});
 		});
 
 		return newContent;
 	}
 
 	public async write(path: RelativePath, content: Uint8Array): Promise<void> {
+		const hasExisted = this.localFiles.has(path);
 		this.localFiles.set(path, content);
 
 		this.client.logger.info(
 			`Updated file ${path} with:\n  new content: ${new TextDecoder().decode(content)}`
 		);
 
-		void this.client.syncer.syncLocallyUpdatedFile({
-			relativePath: path,
-			updateTime: new Date()
+		this.runCallback(() => {
+			if (hasExisted) {
+				void this.client.syncer.syncLocallyUpdatedFile({
+					relativePath: path
+				});
+			} else {
+				void this.client.syncer.syncLocallyCreatedFile(path);
+			}
 		});
 	}
 
@@ -118,7 +140,10 @@ export class MockClient implements FileSystemOperations {
 			`Deleting file: ${path} with:\n  content ${new TextDecoder().decode(this.localFiles.get(path))}`
 		);
 		this.localFiles.delete(path);
-		void this.client.syncer.syncLocallyDeletedFile(path);
+
+		this.runCallback(() => {
+			void this.client.syncer.syncLocallyDeletedFile(path);
+		});
 	}
 
 	public async rename(
@@ -138,10 +163,20 @@ export class MockClient implements FileSystemOperations {
 			`Renamed file: ${oldPath} -> ${newPath} with:\n  content ${new TextDecoder().decode(file)}`
 		);
 
-		void this.client.syncer.syncLocallyUpdatedFile({
-			oldPath,
-			relativePath: newPath,
-			updateTime: new Date()
+		this.runCallback(() => {
+			void this.client.syncer.syncLocallyUpdatedFile({
+				oldPath,
+				relativePath: newPath
+			});
 		});
 	}
+
+	private runCallback(callback: () => void): void {
+		if (this.useSlowFileEvents) {
+			// we aren't the best client and it takes some time to notice changes
+			setTimeout(callback, 100);
+		} else {
+			callback();
+		}
+	}
 }
diff --git a/frontend/test-client/src/cli.ts b/frontend/test-client/src/cli.ts
index 7f8b29a4..ea7ebbd0 100644
--- a/frontend/test-client/src/cli.ts
+++ b/frontend/test-client/src/cli.ts
@@ -3,20 +3,26 @@ import { MockAgent } from "./agent/mock-agent";
 import { sleep } from "./utils/sleep";
 import { v4 as uuidv4 } from "uuid";
 
+let slowFileEvents = false;
+
 async function runTest({
 	agentCount,
 	concurrency,
 	iterations,
 	doDeletes,
+	useSlowFileEvents,
 	jitterScaleInSeconds
 }: {
 	agentCount: number;
 	concurrency: number;
 	iterations: number;
 	doDeletes: boolean;
+	useSlowFileEvents: boolean;
 	jitterScaleInSeconds: number;
 }): Promise<void> {
-	const settings = `with ${agentCount} agents, concurrency ${concurrency}, iterations ${iterations}, doDeletes ${doDeletes}, jitterScaleInSeconds ${jitterScaleInSeconds}`;
+	slowFileEvents = useSlowFileEvents;
+
+	const settings = `with ${agentCount} agents, concurrency ${concurrency}, iterations ${iterations}, doDeletes ${doDeletes}, jitterScaleInSeconds ${jitterScaleInSeconds}, useSlowFileEvents ${useSlowFileEvents}`;
 	console.info(`Running test ${settings}`);
 
 	const initialSettings: Partial<SyncSettings> = {
@@ -34,6 +40,7 @@ async function runTest({
 				initialSettings,
 				`agent-${i}`,
 				doDeletes,
+				useSlowFileEvents,
 				jitterScaleInSeconds
 			)
 		);
@@ -52,12 +59,24 @@ async function runTest({
 
 		// Each agent can have unpushed changes which might conflict with eachother so each has to resolve the conflicts & push, and
 		for (const client of clients) {
-			await client.finish();
+			try {
+				await client.finish();
+			} catch (err) {
+				if (!slowFileEvents) {
+					throw err;
+				}
+			}
 		}
 
 		// then we need a second pass to ensure that all agents pull the same state.
 		for (const client of clients) {
-			await client.finish();
+			try {
+				await client.finish();
+			} catch (err) {
+				if (!slowFileEvents) {
+					throw err;
+				}
+			}
 		}
 
 		console.info("Agents finished successfully");
@@ -78,41 +97,49 @@ async function runTest({
 			console.info(`Content check for ${client.name} passed`);
 		});
 
-		console.info(`Test passed with ${settings}`);
+		console.info(`Test passed ${settings}`);
 	} catch (err) {
-		console.error(`Test failed with ${settings}`);
+		console.error(`Test failed ${settings}`);
 		throw err;
 	}
 }
 
 async function runTests(): Promise<void> {
-	const agentCounts = [2, 10];
-	const jitterScaleInSeconds = [0.5, 3, 0];
-	const concurrencies = [1, 16];
-	const iterations = [50, 300];
-	const doDeletes = [false, true];
-
-	for (const agentCount of agentCounts) {
-		for (const concurrency of concurrencies) {
-			for (const jitter of jitterScaleInSeconds) {
-				for (const iteration of iterations) {
-					for (const deleteFiles of doDeletes) {
-						while (true) {
-							await runTest({
-								agentCount,
-								concurrency,
-								iterations: iteration,
-								doDeletes: deleteFiles,
-								jitterScaleInSeconds: jitter
-							});
-						}
-					}
-				}
+	for (const useSlowFileEvents of [false, true]) {
+		for (const concurrency of [
+			16,
+			1 // test with concurrency 1 to check for deadlocks
+		]) {
+			for (const doDeletes of [true, false]) {
+				await runTest({
+					agentCount: 3,
+					concurrency,
+					iterations: 100,
+					doDeletes,
+					useSlowFileEvents,
+					jitterScaleInSeconds: 0.75
+				});
 			}
 		}
 	}
 }
 
+process.on("uncaughtException", (error) => {
+	if (slowFileEvents) {
+		return;
+	}
+	console.error("Uncaught Exception:", error);
+	process.exit(1);
+});
+
+process.on("unhandledRejection", (reason, _promise) => {
+	if (slowFileEvents) {
+		return;
+	}
+	console.error("Unhandled Rejection:", reason);
+	process.exit(1);
+});
+
 runTests()
 	.then(() => {
 		process.exit(0);
diff --git a/frontend/test-client/webpack.config.js b/frontend/test-client/webpack.config.js
index aa42a7df..b2324b9b 100644
--- a/frontend/test-client/webpack.config.js
+++ b/frontend/test-client/webpack.config.js
@@ -12,8 +12,7 @@ module.exports = {
 		rules: [
 			{
 				test: /\.ts$/,
-				use: "ts-loader",
-				exclude: /node_modules/
+				use: "ts-loader"
 			}
 		]
 	},
diff --git a/frontend/manifest.json b/manifest.json
similarity index 100%
rename from frontend/manifest.json
rename to manifest.json
diff --git a/bump-version.sh b/scripts/bump-version.sh
similarity index 84%
rename from bump-version.sh
rename to scripts/bump-version.sh
index b17842be..c8de4839 100755
--- a/bump-version.sh
+++ b/scripts/bump-version.sh
@@ -27,20 +27,20 @@ cd backend
 cargo set-version --bump patch
 
 echo "Bumping frontend versions"
-cd ../plugin
-npm version patch
+cd ../frontend
+npm version patch --workspaces
 
 echo "Updating frontend dependencies to match the new backend versions"
 cd ../backend/sync_lib
 wasm-pack build --target web --features console_error_panic_hook
 
-cd ../../plugin
+cd ../../frontend
 npm install
 
 cd ..
-cp plugin/manifest.json manifest.json  # for BRAT, otherwise it wouldn't update
+cp frontend/obsidian-plugin/manifest.json manifest.json  # for BRAT, otherwise it wouldn't update
 
-# Commit and tag
+Commit and tag
 git add .
 TAG=$(node -p "require('./plugin/package.json').version")
 git commit -m "Bump versions to $TAG"
diff --git a/scripts/clean-up.sh b/scripts/clean-up.sh
new file mode 100755
index 00000000..85c12d10
--- /dev/null
+++ b/scripts/clean-up.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+rm -rf backend/databases
+rm -rf logs
diff --git a/scripts/e2e.sh b/scripts/e2e.sh
new file mode 100755
index 00000000..fa06d82e
--- /dev/null
+++ b/scripts/e2e.sh
@@ -0,0 +1,79 @@
+#!/bin/bash
+
+set -e
+set -o pipefail
+
+# Check if the argument is provided
+if [ $# -eq 0 ]; then
+    echo "Usage: $0 <number_of_processes>"
+    exit 1
+fi
+
+# Get the number of processes from the first argument
+process_count=$1
+
+mkdir -p logs
+
+cd frontend
+npm run build
+
+pids=()
+for i in $(seq 1 $process_count); do
+    node test-client/dist/cli.js > "../logs/log_${i}.log" 2>&1 &
+    pids+=($!)
+done
+
+cd -
+
+print_failed_log() {
+    for i in $(seq 1 $process_count); do
+        if [ -n "${pids[$i-1]}" ] && ! kill -0 ${pids[$i-1]} 2>/dev/null; then
+            # Get the exit code of the process
+            wait ${pids[$i-1]}
+            exit_code=$?
+            
+            # Only consider non-zero exit codes as failures
+            if [ $exit_code -ne 0 ]; then
+                echo "Process ${pids[$i-1]} failed with exit code $exit_code. Log file: $(pwd)/logs/log_${i}.log"
+                return 0
+            else
+                echo "Process ${pids[$i-1]} completed successfully with exit code 0"
+                # Mark this PID as processed by setting it to empty
+                pids[$i-1]=""
+            fi
+        fi
+    done
+    return 1
+}
+
+echo "Monitoring $process_count processes"
+
+# Monitor processes
+while true; do
+    if print_failed_log; then
+        # Kill remaining processes
+        for pid in "${pids[@]}"; do
+            if [ -n "$pid" ]; then
+                kill $pid 2>/dev/null || true
+            fi
+        done
+        exit 1
+    fi
+
+    # Check if all processes have completed
+    all_done=true
+    for pid in "${pids[@]}"; do
+        if [ -n "$pid" ] && kill -0 $pid 2>/dev/null; then
+            all_done=false
+            break
+        fi
+    done
+
+    if $all_done; then
+        echo "All processes completed successfully"
+        exit 0
+    fi
+
+    sleep 0.2
+done
+
diff --git a/scripts/update-api-types.sh b/scripts/update-api-types.sh
new file mode 100755
index 00000000..d0aa2357
--- /dev/null
+++ b/scripts/update-api-types.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+npm install -g openapi-typescript
+openapi-typescript http://localhost:3030/api.json --output frontend/sync-client/src/services/types.ts

From 0688033ff3bd5bd95b722dc5c3c9843ddb57a834 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 16 Mar 2025 20:15:23 +0000
Subject: [PATCH 280/761] Bump versions to 0.0.31

---
 backend/Cargo.lock                     | 6 +++---
 backend/Cargo.toml                     | 2 +-
 frontend/obsidian-plugin/manifest.json | 4 ++--
 frontend/obsidian-plugin/package.json  | 2 +-
 frontend/package-lock.json             | 8 ++++----
 frontend/sync-client/package.json      | 4 ++--
 frontend/test-client/package.json      | 4 ++--
 manifest.json                          | 4 ++--
 scripts/bump-version.sh                | 2 +-
 9 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 8eddadf5..fd739b88 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1746,7 +1746,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile"
-version = "0.0.30"
+version = "0.0.31"
 dependencies = [
  "insta",
  "pretty_assertions",
@@ -2380,7 +2380,7 @@ dependencies = [
 
 [[package]]
 name = "sync_lib"
-version = "0.0.30"
+version = "0.0.31"
 dependencies = [
  "base64 0.22.1",
  "console_error_panic_hook",
@@ -2393,7 +2393,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.0.30"
+version = "0.0.31"
 dependencies = [
  "aide",
  "aide-axum-typed-multipart",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 5c3768a5..c9ee7d61 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -12,7 +12,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.0.30"
+version = "0.0.31"
 
 [workspace.dependencies]  
 serde = { version = "1.0.214", default-features = false, features = ["derive"] }
diff --git a/frontend/obsidian-plugin/manifest.json b/frontend/obsidian-plugin/manifest.json
index 7b7ca8c8..319d4e91 100644
--- a/frontend/obsidian-plugin/manifest.json
+++ b/frontend/obsidian-plugin/manifest.json
@@ -1,10 +1,10 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.0.30",
+	"version": "0.0.31",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
 	"authorUrl": "https://schmelczer.dev",
 	"isDesktopOnly": false
-}
+}
\ No newline at end of file
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index 7fcd9c02..b8a99d7d 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.0.30",
+	"version": "0.0.31",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index fea89cd9..2eafc99b 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -21,7 +21,7 @@
 		},
 		"../backend/sync_lib/pkg": {
 			"name": "sync_lib",
-			"version": "0.0.30",
+			"version": "0.0.31",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -6724,7 +6724,7 @@
 		},
 		"obsidian-plugin": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.0.30",
+			"version": "0.0.31",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
@@ -6752,7 +6752,7 @@
 			}
 		},
 		"sync-client": {
-			"version": "0.0.0",
+			"version": "0.0.31",
 			"dependencies": {
 				"byte-base64": "^1.1.0",
 				"fetch-retry": "^6.0.0",
@@ -6776,7 +6776,7 @@
 			}
 		},
 		"test-client": {
-			"version": "0.0.0",
+			"version": "0.0.31",
 			"bin": {
 				"test-client": "dist/cli.js"
 			},
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index f08b5f5a..116aff32 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "sync-client",
-	"version": "0.0.30",
+	"version": "0.0.31",
 	"main": "dist/sync-client.node.js",
 	"browser": "dist/sync-client.web.js",
 	"types": "dist/types/index.d.ts",
@@ -33,4 +33,4 @@
 		"webpack-merge": "^6.0.1",
 		"sync_lib": "file:../../backend/sync_lib/pkg"
 	}
-}
\ No newline at end of file
+}
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index b11a4c41..dff66e3b 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "test-client",
-	"version": "0.0.30",
+	"version": "0.0.31",
 	"private": true,
 	"bin": {
 		"test-client": "./dist/cli.js"
@@ -20,4 +20,4 @@
 		"webpack": "^5.98.0",
 		"webpack-cli": "^6.0.1"
 	}
-}
\ No newline at end of file
+}
diff --git a/manifest.json b/manifest.json
index 7b7ca8c8..319d4e91 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,10 +1,10 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.0.30",
+	"version": "0.0.31",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
 	"authorUrl": "https://schmelczer.dev",
 	"isDesktopOnly": false
-}
+}
\ No newline at end of file
diff --git a/scripts/bump-version.sh b/scripts/bump-version.sh
index c8de4839..f6f8609a 100755
--- a/scripts/bump-version.sh
+++ b/scripts/bump-version.sh
@@ -40,7 +40,7 @@ npm install
 cd ..
 cp frontend/obsidian-plugin/manifest.json manifest.json  # for BRAT, otherwise it wouldn't update
 
-Commit and tag
+# Commit and tag
 git add .
 TAG=$(node -p "require('./plugin/package.json').version")
 git commit -m "Bump versions to $TAG"

From 75583dedbeec9974106caff99c89bcde74e20d0a Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 16 Mar 2025 20:15:45 +0000
Subject: [PATCH 281/761] Fix bump version

---
 scripts/bump-version.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bump-version.sh b/scripts/bump-version.sh
index f6f8609a..93b33f54 100755
--- a/scripts/bump-version.sh
+++ b/scripts/bump-version.sh
@@ -42,7 +42,7 @@ cp frontend/obsidian-plugin/manifest.json manifest.json  # for BRAT, otherwise i
 
 # Commit and tag
 git add .
-TAG=$(node -p "require('./plugin/package.json').version")
+TAG=$(node -p "require('./frontend/obsidian-plugin/package.json').version")
 git commit -m "Bump versions to $TAG"
 
 git push

From 535169a03967831904214c2fe4ecbdee8625c107 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 16 Mar 2025 20:37:40 +0000
Subject: [PATCH 282/761] Try fixing CI

---
 README.md                  |  1 -
 frontend/package.json      |  4 ++--
 scripts/e2e.sh             |  2 ++
 scripts/wait-for-server.sh | 22 ++++++++++++++++++++++
 4 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100755 scripts/wait-for-server.sh

diff --git a/README.md b/README.md
index 6ad857e0..9aa988bb 100644
--- a/README.md
+++ b/README.md
@@ -53,4 +53,3 @@ scripts/e2e.sh
 ```
 
 And to clean up the logs & database files, run `scripts/clean-up.sh`
-```
diff --git a/frontend/package.json b/frontend/package.json
index 24c46388..cb0f45f7 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -16,7 +16,7 @@
 		"build": "npm run build --workspaces",
 		"dev": "concurrently --kill-others \"npm run dev -w sync-client\" \"npm run dev -w obsidian-plugin\"",
 		"test": "npm run test --workspaces",
-		"lint": "eslint --fix sync-client obsidian-plugin test-client && prettier --write \"**/*.(ts|scss|json|html)\"",
+		"lint": "eslint --fix sync-client obsidian-plugin test-client && prettier --write \"**/*.ts\"",
 		"update": "ncu -u -ws"
 	},
 	"devDependencies": {
@@ -27,4 +27,4 @@
 		"prettier": "^3.5.3",
 		"typescript-eslint": "8.26.1"
 	}
-}
+}
\ No newline at end of file
diff --git a/scripts/e2e.sh b/scripts/e2e.sh
index fa06d82e..f969f298 100755
--- a/scripts/e2e.sh
+++ b/scripts/e2e.sh
@@ -17,6 +17,8 @@ mkdir -p logs
 cd frontend
 npm run build
 
+./scripts/wait-for-server.sh
+
 pids=()
 for i in $(seq 1 $process_count); do
     node test-client/dist/cli.js > "../logs/log_${i}.log" 2>&1 &
diff --git a/scripts/wait-for-server.sh b/scripts/wait-for-server.sh
new file mode 100755
index 00000000..fa7f02bd
--- /dev/null
+++ b/scripts/wait-for-server.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+SERVER_URL="http://localhost:3000"
+MAX_RETRIES=30
+RETRY_INTERVAL_IN_SECONDS=5
+
+echo "Waiting for $SERVER_URL to become available..."
+count=0
+while [ $count -lt $MAX_RETRIES ]; do
+  if curl -s -f -o /dev/null $SERVER_URL; then
+    echo "$SERVER_URL is now available!"
+    break
+  fi
+  echo "Attempt $(($count+1))/$MAX_RETRIES: $SERVER_URL not available yet, retrying in ${RETRY_INTERVAL_IN_SECONDS}s..."
+  sleep $RETRY_INTERVAL_IN_SECONDS
+  count=$(($count+1))
+done
+
+if [ $count -eq $MAX_RETRIES ]; then
+  echo "Error: $SERVER_URL did not become available after $MAX_RETRIES attempts."
+  exit 1
+fi

From 577be484b89123cda74f52a1d650108c74a79d35 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 16 Mar 2025 20:45:03 +0000
Subject: [PATCH 283/761] Fix docker publishing & version bumping

---
 .github/workflows/publish-docker.yml | 8 ++++----
 scripts/bump-version.sh              | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml
index 14516a66..356031d6 100644
--- a/.github/workflows/publish-docker.yml
+++ b/.github/workflows/publish-docker.yml
@@ -35,7 +35,7 @@ jobs:
       # Install the cosign tool except on PR
       # https://github.com/sigstore/cosign-installer
       - name: Install cosign
-        if: ${{ github.ref_type == 'tag' }}
+        if: startsWith(github.event.ref, 'refs/tags/')
         uses: sigstore/cosign-installer@59acb6260d9c0ba8f4a2f9d9b48431a222b68e20 #v3.5.0
         with:
           cosign-release: "v2.2.4"
@@ -49,7 +49,7 @@ jobs:
       # Login against a Docker registry except on PR
       # https://github.com/docker/login-action
       - name: Log into registry ${{ env.REGISTRY }}
-        if: ${{ github.ref_type == 'tag' }}
+        if: startsWith(github.event.ref, 'refs/tags/')
         uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
         with:
           registry: ${{ env.REGISTRY }}
@@ -71,7 +71,7 @@ jobs:
         uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
         with:
           context: backend
-          push: ${{ github.ref_type == 'tag' }}
+          push: startsWith(github.event.ref, 'refs/tags/')
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
@@ -83,7 +83,7 @@ jobs:
       # transparency data even for private images, pass --force to cosign below.
       # https://github.com/sigstore/cosign
       - name: Sign the published Docker image
-        if: ${{ github.ref_type == 'tag' }}
+        if: startsWith(github.event.ref, 'refs/tags/')
         env:
           # https://docs.github.com/en/actions/security-guides/security-hardening-for-github-actions#using-an-intermediate-environment-variable
           TAGS: ${{ steps.meta.outputs.tags }}
diff --git a/scripts/bump-version.sh b/scripts/bump-version.sh
index 93b33f54..55813bd8 100755
--- a/scripts/bump-version.sh
+++ b/scripts/bump-version.sh
@@ -24,11 +24,11 @@ fi
 
 echo "Bumping backend versions"
 cd backend
-cargo set-version --bump patch
+cargo set-version --bump $1
 
 echo "Bumping frontend versions"
 cd ../frontend
-npm version patch --workspaces
+npm version $1 --workspaces
 
 echo "Updating frontend dependencies to match the new backend versions"
 cd ../backend/sync_lib

From 77dd086603f3a07e2567b7d414c9265aa9cb545d Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 16 Mar 2025 20:45:16 +0000
Subject: [PATCH 284/761] Bump versions to 0.1.0

---
 backend/Cargo.lock                     | 6 +++---
 backend/Cargo.toml                     | 2 +-
 frontend/obsidian-plugin/manifest.json | 2 +-
 frontend/obsidian-plugin/package.json  | 2 +-
 frontend/package-lock.json             | 8 ++++----
 frontend/sync-client/package.json      | 2 +-
 frontend/test-client/package.json      | 2 +-
 manifest.json                          | 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index fd739b88..b11aa305 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1746,7 +1746,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile"
-version = "0.0.31"
+version = "0.1.0"
 dependencies = [
  "insta",
  "pretty_assertions",
@@ -2380,7 +2380,7 @@ dependencies = [
 
 [[package]]
 name = "sync_lib"
-version = "0.0.31"
+version = "0.1.0"
 dependencies = [
  "base64 0.22.1",
  "console_error_panic_hook",
@@ -2393,7 +2393,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.0.31"
+version = "0.1.0"
 dependencies = [
  "aide",
  "aide-axum-typed-multipart",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index c9ee7d61..ba22a162 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -12,7 +12,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.0.31"
+version = "0.1.0"
 
 [workspace.dependencies]  
 serde = { version = "1.0.214", default-features = false, features = ["derive"] }
diff --git a/frontend/obsidian-plugin/manifest.json b/frontend/obsidian-plugin/manifest.json
index 319d4e91..c70d8813 100644
--- a/frontend/obsidian-plugin/manifest.json
+++ b/frontend/obsidian-plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.0.31",
+	"version": "0.1.0",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index b8a99d7d..a386c5c0 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.0.31",
+	"version": "0.1.0",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 2eafc99b..db09bc88 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -21,7 +21,7 @@
 		},
 		"../backend/sync_lib/pkg": {
 			"name": "sync_lib",
-			"version": "0.0.31",
+			"version": "0.1.0",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -6724,7 +6724,7 @@
 		},
 		"obsidian-plugin": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.0.31",
+			"version": "0.1.0",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
@@ -6752,7 +6752,7 @@
 			}
 		},
 		"sync-client": {
-			"version": "0.0.31",
+			"version": "0.1.0",
 			"dependencies": {
 				"byte-base64": "^1.1.0",
 				"fetch-retry": "^6.0.0",
@@ -6776,7 +6776,7 @@
 			}
 		},
 		"test-client": {
-			"version": "0.0.31",
+			"version": "0.1.0",
 			"bin": {
 				"test-client": "dist/cli.js"
 			},
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index 116aff32..e7df9c92 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "sync-client",
-	"version": "0.0.31",
+	"version": "0.1.0",
 	"main": "dist/sync-client.node.js",
 	"browser": "dist/sync-client.web.js",
 	"types": "dist/types/index.d.ts",
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index dff66e3b..e9200184 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "test-client",
-	"version": "0.0.31",
+	"version": "0.1.0",
 	"private": true,
 	"bin": {
 		"test-client": "./dist/cli.js"
diff --git a/manifest.json b/manifest.json
index 319d4e91..c70d8813 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.0.31",
+	"version": "0.1.0",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",

From f1dc849330f77766b306333ed002687dc59f4320 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 16 Mar 2025 21:00:07 +0000
Subject: [PATCH 285/761] Fix docker publish fix

---
 .github/workflows/publish-docker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml
index 356031d6..b221e8b5 100644
--- a/.github/workflows/publish-docker.yml
+++ b/.github/workflows/publish-docker.yml
@@ -71,7 +71,7 @@ jobs:
         uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
         with:
           context: backend
-          push: startsWith(github.event.ref, 'refs/tags/')
+          push: ${{ startsWith(github.event.ref, 'refs/tags/') }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha

From 8b8665c7ae8280e01ffe1fc3ad2dc4a1c69aace8 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 16 Mar 2025 21:00:21 +0000
Subject: [PATCH 286/761] Bump versions to 0.1.1

---
 backend/Cargo.lock                     | 6 +++---
 backend/Cargo.toml                     | 2 +-
 frontend/obsidian-plugin/manifest.json | 2 +-
 frontend/obsidian-plugin/package.json  | 2 +-
 frontend/package-lock.json             | 8 ++++----
 frontend/sync-client/package.json      | 2 +-
 frontend/test-client/package.json      | 2 +-
 manifest.json                          | 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index b11aa305..80592e73 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1746,7 +1746,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile"
-version = "0.1.0"
+version = "0.1.1"
 dependencies = [
  "insta",
  "pretty_assertions",
@@ -2380,7 +2380,7 @@ dependencies = [
 
 [[package]]
 name = "sync_lib"
-version = "0.1.0"
+version = "0.1.1"
 dependencies = [
  "base64 0.22.1",
  "console_error_panic_hook",
@@ -2393,7 +2393,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.1.0"
+version = "0.1.1"
 dependencies = [
  "aide",
  "aide-axum-typed-multipart",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index ba22a162..c5f70958 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -12,7 +12,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.1.0"
+version = "0.1.1"
 
 [workspace.dependencies]  
 serde = { version = "1.0.214", default-features = false, features = ["derive"] }
diff --git a/frontend/obsidian-plugin/manifest.json b/frontend/obsidian-plugin/manifest.json
index c70d8813..d79d9726 100644
--- a/frontend/obsidian-plugin/manifest.json
+++ b/frontend/obsidian-plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.1.0",
+	"version": "0.1.1",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index a386c5c0..bf52451a 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.1.0",
+	"version": "0.1.1",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index db09bc88..e943fb1b 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -21,7 +21,7 @@
 		},
 		"../backend/sync_lib/pkg": {
 			"name": "sync_lib",
-			"version": "0.1.0",
+			"version": "0.1.1",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -6724,7 +6724,7 @@
 		},
 		"obsidian-plugin": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.1.0",
+			"version": "0.1.1",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
@@ -6752,7 +6752,7 @@
 			}
 		},
 		"sync-client": {
-			"version": "0.1.0",
+			"version": "0.1.1",
 			"dependencies": {
 				"byte-base64": "^1.1.0",
 				"fetch-retry": "^6.0.0",
@@ -6776,7 +6776,7 @@
 			}
 		},
 		"test-client": {
-			"version": "0.1.0",
+			"version": "0.1.1",
 			"bin": {
 				"test-client": "dist/cli.js"
 			},
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index e7df9c92..134a8204 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "sync-client",
-	"version": "0.1.0",
+	"version": "0.1.1",
 	"main": "dist/sync-client.node.js",
 	"browser": "dist/sync-client.web.js",
 	"types": "dist/types/index.d.ts",
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index e9200184..60c1fa22 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "test-client",
-	"version": "0.1.0",
+	"version": "0.1.1",
 	"private": true,
 	"bin": {
 		"test-client": "./dist/cli.js"
diff --git a/manifest.json b/manifest.json
index c70d8813..d79d9726 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.1.0",
+	"version": "0.1.1",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",

From 9c512da460eefb94ec3dccd4688461eb59678baf Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 16 Mar 2025 21:00:56 +0000
Subject: [PATCH 287/761] Fix path

---
 scripts/e2e.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/e2e.sh b/scripts/e2e.sh
index f969f298..3e0747be 100755
--- a/scripts/e2e.sh
+++ b/scripts/e2e.sh
@@ -17,7 +17,7 @@ mkdir -p logs
 cd frontend
 npm run build
 
-./scripts/wait-for-server.sh
+./wait-for-server.sh
 
 pids=()
 for i in $(seq 1 $process_count); do

From eb2a186d1dc6eb877d8458dda8666cf75216f7be Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 16 Mar 2025 21:09:25 +0000
Subject: [PATCH 288/761] Try fixing CI again

---
 .github/workflows/publish-docker.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml
index b221e8b5..aad55fe6 100644
--- a/.github/workflows/publish-docker.yml
+++ b/.github/workflows/publish-docker.yml
@@ -35,7 +35,7 @@ jobs:
       # Install the cosign tool except on PR
       # https://github.com/sigstore/cosign-installer
       - name: Install cosign
-        if: startsWith(github.event.ref, 'refs/tags/')
+        if: startsWith(github.ref, 'refs/tags/')
         uses: sigstore/cosign-installer@59acb6260d9c0ba8f4a2f9d9b48431a222b68e20 #v3.5.0
         with:
           cosign-release: "v2.2.4"
@@ -49,7 +49,7 @@ jobs:
       # Login against a Docker registry except on PR
       # https://github.com/docker/login-action
       - name: Log into registry ${{ env.REGISTRY }}
-        if: startsWith(github.event.ref, 'refs/tags/')
+        if: startsWith(github.ref, 'refs/tags/')
         uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
         with:
           registry: ${{ env.REGISTRY }}
@@ -71,7 +71,7 @@ jobs:
         uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
         with:
           context: backend
-          push: ${{ startsWith(github.event.ref, 'refs/tags/') }}
+          push: ${{ startsWith(github.ref, 'refs/tags/') }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
@@ -83,7 +83,7 @@ jobs:
       # transparency data even for private images, pass --force to cosign below.
       # https://github.com/sigstore/cosign
       - name: Sign the published Docker image
-        if: startsWith(github.event.ref, 'refs/tags/')
+        if: startsWith(github.ref, 'refs/tags/')
         env:
           # https://docs.github.com/en/actions/security-guides/security-hardening-for-github-actions#using-an-intermediate-environment-variable
           TAGS: ${{ steps.meta.outputs.tags }}

From ad0b72e5248e7cef89698205d35b8961a731a66c Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 16 Mar 2025 21:09:37 +0000
Subject: [PATCH 289/761] Bump versions to 0.1.2

---
 backend/Cargo.lock                     | 6 +++---
 backend/Cargo.toml                     | 2 +-
 frontend/obsidian-plugin/manifest.json | 2 +-
 frontend/obsidian-plugin/package.json  | 2 +-
 frontend/package-lock.json             | 8 ++++----
 frontend/sync-client/package.json      | 2 +-
 frontend/test-client/package.json      | 2 +-
 manifest.json                          | 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 80592e73..ff04105b 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1746,7 +1746,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile"
-version = "0.1.1"
+version = "0.1.2"
 dependencies = [
  "insta",
  "pretty_assertions",
@@ -2380,7 +2380,7 @@ dependencies = [
 
 [[package]]
 name = "sync_lib"
-version = "0.1.1"
+version = "0.1.2"
 dependencies = [
  "base64 0.22.1",
  "console_error_panic_hook",
@@ -2393,7 +2393,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.1.1"
+version = "0.1.2"
 dependencies = [
  "aide",
  "aide-axum-typed-multipart",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index c5f70958..3a1a6288 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -12,7 +12,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.1.1"
+version = "0.1.2"
 
 [workspace.dependencies]  
 serde = { version = "1.0.214", default-features = false, features = ["derive"] }
diff --git a/frontend/obsidian-plugin/manifest.json b/frontend/obsidian-plugin/manifest.json
index d79d9726..cc54d7a2 100644
--- a/frontend/obsidian-plugin/manifest.json
+++ b/frontend/obsidian-plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.1.1",
+	"version": "0.1.2",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index bf52451a..71c7a78d 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.1.1",
+	"version": "0.1.2",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index e943fb1b..c610bd92 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -21,7 +21,7 @@
 		},
 		"../backend/sync_lib/pkg": {
 			"name": "sync_lib",
-			"version": "0.1.1",
+			"version": "0.1.2",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -6724,7 +6724,7 @@
 		},
 		"obsidian-plugin": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.1.1",
+			"version": "0.1.2",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
@@ -6752,7 +6752,7 @@
 			}
 		},
 		"sync-client": {
-			"version": "0.1.1",
+			"version": "0.1.2",
 			"dependencies": {
 				"byte-base64": "^1.1.0",
 				"fetch-retry": "^6.0.0",
@@ -6776,7 +6776,7 @@
 			}
 		},
 		"test-client": {
-			"version": "0.1.1",
+			"version": "0.1.2",
 			"bin": {
 				"test-client": "dist/cli.js"
 			},
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index 134a8204..c3425969 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "sync-client",
-	"version": "0.1.1",
+	"version": "0.1.2",
 	"main": "dist/sync-client.node.js",
 	"browser": "dist/sync-client.web.js",
 	"types": "dist/types/index.d.ts",
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index 60c1fa22..8b73c9f3 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "test-client",
-	"version": "0.1.1",
+	"version": "0.1.2",
 	"private": true,
 	"bin": {
 		"test-client": "./dist/cli.js"
diff --git a/manifest.json b/manifest.json
index d79d9726..cc54d7a2 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.1.1",
+	"version": "0.1.2",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",

From 4bd5dbb1e07599cec1dc217463bda0f7124f22ba Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 16 Mar 2025 21:15:36 +0000
Subject: [PATCH 290/761] Check vars

---
 .github/workflows/check.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 5acccc1f..712c7521 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -25,6 +25,9 @@ jobs:
 
       - name: Setup rust
         run: |
+          echo "github.ref: ${{ github.ref }}"
+          echo "github.ref_type: ${{ github.ref_type }}"
+          echo "github.event_name: ${{ github.event_name }}"
           cargo install sqlx-cli
           cd backend
           sqlx database create --database-url sqlite://db.sqlite3

From 0564885aa6a83432ff2f8181c30f5289929ce066 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 16 Mar 2025 21:20:07 +0000
Subject: [PATCH 291/761] Fix e2e CI

---
 .github/workflows/check.yml          | 3 ---
 .github/workflows/publish-docker.yml | 8 ++++----
 scripts/e2e.sh                       | 2 +-
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 712c7521..5acccc1f 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -25,9 +25,6 @@ jobs:
 
       - name: Setup rust
         run: |
-          echo "github.ref: ${{ github.ref }}"
-          echo "github.ref_type: ${{ github.ref_type }}"
-          echo "github.event_name: ${{ github.event_name }}"
           cargo install sqlx-cli
           cd backend
           sqlx database create --database-url sqlite://db.sqlite3
diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml
index aad55fe6..46f37967 100644
--- a/.github/workflows/publish-docker.yml
+++ b/.github/workflows/publish-docker.yml
@@ -35,7 +35,7 @@ jobs:
       # Install the cosign tool except on PR
       # https://github.com/sigstore/cosign-installer
       - name: Install cosign
-        if: startsWith(github.ref, 'refs/tags/')
+        if: github.ref_type == 'tag'
         uses: sigstore/cosign-installer@59acb6260d9c0ba8f4a2f9d9b48431a222b68e20 #v3.5.0
         with:
           cosign-release: "v2.2.4"
@@ -49,7 +49,7 @@ jobs:
       # Login against a Docker registry except on PR
       # https://github.com/docker/login-action
       - name: Log into registry ${{ env.REGISTRY }}
-        if: startsWith(github.ref, 'refs/tags/')
+        if: github.ref_type == 'tag'
         uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
         with:
           registry: ${{ env.REGISTRY }}
@@ -71,7 +71,7 @@ jobs:
         uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
         with:
           context: backend
-          push: ${{ startsWith(github.ref, 'refs/tags/') }}
+          push: ${{ github.ref_type == 'tag' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
@@ -83,7 +83,7 @@ jobs:
       # transparency data even for private images, pass --force to cosign below.
       # https://github.com/sigstore/cosign
       - name: Sign the published Docker image
-        if: startsWith(github.ref, 'refs/tags/')
+        if: ${{ github.ref_type == 'tag' }}
         env:
           # https://docs.github.com/en/actions/security-guides/security-hardening-for-github-actions#using-an-intermediate-environment-variable
           TAGS: ${{ steps.meta.outputs.tags }}
diff --git a/scripts/e2e.sh b/scripts/e2e.sh
index 3e0747be..993795a9 100755
--- a/scripts/e2e.sh
+++ b/scripts/e2e.sh
@@ -17,7 +17,7 @@ mkdir -p logs
 cd frontend
 npm run build
 
-./wait-for-server.sh
+../scripts/wait-for-server.sh
 
 pids=()
 for i in $(seq 1 $process_count); do

From 84ddcaad84fa6eb14f03f01d30923b81947bebc9 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 16 Mar 2025 21:24:28 +0000
Subject: [PATCH 292/761] Print logs

---
 scripts/e2e.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/e2e.sh b/scripts/e2e.sh
index 993795a9..d361ae34 100755
--- a/scripts/e2e.sh
+++ b/scripts/e2e.sh
@@ -36,6 +36,7 @@ print_failed_log() {
             
             # Only consider non-zero exit codes as failures
             if [ $exit_code -ne 0 ]; then
+                cat "$(pwd)/logs/log_${i}.log"
                 echo "Process ${pids[$i-1]} failed with exit code $exit_code. Log file: $(pwd)/logs/log_${i}.log"
                 return 0
             else

From 088cedae9a8413712c940be720b05d47974279fb Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 16 Mar 2025 21:24:38 +0000
Subject: [PATCH 293/761] Bump versions to 0.1.3

---
 backend/Cargo.lock                     | 6 +++---
 backend/Cargo.toml                     | 2 +-
 frontend/obsidian-plugin/manifest.json | 2 +-
 frontend/obsidian-plugin/package.json  | 2 +-
 frontend/package-lock.json             | 8 ++++----
 frontend/sync-client/package.json      | 2 +-
 frontend/test-client/package.json      | 2 +-
 manifest.json                          | 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index ff04105b..1c5e23b8 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1746,7 +1746,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile"
-version = "0.1.2"
+version = "0.1.3"
 dependencies = [
  "insta",
  "pretty_assertions",
@@ -2380,7 +2380,7 @@ dependencies = [
 
 [[package]]
 name = "sync_lib"
-version = "0.1.2"
+version = "0.1.3"
 dependencies = [
  "base64 0.22.1",
  "console_error_panic_hook",
@@ -2393,7 +2393,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.1.2"
+version = "0.1.3"
 dependencies = [
  "aide",
  "aide-axum-typed-multipart",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 3a1a6288..c7749e2f 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -12,7 +12,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.1.2"
+version = "0.1.3"
 
 [workspace.dependencies]  
 serde = { version = "1.0.214", default-features = false, features = ["derive"] }
diff --git a/frontend/obsidian-plugin/manifest.json b/frontend/obsidian-plugin/manifest.json
index cc54d7a2..46a7251c 100644
--- a/frontend/obsidian-plugin/manifest.json
+++ b/frontend/obsidian-plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.1.2",
+	"version": "0.1.3",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index 71c7a78d..2a398100 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.1.2",
+	"version": "0.1.3",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index c610bd92..f6b068cf 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -21,7 +21,7 @@
 		},
 		"../backend/sync_lib/pkg": {
 			"name": "sync_lib",
-			"version": "0.1.2",
+			"version": "0.1.3",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -6724,7 +6724,7 @@
 		},
 		"obsidian-plugin": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.1.2",
+			"version": "0.1.3",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
@@ -6752,7 +6752,7 @@
 			}
 		},
 		"sync-client": {
-			"version": "0.1.2",
+			"version": "0.1.3",
 			"dependencies": {
 				"byte-base64": "^1.1.0",
 				"fetch-retry": "^6.0.0",
@@ -6776,7 +6776,7 @@
 			}
 		},
 		"test-client": {
-			"version": "0.1.2",
+			"version": "0.1.3",
 			"bin": {
 				"test-client": "dist/cli.js"
 			},
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index c3425969..20196867 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "sync-client",
-	"version": "0.1.2",
+	"version": "0.1.3",
 	"main": "dist/sync-client.node.js",
 	"browser": "dist/sync-client.web.js",
 	"types": "dist/types/index.d.ts",
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index 8b73c9f3..fbce1253 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "test-client",
-	"version": "0.1.2",
+	"version": "0.1.3",
 	"private": true,
 	"bin": {
 		"test-client": "./dist/cli.js"
diff --git a/manifest.json b/manifest.json
index cc54d7a2..46a7251c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.1.2",
+	"version": "0.1.3",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",

From 47af8323cfd20f628e2ee6bb050427fc8529daa4 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 16 Mar 2025 21:35:41 +0000
Subject: [PATCH 294/761] Change port

---
 frontend/obsidian-plugin/src/views/settings-tab.ts | 2 +-
 frontend/test-client/src/cli.ts                    | 2 +-
 scripts/update-api-types.sh                        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/obsidian-plugin/src/views/settings-tab.ts b/frontend/obsidian-plugin/src/views/settings-tab.ts
index d37a26dc..ff796b3b 100644
--- a/frontend/obsidian-plugin/src/views/settings-tab.ts
+++ b/frontend/obsidian-plugin/src/views/settings-tab.ts
@@ -121,7 +121,7 @@ export class SyncSettingsTab extends PluginSettingTab {
 			.setTooltip("This is the URL of the server you want to sync with.")
 			.addText((text) =>
 				text
-					.setPlaceholder("https://example.com:3030")
+					.setPlaceholder("https://example.com:3000")
 					.setValue(this.syncClient.settings.getSettings().remoteUri)
 					.onChange(async (value) =>
 						this.syncClient.settings.setSetting("remoteUri", value)
diff --git a/frontend/test-client/src/cli.ts b/frontend/test-client/src/cli.ts
index ea7ebbd0..440998f9 100644
--- a/frontend/test-client/src/cli.ts
+++ b/frontend/test-client/src/cli.ts
@@ -30,7 +30,7 @@ async function runTest({
 		token: "token",
 		vaultName: uuidv4(),
 		syncConcurrency: concurrency,
-		remoteUri: "http://localhost:3030"
+		remoteUri: "http://localhost:3000"
 	};
 
 	const clients: MockAgent[] = [];
diff --git a/scripts/update-api-types.sh b/scripts/update-api-types.sh
index d0aa2357..0827f9a8 100755
--- a/scripts/update-api-types.sh
+++ b/scripts/update-api-types.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
 npm install -g openapi-typescript
-openapi-typescript http://localhost:3030/api.json --output frontend/sync-client/src/services/types.ts
+openapi-typescript http://localhost:3000/api.json --output frontend/sync-client/src/services/types.ts

From d0e9b16073d86682165d0c6db35672a20581097d Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 16 Mar 2025 21:41:57 +0000
Subject: [PATCH 295/761] Add tag as trigger

---
 .github/workflows/publish-docker.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml
index 46f37967..4da76519 100644
--- a/.github/workflows/publish-docker.yml
+++ b/.github/workflows/publish-docker.yml
@@ -8,6 +8,7 @@ name: Publish server Docker image
 on:
   push:
     branches: ["master"]
+    tags: ["*"]
   pull_request:
     branches: ["master"]
 

From 0935433cc1627a9646bc0cdead89665ae4cb930e Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 16 Mar 2025 21:42:15 +0000
Subject: [PATCH 296/761] Bump versions to 0.1.4

---
 backend/Cargo.lock                     | 6 +++---
 backend/Cargo.toml                     | 2 +-
 frontend/obsidian-plugin/manifest.json | 2 +-
 frontend/obsidian-plugin/package.json  | 2 +-
 frontend/package-lock.json             | 8 ++++----
 frontend/sync-client/package.json      | 2 +-
 frontend/test-client/package.json      | 2 +-
 manifest.json                          | 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 1c5e23b8..698b8182 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1746,7 +1746,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile"
-version = "0.1.3"
+version = "0.1.4"
 dependencies = [
  "insta",
  "pretty_assertions",
@@ -2380,7 +2380,7 @@ dependencies = [
 
 [[package]]
 name = "sync_lib"
-version = "0.1.3"
+version = "0.1.4"
 dependencies = [
  "base64 0.22.1",
  "console_error_panic_hook",
@@ -2393,7 +2393,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.1.3"
+version = "0.1.4"
 dependencies = [
  "aide",
  "aide-axum-typed-multipart",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index c7749e2f..514e53ed 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -12,7 +12,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.1.3"
+version = "0.1.4"
 
 [workspace.dependencies]  
 serde = { version = "1.0.214", default-features = false, features = ["derive"] }
diff --git a/frontend/obsidian-plugin/manifest.json b/frontend/obsidian-plugin/manifest.json
index 46a7251c..2fe0db76 100644
--- a/frontend/obsidian-plugin/manifest.json
+++ b/frontend/obsidian-plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.1.3",
+	"version": "0.1.4",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index 2a398100..12f7716f 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.1.3",
+	"version": "0.1.4",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index f6b068cf..ff1315a8 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -21,7 +21,7 @@
 		},
 		"../backend/sync_lib/pkg": {
 			"name": "sync_lib",
-			"version": "0.1.3",
+			"version": "0.1.4",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -6724,7 +6724,7 @@
 		},
 		"obsidian-plugin": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.1.3",
+			"version": "0.1.4",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
@@ -6752,7 +6752,7 @@
 			}
 		},
 		"sync-client": {
-			"version": "0.1.3",
+			"version": "0.1.4",
 			"dependencies": {
 				"byte-base64": "^1.1.0",
 				"fetch-retry": "^6.0.0",
@@ -6776,7 +6776,7 @@
 			}
 		},
 		"test-client": {
-			"version": "0.1.3",
+			"version": "0.1.4",
 			"bin": {
 				"test-client": "dist/cli.js"
 			},
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index 20196867..0da16c06 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "sync-client",
-	"version": "0.1.3",
+	"version": "0.1.4",
 	"main": "dist/sync-client.node.js",
 	"browser": "dist/sync-client.web.js",
 	"types": "dist/types/index.d.ts",
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index fbce1253..6b2fe998 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "test-client",
-	"version": "0.1.3",
+	"version": "0.1.4",
 	"private": true,
 	"bin": {
 		"test-client": "./dist/cli.js"
diff --git a/manifest.json b/manifest.json
index 46a7251c..2fe0db76 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.1.3",
+	"version": "0.1.4",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",

From c4e4a2a0f6a0a0490d22e78ccb2a7a24d5320b26 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 16 Mar 2025 21:49:52 +0000
Subject: [PATCH 297/761] Rever docker publishing

---
 .github/workflows/publish-docker.yml | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml
index 4da76519..638e3f36 100644
--- a/.github/workflows/publish-docker.yml
+++ b/.github/workflows/publish-docker.yml
@@ -7,10 +7,8 @@ name: Publish server Docker image
 
 on:
   push:
-    branches: ["master"]
-    tags: ["*"]
-  pull_request:
-    branches: ["master"]
+    tags:
+      - "*"
 
 env:
   # Use docker.io for Docker Hub if empty
@@ -36,7 +34,7 @@ jobs:
       # Install the cosign tool except on PR
       # https://github.com/sigstore/cosign-installer
       - name: Install cosign
-        if: github.ref_type == 'tag'
+        if: github.event_name != 'pull_request'
         uses: sigstore/cosign-installer@59acb6260d9c0ba8f4a2f9d9b48431a222b68e20 #v3.5.0
         with:
           cosign-release: "v2.2.4"
@@ -50,7 +48,7 @@ jobs:
       # Login against a Docker registry except on PR
       # https://github.com/docker/login-action
       - name: Log into registry ${{ env.REGISTRY }}
-        if: github.ref_type == 'tag'
+        if: github.event_name != 'pull_request'
         uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
         with:
           registry: ${{ env.REGISTRY }}
@@ -72,7 +70,7 @@ jobs:
         uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
         with:
           context: backend
-          push: ${{ github.ref_type == 'tag' }}
+          push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
@@ -84,7 +82,7 @@ jobs:
       # transparency data even for private images, pass --force to cosign below.
       # https://github.com/sigstore/cosign
       - name: Sign the published Docker image
-        if: ${{ github.ref_type == 'tag' }}
+        if: ${{ github.event_name != 'pull_request' }}
         env:
           # https://docs.github.com/en/actions/security-guides/security-hardening-for-github-actions#using-an-intermediate-environment-variable
           TAGS: ${{ steps.meta.outputs.tags }}

From d8f92680421f217204dc5225474d73765e69f885 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 16 Mar 2025 21:50:09 +0000
Subject: [PATCH 298/761] Bump versions to 0.1.5

---
 backend/Cargo.lock                     | 6 +++---
 backend/Cargo.toml                     | 2 +-
 frontend/obsidian-plugin/manifest.json | 2 +-
 frontend/obsidian-plugin/package.json  | 2 +-
 frontend/package-lock.json             | 8 ++++----
 frontend/sync-client/package.json      | 2 +-
 frontend/test-client/package.json      | 2 +-
 manifest.json                          | 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 698b8182..159a82bf 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1746,7 +1746,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile"
-version = "0.1.4"
+version = "0.1.5"
 dependencies = [
  "insta",
  "pretty_assertions",
@@ -2380,7 +2380,7 @@ dependencies = [
 
 [[package]]
 name = "sync_lib"
-version = "0.1.4"
+version = "0.1.5"
 dependencies = [
  "base64 0.22.1",
  "console_error_panic_hook",
@@ -2393,7 +2393,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.1.4"
+version = "0.1.5"
 dependencies = [
  "aide",
  "aide-axum-typed-multipart",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 514e53ed..7e728911 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -12,7 +12,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.1.4"
+version = "0.1.5"
 
 [workspace.dependencies]  
 serde = { version = "1.0.214", default-features = false, features = ["derive"] }
diff --git a/frontend/obsidian-plugin/manifest.json b/frontend/obsidian-plugin/manifest.json
index 2fe0db76..11102ee1 100644
--- a/frontend/obsidian-plugin/manifest.json
+++ b/frontend/obsidian-plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.1.4",
+	"version": "0.1.5",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index 12f7716f..bd267393 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.1.4",
+	"version": "0.1.5",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index ff1315a8..dad989b6 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -21,7 +21,7 @@
 		},
 		"../backend/sync_lib/pkg": {
 			"name": "sync_lib",
-			"version": "0.1.4",
+			"version": "0.1.5",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -6724,7 +6724,7 @@
 		},
 		"obsidian-plugin": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.1.4",
+			"version": "0.1.5",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
@@ -6752,7 +6752,7 @@
 			}
 		},
 		"sync-client": {
-			"version": "0.1.4",
+			"version": "0.1.5",
 			"dependencies": {
 				"byte-base64": "^1.1.0",
 				"fetch-retry": "^6.0.0",
@@ -6776,7 +6776,7 @@
 			}
 		},
 		"test-client": {
-			"version": "0.1.4",
+			"version": "0.1.5",
 			"bin": {
 				"test-client": "dist/cli.js"
 			},
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index 0da16c06..908b1bcd 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "sync-client",
-	"version": "0.1.4",
+	"version": "0.1.5",
 	"main": "dist/sync-client.node.js",
 	"browser": "dist/sync-client.web.js",
 	"types": "dist/types/index.d.ts",
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index 6b2fe998..2d9dc7c7 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "test-client",
-	"version": "0.1.4",
+	"version": "0.1.5",
 	"private": true,
 	"bin": {
 		"test-client": "./dist/cli.js"
diff --git a/manifest.json b/manifest.json
index 2fe0db76..11102ee1 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.1.4",
+	"version": "0.1.5",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",

From e35af96db6848774bd95f7e0e96921b0b26fedfe Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Tue, 18 Mar 2025 20:48:29 +0000
Subject: [PATCH 299/761] Add debug logging

---
 .github/workflows/publish-docker.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml
index 638e3f36..7c6d0b13 100644
--- a/.github/workflows/publish-docker.yml
+++ b/.github/workflows/publish-docker.yml
@@ -31,6 +31,12 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+      - name: Debug
+        run: |
+          echo "github.ref: ${{ github.ref }}"
+          echo "github.ref_type: ${{ github.ref_type }}"
+          echo "github.event_name: ${{ github.event_name }}"
+
       # Install the cosign tool except on PR
       # https://github.com/sigstore/cosign-installer
       - name: Install cosign

From f07f372bc58e55ba0a3e7e6c01b4ea9e742b91ee Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Tue, 18 Mar 2025 20:48:49 +0000
Subject: [PATCH 300/761] Try fixing E2E

---
 .gitignore                      |  1 -
 backend/.dockerignore           |  7 ++-----
 backend/config.yml              | 13 +++++++++++++
 frontend/test-client/src/cli.ts |  2 +-
 4 files changed, 16 insertions(+), 7 deletions(-)
 create mode 100644 backend/config.yml

diff --git a/.gitignore b/.gitignore
index d2a83679..b1e083d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,7 +11,6 @@ frontend/*/dist
 
 backend/db.sqlite3*
 backend/databases
-backend/config.yml
 
 *.log
 
diff --git a/backend/.dockerignore b/backend/.dockerignore
index e3630304..dd62faf4 100644
--- a/backend/.dockerignore
+++ b/backend/.dockerignore
@@ -1,9 +1,6 @@
 target
 Dockerfile
 .dockerignore
-db.sqlite3*
-*.log
+databases
 sync_lib/pkg
-fuzz/artifacts
-fuzz/corpus
-fuzz/coverage
+config.yml
diff --git a/backend/config.yml b/backend/config.yml
new file mode 100644
index 00000000..b05f94c2
--- /dev/null
+++ b/backend/config.yml
@@ -0,0 +1,13 @@
+database:
+  databases_directory_path: databases
+  max_connections: 12
+server:
+  host: 0.0.0.0
+  port: 3000
+  max_body_size_mb: 512
+users:
+  user_tokens:
+  - name: admin
+    token: test-token-change-me
+  - name: test
+    token: token
diff --git a/frontend/test-client/src/cli.ts b/frontend/test-client/src/cli.ts
index 440998f9..dd6705d5 100644
--- a/frontend/test-client/src/cli.ts
+++ b/frontend/test-client/src/cli.ts
@@ -27,7 +27,7 @@ async function runTest({
 
 	const initialSettings: Partial<SyncSettings> = {
 		isSyncEnabled: true,
-		token: "token",
+		token: "test-token-change-me", // same as in backend/config.yml
 		vaultName: uuidv4(),
 		syncConcurrency: concurrency,
 		remoteUri: "http://localhost:3000"

From c278e9d1313dc8099d142666630acc803ff7eb99 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Tue, 18 Mar 2025 21:13:47 +0000
Subject: [PATCH 301/761] Log to console

---
 .../obsidian-plugin/src/vault-link-plugin.ts  | 27 ++++++++++++++++---
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/frontend/obsidian-plugin/src/vault-link-plugin.ts b/frontend/obsidian-plugin/src/vault-link-plugin.ts
index e60c33af..ae290b53 100644
--- a/frontend/obsidian-plugin/src/vault-link-plugin.ts
+++ b/frontend/obsidian-plugin/src/vault-link-plugin.ts
@@ -2,15 +2,13 @@ import type { WorkspaceLeaf } from "obsidian";
 import { Plugin } from "obsidian";
 import "./styles.scss";
 import "../manifest.json";
-
 import { SyncSettingsTab } from "./views/settings-tab";
 import { HistoryView } from "./views/history-view";
 import { ObsidianFileEventHandler } from "./obisidan-event-handler";
 import { StatusBar } from "./views/status-bar";
-
 import { LogsView } from "./views/logs-view";
 import { StatusDescription } from "./views/status-description";
-import { SyncClient } from "sync-client";
+import { SyncClient, LogLevel, LogLine } from "sync-client";
 import { ObsidianFileSystemOperations } from "./obsidian-file-system";
 
 export default class VaultLinkPlugin extends Plugin {
@@ -26,7 +24,7 @@ export default class VaultLinkPlugin extends Plugin {
 			}
 		);
 
-		this.client.logger.info("Starting plugin");
+		registerConsoleForLogging(this.client);
 
 		const statusDescription = new StatusDescription(this.client);
 
@@ -125,3 +123,24 @@ export default class VaultLinkPlugin extends Plugin {
 		}
 	}
 }
+
+function registerConsoleForLogging(client: SyncClient) {
+	client.logger.addOnMessageListener((logLine: LogLine) => {
+		const formatted = `${logLine.timestamp.toISOString()} ${logLine.level} ${logLine.message}`;
+
+		switch (logLine.level) {
+			case LogLevel.ERROR:
+				console.error(formatted);
+				break;
+			case LogLevel.WARNING:
+				console.warn(formatted);
+				break;
+			case LogLevel.INFO:
+				console.info(formatted);
+				break;
+			case LogLevel.DEBUG:
+				console.debug(formatted);
+				break;
+		}
+	});
+}

From 82345cf1bf934e14af4a9e59bbe17e03df9b9278 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Tue, 18 Mar 2025 21:20:15 +0000
Subject: [PATCH 302/761] Only use 2 clients for E2E

---
 frontend/test-client/src/cli.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/test-client/src/cli.ts b/frontend/test-client/src/cli.ts
index dd6705d5..25dc8556 100644
--- a/frontend/test-client/src/cli.ts
+++ b/frontend/test-client/src/cli.ts
@@ -112,7 +112,7 @@ async function runTests(): Promise<void> {
 		]) {
 			for (const doDeletes of [true, false]) {
 				await runTest({
-					agentCount: 3,
+					agentCount: 2,
 					concurrency,
 					iterations: 100,
 					doDeletes,

From a39e0886c79a2030cf5ca51a028f1c6531de4ce1 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Tue, 18 Mar 2025 21:20:43 +0000
Subject: [PATCH 303/761] Export LogLine

---
 frontend/sync-client/src/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/sync-client/src/index.ts b/frontend/sync-client/src/index.ts
index e1625963..82b6bd87 100644
--- a/frontend/sync-client/src/index.ts
+++ b/frontend/sync-client/src/index.ts
@@ -7,7 +7,7 @@ export {
 	type HistoryEntry
 } from "./tracing/sync-history";
 
-export { Logger, LogLevel } from "./tracing/logger";
+export { Logger, LogLevel, LogLine } from "./tracing/logger";
 
 export { SyncClient } from "./sync-client";
 export { Syncer } from "./sync-operations/syncer";

From d772cda1647b5d36218aaac3c4e337c7adb91c77 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 20 Mar 2025 20:44:03 +0000
Subject: [PATCH 304/761] Use new settings API exposed directly through
 SyncClient

---
 .../obsidian-plugin/src/views/logs-view.ts    | 14 ++---
 .../obsidian-plugin/src/views/settings-tab.ts | 56 +++++++------------
 .../obsidian-plugin/src/views/status-bar.ts   |  4 +-
 .../src/views/status-description.ts           |  8 +--
 .../sync-client/src/persistence/settings.ts   | 18 +++---
 frontend/test-client/src/agent/mock-agent.ts  | 20 +++----
 frontend/test-client/src/agent/mock-client.ts |  2 +-
 7 files changed, 50 insertions(+), 72 deletions(-)

diff --git a/frontend/obsidian-plugin/src/views/logs-view.ts b/frontend/obsidian-plugin/src/views/logs-view.ts
index 22def86f..eaa1a780 100644
--- a/frontend/obsidian-plugin/src/views/logs-view.ts
+++ b/frontend/obsidian-plugin/src/views/logs-view.ts
@@ -18,15 +18,11 @@ export class LogsView extends ItemView {
 			this.updateView();
 		});
 
-		this.client.settings.addOnSettingsChangeHandlers(
-			(newSettings, oldSettings) => {
-				if (
-					newSettings.minimumLogLevel !== oldSettings.minimumLogLevel
-				) {
-					this.updateView();
-				}
+		this.client.addOnSettingsChangeHandlers((newSettings, oldSettings) => {
+			if (newSettings.minimumLogLevel !== oldSettings.minimumLogLevel) {
+				this.updateView();
 			}
-		);
+		});
 	}
 
 	private static formatTimestamp(timestamp: Date): string {
@@ -82,7 +78,7 @@ export class LogsView extends ItemView {
 		);
 
 		const logs = this.client.logger.getMessages(
-			this.client.settings.getSettings().minimumLogLevel
+			this.client.getSettings().minimumLogLevel
 		);
 
 		if (logs.length === 0) {
diff --git a/frontend/obsidian-plugin/src/views/settings-tab.ts b/frontend/obsidian-plugin/src/views/settings-tab.ts
index ff796b3b..d4d80061 100644
--- a/frontend/obsidian-plugin/src/views/settings-tab.ts
+++ b/frontend/obsidian-plugin/src/views/settings-tab.ts
@@ -32,8 +32,8 @@ export class SyncSettingsTab extends PluginSettingTab {
 		this.syncClient = syncClient;
 		this.statusDescription = statusDescription;
 
-		this.editedVaultName = this.syncClient.settings.getSettings().vaultName;
-		this.syncClient.settings.addOnSettingsChangeHandlers(
+		this.editedVaultName = this.syncClient.getSettings().vaultName;
+		this.syncClient.addOnSettingsChangeHandlers(
 			(newSettings, oldSettings) => {
 				if (newSettings.vaultName !== oldSettings.vaultName) {
 					this.editedVaultName = newSettings.vaultName;
@@ -122,9 +122,9 @@ export class SyncSettingsTab extends PluginSettingTab {
 			.addText((text) =>
 				text
 					.setPlaceholder("https://example.com:3000")
-					.setValue(this.syncClient.settings.getSettings().remoteUri)
+					.setValue(this.syncClient.getSettings().remoteUri)
 					.onChange(async (value) =>
-						this.syncClient.settings.setSetting("remoteUri", value)
+						this.syncClient.setSetting("remoteUri", value)
 					)
 			)
 			.addButton((button) =>
@@ -146,9 +146,9 @@ export class SyncSettingsTab extends PluginSettingTab {
 			.addTextArea((text) =>
 				text
 					.setPlaceholder("ey...")
-					.setValue(this.syncClient.settings.getSettings().token)
+					.setValue(this.syncClient.getSettings().token)
 					.onChange(async (value) =>
-						this.syncClient.settings.setSetting("token", value)
+						this.syncClient.setSetting("token", value)
 					)
 			);
 
@@ -161,22 +161,21 @@ export class SyncSettingsTab extends PluginSettingTab {
 			.addText((text) =>
 				text
 					.setPlaceholder("My Obsidian Vault")
-					.setValue(this.syncClient.settings.getSettings().vaultName)
+					.setValue(this.syncClient.getSettings().vaultName)
 					.onChange((value) => (this.editedVaultName = value))
 			)
 			.addButton((button) =>
 				button.setButtonText("Apply").onClick(async () => {
 					if (
 						this.editedVaultName ===
-						this.syncClient.settings.getSettings().vaultName
+						this.syncClient.getSettings().vaultName
 					) {
 						return;
 					}
-					await this.syncClient.settings.setSetting(
+					await this.syncClient.setSetting(
 						"vaultName",
 						this.editedVaultName
 					);
-					await this.syncClient.reset();
 					new Notice(
 						"Sync state has been reset, you will need to resync"
 					);
@@ -213,11 +212,11 @@ export class SyncSettingsTab extends PluginSettingTab {
 					.setDynamicTooltip()
 					.setInstant(false)
 					.setValue(
-						this.syncClient.settings.getSettings()
+						this.syncClient.getSettings()
 							.fetchChangesUpdateIntervalMs / 1000
 					)
 					.onChange(async (value) =>
-						this.syncClient.settings.setSetting(
+						this.syncClient.setSetting(
 							"fetchChangesUpdateIntervalMs",
 							value * 1000
 						)
@@ -234,14 +233,9 @@ export class SyncSettingsTab extends PluginSettingTab {
 					.setLimits(1, 16, 1)
 					.setDynamicTooltip()
 					.setInstant(false)
-					.setValue(
-						this.syncClient.settings.getSettings().syncConcurrency
-					)
+					.setValue(this.syncClient.getSettings().syncConcurrency)
 					.onChange(async (value) =>
-						this.syncClient.settings.setSetting(
-							"syncConcurrency",
-							value
-						)
+						this.syncClient.setSetting("syncConcurrency", value)
 					)
 			);
 
@@ -255,14 +249,9 @@ export class SyncSettingsTab extends PluginSettingTab {
 					.setLimits(0, 32, 1)
 					.setDynamicTooltip()
 					.setInstant(false)
-					.setValue(
-						this.syncClient.settings.getSettings().maxFileSizeMB
-					)
+					.setValue(this.syncClient.getSettings().maxFileSizeMB)
 					.onChange(async (value) =>
-						this.syncClient.settings.setSetting(
-							"maxFileSizeMB",
-							value
-						)
+						this.syncClient.setSetting("maxFileSizeMB", value)
 					)
 			);
 
@@ -276,14 +265,9 @@ export class SyncSettingsTab extends PluginSettingTab {
 			)
 			.addToggle((toggle) =>
 				toggle
-					.setValue(
-						this.syncClient.settings.getSettings().isSyncEnabled
-					)
+					.setValue(this.syncClient.getSettings().isSyncEnabled)
 					.onChange(async (value) =>
-						this.syncClient.settings.setSetting(
-							"isSyncEnabled",
-							value
-						)
+						this.syncClient.setSetting("isSyncEnabled", value)
 					)
 			);
 	}
@@ -304,11 +288,9 @@ export class SyncSettingsTab extends PluginSettingTab {
 						[LogLevel.WARNING]: LogLevel.WARNING,
 						[LogLevel.ERROR]: LogLevel.ERROR
 					})
-					.setValue(
-						this.syncClient.settings.getSettings().minimumLogLevel
-					)
+					.setValue(this.syncClient.getSettings().minimumLogLevel)
 					.onChange(async (value) =>
-						this.syncClient.settings.setSetting(
+						this.syncClient.setSetting(
 							"minimumLogLevel",
 							// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
 							value as LogLevel
diff --git a/frontend/obsidian-plugin/src/views/status-bar.ts b/frontend/obsidian-plugin/src/views/status-bar.ts
index ba7d7339..211cde96 100644
--- a/frontend/obsidian-plugin/src/views/status-bar.ts
+++ b/frontend/obsidian-plugin/src/views/status-bar.ts
@@ -24,7 +24,7 @@ export class StatusBar {
 			}
 		);
 
-		this.syncClient.settings.addOnSettingsChangeHandlers(() => {
+		this.syncClient.addOnSettingsChangeHandlers(() => {
 			this.updateStatus();
 		});
 	}
@@ -57,7 +57,7 @@ export class StatusBar {
 		}
 
 		if (!hasShownMessage) {
-			if (this.syncClient.settings.getSettings().isSyncEnabled) {
+			if (this.syncClient.getSettings().isSyncEnabled) {
 				container.createSpan({ text: "VaultLink is idle" });
 			} else {
 				const button = container.createEl("button", {
diff --git a/frontend/obsidian-plugin/src/views/status-description.ts b/frontend/obsidian-plugin/src/views/status-description.ts
index 381547d6..b22c7a9c 100644
--- a/frontend/obsidian-plugin/src/views/status-description.ts
+++ b/frontend/obsidian-plugin/src/views/status-description.ts
@@ -26,7 +26,7 @@ export class StatusDescription {
 			}
 		);
 
-		this.syncClient.settings.addOnSettingsChangeHandlers(() => {
+		this.syncClient.addOnSettingsChangeHandlers(() => {
 			void this.updateConnectionState();
 		});
 	}
@@ -67,8 +67,8 @@ export class StatusDescription {
 
 		container.createSpan({ text: "VaultLink is connected to the server " });
 		container.createEl("a", {
-			text: this.syncClient.settings.getSettings().remoteUri,
-			href: this.syncClient.settings.getSettings().remoteUri
+			text: this.syncClient.getSettings().remoteUri,
+			href: this.syncClient.getSettings().remoteUri
 		});
 
 		container.createSpan({
@@ -87,7 +87,7 @@ export class StatusDescription {
 			(this.lastHistoryStats?.success ?? 0) === 0 &&
 			(this.lastHistoryStats?.error ?? 0) === 0
 		) {
-			if (this.syncClient.settings.getSettings().isSyncEnabled) {
+			if (this.syncClient.getSettings().isSyncEnabled) {
 				container.createSpan({
 					text: "Syncing is enabled but VaultLink hasn't found anything to sync yet."
 				});
diff --git a/frontend/sync-client/src/persistence/settings.ts b/frontend/sync-client/src/persistence/settings.ts
index dbeb8c15..457636e2 100644
--- a/frontend/sync-client/src/persistence/settings.ts
+++ b/frontend/sync-client/src/persistence/settings.ts
@@ -50,15 +50,6 @@ export class Settings {
 		return this.settings;
 	}
 
-	public async setSettings(value: SyncSettings): Promise<void> {
-		const oldSettings = this.settings;
-		this.settings = value;
-		this.onSettingsChangeHandlers.forEach((handler) => {
-			handler(value, oldSettings);
-		});
-		await this.save();
-	}
-
 	public addOnSettingsChangeHandlers(
 		handler: (settings: SyncSettings, oldSettings: SyncSettings) => void
 	): void {
@@ -74,6 +65,15 @@ export class Settings {
 		await this.setSettings(newSettings);
 	}
 
+	private async setSettings(value: SyncSettings): Promise<void> {
+		const oldSettings = this.settings;
+		this.settings = value;
+		this.onSettingsChangeHandlers.forEach((handler) => {
+			handler(value, oldSettings);
+		});
+		await this.save();
+	}
+
 	private async save(): Promise<void> {
 		await this.saveData(this.settings);
 	}
diff --git a/frontend/test-client/src/agent/mock-agent.ts b/frontend/test-client/src/agent/mock-agent.ts
index 7713b524..ff705204 100644
--- a/frontend/test-client/src/agent/mock-agent.ts
+++ b/frontend/test-client/src/agent/mock-agent.ts
@@ -43,7 +43,7 @@ export class MockAgent extends MockClient {
 		};
 
 		this.client.logger.addOnMessageListener((logLine: LogLine) => {
-			const state = this.client.settings.getSettings().isSyncEnabled
+			const state = this.client.getSettings().isSyncEnabled
 				? "(online) "
 				: "(offline)";
 			const formatted = `[${this.name} ${state}] ${logLine.timestamp.toISOString()} ${logLine.level} ${logLine.message}`;
@@ -91,7 +91,7 @@ export class MockAgent extends MockClient {
 			this.changeFetchChangesUpdateIntervalMsAction.bind(this)
 		];
 
-		if (this.client.settings.getSettings().isSyncEnabled) {
+		if (this.client.getSettings().isSyncEnabled) {
 			if (this.doNotTouchWhileOffline.length === 0) {
 				options.push(this.disableSyncAction.bind(this));
 			}
@@ -131,7 +131,7 @@ export class MockAgent extends MockClient {
 	}
 
 	public async finish(): Promise<void> {
-		await this.client.settings.setSetting("isSyncEnabled", true);
+		await this.client.setSetting("isSyncEnabled", true);
 		await Promise.all(this.pendingActions);
 		this.client.stop();
 		await this.client.syncer.waitForSyncQueue();
@@ -239,7 +239,7 @@ export class MockAgent extends MockClient {
 		const file = this.getFileName();
 
 		if (
-			(!this.client.settings.getSettings().isSyncEnabled &&
+			(!this.client.getSettings().isSyncEnabled &&
 				this.doNotTouchWhileOffline.includes(file)) ||
 			(await this.exists(file))
 		) {
@@ -258,7 +258,7 @@ export class MockAgent extends MockClient {
 		this.client.logger.info(
 			`Decided to change fetchChangesUpdateIntervalMs`
 		);
-		return this.client.settings.setSetting(
+		return this.client.setSetting(
 			"fetchChangesUpdateIntervalMs",
 			Math.random() * 2000 + 100
 		);
@@ -266,12 +266,12 @@ export class MockAgent extends MockClient {
 
 	private async disableSyncAction(): Promise<void> {
 		this.client.logger.info(`Decided to disable sync`);
-		await this.client.settings.setSetting("isSyncEnabled", false);
+		await this.client.setSetting("isSyncEnabled", false);
 	}
 
 	private async enableSyncAction(): Promise<void> {
 		this.client.logger.info(`Decided to enable sync`);
-		await this.client.settings.setSetting("isSyncEnabled", true);
+		await this.client.setSetting("isSyncEnabled", true);
 	}
 
 	private async renameFileAction(files: RelativePath[]): Promise<void> {
@@ -280,7 +280,7 @@ export class MockAgent extends MockClient {
 		// We can't edit files offline that have been updated while offline.
 		// Otherwise, the resolution logic couldn't handle it.
 		if (
-			!this.client.settings.getSettings().isSyncEnabled &&
+			!this.client.getSettings().isSyncEnabled &&
 			this.doNotTouchWhileOffline.includes(file)
 		) {
 			this.client.logger.info(
@@ -292,7 +292,7 @@ export class MockAgent extends MockClient {
 		const newName = this.getFileName();
 
 		if (
-			(!this.client.settings.getSettings().isSyncEnabled &&
+			(!this.client.getSettings().isSyncEnabled &&
 				this.doNotTouchWhileOffline.includes(newName)) ||
 			(await this.exists(newName))
 		) {
@@ -311,7 +311,7 @@ export class MockAgent extends MockClient {
 		// We can't edit files offline that have been updated while offline.
 		// Otherwise, the resolution logic couldn't handle it.
 		if (
-			!this.client.settings.getSettings().isSyncEnabled &&
+			!this.client.getSettings().isSyncEnabled &&
 			this.doNotTouchWhileOffline.includes(file)
 		) {
 			this.client.logger.info(
diff --git a/frontend/test-client/src/agent/mock-client.ts b/frontend/test-client/src/agent/mock-client.ts
index 7e4e14c3..1adae4bd 100644
--- a/frontend/test-client/src/agent/mock-client.ts
+++ b/frontend/test-client/src/agent/mock-client.ts
@@ -25,7 +25,7 @@ export class MockClient implements FileSystemOperations {
 		await Promise.all(
 			Object.keys(this.initialSettings).map(async (key) => {
 				const settingKey = key as keyof SyncSettings; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
-				return this.client.settings.setSetting(
+				return this.client.setSetting(
 					settingKey,
 					this.initialSettings[settingKey]! // eslint-disable-line @typescript-eslint/no-non-null-assertion
 				);

From a9223156a68a28d4cde6616de4befefad8facf61 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 20 Mar 2025 20:49:00 +0000
Subject: [PATCH 305/761] Inline fetch-retry with cancellation

---
 frontend/package-lock.json                    |   5 -
 frontend/sync-client/package.json             |   3 +-
 .../src/services/connected-state.ts           |  51 ---------
 .../src/services/connection-status.ts         | 101 ++++++++++++++++++
 .../sync-client/src/services/sync-service.ts  |   8 +-
 .../sync-client/src/utils/retried-fetch.ts    |  38 -------
 frontend/sync-client/src/utils/sleep.ts       |   3 +
 7 files changed, 109 insertions(+), 100 deletions(-)
 delete mode 100644 frontend/sync-client/src/services/connected-state.ts
 create mode 100644 frontend/sync-client/src/services/connection-status.ts
 delete mode 100644 frontend/sync-client/src/utils/retried-fetch.ts
 create mode 100644 frontend/sync-client/src/utils/sleep.ts

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index dad989b6..037bd9d4 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -3157,10 +3157,6 @@
 				"bser": "2.1.1"
 			}
 		},
-		"node_modules/fetch-retry": {
-			"version": "6.0.0",
-			"license": "MIT"
-		},
 		"node_modules/file-entry-cache": {
 			"version": "8.0.0",
 			"dev": true,
@@ -6755,7 +6751,6 @@
 			"version": "0.1.5",
 			"dependencies": {
 				"byte-base64": "^1.1.0",
-				"fetch-retry": "^6.0.0",
 				"openapi-fetch": "0.13.5",
 				"openapi-typescript": "7.6.1",
 				"p-queue": "^8.1.0",
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index 908b1bcd..826e7e94 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -14,7 +14,6 @@
 	},
 	"dependencies": {
 		"byte-base64": "^1.1.0",
-		"fetch-retry": "^6.0.0",
 		"openapi-fetch": "0.13.5",
 		"openapi-typescript": "7.6.1",
 		"p-queue": "^8.1.0",
@@ -33,4 +32,4 @@
 		"webpack-merge": "^6.0.1",
 		"sync_lib": "file:../../backend/sync_lib/pkg"
 	}
-}
+}
\ No newline at end of file
diff --git a/frontend/sync-client/src/services/connected-state.ts b/frontend/sync-client/src/services/connected-state.ts
deleted file mode 100644
index 4b62b792..00000000
--- a/frontend/sync-client/src/services/connected-state.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import type { Settings } from "../persistence/settings";
-import type { Logger } from "../tracing/logger";
-import { createPromise } from "../utils/create-promise";
-import { retriedFetchFactory } from "../utils/retried-fetch";
-
-export class ConnectedState {
-	private resolveIsSyncEnabled: (() => void) | undefined;
-	private syncIsEnabled: Promise<void> | undefined;
-
-	public constructor(
-		settings: Settings,
-		private readonly logger: Logger
-	) {
-		settings.addOnSettingsChangeHandlers((newSettings, oldSettings) => {
-			if (!oldSettings.isSyncEnabled && newSettings.isSyncEnabled) {
-				this.handleComingOnline();
-			} else if (
-				oldSettings.isSyncEnabled &&
-				!newSettings.isSyncEnabled
-			) {
-				this.handleGoingOffline();
-			}
-		});
-	}
-
-	public getFetchImplementation(
-		fetch: typeof globalThis.fetch,
-		{ doRetries = true }: { doRetries: boolean } = { doRetries: true }
-	): typeof globalThis.fetch {
-		const retriedFetch = doRetries
-			? retriedFetchFactory(this.logger, fetch)
-			: fetch;
-
-		return async (input: RequestInfo | URL): Promise<Response> => {
-			if (this.syncIsEnabled !== undefined) {
-				await this.syncIsEnabled;
-			}
-			return retriedFetch(input);
-		};
-	}
-
-	private handleComingOnline(): void {
-		this.logger.debug("Sync is enabled");
-		this.resolveIsSyncEnabled?.();
-	}
-
-	private handleGoingOffline(): void {
-		this.logger.debug("Sync is disabled");
-		[this.syncIsEnabled, this.resolveIsSyncEnabled] = createPromise();
-	}
-}
diff --git a/frontend/sync-client/src/services/connection-status.ts b/frontend/sync-client/src/services/connection-status.ts
new file mode 100644
index 00000000..ebf9361b
--- /dev/null
+++ b/frontend/sync-client/src/services/connection-status.ts
@@ -0,0 +1,101 @@
+import type { Settings } from "../persistence/settings";
+import type { Logger } from "../tracing/logger";
+import { createPromise } from "../utils/create-promise";
+import { sleep } from "../utils/sleep";
+
+export class ConnectionStatus {
+	private static readonly UNTIL_RESOLUTION = Symbol();
+	private canFetch = true;
+	private until: Promise<Symbol>;
+	private resolveUntil: (result: Symbol) => void;
+	private rejectUntil: (reason: any) => void;
+
+	public constructor(
+		settings: Settings,
+		private readonly logger: Logger
+	) {
+		[this.until, this.resolveUntil, this.rejectUntil] =
+			createPromise<Symbol>();
+
+		settings.addOnSettingsChangeHandlers((newSettings, oldSettings) => {
+			if (oldSettings.isSyncEnabled != newSettings.isSyncEnabled) {
+				this.canFetch = newSettings.isSyncEnabled;
+				this.resolveUntil(ConnectionStatus.UNTIL_RESOLUTION);
+				[this.until, this.resolveUntil, this.rejectUntil] =
+					createPromise<Symbol>();
+			}
+		});
+	}
+
+	public getFetchImplementation(
+		fetch: typeof globalThis.fetch,
+		{ doRetries = true }: { doRetries: boolean } = { doRetries: true }
+	): typeof globalThis.fetch {
+		return doRetries ? this.retriedFetchFactory(this.logger, fetch) : fetch;
+	}
+
+	public reset() {
+		this.rejectUntil(new Error("Sync was reset"));
+		[this.until, this.resolveUntil, this.rejectUntil] = createPromise();
+	}
+
+	private retriedFetchFactory(
+		logger: Logger,
+		fetch: typeof globalThis.fetch = globalThis.fetch
+	) {
+		return async (input: RequestInfo | URL): Promise<Response> => {
+			while (true) {
+				while (this.canFetch === false) {
+					await this.until;
+				}
+
+				try {
+					// https://github.com/jonbern/fetch-retry/blob/8684ef4e688375f623bd76f13add76dbc1d67cfb/index.js#L67C1-L70C21
+					let _input =
+						typeof Request !== "undefined" &&
+						input instanceof Request
+							? input.clone()
+							: input;
+
+					const fetchPromise = fetch(_input);
+
+					// We only want to catch rejections from `this.until`
+					let result;
+					do {
+						result = await Promise.race([this.until, fetchPromise]);
+					} while (result === ConnectionStatus.UNTIL_RESOLUTION);
+
+					let fetchResult: Response = result as Response;
+
+					if (!fetchResult.ok) {
+						this.logger.warn(
+							`Retrying fetch for ${ConnectionStatus.getUrlFromInput(
+								input
+							)}, got status ${fetchResult.status}`
+						);
+					}
+
+					return fetchResult;
+				} catch (error) {
+					logger.warn(
+						`Retrying fetch for ${ConnectionStatus.getUrlFromInput(
+							input
+						)}, got error: ${error}`
+					);
+				}
+
+				await Promise.race([this.until, sleep(1000)]);
+			}
+		};
+	}
+
+	private static getUrlFromInput(input: RequestInfo | URL): string {
+		if (input instanceof URL) {
+			return input.href;
+		}
+		if (typeof input === "string") {
+			return input;
+		}
+		return input.url;
+	}
+}
diff --git a/frontend/sync-client/src/services/sync-service.ts b/frontend/sync-client/src/services/sync-service.ts
index 74954cf3..1b52751f 100644
--- a/frontend/sync-client/src/services/sync-service.ts
+++ b/frontend/sync-client/src/services/sync-service.ts
@@ -8,7 +8,7 @@ import type {
 } from "../persistence/database";
 import type { Logger } from "../tracing/logger";
 import type { Settings } from "../persistence/settings";
-import type { ConnectedState } from "./connected-state";
+import type { ConnectionStatus } from "./connection-status";
 
 export interface CheckConnectionResult {
 	isSuccessful: boolean;
@@ -21,7 +21,7 @@ export class SyncService {
 	private _fetchImplementation: typeof globalThis.fetch = globalThis.fetch;
 
 	public constructor(
-		private readonly connectedState: ConnectedState,
+		private readonly connectionStatus: ConnectionStatus,
 		private readonly settings: Settings,
 		private readonly logger: Logger
 	) {
@@ -296,14 +296,14 @@ export class SyncService {
 	private createClient(remoteUri: string): void {
 		this.client = createClient<paths>({
 			baseUrl: remoteUri,
-			fetch: this.connectedState.getFetchImplementation(
+			fetch: this.connectionStatus.getFetchImplementation(
 				this._fetchImplementation
 			)
 		});
 
 		this.clientWithoutRetries = createClient<paths>({
 			baseUrl: remoteUri,
-			fetch: this.connectedState.getFetchImplementation(
+			fetch: this.connectionStatus.getFetchImplementation(
 				this._fetchImplementation,
 				{ doRetries: false }
 			)
diff --git a/frontend/sync-client/src/utils/retried-fetch.ts b/frontend/sync-client/src/utils/retried-fetch.ts
deleted file mode 100644
index a3856f8d..00000000
--- a/frontend/sync-client/src/utils/retried-fetch.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import * as fetchRetryFactory from "fetch-retry";
-import type { RequestInitRetryParams } from "fetch-retry";
-import type { Logger } from "../tracing/logger";
-
-function getUrlFromInput(input: RequestInfo | URL): string {
-	if (input instanceof URL) {
-		return input.href;
-	}
-	if (typeof input === "string") {
-		return input;
-	}
-	return input.url;
-}
-
-export function retriedFetchFactory(
-	logger: Logger,
-	fetch: typeof globalThis.fetch = globalThis.fetch
-) {
-	return async (
-		input: RequestInfo | URL,
-		init: RequestInitRetryParams<typeof fetch> = {}
-	): Promise<Response> => {
-		return fetchRetryFactory.default(fetch)(input, {
-			retryOn: function (attempt, error, response) {
-				if (error !== null || !response || response.status >= 500) {
-					logger.warn(
-						`Retrying fetch for ${getUrlFromInput(input)}, attempt ${attempt}`
-					);
-
-					return true;
-				}
-				return false;
-			},
-			retryDelay: (attempt) => Math.pow(1.5, attempt) * 500,
-			...init
-		});
-	};
-}
diff --git a/frontend/sync-client/src/utils/sleep.ts b/frontend/sync-client/src/utils/sleep.ts
new file mode 100644
index 00000000..638fc019
--- /dev/null
+++ b/frontend/sync-client/src/utils/sleep.ts
@@ -0,0 +1,3 @@
+export async function sleep(ms: number): Promise<void> {
+	return new Promise((resolve) => setTimeout(resolve, ms));
+}

From 7e1aeb5a9f100cb75620576fa51cd6d3b64b2f99 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 20 Mar 2025 20:49:07 +0000
Subject: [PATCH 306/761] Update token

---
 backend/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/config.yml b/backend/config.yml
index b05f94c2..d8ccf20d 100644
--- a/backend/config.yml
+++ b/backend/config.yml
@@ -10,4 +10,4 @@ users:
   - name: admin
     token: test-token-change-me
   - name: test
-    token: token
+    token: other-test-token

From b00b9521c642f6dcee42c95466a2655d1e94143c Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 20 Mar 2025 20:49:23 +0000
Subject: [PATCH 307/761] Sync all file types

---
 .../sync-client/src/file-operations/file-operations.ts |  4 ----
 .../src/sync-operations/unrestricted-syncer.ts         | 10 ----------
 2 files changed, 14 deletions(-)

diff --git a/frontend/sync-client/src/file-operations/file-operations.ts b/frontend/sync-client/src/file-operations/file-operations.ts
index b198caa4..6adada5c 100644
--- a/frontend/sync-client/src/file-operations/file-operations.ts
+++ b/frontend/sync-client/src/file-operations/file-operations.ts
@@ -145,10 +145,6 @@ export class FileOperations {
 		await this.fs.rename(oldPath, newPath);
 	}
 
-	public isFileEligibleForSync(path: RelativePath): boolean {
-		return isFileTypeMergable(path);
-	}
-
 	private async createParentDirectories(path: string): Promise<void> {
 		const components = path.split("/");
 		if (components.length === 1) {
diff --git a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
index fe268f4d..4eef87a2 100644
--- a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
+++ b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
@@ -356,16 +356,6 @@ export class UnrestrictedSyncer {
 		syncSource: SyncSource,
 		fn: () => Promise<T>
 	): Promise<T | undefined> {
-		if (!this.operations.isFileEligibleForSync(relativePath)) {
-			this.history.addHistoryEntry({
-				status: SyncStatus.ERROR,
-				relativePath,
-				message: `File ${relativePath} is not eligible for syncing`,
-				type: syncType
-			});
-			return;
-		}
-
 		this.logger.debug(
 			`Syncing ${relativePath} (${syncSource} - ${syncType})`
 		);

From e6563c99b0f1ab5c665d0458b8fe0ed9dc4d5f07 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 20 Mar 2025 20:59:49 +0000
Subject: [PATCH 308/761] Remove minimum log level

---
 .../obsidian-plugin/src/views/logs-view.ts    | 12 ++------
 .../obsidian-plugin/src/views/settings-tab.ts | 28 -------------------
 .../sync-client/src/persistence/settings.ts   |  2 --
 3 files changed, 2 insertions(+), 40 deletions(-)

diff --git a/frontend/obsidian-plugin/src/views/logs-view.ts b/frontend/obsidian-plugin/src/views/logs-view.ts
index eaa1a780..9c852998 100644
--- a/frontend/obsidian-plugin/src/views/logs-view.ts
+++ b/frontend/obsidian-plugin/src/views/logs-view.ts
@@ -1,7 +1,7 @@
 import type { WorkspaceLeaf } from "obsidian";
 import { ItemView } from "obsidian";
 import type VaultLinkPlugin from "../vault-link-plugin";
-import type { SyncClient } from "sync-client";
+import { LogLevel, type SyncClient } from "sync-client";
 
 export class LogsView extends ItemView {
 	public static readonly TYPE = "logs-view";
@@ -17,12 +17,6 @@ export class LogsView extends ItemView {
 		this.client.logger.addOnMessageListener(() => {
 			this.updateView();
 		});
-
-		this.client.addOnSettingsChangeHandlers((newSettings, oldSettings) => {
-			if (newSettings.minimumLogLevel !== oldSettings.minimumLogLevel) {
-				this.updateView();
-			}
-		});
 	}
 
 	private static formatTimestamp(timestamp: Date): string {
@@ -77,9 +71,7 @@ export class LogsView extends ItemView {
 			}
 		);
 
-		const logs = this.client.logger.getMessages(
-			this.client.getSettings().minimumLogLevel
-		);
+		const logs = this.client.logger.getMessages(LogLevel.DEBUG);
 
 		if (logs.length === 0) {
 			container.createEl("p", { text: "No logs available yet." });
diff --git a/frontend/obsidian-plugin/src/views/settings-tab.ts b/frontend/obsidian-plugin/src/views/settings-tab.ts
index d4d80061..79f3baf9 100644
--- a/frontend/obsidian-plugin/src/views/settings-tab.ts
+++ b/frontend/obsidian-plugin/src/views/settings-tab.ts
@@ -51,7 +51,6 @@ export class SyncSettingsTab extends PluginSettingTab {
 		this.renderSettingsHeader(containerEl);
 		this.renderConnectionSettings(containerEl);
 		this.renderSyncSettings(containerEl);
-		this.renderViewSettings(containerEl);
 	}
 
 	public hide(): void {
@@ -272,33 +271,6 @@ export class SyncSettingsTab extends PluginSettingTab {
 			);
 	}
 
-	private renderViewSettings(containerEl: HTMLElement): void {
-		containerEl.createEl("h3", { text: "View" });
-
-		new Setting(containerEl)
-			.setName("Minimum log level")
-			.setDesc(
-				"Set the log level for the plugin. Lower levels will show more logs."
-			)
-			.addDropdown((dropdown) =>
-				dropdown
-					.addOptions({
-						[LogLevel.DEBUG]: LogLevel.DEBUG,
-						[LogLevel.INFO]: LogLevel.INFO,
-						[LogLevel.WARNING]: LogLevel.WARNING,
-						[LogLevel.ERROR]: LogLevel.ERROR
-					})
-					.setValue(this.syncClient.getSettings().minimumLogLevel)
-					.onChange(async (value) =>
-						this.syncClient.setSetting(
-							"minimumLogLevel",
-							// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-							value as LogLevel
-						)
-					)
-			);
-	}
-
 	private setStatusDescriptionSubscription(
 		newSubscription?: () => void
 	): void {
diff --git a/frontend/sync-client/src/persistence/settings.ts b/frontend/sync-client/src/persistence/settings.ts
index 457636e2..1848cb6b 100644
--- a/frontend/sync-client/src/persistence/settings.ts
+++ b/frontend/sync-client/src/persistence/settings.ts
@@ -8,7 +8,6 @@ export interface SyncSettings {
 	fetchChangesUpdateIntervalMs: number;
 	syncConcurrency: number;
 	isSyncEnabled: boolean;
-	minimumLogLevel: LogLevel;
 	maxFileSizeMB: number;
 }
 
@@ -19,7 +18,6 @@ const DEFAULT_SETTINGS: SyncSettings = {
 	fetchChangesUpdateIntervalMs: 1000,
 	syncConcurrency: 1,
 	isSyncEnabled: false,
-	minimumLogLevel: LogLevel.INFO,
 	maxFileSizeMB: 10
 };
 

From 03d0b7e0259a313e14ad2ba9eceb86aa6a6d80f7 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 20 Mar 2025 21:00:54 +0000
Subject: [PATCH 309/761] Use inlined sync history

---
 frontend/obsidian-plugin/src/views/history-view.ts       | 4 ++--
 frontend/obsidian-plugin/src/views/status-bar.ts         | 2 +-
 frontend/obsidian-plugin/src/views/status-description.ts | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/obsidian-plugin/src/views/history-view.ts b/frontend/obsidian-plugin/src/views/history-view.ts
index d253b27f..a4c09b55 100644
--- a/frontend/obsidian-plugin/src/views/history-view.ts
+++ b/frontend/obsidian-plugin/src/views/history-view.ts
@@ -17,7 +17,7 @@ export class HistoryView extends ItemView {
 		super(leaf);
 		this.icon = HistoryView.ICON;
 
-		this.client.history.addSyncHistoryUpdateListener(() => {
+		this.client.addSyncHistoryUpdateListener(() => {
 			this.updateView().catch((_error: unknown) => {
 				this.client.logger.error("Failed to update history view");
 			});
@@ -93,7 +93,7 @@ export class HistoryView extends ItemView {
 		container.empty();
 		container.createEl("h4", { text: "VaultLink History" });
 
-		const entries = this.client.history.getEntries().reverse();
+		const entries = this.client.getHistoryEntries().reverse();
 		entries.forEach((entry) => {
 			container.createDiv(
 				{
diff --git a/frontend/obsidian-plugin/src/views/status-bar.ts b/frontend/obsidian-plugin/src/views/status-bar.ts
index 211cde96..6a55f3da 100644
--- a/frontend/obsidian-plugin/src/views/status-bar.ts
+++ b/frontend/obsidian-plugin/src/views/status-bar.ts
@@ -12,7 +12,7 @@ export class StatusBar {
 		private readonly syncClient: SyncClient
 	) {
 		this.statusBarItem = plugin.addStatusBarItem();
-		this.syncClient.history.addSyncHistoryUpdateListener((status) => {
+		this.syncClient.addSyncHistoryUpdateListener((status) => {
 			this.lastHistoryStats = status;
 			this.updateStatus();
 		});
diff --git a/frontend/obsidian-plugin/src/views/status-description.ts b/frontend/obsidian-plugin/src/views/status-description.ts
index b22c7a9c..e992326c 100644
--- a/frontend/obsidian-plugin/src/views/status-description.ts
+++ b/frontend/obsidian-plugin/src/views/status-description.ts
@@ -14,7 +14,7 @@ export class StatusDescription {
 	public constructor(private readonly syncClient: SyncClient) {
 		void this.updateConnectionState();
 
-		syncClient.history.addSyncHistoryUpdateListener((status) => {
+		syncClient.addSyncHistoryUpdateListener((status) => {
 			this.lastHistoryStats = status;
 			this.updateDescription();
 		});

From 198ac93c8cb36adaf8e0b01bdaca5fb3b9a046b1 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 20 Mar 2025 21:18:22 +0000
Subject: [PATCH 310/761] Change fetch implementation passing

---
 frontend/test-client/src/agent/mock-agent.ts  | 23 ++++++++++---------
 frontend/test-client/src/agent/mock-client.ts | 16 +++++++++----
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/frontend/test-client/src/agent/mock-agent.ts b/frontend/test-client/src/agent/mock-agent.ts
index ff705204..23fcd092 100644
--- a/frontend/test-client/src/agent/mock-agent.ts
+++ b/frontend/test-client/src/agent/mock-agent.ts
@@ -25,23 +25,24 @@ export class MockAgent extends MockClient {
 	}
 
 	public async init(): Promise<void> {
-		await super.init();
+		await super.init(
+			// flaky fetch implementation to use during testing
+			async (
+				input: string | URL | globalThis.Request,
+				init?: RequestInit
+			): Promise<Response> => {
+				await sleep(Math.random() * this.jitterScaleInSeconds * 1000);
+				const response = await fetch(input, init);
+				await sleep(Math.random() * this.jitterScaleInSeconds * 1000);
+				return response;
+			}
+		);
 
 		assert(
 			(await this.client.checkConnection()).isSuccessful,
 			"Connection check failed"
 		);
 
-		this.client.fetchImplementation = async (
-			input: string | URL | globalThis.Request,
-			init?: RequestInit
-		): Promise<Response> => {
-			await sleep(Math.random() * this.jitterScaleInSeconds * 1000);
-			const response = await fetch(input, init);
-			await sleep(Math.random() * this.jitterScaleInSeconds * 1000);
-			return response;
-		};
-
 		this.client.logger.addOnMessageListener((logLine: LogLine) => {
 			const state = this.client.getSettings().isSyncEnabled
 				? "(online) "
diff --git a/frontend/test-client/src/agent/mock-client.ts b/frontend/test-client/src/agent/mock-client.ts
index 1adae4bd..9d4d457e 100644
--- a/frontend/test-client/src/agent/mock-client.ts
+++ b/frontend/test-client/src/agent/mock-client.ts
@@ -16,11 +16,17 @@ export class MockClient implements FileSystemOperations {
 		protected readonly useSlowFileEvents: boolean
 	) {}
 
-	public async init(): Promise<void> {
-		this.client = await SyncClient.create(this, {
-			load: async () => this.data,
-			save: async (data) => void (this.data = data)
-		});
+	public async init(
+		fetchImplementation: typeof globalThis.fetch
+	): Promise<void> {
+		this.client = await SyncClient.create(
+			this,
+			{
+				load: async () => this.data,
+				save: async (data) => void (this.data = data)
+			},
+			fetchImplementation
+		);
 
 		await Promise.all(
 			Object.keys(this.initialSettings).map(async (key) => {

From 9e05734c5fd65b7815e775aa8976247eb65bb95a Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 20 Mar 2025 21:18:42 +0000
Subject: [PATCH 311/761] Add todos

---
 README.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/README.md b/README.md
index 9aa988bb..7da19aeb 100644
--- a/README.md
+++ b/README.md
@@ -53,3 +53,11 @@ scripts/e2e.sh
 ```
 
 And to clean up the logs & database files, run `scripts/clean-up.sh`
+
+## Todos
+
+- Don't show server traces on auth failure
+- Better server logs
+- Allow setting config.yml path for server
+- Single apply button in settings
+- vritual list for logs view

From 136514d33a7b2aa891af76983ad070a6dbd9276c Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 20 Mar 2025 21:19:41 +0000
Subject: [PATCH 312/761] Rename & make idempotent

---
 frontend/sync-client/src/persistence/database.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/frontend/sync-client/src/persistence/database.ts b/frontend/sync-client/src/persistence/database.ts
index 9f003d4c..c2f12234 100644
--- a/frontend/sync-client/src/persistence/database.ts
+++ b/frontend/sync-client/src/persistence/database.ts
@@ -114,7 +114,7 @@ export class Database {
 		this.save();
 	}
 
-	public resetSyncState(): void {
+	public reset(): void {
 		this.documents = [];
 		this.lastSeenUpdateId = 0;
 		this.save();
@@ -142,7 +142,9 @@ export class Database {
 		);
 
 		if (entry === undefined) {
-			throw new Error("Document not found by update promise");
+			// This method should be idempotent and tolerant of
+			// stragglers calling it after the databse has been reset.
+			return;
 		}
 
 		entry.updates = entry.updates.filter((update) => update !== promise);

From 1b7ab8b0384eeb595412b9e8c810e0942c56231e Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 20 Mar 2025 21:19:59 +0000
Subject: [PATCH 313/761] Fix reset logic

---
 frontend/sync-client/src/sync-operations/syncer.ts | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/frontend/sync-client/src/sync-operations/syncer.ts b/frontend/sync-client/src/sync-operations/syncer.ts
index 70ba88d5..7ea50e93 100644
--- a/frontend/sync-client/src/sync-operations/syncer.ts
+++ b/frontend/sync-client/src/sync-operations/syncer.ts
@@ -10,7 +10,6 @@ import type { Settings } from "../persistence/settings";
 import type { FileOperations } from "../file-operations/file-operations";
 import { findMatchingFile } from "../utils/find-matching-file";
 import { UnrestrictedSyncer } from "./unrestricted-syncer";
-import { FileNotFoundError } from "../file-operations/safe-filesystem-operations";
 import { createPromise } from "../utils/create-promise";
 
 export class Syncer {
@@ -212,7 +211,7 @@ export class Syncer {
 	}
 
 	public async applyRemoteChangesLocally(): Promise<void> {
-		if (this.runningApplyRemoteChangesLocally != null) {
+		if (this.runningApplyRemoteChangesLocally !== undefined) {
 			this.logger.debug(
 				"Applying remote changes locally is already in progress"
 			);
@@ -237,11 +236,7 @@ export class Syncer {
 	}
 
 	public async reset(): Promise<void> {
-		this.syncQueue.clear();
 		await this.syncQueue.onEmpty();
-		this.remainingOperationsListeners.forEach((listener) => {
-			listener(0);
-		});
 		this.internalSyncer.reset();
 	}
 

From e7ec41eafeff9e281209efe9f941b043bc6b77f9 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 20 Mar 2025 22:26:19 +0000
Subject: [PATCH 314/761] Remove deleted files from DB

---
 frontend/sync-client/src/persistence/database.ts   | 5 +++++
 frontend/sync-client/src/sync-operations/syncer.ts | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/frontend/sync-client/src/persistence/database.ts b/frontend/sync-client/src/persistence/database.ts
index c2f12234..617cfbf1 100644
--- a/frontend/sync-client/src/persistence/database.ts
+++ b/frontend/sync-client/src/persistence/database.ts
@@ -151,6 +151,11 @@ export class Database {
 		// No need to save as Promises don't get serialized
 	}
 
+	public removeDocument(find: DocumentRecord): void {
+		this.documents = this.documents.filter((document) => document !== find);
+		this.save();
+	}
+
 	public getLatestDocumentByRelativePath(
 		find: RelativePath
 	): DocumentRecord | undefined {
diff --git a/frontend/sync-client/src/sync-operations/syncer.ts b/frontend/sync-client/src/sync-operations/syncer.ts
index 7ea50e93..7a7ba286 100644
--- a/frontend/sync-client/src/sync-operations/syncer.ts
+++ b/frontend/sync-client/src/sync-operations/syncer.ts
@@ -119,6 +119,8 @@ export class Syncer {
 			);
 
 			resolve();
+
+			this.database.removeDocument(document);
 		} catch (e) {
 			reject(e);
 		} finally {
@@ -263,7 +265,7 @@ export class Syncer {
 		const lastSeenUpdateId = this.database.getLastSeenUpdateId();
 		if (
 			lastSeenUpdateId === undefined ||
-			remote.lastUpdateId > lastSeenUpdateId
+			lastSeenUpdateId < remote.lastUpdateId
 		) {
 			this.database.setLastSeenUpdateId(remote.lastUpdateId);
 		}

From 8a9f87cc0553e1864db604af40330fdac61f854f Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 20 Mar 2025 22:27:07 +0000
Subject: [PATCH 315/761] Clean up API

---
 .../obsidian-plugin/src/vault-link-plugin.ts  |   5 +-
 frontend/sync-client/src/sync-client.ts       | 118 ++++++++++++------
 2 files changed, 81 insertions(+), 42 deletions(-)

diff --git a/frontend/obsidian-plugin/src/vault-link-plugin.ts b/frontend/obsidian-plugin/src/vault-link-plugin.ts
index ae290b53..ebfa2d26 100644
--- a/frontend/obsidian-plugin/src/vault-link-plugin.ts
+++ b/frontend/obsidian-plugin/src/vault-link-plugin.ts
@@ -62,6 +62,7 @@ export default class VaultLinkPlugin extends Plugin {
 
 		this.app.workspace.onLayoutReady(async () => {
 			this.client.logger.info("Initialising sync handlers");
+
 			[
 				this.app.vault.on(
 					"create",
@@ -83,9 +84,9 @@ export default class VaultLinkPlugin extends Plugin {
 				this.registerEvent(event);
 			});
 
-			this.client.logger.info("Sync handlers initialised");
+			void this.client.start();
 
-			void this.client.syncer.scheduleSyncForOfflineChanges();
+			this.client.logger.info("Sync handlers initialised");
 		});
 	}
 
diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts
index dfd366ca..817e134b 100644
--- a/frontend/sync-client/src/sync-client.ts
+++ b/frontend/sync-client/src/sync-client.ts
@@ -1,7 +1,11 @@
-import init from "sync_lib";
+import initWasm from "sync_lib";
 import wasmBin from "../../../backend/sync_lib/pkg/sync_lib_bg.wasm";
 import type { PersistenceProvider } from "./persistence/persistence";
-import { SyncHistory } from "./tracing/sync-history";
+import {
+	HistoryEntry,
+	HistoryStats,
+	SyncHistory
+} from "./tracing/sync-history";
 import { Logger } from "./tracing/logger";
 import type { StoredDatabase } from "./persistence/database";
 import { Database } from "./persistence/database";
@@ -12,7 +16,7 @@ import { SyncService } from "./services/sync-service";
 import { Syncer } from "./sync-operations/syncer";
 import type { FileSystemOperations } from "./file-operations/filesystem-operations";
 import { FileOperations } from "./file-operations/file-operations";
-import { ConnectedState } from "./services/connected-state";
+import { ConnectionStatus } from "./services/connection-status";
 
 export class SyncClient {
 	private remoteListenerIntervalId: NodeJS.Timeout | null = null;
@@ -23,17 +27,10 @@ export class SyncClient {
 		private readonly _database: Database,
 		private readonly _syncer: Syncer,
 		private readonly _syncService: SyncService,
-		private readonly _logger: Logger
+		private readonly _logger: Logger,
+		private readonly _connectionStatus: ConnectionStatus
 	) {}
 
-	public get history(): SyncHistory {
-		return this._history;
-	}
-
-	public get settings(): Settings {
-		return this._settings;
-	}
-
 	public get syncer(): Syncer {
 		return this._syncer;
 	}
@@ -46,10 +43,6 @@ export class SyncClient {
 		return this._database.length;
 	}
 
-	public set fetchImplementation(fetch: typeof globalThis.fetch) {
-		this._syncService.fetchImplementation = fetch;
-	}
-
 	public static async create(
 		fs: FileSystemOperations,
 		persistence: PersistenceProvider<
@@ -57,13 +50,15 @@ export class SyncClient {
 				settings: Partial<SyncSettings>;
 				database: Partial<StoredDatabase>;
 			}>
-		>
+		>,
+		fetch: typeof globalThis.fetch = globalThis.fetch
 	): Promise<SyncClient> {
 		const logger = new Logger();
-		const history = new SyncHistory(logger);
 		logger.info("Starting SyncClient");
 
-		await init(
+		const history = new SyncHistory(logger);
+
+		await initWasm(
 			// eslint-disable-next-line
 			(wasmBin as any).default // it is loaded as a base64 string by webpack
 		);
@@ -91,10 +86,9 @@ export class SyncClient {
 			}
 		);
 
-		const connectedState = new ConnectedState(settings, logger);
-
-		const syncService = new SyncService(connectedState, settings, logger);
-
+		const connectionStatus = new ConnectionStatus(settings, logger);
+		const syncService = new SyncService(connectionStatus, settings, logger);
+		syncService.fetchImplementation = fetch;
 		const syncer = new Syncer(
 			logger,
 			database,
@@ -110,13 +104,8 @@ export class SyncClient {
 			database,
 			syncer,
 			syncService,
-			logger
-		);
-
-		void syncer.scheduleSyncForOfflineChanges();
-
-		client.registerRemoteEventListener(
-			settings.getSettings().fetchChangesUpdateIntervalMs
+			logger,
+			connectionStatus
 		);
 
 		settings.addOnSettingsChangeHandlers((newSettings, oldSettings) => {
@@ -124,13 +113,21 @@ export class SyncClient {
 				newSettings.fetchChangesUpdateIntervalMs !==
 				oldSettings.fetchChangesUpdateIntervalMs
 			) {
-				client.registerRemoteEventListener(
+				client.setRemoteEventListener(
 					newSettings.fetchChangesUpdateIntervalMs
 				);
 			}
+
+			if (
+				newSettings.vaultName !== oldSettings.vaultName ||
+				newSettings.token !== oldSettings.token ||
+				newSettings.remoteUri !== oldSettings.remoteUri
+			) {
+				client.reset();
+			}
 		});
 
-		logger.info("SyncClient loaded");
+		logger.info("SyncClient initialised");
 
 		return client;
 	}
@@ -139,25 +136,60 @@ export class SyncClient {
 		return this._syncService.checkConnection();
 	}
 
+	public getHistoryEntries(): HistoryEntry[] {
+		return this._history.getEntries();
+	}
+
+	public addSyncHistoryUpdateListener(
+		listener: (stats: HistoryStats) => void
+	): void {
+		this._history.addSyncHistoryUpdateListener(listener);
+	}
+
+	public async start(): Promise<void> {
+		await this._syncer.scheduleSyncForOfflineChanges();
+
+		this.setRemoteEventListener(
+			this._settings.getSettings().fetchChangesUpdateIntervalMs
+		);
+	}
+
+	/// Clear all global state that has been touched by SyncClient.
+	public stop(): void {
+		this.unsetRemoteEventListener();
+	}
+
 	/// Wait for the in-flight operations to finish, reset all tracking,
 	/// and the local database but retain the settings.
 	/// The SyncClient can be used again after calling this method.
 	public async reset(): Promise<void> {
 		this.stop();
+		this._connectionStatus.reset();
 		await this._syncer.reset();
 		this._history.reset();
-		this._database.resetSyncState();
-		this.logger.reset();
+		this._database.reset();
+		this._logger.reset();
+		void this.start();
 	}
 
-	/// Clear all global state that has been touched by SyncClient.
-	public stop(): void {
-		if (this.remoteListenerIntervalId !== null) {
-			clearInterval(this.remoteListenerIntervalId);
-		}
+	public getSettings(): SyncSettings {
+		return this._settings.getSettings();
 	}
 
-	private registerRemoteEventListener(intervalMs: number): void {
+	public async setSetting<T extends keyof SyncSettings>(
+		key: T,
+		value: SyncSettings[T]
+	): Promise<void> {
+		await this._settings.setSetting(key, value);
+	}
+
+	public addOnSettingsChangeHandlers(
+		handler: (settings: SyncSettings, oldSettings: SyncSettings) => void
+	): void {
+		this._settings.addOnSettingsChangeHandlers(handler);
+	}
+
+	private setRemoteEventListener(intervalMs: number): void {
 		if (this.remoteListenerIntervalId !== null) {
 			clearInterval(this.remoteListenerIntervalId);
 		}
@@ -167,4 +199,10 @@ export class SyncClient {
 			intervalMs
 		);
 	}
+
+	private unsetRemoteEventListener(): void {
+		if (this.remoteListenerIntervalId !== null) {
+			clearInterval(this.remoteListenerIntervalId);
+		}
+	}
 }

From b6d04168073c82e5d3b7d78ab8469f34b5b35124 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 20 Mar 2025 22:28:59 +0000
Subject: [PATCH 316/761] Lint

---
 .../obsidian-plugin/src/vault-link-plugin.ts  | 46 +++++++++----------
 frontend/sync-client/src/sync-client.ts       |  9 ++--
 2 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/frontend/obsidian-plugin/src/vault-link-plugin.ts b/frontend/obsidian-plugin/src/vault-link-plugin.ts
index ebfa2d26..bf19d37c 100644
--- a/frontend/obsidian-plugin/src/vault-link-plugin.ts
+++ b/frontend/obsidian-plugin/src/vault-link-plugin.ts
@@ -8,12 +8,33 @@ import { ObsidianFileEventHandler } from "./obisidan-event-handler";
 import { StatusBar } from "./views/status-bar";
 import { LogsView } from "./views/logs-view";
 import { StatusDescription } from "./views/status-description";
-import { SyncClient, LogLevel, LogLine } from "sync-client";
+import type { LogLine } from "sync-client";
+import { SyncClient, LogLevel } from "sync-client";
 import { ObsidianFileSystemOperations } from "./obsidian-file-system";
 
 export default class VaultLinkPlugin extends Plugin {
 	private settingsTab: SyncSettingsTab | undefined;
 	private client!: SyncClient;
+	private static registerConsoleForLogging(client: SyncClient): void {
+		client.logger.addOnMessageListener((logLine: LogLine) => {
+			const formatted = `${logLine.timestamp.toISOString()} ${logLine.level} ${logLine.message}`;
+
+			switch (logLine.level) {
+				case LogLevel.ERROR:
+					console.error(formatted);
+					break;
+				case LogLevel.WARNING:
+					console.warn(formatted);
+					break;
+				case LogLevel.INFO:
+					console.info(formatted);
+					break;
+				case LogLevel.DEBUG:
+					console.debug(formatted);
+					break;
+			}
+		});
+	}
 
 	public async onload(): Promise<void> {
 		this.client = await SyncClient.create(
@@ -24,7 +45,7 @@ export default class VaultLinkPlugin extends Plugin {
 			}
 		);
 
-		registerConsoleForLogging(this.client);
+		VaultLinkPlugin.registerConsoleForLogging(this.client);
 
 		const statusDescription = new StatusDescription(this.client);
 
@@ -124,24 +145,3 @@ export default class VaultLinkPlugin extends Plugin {
 		}
 	}
 }
-
-function registerConsoleForLogging(client: SyncClient) {
-	client.logger.addOnMessageListener((logLine: LogLine) => {
-		const formatted = `${logLine.timestamp.toISOString()} ${logLine.level} ${logLine.message}`;
-
-		switch (logLine.level) {
-			case LogLevel.ERROR:
-				console.error(formatted);
-				break;
-			case LogLevel.WARNING:
-				console.warn(formatted);
-				break;
-			case LogLevel.INFO:
-				console.info(formatted);
-				break;
-			case LogLevel.DEBUG:
-				console.debug(formatted);
-				break;
-		}
-	});
-}
diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts
index 817e134b..3def68f9 100644
--- a/frontend/sync-client/src/sync-client.ts
+++ b/frontend/sync-client/src/sync-client.ts
@@ -1,11 +1,8 @@
 import initWasm from "sync_lib";
 import wasmBin from "../../../backend/sync_lib/pkg/sync_lib_bg.wasm";
 import type { PersistenceProvider } from "./persistence/persistence";
-import {
-	HistoryEntry,
-	HistoryStats,
-	SyncHistory
-} from "./tracing/sync-history";
+import type { HistoryEntry, HistoryStats } from "./tracing/sync-history";
+import { SyncHistory } from "./tracing/sync-history";
 import { Logger } from "./tracing/logger";
 import type { StoredDatabase } from "./persistence/database";
 import { Database } from "./persistence/database";
@@ -123,7 +120,7 @@ export class SyncClient {
 				newSettings.token !== oldSettings.token ||
 				newSettings.remoteUri !== oldSettings.remoteUri
 			) {
-				client.reset();
+				void client.reset();
 			}
 		});
 

From 149b8a1de5689a299c8182169470ee6314561b7d Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Mar 2025 11:12:53 +0000
Subject: [PATCH 317/761] Lint connection status

---
 .../sync-client/src/services/connection-status.ts  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/frontend/sync-client/src/services/connection-status.ts b/frontend/sync-client/src/services/connection-status.ts
index ebf9361b..b31d6b95 100644
--- a/frontend/sync-client/src/services/connection-status.ts
+++ b/frontend/sync-client/src/services/connection-status.ts
@@ -6,8 +6,8 @@ import { sleep } from "../utils/sleep";
 export class ConnectionStatus {
 	private static readonly UNTIL_RESOLUTION = Symbol();
 	private canFetch = true;
-	private until: Promise<Symbol>;
-	private resolveUntil: (result: Symbol) => void;
+	private until: Promise<symbol>;
+	private resolveUntil: (result: symbol) => void;
 	private rejectUntil: (reason: any) => void;
 
 	public constructor(
@@ -15,14 +15,14 @@ export class ConnectionStatus {
 		private readonly logger: Logger
 	) {
 		[this.until, this.resolveUntil, this.rejectUntil] =
-			createPromise<Symbol>();
+			createPromise<symbol>();
 
 		settings.addOnSettingsChangeHandlers((newSettings, oldSettings) => {
 			if (oldSettings.isSyncEnabled != newSettings.isSyncEnabled) {
 				this.canFetch = newSettings.isSyncEnabled;
 				this.resolveUntil(ConnectionStatus.UNTIL_RESOLUTION);
 				[this.until, this.resolveUntil, this.rejectUntil] =
-					createPromise<Symbol>();
+					createPromise<symbol>();
 			}
 		});
 	}
@@ -45,13 +45,13 @@ export class ConnectionStatus {
 	) {
 		return async (input: RequestInfo | URL): Promise<Response> => {
 			while (true) {
-				while (this.canFetch === false) {
+				while (!this.canFetch) {
 					await this.until;
 				}
 
 				try {
 					// https://github.com/jonbern/fetch-retry/blob/8684ef4e688375f623bd76f13add76dbc1d67cfb/index.js#L67C1-L70C21
-					let _input =
+					const _input =
 						typeof Request !== "undefined" &&
 						input instanceof Request
 							? input.clone()
@@ -65,7 +65,7 @@ export class ConnectionStatus {
 						result = await Promise.race([this.until, fetchPromise]);
 					} while (result === ConnectionStatus.UNTIL_RESOLUTION);
 
-					let fetchResult: Response = result as Response;
+					const fetchResult: Response = result as Response;
 
 					if (!fetchResult.ok) {
 						this.logger.warn(

From 60f859b984edf99380b03a6444e0676795f924da Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Mar 2025 11:44:37 +0000
Subject: [PATCH 318/761] Improve docs

---
 .../safe-filesystem-operations.ts             | 61 +++++++++++--------
 1 file changed, 36 insertions(+), 25 deletions(-)

diff --git a/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts b/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
index c13611ef..5f578dc3 100644
--- a/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
+++ b/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
@@ -2,18 +2,13 @@ import type { RelativePath } from "../persistence/database";
 import type { FileSystemOperations } from "./filesystem-operations";
 import type { Logger } from "../tracing/logger";
 import { DocumentLocks } from "./document-locks";
+import { FileNotFoundError } from "./file-not-found-error";
 
-export class FileNotFoundError extends Error {
-	public constructor(message: string) {
-		super(message);
-		this.name = "FileNotFoundError";
-	}
-}
-
-// Decorate FileSystemOperations replacing errors with FileNotFoundError
-// if the accessed file doesn't exist. It also ensures that there's only
-// ever a single request in-flight for any one file through the use of
-// DocumentLocks.
+/**
+ * Decorates `FileSystemOperations` to replace errors with `FileNotFoundError`
+ * if the accessed file doesn't exist. It also ensures that there's at most a
+ * single request in-flight for any one file through the use of locks.
+ */
 export class SafeFileSystemOperations implements FileSystemOperations {
 	private readonly locks: DocumentLocks;
 
@@ -25,11 +20,14 @@ export class SafeFileSystemOperations implements FileSystemOperations {
 	}
 
 	public async listAllFiles(): Promise<RelativePath[]> {
-		return this.fs.listAllFiles();
+		this.logger.debug("Listing all files");
+		const result = await this.fs.listAllFiles();
+		this.logger.debug(`Listed ${result.length} files`);
+		return result;
 	}
 
 	public async read(path: RelativePath): Promise<Uint8Array> {
-		this.logger.debug(`Reading file: ${path}`);
+		this.logger.debug(`Reading file '${path}'`);
 		return this.safeOperation(
 			path,
 			this.decorateToHoldLock(path, async () => this.fs.read(path)),
@@ -38,7 +36,7 @@ export class SafeFileSystemOperations implements FileSystemOperations {
 	}
 
 	public async write(path: RelativePath, content: Uint8Array): Promise<void> {
-		this.logger.debug(`Writing file: ${path}`);
+		this.logger.debug(`Writing to file '${path}'`);
 		return this.decorateToHoldLock(path, async () =>
 			this.fs.write(path, content)
 		)();
@@ -48,7 +46,7 @@ export class SafeFileSystemOperations implements FileSystemOperations {
 		path: RelativePath,
 		updater: (currentContent: string) => string
 	): Promise<string> {
-		this.logger.debug(`Atomic update of file: ${path}`);
+		this.logger.debug(`Atomically updating file '${path}'`);
 		return this.safeOperation(
 			path,
 			this.decorateToHoldLock(path, async () =>
@@ -59,7 +57,7 @@ export class SafeFileSystemOperations implements FileSystemOperations {
 	}
 
 	public async getFileSize(path: RelativePath): Promise<number> {
-		this.logger.debug(`Getting file size: ${path}`);
+		this.logger.debug(`Getting size of file '${path}'`);
 		return this.safeOperation(
 			path,
 			this.decorateToHoldLock(path, async () =>
@@ -70,21 +68,21 @@ export class SafeFileSystemOperations implements FileSystemOperations {
 	}
 
 	public async exists(path: RelativePath): Promise<boolean> {
-		this.logger.debug(`Checking if file exists: ${path}`);
+		this.logger.debug(`Checking if file '${path}' exists`);
 		return this.decorateToHoldLock(path, async () =>
 			this.fs.exists(path)
 		)();
 	}
 
 	public async createDirectory(path: RelativePath): Promise<void> {
-		this.logger.debug(`Creating directory: ${path}`);
+		this.logger.debug(`Creating directory '${path}'`);
 		return this.decorateToHoldLock(path, async () =>
 			this.fs.createDirectory(path)
 		)();
 	}
 
 	public async delete(path: RelativePath): Promise<void> {
-		this.logger.debug(`Deleting file: ${path}`);
+		this.logger.debug(`Deleting file '${path}'`);
 		return this.decorateToHoldLock(path, async () =>
 			this.fs.delete(path)
 		)();
@@ -94,7 +92,7 @@ export class SafeFileSystemOperations implements FileSystemOperations {
 		oldPath: RelativePath,
 		newPath: RelativePath
 	): Promise<void> {
-		this.logger.debug(`Renaming file: ${oldPath} to ${newPath}`);
+		this.logger.debug(`Renaming file '${oldPath}' to '${newPath}'`);
 		return this.safeOperation(
 			oldPath,
 			this.decorateToHoldLock([oldPath, newPath], async () =>
@@ -104,6 +102,11 @@ export class SafeFileSystemOperations implements FileSystemOperations {
 		);
 	}
 
+	/**
+	 * Decorate an operation to ensure that the file is locked before running it
+	 * and that the lock is released afterwards. This results in at-most one
+	 * concurrent operation running per file.
+	 */
 	private decorateToHoldLock<T>(
 		pathOrPaths: RelativePath | RelativePath[],
 		operation: () => Promise<T>
@@ -112,9 +115,11 @@ export class SafeFileSystemOperations implements FileSystemOperations {
 			const paths = Array.isArray(pathOrPaths)
 				? pathOrPaths
 				: [pathOrPaths];
+
 			await Promise.all(
 				paths.map(async (path) => this.locks.waitForDocumentLock(path))
 			);
+
 			try {
 				return await operation();
 			} finally {
@@ -127,27 +132,33 @@ export class SafeFileSystemOperations implements FileSystemOperations {
 		};
 	}
 
+	/**
+	 * Decorate an operation to ensure that the file exists before running it.
+	 * If the operation fails, it will check if the file still exists and throw
+	 * a FileNotFoundError if it doesn't
+	 */
 	private async safeOperation<T>(
 		path: RelativePath,
 		operation: () => Promise<T>,
 		operationName: string
 	): Promise<T> {
-		// Without locking the file, this isn't atomic, however, it's good enough practicaly.
-		// This will only break if the file exists, gets deleted and then immediately
-		// recreated while `operation` is running.
 		if (!(await this.fs.exists(path))) {
 			throw new FileNotFoundError(
-				`File not found: ${path} before trying to ${operationName}`
+				`File '${path}' not found before trying to ${operationName}`
 			);
 		}
+
 		try {
 			return await operation();
 		} catch (error) {
+			// Without locking the file, this isn't atomic, however, it's good enough in practice.
+			// This will only break if the file exists, gets deleted and then immediately
+			// recreated while `operation` is running.
 			if (await this.fs.exists(path)) {
 				throw error;
 			} else {
 				throw new FileNotFoundError(
-					`File not found: ${path} when trying to ${operationName}`
+					`File '${path}' not found when trying to ${operationName}`
 				);
 			}
 		}

From 7dcdc98b60ee6ddac05c5e950e5a8e597f0c62a0 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Mar 2025 11:53:20 +0000
Subject: [PATCH 319/761] Fix testing setup

---
 .../file-operations/file-operations.test.ts   | 154 ++++++++++--------
 1 file changed, 84 insertions(+), 70 deletions(-)

diff --git a/frontend/sync-client/src/file-operations/file-operations.test.ts b/frontend/sync-client/src/file-operations/file-operations.test.ts
index 43308f8c..0d947e88 100644
--- a/frontend/sync-client/src/file-operations/file-operations.test.ts
+++ b/frontend/sync-client/src/file-operations/file-operations.test.ts
@@ -7,94 +7,108 @@ import { FileOperations } from "./file-operations";
 import { Logger } from "../tracing/logger";
 import { assertSetContainsExactly } from "../utils/assert-set-contains-exactly";
 import type { FileSystemOperations } from "./filesystem-operations";
+import init, { base64ToBytes } from "sync_lib";
+import fs from "fs";
+
+class MockDatabase implements Partial<Database> {
+	public getLatestDocumentByRelativePath(
+		_find: RelativePath
+	): DocumentRecord | undefined {
+		// no-op
+		return undefined;
+	}
+
+	public move(
+		_oldRelativePath: RelativePath,
+		_newRelativePath: RelativePath
+	): void {
+		// no-op
+	}
+}
+
+class FakeFileSystemOperations implements FileSystemOperations {
+	public readonly names = new Set<string>();
+
+	public async listAllFiles(): Promise<RelativePath[]> {
+		throw new Error("Method not implemented.");
+	}
+	public async read(_path: RelativePath): Promise<Uint8Array> {
+		throw new Error("Method not implemented.");
+	}
+	public async write(
+		path: RelativePath,
+		_content: Uint8Array
+	): Promise<void> {
+		this.names.add(path);
+	}
+	public async atomicUpdateText(
+		_path: RelativePath,
+		_updater: (currentContent: string) => string
+	): Promise<string> {
+		throw new Error("Method not implemented.");
+	}
+	public async getFileSize(_path: RelativePath): Promise<number> {
+		throw new Error("Method not implemented.");
+	}
+	public async getModificationTime(_path: RelativePath): Promise<Date> {
+		throw new Error("Method not implemented.");
+	}
+	public async exists(path: RelativePath): Promise<boolean> {
+		return this.names.has(path);
+	}
+	public async createDirectory(_path: RelativePath): Promise<void> {
+		// this is called but irrelevant for this mock
+	}
+	public async delete(_path: RelativePath): Promise<void> {
+		throw new Error("Method not implemented.");
+	}
+	public async rename(
+		oldPath: RelativePath,
+		newPath: RelativePath
+	): Promise<void> {
+		this.names.delete(oldPath);
+		this.names.add(newPath);
+	}
+}
 
 describe("File operations", () => {
-	class MockDatabase implements Partial<Database> {
-		public getLatestDocumentByRelativePath(
-			_find: RelativePath
-		): DocumentRecord | undefined {
-			// no-op
-			return undefined;
-		}
+	beforeEach(async () => {
+		const wasmBin = fs.readFileSync(
+			"../../backend/sync_lib/pkg/sync_lib_bg.wasm"
+		);
+		await init({ module_or_path: wasmBin });
+	});
 
-		public move(
-			_oldRelativePath: RelativePath,
-			_newRelativePath: RelativePath
-		): void {
-			// no-op
-		}
-	}
-
-	class FakeFileSystemOperations implements FileSystemOperations {
-		public readonly names = new Set<string>();
-
-		public async listAllFiles(): Promise<RelativePath[]> {
-			throw new Error("Method not implemented.");
-		}
-		public async read(_path: RelativePath): Promise<Uint8Array> {
-			throw new Error("Method not implemented.");
-		}
-		public async write(
-			path: RelativePath,
-			_content: Uint8Array
-		): Promise<void> {
-			this.names.add(path);
-		}
-		public async atomicUpdateText(
-			_path: RelativePath,
-			_updater: (currentContent: string) => string
-		): Promise<string> {
-			throw new Error("Method not implemented.");
-		}
-		public async getFileSize(_path: RelativePath): Promise<number> {
-			throw new Error("Method not implemented.");
-		}
-		public async getModificationTime(_path: RelativePath): Promise<Date> {
-			throw new Error("Method not implemented.");
-		}
-		public async exists(path: RelativePath): Promise<boolean> {
-			return this.names.has(path);
-		}
-		public async createDirectory(_path: RelativePath): Promise<void> {
-			// this is called but irrelevant for this mock
-		}
-		public async delete(_path: RelativePath): Promise<void> {
-			throw new Error("Method not implemented.");
-		}
-		public async rename(
-			oldPath: RelativePath,
-			newPath: RelativePath
-		): Promise<void> {
-			this.names.delete(oldPath);
-			this.names.add(newPath);
-		}
-	}
-
-	test("should deconflict renames", async () => {
-		const fs = new FakeFileSystemOperations();
+	it("should deconflict renames", async () => {
+		const fileSystemOperations = new FakeFileSystemOperations();
 		const fileOperations = new FileOperations(
 			new Logger(),
 			new MockDatabase() as Database, // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
-			fs
+			fileSystemOperations
 		);
 
 		await fileOperations.create("a", new Uint8Array());
-		assertSetContainsExactly(fs.names, "a");
+		assertSetContainsExactly(fileSystemOperations.names, "a");
 		await fileOperations.move("a", "b");
-		assertSetContainsExactly(fs.names, "b");
+		assertSetContainsExactly(fileSystemOperations.names, "b");
 
 		await fileOperations.create("c", new Uint8Array());
-		assertSetContainsExactly(fs.names, "b", "c");
+		assertSetContainsExactly(fileSystemOperations.names, "b", "c");
 
 		await fileOperations.move("c", "b");
-		assertSetContainsExactly(fs.names, "b", "b (1)");
+		assertSetContainsExactly(fileSystemOperations.names, "b", "b (1)");
 
 		await fileOperations.create("c", new Uint8Array());
 		await fileOperations.move("c", "b");
-		assertSetContainsExactly(fs.names, "b", "b (1)", "b (2)");
+		assertSetContainsExactly(
+			fileSystemOperations.names,
+			"b",
+			"b (1)",
+			"b (2)"
+		);
 	});
 
-	test("should deconflict renames with file extension", async () => {
+	it("should deconflict renames with file extension", async () => {
 		const fs = new FakeFileSystemOperations();
 		const fileOperations = new FileOperations(
 			new Logger(),
@@ -124,7 +138,7 @@ describe("File operations", () => {
 		);
 	});
 
-	test("should deconflict renames with paths", async () => {
+	it("should deconflict renames with paths", async () => {
 		const fs = new FakeFileSystemOperations();
 		const fileOperations = new FileOperations(
 			new Logger(),

From 16aac488cc1f94e7f7e424350265f1bd90562405 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Mar 2025 12:01:06 +0000
Subject: [PATCH 320/761] Add docs

---
 .../file-operations/filesystem-operations.ts    | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/frontend/sync-client/src/file-operations/filesystem-operations.ts b/frontend/sync-client/src/file-operations/filesystem-operations.ts
index 3cab9d2d..19d319ba 100644
--- a/frontend/sync-client/src/file-operations/filesystem-operations.ts
+++ b/frontend/sync-client/src/file-operations/filesystem-operations.ts
@@ -1,16 +1,33 @@
 import type { RelativePath } from "../persistence/database";
 
 export interface FileSystemOperations {
+	// List all files that should be synced.
 	listAllFiles: () => Promise<RelativePath[]>;
+
+	// Read the content of a file.
 	read: (path: RelativePath) => Promise<Uint8Array>;
+
+	// Create or overwrite a file with the given content.
 	write: (path: RelativePath, content: Uint8Array) => Promise<void>;
+
+	// Atomically update the content of a text file.
 	atomicUpdateText: (
 		path: RelativePath,
 		updater: (currentContent: string) => string
 	) => Promise<string>;
+
+	// Get the size of a file in bytes.
 	getFileSize: (path: RelativePath) => Promise<number>;
+
+	// Check if a file exists.
 	exists: (path: RelativePath) => Promise<boolean>;
+
+	// Create a directory at the specified path. All parent directories must already exist.
 	createDirectory: (path: RelativePath) => Promise<void>;
+
+	// Delete a file. It is expected that the path points to an existing file.
 	delete: (path: RelativePath) => Promise<void>;
+
+	// Rename a file. It is expected that the oldPath points to an existing file and the newPath does not exist.
 	rename: (oldPath: RelativePath, newPath: RelativePath) => Promise<void>;
 }

From 087d38f5707519f21e9234764736554c627955dd Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Mar 2025 12:01:15 +0000
Subject: [PATCH 321/761] Extract error

---
 .../sync-client/src/file-operations/file-not-found-error.ts | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 frontend/sync-client/src/file-operations/file-not-found-error.ts

diff --git a/frontend/sync-client/src/file-operations/file-not-found-error.ts b/frontend/sync-client/src/file-operations/file-not-found-error.ts
new file mode 100644
index 00000000..63af7dab
--- /dev/null
+++ b/frontend/sync-client/src/file-operations/file-not-found-error.ts
@@ -0,0 +1,6 @@
+export class FileNotFoundError extends Error {
+	public constructor(message: string) {
+		super(message);
+		this.name = "FileNotFoundError";
+	}
+}

From d885646f396b86f12c8c87d900849c47e7c323a0 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Mar 2025 12:01:27 +0000
Subject: [PATCH 322/761] Configure line-endings

---
 .../obsidian-plugin/src/vault-link-plugin.ts   | 13 +++++++------
 frontend/sync-client/src/sync-client.ts        | 18 ++++++++++++------
 frontend/test-client/src/agent/mock-client.ts  | 10 +++++-----
 3 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/frontend/obsidian-plugin/src/vault-link-plugin.ts b/frontend/obsidian-plugin/src/vault-link-plugin.ts
index bf19d37c..435cecd1 100644
--- a/frontend/obsidian-plugin/src/vault-link-plugin.ts
+++ b/frontend/obsidian-plugin/src/vault-link-plugin.ts
@@ -1,5 +1,5 @@
 import type { WorkspaceLeaf } from "obsidian";
-import { Plugin } from "obsidian";
+import { Platform, Plugin } from "obsidian";
 import "./styles.scss";
 import "../manifest.json";
 import { SyncSettingsTab } from "./views/settings-tab";
@@ -37,13 +37,14 @@ export default class VaultLinkPlugin extends Plugin {
 	}
 
 	public async onload(): Promise<void> {
-		this.client = await SyncClient.create(
-			new ObsidianFileSystemOperations(this.app.vault),
-			{
+		this.client = await SyncClient.create({
+			fs: new ObsidianFileSystemOperations(this.app.vault),
+			persistence: {
 				load: this.loadData.bind(this),
 				save: this.saveData.bind(this)
-			}
-		);
+			},
+			nativeLineEndings: Platform.isWin ? "\r\n" : "\n"
+		});
 
 		VaultLinkPlugin.registerConsoleForLogging(this.client);
 
diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts
index 3def68f9..86d634ab 100644
--- a/frontend/sync-client/src/sync-client.ts
+++ b/frontend/sync-client/src/sync-client.ts
@@ -40,16 +40,22 @@ export class SyncClient {
 		return this._database.length;
 	}
 
-	public static async create(
-		fs: FileSystemOperations,
+	public static async create({
+		fs,
+		persistence,
+		fetch = globalThis.fetch,
+		nativeLineEndings = "\n"
+	}: {
+		fs: FileSystemOperations;
 		persistence: PersistenceProvider<
 			Partial<{
 				settings: Partial<SyncSettings>;
 				database: Partial<StoredDatabase>;
 			}>
-		>,
-		fetch: typeof globalThis.fetch = globalThis.fetch
-	): Promise<SyncClient> {
+		>;
+		fetch?: typeof globalThis.fetch;
+		nativeLineEndings?: string;
+	}): Promise<SyncClient> {
 		const logger = new Logger();
 		logger.info("Starting SyncClient");
 
@@ -91,7 +97,7 @@ export class SyncClient {
 			database,
 			settings,
 			syncService,
-			new FileOperations(logger, database, fs),
+			new FileOperations(logger, database, fs, nativeLineEndings),
 			history
 		);
 
diff --git a/frontend/test-client/src/agent/mock-client.ts b/frontend/test-client/src/agent/mock-client.ts
index 9d4d457e..9f3483cb 100644
--- a/frontend/test-client/src/agent/mock-client.ts
+++ b/frontend/test-client/src/agent/mock-client.ts
@@ -19,14 +19,14 @@ export class MockClient implements FileSystemOperations {
 	public async init(
 		fetchImplementation: typeof globalThis.fetch
 	): Promise<void> {
-		this.client = await SyncClient.create(
-			this,
-			{
+		this.client = await SyncClient.create({
+			fs: this,
+			persistence: {
 				load: async () => this.data,
 				save: async (data) => void (this.data = data)
 			},
-			fetchImplementation
-		);
+			fetch: fetchImplementation
+		});
 
 		await Promise.all(
 			Object.keys(this.initialSettings).map(async (key) => {

From 1c904909af4190ae7204b15595bc7f291f6810b2 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Mar 2025 12:04:43 +0000
Subject: [PATCH 323/761] Fix updates

---
 .../sync-operations/unrestricted-syncer.ts    | 43 ++++++++++++-------
 1 file changed, 28 insertions(+), 15 deletions(-)

diff --git a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
index 4eef87a2..f62f907c 100644
--- a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
+++ b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
@@ -13,9 +13,9 @@ import type { components } from "../services/types";
 import { deserialize } from "../utils/deserialize";
 import type { Settings } from "../persistence/settings";
 import type { FileOperations } from "../file-operations/file-operations";
-import { FileNotFoundError } from "../file-operations/safe-filesystem-operations";
 import { DocumentLocks } from "../file-operations/document-locks";
 import { createPromise } from "../utils/create-promise";
+import { FileNotFoundError } from "../file-operations/file-not-found-error";
 
 export class UnrestrictedSyncer {
 	private readonly locks: DocumentLocks;
@@ -106,6 +106,8 @@ export class UnrestrictedSyncer {
 	public async unrestrictedSyncLocallyUpdatedFile({
 		oldPath,
 		document,
+		// We use the same code path for both local and remote updates. We need to force the update
+		// if there are no local changes but we know that the remote version is newer.
 		force = false
 	}: {
 		oldPath?: RelativePath;
@@ -131,23 +133,31 @@ export class UnrestrictedSyncer {
 				); // this can throw FileNotFoundError
 				let contentHash = hash(contentBytes);
 
+				let response:
+					| components["schemas"]["DocumentVersion"]
+					| components["schemas"]["DocumentUpdateResponse"];
 				if (
 					document.metadata.hash === contentHash &&
-					oldPath === undefined &&
-					!force
+					oldPath === undefined
 				) {
-					this.logger.debug(
-						`File hash of ${document.relativePath} matches with last synced version and the path hasn't changed; no need to sync`
-					);
-					return;
-				}
+					if (!force) {
+						this.logger.debug(
+							`File hash of ${document.relativePath} matches with last synced version and the path hasn't changed; no need to sync`
+						);
+						return;
+					}
 
-				const response = await this.syncService.put({
-					documentId: document.documentId,
-					parentVersionId: document.metadata.parentVersionId,
-					relativePath: document.relativePath,
-					contentBytes
-				});
+					response = await this.syncService.get({
+						documentId: document.documentId
+					});
+				} else {
+					response = await this.syncService.put({
+						documentId: document.documentId,
+						parentVersionId: document.metadata.parentVersionId,
+						relativePath: document.relativePath,
+						contentBytes
+					});
+				}
 
 				// `document` is mutable and reflects the latest state in the local database
 				// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
@@ -226,7 +236,10 @@ export class UnrestrictedSyncer {
 					document
 				);
 
-				if (response.type === "MergingUpdate") {
+				if (
+					!("type" in response) ||
+					response.type === "MergingUpdate"
+				) {
 					const responseBytes = deserialize(response.contentBase64);
 					contentHash = hash(responseBytes);
 

From 79eb4f6c7be233ba9e3bdc0632e0738d2d8d0b46 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Mar 2025 12:05:16 +0000
Subject: [PATCH 324/761] Add lineending support and clean up

---
 .../src/file-operations/file-operations.ts    | 127 ++++++++++--------
 1 file changed, 69 insertions(+), 58 deletions(-)

diff --git a/frontend/sync-client/src/file-operations/file-operations.ts b/frontend/sync-client/src/file-operations/file-operations.ts
index 6adada5c..6d7b2f81 100644
--- a/frontend/sync-client/src/file-operations/file-operations.ts
+++ b/frontend/sync-client/src/file-operations/file-operations.ts
@@ -11,50 +11,32 @@ export class FileOperations {
 	public constructor(
 		private readonly logger: Logger,
 		private readonly database: Database,
-		fs: FileSystemOperations
+		fs: FileSystemOperations,
+		private readonly nativeLineEndings: string = "\n"
 	) {
 		this.fs = new SafeFileSystemOperations(fs, logger);
 	}
 
 	public async listAllFiles(): Promise<RelativePath[]> {
-		const files = await this.fs.listAllFiles();
-		this.logger.debug(`Listing all files, found ${files.length}`);
-		return files;
+		return this.fs.listAllFiles();
 	}
 
 	public async read(path: RelativePath): Promise<Uint8Array> {
-		const content = await this.fs.read(path);
-
-		if (isBinary(content)) {
-			return content;
-		}
-
-		const decoder = new TextDecoder("utf-8");
-
-		// Normalize line-endings to LF on Windows
-		let text = decoder.decode(content);
-		text = text.replace(/\r\n/g, "\n");
-
-		return new TextEncoder().encode(text);
+		return this.fromNativeLineEndings(await this.fs.read(path));
 	}
 
-	public async getFileSize(path: RelativePath): Promise<number> {
-		return this.fs.getFileSize(path);
-	}
-
-	public async exists(path: RelativePath): Promise<boolean> {
-		return this.fs.exists(path);
-	}
-
-	// Create and write the file if it doesn't exist. Otherwise, it has the same behavior as write.
-	// All parent directories are created if they don't exist.
+	/**
+	 * Create a file at the specified path.
+	 *
+	 * If a file with the same name already exists, it is moved before creating the new one.
+	 * Parent directories are created if necessary.
+	 */
 	public async create(
 		path: RelativePath,
 		newContent: Uint8Array
 	): Promise<void> {
-		this.logger.debug(`Creating file: ${path}`);
-
-		await this.fs.write(path, newContent);
+		await this.ensureClearPath(path);
+		return this.fs.write(path, this.toNativeLineEndings(newContent));
 	}
 
 	public async ensureClearPath(path: RelativePath): Promise<void> {
@@ -71,19 +53,22 @@ export class FileOperations {
 		}
 	}
 
-	// Update the file at the given path.
-	// If the file's content is different from `expectedContent`, the a 3-way merge is performed before writing.
-	// If the file no longer exists, the file is not recreated and an empty array is returned.
+	/**
+	 * Update the file at the given path.
+	 *
+	 * Performs a 3-way merge before writing if the file's content differs from `expectedContent`.
+	 * Does not recreate the file if it no longer exists, returning an empty array instead.
+	 */
 	public async write(
 		path: RelativePath,
 		expectedContent: Uint8Array,
 		newContent: Uint8Array
-	): Promise<Uint8Array> {
+	): Promise<void> {
 		if (!(await this.fs.exists(path))) {
 			this.logger.debug(
 				`The caller assumed ${path} exists, but it no longer, so we wont recreate it`
 			);
-			return new Uint8Array(0);
+			return;
 		}
 
 		if (
@@ -94,44 +79,47 @@ export class FileOperations {
 			this.logger.debug(
 				`The expected content is not mergable, so we won't perform a 3-way merge, just overwrite it`
 			);
-			await this.fs.write(path, newContent);
-			return newContent;
+			await this.fs.write(
+				path,
+				// `newContent` might not be binary so we still have to ensure the line endings are correct
+				this.toNativeLineEndings(newContent)
+			);
+			return;
 		}
 
-		const expectedText = new TextDecoder().decode(expectedContent);
-		const newText = new TextDecoder().decode(newContent);
+		const expectedText = new TextDecoder().decode(expectedContent); // this comes from a previous read which must only have \n line endings
+		const newText = new TextDecoder().decode(newContent); // this comes from the server which stores text with \n line endings
 
-		const resultText = await this.fs.atomicUpdateText(
-			path,
-			(currentText) => {
-				currentText = currentText.replace(/\r\n/g, "\n");
-				if (currentText !== expectedText) {
-					this.logger.debug(
-						`Performing a 3-way merge for ${path} with the expected content`
-					);
+		await this.fs.atomicUpdateText(path, (currentText) => {
+			currentText = currentText.replace(this.nativeLineEndings, "\n");
 
-					return mergeText(expectedText, currentText, newText);
-				}
+			this.logger.debug(
+				`Performing a 3-way merge for ${path} with the expected content`
+			);
 
-				this.logger.debug(
-					`The current content of ${path} is the same as the expected content, so we will just write the new content`
-				);
-
-				return newText;
-			}
-		);
-		return new TextEncoder().encode(resultText);
+			return mergeText(expectedText, currentText, newText).replace(
+				"\n",
+				this.nativeLineEndings
+			);
+		});
 	}
 
 	public async delete(path: RelativePath): Promise<void> {
 		if (await this.exists(path)) {
-			this.logger.debug(`Deleting file: ${path}`);
 			return this.fs.delete(path);
 		} else {
 			this.logger.debug(`No need to delete '${path}', it doesn't exist`);
 		}
 	}
 
+	public async getFileSize(path: RelativePath): Promise<number> {
+		return this.fs.getFileSize(path);
+	}
+
+	public async exists(path: RelativePath): Promise<boolean> {
+		return this.fs.exists(path);
+	}
+
 	public async move(
 		oldPath: RelativePath,
 		newPath: RelativePath
@@ -139,12 +127,35 @@ export class FileOperations {
 		if (oldPath === newPath) {
 			return;
 		}
+
 		await this.ensureClearPath(newPath);
 
 		this.database.move(oldPath, newPath);
 		await this.fs.rename(oldPath, newPath);
 	}
 
+	private fromNativeLineEndings(content: Uint8Array): Uint8Array {
+		if (isBinary(content)) {
+			return content;
+		}
+
+		const decoder = new TextDecoder("utf-8");
+		let text = decoder.decode(content);
+		text = text.replace(this.nativeLineEndings, "\n");
+		return new TextEncoder().encode(text);
+	}
+
+	private toNativeLineEndings(content: Uint8Array): Uint8Array {
+		if (isBinary(content)) {
+			return content;
+		}
+
+		const decoder = new TextDecoder("utf-8");
+		let text = decoder.decode(content);
+		text = text.replace("\n", this.nativeLineEndings);
+		return new TextEncoder().encode(text);
+	}
+
 	private async createParentDirectories(path: string): Promise<void> {
 		const components = path.split("/");
 		if (components.length === 1) {

From ba90fc0b41a87384b27c564301ecee767bb12f49 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Mar 2025 12:09:07 +0000
Subject: [PATCH 325/761] Lint & format

---
 .../file-operations/file-operations.test.ts   | 29 ++++++++++++-----
 .../src/file-operations/file-operations.ts    |  2 +-
 .../src/services/connection-status.ts         | 31 ++++++++++---------
 frontend/sync-client/src/sync-client.ts       |  1 +
 .../sync-operations/unrestricted-syncer.ts    |  3 +-
 5 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/frontend/sync-client/src/file-operations/file-operations.test.ts b/frontend/sync-client/src/file-operations/file-operations.test.ts
index 0d947e88..4f7dd491 100644
--- a/frontend/sync-client/src/file-operations/file-operations.test.ts
+++ b/frontend/sync-client/src/file-operations/file-operations.test.ts
@@ -109,27 +109,36 @@ describe("File operations", () => {
 	});
 
 	it("should deconflict renames with file extension", async () => {
-		const fs = new FakeFileSystemOperations();
+		const fileSystemOperations = new FakeFileSystemOperations();
 		const fileOperations = new FileOperations(
 			new Logger(),
 			new MockDatabase() as Database, // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
-			fs
+			fileSystemOperations
 		);
 
 		await fileOperations.create("b.md", new Uint8Array());
 		await fileOperations.create("c.md", new Uint8Array());
 		await fileOperations.move("c.md", "b.md");
-		assertSetContainsExactly(fs.names, "b.md", "b (1).md");
+		assertSetContainsExactly(
+			fileSystemOperations.names,
+			"b.md",
+			"b (1).md"
+		);
 
 		await fileOperations.create("d.md", new Uint8Array());
 		await fileOperations.move("d.md", "b.md");
-		assertSetContainsExactly(fs.names, "b.md", "b (1).md", "b (2).md");
+		assertSetContainsExactly(
+			fileSystemOperations.names,
+			"b.md",
+			"b (1).md",
+			"b (2).md"
+		);
 
 		await fileOperations.create("file-23.md", new Uint8Array());
 		await fileOperations.create("file-23 (1).md", new Uint8Array());
 		await fileOperations.move("file-23.md", "file-23 (1).md");
 		assertSetContainsExactly(
-			fs.names,
+			fileSystemOperations.names,
 			"b.md",
 			"b (1).md",
 			"b (2).md",
@@ -139,16 +148,20 @@ describe("File operations", () => {
 	});
 
 	it("should deconflict renames with paths", async () => {
-		const fs = new FakeFileSystemOperations();
+		const fileSystemOperations = new FakeFileSystemOperations();
 		const fileOperations = new FileOperations(
 			new Logger(),
 			new MockDatabase() as Database, // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
-			fs
+			fileSystemOperations
 		);
 
 		await fileOperations.create("a/b.c/d", new Uint8Array());
 		await fileOperations.create("a/b.c/e", new Uint8Array());
 		await fileOperations.move("a/b.c/d", "a/b.c/e");
-		assertSetContainsExactly(fs.names, "a/b.c/e", "a/b.c/e (1)");
+		assertSetContainsExactly(
+			fileSystemOperations.names,
+			"a/b.c/e",
+			"a/b.c/e (1)"
+		);
 	});
 });
diff --git a/frontend/sync-client/src/file-operations/file-operations.ts b/frontend/sync-client/src/file-operations/file-operations.ts
index 6d7b2f81..6cac74f3 100644
--- a/frontend/sync-client/src/file-operations/file-operations.ts
+++ b/frontend/sync-client/src/file-operations/file-operations.ts
@@ -12,7 +12,7 @@ export class FileOperations {
 		private readonly logger: Logger,
 		private readonly database: Database,
 		fs: FileSystemOperations,
-		private readonly nativeLineEndings: string = "\n"
+		private readonly nativeLineEndings = "\n"
 	) {
 		this.fs = new SafeFileSystemOperations(fs, logger);
 	}
diff --git a/frontend/sync-client/src/services/connection-status.ts b/frontend/sync-client/src/services/connection-status.ts
index b31d6b95..753af362 100644
--- a/frontend/sync-client/src/services/connection-status.ts
+++ b/frontend/sync-client/src/services/connection-status.ts
@@ -8,7 +8,7 @@ export class ConnectionStatus {
 	private canFetch = true;
 	private until: Promise<symbol>;
 	private resolveUntil: (result: symbol) => void;
-	private rejectUntil: (reason: any) => void;
+	private rejectUntil: (reason: unknown) => void;
 
 	public constructor(
 		settings: Settings,
@@ -27,6 +27,16 @@ export class ConnectionStatus {
 		});
 	}
 
+	private static getUrlFromInput(input: RequestInfo | URL): string {
+		if (input instanceof URL) {
+			return input.href;
+		}
+		if (typeof input === "string") {
+			return input;
+		}
+		return input.url;
+	}
+
 	public getFetchImplementation(
 		fetch: typeof globalThis.fetch,
 		{ doRetries = true }: { doRetries: boolean } = { doRetries: true }
@@ -34,7 +44,7 @@ export class ConnectionStatus {
 		return doRetries ? this.retriedFetchFactory(this.logger, fetch) : fetch;
 	}
 
-	public reset() {
+	public reset(): void {
 		this.rejectUntil(new Error("Sync was reset"));
 		[this.until, this.resolveUntil, this.rejectUntil] = createPromise();
 	}
@@ -42,8 +52,9 @@ export class ConnectionStatus {
 	private retriedFetchFactory(
 		logger: Logger,
 		fetch: typeof globalThis.fetch = globalThis.fetch
-	) {
+	): typeof globalThis.fetch {
 		return async (input: RequestInfo | URL): Promise<Response> => {
+			// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
 			while (true) {
 				while (!this.canFetch) {
 					await this.until;
@@ -60,12 +71,12 @@ export class ConnectionStatus {
 					const fetchPromise = fetch(_input);
 
 					// We only want to catch rejections from `this.until`
-					let result;
+					let result: symbol | Response | undefined = undefined;
 					do {
 						result = await Promise.race([this.until, fetchPromise]);
 					} while (result === ConnectionStatus.UNTIL_RESOLUTION);
 
-					const fetchResult: Response = result as Response;
+					const fetchResult: Response = result as Response; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
 
 					if (!fetchResult.ok) {
 						this.logger.warn(
@@ -88,14 +99,4 @@ export class ConnectionStatus {
 			}
 		};
 	}
-
-	private static getUrlFromInput(input: RequestInfo | URL): string {
-		if (input instanceof URL) {
-			return input.href;
-		}
-		if (typeof input === "string") {
-			return input;
-		}
-		return input.url;
-	}
 }
diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts
index 86d634ab..8e139f74 100644
--- a/frontend/sync-client/src/sync-client.ts
+++ b/frontend/sync-client/src/sync-client.ts
@@ -18,6 +18,7 @@ import { ConnectionStatus } from "./services/connection-status";
 export class SyncClient {
 	private remoteListenerIntervalId: NodeJS.Timeout | null = null;
 
+	// eslint-disable-next-line @typescript-eslint/max-params
 	private constructor(
 		private readonly _history: SyncHistory,
 		private readonly _settings: Settings,
diff --git a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
index f62f907c..6b233af0 100644
--- a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
+++ b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
@@ -135,7 +135,8 @@ export class UnrestrictedSyncer {
 
 				let response:
 					| components["schemas"]["DocumentVersion"]
-					| components["schemas"]["DocumentUpdateResponse"];
+					| components["schemas"]["DocumentUpdateResponse"]
+					| undefined = undefined;
 				if (
 					document.metadata.hash === contentHash &&
 					oldPath === undefined

From 93b43f57b79f431c6d87ac33c5263bba97793653 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Mar 2025 12:25:31 +0000
Subject: [PATCH 326/761] Fix E2E tests

---
 frontend/test-client/src/cli.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/frontend/test-client/src/cli.ts b/frontend/test-client/src/cli.ts
index 25dc8556..4747f2af 100644
--- a/frontend/test-client/src/cli.ts
+++ b/frontend/test-client/src/cli.ts
@@ -132,11 +132,16 @@ process.on("uncaughtException", (error) => {
 	process.exit(1);
 });
 
-process.on("unhandledRejection", (reason, _promise) => {
+process.on("unhandledRejection", (error, _promise) => {
+	if (error instanceof Error && error.message === "Sync was reset") {
+		return;
+	}
+
 	if (slowFileEvents) {
 		return;
 	}
-	console.error("Unhandled Rejection:", reason);
+
+	console.error("Unhandled Rejection:", error);
 	process.exit(1);
 });
 

From 2722f7c7fcb15398b5a57943491826fc34dd93f5 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Mar 2025 13:48:01 +0000
Subject: [PATCH 327/761] Stop exposing Syncer from SyncClient

---
 .../src/obisidan-event-handler.ts             |  8 +-
 .../obsidian-plugin/src/views/settings-tab.ts |  2 +-
 .../obsidian-plugin/src/views/status-bar.ts   |  4 +-
 .../src/views/status-description.ts           |  4 +-
 frontend/sync-client/src/index.ts             | 10 +--
 .../sync-client/src/persistence/settings.ts   |  2 +-
 .../src/services/connection-status.ts         |  2 +-
 .../sync-client/src/services/sync-service.ts  |  2 +-
 frontend/sync-client/src/sync-client.ts       | 89 +++++++++++++------
 frontend/test-client/src/agent/mock-agent.ts  |  4 +-
 frontend/test-client/src/agent/mock-client.ts | 12 +--
 11 files changed, 84 insertions(+), 55 deletions(-)

diff --git a/frontend/obsidian-plugin/src/obisidan-event-handler.ts b/frontend/obsidian-plugin/src/obisidan-event-handler.ts
index 9fb5dba4..df0d8266 100644
--- a/frontend/obsidian-plugin/src/obisidan-event-handler.ts
+++ b/frontend/obsidian-plugin/src/obisidan-event-handler.ts
@@ -9,7 +9,7 @@ export class ObsidianFileEventHandler {
 		if (file instanceof TFile) {
 			this.client.logger.info(`File created: ${file.path}`);
 
-			await this.client.syncer.syncLocallyCreatedFile(file.path);
+			await this.client.syncLocallyCreatedFile(file.path);
 		} else {
 			this.client.logger.debug(`Folder created: ${file.path}, ignored`);
 		}
@@ -19,7 +19,7 @@ export class ObsidianFileEventHandler {
 		if (file instanceof TFile) {
 			this.client.logger.info(`File deleted: ${file.path}`);
 
-			await this.client.syncer.syncLocallyDeletedFile(file.path);
+			await this.client.syncLocallyDeletedFile(file.path);
 		} else {
 			this.client.logger.debug(`Folder deleted: ${file.path}, ignored`);
 		}
@@ -29,7 +29,7 @@ export class ObsidianFileEventHandler {
 		if (file instanceof TFile) {
 			this.client.logger.info(`File renamed: ${oldPath} -> ${file.path}`);
 
-			await this.client.syncer.syncLocallyUpdatedFile({
+			await this.client.syncLocallyUpdatedFile({
 				oldPath,
 				relativePath: file.path
 			});
@@ -48,7 +48,7 @@ export class ObsidianFileEventHandler {
 
 			this.client.logger.info(`File modified: ${file.path}`);
 
-			await this.client.syncer.syncLocallyUpdatedFile({
+			await this.client.syncLocallyUpdatedFile({
 				relativePath: file.path
 			});
 		} else {
diff --git a/frontend/obsidian-plugin/src/views/settings-tab.ts b/frontend/obsidian-plugin/src/views/settings-tab.ts
index 79f3baf9..29e0b820 100644
--- a/frontend/obsidian-plugin/src/views/settings-tab.ts
+++ b/frontend/obsidian-plugin/src/views/settings-tab.ts
@@ -33,7 +33,7 @@ export class SyncSettingsTab extends PluginSettingTab {
 		this.statusDescription = statusDescription;
 
 		this.editedVaultName = this.syncClient.getSettings().vaultName;
-		this.syncClient.addOnSettingsChangeHandlers(
+		this.syncClient.addOnSettingsChangeListener(
 			(newSettings, oldSettings) => {
 				if (newSettings.vaultName !== oldSettings.vaultName) {
 					this.editedVaultName = newSettings.vaultName;
diff --git a/frontend/obsidian-plugin/src/views/status-bar.ts b/frontend/obsidian-plugin/src/views/status-bar.ts
index 6a55f3da..84e7586c 100644
--- a/frontend/obsidian-plugin/src/views/status-bar.ts
+++ b/frontend/obsidian-plugin/src/views/status-bar.ts
@@ -17,14 +17,14 @@ export class StatusBar {
 			this.updateStatus();
 		});
 
-		this.syncClient.syncer.addRemainingOperationsListener(
+		this.syncClient.addRemainingSyncOperationsListener(
 			(remainingOperations) => {
 				this.lastRemaining = remainingOperations;
 				this.updateStatus();
 			}
 		);
 
-		this.syncClient.addOnSettingsChangeHandlers(() => {
+		this.syncClient.addOnSettingsChangeListener(() => {
 			this.updateStatus();
 		});
 	}
diff --git a/frontend/obsidian-plugin/src/views/status-description.ts b/frontend/obsidian-plugin/src/views/status-description.ts
index e992326c..c696c53f 100644
--- a/frontend/obsidian-plugin/src/views/status-description.ts
+++ b/frontend/obsidian-plugin/src/views/status-description.ts
@@ -19,14 +19,14 @@ export class StatusDescription {
 			this.updateDescription();
 		});
 
-		this.syncClient.syncer.addRemainingOperationsListener(
+		this.syncClient.addRemainingSyncOperationsListener(
 			(remainingOperations) => {
 				this.lastRemaining = remainingOperations;
 				this.updateDescription();
 			}
 		);
 
-		this.syncClient.addOnSettingsChangeHandlers(() => {
+		this.syncClient.addOnSettingsChangeListener(() => {
 			void this.updateConnectionState();
 		});
 	}
diff --git a/frontend/sync-client/src/index.ts b/frontend/sync-client/src/index.ts
index 82b6bd87..9308c063 100644
--- a/frontend/sync-client/src/index.ts
+++ b/frontend/sync-client/src/index.ts
@@ -1,19 +1,15 @@
 export {
-	SyncHistory,
 	SyncType,
 	SyncSource,
 	SyncStatus,
 	type HistoryStats,
 	type HistoryEntry
 } from "./tracing/sync-history";
-
 export { Logger, LogLevel, LogLine } from "./tracing/logger";
-
-export { SyncClient } from "./sync-client";
-export { Syncer } from "./sync-operations/syncer";
 export type { CheckConnectionResult } from "./services/sync-service";
-export { Settings, type SyncSettings } from "./persistence/settings";
-
+export { type SyncSettings } from "./persistence/settings";
 export type { RelativePath } from "./persistence/database";
 export type { FileSystemOperations } from "./file-operations/filesystem-operations";
 export type { PersistenceProvider } from "./persistence/persistence";
+
+export { SyncClient } from "./sync-client";
diff --git a/frontend/sync-client/src/persistence/settings.ts b/frontend/sync-client/src/persistence/settings.ts
index 1848cb6b..8233ddfe 100644
--- a/frontend/sync-client/src/persistence/settings.ts
+++ b/frontend/sync-client/src/persistence/settings.ts
@@ -48,7 +48,7 @@ export class Settings {
 		return this.settings;
 	}
 
-	public addOnSettingsChangeHandlers(
+	public addOnSettingsChangeListener(
 		handler: (settings: SyncSettings, oldSettings: SyncSettings) => void
 	): void {
 		this.onSettingsChangeHandlers.push(handler);
diff --git a/frontend/sync-client/src/services/connection-status.ts b/frontend/sync-client/src/services/connection-status.ts
index 753af362..0ee0d5ae 100644
--- a/frontend/sync-client/src/services/connection-status.ts
+++ b/frontend/sync-client/src/services/connection-status.ts
@@ -17,7 +17,7 @@ export class ConnectionStatus {
 		[this.until, this.resolveUntil, this.rejectUntil] =
 			createPromise<symbol>();
 
-		settings.addOnSettingsChangeHandlers((newSettings, oldSettings) => {
+		settings.addOnSettingsChangeListener((newSettings, oldSettings) => {
 			if (oldSettings.isSyncEnabled != newSettings.isSyncEnabled) {
 				this.canFetch = newSettings.isSyncEnabled;
 				this.resolveUntil(ConnectionStatus.UNTIL_RESOLUTION);
diff --git a/frontend/sync-client/src/services/sync-service.ts b/frontend/sync-client/src/services/sync-service.ts
index 1b52751f..53cb4d59 100644
--- a/frontend/sync-client/src/services/sync-service.ts
+++ b/frontend/sync-client/src/services/sync-service.ts
@@ -27,7 +27,7 @@ export class SyncService {
 	) {
 		this.createClient(this.settings.getSettings().remoteUri);
 
-		settings.addOnSettingsChangeHandlers((newSettings, oldSettings) => {
+		settings.addOnSettingsChangeListener((newSettings, oldSettings) => {
 			if (newSettings.remoteUri === oldSettings.remoteUri) {
 				return;
 			}
diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts
index 8e139f74..39970e4f 100644
--- a/frontend/sync-client/src/sync-client.ts
+++ b/frontend/sync-client/src/sync-client.ts
@@ -4,7 +4,7 @@ import type { PersistenceProvider } from "./persistence/persistence";
 import type { HistoryEntry, HistoryStats } from "./tracing/sync-history";
 import { SyncHistory } from "./tracing/sync-history";
 import { Logger } from "./tracing/logger";
-import type { StoredDatabase } from "./persistence/database";
+import type { RelativePath, StoredDatabase } from "./persistence/database";
 import { Database } from "./persistence/database";
 import type { SyncSettings } from "./persistence/settings";
 import { Settings } from "./persistence/settings";
@@ -29,10 +29,6 @@ export class SyncClient {
 		private readonly _connectionStatus: ConnectionStatus
 	) {}
 
-	public get syncer(): Syncer {
-		return this._syncer;
-	}
-
 	public get logger(): Logger {
 		return this._logger;
 	}
@@ -58,7 +54,7 @@ export class SyncClient {
 		nativeLineEndings?: string;
 	}): Promise<SyncClient> {
 		const logger = new Logger();
-		logger.info("Starting SyncClient");
+		logger.info("Initialising SyncClient");
 
 		const history = new SyncHistory(logger);
 
@@ -112,25 +108,6 @@ export class SyncClient {
 			connectionStatus
 		);
 
-		settings.addOnSettingsChangeHandlers((newSettings, oldSettings) => {
-			if (
-				newSettings.fetchChangesUpdateIntervalMs !==
-				oldSettings.fetchChangesUpdateIntervalMs
-			) {
-				client.setRemoteEventListener(
-					newSettings.fetchChangesUpdateIntervalMs
-				);
-			}
-
-			if (
-				newSettings.vaultName !== oldSettings.vaultName ||
-				newSettings.token !== oldSettings.token ||
-				newSettings.remoteUri !== oldSettings.remoteUri
-			) {
-				void client.reset();
-			}
-		});
-
 		logger.info("SyncClient initialised");
 
 		return client;
@@ -151,6 +128,27 @@ export class SyncClient {
 	}
 
 	public async start(): Promise<void> {
+		this._settings.addOnSettingsChangeListener(
+			(newSettings, oldSettings) => {
+				if (
+					newSettings.fetchChangesUpdateIntervalMs !==
+					oldSettings.fetchChangesUpdateIntervalMs
+				) {
+					this.setRemoteEventListener(
+						newSettings.fetchChangesUpdateIntervalMs
+					);
+				}
+
+				if (
+					newSettings.vaultName !== oldSettings.vaultName ||
+					newSettings.token !== oldSettings.token ||
+					newSettings.remoteUri !== oldSettings.remoteUri
+				) {
+					void this.reset();
+				}
+			}
+		);
+
 		await this._syncer.scheduleSyncForOfflineChanges();
 
 		this.setRemoteEventListener(
@@ -163,6 +161,12 @@ export class SyncClient {
 		this.unsetRemoteEventListener();
 	}
 
+	public async waitAndStop(): Promise<void> {
+		await this._syncer.waitForSyncQueue();
+		await this._syncer.applyRemoteChangesLocally();
+		this.stop();
+	}
+
 	/// Wait for the in-flight operations to finish, reset all tracking,
 	/// and the local database but retain the settings.
 	/// The SyncClient can be used again after calling this method.
@@ -187,10 +191,41 @@ export class SyncClient {
 		await this._settings.setSetting(key, value);
 	}
 
-	public addOnSettingsChangeHandlers(
+	public addOnSettingsChangeListener(
 		handler: (settings: SyncSettings, oldSettings: SyncSettings) => void
 	): void {
-		this._settings.addOnSettingsChangeHandlers(handler);
+		this._settings.addOnSettingsChangeListener(handler);
+	}
+
+	public addRemainingSyncOperationsListener(
+		listener: (remainingOperations: number) => void
+	): void {
+		this._syncer.addRemainingOperationsListener(listener);
+	}
+
+	public async syncLocallyCreatedFile(
+		relativePath: RelativePath
+	): Promise<void> {
+		return this._syncer.syncLocallyCreatedFile(relativePath);
+	}
+
+	public async syncLocallyDeletedFile(
+		relativePath: RelativePath
+	): Promise<void> {
+		return this._syncer.syncLocallyDeletedFile(relativePath);
+	}
+
+	public async syncLocallyUpdatedFile({
+		oldPath,
+		relativePath
+	}: {
+		oldPath?: RelativePath;
+		relativePath: RelativePath;
+	}): Promise<void> {
+		return this._syncer.syncLocallyUpdatedFile({
+			oldPath,
+			relativePath
+		});
 	}
 
 	private setRemoteEventListener(intervalMs: number): void {
diff --git a/frontend/test-client/src/agent/mock-agent.ts b/frontend/test-client/src/agent/mock-agent.ts
index 23fcd092..3f7b16d3 100644
--- a/frontend/test-client/src/agent/mock-agent.ts
+++ b/frontend/test-client/src/agent/mock-agent.ts
@@ -134,9 +134,7 @@ export class MockAgent extends MockClient {
 	public async finish(): Promise<void> {
 		await this.client.setSetting("isSyncEnabled", true);
 		await Promise.all(this.pendingActions);
-		this.client.stop();
-		await this.client.syncer.waitForSyncQueue();
-		await this.client.syncer.applyRemoteChangesLocally();
+		await this.client.waitAndStop();
 	}
 
 	public assertFileSystemsAreConsistent(otherAgent: MockAgent): void {
diff --git a/frontend/test-client/src/agent/mock-client.ts b/frontend/test-client/src/agent/mock-client.ts
index 9f3483cb..793c3775 100644
--- a/frontend/test-client/src/agent/mock-client.ts
+++ b/frontend/test-client/src/agent/mock-client.ts
@@ -72,7 +72,7 @@ export class MockClient implements FileSystemOperations {
 		this.localFiles.set(path, newContent);
 
 		this.runCallback(() => {
-			void this.client.syncer.syncLocallyCreatedFile(path);
+			void this.client.syncLocallyCreatedFile(path);
 		});
 	}
 
@@ -114,7 +114,7 @@ export class MockClient implements FileSystemOperations {
 		);
 
 		this.runCallback(() => {
-			void this.client.syncer.syncLocallyUpdatedFile({
+			void this.client.syncLocallyUpdatedFile({
 				relativePath: path
 			});
 		});
@@ -132,11 +132,11 @@ export class MockClient implements FileSystemOperations {
 
 		this.runCallback(() => {
 			if (hasExisted) {
-				void this.client.syncer.syncLocallyUpdatedFile({
+				void this.client.syncLocallyUpdatedFile({
 					relativePath: path
 				});
 			} else {
-				void this.client.syncer.syncLocallyCreatedFile(path);
+				void this.client.syncLocallyCreatedFile(path);
 			}
 		});
 	}
@@ -148,7 +148,7 @@ export class MockClient implements FileSystemOperations {
 		this.localFiles.delete(path);
 
 		this.runCallback(() => {
-			void this.client.syncer.syncLocallyDeletedFile(path);
+			void this.client.syncLocallyDeletedFile(path);
 		});
 	}
 
@@ -170,7 +170,7 @@ export class MockClient implements FileSystemOperations {
 		);
 
 		this.runCallback(() => {
-			void this.client.syncer.syncLocallyUpdatedFile({
+			void this.client.syncLocallyUpdatedFile({
 				oldPath,
 				relativePath: newPath
 			});

From 8723c8499b6a312a90fd019d256e2d2085ea0170 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Mar 2025 14:05:54 +0000
Subject: [PATCH 328/761] Fix status bar disabled state

---
 .../obsidian-plugin/src/views/status-bar.ts   | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/frontend/obsidian-plugin/src/views/status-bar.ts b/frontend/obsidian-plugin/src/views/status-bar.ts
index 84e7586c..3e35d93a 100644
--- a/frontend/obsidian-plugin/src/views/status-bar.ts
+++ b/frontend/obsidian-plugin/src/views/status-bar.ts
@@ -35,6 +35,18 @@ export class StatusBar {
 			cls: ["sync-status"]
 		});
 
+		if (!this.syncClient.getSettings().isSyncEnabled) {
+			const button = container.createEl("button", {
+				text: "VaultLink is disabled, click to configure",
+				cls: "initialize-button"
+			});
+			button.onclick = (): void => {
+				this.plugin.openSettings();
+			};
+
+			return;
+		}
+
 		let hasShownMessage = false;
 
 		if ((this.lastRemaining ?? 0) > 0) {
@@ -57,17 +69,7 @@ export class StatusBar {
 		}
 
 		if (!hasShownMessage) {
-			if (this.syncClient.getSettings().isSyncEnabled) {
-				container.createSpan({ text: "VaultLink is idle" });
-			} else {
-				const button = container.createEl("button", {
-					text: "VaultLink is disabled, click to configure",
-					cls: "initialize-button"
-				});
-				button.onclick = (): void => {
-					this.plugin.openSettings();
-				};
-			}
+			container.createSpan({ text: "VaultLink is idle" });
 		}
 	}
 }

From 6906bc4f5ecc691f51078625e30f8c9be421aaaf Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Mar 2025 14:06:17 +0000
Subject: [PATCH 329/761] Avoid duplication from initial sync

---
 .../sync-client/src/persistence/database.ts   | 77 +++++++++++++++----
 .../sync-client/src/sync-operations/syncer.ts | 38 ++++++++-
 2 files changed, 97 insertions(+), 18 deletions(-)

diff --git a/frontend/sync-client/src/persistence/database.ts b/frontend/sync-client/src/persistence/database.ts
index 617cfbf1..f6379c53 100644
--- a/frontend/sync-client/src/persistence/database.ts
+++ b/frontend/sync-client/src/persistence/database.ts
@@ -1,4 +1,5 @@
 import type { Logger } from "../tracing/logger";
+import { EMPTY_HASH } from "../utils/hash";
 
 export type VaultUpdateId = number;
 export type DocumentId = string;
@@ -19,6 +20,7 @@ export interface StoredDocumentMetadata {
 export interface StoredDatabase {
 	documents: StoredDocumentMetadata[];
 	lastSeenUpdateId: VaultUpdateId | undefined;
+	hasInitialSyncCompleted: boolean;
 }
 
 /**
@@ -39,6 +41,7 @@ export interface DocumentRecord {
 export class Database {
 	private documents: DocumentRecord[];
 	private lastSeenUpdateId: VaultUpdateId | undefined;
+	private hasInitialSyncCompleted: boolean;
 
 	public constructor(
 		private readonly logger: Logger,
@@ -66,6 +69,12 @@ export class Database {
 		this.logger.debug(
 			`Loaded last seen update id: ${this.lastSeenUpdateId}`
 		);
+
+		this.hasInitialSyncCompleted =
+			initialState.hasInitialSyncCompleted ?? false;
+		this.logger.debug(
+			`Loaded hasInitialSyncCompleted: ${this.hasInitialSyncCompleted}`
+		);
 	}
 
 	public get length(): number {
@@ -105,21 +114,6 @@ export class Database {
 		});
 	}
 
-	public getLastSeenUpdateId(): VaultUpdateId | undefined {
-		return this.lastSeenUpdateId;
-	}
-
-	public setLastSeenUpdateId(value: VaultUpdateId | undefined): void {
-		this.lastSeenUpdateId = value;
-		this.save();
-	}
-
-	public reset(): void {
-		this.documents = [];
-		this.lastSeenUpdateId = 0;
-		this.save();
-	}
-
 	public updateDocumentMetadata(
 		metadata: {
 			parentVersionId: VaultUpdateId;
@@ -215,6 +209,29 @@ export class Database {
 		return entry;
 	}
 
+	public createNewEmptyDocument(
+		documentId: DocumentId,
+		parentVersionId: VaultUpdateId,
+		relativePath: RelativePath
+	): DocumentRecord {
+		const entry = {
+			relativePath,
+			documentId,
+			metadata: {
+				parentVersionId,
+				hash: EMPTY_HASH
+			},
+			isDeleted: false,
+			updates: [],
+			parallelVersion: 0
+		};
+
+		this.documents.push(entry);
+		this.save();
+
+		return entry;
+	}
+
 	public getDocumentByDocumentId(
 		find: DocumentId
 	): DocumentRecord | undefined {
@@ -260,6 +277,31 @@ export class Database {
 		candidate.isDeleted = true;
 	}
 
+	public getHasInitialSyncCompleted(): boolean {
+		return this.hasInitialSyncCompleted;
+	}
+
+	public setHasInitialSyncCompleted(value: boolean): void {
+		this.hasInitialSyncCompleted = value;
+		this.save();
+	}
+
+	public getLastSeenUpdateId(): VaultUpdateId | undefined {
+		return this.lastSeenUpdateId;
+	}
+
+	public setLastSeenUpdateId(value: VaultUpdateId | undefined): void {
+		this.lastSeenUpdateId = value;
+		this.save();
+	}
+
+	public reset(): void {
+		this.documents = [];
+		this.lastSeenUpdateId = 0;
+		this.hasInitialSyncCompleted = false;
+		this.save();
+	}
+
 	private save(): void {
 		this.ensureConsistency();
 		void this.saveData({
@@ -268,10 +310,11 @@ export class Database {
 					documentId,
 					relativePath,
 					// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-					...metadata! // resolvedDocuments only returns docs with metadata set
+					...metadata! // `resolvedDocuments` only returns docs with metadata set
 				})
 			),
-			lastSeenUpdateId: this.lastSeenUpdateId
+			lastSeenUpdateId: this.lastSeenUpdateId,
+			hasInitialSyncCompleted: this.hasInitialSyncCompleted
 		});
 	}
 
diff --git a/frontend/sync-client/src/sync-operations/syncer.ts b/frontend/sync-client/src/sync-operations/syncer.ts
index 7a7ba286..861dac00 100644
--- a/frontend/sync-client/src/sync-operations/syncer.ts
+++ b/frontend/sync-client/src/sync-operations/syncer.ts
@@ -36,7 +36,7 @@ export class Syncer {
 			concurrency: settings.getSettings().syncConcurrency
 		});
 
-		settings.addOnSettingsChangeHandlers((newSettings, oldSettings) => {
+		settings.addOnSettingsChangeListener((newSettings, oldSettings) => {
 			if (newSettings.syncConcurrency === oldSettings.syncConcurrency) {
 				return;
 			}
@@ -310,6 +310,8 @@ export class Syncer {
 	}
 
 	private async internalScheduleSyncForOfflineChanges(): Promise<void> {
+		await this.createFakeDocumentsFromRemoteState();
+
 		const allLocalFiles = await this.operations.listAllFiles();
 
 		let locallyPossiblyDeletedFiles = [
@@ -387,4 +389,38 @@ export class Syncer {
 
 		await Promise.all([updates, deletes]);
 	}
+
+	/**
+	 * Create fake documents in the database for all files that are present locally
+	 * and also exist remotely. This will stop the subequent syncs from duplicating
+	 * the documents by creating the same documents from multiple clients.
+	 */
+	private async createFakeDocumentsFromRemoteState(): Promise<void> {
+		if (this.database.getHasInitialSyncCompleted()) {
+			return;
+		}
+
+		const [allLocalFiles, remote] = await Promise.all([
+			this.operations.listAllFiles(),
+			this.syncQueue.add(async () => this.syncService.getAll())
+		]);
+
+		if (remote !== undefined) {
+			remote.latestDocuments
+				.filter(
+					(remoteDocument) =>
+						allLocalFiles.includes(remoteDocument.relativePath) &&
+						!remoteDocument.isDeleted
+				)
+				.forEach((remoteDocument) => {
+					this.database.createNewEmptyDocument(
+						remoteDocument.documentId,
+						remoteDocument.vaultUpdateId,
+						remoteDocument.relativePath
+					);
+				});
+		}
+
+		this.database.setHasInitialSyncCompleted(true);
+	}
 }

From 3501394de566f3ded8861c81053467581d5651a1 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Mar 2025 14:06:30 +0000
Subject: [PATCH 330/761] Respect sync enabled on load

---
 frontend/sync-client/src/services/connection-status.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/frontend/sync-client/src/services/connection-status.ts b/frontend/sync-client/src/services/connection-status.ts
index 0ee0d5ae..2d34ee89 100644
--- a/frontend/sync-client/src/services/connection-status.ts
+++ b/frontend/sync-client/src/services/connection-status.ts
@@ -5,7 +5,7 @@ import { sleep } from "../utils/sleep";
 
 export class ConnectionStatus {
 	private static readonly UNTIL_RESOLUTION = Symbol();
-	private canFetch = true;
+	private canFetch: boolean;
 	private until: Promise<symbol>;
 	private resolveUntil: (result: symbol) => void;
 	private rejectUntil: (reason: unknown) => void;
@@ -14,6 +14,8 @@ export class ConnectionStatus {
 		settings: Settings,
 		private readonly logger: Logger
 	) {
+		this.canFetch = settings.getSettings().isSyncEnabled;
+
 		[this.until, this.resolveUntil, this.rejectUntil] =
 			createPromise<symbol>();
 

From 5edf8f37a62e443b04fd161756dd2d98a1e0b5f0 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Mar 2025 14:06:36 +0000
Subject: [PATCH 331/761] Rename

---
 frontend/sync-client/src/sync-client.ts | 54 ++++++++++++-------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts
index 39970e4f..37afb1d1 100644
--- a/frontend/sync-client/src/sync-client.ts
+++ b/frontend/sync-client/src/sync-client.ts
@@ -20,13 +20,13 @@ export class SyncClient {
 
 	// eslint-disable-next-line @typescript-eslint/max-params
 	private constructor(
-		private readonly _history: SyncHistory,
-		private readonly _settings: Settings,
-		private readonly _database: Database,
-		private readonly _syncer: Syncer,
-		private readonly _syncService: SyncService,
+		private readonly history: SyncHistory,
+		private readonly settings: Settings,
+		private readonly database: Database,
+		private readonly syncer: Syncer,
+		private readonly syncService: SyncService,
 		private readonly _logger: Logger,
-		private readonly _connectionStatus: ConnectionStatus
+		private readonly connectionStatus: ConnectionStatus
 	) {}
 
 	public get logger(): Logger {
@@ -34,7 +34,7 @@ export class SyncClient {
 	}
 
 	public get documentCount(): number {
-		return this._database.length;
+		return this.database.length;
 	}
 
 	public static async create({
@@ -114,21 +114,21 @@ export class SyncClient {
 	}
 
 	public async checkConnection(): Promise<CheckConnectionResult> {
-		return this._syncService.checkConnection();
+		return this.syncService.checkConnection();
 	}
 
 	public getHistoryEntries(): HistoryEntry[] {
-		return this._history.getEntries();
+		return this.history.getEntries();
 	}
 
 	public addSyncHistoryUpdateListener(
 		listener: (stats: HistoryStats) => void
 	): void {
-		this._history.addSyncHistoryUpdateListener(listener);
+		this.history.addSyncHistoryUpdateListener(listener);
 	}
 
 	public async start(): Promise<void> {
-		this._settings.addOnSettingsChangeListener(
+		this.settings.addOnSettingsChangeListener(
 			(newSettings, oldSettings) => {
 				if (
 					newSettings.fetchChangesUpdateIntervalMs !==
@@ -149,10 +149,10 @@ export class SyncClient {
 			}
 		);
 
-		await this._syncer.scheduleSyncForOfflineChanges();
+		await this.syncer.scheduleSyncForOfflineChanges();
 
 		this.setRemoteEventListener(
-			this._settings.getSettings().fetchChangesUpdateIntervalMs
+			this.settings.getSettings().fetchChangesUpdateIntervalMs
 		);
 	}
 
@@ -162,8 +162,8 @@ export class SyncClient {
 	}
 
 	public async waitAndStop(): Promise<void> {
-		await this._syncer.waitForSyncQueue();
-		await this._syncer.applyRemoteChangesLocally();
+		await this.syncer.waitForSyncQueue();
+		await this.syncer.applyRemoteChangesLocally();
 		this.stop();
 	}
 
@@ -172,47 +172,47 @@ export class SyncClient {
 	/// The SyncClient can be used again after calling this method.
 	public async reset(): Promise<void> {
 		this.stop();
-		this._connectionStatus.reset();
-		await this._syncer.reset();
-		this._history.reset();
-		this._database.reset();
+		this.connectionStatus.reset();
+		await this.syncer.reset();
+		this.history.reset();
+		this.database.reset();
 		this._logger.reset();
 		void this.start();
 	}
 
 	public getSettings(): SyncSettings {
-		return this._settings.getSettings();
+		return this.settings.getSettings();
 	}
 
 	public async setSetting<T extends keyof SyncSettings>(
 		key: T,
 		value: SyncSettings[T]
 	): Promise<void> {
-		await this._settings.setSetting(key, value);
+		await this.settings.setSetting(key, value);
 	}
 
 	public addOnSettingsChangeListener(
 		handler: (settings: SyncSettings, oldSettings: SyncSettings) => void
 	): void {
-		this._settings.addOnSettingsChangeListener(handler);
+		this.settings.addOnSettingsChangeListener(handler);
 	}
 
 	public addRemainingSyncOperationsListener(
 		listener: (remainingOperations: number) => void
 	): void {
-		this._syncer.addRemainingOperationsListener(listener);
+		this.syncer.addRemainingOperationsListener(listener);
 	}
 
 	public async syncLocallyCreatedFile(
 		relativePath: RelativePath
 	): Promise<void> {
-		return this._syncer.syncLocallyCreatedFile(relativePath);
+		return this.syncer.syncLocallyCreatedFile(relativePath);
 	}
 
 	public async syncLocallyDeletedFile(
 		relativePath: RelativePath
 	): Promise<void> {
-		return this._syncer.syncLocallyDeletedFile(relativePath);
+		return this.syncer.syncLocallyDeletedFile(relativePath);
 	}
 
 	public async syncLocallyUpdatedFile({
@@ -222,7 +222,7 @@ export class SyncClient {
 		oldPath?: RelativePath;
 		relativePath: RelativePath;
 	}): Promise<void> {
-		return this._syncer.syncLocallyUpdatedFile({
+		return this.syncer.syncLocallyUpdatedFile({
 			oldPath,
 			relativePath
 		});
@@ -234,7 +234,7 @@ export class SyncClient {
 		}
 
 		this.remoteListenerIntervalId = setInterval(
-			() => void this._syncer.applyRemoteChangesLocally(),
+			() => void this.syncer.applyRemoteChangesLocally(),
 			intervalMs
 		);
 	}

From ab12b07ed854e43e3ab8d05339cd9fe87ca3d263 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Mar 2025 14:06:59 +0000
Subject: [PATCH 332/761] Add todos

---
 README.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/README.md b/README.md
index 7da19aeb..771cb514 100644
--- a/README.md
+++ b/README.md
@@ -60,4 +60,11 @@ And to clean up the logs & database files, run `scripts/clean-up.sh`
 - Better server logs
 - Allow setting config.yml path for server
 - Single apply button in settings
+- history tab for going back
 - vritual list for logs view
+- show cursors
+- use websocket
+- fix docker publish
+- add self-hosted runner protection
+- change default branch
+- split repo
\ No newline at end of file

From ef9ec69204fbf3aafdbafd228d5d0c304865bdc1 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Mar 2025 14:07:11 +0000
Subject: [PATCH 333/761] Bump versions to 0.1.6

---
 backend/Cargo.lock                     | 6 +++---
 backend/Cargo.toml                     | 2 +-
 frontend/obsidian-plugin/manifest.json | 2 +-
 frontend/obsidian-plugin/package.json  | 2 +-
 frontend/package-lock.json             | 8 ++++----
 frontend/sync-client/package.json      | 4 ++--
 frontend/test-client/package.json      | 2 +-
 manifest.json                          | 2 +-
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 159a82bf..ee4c80f6 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1746,7 +1746,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile"
-version = "0.1.5"
+version = "0.1.6"
 dependencies = [
  "insta",
  "pretty_assertions",
@@ -2380,7 +2380,7 @@ dependencies = [
 
 [[package]]
 name = "sync_lib"
-version = "0.1.5"
+version = "0.1.6"
 dependencies = [
  "base64 0.22.1",
  "console_error_panic_hook",
@@ -2393,7 +2393,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.1.5"
+version = "0.1.6"
 dependencies = [
  "aide",
  "aide-axum-typed-multipart",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 7e728911..0c7fc3b9 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -12,7 +12,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.1.5"
+version = "0.1.6"
 
 [workspace.dependencies]  
 serde = { version = "1.0.214", default-features = false, features = ["derive"] }
diff --git a/frontend/obsidian-plugin/manifest.json b/frontend/obsidian-plugin/manifest.json
index 11102ee1..0ad753f6 100644
--- a/frontend/obsidian-plugin/manifest.json
+++ b/frontend/obsidian-plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.1.5",
+	"version": "0.1.6",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index bd267393..31134290 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.1.5",
+	"version": "0.1.6",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 037bd9d4..06cf875b 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -21,7 +21,7 @@
 		},
 		"../backend/sync_lib/pkg": {
 			"name": "sync_lib",
-			"version": "0.1.5",
+			"version": "0.1.6",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -6720,7 +6720,7 @@
 		},
 		"obsidian-plugin": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.1.5",
+			"version": "0.1.6",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
@@ -6748,7 +6748,7 @@
 			}
 		},
 		"sync-client": {
-			"version": "0.1.5",
+			"version": "0.1.6",
 			"dependencies": {
 				"byte-base64": "^1.1.0",
 				"openapi-fetch": "0.13.5",
@@ -6771,7 +6771,7 @@
 			}
 		},
 		"test-client": {
-			"version": "0.1.5",
+			"version": "0.1.6",
 			"bin": {
 				"test-client": "dist/cli.js"
 			},
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index 826e7e94..8ad133c0 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "sync-client",
-	"version": "0.1.5",
+	"version": "0.1.6",
 	"main": "dist/sync-client.node.js",
 	"browser": "dist/sync-client.web.js",
 	"types": "dist/types/index.d.ts",
@@ -32,4 +32,4 @@
 		"webpack-merge": "^6.0.1",
 		"sync_lib": "file:../../backend/sync_lib/pkg"
 	}
-}
\ No newline at end of file
+}
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index 2d9dc7c7..7277f73b 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "test-client",
-	"version": "0.1.5",
+	"version": "0.1.6",
 	"private": true,
 	"bin": {
 		"test-client": "./dist/cli.js"
diff --git a/manifest.json b/manifest.json
index 11102ee1..0ad753f6 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.1.5",
+	"version": "0.1.6",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",

From 792097060bd5a6dfeb228868f55c1ca19aa10e1c Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Mar 2025 14:12:45 +0000
Subject: [PATCH 334/761] Add utils folder

---
 scripts/e2e.sh                         | 2 +-
 scripts/update-api-types.sh            | 4 ++++
 scripts/{ => utils}/wait-for-server.sh | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)
 rename scripts/{ => utils}/wait-for-server.sh (98%)

diff --git a/scripts/e2e.sh b/scripts/e2e.sh
index d361ae34..149d76f9 100755
--- a/scripts/e2e.sh
+++ b/scripts/e2e.sh
@@ -17,7 +17,7 @@ mkdir -p logs
 cd frontend
 npm run build
 
-../scripts/wait-for-server.sh
+../scripts/utils/wait-for-server.sh
 
 pids=()
 for i in $(seq 1 $process_count); do
diff --git a/scripts/update-api-types.sh b/scripts/update-api-types.sh
index 0827f9a8..d9f39566 100755
--- a/scripts/update-api-types.sh
+++ b/scripts/update-api-types.sh
@@ -1,4 +1,8 @@
 #!/bin/bash
 
+set -e
+
+./scripts/utils/wait-for-server.sh
+
 npm install -g openapi-typescript
 openapi-typescript http://localhost:3000/api.json --output frontend/sync-client/src/services/types.ts
diff --git a/scripts/wait-for-server.sh b/scripts/utils/wait-for-server.sh
similarity index 98%
rename from scripts/wait-for-server.sh
rename to scripts/utils/wait-for-server.sh
index fa7f02bd..7824c405 100755
--- a/scripts/wait-for-server.sh
+++ b/scripts/utils/wait-for-server.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 SERVER_URL="http://localhost:3000"
 MAX_RETRIES=30
 RETRY_INTERVAL_IN_SECONDS=5

From 84566c1b5549ac02ecc9bce82d98627b48dfdc93 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Mar 2025 14:41:20 +0000
Subject: [PATCH 335/761] Improve CI

---
 .github/workflows/check.yml          |  5 ++---
 .github/workflows/e2e.yml            | 12 +++++++++++-
 .github/workflows/publish-docker.yml | 29 +++++++++++++---------------
 3 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 5acccc1f..f5fe73d7 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -25,7 +25,7 @@ jobs:
 
       - name: Setup rust
         run: |
-          cargo install sqlx-cli
+          cargo install sqlx-cli wasm-pack
           cd backend
           sqlx database create --database-url sqlite://db.sqlite3
           sqlx migrate run --source sync_server/src/database/migrations --database-url sqlite://db.sqlite3
@@ -33,7 +33,6 @@ jobs:
       - name: Build wasm
         run: |
           cd backend
-          cargo install wasm-pack
           wasm-pack build --target web sync_lib
 
       - name: Lint backend
@@ -57,7 +56,7 @@ jobs:
           npm run lint
           if [[ $(git status --porcelain) ]]; then
               git status --porcelain
-              echo "Failing CI because the working directory is not clean after linting."
+              echo "Failing CI because the working directory is not clean after linting"
               exit 1
           fi
 
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index dd2fe5d9..0f21ed65 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -39,7 +39,17 @@ jobs:
         run: |
           cd backend
           RUST_BACKTRACE=1 cargo run -p sync_server &
-          cd ../frontend
+          cd ..
+
+          scripts/update-api-types.sh
+          cd frontend
           npm ci
+          npm run lint
+          if [[ $(git status --porcelain) ]]; then
+              git status --porcelain
+              echo "Failing CI because the working directory is not clean after updating the API types"
+              exit 1
+          fi
+
           cd ..
           scripts/e2e.sh 32
diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml
index 7c6d0b13..d51e485b 100644
--- a/.github/workflows/publish-docker.yml
+++ b/.github/workflows/publish-docker.yml
@@ -1,14 +1,11 @@
 name: Publish server Docker image
 
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-
 on:
   push:
-    tags:
-      - "*"
+    branches: ["master"]
+    tags: ["*"]
+  pull_request:
+    branches: ["master"]
 
 env:
   # Use docker.io for Docker Hub if empty
@@ -24,7 +21,7 @@ jobs:
       contents: read
       packages: write
       # This is used to complete the identity challenge
-      # with sigstore/fulcio when running outside of PRs.
+      # with sigstore/fulcio.
       id-token: write
 
     steps:
@@ -37,10 +34,10 @@ jobs:
           echo "github.ref_type: ${{ github.ref_type }}"
           echo "github.event_name: ${{ github.event_name }}"
 
-      # Install the cosign tool except on PR
+      # Install the cosign tool
       # https://github.com/sigstore/cosign-installer
       - name: Install cosign
-        if: github.event_name != 'pull_request'
+        if: github.ref_type == 'tag'
         uses: sigstore/cosign-installer@59acb6260d9c0ba8f4a2f9d9b48431a222b68e20 #v3.5.0
         with:
           cosign-release: "v2.2.4"
@@ -51,10 +48,10 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0
 
-      # Login against a Docker registry except on PR
+      # Login against a Docker registry
       # https://github.com/docker/login-action
       - name: Log into registry ${{ env.REGISTRY }}
-        if: github.event_name != 'pull_request'
+        if: github.ref_type == 'tag'
         uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
         with:
           registry: ${{ env.REGISTRY }}
@@ -69,26 +66,26 @@ jobs:
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
 
-      # Build and push Docker image with Buildx (don't push on PR)
+      # Build and push Docker image with Buildx
       # https://github.com/docker/build-push-action
       - name: Build and push Docker image
         id: build-and-push
         uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
         with:
           context: backend
-          push: ${{ github.event_name != 'pull_request' }}
+          push: ${{ github.ref_type == 'tag' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
 
-      # Sign the resulting Docker image digest except on PRs.
+      # Sign the resulting Docker image digest.
       # This will only write to the public Rekor transparency log when the Docker
       # repository is public to avoid leaking data. If you would like to publish
       # transparency data even for private images, pass --force to cosign below.
       # https://github.com/sigstore/cosign
       - name: Sign the published Docker image
-        if: ${{ github.event_name != 'pull_request' }}
+        if: ${{ github.ref_type == 'tag' }}
         env:
           # https://docs.github.com/en/actions/security-guides/security-hardening-for-github-actions#using-an-intermediate-environment-variable
           TAGS: ${{ steps.meta.outputs.tags }}

From da369e61e702a3c2fa51043a0e73c93dd39d7566 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Mar 2025 14:49:39 +0000
Subject: [PATCH 336/761] Fix E2E

---
 .github/workflows/e2e.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 0f21ed65..c5f6c645 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -44,6 +44,7 @@ jobs:
           scripts/update-api-types.sh
           cd frontend
           npm ci
+          npm run build
           npm run lint
           if [[ $(git status --porcelain) ]]; then
               git status --porcelain

From acbc0c0e654ea360f73b0161a2a31526de2b8801 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Mar 2025 15:38:23 +0000
Subject: [PATCH 337/761] Improve server config setting section

---
 frontend/obsidian-plugin/src/styles.scss      |   6 +-
 .../obsidian-plugin/src/views/settings-tab.ts | 218 ++++++++++++------
 .../sync-client/src/persistence/settings.ts   |  15 +-
 frontend/sync-client/src/sync-client.ts       |   4 +
 4 files changed, 163 insertions(+), 80 deletions(-)

diff --git a/frontend/obsidian-plugin/src/styles.scss b/frontend/obsidian-plugin/src/styles.scss
index 47513337..31858f0e 100644
--- a/frontend/obsidian-plugin/src/styles.scss
+++ b/frontend/obsidian-plugin/src/styles.scss
@@ -63,9 +63,13 @@
 		cursor: pointer;
 	}
 
+	input[type="text"],
+	textarea {
+		width: 250px;
+	}
+
 	textarea {
 		resize: none;
-		width: 100%;
 		height: 60px;
 	}
 }
diff --git a/frontend/obsidian-plugin/src/views/settings-tab.ts b/frontend/obsidian-plugin/src/views/settings-tab.ts
index 29e0b820..7eca7cc1 100644
--- a/frontend/obsidian-plugin/src/views/settings-tab.ts
+++ b/frontend/obsidian-plugin/src/views/settings-tab.ts
@@ -1,14 +1,14 @@
 import type { App } from "obsidian";
 import { Notice, PluginSettingTab, Setting } from "obsidian";
-
 import type VaultLinkPlugin from "../vault-link-plugin";
 import type { StatusDescription } from "./status-description";
 import { LogsView } from "./logs-view";
 import { HistoryView } from "./history-view";
-import type { SyncClient } from "sync-client";
-import { LogLevel } from "sync-client";
+import type { SyncClient, SyncSettings } from "sync-client";
 
 export class SyncSettingsTab extends PluginSettingTab {
+	private editedServerUri: string;
+	private editedToken: string;
 	private editedVaultName: string;
 
 	private readonly plugin: VaultLinkPlugin;
@@ -32,11 +32,30 @@ export class SyncSettingsTab extends PluginSettingTab {
 		this.syncClient = syncClient;
 		this.statusDescription = statusDescription;
 
+		this.editedServerUri = this.syncClient.getSettings().remoteUri;
+		this.editedToken = this.syncClient.getSettings().token;
 		this.editedVaultName = this.syncClient.getSettings().vaultName;
+
 		this.syncClient.addOnSettingsChangeListener(
 			(newSettings, oldSettings) => {
+				let hasChanged = false;
+
+				if (newSettings.remoteUri !== oldSettings.remoteUri) {
+					this.editedServerUri = newSettings.remoteUri;
+					hasChanged = true;
+				}
+
+				if (newSettings.token !== oldSettings.token) {
+					this.editedToken = newSettings.token;
+					hasChanged = true;
+				}
+
 				if (newSettings.vaultName !== oldSettings.vaultName) {
 					this.editedVaultName = newSettings.vaultName;
+					hasChanged = true;
+				}
+
+				if (hasChanged) {
 					this.display();
 				}
 			}
@@ -112,8 +131,13 @@ export class SyncSettingsTab extends PluginSettingTab {
 	private renderConnectionSettings(containerEl: HTMLElement): void {
 		containerEl.createEl("h3", { text: "Connection" });
 
+		const [title, updateTitle] = this.unsavedAwareSettingName(
+			"Server address",
+			"remoteUri"
+		);
+
 		new Setting(containerEl)
-			.setName("Server address")
+			.setName(title)
 			.setDesc(
 				"Your VaultLink server's URL including the protocol and full path."
 			)
@@ -121,10 +145,76 @@ export class SyncSettingsTab extends PluginSettingTab {
 			.addText((text) =>
 				text
 					.setPlaceholder("https://example.com:3000")
-					.setValue(this.syncClient.getSettings().remoteUri)
-					.onChange(async (value) =>
-						this.syncClient.setSetting("remoteUri", value)
-					)
+					.setValue(this.editedServerUri)
+					.onChange((value) => {
+						this.editedServerUri = value;
+						updateTitle(value);
+					})
+			);
+
+		const [tokenTitle, updateTokenTitle] = this.unsavedAwareSettingName(
+			"Access token",
+			"token"
+		);
+
+		new Setting(containerEl)
+			.setName(tokenTitle)
+			.setClass("sync-settings-access-token")
+			.setDesc(
+				"Set the access token for the server that you can get from the server"
+			)
+			.setTooltip("todo, links to dcocs")
+			.addTextArea((text) =>
+				text
+					.setPlaceholder("ey...")
+					.setValue(this.editedToken)
+					.onChange((value) => {
+						this.editedToken = value;
+						updateTokenTitle(value);
+					})
+			);
+
+		const [vaultNameTitle, updateVaultNameTitle] =
+			this.unsavedAwareSettingName("Vault name", "vaultName");
+
+		new Setting(containerEl)
+			.setName(vaultNameTitle)
+			.setDesc(
+				"Set the name of the remote vault that you want to sync with"
+			)
+			.setTooltip("todo, links to dcocs")
+			.addText((text) =>
+				text
+					.setPlaceholder("My Obsidian Vault")
+					.setValue(this.editedVaultName)
+					.onChange((value) => {
+						this.editedVaultName = value;
+						updateVaultNameTitle(value);
+					})
+			);
+
+		new Setting(containerEl)
+			.addButton((button) =>
+				button.setButtonText("Apply").onClick(async () => {
+					if (
+						this.editedVaultName !==
+							this.syncClient.getSettings().vaultName ||
+						this.editedServerUri !==
+							this.syncClient.getSettings().remoteUri ||
+						this.editedToken !== this.syncClient.getSettings().token
+					) {
+						await this.syncClient.setSettings({
+							vaultName: this.editedVaultName,
+							remoteUri: this.editedServerUri,
+							token: this.editedToken
+						});
+						new Notice(
+							"The changes have been applied successfully!"
+						);
+					} else {
+						new Notice("No changes to apply");
+					}
+				})
 			)
 			.addButton((button) =>
 				button.setButtonText("Test connection").onClick(async () => {
@@ -134,69 +224,25 @@ export class SyncSettingsTab extends PluginSettingTab {
 					await this.statusDescription.updateConnectionState();
 				})
 			);
-
-		new Setting(containerEl)
-			.setName("Access token")
-			.setClass("sync-settings-access-token")
-			.setDesc(
-				"Set the access token for the server that you can get from the server"
-			)
-			.setTooltip("todo, links to dcocs")
-			.addTextArea((text) =>
-				text
-					.setPlaceholder("ey...")
-					.setValue(this.syncClient.getSettings().token)
-					.onChange(async (value) =>
-						this.syncClient.setSetting("token", value)
-					)
-			);
-
-		new Setting(containerEl)
-			.setName("Vault name")
-			.setDesc(
-				"Set the name of the remote vault that you want to sync with"
-			)
-			.setTooltip("todo, links to dcocs")
-			.addText((text) =>
-				text
-					.setPlaceholder("My Obsidian Vault")
-					.setValue(this.syncClient.getSettings().vaultName)
-					.onChange((value) => (this.editedVaultName = value))
-			)
-			.addButton((button) =>
-				button.setButtonText("Apply").onClick(async () => {
-					if (
-						this.editedVaultName ===
-						this.syncClient.getSettings().vaultName
-					) {
-						return;
-					}
-					await this.syncClient.setSetting(
-						"vaultName",
-						this.editedVaultName
-					);
-					new Notice(
-						"Sync state has been reset, you will need to resync"
-					);
-				})
-			);
 	}
 
 	private renderSyncSettings(containerEl: HTMLElement): void {
 		containerEl.createEl("h3", { text: "Sync" });
 
 		new Setting(containerEl)
-			.setName("Danger zone")
+			.setName("Enable sync")
 			.setDesc(
-				"How many concurrent sync operations to run. Setting this value higher may increase the overall performance, however, it will require more memory as well. If you notice frequent crashes, especially on mobile, set this to 1."
+				"Enable pulling and pushing changes to the remote server. The first time it's enabled, or after the sync state has been reset, all local files will be pushed to the server."
 			)
-			.addButton((button) =>
-				button.setButtonText("Reset sync state").onClick(async () => {
-					await this.syncClient.reset();
-					new Notice(
-						"Sync state has been reset, you will need to resync"
-					);
-				})
+			.setTooltip(
+				"Enable pulling and pushing changes to the remote server."
+			)
+			.addToggle((toggle) =>
+				toggle
+					.setValue(this.syncClient.getSettings().isSyncEnabled)
+					.onChange(async (value) =>
+						this.syncClient.setSetting("isSyncEnabled", value)
+					)
 			);
 
 		new Setting(containerEl)
@@ -255,19 +301,17 @@ export class SyncSettingsTab extends PluginSettingTab {
 			);
 
 		new Setting(containerEl)
-			.setName("Enable sync")
+			.setName("Danger zone")
 			.setDesc(
-				"Enable pulling and pushing changes to the remote server. The first time it's enabled, or after the sync state has been reset, all local files will be pushed to the server."
+				"How many concurrent sync operations to run. Setting this value higher may increase the overall performance, however, it will require more memory as well. If you notice frequent crashes, especially on mobile, set this to 1."
 			)
-			.setTooltip(
-				"Enable pulling and pushing changes to the remote server."
-			)
-			.addToggle((toggle) =>
-				toggle
-					.setValue(this.syncClient.getSettings().isSyncEnabled)
-					.onChange(async (value) =>
-						this.syncClient.setSetting("isSyncEnabled", value)
-					)
+			.addButton((button) =>
+				button.setButtonText("Reset sync state").onClick(async () => {
+					await this.syncClient.reset();
+					new Notice(
+						"Sync state has been reset, you will need to resync"
+					);
+				})
 			);
 	}
 
@@ -287,4 +331,30 @@ export class SyncSettingsTab extends PluginSettingTab {
 			);
 		}
 	}
+
+	private unsavedAwareSettingName(
+		name: string,
+		settingName: keyof SyncSettings
+	): [
+		DocumentFragment,
+		(newValue: SyncSettings[keyof SyncSettings]) => void
+	] {
+		const titleContainer = document.createDocumentFragment();
+		const title = titleContainer.createEl("div", {
+			text: name,
+			cls: "setting-item-name"
+		});
+
+		const updateTitle = (
+			currentValue: SyncSettings[keyof SyncSettings]
+		): void => {
+			title.innerText = `${name}${
+				currentValue !== this.syncClient.getSettings()[settingName]
+					? " (unsaved)"
+					: ""
+			}`;
+		};
+
+		return [titleContainer, updateTitle];
+	}
 }
diff --git a/frontend/sync-client/src/persistence/settings.ts b/frontend/sync-client/src/persistence/settings.ts
index 8233ddfe..b951930d 100644
--- a/frontend/sync-client/src/persistence/settings.ts
+++ b/frontend/sync-client/src/persistence/settings.ts
@@ -58,16 +58,21 @@ export class Settings {
 		key: T,
 		value: SyncSettings[T]
 	): Promise<void> {
-		const newSettings = { ...this.settings, [key]: value };
 		this.logger.debug(`Setting '${key}' to '${value}'`);
-		await this.setSettings(newSettings);
+		await this.setSettings({
+			[key]: value
+		});
 	}
 
-	private async setSettings(value: SyncSettings): Promise<void> {
+	public async setSettings(value: Partial<SyncSettings>): Promise<void> {
 		const oldSettings = this.settings;
-		this.settings = value;
+		this.settings = {
+			...this.settings,
+			...value
+		};
+
 		this.onSettingsChangeHandlers.forEach((handler) => {
-			handler(value, oldSettings);
+			handler(this.settings, oldSettings);
 		});
 		await this.save();
 	}
diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts
index 37afb1d1..b07a1692 100644
--- a/frontend/sync-client/src/sync-client.ts
+++ b/frontend/sync-client/src/sync-client.ts
@@ -191,6 +191,10 @@ export class SyncClient {
 		await this.settings.setSetting(key, value);
 	}
 
+	public async setSettings(value: Partial<SyncSettings>): Promise<void> {
+		await this.settings.setSettings(value);
+	}
+
 	public addOnSettingsChangeListener(
 		handler: (settings: SyncSettings, oldSettings: SyncSettings) => void
 	): void {

From 80ad81f872de847ec314282d5ae2bffd186fae3c Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Mar 2025 15:38:28 +0000
Subject: [PATCH 338/761] Fix volumes

---
 backend/Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/backend/Dockerfile b/backend/Dockerfile
index 24388c7f..ac0cee79 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -21,9 +21,8 @@ RUN apk add --no-cache curl
 
 COPY --from=builder /usr/src/backend/target/x86_64-unknown-linux-musl/release/sync_server /app/sync_server
 
-VOLUME /data/databases
+VOLUME /data
 EXPOSE 3000/tcp
-
 WORKDIR /data
 
 HEALTHCHECK \

From c7e53bff262d60e271957813b5703874a5c4f11b Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Mar 2025 16:15:33 +0000
Subject: [PATCH 339/761] Hoist retry logic

---
 .../obsidian-plugin/src/views/settings-tab.ts |   1 +
 .../src/services/connection-status.ts         |  70 ++--
 .../sync-client/src/services/sync-service.ts  | 335 ++++++++++--------
 .../sync-operations/unrestricted-syncer.ts    |   6 +-
 4 files changed, 219 insertions(+), 193 deletions(-)

diff --git a/frontend/obsidian-plugin/src/views/settings-tab.ts b/frontend/obsidian-plugin/src/views/settings-tab.ts
index 7eca7cc1..24fcf8d0 100644
--- a/frontend/obsidian-plugin/src/views/settings-tab.ts
+++ b/frontend/obsidian-plugin/src/views/settings-tab.ts
@@ -211,6 +211,7 @@ export class SyncSettingsTab extends PluginSettingTab {
 						new Notice(
 							"The changes have been applied successfully!"
 						);
+						await this.statusDescription.updateConnectionState();
 					} else {
 						new Notice("No changes to apply");
 					}
diff --git a/frontend/sync-client/src/services/connection-status.ts b/frontend/sync-client/src/services/connection-status.ts
index 2d34ee89..5a804cf1 100644
--- a/frontend/sync-client/src/services/connection-status.ts
+++ b/frontend/sync-client/src/services/connection-status.ts
@@ -39,65 +39,53 @@ export class ConnectionStatus {
 		return input.url;
 	}
 
-	public getFetchImplementation(
-		fetch: typeof globalThis.fetch,
-		{ doRetries = true }: { doRetries: boolean } = { doRetries: true }
-	): typeof globalThis.fetch {
-		return doRetries ? this.retriedFetchFactory(this.logger, fetch) : fetch;
-	}
-
 	public reset(): void {
 		this.rejectUntil(new Error("Sync was reset"));
 		[this.until, this.resolveUntil, this.rejectUntil] = createPromise();
 	}
 
-	private retriedFetchFactory(
+	public getFetchImplementation(
 		logger: Logger,
 		fetch: typeof globalThis.fetch = globalThis.fetch
 	): typeof globalThis.fetch {
 		return async (input: RequestInfo | URL): Promise<Response> => {
-			// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-			while (true) {
-				while (!this.canFetch) {
-					await this.until;
-				}
+			while (!this.canFetch) {
+				await this.until;
+			}
 
-				try {
-					// https://github.com/jonbern/fetch-retry/blob/8684ef4e688375f623bd76f13add76dbc1d67cfb/index.js#L67C1-L70C21
-					const _input =
-						typeof Request !== "undefined" &&
-						input instanceof Request
-							? input.clone()
-							: input;
+			try {
+				// https://github.com/jonbern/fetch-retry/blob/8684ef4e688375f623bd76f13add76dbc1d67cfb/index.js#L67C1-L70C21
+				const _input =
+					typeof Request !== "undefined" && input instanceof Request
+						? input.clone()
+						: input;
 
-					const fetchPromise = fetch(_input);
+				const fetchPromise = fetch(_input);
 
-					// We only want to catch rejections from `this.until`
-					let result: symbol | Response | undefined = undefined;
-					do {
-						result = await Promise.race([this.until, fetchPromise]);
-					} while (result === ConnectionStatus.UNTIL_RESOLUTION);
+				// We only want to catch rejections from `this.until`
+				let result: symbol | Response | undefined = undefined;
+				do {
+					result = await Promise.race([this.until, fetchPromise]);
+				} while (result === ConnectionStatus.UNTIL_RESOLUTION);
 
-					const fetchResult: Response = result as Response; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+				const fetchResult: Response = result as Response; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
 
-					if (!fetchResult.ok) {
-						this.logger.warn(
-							`Retrying fetch for ${ConnectionStatus.getUrlFromInput(
-								input
-							)}, got status ${fetchResult.status}`
-						);
-					}
-
-					return fetchResult;
-				} catch (error) {
-					logger.warn(
-						`Retrying fetch for ${ConnectionStatus.getUrlFromInput(
+				if (!fetchResult.ok) {
+					this.logger.warn(
+						`Fetch for ${ConnectionStatus.getUrlFromInput(
 							input
-						)}, got error: ${error}`
+						)}, got status ${fetchResult.status}`
 					);
 				}
 
-				await Promise.race([this.until, sleep(1000)]);
+				return fetchResult;
+			} catch (error) {
+				logger.warn(
+					`Fetch for ${ConnectionStatus.getUrlFromInput(
+						input
+					)}, got error: ${error}`
+				);
+				throw error;
 			}
 		};
 	}
diff --git a/frontend/sync-client/src/services/sync-service.ts b/frontend/sync-client/src/services/sync-service.ts
index 53cb4d59..3c2a3bd5 100644
--- a/frontend/sync-client/src/services/sync-service.ts
+++ b/frontend/sync-client/src/services/sync-service.ts
@@ -9,6 +9,7 @@ import type {
 import type { Logger } from "../tracing/logger";
 import type { Settings } from "../persistence/settings";
 import type { ConnectionStatus } from "./connection-status";
+import { sleep } from "../utils/sleep";
 
 export interface CheckConnectionResult {
 	isSuccessful: boolean;
@@ -16,8 +17,8 @@ export interface CheckConnectionResult {
 }
 
 export class SyncService {
-	private client!: Client<paths>;
-	private clientWithoutRetries!: Client<paths>;
+	private client: Client<paths>;
+	private pingClient: Client<paths>;
 	private _fetchImplementation: typeof globalThis.fetch = globalThis.fetch;
 
 	public constructor(
@@ -25,20 +26,26 @@ export class SyncService {
 		private readonly settings: Settings,
 		private readonly logger: Logger
 	) {
-		this.createClient(this.settings.getSettings().remoteUri);
+		[this.client, this.pingClient] = this.createClient(
+			this.settings.getSettings().remoteUri
+		);
 
 		settings.addOnSettingsChangeListener((newSettings, oldSettings) => {
 			if (newSettings.remoteUri === oldSettings.remoteUri) {
 				return;
 			}
 
-			this.createClient(newSettings.remoteUri);
+			[this.client, this.pingClient] = this.createClient(
+				newSettings.remoteUri
+			);
 		});
 	}
 
 	public set fetchImplementation(fetch: typeof globalThis.fetch) {
 		this._fetchImplementation = fetch;
-		this.createClient(this.settings.getSettings().remoteUri);
+		[this.client, this.pingClient] = this.createClient(
+			this.settings.getSettings().remoteUri
+		);
 	}
 
 	private static formatError(
@@ -62,42 +69,44 @@ export class SyncService {
 		relativePath: RelativePath;
 		contentBytes: Uint8Array;
 	}): Promise<components["schemas"]["DocumentVersionWithoutContent"]> {
-		const formData = new FormData();
-		if (documentId !== undefined) {
-			formData.append("document_id", documentId);
-		}
-		formData.append("relative_path", relativePath);
-		formData.append("content", new Blob([contentBytes]));
-
-		const response = await this.client.POST(
-			"/vaults/{vault_id}/documents",
-			{
-				params: {
-					path: {
-						vault_id: this.settings.getSettings().vaultName
-					},
-					header: {
-						authorization: `Bearer ${this.settings.getSettings().token}`
-					}
-				},
-				// eslint-disable-next-line
-				body: formData as any // FormData is not supported by openapi-fetch
+		return this.withRetries(async () => {
+			const formData = new FormData();
+			if (documentId !== undefined) {
+				formData.append("document_id", documentId);
 			}
-		);
+			formData.append("relative_path", relativePath);
+			formData.append("content", new Blob([contentBytes]));
 
-		if (!response.data) {
-			throw new Error(
-				`Failed to create document: ${SyncService.formatError(response.error)}`
+			const response = await this.client.POST(
+				"/vaults/{vault_id}/documents",
+				{
+					params: {
+						path: {
+							vault_id: this.settings.getSettings().vaultName
+						},
+						header: {
+							authorization: `Bearer ${this.settings.getSettings().token}`
+						}
+					},
+					// eslint-disable-next-line
+					body: formData as any // FormData is not supported by openapi-fetch
+				}
 			);
-		}
 
-		this.logger.debug(
-			`Created document ${JSON.stringify(response.data)} with id ${
-				response.data.documentId
-			}`
-		);
+			if (!response.data) {
+				throw new Error(
+					`Failed to create document: ${SyncService.formatError(response.error)}`
+				);
+			}
 
-		return response.data;
+			this.logger.debug(
+				`Created document ${JSON.stringify(response.data)} with id ${
+					response.data.documentId
+				}`
+			);
+
+			return response.data;
+		});
 	}
 
 	public async put({
@@ -111,44 +120,46 @@ export class SyncService {
 		relativePath: RelativePath;
 		contentBytes: Uint8Array;
 	}): Promise<components["schemas"]["DocumentUpdateResponse"]> {
-		this.logger.debug(
-			`Updating document ${documentId} with parent version ${parentVersionId} and relative path ${relativePath}`
-		);
-		const formData = new FormData();
-		formData.append("parent_version_id", parentVersionId.toString());
-		formData.append("relative_path", relativePath);
-		formData.append("content", new Blob([contentBytes]));
-
-		const response = await this.client.PUT(
-			"/vaults/{vault_id}/documents/{document_id}",
-			{
-				params: {
-					path: {
-						vault_id: this.settings.getSettings().vaultName,
-						document_id: documentId
-					},
-					header: {
-						authorization: `Bearer ${this.settings.getSettings().token}`
-					}
-				},
-				// eslint-disable-next-line
-				body: formData as any // FormData is not supported by openapi-fetch
-			}
-		);
-
-		if (!response.data) {
-			throw new Error(
-				`Failed to update document: ${SyncService.formatError(response.error)}`
+		return this.withRetries(async () => {
+			this.logger.debug(
+				`Updating document ${documentId} with parent version ${parentVersionId} and relative path ${relativePath}`
 			);
-		}
+			const formData = new FormData();
+			formData.append("parent_version_id", parentVersionId.toString());
+			formData.append("relative_path", relativePath);
+			formData.append("content", new Blob([contentBytes]));
 
-		this.logger.debug(
-			`Updated document ${JSON.stringify(response.data)} with id ${
-				response.data.documentId
-			}`
-		);
+			const response = await this.client.PUT(
+				"/vaults/{vault_id}/documents/{document_id}",
+				{
+					params: {
+						path: {
+							vault_id: this.settings.getSettings().vaultName,
+							document_id: documentId
+						},
+						header: {
+							authorization: `Bearer ${this.settings.getSettings().token}`
+						}
+					},
+					// eslint-disable-next-line
+					body: formData as any // FormData is not supported by openapi-fetch
+				}
+			);
 
-		return response.data;
+			if (!response.data) {
+				throw new Error(
+					`Failed to update document: ${SyncService.formatError(response.error)}`
+				);
+			}
+
+			this.logger.debug(
+				`Updated document ${JSON.stringify(response.data)} with id ${
+					response.data.documentId
+				}`
+			);
+
+			return response.data;
+		});
 	}
 
 	public async delete({
@@ -158,33 +169,35 @@ export class SyncService {
 		documentId: DocumentId;
 		relativePath: RelativePath;
 	}): Promise<components["schemas"]["DocumentVersionWithoutContent"]> {
-		const response = await this.client.DELETE(
-			"/vaults/{vault_id}/documents/{document_id}",
-			{
-				params: {
-					path: {
-						vault_id: this.settings.getSettings().vaultName,
-						document_id: documentId
+		return this.withRetries(async () => {
+			const response = await this.client.DELETE(
+				"/vaults/{vault_id}/documents/{document_id}",
+				{
+					params: {
+						path: {
+							vault_id: this.settings.getSettings().vaultName,
+							document_id: documentId
+						},
+						header: {
+							authorization: `Bearer ${this.settings.getSettings().token}`
+						}
 					},
-					header: {
-						authorization: `Bearer ${this.settings.getSettings().token}`
+					body: {
+						relativePath
 					}
-				},
-				body: {
-					relativePath
 				}
+			);
+
+			if (response.error) {
+				throw new Error(`Failed to delete document`);
 			}
-		);
 
-		if (response.error) {
-			throw new Error(`Failed to delete document`);
-		}
+			this.logger.debug(
+				`Deleted document ${relativePath} with id ${documentId}`
+			);
 
-		this.logger.debug(
-			`Deleted document ${relativePath} with id ${documentId}`
-		);
-
-		return response.data;
+			return response.data;
+		});
 	}
 
 	public async get({
@@ -192,63 +205,70 @@ export class SyncService {
 	}: {
 		documentId: DocumentId;
 	}): Promise<components["schemas"]["DocumentVersion"]> {
-		const response = await this.client.GET(
-			"/vaults/{vault_id}/documents/{document_id}",
-			{
-				params: {
-					path: {
-						vault_id: this.settings.getSettings().vaultName,
-						document_id: documentId
-					},
-					header: {
-						authorization: `Bearer ${this.settings.getSettings().token}`
+		return this.withRetries(async () => {
+			const response = await this.client.GET(
+				"/vaults/{vault_id}/documents/{document_id}",
+				{
+					params: {
+						path: {
+							vault_id: this.settings.getSettings().vaultName,
+							document_id: documentId
+						},
+						header: {
+							authorization: `Bearer ${this.settings.getSettings().token}`
+						}
 					}
 				}
-			}
-		);
-
-		if (!response.data) {
-			throw new Error(
-				`Failed to get document: ${SyncService.formatError(response.error)}`
 			);
-		}
 
-		this.logger.debug(
-			`Get document ${response.data.relativePath} with id ${response.data.documentId}`
-		);
+			if (!response.data) {
+				throw new Error(
+					`Failed to get document: ${SyncService.formatError(response.error)}`
+				);
+			}
 
-		return response.data;
+			this.logger.debug(
+				`Get document ${response.data.relativePath} with id ${response.data.documentId}`
+			);
+
+			return response.data;
+		});
 	}
 
 	public async getAll(
 		since?: VaultUpdateId
 	): Promise<components["schemas"]["FetchLatestDocumentsResponse"]> {
-		const response = await this.client.GET("/vaults/{vault_id}/documents", {
-			params: {
-				path: {
-					vault_id: this.settings.getSettings().vaultName
-				},
-				header: {
-					authorization: `Bearer ${this.settings.getSettings().token}`
-				},
-				query: {
-					since_update_id: since
+		return this.withRetries(async () => {
+			const response = await this.client.GET(
+				"/vaults/{vault_id}/documents",
+				{
+					params: {
+						path: {
+							vault_id: this.settings.getSettings().vaultName
+						},
+						header: {
+							authorization: `Bearer ${this.settings.getSettings().token}`
+						},
+						query: {
+							since_update_id: since
+						}
+					}
 				}
-			}
-		});
-
-		const { error } = response;
-		if (error) {
-			throw new Error(
-				`Failed to get documents: ${SyncService.formatError(response.error)}`
 			);
-		}
 
-		this.logger.debug(
-			`Got ${response.data.latestDocuments.length} document metadata`
-		);
+			const { error } = response;
+			if (error) {
+				throw new Error(
+					`Failed to get documents: ${SyncService.formatError(response.error)}`
+				);
+			}
 
-		return response.data;
+			this.logger.debug(
+				`Got ${response.data.latestDocuments.length} document metadata`
+			);
+
+			return response.data;
+		});
 	}
 
 	public async checkConnection(): Promise<CheckConnectionResult> {
@@ -273,8 +293,9 @@ export class SyncService {
 		}
 	}
 
+	// No retries
 	private async ping(): Promise<components["schemas"]["PingResponse"]> {
-		const response = await this.clientWithoutRetries.GET("/ping", {
+		const response = await this.pingClient.GET("/ping", {
 			params: {
 				header: {
 					authorization: `Bearer ${this.settings.getSettings().token}`
@@ -293,20 +314,34 @@ export class SyncService {
 		return response.data;
 	}
 
-	private createClient(remoteUri: string): void {
-		this.client = createClient<paths>({
-			baseUrl: remoteUri,
-			fetch: this.connectionStatus.getFetchImplementation(
-				this._fetchImplementation
-			)
-		});
+	/**
+	 * Create a client and a ping client for the given remote URI.
+	 */
+	private createClient(remoteUri: string): [Client<paths>, Client<paths>] {
+		return [
+			createClient<paths>({
+				baseUrl: remoteUri,
+				fetch: this.connectionStatus.getFetchImplementation(
+					this.logger,
+					this._fetchImplementation
+				)
+			}),
+			createClient<paths>({
+				baseUrl: remoteUri,
+				fetch: this._fetchImplementation
+			})
+		];
+	}
 
-		this.clientWithoutRetries = createClient<paths>({
-			baseUrl: remoteUri,
-			fetch: this.connectionStatus.getFetchImplementation(
-				this._fetchImplementation,
-				{ doRetries: false }
-			)
-		});
+	private async withRetries<T>(fn: () => Promise<T>): Promise<T> {
+		// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+		while (true) {
+			try {
+				return await fn();
+			} catch (e) {
+				this.logger.error(`Failed network call (${e}), retrying`);
+				await sleep(1000);
+			}
+		}
 	}
 }
diff --git a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
index 6b233af0..dffd35b8 100644
--- a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
+++ b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
@@ -177,7 +177,9 @@ export class UnrestrictedSyncer {
 				}
 
 				if (
-					document.metadata.parentVersionId >= response.vaultUpdateId
+					// `Syncer` creates fake local document metadata for all remote docs with invalid hashes. The parent IDs will likely match
+					// the latest versions so we still need to update the local versions to turn the fakes into real metadata.
+					document.metadata.parentVersionId > response.vaultUpdateId
 				) {
 					this.logger.debug(
 						`Document ${document.relativePath} is already more up to date than the fetched version`
@@ -281,7 +283,7 @@ export class UnrestrictedSyncer {
 						remoteVersion.vaultUpdateId
 					) {
 						this.logger.debug(
-							`Document ${remoteVersion.relativePath} is already more up to date than the fetched version`
+							`Document ${remoteVersion.relativePath} is already at least as up to date as the fetched version`
 						);
 						return;
 					}

From 092f9ad2bc1463efea90739edba82b72e5d01bcf Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Mar 2025 16:15:57 +0000
Subject: [PATCH 340/761] Update todos

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 771cb514..a101bfad 100644
--- a/README.md
+++ b/README.md
@@ -57,14 +57,14 @@ And to clean up the logs & database files, run `scripts/clean-up.sh`
 ## Todos
 
 - Don't show server traces on auth failure
+- vritual list for logs view
+
 - Better server logs
 - Allow setting config.yml path for server
-- Single apply button in settings
 - history tab for going back
-- vritual list for logs view
 - show cursors
 - use websocket
 - fix docker publish
 - add self-hosted runner protection
 - change default branch
-- split repo
\ No newline at end of file
+- split repo

From 21075cafb35f91332970b34dc66375c86f3f5b7a Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Mar 2025 16:16:03 +0000
Subject: [PATCH 341/761] Bump versions to 0.1.7

---
 backend/Cargo.lock                     | 6 +++---
 backend/Cargo.toml                     | 2 +-
 frontend/obsidian-plugin/manifest.json | 2 +-
 frontend/obsidian-plugin/package.json  | 2 +-
 frontend/package-lock.json             | 8 ++++----
 frontend/sync-client/package.json      | 2 +-
 frontend/test-client/package.json      | 2 +-
 manifest.json                          | 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index ee4c80f6..5a02c283 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1746,7 +1746,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile"
-version = "0.1.6"
+version = "0.1.7"
 dependencies = [
  "insta",
  "pretty_assertions",
@@ -2380,7 +2380,7 @@ dependencies = [
 
 [[package]]
 name = "sync_lib"
-version = "0.1.6"
+version = "0.1.7"
 dependencies = [
  "base64 0.22.1",
  "console_error_panic_hook",
@@ -2393,7 +2393,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.1.6"
+version = "0.1.7"
 dependencies = [
  "aide",
  "aide-axum-typed-multipart",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 0c7fc3b9..cc1d43cb 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -12,7 +12,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.1.6"
+version = "0.1.7"
 
 [workspace.dependencies]  
 serde = { version = "1.0.214", default-features = false, features = ["derive"] }
diff --git a/frontend/obsidian-plugin/manifest.json b/frontend/obsidian-plugin/manifest.json
index 0ad753f6..93bda4cc 100644
--- a/frontend/obsidian-plugin/manifest.json
+++ b/frontend/obsidian-plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.1.6",
+	"version": "0.1.7",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index 31134290..3f11d5fe 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.1.6",
+	"version": "0.1.7",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 06cf875b..441b53de 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -21,7 +21,7 @@
 		},
 		"../backend/sync_lib/pkg": {
 			"name": "sync_lib",
-			"version": "0.1.6",
+			"version": "0.1.7",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -6720,7 +6720,7 @@
 		},
 		"obsidian-plugin": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.1.6",
+			"version": "0.1.7",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
@@ -6748,7 +6748,7 @@
 			}
 		},
 		"sync-client": {
-			"version": "0.1.6",
+			"version": "0.1.7",
 			"dependencies": {
 				"byte-base64": "^1.1.0",
 				"openapi-fetch": "0.13.5",
@@ -6771,7 +6771,7 @@
 			}
 		},
 		"test-client": {
-			"version": "0.1.6",
+			"version": "0.1.7",
 			"bin": {
 				"test-client": "dist/cli.js"
 			},
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index 8ad133c0..b4d74f0d 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "sync-client",
-	"version": "0.1.6",
+	"version": "0.1.7",
 	"main": "dist/sync-client.node.js",
 	"browser": "dist/sync-client.web.js",
 	"types": "dist/types/index.d.ts",
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index 7277f73b..ccf6e7e0 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "test-client",
-	"version": "0.1.6",
+	"version": "0.1.7",
 	"private": true,
 	"bin": {
 		"test-client": "./dist/cli.js"
diff --git a/manifest.json b/manifest.json
index 0ad753f6..93bda4cc 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.1.6",
+	"version": "0.1.7",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",

From 8a27987798c67649b47aad511ecc362d74558030 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Mar 2025 17:06:32 +0000
Subject: [PATCH 342/761] Make logs view performant

---
 .../obsidian-plugin/src/vault-link-plugin.ts  |   2 +-
 .../obsidian-plugin/src/views/logs-view.ts    | 115 ++++++++----------
 frontend/sync-client/src/tracing/logger.ts    |   2 +-
 3 files changed, 51 insertions(+), 68 deletions(-)

diff --git a/frontend/obsidian-plugin/src/vault-link-plugin.ts b/frontend/obsidian-plugin/src/vault-link-plugin.ts
index 435cecd1..7e762a87 100644
--- a/frontend/obsidian-plugin/src/vault-link-plugin.ts
+++ b/frontend/obsidian-plugin/src/vault-link-plugin.ts
@@ -66,7 +66,7 @@ export default class VaultLinkPlugin extends Plugin {
 		);
 		this.registerView(
 			LogsView.TYPE,
-			(leaf) => new LogsView(this, this.client, leaf)
+			(leaf) => new LogsView(this.client, leaf)
 		);
 
 		this.addRibbonIcon(
diff --git a/frontend/obsidian-plugin/src/views/logs-view.ts b/frontend/obsidian-plugin/src/views/logs-view.ts
index 9c852998..62a2bf22 100644
--- a/frontend/obsidian-plugin/src/views/logs-view.ts
+++ b/frontend/obsidian-plugin/src/views/logs-view.ts
@@ -1,14 +1,15 @@
 import type { WorkspaceLeaf } from "obsidian";
 import { ItemView } from "obsidian";
-import type VaultLinkPlugin from "../vault-link-plugin";
-import { LogLevel, type SyncClient } from "sync-client";
+import { LogLevel, LogLine, type SyncClient } from "sync-client";
 
 export class LogsView extends ItemView {
 	public static readonly TYPE = "logs-view";
 	public static readonly ICON = "logs";
 
+	private logsContainer: HTMLElement | undefined;
+	private logLineToElement: Map<LogLine, HTMLElement> = new Map();
+
 	public constructor(
-		private readonly plugin: VaultLinkPlugin,
 		private readonly client: SyncClient,
 		leaf: WorkspaceLeaf
 	) {
@@ -36,76 +37,58 @@ export class LogsView extends ItemView {
 
 		const container = this.containerEl.children[1];
 		container.addClass("logs-view");
+		container.createEl("h4", { text: "VaultLink logs" });
+		this.logsContainer = container.createDiv({ cls: "logs-container" });
 	}
 
 	private updateView(): void {
-		const container = this.containerEl.children[1];
-
-		let logsContainer = container
-			.getElementsByClassName("logs-container")
-			.item(0);
-		const scrollPosition = logsContainer?.scrollTop;
-
-		container.empty();
-
-		container.createEl("h4", { text: "VaultLink logs" });
-		container.createEl(
-			"p",
-			{
-				text: "This view displays logs generated by VaultLink. You can set the log level in the "
-			},
-			(p) => {
-				p.createEl(
-					"a",
-					{
-						text: "settings"
-					},
-					(button) => {
-						button.addEventListener("click", () => {
-							this.plugin.openSettings();
-						});
-					}
-				);
-
-				p.createSpan({ text: "." });
-			}
-		);
-
-		const logs = this.client.logger.getMessages(LogLevel.DEBUG);
-
-		if (logs.length === 0) {
-			container.createEl("p", { text: "No logs available yet." });
+		const container = this.logsContainer;
+		if (container === undefined) {
 			return;
 		}
 
-		logsContainer = container.createDiv(
-			{ cls: "logs-container" },
-			(element) => {
-				logs.forEach((message) =>
-					element.createDiv(
-						{
-							cls: ["log-message", message.level]
-						},
-						(messageContainer) => {
-							messageContainer.createEl("span", {
-								text: LogsView.formatTimestamp(
-									message.timestamp
-								),
-								cls: "timestamp"
-							});
-							messageContainer.createEl("span", {
-								text: message.message
-							});
-						}
-					)
-				);
-			}
-		);
+		const logs = this.client.logger.getMessages(LogLevel.DEBUG);
 
-		if (scrollPosition !== undefined) {
-			logsContainer.scrollTop = scrollPosition;
-		} else {
-			logsContainer.scrollTop = logsContainer.scrollHeight;
+		if (this.logLineToElement.size === 0 && logs.length > 0) {
+			// Clear the "No logs available yet" message
+			container.empty();
+		}
+
+		logs.forEach((message) => {
+			if (this.logLineToElement.has(message)) {
+				return;
+			}
+
+			const element = container.createDiv(
+				{
+					cls: ["log-message", message.level]
+				},
+				(messageContainer) => {
+					messageContainer.createEl("span", {
+						text: LogsView.formatTimestamp(message.timestamp),
+						cls: "timestamp"
+					});
+					messageContainer.createEl("span", {
+						text: message.message
+					});
+				}
+			);
+
+			this.logLineToElement.set(message, element);
+		});
+
+		const newLines = new Set(logs);
+		for (const [logLine, element] of this.logLineToElement) {
+			if (!newLines.has(logLine)) {
+				element.remove();
+				this.logLineToElement.delete(logLine);
+			}
+		}
+
+		if (logs.length === 0) {
+			container.createEl("p", {
+				text: "No logs available yet."
+			});
 		}
 	}
 }
diff --git a/frontend/sync-client/src/tracing/logger.ts b/frontend/sync-client/src/tracing/logger.ts
index a2e7cf98..f817bc26 100644
--- a/frontend/sync-client/src/tracing/logger.ts
+++ b/frontend/sync-client/src/tracing/logger.ts
@@ -21,7 +21,7 @@ export class LogLine {
 }
 
 export class Logger {
-	private static readonly MAX_MESSAGES = 10000;
+	private static readonly MAX_MESSAGES = 2000;
 	private readonly messages: LogLine[] = [];
 	private readonly onMessageListeners: ((message: LogLine) => void)[] = [];
 

From a937f64fa0659bbcbb561f3b402735d7f718f9e2 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Mar 2025 17:07:04 +0000
Subject: [PATCH 343/761] Extract reset error

---
 frontend/sync-client/src/services/connection-status.ts | 4 ++--
 frontend/sync-client/src/services/sync-reset-error.ts  | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 frontend/sync-client/src/services/sync-reset-error.ts

diff --git a/frontend/sync-client/src/services/connection-status.ts b/frontend/sync-client/src/services/connection-status.ts
index 5a804cf1..39e945b4 100644
--- a/frontend/sync-client/src/services/connection-status.ts
+++ b/frontend/sync-client/src/services/connection-status.ts
@@ -1,7 +1,7 @@
 import type { Settings } from "../persistence/settings";
 import type { Logger } from "../tracing/logger";
 import { createPromise } from "../utils/create-promise";
-import { sleep } from "../utils/sleep";
+import { SyncResetError } from "./sync-reset-error";
 
 export class ConnectionStatus {
 	private static readonly UNTIL_RESOLUTION = Symbol();
@@ -40,7 +40,7 @@ export class ConnectionStatus {
 	}
 
 	public reset(): void {
-		this.rejectUntil(new Error("Sync was reset"));
+		this.rejectUntil(new SyncResetError());
 		[this.until, this.resolveUntil, this.rejectUntil] = createPromise();
 	}
 
diff --git a/frontend/sync-client/src/services/sync-reset-error.ts b/frontend/sync-client/src/services/sync-reset-error.ts
new file mode 100644
index 00000000..d1aa2eb6
--- /dev/null
+++ b/frontend/sync-client/src/services/sync-reset-error.ts
@@ -0,0 +1,6 @@
+export class SyncResetError extends Error {
+	constructor() {
+		super("Sync was reset");
+		this.name = "SyncResetError";
+	}
+}

From bd44fe9c74ff8eceb72de7270eab31cedb061755 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Mar 2025 17:21:30 +0000
Subject: [PATCH 344/761] Remove debug step

---
 .github/workflows/publish-docker.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml
index d51e485b..2b8f8637 100644
--- a/.github/workflows/publish-docker.yml
+++ b/.github/workflows/publish-docker.yml
@@ -28,12 +28,6 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Debug
-        run: |
-          echo "github.ref: ${{ github.ref }}"
-          echo "github.ref_type: ${{ github.ref_type }}"
-          echo "github.event_name: ${{ github.event_name }}"
-
       # Install the cosign tool
       # https://github.com/sigstore/cosign-installer
       - name: Install cosign

From 8cfbaa1bdac418f1ccc7715d5339a007d8ccf0bc Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Mar 2025 17:21:59 +0000
Subject: [PATCH 345/761] Fix reset flow

---
 .../sync-client/src/services/connection-status.ts   |  5 ++++-
 frontend/sync-client/src/sync-client.ts             |  5 +++--
 frontend/sync-client/src/sync-operations/syncer.ts  | 13 +++++++++++++
 .../src/sync-operations/unrestricted-syncer.ts      |  8 ++++++++
 4 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/frontend/sync-client/src/services/connection-status.ts b/frontend/sync-client/src/services/connection-status.ts
index 39e945b4..572d8895 100644
--- a/frontend/sync-client/src/services/connection-status.ts
+++ b/frontend/sync-client/src/services/connection-status.ts
@@ -39,8 +39,11 @@ export class ConnectionStatus {
 		return input.url;
 	}
 
-	public reset(): void {
+	public startReset(): void {
 		this.rejectUntil(new SyncResetError());
+	}
+
+	public finishReset(): void {
 		[this.until, this.resolveUntil, this.rejectUntil] = createPromise();
 	}
 
diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts
index b07a1692..fa3dbe31 100644
--- a/frontend/sync-client/src/sync-client.ts
+++ b/frontend/sync-client/src/sync-client.ts
@@ -162,8 +162,8 @@ export class SyncClient {
 	}
 
 	public async waitAndStop(): Promise<void> {
-		await this.syncer.waitForSyncQueue();
 		await this.syncer.applyRemoteChangesLocally();
+		await this.syncer.waitForSyncQueue();
 		this.stop();
 	}
 
@@ -172,11 +172,12 @@ export class SyncClient {
 	/// The SyncClient can be used again after calling this method.
 	public async reset(): Promise<void> {
 		this.stop();
-		this.connectionStatus.reset();
+		this.connectionStatus.startReset();
 		await this.syncer.reset();
 		this.history.reset();
 		this.database.reset();
 		this._logger.reset();
+		this.connectionStatus.finishReset();
 		void this.start();
 	}
 
diff --git a/frontend/sync-client/src/sync-operations/syncer.ts b/frontend/sync-client/src/sync-operations/syncer.ts
index 861dac00..bec932a0 100644
--- a/frontend/sync-client/src/sync-operations/syncer.ts
+++ b/frontend/sync-client/src/sync-operations/syncer.ts
@@ -11,6 +11,7 @@ import type { FileOperations } from "../file-operations/file-operations";
 import { findMatchingFile } from "../utils/find-matching-file";
 import { UnrestrictedSyncer } from "./unrestricted-syncer";
 import { createPromise } from "../utils/create-promise";
+import { SyncResetError } from "../services/sync-reset-error";
 
 export class Syncer {
 	private readonly remainingOperationsListeners: ((
@@ -203,6 +204,12 @@ export class Syncer {
 			await this.runningScheduleSyncForOfflineChanges;
 			this.logger.info(`All local changes have been applied remotely`);
 		} catch (e) {
+			if (e instanceof SyncResetError) {
+				this.logger.info(
+					"Failed to apply local changes remotely due to a reset"
+				);
+				return;
+			}
 			this.logger.error(
 				`Not all local changes have been applied remotely: ${e}`
 			);
@@ -226,6 +233,12 @@ export class Syncer {
 			await this.runningApplyRemoteChangesLocally;
 			this.logger.info("All remote changes have been applied locally");
 		} catch (e) {
+			if (e instanceof SyncResetError) {
+				this.logger.info(
+					"Failed to apply remote changes locally due to a reset"
+				);
+				return;
+			}
 			this.logger.error(`Failed to apply remote changes locally: ${e}`);
 			throw e;
 		} finally {
diff --git a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
index dffd35b8..e6426fa0 100644
--- a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
+++ b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
@@ -16,6 +16,7 @@ import type { FileOperations } from "../file-operations/file-operations";
 import { DocumentLocks } from "../file-operations/document-locks";
 import { createPromise } from "../utils/create-promise";
 import { FileNotFoundError } from "../file-operations/file-not-found-error";
+import { SyncResetError } from "../services/sync-reset-error";
 
 export class UnrestrictedSyncer {
 	private readonly locks: DocumentLocks;
@@ -402,6 +403,13 @@ export class UnrestrictedSyncer {
 				this.logger.info(
 					`Skip ${syncSource.toLocaleLowerCase()} file because it no longer exists when trying to ${syncType.toLocaleLowerCase()} it`
 				);
+				return;
+			}
+			if (e instanceof SyncResetError) {
+				this.logger.info(
+					`Interrupting sync operation because of a reset`
+				);
+				return;
 			} else {
 				this.history.addHistoryEntry({
 					status: SyncStatus.ERROR,

From 1b57e277a24ae8a4701eda87f2699db8905f7851 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Mar 2025 17:22:09 +0000
Subject: [PATCH 346/761] Use consistent vault name

---
 .../sync-client/src/services/sync-service.ts  | 26 +++++++++++++++----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/frontend/sync-client/src/services/sync-service.ts b/frontend/sync-client/src/services/sync-service.ts
index 3c2a3bd5..6684428f 100644
--- a/frontend/sync-client/src/services/sync-service.ts
+++ b/frontend/sync-client/src/services/sync-service.ts
@@ -10,6 +10,7 @@ import type { Logger } from "../tracing/logger";
 import type { Settings } from "../persistence/settings";
 import type { ConnectionStatus } from "./connection-status";
 import { sleep } from "../utils/sleep";
+import { SyncResetError } from "./sync-reset-error";
 
 export interface CheckConnectionResult {
 	isSuccessful: boolean;
@@ -69,6 +70,8 @@ export class SyncService {
 		relativePath: RelativePath;
 		contentBytes: Uint8Array;
 	}): Promise<components["schemas"]["DocumentVersionWithoutContent"]> {
+		const vaultName = this.settings.getSettings().vaultName;
+
 		return this.withRetries(async () => {
 			const formData = new FormData();
 			if (documentId !== undefined) {
@@ -82,7 +85,7 @@ export class SyncService {
 				{
 					params: {
 						path: {
-							vault_id: this.settings.getSettings().vaultName
+							vault_id: vaultName
 						},
 						header: {
 							authorization: `Bearer ${this.settings.getSettings().token}`
@@ -120,6 +123,8 @@ export class SyncService {
 		relativePath: RelativePath;
 		contentBytes: Uint8Array;
 	}): Promise<components["schemas"]["DocumentUpdateResponse"]> {
+		const vaultName = this.settings.getSettings().vaultName;
+
 		return this.withRetries(async () => {
 			this.logger.debug(
 				`Updating document ${documentId} with parent version ${parentVersionId} and relative path ${relativePath}`
@@ -134,7 +139,7 @@ export class SyncService {
 				{
 					params: {
 						path: {
-							vault_id: this.settings.getSettings().vaultName,
+							vault_id: vaultName,
 							document_id: documentId
 						},
 						header: {
@@ -170,12 +175,14 @@ export class SyncService {
 		relativePath: RelativePath;
 	}): Promise<components["schemas"]["DocumentVersionWithoutContent"]> {
 		return this.withRetries(async () => {
+			const vaultName = this.settings.getSettings().vaultName;
+
 			const response = await this.client.DELETE(
 				"/vaults/{vault_id}/documents/{document_id}",
 				{
 					params: {
 						path: {
-							vault_id: this.settings.getSettings().vaultName,
+							vault_id: vaultName,
 							document_id: documentId
 						},
 						header: {
@@ -205,13 +212,15 @@ export class SyncService {
 	}: {
 		documentId: DocumentId;
 	}): Promise<components["schemas"]["DocumentVersion"]> {
+		const vaultName = this.settings.getSettings().vaultName;
+
 		return this.withRetries(async () => {
 			const response = await this.client.GET(
 				"/vaults/{vault_id}/documents/{document_id}",
 				{
 					params: {
 						path: {
-							vault_id: this.settings.getSettings().vaultName,
+							vault_id: vaultName,
 							document_id: documentId
 						},
 						header: {
@@ -239,12 +248,14 @@ export class SyncService {
 		since?: VaultUpdateId
 	): Promise<components["schemas"]["FetchLatestDocumentsResponse"]> {
 		return this.withRetries(async () => {
+			const vaultName = this.settings.getSettings().vaultName;
+
 			const response = await this.client.GET(
 				"/vaults/{vault_id}/documents",
 				{
 					params: {
 						path: {
-							vault_id: this.settings.getSettings().vaultName
+							vault_id: vaultName
 						},
 						header: {
 							authorization: `Bearer ${this.settings.getSettings().token}`
@@ -339,6 +350,11 @@ export class SyncService {
 			try {
 				return await fn();
 			} catch (e) {
+				// We must not retry errors coming from reset
+				if (e instanceof SyncResetError) {
+					throw e;
+				}
+
 				this.logger.error(`Failed network call (${e}), retrying`);
 				await sleep(1000);
 			}

From eb9fadf714a82070143063142cceb61ec3907fac Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Mar 2025 18:10:39 +0000
Subject: [PATCH 347/761] Fix crashes

---
 README.md                                     |  3 +-
 frontend/obsidian-plugin/src/styles.scss      |  1 +
 frontend/sync-client/src/sync-client.ts       | 45 ++++++++++---------
 .../sync-client/src/tracing/sync-history.ts   |  2 +-
 4 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/README.md b/README.md
index a101bfad..4fb4b3b9 100644
--- a/README.md
+++ b/README.md
@@ -57,8 +57,7 @@ And to clean up the logs & database files, run `scripts/clean-up.sh`
 ## Todos
 
 - Don't show server traces on auth failure
-- vritual list for logs view
-
+- better history tab
 - Better server logs
 - Allow setting config.yml path for server
 - history tab for going back
diff --git a/frontend/obsidian-plugin/src/styles.scss b/frontend/obsidian-plugin/src/styles.scss
index 31858f0e..c66c24a8 100644
--- a/frontend/obsidian-plugin/src/styles.scss
+++ b/frontend/obsidian-plugin/src/styles.scss
@@ -102,6 +102,7 @@
 			margin-bottom: var(--size-2-1);
 			overflow-wrap: break-word;
 			white-space: pre-wrap;
+			user-select: all;
 
 			.timestamp {
 				@include number-card;
diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts
index fa3dbe31..1d23399c 100644
--- a/frontend/sync-client/src/sync-client.ts
+++ b/frontend/sync-client/src/sync-client.ts
@@ -27,7 +27,29 @@ export class SyncClient {
 		private readonly syncService: SyncService,
 		private readonly _logger: Logger,
 		private readonly connectionStatus: ConnectionStatus
-	) {}
+	) {
+		this.settings.addOnSettingsChangeListener(
+			(newSettings, oldSettings) => {
+				if (
+					newSettings.fetchChangesUpdateIntervalMs !==
+					oldSettings.fetchChangesUpdateIntervalMs
+				) {
+					this.setRemoteEventListener(
+						newSettings.fetchChangesUpdateIntervalMs
+					);
+				}
+
+				if (newSettings.vaultName !== oldSettings.vaultName) {
+					void this.reset();
+				} else if (
+					newSettings.isSyncEnabled &&
+					!oldSettings.isSyncEnabled
+				) {
+					void this.start();
+				}
+			}
+		);
+	}
 
 	public get logger(): Logger {
 		return this._logger;
@@ -128,27 +150,6 @@ export class SyncClient {
 	}
 
 	public async start(): Promise<void> {
-		this.settings.addOnSettingsChangeListener(
-			(newSettings, oldSettings) => {
-				if (
-					newSettings.fetchChangesUpdateIntervalMs !==
-					oldSettings.fetchChangesUpdateIntervalMs
-				) {
-					this.setRemoteEventListener(
-						newSettings.fetchChangesUpdateIntervalMs
-					);
-				}
-
-				if (
-					newSettings.vaultName !== oldSettings.vaultName ||
-					newSettings.token !== oldSettings.token ||
-					newSettings.remoteUri !== oldSettings.remoteUri
-				) {
-					void this.reset();
-				}
-			}
-		);
-
 		await this.syncer.scheduleSyncForOfflineChanges();
 
 		this.setRemoteEventListener(
diff --git a/frontend/sync-client/src/tracing/sync-history.ts b/frontend/sync-client/src/tracing/sync-history.ts
index ec8841e9..7d3b8f9a 100644
--- a/frontend/sync-client/src/tracing/sync-history.ts
+++ b/frontend/sync-client/src/tracing/sync-history.ts
@@ -33,7 +33,7 @@ export interface HistoryStats {
 }
 
 export class SyncHistory {
-	private static readonly MAX_ENTRIES = 5000;
+	private static readonly MAX_ENTRIES = 500;
 
 	private readonly entries: HistoryEntry[] = [];
 

From 7153c06c63c735de81c76ac6eaca42481a2c3f0a Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Mar 2025 18:10:50 +0000
Subject: [PATCH 348/761] Lint

---
 frontend/obsidian-plugin/src/views/logs-view.ts       |  5 +++--
 frontend/sync-client/src/services/sync-reset-error.ts |  2 +-
 frontend/sync-client/src/services/sync-service.ts     | 10 +++++-----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/frontend/obsidian-plugin/src/views/logs-view.ts b/frontend/obsidian-plugin/src/views/logs-view.ts
index 62a2bf22..a7ea6228 100644
--- a/frontend/obsidian-plugin/src/views/logs-view.ts
+++ b/frontend/obsidian-plugin/src/views/logs-view.ts
@@ -1,13 +1,14 @@
 import type { WorkspaceLeaf } from "obsidian";
 import { ItemView } from "obsidian";
-import { LogLevel, LogLine, type SyncClient } from "sync-client";
+import type { LogLine } from "sync-client";
+import { LogLevel, type SyncClient } from "sync-client";
 
 export class LogsView extends ItemView {
 	public static readonly TYPE = "logs-view";
 	public static readonly ICON = "logs";
 
 	private logsContainer: HTMLElement | undefined;
-	private logLineToElement: Map<LogLine, HTMLElement> = new Map();
+	private readonly logLineToElement = new Map<LogLine, HTMLElement>();
 
 	public constructor(
 		private readonly client: SyncClient,
diff --git a/frontend/sync-client/src/services/sync-reset-error.ts b/frontend/sync-client/src/services/sync-reset-error.ts
index d1aa2eb6..5e27dfb6 100644
--- a/frontend/sync-client/src/services/sync-reset-error.ts
+++ b/frontend/sync-client/src/services/sync-reset-error.ts
@@ -1,5 +1,5 @@
 export class SyncResetError extends Error {
-	constructor() {
+	public constructor() {
 		super("Sync was reset");
 		this.name = "SyncResetError";
 	}
diff --git a/frontend/sync-client/src/services/sync-service.ts b/frontend/sync-client/src/services/sync-service.ts
index 6684428f..0b3fcba3 100644
--- a/frontend/sync-client/src/services/sync-service.ts
+++ b/frontend/sync-client/src/services/sync-service.ts
@@ -70,7 +70,7 @@ export class SyncService {
 		relativePath: RelativePath;
 		contentBytes: Uint8Array;
 	}): Promise<components["schemas"]["DocumentVersionWithoutContent"]> {
-		const vaultName = this.settings.getSettings().vaultName;
+		const { vaultName } = this.settings.getSettings();
 
 		return this.withRetries(async () => {
 			const formData = new FormData();
@@ -123,7 +123,7 @@ export class SyncService {
 		relativePath: RelativePath;
 		contentBytes: Uint8Array;
 	}): Promise<components["schemas"]["DocumentUpdateResponse"]> {
-		const vaultName = this.settings.getSettings().vaultName;
+		const { vaultName } = this.settings.getSettings();
 
 		return this.withRetries(async () => {
 			this.logger.debug(
@@ -175,7 +175,7 @@ export class SyncService {
 		relativePath: RelativePath;
 	}): Promise<components["schemas"]["DocumentVersionWithoutContent"]> {
 		return this.withRetries(async () => {
-			const vaultName = this.settings.getSettings().vaultName;
+			const { vaultName } = this.settings.getSettings();
 
 			const response = await this.client.DELETE(
 				"/vaults/{vault_id}/documents/{document_id}",
@@ -212,7 +212,7 @@ export class SyncService {
 	}: {
 		documentId: DocumentId;
 	}): Promise<components["schemas"]["DocumentVersion"]> {
-		const vaultName = this.settings.getSettings().vaultName;
+		const { vaultName } = this.settings.getSettings();
 
 		return this.withRetries(async () => {
 			const response = await this.client.GET(
@@ -248,7 +248,7 @@ export class SyncService {
 		since?: VaultUpdateId
 	): Promise<components["schemas"]["FetchLatestDocumentsResponse"]> {
 		return this.withRetries(async () => {
-			const vaultName = this.settings.getSettings().vaultName;
+			const { vaultName } = this.settings.getSettings();
 
 			const response = await this.client.GET(
 				"/vaults/{vault_id}/documents",

From abe074202b5b5b64f20773c888319ffdebcf51f7 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Mar 2025 18:11:10 +0000
Subject: [PATCH 349/761] Bump versions to 0.1.8

---
 backend/Cargo.lock                     | 6 +++---
 backend/Cargo.toml                     | 2 +-
 frontend/obsidian-plugin/manifest.json | 2 +-
 frontend/obsidian-plugin/package.json  | 2 +-
 frontend/package-lock.json             | 8 ++++----
 frontend/sync-client/package.json      | 2 +-
 frontend/test-client/package.json      | 2 +-
 manifest.json                          | 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 5a02c283..36901b9a 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1746,7 +1746,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile"
-version = "0.1.7"
+version = "0.1.8"
 dependencies = [
  "insta",
  "pretty_assertions",
@@ -2380,7 +2380,7 @@ dependencies = [
 
 [[package]]
 name = "sync_lib"
-version = "0.1.7"
+version = "0.1.8"
 dependencies = [
  "base64 0.22.1",
  "console_error_panic_hook",
@@ -2393,7 +2393,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.1.7"
+version = "0.1.8"
 dependencies = [
  "aide",
  "aide-axum-typed-multipart",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index cc1d43cb..a0dea7ec 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -12,7 +12,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.1.7"
+version = "0.1.8"
 
 [workspace.dependencies]  
 serde = { version = "1.0.214", default-features = false, features = ["derive"] }
diff --git a/frontend/obsidian-plugin/manifest.json b/frontend/obsidian-plugin/manifest.json
index 93bda4cc..9bea5612 100644
--- a/frontend/obsidian-plugin/manifest.json
+++ b/frontend/obsidian-plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.1.7",
+	"version": "0.1.8",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index 3f11d5fe..8efdb8a2 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.1.7",
+	"version": "0.1.8",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 441b53de..33f2f0bc 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -21,7 +21,7 @@
 		},
 		"../backend/sync_lib/pkg": {
 			"name": "sync_lib",
-			"version": "0.1.7",
+			"version": "0.1.8",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -6720,7 +6720,7 @@
 		},
 		"obsidian-plugin": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.1.7",
+			"version": "0.1.8",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
@@ -6748,7 +6748,7 @@
 			}
 		},
 		"sync-client": {
-			"version": "0.1.7",
+			"version": "0.1.8",
 			"dependencies": {
 				"byte-base64": "^1.1.0",
 				"openapi-fetch": "0.13.5",
@@ -6771,7 +6771,7 @@
 			}
 		},
 		"test-client": {
-			"version": "0.1.7",
+			"version": "0.1.8",
 			"bin": {
 				"test-client": "dist/cli.js"
 			},
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index b4d74f0d..0943bdbb 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "sync-client",
-	"version": "0.1.7",
+	"version": "0.1.8",
 	"main": "dist/sync-client.node.js",
 	"browser": "dist/sync-client.web.js",
 	"types": "dist/types/index.d.ts",
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index ccf6e7e0..c8ef19f6 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "test-client",
-	"version": "0.1.7",
+	"version": "0.1.8",
 	"private": true,
 	"bin": {
 		"test-client": "./dist/cli.js"
diff --git a/manifest.json b/manifest.json
index 93bda4cc..9bea5612 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.1.7",
+	"version": "0.1.8",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",

From 30ecf52ddebc1d4160dfddf9402747367f9da04e Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Mar 2025 18:41:30 +0000
Subject: [PATCH 350/761] Improve history view

---
 README.md                                     |   1 -
 frontend/obsidian-plugin/src/styles.scss      |   1 +
 .../obsidian-plugin/src/views/history-view.ts | 179 +++++++++++-------
 .../obsidian-plugin/src/views/logs-view.ts    |  40 ++--
 frontend/sync-client/src/index.ts             |   1 -
 .../sync-operations/unrestricted-syncer.ts    |  52 ++---
 .../sync-client/src/tracing/sync-history.ts   |  20 +-
 7 files changed, 165 insertions(+), 129 deletions(-)

diff --git a/README.md b/README.md
index 4fb4b3b9..cad994b6 100644
--- a/README.md
+++ b/README.md
@@ -57,7 +57,6 @@ And to clean up the logs & database files, run `scripts/clean-up.sh`
 ## Todos
 
 - Don't show server traces on auth failure
-- better history tab
 - Better server logs
 - Allow setting config.yml path for server
 - history tab for going back
diff --git a/frontend/obsidian-plugin/src/styles.scss b/frontend/obsidian-plugin/src/styles.scss
index c66c24a8..9ffc5caa 100644
--- a/frontend/obsidian-plugin/src/styles.scss
+++ b/frontend/obsidian-plugin/src/styles.scss
@@ -164,6 +164,7 @@
 		.history-card-title {
 			font: var(--font-monospace);
 			display: flex;
+			align-items: center;
 			gap: var(--size-4-2);
 			word-break: break-all;
 			margin: 0;
diff --git a/frontend/obsidian-plugin/src/views/history-view.ts b/frontend/obsidian-plugin/src/views/history-view.ts
index a4c09b55..4b743a46 100644
--- a/frontend/obsidian-plugin/src/views/history-view.ts
+++ b/frontend/obsidian-plugin/src/views/history-view.ts
@@ -3,13 +3,19 @@ import { ItemView, setIcon } from "obsidian";
 
 import { intlFormatDistance } from "date-fns";
 import type { HistoryEntry, SyncClient } from "sync-client";
-import { SyncType, SyncSource, SyncStatus } from "sync-client";
+import { SyncType } from "sync-client";
 
 export class HistoryView extends ItemView {
 	public static readonly TYPE = "history-view";
 	public static readonly ICON = "square-stack";
 	private timer: NodeJS.Timeout | null = null;
 
+	private historyContainer: HTMLElement | undefined;
+	private readonly historyEntryToElement = new Map<
+		HistoryEntry,
+		HTMLElement
+	>();
+
 	public constructor(
 		leaf: WorkspaceLeaf,
 		private readonly client: SyncClient
@@ -38,18 +44,6 @@ export class HistoryView extends ItemView {
 		}
 	}
 
-	private static getSyncSourceIcon(source: SyncSource | undefined): IconName {
-		switch (source) {
-			case SyncSource.PUSH:
-				return "upload";
-			case SyncSource.PULL:
-				return "download";
-			case undefined:
-			default:
-				return "";
-		}
-	}
-
 	private static renderSyncItemTitle(
 		element: HTMLElement,
 		entry: HistoryEntry
@@ -62,11 +56,6 @@ export class HistoryView extends ItemView {
 		element.createEl("span", {
 			text: entry.relativePath
 		});
-
-		const syncSourceIcon = HistoryView.getSyncSourceIcon(entry.source);
-		if (syncSourceIcon) {
-			setIcon(element.createDiv(), syncSourceIcon);
-		}
 	}
 
 	public getViewType(): string {
@@ -78,6 +67,11 @@ export class HistoryView extends ItemView {
 	}
 
 	public async onOpen(): Promise<void> {
+		const container = this.containerEl.children[1];
+		container.createEl("h4", { text: "VaultLink history" });
+
+		this.historyContainer = container.createDiv({ cls: "logs-container" });
+
 		await this.updateView();
 		this.timer = setInterval(() => void this.updateView(), 1000);
 	}
@@ -89,66 +83,105 @@ export class HistoryView extends ItemView {
 	}
 
 	private async updateView(): Promise<void> {
-		const container = this.containerEl.children[1];
-		container.empty();
-		container.createEl("h4", { text: "VaultLink History" });
+		const container = this.historyContainer;
+		if (container === undefined) {
+			return;
+		}
 
 		const entries = this.client.getHistoryEntries().reverse();
+
+		if (this.historyEntryToElement.size === 0 && entries.length > 0) {
+			// Clear the "No update has happened yet" message
+			container.empty();
+		}
+
 		entries.forEach((entry) => {
-			container.createDiv(
-				{
-					cls: ["history-card", entry.status.toLocaleLowerCase()]
-				},
-				(card) => {
-					if (
-						this.app.vault.getFileByPath(entry.relativePath) !==
-						null
-					) {
-						card.addEventListener("click", () => {
-							void this.app.workspace.openLinkText(
-								entry.relativePath,
-								entry.relativePath,
-								false
-							);
-						});
-
-						card.addClass("clickable");
-					}
-
-					card.createDiv(
-						{
-							cls: "history-card-header"
-						},
-						(header) => {
-							header.createEl(
-								"h5",
-								{
-									cls: "history-card-title"
-								},
-								(title) => {
-									HistoryView.renderSyncItemTitle(
-										title,
-										entry
-									);
-								}
-							);
-
-							header.createSpan({
-								text: intlFormatDistance(
-									entry.timestamp,
-									new Date()
-								),
-								cls: "history-card-timestamp"
-							});
-						}
+			const element = this.historyEntryToElement.get(entry);
+			if (element !== undefined) {
+				const timestampElement = element.querySelector(
+					".history-card-timestamp"
+				);
+				if (timestampElement != null) {
+					timestampElement.textContent = intlFormatDistance(
+						entry.timestamp,
+						new Date()
 					);
-
-					card.createEl("p", {
-						text: `${entry.message}.`,
-						cls: "history-card-message"
-					});
 				}
-			);
+				return;
+			}
+
+			const newElement = this.createHistoryCard(container, entry);
+			container.prepend(newElement);
+			this.historyEntryToElement.set(entry, newElement);
 		});
+
+		const newEntries = new Set(entries);
+		for (const [entry, element] of this.historyEntryToElement) {
+			if (!newEntries.has(entry)) {
+				element.remove();
+				this.historyEntryToElement.delete(entry);
+			}
+		}
+
+		if (entries.length === 0) {
+			container.empty();
+			container.createEl("p", {
+				text: "No update has happened yet."
+			});
+		}
+	}
+
+	private createHistoryCard(
+		container: HTMLElement,
+		entry: HistoryEntry
+	): HTMLElement {
+		return container.createDiv(
+			{
+				cls: ["history-card", entry.status.toLocaleLowerCase()]
+			},
+			(card) => {
+				if (this.app.vault.getFileByPath(entry.relativePath) !== null) {
+					card.addEventListener("click", () => {
+						void this.app.workspace.openLinkText(
+							entry.relativePath,
+							entry.relativePath,
+							false
+						);
+					});
+
+					card.addClass("clickable");
+				}
+
+				card.createDiv(
+					{
+						cls: "history-card-header"
+					},
+					(header) => {
+						header.createEl(
+							"h5",
+							{
+								cls: "history-card-title"
+							},
+							(title) => {
+								HistoryView.renderSyncItemTitle(title, entry);
+							}
+						);
+
+						header.createSpan({
+							text: intlFormatDistance(
+								entry.timestamp,
+								new Date()
+							),
+							cls: "history-card-timestamp"
+						});
+					}
+				);
+
+				card.createEl("p", {
+					text: `${entry.message}.`,
+					cls: "history-card-message"
+				});
+			}
+		);
 	}
 }
diff --git a/frontend/obsidian-plugin/src/views/logs-view.ts b/frontend/obsidian-plugin/src/views/logs-view.ts
index a7ea6228..2e3ea88d 100644
--- a/frontend/obsidian-plugin/src/views/logs-view.ts
+++ b/frontend/obsidian-plugin/src/views/logs-view.ts
@@ -21,6 +21,26 @@ export class LogsView extends ItemView {
 		});
 	}
 
+	private static createLogLineElement(
+		container: HTMLElement,
+		logLine: LogLine
+	): HTMLElement {
+		return container.createDiv(
+			{
+				cls: ["log-message", logLine.level]
+			},
+			(messageContainer) => {
+				messageContainer.createEl("span", {
+					text: LogsView.formatTimestamp(logLine.timestamp),
+					cls: "timestamp"
+				});
+				messageContainer.createEl("span", {
+					text: logLine.message
+				});
+			}
+		);
+	}
+
 	private static formatTimestamp(timestamp: Date): string {
 		return timestamp.toTimeString().split(" ")[0];
 	}
@@ -34,12 +54,12 @@ export class LogsView extends ItemView {
 	}
 
 	public async onOpen(): Promise<void> {
-		this.updateView();
-
 		const container = this.containerEl.children[1];
 		container.addClass("logs-view");
 		container.createEl("h4", { text: "VaultLink logs" });
 		this.logsContainer = container.createDiv({ cls: "logs-container" });
+
+		this.updateView();
 	}
 
 	private updateView(): void {
@@ -60,20 +80,7 @@ export class LogsView extends ItemView {
 				return;
 			}
 
-			const element = container.createDiv(
-				{
-					cls: ["log-message", message.level]
-				},
-				(messageContainer) => {
-					messageContainer.createEl("span", {
-						text: LogsView.formatTimestamp(message.timestamp),
-						cls: "timestamp"
-					});
-					messageContainer.createEl("span", {
-						text: message.message
-					});
-				}
-			);
+			const element = LogsView.createLogLineElement(container, message);
 
 			this.logLineToElement.set(message, element);
 		});
@@ -87,6 +94,7 @@ export class LogsView extends ItemView {
 		}
 
 		if (logs.length === 0) {
+			container.empty();
 			container.createEl("p", {
 				text: "No logs available yet."
 			});
diff --git a/frontend/sync-client/src/index.ts b/frontend/sync-client/src/index.ts
index 9308c063..cb8a38a2 100644
--- a/frontend/sync-client/src/index.ts
+++ b/frontend/sync-client/src/index.ts
@@ -1,6 +1,5 @@
 export {
 	SyncType,
-	SyncSource,
 	SyncStatus,
 	type HistoryStats,
 	type HistoryEntry
diff --git a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
index e6426fa0..4df4ae03 100644
--- a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
+++ b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
@@ -7,7 +7,7 @@ import type {
 import type { SyncService } from "../services/sync-service";
 import type { Logger } from "../tracing/logger";
 import type { SyncHistory } from "../tracing/sync-history";
-import { SyncSource, SyncStatus, SyncType } from "../tracing/sync-history";
+import { SyncStatus, SyncType } from "../tracing/sync-history";
 import { EMPTY_HASH, hash } from "../utils/hash";
 import type { components } from "../services/types";
 import { deserialize } from "../utils/deserialize";
@@ -38,7 +38,6 @@ export class UnrestrictedSyncer {
 		return this.executeSync(
 			document.relativePath,
 			SyncType.CREATE,
-			SyncSource.PUSH,
 			async () => {
 				const contentBytes = await this.operations.read(
 					document.relativePath
@@ -53,7 +52,6 @@ export class UnrestrictedSyncer {
 
 				this.history.addHistoryEntry({
 					status: SyncStatus.SUCCESS,
-					source: SyncSource.PUSH,
 					relativePath: document.relativePath,
 					message: `Successfully uploaded locally created file`,
 					type: SyncType.CREATE
@@ -78,7 +76,6 @@ export class UnrestrictedSyncer {
 		await this.executeSync(
 			document.relativePath,
 			SyncType.DELETE,
-			SyncSource.PUSH,
 			async () => {
 				const response = await this.syncService.delete({
 					documentId: document.documentId,
@@ -87,7 +84,6 @@ export class UnrestrictedSyncer {
 
 				this.history.addHistoryEntry({
 					status: SyncStatus.SUCCESS,
-					source: SyncSource.PUSH,
 					relativePath: document.relativePath,
 					message: `Successfully deleted locally deleted file on the remote server`,
 					type: SyncType.DELETE
@@ -118,7 +114,6 @@ export class UnrestrictedSyncer {
 		await this.executeSync(
 			document.relativePath,
 			SyncType.UPDATE,
-			SyncSource.PUSH,
 			async () => {
 				const originalRelativePath = document.relativePath;
 
@@ -188,18 +183,18 @@ export class UnrestrictedSyncer {
 					return;
 				}
 
-				this.history.addHistoryEntry({
-					status: SyncStatus.SUCCESS,
-					source: SyncSource.PUSH,
-					relativePath: document.relativePath,
-					message: `Successfully uploaded locally updated file to the remote server`,
-					type: SyncType.UPDATE
-				});
+				if (!force) {
+					this.history.addHistoryEntry({
+						status: SyncStatus.SUCCESS,
+						relativePath: document.relativePath,
+						message: `Successfully uploaded locally updated file to the remote server`,
+						type: SyncType.UPDATE
+					});
+				}
 
 				if (response.isDeleted) {
 					this.history.addHistoryEntry({
 						status: SyncStatus.SUCCESS,
-						source: SyncSource.PULL,
 						relativePath: document.relativePath,
 						message:
 							"The file we tried to update had been deleted remotely, therefore, we have deleted it locally",
@@ -253,13 +248,14 @@ export class UnrestrictedSyncer {
 						responseBytes
 					);
 
-					this.history.addHistoryEntry({
-						status: SyncStatus.SUCCESS,
-						source: SyncSource.PULL,
-						relativePath: document.relativePath,
-						message: `The file we updated had been updated remotely, so we downloaded the merged version`,
-						type: SyncType.UPDATE
-					});
+					if (!force) {
+						this.history.addHistoryEntry({
+							status: SyncStatus.SUCCESS,
+							relativePath: document.relativePath,
+							message: `The file we updated had been updated remotely, so we downloaded the merged version`,
+							type: SyncType.UPDATE
+						});
+					}
 				}
 
 				this.tryIncrementVaultUpdateId(response.vaultUpdateId);
@@ -274,7 +270,6 @@ export class UnrestrictedSyncer {
 		await this.executeSync(
 			remoteVersion.relativePath,
 			SyncType.UPDATE,
-			SyncSource.PULL,
 			async () => {
 				if (document?.metadata !== undefined) {
 					// If the file exists locally, let's pretend the user has updated it
@@ -358,7 +353,6 @@ export class UnrestrictedSyncer {
 
 				this.history.addHistoryEntry({
 					status: SyncStatus.SUCCESS,
-					source: SyncSource.PULL,
 					relativePath: remoteVersion.relativePath,
 					message: `Successfully downloaded remote file which hadn't existed locally`,
 					type: SyncType.CREATE
@@ -370,12 +364,9 @@ export class UnrestrictedSyncer {
 	public async executeSync<T>(
 		relativePath: RelativePath,
 		syncType: SyncType,
-		syncSource: SyncSource,
 		fn: () => Promise<T>
 	): Promise<T | undefined> {
-		this.logger.debug(
-			`Syncing ${relativePath} (${syncSource} - ${syncType})`
-		);
+		this.logger.debug(`Syncing ${relativePath} (${syncType})`);
 
 		try {
 			if (
@@ -401,7 +392,7 @@ export class UnrestrictedSyncer {
 			if (e instanceof FileNotFoundError) {
 				// A subsequent sync operation must have been creating to deal with this
 				this.logger.info(
-					`Skip ${syncSource.toLocaleLowerCase()} file because it no longer exists when trying to ${syncType.toLocaleLowerCase()} it`
+					`Skiping file '${relativePath}' because it no longer exists when trying to ${syncType.toLocaleLowerCase()} it`
 				);
 				return;
 			}
@@ -414,9 +405,8 @@ export class UnrestrictedSyncer {
 				this.history.addHistoryEntry({
 					status: SyncStatus.ERROR,
 					relativePath,
-					message: `Failed to ${syncSource.toLocaleLowerCase()} file because of ${e} when trying to ${syncType.toLocaleLowerCase()} it`,
-					type: syncType,
-					source: syncSource
+					message: `Failed to sync file '${relativePath}' because of ${e} when trying to ${syncType.toLocaleLowerCase()} it`,
+					type: syncType
 				});
 				throw e;
 			}
diff --git a/frontend/sync-client/src/tracing/sync-history.ts b/frontend/sync-client/src/tracing/sync-history.ts
index 7d3b8f9a..d1c69577 100644
--- a/frontend/sync-client/src/tracing/sync-history.ts
+++ b/frontend/sync-client/src/tracing/sync-history.ts
@@ -6,7 +6,6 @@ export interface CommonHistoryEntry {
 	relativePath: RelativePath;
 	message: string;
 	type?: SyncType;
-	source?: SyncSource;
 }
 
 export enum SyncType {
@@ -15,11 +14,6 @@ export enum SyncType {
 	DELETE = "DELETE"
 }
 
-export enum SyncSource {
-	PUSH = "PUSH",
-	PULL = "PULL"
-}
-
 export enum SyncStatus {
 	SUCCESS = "SUCCESS",
 	ERROR = "ERROR"
@@ -35,7 +29,7 @@ export interface HistoryStats {
 export class SyncHistory {
 	private static readonly MAX_ENTRIES = 500;
 
-	private readonly entries: HistoryEntry[] = [];
+	private entries: HistoryEntry[] = [];
 
 	private readonly syncHistoryUpdateListeners: ((
 		status: HistoryStats
@@ -75,6 +69,18 @@ export class SyncHistory {
 			...entry,
 			timestamp: new Date()
 		};
+
+		const candidate = this.entries.find(
+			(e) => e.relativePath === historyEntry.relativePath
+		);
+		if (
+			candidate !== undefined &&
+			(this.entries.slice(-1)[0] === candidate ||
+				candidate.timestamp.getTime() + 10 * 1000 >
+					historyEntry.timestamp.getTime())
+		) {
+			this.entries = this.entries.filter((e) => e !== candidate);
+		}
 		this.entries.push(historyEntry);
 
 		if (entry.status === SyncStatus.SUCCESS) {

From 84adda96c1fa769984d6fd79aa3628f294265556 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Mar 2025 18:45:37 +0000
Subject: [PATCH 351/761] Improve message

---
 frontend/sync-client/src/tracing/sync-history.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/sync-client/src/tracing/sync-history.ts b/frontend/sync-client/src/tracing/sync-history.ts
index d1c69577..0980d809 100644
--- a/frontend/sync-client/src/tracing/sync-history.ts
+++ b/frontend/sync-client/src/tracing/sync-history.ts
@@ -91,7 +91,7 @@ export class SyncHistory {
 		} else {
 			this.status.error++;
 			this.logger.error(
-				`Error syncing file: ${entry.relativePath} - ${entry.message}`
+				`Cannot sync file: ${entry.relativePath} - ${entry.message}`
 			);
 		}
 

From 3dbeb54c543fc3b86e063ca6467e1fe5ce143af3 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Mar 2025 20:23:34 +0000
Subject: [PATCH 352/761] Only show file name on history card

---
 frontend/obsidian-plugin/src/views/history-view.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/obsidian-plugin/src/views/history-view.ts b/frontend/obsidian-plugin/src/views/history-view.ts
index 4b743a46..2169a425 100644
--- a/frontend/obsidian-plugin/src/views/history-view.ts
+++ b/frontend/obsidian-plugin/src/views/history-view.ts
@@ -54,7 +54,7 @@ export class HistoryView extends ItemView {
 		}
 
 		element.createEl("span", {
-			text: entry.relativePath
+			text: entry.relativePath.split("/").pop()
 		});
 	}
 

From 407c56040e36f8f1a73f2773d213205da4fd0d18 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Mar 2025 20:24:19 +0000
Subject: [PATCH 353/761] Improve settings

---
 frontend/obsidian-plugin/src/views/settings-tab.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/obsidian-plugin/src/views/settings-tab.ts b/frontend/obsidian-plugin/src/views/settings-tab.ts
index 24fcf8d0..7d726fb5 100644
--- a/frontend/obsidian-plugin/src/views/settings-tab.ts
+++ b/frontend/obsidian-plugin/src/views/settings-tab.ts
@@ -292,7 +292,7 @@ export class SyncSettingsTab extends PluginSettingTab {
 			)
 			.addSlider((slider) =>
 				slider
-					.setLimits(0, 32, 1)
+					.setLimits(1, 64, 1)
 					.setDynamicTooltip()
 					.setInstant(false)
 					.setValue(this.syncClient.getSettings().maxFileSizeMB)
@@ -304,7 +304,7 @@ export class SyncSettingsTab extends PluginSettingTab {
 		new Setting(containerEl)
 			.setName("Danger zone")
 			.setDesc(
-				"How many concurrent sync operations to run. Setting this value higher may increase the overall performance, however, it will require more memory as well. If you notice frequent crashes, especially on mobile, set this to 1."
+				"Delete the local metadata database while leaving the local and remote files intact."
 			)
 			.addButton((button) =>
 				button.setButtonText("Reset sync state").onClick(async () => {

From e9c6f99df2dd915589c165a6ae44313aa1c74811 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Mar 2025 20:30:24 +0000
Subject: [PATCH 354/761] Give unique names to path params

---
 .../sync_server/src/server/create_document.rs |  6 +-
 .../sync_server/src/server/delete_document.rs |  6 +-
 .../src/server/fetch_document_version.rs      |  6 +-
 .../server/fetch_document_version_content.rs  |  6 +-
 .../server/fetch_latest_document_version.rs   |  6 +-
 .../src/server/fetch_latest_documents.rs      |  4 +-
 .../sync_server/src/server/update_document.rs | 10 +--
 frontend/sync-client/src/services/types.ts    | 70 +++++++++----------
 8 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/backend/sync_server/src/server/create_document.rs b/backend/sync_server/src/server/create_document.rs
index 89f54783..3b9bc794 100644
--- a/backend/sync_server/src/server/create_document.rs
+++ b/backend/sync_server/src/server/create_document.rs
@@ -23,7 +23,7 @@ use crate::{
 
 // This is required for aide to infer the path parameter types and names
 #[derive(Deserialize, JsonSchema)]
-pub struct PathParams {
+pub struct CreateDocumentPathParams {
     vault_id: VaultId,
 }
 
@@ -33,7 +33,7 @@ pub struct PathParams {
 #[axum::debug_handler]
 pub async fn create_document_multipart(
     TypedHeader(auth_header): TypedHeader<Authorization<Bearer>>,
-    Path(PathParams { vault_id }): Path<PathParams>,
+    Path(CreateDocumentPathParams { vault_id }): Path<CreateDocumentPathParams>,
     State(state): State<AppState>,
     TypedMultipart(axum_typed_multipart::TypedMultipart(request)): TypedMultipart<
         CreateDocumentVersionMultipart,
@@ -56,7 +56,7 @@ pub async fn create_document_multipart(
 #[axum::debug_handler]
 pub async fn create_document_json(
     TypedHeader(auth_header): TypedHeader<Authorization<Bearer>>,
-    Path(PathParams { vault_id }): Path<PathParams>,
+    Path(CreateDocumentPathParams { vault_id }): Path<CreateDocumentPathParams>,
     State(state): State<AppState>,
     Json(request): Json<CreateDocumentVersion>,
 ) -> Result<Json<DocumentVersionWithoutContent>, SyncServerError> {
diff --git a/backend/sync_server/src/server/delete_document.rs b/backend/sync_server/src/server/delete_document.rs
index 75f90d23..4d940852 100644
--- a/backend/sync_server/src/server/delete_document.rs
+++ b/backend/sync_server/src/server/delete_document.rs
@@ -17,7 +17,7 @@ use crate::{
 
 // This is required for aide to infer the path parameter types and names
 #[derive(Deserialize, JsonSchema)]
-pub struct PathParams {
+pub struct DeleteDocumentPathParams {
     vault_id: VaultId,
     document_id: DocumentId,
 }
@@ -25,10 +25,10 @@ pub struct PathParams {
 #[axum::debug_handler]
 pub async fn delete_document(
     TypedHeader(auth_header): TypedHeader<Authorization<Bearer>>,
-    Path(PathParams {
+    Path(DeleteDocumentPathParams {
         vault_id,
         document_id,
-    }): Path<PathParams>,
+    }): Path<DeleteDocumentPathParams>,
     State(mut state): State<AppState>,
     Json(request): Json<DeleteDocumentVersion>,
 ) -> Result<Json<DocumentVersionWithoutContent>, SyncServerError> {
diff --git a/backend/sync_server/src/server/fetch_document_version.rs b/backend/sync_server/src/server/fetch_document_version.rs
index a2b157e3..be488c18 100644
--- a/backend/sync_server/src/server/fetch_document_version.rs
+++ b/backend/sync_server/src/server/fetch_document_version.rs
@@ -16,7 +16,7 @@ use crate::{
 
 // This is required for aide to infer the path parameter types and names
 #[derive(Deserialize, JsonSchema)]
-pub struct PathParams {
+pub struct FetchDocumentVersionPathParams {
     vault_id: VaultId,
     document_id: DocumentId,
     vault_update_id: VaultUpdateId,
@@ -25,11 +25,11 @@ pub struct PathParams {
 #[axum::debug_handler]
 pub async fn fetch_document_version(
     TypedHeader(auth_header): TypedHeader<Authorization<Bearer>>,
-    Path(PathParams {
+    Path(FetchDocumentVersionPathParams {
         vault_id,
         document_id,
         vault_update_id,
-    }): Path<PathParams>,
+    }): Path<FetchDocumentVersionPathParams>,
     State(mut state): State<AppState>,
 ) -> Result<Json<DocumentVersion>, SyncServerError> {
     auth(&state, auth_header.token())?;
diff --git a/backend/sync_server/src/server/fetch_document_version_content.rs b/backend/sync_server/src/server/fetch_document_version_content.rs
index 203f0afb..746c9b3a 100644
--- a/backend/sync_server/src/server/fetch_document_version_content.rs
+++ b/backend/sync_server/src/server/fetch_document_version_content.rs
@@ -18,7 +18,7 @@ use crate::{
 
 // This is required for aide to infer the path parameter types and names
 #[derive(Deserialize, JsonSchema)]
-pub struct PathParams {
+pub struct FetchDocumentVersionContentPathParams {
     vault_id: VaultId,
     document_id: DocumentId,
     vault_update_id: VaultUpdateId,
@@ -27,11 +27,11 @@ pub struct PathParams {
 #[axum::debug_handler]
 pub async fn fetch_document_version_content(
     TypedHeader(auth_header): TypedHeader<Authorization<Bearer>>,
-    Path(PathParams {
+    Path(FetchDocumentVersionContentPathParams {
         vault_id,
         document_id,
         vault_update_id,
-    }): Path<PathParams>,
+    }): Path<FetchDocumentVersionContentPathParams>,
     State(mut state): State<AppState>,
 ) -> Result<Bytes, SyncServerError> {
     auth(&state, auth_header.token())?;
diff --git a/backend/sync_server/src/server/fetch_latest_document_version.rs b/backend/sync_server/src/server/fetch_latest_document_version.rs
index 331730e0..c9c2fdec 100644
--- a/backend/sync_server/src/server/fetch_latest_document_version.rs
+++ b/backend/sync_server/src/server/fetch_latest_document_version.rs
@@ -16,7 +16,7 @@ use crate::{
 
 // This is required for aide to infer the path parameter types and names
 #[derive(Deserialize, JsonSchema)]
-pub struct PathParams {
+pub struct FetchLatestDocumentVersionPathParams {
     vault_id: VaultId,
     document_id: DocumentId,
 }
@@ -24,10 +24,10 @@ pub struct PathParams {
 #[axum::debug_handler]
 pub async fn fetch_latest_document_version(
     TypedHeader(auth_header): TypedHeader<Authorization<Bearer>>,
-    Path(PathParams {
+    Path(FetchLatestDocumentVersionPathParams {
         vault_id,
         document_id,
-    }): Path<PathParams>,
+    }): Path<FetchLatestDocumentVersionPathParams>,
     State(mut state): State<AppState>,
 ) -> Result<Json<DocumentVersion>, SyncServerError> {
     auth(&state, auth_header.token())?;
diff --git a/backend/sync_server/src/server/fetch_latest_documents.rs b/backend/sync_server/src/server/fetch_latest_documents.rs
index b7ff09b7..89197c2e 100644
--- a/backend/sync_server/src/server/fetch_latest_documents.rs
+++ b/backend/sync_server/src/server/fetch_latest_documents.rs
@@ -15,7 +15,7 @@ use crate::{
 
 // This is required for aide to infer the path parameter types and names
 #[derive(Deserialize, JsonSchema)]
-pub struct PathParams {
+pub struct FetchLatestDocumentsPathParams {
     vault_id: VaultId,
 }
 
@@ -28,7 +28,7 @@ pub struct QueryParams {
 #[axum::debug_handler]
 pub async fn fetch_latest_documents(
     TypedHeader(auth_header): TypedHeader<Authorization<Bearer>>,
-    Path(PathParams { vault_id }): Path<PathParams>,
+    Path(FetchLatestDocumentsPathParams { vault_id }): Path<FetchLatestDocumentsPathParams>,
     Query(QueryParams { since_update_id }): Query<QueryParams>,
     State(mut state): State<AppState>,
 ) -> Result<Json<FetchLatestDocumentsResponse>, SyncServerError> {
diff --git a/backend/sync_server/src/server/update_document.rs b/backend/sync_server/src/server/update_document.rs
index a9b9c13e..3b83f774 100644
--- a/backend/sync_server/src/server/update_document.rs
+++ b/backend/sync_server/src/server/update_document.rs
@@ -25,7 +25,7 @@ use crate::{
 
 // This is required for aide to infer the path parameter types and names
 #[derive(Deserialize, JsonSchema)]
-pub struct PathParams {
+pub struct UpdateDocumentPathParams {
     vault_id: VaultId,
     document_id: DocumentId,
 }
@@ -33,10 +33,10 @@ pub struct PathParams {
 #[axum::debug_handler]
 pub async fn update_document_multipart(
     TypedHeader(auth_header): TypedHeader<Authorization<Bearer>>,
-    Path(PathParams {
+    Path(UpdateDocumentPathParams {
         vault_id,
         document_id,
-    }): Path<PathParams>,
+    }): Path<UpdateDocumentPathParams>,
     State(state): State<AppState>,
     TypedMultipart(axum_typed_multipart::TypedMultipart(request)): TypedMultipart<
         UpdateDocumentVersionMultipart,
@@ -57,10 +57,10 @@ pub async fn update_document_multipart(
 #[axum::debug_handler]
 pub async fn update_document_json(
     TypedHeader(auth_header): TypedHeader<Authorization<Bearer>>,
-    Path(PathParams {
+    Path(UpdateDocumentPathParams {
         vault_id,
         document_id,
-    }): Path<PathParams>,
+    }): Path<UpdateDocumentPathParams>,
     State(state): State<AppState>,
     Json(request): Json<UpdateDocumentVersion>,
 ) -> Result<Json<DocumentUpdateResponse>, SyncServerError> {
diff --git a/frontend/sync-client/src/services/types.ts b/frontend/sync-client/src/services/types.ts
index e8a954f3..5cd674ed 100644
--- a/frontend/sync-client/src/services/types.ts
+++ b/frontend/sync-client/src/services/types.ts
@@ -450,6 +450,9 @@ export type webhooks = Record<string, never>;
 export interface components {
 	schemas: {
 		Array_of_uint8: number[];
+		CreateDocumentPathParams: {
+			vault_id: string;
+		};
 		CreateDocumentVersion: {
 			contentBase64: string;
 			/**
@@ -465,6 +468,11 @@ export interface components {
 			document_id?: string | null;
 			relative_path: string;
 		};
+		DeleteDocumentPathParams: {
+			/** Format: uuid */
+			document_id: string;
+			vault_id: string;
+		};
 		DeleteDocumentVersion: {
 			relativePath: string;
 		};
@@ -516,6 +524,28 @@ export interface components {
 			/** Format: int64 */
 			vaultUpdateId: number;
 		};
+		FetchDocumentVersionContentPathParams: {
+			/** Format: uuid */
+			document_id: string;
+			vault_id: string;
+			/** Format: int64 */
+			vault_update_id: number;
+		};
+		FetchDocumentVersionPathParams: {
+			/** Format: uuid */
+			document_id: string;
+			vault_id: string;
+			/** Format: int64 */
+			vault_update_id: number;
+		};
+		FetchLatestDocumentVersionPathParams: {
+			/** Format: uuid */
+			document_id: string;
+			vault_id: string;
+		};
+		FetchLatestDocumentsPathParams: {
+			vault_id: string;
+		};
 		/** @description Response to a fetch latest documents request. */
 		FetchLatestDocumentsResponse: {
 			/**
@@ -525,41 +555,6 @@ export interface components {
 			lastUpdateId: number;
 			latestDocuments: components["schemas"]["DocumentVersionWithoutContent"][];
 		};
-		PathParams: {
-			vault_id: string;
-		};
-		PathParams2: {
-			vault_id: string;
-		};
-		PathParams3: {
-			/** Format: uuid */
-			document_id: string;
-			vault_id: string;
-		};
-		PathParams4: {
-			/** Format: uuid */
-			document_id: string;
-			vault_id: string;
-		};
-		PathParams5: {
-			/** Format: uuid */
-			document_id: string;
-			vault_id: string;
-			/** Format: int64 */
-			vault_update_id: number;
-		};
-		PathParams6: {
-			/** Format: uuid */
-			document_id: string;
-			vault_id: string;
-			/** Format: int64 */
-			vault_update_id: number;
-		};
-		PathParams7: {
-			/** Format: uuid */
-			document_id: string;
-			vault_id: string;
-		};
 		/** @description Response to a ping request. */
 		PingResponse: {
 			/** @description Whether the client is authenticated based on the sent Authorization header. */
@@ -575,6 +570,11 @@ export interface components {
 			causes: string[];
 			message: string;
 		};
+		UpdateDocumentPathParams: {
+			/** Format: uuid */
+			document_id: string;
+			vault_id: string;
+		};
 		UpdateDocumentVersion: {
 			contentBase64: string;
 			/** Format: int64 */

From e83539bb485411d41c70071ebf7043b9f3b83084 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Mar 2025 20:31:48 +0000
Subject: [PATCH 355/761] Inject deps

---
 frontend/sync-client/src/sync-client.ts | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts
index 1d23399c..93998d9d 100644
--- a/frontend/sync-client/src/sync-client.ts
+++ b/frontend/sync-client/src/sync-client.ts
@@ -14,6 +14,7 @@ import { Syncer } from "./sync-operations/syncer";
 import type { FileSystemOperations } from "./file-operations/filesystem-operations";
 import { FileOperations } from "./file-operations/file-operations";
 import { ConnectionStatus } from "./services/connection-status";
+import { UnrestrictedSyncer } from "./sync-operations/unrestricted-syncer";
 
 export class SyncClient {
 	private remoteListenerIntervalId: NodeJS.Timeout | null = null;
@@ -41,11 +42,6 @@ export class SyncClient {
 
 				if (newSettings.vaultName !== oldSettings.vaultName) {
 					void this.reset();
-				} else if (
-					newSettings.isSyncEnabled &&
-					!oldSettings.isSyncEnabled
-				) {
-					void this.start();
 				}
 			}
 		);
@@ -111,13 +107,27 @@ export class SyncClient {
 		const connectionStatus = new ConnectionStatus(settings, logger);
 		const syncService = new SyncService(connectionStatus, settings, logger);
 		syncService.fetchImplementation = fetch;
+		const fileOperations = new FileOperations(
+			logger,
+			database,
+			fs,
+			nativeLineEndings
+		);
+		const unrestrictedSyncer = new UnrestrictedSyncer(
+			logger,
+			database,
+			settings,
+			syncService,
+			fileOperations,
+			history
+		);
 		const syncer = new Syncer(
 			logger,
 			database,
 			settings,
 			syncService,
-			new FileOperations(logger, database, fs, nativeLineEndings),
-			history
+			fileOperations,
+			unrestrictedSyncer
 		);
 
 		const client = new SyncClient(

From 62427183fd5ef4533186b6ad48f0269699554ac5 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Mar 2025 20:32:02 +0000
Subject: [PATCH 356/761] Print current size not just limit

---
 .../sync-operations/unrestricted-syncer.ts    | 35 ++++++++++---------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
index 4df4ae03..b1d2fccc 100644
--- a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
+++ b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
@@ -369,22 +369,25 @@ export class UnrestrictedSyncer {
 		this.logger.debug(`Syncing ${relativePath} (${syncType})`);
 
 		try {
-			if (
-				(await this.operations.exists(relativePath)) &&
-				(await this.operations.getFileSize(relativePath)) / // this can throw FileNotFoundError
-					1024 /
-					1024 >
-					this.settings.getSettings().maxFileSizeMB
-			) {
-				this.history.addHistoryEntry({
-					status: SyncStatus.ERROR,
-					relativePath,
-					message: `File size exceeds the maximum file size limit of ${
-						this.settings.getSettings().maxFileSizeMB
-					}MB`,
-					type: syncType
-				});
-				return;
+			if (await this.operations.exists(relativePath)) {
+				const sizeInMB = Math.round(
+					(await this.operations.getFileSize(relativePath)) /
+						1024 /
+						1024
+				);
+
+				if (sizeInMB > this.settings.getSettings().maxFileSizeMB) {
+					this.history.addHistoryEntry({
+						status: SyncStatus.ERROR,
+						relativePath,
+						message: `File size of ${sizeInMB} MB exceeds the maximum file size limit of ${
+							this.settings.getSettings().maxFileSizeMB
+						} MB`,
+						type: syncType
+					});
+
+					return;
+				}
 			}
 
 			return await fn();

From a8cadd1e5366b7387749e5f9e6ed76a33931f38f Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Mar 2025 20:50:43 +0000
Subject: [PATCH 357/761] Fix test

---
 frontend/sync-client/src/index.ts             |  2 +-
 frontend/sync-client/src/sync-client.ts       |  3 +-
 .../sync-client/src/sync-operations/syncer.ts | 31 +++++++------------
 frontend/test-client/src/agent/mock-client.ts | 15 ++++++++-
 4 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/frontend/sync-client/src/index.ts b/frontend/sync-client/src/index.ts
index cb8a38a2..d40b5aab 100644
--- a/frontend/sync-client/src/index.ts
+++ b/frontend/sync-client/src/index.ts
@@ -7,7 +7,7 @@ export {
 export { Logger, LogLevel, LogLine } from "./tracing/logger";
 export type { CheckConnectionResult } from "./services/sync-service";
 export { type SyncSettings } from "./persistence/settings";
-export type { RelativePath } from "./persistence/database";
+export type { RelativePath, StoredDatabase } from "./persistence/database";
 export type { FileSystemOperations } from "./file-operations/filesystem-operations";
 export type { PersistenceProvider } from "./persistence/persistence";
 
diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts
index 93998d9d..ceadd8cf 100644
--- a/frontend/sync-client/src/sync-client.ts
+++ b/frontend/sync-client/src/sync-client.ts
@@ -173,8 +173,7 @@ export class SyncClient {
 	}
 
 	public async waitAndStop(): Promise<void> {
-		await this.syncer.applyRemoteChangesLocally();
-		await this.syncer.waitForSyncQueue();
+		await this.syncer.waitUntilFinished();
 		this.stop();
 	}
 
diff --git a/frontend/sync-client/src/sync-operations/syncer.ts b/frontend/sync-client/src/sync-operations/syncer.ts
index bec932a0..1c3b064c 100644
--- a/frontend/sync-client/src/sync-operations/syncer.ts
+++ b/frontend/sync-client/src/sync-operations/syncer.ts
@@ -1,7 +1,6 @@
 import type { Database, RelativePath } from "../persistence/database";
 import type { SyncService } from "../services/sync-service";
 import type { Logger } from "../tracing/logger";
-import type { SyncHistory } from "../tracing/sync-history";
 import PQueue from "p-queue";
 import { hash } from "../utils/hash";
 import { v4 as uuidv4 } from "uuid";
@@ -9,7 +8,7 @@ import type { components } from "../services/types";
 import type { Settings } from "../persistence/settings";
 import type { FileOperations } from "../file-operations/file-operations";
 import { findMatchingFile } from "../utils/find-matching-file";
-import { UnrestrictedSyncer } from "./unrestricted-syncer";
+import type { UnrestrictedSyncer } from "./unrestricted-syncer";
 import { createPromise } from "../utils/create-promise";
 import { SyncResetError } from "../services/sync-reset-error";
 
@@ -17,21 +16,18 @@ export class Syncer {
 	private readonly remainingOperationsListeners: ((
 		remainingOperations: number
 	) => void)[] = [];
-
 	private readonly syncQueue: PQueue;
 
 	private runningScheduleSyncForOfflineChanges: Promise<void> | undefined;
 	private runningApplyRemoteChangesLocally: Promise<void> | undefined;
 
-	private readonly internalSyncer: UnrestrictedSyncer;
-
 	public constructor(
 		private readonly logger: Logger,
 		private readonly database: Database,
 		settings: Settings,
 		private readonly syncService: SyncService,
 		private readonly operations: FileOperations,
-		history: SyncHistory
+		private readonly internalSyncer: UnrestrictedSyncer
 	) {
 		this.syncQueue = new PQueue({
 			concurrency: settings.getSettings().syncConcurrency
@@ -49,15 +45,6 @@ export class Syncer {
 				listener(this.syncQueue.size);
 			});
 		});
-
-		this.internalSyncer = new UnrestrictedSyncer(
-			logger,
-			database,
-			settings,
-			syncService,
-			operations,
-			history
-		);
 	}
 
 	public addRemainingOperationsListener(
@@ -246,13 +233,17 @@ export class Syncer {
 		}
 	}
 
-	public async waitForSyncQueue(): Promise<void> {
-		return this.syncQueue.onEmpty();
+	public async reset(): Promise<void> {
+		await this.waitUntilFinished();
+		this.internalSyncer.reset();
 	}
 
-	public async reset(): Promise<void> {
-		await this.syncQueue.onEmpty();
-		this.internalSyncer.reset();
+	public async waitUntilFinished(): Promise<void> {
+		await Promise.allSettled([
+			this.runningScheduleSyncForOfflineChanges,
+			this.runningApplyRemoteChangesLocally
+		]);
+		return this.syncQueue.onEmpty();
 	}
 
 	private async internalApplyRemoteChangesLocally(): Promise<void> {
diff --git a/frontend/test-client/src/agent/mock-client.ts b/frontend/test-client/src/agent/mock-client.ts
index 793c3775..3913bb14 100644
--- a/frontend/test-client/src/agent/mock-client.ts
+++ b/frontend/test-client/src/agent/mock-client.ts
@@ -1,3 +1,4 @@
+import type { StoredDatabase } from "sync-client/dist/types/persistence/database";
 import { assert } from "../utils/assert";
 import {
 	type RelativePath,
@@ -9,7 +10,17 @@ import {
 export class MockClient implements FileSystemOperations {
 	protected readonly localFiles = new Map<string, Uint8Array>();
 	protected client!: SyncClient;
-	protected data: object | undefined = undefined;
+
+	protected data: Partial<{
+		settings: Partial<SyncSettings>;
+		database: Partial<StoredDatabase>;
+	}> = {
+		database: {
+			// Assume all clients start at the same time so there's no need to fetch
+			// any shared state.
+			hasInitialSyncCompleted: true
+		}
+	};
 
 	public constructor(
 		private readonly initialSettings: Partial<SyncSettings>,
@@ -37,6 +48,8 @@ export class MockClient implements FileSystemOperations {
 				);
 			})
 		);
+
+		await this.client.start();
 	}
 
 	public async listAllFiles(): Promise<RelativePath[]> {

From 8c98ee6c65ba019c6e1164e5c599ede95512c80c Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Mar 2025 20:50:58 +0000
Subject: [PATCH 358/761] Bump versions to 0.2.0

---
 backend/Cargo.lock                     | 6 +++---
 backend/Cargo.toml                     | 2 +-
 frontend/obsidian-plugin/manifest.json | 2 +-
 frontend/obsidian-plugin/package.json  | 2 +-
 frontend/package-lock.json             | 8 ++++----
 frontend/sync-client/package.json      | 2 +-
 frontend/test-client/package.json      | 2 +-
 manifest.json                          | 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 36901b9a..fef132d5 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1746,7 +1746,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile"
-version = "0.1.8"
+version = "0.2.0"
 dependencies = [
  "insta",
  "pretty_assertions",
@@ -2380,7 +2380,7 @@ dependencies = [
 
 [[package]]
 name = "sync_lib"
-version = "0.1.8"
+version = "0.2.0"
 dependencies = [
  "base64 0.22.1",
  "console_error_panic_hook",
@@ -2393,7 +2393,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.1.8"
+version = "0.2.0"
 dependencies = [
  "aide",
  "aide-axum-typed-multipart",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index a0dea7ec..f1ec981c 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -12,7 +12,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.1.8"
+version = "0.2.0"
 
 [workspace.dependencies]  
 serde = { version = "1.0.214", default-features = false, features = ["derive"] }
diff --git a/frontend/obsidian-plugin/manifest.json b/frontend/obsidian-plugin/manifest.json
index 9bea5612..df4255bf 100644
--- a/frontend/obsidian-plugin/manifest.json
+++ b/frontend/obsidian-plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.1.8",
+	"version": "0.2.0",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index 8efdb8a2..43387e63 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.1.8",
+	"version": "0.2.0",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 33f2f0bc..6a367708 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -21,7 +21,7 @@
 		},
 		"../backend/sync_lib/pkg": {
 			"name": "sync_lib",
-			"version": "0.1.8",
+			"version": "0.2.0",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -6720,7 +6720,7 @@
 		},
 		"obsidian-plugin": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.1.8",
+			"version": "0.2.0",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
@@ -6748,7 +6748,7 @@
 			}
 		},
 		"sync-client": {
-			"version": "0.1.8",
+			"version": "0.2.0",
 			"dependencies": {
 				"byte-base64": "^1.1.0",
 				"openapi-fetch": "0.13.5",
@@ -6771,7 +6771,7 @@
 			}
 		},
 		"test-client": {
-			"version": "0.1.8",
+			"version": "0.2.0",
 			"bin": {
 				"test-client": "dist/cli.js"
 			},
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index 0943bdbb..ee28075c 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "sync-client",
-	"version": "0.1.8",
+	"version": "0.2.0",
 	"main": "dist/sync-client.node.js",
 	"browser": "dist/sync-client.web.js",
 	"types": "dist/types/index.d.ts",
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index c8ef19f6..9192670e 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "test-client",
-	"version": "0.1.8",
+	"version": "0.2.0",
 	"private": true,
 	"bin": {
 		"test-client": "./dist/cli.js"
diff --git a/manifest.json b/manifest.json
index 9bea5612..df4255bf 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.1.8",
+	"version": "0.2.0",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",

From bb015209a2bf86f7859217ef45d65bd30a4c4068 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Mar 2025 20:52:16 +0000
Subject: [PATCH 359/761] Fix build

---
 frontend/sync-client/src/persistence/persistence.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/sync-client/src/persistence/persistence.ts b/frontend/sync-client/src/persistence/persistence.ts
index 3e57e0e0..706ae6ff 100644
--- a/frontend/sync-client/src/persistence/persistence.ts
+++ b/frontend/sync-client/src/persistence/persistence.ts
@@ -1,4 +1,4 @@
-export interface PersistenceProvider<T extends object> {
+export interface PersistenceProvider<T> {
 	load: () => Promise<T | undefined>;
-	save: (data: T | undefined) => Promise<void>;
+	save: (data: T) => Promise<void>;
 }

From a4ee946b93425a74b83e4c31e758efcdd8ae5bff Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Mar 2025 20:52:26 +0000
Subject: [PATCH 360/761] Bump versions to 0.2.1

---
 backend/Cargo.lock                     | 6 +++---
 backend/Cargo.toml                     | 2 +-
 frontend/obsidian-plugin/manifest.json | 2 +-
 frontend/obsidian-plugin/package.json  | 2 +-
 frontend/package-lock.json             | 8 ++++----
 frontend/sync-client/package.json      | 2 +-
 frontend/test-client/package.json      | 2 +-
 manifest.json                          | 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index fef132d5..e5ecbaac 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1746,7 +1746,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile"
-version = "0.2.0"
+version = "0.2.1"
 dependencies = [
  "insta",
  "pretty_assertions",
@@ -2380,7 +2380,7 @@ dependencies = [
 
 [[package]]
 name = "sync_lib"
-version = "0.2.0"
+version = "0.2.1"
 dependencies = [
  "base64 0.22.1",
  "console_error_panic_hook",
@@ -2393,7 +2393,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.2.0"
+version = "0.2.1"
 dependencies = [
  "aide",
  "aide-axum-typed-multipart",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index f1ec981c..1468eba2 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -12,7 +12,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.2.0"
+version = "0.2.1"
 
 [workspace.dependencies]  
 serde = { version = "1.0.214", default-features = false, features = ["derive"] }
diff --git a/frontend/obsidian-plugin/manifest.json b/frontend/obsidian-plugin/manifest.json
index df4255bf..69c0d8d5 100644
--- a/frontend/obsidian-plugin/manifest.json
+++ b/frontend/obsidian-plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.2.0",
+	"version": "0.2.1",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index 43387e63..9ad44d81 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.2.0",
+	"version": "0.2.1",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 6a367708..7c5344e1 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -21,7 +21,7 @@
 		},
 		"../backend/sync_lib/pkg": {
 			"name": "sync_lib",
-			"version": "0.2.0",
+			"version": "0.2.1",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -6720,7 +6720,7 @@
 		},
 		"obsidian-plugin": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.2.0",
+			"version": "0.2.1",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
@@ -6748,7 +6748,7 @@
 			}
 		},
 		"sync-client": {
-			"version": "0.2.0",
+			"version": "0.2.1",
 			"dependencies": {
 				"byte-base64": "^1.1.0",
 				"openapi-fetch": "0.13.5",
@@ -6771,7 +6771,7 @@
 			}
 		},
 		"test-client": {
-			"version": "0.2.0",
+			"version": "0.2.1",
 			"bin": {
 				"test-client": "dist/cli.js"
 			},
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index ee28075c..1107f1aa 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "sync-client",
-	"version": "0.2.0",
+	"version": "0.2.1",
 	"main": "dist/sync-client.node.js",
 	"browser": "dist/sync-client.web.js",
 	"types": "dist/types/index.d.ts",
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index 9192670e..89ab18e1 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "test-client",
-	"version": "0.2.0",
+	"version": "0.2.1",
 	"private": true,
 	"bin": {
 		"test-client": "./dist/cli.js"
diff --git a/manifest.json b/manifest.json
index df4255bf..69c0d8d5 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.2.0",
+	"version": "0.2.1",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",

From 58a61d036b108454cb38f3ed46ed2a9212810e9a Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Mar 2025 20:55:14 +0000
Subject: [PATCH 361/761] Update branch name

---
 .github/workflows/check.yml          | 4 ++--
 .github/workflows/e2e.yml            | 4 ++--
 .github/workflows/publish-docker.yml | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index f5fe73d7..4491e98f 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -2,9 +2,9 @@ name: Check
 
 on:
   push:
-    branches: ["master"]
+    branches: ["main"]
   pull_request:
-    branches: ["master"]
+    branches: ["main"]
 
 env:
   CARGO_TERM_COLOR: always
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index c5f6c645..2352e5b2 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -2,9 +2,9 @@ name: E2E tests
 
 on:
   push:
-    branches: ["master"]
+    branches: ["main"]
   pull_request:
-    branches: ["master"]
+    branches: ["main"]
 
 env:
   CARGO_TERM_COLOR: always
diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml
index 2b8f8637..7113992f 100644
--- a/.github/workflows/publish-docker.yml
+++ b/.github/workflows/publish-docker.yml
@@ -2,10 +2,10 @@ name: Publish server Docker image
 
 on:
   push:
-    branches: ["master"]
+    branches: ["main"]
     tags: ["*"]
   pull_request:
-    branches: ["master"]
+    branches: ["main"]
 
 env:
   # Use docker.io for Docker Hub if empty

From 468d0ac8cf9d13b0c43444299544036c8382e375 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 23 Mar 2025 15:00:20 +0000
Subject: [PATCH 362/761] Fix history view

---
 frontend/obsidian-plugin/src/styles.scss      |  2 +-
 .../obsidian-plugin/src/views/history-view.ts | 40 ++++++----
 frontend/sync-client/src/sync-client.ts       |  4 +-
 .../sync-client/src/tracing/sync-history.ts   | 76 ++++++++++++-------
 4 files changed, 77 insertions(+), 45 deletions(-)

diff --git a/frontend/obsidian-plugin/src/styles.scss b/frontend/obsidian-plugin/src/styles.scss
index 9ffc5caa..110e7152 100644
--- a/frontend/obsidian-plugin/src/styles.scss
+++ b/frontend/obsidian-plugin/src/styles.scss
@@ -70,7 +70,7 @@
 
 	textarea {
 		resize: none;
-		height: 60px;
+		height: 75px;
 	}
 }
 
diff --git a/frontend/obsidian-plugin/src/views/history-view.ts b/frontend/obsidian-plugin/src/views/history-view.ts
index 2169a425..2a4d7e1e 100644
--- a/frontend/obsidian-plugin/src/views/history-view.ts
+++ b/frontend/obsidian-plugin/src/views/history-view.ts
@@ -23,11 +23,14 @@ export class HistoryView extends ItemView {
 		super(leaf);
 		this.icon = HistoryView.ICON;
 
-		this.client.addSyncHistoryUpdateListener(() => {
-			this.updateView().catch((_error: unknown) => {
-				this.client.logger.error("Failed to update history view");
-			});
-		});
+		this.client.addSyncHistoryUpdateListener(
+			() =>
+				void this.updateView().catch((error: unknown) => {
+					this.client.logger.error(
+						`Failed to update history view: ${error}`
+					);
+				})
+		);
 	}
 
 	private static getSyncTypeIcon(type: SyncType | undefined): IconName {
@@ -58,6 +61,21 @@ export class HistoryView extends ItemView {
 		});
 	}
 
+	private static updateTimeSince(
+		element: HTMLElement,
+		entry: HistoryEntry
+	): void {
+		const timestampElement = element.querySelector(
+			".history-card-timestamp"
+		);
+		if (timestampElement != null) {
+			timestampElement.textContent = intlFormatDistance(
+				entry.timestamp,
+				new Date()
+			);
+		}
+	}
+
 	public getViewType(): string {
 		return HistoryView.TYPE;
 	}
@@ -88,7 +106,7 @@ export class HistoryView extends ItemView {
 			return;
 		}
 
-		const entries = this.client.getHistoryEntries().reverse();
+		const entries = this.client.getHistoryEntries();
 
 		if (this.historyEntryToElement.size === 0 && entries.length > 0) {
 			// Clear the "No update has happened yet" message
@@ -98,15 +116,7 @@ export class HistoryView extends ItemView {
 		entries.forEach((entry) => {
 			const element = this.historyEntryToElement.get(entry);
 			if (element !== undefined) {
-				const timestampElement = element.querySelector(
-					".history-card-timestamp"
-				);
-				if (timestampElement != null) {
-					timestampElement.textContent = intlFormatDistance(
-						entry.timestamp,
-						new Date()
-					);
-				}
+				HistoryView.updateTimeSince(element, entry);
 				return;
 			}
 
diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts
index ceadd8cf..0e0df2ff 100644
--- a/frontend/sync-client/src/sync-client.ts
+++ b/frontend/sync-client/src/sync-client.ts
@@ -149,8 +149,8 @@ export class SyncClient {
 		return this.syncService.checkConnection();
 	}
 
-	public getHistoryEntries(): HistoryEntry[] {
-		return this.history.getEntries();
+	public getHistoryEntries(): readonly HistoryEntry[] {
+		return this.history.entries;
 	}
 
 	public addSyncHistoryUpdateListener(
diff --git a/frontend/sync-client/src/tracing/sync-history.ts b/frontend/sync-client/src/tracing/sync-history.ts
index 0980d809..fe782e9b 100644
--- a/frontend/sync-client/src/tracing/sync-history.ts
+++ b/frontend/sync-client/src/tracing/sync-history.ts
@@ -28,8 +28,9 @@ export interface HistoryStats {
 
 export class SyncHistory {
 	private static readonly MAX_ENTRIES = 500;
+	private static readonly TIMEOUT_FOR_MERGING_ENTRIES_IN_SECONDS = 15;
 
-	private entries: HistoryEntry[] = [];
+	private _entries: HistoryEntry[] = [];
 
 	private readonly syncHistoryUpdateListeners: ((
 		status: HistoryStats
@@ -42,19 +43,35 @@ export class SyncHistory {
 
 	public constructor(private readonly logger: Logger) {}
 
-	public getEntries(): HistoryEntry[] {
-		return [...this.entries];
+	public get entries(): readonly HistoryEntry[] {
+		return this._entries;
 	}
 
-	public reset(): void {
-		this.entries.length = 0;
-		this.status = {
-			success: 0,
-			error: 0
+	/**
+	 * Insert the entry at the beginning of the history list. If the entry
+	 * already in the list, it will get moved to the beginning and updated.
+	 *
+	 * If the entry list is too long, the oldest entry will be removed.
+	 */
+	public addHistoryEntry(entry: CommonHistoryEntry): void {
+		const historyEntry = {
+			...entry,
+			timestamp: new Date()
 		};
-		this.syncHistoryUpdateListeners.forEach((listener) => {
-			listener(this.status);
-		});
+
+		const candidate = this.findSimilarRecentEntry(historyEntry);
+		if (candidate !== undefined) {
+			this._entries = this._entries.filter((e) => e !== candidate);
+		}
+
+		// Insert the entry at the beginning
+		this._entries.unshift(historyEntry);
+
+		if (this._entries.length > SyncHistory.MAX_ENTRIES) {
+			this._entries.pop();
+		}
+
+		this.updateSuccessCount(historyEntry);
 	}
 
 	public addSyncHistoryUpdateListener(
@@ -64,25 +81,35 @@ export class SyncHistory {
 		listener({ ...this.status });
 	}
 
-	public addHistoryEntry(entry: CommonHistoryEntry): void {
-		const historyEntry = {
-			...entry,
-			timestamp: new Date()
+	public reset(): void {
+		this._entries.length = 0;
+		this.status = {
+			success: 0,
+			error: 0
 		};
+		this.syncHistoryUpdateListeners.forEach((listener) => {
+			listener(this.status);
+		});
+	}
 
-		const candidate = this.entries.find(
-			(e) => e.relativePath === historyEntry.relativePath
+	private findSimilarRecentEntry(
+		entry: HistoryEntry
+	): HistoryEntry | undefined {
+		const candidate = this._entries.find(
+			(e) => e.relativePath === entry.relativePath
 		);
 		if (
 			candidate !== undefined &&
-			(this.entries.slice(-1)[0] === candidate ||
-				candidate.timestamp.getTime() + 10 * 1000 >
-					historyEntry.timestamp.getTime())
+			(this._entries[0] === candidate ||
+				candidate.timestamp.getTime() +
+					SyncHistory.TIMEOUT_FOR_MERGING_ENTRIES_IN_SECONDS * 1000 >
+					entry.timestamp.getTime())
 		) {
-			this.entries = this.entries.filter((e) => e !== candidate);
+			return candidate;
 		}
-		this.entries.push(historyEntry);
+	}
 
+	private updateSuccessCount(entry: HistoryEntry): void {
 		if (entry.status === SyncStatus.SUCCESS) {
 			this.status.success++;
 			this.logger.info(
@@ -94,13 +121,8 @@ export class SyncHistory {
 				`Cannot sync file: ${entry.relativePath} - ${entry.message}`
 			);
 		}
-
 		this.syncHistoryUpdateListeners.forEach((listener) => {
 			listener(this.status);
 		});
-
-		if (this.entries.length > SyncHistory.MAX_ENTRIES) {
-			this.entries.shift();
-		}
 	}
 }

From 272cb2e958bcb1ade0dfc133b67eae754d03f6fc Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 23 Mar 2025 15:13:45 +0000
Subject: [PATCH 363/761] Create dependabot.yml

---
 .github/dependabot.yml | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 .github/dependabot.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 00000000..5a33123b
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,27 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: "npm"
+    directories: ["**"]
+    schedule:
+      interval: "daily"
+
+  - package-ecosystem: "docker"
+    directories: ["**"]
+    schedule:
+      interval: "daily"
+
+  - package-ecosystem: "cargo"
+    directories: ["**"]
+    schedule:
+      interval: "daily"
+
+  # Disable this for security reasons
+  # - package-ecosystem: "github-actions"
+  #   directories: ["**"]
+  #   schedule:
+  #     interval: "daily"

From 0ae05dda1641a8e4f310b8d6b1ffc6ad11fb7745 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Mon, 24 Mar 2025 21:16:23 +0000
Subject: [PATCH 364/761] Remove todos

---
 README.md | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/README.md b/README.md
index cad994b6..9aa988bb 100644
--- a/README.md
+++ b/README.md
@@ -53,16 +53,3 @@ scripts/e2e.sh
 ```
 
 And to clean up the logs & database files, run `scripts/clean-up.sh`
-
-## Todos
-
-- Don't show server traces on auth failure
-- Better server logs
-- Allow setting config.yml path for server
-- history tab for going back
-- show cursors
-- use websocket
-- fix docker publish
-- add self-hosted runner protection
-- change default branch
-- split repo

From 3e4e7d38d861cc8ded949ddea265ddf0048bb201 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Mon, 24 Mar 2025 21:16:32 +0000
Subject: [PATCH 365/761] Bump versions to 0.2.2

---
 backend/Cargo.lock                     | 6 +++---
 backend/Cargo.toml                     | 2 +-
 frontend/obsidian-plugin/manifest.json | 2 +-
 frontend/obsidian-plugin/package.json  | 2 +-
 frontend/package-lock.json             | 8 ++++----
 frontend/sync-client/package.json      | 2 +-
 frontend/test-client/package.json      | 2 +-
 manifest.json                          | 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index e5ecbaac..6292ef06 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1746,7 +1746,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile"
-version = "0.2.1"
+version = "0.2.2"
 dependencies = [
  "insta",
  "pretty_assertions",
@@ -2380,7 +2380,7 @@ dependencies = [
 
 [[package]]
 name = "sync_lib"
-version = "0.2.1"
+version = "0.2.2"
 dependencies = [
  "base64 0.22.1",
  "console_error_panic_hook",
@@ -2393,7 +2393,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.2.1"
+version = "0.2.2"
 dependencies = [
  "aide",
  "aide-axum-typed-multipart",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 1468eba2..9c346afd 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -12,7 +12,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.2.1"
+version = "0.2.2"
 
 [workspace.dependencies]  
 serde = { version = "1.0.214", default-features = false, features = ["derive"] }
diff --git a/frontend/obsidian-plugin/manifest.json b/frontend/obsidian-plugin/manifest.json
index 69c0d8d5..740b2086 100644
--- a/frontend/obsidian-plugin/manifest.json
+++ b/frontend/obsidian-plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.2.1",
+	"version": "0.2.2",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index 9ad44d81..5c6671d4 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.2.1",
+	"version": "0.2.2",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 7c5344e1..c1995ecf 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -21,7 +21,7 @@
 		},
 		"../backend/sync_lib/pkg": {
 			"name": "sync_lib",
-			"version": "0.2.1",
+			"version": "0.2.2",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -6720,7 +6720,7 @@
 		},
 		"obsidian-plugin": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.2.1",
+			"version": "0.2.2",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
@@ -6748,7 +6748,7 @@
 			}
 		},
 		"sync-client": {
-			"version": "0.2.1",
+			"version": "0.2.2",
 			"dependencies": {
 				"byte-base64": "^1.1.0",
 				"openapi-fetch": "0.13.5",
@@ -6771,7 +6771,7 @@
 			}
 		},
 		"test-client": {
-			"version": "0.2.1",
+			"version": "0.2.2",
 			"bin": {
 				"test-client": "dist/cli.js"
 			},
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index 1107f1aa..5524df0c 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "sync-client",
-	"version": "0.2.1",
+	"version": "0.2.2",
 	"main": "dist/sync-client.node.js",
 	"browser": "dist/sync-client.web.js",
 	"types": "dist/types/index.d.ts",
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index 89ab18e1..c4e3e639 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "test-client",
-	"version": "0.2.1",
+	"version": "0.2.2",
 	"private": true,
 	"bin": {
 		"test-client": "./dist/cli.js"
diff --git a/manifest.json b/manifest.json
index 69c0d8d5..740b2086 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.2.1",
+	"version": "0.2.2",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",

From a6fd0f1dd7e34575e17dbc665f09a2aa1d497256 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Mon, 24 Mar 2025 21:57:05 +0000
Subject: [PATCH 366/761] Add clap

---
 backend/Cargo.lock             | 109 +++++++++++++++++++++++++++++++++
 backend/sync_server/Cargo.toml |   1 +
 2 files changed, 110 insertions(+)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 6292ef06..4ea73d94 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -96,6 +96,56 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "anstream"
+version = "0.6.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
+dependencies = [
+ "anstyle",
+ "once_cell",
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "anyhow"
 version = "1.0.94"
@@ -399,6 +449,52 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "clap"
+version = "4.5.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6088f3ae8c3608d19260cd7445411865a485688711b78b5be70d78cd96136f83"
+dependencies = [
+ "clap_builder",
+ "clap_derive",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.5.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22a7ef7f676155edfb82daa97f99441f3ebf4a58d5e32f295a56259f1b6facc8"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "clap_lex",
+ "strsim",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.5.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
+
+[[package]]
+name = "colorchoice"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
+
 [[package]]
 name = "concurrent-queue"
 version = "2.5.0"
@@ -1196,6 +1292,12 @@ dependencies = [
  "similar",
 ]
 
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+
 [[package]]
 name = "iso8601"
 version = "0.6.1"
@@ -2403,6 +2505,7 @@ dependencies = [
  "axum-jsonschema",
  "axum_typed_multipart",
  "chrono",
+ "clap",
  "log",
  "rand",
  "reconcile",
@@ -2826,6 +2929,12 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
 
+[[package]]
+name = "utf8parse"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+
 [[package]]
 name = "uuid"
 version = "1.11.0"
diff --git a/backend/sync_server/Cargo.toml b/backend/sync_server/Cargo.toml
index 8b14c450..4b31cc1c 100644
--- a/backend/sync_server/Cargo.toml
+++ b/backend/sync_server/Cargo.toml
@@ -33,6 +33,7 @@ rand = "0.8.5"
 sanitize-filename = "0.6.0"
 axum-jsonschema = { version = "0.8.0", features = ["aide"] }
 regex = "1.11.1"
+clap = { version = "4.5.32", features = ["derive"] }
 
 [lints]
 workspace = true

From 958af89116e617e8f7d31a4e360ee1b397ab49fc Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Mon, 24 Mar 2025 21:57:26 +0000
Subject: [PATCH 367/761] Rename config.yml

---
 .github/workflows/e2e.yml              | 2 +-
 backend/.dockerignore                  | 2 +-
 backend/{config.yml => config-e2e.yml} | 6 ++++++
 frontend/test-client/src/cli.ts        | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)
 rename backend/{config.yml => config-e2e.yml} (76%)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 2352e5b2..1481234d 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -38,7 +38,7 @@ jobs:
       - name: E2E tests
         run: |
           cd backend
-          RUST_BACKTRACE=1 cargo run -p sync_server &
+          RUST_BACKTRACE=1 cargo run -p sync_server config-e2e.yml &
           cd ..
 
           scripts/update-api-types.sh
diff --git a/backend/.dockerignore b/backend/.dockerignore
index dd62faf4..985e2cd4 100644
--- a/backend/.dockerignore
+++ b/backend/.dockerignore
@@ -3,4 +3,4 @@ Dockerfile
 .dockerignore
 databases
 sync_lib/pkg
-config.yml
+*.yml
diff --git a/backend/config.yml b/backend/config-e2e.yml
similarity index 76%
rename from backend/config.yml
rename to backend/config-e2e.yml
index d8ccf20d..2345c8b3 100644
--- a/backend/config.yml
+++ b/backend/config-e2e.yml
@@ -9,5 +9,11 @@ users:
   user_tokens:
   - name: admin
     token: test-token-change-me
+    vaults: 
+      all: true
+
   - name: test
     token: other-test-token
+    vaults: 
+      allowed:
+       - default
diff --git a/frontend/test-client/src/cli.ts b/frontend/test-client/src/cli.ts
index 4747f2af..799ee790 100644
--- a/frontend/test-client/src/cli.ts
+++ b/frontend/test-client/src/cli.ts
@@ -27,7 +27,7 @@ async function runTest({
 
 	const initialSettings: Partial<SyncSettings> = {
 		isSyncEnabled: true,
-		token: "test-token-change-me", // same as in backend/config.yml
+		token: "test-token-change-me", // same as in backend/config-e2e.yml
 		vaultName: uuidv4(),
 		syncConcurrency: concurrency,
 		remoteUri: "http://localhost:3000"

From baba8f82bfab079a1e8f1e36322cecbbb35e78c9 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Mon, 24 Mar 2025 21:57:56 +0000
Subject: [PATCH 368/761] Take config path as input

---
 backend/sync_server/src/cli.rs              |  1 +
 backend/sync_server/src/cli/args.rs         | 38 +++++++++++++++++++++
 backend/sync_server/src/consts.rs           |  2 +-
 backend/sync_server/src/main.rs             |  7 +++-
 backend/sync_server/src/server.rs           |  6 ++--
 backend/sync_server/src/server/app_state.rs | 11 +++---
 6 files changed, 56 insertions(+), 9 deletions(-)
 create mode 100644 backend/sync_server/src/cli.rs
 create mode 100644 backend/sync_server/src/cli/args.rs

diff --git a/backend/sync_server/src/cli.rs b/backend/sync_server/src/cli.rs
new file mode 100644
index 00000000..6e10f4ad
--- /dev/null
+++ b/backend/sync_server/src/cli.rs
@@ -0,0 +1 @@
+pub mod args;
diff --git a/backend/sync_server/src/cli/args.rs b/backend/sync_server/src/cli/args.rs
new file mode 100644
index 00000000..ec5739f9
--- /dev/null
+++ b/backend/sync_server/src/cli/args.rs
@@ -0,0 +1,38 @@
+use std::ffi::OsString;
+
+use clap::{Parser, ValueEnum};
+
+/// Simple program to greet a person
+#[derive(Parser, Debug)]
+#[command(version, about, long_about = None)]
+pub struct Args {
+    #[arg(
+            long,
+            require_equals = true,
+            value_name = "WHEN",
+            num_args = 0..=1,
+            default_value_t = ColorWhen::Auto,
+            default_missing_value = "always",
+            value_enum
+        )]
+    pub color: ColorWhen,
+
+    #[arg(last = true)]
+    pub config_path: Option<OsString>,
+}
+
+#[derive(ValueEnum, Copy, Clone, Debug, PartialEq, Eq)]
+pub enum ColorWhen {
+    Always,
+    Auto,
+    Never,
+}
+
+impl std::fmt::Display for ColorWhen {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        self.to_possible_value()
+            .expect("no values are skipped")
+            .get_name()
+            .fmt(f)
+    }
+}
diff --git a/backend/sync_server/src/consts.rs b/backend/sync_server/src/consts.rs
index f38012de..bec936b4 100644
--- a/backend/sync_server/src/consts.rs
+++ b/backend/sync_server/src/consts.rs
@@ -1,4 +1,4 @@
-pub const CONFIG_PATH: &str = "config.yml";
+pub const DEFAULT_CONFIG_PATH: &str = "config.yml";
 pub const DEFAULT_DATABASES_DIRECTORY_PATH: &str = "databases";
 pub const DEFAULT_HOST: &str = "127.0.0.1";
 pub const DEFAULT_PORT: u16 = 3000;
diff --git a/backend/sync_server/src/main.rs b/backend/sync_server/src/main.rs
index 61f6f2af..2b8abccd 100644
--- a/backend/sync_server/src/main.rs
+++ b/backend/sync_server/src/main.rs
@@ -1,3 +1,4 @@
+mod cli;
 mod config;
 mod consts;
 mod database;
@@ -6,6 +7,8 @@ mod server;
 mod utils;
 
 use anyhow::{Context as _, Result};
+use clap::Parser;
+use cli::args::Args;
 use errors::{SyncServerError, init_error};
 use log::info;
 use server::create_server;
@@ -13,6 +16,8 @@ use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};
 
 #[tokio::main]
 async fn main() -> Result<(), SyncServerError> {
+    let args = Args::parse();
+
     tracing_subscriber::registry()
         .with(
             tracing_subscriber::EnvFilter::try_from_default_env().unwrap_or_else(|_| {
@@ -33,7 +38,7 @@ async fn main() -> Result<(), SyncServerError> {
         env!("CARGO_PKG_VERSION")
     );
 
-    create_server()
+    create_server(args.config_path)
         .await
         .context("Failed to start server")
         .map_err(init_error)
diff --git a/backend/sync_server/src/server.rs b/backend/sync_server/src/server.rs
index 511187e0..083be5ba 100644
--- a/backend/sync_server/src/server.rs
+++ b/backend/sync_server/src/server.rs
@@ -1,4 +1,4 @@
-use std::sync::Arc;
+use std::{ffi::OsString, sync::Arc};
 
 use aide::{
     axum::{
@@ -48,11 +48,11 @@ mod requests;
 mod responses;
 mod update_document;
 
-pub async fn create_server() -> Result<()> {
+pub async fn create_server(config_path: Option<OsString>) -> Result<()> {
     aide::r#gen::on_error(|err| error!("{err}"));
     aide::r#gen::extract_schemas(true);
 
-    let app_state = AppState::try_new()
+    let app_state = AppState::try_new(config_path)
         .await
         .context("Failed to initialise app state")?;
 
diff --git a/backend/sync_server/src/server/app_state.rs b/backend/sync_server/src/server/app_state.rs
index 0b02abcb..2a8a96eb 100644
--- a/backend/sync_server/src/server/app_state.rs
+++ b/backend/sync_server/src/server/app_state.rs
@@ -1,6 +1,8 @@
+use std::ffi::OsString;
+
 use anyhow::Result;
 
-use crate::{config::Config, consts::CONFIG_PATH, database::Database};
+use crate::{config::Config, consts::DEFAULT_CONFIG_PATH, database::Database};
 
 #[derive(Clone, Debug)]
 pub struct AppState {
@@ -9,10 +11,11 @@ pub struct AppState {
 }
 
 impl AppState {
-    pub async fn try_new() -> Result<Self> {
-        let path = std::path::Path::new(CONFIG_PATH);
+    pub async fn try_new(config_path: Option<OsString>) -> Result<Self> {
+        let config_path = config_path.unwrap_or_else(|| OsString::from(DEFAULT_CONFIG_PATH));
+        let path = std::path::PathBuf::from(config_path);
 
-        let config = Config::read_or_create(path).await?;
+        let config = Config::read_or_create(&path).await?;
         let database = Database::try_new(&config.database).await?;
 
         Ok(Self { config, database })

From ccff1cfc7a1b7edb65c4c4b351c5fe7685729017 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Mon, 24 Mar 2025 22:03:43 +0000
Subject: [PATCH 369/761] Fix parsing

---
 backend/sync_server/src/cli/args.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/sync_server/src/cli/args.rs b/backend/sync_server/src/cli/args.rs
index ec5739f9..88ff1718 100644
--- a/backend/sync_server/src/cli/args.rs
+++ b/backend/sync_server/src/cli/args.rs
@@ -2,10 +2,13 @@ use std::ffi::OsString;
 
 use clap::{Parser, ValueEnum};
 
-/// Simple program to greet a person
+/// Server for backing the VaultLink plugin
 #[derive(Parser, Debug)]
 #[command(version, about, long_about = None)]
 pub struct Args {
+    #[arg(index = 1)]
+    pub config_path: Option<OsString>,
+
     #[arg(
             long,
             require_equals = true,
@@ -16,9 +19,6 @@ pub struct Args {
             value_enum
         )]
     pub color: ColorWhen,
-
-    #[arg(last = true)]
-    pub config_path: Option<OsString>,
 }
 
 #[derive(ValueEnum, Copy, Clone, Debug, PartialEq, Eq)]

From 237b4b9f9d9c1f53e4ccc62de49f5b4062262fde Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 25 Mar 2025 22:28:09 +0000
Subject: [PATCH 370/761] Bump uuid from 1.11.0 to 1.16.0 in /backend (#9)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 backend/Cargo.lock             | 52 ++++++++++++++++++++++++++++------
 backend/sync_server/Cargo.toml |  2 +-
 2 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 4ea73d94..30d157fb 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -24,7 +24,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
 dependencies = [
  "cfg-if",
- "getrandom",
+ "getrandom 0.2.15",
  "once_cell",
  "serde",
  "version_check",
@@ -922,10 +922,22 @@ dependencies = [
  "cfg-if",
  "js-sys",
  "libc",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "getrandom"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "r-efi",
+ "wasi 0.14.2+wasi-0.2.4",
+]
+
 [[package]]
 name = "gimli"
 version = "0.31.1"
@@ -1344,7 +1356,7 @@ dependencies = [
  "bytecount",
  "fancy-regex",
  "fraction",
- "getrandom",
+ "getrandom 0.2.15",
  "iso8601",
  "itoa",
  "memchr",
@@ -1495,7 +1507,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
 dependencies = [
  "libc",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
  "windows-sys 0.52.0",
 ]
 
@@ -1816,6 +1828,12 @@ dependencies = [
  "proc-macro2",
 ]
 
+[[package]]
+name = "r-efi"
+version = "5.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
+
 [[package]]
 name = "rand"
 version = "0.8.5"
@@ -1843,7 +1861,7 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.15",
 ]
 
 [[package]]
@@ -2937,11 +2955,11 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.11.0"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a"
+checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9"
 dependencies = [
- "getrandom",
+ "getrandom 0.3.2",
  "serde",
 ]
 
@@ -2979,6 +2997,15 @@ version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
+[[package]]
+name = "wasi"
+version = "0.14.2+wasi-0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
+dependencies = [
+ "wit-bindgen-rt",
+]
+
 [[package]]
 name = "wasite"
 version = "0.1.0"
@@ -3285,6 +3312,15 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
+[[package]]
+name = "wit-bindgen-rt"
+version = "0.39.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
+dependencies = [
+ "bitflags",
+]
+
 [[package]]
 name = "write16"
 version = "1.0.0"
diff --git a/backend/sync_server/Cargo.toml b/backend/sync_server/Cargo.toml
index 4b31cc1c..431ba6e9 100644
--- a/backend/sync_server/Cargo.toml
+++ b/backend/sync_server/Cargo.toml
@@ -14,7 +14,7 @@ serde = { workspace = true }
 thiserror = { workspace = true }
 
 tokio = { version = "1.42.0", features = ["full"]}
-uuid = { version = "1.11.0", features = ["v4", "serde"] }
+uuid = { version = "1.16.0", features = ["v4", "serde"] }
 log = { version = "0.4.22" }
 anyhow =  { version = "1.0.94", features = ["backtrace"] }
 axum = { version = "0.7.4", features = ["ws", "macros", "tracing", "multipart"]}

From aec3cd9b2f2c9e7b850f828300d1b34eb5632b0e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 25 Mar 2025 22:28:28 +0000
Subject: [PATCH 371/761] Bump chrono from 0.4.38 to 0.4.40 in /backend (#11)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 backend/Cargo.lock             | 12 +++++++++---
 backend/sync_server/Cargo.toml |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 30d157fb..abc422fb 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -436,9 +436,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chrono"
-version = "0.4.38"
+version = "0.4.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
+checksum = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
@@ -446,7 +446,7 @@ dependencies = [
  "num-traits",
  "serde",
  "wasm-bindgen",
- "windows-targets 0.52.6",
+ "windows-link",
 ]
 
 [[package]]
@@ -3164,6 +3164,12 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-link"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38"
+
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
diff --git a/backend/sync_server/Cargo.toml b/backend/sync_server/Cargo.toml
index 431ba6e9..52ad9b88 100644
--- a/backend/sync_server/Cargo.toml
+++ b/backend/sync_server/Cargo.toml
@@ -25,7 +25,7 @@ tower-http = { version = "0.6.1", features = ["cors", "trace", "limit"] }
 tracing-subscriber = { version = "0.3.19", features = ["fmt", "env-filter"]}
 serde_yaml = "0.9.34"
 sqlx = { version = "0.8.2", features = ["sqlite", "runtime-tokio", "uuid", "chrono"] }
-chrono = { version = "0.4.38", features = ["serde"] }
+chrono = { version = "0.4.40", features = ["serde"] }
 aide = { version = "0.13.4", features = ["axum", "axum-ws", "scalar", "axum-headers"] }
 schemars = { version = "0.8.21", features = ["chrono", "uuid1", "bytes"] }
 tracing = "0.1.41"

From 3d27b7f313f9ab03bea97a7661393128757b3c1b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 25 Mar 2025 22:28:42 +0000
Subject: [PATCH 372/761] Bump alpine from 3.21.0 to 3.21.3 in /backend (#8)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 backend/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/Dockerfile b/backend/Dockerfile
index ac0cee79..ced27dfb 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -13,7 +13,7 @@ RUN sqlx migrate run --source sync_server/src/database/migrations --database-url
 RUN cargo build --package sync_server --release --target x86_64-unknown-linux-musl
 
 # Runtime image
-FROM alpine:3.21.0
+FROM alpine:3.21.3
 
 LABEL org.opencontainers.image.authors="andras@schmelczer.dev"
 

From 1aad0fce31b66b21568222710a901722f5c2f87c Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 29 Mar 2025 10:17:46 +0000
Subject: [PATCH 373/761] Add WebSocket support (#12)

---
 .github/workflows/check.yml                   |    2 +-
 .github/workflows/e2e.yml                     |    4 +-
 .gitignore                                    |    2 +-
 backend/Cargo.lock                            |   17 +-
 backend/Cargo.toml                            |    1 +
 backend/Dockerfile                            |    2 +-
 backend/config-e2e.yml                        |    3 +
 backend/sync_server/Cargo.toml                |    3 +
 backend/sync_server/README.md                 |    2 +-
 .../sync_server/src/{server => }/app_state.rs |   15 +-
 .../sync_server/src/app_state/broadcasts.rs   |   57 +
 .../src/{ => app_state}/database.rs           |   25 +-
 .../migrations/20241207143519_bootstrap.sql   |    0
 .../src/{ => app_state}/database/models.rs    |    0
 backend/sync_server/src/cli.rs                |    1 +
 backend/sync_server/src/cli/args.rs           |   28 +-
 backend/sync_server/src/cli/color_when.rs     |   31 +
 .../sync_server/src/config/server_config.rs   |   14 +-
 backend/sync_server/src/consts.rs             |    1 +
 backend/sync_server/src/main.rs               |   67 +-
 backend/sync_server/src/server.rs             |   28 +-
 backend/sync_server/src/server/auth.rs        |    3 +-
 .../sync_server/src/server/create_document.rs |   15 +-
 .../sync_server/src/server/delete_document.rs |   16 +-
 .../src/server/fetch_document_version.rs      |    9 +-
 .../server/fetch_document_version_content.rs  |    9 +-
 .../server/fetch_latest_document_version.rs   |    9 +-
 .../src/server/fetch_latest_documents.rs      |    9 +-
 backend/sync_server/src/server/ping.rs        |    4 +-
 backend/sync_server/src/server/requests.rs    |    2 +-
 backend/sync_server/src/server/responses.rs   |    4 +-
 .../sync_server/src/server/update_document.rs |   13 +-
 backend/sync_server/src/server/websocket.rs   |  147 ++
 .../src/obisidan-event-handler.ts             |   58 -
 .../src/obsidian-file-system.ts               |   40 +-
 frontend/obsidian-plugin/src/styles.scss      |  185 --
 .../obsidian-plugin/src/vault-link-plugin.ts  |  103 +-
 .../src/views/history/history-view.scss       |   53 +
 .../src/views/{ => history}/history-view.ts   |    3 +-
 .../src/views/logs/logs-view.scss             |   60 +
 .../src/views/{ => logs}/logs-view.ts         |   55 +-
 .../src/views/settings/settings-tab.scss      |   57 +
 .../src/views/{ => settings}/settings-tab.ts  |   35 +-
 .../src/views/status-bar/status-bar.scss      |   14 +
 .../src/views/{ => status-bar}/status-bar.ts  |    4 +-
 .../status-description.scss                   |   32 +
 .../status-description.ts                     |   26 +-
 frontend/obsidian-plugin/tsconfig.json        |   11 +-
 frontend/package-lock.json                    | 1669 ++++++++++++++---
 frontend/sync-client/package.json             |    5 +-
 .../src/file-operations/document-locks.ts     |   65 -
 .../safe-filesystem-operations.ts             |   10 +-
 frontend/sync-client/src/index.ts             |    2 +-
 .../sync-client/src/persistence/settings.ts   |    3 -
 .../sync-client/src/services/sync-service.ts  |   52 +-
 frontend/sync-client/src/services/types.ts    |    7 +
 frontend/sync-client/src/sync-client.ts       |   57 +-
 .../sync-client/src/sync-operations/syncer.ts |  220 ++-
 .../sync-operations/unrestricted-syncer.ts    |   12 +-
 frontend/sync-client/src/tracing/logger.ts    |    2 +-
 .../locks.test.ts}                            |   62 +-
 frontend/sync-client/src/utils/locks.ts       |   60 +
 frontend/sync-client/tsconfig.json            |    8 +-
 frontend/sync-client/webpack.config.js        |   11 +-
 frontend/test-client/package.json             |    5 +-
 frontend/test-client/src/agent/mock-agent.ts  |   13 +-
 frontend/test-client/src/agent/mock-client.ts |   18 +-
 frontend/test-client/tsconfig.json            |   11 +-
 68 files changed, 2578 insertions(+), 993 deletions(-)
 rename backend/sync_server/src/{server => }/app_state.rs (61%)
 create mode 100644 backend/sync_server/src/app_state/broadcasts.rs
 rename backend/sync_server/src/{ => app_state}/database.rs (96%)
 rename backend/sync_server/src/{ => app_state}/database/migrations/20241207143519_bootstrap.sql (100%)
 rename backend/sync_server/src/{ => app_state}/database/models.rs (100%)
 create mode 100644 backend/sync_server/src/cli/color_when.rs
 create mode 100644 backend/sync_server/src/server/websocket.rs
 delete mode 100644 frontend/obsidian-plugin/src/obisidan-event-handler.ts
 delete mode 100644 frontend/obsidian-plugin/src/styles.scss
 create mode 100644 frontend/obsidian-plugin/src/views/history/history-view.scss
 rename frontend/obsidian-plugin/src/views/{ => history}/history-view.ts (99%)
 create mode 100644 frontend/obsidian-plugin/src/views/logs/logs-view.scss
 rename frontend/obsidian-plugin/src/views/{ => logs}/logs-view.ts (62%)
 create mode 100644 frontend/obsidian-plugin/src/views/settings/settings-tab.scss
 rename frontend/obsidian-plugin/src/views/{ => settings}/settings-tab.ts (90%)
 create mode 100644 frontend/obsidian-plugin/src/views/status-bar/status-bar.scss
 rename frontend/obsidian-plugin/src/views/{ => status-bar}/status-bar.ts (95%)
 create mode 100644 frontend/obsidian-plugin/src/views/status-description/status-description.scss
 rename frontend/obsidian-plugin/src/views/{ => status-description}/status-description.ts (83%)
 delete mode 100644 frontend/sync-client/src/file-operations/document-locks.ts
 rename frontend/sync-client/src/{file-operations/document-locks.test.ts => utils/locks.test.ts} (55%)
 create mode 100644 frontend/sync-client/src/utils/locks.ts

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 4491e98f..9cff4023 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -28,7 +28,7 @@ jobs:
           cargo install sqlx-cli wasm-pack
           cd backend
           sqlx database create --database-url sqlite://db.sqlite3
-          sqlx migrate run --source sync_server/src/database/migrations --database-url sqlite://db.sqlite3
+          sqlx migrate run --source sync_server/src/app_state/database/migrations --database-url sqlite://db.sqlite3
 
       - name: Build wasm
         run: |
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 1481234d..ad7523f5 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -28,7 +28,7 @@ jobs:
           cargo install sqlx-cli wasm-pack
           cd backend
           sqlx database create --database-url sqlite://db.sqlite3
-          sqlx migrate run --source sync_server/src/database/migrations --database-url sqlite://db.sqlite3
+          sqlx migrate run --source sync_server/src/app_state/database/migrations --database-url sqlite://db.sqlite3
 
       - name: Build wasm
         run: |
@@ -38,7 +38,7 @@ jobs:
       - name: E2E tests
         run: |
           cd backend
-          RUST_BACKTRACE=1 cargo run -p sync_server config-e2e.yml &
+          cargo run -p sync_server config-e2e.yml --color never &
           cd ..
 
           scripts/update-api-types.sh
diff --git a/.gitignore b/.gitignore
index b1e083d2..a91ed90b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,4 +14,4 @@ backend/databases
 
 *.log
 
-plugin/coverage
+*.sqlx
diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index abc422fb..e1f26dc7 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -459,6 +459,16 @@ dependencies = [
  "clap_derive",
 ]
 
+[[package]]
+name = "clap-verbosity-flag"
+version = "3.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2678fade3b77aa3a8ff3aae87e9c008d3fb00473a41c71fbf74e91c8c7b37e84"
+dependencies = [
+ "clap",
+ "log",
+]
+
 [[package]]
 name = "clap_builder"
 version = "4.5.32"
@@ -2069,9 +2079,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.133"
+version = "1.0.140"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377"
+checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
 dependencies = [
  "itoa",
  "memchr",
@@ -2524,6 +2534,8 @@ dependencies = [
  "axum_typed_multipart",
  "chrono",
  "clap",
+ "clap-verbosity-flag",
+ "futures",
  "log",
  "rand",
  "reconcile",
@@ -2531,6 +2543,7 @@ dependencies = [
  "sanitize-filename",
  "schemars",
  "serde",
+ "serde_json",
  "serde_yaml",
  "sqlx",
  "sync_lib",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 9c346afd..0dbad3aa 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -22,6 +22,7 @@ thiserror = { version = "1.0.66", default-features = false  }
 codegen-units = 1
 lto = true
 opt-level = 3
+strip="debuginfo"  # Keep some info for better panics
 
 [workspace.lints.rust]
 unsafe_code = "forbid"
diff --git a/backend/Dockerfile b/backend/Dockerfile
index ced27dfb..897066c0 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -8,7 +8,7 @@ RUN cargo install sqlx-cli
 COPY . .
 
 RUN sqlx database create --database-url sqlite://db.sqlite3
-RUN sqlx migrate run --source sync_server/src/database/migrations --database-url sqlite://db.sqlite3
+RUN sqlx migrate run --source sync_server/src/app_state/database/migrations --database-url sqlite://db.sqlite3
 
 RUN cargo build --package sync_server --release --target x86_64-unknown-linux-musl
 
diff --git a/backend/config-e2e.yml b/backend/config-e2e.yml
index 2345c8b3..04fe344a 100644
--- a/backend/config-e2e.yml
+++ b/backend/config-e2e.yml
@@ -1,10 +1,13 @@
 database:
   databases_directory_path: databases
   max_connections: 12
+
 server:
   host: 0.0.0.0
   port: 3000
   max_body_size_mb: 512
+  max_clients_per_vault: 256
+
 users:
   user_tokens:
   - name: admin
diff --git a/backend/sync_server/Cargo.toml b/backend/sync_server/Cargo.toml
index 52ad9b88..611f09a0 100644
--- a/backend/sync_server/Cargo.toml
+++ b/backend/sync_server/Cargo.toml
@@ -34,6 +34,9 @@ sanitize-filename = "0.6.0"
 axum-jsonschema = { version = "0.8.0", features = ["aide"] }
 regex = "1.11.1"
 clap = { version = "4.5.32", features = ["derive"] }
+futures = "0.3.31"
+serde_json = "1.0.140"
+clap-verbosity-flag = "3.0.2"
 
 [lints]
 workspace = true
diff --git a/backend/sync_server/README.md b/backend/sync_server/README.md
index 0b671554..569dc0b2 100644
--- a/backend/sync_server/README.md
+++ b/backend/sync_server/README.md
@@ -1,4 +1,4 @@
 
 cargo install sqlx-cli
 rm db.sqlite3; sqlx database create --database-url sqlite://db.sqlite3
-sqlx migrate run --source sync_server/src/database/migrations --database-url sqlite://db.sqlite3
+sqlx migrate run --source sync_server/src/app_state/database/migrations --database-url sqlite://db.sqlite3
diff --git a/backend/sync_server/src/server/app_state.rs b/backend/sync_server/src/app_state.rs
similarity index 61%
rename from backend/sync_server/src/server/app_state.rs
rename to backend/sync_server/src/app_state.rs
index 2a8a96eb..1cad9149 100644
--- a/backend/sync_server/src/server/app_state.rs
+++ b/backend/sync_server/src/app_state.rs
@@ -1,13 +1,19 @@
+pub mod broadcasts;
+pub mod database;
+
 use std::ffi::OsString;
 
 use anyhow::Result;
+use broadcasts::Broadcasts;
+use database::Database;
 
-use crate::{config::Config, consts::DEFAULT_CONFIG_PATH, database::Database};
+use crate::{config::Config, consts::DEFAULT_CONFIG_PATH};
 
 #[derive(Clone, Debug)]
 pub struct AppState {
     pub config: Config,
     pub database: Database,
+    pub broadcasts: Broadcasts,
 }
 
 impl AppState {
@@ -17,7 +23,12 @@ impl AppState {
 
         let config = Config::read_or_create(&path).await?;
         let database = Database::try_new(&config.database).await?;
+        let broadcasts = Broadcasts::new(&config.server);
 
-        Ok(Self { config, database })
+        Ok(Self {
+            config,
+            database,
+            broadcasts,
+        })
     }
 }
diff --git a/backend/sync_server/src/app_state/broadcasts.rs b/backend/sync_server/src/app_state/broadcasts.rs
new file mode 100644
index 00000000..9d2d2192
--- /dev/null
+++ b/backend/sync_server/src/app_state/broadcasts.rs
@@ -0,0 +1,57 @@
+use std::{collections::HashMap, sync::Arc};
+
+use anyhow::Context;
+use tokio::sync::{Mutex, broadcast};
+
+use super::database::models::{DocumentVersionWithoutContent, VaultId};
+use crate::{config::server_config::ServerConfig, errors::server_error};
+
+#[derive(Debug, Clone)]
+pub struct Broadcasts {
+    max_clients_per_vault: usize,
+    tx: Arc<Mutex<HashMap<VaultId, broadcast::Sender<DocumentVersionWithoutContent>>>>,
+}
+
+impl Broadcasts {
+    pub fn new(server_config: &ServerConfig) -> Self {
+        Self {
+            max_clients_per_vault: server_config.max_clients_per_vault,
+            tx: Arc::new(Mutex::new(HashMap::new())),
+        }
+    }
+
+    pub async fn get_receiver(
+        &self,
+        vault: VaultId,
+    ) -> broadcast::Receiver<DocumentVersionWithoutContent> {
+        let tx = self.get_or_create(vault).await;
+
+        tx.subscribe()
+    }
+
+    /// Sent a document update to all clients subscribed to the vault.
+    /// We ignore & log failures.
+    pub async fn send(&self, vault: VaultId, document: DocumentVersionWithoutContent) {
+        let tx = self.get_or_create(vault).await;
+
+        let result = tx
+            .send(document)
+            .context("Cannot broadcast update message to websocket listeners")
+            .map_err(server_error);
+
+        if result.is_err() {
+            log::debug!("Failed to send message: {result:?}");
+        }
+    }
+
+    async fn get_or_create(
+        &self,
+        vault: VaultId,
+    ) -> broadcast::Sender<DocumentVersionWithoutContent> {
+        let mut tx = self.tx.lock().await;
+
+        tx.entry(vault)
+            .or_insert_with(|| broadcast::channel(self.max_clients_per_vault).0.clone())
+            .clone()
+    }
+}
diff --git a/backend/sync_server/src/database.rs b/backend/sync_server/src/app_state/database.rs
similarity index 96%
rename from backend/sync_server/src/database.rs
rename to backend/sync_server/src/app_state/database.rs
index 882bd0a2..fa7f35b0 100644
--- a/backend/sync_server/src/database.rs
+++ b/backend/sync_server/src/app_state/database.rs
@@ -85,13 +85,13 @@ impl Database {
     }
 
     async fn run_migrations(pool: &Pool<Sqlite>) -> Result<()> {
-        sqlx::migrate!("src/database/migrations")
+        sqlx::migrate!("src/app_state/database/migrations")
             .run(pool)
             .await
             .context("Cannot check for pending migrations")
     }
 
-    async fn get_connection_pool(&mut self, vault: &VaultId) -> Result<Pool<Sqlite>> {
+    async fn get_connection_pool(&self, vault: &VaultId) -> Result<Pool<Sqlite>> {
         let mut pools = self.connection_pools.lock().await;
         if !pools.contains_key(vault) {
             let pool = Self::create_vault_database(&self.config, vault).await?;
@@ -108,7 +108,7 @@ impl Database {
     /// Attempting to write from this transaction might result in a
     /// database locked error. Use this transaction for read-only operations.
     pub async fn create_readonly_transaction(
-        &mut self,
+        &self,
         vault: &VaultId,
     ) -> Result<Transaction<'static>> {
         self.get_connection_pool(vault)
@@ -118,10 +118,7 @@ impl Database {
             .context("Cannot create transaction")
     }
 
-    pub async fn create_write_transaction(
-        &mut self,
-        vault: &VaultId,
-    ) -> Result<Transaction<'static>> {
+    pub async fn create_write_transaction(&self, vault: &VaultId) -> Result<Transaction<'static>> {
         let mut transaction = self.create_readonly_transaction(vault).await?;
 
         // sqlx doesn't support immediate transactions for sqlite: https://github.com/launchbadge/sqlx/issues/481
@@ -134,7 +131,7 @@ impl Database {
 
     /// Return the latest state of all documents in the vault
     pub async fn get_latest_documents(
-        &mut self,
+        &self,
         vault: &VaultId,
         transaction: Option<&mut Transaction<'_>>,
     ) -> Result<Vec<DocumentVersionWithoutContent>> {
@@ -165,7 +162,7 @@ impl Database {
     /// Return the latest state of all documents (including deleted) in the
     /// vault which have changed since the given update id
     pub async fn get_latest_documents_since(
-        &mut self,
+        &self,
         vault: &VaultId,
         vault_update_id: VaultUpdateId,
         transaction: Option<&mut Transaction<'_>>,
@@ -199,7 +196,7 @@ impl Database {
     }
 
     pub async fn get_max_update_id_in_vault(
-        &mut self,
+        &self,
         vault: &VaultId,
         transaction: Option<&mut Transaction<'_>>,
     ) -> Result<i64> {
@@ -222,7 +219,7 @@ impl Database {
     }
 
     pub async fn get_latest_document_by_path(
-        &mut self,
+        &self,
         vault: &VaultId,
         relative_path: &str,
         transaction: Option<&mut Transaction<'_>>,
@@ -258,7 +255,7 @@ impl Database {
     }
 
     pub async fn get_latest_document(
-        &mut self,
+        &self,
         vault: &VaultId,
         document_id: &DocumentId,
         transaction: Option<&mut Transaction<'_>>,
@@ -291,7 +288,7 @@ impl Database {
     }
 
     pub async fn get_document_version(
-        &mut self,
+        &self,
         vault: &VaultId,
         vault_update_id: VaultUpdateId,
         transaction: Option<&mut Transaction<'_>>,
@@ -322,7 +319,7 @@ impl Database {
     }
 
     pub async fn insert_document_version(
-        &mut self,
+        &self,
         vault: &VaultId,
         version: &StoredDocumentVersion,
         transaction: Option<&mut Transaction<'_>>,
diff --git a/backend/sync_server/src/database/migrations/20241207143519_bootstrap.sql b/backend/sync_server/src/app_state/database/migrations/20241207143519_bootstrap.sql
similarity index 100%
rename from backend/sync_server/src/database/migrations/20241207143519_bootstrap.sql
rename to backend/sync_server/src/app_state/database/migrations/20241207143519_bootstrap.sql
diff --git a/backend/sync_server/src/database/models.rs b/backend/sync_server/src/app_state/database/models.rs
similarity index 100%
rename from backend/sync_server/src/database/models.rs
rename to backend/sync_server/src/app_state/database/models.rs
diff --git a/backend/sync_server/src/cli.rs b/backend/sync_server/src/cli.rs
index 6e10f4ad..d5c08521 100644
--- a/backend/sync_server/src/cli.rs
+++ b/backend/sync_server/src/cli.rs
@@ -1 +1,2 @@
 pub mod args;
+pub mod color_when;
diff --git a/backend/sync_server/src/cli/args.rs b/backend/sync_server/src/cli/args.rs
index 88ff1718..603d8d15 100644
--- a/backend/sync_server/src/cli/args.rs
+++ b/backend/sync_server/src/cli/args.rs
@@ -1,38 +1,26 @@
 use std::ffi::OsString;
 
-use clap::{Parser, ValueEnum};
+use clap::Parser;
+use clap_verbosity_flag::{InfoLevel, Verbosity};
 
-/// Server for backing the VaultLink plugin
+use crate::cli::color_when::ColorWhen;
+
+/// Server for backing the `VaultLink` plugin
 #[derive(Parser, Debug)]
 #[command(version, about, long_about = None)]
 pub struct Args {
     #[arg(index = 1)]
     pub config_path: Option<OsString>,
 
+    #[command(flatten)]
+    pub verbose: Verbosity<InfoLevel>,
+
     #[arg(
             long,
-            require_equals = true,
             value_name = "WHEN",
-            num_args = 0..=1,
             default_value_t = ColorWhen::Auto,
             default_missing_value = "always",
             value_enum
         )]
     pub color: ColorWhen,
 }
-
-#[derive(ValueEnum, Copy, Clone, Debug, PartialEq, Eq)]
-pub enum ColorWhen {
-    Always,
-    Auto,
-    Never,
-}
-
-impl std::fmt::Display for ColorWhen {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        self.to_possible_value()
-            .expect("no values are skipped")
-            .get_name()
-            .fmt(f)
-    }
-}
diff --git a/backend/sync_server/src/cli/color_when.rs b/backend/sync_server/src/cli/color_when.rs
new file mode 100644
index 00000000..a3709b94
--- /dev/null
+++ b/backend/sync_server/src/cli/color_when.rs
@@ -0,0 +1,31 @@
+use std::io::IsTerminal;
+
+use clap::ValueEnum;
+
+#[derive(ValueEnum, Copy, Clone, Debug, PartialEq, Eq)]
+pub enum ColorWhen {
+    Always,
+    Auto,
+    Never,
+}
+
+impl ColorWhen {
+    pub fn use_colors(self) -> bool {
+        match self {
+            ColorWhen::Always => true,
+            ColorWhen::Auto => {
+                std::env::var_os("NO_COLOR").is_none() && std::io::stderr().is_terminal()
+            }
+            ColorWhen::Never => false,
+        }
+    }
+}
+
+impl std::fmt::Display for ColorWhen {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        self.to_possible_value()
+            .expect("no values are skipped")
+            .get_name()
+            .fmt(f)
+    }
+}
diff --git a/backend/sync_server/src/config/server_config.rs b/backend/sync_server/src/config/server_config.rs
index 8d7c63ea..077bd8d8 100644
--- a/backend/sync_server/src/config/server_config.rs
+++ b/backend/sync_server/src/config/server_config.rs
@@ -1,7 +1,10 @@
 use log::debug;
 use serde::{Deserialize, Serialize};
 
-use crate::consts::{DEFAULT_HOST, DEFAULT_MAX_BODY_SIZE_MB, DEFAULT_PORT};
+use crate::consts::{
+    DEFAULT_HOST, DEFAULT_MAX_BODY_SIZE_MB, DEFAULT_MAX_CLIENTS_PER_VAULT, DEFAULT_PORT,
+};
+
 #[derive(Debug, Deserialize, Serialize, Clone)]
 pub struct ServerConfig {
     #[serde(default = "default_host")]
@@ -12,6 +15,9 @@ pub struct ServerConfig {
 
     #[serde(default = "default_max_body_size_mb")]
     pub max_body_size_mb: usize,
+
+    #[serde(default = "default_max_clients_per_vault")]
+    pub max_clients_per_vault: usize,
 }
 
 fn default_host() -> String {
@@ -29,12 +35,18 @@ fn default_max_body_size_mb() -> usize {
     DEFAULT_MAX_BODY_SIZE_MB
 }
 
+fn default_max_clients_per_vault() -> usize {
+    debug!("Using default max clients per vault: {DEFAULT_MAX_CLIENTS_PER_VAULT}");
+    DEFAULT_MAX_CLIENTS_PER_VAULT
+}
+
 impl Default for ServerConfig {
     fn default() -> Self {
         Self {
             host: default_host(),
             port: default_port(),
             max_body_size_mb: default_max_body_size_mb(),
+            max_clients_per_vault: default_max_clients_per_vault(),
         }
     }
 }
diff --git a/backend/sync_server/src/consts.rs b/backend/sync_server/src/consts.rs
index bec936b4..2d3bec55 100644
--- a/backend/sync_server/src/consts.rs
+++ b/backend/sync_server/src/consts.rs
@@ -4,3 +4,4 @@ pub const DEFAULT_HOST: &str = "127.0.0.1";
 pub const DEFAULT_PORT: u16 = 3000;
 pub const DEFAULT_MAX_CONNECTIONS: u32 = 12;
 pub const DEFAULT_MAX_BODY_SIZE_MB: usize = 4096;
+pub const DEFAULT_MAX_CLIENTS_PER_VAULT: usize = 256;
diff --git a/backend/sync_server/src/main.rs b/backend/sync_server/src/main.rs
index 2b8abccd..b3989b0c 100644
--- a/backend/sync_server/src/main.rs
+++ b/backend/sync_server/src/main.rs
@@ -1,38 +1,79 @@
+mod app_state;
 mod cli;
 mod config;
 mod consts;
-mod database;
 mod errors;
 mod server;
 mod utils;
 
+use std::process::ExitCode;
+
 use anyhow::{Context as _, Result};
 use clap::Parser;
 use cli::args::Args;
 use errors::{SyncServerError, init_error};
 use log::info;
 use server::create_server;
-use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};
+use tracing_subscriber::{EnvFilter, fmt::format, util::SubscriberInitExt};
 
 #[tokio::main]
-async fn main() -> Result<(), SyncServerError> {
+async fn main() -> ExitCode {
     let args = Args::parse();
 
-    tracing_subscriber::registry()
-        .with(
-            tracing_subscriber::EnvFilter::try_from_default_env().unwrap_or_else(|_| {
-                format!(
-                    "{}=debug,tower_http=debug,axum::rejection=trace",
-                    env!("CARGO_CRATE_NAME")
-                )
-                .into()
-            }),
+    let mut result = set_up_logging(&args);
+
+    if result.is_ok() {
+        result = start_server(args).await;
+    }
+
+    match result {
+        Ok(()) => ExitCode::SUCCESS,
+        Err(e) => {
+            eprintln!("Failed to set up logging: {e}");
+            ExitCode::FAILURE
+        }
+    }
+}
+
+fn set_up_logging(args: &Args) -> Result<(), SyncServerError> {
+    let level_filter = match args.verbose.log_level_filter() {
+        // We don't want to allow disabling all logging
+        log::LevelFilter::Off | log::LevelFilter::Error => tracing::Level::ERROR,
+        log::LevelFilter::Warn => tracing::Level::WARN,
+        log::LevelFilter::Info => tracing::Level::INFO,
+        log::LevelFilter::Debug => tracing::Level::DEBUG,
+        log::LevelFilter::Trace => tracing::Level::TRACE,
+    };
+
+    let env_filter = EnvFilter::builder()
+        .with_default_directive(level_filter.into())
+        .from_env()
+        .context("Failed to create logging env filter")
+        .map_err(init_error)?;
+
+    let use_colors = args.color.use_colors();
+
+    let is_debug_mode = args.verbose.log_level_filter() >= log::LevelFilter::Debug;
+
+    tracing_subscriber::fmt()
+        .with_ansi(use_colors)
+        .with_env_filter(env_filter)
+        .event_format(
+            format()
+                .without_time()
+                .with_target(is_debug_mode)
+                .with_line_number(is_debug_mode)
+                .compact(),
         )
-        .with(tracing_subscriber::fmt::layer())
+        .finish()
         .try_init()
         .context("Failed to initialise tracing")
         .map_err(init_error)?;
 
+    Ok(())
+}
+
+async fn start_server(args: Args) -> Result<(), SyncServerError> {
     info!(
         "Starting VaultLink server version {}",
         env!("CARGO_PKG_VERSION")
diff --git a/backend/sync_server/src/server.rs b/backend/sync_server/src/server.rs
index 083be5ba..90bd8ff3 100644
--- a/backend/sync_server/src/server.rs
+++ b/backend/sync_server/src/server.rs
@@ -1,3 +1,16 @@
+mod auth;
+mod create_document;
+mod delete_document;
+mod fetch_document_version;
+mod fetch_document_version_content;
+mod fetch_latest_document_version;
+mod fetch_latest_documents;
+mod ping;
+mod requests;
+mod responses;
+mod update_document;
+mod websocket;
+
 use std::{ffi::OsString, sync::Arc};
 
 use aide::{
@@ -10,7 +23,6 @@ use aide::{
     transform::TransformOpenApi,
 };
 use anyhow::{Context as _, Result, anyhow};
-use app_state::AppState;
 use axum::{
     Extension, Json,
     extract::{DefaultBodyLimit, Request},
@@ -32,21 +44,10 @@ use tower_http::{
 use tracing::{Level, info_span};
 
 use crate::{
+    app_state::AppState,
     config::server_config::ServerConfig,
     errors::{SerializedError, not_found_error},
 };
-mod app_state;
-mod auth;
-mod create_document;
-mod delete_document;
-mod fetch_document_version;
-mod fetch_document_version_content;
-mod fetch_latest_document_version;
-mod fetch_latest_documents;
-mod ping;
-mod requests;
-mod responses;
-mod update_document;
 
 pub async fn create_server(config_path: Option<OsString>) -> Result<()> {
     aide::r#gen::on_error(|err| error!("{err}"));
@@ -65,6 +66,7 @@ pub async fn create_server(config_path: Option<OsString>) -> Result<()> {
             "/vaults/:vault_id/documents",
             get(fetch_latest_documents::fetch_latest_documents),
         )
+        .route("/vaults/:vault_id/ws", get(websocket::websocket_handler))
         .api_route(
             "/vaults/:vault_id/documents",
             post(create_document::create_document_multipart),
diff --git a/backend/sync_server/src/server/auth.rs b/backend/sync_server/src/server/auth.rs
index 9c73070c..ae20e187 100644
--- a/backend/sync_server/src/server/auth.rs
+++ b/backend/sync_server/src/server/auth.rs
@@ -1,9 +1,10 @@
-use super::app_state::AppState;
 use crate::{
+    app_state::AppState,
     config::user_config::User,
     errors::{SyncServerError, unauthorized_error},
 };
 
+// TODO: turn this into a middleware
 pub fn auth(app_state: &AppState, token: &str) -> Result<User, SyncServerError> {
     app_state
         .config
diff --git a/backend/sync_server/src/server/create_document.rs b/backend/sync_server/src/server/create_document.rs
index 3b9bc794..826b37c6 100644
--- a/backend/sync_server/src/server/create_document.rs
+++ b/backend/sync_server/src/server/create_document.rs
@@ -11,12 +11,16 @@ use serde::Deserialize;
 use sync_lib::base64_to_bytes;
 
 use super::{
-    app_state::AppState,
     auth::auth,
     requests::{CreateDocumentVersion, CreateDocumentVersionMultipart},
 };
 use crate::{
-    database::models::{DocumentId, DocumentVersionWithoutContent, StoredDocumentVersion, VaultId},
+    app_state::{
+        AppState,
+        database::models::{
+            DocumentId, DocumentVersionWithoutContent, StoredDocumentVersion, VaultId,
+        },
+    },
     errors::{SyncServerError, client_error, server_error},
     utils::sanitize_path,
 };
@@ -77,7 +81,7 @@ pub async fn create_document_json(
 
 async fn internal_create_document(
     auth_header: Authorization<Bearer>,
-    mut state: AppState,
+    state: AppState,
     vault_id: VaultId,
     document_id: Option<DocumentId>,
     relative_path: String,
@@ -139,5 +143,10 @@ async fn internal_create_document(
         .context("Failed to commit successful transaction")
         .map_err(server_error)?;
 
+    state
+        .broadcasts
+        .send(vault_id, new_version.clone().into())
+        .await;
+
     Ok(Json(new_version.into()))
 }
diff --git a/backend/sync_server/src/server/delete_document.rs b/backend/sync_server/src/server/delete_document.rs
index 4d940852..10fbca3c 100644
--- a/backend/sync_server/src/server/delete_document.rs
+++ b/backend/sync_server/src/server/delete_document.rs
@@ -8,9 +8,14 @@ use axum_jsonschema::Json;
 use schemars::JsonSchema;
 use serde::Deserialize;
 
-use super::{app_state::AppState, auth::auth, requests::DeleteDocumentVersion};
+use super::{auth::auth, requests::DeleteDocumentVersion};
 use crate::{
-    database::models::{DocumentId, DocumentVersionWithoutContent, StoredDocumentVersion, VaultId},
+    app_state::{
+        AppState,
+        database::models::{
+            DocumentId, DocumentVersionWithoutContent, StoredDocumentVersion, VaultId,
+        },
+    },
     errors::{SyncServerError, server_error},
     utils::sanitize_path,
 };
@@ -29,7 +34,7 @@ pub async fn delete_document(
         vault_id,
         document_id,
     }): Path<DeleteDocumentPathParams>,
-    State(mut state): State<AppState>,
+    State(state): State<AppState>,
     Json(request): Json<DeleteDocumentVersion>,
 ) -> Result<Json<DocumentVersionWithoutContent>, SyncServerError> {
     auth(&state, auth_header.token())?;
@@ -67,5 +72,10 @@ pub async fn delete_document(
         .context("Failed to commit successful transaction")
         .map_err(server_error)?;
 
+    state
+        .broadcasts
+        .send(vault_id, new_version.clone().into())
+        .await;
+
     Ok(Json(new_version.into()))
 }
diff --git a/backend/sync_server/src/server/fetch_document_version.rs b/backend/sync_server/src/server/fetch_document_version.rs
index be488c18..aab06c85 100644
--- a/backend/sync_server/src/server/fetch_document_version.rs
+++ b/backend/sync_server/src/server/fetch_document_version.rs
@@ -8,9 +8,12 @@ use axum_jsonschema::Json;
 use schemars::JsonSchema;
 use serde::Deserialize;
 
-use super::{app_state::AppState, auth::auth};
+use super::auth::auth;
 use crate::{
-    database::models::{DocumentId, DocumentVersion, VaultId, VaultUpdateId},
+    app_state::{
+        AppState,
+        database::models::{DocumentId, DocumentVersion, VaultId, VaultUpdateId},
+    },
     errors::{SyncServerError, not_found_error, server_error},
 };
 
@@ -30,7 +33,7 @@ pub async fn fetch_document_version(
         document_id,
         vault_update_id,
     }): Path<FetchDocumentVersionPathParams>,
-    State(mut state): State<AppState>,
+    State(state): State<AppState>,
 ) -> Result<Json<DocumentVersion>, SyncServerError> {
     auth(&state, auth_header.token())?;
 
diff --git a/backend/sync_server/src/server/fetch_document_version_content.rs b/backend/sync_server/src/server/fetch_document_version_content.rs
index 746c9b3a..a2504ba1 100644
--- a/backend/sync_server/src/server/fetch_document_version_content.rs
+++ b/backend/sync_server/src/server/fetch_document_version_content.rs
@@ -10,9 +10,12 @@ use axum_extra::{
 use schemars::JsonSchema;
 use serde::Deserialize;
 
-use super::{app_state::AppState, auth::auth};
+use super::auth::auth;
 use crate::{
-    database::models::{DocumentId, VaultId, VaultUpdateId},
+    app_state::{
+        AppState,
+        database::models::{DocumentId, VaultId, VaultUpdateId},
+    },
     errors::{SyncServerError, not_found_error, server_error},
 };
 
@@ -32,7 +35,7 @@ pub async fn fetch_document_version_content(
         document_id,
         vault_update_id,
     }): Path<FetchDocumentVersionContentPathParams>,
-    State(mut state): State<AppState>,
+    State(state): State<AppState>,
 ) -> Result<Bytes, SyncServerError> {
     auth(&state, auth_header.token())?;
 
diff --git a/backend/sync_server/src/server/fetch_latest_document_version.rs b/backend/sync_server/src/server/fetch_latest_document_version.rs
index c9c2fdec..ec777f30 100644
--- a/backend/sync_server/src/server/fetch_latest_document_version.rs
+++ b/backend/sync_server/src/server/fetch_latest_document_version.rs
@@ -8,9 +8,12 @@ use axum_jsonschema::Json;
 use schemars::JsonSchema;
 use serde::Deserialize;
 
-use super::{app_state::AppState, auth::auth};
+use super::auth::auth;
 use crate::{
-    database::models::{DocumentId, DocumentVersion, VaultId},
+    app_state::{
+        AppState,
+        database::models::{DocumentId, DocumentVersion, VaultId},
+    },
     errors::{SyncServerError, not_found_error, server_error},
 };
 
@@ -28,7 +31,7 @@ pub async fn fetch_latest_document_version(
         vault_id,
         document_id,
     }): Path<FetchLatestDocumentVersionPathParams>,
-    State(mut state): State<AppState>,
+    State(state): State<AppState>,
 ) -> Result<Json<DocumentVersion>, SyncServerError> {
     auth(&state, auth_header.token())?;
 
diff --git a/backend/sync_server/src/server/fetch_latest_documents.rs b/backend/sync_server/src/server/fetch_latest_documents.rs
index 89197c2e..2b4dc841 100644
--- a/backend/sync_server/src/server/fetch_latest_documents.rs
+++ b/backend/sync_server/src/server/fetch_latest_documents.rs
@@ -7,9 +7,12 @@ use axum_jsonschema::Json;
 use schemars::JsonSchema;
 use serde::Deserialize;
 
-use super::{app_state::AppState, auth::auth, responses::FetchLatestDocumentsResponse};
+use super::{auth::auth, responses::FetchLatestDocumentsResponse};
 use crate::{
-    database::models::{VaultId, VaultUpdateId},
+    app_state::{
+        AppState,
+        database::models::{VaultId, VaultUpdateId},
+    },
     errors::{SyncServerError, server_error},
 };
 
@@ -30,7 +33,7 @@ pub async fn fetch_latest_documents(
     TypedHeader(auth_header): TypedHeader<Authorization<Bearer>>,
     Path(FetchLatestDocumentsPathParams { vault_id }): Path<FetchLatestDocumentsPathParams>,
     Query(QueryParams { since_update_id }): Query<QueryParams>,
-    State(mut state): State<AppState>,
+    State(state): State<AppState>,
 ) -> Result<Json<FetchLatestDocumentsResponse>, SyncServerError> {
     auth(&state, auth_header.token())?;
 
diff --git a/backend/sync_server/src/server/ping.rs b/backend/sync_server/src/server/ping.rs
index 1823c9f9..1fe75ee6 100644
--- a/backend/sync_server/src/server/ping.rs
+++ b/backend/sync_server/src/server/ping.rs
@@ -4,8 +4,8 @@ use axum_extra::{
     headers::{Authorization, authorization::Bearer},
 };
 
-use super::{app_state::AppState, auth::auth, responses::PingResponse};
-use crate::errors::SyncServerError;
+use super::{auth::auth, responses::PingResponse};
+use crate::{app_state::AppState, errors::SyncServerError};
 
 #[axum::debug_handler]
 pub async fn ping(
diff --git a/backend/sync_server/src/server/requests.rs b/backend/sync_server/src/server/requests.rs
index 3c888266..89820dbe 100644
--- a/backend/sync_server/src/server/requests.rs
+++ b/backend/sync_server/src/server/requests.rs
@@ -4,7 +4,7 @@ use axum_typed_multipart::TryFromMultipart;
 use schemars::JsonSchema;
 use serde::{self, Deserialize};
 
-use crate::database::models::{DocumentId, VaultUpdateId};
+use crate::app_state::database::models::{DocumentId, VaultUpdateId};
 
 #[derive(Debug, Deserialize, JsonSchema)]
 #[serde(rename_all = "camelCase")]
diff --git a/backend/sync_server/src/server/responses.rs b/backend/sync_server/src/server/responses.rs
index 09b254ef..993bc7e7 100644
--- a/backend/sync_server/src/server/responses.rs
+++ b/backend/sync_server/src/server/responses.rs
@@ -1,7 +1,9 @@
 use schemars::JsonSchema;
 use serde::{self, Serialize};
 
-use crate::database::models::{DocumentVersion, DocumentVersionWithoutContent, VaultUpdateId};
+use crate::app_state::database::models::{
+    DocumentVersion, DocumentVersionWithoutContent, VaultUpdateId,
+};
 
 /// Response to a ping request.
 #[derive(Debug, Clone, Serialize, JsonSchema)]
diff --git a/backend/sync_server/src/server/update_document.rs b/backend/sync_server/src/server/update_document.rs
index 3b83f774..0448ddb7 100644
--- a/backend/sync_server/src/server/update_document.rs
+++ b/backend/sync_server/src/server/update_document.rs
@@ -12,13 +12,15 @@ use serde::Deserialize;
 use sync_lib::{base64_to_bytes, is_file_type_mergable, merge};
 
 use super::{
-    app_state::AppState,
     auth::auth,
     requests::{UpdateDocumentVersion, UpdateDocumentVersionMultipart},
     responses::DocumentUpdateResponse,
 };
 use crate::{
-    database::models::{DocumentId, StoredDocumentVersion, VaultId, VaultUpdateId},
+    app_state::{
+        AppState,
+        database::models::{DocumentId, StoredDocumentVersion, VaultId, VaultUpdateId},
+    },
     errors::{SyncServerError, client_error, not_found_error, server_error},
     utils::{deduped_file_paths, sanitize_path},
 };
@@ -83,7 +85,7 @@ pub async fn update_document_json(
 #[allow(clippy::too_many_arguments, clippy::too_many_lines)]
 async fn internal_update_document(
     auth_header: Authorization<Bearer>,
-    mut state: AppState,
+    state: AppState,
     vault_id: VaultId,
     document_id: DocumentId,
     parent_version_id: VaultUpdateId,
@@ -216,6 +218,11 @@ async fn internal_update_document(
         .context("Failed to commit successful transaction")
         .map_err(server_error)?;
 
+    state
+        .broadcasts
+        .send(vault_id, new_version.clone().into())
+        .await;
+
     Ok(Json(if is_different_from_request_content {
         DocumentUpdateResponse::MergingUpdate(new_version.into())
     } else {
diff --git a/backend/sync_server/src/server/websocket.rs b/backend/sync_server/src/server/websocket.rs
new file mode 100644
index 00000000..30125f41
--- /dev/null
+++ b/backend/sync_server/src/server/websocket.rs
@@ -0,0 +1,147 @@
+use anyhow::Context;
+use axum::{
+    extract::{
+        Path, Query, State,
+        ws::{Message, WebSocket, WebSocketUpgrade},
+    },
+    response::Response,
+};
+use futures::{
+    sink::SinkExt,
+    stream::{SplitSink, StreamExt},
+};
+use log::{error, info, warn};
+use schemars::JsonSchema;
+use serde::Deserialize;
+
+use super::auth::auth;
+use crate::{
+    app_state::{
+        AppState,
+        database::models::{DocumentVersionWithoutContent, VaultId, VaultUpdateId},
+    },
+    errors::{SyncServerError, server_error, unauthorized_error},
+};
+
+// This is required for aide to infer the path parameter types and names
+#[derive(Deserialize, JsonSchema)]
+pub struct WebsocketPathParams {
+    vault_id: VaultId,
+}
+
+// This is required for aide to infer the path parameter types and names
+#[derive(Deserialize, JsonSchema)]
+pub struct QueryParams {
+    since_update_id: Option<VaultUpdateId>,
+}
+
+pub async fn websocket_handler(
+    ws: WebSocketUpgrade,
+    Path(WebsocketPathParams { vault_id }): Path<WebsocketPathParams>,
+    Query(QueryParams { since_update_id }): Query<QueryParams>,
+    State(state): State<AppState>,
+) -> Result<Response, SyncServerError> {
+    Ok(ws.on_upgrade(move |socket| websocket_wrapped(state, socket, vault_id, since_update_id)))
+}
+
+async fn websocket_wrapped(
+    state: AppState,
+    stream: WebSocket,
+    vault_id: VaultId,
+    since_update_id: Option<VaultUpdateId>,
+) {
+    info!("Websocket connection opened on vault '{}'", vault_id);
+
+    let result = websocket(state, stream, vault_id.clone(), since_update_id).await;
+
+    if let Err(err) = result {
+        error!(
+            "Websocket connection error on vault '{}': {}",
+            vault_id, err
+        );
+    }
+
+    warn!("Websocket connection closed on vault '{}'", vault_id);
+}
+
+async fn websocket(
+    state: AppState,
+    stream: WebSocket,
+    vault_id: VaultId,
+    since_update_id: Option<VaultUpdateId>,
+) -> Result<(), SyncServerError> {
+    let (mut sender, mut receiver) = stream.split();
+
+    if let Some(Ok(Message::Text(token))) = receiver.next().await {
+        auth(&state, &token)?;
+    } else {
+        return Err(unauthorized_error(anyhow::anyhow!(
+            "Failed to authenticate"
+        )));
+    }
+
+    let mut rx = state.broadcasts.get_receiver(vault_id.clone()).await;
+
+    let documents = if let Some(since_update_id) = since_update_id {
+        state
+            .database
+            .get_latest_documents_since(&vault_id, since_update_id, None)
+            .await
+            .map_err(server_error)
+    } else {
+        state
+            .database
+            .get_latest_documents(&vault_id, None)
+            .await
+            .map_err(server_error)
+    }?;
+
+    for document in documents {
+        send_document_over_websocket(document, &mut sender).await?;
+    }
+
+    let mut send_task = tokio::spawn(async move {
+        while let Ok(update) = rx.recv().await {
+            send_document_over_websocket(update, &mut sender).await?;
+        }
+
+        Ok::<(), SyncServerError>(())
+    });
+
+    let mut recv_task =
+        tokio::spawn(
+            async move { while let Some(Ok(Message::Text(_text))) = receiver.next().await {} },
+        );
+
+    tokio::select! {
+        _ = &mut send_task => recv_task.abort(),
+        _ = &mut recv_task => send_task.abort(),
+    };
+
+    send_task
+        .await
+        .context("Websocket send task failed")
+        .map_err(server_error)??;
+
+    recv_task
+        .await
+        .context("Websocket receive task failed")
+        .map_err(server_error)?;
+
+    Ok(())
+}
+
+async fn send_document_over_websocket(
+    document: DocumentVersionWithoutContent,
+    sender: &mut SplitSink<WebSocket, Message>,
+) -> Result<(), SyncServerError> {
+    let serialized_update = serde_json::to_string(&document)
+        .context("Failed to serialize update")
+        .map_err(server_error)?;
+
+    sender
+        .send(Message::Text(serialized_update))
+        .await
+        .context("Failed to send message over websocket")
+        .map_err(server_error)
+}
diff --git a/frontend/obsidian-plugin/src/obisidan-event-handler.ts b/frontend/obsidian-plugin/src/obisidan-event-handler.ts
deleted file mode 100644
index df0d8266..00000000
--- a/frontend/obsidian-plugin/src/obisidan-event-handler.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import type { SyncClient } from "sync-client";
-import type { TAbstractFile } from "obsidian";
-import { TFile } from "obsidian";
-
-export class ObsidianFileEventHandler {
-	public constructor(private readonly client: SyncClient) {}
-
-	public async onCreate(file: TAbstractFile): Promise<void> {
-		if (file instanceof TFile) {
-			this.client.logger.info(`File created: ${file.path}`);
-
-			await this.client.syncLocallyCreatedFile(file.path);
-		} else {
-			this.client.logger.debug(`Folder created: ${file.path}, ignored`);
-		}
-	}
-
-	public async onDelete(file: TAbstractFile): Promise<void> {
-		if (file instanceof TFile) {
-			this.client.logger.info(`File deleted: ${file.path}`);
-
-			await this.client.syncLocallyDeletedFile(file.path);
-		} else {
-			this.client.logger.debug(`Folder deleted: ${file.path}, ignored`);
-		}
-	}
-
-	public async onRename(file: TAbstractFile, oldPath: string): Promise<void> {
-		if (file instanceof TFile) {
-			this.client.logger.info(`File renamed: ${oldPath} -> ${file.path}`);
-
-			await this.client.syncLocallyUpdatedFile({
-				oldPath,
-				relativePath: file.path
-			});
-		} else {
-			this.client.logger.debug(
-				`Folder renamed: ${oldPath} -> ${file.path}, ignored`
-			);
-		}
-	}
-
-	public async onModify(file: TAbstractFile): Promise<void> {
-		if (file instanceof TFile) {
-			if (file.basename.startsWith("console-log.iPhone")) {
-				return;
-			}
-
-			this.client.logger.info(`File modified: ${file.path}`);
-
-			await this.client.syncLocallyUpdatedFile({
-				relativePath: file.path
-			});
-		} else {
-			this.client.logger.debug(`Folder modified: ${file.path}, ignored`);
-		}
-	}
-}
diff --git a/frontend/obsidian-plugin/src/obsidian-file-system.ts b/frontend/obsidian-plugin/src/obsidian-file-system.ts
index f9a5d681..55388e05 100644
--- a/frontend/obsidian-plugin/src/obsidian-file-system.ts
+++ b/frontend/obsidian-plugin/src/obsidian-file-system.ts
@@ -1,23 +1,38 @@
-import type { Stat, Vault } from "obsidian";
-import { normalizePath } from "obsidian";
+import type { Stat, Vault, Workspace } from "obsidian";
+import { MarkdownView, normalizePath } from "obsidian";
 import type { FileSystemOperations, RelativePath } from "sync-client";
 
 export class ObsidianFileSystemOperations implements FileSystemOperations {
-	public constructor(private readonly vault: Vault) {}
+	public constructor(
+		private readonly vault: Vault,
+		private readonly workspace: Workspace
+	) {}
 
 	public async listAllFiles(): Promise<RelativePath[]> {
 		return this.vault.getFiles().map((file) => file.path);
 	}
 
 	public async read(path: RelativePath): Promise<Uint8Array> {
-		return new Uint8Array(
-			await this.vault.adapter.readBinary(normalizePath(path))
-		);
+		path = normalizePath(path);
+		const view = this.workspace.getActiveViewOfType(MarkdownView);
+		if (view?.file?.path === path) {
+			return new TextEncoder().encode(view.editor.getValue());
+		}
+
+		return new Uint8Array(await this.vault.adapter.readBinary(path));
 	}
 
 	public async write(path: RelativePath, content: Uint8Array): Promise<void> {
+		path = normalizePath(path);
+
+		const view = this.workspace.getActiveViewOfType(MarkdownView);
+		if (view?.file?.path === path) {
+			view.editor.setValue(new TextDecoder().decode(content));
+			return;
+		}
+
 		return this.vault.adapter.writeBinary(
-			normalizePath(path),
+			path,
 			// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
 			content.buffer as ArrayBuffer
 		);
@@ -27,7 +42,16 @@ export class ObsidianFileSystemOperations implements FileSystemOperations {
 		path: RelativePath,
 		updater: (currentContent: string) => string
 	): Promise<string> {
-		return this.vault.adapter.process(normalizePath(path), updater);
+		path = normalizePath(path);
+
+		const view = this.workspace.getActiveViewOfType(MarkdownView);
+		if (view?.file?.path === path) {
+			const result = updater(view.editor.getValue());
+			view.editor.setValue(result);
+			return result;
+		}
+
+		return this.vault.adapter.process(path, updater);
 	}
 
 	public async getFileSize(path: RelativePath): Promise<number> {
diff --git a/frontend/obsidian-plugin/src/styles.scss b/frontend/obsidian-plugin/src/styles.scss
deleted file mode 100644
index 110e7152..00000000
--- a/frontend/obsidian-plugin/src/styles.scss
+++ /dev/null
@@ -1,185 +0,0 @@
-@mixin number-card {
-	padding: var(--size-2-1) var(--size-4-1);
-	border-radius: var(--radius-s);
-	background-color: var(--color-base-30);
-	font-size: var(--font-ui-small);
-
-	&.good {
-		background-color: rgba(var(--color-green-rgb), 0.35);
-	}
-
-	&.bad {
-		background-color: rgba(var(--color-red-rgb), 0.35);
-	}
-}
-
-.status-description {
-	margin: var(--p-spacing) 0;
-
-	.number {
-		@include number-card;
-		font-family: var(--font-monospace);
-		font-weight: var(--bold-weight);
-	}
-
-	.error {
-		color: rgb(var(--color-red-rgb));
-	}
-
-	.warning {
-		color: rgb(var(--color-yellow-rgb));
-	}
-}
-
-.vault-link-settings {
-	h2 {
-		display: flex;
-		align-items: center;
-		font-size: var(--h2-size);
-
-		.version {
-			@include number-card;
-			margin: var(--size-2-2) 0 0 var(--size-4-2);
-			background-color: var(--color-base-30);
-			color: var(--color-base-70);
-			font-size: var(--font-ui-smaller);
-		}
-	}
-
-	.button-container {
-		display: flex;
-		gap: var(--size-4-2);
-	}
-
-	h3 {
-		font-size: var(--font-ui-large);
-		margin-top: var(--heading-spacing);
-	}
-
-	button,
-	input[type="range"],
-	.checkbox-container,
-	.slider::-webkit-slider-thumb {
-		cursor: pointer;
-	}
-
-	input[type="text"],
-	textarea {
-		width: 250px;
-	}
-
-	textarea {
-		resize: none;
-		height: 75px;
-	}
-}
-
-.sync-status {
-	display: flex;
-	gap: var(--size-4-2);
-
-	* {
-		display: block;
-	}
-
-	.initialize-button {
-		padding: 0 var(--size-4-2);
-		background: rgba(var(--color-red-rgb), 0.4);
-		cursor: pointer;
-	}
-}
-
-.logs-view {
-	display: flex;
-	flex-direction: column;
-
-	.logs-container {
-		max-width: 100%;
-		overflow-y: auto;
-
-		.log-message {
-			font: var(--font-monospace);
-			margin-bottom: var(--size-2-1);
-			overflow-wrap: break-word;
-			white-space: pre-wrap;
-			user-select: all;
-
-			.timestamp {
-				@include number-card;
-				font-family: var(--font-monospace);
-				font-weight: var(--bold-weight);
-				margin-right: var(--size-4-1);
-			}
-
-			&.DEBUG {
-				color: var(--color-base-50);
-			}
-
-			&.INFO {
-				color: var(--color-green-rgb);
-			}
-
-			&.WARNING {
-				color: var(--color-yellow-rgb);
-			}
-
-			&.ERROR {
-				color: var(--color-red-rgb);
-			}
-		}
-	}
-}
-
-.history-card {
-	padding: var(--size-4-4);
-	margin: var(--size-4-2);
-	background-color: var(--color-base-00);
-	border-radius: var(--radius-l);
-	container-type: inline-size;
-
-	&.clickable {
-		cursor: pointer;
-	}
-
-	&.success {
-		background-color: rgba(var(--color-green-rgb), 0.2);
-	}
-
-	&.error {
-		background-color: rgba(var(--color-red-rgb), 0.2);
-	}
-
-	.history-card-header {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		margin-bottom: var(--size-4-2);
-		gap: var(--size-4-2);
-
-		@container (max-width: 300px) {
-			flex-direction: column;
-			align-items: flex-start;
-		}
-
-		.history-card-title {
-			font: var(--font-monospace);
-			display: flex;
-			align-items: center;
-			gap: var(--size-4-2);
-			word-break: break-all;
-			margin: 0;
-		}
-
-		.history-card-timestamp {
-			font-size: var(--font-ui-small);
-			font-style: italic;
-			color: var(--italic-color);
-		}
-	}
-
-	.history-card-message {
-		font-size: var(--font-ui-medium);
-		color: var(--color-base-70);
-		margin: 0;
-	}
-}
diff --git a/frontend/obsidian-plugin/src/vault-link-plugin.ts b/frontend/obsidian-plugin/src/vault-link-plugin.ts
index 7e762a87..aab9bad8 100644
--- a/frontend/obsidian-plugin/src/vault-link-plugin.ts
+++ b/frontend/obsidian-plugin/src/vault-link-plugin.ts
@@ -1,20 +1,25 @@
-import type { WorkspaceLeaf } from "obsidian";
-import { Platform, Plugin } from "obsidian";
-import "./styles.scss";
+import type {
+	Editor,
+	MarkdownFileInfo,
+	MarkdownView,
+	TAbstractFile,
+	WorkspaceLeaf
+} from "obsidian";
+import { Platform, Plugin, TFile } from "obsidian";
 import "../manifest.json";
-import { SyncSettingsTab } from "./views/settings-tab";
-import { HistoryView } from "./views/history-view";
-import { ObsidianFileEventHandler } from "./obisidan-event-handler";
-import { StatusBar } from "./views/status-bar";
-import { LogsView } from "./views/logs-view";
-import { StatusDescription } from "./views/status-description";
+import { HistoryView } from "./views/history/history-view";
+import { StatusBar } from "./views/status-bar/status-bar";
+import { LogsView } from "./views/logs/logs-view";
+import { StatusDescription } from "./views/status-description/status-description";
 import type { LogLine } from "sync-client";
 import { SyncClient, LogLevel } from "sync-client";
 import { ObsidianFileSystemOperations } from "./obsidian-file-system";
+import { SyncSettingsTab } from "./views/settings/settings-tab";
 
 export default class VaultLinkPlugin extends Plugin {
 	private settingsTab: SyncSettingsTab | undefined;
 	private client!: SyncClient;
+
 	private static registerConsoleForLogging(client: SyncClient): void {
 		client.logger.addOnMessageListener((logLine: LogLine) => {
 			const formatted = `${logLine.timestamp.toISOString()} ${logLine.level} ${logLine.message}`;
@@ -38,7 +43,10 @@ export default class VaultLinkPlugin extends Plugin {
 
 	public async onload(): Promise<void> {
 		this.client = await SyncClient.create({
-			fs: new ObsidianFileSystemOperations(this.app.vault),
+			fs: new ObsidianFileSystemOperations(
+				this.app.vault,
+				this.app.workspace
+			),
 			persistence: {
 				load: this.loadData.bind(this),
 				save: this.saveData.bind(this)
@@ -80,35 +88,9 @@ export default class VaultLinkPlugin extends Plugin {
 			async (_: MouseEvent) => this.activateView(LogsView.TYPE)
 		);
 
-		const eventHandler = new ObsidianFileEventHandler(this.client);
-
 		this.app.workspace.onLayoutReady(async () => {
-			this.client.logger.info("Initialising sync handlers");
-
-			[
-				this.app.vault.on(
-					"create",
-					eventHandler.onCreate.bind(eventHandler)
-				),
-				this.app.vault.on(
-					"modify",
-					eventHandler.onModify.bind(eventHandler)
-				),
-				this.app.vault.on(
-					"delete",
-					eventHandler.onDelete.bind(eventHandler)
-				),
-				this.app.vault.on(
-					"rename",
-					eventHandler.onRename.bind(eventHandler)
-				)
-			].forEach((event) => {
-				this.registerEvent(event);
-			});
-
+			this.registerEditorEvents();
 			void this.client.start();
-
-			this.client.logger.info("Sync handlers initialised");
 		});
 	}
 
@@ -145,4 +127,51 @@ export default class VaultLinkPlugin extends Plugin {
 			await workspace.revealLeaf(leaf);
 		}
 	}
+
+	private registerEditorEvents(): void {
+		[
+			this.app.workspace.on(
+				"editor-change",
+				async (
+					_editor: Editor,
+					info: MarkdownView | MarkdownFileInfo
+				) => {
+					const { file } = info;
+					if (file) {
+						await this.client.syncLocallyUpdatedFile({
+							relativePath: file.path
+						});
+					}
+				}
+			),
+			this.app.vault.on("create", async (file: TAbstractFile) => {
+				if (file instanceof TFile) {
+					await this.client.syncLocallyCreatedFile(file.path);
+				}
+			}),
+			this.app.vault.on("modify", async (file: TAbstractFile) => {
+				if (file instanceof TFile) {
+					await this.client.syncLocallyUpdatedFile({
+						relativePath: file.path
+					});
+				}
+			}),
+			this.app.vault.on("delete", async (file: TAbstractFile) => {
+				await this.client.syncLocallyDeletedFile(file.path);
+			}),
+			this.app.vault.on(
+				"rename",
+				async (file: TAbstractFile, oldPath: string) => {
+					if (file instanceof TFile) {
+						await this.client.syncLocallyUpdatedFile({
+							oldPath,
+							relativePath: file.path
+						});
+					}
+				}
+			)
+		].forEach((event) => {
+			this.registerEvent(event);
+		});
+	}
 }
diff --git a/frontend/obsidian-plugin/src/views/history/history-view.scss b/frontend/obsidian-plugin/src/views/history/history-view.scss
new file mode 100644
index 00000000..deabf59f
--- /dev/null
+++ b/frontend/obsidian-plugin/src/views/history/history-view.scss
@@ -0,0 +1,53 @@
+.history-card {
+	padding: var(--size-4-4);
+	margin: var(--size-4-2);
+	background-color: var(--color-base-00);
+	border-radius: var(--radius-l);
+	container-type: inline-size;
+
+	&.clickable {
+		cursor: pointer;
+	}
+
+	&.success {
+		background-color: rgba(var(--color-green-rgb), 0.2);
+	}
+
+	&.error {
+		background-color: rgba(var(--color-red-rgb), 0.2);
+	}
+
+	.history-card-header {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		margin-bottom: var(--size-4-2);
+		gap: var(--size-4-2);
+
+		@container (max-width: 300px) {
+			flex-direction: column;
+			align-items: flex-start;
+		}
+
+		.history-card-title {
+			font: var(--font-monospace);
+			display: flex;
+			align-items: center;
+			gap: var(--size-4-2);
+			word-break: break-all;
+			margin: 0;
+		}
+
+		.history-card-timestamp {
+			font-size: var(--font-ui-small);
+			font-style: italic;
+			color: var(--italic-color);
+		}
+	}
+
+	.history-card-message {
+		font-size: var(--font-ui-medium);
+		color: var(--color-base-70);
+		margin: 0;
+	}
+}
diff --git a/frontend/obsidian-plugin/src/views/history-view.ts b/frontend/obsidian-plugin/src/views/history/history-view.ts
similarity index 99%
rename from frontend/obsidian-plugin/src/views/history-view.ts
rename to frontend/obsidian-plugin/src/views/history/history-view.ts
index 2a4d7e1e..f1aef04e 100644
--- a/frontend/obsidian-plugin/src/views/history-view.ts
+++ b/frontend/obsidian-plugin/src/views/history/history-view.ts
@@ -1,6 +1,7 @@
+import "./history-view.scss";
+
 import type { IconName, WorkspaceLeaf } from "obsidian";
 import { ItemView, setIcon } from "obsidian";
-
 import { intlFormatDistance } from "date-fns";
 import type { HistoryEntry, SyncClient } from "sync-client";
 import { SyncType } from "sync-client";
diff --git a/frontend/obsidian-plugin/src/views/logs/logs-view.scss b/frontend/obsidian-plugin/src/views/logs/logs-view.scss
new file mode 100644
index 00000000..82ed1037
--- /dev/null
+++ b/frontend/obsidian-plugin/src/views/logs/logs-view.scss
@@ -0,0 +1,60 @@
+.logs-view {
+	display: flex;
+	flex-direction: column;
+
+	.verbosity-selector {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		font-weight: normal;
+		gap: var(--size-4-2);
+		margin: var(--size-4-4) var(--size-4-2);
+
+		h4 {
+			margin: 0;
+		}
+
+		select {
+			cursor: pointer;
+		}
+	}
+
+	.logs-container {
+		max-width: 100%;
+		overflow-y: auto;
+
+		.log-message {
+			font: var(--font-monospace);
+			margin-bottom: var(--size-2-1);
+			overflow-wrap: break-word;
+			white-space: pre-wrap;
+			user-select: all;
+
+			.timestamp {
+				padding: var(--size-2-1) var(--size-4-1);
+				border-radius: var(--radius-s);
+				background-color: var(--color-base-30);
+				font-size: var(--font-ui-small);
+				font-family: var(--font-monospace);
+				font-weight: var(--bold-weight);
+				margin-right: var(--size-4-1);
+			}
+
+			&.DEBUG {
+				color: var(--color-base-50);
+			}
+
+			&.INFO {
+				color: var(--color-base-100);
+			}
+
+			&.WARNING {
+				color: rgb(var(--color-yellow-rgb));
+			}
+
+			&.ERROR {
+				color: rgb(var(--color-red-rgb));
+			}
+		}
+	}
+}
diff --git a/frontend/obsidian-plugin/src/views/logs-view.ts b/frontend/obsidian-plugin/src/views/logs/logs-view.ts
similarity index 62%
rename from frontend/obsidian-plugin/src/views/logs-view.ts
rename to frontend/obsidian-plugin/src/views/logs/logs-view.ts
index 2e3ea88d..9830d5e8 100644
--- a/frontend/obsidian-plugin/src/views/logs-view.ts
+++ b/frontend/obsidian-plugin/src/views/logs/logs-view.ts
@@ -1,3 +1,5 @@
+import "./logs-view.scss";
+
 import type { WorkspaceLeaf } from "obsidian";
 import { ItemView } from "obsidian";
 import type { LogLine } from "sync-client";
@@ -7,8 +9,11 @@ export class LogsView extends ItemView {
 	public static readonly TYPE = "logs-view";
 	public static readonly ICON = "logs";
 
+	private static readonly MAX_OFFSET_FROM_BOTTOM_WITH_AUTO_SCROLL_PX = 300;
+
 	private logsContainer: HTMLElement | undefined;
 	private readonly logLineToElement = new Map<LogLine, HTMLElement>();
+	private minLogLevel: LogLevel = LogLevel.INFO;
 
 	public constructor(
 		private readonly client: SyncClient,
@@ -56,10 +61,43 @@ export class LogsView extends ItemView {
 	public async onOpen(): Promise<void> {
 		const container = this.containerEl.children[1];
 		container.addClass("logs-view");
-		container.createEl("h4", { text: "VaultLink logs" });
-		this.logsContainer = container.createDiv({ cls: "logs-container" });
 
-		this.updateView();
+		const logLevels = [
+			{ label: "Debug", value: LogLevel.DEBUG },
+			{ label: "Info", value: LogLevel.INFO },
+			{ label: "Warn", value: LogLevel.WARNING },
+			{ label: "Error", value: LogLevel.ERROR }
+		];
+
+		container.createDiv(
+			{
+				cls: "verbosity-selector"
+			},
+			(verbositySection) => {
+				verbositySection.createEl("h4", {
+					text: "VaultLink logs"
+				});
+
+				verbositySection.createEl("select", {}, (dropdown) => {
+					logLevels.forEach(({ label, value }) =>
+						dropdown.createEl("option", { text: label, value })
+					);
+
+					dropdown.value = this.minLogLevel;
+
+					dropdown.addEventListener("change", () => {
+						// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+						this.minLogLevel = dropdown.value as LogLevel;
+
+						this.logsContainer?.empty();
+						this.logLineToElement.clear();
+						this.updateView();
+					});
+				});
+			}
+		);
+
+		this.logsContainer = container.createDiv({ cls: "logs-container" });
 	}
 
 	private updateView(): void {
@@ -68,13 +106,20 @@ export class LogsView extends ItemView {
 			return;
 		}
 
-		const logs = this.client.logger.getMessages(LogLevel.DEBUG);
+		const logs = this.client.logger.getMessages(this.minLogLevel);
 
 		if (this.logLineToElement.size === 0 && logs.length > 0) {
 			// Clear the "No logs available yet" message
 			container.empty();
 		}
 
+		const shouldScroll =
+			container.scrollTop == 0 ||
+			container.scrollHeight -
+				container.clientHeight -
+				container.scrollTop <
+				LogsView.MAX_OFFSET_FROM_BOTTOM_WITH_AUTO_SCROLL_PX;
+
 		logs.forEach((message) => {
 			if (this.logLineToElement.has(message)) {
 				return;
@@ -98,6 +143,8 @@ export class LogsView extends ItemView {
 			container.createEl("p", {
 				text: "No logs available yet."
 			});
+		} else if (shouldScroll) {
+			container.scrollTop = container.scrollHeight;
 		}
 	}
 }
diff --git a/frontend/obsidian-plugin/src/views/settings/settings-tab.scss b/frontend/obsidian-plugin/src/views/settings/settings-tab.scss
new file mode 100644
index 00000000..dcc3e806
--- /dev/null
+++ b/frontend/obsidian-plugin/src/views/settings/settings-tab.scss
@@ -0,0 +1,57 @@
+@mixin number-card {
+	padding: var(--size-2-1) var(--size-4-1);
+	border-radius: var(--radius-s);
+	background-color: var(--color-base-30);
+	font-size: var(--font-ui-small);
+
+	&.good {
+		background-color: rgba(var(--color-green-rgb), 0.35);
+	}
+
+	&.bad {
+		background-color: rgba(var(--color-red-rgb), 0.35);
+	}
+}
+
+.vault-link-settings {
+	h2 {
+		display: flex;
+		align-items: center;
+		font-size: var(--h2-size);
+
+		.version {
+			@include number-card;
+			margin: var(--size-2-2) 0 0 var(--size-4-2);
+			background-color: var(--color-base-30);
+			color: var(--color-base-70);
+			font-size: var(--font-ui-smaller);
+		}
+	}
+
+	.button-container {
+		display: flex;
+		gap: var(--size-4-2);
+	}
+
+	h3 {
+		font-size: var(--font-ui-large);
+		margin-top: var(--heading-spacing);
+	}
+
+	button,
+	input[type="range"],
+	.checkbox-container,
+	.slider::-webkit-slider-thumb {
+		cursor: pointer;
+	}
+
+	input[type="text"],
+	textarea {
+		width: 250px;
+	}
+
+	textarea {
+		resize: none;
+		height: 75px;
+	}
+}
diff --git a/frontend/obsidian-plugin/src/views/settings-tab.ts b/frontend/obsidian-plugin/src/views/settings/settings-tab.ts
similarity index 90%
rename from frontend/obsidian-plugin/src/views/settings-tab.ts
rename to frontend/obsidian-plugin/src/views/settings/settings-tab.ts
index 7d726fb5..6c21e7af 100644
--- a/frontend/obsidian-plugin/src/views/settings-tab.ts
+++ b/frontend/obsidian-plugin/src/views/settings/settings-tab.ts
@@ -1,10 +1,12 @@
+import "./settings-tab.scss";
+
 import type { App } from "obsidian";
 import { Notice, PluginSettingTab, Setting } from "obsidian";
-import type VaultLinkPlugin from "../vault-link-plugin";
-import type { StatusDescription } from "./status-description";
-import { LogsView } from "./logs-view";
-import { HistoryView } from "./history-view";
+import type VaultLinkPlugin from "src/vault-link-plugin";
 import type { SyncClient, SyncSettings } from "sync-client";
+import { HistoryView } from "../history/history-view";
+import { LogsView } from "../logs/logs-view";
+import type { StatusDescription } from "../status-description/status-description";
 
 export class SyncSettingsTab extends PluginSettingTab {
 	private editedServerUri: string;
@@ -220,7 +222,7 @@ export class SyncSettingsTab extends PluginSettingTab {
 			.addButton((button) =>
 				button.setButtonText("Test connection").onClick(async () => {
 					new Notice(
-						(await this.syncClient.checkConnection()).message
+						(await this.syncClient.checkConnection()).serverMessage
 					);
 					await this.statusDescription.updateConnectionState();
 				})
@@ -246,29 +248,6 @@ export class SyncSettingsTab extends PluginSettingTab {
 					)
 			);
 
-		new Setting(containerEl)
-			.setName("Remote fetching frequency (seconds)")
-			.setDesc(
-				"Set how often should the plugin check for changes on the server. Lower values will increase the frequency of the checks making it easier to collaborate with others."
-			)
-			.setTooltip("todo, links to docs")
-			.addSlider((text) =>
-				text
-					.setLimits(0.5, 60, 0.5)
-					.setDynamicTooltip()
-					.setInstant(false)
-					.setValue(
-						this.syncClient.getSettings()
-							.fetchChangesUpdateIntervalMs / 1000
-					)
-					.onChange(async (value) =>
-						this.syncClient.setSetting(
-							"fetchChangesUpdateIntervalMs",
-							value * 1000
-						)
-					)
-			);
-
 		new Setting(containerEl)
 			.setName("Sync concurrency")
 			.setDesc(
diff --git a/frontend/obsidian-plugin/src/views/status-bar/status-bar.scss b/frontend/obsidian-plugin/src/views/status-bar/status-bar.scss
new file mode 100644
index 00000000..3762c2d9
--- /dev/null
+++ b/frontend/obsidian-plugin/src/views/status-bar/status-bar.scss
@@ -0,0 +1,14 @@
+.sync-status {
+	display: flex;
+	gap: var(--size-4-2);
+
+	* {
+		display: block;
+	}
+
+	.initialize-button {
+		padding: 0 var(--size-4-2);
+		background: rgba(var(--color-red-rgb), 0.4);
+		cursor: pointer;
+	}
+}
diff --git a/frontend/obsidian-plugin/src/views/status-bar.ts b/frontend/obsidian-plugin/src/views/status-bar/status-bar.ts
similarity index 95%
rename from frontend/obsidian-plugin/src/views/status-bar.ts
rename to frontend/obsidian-plugin/src/views/status-bar/status-bar.ts
index 3e35d93a..6289b0ca 100644
--- a/frontend/obsidian-plugin/src/views/status-bar.ts
+++ b/frontend/obsidian-plugin/src/views/status-bar/status-bar.ts
@@ -1,5 +1,7 @@
+import "./status-bar.scss";
+
 import type { HistoryStats, SyncClient } from "sync-client";
-import type VaultLinkPlugin from "../vault-link-plugin";
+import type VaultLinkPlugin from "../../vault-link-plugin";
 
 export class StatusBar {
 	private readonly statusBarItem: HTMLElement;
diff --git a/frontend/obsidian-plugin/src/views/status-description/status-description.scss b/frontend/obsidian-plugin/src/views/status-description/status-description.scss
new file mode 100644
index 00000000..3ac86944
--- /dev/null
+++ b/frontend/obsidian-plugin/src/views/status-description/status-description.scss
@@ -0,0 +1,32 @@
+@mixin number-card {
+	padding: var(--size-2-1) var(--size-4-1);
+	border-radius: var(--radius-s);
+	background-color: var(--color-base-30);
+	font-size: var(--font-ui-small);
+
+	&.good {
+		background-color: rgba(var(--color-green-rgb), 0.35);
+	}
+
+	&.bad {
+		background-color: rgba(var(--color-red-rgb), 0.35);
+	}
+}
+
+.status-description {
+	margin: var(--p-spacing) 0;
+
+	.number {
+		@include number-card;
+		font-family: var(--font-monospace);
+		font-weight: var(--bold-weight);
+	}
+
+	.error {
+		color: rgb(var(--color-red-rgb));
+	}
+
+	.warning {
+		color: rgb(var(--color-yellow-rgb));
+	}
+}
diff --git a/frontend/obsidian-plugin/src/views/status-description.ts b/frontend/obsidian-plugin/src/views/status-description/status-description.ts
similarity index 83%
rename from frontend/obsidian-plugin/src/views/status-description.ts
rename to frontend/obsidian-plugin/src/views/status-description/status-description.ts
index c696c53f..6d5ac693 100644
--- a/frontend/obsidian-plugin/src/views/status-description.ts
+++ b/frontend/obsidian-plugin/src/views/status-description/status-description.ts
@@ -1,13 +1,15 @@
+import "./status-description.scss";
+
 import type {
 	HistoryStats,
-	CheckConnectionResult,
+	NetworkConnectionStatus,
 	SyncClient
 } from "sync-client";
 
 export class StatusDescription {
 	private lastHistoryStats: HistoryStats | undefined;
 	private lastRemaining: number | undefined;
-	private lastConnectionState: CheckConnectionResult | undefined;
+	private lastConnectionState: NetworkConnectionStatus | undefined;
 
 	private statusChangeListeners: (() => void)[] = [];
 
@@ -26,9 +28,13 @@ export class StatusDescription {
 			}
 		);
 
-		this.syncClient.addOnSettingsChangeListener(() => {
-			void this.updateConnectionState();
-		});
+		this.syncClient.addWebSocketStatusChangeListener(
+			() => void this.updateConnectionState()
+		);
+
+		this.syncClient.addOnSettingsChangeListener(
+			() => void this.updateConnectionState()
+		);
 	}
 
 	public async updateConnectionState(): Promise<void> {
@@ -59,7 +65,15 @@ export class StatusDescription {
 
 		if (!this.lastConnectionState.isSuccessful) {
 			container.createSpan({
-				text: `VaultLink failed to connect to the remote server with the error "${this.lastConnectionState.message}"`,
+				text: `VaultLink failed to connect to the remote server with error '${this.lastConnectionState.serverMessage}'`,
+				cls: "error"
+			});
+			return;
+		}
+
+		if (!this.lastConnectionState.isWebSocketConnected) {
+			container.createSpan({
+				text: `${this.lastConnectionState.serverMessage} but the WebSocket connection could not be established.`,
 				cls: "error"
 			});
 			return;
diff --git a/frontend/obsidian-plugin/tsconfig.json b/frontend/obsidian-plugin/tsconfig.json
index 90ae756e..09dab427 100644
--- a/frontend/obsidian-plugin/tsconfig.json
+++ b/frontend/obsidian-plugin/tsconfig.json
@@ -6,7 +6,12 @@
 		"strict": true,
 		"moduleResolution": "bundler",
 		"allowSyntheticDefaultImports": true,
-		"lib": ["DOM", "ESNext"]
+		"lib": [
+			"DOM",
+			"ESNext"
+		]
 	},
-	"exclude": ["./dist"]
-}
+	"exclude": [
+		"./dist"
+	]
+}
\ No newline at end of file
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index c1995ecf..761db9ad 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -27,6 +27,8 @@
 		},
 		"node_modules/@ampproject/remapping": {
 			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
+			"integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"dependencies": {
@@ -39,6 +41,8 @@
 		},
 		"node_modules/@babel/code-frame": {
 			"version": "7.26.2",
+			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz",
+			"integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==",
 			"license": "MIT",
 			"dependencies": {
 				"@babel/helper-validator-identifier": "^7.25.9",
@@ -51,6 +55,8 @@
 		},
 		"node_modules/@babel/compat-data": {
 			"version": "7.26.8",
+			"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.8.tgz",
+			"integrity": "sha512-oH5UPLMWR3L2wEFLnFJ1TZXqHufiTKAiLfqw5zkhS4dKXLJ10yVztfil/twG8EDTA4F/tvVNw9nOl4ZMslB8rQ==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -58,20 +64,22 @@
 			}
 		},
 		"node_modules/@babel/core": {
-			"version": "7.26.9",
+			"version": "7.26.10",
+			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.10.tgz",
+			"integrity": "sha512-vMqyb7XCDMPvJFFOaT9kxtiRh42GwlZEg1/uIgtZshS5a/8OaduUfCi7kynKgc3Tw/6Uo2D+db9qBttghhmxwQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"@ampproject/remapping": "^2.2.0",
 				"@babel/code-frame": "^7.26.2",
-				"@babel/generator": "^7.26.9",
+				"@babel/generator": "^7.26.10",
 				"@babel/helper-compilation-targets": "^7.26.5",
 				"@babel/helper-module-transforms": "^7.26.0",
-				"@babel/helpers": "^7.26.9",
-				"@babel/parser": "^7.26.9",
+				"@babel/helpers": "^7.26.10",
+				"@babel/parser": "^7.26.10",
 				"@babel/template": "^7.26.9",
-				"@babel/traverse": "^7.26.9",
-				"@babel/types": "^7.26.9",
+				"@babel/traverse": "^7.26.10",
+				"@babel/types": "^7.26.10",
 				"convert-source-map": "^2.0.0",
 				"debug": "^4.1.0",
 				"gensync": "^1.0.0-beta.2",
@@ -88,6 +96,8 @@
 		},
 		"node_modules/@babel/core/node_modules/semver": {
 			"version": "6.3.1",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
 			"dev": true,
 			"license": "ISC",
 			"bin": {
@@ -95,12 +105,14 @@
 			}
 		},
 		"node_modules/@babel/generator": {
-			"version": "7.26.9",
+			"version": "7.27.0",
+			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.27.0.tgz",
+			"integrity": "sha512-VybsKvpiN1gU1sdMZIp7FcqphVVKEwcuj02x73uvcHE0PTihx1nlBcowYWhDwjpoAXRv43+gDzyggGnn1XZhVw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@babel/parser": "^7.26.9",
-				"@babel/types": "^7.26.9",
+				"@babel/parser": "^7.27.0",
+				"@babel/types": "^7.27.0",
 				"@jridgewell/gen-mapping": "^0.3.5",
 				"@jridgewell/trace-mapping": "^0.3.25",
 				"jsesc": "^3.0.2"
@@ -110,11 +122,13 @@
 			}
 		},
 		"node_modules/@babel/helper-compilation-targets": {
-			"version": "7.26.5",
+			"version": "7.27.0",
+			"resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.0.tgz",
+			"integrity": "sha512-LVk7fbXml0H2xH34dFzKQ7TDZ2G4/rVTOrq9V+icbbadjbVxxeFeDsNHv2SrZeWoA+6ZiTyWYWtScEIW07EAcA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@babel/compat-data": "^7.26.5",
+				"@babel/compat-data": "^7.26.8",
 				"@babel/helper-validator-option": "^7.25.9",
 				"browserslist": "^4.24.0",
 				"lru-cache": "^5.1.1",
@@ -126,6 +140,8 @@
 		},
 		"node_modules/@babel/helper-compilation-targets/node_modules/semver": {
 			"version": "6.3.1",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
 			"dev": true,
 			"license": "ISC",
 			"bin": {
@@ -134,6 +150,8 @@
 		},
 		"node_modules/@babel/helper-module-imports": {
 			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz",
+			"integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -146,6 +164,8 @@
 		},
 		"node_modules/@babel/helper-module-transforms": {
 			"version": "7.26.0",
+			"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz",
+			"integrity": "sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -162,6 +182,8 @@
 		},
 		"node_modules/@babel/helper-plugin-utils": {
 			"version": "7.26.5",
+			"resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.26.5.tgz",
+			"integrity": "sha512-RS+jZcRdZdRFzMyr+wcsaqOmld1/EqTghfaBGQQd/WnRdzdlvSZ//kF7U8VQTxf1ynZ4cjUcYgjVGx13ewNPMg==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -170,6 +192,8 @@
 		},
 		"node_modules/@babel/helper-string-parser": {
 			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
+			"integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -178,6 +202,8 @@
 		},
 		"node_modules/@babel/helper-validator-identifier": {
 			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
+			"integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==",
 			"license": "MIT",
 			"engines": {
 				"node": ">=6.9.0"
@@ -185,6 +211,8 @@
 		},
 		"node_modules/@babel/helper-validator-option": {
 			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz",
+			"integrity": "sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -192,25 +220,27 @@
 			}
 		},
 		"node_modules/@babel/helpers": {
-			"version": "7.26.10",
-			"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.10.tgz",
-			"integrity": "sha512-UPYc3SauzZ3JGgj87GgZ89JVdC5dj0AoetR5Bw6wj4niittNyFh6+eOGonYvJ1ao6B8lEa3Q3klS7ADZ53bc5g==",
+			"version": "7.27.0",
+			"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.27.0.tgz",
+			"integrity": "sha512-U5eyP/CTFPuNE3qk+WZMxFkp/4zUzdceQlfzf7DdGdhp+Fezd7HD+i8Y24ZuTMKX3wQBld449jijbGq6OdGNQg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@babel/template": "^7.26.9",
-				"@babel/types": "^7.26.10"
+				"@babel/template": "^7.27.0",
+				"@babel/types": "^7.27.0"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/parser": {
-			"version": "7.26.9",
+			"version": "7.27.0",
+			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.27.0.tgz",
+			"integrity": "sha512-iaepho73/2Pz7w2eMS0Q5f83+0RKI7i4xmiYeBmDzfRVbQtTOG7Ts0S4HzJVsTMGI9keU8rNfuZr8DKfSt7Yyg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@babel/types": "^7.26.9"
+				"@babel/types": "^7.27.0"
 			},
 			"bin": {
 				"parser": "bin/babel-parser.js"
@@ -221,6 +251,8 @@
 		},
 		"node_modules/@babel/plugin-syntax-async-generators": {
 			"version": "7.8.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
+			"integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -232,6 +264,8 @@
 		},
 		"node_modules/@babel/plugin-syntax-bigint": {
 			"version": "7.8.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
+			"integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -243,6 +277,8 @@
 		},
 		"node_modules/@babel/plugin-syntax-class-properties": {
 			"version": "7.12.13",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
+			"integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -254,6 +290,8 @@
 		},
 		"node_modules/@babel/plugin-syntax-class-static-block": {
 			"version": "7.14.5",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
+			"integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -268,6 +306,8 @@
 		},
 		"node_modules/@babel/plugin-syntax-import-attributes": {
 			"version": "7.26.0",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.26.0.tgz",
+			"integrity": "sha512-e2dttdsJ1ZTpi3B9UYGLw41hifAubg19AtCu/2I/F1QNVclOBr1dYpTdmdyZ84Xiz43BS/tCUkMAZNLv12Pi+A==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -282,6 +322,8 @@
 		},
 		"node_modules/@babel/plugin-syntax-import-meta": {
 			"version": "7.10.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
+			"integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -293,6 +335,8 @@
 		},
 		"node_modules/@babel/plugin-syntax-json-strings": {
 			"version": "7.8.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
+			"integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -304,6 +348,8 @@
 		},
 		"node_modules/@babel/plugin-syntax-jsx": {
 			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.25.9.tgz",
+			"integrity": "sha512-ld6oezHQMZsZfp6pWtbjaNDF2tiiCYYDqQszHt5VV437lewP9aSi2Of99CK0D0XB21k7FLgnLcmQKyKzynfeAA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -318,6 +364,8 @@
 		},
 		"node_modules/@babel/plugin-syntax-logical-assignment-operators": {
 			"version": "7.10.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
+			"integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -329,6 +377,8 @@
 		},
 		"node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
 			"version": "7.8.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
+			"integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -340,6 +390,8 @@
 		},
 		"node_modules/@babel/plugin-syntax-numeric-separator": {
 			"version": "7.10.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
+			"integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -351,6 +403,8 @@
 		},
 		"node_modules/@babel/plugin-syntax-object-rest-spread": {
 			"version": "7.8.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
+			"integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -362,6 +416,8 @@
 		},
 		"node_modules/@babel/plugin-syntax-optional-catch-binding": {
 			"version": "7.8.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
+			"integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -373,6 +429,8 @@
 		},
 		"node_modules/@babel/plugin-syntax-optional-chaining": {
 			"version": "7.8.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
+			"integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -384,6 +442,8 @@
 		},
 		"node_modules/@babel/plugin-syntax-private-property-in-object": {
 			"version": "7.14.5",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
+			"integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -398,6 +458,8 @@
 		},
 		"node_modules/@babel/plugin-syntax-top-level-await": {
 			"version": "7.14.5",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
+			"integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -412,6 +474,8 @@
 		},
 		"node_modules/@babel/plugin-syntax-typescript": {
 			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.25.9.tgz",
+			"integrity": "sha512-hjMgRy5hb8uJJjUcdWunWVcoi9bGpJp8p5Ol1229PoN6aytsLwNMgmdftO23wnCLMfVmTwZDWMPNq/D1SY60JQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -425,28 +489,32 @@
 			}
 		},
 		"node_modules/@babel/template": {
-			"version": "7.26.9",
+			"version": "7.27.0",
+			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.0.tgz",
+			"integrity": "sha512-2ncevenBqXI6qRMukPlXwHKHchC7RyMuu4xv5JBXRfOGVcTy1mXCD12qrp7Jsoxll1EV3+9sE4GugBVRjT2jFA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"@babel/code-frame": "^7.26.2",
-				"@babel/parser": "^7.26.9",
-				"@babel/types": "^7.26.9"
+				"@babel/parser": "^7.27.0",
+				"@babel/types": "^7.27.0"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/traverse": {
-			"version": "7.26.9",
+			"version": "7.27.0",
+			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.27.0.tgz",
+			"integrity": "sha512-19lYZFzYVQkkHkl4Cy4WrAVcqBkgvV2YM2TU3xG6DIwO7O3ecbDPfW3yM3bjAGcqcQHi+CCtjMR3dIEHxsd6bA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"@babel/code-frame": "^7.26.2",
-				"@babel/generator": "^7.26.9",
-				"@babel/parser": "^7.26.9",
-				"@babel/template": "^7.26.9",
-				"@babel/types": "^7.26.9",
+				"@babel/generator": "^7.27.0",
+				"@babel/parser": "^7.27.0",
+				"@babel/template": "^7.27.0",
+				"@babel/types": "^7.27.0",
 				"debug": "^4.3.1",
 				"globals": "^11.1.0"
 			},
@@ -456,6 +524,8 @@
 		},
 		"node_modules/@babel/traverse/node_modules/globals": {
 			"version": "11.12.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -463,9 +533,9 @@
 			}
 		},
 		"node_modules/@babel/types": {
-			"version": "7.26.10",
-			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.10.tgz",
-			"integrity": "sha512-emqcG3vHrpxUKTrxcblR36dcrcoRDvKmnL/dCL6ZsHaShW80qxCAcNhzQZrpeM765VzEos+xOi4s+r4IXzTwdQ==",
+			"version": "7.27.0",
+			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.27.0.tgz",
+			"integrity": "sha512-H45s8fVLYjbhFH62dIJ3WtmJ6RSPt/3DRO0ZcT2SUiYiQyz3BLVb9ADEnLl91m74aQPS3AzzeajZHYOalWe3bg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -478,11 +548,15 @@
 		},
 		"node_modules/@bcoe/v8-coverage": {
 			"version": "0.2.3",
+			"resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
+			"integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@codemirror/state": {
 			"version": "6.5.2",
+			"resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.5.2.tgz",
+			"integrity": "sha512-FVqsPqtPWKVVL3dPSxy8wEF/ymIEuVzF1PK3VbUgrxXpJUSHQWWZz4JMToquRxnkw+36LTamCZG2iua2Ptq0fA==",
 			"dev": true,
 			"license": "MIT",
 			"peer": true,
@@ -491,7 +565,9 @@
 			}
 		},
 		"node_modules/@codemirror/view": {
-			"version": "6.36.3",
+			"version": "6.36.4",
+			"resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.36.4.tgz",
+			"integrity": "sha512-ZQ0V5ovw/miKEXTvjgzRyjnrk9TwriUB1k4R5p7uNnHR9Hus+D1SXHGdJshijEzPFjU25xea/7nhIeSqYFKdbA==",
 			"dev": true,
 			"license": "MIT",
 			"peer": true,
@@ -501,32 +577,10 @@
 				"w3c-keyname": "^2.2.4"
 			}
 		},
-		"node_modules/@cspotcode/source-map-support": {
-			"version": "0.8.1",
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"peer": true,
-			"dependencies": {
-				"@jridgewell/trace-mapping": "0.3.9"
-			},
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": {
-			"version": "0.3.9",
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"peer": true,
-			"dependencies": {
-				"@jridgewell/resolve-uri": "^3.0.3",
-				"@jridgewell/sourcemap-codec": "^1.4.10"
-			}
-		},
 		"node_modules/@discoveryjs/json-ext": {
 			"version": "0.6.3",
+			"resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.6.3.tgz",
+			"integrity": "sha512-4B4OijXeVNOPZlYA2oEwWOTkzyltLao+xbotHQeqN++Rv27Y6s818+n2Qkp8q+Fxhn0t/5lA5X1Mxktud8eayQ==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -534,7 +588,9 @@
 			}
 		},
 		"node_modules/@eslint-community/eslint-utils": {
-			"version": "4.4.1",
+			"version": "4.5.1",
+			"resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.5.1.tgz",
+			"integrity": "sha512-soEIOALTfTK6EjmKMMoLugwaP0rzkad90iIWd1hMO9ARkSAyjfMfkRRhLvD5qH7vvM0Cg72pieUfR6yh6XxC4w==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -552,6 +608,8 @@
 		},
 		"node_modules/@eslint-community/eslint-utils/node_modules/eslint-visitor-keys": {
 			"version": "3.4.3",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+			"integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"engines": {
@@ -563,6 +621,8 @@
 		},
 		"node_modules/@eslint-community/regexpp": {
 			"version": "4.12.1",
+			"resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz",
+			"integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -571,6 +631,8 @@
 		},
 		"node_modules/@eslint/config-array": {
 			"version": "0.19.2",
+			"resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.19.2.tgz",
+			"integrity": "sha512-GNKqxfHG2ySmJOBSHg7LxeUx4xpuCoFjacmlCoYWEbaPXLwvfIjixRI12xCQZeULksQb23uiA8F40w5TojpV7w==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"dependencies": {
@@ -606,9 +668,9 @@
 			}
 		},
 		"node_modules/@eslint/eslintrc": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.0.tgz",
-			"integrity": "sha512-yaVPAiNAalnCZedKLdR21GOGILMLKPyqSLWaAjQFvYA2i/ciDi8ArYVr69Anohb6cH2Ukhqti4aFnYyPm8wdwQ==",
+			"version": "3.3.1",
+			"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.1.tgz",
+			"integrity": "sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -641,6 +703,8 @@
 		},
 		"node_modules/@eslint/object-schema": {
 			"version": "2.1.6",
+			"resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.6.tgz",
+			"integrity": "sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"engines": {
@@ -663,6 +727,8 @@
 		},
 		"node_modules/@humanfs/core": {
 			"version": "0.19.1",
+			"resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz",
+			"integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"engines": {
@@ -671,6 +737,8 @@
 		},
 		"node_modules/@humanfs/node": {
 			"version": "0.16.6",
+			"resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz",
+			"integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"dependencies": {
@@ -683,6 +751,8 @@
 		},
 		"node_modules/@humanfs/node/node_modules/@humanwhocodes/retry": {
 			"version": "0.3.1",
+			"resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz",
+			"integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"engines": {
@@ -695,6 +765,8 @@
 		},
 		"node_modules/@humanwhocodes/module-importer": {
 			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
+			"integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"engines": {
@@ -721,6 +793,8 @@
 		},
 		"node_modules/@istanbuljs/load-nyc-config": {
 			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
+			"integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
 			"dev": true,
 			"license": "ISC",
 			"dependencies": {
@@ -736,6 +810,8 @@
 		},
 		"node_modules/@istanbuljs/load-nyc-config/node_modules/argparse": {
 			"version": "1.0.10",
+			"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+			"integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -744,6 +820,8 @@
 		},
 		"node_modules/@istanbuljs/load-nyc-config/node_modules/find-up": {
 			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+			"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -756,6 +834,8 @@
 		},
 		"node_modules/@istanbuljs/load-nyc-config/node_modules/js-yaml": {
 			"version": "3.14.1",
+			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+			"integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -768,6 +848,8 @@
 		},
 		"node_modules/@istanbuljs/load-nyc-config/node_modules/locate-path": {
 			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+			"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -779,6 +861,8 @@
 		},
 		"node_modules/@istanbuljs/load-nyc-config/node_modules/p-limit": {
 			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+			"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -793,6 +877,8 @@
 		},
 		"node_modules/@istanbuljs/load-nyc-config/node_modules/p-locate": {
 			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+			"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -804,6 +890,8 @@
 		},
 		"node_modules/@istanbuljs/load-nyc-config/node_modules/resolve-from": {
 			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+			"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -812,6 +900,8 @@
 		},
 		"node_modules/@istanbuljs/schema": {
 			"version": "0.1.3",
+			"resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
+			"integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -820,6 +910,8 @@
 		},
 		"node_modules/@jest/console": {
 			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz",
+			"integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -836,6 +928,8 @@
 		},
 		"node_modules/@jest/core": {
 			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/@jest/core/-/core-29.7.0.tgz",
+			"integrity": "sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -882,6 +976,8 @@
 		},
 		"node_modules/@jest/environment": {
 			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz",
+			"integrity": "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -896,6 +992,8 @@
 		},
 		"node_modules/@jest/expect": {
 			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz",
+			"integrity": "sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -908,6 +1006,8 @@
 		},
 		"node_modules/@jest/expect-utils": {
 			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz",
+			"integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -919,6 +1019,8 @@
 		},
 		"node_modules/@jest/fake-timers": {
 			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz",
+			"integrity": "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -935,6 +1037,8 @@
 		},
 		"node_modules/@jest/globals": {
 			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz",
+			"integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -949,6 +1053,8 @@
 		},
 		"node_modules/@jest/reporters": {
 			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz",
+			"integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -991,6 +1097,8 @@
 		},
 		"node_modules/@jest/schemas": {
 			"version": "29.6.3",
+			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
+			"integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1002,6 +1110,8 @@
 		},
 		"node_modules/@jest/source-map": {
 			"version": "29.6.3",
+			"resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz",
+			"integrity": "sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1015,6 +1125,8 @@
 		},
 		"node_modules/@jest/test-result": {
 			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz",
+			"integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1029,6 +1141,8 @@
 		},
 		"node_modules/@jest/test-sequencer": {
 			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz",
+			"integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1043,6 +1157,8 @@
 		},
 		"node_modules/@jest/transform": {
 			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz",
+			"integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1068,6 +1184,8 @@
 		},
 		"node_modules/@jest/types": {
 			"version": "29.6.3",
+			"resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+			"integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1084,6 +1202,8 @@
 		},
 		"node_modules/@jridgewell/gen-mapping": {
 			"version": "0.3.8",
+			"resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz",
+			"integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1097,6 +1217,8 @@
 		},
 		"node_modules/@jridgewell/resolve-uri": {
 			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+			"integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -1105,6 +1227,8 @@
 		},
 		"node_modules/@jridgewell/set-array": {
 			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+			"integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -1113,6 +1237,8 @@
 		},
 		"node_modules/@jridgewell/source-map": {
 			"version": "0.3.6",
+			"resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz",
+			"integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1122,11 +1248,15 @@
 		},
 		"node_modules/@jridgewell/sourcemap-codec": {
 			"version": "1.5.0",
+			"resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
+			"integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@jridgewell/trace-mapping": {
 			"version": "0.3.25",
+			"resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+			"integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1136,6 +1266,8 @@
 		},
 		"node_modules/@marijn/find-cluster-break": {
 			"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==",
 			"dev": true,
 			"license": "MIT",
 			"peer": true
@@ -1180,6 +1312,8 @@
 		},
 		"node_modules/@parcel/watcher": {
 			"version": "2.5.1",
+			"resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.1.tgz",
+			"integrity": "sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==",
 			"dev": true,
 			"hasInstallScript": true,
 			"license": "MIT",
@@ -1213,8 +1347,178 @@
 				"@parcel/watcher-win32-x64": "2.5.1"
 			}
 		},
+		"node_modules/@parcel/watcher-android-arm64": {
+			"version": "2.5.1",
+			"resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.1.tgz",
+			"integrity": "sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"android"
+			],
+			"engines": {
+				"node": ">= 10.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/parcel"
+			}
+		},
+		"node_modules/@parcel/watcher-darwin-arm64": {
+			"version": "2.5.1",
+			"resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.1.tgz",
+			"integrity": "sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"darwin"
+			],
+			"engines": {
+				"node": ">= 10.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/parcel"
+			}
+		},
+		"node_modules/@parcel/watcher-darwin-x64": {
+			"version": "2.5.1",
+			"resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.1.tgz",
+			"integrity": "sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"darwin"
+			],
+			"engines": {
+				"node": ">= 10.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/parcel"
+			}
+		},
+		"node_modules/@parcel/watcher-freebsd-x64": {
+			"version": "2.5.1",
+			"resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.1.tgz",
+			"integrity": "sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"freebsd"
+			],
+			"engines": {
+				"node": ">= 10.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/parcel"
+			}
+		},
+		"node_modules/@parcel/watcher-linux-arm-glibc": {
+			"version": "2.5.1",
+			"resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.1.tgz",
+			"integrity": "sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA==",
+			"cpu": [
+				"arm"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">= 10.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/parcel"
+			}
+		},
+		"node_modules/@parcel/watcher-linux-arm-musl": {
+			"version": "2.5.1",
+			"resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.1.tgz",
+			"integrity": "sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==",
+			"cpu": [
+				"arm"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">= 10.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/parcel"
+			}
+		},
+		"node_modules/@parcel/watcher-linux-arm64-glibc": {
+			"version": "2.5.1",
+			"resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.1.tgz",
+			"integrity": "sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">= 10.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/parcel"
+			}
+		},
+		"node_modules/@parcel/watcher-linux-arm64-musl": {
+			"version": "2.5.1",
+			"resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.1.tgz",
+			"integrity": "sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">= 10.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/parcel"
+			}
+		},
 		"node_modules/@parcel/watcher-linux-x64-glibc": {
 			"version": "2.5.1",
+			"resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.1.tgz",
+			"integrity": "sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==",
 			"cpu": [
 				"x64"
 			],
@@ -1234,6 +1538,8 @@
 		},
 		"node_modules/@parcel/watcher-linux-x64-musl": {
 			"version": "2.5.1",
+			"resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.1.tgz",
+			"integrity": "sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==",
 			"cpu": [
 				"x64"
 			],
@@ -1251,8 +1557,73 @@
 				"url": "https://opencollective.com/parcel"
 			}
 		},
+		"node_modules/@parcel/watcher-win32-arm64": {
+			"version": "2.5.1",
+			"resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.1.tgz",
+			"integrity": "sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"win32"
+			],
+			"engines": {
+				"node": ">= 10.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/parcel"
+			}
+		},
+		"node_modules/@parcel/watcher-win32-ia32": {
+			"version": "2.5.1",
+			"resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.1.tgz",
+			"integrity": "sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ==",
+			"cpu": [
+				"ia32"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"win32"
+			],
+			"engines": {
+				"node": ">= 10.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/parcel"
+			}
+		},
+		"node_modules/@parcel/watcher-win32-x64": {
+			"version": "2.5.1",
+			"resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.1.tgz",
+			"integrity": "sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"win32"
+			],
+			"engines": {
+				"node": ">= 10.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/parcel"
+			}
+		},
 		"node_modules/@redocly/ajv": {
 			"version": "8.11.2",
+			"resolved": "https://registry.npmjs.org/@redocly/ajv/-/ajv-8.11.2.tgz",
+			"integrity": "sha512-io1JpnwtIcvojV7QKDUSIuMN/ikdOUd1ReEnUnMKGfDVridQZ31J0MmIuqwuRjWDZfmvr+Q0MqCcfHM2gTivOg==",
 			"license": "MIT",
 			"dependencies": {
 				"fast-deep-equal": "^3.1.1",
@@ -1267,18 +1638,24 @@
 		},
 		"node_modules/@redocly/ajv/node_modules/json-schema-traverse": {
 			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
 			"license": "MIT"
 		},
 		"node_modules/@redocly/config": {
-			"version": "0.20.3",
+			"version": "0.22.1",
+			"resolved": "https://registry.npmjs.org/@redocly/config/-/config-0.22.1.tgz",
+			"integrity": "sha512-1CqQfiG456v9ZgYBG9xRQHnpXjt8WoSnDwdkX6gxktuK69v2037hTAR1eh0DGIqpZ1p4k82cGH8yTNwt7/pI9g==",
 			"license": "MIT"
 		},
 		"node_modules/@redocly/openapi-core": {
-			"version": "1.29.0",
+			"version": "1.34.0",
+			"resolved": "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.34.0.tgz",
+			"integrity": "sha512-Ji00EiLQRXq0pJIz5pAjGF9MfQvQVsQehc6uIis6sqat8tG/zh25Zi64w6HVGEDgJEzUeq/CuUlD0emu3Hdaqw==",
 			"license": "MIT",
 			"dependencies": {
 				"@redocly/ajv": "^8.11.2",
-				"@redocly/config": "^0.20.1",
+				"@redocly/config": "^0.22.0",
 				"colorette": "^1.2.0",
 				"https-proxy-agent": "^7.0.5",
 				"js-levenshtein": "^1.1.6",
@@ -1294,6 +1671,8 @@
 		},
 		"node_modules/@redocly/openapi-core/node_modules/brace-expansion": {
 			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+			"integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
 			"license": "MIT",
 			"dependencies": {
 				"balanced-match": "^1.0.0"
@@ -1301,6 +1680,8 @@
 		},
 		"node_modules/@redocly/openapi-core/node_modules/minimatch": {
 			"version": "5.1.6",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+			"integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
 			"license": "ISC",
 			"dependencies": {
 				"brace-expansion": "^2.0.1"
@@ -1311,11 +1692,15 @@
 		},
 		"node_modules/@sinclair/typebox": {
 			"version": "0.27.8",
+			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
+			"integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@sinonjs/commons": {
 			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz",
+			"integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==",
 			"dev": true,
 			"license": "BSD-3-Clause",
 			"dependencies": {
@@ -1324,42 +1709,18 @@
 		},
 		"node_modules/@sinonjs/fake-timers": {
 			"version": "10.3.0",
+			"resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz",
+			"integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==",
 			"dev": true,
 			"license": "BSD-3-Clause",
 			"dependencies": {
 				"@sinonjs/commons": "^3.0.0"
 			}
 		},
-		"node_modules/@tsconfig/node10": {
-			"version": "1.0.11",
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"peer": true
-		},
-		"node_modules/@tsconfig/node12": {
-			"version": "1.0.11",
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"peer": true
-		},
-		"node_modules/@tsconfig/node14": {
-			"version": "1.0.3",
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"peer": true
-		},
-		"node_modules/@tsconfig/node16": {
-			"version": "1.0.4",
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"peer": true
-		},
 		"node_modules/@types/babel__core": {
 			"version": "7.20.5",
+			"resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
+			"integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1372,6 +1733,8 @@
 		},
 		"node_modules/@types/babel__generator": {
 			"version": "7.6.8",
+			"resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz",
+			"integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1380,6 +1743,8 @@
 		},
 		"node_modules/@types/babel__template": {
 			"version": "7.4.4",
+			"resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz",
+			"integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1388,7 +1753,9 @@
 			}
 		},
 		"node_modules/@types/babel__traverse": {
-			"version": "7.20.6",
+			"version": "7.20.7",
+			"resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.7.tgz",
+			"integrity": "sha512-dkO5fhS7+/oos4ciWxyEyjWe48zmG6wbCheo/G2ZnHx4fs3EU6YC6UM8rk56gAjNJ9P3MTH2jo5jb92/K6wbng==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1397,6 +1764,8 @@
 		},
 		"node_modules/@types/codemirror": {
 			"version": "5.60.8",
+			"resolved": "https://registry.npmjs.org/@types/codemirror/-/codemirror-5.60.8.tgz",
+			"integrity": "sha512-VjFgDF/eB+Aklcy15TtOTLQeMjTo07k7KAjql8OK5Dirr7a6sJY4T1uVBDuTVG9VEmn1uUsohOpYnVfgC6/jyw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1405,6 +1774,8 @@
 		},
 		"node_modules/@types/eslint": {
 			"version": "9.6.1",
+			"resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz",
+			"integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1414,6 +1785,8 @@
 		},
 		"node_modules/@types/eslint-scope": {
 			"version": "3.7.7",
+			"resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
+			"integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1422,12 +1795,16 @@
 			}
 		},
 		"node_modules/@types/estree": {
-			"version": "1.0.6",
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz",
+			"integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@types/graceful-fs": {
 			"version": "4.1.9",
+			"resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz",
+			"integrity": "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1436,11 +1813,15 @@
 		},
 		"node_modules/@types/istanbul-lib-coverage": {
 			"version": "2.0.6",
+			"resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz",
+			"integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@types/istanbul-lib-report": {
 			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz",
+			"integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1449,6 +1830,8 @@
 		},
 		"node_modules/@types/istanbul-reports": {
 			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz",
+			"integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1457,6 +1840,8 @@
 		},
 		"node_modules/@types/jest": {
 			"version": "29.5.14",
+			"resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.14.tgz",
+			"integrity": "sha512-ZN+4sdnLUbo8EVvVc2ao0GFW6oVrQRPn4K2lglySj7APvSrgzxHiNNK99us4WDMi57xxA2yggblIAMNhXOotLQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1466,13 +1851,15 @@
 		},
 		"node_modules/@types/json-schema": {
 			"version": "7.0.15",
+			"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
+			"integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@types/node": {
-			"version": "22.13.10",
-			"resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.10.tgz",
-			"integrity": "sha512-I6LPUvlRH+O6VRUqYOcMudhaIdUVWfsjnZavnsraHvpBwaEyMN29ry+0UVJhImYL16xsscu0aske3yA+uPOWfw==",
+			"version": "22.13.14",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.14.tgz",
+			"integrity": "sha512-Zs/Ollc1SJ8nKUAgc7ivOEdIBM8JAKgrqqUYi2J997JuKO7/tpQC+WCetQ1sypiKCQWHdvdg9wBNpUPEWZae7w==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1481,11 +1868,15 @@
 		},
 		"node_modules/@types/stack-utils": {
 			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz",
+			"integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@types/tern": {
 			"version": "0.23.9",
+			"resolved": "https://registry.npmjs.org/@types/tern/-/tern-0.23.9.tgz",
+			"integrity": "sha512-ypzHFE/wBzh+BlH6rrBgS5I/Z7RD21pGhZ2rltb/+ZrVM1awdZwjx7hE5XfuYgHWk9uvV5HLZN3SloevCAp3Bw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1494,6 +1885,8 @@
 		},
 		"node_modules/@types/yargs": {
 			"version": "17.0.33",
+			"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.33.tgz",
+			"integrity": "sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1502,6 +1895,8 @@
 		},
 		"node_modules/@types/yargs-parser": {
 			"version": "21.0.3",
+			"resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz",
+			"integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -1713,6 +2108,8 @@
 		},
 		"node_modules/@webassemblyjs/ast": {
 			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz",
+			"integrity": "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1722,21 +2119,29 @@
 		},
 		"node_modules/@webassemblyjs/floating-point-hex-parser": {
 			"version": "1.13.2",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz",
+			"integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@webassemblyjs/helper-api-error": {
 			"version": "1.13.2",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz",
+			"integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@webassemblyjs/helper-buffer": {
 			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz",
+			"integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@webassemblyjs/helper-numbers": {
 			"version": "1.13.2",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz",
+			"integrity": "sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1747,11 +2152,15 @@
 		},
 		"node_modules/@webassemblyjs/helper-wasm-bytecode": {
 			"version": "1.13.2",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz",
+			"integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@webassemblyjs/helper-wasm-section": {
 			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz",
+			"integrity": "sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1763,6 +2172,8 @@
 		},
 		"node_modules/@webassemblyjs/ieee754": {
 			"version": "1.13.2",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz",
+			"integrity": "sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1771,6 +2182,8 @@
 		},
 		"node_modules/@webassemblyjs/leb128": {
 			"version": "1.13.2",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz",
+			"integrity": "sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"dependencies": {
@@ -1779,11 +2192,15 @@
 		},
 		"node_modules/@webassemblyjs/utf8": {
 			"version": "1.13.2",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz",
+			"integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@webassemblyjs/wasm-edit": {
 			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz",
+			"integrity": "sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1799,6 +2216,8 @@
 		},
 		"node_modules/@webassemblyjs/wasm-gen": {
 			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz",
+			"integrity": "sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1811,6 +2230,8 @@
 		},
 		"node_modules/@webassemblyjs/wasm-opt": {
 			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz",
+			"integrity": "sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1822,6 +2243,8 @@
 		},
 		"node_modules/@webassemblyjs/wasm-parser": {
 			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz",
+			"integrity": "sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1835,6 +2258,8 @@
 		},
 		"node_modules/@webassemblyjs/wast-printer": {
 			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz",
+			"integrity": "sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1844,6 +2269,8 @@
 		},
 		"node_modules/@webpack-cli/configtest": {
 			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-3.0.1.tgz",
+			"integrity": "sha512-u8d0pJ5YFgneF/GuvEiDA61Tf1VDomHHYMjv/wc9XzYj7nopltpG96nXN5dJRstxZhcNpV1g+nT6CydO7pHbjA==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -1856,6 +2283,8 @@
 		},
 		"node_modules/@webpack-cli/info": {
 			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-3.0.1.tgz",
+			"integrity": "sha512-coEmDzc2u/ffMvuW9aCjoRzNSPDl/XLuhPdlFRpT9tZHmJ/039az33CE7uH+8s0uL1j5ZNtfdv0HkfaKRBGJsQ==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -1868,6 +2297,8 @@
 		},
 		"node_modules/@webpack-cli/serve": {
 			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-3.0.1.tgz",
+			"integrity": "sha512-sbgw03xQaCLiT6gcY/6u3qBDn01CWw/nbaXl3gTdTFuJJ75Gffv3E3DBpgvY2fkkrdS1fpjaXNOmJlnbtKauKg==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -1885,16 +2316,22 @@
 		},
 		"node_modules/@xtuc/ieee754": {
 			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
+			"integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
 			"dev": true,
 			"license": "BSD-3-Clause"
 		},
 		"node_modules/@xtuc/long": {
 			"version": "4.2.2",
+			"resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
+			"integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
 			"dev": true,
 			"license": "Apache-2.0"
 		},
 		"node_modules/acorn": {
-			"version": "8.14.0",
+			"version": "8.14.1",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz",
+			"integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==",
 			"dev": true,
 			"license": "MIT",
 			"bin": {
@@ -1914,21 +2351,10 @@
 				"acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
 			}
 		},
-		"node_modules/acorn-walk": {
-			"version": "8.3.4",
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"peer": true,
-			"dependencies": {
-				"acorn": "^8.11.0"
-			},
-			"engines": {
-				"node": ">=0.4.0"
-			}
-		},
 		"node_modules/adjust-sourcemap-loader": {
 			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-4.0.0.tgz",
+			"integrity": "sha512-OXwN5b9pCUXNQHJpwwD2qP40byEmSgzj8B4ydSN0uMNYWiFmJ6x6KwUllMmfk8Rwu/HJDFR7U8ubsWBoN0Xp0A==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1941,6 +2367,8 @@
 		},
 		"node_modules/agent-base": {
 			"version": "7.1.3",
+			"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
+			"integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==",
 			"license": "MIT",
 			"engines": {
 				"node": ">= 14"
@@ -1948,6 +2376,8 @@
 		},
 		"node_modules/ajv": {
 			"version": "6.12.6",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+			"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1963,6 +2393,8 @@
 		},
 		"node_modules/ajv-formats": {
 			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
+			"integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1979,6 +2411,8 @@
 		},
 		"node_modules/ajv-formats/node_modules/ajv": {
 			"version": "8.17.1",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+			"integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1994,11 +2428,15 @@
 		},
 		"node_modules/ajv-formats/node_modules/json-schema-traverse": {
 			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/ajv-keywords": {
 			"version": "3.5.2",
+			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+			"integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
 			"dev": true,
 			"license": "MIT",
 			"peerDependencies": {
@@ -2007,6 +2445,8 @@
 		},
 		"node_modules/ansi-colors": {
 			"version": "4.1.3",
+			"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
+			"integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
 			"license": "MIT",
 			"engines": {
 				"node": ">=6"
@@ -2014,6 +2454,8 @@
 		},
 		"node_modules/ansi-escapes": {
 			"version": "4.3.2",
+			"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+			"integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2028,6 +2470,8 @@
 		},
 		"node_modules/ansi-regex": {
 			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+			"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -2036,6 +2480,8 @@
 		},
 		"node_modules/ansi-styles": {
 			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2050,6 +2496,8 @@
 		},
 		"node_modules/anymatch": {
 			"version": "3.1.3",
+			"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+			"integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
 			"dev": true,
 			"license": "ISC",
 			"dependencies": {
@@ -2060,24 +2508,23 @@
 				"node": ">= 8"
 			}
 		},
-		"node_modules/arg": {
-			"version": "4.1.3",
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"peer": true
-		},
 		"node_modules/argparse": {
 			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+			"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
 			"license": "Python-2.0"
 		},
 		"node_modules/async": {
 			"version": "3.2.6",
+			"resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
+			"integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/babel-jest": {
 			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz",
+			"integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2098,6 +2545,8 @@
 		},
 		"node_modules/babel-plugin-istanbul": {
 			"version": "6.1.1",
+			"resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
+			"integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
 			"dev": true,
 			"license": "BSD-3-Clause",
 			"dependencies": {
@@ -2113,6 +2562,8 @@
 		},
 		"node_modules/babel-plugin-istanbul/node_modules/istanbul-lib-instrument": {
 			"version": "5.2.1",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
+			"integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
 			"dev": true,
 			"license": "BSD-3-Clause",
 			"dependencies": {
@@ -2128,6 +2579,8 @@
 		},
 		"node_modules/babel-plugin-istanbul/node_modules/semver": {
 			"version": "6.3.1",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
 			"dev": true,
 			"license": "ISC",
 			"bin": {
@@ -2136,6 +2589,8 @@
 		},
 		"node_modules/babel-plugin-jest-hoist": {
 			"version": "29.6.3",
+			"resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz",
+			"integrity": "sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2150,6 +2605,8 @@
 		},
 		"node_modules/babel-preset-current-node-syntax": {
 			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.1.0.tgz",
+			"integrity": "sha512-ldYss8SbBlWva1bs28q78Ju5Zq1F+8BrqBZZ0VFhLBvhh6lCpC2o3gDJi/5DRLs9FgYZCnmPYIVFU4lRXCkyUw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2175,6 +2632,8 @@
 		},
 		"node_modules/babel-preset-jest": {
 			"version": "29.6.3",
+			"resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz",
+			"integrity": "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2190,10 +2649,14 @@
 		},
 		"node_modules/balanced-match": {
 			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+			"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
 			"license": "MIT"
 		},
 		"node_modules/big.js": {
 			"version": "5.2.2",
+			"resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
+			"integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -2202,6 +2665,8 @@
 		},
 		"node_modules/brace-expansion": {
 			"version": "1.1.11",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2211,6 +2676,8 @@
 		},
 		"node_modules/braces": {
 			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+			"integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2222,6 +2689,8 @@
 		},
 		"node_modules/browserslist": {
 			"version": "4.24.4",
+			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz",
+			"integrity": "sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==",
 			"dev": true,
 			"funding": [
 				{
@@ -2253,6 +2722,8 @@
 		},
 		"node_modules/bs-logger": {
 			"version": "0.2.6",
+			"resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz",
+			"integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2264,6 +2735,8 @@
 		},
 		"node_modules/bser": {
 			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
+			"integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"dependencies": {
@@ -2272,11 +2745,29 @@
 		},
 		"node_modules/buffer-from": {
 			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+			"integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
 			"dev": true,
 			"license": "MIT"
 		},
+		"node_modules/bufferutil": {
+			"version": "4.0.9",
+			"resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.9.tgz",
+			"integrity": "sha512-WDtdLmJvAuNNPzByAYpRo2rF1Mmradw6gvWsQKf63476DDXmomT9zUiGypLcG4ibIM67vhAj8jJRdbmEws2Aqw==",
+			"dev": true,
+			"hasInstallScript": true,
+			"license": "MIT",
+			"dependencies": {
+				"node-gyp-build": "^4.3.0"
+			},
+			"engines": {
+				"node": ">=6.14.2"
+			}
+		},
 		"node_modules/byte-base64": {
 			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/byte-base64/-/byte-base64-1.1.0.tgz",
+			"integrity": "sha512-56cXelkJrVMdCY9V/3RfDxTh4VfMFCQ5km7B7GkIGfo4bcPL9aACyJLB0Ms3Ezu5rsHmLB2suis96z4fLM03DA==",
 			"license": "MIT"
 		},
 		"node_modules/call-bind-apply-helpers": {
@@ -2294,14 +2785,14 @@
 			}
 		},
 		"node_modules/call-bound": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.3.tgz",
-			"integrity": "sha512-YTd+6wGlNlPxSuri7Y6X8tY2dmm12UMH66RpKMhiX6rsk5wXXnYgbUcOt8kiS31/AjfoTOvCsE+w8nZQLQnzHA==",
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz",
+			"integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"call-bind-apply-helpers": "^1.0.1",
-				"get-intrinsic": "^1.2.6"
+				"call-bind-apply-helpers": "^1.0.2",
+				"get-intrinsic": "^1.3.0"
 			},
 			"engines": {
 				"node": ">= 0.4"
@@ -2312,6 +2803,8 @@
 		},
 		"node_modules/callsites": {
 			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+			"integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -2320,6 +2813,8 @@
 		},
 		"node_modules/camelcase": {
 			"version": "5.3.1",
+			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+			"integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -2327,7 +2822,9 @@
 			}
 		},
 		"node_modules/caniuse-lite": {
-			"version": "1.0.30001700",
+			"version": "1.0.30001707",
+			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001707.tgz",
+			"integrity": "sha512-3qtRjw/HQSMlDWf+X79N206fepf4SOOU6SQLMaq/0KkZLmSjPxAkBOQQ+FxbHKfHmYLZFfdWsO3KA90ceHPSnw==",
 			"dev": true,
 			"funding": [
 				{
@@ -2347,6 +2844,8 @@
 		},
 		"node_modules/chalk": {
 			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2360,12 +2859,29 @@
 				"url": "https://github.com/chalk/chalk?sponsor=1"
 			}
 		},
+		"node_modules/chalk/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
 		"node_modules/change-case": {
 			"version": "5.4.4",
+			"resolved": "https://registry.npmjs.org/change-case/-/change-case-5.4.4.tgz",
+			"integrity": "sha512-HRQyTk2/YPEkt9TnUPbOpr64Uw3KOicFWPVBb+xiHvd6eBx/qPr9xqfBFDT8P2vWsvvz4jbEkfDe71W3VyNu2w==",
 			"license": "MIT"
 		},
 		"node_modules/char-regex": {
 			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
+			"integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -2374,6 +2890,8 @@
 		},
 		"node_modules/chokidar": {
 			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
+			"integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2388,6 +2906,8 @@
 		},
 		"node_modules/chrome-trace-event": {
 			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz",
+			"integrity": "sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -2396,6 +2916,8 @@
 		},
 		"node_modules/ci-info": {
 			"version": "3.9.0",
+			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+			"integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
 			"dev": true,
 			"funding": [
 				{
@@ -2410,11 +2932,15 @@
 		},
 		"node_modules/cjs-module-lexer": {
 			"version": "1.4.3",
+			"resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.3.tgz",
+			"integrity": "sha512-9z8TZaGM1pfswYeXrUpzPrkx8UnWYdhJclsiYMm6x/w5+nN+8Tf/LnAgfLGQCm59qAOxU8WwHEq2vNwF6i4j+Q==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/cliui": {
 			"version": "8.0.1",
+			"resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+			"integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
 			"dev": true,
 			"license": "ISC",
 			"dependencies": {
@@ -2428,6 +2954,8 @@
 		},
 		"node_modules/clone-deep": {
 			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
+			"integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2441,6 +2969,8 @@
 		},
 		"node_modules/co": {
 			"version": "4.6.0",
+			"resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+			"integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -2450,11 +2980,15 @@
 		},
 		"node_modules/collect-v8-coverage": {
 			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz",
+			"integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/color-convert": {
 			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2466,25 +3000,35 @@
 		},
 		"node_modules/color-name": {
 			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/colorette": {
 			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/colorette/-/colorette-1.4.0.tgz",
+			"integrity": "sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==",
 			"license": "MIT"
 		},
 		"node_modules/commander": {
 			"version": "2.20.3",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+			"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/concat-map": {
 			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+			"integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/concurrently": {
 			"version": "9.1.2",
+			"resolved": "https://registry.npmjs.org/concurrently/-/concurrently-9.1.2.tgz",
+			"integrity": "sha512-H9MWcoPsYddwbOGM6difjVwVZHl63nwMEwDJG/L7VGtuaJhb12h2caPG2tVPWs7emuYix252iGfqOyrz1GczTQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2507,27 +3051,17 @@
 				"url": "https://github.com/open-cli-tools/concurrently?sponsor=1"
 			}
 		},
-		"node_modules/concurrently/node_modules/supports-color": {
-			"version": "8.1.1",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"has-flag": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/supports-color?sponsor=1"
-			}
-		},
 		"node_modules/convert-source-map": {
 			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+			"integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/create-jest": {
 			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz",
+			"integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2546,15 +3080,10 @@
 				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
 			}
 		},
-		"node_modules/create-require": {
-			"version": "1.1.1",
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"peer": true
-		},
 		"node_modules/cross-spawn": {
 			"version": "7.0.6",
+			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+			"integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2568,6 +3097,8 @@
 		},
 		"node_modules/css-loader": {
 			"version": "7.1.2",
+			"resolved": "https://registry.npmjs.org/css-loader/-/css-loader-7.1.2.tgz",
+			"integrity": "sha512-6WvYYn7l/XEGN8Xu2vWFt9nVzrCn39vKyTEFf/ExEyoksJjjSZV/0/35XPlMbpnr6VGhZIUg5yJrL8tGfes/FA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2602,6 +3133,8 @@
 		},
 		"node_modules/cssesc": {
 			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+			"integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
 			"dev": true,
 			"license": "MIT",
 			"bin": {
@@ -2613,6 +3146,8 @@
 		},
 		"node_modules/date-fns": {
 			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-4.1.0.tgz",
+			"integrity": "sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==",
 			"dev": true,
 			"license": "MIT",
 			"funding": {
@@ -2622,6 +3157,8 @@
 		},
 		"node_modules/debug": {
 			"version": "4.4.0",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
+			"integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
 			"license": "MIT",
 			"dependencies": {
 				"ms": "^2.1.3"
@@ -2637,6 +3174,8 @@
 		},
 		"node_modules/dedent": {
 			"version": "1.5.3",
+			"resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.3.tgz",
+			"integrity": "sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==",
 			"dev": true,
 			"license": "MIT",
 			"peerDependencies": {
@@ -2650,11 +3189,15 @@
 		},
 		"node_modules/deep-is": {
 			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+			"integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/deepmerge": {
 			"version": "4.3.1",
+			"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
+			"integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -2663,6 +3206,8 @@
 		},
 		"node_modules/detect-libc": {
 			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+			"integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"optional": true,
@@ -2675,24 +3220,18 @@
 		},
 		"node_modules/detect-newline": {
 			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
+			"integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
 				"node": ">=8"
 			}
 		},
-		"node_modules/diff": {
-			"version": "4.0.2",
-			"dev": true,
-			"license": "BSD-3-Clause",
-			"optional": true,
-			"peer": true,
-			"engines": {
-				"node": ">=0.3.1"
-			}
-		},
 		"node_modules/diff-sequences": {
 			"version": "29.6.3",
+			"resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
+			"integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -2716,6 +3255,8 @@
 		},
 		"node_modules/ejs": {
 			"version": "3.1.10",
+			"resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
+			"integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"dependencies": {
@@ -2729,12 +3270,16 @@
 			}
 		},
 		"node_modules/electron-to-chromium": {
-			"version": "1.5.102",
+			"version": "1.5.127",
+			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.127.tgz",
+			"integrity": "sha512-Ke5OggqOtEqzCzcUyV+9jgO6L6sv1gQVKGtSExXHjD/FK0p4qzPZbrDsrCdy0DptcQprD0V80RCBYSWLMhTTgQ==",
 			"dev": true,
 			"license": "ISC"
 		},
 		"node_modules/emittery": {
 			"version": "0.13.1",
+			"resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz",
+			"integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -2746,11 +3291,15 @@
 		},
 		"node_modules/emoji-regex": {
 			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/emojis-list": {
 			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+			"integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -2759,6 +3308,8 @@
 		},
 		"node_modules/enhanced-resolve": {
 			"version": "5.18.1",
+			"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.1.tgz",
+			"integrity": "sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2771,6 +3322,8 @@
 		},
 		"node_modules/envinfo": {
 			"version": "7.14.0",
+			"resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.14.0.tgz",
+			"integrity": "sha512-CO40UI41xDQzhLB1hWyqUKgFhs250pNcGbyGKe1l/e4FSaI/+YE4IMG76GDt0In67WLPACIITC+sOi08x4wIvg==",
 			"dev": true,
 			"license": "MIT",
 			"bin": {
@@ -2782,6 +3335,8 @@
 		},
 		"node_modules/error-ex": {
 			"version": "1.3.2",
+			"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+			"integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2810,6 +3365,8 @@
 		},
 		"node_modules/es-module-lexer": {
 			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.6.0.tgz",
+			"integrity": "sha512-qqnD1yMU6tk/jnaMosogGySTZP8YtUgAffA9nMN+E/rjxcfRQ6IEk7IiozUjgxKoFHBGjTLnrHB/YC45r/59EQ==",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -2828,6 +3385,8 @@
 		},
 		"node_modules/escalade": {
 			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+			"integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -2836,6 +3395,8 @@
 		},
 		"node_modules/escape-string-regexp": {
 			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+			"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -2908,6 +3469,8 @@
 		},
 		"node_modules/eslint-plugin-unused-imports": {
 			"version": "4.1.4",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-unused-imports/-/eslint-plugin-unused-imports-4.1.4.tgz",
+			"integrity": "sha512-YptD6IzQjDardkl0POxnnRBhU1OEePMV0nd6siHaRBbd+lyh6NAhFEobiznKU7kTsSsDeSD62Pe7kAM1b7dAZQ==",
 			"dev": true,
 			"license": "MIT",
 			"peerDependencies": {
@@ -2939,6 +3502,8 @@
 		},
 		"node_modules/eslint-visitor-keys": {
 			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
+			"integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"engines": {
@@ -2968,6 +3533,8 @@
 		},
 		"node_modules/esprima": {
 			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+			"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
 			"dev": true,
 			"license": "BSD-2-Clause",
 			"bin": {
@@ -2980,6 +3547,8 @@
 		},
 		"node_modules/esquery": {
 			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
+			"integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
 			"dev": true,
 			"license": "BSD-3-Clause",
 			"dependencies": {
@@ -2991,6 +3560,8 @@
 		},
 		"node_modules/esrecurse": {
 			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+			"integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
 			"dev": true,
 			"license": "BSD-2-Clause",
 			"dependencies": {
@@ -3002,6 +3573,8 @@
 		},
 		"node_modules/estraverse": {
 			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+			"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
 			"dev": true,
 			"license": "BSD-2-Clause",
 			"engines": {
@@ -3010,6 +3583,8 @@
 		},
 		"node_modules/esutils": {
 			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+			"integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
 			"dev": true,
 			"license": "BSD-2-Clause",
 			"engines": {
@@ -3018,10 +3593,14 @@
 		},
 		"node_modules/eventemitter3": {
 			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz",
+			"integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==",
 			"license": "MIT"
 		},
 		"node_modules/events": {
 			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+			"integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -3030,6 +3609,8 @@
 		},
 		"node_modules/execa": {
 			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+			"integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -3052,6 +3633,8 @@
 		},
 		"node_modules/exit": {
 			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+			"integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",
 			"dev": true,
 			"engines": {
 				"node": ">= 0.8.0"
@@ -3059,6 +3642,8 @@
 		},
 		"node_modules/expect": {
 			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz",
+			"integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -3074,6 +3659,8 @@
 		},
 		"node_modules/fast-deep-equal": {
 			"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==",
 			"license": "MIT"
 		},
 		"node_modules/fast-glob": {
@@ -3108,16 +3695,22 @@
 		},
 		"node_modules/fast-json-stable-stringify": {
 			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+			"integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/fast-levenshtein": {
 			"version": "2.0.6",
+			"resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+			"integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/fast-uri": {
 			"version": "3.0.6",
+			"resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.6.tgz",
+			"integrity": "sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw==",
 			"dev": true,
 			"funding": [
 				{
@@ -3133,6 +3726,8 @@
 		},
 		"node_modules/fastest-levenshtein": {
 			"version": "1.0.16",
+			"resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz",
+			"integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -3151,6 +3746,8 @@
 		},
 		"node_modules/fb-watchman": {
 			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz",
+			"integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"dependencies": {
@@ -3159,6 +3756,8 @@
 		},
 		"node_modules/file-entry-cache": {
 			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz",
+			"integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -3170,6 +3769,8 @@
 		},
 		"node_modules/file-loader": {
 			"version": "6.2.0",
+			"resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz",
+			"integrity": "sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -3189,6 +3790,8 @@
 		},
 		"node_modules/filelist": {
 			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
+			"integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"dependencies": {
@@ -3197,6 +3800,8 @@
 		},
 		"node_modules/filelist/node_modules/brace-expansion": {
 			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+			"integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -3205,6 +3810,8 @@
 		},
 		"node_modules/filelist/node_modules/minimatch": {
 			"version": "5.1.6",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+			"integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
 			"dev": true,
 			"license": "ISC",
 			"dependencies": {
@@ -3216,6 +3823,8 @@
 		},
 		"node_modules/fill-range": {
 			"version": "7.1.1",
+			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+			"integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -3227,6 +3836,8 @@
 		},
 		"node_modules/find-up": {
 			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+			"integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -3242,6 +3853,8 @@
 		},
 		"node_modules/flat": {
 			"version": "5.0.2",
+			"resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
+			"integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
 			"dev": true,
 			"license": "BSD-3-Clause",
 			"bin": {
@@ -3250,6 +3863,8 @@
 		},
 		"node_modules/flat-cache": {
 			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz",
+			"integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -3262,11 +3877,15 @@
 		},
 		"node_modules/flatted": {
 			"version": "3.3.3",
+			"resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz",
+			"integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==",
 			"dev": true,
 			"license": "ISC"
 		},
 		"node_modules/fs-extra": {
 			"version": "11.3.0",
+			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.0.tgz",
+			"integrity": "sha512-Z4XaCL6dUDHfP/jT25jJKMmtxvuwbkrD1vNSMFlo9lNLY2c5FHYSQgHPRZUjAB26TpDEoW9HCOgplrdbaPV/ew==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -3280,11 +3899,30 @@
 		},
 		"node_modules/fs.realpath": {
 			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+			"integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
 			"dev": true,
 			"license": "ISC"
 		},
+		"node_modules/fsevents": {
+			"version": "2.3.3",
+			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+			"integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+			"dev": true,
+			"hasInstallScript": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"darwin"
+			],
+			"engines": {
+				"node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+			}
+		},
 		"node_modules/function-bind": {
 			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+			"integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
 			"dev": true,
 			"license": "MIT",
 			"funding": {
@@ -3293,6 +3931,8 @@
 		},
 		"node_modules/gensync": {
 			"version": "1.0.0-beta.2",
+			"resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+			"integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -3301,6 +3941,8 @@
 		},
 		"node_modules/get-caller-file": {
 			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+			"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
 			"dev": true,
 			"license": "ISC",
 			"engines": {
@@ -3334,6 +3976,8 @@
 		},
 		"node_modules/get-package-type": {
 			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
+			"integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -3356,6 +4000,8 @@
 		},
 		"node_modules/get-stream": {
 			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+			"integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -3367,6 +4013,9 @@
 		},
 		"node_modules/glob": {
 			"version": "7.2.3",
+			"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+			"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+			"deprecated": "Glob versions prior to v9 are no longer supported",
 			"dev": true,
 			"license": "ISC",
 			"dependencies": {
@@ -3386,6 +4035,8 @@
 		},
 		"node_modules/glob-parent": {
 			"version": "6.0.2",
+			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+			"integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
 			"dev": true,
 			"license": "ISC",
 			"dependencies": {
@@ -3397,6 +4048,8 @@
 		},
 		"node_modules/glob-to-regexp": {
 			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
+			"integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
 			"dev": true,
 			"license": "BSD-2-Clause"
 		},
@@ -3428,16 +4081,22 @@
 		},
 		"node_modules/graceful-fs": {
 			"version": "4.2.11",
+			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+			"integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
 			"dev": true,
 			"license": "ISC"
 		},
 		"node_modules/graphemer": {
 			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
+			"integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/has-flag": {
 			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -3459,6 +4118,8 @@
 		},
 		"node_modules/hasown": {
 			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+			"integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -3470,11 +4131,15 @@
 		},
 		"node_modules/html-escaper": {
 			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+			"integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/https-proxy-agent": {
 			"version": "7.0.6",
+			"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
+			"integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
 			"license": "MIT",
 			"dependencies": {
 				"agent-base": "^7.1.2",
@@ -3486,6 +4151,8 @@
 		},
 		"node_modules/human-signals": {
 			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+			"integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"engines": {
@@ -3494,6 +4161,8 @@
 		},
 		"node_modules/icss-utils": {
 			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
+			"integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
 			"dev": true,
 			"license": "ISC",
 			"engines": {
@@ -3505,6 +4174,8 @@
 		},
 		"node_modules/ignore": {
 			"version": "5.3.2",
+			"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+			"integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -3512,7 +4183,9 @@
 			}
 		},
 		"node_modules/immutable": {
-			"version": "5.0.3",
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.1.tgz",
+			"integrity": "sha512-3jatXi9ObIsPGr3N5hGw/vWWcTkq6hUYhpQz4k0wLC+owqWi/LiugIw9x0EdNZ2yGedKN/HzePiBvaJRXa0Ujg==",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -3535,6 +4208,8 @@
 		},
 		"node_modules/import-local": {
 			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz",
+			"integrity": "sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -3553,6 +4228,8 @@
 		},
 		"node_modules/imurmurhash": {
 			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+			"integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -3560,7 +4237,9 @@
 			}
 		},
 		"node_modules/index-to-position": {
-			"version": "0.1.2",
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/index-to-position/-/index-to-position-1.0.0.tgz",
+			"integrity": "sha512-sCO7uaLVhRJ25vz1o8s9IFM3nVS4DkuQnyjMwiQPKvQuBYBDmb8H7zx8ki7nVh4HJQOdVWebyvLE0qt+clruxA==",
 			"license": "MIT",
 			"engines": {
 				"node": ">=18"
@@ -3571,6 +4250,9 @@
 		},
 		"node_modules/inflight": {
 			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+			"integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+			"deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
 			"dev": true,
 			"license": "ISC",
 			"dependencies": {
@@ -3580,11 +4262,15 @@
 		},
 		"node_modules/inherits": {
 			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+			"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
 			"dev": true,
 			"license": "ISC"
 		},
 		"node_modules/interpret": {
 			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/interpret/-/interpret-3.1.1.tgz",
+			"integrity": "sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -3593,11 +4279,15 @@
 		},
 		"node_modules/is-arrayish": {
 			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+			"integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/is-core-module": {
 			"version": "2.16.1",
+			"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
+			"integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -3612,6 +4302,8 @@
 		},
 		"node_modules/is-extglob": {
 			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+			"integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -3620,6 +4312,8 @@
 		},
 		"node_modules/is-fullwidth-code-point": {
 			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+			"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -3628,6 +4322,8 @@
 		},
 		"node_modules/is-generator-fn": {
 			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
+			"integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -3636,6 +4332,8 @@
 		},
 		"node_modules/is-glob": {
 			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+			"integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -3647,6 +4345,8 @@
 		},
 		"node_modules/is-number": {
 			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+			"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -3655,6 +4355,8 @@
 		},
 		"node_modules/is-plain-object": {
 			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+			"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -3666,6 +4368,8 @@
 		},
 		"node_modules/is-stream": {
 			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+			"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -3677,11 +4381,15 @@
 		},
 		"node_modules/isexe": {
 			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+			"integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
 			"dev": true,
 			"license": "ISC"
 		},
 		"node_modules/isobject": {
 			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+			"integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -3690,6 +4398,8 @@
 		},
 		"node_modules/istanbul-lib-coverage": {
 			"version": "3.2.2",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
+			"integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
 			"dev": true,
 			"license": "BSD-3-Clause",
 			"engines": {
@@ -3698,6 +4408,8 @@
 		},
 		"node_modules/istanbul-lib-instrument": {
 			"version": "6.0.3",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz",
+			"integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==",
 			"dev": true,
 			"license": "BSD-3-Clause",
 			"dependencies": {
@@ -3713,6 +4425,8 @@
 		},
 		"node_modules/istanbul-lib-report": {
 			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
+			"integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
 			"dev": true,
 			"license": "BSD-3-Clause",
 			"dependencies": {
@@ -3724,8 +4438,23 @@
 				"node": ">=10"
 			}
 		},
+		"node_modules/istanbul-lib-report/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
 		"node_modules/istanbul-lib-source-maps": {
 			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
+			"integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
 			"dev": true,
 			"license": "BSD-3-Clause",
 			"dependencies": {
@@ -3739,6 +4468,8 @@
 		},
 		"node_modules/istanbul-reports": {
 			"version": "3.1.7",
+			"resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz",
+			"integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==",
 			"dev": true,
 			"license": "BSD-3-Clause",
 			"dependencies": {
@@ -3751,6 +4482,8 @@
 		},
 		"node_modules/jake": {
 			"version": "10.9.2",
+			"resolved": "https://registry.npmjs.org/jake/-/jake-10.9.2.tgz",
+			"integrity": "sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"dependencies": {
@@ -3768,6 +4501,8 @@
 		},
 		"node_modules/jest": {
 			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz",
+			"integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -3793,6 +4528,8 @@
 		},
 		"node_modules/jest-changed-files": {
 			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz",
+			"integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -3806,6 +4543,8 @@
 		},
 		"node_modules/jest-circus": {
 			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz",
+			"integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -3836,6 +4575,8 @@
 		},
 		"node_modules/jest-cli": {
 			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz",
+			"integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -3868,6 +4609,8 @@
 		},
 		"node_modules/jest-config": {
 			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz",
+			"integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -3912,6 +4655,8 @@
 		},
 		"node_modules/jest-diff": {
 			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz",
+			"integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -3926,6 +4671,8 @@
 		},
 		"node_modules/jest-docblock": {
 			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz",
+			"integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -3937,6 +4684,8 @@
 		},
 		"node_modules/jest-each": {
 			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz",
+			"integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -3952,6 +4701,8 @@
 		},
 		"node_modules/jest-environment-node": {
 			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz",
+			"integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -3968,6 +4719,8 @@
 		},
 		"node_modules/jest-get-type": {
 			"version": "29.6.3",
+			"resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz",
+			"integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -3976,6 +4729,8 @@
 		},
 		"node_modules/jest-haste-map": {
 			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz",
+			"integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4000,6 +4755,8 @@
 		},
 		"node_modules/jest-leak-detector": {
 			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz",
+			"integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4012,6 +4769,8 @@
 		},
 		"node_modules/jest-matcher-utils": {
 			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz",
+			"integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4026,6 +4785,8 @@
 		},
 		"node_modules/jest-message-util": {
 			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz",
+			"integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4045,6 +4806,8 @@
 		},
 		"node_modules/jest-mock": {
 			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz",
+			"integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4058,6 +4821,8 @@
 		},
 		"node_modules/jest-pnp-resolver": {
 			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
+			"integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -4074,6 +4839,8 @@
 		},
 		"node_modules/jest-regex-util": {
 			"version": "29.6.3",
+			"resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz",
+			"integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -4082,6 +4849,8 @@
 		},
 		"node_modules/jest-resolve": {
 			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz",
+			"integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4101,6 +4870,8 @@
 		},
 		"node_modules/jest-resolve-dependencies": {
 			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz",
+			"integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4113,6 +4884,8 @@
 		},
 		"node_modules/jest-runner": {
 			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz",
+			"integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4144,6 +4917,8 @@
 		},
 		"node_modules/jest-runtime": {
 			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz",
+			"integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4176,6 +4951,8 @@
 		},
 		"node_modules/jest-snapshot": {
 			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz",
+			"integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4206,6 +4983,8 @@
 		},
 		"node_modules/jest-util": {
 			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+			"integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4222,6 +5001,8 @@
 		},
 		"node_modules/jest-validate": {
 			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz",
+			"integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4238,6 +5019,8 @@
 		},
 		"node_modules/jest-validate/node_modules/camelcase": {
 			"version": "6.3.0",
+			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+			"integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -4249,6 +5032,8 @@
 		},
 		"node_modules/jest-watcher": {
 			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz",
+			"integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4267,6 +5052,8 @@
 		},
 		"node_modules/jest-worker": {
 			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz",
+			"integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4279,22 +5066,10 @@
 				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
 			}
 		},
-		"node_modules/jest-worker/node_modules/supports-color": {
-			"version": "8.1.1",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"has-flag": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/supports-color?sponsor=1"
-			}
-		},
 		"node_modules/js-levenshtein": {
 			"version": "1.1.6",
+			"resolved": "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.6.tgz",
+			"integrity": "sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==",
 			"license": "MIT",
 			"engines": {
 				"node": ">=0.10.0"
@@ -4302,10 +5077,14 @@
 		},
 		"node_modules/js-tokens": {
 			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+			"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
 			"license": "MIT"
 		},
 		"node_modules/js-yaml": {
 			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+			"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
 			"license": "MIT",
 			"dependencies": {
 				"argparse": "^2.0.1"
@@ -4316,6 +5095,8 @@
 		},
 		"node_modules/jsesc": {
 			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
+			"integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",
 			"dev": true,
 			"license": "MIT",
 			"bin": {
@@ -4327,26 +5108,36 @@
 		},
 		"node_modules/json-buffer": {
 			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
+			"integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/json-parse-even-better-errors": {
 			"version": "2.3.1",
+			"resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+			"integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/json-schema-traverse": {
 			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/json-stable-stringify-without-jsonify": {
 			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+			"integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/json5": {
 			"version": "2.2.3",
+			"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+			"integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
 			"dev": true,
 			"license": "MIT",
 			"bin": {
@@ -4358,6 +5149,8 @@
 		},
 		"node_modules/jsonfile": {
 			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+			"integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4369,6 +5162,8 @@
 		},
 		"node_modules/keyv": {
 			"version": "4.5.4",
+			"resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
+			"integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4377,6 +5172,8 @@
 		},
 		"node_modules/kind-of": {
 			"version": "6.0.3",
+			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+			"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -4385,6 +5182,8 @@
 		},
 		"node_modules/kleur": {
 			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
+			"integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -4393,6 +5192,8 @@
 		},
 		"node_modules/leven": {
 			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
+			"integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -4401,6 +5202,8 @@
 		},
 		"node_modules/levn": {
 			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+			"integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4413,11 +5216,15 @@
 		},
 		"node_modules/lines-and-columns": {
 			"version": "1.2.4",
+			"resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+			"integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/loader-runner": {
 			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
+			"integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -4426,6 +5233,8 @@
 		},
 		"node_modules/loader-utils": {
 			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+			"integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4439,6 +5248,8 @@
 		},
 		"node_modules/locate-path": {
 			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+			"integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4453,21 +5264,29 @@
 		},
 		"node_modules/lodash": {
 			"version": "4.17.21",
+			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+			"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/lodash.memoize": {
 			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
+			"integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/lodash.merge": {
 			"version": "4.6.2",
+			"resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+			"integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/lru-cache": {
 			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+			"integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
 			"dev": true,
 			"license": "ISC",
 			"dependencies": {
@@ -4476,6 +5295,8 @@
 		},
 		"node_modules/make-dir": {
 			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
+			"integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4490,11 +5311,15 @@
 		},
 		"node_modules/make-error": {
 			"version": "1.3.6",
+			"resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
+			"integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
 			"dev": true,
 			"license": "ISC"
 		},
 		"node_modules/makeerror": {
 			"version": "1.0.12",
+			"resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
+			"integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
 			"dev": true,
 			"license": "BSD-3-Clause",
 			"dependencies": {
@@ -4513,6 +5338,8 @@
 		},
 		"node_modules/merge-stream": {
 			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+			"integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -4528,6 +5355,8 @@
 		},
 		"node_modules/micromatch": {
 			"version": "4.0.8",
+			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+			"integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4540,6 +5369,8 @@
 		},
 		"node_modules/mime-db": {
 			"version": "1.52.0",
+			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+			"integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -4548,6 +5379,8 @@
 		},
 		"node_modules/mime-types": {
 			"version": "2.1.35",
+			"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+			"integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4559,6 +5392,8 @@
 		},
 		"node_modules/mimic-fn": {
 			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+			"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -4567,6 +5402,8 @@
 		},
 		"node_modules/mini-css-extract-plugin": {
 			"version": "2.9.2",
+			"resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.2.tgz",
+			"integrity": "sha512-GJuACcS//jtq4kCtd5ii/M0SZf7OZRH+BxdqXZHaJfb8TJiVl+NgQRPwiYt2EuqeSkNydn/7vP+bcE27C5mb9w==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4586,6 +5423,8 @@
 		},
 		"node_modules/mini-css-extract-plugin/node_modules/ajv": {
 			"version": "8.17.1",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+			"integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4601,6 +5440,8 @@
 		},
 		"node_modules/mini-css-extract-plugin/node_modules/ajv-keywords": {
 			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+			"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4612,11 +5453,15 @@
 		},
 		"node_modules/mini-css-extract-plugin/node_modules/json-schema-traverse": {
 			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/mini-css-extract-plugin/node_modules/schema-utils": {
 			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.0.tgz",
+			"integrity": "sha512-Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4635,6 +5480,8 @@
 		},
 		"node_modules/minimatch": {
 			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+			"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
 			"dev": true,
 			"license": "ISC",
 			"dependencies": {
@@ -4646,6 +5493,8 @@
 		},
 		"node_modules/moment": {
 			"version": "2.29.4",
+			"resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
+			"integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -4654,10 +5503,14 @@
 		},
 		"node_modules/ms": {
 			"version": "2.1.3",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+			"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
 			"license": "MIT"
 		},
 		"node_modules/nanoid": {
-			"version": "3.3.8",
+			"version": "3.3.11",
+			"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
+			"integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
 			"dev": true,
 			"funding": [
 				{
@@ -4675,32 +5528,56 @@
 		},
 		"node_modules/natural-compare": {
 			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+			"integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/neo-async": {
 			"version": "2.6.2",
+			"resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
+			"integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/node-addon-api": {
 			"version": "7.1.1",
+			"resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz",
+			"integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==",
 			"dev": true,
 			"license": "MIT",
 			"optional": true
 		},
+		"node_modules/node-gyp-build": {
+			"version": "4.8.4",
+			"resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.4.tgz",
+			"integrity": "sha512-LA4ZjwlnUblHVgq0oBF3Jl/6h/Nvs5fzBLwdEF4nuxnFdsfajde4WfxtJr3CaiH+F6ewcIB/q4jQ4UzPyid+CQ==",
+			"dev": true,
+			"license": "MIT",
+			"bin": {
+				"node-gyp-build": "bin.js",
+				"node-gyp-build-optional": "optional.js",
+				"node-gyp-build-test": "build-test.js"
+			}
+		},
 		"node_modules/node-int64": {
 			"version": "0.4.0",
+			"resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
+			"integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/node-releases": {
 			"version": "2.0.19",
+			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
+			"integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/normalize-path": {
 			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+			"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -4708,9 +5585,9 @@
 			}
 		},
 		"node_modules/npm-check-updates": {
-			"version": "17.1.15",
-			"resolved": "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-17.1.15.tgz",
-			"integrity": "sha512-miATvKu5rjec/1wxc5TGDjpsucgtCHwRVZorZpDkS6NzdWXfnUWlN4abZddWb7XSijAuBNzzYglIdTm9SbgMVg==",
+			"version": "17.1.16",
+			"resolved": "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-17.1.16.tgz",
+			"integrity": "sha512-9nohkfjLRzLfsLVGbO34eXBejvrOOTuw5tvNammH73KEFG5XlFoi3G2TgjTExHtnrKWCbZ+mTT+dbNeSjASIPw==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"bin": {
@@ -4724,6 +5601,8 @@
 		},
 		"node_modules/npm-run-path": {
 			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+			"integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4748,6 +5627,8 @@
 		},
 		"node_modules/obsidian": {
 			"version": "1.8.7",
+			"resolved": "https://registry.npmjs.org/obsidian/-/obsidian-1.8.7.tgz",
+			"integrity": "sha512-h4bWwNFAGRXlMlMAzdEiIM2ppTGlrh7uGOJS6w4gClrsjc+ei/3YAtU2VdFUlCiPuTHpY4aBpFJJW75S1Tl/JA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4761,6 +5642,8 @@
 		},
 		"node_modules/once": {
 			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+			"integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
 			"dev": true,
 			"license": "ISC",
 			"dependencies": {
@@ -4769,6 +5652,8 @@
 		},
 		"node_modules/onetime": {
 			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+			"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4792,6 +5677,8 @@
 		},
 		"node_modules/openapi-typescript": {
 			"version": "7.6.1",
+			"resolved": "https://registry.npmjs.org/openapi-typescript/-/openapi-typescript-7.6.1.tgz",
+			"integrity": "sha512-F7RXEeo/heF3O9lOXo2bNjCOtfp7u+D6W3a3VNEH2xE6v+fxLtn5nq0uvUcA1F5aT+CMhNeC5Uqtg5tlXFX/ag==",
 			"license": "MIT",
 			"dependencies": {
 				"@redocly/openapi-core": "^1.28.0",
@@ -4810,15 +5697,19 @@
 		},
 		"node_modules/openapi-typescript-helpers": {
 			"version": "0.0.15",
+			"resolved": "https://registry.npmjs.org/openapi-typescript-helpers/-/openapi-typescript-helpers-0.0.15.tgz",
+			"integrity": "sha512-opyTPaunsklCBpTK8JGef6mfPhLSnyy5a0IN9vKtx3+4aExf+KxEqYwIy3hqkedXIB97u357uLMJsOnm3GVjsw==",
 			"license": "MIT"
 		},
 		"node_modules/openapi-typescript/node_modules/parse-json": {
-			"version": "8.1.0",
+			"version": "8.2.0",
+			"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-8.2.0.tgz",
+			"integrity": "sha512-eONBZy4hm2AgxjNFd8a4nyDJnzUAH0g34xSQAwWEVGCjdZ4ZL7dKZBfq267GWP/JaS9zW62Xs2FeAdDvpHHJGQ==",
 			"license": "MIT",
 			"dependencies": {
-				"@babel/code-frame": "^7.22.13",
-				"index-to-position": "^0.1.2",
-				"type-fest": "^4.7.1"
+				"@babel/code-frame": "^7.26.2",
+				"index-to-position": "^1.0.0",
+				"type-fest": "^4.37.0"
 			},
 			"engines": {
 				"node": ">=18"
@@ -4829,6 +5720,8 @@
 		},
 		"node_modules/openapi-typescript/node_modules/supports-color": {
 			"version": "9.4.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-9.4.0.tgz",
+			"integrity": "sha512-VL+lNrEoIXww1coLPOmiEmK/0sGigko5COxI09KzHc2VJXJsQ37UaQ+8quuxjDeA7+KnLGTWRyOXSLLR2Wb4jw==",
 			"license": "MIT",
 			"engines": {
 				"node": ">=12"
@@ -4838,7 +5731,9 @@
 			}
 		},
 		"node_modules/openapi-typescript/node_modules/type-fest": {
-			"version": "4.35.0",
+			"version": "4.38.0",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.38.0.tgz",
+			"integrity": "sha512-2dBz5D5ycHIoliLYLi0Q2V7KRaDlH0uWIvmk7TYlAg5slqwiPv1ezJdZm1QEM0xgk29oYWMCbIG7E6gHpvChlg==",
 			"license": "(MIT OR CC0-1.0)",
 			"engines": {
 				"node": ">=16"
@@ -4849,6 +5744,8 @@
 		},
 		"node_modules/optionator": {
 			"version": "0.9.4",
+			"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
+			"integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4865,6 +5762,8 @@
 		},
 		"node_modules/p-limit": {
 			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+			"integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4879,6 +5778,8 @@
 		},
 		"node_modules/p-locate": {
 			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+			"integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4893,6 +5794,8 @@
 		},
 		"node_modules/p-queue": {
 			"version": "8.1.0",
+			"resolved": "https://registry.npmjs.org/p-queue/-/p-queue-8.1.0.tgz",
+			"integrity": "sha512-mxLDbbGIBEXTJL0zEx8JIylaj3xQ7Z/7eEVjcF9fJX4DBiH9oqe+oahYnlKKxm0Ci9TlWTyhSHgygxMxjIB2jw==",
 			"license": "MIT",
 			"dependencies": {
 				"eventemitter3": "^5.0.1",
@@ -4907,6 +5810,8 @@
 		},
 		"node_modules/p-timeout": {
 			"version": "6.1.4",
+			"resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-6.1.4.tgz",
+			"integrity": "sha512-MyIV3ZA/PmyBN/ud8vV9XzwTrNtR4jFrObymZYnZqMmW0zA8Z17vnT0rBgFE/TlohB+YCHqXMgZzb3Csp49vqg==",
 			"license": "MIT",
 			"engines": {
 				"node": ">=14.16"
@@ -4917,6 +5822,8 @@
 		},
 		"node_modules/p-try": {
 			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+			"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -4938,6 +5845,8 @@
 		},
 		"node_modules/parse-json": {
 			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+			"integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4955,6 +5864,8 @@
 		},
 		"node_modules/path-exists": {
 			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+			"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -4963,6 +5874,8 @@
 		},
 		"node_modules/path-is-absolute": {
 			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+			"integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -4971,6 +5884,8 @@
 		},
 		"node_modules/path-key": {
 			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -4979,15 +5894,21 @@
 		},
 		"node_modules/path-parse": {
 			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+			"integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/picocolors": {
 			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+			"integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
 			"license": "ISC"
 		},
 		"node_modules/picomatch": {
 			"version": "2.3.1",
+			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+			"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -4998,7 +5919,9 @@
 			}
 		},
 		"node_modules/pirates": {
-			"version": "4.0.6",
+			"version": "4.0.7",
+			"resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.7.tgz",
+			"integrity": "sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -5007,6 +5930,8 @@
 		},
 		"node_modules/pkg-dir": {
 			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+			"integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5018,6 +5943,8 @@
 		},
 		"node_modules/pkg-dir/node_modules/find-up": {
 			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+			"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5030,6 +5957,8 @@
 		},
 		"node_modules/pkg-dir/node_modules/locate-path": {
 			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+			"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5041,6 +5970,8 @@
 		},
 		"node_modules/pkg-dir/node_modules/p-limit": {
 			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+			"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5055,6 +5986,8 @@
 		},
 		"node_modules/pkg-dir/node_modules/p-locate": {
 			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+			"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5066,13 +5999,17 @@
 		},
 		"node_modules/pluralize": {
 			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/pluralize/-/pluralize-8.0.0.tgz",
+			"integrity": "sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==",
 			"license": "MIT",
 			"engines": {
 				"node": ">=4"
 			}
 		},
 		"node_modules/postcss": {
-			"version": "8.5.2",
+			"version": "8.5.3",
+			"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz",
+			"integrity": "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==",
 			"dev": true,
 			"funding": [
 				{
@@ -5100,6 +6037,8 @@
 		},
 		"node_modules/postcss-modules-extract-imports": {
 			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.1.0.tgz",
+			"integrity": "sha512-k3kNe0aNFQDAZGbin48pL2VNidTF0w4/eASDsxlyspobzU3wZQLOGj7L9gfRe0Jo9/4uud09DsjFNH7winGv8Q==",
 			"dev": true,
 			"license": "ISC",
 			"engines": {
@@ -5111,6 +6050,8 @@
 		},
 		"node_modules/postcss-modules-local-by-default": {
 			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.2.0.tgz",
+			"integrity": "sha512-5kcJm/zk+GJDSfw+V/42fJ5fhjL5YbFDl8nVdXkJPLLW+Vf9mTD5Xe0wqIaDnLuL2U6cDNpTr+UQ+v2HWIBhzw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5127,6 +6068,8 @@
 		},
 		"node_modules/postcss-modules-scope": {
 			"version": "3.2.1",
+			"resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.2.1.tgz",
+			"integrity": "sha512-m9jZstCVaqGjTAuny8MdgE88scJnCiQSlSrOWcTQgM2t32UBe+MUmFSO5t7VMSfAf/FJKImAxBav8ooCHJXCJA==",
 			"dev": true,
 			"license": "ISC",
 			"dependencies": {
@@ -5141,6 +6084,8 @@
 		},
 		"node_modules/postcss-modules-values": {
 			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
+			"integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
 			"dev": true,
 			"license": "ISC",
 			"dependencies": {
@@ -5155,6 +6100,8 @@
 		},
 		"node_modules/postcss-selector-parser": {
 			"version": "7.1.0",
+			"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
+			"integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5167,11 +6114,15 @@
 		},
 		"node_modules/postcss-value-parser": {
 			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/prelude-ls": {
 			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+			"integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -5196,6 +6147,8 @@
 		},
 		"node_modules/pretty-format": {
 			"version": "29.7.0",
+			"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
+			"integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5209,6 +6162,8 @@
 		},
 		"node_modules/pretty-format/node_modules/ansi-styles": {
 			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+			"integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -5220,6 +6175,8 @@
 		},
 		"node_modules/prompts": {
 			"version": "2.4.2",
+			"resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
+			"integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5232,6 +6189,8 @@
 		},
 		"node_modules/punycode": {
 			"version": "2.3.1",
+			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+			"integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -5240,6 +6199,8 @@
 		},
 		"node_modules/pure-rand": {
 			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.1.0.tgz",
+			"integrity": "sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==",
 			"dev": true,
 			"funding": [
 				{
@@ -5292,6 +6253,8 @@
 		},
 		"node_modules/randombytes": {
 			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+			"integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5300,11 +6263,15 @@
 		},
 		"node_modules/react-is": {
 			"version": "18.3.1",
+			"resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
+			"integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/readdirp": {
 			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz",
+			"integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -5317,6 +6284,8 @@
 		},
 		"node_modules/rechoir": {
 			"version": "0.8.0",
+			"resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.8.0.tgz",
+			"integrity": "sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5328,16 +6297,22 @@
 		},
 		"node_modules/regex-parser": {
 			"version": "2.3.1",
+			"resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.3.1.tgz",
+			"integrity": "sha512-yXLRqatcCuKtVHsWrNg0JL3l1zGfdXeEvDa0bdu4tCDQw0RpMDZsqbkyRTUnKMR0tXF627V2oEWjBEaEdqTwtQ==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/request-animation-frame-timeout": {
 			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/request-animation-frame-timeout/-/request-animation-frame-timeout-2.0.4.tgz",
+			"integrity": "sha512-5oYwRBYjrMSU/YHHXj5AM/nv96ZE0b8WZoA3FqnkeDDPXoprxUCZFK4IWZTl+y3RJQtaihiJPiKOB4NZfZ7C7A==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/require-directory": {
 			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+			"integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -5346,6 +6321,8 @@
 		},
 		"node_modules/require-from-string": {
 			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+			"integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
 			"license": "MIT",
 			"engines": {
 				"node": ">=0.10.0"
@@ -5353,6 +6330,8 @@
 		},
 		"node_modules/resolve": {
 			"version": "1.22.10",
+			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz",
+			"integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5372,6 +6351,8 @@
 		},
 		"node_modules/resolve-cwd": {
 			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
+			"integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5383,6 +6364,8 @@
 		},
 		"node_modules/resolve-cwd/node_modules/resolve-from": {
 			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+			"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -5401,6 +6384,8 @@
 		},
 		"node_modules/resolve-url-loader": {
 			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-5.0.0.tgz",
+			"integrity": "sha512-uZtduh8/8srhBoMx//5bwqjQ+rfYOUq8zC9NrMUGtjBiGTtFJM42s58/36+hTqeqINcnYe08Nj3LkK9lW4N8Xg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5416,11 +6401,15 @@
 		},
 		"node_modules/resolve-url-loader/node_modules/convert-source-map": {
 			"version": "1.9.0",
+			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
+			"integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/resolve.exports": {
 			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.3.tgz",
+			"integrity": "sha512-OcXjMsGdhL4XnbShKpAcSqPMzQoYkYyhbEaeSko47MjRP9NfEQMhZkXL1DoFlt9LWQn4YttrdnV6X2OiyzBi+A==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -5463,7 +6452,9 @@
 			}
 		},
 		"node_modules/rxjs": {
-			"version": "7.8.1",
+			"version": "7.8.2",
+			"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.2.tgz",
+			"integrity": "sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"dependencies": {
@@ -5472,6 +6463,8 @@
 		},
 		"node_modules/safe-buffer": {
 			"version": "5.2.1",
+			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+			"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
 			"dev": true,
 			"funding": [
 				{
@@ -5490,9 +6483,9 @@
 			"license": "MIT"
 		},
 		"node_modules/sass": {
-			"version": "1.85.1",
-			"resolved": "https://registry.npmjs.org/sass/-/sass-1.85.1.tgz",
-			"integrity": "sha512-Uk8WpxM5v+0cMR0XjX9KfRIacmSG86RH4DCCZjLU2rFh5tyutt9siAXJ7G+YfxQ99Q6wrRMbMlVl6KqUms71ag==",
+			"version": "1.86.0",
+			"resolved": "https://registry.npmjs.org/sass/-/sass-1.86.0.tgz",
+			"integrity": "sha512-zV8vGUld/+mP4KbMLJMX7TyGCuUp7hnkOScgCMsWuHtns8CWBoz+vmEhoGMXsaJrbUP8gj+F1dLvVe79sK8UdA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5512,6 +6505,8 @@
 		},
 		"node_modules/sass-loader": {
 			"version": "16.0.5",
+			"resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-16.0.5.tgz",
+			"integrity": "sha512-oL+CMBXrj6BZ/zOq4os+UECPL+bWqt6OAC6DWS8Ln8GZRcMDjlJ4JC3FBDuHJdYaFWIdKNIBYmtZtK2MaMkNIw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5551,6 +6546,8 @@
 		},
 		"node_modules/schema-utils": {
 			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+			"integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5568,6 +6565,8 @@
 		},
 		"node_modules/semver": {
 			"version": "7.7.1",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
+			"integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
 			"dev": true,
 			"license": "ISC",
 			"bin": {
@@ -5579,6 +6578,8 @@
 		},
 		"node_modules/serialize-javascript": {
 			"version": "6.0.2",
+			"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
+			"integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
 			"dev": true,
 			"license": "BSD-3-Clause",
 			"dependencies": {
@@ -5587,6 +6588,8 @@
 		},
 		"node_modules/shallow-clone": {
 			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
+			"integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5598,6 +6601,8 @@
 		},
 		"node_modules/shebang-command": {
 			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5609,6 +6614,8 @@
 		},
 		"node_modules/shebang-regex": {
 			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -5617,6 +6624,8 @@
 		},
 		"node_modules/shell-quote": {
 			"version": "1.8.2",
+			"resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.2.tgz",
+			"integrity": "sha512-AzqKpGKjrj7EM6rKVQEPpB288oCfnrEIuyoT9cyF4nmGa7V8Zk6f7RRqYisX8X9m+Q7bd632aZW4ky7EhbQztA==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -5704,16 +6713,22 @@
 		},
 		"node_modules/signal-exit": {
 			"version": "3.0.7",
+			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+			"integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
 			"dev": true,
 			"license": "ISC"
 		},
 		"node_modules/sisteransi": {
 			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
+			"integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/slash": {
 			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+			"integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -5722,6 +6737,8 @@
 		},
 		"node_modules/source-map": {
 			"version": "0.6.1",
+			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+			"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
 			"dev": true,
 			"license": "BSD-3-Clause",
 			"engines": {
@@ -5730,6 +6747,8 @@
 		},
 		"node_modules/source-map-js": {
 			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
+			"integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
 			"dev": true,
 			"license": "BSD-3-Clause",
 			"engines": {
@@ -5738,6 +6757,8 @@
 		},
 		"node_modules/source-map-support": {
 			"version": "0.5.13",
+			"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
+			"integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5747,11 +6768,15 @@
 		},
 		"node_modules/sprintf-js": {
 			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+			"integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
 			"dev": true,
 			"license": "BSD-3-Clause"
 		},
 		"node_modules/stack-utils": {
 			"version": "2.0.6",
+			"resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
+			"integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5763,6 +6788,8 @@
 		},
 		"node_modules/stack-utils/node_modules/escape-string-regexp": {
 			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+			"integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -5771,6 +6798,8 @@
 		},
 		"node_modules/string-length": {
 			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
+			"integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5783,6 +6812,8 @@
 		},
 		"node_modules/string-width": {
 			"version": "4.2.3",
+			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5796,6 +6827,8 @@
 		},
 		"node_modules/strip-ansi": {
 			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+			"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5807,6 +6840,8 @@
 		},
 		"node_modules/strip-bom": {
 			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
+			"integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -5815,6 +6850,8 @@
 		},
 		"node_modules/strip-final-newline": {
 			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+			"integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -5823,6 +6860,8 @@
 		},
 		"node_modules/strip-json-comments": {
 			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+			"integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -5834,23 +6873,32 @@
 		},
 		"node_modules/style-mod": {
 			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.1.2.tgz",
+			"integrity": "sha512-wnD1HyVqpJUI2+eKZ+eo1UwghftP6yuFheBqqe+bWCotBjC2K1YnteJILRMs3SM4V/0dLEW1SC27MWP5y+mwmw==",
 			"dev": true,
 			"license": "MIT",
 			"peer": true
 		},
 		"node_modules/supports-color": {
-			"version": "7.2.0",
+			"version": "8.1.1",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+			"integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"has-flag": "^4.0.0"
 			},
 			"engines": {
-				"node": ">=8"
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/supports-color?sponsor=1"
 			}
 		},
 		"node_modules/supports-preserve-symlinks-flag": {
 			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+			"integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -5870,6 +6918,8 @@
 		},
 		"node_modules/tapable": {
 			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
+			"integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -5878,6 +6928,8 @@
 		},
 		"node_modules/terser": {
 			"version": "5.39.0",
+			"resolved": "https://registry.npmjs.org/terser/-/terser-5.39.0.tgz",
+			"integrity": "sha512-LBAhFyLho16harJoWMg/nZsQYgTrg5jXOn2nCYjRUcZZEdE3qa2zb8QEDRUGVZBW4rlazf2fxkg8tztybTaqWw==",
 			"dev": true,
 			"license": "BSD-2-Clause",
 			"dependencies": {
@@ -5930,6 +6982,8 @@
 		},
 		"node_modules/terser-webpack-plugin/node_modules/ajv": {
 			"version": "8.17.1",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+			"integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5945,6 +6999,8 @@
 		},
 		"node_modules/terser-webpack-plugin/node_modules/ajv-keywords": {
 			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+			"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5956,6 +7012,8 @@
 		},
 		"node_modules/terser-webpack-plugin/node_modules/jest-worker": {
 			"version": "27.5.1",
+			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
+			"integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5969,11 +7027,15 @@
 		},
 		"node_modules/terser-webpack-plugin/node_modules/json-schema-traverse": {
 			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/terser-webpack-plugin/node_modules/schema-utils": {
 			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.0.tgz",
+			"integrity": "sha512-Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5990,22 +7052,10 @@
 				"url": "https://opencollective.com/webpack"
 			}
 		},
-		"node_modules/terser-webpack-plugin/node_modules/supports-color": {
-			"version": "8.1.1",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"has-flag": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/supports-color?sponsor=1"
-			}
-		},
 		"node_modules/terser/node_modules/source-map-support": {
 			"version": "0.5.21",
+			"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+			"integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -6019,6 +7069,8 @@
 		},
 		"node_modules/test-exclude": {
 			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
+			"integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
 			"dev": true,
 			"license": "ISC",
 			"dependencies": {
@@ -6032,11 +7084,15 @@
 		},
 		"node_modules/tmpl": {
 			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
+			"integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
 			"dev": true,
 			"license": "BSD-3-Clause"
 		},
 		"node_modules/to-regex-range": {
 			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+			"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -6048,6 +7104,8 @@
 		},
 		"node_modules/tree-kill": {
 			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",
+			"integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==",
 			"dev": true,
 			"license": "MIT",
 			"bin": {
@@ -6055,7 +7113,9 @@
 			}
 		},
 		"node_modules/ts-api-utils": {
-			"version": "2.0.1",
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.1.0.tgz",
+			"integrity": "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -6066,9 +7126,9 @@
 			}
 		},
 		"node_modules/ts-jest": {
-			"version": "29.2.6",
-			"resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.2.6.tgz",
-			"integrity": "sha512-yTNZVZqc8lSixm+QGVFcPe6+yj7+TWZwIesuOWvfcn4B9bz5x4NDzVCQQjOs7Hfouu36aEqfEbo9Qpo+gq8dDg==",
+			"version": "29.3.0",
+			"resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.3.0.tgz",
+			"integrity": "sha512-4bfGBX7Gd1Aqz3SyeDS9O276wEU/BInZxskPrbhZLyv+c1wskDCqDFMJQJLWrIr/fKoAH4GE5dKUlrdyvo+39A==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -6080,6 +7140,7 @@
 				"lodash.memoize": "^4.1.2",
 				"make-error": "^1.3.6",
 				"semver": "^7.7.1",
+				"type-fest": "^4.37.0",
 				"yargs-parser": "^21.1.1"
 			},
 			"bin": {
@@ -6114,8 +7175,23 @@
 				}
 			}
 		},
+		"node_modules/ts-jest/node_modules/type-fest": {
+			"version": "4.38.0",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.38.0.tgz",
+			"integrity": "sha512-2dBz5D5ycHIoliLYLi0Q2V7KRaDlH0uWIvmk7TYlAg5slqwiPv1ezJdZm1QEM0xgk29oYWMCbIG7E6gHpvChlg==",
+			"dev": true,
+			"license": "(MIT OR CC0-1.0)",
+			"engines": {
+				"node": ">=16"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
 		"node_modules/ts-loader": {
 			"version": "9.5.2",
+			"resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.5.2.tgz",
+			"integrity": "sha512-Qo4piXvOTWcMGIgRiuFa6nHNm+54HbYaZCKqc9eeZCLRy3XqafQgwX2F7mofrbJG3g7EEb+lkiR+z2Lic2s3Zw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -6135,63 +7211,25 @@
 		},
 		"node_modules/ts-loader/node_modules/source-map": {
 			"version": "0.7.4",
+			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
+			"integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
 			"dev": true,
 			"license": "BSD-3-Clause",
 			"engines": {
 				"node": ">= 8"
 			}
 		},
-		"node_modules/ts-node": {
-			"version": "10.9.2",
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"peer": true,
-			"dependencies": {
-				"@cspotcode/source-map-support": "^0.8.0",
-				"@tsconfig/node10": "^1.0.7",
-				"@tsconfig/node12": "^1.0.7",
-				"@tsconfig/node14": "^1.0.0",
-				"@tsconfig/node16": "^1.0.2",
-				"acorn": "^8.4.1",
-				"acorn-walk": "^8.1.1",
-				"arg": "^4.1.0",
-				"create-require": "^1.1.0",
-				"diff": "^4.0.1",
-				"make-error": "^1.1.1",
-				"v8-compile-cache-lib": "^3.0.1",
-				"yn": "3.1.1"
-			},
-			"bin": {
-				"ts-node": "dist/bin.js",
-				"ts-node-cwd": "dist/bin-cwd.js",
-				"ts-node-esm": "dist/bin-esm.js",
-				"ts-node-script": "dist/bin-script.js",
-				"ts-node-transpile-only": "dist/bin-transpile.js",
-				"ts-script": "dist/bin-script-deprecated.js"
-			},
-			"peerDependencies": {
-				"@swc/core": ">=1.2.50",
-				"@swc/wasm": ">=1.2.50",
-				"@types/node": "*",
-				"typescript": ">=2.7"
-			},
-			"peerDependenciesMeta": {
-				"@swc/core": {
-					"optional": true
-				},
-				"@swc/wasm": {
-					"optional": true
-				}
-			}
-		},
 		"node_modules/tslib": {
 			"version": "2.8.1",
+			"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+			"integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
 			"dev": true,
 			"license": "0BSD"
 		},
 		"node_modules/type-check": {
 			"version": "0.4.0",
+			"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+			"integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -6203,6 +7241,8 @@
 		},
 		"node_modules/type-detect": {
 			"version": "4.0.8",
+			"resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+			"integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -6211,6 +7251,8 @@
 		},
 		"node_modules/type-fest": {
 			"version": "0.21.3",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+			"integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
 			"dev": true,
 			"license": "(MIT OR CC0-1.0)",
 			"engines": {
@@ -6258,11 +7300,15 @@
 		},
 		"node_modules/undici-types": {
 			"version": "6.20.0",
+			"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
+			"integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/universalify": {
 			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+			"integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -6270,7 +7316,9 @@
 			}
 		},
 		"node_modules/update-browserslist-db": {
-			"version": "1.1.2",
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz",
+			"integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==",
 			"dev": true,
 			"funding": [
 				{
@@ -6300,6 +7348,8 @@
 		},
 		"node_modules/uri-js": {
 			"version": "4.4.1",
+			"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+			"integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
 			"dev": true,
 			"license": "BSD-2-Clause",
 			"dependencies": {
@@ -6308,6 +7358,8 @@
 		},
 		"node_modules/uri-js-replace": {
 			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/uri-js-replace/-/uri-js-replace-1.0.1.tgz",
+			"integrity": "sha512-W+C9NWNLFOoBI2QWDp4UT9pv65r2w5Cx+3sTYFvtMdDBxkKt1syCqsUdSFAChbEe1uK5TfS04wt/nGwmaeIQ0g==",
 			"license": "MIT"
 		},
 		"node_modules/url": {
@@ -6331,13 +7383,33 @@
 			"dev": true,
 			"license": "MIT"
 		},
+		"node_modules/utf-8-validate": {
+			"version": "6.0.5",
+			"resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-6.0.5.tgz",
+			"integrity": "sha512-EYZR+OpIXp9Y1eG1iueg8KRsY8TuT8VNgnanZ0uA3STqhHQTLwbl+WX76/9X5OY12yQubymBpaBSmMPkSTQcKA==",
+			"dev": true,
+			"hasInstallScript": true,
+			"license": "MIT",
+			"optional": true,
+			"peer": true,
+			"dependencies": {
+				"node-gyp-build": "^4.3.0"
+			},
+			"engines": {
+				"node": ">=6.14.2"
+			}
+		},
 		"node_modules/util-deprecate": {
 			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+			"integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/uuid": {
 			"version": "11.1.0",
+			"resolved": "https://registry.npmjs.org/uuid/-/uuid-11.1.0.tgz",
+			"integrity": "sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A==",
 			"funding": [
 				"https://github.com/sponsors/broofa",
 				"https://github.com/sponsors/ctavan"
@@ -6347,15 +7419,10 @@
 				"uuid": "dist/esm/bin/uuid"
 			}
 		},
-		"node_modules/v8-compile-cache-lib": {
-			"version": "3.0.1",
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"peer": true
-		},
 		"node_modules/v8-to-istanbul": {
 			"version": "9.3.0",
+			"resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz",
+			"integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==",
 			"dev": true,
 			"license": "ISC",
 			"dependencies": {
@@ -6373,6 +7440,8 @@
 		},
 		"node_modules/virtual-scroller": {
 			"version": "1.13.1",
+			"resolved": "https://registry.npmjs.org/virtual-scroller/-/virtual-scroller-1.13.1.tgz",
+			"integrity": "sha512-sui46QUBOIfHyXYjdGkxoze/GlCZFUFRxzxEvsu06UQ4iPc3uRfGnm/Qj7195hiMVOYQW9lDn+m3sD7sRMYdYg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -6381,12 +7450,16 @@
 		},
 		"node_modules/w3c-keyname": {
 			"version": "2.2.8",
+			"resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.8.tgz",
+			"integrity": "sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==",
 			"dev": true,
 			"license": "MIT",
 			"peer": true
 		},
 		"node_modules/walker": {
 			"version": "1.0.8",
+			"resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
+			"integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"dependencies": {
@@ -6395,6 +7468,8 @@
 		},
 		"node_modules/watchpack": {
 			"version": "2.4.2",
+			"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz",
+			"integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -6407,6 +7482,8 @@
 		},
 		"node_modules/webpack": {
 			"version": "5.98.0",
+			"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.98.0.tgz",
+			"integrity": "sha512-UFynvx+gM44Gv9qFgj0acCQK2VE1CtdfwFdimkapco3hlPCJ/zeq73n2yVKimVbtm+TnApIugGhLJnkU6gjYXA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -6452,6 +7529,8 @@
 		},
 		"node_modules/webpack-cli": {
 			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-6.0.1.tgz",
+			"integrity": "sha512-MfwFQ6SfwinsUVi0rNJm7rHZ31GyTcpVE5pgVA3hwFRb7COD4TzjUUwhGWKfO50+xdc2MQPuEBBJoqIMGt3JDw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -6493,11 +7572,15 @@
 		},
 		"node_modules/webpack-cli/node_modules/colorette": {
 			"version": "2.0.20",
+			"resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
+			"integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/webpack-cli/node_modules/commander": {
 			"version": "12.1.0",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-12.1.0.tgz",
+			"integrity": "sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -6521,6 +7604,8 @@
 		},
 		"node_modules/webpack-sources": {
 			"version": "3.2.3",
+			"resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
+			"integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -6529,6 +7614,8 @@
 		},
 		"node_modules/webpack/node_modules/ajv": {
 			"version": "8.17.1",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+			"integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -6544,6 +7631,8 @@
 		},
 		"node_modules/webpack/node_modules/ajv-keywords": {
 			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+			"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -6555,6 +7644,8 @@
 		},
 		"node_modules/webpack/node_modules/eslint-scope": {
 			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+			"integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
 			"dev": true,
 			"license": "BSD-2-Clause",
 			"dependencies": {
@@ -6567,6 +7658,8 @@
 		},
 		"node_modules/webpack/node_modules/estraverse": {
 			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+			"integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
 			"dev": true,
 			"license": "BSD-2-Clause",
 			"engines": {
@@ -6575,11 +7668,15 @@
 		},
 		"node_modules/webpack/node_modules/json-schema-traverse": {
 			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/webpack/node_modules/schema-utils": {
 			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.0.tgz",
+			"integrity": "sha512-Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -6598,6 +7695,8 @@
 		},
 		"node_modules/which": {
 			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+			"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
 			"dev": true,
 			"license": "ISC",
 			"dependencies": {
@@ -6612,11 +7711,15 @@
 		},
 		"node_modules/wildcard": {
 			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz",
+			"integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/word-wrap": {
 			"version": "1.2.5",
+			"resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
+			"integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -6625,6 +7728,8 @@
 		},
 		"node_modules/wrap-ansi": {
 			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+			"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -6641,11 +7746,15 @@
 		},
 		"node_modules/wrappy": {
 			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+			"integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
 			"dev": true,
 			"license": "ISC"
 		},
 		"node_modules/write-file-atomic": {
 			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
+			"integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
 			"dev": true,
 			"license": "ISC",
 			"dependencies": {
@@ -6656,8 +7765,32 @@
 				"node": "^12.13.0 || ^14.15.0 || >=16.0.0"
 			}
 		},
+		"node_modules/ws": {
+			"version": "8.18.1",
+			"resolved": "https://registry.npmjs.org/ws/-/ws-8.18.1.tgz",
+			"integrity": "sha512-RKW2aJZMXeMxVpnZ6bck+RswznaxmzdULiBr6KY7XkTnW8uvt0iT9H5DkHUChXrc+uurzwa0rVI16n/Xzjdz1w==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=10.0.0"
+			},
+			"peerDependencies": {
+				"bufferutil": "^4.0.1",
+				"utf-8-validate": ">=5.0.2"
+			},
+			"peerDependenciesMeta": {
+				"bufferutil": {
+					"optional": true
+				},
+				"utf-8-validate": {
+					"optional": true
+				}
+			}
+		},
 		"node_modules/y18n": {
 			"version": "5.0.8",
+			"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+			"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
 			"dev": true,
 			"license": "ISC",
 			"engines": {
@@ -6666,15 +7799,21 @@
 		},
 		"node_modules/yallist": {
 			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+			"integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
 			"dev": true,
 			"license": "ISC"
 		},
 		"node_modules/yaml-ast-parser": {
 			"version": "0.0.43",
+			"resolved": "https://registry.npmjs.org/yaml-ast-parser/-/yaml-ast-parser-0.0.43.tgz",
+			"integrity": "sha512-2PTINUwsRqSd+s8XxKaJWQlUuEMHJQyEuh2edBbW8KNJz0SJPwUSD2zRWqezFEdN7IzAgeuYHFUCF7o8zRdZ0A==",
 			"license": "Apache-2.0"
 		},
 		"node_modules/yargs": {
 			"version": "17.7.2",
+			"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+			"integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -6692,23 +7831,17 @@
 		},
 		"node_modules/yargs-parser": {
 			"version": "21.1.1",
+			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+			"integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
 			"license": "ISC",
 			"engines": {
 				"node": ">=12"
 			}
 		},
-		"node_modules/yn": {
-			"version": "3.1.1",
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"peer": true,
-			"engines": {
-				"node": ">=6"
-			}
-		},
 		"node_modules/yocto-queue": {
 			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+			"integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -6759,6 +7892,7 @@
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
 				"@types/node": "^22.13.10",
+				"bufferutil": "^4.0.9",
 				"jest": "^29.7.0",
 				"sync_lib": "file:../../backend/sync_lib/pkg",
 				"ts-jest": "^29.2.6",
@@ -6767,7 +7901,8 @@
 				"typescript": "5.8.2",
 				"webpack": "^5.98.0",
 				"webpack-cli": "^6.0.1",
-				"webpack-merge": "^6.0.1"
+				"webpack-merge": "^6.0.1",
+				"ws": "^8.18.1"
 			}
 		},
 		"test-client": {
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index 5524df0c..cd8d2a2a 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -23,6 +23,7 @@
 		"@types/jest": "^29.5.14",
 		"@types/node": "^22.13.10",
 		"jest": "^29.7.0",
+		"sync_lib": "file:../../backend/sync_lib/pkg",
 		"ts-jest": "^29.2.6",
 		"ts-loader": "^9.5.2",
 		"tslib": "2.8.1",
@@ -30,6 +31,6 @@
 		"webpack": "^5.98.0",
 		"webpack-cli": "^6.0.1",
 		"webpack-merge": "^6.0.1",
-		"sync_lib": "file:../../backend/sync_lib/pkg"
+		"ws": "^8.18.1"
 	}
-}
+}
\ No newline at end of file
diff --git a/frontend/sync-client/src/file-operations/document-locks.ts b/frontend/sync-client/src/file-operations/document-locks.ts
deleted file mode 100644
index 522ed02a..00000000
--- a/frontend/sync-client/src/file-operations/document-locks.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-import type { Logger } from "../tracing/logger";
-import type { RelativePath } from "../persistence/database";
-
-// Manages locks on documents to prevent concurrent modifications
-// allowing the client's FileOperations implementation to be simpler.
-// Locks are granted in a first-in-first-out order.
-export class DocumentLocks {
-	private readonly locked = new Set<RelativePath>();
-	private readonly waiters = new Map<RelativePath, (() => void)[]>();
-
-	public constructor(private readonly logger: Logger) {}
-
-	public tryLockDocument(relativePath: RelativePath): boolean {
-		if (this.locked.has(relativePath)) {
-			return false;
-		}
-
-		this.locked.add(relativePath);
-
-		return true;
-	}
-
-	public async waitForDocumentLock(
-		relativePath: RelativePath
-	): Promise<void> {
-		if (this.tryLockDocument(relativePath)) {
-			return Promise.resolve();
-		}
-
-		this.logger.debug(`Waiting for lock on ${relativePath}`);
-
-		return new Promise((resolve) => {
-			let waiting = this.waiters.get(relativePath);
-			if (!waiting) {
-				waiting = [];
-				this.waiters.set(relativePath, waiting);
-			}
-
-			waiting.push(resolve);
-		});
-	}
-
-	public unlockDocument(relativePath: RelativePath): void {
-		if (!this.locked.has(relativePath)) {
-			throw new Error(
-				`Document ${relativePath} is not locked, cannot unlock`
-			);
-		}
-
-		// Remove the first element to ensure FIFO unblocking order
-		const nextWaiting = this.waiters.get(relativePath)?.shift();
-
-		if (nextWaiting) {
-			this.logger.debug(`Granted lock on ${relativePath}`);
-			nextWaiting();
-		} else {
-			this.locked.delete(relativePath);
-		}
-	}
-
-	public reset(): void {
-		this.locked.clear();
-		this.waiters.clear();
-	}
-}
diff --git a/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts b/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
index 5f578dc3..8b2a547a 100644
--- a/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
+++ b/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
@@ -1,7 +1,7 @@
 import type { RelativePath } from "../persistence/database";
 import type { FileSystemOperations } from "./filesystem-operations";
 import type { Logger } from "../tracing/logger";
-import { DocumentLocks } from "./document-locks";
+import { Locks } from "../utils/locks";
 import { FileNotFoundError } from "./file-not-found-error";
 
 /**
@@ -10,13 +10,13 @@ import { FileNotFoundError } from "./file-not-found-error";
  * single request in-flight for any one file through the use of locks.
  */
 export class SafeFileSystemOperations implements FileSystemOperations {
-	private readonly locks: DocumentLocks;
+	private readonly locks: Locks<RelativePath>;
 
 	public constructor(
 		private readonly fs: FileSystemOperations,
 		private readonly logger: Logger
 	) {
-		this.locks = new DocumentLocks(logger);
+		this.locks = new Locks(logger);
 	}
 
 	public async listAllFiles(): Promise<RelativePath[]> {
@@ -117,7 +117,7 @@ export class SafeFileSystemOperations implements FileSystemOperations {
 				: [pathOrPaths];
 
 			await Promise.all(
-				paths.map(async (path) => this.locks.waitForDocumentLock(path))
+				paths.map(async (path) => this.locks.waitForLock(path))
 			);
 
 			try {
@@ -125,7 +125,7 @@ export class SafeFileSystemOperations implements FileSystemOperations {
 			} finally {
 				await Promise.all(
 					paths.map((path) => {
-						this.locks.unlockDocument(path);
+						this.locks.unlock(path);
 					})
 				);
 			}
diff --git a/frontend/sync-client/src/index.ts b/frontend/sync-client/src/index.ts
index d40b5aab..6c36965f 100644
--- a/frontend/sync-client/src/index.ts
+++ b/frontend/sync-client/src/index.ts
@@ -5,10 +5,10 @@ export {
 	type HistoryEntry
 } from "./tracing/sync-history";
 export { Logger, LogLevel, LogLine } from "./tracing/logger";
-export type { CheckConnectionResult } from "./services/sync-service";
 export { type SyncSettings } from "./persistence/settings";
 export type { RelativePath, StoredDatabase } from "./persistence/database";
 export type { FileSystemOperations } from "./file-operations/filesystem-operations";
 export type { PersistenceProvider } from "./persistence/persistence";
 
+export type { NetworkConnectionStatus } from "./sync-client";
 export { SyncClient } from "./sync-client";
diff --git a/frontend/sync-client/src/persistence/settings.ts b/frontend/sync-client/src/persistence/settings.ts
index b951930d..aecfafc9 100644
--- a/frontend/sync-client/src/persistence/settings.ts
+++ b/frontend/sync-client/src/persistence/settings.ts
@@ -1,11 +1,9 @@
 import type { Logger } from "../tracing/logger";
-import { LogLevel } from "../tracing/logger";
 
 export interface SyncSettings {
 	remoteUri: string;
 	token: string;
 	vaultName: string;
-	fetchChangesUpdateIntervalMs: number;
 	syncConcurrency: number;
 	isSyncEnabled: boolean;
 	maxFileSizeMB: number;
@@ -15,7 +13,6 @@ const DEFAULT_SETTINGS: SyncSettings = {
 	remoteUri: "",
 	token: "",
 	vaultName: "default",
-	fetchChangesUpdateIntervalMs: 1000,
 	syncConcurrency: 1,
 	isSyncEnabled: false,
 	maxFileSizeMB: 10
diff --git a/frontend/sync-client/src/services/sync-service.ts b/frontend/sync-client/src/services/sync-service.ts
index 0b3fcba3..3d84947c 100644
--- a/frontend/sync-client/src/services/sync-service.ts
+++ b/frontend/sync-client/src/services/sync-service.ts
@@ -18,6 +18,7 @@ export interface CheckConnectionResult {
 }
 
 export class SyncService {
+	private static readonly NETWORK_RETRY_INTERVAL_MS = 1000;
 	private client: Client<paths>;
 	private pingClient: Client<paths>;
 	private _fetchImplementation: typeof globalThis.fetch = globalThis.fetch;
@@ -284,17 +285,35 @@ export class SyncService {
 
 	public async checkConnection(): Promise<CheckConnectionResult> {
 		try {
-			const result = await this.ping();
+			const response = await this.pingClient.GET("/ping", {
+				params: {
+					header: {
+						authorization: `Bearer ${this.settings.getSettings().token}`
+					}
+				}
+			});
+
+			this.logger.debug(
+				`Ping response: ${JSON.stringify(response.data)}`
+			);
+
+			if (!response.data) {
+				throw new Error(
+					`Failed to ping server: ${SyncService.formatError(response.error)}`
+				);
+			}
+
+			const result = response.data;
 			if (result.isAuthenticated) {
 				return {
 					isSuccessful: true,
-					message: `Successfully connected to server (version: ${result.serverVersion}) and authenticated.`
+					message: `Successfully connected to server (version: ${result.serverVersion}) and authenticated`
 				};
 			}
 
 			return {
 				isSuccessful: false,
-				message: `Successfully connected to server (version: ${result.serverVersion}) but failed to authenticate.`
+				message: `Successfully connected to server (version: ${result.serverVersion}) but failed to authenticate`
 			};
 		} catch (e) {
 			return {
@@ -304,27 +323,6 @@ export class SyncService {
 		}
 	}
 
-	// No retries
-	private async ping(): Promise<components["schemas"]["PingResponse"]> {
-		const response = await this.pingClient.GET("/ping", {
-			params: {
-				header: {
-					authorization: `Bearer ${this.settings.getSettings().token}`
-				}
-			}
-		});
-
-		this.logger.debug(`Ping response: ${JSON.stringify(response.data)}`);
-
-		if (!response.data) {
-			throw new Error(
-				`Failed to ping server: ${SyncService.formatError(response.error)}`
-			);
-		}
-
-		return response.data;
-	}
-
 	/**
 	 * Create a client and a ping client for the given remote URI.
 	 */
@@ -355,8 +353,10 @@ export class SyncService {
 					throw e;
 				}
 
-				this.logger.error(`Failed network call (${e}), retrying`);
-				await sleep(1000);
+				this.logger.error(
+					`Failed network call (${e}), retryingin ${SyncService.NETWORK_RETRY_INTERVAL_MS}ms`
+				);
+				await sleep(SyncService.NETWORK_RETRY_INTERVAL_MS);
 			}
 		}
 	}
diff --git a/frontend/sync-client/src/services/types.ts b/frontend/sync-client/src/services/types.ts
index 5cd674ed..8e9df505 100644
--- a/frontend/sync-client/src/services/types.ts
+++ b/frontend/sync-client/src/services/types.ts
@@ -566,6 +566,10 @@ export interface components {
 			/** Format: int64 */
 			since_update_id?: number | null;
 		};
+		QueryParams2: {
+			/** Format: int64 */
+			since_update_id?: number | null;
+		};
 		SerializedError: {
 			causes: string[];
 			message: string;
@@ -587,6 +591,9 @@ export interface components {
 			parentVersionId: number;
 			relativePath: string;
 		};
+		WebsocketPathParams: {
+			vault_id: string;
+		};
 	};
 	responses: never;
 	parameters: never;
diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts
index 0e0df2ff..27aa2172 100644
--- a/frontend/sync-client/src/sync-client.ts
+++ b/frontend/sync-client/src/sync-client.ts
@@ -8,7 +8,6 @@ import type { RelativePath, StoredDatabase } from "./persistence/database";
 import { Database } from "./persistence/database";
 import type { SyncSettings } from "./persistence/settings";
 import { Settings } from "./persistence/settings";
-import type { CheckConnectionResult } from "./services/sync-service";
 import { SyncService } from "./services/sync-service";
 import { Syncer } from "./sync-operations/syncer";
 import type { FileSystemOperations } from "./file-operations/filesystem-operations";
@@ -16,9 +15,13 @@ import { FileOperations } from "./file-operations/file-operations";
 import { ConnectionStatus } from "./services/connection-status";
 import { UnrestrictedSyncer } from "./sync-operations/unrestricted-syncer";
 
-export class SyncClient {
-	private remoteListenerIntervalId: NodeJS.Timeout | null = null;
+export interface NetworkConnectionStatus {
+	isSuccessful: boolean;
+	serverMessage: string;
+	isWebSocketConnected: boolean;
+}
 
+export class SyncClient {
 	// eslint-disable-next-line @typescript-eslint/max-params
 	private constructor(
 		private readonly history: SyncHistory,
@@ -31,15 +34,6 @@ export class SyncClient {
 	) {
 		this.settings.addOnSettingsChangeListener(
 			(newSettings, oldSettings) => {
-				if (
-					newSettings.fetchChangesUpdateIntervalMs !==
-					oldSettings.fetchChangesUpdateIntervalMs
-				) {
-					this.setRemoteEventListener(
-						newSettings.fetchChangesUpdateIntervalMs
-					);
-				}
-
 				if (newSettings.vaultName !== oldSettings.vaultName) {
 					void this.reset();
 				}
@@ -145,8 +139,13 @@ export class SyncClient {
 		return client;
 	}
 
-	public async checkConnection(): Promise<CheckConnectionResult> {
-		return this.syncService.checkConnection();
+	public async checkConnection(): Promise<NetworkConnectionStatus> {
+		const server = await this.syncService.checkConnection();
+		return {
+			isSuccessful: server.isSuccessful,
+			serverMessage: server.message,
+			isWebSocketConnected: this.syncer.isWebSocketConnected
+		};
 	}
 
 	public getHistoryEntries(): readonly HistoryEntry[] {
@@ -161,20 +160,15 @@ export class SyncClient {
 
 	public async start(): Promise<void> {
 		await this.syncer.scheduleSyncForOfflineChanges();
-
-		this.setRemoteEventListener(
-			this.settings.getSettings().fetchChangesUpdateIntervalMs
-		);
 	}
 
-	/// Clear all global state that has been touched by SyncClient.
 	public stop(): void {
-		this.unsetRemoteEventListener();
+		this.syncer.stop();
 	}
 
 	public async waitAndStop(): Promise<void> {
-		await this.syncer.waitUntilFinished();
 		this.stop();
+		await this.syncer.waitUntilFinished();
 	}
 
 	/// Wait for the in-flight operations to finish, reset all tracking,
@@ -218,6 +212,10 @@ export class SyncClient {
 		this.syncer.addRemainingOperationsListener(listener);
 	}
 
+	public addWebSocketStatusChangeListener(listener: () => void): void {
+		this.syncer.addWebSocketStatusChangeListener(listener);
+	}
+
 	public async syncLocallyCreatedFile(
 		relativePath: RelativePath
 	): Promise<void> {
@@ -242,21 +240,4 @@ export class SyncClient {
 			relativePath
 		});
 	}
-
-	private setRemoteEventListener(intervalMs: number): void {
-		if (this.remoteListenerIntervalId !== null) {
-			clearInterval(this.remoteListenerIntervalId);
-		}
-
-		this.remoteListenerIntervalId = setInterval(
-			() => void this.syncer.applyRemoteChangesLocally(),
-			intervalMs
-		);
-	}
-
-	private unsetRemoteEventListener(): void {
-		if (this.remoteListenerIntervalId !== null) {
-			clearInterval(this.remoteListenerIntervalId);
-		}
-	}
 }
diff --git a/frontend/sync-client/src/sync-operations/syncer.ts b/frontend/sync-client/src/sync-operations/syncer.ts
index 1c3b064c..7bad88e4 100644
--- a/frontend/sync-client/src/sync-operations/syncer.ts
+++ b/frontend/sync-client/src/sync-operations/syncer.ts
@@ -1,30 +1,40 @@
-import type { Database, RelativePath } from "../persistence/database";
+import type {
+	Database,
+	DocumentId,
+	RelativePath
+} from "../persistence/database";
 import type { SyncService } from "../services/sync-service";
 import type { Logger } from "../tracing/logger";
 import PQueue from "p-queue";
 import { hash } from "../utils/hash";
 import { v4 as uuidv4 } from "uuid";
 import type { components } from "../services/types";
-import type { Settings } from "../persistence/settings";
+import type { Settings, SyncSettings } from "../persistence/settings";
 import type { FileOperations } from "../file-operations/file-operations";
 import { findMatchingFile } from "../utils/find-matching-file";
 import type { UnrestrictedSyncer } from "./unrestricted-syncer";
 import { createPromise } from "../utils/create-promise";
 import { SyncResetError } from "../services/sync-reset-error";
+import { Locks } from "../utils/locks";
 
 export class Syncer {
+	private readonly remoteDocumentsLock: Locks<DocumentId>;
 	private readonly remainingOperationsListeners: ((
 		remainingOperations: number
 	) => void)[] = [];
+	private readonly webSocketStatusChangeListeners: (() => void)[] = [];
 	private readonly syncQueue: PQueue;
 
 	private runningScheduleSyncForOfflineChanges: Promise<void> | undefined;
-	private runningApplyRemoteChangesLocally: Promise<void> | undefined;
+	private refreshApplyRemoteChangesWebSocketInterval:
+		| NodeJS.Timeout
+		| undefined;
+	private applyRemoteChangesWebSocket: WebSocket | undefined;
 
 	public constructor(
 		private readonly logger: Logger,
 		private readonly database: Database,
-		settings: Settings,
+		private readonly settings: Settings,
 		private readonly syncService: SyncService,
 		private readonly operations: FileOperations,
 		private readonly internalSyncer: UnrestrictedSyncer
@@ -33,11 +43,23 @@ export class Syncer {
 			concurrency: settings.getSettings().syncConcurrency
 		});
 
+		this.updateWebSocket(settings.getSettings());
+
+		this.remoteDocumentsLock = new Locks<DocumentId>(this.logger);
+
 		settings.addOnSettingsChangeListener((newSettings, oldSettings) => {
-			if (newSettings.syncConcurrency === oldSettings.syncConcurrency) {
-				return;
+			if (
+				newSettings.remoteUri !== oldSettings.remoteUri ||
+				newSettings.vaultName !== oldSettings.vaultName ||
+				newSettings.token !== oldSettings.token ||
+				newSettings.isSyncEnabled !== oldSettings.isSyncEnabled
+			) {
+				this.updateWebSocket(newSettings);
+			}
+
+			if (newSettings.syncConcurrency !== oldSettings.syncConcurrency) {
+				this.syncQueue.concurrency = newSettings.syncConcurrency;
 			}
-			this.syncQueue.concurrency = newSettings.syncConcurrency;
 		});
 
 		this.syncQueue.on("active", () => {
@@ -45,6 +67,12 @@ export class Syncer {
 				listener(this.syncQueue.size);
 			});
 		});
+
+		this.setWebSocketRefreshInterval();
+	}
+
+	public get isWebSocketConnected(): boolean {
+		return this.applyRemoteChangesWebSocket?.readyState === WebSocket.OPEN;
 	}
 
 	public addRemainingOperationsListener(
@@ -53,6 +81,10 @@ export class Syncer {
 		this.remainingOperationsListeners.push(listener);
 	}
 
+	public addWebSocketStatusChangeListener(listener: () => void): void {
+		this.webSocketStatusChangeListeners.push(listener);
+	}
+
 	public async syncLocallyCreatedFile(
 		relativePath: RelativePath
 	): Promise<void> {
@@ -206,109 +238,139 @@ export class Syncer {
 		}
 	}
 
-	public async applyRemoteChangesLocally(): Promise<void> {
-		if (this.runningApplyRemoteChangesLocally !== undefined) {
-			this.logger.debug(
-				"Applying remote changes locally is already in progress"
-			);
-			return this.runningApplyRemoteChangesLocally;
-		}
-
-		try {
-			this.runningApplyRemoteChangesLocally =
-				this.internalApplyRemoteChangesLocally();
-			await this.runningApplyRemoteChangesLocally;
-			this.logger.info("All remote changes have been applied locally");
-		} catch (e) {
-			if (e instanceof SyncResetError) {
-				this.logger.info(
-					"Failed to apply remote changes locally due to a reset"
-				);
-				return;
-			}
-			this.logger.error(`Failed to apply remote changes locally: ${e}`);
-			throw e;
-		} finally {
-			this.runningApplyRemoteChangesLocally = undefined;
-		}
+	public async waitUntilFinished(): Promise<void> {
+		await this.runningScheduleSyncForOfflineChanges;
+		return this.syncQueue.onEmpty();
 	}
 
 	public async reset(): Promise<void> {
 		await this.waitUntilFinished();
-		this.internalSyncer.reset();
+		this.setWebSocketRefreshInterval();
+		this.updateWebSocket(this.settings.getSettings());
 	}
 
-	public async waitUntilFinished(): Promise<void> {
-		await Promise.allSettled([
-			this.runningScheduleSyncForOfflineChanges,
-			this.runningApplyRemoteChangesLocally
-		]);
-		return this.syncQueue.onEmpty();
+	public stop(): void {
+		clearInterval(this.refreshApplyRemoteChangesWebSocketInterval);
+		this.applyRemoteChangesWebSocket?.close();
 	}
 
-	private async internalApplyRemoteChangesLocally(): Promise<void> {
-		const remote = await this.syncQueue.add(async () =>
-			this.syncService.getAll(this.database.getLastSeenUpdateId())
-		);
+	private updateWebSocket(settings: SyncSettings): void {
+		this.applyRemoteChangesWebSocket?.close();
 
-		if (!remote) {
-			throw new Error("Failed to fetch remote changes");
-		}
-
-		if (remote.latestDocuments.length === 0) {
-			this.logger.debug("No remote changes to apply");
+		if (!settings.isSyncEnabled) {
+			this.applyRemoteChangesWebSocket = undefined;
 			return;
 		}
 
-		this.logger.info("Applying remote changes locally");
+		const wsUri = new URL(settings.remoteUri);
+		wsUri.protocol = wsUri.protocol === "https" ? "wss" : "ws";
+		wsUri.pathname = `/vaults/${settings.vaultName}/ws`;
 
-		await Promise.all(
-			remote.latestDocuments.map(this.syncRemotelyUpdatedFile.bind(this))
-		);
-
-		const lastSeenUpdateId = this.database.getLastSeenUpdateId();
 		if (
-			lastSeenUpdateId === undefined ||
-			lastSeenUpdateId < remote.lastUpdateId
+			typeof globalThis !== "undefined" &&
+			typeof globalThis.WebSocket === "undefined"
 		) {
-			this.database.setLastSeenUpdateId(remote.lastUpdateId);
+			// polyfill for WebSocket in Node.js
+			// eslint-disable-next-line
+			globalThis.WebSocket = require("ws");
 		}
+
+		this.applyRemoteChangesWebSocket = new WebSocket(wsUri);
+
+		this.applyRemoteChangesWebSocket.onmessage = (event): void =>
+			void this.syncRemotelyUpdatedFile(event.data).catch(
+				(e: unknown) => {
+					this.logger.error(
+						`Failed to sync remotely updated file: ${e}`
+					);
+				}
+			);
+
+		// The JS WebSocket API doesn't support setting headers, so we have to send the token as a message
+		this.applyRemoteChangesWebSocket.onopen = (): void => {
+			this.applyRemoteChangesWebSocket?.send(settings.token);
+			this.webSocketStatusChangeListeners.forEach((listener) => {
+				listener();
+			});
+		};
+
+		this.applyRemoteChangesWebSocket.onclose = (event): void => {
+			this.logger.warn(
+				`WebSocket closed with code ${event.code}: ${event.reason}`
+			);
+			this.webSocketStatusChangeListeners.forEach((listener) => {
+				listener();
+			});
+		};
 	}
 
-	private async syncRemotelyUpdatedFile(
-		remoteVersion: components["schemas"]["DocumentVersionWithoutContent"]
-	): Promise<void> {
+	private setWebSocketRefreshInterval(): void {
+		this.refreshApplyRemoteChangesWebSocketInterval = setInterval(() => {
+			if (
+				this.applyRemoteChangesWebSocket?.readyState === WebSocket.OPEN
+			) {
+				return;
+			}
+			this.updateWebSocket(this.settings.getSettings());
+		}, 5000);
+	}
+
+	private async syncRemotelyUpdatedFile(message: string): Promise<void> {
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+		const remoteVersion = JSON.parse(
+			message
+		) as components["schemas"]["DocumentVersionWithoutContent"];
+
 		let document = this.database.getDocumentByDocumentId(
 			remoteVersion.documentId
 		);
 
-		const [promise, resolve, reject] = createPromise();
-
+		let hasLockToRelease = false;
 		if (document === undefined) {
-			await this.syncQueue.add(async () =>
-				this.internalSyncer.unrestrictedSyncRemotelyUpdatedFile(
-					remoteVersion
-				)
+			// Let's avoid the same documents getting created in parallel multiple times
+			await this.remoteDocumentsLock.waitForLock(
+				remoteVersion.documentId
 			);
-		} else {
-			document = await this.database.getResolvedDocumentByRelativePath(
-				document.relativePath,
-				promise
+			hasLockToRelease = true;
+			document = this.database.getDocumentByDocumentId(
+				remoteVersion.documentId
 			);
+		}
 
-			try {
+		try {
+			if (document === undefined) {
 				await this.syncQueue.add(async () =>
 					this.internalSyncer.unrestrictedSyncRemotelyUpdatedFile(
-						remoteVersion,
-						document
+						remoteVersion
 					)
 				);
+			} else {
+				const [promise, resolve, reject] = createPromise();
 
-				resolve();
-			} catch (e) {
-				reject(e);
-			} finally {
-				this.database.removeDocumentPromise(promise);
+				document =
+					await this.database.getResolvedDocumentByRelativePath(
+						document.relativePath,
+						promise
+					);
+
+				try {
+					await this.syncQueue.add(async () =>
+						this.internalSyncer.unrestrictedSyncRemotelyUpdatedFile(
+							remoteVersion,
+							document
+						)
+					);
+
+					resolve();
+				} catch (e) {
+					reject(e);
+				} finally {
+					this.database.removeDocumentPromise(promise);
+				}
+			}
+		} finally {
+			if (hasLockToRelease) {
+				this.remoteDocumentsLock.unlock(remoteVersion.documentId);
 			}
 		}
 	}
diff --git a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
index b1d2fccc..c7e01cd6 100644
--- a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
+++ b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
@@ -13,14 +13,11 @@ import type { components } from "../services/types";
 import { deserialize } from "../utils/deserialize";
 import type { Settings } from "../persistence/settings";
 import type { FileOperations } from "../file-operations/file-operations";
-import { DocumentLocks } from "../file-operations/document-locks";
 import { createPromise } from "../utils/create-promise";
 import { FileNotFoundError } from "../file-operations/file-not-found-error";
 import { SyncResetError } from "../services/sync-reset-error";
 
 export class UnrestrictedSyncer {
-	private readonly locks: DocumentLocks;
-
 	public constructor(
 		private readonly logger: Logger,
 		private readonly database: Database,
@@ -28,10 +25,7 @@ export class UnrestrictedSyncer {
 		private readonly syncService: SyncService,
 		private readonly operations: FileOperations,
 		private readonly history: SyncHistory
-	) {
-		this.locks = new DocumentLocks(logger);
-	}
-
+	) {}
 	public async unrestrictedSyncLocallyCreatedFile(
 		document: DocumentRecord
 	): Promise<void> {
@@ -416,10 +410,6 @@ export class UnrestrictedSyncer {
 		}
 	}
 
-	public reset(): void {
-		this.locks.reset();
-	}
-
 	private tryIncrementVaultUpdateId(responseVaultUpdateId: number): void {
 		if (this.database.getLastSeenUpdateId() === responseVaultUpdateId - 1) {
 			this.database.setLastSeenUpdateId(responseVaultUpdateId);
diff --git a/frontend/sync-client/src/tracing/logger.ts b/frontend/sync-client/src/tracing/logger.ts
index f817bc26..dc259320 100644
--- a/frontend/sync-client/src/tracing/logger.ts
+++ b/frontend/sync-client/src/tracing/logger.ts
@@ -21,7 +21,7 @@ export class LogLine {
 }
 
 export class Logger {
-	private static readonly MAX_MESSAGES = 2000;
+	private static readonly MAX_MESSAGES = 100000;
 	private readonly messages: LogLine[] = [];
 	private readonly onMessageListeners: ((message: LogLine) => void)[] = [];
 
diff --git a/frontend/sync-client/src/file-operations/document-locks.test.ts b/frontend/sync-client/src/utils/locks.test.ts
similarity index 55%
rename from frontend/sync-client/src/file-operations/document-locks.test.ts
rename to frontend/sync-client/src/utils/locks.test.ts
index 1b8394ba..f545e957 100644
--- a/frontend/sync-client/src/file-operations/document-locks.test.ts
+++ b/frontend/sync-client/src/utils/locks.test.ts
@@ -1,92 +1,88 @@
 import { Logger } from "../tracing/logger";
 import type { RelativePath } from "../persistence/database";
-import { DocumentLocks } from "./document-locks";
+import { Locks } from "./locks";
 
 describe("Document lock", () => {
 	const testPath: RelativePath = "test/document/path";
 	const logger = new Logger();
-	let locks = new DocumentLocks(logger);
+
+	// eslint-disable-next-line @typescript-eslint/init-declarations
+	let locks: Locks<RelativePath>;
 
 	beforeEach(() => {
-		locks = new DocumentLocks(logger);
+		locks = new Locks<RelativePath>(logger);
 	});
 
 	test("should lock a document successfully", () => {
-		const result = locks.tryLockDocument(testPath);
+		const result = locks.tryLock(testPath);
 		expect(result).toBe(true);
 	});
 
 	test("should not lock a document that is already locked", () => {
-		locks.tryLockDocument(testPath);
-		const result = locks.tryLockDocument(testPath);
+		locks.tryLock(testPath);
+		const result = locks.tryLock(testPath);
 		expect(result).toBe(false);
 	});
 
 	test("should unlock a locked document", () => {
-		locks.tryLockDocument(testPath);
-		locks.unlockDocument(testPath);
-		const result = locks.tryLockDocument(testPath);
+		locks.tryLock(testPath);
+		locks.unlock(testPath);
+		const result = locks.tryLock(testPath);
 		expect(result).toBe(true);
-		locks.unlockDocument(testPath);
+		locks.unlock(testPath);
 	});
 
 	test("should throw an error when unlocking a document that is not locked", () => {
 		expect(() => {
-			locks.unlockDocument(testPath);
+			locks.unlock(testPath);
 		}).toThrow(`Document ${testPath} is not locked, cannot unlock`);
 	});
 
 	test("should wait for a document lock and resolve when unlocked", async () => {
-		locks.tryLockDocument(testPath);
+		locks.tryLock(testPath);
 
 		let resolved = false;
-		const waitPromise = locks.waitForDocumentLock(testPath).then(() => {
+		const waitPromise = locks.waitForLock(testPath).then(() => {
 			resolved = true;
 		});
 
-		locks.unlockDocument(testPath);
+		locks.unlock(testPath);
 		await waitPromise;
 
 		expect(resolved).toBe(true);
 	});
 
 	test("should resolve multiple waiters in FIFO order", async () => {
-		locks.tryLockDocument(testPath);
+		locks.tryLock(testPath);
 
 		let firstResolved = false;
 		let secondResolved = false;
 		let thirdResolved = false;
 
-		const firstWaitPromise = locks
-			.waitForDocumentLock(testPath)
-			.then(() => {
-				firstResolved = true;
-			});
+		const firstWaitPromise = locks.waitForLock(testPath).then(() => {
+			firstResolved = true;
+		});
 
-		const secondWaitPromise = locks
-			.waitForDocumentLock(testPath)
-			.then(() => {
-				secondResolved = true;
-			});
+		const secondWaitPromise = locks.waitForLock(testPath).then(() => {
+			secondResolved = true;
+		});
 
-		const thirdWaitPromise = locks
-			.waitForDocumentLock(testPath)
-			.then(() => {
-				thirdResolved = true;
-			});
+		const thirdWaitPromise = locks.waitForLock(testPath).then(() => {
+			thirdResolved = true;
+		});
 
-		locks.unlockDocument(testPath);
+		locks.unlock(testPath);
 		await firstWaitPromise;
 		expect(firstResolved).toBe(true);
 		expect(secondResolved).toBe(false);
 		expect(thirdResolved).toBe(false);
 
-		locks.unlockDocument(testPath);
+		locks.unlock(testPath);
 		await secondWaitPromise;
 		expect(secondResolved).toBe(true);
 		expect(thirdResolved).toBe(false);
 
-		locks.unlockDocument(testPath);
+		locks.unlock(testPath);
 		await thirdWaitPromise;
 		expect(thirdResolved).toBe(true);
 	});
diff --git a/frontend/sync-client/src/utils/locks.ts b/frontend/sync-client/src/utils/locks.ts
new file mode 100644
index 00000000..542f8a88
--- /dev/null
+++ b/frontend/sync-client/src/utils/locks.ts
@@ -0,0 +1,60 @@
+import type { Logger } from "../tracing/logger";
+
+// Manages locks on T to prevent concurrent modifications
+// allowing the client's FileOperations implementation to be simpler.
+// Locks are granted in a first-in-first-out order.
+export class Locks<T> {
+	private readonly locked = new Set<T>();
+	private readonly waiters = new Map<T, (() => void)[]>();
+
+	public constructor(private readonly logger: Logger) {}
+
+	public tryLock(key: T): boolean {
+		if (this.locked.has(key)) {
+			return false;
+		}
+
+		this.locked.add(key);
+
+		return true;
+	}
+
+	public async waitForLock(key: T): Promise<void> {
+		if (this.tryLock(key)) {
+			return Promise.resolve();
+		}
+
+		this.logger.debug(`Waiting for lock on ${key}`);
+
+		return new Promise((resolve) => {
+			let waiting = this.waiters.get(key);
+			if (!waiting) {
+				waiting = [];
+				this.waiters.set(key, waiting);
+			}
+
+			waiting.push(resolve);
+		});
+	}
+
+	public unlock(key: T): void {
+		if (!this.locked.has(key)) {
+			throw new Error(`Document ${key} is not locked, cannot unlock`);
+		}
+
+		// Remove the first element to ensure FIFO unblocking order
+		const nextWaiting = this.waiters.get(key)?.shift();
+
+		if (nextWaiting) {
+			this.logger.debug(`Granted lock on ${key}`);
+			nextWaiting();
+		} else {
+			this.locked.delete(key);
+		}
+	}
+
+	public reset(): void {
+		this.locked.clear();
+		this.waiters.clear();
+	}
+}
diff --git a/frontend/sync-client/tsconfig.json b/frontend/sync-client/tsconfig.json
index ee31a31e..024e7b99 100644
--- a/frontend/sync-client/tsconfig.json
+++ b/frontend/sync-client/tsconfig.json
@@ -6,10 +6,12 @@
 		"allowSyntheticDefaultImports": true,
 		"moduleResolution": "bundler",
 		"lib": [
-			"DOM" // to get "fetch"
+			"DOM" // to get `fetch` & `WebSocket`
 		],
 		"declaration": true,
 		"declarationDir": "./dist/types"
 	},
-	"exclude": ["./dist"]
-}
+	"exclude": [
+		"./dist"
+	]
+}
\ No newline at end of file
diff --git a/frontend/sync-client/webpack.config.js b/frontend/sync-client/webpack.config.js
index 3f913041..5efbe8eb 100644
--- a/frontend/sync-client/webpack.config.js
+++ b/frontend/sync-client/webpack.config.js
@@ -20,7 +20,7 @@ const common = {
 		minimize: false
 	},
 	resolve: {
-		extensions: [".ts"],
+		extensions: [".ts", ".js"],
 		alias: {
 			root: __dirname,
 			src: path.resolve(__dirname, "src")
@@ -42,6 +42,11 @@ module.exports = [
 				type: "umd"
 			},
 			globalObject: "this"
+		},
+		resolve: {
+			fallback: {
+				ws: false // Exclude `ws` from the browser bundle
+			}
 		}
 	}),
 	merge(common, {
@@ -50,6 +55,10 @@ module.exports = [
 			path: path.resolve(__dirname, "dist"),
 			filename: "sync-client.node.js",
 			libraryTarget: "commonjs2"
+		},
+		externals: {
+			bufferutil: "bufferutil",
+			"utf-8-validate": "utf-8-validate" // required for ws: https://github.com/websockets/ws/issues/2245#issuecomment-2250318733
 		}
 	})
 ];
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index c4e3e639..c806c8d3 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -18,6 +18,7 @@
 		"typescript": "5.8.2",
 		"uuid": "^11.1.0",
 		"webpack": "^5.98.0",
-		"webpack-cli": "^6.0.1"
+		"webpack-cli": "^6.0.1",
+		"bufferutil": "^4.0.9"
 	}
-}
+}
\ No newline at end of file
diff --git a/frontend/test-client/src/agent/mock-agent.ts b/frontend/test-client/src/agent/mock-agent.ts
index 3f7b16d3..945fd7dd 100644
--- a/frontend/test-client/src/agent/mock-agent.ts
+++ b/frontend/test-client/src/agent/mock-agent.ts
@@ -88,8 +88,7 @@ export class MockAgent extends MockClient {
 
 	public async act(): Promise<void> {
 		const options: (() => Promise<unknown>)[] = [
-			this.createFileAction.bind(this),
-			this.changeFetchChangesUpdateIntervalMsAction.bind(this)
+			this.createFileAction.bind(this)
 		];
 
 		if (this.client.getSettings().isSyncEnabled) {
@@ -253,16 +252,6 @@ export class MockAgent extends MockClient {
 		return this.create(file, new TextEncoder().encode(` ${content} `));
 	}
 
-	private async changeFetchChangesUpdateIntervalMsAction(): Promise<void> {
-		this.client.logger.info(
-			`Decided to change fetchChangesUpdateIntervalMs`
-		);
-		return this.client.setSetting(
-			"fetchChangesUpdateIntervalMs",
-			Math.random() * 2000 + 100
-		);
-	}
-
 	private async disableSyncAction(): Promise<void> {
 		this.client.logger.info(`Decided to disable sync`);
 		await this.client.setSetting("isSyncEnabled", false);
diff --git a/frontend/test-client/src/agent/mock-client.ts b/frontend/test-client/src/agent/mock-client.ts
index 3913bb14..5aa3dd6c 100644
--- a/frontend/test-client/src/agent/mock-client.ts
+++ b/frontend/test-client/src/agent/mock-client.ts
@@ -1,4 +1,4 @@
-import type { StoredDatabase } from "sync-client/dist/types/persistence/database";
+import type { StoredDatabase } from "sync-client";
 import { assert } from "../utils/assert";
 import {
 	type RelativePath,
@@ -23,9 +23,11 @@ export class MockClient implements FileSystemOperations {
 	};
 
 	public constructor(
-		private readonly initialSettings: Partial<SyncSettings>,
+		initialSettings: Partial<SyncSettings>,
 		protected readonly useSlowFileEvents: boolean
-	) {}
+	) {
+		this.data.settings = initialSettings;
+	}
 
 	public async init(
 		fetchImplementation: typeof globalThis.fetch
@@ -39,16 +41,6 @@ export class MockClient implements FileSystemOperations {
 			fetch: fetchImplementation
 		});
 
-		await Promise.all(
-			Object.keys(this.initialSettings).map(async (key) => {
-				const settingKey = key as keyof SyncSettings; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
-				return this.client.setSetting(
-					settingKey,
-					this.initialSettings[settingKey]! // eslint-disable-line @typescript-eslint/no-non-null-assertion
-				);
-			})
-		);
-
 		await this.client.start();
 	}
 
diff --git a/frontend/test-client/tsconfig.json b/frontend/test-client/tsconfig.json
index 67691c50..4995a2bc 100644
--- a/frontend/test-client/tsconfig.json
+++ b/frontend/test-client/tsconfig.json
@@ -5,8 +5,13 @@
 		"target": "ES2022",
 		"module": "CommonJS",
 		"esModuleInterop": true,
-		"lib": ["DOM", "ESNext"],
+		"lib": [
+			"DOM",
+			"ESNext"
+		],
 		"moduleResolution": "node"
 	},
-	"exclude": ["./dist"]
-}
+	"exclude": [
+		"./dist"
+	]
+}
\ No newline at end of file

From 2ac3630a65fa54c908284a0e09e980388a75fb1f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 29 Mar 2025 10:18:12 +0000
Subject: [PATCH 374/761] Bump serde from 1.0.215 to 1.0.219 in /backend (#5)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 backend/Cargo.lock           | 8 ++++----
 backend/Cargo.toml           | 2 +-
 backend/reconcile/Cargo.toml | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index e1f26dc7..139b19e1 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -2048,18 +2048,18 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "serde"
-version = "1.0.215"
+version = "1.0.219"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f"
+checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.215"
+version = "1.0.219"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0"
+checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 0dbad3aa..3a116e6f 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -15,7 +15,7 @@ repository = "https://github.com/schmelczer/vault-link"
 version = "0.2.2"
 
 [workspace.dependencies]  
-serde = { version = "1.0.214", default-features = false, features = ["derive"] }
+serde = { version = "1.0.219", default-features = false, features = ["derive"] }
 thiserror = { version = "1.0.66", default-features = false  } 
 
 [profile.release]
diff --git a/backend/reconcile/Cargo.toml b/backend/reconcile/Cargo.toml
index bc2f5429..99e7d6e6 100644
--- a/backend/reconcile/Cargo.toml
+++ b/backend/reconcile/Cargo.toml
@@ -7,7 +7,7 @@ license.workspace = true
 repository.workspace = true
 
 [dependencies]
-serde = { version = "1.0.215", optional = true }
+serde = { version = "1.0.219", optional = true }
 
 [features]
 serde = [ "dep:serde" ]

From cb5e930399ec907cc998eddde5100434eb0ccdd2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 29 Mar 2025 10:18:24 +0000
Subject: [PATCH 375/761] Bump anyhow from 1.0.94 to 1.0.97 in /backend (#13)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 backend/Cargo.lock             | 4 ++--
 backend/sync_server/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 139b19e1..1c329662 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -148,9 +148,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.94"
+version = "1.0.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7"
+checksum = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f"
 dependencies = [
  "backtrace",
 ]
diff --git a/backend/sync_server/Cargo.toml b/backend/sync_server/Cargo.toml
index 611f09a0..b873a222 100644
--- a/backend/sync_server/Cargo.toml
+++ b/backend/sync_server/Cargo.toml
@@ -16,7 +16,7 @@ thiserror = { workspace = true }
 tokio = { version = "1.42.0", features = ["full"]}
 uuid = { version = "1.16.0", features = ["v4", "serde"] }
 log = { version = "0.4.22" }
-anyhow =  { version = "1.0.94", features = ["backtrace"] }
+anyhow =  { version = "1.0.97", features = ["backtrace"] }
 axum = { version = "0.7.4", features = ["ws", "macros", "tracing", "multipart"]}
 axum-extra = { version = "0.9.6", features = ["typed-header"] }
 aide-axum-typed-multipart = "0.13.0"

From 44ab720b1de242b0445d27defa414ec60c734e0e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 29 Mar 2025 10:18:35 +0000
Subject: [PATCH 376/761] Bump tokio from 1.42.0 to 1.44.1 in /backend (#14)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 backend/Cargo.lock             | 12 ++++++------
 backend/sync_server/Cargo.toml |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 1c329662..71db6f88 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1393,9 +1393,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.167"
+version = "0.2.171"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09d6582e104315a817dff97f75133544b2e094ee22447d2acf4a74e189ba06fc"
+checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6"
 
 [[package]]
 name = "libm"
@@ -2705,9 +2705,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.42.0"
+version = "1.44.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551"
+checksum = "f382da615b842244d4b8738c82ed1275e6c5dd90c459a30941cd07080b06c91a"
 dependencies = [
  "backtrace",
  "bytes",
@@ -2723,9 +2723,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
+checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/backend/sync_server/Cargo.toml b/backend/sync_server/Cargo.toml
index b873a222..634cdc36 100644
--- a/backend/sync_server/Cargo.toml
+++ b/backend/sync_server/Cargo.toml
@@ -13,7 +13,7 @@ sync_lib = { path = "../sync_lib" }
 serde = { workspace = true }
 thiserror = { workspace = true }
 
-tokio = { version = "1.42.0", features = ["full"]}
+tokio = { version = "1.44.1", features = ["full"]}
 uuid = { version = "1.16.0", features = ["v4", "serde"] }
 log = { version = "0.4.22" }
 anyhow =  { version = "1.0.97", features = ["backtrace"] }

From 6fb922f4bacd7a5bbdf8258b36dfc9b0e1cf448f Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 29 Mar 2025 11:02:42 +0000
Subject: [PATCH 377/761] Rate-limit DB writes

---
 frontend/sync-client/src/sync-client.ts       | 12 +++-
 .../sync-client/src/utils/rate-limit.test.ts  | 66 +++++++++++++++++++
 frontend/sync-client/src/utils/rate-limit.ts  | 58 ++++++++++++++++
 3 files changed, 134 insertions(+), 2 deletions(-)
 create mode 100644 frontend/sync-client/src/utils/rate-limit.test.ts
 create mode 100644 frontend/sync-client/src/utils/rate-limit.ts

diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts
index 27aa2172..0153148c 100644
--- a/frontend/sync-client/src/sync-client.ts
+++ b/frontend/sync-client/src/sync-client.ts
@@ -14,6 +14,7 @@ import type { FileSystemOperations } from "./file-operations/filesystem-operatio
 import { FileOperations } from "./file-operations/file-operations";
 import { ConnectionStatus } from "./services/connection-status";
 import { UnrestrictedSyncer } from "./sync-operations/unrestricted-syncer";
+import { rateLimit } from "./utils/rate-limit";
 
 export interface NetworkConnectionStatus {
 	isSuccessful: boolean;
@@ -22,6 +23,8 @@ export interface NetworkConnectionStatus {
 }
 
 export class SyncClient {
+	private static readonly MINIMUM_SAVE_INTERVAL_MS = 1000;
+
 	// eslint-disable-next-line @typescript-eslint/max-params
 	private constructor(
 		private readonly history: SyncHistory,
@@ -80,12 +83,17 @@ export class SyncClient {
 			database: undefined
 		};
 
+		const rateLimitedSave = rateLimit(
+			persistence.save,
+			SyncClient.MINIMUM_SAVE_INTERVAL_MS
+		);
+
 		const database = new Database(
 			logger,
 			state.database,
 			async (data): Promise<void> => {
 				state = { ...state, database: data };
-				return persistence.save(state);
+				await rateLimitedSave(state);
 			}
 		);
 
@@ -94,7 +102,7 @@ export class SyncClient {
 			state.settings,
 			async (data): Promise<void> => {
 				state = { ...state, settings: data };
-				return persistence.save(state);
+				await rateLimitedSave(state);
 			}
 		);
 
diff --git a/frontend/sync-client/src/utils/rate-limit.test.ts b/frontend/sync-client/src/utils/rate-limit.test.ts
new file mode 100644
index 00000000..577783f7
--- /dev/null
+++ b/frontend/sync-client/src/utils/rate-limit.test.ts
@@ -0,0 +1,66 @@
+import { rateLimit } from "./rate-limit";
+import { jest } from "@jest/globals";
+
+describe("rateLimit", () => {
+	beforeEach(() => {
+		jest.useFakeTimers();
+	});
+
+	afterEach(() => {
+		jest.useRealTimers();
+	});
+
+	it("should call the function immediately on first invocation", async () => {
+		const mockFn = jest
+			.fn<() => Promise<string>>()
+			.mockResolvedValue("result");
+		const rateLimited = rateLimit(mockFn, 100);
+
+		const promise = rateLimited();
+		expect(mockFn).toHaveBeenCalledTimes(1);
+
+		await promise;
+	});
+
+	it("should call the function again after the interval has passed", async () => {
+		const mockFn = jest
+			.fn<(value: number) => Promise<string>>()
+			.mockResolvedValue("result");
+
+		const rateLimited = rateLimit(mockFn, 100);
+
+		const promise1 = rateLimited(1);
+		await promise1;
+
+		jest.advanceTimersByTime(200);
+
+		const promise2 = rateLimited(2);
+		await promise2;
+
+		expect(mockFn).toHaveBeenCalledTimes(2);
+		expect(mockFn).toHaveBeenCalledWith(2);
+	});
+
+	it("should use the most recent arguments if multiple calls are made within interval", async () => {
+		const mockFn = jest
+			.fn<(value: string) => Promise<string>>()
+			.mockImplementation(async (val) => `${val}-result`);
+		const rateLimited = rateLimit(mockFn, 100);
+
+		const promise1 = rateLimited("first");
+		jest.advanceTimersByTime(10);
+		const promise2 = rateLimited("second");
+		jest.advanceTimersByTime(10);
+		const promise3 = rateLimited("third");
+
+		jest.advanceTimersByTime(1000);
+
+		expect(await promise1).toEqual("first-result");
+		expect(await promise2).toEqual("third-result");
+		expect(await promise3).toBeUndefined();
+
+		expect(mockFn).toHaveBeenCalledTimes(2);
+		expect(mockFn).toHaveBeenNthCalledWith(1, "first");
+		expect(mockFn).toHaveBeenNthCalledWith(2, "third");
+	});
+});
diff --git a/frontend/sync-client/src/utils/rate-limit.ts b/frontend/sync-client/src/utils/rate-limit.ts
new file mode 100644
index 00000000..4de89ae8
--- /dev/null
+++ b/frontend/sync-client/src/utils/rate-limit.ts
@@ -0,0 +1,58 @@
+import { createPromise } from "./create-promise";
+import { sleep } from "./sleep";
+
+/**
+ * Creates a rate-limited version of a given asynchronous function.
+ * Ensures that the function is not called more frequently than specified by `minIntervalMs`.
+ * If the function is called while a previous call is still within the rate limit window,
+ * it will queue up the most recent arguments and execute them after the rate limit expires.
+ * Only the most recent call is preserved in the queue.
+ *
+ * @template T - Type of the function to be rate limited
+ * @param {T} fn - The asynchronous function to rate limit
+ * @param {number} minIntervalMs - The minimum interval in milliseconds between function calls
+ * @returns {(...args: Parameters<T>) => ReturnType<T> | Promise<undefined>} A decorated function that respects the rate limit.
+ *         Returns the original function's return type when executed, or undefined if the call was superseded by a newer one.
+ */
+export function rateLimit<
+	R,
+	T extends (
+		...args: any // eslint-disable-line @typescript-eslint/no-explicit-any
+	) => Promise<R>
+>(
+	fn: T,
+	minIntervalMs: number
+): (...args: Parameters<T>) => Promise<R | undefined> {
+	let newArgs: Parameters<T> | undefined = undefined;
+	let running: Promise<unknown> | undefined = undefined;
+
+	const decoratedFn = async (
+		...args: Parameters<T>
+	): Promise<R | undefined> => {
+		if (running !== undefined) {
+			newArgs = args;
+			await running;
+
+			// args might have changed while we were waiting
+			// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+			if (newArgs === undefined) {
+				// we weren't the first one to wake up, that means a newer
+				// invocation is running now, we can just bail
+				return;
+			}
+			args = newArgs;
+			newArgs = undefined;
+		}
+
+		const [promise, resolve] = createPromise();
+		running = promise;
+		sleep(minIntervalMs)
+			.then(resolve)
+			.catch(() => {
+				// sleep cannot fail
+			});
+		return fn(...args);
+	};
+
+	return decoratedFn;
+}

From a8c813b9a799ca3cf7159afa18ad0f2cbffb625e Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 29 Mar 2025 11:02:57 +0000
Subject: [PATCH 378/761] Bump versions to 0.3.0

---
 backend/Cargo.lock                     |  6 +++---
 backend/Cargo.toml                     |  2 +-
 frontend/obsidian-plugin/manifest.json |  2 +-
 frontend/obsidian-plugin/package.json  |  2 +-
 frontend/package-lock.json             | 10 +++++-----
 frontend/sync-client/package.json      |  4 ++--
 frontend/test-client/package.json      |  4 ++--
 manifest.json                          |  2 +-
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 71db6f88..2e147bea 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1876,7 +1876,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile"
-version = "0.2.2"
+version = "0.3.0"
 dependencies = [
  "insta",
  "pretty_assertions",
@@ -2510,7 +2510,7 @@ dependencies = [
 
 [[package]]
 name = "sync_lib"
-version = "0.2.2"
+version = "0.3.0"
 dependencies = [
  "base64 0.22.1",
  "console_error_panic_hook",
@@ -2523,7 +2523,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.2.2"
+version = "0.3.0"
 dependencies = [
  "aide",
  "aide-axum-typed-multipart",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 3a116e6f..793b6248 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -12,7 +12,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.2.2"
+version = "0.3.0"
 
 [workspace.dependencies]  
 serde = { version = "1.0.219", default-features = false, features = ["derive"] }
diff --git a/frontend/obsidian-plugin/manifest.json b/frontend/obsidian-plugin/manifest.json
index 740b2086..0d0af46e 100644
--- a/frontend/obsidian-plugin/manifest.json
+++ b/frontend/obsidian-plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.2.2",
+	"version": "0.3.0",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index 5c6671d4..7103399f 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.2.2",
+	"version": "0.3.0",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 761db9ad..01f9c220 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -21,7 +21,7 @@
 		},
 		"../backend/sync_lib/pkg": {
 			"name": "sync_lib",
-			"version": "0.2.2",
+			"version": "0.3.0",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -7853,7 +7853,7 @@
 		},
 		"obsidian-plugin": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.2.2",
+			"version": "0.3.0",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
@@ -7881,7 +7881,7 @@
 			}
 		},
 		"sync-client": {
-			"version": "0.2.2",
+			"version": "0.3.0",
 			"dependencies": {
 				"byte-base64": "^1.1.0",
 				"openapi-fetch": "0.13.5",
@@ -7892,7 +7892,6 @@
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
 				"@types/node": "^22.13.10",
-				"bufferutil": "^4.0.9",
 				"jest": "^29.7.0",
 				"sync_lib": "file:../../backend/sync_lib/pkg",
 				"ts-jest": "^29.2.6",
@@ -7906,12 +7905,13 @@
 			}
 		},
 		"test-client": {
-			"version": "0.2.2",
+			"version": "0.3.0",
 			"bin": {
 				"test-client": "dist/cli.js"
 			},
 			"devDependencies": {
 				"@types/node": "^22.13.10",
+				"bufferutil": "^4.0.9",
 				"sync-client": "file:../sync-client",
 				"ts-loader": "^9.5.2",
 				"tslib": "2.8.1",
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index cd8d2a2a..5dba3a9e 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "sync-client",
-	"version": "0.2.2",
+	"version": "0.3.0",
 	"main": "dist/sync-client.node.js",
 	"browser": "dist/sync-client.web.js",
 	"types": "dist/types/index.d.ts",
@@ -33,4 +33,4 @@
 		"webpack-merge": "^6.0.1",
 		"ws": "^8.18.1"
 	}
-}
\ No newline at end of file
+}
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index c806c8d3..ed012965 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "test-client",
-	"version": "0.2.2",
+	"version": "0.3.0",
 	"private": true,
 	"bin": {
 		"test-client": "./dist/cli.js"
@@ -21,4 +21,4 @@
 		"webpack-cli": "^6.0.1",
 		"bufferutil": "^4.0.9"
 	}
-}
\ No newline at end of file
+}
diff --git a/manifest.json b/manifest.json
index 740b2086..0d0af46e 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.2.2",
+	"version": "0.3.0",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",

From 5356dc0eb9db4da2a55f1879726c99b70789dcce Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 29 Mar 2025 11:03:53 +0000
Subject: [PATCH 379/761] Bump rust from 1.83 to 1.85 in /backend (#6)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 backend/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/Dockerfile b/backend/Dockerfile
index 897066c0..5a51d15c 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.83 AS builder
+FROM rust:1.85 AS builder
 
 WORKDIR /usr/src/backend
 

From b3e98d32b615ab8a592c1c0272181a537071616d Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 29 Mar 2025 12:25:15 +0000
Subject: [PATCH 380/761] Add vault-level access control

---
 backend/config-e2e.yml                        |  4 ++--
 backend/sync_server/src/app_state/database.rs |  2 +-
 .../sync_server/src/config/database_config.rs | 14 +++++------
 backend/sync_server/src/config/user_config.rs | 20 ++++++++++++++++
 backend/sync_server/src/consts.rs             |  2 +-
 backend/sync_server/src/errors.rs             | 17 +++++++-------
 backend/sync_server/src/server.rs             |  2 +-
 backend/sync_server/src/server/auth.rs        | 23 ++++++++++++++-----
 .../sync_server/src/server/create_document.rs |  2 +-
 .../sync_server/src/server/delete_document.rs |  2 +-
 .../src/server/fetch_document_version.rs      |  2 +-
 .../server/fetch_document_version_content.rs  |  2 +-
 .../server/fetch_latest_document_version.rs   |  2 +-
 .../src/server/fetch_latest_documents.rs      |  2 +-
 backend/sync_server/src/server/ping.rs        | 23 +++++++++++++++----
 .../sync_server/src/server/update_document.rs |  2 +-
 backend/sync_server/src/server/websocket.rs   |  6 ++---
 17 files changed, 86 insertions(+), 41 deletions(-)

diff --git a/backend/config-e2e.yml b/backend/config-e2e.yml
index 04fe344a..a49ab287 100644
--- a/backend/config-e2e.yml
+++ b/backend/config-e2e.yml
@@ -1,6 +1,6 @@
 database:
   databases_directory_path: databases
-  max_connections: 12
+  max_connections_per_vault: 12
 
 server:
   host: 0.0.0.0
@@ -13,7 +13,7 @@ users:
   - name: admin
     token: test-token-change-me
     vaults: 
-      all: true
+      allow_access_to_all: true
 
   - name: test
     token: other-test-token
diff --git a/backend/sync_server/src/app_state/database.rs b/backend/sync_server/src/app_state/database.rs
index fa7f35b0..2c2cfced 100644
--- a/backend/sync_server/src/app_state/database.rs
+++ b/backend/sync_server/src/app_state/database.rs
@@ -73,7 +73,7 @@ impl Database {
             .journal_mode(sqlx::sqlite::SqliteJournalMode::Wal);
 
         let pool = SqlitePoolOptions::new()
-            .max_connections(config.max_connections)
+            .max_connections(config.max_connections_per_vault)
             .test_before_acquire(true)
             .connect_with(connection_options)
             .await
diff --git a/backend/sync_server/src/config/database_config.rs b/backend/sync_server/src/config/database_config.rs
index b3d2fad7..ef26a09d 100644
--- a/backend/sync_server/src/config/database_config.rs
+++ b/backend/sync_server/src/config/database_config.rs
@@ -3,15 +3,15 @@ use std::path::PathBuf;
 use log::debug;
 use serde::{Deserialize, Serialize};
 
-use crate::consts::{DEFAULT_DATABASES_DIRECTORY_PATH, DEFAULT_MAX_CONNECTIONS};
+use crate::consts::{DEFAULT_DATABASES_DIRECTORY_PATH, DEFAULT_MAX_CONNECTIONS_PER_VAULT};
 
 #[derive(Debug, Deserialize, Serialize, Clone)]
 pub struct DatabaseConfig {
     #[serde(default = "default_databases_directory_path")]
     pub databases_directory_path: PathBuf,
 
-    #[serde(default = "default_max_connections")]
-    pub max_connections: u32,
+    #[serde(default = "default_max_connections_per_vault")]
+    pub max_connections_per_vault: u32,
 }
 
 fn default_databases_directory_path() -> PathBuf {
@@ -19,16 +19,16 @@ fn default_databases_directory_path() -> PathBuf {
     PathBuf::from(DEFAULT_DATABASES_DIRECTORY_PATH)
 }
 
-fn default_max_connections() -> u32 {
-    debug!("Using default max connections: {DEFAULT_MAX_CONNECTIONS}");
-    DEFAULT_MAX_CONNECTIONS
+fn default_max_connections_per_vault() -> u32 {
+    debug!("Using default max connections: {DEFAULT_MAX_CONNECTIONS_PER_VAULT}");
+    DEFAULT_MAX_CONNECTIONS_PER_VAULT
 }
 
 impl Default for DatabaseConfig {
     fn default() -> Self {
         Self {
             databases_directory_path: default_databases_directory_path(),
-            max_connections: default_max_connections(),
+            max_connections_per_vault: default_max_connections_per_vault(),
         }
     }
 }
diff --git a/backend/sync_server/src/config/user_config.rs b/backend/sync_server/src/config/user_config.rs
index c3afca14..4ee7c72d 100644
--- a/backend/sync_server/src/config/user_config.rs
+++ b/backend/sync_server/src/config/user_config.rs
@@ -1,6 +1,10 @@
+use std::default;
+
 use rand::{Rng as _, distributions::Alphanumeric, thread_rng};
 use serde::{Deserialize, Serialize};
 
+use crate::app_state::database::models::VaultId;
+
 #[derive(Debug, Deserialize, Serialize, Clone)]
 pub struct UserConfig {
     #[serde(default = "default_users")]
@@ -17,6 +21,7 @@ impl UserConfig {
 pub struct User {
     pub name: String,
     pub token: String,
+    pub vault_access: VaultAccess,
 }
 
 impl Default for UserConfig {
@@ -27,10 +32,25 @@ impl Default for UserConfig {
     }
 }
 
+#[derive(Debug, Deserialize, Serialize, Clone, Default)]
+#[serde(rename_all = "snake_case", tag = "type")]
+pub enum VaultAccess {
+    #[default]
+    AllowAccessToAll,
+
+    AllowList(AllowListedVaults),
+}
+
+#[derive(Debug, Deserialize, Serialize, Clone, Default)]
+pub struct AllowListedVaults {
+    pub allowed: Vec<VaultId>,
+}
+
 fn default_users() -> Vec<User> {
     vec![User {
         name: "admin".to_owned(),
         token: get_random_token(),
+        vault_access: VaultAccess::default(),
     }]
 }
 
diff --git a/backend/sync_server/src/consts.rs b/backend/sync_server/src/consts.rs
index 2d3bec55..1453f25a 100644
--- a/backend/sync_server/src/consts.rs
+++ b/backend/sync_server/src/consts.rs
@@ -2,6 +2,6 @@ pub const DEFAULT_CONFIG_PATH: &str = "config.yml";
 pub const DEFAULT_DATABASES_DIRECTORY_PATH: &str = "databases";
 pub const DEFAULT_HOST: &str = "127.0.0.1";
 pub const DEFAULT_PORT: u16 = 3000;
-pub const DEFAULT_MAX_CONNECTIONS: u32 = 12;
+pub const DEFAULT_MAX_CONNECTIONS_PER_VAULT: u32 = 12;
 pub const DEFAULT_MAX_BODY_SIZE_MB: usize = 4096;
 pub const DEFAULT_MAX_CLIENTS_PER_VAULT: usize = 256;
diff --git a/backend/sync_server/src/errors.rs b/backend/sync_server/src/errors.rs
index 5aec9c32..31538107 100644
--- a/backend/sync_server/src/errors.rs
+++ b/backend/sync_server/src/errors.rs
@@ -24,7 +24,7 @@ pub enum SyncServerError {
     NotFound(#[source] anyhow::Error),
 
     #[error("Unauthorized: {0}")]
-    Unauthorized(#[source] anyhow::Error),
+    Unauthenticated(#[source] anyhow::Error),
 
     #[error("Permission denied error: {0}")]
     PermissionDeniedError(#[source] anyhow::Error),
@@ -37,7 +37,7 @@ impl SyncServerError {
             | Self::ClientError(error)
             | Self::ServerError(error)
             | Self::NotFound(error)
-            | Self::Unauthorized(error)
+            | Self::Unauthenticated(error)
             | Self::PermissionDeniedError(error) => error.into(),
         }
     }
@@ -53,7 +53,7 @@ impl IntoResponse for SyncServerError {
             }
             Self::ClientError(_) => (StatusCode::BAD_REQUEST, body).into_response(),
             Self::NotFound(_) => (StatusCode::NOT_FOUND, body).into_response(),
-            Self::Unauthorized(_) => (StatusCode::UNAUTHORIZED, body).into_response(),
+            Self::Unauthenticated(_) => (StatusCode::UNAUTHORIZED, body).into_response(),
             Self::PermissionDeniedError(_) => (StatusCode::FORBIDDEN, body).into_response(),
         }
     }
@@ -100,17 +100,16 @@ pub fn client_error(error: anyhow::Error) -> SyncServerError {
 }
 
 pub fn not_found_error(error: anyhow::Error) -> SyncServerError {
-    info!("Not found error: {:?}", error);
+    info!("Not found: {:?}", error);
     SyncServerError::NotFound(error)
 }
 
-pub fn unauthorized_error(error: anyhow::Error) -> SyncServerError {
-    info!("Unauthorized error: {:?}", error);
-    SyncServerError::Unauthorized(error)
+pub fn unauthenticated_error(error: anyhow::Error) -> SyncServerError {
+    info!("Unauthenticated user: {:?}", error);
+    SyncServerError::Unauthenticated(error)
 }
 
-#[allow(dead_code)]
 pub fn permission_denied_error(error: anyhow::Error) -> SyncServerError {
-    info!("Permission denied error: {:?}", error);
+    info!("Permission denied: {:?}", error);
     SyncServerError::PermissionDeniedError(error)
 }
diff --git a/backend/sync_server/src/server.rs b/backend/sync_server/src/server.rs
index 90bd8ff3..4bc85c0f 100644
--- a/backend/sync_server/src/server.rs
+++ b/backend/sync_server/src/server.rs
@@ -61,7 +61,7 @@ pub async fn create_server(config_path: Option<OsString>) -> Result<()> {
 
     let mut api = create_open_api();
     let app = ApiRouter::new()
-        .api_route("/ping", get(ping::ping))
+        .api_route("/vaults/:vault_id/ping", get(ping::ping))
         .api_route(
             "/vaults/:vault_id/documents",
             get(fetch_latest_documents::fetch_latest_documents),
diff --git a/backend/sync_server/src/server/auth.rs b/backend/sync_server/src/server/auth.rs
index ae20e187..06bfe5db 100644
--- a/backend/sync_server/src/server/auth.rs
+++ b/backend/sync_server/src/server/auth.rs
@@ -1,15 +1,26 @@
 use crate::{
-    app_state::AppState,
-    config::user_config::User,
-    errors::{SyncServerError, unauthorized_error},
+    app_state::{AppState, database::models::VaultId},
+    config::user_config::{AllowListedVaults, User, VaultAccess},
+    errors::{SyncServerError, permission_denied_error, unauthenticated_error},
 };
 
 // TODO: turn this into a middleware
-pub fn auth(app_state: &AppState, token: &str) -> Result<User, SyncServerError> {
-    app_state
+pub fn auth(app_state: &AppState, token: &str, vault: &VaultId) -> Result<User, SyncServerError> {
+    let user = app_state
         .config
         .users
         .get_user(token)
         .cloned()
-        .ok_or_else(|| unauthorized_error(anyhow::anyhow!("Invalid token")))
+        .ok_or_else(|| unauthenticated_error(anyhow::anyhow!("Invalid token")))?;
+
+    if match user.vault_access {
+        VaultAccess::AllowAccessToAll => true,
+        VaultAccess::AllowList(AllowListedVaults { ref allowed }) => allowed.contains(vault),
+    } {
+        Ok(user)
+    } else {
+        Err(permission_denied_error(anyhow::anyhow!(
+            "Permission denied for vault `{vault}`"
+        )))
+    }
 }
diff --git a/backend/sync_server/src/server/create_document.rs b/backend/sync_server/src/server/create_document.rs
index 826b37c6..25919384 100644
--- a/backend/sync_server/src/server/create_document.rs
+++ b/backend/sync_server/src/server/create_document.rs
@@ -87,7 +87,7 @@ async fn internal_create_document(
     relative_path: String,
     content: Vec<u8>,
 ) -> Result<Json<DocumentVersionWithoutContent>, SyncServerError> {
-    auth(&state, auth_header.token())?;
+    auth(&state, auth_header.token(), &vault_id)?;
 
     let mut transaction = state
         .database
diff --git a/backend/sync_server/src/server/delete_document.rs b/backend/sync_server/src/server/delete_document.rs
index 10fbca3c..82955676 100644
--- a/backend/sync_server/src/server/delete_document.rs
+++ b/backend/sync_server/src/server/delete_document.rs
@@ -37,7 +37,7 @@ pub async fn delete_document(
     State(state): State<AppState>,
     Json(request): Json<DeleteDocumentVersion>,
 ) -> Result<Json<DocumentVersionWithoutContent>, SyncServerError> {
-    auth(&state, auth_header.token())?;
+    auth(&state, auth_header.token(), &vault_id)?;
 
     let mut transaction = state
         .database
diff --git a/backend/sync_server/src/server/fetch_document_version.rs b/backend/sync_server/src/server/fetch_document_version.rs
index aab06c85..87900696 100644
--- a/backend/sync_server/src/server/fetch_document_version.rs
+++ b/backend/sync_server/src/server/fetch_document_version.rs
@@ -35,7 +35,7 @@ pub async fn fetch_document_version(
     }): Path<FetchDocumentVersionPathParams>,
     State(state): State<AppState>,
 ) -> Result<Json<DocumentVersion>, SyncServerError> {
-    auth(&state, auth_header.token())?;
+    auth(&state, auth_header.token(), &vault_id)?;
 
     let result = state
         .database
diff --git a/backend/sync_server/src/server/fetch_document_version_content.rs b/backend/sync_server/src/server/fetch_document_version_content.rs
index a2504ba1..24eddf40 100644
--- a/backend/sync_server/src/server/fetch_document_version_content.rs
+++ b/backend/sync_server/src/server/fetch_document_version_content.rs
@@ -37,7 +37,7 @@ pub async fn fetch_document_version_content(
     }): Path<FetchDocumentVersionContentPathParams>,
     State(state): State<AppState>,
 ) -> Result<Bytes, SyncServerError> {
-    auth(&state, auth_header.token())?;
+    auth(&state, auth_header.token(), &vault_id)?;
 
     let result = state
         .database
diff --git a/backend/sync_server/src/server/fetch_latest_document_version.rs b/backend/sync_server/src/server/fetch_latest_document_version.rs
index ec777f30..5ccfa4e9 100644
--- a/backend/sync_server/src/server/fetch_latest_document_version.rs
+++ b/backend/sync_server/src/server/fetch_latest_document_version.rs
@@ -33,7 +33,7 @@ pub async fn fetch_latest_document_version(
     }): Path<FetchLatestDocumentVersionPathParams>,
     State(state): State<AppState>,
 ) -> Result<Json<DocumentVersion>, SyncServerError> {
-    auth(&state, auth_header.token())?;
+    auth(&state, auth_header.token(), &vault_id)?;
 
     let latest_version = state
         .database
diff --git a/backend/sync_server/src/server/fetch_latest_documents.rs b/backend/sync_server/src/server/fetch_latest_documents.rs
index 2b4dc841..4b62a2f8 100644
--- a/backend/sync_server/src/server/fetch_latest_documents.rs
+++ b/backend/sync_server/src/server/fetch_latest_documents.rs
@@ -35,7 +35,7 @@ pub async fn fetch_latest_documents(
     Query(QueryParams { since_update_id }): Query<QueryParams>,
     State(state): State<AppState>,
 ) -> Result<Json<FetchLatestDocumentsResponse>, SyncServerError> {
-    auth(&state, auth_header.token())?;
+    auth(&state, auth_header.token(), &vault_id)?;
 
     let documents = if let Some(since_update_id) = since_update_id {
         state
diff --git a/backend/sync_server/src/server/ping.rs b/backend/sync_server/src/server/ping.rs
index 1fe75ee6..38dc2037 100644
--- a/backend/sync_server/src/server/ping.rs
+++ b/backend/sync_server/src/server/ping.rs
@@ -1,19 +1,34 @@
-use axum::{Json, extract::State};
+use axum::{
+    Json,
+    extract::{Path, State},
+};
 use axum_extra::{
     TypedHeader,
     headers::{Authorization, authorization::Bearer},
 };
+use schemars::JsonSchema;
+use serde::Deserialize;
 
 use super::{auth::auth, responses::PingResponse};
-use crate::{app_state::AppState, errors::SyncServerError};
+use crate::{
+    app_state::{AppState, database::models::VaultId},
+    errors::SyncServerError,
+};
+
+// This is required for aide to infer the path parameter types and names
+#[derive(Deserialize, JsonSchema)]
+pub struct PingPathParams {
+    vault_id: VaultId,
+}
 
 #[axum::debug_handler]
 pub async fn ping(
     maybe_auth_header: Option<TypedHeader<Authorization<Bearer>>>,
+    Path(PingPathParams { vault_id }): Path<PingPathParams>,
     State(state): State<AppState>,
 ) -> Result<Json<PingResponse>, SyncServerError> {
-    let is_authenticated =
-        maybe_auth_header.is_some_and(|auth_header| auth(&state, auth_header.token()).is_ok());
+    let is_authenticated = maybe_auth_header
+        .is_some_and(|auth_header| auth(&state, auth_header.token(), &vault_id).is_ok());
 
     Ok(Json(PingResponse {
         server_version: env!("CARGO_PKG_VERSION").to_owned(),
diff --git a/backend/sync_server/src/server/update_document.rs b/backend/sync_server/src/server/update_document.rs
index 0448ddb7..5bb39b70 100644
--- a/backend/sync_server/src/server/update_document.rs
+++ b/backend/sync_server/src/server/update_document.rs
@@ -92,7 +92,7 @@ async fn internal_update_document(
     relative_path: String,
     content: Vec<u8>,
 ) -> Result<Json<DocumentUpdateResponse>, SyncServerError> {
-    auth(&state, auth_header.token())?;
+    auth(&state, auth_header.token(), &vault_id)?;
 
     // No need for a transaction as document versions are immutable
     let parent_document = state
diff --git a/backend/sync_server/src/server/websocket.rs b/backend/sync_server/src/server/websocket.rs
index 30125f41..d672b944 100644
--- a/backend/sync_server/src/server/websocket.rs
+++ b/backend/sync_server/src/server/websocket.rs
@@ -20,7 +20,7 @@ use crate::{
         AppState,
         database::models::{DocumentVersionWithoutContent, VaultId, VaultUpdateId},
     },
-    errors::{SyncServerError, server_error, unauthorized_error},
+    errors::{SyncServerError, server_error, unauthenticated_error},
 };
 
 // This is required for aide to infer the path parameter types and names
@@ -73,9 +73,9 @@ async fn websocket(
     let (mut sender, mut receiver) = stream.split();
 
     if let Some(Ok(Message::Text(token))) = receiver.next().await {
-        auth(&state, &token)?;
+        auth(&state, &token, &vault_id)?;
     } else {
-        return Err(unauthorized_error(anyhow::anyhow!(
+        return Err(unauthenticated_error(anyhow::anyhow!(
             "Failed to authenticate"
         )));
     }

From 81c4cc991c5d817857b02a10d23ddddd071ba314 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 29 Mar 2025 12:25:24 +0000
Subject: [PATCH 381/761] Print init errors

---
 backend/sync_server/src/errors.rs | 25 +++++++++++++++++++------
 backend/sync_server/src/main.rs   |  2 +-
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/backend/sync_server/src/errors.rs b/backend/sync_server/src/errors.rs
index 31538107..c5b46c21 100644
--- a/backend/sync_server/src/errors.rs
+++ b/backend/sync_server/src/errors.rs
@@ -43,6 +43,25 @@ impl SyncServerError {
     }
 }
 
+#[derive(Debug, Clone, Serialize, JsonSchema)]
+pub struct SerializedError {
+    pub message: String,
+    pub causes: Vec<String>,
+}
+
+impl ToString for SerializedError {
+    fn to_string(&self) -> String {
+        let mut result = self.message.clone();
+        if !self.causes.is_empty() {
+            result.push_str("\nCauses:\n");
+            for cause in &self.causes {
+                result.push_str(&format!("- {}\n", cause));
+            }
+        }
+        result
+    }
+}
+
 impl IntoResponse for SyncServerError {
     fn into_response(self) -> Response {
         let body = Json(self.serialize());
@@ -59,12 +78,6 @@ impl IntoResponse for SyncServerError {
     }
 }
 
-#[derive(Debug, Clone, Serialize, JsonSchema)]
-pub struct SerializedError {
-    pub message: String,
-    pub causes: Vec<String>,
-}
-
 impl From<&anyhow::Error> for SerializedError {
     fn from(error: &anyhow::Error) -> SerializedError {
         let mut causes = vec![];
diff --git a/backend/sync_server/src/main.rs b/backend/sync_server/src/main.rs
index b3989b0c..9b2686f2 100644
--- a/backend/sync_server/src/main.rs
+++ b/backend/sync_server/src/main.rs
@@ -29,7 +29,7 @@ async fn main() -> ExitCode {
     match result {
         Ok(()) => ExitCode::SUCCESS,
         Err(e) => {
-            eprintln!("Failed to set up logging: {e}");
+            eprintln!("{}", e.serialize().to_string());
             ExitCode::FAILURE
         }
     }

From 1eec55b2d0ce120c74281ece4bf41ea89d3c7f21 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 29 Mar 2025 12:25:32 +0000
Subject: [PATCH 382/761] Update example config

---
 backend/config-e2e.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/backend/config-e2e.yml b/backend/config-e2e.yml
index a49ab287..e8fc6fd8 100644
--- a/backend/config-e2e.yml
+++ b/backend/config-e2e.yml
@@ -12,11 +12,12 @@ users:
   user_tokens:
   - name: admin
     token: test-token-change-me
-    vaults: 
-      allow_access_to_all: true
+    vault_access: 
+      type: allow_access_to_all
 
   - name: test
     token: other-test-token
-    vaults: 
-      allowed:
+    vault_access:
+      type: allow_list
+      allowed: 
        - default

From 3d8152f6f58a06888fc7515b81d35c437f9688a1 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 29 Mar 2025 12:26:52 +0000
Subject: [PATCH 383/761] Rate-limit updates

---
 .../src/utils/register-console-for-logging.ts | 23 ++++++++
 .../obsidian-plugin/src/vault-link-plugin.ts  | 55 +++++++++----------
 frontend/sync-client/src/index.ts             |  1 +
 3 files changed, 49 insertions(+), 30 deletions(-)
 create mode 100644 frontend/obsidian-plugin/src/utils/register-console-for-logging.ts

diff --git a/frontend/obsidian-plugin/src/utils/register-console-for-logging.ts b/frontend/obsidian-plugin/src/utils/register-console-for-logging.ts
new file mode 100644
index 00000000..e898f380
--- /dev/null
+++ b/frontend/obsidian-plugin/src/utils/register-console-for-logging.ts
@@ -0,0 +1,23 @@
+import type { LogLine, SyncClient } from "sync-client";
+import { LogLevel } from "sync-client";
+
+export function registerConsoleForLogging(client: SyncClient): void {
+	client.logger.addOnMessageListener((logLine: LogLine) => {
+		const formatted = `${logLine.timestamp.toISOString()} ${logLine.level} ${logLine.message}`;
+
+		switch (logLine.level) {
+			case LogLevel.ERROR:
+				console.error(formatted);
+				break;
+			case LogLevel.WARNING:
+				console.warn(formatted);
+				break;
+			case LogLevel.INFO:
+				console.info(formatted);
+				break;
+			case LogLevel.DEBUG:
+				console.debug(formatted);
+				break;
+		}
+	});
+}
diff --git a/frontend/obsidian-plugin/src/vault-link-plugin.ts b/frontend/obsidian-plugin/src/vault-link-plugin.ts
index aab9bad8..4995d03c 100644
--- a/frontend/obsidian-plugin/src/vault-link-plugin.ts
+++ b/frontend/obsidian-plugin/src/vault-link-plugin.ts
@@ -11,35 +11,18 @@ import { HistoryView } from "./views/history/history-view";
 import { StatusBar } from "./views/status-bar/status-bar";
 import { LogsView } from "./views/logs/logs-view";
 import { StatusDescription } from "./views/status-description/status-description";
-import type { LogLine } from "sync-client";
-import { SyncClient, LogLevel } from "sync-client";
+import { SyncClient, rateLimit } from "sync-client";
 import { ObsidianFileSystemOperations } from "./obsidian-file-system";
 import { SyncSettingsTab } from "./views/settings/settings-tab";
+import { registerConsoleForLogging } from "./utils/register-console-for-logging";
 
 export default class VaultLinkPlugin extends Plugin {
 	private settingsTab: SyncSettingsTab | undefined;
 	private client!: SyncClient;
-
-	private static registerConsoleForLogging(client: SyncClient): void {
-		client.logger.addOnMessageListener((logLine: LogLine) => {
-			const formatted = `${logLine.timestamp.toISOString()} ${logLine.level} ${logLine.message}`;
-
-			switch (logLine.level) {
-				case LogLevel.ERROR:
-					console.error(formatted);
-					break;
-				case LogLevel.WARNING:
-					console.warn(formatted);
-					break;
-				case LogLevel.INFO:
-					console.info(formatted);
-					break;
-				case LogLevel.DEBUG:
-					console.debug(formatted);
-					break;
-			}
-		});
-	}
+	private readonly rateLimitedUpdatesPerFile = new Map<
+		string,
+		() => Promise<unknown>
+	>();
 
 	public async onload(): Promise<void> {
 		this.client = await SyncClient.create({
@@ -54,7 +37,7 @@ export default class VaultLinkPlugin extends Plugin {
 			nativeLineEndings: Platform.isWin ? "\r\n" : "\n"
 		});
 
-		VaultLinkPlugin.registerConsoleForLogging(this.client);
+		registerConsoleForLogging(this.client);
 
 		const statusDescription = new StatusDescription(this.client);
 
@@ -138,9 +121,7 @@ export default class VaultLinkPlugin extends Plugin {
 				) => {
 					const { file } = info;
 					if (file) {
-						await this.client.syncLocallyUpdatedFile({
-							relativePath: file.path
-						});
+						await this.rateLimitedUpdate(file.path);
 					}
 				}
 			),
@@ -151,9 +132,7 @@ export default class VaultLinkPlugin extends Plugin {
 			}),
 			this.app.vault.on("modify", async (file: TAbstractFile) => {
 				if (file instanceof TFile) {
-					await this.client.syncLocallyUpdatedFile({
-						relativePath: file.path
-					});
+					await this.rateLimitedUpdate(file.path);
 				}
 			}),
 			this.app.vault.on("delete", async (file: TAbstractFile) => {
@@ -174,4 +153,20 @@ export default class VaultLinkPlugin extends Plugin {
 			this.registerEvent(event);
 		});
 	}
+
+	private async rateLimitedUpdate(path: string): Promise<void> {
+		if (!this.rateLimitedUpdatesPerFile.has(path)) {
+			this.rateLimitedUpdatesPerFile.set(
+				path,
+				rateLimit(
+					async () =>
+						this.client.syncLocallyUpdatedFile({
+							relativePath: path
+						}),
+					250
+				)
+			);
+		}
+		await this.rateLimitedUpdatesPerFile.get(path)();
+	}
 }
diff --git a/frontend/sync-client/src/index.ts b/frontend/sync-client/src/index.ts
index 6c36965f..0a03d0ae 100644
--- a/frontend/sync-client/src/index.ts
+++ b/frontend/sync-client/src/index.ts
@@ -6,6 +6,7 @@ export {
 } from "./tracing/sync-history";
 export { Logger, LogLevel, LogLine } from "./tracing/logger";
 export { type SyncSettings } from "./persistence/settings";
+export { rateLimit } from "./utils/rate-limit";
 export type { RelativePath, StoredDatabase } from "./persistence/database";
 export type { FileSystemOperations } from "./file-operations/filesystem-operations";
 export type { PersistenceProvider } from "./persistence/persistence";

From 7413299cec346c96e6ccc492928c182113412ab3 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 29 Mar 2025 12:26:59 +0000
Subject: [PATCH 384/761] Fix typo

---
 frontend/sync-client/src/services/sync-service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/sync-client/src/services/sync-service.ts b/frontend/sync-client/src/services/sync-service.ts
index 3d84947c..78174699 100644
--- a/frontend/sync-client/src/services/sync-service.ts
+++ b/frontend/sync-client/src/services/sync-service.ts
@@ -354,7 +354,7 @@ export class SyncService {
 				}
 
 				this.logger.error(
-					`Failed network call (${e}), retryingin ${SyncService.NETWORK_RETRY_INTERVAL_MS}ms`
+					`Failed network call (${e}), retrying in ${SyncService.NETWORK_RETRY_INTERVAL_MS}ms`
 				);
 				await sleep(SyncService.NETWORK_RETRY_INTERVAL_MS);
 			}

From c5af0d40d8149fb9417b3bb8252433ebae38faee Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 29 Mar 2025 12:28:12 +0000
Subject: [PATCH 385/761] Pick up changed ping API

---
 .../sync-client/src/services/sync-service.ts   | 18 +++++++++++++-----
 frontend/sync-client/src/services/types.ts     |  9 +++++++--
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/frontend/sync-client/src/services/sync-service.ts b/frontend/sync-client/src/services/sync-service.ts
index 78174699..79c7a382 100644
--- a/frontend/sync-client/src/services/sync-service.ts
+++ b/frontend/sync-client/src/services/sync-service.ts
@@ -284,14 +284,22 @@ export class SyncService {
 	}
 
 	public async checkConnection(): Promise<CheckConnectionResult> {
+		const { vaultName } = this.settings.getSettings();
+
 		try {
-			const response = await this.pingClient.GET("/ping", {
-				params: {
-					header: {
-						authorization: `Bearer ${this.settings.getSettings().token}`
+			const response = await this.pingClient.GET(
+				"/vaults/{vault_id}/ping",
+				{
+					params: {
+						header: {
+							authorization: `Bearer ${this.settings.getSettings().token}`
+						},
+						path: {
+							vault_id: vaultName
+						}
 					}
 				}
-			});
+			);
 
 			this.logger.debug(
 				`Ping response: ${JSON.stringify(response.data)}`
diff --git a/frontend/sync-client/src/services/types.ts b/frontend/sync-client/src/services/types.ts
index 8e9df505..29983c8d 100644
--- a/frontend/sync-client/src/services/types.ts
+++ b/frontend/sync-client/src/services/types.ts
@@ -4,7 +4,7 @@
  */
 
 export interface paths {
-	"/ping": {
+	"/vaults/{vault_id}/ping": {
 		parameters: {
 			query?: never;
 			header?: never;
@@ -17,7 +17,9 @@ export interface paths {
 				header?: {
 					authorization?: string;
 				};
-				path?: never;
+				path: {
+					vault_id: string;
+				};
 				cookie?: never;
 			};
 			requestBody?: never;
@@ -555,6 +557,9 @@ export interface components {
 			lastUpdateId: number;
 			latestDocuments: components["schemas"]["DocumentVersionWithoutContent"][];
 		};
+		PingPathParams: {
+			vault_id: string;
+		};
 		/** @description Response to a ping request. */
 		PingResponse: {
 			/** @description Whether the client is authenticated based on the sent Authorization header. */

From 3bbc5c61e986242f2f36b22986d9f54e857d9281 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 29 Mar 2025 12:29:36 +0000
Subject: [PATCH 386/761] Bump versions to 0.3.1

---
 backend/Cargo.lock                     | 6 +++---
 backend/Cargo.toml                     | 2 +-
 frontend/obsidian-plugin/manifest.json | 2 +-
 frontend/obsidian-plugin/package.json  | 2 +-
 frontend/package-lock.json             | 8 ++++----
 frontend/sync-client/package.json      | 2 +-
 frontend/test-client/package.json      | 2 +-
 manifest.json                          | 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 2e147bea..9f3c2603 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1876,7 +1876,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile"
-version = "0.3.0"
+version = "0.3.1"
 dependencies = [
  "insta",
  "pretty_assertions",
@@ -2510,7 +2510,7 @@ dependencies = [
 
 [[package]]
 name = "sync_lib"
-version = "0.3.0"
+version = "0.3.1"
 dependencies = [
  "base64 0.22.1",
  "console_error_panic_hook",
@@ -2523,7 +2523,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.3.0"
+version = "0.3.1"
 dependencies = [
  "aide",
  "aide-axum-typed-multipart",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 793b6248..6f63dfe4 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -12,7 +12,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.3.0"
+version = "0.3.1"
 
 [workspace.dependencies]  
 serde = { version = "1.0.219", default-features = false, features = ["derive"] }
diff --git a/frontend/obsidian-plugin/manifest.json b/frontend/obsidian-plugin/manifest.json
index 0d0af46e..71803ae0 100644
--- a/frontend/obsidian-plugin/manifest.json
+++ b/frontend/obsidian-plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.3.0",
+	"version": "0.3.1",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index 7103399f..20de3f04 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.3.0",
+	"version": "0.3.1",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 01f9c220..54a1b525 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -21,7 +21,7 @@
 		},
 		"../backend/sync_lib/pkg": {
 			"name": "sync_lib",
-			"version": "0.3.0",
+			"version": "0.3.1",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -7853,7 +7853,7 @@
 		},
 		"obsidian-plugin": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.3.0",
+			"version": "0.3.1",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
@@ -7881,7 +7881,7 @@
 			}
 		},
 		"sync-client": {
-			"version": "0.3.0",
+			"version": "0.3.1",
 			"dependencies": {
 				"byte-base64": "^1.1.0",
 				"openapi-fetch": "0.13.5",
@@ -7905,7 +7905,7 @@
 			}
 		},
 		"test-client": {
-			"version": "0.3.0",
+			"version": "0.3.1",
 			"bin": {
 				"test-client": "dist/cli.js"
 			},
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index 5dba3a9e..cd0875af 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "sync-client",
-	"version": "0.3.0",
+	"version": "0.3.1",
 	"main": "dist/sync-client.node.js",
 	"browser": "dist/sync-client.web.js",
 	"types": "dist/types/index.d.ts",
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index ed012965..9e7991f3 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "test-client",
-	"version": "0.3.0",
+	"version": "0.3.1",
 	"private": true,
 	"bin": {
 		"test-client": "./dist/cli.js"
diff --git a/manifest.json b/manifest.json
index 0d0af46e..71803ae0 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.3.0",
+	"version": "0.3.1",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",

From 52bda8976484682c7e07a034131fe573d32d0fb7 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 29 Mar 2025 13:36:32 +0000
Subject: [PATCH 387/761] Fix jumping cursor

---
 frontend/obsidian-plugin/src/obsidian-file-system.ts | 4 ++++
 frontend/obsidian-plugin/src/vault-link-plugin.ts    | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/frontend/obsidian-plugin/src/obsidian-file-system.ts b/frontend/obsidian-plugin/src/obsidian-file-system.ts
index 55388e05..24e06af9 100644
--- a/frontend/obsidian-plugin/src/obsidian-file-system.ts
+++ b/frontend/obsidian-plugin/src/obsidian-file-system.ts
@@ -27,7 +27,9 @@ export class ObsidianFileSystemOperations implements FileSystemOperations {
 
 		const view = this.workspace.getActiveViewOfType(MarkdownView);
 		if (view?.file?.path === path) {
+			const position = view.editor.getCursor();
 			view.editor.setValue(new TextDecoder().decode(content));
+			view.editor.setCursor(position);
 			return;
 		}
 
@@ -47,7 +49,9 @@ export class ObsidianFileSystemOperations implements FileSystemOperations {
 		const view = this.workspace.getActiveViewOfType(MarkdownView);
 		if (view?.file?.path === path) {
 			const result = updater(view.editor.getValue());
+			const position = view.editor.getCursor();
 			view.editor.setValue(result);
+			view.editor.setCursor(position);
 			return result;
 		}
 
diff --git a/frontend/obsidian-plugin/src/vault-link-plugin.ts b/frontend/obsidian-plugin/src/vault-link-plugin.ts
index 4995d03c..40b9ed57 100644
--- a/frontend/obsidian-plugin/src/vault-link-plugin.ts
+++ b/frontend/obsidian-plugin/src/vault-link-plugin.ts
@@ -167,6 +167,6 @@ export default class VaultLinkPlugin extends Plugin {
 				)
 			);
 		}
-		await this.rateLimitedUpdatesPerFile.get(path)();
+		await this.rateLimitedUpdatesPerFile.get(path)?.();
 	}
 }

From bb5a0bde3aa47fe2417821e292fe3f85671740b9 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 29 Mar 2025 13:36:44 +0000
Subject: [PATCH 388/761] Bump versions to 0.3.2

---
 backend/Cargo.lock                     | 6 +++---
 backend/Cargo.toml                     | 2 +-
 frontend/obsidian-plugin/manifest.json | 2 +-
 frontend/obsidian-plugin/package.json  | 2 +-
 frontend/package-lock.json             | 8 ++++----
 frontend/sync-client/package.json      | 2 +-
 frontend/test-client/package.json      | 2 +-
 manifest.json                          | 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 9f3c2603..b1815d8f 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1876,7 +1876,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile"
-version = "0.3.1"
+version = "0.3.2"
 dependencies = [
  "insta",
  "pretty_assertions",
@@ -2510,7 +2510,7 @@ dependencies = [
 
 [[package]]
 name = "sync_lib"
-version = "0.3.1"
+version = "0.3.2"
 dependencies = [
  "base64 0.22.1",
  "console_error_panic_hook",
@@ -2523,7 +2523,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.3.1"
+version = "0.3.2"
 dependencies = [
  "aide",
  "aide-axum-typed-multipart",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 6f63dfe4..3989b9ad 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -12,7 +12,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.3.1"
+version = "0.3.2"
 
 [workspace.dependencies]  
 serde = { version = "1.0.219", default-features = false, features = ["derive"] }
diff --git a/frontend/obsidian-plugin/manifest.json b/frontend/obsidian-plugin/manifest.json
index 71803ae0..9bdd41ed 100644
--- a/frontend/obsidian-plugin/manifest.json
+++ b/frontend/obsidian-plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.3.1",
+	"version": "0.3.2",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index 20de3f04..430549c2 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.3.1",
+	"version": "0.3.2",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 54a1b525..a58647ac 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -21,7 +21,7 @@
 		},
 		"../backend/sync_lib/pkg": {
 			"name": "sync_lib",
-			"version": "0.3.1",
+			"version": "0.3.2",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -7853,7 +7853,7 @@
 		},
 		"obsidian-plugin": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.3.1",
+			"version": "0.3.2",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
@@ -7881,7 +7881,7 @@
 			}
 		},
 		"sync-client": {
-			"version": "0.3.1",
+			"version": "0.3.2",
 			"dependencies": {
 				"byte-base64": "^1.1.0",
 				"openapi-fetch": "0.13.5",
@@ -7905,7 +7905,7 @@
 			}
 		},
 		"test-client": {
-			"version": "0.3.1",
+			"version": "0.3.2",
 			"bin": {
 				"test-client": "dist/cli.js"
 			},
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index cd0875af..3af0250f 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "sync-client",
-	"version": "0.3.1",
+	"version": "0.3.2",
 	"main": "dist/sync-client.node.js",
 	"browser": "dist/sync-client.web.js",
 	"types": "dist/types/index.d.ts",
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index 9e7991f3..14f3d1c0 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "test-client",
-	"version": "0.3.1",
+	"version": "0.3.2",
 	"private": true,
 	"bin": {
 		"test-client": "./dist/cli.js"
diff --git a/manifest.json b/manifest.json
index 71803ae0..9bdd41ed 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.3.1",
+	"version": "0.3.2",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",

From 0311883a16ca5d6c1f83d0dc4290b9b035845206 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 29 Mar 2025 14:04:06 +0000
Subject: [PATCH 389/761] Fix lint

---
 backend/sync_server/src/config/user_config.rs |  2 --
 backend/sync_server/src/errors.rs             | 14 ++++++++------
 backend/sync_server/src/main.rs               |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/backend/sync_server/src/config/user_config.rs b/backend/sync_server/src/config/user_config.rs
index 4ee7c72d..fea80894 100644
--- a/backend/sync_server/src/config/user_config.rs
+++ b/backend/sync_server/src/config/user_config.rs
@@ -1,5 +1,3 @@
-use std::default;
-
 use rand::{Rng as _, distributions::Alphanumeric, thread_rng};
 use serde::{Deserialize, Serialize};
 
diff --git a/backend/sync_server/src/errors.rs b/backend/sync_server/src/errors.rs
index c5b46c21..69b38d26 100644
--- a/backend/sync_server/src/errors.rs
+++ b/backend/sync_server/src/errors.rs
@@ -1,3 +1,5 @@
+use std::fmt::Display;
+
 use aide::OperationOutput;
 use axum::{
     Json,
@@ -49,16 +51,16 @@ pub struct SerializedError {
     pub causes: Vec<String>,
 }
 
-impl ToString for SerializedError {
-    fn to_string(&self) -> String {
-        let mut result = self.message.clone();
+impl Display for SerializedError {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         if !self.causes.is_empty() {
-            result.push_str("\nCauses:\n");
+            write!(f, "\nCauses:\n")?;
             for cause in &self.causes {
-                result.push_str(&format!("- {}\n", cause));
+                write!(f, "{}", &format!("- {cause}\n"))?;
             }
         }
-        result
+
+        Ok(())
     }
 }
 
diff --git a/backend/sync_server/src/main.rs b/backend/sync_server/src/main.rs
index 9b2686f2..83556542 100644
--- a/backend/sync_server/src/main.rs
+++ b/backend/sync_server/src/main.rs
@@ -29,7 +29,7 @@ async fn main() -> ExitCode {
     match result {
         Ok(()) => ExitCode::SUCCESS,
         Err(e) => {
-            eprintln!("{}", e.serialize().to_string());
+            eprintln!("{}", e.serialize());
             ExitCode::FAILURE
         }
     }

From 86dead52661118987d4e049fd43773b38e8f26e4 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 29 Mar 2025 14:04:36 +0000
Subject: [PATCH 390/761] Bump versions to 0.3.3

---
 backend/Cargo.lock                     | 6 +++---
 backend/Cargo.toml                     | 2 +-
 frontend/obsidian-plugin/manifest.json | 2 +-
 frontend/obsidian-plugin/package.json  | 2 +-
 frontend/package-lock.json             | 8 ++++----
 frontend/sync-client/package.json      | 2 +-
 frontend/test-client/package.json      | 2 +-
 manifest.json                          | 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index b1815d8f..5a5628f7 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1876,7 +1876,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile"
-version = "0.3.2"
+version = "0.3.3"
 dependencies = [
  "insta",
  "pretty_assertions",
@@ -2510,7 +2510,7 @@ dependencies = [
 
 [[package]]
 name = "sync_lib"
-version = "0.3.2"
+version = "0.3.3"
 dependencies = [
  "base64 0.22.1",
  "console_error_panic_hook",
@@ -2523,7 +2523,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.3.2"
+version = "0.3.3"
 dependencies = [
  "aide",
  "aide-axum-typed-multipart",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 3989b9ad..de127567 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -12,7 +12,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.3.2"
+version = "0.3.3"
 
 [workspace.dependencies]  
 serde = { version = "1.0.219", default-features = false, features = ["derive"] }
diff --git a/frontend/obsidian-plugin/manifest.json b/frontend/obsidian-plugin/manifest.json
index 9bdd41ed..6ddc5526 100644
--- a/frontend/obsidian-plugin/manifest.json
+++ b/frontend/obsidian-plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.3.2",
+	"version": "0.3.3",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index 430549c2..749941aa 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.3.2",
+	"version": "0.3.3",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index a58647ac..7dca724e 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -21,7 +21,7 @@
 		},
 		"../backend/sync_lib/pkg": {
 			"name": "sync_lib",
-			"version": "0.3.2",
+			"version": "0.3.3",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -7853,7 +7853,7 @@
 		},
 		"obsidian-plugin": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.3.2",
+			"version": "0.3.3",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
@@ -7881,7 +7881,7 @@
 			}
 		},
 		"sync-client": {
-			"version": "0.3.2",
+			"version": "0.3.3",
 			"dependencies": {
 				"byte-base64": "^1.1.0",
 				"openapi-fetch": "0.13.5",
@@ -7905,7 +7905,7 @@
 			}
 		},
 		"test-client": {
-			"version": "0.3.2",
+			"version": "0.3.3",
 			"bin": {
 				"test-client": "dist/cli.js"
 			},
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index 3af0250f..e003c6ff 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "sync-client",
-	"version": "0.3.2",
+	"version": "0.3.3",
 	"main": "dist/sync-client.node.js",
 	"browser": "dist/sync-client.web.js",
 	"types": "dist/types/index.d.ts",
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index 14f3d1c0..5b64153d 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "test-client",
-	"version": "0.3.2",
+	"version": "0.3.3",
 	"private": true,
 	"bin": {
 		"test-client": "./dist/cli.js"
diff --git a/manifest.json b/manifest.json
index 9bdd41ed..6ddc5526 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.3.2",
+	"version": "0.3.3",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",

From ecaa914879fc4ad3f985f991e079a8430246bbf5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Apr 2025 22:51:12 +0100
Subject: [PATCH 391/761] Bump insta from 1.41.1 to 1.42.2 in /backend (#15)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 backend/Cargo.lock           | 27 ++++++++++++++++++++++++---
 backend/reconcile/Cargo.toml |  2 +-
 backend/sync_lib/Cargo.toml  |  2 +-
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 5a5628f7..9a9ec6ef 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1304,13 +1304,14 @@ dependencies = [
 
 [[package]]
 name = "insta"
-version = "1.41.1"
+version = "1.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e9ffc4d4892617c50a928c52b2961cb5174b6fc6ebf252b2fac9d21955c48b8"
+checksum = "50259abbaa67d11d2bcafc7ba1d094ed7a0c70e3ce893f0d0997f73558cb3084"
 dependencies = [
  "console",
- "lazy_static",
  "linked-hash-map",
+ "once_cell",
+ "pin-project",
  "similar",
 ]
 
@@ -1732,6 +1733,26 @@ version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
+[[package]]
+name = "pin-project"
+version = "1.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677f1add503faace112b9f1373e43e9e054bfdd22ff1a63c1bc485eaec6a6a8a"
+dependencies = [
+ "pin-project-internal",
+]
+
+[[package]]
+name = "pin-project-internal"
+version = "1.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
 [[package]]
 name = "pin-project-lite"
 version = "0.2.15"
diff --git a/backend/reconcile/Cargo.toml b/backend/reconcile/Cargo.toml
index 99e7d6e6..c96ccbaf 100644
--- a/backend/reconcile/Cargo.toml
+++ b/backend/reconcile/Cargo.toml
@@ -13,7 +13,7 @@ serde = { version = "1.0.219", optional = true }
 serde = [ "dep:serde" ]
 
 [dev-dependencies]
-insta = "1.41.1"
+insta = "1.42.2"
 pretty_assertions = "1.4.1"
 test-case = "3.3.1"
 
diff --git a/backend/sync_lib/Cargo.toml b/backend/sync_lib/Cargo.toml
index ef48f6ee..72f3de87 100644
--- a/backend/sync_lib/Cargo.toml
+++ b/backend/sync_lib/Cargo.toml
@@ -23,7 +23,7 @@ console_error_panic_hook = { version = "0.1.7", optional = true }
 
 [dev-dependencies]
 wasm-bindgen-test = "0.3.49"
-insta = "1.41.1"
+insta = "1.42.2"
 
 [features]
 default = ["console_error_panic_hook"]

From 29d87797863b0ac20a10a903c9fb69f08b0407f9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 2 Apr 2025 20:10:25 +0100
Subject: [PATCH 392/761] Bump sqlx from 0.8.2 to 0.8.3 in /backend (#20)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 backend/Cargo.lock             | 128 ++++++++++++++++-----------------
 backend/sync_server/Cargo.toml |   2 +-
 2 files changed, 61 insertions(+), 69 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 9a9ec6ef..a4716eb6 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -56,7 +56,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_qs",
- "thiserror",
+ "thiserror 1.0.69",
  "tower-layer",
  "tower-service",
  "tracing",
@@ -310,7 +310,7 @@ dependencies = [
  "futures-core",
  "futures-util",
  "tempfile",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "uuid",
 ]
@@ -794,6 +794,12 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
+[[package]]
+name = "foldhash"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
+
 [[package]]
 name = "form_urlencoded"
 version = "1.2.1"
@@ -954,29 +960,24 @@ version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
-[[package]]
-name = "hashbrown"
-version = "0.14.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
-dependencies = [
- "ahash",
- "allocator-api2",
-]
-
 [[package]]
 name = "hashbrown"
 version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
+dependencies = [
+ "allocator-api2",
+ "equivalent",
+ "foldhash",
+]
 
 [[package]]
 name = "hashlink"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af"
+checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1"
 dependencies = [
- "hashbrown 0.14.5",
+ "hashbrown",
 ]
 
 [[package]]
@@ -1298,7 +1299,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f"
 dependencies = [
  "equivalent",
- "hashbrown 0.15.2",
+ "hashbrown",
  "serde",
 ]
 
@@ -1712,12 +1713,6 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
-[[package]]
-name = "paste"
-version = "1.0.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
-
 [[package]]
 name = "pem-rfc7468"
 version = "0.7.0"
@@ -2130,7 +2125,7 @@ dependencies = [
  "futures",
  "percent-encoding",
  "serde",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -2267,21 +2262,11 @@ dependencies = [
  "der",
 ]
 
-[[package]]
-name = "sqlformat"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bba3a93db0cc4f7bdece8bb09e77e2e785c20bfebf79eb8340ed80708048790"
-dependencies = [
- "nom",
- "unicode_categories",
-]
-
 [[package]]
 name = "sqlx"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93334716a037193fac19df402f8571269c84a00852f6a7066b5d2616dcd64d3e"
+checksum = "4410e73b3c0d8442c5f99b425d7a435b5ee0ae4167b3196771dd3f7a01be745f"
 dependencies = [
  "sqlx-core",
  "sqlx-macros",
@@ -2292,38 +2277,32 @@ dependencies = [
 
 [[package]]
 name = "sqlx-core"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4d8060b456358185f7d50c55d9b5066ad956956fddec42ee2e8567134a8936e"
+checksum = "6a007b6936676aa9ab40207cde35daab0a04b823be8ae004368c0793b96a61e0"
 dependencies = [
- "atoi",
- "byteorder",
  "bytes",
  "chrono",
  "crc",
  "crossbeam-queue",
  "either",
  "event-listener",
- "futures-channel",
  "futures-core",
  "futures-intrusive",
  "futures-io",
  "futures-util",
- "hashbrown 0.14.5",
+ "hashbrown",
  "hashlink",
- "hex",
  "indexmap",
  "log",
  "memchr",
  "once_cell",
- "paste",
  "percent-encoding",
  "serde",
  "serde_json",
  "sha2",
  "smallvec",
- "sqlformat",
- "thiserror",
+ "thiserror 2.0.12",
  "tokio",
  "tokio-stream",
  "tracing",
@@ -2333,9 +2312,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx-macros"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cac0692bcc9de3b073e8d747391827297e075c7710ff6276d9f7a1f3d58c6657"
+checksum = "3112e2ad78643fef903618d78cf0aec1cb3134b019730edb039b69eaf531f310"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2346,9 +2325,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx-macros-core"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1804e8a7c7865599c9c79be146dc8a9fd8cc86935fa641d3ea58e5f0688abaa5"
+checksum = "4e9f90acc5ab146a99bf5061a7eb4976b573f560bc898ef3bf8435448dd5e7ad"
 dependencies = [
  "dotenvy",
  "either",
@@ -2372,9 +2351,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx-mysql"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64bb4714269afa44aef2755150a0fc19d756fb580a67db8885608cf02f47d06a"
+checksum = "4560278f0e00ce64938540546f59f590d60beee33fffbd3b9cd47851e5fff233"
 dependencies = [
  "atoi",
  "base64 0.22.1",
@@ -2408,7 +2387,7 @@ dependencies = [
  "smallvec",
  "sqlx-core",
  "stringprep",
- "thiserror",
+ "thiserror 2.0.12",
  "tracing",
  "uuid",
  "whoami",
@@ -2416,9 +2395,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx-postgres"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fa91a732d854c5d7726349bb4bb879bb9478993ceb764247660aee25f67c2f8"
+checksum = "c5b98a57f363ed6764d5b3a12bfedf62f07aa16e1856a7ddc2a0bb190a959613"
 dependencies = [
  "atoi",
  "base64 0.22.1",
@@ -2430,7 +2409,6 @@ dependencies = [
  "etcetera",
  "futures-channel",
  "futures-core",
- "futures-io",
  "futures-util",
  "hex",
  "hkdf",
@@ -2448,7 +2426,7 @@ dependencies = [
  "smallvec",
  "sqlx-core",
  "stringprep",
- "thiserror",
+ "thiserror 2.0.12",
  "tracing",
  "uuid",
  "whoami",
@@ -2456,9 +2434,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx-sqlite"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5b2cf34a45953bfd3daaf3db0f7a7878ab9b7a6b91b422d24a7a9e4c857b680"
+checksum = "f85ca71d3a5b24e64e1d08dd8fe36c6c95c339a896cc33068148906784620540"
 dependencies = [
  "atoi",
  "chrono",
@@ -2537,7 +2515,7 @@ dependencies = [
  "console_error_panic_hook",
  "insta",
  "reconcile",
- "thiserror",
+ "thiserror 1.0.69",
  "wasm-bindgen",
  "wasm-bindgen-test",
 ]
@@ -2568,7 +2546,7 @@ dependencies = [
  "serde_yaml",
  "sqlx",
  "sync_lib",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "tower-http",
  "tracing",
@@ -2645,7 +2623,16 @@ version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
 dependencies = [
- "thiserror-impl",
+ "thiserror-impl 1.0.69",
+]
+
+[[package]]
+name = "thiserror"
+version = "2.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
+dependencies = [
+ "thiserror-impl 2.0.12",
 ]
 
 [[package]]
@@ -2659,6 +2646,17 @@ dependencies = [
  "syn 2.0.90",
 ]
 
+[[package]]
+name = "thiserror-impl"
+version = "2.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
 [[package]]
 name = "thread_local"
 version = "1.1.8"
@@ -2897,7 +2895,7 @@ dependencies = [
  "log",
  "rand",
  "sha1",
- "thiserror",
+ "thiserror 1.0.69",
  "utf-8",
 ]
 
@@ -2940,12 +2938,6 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0"
 
-[[package]]
-name = "unicode_categories"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e"
-
 [[package]]
 name = "unsafe-libyaml"
 version = "0.2.11"
diff --git a/backend/sync_server/Cargo.toml b/backend/sync_server/Cargo.toml
index 634cdc36..7d8e892f 100644
--- a/backend/sync_server/Cargo.toml
+++ b/backend/sync_server/Cargo.toml
@@ -24,7 +24,7 @@ axum_typed_multipart = "0.11.0"
 tower-http = { version = "0.6.1", features = ["cors", "trace", "limit"] }
 tracing-subscriber = { version = "0.3.19", features = ["fmt", "env-filter"]}
 serde_yaml = "0.9.34"
-sqlx = { version = "0.8.2", features = ["sqlite", "runtime-tokio", "uuid", "chrono"] }
+sqlx = { version = "0.8.3", features = ["sqlite", "runtime-tokio", "uuid", "chrono"] }
 chrono = { version = "0.4.40", features = ["serde"] }
 aide = { version = "0.13.4", features = ["axum", "axum-ws", "scalar", "axum-headers"] }
 schemars = { version = "0.8.21", features = ["chrono", "uuid1", "bytes"] }

From 1f9728d8930831cd4ccebcb0b00cd43e8ecc99b6 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Wed, 2 Apr 2025 22:06:38 +0100
Subject: [PATCH 393/761] Add cursor moving (#19)

---
 .editorconfig                                 |  11 +
 backend/Cargo.lock                            |   1 +
 backend/reconcile/Cargo.toml                  |   4 +-
 backend/reconcile/src/lib.rs                  |   7 +-
 .../reconcile/src/operation_transformation.rs | 227 ++++++++++++++++--
 .../src/operation_transformation/cursor.rs    |  68 ++++++
 .../operation_transformation/edited_text.rs   | 176 ++++++++++----
 .../operation_transformation/merge_context.rs |  39 +--
 .../src/operation_transformation/operation.rs |   2 +-
 ...ted_text__tests__calculate_operations.snap |   1 +
 backend/reconcile/src/utils/side.rs           |  12 +
 backend/reconcile/tests/example_document.rs   |  98 ++++++++
 backend/reconcile/tests/examples/1.yml        |   6 +
 backend/reconcile/tests/examples/10.yml       |   4 +
 backend/reconcile/tests/examples/11.yml       |   4 +
 backend/reconcile/tests/examples/12.yml       |   4 +
 backend/reconcile/tests/examples/13.yml       |   4 +
 backend/reconcile/tests/examples/2.yml        |   4 +
 backend/reconcile/tests/examples/3.yml        |   4 +
 backend/reconcile/tests/examples/4.yml        |   4 +
 backend/reconcile/tests/examples/5.yml        |   4 +
 backend/reconcile/tests/examples/6.yml        |   4 +
 backend/reconcile/tests/examples/7.yml        |   4 +
 backend/reconcile/tests/examples/8.yml        |   4 +
 backend/reconcile/tests/examples/9.yml        |   4 +
 .../{test => tests}/resources/kun_lu.txt      |   0
 .../resources/pride_and_prejudice.txt         |   0
 .../resources/romeo_and_juliet.txt            |   0
 .../resources/room_with_a_view.txt            |   0
 backend/reconcile/tests/test.rs               |  46 ++++
 backend/sync_lib/src/cursor.rs                |  88 +++++++
 backend/sync_lib/src/lib.rs                   |  18 +-
 backend/sync_lib/tests/web.rs                 |  40 ++-
 backend/sync_server/src/server/auth.rs        |   8 +
 frontend/obsidian-plugin/jest.config.js       |   3 +
 frontend/obsidian-plugin/package.json         |   4 +-
 .../src/obsidian-file-system.ts               |  52 +++-
 .../utils/line-and-column-to-position.test.ts |  43 ++++
 .../src/utils/line-and-column-to-position.ts  |  34 +++
 .../utils/position-to-line-and-column.test.ts |  69 ++++++
 .../src/utils/position-to-line-and-column.ts  |  30 +++
 .../file-operations/file-operations.test.ts   |   7 +-
 .../src/file-operations/file-operations.ts    |  60 ++++-
 .../file-operations/filesystem-operations.ts  |  12 +-
 .../safe-filesystem-operations.ts             |   7 +-
 frontend/sync-client/src/index.ts             |   6 +-
 .../sync-client/src/sync-operations/syncer.ts |   8 +-
 frontend/test-client/src/agent/mock-agent.ts  |   5 +-
 frontend/test-client/src/agent/mock-client.ts |   6 +-
 49 files changed, 1105 insertions(+), 141 deletions(-)
 create mode 100644 .editorconfig
 create mode 100644 backend/reconcile/src/operation_transformation/cursor.rs
 create mode 100644 backend/reconcile/tests/example_document.rs
 create mode 100644 backend/reconcile/tests/examples/1.yml
 create mode 100644 backend/reconcile/tests/examples/10.yml
 create mode 100644 backend/reconcile/tests/examples/11.yml
 create mode 100644 backend/reconcile/tests/examples/12.yml
 create mode 100644 backend/reconcile/tests/examples/13.yml
 create mode 100644 backend/reconcile/tests/examples/2.yml
 create mode 100644 backend/reconcile/tests/examples/3.yml
 create mode 100644 backend/reconcile/tests/examples/4.yml
 create mode 100644 backend/reconcile/tests/examples/5.yml
 create mode 100644 backend/reconcile/tests/examples/6.yml
 create mode 100644 backend/reconcile/tests/examples/7.yml
 create mode 100644 backend/reconcile/tests/examples/8.yml
 create mode 100644 backend/reconcile/tests/examples/9.yml
 rename backend/reconcile/{test => tests}/resources/kun_lu.txt (100%)
 rename backend/reconcile/{test => tests}/resources/pride_and_prejudice.txt (100%)
 rename backend/reconcile/{test => tests}/resources/romeo_and_juliet.txt (100%)
 rename backend/reconcile/{test => tests}/resources/room_with_a_view.txt (100%)
 create mode 100644 backend/reconcile/tests/test.rs
 create mode 100644 backend/sync_lib/src/cursor.rs
 create mode 100644 frontend/obsidian-plugin/jest.config.js
 create mode 100644 frontend/obsidian-plugin/src/utils/line-and-column-to-position.test.ts
 create mode 100644 frontend/obsidian-plugin/src/utils/line-and-column-to-position.ts
 create mode 100644 frontend/obsidian-plugin/src/utils/position-to-line-and-column.test.ts
 create mode 100644 frontend/obsidian-plugin/src/utils/position-to-line-and-column.ts

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..5773d4e4
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,11 @@
+# https://editorconfig.org
+
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+charset = utf-8
+indent_style = space
+indent_size = 4
diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index a4716eb6..d7aa152e 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1897,6 +1897,7 @@ dependencies = [
  "insta",
  "pretty_assertions",
  "serde",
+ "serde_yaml",
  "test-case",
 ]
 
diff --git a/backend/reconcile/Cargo.toml b/backend/reconcile/Cargo.toml
index c96ccbaf..61e7edf8 100644
--- a/backend/reconcile/Cargo.toml
+++ b/backend/reconcile/Cargo.toml
@@ -7,7 +7,7 @@ license.workspace = true
 repository.workspace = true
 
 [dependencies]
-serde = { version = "1.0.219", optional = true }
+serde = { version = "1.0.219", optional = true, features = ["derive"] }
 
 [features]
 serde = [ "dep:serde" ]
@@ -15,6 +15,8 @@ serde = [ "dep:serde" ]
 [dev-dependencies]
 insta = "1.42.2"
 pretty_assertions = "1.4.1"
+serde = { version = "1.0.219", features = ["derive"] }
+serde_yaml ="0.9.34"
 test-case = "3.3.1"
 
 [lints]
diff --git a/backend/reconcile/src/lib.rs b/backend/reconcile/src/lib.rs
index 9c5bb764..a04ae853 100644
--- a/backend/reconcile/src/lib.rs
+++ b/backend/reconcile/src/lib.rs
@@ -3,5 +3,8 @@ mod operation_transformation;
 mod tokenizer;
 mod utils;
 
-pub use operation_transformation::{EditedText, reconcile, reconcile_with_tokenizer};
-pub use tokenizer::token::Token;
+pub use operation_transformation::{
+    CursorPosition, EditedText, TextWithCursors, reconcile, reconcile_with_cursors,
+    reconcile_with_tokenizer,
+};
+pub use tokenizer::{Tokenizer, token::Token};
diff --git a/backend/reconcile/src/operation_transformation.rs b/backend/reconcile/src/operation_transformation.rs
index a71bc65a..8c95d397 100644
--- a/backend/reconcile/src/operation_transformation.rs
+++ b/backend/reconcile/src/operation_transformation.rs
@@ -1,41 +1,42 @@
+mod cursor;
 mod edited_text;
 mod merge_context;
 mod operation;
 
+pub use cursor::{CursorPosition, TextWithCursors};
 pub use edited_text::EditedText;
 pub use operation::Operation;
 
-use crate::tokenizer::Tokenizer;
+use crate::Tokenizer;
 
 #[must_use]
 pub fn reconcile(original: &str, left: &str, right: &str) -> String {
-    // Common trivial cases
-    if left == right {
-        return left.to_owned();
-    }
+    reconcile_with_cursors(original, left.into(), right.into())
+        .text
+        .to_string()
+}
 
-    if original == left {
-        return right.to_owned();
-    }
-
-    if original == right {
-        return left.to_owned();
-    }
-
-    // 3-way merge
+#[must_use]
+pub fn reconcile_with_cursors<'a>(
+    original: &'a str,
+    left: TextWithCursors<'a>,
+    right: TextWithCursors<'a>,
+) -> TextWithCursors<'static> {
     let left_operations = EditedText::from_strings(original, left);
     let right_operations = EditedText::from_strings(original, right);
 
     let merged_operations = left_operations.merge(right_operations);
-    merged_operations.apply()
+
+    TextWithCursors::new_owned(merged_operations.apply(), merged_operations.cursors)
 }
 
-pub fn reconcile_with_tokenizer<F, T>(
+#[must_use]
+pub fn reconcile_with_tokenizer<'a, F, T>(
     original: &str,
-    left: &str,
-    right: &str,
+    left: TextWithCursors<'a>,
+    right: TextWithCursors<'a>,
     tokenizer: &Tokenizer<T>,
-) -> String
+) -> TextWithCursors<'static>
 where
     T: PartialEq + Clone + std::fmt::Debug,
 {
@@ -43,7 +44,8 @@ where
     let right_operations = EditedText::from_strings_with_tokenizer(original, right, tokenizer);
 
     let merged_operations = left_operations.merge(right_operations);
-    merged_operations.apply()
+
+    TextWithCursors::new_owned(merged_operations.apply(), merged_operations.cursors)
 }
 
 #[cfg(test)]
@@ -54,6 +56,7 @@ mod test {
     use test_case::test_matrix;
 
     use super::*;
+    use crate::CursorPosition;
 
     #[test]
     fn test_merges() {
@@ -172,6 +175,188 @@ mod test {
             "      |7ca2b36d-6ee7-49eb-8eb1-d77e4cc1a001|      |cd9195cc-103a-4f13-90c8-4fba0ba421ee|      |d39156cc-cfd6-42a8-b70a-75020896069d|      |fbad794c-9c47-41f2-a343-490284ecb5a0|      |dup|      |dup|   ");
     }
 
+    #[test]
+    fn test_cursor_position_no_updates() {
+        let original = "hello world";
+        let left = TextWithCursors::new(
+            "hello world",
+            vec![CursorPosition {
+                id: 0,
+                char_index: 0,
+            }],
+        );
+        let right = TextWithCursors::new(
+            "hello world",
+            vec![CursorPosition {
+                id: 1,
+                char_index: 5,
+            }],
+        );
+
+        let merged = reconcile_with_cursors(original, left, right);
+
+        assert_eq!(
+            merged,
+            TextWithCursors::new(
+                "hello world",
+                vec![
+                    CursorPosition {
+                        id: 0,
+                        char_index: 0
+                    },
+                    CursorPosition {
+                        id: 1,
+                        char_index: 5
+                    }
+                ]
+            )
+        );
+    }
+
+    #[test]
+    fn test_cursor_position_updates_with_inserts() {
+        let original = "hi";
+        let left = TextWithCursors::new(
+            "hi there",
+            vec![CursorPosition {
+                id: 0,
+                char_index: 7,
+            }],
+        );
+        let right = TextWithCursors::new(
+            "hi world!",
+            vec![
+                CursorPosition {
+                    id: 1,
+                    char_index: 9,
+                },
+                CursorPosition {
+                    id: 2,
+                    char_index: 1,
+                },
+            ],
+        );
+
+        let merged = reconcile_with_cursors(original, left, right);
+
+        assert_eq!(
+            merged,
+            TextWithCursors::new(
+                "hi there world!",
+                vec![
+                    CursorPosition {
+                        id: 2,
+                        char_index: 1,
+                    },
+                    CursorPosition {
+                        id: 0,
+                        char_index: 7
+                    },
+                    CursorPosition {
+                        id: 1,
+                        char_index: 15
+                    },
+                ]
+            )
+        );
+    }
+
+    #[test]
+    fn test_cursor_position_updates_with_deleted() {
+        let original = "a b c d";
+        let left = TextWithCursors::new(
+            "a b d",
+            vec![CursorPosition {
+                id: 0,
+                char_index: 1, // after a
+            }],
+        );
+        let right = TextWithCursors::new(
+            "c d",
+            vec![CursorPosition {
+                id: 1,
+                char_index: 1, // after c
+            }],
+        );
+
+        let merged = reconcile_with_cursors(original, left, right);
+
+        assert_eq!(
+            merged,
+            TextWithCursors::new(
+                " d",
+                vec![
+                    CursorPosition {
+                        id: 0,
+                        char_index: 0
+                    },
+                    CursorPosition {
+                        id: 1,
+                        char_index: 1
+                    }
+                ]
+            )
+        );
+    }
+
+    #[test]
+    fn test_cursor_complex() {
+        let original = "this is some complex text to test cursor positions";
+        let left = TextWithCursors::new(
+            "this is really complex text for testing cursor positions",
+            vec![
+                CursorPosition {
+                    id: 0,
+                    char_index: 8,
+                }, // after "this is "
+                CursorPosition {
+                    id: 1,
+                    char_index: 22,
+                }, // after "this is really complex text"
+            ],
+        );
+        let right = TextWithCursors::new(
+            "that was some complex sample to test cursor movements",
+            vec![
+                CursorPosition {
+                    id: 2,
+                    char_index: 5,
+                }, // after "that "
+                CursorPosition {
+                    id: 3,
+                    char_index: 29,
+                }, // after "some complex sample "
+            ],
+        );
+
+        let merged = reconcile_with_cursors(original, left, right);
+
+        assert_eq!(
+            merged,
+            TextWithCursors::new(
+                "that was really complex sample for testing cursor movements",
+                vec![
+                    CursorPosition {
+                        id: 2,
+                        char_index: 5
+                    }, // unchanged
+                    CursorPosition {
+                        id: 0,
+                        char_index: 9
+                    }, // before "really"
+                    CursorPosition {
+                        id: 1,
+                        char_index: 23
+                    }, // inside of "s|ample" because "text" got replaced by "sample"
+                    CursorPosition {
+                        id: 3,
+                        char_index: 31
+                    }, // before "for"
+                ]
+            )
+        );
+    }
+
     #[test_matrix( [
         "pride_and_prejudice.txt",
         "romeo_and_juliet.txt",
@@ -200,7 +385,7 @@ mod test {
         let files = [file_name_1, file_name_2, file_name_3];
         let permutations = [range_1, range_2, range_3];
 
-        let root = Path::new("test/resources/");
+        let root = Path::new("tests/resources/");
 
         let contents = files
             .iter()
diff --git a/backend/reconcile/src/operation_transformation/cursor.rs b/backend/reconcile/src/operation_transformation/cursor.rs
new file mode 100644
index 00000000..c17f560c
--- /dev/null
+++ b/backend/reconcile/src/operation_transformation/cursor.rs
@@ -0,0 +1,68 @@
+use std::borrow::Cow;
+
+#[cfg(feature = "serde")]
+use serde::{Deserialize, Serialize};
+
+use super::merge_context::MergeContext;
+use crate::operation_transformation::Operation;
+
+// CursorPosition represents the position of an identifiable cursor in a text
+// document based on its (UTF-8) character index.
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[derive(Debug, Clone, PartialEq, Default)]
+pub struct CursorPosition {
+    pub id: usize,
+    pub char_index: usize,
+}
+
+impl CursorPosition {
+    #[must_use]
+    pub fn apply_merge_context<T>(&self, context: &MergeContext<T>) -> Self
+    where
+        T: PartialEq + Clone + std::fmt::Debug,
+    {
+        let char_index = match context.last_operation() {
+            Some(Operation::Delete { index, .. }) => (*index) as i64,
+            _ => self.char_index as i64 + context.shift,
+        };
+
+        CursorPosition {
+            id: self.id,
+            char_index: char_index.max(0) as usize,
+        }
+    }
+}
+
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[derive(Debug, Clone, PartialEq, Default)]
+pub struct TextWithCursors<'a> {
+    pub text: Cow<'a, str>,
+    pub cursors: Vec<CursorPosition>,
+}
+
+impl<'a> TextWithCursors<'a> {
+    #[must_use]
+    pub fn new(text: &'a str, cursors: Vec<CursorPosition>) -> Self {
+        Self {
+            text: text.into(),
+            cursors,
+        }
+    }
+
+    #[must_use]
+    pub fn new_owned(text: String, cursors: Vec<CursorPosition>) -> Self {
+        Self {
+            text: text.into(),
+            cursors,
+        }
+    }
+}
+
+impl<'a> From<&'a str> for TextWithCursors<'a> {
+    fn from(text: &'a str) -> Self {
+        Self {
+            text: text.into(),
+            cursors: Vec::new(),
+        }
+    }
+}
diff --git a/backend/reconcile/src/operation_transformation/edited_text.rs b/backend/reconcile/src/operation_transformation/edited_text.rs
index 8a7013e4..8fc2ed96 100644
--- a/backend/reconcile/src/operation_transformation/edited_text.rs
+++ b/backend/reconcile/src/operation_transformation/edited_text.rs
@@ -3,7 +3,7 @@ use core::iter;
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
 
-use super::Operation;
+use super::{CursorPosition, Operation, TextWithCursors};
 use crate::{
     diffs::{myers::diff, raw_operation::RawOperation},
     operation_transformation::merge_context::MergeContext,
@@ -29,6 +29,7 @@ where
 {
     text: &'a str,
     operations: Vec<OrderedOperation<T>>,
+    pub(crate) cursors: Vec<CursorPosition>,
 }
 
 impl<'a> EditedText<'a, String> {
@@ -39,7 +40,7 @@ impl<'a> EditedText<'a, String> {
     /// word tokenizer is used to tokenize the text which splits the text on
     /// whitespaces.
     #[must_use]
-    pub fn from_strings(original: &'a str, updated: &str) -> Self {
+    pub fn from_strings(original: &'a str, updated: TextWithCursors<'a>) -> Self {
         Self::from_strings_with_tokenizer(original, updated, &word_tokenizer)
     }
 }
@@ -55,17 +56,18 @@ where
     /// function is used to tokenize the text.
     pub fn from_strings_with_tokenizer(
         original: &'a str,
-        updated: &str,
+        updated: TextWithCursors<'a>,
         tokenizer: &Tokenizer<T>,
     ) -> Self {
         let original_tokens = (tokenizer)(original);
-        let updated_tokens = (tokenizer)(updated);
+        let updated_tokens = (tokenizer)(&updated.text);
 
         let diff: Vec<RawOperation<T>> = diff(&original_tokens, &updated_tokens);
 
         Self::new(
             original,
             Self::cook_operations(Self::elongate_operations(diff)).collect(),
+            updated.cursors,
         )
     }
 
@@ -170,7 +172,11 @@ where
     /// Create a new `EditedText` with the given operations.
     /// The operations must be in the order in which they are meant to be
     /// applied. The operations must not overlap.
-    fn new(text: &'a str, operations: Vec<OrderedOperation<T>>) -> Self {
+    fn new(
+        text: &'a str,
+        operations: Vec<OrderedOperation<T>>,
+        mut cursors: Vec<CursorPosition>,
+    ) -> Self {
         operations
             .iter()
             .zip(operations.iter().skip(1))
@@ -183,7 +189,13 @@ where
                 );
             });
 
-        Self { text, operations }
+        cursors.sort_by_key(|cursor| cursor.char_index);
+
+        Self {
+            text,
+            operations,
+            cursors,
+        }
     }
 
     #[must_use]
@@ -196,50 +208,110 @@ where
         let mut left_merge_context = MergeContext::default();
         let mut right_merge_context = MergeContext::default();
 
-        Self::new(
-            self.text,
-            self.operations
-                .into_iter()
-                .map(|op| (op, Side::Left))
-                .merge_sorted_by_key(
-                    other.operations.into_iter().map(|op| (op, Side::Right)),
-                    |(operation, _)| {
-                        (
-                            operation.order,
-                            // Operations on the left and right must come in the same order so that
-                            // inserts can be merged with other inserts and deletes with deletes.
-                            usize::from(matches!(operation.operation, Operation::Delete { .. })),
-                            // Make sure that the ordering is deterministic regardless which text
-                            // is left or right.
-                            match &operation.operation {
-                                Operation::Insert { text, .. } => text
-                                    .iter()
-                                    .map(super::super::tokenizer::token::Token::original)
-                                    .collect::<String>(),
-                                Operation::Delete {
-                                    deleted_character_count,
-                                    ..
-                                } => deleted_character_count.to_string(),
-                            },
+        let mut merged_cursors = Vec::with_capacity(self.cursors.len() + other.cursors.len());
+        let mut left_cursors = self.cursors.iter().peekable();
+        let mut right_cursors = other.cursors.iter().peekable();
+
+        let merged_operations = self
+            .operations
+            .into_iter()
+            // The current text is always the left; the other operation is the right side.
+            .map(|op| (op, Side::Left))
+            .merge_sorted_by_key(
+                other.operations.into_iter().map(|op| (op, Side::Right)),
+                |(operation, _)| {
+                    (
+                        operation.order,
+                        // Operations on the left and right must come in the same order so that
+                        // inserts can be merged with other inserts and deletes with deletes.
+                        usize::from(matches!(operation.operation, Operation::Delete { .. })),
+                        // Make sure that the ordering is deterministic regardless which text
+                        // is left or right.
+                        match &operation.operation {
+                            Operation::Insert { text, .. } => text
+                                .iter()
+                                .map(super::super::tokenizer::token::Token::original)
+                                .collect::<String>(),
+                            Operation::Delete {
+                                deleted_character_count,
+                                ..
+                            } => deleted_character_count.to_string(),
+                        },
+                    )
+                },
+            )
+            .flat_map(|(OrderedOperation { order, operation }, side)| {
+                match side {
+                    Side::Left => {
+                        while let Some(cursor) = left_cursors
+                            .next_if(|cursor| cursor.char_index <= operation.start_index())
+                        {
+                            right_merge_context.consume_last_operation_if_it_is_too_behind(
+                                cursor.char_index as i64,
+                            );
+                            merged_cursors.push(cursor.apply_merge_context(&right_merge_context));
+                        }
+
+                        while let Some(cursor) = right_cursors.next_if(|cursor| {
+                            cursor.char_index as i64
+                                <= operation.start_index() as i64 + right_merge_context.shift
+                                    - left_merge_context.shift
+                        }) {
+                            left_merge_context.consume_last_operation_if_it_is_too_behind(
+                                cursor.char_index as i64,
+                            );
+                            merged_cursors.push(cursor.apply_merge_context(&left_merge_context));
+                        }
+
+                        operation.merge_operations_with_context(
+                            &mut right_merge_context,
+                            &mut left_merge_context,
                         )
-                    },
-                )
-                .flat_map(|(OrderedOperation { order, operation }, side)| {
-                    match side {
-                        Side::Left => operation.merge_operations_with_context(
-                            &mut right_merge_context,
-                            &mut left_merge_context,
-                        ),
-                        Side::Right => operation.merge_operations_with_context(
-                            &mut left_merge_context,
-                            &mut right_merge_context,
-                        ),
                     }
-                    .map(|operation| OrderedOperation { order, operation })
-                    .into_iter()
-                })
-                .collect(),
-        )
+                    Side::Right => {
+                        while let Some(cursor) = right_cursors
+                            .next_if(|cursor| cursor.char_index <= operation.start_index())
+                        {
+                            left_merge_context.consume_last_operation_if_it_is_too_behind(
+                                cursor.char_index as i64,
+                            );
+                            merged_cursors.push(cursor.apply_merge_context(&left_merge_context));
+                        }
+
+                        while let Some(cursor) = left_cursors.next_if(|cursor| {
+                            cursor.char_index as i64
+                                <= operation.start_index() as i64 + left_merge_context.shift
+                                    - right_merge_context.shift
+                        }) {
+                            right_merge_context.consume_last_operation_if_it_is_too_behind(
+                                cursor.char_index as i64,
+                            );
+                            merged_cursors.push(cursor.apply_merge_context(&right_merge_context));
+                        }
+
+                        operation.merge_operations_with_context(
+                            &mut left_merge_context,
+                            &mut right_merge_context,
+                        )
+                    }
+                }
+                .map(|operation| OrderedOperation { order, operation })
+                .into_iter()
+            })
+            .collect();
+
+        for cursor in left_cursors {
+            right_merge_context
+                .consume_last_operation_if_it_is_too_behind(cursor.char_index as i64);
+            merged_cursors.push(cursor.apply_merge_context(&right_merge_context));
+        }
+
+        for cursor in right_cursors {
+            left_merge_context.consume_last_operation_if_it_is_too_behind(cursor.char_index as i64);
+            merged_cursors.push(cursor.apply_merge_context(&left_merge_context));
+        }
+
+        Self::new(self.text, merged_operations, merged_cursors)
     }
 
     /// Apply the operations to the text and return the resulting text.
@@ -268,7 +340,7 @@ mod tests {
         let left = "hello world! How are you?  Adam";
         let right = "Hello, my friend! How are you doing? Albert";
 
-        let operations = EditedText::from_strings(left, right);
+        let operations = EditedText::from_strings(left, right.into());
 
         insta::assert_debug_snapshot!(operations);
 
@@ -280,7 +352,7 @@ mod tests {
     fn test_calculate_operations_with_no_diff() {
         let text = "hello world!";
 
-        let operations = EditedText::from_strings(text, text);
+        let operations = EditedText::from_strings(text, text.into());
 
         assert_eq!(operations.operations.len(), 0);
 
@@ -296,8 +368,8 @@ mod tests {
         let right = "Hello world! How are you?";
         let expected = "Hello world! How are you? I'm Andras.";
 
-        let operations_1 = EditedText::from_strings(original, left);
-        let operations_2 = EditedText::from_strings(original, right);
+        let operations_1 = EditedText::from_strings(original, left.into());
+        let operations_2 = EditedText::from_strings(original, right.into());
 
         let operations = operations_1.merge(operations_2);
         assert_eq!(operations.apply(), expected);
diff --git a/backend/reconcile/src/operation_transformation/merge_context.rs b/backend/reconcile/src/operation_transformation/merge_context.rs
index 980389df..d45f08ad 100644
--- a/backend/reconcile/src/operation_transformation/merge_context.rs
+++ b/backend/reconcile/src/operation_transformation/merge_context.rs
@@ -2,7 +2,7 @@ use core::fmt::Debug;
 
 use crate::operation_transformation::Operation;
 
-#[derive(Clone)]
+#[derive(Clone, Debug)]
 pub struct MergeContext<T>
 where
     T: PartialEq + Clone + std::fmt::Debug,
@@ -23,26 +23,19 @@ where
     }
 }
 
-impl<T> Debug for MergeContext<T>
-where
-    T: PartialEq + Clone + std::fmt::Debug,
-{
-    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
-        f.debug_struct("MergeContext")
-            .field("last_operation", &self.last_operation)
-            .field("shift", &self.shift)
-            .finish()
-    }
-}
-
 impl<T> MergeContext<T>
 where
     T: PartialEq + Clone + std::fmt::Debug,
 {
     pub fn last_operation(&self) -> Option<&Operation<T>> { self.last_operation.as_ref() }
 
+    pub fn replace_last_operation(&mut self, operation: Option<Operation<T>>) {
+        self.last_operation = operation;
+    }
+
     /// Replace the last delete operation (if there was one) with a new one
-    /// while applying it to the shift.
+    /// while applying it to the `shift` in case the last operation
+    /// was a delete.
     pub fn consume_and_replace_last_operation(&mut self, operation: Option<Operation<T>>) {
         if let Some(Operation::Delete {
             deleted_character_count,
@@ -55,32 +48,22 @@ where
         self.last_operation = operation;
     }
 
-    pub fn replace_last_operation(&mut self, operation: Option<Operation<T>>) {
-        self.last_operation = operation;
-    }
-
     /// Remove the last operation (if there was one) in case it is behind the
-    /// threshold operation. This changes the shift in case the last operation
+    /// threshold operation. This updates the `shift` in case the last operation
     /// was a delete.
-    pub fn consume_last_operation_if_it_is_too_behind(
-        &mut self,
-        threshold_operation: &Operation<T>,
-    ) {
+    pub fn consume_last_operation_if_it_is_too_behind(&mut self, threshold_index: i64) {
         if let Some(last_operation) = self.last_operation.as_ref() {
             if let Operation::Delete {
                 deleted_character_count,
                 ..
             } = last_operation
             {
-                if threshold_operation.start_index() as i64 + self.shift
-                    > last_operation.end_index() as i64
-                {
+                if threshold_index + self.shift > last_operation.end_index() as i64 {
                     self.shift -= *deleted_character_count as i64;
                     self.last_operation = None;
                 }
             } else if let Operation::Insert { .. } = last_operation {
-                if threshold_operation.start_index() as i64 + self.shift
-                    - last_operation.len() as i64
+                if threshold_index + self.shift - last_operation.len() as i64
                     > last_operation.end_index() as i64
                 {
                     self.last_operation = None;
diff --git a/backend/reconcile/src/operation_transformation/operation.rs b/backend/reconcile/src/operation_transformation/operation.rs
index d0d285b0..68eab6ae 100644
--- a/backend/reconcile/src/operation_transformation/operation.rs
+++ b/backend/reconcile/src/operation_transformation/operation.rs
@@ -189,7 +189,7 @@ where
         affecting_context: &mut MergeContext<T>,
         produced_context: &mut MergeContext<T>,
     ) -> Option<Operation<T>> {
-        affecting_context.consume_last_operation_if_it_is_too_behind(&self);
+        affecting_context.consume_last_operation_if_it_is_too_behind(self.start_index() as i64);
         let operation = self.with_shifted_index(affecting_context.shift);
 
         match (operation, affecting_context.last_operation()) {
diff --git a/backend/reconcile/src/operation_transformation/snapshots/reconcile__operation_transformation__edited_text__tests__calculate_operations.snap b/backend/reconcile/src/operation_transformation/snapshots/reconcile__operation_transformation__edited_text__tests__calculate_operations.snap
index 0630f986..f08083f4 100644
--- a/backend/reconcile/src/operation_transformation/snapshots/reconcile__operation_transformation__edited_text__tests__calculate_operations.snap
+++ b/backend/reconcile/src/operation_transformation/snapshots/reconcile__operation_transformation__edited_text__tests__calculate_operations.snap
@@ -23,4 +23,5 @@ EditedText {
             operation: <delete ' you?  Adam' from index 43>,
         },
     ],
+    cursors: [],
 }
diff --git a/backend/reconcile/src/utils/side.rs b/backend/reconcile/src/utils/side.rs
index bfeee2c4..825fa9e2 100644
--- a/backend/reconcile/src/utils/side.rs
+++ b/backend/reconcile/src/utils/side.rs
@@ -1,4 +1,16 @@
+use std::fmt::Display;
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum Side {
     Left,
     Right,
 }
+
+impl Display for Side {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Side::Left => write!(f, "Left"),
+            Side::Right => write!(f, "Right"),
+        }
+    }
+}
diff --git a/backend/reconcile/tests/example_document.rs b/backend/reconcile/tests/example_document.rs
new file mode 100644
index 00000000..75f5bdab
--- /dev/null
+++ b/backend/reconcile/tests/example_document.rs
@@ -0,0 +1,98 @@
+use std::{fs, path::Path};
+
+use pretty_assertions::assert_eq;
+use reconcile::{CursorPosition, TextWithCursors};
+use serde::Deserialize;
+
+/// `ExampleDocument` represents a test case for the reconciliation process.
+/// It contains a parent string, left and right strings with cursor positions,
+/// and the expected result after reconciliation.
+///
+/// '|' characters in the left, right, and expected strings are treated as
+/// cursor positions and are converted into `CursorPosition` objects.
+#[derive(Debug, Deserialize, Clone, PartialEq, Eq)]
+pub struct ExampleDocument {
+    parent: String,
+    left: String,
+    right: String,
+    expected: String,
+}
+
+impl ExampleDocument {
+    /// Creates a new `ExampleDocument` instance from a YAML file.
+    ///
+    /// # Panics
+    ///
+    /// If the file cannot be opened or parsed, the program will panic.
+    #[must_use]
+    pub fn from_yaml(path: &Path) -> Self {
+        let file = fs::File::open(path).expect("Failed to open example file");
+        serde_yaml::from_reader(file).expect("Failed to parse example file")
+    }
+
+    #[must_use]
+    pub fn parent(&self) -> String { self.parent.clone() }
+
+    #[must_use]
+    pub fn left(&self) -> TextWithCursors<'static> {
+        ExampleDocument::string_to_text_with_cursors(&self.left)
+    }
+
+    #[must_use]
+    pub fn right(&self) -> TextWithCursors<'static> {
+        ExampleDocument::string_to_text_with_cursors(&self.right)
+    }
+
+    /// Asserts that the result string matches the expected string,
+    /// including cursor positions.
+    ///
+    /// # Panics
+    ///
+    /// If the result string does not match the expected string, the program
+    /// will panic.
+    pub fn assert_eq(&self, result: &TextWithCursors<'static>) {
+        let result_str = ExampleDocument::text_with_cursors_to_string(result);
+        assert_eq!(result_str, self.expected);
+    }
+
+    /// Asserts that the result string matches the expected string,
+    /// ignoring cursor positions.
+    ///
+    /// # Panics
+    ///
+    /// If the result string does not match the expected string, the program
+    /// will panic.
+    pub fn assert_eq_without_cursors(&self, result: &str) {
+        assert_eq!(
+            result,
+            ExampleDocument::string_to_text_with_cursors(&self.expected).text,
+        );
+    }
+
+    fn text_with_cursors_to_string(text: &TextWithCursors<'_>) -> String {
+        let mut result = text.text.clone().into_owned();
+        for (i, cursor) in text.cursors.iter().enumerate() {
+            result.insert(cursor.char_index + i, '|');
+        }
+        result
+    }
+
+    fn string_to_text_with_cursors(text: &str) -> TextWithCursors<'static> {
+        let cursors = Self::parse_cursors(text);
+        let text = text.replace('|', "");
+        TextWithCursors::new_owned(text, cursors)
+    }
+
+    fn parse_cursors(text: &str) -> Vec<CursorPosition> {
+        let mut cursors = Vec::new();
+        for (i, c) in text.chars().enumerate() {
+            if c == '|' {
+                cursors.push(CursorPosition {
+                    id: 0,
+                    char_index: i - cursors.len(),
+                });
+            }
+        }
+        cursors
+    }
+}
diff --git a/backend/reconcile/tests/examples/1.yml b/backend/reconcile/tests/examples/1.yml
new file mode 100644
index 00000000..ce90f51f
--- /dev/null
+++ b/backend/reconcile/tests/examples/1.yml
@@ -0,0 +1,6 @@
+# The `|` characters denote cursor positions which are stripped before the actual reconcile logic is run
+---
+parent: You're Annual Savings Statement is available in our online portal
+left: Your| annual record is available in our online portal|
+right: You're Annual Savings information| is available online
+expected: Your| annual record information| is available online|
diff --git a/backend/reconcile/tests/examples/10.yml b/backend/reconcile/tests/examples/10.yml
new file mode 100644
index 00000000..0ee73838
--- /dev/null
+++ b/backend/reconcile/tests/examples/10.yml
@@ -0,0 +1,4 @@
+parent: marketplace
+left: market| place
+right: market|space
+expected: market| placemarket|space
diff --git a/backend/reconcile/tests/examples/11.yml b/backend/reconcile/tests/examples/11.yml
new file mode 100644
index 00000000..d576c04d
--- /dev/null
+++ b/backend/reconcile/tests/examples/11.yml
@@ -0,0 +1,4 @@
+parent: Please remember to bring your laptop and charger
+left: Please remember to bring your laptop|
+right: Please remember to bring your |new |laptop and charger
+expected: Please remember to bring your |new |laptop|
diff --git a/backend/reconcile/tests/examples/12.yml b/backend/reconcile/tests/examples/12.yml
new file mode 100644
index 00000000..879b398f
--- /dev/null
+++ b/backend/reconcile/tests/examples/12.yml
@@ -0,0 +1,4 @@
+parent: Party A shall pay Party B
+left: Party C shall pay Party B
+right: Party A shall receive from Party B
+expected: Party C shall receive from Party B
diff --git a/backend/reconcile/tests/examples/13.yml b/backend/reconcile/tests/examples/13.yml
new file mode 100644
index 00000000..e12c635b
--- /dev/null
+++ b/backend/reconcile/tests/examples/13.yml
@@ -0,0 +1,4 @@
+parent: Please submit your assignment by Friday
+left: Please submit your |completed |assignment by Friday
+right: Please submit your assignment |online |by Friday
+expected: Please submit your |completed |assignment |online |by Friday
diff --git a/backend/reconcile/tests/examples/2.yml b/backend/reconcile/tests/examples/2.yml
new file mode 100644
index 00000000..77a03755
--- /dev/null
+++ b/backend/reconcile/tests/examples/2.yml
@@ -0,0 +1,4 @@
+parent:
+left: hi my friend|
+right: hi there|
+expected: hi my friend| there|
diff --git a/backend/reconcile/tests/examples/3.yml b/backend/reconcile/tests/examples/3.yml
new file mode 100644
index 00000000..8e2dd222
--- /dev/null
+++ b/backend/reconcile/tests/examples/3.yml
@@ -0,0 +1,4 @@
+parent: Buy milk and eggs
+left: Buy organic milk| and eggs|
+right: Buy milk and eggs| and bread
+expected: Buy organic milk| and eggs|| and bread
diff --git a/backend/reconcile/tests/examples/4.yml b/backend/reconcile/tests/examples/4.yml
new file mode 100644
index 00000000..f06d3287
--- /dev/null
+++ b/backend/reconcile/tests/examples/4.yml
@@ -0,0 +1,4 @@
+parent: Meeting at 2pm in 会议室
+left: Meeting at |3pm in the 会议室
+right: Team meeting at 2pm in conference room|
+expected: Team meeting at |3pm in conference room| the
diff --git a/backend/reconcile/tests/examples/5.yml b/backend/reconcile/tests/examples/5.yml
new file mode 100644
index 00000000..aac8a98c
--- /dev/null
+++ b/backend/reconcile/tests/examples/5.yml
@@ -0,0 +1,4 @@
+parent: Send the report to the team
+left: Send the |detailed |report to the |entire |team
+right: Send the |quarterly |detailed |report to the team
+expected: Send the |detailed |quarterly |detailed ||report to the |entire |team
diff --git a/backend/reconcile/tests/examples/6.yml b/backend/reconcile/tests/examples/6.yml
new file mode 100644
index 00000000..16d25fb2
--- /dev/null
+++ b/backend/reconcile/tests/examples/6.yml
@@ -0,0 +1,4 @@
+parent: Ready, Set go
+left: Ready! Set go|
+right: Ready, Set, go!|
+expected: Ready! Set, go!||
diff --git a/backend/reconcile/tests/examples/7.yml b/backend/reconcile/tests/examples/7.yml
new file mode 100644
index 00000000..579e9271
--- /dev/null
+++ b/backend/reconcile/tests/examples/7.yml
@@ -0,0 +1,4 @@
+parent: "Total: $100"
+left: "Total: |$150"
+right: "Total: |€100"
+expected: "Total: |$150 |€100"
diff --git a/backend/reconcile/tests/examples/8.yml b/backend/reconcile/tests/examples/8.yml
new file mode 100644
index 00000000..6c316ef6
--- /dev/null
+++ b/backend/reconcile/tests/examples/8.yml
@@ -0,0 +1,4 @@
+parent: Start middle end
+left: Start [important] middle end|
+right: Start middle [critical] end|
+expected: Start [important] middle [critical] end||
diff --git a/backend/reconcile/tests/examples/9.yml b/backend/reconcile/tests/examples/9.yml
new file mode 100644
index 00000000..6f534b76
--- /dev/null
+++ b/backend/reconcile/tests/examples/9.yml
@@ -0,0 +1,4 @@
+parent: A B C D
+left: A X B D|
+right: A B Y|
+expected: A X B Y||
diff --git a/backend/reconcile/test/resources/kun_lu.txt b/backend/reconcile/tests/resources/kun_lu.txt
similarity index 100%
rename from backend/reconcile/test/resources/kun_lu.txt
rename to backend/reconcile/tests/resources/kun_lu.txt
diff --git a/backend/reconcile/test/resources/pride_and_prejudice.txt b/backend/reconcile/tests/resources/pride_and_prejudice.txt
similarity index 100%
rename from backend/reconcile/test/resources/pride_and_prejudice.txt
rename to backend/reconcile/tests/resources/pride_and_prejudice.txt
diff --git a/backend/reconcile/test/resources/romeo_and_juliet.txt b/backend/reconcile/tests/resources/romeo_and_juliet.txt
similarity index 100%
rename from backend/reconcile/test/resources/romeo_and_juliet.txt
rename to backend/reconcile/tests/resources/romeo_and_juliet.txt
diff --git a/backend/reconcile/test/resources/room_with_a_view.txt b/backend/reconcile/tests/resources/room_with_a_view.txt
similarity index 100%
rename from backend/reconcile/test/resources/room_with_a_view.txt
rename to backend/reconcile/tests/resources/room_with_a_view.txt
diff --git a/backend/reconcile/tests/test.rs b/backend/reconcile/tests/test.rs
new file mode 100644
index 00000000..1139dc16
--- /dev/null
+++ b/backend/reconcile/tests/test.rs
@@ -0,0 +1,46 @@
+mod example_document;
+use std::{fs, path::Path};
+
+use example_document::ExampleDocument;
+use reconcile::{reconcile, reconcile_with_cursors};
+
+#[test]
+fn test_with_examples() {
+    let examples_dir = Path::new("tests/examples");
+    let mut entries = fs::read_dir(examples_dir)
+        .expect("Failed to read examples directory")
+        .collect::<Vec<_>>();
+
+    entries.sort_by_key(|entry| {
+        let path = entry
+            .as_ref()
+            .expect("Failed to read directory entry")
+            .path();
+        path.file_name()
+            .and_then(|name| name.to_str())
+            .and_then(|name| name.split('.').next().unwrap().parse::<i32>().ok())
+            .unwrap_or_default()
+    });
+
+    for entry in entries {
+        let entry = entry.expect("Failed to read directory entry");
+        let path = entry.path();
+
+        if path.is_file() && path.extension().and_then(|ext| ext.to_str()) == Some("yml") {
+            let doc = ExampleDocument::from_yaml(&path);
+            println!("Testing with example from {}", path.display());
+
+            doc.assert_eq_without_cursors(&reconcile(
+                &doc.parent(),
+                &doc.left().text,
+                &doc.right().text,
+            ));
+
+            doc.assert_eq(&reconcile_with_cursors(
+                &doc.parent(),
+                doc.left(),
+                doc.right(),
+            ));
+        }
+    }
+}
diff --git a/backend/sync_lib/src/cursor.rs b/backend/sync_lib/src/cursor.rs
new file mode 100644
index 00000000..2f7135eb
--- /dev/null
+++ b/backend/sync_lib/src/cursor.rs
@@ -0,0 +1,88 @@
+use wasm_bindgen::prelude::*;
+
+/// Wrapper type to expose `TextWithCursors` to JS.
+#[wasm_bindgen]
+#[derive(Debug, Clone, PartialEq)]
+pub struct TextWithCursors {
+    text: String,
+    cursors: Vec<CursorPosition>,
+}
+
+#[wasm_bindgen]
+impl TextWithCursors {
+    #[wasm_bindgen(constructor)]
+    #[must_use]
+    pub fn new(text: String, cursors: Vec<CursorPosition>) -> Self { Self { text, cursors } }
+
+    #[must_use]
+    pub fn text(&self) -> String { self.text.clone() }
+
+    #[must_use]
+    pub fn cursors(&self) -> Vec<CursorPosition> { self.cursors.clone() }
+}
+
+impl From<TextWithCursors> for reconcile::TextWithCursors<'_> {
+    fn from(owned: TextWithCursors) -> Self {
+        reconcile::TextWithCursors::new_owned(
+            owned.text.to_string(),
+            owned
+                .cursors
+                .into_iter()
+                .map(std::convert::Into::into)
+                .collect(),
+        )
+    }
+}
+
+impl From<reconcile::TextWithCursors<'_>> for TextWithCursors {
+    fn from(text_with_cursors: reconcile::TextWithCursors<'_>) -> Self {
+        TextWithCursors {
+            text: text_with_cursors.text.into_owned(),
+            cursors: text_with_cursors
+                .cursors
+                .into_iter()
+                .map(std::convert::Into::into)
+                .collect(),
+        }
+    }
+}
+
+/// Wrapper type to expose `CursorPosition` to JS.
+#[wasm_bindgen]
+#[derive(Debug, Clone, PartialEq)]
+pub struct CursorPosition {
+    id: usize,
+    char_index: usize,
+}
+
+#[wasm_bindgen]
+impl CursorPosition {
+    #[wasm_bindgen(constructor)]
+    #[must_use]
+    pub fn new(id: usize, char_index: usize) -> Self { Self { id, char_index } }
+
+    #[must_use]
+    pub fn id(&self) -> usize { self.id }
+
+    #[wasm_bindgen(js_name = characterPosition)]
+    #[must_use]
+    pub fn char_index(&self) -> usize { self.char_index }
+}
+
+impl From<CursorPosition> for reconcile::CursorPosition {
+    fn from(owned: CursorPosition) -> Self {
+        reconcile::CursorPosition {
+            id: owned.id,
+            char_index: owned.char_index,
+        }
+    }
+}
+
+impl From<reconcile::CursorPosition> for CursorPosition {
+    fn from(cursor: reconcile::CursorPosition) -> Self {
+        CursorPosition {
+            id: cursor.id,
+            char_index: cursor.char_index,
+        }
+    }
+}
diff --git a/backend/sync_lib/src/lib.rs b/backend/sync_lib/src/lib.rs
index 6f27e055..d2a54cf9 100644
--- a/backend/sync_lib/src/lib.rs
+++ b/backend/sync_lib/src/lib.rs
@@ -8,12 +8,15 @@
 //! # Modules
 //!
 //! - `errors`: Contains error types used in this crate.
+
 use core::str;
 
 use base64::{Engine as _, engine::general_purpose::STANDARD};
+use cursor::TextWithCursors;
 use errors::SyncLibError;
 use wasm_bindgen::prelude::*;
 
+pub mod cursor;
 pub mod errors;
 
 /// Encode binary data for easy transport over HTTP. Inverse of
@@ -93,7 +96,7 @@ pub fn merge(parent: &[u8], left: &[u8], right: &[u8]) -> Vec<u8> {
     }
 }
 
-/// WASM wrapper around `reconcile::reconcile` for text merging.
+/// WASM wrapper around `reconcile::reconcile` for merging text.
 #[wasm_bindgen(js_name = mergeText)]
 #[must_use]
 pub fn merge_text(parent: &str, left: &str, right: &str) -> String {
@@ -102,6 +105,19 @@ pub fn merge_text(parent: &str, left: &str, right: &str) -> String {
     reconcile::reconcile(parent, left, right)
 }
 
+/// WASM wrapper around `reconcile::reconcile_with_cursors` for merging text.
+#[wasm_bindgen(js_name = mergeTextWithCursors)]
+#[must_use]
+pub fn merge_text_with_cursors(
+    parent: &str,
+    left: TextWithCursors,
+    right: TextWithCursors,
+) -> TextWithCursors {
+    set_panic_hook();
+
+    reconcile::reconcile_with_cursors(parent, left.into(), right.into()).into()
+}
+
 /// Heuristically determine if the given data is a binary or a text file's
 /// content.
 #[wasm_bindgen(js_name = isBinary)]
diff --git a/backend/sync_lib/tests/web.rs b/backend/sync_lib/tests/web.rs
index e45cbea6..cf82aa7e 100644
--- a/backend/sync_lib/tests/web.rs
+++ b/backend/sync_lib/tests/web.rs
@@ -1,5 +1,8 @@
 use insta::assert_debug_snapshot;
-use sync_lib::*;
+use sync_lib::{
+    cursor::{CursorPosition, TextWithCursors},
+    *,
+};
 use wasm_bindgen_test::*;
 
 #[wasm_bindgen_test(unsupported = test)]
@@ -23,11 +26,44 @@ fn test_base64_to_bytes_error() {
 }
 
 #[wasm_bindgen_test(unsupported = test)]
-fn merge_text() {
+fn test_merge() {
     let left = b"hello ";
     let right = b"world";
     let result = merge(b"", left, right);
     assert_eq!(result, b"hello world");
+
+    let left = b"\0binary";
+    let right = b"other";
+    let result = merge(b"", left, right);
+    assert_eq!(result, right);
+}
+
+#[wasm_bindgen_test(unsupported = test)]
+fn test_merge_text() {
+    let left = "hello ";
+    let right = "world";
+    let result = merge_text("", left, right);
+    assert_eq!(result, "hello world");
+}
+
+#[wasm_bindgen_test(unsupported = test)]
+fn test_merge_text_with_cursors() {
+    let result = merge_text_with_cursors(
+        "hi",
+        TextWithCursors::new("hi world".to_owned(), vec![]),
+        TextWithCursors::new(
+            "hi".to_owned(),
+            vec![CursorPosition::new(0, 1), CursorPosition::new(1, 2)],
+        ),
+    );
+
+    assert_eq!(
+        result,
+        TextWithCursors::new(
+            "hi world".to_owned(),
+            vec![CursorPosition::new(0, 1), CursorPosition::new(1, 2)]
+        ),
+    );
 }
 
 #[wasm_bindgen_test(unsupported = test)]
diff --git a/backend/sync_server/src/server/auth.rs b/backend/sync_server/src/server/auth.rs
index 06bfe5db..7a7d2197 100644
--- a/backend/sync_server/src/server/auth.rs
+++ b/backend/sync_server/src/server/auth.rs
@@ -1,3 +1,5 @@
+use log::info;
+
 use crate::{
     app_state::{AppState, database::models::VaultId},
     config::user_config::{AllowListedVaults, User, VaultAccess},
@@ -13,10 +15,16 @@ pub fn auth(app_state: &AppState, token: &str, vault: &VaultId) -> Result<User,
         .cloned()
         .ok_or_else(|| unauthenticated_error(anyhow::anyhow!("Invalid token")))?;
 
+    info!("User `{}` authenticated", user.name);
+
     if match user.vault_access {
         VaultAccess::AllowAccessToAll => true,
         VaultAccess::AllowList(AllowListedVaults { ref allowed }) => allowed.contains(vault),
     } {
+        info!(
+            "User `{}` is authorised to access to vault `{}`",
+            user.name, vault
+        );
         Ok(user)
     } else {
         Err(permission_denied_error(anyhow::anyhow!(
diff --git a/frontend/obsidian-plugin/jest.config.js b/frontend/obsidian-plugin/jest.config.js
new file mode 100644
index 00000000..8c1027ee
--- /dev/null
+++ b/frontend/obsidian-plugin/jest.config.js
@@ -0,0 +1,3 @@
+module.exports = {
+	preset: "ts-jest/presets/js-with-babel-esm"
+};
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index 749941aa..d54690e4 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -6,7 +6,7 @@
 	"scripts": {
 		"dev": "webpack watch --mode development",
 		"build": "webpack --mode production",
-		"test": "jest --passWithNoTests",
+		"test": "jest",
 		"version": "node version-bump.mjs"
 	},
 	"keywords": [],
@@ -36,4 +36,4 @@
 		"webpack": "^5.98.0",
 		"webpack-cli": "^6.0.1"
 	}
-}
+}
\ No newline at end of file
diff --git a/frontend/obsidian-plugin/src/obsidian-file-system.ts b/frontend/obsidian-plugin/src/obsidian-file-system.ts
index 24e06af9..60c49328 100644
--- a/frontend/obsidian-plugin/src/obsidian-file-system.ts
+++ b/frontend/obsidian-plugin/src/obsidian-file-system.ts
@@ -1,6 +1,12 @@
 import type { Stat, Vault, Workspace } from "obsidian";
 import { MarkdownView, normalizePath } from "obsidian";
-import type { FileSystemOperations, RelativePath } from "sync-client";
+import type {
+	FileSystemOperations,
+	RelativePath,
+	TextWithCursors
+} from "sync-client";
+import { lineAndColumnToPosition } from "./utils/line-and-column-to-position";
+import { positionToLineAndColumn } from "./utils/position-to-line-and-column";
 
 export class ObsidianFileSystemOperations implements FileSystemOperations {
 	public constructor(
@@ -42,20 +48,50 @@ export class ObsidianFileSystemOperations implements FileSystemOperations {
 
 	public async atomicUpdateText(
 		path: RelativePath,
-		updater: (currentContent: string) => string
+		updater: (current: TextWithCursors) => TextWithCursors
 	): Promise<string> {
 		path = normalizePath(path);
 
 		const view = this.workspace.getActiveViewOfType(MarkdownView);
+
 		if (view?.file?.path === path) {
-			const result = updater(view.editor.getValue());
-			const position = view.editor.getCursor();
-			view.editor.setValue(result);
-			view.editor.setCursor(position);
-			return result;
+			const cursor = view.editor.getCursor();
+			const text = view.editor.getValue();
+			const result = updater({
+				text,
+				cursors: [
+					{
+						id: 0,
+						characterPosition: lineAndColumnToPosition(
+							text,
+							cursor.line,
+							cursor.ch
+						)
+					}
+				]
+			});
+
+			view.editor.setValue(result.text);
+
+			result.cursors.forEach((movedCursor) => {
+				const { line, column } = positionToLineAndColumn(
+					result.text,
+					movedCursor.characterPosition
+				);
+				view.editor.setCursor(line, column);
+			});
+
+			return result.text;
 		}
 
-		return this.vault.adapter.process(path, updater);
+		return this.vault.adapter.process(
+			path,
+			(text) =>
+				updater({
+					text,
+					cursors: []
+				}).text
+		);
 	}
 
 	public async getFileSize(path: RelativePath): Promise<number> {
diff --git a/frontend/obsidian-plugin/src/utils/line-and-column-to-position.test.ts b/frontend/obsidian-plugin/src/utils/line-and-column-to-position.test.ts
new file mode 100644
index 00000000..b98f66e5
--- /dev/null
+++ b/frontend/obsidian-plugin/src/utils/line-and-column-to-position.test.ts
@@ -0,0 +1,43 @@
+import { lineAndColumnToPosition } from "./line-and-column-to-position";
+
+describe("lineAndColumnToPosition", () => {
+	it("should return the correct position for the first line", () => {
+		const text = "Hello\nWorld";
+		const position = lineAndColumnToPosition(text, 0, 3);
+		expect(position).toBe(3);
+	});
+
+	it("should return the correct position for the second line", () => {
+		const text = "Hello\nWorld";
+		const position = lineAndColumnToPosition(text, 1, 2);
+		expect(position).toBe(8);
+	});
+
+	it("should return the correct position for an empty string", () => {
+		const text = "";
+		const position = lineAndColumnToPosition(text, 0, 0);
+		expect(position).toBe(0);
+	});
+
+	it("should handle a single-line string correctly", () => {
+		const text = "SingleLine";
+		const position = lineAndColumnToPosition(text, 0, 5);
+		expect(position).toBe(5);
+	});
+
+	it("should handle multi-line strings with varying lengths", () => {
+		const text = "Line1\nLongerLine2\nShort3";
+		const position = lineAndColumnToPosition(text, 2, 4);
+		expect(position).toBe(22);
+	});
+
+	it("should throw an error if the line number is out of range", () => {
+		const text = "Line1\nLine2";
+		expect(() => lineAndColumnToPosition(text, 3, 0)).toThrow();
+	});
+
+	it("should throw an error if the column number is out of range", () => {
+		const text = "Line1\nLine2";
+		expect(() => lineAndColumnToPosition(text, 1, 10)).toThrow();
+	});
+});
diff --git a/frontend/obsidian-plugin/src/utils/line-and-column-to-position.ts b/frontend/obsidian-plugin/src/utils/line-and-column-to-position.ts
new file mode 100644
index 00000000..0bc114c7
--- /dev/null
+++ b/frontend/obsidian-plugin/src/utils/line-and-column-to-position.ts
@@ -0,0 +1,34 @@
+/**
+ * Converts line and column coordinates to an absolute character position in a text string.
+ *
+ * @param line - The zero-based line number
+ * @param column - The zero-based column number
+ * @param text - The text string to calculate position in
+ * @returns The absolute character position (zero-based index) in the text string
+ * @throws Error if line number is out of range
+ * @throws Error if column number is out of range
+ */
+export function lineAndColumnToPosition(
+	text: string,
+	line: number,
+	column: number
+): number {
+	const lines = text.split("\n");
+
+	if (line >= lines.length) {
+		throw new Error(`Line number ${line} is out of range.`);
+	}
+
+	if (column > lines[line].length) {
+		throw new Error(`Column number ${column} is out of range.`);
+	}
+
+	let position = 0;
+	for (let i = 0; i < line; i++) {
+		position += lines[i].length + 1;
+	}
+
+	position += column;
+
+	return position;
+}
diff --git a/frontend/obsidian-plugin/src/utils/position-to-line-and-column.test.ts b/frontend/obsidian-plugin/src/utils/position-to-line-and-column.test.ts
new file mode 100644
index 00000000..e5d3bac5
--- /dev/null
+++ b/frontend/obsidian-plugin/src/utils/position-to-line-and-column.test.ts
@@ -0,0 +1,69 @@
+import { positionToLineAndColumn } from "./position-to-line-and-column";
+
+describe("positionToLineAndColumn", () => {
+	test("converts position to line and column in a single line text", () => {
+		const text = "Hello, world!";
+		expect(positionToLineAndColumn(text, 0)).toEqual({
+			line: 0,
+			column: 1
+		});
+		expect(positionToLineAndColumn(text, 7)).toEqual({
+			line: 0,
+			column: 8
+		});
+		expect(positionToLineAndColumn(text, 12)).toEqual({
+			line: 0,
+			column: 13
+		});
+	});
+
+	test("converts position to line and column in multi-line text", () => {
+		const text = "First line\nSecond line\nThird line";
+		expect(positionToLineAndColumn(text, 0)).toEqual({
+			line: 0,
+			column: 1
+		});
+		expect(positionToLineAndColumn(text, 10)).toEqual({
+			line: 0,
+			column: 11
+		});
+		expect(positionToLineAndColumn(text, 15)).toEqual({
+			line: 1,
+			column: 5
+		});
+		expect(positionToLineAndColumn(text, 26)).toEqual({
+			line: 2,
+			column: 4
+		});
+	});
+
+	test("handles positions at line breaks", () => {
+		const text = "Line\nBreak";
+		expect(positionToLineAndColumn(text, 4)).toEqual({
+			line: 0,
+			column: 5
+		});
+		expect(positionToLineAndColumn(text, 5)).toEqual({
+			line: 1,
+			column: 1
+		});
+	});
+
+	test("handles empty input", () => {
+		expect(positionToLineAndColumn("", 0)).toEqual({ line: 0, column: 1 });
+	});
+
+	test("handles positions at the end of text", () => {
+		const text = "End";
+		expect(positionToLineAndColumn(text, 3)).toEqual({
+			line: 0,
+			column: 4
+		});
+	});
+
+	test("throws error for position out of range", () => {
+		const text = "Short text";
+		expect(() => positionToLineAndColumn(text, 15)).toThrow();
+		expect(() => positionToLineAndColumn(text, -1)).toThrow();
+	});
+});
diff --git a/frontend/obsidian-plugin/src/utils/position-to-line-and-column.ts b/frontend/obsidian-plugin/src/utils/position-to-line-and-column.ts
new file mode 100644
index 00000000..a9c81881
--- /dev/null
+++ b/frontend/obsidian-plugin/src/utils/position-to-line-and-column.ts
@@ -0,0 +1,30 @@
+/**
+ * Converts a character position in text to line and column numbers.
+ *
+ * @param text The text content to analyze
+ * @param position The character position to convert
+ * @returns An object containing line and column numbers (0-based index for line, 1-based index for column)
+ * @throws Will throw an error if the position is negative or exceeds the text length
+ */
+export function positionToLineAndColumn(
+	text: string,
+	position: number
+): { line: number; column: number } {
+	if (position < 0) {
+		throw new Error("Position cannot be negative");
+	}
+
+	if (position > text.length) {
+		throw new Error(
+			`Position ${position} exceeds text length ${text.length}`
+		);
+	}
+
+	const textUpToPosition = text.substring(0, position);
+	const lines = textUpToPosition.split("\n");
+
+	const line = lines.length - 1; // 0-based index
+	const column = lines[lines.length - 1].length + 1; // 1-based index
+
+	return { line, column };
+}
diff --git a/frontend/sync-client/src/file-operations/file-operations.test.ts b/frontend/sync-client/src/file-operations/file-operations.test.ts
index 4f7dd491..2529bab2 100644
--- a/frontend/sync-client/src/file-operations/file-operations.test.ts
+++ b/frontend/sync-client/src/file-operations/file-operations.test.ts
@@ -6,7 +6,10 @@ import type {
 import { FileOperations } from "./file-operations";
 import { Logger } from "../tracing/logger";
 import { assertSetContainsExactly } from "../utils/assert-set-contains-exactly";
-import type { FileSystemOperations } from "./filesystem-operations";
+import type {
+	FileSystemOperations,
+	TextWithCursors
+} from "./filesystem-operations";
 import init, { base64ToBytes } from "sync_lib";
 import fs from "fs";
 
@@ -43,7 +46,7 @@ class FakeFileSystemOperations implements FileSystemOperations {
 	}
 	public async atomicUpdateText(
 		_path: RelativePath,
-		_updater: (currentContent: string) => string
+		_updater: (current: TextWithCursors) => TextWithCursors
 	): Promise<string> {
 		throw new Error("Method not implemented.");
 	}
diff --git a/frontend/sync-client/src/file-operations/file-operations.ts b/frontend/sync-client/src/file-operations/file-operations.ts
index 6cac74f3..e6e42c9d 100644
--- a/frontend/sync-client/src/file-operations/file-operations.ts
+++ b/frontend/sync-client/src/file-operations/file-operations.ts
@@ -1,7 +1,16 @@
 import type { Logger } from "../tracing/logger";
-import type { FileSystemOperations } from "./filesystem-operations";
+import type {
+	FileSystemOperations,
+	TextWithCursors
+} from "./filesystem-operations";
 import type { Database, RelativePath } from "../persistence/database";
-import { isBinary, isFileTypeMergable, mergeText } from "sync_lib";
+import {
+	CursorPosition,
+	isBinary,
+	isFileTypeMergable,
+	mergeTextWithCursors,
+	TextWithCursors as RustTextWithCursors
+} from "sync_lib";
 import { SafeFileSystemOperations } from "./safe-filesystem-operations";
 
 export class FileOperations {
@@ -90,18 +99,45 @@ export class FileOperations {
 		const expectedText = new TextDecoder().decode(expectedContent); // this comes from a previous read which must only have \n line endings
 		const newText = new TextDecoder().decode(newContent); // this comes from the server which stores text with \n line endings
 
-		await this.fs.atomicUpdateText(path, (currentText) => {
-			currentText = currentText.replace(this.nativeLineEndings, "\n");
+		await this.fs.atomicUpdateText(
+			path,
+			({ text, cursors }: TextWithCursors): TextWithCursors => {
+				text = text.replace(this.nativeLineEndings, "\n");
 
-			this.logger.debug(
-				`Performing a 3-way merge for ${path} with the expected content`
-			);
+				this.logger.debug(
+					`Performing a 3-way merge for ${path} with the expected content`
+				);
 
-			return mergeText(expectedText, currentText, newText).replace(
-				"\n",
-				this.nativeLineEndings
-			);
-		});
+				const left = new RustTextWithCursors(
+					text,
+					cursors.map(
+						(cursor) =>
+							new CursorPosition(
+								cursor.id,
+								cursor.characterPosition
+							)
+					)
+				);
+				const right = new RustTextWithCursors(newText, []);
+				const merged = mergeTextWithCursors(expectedText, left, right);
+
+				const resultText = merged
+					.text()
+					.replace("\n", this.nativeLineEndings);
+
+				const resultCursors = merged.cursors().map((cursor) => ({
+					id: cursor.id(),
+					characterPosition: cursor.characterPosition()
+				}));
+
+				merged.free();
+
+				return {
+					text: resultText,
+					cursors: resultCursors
+				};
+			}
+		);
 	}
 
 	public async delete(path: RelativePath): Promise<void> {
diff --git a/frontend/sync-client/src/file-operations/filesystem-operations.ts b/frontend/sync-client/src/file-operations/filesystem-operations.ts
index 19d319ba..175490d4 100644
--- a/frontend/sync-client/src/file-operations/filesystem-operations.ts
+++ b/frontend/sync-client/src/file-operations/filesystem-operations.ts
@@ -1,5 +1,15 @@
 import type { RelativePath } from "../persistence/database";
 
+export interface Cursor {
+	id: number;
+	characterPosition: number;
+}
+
+export interface TextWithCursors {
+	text: string;
+	cursors: Cursor[];
+}
+
 export interface FileSystemOperations {
 	// List all files that should be synced.
 	listAllFiles: () => Promise<RelativePath[]>;
@@ -13,7 +23,7 @@ export interface FileSystemOperations {
 	// Atomically update the content of a text file.
 	atomicUpdateText: (
 		path: RelativePath,
-		updater: (currentContent: string) => string
+		updater: (current: TextWithCursors) => TextWithCursors
 	) => Promise<string>;
 
 	// Get the size of a file in bytes.
diff --git a/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts b/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
index 8b2a547a..433f1d75 100644
--- a/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
+++ b/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
@@ -1,5 +1,8 @@
 import type { RelativePath } from "../persistence/database";
-import type { FileSystemOperations } from "./filesystem-operations";
+import type {
+	FileSystemOperations,
+	TextWithCursors
+} from "./filesystem-operations";
 import type { Logger } from "../tracing/logger";
 import { Locks } from "../utils/locks";
 import { FileNotFoundError } from "./file-not-found-error";
@@ -44,7 +47,7 @@ export class SafeFileSystemOperations implements FileSystemOperations {
 
 	public async atomicUpdateText(
 		path: RelativePath,
-		updater: (currentContent: string) => string
+		updater: (current: TextWithCursors) => TextWithCursors
 	): Promise<string> {
 		this.logger.debug(`Atomically updating file '${path}'`);
 		return this.safeOperation(
diff --git a/frontend/sync-client/src/index.ts b/frontend/sync-client/src/index.ts
index 0a03d0ae..e5760ead 100644
--- a/frontend/sync-client/src/index.ts
+++ b/frontend/sync-client/src/index.ts
@@ -8,7 +8,11 @@ export { Logger, LogLevel, LogLine } from "./tracing/logger";
 export { type SyncSettings } from "./persistence/settings";
 export { rateLimit } from "./utils/rate-limit";
 export type { RelativePath, StoredDatabase } from "./persistence/database";
-export type { FileSystemOperations } from "./file-operations/filesystem-operations";
+export type {
+	FileSystemOperations,
+	TextWithCursors,
+	Cursor
+} from "./file-operations/filesystem-operations";
 export type { PersistenceProvider } from "./persistence/persistence";
 
 export type { NetworkConnectionStatus } from "./sync-client";
diff --git a/frontend/sync-client/src/sync-operations/syncer.ts b/frontend/sync-client/src/sync-operations/syncer.ts
index 7bad88e4..ec6b2288 100644
--- a/frontend/sync-client/src/sync-operations/syncer.ts
+++ b/frontend/sync-client/src/sync-operations/syncer.ts
@@ -266,6 +266,8 @@ export class Syncer {
 		wsUri.protocol = wsUri.protocol === "https" ? "wss" : "ws";
 		wsUri.pathname = `/vaults/${settings.vaultName}/ws`;
 
+		this.logger.info(`Connecting to WebSocket at ${wsUri.toString()}`);
+
 		if (
 			typeof globalThis !== "undefined" &&
 			typeof globalThis.WebSocket === "undefined"
@@ -288,6 +290,7 @@ export class Syncer {
 
 		// The JS WebSocket API doesn't support setting headers, so we have to send the token as a message
 		this.applyRemoteChangesWebSocket.onopen = (): void => {
+			this.logger.info("WebSocket connection opened");
 			this.applyRemoteChangesWebSocket?.send(settings.token);
 			this.webSocketStatusChangeListeners.forEach((listener) => {
 				listener();
@@ -476,7 +479,10 @@ export class Syncer {
 				.filter(
 					(remoteDocument) =>
 						allLocalFiles.includes(remoteDocument.relativePath) &&
-						!remoteDocument.isDeleted
+						!remoteDocument.isDeleted &&
+						this.database.getDocumentByDocumentId(
+							remoteDocument.documentId
+						) === undefined
 				)
 				.forEach((remoteDocument) => {
 					this.database.createNewEmptyDocument(
diff --git a/frontend/test-client/src/agent/mock-agent.ts b/frontend/test-client/src/agent/mock-agent.ts
index 945fd7dd..9939d53c 100644
--- a/frontend/test-client/src/agent/mock-agent.ts
+++ b/frontend/test-client/src/agent/mock-agent.ts
@@ -313,7 +313,10 @@ export class MockAgent extends MockClient {
 			`Decided to update file ${file} with ${content}`
 		);
 		this.doNotTouchWhileOffline.push(file);
-		await this.atomicUpdateText(file, (old) => old + ` ${content} `);
+		await this.atomicUpdateText(file, (old) => ({
+			text: old.text + ` ${content} `,
+			cursors: []
+		}));
 	}
 
 	private async deleteFileAction(files: RelativePath[]): Promise<void> {
diff --git a/frontend/test-client/src/agent/mock-client.ts b/frontend/test-client/src/agent/mock-client.ts
index 5aa3dd6c..29d808f8 100644
--- a/frontend/test-client/src/agent/mock-client.ts
+++ b/frontend/test-client/src/agent/mock-client.ts
@@ -1,4 +1,4 @@
-import type { StoredDatabase } from "sync-client";
+import type { StoredDatabase, TextWithCursors } from "sync-client";
 import { assert } from "../utils/assert";
 import {
 	type RelativePath,
@@ -87,14 +87,14 @@ export class MockClient implements FileSystemOperations {
 
 	public async atomicUpdateText(
 		path: RelativePath,
-		updater: (currentContent: string) => string
+		updater: (currentContent: TextWithCursors) => TextWithCursors
 	): Promise<string> {
 		const file = this.localFiles.get(path);
 		if (!file) {
 			throw new Error(`File ${path} does not exist`);
 		}
 		const currentContent = new TextDecoder().decode(file);
-		const newContent = updater(currentContent);
+		const newContent = updater({ text: currentContent, cursors: [] }).text;
 		const newContentUint8Array = new TextEncoder().encode(newContent);
 		this.localFiles.set(path, newContentUint8Array);
 

From 4e45888040ffbdb685da841d06e41209c56f85ff Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Wed, 2 Apr 2025 22:18:16 +0100
Subject: [PATCH 394/761] Bump versions to 0.3.4

---
 backend/Cargo.lock                     | 6 +++---
 backend/Cargo.toml                     | 2 +-
 frontend/obsidian-plugin/manifest.json | 2 +-
 frontend/obsidian-plugin/package.json  | 4 ++--
 frontend/package-lock.json             | 8 ++++----
 frontend/sync-client/package.json      | 2 +-
 frontend/test-client/package.json      | 2 +-
 manifest.json                          | 2 +-
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index d7aa152e..cfa7c915 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1892,7 +1892,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile"
-version = "0.3.3"
+version = "0.3.4"
 dependencies = [
  "insta",
  "pretty_assertions",
@@ -2510,7 +2510,7 @@ dependencies = [
 
 [[package]]
 name = "sync_lib"
-version = "0.3.3"
+version = "0.3.4"
 dependencies = [
  "base64 0.22.1",
  "console_error_panic_hook",
@@ -2523,7 +2523,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.3.3"
+version = "0.3.4"
 dependencies = [
  "aide",
  "aide-axum-typed-multipart",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index de127567..4addc8f4 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -12,7 +12,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.3.3"
+version = "0.3.4"
 
 [workspace.dependencies]  
 serde = { version = "1.0.219", default-features = false, features = ["derive"] }
diff --git a/frontend/obsidian-plugin/manifest.json b/frontend/obsidian-plugin/manifest.json
index 6ddc5526..dbee2b86 100644
--- a/frontend/obsidian-plugin/manifest.json
+++ b/frontend/obsidian-plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.3.3",
+	"version": "0.3.4",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index d54690e4..46e0d2d0 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.3.3",
+	"version": "0.3.4",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {
@@ -36,4 +36,4 @@
 		"webpack": "^5.98.0",
 		"webpack-cli": "^6.0.1"
 	}
-}
\ No newline at end of file
+}
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 7dca724e..d26f939e 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -21,7 +21,7 @@
 		},
 		"../backend/sync_lib/pkg": {
 			"name": "sync_lib",
-			"version": "0.3.3",
+			"version": "0.3.4",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -7853,7 +7853,7 @@
 		},
 		"obsidian-plugin": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.3.3",
+			"version": "0.3.4",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
@@ -7881,7 +7881,7 @@
 			}
 		},
 		"sync-client": {
-			"version": "0.3.3",
+			"version": "0.3.4",
 			"dependencies": {
 				"byte-base64": "^1.1.0",
 				"openapi-fetch": "0.13.5",
@@ -7905,7 +7905,7 @@
 			}
 		},
 		"test-client": {
-			"version": "0.3.3",
+			"version": "0.3.4",
 			"bin": {
 				"test-client": "dist/cli.js"
 			},
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index e003c6ff..534f9158 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "sync-client",
-	"version": "0.3.3",
+	"version": "0.3.4",
 	"main": "dist/sync-client.node.js",
 	"browser": "dist/sync-client.web.js",
 	"types": "dist/types/index.d.ts",
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index 5b64153d..1f5b3926 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "test-client",
-	"version": "0.3.3",
+	"version": "0.3.4",
 	"private": true,
 	"bin": {
 		"test-client": "./dist/cli.js"
diff --git a/manifest.json b/manifest.json
index 6ddc5526..dbee2b86 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.3.3",
+	"version": "0.3.4",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",

From a0044badf3c4f6c1b549041f9924729dd6b52c9f Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Wed, 2 Apr 2025 22:19:10 +0100
Subject: [PATCH 395/761] Update node deps

---
 frontend/obsidian-plugin/package.json |   6 +-
 frontend/package-lock.json            | 166 +++++++++++++-------------
 frontend/package.json                 |   6 +-
 frontend/sync-client/package.json     |   4 +-
 frontend/test-client/package.json     |   2 +-
 5 files changed, 92 insertions(+), 92 deletions(-)

diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index 46e0d2d0..05b28446 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -14,7 +14,7 @@
 	"license": "MIT",
 	"devDependencies": {
 		"@types/jest": "^29.5.14",
-		"@types/node": "^22.13.10",
+		"@types/node": "^22.14.0",
 		"css-loader": "^7.1.2",
 		"date-fns": "^4.1.0",
 		"file-loader": "^6.2.0",
@@ -23,11 +23,11 @@
 		"mini-css-extract-plugin": "^2.9.2",
 		"obsidian": "1.8.7",
 		"resolve-url-loader": "^5.0.0",
-		"sass": "^1.85.1",
+		"sass": "^1.86.1",
 		"sass-loader": "^16.0.5",
 		"sync-client": "file:../sync-client",
 		"terser-webpack-plugin": "^5.3.14",
-		"ts-jest": "^29.2.6",
+		"ts-jest": "^29.3.1",
 		"ts-loader": "^9.5.2",
 		"tslib": "2.8.1",
 		"typescript": "5.8.2",
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index d26f939e..b5f8e989 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -12,11 +12,11 @@
 			],
 			"devDependencies": {
 				"concurrently": "^9.1.2",
-				"eslint": "9.22.0",
+				"eslint": "9.23.0",
 				"eslint-plugin-unused-imports": "^4.1.4",
-				"npm-check-updates": "^17.1.15",
+				"npm-check-updates": "^17.1.16",
 				"prettier": "^3.5.3",
-				"typescript-eslint": "8.26.1"
+				"typescript-eslint": "8.29.0"
 			}
 		},
 		"../backend/sync_lib/pkg": {
@@ -645,9 +645,9 @@
 			}
 		},
 		"node_modules/@eslint/config-helpers": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.1.0.tgz",
-			"integrity": "sha512-kLrdPDJE1ckPo94kmPPf9Hfd0DU0Jw6oKYrhe+pwSC0iTUInmTa+w6fw8sGgcfkFJGNdWOUeOaDM4quW4a7OkA==",
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.2.1.tgz",
+			"integrity": "sha512-RI17tsD2frtDu/3dmI7QRrD4bedNKPM08ziRYaC5AhkGrzIAJelm9kJU1TznK+apx6V+cqRz8tfpEeG3oIyjxw==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"engines": {
@@ -692,9 +692,9 @@
 			}
 		},
 		"node_modules/@eslint/js": {
-			"version": "9.22.0",
-			"resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.22.0.tgz",
-			"integrity": "sha512-vLFajx9o8d1/oL2ZkpMYbkLv8nDB6yaIwFNt7nI4+I80U/z03SxmfOMsLbvWr3p7C+Wnoh//aOu2pQW8cS0HCQ==",
+			"version": "9.23.0",
+			"resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.23.0.tgz",
+			"integrity": "sha512-35MJ8vCPU0ZMxo7zfev2pypqTwWTofFZO6m4KAtdoFhRpLJUpHTZZ+KB3C7Hb1d7bULYwO4lJXGCi5Se+8OMbw==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -1857,13 +1857,13 @@
 			"license": "MIT"
 		},
 		"node_modules/@types/node": {
-			"version": "22.13.14",
-			"resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.14.tgz",
-			"integrity": "sha512-Zs/Ollc1SJ8nKUAgc7ivOEdIBM8JAKgrqqUYi2J997JuKO7/tpQC+WCetQ1sypiKCQWHdvdg9wBNpUPEWZae7w==",
+			"version": "22.14.0",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-22.14.0.tgz",
+			"integrity": "sha512-Kmpl+z84ILoG+3T/zQFyAJsU6EPTmOCj8/2+83fSN6djd6I4o7uOuGIH6vq3PrjY5BGitSbFuMN18j3iknubbA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"undici-types": "~6.20.0"
+				"undici-types": "~6.21.0"
 			}
 		},
 		"node_modules/@types/stack-utils": {
@@ -1901,17 +1901,17 @@
 			"license": "MIT"
 		},
 		"node_modules/@typescript-eslint/eslint-plugin": {
-			"version": "8.26.1",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.26.1.tgz",
-			"integrity": "sha512-2X3mwqsj9Bd3Ciz508ZUtoQQYpOhU/kWoUqIf49H8Z0+Vbh6UF/y0OEYp0Q0axOGzaBGs7QxRwq0knSQ8khQNA==",
+			"version": "8.29.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.29.0.tgz",
+			"integrity": "sha512-PAIpk/U7NIS6H7TEtN45SPGLQaHNgB7wSjsQV/8+KYokAb2T/gloOA/Bee2yd4/yKVhPKe5LlaUGhAZk5zmSaQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"@eslint-community/regexpp": "^4.10.0",
-				"@typescript-eslint/scope-manager": "8.26.1",
-				"@typescript-eslint/type-utils": "8.26.1",
-				"@typescript-eslint/utils": "8.26.1",
-				"@typescript-eslint/visitor-keys": "8.26.1",
+				"@typescript-eslint/scope-manager": "8.29.0",
+				"@typescript-eslint/type-utils": "8.29.0",
+				"@typescript-eslint/utils": "8.29.0",
+				"@typescript-eslint/visitor-keys": "8.29.0",
 				"graphemer": "^1.4.0",
 				"ignore": "^5.3.1",
 				"natural-compare": "^1.4.0",
@@ -1931,16 +1931,16 @@
 			}
 		},
 		"node_modules/@typescript-eslint/parser": {
-			"version": "8.26.1",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.26.1.tgz",
-			"integrity": "sha512-w6HZUV4NWxqd8BdeFf81t07d7/YV9s7TCWrQQbG5uhuvGUAW+fq1usZ1Hmz9UPNLniFnD8GLSsDpjP0hm1S4lQ==",
+			"version": "8.29.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.29.0.tgz",
+			"integrity": "sha512-8C0+jlNJOwQso2GapCVWWfW/rzaq7Lbme+vGUFKE31djwNncIpgXD7Cd4weEsDdkoZDjH0lwwr3QDQFuyrMg9g==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@typescript-eslint/scope-manager": "8.26.1",
-				"@typescript-eslint/types": "8.26.1",
-				"@typescript-eslint/typescript-estree": "8.26.1",
-				"@typescript-eslint/visitor-keys": "8.26.1",
+				"@typescript-eslint/scope-manager": "8.29.0",
+				"@typescript-eslint/types": "8.29.0",
+				"@typescript-eslint/typescript-estree": "8.29.0",
+				"@typescript-eslint/visitor-keys": "8.29.0",
 				"debug": "^4.3.4"
 			},
 			"engines": {
@@ -1956,14 +1956,14 @@
 			}
 		},
 		"node_modules/@typescript-eslint/scope-manager": {
-			"version": "8.26.1",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.26.1.tgz",
-			"integrity": "sha512-6EIvbE5cNER8sqBu6V7+KeMZIC1664d2Yjt+B9EWUXrsyWpxx4lEZrmvxgSKRC6gX+efDL/UY9OpPZ267io3mg==",
+			"version": "8.29.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.29.0.tgz",
+			"integrity": "sha512-aO1PVsq7Gm+tcghabUpzEnVSFMCU4/nYIgC2GOatJcllvWfnhrgW0ZEbnTxm36QsikmCN1K/6ZgM7fok2I7xNw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@typescript-eslint/types": "8.26.1",
-				"@typescript-eslint/visitor-keys": "8.26.1"
+				"@typescript-eslint/types": "8.29.0",
+				"@typescript-eslint/visitor-keys": "8.29.0"
 			},
 			"engines": {
 				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -1974,14 +1974,14 @@
 			}
 		},
 		"node_modules/@typescript-eslint/type-utils": {
-			"version": "8.26.1",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.26.1.tgz",
-			"integrity": "sha512-Kcj/TagJLwoY/5w9JGEFV0dclQdyqw9+VMndxOJKtoFSjfZhLXhYjzsQEeyza03rwHx2vFEGvrJWJBXKleRvZg==",
+			"version": "8.29.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.29.0.tgz",
+			"integrity": "sha512-ahaWQ42JAOx+NKEf5++WC/ua17q5l+j1GFrbbpVKzFL/tKVc0aYY8rVSYUpUvt2hUP1YBr7mwXzx+E/DfUWI9Q==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@typescript-eslint/typescript-estree": "8.26.1",
-				"@typescript-eslint/utils": "8.26.1",
+				"@typescript-eslint/typescript-estree": "8.29.0",
+				"@typescript-eslint/utils": "8.29.0",
 				"debug": "^4.3.4",
 				"ts-api-utils": "^2.0.1"
 			},
@@ -1998,9 +1998,9 @@
 			}
 		},
 		"node_modules/@typescript-eslint/types": {
-			"version": "8.26.1",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.26.1.tgz",
-			"integrity": "sha512-n4THUQW27VmQMx+3P+B0Yptl7ydfceUj4ON/AQILAASwgYdZ/2dhfymRMh5egRUrvK5lSmaOm77Ry+lmXPOgBQ==",
+			"version": "8.29.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.29.0.tgz",
+			"integrity": "sha512-wcJL/+cOXV+RE3gjCyl/V2G877+2faqvlgtso/ZRbTCnZazh0gXhe+7gbAnfubzN2bNsBtZjDvlh7ero8uIbzg==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -2012,14 +2012,14 @@
 			}
 		},
 		"node_modules/@typescript-eslint/typescript-estree": {
-			"version": "8.26.1",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.26.1.tgz",
-			"integrity": "sha512-yUwPpUHDgdrv1QJ7YQal3cMVBGWfnuCdKbXw1yyjArax3353rEJP1ZA+4F8nOlQ3RfS2hUN/wze3nlY+ZOhvoA==",
+			"version": "8.29.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.29.0.tgz",
+			"integrity": "sha512-yOfen3jE9ISZR/hHpU/bmNvTtBW1NjRbkSFdZOksL1N+ybPEE7UVGMwqvS6CP022Rp00Sb0tdiIkhSCe6NI8ow==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@typescript-eslint/types": "8.26.1",
-				"@typescript-eslint/visitor-keys": "8.26.1",
+				"@typescript-eslint/types": "8.29.0",
+				"@typescript-eslint/visitor-keys": "8.29.0",
 				"debug": "^4.3.4",
 				"fast-glob": "^3.3.2",
 				"is-glob": "^4.0.3",
@@ -2065,16 +2065,16 @@
 			}
 		},
 		"node_modules/@typescript-eslint/utils": {
-			"version": "8.26.1",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.26.1.tgz",
-			"integrity": "sha512-V4Urxa/XtSUroUrnI7q6yUTD3hDtfJ2jzVfeT3VK0ciizfK2q/zGC0iDh1lFMUZR8cImRrep6/q0xd/1ZGPQpg==",
+			"version": "8.29.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.29.0.tgz",
+			"integrity": "sha512-gX/A0Mz9Bskm8avSWFcK0gP7cZpbY4AIo6B0hWYFCaIsz750oaiWR4Jr2CI+PQhfW1CpcQr9OlfPS+kMFegjXA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"@eslint-community/eslint-utils": "^4.4.0",
-				"@typescript-eslint/scope-manager": "8.26.1",
-				"@typescript-eslint/types": "8.26.1",
-				"@typescript-eslint/typescript-estree": "8.26.1"
+				"@typescript-eslint/scope-manager": "8.29.0",
+				"@typescript-eslint/types": "8.29.0",
+				"@typescript-eslint/typescript-estree": "8.29.0"
 			},
 			"engines": {
 				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2089,13 +2089,13 @@
 			}
 		},
 		"node_modules/@typescript-eslint/visitor-keys": {
-			"version": "8.26.1",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.26.1.tgz",
-			"integrity": "sha512-AjOC3zfnxd6S4Eiy3jwktJPclqhFHNyd8L6Gycf9WUPoKZpgM5PjkxY1X7uSy61xVpiJDhhk7XT2NVsN3ALTWg==",
+			"version": "8.29.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.29.0.tgz",
+			"integrity": "sha512-Sne/pVz8ryR03NFK21VpN88dZ2FdQXOlq3VIklbrTYEt8yXtRFr9tvUhqvCeKjqYk5FSim37sHbooT6vzBTZcg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@typescript-eslint/types": "8.26.1",
+				"@typescript-eslint/types": "8.29.0",
 				"eslint-visitor-keys": "^4.2.0"
 			},
 			"engines": {
@@ -3407,19 +3407,19 @@
 			}
 		},
 		"node_modules/eslint": {
-			"version": "9.22.0",
-			"resolved": "https://registry.npmjs.org/eslint/-/eslint-9.22.0.tgz",
-			"integrity": "sha512-9V/QURhsRN40xuHXWjV64yvrzMjcz7ZyNoF2jJFmy9j/SLk0u1OLSZgXi28MrXjymnjEGSR80WCdab3RGMDveQ==",
+			"version": "9.23.0",
+			"resolved": "https://registry.npmjs.org/eslint/-/eslint-9.23.0.tgz",
+			"integrity": "sha512-jV7AbNoFPAY1EkFYpLq5bslU9NLNO8xnEeQXwErNibVryjk67wHVmddTBilc5srIttJDBrB0eMHKZBFbSIABCw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"@eslint-community/eslint-utils": "^4.2.0",
 				"@eslint-community/regexpp": "^4.12.1",
 				"@eslint/config-array": "^0.19.2",
-				"@eslint/config-helpers": "^0.1.0",
+				"@eslint/config-helpers": "^0.2.0",
 				"@eslint/core": "^0.12.0",
-				"@eslint/eslintrc": "^3.3.0",
-				"@eslint/js": "9.22.0",
+				"@eslint/eslintrc": "^3.3.1",
+				"@eslint/js": "9.23.0",
 				"@eslint/plugin-kit": "^0.2.7",
 				"@humanfs/node": "^0.16.6",
 				"@humanwhocodes/module-importer": "^1.0.1",
@@ -6483,9 +6483,9 @@
 			"license": "MIT"
 		},
 		"node_modules/sass": {
-			"version": "1.86.0",
-			"resolved": "https://registry.npmjs.org/sass/-/sass-1.86.0.tgz",
-			"integrity": "sha512-zV8vGUld/+mP4KbMLJMX7TyGCuUp7hnkOScgCMsWuHtns8CWBoz+vmEhoGMXsaJrbUP8gj+F1dLvVe79sK8UdA==",
+			"version": "1.86.1",
+			"resolved": "https://registry.npmjs.org/sass/-/sass-1.86.1.tgz",
+			"integrity": "sha512-Yaok4XELL1L9Im/ZUClKu//D2OP1rOljKj0Gf34a+GzLbMveOzL7CfqYo+JUa5Xt1nhTCW+OcKp/FtR7/iqj1w==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -7126,9 +7126,9 @@
 			}
 		},
 		"node_modules/ts-jest": {
-			"version": "29.3.0",
-			"resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.3.0.tgz",
-			"integrity": "sha512-4bfGBX7Gd1Aqz3SyeDS9O276wEU/BInZxskPrbhZLyv+c1wskDCqDFMJQJLWrIr/fKoAH4GE5dKUlrdyvo+39A==",
+			"version": "29.3.1",
+			"resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.3.1.tgz",
+			"integrity": "sha512-FT2PIRtZABwl6+ZCry8IY7JZ3xMuppsEV9qFVHOVe8jDzggwUZ9TsM4chyJxL9yi6LvkqcZYU3LmapEE454zBQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -7140,7 +7140,7 @@
 				"lodash.memoize": "^4.1.2",
 				"make-error": "^1.3.6",
 				"semver": "^7.7.1",
-				"type-fest": "^4.37.0",
+				"type-fest": "^4.38.0",
 				"yargs-parser": "^21.1.1"
 			},
 			"bin": {
@@ -7276,15 +7276,15 @@
 			}
 		},
 		"node_modules/typescript-eslint": {
-			"version": "8.26.1",
-			"resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.26.1.tgz",
-			"integrity": "sha512-t/oIs9mYyrwZGRpDv3g+3K6nZ5uhKEMt2oNmAPwaY4/ye0+EH4nXIPYNtkYFS6QHm+1DFg34DbglYBz5P9Xysg==",
+			"version": "8.29.0",
+			"resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.29.0.tgz",
+			"integrity": "sha512-ep9rVd9B4kQsZ7ZnWCVxUE/xDLUUUsRzE0poAeNu+4CkFErLfuvPt/qtm2EpnSyfvsR0S6QzDFSrPCFBwf64fg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@typescript-eslint/eslint-plugin": "8.26.1",
-				"@typescript-eslint/parser": "8.26.1",
-				"@typescript-eslint/utils": "8.26.1"
+				"@typescript-eslint/eslint-plugin": "8.29.0",
+				"@typescript-eslint/parser": "8.29.0",
+				"@typescript-eslint/utils": "8.29.0"
 			},
 			"engines": {
 				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -7299,9 +7299,9 @@
 			}
 		},
 		"node_modules/undici-types": {
-			"version": "6.20.0",
-			"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
-			"integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
+			"version": "6.21.0",
+			"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
+			"integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -7857,7 +7857,7 @@
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
-				"@types/node": "^22.13.10",
+				"@types/node": "^22.14.0",
 				"css-loader": "^7.1.2",
 				"date-fns": "^4.1.0",
 				"file-loader": "^6.2.0",
@@ -7866,11 +7866,11 @@
 				"mini-css-extract-plugin": "^2.9.2",
 				"obsidian": "1.8.7",
 				"resolve-url-loader": "^5.0.0",
-				"sass": "^1.85.1",
+				"sass": "^1.86.1",
 				"sass-loader": "^16.0.5",
 				"sync-client": "file:../sync-client",
 				"terser-webpack-plugin": "^5.3.14",
-				"ts-jest": "^29.2.6",
+				"ts-jest": "^29.3.1",
 				"ts-loader": "^9.5.2",
 				"tslib": "2.8.1",
 				"typescript": "5.8.2",
@@ -7891,10 +7891,10 @@
 			},
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
-				"@types/node": "^22.13.10",
+				"@types/node": "^22.14.0",
 				"jest": "^29.7.0",
 				"sync_lib": "file:../../backend/sync_lib/pkg",
-				"ts-jest": "^29.2.6",
+				"ts-jest": "^29.3.1",
 				"ts-loader": "^9.5.2",
 				"tslib": "2.8.1",
 				"typescript": "5.8.2",
@@ -7910,7 +7910,7 @@
 				"test-client": "dist/cli.js"
 			},
 			"devDependencies": {
-				"@types/node": "^22.13.10",
+				"@types/node": "^22.14.0",
 				"bufferutil": "^4.0.9",
 				"sync-client": "file:../sync-client",
 				"ts-loader": "^9.5.2",
diff --git a/frontend/package.json b/frontend/package.json
index cb0f45f7..8ae718c4 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -21,10 +21,10 @@
 	},
 	"devDependencies": {
 		"concurrently": "^9.1.2",
-		"eslint": "9.22.0",
+		"eslint": "9.23.0",
 		"eslint-plugin-unused-imports": "^4.1.4",
-		"npm-check-updates": "^17.1.15",
+		"npm-check-updates": "^17.1.16",
 		"prettier": "^3.5.3",
-		"typescript-eslint": "8.26.1"
+		"typescript-eslint": "8.29.0"
 	}
 }
\ No newline at end of file
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index 534f9158..6f0e13e1 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -21,10 +21,10 @@
 	},
 	"devDependencies": {
 		"@types/jest": "^29.5.14",
-		"@types/node": "^22.13.10",
+		"@types/node": "^22.14.0",
 		"jest": "^29.7.0",
 		"sync_lib": "file:../../backend/sync_lib/pkg",
-		"ts-jest": "^29.2.6",
+		"ts-jest": "^29.3.1",
 		"ts-loader": "^9.5.2",
 		"tslib": "2.8.1",
 		"typescript": "5.8.2",
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index 1f5b3926..5c1f6979 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -11,7 +11,7 @@
 		"test": "jest --passWithNoTests"
 	},
 	"devDependencies": {
-		"@types/node": "^22.13.10",
+		"@types/node": "^22.14.0",
 		"sync-client": "file:../sync-client",
 		"ts-loader": "^9.5.2",
 		"tslib": "2.8.1",

From 5328e3b0f624d0a73002d33101ec5ee5e4fab361 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 3 Apr 2025 21:44:45 +0100
Subject: [PATCH 396/761] Fix cursor movement on Windows

---
 .../utils/line-and-column-to-position.test.ts |  7 ++-
 .../src/utils/line-and-column-to-position.ts  |  2 +-
 .../utils/position-to-line-and-column.test.ts | 54 ++++++++-----------
 .../src/utils/position-to-line-and-column.ts  |  7 +--
 4 files changed, 31 insertions(+), 39 deletions(-)

diff --git a/frontend/obsidian-plugin/src/utils/line-and-column-to-position.test.ts b/frontend/obsidian-plugin/src/utils/line-and-column-to-position.test.ts
index b98f66e5..9c02fbb5 100644
--- a/frontend/obsidian-plugin/src/utils/line-and-column-to-position.test.ts
+++ b/frontend/obsidian-plugin/src/utils/line-and-column-to-position.test.ts
@@ -19,10 +19,9 @@ describe("lineAndColumnToPosition", () => {
 		expect(position).toBe(0);
 	});
 
-	it("should handle a single-line string correctly", () => {
-		const text = "SingleLine";
-		const position = lineAndColumnToPosition(text, 0, 5);
-		expect(position).toBe(5);
+	it("with carrige return", () => {
+		expect(lineAndColumnToPosition("a\nb", 1, 1)).toBe(3);
+		expect(lineAndColumnToPosition("a\r\nb", 1, 1)).toBe(3);
 	});
 
 	it("should handle multi-line strings with varying lengths", () => {
diff --git a/frontend/obsidian-plugin/src/utils/line-and-column-to-position.ts b/frontend/obsidian-plugin/src/utils/line-and-column-to-position.ts
index 0bc114c7..670d8cac 100644
--- a/frontend/obsidian-plugin/src/utils/line-and-column-to-position.ts
+++ b/frontend/obsidian-plugin/src/utils/line-and-column-to-position.ts
@@ -13,7 +13,7 @@ export function lineAndColumnToPosition(
 	line: number,
 	column: number
 ): number {
-	const lines = text.split("\n");
+	const lines = text.replace("\r", "").split("\n");
 
 	if (line >= lines.length) {
 		throw new Error(`Line number ${line} is out of range.`);
diff --git a/frontend/obsidian-plugin/src/utils/position-to-line-and-column.test.ts b/frontend/obsidian-plugin/src/utils/position-to-line-and-column.test.ts
index e5d3bac5..d5533778 100644
--- a/frontend/obsidian-plugin/src/utils/position-to-line-and-column.test.ts
+++ b/frontend/obsidian-plugin/src/utils/position-to-line-and-column.test.ts
@@ -1,63 +1,55 @@
 import { positionToLineAndColumn } from "./position-to-line-and-column";
 
 describe("positionToLineAndColumn", () => {
-	test("converts position to line and column in a single line text", () => {
-		const text = "Hello, world!";
-		expect(positionToLineAndColumn(text, 0)).toEqual({
-			line: 0,
-			column: 1
-		});
-		expect(positionToLineAndColumn(text, 7)).toEqual({
-			line: 0,
-			column: 8
-		});
-		expect(positionToLineAndColumn(text, 12)).toEqual({
-			line: 0,
-			column: 13
-		});
-	});
-
 	test("converts position to line and column in multi-line text", () => {
-		const text = "First line\nSecond line\nThird line";
+		const text = "ab\ncd\n";
 		expect(positionToLineAndColumn(text, 0)).toEqual({
+			line: 0,
+			column: 0
+		});
+		expect(positionToLineAndColumn(text, 1)).toEqual({
 			line: 0,
 			column: 1
 		});
-		expect(positionToLineAndColumn(text, 10)).toEqual({
+		expect(positionToLineAndColumn(text, 2)).toEqual({
 			line: 0,
-			column: 11
+			column: 2
 		});
-		expect(positionToLineAndColumn(text, 15)).toEqual({
+		expect(positionToLineAndColumn(text, 3)).toEqual({
 			line: 1,
-			column: 5
+			column: 0
 		});
-		expect(positionToLineAndColumn(text, 26)).toEqual({
+		expect(positionToLineAndColumn(text, 4)).toEqual({
+			line: 1,
+			column: 1
+		});
+		expect(positionToLineAndColumn(text, 6)).toEqual({
 			line: 2,
-			column: 4
+			column: 0
 		});
 	});
 
-	test("handles positions at line breaks", () => {
-		const text = "Line\nBreak";
-		expect(positionToLineAndColumn(text, 4)).toEqual({
-			line: 0,
-			column: 5
+	test("with carrige returns", () => {
+		expect(positionToLineAndColumn("a\nb", 3)).toEqual({
+			line: 1,
+			column: 1
 		});
-		expect(positionToLineAndColumn(text, 5)).toEqual({
+
+		expect(positionToLineAndColumn("a\r\nb", 3)).toEqual({
 			line: 1,
 			column: 1
 		});
 	});
 
 	test("handles empty input", () => {
-		expect(positionToLineAndColumn("", 0)).toEqual({ line: 0, column: 1 });
+		expect(positionToLineAndColumn("", 0)).toEqual({ line: 0, column: 0 });
 	});
 
 	test("handles positions at the end of text", () => {
 		const text = "End";
 		expect(positionToLineAndColumn(text, 3)).toEqual({
 			line: 0,
-			column: 4
+			column: 3
 		});
 	});
 
diff --git a/frontend/obsidian-plugin/src/utils/position-to-line-and-column.ts b/frontend/obsidian-plugin/src/utils/position-to-line-and-column.ts
index a9c81881..3c35fb6e 100644
--- a/frontend/obsidian-plugin/src/utils/position-to-line-and-column.ts
+++ b/frontend/obsidian-plugin/src/utils/position-to-line-and-column.ts
@@ -3,7 +3,7 @@
  *
  * @param text The text content to analyze
  * @param position The character position to convert
- * @returns An object containing line and column numbers (0-based index for line, 1-based index for column)
+ * @returns An object containing line and column numbers
  * @throws Will throw an error if the position is negative or exceeds the text length
  */
 export function positionToLineAndColumn(
@@ -20,11 +20,12 @@ export function positionToLineAndColumn(
 		);
 	}
 
+	text = text.replace("\r", "");
 	const textUpToPosition = text.substring(0, position);
 	const lines = textUpToPosition.split("\n");
 
-	const line = lines.length - 1; // 0-based index
-	const column = lines[lines.length - 1].length + 1; // 1-based index
+	const line = lines.length - 1;
+	const column = lines[lines.length - 1].length;
 
 	return { line, column };
 }

From e3295a38af077d873ebb5d73d46ea874cfc520fe Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 3 Apr 2025 21:45:01 +0100
Subject: [PATCH 397/761] Bump versions to 0.3.5

---
 backend/Cargo.lock                     | 6 +++---
 backend/Cargo.toml                     | 2 +-
 frontend/obsidian-plugin/manifest.json | 2 +-
 frontend/obsidian-plugin/package.json  | 2 +-
 frontend/package-lock.json             | 8 ++++----
 frontend/sync-client/package.json      | 2 +-
 frontend/test-client/package.json      | 2 +-
 manifest.json                          | 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index cfa7c915..5b9aa79e 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1892,7 +1892,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile"
-version = "0.3.4"
+version = "0.3.5"
 dependencies = [
  "insta",
  "pretty_assertions",
@@ -2510,7 +2510,7 @@ dependencies = [
 
 [[package]]
 name = "sync_lib"
-version = "0.3.4"
+version = "0.3.5"
 dependencies = [
  "base64 0.22.1",
  "console_error_panic_hook",
@@ -2523,7 +2523,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.3.4"
+version = "0.3.5"
 dependencies = [
  "aide",
  "aide-axum-typed-multipart",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 4addc8f4..6f26608e 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -12,7 +12,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.3.4"
+version = "0.3.5"
 
 [workspace.dependencies]  
 serde = { version = "1.0.219", default-features = false, features = ["derive"] }
diff --git a/frontend/obsidian-plugin/manifest.json b/frontend/obsidian-plugin/manifest.json
index dbee2b86..822413eb 100644
--- a/frontend/obsidian-plugin/manifest.json
+++ b/frontend/obsidian-plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.3.4",
+	"version": "0.3.5",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index 05b28446..696a005c 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.3.4",
+	"version": "0.3.5",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index b5f8e989..b74df05d 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -21,7 +21,7 @@
 		},
 		"../backend/sync_lib/pkg": {
 			"name": "sync_lib",
-			"version": "0.3.4",
+			"version": "0.3.5",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -7853,7 +7853,7 @@
 		},
 		"obsidian-plugin": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.3.4",
+			"version": "0.3.5",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
@@ -7881,7 +7881,7 @@
 			}
 		},
 		"sync-client": {
-			"version": "0.3.4",
+			"version": "0.3.5",
 			"dependencies": {
 				"byte-base64": "^1.1.0",
 				"openapi-fetch": "0.13.5",
@@ -7905,7 +7905,7 @@
 			}
 		},
 		"test-client": {
-			"version": "0.3.4",
+			"version": "0.3.5",
 			"bin": {
 				"test-client": "dist/cli.js"
 			},
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index 6f0e13e1..0644a84f 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "sync-client",
-	"version": "0.3.4",
+	"version": "0.3.5",
 	"main": "dist/sync-client.node.js",
 	"browser": "dist/sync-client.web.js",
 	"types": "dist/types/index.d.ts",
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index 5c1f6979..bf09de9f 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "test-client",
-	"version": "0.3.4",
+	"version": "0.3.5",
 	"private": true,
 	"bin": {
 		"test-client": "./dist/cli.js"
diff --git a/manifest.json b/manifest.json
index dbee2b86..822413eb 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.3.4",
+	"version": "0.3.5",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",

From 181ea4faef0422c0b1f78c268e6cc886989879de Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 3 Apr 2025 22:46:07 +0100
Subject: [PATCH 398/761] Fix logs view

---
 frontend/obsidian-plugin/src/views/logs/logs-view.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frontend/obsidian-plugin/src/views/logs/logs-view.ts b/frontend/obsidian-plugin/src/views/logs/logs-view.ts
index 9830d5e8..19cf4701 100644
--- a/frontend/obsidian-plugin/src/views/logs/logs-view.ts
+++ b/frontend/obsidian-plugin/src/views/logs/logs-view.ts
@@ -98,6 +98,8 @@ export class LogsView extends ItemView {
 		);
 
 		this.logsContainer = container.createDiv({ cls: "logs-container" });
+
+		this.updateView();
 	}
 
 	private updateView(): void {

From 9a0b8a07bf23022cb9909360bc602ee7cab8608e Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 4 Apr 2025 21:19:54 +0100
Subject: [PATCH 399/761] Add response_timeout_seconds config

---
 backend/Cargo.lock                            |  1 +
 backend/config-e2e.yml                        | 35 ++++++++++---------
 backend/sync_server/Cargo.toml                |  2 +-
 .../sync_server/src/config/server_config.rs   | 18 +++++-----
 backend/sync_server/src/consts.rs             |  1 +
 5 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 5b9aa79e..20235b5e 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -2803,6 +2803,7 @@ dependencies = [
  "http-body",
  "http-body-util",
  "pin-project-lite",
+ "tokio",
  "tower-layer",
  "tower-service",
  "tracing",
diff --git a/backend/config-e2e.yml b/backend/config-e2e.yml
index e8fc6fd8..ff916c3f 100644
--- a/backend/config-e2e.yml
+++ b/backend/config-e2e.yml
@@ -1,23 +1,24 @@
 database:
-  databases_directory_path: databases
-  max_connections_per_vault: 12
+    databases_directory_path: databases
+    max_connections_per_vault: 12
 
 server:
-  host: 0.0.0.0
-  port: 3000
-  max_body_size_mb: 512
-  max_clients_per_vault: 256
+    host: 0.0.0.0
+    port: 3000
+    max_body_size_mb: 512
+    max_clients_per_vault: 256
+    response_timeout_seconds: 60
 
 users:
-  user_tokens:
-  - name: admin
-    token: test-token-change-me
-    vault_access: 
-      type: allow_access_to_all
+    user_tokens:
+        - name: admin
+          token: test-token-change-me
+          vault_access:
+              type: allow_access_to_all
 
-  - name: test
-    token: other-test-token
-    vault_access:
-      type: allow_list
-      allowed: 
-       - default
+        - name: test
+          token: other-test-token
+          vault_access:
+              type: allow_list
+              allowed:
+                  - default
diff --git a/backend/sync_server/Cargo.toml b/backend/sync_server/Cargo.toml
index 7d8e892f..4c8c655a 100644
--- a/backend/sync_server/Cargo.toml
+++ b/backend/sync_server/Cargo.toml
@@ -21,7 +21,7 @@ axum = { version = "0.7.4", features = ["ws", "macros", "tracing", "multipart"]}
 axum-extra = { version = "0.9.6", features = ["typed-header"] }
 aide-axum-typed-multipart = "0.13.0"
 axum_typed_multipart = "0.11.0"
-tower-http = { version = "0.6.1", features = ["cors", "trace", "limit"] }
+tower-http = { version = "0.6.1", features = ["cors", "trace", "limit", "timeout"] }
 tracing-subscriber = { version = "0.3.19", features = ["fmt", "env-filter"]}
 serde_yaml = "0.9.34"
 sqlx = { version = "0.8.3", features = ["sqlite", "runtime-tokio", "uuid", "chrono"] }
diff --git a/backend/sync_server/src/config/server_config.rs b/backend/sync_server/src/config/server_config.rs
index 077bd8d8..ce922fb9 100644
--- a/backend/sync_server/src/config/server_config.rs
+++ b/backend/sync_server/src/config/server_config.rs
@@ -3,9 +3,10 @@ use serde::{Deserialize, Serialize};
 
 use crate::consts::{
     DEFAULT_HOST, DEFAULT_MAX_BODY_SIZE_MB, DEFAULT_MAX_CLIENTS_PER_VAULT, DEFAULT_PORT,
+    DEFAULT_RESPONSE_TIMEOUT_SECONDS,
 };
 
-#[derive(Debug, Deserialize, Serialize, Clone)]
+#[derive(Debug, Deserialize, Serialize, Clone, Default)]
 pub struct ServerConfig {
     #[serde(default = "default_host")]
     pub host: String,
@@ -18,6 +19,9 @@ pub struct ServerConfig {
 
     #[serde(default = "default_max_clients_per_vault")]
     pub max_clients_per_vault: usize,
+
+    #[serde(default = "default_response_timeout_seconds")]
+    pub response_timeout_seconds: u64,
 }
 
 fn default_host() -> String {
@@ -40,13 +44,7 @@ fn default_max_clients_per_vault() -> usize {
     DEFAULT_MAX_CLIENTS_PER_VAULT
 }
 
-impl Default for ServerConfig {
-    fn default() -> Self {
-        Self {
-            host: default_host(),
-            port: default_port(),
-            max_body_size_mb: default_max_body_size_mb(),
-            max_clients_per_vault: default_max_clients_per_vault(),
-        }
-    }
+fn default_response_timeout_seconds() -> u64 {
+    debug!("Using default response timeout (seconds): {DEFAULT_RESPONSE_TIMEOUT_SECONDS}");
+    DEFAULT_RESPONSE_TIMEOUT_SECONDS
 }
diff --git a/backend/sync_server/src/consts.rs b/backend/sync_server/src/consts.rs
index 1453f25a..57fb2559 100644
--- a/backend/sync_server/src/consts.rs
+++ b/backend/sync_server/src/consts.rs
@@ -4,4 +4,5 @@ pub const DEFAULT_HOST: &str = "127.0.0.1";
 pub const DEFAULT_PORT: u16 = 3000;
 pub const DEFAULT_MAX_CONNECTIONS_PER_VAULT: u32 = 12;
 pub const DEFAULT_MAX_BODY_SIZE_MB: usize = 4096;
+pub const DEFAULT_RESPONSE_TIMEOUT_SECONDS: u64 = 60;
 pub const DEFAULT_MAX_CLIENTS_PER_VAULT: usize = 256;

From 297787739b124faeeeb255773c499de95fc8c5fd Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 4 Apr 2025 21:20:04 +0100
Subject: [PATCH 400/761] Don't apply empty edits

---
 frontend/obsidian-plugin/src/obsidian-file-system.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frontend/obsidian-plugin/src/obsidian-file-system.ts b/frontend/obsidian-plugin/src/obsidian-file-system.ts
index 60c49328..c6893719 100644
--- a/frontend/obsidian-plugin/src/obsidian-file-system.ts
+++ b/frontend/obsidian-plugin/src/obsidian-file-system.ts
@@ -71,6 +71,10 @@ export class ObsidianFileSystemOperations implements FileSystemOperations {
 				]
 			});
 
+			if (result.text === text) {
+				return text;
+			}
+
 			view.editor.setValue(result.text);
 
 			result.cursors.forEach((movedCursor) => {

From fb71460fc34da804e749ceba4de416a394a11dc1 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 4 Apr 2025 21:46:08 +0100
Subject: [PATCH 401/761] Turn auth into a middleware

---
 backend/sync_server/src/server/auth.rs | 47 ++++++++++++++++++++++----
 1 file changed, 41 insertions(+), 6 deletions(-)

diff --git a/backend/sync_server/src/server/auth.rs b/backend/sync_server/src/server/auth.rs
index 7a7d2197..7cd0b26b 100644
--- a/backend/sync_server/src/server/auth.rs
+++ b/backend/sync_server/src/server/auth.rs
@@ -1,3 +1,14 @@
+use std::collections::HashMap;
+
+use axum::{
+    extract::{Path, Request, State},
+    middleware::Next,
+    response::Response,
+};
+use axum_extra::{
+    TypedHeader,
+    headers::{Authorization, authorization::Bearer},
+};
 use log::info;
 
 use crate::{
@@ -6,9 +17,32 @@ use crate::{
     errors::{SyncServerError, permission_denied_error, unauthenticated_error},
 };
 
-// TODO: turn this into a middleware
-pub fn auth(app_state: &AppState, token: &str, vault: &VaultId) -> Result<User, SyncServerError> {
-    let user = app_state
+
+pub async fn auth_middleware(
+    State(state): State<AppState>,
+    Path(path_params): Path<HashMap<String, String>>,
+    TypedHeader(auth_header): TypedHeader<Authorization<Bearer>>,
+    mut req: Request,
+    next: Next,
+) -> Result<Response, SyncServerError> {
+    let token = auth_header.token();
+    let vault_id = path_params
+        .get("vault_id")
+        .ok_or_else(|| unauthenticated_error(anyhow::anyhow!("Missing vault_id")))?;
+
+    let user = auth(&state, token, vault_id)?;
+
+    req.extensions_mut().insert(user);
+
+    Ok(next.run(req).await)
+}
+
+pub fn auth(
+    state: &AppState,
+    token: &str,
+    vault_id: &VaultId,
+) -> Result<User, SyncServerError> {
+    let user = state
         .config
         .users
         .get_user(token)
@@ -19,16 +53,17 @@ pub fn auth(app_state: &AppState, token: &str, vault: &VaultId) -> Result<User,
 
     if match user.vault_access {
         VaultAccess::AllowAccessToAll => true,
-        VaultAccess::AllowList(AllowListedVaults { ref allowed }) => allowed.contains(vault),
+        VaultAccess::AllowList(AllowListedVaults { ref allowed }) => allowed.contains(vault_id),
     } {
         info!(
             "User `{}` is authorised to access to vault `{}`",
-            user.name, vault
+            user.name, vault_id
         );
+
         Ok(user)
     } else {
         Err(permission_denied_error(anyhow::anyhow!(
-            "Permission denied for vault `{vault}`"
+            "Permission denied for vault `{vault_id}`"
         )))
     }
 }

From b5e528d8b88aece2aeb7db10a3563250ae686ef4 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 4 Apr 2025 21:47:19 +0100
Subject: [PATCH 402/761] Use middleware instead of manual auth checks

---
 backend/sync_server/src/server.rs             | 151 ++++++++++--------
 .../sync_server/src/server/create_document.rs |  16 +-
 .../sync_server/src/server/delete_document.rs |   9 +-
 .../src/server/fetch_document_version.rs      |   8 -
 .../server/fetch_document_version_content.rs  |   8 -
 .../server/fetch_latest_document_version.rs   |   8 -
 .../src/server/fetch_latest_documents.rs      |   9 +-
 .../sync_server/src/server/update_document.rs |  12 --
 8 files changed, 86 insertions(+), 135 deletions(-)

diff --git a/backend/sync_server/src/server.rs b/backend/sync_server/src/server.rs
index 4bc85c0f..45d43d85 100644
--- a/backend/sync_server/src/server.rs
+++ b/backend/sync_server/src/server.rs
@@ -11,7 +11,7 @@ mod responses;
 mod update_document;
 mod websocket;
 
-use std::{ffi::OsString, sync::Arc};
+use std::{ffi::OsString, sync::Arc, time::Duration};
 
 use aide::{
     axum::{
@@ -23,10 +23,12 @@ use aide::{
     transform::TransformOpenApi,
 };
 use anyhow::{Context as _, Result, anyhow};
+use auth::auth_middleware;
 use axum::{
     Extension, Json,
     extract::{DefaultBodyLimit, Request},
     http::{self, HeaderValue, Method},
+    middleware,
     response::IntoResponse,
     routing::IntoMakeService,
 };
@@ -36,6 +38,7 @@ use tower_http::{
     LatencyUnit,
     cors::CorsLayer,
     limit::RequestBodyLimitLayer,
+    timeout::TimeoutLayer,
     trace::{
         DefaultOnBodyChunk, DefaultOnEos, DefaultOnFailure, DefaultOnRequest, DefaultOnResponse,
         TraceLayer,
@@ -46,7 +49,7 @@ use tracing::{Level, info_span};
 use crate::{
     app_state::AppState,
     config::server_config::ServerConfig,
-    errors::{SerializedError, not_found_error},
+    errors::{SerializedError, client_error, not_found_error},
 };
 
 pub async fn create_server(config_path: Option<OsString>) -> Result<()> {
@@ -61,12 +64,85 @@ pub async fn create_server(config_path: Option<OsString>) -> Result<()> {
 
     let mut api = create_open_api();
     let app = ApiRouter::new()
+        .nest("/", get_authed_routes(app_state.clone()))
         .api_route("/vaults/:vault_id/ping", get(ping::ping))
+        .route("/vaults/:vault_id/ws", get(websocket::websocket_handler))
+        .route("/", Scalar::new("/api.json").axum_route())
+        .route("/api.json", axum::routing::get(serve_api))
+        .layer(DefaultBodyLimit::disable())
+        .layer(RequestBodyLimitLayer::new(
+            app_state.config.server.max_body_size_mb * 1024 * 1024,
+        ))
+        .layer(TimeoutLayer::new(Duration::from_secs(
+            server_config.response_timeout_seconds,
+        )))
+        .layer(
+            CorsLayer::new()
+                .allow_origin("*".parse::<HeaderValue>().expect("Failed to parse origin"))
+                .allow_headers([http::header::CONTENT_TYPE, http::header::AUTHORIZATION])
+                .allow_methods([Method::GET, Method::POST, Method::PUT, Method::DELETE]),
+        )
+        .layer(
+            TraceLayer::new_for_http()
+                .make_span_with(|request: &Request<_>| {
+                    info_span!(
+                        "http_request",
+                        method = ?request.method(),
+                        uri = ?request.uri(),
+                    )
+                })
+                .on_request(DefaultOnRequest::new().level(Level::INFO))
+                .on_response(
+                    DefaultOnResponse::new()
+                        .level(Level::INFO)
+                        .latency_unit(LatencyUnit::Millis),
+                )
+                .on_body_chunk(DefaultOnBodyChunk::new())
+                .on_eos(DefaultOnEos::new())
+                .on_failure(DefaultOnFailure::new().level(Level::ERROR)),
+        )
+        .with_state(app_state)
+        .finish_api_with(&mut api, add_api_docs_error_example)
+        .layer(Extension(Arc::new(api))) // https://github.com/tamasfe/aide/blob/507f4a8822bc0c13cbda0f589da1e0f4cbcdb812/examples/example-axum/src/main.rs#L39
+        .fallback(handle_404)
+        .fallback(handle_405)
+        .into_make_service();
+
+    start_server(app, &server_config).await
+}
+
+async fn serve_api(Extension(api): Extension<Arc<OpenApi>>) -> impl IntoResponse { Json(api) }
+
+fn create_open_api() -> OpenApi {
+    OpenApi {
+        info: Info {
+            title: "VaultLink sync server".to_owned(),
+            summary: Some(
+                "Simple API for syncing documents between concurrent clients.".to_owned(),
+            ),
+            description: Some(include_str!("../README.md").to_owned()),
+            version: env!("CARGO_PKG_VERSION").to_owned(),
+            ..Info::default()
+        },
+        ..OpenApi::default()
+    }
+}
+
+fn add_api_docs_error_example(api: TransformOpenApi<'_>) -> TransformOpenApi<'_> {
+    api.default_response_with::<Json<SerializedError>, _>(|res| {
+        res.example(SerializedError {
+            message: "An error has occurred".to_owned(),
+            causes: vec![],
+        })
+    })
+}
+
+fn get_authed_routes(app_state: AppState) -> ApiRouter<AppState> {
+    ApiRouter::new()
         .api_route(
             "/vaults/:vault_id/documents",
             get(fetch_latest_documents::fetch_latest_documents),
         )
-        .route("/vaults/:vault_id/ws", get(websocket::websocket_handler))
         .api_route(
             "/vaults/:vault_id/documents",
             post(create_document::create_document_multipart),
@@ -99,70 +175,7 @@ pub async fn create_server(config_path: Option<OsString>) -> Result<()> {
             "/vaults/:vault_id/documents/:document_id",
             delete(delete_document::delete_document),
         )
-        .route("/", Scalar::new("/api.json").axum_route())
-        .route("/api.json", axum::routing::get(serve_api))
-        .layer(
-            TraceLayer::new_for_http()
-                .make_span_with(|request: &Request<_>| {
-                    info_span!(
-                        "http_request",
-                        method = ?request.method(),
-                        uri = ?request.uri(),
-                    )
-                })
-                .on_request(DefaultOnRequest::new().level(Level::INFO))
-                .on_response(
-                    DefaultOnResponse::new()
-                        .level(Level::INFO)
-                        .latency_unit(LatencyUnit::Millis),
-                )
-                .on_body_chunk(DefaultOnBodyChunk::new())
-                .on_eos(DefaultOnEos::new())
-                .on_failure(DefaultOnFailure::new().level(Level::ERROR)),
-        )
-        .layer(DefaultBodyLimit::disable())
-        .layer(RequestBodyLimitLayer::new(
-            app_state.config.server.max_body_size_mb * 1024 * 1024,
-        ))
-        .layer(
-            CorsLayer::new()
-                .allow_origin("*".parse::<HeaderValue>().expect("Failed to parse origin"))
-                .allow_headers([http::header::CONTENT_TYPE, http::header::AUTHORIZATION])
-                .allow_methods([Method::GET, Method::POST, Method::PUT, Method::DELETE]),
-        )
-        .with_state(app_state)
-        .finish_api_with(&mut api, add_api_docs_error_example)
-        .layer(Extension(Arc::new(api))) // https://github.com/tamasfe/aide/blob/507f4a8822bc0c13cbda0f589da1e0f4cbcdb812/examples/example-axum/src/main.rs#L39
-        .fallback(handler_404)
-        .into_make_service();
-
-    start_server(app, &server_config).await
-}
-
-async fn serve_api(Extension(api): Extension<Arc<OpenApi>>) -> impl IntoResponse { Json(api) }
-
-fn create_open_api() -> OpenApi {
-    OpenApi {
-        info: Info {
-            title: "VaultLink sync server".to_owned(),
-            summary: Some(
-                "Simple API for syncing documents between concurrent clients.".to_owned(),
-            ),
-            description: Some(include_str!("../README.md").to_owned()),
-            version: env!("CARGO_PKG_VERSION").to_owned(),
-            ..Info::default()
-        },
-        ..OpenApi::default()
-    }
-}
-
-fn add_api_docs_error_example(api: TransformOpenApi<'_>) -> TransformOpenApi<'_> {
-    api.default_response_with::<Json<SerializedError>, _>(|res| {
-        res.example(SerializedError {
-            message: "An error has occurred".to_owned(),
-            causes: vec![],
-        })
-    })
+        .layer(middleware::from_fn_with_state(app_state, auth_middleware))
 }
 
 async fn start_server(app: IntoMakeService<axum::Router>, config: &ServerConfig) -> Result<()> {
@@ -209,4 +222,6 @@ async fn shutdown_signal() {
     }
 }
 
-async fn handler_404() -> impl IntoResponse { not_found_error(anyhow!("Page not found")) }
+async fn handle_404() -> impl IntoResponse { not_found_error(anyhow!("Page not found")) }
+
+async fn handle_405() -> impl IntoResponse { client_error(anyhow!("Method not allowed")) }
diff --git a/backend/sync_server/src/server/create_document.rs b/backend/sync_server/src/server/create_document.rs
index 25919384..bc54264b 100644
--- a/backend/sync_server/src/server/create_document.rs
+++ b/backend/sync_server/src/server/create_document.rs
@@ -1,19 +1,12 @@
 use aide_axum_typed_multipart::TypedMultipart;
 use anyhow::Context as _;
 use axum::extract::{Path, State};
-use axum_extra::{
-    TypedHeader,
-    headers::{Authorization, authorization::Bearer},
-};
 use axum_jsonschema::Json;
 use schemars::JsonSchema;
 use serde::Deserialize;
 use sync_lib::base64_to_bytes;
 
-use super::{
-    auth::auth,
-    requests::{CreateDocumentVersion, CreateDocumentVersionMultipart},
-};
+use super::requests::{CreateDocumentVersion, CreateDocumentVersionMultipart};
 use crate::{
     app_state::{
         AppState,
@@ -36,7 +29,6 @@ pub struct CreateDocumentPathParams {
 /// with their content merged.
 #[axum::debug_handler]
 pub async fn create_document_multipart(
-    TypedHeader(auth_header): TypedHeader<Authorization<Bearer>>,
     Path(CreateDocumentPathParams { vault_id }): Path<CreateDocumentPathParams>,
     State(state): State<AppState>,
     TypedMultipart(axum_typed_multipart::TypedMultipart(request)): TypedMultipart<
@@ -44,7 +36,6 @@ pub async fn create_document_multipart(
     >,
 ) -> Result<Json<DocumentVersionWithoutContent>, SyncServerError> {
     internal_create_document(
-        auth_header,
         state,
         vault_id,
         request.document_id,
@@ -59,7 +50,6 @@ pub async fn create_document_multipart(
 /// with their content merged.
 #[axum::debug_handler]
 pub async fn create_document_json(
-    TypedHeader(auth_header): TypedHeader<Authorization<Bearer>>,
     Path(CreateDocumentPathParams { vault_id }): Path<CreateDocumentPathParams>,
     State(state): State<AppState>,
     Json(request): Json<CreateDocumentVersion>,
@@ -69,7 +59,6 @@ pub async fn create_document_json(
         .map_err(client_error)?;
 
     internal_create_document(
-        auth_header,
         state,
         vault_id,
         request.document_id,
@@ -80,15 +69,12 @@ pub async fn create_document_json(
 }
 
 async fn internal_create_document(
-    auth_header: Authorization<Bearer>,
     state: AppState,
     vault_id: VaultId,
     document_id: Option<DocumentId>,
     relative_path: String,
     content: Vec<u8>,
 ) -> Result<Json<DocumentVersionWithoutContent>, SyncServerError> {
-    auth(&state, auth_header.token(), &vault_id)?;
-
     let mut transaction = state
         .database
         .create_write_transaction(&vault_id)
diff --git a/backend/sync_server/src/server/delete_document.rs b/backend/sync_server/src/server/delete_document.rs
index 82955676..f278f773 100644
--- a/backend/sync_server/src/server/delete_document.rs
+++ b/backend/sync_server/src/server/delete_document.rs
@@ -1,14 +1,10 @@
 use anyhow::Context as _;
 use axum::extract::{Path, State};
-use axum_extra::{
-    TypedHeader,
-    headers::{Authorization, authorization::Bearer},
-};
 use axum_jsonschema::Json;
 use schemars::JsonSchema;
 use serde::Deserialize;
 
-use super::{auth::auth, requests::DeleteDocumentVersion};
+use super::requests::DeleteDocumentVersion;
 use crate::{
     app_state::{
         AppState,
@@ -29,7 +25,6 @@ pub struct DeleteDocumentPathParams {
 
 #[axum::debug_handler]
 pub async fn delete_document(
-    TypedHeader(auth_header): TypedHeader<Authorization<Bearer>>,
     Path(DeleteDocumentPathParams {
         vault_id,
         document_id,
@@ -37,8 +32,6 @@ pub async fn delete_document(
     State(state): State<AppState>,
     Json(request): Json<DeleteDocumentVersion>,
 ) -> Result<Json<DocumentVersionWithoutContent>, SyncServerError> {
-    auth(&state, auth_header.token(), &vault_id)?;
-
     let mut transaction = state
         .database
         .create_write_transaction(&vault_id)
diff --git a/backend/sync_server/src/server/fetch_document_version.rs b/backend/sync_server/src/server/fetch_document_version.rs
index 87900696..195ae011 100644
--- a/backend/sync_server/src/server/fetch_document_version.rs
+++ b/backend/sync_server/src/server/fetch_document_version.rs
@@ -1,14 +1,9 @@
 use anyhow::anyhow;
 use axum::extract::{Path, State};
-use axum_extra::{
-    TypedHeader,
-    headers::{Authorization, authorization::Bearer},
-};
 use axum_jsonschema::Json;
 use schemars::JsonSchema;
 use serde::Deserialize;
 
-use super::auth::auth;
 use crate::{
     app_state::{
         AppState,
@@ -27,7 +22,6 @@ pub struct FetchDocumentVersionPathParams {
 
 #[axum::debug_handler]
 pub async fn fetch_document_version(
-    TypedHeader(auth_header): TypedHeader<Authorization<Bearer>>,
     Path(FetchDocumentVersionPathParams {
         vault_id,
         document_id,
@@ -35,8 +29,6 @@ pub async fn fetch_document_version(
     }): Path<FetchDocumentVersionPathParams>,
     State(state): State<AppState>,
 ) -> Result<Json<DocumentVersion>, SyncServerError> {
-    auth(&state, auth_header.token(), &vault_id)?;
-
     let result = state
         .database
         .get_document_version(&vault_id, vault_update_id, None)
diff --git a/backend/sync_server/src/server/fetch_document_version_content.rs b/backend/sync_server/src/server/fetch_document_version_content.rs
index 24eddf40..9708c4e5 100644
--- a/backend/sync_server/src/server/fetch_document_version_content.rs
+++ b/backend/sync_server/src/server/fetch_document_version_content.rs
@@ -3,14 +3,9 @@ use axum::{
     body::Bytes,
     extract::{Path, State},
 };
-use axum_extra::{
-    TypedHeader,
-    headers::{Authorization, authorization::Bearer},
-};
 use schemars::JsonSchema;
 use serde::Deserialize;
 
-use super::auth::auth;
 use crate::{
     app_state::{
         AppState,
@@ -29,7 +24,6 @@ pub struct FetchDocumentVersionContentPathParams {
 
 #[axum::debug_handler]
 pub async fn fetch_document_version_content(
-    TypedHeader(auth_header): TypedHeader<Authorization<Bearer>>,
     Path(FetchDocumentVersionContentPathParams {
         vault_id,
         document_id,
@@ -37,8 +31,6 @@ pub async fn fetch_document_version_content(
     }): Path<FetchDocumentVersionContentPathParams>,
     State(state): State<AppState>,
 ) -> Result<Bytes, SyncServerError> {
-    auth(&state, auth_header.token(), &vault_id)?;
-
     let result = state
         .database
         .get_document_version(&vault_id, vault_update_id, None)
diff --git a/backend/sync_server/src/server/fetch_latest_document_version.rs b/backend/sync_server/src/server/fetch_latest_document_version.rs
index 5ccfa4e9..c8025711 100644
--- a/backend/sync_server/src/server/fetch_latest_document_version.rs
+++ b/backend/sync_server/src/server/fetch_latest_document_version.rs
@@ -1,14 +1,9 @@
 use anyhow::anyhow;
 use axum::extract::{Path, State};
-use axum_extra::{
-    TypedHeader,
-    headers::{Authorization, authorization::Bearer},
-};
 use axum_jsonschema::Json;
 use schemars::JsonSchema;
 use serde::Deserialize;
 
-use super::auth::auth;
 use crate::{
     app_state::{
         AppState,
@@ -26,15 +21,12 @@ pub struct FetchLatestDocumentVersionPathParams {
 
 #[axum::debug_handler]
 pub async fn fetch_latest_document_version(
-    TypedHeader(auth_header): TypedHeader<Authorization<Bearer>>,
     Path(FetchLatestDocumentVersionPathParams {
         vault_id,
         document_id,
     }): Path<FetchLatestDocumentVersionPathParams>,
     State(state): State<AppState>,
 ) -> Result<Json<DocumentVersion>, SyncServerError> {
-    auth(&state, auth_header.token(), &vault_id)?;
-
     let latest_version = state
         .database
         .get_latest_document(&vault_id, &document_id, None)
diff --git a/backend/sync_server/src/server/fetch_latest_documents.rs b/backend/sync_server/src/server/fetch_latest_documents.rs
index 4b62a2f8..3765f52b 100644
--- a/backend/sync_server/src/server/fetch_latest_documents.rs
+++ b/backend/sync_server/src/server/fetch_latest_documents.rs
@@ -1,13 +1,9 @@
 use axum::extract::{Path, Query, State};
-use axum_extra::{
-    TypedHeader,
-    headers::{Authorization, authorization::Bearer},
-};
 use axum_jsonschema::Json;
 use schemars::JsonSchema;
 use serde::Deserialize;
 
-use super::{auth::auth, responses::FetchLatestDocumentsResponse};
+use super::responses::FetchLatestDocumentsResponse;
 use crate::{
     app_state::{
         AppState,
@@ -30,13 +26,10 @@ pub struct QueryParams {
 
 #[axum::debug_handler]
 pub async fn fetch_latest_documents(
-    TypedHeader(auth_header): TypedHeader<Authorization<Bearer>>,
     Path(FetchLatestDocumentsPathParams { vault_id }): Path<FetchLatestDocumentsPathParams>,
     Query(QueryParams { since_update_id }): Query<QueryParams>,
     State(state): State<AppState>,
 ) -> Result<Json<FetchLatestDocumentsResponse>, SyncServerError> {
-    auth(&state, auth_header.token(), &vault_id)?;
-
     let documents = if let Some(since_update_id) = since_update_id {
         state
             .database
diff --git a/backend/sync_server/src/server/update_document.rs b/backend/sync_server/src/server/update_document.rs
index 5bb39b70..c953b687 100644
--- a/backend/sync_server/src/server/update_document.rs
+++ b/backend/sync_server/src/server/update_document.rs
@@ -1,10 +1,6 @@
 use aide_axum_typed_multipart::TypedMultipart;
 use anyhow::{Context as _, anyhow};
 use axum::extract::{Path, State};
-use axum_extra::{
-    TypedHeader,
-    headers::{Authorization, authorization::Bearer},
-};
 use axum_jsonschema::Json;
 use log::info;
 use schemars::JsonSchema;
@@ -12,7 +8,6 @@ use serde::Deserialize;
 use sync_lib::{base64_to_bytes, is_file_type_mergable, merge};
 
 use super::{
-    auth::auth,
     requests::{UpdateDocumentVersion, UpdateDocumentVersionMultipart},
     responses::DocumentUpdateResponse,
 };
@@ -34,7 +29,6 @@ pub struct UpdateDocumentPathParams {
 
 #[axum::debug_handler]
 pub async fn update_document_multipart(
-    TypedHeader(auth_header): TypedHeader<Authorization<Bearer>>,
     Path(UpdateDocumentPathParams {
         vault_id,
         document_id,
@@ -45,7 +39,6 @@ pub async fn update_document_multipart(
     >,
 ) -> Result<Json<DocumentUpdateResponse>, SyncServerError> {
     internal_update_document(
-        auth_header,
         state,
         vault_id,
         document_id,
@@ -58,7 +51,6 @@ pub async fn update_document_multipart(
 
 #[axum::debug_handler]
 pub async fn update_document_json(
-    TypedHeader(auth_header): TypedHeader<Authorization<Bearer>>,
     Path(UpdateDocumentPathParams {
         vault_id,
         document_id,
@@ -71,7 +63,6 @@ pub async fn update_document_json(
         .map_err(client_error)?;
 
     internal_update_document(
-        auth_header,
         state,
         vault_id,
         document_id,
@@ -84,7 +75,6 @@ pub async fn update_document_json(
 
 #[allow(clippy::too_many_arguments, clippy::too_many_lines)]
 async fn internal_update_document(
-    auth_header: Authorization<Bearer>,
     state: AppState,
     vault_id: VaultId,
     document_id: DocumentId,
@@ -92,8 +82,6 @@ async fn internal_update_document(
     relative_path: String,
     content: Vec<u8>,
 ) -> Result<Json<DocumentUpdateResponse>, SyncServerError> {
-    auth(&state, auth_header.token(), &vault_id)?;
-
     // No need for a transaction as document versions are immutable
     let parent_document = state
         .database

From 0e53631cc80b52f0844e9b69ec8cd74295e9b1df Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 4 Apr 2025 21:48:27 +0100
Subject: [PATCH 403/761] Format

---
 backend/sync_server/src/server/auth.rs | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/backend/sync_server/src/server/auth.rs b/backend/sync_server/src/server/auth.rs
index 7cd0b26b..3a1f5939 100644
--- a/backend/sync_server/src/server/auth.rs
+++ b/backend/sync_server/src/server/auth.rs
@@ -17,7 +17,6 @@ use crate::{
     errors::{SyncServerError, permission_denied_error, unauthenticated_error},
 };
 
-
 pub async fn auth_middleware(
     State(state): State<AppState>,
     Path(path_params): Path<HashMap<String, String>>,
@@ -37,11 +36,7 @@ pub async fn auth_middleware(
     Ok(next.run(req).await)
 }
 
-pub fn auth(
-    state: &AppState,
-    token: &str,
-    vault_id: &VaultId,
-) -> Result<User, SyncServerError> {
+pub fn auth(state: &AppState, token: &str, vault_id: &VaultId) -> Result<User, SyncServerError> {
     let user = state
         .config
         .users

From 5923eaa88f6243e824c8e7bb91ed0f1e5d8c6335 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 4 Apr 2025 21:52:19 +0100
Subject: [PATCH 404/761] Bump rust from 1.85 to 1.86 in /backend (#22)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 backend/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/Dockerfile b/backend/Dockerfile
index 5a51d15c..6f1a31d1 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.85 AS builder
+FROM rust:1.86 AS builder
 
 WORKDIR /usr/src/backend
 

From 3881f56b45908306b137073294bfa45c7a11ec2e Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 4 Apr 2025 21:58:05 +0100
Subject: [PATCH 405/761] Bump rust deps

---
 backend/Cargo.lock                            | 81 +++++++++++++++----
 backend/sync_server/Cargo.toml                |  5 +-
 backend/sync_server/src/config.rs             |  8 +-
 backend/sync_server/src/config/user_config.rs |  4 +-
 backend/sync_server/src/errors.rs             | 10 +--
 backend/sync_server/src/server/websocket.rs   |  9 +--
 6 files changed, 81 insertions(+), 36 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 20235b5e..b0ee9b59 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -28,7 +28,7 @@ dependencies = [
  "once_cell",
  "serde",
  "version_check",
- "zerocopy",
+ "zerocopy 0.7.35",
 ]
 
 [[package]]
@@ -1446,9 +1446,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.22"
+version = "0.4.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
 
 [[package]]
 name = "matchers"
@@ -1596,7 +1596,7 @@ dependencies = [
  "num-integer",
  "num-iter",
  "num-traits",
- "rand",
+ "rand 0.8.5",
  "smallvec",
  "zeroize",
 ]
@@ -1799,7 +1799,7 @@ version = "0.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
 dependencies = [
- "zerocopy",
+ "zerocopy 0.7.35",
 ]
 
 [[package]]
@@ -1867,8 +1867,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
  "libc",
- "rand_chacha",
- "rand_core",
+ "rand_chacha 0.3.1",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rand"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94"
+dependencies = [
+ "rand_chacha 0.9.0",
+ "rand_core 0.9.3",
+ "zerocopy 0.8.24",
 ]
 
 [[package]]
@@ -1878,7 +1889,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
 dependencies = [
  "ppv-lite86",
- "rand_core",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.9.3",
 ]
 
 [[package]]
@@ -1890,6 +1911,15 @@ dependencies = [
  "getrandom 0.2.15",
 ]
 
+[[package]]
+name = "rand_core"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
+dependencies = [
+ "getrandom 0.3.2",
+]
+
 [[package]]
 name = "reconcile"
 version = "0.3.5"
@@ -1967,7 +1997,7 @@ dependencies = [
  "num-traits",
  "pkcs1",
  "pkcs8",
- "rand_core",
+ "rand_core 0.6.4",
  "signature",
  "spki",
  "subtle",
@@ -2207,7 +2237,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
 dependencies = [
  "digest",
- "rand_core",
+ "rand_core 0.6.4",
 ]
 
 [[package]]
@@ -2380,7 +2410,7 @@ dependencies = [
  "memchr",
  "once_cell",
  "percent-encoding",
- "rand",
+ "rand 0.8.5",
  "rsa",
  "serde",
  "sha1",
@@ -2420,7 +2450,7 @@ dependencies = [
  "md-5",
  "memchr",
  "once_cell",
- "rand",
+ "rand 0.8.5",
  "serde",
  "serde_json",
  "sha2",
@@ -2537,8 +2567,7 @@ dependencies = [
  "clap-verbosity-flag",
  "futures",
  "log",
- "rand",
- "reconcile",
+ "rand 0.9.0",
  "regex",
  "sanitize-filename",
  "schemars",
@@ -2895,7 +2924,7 @@ dependencies = [
  "http",
  "httparse",
  "log",
- "rand",
+ "rand 0.8.5",
  "sha1",
  "thiserror 1.0.69",
  "utf-8",
@@ -3404,7 +3433,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
 dependencies = [
  "byteorder",
- "zerocopy-derive",
+ "zerocopy-derive 0.7.35",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.8.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2586fea28e186957ef732a5f8b3be2da217d65c5969d4b1e17f973ebbe876879"
+dependencies = [
+ "zerocopy-derive 0.8.24",
 ]
 
 [[package]]
@@ -3418,6 +3456,17 @@ dependencies = [
  "syn 2.0.90",
 ]
 
+[[package]]
+name = "zerocopy-derive"
+version = "0.8.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a996a8f63c5c4448cd959ac1bab0aaa3306ccfd060472f85943ee0750f0169be"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
 [[package]]
 name = "zerofrom"
 version = "0.1.5"
diff --git a/backend/sync_server/Cargo.toml b/backend/sync_server/Cargo.toml
index 4c8c655a..cce5b636 100644
--- a/backend/sync_server/Cargo.toml
+++ b/backend/sync_server/Cargo.toml
@@ -7,7 +7,6 @@ license.workspace = true
 repository.workspace = true
 
 [dependencies]
-reconcile = { path = "../reconcile" }
 sync_lib = { path = "../sync_lib" }
 
 serde = { workspace = true }
@@ -15,7 +14,7 @@ thiserror = { workspace = true }
 
 tokio = { version = "1.44.1", features = ["full"]}
 uuid = { version = "1.16.0", features = ["v4", "serde"] }
-log = { version = "0.4.22" }
+log = { version = "0.4.27" }
 anyhow =  { version = "1.0.97", features = ["backtrace"] }
 axum = { version = "0.7.4", features = ["ws", "macros", "tracing", "multipart"]}
 axum-extra = { version = "0.9.6", features = ["typed-header"] }
@@ -29,7 +28,7 @@ chrono = { version = "0.4.40", features = ["serde"] }
 aide = { version = "0.13.4", features = ["axum", "axum-ws", "scalar", "axum-headers"] }
 schemars = { version = "0.8.21", features = ["chrono", "uuid1", "bytes"] }
 tracing = "0.1.41"
-rand = "0.8.5"
+rand = "0.9.0"
 sanitize-filename = "0.6.0"
 axum-jsonschema = { version = "0.8.0", features = ["aide"] }
 regex = "1.11.1"
diff --git a/backend/sync_server/src/config.rs b/backend/sync_server/src/config.rs
index 862dd0e7..8e4dcef3 100644
--- a/backend/sync_server/src/config.rs
+++ b/backend/sync_server/src/config.rs
@@ -26,16 +26,16 @@ impl Config {
     pub async fn read_or_create(path: &Path) -> Result<Self> {
         if path.exists() {
             info!(
-                "Loading configuration from {:?}",
-                path.canonicalize().unwrap()
+                "Loading configuration from '{}'",
+                path.canonicalize().unwrap().display()
             );
             Self::load_from_file(path).await
         } else {
             let config = Self::default();
             config.write(path).await?;
             warn!(
-                "Configuration file not found, wrote default configuration to {:?}",
-                path.canonicalize().unwrap()
+                "Configuration file not found, wrote default configuration to '{}'",
+                path.canonicalize().unwrap().display()
             );
             Ok(config)
         }
diff --git a/backend/sync_server/src/config/user_config.rs b/backend/sync_server/src/config/user_config.rs
index fea80894..2450c3aa 100644
--- a/backend/sync_server/src/config/user_config.rs
+++ b/backend/sync_server/src/config/user_config.rs
@@ -1,4 +1,4 @@
-use rand::{Rng as _, distributions::Alphanumeric, thread_rng};
+use rand::{Rng, distr::Alphanumeric, rng};
 use serde::{Deserialize, Serialize};
 
 use crate::app_state::database::models::VaultId;
@@ -53,7 +53,7 @@ fn default_users() -> Vec<User> {
 }
 
 pub fn get_random_token() -> String {
-    thread_rng()
+    rng()
         .sample_iter(&Alphanumeric)
         .take(64)
         .map(char::from)
diff --git a/backend/sync_server/src/errors.rs b/backend/sync_server/src/errors.rs
index 69b38d26..a16f7137 100644
--- a/backend/sync_server/src/errors.rs
+++ b/backend/sync_server/src/errors.rs
@@ -105,26 +105,26 @@ pub const fn init_error(error: anyhow::Error) -> SyncServerError {
 }
 
 pub fn server_error(error: anyhow::Error) -> SyncServerError {
-    error!("Server error: {:?}", error);
+    error!("Server error: {error:?}");
     SyncServerError::ServerError(error)
 }
 
 pub fn client_error(error: anyhow::Error) -> SyncServerError {
-    info!("Client error: {:?}", error);
+    info!("Client error: {error:?}");
     SyncServerError::ClientError(error)
 }
 
 pub fn not_found_error(error: anyhow::Error) -> SyncServerError {
-    info!("Not found: {:?}", error);
+    info!("Not found: {error:?}");
     SyncServerError::NotFound(error)
 }
 
 pub fn unauthenticated_error(error: anyhow::Error) -> SyncServerError {
-    info!("Unauthenticated user: {:?}", error);
+    info!("Unauthenticated user: {error:?}");
     SyncServerError::Unauthenticated(error)
 }
 
 pub fn permission_denied_error(error: anyhow::Error) -> SyncServerError {
-    info!("Permission denied: {:?}", error);
+    info!("Permission denied: {error:?}");
     SyncServerError::PermissionDeniedError(error)
 }
diff --git a/backend/sync_server/src/server/websocket.rs b/backend/sync_server/src/server/websocket.rs
index d672b944..aa5bc88e 100644
--- a/backend/sync_server/src/server/websocket.rs
+++ b/backend/sync_server/src/server/websocket.rs
@@ -50,18 +50,15 @@ async fn websocket_wrapped(
     vault_id: VaultId,
     since_update_id: Option<VaultUpdateId>,
 ) {
-    info!("Websocket connection opened on vault '{}'", vault_id);
+    info!("Websocket connection opened on vault '{vault_id}'");
 
     let result = websocket(state, stream, vault_id.clone(), since_update_id).await;
 
     if let Err(err) = result {
-        error!(
-            "Websocket connection error on vault '{}': {}",
-            vault_id, err
-        );
+        error!("Websocket connection error on vault '{vault_id}': {err}");
     }
 
-    warn!("Websocket connection closed on vault '{}'", vault_id);
+    warn!("Websocket connection closed on vault '{vault_id}'");
 }
 
 async fn websocket(

From d9774f364f47d2e6c85b65764f76567af0fd5231 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 4 Apr 2025 21:58:19 +0100
Subject: [PATCH 406/761] Add machete to checks

---
 .github/workflows/check.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 9cff4023..8ae2628f 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -25,7 +25,7 @@ jobs:
 
       - name: Setup rust
         run: |
-          cargo install sqlx-cli wasm-pack
+          cargo install sqlx-cli wasm-pack machete
           cd backend
           sqlx database create --database-url sqlite://db.sqlite3
           sqlx migrate run --source sync_server/src/app_state/database/migrations --database-url sqlite://db.sqlite3
@@ -40,6 +40,7 @@ jobs:
           cd backend
           cargo clippy --all-targets --all-features
           cargo fmt --all -- --check
+          cargo machete
 
       - name: Test backend
         run: |

From 9199915362a84c9d8b07a17bc6e7f348f3410f64 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 4 Apr 2025 21:58:32 +0100
Subject: [PATCH 407/761] Update editorconfig

---
 .editorconfig          |  3 +++
 backend/config-e2e.yml | 36 ++++++++++++++++++------------------
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 5773d4e4..9c63a68d 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -9,3 +9,6 @@ trim_trailing_whitespace = true
 charset = utf-8
 indent_style = space
 indent_size = 4
+
+[*.{yml,yaml}]
+indent_size = 2
diff --git a/backend/config-e2e.yml b/backend/config-e2e.yml
index ff916c3f..40df4c89 100644
--- a/backend/config-e2e.yml
+++ b/backend/config-e2e.yml
@@ -1,24 +1,24 @@
 database:
-    databases_directory_path: databases
-    max_connections_per_vault: 12
+  databases_directory_path: databases
+  max_connections_per_vault: 12
 
 server:
-    host: 0.0.0.0
-    port: 3000
-    max_body_size_mb: 512
-    max_clients_per_vault: 256
-    response_timeout_seconds: 60
+  host: 0.0.0.0
+  port: 3000
+  max_body_size_mb: 512
+  max_clients_per_vault: 256
+  response_timeout_seconds: 60
 
 users:
-    user_tokens:
-        - name: admin
-          token: test-token-change-me
-          vault_access:
-              type: allow_access_to_all
+  user_tokens:
+    - name: admin
+      token: test-token-change-me
+      vault_access:
+        type: allow_access_to_all
 
-        - name: test
-          token: other-test-token
-          vault_access:
-              type: allow_list
-              allowed:
-                  - default
+    - name: test
+      token: other-test-token
+      vault_access:
+        type: allow_list
+        allowed:
+          - default

From 11e2d121b13a0d318c0f9ebae7283f6cd3a7942b Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 4 Apr 2025 22:02:24 +0100
Subject: [PATCH 408/761] Update API types

---
 .../sync-client/src/services/sync-service.ts  |  25 ++--
 frontend/sync-client/src/services/types.ts    | 128 ++++++++----------
 2 files changed, 63 insertions(+), 90 deletions(-)

diff --git a/frontend/sync-client/src/services/sync-service.ts b/frontend/sync-client/src/services/sync-service.ts
index 79c7a382..4af744ee 100644
--- a/frontend/sync-client/src/services/sync-service.ts
+++ b/frontend/sync-client/src/services/sync-service.ts
@@ -87,9 +87,6 @@ export class SyncService {
 					params: {
 						path: {
 							vault_id: vaultName
-						},
-						header: {
-							authorization: `Bearer ${this.settings.getSettings().token}`
 						}
 					},
 					// eslint-disable-next-line
@@ -142,9 +139,6 @@ export class SyncService {
 						path: {
 							vault_id: vaultName,
 							document_id: documentId
-						},
-						header: {
-							authorization: `Bearer ${this.settings.getSettings().token}`
 						}
 					},
 					// eslint-disable-next-line
@@ -185,9 +179,6 @@ export class SyncService {
 						path: {
 							vault_id: vaultName,
 							document_id: documentId
-						},
-						header: {
-							authorization: `Bearer ${this.settings.getSettings().token}`
 						}
 					},
 					body: {
@@ -223,9 +214,6 @@ export class SyncService {
 						path: {
 							vault_id: vaultName,
 							document_id: documentId
-						},
-						header: {
-							authorization: `Bearer ${this.settings.getSettings().token}`
 						}
 					}
 				}
@@ -258,9 +246,6 @@ export class SyncService {
 						path: {
 							vault_id: vaultName
 						},
-						header: {
-							authorization: `Bearer ${this.settings.getSettings().token}`
-						},
 						query: {
 							since_update_id: since
 						}
@@ -341,11 +326,17 @@ export class SyncService {
 				fetch: this.connectionStatus.getFetchImplementation(
 					this.logger,
 					this._fetchImplementation
-				)
+				),
+				headers: {
+					authorization: `Bearer ${this.settings.getSettings().token}`
+				}
 			}),
 			createClient<paths>({
 				baseUrl: remoteUri,
-				fetch: this._fetchImplementation
+				fetch: this._fetchImplementation,
+				headers: {
+					authorization: `Bearer ${this.settings.getSettings().token}`
+				}
 			})
 		];
 	}
diff --git a/frontend/sync-client/src/services/types.ts b/frontend/sync-client/src/services/types.ts
index 29983c8d..55f72315 100644
--- a/frontend/sync-client/src/services/types.ts
+++ b/frontend/sync-client/src/services/types.ts
@@ -4,52 +4,6 @@
  */
 
 export interface paths {
-	"/vaults/{vault_id}/ping": {
-		parameters: {
-			query?: never;
-			header?: never;
-			path?: never;
-			cookie?: never;
-		};
-		get: {
-			parameters: {
-				query?: never;
-				header?: {
-					authorization?: string;
-				};
-				path: {
-					vault_id: string;
-				};
-				cookie?: never;
-			};
-			requestBody?: never;
-			responses: {
-				200: {
-					headers: {
-						[name: string]: unknown;
-					};
-					content: {
-						"application/json": components["schemas"]["PingResponse"];
-					};
-				};
-				default: {
-					headers: {
-						[name: string]: unknown;
-					};
-					content: {
-						"application/json": components["schemas"]["SerializedError"];
-					};
-				};
-			};
-		};
-		put?: never;
-		post?: never;
-		delete?: never;
-		options?: never;
-		head?: never;
-		patch?: never;
-		trace?: never;
-	};
 	"/vaults/{vault_id}/documents": {
 		parameters: {
 			query?: never;
@@ -62,9 +16,7 @@ export interface paths {
 				query?: {
 					since_update_id?: number | null;
 				};
-				header: {
-					authorization: string;
-				};
+				header?: never;
 				path: {
 					vault_id: string;
 				};
@@ -94,9 +46,7 @@ export interface paths {
 		post: {
 			parameters: {
 				query?: never;
-				header: {
-					authorization: string;
-				};
+				header?: never;
 				path: {
 					vault_id: string;
 				};
@@ -144,9 +94,7 @@ export interface paths {
 		post: {
 			parameters: {
 				query?: never;
-				header: {
-					authorization: string;
-				};
+				header?: never;
 				path: {
 					vault_id: string;
 				};
@@ -192,9 +140,7 @@ export interface paths {
 		get: {
 			parameters: {
 				query?: never;
-				header: {
-					authorization: string;
-				};
+				header?: never;
 				path: {
 					document_id: string;
 					vault_id: string;
@@ -224,9 +170,7 @@ export interface paths {
 		put: {
 			parameters: {
 				query?: never;
-				header: {
-					authorization: string;
-				};
+				header?: never;
 				path: {
 					document_id: string;
 					vault_id: string;
@@ -261,9 +205,7 @@ export interface paths {
 		delete: {
 			parameters: {
 				query?: never;
-				header: {
-					authorization: string;
-				};
+				header?: never;
 				path: {
 					document_id: string;
 					vault_id: string;
@@ -310,9 +252,7 @@ export interface paths {
 		put: {
 			parameters: {
 				query?: never;
-				header: {
-					authorization: string;
-				};
+				header?: never;
 				path: {
 					document_id: string;
 					vault_id: string;
@@ -361,9 +301,7 @@ export interface paths {
 		put: {
 			parameters: {
 				query?: never;
-				header: {
-					authorization: string;
-				};
+				header?: never;
 				path: {
 					document_id: string;
 					vault_id: string;
@@ -409,9 +347,7 @@ export interface paths {
 		put: {
 			parameters: {
 				query?: never;
-				header: {
-					authorization: string;
-				};
+				header?: never;
 				path: {
 					document_id: string;
 					vault_id: string;
@@ -447,6 +383,52 @@ export interface paths {
 		patch?: never;
 		trace?: never;
 	};
+	"/vaults/{vault_id}/ping": {
+		parameters: {
+			query?: never;
+			header?: never;
+			path?: never;
+			cookie?: never;
+		};
+		get: {
+			parameters: {
+				query?: never;
+				header?: {
+					authorization?: string;
+				};
+				path: {
+					vault_id: string;
+				};
+				cookie?: never;
+			};
+			requestBody?: never;
+			responses: {
+				200: {
+					headers: {
+						[name: string]: unknown;
+					};
+					content: {
+						"application/json": components["schemas"]["PingResponse"];
+					};
+				};
+				default: {
+					headers: {
+						[name: string]: unknown;
+					};
+					content: {
+						"application/json": components["schemas"]["SerializedError"];
+					};
+				};
+			};
+		};
+		put?: never;
+		post?: never;
+		delete?: never;
+		options?: never;
+		head?: never;
+		patch?: never;
+		trace?: never;
+	};
 }
 export type webhooks = Record<string, never>;
 export interface components {

From 648db73628a4439856ff8e78ba518f4d78f31d11 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 4 Apr 2025 23:13:50 +0100
Subject: [PATCH 409/761] Add device id and use it to filter out updates coming
 from the same device

---
 .../sync_server/src/app_state/broadcasts.rs   | 22 +++++-----
 .../src/app_state/database/models.rs          |  1 +
 backend/sync_server/src/server.rs             |  2 +-
 .../sync_server/src/server/create_document.rs | 14 +++++-
 .../sync_server/src/server/delete_document.rs |  9 +++-
 backend/sync_server/src/server/requests.rs    |  7 ++-
 .../sync_server/src/server/update_document.rs | 44 +++++++++++++++++--
 backend/sync_server/src/server/websocket.rs   | 27 +++++++++---
 8 files changed, 101 insertions(+), 25 deletions(-)

diff --git a/backend/sync_server/src/app_state/broadcasts.rs b/backend/sync_server/src/app_state/broadcasts.rs
index 9d2d2192..f71886cf 100644
--- a/backend/sync_server/src/app_state/broadcasts.rs
+++ b/backend/sync_server/src/app_state/broadcasts.rs
@@ -3,13 +3,19 @@ use std::{collections::HashMap, sync::Arc};
 use anyhow::Context;
 use tokio::sync::{Mutex, broadcast};
 
-use super::database::models::{DocumentVersionWithoutContent, VaultId};
+use super::database::models::{DeviceId, DocumentVersionWithoutContent, VaultId};
 use crate::{config::server_config::ServerConfig, errors::server_error};
 
 #[derive(Debug, Clone)]
 pub struct Broadcasts {
     max_clients_per_vault: usize,
-    tx: Arc<Mutex<HashMap<VaultId, broadcast::Sender<DocumentVersionWithoutContent>>>>,
+    tx: Arc<Mutex<HashMap<VaultId, broadcast::Sender<VaultUpdate>>>>,
+}
+
+#[derive(Debug, Clone)]
+pub struct VaultUpdate {
+    pub origin_device_id: Option<DeviceId>,
+    pub document: DocumentVersionWithoutContent,
 }
 
 impl Broadcasts {
@@ -20,10 +26,7 @@ impl Broadcasts {
         }
     }
 
-    pub async fn get_receiver(
-        &self,
-        vault: VaultId,
-    ) -> broadcast::Receiver<DocumentVersionWithoutContent> {
+    pub async fn get_receiver(&self, vault: VaultId) -> broadcast::Receiver<VaultUpdate> {
         let tx = self.get_or_create(vault).await;
 
         tx.subscribe()
@@ -31,7 +34,7 @@ impl Broadcasts {
 
     /// Sent a document update to all clients subscribed to the vault.
     /// We ignore & log failures.
-    pub async fn send(&self, vault: VaultId, document: DocumentVersionWithoutContent) {
+    pub async fn send(&self, vault: VaultId, document: VaultUpdate) {
         let tx = self.get_or_create(vault).await;
 
         let result = tx
@@ -44,10 +47,7 @@ impl Broadcasts {
         }
     }
 
-    async fn get_or_create(
-        &self,
-        vault: VaultId,
-    ) -> broadcast::Sender<DocumentVersionWithoutContent> {
+    async fn get_or_create(&self, vault: VaultId) -> broadcast::Sender<VaultUpdate> {
         let mut tx = self.tx.lock().await;
 
         tx.entry(vault)
diff --git a/backend/sync_server/src/app_state/database/models.rs b/backend/sync_server/src/app_state/database/models.rs
index a837e93c..55079c81 100644
--- a/backend/sync_server/src/app_state/database/models.rs
+++ b/backend/sync_server/src/app_state/database/models.rs
@@ -6,6 +6,7 @@ use sync_lib::bytes_to_base64;
 pub type VaultId = String;
 pub type VaultUpdateId = i64;
 pub type DocumentId = uuid::Uuid;
+pub type DeviceId = String;
 
 #[derive(Debug, Clone)]
 pub struct StoredDocumentVersion {
diff --git a/backend/sync_server/src/server.rs b/backend/sync_server/src/server.rs
index 45d43d85..e993ed15 100644
--- a/backend/sync_server/src/server.rs
+++ b/backend/sync_server/src/server.rs
@@ -86,7 +86,7 @@ pub async fn create_server(config_path: Option<OsString>) -> Result<()> {
             TraceLayer::new_for_http()
                 .make_span_with(|request: &Request<_>| {
                     info_span!(
-                        "http_request",
+                        "http",
                         method = ?request.method(),
                         uri = ?request.uri(),
                     )
diff --git a/backend/sync_server/src/server/create_document.rs b/backend/sync_server/src/server/create_document.rs
index bc54264b..1c2e6126 100644
--- a/backend/sync_server/src/server/create_document.rs
+++ b/backend/sync_server/src/server/create_document.rs
@@ -10,8 +10,9 @@ use super::requests::{CreateDocumentVersion, CreateDocumentVersionMultipart};
 use crate::{
     app_state::{
         AppState,
+        broadcasts::VaultUpdate,
         database::models::{
-            DocumentId, DocumentVersionWithoutContent, StoredDocumentVersion, VaultId,
+            DeviceId, DocumentId, DocumentVersionWithoutContent, StoredDocumentVersion, VaultId,
         },
     },
     errors::{SyncServerError, client_error, server_error},
@@ -40,6 +41,7 @@ pub async fn create_document_multipart(
         vault_id,
         request.document_id,
         request.relative_path,
+        request.device_id,
         request.content.contents.to_vec(),
     )
     .await
@@ -63,6 +65,7 @@ pub async fn create_document_json(
         vault_id,
         request.document_id,
         request.relative_path,
+        request.device_id,
         content_bytes,
     )
     .await
@@ -73,6 +76,7 @@ async fn internal_create_document(
     vault_id: VaultId,
     document_id: Option<DocumentId>,
     relative_path: String,
+    device_id: Option<DeviceId>,
     content: Vec<u8>,
 ) -> Result<Json<DocumentVersionWithoutContent>, SyncServerError> {
     let mut transaction = state
@@ -131,7 +135,13 @@ async fn internal_create_document(
 
     state
         .broadcasts
-        .send(vault_id, new_version.clone().into())
+        .send(
+            vault_id,
+            VaultUpdate {
+                origin_device_id: device_id,
+                document: new_version.clone().into(),
+            },
+        )
         .await;
 
     Ok(Json(new_version.into()))
diff --git a/backend/sync_server/src/server/delete_document.rs b/backend/sync_server/src/server/delete_document.rs
index f278f773..2d02decc 100644
--- a/backend/sync_server/src/server/delete_document.rs
+++ b/backend/sync_server/src/server/delete_document.rs
@@ -8,6 +8,7 @@ use super::requests::DeleteDocumentVersion;
 use crate::{
     app_state::{
         AppState,
+        broadcasts::VaultUpdate,
         database::models::{
             DocumentId, DocumentVersionWithoutContent, StoredDocumentVersion, VaultId,
         },
@@ -67,7 +68,13 @@ pub async fn delete_document(
 
     state
         .broadcasts
-        .send(vault_id, new_version.clone().into())
+        .send(
+            vault_id,
+            VaultUpdate {
+                origin_device_id: request.device_id,
+                document: new_version.clone().into(),
+            },
+        )
         .await;
 
     Ok(Json(new_version.into()))
diff --git a/backend/sync_server/src/server/requests.rs b/backend/sync_server/src/server/requests.rs
index 89820dbe..26e6a398 100644
--- a/backend/sync_server/src/server/requests.rs
+++ b/backend/sync_server/src/server/requests.rs
@@ -4,7 +4,7 @@ use axum_typed_multipart::TryFromMultipart;
 use schemars::JsonSchema;
 use serde::{self, Deserialize};
 
-use crate::app_state::database::models::{DocumentId, VaultUpdateId};
+use crate::app_state::database::models::{DeviceId, DocumentId, VaultUpdateId};
 
 #[derive(Debug, Deserialize, JsonSchema)]
 #[serde(rename_all = "camelCase")]
@@ -16,6 +16,7 @@ pub struct CreateDocumentVersion {
     pub document_id: Option<DocumentId>,
     pub relative_path: String,
     pub content_base64: String,
+    pub device_id: Option<DeviceId>,
 }
 
 #[derive(Debug, TryFromMultipart, JsonSchema)]
@@ -24,6 +25,7 @@ pub struct CreateDocumentVersionMultipart {
     pub relative_path: String,
     #[form_data(limit = "unlimited")]
     pub content: FieldData<Bytes>,
+    pub device_id: Option<DeviceId>,
 }
 
 #[derive(Debug, Deserialize, JsonSchema)]
@@ -32,6 +34,7 @@ pub struct UpdateDocumentVersion {
     pub parent_version_id: VaultUpdateId,
     pub relative_path: String,
     pub content_base64: String,
+    pub device_id: Option<DeviceId>,
 }
 
 #[derive(Debug, TryFromMultipart, JsonSchema)]
@@ -41,10 +44,12 @@ pub struct UpdateDocumentVersionMultipart {
     pub relative_path: String,
     #[form_data(limit = "unlimited")]
     pub content: FieldData<Bytes>,
+    pub device_id: Option<DeviceId>,
 }
 
 #[derive(Debug, Deserialize, JsonSchema)]
 #[serde(rename_all = "camelCase")]
 pub struct DeleteDocumentVersion {
     pub relative_path: String,
+    pub device_id: Option<DeviceId>,
 }
diff --git a/backend/sync_server/src/server/update_document.rs b/backend/sync_server/src/server/update_document.rs
index c953b687..a572394f 100644
--- a/backend/sync_server/src/server/update_document.rs
+++ b/backend/sync_server/src/server/update_document.rs
@@ -14,7 +14,8 @@ use super::{
 use crate::{
     app_state::{
         AppState,
-        database::models::{DocumentId, StoredDocumentVersion, VaultId, VaultUpdateId},
+        broadcasts::VaultUpdate,
+        database::models::{DeviceId, DocumentId, StoredDocumentVersion, VaultId, VaultUpdateId},
     },
     errors::{SyncServerError, client_error, not_found_error, server_error},
     utils::{deduped_file_paths, sanitize_path},
@@ -44,6 +45,7 @@ pub async fn update_document_multipart(
         document_id,
         request.parent_version_id,
         request.relative_path,
+        request.device_id,
         request.content.contents.to_vec(),
     )
     .await
@@ -68,6 +70,7 @@ pub async fn update_document_json(
         document_id,
         request.parent_version_id,
         request.relative_path,
+        request.device_id,
         content_bytes,
     )
     .await
@@ -80,6 +83,7 @@ async fn internal_update_document(
     document_id: DocumentId,
     parent_version_id: VaultUpdateId,
     relative_path: String,
+    device_id: Option<DeviceId>,
     content: Vec<u8>,
 ) -> Result<Json<DocumentUpdateResponse>, SyncServerError> {
     // No need for a transaction as document versions are immutable
@@ -98,6 +102,34 @@ async fn internal_update_document(
             Ok,
         )?;
 
+    let sanitized_relative_path = sanitize_path(&relative_path);
+
+    // Return the latest version if the update is a no-op from the client's
+    // perspective
+    if content == parent_document.content
+        && sanitized_relative_path == parent_document.relative_path
+    {
+        info!("Document content is the same as the parent version, skipping update");
+
+        let latest_version = state
+            .database
+            .get_latest_document(&vault_id, &document_id, None)
+            .await
+            .map_err(server_error)?
+            .map_or_else(
+                || {
+                    Err(not_found_error(anyhow!(
+                        "Document with id `{document_id}` not found",
+                    )))
+                },
+                Ok,
+            )?;
+
+        return Ok(Json(DocumentUpdateResponse::FastForwardUpdate(
+            latest_version.into(),
+        )));
+    }
+
     let mut transaction = state
         .database
         .create_write_transaction(&vault_id)
@@ -136,8 +168,6 @@ async fn internal_update_document(
         )));
     }
 
-    let sanitized_relative_path = sanitize_path(&relative_path);
-
     // Return the latest version if the content and path are the same as the latest
     // version
     if content == latest_version.content && sanitized_relative_path == latest_version.relative_path
@@ -208,7 +238,13 @@ async fn internal_update_document(
 
     state
         .broadcasts
-        .send(vault_id, new_version.clone().into())
+        .send(
+            vault_id,
+            VaultUpdate {
+                origin_device_id: device_id,
+                document: new_version.clone().into(),
+            },
+        )
         .await;
 
     Ok(Json(if is_different_from_request_content {
diff --git a/backend/sync_server/src/server/websocket.rs b/backend/sync_server/src/server/websocket.rs
index aa5bc88e..7241b12f 100644
--- a/backend/sync_server/src/server/websocket.rs
+++ b/backend/sync_server/src/server/websocket.rs
@@ -18,7 +18,7 @@ use super::auth::auth;
 use crate::{
     app_state::{
         AppState,
-        database::models::{DocumentVersionWithoutContent, VaultId, VaultUpdateId},
+        database::models::{DeviceId, DocumentVersionWithoutContent, VaultId, VaultUpdateId},
     },
     errors::{SyncServerError, server_error, unauthenticated_error},
 };
@@ -61,6 +61,13 @@ async fn websocket_wrapped(
     warn!("Websocket connection closed on vault '{vault_id}'");
 }
 
+#[derive(Deserialize)]
+#[serde(rename_all = "camelCase")]
+struct WebsocketHandshake {
+    pub token: String,
+    pub device_id: DeviceId,
+}
+
 async fn websocket(
     state: AppState,
     stream: WebSocket,
@@ -69,13 +76,19 @@ async fn websocket(
 ) -> Result<(), SyncServerError> {
     let (mut sender, mut receiver) = stream.split();
 
-    if let Some(Ok(Message::Text(token))) = receiver.next().await {
-        auth(&state, &token, &vault_id)?;
+    let handshake = if let Some(Ok(Message::Text(token))) = receiver.next().await {
+        let handshake: WebsocketHandshake = serde_json::from_str(&token)
+            .context("Failed to parse token")
+            .map_err(server_error)?;
+
+        auth(&state, &handshake.token, &vault_id)?;
+
+        handshake
     } else {
         return Err(unauthenticated_error(anyhow::anyhow!(
             "Failed to authenticate"
         )));
-    }
+    };
 
     let mut rx = state.broadcasts.get_receiver(vault_id.clone()).await;
 
@@ -99,7 +112,11 @@ async fn websocket(
 
     let mut send_task = tokio::spawn(async move {
         while let Ok(update) = rx.recv().await {
-            send_document_over_websocket(update, &mut sender).await?;
+            if Some(&handshake.device_id) == update.origin_device_id.as_ref() {
+                continue;
+            }
+
+            send_document_over_websocket(update.document, &mut sender).await?;
         }
 
         Ok::<(), SyncServerError>(())

From 69438a78c633ae21b08a5569125e22a3a79cad8d Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 4 Apr 2025 23:14:37 +0100
Subject: [PATCH 410/761] Fix bug where we didn't update hash on updates

---
 .../src/sync-operations/unrestricted-syncer.ts   | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
index c7e01cd6..43cb5c7c 100644
--- a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
+++ b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
@@ -236,6 +236,14 @@ export class UnrestrictedSyncer {
 					const responseBytes = deserialize(response.contentBase64);
 					contentHash = hash(responseBytes);
 
+					this.database.updateDocumentMetadata(
+						{
+							parentVersionId: response.vaultUpdateId,
+							hash: contentHash
+						},
+						document
+					);
+
 					await this.operations.write(
 						actualPath,
 						contentBytes,
@@ -250,6 +258,14 @@ export class UnrestrictedSyncer {
 							type: SyncType.UPDATE
 						});
 					}
+				} else {
+					this.database.updateDocumentMetadata(
+						{
+							parentVersionId: response.vaultUpdateId,
+							hash: contentHash
+						},
+						document
+					);
 				}
 
 				this.tryIncrementVaultUpdateId(response.vaultUpdateId);

From a25027bc9000cc55f5d893da8c6c8297eeb94587 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 4 Apr 2025 23:15:05 +0100
Subject: [PATCH 411/761] Send device id to server

---
 frontend/sync-client/src/services/sync-service.ts  |  6 +++++-
 frontend/sync-client/src/services/types.ts         |  5 +++++
 frontend/sync-client/src/sync-client.ts            | 10 +++++++++-
 frontend/sync-client/src/sync-operations/syncer.ts |  9 ++++++++-
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/frontend/sync-client/src/services/sync-service.ts b/frontend/sync-client/src/services/sync-service.ts
index 4af744ee..7251ef79 100644
--- a/frontend/sync-client/src/services/sync-service.ts
+++ b/frontend/sync-client/src/services/sync-service.ts
@@ -24,6 +24,7 @@ export class SyncService {
 	private _fetchImplementation: typeof globalThis.fetch = globalThis.fetch;
 
 	public constructor(
+		private readonly deviceId: string,
 		private readonly connectionStatus: ConnectionStatus,
 		private readonly settings: Settings,
 		private readonly logger: Logger
@@ -79,6 +80,7 @@ export class SyncService {
 				formData.append("document_id", documentId);
 			}
 			formData.append("relative_path", relativePath);
+			formData.append("device_id", this.deviceId);
 			formData.append("content", new Blob([contentBytes]));
 
 			const response = await this.client.POST(
@@ -130,6 +132,7 @@ export class SyncService {
 			const formData = new FormData();
 			formData.append("parent_version_id", parentVersionId.toString());
 			formData.append("relative_path", relativePath);
+			formData.append("device_id", this.deviceId);
 			formData.append("content", new Blob([contentBytes]));
 
 			const response = await this.client.PUT(
@@ -182,7 +185,8 @@ export class SyncService {
 						}
 					},
 					body: {
-						relativePath
+						relativePath,
+						deviceId: this.deviceId
 					}
 				}
 			);
diff --git a/frontend/sync-client/src/services/types.ts b/frontend/sync-client/src/services/types.ts
index 55f72315..7ecb7fe3 100644
--- a/frontend/sync-client/src/services/types.ts
+++ b/frontend/sync-client/src/services/types.ts
@@ -439,6 +439,7 @@ export interface components {
 		};
 		CreateDocumentVersion: {
 			contentBase64: string;
+			deviceId?: string | null;
 			/**
 			 * Format: uuid
 			 * @description The client can decide the document id (if it wishes to) in order to help with syncing. If the client does not provide a document id, the server will generate one. If the client provides a document id it must not already exist in the database.
@@ -448,6 +449,7 @@ export interface components {
 		};
 		CreateDocumentVersionMultipart: {
 			content: components["schemas"]["Array_of_uint8"];
+			device_id?: string | null;
 			/** Format: uuid */
 			document_id?: string | null;
 			relative_path: string;
@@ -458,6 +460,7 @@ export interface components {
 			vault_id: string;
 		};
 		DeleteDocumentVersion: {
+			deviceId?: string | null;
 			relativePath: string;
 		};
 		/** @description Response to an update document request. */
@@ -568,12 +571,14 @@ export interface components {
 		};
 		UpdateDocumentVersion: {
 			contentBase64: string;
+			deviceId?: string | null;
 			/** Format: int64 */
 			parentVersionId: number;
 			relativePath: string;
 		};
 		UpdateDocumentVersionMultipart: {
 			content: components["schemas"]["Array_of_uint8"];
+			deviceId?: string | null;
 			/** Format: int64 */
 			parentVersionId: number;
 			relativePath: string;
diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts
index 0153148c..228b29eb 100644
--- a/frontend/sync-client/src/sync-client.ts
+++ b/frontend/sync-client/src/sync-client.ts
@@ -15,6 +15,7 @@ import { FileOperations } from "./file-operations/file-operations";
 import { ConnectionStatus } from "./services/connection-status";
 import { UnrestrictedSyncer } from "./sync-operations/unrestricted-syncer";
 import { rateLimit } from "./utils/rate-limit";
+import { v4 as uuidv4 } from "uuid";
 
 export interface NetworkConnectionStatus {
 	isSuccessful: boolean;
@@ -105,9 +106,15 @@ export class SyncClient {
 				await rateLimitedSave(state);
 			}
 		);
+		const deviceId = uuidv4();
 
 		const connectionStatus = new ConnectionStatus(settings, logger);
-		const syncService = new SyncService(connectionStatus, settings, logger);
+		const syncService = new SyncService(
+			deviceId,
+			connectionStatus,
+			settings,
+			logger
+		);
 		syncService.fetchImplementation = fetch;
 		const fileOperations = new FileOperations(
 			logger,
@@ -124,6 +131,7 @@ export class SyncClient {
 			history
 		);
 		const syncer = new Syncer(
+			deviceId,
 			logger,
 			database,
 			settings,
diff --git a/frontend/sync-client/src/sync-operations/syncer.ts b/frontend/sync-client/src/sync-operations/syncer.ts
index ec6b2288..ef35d100 100644
--- a/frontend/sync-client/src/sync-operations/syncer.ts
+++ b/frontend/sync-client/src/sync-operations/syncer.ts
@@ -31,7 +31,9 @@ export class Syncer {
 		| undefined;
 	private applyRemoteChangesWebSocket: WebSocket | undefined;
 
+	// eslint-disable-next-line @typescript-eslint/max-params
 	public constructor(
+		private readonly deviceId: string,
 		private readonly logger: Logger,
 		private readonly database: Database,
 		private readonly settings: Settings,
@@ -291,7 +293,12 @@ export class Syncer {
 		// The JS WebSocket API doesn't support setting headers, so we have to send the token as a message
 		this.applyRemoteChangesWebSocket.onopen = (): void => {
 			this.logger.info("WebSocket connection opened");
-			this.applyRemoteChangesWebSocket?.send(settings.token);
+			this.applyRemoteChangesWebSocket?.send(
+				JSON.stringify({
+					deviceId: this.deviceId,
+					token: settings.token
+				})
+			);
 			this.webSocketStatusChangeListeners.forEach((listener) => {
 				listener();
 			});

From 28ab87bda0e3955980c6f916734a0e6f153f2444 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 4 Apr 2025 23:16:17 +0100
Subject: [PATCH 412/761] Fix CI

---
 .github/workflows/check.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 8ae2628f..d7f73c62 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -25,7 +25,7 @@ jobs:
 
       - name: Setup rust
         run: |
-          cargo install sqlx-cli wasm-pack machete
+          cargo install sqlx-cli wasm-pack cargo-machete
           cd backend
           sqlx database create --database-url sqlite://db.sqlite3
           sqlx migrate run --source sync_server/src/app_state/database/migrations --database-url sqlite://db.sqlite3

From 0c6d36041ce230fea020afc86c44c146de3bf61d Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 4 Apr 2025 23:16:32 +0100
Subject: [PATCH 413/761] Bump versions to 0.3.6

---
 backend/Cargo.lock                     | 6 +++---
 backend/Cargo.toml                     | 2 +-
 frontend/obsidian-plugin/manifest.json | 2 +-
 frontend/obsidian-plugin/package.json  | 2 +-
 frontend/package-lock.json             | 8 ++++----
 frontend/sync-client/package.json      | 2 +-
 frontend/test-client/package.json      | 2 +-
 manifest.json                          | 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index b0ee9b59..2a008ac6 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1922,7 +1922,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile"
-version = "0.3.5"
+version = "0.3.6"
 dependencies = [
  "insta",
  "pretty_assertions",
@@ -2540,7 +2540,7 @@ dependencies = [
 
 [[package]]
 name = "sync_lib"
-version = "0.3.5"
+version = "0.3.6"
 dependencies = [
  "base64 0.22.1",
  "console_error_panic_hook",
@@ -2553,7 +2553,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.3.5"
+version = "0.3.6"
 dependencies = [
  "aide",
  "aide-axum-typed-multipart",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 6f26608e..04d6216a 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -12,7 +12,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.3.5"
+version = "0.3.6"
 
 [workspace.dependencies]  
 serde = { version = "1.0.219", default-features = false, features = ["derive"] }
diff --git a/frontend/obsidian-plugin/manifest.json b/frontend/obsidian-plugin/manifest.json
index 822413eb..1450df2b 100644
--- a/frontend/obsidian-plugin/manifest.json
+++ b/frontend/obsidian-plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.3.5",
+	"version": "0.3.6",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index 696a005c..8f891bcd 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.3.5",
+	"version": "0.3.6",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index b74df05d..1747f840 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -21,7 +21,7 @@
 		},
 		"../backend/sync_lib/pkg": {
 			"name": "sync_lib",
-			"version": "0.3.5",
+			"version": "0.3.6",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -7853,7 +7853,7 @@
 		},
 		"obsidian-plugin": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.3.5",
+			"version": "0.3.6",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
@@ -7881,7 +7881,7 @@
 			}
 		},
 		"sync-client": {
-			"version": "0.3.5",
+			"version": "0.3.6",
 			"dependencies": {
 				"byte-base64": "^1.1.0",
 				"openapi-fetch": "0.13.5",
@@ -7905,7 +7905,7 @@
 			}
 		},
 		"test-client": {
-			"version": "0.3.5",
+			"version": "0.3.6",
 			"bin": {
 				"test-client": "dist/cli.js"
 			},
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index 0644a84f..e897cc55 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "sync-client",
-	"version": "0.3.5",
+	"version": "0.3.6",
 	"main": "dist/sync-client.node.js",
 	"browser": "dist/sync-client.web.js",
 	"types": "dist/types/index.d.ts",
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index bf09de9f..8a580420 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "test-client",
-	"version": "0.3.5",
+	"version": "0.3.6",
 	"private": true,
 	"bin": {
 		"test-client": "./dist/cli.js"
diff --git a/manifest.json b/manifest.json
index 822413eb..1450df2b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.3.5",
+	"version": "0.3.6",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",

From 5bb420e162b75af34a4262e74e97972ff901676f Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 5 Apr 2025 09:45:44 +0100
Subject: [PATCH 414/761] Add diff tests

---
 backend/reconcile/src/diffs/myers.rs          | 54 ++++++++++++++++++
 ...le__diffs__myers__tests__complex_diff.snap | 55 +++++++++++++++++++
 ...ile__diffs__myers__tests__delete_only.snap | 19 +++++++
 ...iffs__myers__tests__identical_content.snap | 23 ++++++++
 ...ile__diffs__myers__tests__insert_only.snap | 19 +++++++
 ...iffs__myers__tests__prefix_and_suffix.snap | 43 +++++++++++++++
 .../reconcile/tests/examples/multiline.yml    | 20 +++++++
 7 files changed, 233 insertions(+)
 create mode 100644 backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__complex_diff.snap
 create mode 100644 backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__delete_only.snap
 create mode 100644 backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__identical_content.snap
 create mode 100644 backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__insert_only.snap
 create mode 100644 backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__prefix_and_suffix.snap
 create mode 100644 backend/reconcile/tests/examples/multiline.yml

diff --git a/backend/reconcile/src/diffs/myers.rs b/backend/reconcile/src/diffs/myers.rs
index 9692c221..da754040 100644
--- a/backend/reconcile/src/diffs/myers.rs
+++ b/backend/reconcile/src/diffs/myers.rs
@@ -282,3 +282,57 @@ fn conquer<T>(
         ));
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use insta::assert_debug_snapshot;
+
+    use super::*;
+
+    #[test]
+    fn test_empty_diff() {
+        let old: Vec<Token<String>> = vec![];
+        let new: Vec<Token<String>> = vec![];
+        let result = diff(&old, &new);
+        assert_eq!(result.len(), 0);
+    }
+
+    #[test]
+    fn test_identical_content() {
+        let content = vec!["a".into(), "b".into(), "c".into()];
+        let result = diff(&content, &content);
+        assert_debug_snapshot!(result);
+    }
+
+    #[test]
+    fn test_insert_only() {
+        let old: Vec<Token<String>> = vec![];
+        let new: Vec<Token<String>> = vec!["a".into(), "b".into()];
+        let result = diff(&old, &new);
+        assert_debug_snapshot!(result);
+    }
+
+    #[test]
+    fn test_delete_only() {
+        let old = vec!["a".into(), "b".into()];
+        let new: Vec<Token<String>> = vec![];
+        let result = diff(&old, &new);
+        assert_debug_snapshot!(result);
+    }
+
+    #[test]
+    fn test_prefix_and_suffix() {
+        let old = vec!["a".into(), "b".into(), "c".into(), "d".into()];
+        let new = vec!["a".into(), "x".into(), "d".into()];
+        let result = diff(&old, &new);
+        assert_debug_snapshot!(result);
+    }
+
+    #[test]
+    fn test_complex_diff() {
+        let old = vec!["a".into(), "b".into(), "c".into(), "d".into()];
+        let new = vec!["a".into(), "x".into(), "c".into(), "y".into()];
+        let result = diff(&old, &new);
+        assert_debug_snapshot!(result);
+    }
+}
diff --git a/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__complex_diff.snap b/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__complex_diff.snap
new file mode 100644
index 00000000..8c89ed35
--- /dev/null
+++ b/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__complex_diff.snap
@@ -0,0 +1,55 @@
+---
+source: reconcile/src/diffs/myers.rs
+expression: result
+snapshot_kind: text
+---
+[
+    Equal(
+        [
+            Token {
+                normalised: "a",
+                original: "a",
+            },
+        ],
+    ),
+    Insert(
+        [
+            Token {
+                normalised: "x",
+                original: "x",
+            },
+        ],
+    ),
+    Delete(
+        [
+            Token {
+                normalised: "b",
+                original: "b",
+            },
+        ],
+    ),
+    Equal(
+        [
+            Token {
+                normalised: "c",
+                original: "c",
+            },
+        ],
+    ),
+    Insert(
+        [
+            Token {
+                normalised: "y",
+                original: "y",
+            },
+        ],
+    ),
+    Delete(
+        [
+            Token {
+                normalised: "d",
+                original: "d",
+            },
+        ],
+    ),
+]
diff --git a/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__delete_only.snap b/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__delete_only.snap
new file mode 100644
index 00000000..f07eb3df
--- /dev/null
+++ b/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__delete_only.snap
@@ -0,0 +1,19 @@
+---
+source: reconcile/src/diffs/myers.rs
+expression: result
+snapshot_kind: text
+---
+[
+    Delete(
+        [
+            Token {
+                normalised: "a",
+                original: "a",
+            },
+            Token {
+                normalised: "b",
+                original: "b",
+            },
+        ],
+    ),
+]
diff --git a/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__identical_content.snap b/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__identical_content.snap
new file mode 100644
index 00000000..a99e2764
--- /dev/null
+++ b/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__identical_content.snap
@@ -0,0 +1,23 @@
+---
+source: reconcile/src/diffs/myers.rs
+expression: result
+snapshot_kind: text
+---
+[
+    Equal(
+        [
+            Token {
+                normalised: "a",
+                original: "a",
+            },
+            Token {
+                normalised: "b",
+                original: "b",
+            },
+            Token {
+                normalised: "c",
+                original: "c",
+            },
+        ],
+    ),
+]
diff --git a/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__insert_only.snap b/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__insert_only.snap
new file mode 100644
index 00000000..b32c8ce3
--- /dev/null
+++ b/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__insert_only.snap
@@ -0,0 +1,19 @@
+---
+source: reconcile/src/diffs/myers.rs
+expression: result
+snapshot_kind: text
+---
+[
+    Insert(
+        [
+            Token {
+                normalised: "a",
+                original: "a",
+            },
+            Token {
+                normalised: "b",
+                original: "b",
+            },
+        ],
+    ),
+]
diff --git a/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__prefix_and_suffix.snap b/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__prefix_and_suffix.snap
new file mode 100644
index 00000000..03c8fee2
--- /dev/null
+++ b/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__prefix_and_suffix.snap
@@ -0,0 +1,43 @@
+---
+source: reconcile/src/diffs/myers.rs
+expression: result
+snapshot_kind: text
+---
+[
+    Equal(
+        [
+            Token {
+                normalised: "a",
+                original: "a",
+            },
+        ],
+    ),
+    Delete(
+        [
+            Token {
+                normalised: "b",
+                original: "b",
+            },
+            Token {
+                normalised: "c",
+                original: "c",
+            },
+        ],
+    ),
+    Insert(
+        [
+            Token {
+                normalised: "x",
+                original: "x",
+            },
+        ],
+    ),
+    Equal(
+        [
+            Token {
+                normalised: "d",
+                original: "d",
+            },
+        ],
+    ),
+]
diff --git a/backend/reconcile/tests/examples/multiline.yml b/backend/reconcile/tests/examples/multiline.yml
new file mode 100644
index 00000000..c751feb9
--- /dev/null
+++ b/backend/reconcile/tests/examples/multiline.yml
@@ -0,0 +1,20 @@
+parent: Hello!
+left: |
+  Hello there!
+
+  How are you?
+
+right: |
+  Hello there!
+
+
+  Best,
+  Andras
+
+expected: |
+  Hello there!
+
+  How are you?
+
+  Best,
+  Andras

From 8e1123016bcce9aa3efcc095c807c4b190c7da23 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 5 Apr 2025 10:24:44 +0100
Subject: [PATCH 415/761] Support multi-document test files

---
 backend/reconcile/tests/example_document.rs | 23 +++-----
 backend/reconcile/tests/test.rs             | 64 +++++++++++++--------
 2 files changed, 47 insertions(+), 40 deletions(-)

diff --git a/backend/reconcile/tests/example_document.rs b/backend/reconcile/tests/example_document.rs
index 75f5bdab..6a1bbf1c 100644
--- a/backend/reconcile/tests/example_document.rs
+++ b/backend/reconcile/tests/example_document.rs
@@ -1,5 +1,3 @@
-use std::{fs, path::Path};
-
 use pretty_assertions::assert_eq;
 use reconcile::{CursorPosition, TextWithCursors};
 use serde::Deserialize;
@@ -19,17 +17,6 @@ pub struct ExampleDocument {
 }
 
 impl ExampleDocument {
-    /// Creates a new `ExampleDocument` instance from a YAML file.
-    ///
-    /// # Panics
-    ///
-    /// If the file cannot be opened or parsed, the program will panic.
-    #[must_use]
-    pub fn from_yaml(path: &Path) -> Self {
-        let file = fs::File::open(path).expect("Failed to open example file");
-        serde_yaml::from_reader(file).expect("Failed to parse example file")
-    }
-
     #[must_use]
     pub fn parent(&self) -> String { self.parent.clone() }
 
@@ -52,7 +39,10 @@ impl ExampleDocument {
     /// will panic.
     pub fn assert_eq(&self, result: &TextWithCursors<'static>) {
         let result_str = ExampleDocument::text_with_cursors_to_string(result);
-        assert_eq!(result_str, self.expected);
+        assert_eq!(
+            result_str, self.expected,
+            "Left (actual) isn't equal to right (expected). Actual: ```\n{result_str}```",
+        );
     }
 
     /// Asserts that the result string matches the expected string,
@@ -63,9 +53,10 @@ impl ExampleDocument {
     /// If the result string does not match the expected string, the program
     /// will panic.
     pub fn assert_eq_without_cursors(&self, result: &str) {
+        let expected = ExampleDocument::string_to_text_with_cursors(&self.expected).text;
         assert_eq!(
-            result,
-            ExampleDocument::string_to_text_with_cursors(&self.expected).text,
+            result, expected,
+            "Left (actual) isn't equal to right (expected), Actual: ```\n{result}```",
         );
     }
 
diff --git a/backend/reconcile/tests/test.rs b/backend/reconcile/tests/test.rs
index 1139dc16..4e43d8a6 100644
--- a/backend/reconcile/tests/test.rs
+++ b/backend/reconcile/tests/test.rs
@@ -1,46 +1,62 @@
 mod example_document;
+
 use std::{fs, path::Path};
 
 use example_document::ExampleDocument;
 use reconcile::{reconcile, reconcile_with_cursors};
+use serde::Deserialize;
 
 #[test]
 fn test_with_examples() {
     let examples_dir = Path::new("tests/examples");
-    let mut entries = fs::read_dir(examples_dir)
+    let entries = fs::read_dir(examples_dir)
         .expect("Failed to read examples directory")
         .collect::<Vec<_>>();
 
-    entries.sort_by_key(|entry| {
-        let path = entry
-            .as_ref()
-            .expect("Failed to read directory entry")
-            .path();
-        path.file_name()
-            .and_then(|name| name.to_str())
-            .and_then(|name| name.split('.').next().unwrap().parse::<i32>().ok())
-            .unwrap_or_default()
-    });
-
     for entry in entries {
         let entry = entry.expect("Failed to read directory entry");
         let path = entry.path();
 
         if path.is_file() && path.extension().and_then(|ext| ext.to_str()) == Some("yml") {
-            let doc = ExampleDocument::from_yaml(&path);
-            println!("Testing with example from {}", path.display());
+            let file = fs::File::open(&path).expect("Failed to open example file");
+            for document in serde_yaml::Deserializer::from_reader(file) {
+                println!("Testing with example from {}", path.display());
 
-            doc.assert_eq_without_cursors(&reconcile(
-                &doc.parent(),
-                &doc.left().text,
-                &doc.right().text,
-            ));
+                let doc =
+                    ExampleDocument::deserialize(document).expect("Failed to deserialize document");
 
-            doc.assert_eq(&reconcile_with_cursors(
-                &doc.parent(),
-                doc.left(),
-                doc.right(),
-            ));
+                test_document(doc);
+
+                println!("Test passed for example from {}", path.display());
+            }
         }
     }
 }
+
+fn test_document(doc: ExampleDocument) {
+    doc.assert_eq_without_cursors(&reconcile(
+        &doc.parent(),
+        &doc.left().text,
+        &doc.right().text,
+    ));
+
+    doc.assert_eq(&reconcile_with_cursors(
+        &doc.parent(),
+        doc.left(),
+        doc.right(),
+    ));
+
+    // inverse direction
+    doc.assert_eq_without_cursors(&reconcile(
+        &doc.parent(),
+        &doc.right().text,
+        &doc.left().text,
+    ));
+
+    // inverse direction with cursors
+    doc.assert_eq(&reconcile_with_cursors(
+        &doc.parent(),
+        doc.right(),
+        doc.left(),
+    ));
+}

From edca6f1717552affef82925bf8956d120529de19 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 5 Apr 2025 10:51:51 +0100
Subject: [PATCH 416/761] Move ordered operation

---
 backend/reconcile/src/operation_transformation.rs                | 1 +
 .../src/{utils => operation_transformation}/ordered_operation.rs | 0
 backend/reconcile/src/utils.rs                                   | 1 -
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename backend/reconcile/src/{utils => operation_transformation}/ordered_operation.rs (100%)

diff --git a/backend/reconcile/src/operation_transformation.rs b/backend/reconcile/src/operation_transformation.rs
index 8c95d397..afff26c7 100644
--- a/backend/reconcile/src/operation_transformation.rs
+++ b/backend/reconcile/src/operation_transformation.rs
@@ -2,6 +2,7 @@ mod cursor;
 mod edited_text;
 mod merge_context;
 mod operation;
+mod ordered_operation;
 
 pub use cursor::{CursorPosition, TextWithCursors};
 pub use edited_text::EditedText;
diff --git a/backend/reconcile/src/utils/ordered_operation.rs b/backend/reconcile/src/operation_transformation/ordered_operation.rs
similarity index 100%
rename from backend/reconcile/src/utils/ordered_operation.rs
rename to backend/reconcile/src/operation_transformation/ordered_operation.rs
diff --git a/backend/reconcile/src/utils.rs b/backend/reconcile/src/utils.rs
index 8461b5ff..105719bd 100644
--- a/backend/reconcile/src/utils.rs
+++ b/backend/reconcile/src/utils.rs
@@ -2,6 +2,5 @@ pub mod common_prefix_len;
 pub mod common_suffix_len;
 pub mod find_longest_prefix_contained_within;
 pub mod merge_iters;
-pub mod ordered_operation;
 pub mod side;
 pub mod string_builder;

From 6ec07feb275309d8a58087f457009acb8377571c Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 5 Apr 2025 11:58:47 +0100
Subject: [PATCH 417/761] Fix assert message order

---
 backend/reconcile/tests/example_document.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/reconcile/tests/example_document.rs b/backend/reconcile/tests/example_document.rs
index 6a1bbf1c..98d68a3d 100644
--- a/backend/reconcile/tests/example_document.rs
+++ b/backend/reconcile/tests/example_document.rs
@@ -40,8 +40,8 @@ impl ExampleDocument {
     pub fn assert_eq(&self, result: &TextWithCursors<'static>) {
         let result_str = ExampleDocument::text_with_cursors_to_string(result);
         assert_eq!(
-            result_str, self.expected,
-            "Left (actual) isn't equal to right (expected). Actual: ```\n{result_str}```",
+            self.expected, result_str,
+            "Left (expected) isn't equal to right (actual). Actual: ```\n{result_str}```",
         );
     }
 
@@ -55,8 +55,8 @@ impl ExampleDocument {
     pub fn assert_eq_without_cursors(&self, result: &str) {
         let expected = ExampleDocument::string_to_text_with_cursors(&self.expected).text;
         assert_eq!(
-            result, expected,
-            "Left (actual) isn't equal to right (expected), Actual: ```\n{result}```",
+            expected, result,
+            "Left (expected) isn't equal to right (actual), Actual: ```\n{result}```",
         );
     }
 

From b15e0319a327bcac99ac5b854985f775d170253c Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 5 Apr 2025 13:44:31 +0100
Subject: [PATCH 418/761] Add BLNS

---
 backend/reconcile/tests/resources/blns.txt | 742 +++++++++++++++++++++
 1 file changed, 742 insertions(+)
 create mode 100644 backend/reconcile/tests/resources/blns.txt

diff --git a/backend/reconcile/tests/resources/blns.txt b/backend/reconcile/tests/resources/blns.txt
new file mode 100644
index 00000000..62352e35
--- /dev/null
+++ b/backend/reconcile/tests/resources/blns.txt
@@ -0,0 +1,742 @@
+#	Reserved Strings
+#
+#	Strings which may be used elsewhere in code
+
+undefined
+undef
+null
+NULL
+(null)
+nil
+NIL
+true
+false
+True
+False
+TRUE
+FALSE
+None
+hasOwnProperty
+then
+constructor
+\
+\\
+
+#	Numeric Strings
+#
+#	Strings which can be interpreted as numeric
+
+0
+1
+1.00
+$1.00
+1/2
+1E2
+1E02
+1E+02
+-1
+-1.00
+-$1.00
+-1/2
+-1E2
+-1E02
+-1E+02
+1/0
+0/0
+-2147483648/-1
+-9223372036854775808/-1
+-0
+-0.0
++0
++0.0
+0.00
+0..0
+.
+0.0.0
+0,00
+0,,0
+,
+0,0,0
+0.0/0
+1.0/0.0
+0.0/0.0
+1,0/0,0
+0,0/0,0
+--1
+-
+-.
+-,
+999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999
+NaN
+Infinity
+-Infinity
+INF
+1#INF
+-1#IND
+1#QNAN
+1#SNAN
+1#IND
+0x0
+0xffffffff
+0xffffffffffffffff
+0xabad1dea
+123456789012345678901234567890123456789
+1,000.00
+1 000.00
+1'000.00
+1,000,000.00
+1 000 000.00
+1'000'000.00
+1.000,00
+1 000,00
+1'000,00
+1.000.000,00
+1 000 000,00
+1'000'000,00
+01000
+08
+09
+2.2250738585072011e-308
+
+#	Special Characters
+#
+# ASCII punctuation.  All of these characters may need to be escaped in some
+# contexts.  Divided into three groups based on (US-layout) keyboard position.
+
+,./;'[]\-=
+<>?:"{}|_+
+!@#$%^&*()`~
+
+# Non-whitespace C0 controls: U+0001 through U+0008, U+000E through U+001F,
+# and U+007F (DEL)
+# Often forbidden to appear in various text-based file formats (e.g. XML),
+# or reused for internal delimiters on the theory that they should never
+# appear in input.
+# The next line may appear to be blank or mojibake in some viewers.
+

+
+# Non-whitespace C1 controls: U+0080 through U+0084 and U+0086 through U+009F.
+# Commonly misinterpreted as additional graphic characters.
+# The next line may appear to be blank, mojibake, or dingbats in some viewers.
+€‚ƒ„†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ
+
+# Whitespace: all of the characters with category Zs, Zl, or Zp (in Unicode
+# version 8.0.0), plus U+0009 (HT), U+000B (VT), U+000C (FF), U+0085 (NEL),
+# and U+200B (ZERO WIDTH SPACE), which are in the C categories but are often
+# treated as whitespace in some contexts.
+# This file unfortunately cannot express strings containing
+# U+0000, U+000A, or U+000D (NUL, LF, CR).
+# The next line may appear to be blank or mojibake in some viewers.
+# The next line may be flagged for "trailing whitespace" in some viewers.
+	 …             ​

  　
+
+# Unicode additional control characters: all of the characters with
+# general category Cf (in Unicode 8.0.0).
+# The next line may appear to be blank or mojibake in some viewers.
+­؀؁؂؃؄؅؜۝܏᠎​‌‍‎‏‪‫‬‭‮⁠⁡⁢⁣⁤⁦⁧⁨⁩𑂽𛲠𛲡𛲢𛲣𝅳𝅴𝅵𝅶𝅷𝅸𝅹𝅺󠀁󠀠󠀡󠀢󠀣󠀤󠀥󠀦󠀧󠀨󠀩󠀪󠀫󠀬󠀭󠀮󠀯󠀰󠀱󠀲󠀳󠀴󠀵󠀶󠀷󠀸󠀹󠀺󠀻󠀼󠀽󠀾󠀿󠁀󠁁󠁂󠁃󠁄󠁅󠁆󠁇󠁈󠁉󠁊󠁋󠁌󠁍󠁎󠁏󠁐󠁑󠁒󠁓󠁔󠁕󠁖󠁗󠁘󠁙󠁚󠁛󠁜󠁝󠁞󠁟󠁠󠁡󠁢󠁣󠁤󠁥󠁦󠁧󠁨󠁩󠁪󠁫󠁬󠁭󠁮󠁯󠁰󠁱󠁲󠁳󠁴󠁵󠁶󠁷󠁸󠁹󠁺󠁻󠁼󠁽󠁾󠁿
+
+# "Byte order marks", U+FEFF and U+FFFE, each on its own line.
+# The next two lines may appear to be blank or mojibake in some viewers.
+
+￾
+
+#	Unicode Symbols
+#
+#	Strings which contain common unicode symbols (e.g. smart quotes)
+
+Ω≈ç√∫˜µ≤≥÷
+åß∂ƒ©˙∆˚¬…æ
+œ∑´®†¥¨ˆøπ“‘
+¡™£¢∞§¶•ªº–≠
+¸˛Ç◊ı˜Â¯˘¿
+ÅÍÎÏ˝ÓÔÒÚÆ☃
+Œ„´‰ˇÁ¨ˆØ∏”’
+`⁄€‹›fifl‡°·‚—±
+⅛⅜⅝⅞
+ЁЂЃЄЅІЇЈЉЊЋЌЍЎЏАБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюя
+٠١٢٣٤٥٦٧٨٩
+
+#	Unicode Subscript/Superscript/Accents
+#
+#	Strings which contain unicode subscripts/superscripts; can cause rendering issues
+
+⁰⁴⁵
+₀₁₂
+⁰⁴⁵₀₁₂
+ด้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็ ด้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็ ด้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็
+
+#	Quotation Marks
+#
+#	Strings which contain misplaced quotation marks; can cause encoding errors
+
+'
+"
+''
+""
+'"'
+"''''"'"
+"'"'"''''"
+<foo val=“bar” />
+<foo val=“bar” />
+<foo val=”bar“ />
+<foo val=`bar' />
+
+#	Two-Byte Characters
+#
+#	Strings which contain two-byte characters: can cause rendering issues or character-length issues
+
+田中さんにあげて下さい
+パーティーへ行かないか
+和製漢語
+部落格
+사회과학원 어학연구소
+찦차를 타고 온 펲시맨과 쑛다리 똠방각하
+社會科學院語學研究所
+울란바토르
+𠜎𠜱𠝹𠱓𠱸𠲖𠳏
+
+#	Strings which contain two-byte letters: can cause issues with naïve UTF-16 capitalizers which think that 16 bits == 1 character
+
+𐐜 𐐔𐐇𐐝𐐀𐐡𐐇𐐓 𐐙𐐊𐐡𐐝𐐓/𐐝𐐇𐐗𐐊𐐤𐐔 𐐒𐐋𐐗 𐐒𐐌 𐐜 𐐡𐐀𐐖𐐇𐐤𐐓𐐝 𐐱𐑂 𐑄 𐐔𐐇𐐝𐐀𐐡𐐇𐐓 𐐏𐐆𐐅𐐤𐐆𐐚𐐊𐐡𐐝𐐆𐐓𐐆
+
+#	Special Unicode Characters Union
+#
+#	A super string recommended by VMware Inc. Globalization Team: can effectively cause rendering issues or character-length issues to validate product globalization readiness.
+#
+#	表          CJK_UNIFIED_IDEOGRAPHS (U+8868)
+#	ポ          KATAKANA LETTER PO (U+30DD)
+#	あ          HIRAGANA LETTER A (U+3042)
+#	A           LATIN CAPITAL LETTER A (U+0041)
+#	鷗          CJK_UNIFIED_IDEOGRAPHS (U+9DD7)
+#	Π          LATIN SMALL LIGATURE OE (U+0153)
+#	é           LATIN SMALL LETTER E WITH ACUTE (U+00E9)
+#	Ｂ           FULLWIDTH LATIN CAPITAL LETTER B (U+FF22)
+#	逍          CJK_UNIFIED_IDEOGRAPHS (U+900D)
+#	Ü           LATIN SMALL LETTER U WITH DIAERESIS (U+00FC)
+#	ß           LATIN SMALL LETTER SHARP S (U+00DF)
+#	ª           FEMININE ORDINAL INDICATOR (U+00AA)
+#	ą           LATIN SMALL LETTER A WITH OGONEK (U+0105)
+#	ñ           LATIN SMALL LETTER N WITH TILDE (U+00F1)
+#	丂          CJK_UNIFIED_IDEOGRAPHS (U+4E02)
+#	㐀          CJK Ideograph Extension A, First (U+3400)
+#	𠀀          CJK Ideograph Extension B, First (U+20000)
+
+表ポあA鷗ŒéＢ逍Üߪąñ丂㐀𠀀
+
+#	Changing length when lowercased
+#
+#	Characters which increase in length (2 to 3 bytes) when lowercased
+#	Credit: https://twitter.com/jifa/status/625776454479970304
+
+Ⱥ
+Ⱦ
+
+#	Japanese Emoticons
+#
+#	Strings which consists of Japanese-style emoticons which are popular on the web
+
+ヽ༼ຈل͜ຈ༽ﾉ ヽ༼ຈل͜ຈ༽ﾉ
+(｡◕ ∀ ◕｡)
+｀ｨ(´∀｀∩
+__ﾛ(,_,*)
+・(￣∀￣)・:*:
+ﾟ･✿ヾ╲(｡◕‿◕｡)╱✿･ﾟ
+,。・:*:・゜’( ☻ ω ☻ )。・:*:・゜’
+(╯°□°）╯︵ ┻━┻)
+(ﾉಥ益ಥ）ﾉ ┻━┻
+┬─┬ノ( º _ ºノ)
+( ͡° ͜ʖ ͡°)
+¯\_(ツ)_/¯
+
+#	Emoji
+#
+#	Strings which contain Emoji; should be the same behavior as two-byte characters, but not always
+
+😍
+👩🏽
+👨‍🦰 👨🏿‍🦰 👨‍🦱 👨🏿‍🦱 🦹🏿‍♂️
+👾 🙇 💁 🙅 🙆 🙋 🙎 🙍
+🐵 🙈 🙉 🙊
+❤️ 💔 💌 💕 💞 💓 💗 💖 💘 💝 💟 💜 💛 💚 💙
+✋🏿 💪🏿 👐🏿 🙌🏿 👏🏿 🙏🏿
+👨‍👩‍👦 👨‍👩‍👧‍👦 👨‍👨‍👦 👩‍👩‍👧 👨‍👦 👨‍👧‍👦 👩‍👦 👩‍👧‍👦
+🚾 🆒 🆓 🆕 🆖 🆗 🆙 🏧
+0️⃣ 1️⃣ 2️⃣ 3️⃣ 4️⃣ 5️⃣ 6️⃣ 7️⃣ 8️⃣ 9️⃣ 🔟
+
+#       Regional Indicator Symbols
+#
+#       Regional Indicator Symbols can be displayed differently across
+#       fonts, and have a number of special behaviors
+
+🇺🇸🇷🇺🇸 🇦🇫🇦🇲🇸
+🇺🇸🇷🇺🇸🇦🇫🇦🇲
+🇺🇸🇷🇺🇸🇦
+
+#	Unicode Numbers
+#
+#	Strings which contain unicode numbers; if the code is localized, it should see the input as numeric
+
+１２３
+١٢٣
+
+#	Right-To-Left Strings
+#
+#	Strings which contain text that should be rendered RTL if possible (e.g. Arabic, Hebrew)
+
+ثم نفس سقطت وبالتحديد،, جزيرتي باستخدام أن دنو. إذ هنا؟ الستار وتنصيب كان. أهّل ايطاليا، بريطانيا-فرنسا قد أخذ. سليمان، إتفاقية بين ما, يذكر الحدود أي بعد, معاملة بولندا، الإطلاق عل إيو.
+בְּרֵאשִׁית, בָּרָא אֱלֹהִים, אֵת הַשָּׁמַיִם, וְאֵת הָאָרֶץ
+הָיְתָהtestالصفحات التّحول
+﷽
+ﷺ
+مُنَاقَشَةُ سُبُلِ اِسْتِخْدَامِ اللُّغَةِ فِي النُّظُمِ الْقَائِمَةِ وَفِيم يَخُصَّ التَّطْبِيقَاتُ الْحاسُوبِيَّةُ،
+الكل في المجمو عة (5)
+
+#	Ogham Text
+#
+#	The only unicode alphabet to use a space which isn't empty but should still act like a space.
+
+᚛ᚄᚓᚐᚋᚒᚄ ᚑᚄᚂᚑᚏᚅ᚜
+᚛                 ᚜
+
+#	Trick Unicode
+#
+#	Strings which contain unicode with unusual properties (e.g. Right-to-left override) (c.f. http://www.unicode.org/charts/PDF/U2000.pdf)
+
+‪‪test‪
+‫test‫
+
test

+test⁠test‫
+⁦test⁧
+
+#	Zalgo Text
+#
+#	Strings which contain "corrupted" text. The corruption will not appear in non-HTML text, however. (via http://www.eeemo.net)
+
+Ṱ̺̺̕o͞ ̷i̲̬͇̪͙n̝̗͕v̟̜̘̦͟o̶̙̰̠kè͚̮̺̪̹̱̤ ̖t̝͕̳̣̻̪͞h̼͓̲̦̳̘̲e͇̣̰̦̬͎ ̢̼̻̱̘h͚͎͙̜̣̲ͅi̦̲̣̰̤v̻͍e̺̭̳̪̰-m̢iͅn̖̺̞̲̯̰d̵̼̟͙̩̼̘̳ ̞̥̱̳̭r̛̗̘e͙p͠r̼̞̻̭̗e̺̠̣͟s̘͇̳͍̝͉e͉̥̯̞̲͚̬͜ǹ̬͎͎̟̖͇̤t͍̬̤͓̼̭͘ͅi̪̱n͠g̴͉ ͏͉ͅc̬̟h͡a̫̻̯͘o̫̟̖͍̙̝͉s̗̦̲.̨̹͈̣
+̡͓̞ͅI̗̘̦͝n͇͇͙v̮̫ok̲̫̙͈i̖͙̭̹̠̞n̡̻̮̣̺g̲͈͙̭͙̬͎ ̰t͔̦h̞̲e̢̤ ͍̬̲͖f̴̘͕̣è͖ẹ̥̩l͖͔͚i͓͚̦͠n͖͍̗͓̳̮g͍ ̨o͚̪͡f̘̣̬ ̖̘͖̟͙̮c҉͔̫͖͓͇͖ͅh̵̤̣͚͔á̗̼͕ͅo̼̣̥s̱͈̺̖̦̻͢.̛̖̞̠̫̰
+̗̺͖̹̯͓Ṯ̤͍̥͇͈h̲́e͏͓̼̗̙̼̣͔ ͇̜̱̠͓͍ͅN͕͠e̗̱z̘̝̜̺͙p̤̺̹͍̯͚e̠̻̠͜r̨̤͍̺̖͔̖̖d̠̟̭̬̝͟i̦͖̩͓͔̤a̠̗̬͉̙n͚͜ ̻̞̰͚ͅh̵͉i̳̞v̢͇ḙ͎͟-҉̭̩̼͔m̤̭̫i͕͇̝̦n̗͙ḍ̟ ̯̲͕͞ǫ̟̯̰̲͙̻̝f ̪̰̰̗̖̭̘͘c̦͍̲̞͍̩̙ḥ͚a̮͎̟̙͜ơ̩̹͎s̤.̝̝ ҉Z̡̖̜͖̰̣͉̜a͖̰͙̬͡l̲̫̳͍̩g̡̟̼̱͚̞̬ͅo̗͜.̟
+̦H̬̤̗̤͝e͜ ̜̥̝̻͍̟́w̕h̖̯͓o̝͙̖͎̱̮ ҉̺̙̞̟͈W̷̼̭a̺̪͍į͈͕̭͙̯̜t̶̼̮s̘͙͖̕ ̠̫̠B̻͍͙͉̳ͅe̵h̵̬͇̫͙i̹͓̳̳̮͎̫̕n͟d̴̪̜̖ ̰͉̩͇͙̲͞ͅT͖̼͓̪͢h͏͓̮̻e̬̝̟ͅ ̤̹̝W͙̞̝͔͇͝ͅa͏͓͔̹̼̣l̴͔̰̤̟͔ḽ̫.͕
+Z̮̞̠͙͔ͅḀ̗̞͈̻̗Ḷ͙͎̯̹̞͓G̻O̭̗̮
+
+#	Unicode Upsidedown
+#
+#	Strings which contain unicode with an "upsidedown" effect (via http://www.upsidedowntext.com)
+
+˙ɐnbᴉlɐ ɐuƃɐɯ ǝɹolop ʇǝ ǝɹoqɐl ʇn ʇunpᴉpᴉɔuᴉ ɹodɯǝʇ poɯsnᴉǝ op pǝs 'ʇᴉlǝ ƃuᴉɔsᴉdᴉpɐ ɹnʇǝʇɔǝsuoɔ 'ʇǝɯɐ ʇᴉs ɹolop ɯnsdᴉ ɯǝɹo˥
+00˙Ɩ$-
+
+#	Unicode font
+#
+#	Strings which contain bold/italic/etc. versions of normal characters
+
+Ｔｈｅ ｑｕｉｃｋ ｂｒｏｗｎ ｆｏｘ ｊｕｍｐｓ ｏｖｅｒ ｔｈｅ ｌａｚｙ ｄｏｇ
+𝐓𝐡𝐞 𝐪𝐮𝐢𝐜𝐤 𝐛𝐫𝐨𝐰𝐧 𝐟𝐨𝐱 𝐣𝐮𝐦𝐩𝐬 𝐨𝐯𝐞𝐫 𝐭𝐡𝐞 𝐥𝐚𝐳𝐲 𝐝𝐨𝐠
+𝕿𝖍𝖊 𝖖𝖚𝖎𝖈𝖐 𝖇𝖗𝖔𝖜𝖓 𝖋𝖔𝖝 𝖏𝖚𝖒𝖕𝖘 𝖔𝖛𝖊𝖗 𝖙𝖍𝖊 𝖑𝖆𝖟𝖞 𝖉𝖔𝖌
+𝑻𝒉𝒆 𝒒𝒖𝒊𝒄𝒌 𝒃𝒓𝒐𝒘𝒏 𝒇𝒐𝒙 𝒋𝒖𝒎𝒑𝒔 𝒐𝒗𝒆𝒓 𝒕𝒉𝒆 𝒍𝒂𝒛𝒚 𝒅𝒐𝒈
+𝓣𝓱𝓮 𝓺𝓾𝓲𝓬𝓴 𝓫𝓻𝓸𝔀𝓷 𝓯𝓸𝔁 𝓳𝓾𝓶𝓹𝓼 𝓸𝓿𝓮𝓻 𝓽𝓱𝓮 𝓵𝓪𝔃𝔂 𝓭𝓸𝓰
+𝕋𝕙𝕖 𝕢𝕦𝕚𝕔𝕜 𝕓𝕣𝕠𝕨𝕟 𝕗𝕠𝕩 𝕛𝕦𝕞𝕡𝕤 𝕠𝕧𝕖𝕣 𝕥𝕙𝕖 𝕝𝕒𝕫𝕪 𝕕𝕠𝕘
+𝚃𝚑𝚎 𝚚𝚞𝚒𝚌𝚔 𝚋𝚛𝚘𝚠𝚗 𝚏𝚘𝚡 𝚓𝚞𝚖𝚙𝚜 𝚘𝚟𝚎𝚛 𝚝𝚑𝚎 𝚕𝚊𝚣𝚢 𝚍𝚘𝚐
+⒯⒣⒠ ⒬⒰⒤⒞⒦ ⒝⒭⒪⒲⒩ ⒡⒪⒳ ⒥⒰⒨⒫⒮ ⒪⒱⒠⒭ ⒯⒣⒠ ⒧⒜⒵⒴ ⒟⒪⒢
+
+#	Script Injection
+#
+#	Strings which attempt to invoke a benign script injection; shows vulnerability to XSS
+
+<script>alert(0)</script>
+&lt;script&gt;alert(&#39;1&#39;);&lt;/script&gt;
+<img src=x onerror=alert(2) />
+<svg><script>123<1>alert(3)</script>
+"><script>alert(4)</script>
+'><script>alert(5)</script>
+><script>alert(6)</script>
+</script><script>alert(7)</script>
+< / script >< script >alert(8)< / script >
+ onfocus=JaVaSCript:alert(9) autofocus
+" onfocus=JaVaSCript:alert(10) autofocus
+' onfocus=JaVaSCript:alert(11) autofocus
+＜script＞alert(12)＜/script＞
+<sc<script>ript>alert(13)</sc</script>ript>
+--><script>alert(14)</script>
+";alert(15);t="
+';alert(16);t='
+JavaSCript:alert(17)
+;alert(18);
+src=JaVaSCript:prompt(19)
+"><script>alert(20);</script x="
+'><script>alert(21);</script x='
+><script>alert(22);</script x=
+" autofocus onkeyup="javascript:alert(23)
+' autofocus onkeyup='javascript:alert(24)
+<script\x20type="text/javascript">javascript:alert(25);</script>
+<script\x3Etype="text/javascript">javascript:alert(26);</script>
+<script\x0Dtype="text/javascript">javascript:alert(27);</script>
+<script\x09type="text/javascript">javascript:alert(28);</script>
+<script\x0Ctype="text/javascript">javascript:alert(29);</script>
+<script\x2Ftype="text/javascript">javascript:alert(30);</script>
+<script\x0Atype="text/javascript">javascript:alert(31);</script>
+'`"><\x3Cscript>javascript:alert(32)</script>
+'`"><\x00script>javascript:alert(33)</script>
+ABC<div style="x\x3Aexpression(javascript:alert(34)">DEF
+ABC<div style="x:expression\x5C(javascript:alert(35)">DEF
+ABC<div style="x:expression\x00(javascript:alert(36)">DEF
+ABC<div style="x:exp\x00ression(javascript:alert(37)">DEF
+ABC<div style="x:exp\x5Cression(javascript:alert(38)">DEF
+ABC<div style="x:\x0Aexpression(javascript:alert(39)">DEF
+ABC<div style="x:\x09expression(javascript:alert(40)">DEF
+ABC<div style="x:\xE3\x80\x80expression(javascript:alert(41)">DEF
+ABC<div style="x:\xE2\x80\x84expression(javascript:alert(42)">DEF
+ABC<div style="x:\xC2\xA0expression(javascript:alert(43)">DEF
+ABC<div style="x:\xE2\x80\x80expression(javascript:alert(44)">DEF
+ABC<div style="x:\xE2\x80\x8Aexpression(javascript:alert(45)">DEF
+ABC<div style="x:\x0Dexpression(javascript:alert(46)">DEF
+ABC<div style="x:\x0Cexpression(javascript:alert(47)">DEF
+ABC<div style="x:\xE2\x80\x87expression(javascript:alert(48)">DEF
+ABC<div style="x:\xEF\xBB\xBFexpression(javascript:alert(49)">DEF
+ABC<div style="x:\x20expression(javascript:alert(50)">DEF
+ABC<div style="x:\xE2\x80\x88expression(javascript:alert(51)">DEF
+ABC<div style="x:\x00expression(javascript:alert(52)">DEF
+ABC<div style="x:\xE2\x80\x8Bexpression(javascript:alert(53)">DEF
+ABC<div style="x:\xE2\x80\x86expression(javascript:alert(54)">DEF
+ABC<div style="x:\xE2\x80\x85expression(javascript:alert(55)">DEF
+ABC<div style="x:\xE2\x80\x82expression(javascript:alert(56)">DEF
+ABC<div style="x:\x0Bexpression(javascript:alert(57)">DEF
+ABC<div style="x:\xE2\x80\x81expression(javascript:alert(58)">DEF
+ABC<div style="x:\xE2\x80\x83expression(javascript:alert(59)">DEF
+ABC<div style="x:\xE2\x80\x89expression(javascript:alert(60)">DEF
+<a href="\x0Bjavascript:javascript:alert(61)" id="fuzzelement1">test</a>
+<a href="\x0Fjavascript:javascript:alert(62)" id="fuzzelement1">test</a>
+<a href="\xC2\xA0javascript:javascript:alert(63)" id="fuzzelement1">test</a>
+<a href="\x05javascript:javascript:alert(64)" id="fuzzelement1">test</a>
+<a href="\xE1\xA0\x8Ejavascript:javascript:alert(65)" id="fuzzelement1">test</a>
+<a href="\x18javascript:javascript:alert(66)" id="fuzzelement1">test</a>
+<a href="\x11javascript:javascript:alert(67)" id="fuzzelement1">test</a>
+<a href="\xE2\x80\x88javascript:javascript:alert(68)" id="fuzzelement1">test</a>
+<a href="\xE2\x80\x89javascript:javascript:alert(69)" id="fuzzelement1">test</a>
+<a href="\xE2\x80\x80javascript:javascript:alert(70)" id="fuzzelement1">test</a>
+<a href="\x17javascript:javascript:alert(71)" id="fuzzelement1">test</a>
+<a href="\x03javascript:javascript:alert(72)" id="fuzzelement1">test</a>
+<a href="\x0Ejavascript:javascript:alert(73)" id="fuzzelement1">test</a>
+<a href="\x1Ajavascript:javascript:alert(74)" id="fuzzelement1">test</a>
+<a href="\x00javascript:javascript:alert(75)" id="fuzzelement1">test</a>
+<a href="\x10javascript:javascript:alert(76)" id="fuzzelement1">test</a>
+<a href="\xE2\x80\x82javascript:javascript:alert(77)" id="fuzzelement1">test</a>
+<a href="\x20javascript:javascript:alert(78)" id="fuzzelement1">test</a>
+<a href="\x13javascript:javascript:alert(79)" id="fuzzelement1">test</a>
+<a href="\x09javascript:javascript:alert(80)" id="fuzzelement1">test</a>
+<a href="\xE2\x80\x8Ajavascript:javascript:alert(81)" id="fuzzelement1">test</a>
+<a href="\x14javascript:javascript:alert(82)" id="fuzzelement1">test</a>
+<a href="\x19javascript:javascript:alert(83)" id="fuzzelement1">test</a>
+<a href="\xE2\x80\xAFjavascript:javascript:alert(84)" id="fuzzelement1">test</a>
+<a href="\x1Fjavascript:javascript:alert(85)" id="fuzzelement1">test</a>
+<a href="\xE2\x80\x81javascript:javascript:alert(86)" id="fuzzelement1">test</a>
+<a href="\x1Djavascript:javascript:alert(87)" id="fuzzelement1">test</a>
+<a href="\xE2\x80\x87javascript:javascript:alert(88)" id="fuzzelement1">test</a>
+<a href="\x07javascript:javascript:alert(89)" id="fuzzelement1">test</a>
+<a href="\xE1\x9A\x80javascript:javascript:alert(90)" id="fuzzelement1">test</a>
+<a href="\xE2\x80\x83javascript:javascript:alert(91)" id="fuzzelement1">test</a>
+<a href="\x04javascript:javascript:alert(92)" id="fuzzelement1">test</a>
+<a href="\x01javascript:javascript:alert(93)" id="fuzzelement1">test</a>
+<a href="\x08javascript:javascript:alert(94)" id="fuzzelement1">test</a>
+<a href="\xE2\x80\x84javascript:javascript:alert(95)" id="fuzzelement1">test</a>
+<a href="\xE2\x80\x86javascript:javascript:alert(96)" id="fuzzelement1">test</a>
+<a href="\xE3\x80\x80javascript:javascript:alert(97)" id="fuzzelement1">test</a>
+<a href="\x12javascript:javascript:alert(98)" id="fuzzelement1">test</a>
+<a href="\x0Djavascript:javascript:alert(99)" id="fuzzelement1">test</a>
+<a href="\x0Ajavascript:javascript:alert(100)" id="fuzzelement1">test</a>
+<a href="\x0Cjavascript:javascript:alert(101)" id="fuzzelement1">test</a>
+<a href="\x15javascript:javascript:alert(102)" id="fuzzelement1">test</a>
+<a href="\xE2\x80\xA8javascript:javascript:alert(103)" id="fuzzelement1">test</a>
+<a href="\x16javascript:javascript:alert(104)" id="fuzzelement1">test</a>
+<a href="\x02javascript:javascript:alert(105)" id="fuzzelement1">test</a>
+<a href="\x1Bjavascript:javascript:alert(106)" id="fuzzelement1">test</a>
+<a href="\x06javascript:javascript:alert(107)" id="fuzzelement1">test</a>
+<a href="\xE2\x80\xA9javascript:javascript:alert(108)" id="fuzzelement1">test</a>
+<a href="\xE2\x80\x85javascript:javascript:alert(109)" id="fuzzelement1">test</a>
+<a href="\x1Ejavascript:javascript:alert(110)" id="fuzzelement1">test</a>
+<a href="\xE2\x81\x9Fjavascript:javascript:alert(111)" id="fuzzelement1">test</a>
+<a href="\x1Cjavascript:javascript:alert(112)" id="fuzzelement1">test</a>
+<a href="javascript\x00:javascript:alert(113)" id="fuzzelement1">test</a>
+<a href="javascript\x3A:javascript:alert(114)" id="fuzzelement1">test</a>
+<a href="javascript\x09:javascript:alert(115)" id="fuzzelement1">test</a>
+<a href="javascript\x0D:javascript:alert(116)" id="fuzzelement1">test</a>
+<a href="javascript\x0A:javascript:alert(117)" id="fuzzelement1">test</a>
+`"'><img src=xxx:x \x0Aonerror=javascript:alert(118)>
+`"'><img src=xxx:x \x22onerror=javascript:alert(119)>
+`"'><img src=xxx:x \x0Bonerror=javascript:alert(120)>
+`"'><img src=xxx:x \x0Donerror=javascript:alert(121)>
+`"'><img src=xxx:x \x2Fonerror=javascript:alert(122)>
+`"'><img src=xxx:x \x09onerror=javascript:alert(123)>
+`"'><img src=xxx:x \x0Conerror=javascript:alert(124)>
+`"'><img src=xxx:x \x00onerror=javascript:alert(125)>
+`"'><img src=xxx:x \x27onerror=javascript:alert(126)>
+`"'><img src=xxx:x \x20onerror=javascript:alert(127)>
+"`'><script>\x3Bjavascript:alert(128)</script>
+"`'><script>\x0Djavascript:alert(129)</script>
+"`'><script>\xEF\xBB\xBFjavascript:alert(130)</script>
+"`'><script>\xE2\x80\x81javascript:alert(131)</script>
+"`'><script>\xE2\x80\x84javascript:alert(132)</script>
+"`'><script>\xE3\x80\x80javascript:alert(133)</script>
+"`'><script>\x09javascript:alert(134)</script>
+"`'><script>\xE2\x80\x89javascript:alert(135)</script>
+"`'><script>\xE2\x80\x85javascript:alert(136)</script>
+"`'><script>\xE2\x80\x88javascript:alert(137)</script>
+"`'><script>\x00javascript:alert(138)</script>
+"`'><script>\xE2\x80\xA8javascript:alert(139)</script>
+"`'><script>\xE2\x80\x8Ajavascript:alert(140)</script>
+"`'><script>\xE1\x9A\x80javascript:alert(141)</script>
+"`'><script>\x0Cjavascript:alert(142)</script>
+"`'><script>\x2Bjavascript:alert(143)</script>
+"`'><script>\xF0\x90\x96\x9Ajavascript:alert(144)</script>
+"`'><script>-javascript:alert(145)</script>
+"`'><script>\x0Ajavascript:alert(146)</script>
+"`'><script>\xE2\x80\xAFjavascript:alert(147)</script>
+"`'><script>\x7Ejavascript:alert(148)</script>
+"`'><script>\xE2\x80\x87javascript:alert(149)</script>
+"`'><script>\xE2\x81\x9Fjavascript:alert(150)</script>
+"`'><script>\xE2\x80\xA9javascript:alert(151)</script>
+"`'><script>\xC2\x85javascript:alert(152)</script>
+"`'><script>\xEF\xBF\xAEjavascript:alert(153)</script>
+"`'><script>\xE2\x80\x83javascript:alert(154)</script>
+"`'><script>\xE2\x80\x8Bjavascript:alert(155)</script>
+"`'><script>\xEF\xBF\xBEjavascript:alert(156)</script>
+"`'><script>\xE2\x80\x80javascript:alert(157)</script>
+"`'><script>\x21javascript:alert(158)</script>
+"`'><script>\xE2\x80\x82javascript:alert(159)</script>
+"`'><script>\xE2\x80\x86javascript:alert(160)</script>
+"`'><script>\xE1\xA0\x8Ejavascript:alert(161)</script>
+"`'><script>\x0Bjavascript:alert(162)</script>
+"`'><script>\x20javascript:alert(163)</script>
+"`'><script>\xC2\xA0javascript:alert(164)</script>
+<img \x00src=x onerror="alert(165)">
+<img \x47src=x onerror="javascript:alert(166)">
+<img \x11src=x onerror="javascript:alert(167)">
+<img \x12src=x onerror="javascript:alert(168)">
+<img\x47src=x onerror="javascript:alert(169)">
+<img\x10src=x onerror="javascript:alert(170)">
+<img\x13src=x onerror="javascript:alert(171)">
+<img\x32src=x onerror="javascript:alert(172)">
+<img\x47src=x onerror="javascript:alert(173)">
+<img\x11src=x onerror="javascript:alert(174)">
+<img \x47src=x onerror="javascript:alert(175)">
+<img \x34src=x onerror="javascript:alert(176)">
+<img \x39src=x onerror="javascript:alert(177)">
+<img \x00src=x onerror="javascript:alert(178)">
+<img src\x09=x onerror="javascript:alert(179)">
+<img src\x10=x onerror="javascript:alert(180)">
+<img src\x13=x onerror="javascript:alert(181)">
+<img src\x32=x onerror="javascript:alert(182)">
+<img src\x12=x onerror="javascript:alert(183)">
+<img src\x11=x onerror="javascript:alert(184)">
+<img src\x00=x onerror="javascript:alert(185)">
+<img src\x47=x onerror="javascript:alert(186)">
+<img src=x\x09onerror="javascript:alert(187)">
+<img src=x\x10onerror="javascript:alert(188)">
+<img src=x\x11onerror="javascript:alert(189)">
+<img src=x\x12onerror="javascript:alert(190)">
+<img src=x\x13onerror="javascript:alert(191)">
+<img[a][b][c]src[d]=x[e]onerror=[f]"alert(192)">
+<img src=x onerror=\x09"javascript:alert(193)">
+<img src=x onerror=\x10"javascript:alert(194)">
+<img src=x onerror=\x11"javascript:alert(195)">
+<img src=x onerror=\x12"javascript:alert(196)">
+<img src=x onerror=\x32"javascript:alert(197)">
+<img src=x onerror=\x00"javascript:alert(198)">
+<a href=java&#1&#2&#3&#4&#5&#6&#7&#8&#11&#12script:javascript:alert(199)>XXX</a>
+<img src="x` `<script>javascript:alert(200)</script>"` `>
+<img src onerror /" '"= alt=javascript:alert(201)//">
+<title onpropertychange=javascript:alert(202)></title><title title=>
+<a href=http://foo.bar/#x=`y></a><img alt="`><img src=x:x onerror=javascript:alert(203)></a>">
+<!--[if]><script>javascript:alert(204)</script -->
+<!--[if<img src=x onerror=javascript:alert(205)//]> -->
+<script src="/\%(jscript)s"></script>
+<script src="\\%(jscript)s"></script>
+<IMG """><SCRIPT>alert("206")</SCRIPT>">
+<IMG SRC=javascript:alert(String.fromCharCode(50,48,55))>
+<IMG SRC=# onmouseover="alert('208')">
+<IMG SRC= onmouseover="alert('209')">
+<IMG onmouseover="alert('210')">
+<IMG SRC=&#106;&#97;&#118;&#97;&#115;&#99;&#114;&#105;&#112;&#116;&#58;&#97;&#108;&#101;&#114;&#116;&#40;&#39;&#50;&#49;&#49;&#39;&#41;>
+<IMG SRC=&#0000106&#0000097&#0000118&#0000097&#0000115&#0000099&#0000114&#0000105&#0000112&#0000116&#0000058&#0000097&#0000108&#0000101&#0000114&#0000116&#0000040&#0000039&#0000050&#0000049&#0000050&#0000039&#0000041>
+<IMG SRC=&#x6A&#x61&#x76&#x61&#x73&#x63&#x72&#x69&#x70&#x74&#x3A&#x61&#x6C&#x65&#x72&#x74&#x28&#x27&#x32&#x31&#x33&#x27&#x29>
+<IMG SRC="jav   ascript:alert('214');">
+<IMG SRC="jav&#x09;ascript:alert('215');">
+<IMG SRC="jav&#x0A;ascript:alert('216');">
+<IMG SRC="jav&#x0D;ascript:alert('217');">
+perl -e 'print "<IMG SRC=java\0script:alert(\"218\")>";' > out
+<IMG SRC=" &#14;  javascript:alert('219');">
+<SCRIPT/XSS SRC="http://ha.ckers.org/xss.js"></SCRIPT>
+<BODY onload!#$%&()*~+-_.,:;?@[/|\]^`=alert("220")>
+<SCRIPT/SRC="http://ha.ckers.org/xss.js"></SCRIPT>
+<<SCRIPT>alert("221");//<</SCRIPT>
+<SCRIPT SRC=http://ha.ckers.org/xss.js?< B >
+<SCRIPT SRC=//ha.ckers.org/.j>
+<IMG SRC="javascript:alert('222')"
+<iframe src=http://ha.ckers.org/scriptlet.html <
+\";alert('223');//
+<u oncopy=alert()> Copy me</u>
+<i onwheel=alert(224)> Scroll over me </i>
+<plaintext>
+http://a/%%30%30
+</textarea><script>alert(225)</script>
+
+#	SQL Injection
+#
+#	Strings which can cause a SQL injection if inputs are not sanitized
+
+1;DROP TABLE users
+1'; DROP TABLE users-- 1
+' OR 1=1 -- 1
+' OR '1'='1
+'; EXEC sp_MSForEachTable 'DROP TABLE ?'; --
+
+%
+_
+
+#	Server Code Injection
+#
+#	Strings which can cause user to run code on server as a privileged user (c.f. https://news.ycombinator.com/item?id=7665153)
+
+-
+--
+--version
+--help
+$USER
+/dev/null; touch /tmp/blns.fail ; echo
+`touch /tmp/blns.fail`
+$(touch /tmp/blns.fail)
+@{[system "touch /tmp/blns.fail"]}
+
+#	Command Injection (Ruby)
+#
+#	Strings which can call system commands within Ruby/Rails applications
+
+eval("puts 'hello world'")
+System("ls -al /")
+`ls -al /`
+Kernel.exec("ls -al /")
+Kernel.exit(1)
+%x('ls -al /')
+
+#      XXE Injection (XML)
+#
+#	String which can reveal system files when parsed by a badly configured XML parser
+
+<?xml version="1.0" encoding="ISO-8859-1"?><!DOCTYPE foo [ <!ELEMENT foo ANY ><!ENTITY xxe SYSTEM "file:///etc/passwd" >]><foo>&xxe;</foo>
+
+#	Unwanted Interpolation
+#
+#	Strings which can be accidentally expanded into different strings if evaluated in the wrong context, e.g. used as a printf format string or via Perl or shell eval. Might expose sensitive data from the program doing the interpolation, or might just represent the wrong string.
+
+$HOME
+$ENV{'HOME'}
+%d
+%s%s%s%s%s
+{0}
+%*.*s
+%@
+%n
+File:///
+
+#	File Inclusion
+#
+#	Strings which can cause user to pull in files that should not be a part of a web server
+
+../../../../../../../../../../../etc/passwd%00
+../../../../../../../../../../../etc/hosts
+
+#	Known CVEs and Vulnerabilities
+#
+#	Strings that test for known vulnerabilities
+
+() { 0; }; touch /tmp/blns.shellshock1.fail;
+() { _; } >_[$($())] { touch /tmp/blns.shellshock2.fail; }
+<<< %s(un='%s') = %u
++++ATH0
+
+#	MSDOS/Windows Special Filenames
+#
+#	Strings which are reserved characters in MSDOS/Windows
+
+CON
+PRN
+AUX
+CLOCK$
+NUL
+A:
+ZZ:
+COM1
+LPT1
+LPT2
+LPT3
+COM2
+COM3
+COM4
+
+#   IRC specific strings
+#
+#   Strings that may occur on IRC clients that make security products freak out
+
+DCC SEND STARTKEYLOGGER 0 0 0
+
+#	Scunthorpe Problem
+#
+#	Innocuous strings which may be blocked by profanity filters (https://en.wikipedia.org/wiki/Scunthorpe_problem)
+
+Scunthorpe General Hospital
+Penistone Community Church
+Lightwater Country Park
+Jimmy Clitheroe
+Horniman Museum
+shitake mushrooms
+RomansInSussex.co.uk
+http://www.cum.qc.ca/
+Craig Cockburn, Software Specialist
+Linda Callahan
+Dr. Herman I. Libshitz
+magna cum laude
+Super Bowl XXX
+medieval erection of parapets
+evaluate
+mocha
+expression
+Arsenal canal
+classic
+Tyson Gay
+Dick Van Dyke
+basement
+
+#	Human injection
+#
+#	Strings which may cause human to reinterpret worldview
+
+If you're reading this, you've been in a coma for almost 20 years now. We're trying a new technique. We don't know where this message will end up in your dream, but we hope it works. Please wake up, we miss you.
+
+#	Terminal escape codes
+#
+#	Strings which punish the fools who use cat/type on this file
+
+Roses are red, violets are blue. Hope you enjoy terminal hue
+But now...for my greatest trick...
+The quick brown fox... [Beeeep]
+
+#	iOS Vulnerabilities
+#
+#	Strings which crashed iMessage in various versions of iOS
+
+Powerلُلُصّبُلُلصّبُررً ॣ ॣh ॣ ॣ冗
+🏳0🌈️
+జ్ఞ‌ా
+
+# Persian special characters
+#
+# This is a four characters string which includes Persian special characters (گچپژ)
+
+گچپژ
+
+# jinja2 injection
+#
+# first one is supposed to raise "MemoryError" exception
+# second, obviously, prints contents of /etc/passwd
+
+{% print 'x' * 64 * 1024**3 %}
+{{ "".__class__.__mro__[2].__subclasses__()[40]("/etc/passwd").read() }}

From b0c6c082a14b3a13c2d160041e5b36893a11f014 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 5 Apr 2025 13:45:28 +0100
Subject: [PATCH 419/761] Fix tests and ignore expensive test

---
 .github/workflows/check.yml                       |  2 +-
 backend/reconcile/src/operation_transformation.rs | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index d7f73c62..41b35a96 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -45,7 +45,7 @@ jobs:
       - name: Test backend
         run: |
           cd backend
-          cargo test --verbose
+          cargo test --verbose -- --include-ignored
           cd sync_lib
           wasm-pack test --node
 
diff --git a/backend/reconcile/src/operation_transformation.rs b/backend/reconcile/src/operation_transformation.rs
index afff26c7..6a2ee8ee 100644
--- a/backend/reconcile/src/operation_transformation.rs
+++ b/backend/reconcile/src/operation_transformation.rs
@@ -132,7 +132,7 @@ mod test {
             "both the same word",
         );
 
-        test_merge_both_ways("    ", "it’s utf-8!", "   ", "it’s utf-8!");
+        test_merge_both_ways("    ", "it’s utf-8!", "    ", "it’s utf-8!");
 
         test_merge_both_ways(
             "both delete the same word but one a bit more",
@@ -173,7 +173,7 @@ mod test {
             "      |7ca2b36d-6ee7-49eb-8eb1-d77e4cc1a001|   ",
               "      |7ca2b36d-6ee7-49eb-8eb1-d77e4cc1a001|      |cd9195cc-103a-4f13-90c8-4fba0ba421ee|      |d39156cc-cfd6-42a8-b70a-75020896069d|      |fbad794c-9c47-41f2-a343-490284ecb5a0|      |dup|   ",
              "       |7ca2b36d-6ee7-49eb-8eb1-d77e4cc1a001|      |cd9195cc-103a-4f13-90c8-4fba0ba421ee|      |dup|   ",
-            "      |7ca2b36d-6ee7-49eb-8eb1-d77e4cc1a001|      |cd9195cc-103a-4f13-90c8-4fba0ba421ee|      |d39156cc-cfd6-42a8-b70a-75020896069d|      |fbad794c-9c47-41f2-a343-490284ecb5a0|      |dup|      |dup|   ");
+            "       |7ca2b36d-6ee7-49eb-8eb1-d77e4cc1a001|      |cd9195cc-103a-4f13-90c8-4fba0ba421ee|      |d39156cc-cfd6-42a8-b70a-75020896069d|      |fbad794c-9c47-41f2-a343-490284ecb5a0|      |dup|      |dup|   ");
     }
 
     #[test]
@@ -358,23 +358,26 @@ mod test {
         );
     }
 
+    #[ignore = "expensive to run, only run in CI"]
     #[test_matrix( [
         "pride_and_prejudice.txt",
         "romeo_and_juliet.txt",
         "room_with_a_view.txt",
         "kun_lu.txt",
-
+        "blns.txt"
     ],  [
         "pride_and_prejudice.txt",
         "romeo_and_juliet.txt",
         "room_with_a_view.txt",
-        "kun_lu.txt"
+        "kun_lu.txt",
+        "blns.txt"
     ],  [
         "pride_and_prejudice.txt",
         "romeo_and_juliet.txt",
         "room_with_a_view.txt",
-        "kun_lu.txt"
-    ], [0..10000, 10000..20000], [0..10000, 10000..20000], [0..10000, 10000..20000])]
+        "kun_lu.txt",
+        "blns.txt"
+    ], [0..10000, 10000..20000, 20000..50000], [0..10000, 10000..20000, 20000..50000], [0..10000, 10000..20000, 20000..50000])]
     fn test_merge_files_without_panic(
         file_name_1: &str,
         file_name_2: &str,

From b230d34b884d68ce3e5e23f742aad184f03fee5d Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 5 Apr 2025 13:48:02 +0100
Subject: [PATCH 420/761] Add left/right joinability for tokens

---
 backend/reconcile/src/diffs/raw_operation.rs  |  24 ++-
 ...le__diffs__myers__tests__complex_diff.snap |  12 ++
 ...ile__diffs__myers__tests__delete_only.snap |   4 +
 ...iffs__myers__tests__identical_content.snap |   6 +
 ...ile__diffs__myers__tests__insert_only.snap |   4 +
 ...iffs__myers__tests__prefix_and_suffix.snap |  10 ++
 .../operation_transformation/edited_text.rs   | 142 +++++++++++-------
 ...rd_tokenizer__tests__with_snapshots-3.snap |  16 +-
 ...rd_tokenizer__tests__with_snapshots-4.snap |  40 ++++-
 ...rd_tokenizer__tests__with_snapshots-5.snap |  39 +++++
 ...word_tokenizer__tests__with_snapshots.snap |  12 +-
 backend/reconcile/src/tokenizer/token.rs      |  28 +++-
 .../reconcile/tests/examples/multiline.yml    |  51 ++++++-
 13 files changed, 313 insertions(+), 75 deletions(-)
 create mode 100644 backend/reconcile/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots-5.snap

diff --git a/backend/reconcile/src/diffs/raw_operation.rs b/backend/reconcile/src/diffs/raw_operation.rs
index 0df48f5d..f95a0349 100644
--- a/backend/reconcile/src/diffs/raw_operation.rs
+++ b/backend/reconcile/src/diffs/raw_operation.rs
@@ -28,10 +28,26 @@ where
 
     pub fn get_original_text(self) -> String { self.tokens().iter().map(Token::original).collect() }
 
-    /// Extends the operation with another operation if returning the new
-    /// operation. Only operations of the same type can be used to extend.
-    /// If the operations are of different types, returns None.
+    pub fn is_left_joinable(&self) -> bool {
+        let first_token = self.tokens().first();
+        first_token.map_or(true, |t| t.get_is_left_joinable())
+    }
+
+    pub fn is_right_joinable(&self) -> bool {
+        let last_token = self.tokens().last();
+        last_token.map_or(true, |t| t.get_is_right_joinable())
+    }
+
+    /// Extends the operation with another operation when it returns Some
+    /// operation. Only operations of the same type as self can be used to
+    /// extend self. If the operations are of different types, returns None.
     pub fn extend(self, other: RawOperation<T>) -> Option<RawOperation<T>> {
+        debug_assert!(
+            std::mem::discriminant(&self) == std::mem::discriminant(&other),
+            "Cannot extend operations of different types. This should have been handled before \
+             calling this function."
+        );
+
         match (self, other) {
             (RawOperation::Insert(tokens1), RawOperation::Insert(tokens2)) => Some(
                 RawOperation::Insert(tokens1.into_iter().chain(tokens2).collect()),
@@ -42,7 +58,7 @@ where
             (RawOperation::Equal(tokens1), RawOperation::Equal(tokens2)) => Some(
                 RawOperation::Equal(tokens1.into_iter().chain(tokens2).collect()),
             ),
-            _ => None,
+            _ => unreachable!("Only operations of the same type can be extended"),
         }
     }
 }
diff --git a/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__complex_diff.snap b/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__complex_diff.snap
index 8c89ed35..57ee0865 100644
--- a/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__complex_diff.snap
+++ b/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__complex_diff.snap
@@ -9,6 +9,8 @@ snapshot_kind: text
             Token {
                 normalised: "a",
                 original: "a",
+                is_left_joinable: true,
+                is_right_joinable: true,
             },
         ],
     ),
@@ -17,6 +19,8 @@ snapshot_kind: text
             Token {
                 normalised: "x",
                 original: "x",
+                is_left_joinable: true,
+                is_right_joinable: true,
             },
         ],
     ),
@@ -25,6 +29,8 @@ snapshot_kind: text
             Token {
                 normalised: "b",
                 original: "b",
+                is_left_joinable: true,
+                is_right_joinable: true,
             },
         ],
     ),
@@ -33,6 +39,8 @@ snapshot_kind: text
             Token {
                 normalised: "c",
                 original: "c",
+                is_left_joinable: true,
+                is_right_joinable: true,
             },
         ],
     ),
@@ -41,6 +49,8 @@ snapshot_kind: text
             Token {
                 normalised: "y",
                 original: "y",
+                is_left_joinable: true,
+                is_right_joinable: true,
             },
         ],
     ),
@@ -49,6 +59,8 @@ snapshot_kind: text
             Token {
                 normalised: "d",
                 original: "d",
+                is_left_joinable: true,
+                is_right_joinable: true,
             },
         ],
     ),
diff --git a/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__delete_only.snap b/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__delete_only.snap
index f07eb3df..a4598d0e 100644
--- a/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__delete_only.snap
+++ b/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__delete_only.snap
@@ -9,10 +9,14 @@ snapshot_kind: text
             Token {
                 normalised: "a",
                 original: "a",
+                is_left_joinable: true,
+                is_right_joinable: true,
             },
             Token {
                 normalised: "b",
                 original: "b",
+                is_left_joinable: true,
+                is_right_joinable: true,
             },
         ],
     ),
diff --git a/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__identical_content.snap b/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__identical_content.snap
index a99e2764..2fc3317a 100644
--- a/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__identical_content.snap
+++ b/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__identical_content.snap
@@ -9,14 +9,20 @@ snapshot_kind: text
             Token {
                 normalised: "a",
                 original: "a",
+                is_left_joinable: true,
+                is_right_joinable: true,
             },
             Token {
                 normalised: "b",
                 original: "b",
+                is_left_joinable: true,
+                is_right_joinable: true,
             },
             Token {
                 normalised: "c",
                 original: "c",
+                is_left_joinable: true,
+                is_right_joinable: true,
             },
         ],
     ),
diff --git a/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__insert_only.snap b/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__insert_only.snap
index b32c8ce3..e07d8440 100644
--- a/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__insert_only.snap
+++ b/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__insert_only.snap
@@ -9,10 +9,14 @@ snapshot_kind: text
             Token {
                 normalised: "a",
                 original: "a",
+                is_left_joinable: true,
+                is_right_joinable: true,
             },
             Token {
                 normalised: "b",
                 original: "b",
+                is_left_joinable: true,
+                is_right_joinable: true,
             },
         ],
     ),
diff --git a/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__prefix_and_suffix.snap b/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__prefix_and_suffix.snap
index 03c8fee2..6b86600d 100644
--- a/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__prefix_and_suffix.snap
+++ b/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__prefix_and_suffix.snap
@@ -9,6 +9,8 @@ snapshot_kind: text
             Token {
                 normalised: "a",
                 original: "a",
+                is_left_joinable: true,
+                is_right_joinable: true,
             },
         ],
     ),
@@ -17,10 +19,14 @@ snapshot_kind: text
             Token {
                 normalised: "b",
                 original: "b",
+                is_left_joinable: true,
+                is_right_joinable: true,
             },
             Token {
                 normalised: "c",
                 original: "c",
+                is_left_joinable: true,
+                is_right_joinable: true,
             },
         ],
     ),
@@ -29,6 +35,8 @@ snapshot_kind: text
             Token {
                 normalised: "x",
                 original: "x",
+                is_left_joinable: true,
+                is_right_joinable: true,
             },
         ],
     ),
@@ -37,6 +45,8 @@ snapshot_kind: text
             Token {
                 normalised: "d",
                 original: "d",
+                is_left_joinable: true,
+                is_right_joinable: true,
             },
         ],
     ),
diff --git a/backend/reconcile/src/operation_transformation/edited_text.rs b/backend/reconcile/src/operation_transformation/edited_text.rs
index 8fc2ed96..fdaa87fc 100644
--- a/backend/reconcile/src/operation_transformation/edited_text.rs
+++ b/backend/reconcile/src/operation_transformation/edited_text.rs
@@ -3,15 +3,12 @@ use core::iter;
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
 
-use super::{CursorPosition, Operation, TextWithCursors};
+use super::{CursorPosition, Operation, TextWithCursors, ordered_operation::OrderedOperation};
 use crate::{
     diffs::{myers::diff, raw_operation::RawOperation},
     operation_transformation::merge_context::MergeContext,
     tokenizer::{Tokenizer, word_tokenizer::word_tokenizer},
-    utils::{
-        merge_iters::MergeSorted as _, ordered_operation::OrderedOperation, side::Side,
-        string_builder::StringBuilder,
-    },
+    utils::{merge_iters::MergeSorted as _, side::Side, string_builder::StringBuilder},
 };
 
 /// A sequence of operations that can be applied to a text document.
@@ -66,11 +63,93 @@ where
 
         Self::new(
             original,
-            Self::cook_operations(Self::elongate_operations(diff)).collect(),
+            Self::cook_operations(Self::elongate_operations(Self::break_up_raw_operations(
+                diff,
+            )))
+            .collect(),
             updated.cursors,
         )
     }
 
+    fn break_up_raw_operations<I>(raw_operations: I) -> impl Iterator<Item = RawOperation<T>>
+    where
+        I: IntoIterator<Item = RawOperation<T>>,
+    {
+        raw_operations.into_iter().flat_map(|raw_operation| {
+            let mut result: Vec<RawOperation<T>> = Vec::new();
+            match raw_operation {
+                RawOperation::Insert(tokens) => {
+                    for token in tokens {
+                        result.push(RawOperation::Insert(vec![token]));
+                    }
+                }
+                RawOperation::Delete(tokens) => {
+                    for token in tokens {
+                        result.push(RawOperation::Delete(vec![token]));
+                    }
+                }
+                RawOperation::Equal(tokens) => {
+                    for token in tokens {
+                        result.push(RawOperation::Equal(vec![token]));
+                    }
+                }
+            }
+            result.into_iter()
+        })
+    }
+
+    fn elongate_operations<I>(raw_operations: I) -> Vec<RawOperation<T>>
+    where
+        I: IntoIterator<Item = RawOperation<T>>,
+    {
+        let mut maybe_previous_insert: Option<RawOperation<T>> = None;
+        let mut maybe_previous_delete: Option<RawOperation<T>> = None;
+
+        let mut result: Vec<RawOperation<T>> = raw_operations
+            .into_iter()
+            .flat_map(|next| match next {
+                RawOperation::Insert(..) => match maybe_previous_insert.take() {
+                    Some(prev) if prev.is_right_joinable() && next.is_left_joinable() => {
+                        maybe_previous_insert = prev.extend(next);
+                        Box::new(iter::empty()) as Box<dyn Iterator<Item = RawOperation<T>>>
+                    }
+                    prev => {
+                        maybe_previous_insert = Some(next);
+                        Box::new(prev.into_iter())
+                    }
+                },
+                RawOperation::Delete(..) => match maybe_previous_delete.take() {
+                    Some(prev) if prev.is_right_joinable() && next.is_left_joinable() => {
+                        maybe_previous_delete = prev.extend(next);
+                        Box::new(iter::empty()) as Box<dyn Iterator<Item = RawOperation<T>>>
+                    }
+                    prev => {
+                        maybe_previous_delete = Some(next);
+                        Box::new(prev.into_iter())
+                    }
+                },
+                RawOperation::Equal(..) => Box::new(
+                    maybe_previous_insert
+                        .take()
+                        .into_iter()
+                        .chain(maybe_previous_delete.take())
+                        .chain(iter::once(next)),
+                )
+                    as Box<dyn Iterator<Item = RawOperation<T>>>,
+            })
+            .collect();
+
+        if let Some(prev) = maybe_previous_insert {
+            result.push(prev);
+        }
+
+        if let Some(prev) = maybe_previous_delete {
+            result.push(prev);
+        }
+
+        result
+    }
+
     // Turn raw operations into ordered operations while keeping track of old & new
     // indexes.
     fn cook_operations<I>(raw_operations: I) -> impl Iterator<Item = OrderedOperation<T>>
@@ -119,56 +198,6 @@ where
         })
     }
 
-    fn elongate_operations<I>(raw_operations: I) -> Vec<RawOperation<T>>
-    where
-        I: IntoIterator<Item = RawOperation<T>>,
-    {
-        let mut maybe_previous_insert: Option<RawOperation<T>> = None;
-        let mut maybe_previous_delete: Option<RawOperation<T>> = None;
-
-        let mut result: Vec<RawOperation<T>> = raw_operations
-            .into_iter()
-            .flat_map(|next| match next {
-                RawOperation::Insert(..) => {
-                    if let Some(prev) = maybe_previous_insert.take() {
-                        maybe_previous_insert = prev.extend(next);
-                    } else {
-                        maybe_previous_insert = Some(next);
-                    }
-
-                    Box::new(iter::empty()) as Box<dyn Iterator<Item = RawOperation<T>>>
-                }
-                RawOperation::Delete(..) => {
-                    if let Some(prev) = maybe_previous_delete.take() {
-                        maybe_previous_delete = prev.extend(next);
-                    } else {
-                        maybe_previous_delete = Some(next);
-                    }
-
-                    Box::new(iter::empty()) as Box<dyn Iterator<Item = RawOperation<T>>>
-                }
-                RawOperation::Equal(..) => Box::new(
-                    maybe_previous_insert
-                        .take()
-                        .into_iter()
-                        .chain(maybe_previous_delete.take())
-                        .chain(iter::once(next)),
-                )
-                    as Box<dyn Iterator<Item = RawOperation<T>>>,
-            })
-            .collect();
-
-        if let Some(prev) = maybe_previous_insert {
-            result.push(prev);
-        }
-
-        if let Some(prev) = maybe_previous_delete {
-            result.push(prev);
-        }
-
-        result
-    }
-
     /// Create a new `EditedText` with the given operations.
     /// The operations must be in the order in which they are meant to be
     /// applied. The operations must not overlap.
@@ -225,6 +254,7 @@ where
                         // Operations on the left and right must come in the same order so that
                         // inserts can be merged with other inserts and deletes with deletes.
                         usize::from(matches!(operation.operation, Operation::Delete { .. })),
+                        operation.operation.start_index(),
                         // Make sure that the ordering is deterministic regardless which text
                         // is left or right.
                         match &operation.operation {
diff --git a/backend/reconcile/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots-3.snap b/backend/reconcile/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots-3.snap
index 58d749ef..d1c94e1e 100644
--- a/backend/reconcile/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots-3.snap
+++ b/backend/reconcile/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots-3.snap
@@ -5,11 +5,21 @@ snapshot_kind: text
 ---
 [
     Token {
-        normalised: "what?",
-        original: " what?",
+        normalised: " what?",
+        original: " ",
+        is_left_joinable: true,
+        is_right_joinable: true,
     },
     Token {
-        normalised: "",
+        normalised: "what?",
+        original: "what?",
+        is_left_joinable: true,
+        is_right_joinable: true,
+    },
+    Token {
+        normalised: " ",
         original: " ",
+        is_left_joinable: true,
+        is_right_joinable: true,
     },
 ]
diff --git a/backend/reconcile/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots-4.snap b/backend/reconcile/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots-4.snap
index 4c28a7f3..6740dbc0 100644
--- a/backend/reconcile/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots-4.snap
+++ b/backend/reconcile/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots-4.snap
@@ -4,20 +4,52 @@ expression: "word_tokenizer(\" hello, \\nwhere are you?\")"
 snapshot_kind: text
 ---
 [
+    Token {
+        normalised: " hello,",
+        original: " ",
+        is_left_joinable: true,
+        is_right_joinable: true,
+    },
     Token {
         normalised: "hello,",
-        original: " hello,",
+        original: "hello,",
+        is_left_joinable: true,
+        is_right_joinable: true,
+    },
+    Token {
+        normalised: " \nwhere",
+        original: " \n",
+        is_left_joinable: true,
+        is_right_joinable: true,
     },
     Token {
         normalised: "where",
-        original: " \nwhere",
+        original: "where",
+        is_left_joinable: true,
+        is_right_joinable: true,
+    },
+    Token {
+        normalised: " are",
+        original: " ",
+        is_left_joinable: true,
+        is_right_joinable: true,
     },
     Token {
         normalised: "are",
-        original: " are",
+        original: "are",
+        is_left_joinable: true,
+        is_right_joinable: true,
+    },
+    Token {
+        normalised: " you?",
+        original: " ",
+        is_left_joinable: true,
+        is_right_joinable: true,
     },
     Token {
         normalised: "you?",
-        original: " you?",
+        original: "you?",
+        is_left_joinable: true,
+        is_right_joinable: true,
     },
 ]
diff --git a/backend/reconcile/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots-5.snap b/backend/reconcile/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots-5.snap
new file mode 100644
index 00000000..832147ec
--- /dev/null
+++ b/backend/reconcile/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots-5.snap
@@ -0,0 +1,39 @@
+---
+source: reconcile/src/tokenizer/word_tokenizer.rs
+expression: "word_tokenizer(\" hello, \\nwhere are you?\")"
+snapshot_kind: text
+---
+[
+    Token {
+        normalised: " ",
+        original: " ",
+    },
+    Token {
+        normalised: "hello,",
+        original: "hello,",
+    },
+    Token {
+        normalised: " \n",
+        original: " \n",
+    },
+    Token {
+        normalised: "where",
+        original: "where",
+    },
+    Token {
+        normalised: " ",
+        original: " ",
+    },
+    Token {
+        normalised: "are",
+        original: "are",
+    },
+    Token {
+        normalised: " ",
+        original: " ",
+    },
+    Token {
+        normalised: "you?",
+        original: "you?",
+    },
+]
diff --git a/backend/reconcile/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots.snap b/backend/reconcile/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots.snap
index 206c7fee..95c8db5f 100644
--- a/backend/reconcile/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots.snap
+++ b/backend/reconcile/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots.snap
@@ -7,9 +7,19 @@ snapshot_kind: text
     Token {
         normalised: "Hi",
         original: "Hi",
+        is_left_joinable: true,
+        is_right_joinable: true,
+    },
+    Token {
+        normalised: " there!",
+        original: " ",
+        is_left_joinable: true,
+        is_right_joinable: true,
     },
     Token {
         normalised: "there!",
-        original: " there!",
+        original: "there!",
+        is_left_joinable: true,
+        is_right_joinable: true,
     },
 ]
diff --git a/backend/reconcile/src/tokenizer/token.rs b/backend/reconcile/src/tokenizer/token.rs
index ab521a71..86cbb92f 100644
--- a/backend/reconcile/src/tokenizer/token.rs
+++ b/backend/reconcile/src/tokenizer/token.rs
@@ -3,29 +3,45 @@ use serde::{Deserialize, Serialize};
 
 /// A token is a string that has been normalised in some way.
 /// The normalised form is used for comparison, while the original form is used
-/// for applying Operations.
+/// for applying `Operation`-s.
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[derive(Debug, Clone)]
 pub struct Token<T>
 where
     T: PartialEq + Clone + std::fmt::Debug,
 {
-    normalised: T,
+    /// The normalised form of the token used deriving the diff.
+    pub normalised: T,
+
+    /// The original string, that should be inserted or deleted in the document.
     original: String,
+
+    /// Whether the token is joinable with the previous token.
+    is_left_joinable: bool,
+
+    /// Whether the token is joinable with the next token.
+    is_right_joinable: bool,
 }
 
 impl From<&str> for Token<String> {
-    fn from(s: &str) -> Self { Token::new(s.trim().to_owned(), s.to_owned()) }
+    fn from(text: &str) -> Self { Token::new(text.to_owned(), text.to_owned(), true, true) }
 }
 
 impl<T> Token<T>
 where
     T: PartialEq + Clone + std::fmt::Debug,
 {
-    pub fn new(normalised: T, original: String) -> Self {
+    pub fn new(
+        normalised: T,
+        original: String,
+        is_left_joinable: bool,
+        is_right_joinable: bool,
+    ) -> Self {
         Token {
             normalised,
             original,
+            is_left_joinable,
+            is_right_joinable,
         }
     }
 
@@ -34,6 +50,10 @@ where
     pub fn normalised(&self) -> &T { &self.normalised }
 
     pub fn get_original_length(&self) -> usize { self.original.chars().count() }
+
+    pub fn get_is_left_joinable(&self) -> bool { self.is_left_joinable }
+
+    pub fn get_is_right_joinable(&self) -> bool { self.is_right_joinable }
 }
 
 impl<T> PartialEq for Token<T>
diff --git a/backend/reconcile/tests/examples/multiline.yml b/backend/reconcile/tests/examples/multiline.yml
index c751feb9..00de7cd9 100644
--- a/backend/reconcile/tests/examples/multiline.yml
+++ b/backend/reconcile/tests/examples/multiline.yml
@@ -7,14 +7,59 @@ left: |
 right: |
   Hello there!
 
-
   Best,
   Andras
 
 expected: |
   Hello there!
 
-  How are you?
-
   Best,
   Andras
+
+
+  How are you?
+
+---
+
+parent: |
+  - my list
+  - 2nd item
+  - 3rd item
+
+left: |
+  - my list
+  - 2nd item
+      - nested list
+        - very nested  list
+  - 3rd item
+
+right: |
+  - my list
+    - nested list
+  - 2nd item
+  - 3rd item
+    - another nested list
+
+expected: |
+  - my list
+    - nested list
+  - 2nd item
+      - nested list
+        - very nested  list
+  - 3rd item
+    - another nested list
+
+---
+
+parent: |
+  a
+  a
+left: |
+  a
+    a
+right: |
+  a
+  a
+expected: |
+  a
+    a

From 2b78f0c76f65b189b2689d738827681751b5e93e Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 5 Apr 2025 13:57:48 +0100
Subject: [PATCH 421/761] Remove break_up_raw_operations

---
 backend/reconcile/src/diffs/myers.rs          | 61 ++++++++++++-------
 ...ile__diffs__myers__tests__delete_only.snap |  4 ++
 ...iffs__myers__tests__identical_content.snap |  8 +++
 ...ile__diffs__myers__tests__insert_only.snap |  4 ++
 ...iffs__myers__tests__prefix_and_suffix.snap |  4 ++
 .../operation_transformation/edited_text.rs   | 32 +---------
 6 files changed, 61 insertions(+), 52 deletions(-)

diff --git a/backend/reconcile/src/diffs/myers.rs b/backend/reconcile/src/diffs/myers.rs
index da754040..b7a7c5e5 100644
--- a/backend/reconcile/src/diffs/myers.rs
+++ b/backend/reconcile/src/diffs/myers.rs
@@ -1,4 +1,5 @@
 //! Taken from <https://github.com/mitsuhiko/similar/blob/7e15c44de11a1cd61e1149189929e189ef977fd8/src/algorithms/myers.rs>
+//!
 //! Myers' diff algorithm.
 //!
 //! * time: `O((N+M)D)`
@@ -34,8 +35,7 @@ use crate::{
 /// Diff `old`, between indices `old_range` and `new` between indices
 /// `new_range`.
 ///
-/// This diff is done with an optional deadline that defines the maximal
-/// execution time permitted before it bails and falls back to an approximation.
+/// The returned RawOperations all have a token count of 1.
 pub fn diff<T>(old: &[Token<T>], new: &[Token<T>]) -> Vec<RawOperation<T>>
 where
     T: PartialEq + Clone + std::fmt::Debug,
@@ -44,6 +44,7 @@ where
     let mut vb = V::new(max_d);
     let mut vf = V::new(max_d);
     let mut result: Vec<RawOperation<T>> = vec![];
+
     conquer(
         old,
         0..old.len(),
@@ -53,6 +54,12 @@ where
         &mut vb,
         &mut result,
     );
+
+    debug_assert!(
+        result.iter().all(|op| op.tokens().len() == 1),
+        "All operations should be of length 1"
+    );
+
     result
 }
 
@@ -234,9 +241,11 @@ fn conquer<T>(
     // Check for common prefix
     let common_prefix_len = common_prefix_len(old, old_range.clone(), new, new_range.clone());
     if common_prefix_len > 0 {
-        result.push(RawOperation::Equal(
-            old[old_range.start..old_range.start + common_prefix_len].to_vec(),
-        ));
+        result.extend(
+            old[old_range.start..old_range.start + common_prefix_len]
+                .iter()
+                .map(|token| RawOperation::Equal(vec![token.clone()])),
+        )
     }
     old_range.start += common_prefix_len;
     new_range.start += common_prefix_len;
@@ -251,15 +260,19 @@ fn conquer<T>(
     new_range.end -= common_suffix_len;
 
     if old_range.is_empty() && new_range.is_empty() {
-        // Do nothing
+        // do nothing
     } else if new_range.is_empty() {
-        result.push(RawOperation::Delete(
-            old[old_range.start..old_range.start + old_range.len()].to_vec(),
-        ));
+        result.extend(
+            old[old_range.start..old_range.start + old_range.len()]
+                .iter()
+                .map(|token| RawOperation::Delete(vec![token.clone()])),
+        )
     } else if old_range.is_empty() {
-        result.push(RawOperation::Insert(
-            new[new_range.start..new_range.start + new_range.len()].to_vec(),
-        ));
+        result.extend(
+            new[new_range.start..new_range.start + new_range.len()]
+                .iter()
+                .map(|token| RawOperation::Insert(vec![token.clone()])),
+        )
     } else if let Some((x_start, y_start)) =
         find_middle_snake(old, old_range.clone(), new, new_range.clone(), vf, vb)
     {
@@ -268,18 +281,24 @@ fn conquer<T>(
         conquer(old, old_a, new, new_a, vf, vb, result);
         conquer(old, old_b, new, new_b, vf, vb, result);
     } else {
-        result.push(RawOperation::Delete(
-            old[old_range.start..old_range.end].to_vec(),
-        ));
-        result.push(RawOperation::Insert(
-            new[new_range.start..new_range.end].to_vec(),
-        ));
+        result.extend(
+            old[old_range.start..old_range.end]
+                .iter()
+                .map(|token| RawOperation::Delete(vec![token.clone()])),
+        );
+        result.extend(
+            new[new_range.start..new_range.end]
+                .iter()
+                .map(|token| RawOperation::Insert(vec![token.clone()])),
+        );
     }
 
     if common_suffix_len > 0 {
-        result.push(RawOperation::Equal(
-            old[common_suffix.0..common_suffix.0 + common_suffix_len].to_vec(),
-        ));
+        result.extend(
+            old[common_suffix.0..common_suffix.0 + common_suffix_len]
+                .iter()
+                .map(|token| RawOperation::Equal(vec![token.clone()])),
+        );
     }
 }
 
diff --git a/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__delete_only.snap b/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__delete_only.snap
index a4598d0e..93bb5298 100644
--- a/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__delete_only.snap
+++ b/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__delete_only.snap
@@ -12,6 +12,10 @@ snapshot_kind: text
                 is_left_joinable: true,
                 is_right_joinable: true,
             },
+        ],
+    ),
+    Delete(
+        [
             Token {
                 normalised: "b",
                 original: "b",
diff --git a/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__identical_content.snap b/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__identical_content.snap
index 2fc3317a..f82d4ac5 100644
--- a/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__identical_content.snap
+++ b/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__identical_content.snap
@@ -12,12 +12,20 @@ snapshot_kind: text
                 is_left_joinable: true,
                 is_right_joinable: true,
             },
+        ],
+    ),
+    Equal(
+        [
             Token {
                 normalised: "b",
                 original: "b",
                 is_left_joinable: true,
                 is_right_joinable: true,
             },
+        ],
+    ),
+    Equal(
+        [
             Token {
                 normalised: "c",
                 original: "c",
diff --git a/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__insert_only.snap b/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__insert_only.snap
index e07d8440..0f61f3c5 100644
--- a/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__insert_only.snap
+++ b/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__insert_only.snap
@@ -12,6 +12,10 @@ snapshot_kind: text
                 is_left_joinable: true,
                 is_right_joinable: true,
             },
+        ],
+    ),
+    Insert(
+        [
             Token {
                 normalised: "b",
                 original: "b",
diff --git a/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__prefix_and_suffix.snap b/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__prefix_and_suffix.snap
index 6b86600d..e50984ff 100644
--- a/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__prefix_and_suffix.snap
+++ b/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__prefix_and_suffix.snap
@@ -22,6 +22,10 @@ snapshot_kind: text
                 is_left_joinable: true,
                 is_right_joinable: true,
             },
+        ],
+    ),
+    Delete(
+        [
             Token {
                 normalised: "c",
                 original: "c",
diff --git a/backend/reconcile/src/operation_transformation/edited_text.rs b/backend/reconcile/src/operation_transformation/edited_text.rs
index fdaa87fc..12e0ee88 100644
--- a/backend/reconcile/src/operation_transformation/edited_text.rs
+++ b/backend/reconcile/src/operation_transformation/edited_text.rs
@@ -63,41 +63,11 @@ where
 
         Self::new(
             original,
-            Self::cook_operations(Self::elongate_operations(Self::break_up_raw_operations(
-                diff,
-            )))
-            .collect(),
+            Self::cook_operations(Self::elongate_operations(diff)).collect(),
             updated.cursors,
         )
     }
 
-    fn break_up_raw_operations<I>(raw_operations: I) -> impl Iterator<Item = RawOperation<T>>
-    where
-        I: IntoIterator<Item = RawOperation<T>>,
-    {
-        raw_operations.into_iter().flat_map(|raw_operation| {
-            let mut result: Vec<RawOperation<T>> = Vec::new();
-            match raw_operation {
-                RawOperation::Insert(tokens) => {
-                    for token in tokens {
-                        result.push(RawOperation::Insert(vec![token]));
-                    }
-                }
-                RawOperation::Delete(tokens) => {
-                    for token in tokens {
-                        result.push(RawOperation::Delete(vec![token]));
-                    }
-                }
-                RawOperation::Equal(tokens) => {
-                    for token in tokens {
-                        result.push(RawOperation::Equal(vec![token]));
-                    }
-                }
-            }
-            result.into_iter()
-        })
-    }
-
     fn elongate_operations<I>(raw_operations: I) -> Vec<RawOperation<T>>
     where
         I: IntoIterator<Item = RawOperation<T>>,

From a1b3b61c439a8566f2335f7a308c55744ad2f3f1 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 5 Apr 2025 14:46:34 +0100
Subject: [PATCH 422/761] Move & add tests

---
 .../reconcile/src/operation_transformation.rs | 246 ------------------
 backend/reconcile/tests/examples/1.yml        |   6 -
 backend/reconcile/tests/examples/10.yml       |   4 -
 backend/reconcile/tests/examples/11.yml       |   4 -
 backend/reconcile/tests/examples/12.yml       |   4 -
 backend/reconcile/tests/examples/13.yml       |   4 -
 backend/reconcile/tests/examples/2.yml        |   4 -
 backend/reconcile/tests/examples/3.yml        |   4 -
 backend/reconcile/tests/examples/4.yml        |   4 -
 backend/reconcile/tests/examples/5.yml        |   4 -
 backend/reconcile/tests/examples/6.yml        |   4 -
 backend/reconcile/tests/examples/7.yml        |   4 -
 backend/reconcile/tests/examples/8.yml        |   4 -
 backend/reconcile/tests/examples/9.yml        |   4 -
 backend/reconcile/tests/examples/deletes.yml  |  28 ++
 .../tests/examples/deletes_and_inserts.yml    |  13 +
 .../tests/examples/idempotent_inserts.yml     |  27 ++
 .../reconcile/tests/examples/multiline.yml    |   6 +-
 .../reconcile/tests/examples/replacing.yml    |  21 ++
 backend/reconcile/tests/examples/utf-8.yml    |  11 +
 backend/reconcile/tests/examples/various.yml  | 130 +++++++++
 21 files changed, 233 insertions(+), 303 deletions(-)
 delete mode 100644 backend/reconcile/tests/examples/1.yml
 delete mode 100644 backend/reconcile/tests/examples/10.yml
 delete mode 100644 backend/reconcile/tests/examples/11.yml
 delete mode 100644 backend/reconcile/tests/examples/12.yml
 delete mode 100644 backend/reconcile/tests/examples/13.yml
 delete mode 100644 backend/reconcile/tests/examples/2.yml
 delete mode 100644 backend/reconcile/tests/examples/3.yml
 delete mode 100644 backend/reconcile/tests/examples/4.yml
 delete mode 100644 backend/reconcile/tests/examples/5.yml
 delete mode 100644 backend/reconcile/tests/examples/6.yml
 delete mode 100644 backend/reconcile/tests/examples/7.yml
 delete mode 100644 backend/reconcile/tests/examples/8.yml
 delete mode 100644 backend/reconcile/tests/examples/9.yml
 create mode 100644 backend/reconcile/tests/examples/deletes.yml
 create mode 100644 backend/reconcile/tests/examples/deletes_and_inserts.yml
 create mode 100644 backend/reconcile/tests/examples/idempotent_inserts.yml
 create mode 100644 backend/reconcile/tests/examples/replacing.yml
 create mode 100644 backend/reconcile/tests/examples/utf-8.yml
 create mode 100644 backend/reconcile/tests/examples/various.yml

diff --git a/backend/reconcile/src/operation_transformation.rs b/backend/reconcile/src/operation_transformation.rs
index 6a2ee8ee..36239dfa 100644
--- a/backend/reconcile/src/operation_transformation.rs
+++ b/backend/reconcile/src/operation_transformation.rs
@@ -59,247 +59,6 @@ mod test {
     use super::*;
     use crate::CursorPosition;
 
-    #[test]
-    fn test_merges() {
-        // Both replaced one token but different
-        test_merge_both_ways(
-            "original_1 original_2 original_3",
-            "original_1 edit_1 original_3",
-            "original_1 original_2 edit_2",
-            "original_1 edit_1 edit_2",
-        );
-
-        // Both replaced the same one token
-        test_merge_both_ways(
-            "original_1 original_2 original_3",
-            "original_1 edit_1 original_3",
-            "original_1 edit_1 original_3",
-            "original_1 edit_1 original_3",
-        );
-
-        // One deleted a large range, the other deleted subranges and inserted as
-        // well
-        test_merge_both_ways(
-            "original_1 original_2 original_3 original_4 original_5",
-            "original_1 original_5",
-            "original_1 edit_1 original_3 edit_2 original_5",
-            "original_1 edit_1 edit_2 original_5",
-        );
-
-        // One deleted a large range, the other inserted and deleted a partially
-        // overlapping range
-        test_merge_both_ways(
-            "original_1 original_2 original_3 original_4 original_5",
-            "original_1 original_5",
-            "original_1 edit_1 original_3 edit_2",
-            "original_1 edit_1 edit_2",
-        );
-
-        // Merge a replace and an append
-        test_merge_both_ways("a b ", "c d ", "a b c d ", "c d c d ");
-
-        test_merge_both_ways("a b c d e", "a e", "a c e", "a e");
-
-        test_merge_both_ways("a 0 1 2 b", "a b", "a E 1 F b", "a E F b");
-
-        test_merge_both_ways(
-            "a this one delete b",
-            "a b",
-            "a my one change b",
-            "a my change b",
-        );
-
-        test_merge_both_ways(
-            "this stays, this is one big delete, don't touch this",
-            "this stays, don't touch this",
-            "this stays, my one change, don't touch this",
-            "this stays, my change, don't touch this",
-        );
-
-        test_merge_both_ways("1 2 3 4 5 6", "1 6", "1 2 4 ", "1 ");
-
-        test_merge_both_ways(
-            "hello world",
-            "hi, world",
-            "hello my friend!",
-            "hi, my friend!",
-        );
-
-        test_merge_both_ways(
-            "both delete the same word",
-            "both the same word",
-            "both the same word",
-            "both the same word",
-        );
-
-        test_merge_both_ways("    ", "it’s utf-8!", "    ", "it’s utf-8!");
-
-        test_merge_both_ways(
-            "both delete the same word but one a bit more",
-            "both the same word",
-            "both same word",
-            "both same word",
-        );
-
-        test_merge_both_ways(
-            "long text with one big delete and many small",
-            "long small",
-            "long with big and small",
-            "long small",
-        );
-    }
-
-    #[test]
-    fn test_reconcile_idempotent_inserts() {
-        // Both inserted the same prefix; this should get deduped
-        test_merge_both_ways(
-            "hi ",
-            "hi there ",
-            "hi there my friend ",
-            "hi there my friend ",
-        );
-
-        // The prefix of the 2nd appears on the 1st so it shouldn't get duplicated
-        test_merge_both_ways(
-            "hi ",
-            "hi there you ",
-            "hi there my friend ",
-            "hi there my friend you ",
-        );
-
-        test_merge_both_ways("a", "a b c", "a b c d", "a b c d");
-
-        test_merge_both_ways(
-            "      |7ca2b36d-6ee7-49eb-8eb1-d77e4cc1a001|   ",
-              "      |7ca2b36d-6ee7-49eb-8eb1-d77e4cc1a001|      |cd9195cc-103a-4f13-90c8-4fba0ba421ee|      |d39156cc-cfd6-42a8-b70a-75020896069d|      |fbad794c-9c47-41f2-a343-490284ecb5a0|      |dup|   ",
-             "       |7ca2b36d-6ee7-49eb-8eb1-d77e4cc1a001|      |cd9195cc-103a-4f13-90c8-4fba0ba421ee|      |dup|   ",
-            "       |7ca2b36d-6ee7-49eb-8eb1-d77e4cc1a001|      |cd9195cc-103a-4f13-90c8-4fba0ba421ee|      |d39156cc-cfd6-42a8-b70a-75020896069d|      |fbad794c-9c47-41f2-a343-490284ecb5a0|      |dup|      |dup|   ");
-    }
-
-    #[test]
-    fn test_cursor_position_no_updates() {
-        let original = "hello world";
-        let left = TextWithCursors::new(
-            "hello world",
-            vec![CursorPosition {
-                id: 0,
-                char_index: 0,
-            }],
-        );
-        let right = TextWithCursors::new(
-            "hello world",
-            vec![CursorPosition {
-                id: 1,
-                char_index: 5,
-            }],
-        );
-
-        let merged = reconcile_with_cursors(original, left, right);
-
-        assert_eq!(
-            merged,
-            TextWithCursors::new(
-                "hello world",
-                vec![
-                    CursorPosition {
-                        id: 0,
-                        char_index: 0
-                    },
-                    CursorPosition {
-                        id: 1,
-                        char_index: 5
-                    }
-                ]
-            )
-        );
-    }
-
-    #[test]
-    fn test_cursor_position_updates_with_inserts() {
-        let original = "hi";
-        let left = TextWithCursors::new(
-            "hi there",
-            vec![CursorPosition {
-                id: 0,
-                char_index: 7,
-            }],
-        );
-        let right = TextWithCursors::new(
-            "hi world!",
-            vec![
-                CursorPosition {
-                    id: 1,
-                    char_index: 9,
-                },
-                CursorPosition {
-                    id: 2,
-                    char_index: 1,
-                },
-            ],
-        );
-
-        let merged = reconcile_with_cursors(original, left, right);
-
-        assert_eq!(
-            merged,
-            TextWithCursors::new(
-                "hi there world!",
-                vec![
-                    CursorPosition {
-                        id: 2,
-                        char_index: 1,
-                    },
-                    CursorPosition {
-                        id: 0,
-                        char_index: 7
-                    },
-                    CursorPosition {
-                        id: 1,
-                        char_index: 15
-                    },
-                ]
-            )
-        );
-    }
-
-    #[test]
-    fn test_cursor_position_updates_with_deleted() {
-        let original = "a b c d";
-        let left = TextWithCursors::new(
-            "a b d",
-            vec![CursorPosition {
-                id: 0,
-                char_index: 1, // after a
-            }],
-        );
-        let right = TextWithCursors::new(
-            "c d",
-            vec![CursorPosition {
-                id: 1,
-                char_index: 1, // after c
-            }],
-        );
-
-        let merged = reconcile_with_cursors(original, left, right);
-
-        assert_eq!(
-            merged,
-            TextWithCursors::new(
-                " d",
-                vec![
-                    CursorPosition {
-                        id: 0,
-                        char_index: 0
-                    },
-                    CursorPosition {
-                        id: 1,
-                        char_index: 1
-                    }
-                ]
-            )
-        );
-    }
-
     #[test]
     fn test_cursor_complex() {
         let original = "this is some complex text to test cursor positions";
@@ -407,9 +166,4 @@ mod test {
 
         let _ = reconcile(&contents[0], &contents[1], &contents[2]);
     }
-
-    fn test_merge_both_ways(original: &str, edit_1: &str, edit_2: &str, expected: &str) {
-        assert_eq!(reconcile(original, edit_1, edit_2), expected);
-        assert_eq!(reconcile(original, edit_2, edit_1), expected);
-    }
 }
diff --git a/backend/reconcile/tests/examples/1.yml b/backend/reconcile/tests/examples/1.yml
deleted file mode 100644
index ce90f51f..00000000
--- a/backend/reconcile/tests/examples/1.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-# The `|` characters denote cursor positions which are stripped before the actual reconcile logic is run
----
-parent: You're Annual Savings Statement is available in our online portal
-left: Your| annual record is available in our online portal|
-right: You're Annual Savings information| is available online
-expected: Your| annual record information| is available online|
diff --git a/backend/reconcile/tests/examples/10.yml b/backend/reconcile/tests/examples/10.yml
deleted file mode 100644
index 0ee73838..00000000
--- a/backend/reconcile/tests/examples/10.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-parent: marketplace
-left: market| place
-right: market|space
-expected: market| placemarket|space
diff --git a/backend/reconcile/tests/examples/11.yml b/backend/reconcile/tests/examples/11.yml
deleted file mode 100644
index d576c04d..00000000
--- a/backend/reconcile/tests/examples/11.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-parent: Please remember to bring your laptop and charger
-left: Please remember to bring your laptop|
-right: Please remember to bring your |new |laptop and charger
-expected: Please remember to bring your |new |laptop|
diff --git a/backend/reconcile/tests/examples/12.yml b/backend/reconcile/tests/examples/12.yml
deleted file mode 100644
index 879b398f..00000000
--- a/backend/reconcile/tests/examples/12.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-parent: Party A shall pay Party B
-left: Party C shall pay Party B
-right: Party A shall receive from Party B
-expected: Party C shall receive from Party B
diff --git a/backend/reconcile/tests/examples/13.yml b/backend/reconcile/tests/examples/13.yml
deleted file mode 100644
index e12c635b..00000000
--- a/backend/reconcile/tests/examples/13.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-parent: Please submit your assignment by Friday
-left: Please submit your |completed |assignment by Friday
-right: Please submit your assignment |online |by Friday
-expected: Please submit your |completed |assignment |online |by Friday
diff --git a/backend/reconcile/tests/examples/2.yml b/backend/reconcile/tests/examples/2.yml
deleted file mode 100644
index 77a03755..00000000
--- a/backend/reconcile/tests/examples/2.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-parent:
-left: hi my friend|
-right: hi there|
-expected: hi my friend| there|
diff --git a/backend/reconcile/tests/examples/3.yml b/backend/reconcile/tests/examples/3.yml
deleted file mode 100644
index 8e2dd222..00000000
--- a/backend/reconcile/tests/examples/3.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-parent: Buy milk and eggs
-left: Buy organic milk| and eggs|
-right: Buy milk and eggs| and bread
-expected: Buy organic milk| and eggs|| and bread
diff --git a/backend/reconcile/tests/examples/4.yml b/backend/reconcile/tests/examples/4.yml
deleted file mode 100644
index f06d3287..00000000
--- a/backend/reconcile/tests/examples/4.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-parent: Meeting at 2pm in 会议室
-left: Meeting at |3pm in the 会议室
-right: Team meeting at 2pm in conference room|
-expected: Team meeting at |3pm in conference room| the
diff --git a/backend/reconcile/tests/examples/5.yml b/backend/reconcile/tests/examples/5.yml
deleted file mode 100644
index aac8a98c..00000000
--- a/backend/reconcile/tests/examples/5.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-parent: Send the report to the team
-left: Send the |detailed |report to the |entire |team
-right: Send the |quarterly |detailed |report to the team
-expected: Send the |detailed |quarterly |detailed ||report to the |entire |team
diff --git a/backend/reconcile/tests/examples/6.yml b/backend/reconcile/tests/examples/6.yml
deleted file mode 100644
index 16d25fb2..00000000
--- a/backend/reconcile/tests/examples/6.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-parent: Ready, Set go
-left: Ready! Set go|
-right: Ready, Set, go!|
-expected: Ready! Set, go!||
diff --git a/backend/reconcile/tests/examples/7.yml b/backend/reconcile/tests/examples/7.yml
deleted file mode 100644
index 579e9271..00000000
--- a/backend/reconcile/tests/examples/7.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-parent: "Total: $100"
-left: "Total: |$150"
-right: "Total: |€100"
-expected: "Total: |$150 |€100"
diff --git a/backend/reconcile/tests/examples/8.yml b/backend/reconcile/tests/examples/8.yml
deleted file mode 100644
index 6c316ef6..00000000
--- a/backend/reconcile/tests/examples/8.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-parent: Start middle end
-left: Start [important] middle end|
-right: Start middle [critical] end|
-expected: Start [important] middle [critical] end||
diff --git a/backend/reconcile/tests/examples/9.yml b/backend/reconcile/tests/examples/9.yml
deleted file mode 100644
index 6f534b76..00000000
--- a/backend/reconcile/tests/examples/9.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-parent: A B C D
-left: A X B D|
-right: A B Y|
-expected: A X B Y||
diff --git a/backend/reconcile/tests/examples/deletes.yml b/backend/reconcile/tests/examples/deletes.yml
new file mode 100644
index 00000000..a4fb2e4d
--- /dev/null
+++ b/backend/reconcile/tests/examples/deletes.yml
@@ -0,0 +1,28 @@
+# Both delete the same range
+parent: original_1 original_2 original_3 original_4 original_5
+left: original_1 original_5|
+right: "|original_1 original_5"
+expected: "|original_1 original_5|"
+
+---
+
+# Both delete a range and one range contains the other
+parent: original_1 original_2 original_3 original_4 original_5
+left: original_1 original_5
+right: original_1 original_4 original_5
+expected: original_1 original_5
+
+---
+
+# Deleting overlapping ranges
+parent: original_1 original_2 original_3 original_4 original_5
+left: original_1 original_4| original_5
+right: original_1 original_2| original_5
+expected: original_1| original_5|
+
+---
+
+parent: long text with one big delete and many small
+left: long small
+right: long with big and small
+expected: long small
diff --git a/backend/reconcile/tests/examples/deletes_and_inserts.yml b/backend/reconcile/tests/examples/deletes_and_inserts.yml
new file mode 100644
index 00000000..ed83604e
--- /dev/null
+++ b/backend/reconcile/tests/examples/deletes_and_inserts.yml
@@ -0,0 +1,13 @@
+# One deleted a large range, the other deleted subranges and inserted as well
+parent: original_1 original_2 original_3 original_4 original_5
+left: original_1 original_5
+right: original_1 edit_1 original_3 edit_2 original_5
+expected: original_1 edit_1 edit_2 original_5
+
+---
+
+# One deleted a large range, the other inserted and deleted a partially overlapping range
+parent: original_1 original_2 original_3 original_4 original_5
+left: original_1 original_5
+right: original_1 edit_1 original_3 edit_2
+expected: original_1 edit_1 edit_2
diff --git a/backend/reconcile/tests/examples/idempotent_inserts.yml b/backend/reconcile/tests/examples/idempotent_inserts.yml
new file mode 100644
index 00000000..f45792ed
--- /dev/null
+++ b/backend/reconcile/tests/examples/idempotent_inserts.yml
@@ -0,0 +1,27 @@
+# Both inserted the same prefix; this should get deduplicateed
+parent: "hi "
+left: "hi there "
+right: "hi there my friend "
+expected: "hi there my friend "
+
+---
+
+# The prefix of the 2nd appears on the 1st so it shouldn't get duplicatelicated
+parent: "hi "
+left: "hi there you "
+right: "hi there my friend "
+expected: "hi there my friend you "
+
+---
+
+parent: a
+left: a b c
+right: a b c d
+expected: a b c d
+
+---
+
+parent: a
+left: abc
+right: abcd
+expected: abcabcd
diff --git a/backend/reconcile/tests/examples/multiline.yml b/backend/reconcile/tests/examples/multiline.yml
index 00de7cd9..b2460c09 100644
--- a/backend/reconcile/tests/examples/multiline.yml
+++ b/backend/reconcile/tests/examples/multiline.yml
@@ -55,11 +55,11 @@ parent: |
   a
   a
 left: |
-  a
+  a|
     a
 right: |
-  a
+  a|
   a
 expected: |
-  a
+  a||
     a
diff --git a/backend/reconcile/tests/examples/replacing.yml b/backend/reconcile/tests/examples/replacing.yml
new file mode 100644
index 00000000..97d7c897
--- /dev/null
+++ b/backend/reconcile/tests/examples/replacing.yml
@@ -0,0 +1,21 @@
+# Both replaced one token but the tokens are different
+parent: original_1 original_2 original_3
+left: original_1 edit_1| original_3
+right: original_1 original_2| edit_2
+expected: original_1 edit_1|| edit_2
+
+---
+
+# Both replace the same token with the same value
+parent: original_1 original_2 original_3
+left: original_1 edit_1| original_3
+right: original_1 edit_1 original_3|
+expected: original_1 edit_1| original_3|
+
+---
+
+# Both replace the same token with different value
+parent: original_1 original_2 original_3
+left: original_1 edit_1| original_3
+right: original_1 conflicting_edit_1| original_3
+expected: original_1 conflicting_edit_1| edit_1| original_3
diff --git a/backend/reconcile/tests/examples/utf-8.yml b/backend/reconcile/tests/examples/utf-8.yml
new file mode 100644
index 00000000..662d7a73
--- /dev/null
+++ b/backend/reconcile/tests/examples/utf-8.yml
@@ -0,0 +1,11 @@
+parent: Meeting at 2pm in 会议室
+left: Meeting at |3pm in 会议室
+right: Team meeting at 2pm in conference room|
+expected: Team meeting at |3pm in conference room|
+
+---
+
+parent: "    "
+left: "it’|s utf-8!"
+right: "    "
+expected: "it’|s utf-8!"
diff --git a/backend/reconcile/tests/examples/various.yml b/backend/reconcile/tests/examples/various.yml
new file mode 100644
index 00000000..91c12024
--- /dev/null
+++ b/backend/reconcile/tests/examples/various.yml
@@ -0,0 +1,130 @@
+parent: You're Annual Savings Statement is available in our online portal
+left: Your| annual record is available in our online portal|
+right: You're Annual Savings information| is available online
+expected: Your| annual record information| is available online|
+
+---
+
+parent: Party A shall pay Party B
+left: Party C shall pay Party B
+right: Party A shall receive from Party B
+expected: Party C shall receive from Party B
+
+---
+
+parent:
+left: hi my friend|
+right: hi there|
+expected: hi my friend| there|
+
+---
+
+parent: Buy milk and eggs
+left: Buy organic milk| and eggs|
+right: Buy milk and eggs| and bread
+expected: Buy organic milk| and eggs|| and bread
+
+---
+
+parent: Send the report to the team
+left: Send the |detailed report to the |entire |team
+right: Send the |quarterly |detailed report to the team
+expected: Send the |detailed |quarterly |detailed report to the |entire |team
+
+---
+
+parent: Ready, Set go
+left: Ready! Set go|
+right: Ready, Set, go!|
+expected: Ready! Set, go!||
+
+---
+
+parent: "Total: $100"
+left: "Total: |$150"
+right: "Total: |€100"
+expected: "Total: |$150 |€100"
+
+---
+
+parent: Start middle end
+left: Start [important] middle end|
+right: Start middle [critical] end|
+expected: Start [important] middle [critical] end||
+
+---
+
+parent: marketplace
+left: market| place
+right: market|space
+expected: market| placemarket|space
+
+---
+
+parent: A B C D
+left: A X B D|
+right: A B Y|
+expected: A X B Y||
+
+---
+
+parent: Please submit your assignment by Friday
+left: Please submit your |completed |assignment by Friday
+right: Please submit your assignment |online |by Friday
+expected: Please submit your |completed |assignment |online |by Friday
+
+---
+
+parent: "a b "
+left: "c d "
+right: "a b c d "
+expected: "c d c d "
+
+---
+
+parent: a b c d e
+left: a e|
+right: a c e|
+expected: a e||
+
+---
+
+parent: a 0 1 2 b
+left: a 0 1| 2 b
+right: a b|
+expected: a| b|
+
+---
+
+parent: a 0 1 2 b
+left: "|a b"
+right: "|a E 1 F b"
+expected: "||a E F b"
+
+---
+
+parent: a this one delete b
+left: a b|
+right: a my one change b|
+expected: a my change b||
+
+---
+
+parent: this stays, this is one big delete, don't touch this
+left: this stays, don't touch this|
+right: this stays, my one change, don't touch this|
+expected: this stays, my change, don't touch this||
+
+---
+
+parent: 1 2 3 4 5 6
+left: 1| 6
+right: 1 2 4|
+expected: 1||
+
+---
+
+parent: hello world
+left: hi, world
+right: hello my friend!
+expected: hi, my friend!

From 123d03fbed2bc149afc630b22d3790706e7abd9a Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 5 Apr 2025 14:47:04 +0100
Subject: [PATCH 423/761] Better docs

---
 backend/reconcile/src/operation_transformation/operation.rs | 4 +---
 backend/reconcile/tests/examples/README.md                  | 1 +
 2 files changed, 2 insertions(+), 3 deletions(-)
 create mode 100644 backend/reconcile/tests/examples/README.md

diff --git a/backend/reconcile/src/operation_transformation/operation.rs b/backend/reconcile/src/operation_transformation/operation.rs
index 68eab6ae..c25871b7 100644
--- a/backend/reconcile/src/operation_transformation/operation.rs
+++ b/backend/reconcile/src/operation_transformation/operation.rs
@@ -13,9 +13,7 @@ use crate::{
     },
 };
 
-/// Represents a change that can be applied to a text document.
-/// Operation is tied to a `ropey::Rope` and is mainly expected to be
-/// created by `EditedText`.
+/// Represents a change that can be applied on a `StringBuilder`.
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[derive(Clone, PartialEq)]
 pub enum Operation<T>
diff --git a/backend/reconcile/tests/examples/README.md b/backend/reconcile/tests/examples/README.md
new file mode 100644
index 00000000..f5fafa78
--- /dev/null
+++ b/backend/reconcile/tests/examples/README.md
@@ -0,0 +1 @@
+The `|` characters denote cursor positions which are stripped before the actual reconcile logic is run

From 9399a335c1d2908a59bacbf21c0eecf10cb07588 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 5 Apr 2025 14:47:13 +0100
Subject: [PATCH 424/761] Fix utf-8 cursor test

---
 backend/reconcile/tests/example_document.rs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/backend/reconcile/tests/example_document.rs b/backend/reconcile/tests/example_document.rs
index 98d68a3d..3d866c1b 100644
--- a/backend/reconcile/tests/example_document.rs
+++ b/backend/reconcile/tests/example_document.rs
@@ -63,7 +63,16 @@ impl ExampleDocument {
     fn text_with_cursors_to_string(text: &TextWithCursors<'_>) -> String {
         let mut result = text.text.clone().into_owned();
         for (i, cursor) in text.cursors.iter().enumerate() {
-            result.insert(cursor.char_index + i, '|');
+            result.insert(
+                result
+                    .char_indices()
+                    .skip(cursor.char_index + i)
+                    .next()
+                    .map(|(byte_index, _)| byte_index)
+                    .unwrap_or_else(|| result.len()), /* find the utf8 char index of the insert
+                                                       * in byte index */
+                '|',
+            );
         }
         result
     }

From a839ff8fc515e2a7046ba0262bcfcd8801095fca Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 5 Apr 2025 17:12:25 +0100
Subject: [PATCH 425/761] Fix npm dependabot

---
 .github/dependabot.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 5a33123b..2ced6ee6 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -9,6 +9,7 @@ updates:
     directories: ["**"]
     schedule:
       interval: "daily"
+    versioning-strategy: increase
 
   - package-ecosystem: "docker"
     directories: ["**"]

From f747634aac52da0e0cdabb3eece9bbb78dd277cb Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 6 Apr 2025 11:20:45 +0100
Subject: [PATCH 426/761] Format tests

---
 backend/reconcile/tests/examples/deletes.yml  |  5 +---
 .../tests/examples/deletes_and_inserts.yml    |  1 -
 .../tests/examples/idempotent_inserts.yml     |  3 --
 .../reconcile/tests/examples/multiline.yml    |  2 --
 .../reconcile/tests/examples/replacing.yml    |  2 --
 backend/reconcile/tests/examples/utf-8.yml    |  1 -
 backend/reconcile/tests/examples/various.yml  | 28 ++++++++-----------
 7 files changed, 12 insertions(+), 30 deletions(-)

diff --git a/backend/reconcile/tests/examples/deletes.yml b/backend/reconcile/tests/examples/deletes.yml
index a4fb2e4d..59eb9337 100644
--- a/backend/reconcile/tests/examples/deletes.yml
+++ b/backend/reconcile/tests/examples/deletes.yml
@@ -5,7 +5,6 @@ right: "|original_1 original_5"
 expected: "|original_1 original_5|"
 
 ---
-
 # Both delete a range and one range contains the other
 parent: original_1 original_2 original_3 original_4 original_5
 left: original_1 original_5
@@ -13,15 +12,13 @@ right: original_1 original_4 original_5
 expected: original_1 original_5
 
 ---
-
 # Deleting overlapping ranges
 parent: original_1 original_2 original_3 original_4 original_5
 left: original_1 original_4| original_5
 right: original_1 original_2| original_5
-expected: original_1| original_5|
+expected: original_1|| original_5
 
 ---
-
 parent: long text with one big delete and many small
 left: long small
 right: long with big and small
diff --git a/backend/reconcile/tests/examples/deletes_and_inserts.yml b/backend/reconcile/tests/examples/deletes_and_inserts.yml
index ed83604e..fe0e7c1a 100644
--- a/backend/reconcile/tests/examples/deletes_and_inserts.yml
+++ b/backend/reconcile/tests/examples/deletes_and_inserts.yml
@@ -5,7 +5,6 @@ right: original_1 edit_1 original_3 edit_2 original_5
 expected: original_1 edit_1 edit_2 original_5
 
 ---
-
 # One deleted a large range, the other inserted and deleted a partially overlapping range
 parent: original_1 original_2 original_3 original_4 original_5
 left: original_1 original_5
diff --git a/backend/reconcile/tests/examples/idempotent_inserts.yml b/backend/reconcile/tests/examples/idempotent_inserts.yml
index f45792ed..a48952be 100644
--- a/backend/reconcile/tests/examples/idempotent_inserts.yml
+++ b/backend/reconcile/tests/examples/idempotent_inserts.yml
@@ -5,7 +5,6 @@ right: "hi there my friend "
 expected: "hi there my friend "
 
 ---
-
 # The prefix of the 2nd appears on the 1st so it shouldn't get duplicatelicated
 parent: "hi "
 left: "hi there you "
@@ -13,14 +12,12 @@ right: "hi there my friend "
 expected: "hi there my friend you "
 
 ---
-
 parent: a
 left: a b c
 right: a b c d
 expected: a b c d
 
 ---
-
 parent: a
 left: abc
 right: abcd
diff --git a/backend/reconcile/tests/examples/multiline.yml b/backend/reconcile/tests/examples/multiline.yml
index b2460c09..3f2d096d 100644
--- a/backend/reconcile/tests/examples/multiline.yml
+++ b/backend/reconcile/tests/examples/multiline.yml
@@ -20,7 +20,6 @@ expected: |
   How are you?
 
 ---
-
 parent: |
   - my list
   - 2nd item
@@ -50,7 +49,6 @@ expected: |
     - another nested list
 
 ---
-
 parent: |
   a
   a
diff --git a/backend/reconcile/tests/examples/replacing.yml b/backend/reconcile/tests/examples/replacing.yml
index 97d7c897..cea57b89 100644
--- a/backend/reconcile/tests/examples/replacing.yml
+++ b/backend/reconcile/tests/examples/replacing.yml
@@ -5,7 +5,6 @@ right: original_1 original_2| edit_2
 expected: original_1 edit_1|| edit_2
 
 ---
-
 # Both replace the same token with the same value
 parent: original_1 original_2 original_3
 left: original_1 edit_1| original_3
@@ -13,7 +12,6 @@ right: original_1 edit_1 original_3|
 expected: original_1 edit_1| original_3|
 
 ---
-
 # Both replace the same token with different value
 parent: original_1 original_2 original_3
 left: original_1 edit_1| original_3
diff --git a/backend/reconcile/tests/examples/utf-8.yml b/backend/reconcile/tests/examples/utf-8.yml
index 662d7a73..8aac95fe 100644
--- a/backend/reconcile/tests/examples/utf-8.yml
+++ b/backend/reconcile/tests/examples/utf-8.yml
@@ -4,7 +4,6 @@ right: Team meeting at 2pm in conference room|
 expected: Team meeting at |3pm in conference room|
 
 ---
-
 parent: "    "
 left: "it’|s utf-8!"
 right: "    "
diff --git a/backend/reconcile/tests/examples/various.yml b/backend/reconcile/tests/examples/various.yml
index 91c12024..0b027477 100644
--- a/backend/reconcile/tests/examples/various.yml
+++ b/backend/reconcile/tests/examples/various.yml
@@ -4,126 +4,120 @@ right: You're Annual Savings information| is available online
 expected: Your| annual record information| is available online|
 
 ---
-
 parent: Party A shall pay Party B
 left: Party C shall pay Party B
 right: Party A shall receive from Party B
 expected: Party C shall receive from Party B
 
 ---
-
 parent:
 left: hi my friend|
 right: hi there|
 expected: hi my friend| there|
 
 ---
+parent: ""
+left: ""
+right: ""
+expected: ""
 
+---
+parent: ""
+left: "|"
+right: "|"
+expected: "||"
+
+---
 parent: Buy milk and eggs
 left: Buy organic milk| and eggs|
 right: Buy milk and eggs| and bread
 expected: Buy organic milk| and eggs|| and bread
 
 ---
-
 parent: Send the report to the team
 left: Send the |detailed report to the |entire |team
 right: Send the |quarterly |detailed report to the team
 expected: Send the |detailed |quarterly |detailed report to the |entire |team
 
 ---
-
 parent: Ready, Set go
 left: Ready! Set go|
 right: Ready, Set, go!|
 expected: Ready! Set, go!||
 
 ---
-
 parent: "Total: $100"
 left: "Total: |$150"
 right: "Total: |€100"
 expected: "Total: |$150 |€100"
 
 ---
-
 parent: Start middle end
 left: Start [important] middle end|
 right: Start middle [critical] end|
 expected: Start [important] middle [critical] end||
 
 ---
-
 parent: marketplace
 left: market| place
 right: market|space
 expected: market| placemarket|space
 
 ---
-
 parent: A B C D
 left: A X B D|
 right: A B Y|
 expected: A X B Y||
 
 ---
-
 parent: Please submit your assignment by Friday
 left: Please submit your |completed |assignment by Friday
 right: Please submit your assignment |online |by Friday
 expected: Please submit your |completed |assignment |online |by Friday
 
 ---
-
 parent: "a b "
 left: "c d "
 right: "a b c d "
 expected: "c d c d "
 
 ---
-
 parent: a b c d e
 left: a e|
 right: a c e|
 expected: a e||
 
 ---
-
 parent: a 0 1 2 b
 left: a 0 1| 2 b
 right: a b|
 expected: a| b|
 
 ---
-
 parent: a 0 1 2 b
 left: "|a b"
 right: "|a E 1 F b"
 expected: "||a E F b"
 
 ---
-
 parent: a this one delete b
 left: a b|
 right: a my one change b|
 expected: a my change b||
 
 ---
-
 parent: this stays, this is one big delete, don't touch this
 left: this stays, don't touch this|
 right: this stays, my one change, don't touch this|
 expected: this stays, my change, don't touch this||
 
 ---
-
 parent: 1 2 3 4 5 6
 left: 1| 6
 right: 1 2 4|
 expected: 1||
 
 ---
-
 parent: hello world
 left: hi, world
 right: hello my friend!

From f509a60f0a627833c2261ed7708ace341526e6ff Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 6 Apr 2025 11:20:58 +0100
Subject: [PATCH 427/761] Split integration tests

---
 backend/reconcile/tests/test.rs | 84 +++++++++++++++++++--------------
 1 file changed, 49 insertions(+), 35 deletions(-)

diff --git a/backend/reconcile/tests/test.rs b/backend/reconcile/tests/test.rs
index 4e43d8a6..5a749f1b 100644
--- a/backend/reconcile/tests/test.rs
+++ b/backend/reconcile/tests/test.rs
@@ -7,12 +7,57 @@ use reconcile::{reconcile, reconcile_with_cursors};
 use serde::Deserialize;
 
 #[test]
-fn test_with_examples() {
+fn test_document_one_way_without_cursors() {
+    get_all_documents().iter().for_each(|doc| {
+        doc.assert_eq_without_cursors(&reconcile(
+            &doc.parent(),
+            &doc.left().text,
+            &doc.right().text,
+        ))
+    });
+}
+
+#[test]
+fn test_document_one_way_with_cursors() {
+    get_all_documents().iter().for_each(|doc| {
+        doc.assert_eq(&reconcile_with_cursors(
+            &doc.parent(),
+            doc.left(),
+            doc.right(),
+        ))
+    });
+}
+
+#[test]
+fn test_document_inverse_way_without_cursors() {
+    get_all_documents().iter().for_each(|doc| {
+        doc.assert_eq_without_cursors(&reconcile(
+            &doc.parent(),
+            &doc.right().text,
+            &doc.left().text,
+        ));
+    });
+}
+
+#[test]
+fn test_document_inverse_way_with_cursors() {
+    get_all_documents().iter().for_each(|doc| {
+        doc.assert_eq(&reconcile_with_cursors(
+            &doc.parent(),
+            doc.right(),
+            doc.left(),
+        ))
+    });
+}
+
+fn get_all_documents() -> Vec<ExampleDocument> {
     let examples_dir = Path::new("tests/examples");
     let entries = fs::read_dir(examples_dir)
         .expect("Failed to read examples directory")
         .collect::<Vec<_>>();
 
+    let mut documents = Vec::new();
+
     for entry in entries {
         let entry = entry.expect("Failed to read directory entry");
         let path = entry.path();
@@ -20,43 +65,12 @@ fn test_with_examples() {
         if path.is_file() && path.extension().and_then(|ext| ext.to_str()) == Some("yml") {
             let file = fs::File::open(&path).expect("Failed to open example file");
             for document in serde_yaml::Deserializer::from_reader(file) {
-                println!("Testing with example from {}", path.display());
-
                 let doc =
                     ExampleDocument::deserialize(document).expect("Failed to deserialize document");
-
-                test_document(doc);
-
-                println!("Test passed for example from {}", path.display());
+                documents.push(doc);
             }
         }
     }
-}
-
-fn test_document(doc: ExampleDocument) {
-    doc.assert_eq_without_cursors(&reconcile(
-        &doc.parent(),
-        &doc.left().text,
-        &doc.right().text,
-    ));
-
-    doc.assert_eq(&reconcile_with_cursors(
-        &doc.parent(),
-        doc.left(),
-        doc.right(),
-    ));
-
-    // inverse direction
-    doc.assert_eq_without_cursors(&reconcile(
-        &doc.parent(),
-        &doc.right().text,
-        &doc.left().text,
-    ));
-
-    // inverse direction with cursors
-    doc.assert_eq(&reconcile_with_cursors(
-        &doc.parent(),
-        doc.right(),
-        doc.left(),
-    ));
+
+    documents
 }

From 9da05c6ff6bf3d70a017ca1df326e2632f652d44 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 6 Apr 2025 11:39:30 +0100
Subject: [PATCH 428/761] Fix cursor moving

---
 .../reconcile/src/operation_transformation.rs |   4 +-
 .../src/operation_transformation/cursor.rs    |  13 +-
 .../operation_transformation/edited_text.rs   | 142 +++++++++---------
 .../src/operation_transformation/operation.rs | 135 ++++++++++++++++-
 ...ted_text__tests__calculate_operations.snap |  16 ++
 ...ts__calculate_operations_with_no_diff.snap |  23 +++
 .../reconcile/src/tokenizer/word_tokenizer.rs |  30 ++--
 7 files changed, 269 insertions(+), 94 deletions(-)
 create mode 100644 backend/reconcile/src/operation_transformation/snapshots/reconcile__operation_transformation__edited_text__tests__calculate_operations_with_no_diff.snap

diff --git a/backend/reconcile/src/operation_transformation.rs b/backend/reconcile/src/operation_transformation.rs
index 36239dfa..45575b98 100644
--- a/backend/reconcile/src/operation_transformation.rs
+++ b/backend/reconcile/src/operation_transformation.rs
@@ -110,8 +110,8 @@ mod test {
                     }, // inside of "s|ample" because "text" got replaced by "sample"
                     CursorPosition {
                         id: 3,
-                        char_index: 31
-                    }, // before "for"
+                        char_index: 43
+                    }, // before "cursor movements"
                 ]
             )
         );
diff --git a/backend/reconcile/src/operation_transformation/cursor.rs b/backend/reconcile/src/operation_transformation/cursor.rs
index c17f560c..a8e74da7 100644
--- a/backend/reconcile/src/operation_transformation/cursor.rs
+++ b/backend/reconcile/src/operation_transformation/cursor.rs
@@ -16,19 +16,10 @@ pub struct CursorPosition {
 }
 
 impl CursorPosition {
-    #[must_use]
-    pub fn apply_merge_context<T>(&self, context: &MergeContext<T>) -> Self
-    where
-        T: PartialEq + Clone + std::fmt::Debug,
-    {
-        let char_index = match context.last_operation() {
-            Some(Operation::Delete { index, .. }) => (*index) as i64,
-            _ => self.char_index as i64 + context.shift,
-        };
-
+    pub fn with_index(self, index: usize) -> Self {
         CursorPosition {
             id: self.id,
-            char_index: char_index.max(0) as usize,
+            char_index: index,
         }
     }
 }
diff --git a/backend/reconcile/src/operation_transformation/edited_text.rs b/backend/reconcile/src/operation_transformation/edited_text.rs
index 12e0ee88..f195a9f5 100644
--- a/backend/reconcile/src/operation_transformation/edited_text.rs
+++ b/backend/reconcile/src/operation_transformation/edited_text.rs
@@ -3,11 +3,11 @@ use core::iter;
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
 
-use super::{CursorPosition, Operation, TextWithCursors, ordered_operation::OrderedOperation};
+use super::{ordered_operation::OrderedOperation, CursorPosition, Operation, TextWithCursors};
 use crate::{
     diffs::{myers::diff, raw_operation::RawOperation},
-    operation_transformation::merge_context::MergeContext,
-    tokenizer::{Tokenizer, word_tokenizer::word_tokenizer},
+    operation_transformation::{merge_context::MergeContext, operation},
+    tokenizer::{word_tokenizer::word_tokenizer, Tokenizer},
     utils::{merge_iters::MergeSorted as _, side::Side, string_builder::StringBuilder},
 };
 
@@ -72,6 +72,10 @@ where
     where
         I: IntoIterator<Item = RawOperation<T>>,
     {
+        // This might look bad, but this makes sense. The inserts and deltes can be
+        // interleaved, such as: IDIDID and we need to turn this into IIIDDD.
+        // So we need to keep track of both the last insert and delete operations, not
+        // just the last one.
         let mut maybe_previous_insert: Option<RawOperation<T>> = None;
         let mut maybe_previous_delete: Option<RawOperation<T>> = None;
 
@@ -132,12 +136,22 @@ where
         raw_operations.into_iter().flat_map(move |raw_operation| {
             let length = raw_operation.original_text_length();
 
-            let operation = match raw_operation {
+            match raw_operation {
                 RawOperation::Equal(..) => {
+                    let op = if cfg!(debug_assertions) {
+                        Operation::create_equal_with_text(
+                            new_index,
+                            raw_operation.get_original_text(),
+                        )
+                    } else {
+                        Operation::create_equal(new_index, length)
+                    }
+                    .map(|operation| OrderedOperation { order, operation });
+
                     new_index += length;
                     order += length;
 
-                    None
+                    op
                 }
                 RawOperation::Insert(tokens) => {
                     let op = Operation::create_insert(new_index, tokens)
@@ -162,9 +176,7 @@ where
 
                     op
                 }
-            };
-
-            operation.into_iter()
+            }
         })
     }
 
@@ -208,10 +220,10 @@ where
         let mut right_merge_context = MergeContext::default();
 
         let mut merged_cursors = Vec::with_capacity(self.cursors.len() + other.cursors.len());
-        let mut left_cursors = self.cursors.iter().peekable();
-        let mut right_cursors = other.cursors.iter().peekable();
+        let mut left_cursors = self.cursors.into_iter().peekable();
+        let mut right_cursors = other.cursors.into_iter().peekable();
 
-        let merged_operations = self
+        let merged_operations: Vec<OrderedOperation<T>> = self
             .operations
             .into_iter()
             // The current text is always the left; the other operation is the right side.
@@ -221,13 +233,11 @@ where
                 |(operation, _)| {
                     (
                         operation.order,
-                        // Operations on the left and right must come in the same order so that
-                        // inserts can be merged with other inserts and deletes with deletes.
-                        usize::from(matches!(operation.operation, Operation::Delete { .. })),
                         operation.operation.start_index(),
                         // Make sure that the ordering is deterministic regardless which text
                         // is left or right.
                         match &operation.operation {
+                            Operation::Equal { index, .. } => index.to_string(),
                             Operation::Insert { text, .. } => text
                                 .iter()
                                 .map(super::super::tokenizer::token::Token::original)
@@ -241,58 +251,55 @@ where
                 },
             )
             .flat_map(|(OrderedOperation { order, operation }, side)| {
+                let original_start = operation.start_index() as i64;
+                let original_end = operation.end_index();
+
                 match side {
                     Side::Left => {
-                        while let Some(cursor) = left_cursors
-                            .next_if(|cursor| cursor.char_index <= operation.start_index())
-                        {
-                            right_merge_context.consume_last_operation_if_it_is_too_behind(
-                                cursor.char_index as i64,
-                            );
-                            merged_cursors.push(cursor.apply_merge_context(&right_merge_context));
-                        }
-
-                        while let Some(cursor) = right_cursors.next_if(|cursor| {
-                            cursor.char_index as i64
-                                <= operation.start_index() as i64 + right_merge_context.shift
-                                    - left_merge_context.shift
-                        }) {
-                            left_merge_context.consume_last_operation_if_it_is_too_behind(
-                                cursor.char_index as i64,
-                            );
-                            merged_cursors.push(cursor.apply_merge_context(&left_merge_context));
-                        }
-
-                        operation.merge_operations_with_context(
+                        let result = operation.merge_operations_with_context(
                             &mut right_merge_context,
                             &mut left_merge_context,
-                        )
+                        );
+
+                        if let Some(ref op @ Operation::Insert { .. })
+                        | Some(ref op @ Operation::Equal { .. }) = result
+                        {
+                            while let Some(mut cursor) =
+                                left_cursors.next_if(|cursor| cursor.char_index <= original_end + 1)
+                            {
+                                let shift = op.start_index() as i64 - original_start;
+
+                                cursor.char_index = (op.start_index() as i64)
+                                    .max(cursor.char_index as i64 + shift)
+                                    as usize;
+                                merged_cursors.push(cursor);
+                            }
+                        }
+
+                        result
                     }
                     Side::Right => {
-                        while let Some(cursor) = right_cursors
-                            .next_if(|cursor| cursor.char_index <= operation.start_index())
-                        {
-                            left_merge_context.consume_last_operation_if_it_is_too_behind(
-                                cursor.char_index as i64,
-                            );
-                            merged_cursors.push(cursor.apply_merge_context(&left_merge_context));
-                        }
-
-                        while let Some(cursor) = left_cursors.next_if(|cursor| {
-                            cursor.char_index as i64
-                                <= operation.start_index() as i64 + left_merge_context.shift
-                                    - right_merge_context.shift
-                        }) {
-                            right_merge_context.consume_last_operation_if_it_is_too_behind(
-                                cursor.char_index as i64,
-                            );
-                            merged_cursors.push(cursor.apply_merge_context(&right_merge_context));
-                        }
-
-                        operation.merge_operations_with_context(
+                        let result = operation.merge_operations_with_context(
                             &mut left_merge_context,
                             &mut right_merge_context,
-                        )
+                        );
+
+                        if let Some(ref op @ Operation::Insert { .. })
+                        | Some(ref op @ Operation::Equal { .. }) = result
+                        {
+                            while let Some(mut cursor) = right_cursors
+                                .next_if(|cursor| cursor.char_index <= original_end + 1)
+                            {
+                                let shift = op.start_index() as i64 - original_start;
+
+                                cursor.char_index = (op.start_index() as i64)
+                                    .max(cursor.char_index as i64 + shift)
+                                    as usize;
+                                merged_cursors.push(cursor);
+                            }
+                        }
+
+                        result
                     }
                 }
                 .map(|operation| OrderedOperation { order, operation })
@@ -300,15 +307,14 @@ where
             })
             .collect();
 
-        for cursor in left_cursors {
-            right_merge_context
-                .consume_last_operation_if_it_is_too_behind(cursor.char_index as i64);
-            merged_cursors.push(cursor.apply_merge_context(&right_merge_context));
-        }
+        let last_index = merged_operations
+            .iter()
+            .last()
+            .map(|op| op.operation.end_index())
+            .unwrap_or(0);
 
-        for cursor in right_cursors {
-            left_merge_context.consume_last_operation_if_it_is_too_behind(cursor.char_index as i64);
-            merged_cursors.push(cursor.apply_merge_context(&left_merge_context));
+        for cursor in left_cursors.chain(right_cursors) {
+            merged_cursors.push(cursor.with_index(last_index));
         }
 
         Self::new(self.text, merged_operations, merged_cursors)
@@ -331,6 +337,7 @@ where
 mod tests {
     use std::env;
 
+    use insta::assert_debug_snapshot;
     use pretty_assertions::assert_eq;
 
     use super::*;
@@ -354,10 +361,9 @@ mod tests {
 
         let operations = EditedText::from_strings(text, text.into());
 
-        assert_eq!(operations.operations.len(), 0);
+        assert_debug_snapshot!(operations);
 
         let new_right = operations.apply();
-
         assert_eq!(new_right.to_string(), text);
     }
 
diff --git a/backend/reconcile/src/operation_transformation/operation.rs b/backend/reconcile/src/operation_transformation/operation.rs
index c25871b7..313d3687 100644
--- a/backend/reconcile/src/operation_transformation/operation.rs
+++ b/backend/reconcile/src/operation_transformation/operation.rs
@@ -20,6 +20,14 @@ pub enum Operation<T>
 where
     T: PartialEq + Clone + std::fmt::Debug,
 {
+    Equal {
+        index: usize,
+        length: usize,
+
+        #[cfg(debug_assertions)]
+        text: Option<String>,
+    },
+
     Insert {
         index: usize,
         text: Vec<Token<T>>,
@@ -38,6 +46,37 @@ impl<T> Operation<T>
 where
     T: PartialEq + Clone + std::fmt::Debug,
 {
+    /// Creates an equal operation with the given index.
+    /// This operation is used to indicate that the text at the given index
+    /// is unchanged.
+    pub fn create_equal(index: usize, length: usize) -> Option<Self> {
+        if length == 0 {
+            return None;
+        }
+
+        Some(Operation::Equal {
+            index,
+            length,
+
+            #[cfg(debug_assertions)]
+            text: None,
+        })
+    }
+
+    pub fn create_equal_with_text(index: usize, text: String) -> Option<Self> {
+        if text.is_empty() {
+            return None;
+        }
+
+        Some(Operation::Equal {
+            index,
+            length: text.chars().count(),
+
+            #[cfg(debug_assertions)]
+            text: Some(text),
+        })
+    }
+
     /// Creates an insert operation with the given index and text.
     /// If the text is empty (meaning that the operation would be a no-op),
     /// returns None.
@@ -87,6 +126,20 @@ where
     /// on a range of text that does not match the text to be deleted.
     pub fn apply<'a>(&self, mut builder: StringBuilder<'a>) -> StringBuilder<'a> {
         match self {
+            Operation::Equal {
+                #[cfg(debug_assertions)]
+                text,
+                ..
+            } => {
+                #[cfg(debug_assertions)]
+                debug_assert!(
+                    text.as_ref()
+                        .is_none_or(|text| builder.get_slice(self.range()) == *text),
+                    "Text which is supposed to be equal does not match the text in the range"
+                );
+
+                return builder;
+            }
             Operation::Insert { text, .. } => builder.insert(
                 self.start_index(),
                 &text.iter().map(Token::original).collect::<String>(),
@@ -114,7 +167,9 @@ where
     /// Returns the index of the first character that the operation affects.
     pub fn start_index(&self) -> usize {
         match self {
-            Operation::Insert { index, .. } | Operation::Delete { index, .. } => *index,
+            Operation::Equal { index, .. }
+            | Operation::Insert { index, .. }
+            | Operation::Delete { index, .. } => *index,
         }
     }
 
@@ -135,6 +190,7 @@ where
     /// because empty operations cannot be created.
     pub fn len(&self) -> usize {
         match self {
+            Operation::Equal { length, .. } => *length,
             Operation::Insert { text, .. } => text.iter().map(Token::get_original_length).sum(),
             Operation::Delete {
                 deleted_character_count,
@@ -147,6 +203,19 @@ where
     /// index.
     pub fn with_index(self, index: usize) -> Self {
         match self {
+            Operation::Equal {
+                length,
+
+                #[cfg(debug_assertions)]
+                text,
+                ..
+            } => Operation::Equal {
+                index,
+                length,
+
+                #[cfg(debug_assertions)]
+                text,
+            },
             Operation::Insert { text, .. } => Operation::Insert { index, text },
             Operation::Delete {
                 deleted_character_count,
@@ -191,7 +260,7 @@ where
         let operation = self.with_shifted_index(affecting_context.shift);
 
         match (operation, affecting_context.last_operation()) {
-            (operation @ Operation::Insert { .. }, None) => {
+            (operation @ Operation::Insert { .. }, None | Some(Operation::Equal { .. })) => {
                 produced_context.shift += operation.len() as i64;
                 produced_context.consume_and_replace_last_operation(Some(operation.clone()));
                 Some(operation)
@@ -227,7 +296,10 @@ where
                 trimmed_operation
             }
 
-            (operation @ Operation::Delete { .. }, None | Some(Operation::Insert { .. })) => {
+            (
+                operation @ Operation::Delete { .. },
+                None | Some(Operation::Insert { .. }) | Some(Operation::Equal { .. }),
+            ) => {
                 produced_context.consume_and_replace_last_operation(Some(operation.clone()));
                 Some(operation)
             }
@@ -286,6 +358,41 @@ where
 
                 updated_delete
             }
+            (
+                ref operation @ Operation::Equal {
+                    length,
+                    #[cfg(debug_assertions)]
+                    ref text,
+                    ..
+                },
+                Some(last_delete @ Operation::Delete { .. }),
+            ) => {
+                debug_assert!(
+                    last_delete.range().contains(&operation.start_index()),
+                    "There is a last delete ({last_delete}) but the operation ({operation}) is \
+                     not contained in it"
+                );
+
+                let overlap = (length as i64)
+                    .min(last_delete.end_index() as i64 - operation.start_index() as i64 + 1);
+
+                if cfg!(debug_assertions) && text.is_some() {
+                    Operation::create_equal_with_text(
+                        operation.end_index().min(last_delete.end_index()),
+                        text.clone()
+                            .unwrap()
+                            .chars()
+                            .skip(overlap as usize)
+                            .collect::<String>(),
+                    )
+                } else {
+                    Operation::create_equal(
+                        operation.end_index().min(last_delete.end_index()),
+                        (length as i64 - overlap) as usize,
+                    )
+                }
+            }
+            (operation @ Operation::Equal { .. }, _) => Some(operation),
         }
     }
 }
@@ -296,6 +403,28 @@ where
 {
     fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
         match self {
+            Operation::Equal {
+                index,
+                length,
+
+                #[cfg(debug_assertions)]
+                text,
+            } => {
+                #[cfg(debug_assertions)]
+                write!(
+                    f,
+                    "<equal {} from index {}>",
+                    text.as_ref()
+                        .map(|text| format!("'{text}'"))
+                        .unwrap_or(format!("{length} characters")),
+                    index
+                )?;
+
+                #[cfg(not(debug_assertions))]
+                write!(f, "<equal {length} from index {index}>")?;
+
+                Ok(())
+            }
             Operation::Insert { index, text } => {
                 write!(
                     f,
diff --git a/backend/reconcile/src/operation_transformation/snapshots/reconcile__operation_transformation__edited_text__tests__calculate_operations.snap b/backend/reconcile/src/operation_transformation/snapshots/reconcile__operation_transformation__edited_text__tests__calculate_operations.snap
index f08083f4..246b2fe0 100644
--- a/backend/reconcile/src/operation_transformation/snapshots/reconcile__operation_transformation__edited_text__tests__calculate_operations.snap
+++ b/backend/reconcile/src/operation_transformation/snapshots/reconcile__operation_transformation__edited_text__tests__calculate_operations.snap
@@ -14,6 +14,22 @@ EditedText {
             order: 0,
             operation: <delete 'hello world!' from index 17>,
         },
+        OrderedOperation {
+            order: 12,
+            operation: <equal ' ' from index 17>,
+        },
+        OrderedOperation {
+            order: 13,
+            operation: <equal 'How' from index 18>,
+        },
+        OrderedOperation {
+            order: 16,
+            operation: <equal ' ' from index 21>,
+        },
+        OrderedOperation {
+            order: 17,
+            operation: <equal 'are' from index 22>,
+        },
         OrderedOperation {
             order: 20,
             operation: <insert ' you doing? Albert' from index 25>,
diff --git a/backend/reconcile/src/operation_transformation/snapshots/reconcile__operation_transformation__edited_text__tests__calculate_operations_with_no_diff.snap b/backend/reconcile/src/operation_transformation/snapshots/reconcile__operation_transformation__edited_text__tests__calculate_operations_with_no_diff.snap
new file mode 100644
index 00000000..33414f8c
--- /dev/null
+++ b/backend/reconcile/src/operation_transformation/snapshots/reconcile__operation_transformation__edited_text__tests__calculate_operations_with_no_diff.snap
@@ -0,0 +1,23 @@
+---
+source: reconcile/src/operation_transformation/edited_text.rs
+expression: operations
+snapshot_kind: text
+---
+EditedText {
+    text: "hello world!",
+    operations: [
+        OrderedOperation {
+            order: 0,
+            operation: <equal 'hello' from index 0>,
+        },
+        OrderedOperation {
+            order: 5,
+            operation: <equal ' ' from index 5>,
+        },
+        OrderedOperation {
+            order: 6,
+            operation: <equal 'world!' from index 6>,
+        },
+    ],
+    cursors: [],
+}
diff --git a/backend/reconcile/src/tokenizer/word_tokenizer.rs b/backend/reconcile/src/tokenizer/word_tokenizer.rs
index 37d748b3..8ebff6a6 100644
--- a/backend/reconcile/src/tokenizer/word_tokenizer.rs
+++ b/backend/reconcile/src/tokenizer/word_tokenizer.rs
@@ -1,29 +1,39 @@
 use super::token::Token;
 
-/// Splits on whitespace keeping the leading whitespace.
+/// Splits on word boundaries creating alternating words and whitespaces with
+/// the whitesspaces getting unique IDs.
 ///
-///     
 /// ## Example
 ///
-/// "Hi there!" -> ["Hi", " there!"]
+/// "Hi there!" -> ["Hi", " " ", "there!"]
 pub fn word_tokenizer(text: &str) -> Vec<Token<String>> {
     let mut result: Vec<Token<String>> = Vec::new();
 
-    let mut last_whitespace = 0;
-    let mut previous_char_is_whitespace = true;
+    let mut previous_boundary_index = 0;
+    let mut previous_char_is_whitespace = text.chars().next().map_or(true, |c| c.is_whitespace());
 
     for (i, c) in text.char_indices() {
         let is_current_char_whitespace = c.is_whitespace();
-        if !previous_char_is_whitespace && is_current_char_whitespace {
-            result.push(text[last_whitespace..i].into());
-            last_whitespace = i;
+        if previous_char_is_whitespace != is_current_char_whitespace {
+            result.push(text[previous_boundary_index..i].into());
+            previous_boundary_index = i;
         }
 
         previous_char_is_whitespace = is_current_char_whitespace;
     }
 
-    if last_whitespace < text.len() {
-        result.push(text[last_whitespace..].into());
+    if previous_boundary_index < text.len() {
+        result.push(text[previous_boundary_index..].into());
+    }
+
+    if result.is_empty() {
+        return result;
+    }
+
+    for i in 0..result.len() - 1 {
+        if result[i].original().chars().all(|c| c.is_whitespace()) {
+            result[i].normalised = result[i].normalised().to_owned() + result[i + 1].original()
+        }
     }
 
     result

From 48f301d8abe99810827012460af2950926663207 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 6 Apr 2025 11:39:40 +0100
Subject: [PATCH 429/761] Lint & format

---
 backend/Cargo.toml                            |  7 +++--
 backend/reconcile/src/diffs/myers.rs          |  8 ++---
 backend/reconcile/src/diffs/raw_operation.rs  | 30 +++++++++----------
 .../src/operation_transformation/cursor.rs    |  4 +--
 .../operation_transformation/edited_text.rs   | 23 +++++++-------
 .../src/operation_transformation/operation.rs |  3 +-
 .../reconcile/src/tokenizer/word_tokenizer.rs |  6 ++--
 backend/reconcile/tests/example_document.rs   |  8 ++---
 backend/reconcile/tests/test.rs               | 22 +++++++-------
 9 files changed, 54 insertions(+), 57 deletions(-)

diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 04d6216a..a5812fc6 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -2,7 +2,7 @@
 resolver = "2"
 members = [
     "reconcile",
-    "sync_server", 
+    "sync_server",
     "sync_lib"
 ]
 
@@ -14,9 +14,9 @@ license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
 version = "0.3.6"
 
-[workspace.dependencies]  
+[workspace.dependencies]
 serde = { version = "1.0.219", default-features = false, features = ["derive"] }
-thiserror = { version = "1.0.66", default-features = false  } 
+thiserror = { version = "1.0.66", default-features = false  }
 
 [profile.release]
 codegen-units = 1
@@ -58,6 +58,7 @@ unnested_or_patterns = "warn"
 unused_self = "warn"
 verbose_file_reads = "warn"
 
+large_stack_arrays = { level = "allow", priority = 1 } # https://github.com/rust-lang/rust-clippy/issues/13774
 cast_possible_truncation = { level = "allow", priority = 1 }
 doc_link_with_quotes = { level = "allow", priority = 1 }
 cast_sign_loss = { level = "allow", priority = 1 }
diff --git a/backend/reconcile/src/diffs/myers.rs b/backend/reconcile/src/diffs/myers.rs
index b7a7c5e5..c0be1d78 100644
--- a/backend/reconcile/src/diffs/myers.rs
+++ b/backend/reconcile/src/diffs/myers.rs
@@ -35,7 +35,7 @@ use crate::{
 /// Diff `old`, between indices `old_range` and `new` between indices
 /// `new_range`.
 ///
-/// The returned RawOperations all have a token count of 1.
+/// The returned `RawOperations` all have a token count of 1.
 pub fn diff<T>(old: &[Token<T>], new: &[Token<T>]) -> Vec<RawOperation<T>>
 where
     T: PartialEq + Clone + std::fmt::Debug,
@@ -245,7 +245,7 @@ fn conquer<T>(
             old[old_range.start..old_range.start + common_prefix_len]
                 .iter()
                 .map(|token| RawOperation::Equal(vec![token.clone()])),
-        )
+        );
     }
     old_range.start += common_prefix_len;
     new_range.start += common_prefix_len;
@@ -266,13 +266,13 @@ fn conquer<T>(
             old[old_range.start..old_range.start + old_range.len()]
                 .iter()
                 .map(|token| RawOperation::Delete(vec![token.clone()])),
-        )
+        );
     } else if old_range.is_empty() {
         result.extend(
             new[new_range.start..new_range.start + new_range.len()]
                 .iter()
                 .map(|token| RawOperation::Insert(vec![token.clone()])),
-        )
+        );
     } else if let Some((x_start, y_start)) =
         find_middle_snake(old, old_range.clone(), new, new_range.clone(), vf, vb)
     {
diff --git a/backend/reconcile/src/diffs/raw_operation.rs b/backend/reconcile/src/diffs/raw_operation.rs
index f95a0349..7630ff7f 100644
--- a/backend/reconcile/src/diffs/raw_operation.rs
+++ b/backend/reconcile/src/diffs/raw_operation.rs
@@ -30,18 +30,18 @@ where
 
     pub fn is_left_joinable(&self) -> bool {
         let first_token = self.tokens().first();
-        first_token.map_or(true, |t| t.get_is_left_joinable())
+        first_token.is_none_or(super::super::tokenizer::token::Token::get_is_left_joinable)
     }
 
     pub fn is_right_joinable(&self) -> bool {
         let last_token = self.tokens().last();
-        last_token.map_or(true, |t| t.get_is_right_joinable())
+        last_token.is_none_or(super::super::tokenizer::token::Token::get_is_right_joinable)
     }
 
-    /// Extends the operation with another operation when it returns Some
-    /// operation. Only operations of the same type as self can be used to
-    /// extend self. If the operations are of different types, returns None.
-    pub fn extend(self, other: RawOperation<T>) -> Option<RawOperation<T>> {
+    /// Extends the operation with another operation. Only operations of the
+    /// same type as self can be used to extend self, otherwise the function
+    /// will panic.
+    pub fn extend(self, other: RawOperation<T>) -> RawOperation<T> {
         debug_assert!(
             std::mem::discriminant(&self) == std::mem::discriminant(&other),
             "Cannot extend operations of different types. This should have been handled before \
@@ -49,15 +49,15 @@ where
         );
 
         match (self, other) {
-            (RawOperation::Insert(tokens1), RawOperation::Insert(tokens2)) => Some(
-                RawOperation::Insert(tokens1.into_iter().chain(tokens2).collect()),
-            ),
-            (RawOperation::Delete(tokens1), RawOperation::Delete(tokens2)) => Some(
-                RawOperation::Delete(tokens1.into_iter().chain(tokens2).collect()),
-            ),
-            (RawOperation::Equal(tokens1), RawOperation::Equal(tokens2)) => Some(
-                RawOperation::Equal(tokens1.into_iter().chain(tokens2).collect()),
-            ),
+            (RawOperation::Insert(tokens1), RawOperation::Insert(tokens2)) => {
+                RawOperation::Insert(tokens1.into_iter().chain(tokens2).collect())
+            }
+            (RawOperation::Delete(tokens1), RawOperation::Delete(tokens2)) => {
+                RawOperation::Delete(tokens1.into_iter().chain(tokens2).collect())
+            }
+            (RawOperation::Equal(tokens1), RawOperation::Equal(tokens2)) => {
+                RawOperation::Equal(tokens1.into_iter().chain(tokens2).collect())
+            }
             _ => unreachable!("Only operations of the same type can be extended"),
         }
     }
diff --git a/backend/reconcile/src/operation_transformation/cursor.rs b/backend/reconcile/src/operation_transformation/cursor.rs
index a8e74da7..c7fbaf5d 100644
--- a/backend/reconcile/src/operation_transformation/cursor.rs
+++ b/backend/reconcile/src/operation_transformation/cursor.rs
@@ -3,9 +3,6 @@ use std::borrow::Cow;
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
 
-use super::merge_context::MergeContext;
-use crate::operation_transformation::Operation;
-
 // CursorPosition represents the position of an identifiable cursor in a text
 // document based on its (UTF-8) character index.
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
@@ -16,6 +13,7 @@ pub struct CursorPosition {
 }
 
 impl CursorPosition {
+    #[must_use]
     pub fn with_index(self, index: usize) -> Self {
         CursorPosition {
             id: self.id,
diff --git a/backend/reconcile/src/operation_transformation/edited_text.rs b/backend/reconcile/src/operation_transformation/edited_text.rs
index f195a9f5..66cda8b9 100644
--- a/backend/reconcile/src/operation_transformation/edited_text.rs
+++ b/backend/reconcile/src/operation_transformation/edited_text.rs
@@ -3,11 +3,11 @@ use core::iter;
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
 
-use super::{ordered_operation::OrderedOperation, CursorPosition, Operation, TextWithCursors};
+use super::{CursorPosition, Operation, TextWithCursors, ordered_operation::OrderedOperation};
 use crate::{
     diffs::{myers::diff, raw_operation::RawOperation},
-    operation_transformation::{merge_context::MergeContext, operation},
-    tokenizer::{word_tokenizer::word_tokenizer, Tokenizer},
+    operation_transformation::merge_context::MergeContext,
+    tokenizer::{Tokenizer, word_tokenizer::word_tokenizer},
     utils::{merge_iters::MergeSorted as _, side::Side, string_builder::StringBuilder},
 };
 
@@ -84,7 +84,7 @@ where
             .flat_map(|next| match next {
                 RawOperation::Insert(..) => match maybe_previous_insert.take() {
                     Some(prev) if prev.is_right_joinable() && next.is_left_joinable() => {
-                        maybe_previous_insert = prev.extend(next);
+                        maybe_previous_insert = Some(prev.extend(next));
                         Box::new(iter::empty()) as Box<dyn Iterator<Item = RawOperation<T>>>
                     }
                     prev => {
@@ -94,7 +94,7 @@ where
                 },
                 RawOperation::Delete(..) => match maybe_previous_delete.take() {
                     Some(prev) if prev.is_right_joinable() && next.is_left_joinable() => {
-                        maybe_previous_delete = prev.extend(next);
+                        maybe_previous_delete = Some(prev.extend(next));
                         Box::new(iter::empty()) as Box<dyn Iterator<Item = RawOperation<T>>>
                     }
                     prev => {
@@ -133,7 +133,7 @@ where
         let mut new_index = 0; // this is the start index of the operation on the new text
         let mut order = 0; // this is the start index of the operation on the original text
 
-        raw_operations.into_iter().flat_map(move |raw_operation| {
+        raw_operations.into_iter().filter_map(move |raw_operation| {
             let length = raw_operation.original_text_length();
 
             match raw_operation {
@@ -261,8 +261,8 @@ where
                             &mut left_merge_context,
                         );
 
-                        if let Some(ref op @ Operation::Insert { .. })
-                        | Some(ref op @ Operation::Equal { .. }) = result
+                        if let Some(ref op @ (Operation::Insert { .. } | Operation::Equal { .. })) =
+                            result
                         {
                             while let Some(mut cursor) =
                                 left_cursors.next_if(|cursor| cursor.char_index <= original_end + 1)
@@ -284,8 +284,8 @@ where
                             &mut right_merge_context,
                         );
 
-                        if let Some(ref op @ Operation::Insert { .. })
-                        | Some(ref op @ Operation::Equal { .. }) = result
+                        if let Some(ref op @ (Operation::Insert { .. } | Operation::Equal { .. })) =
+                            result
                         {
                             while let Some(mut cursor) = right_cursors
                                 .next_if(|cursor| cursor.char_index <= original_end + 1)
@@ -310,8 +310,7 @@ where
         let last_index = merged_operations
             .iter()
             .last()
-            .map(|op| op.operation.end_index())
-            .unwrap_or(0);
+            .map_or(0, |op| op.operation.end_index());
 
         for cursor in left_cursors.chain(right_cursors) {
             merged_cursors.push(cursor.with_index(last_index));
diff --git a/backend/reconcile/src/operation_transformation/operation.rs b/backend/reconcile/src/operation_transformation/operation.rs
index 313d3687..73ae0583 100644
--- a/backend/reconcile/src/operation_transformation/operation.rs
+++ b/backend/reconcile/src/operation_transformation/operation.rs
@@ -251,6 +251,7 @@ where
     /// and updating the context. This implements a comples FSM that handles
     /// the merging of operations in a way that is consistent with the text.
     /// The contexts are updated in-place.
+    #[allow(clippy::too_many_lines)]
     pub fn merge_operations_with_context(
         self,
         affecting_context: &mut MergeContext<T>,
@@ -298,7 +299,7 @@ where
 
             (
                 operation @ Operation::Delete { .. },
-                None | Some(Operation::Insert { .. }) | Some(Operation::Equal { .. }),
+                None | Some(Operation::Insert { .. } | Operation::Equal { .. }),
             ) => {
                 produced_context.consume_and_replace_last_operation(Some(operation.clone()));
                 Some(operation)
diff --git a/backend/reconcile/src/tokenizer/word_tokenizer.rs b/backend/reconcile/src/tokenizer/word_tokenizer.rs
index 8ebff6a6..dd22b7ea 100644
--- a/backend/reconcile/src/tokenizer/word_tokenizer.rs
+++ b/backend/reconcile/src/tokenizer/word_tokenizer.rs
@@ -10,7 +10,7 @@ pub fn word_tokenizer(text: &str) -> Vec<Token<String>> {
     let mut result: Vec<Token<String>> = Vec::new();
 
     let mut previous_boundary_index = 0;
-    let mut previous_char_is_whitespace = text.chars().next().map_or(true, |c| c.is_whitespace());
+    let mut previous_char_is_whitespace = text.chars().next().is_none_or(char::is_whitespace);
 
     for (i, c) in text.char_indices() {
         let is_current_char_whitespace = c.is_whitespace();
@@ -31,8 +31,8 @@ pub fn word_tokenizer(text: &str) -> Vec<Token<String>> {
     }
 
     for i in 0..result.len() - 1 {
-        if result[i].original().chars().all(|c| c.is_whitespace()) {
-            result[i].normalised = result[i].normalised().to_owned() + result[i + 1].original()
+        if result[i].original().chars().all(char::is_whitespace) {
+            result[i].normalised = result[i].normalised().to_owned() + result[i + 1].original();
         }
     }
 
diff --git a/backend/reconcile/tests/example_document.rs b/backend/reconcile/tests/example_document.rs
index 3d866c1b..66a56f65 100644
--- a/backend/reconcile/tests/example_document.rs
+++ b/backend/reconcile/tests/example_document.rs
@@ -66,11 +66,9 @@ impl ExampleDocument {
             result.insert(
                 result
                     .char_indices()
-                    .skip(cursor.char_index + i)
-                    .next()
-                    .map(|(byte_index, _)| byte_index)
-                    .unwrap_or_else(|| result.len()), /* find the utf8 char index of the insert
-                                                       * in byte index */
+                    .nth(cursor.char_index + i)
+                    .map_or_else(|| result.len(), |(byte_index, _)| byte_index), /* find the utf8 char index of the insert
+                                                                                  * in byte index */
                 '|',
             );
         }
diff --git a/backend/reconcile/tests/test.rs b/backend/reconcile/tests/test.rs
index 5a749f1b..088a93e9 100644
--- a/backend/reconcile/tests/test.rs
+++ b/backend/reconcile/tests/test.rs
@@ -8,46 +8,46 @@ use serde::Deserialize;
 
 #[test]
 fn test_document_one_way_without_cursors() {
-    get_all_documents().iter().for_each(|doc| {
+    for doc in &get_all_documents() {
         doc.assert_eq_without_cursors(&reconcile(
             &doc.parent(),
             &doc.left().text,
             &doc.right().text,
-        ))
-    });
+        ));
+    }
 }
 
 #[test]
 fn test_document_one_way_with_cursors() {
-    get_all_documents().iter().for_each(|doc| {
+    for doc in &get_all_documents() {
         doc.assert_eq(&reconcile_with_cursors(
             &doc.parent(),
             doc.left(),
             doc.right(),
-        ))
-    });
+        ));
+    }
 }
 
 #[test]
 fn test_document_inverse_way_without_cursors() {
-    get_all_documents().iter().for_each(|doc| {
+    for doc in &get_all_documents() {
         doc.assert_eq_without_cursors(&reconcile(
             &doc.parent(),
             &doc.right().text,
             &doc.left().text,
         ));
-    });
+    }
 }
 
 #[test]
 fn test_document_inverse_way_with_cursors() {
-    get_all_documents().iter().for_each(|doc| {
+    for doc in &get_all_documents() {
         doc.assert_eq(&reconcile_with_cursors(
             &doc.parent(),
             doc.right(),
             doc.left(),
-        ))
-    });
+        ));
+    }
 }
 
 fn get_all_documents() -> Vec<ExampleDocument> {

From aa78e258e78c735c894da389a7adebebccee5cb7 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 6 Apr 2025 11:43:08 +0100
Subject: [PATCH 430/761] Enable more lints

---
 backend/Cargo.toml                            | 21 ++++++++++---------
 .../reconcile/src/tokenizer/word_tokenizer.rs |  4 +++-
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index a5812fc6..9f583425 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -59,18 +59,19 @@ unused_self = "warn"
 verbose_file_reads = "warn"
 
 large_stack_arrays = { level = "allow", priority = 1 } # https://github.com/rust-lang/rust-clippy/issues/13774
+
+# TODO: fix these
 cast_possible_truncation = { level = "allow", priority = 1 }
-doc_link_with_quotes = { level = "allow", priority = 1 }
 cast_sign_loss = { level = "allow", priority = 1 }
 cast_possible_wrap = { level = "allow", priority = 1 }
-struct_field_names = { level = "allow", priority = 1 }
-single_call_fn = { level = "allow", priority = 1 }
-absolute_paths = { level = "allow", priority = 1 }
-arithmetic_side_effects = { level = "allow", priority = 1 }
-similar_names = { level = "allow", priority = 1 }
-self_named_module_files = { level = "allow", priority = 1 }
-single_char_lifetime_names = { level = "allow", priority = 1 }
-missing_docs_in_private_items = { level = "allow", priority = 1 }
-question_mark_used =  { level = "allow", priority = 1 }
+
+# Silly lints
 implicit_return = { level = "allow", priority = 1 }
+question_mark_used =  { level = "allow", priority = 1 }
+struct_field_names = { level = "allow", priority = 1 }
+single_char_lifetime_names = { level = "allow", priority = 1 }
+single_call_fn = { level = "allow", priority = 1 }
+similar_names = { level = "allow", priority = 1 }
+missing_docs_in_private_items = { level = "allow", priority = 1 }
+
 pedantic = { level = "warn", priority = 0 }
diff --git a/backend/reconcile/src/tokenizer/word_tokenizer.rs b/backend/reconcile/src/tokenizer/word_tokenizer.rs
index dd22b7ea..2267f69f 100644
--- a/backend/reconcile/src/tokenizer/word_tokenizer.rs
+++ b/backend/reconcile/src/tokenizer/word_tokenizer.rs
@@ -5,7 +5,9 @@ use super::token::Token;
 ///
 /// ## Example
 ///
-/// "Hi there!" -> ["Hi", " " ", "there!"]
+/// ```not_rust
+/// "Hi there!" -> ["Hi", " ", "there!"]
+/// ```
 pub fn word_tokenizer(text: &str) -> Vec<Token<String>> {
     let mut result: Vec<Token<String>> = Vec::new();
 

From 09f20900cd1c55bb5bfcdbebae95fd7444894c04 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 6 Apr 2025 12:14:33 +0100
Subject: [PATCH 431/761] Fix build

---
 .../src/operation_transformation/operation.rs | 38 +++++++++++--------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/backend/reconcile/src/operation_transformation/operation.rs b/backend/reconcile/src/operation_transformation/operation.rs
index 73ae0583..87c22129 100644
--- a/backend/reconcile/src/operation_transformation/operation.rs
+++ b/backend/reconcile/src/operation_transformation/operation.rs
@@ -377,21 +377,29 @@ where
                 let overlap = (length as i64)
                     .min(last_delete.end_index() as i64 - operation.start_index() as i64 + 1);
 
-                if cfg!(debug_assertions) && text.is_some() {
-                    Operation::create_equal_with_text(
-                        operation.end_index().min(last_delete.end_index()),
-                        text.clone()
-                            .unwrap()
-                            .chars()
-                            .skip(overlap as usize)
-                            .collect::<String>(),
-                    )
-                } else {
-                    Operation::create_equal(
-                        operation.end_index().min(last_delete.end_index()),
-                        (length as i64 - overlap) as usize,
-                    )
-                }
+                #[cfg(debug_assertions)]
+                let result = text
+                    .as_ref()
+                    .map(|text| {
+                        Operation::create_equal_with_text(
+                            operation.end_index().min(last_delete.end_index()),
+                            text.chars().skip(overlap as usize).collect::<String>(),
+                        )
+                    })
+                    .unwrap_or_else(|| {
+                        Operation::create_equal(
+                            operation.end_index().min(last_delete.end_index()),
+                            (length as i64 - overlap) as usize,
+                        )
+                    });
+
+                #[cfg(not(debug_assertions))]
+                let result = Operation::create_equal(
+                    operation.end_index().min(last_delete.end_index()),
+                    (length as i64 - overlap) as usize,
+                );
+
+                result
             }
             (operation @ Operation::Equal { .. }, _) => Some(operation),
         }

From c734d256be08b11c3fda1bd1b4c5fe6061588247 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 6 Apr 2025 12:16:03 +0100
Subject: [PATCH 432/761] Fix lint

---
 .../src/operation_transformation/operation.rs | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/backend/reconcile/src/operation_transformation/operation.rs b/backend/reconcile/src/operation_transformation/operation.rs
index 87c22129..e194f9c3 100644
--- a/backend/reconcile/src/operation_transformation/operation.rs
+++ b/backend/reconcile/src/operation_transformation/operation.rs
@@ -378,20 +378,20 @@ where
                     .min(last_delete.end_index() as i64 - operation.start_index() as i64 + 1);
 
                 #[cfg(debug_assertions)]
-                let result = text
-                    .as_ref()
-                    .map(|text| {
-                        Operation::create_equal_with_text(
-                            operation.end_index().min(last_delete.end_index()),
-                            text.chars().skip(overlap as usize).collect::<String>(),
-                        )
-                    })
-                    .unwrap_or_else(|| {
+                let result = text.as_ref().map_or_else(
+                    || {
                         Operation::create_equal(
                             operation.end_index().min(last_delete.end_index()),
                             (length as i64 - overlap) as usize,
                         )
-                    });
+                    },
+                    |text| {
+                        Operation::create_equal_with_text(
+                            operation.end_index().min(last_delete.end_index()),
+                            text.chars().skip(overlap as usize).collect::<String>(),
+                        )
+                    },
+                );
 
                 #[cfg(not(debug_assertions))]
                 let result = Operation::create_equal(

From ac4c7fb1df3c4d4727d0168b883d69475ad17148 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 6 Apr 2025 13:28:07 +0100
Subject: [PATCH 433/761] Faster tests

---
 .../reconcile/src/operation_transformation.rs |    5 +-
 .../operation_transformation/edited_text.rs   |    2 +-
 backend/reconcile/tests/examples/various.yml  |    6 +
 .../tests/resources/romeo_and_juliet.txt      | 5646 -----------------
 4 files changed, 8 insertions(+), 5651 deletions(-)
 delete mode 100644 backend/reconcile/tests/resources/romeo_and_juliet.txt

diff --git a/backend/reconcile/src/operation_transformation.rs b/backend/reconcile/src/operation_transformation.rs
index 45575b98..08a55a94 100644
--- a/backend/reconcile/src/operation_transformation.rs
+++ b/backend/reconcile/src/operation_transformation.rs
@@ -120,23 +120,20 @@ mod test {
     #[ignore = "expensive to run, only run in CI"]
     #[test_matrix( [
         "pride_and_prejudice.txt",
-        "romeo_and_juliet.txt",
         "room_with_a_view.txt",
         "kun_lu.txt",
         "blns.txt"
     ],  [
         "pride_and_prejudice.txt",
-        "romeo_and_juliet.txt",
         "room_with_a_view.txt",
         "kun_lu.txt",
         "blns.txt"
     ],  [
         "pride_and_prejudice.txt",
-        "romeo_and_juliet.txt",
         "room_with_a_view.txt",
         "kun_lu.txt",
         "blns.txt"
-    ], [0..10000, 10000..20000, 20000..50000], [0..10000, 10000..20000, 20000..50000], [0..10000, 10000..20000, 20000..50000])]
+    ], [0..10000, 10000..20000], [0..10000, 10000..20000], [0..10000, 10000..20000])]
     fn test_merge_files_without_panic(
         file_name_1: &str,
         file_name_2: &str,
diff --git a/backend/reconcile/src/operation_transformation/edited_text.rs b/backend/reconcile/src/operation_transformation/edited_text.rs
index 66cda8b9..0ef6c66e 100644
--- a/backend/reconcile/src/operation_transformation/edited_text.rs
+++ b/backend/reconcile/src/operation_transformation/edited_text.rs
@@ -240,7 +240,7 @@ where
                             Operation::Equal { index, .. } => index.to_string(),
                             Operation::Insert { text, .. } => text
                                 .iter()
-                                .map(super::super::tokenizer::token::Token::original)
+                                .map(crate::tokenizer::token::Token::original)
                                 .collect::<String>(),
                             Operation::Delete {
                                 deleted_character_count,
diff --git a/backend/reconcile/tests/examples/various.yml b/backend/reconcile/tests/examples/various.yml
index 0b027477..7a87e4e7 100644
--- a/backend/reconcile/tests/examples/various.yml
+++ b/backend/reconcile/tests/examples/various.yml
@@ -122,3 +122,9 @@ parent: hello world
 left: hi, world
 right: hello my friend!
 expected: hi, my friend!
+
+---
+parent: a a
+left: a
+right: a
+expected: a
diff --git a/backend/reconcile/tests/resources/romeo_and_juliet.txt b/backend/reconcile/tests/resources/romeo_and_juliet.txt
deleted file mode 100644
index fd501246..00000000
--- a/backend/reconcile/tests/resources/romeo_and_juliet.txt
+++ /dev/null
@@ -1,5646 +0,0 @@
-The Project Gutenberg eBook of Romeo and Juliet
-    
-This ebook is for the use of anyone anywhere in the United States and
-most other parts of the world at no cost and with almost no restrictions
-whatsoever. You may copy it, give it away or re-use it under the terms
-of the Project Gutenberg License included with this ebook or online
-at www.gutenberg.org. If you are not located in the United States,
-you will have to check the laws of the country where you are located
-before using this eBook.
-
-Title: Romeo and Juliet
-
-Author: William Shakespeare
-
-Release date: November 1, 1998 [eBook #1513]
-                Most recently updated: June 19, 2024
-
-Language: English
-
-Credits: the PG Shakespeare Team, a team of about twenty Project Gutenberg volunteers
-
-
-*** START OF THE PROJECT GUTENBERG EBOOK ROMEO AND JULIET ***
-
-
-
-
-THE TRAGEDY OF ROMEO AND JULIET
-
-by William Shakespeare
-
-
-
-
-Contents
-
-THE PROLOGUE.
-
-ACT I
-Scene I. A public place.
-Scene II. A Street.
-Scene III. Room in Capulet’s House.
-Scene IV. A Street.
-Scene V. A Hall in Capulet’s House.
-
-ACT II
-CHORUS.
-Scene I. An open place adjoining Capulet’s Garden.
-Scene II. Capulet’s Garden.
-Scene III. Friar Lawrence’s Cell.
-Scene IV. A Street.
-Scene V. Capulet’s Garden.
-Scene VI. Friar Lawrence’s Cell.
-
-ACT III
-Scene I. A public Place.
-Scene II. A Room in Capulet’s House.
-Scene III. Friar Lawrence’s cell.
-Scene IV. A Room in Capulet’s House.
-Scene V. An open Gallery to Juliet’s Chamber, overlooking the Garden.
-
-ACT IV
-Scene I. Friar Lawrence’s Cell.
-Scene II. Hall in Capulet’s House.
-Scene III. Juliet’s Chamber.
-Scene IV. Hall in Capulet’s House.
-Scene V. Juliet’s Chamber; Juliet on the bed.
-
-ACT V
-Scene I. Mantua. A Street.
-Scene II. Friar Lawrence’s Cell.
-Scene III. A churchyard; in it a Monument belonging to the Capulets.
-
-
-
-
- Dramatis Personæ
-
-ESCALUS, Prince of Verona.
-MERCUTIO, kinsman to the Prince, and friend to Romeo.
-PARIS, a young Nobleman, kinsman to the Prince.
-Page to Paris.
-
-MONTAGUE, head of a Veronese family at feud with the Capulets.
-LADY MONTAGUE, wife to Montague.
-ROMEO, son to Montague.
-BENVOLIO, nephew to Montague, and friend to Romeo.
-ABRAM, servant to Montague.
-BALTHASAR, servant to Romeo.
-
-CAPULET, head of a Veronese family at feud with the Montagues.
-LADY CAPULET, wife to Capulet.
-JULIET, daughter to Capulet.
-TYBALT, nephew to Lady Capulet.
-CAPULET’S COUSIN, an old man.
-NURSE to Juliet.
-PETER, servant to Juliet’s Nurse.
-SAMPSON, servant to Capulet.
-GREGORY, servant to Capulet.
-Servants.
-
-FRIAR LAWRENCE, a Franciscan.
-FRIAR JOHN, of the same Order.
-An Apothecary.
-CHORUS.
-Three Musicians.
-An Officer.
-Citizens of Verona; several Men and Women, relations to both houses;
-Maskers, Guards, Watchmen and Attendants.
-
-SCENE. During the greater part of the Play in Verona; once, in the
-Fifth Act, at Mantua.
-
-
-
-
-THE PROLOGUE
-
-
- Enter Chorus.
-
-CHORUS.
-Two households, both alike in dignity,
-In fair Verona, where we lay our scene,
-From ancient grudge break to new mutiny,
-Where civil blood makes civil hands unclean.
-From forth the fatal loins of these two foes
-A pair of star-cross’d lovers take their life;
-Whose misadventur’d piteous overthrows
-Doth with their death bury their parents’ strife.
-The fearful passage of their death-mark’d love,
-And the continuance of their parents’ rage,
-Which, but their children’s end, nought could remove,
-Is now the two hours’ traffic of our stage;
-The which, if you with patient ears attend,
-What here shall miss, our toil shall strive to mend.
-
- [_Exit._]
-
-
-
-
-ACT I
-
-SCENE I. A public place.
-
-
- Enter Sampson and Gregory armed with swords and bucklers.
-
-SAMPSON.
-Gregory, on my word, we’ll not carry coals.
-
-GREGORY.
-No, for then we should be colliers.
-
-SAMPSON.
-I mean, if we be in choler, we’ll draw.
-
-GREGORY.
-Ay, while you live, draw your neck out o’ the collar.
-
-SAMPSON.
-I strike quickly, being moved.
-
-GREGORY.
-But thou art not quickly moved to strike.
-
-SAMPSON.
-A dog of the house of Montague moves me.
-
-GREGORY.
-To move is to stir; and to be valiant is to stand: therefore, if thou
-art moved, thou runn’st away.
-
-SAMPSON.
-A dog of that house shall move me to stand.
-I will take the wall of any man or maid of Montague’s.
-
-GREGORY.
-That shows thee a weak slave, for the weakest goes to the wall.
-
-SAMPSON.
-True, and therefore women, being the weaker vessels, are ever thrust to
-the wall: therefore I will push Montague’s men from the wall, and
-thrust his maids to the wall.
-
-GREGORY.
-The quarrel is between our masters and us their men.
-
-SAMPSON.
-’Tis all one, I will show myself a tyrant: when I have fought with the
-men I will be civil with the maids, I will cut off their heads.
-
-GREGORY.
-The heads of the maids?
-
-SAMPSON.
-Ay, the heads of the maids, or their maidenheads; take it in what sense
-thou wilt.
-
-GREGORY.
-They must take it in sense that feel it.
-
-SAMPSON.
-Me they shall feel while I am able to stand: and ’tis known I am a
-pretty piece of flesh.
-
-GREGORY.
-’Tis well thou art not fish; if thou hadst, thou hadst been poor John.
-Draw thy tool; here comes of the house of Montagues.
-
- Enter Abram and Balthasar.
-
-SAMPSON.
-My naked weapon is out: quarrel, I will back thee.
-
-GREGORY.
-How? Turn thy back and run?
-
-SAMPSON.
-Fear me not.
-
-GREGORY.
-No, marry; I fear thee!
-
-SAMPSON.
-Let us take the law of our sides; let them begin.
-
-GREGORY.
-I will frown as I pass by, and let them take it as they list.
-
-SAMPSON.
-Nay, as they dare. I will bite my thumb at them, which is disgrace to
-them if they bear it.
-
-ABRAM.
-Do you bite your thumb at us, sir?
-
-SAMPSON.
-I do bite my thumb, sir.
-
-ABRAM.
-Do you bite your thumb at us, sir?
-
-SAMPSON.
-Is the law of our side if I say ay?
-
-GREGORY.
-No.
-
-SAMPSON.
-No sir, I do not bite my thumb at you, sir; but I bite my thumb, sir.
-
-GREGORY.
-Do you quarrel, sir?
-
-ABRAM.
-Quarrel, sir? No, sir.
-
-SAMPSON.
-But if you do, sir, I am for you. I serve as good a man as you.
-
-ABRAM.
-No better.
-
-SAMPSON.
-Well, sir.
-
- Enter Benvolio.
-
-GREGORY.
-Say better; here comes one of my master’s kinsmen.
-
-SAMPSON.
-Yes, better, sir.
-
-ABRAM.
-You lie.
-
-SAMPSON.
-Draw, if you be men. Gregory, remember thy washing blow.
-
- [_They fight._]
-
-BENVOLIO.
-Part, fools! put up your swords, you know not what you do.
-
- [_Beats down their swords._]
-
- Enter Tybalt.
-
-TYBALT.
-What, art thou drawn among these heartless hinds?
-Turn thee Benvolio, look upon thy death.
-
-BENVOLIO.
-I do but keep the peace, put up thy sword,
-Or manage it to part these men with me.
-
-TYBALT.
-What, drawn, and talk of peace? I hate the word
-As I hate hell, all Montagues, and thee:
-Have at thee, coward.
-
- [_They fight._]
-
- Enter three or four Citizens with clubs.
-
-FIRST CITIZEN.
-Clubs, bills and partisans! Strike! Beat them down!
-Down with the Capulets! Down with the Montagues!
-
- Enter Capulet in his gown, and Lady Capulet.
-
-CAPULET.
-What noise is this? Give me my long sword, ho!
-
-LADY CAPULET.
-A crutch, a crutch! Why call you for a sword?
-
-CAPULET.
-My sword, I say! Old Montague is come,
-And flourishes his blade in spite of me.
-
- Enter Montague and his Lady Montague.
-
-MONTAGUE.
-Thou villain Capulet! Hold me not, let me go.
-
-LADY MONTAGUE.
-Thou shalt not stir one foot to seek a foe.
-
- Enter Prince Escalus, with Attendants.
-
-PRINCE.
-Rebellious subjects, enemies to peace,
-Profaners of this neighbour-stained steel,—
-Will they not hear? What, ho! You men, you beasts,
-That quench the fire of your pernicious rage
-With purple fountains issuing from your veins,
-On pain of torture, from those bloody hands
-Throw your mistemper’d weapons to the ground
-And hear the sentence of your moved prince.
-Three civil brawls, bred of an airy word,
-By thee, old Capulet, and Montague,
-Have thrice disturb’d the quiet of our streets,
-And made Verona’s ancient citizens
-Cast by their grave beseeming ornaments,
-To wield old partisans, in hands as old,
-Canker’d with peace, to part your canker’d hate.
-If ever you disturb our streets again,
-Your lives shall pay the forfeit of the peace.
-For this time all the rest depart away:
-You, Capulet, shall go along with me,
-And Montague, come you this afternoon,
-To know our farther pleasure in this case,
-To old Free-town, our common judgement-place.
-Once more, on pain of death, all men depart.
-
- [_Exeunt Prince and Attendants; Capulet, Lady Capulet, Tybalt,
- Citizens and Servants._]
-
-MONTAGUE.
-Who set this ancient quarrel new abroach?
-Speak, nephew, were you by when it began?
-
-BENVOLIO.
-Here were the servants of your adversary
-And yours, close fighting ere I did approach.
-I drew to part them, in the instant came
-The fiery Tybalt, with his sword prepar’d,
-Which, as he breath’d defiance to my ears,
-He swung about his head, and cut the winds,
-Who nothing hurt withal, hiss’d him in scorn.
-While we were interchanging thrusts and blows
-Came more and more, and fought on part and part,
-Till the Prince came, who parted either part.
-
-LADY MONTAGUE.
-O where is Romeo, saw you him today?
-Right glad I am he was not at this fray.
-
-BENVOLIO.
-Madam, an hour before the worshipp’d sun
-Peer’d forth the golden window of the east,
-A troubled mind drave me to walk abroad,
-Where underneath the grove of sycamore
-That westward rooteth from this city side,
-So early walking did I see your son.
-Towards him I made, but he was ware of me,
-And stole into the covert of the wood.
-I, measuring his affections by my own,
-Which then most sought where most might not be found,
-Being one too many by my weary self,
-Pursu’d my humour, not pursuing his,
-And gladly shunn’d who gladly fled from me.
-
-MONTAGUE.
-Many a morning hath he there been seen,
-With tears augmenting the fresh morning’s dew,
-Adding to clouds more clouds with his deep sighs;
-But all so soon as the all-cheering sun
-Should in the farthest east begin to draw
-The shady curtains from Aurora’s bed,
-Away from light steals home my heavy son,
-And private in his chamber pens himself,
-Shuts up his windows, locks fair daylight out
-And makes himself an artificial night.
-Black and portentous must this humour prove,
-Unless good counsel may the cause remove.
-
-BENVOLIO.
-My noble uncle, do you know the cause?
-
-MONTAGUE.
-I neither know it nor can learn of him.
-
-BENVOLIO.
-Have you importun’d him by any means?
-
-MONTAGUE.
-Both by myself and many other friends;
-But he, his own affections’ counsellor,
-Is to himself—I will not say how true—
-But to himself so secret and so close,
-So far from sounding and discovery,
-As is the bud bit with an envious worm
-Ere he can spread his sweet leaves to the air,
-Or dedicate his beauty to the sun.
-Could we but learn from whence his sorrows grow,
-We would as willingly give cure as know.
-
- Enter Romeo.
-
-BENVOLIO.
-See, where he comes. So please you step aside;
-I’ll know his grievance or be much denied.
-
-MONTAGUE.
-I would thou wert so happy by thy stay
-To hear true shrift. Come, madam, let’s away,
-
- [_Exeunt Montague and Lady Montague._]
-
-BENVOLIO.
-Good morrow, cousin.
-
-ROMEO.
-Is the day so young?
-
-BENVOLIO.
-But new struck nine.
-
-ROMEO.
-Ay me, sad hours seem long.
-Was that my father that went hence so fast?
-
-BENVOLIO.
-It was. What sadness lengthens Romeo’s hours?
-
-ROMEO.
-Not having that which, having, makes them short.
-
-BENVOLIO.
-In love?
-
-ROMEO.
-Out.
-
-BENVOLIO.
-Of love?
-
-ROMEO.
-Out of her favour where I am in love.
-
-BENVOLIO.
-Alas that love so gentle in his view,
-Should be so tyrannous and rough in proof.
-
-ROMEO.
-Alas that love, whose view is muffled still,
-Should, without eyes, see pathways to his will!
-Where shall we dine? O me! What fray was here?
-Yet tell me not, for I have heard it all.
-Here’s much to do with hate, but more with love:
-Why, then, O brawling love! O loving hate!
-O anything, of nothing first create!
-O heavy lightness! serious vanity!
-Misshapen chaos of well-seeming forms!
-Feather of lead, bright smoke, cold fire, sick health!
-Still-waking sleep, that is not what it is!
-This love feel I, that feel no love in this.
-Dost thou not laugh?
-
-BENVOLIO.
-No coz, I rather weep.
-
-ROMEO.
-Good heart, at what?
-
-BENVOLIO.
-At thy good heart’s oppression.
-
-ROMEO.
-Why such is love’s transgression.
-Griefs of mine own lie heavy in my breast,
-Which thou wilt propagate to have it prest
-With more of thine. This love that thou hast shown
-Doth add more grief to too much of mine own.
-Love is a smoke made with the fume of sighs;
-Being purg’d, a fire sparkling in lovers’ eyes;
-Being vex’d, a sea nourish’d with lovers’ tears:
-What is it else? A madness most discreet,
-A choking gall, and a preserving sweet.
-Farewell, my coz.
-
- [_Going._]
-
-BENVOLIO.
-Soft! I will go along:
-And if you leave me so, you do me wrong.
-
-ROMEO.
-Tut! I have lost myself; I am not here.
-This is not Romeo, he’s some other where.
-
-BENVOLIO.
-Tell me in sadness who is that you love?
-
-ROMEO.
-What, shall I groan and tell thee?
-
-BENVOLIO.
-Groan! Why, no; but sadly tell me who.
-
-ROMEO.
-Bid a sick man in sadness make his will,
-A word ill urg’d to one that is so ill.
-In sadness, cousin, I do love a woman.
-
-BENVOLIO.
-I aim’d so near when I suppos’d you lov’d.
-
-ROMEO.
-A right good markman, and she’s fair I love.
-
-BENVOLIO.
-A right fair mark, fair coz, is soonest hit.
-
-ROMEO.
-Well, in that hit you miss: she’ll not be hit
-With Cupid’s arrow, she hath Dian’s wit;
-And in strong proof of chastity well arm’d,
-From love’s weak childish bow she lives uncharm’d.
-She will not stay the siege of loving terms
-Nor bide th’encounter of assailing eyes,
-Nor ope her lap to saint-seducing gold:
-O she’s rich in beauty, only poor
-That when she dies, with beauty dies her store.
-
-BENVOLIO.
-Then she hath sworn that she will still live chaste?
-
-ROMEO.
-She hath, and in that sparing makes huge waste;
-For beauty starv’d with her severity,
-Cuts beauty off from all posterity.
-She is too fair, too wise; wisely too fair,
-To merit bliss by making me despair.
-She hath forsworn to love, and in that vow
-Do I live dead, that live to tell it now.
-
-BENVOLIO.
-Be rul’d by me, forget to think of her.
-
-ROMEO.
-O teach me how I should forget to think.
-
-BENVOLIO.
-By giving liberty unto thine eyes;
-Examine other beauties.
-
-ROMEO.
-’Tis the way
-To call hers, exquisite, in question more.
-These happy masks that kiss fair ladies’ brows,
-Being black, puts us in mind they hide the fair;
-He that is strucken blind cannot forget
-The precious treasure of his eyesight lost.
-Show me a mistress that is passing fair,
-What doth her beauty serve but as a note
-Where I may read who pass’d that passing fair?
-Farewell, thou canst not teach me to forget.
-
-BENVOLIO.
-I’ll pay that doctrine, or else die in debt.
-
- [_Exeunt._]
-
-SCENE II. A Street.
-
- Enter Capulet, Paris and Servant.
-
-CAPULET.
-But Montague is bound as well as I,
-In penalty alike; and ’tis not hard, I think,
-For men so old as we to keep the peace.
-
-PARIS.
-Of honourable reckoning are you both,
-And pity ’tis you liv’d at odds so long.
-But now my lord, what say you to my suit?
-
-CAPULET.
-But saying o’er what I have said before.
-My child is yet a stranger in the world,
-She hath not seen the change of fourteen years;
-Let two more summers wither in their pride
-Ere we may think her ripe to be a bride.
-
-PARIS.
-Younger than she are happy mothers made.
-
-CAPULET.
-And too soon marr’d are those so early made.
-The earth hath swallowed all my hopes but she,
-She is the hopeful lady of my earth:
-But woo her, gentle Paris, get her heart,
-My will to her consent is but a part;
-And she agree, within her scope of choice
-Lies my consent and fair according voice.
-This night I hold an old accustom’d feast,
-Whereto I have invited many a guest,
-Such as I love, and you among the store,
-One more, most welcome, makes my number more.
-At my poor house look to behold this night
-Earth-treading stars that make dark heaven light:
-Such comfort as do lusty young men feel
-When well apparell’d April on the heel
-Of limping winter treads, even such delight
-Among fresh female buds shall you this night
-Inherit at my house. Hear all, all see,
-And like her most whose merit most shall be:
-Which, on more view of many, mine, being one,
-May stand in number, though in reckoning none.
-Come, go with me. Go, sirrah, trudge about
-Through fair Verona; find those persons out
-Whose names are written there, [_gives a paper_] and to them say,
-My house and welcome on their pleasure stay.
-
- [_Exeunt Capulet and Paris._]
-
-SERVANT.
-Find them out whose names are written here! It is written that the
-shoemaker should meddle with his yard and the tailor with his last, the
-fisher with his pencil, and the painter with his nets; but I am sent to
-find those persons whose names are here writ, and can never find what
-names the writing person hath here writ. I must to the learned. In good
-time!
-
- Enter Benvolio and Romeo.
-
-BENVOLIO.
-Tut, man, one fire burns out another’s burning,
-One pain is lessen’d by another’s anguish;
-Turn giddy, and be holp by backward turning;
-One desperate grief cures with another’s languish:
-Take thou some new infection to thy eye,
-And the rank poison of the old will die.
-
-ROMEO.
-Your plantain leaf is excellent for that.
-
-BENVOLIO.
-For what, I pray thee?
-
-ROMEO.
-For your broken shin.
-
-BENVOLIO.
-Why, Romeo, art thou mad?
-
-ROMEO.
-Not mad, but bound more than a madman is:
-Shut up in prison, kept without my food,
-Whipp’d and tormented and—God-den, good fellow.
-
-SERVANT.
-God gi’ go-den. I pray, sir, can you read?
-
-ROMEO.
-Ay, mine own fortune in my misery.
-
-SERVANT.
-Perhaps you have learned it without book.
-But I pray, can you read anything you see?
-
-ROMEO.
-Ay, If I know the letters and the language.
-
-SERVANT.
-Ye say honestly, rest you merry!
-
-ROMEO.
-Stay, fellow; I can read.
-
- [_He reads the letter._]
-
-_Signior Martino and his wife and daughters;
-County Anselmo and his beauteous sisters;
-The lady widow of Utruvio;
-Signior Placentio and his lovely nieces;
-Mercutio and his brother Valentine;
-Mine uncle Capulet, his wife, and daughters;
-My fair niece Rosaline and Livia;
-Signior Valentio and his cousin Tybalt;
-Lucio and the lively Helena. _
-
-
-A fair assembly. [_Gives back the paper_] Whither should they come?
-
-SERVANT.
-Up.
-
-ROMEO.
-Whither to supper?
-
-SERVANT.
-To our house.
-
-ROMEO.
-Whose house?
-
-SERVANT.
-My master’s.
-
-ROMEO.
-Indeed I should have ask’d you that before.
-
-SERVANT.
-Now I’ll tell you without asking. My master is the great rich Capulet,
-and if you be not of the house of Montagues, I pray come and crush a
-cup of wine. Rest you merry.
-
- [_Exit._]
-
-BENVOLIO.
-At this same ancient feast of Capulet’s
-Sups the fair Rosaline whom thou so lov’st;
-With all the admired beauties of Verona.
-Go thither and with unattainted eye,
-Compare her face with some that I shall show,
-And I will make thee think thy swan a crow.
-
-ROMEO.
-When the devout religion of mine eye
-Maintains such falsehood, then turn tears to fire;
-And these who, often drown’d, could never die,
-Transparent heretics, be burnt for liars.
-One fairer than my love? The all-seeing sun
-Ne’er saw her match since first the world begun.
-
-BENVOLIO.
-Tut, you saw her fair, none else being by,
-Herself pois’d with herself in either eye:
-But in that crystal scales let there be weigh’d
-Your lady’s love against some other maid
-That I will show you shining at this feast,
-And she shall scant show well that now shows best.
-
-ROMEO.
-I’ll go along, no such sight to be shown,
-But to rejoice in splendour of my own.
-
- [_Exeunt._]
-
-SCENE III. Room in Capulet’s House.
-
- Enter Lady Capulet and Nurse.
-
-LADY CAPULET.
-Nurse, where’s my daughter? Call her forth to me.
-
-NURSE.
-Now, by my maidenhead, at twelve year old,
-I bade her come. What, lamb! What ladybird!
-God forbid! Where’s this girl? What, Juliet!
-
- Enter Juliet.
-
-JULIET.
-How now, who calls?
-
-NURSE.
-Your mother.
-
-JULIET.
-Madam, I am here. What is your will?
-
-LADY CAPULET.
-This is the matter. Nurse, give leave awhile,
-We must talk in secret. Nurse, come back again,
-I have remember’d me, thou’s hear our counsel.
-Thou knowest my daughter’s of a pretty age.
-
-NURSE.
-Faith, I can tell her age unto an hour.
-
-LADY CAPULET.
-She’s not fourteen.
-
-NURSE.
-I’ll lay fourteen of my teeth,
-And yet, to my teen be it spoken, I have but four,
-She is not fourteen. How long is it now
-To Lammas-tide?
-
-LADY CAPULET.
-A fortnight and odd days.
-
-NURSE.
-Even or odd, of all days in the year,
-Come Lammas Eve at night shall she be fourteen.
-Susan and she,—God rest all Christian souls!—
-Were of an age. Well, Susan is with God;
-She was too good for me. But as I said,
-On Lammas Eve at night shall she be fourteen;
-That shall she, marry; I remember it well.
-’Tis since the earthquake now eleven years;
-And she was wean’d,—I never shall forget it—,
-Of all the days of the year, upon that day:
-For I had then laid wormwood to my dug,
-Sitting in the sun under the dovehouse wall;
-My lord and you were then at Mantua:
-Nay, I do bear a brain. But as I said,
-When it did taste the wormwood on the nipple
-Of my dug and felt it bitter, pretty fool,
-To see it tetchy, and fall out with the dug!
-Shake, quoth the dovehouse: ’twas no need, I trow,
-To bid me trudge.
-And since that time it is eleven years;
-For then she could stand alone; nay, by th’rood
-She could have run and waddled all about;
-For even the day before she broke her brow,
-And then my husband,—God be with his soul!
-A was a merry man,—took up the child:
-‘Yea,’ quoth he, ‘dost thou fall upon thy face?
-Thou wilt fall backward when thou hast more wit;
-Wilt thou not, Jule?’ and, by my holidame,
-The pretty wretch left crying, and said ‘Ay’.
-To see now how a jest shall come about.
-I warrant, and I should live a thousand years,
-I never should forget it. ‘Wilt thou not, Jule?’ quoth he;
-And, pretty fool, it stinted, and said ‘Ay.’
-
-LADY CAPULET.
-Enough of this; I pray thee hold thy peace.
-
-NURSE.
-Yes, madam, yet I cannot choose but laugh,
-To think it should leave crying, and say ‘Ay’;
-And yet I warrant it had upon it brow
-A bump as big as a young cockerel’s stone;
-A perilous knock, and it cried bitterly.
-‘Yea,’ quoth my husband, ‘fall’st upon thy face?
-Thou wilt fall backward when thou comest to age;
-Wilt thou not, Jule?’ it stinted, and said ‘Ay’.
-
-JULIET.
-And stint thou too, I pray thee, Nurse, say I.
-
-NURSE.
-Peace, I have done. God mark thee to his grace
-Thou wast the prettiest babe that e’er I nurs’d:
-And I might live to see thee married once, I have my wish.
-
-LADY CAPULET.
-Marry, that marry is the very theme
-I came to talk of. Tell me, daughter Juliet,
-How stands your disposition to be married?
-
-JULIET.
-It is an honour that I dream not of.
-
-NURSE.
-An honour! Were not I thine only nurse,
-I would say thou hadst suck’d wisdom from thy teat.
-
-LADY CAPULET.
-Well, think of marriage now: younger than you,
-Here in Verona, ladies of esteem,
-Are made already mothers. By my count
-I was your mother much upon these years
-That you are now a maid. Thus, then, in brief;
-The valiant Paris seeks you for his love.
-
-NURSE.
-A man, young lady! Lady, such a man
-As all the world—why he’s a man of wax.
-
-LADY CAPULET.
-Verona’s summer hath not such a flower.
-
-NURSE.
-Nay, he’s a flower, in faith a very flower.
-
-LADY CAPULET.
-What say you, can you love the gentleman?
-This night you shall behold him at our feast;
-Read o’er the volume of young Paris’ face,
-And find delight writ there with beauty’s pen.
-Examine every married lineament,
-And see how one another lends content;
-And what obscur’d in this fair volume lies,
-Find written in the margent of his eyes.
-This precious book of love, this unbound lover,
-To beautify him, only lacks a cover:
-The fish lives in the sea; and ’tis much pride
-For fair without the fair within to hide.
-That book in many’s eyes doth share the glory,
-That in gold clasps locks in the golden story;
-So shall you share all that he doth possess,
-By having him, making yourself no less.
-
-NURSE.
-No less, nay bigger. Women grow by men.
-
-LADY CAPULET.
-Speak briefly, can you like of Paris’ love?
-
-JULIET.
-I’ll look to like, if looking liking move:
-But no more deep will I endart mine eye
-Than your consent gives strength to make it fly.
-
- Enter a Servant.
-
-SERVANT.
-Madam, the guests are come, supper served up, you called, my young lady
-asked for, the Nurse cursed in the pantry, and everything in extremity.
-I must hence to wait, I beseech you follow straight.
-
-LADY CAPULET.
-We follow thee.
-
- [_Exit Servant._]
-
-Juliet, the County stays.
-
-NURSE.
-Go, girl, seek happy nights to happy days.
-
- [_Exeunt._]
-
-SCENE IV. A Street.
-
- Enter Romeo, Mercutio, Benvolio, with five or six Maskers;
- Torch-bearers and others.
-
-ROMEO.
-What, shall this speech be spoke for our excuse?
-Or shall we on without apology?
-
-BENVOLIO.
-The date is out of such prolixity:
-We’ll have no Cupid hoodwink’d with a scarf,
-Bearing a Tartar’s painted bow of lath,
-Scaring the ladies like a crow-keeper;
-Nor no without-book prologue, faintly spoke
-After the prompter, for our entrance:
-But let them measure us by what they will,
-We’ll measure them a measure, and be gone.
-
-ROMEO.
-Give me a torch, I am not for this ambling;
-Being but heavy I will bear the light.
-
-MERCUTIO.
-Nay, gentle Romeo, we must have you dance.
-
-ROMEO.
-Not I, believe me, you have dancing shoes,
-With nimble soles, I have a soul of lead
-So stakes me to the ground I cannot move.
-
-MERCUTIO.
-You are a lover, borrow Cupid’s wings,
-And soar with them above a common bound.
-
-ROMEO.
-I am too sore enpierced with his shaft
-To soar with his light feathers, and so bound,
-I cannot bound a pitch above dull woe.
-Under love’s heavy burden do I sink.
-
-MERCUTIO.
-And, to sink in it, should you burden love;
-Too great oppression for a tender thing.
-
-ROMEO.
-Is love a tender thing? It is too rough,
-Too rude, too boisterous; and it pricks like thorn.
-
-MERCUTIO.
-If love be rough with you, be rough with love;
-Prick love for pricking, and you beat love down.
-Give me a case to put my visage in: [_Putting on a mask._]
-A visor for a visor. What care I
-What curious eye doth quote deformities?
-Here are the beetle-brows shall blush for me.
-
-BENVOLIO.
-Come, knock and enter; and no sooner in
-But every man betake him to his legs.
-
-ROMEO.
-A torch for me: let wantons, light of heart,
-Tickle the senseless rushes with their heels;
-For I am proverb’d with a grandsire phrase,
-I’ll be a candle-holder and look on,
-The game was ne’er so fair, and I am done.
-
-MERCUTIO.
-Tut, dun’s the mouse, the constable’s own word:
-If thou art dun, we’ll draw thee from the mire
-Or save your reverence love, wherein thou stickest
-Up to the ears. Come, we burn daylight, ho.
-
-ROMEO.
-Nay, that’s not so.
-
-MERCUTIO.
-I mean sir, in delay
-We waste our lights in vain, light lights by day.
-Take our good meaning, for our judgment sits
-Five times in that ere once in our five wits.
-
-ROMEO.
-And we mean well in going to this mask;
-But ’tis no wit to go.
-
-MERCUTIO.
-Why, may one ask?
-
-ROMEO.
-I dreamt a dream tonight.
-
-MERCUTIO.
-And so did I.
-
-ROMEO.
-Well what was yours?
-
-MERCUTIO.
-That dreamers often lie.
-
-ROMEO.
-In bed asleep, while they do dream things true.
-
-MERCUTIO.
-O, then, I see Queen Mab hath been with you.
-She is the fairies’ midwife, and she comes
-In shape no bigger than an agate-stone
-On the fore-finger of an alderman,
-Drawn with a team of little atomies
-Over men’s noses as they lie asleep:
-Her waggon-spokes made of long spinners’ legs;
-The cover, of the wings of grasshoppers;
-Her traces, of the smallest spider’s web;
-The collars, of the moonshine’s watery beams;
-Her whip of cricket’s bone; the lash, of film;
-Her waggoner, a small grey-coated gnat,
-Not half so big as a round little worm
-Prick’d from the lazy finger of a maid:
-Her chariot is an empty hazelnut,
-Made by the joiner squirrel or old grub,
-Time out o’ mind the fairies’ coachmakers.
-And in this state she gallops night by night
-Through lovers’ brains, and then they dream of love;
-O’er courtiers’ knees, that dream on curtsies straight;
-O’er lawyers’ fingers, who straight dream on fees;
-O’er ladies’ lips, who straight on kisses dream,
-Which oft the angry Mab with blisters plagues,
-Because their breaths with sweetmeats tainted are:
-Sometime she gallops o’er a courtier’s nose,
-And then dreams he of smelling out a suit;
-And sometime comes she with a tithe-pig’s tail,
-Tickling a parson’s nose as a lies asleep,
-Then dreams he of another benefice:
-Sometime she driveth o’er a soldier’s neck,
-And then dreams he of cutting foreign throats,
-Of breaches, ambuscados, Spanish blades,
-Of healths five fathom deep; and then anon
-Drums in his ear, at which he starts and wakes;
-And, being thus frighted, swears a prayer or two,
-And sleeps again. This is that very Mab
-That plats the manes of horses in the night;
-And bakes the elf-locks in foul sluttish hairs,
-Which, once untangled, much misfortune bodes:
-This is the hag, when maids lie on their backs,
-That presses them, and learns them first to bear,
-Making them women of good carriage:
-This is she,—
-
-ROMEO.
-Peace, peace, Mercutio, peace,
-Thou talk’st of nothing.
-
-MERCUTIO.
-True, I talk of dreams,
-Which are the children of an idle brain,
-Begot of nothing but vain fantasy,
-Which is as thin of substance as the air,
-And more inconstant than the wind, who woos
-Even now the frozen bosom of the north,
-And, being anger’d, puffs away from thence,
-Turning his side to the dew-dropping south.
-
-BENVOLIO.
-This wind you talk of blows us from ourselves:
-Supper is done, and we shall come too late.
-
-ROMEO.
-I fear too early: for my mind misgives
-Some consequence yet hanging in the stars,
-Shall bitterly begin his fearful date
-With this night’s revels; and expire the term
-Of a despised life, clos’d in my breast
-By some vile forfeit of untimely death.
-But he that hath the steerage of my course
-Direct my suit. On, lusty gentlemen!
-
-BENVOLIO.
-Strike, drum.
-
- [_Exeunt._]
-
-SCENE V. A Hall in Capulet’s House.
-
- Musicians waiting. Enter Servants.
-
-FIRST SERVANT.
-Where’s Potpan, that he helps not to take away?
-He shift a trencher! He scrape a trencher!
-
-SECOND SERVANT.
-When good manners shall lie all in one or two men’s hands, and they
-unwash’d too, ’tis a foul thing.
-
-FIRST SERVANT.
-Away with the join-stools, remove the court-cupboard, look to the
-plate. Good thou, save me a piece of marchpane; and as thou loves me,
-let the porter let in Susan Grindstone and Nell. Antony and Potpan!
-
-SECOND SERVANT.
-Ay, boy, ready.
-
-FIRST SERVANT.
-You are looked for and called for, asked for and sought for, in the
-great chamber.
-
-SECOND SERVANT.
-We cannot be here and there too. Cheerly, boys. Be brisk awhile, and
-the longer liver take all.
-
- [_Exeunt._]
-
- Enter Capulet, &c. with the Guests and Gentlewomen to the Maskers.
-
-CAPULET.
-Welcome, gentlemen, ladies that have their toes
-Unplagu’d with corns will have a bout with you.
-Ah my mistresses, which of you all
-Will now deny to dance? She that makes dainty,
-She I’ll swear hath corns. Am I come near ye now?
-Welcome, gentlemen! I have seen the day
-That I have worn a visor, and could tell
-A whispering tale in a fair lady’s ear,
-Such as would please; ’tis gone, ’tis gone, ’tis gone,
-You are welcome, gentlemen! Come, musicians, play.
-A hall, a hall, give room! And foot it, girls.
-
- [_Music plays, and they dance._]
-
-More light, you knaves; and turn the tables up,
-And quench the fire, the room is grown too hot.
-Ah sirrah, this unlook’d-for sport comes well.
-Nay sit, nay sit, good cousin Capulet,
-For you and I are past our dancing days;
-How long is’t now since last yourself and I
-Were in a mask?
-
-CAPULET’S COUSIN.
-By’r Lady, thirty years.
-
-CAPULET.
-What, man, ’tis not so much, ’tis not so much:
-’Tis since the nuptial of Lucentio,
-Come Pentecost as quickly as it will,
-Some five and twenty years; and then we mask’d.
-
-CAPULET’S COUSIN.
-’Tis more, ’tis more, his son is elder, sir;
-His son is thirty.
-
-CAPULET.
-Will you tell me that?
-His son was but a ward two years ago.
-
-ROMEO.
-What lady is that, which doth enrich the hand
-Of yonder knight?
-
-SERVANT.
-I know not, sir.
-
-ROMEO.
-O, she doth teach the torches to burn bright!
-It seems she hangs upon the cheek of night
-As a rich jewel in an Ethiop’s ear;
-Beauty too rich for use, for earth too dear!
-So shows a snowy dove trooping with crows
-As yonder lady o’er her fellows shows.
-The measure done, I’ll watch her place of stand,
-And touching hers, make blessed my rude hand.
-Did my heart love till now? Forswear it, sight!
-For I ne’er saw true beauty till this night.
-
-TYBALT.
-This by his voice, should be a Montague.
-Fetch me my rapier, boy. What, dares the slave
-Come hither, cover’d with an antic face,
-To fleer and scorn at our solemnity?
-Now by the stock and honour of my kin,
-To strike him dead I hold it not a sin.
-
-CAPULET.
-Why how now, kinsman!
-Wherefore storm you so?
-
-TYBALT.
-Uncle, this is a Montague, our foe;
-A villain that is hither come in spite,
-To scorn at our solemnity this night.
-
-CAPULET.
-Young Romeo, is it?
-
-TYBALT.
-’Tis he, that villain Romeo.
-
-CAPULET.
-Content thee, gentle coz, let him alone,
-A bears him like a portly gentleman;
-And, to say truth, Verona brags of him
-To be a virtuous and well-govern’d youth.
-I would not for the wealth of all the town
-Here in my house do him disparagement.
-Therefore be patient, take no note of him,
-It is my will; the which if thou respect,
-Show a fair presence and put off these frowns,
-An ill-beseeming semblance for a feast.
-
-TYBALT.
-It fits when such a villain is a guest:
-I’ll not endure him.
-
-CAPULET.
-He shall be endur’d.
-What, goodman boy! I say he shall, go to;
-Am I the master here, or you? Go to.
-You’ll not endure him! God shall mend my soul,
-You’ll make a mutiny among my guests!
-You will set cock-a-hoop, you’ll be the man!
-
-TYBALT.
-Why, uncle, ’tis a shame.
-
-CAPULET.
-Go to, go to!
-You are a saucy boy. Is’t so, indeed?
-This trick may chance to scathe you, I know what.
-You must contrary me! Marry, ’tis time.
-Well said, my hearts!—You are a princox; go:
-Be quiet, or—More light, more light!—For shame!
-I’ll make you quiet. What, cheerly, my hearts.
-
-TYBALT.
-Patience perforce with wilful choler meeting
-Makes my flesh tremble in their different greeting.
-I will withdraw: but this intrusion shall,
-Now seeming sweet, convert to bitter gall.
-
- [_Exit._]
-
-ROMEO.
-[_To Juliet._] If I profane with my unworthiest hand
-This holy shrine, the gentle sin is this,
-My lips, two blushing pilgrims, ready stand
-To smooth that rough touch with a tender kiss.
-
-JULIET.
-Good pilgrim, you do wrong your hand too much,
-Which mannerly devotion shows in this;
-For saints have hands that pilgrims’ hands do touch,
-And palm to palm is holy palmers’ kiss.
-
-ROMEO.
-Have not saints lips, and holy palmers too?
-
-JULIET.
-Ay, pilgrim, lips that they must use in prayer.
-
-ROMEO.
-O, then, dear saint, let lips do what hands do:
-They pray, grant thou, lest faith turn to despair.
-
-JULIET.
-Saints do not move, though grant for prayers’ sake.
-
-ROMEO.
-Then move not while my prayer’s effect I take.
-Thus from my lips, by thine my sin is purg’d.
-[_Kissing her._]
-
-JULIET.
-Then have my lips the sin that they have took.
-
-ROMEO.
-Sin from my lips? O trespass sweetly urg’d!
-Give me my sin again.
-
-JULIET.
-You kiss by the book.
-
-NURSE.
-Madam, your mother craves a word with you.
-
-ROMEO.
-What is her mother?
-
-NURSE.
-Marry, bachelor,
-Her mother is the lady of the house,
-And a good lady, and a wise and virtuous.
-I nurs’d her daughter that you talk’d withal.
-I tell you, he that can lay hold of her
-Shall have the chinks.
-
-ROMEO.
-Is she a Capulet?
-O dear account! My life is my foe’s debt.
-
-BENVOLIO.
-Away, be gone; the sport is at the best.
-
-ROMEO.
-Ay, so I fear; the more is my unrest.
-
-CAPULET.
-Nay, gentlemen, prepare not to be gone,
-We have a trifling foolish banquet towards.
-Is it e’en so? Why then, I thank you all;
-I thank you, honest gentlemen; good night.
-More torches here! Come on then, let’s to bed.
-Ah, sirrah, by my fay, it waxes late,
-I’ll to my rest.
-
- [_Exeunt all but Juliet and Nurse._]
-
-JULIET.
-Come hither, Nurse. What is yond gentleman?
-
-NURSE.
-The son and heir of old Tiberio.
-
-JULIET.
-What’s he that now is going out of door?
-
-NURSE.
-Marry, that I think be young Petruchio.
-
-JULIET.
-What’s he that follows here, that would not dance?
-
-NURSE.
-I know not.
-
-JULIET.
-Go ask his name. If he be married,
-My grave is like to be my wedding bed.
-
-NURSE.
-His name is Romeo, and a Montague,
-The only son of your great enemy.
-
-JULIET.
-My only love sprung from my only hate!
-Too early seen unknown, and known too late!
-Prodigious birth of love it is to me,
-That I must love a loathed enemy.
-
-NURSE.
-What’s this? What’s this?
-
-JULIET.
-A rhyme I learn’d even now
-Of one I danc’d withal.
-
- [_One calls within, ‘Juliet’._]
-
-NURSE.
-Anon, anon!
-Come let’s away, the strangers all are gone.
-
- [_Exeunt._]
-
-
-
-
-ACT II
-
-
- Enter Chorus.
-
-CHORUS.
-Now old desire doth in his deathbed lie,
-And young affection gapes to be his heir;
-That fair for which love groan’d for and would die,
-With tender Juliet match’d, is now not fair.
-Now Romeo is belov’d, and loves again,
-Alike bewitched by the charm of looks;
-But to his foe suppos’d he must complain,
-And she steal love’s sweet bait from fearful hooks:
-Being held a foe, he may not have access
-To breathe such vows as lovers use to swear;
-And she as much in love, her means much less
-To meet her new beloved anywhere.
-But passion lends them power, time means, to meet,
-Tempering extremities with extreme sweet.
-
- [_Exit._]
-
-SCENE I. An open place adjoining Capulet’s Garden.
-
- Enter Romeo.
-
-ROMEO.
-Can I go forward when my heart is here?
-Turn back, dull earth, and find thy centre out.
-
- [_He climbs the wall and leaps down within it._]
-
- Enter Benvolio and Mercutio.
-
-BENVOLIO.
-Romeo! My cousin Romeo! Romeo!
-
-MERCUTIO.
-He is wise,
-And on my life hath stol’n him home to bed.
-
-BENVOLIO.
-He ran this way, and leap’d this orchard wall:
-Call, good Mercutio.
-
-MERCUTIO.
-Nay, I’ll conjure too.
-Romeo! Humours! Madman! Passion! Lover!
-Appear thou in the likeness of a sigh,
-Speak but one rhyme, and I am satisfied;
-Cry but ‘Ah me!’ Pronounce but Love and dove;
-Speak to my gossip Venus one fair word,
-One nickname for her purblind son and heir,
-Young Abraham Cupid, he that shot so trim
-When King Cophetua lov’d the beggar-maid.
-He heareth not, he stirreth not, he moveth not;
-The ape is dead, and I must conjure him.
-I conjure thee by Rosaline’s bright eyes,
-By her high forehead and her scarlet lip,
-By her fine foot, straight leg, and quivering thigh,
-And the demesnes that there adjacent lie,
-That in thy likeness thou appear to us.
-
-BENVOLIO.
-An if he hear thee, thou wilt anger him.
-
-MERCUTIO.
-This cannot anger him. ’Twould anger him
-To raise a spirit in his mistress’ circle,
-Of some strange nature, letting it there stand
-Till she had laid it, and conjur’d it down;
-That were some spite. My invocation
-Is fair and honest, and, in his mistress’ name,
-I conjure only but to raise up him.
-
-BENVOLIO.
-Come, he hath hid himself among these trees
-To be consorted with the humorous night.
-Blind is his love, and best befits the dark.
-
-MERCUTIO.
-If love be blind, love cannot hit the mark.
-Now will he sit under a medlar tree,
-And wish his mistress were that kind of fruit
-As maids call medlars when they laugh alone.
-O Romeo, that she were, O that she were
-An open-arse and thou a poperin pear!
-Romeo, good night. I’ll to my truckle-bed.
-This field-bed is too cold for me to sleep.
-Come, shall we go?
-
-BENVOLIO.
-Go then; for ’tis in vain
-To seek him here that means not to be found.
-
- [_Exeunt._]
-
-SCENE II. Capulet’s Garden.
-
- Enter Romeo.
-
-ROMEO.
-He jests at scars that never felt a wound.
-
- Juliet appears above at a window.
-
-But soft, what light through yonder window breaks?
-It is the east, and Juliet is the sun!
-Arise fair sun and kill the envious moon,
-Who is already sick and pale with grief,
-That thou her maid art far more fair than she.
-Be not her maid since she is envious;
-Her vestal livery is but sick and green,
-And none but fools do wear it; cast it off.
-It is my lady, O it is my love!
-O, that she knew she were!
-She speaks, yet she says nothing. What of that?
-Her eye discourses, I will answer it.
-I am too bold, ’tis not to me she speaks.
-Two of the fairest stars in all the heaven,
-Having some business, do entreat her eyes
-To twinkle in their spheres till they return.
-What if her eyes were there, they in her head?
-The brightness of her cheek would shame those stars,
-As daylight doth a lamp; her eyes in heaven
-Would through the airy region stream so bright
-That birds would sing and think it were not night.
-See how she leans her cheek upon her hand.
-O that I were a glove upon that hand,
-That I might touch that cheek.
-
-JULIET.
-Ay me.
-
-ROMEO.
-She speaks.
-O speak again bright angel, for thou art
-As glorious to this night, being o’er my head,
-As is a winged messenger of heaven
-Unto the white-upturned wondering eyes
-Of mortals that fall back to gaze on him
-When he bestrides the lazy-puffing clouds
-And sails upon the bosom of the air.
-
-JULIET.
-O Romeo, Romeo, wherefore art thou Romeo?
-Deny thy father and refuse thy name.
-Or if thou wilt not, be but sworn my love,
-And I’ll no longer be a Capulet.
-
-ROMEO.
-[_Aside._] Shall I hear more, or shall I speak at this?
-
-JULIET.
-’Tis but thy name that is my enemy;
-Thou art thyself, though not a Montague.
-What’s Montague? It is nor hand nor foot,
-Nor arm, nor face, nor any other part
-Belonging to a man. O be some other name.
-What’s in a name? That which we call a rose
-By any other name would smell as sweet;
-So Romeo would, were he not Romeo call’d,
-Retain that dear perfection which he owes
-Without that title. Romeo, doff thy name,
-And for thy name, which is no part of thee,
-Take all myself.
-
-ROMEO.
-I take thee at thy word.
-Call me but love, and I’ll be new baptis’d;
-Henceforth I never will be Romeo.
-
-JULIET.
-What man art thou that, thus bescreen’d in night
-So stumblest on my counsel?
-
-ROMEO.
-By a name
-I know not how to tell thee who I am:
-My name, dear saint, is hateful to myself,
-Because it is an enemy to thee.
-Had I it written, I would tear the word.
-
-JULIET.
-My ears have yet not drunk a hundred words
-Of thy tongue’s utterance, yet I know the sound.
-Art thou not Romeo, and a Montague?
-
-ROMEO.
-Neither, fair maid, if either thee dislike.
-
-JULIET.
-How cam’st thou hither, tell me, and wherefore?
-The orchard walls are high and hard to climb,
-And the place death, considering who thou art,
-If any of my kinsmen find thee here.
-
-ROMEO.
-With love’s light wings did I o’erperch these walls,
-For stony limits cannot hold love out,
-And what love can do, that dares love attempt:
-Therefore thy kinsmen are no stop to me.
-
-JULIET.
-If they do see thee, they will murder thee.
-
-ROMEO.
-Alack, there lies more peril in thine eye
-Than twenty of their swords. Look thou but sweet,
-And I am proof against their enmity.
-
-JULIET.
-I would not for the world they saw thee here.
-
-ROMEO.
-I have night’s cloak to hide me from their eyes,
-And but thou love me, let them find me here.
-My life were better ended by their hate
-Than death prorogued, wanting of thy love.
-
-JULIET.
-By whose direction found’st thou out this place?
-
-ROMEO.
-By love, that first did prompt me to enquire;
-He lent me counsel, and I lent him eyes.
-I am no pilot; yet wert thou as far
-As that vast shore wash’d with the farthest sea,
-I should adventure for such merchandise.
-
-JULIET.
-Thou knowest the mask of night is on my face,
-Else would a maiden blush bepaint my cheek
-For that which thou hast heard me speak tonight.
-Fain would I dwell on form, fain, fain deny
-What I have spoke; but farewell compliment.
-Dost thou love me? I know thou wilt say Ay,
-And I will take thy word. Yet, if thou swear’st,
-Thou mayst prove false. At lovers’ perjuries,
-They say Jove laughs. O gentle Romeo,
-If thou dost love, pronounce it faithfully.
-Or if thou thinkest I am too quickly won,
-I’ll frown and be perverse, and say thee nay,
-So thou wilt woo. But else, not for the world.
-In truth, fair Montague, I am too fond;
-And therefore thou mayst think my ’haviour light:
-But trust me, gentleman, I’ll prove more true
-Than those that have more cunning to be strange.
-I should have been more strange, I must confess,
-But that thou overheard’st, ere I was ’ware,
-My true-love passion; therefore pardon me,
-And not impute this yielding to light love,
-Which the dark night hath so discovered.
-
-ROMEO.
-Lady, by yonder blessed moon I vow,
-That tips with silver all these fruit-tree tops,—
-
-JULIET.
-O swear not by the moon, th’inconstant moon,
-That monthly changes in her circled orb,
-Lest that thy love prove likewise variable.
-
-ROMEO.
-What shall I swear by?
-
-JULIET.
-Do not swear at all.
-Or if thou wilt, swear by thy gracious self,
-Which is the god of my idolatry,
-And I’ll believe thee.
-
-ROMEO.
-If my heart’s dear love,—
-
-JULIET.
-Well, do not swear. Although I joy in thee,
-I have no joy of this contract tonight;
-It is too rash, too unadvis’d, too sudden,
-Too like the lightning, which doth cease to be
-Ere one can say “It lightens.” Sweet, good night.
-This bud of love, by summer’s ripening breath,
-May prove a beauteous flower when next we meet.
-Good night, good night. As sweet repose and rest
-Come to thy heart as that within my breast.
-
-ROMEO.
-O wilt thou leave me so unsatisfied?
-
-JULIET.
-What satisfaction canst thou have tonight?
-
-ROMEO.
-Th’exchange of thy love’s faithful vow for mine.
-
-JULIET.
-I gave thee mine before thou didst request it;
-And yet I would it were to give again.
-
-ROMEO.
-Would’st thou withdraw it? For what purpose, love?
-
-JULIET.
-But to be frank and give it thee again.
-And yet I wish but for the thing I have;
-My bounty is as boundless as the sea,
-My love as deep; the more I give to thee,
-The more I have, for both are infinite.
-I hear some noise within. Dear love, adieu.
-[_Nurse calls within._]
-Anon, good Nurse!—Sweet Montague be true.
-Stay but a little, I will come again.
-
- [_Exit._]
-
-ROMEO.
-O blessed, blessed night. I am afeard,
-Being in night, all this is but a dream,
-Too flattering sweet to be substantial.
-
- Enter Juliet above.
-
-JULIET.
-Three words, dear Romeo, and good night indeed.
-If that thy bent of love be honourable,
-Thy purpose marriage, send me word tomorrow,
-By one that I’ll procure to come to thee,
-Where and what time thou wilt perform the rite,
-And all my fortunes at thy foot I’ll lay
-And follow thee my lord throughout the world.
-
-NURSE.
-[_Within._] Madam.
-
-JULIET.
-I come, anon.— But if thou meanest not well,
-I do beseech thee,—
-
-NURSE.
-[_Within._] Madam.
-
-JULIET.
-By and by I come—
-To cease thy strife and leave me to my grief.
-Tomorrow will I send.
-
-ROMEO.
-So thrive my soul,—
-
-JULIET.
-A thousand times good night.
-
- [_Exit._]
-
-ROMEO.
-A thousand times the worse, to want thy light.
-Love goes toward love as schoolboys from their books,
-But love from love, towards school with heavy looks.
-
- [_Retiring slowly._]
-
- Re-enter Juliet, above.
-
-JULIET.
-Hist! Romeo, hist! O for a falconer’s voice
-To lure this tassel-gentle back again.
-Bondage is hoarse and may not speak aloud,
-Else would I tear the cave where Echo lies,
-And make her airy tongue more hoarse than mine
-With repetition of my Romeo’s name.
-
-ROMEO.
-It is my soul that calls upon my name.
-How silver-sweet sound lovers’ tongues by night,
-Like softest music to attending ears.
-
-JULIET.
-Romeo.
-
-ROMEO.
-My dear?
-
-JULIET.
-What o’clock tomorrow
-Shall I send to thee?
-
-ROMEO.
-By the hour of nine.
-
-JULIET.
-I will not fail. ’Tis twenty years till then.
-I have forgot why I did call thee back.
-
-ROMEO.
-Let me stand here till thou remember it.
-
-JULIET.
-I shall forget, to have thee still stand there,
-Remembering how I love thy company.
-
-ROMEO.
-And I’ll still stay, to have thee still forget,
-Forgetting any other home but this.
-
-JULIET.
-’Tis almost morning; I would have thee gone,
-And yet no farther than a wanton’s bird,
-That lets it hop a little from her hand,
-Like a poor prisoner in his twisted gyves,
-And with a silk thread plucks it back again,
-So loving-jealous of his liberty.
-
-ROMEO.
-I would I were thy bird.
-
-JULIET.
-Sweet, so would I:
-Yet I should kill thee with much cherishing.
-Good night, good night. Parting is such sweet sorrow
-That I shall say good night till it be morrow.
-
- [_Exit._]
-
-ROMEO.
-Sleep dwell upon thine eyes, peace in thy breast.
-Would I were sleep and peace, so sweet to rest.
-Hence will I to my ghostly Sire’s cell,
-His help to crave and my dear hap to tell.
-
- [_Exit._]
-
-SCENE III. Friar Lawrence’s Cell.
-
- Enter Friar Lawrence with a basket.
-
-FRIAR LAWRENCE.
-The grey-ey’d morn smiles on the frowning night,
-Chequering the eastern clouds with streaks of light;
-And fleckled darkness like a drunkard reels
-From forth day’s pathway, made by Titan’s fiery wheels
-Now, ere the sun advance his burning eye,
-The day to cheer, and night’s dank dew to dry,
-I must upfill this osier cage of ours
-With baleful weeds and precious-juiced flowers.
-The earth that’s nature’s mother, is her tomb;
-What is her burying grave, that is her womb:
-And from her womb children of divers kind
-We sucking on her natural bosom find.
-Many for many virtues excellent,
-None but for some, and yet all different.
-O, mickle is the powerful grace that lies
-In plants, herbs, stones, and their true qualities.
-For naught so vile that on the earth doth live
-But to the earth some special good doth give;
-Nor aught so good but, strain’d from that fair use,
-Revolts from true birth, stumbling on abuse.
-Virtue itself turns vice being misapplied,
-And vice sometime’s by action dignified.
-
- Enter Romeo.
-
-Within the infant rind of this weak flower
-Poison hath residence, and medicine power:
-For this, being smelt, with that part cheers each part;
-Being tasted, slays all senses with the heart.
-Two such opposed kings encamp them still
-In man as well as herbs,—grace and rude will;
-And where the worser is predominant,
-Full soon the canker death eats up that plant.
-
-ROMEO.
-Good morrow, father.
-
-FRIAR LAWRENCE.
-Benedicite!
-What early tongue so sweet saluteth me?
-Young son, it argues a distemper’d head
-So soon to bid good morrow to thy bed.
-Care keeps his watch in every old man’s eye,
-And where care lodges sleep will never lie;
-But where unbruised youth with unstuff’d brain
-Doth couch his limbs, there golden sleep doth reign.
-Therefore thy earliness doth me assure
-Thou art uprous’d with some distemperature;
-Or if not so, then here I hit it right,
-Our Romeo hath not been in bed tonight.
-
-ROMEO.
-That last is true; the sweeter rest was mine.
-
-FRIAR LAWRENCE.
-God pardon sin. Wast thou with Rosaline?
-
-ROMEO.
-With Rosaline, my ghostly father? No.
-I have forgot that name, and that name’s woe.
-
-FRIAR LAWRENCE.
-That’s my good son. But where hast thou been then?
-
-ROMEO.
-I’ll tell thee ere thou ask it me again.
-I have been feasting with mine enemy,
-Where on a sudden one hath wounded me
-That’s by me wounded. Both our remedies
-Within thy help and holy physic lies.
-I bear no hatred, blessed man; for lo,
-My intercession likewise steads my foe.
-
-FRIAR LAWRENCE.
-Be plain, good son, and homely in thy drift;
-Riddling confession finds but riddling shrift.
-
-ROMEO.
-Then plainly know my heart’s dear love is set
-On the fair daughter of rich Capulet.
-As mine on hers, so hers is set on mine;
-And all combin’d, save what thou must combine
-By holy marriage. When, and where, and how
-We met, we woo’d, and made exchange of vow,
-I’ll tell thee as we pass; but this I pray,
-That thou consent to marry us today.
-
-FRIAR LAWRENCE.
-Holy Saint Francis! What a change is here!
-Is Rosaline, that thou didst love so dear,
-So soon forsaken? Young men’s love then lies
-Not truly in their hearts, but in their eyes.
-Jesu Maria, what a deal of brine
-Hath wash’d thy sallow cheeks for Rosaline!
-How much salt water thrown away in waste,
-To season love, that of it doth not taste.
-The sun not yet thy sighs from heaven clears,
-Thy old groans yet ring in mine ancient ears.
-Lo here upon thy cheek the stain doth sit
-Of an old tear that is not wash’d off yet.
-If ere thou wast thyself, and these woes thine,
-Thou and these woes were all for Rosaline,
-And art thou chang’d? Pronounce this sentence then,
-Women may fall, when there’s no strength in men.
-
-ROMEO.
-Thou chidd’st me oft for loving Rosaline.
-
-FRIAR LAWRENCE.
-For doting, not for loving, pupil mine.
-
-ROMEO.
-And bad’st me bury love.
-
-FRIAR LAWRENCE.
-Not in a grave
-To lay one in, another out to have.
-
-ROMEO.
-I pray thee chide me not, her I love now
-Doth grace for grace and love for love allow.
-The other did not so.
-
-FRIAR LAWRENCE.
-O, she knew well
-Thy love did read by rote, that could not spell.
-But come young waverer, come go with me,
-In one respect I’ll thy assistant be;
-For this alliance may so happy prove,
-To turn your households’ rancour to pure love.
-
-ROMEO.
-O let us hence; I stand on sudden haste.
-
-FRIAR LAWRENCE.
-Wisely and slow; they stumble that run fast.
-
- [_Exeunt._]
-
-SCENE IV. A Street.
-
- Enter Benvolio and Mercutio.
-
-MERCUTIO.
-Where the devil should this Romeo be? Came he not home tonight?
-
-BENVOLIO.
-Not to his father’s; I spoke with his man.
-
-MERCUTIO.
-Why, that same pale hard-hearted wench, that Rosaline, torments him so
-that he will sure run mad.
-
-BENVOLIO.
-Tybalt, the kinsman to old Capulet, hath sent a letter to his father’s
-house.
-
-MERCUTIO.
-A challenge, on my life.
-
-BENVOLIO.
-Romeo will answer it.
-
-MERCUTIO.
-Any man that can write may answer a letter.
-
-BENVOLIO.
-Nay, he will answer the letter’s master, how he dares, being dared.
-
-MERCUTIO.
-Alas poor Romeo, he is already dead, stabbed with a white wench’s black
-eye; run through the ear with a love song, the very pin of his heart
-cleft with the blind bow-boy’s butt-shaft. And is he a man to encounter
-Tybalt?
-
-BENVOLIO.
-Why, what is Tybalt?
-
-MERCUTIO.
-More than Prince of cats. O, he’s the courageous captain of
-compliments. He fights as you sing prick-song, keeps time, distance,
-and proportion. He rests his minim rest, one, two, and the third in
-your bosom: the very butcher of a silk button, a duellist, a duellist;
-a gentleman of the very first house, of the first and second cause. Ah,
-the immortal passado, the punto reverso, the hay.
-
-BENVOLIO.
-The what?
-
-MERCUTIO.
-The pox of such antic lisping, affecting phantasies; these new tuners
-of accent. By Jesu, a very good blade, a very tall man, a very good
-whore. Why, is not this a lamentable thing, grandsire, that we should
-be thus afflicted with these strange flies, these fashion-mongers,
-these pardon-me’s, who stand so much on the new form that they cannot
-sit at ease on the old bench? O their bones, their bones!
-
- Enter Romeo.
-
-BENVOLIO.
-Here comes Romeo, here comes Romeo!
-
-MERCUTIO.
-Without his roe, like a dried herring. O flesh, flesh, how art thou
-fishified! Now is he for the numbers that Petrarch flowed in. Laura, to
-his lady, was but a kitchen wench,—marry, she had a better love to
-berhyme her: Dido a dowdy; Cleopatra a gypsy; Helen and Hero hildings
-and harlots; Thisbe a grey eye or so, but not to the purpose. Signior
-Romeo, bonjour! There’s a French salutation to your French slop. You
-gave us the counterfeit fairly last night.
-
-ROMEO.
-Good morrow to you both. What counterfeit did I give you?
-
-MERCUTIO.
-The slip sir, the slip; can you not conceive?
-
-ROMEO.
-Pardon, good Mercutio, my business was great, and in such a case as
-mine a man may strain courtesy.
-
-MERCUTIO.
-That’s as much as to say, such a case as yours constrains a man to bow
-in the hams.
-
-ROMEO.
-Meaning, to curtsy.
-
-MERCUTIO.
-Thou hast most kindly hit it.
-
-ROMEO.
-A most courteous exposition.
-
-MERCUTIO.
-Nay, I am the very pink of courtesy.
-
-ROMEO.
-Pink for flower.
-
-MERCUTIO.
-Right.
-
-ROMEO.
-Why, then is my pump well flowered.
-
-MERCUTIO.
-Sure wit, follow me this jest now, till thou hast worn out thy pump,
-that when the single sole of it is worn, the jest may remain after the
-wearing, solely singular.
-
-ROMEO.
-O single-soled jest, solely singular for the singleness!
-
-MERCUTIO.
-Come between us, good Benvolio; my wits faint.
-
-ROMEO.
-Swits and spurs, swits and spurs; or I’ll cry a match.
-
-MERCUTIO.
-Nay, if thy wits run the wild-goose chase, I am done. For thou hast
-more of the wild-goose in one of thy wits, than I am sure, I have in my
-whole five. Was I with you there for the goose?
-
-ROMEO.
-Thou wast never with me for anything, when thou wast not there for the
-goose.
-
-MERCUTIO.
-I will bite thee by the ear for that jest.
-
-ROMEO.
-Nay, good goose, bite not.
-
-MERCUTIO.
-Thy wit is a very bitter sweeting, it is a most sharp sauce.
-
-ROMEO.
-And is it not then well served in to a sweet goose?
-
-MERCUTIO.
-O here’s a wit of cheveril, that stretches from an inch narrow to an
-ell broad.
-
-ROMEO.
-I stretch it out for that word broad, which added to the goose, proves
-thee far and wide a broad goose.
-
-MERCUTIO.
-Why, is not this better now than groaning for love? Now art thou
-sociable, now art thou Romeo; now art thou what thou art, by art as
-well as by nature. For this drivelling love is like a great natural,
-that runs lolling up and down to hide his bauble in a hole.
-
-BENVOLIO.
-Stop there, stop there.
-
-MERCUTIO.
-Thou desirest me to stop in my tale against the hair.
-
-BENVOLIO.
-Thou wouldst else have made thy tale large.
-
-MERCUTIO.
-O, thou art deceived; I would have made it short, for I was come to the
-whole depth of my tale, and meant indeed to occupy the argument no
-longer.
-
- Enter Nurse and Peter.
-
-ROMEO.
-Here’s goodly gear!
-A sail, a sail!
-
-MERCUTIO.
-Two, two; a shirt and a smock.
-
-NURSE.
-Peter!
-
-PETER.
-Anon.
-
-NURSE.
-My fan, Peter.
-
-MERCUTIO.
-Good Peter, to hide her face; for her fan’s the fairer face.
-
-NURSE.
-God ye good morrow, gentlemen.
-
-MERCUTIO.
-God ye good-den, fair gentlewoman.
-
-NURSE.
-Is it good-den?
-
-MERCUTIO.
-’Tis no less, I tell ye; for the bawdy hand of the dial is now upon the
-prick of noon.
-
-NURSE.
-Out upon you! What a man are you?
-
-ROMEO.
-One, gentlewoman, that God hath made for himself to mar.
-
-NURSE.
-By my troth, it is well said; for himself to mar, quoth a? Gentlemen,
-can any of you tell me where I may find the young Romeo?
-
-ROMEO.
-I can tell you: but young Romeo will be older when you have found him
-than he was when you sought him. I am the youngest of that name, for
-fault of a worse.
-
-NURSE.
-You say well.
-
-MERCUTIO.
-Yea, is the worst well? Very well took, i’faith; wisely, wisely.
-
-NURSE.
-If you be he, sir, I desire some confidence with you.
-
-BENVOLIO.
-She will endite him to some supper.
-
-MERCUTIO.
-A bawd, a bawd, a bawd! So ho!
-
-ROMEO.
-What hast thou found?
-
-MERCUTIO.
-No hare, sir; unless a hare, sir, in a lenten pie, that is something
-stale and hoar ere it be spent.
-[_Sings._]
-    An old hare hoar,
-    And an old hare hoar,
-  Is very good meat in Lent;
-    But a hare that is hoar
-    Is too much for a score
-  When it hoars ere it be spent.
-Romeo, will you come to your father’s? We’ll to dinner thither.
-
-ROMEO.
-I will follow you.
-
-MERCUTIO.
-Farewell, ancient lady; farewell, lady, lady, lady.
-
- [_Exeunt Mercutio and Benvolio._]
-
-NURSE.
-I pray you, sir, what saucy merchant was this that was so full of his
-ropery?
-
-ROMEO.
-A gentleman, Nurse, that loves to hear himself talk, and will speak
-more in a minute than he will stand to in a month.
-
-NURSE.
-And a speak anything against me, I’ll take him down, and a were lustier
-than he is, and twenty such Jacks. And if I cannot, I’ll find those
-that shall. Scurvy knave! I am none of his flirt-gills; I am none of
-his skains-mates.—And thou must stand by too and suffer every knave to
-use me at his pleasure!
-
-PETER.
-I saw no man use you at his pleasure; if I had, my weapon should
-quickly have been out. I warrant you, I dare draw as soon as another
-man, if I see occasion in a good quarrel, and the law on my side.
-
-NURSE.
-Now, afore God, I am so vexed that every part about me quivers. Scurvy
-knave. Pray you, sir, a word: and as I told you, my young lady bid me
-enquire you out; what she bade me say, I will keep to myself. But first
-let me tell ye, if ye should lead her in a fool’s paradise, as they
-say, it were a very gross kind of behaviour, as they say; for the
-gentlewoman is young. And therefore, if you should deal double with
-her, truly it were an ill thing to be offered to any gentlewoman, and
-very weak dealing.
-
-ROMEO. Nurse, commend me to thy lady and mistress. I protest unto
-thee,—
-
-NURSE.
-Good heart, and i’faith I will tell her as much. Lord, Lord, she will
-be a joyful woman.
-
-ROMEO.
-What wilt thou tell her, Nurse? Thou dost not mark me.
-
-NURSE.
-I will tell her, sir, that you do protest, which, as I take it, is a
-gentlemanlike offer.
-
-ROMEO.
-Bid her devise
-Some means to come to shrift this afternoon,
-And there she shall at Friar Lawrence’ cell
-Be shriv’d and married. Here is for thy pains.
-
-NURSE.
-No truly, sir; not a penny.
-
-ROMEO.
-Go to; I say you shall.
-
-NURSE.
-This afternoon, sir? Well, she shall be there.
-
-ROMEO.
-And stay, good Nurse, behind the abbey wall.
-Within this hour my man shall be with thee,
-And bring thee cords made like a tackled stair,
-Which to the high topgallant of my joy
-Must be my convoy in the secret night.
-Farewell, be trusty, and I’ll quit thy pains;
-Farewell; commend me to thy mistress.
-
-NURSE.
-Now God in heaven bless thee. Hark you, sir.
-
-ROMEO.
-What say’st thou, my dear Nurse?
-
-NURSE.
-Is your man secret? Did you ne’er hear say,
-Two may keep counsel, putting one away?
-
-ROMEO.
-I warrant thee my man’s as true as steel.
-
-NURSE.
-Well, sir, my mistress is the sweetest lady. Lord, Lord! When ’twas a
-little prating thing,—O, there is a nobleman in town, one Paris, that
-would fain lay knife aboard; but she, good soul, had as lief see a
-toad, a very toad, as see him. I anger her sometimes, and tell her that
-Paris is the properer man, but I’ll warrant you, when I say so, she
-looks as pale as any clout in the versal world. Doth not rosemary and
-Romeo begin both with a letter?
-
-ROMEO.
-Ay, Nurse; what of that? Both with an R.
-
-NURSE.
-Ah, mocker! That’s the dog’s name. R is for the—no, I know it begins
-with some other letter, and she hath the prettiest sententious of it,
-of you and rosemary, that it would do you good to hear it.
-
-ROMEO.
-Commend me to thy lady.
-
-NURSE.
-Ay, a thousand times. Peter!
-
- [_Exit Romeo._]
-
-PETER.
-Anon.
-
-NURSE.
-Before and apace.
-
- [_Exeunt._]
-
-SCENE V. Capulet’s Garden.
-
- Enter Juliet.
-
-JULIET.
-The clock struck nine when I did send the Nurse,
-In half an hour she promised to return.
-Perchance she cannot meet him. That’s not so.
-O, she is lame. Love’s heralds should be thoughts,
-Which ten times faster glides than the sun’s beams,
-Driving back shadows over lowering hills:
-Therefore do nimble-pinion’d doves draw love,
-And therefore hath the wind-swift Cupid wings.
-Now is the sun upon the highmost hill
-Of this day’s journey, and from nine till twelve
-Is three long hours, yet she is not come.
-Had she affections and warm youthful blood,
-She’d be as swift in motion as a ball;
-My words would bandy her to my sweet love,
-And his to me.
-But old folks, many feign as they were dead;
-Unwieldy, slow, heavy and pale as lead.
-
- Enter Nurse and Peter.
-
-O God, she comes. O honey Nurse, what news?
-Hast thou met with him? Send thy man away.
-
-NURSE.
-Peter, stay at the gate.
-
- [_Exit Peter._]
-
-JULIET.
-Now, good sweet Nurse,—O Lord, why look’st thou sad?
-Though news be sad, yet tell them merrily;
-If good, thou sham’st the music of sweet news
-By playing it to me with so sour a face.
-
-NURSE.
-I am aweary, give me leave awhile;
-Fie, how my bones ache! What a jaunt have I had!
-
-JULIET.
-I would thou hadst my bones, and I thy news:
-Nay come, I pray thee speak; good, good Nurse, speak.
-
-NURSE.
-Jesu, what haste? Can you not stay a while? Do you not see that I am
-out of breath?
-
-JULIET.
-How art thou out of breath, when thou hast breath
-To say to me that thou art out of breath?
-The excuse that thou dost make in this delay
-Is longer than the tale thou dost excuse.
-Is thy news good or bad? Answer to that;
-Say either, and I’ll stay the circumstance.
-Let me be satisfied, is’t good or bad?
-
-NURSE.
-Well, you have made a simple choice; you know not how to choose a man.
-Romeo? No, not he. Though his face be better than any man’s, yet his
-leg excels all men’s, and for a hand and a foot, and a body, though
-they be not to be talked on, yet they are past compare. He is not the
-flower of courtesy, but I’ll warrant him as gentle as a lamb. Go thy
-ways, wench, serve God. What, have you dined at home?
-
-JULIET.
-No, no. But all this did I know before.
-What says he of our marriage? What of that?
-
-NURSE.
-Lord, how my head aches! What a head have I!
-It beats as it would fall in twenty pieces.
-My back o’ t’other side,—O my back, my back!
-Beshrew your heart for sending me about
-To catch my death with jauncing up and down.
-
-JULIET.
-I’faith, I am sorry that thou art not well.
-Sweet, sweet, sweet Nurse, tell me, what says my love?
-
-NURSE.
-Your love says like an honest gentleman,
-And a courteous, and a kind, and a handsome,
-And I warrant a virtuous,—Where is your mother?
-
-JULIET.
-Where is my mother? Why, she is within.
-Where should she be? How oddly thou repliest.
-‘Your love says, like an honest gentleman,
-‘Where is your mother?’
-
-NURSE.
-O God’s lady dear,
-Are you so hot? Marry, come up, I trow.
-Is this the poultice for my aching bones?
-Henceforward do your messages yourself.
-
-JULIET.
-Here’s such a coil. Come, what says Romeo?
-
-NURSE.
-Have you got leave to go to shrift today?
-
-JULIET.
-I have.
-
-NURSE.
-Then hie you hence to Friar Lawrence’ cell;
-There stays a husband to make you a wife.
-Now comes the wanton blood up in your cheeks,
-They’ll be in scarlet straight at any news.
-Hie you to church. I must another way,
-To fetch a ladder by the which your love
-Must climb a bird’s nest soon when it is dark.
-I am the drudge, and toil in your delight;
-But you shall bear the burden soon at night.
-Go. I’ll to dinner; hie you to the cell.
-
-JULIET.
-Hie to high fortune! Honest Nurse, farewell.
-
- [_Exeunt._]
-
-SCENE VI. Friar Lawrence’s Cell.
-
- Enter Friar Lawrence and Romeo.
-
-FRIAR LAWRENCE.
-So smile the heavens upon this holy act
-That after-hours with sorrow chide us not.
-
-ROMEO.
-Amen, amen, but come what sorrow can,
-It cannot countervail the exchange of joy
-That one short minute gives me in her sight.
-Do thou but close our hands with holy words,
-Then love-devouring death do what he dare,
-It is enough I may but call her mine.
-
-FRIAR LAWRENCE.
-These violent delights have violent ends,
-And in their triumph die; like fire and powder,
-Which as they kiss consume. The sweetest honey
-Is loathsome in his own deliciousness,
-And in the taste confounds the appetite.
-Therefore love moderately: long love doth so;
-Too swift arrives as tardy as too slow.
-
- Enter Juliet.
-
-Here comes the lady. O, so light a foot
-Will ne’er wear out the everlasting flint.
-A lover may bestride the gossamers
-That idles in the wanton summer air
-And yet not fall; so light is vanity.
-
-JULIET.
-Good even to my ghostly confessor.
-
-FRIAR LAWRENCE.
-Romeo shall thank thee, daughter, for us both.
-
-JULIET.
-As much to him, else is his thanks too much.
-
-ROMEO.
-Ah, Juliet, if the measure of thy joy
-Be heap’d like mine, and that thy skill be more
-To blazon it, then sweeten with thy breath
-This neighbour air, and let rich music’s tongue
-Unfold the imagin’d happiness that both
-Receive in either by this dear encounter.
-
-JULIET.
-Conceit more rich in matter than in words,
-Brags of his substance, not of ornament.
-They are but beggars that can count their worth;
-But my true love is grown to such excess,
-I cannot sum up sum of half my wealth.
-
-FRIAR LAWRENCE.
-Come, come with me, and we will make short work,
-For, by your leaves, you shall not stay alone
-Till holy church incorporate two in one.
-
- [_Exeunt._]
-
-
-
-
-ACT III
-
-SCENE I. A public Place.
-
-
- Enter Mercutio, Benvolio, Page and Servants.
-
-BENVOLIO.
-I pray thee, good Mercutio, let’s retire:
-The day is hot, the Capulets abroad,
-And if we meet, we shall not scape a brawl,
-For now these hot days, is the mad blood stirring.
-
-MERCUTIO.
-Thou art like one of these fellows that, when he enters the confines of
-a tavern, claps me his sword upon the table, and says ‘God send me no
-need of thee!’ and by the operation of the second cup draws him on the
-drawer, when indeed there is no need.
-
-BENVOLIO.
-Am I like such a fellow?
-
-MERCUTIO.
-Come, come, thou art as hot a Jack in thy mood as any in Italy; and as
-soon moved to be moody, and as soon moody to be moved.
-
-BENVOLIO.
-And what to?
-
-MERCUTIO.
-Nay, an there were two such, we should have none shortly, for one would
-kill the other. Thou? Why, thou wilt quarrel with a man that hath a
-hair more or a hair less in his beard than thou hast. Thou wilt quarrel
-with a man for cracking nuts, having no other reason but because thou
-hast hazel eyes. What eye but such an eye would spy out such a quarrel?
-Thy head is as full of quarrels as an egg is full of meat, and yet thy
-head hath been beaten as addle as an egg for quarrelling. Thou hast
-quarrelled with a man for coughing in the street, because he hath
-wakened thy dog that hath lain asleep in the sun. Didst thou not fall
-out with a tailor for wearing his new doublet before Easter? with
-another for tying his new shoes with an old riband? And yet thou wilt
-tutor me from quarrelling!
-
-BENVOLIO.
-And I were so apt to quarrel as thou art, any man should buy the fee
-simple of my life for an hour and a quarter.
-
-MERCUTIO.
-The fee simple! O simple!
-
- Enter Tybalt and others.
-
-BENVOLIO.
-By my head, here comes the Capulets.
-
-MERCUTIO.
-By my heel, I care not.
-
-TYBALT.
-Follow me close, for I will speak to them.
-Gentlemen, good-den: a word with one of you.
-
-MERCUTIO.
-And but one word with one of us? Couple it with something; make it a
-word and a blow.
-
-TYBALT.
-You shall find me apt enough to that, sir, and you will give me
-occasion.
-
-MERCUTIO.
-Could you not take some occasion without giving?
-
-TYBALT.
-Mercutio, thou consortest with Romeo.
-
-MERCUTIO.
-Consort? What, dost thou make us minstrels? And thou make minstrels of
-us, look to hear nothing but discords. Here’s my fiddlestick, here’s
-that shall make you dance. Zounds, consort!
-
-BENVOLIO.
-We talk here in the public haunt of men.
-Either withdraw unto some private place,
-And reason coldly of your grievances,
-Or else depart; here all eyes gaze on us.
-
-MERCUTIO.
-Men’s eyes were made to look, and let them gaze.
-I will not budge for no man’s pleasure, I.
-
- Enter Romeo.
-
-TYBALT.
-Well, peace be with you, sir, here comes my man.
-
-MERCUTIO.
-But I’ll be hanged, sir, if he wear your livery.
-Marry, go before to field, he’ll be your follower;
-Your worship in that sense may call him man.
-
-TYBALT.
-Romeo, the love I bear thee can afford
-No better term than this: Thou art a villain.
-
-ROMEO.
-Tybalt, the reason that I have to love thee
-Doth much excuse the appertaining rage
-To such a greeting. Villain am I none;
-Therefore farewell; I see thou know’st me not.
-
-TYBALT.
-Boy, this shall not excuse the injuries
-That thou hast done me, therefore turn and draw.
-
-ROMEO.
-I do protest I never injur’d thee,
-But love thee better than thou canst devise
-Till thou shalt know the reason of my love.
-And so good Capulet, which name I tender
-As dearly as mine own, be satisfied.
-
-MERCUTIO.
-O calm, dishonourable, vile submission!
-[_Draws._] Alla stoccata carries it away.
-Tybalt, you rat-catcher, will you walk?
-
-TYBALT.
-What wouldst thou have with me?
-
-MERCUTIO.
-Good King of Cats, nothing but one of your nine lives; that I mean to
-make bold withal, and, as you shall use me hereafter, dry-beat the rest
-of the eight. Will you pluck your sword out of his pilcher by the ears?
-Make haste, lest mine be about your ears ere it be out.
-
-TYBALT.
-[_Drawing._] I am for you.
-
-ROMEO.
-Gentle Mercutio, put thy rapier up.
-
-MERCUTIO.
-Come, sir, your passado.
-
- [_They fight._]
-
-ROMEO.
-Draw, Benvolio; beat down their weapons.
-Gentlemen, for shame, forbear this outrage,
-Tybalt, Mercutio, the Prince expressly hath
-Forbid this bandying in Verona streets.
-Hold, Tybalt! Good Mercutio!
-
- [_Exeunt Tybalt with his Partizans._]
-
-MERCUTIO.
-I am hurt.
-A plague o’ both your houses. I am sped.
-Is he gone, and hath nothing?
-
-BENVOLIO.
-What, art thou hurt?
-
-MERCUTIO.
-Ay, ay, a scratch, a scratch. Marry, ’tis enough.
-Where is my page? Go villain, fetch a surgeon.
-
- [_Exit Page._]
-
-ROMEO.
-Courage, man; the hurt cannot be much.
-
-MERCUTIO.
-No, ’tis not so deep as a well, nor so wide as a church door, but ’tis
-enough, ’twill serve. Ask for me tomorrow, and you shall find me a
-grave man. I am peppered, I warrant, for this world. A plague o’ both
-your houses. Zounds, a dog, a rat, a mouse, a cat, to scratch a man to
-death. A braggart, a rogue, a villain, that fights by the book of
-arithmetic!—Why the devil came you between us? I was hurt under your
-arm.
-
-ROMEO.
-I thought all for the best.
-
-MERCUTIO.
-Help me into some house, Benvolio,
-Or I shall faint. A plague o’ both your houses.
-They have made worms’ meat of me.
-I have it, and soundly too. Your houses!
-
- [_Exeunt Mercutio and Benvolio._]
-
-ROMEO.
-This gentleman, the Prince’s near ally,
-My very friend, hath got his mortal hurt
-In my behalf; my reputation stain’d
-With Tybalt’s slander,—Tybalt, that an hour
-Hath been my cousin. O sweet Juliet,
-Thy beauty hath made me effeminate
-And in my temper soften’d valour’s steel.
-
- Re-enter Benvolio.
-
-BENVOLIO.
-O Romeo, Romeo, brave Mercutio’s dead,
-That gallant spirit hath aspir’d the clouds,
-Which too untimely here did scorn the earth.
-
-ROMEO.
-This day’s black fate on mo days doth depend;
-This but begins the woe others must end.
-
- Re-enter Tybalt.
-
-BENVOLIO.
-Here comes the furious Tybalt back again.
-
-ROMEO.
-Again in triumph, and Mercutio slain?
-Away to heaven respective lenity,
-And fire-ey’d fury be my conduct now!
-Now, Tybalt, take the ‘villain’ back again
-That late thou gav’st me, for Mercutio’s soul
-Is but a little way above our heads,
-Staying for thine to keep him company.
-Either thou or I, or both, must go with him.
-
-TYBALT.
-Thou wretched boy, that didst consort him here,
-Shalt with him hence.
-
-ROMEO.
-This shall determine that.
-
- [_They fight; Tybalt falls._]
-
-BENVOLIO.
-Romeo, away, be gone!
-The citizens are up, and Tybalt slain.
-Stand not amaz’d. The Prince will doom thee death
-If thou art taken. Hence, be gone, away!
-
-ROMEO.
-O, I am fortune’s fool!
-
-BENVOLIO.
-Why dost thou stay?
-
- [_Exit Romeo._]
-
- Enter Citizens.
-
-FIRST CITIZEN.
-Which way ran he that kill’d Mercutio?
-Tybalt, that murderer, which way ran he?
-
-BENVOLIO.
-There lies that Tybalt.
-
-FIRST CITIZEN.
-Up, sir, go with me.
-I charge thee in the Prince’s name obey.
-
- Enter Prince, attended; Montague, Capulet, their Wives and others.
-
-PRINCE.
-Where are the vile beginners of this fray?
-
-BENVOLIO.
-O noble Prince, I can discover all
-The unlucky manage of this fatal brawl.
-There lies the man, slain by young Romeo,
-That slew thy kinsman, brave Mercutio.
-
-LADY CAPULET.
-Tybalt, my cousin! O my brother’s child!
-O Prince! O husband! O, the blood is spill’d
-Of my dear kinsman! Prince, as thou art true,
-For blood of ours shed blood of Montague.
-O cousin, cousin.
-
-PRINCE.
-Benvolio, who began this bloody fray?
-
-BENVOLIO.
-Tybalt, here slain, whom Romeo’s hand did slay;
-Romeo, that spoke him fair, bid him bethink
-How nice the quarrel was, and urg’d withal
-Your high displeasure. All this uttered
-With gentle breath, calm look, knees humbly bow’d
-Could not take truce with the unruly spleen
-Of Tybalt, deaf to peace, but that he tilts
-With piercing steel at bold Mercutio’s breast,
-Who, all as hot, turns deadly point to point,
-And, with a martial scorn, with one hand beats
-Cold death aside, and with the other sends
-It back to Tybalt, whose dexterity
-Retorts it. Romeo he cries aloud,
-‘Hold, friends! Friends, part!’ and swifter than his tongue,
-His agile arm beats down their fatal points,
-And ’twixt them rushes; underneath whose arm
-An envious thrust from Tybalt hit the life
-Of stout Mercutio, and then Tybalt fled.
-But by and by comes back to Romeo,
-Who had but newly entertain’d revenge,
-And to’t they go like lightning; for, ere I
-Could draw to part them was stout Tybalt slain;
-And as he fell did Romeo turn and fly.
-This is the truth, or let Benvolio die.
-
-LADY CAPULET.
-He is a kinsman to the Montague.
-Affection makes him false, he speaks not true.
-Some twenty of them fought in this black strife,
-And all those twenty could but kill one life.
-I beg for justice, which thou, Prince, must give;
-Romeo slew Tybalt, Romeo must not live.
-
-PRINCE.
-Romeo slew him, he slew Mercutio.
-Who now the price of his dear blood doth owe?
-
-MONTAGUE.
-Not Romeo, Prince, he was Mercutio’s friend;
-His fault concludes but what the law should end,
-The life of Tybalt.
-
-PRINCE.
-And for that offence
-Immediately we do exile him hence.
-I have an interest in your hate’s proceeding,
-My blood for your rude brawls doth lie a-bleeding.
-But I’ll amerce you with so strong a fine
-That you shall all repent the loss of mine.
-I will be deaf to pleading and excuses;
-Nor tears nor prayers shall purchase out abuses.
-Therefore use none. Let Romeo hence in haste,
-Else, when he is found, that hour is his last.
-Bear hence this body, and attend our will.
-Mercy but murders, pardoning those that kill.
-
- [_Exeunt._]
-
-SCENE II. A Room in Capulet’s House.
-
- Enter Juliet.
-
-JULIET.
-Gallop apace, you fiery-footed steeds,
-Towards Phoebus’ lodging. Such a waggoner
-As Phaeton would whip you to the west
-And bring in cloudy night immediately.
-Spread thy close curtain, love-performing night,
-That runaway’s eyes may wink, and Romeo
-Leap to these arms, untalk’d of and unseen.
-Lovers can see to do their amorous rites
-By their own beauties: or, if love be blind,
-It best agrees with night. Come, civil night,
-Thou sober-suited matron, all in black,
-And learn me how to lose a winning match,
-Play’d for a pair of stainless maidenhoods.
-Hood my unmann’d blood, bating in my cheeks,
-With thy black mantle, till strange love, grow bold,
-Think true love acted simple modesty.
-Come, night, come Romeo; come, thou day in night;
-For thou wilt lie upon the wings of night
-Whiter than new snow upon a raven’s back.
-Come gentle night, come loving black-brow’d night,
-Give me my Romeo, and when I shall die,
-Take him and cut him out in little stars,
-And he will make the face of heaven so fine
-That all the world will be in love with night,
-And pay no worship to the garish sun.
-O, I have bought the mansion of a love,
-But not possess’d it; and though I am sold,
-Not yet enjoy’d. So tedious is this day
-As is the night before some festival
-To an impatient child that hath new robes
-And may not wear them. O, here comes my Nurse,
-And she brings news, and every tongue that speaks
-But Romeo’s name speaks heavenly eloquence.
-
- Enter Nurse, with cords.
-
-Now, Nurse, what news? What hast thou there?
-The cords that Romeo bid thee fetch?
-
-NURSE.
-Ay, ay, the cords.
-
- [_Throws them down._]
-
-JULIET.
-Ay me, what news? Why dost thou wring thy hands?
-
-NURSE.
-Ah, well-a-day, he’s dead, he’s dead, he’s dead!
-We are undone, lady, we are undone.
-Alack the day, he’s gone, he’s kill’d, he’s dead.
-
-JULIET.
-Can heaven be so envious?
-
-NURSE.
-Romeo can,
-Though heaven cannot. O Romeo, Romeo.
-Who ever would have thought it? Romeo!
-
-JULIET.
-What devil art thou, that dost torment me thus?
-This torture should be roar’d in dismal hell.
-Hath Romeo slain himself? Say thou but Ay,
-And that bare vowel I shall poison more
-Than the death-darting eye of cockatrice.
-I am not I if there be such an I;
-Or those eyes shut that make thee answer Ay.
-If he be slain, say Ay; or if not, No.
-Brief sounds determine of my weal or woe.
-
-NURSE.
-I saw the wound, I saw it with mine eyes,
-God save the mark!—here on his manly breast.
-A piteous corse, a bloody piteous corse;
-Pale, pale as ashes, all bedaub’d in blood,
-All in gore-blood. I swounded at the sight.
-
-JULIET.
-O, break, my heart. Poor bankrout, break at once.
-To prison, eyes; ne’er look on liberty.
-Vile earth to earth resign; end motion here,
-And thou and Romeo press one heavy bier.
-
-NURSE.
-O Tybalt, Tybalt, the best friend I had.
-O courteous Tybalt, honest gentleman!
-That ever I should live to see thee dead.
-
-JULIET.
-What storm is this that blows so contrary?
-Is Romeo slaughter’d and is Tybalt dead?
-My dearest cousin, and my dearer lord?
-Then dreadful trumpet sound the general doom,
-For who is living, if those two are gone?
-
-NURSE.
-Tybalt is gone, and Romeo banished,
-Romeo that kill’d him, he is banished.
-
-JULIET.
-O God! Did Romeo’s hand shed Tybalt’s blood?
-
-NURSE.
-It did, it did; alas the day, it did.
-
-JULIET.
-O serpent heart, hid with a flowering face!
-Did ever dragon keep so fair a cave?
-Beautiful tyrant, fiend angelical,
-Dove-feather’d raven, wolvish-ravening lamb!
-Despised substance of divinest show!
-Just opposite to what thou justly seem’st,
-A damned saint, an honourable villain!
-O nature, what hadst thou to do in hell
-When thou didst bower the spirit of a fiend
-In mortal paradise of such sweet flesh?
-Was ever book containing such vile matter
-So fairly bound? O, that deceit should dwell
-In such a gorgeous palace.
-
-NURSE.
-There’s no trust,
-No faith, no honesty in men. All perjur’d,
-All forsworn, all naught, all dissemblers.
-Ah, where’s my man? Give me some aqua vitae.
-These griefs, these woes, these sorrows make me old.
-Shame come to Romeo.
-
-JULIET.
-Blister’d be thy tongue
-For such a wish! He was not born to shame.
-Upon his brow shame is asham’d to sit;
-For ’tis a throne where honour may be crown’d
-Sole monarch of the universal earth.
-O, what a beast was I to chide at him!
-
-NURSE.
-Will you speak well of him that kill’d your cousin?
-
-JULIET.
-Shall I speak ill of him that is my husband?
-Ah, poor my lord, what tongue shall smooth thy name,
-When I thy three-hours’ wife have mangled it?
-But wherefore, villain, didst thou kill my cousin?
-That villain cousin would have kill’d my husband.
-Back, foolish tears, back to your native spring,
-Your tributary drops belong to woe,
-Which you mistaking offer up to joy.
-My husband lives, that Tybalt would have slain,
-And Tybalt’s dead, that would have slain my husband.
-All this is comfort; wherefore weep I then?
-Some word there was, worser than Tybalt’s death,
-That murder’d me. I would forget it fain,
-But O, it presses to my memory
-Like damned guilty deeds to sinners’ minds.
-Tybalt is dead, and Romeo banished.
-That ‘banished,’ that one word ‘banished,’
-Hath slain ten thousand Tybalts. Tybalt’s death
-Was woe enough, if it had ended there.
-Or if sour woe delights in fellowship,
-And needly will be rank’d with other griefs,
-Why follow’d not, when she said Tybalt’s dead,
-Thy father or thy mother, nay or both,
-Which modern lamentation might have mov’d?
-But with a rear-ward following Tybalt’s death,
-‘Romeo is banished’—to speak that word
-Is father, mother, Tybalt, Romeo, Juliet,
-All slain, all dead. Romeo is banished,
-There is no end, no limit, measure, bound,
-In that word’s death, no words can that woe sound.
-Where is my father and my mother, Nurse?
-
-NURSE.
-Weeping and wailing over Tybalt’s corse.
-Will you go to them? I will bring you thither.
-
-JULIET.
-Wash they his wounds with tears. Mine shall be spent,
-When theirs are dry, for Romeo’s banishment.
-Take up those cords. Poor ropes, you are beguil’d,
-Both you and I; for Romeo is exil’d.
-He made you for a highway to my bed,
-But I, a maid, die maiden-widowed.
-Come cords, come Nurse, I’ll to my wedding bed,
-And death, not Romeo, take my maidenhead.
-
-NURSE.
-Hie to your chamber. I’ll find Romeo
-To comfort you. I wot well where he is.
-Hark ye, your Romeo will be here at night.
-I’ll to him, he is hid at Lawrence’ cell.
-
-JULIET.
-O find him, give this ring to my true knight,
-And bid him come to take his last farewell.
-
- [_Exeunt._]
-
-SCENE III. Friar Lawrence’s cell.
-
- Enter Friar Lawrence.
-
-FRIAR LAWRENCE.
-Romeo, come forth; come forth, thou fearful man.
-Affliction is enanmour’d of thy parts
-And thou art wedded to calamity.
-
- Enter Romeo.
-
-ROMEO.
-Father, what news? What is the Prince’s doom?
-What sorrow craves acquaintance at my hand,
-That I yet know not?
-
-FRIAR LAWRENCE.
-Too familiar
-Is my dear son with such sour company.
-I bring thee tidings of the Prince’s doom.
-
-ROMEO.
-What less than doomsday is the Prince’s doom?
-
-FRIAR LAWRENCE.
-A gentler judgment vanish’d from his lips,
-Not body’s death, but body’s banishment.
-
-ROMEO.
-Ha, banishment? Be merciful, say death;
-For exile hath more terror in his look,
-Much more than death. Do not say banishment.
-
-FRIAR LAWRENCE.
-Hence from Verona art thou banished.
-Be patient, for the world is broad and wide.
-
-ROMEO.
-There is no world without Verona walls,
-But purgatory, torture, hell itself.
-Hence banished is banish’d from the world,
-And world’s exile is death. Then banished
-Is death misterm’d. Calling death banished,
-Thou cutt’st my head off with a golden axe,
-And smilest upon the stroke that murders me.
-
-FRIAR LAWRENCE.
-O deadly sin, O rude unthankfulness!
-Thy fault our law calls death, but the kind Prince,
-Taking thy part, hath brush’d aside the law,
-And turn’d that black word death to banishment.
-This is dear mercy, and thou see’st it not.
-
-ROMEO.
-’Tis torture, and not mercy. Heaven is here
-Where Juliet lives, and every cat and dog,
-And little mouse, every unworthy thing,
-Live here in heaven and may look on her,
-But Romeo may not. More validity,
-More honourable state, more courtship lives
-In carrion flies than Romeo. They may seize
-On the white wonder of dear Juliet’s hand,
-And steal immortal blessing from her lips,
-Who, even in pure and vestal modesty
-Still blush, as thinking their own kisses sin.
-But Romeo may not, he is banished.
-This may flies do, when I from this must fly.
-They are free men but I am banished.
-And say’st thou yet that exile is not death?
-Hadst thou no poison mix’d, no sharp-ground knife,
-No sudden mean of death, though ne’er so mean,
-But banished to kill me? Banished?
-O Friar, the damned use that word in hell.
-Howling attends it. How hast thou the heart,
-Being a divine, a ghostly confessor,
-A sin-absolver, and my friend profess’d,
-To mangle me with that word banished?
-
-FRIAR LAWRENCE.
-Thou fond mad man, hear me speak a little,
-
-ROMEO.
-O, thou wilt speak again of banishment.
-
-FRIAR LAWRENCE.
-I’ll give thee armour to keep off that word,
-Adversity’s sweet milk, philosophy,
-To comfort thee, though thou art banished.
-
-ROMEO.
-Yet banished? Hang up philosophy.
-Unless philosophy can make a Juliet,
-Displant a town, reverse a Prince’s doom,
-It helps not, it prevails not, talk no more.
-
-FRIAR LAWRENCE.
-O, then I see that mad men have no ears.
-
-ROMEO.
-How should they, when that wise men have no eyes?
-
-FRIAR LAWRENCE.
-Let me dispute with thee of thy estate.
-
-ROMEO.
-Thou canst not speak of that thou dost not feel.
-Wert thou as young as I, Juliet thy love,
-An hour but married, Tybalt murdered,
-Doting like me, and like me banished,
-Then mightst thou speak, then mightst thou tear thy hair,
-And fall upon the ground as I do now,
-Taking the measure of an unmade grave.
-
- [_Knocking within._]
-
-FRIAR LAWRENCE.
-Arise; one knocks. Good Romeo, hide thyself.
-
-ROMEO.
-Not I, unless the breath of heartsick groans
-Mist-like infold me from the search of eyes.
-
- [_Knocking._]
-
-FRIAR LAWRENCE.
-Hark, how they knock!—Who’s there?—Romeo, arise,
-Thou wilt be taken.—Stay awhile.—Stand up.
-
- [_Knocking._]
-
-Run to my study.—By-and-by.—God’s will,
-What simpleness is this.—I come, I come.
-
- [_Knocking._]
-
-Who knocks so hard? Whence come you, what’s your will?
-
-NURSE.
-[_Within._] Let me come in, and you shall know my errand.
-I come from Lady Juliet.
-
-FRIAR LAWRENCE.
-Welcome then.
-
- Enter Nurse.
-
-NURSE.
-O holy Friar, O, tell me, holy Friar,
-Where is my lady’s lord, where’s Romeo?
-
-FRIAR LAWRENCE.
-There on the ground, with his own tears made drunk.
-
-NURSE.
-O, he is even in my mistress’ case.
-Just in her case! O woeful sympathy!
-Piteous predicament. Even so lies she,
-Blubbering and weeping, weeping and blubbering.
-Stand up, stand up; stand, and you be a man.
-For Juliet’s sake, for her sake, rise and stand.
-Why should you fall into so deep an O?
-
-ROMEO.
-Nurse.
-
-NURSE.
-Ah sir, ah sir, death’s the end of all.
-
-ROMEO.
-Spakest thou of Juliet? How is it with her?
-Doth not she think me an old murderer,
-Now I have stain’d the childhood of our joy
-With blood remov’d but little from her own?
-Where is she? And how doth she? And what says
-My conceal’d lady to our cancell’d love?
-
-NURSE.
-O, she says nothing, sir, but weeps and weeps;
-And now falls on her bed, and then starts up,
-And Tybalt calls, and then on Romeo cries,
-And then down falls again.
-
-ROMEO.
-As if that name,
-Shot from the deadly level of a gun,
-Did murder her, as that name’s cursed hand
-Murder’d her kinsman. O, tell me, Friar, tell me,
-In what vile part of this anatomy
-Doth my name lodge? Tell me, that I may sack
-The hateful mansion.
-
- [_Drawing his sword._]
-
-FRIAR LAWRENCE.
-Hold thy desperate hand.
-Art thou a man? Thy form cries out thou art.
-Thy tears are womanish, thy wild acts denote
-The unreasonable fury of a beast.
-Unseemly woman in a seeming man,
-And ill-beseeming beast in seeming both!
-Thou hast amaz’d me. By my holy order,
-I thought thy disposition better temper’d.
-Hast thou slain Tybalt? Wilt thou slay thyself?
-And slay thy lady, that in thy life lives,
-By doing damned hate upon thyself?
-Why rail’st thou on thy birth, the heaven and earth?
-Since birth, and heaven and earth, all three do meet
-In thee at once; which thou at once wouldst lose.
-Fie, fie, thou sham’st thy shape, thy love, thy wit,
-Which, like a usurer, abound’st in all,
-And usest none in that true use indeed
-Which should bedeck thy shape, thy love, thy wit.
-Thy noble shape is but a form of wax,
-Digressing from the valour of a man;
-Thy dear love sworn but hollow perjury,
-Killing that love which thou hast vow’d to cherish;
-Thy wit, that ornament to shape and love,
-Misshapen in the conduct of them both,
-Like powder in a skilless soldier’s flask,
-Is set afire by thine own ignorance,
-And thou dismember’d with thine own defence.
-What, rouse thee, man. Thy Juliet is alive,
-For whose dear sake thou wast but lately dead.
-There art thou happy. Tybalt would kill thee,
-But thou slew’st Tybalt; there art thou happy.
-The law that threaten’d death becomes thy friend,
-And turns it to exile; there art thou happy.
-A pack of blessings light upon thy back;
-Happiness courts thee in her best array;
-But like a misshaped and sullen wench,
-Thou putt’st up thy Fortune and thy love.
-Take heed, take heed, for such die miserable.
-Go, get thee to thy love as was decreed,
-Ascend her chamber, hence and comfort her.
-But look thou stay not till the watch be set,
-For then thou canst not pass to Mantua;
-Where thou shalt live till we can find a time
-To blaze your marriage, reconcile your friends,
-Beg pardon of the Prince, and call thee back
-With twenty hundred thousand times more joy
-Than thou went’st forth in lamentation.
-Go before, Nurse. Commend me to thy lady,
-And bid her hasten all the house to bed,
-Which heavy sorrow makes them apt unto.
-Romeo is coming.
-
-NURSE.
-O Lord, I could have stay’d here all the night
-To hear good counsel. O, what learning is!
-My lord, I’ll tell my lady you will come.
-
-ROMEO.
-Do so, and bid my sweet prepare to chide.
-
-NURSE.
-Here sir, a ring she bid me give you, sir.
-Hie you, make haste, for it grows very late.
-
- [_Exit._]
-
-ROMEO.
-How well my comfort is reviv’d by this.
-
-FRIAR LAWRENCE.
-Go hence, good night, and here stands all your state:
-Either be gone before the watch be set,
-Or by the break of day disguis’d from hence.
-Sojourn in Mantua. I’ll find out your man,
-And he shall signify from time to time
-Every good hap to you that chances here.
-Give me thy hand; ’tis late; farewell; good night.
-
-ROMEO.
-But that a joy past joy calls out on me,
-It were a grief so brief to part with thee.
-Farewell.
-
- [_Exeunt._]
-
-SCENE IV. A Room in Capulet’s House.
-
- Enter Capulet, Lady Capulet and Paris.
-
-CAPULET.
-Things have fallen out, sir, so unluckily
-That we have had no time to move our daughter.
-Look you, she lov’d her kinsman Tybalt dearly,
-And so did I. Well, we were born to die.
-’Tis very late; she’ll not come down tonight.
-I promise you, but for your company,
-I would have been abed an hour ago.
-
-PARIS.
-These times of woe afford no tune to woo.
-Madam, good night. Commend me to your daughter.
-
-LADY CAPULET.
-I will, and know her mind early tomorrow;
-Tonight she’s mew’d up to her heaviness.
-
-CAPULET.
-Sir Paris, I will make a desperate tender
-Of my child’s love. I think she will be rul’d
-In all respects by me; nay more, I doubt it not.
-Wife, go you to her ere you go to bed,
-Acquaint her here of my son Paris’ love,
-And bid her, mark you me, on Wednesday next,
-But, soft, what day is this?
-
-PARIS.
-Monday, my lord.
-
-CAPULET.
-Monday! Ha, ha! Well, Wednesday is too soon,
-A Thursday let it be; a Thursday, tell her,
-She shall be married to this noble earl.
-Will you be ready? Do you like this haste?
-We’ll keep no great ado,—a friend or two,
-For, hark you, Tybalt being slain so late,
-It may be thought we held him carelessly,
-Being our kinsman, if we revel much.
-Therefore we’ll have some half a dozen friends,
-And there an end. But what say you to Thursday?
-
-PARIS.
-My lord, I would that Thursday were tomorrow.
-
-CAPULET.
-Well, get you gone. A Thursday be it then.
-Go you to Juliet ere you go to bed,
-Prepare her, wife, against this wedding day.
-Farewell, my lord.—Light to my chamber, ho!
-Afore me, it is so very very late that we
-May call it early by and by. Good night.
-
- [_Exeunt._]
-
-SCENE V. An open Gallery to Juliet’s Chamber, overlooking the Garden.
-
- Enter Romeo and Juliet.
-
-JULIET.
-Wilt thou be gone? It is not yet near day.
-It was the nightingale, and not the lark,
-That pierc’d the fearful hollow of thine ear;
-Nightly she sings on yond pomegranate tree.
-Believe me, love, it was the nightingale.
-
-ROMEO.
-It was the lark, the herald of the morn,
-No nightingale. Look, love, what envious streaks
-Do lace the severing clouds in yonder east.
-Night’s candles are burnt out, and jocund day
-Stands tiptoe on the misty mountain tops.
-I must be gone and live, or stay and die.
-
-JULIET.
-Yond light is not daylight, I know it, I.
-It is some meteor that the sun exhales
-To be to thee this night a torchbearer
-And light thee on thy way to Mantua.
-Therefore stay yet, thou need’st not to be gone.
-
-ROMEO.
-Let me be ta’en, let me be put to death,
-I am content, so thou wilt have it so.
-I’ll say yon grey is not the morning’s eye,
-’Tis but the pale reflex of Cynthia’s brow.
-Nor that is not the lark whose notes do beat
-The vaulty heaven so high above our heads.
-I have more care to stay than will to go.
-Come, death, and welcome. Juliet wills it so.
-How is’t, my soul? Let’s talk. It is not day.
-
-JULIET.
-It is, it is! Hie hence, be gone, away.
-It is the lark that sings so out of tune,
-Straining harsh discords and unpleasing sharps.
-Some say the lark makes sweet division;
-This doth not so, for she divideth us.
-Some say the lark and loathed toad change eyes.
-O, now I would they had chang’d voices too,
-Since arm from arm that voice doth us affray,
-Hunting thee hence with hunt’s-up to the day.
-O now be gone, more light and light it grows.
-
-ROMEO.
-More light and light, more dark and dark our woes.
-
- Enter Nurse.
-
-NURSE.
-Madam.
-
-JULIET.
-Nurse?
-
-NURSE.
-Your lady mother is coming to your chamber.
-The day is broke, be wary, look about.
-
- [_Exit._]
-
-JULIET.
-Then, window, let day in, and let life out.
-
-ROMEO.
-Farewell, farewell, one kiss, and I’ll descend.
-
- [_Descends._]
-
-JULIET.
-Art thou gone so? Love, lord, ay husband, friend,
-I must hear from thee every day in the hour,
-For in a minute there are many days.
-O, by this count I shall be much in years
-Ere I again behold my Romeo.
-
-ROMEO.
-Farewell!
-I will omit no opportunity
-That may convey my greetings, love, to thee.
-
-JULIET.
-O thinkest thou we shall ever meet again?
-
-ROMEO.
-I doubt it not, and all these woes shall serve
-For sweet discourses in our time to come.
-
-JULIET.
-O God! I have an ill-divining soul!
-Methinks I see thee, now thou art so low,
-As one dead in the bottom of a tomb.
-Either my eyesight fails, or thou look’st pale.
-
-ROMEO.
-And trust me, love, in my eye so do you.
-Dry sorrow drinks our blood. Adieu, adieu.
-
- [_Exit below._]
-
-JULIET.
-O Fortune, Fortune! All men call thee fickle,
-If thou art fickle, what dost thou with him
-That is renown’d for faith? Be fickle, Fortune;
-For then, I hope thou wilt not keep him long
-But send him back.
-
-LADY CAPULET.
-[_Within._] Ho, daughter, are you up?
-
-JULIET.
-Who is’t that calls? Is it my lady mother?
-Is she not down so late, or up so early?
-What unaccustom’d cause procures her hither?
-
- Enter Lady Capulet.
-
-LADY CAPULET.
-Why, how now, Juliet?
-
-JULIET.
-Madam, I am not well.
-
-LADY CAPULET.
-Evermore weeping for your cousin’s death?
-What, wilt thou wash him from his grave with tears?
-And if thou couldst, thou couldst not make him live.
-Therefore have done: some grief shows much of love,
-But much of grief shows still some want of wit.
-
-JULIET.
-Yet let me weep for such a feeling loss.
-
-LADY CAPULET.
-So shall you feel the loss, but not the friend
-Which you weep for.
-
-JULIET.
-Feeling so the loss,
-I cannot choose but ever weep the friend.
-
-LADY CAPULET.
-Well, girl, thou weep’st not so much for his death
-As that the villain lives which slaughter’d him.
-
-JULIET.
-What villain, madam?
-
-LADY CAPULET.
-That same villain Romeo.
-
-JULIET.
-Villain and he be many miles asunder.
-God pardon him. I do, with all my heart.
-And yet no man like he doth grieve my heart.
-
-LADY CAPULET.
-That is because the traitor murderer lives.
-
-JULIET.
-Ay madam, from the reach of these my hands.
-Would none but I might venge my cousin’s death.
-
-LADY CAPULET.
-We will have vengeance for it, fear thou not.
-Then weep no more. I’ll send to one in Mantua,
-Where that same banish’d runagate doth live,
-Shall give him such an unaccustom’d dram
-That he shall soon keep Tybalt company:
-And then I hope thou wilt be satisfied.
-
-JULIET.
-Indeed I never shall be satisfied
-With Romeo till I behold him—dead—
-Is my poor heart so for a kinsman vex’d.
-Madam, if you could find out but a man
-To bear a poison, I would temper it,
-That Romeo should upon receipt thereof,
-Soon sleep in quiet. O, how my heart abhors
-To hear him nam’d, and cannot come to him,
-To wreak the love I bore my cousin
-Upon his body that hath slaughter’d him.
-
-LADY CAPULET.
-Find thou the means, and I’ll find such a man.
-But now I’ll tell thee joyful tidings, girl.
-
-JULIET.
-And joy comes well in such a needy time.
-What are they, I beseech your ladyship?
-
-LADY CAPULET.
-Well, well, thou hast a careful father, child;
-One who to put thee from thy heaviness,
-Hath sorted out a sudden day of joy,
-That thou expects not, nor I look’d not for.
-
-JULIET.
-Madam, in happy time, what day is that?
-
-LADY CAPULET.
-Marry, my child, early next Thursday morn
-The gallant, young, and noble gentleman,
-The County Paris, at Saint Peter’s Church,
-Shall happily make thee there a joyful bride.
-
-JULIET.
-Now by Saint Peter’s Church, and Peter too,
-He shall not make me there a joyful bride.
-I wonder at this haste, that I must wed
-Ere he that should be husband comes to woo.
-I pray you tell my lord and father, madam,
-I will not marry yet; and when I do, I swear
-It shall be Romeo, whom you know I hate,
-Rather than Paris. These are news indeed.
-
-LADY CAPULET.
-Here comes your father, tell him so yourself,
-And see how he will take it at your hands.
-
- Enter Capulet and Nurse.
-
-CAPULET.
-When the sun sets, the air doth drizzle dew;
-But for the sunset of my brother’s son
-It rains downright.
-How now? A conduit, girl? What, still in tears?
-Evermore showering? In one little body
-Thou counterfeits a bark, a sea, a wind.
-For still thy eyes, which I may call the sea,
-Do ebb and flow with tears; the bark thy body is,
-Sailing in this salt flood, the winds, thy sighs,
-Who raging with thy tears and they with them,
-Without a sudden calm will overset
-Thy tempest-tossed body. How now, wife?
-Have you deliver’d to her our decree?
-
-LADY CAPULET.
-Ay, sir; but she will none, she gives you thanks.
-I would the fool were married to her grave.
-
-CAPULET.
-Soft. Take me with you, take me with you, wife.
-How, will she none? Doth she not give us thanks?
-Is she not proud? Doth she not count her blest,
-Unworthy as she is, that we have wrought
-So worthy a gentleman to be her bridegroom?
-
-JULIET.
-Not proud you have, but thankful that you have.
-Proud can I never be of what I hate;
-But thankful even for hate that is meant love.
-
-CAPULET.
-How now, how now, chopp’d logic? What is this?
-Proud, and, I thank you, and I thank you not;
-And yet not proud. Mistress minion you,
-Thank me no thankings, nor proud me no prouds,
-But fettle your fine joints ’gainst Thursday next
-To go with Paris to Saint Peter’s Church,
-Or I will drag thee on a hurdle thither.
-Out, you green-sickness carrion! Out, you baggage!
-You tallow-face!
-
-LADY CAPULET.
-Fie, fie! What, are you mad?
-
-JULIET.
-Good father, I beseech you on my knees,
-Hear me with patience but to speak a word.
-
-CAPULET.
-Hang thee young baggage, disobedient wretch!
-I tell thee what,—get thee to church a Thursday,
-Or never after look me in the face.
-Speak not, reply not, do not answer me.
-My fingers itch. Wife, we scarce thought us blest
-That God had lent us but this only child;
-But now I see this one is one too much,
-And that we have a curse in having her.
-Out on her, hilding.
-
-NURSE.
-God in heaven bless her.
-You are to blame, my lord, to rate her so.
-
-CAPULET.
-And why, my lady wisdom? Hold your tongue,
-Good prudence; smatter with your gossips, go.
-
-NURSE.
-I speak no treason.
-
-CAPULET.
-O God ye good-en!
-
-NURSE.
-May not one speak?
-
-CAPULET.
-Peace, you mumbling fool!
-Utter your gravity o’er a gossip’s bowl,
-For here we need it not.
-
-LADY CAPULET.
-You are too hot.
-
-CAPULET.
-God’s bread, it makes me mad!
-Day, night, hour, ride, time, work, play,
-Alone, in company, still my care hath been
-To have her match’d, and having now provided
-A gentleman of noble parentage,
-Of fair demesnes, youthful, and nobly allied,
-Stuff’d, as they say, with honourable parts,
-Proportion’d as one’s thought would wish a man,
-And then to have a wretched puling fool,
-A whining mammet, in her fortune’s tender,
-To answer, ‘I’ll not wed, I cannot love,
-I am too young, I pray you pardon me.’
-But, and you will not wed, I’ll pardon you.
-Graze where you will, you shall not house with me.
-Look to’t, think on’t, I do not use to jest.
-Thursday is near; lay hand on heart, advise.
-And you be mine, I’ll give you to my friend;
-And you be not, hang, beg, starve, die in the streets,
-For by my soul, I’ll ne’er acknowledge thee,
-Nor what is mine shall never do thee good.
-Trust to’t, bethink you, I’ll not be forsworn.
-
- [_Exit._]
-
-JULIET.
-Is there no pity sitting in the clouds,
-That sees into the bottom of my grief?
-O sweet my mother, cast me not away,
-Delay this marriage for a month, a week,
-Or, if you do not, make the bridal bed
-In that dim monument where Tybalt lies.
-
-LADY CAPULET.
-Talk not to me, for I’ll not speak a word.
-Do as thou wilt, for I have done with thee.
-
- [_Exit._]
-
-JULIET.
-O God! O Nurse, how shall this be prevented?
-My husband is on earth, my faith in heaven.
-How shall that faith return again to earth,
-Unless that husband send it me from heaven
-By leaving earth? Comfort me, counsel me.
-Alack, alack, that heaven should practise stratagems
-Upon so soft a subject as myself.
-What say’st thou? Hast thou not a word of joy?
-Some comfort, Nurse.
-
-NURSE.
-Faith, here it is.
-Romeo is banished; and all the world to nothing
-That he dares ne’er come back to challenge you.
-Or if he do, it needs must be by stealth.
-Then, since the case so stands as now it doth,
-I think it best you married with the County.
-O, he’s a lovely gentleman.
-Romeo’s a dishclout to him. An eagle, madam,
-Hath not so green, so quick, so fair an eye
-As Paris hath. Beshrew my very heart,
-I think you are happy in this second match,
-For it excels your first: or if it did not,
-Your first is dead, or ’twere as good he were,
-As living here and you no use of him.
-
-JULIET.
-Speakest thou from thy heart?
-
-NURSE.
-And from my soul too,
-Or else beshrew them both.
-
-JULIET.
-Amen.
-
-NURSE.
-What?
-
-JULIET.
-Well, thou hast comforted me marvellous much.
-Go in, and tell my lady I am gone,
-Having displeas’d my father, to Lawrence’ cell,
-To make confession and to be absolv’d.
-
-NURSE.
-Marry, I will; and this is wisely done.
-
- [_Exit._]
-
-JULIET.
-Ancient damnation! O most wicked fiend!
-Is it more sin to wish me thus forsworn,
-Or to dispraise my lord with that same tongue
-Which she hath prais’d him with above compare
-So many thousand times? Go, counsellor.
-Thou and my bosom henceforth shall be twain.
-I’ll to the Friar to know his remedy.
-If all else fail, myself have power to die.
-
- [_Exit._]
-
-
-
-
-ACT IV
-
-SCENE I. Friar Lawrence’s Cell.
-
-
- Enter Friar Lawrence and Paris.
-
-FRIAR LAWRENCE.
-On Thursday, sir? The time is very short.
-
-PARIS.
-My father Capulet will have it so;
-And I am nothing slow to slack his haste.
-
-FRIAR LAWRENCE.
-You say you do not know the lady’s mind.
-Uneven is the course; I like it not.
-
-PARIS.
-Immoderately she weeps for Tybalt’s death,
-And therefore have I little talk’d of love;
-For Venus smiles not in a house of tears.
-Now, sir, her father counts it dangerous
-That she do give her sorrow so much sway;
-And in his wisdom, hastes our marriage,
-To stop the inundation of her tears,
-Which, too much minded by herself alone,
-May be put from her by society.
-Now do you know the reason of this haste.
-
-FRIAR LAWRENCE.
-[_Aside._] I would I knew not why it should be slow’d.—
-Look, sir, here comes the lady toward my cell.
-
- Enter Juliet.
-
-PARIS.
-Happily met, my lady and my wife!
-
-JULIET.
-That may be, sir, when I may be a wife.
-
-PARIS.
-That may be, must be, love, on Thursday next.
-
-JULIET.
-What must be shall be.
-
-FRIAR LAWRENCE.
-That’s a certain text.
-
-PARIS.
-Come you to make confession to this father?
-
-JULIET.
-To answer that, I should confess to you.
-
-PARIS.
-Do not deny to him that you love me.
-
-JULIET.
-I will confess to you that I love him.
-
-PARIS.
-So will ye, I am sure, that you love me.
-
-JULIET.
-If I do so, it will be of more price,
-Being spoke behind your back than to your face.
-
-PARIS.
-Poor soul, thy face is much abus’d with tears.
-
-JULIET.
-The tears have got small victory by that;
-For it was bad enough before their spite.
-
-PARIS.
-Thou wrong’st it more than tears with that report.
-
-JULIET.
-That is no slander, sir, which is a truth,
-And what I spake, I spake it to my face.
-
-PARIS.
-Thy face is mine, and thou hast slander’d it.
-
-JULIET.
-It may be so, for it is not mine own.
-Are you at leisure, holy father, now,
-Or shall I come to you at evening mass?
-
-FRIAR LAWRENCE.
-My leisure serves me, pensive daughter, now.—
-My lord, we must entreat the time alone.
-
-PARIS.
-God shield I should disturb devotion!—
-Juliet, on Thursday early will I rouse ye,
-Till then, adieu; and keep this holy kiss.
-
- [_Exit._]
-
-JULIET.
-O shut the door, and when thou hast done so,
-Come weep with me, past hope, past cure, past help!
-
-FRIAR LAWRENCE.
-O Juliet, I already know thy grief;
-It strains me past the compass of my wits.
-I hear thou must, and nothing may prorogue it,
-On Thursday next be married to this County.
-
-JULIET.
-Tell me not, Friar, that thou hear’st of this,
-Unless thou tell me how I may prevent it.
-If in thy wisdom, thou canst give no help,
-Do thou but call my resolution wise,
-And with this knife I’ll help it presently.
-God join’d my heart and Romeo’s, thou our hands;
-And ere this hand, by thee to Romeo’s seal’d,
-Shall be the label to another deed,
-Or my true heart with treacherous revolt
-Turn to another, this shall slay them both.
-Therefore, out of thy long-experienc’d time,
-Give me some present counsel, or behold
-’Twixt my extremes and me this bloody knife
-Shall play the empire, arbitrating that
-Which the commission of thy years and art
-Could to no issue of true honour bring.
-Be not so long to speak. I long to die,
-If what thou speak’st speak not of remedy.
-
-FRIAR LAWRENCE.
-Hold, daughter. I do spy a kind of hope,
-Which craves as desperate an execution
-As that is desperate which we would prevent.
-If, rather than to marry County Paris
-Thou hast the strength of will to slay thyself,
-Then is it likely thou wilt undertake
-A thing like death to chide away this shame,
-That cop’st with death himself to scape from it.
-And if thou dar’st, I’ll give thee remedy.
-
-JULIET.
-O, bid me leap, rather than marry Paris,
-From off the battlements of yonder tower,
-Or walk in thievish ways, or bid me lurk
-Where serpents are. Chain me with roaring bears;
-Or hide me nightly in a charnel-house,
-O’er-cover’d quite with dead men’s rattling bones,
-With reeky shanks and yellow chapless skulls.
-Or bid me go into a new-made grave,
-And hide me with a dead man in his shroud;
-Things that, to hear them told, have made me tremble,
-And I will do it without fear or doubt,
-To live an unstain’d wife to my sweet love.
-
-FRIAR LAWRENCE.
-Hold then. Go home, be merry, give consent
-To marry Paris. Wednesday is tomorrow;
-Tomorrow night look that thou lie alone,
-Let not thy Nurse lie with thee in thy chamber.
-Take thou this vial, being then in bed,
-And this distilled liquor drink thou off,
-When presently through all thy veins shall run
-A cold and drowsy humour; for no pulse
-Shall keep his native progress, but surcease.
-No warmth, no breath shall testify thou livest,
-The roses in thy lips and cheeks shall fade
-To paly ashes; thy eyes’ windows fall,
-Like death when he shuts up the day of life.
-Each part depriv’d of supple government,
-Shall stiff and stark and cold appear like death.
-And in this borrow’d likeness of shrunk death
-Thou shalt continue two and forty hours,
-And then awake as from a pleasant sleep.
-Now when the bridegroom in the morning comes
-To rouse thee from thy bed, there art thou dead.
-Then as the manner of our country is,
-In thy best robes, uncover’d, on the bier,
-Thou shalt be borne to that same ancient vault
-Where all the kindred of the Capulets lie.
-In the meantime, against thou shalt awake,
-Shall Romeo by my letters know our drift,
-And hither shall he come, and he and I
-Will watch thy waking, and that very night
-Shall Romeo bear thee hence to Mantua.
-And this shall free thee from this present shame,
-If no inconstant toy nor womanish fear
-Abate thy valour in the acting it.
-
-JULIET.
-Give me, give me! O tell not me of fear!
-
-FRIAR LAWRENCE.
-Hold; get you gone, be strong and prosperous
-In this resolve. I’ll send a friar with speed
-To Mantua, with my letters to thy lord.
-
-JULIET.
-Love give me strength, and strength shall help afford.
-Farewell, dear father.
-
- [_Exeunt._]
-
-SCENE II. Hall in Capulet’s House.
-
- Enter Capulet, Lady Capulet, Nurse and Servants.
-
-CAPULET.
-So many guests invite as here are writ.
-
- [_Exit first Servant._]
-
-Sirrah, go hire me twenty cunning cooks.
-
-SECOND SERVANT.
-You shall have none ill, sir; for I’ll try if they can lick their
-fingers.
-
-CAPULET.
-How canst thou try them so?
-
-SECOND SERVANT.
-Marry, sir, ’tis an ill cook that cannot lick his own fingers;
-therefore he that cannot lick his fingers goes not with me.
-
-CAPULET.
-Go, begone.
-
- [_Exit second Servant._]
-
-We shall be much unfurnish’d for this time.
-What, is my daughter gone to Friar Lawrence?
-
-NURSE.
-Ay, forsooth.
-
-CAPULET.
-Well, he may chance to do some good on her.
-A peevish self-will’d harlotry it is.
-
- Enter Juliet.
-
-NURSE.
-See where she comes from shrift with merry look.
-
-CAPULET.
-How now, my headstrong. Where have you been gadding?
-
-JULIET.
-Where I have learnt me to repent the sin
-Of disobedient opposition
-To you and your behests; and am enjoin’d
-By holy Lawrence to fall prostrate here,
-To beg your pardon. Pardon, I beseech you.
-Henceforward I am ever rul’d by you.
-
-CAPULET.
-Send for the County, go tell him of this.
-I’ll have this knot knit up tomorrow morning.
-
-JULIET.
-I met the youthful lord at Lawrence’ cell,
-And gave him what becomed love I might,
-Not stepping o’er the bounds of modesty.
-
-CAPULET.
-Why, I am glad on’t. This is well. Stand up.
-This is as’t should be. Let me see the County.
-Ay, marry. Go, I say, and fetch him hither.
-Now afore God, this reverend holy Friar,
-All our whole city is much bound to him.
-
-JULIET.
-Nurse, will you go with me into my closet,
-To help me sort such needful ornaments
-As you think fit to furnish me tomorrow?
-
-LADY CAPULET.
-No, not till Thursday. There is time enough.
-
-CAPULET.
-Go, Nurse, go with her. We’ll to church tomorrow.
-
- [_Exeunt Juliet and Nurse._]
-
-LADY CAPULET.
-We shall be short in our provision,
-’Tis now near night.
-
-CAPULET.
-Tush, I will stir about,
-And all things shall be well, I warrant thee, wife.
-Go thou to Juliet, help to deck up her.
-I’ll not to bed tonight, let me alone.
-I’ll play the housewife for this once.—What, ho!—
-They are all forth: well, I will walk myself
-To County Paris, to prepare him up
-Against tomorrow. My heart is wondrous light
-Since this same wayward girl is so reclaim’d.
-
- [_Exeunt._]
-
-SCENE III. Juliet’s Chamber.
-
- Enter Juliet and Nurse.
-
-JULIET.
-Ay, those attires are best. But, gentle Nurse,
-I pray thee leave me to myself tonight;
-For I have need of many orisons
-To move the heavens to smile upon my state,
-Which, well thou know’st, is cross and full of sin.
-
- Enter Lady Capulet.
-
-LADY CAPULET.
-What, are you busy, ho? Need you my help?
-
-JULIET.
-No, madam; we have cull’d such necessaries
-As are behoveful for our state tomorrow.
-So please you, let me now be left alone,
-And let the nurse this night sit up with you,
-For I am sure you have your hands full all
-In this so sudden business.
-
-LADY CAPULET.
-Good night.
-Get thee to bed and rest, for thou hast need.
-
- [_Exeunt Lady Capulet and Nurse._]
-
-JULIET.
-Farewell. God knows when we shall meet again.
-I have a faint cold fear thrills through my veins
-That almost freezes up the heat of life.
-I’ll call them back again to comfort me.
-Nurse!—What should she do here?
-My dismal scene I needs must act alone.
-Come, vial.
-What if this mixture do not work at all?
-Shall I be married then tomorrow morning?
-No, No! This shall forbid it. Lie thou there.
-
- [_Laying down her dagger._]
-
-What if it be a poison, which the Friar
-Subtly hath minister’d to have me dead,
-Lest in this marriage he should be dishonour’d,
-Because he married me before to Romeo?
-I fear it is. And yet methinks it should not,
-For he hath still been tried a holy man.
-How if, when I am laid into the tomb,
-I wake before the time that Romeo
-Come to redeem me? There’s a fearful point!
-Shall I not then be stifled in the vault,
-To whose foul mouth no healthsome air breathes in,
-And there die strangled ere my Romeo comes?
-Or, if I live, is it not very like,
-The horrible conceit of death and night,
-Together with the terror of the place,
-As in a vault, an ancient receptacle,
-Where for this many hundred years the bones
-Of all my buried ancestors are pack’d,
-Where bloody Tybalt, yet but green in earth,
-Lies festering in his shroud; where, as they say,
-At some hours in the night spirits resort—
-Alack, alack, is it not like that I,
-So early waking, what with loathsome smells,
-And shrieks like mandrakes torn out of the earth,
-That living mortals, hearing them, run mad.
-O, if I wake, shall I not be distraught,
-Environed with all these hideous fears,
-And madly play with my forefathers’ joints?
-And pluck the mangled Tybalt from his shroud?
-And, in this rage, with some great kinsman’s bone,
-As with a club, dash out my desperate brains?
-O look, methinks I see my cousin’s ghost
-Seeking out Romeo that did spit his body
-Upon a rapier’s point. Stay, Tybalt, stay!
-Romeo, Romeo, Romeo, here’s drink! I drink to thee.
-
- [_Throws herself on the bed._]
-
-SCENE IV. Hall in Capulet’s House.
-
- Enter Lady Capulet and Nurse.
-
-LADY CAPULET.
-Hold, take these keys and fetch more spices, Nurse.
-
-NURSE.
-They call for dates and quinces in the pastry.
-
- Enter Capulet.
-
-CAPULET.
-Come, stir, stir, stir! The second cock hath crow’d,
-The curfew bell hath rung, ’tis three o’clock.
-Look to the bak’d meats, good Angelica;
-Spare not for cost.
-
-NURSE.
-Go, you cot-quean, go,
-Get you to bed; faith, you’ll be sick tomorrow
-For this night’s watching.
-
-CAPULET.
-No, not a whit. What! I have watch’d ere now
-All night for lesser cause, and ne’er been sick.
-
-LADY CAPULET.
-Ay, you have been a mouse-hunt in your time;
-But I will watch you from such watching now.
-
- [_Exeunt Lady Capulet and Nurse._]
-
-CAPULET.
-A jealous-hood, a jealous-hood!
-
- Enter Servants, with spits, logs and baskets.
-
-Now, fellow, what’s there?
-
-FIRST SERVANT.
-Things for the cook, sir; but I know not what.
-
-CAPULET.
-Make haste, make haste.
-
- [_Exit First Servant._]
-
-—Sirrah, fetch drier logs.
-Call Peter, he will show thee where they are.
-
-SECOND SERVANT.
-I have a head, sir, that will find out logs
-And never trouble Peter for the matter.
-
- [_Exit._]
-
-CAPULET.
-Mass and well said; a merry whoreson, ha.
-Thou shalt be loggerhead.—Good faith, ’tis day.
-The County will be here with music straight,
-For so he said he would. I hear him near.
-
- [_Play music._]
-
-Nurse! Wife! What, ho! What, Nurse, I say!
-
- Re-enter Nurse.
-
-Go waken Juliet, go and trim her up.
-I’ll go and chat with Paris. Hie, make haste,
-Make haste; the bridegroom he is come already.
-Make haste I say.
-
- [_Exeunt._]
-
-SCENE V. Juliet’s Chamber; Juliet on the bed.
-
- Enter Nurse.
-
-NURSE.
-Mistress! What, mistress! Juliet! Fast, I warrant her, she.
-Why, lamb, why, lady, fie, you slug-abed!
-Why, love, I say! Madam! Sweetheart! Why, bride!
-What, not a word? You take your pennyworths now.
-Sleep for a week; for the next night, I warrant,
-The County Paris hath set up his rest
-That you shall rest but little. God forgive me!
-Marry and amen. How sound is she asleep!
-I needs must wake her. Madam, madam, madam!
-Ay, let the County take you in your bed,
-He’ll fright you up, i’faith. Will it not be?
-What, dress’d, and in your clothes, and down again?
-I must needs wake you. Lady! Lady! Lady!
-Alas, alas! Help, help! My lady’s dead!
-O, well-a-day that ever I was born.
-Some aqua vitae, ho! My lord! My lady!
-
- Enter Lady Capulet.
-
-LADY CAPULET.
-What noise is here?
-
-NURSE.
-O lamentable day!
-
-LADY CAPULET.
-What is the matter?
-
-NURSE.
-Look, look! O heavy day!
-
-LADY CAPULET.
-O me, O me! My child, my only life.
-Revive, look up, or I will die with thee.
-Help, help! Call help.
-
- Enter Capulet.
-
-CAPULET.
-For shame, bring Juliet forth, her lord is come.
-
-NURSE.
-She’s dead, deceas’d, she’s dead; alack the day!
-
-LADY CAPULET.
-Alack the day, she’s dead, she’s dead, she’s dead!
-
-CAPULET.
-Ha! Let me see her. Out alas! She’s cold,
-Her blood is settled and her joints are stiff.
-Life and these lips have long been separated.
-Death lies on her like an untimely frost
-Upon the sweetest flower of all the field.
-
-NURSE.
-O lamentable day!
-
-LADY CAPULET.
-O woful time!
-
-CAPULET.
-Death, that hath ta’en her hence to make me wail,
-Ties up my tongue and will not let me speak.
-
- Enter Friar Lawrence and Paris with Musicians.
-
-FRIAR LAWRENCE.
-Come, is the bride ready to go to church?
-
-CAPULET.
-Ready to go, but never to return.
-O son, the night before thy wedding day
-Hath death lain with thy bride. There she lies,
-Flower as she was, deflowered by him.
-Death is my son-in-law, death is my heir;
-My daughter he hath wedded. I will die
-And leave him all; life, living, all is death’s.
-
-PARIS.
-Have I thought long to see this morning’s face,
-And doth it give me such a sight as this?
-
-LADY CAPULET.
-Accurs’d, unhappy, wretched, hateful day.
-Most miserable hour that e’er time saw
-In lasting labour of his pilgrimage.
-But one, poor one, one poor and loving child,
-But one thing to rejoice and solace in,
-And cruel death hath catch’d it from my sight.
-
-NURSE.
-O woe! O woeful, woeful, woeful day.
-Most lamentable day, most woeful day
-That ever, ever, I did yet behold!
-O day, O day, O day, O hateful day.
-Never was seen so black a day as this.
-O woeful day, O woeful day.
-
-PARIS.
-Beguil’d, divorced, wronged, spited, slain.
-Most detestable death, by thee beguil’d,
-By cruel, cruel thee quite overthrown.
-O love! O life! Not life, but love in death!
-
-CAPULET.
-Despis’d, distressed, hated, martyr’d, kill’d.
-Uncomfortable time, why cam’st thou now
-To murder, murder our solemnity?
-O child! O child! My soul, and not my child,
-Dead art thou. Alack, my child is dead,
-And with my child my joys are buried.
-
-FRIAR LAWRENCE.
-Peace, ho, for shame. Confusion’s cure lives not
-In these confusions. Heaven and yourself
-Had part in this fair maid, now heaven hath all,
-And all the better is it for the maid.
-Your part in her you could not keep from death,
-But heaven keeps his part in eternal life.
-The most you sought was her promotion,
-For ’twas your heaven she should be advanc’d,
-And weep ye now, seeing she is advanc’d
-Above the clouds, as high as heaven itself?
-O, in this love, you love your child so ill
-That you run mad, seeing that she is well.
-She’s not well married that lives married long,
-But she’s best married that dies married young.
-Dry up your tears, and stick your rosemary
-On this fair corse, and, as the custom is,
-And in her best array bear her to church;
-For though fond nature bids us all lament,
-Yet nature’s tears are reason’s merriment.
-
-CAPULET.
-All things that we ordained festival
-Turn from their office to black funeral:
-Our instruments to melancholy bells,
-Our wedding cheer to a sad burial feast;
-Our solemn hymns to sullen dirges change;
-Our bridal flowers serve for a buried corse,
-And all things change them to the contrary.
-
-FRIAR LAWRENCE.
-Sir, go you in, and, madam, go with him,
-And go, Sir Paris, everyone prepare
-To follow this fair corse unto her grave.
-The heavens do lower upon you for some ill;
-Move them no more by crossing their high will.
-
- [_Exeunt Capulet, Lady Capulet, Paris and Friar._]
-
-FIRST MUSICIAN.
-Faith, we may put up our pipes and be gone.
-
-NURSE.
-Honest good fellows, ah, put up, put up,
-For well you know this is a pitiful case.
-
-FIRST MUSICIAN.
-Ay, by my troth, the case may be amended.
-
- [_Exit Nurse._]
-
- Enter Peter.
-
-PETER.
-Musicians, O, musicians, ‘Heart’s ease,’ ‘Heart’s ease’, O, and you
-will have me live, play ‘Heart’s ease.’
-
-FIRST MUSICIAN.
-Why ‘Heart’s ease’?
-
-PETER.
-O musicians, because my heart itself plays ‘My heart is full’. O play
-me some merry dump to comfort me.
-
-FIRST MUSICIAN.
-Not a dump we, ’tis no time to play now.
-
-PETER.
-You will not then?
-
-FIRST MUSICIAN.
-No.
-
-PETER.
-I will then give it you soundly.
-
-FIRST MUSICIAN.
-What will you give us?
-
-PETER.
-No money, on my faith, but the gleek! I will give you the minstrel.
-
-FIRST MUSICIAN.
-Then will I give you the serving-creature.
-
-PETER.
-Then will I lay the serving-creature’s dagger on your pate. I will
-carry no crotchets. I’ll re you, I’ll fa you. Do you note me?
-
-FIRST MUSICIAN.
-And you re us and fa us, you note us.
-
-SECOND MUSICIAN.
-Pray you put up your dagger, and put out your wit.
-
-PETER.
-Then have at you with my wit. I will dry-beat you with an iron wit, and
-put up my iron dagger. Answer me like men.
-    ‘When griping griefs the heart doth wound,
-      And doleful dumps the mind oppress,
-    Then music with her silver sound’—
-Why ‘silver sound’? Why ‘music with her silver sound’? What say you,
-Simon Catling?
-
-FIRST MUSICIAN.
-Marry, sir, because silver hath a sweet sound.
-
-PETER.
-Prates. What say you, Hugh Rebeck?
-
-SECOND MUSICIAN.
-I say ‘silver sound’ because musicians sound for silver.
-
-PETER.
-Prates too! What say you, James Soundpost?
-
-THIRD MUSICIAN.
-Faith, I know not what to say.
-
-PETER.
-O, I cry you mercy, you are the singer. I will say for you. It is
-‘music with her silver sound’ because musicians have no gold for
-sounding.
-      ‘Then music with her silver sound
-      With speedy help doth lend redress.’
-
- [_Exit._]
-
-FIRST MUSICIAN.
-What a pestilent knave is this same!
-
-SECOND MUSICIAN.
-Hang him, Jack. Come, we’ll in here, tarry for the mourners, and stay
-dinner.
-
- [_Exeunt._]
-
-
-
-
-ACT V
-
-SCENE I. Mantua. A Street.
-
-
- Enter Romeo.
-
-ROMEO.
-If I may trust the flattering eye of sleep,
-My dreams presage some joyful news at hand.
-My bosom’s lord sits lightly in his throne;
-And all this day an unaccustom’d spirit
-Lifts me above the ground with cheerful thoughts.
-I dreamt my lady came and found me dead,—
-Strange dream, that gives a dead man leave to think!—
-And breath’d such life with kisses in my lips,
-That I reviv’d, and was an emperor.
-Ah me, how sweet is love itself possess’d,
-When but love’s shadows are so rich in joy.
-
- Enter Balthasar.
-
-News from Verona! How now, Balthasar?
-Dost thou not bring me letters from the Friar?
-How doth my lady? Is my father well?
-How fares my Juliet? That I ask again;
-For nothing can be ill if she be well.
-
-BALTHASAR.
-Then she is well, and nothing can be ill.
-Her body sleeps in Capel’s monument,
-And her immortal part with angels lives.
-I saw her laid low in her kindred’s vault,
-And presently took post to tell it you.
-O pardon me for bringing these ill news,
-Since you did leave it for my office, sir.
-
-ROMEO.
-Is it even so? Then I defy you, stars!
-Thou know’st my lodging. Get me ink and paper,
-And hire post-horses. I will hence tonight.
-
-BALTHASAR.
-I do beseech you sir, have patience.
-Your looks are pale and wild, and do import
-Some misadventure.
-
-ROMEO.
-Tush, thou art deceiv’d.
-Leave me, and do the thing I bid thee do.
-Hast thou no letters to me from the Friar?
-
-BALTHASAR.
-No, my good lord.
-
-ROMEO.
-No matter. Get thee gone,
-And hire those horses. I’ll be with thee straight.
-
- [_Exit Balthasar._]
-
-Well, Juliet, I will lie with thee tonight.
-Let’s see for means. O mischief thou art swift
-To enter in the thoughts of desperate men.
-I do remember an apothecary,—
-And hereabouts he dwells,—which late I noted
-In tatter’d weeds, with overwhelming brows,
-Culling of simples, meagre were his looks,
-Sharp misery had worn him to the bones;
-And in his needy shop a tortoise hung,
-An alligator stuff’d, and other skins
-Of ill-shaped fishes; and about his shelves
-A beggarly account of empty boxes,
-Green earthen pots, bladders, and musty seeds,
-Remnants of packthread, and old cakes of roses
-Were thinly scatter’d, to make up a show.
-Noting this penury, to myself I said,
-And if a man did need a poison now,
-Whose sale is present death in Mantua,
-Here lives a caitiff wretch would sell it him.
-O, this same thought did but forerun my need,
-And this same needy man must sell it me.
-As I remember, this should be the house.
-Being holiday, the beggar’s shop is shut.
-What, ho! Apothecary!
-
- Enter Apothecary.
-
-APOTHECARY.
-Who calls so loud?
-
-ROMEO.
-Come hither, man. I see that thou art poor.
-Hold, there is forty ducats. Let me have
-A dram of poison, such soon-speeding gear
-As will disperse itself through all the veins,
-That the life-weary taker may fall dead,
-And that the trunk may be discharg’d of breath
-As violently as hasty powder fir’d
-Doth hurry from the fatal cannon’s womb.
-
-APOTHECARY.
-Such mortal drugs I have, but Mantua’s law
-Is death to any he that utters them.
-
-ROMEO.
-Art thou so bare and full of wretchedness,
-And fear’st to die? Famine is in thy cheeks,
-Need and oppression starveth in thine eyes,
-Contempt and beggary hangs upon thy back.
-The world is not thy friend, nor the world’s law;
-The world affords no law to make thee rich;
-Then be not poor, but break it and take this.
-
-APOTHECARY.
-My poverty, but not my will consents.
-
-ROMEO.
-I pay thy poverty, and not thy will.
-
-APOTHECARY.
-Put this in any liquid thing you will
-And drink it off; and, if you had the strength
-Of twenty men, it would despatch you straight.
-
-ROMEO.
-There is thy gold, worse poison to men’s souls,
-Doing more murder in this loathsome world
-Than these poor compounds that thou mayst not sell.
-I sell thee poison, thou hast sold me none.
-Farewell, buy food, and get thyself in flesh.
-Come, cordial and not poison, go with me
-To Juliet’s grave, for there must I use thee.
-
- [_Exeunt._]
-
-SCENE II. Friar Lawrence’s Cell.
-
- Enter Friar John.
-
-FRIAR JOHN.
-Holy Franciscan Friar! Brother, ho!
-
- Enter Friar Lawrence.
-
-FRIAR LAWRENCE.
-This same should be the voice of Friar John.
-Welcome from Mantua. What says Romeo?
-Or, if his mind be writ, give me his letter.
-
-FRIAR JOHN.
-Going to find a barefoot brother out,
-One of our order, to associate me,
-Here in this city visiting the sick,
-And finding him, the searchers of the town,
-Suspecting that we both were in a house
-Where the infectious pestilence did reign,
-Seal’d up the doors, and would not let us forth,
-So that my speed to Mantua there was stay’d.
-
-FRIAR LAWRENCE.
-Who bare my letter then to Romeo?
-
-FRIAR JOHN.
-I could not send it,—here it is again,—
-Nor get a messenger to bring it thee,
-So fearful were they of infection.
-
-FRIAR LAWRENCE.
-Unhappy fortune! By my brotherhood,
-The letter was not nice, but full of charge,
-Of dear import, and the neglecting it
-May do much danger. Friar John, go hence,
-Get me an iron crow and bring it straight
-Unto my cell.
-
-FRIAR JOHN.
-Brother, I’ll go and bring it thee.
-
- [_Exit._]
-
-FRIAR LAWRENCE.
-Now must I to the monument alone.
-Within this three hours will fair Juliet wake.
-She will beshrew me much that Romeo
-Hath had no notice of these accidents;
-But I will write again to Mantua,
-And keep her at my cell till Romeo come.
-Poor living corse, clos’d in a dead man’s tomb.
-
- [_Exit._]
-
-SCENE III. A churchyard; in it a Monument belonging to the Capulets.
-
- Enter Paris, and his Page bearing flowers and a torch.
-
-PARIS.
-Give me thy torch, boy. Hence and stand aloof.
-Yet put it out, for I would not be seen.
-Under yond yew tree lay thee all along,
-Holding thy ear close to the hollow ground;
-So shall no foot upon the churchyard tread,
-Being loose, unfirm, with digging up of graves,
-But thou shalt hear it. Whistle then to me,
-As signal that thou hear’st something approach.
-Give me those flowers. Do as I bid thee, go.
-
-PAGE.
-[_Aside._] I am almost afraid to stand alone
-Here in the churchyard; yet I will adventure.
-
- [_Retires._]
-
-PARIS.
-Sweet flower, with flowers thy bridal bed I strew.
-O woe, thy canopy is dust and stones,
-Which with sweet water nightly I will dew,
-Or wanting that, with tears distill’d by moans.
-The obsequies that I for thee will keep,
-Nightly shall be to strew thy grave and weep.
-
- [_The Page whistles._]
-
-The boy gives warning something doth approach.
-What cursed foot wanders this way tonight,
-To cross my obsequies and true love’s rite?
-What, with a torch! Muffle me, night, awhile.
-
- [_Retires._]
-
- Enter Romeo and Balthasar with a torch, mattock, &c.
-
-ROMEO.
-Give me that mattock and the wrenching iron.
-Hold, take this letter; early in the morning
-See thou deliver it to my lord and father.
-Give me the light; upon thy life I charge thee,
-Whate’er thou hear’st or seest, stand all aloof
-And do not interrupt me in my course.
-Why I descend into this bed of death
-Is partly to behold my lady’s face,
-But chiefly to take thence from her dead finger
-A precious ring, a ring that I must use
-In dear employment. Therefore hence, be gone.
-But if thou jealous dost return to pry
-In what I further shall intend to do,
-By heaven I will tear thee joint by joint,
-And strew this hungry churchyard with thy limbs.
-The time and my intents are savage-wild;
-More fierce and more inexorable far
-Than empty tigers or the roaring sea.
-
-BALTHASAR.
-I will be gone, sir, and not trouble you.
-
-ROMEO.
-So shalt thou show me friendship. Take thou that.
-Live, and be prosperous, and farewell, good fellow.
-
-BALTHASAR.
-For all this same, I’ll hide me hereabout.
-His looks I fear, and his intents I doubt.
-
- [_Retires_]
-
-ROMEO.
-Thou detestable maw, thou womb of death,
-Gorg’d with the dearest morsel of the earth,
-Thus I enforce thy rotten jaws to open,
-
- [_Breaking open the door of the monument._]
-
-And in despite, I’ll cram thee with more food.
-
-PARIS.
-This is that banish’d haughty Montague
-That murder’d my love’s cousin,—with which grief,
-It is supposed, the fair creature died,—
-And here is come to do some villainous shame
-To the dead bodies. I will apprehend him.
-
- [_Advances._]
-
-Stop thy unhallow’d toil, vile Montague.
-Can vengeance be pursu’d further than death?
-Condemned villain, I do apprehend thee.
-Obey, and go with me, for thou must die.
-
-ROMEO.
-I must indeed; and therefore came I hither.
-Good gentle youth, tempt not a desperate man.
-Fly hence and leave me. Think upon these gone;
-Let them affright thee. I beseech thee, youth,
-Put not another sin upon my head
-By urging me to fury. O be gone.
-By heaven I love thee better than myself;
-For I come hither arm’d against myself.
-Stay not, be gone, live, and hereafter say,
-A madman’s mercy bid thee run away.
-
-PARIS.
-I do defy thy conjuration,
-And apprehend thee for a felon here.
-
-ROMEO.
-Wilt thou provoke me? Then have at thee, boy!
-
- [_They fight._]
-
-PAGE.
-O lord, they fight! I will go call the watch.
-
- [_Exit._]
-
-PARIS.
-O, I am slain! [_Falls._] If thou be merciful,
-Open the tomb, lay me with Juliet.
-
- [_Dies._]
-
-ROMEO.
-In faith, I will. Let me peruse this face.
-Mercutio’s kinsman, noble County Paris!
-What said my man, when my betossed soul
-Did not attend him as we rode? I think
-He told me Paris should have married Juliet.
-Said he not so? Or did I dream it so?
-Or am I mad, hearing him talk of Juliet,
-To think it was so? O, give me thy hand,
-One writ with me in sour misfortune’s book.
-I’ll bury thee in a triumphant grave.
-A grave? O no, a lantern, slaught’red youth,
-For here lies Juliet, and her beauty makes
-This vault a feasting presence full of light.
-Death, lie thou there, by a dead man interr’d.
-
- [_Laying Paris in the monument._]
-
-How oft when men are at the point of death
-Have they been merry! Which their keepers call
-A lightning before death. O, how may I
-Call this a lightning? O my love, my wife,
-Death that hath suck’d the honey of thy breath,
-Hath had no power yet upon thy beauty.
-Thou art not conquer’d. Beauty’s ensign yet
-Is crimson in thy lips and in thy cheeks,
-And death’s pale flag is not advanced there.
-Tybalt, liest thou there in thy bloody sheet?
-O, what more favour can I do to thee
-Than with that hand that cut thy youth in twain
-To sunder his that was thine enemy?
-Forgive me, cousin. Ah, dear Juliet,
-Why art thou yet so fair? Shall I believe
-That unsubstantial death is amorous;
-And that the lean abhorred monster keeps
-Thee here in dark to be his paramour?
-For fear of that I still will stay with thee,
-And never from this palace of dim night
-Depart again. Here, here will I remain
-With worms that are thy chambermaids. O, here
-Will I set up my everlasting rest;
-And shake the yoke of inauspicious stars
-From this world-wearied flesh. Eyes, look your last.
-Arms, take your last embrace! And, lips, O you
-The doors of breath, seal with a righteous kiss
-A dateless bargain to engrossing death.
-Come, bitter conduct, come, unsavoury guide.
-Thou desperate pilot, now at once run on
-The dashing rocks thy sea-sick weary bark.
-Here’s to my love! [_Drinks._] O true apothecary!
-Thy drugs are quick. Thus with a kiss I die.
-
- [_Dies._]
-
- Enter, at the other end of the Churchyard, Friar Lawrence, with a
- lantern, crow, and spade.
-
-FRIAR LAWRENCE.
-Saint Francis be my speed. How oft tonight
-Have my old feet stumbled at graves? Who’s there?
-Who is it that consorts, so late, the dead?
-
-BALTHASAR.
-Here’s one, a friend, and one that knows you well.
-
-FRIAR LAWRENCE.
-Bliss be upon you. Tell me, good my friend,
-What torch is yond that vainly lends his light
-To grubs and eyeless skulls? As I discern,
-It burneth in the Capels’ monument.
-
-BALTHASAR.
-It doth so, holy sir, and there’s my master,
-One that you love.
-
-FRIAR LAWRENCE.
-Who is it?
-
-BALTHASAR.
-Romeo.
-
-FRIAR LAWRENCE.
-How long hath he been there?
-
-BALTHASAR.
-Full half an hour.
-
-FRIAR LAWRENCE.
-Go with me to the vault.
-
-BALTHASAR.
-I dare not, sir;
-My master knows not but I am gone hence,
-And fearfully did menace me with death
-If I did stay to look on his intents.
-
-FRIAR LAWRENCE.
-Stay then, I’ll go alone. Fear comes upon me.
-O, much I fear some ill unlucky thing.
-
-BALTHASAR.
-As I did sleep under this yew tree here,
-I dreamt my master and another fought,
-And that my master slew him.
-
-FRIAR LAWRENCE.
-Romeo! [_Advances._]
-Alack, alack, what blood is this which stains
-The stony entrance of this sepulchre?
-What mean these masterless and gory swords
-To lie discolour’d by this place of peace?
-
- [_Enters the monument._]
-
-Romeo! O, pale! Who else? What, Paris too?
-And steep’d in blood? Ah what an unkind hour
-Is guilty of this lamentable chance?
-The lady stirs.
-
- [_Juliet wakes and stirs._]
-
-JULIET.
-O comfortable Friar, where is my lord?
-I do remember well where I should be,
-And there I am. Where is my Romeo?
-
- [_Noise within._]
-
-FRIAR LAWRENCE.
-I hear some noise. Lady, come from that nest
-Of death, contagion, and unnatural sleep.
-A greater power than we can contradict
-Hath thwarted our intents. Come, come away.
-Thy husband in thy bosom there lies dead;
-And Paris too. Come, I’ll dispose of thee
-Among a sisterhood of holy nuns.
-Stay not to question, for the watch is coming.
-Come, go, good Juliet. I dare no longer stay.
-
-JULIET.
-Go, get thee hence, for I will not away.
-
- [_Exit Friar Lawrence._]
-
-What’s here? A cup clos’d in my true love’s hand?
-Poison, I see, hath been his timeless end.
-O churl. Drink all, and left no friendly drop
-To help me after? I will kiss thy lips.
-Haply some poison yet doth hang on them,
-To make me die with a restorative.
-
- [_Kisses him._]
-
-Thy lips are warm!
-
-FIRST WATCH.
-[_Within._] Lead, boy. Which way?
-
-JULIET.
-Yea, noise? Then I’ll be brief. O happy dagger.
-
- [_Snatching Romeo’s dagger._]
-
-This is thy sheath. [_stabs herself_] There rest, and let me die.
-
- [_Falls on Romeo’s body and dies._]
-
- Enter Watch with the Page of Paris.
-
-PAGE.
-This is the place. There, where the torch doth burn.
-
-FIRST WATCH.
-The ground is bloody. Search about the churchyard.
-Go, some of you, whoe’er you find attach.
-
- [_Exeunt some of the Watch._]
-
-Pitiful sight! Here lies the County slain,
-And Juliet bleeding, warm, and newly dead,
-Who here hath lain this two days buried.
-Go tell the Prince; run to the Capulets.
-Raise up the Montagues, some others search.
-
- [_Exeunt others of the Watch._]
-
-We see the ground whereon these woes do lie,
-But the true ground of all these piteous woes
-We cannot without circumstance descry.
-
- Re-enter some of the Watch with Balthasar.
-
-SECOND WATCH.
-Here’s Romeo’s man. We found him in the churchyard.
-
-FIRST WATCH.
-Hold him in safety till the Prince come hither.
-
- Re-enter others of the Watch with Friar Lawrence.
-
-THIRD WATCH. Here is a Friar that trembles, sighs, and weeps.
-We took this mattock and this spade from him
-As he was coming from this churchyard side.
-
-FIRST WATCH.
-A great suspicion. Stay the Friar too.
-
- Enter the Prince and Attendants.
-
-PRINCE.
-What misadventure is so early up,
-That calls our person from our morning’s rest?
-
- Enter Capulet, Lady Capulet and others.
-
-CAPULET.
-What should it be that they so shriek abroad?
-
-LADY CAPULET.
-O the people in the street cry Romeo,
-Some Juliet, and some Paris, and all run
-With open outcry toward our monument.
-
-PRINCE.
-What fear is this which startles in our ears?
-
-FIRST WATCH.
-Sovereign, here lies the County Paris slain,
-And Romeo dead, and Juliet, dead before,
-Warm and new kill’d.
-
-PRINCE.
-Search, seek, and know how this foul murder comes.
-
-FIRST WATCH.
-Here is a Friar, and slaughter’d Romeo’s man,
-With instruments upon them fit to open
-These dead men’s tombs.
-
-CAPULET.
-O heaven! O wife, look how our daughter bleeds!
-This dagger hath mista’en, for lo, his house
-Is empty on the back of Montague,
-And it mis-sheathed in my daughter’s bosom.
-
-LADY CAPULET.
-O me! This sight of death is as a bell
-That warns my old age to a sepulchre.
-
- Enter Montague and others.
-
-PRINCE.
-Come, Montague, for thou art early up,
-To see thy son and heir more early down.
-
-MONTAGUE.
-Alas, my liege, my wife is dead tonight.
-Grief of my son’s exile hath stopp’d her breath.
-What further woe conspires against mine age?
-
-PRINCE.
-Look, and thou shalt see.
-
-MONTAGUE.
-O thou untaught! What manners is in this,
-To press before thy father to a grave?
-
-PRINCE.
-Seal up the mouth of outrage for a while,
-Till we can clear these ambiguities,
-And know their spring, their head, their true descent,
-And then will I be general of your woes,
-And lead you even to death. Meantime forbear,
-And let mischance be slave to patience.
-Bring forth the parties of suspicion.
-
-FRIAR LAWRENCE.
-I am the greatest, able to do least,
-Yet most suspected, as the time and place
-Doth make against me, of this direful murder.
-And here I stand, both to impeach and purge
-Myself condemned and myself excus’d.
-
-PRINCE.
-Then say at once what thou dost know in this.
-
-FRIAR LAWRENCE.
-I will be brief, for my short date of breath
-Is not so long as is a tedious tale.
-Romeo, there dead, was husband to that Juliet,
-And she, there dead, that Romeo’s faithful wife.
-I married them; and their stol’n marriage day
-Was Tybalt’s doomsday, whose untimely death
-Banish’d the new-made bridegroom from this city;
-For whom, and not for Tybalt, Juliet pin’d.
-You, to remove that siege of grief from her,
-Betroth’d, and would have married her perforce
-To County Paris. Then comes she to me,
-And with wild looks, bid me devise some means
-To rid her from this second marriage,
-Or in my cell there would she kill herself.
-Then gave I her, so tutored by my art,
-A sleeping potion, which so took effect
-As I intended, for it wrought on her
-The form of death. Meantime I writ to Romeo
-That he should hither come as this dire night
-To help to take her from her borrow’d grave,
-Being the time the potion’s force should cease.
-But he which bore my letter, Friar John,
-Was stay’d by accident; and yesternight
-Return’d my letter back. Then all alone
-At the prefixed hour of her waking
-Came I to take her from her kindred’s vault,
-Meaning to keep her closely at my cell
-Till I conveniently could send to Romeo.
-But when I came, some minute ere the time
-Of her awaking, here untimely lay
-The noble Paris and true Romeo dead.
-She wakes; and I entreated her come forth
-And bear this work of heaven with patience.
-But then a noise did scare me from the tomb;
-And she, too desperate, would not go with me,
-But, as it seems, did violence on herself.
-All this I know; and to the marriage
-Her Nurse is privy. And if ought in this
-Miscarried by my fault, let my old life
-Be sacrific’d, some hour before his time,
-Unto the rigour of severest law.
-
-PRINCE.
-We still have known thee for a holy man.
-Where’s Romeo’s man? What can he say to this?
-
-BALTHASAR.
-I brought my master news of Juliet’s death,
-And then in post he came from Mantua
-To this same place, to this same monument.
-This letter he early bid me give his father,
-And threaten’d me with death, going in the vault,
-If I departed not, and left him there.
-
-PRINCE.
-Give me the letter, I will look on it.
-Where is the County’s Page that rais’d the watch?
-Sirrah, what made your master in this place?
-
-PAGE.
-He came with flowers to strew his lady’s grave,
-And bid me stand aloof, and so I did.
-Anon comes one with light to ope the tomb,
-And by and by my master drew on him,
-And then I ran away to call the watch.
-
-PRINCE.
-This letter doth make good the Friar’s words,
-Their course of love, the tidings of her death.
-And here he writes that he did buy a poison
-Of a poor ’pothecary, and therewithal
-Came to this vault to die, and lie with Juliet.
-Where be these enemies? Capulet, Montague,
-See what a scourge is laid upon your hate,
-That heaven finds means to kill your joys with love!
-And I, for winking at your discords too,
-Have lost a brace of kinsmen. All are punish’d.
-
-CAPULET.
-O brother Montague, give me thy hand.
-This is my daughter’s jointure, for no more
-Can I demand.
-
-MONTAGUE.
-But I can give thee more,
-For I will raise her statue in pure gold,
-That whiles Verona by that name is known,
-There shall no figure at such rate be set
-As that of true and faithful Juliet.
-
-CAPULET.
-As rich shall Romeo’s by his lady’s lie,
-Poor sacrifices of our enmity.
-
-PRINCE.
-A glooming peace this morning with it brings;
-The sun for sorrow will not show his head.
-Go hence, to have more talk of these sad things.
-Some shall be pardon’d, and some punished,
-For never was a story of more woe
-Than this of Juliet and her Romeo.
-
- [_Exeunt._]
-
-
-
-
-*** END OF THE PROJECT GUTENBERG EBOOK ROMEO AND JULIET ***
-
-
-    
-
-Updated editions will replace the previous one—the old editions will
-be renamed.
-
-Creating the works from print editions not protected by U.S. copyright
-law means that no one owns a United States copyright in these works,
-so the Foundation (and you!) can copy and distribute it in the United
-States without permission and without paying copyright
-royalties. Special rules, set forth in the General Terms of Use part
-of this license, apply to copying and distributing Project
-Gutenberg™ electronic works to protect the PROJECT GUTENBERG™
-concept and trademark. Project Gutenberg is a registered trademark,
-and may not be used if you charge for an eBook, except by following
-the terms of the trademark license, including paying royalties for use
-of the Project Gutenberg trademark. If you do not charge anything for
-copies of this eBook, complying with the trademark license is very
-easy. You may use this eBook for nearly any purpose such as creation
-of derivative works, reports, performances and research. Project
-Gutenberg eBooks may be modified and printed and given away—you may
-do practically ANYTHING in the United States with eBooks not protected
-by U.S. copyright law. Redistribution is subject to the trademark
-license, especially commercial redistribution.
-
-
-START: FULL LICENSE
-
-THE FULL PROJECT GUTENBERG LICENSE
-
-PLEASE READ THIS BEFORE YOU DISTRIBUTE OR USE THIS WORK
-
-To protect the Project Gutenberg™ mission of promoting the free
-distribution of electronic works, by using or distributing this work
-(or any other work associated in any way with the phrase “Project
-Gutenberg”), you agree to comply with all the terms of the Full
-Project Gutenberg™ License available with this file or online at
-www.gutenberg.org/license.
-
-Section 1. General Terms of Use and Redistributing Project Gutenberg™
-electronic works
-
-1.A. By reading or using any part of this Project Gutenberg™
-electronic work, you indicate that you have read, understand, agree to
-and accept all the terms of this license and intellectual property
-(trademark/copyright) agreement. If you do not agree to abide by all
-the terms of this agreement, you must cease using and return or
-destroy all copies of Project Gutenberg™ electronic works in your
-possession. If you paid a fee for obtaining a copy of or access to a
-Project Gutenberg™ electronic work and you do not agree to be bound
-by the terms of this agreement, you may obtain a refund from the person
-or entity to whom you paid the fee as set forth in paragraph 1.E.8.
-
-1.B. “Project Gutenberg” is a registered trademark. It may only be
-used on or associated in any way with an electronic work by people who
-agree to be bound by the terms of this agreement. There are a few
-things that you can do with most Project Gutenberg™ electronic works
-even without complying with the full terms of this agreement. See
-paragraph 1.C below. There are a lot of things you can do with Project
-Gutenberg™ electronic works if you follow the terms of this
-agreement and help preserve free future access to Project Gutenberg™
-electronic works. See paragraph 1.E below.
-
-1.C. The Project Gutenberg Literary Archive Foundation (“the
-Foundation” or PGLAF), owns a compilation copyright in the collection
-of Project Gutenberg™ electronic works. Nearly all the individual
-works in the collection are in the public domain in the United
-States. If an individual work is unprotected by copyright law in the
-United States and you are located in the United States, we do not
-claim a right to prevent you from copying, distributing, performing,
-displaying or creating derivative works based on the work as long as
-all references to Project Gutenberg are removed. Of course, we hope
-that you will support the Project Gutenberg™ mission of promoting
-free access to electronic works by freely sharing Project Gutenberg™
-works in compliance with the terms of this agreement for keeping the
-Project Gutenberg™ name associated with the work. You can easily
-comply with the terms of this agreement by keeping this work in the
-same format with its attached full Project Gutenberg™ License when
-you share it without charge with others.
-
-1.D. The copyright laws of the place where you are located also govern
-what you can do with this work. Copyright laws in most countries are
-in a constant state of change. If you are outside the United States,
-check the laws of your country in addition to the terms of this
-agreement before downloading, copying, displaying, performing,
-distributing or creating derivative works based on this work or any
-other Project Gutenberg™ work. The Foundation makes no
-representations concerning the copyright status of any work in any
-country other than the United States.
-
-1.E. Unless you have removed all references to Project Gutenberg:
-
-1.E.1. The following sentence, with active links to, or other
-immediate access to, the full Project Gutenberg™ License must appear
-prominently whenever any copy of a Project Gutenberg™ work (any work
-on which the phrase “Project Gutenberg” appears, or with which the
-phrase “Project Gutenberg” is associated) is accessed, displayed,
-performed, viewed, copied or distributed:
-
-    This eBook is for the use of anyone anywhere in the United States and most
-    other parts of the world at no cost and with almost no restrictions
-    whatsoever. You may copy it, give it away or re-use it under the terms
-    of the Project Gutenberg License included with this eBook or online
-    at www.gutenberg.org. If you
-    are not located in the United States, you will have to check the laws
-    of the country where you are located before using this eBook.
-  
-1.E.2. If an individual Project Gutenberg™ electronic work is
-derived from texts not protected by U.S. copyright law (does not
-contain a notice indicating that it is posted with permission of the
-copyright holder), the work can be copied and distributed to anyone in
-the United States without paying any fees or charges. If you are
-redistributing or providing access to a work with the phrase “Project
-Gutenberg” associated with or appearing on the work, you must comply
-either with the requirements of paragraphs 1.E.1 through 1.E.7 or
-obtain permission for the use of the work and the Project Gutenberg™
-trademark as set forth in paragraphs 1.E.8 or 1.E.9.
-
-1.E.3. If an individual Project Gutenberg™ electronic work is posted
-with the permission of the copyright holder, your use and distribution
-must comply with both paragraphs 1.E.1 through 1.E.7 and any
-additional terms imposed by the copyright holder. Additional terms
-will be linked to the Project Gutenberg™ License for all works
-posted with the permission of the copyright holder found at the
-beginning of this work.
-
-1.E.4. Do not unlink or detach or remove the full Project Gutenberg™
-License terms from this work, or any files containing a part of this
-work or any other work associated with Project Gutenberg™.
-
-1.E.5. Do not copy, display, perform, distribute or redistribute this
-electronic work, or any part of this electronic work, without
-prominently displaying the sentence set forth in paragraph 1.E.1 with
-active links or immediate access to the full terms of the Project
-Gutenberg™ License.
-
-1.E.6. You may convert to and distribute this work in any binary,
-compressed, marked up, nonproprietary or proprietary form, including
-any word processing or hypertext form. However, if you provide access
-to or distribute copies of a Project Gutenberg™ work in a format
-other than “Plain Vanilla ASCII” or other format used in the official
-version posted on the official Project Gutenberg™ website
-(www.gutenberg.org), you must, at no additional cost, fee or expense
-to the user, provide a copy, a means of exporting a copy, or a means
-of obtaining a copy upon request, of the work in its original “Plain
-Vanilla ASCII” or other form. Any alternate format must include the
-full Project Gutenberg™ License as specified in paragraph 1.E.1.
-
-1.E.7. Do not charge a fee for access to, viewing, displaying,
-performing, copying or distributing any Project Gutenberg™ works
-unless you comply with paragraph 1.E.8 or 1.E.9.
-
-1.E.8. You may charge a reasonable fee for copies of or providing
-access to or distributing Project Gutenberg™ electronic works
-provided that:
-
-    • You pay a royalty fee of 20% of the gross profits you derive from
-        the use of Project Gutenberg™ works calculated using the method
-        you already use to calculate your applicable taxes. The fee is owed
-        to the owner of the Project Gutenberg™ trademark, but he has
-        agreed to donate royalties under this paragraph to the Project
-        Gutenberg Literary Archive Foundation. Royalty payments must be paid
-        within 60 days following each date on which you prepare (or are
-        legally required to prepare) your periodic tax returns. Royalty
-        payments should be clearly marked as such and sent to the Project
-        Gutenberg Literary Archive Foundation at the address specified in
-        Section 4, “Information about donations to the Project Gutenberg
-        Literary Archive Foundation.”
-    
-    • You provide a full refund of any money paid by a user who notifies
-        you in writing (or by e-mail) within 30 days of receipt that s/he
-        does not agree to the terms of the full Project Gutenberg™
-        License. You must require such a user to return or destroy all
-        copies of the works possessed in a physical medium and discontinue
-        all use of and all access to other copies of Project Gutenberg™
-        works.
-    
-    • You provide, in accordance with paragraph 1.F.3, a full refund of
-        any money paid for a work or a replacement copy, if a defect in the
-        electronic work is discovered and reported to you within 90 days of
-        receipt of the work.
-    
-    • You comply with all other terms of this agreement for free
-        distribution of Project Gutenberg™ works.
-    
-
-1.E.9. If you wish to charge a fee or distribute a Project
-Gutenberg™ electronic work or group of works on different terms than
-are set forth in this agreement, you must obtain permission in writing
-from the Project Gutenberg Literary Archive Foundation, the manager of
-the Project Gutenberg™ trademark. Contact the Foundation as set
-forth in Section 3 below.
-
-1.F.
-
-1.F.1. Project Gutenberg volunteers and employees expend considerable
-effort to identify, do copyright research on, transcribe and proofread
-works not protected by U.S. copyright law in creating the Project
-Gutenberg™ collection. Despite these efforts, Project Gutenberg™
-electronic works, and the medium on which they may be stored, may
-contain “Defects,” such as, but not limited to, incomplete, inaccurate
-or corrupt data, transcription errors, a copyright or other
-intellectual property infringement, a defective or damaged disk or
-other medium, a computer virus, or computer codes that damage or
-cannot be read by your equipment.
-
-1.F.2. LIMITED WARRANTY, DISCLAIMER OF DAMAGES - Except for the “Right
-of Replacement or Refund” described in paragraph 1.F.3, the Project
-Gutenberg Literary Archive Foundation, the owner of the Project
-Gutenberg™ trademark, and any other party distributing a Project
-Gutenberg™ electronic work under this agreement, disclaim all
-liability to you for damages, costs and expenses, including legal
-fees. YOU AGREE THAT YOU HAVE NO REMEDIES FOR NEGLIGENCE, STRICT
-LIABILITY, BREACH OF WARRANTY OR BREACH OF CONTRACT EXCEPT THOSE
-PROVIDED IN PARAGRAPH 1.F.3. YOU AGREE THAT THE FOUNDATION, THE
-TRADEMARK OWNER, AND ANY DISTRIBUTOR UNDER THIS AGREEMENT WILL NOT BE
-LIABLE TO YOU FOR ACTUAL, DIRECT, INDIRECT, CONSEQUENTIAL, PUNITIVE OR
-INCIDENTAL DAMAGES EVEN IF YOU GIVE NOTICE OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-1.F.3. LIMITED RIGHT OF REPLACEMENT OR REFUND - If you discover a
-defect in this electronic work within 90 days of receiving it, you can
-receive a refund of the money (if any) you paid for it by sending a
-written explanation to the person you received the work from. If you
-received the work on a physical medium, you must return the medium
-with your written explanation. The person or entity that provided you
-with the defective work may elect to provide a replacement copy in
-lieu of a refund. If you received the work electronically, the person
-or entity providing it to you may choose to give you a second
-opportunity to receive the work electronically in lieu of a refund. If
-the second copy is also defective, you may demand a refund in writing
-without further opportunities to fix the problem.
-
-1.F.4. Except for the limited right of replacement or refund set forth
-in paragraph 1.F.3, this work is provided to you ‘AS-IS’, WITH NO
-OTHER WARRANTIES OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
-LIMITED TO WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PURPOSE.
-
-1.F.5. Some states do not allow disclaimers of certain implied
-warranties or the exclusion or limitation of certain types of
-damages. If any disclaimer or limitation set forth in this agreement
-violates the law of the state applicable to this agreement, the
-agreement shall be interpreted to make the maximum disclaimer or
-limitation permitted by the applicable state law. The invalidity or
-unenforceability of any provision of this agreement shall not void the
-remaining provisions.
-
-1.F.6. INDEMNITY - You agree to indemnify and hold the Foundation, the
-trademark owner, any agent or employee of the Foundation, anyone
-providing copies of Project Gutenberg™ electronic works in
-accordance with this agreement, and any volunteers associated with the
-production, promotion and distribution of Project Gutenberg™
-electronic works, harmless from all liability, costs and expenses,
-including legal fees, that arise directly or indirectly from any of
-the following which you do or cause to occur: (a) distribution of this
-or any Project Gutenberg™ work, (b) alteration, modification, or
-additions or deletions to any Project Gutenberg™ work, and (c) any
-Defect you cause.
-
-Section 2. Information about the Mission of Project Gutenberg™
-
-Project Gutenberg™ is synonymous with the free distribution of
-electronic works in formats readable by the widest variety of
-computers including obsolete, old, middle-aged and new computers. It
-exists because of the efforts of hundreds of volunteers and donations
-from people in all walks of life.
-
-Volunteers and financial support to provide volunteers with the
-assistance they need are critical to reaching Project Gutenberg™’s
-goals and ensuring that the Project Gutenberg™ collection will
-remain freely available for generations to come. In 2001, the Project
-Gutenberg Literary Archive Foundation was created to provide a secure
-and permanent future for Project Gutenberg™ and future
-generations. To learn more about the Project Gutenberg Literary
-Archive Foundation and how your efforts and donations can help, see
-Sections 3 and 4 and the Foundation information page at www.gutenberg.org.
-
-Section 3. Information about the Project Gutenberg Literary Archive Foundation
-
-The Project Gutenberg Literary Archive Foundation is a non-profit
-501(c)(3) educational corporation organized under the laws of the
-state of Mississippi and granted tax exempt status by the Internal
-Revenue Service. The Foundation’s EIN or federal tax identification
-number is 64-6221541. Contributions to the Project Gutenberg Literary
-Archive Foundation are tax deductible to the full extent permitted by
-U.S. federal laws and your state’s laws.
-
-The Foundation’s business office is located at 809 North 1500 West,
-Salt Lake City, UT 84116, (801) 596-1887. Email contact links and up
-to date contact information can be found at the Foundation’s website
-and official page at www.gutenberg.org/contact
-
-Section 4. Information about Donations to the Project Gutenberg
-Literary Archive Foundation
-
-Project Gutenberg™ depends upon and cannot survive without widespread
-public support and donations to carry out its mission of
-increasing the number of public domain and licensed works that can be
-freely distributed in machine-readable form accessible by the widest
-array of equipment including outdated equipment. Many small donations
-($1 to $5,000) are particularly important to maintaining tax exempt
-status with the IRS.
-
-The Foundation is committed to complying with the laws regulating
-charities and charitable donations in all 50 states of the United
-States. Compliance requirements are not uniform and it takes a
-considerable effort, much paperwork and many fees to meet and keep up
-with these requirements. We do not solicit donations in locations
-where we have not received written confirmation of compliance. To SEND
-DONATIONS or determine the status of compliance for any particular state
-visit www.gutenberg.org/donate.
-
-While we cannot and do not solicit contributions from states where we
-have not met the solicitation requirements, we know of no prohibition
-against accepting unsolicited donations from donors in such states who
-approach us with offers to donate.
-
-International donations are gratefully accepted, but we cannot make
-any statements concerning tax treatment of donations received from
-outside the United States. U.S. laws alone swamp our small staff.
-
-Please check the Project Gutenberg web pages for current donation
-methods and addresses. Donations are accepted in a number of other
-ways including checks, online payments and credit card donations. To
-donate, please visit: www.gutenberg.org/donate.
-
-Section 5. General Information About Project Gutenberg™ electronic works
-
-Professor Michael S. Hart was the originator of the Project
-Gutenberg™ concept of a library of electronic works that could be
-freely shared with anyone. For forty years, he produced and
-distributed Project Gutenberg™ eBooks with only a loose network of
-volunteer support.
-
-Project Gutenberg™ eBooks are often created from several printed
-editions, all of which are confirmed as not protected by copyright in
-the U.S. unless a copyright notice is included. Thus, we do not
-necessarily keep eBooks in compliance with any particular paper
-edition.
-
-Most people start at our website which has the main PG search
-facility: www.gutenberg.org.
-
-This website includes information about Project Gutenberg™,
-including how to make donations to the Project Gutenberg Literary
-Archive Foundation, how to help produce our new eBooks, and how to
-subscribe to our email newsletter to hear about new eBooks.
-

From 29ff60154584e2e94adb580dd0a178342e3c568f Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 6 Apr 2025 13:28:27 +0100
Subject: [PATCH 434/761] Bump versions to 0.3.7

---
 backend/Cargo.lock                     | 6 +++---
 backend/Cargo.toml                     | 2 +-
 frontend/obsidian-plugin/manifest.json | 2 +-
 frontend/obsidian-plugin/package.json  | 2 +-
 frontend/package-lock.json             | 8 ++++----
 frontend/sync-client/package.json      | 2 +-
 frontend/test-client/package.json      | 2 +-
 manifest.json                          | 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 2a008ac6..4c172ed8 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1922,7 +1922,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile"
-version = "0.3.6"
+version = "0.3.7"
 dependencies = [
  "insta",
  "pretty_assertions",
@@ -2540,7 +2540,7 @@ dependencies = [
 
 [[package]]
 name = "sync_lib"
-version = "0.3.6"
+version = "0.3.7"
 dependencies = [
  "base64 0.22.1",
  "console_error_panic_hook",
@@ -2553,7 +2553,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.3.6"
+version = "0.3.7"
 dependencies = [
  "aide",
  "aide-axum-typed-multipart",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 9f583425..046d6f73 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -12,7 +12,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.3.6"
+version = "0.3.7"
 
 [workspace.dependencies]
 serde = { version = "1.0.219", default-features = false, features = ["derive"] }
diff --git a/frontend/obsidian-plugin/manifest.json b/frontend/obsidian-plugin/manifest.json
index 1450df2b..306bafbc 100644
--- a/frontend/obsidian-plugin/manifest.json
+++ b/frontend/obsidian-plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.3.6",
+	"version": "0.3.7",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index 8f891bcd..f3359c3d 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.3.6",
+	"version": "0.3.7",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 1747f840..441b2df7 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -21,7 +21,7 @@
 		},
 		"../backend/sync_lib/pkg": {
 			"name": "sync_lib",
-			"version": "0.3.6",
+			"version": "0.3.7",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -7853,7 +7853,7 @@
 		},
 		"obsidian-plugin": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.3.6",
+			"version": "0.3.7",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
@@ -7881,7 +7881,7 @@
 			}
 		},
 		"sync-client": {
-			"version": "0.3.6",
+			"version": "0.3.7",
 			"dependencies": {
 				"byte-base64": "^1.1.0",
 				"openapi-fetch": "0.13.5",
@@ -7905,7 +7905,7 @@
 			}
 		},
 		"test-client": {
-			"version": "0.3.6",
+			"version": "0.3.7",
 			"bin": {
 				"test-client": "dist/cli.js"
 			},
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index e897cc55..c58bf9eb 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "sync-client",
-	"version": "0.3.6",
+	"version": "0.3.7",
 	"main": "dist/sync-client.node.js",
 	"browser": "dist/sync-client.web.js",
 	"types": "dist/types/index.d.ts",
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index 8a580420..07de1929 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "test-client",
-	"version": "0.3.6",
+	"version": "0.3.7",
 	"private": true,
 	"bin": {
 		"test-client": "./dist/cli.js"
diff --git a/manifest.json b/manifest.json
index 1450df2b..306bafbc 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.3.6",
+	"version": "0.3.7",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",

From f8b0501eea40ef3ccd94b0e9bdcd17f5f71614eb Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 6 Apr 2025 13:55:27 +0100
Subject: [PATCH 435/761] Fix E2E tests

---
 .../sync_server/src/server/update_document.rs | 26 -------------------
 .../sync-client/src/sync-operations/syncer.ts |  3 +--
 frontend/test-client/src/agent/mock-client.ts |  2 +-
 frontend/test-client/src/cli.ts               |  4 ++-
 4 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/backend/sync_server/src/server/update_document.rs b/backend/sync_server/src/server/update_document.rs
index a572394f..fdbbfd6e 100644
--- a/backend/sync_server/src/server/update_document.rs
+++ b/backend/sync_server/src/server/update_document.rs
@@ -104,32 +104,6 @@ async fn internal_update_document(
 
     let sanitized_relative_path = sanitize_path(&relative_path);
 
-    // Return the latest version if the update is a no-op from the client's
-    // perspective
-    if content == parent_document.content
-        && sanitized_relative_path == parent_document.relative_path
-    {
-        info!("Document content is the same as the parent version, skipping update");
-
-        let latest_version = state
-            .database
-            .get_latest_document(&vault_id, &document_id, None)
-            .await
-            .map_err(server_error)?
-            .map_or_else(
-                || {
-                    Err(not_found_error(anyhow!(
-                        "Document with id `{document_id}` not found",
-                    )))
-                },
-                Ok,
-            )?;
-
-        return Ok(Json(DocumentUpdateResponse::FastForwardUpdate(
-            latest_version.into(),
-        )));
-    }
-
     let mut transaction = state
         .database
         .create_write_transaction(&vault_id)
diff --git a/frontend/sync-client/src/sync-operations/syncer.ts b/frontend/sync-client/src/sync-operations/syncer.ts
index ef35d100..ff102668 100644
--- a/frontend/sync-client/src/sync-operations/syncer.ts
+++ b/frontend/sync-client/src/sync-operations/syncer.ts
@@ -274,9 +274,8 @@ export class Syncer {
 			typeof globalThis !== "undefined" &&
 			typeof globalThis.WebSocket === "undefined"
 		) {
-			// polyfill for WebSocket in Node.js
 			// eslint-disable-next-line
-			globalThis.WebSocket = require("ws");
+			globalThis.WebSocket = require("ws"); // polyfill for WebSocket in Node.js
 		}
 
 		this.applyRemoteChangesWebSocket = new WebSocket(wsUri);
diff --git a/frontend/test-client/src/agent/mock-client.ts b/frontend/test-client/src/agent/mock-client.ts
index 29d808f8..a1e2b9e9 100644
--- a/frontend/test-client/src/agent/mock-client.ts
+++ b/frontend/test-client/src/agent/mock-client.ts
@@ -108,7 +108,7 @@ export class MockClient implements FileSystemOperations {
 				{
 					assert(
 						newParts.includes(part),
-						`Part ${part} not found in new content`
+						`Part ${part} not found in new content: ${newContent}`
 					);
 				}
 			);
diff --git a/frontend/test-client/src/cli.ts b/frontend/test-client/src/cli.ts
index 799ee790..98dff41c 100644
--- a/frontend/test-client/src/cli.ts
+++ b/frontend/test-client/src/cli.ts
@@ -25,10 +25,12 @@ async function runTest({
 	const settings = `with ${agentCount} agents, concurrency ${concurrency}, iterations ${iterations}, doDeletes ${doDeletes}, jitterScaleInSeconds ${jitterScaleInSeconds}, useSlowFileEvents ${useSlowFileEvents}`;
 	console.info(`Running test ${settings}`);
 
+	const vaultName = uuidv4();
+	console.info(`Using vault name: ${vaultName}`);
 	const initialSettings: Partial<SyncSettings> = {
 		isSyncEnabled: true,
 		token: "test-token-change-me", // same as in backend/config-e2e.yml
-		vaultName: uuidv4(),
+		vaultName,
 		syncConcurrency: concurrency,
 		remoteUri: "http://localhost:3000"
 	};

From 59c143199ca6314d3d2317ca90623ed0b2b581bd Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 6 Apr 2025 13:56:03 +0100
Subject: [PATCH 436/761] Bump versions to 0.3.8

---
 backend/Cargo.lock                     | 6 +++---
 backend/Cargo.toml                     | 2 +-
 frontend/obsidian-plugin/manifest.json | 2 +-
 frontend/obsidian-plugin/package.json  | 2 +-
 frontend/package-lock.json             | 8 ++++----
 frontend/sync-client/package.json      | 2 +-
 frontend/test-client/package.json      | 2 +-
 manifest.json                          | 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 4c172ed8..7c356a19 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1922,7 +1922,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile"
-version = "0.3.7"
+version = "0.3.8"
 dependencies = [
  "insta",
  "pretty_assertions",
@@ -2540,7 +2540,7 @@ dependencies = [
 
 [[package]]
 name = "sync_lib"
-version = "0.3.7"
+version = "0.3.8"
 dependencies = [
  "base64 0.22.1",
  "console_error_panic_hook",
@@ -2553,7 +2553,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.3.7"
+version = "0.3.8"
 dependencies = [
  "aide",
  "aide-axum-typed-multipart",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 046d6f73..0e543c8c 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -12,7 +12,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.3.7"
+version = "0.3.8"
 
 [workspace.dependencies]
 serde = { version = "1.0.219", default-features = false, features = ["derive"] }
diff --git a/frontend/obsidian-plugin/manifest.json b/frontend/obsidian-plugin/manifest.json
index 306bafbc..fea93c92 100644
--- a/frontend/obsidian-plugin/manifest.json
+++ b/frontend/obsidian-plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.3.7",
+	"version": "0.3.8",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index f3359c3d..eb9d64db 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.3.7",
+	"version": "0.3.8",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 441b2df7..1ec3a737 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -21,7 +21,7 @@
 		},
 		"../backend/sync_lib/pkg": {
 			"name": "sync_lib",
-			"version": "0.3.7",
+			"version": "0.3.8",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -7853,7 +7853,7 @@
 		},
 		"obsidian-plugin": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.3.7",
+			"version": "0.3.8",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
@@ -7881,7 +7881,7 @@
 			}
 		},
 		"sync-client": {
-			"version": "0.3.7",
+			"version": "0.3.8",
 			"dependencies": {
 				"byte-base64": "^1.1.0",
 				"openapi-fetch": "0.13.5",
@@ -7905,7 +7905,7 @@
 			}
 		},
 		"test-client": {
-			"version": "0.3.7",
+			"version": "0.3.8",
 			"bin": {
 				"test-client": "dist/cli.js"
 			},
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index c58bf9eb..770decfd 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "sync-client",
-	"version": "0.3.7",
+	"version": "0.3.8",
 	"main": "dist/sync-client.node.js",
 	"browser": "dist/sync-client.web.js",
 	"types": "dist/types/index.d.ts",
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index 07de1929..278910a6 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "test-client",
-	"version": "0.3.7",
+	"version": "0.3.8",
 	"private": true,
 	"bin": {
 		"test-client": "./dist/cli.js"
diff --git a/manifest.json b/manifest.json
index 306bafbc..fea93c92 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.3.7",
+	"version": "0.3.8",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",

From 4cdc11cd50165ed939fa735aead9b3eafd317315 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 6 Apr 2025 16:27:56 +0100
Subject: [PATCH 437/761] Bump aide from 0.13.4 to 0.13.5 in /backend (#24)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 backend/Cargo.lock             | 4 ++--
 backend/sync_server/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 7c356a19..dac7f998 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -42,9 +42,9 @@ dependencies = [
 
 [[package]]
 name = "aide"
-version = "0.13.4"
+version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b0e3b97a21e41ec5c19bfd9b4fc1f7086be104f8b988681230247ffc91cc8ed"
+checksum = "5678d2978845ddb4bd736a026f467dd652d831e9e6254b0e41b07f7ee7523309"
 dependencies = [
  "axum",
  "axum-extra",
diff --git a/backend/sync_server/Cargo.toml b/backend/sync_server/Cargo.toml
index cce5b636..f9d5d3d4 100644
--- a/backend/sync_server/Cargo.toml
+++ b/backend/sync_server/Cargo.toml
@@ -25,7 +25,7 @@ tracing-subscriber = { version = "0.3.19", features = ["fmt", "env-filter"]}
 serde_yaml = "0.9.34"
 sqlx = { version = "0.8.3", features = ["sqlite", "runtime-tokio", "uuid", "chrono"] }
 chrono = { version = "0.4.40", features = ["serde"] }
-aide = { version = "0.13.4", features = ["axum", "axum-ws", "scalar", "axum-headers"] }
+aide = { version = "0.13.5", features = ["axum", "axum-ws", "scalar", "axum-headers"] }
 schemars = { version = "0.8.21", features = ["chrono", "uuid1", "bytes"] }
 tracing = "0.1.41"
 rand = "0.9.0"

From 3238d7b81967b7508f95222a6ff7fe10ef5785cd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 6 Apr 2025 16:28:25 +0100
Subject: [PATCH 438/761] Bump tokio from 1.44.1 to 1.44.2 in /backend (#23)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 backend/Cargo.lock             | 4 ++--
 backend/sync_server/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index dac7f998..6ad1e73f 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -2754,9 +2754,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.44.1"
+version = "1.44.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f382da615b842244d4b8738c82ed1275e6c5dd90c459a30941cd07080b06c91a"
+checksum = "e6b88822cbe49de4185e3a4cbf8321dd487cf5fe0c5c65695fef6346371e9c48"
 dependencies = [
  "backtrace",
  "bytes",
diff --git a/backend/sync_server/Cargo.toml b/backend/sync_server/Cargo.toml
index f9d5d3d4..7ec6eeaf 100644
--- a/backend/sync_server/Cargo.toml
+++ b/backend/sync_server/Cargo.toml
@@ -12,7 +12,7 @@ sync_lib = { path = "../sync_lib" }
 serde = { workspace = true }
 thiserror = { workspace = true }
 
-tokio = { version = "1.44.1", features = ["full"]}
+tokio = { version = "1.44.2", features = ["full"]}
 uuid = { version = "1.16.0", features = ["v4", "serde"] }
 log = { version = "0.4.27" }
 anyhow =  { version = "1.0.97", features = ["backtrace"] }

From f6015a9c437a04a333be6006b59ee490b47479fb Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 6 Apr 2025 16:46:23 +0100
Subject: [PATCH 439/761] Fix healthcheck

---
 backend/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/Dockerfile b/backend/Dockerfile
index 6f1a31d1..0d35c82a 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -28,6 +28,6 @@ WORKDIR /data
 HEALTHCHECK \
     --interval=30s \
     --timeout=5s \
-    CMD curl -f http://localhost:3000/ping || exit 1
+    CMD curl -f http://localhost:3000/vaults/fake/ping || exit 1
 
 ENTRYPOINT ["/app/sync_server"]

From a86a056888d2ea352edf5703d13b1f5dbc657d7c Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Mon, 7 Apr 2025 20:22:30 +0100
Subject: [PATCH 440/761] Fix history ordering

---
 frontend/obsidian-plugin/src/views/history/history-view.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/obsidian-plugin/src/views/history/history-view.ts b/frontend/obsidian-plugin/src/views/history/history-view.ts
index f1aef04e..d766e754 100644
--- a/frontend/obsidian-plugin/src/views/history/history-view.ts
+++ b/frontend/obsidian-plugin/src/views/history/history-view.ts
@@ -107,7 +107,8 @@ export class HistoryView extends ItemView {
 			return;
 		}
 
-		const entries = this.client.getHistoryEntries();
+		// entries are newest first, but we prepend new ones
+		const entries = this.client.getHistoryEntries().toReversed();
 
 		if (this.historyEntryToElement.size === 0 && entries.length > 0) {
 			// Clear the "No update has happened yet" message

From ff02fee6a5558b42d363e2e27542913d0611e7fb Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Mon, 7 Apr 2025 22:23:23 +0100
Subject: [PATCH 441/761] Random case vaultId

---
 frontend/test-client/jest.config.js           |  3 ++
 frontend/test-client/package.json             | 44 +++++++++----------
 frontend/test-client/src/cli.ts               |  5 ++-
 .../src/utils/random-casing.test.ts           | 11 +++++
 .../test-client/src/utils/random-casing.ts    | 10 +++++
 5 files changed, 49 insertions(+), 24 deletions(-)
 create mode 100644 frontend/test-client/jest.config.js
 create mode 100644 frontend/test-client/src/utils/random-casing.test.ts
 create mode 100644 frontend/test-client/src/utils/random-casing.ts

diff --git a/frontend/test-client/jest.config.js b/frontend/test-client/jest.config.js
new file mode 100644
index 00000000..8c1027ee
--- /dev/null
+++ b/frontend/test-client/jest.config.js
@@ -0,0 +1,3 @@
+module.exports = {
+	preset: "ts-jest/presets/js-with-babel-esm"
+};
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index 278910a6..4d5e18c0 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -1,24 +1,24 @@
 {
-	"name": "test-client",
-	"version": "0.3.8",
-	"private": true,
-	"bin": {
-		"test-client": "./dist/cli.js"
-	},
-	"scripts": {
-		"dev": "webpack watch --mode development",
-		"build": "webpack --mode production",
-		"test": "jest --passWithNoTests"
-	},
-	"devDependencies": {
-		"@types/node": "^22.14.0",
-		"sync-client": "file:../sync-client",
-		"ts-loader": "^9.5.2",
-		"tslib": "2.8.1",
-		"typescript": "5.8.2",
-		"uuid": "^11.1.0",
-		"webpack": "^5.98.0",
-		"webpack-cli": "^6.0.1",
-		"bufferutil": "^4.0.9"
-	}
+    "name": "test-client",
+    "version": "0.3.8",
+    "private": true,
+    "bin": {
+        "test-client": "./dist/cli.js"
+    },
+    "scripts": {
+        "dev": "webpack watch --mode development",
+        "build": "webpack --mode production",
+        "test": "jest"
+    },
+    "devDependencies": {
+        "@types/node": "^22.14.0",
+        "sync-client": "file:../sync-client",
+        "ts-loader": "^9.5.2",
+        "tslib": "2.8.1",
+        "typescript": "5.8.2",
+        "uuid": "^11.1.0",
+        "webpack": "^5.98.0",
+        "webpack-cli": "^6.0.1",
+        "bufferutil": "^4.0.9"
+    }
 }
diff --git a/frontend/test-client/src/cli.ts b/frontend/test-client/src/cli.ts
index 98dff41c..9093c697 100644
--- a/frontend/test-client/src/cli.ts
+++ b/frontend/test-client/src/cli.ts
@@ -2,6 +2,7 @@ import type { SyncSettings } from "sync-client";
 import { MockAgent } from "./agent/mock-agent";
 import { sleep } from "./utils/sleep";
 import { v4 as uuidv4 } from "uuid";
+import { randomCasing } from "./utils/random-casing";
 
 let slowFileEvents = false;
 
@@ -29,8 +30,8 @@ async function runTest({
 	console.info(`Using vault name: ${vaultName}`);
 	const initialSettings: Partial<SyncSettings> = {
 		isSyncEnabled: true,
-		token: "test-token-change-me", // same as in backend/config-e2e.yml
-		vaultName,
+		token: "   test-token-change-me     ", // same as in backend/config-e2e.yml with spaces
+		vaultName: randomCasing(vaultName) + (Math.random() > 0.5 ? "  " : ""), // extra spaces shouldn't matter
 		syncConcurrency: concurrency,
 		remoteUri: "http://localhost:3000"
 	};
diff --git a/frontend/test-client/src/utils/random-casing.test.ts b/frontend/test-client/src/utils/random-casing.test.ts
new file mode 100644
index 00000000..c6f1aafa
--- /dev/null
+++ b/frontend/test-client/src/utils/random-casing.test.ts
@@ -0,0 +1,11 @@
+import { randomCasing } from "./random-casing";
+
+describe("randomCasing", () => {
+	it("simple test", () => {
+		const input =
+			"hello, this is a really long string with a lot of characters";
+		const result = randomCasing(input);
+		expect(result.toLowerCase()).toBe(input.toLowerCase());
+		expect(result).not.toBe(input);
+	});
+});
diff --git a/frontend/test-client/src/utils/random-casing.ts b/frontend/test-client/src/utils/random-casing.ts
new file mode 100644
index 00000000..bf9f99dc
--- /dev/null
+++ b/frontend/test-client/src/utils/random-casing.ts
@@ -0,0 +1,10 @@
+export function randomCasing(str: string): string {
+	const chars = str.split("");
+	const randomCasedChars = chars.map((char) => {
+		if (Math.random() < 0.5) {
+			return char.toUpperCase();
+		}
+		return char.toLowerCase();
+	});
+	return randomCasedChars.join("");
+}

From 51f69a39aff06ff04b311b6f9fb4acd57073266e Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Mon, 7 Apr 2025 22:26:16 +0100
Subject: [PATCH 442/761] Add utils module

---
 backend/sync_server/src/utils.rs              | 121 +-----------------
 backend/sync_server/src/utils/dedup_paths.rs  |  88 +++++++++++++
 .../sync_server/src/utils/sanitize_path.rs    |  34 +++++
 3 files changed, 125 insertions(+), 118 deletions(-)
 create mode 100644 backend/sync_server/src/utils/dedup_paths.rs
 create mode 100644 backend/sync_server/src/utils/sanitize_path.rs

diff --git a/backend/sync_server/src/utils.rs b/backend/sync_server/src/utils.rs
index 6289944f..870f4ae5 100644
--- a/backend/sync_server/src/utils.rs
+++ b/backend/sync_server/src/utils.rs
@@ -1,118 +1,3 @@
-use regex::Regex;
-
-/// Sanitize the document's path to allow all clients to create the same path in
-/// their filesystem. If we didn't do this server-side, client's would need to
-/// deal with mapping invalid names to valid ones and then back.
-pub fn sanitize_path(path: &str) -> String {
-    let options = sanitize_filename::Options {
-        truncate: true,
-        windows: true, // Windows is the lowest common denominator
-        replacement: "",
-    };
-
-    path.split('/')
-        .map(|part| {
-            let proposal = sanitize_filename::sanitize_with_options(part, options.clone());
-            if !part.is_empty() && proposal.is_empty() {
-                "_".to_owned()
-            } else {
-                proposal
-            }
-        })
-        .collect::<Vec<_>>()
-        .join("/")
-}
-
-pub fn deduped_file_paths(path: &str) -> impl Iterator<Item = String> {
-    let mut path_parts = path.split('/').collect::<Vec<_>>();
-    let file_name = path_parts.pop().unwrap().to_owned();
-
-    let mut directory = path_parts.join("/");
-    if !directory.is_empty() {
-        directory.push('/');
-    }
-
-    let name_parts = file_name.rsplitn(2, '.').collect::<Vec<_>>();
-    let mut reverse_parts = name_parts.into_iter().rev();
-    let (stem, extension) = match (reverse_parts.next(), reverse_parts.next()) {
-        (Some(stem), maybe_extension) => (
-            stem.to_owned(),
-            maybe_extension
-                .map(|ext| format!(".{ext}"))
-                .unwrap_or_default(),
-        ),
-        _ => unreachable!("Path must have at least one part"),
-    };
-
-    let regex = Regex::new(r" \((\d+)\)$").unwrap();
-    let start_number = regex
-        .captures(&stem)
-        .and_then(|caps| caps.get(1))
-        .and_then(|m| m.as_str().parse::<u32>().ok())
-        .unwrap_or(0);
-
-    let clean_stem = regex.replace(&stem, "").to_string();
-
-    (start_number..).map(move |dedup_number| {
-        if dedup_number == 0 {
-            format!("{directory}{clean_stem}{extension}")
-        } else {
-            format!("{directory}{clean_stem} ({dedup_number}){extension}")
-        }
-    })
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    #[test]
-    fn test_sanitize_path() {
-        assert_eq!(sanitize_path("/my/path/what?"), "/my/path/what");
-        assert_eq!(sanitize_path("file (1).md"), "file (1).md");
-        assert_eq!(sanitize_path("/my/path/\\\\:?"), "/my/path/_");
-    }
-
-    #[test]
-    fn test_deduped_file_paths() {
-        let mut deduped = deduped_file_paths("file.txt");
-        assert_eq!(deduped.next(), Some("file.txt".to_owned()));
-        assert_eq!(deduped.next(), Some("file (1).txt".to_owned()));
-        assert_eq!(deduped.next(), Some("file (2).txt".to_owned()));
-
-        let mut deduped = deduped_file_paths("file");
-        assert_eq!(deduped.next(), Some("file".to_owned()));
-        assert_eq!(deduped.next(), Some("file (1)".to_owned()));
-        assert_eq!(deduped.next(), Some("file (2)".to_owned()));
-
-        let mut deduped = deduped_file_paths("file (51).md");
-        assert_eq!(deduped.next(), Some("file (51).md".to_owned()));
-        assert_eq!(deduped.next(), Some("file (52).md".to_owned()));
-        assert_eq!(deduped.next(), Some("file (53).md".to_owned()));
-
-        let mut deduped = deduped_file_paths("file (5)");
-        assert_eq!(deduped.next(), Some("file (5)".to_owned()));
-        assert_eq!(deduped.next(), Some("file (6)".to_owned()));
-        assert_eq!(deduped.next(), Some("file (7)".to_owned()));
-
-        let mut deduped = deduped_file_paths("my/path.with.dots/file (5).md");
-        assert_eq!(
-            deduped.next(),
-            Some("my/path.with.dots/file (5).md".to_owned())
-        );
-        assert_eq!(
-            deduped.next(),
-            Some("my/path.with.dots/file (6).md".to_owned())
-        );
-
-        let mut deduped = deduped_file_paths("my/path.with.dots/file (5)");
-        assert_eq!(
-            deduped.next(),
-            Some("my/path.with.dots/file (5)".to_owned())
-        );
-        assert_eq!(
-            deduped.next(),
-            Some("my/path.with.dots/file (6)".to_owned())
-        );
-    }
-}
+pub mod dedup_paths;
+pub mod normalize;
+pub mod sanitize_path;
diff --git a/backend/sync_server/src/utils/dedup_paths.rs b/backend/sync_server/src/utils/dedup_paths.rs
new file mode 100644
index 00000000..c35ad33b
--- /dev/null
+++ b/backend/sync_server/src/utils/dedup_paths.rs
@@ -0,0 +1,88 @@
+use regex::Regex;
+
+pub fn dedup_paths(path: &str) -> impl Iterator<Item = String> {
+    let mut path_parts = path.split('/').collect::<Vec<_>>();
+    let file_name = path_parts.pop().unwrap().to_owned();
+
+    let mut directory = path_parts.join("/");
+    if !directory.is_empty() {
+        directory.push('/');
+    }
+
+    let name_parts = file_name.rsplitn(2, '.').collect::<Vec<_>>();
+    let mut reverse_parts = name_parts.into_iter().rev();
+    let (stem, extension) = match (reverse_parts.next(), reverse_parts.next()) {
+        (Some(stem), maybe_extension) => (
+            stem.to_owned(),
+            maybe_extension
+                .map(|ext| format!(".{ext}"))
+                .unwrap_or_default(),
+        ),
+        _ => unreachable!("Path must have at least one part"),
+    };
+
+    let regex = Regex::new(r" \((\d+)\)$").unwrap();
+    let start_number = regex
+        .captures(&stem)
+        .and_then(|caps| caps.get(1))
+        .and_then(|m| m.as_str().parse::<u32>().ok())
+        .unwrap_or(0);
+
+    let clean_stem = regex.replace(&stem, "").to_string();
+
+    (start_number..).map(move |dedup_number| {
+        if dedup_number == 0 {
+            format!("{directory}{clean_stem}{extension}")
+        } else {
+            format!("{directory}{clean_stem} ({dedup_number}){extension}")
+        }
+    })
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn test_dedup_paths() {
+        let mut deduped = dedup_paths("file.txt");
+        assert_eq!(deduped.next(), Some("file.txt".to_owned()));
+        assert_eq!(deduped.next(), Some("file (1).txt".to_owned()));
+        assert_eq!(deduped.next(), Some("file (2).txt".to_owned()));
+
+        let mut deduped = dedup_paths("file");
+        assert_eq!(deduped.next(), Some("file".to_owned()));
+        assert_eq!(deduped.next(), Some("file (1)".to_owned()));
+        assert_eq!(deduped.next(), Some("file (2)".to_owned()));
+
+        let mut deduped = dedup_paths("file (51).md");
+        assert_eq!(deduped.next(), Some("file (51).md".to_owned()));
+        assert_eq!(deduped.next(), Some("file (52).md".to_owned()));
+        assert_eq!(deduped.next(), Some("file (53).md".to_owned()));
+
+        let mut deduped = dedup_paths("file (5)");
+        assert_eq!(deduped.next(), Some("file (5)".to_owned()));
+        assert_eq!(deduped.next(), Some("file (6)".to_owned()));
+        assert_eq!(deduped.next(), Some("file (7)".to_owned()));
+
+        let mut deduped = dedup_paths("my/path.with.dots/file (5).md");
+        assert_eq!(
+            deduped.next(),
+            Some("my/path.with.dots/file (5).md".to_owned())
+        );
+        assert_eq!(
+            deduped.next(),
+            Some("my/path.with.dots/file (6).md".to_owned())
+        );
+
+        let mut deduped = dedup_paths("my/path.with.dots/file (5)");
+        assert_eq!(
+            deduped.next(),
+            Some("my/path.with.dots/file (5)".to_owned())
+        );
+        assert_eq!(
+            deduped.next(),
+            Some("my/path.with.dots/file (6)".to_owned())
+        );
+    }
+}
diff --git a/backend/sync_server/src/utils/sanitize_path.rs b/backend/sync_server/src/utils/sanitize_path.rs
new file mode 100644
index 00000000..9703225c
--- /dev/null
+++ b/backend/sync_server/src/utils/sanitize_path.rs
@@ -0,0 +1,34 @@
+/// Sanitize the document's path to allow all clients to create the same path in
+/// their filesystem. If we didn't do this server-side, client's would need to
+/// deal with mapping invalid names to valid ones and then back.
+pub fn sanitize_path(path: &str) -> String {
+    let options = sanitize_filename::Options {
+        truncate: true,
+        windows: true, // Windows is the lowest common denominator
+        replacement: "",
+    };
+
+    path.split('/')
+        .map(|part| {
+            let proposal = sanitize_filename::sanitize_with_options(part, options.clone());
+            if !part.is_empty() && proposal.is_empty() {
+                "_".to_owned()
+            } else {
+                proposal
+            }
+        })
+        .collect::<Vec<_>>()
+        .join("/")
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn test_sanitize_path() {
+        assert_eq!(sanitize_path("/my/path/what?"), "/my/path/what");
+        assert_eq!(sanitize_path("file (1).md"), "file (1).md");
+        assert_eq!(sanitize_path("/my/path/\\\\:?"), "/my/path/_");
+    }
+}

From 04a24d0b38433a64870670849f6c19541fb460f4 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Mon, 7 Apr 2025 22:28:39 +0100
Subject: [PATCH 443/761] Normalise settings values

---
 .../src/views/settings/settings-tab.ts        | 43 +++++++++++--------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/frontend/obsidian-plugin/src/views/settings/settings-tab.ts b/frontend/obsidian-plugin/src/views/settings/settings-tab.ts
index 6c21e7af..c5f0c214 100644
--- a/frontend/obsidian-plugin/src/views/settings/settings-tab.ts
+++ b/frontend/obsidian-plugin/src/views/settings/settings-tab.ts
@@ -137,7 +137,6 @@ export class SyncSettingsTab extends PluginSettingTab {
 			"Server address",
 			"remoteUri"
 		);
-
 		new Setting(containerEl)
 			.setName(title)
 			.setDesc(
@@ -147,10 +146,10 @@ export class SyncSettingsTab extends PluginSettingTab {
 			.addText((text) =>
 				text
 					.setPlaceholder("https://example.com:3000")
-					.setValue(this.editedServerUri)
+					.setValue(this.editedServerUri.toLowerCase().trim())
 					.onChange((value) => {
-						this.editedServerUri = value;
-						updateTitle(value);
+						this.editedServerUri = value.toLowerCase().trim();
+						updateTitle(value.toLowerCase().trim());
 					})
 			);
 
@@ -158,7 +157,6 @@ export class SyncSettingsTab extends PluginSettingTab {
 			"Access token",
 			"token"
 		);
-
 		new Setting(containerEl)
 			.setName(tokenTitle)
 			.setClass("sync-settings-access-token")
@@ -169,16 +167,15 @@ export class SyncSettingsTab extends PluginSettingTab {
 			.addTextArea((text) =>
 				text
 					.setPlaceholder("ey...")
-					.setValue(this.editedToken)
+					.setValue(this.editedToken.trim())
 					.onChange((value) => {
-						this.editedToken = value;
-						updateTokenTitle(value);
+						this.editedToken = value.trim();
+						updateTokenTitle(value.trim());
 					})
 			);
 
 		const [vaultNameTitle, updateVaultNameTitle] =
 			this.unsavedAwareSettingName("Vault name", "vaultName");
-
 		new Setting(containerEl)
 			.setName(vaultNameTitle)
 			.setDesc(
@@ -188,23 +185,17 @@ export class SyncSettingsTab extends PluginSettingTab {
 			.addText((text) =>
 				text
 					.setPlaceholder("My Obsidian Vault")
-					.setValue(this.editedVaultName)
+					.setValue(this.editedVaultName.toLowerCase().trim())
 					.onChange((value) => {
-						this.editedVaultName = value;
-						updateVaultNameTitle(value);
+						this.editedVaultName = value.toLowerCase().trim();
+						updateVaultNameTitle(value.toLowerCase().trim());
 					})
 			);
 
 		new Setting(containerEl)
 			.addButton((button) =>
 				button.setButtonText("Apply").onClick(async () => {
-					if (
-						this.editedVaultName !==
-							this.syncClient.getSettings().vaultName ||
-						this.editedServerUri !==
-							this.syncClient.getSettings().remoteUri ||
-						this.editedToken !== this.syncClient.getSettings().token
-					) {
+					if (this.areThereUnsavedChanges()) {
 						await this.syncClient.setSettings({
 							vaultName: this.editedVaultName,
 							remoteUri: this.editedServerUri,
@@ -221,6 +212,12 @@ export class SyncSettingsTab extends PluginSettingTab {
 			)
 			.addButton((button) =>
 				button.setButtonText("Test connection").onClick(async () => {
+					if (this.areThereUnsavedChanges()) {
+						new Notice(
+							"There are unsaved changes, testing with the currently saved settings"
+						);
+					}
+
 					new Notice(
 						(await this.syncClient.checkConnection()).serverMessage
 					);
@@ -229,6 +226,14 @@ export class SyncSettingsTab extends PluginSettingTab {
 			);
 	}
 
+	private areThereUnsavedChanges(): boolean {
+		return (
+			this.editedServerUri !== this.syncClient.getSettings().remoteUri ||
+			this.editedToken !== this.syncClient.getSettings().token ||
+			this.editedVaultName !== this.syncClient.getSettings().vaultName
+		);
+	}
+
 	private renderSyncSettings(containerEl: HTMLElement): void {
 		containerEl.createEl("h3", { text: "Sync" });
 

From 74a8060246c336f74b5f5615acaa78533de3f3dc Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Mon, 7 Apr 2025 22:29:23 +0100
Subject: [PATCH 444/761] Always normalise vaultId and trim token

---
 backend/sync_server/src/server/auth.rs              | 13 ++++++++-----
 backend/sync_server/src/server/create_document.rs   |  3 ++-
 backend/sync_server/src/server/delete_document.rs   |  4 +++-
 .../src/server/fetch_document_version.rs            |  3 +++
 .../src/server/fetch_document_version_content.rs    |  3 +++
 .../src/server/fetch_latest_document_version.rs     |  3 +++
 .../src/server/fetch_latest_documents.rs            |  2 ++
 backend/sync_server/src/server/ping.rs              |  2 ++
 backend/sync_server/src/server/update_document.rs   |  6 ++++--
 backend/sync_server/src/server/websocket.rs         |  4 +++-
 backend/sync_server/src/utils/normalize.rs          | 11 +++++++++++
 11 files changed, 44 insertions(+), 10 deletions(-)
 create mode 100644 backend/sync_server/src/utils/normalize.rs

diff --git a/backend/sync_server/src/server/auth.rs b/backend/sync_server/src/server/auth.rs
index 3a1f5939..6727501e 100644
--- a/backend/sync_server/src/server/auth.rs
+++ b/backend/sync_server/src/server/auth.rs
@@ -15,6 +15,7 @@ use crate::{
     app_state::{AppState, database::models::VaultId},
     config::user_config::{AllowListedVaults, User, VaultAccess},
     errors::{SyncServerError, permission_denied_error, unauthenticated_error},
+    utils::normalize::normalize_string,
 };
 
 pub async fn auth_middleware(
@@ -24,12 +25,14 @@ pub async fn auth_middleware(
     mut req: Request,
     next: Next,
 ) -> Result<Response, SyncServerError> {
-    let token = auth_header.token();
-    let vault_id = path_params
-        .get("vault_id")
-        .ok_or_else(|| unauthenticated_error(anyhow::anyhow!("Missing vault_id")))?;
+    let token = auth_header.token().trim();
+    let vault_id = normalize_string(
+        path_params
+            .get("vault_id")
+            .ok_or_else(|| unauthenticated_error(anyhow::anyhow!("Missing vault_id")))?,
+    );
 
-    let user = auth(&state, token, vault_id)?;
+    let user = auth(&state, token, &vault_id)?;
 
     req.extensions_mut().insert(user);
 
diff --git a/backend/sync_server/src/server/create_document.rs b/backend/sync_server/src/server/create_document.rs
index 1c2e6126..ebbcac26 100644
--- a/backend/sync_server/src/server/create_document.rs
+++ b/backend/sync_server/src/server/create_document.rs
@@ -16,12 +16,13 @@ use crate::{
         },
     },
     errors::{SyncServerError, client_error, server_error},
-    utils::sanitize_path,
+    utils::{normalize::normalize, sanitize_path::sanitize_path},
 };
 
 // This is required for aide to infer the path parameter types and names
 #[derive(Deserialize, JsonSchema)]
 pub struct CreateDocumentPathParams {
+    #[serde(deserialize_with = "normalize")]
     vault_id: VaultId,
 }
 
diff --git a/backend/sync_server/src/server/delete_document.rs b/backend/sync_server/src/server/delete_document.rs
index 2d02decc..3329e7fb 100644
--- a/backend/sync_server/src/server/delete_document.rs
+++ b/backend/sync_server/src/server/delete_document.rs
@@ -14,13 +14,15 @@ use crate::{
         },
     },
     errors::{SyncServerError, server_error},
-    utils::sanitize_path,
+    utils::{normalize::normalize, sanitize_path::sanitize_path},
 };
 
 // This is required for aide to infer the path parameter types and names
 #[derive(Deserialize, JsonSchema)]
 pub struct DeleteDocumentPathParams {
+    #[serde(deserialize_with = "normalize")]
     vault_id: VaultId,
+
     document_id: DocumentId,
 }
 
diff --git a/backend/sync_server/src/server/fetch_document_version.rs b/backend/sync_server/src/server/fetch_document_version.rs
index 195ae011..ee8f6c55 100644
--- a/backend/sync_server/src/server/fetch_document_version.rs
+++ b/backend/sync_server/src/server/fetch_document_version.rs
@@ -10,12 +10,15 @@ use crate::{
         database::models::{DocumentId, DocumentVersion, VaultId, VaultUpdateId},
     },
     errors::{SyncServerError, not_found_error, server_error},
+    utils::normalize::normalize,
 };
 
 // This is required for aide to infer the path parameter types and names
 #[derive(Deserialize, JsonSchema)]
 pub struct FetchDocumentVersionPathParams {
+    #[serde(deserialize_with = "normalize")]
     vault_id: VaultId,
+
     document_id: DocumentId,
     vault_update_id: VaultUpdateId,
 }
diff --git a/backend/sync_server/src/server/fetch_document_version_content.rs b/backend/sync_server/src/server/fetch_document_version_content.rs
index 9708c4e5..50cacca1 100644
--- a/backend/sync_server/src/server/fetch_document_version_content.rs
+++ b/backend/sync_server/src/server/fetch_document_version_content.rs
@@ -12,12 +12,15 @@ use crate::{
         database::models::{DocumentId, VaultId, VaultUpdateId},
     },
     errors::{SyncServerError, not_found_error, server_error},
+    utils::normalize::normalize,
 };
 
 // This is required for aide to infer the path parameter types and names
 #[derive(Deserialize, JsonSchema)]
 pub struct FetchDocumentVersionContentPathParams {
+    #[serde(deserialize_with = "normalize")]
     vault_id: VaultId,
+
     document_id: DocumentId,
     vault_update_id: VaultUpdateId,
 }
diff --git a/backend/sync_server/src/server/fetch_latest_document_version.rs b/backend/sync_server/src/server/fetch_latest_document_version.rs
index c8025711..3b85ed37 100644
--- a/backend/sync_server/src/server/fetch_latest_document_version.rs
+++ b/backend/sync_server/src/server/fetch_latest_document_version.rs
@@ -10,12 +10,15 @@ use crate::{
         database::models::{DocumentId, DocumentVersion, VaultId},
     },
     errors::{SyncServerError, not_found_error, server_error},
+    utils::normalize::normalize,
 };
 
 // This is required for aide to infer the path parameter types and names
 #[derive(Deserialize, JsonSchema)]
 pub struct FetchLatestDocumentVersionPathParams {
+    #[serde(deserialize_with = "normalize")]
     vault_id: VaultId,
+
     document_id: DocumentId,
 }
 
diff --git a/backend/sync_server/src/server/fetch_latest_documents.rs b/backend/sync_server/src/server/fetch_latest_documents.rs
index 3765f52b..e78b7594 100644
--- a/backend/sync_server/src/server/fetch_latest_documents.rs
+++ b/backend/sync_server/src/server/fetch_latest_documents.rs
@@ -10,11 +10,13 @@ use crate::{
         database::models::{VaultId, VaultUpdateId},
     },
     errors::{SyncServerError, server_error},
+    utils::normalize::normalize,
 };
 
 // This is required for aide to infer the path parameter types and names
 #[derive(Deserialize, JsonSchema)]
 pub struct FetchLatestDocumentsPathParams {
+    #[serde(deserialize_with = "normalize")]
     vault_id: VaultId,
 }
 
diff --git a/backend/sync_server/src/server/ping.rs b/backend/sync_server/src/server/ping.rs
index 38dc2037..96a8d82a 100644
--- a/backend/sync_server/src/server/ping.rs
+++ b/backend/sync_server/src/server/ping.rs
@@ -13,11 +13,13 @@ use super::{auth::auth, responses::PingResponse};
 use crate::{
     app_state::{AppState, database::models::VaultId},
     errors::SyncServerError,
+    utils::normalize::normalize,
 };
 
 // This is required for aide to infer the path parameter types and names
 #[derive(Deserialize, JsonSchema)]
 pub struct PingPathParams {
+    #[serde(deserialize_with = "normalize")]
     vault_id: VaultId,
 }
 
diff --git a/backend/sync_server/src/server/update_document.rs b/backend/sync_server/src/server/update_document.rs
index fdbbfd6e..60a4cab8 100644
--- a/backend/sync_server/src/server/update_document.rs
+++ b/backend/sync_server/src/server/update_document.rs
@@ -18,13 +18,15 @@ use crate::{
         database::models::{DeviceId, DocumentId, StoredDocumentVersion, VaultId, VaultUpdateId},
     },
     errors::{SyncServerError, client_error, not_found_error, server_error},
-    utils::{deduped_file_paths, sanitize_path},
+    utils::{dedup_paths::dedup_paths, normalize::normalize, sanitize_path::sanitize_path},
 };
 
 // This is required for aide to infer the path parameter types and names
 #[derive(Deserialize, JsonSchema)]
 pub struct UpdateDocumentPathParams {
+    #[serde(deserialize_with = "normalize")]
     vault_id: VaultId,
+
     document_id: DocumentId,
 }
 
@@ -171,7 +173,7 @@ async fn internal_update_document(
         && latest_version.relative_path != sanitized_relative_path
     {
         let mut new_relative_path = String::default();
-        for candidate in deduped_file_paths(&sanitized_relative_path) {
+        for candidate in dedup_paths(&sanitized_relative_path) {
             if state
                 .database
                 .get_latest_document_by_path(&vault_id, &candidate, Some(&mut transaction))
diff --git a/backend/sync_server/src/server/websocket.rs b/backend/sync_server/src/server/websocket.rs
index 7241b12f..82a37af6 100644
--- a/backend/sync_server/src/server/websocket.rs
+++ b/backend/sync_server/src/server/websocket.rs
@@ -21,11 +21,13 @@ use crate::{
         database::models::{DeviceId, DocumentVersionWithoutContent, VaultId, VaultUpdateId},
     },
     errors::{SyncServerError, server_error, unauthenticated_error},
+    utils::normalize::{normalize, normalize_string},
 };
 
 // This is required for aide to infer the path parameter types and names
 #[derive(Deserialize, JsonSchema)]
 pub struct WebsocketPathParams {
+    #[serde(deserialize_with = "normalize")]
     vault_id: VaultId,
 }
 
@@ -81,7 +83,7 @@ async fn websocket(
             .context("Failed to parse token")
             .map_err(server_error)?;
 
-        auth(&state, &handshake.token, &vault_id)?;
+        auth(&state, handshake.token.trim(), &normalize_string(&vault_id))?;
 
         handshake
     } else {
diff --git a/backend/sync_server/src/utils/normalize.rs b/backend/sync_server/src/utils/normalize.rs
new file mode 100644
index 00000000..adb83ac1
--- /dev/null
+++ b/backend/sync_server/src/utils/normalize.rs
@@ -0,0 +1,11 @@
+use serde::{Deserialize, Deserializer};
+
+pub fn normalize<'de, D>(deserializer: D) -> Result<String, D::Error>
+where
+    D: Deserializer<'de>,
+{
+    let s = String::deserialize(deserializer)?;
+    Ok(normalize_string(&s))
+}
+
+pub fn normalize_string(s: &str) -> String { s.trim().to_lowercase() }

From bf283bbe7c5a7f47f49bf9610a5ebcdf6eceab9e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Apr 2025 22:34:23 +0100
Subject: [PATCH 445/761] Bump schemars from 0.8.21 to 0.8.22 in /backend (#25)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 backend/Cargo.lock             | 8 ++++----
 backend/sync_server/Cargo.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 6ad1e73f..df51d344 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -2055,9 +2055,9 @@ dependencies = [
 
 [[package]]
 name = "schemars"
-version = "0.8.21"
+version = "0.8.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92"
+checksum = "3fbf2ae1b8bc8e02df939598064d22402220cd5bbcca1c76f7d6a310974d5615"
 dependencies = [
  "bytes",
  "chrono",
@@ -2071,9 +2071,9 @@ dependencies = [
 
 [[package]]
 name = "schemars_derive"
-version = "0.8.21"
+version = "0.8.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e"
+checksum = "32e265784ad618884abaea0600a9adf15393368d840e0222d101a072f3f7534d"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/backend/sync_server/Cargo.toml b/backend/sync_server/Cargo.toml
index 7ec6eeaf..908bf8c7 100644
--- a/backend/sync_server/Cargo.toml
+++ b/backend/sync_server/Cargo.toml
@@ -26,7 +26,7 @@ serde_yaml = "0.9.34"
 sqlx = { version = "0.8.3", features = ["sqlite", "runtime-tokio", "uuid", "chrono"] }
 chrono = { version = "0.4.40", features = ["serde"] }
 aide = { version = "0.13.5", features = ["axum", "axum-ws", "scalar", "axum-headers"] }
-schemars = { version = "0.8.21", features = ["chrono", "uuid1", "bytes"] }
+schemars = { version = "0.8.22", features = ["chrono", "uuid1", "bytes"] }
 tracing = "0.1.41"
 rand = "0.9.0"
 sanitize-filename = "0.6.0"

From 3ec6bd4d5b45cc134d476cdf8041d61b3d0a5584 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Mon, 7 Apr 2025 23:13:45 +0100
Subject: [PATCH 446/761] Allow overriding WebSocket implementation and add
 flaky version for testing

---
 frontend/sync-client/package.json             | 68 +++++++++----------
 .../sync-client/src/services/sync-service.ts  | 15 ++--
 frontend/sync-client/src/sync-client.ts       | 12 ++--
 .../sync-client/src/sync-operations/syncer.ts | 39 +++++++----
 frontend/test-client/src/agent/mock-agent.ts  | 14 ++--
 frontend/test-client/src/agent/mock-client.ts |  6 +-
 frontend/test-client/src/utils/flaky-fetch.ts | 20 ++++++
 .../test-client/src/utils/flaky-websocket.ts  | 61 +++++++++++++++++
 8 files changed, 162 insertions(+), 73 deletions(-)
 create mode 100644 frontend/test-client/src/utils/flaky-fetch.ts
 create mode 100644 frontend/test-client/src/utils/flaky-websocket.ts

diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index 770decfd..51b174fc 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -1,36 +1,36 @@
 {
-	"name": "sync-client",
-	"version": "0.3.8",
-	"main": "dist/sync-client.node.js",
-	"browser": "dist/sync-client.web.js",
-	"types": "dist/types/index.d.ts",
-	"files": [
-		"dist/**/*"
-	],
-	"scripts": {
-		"dev": "webpack watch --mode development",
-		"build": "webpack --mode production",
-		"test": "NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules\" jest"
-	},
-	"dependencies": {
-		"byte-base64": "^1.1.0",
-		"openapi-fetch": "0.13.5",
-		"openapi-typescript": "7.6.1",
-		"p-queue": "^8.1.0",
-		"uuid": "^11.1.0"
-	},
-	"devDependencies": {
-		"@types/jest": "^29.5.14",
-		"@types/node": "^22.14.0",
-		"jest": "^29.7.0",
-		"sync_lib": "file:../../backend/sync_lib/pkg",
-		"ts-jest": "^29.3.1",
-		"ts-loader": "^9.5.2",
-		"tslib": "2.8.1",
-		"typescript": "5.8.2",
-		"webpack": "^5.98.0",
-		"webpack-cli": "^6.0.1",
-		"webpack-merge": "^6.0.1",
-		"ws": "^8.18.1"
-	}
+    "name": "sync-client",
+    "version": "0.3.8",
+    "main": "dist/sync-client.node.js",
+    "browser": "dist/sync-client.web.js",
+    "types": "dist/types/index.d.ts",
+    "files": [
+        "dist/**/*"
+    ],
+    "scripts": {
+        "dev": "webpack watch --mode development",
+        "build": "webpack --mode production",
+        "test": "NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules\" jest"
+    },
+    "dependencies": {
+        "byte-base64": "^1.1.0",
+        "openapi-fetch": "0.13.5",
+        "openapi-typescript": "7.6.1",
+        "p-queue": "^8.1.0",
+        "uuid": "^11.1.0"
+    },
+    "devDependencies": {
+        "@types/jest": "^29.5.14",
+        "@types/node": "^22.14.0",
+        "jest": "^29.7.0",
+        "sync_lib": "file:../../backend/sync_lib/pkg",
+        "ts-jest": "^29.3.1",
+        "ts-loader": "^9.5.2",
+        "tslib": "2.8.1",
+        "typescript": "5.8.2",
+        "webpack": "^5.98.0",
+        "webpack-cli": "^6.0.1",
+        "webpack-merge": "^6.0.1",
+        "ws": "^8.18.1"
+    }
 }
diff --git a/frontend/sync-client/src/services/sync-service.ts b/frontend/sync-client/src/services/sync-service.ts
index 7251ef79..69eae6c8 100644
--- a/frontend/sync-client/src/services/sync-service.ts
+++ b/frontend/sync-client/src/services/sync-service.ts
@@ -21,13 +21,13 @@ export class SyncService {
 	private static readonly NETWORK_RETRY_INTERVAL_MS = 1000;
 	private client: Client<paths>;
 	private pingClient: Client<paths>;
-	private _fetchImplementation: typeof globalThis.fetch = globalThis.fetch;
 
 	public constructor(
 		private readonly deviceId: string,
 		private readonly connectionStatus: ConnectionStatus,
 		private readonly settings: Settings,
-		private readonly logger: Logger
+		private readonly logger: Logger,
+		private readonly fetchImplementation: typeof globalThis.fetch = globalThis.fetch
 	) {
 		[this.client, this.pingClient] = this.createClient(
 			this.settings.getSettings().remoteUri
@@ -44,13 +44,6 @@ export class SyncService {
 		});
 	}
 
-	public set fetchImplementation(fetch: typeof globalThis.fetch) {
-		this._fetchImplementation = fetch;
-		[this.client, this.pingClient] = this.createClient(
-			this.settings.getSettings().remoteUri
-		);
-	}
-
 	private static formatError(
 		error: components["schemas"]["SerializedError"]
 	): string {
@@ -329,7 +322,7 @@ export class SyncService {
 				baseUrl: remoteUri,
 				fetch: this.connectionStatus.getFetchImplementation(
 					this.logger,
-					this._fetchImplementation
+					this.fetchImplementation
 				),
 				headers: {
 					authorization: `Bearer ${this.settings.getSettings().token}`
@@ -337,7 +330,7 @@ export class SyncService {
 			}),
 			createClient<paths>({
 				baseUrl: remoteUri,
-				fetch: this._fetchImplementation,
+				fetch: this.fetchImplementation,
 				headers: {
 					authorization: `Bearer ${this.settings.getSettings().token}`
 				}
diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts
index 228b29eb..ab1cd76c 100644
--- a/frontend/sync-client/src/sync-client.ts
+++ b/frontend/sync-client/src/sync-client.ts
@@ -56,7 +56,8 @@ export class SyncClient {
 	public static async create({
 		fs,
 		persistence,
-		fetch = globalThis.fetch,
+		fetch,
+		webSocket,
 		nativeLineEndings = "\n"
 	}: {
 		fs: FileSystemOperations;
@@ -67,6 +68,7 @@ export class SyncClient {
 			}>
 		>;
 		fetch?: typeof globalThis.fetch;
+		webSocket?: typeof globalThis.WebSocket;
 		nativeLineEndings?: string;
 	}): Promise<SyncClient> {
 		const logger = new Logger();
@@ -113,9 +115,10 @@ export class SyncClient {
 			deviceId,
 			connectionStatus,
 			settings,
-			logger
+			logger,
+			fetch
 		);
-		syncService.fetchImplementation = fetch;
+
 		const fileOperations = new FileOperations(
 			logger,
 			database,
@@ -137,7 +140,8 @@ export class SyncClient {
 			settings,
 			syncService,
 			fileOperations,
-			unrestrictedSyncer
+			unrestrictedSyncer,
+			webSocket
 		);
 
 		const client = new SyncClient(
diff --git a/frontend/sync-client/src/sync-operations/syncer.ts b/frontend/sync-client/src/sync-operations/syncer.ts
index ff102668..7d7982df 100644
--- a/frontend/sync-client/src/sync-operations/syncer.ts
+++ b/frontend/sync-client/src/sync-operations/syncer.ts
@@ -31,6 +31,8 @@ export class Syncer {
 		| undefined;
 	private applyRemoteChangesWebSocket: WebSocket | undefined;
 
+	private readonly webSocketImplementation: typeof globalThis.WebSocket;
+
 	// eslint-disable-next-line @typescript-eslint/max-params
 	public constructor(
 		private readonly deviceId: string,
@@ -39,12 +41,27 @@ export class Syncer {
 		private readonly settings: Settings,
 		private readonly syncService: SyncService,
 		private readonly operations: FileOperations,
-		private readonly internalSyncer: UnrestrictedSyncer
+		private readonly internalSyncer: UnrestrictedSyncer,
+		webSocketImplementation?: typeof globalThis.WebSocket
 	) {
 		this.syncQueue = new PQueue({
 			concurrency: settings.getSettings().syncConcurrency
 		});
 
+		if (webSocketImplementation) {
+			this.webSocketImplementation = webSocketImplementation;
+		} else {
+			if (
+				typeof globalThis !== "undefined" &&
+				typeof globalThis.WebSocket === "undefined"
+			) {
+				// eslint-disable-next-line
+				this.webSocketImplementation = require("ws"); // polyfill for WebSocket in Node.js
+			} else {
+				this.webSocketImplementation = WebSocket;
+			}
+		}
+
 		this.updateWebSocket(settings.getSettings());
 
 		this.remoteDocumentsLock = new Locks<DocumentId>(this.logger);
@@ -74,7 +91,10 @@ export class Syncer {
 	}
 
 	public get isWebSocketConnected(): boolean {
-		return this.applyRemoteChangesWebSocket?.readyState === WebSocket.OPEN;
+		return (
+			this.applyRemoteChangesWebSocket?.readyState ===
+			this.webSocketImplementation.OPEN
+		);
 	}
 
 	public addRemainingOperationsListener(
@@ -270,15 +290,9 @@ export class Syncer {
 
 		this.logger.info(`Connecting to WebSocket at ${wsUri.toString()}`);
 
-		if (
-			typeof globalThis !== "undefined" &&
-			typeof globalThis.WebSocket === "undefined"
-		) {
-			// eslint-disable-next-line
-			globalThis.WebSocket = require("ws"); // polyfill for WebSocket in Node.js
-		}
-
-		this.applyRemoteChangesWebSocket = new WebSocket(wsUri);
+		this.applyRemoteChangesWebSocket = new this.webSocketImplementation(
+			wsUri
+		);
 
 		this.applyRemoteChangesWebSocket.onmessage = (event): void =>
 			void this.syncRemotelyUpdatedFile(event.data).catch(
@@ -316,7 +330,8 @@ export class Syncer {
 	private setWebSocketRefreshInterval(): void {
 		this.refreshApplyRemoteChangesWebSocketInterval = setInterval(() => {
 			if (
-				this.applyRemoteChangesWebSocket?.readyState === WebSocket.OPEN
+				this.applyRemoteChangesWebSocket?.readyState ===
+				this.webSocketImplementation.OPEN
 			) {
 				return;
 			}
diff --git a/frontend/test-client/src/agent/mock-agent.ts b/frontend/test-client/src/agent/mock-agent.ts
index 9939d53c..35dfe132 100644
--- a/frontend/test-client/src/agent/mock-agent.ts
+++ b/frontend/test-client/src/agent/mock-agent.ts
@@ -6,6 +6,8 @@ import { LogLevel } from "sync-client";
 import { MockClient } from "./mock-client";
 import { sleep } from "../utils/sleep";
 import type { LogLine } from "sync-client/dist/types/tracing/logger";
+import { flakyFetchFactory } from "../utils/flaky-fetch";
+import { flakyWebSocketFactory } from "../utils/flaky-websocket";
 
 export class MockAgent extends MockClient {
 	private readonly writtenContents: string[] = [];
@@ -26,16 +28,8 @@ export class MockAgent extends MockClient {
 
 	public async init(): Promise<void> {
 		await super.init(
-			// flaky fetch implementation to use during testing
-			async (
-				input: string | URL | globalThis.Request,
-				init?: RequestInit
-			): Promise<Response> => {
-				await sleep(Math.random() * this.jitterScaleInSeconds * 1000);
-				const response = await fetch(input, init);
-				await sleep(Math.random() * this.jitterScaleInSeconds * 1000);
-				return response;
-			}
+			flakyFetchFactory(this.jitterScaleInSeconds),
+			flakyWebSocketFactory(this.jitterScaleInSeconds)
 		);
 
 		assert(
diff --git a/frontend/test-client/src/agent/mock-client.ts b/frontend/test-client/src/agent/mock-client.ts
index a1e2b9e9..766e7981 100644
--- a/frontend/test-client/src/agent/mock-client.ts
+++ b/frontend/test-client/src/agent/mock-client.ts
@@ -30,7 +30,8 @@ export class MockClient implements FileSystemOperations {
 	}
 
 	public async init(
-		fetchImplementation: typeof globalThis.fetch
+		fetchImplementation: typeof globalThis.fetch,
+		webSocketImplementation: typeof globalThis.WebSocket
 	): Promise<void> {
 		this.client = await SyncClient.create({
 			fs: this,
@@ -38,7 +39,8 @@ export class MockClient implements FileSystemOperations {
 				load: async () => this.data,
 				save: async (data) => void (this.data = data)
 			},
-			fetch: fetchImplementation
+			fetch: fetchImplementation,
+			webSocket: webSocketImplementation
 		});
 
 		await this.client.start();
diff --git a/frontend/test-client/src/utils/flaky-fetch.ts b/frontend/test-client/src/utils/flaky-fetch.ts
new file mode 100644
index 00000000..6a2c8817
--- /dev/null
+++ b/frontend/test-client/src/utils/flaky-fetch.ts
@@ -0,0 +1,20 @@
+import { sleep } from "./sleep";
+
+export const flakyFetchFactory =
+	(jitterScaleInSeconds: number) =>
+	async (
+		input: string | URL | globalThis.Request,
+		init?: RequestInit
+	): Promise<Response> => {
+		if (jitterScaleInSeconds > 0) {
+			await sleep(Math.random() * jitterScaleInSeconds * 1000);
+		}
+
+		const response = await fetch(input, init);
+
+		if (jitterScaleInSeconds > 0) {
+			await sleep(Math.random() * jitterScaleInSeconds * 1000);
+		}
+
+		return response;
+	};
diff --git a/frontend/test-client/src/utils/flaky-websocket.ts b/frontend/test-client/src/utils/flaky-websocket.ts
new file mode 100644
index 00000000..f30c7f66
--- /dev/null
+++ b/frontend/test-client/src/utils/flaky-websocket.ts
@@ -0,0 +1,61 @@
+import { sleep } from "./sleep";
+
+export function flakyWebSocketFactory(
+	jitterScaleInSeconds: number
+): typeof WebSocket {
+	// eslint-disable-next-line
+	return class FlakyWebSocket extends require("ws") {
+		public set onopen(callback: (event: Event) => void) {
+			// eslint-disable-next-line
+			super.onopen = async (event: Event): Promise<void> => {
+				if (jitterScaleInSeconds > 0) {
+					await sleep(Math.random() * jitterScaleInSeconds * 1000);
+				}
+
+				callback(event);
+			};
+		}
+
+		public set onmessage(callback: (event: MessageEvent) => void) {
+			// eslint-disable-next-line
+			super.onmessage = async (event: MessageEvent): Promise<void> => {
+				if (jitterScaleInSeconds > 0) {
+					await sleep(Math.random() * jitterScaleInSeconds * 1000);
+				}
+
+				callback(event);
+			};
+		}
+
+		public set onclose(callback: (event: CloseEvent) => void) {
+			// eslint-disable-next-line
+			super.onclose = async (event: CloseEvent): Promise<void> => {
+				if (jitterScaleInSeconds > 0) {
+					await sleep(Math.random() * jitterScaleInSeconds * 1000);
+				}
+				callback(event);
+			};
+		}
+
+		public set onerror(callback: (event: Event) => void) {
+			// eslint-disable-next-line
+			super.onerror = async (event: Event): Promise<void> => {
+				if (jitterScaleInSeconds > 0) {
+					await sleep(Math.random() * jitterScaleInSeconds * 1000);
+				}
+				callback(event);
+			};
+		}
+
+		public async send(
+			data: string | ArrayBufferLike | Blob | ArrayBufferView
+		): Promise<void> {
+			if (jitterScaleInSeconds > 0) {
+				await sleep(Math.random() * jitterScaleInSeconds * 1000);
+			}
+
+			// eslint-disable-next-line
+			super.send(data);
+		}
+	} as unknown as typeof WebSocket;
+}

From fd6f40d72c26afda578fe25000c6cb9779d78b5a Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Mon, 7 Apr 2025 23:14:00 +0100
Subject: [PATCH 447/761] Bump versions to 0.3.9

---
 backend/Cargo.lock                     | 6 +++---
 backend/Cargo.toml                     | 2 +-
 frontend/obsidian-plugin/manifest.json | 2 +-
 frontend/obsidian-plugin/package.json  | 2 +-
 frontend/package-lock.json             | 8 ++++----
 frontend/sync-client/package.json      | 2 +-
 frontend/test-client/package.json      | 2 +-
 manifest.json                          | 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 6ad1e73f..d823b212 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1922,7 +1922,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile"
-version = "0.3.8"
+version = "0.3.9"
 dependencies = [
  "insta",
  "pretty_assertions",
@@ -2540,7 +2540,7 @@ dependencies = [
 
 [[package]]
 name = "sync_lib"
-version = "0.3.8"
+version = "0.3.9"
 dependencies = [
  "base64 0.22.1",
  "console_error_panic_hook",
@@ -2553,7 +2553,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.3.8"
+version = "0.3.9"
 dependencies = [
  "aide",
  "aide-axum-typed-multipart",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 0e543c8c..f45527e0 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -12,7 +12,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.3.8"
+version = "0.3.9"
 
 [workspace.dependencies]
 serde = { version = "1.0.219", default-features = false, features = ["derive"] }
diff --git a/frontend/obsidian-plugin/manifest.json b/frontend/obsidian-plugin/manifest.json
index fea93c92..bbe027c4 100644
--- a/frontend/obsidian-plugin/manifest.json
+++ b/frontend/obsidian-plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.3.8",
+	"version": "0.3.9",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index eb9d64db..6a6cdbb1 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.3.8",
+	"version": "0.3.9",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 1ec3a737..1c8712ec 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -21,7 +21,7 @@
 		},
 		"../backend/sync_lib/pkg": {
 			"name": "sync_lib",
-			"version": "0.3.8",
+			"version": "0.3.9",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -7853,7 +7853,7 @@
 		},
 		"obsidian-plugin": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.3.8",
+			"version": "0.3.9",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
@@ -7881,7 +7881,7 @@
 			}
 		},
 		"sync-client": {
-			"version": "0.3.8",
+			"version": "0.3.9",
 			"dependencies": {
 				"byte-base64": "^1.1.0",
 				"openapi-fetch": "0.13.5",
@@ -7905,7 +7905,7 @@
 			}
 		},
 		"test-client": {
-			"version": "0.3.8",
+			"version": "0.3.9",
 			"bin": {
 				"test-client": "dist/cli.js"
 			},
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index 51b174fc..09793bcc 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "sync-client",
-    "version": "0.3.8",
+    "version": "0.3.9",
     "main": "dist/sync-client.node.js",
     "browser": "dist/sync-client.web.js",
     "types": "dist/types/index.d.ts",
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index 4d5e18c0..d0a7f507 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "test-client",
-    "version": "0.3.8",
+    "version": "0.3.9",
     "private": true,
     "bin": {
         "test-client": "./dist/cli.js"
diff --git a/manifest.json b/manifest.json
index fea93c92..bbe027c4 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.3.8",
+	"version": "0.3.9",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",

From 3095ec68764501ab230440eb760b9c8948e802d9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 8 Apr 2025 20:34:17 +0100
Subject: [PATCH 448/761] Bump thiserror from 1.0.69 to 2.0.12 in /backend
 (#27)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 backend/Cargo.lock | 4 ++--
 backend/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 7c17f02c..89273241 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -2546,7 +2546,7 @@ dependencies = [
  "console_error_panic_hook",
  "insta",
  "reconcile",
- "thiserror 1.0.69",
+ "thiserror 2.0.12",
  "wasm-bindgen",
  "wasm-bindgen-test",
 ]
@@ -2576,7 +2576,7 @@ dependencies = [
  "serde_yaml",
  "sqlx",
  "sync_lib",
- "thiserror 1.0.69",
+ "thiserror 2.0.12",
  "tokio",
  "tower-http",
  "tracing",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index f45527e0..cc3ac642 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -16,7 +16,7 @@ version = "0.3.9"
 
 [workspace.dependencies]
 serde = { version = "1.0.219", default-features = false, features = ["derive"] }
-thiserror = { version = "1.0.66", default-features = false  }
+thiserror = { version = "2.0.12", default-features = false  }
 
 [profile.release]
 codegen-units = 1

From 32fec24e0402134b448424724ae2d072d94a8fdb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 8 Apr 2025 20:34:28 +0100
Subject: [PATCH 449/761] Bump clap from 4.5.32 to 4.5.35 in /backend (#26)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 backend/Cargo.lock             | 8 ++++----
 backend/sync_server/Cargo.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 89273241..95d1edae 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -451,9 +451,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.32"
+version = "4.5.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6088f3ae8c3608d19260cd7445411865a485688711b78b5be70d78cd96136f83"
+checksum = "d8aa86934b44c19c50f87cc2790e19f54f7a67aedb64101c2e1a2e5ecfb73944"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -471,9 +471,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.32"
+version = "4.5.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22a7ef7f676155edfb82daa97f99441f3ebf4a58d5e32f295a56259f1b6facc8"
+checksum = "2414dbb2dd0695280da6ea9261e327479e9d37b0630f6b53ba2a11c60c679fd9"
 dependencies = [
  "anstream",
  "anstyle",
diff --git a/backend/sync_server/Cargo.toml b/backend/sync_server/Cargo.toml
index 908bf8c7..7b6b7fde 100644
--- a/backend/sync_server/Cargo.toml
+++ b/backend/sync_server/Cargo.toml
@@ -32,7 +32,7 @@ rand = "0.9.0"
 sanitize-filename = "0.6.0"
 axum-jsonschema = { version = "0.8.0", features = ["aide"] }
 regex = "1.11.1"
-clap = { version = "4.5.32", features = ["derive"] }
+clap = { version = "4.5.35", features = ["derive"] }
 futures = "0.3.31"
 serde_json = "1.0.140"
 clap-verbosity-flag = "3.0.2"

From 82e41e5b4ec13ed708584d1b92d6e06ba1324a24 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Tue, 8 Apr 2025 20:42:06 +0100
Subject: [PATCH 450/761] Check in package.json for dependabot

---
 backend/sync_lib/pkg/package.json | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 backend/sync_lib/pkg/package.json

diff --git a/backend/sync_lib/pkg/package.json b/backend/sync_lib/pkg/package.json
new file mode 100644
index 00000000..02e49a7e
--- /dev/null
+++ b/backend/sync_lib/pkg/package.json
@@ -0,0 +1,23 @@
+{
+  "name": "sync_lib",
+  "type": "module",
+  "collaborators": [
+    "Andras Schmelczer <andras@schmelczer.dev>"
+  ],
+  "version": "0.3.9",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/schmelczer/vault-link"
+  },
+  "files": [
+    "sync_lib_bg.wasm",
+    "sync_lib.js",
+    "sync_lib.d.ts"
+  ],
+  "main": "sync_lib.js",
+  "types": "sync_lib.d.ts",
+  "sideEffects": [
+    "./snippets/*"
+  ]
+}
\ No newline at end of file

From 1bd9331bfaf46614f30e81515d604a0f8aa53c3f Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Tue, 8 Apr 2025 20:45:42 +0100
Subject: [PATCH 451/761] Fix E2E error

---
 frontend/sync-client/src/sync-operations/syncer.ts | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/frontend/sync-client/src/sync-operations/syncer.ts b/frontend/sync-client/src/sync-operations/syncer.ts
index 7d7982df..a39e58dc 100644
--- a/frontend/sync-client/src/sync-operations/syncer.ts
+++ b/frontend/sync-client/src/sync-operations/syncer.ts
@@ -273,11 +273,19 @@ export class Syncer {
 
 	public stop(): void {
 		clearInterval(this.refreshApplyRemoteChangesWebSocketInterval);
-		this.applyRemoteChangesWebSocket?.close();
+		try {
+			this.applyRemoteChangesWebSocket?.close();
+		} catch (e) {
+			this.logger.warn(`Failed to close WebSocket: ${e}`);
+		}
 	}
 
 	private updateWebSocket(settings: SyncSettings): void {
-		this.applyRemoteChangesWebSocket?.close();
+		try {
+			this.applyRemoteChangesWebSocket?.close();
+		} catch (e) {
+			this.logger.warn(`Failed to close WebSocket: ${e}`);
+		}
 
 		if (!settings.isSyncEnabled) {
 			this.applyRemoteChangesWebSocket = undefined;

From bda5f3738599c67917303c69cf883fa7b669c6e0 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Tue, 8 Apr 2025 22:21:22 +0100
Subject: [PATCH 452/761] Add min covered

---
 .../sync-client/src/utils/min-covered.test.ts | 48 +++++++++++++++++
 frontend/sync-client/src/utils/min-covered.ts | 51 +++++++++++++++++++
 2 files changed, 99 insertions(+)
 create mode 100644 frontend/sync-client/src/utils/min-covered.test.ts
 create mode 100644 frontend/sync-client/src/utils/min-covered.ts

diff --git a/frontend/sync-client/src/utils/min-covered.test.ts b/frontend/sync-client/src/utils/min-covered.test.ts
new file mode 100644
index 00000000..f53c8cdd
--- /dev/null
+++ b/frontend/sync-client/src/utils/min-covered.test.ts
@@ -0,0 +1,48 @@
+import { CoveredValues } from "./min-covered";
+
+describe("CoveredValues", () => {
+	test("should initialize with the given min value", () => {
+		const covered = new CoveredValues(5);
+		expect(covered.min).toBe(5);
+	});
+
+	test("should add values greater than min", () => {
+		const covered = new CoveredValues(0);
+		covered.add(3);
+		expect(covered.min).toBe(0);
+		covered.add(1);
+		expect(covered.min).toBe(1);
+		covered.add(4);
+		expect(covered.min).toBe(1);
+		covered.add(2);
+		expect(covered.min).toBe(4);
+	});
+
+	test("should ignore duplicate values", () => {
+		const covered = new CoveredValues(0);
+		covered.add(3);
+		covered.add(3);
+		covered.add(3);
+		expect(covered.min).toBe(0);
+		covered.add(1);
+		covered.add(2);
+		expect(covered.min).toBe(3);
+	});
+
+	test("should handle multiple consecutive values", () => {
+		const covered = new CoveredValues(132);
+		for (let i = 250; i > 132; i--) {
+			expect(covered.min).toBe(132);
+			covered.add(i);
+		}
+		expect(covered.min).toBe(250);
+	});
+
+	test("should handle adding values lower than current min", () => {
+		const covered = new CoveredValues(5);
+		covered.add(3);
+		expect(covered.min).toBe(5);
+		covered.add(6);
+		expect(covered.min).toBe(6);
+	});
+});
diff --git a/frontend/sync-client/src/utils/min-covered.ts b/frontend/sync-client/src/utils/min-covered.ts
new file mode 100644
index 00000000..5bdf3ec8
--- /dev/null
+++ b/frontend/sync-client/src/utils/min-covered.ts
@@ -0,0 +1,51 @@
+/**
+ * A class that tracks the minimum covered value in a sequence of numbers.
+ * It keeps track of a minimum value based on the seen values.
+ *
+ * It expects integers slightly out of order and makes sure that the value of `min` is
+ * always the minimum of the seen values. This is done with bounded memory usage.
+ *
+ * @example
+ * ```typescript
+ * const covered = new CoveredValues(0);
+ * covered.add(2); // seenValues = [2], min = 0
+ * covered.add(1); // seenValues = [], min = 2
+ * covered.min; // returns 2
+ * ```
+ */
+export class CoveredValues {
+	private seenValues: number[] = [];
+
+	public constructor(private minValue: number) {}
+
+	public add(value: number): void {
+		if (value < this.minValue) {
+			return;
+		}
+
+		let i = 0;
+		while (i < this.seenValues.length && this.seenValues[i] < value) {
+			i++;
+		}
+
+		if (i === this.seenValues.length) {
+			this.seenValues.push(value);
+		} else if (this.seenValues[i] === value) {
+			return;
+		} else {
+			this.seenValues.splice(i, 0, value);
+		}
+
+		while (
+			this.seenValues.length > 0 &&
+			this.seenValues[0] === this.minValue + 1
+		) {
+			this.seenValues.shift();
+			this.minValue++;
+		}
+	}
+
+	public get min(): number {
+		return this.minValue;
+	}
+}

From 33fd127cf6c6377580f9ec2faec9a30810e0ef36 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Tue, 8 Apr 2025 22:22:37 +0100
Subject: [PATCH 453/761] Take last_seen_vault_update_id as a WS message
 instead of query parameter

---
 backend/sync_server/src/server/websocket.rs | 30 +++++++--------------
 1 file changed, 9 insertions(+), 21 deletions(-)

diff --git a/backend/sync_server/src/server/websocket.rs b/backend/sync_server/src/server/websocket.rs
index 82a37af6..204391bd 100644
--- a/backend/sync_server/src/server/websocket.rs
+++ b/backend/sync_server/src/server/websocket.rs
@@ -1,7 +1,7 @@
 use anyhow::Context;
 use axum::{
     extract::{
-        Path, Query, State,
+        Path, State,
         ws::{Message, WebSocket, WebSocketUpgrade},
     },
     response::Response,
@@ -21,7 +21,7 @@ use crate::{
         database::models::{DeviceId, DocumentVersionWithoutContent, VaultId, VaultUpdateId},
     },
     errors::{SyncServerError, server_error, unauthenticated_error},
-    utils::normalize::{normalize, normalize_string},
+    utils::normalize::normalize,
 };
 
 // This is required for aide to infer the path parameter types and names
@@ -31,30 +31,18 @@ pub struct WebsocketPathParams {
     vault_id: VaultId,
 }
 
-// This is required for aide to infer the path parameter types and names
-#[derive(Deserialize, JsonSchema)]
-pub struct QueryParams {
-    since_update_id: Option<VaultUpdateId>,
-}
-
 pub async fn websocket_handler(
     ws: WebSocketUpgrade,
     Path(WebsocketPathParams { vault_id }): Path<WebsocketPathParams>,
-    Query(QueryParams { since_update_id }): Query<QueryParams>,
     State(state): State<AppState>,
 ) -> Result<Response, SyncServerError> {
-    Ok(ws.on_upgrade(move |socket| websocket_wrapped(state, socket, vault_id, since_update_id)))
+    Ok(ws.on_upgrade(move |socket| websocket_wrapped(state, socket, vault_id)))
 }
 
-async fn websocket_wrapped(
-    state: AppState,
-    stream: WebSocket,
-    vault_id: VaultId,
-    since_update_id: Option<VaultUpdateId>,
-) {
+async fn websocket_wrapped(state: AppState, stream: WebSocket, vault_id: VaultId) {
     info!("Websocket connection opened on vault '{vault_id}'");
 
-    let result = websocket(state, stream, vault_id.clone(), since_update_id).await;
+    let result = websocket(state, stream, vault_id.clone()).await;
 
     if let Err(err) = result {
         error!("Websocket connection error on vault '{vault_id}': {err}");
@@ -68,13 +56,13 @@ async fn websocket_wrapped(
 struct WebsocketHandshake {
     pub token: String,
     pub device_id: DeviceId,
+    pub last_seen_vault_update_id: Option<VaultUpdateId>,
 }
 
 async fn websocket(
     state: AppState,
     stream: WebSocket,
     vault_id: VaultId,
-    since_update_id: Option<VaultUpdateId>,
 ) -> Result<(), SyncServerError> {
     let (mut sender, mut receiver) = stream.split();
 
@@ -83,7 +71,7 @@ async fn websocket(
             .context("Failed to parse token")
             .map_err(server_error)?;
 
-        auth(&state, handshake.token.trim(), &normalize_string(&vault_id))?;
+        auth(&state, handshake.token.trim(), &vault_id)?;
 
         handshake
     } else {
@@ -94,10 +82,10 @@ async fn websocket(
 
     let mut rx = state.broadcasts.get_receiver(vault_id.clone()).await;
 
-    let documents = if let Some(since_update_id) = since_update_id {
+    let documents = if let Some(update_id) = handshake.last_seen_vault_update_id {
         state
             .database
-            .get_latest_documents_since(&vault_id, since_update_id, None)
+            .get_latest_documents_since(&vault_id, update_id, None)
             .await
             .map_err(server_error)
     } else {

From dc124ace20e0ecae78c830dfcbc4f196c65cf437 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Tue, 8 Apr 2025 22:23:01 +0100
Subject: [PATCH 454/761] Sort latest updates ascending

---
 backend/sync_server/src/app_state/database.rs | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/backend/sync_server/src/app_state/database.rs b/backend/sync_server/src/app_state/database.rs
index 2c2cfced..570355cd 100644
--- a/backend/sync_server/src/app_state/database.rs
+++ b/backend/sync_server/src/app_state/database.rs
@@ -138,14 +138,14 @@ impl Database {
         let query = sqlx::query_as!(
             DocumentVersionWithoutContent,
             r#"
-            select 
+            select
                 vault_update_id,
-                document_id as "document_id: Hyphenated", 
+                document_id as "document_id: Hyphenated",
                 relative_path,
                 updated_date as "updated_date: chrono::DateTime<Utc>",
                 is_deleted
             from latest_document_versions
-            order by vault_update_id desc
+            order by vault_update_id
             "#,
         );
 
@@ -178,7 +178,7 @@ impl Database {
                 is_deleted
             from latest_document_versions
             where vault_update_id > ?
-            order by vault_update_id desc
+            order by vault_update_id
             "#,
             vault_update_id
         );
@@ -227,9 +227,9 @@ impl Database {
         let query = sqlx::query_as!(
             StoredDocumentVersion,
             r#"
-            select 
+            select
                 vault_update_id,
-                document_id as "document_id: Hyphenated", 
+                document_id as "document_id: Hyphenated",
                 relative_path,
                 updated_date as "updated_date: chrono::DateTime<Utc>",
                 content,
@@ -264,9 +264,9 @@ impl Database {
         let query = sqlx::query_as!(
             StoredDocumentVersion,
             r#"
-            select 
+            select
                 vault_update_id,
-                document_id as "document_id: Hyphenated", 
+                document_id as "document_id: Hyphenated",
                 relative_path,
                 updated_date as "updated_date: chrono::DateTime<Utc>",
                 content,
@@ -296,9 +296,9 @@ impl Database {
         let query = sqlx::query_as!(
             StoredDocumentVersion,
             r#"
-            select 
+            select
                 vault_update_id,
-                document_id as "document_id: Hyphenated", 
+                document_id as "document_id: Hyphenated",
                 relative_path,
                 updated_date as "updated_date: chrono::DateTime<Utc>",
                 content,
@@ -329,7 +329,7 @@ impl Database {
             r#"
             insert into documents (
                 vault_update_id,
-                document_id, 
+                document_id,
                 relative_path,
                 updated_date,
                 content,

From 0abd50ac0cf50a0f4ecffe54c58ea31952073365 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Tue, 8 Apr 2025 23:00:44 +0100
Subject: [PATCH 455/761] Add force setting to MinCovered

---
 frontend/sync-client/src/utils/min-covered.test.ts | 12 ++++++++++++
 frontend/sync-client/src/utils/min-covered.ts      | 13 +++++++++----
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/frontend/sync-client/src/utils/min-covered.test.ts b/frontend/sync-client/src/utils/min-covered.test.ts
index f53c8cdd..429f7a63 100644
--- a/frontend/sync-client/src/utils/min-covered.test.ts
+++ b/frontend/sync-client/src/utils/min-covered.test.ts
@@ -45,4 +45,16 @@ describe("CoveredValues", () => {
 		covered.add(6);
 		expect(covered.min).toBe(6);
 	});
+
+	test("should handle force setting min value", () => {
+		const covered = new CoveredValues(5);
+		covered.add(7);
+		covered.add(8);
+		covered.add(9);
+		expect(covered.min).toBe(5);
+		covered.min = 6;
+		expect(covered.min).toBe(6);
+		covered.add(10);
+		expect(covered.min).toBe(10);
+	});
 });
diff --git a/frontend/sync-client/src/utils/min-covered.ts b/frontend/sync-client/src/utils/min-covered.ts
index 5bdf3ec8..c453ef88 100644
--- a/frontend/sync-client/src/utils/min-covered.ts
+++ b/frontend/sync-client/src/utils/min-covered.ts
@@ -18,6 +18,15 @@ export class CoveredValues {
 
 	public constructor(private minValue: number) {}
 
+	public get min(): number {
+		return this.minValue;
+	}
+
+	public set min(value: number) {
+		this.minValue = Math.max(value, this.minValue);
+		this.seenValues = this.seenValues.filter((v) => v > value);
+	}
+
 	public add(value: number): void {
 		if (value < this.minValue) {
 			return;
@@ -44,8 +53,4 @@ export class CoveredValues {
 			this.minValue++;
 		}
 	}
-
-	public get min(): number {
-		return this.minValue;
-	}
 }

From f63d3dd83089a42315967d2a6c2d8cf8df009979 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Tue, 8 Apr 2025 23:01:08 +0100
Subject: [PATCH 456/761] Add websocket message type

---
 backend/sync_server/src/server/websocket.rs | 35 ++++++++++++++++-----
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/backend/sync_server/src/server/websocket.rs b/backend/sync_server/src/server/websocket.rs
index 204391bd..2517fe88 100644
--- a/backend/sync_server/src/server/websocket.rs
+++ b/backend/sync_server/src/server/websocket.rs
@@ -12,7 +12,7 @@ use futures::{
 };
 use log::{error, info, warn};
 use schemars::JsonSchema;
-use serde::Deserialize;
+use serde::{Deserialize, Serialize};
 
 use super::auth::auth;
 use crate::{
@@ -59,6 +59,13 @@ struct WebsocketHandshake {
     pub last_seen_vault_update_id: Option<VaultUpdateId>,
 }
 
+#[derive(Serialize)]
+#[serde(rename_all = "camelCase")]
+struct WebsocketVaultUpdate {
+    pub documents: Vec<DocumentVersionWithoutContent>,
+    pub is_initial_sync: bool,
+}
+
 async fn websocket(
     state: AppState,
     stream: WebSocket,
@@ -96,9 +103,14 @@ async fn websocket(
             .map_err(server_error)
     }?;
 
-    for document in documents {
-        send_document_over_websocket(document, &mut sender).await?;
-    }
+    send_update_over_websocket(
+        &WebsocketVaultUpdate {
+            documents,
+            is_initial_sync: true,
+        },
+        &mut sender,
+    )
+    .await?;
 
     let mut send_task = tokio::spawn(async move {
         while let Ok(update) = rx.recv().await {
@@ -106,7 +118,14 @@ async fn websocket(
                 continue;
             }
 
-            send_document_over_websocket(update.document, &mut sender).await?;
+            send_update_over_websocket(
+                &WebsocketVaultUpdate {
+                    documents: vec![update.document],
+                    is_initial_sync: false,
+                },
+                &mut sender,
+            )
+            .await?;
         }
 
         Ok::<(), SyncServerError>(())
@@ -135,11 +154,11 @@ async fn websocket(
     Ok(())
 }
 
-async fn send_document_over_websocket(
-    document: DocumentVersionWithoutContent,
+async fn send_update_over_websocket(
+    update: &WebsocketVaultUpdate,
     sender: &mut SplitSink<WebSocket, Message>,
 ) -> Result<(), SyncServerError> {
-    let serialized_update = serde_json::to_string(&document)
+    let serialized_update = serde_json::to_string(update)
         .context("Failed to serialize update")
         .map_err(server_error)?;
 

From 96bf542b912878d457fedfca326a234e6acde910 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Tue, 8 Apr 2025 23:02:41 +0100
Subject: [PATCH 457/761] Keep updating the last seen id correctly

---
 .../sync-client/src/persistence/database.ts   | 32 ++++++++----
 .../sync-client/src/sync-operations/syncer.ts | 50 +++++++++++++------
 .../sync-operations/unrestricted-syncer.ts    | 25 +++-------
 3 files changed, 66 insertions(+), 41 deletions(-)

diff --git a/frontend/sync-client/src/persistence/database.ts b/frontend/sync-client/src/persistence/database.ts
index f6379c53..3edbec80 100644
--- a/frontend/sync-client/src/persistence/database.ts
+++ b/frontend/sync-client/src/persistence/database.ts
@@ -1,5 +1,6 @@
 import type { Logger } from "../tracing/logger";
 import { EMPTY_HASH } from "../utils/hash";
+import { CoveredValues } from "../utils/min-covered";
 
 export type VaultUpdateId = number;
 export type DocumentId = string;
@@ -40,7 +41,7 @@ export interface DocumentRecord {
 
 export class Database {
 	private documents: DocumentRecord[];
-	private lastSeenUpdateId: VaultUpdateId | undefined;
+	private lastSeenUpdateIds: CoveredValues;
 	private hasInitialSyncCompleted: boolean;
 
 	public constructor(
@@ -65,9 +66,10 @@ export class Database {
 		this.ensureConsistency();
 		this.logger.debug(`Loaded ${this.documents.length} documents`);
 
-		this.lastSeenUpdateId = initialState.lastSeenUpdateId;
-		this.logger.debug(
-			`Loaded last seen update id: ${this.lastSeenUpdateId}`
+		const { lastSeenUpdateId } = initialState;
+		this.logger.debug(`Loaded last seen update id: ${lastSeenUpdateId}`);
+		this.lastSeenUpdateIds = new CoveredValues(
+			Math.max(0, lastSeenUpdateId ?? 0) // the first updateId will be 1 which is the first integer after -1
 		);
 
 		this.hasInitialSyncCompleted =
@@ -286,18 +288,28 @@ export class Database {
 		this.save();
 	}
 
-	public getLastSeenUpdateId(): VaultUpdateId | undefined {
-		return this.lastSeenUpdateId;
+	public getLastSeenUpdateId(): VaultUpdateId {
+		return this.lastSeenUpdateIds.min;
 	}
 
-	public setLastSeenUpdateId(value: VaultUpdateId | undefined): void {
-		this.lastSeenUpdateId = value;
+	public addLastSeenUpdateId(value: number): void {
+		const previousMin = this.lastSeenUpdateIds.min;
+		this.lastSeenUpdateIds.add(value);
+		if (previousMin !== this.lastSeenUpdateIds.min) {
+			this.save();
+		}
+	}
+
+	public setLastSeenUpdateId(value: number): void {
+		this.lastSeenUpdateIds.min = value;
 		this.save();
 	}
 
 	public reset(): void {
 		this.documents = [];
-		this.lastSeenUpdateId = 0;
+		this.lastSeenUpdateIds = new CoveredValues(
+			0 // the first updateId will be 1 which is the first integer after -1
+		);
 		this.hasInitialSyncCompleted = false;
 		this.save();
 	}
@@ -313,7 +325,7 @@ export class Database {
 					...metadata! // `resolvedDocuments` only returns docs with metadata set
 				})
 			),
-			lastSeenUpdateId: this.lastSeenUpdateId,
+			lastSeenUpdateId: this.lastSeenUpdateIds.min,
 			hasInitialSyncCompleted: this.hasInitialSyncCompleted
 		});
 	}
diff --git a/frontend/sync-client/src/sync-operations/syncer.ts b/frontend/sync-client/src/sync-operations/syncer.ts
index a39e58dc..5aafb08c 100644
--- a/frontend/sync-client/src/sync-operations/syncer.ts
+++ b/frontend/sync-client/src/sync-operations/syncer.ts
@@ -17,6 +17,11 @@ import { createPromise } from "../utils/create-promise";
 import { SyncResetError } from "../services/sync-reset-error";
 import { Locks } from "../utils/locks";
 
+interface WebsocketVaultUpdate {
+	documents: components["schemas"]["DocumentVersionWithoutContent"][];
+	isInitialSync: boolean;
+}
+
 export class Syncer {
 	private readonly remoteDocumentsLock: Locks<DocumentId>;
 	private readonly remainingOperationsListeners: ((
@@ -273,6 +278,7 @@ export class Syncer {
 
 	public stop(): void {
 		clearInterval(this.refreshApplyRemoteChangesWebSocketInterval);
+
 		try {
 			this.applyRemoteChangesWebSocket?.close();
 		} catch (e) {
@@ -302,14 +308,30 @@ export class Syncer {
 			wsUri
 		);
 
-		this.applyRemoteChangesWebSocket.onmessage = (event): void =>
-			void this.syncRemotelyUpdatedFile(event.data).catch(
-				(e: unknown) => {
-					this.logger.error(
-						`Failed to sync remotely updated file: ${e}`
+		this.applyRemoteChangesWebSocket.onmessage = async (
+			event
+		): Promise<void> => {
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+			const message = JSON.parse(event.data) as WebsocketVaultUpdate;
+
+			try {
+				await Promise.all(
+					message.documents.map(async (document) =>
+						this.syncRemotelyUpdatedFile(document)
+					)
+				);
+
+				if (message.isInitialSync && message.documents.length > 0) {
+					this.database.setLastSeenUpdateId(
+						message.documents
+							.map((document) => document.vaultUpdateId)
+							.reduce((a, b) => Math.max(a, b))
 					);
 				}
-			);
+			} catch (e) {
+				this.logger.error(`Failed to sync remotely updated file: ${e}`);
+			}
+		};
 
 		// The JS WebSocket API doesn't support setting headers, so we have to send the token as a message
 		this.applyRemoteChangesWebSocket.onopen = (): void => {
@@ -317,7 +339,8 @@ export class Syncer {
 			this.applyRemoteChangesWebSocket?.send(
 				JSON.stringify({
 					deviceId: this.deviceId,
-					token: settings.token
+					token: settings.token,
+					lastSeenVaultUpdateId: this.database.getLastSeenUpdateId()
 				})
 			);
 			this.webSocketStatusChangeListeners.forEach((listener) => {
@@ -327,7 +350,7 @@ export class Syncer {
 
 		this.applyRemoteChangesWebSocket.onclose = (event): void => {
 			this.logger.warn(
-				`WebSocket closed with code ${event.code}: ${event.reason}`
+				`WebSocket closed with code ${event.code} (${event.reason == "" ? "unknown reason" : event.reason})`
 			);
 			this.webSocketStatusChangeListeners.forEach((listener) => {
 				listener();
@@ -347,12 +370,9 @@ export class Syncer {
 		}, 5000);
 	}
 
-	private async syncRemotelyUpdatedFile(message: string): Promise<void> {
-		// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-		const remoteVersion = JSON.parse(
-			message
-		) as components["schemas"]["DocumentVersionWithoutContent"];
-
+	private async syncRemotelyUpdatedFile(
+		remoteVersion: components["schemas"]["DocumentVersionWithoutContent"]
+	): Promise<void> {
 		let document = this.database.getDocumentByDocumentId(
 			remoteVersion.documentId
 		);
@@ -400,6 +420,8 @@ export class Syncer {
 					this.database.removeDocumentPromise(promise);
 				}
 			}
+
+			this.database.addLastSeenUpdateId(remoteVersion.vaultUpdateId);
 		} finally {
 			if (hasLockToRelease) {
 				this.remoteDocumentsLock.unlock(remoteVersion.documentId);
diff --git a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
index 43cb5c7c..e62ea173 100644
--- a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
+++ b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
@@ -59,7 +59,7 @@ export class UnrestrictedSyncer {
 					document
 				);
 
-				this.tryIncrementVaultUpdateId(response.vaultUpdateId);
+				this.database.addLastSeenUpdateId(response.vaultUpdateId);
 			}
 		);
 	}
@@ -90,6 +90,8 @@ export class UnrestrictedSyncer {
 					},
 					document
 				);
+
+				this.database.addLastSeenUpdateId(response.vaultUpdateId);
 			}
 		);
 	}
@@ -156,6 +158,7 @@ export class UnrestrictedSyncer {
 					this.logger.info(
 						`Document ${document.relativePath} has been deleted before we could finish updating it`
 					);
+					this.database.addLastSeenUpdateId(response.vaultUpdateId);
 					return;
 				}
 
@@ -174,6 +177,7 @@ export class UnrestrictedSyncer {
 					this.logger.debug(
 						`Document ${document.relativePath} is already more up to date than the fetched version`
 					);
+					this.database.addLastSeenUpdateId(response.vaultUpdateId); // in case the previous `vaultUpdateId` update hasn't made it through
 					return;
 				}
 
@@ -206,7 +210,7 @@ export class UnrestrictedSyncer {
 
 					await this.operations.delete(document.relativePath);
 
-					this.tryIncrementVaultUpdateId(response.vaultUpdateId);
+					this.database.addLastSeenUpdateId(response.vaultUpdateId);
 
 					return;
 				}
@@ -221,14 +225,6 @@ export class UnrestrictedSyncer {
 					); // this can throw FileNotFoundError
 				}
 
-				this.database.updateDocumentMetadata(
-					{
-						parentVersionId: response.vaultUpdateId,
-						hash: contentHash
-					},
-					document
-				);
-
 				if (
 					!("type" in response) ||
 					response.type === "MergingUpdate"
@@ -268,7 +264,7 @@ export class UnrestrictedSyncer {
 					);
 				}
 
-				this.tryIncrementVaultUpdateId(response.vaultUpdateId);
+				this.database.addLastSeenUpdateId(response.vaultUpdateId);
 			}
 		);
 	}
@@ -291,6 +287,7 @@ export class UnrestrictedSyncer {
 						this.logger.debug(
 							`Document ${remoteVersion.relativePath} is already at least as up to date as the fetched version`
 						);
+
 						return;
 					}
 
@@ -425,10 +422,4 @@ export class UnrestrictedSyncer {
 			}
 		}
 	}
-
-	private tryIncrementVaultUpdateId(responseVaultUpdateId: number): void {
-		if (this.database.getLastSeenUpdateId() === responseVaultUpdateId - 1) {
-			this.database.setLastSeenUpdateId(responseVaultUpdateId);
-		}
-	}
 }

From b26552fc1f7633c716b7df3cecb96229a35f6f99 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Tue, 8 Apr 2025 23:05:06 +0100
Subject: [PATCH 458/761] Update API types

---
 frontend/sync-client/src/services/types.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/frontend/sync-client/src/services/types.ts b/frontend/sync-client/src/services/types.ts
index 7ecb7fe3..6ceadefd 100644
--- a/frontend/sync-client/src/services/types.ts
+++ b/frontend/sync-client/src/services/types.ts
@@ -556,10 +556,6 @@ export interface components {
 			/** Format: int64 */
 			since_update_id?: number | null;
 		};
-		QueryParams2: {
-			/** Format: int64 */
-			since_update_id?: number | null;
-		};
 		SerializedError: {
 			causes: string[];
 			message: string;

From a82ed701ef2b8447c5379bdf38f8053448fde63b Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 13 Apr 2025 21:27:16 +0100
Subject: [PATCH 459/761] Bump versions to 0.3.10

---
 backend/Cargo.lock                     | 6 +++---
 backend/Cargo.toml                     | 2 +-
 backend/sync_lib/pkg/package.json      | 2 +-
 frontend/obsidian-plugin/manifest.json | 2 +-
 frontend/obsidian-plugin/package.json  | 2 +-
 frontend/package-lock.json             | 8 ++++----
 frontend/sync-client/package.json      | 2 +-
 frontend/test-client/package.json      | 2 +-
 manifest.json                          | 2 +-
 9 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 95d1edae..31ceb562 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1922,7 +1922,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile"
-version = "0.3.9"
+version = "0.3.10"
 dependencies = [
  "insta",
  "pretty_assertions",
@@ -2540,7 +2540,7 @@ dependencies = [
 
 [[package]]
 name = "sync_lib"
-version = "0.3.9"
+version = "0.3.10"
 dependencies = [
  "base64 0.22.1",
  "console_error_panic_hook",
@@ -2553,7 +2553,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.3.9"
+version = "0.3.10"
 dependencies = [
  "aide",
  "aide-axum-typed-multipart",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index cc3ac642..0ba127f0 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -12,7 +12,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.3.9"
+version = "0.3.10"
 
 [workspace.dependencies]
 serde = { version = "1.0.219", default-features = false, features = ["derive"] }
diff --git a/backend/sync_lib/pkg/package.json b/backend/sync_lib/pkg/package.json
index 02e49a7e..bef8239a 100644
--- a/backend/sync_lib/pkg/package.json
+++ b/backend/sync_lib/pkg/package.json
@@ -4,7 +4,7 @@
   "collaborators": [
     "Andras Schmelczer <andras@schmelczer.dev>"
   ],
-  "version": "0.3.9",
+  "version": "0.3.10",
   "license": "MIT",
   "repository": {
     "type": "git",
diff --git a/frontend/obsidian-plugin/manifest.json b/frontend/obsidian-plugin/manifest.json
index bbe027c4..c5621e7e 100644
--- a/frontend/obsidian-plugin/manifest.json
+++ b/frontend/obsidian-plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.3.9",
+	"version": "0.3.10",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index 6a6cdbb1..7459d8bb 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.3.9",
+	"version": "0.3.10",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 1c8712ec..1a53493e 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -21,7 +21,7 @@
 		},
 		"../backend/sync_lib/pkg": {
 			"name": "sync_lib",
-			"version": "0.3.9",
+			"version": "0.3.10",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -7853,7 +7853,7 @@
 		},
 		"obsidian-plugin": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.3.9",
+			"version": "0.3.10",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
@@ -7881,7 +7881,7 @@
 			}
 		},
 		"sync-client": {
-			"version": "0.3.9",
+			"version": "0.3.10",
 			"dependencies": {
 				"byte-base64": "^1.1.0",
 				"openapi-fetch": "0.13.5",
@@ -7905,7 +7905,7 @@
 			}
 		},
 		"test-client": {
-			"version": "0.3.9",
+			"version": "0.3.10",
 			"bin": {
 				"test-client": "dist/cli.js"
 			},
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index 09793bcc..5ac07cc8 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "sync-client",
-    "version": "0.3.9",
+    "version": "0.3.10",
     "main": "dist/sync-client.node.js",
     "browser": "dist/sync-client.web.js",
     "types": "dist/types/index.d.ts",
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index d0a7f507..9fe537d6 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "test-client",
-    "version": "0.3.9",
+    "version": "0.3.10",
     "private": true,
     "bin": {
         "test-client": "./dist/cli.js"
diff --git a/manifest.json b/manifest.json
index bbe027c4..c5621e7e 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.3.9",
+	"version": "0.3.10",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",

From 535b76bb71ae8b8ddf02efb905cba67c4d6d160b Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 13 Apr 2025 22:06:35 +0100
Subject: [PATCH 460/761] Fix E2E

---
 frontend/test-client/src/cli.ts | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/frontend/test-client/src/cli.ts b/frontend/test-client/src/cli.ts
index 9093c697..ce941b00 100644
--- a/frontend/test-client/src/cli.ts
+++ b/frontend/test-client/src/cli.ts
@@ -131,7 +131,17 @@ process.on("uncaughtException", (error) => {
 	if (slowFileEvents) {
 		return;
 	}
-	console.error("Uncaught Exception:", error);
+
+	if (
+		error instanceof Error &&
+		error.message.includes(
+			"WebSocket was closed before the connection was established"
+		)
+	) {
+		return;
+	}
+
+	console.error("Uncaught exception:", error);
 	process.exit(1);
 });
 
@@ -144,7 +154,7 @@ process.on("unhandledRejection", (error, _promise) => {
 		return;
 	}
 
-	console.error("Unhandled Rejection:", error);
+	console.error("Unhandled rejection:", error);
 	process.exit(1);
 });
 

From 78525cef45d0ec8b3cd30f0fa77f9c69f7ccd2ee Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 13 Apr 2025 22:21:19 +0100
Subject: [PATCH 461/761] Fix tests ignoring overflowing cursors

---
 backend/reconcile/tests/example_document.rs  | 7 +++++++
 backend/reconcile/tests/examples/deletes.yml | 6 ++++++
 2 files changed, 13 insertions(+)

diff --git a/backend/reconcile/tests/example_document.rs b/backend/reconcile/tests/example_document.rs
index 66a56f65..10790c8b 100644
--- a/backend/reconcile/tests/example_document.rs
+++ b/backend/reconcile/tests/example_document.rs
@@ -63,6 +63,13 @@ impl ExampleDocument {
     fn text_with_cursors_to_string(text: &TextWithCursors<'_>) -> String {
         let mut result = text.text.clone().into_owned();
         for (i, cursor) in text.cursors.iter().enumerate() {
+            assert!(
+                cursor.char_index <= result.len(), // equals in case of insert at the end
+                "Cursor index out of bounds: {} > {}",
+                cursor.char_index,
+                result.len()
+            );
+
             result.insert(
                 result
                     .char_indices()
diff --git a/backend/reconcile/tests/examples/deletes.yml b/backend/reconcile/tests/examples/deletes.yml
index 59eb9337..c4c145b8 100644
--- a/backend/reconcile/tests/examples/deletes.yml
+++ b/backend/reconcile/tests/examples/deletes.yml
@@ -23,3 +23,9 @@ parent: long text with one big delete and many small
 left: long small
 right: long with big and small
 expected: long small
+
+---
+parent: long text where the cursor has to be clamped after delete
+left: long text where the cursor has to be clamped after delete|
+right: long text where the cursor
+expected: long text where the cursor|

From 7c081e893960295bf81d71b889863fc3e4f62506 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 13 Apr 2025 22:21:38 +0100
Subject: [PATCH 462/761] Fix out of bounds cursors in case of trailing delete

---
 .../reconcile/src/operation_transformation/edited_text.rs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/backend/reconcile/src/operation_transformation/edited_text.rs b/backend/reconcile/src/operation_transformation/edited_text.rs
index 0ef6c66e..0f136fe7 100644
--- a/backend/reconcile/src/operation_transformation/edited_text.rs
+++ b/backend/reconcile/src/operation_transformation/edited_text.rs
@@ -309,7 +309,13 @@ where
 
         let last_index = merged_operations
             .iter()
-            .last()
+            .filter(|operation| {
+                matches!(
+                    operation.operation,
+                    Operation::Insert { .. } | Operation::Equal { .. }
+                )
+            })
+            .next_back()
             .map_or(0, |op| op.operation.end_index());
 
         for cursor in left_cursors.chain(right_cursors) {

From 438f0b4d97bf045368177ef852b0356f85a90469 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 13 Apr 2025 22:23:28 +0100
Subject: [PATCH 463/761] Fix out of bounds cursor checking

---
 .../src/utils/position-to-line-and-column.ts             | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/frontend/obsidian-plugin/src/utils/position-to-line-and-column.ts b/frontend/obsidian-plugin/src/utils/position-to-line-and-column.ts
index 3c35fb6e..3df61ded 100644
--- a/frontend/obsidian-plugin/src/utils/position-to-line-and-column.ts
+++ b/frontend/obsidian-plugin/src/utils/position-to-line-and-column.ts
@@ -14,13 +14,18 @@ export function positionToLineAndColumn(
 		throw new Error("Position cannot be negative");
 	}
 
-	if (position > text.length) {
+	text = text.replace("\r", "");
+
+	if (
+		position >
+		text.length + 1
+		// +1 to account for the cursor being after last character
+	) {
 		throw new Error(
 			`Position ${position} exceeds text length ${text.length}`
 		);
 	}
 
-	text = text.replace("\r", "");
 	const textUpToPosition = text.substring(0, position);
 	const lines = textUpToPosition.split("\n");
 

From 23684c982e813a532a369ae97c53bdd4602a13d7 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 13 Apr 2025 22:23:35 +0100
Subject: [PATCH 464/761] Add comment

---
 .../sync-client/src/file-operations/filesystem-operations.ts    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frontend/sync-client/src/file-operations/filesystem-operations.ts b/frontend/sync-client/src/file-operations/filesystem-operations.ts
index 175490d4..4caf538d 100644
--- a/frontend/sync-client/src/file-operations/filesystem-operations.ts
+++ b/frontend/sync-client/src/file-operations/filesystem-operations.ts
@@ -2,6 +2,8 @@ import type { RelativePath } from "../persistence/database";
 
 export interface Cursor {
 	id: number;
+
+	/// The character position is the index of the character in the text where the text lines are separated by '\n' new line character even if the actual text uses different line endings.
 	characterPosition: number;
 }
 

From e2edc076b97e3dcbd94caafd1acf02406bb7b44f Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 13 Apr 2025 22:23:53 +0100
Subject: [PATCH 465/761] Bump versions to 0.3.11

---
 backend/Cargo.lock                     | 6 +++---
 backend/Cargo.toml                     | 2 +-
 backend/sync_lib/pkg/package.json      | 2 +-
 frontend/obsidian-plugin/manifest.json | 2 +-
 frontend/obsidian-plugin/package.json  | 2 +-
 frontend/package-lock.json             | 8 ++++----
 frontend/sync-client/package.json      | 2 +-
 frontend/test-client/package.json      | 2 +-
 manifest.json                          | 2 +-
 9 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 31ceb562..d26ea432 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1922,7 +1922,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile"
-version = "0.3.10"
+version = "0.3.11"
 dependencies = [
  "insta",
  "pretty_assertions",
@@ -2540,7 +2540,7 @@ dependencies = [
 
 [[package]]
 name = "sync_lib"
-version = "0.3.10"
+version = "0.3.11"
 dependencies = [
  "base64 0.22.1",
  "console_error_panic_hook",
@@ -2553,7 +2553,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.3.10"
+version = "0.3.11"
 dependencies = [
  "aide",
  "aide-axum-typed-multipart",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 0ba127f0..be698c8b 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -12,7 +12,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.3.10"
+version = "0.3.11"
 
 [workspace.dependencies]
 serde = { version = "1.0.219", default-features = false, features = ["derive"] }
diff --git a/backend/sync_lib/pkg/package.json b/backend/sync_lib/pkg/package.json
index bef8239a..3f69de86 100644
--- a/backend/sync_lib/pkg/package.json
+++ b/backend/sync_lib/pkg/package.json
@@ -4,7 +4,7 @@
   "collaborators": [
     "Andras Schmelczer <andras@schmelczer.dev>"
   ],
-  "version": "0.3.10",
+  "version": "0.3.11",
   "license": "MIT",
   "repository": {
     "type": "git",
diff --git a/frontend/obsidian-plugin/manifest.json b/frontend/obsidian-plugin/manifest.json
index c5621e7e..171c3b73 100644
--- a/frontend/obsidian-plugin/manifest.json
+++ b/frontend/obsidian-plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.3.10",
+	"version": "0.3.11",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index 7459d8bb..7f10138f 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.3.10",
+	"version": "0.3.11",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 1a53493e..da2e6eb1 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -21,7 +21,7 @@
 		},
 		"../backend/sync_lib/pkg": {
 			"name": "sync_lib",
-			"version": "0.3.10",
+			"version": "0.3.11",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -7853,7 +7853,7 @@
 		},
 		"obsidian-plugin": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.3.10",
+			"version": "0.3.11",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
@@ -7881,7 +7881,7 @@
 			}
 		},
 		"sync-client": {
-			"version": "0.3.10",
+			"version": "0.3.11",
 			"dependencies": {
 				"byte-base64": "^1.1.0",
 				"openapi-fetch": "0.13.5",
@@ -7905,7 +7905,7 @@
 			}
 		},
 		"test-client": {
-			"version": "0.3.10",
+			"version": "0.3.11",
 			"bin": {
 				"test-client": "dist/cli.js"
 			},
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index 5ac07cc8..ce052e63 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "sync-client",
-    "version": "0.3.10",
+    "version": "0.3.11",
     "main": "dist/sync-client.node.js",
     "browser": "dist/sync-client.web.js",
     "types": "dist/types/index.d.ts",
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index 9fe537d6..2f358a9b 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "test-client",
-    "version": "0.3.10",
+    "version": "0.3.11",
     "private": true,
     "bin": {
         "test-client": "./dist/cli.js"
diff --git a/manifest.json b/manifest.json
index c5621e7e..171c3b73 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.3.10",
+	"version": "0.3.11",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",

From 35bb7f2405b6f828d133068605c51882ffb11ed1 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 13 Apr 2025 23:06:07 +0100
Subject: [PATCH 466/761] Fix cursor movement on shortened deletes and refactor

---
 .../src/operation_transformation/cursor.rs    |  2 +-
 .../operation_transformation/edited_text.rs   | 71 +++++++++----------
 backend/reconcile/tests/example_document.rs   |  2 +-
 backend/reconcile/tests/examples/various.yml  |  2 +-
 4 files changed, 35 insertions(+), 42 deletions(-)

diff --git a/backend/reconcile/src/operation_transformation/cursor.rs b/backend/reconcile/src/operation_transformation/cursor.rs
index c7fbaf5d..f1452734 100644
--- a/backend/reconcile/src/operation_transformation/cursor.rs
+++ b/backend/reconcile/src/operation_transformation/cursor.rs
@@ -14,7 +14,7 @@ pub struct CursorPosition {
 
 impl CursorPosition {
     #[must_use]
-    pub fn with_index(self, index: usize) -> Self {
+    pub fn with_index(&self, index: usize) -> Self {
         CursorPosition {
             id: self.id,
             char_index: index,
diff --git a/backend/reconcile/src/operation_transformation/edited_text.rs b/backend/reconcile/src/operation_transformation/edited_text.rs
index 0f136fe7..b83441f6 100644
--- a/backend/reconcile/src/operation_transformation/edited_text.rs
+++ b/backend/reconcile/src/operation_transformation/edited_text.rs
@@ -253,57 +253,50 @@ where
             .flat_map(|(OrderedOperation { order, operation }, side)| {
                 let original_start = operation.start_index() as i64;
                 let original_end = operation.end_index();
+                let original_length = operation.len() as i64;
 
-                match side {
-                    Side::Left => {
-                        let result = operation.merge_operations_with_context(
-                            &mut right_merge_context,
-                            &mut left_merge_context,
-                        );
+                let result = match side {
+                    Side::Left => operation.merge_operations_with_context(
+                        &mut right_merge_context,
+                        &mut left_merge_context,
+                    ),
+                    Side::Right => operation.merge_operations_with_context(
+                        &mut left_merge_context,
+                        &mut right_merge_context,
+                    ),
+                };
 
-                        if let Some(ref op @ (Operation::Insert { .. } | Operation::Equal { .. })) =
-                            result
-                        {
-                            while let Some(mut cursor) =
+                if let Some(ref op @ (Operation::Insert { .. } | Operation::Equal { .. })) = result
+                {
+                    let shift = op.start_index() as i64 - original_start + op.len() as i64
+                        - original_length;
+                    match side {
+                        Side::Left => {
+                            while let Some(cursor) =
                                 left_cursors.next_if(|cursor| cursor.char_index <= original_end + 1)
                             {
-                                let shift = op.start_index() as i64 - original_start;
-
-                                cursor.char_index = (op.start_index() as i64)
-                                    .max(cursor.char_index as i64 + shift)
-                                    as usize;
-                                merged_cursors.push(cursor);
+                                merged_cursors.push(cursor.with_index(
+                                    (op.start_index() as i64).max(cursor.char_index as i64 + shift)
+                                        as usize,
+                                ));
                             }
                         }
-
-                        result
-                    }
-                    Side::Right => {
-                        let result = operation.merge_operations_with_context(
-                            &mut left_merge_context,
-                            &mut right_merge_context,
-                        );
-
-                        if let Some(ref op @ (Operation::Insert { .. } | Operation::Equal { .. })) =
-                            result
-                        {
-                            while let Some(mut cursor) = right_cursors
+                        Side::Right => {
+                            while let Some(cursor) = right_cursors
                                 .next_if(|cursor| cursor.char_index <= original_end + 1)
                             {
-                                let shift = op.start_index() as i64 - original_start;
-
-                                cursor.char_index = (op.start_index() as i64)
-                                    .max(cursor.char_index as i64 + shift)
-                                    as usize;
-                                merged_cursors.push(cursor);
+                                merged_cursors.push(cursor.with_index(
+                                    (op.start_index() as i64).max(cursor.char_index as i64 + shift)
+                                        as usize,
+                                ));
                             }
                         }
-
-                        result
                     }
                 }
-                .map(|operation| OrderedOperation { order, operation })
-                .into_iter()
+
+                result
+                    .map(|operation| OrderedOperation { order, operation })
+                    .into_iter()
             })
             .collect();
 
diff --git a/backend/reconcile/tests/example_document.rs b/backend/reconcile/tests/example_document.rs
index 10790c8b..277e49e1 100644
--- a/backend/reconcile/tests/example_document.rs
+++ b/backend/reconcile/tests/example_document.rs
@@ -65,7 +65,7 @@ impl ExampleDocument {
         for (i, cursor) in text.cursors.iter().enumerate() {
             assert!(
                 cursor.char_index <= result.len(), // equals in case of insert at the end
-                "Cursor index out of bounds: {} > {}",
+                "Cursor index out of bounds: {} > {} when testing for '{result}'",
                 cursor.char_index,
                 result.len()
             );
diff --git a/backend/reconcile/tests/examples/various.yml b/backend/reconcile/tests/examples/various.yml
index 7a87e4e7..cfbeb423 100644
--- a/backend/reconcile/tests/examples/various.yml
+++ b/backend/reconcile/tests/examples/various.yml
@@ -67,7 +67,7 @@ expected: market| placemarket|space
 parent: A B C D
 left: A X B D|
 right: A B Y|
-expected: A X B Y||
+expected: A X B |Y|
 
 ---
 parent: Please submit your assignment by Friday

From 5baf92b2ee10264d92c876aee0e250b052d37c84 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 11 May 2025 14:53:02 +0100
Subject: [PATCH 467/761] Bump clap from 4.5.35 to 4.5.37 in /backend (#32)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 backend/Cargo.lock             | 8 ++++----
 backend/sync_server/Cargo.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index d26ea432..abf2942c 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -451,9 +451,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.35"
+version = "4.5.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8aa86934b44c19c50f87cc2790e19f54f7a67aedb64101c2e1a2e5ecfb73944"
+checksum = "eccb054f56cbd38340b380d4a8e69ef1f02f1af43db2f0cc817a4774d80ae071"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -471,9 +471,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.35"
+version = "4.5.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2414dbb2dd0695280da6ea9261e327479e9d37b0630f6b53ba2a11c60c679fd9"
+checksum = "efd9466fac8543255d3b1fcad4762c5e116ffe808c8a3043d4263cd4fd4862a2"
 dependencies = [
  "anstream",
  "anstyle",
diff --git a/backend/sync_server/Cargo.toml b/backend/sync_server/Cargo.toml
index 7b6b7fde..1d28b854 100644
--- a/backend/sync_server/Cargo.toml
+++ b/backend/sync_server/Cargo.toml
@@ -32,7 +32,7 @@ rand = "0.9.0"
 sanitize-filename = "0.6.0"
 axum-jsonschema = { version = "0.8.0", features = ["aide"] }
 regex = "1.11.1"
-clap = { version = "4.5.35", features = ["derive"] }
+clap = { version = "4.5.37", features = ["derive"] }
 futures = "0.3.31"
 serde_json = "1.0.140"
 clap-verbosity-flag = "3.0.2"

From 1598e3c4d57348111d830bdd237cff1a0a424de4 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 11 May 2025 15:50:24 +0100
Subject: [PATCH 468/761] Handle syncing with selections

---
 .../src/obsidian-file-system.ts               | 53 +++++++++++++------
 1 file changed, 38 insertions(+), 15 deletions(-)

diff --git a/frontend/obsidian-plugin/src/obsidian-file-system.ts b/frontend/obsidian-plugin/src/obsidian-file-system.ts
index c6893719..2cccacd3 100644
--- a/frontend/obsidian-plugin/src/obsidian-file-system.ts
+++ b/frontend/obsidian-plugin/src/obsidian-file-system.ts
@@ -55,20 +55,31 @@ export class ObsidianFileSystemOperations implements FileSystemOperations {
 		const view = this.workspace.getActiveViewOfType(MarkdownView);
 
 		if (view?.file?.path === path) {
-			const cursor = view.editor.getCursor();
 			const text = view.editor.getValue();
-			const result = updater({
-				text,
-				cursors: [
+			const cursors = view.editor
+				.listSelections()
+				.flatMap(({ anchor, head }, i) => [
 					{
-						id: 0,
+						id: 2 * i,
 						characterPosition: lineAndColumnToPosition(
 							text,
-							cursor.line,
-							cursor.ch
+							anchor.line,
+							anchor.ch
+						)
+					},
+					{
+						id: 2 * i + 1,
+						characterPosition: lineAndColumnToPosition(
+							text,
+							head.line,
+							head.ch
 						)
 					}
-				]
+				]);
+
+			const result = updater({
+				text,
+				cursors
 			});
 
 			if (result.text === text) {
@@ -77,13 +88,25 @@ export class ObsidianFileSystemOperations implements FileSystemOperations {
 
 			view.editor.setValue(result.text);
 
-			result.cursors.forEach((movedCursor) => {
-				const { line, column } = positionToLineAndColumn(
-					result.text,
-					movedCursor.characterPosition
-				);
-				view.editor.setCursor(line, column);
-			});
+			const selections = [];
+			for (let i = 0; i < result.cursors.length / 2; i++) {
+				const from = result.cursors[2 * i];
+				const to = result.cursors[2 * i + 1];
+				const { line: fromLine, column: fromColumn } =
+					positionToLineAndColumn(
+						result.text,
+						from.characterPosition
+					);
+
+				const { line: toLine, column: toColumn } =
+					positionToLineAndColumn(result.text, to.characterPosition);
+
+				selections.push({
+					anchor: { line: fromLine, ch: fromColumn },
+					head: { line: toLine, ch: toColumn }
+				});
+			}
+			view.editor.setSelections(selections);
 
 			return result.text;
 		}

From 8b22549f5e6bd7d01b879a6d85a4a5c157a10078 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 11 May 2025 22:24:43 +0100
Subject: [PATCH 469/761] Expose sync status per file

---
 frontend/sync-client/src/index.ts             |  3 ++-
 frontend/sync-client/src/sync-client.ts       | 21 +++++++++++++------
 .../src/types/document-update-status.ts       |  4 ++++
 .../src/types/network-connection-status.ts    |  5 +++++
 4 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 frontend/sync-client/src/types/document-update-status.ts
 create mode 100644 frontend/sync-client/src/types/network-connection-status.ts

diff --git a/frontend/sync-client/src/index.ts b/frontend/sync-client/src/index.ts
index e5760ead..38d11ec7 100644
--- a/frontend/sync-client/src/index.ts
+++ b/frontend/sync-client/src/index.ts
@@ -15,5 +15,6 @@ export type {
 } from "./file-operations/filesystem-operations";
 export type { PersistenceProvider } from "./persistence/persistence";
 
-export type { NetworkConnectionStatus } from "./sync-client";
+export type { NetworkConnectionStatus } from "./types/network-connection-status";
+export { DocumentUpdateStatus } from "./types/document-update-status";
 export { SyncClient } from "./sync-client";
diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts
index ab1cd76c..e64ea6db 100644
--- a/frontend/sync-client/src/sync-client.ts
+++ b/frontend/sync-client/src/sync-client.ts
@@ -16,12 +16,8 @@ import { ConnectionStatus } from "./services/connection-status";
 import { UnrestrictedSyncer } from "./sync-operations/unrestricted-syncer";
 import { rateLimit } from "./utils/rate-limit";
 import { v4 as uuidv4 } from "uuid";
-
-export interface NetworkConnectionStatus {
-	isSuccessful: boolean;
-	serverMessage: string;
-	isWebSocketConnected: boolean;
-}
+import { NetworkConnectionStatus } from "./types/network-connection-status";
+import { DocumentUpdateStatus } from "./types/document-update-status";
 
 export class SyncClient {
 	private static readonly MINIMUM_SAVE_INTERVAL_MS = 1000;
@@ -260,4 +256,17 @@ export class SyncClient {
 			relativePath
 		});
 	}
+
+	public getDocumentSyncingStatus(
+		relativePath: RelativePath
+	): DocumentUpdateStatus {
+		const document =
+			this.database.getLatestDocumentByRelativePath(relativePath);
+		if (document === undefined) {
+			return DocumentUpdateStatus.SYNCING;
+		}
+		return document.updates.length > 0
+			? DocumentUpdateStatus.SYNCING
+			: DocumentUpdateStatus.UP_TO_DATE;
+	}
 }
diff --git a/frontend/sync-client/src/types/document-update-status.ts b/frontend/sync-client/src/types/document-update-status.ts
new file mode 100644
index 00000000..7fa1c888
--- /dev/null
+++ b/frontend/sync-client/src/types/document-update-status.ts
@@ -0,0 +1,4 @@
+export enum DocumentUpdateStatus {
+	UP_TO_DATE = "UP_TO_DATE",
+	SYNCING = "SYNCING"
+}
diff --git a/frontend/sync-client/src/types/network-connection-status.ts b/frontend/sync-client/src/types/network-connection-status.ts
new file mode 100644
index 00000000..fb93f5f5
--- /dev/null
+++ b/frontend/sync-client/src/types/network-connection-status.ts
@@ -0,0 +1,5 @@
+export interface NetworkConnectionStatus {
+	isSuccessful: boolean;
+	serverMessage: string;
+	isWebSocketConnected: boolean;
+}

From de346b9fcf2ee630d174a50b026cb20a37b15da7 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 11 May 2025 22:25:19 +0100
Subject: [PATCH 470/761] Add sync status inside editor

---
 .../obsidian-plugin/src/vault-link-plugin.ts  | 12 ++++
 .../editor-sync-line/editor-sync-line.scss    | 43 +++++++++++++++
 .../editor-sync-line/editor-sync-line.ts      | 55 +++++++++++++++++++
 frontend/sync-client/src/sync-client.ts       |  2 +-
 4 files changed, 111 insertions(+), 1 deletion(-)
 create mode 100644 frontend/obsidian-plugin/src/views/editor-sync-line/editor-sync-line.scss
 create mode 100644 frontend/obsidian-plugin/src/views/editor-sync-line/editor-sync-line.ts

diff --git a/frontend/obsidian-plugin/src/vault-link-plugin.ts b/frontend/obsidian-plugin/src/vault-link-plugin.ts
index 40b9ed57..f675d4dd 100644
--- a/frontend/obsidian-plugin/src/vault-link-plugin.ts
+++ b/frontend/obsidian-plugin/src/vault-link-plugin.ts
@@ -15,8 +15,10 @@ import { SyncClient, rateLimit } from "sync-client";
 import { ObsidianFileSystemOperations } from "./obsidian-file-system";
 import { SyncSettingsTab } from "./views/settings/settings-tab";
 import { registerConsoleForLogging } from "./utils/register-console-for-logging";
+import { updateEditorStatusDisplay } from "./views/editor-sync-line/editor-sync-line";
 
 export default class VaultLinkPlugin extends Plugin {
+	private readonly disposables: (() => void)[] = [];
 	private settingsTab: SyncSettingsTab | undefined;
 	private client!: SyncClient;
 	private readonly rateLimitedUpdatesPerFile = new Map<
@@ -74,11 +76,21 @@ export default class VaultLinkPlugin extends Plugin {
 		this.app.workspace.onLayoutReady(async () => {
 			this.registerEditorEvents();
 			void this.client.start();
+
+			const interval = setInterval(() => {
+				updateEditorStatusDisplay(this.app.workspace, this.client);
+			}, 200);
+			this.disposables.push(() => {
+				clearInterval(interval);
+			});
 		});
 	}
 
 	public onunload(): void {
 		this.client.stop();
+		this.disposables.forEach((disposable) => {
+			disposable();
+		});
 	}
 
 	public openSettings(): void {
diff --git a/frontend/obsidian-plugin/src/views/editor-sync-line/editor-sync-line.scss b/frontend/obsidian-plugin/src/views/editor-sync-line/editor-sync-line.scss
new file mode 100644
index 00000000..a430ac3b
--- /dev/null
+++ b/frontend/obsidian-plugin/src/views/editor-sync-line/editor-sync-line.scss
@@ -0,0 +1,43 @@
+.vault-link-sync-status {
+	position: absolute;
+	right: var(--size-4-4);
+	top: var(--size-4-2);
+	opacity: 0.7;
+	cursor: pointer;
+
+	> span {
+		opacity: 0;
+		position: absolute;
+		min-width: 200px;
+		text-align: right;
+		padding-right: var(--size-2-2);
+
+		top: 50%;
+		left: 0;
+		transform: translateY(-50%) translateX(-100%) translateY(-2px);
+		transition: opacity 200ms;
+	}
+
+	&:hover {
+		> span {
+			opacity: 1;
+		}
+	}
+
+	> .icon {
+		line-height: 0;
+	}
+
+	&.loading > .icon {
+		animation: spin 2s linear infinite;
+
+		@keyframes spin {
+			0% {
+				transform: rotate(0deg);
+			}
+			100% {
+				transform: rotate(360deg);
+			}
+		}
+	}
+}
diff --git a/frontend/obsidian-plugin/src/views/editor-sync-line/editor-sync-line.ts b/frontend/obsidian-plugin/src/views/editor-sync-line/editor-sync-line.ts
new file mode 100644
index 00000000..67750687
--- /dev/null
+++ b/frontend/obsidian-plugin/src/views/editor-sync-line/editor-sync-line.ts
@@ -0,0 +1,55 @@
+import type { Workspace } from "obsidian";
+import { FileView, setIcon } from "obsidian";
+import type { SyncClient } from "sync-client";
+import { DocumentUpdateStatus } from "sync-client";
+import "./editor-sync-line.scss";
+
+export function updateEditorStatusDisplay(
+	workspace: Workspace,
+	client: SyncClient
+): void {
+	workspace.iterateAllLeaves((leaf) => {
+		if (leaf.view instanceof FileView) {
+			const filePath = leaf.view.file?.path;
+			if (filePath == null) {
+				return;
+			}
+			const parent = leaf.view.contentEl.querySelector(".cm-editor");
+			if (parent == null) {
+				return;
+			}
+
+			const element =
+				parent.querySelector(".vault-link-sync-status") ??
+				parent.createDiv(
+					{
+						cls: "vault-link-sync-status"
+					},
+					(el) => {
+						el.createSpan({ text: "VaultLink sync state" });
+						el.createDiv({
+							cls: "icon"
+						});
+					}
+				);
+
+			const isLoading =
+				client.getDocumentSyncingStatus(filePath) ==
+				DocumentUpdateStatus.SYNCING;
+
+			if (isLoading) {
+				element.classList.add("loading");
+			} else {
+				element.classList.remove("loading");
+			}
+
+			const iconContainer = element.querySelector(".icon");
+			if (iconContainer != null) {
+				setIcon(
+					iconContainer as HTMLElement, // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+					isLoading ? "loader" : "circle-check"
+				);
+			}
+		}
+	});
+}
diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts
index e64ea6db..94c446e8 100644
--- a/frontend/sync-client/src/sync-client.ts
+++ b/frontend/sync-client/src/sync-client.ts
@@ -16,7 +16,7 @@ import { ConnectionStatus } from "./services/connection-status";
 import { UnrestrictedSyncer } from "./sync-operations/unrestricted-syncer";
 import { rateLimit } from "./utils/rate-limit";
 import { v4 as uuidv4 } from "uuid";
-import { NetworkConnectionStatus } from "./types/network-connection-status";
+import type { NetworkConnectionStatus } from "./types/network-connection-status";
 import { DocumentUpdateStatus } from "./types/document-update-status";
 
 export class SyncClient {

From 8f97e8e656f9c89e1e6b351af9517edec15eb6a0 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 11 May 2025 22:25:35 +0100
Subject: [PATCH 471/761] Bump versions to 0.3.12

---
 backend/Cargo.lock                     | 6 +++---
 backend/Cargo.toml                     | 2 +-
 backend/sync_lib/pkg/package.json      | 2 +-
 frontend/obsidian-plugin/manifest.json | 2 +-
 frontend/obsidian-plugin/package.json  | 2 +-
 frontend/package-lock.json             | 8 ++++----
 frontend/sync-client/package.json      | 2 +-
 frontend/test-client/package.json      | 2 +-
 manifest.json                          | 2 +-
 9 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index abf2942c..b49aca0a 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1922,7 +1922,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile"
-version = "0.3.11"
+version = "0.3.12"
 dependencies = [
  "insta",
  "pretty_assertions",
@@ -2540,7 +2540,7 @@ dependencies = [
 
 [[package]]
 name = "sync_lib"
-version = "0.3.11"
+version = "0.3.12"
 dependencies = [
  "base64 0.22.1",
  "console_error_panic_hook",
@@ -2553,7 +2553,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.3.11"
+version = "0.3.12"
 dependencies = [
  "aide",
  "aide-axum-typed-multipart",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index be698c8b..69d6914a 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -12,7 +12,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.3.11"
+version = "0.3.12"
 
 [workspace.dependencies]
 serde = { version = "1.0.219", default-features = false, features = ["derive"] }
diff --git a/backend/sync_lib/pkg/package.json b/backend/sync_lib/pkg/package.json
index 3f69de86..7205c295 100644
--- a/backend/sync_lib/pkg/package.json
+++ b/backend/sync_lib/pkg/package.json
@@ -4,7 +4,7 @@
   "collaborators": [
     "Andras Schmelczer <andras@schmelczer.dev>"
   ],
-  "version": "0.3.11",
+  "version": "0.3.12",
   "license": "MIT",
   "repository": {
     "type": "git",
diff --git a/frontend/obsidian-plugin/manifest.json b/frontend/obsidian-plugin/manifest.json
index 171c3b73..6f70280d 100644
--- a/frontend/obsidian-plugin/manifest.json
+++ b/frontend/obsidian-plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.3.11",
+	"version": "0.3.12",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index 7f10138f..941438db 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.3.11",
+	"version": "0.3.12",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index da2e6eb1..d199a1cb 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -21,7 +21,7 @@
 		},
 		"../backend/sync_lib/pkg": {
 			"name": "sync_lib",
-			"version": "0.3.11",
+			"version": "0.3.12",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -7853,7 +7853,7 @@
 		},
 		"obsidian-plugin": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.3.11",
+			"version": "0.3.12",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
@@ -7881,7 +7881,7 @@
 			}
 		},
 		"sync-client": {
-			"version": "0.3.11",
+			"version": "0.3.12",
 			"dependencies": {
 				"byte-base64": "^1.1.0",
 				"openapi-fetch": "0.13.5",
@@ -7905,7 +7905,7 @@
 			}
 		},
 		"test-client": {
-			"version": "0.3.11",
+			"version": "0.3.12",
 			"bin": {
 				"test-client": "dist/cli.js"
 			},
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index ce052e63..cd37bac3 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "sync-client",
-    "version": "0.3.11",
+    "version": "0.3.12",
     "main": "dist/sync-client.node.js",
     "browser": "dist/sync-client.web.js",
     "types": "dist/types/index.d.ts",
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index 2f358a9b..a5abdb7c 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "test-client",
-    "version": "0.3.11",
+    "version": "0.3.12",
     "private": true,
     "bin": {
         "test-client": "./dist/cli.js"
diff --git a/manifest.json b/manifest.json
index 171c3b73..6f70280d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.3.11",
+	"version": "0.3.12",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",

From 45f9f37d0f2ec4fb75a291218b0d986a97cd75f9 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Wed, 14 May 2025 22:14:34 +0100
Subject: [PATCH 472/761] Make startup deletion check more robust

---
 .../src/obsidian-file-system.ts               | 22 ++++++++++++++++++-
 .../sync-client/src/sync-operations/syncer.ts | 14 +++++++++---
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/frontend/obsidian-plugin/src/obsidian-file-system.ts b/frontend/obsidian-plugin/src/obsidian-file-system.ts
index 2cccacd3..1a4d7099 100644
--- a/frontend/obsidian-plugin/src/obsidian-file-system.ts
+++ b/frontend/obsidian-plugin/src/obsidian-file-system.ts
@@ -15,7 +15,27 @@ export class ObsidianFileSystemOperations implements FileSystemOperations {
 	) {}
 
 	public async listAllFiles(): Promise<RelativePath[]> {
-		return this.vault.getFiles().map((file) => file.path);
+		// Let's implement this by hand because vault.adapter.listAllFiles doesn't always return all files.
+		const allFiles = [];
+		const remainingFolders = [this.vault.getRoot().path];
+
+		// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+		while (true) {
+			const folder = remainingFolders.pop();
+			if (folder == undefined) {
+				break;
+			}
+
+			if (folder.includes(".obsidian")) {
+				continue;
+			}
+
+			const files = await this.vault.adapter.list(normalizePath(folder));
+			allFiles.push(...files.files);
+			remainingFolders.push(...files.folders);
+		}
+
+		return allFiles;
 	}
 
 	public async read(path: RelativePath): Promise<Uint8Array> {
diff --git a/frontend/sync-client/src/sync-operations/syncer.ts b/frontend/sync-client/src/sync-operations/syncer.ts
index 5aafb08c..ca608314 100644
--- a/frontend/sync-client/src/sync-operations/syncer.ts
+++ b/frontend/sync-client/src/sync-operations/syncer.ts
@@ -1,6 +1,7 @@
 import type {
 	Database,
 	DocumentId,
+	DocumentRecord,
 	RelativePath
 } from "../persistence/database";
 import type { SyncService } from "../services/sync-service";
@@ -434,9 +435,16 @@ export class Syncer {
 
 		const allLocalFiles = await this.operations.listAllFiles();
 
-		let locallyPossiblyDeletedFiles = [
-			...this.database.resolvedDocuments
-		].filter(({ relativePath }) => !allLocalFiles.includes(relativePath));
+		let locallyPossiblyDeletedFiles: DocumentRecord[] = [];
+
+		for (const document of this.database.resolvedDocuments) {
+			if (
+				!document.isDeleted &&
+				!(await this.operations.exists(document.relativePath))
+			) {
+				locallyPossiblyDeletedFiles.push(document);
+			}
+		}
 
 		const updates = Promise.all(
 			allLocalFiles.map(async (relativePath) => {

From 0093d6132be9082a6eab324432c86bb6c7b1a09e Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Wed, 14 May 2025 22:14:50 +0100
Subject: [PATCH 473/761] Bump versions to 0.3.13

---
 backend/Cargo.lock                     | 6 +++---
 backend/Cargo.toml                     | 2 +-
 backend/sync_lib/pkg/package.json      | 2 +-
 frontend/obsidian-plugin/manifest.json | 2 +-
 frontend/obsidian-plugin/package.json  | 2 +-
 frontend/package-lock.json             | 8 ++++----
 frontend/sync-client/package.json      | 2 +-
 frontend/test-client/package.json      | 2 +-
 manifest.json                          | 2 +-
 9 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index b49aca0a..b5dcbafc 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1922,7 +1922,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile"
-version = "0.3.12"
+version = "0.3.13"
 dependencies = [
  "insta",
  "pretty_assertions",
@@ -2540,7 +2540,7 @@ dependencies = [
 
 [[package]]
 name = "sync_lib"
-version = "0.3.12"
+version = "0.3.13"
 dependencies = [
  "base64 0.22.1",
  "console_error_panic_hook",
@@ -2553,7 +2553,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.3.12"
+version = "0.3.13"
 dependencies = [
  "aide",
  "aide-axum-typed-multipart",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 69d6914a..700f4f1d 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -12,7 +12,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.3.12"
+version = "0.3.13"
 
 [workspace.dependencies]
 serde = { version = "1.0.219", default-features = false, features = ["derive"] }
diff --git a/backend/sync_lib/pkg/package.json b/backend/sync_lib/pkg/package.json
index 7205c295..6f451524 100644
--- a/backend/sync_lib/pkg/package.json
+++ b/backend/sync_lib/pkg/package.json
@@ -4,7 +4,7 @@
   "collaborators": [
     "Andras Schmelczer <andras@schmelczer.dev>"
   ],
-  "version": "0.3.12",
+  "version": "0.3.13",
   "license": "MIT",
   "repository": {
     "type": "git",
diff --git a/frontend/obsidian-plugin/manifest.json b/frontend/obsidian-plugin/manifest.json
index 6f70280d..ca1aad92 100644
--- a/frontend/obsidian-plugin/manifest.json
+++ b/frontend/obsidian-plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.3.12",
+	"version": "0.3.13",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index 941438db..851c25f1 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.3.12",
+	"version": "0.3.13",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index d199a1cb..1f030d69 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -21,7 +21,7 @@
 		},
 		"../backend/sync_lib/pkg": {
 			"name": "sync_lib",
-			"version": "0.3.12",
+			"version": "0.3.13",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -7853,7 +7853,7 @@
 		},
 		"obsidian-plugin": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.3.12",
+			"version": "0.3.13",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
@@ -7881,7 +7881,7 @@
 			}
 		},
 		"sync-client": {
-			"version": "0.3.12",
+			"version": "0.3.13",
 			"dependencies": {
 				"byte-base64": "^1.1.0",
 				"openapi-fetch": "0.13.5",
@@ -7905,7 +7905,7 @@
 			}
 		},
 		"test-client": {
-			"version": "0.3.12",
+			"version": "0.3.13",
 			"bin": {
 				"test-client": "dist/cli.js"
 			},
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index cd37bac3..8236c3ae 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "sync-client",
-    "version": "0.3.12",
+    "version": "0.3.13",
     "main": "dist/sync-client.node.js",
     "browser": "dist/sync-client.web.js",
     "types": "dist/types/index.d.ts",
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index a5abdb7c..bc706b39 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "test-client",
-    "version": "0.3.12",
+    "version": "0.3.13",
     "private": true,
     "bin": {
         "test-client": "./dist/cli.js"
diff --git a/manifest.json b/manifest.json
index 6f70280d..ca1aad92 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.3.12",
+	"version": "0.3.13",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",

From 7776b69a0b6ee7e77c14e311286702cb7f776bac Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Wed, 14 May 2025 22:15:57 +0100
Subject: [PATCH 474/761] Update API types

---
 frontend/sync-client/src/services/types.ts | 40 ++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/frontend/sync-client/src/services/types.ts b/frontend/sync-client/src/services/types.ts
index 6ceadefd..7a13e092 100644
--- a/frontend/sync-client/src/services/types.ts
+++ b/frontend/sync-client/src/services/types.ts
@@ -37,6 +37,10 @@ export interface paths {
 						[name: string]: unknown;
 					};
 					content: {
+						/** @example {
+						 *       "causes": [],
+						 *       "message": "An error has occurred"
+						 *     } */
 						"application/json": components["schemas"]["SerializedError"];
 					};
 				};
@@ -71,6 +75,10 @@ export interface paths {
 						[name: string]: unknown;
 					};
 					content: {
+						/** @example {
+						 *       "causes": [],
+						 *       "message": "An error has occurred"
+						 *     } */
 						"application/json": components["schemas"]["SerializedError"];
 					};
 				};
@@ -119,6 +127,10 @@ export interface paths {
 						[name: string]: unknown;
 					};
 					content: {
+						/** @example {
+						 *       "causes": [],
+						 *       "message": "An error has occurred"
+						 *     } */
 						"application/json": components["schemas"]["SerializedError"];
 					};
 				};
@@ -162,6 +174,10 @@ export interface paths {
 						[name: string]: unknown;
 					};
 					content: {
+						/** @example {
+						 *       "causes": [],
+						 *       "message": "An error has occurred"
+						 *     } */
 						"application/json": components["schemas"]["SerializedError"];
 					};
 				};
@@ -196,6 +212,10 @@ export interface paths {
 						[name: string]: unknown;
 					};
 					content: {
+						/** @example {
+						 *       "causes": [],
+						 *       "message": "An error has occurred"
+						 *     } */
 						"application/json": components["schemas"]["SerializedError"];
 					};
 				};
@@ -231,6 +251,10 @@ export interface paths {
 						[name: string]: unknown;
 					};
 					content: {
+						/** @example {
+						 *       "causes": [],
+						 *       "message": "An error has occurred"
+						 *     } */
 						"application/json": components["schemas"]["SerializedError"];
 					};
 				};
@@ -278,6 +302,10 @@ export interface paths {
 						[name: string]: unknown;
 					};
 					content: {
+						/** @example {
+						 *       "causes": [],
+						 *       "message": "An error has occurred"
+						 *     } */
 						"application/json": components["schemas"]["SerializedError"];
 					};
 				};
@@ -324,6 +352,10 @@ export interface paths {
 						[name: string]: unknown;
 					};
 					content: {
+						/** @example {
+						 *       "causes": [],
+						 *       "message": "An error has occurred"
+						 *     } */
 						"application/json": components["schemas"]["SerializedError"];
 					};
 				};
@@ -371,6 +403,10 @@ export interface paths {
 						[name: string]: unknown;
 					};
 					content: {
+						/** @example {
+						 *       "causes": [],
+						 *       "message": "An error has occurred"
+						 *     } */
 						"application/json": components["schemas"]["SerializedError"];
 					};
 				};
@@ -416,6 +452,10 @@ export interface paths {
 						[name: string]: unknown;
 					};
 					content: {
+						/** @example {
+						 *       "causes": [],
+						 *       "message": "An error has occurred"
+						 *     } */
 						"application/json": components["schemas"]["SerializedError"];
 					};
 				};

From 87ec86a3ad59a0c35ba05ed6e7a58340d556c733 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 May 2025 22:16:18 +0100
Subject: [PATCH 475/761] Bump sqlx from 0.8.3 to 0.8.5 in /backend (#30)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 backend/Cargo.lock             | 30 ++++++++++++++++--------------
 backend/sync_server/Cargo.toml |  2 +-
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index b5dcbafc..e34147c5 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -2295,9 +2295,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx"
-version = "0.8.3"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4410e73b3c0d8442c5f99b425d7a435b5ee0ae4167b3196771dd3f7a01be745f"
+checksum = "f3c3a85280daca669cfd3bcb68a337882a8bc57ec882f72c5d13a430613a738e"
 dependencies = [
  "sqlx-core",
  "sqlx-macros",
@@ -2308,10 +2308,11 @@ dependencies = [
 
 [[package]]
 name = "sqlx-core"
-version = "0.8.3"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a007b6936676aa9ab40207cde35daab0a04b823be8ae004368c0793b96a61e0"
+checksum = "f743f2a3cea30a58cd479013f75550e879009e3a02f616f18ca699335aa248c3"
 dependencies = [
+ "base64 0.22.1",
  "bytes",
  "chrono",
  "crc",
@@ -2343,9 +2344,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx-macros"
-version = "0.8.3"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3112e2ad78643fef903618d78cf0aec1cb3134b019730edb039b69eaf531f310"
+checksum = "7f4200e0fde19834956d4252347c12a083bdcb237d7a1a1446bffd8768417dce"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2356,9 +2357,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx-macros-core"
-version = "0.8.3"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e9f90acc5ab146a99bf5061a7eb4976b573f560bc898ef3bf8435448dd5e7ad"
+checksum = "882ceaa29cade31beca7129b6beeb05737f44f82dbe2a9806ecea5a7093d00b7"
 dependencies = [
  "dotenvy",
  "either",
@@ -2382,9 +2383,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx-mysql"
-version = "0.8.3"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4560278f0e00ce64938540546f59f590d60beee33fffbd3b9cd47851e5fff233"
+checksum = "0afdd3aa7a629683c2d750c2df343025545087081ab5942593a5288855b1b7a7"
 dependencies = [
  "atoi",
  "base64 0.22.1",
@@ -2426,9 +2427,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx-postgres"
-version = "0.8.3"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5b98a57f363ed6764d5b3a12bfedf62f07aa16e1856a7ddc2a0bb190a959613"
+checksum = "a0bedbe1bbb5e2615ef347a5e9d8cd7680fb63e77d9dafc0f29be15e53f1ebe6"
 dependencies = [
  "atoi",
  "base64 0.22.1",
@@ -2465,9 +2466,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx-sqlite"
-version = "0.8.3"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f85ca71d3a5b24e64e1d08dd8fe36c6c95c339a896cc33068148906784620540"
+checksum = "c26083e9a520e8eb87a06b12347679b142dc2ea29e6e409f805644a7a979a5bc"
 dependencies = [
  "atoi",
  "chrono",
@@ -2483,6 +2484,7 @@ dependencies = [
  "serde",
  "serde_urlencoded",
  "sqlx-core",
+ "thiserror 2.0.12",
  "tracing",
  "url",
  "uuid",
diff --git a/backend/sync_server/Cargo.toml b/backend/sync_server/Cargo.toml
index 1d28b854..ab8e890e 100644
--- a/backend/sync_server/Cargo.toml
+++ b/backend/sync_server/Cargo.toml
@@ -23,7 +23,7 @@ axum_typed_multipart = "0.11.0"
 tower-http = { version = "0.6.1", features = ["cors", "trace", "limit", "timeout"] }
 tracing-subscriber = { version = "0.3.19", features = ["fmt", "env-filter"]}
 serde_yaml = "0.9.34"
-sqlx = { version = "0.8.3", features = ["sqlite", "runtime-tokio", "uuid", "chrono"] }
+sqlx = { version = "0.8.5", features = ["sqlite", "runtime-tokio", "uuid", "chrono"] }
 chrono = { version = "0.4.40", features = ["serde"] }
 aide = { version = "0.13.5", features = ["axum", "axum-ws", "scalar", "axum-headers"] }
 schemars = { version = "0.8.22", features = ["chrono", "uuid1", "bytes"] }

From 519be6e46da5f08311860e306cabfa867bbd396d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 May 2025 19:50:44 +0100
Subject: [PATCH 476/761] Bump rust from 1.86 to 1.87 in /backend (#37)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 backend/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/Dockerfile b/backend/Dockerfile
index 0d35c82a..4f3021eb 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.86 AS builder
+FROM rust:1.87 AS builder
 
 WORKDIR /usr/src/backend
 

From 4001150414364c12e7e7b3cc8a6fd4513b17cf83 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 May 2025 19:50:52 +0100
Subject: [PATCH 477/761] Bump clap from 4.5.37 to 4.5.38 in /backend (#36)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 backend/Cargo.lock             | 8 ++++----
 backend/sync_server/Cargo.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index e34147c5..7e130244 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -451,9 +451,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.37"
+version = "4.5.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eccb054f56cbd38340b380d4a8e69ef1f02f1af43db2f0cc817a4774d80ae071"
+checksum = "ed93b9805f8ba930df42c2590f05453d5ec36cbb85d018868a5b24d31f6ac000"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -471,9 +471,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.37"
+version = "4.5.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efd9466fac8543255d3b1fcad4762c5e116ffe808c8a3043d4263cd4fd4862a2"
+checksum = "379026ff283facf611b0ea629334361c4211d1b12ee01024eec1591133b04120"
 dependencies = [
  "anstream",
  "anstyle",
diff --git a/backend/sync_server/Cargo.toml b/backend/sync_server/Cargo.toml
index ab8e890e..f0a54c0b 100644
--- a/backend/sync_server/Cargo.toml
+++ b/backend/sync_server/Cargo.toml
@@ -32,7 +32,7 @@ rand = "0.9.0"
 sanitize-filename = "0.6.0"
 axum-jsonschema = { version = "0.8.0", features = ["aide"] }
 regex = "1.11.1"
-clap = { version = "4.5.37", features = ["derive"] }
+clap = { version = "4.5.38", features = ["derive"] }
 futures = "0.3.31"
 serde_json = "1.0.140"
 clap-verbosity-flag = "3.0.2"

From ec610c77fbbec9c826a677c609f170812a42d82f Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Tue, 20 May 2025 20:08:02 +0100
Subject: [PATCH 478/761] Randomise slow file event length

---
 frontend/test-client/src/agent/mock-client.ts | 14 +++++++-------
 frontend/test-client/src/cli.ts               |  1 +
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/frontend/test-client/src/agent/mock-client.ts b/frontend/test-client/src/agent/mock-client.ts
index 766e7981..ae465473 100644
--- a/frontend/test-client/src/agent/mock-client.ts
+++ b/frontend/test-client/src/agent/mock-client.ts
@@ -78,7 +78,7 @@ export class MockClient implements FileSystemOperations {
 		);
 		this.localFiles.set(path, newContent);
 
-		this.runCallback(() => {
+		this.executeFileOperation(() => {
 			void this.client.syncLocallyCreatedFile(path);
 		});
 	}
@@ -120,7 +120,7 @@ export class MockClient implements FileSystemOperations {
 			`Updated file ${path} with:\n  current content: ${currentContent}\n  new content: ${newContent}`
 		);
 
-		this.runCallback(() => {
+		this.executeFileOperation(() => {
 			void this.client.syncLocallyUpdatedFile({
 				relativePath: path
 			});
@@ -137,7 +137,7 @@ export class MockClient implements FileSystemOperations {
 			`Updated file ${path} with:\n  new content: ${new TextDecoder().decode(content)}`
 		);
 
-		this.runCallback(() => {
+		this.executeFileOperation(() => {
 			if (hasExisted) {
 				void this.client.syncLocallyUpdatedFile({
 					relativePath: path
@@ -154,7 +154,7 @@ export class MockClient implements FileSystemOperations {
 		);
 		this.localFiles.delete(path);
 
-		this.runCallback(() => {
+		this.executeFileOperation(() => {
 			void this.client.syncLocallyDeletedFile(path);
 		});
 	}
@@ -176,7 +176,7 @@ export class MockClient implements FileSystemOperations {
 			`Renamed file: ${oldPath} -> ${newPath} with:\n  content ${new TextDecoder().decode(file)}`
 		);
 
-		this.runCallback(() => {
+		this.executeFileOperation(() => {
 			void this.client.syncLocallyUpdatedFile({
 				oldPath,
 				relativePath: newPath
@@ -184,10 +184,10 @@ export class MockClient implements FileSystemOperations {
 		});
 	}
 
-	private runCallback(callback: () => void): void {
+	private executeFileOperation(callback: () => void): void {
 		if (this.useSlowFileEvents) {
 			// we aren't the best client and it takes some time to notice changes
-			setTimeout(callback, 100);
+			setTimeout(callback, Math.random() * 100);
 		} else {
 			callback();
 		}
diff --git a/frontend/test-client/src/cli.ts b/frontend/test-client/src/cli.ts
index ce941b00..6e5ede93 100644
--- a/frontend/test-client/src/cli.ts
+++ b/frontend/test-client/src/cli.ts
@@ -4,6 +4,7 @@ import { sleep } from "./utils/sleep";
 import { v4 as uuidv4 } from "uuid";
 import { randomCasing } from "./utils/random-casing";
 
+// Simulate async file access by injecting waiting time before returning from file operations.
 let slowFileEvents = false;
 
 async function runTest({

From bfb522b2c728b1f363af1181b4a71c606f89a71c Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 22 May 2025 20:25:21 +0100
Subject: [PATCH 479/761] Update dependabot

---
 .github/dependabot.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 2ced6ee6..e5319cf3 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -7,17 +7,19 @@ version: 2
 updates:
   - package-ecosystem: "npm"
     directories: ["**"]
+    directory: "/frontend"
     schedule:
       interval: "daily"
-    versioning-strategy: increase
 
   - package-ecosystem: "docker"
     directories: ["**"]
+    directory: "/backend"
     schedule:
       interval: "daily"
 
   - package-ecosystem: "cargo"
     directories: ["**"]
+    directory: "/backend"
     schedule:
       interval: "daily"
 

From 715bbc4d2eea3297691ff7f3975915470ea856fb Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 22 May 2025 21:05:26 +0100
Subject: [PATCH 480/761] Add user and device provenance colums

---
 backend/sync_server/src/app_state/database.rs | 30 ++++++++++++++-----
 .../20250522192949_add_provenance_columns.sql |  2 ++
 .../src/app_state/database/models.rs          | 11 +++++++
 .../sync_server/src/server/create_document.rs | 20 ++++++++++++-
 .../sync_server/src/server/delete_document.rs | 11 ++++++-
 .../sync_server/src/server/update_document.rs | 19 +++++++++++-
 6 files changed, 82 insertions(+), 11 deletions(-)
 create mode 100644 backend/sync_server/src/app_state/database/migrations/20250522192949_add_provenance_columns.sql

diff --git a/backend/sync_server/src/app_state/database.rs b/backend/sync_server/src/app_state/database.rs
index 570355cd..1e26e142 100644
--- a/backend/sync_server/src/app_state/database.rs
+++ b/backend/sync_server/src/app_state/database.rs
@@ -143,7 +143,9 @@ impl Database {
                 document_id as "document_id: Hyphenated",
                 relative_path,
                 updated_date as "updated_date: chrono::DateTime<Utc>",
-                is_deleted
+                is_deleted,
+                user_id,
+                device_id
             from latest_document_versions
             order by vault_update_id
             "#,
@@ -175,7 +177,9 @@ impl Database {
                 document_id as "document_id: Hyphenated",
                 relative_path,
                 updated_date as "updated_date: chrono::DateTime<Utc>",
-                is_deleted
+                is_deleted,
+                user_id,
+                device_id
             from latest_document_versions
             where vault_update_id > ?
             order by vault_update_id
@@ -233,7 +237,9 @@ impl Database {
                 relative_path,
                 updated_date as "updated_date: chrono::DateTime<Utc>",
                 content,
-                is_deleted
+                is_deleted,
+                user_id,
+                device_id
             from latest_document_versions
             where relative_path = ?
             order by vault_update_id desc  -- `latest_document_versions` only contains a single latest version of each document, however,
@@ -270,7 +276,9 @@ impl Database {
                 relative_path,
                 updated_date as "updated_date: chrono::DateTime<Utc>",
                 content,
-                is_deleted
+                is_deleted,
+                user_id,
+                device_id
             from latest_document_versions
             where document_id = ?
             "#,
@@ -302,7 +310,9 @@ impl Database {
                 relative_path,
                 updated_date as "updated_date: chrono::DateTime<Utc>",
                 content,
-                is_deleted
+                is_deleted,
+                user_id,
+                device_id
             from documents
             where vault_update_id = ?"#,
             vault_update_id
@@ -333,16 +343,20 @@ impl Database {
                 relative_path,
                 updated_date,
                 content,
-                is_deleted
+                is_deleted,
+                user_id,
+                device_id
             )
-            values (?, ?, ?, ?, ?, ?)
+            values (?, ?, ?, ?, ?, ?, ?, ?)
             "#,
             version.vault_update_id,
             document_id,
             version.relative_path,
             version.updated_date,
             version.content,
-            version.is_deleted
+            version.is_deleted,
+            version.user_id,
+            version.device_id
         );
 
         if let Some(transaction) = transaction {
diff --git a/backend/sync_server/src/app_state/database/migrations/20250522192949_add_provenance_columns.sql b/backend/sync_server/src/app_state/database/migrations/20250522192949_add_provenance_columns.sql
new file mode 100644
index 00000000..06860174
--- /dev/null
+++ b/backend/sync_server/src/app_state/database/migrations/20250522192949_add_provenance_columns.sql
@@ -0,0 +1,2 @@
+ALTER TABLE documents ADD COLUMN user_id TEXT NOT NULL DEFAULT "";
+ALTER TABLE documents ADD COLUMN device_id TEXT NOT NULL DEFAULT "";
diff --git a/backend/sync_server/src/app_state/database/models.rs b/backend/sync_server/src/app_state/database/models.rs
index 55079c81..9f896ac5 100644
--- a/backend/sync_server/src/app_state/database/models.rs
+++ b/backend/sync_server/src/app_state/database/models.rs
@@ -6,6 +6,7 @@ use sync_lib::bytes_to_base64;
 pub type VaultId = String;
 pub type VaultUpdateId = i64;
 pub type DocumentId = uuid::Uuid;
+pub type UserId = String;
 pub type DeviceId = String;
 
 #[derive(Debug, Clone)]
@@ -16,6 +17,8 @@ pub struct StoredDocumentVersion {
     pub updated_date: DateTime<Utc>,
     pub content: Vec<u8>,
     pub is_deleted: bool,
+    pub user_id: UserId,
+    pub device_id: DeviceId,
 }
 
 impl PartialEq<Self> for StoredDocumentVersion {
@@ -30,6 +33,8 @@ pub struct DocumentVersionWithoutContent {
     pub relative_path: String,
     pub updated_date: DateTime<Utc>,
     pub is_deleted: bool,
+    pub user_id: UserId,
+    pub device_id: DeviceId,
 }
 
 impl From<StoredDocumentVersion> for DocumentVersionWithoutContent {
@@ -40,6 +45,8 @@ impl From<StoredDocumentVersion> for DocumentVersionWithoutContent {
             relative_path: value.relative_path,
             updated_date: value.updated_date,
             is_deleted: value.is_deleted,
+            user_id: value.user_id,
+            device_id: value.device_id,
         }
     }
 }
@@ -53,6 +60,8 @@ pub struct DocumentVersion {
     pub updated_date: DateTime<Utc>,
     pub content_base64: String,
     pub is_deleted: bool,
+    pub user_id: UserId,
+    pub device_id: DeviceId,
 }
 
 impl From<StoredDocumentVersion> for DocumentVersion {
@@ -64,6 +73,8 @@ impl From<StoredDocumentVersion> for DocumentVersion {
             updated_date: value.updated_date,
             content_base64: bytes_to_base64(&value.content),
             is_deleted: value.is_deleted,
+            user_id: value.user_id,
+            device_id: value.device_id,
         }
     }
 }
diff --git a/backend/sync_server/src/server/create_document.rs b/backend/sync_server/src/server/create_document.rs
index ebbcac26..0fc9dc3f 100644
--- a/backend/sync_server/src/server/create_document.rs
+++ b/backend/sync_server/src/server/create_document.rs
@@ -1,6 +1,10 @@
 use aide_axum_typed_multipart::TypedMultipart;
 use anyhow::Context as _;
-use axum::extract::{Path, State};
+use axum::{
+    Extension,
+    extract::{Path, State},
+};
+use axum_extra::{TypedHeader, headers::UserAgent};
 use axum_jsonschema::Json;
 use schemars::JsonSchema;
 use serde::Deserialize;
@@ -15,6 +19,7 @@ use crate::{
             DeviceId, DocumentId, DocumentVersionWithoutContent, StoredDocumentVersion, VaultId,
         },
     },
+    config::user_config::User,
     errors::{SyncServerError, client_error, server_error},
     utils::{normalize::normalize, sanitize_path::sanitize_path},
 };
@@ -32,12 +37,16 @@ pub struct CreateDocumentPathParams {
 #[axum::debug_handler]
 pub async fn create_document_multipart(
     Path(CreateDocumentPathParams { vault_id }): Path<CreateDocumentPathParams>,
+    Extension(user): Extension<User>,
+    TypedHeader(user_agent): TypedHeader<UserAgent>,
     State(state): State<AppState>,
     TypedMultipart(axum_typed_multipart::TypedMultipart(request)): TypedMultipart<
         CreateDocumentVersionMultipart,
     >,
 ) -> Result<Json<DocumentVersionWithoutContent>, SyncServerError> {
     internal_create_document(
+        user,
+        user_agent,
         state,
         vault_id,
         request.document_id,
@@ -54,6 +63,8 @@ pub async fn create_document_multipart(
 #[axum::debug_handler]
 pub async fn create_document_json(
     Path(CreateDocumentPathParams { vault_id }): Path<CreateDocumentPathParams>,
+    Extension(user): Extension<User>,
+    TypedHeader(user_agent): TypedHeader<UserAgent>,
     State(state): State<AppState>,
     Json(request): Json<CreateDocumentVersion>,
 ) -> Result<Json<DocumentVersionWithoutContent>, SyncServerError> {
@@ -62,6 +73,8 @@ pub async fn create_document_json(
         .map_err(client_error)?;
 
     internal_create_document(
+        user,
+        user_agent,
         state,
         vault_id,
         request.document_id,
@@ -72,7 +85,10 @@ pub async fn create_document_json(
     .await
 }
 
+#[allow(clippy::too_many_arguments)]
 async fn internal_create_document(
+    user: User,
+    user_agent: UserAgent,
     state: AppState,
     vault_id: VaultId,
     document_id: Option<DocumentId>,
@@ -120,6 +136,8 @@ async fn internal_create_document(
         content,
         updated_date: chrono::Utc::now(),
         is_deleted: false,
+        user_id: user.name,
+        device_id: user_agent.to_string(),
     };
 
     state
diff --git a/backend/sync_server/src/server/delete_document.rs b/backend/sync_server/src/server/delete_document.rs
index 3329e7fb..9735e803 100644
--- a/backend/sync_server/src/server/delete_document.rs
+++ b/backend/sync_server/src/server/delete_document.rs
@@ -1,5 +1,9 @@
 use anyhow::Context as _;
-use axum::extract::{Path, State};
+use axum::{
+    Extension,
+    extract::{Path, State},
+};
+use axum_extra::{TypedHeader, headers::UserAgent};
 use axum_jsonschema::Json;
 use schemars::JsonSchema;
 use serde::Deserialize;
@@ -13,6 +17,7 @@ use crate::{
             DocumentId, DocumentVersionWithoutContent, StoredDocumentVersion, VaultId,
         },
     },
+    config::user_config::User,
     errors::{SyncServerError, server_error},
     utils::{normalize::normalize, sanitize_path::sanitize_path},
 };
@@ -32,6 +37,8 @@ pub async fn delete_document(
         vault_id,
         document_id,
     }): Path<DeleteDocumentPathParams>,
+    Extension(user): Extension<User>,
+    TypedHeader(user_agent): TypedHeader<UserAgent>,
     State(state): State<AppState>,
     Json(request): Json<DeleteDocumentVersion>,
 ) -> Result<Json<DocumentVersionWithoutContent>, SyncServerError> {
@@ -54,6 +61,8 @@ pub async fn delete_document(
         content: vec![],
         updated_date: chrono::Utc::now(),
         is_deleted: true,
+        user_id: user.name,
+        device_id: user_agent.to_string(),
     };
 
     state
diff --git a/backend/sync_server/src/server/update_document.rs b/backend/sync_server/src/server/update_document.rs
index 60a4cab8..ded4dd03 100644
--- a/backend/sync_server/src/server/update_document.rs
+++ b/backend/sync_server/src/server/update_document.rs
@@ -1,6 +1,10 @@
 use aide_axum_typed_multipart::TypedMultipart;
 use anyhow::{Context as _, anyhow};
-use axum::extract::{Path, State};
+use axum::{
+    Extension,
+    extract::{Path, State},
+};
+use axum_extra::{TypedHeader, headers::UserAgent};
 use axum_jsonschema::Json;
 use log::info;
 use schemars::JsonSchema;
@@ -17,6 +21,7 @@ use crate::{
         broadcasts::VaultUpdate,
         database::models::{DeviceId, DocumentId, StoredDocumentVersion, VaultId, VaultUpdateId},
     },
+    config::user_config::User,
     errors::{SyncServerError, client_error, not_found_error, server_error},
     utils::{dedup_paths::dedup_paths, normalize::normalize, sanitize_path::sanitize_path},
 };
@@ -36,12 +41,16 @@ pub async fn update_document_multipart(
         vault_id,
         document_id,
     }): Path<UpdateDocumentPathParams>,
+    Extension(user): Extension<User>,
+    TypedHeader(user_agent): TypedHeader<UserAgent>,
     State(state): State<AppState>,
     TypedMultipart(axum_typed_multipart::TypedMultipart(request)): TypedMultipart<
         UpdateDocumentVersionMultipart,
     >,
 ) -> Result<Json<DocumentUpdateResponse>, SyncServerError> {
     internal_update_document(
+        user,
+        user_agent,
         state,
         vault_id,
         document_id,
@@ -59,6 +68,8 @@ pub async fn update_document_json(
         vault_id,
         document_id,
     }): Path<UpdateDocumentPathParams>,
+    Extension(user): Extension<User>,
+    TypedHeader(user_agent): TypedHeader<UserAgent>,
     State(state): State<AppState>,
     Json(request): Json<UpdateDocumentVersion>,
 ) -> Result<Json<DocumentUpdateResponse>, SyncServerError> {
@@ -67,6 +78,8 @@ pub async fn update_document_json(
         .map_err(client_error)?;
 
     internal_update_document(
+        user,
+        user_agent,
         state,
         vault_id,
         document_id,
@@ -80,6 +93,8 @@ pub async fn update_document_json(
 
 #[allow(clippy::too_many_arguments, clippy::too_many_lines)]
 async fn internal_update_document(
+    user: User,
+    user_agent: UserAgent,
     state: AppState,
     vault_id: VaultId,
     document_id: DocumentId,
@@ -198,6 +213,8 @@ async fn internal_update_document(
         content: merged_content,
         updated_date: chrono::Utc::now(),
         is_deleted: false,
+        user_id: user.name,
+        device_id: user_agent.to_string(),
     };
 
     state

From 961032b24febb9c67aafa2d827b226b403d09b05 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 22 May 2025 21:08:18 +0100
Subject: [PATCH 481/761] Keep content on delete

---
 .../sync_server/src/server/delete_document.rs | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/backend/sync_server/src/server/delete_document.rs b/backend/sync_server/src/server/delete_document.rs
index 9735e803..e6855d6b 100644
--- a/backend/sync_server/src/server/delete_document.rs
+++ b/backend/sync_server/src/server/delete_document.rs
@@ -1,4 +1,4 @@
-use anyhow::Context as _;
+use anyhow::{Context as _, anyhow};
 use axum::{
     Extension,
     extract::{Path, State},
@@ -18,7 +18,7 @@ use crate::{
         },
     },
     config::user_config::User,
-    errors::{SyncServerError, server_error},
+    errors::{SyncServerError, not_found_error, server_error},
     utils::{normalize::normalize, sanitize_path::sanitize_path},
 };
 
@@ -54,11 +54,25 @@ pub async fn delete_document(
         .await
         .map_err(server_error)?;
 
+    let latest_version = state
+        .database
+        .get_latest_document(&vault_id, &document_id, Some(&mut transaction))
+        .await
+        .map_err(server_error)?
+        .map_or_else(
+            || {
+                Err(not_found_error(anyhow!(
+                    "Document with id `{document_id}` not found",
+                )))
+            },
+            Ok,
+        )?;
+
     let new_version = StoredDocumentVersion {
         vault_update_id: last_update_id + 1,
         document_id,
         relative_path: sanitize_path(&request.relative_path),
-        content: vec![],
+        content: latest_version.content, // copy the content from the latest version
         updated_date: chrono::Utc::now(),
         is_deleted: true,
         user_id: user.name,

From 8eba310e8b89e27cb34a2b3c58236da81a473ac5 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 22 May 2025 21:10:03 +0100
Subject: [PATCH 482/761] Fix dependabot config

---
 .github/dependabot.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index e5319cf3..b445fda5 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -6,20 +6,17 @@
 version: 2
 updates:
   - package-ecosystem: "npm"
-    directories: ["**"]
-    directory: "/frontend"
+    directories: ["/frontend"]
     schedule:
       interval: "daily"
 
   - package-ecosystem: "docker"
     directories: ["**"]
-    directory: "/backend"
     schedule:
       interval: "daily"
 
   - package-ecosystem: "cargo"
     directories: ["**"]
-    directory: "/backend"
     schedule:
       interval: "daily"
 

From 1ab93167de19033976f05b2710a3cbb8f34d3dd2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 May 2025 21:31:49 +0100
Subject: [PATCH 483/761] Bump anyhow from 1.0.97 to 1.0.98 in /backend (#38)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 backend/Cargo.lock             | 4 ++--
 backend/sync_server/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 7e130244..a4d9c3e4 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -148,9 +148,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.97"
+version = "1.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f"
+checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
 dependencies = [
  "backtrace",
 ]
diff --git a/backend/sync_server/Cargo.toml b/backend/sync_server/Cargo.toml
index f0a54c0b..37d0f2e0 100644
--- a/backend/sync_server/Cargo.toml
+++ b/backend/sync_server/Cargo.toml
@@ -15,7 +15,7 @@ thiserror = { workspace = true }
 tokio = { version = "1.44.2", features = ["full"]}
 uuid = { version = "1.16.0", features = ["v4", "serde"] }
 log = { version = "0.4.27" }
-anyhow =  { version = "1.0.97", features = ["backtrace"] }
+anyhow =  { version = "1.0.98", features = ["backtrace"] }
 axum = { version = "0.7.4", features = ["ws", "macros", "tracing", "multipart"]}
 axum-extra = { version = "0.9.6", features = ["typed-header"] }
 aide-axum-typed-multipart = "0.13.0"

From 2e2da3a46de19754e8ebf38178e136c989e3a6b8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 May 2025 21:32:03 +0100
Subject: [PATCH 484/761] Bump chrono from 0.4.40 to 0.4.41 in /backend (#34)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 backend/Cargo.lock             | 4 ++--
 backend/sync_server/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index a4d9c3e4..74b47e36 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -436,9 +436,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chrono"
-version = "0.4.40"
+version = "0.4.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c"
+checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
diff --git a/backend/sync_server/Cargo.toml b/backend/sync_server/Cargo.toml
index 37d0f2e0..40011c38 100644
--- a/backend/sync_server/Cargo.toml
+++ b/backend/sync_server/Cargo.toml
@@ -24,7 +24,7 @@ tower-http = { version = "0.6.1", features = ["cors", "trace", "limit", "timeout
 tracing-subscriber = { version = "0.3.19", features = ["fmt", "env-filter"]}
 serde_yaml = "0.9.34"
 sqlx = { version = "0.8.5", features = ["sqlite", "runtime-tokio", "uuid", "chrono"] }
-chrono = { version = "0.4.40", features = ["serde"] }
+chrono = { version = "0.4.41", features = ["serde"] }
 aide = { version = "0.13.5", features = ["axum", "axum-ws", "scalar", "axum-headers"] }
 schemars = { version = "0.8.22", features = ["chrono", "uuid1", "bytes"] }
 tracing = "0.1.41"

From 6292b014647bb2505a8fd1e00acaa691be84e28b Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 22 May 2025 21:39:54 +0100
Subject: [PATCH 485/761] Hide sqlx folder

---
 .vscode/settings.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 78bb1516..ce20ced2 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -3,6 +3,7 @@
     "jest.rootPath": "plugin",
     "files.exclude": {
         "**/dist": true,
-        "**/node_modules": true
+        "**/node_modules": true,
+        "**/.sqlx": true,
     }
-}
\ No newline at end of file
+}

From bbb2adce63d03defc23282a01a592fbd4685974c Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 22 May 2025 21:40:40 +0100
Subject: [PATCH 486/761] Update REAMDE

---
 README.md                     | 10 +++++++---
 backend/sync_server/README.md |  9 +++++++--
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 9aa988bb..4735cf5f 100644
--- a/README.md
+++ b/README.md
@@ -35,11 +35,11 @@ flatpak run md.obsidian.Obsidian
 
 #### Update HTTP API TS bindings
 
-```sh 
+```sh
 scripts/update-api-types.sh
 ```
 
-#### Publish new version 
+#### Publish new version
 
 ```sh
 scripts/bump-version.sh patch
@@ -48,8 +48,12 @@ scripts/bump-version.sh patch
 
 #### Run E2E tests
 
-```sh 
+```sh
 scripts/e2e.sh
 ```
 
 And to clean up the logs & database files, run `scripts/clean-up.sh`
+
+## Projects
+
+- [Sync server](./backend/sync_server/README.md)
diff --git a/backend/sync_server/README.md b/backend/sync_server/README.md
index 569dc0b2..7d61209a 100644
--- a/backend/sync_server/README.md
+++ b/backend/sync_server/README.md
@@ -1,4 +1,9 @@
+# Sync server
 
-cargo install sqlx-cli
-rm db.sqlite3; sqlx database create --database-url sqlite://db.sqlite3
+## Creating/resetting the Database for development
+
+```sh
+sqlx database create --database-url sqlite://db.sqlite3
 sqlx migrate run --source sync_server/src/app_state/database/migrations --database-url sqlite://db.sqlite3
+cargo sqlx prepare --workspace
+```

From ceb217cda87169e5bd3907187e274f7ac5333e9f Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 22 May 2025 21:41:59 +0100
Subject: [PATCH 487/761] Add simple glob ignore patterns

---
 .../obsidian-plugin/src/vault-link-plugin.ts  |  4 +-
 .../src/views/settings/settings-tab.ts        | 23 +++++++++++
 frontend/package-lock.json                    | 25 ++++++++++++
 frontend/sync-client/package.json             |  1 +
 frontend/sync-client/src/index.ts             |  2 +-
 .../sync-client/src/persistence/settings.ts   |  6 ++-
 .../sync-operations/unrestricted-syncer.ts    | 39 +++++++++++++++++--
 .../sync-client/src/tracing/sync-history.ts   |  3 +-
 8 files changed, 95 insertions(+), 8 deletions(-)

diff --git a/frontend/obsidian-plugin/src/vault-link-plugin.ts b/frontend/obsidian-plugin/src/vault-link-plugin.ts
index f675d4dd..68be059f 100644
--- a/frontend/obsidian-plugin/src/vault-link-plugin.ts
+++ b/frontend/obsidian-plugin/src/vault-link-plugin.ts
@@ -11,7 +11,7 @@ import { HistoryView } from "./views/history/history-view";
 import { StatusBar } from "./views/status-bar/status-bar";
 import { LogsView } from "./views/logs/logs-view";
 import { StatusDescription } from "./views/status-description/status-description";
-import { SyncClient, rateLimit } from "sync-client";
+import { SyncClient, rateLimit, DEFAULT_SETTINGS } from "sync-client";
 import { ObsidianFileSystemOperations } from "./obsidian-file-system";
 import { SyncSettingsTab } from "./views/settings/settings-tab";
 import { registerConsoleForLogging } from "./utils/register-console-for-logging";
@@ -27,6 +27,8 @@ export default class VaultLinkPlugin extends Plugin {
 	>();
 
 	public async onload(): Promise<void> {
+		DEFAULT_SETTINGS.ignorePatterns.push(".obsidian", ".git");
+
 		this.client = await SyncClient.create({
 			fs: new ObsidianFileSystemOperations(
 				this.app.vault,
diff --git a/frontend/obsidian-plugin/src/views/settings/settings-tab.ts b/frontend/obsidian-plugin/src/views/settings/settings-tab.ts
index c5f0c214..31e9182b 100644
--- a/frontend/obsidian-plugin/src/views/settings/settings-tab.ts
+++ b/frontend/obsidian-plugin/src/views/settings/settings-tab.ts
@@ -253,6 +253,29 @@ export class SyncSettingsTab extends PluginSettingTab {
 					)
 			);
 
+		new Setting(containerEl)
+			.setName("Ignore patterns")
+			.setDesc(
+				"Patterns to ignore when syncing. Each line is a separate glob pattern. Patterns are matched against the relative path of the file. For example, to ignore all files in a folder named 'ignore', enter 'ignore/*'. To ignore all files with the extension '.log', enter '*.log'."
+			)
+			.addTextArea((text) =>
+				text
+					.setValue(
+						this.syncClient.getSettings().ignorePatterns.join("\n")
+					)
+					.setPlaceholder("Enter patterns to ignore, one per line")
+					.onChange(async (value) => {
+						const patterns = value
+							.split("\n")
+							.map((pattern) => pattern.trim())
+							.filter((pattern) => pattern.length > 0);
+						return this.syncClient.setSetting(
+							"ignorePatterns",
+							patterns
+						);
+					})
+			);
+
 		new Setting(containerEl)
 			.setName("Sync concurrency")
 			.setDesc(
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 1f030d69..045c5e9f 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -7884,6 +7884,7 @@
 			"version": "0.3.13",
 			"dependencies": {
 				"byte-base64": "^1.1.0",
+				"minimatch": "^10.0.1",
 				"openapi-fetch": "0.13.5",
 				"openapi-typescript": "7.6.1",
 				"p-queue": "^8.1.0",
@@ -7904,6 +7905,30 @@
 				"ws": "^8.18.1"
 			}
 		},
+		"sync-client/node_modules/brace-expansion": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+			"integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+			"license": "MIT",
+			"dependencies": {
+				"balanced-match": "^1.0.0"
+			}
+		},
+		"sync-client/node_modules/minimatch": {
+			"version": "10.0.1",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.1.tgz",
+			"integrity": "sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==",
+			"license": "ISC",
+			"dependencies": {
+				"brace-expansion": "^2.0.1"
+			},
+			"engines": {
+				"node": "20 || >=22"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
 		"test-client": {
 			"version": "0.3.13",
 			"bin": {
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index 8236c3ae..c38fcd01 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -14,6 +14,7 @@
     },
     "dependencies": {
         "byte-base64": "^1.1.0",
+        "minimatch": "^10.0.1",
         "openapi-fetch": "0.13.5",
         "openapi-typescript": "7.6.1",
         "p-queue": "^8.1.0",
diff --git a/frontend/sync-client/src/index.ts b/frontend/sync-client/src/index.ts
index 38d11ec7..324312b5 100644
--- a/frontend/sync-client/src/index.ts
+++ b/frontend/sync-client/src/index.ts
@@ -5,7 +5,7 @@ export {
 	type HistoryEntry
 } from "./tracing/sync-history";
 export { Logger, LogLevel, LogLine } from "./tracing/logger";
-export { type SyncSettings } from "./persistence/settings";
+export { type SyncSettings, DEFAULT_SETTINGS } from "./persistence/settings";
 export { rateLimit } from "./utils/rate-limit";
 export type { RelativePath, StoredDatabase } from "./persistence/database";
 export type {
diff --git a/frontend/sync-client/src/persistence/settings.ts b/frontend/sync-client/src/persistence/settings.ts
index aecfafc9..a62e4f0c 100644
--- a/frontend/sync-client/src/persistence/settings.ts
+++ b/frontend/sync-client/src/persistence/settings.ts
@@ -7,15 +7,17 @@ export interface SyncSettings {
 	syncConcurrency: number;
 	isSyncEnabled: boolean;
 	maxFileSizeMB: number;
+	ignorePatterns: string[];
 }
 
-const DEFAULT_SETTINGS: SyncSettings = {
+export const DEFAULT_SETTINGS: SyncSettings = {
 	remoteUri: "",
 	token: "",
 	vaultName: "default",
 	syncConcurrency: 1,
 	isSyncEnabled: false,
-	maxFileSizeMB: 10
+	maxFileSizeMB: 10,
+	ignorePatterns: []
 };
 
 export class Settings {
diff --git a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
index e62ea173..f6b2c8f8 100644
--- a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
+++ b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
@@ -16,8 +16,11 @@ import type { FileOperations } from "../file-operations/file-operations";
 import { createPromise } from "../utils/create-promise";
 import { FileNotFoundError } from "../file-operations/file-not-found-error";
 import { SyncResetError } from "../services/sync-reset-error";
+import { makeRe } from "minimatch";
 
 export class UnrestrictedSyncer {
+	private ignorePatterns: RegExp[];
+
 	public constructor(
 		private readonly logger: Logger,
 		private readonly database: Database,
@@ -25,7 +28,16 @@ export class UnrestrictedSyncer {
 		private readonly syncService: SyncService,
 		private readonly operations: FileOperations,
 		private readonly history: SyncHistory
-	) {}
+	) {
+		this.ignorePatterns = this.globsToRegex(
+			this.settings.getSettings().ignorePatterns
+		);
+
+		this.settings.addOnSettingsChangeListener((newSettings) => {
+			this.ignorePatterns = this.globsToRegex(newSettings.ignorePatterns);
+		});
+	}
+
 	public async unrestrictedSyncLocallyCreatedFile(
 		document: DocumentRecord
 	): Promise<void> {
@@ -373,7 +385,14 @@ export class UnrestrictedSyncer {
 		syncType: SyncType,
 		fn: () => Promise<T>
 	): Promise<T | undefined> {
-		this.logger.debug(`Syncing ${relativePath} (${syncType})`);
+		for (const pattern of this.ignorePatterns) {
+			if (pattern.test(relativePath)) {
+				this.logger.debug(
+					`File '${relativePath}' is ignored by the ignore pattern: ${pattern}`
+				);
+				return; // bail without SKIPPED status because we were told to ignore this file and we shouldn't clutter up the history
+			}
+		}
 
 		try {
 			if (await this.operations.exists(relativePath)) {
@@ -385,7 +404,7 @@ export class UnrestrictedSyncer {
 
 				if (sizeInMB > this.settings.getSettings().maxFileSizeMB) {
 					this.history.addHistoryEntry({
-						status: SyncStatus.ERROR,
+						status: SyncStatus.SKIPPED,
 						relativePath,
 						message: `File size of ${sizeInMB} MB exceeds the maximum file size limit of ${
 							this.settings.getSettings().maxFileSizeMB
@@ -422,4 +441,18 @@ export class UnrestrictedSyncer {
 			}
 		}
 	}
+
+	private globsToRegex(globs: string[]): RegExp[] {
+		return globs
+			.map((pattern) => {
+				const result = makeRe(pattern);
+				if (result === false) {
+					this.logger.warn(
+						`Failed to parse ${pattern}' as a glob pattern, skipping it`
+					);
+				}
+				return result;
+			})
+			.filter((pattern) => pattern !== false);
+	}
 }
diff --git a/frontend/sync-client/src/tracing/sync-history.ts b/frontend/sync-client/src/tracing/sync-history.ts
index fe782e9b..38f8320c 100644
--- a/frontend/sync-client/src/tracing/sync-history.ts
+++ b/frontend/sync-client/src/tracing/sync-history.ts
@@ -16,7 +16,8 @@ export enum SyncType {
 
 export enum SyncStatus {
 	SUCCESS = "SUCCESS",
-	ERROR = "ERROR"
+	ERROR = "ERROR",
+	SKIPPED = "SKIPPED"
 }
 
 export type HistoryEntry = CommonHistoryEntry & { timestamp: Date };

From 5448c1cf99f8dea2f351342abca29a609d44b849 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 22 May 2025 21:42:34 +0100
Subject: [PATCH 488/761] Update API types

---
 frontend/sync-client/src/services/types.ts | 28 ++++++++++++++++++----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/frontend/sync-client/src/services/types.ts b/frontend/sync-client/src/services/types.ts
index 7a13e092..6a50b1c0 100644
--- a/frontend/sync-client/src/services/types.ts
+++ b/frontend/sync-client/src/services/types.ts
@@ -50,7 +50,9 @@ export interface paths {
 		post: {
 			parameters: {
 				query?: never;
-				header?: never;
+				header: {
+					"user-agent": string;
+				};
 				path: {
 					vault_id: string;
 				};
@@ -102,7 +104,9 @@ export interface paths {
 		post: {
 			parameters: {
 				query?: never;
-				header?: never;
+				header: {
+					"user-agent": string;
+				};
 				path: {
 					vault_id: string;
 				};
@@ -186,7 +190,9 @@ export interface paths {
 		put: {
 			parameters: {
 				query?: never;
-				header?: never;
+				header: {
+					"user-agent": string;
+				};
 				path: {
 					document_id: string;
 					vault_id: string;
@@ -225,7 +231,9 @@ export interface paths {
 		delete: {
 			parameters: {
 				query?: never;
-				header?: never;
+				header: {
+					"user-agent": string;
+				};
 				path: {
 					document_id: string;
 					vault_id: string;
@@ -276,7 +284,9 @@ export interface paths {
 		put: {
 			parameters: {
 				query?: never;
-				header?: never;
+				header: {
+					"user-agent": string;
+				};
 				path: {
 					document_id: string;
 					vault_id: string;
@@ -506,6 +516,7 @@ export interface components {
 		/** @description Response to an update document request. */
 		DocumentUpdateResponse:
 			| {
+					deviceId: string;
 					/** Format: uuid */
 					documentId: string;
 					isDeleted: boolean;
@@ -514,11 +525,13 @@ export interface components {
 					type: "FastForwardUpdate";
 					/** Format: date-time */
 					updatedDate: string;
+					userId: string;
 					/** Format: int64 */
 					vaultUpdateId: number;
 			  }
 			| {
 					contentBase64: string;
+					deviceId: string;
 					/** Format: uuid */
 					documentId: string;
 					isDeleted: boolean;
@@ -527,27 +540,32 @@ export interface components {
 					type: "MergingUpdate";
 					/** Format: date-time */
 					updatedDate: string;
+					userId: string;
 					/** Format: int64 */
 					vaultUpdateId: number;
 			  };
 		DocumentVersion: {
 			contentBase64: string;
+			deviceId: string;
 			/** Format: uuid */
 			documentId: string;
 			isDeleted: boolean;
 			relativePath: string;
 			/** Format: date-time */
 			updatedDate: string;
+			userId: string;
 			/** Format: int64 */
 			vaultUpdateId: number;
 		};
 		DocumentVersionWithoutContent: {
+			deviceId: string;
 			/** Format: uuid */
 			documentId: string;
 			isDeleted: boolean;
 			relativePath: string;
 			/** Format: date-time */
 			updatedDate: string;
+			userId: string;
 			/** Format: int64 */
 			vaultUpdateId: number;
 		};

From 70fe45a09da7618f427a79a193cbd9720daf83d8 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 22 May 2025 22:24:30 +0100
Subject: [PATCH 489/761] Rename user-agent header to device-id

---
 backend/sync_server/src/server.rs             |  8 ++++-
 .../sync_server/src/server/create_document.rs | 15 +++++----
 .../sync_server/src/server/delete_document.rs |  8 ++---
 .../src/server/device_id_header.rs            | 33 +++++++++++++++++++
 .../sync_server/src/server/update_document.rs | 11 ++++---
 .../sync-client/src/services/sync-service.ts  | 23 +++++++++++++
 frontend/sync-client/src/services/types.ts    | 10 +++---
 frontend/sync-client/webpack.config.js        |  7 ++++
 8 files changed, 94 insertions(+), 21 deletions(-)
 create mode 100644 backend/sync_server/src/server/device_id_header.rs

diff --git a/backend/sync_server/src/server.rs b/backend/sync_server/src/server.rs
index e993ed15..0fd5fa03 100644
--- a/backend/sync_server/src/server.rs
+++ b/backend/sync_server/src/server.rs
@@ -1,6 +1,7 @@
 mod auth;
 mod create_document;
 mod delete_document;
+mod device_id_header;
 mod fetch_document_version;
 mod fetch_document_version_content;
 mod fetch_latest_document_version;
@@ -32,6 +33,7 @@ use axum::{
     response::IntoResponse,
     routing::IntoMakeService,
 };
+use device_id_header::DEVICE_ID_HEADER_NAME;
 use log::{error, info};
 use tokio::signal;
 use tower_http::{
@@ -79,7 +81,11 @@ pub async fn create_server(config_path: Option<OsString>) -> Result<()> {
         .layer(
             CorsLayer::new()
                 .allow_origin("*".parse::<HeaderValue>().expect("Failed to parse origin"))
-                .allow_headers([http::header::CONTENT_TYPE, http::header::AUTHORIZATION])
+                .allow_headers([
+                    http::header::CONTENT_TYPE,
+                    http::header::AUTHORIZATION,
+                    DEVICE_ID_HEADER_NAME.clone(),
+                ])
                 .allow_methods([Method::GET, Method::POST, Method::PUT, Method::DELETE]),
         )
         .layer(
diff --git a/backend/sync_server/src/server/create_document.rs b/backend/sync_server/src/server/create_document.rs
index 0fc9dc3f..b9459df5 100644
--- a/backend/sync_server/src/server/create_document.rs
+++ b/backend/sync_server/src/server/create_document.rs
@@ -4,13 +4,16 @@ use axum::{
     Extension,
     extract::{Path, State},
 };
-use axum_extra::{TypedHeader, headers::UserAgent};
+use axum_extra::TypedHeader;
 use axum_jsonschema::Json;
 use schemars::JsonSchema;
 use serde::Deserialize;
 use sync_lib::base64_to_bytes;
 
-use super::requests::{CreateDocumentVersion, CreateDocumentVersionMultipart};
+use super::{
+    device_id_header::DeviceIdHeader,
+    requests::{CreateDocumentVersion, CreateDocumentVersionMultipart},
+};
 use crate::{
     app_state::{
         AppState,
@@ -38,7 +41,7 @@ pub struct CreateDocumentPathParams {
 pub async fn create_document_multipart(
     Path(CreateDocumentPathParams { vault_id }): Path<CreateDocumentPathParams>,
     Extension(user): Extension<User>,
-    TypedHeader(user_agent): TypedHeader<UserAgent>,
+    TypedHeader(user_agent): TypedHeader<DeviceIdHeader>,
     State(state): State<AppState>,
     TypedMultipart(axum_typed_multipart::TypedMultipart(request)): TypedMultipart<
         CreateDocumentVersionMultipart,
@@ -64,7 +67,7 @@ pub async fn create_document_multipart(
 pub async fn create_document_json(
     Path(CreateDocumentPathParams { vault_id }): Path<CreateDocumentPathParams>,
     Extension(user): Extension<User>,
-    TypedHeader(user_agent): TypedHeader<UserAgent>,
+    TypedHeader(user_agent): TypedHeader<DeviceIdHeader>,
     State(state): State<AppState>,
     Json(request): Json<CreateDocumentVersion>,
 ) -> Result<Json<DocumentVersionWithoutContent>, SyncServerError> {
@@ -88,7 +91,7 @@ pub async fn create_document_json(
 #[allow(clippy::too_many_arguments)]
 async fn internal_create_document(
     user: User,
-    user_agent: UserAgent,
+    user_agent: DeviceIdHeader,
     state: AppState,
     vault_id: VaultId,
     document_id: Option<DocumentId>,
@@ -137,7 +140,7 @@ async fn internal_create_document(
         updated_date: chrono::Utc::now(),
         is_deleted: false,
         user_id: user.name,
-        device_id: user_agent.to_string(),
+        device_id: user_agent.0,
     };
 
     state
diff --git a/backend/sync_server/src/server/delete_document.rs b/backend/sync_server/src/server/delete_document.rs
index e6855d6b..e519c03f 100644
--- a/backend/sync_server/src/server/delete_document.rs
+++ b/backend/sync_server/src/server/delete_document.rs
@@ -3,12 +3,12 @@ use axum::{
     Extension,
     extract::{Path, State},
 };
-use axum_extra::{TypedHeader, headers::UserAgent};
+use axum_extra::TypedHeader;
 use axum_jsonschema::Json;
 use schemars::JsonSchema;
 use serde::Deserialize;
 
-use super::requests::DeleteDocumentVersion;
+use super::{device_id_header::DeviceIdHeader, requests::DeleteDocumentVersion};
 use crate::{
     app_state::{
         AppState,
@@ -38,7 +38,7 @@ pub async fn delete_document(
         document_id,
     }): Path<DeleteDocumentPathParams>,
     Extension(user): Extension<User>,
-    TypedHeader(user_agent): TypedHeader<UserAgent>,
+    TypedHeader(user_agent): TypedHeader<DeviceIdHeader>,
     State(state): State<AppState>,
     Json(request): Json<DeleteDocumentVersion>,
 ) -> Result<Json<DocumentVersionWithoutContent>, SyncServerError> {
@@ -76,7 +76,7 @@ pub async fn delete_document(
         updated_date: chrono::Utc::now(),
         is_deleted: true,
         user_id: user.name,
-        device_id: user_agent.to_string(),
+        device_id: user_agent.0,
     };
 
     state
diff --git a/backend/sync_server/src/server/device_id_header.rs b/backend/sync_server/src/server/device_id_header.rs
new file mode 100644
index 00000000..be36c8d8
--- /dev/null
+++ b/backend/sync_server/src/server/device_id_header.rs
@@ -0,0 +1,33 @@
+use axum_extra::headers;
+use headers::{Header, HeaderName, HeaderValue};
+
+pub struct DeviceIdHeader(pub String);
+
+pub static DEVICE_ID_HEADER_NAME: HeaderName = HeaderName::from_static("device-id");
+
+impl Header for DeviceIdHeader {
+    fn name() -> &'static HeaderName { &DEVICE_ID_HEADER_NAME }
+
+    fn decode<'i, I>(values: &mut I) -> Result<Self, headers::Error>
+    where
+        I: Iterator<Item = &'i HeaderValue>,
+    {
+        let value = values.next().ok_or_else(headers::Error::invalid)?;
+
+        Ok(DeviceIdHeader(
+            value
+                .to_str()
+                .map_err(|_| headers::Error::invalid())?
+                .to_owned(),
+        ))
+    }
+
+    fn encode<E>(&self, values: &mut E)
+    where
+        E: Extend<HeaderValue>,
+    {
+        let value = HeaderValue::from_static(Box::leak(self.0.to_string().into_boxed_str()));
+
+        values.extend(std::iter::once(value));
+    }
+}
diff --git a/backend/sync_server/src/server/update_document.rs b/backend/sync_server/src/server/update_document.rs
index ded4dd03..22eb38b0 100644
--- a/backend/sync_server/src/server/update_document.rs
+++ b/backend/sync_server/src/server/update_document.rs
@@ -4,7 +4,7 @@ use axum::{
     Extension,
     extract::{Path, State},
 };
-use axum_extra::{TypedHeader, headers::UserAgent};
+use axum_extra::TypedHeader;
 use axum_jsonschema::Json;
 use log::info;
 use schemars::JsonSchema;
@@ -12,6 +12,7 @@ use serde::Deserialize;
 use sync_lib::{base64_to_bytes, is_file_type_mergable, merge};
 
 use super::{
+    device_id_header::DeviceIdHeader,
     requests::{UpdateDocumentVersion, UpdateDocumentVersionMultipart},
     responses::DocumentUpdateResponse,
 };
@@ -42,7 +43,7 @@ pub async fn update_document_multipart(
         document_id,
     }): Path<UpdateDocumentPathParams>,
     Extension(user): Extension<User>,
-    TypedHeader(user_agent): TypedHeader<UserAgent>,
+    TypedHeader(user_agent): TypedHeader<DeviceIdHeader>,
     State(state): State<AppState>,
     TypedMultipart(axum_typed_multipart::TypedMultipart(request)): TypedMultipart<
         UpdateDocumentVersionMultipart,
@@ -69,7 +70,7 @@ pub async fn update_document_json(
         document_id,
     }): Path<UpdateDocumentPathParams>,
     Extension(user): Extension<User>,
-    TypedHeader(user_agent): TypedHeader<UserAgent>,
+    TypedHeader(user_agent): TypedHeader<DeviceIdHeader>,
     State(state): State<AppState>,
     Json(request): Json<UpdateDocumentVersion>,
 ) -> Result<Json<DocumentUpdateResponse>, SyncServerError> {
@@ -94,7 +95,7 @@ pub async fn update_document_json(
 #[allow(clippy::too_many_arguments, clippy::too_many_lines)]
 async fn internal_update_document(
     user: User,
-    user_agent: UserAgent,
+    user_agent: DeviceIdHeader,
     state: AppState,
     vault_id: VaultId,
     document_id: DocumentId,
@@ -214,7 +215,7 @@ async fn internal_update_document(
         updated_date: chrono::Utc::now(),
         is_deleted: false,
         user_id: user.name,
-        device_id: user_agent.to_string(),
+        device_id: user_agent.0,
     };
 
     state
diff --git a/frontend/sync-client/src/services/sync-service.ts b/frontend/sync-client/src/services/sync-service.ts
index 69eae6c8..741aa012 100644
--- a/frontend/sync-client/src/services/sync-service.ts
+++ b/frontend/sync-client/src/services/sync-service.ts
@@ -44,6 +44,19 @@ export class SyncService {
 		});
 	}
 
+	private get deviceIdHeader(): string {
+		// @ts-expect-error, injected by webpack
+		const packageVersion = __CURRENT_VERSION__; // eslint-disable-line
+
+		const platform =
+			typeof navigator !== "undefined"
+				? navigator.platform // eslint-disable-line @typescript-eslint/no-deprecated
+				: typeof process !== "undefined"
+					? process.platform
+					: "unknown";
+		return `vault-link/${packageVersion} (${this.deviceId}; ${platform})`;
+	}
+
 	private static formatError(
 		error: components["schemas"]["SerializedError"]
 	): string {
@@ -82,6 +95,9 @@ export class SyncService {
 					params: {
 						path: {
 							vault_id: vaultName
+						},
+						header: {
+							"device-id": this.deviceIdHeader
 						}
 					},
 					// eslint-disable-next-line
@@ -135,6 +151,9 @@ export class SyncService {
 						path: {
 							vault_id: vaultName,
 							document_id: documentId
+						},
+						header: {
+							"device-id": this.deviceIdHeader
 						}
 					},
 					// eslint-disable-next-line
@@ -175,8 +194,12 @@ export class SyncService {
 						path: {
 							vault_id: vaultName,
 							document_id: documentId
+						},
+						header: {
+							"device-id": this.deviceIdHeader
 						}
 					},
+
 					body: {
 						relativePath,
 						deviceId: this.deviceId
diff --git a/frontend/sync-client/src/services/types.ts b/frontend/sync-client/src/services/types.ts
index 6a50b1c0..4fff201c 100644
--- a/frontend/sync-client/src/services/types.ts
+++ b/frontend/sync-client/src/services/types.ts
@@ -51,7 +51,7 @@ export interface paths {
 			parameters: {
 				query?: never;
 				header: {
-					"user-agent": string;
+					"device-id": string;
 				};
 				path: {
 					vault_id: string;
@@ -105,7 +105,7 @@ export interface paths {
 			parameters: {
 				query?: never;
 				header: {
-					"user-agent": string;
+					"device-id": string;
 				};
 				path: {
 					vault_id: string;
@@ -191,7 +191,7 @@ export interface paths {
 			parameters: {
 				query?: never;
 				header: {
-					"user-agent": string;
+					"device-id": string;
 				};
 				path: {
 					document_id: string;
@@ -232,7 +232,7 @@ export interface paths {
 			parameters: {
 				query?: never;
 				header: {
-					"user-agent": string;
+					"device-id": string;
 				};
 				path: {
 					document_id: string;
@@ -285,7 +285,7 @@ export interface paths {
 			parameters: {
 				query?: never;
 				header: {
-					"user-agent": string;
+					"device-id": string;
 				};
 				path: {
 					document_id: string;
diff --git a/frontend/sync-client/webpack.config.js b/frontend/sync-client/webpack.config.js
index 5efbe8eb..d84a5cd4 100644
--- a/frontend/sync-client/webpack.config.js
+++ b/frontend/sync-client/webpack.config.js
@@ -1,5 +1,7 @@
 const path = require("path");
 const { merge } = require("webpack-merge");
+const webpack = require("webpack");
+const packageJson = require("./package.json");
 
 const common = {
 	entry: "./src/index.ts",
@@ -15,6 +17,11 @@ const common = {
 			}
 		]
 	},
+	plugins: [
+		new webpack.DefinePlugin({
+			__CURRENT_VERSION__: JSON.stringify(packageJson.version)
+		})
+	],
 	optimization: {
 		// the consuming project should take care of minification
 		minimize: false

From 3fe70b37ec5dd709508e541a7ba6ed5948aa3e44 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 22 May 2025 22:25:31 +0100
Subject: [PATCH 490/761] Bump versions to 0.3.14

---
 backend/Cargo.lock                     | 6 +++---
 backend/Cargo.toml                     | 2 +-
 backend/sync_lib/pkg/package.json      | 2 +-
 frontend/obsidian-plugin/manifest.json | 2 +-
 frontend/obsidian-plugin/package.json  | 2 +-
 frontend/package-lock.json             | 8 ++++----
 frontend/sync-client/package.json      | 2 +-
 frontend/test-client/package.json      | 2 +-
 manifest.json                          | 2 +-
 9 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 74b47e36..3acaa70c 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1922,7 +1922,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile"
-version = "0.3.13"
+version = "0.3.14"
 dependencies = [
  "insta",
  "pretty_assertions",
@@ -2542,7 +2542,7 @@ dependencies = [
 
 [[package]]
 name = "sync_lib"
-version = "0.3.13"
+version = "0.3.14"
 dependencies = [
  "base64 0.22.1",
  "console_error_panic_hook",
@@ -2555,7 +2555,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.3.13"
+version = "0.3.14"
 dependencies = [
  "aide",
  "aide-axum-typed-multipart",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 700f4f1d..ad8d2d09 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -12,7 +12,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.3.13"
+version = "0.3.14"
 
 [workspace.dependencies]
 serde = { version = "1.0.219", default-features = false, features = ["derive"] }
diff --git a/backend/sync_lib/pkg/package.json b/backend/sync_lib/pkg/package.json
index 6f451524..babe4225 100644
--- a/backend/sync_lib/pkg/package.json
+++ b/backend/sync_lib/pkg/package.json
@@ -4,7 +4,7 @@
   "collaborators": [
     "Andras Schmelczer <andras@schmelczer.dev>"
   ],
-  "version": "0.3.13",
+  "version": "0.3.14",
   "license": "MIT",
   "repository": {
     "type": "git",
diff --git a/frontend/obsidian-plugin/manifest.json b/frontend/obsidian-plugin/manifest.json
index ca1aad92..8ea69649 100644
--- a/frontend/obsidian-plugin/manifest.json
+++ b/frontend/obsidian-plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.3.13",
+	"version": "0.3.14",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index 851c25f1..48edaaa7 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.3.13",
+	"version": "0.3.14",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 045c5e9f..e3eaf211 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -21,7 +21,7 @@
 		},
 		"../backend/sync_lib/pkg": {
 			"name": "sync_lib",
-			"version": "0.3.13",
+			"version": "0.3.14",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -7853,7 +7853,7 @@
 		},
 		"obsidian-plugin": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.3.13",
+			"version": "0.3.14",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
@@ -7881,7 +7881,7 @@
 			}
 		},
 		"sync-client": {
-			"version": "0.3.13",
+			"version": "0.3.14",
 			"dependencies": {
 				"byte-base64": "^1.1.0",
 				"minimatch": "^10.0.1",
@@ -7930,7 +7930,7 @@
 			}
 		},
 		"test-client": {
-			"version": "0.3.13",
+			"version": "0.3.14",
 			"bin": {
 				"test-client": "dist/cli.js"
 			},
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index c38fcd01..5b6143a8 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "sync-client",
-    "version": "0.3.13",
+    "version": "0.3.14",
     "main": "dist/sync-client.node.js",
     "browser": "dist/sync-client.web.js",
     "types": "dist/types/index.d.ts",
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index bc706b39..5df634e7 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "test-client",
-    "version": "0.3.13",
+    "version": "0.3.14",
     "private": true,
     "bin": {
         "test-client": "./dist/cli.js"
diff --git a/manifest.json b/manifest.json
index ca1aad92..8ea69649 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.3.13",
+	"version": "0.3.14",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",

From 650e14b82c008f549e031f1b6f4f0ae2e5f0fe21 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 23 May 2025 21:46:42 +0100
Subject: [PATCH 491/761] Bump typescript-eslint from 8.29.0 to 8.32.1 in
 /frontend (#39)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 frontend/package-lock.json | 124 ++++++++++++++++++++-----------------
 frontend/package.json      |   2 +-
 2 files changed, 68 insertions(+), 58 deletions(-)

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index e3eaf211..60a4ef58 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -16,7 +16,7 @@
 				"eslint-plugin-unused-imports": "^4.1.4",
 				"npm-check-updates": "^17.1.16",
 				"prettier": "^3.5.3",
-				"typescript-eslint": "8.29.0"
+				"typescript-eslint": "8.32.1"
 			}
 		},
 		"../backend/sync_lib/pkg": {
@@ -588,9 +588,9 @@
 			}
 		},
 		"node_modules/@eslint-community/eslint-utils": {
-			"version": "4.5.1",
-			"resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.5.1.tgz",
-			"integrity": "sha512-soEIOALTfTK6EjmKMMoLugwaP0rzkad90iIWd1hMO9ARkSAyjfMfkRRhLvD5qH7vvM0Cg72pieUfR6yh6XxC4w==",
+			"version": "4.7.0",
+			"resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz",
+			"integrity": "sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1901,21 +1901,21 @@
 			"license": "MIT"
 		},
 		"node_modules/@typescript-eslint/eslint-plugin": {
-			"version": "8.29.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.29.0.tgz",
-			"integrity": "sha512-PAIpk/U7NIS6H7TEtN45SPGLQaHNgB7wSjsQV/8+KYokAb2T/gloOA/Bee2yd4/yKVhPKe5LlaUGhAZk5zmSaQ==",
+			"version": "8.32.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.32.1.tgz",
+			"integrity": "sha512-6u6Plg9nP/J1GRpe/vcjjabo6Uc5YQPAMxsgQyGC/I0RuukiG1wIe3+Vtg3IrSCVJDmqK3j8adrtzXSENRtFgg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"@eslint-community/regexpp": "^4.10.0",
-				"@typescript-eslint/scope-manager": "8.29.0",
-				"@typescript-eslint/type-utils": "8.29.0",
-				"@typescript-eslint/utils": "8.29.0",
-				"@typescript-eslint/visitor-keys": "8.29.0",
+				"@typescript-eslint/scope-manager": "8.32.1",
+				"@typescript-eslint/type-utils": "8.32.1",
+				"@typescript-eslint/utils": "8.32.1",
+				"@typescript-eslint/visitor-keys": "8.32.1",
 				"graphemer": "^1.4.0",
-				"ignore": "^5.3.1",
+				"ignore": "^7.0.0",
 				"natural-compare": "^1.4.0",
-				"ts-api-utils": "^2.0.1"
+				"ts-api-utils": "^2.1.0"
 			},
 			"engines": {
 				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -1930,17 +1930,27 @@
 				"typescript": ">=4.8.4 <5.9.0"
 			}
 		},
+		"node_modules/@typescript-eslint/eslint-plugin/node_modules/ignore": {
+			"version": "7.0.4",
+			"resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.4.tgz",
+			"integrity": "sha512-gJzzk+PQNznz8ysRrC0aOkBNVRBDtE1n53IqyqEf3PXrYwomFs5q4pGMizBMJF+ykh03insJ27hB8gSrD2Hn8A==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 4"
+			}
+		},
 		"node_modules/@typescript-eslint/parser": {
-			"version": "8.29.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.29.0.tgz",
-			"integrity": "sha512-8C0+jlNJOwQso2GapCVWWfW/rzaq7Lbme+vGUFKE31djwNncIpgXD7Cd4weEsDdkoZDjH0lwwr3QDQFuyrMg9g==",
+			"version": "8.32.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.32.1.tgz",
+			"integrity": "sha512-LKMrmwCPoLhM45Z00O1ulb6jwyVr2kr3XJp+G+tSEZcbauNnScewcQwtJqXDhXeYPDEjZ8C1SjXm015CirEmGg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@typescript-eslint/scope-manager": "8.29.0",
-				"@typescript-eslint/types": "8.29.0",
-				"@typescript-eslint/typescript-estree": "8.29.0",
-				"@typescript-eslint/visitor-keys": "8.29.0",
+				"@typescript-eslint/scope-manager": "8.32.1",
+				"@typescript-eslint/types": "8.32.1",
+				"@typescript-eslint/typescript-estree": "8.32.1",
+				"@typescript-eslint/visitor-keys": "8.32.1",
 				"debug": "^4.3.4"
 			},
 			"engines": {
@@ -1956,14 +1966,14 @@
 			}
 		},
 		"node_modules/@typescript-eslint/scope-manager": {
-			"version": "8.29.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.29.0.tgz",
-			"integrity": "sha512-aO1PVsq7Gm+tcghabUpzEnVSFMCU4/nYIgC2GOatJcllvWfnhrgW0ZEbnTxm36QsikmCN1K/6ZgM7fok2I7xNw==",
+			"version": "8.32.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.32.1.tgz",
+			"integrity": "sha512-7IsIaIDeZn7kffk7qXC3o6Z4UblZJKV3UBpkvRNpr5NSyLji7tvTcvmnMNYuYLyh26mN8W723xpo3i4MlD33vA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@typescript-eslint/types": "8.29.0",
-				"@typescript-eslint/visitor-keys": "8.29.0"
+				"@typescript-eslint/types": "8.32.1",
+				"@typescript-eslint/visitor-keys": "8.32.1"
 			},
 			"engines": {
 				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -1974,16 +1984,16 @@
 			}
 		},
 		"node_modules/@typescript-eslint/type-utils": {
-			"version": "8.29.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.29.0.tgz",
-			"integrity": "sha512-ahaWQ42JAOx+NKEf5++WC/ua17q5l+j1GFrbbpVKzFL/tKVc0aYY8rVSYUpUvt2hUP1YBr7mwXzx+E/DfUWI9Q==",
+			"version": "8.32.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.32.1.tgz",
+			"integrity": "sha512-mv9YpQGA8iIsl5KyUPi+FGLm7+bA4fgXaeRcFKRDRwDMu4iwrSHeDPipwueNXhdIIZltwCJv+NkxftECbIZWfA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@typescript-eslint/typescript-estree": "8.29.0",
-				"@typescript-eslint/utils": "8.29.0",
+				"@typescript-eslint/typescript-estree": "8.32.1",
+				"@typescript-eslint/utils": "8.32.1",
 				"debug": "^4.3.4",
-				"ts-api-utils": "^2.0.1"
+				"ts-api-utils": "^2.1.0"
 			},
 			"engines": {
 				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -1998,9 +2008,9 @@
 			}
 		},
 		"node_modules/@typescript-eslint/types": {
-			"version": "8.29.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.29.0.tgz",
-			"integrity": "sha512-wcJL/+cOXV+RE3gjCyl/V2G877+2faqvlgtso/ZRbTCnZazh0gXhe+7gbAnfubzN2bNsBtZjDvlh7ero8uIbzg==",
+			"version": "8.32.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.32.1.tgz",
+			"integrity": "sha512-YmybwXUJcgGqgAp6bEsgpPXEg6dcCyPyCSr0CAAueacR/CCBi25G3V8gGQ2kRzQRBNol7VQknxMs9HvVa9Rvfg==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -2012,20 +2022,20 @@
 			}
 		},
 		"node_modules/@typescript-eslint/typescript-estree": {
-			"version": "8.29.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.29.0.tgz",
-			"integrity": "sha512-yOfen3jE9ISZR/hHpU/bmNvTtBW1NjRbkSFdZOksL1N+ybPEE7UVGMwqvS6CP022Rp00Sb0tdiIkhSCe6NI8ow==",
+			"version": "8.32.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.32.1.tgz",
+			"integrity": "sha512-Y3AP9EIfYwBb4kWGb+simvPaqQoT5oJuzzj9m0i6FCY6SPvlomY2Ei4UEMm7+FXtlNJbor80ximyslzaQF6xhg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@typescript-eslint/types": "8.29.0",
-				"@typescript-eslint/visitor-keys": "8.29.0",
+				"@typescript-eslint/types": "8.32.1",
+				"@typescript-eslint/visitor-keys": "8.32.1",
 				"debug": "^4.3.4",
 				"fast-glob": "^3.3.2",
 				"is-glob": "^4.0.3",
 				"minimatch": "^9.0.4",
 				"semver": "^7.6.0",
-				"ts-api-utils": "^2.0.1"
+				"ts-api-utils": "^2.1.0"
 			},
 			"engines": {
 				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2065,16 +2075,16 @@
 			}
 		},
 		"node_modules/@typescript-eslint/utils": {
-			"version": "8.29.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.29.0.tgz",
-			"integrity": "sha512-gX/A0Mz9Bskm8avSWFcK0gP7cZpbY4AIo6B0hWYFCaIsz750oaiWR4Jr2CI+PQhfW1CpcQr9OlfPS+kMFegjXA==",
+			"version": "8.32.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.32.1.tgz",
+			"integrity": "sha512-DsSFNIgLSrc89gpq1LJB7Hm1YpuhK086DRDJSNrewcGvYloWW1vZLHBTIvarKZDcAORIy/uWNx8Gad+4oMpkSA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@eslint-community/eslint-utils": "^4.4.0",
-				"@typescript-eslint/scope-manager": "8.29.0",
-				"@typescript-eslint/types": "8.29.0",
-				"@typescript-eslint/typescript-estree": "8.29.0"
+				"@eslint-community/eslint-utils": "^4.7.0",
+				"@typescript-eslint/scope-manager": "8.32.1",
+				"@typescript-eslint/types": "8.32.1",
+				"@typescript-eslint/typescript-estree": "8.32.1"
 			},
 			"engines": {
 				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2089,13 +2099,13 @@
 			}
 		},
 		"node_modules/@typescript-eslint/visitor-keys": {
-			"version": "8.29.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.29.0.tgz",
-			"integrity": "sha512-Sne/pVz8ryR03NFK21VpN88dZ2FdQXOlq3VIklbrTYEt8yXtRFr9tvUhqvCeKjqYk5FSim37sHbooT6vzBTZcg==",
+			"version": "8.32.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.32.1.tgz",
+			"integrity": "sha512-ar0tjQfObzhSaW3C3QNmTc5ofj0hDoNQ5XWrCy6zDyabdr0TWhCkClp+rywGNj/odAFBVzzJrK4tEq5M4Hmu4w==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@typescript-eslint/types": "8.29.0",
+				"@typescript-eslint/types": "8.32.1",
 				"eslint-visitor-keys": "^4.2.0"
 			},
 			"engines": {
@@ -7276,15 +7286,15 @@
 			}
 		},
 		"node_modules/typescript-eslint": {
-			"version": "8.29.0",
-			"resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.29.0.tgz",
-			"integrity": "sha512-ep9rVd9B4kQsZ7ZnWCVxUE/xDLUUUsRzE0poAeNu+4CkFErLfuvPt/qtm2EpnSyfvsR0S6QzDFSrPCFBwf64fg==",
+			"version": "8.32.1",
+			"resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.32.1.tgz",
+			"integrity": "sha512-D7el+eaDHAmXvrZBy1zpzSNIRqnCOrkwTgZxTu3MUqRWk8k0q9m9Ho4+vPf7iHtgUfrK/o8IZaEApsxPlHTFCg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@typescript-eslint/eslint-plugin": "8.29.0",
-				"@typescript-eslint/parser": "8.29.0",
-				"@typescript-eslint/utils": "8.29.0"
+				"@typescript-eslint/eslint-plugin": "8.32.1",
+				"@typescript-eslint/parser": "8.32.1",
+				"@typescript-eslint/utils": "8.32.1"
 			},
 			"engines": {
 				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
diff --git a/frontend/package.json b/frontend/package.json
index 8ae718c4..7a542ef0 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -25,6 +25,6 @@
 		"eslint-plugin-unused-imports": "^4.1.4",
 		"npm-check-updates": "^17.1.16",
 		"prettier": "^3.5.3",
-		"typescript-eslint": "8.29.0"
+		"typescript-eslint": "8.32.1"
 	}
 }
\ No newline at end of file

From 0295b5633fc18b434cf529595b0553a22565885d Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 23 May 2025 21:56:39 +0100
Subject: [PATCH 492/761] Allow deleting non-existent files

---
 .../sync_server/src/server/delete_document.rs   | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/backend/sync_server/src/server/delete_document.rs b/backend/sync_server/src/server/delete_document.rs
index e519c03f..dbb9a0df 100644
--- a/backend/sync_server/src/server/delete_document.rs
+++ b/backend/sync_server/src/server/delete_document.rs
@@ -1,4 +1,4 @@
-use anyhow::{Context as _, anyhow};
+use anyhow::Context as _;
 use axum::{
     Extension,
     extract::{Path, State},
@@ -18,7 +18,7 @@ use crate::{
         },
     },
     config::user_config::User,
-    errors::{SyncServerError, not_found_error, server_error},
+    errors::{SyncServerError, server_error},
     utils::{normalize::normalize, sanitize_path::sanitize_path},
 };
 
@@ -54,25 +54,18 @@ pub async fn delete_document(
         .await
         .map_err(server_error)?;
 
-    let latest_version = state
+    let latest_content = state
         .database
         .get_latest_document(&vault_id, &document_id, Some(&mut transaction))
         .await
         .map_err(server_error)?
-        .map_or_else(
-            || {
-                Err(not_found_error(anyhow!(
-                    "Document with id `{document_id}` not found",
-                )))
-            },
-            Ok,
-        )?;
+        .map_or_else(Vec::new, |version| version.content); // in case the document has never existed before deleting it
 
     let new_version = StoredDocumentVersion {
         vault_update_id: last_update_id + 1,
         document_id,
         relative_path: sanitize_path(&request.relative_path),
-        content: latest_version.content, // copy the content from the latest version
+        content: latest_content, // copy the content from the latest version
         updated_date: chrono::Utc::now(),
         is_deleted: true,
         user_id: user.name,

From 0cd2e9175f9bf723cbafad4acd7502fbf268f650 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 23 May 2025 21:57:41 +0100
Subject: [PATCH 493/761] Print pending id

---
 .../src/file-operations/safe-filesystem-operations.ts      | 2 +-
 frontend/sync-client/src/sync-operations/syncer.ts         | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts b/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
index 433f1d75..6297af90 100644
--- a/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
+++ b/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
@@ -138,7 +138,7 @@ export class SafeFileSystemOperations implements FileSystemOperations {
 	/**
 	 * Decorate an operation to ensure that the file exists before running it.
 	 * If the operation fails, it will check if the file still exists and throw
-	 * a FileNotFoundError if it doesn't
+	 * a FileNotFoundError if it doesn't.
 	 */
 	private async safeOperation<T>(
 		path: RelativePath,
diff --git a/frontend/sync-client/src/sync-operations/syncer.ts b/frontend/sync-client/src/sync-operations/syncer.ts
index ca608314..aa7ff7fe 100644
--- a/frontend/sync-client/src/sync-operations/syncer.ts
+++ b/frontend/sync-client/src/sync-operations/syncer.ts
@@ -128,12 +128,17 @@ export class Syncer {
 
 		const [promise, resolve, reject] = createPromise();
 
+		const id = uuidv4();
 		const document = this.database.createNewPendingDocument(
-			uuidv4(),
+			id,
 			relativePath,
 			promise
 		);
 
+		this.logger.debug(
+			`Creating new pending document ${relativePath} with id ${id}`
+		);
+
 		try {
 			await this.syncQueue.add(async () =>
 				this.internalSyncer.unrestrictedSyncLocallyCreatedFile(document)

From ef0017453862df1d0201a801063f11d5f969d821 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 23 May 2025 21:58:01 +0100
Subject: [PATCH 494/761] Fix E2E test by not creating deleted files

---
 .../src/sync-operations/unrestricted-syncer.ts           | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
index f6b2c8f8..58e88943 100644
--- a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
+++ b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
@@ -45,6 +45,13 @@ export class UnrestrictedSyncer {
 			document.relativePath,
 			SyncType.CREATE,
 			async () => {
+				if (document.isDeleted) {
+					this.logger.debug(
+						`Document ${document.relativePath} has been already deleted, no need to update it`
+					);
+					return;
+				}
+
 				const contentBytes = await this.operations.read(
 					document.relativePath
 				); // this can throw FileNotFoundError
@@ -125,7 +132,7 @@ export class UnrestrictedSyncer {
 			async () => {
 				const originalRelativePath = document.relativePath;
 
-				if (document.metadata === undefined || document.isDeleted) {
+				if (document.isDeleted || document.metadata === undefined) {
 					this.logger.debug(
 						`Document ${document.relativePath} has been already deleted, no need to update it`
 					);

From 11dde0baa46f17090e1be91975b0395906ed80f5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 23 May 2025 23:07:41 +0100
Subject: [PATCH 495/761] Bump sass from 1.86.1 to 1.89.0 in /frontend (#42)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 frontend/obsidian-plugin/package.json | 2 +-
 frontend/package-lock.json            | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index 48edaaa7..89894800 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -23,7 +23,7 @@
 		"mini-css-extract-plugin": "^2.9.2",
 		"obsidian": "1.8.7",
 		"resolve-url-loader": "^5.0.0",
-		"sass": "^1.86.1",
+		"sass": "^1.89.0",
 		"sass-loader": "^16.0.5",
 		"sync-client": "file:../sync-client",
 		"terser-webpack-plugin": "^5.3.14",
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 60a4ef58..5da3b53b 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -6493,9 +6493,9 @@
 			"license": "MIT"
 		},
 		"node_modules/sass": {
-			"version": "1.86.1",
-			"resolved": "https://registry.npmjs.org/sass/-/sass-1.86.1.tgz",
-			"integrity": "sha512-Yaok4XELL1L9Im/ZUClKu//D2OP1rOljKj0Gf34a+GzLbMveOzL7CfqYo+JUa5Xt1nhTCW+OcKp/FtR7/iqj1w==",
+			"version": "1.89.0",
+			"resolved": "https://registry.npmjs.org/sass/-/sass-1.89.0.tgz",
+			"integrity": "sha512-ld+kQU8YTdGNjOLfRWBzewJpU5cwEv/h5yyqlSeJcj6Yh8U4TDA9UA5FPicqDz/xgRPWRSYIQNiFks21TbA9KQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -7876,7 +7876,7 @@
 				"mini-css-extract-plugin": "^2.9.2",
 				"obsidian": "1.8.7",
 				"resolve-url-loader": "^5.0.0",
-				"sass": "^1.86.1",
+				"sass": "^1.89.0",
 				"sass-loader": "^16.0.5",
 				"sync-client": "file:../sync-client",
 				"terser-webpack-plugin": "^5.3.14",

From a9dc9f8fe303718ebcd30161f29d9cc58536fe22 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 23 May 2025 23:07:51 +0100
Subject: [PATCH 496/761] Bump openapi-fetch from 0.13.5 to 0.14.0 in /frontend
 (#43)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 frontend/package-lock.json        | 8 ++++----
 frontend/sync-client/package.json | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 5da3b53b..909ca009 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -5677,9 +5677,9 @@
 			}
 		},
 		"node_modules/openapi-fetch": {
-			"version": "0.13.5",
-			"resolved": "https://registry.npmjs.org/openapi-fetch/-/openapi-fetch-0.13.5.tgz",
-			"integrity": "sha512-AQK8T9GSKFREFlN1DBXTYsLjs7YV2tZcJ7zUWxbjMoQmj8dDSFRrzhLCbHPZWA1TMV3vACqfCxLEZcwf2wxV6Q==",
+			"version": "0.14.0",
+			"resolved": "https://registry.npmjs.org/openapi-fetch/-/openapi-fetch-0.14.0.tgz",
+			"integrity": "sha512-PshIdm1NgdLvb05zp8LqRQMNSKzIlPkyMxYFxwyHR+UlKD4t2nUjkDhNxeRbhRSEd3x5EUNh2w5sJYwkhOH4fg==",
 			"license": "MIT",
 			"dependencies": {
 				"openapi-typescript-helpers": "^0.0.15"
@@ -7895,7 +7895,7 @@
 			"dependencies": {
 				"byte-base64": "^1.1.0",
 				"minimatch": "^10.0.1",
-				"openapi-fetch": "0.13.5",
+				"openapi-fetch": "0.14.0",
 				"openapi-typescript": "7.6.1",
 				"p-queue": "^8.1.0",
 				"uuid": "^11.1.0"
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index 5b6143a8..b7beece7 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -15,7 +15,7 @@
     "dependencies": {
         "byte-base64": "^1.1.0",
         "minimatch": "^10.0.1",
-        "openapi-fetch": "0.13.5",
+        "openapi-fetch": "0.14.0",
         "openapi-typescript": "7.6.1",
         "p-queue": "^8.1.0",
         "uuid": "^11.1.0"

From 33455d24fc7889d7d9dc048889adaf912f27ec56 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 23 May 2025 23:08:00 +0100
Subject: [PATCH 497/761] Bump typescript from 5.8.2 to 5.8.3 in /frontend
 (#40)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 frontend/obsidian-plugin/package.json |  2 +-
 frontend/package-lock.json            | 12 ++++++------
 frontend/sync-client/package.json     |  2 +-
 frontend/test-client/package.json     |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index 89894800..589e2ed9 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -30,7 +30,7 @@
 		"ts-jest": "^29.3.1",
 		"ts-loader": "^9.5.2",
 		"tslib": "2.8.1",
-		"typescript": "5.8.2",
+		"typescript": "5.8.3",
 		"url": "^0.11.4",
 		"virtual-scroller": "^1.13.1",
 		"webpack": "^5.98.0",
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 909ca009..a4f4f43b 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -7273,9 +7273,9 @@
 			}
 		},
 		"node_modules/typescript": {
-			"version": "5.8.2",
-			"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.2.tgz",
-			"integrity": "sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ==",
+			"version": "5.8.3",
+			"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.3.tgz",
+			"integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==",
 			"license": "Apache-2.0",
 			"bin": {
 				"tsc": "bin/tsc",
@@ -7883,7 +7883,7 @@
 				"ts-jest": "^29.3.1",
 				"ts-loader": "^9.5.2",
 				"tslib": "2.8.1",
-				"typescript": "5.8.2",
+				"typescript": "5.8.3",
 				"url": "^0.11.4",
 				"virtual-scroller": "^1.13.1",
 				"webpack": "^5.98.0",
@@ -7908,7 +7908,7 @@
 				"ts-jest": "^29.3.1",
 				"ts-loader": "^9.5.2",
 				"tslib": "2.8.1",
-				"typescript": "5.8.2",
+				"typescript": "5.8.3",
 				"webpack": "^5.98.0",
 				"webpack-cli": "^6.0.1",
 				"webpack-merge": "^6.0.1",
@@ -7950,7 +7950,7 @@
 				"sync-client": "file:../sync-client",
 				"ts-loader": "^9.5.2",
 				"tslib": "2.8.1",
-				"typescript": "5.8.2",
+				"typescript": "5.8.3",
 				"uuid": "^11.1.0",
 				"webpack": "^5.98.0",
 				"webpack-cli": "^6.0.1"
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index b7beece7..893463d4 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -28,7 +28,7 @@
         "ts-jest": "^29.3.1",
         "ts-loader": "^9.5.2",
         "tslib": "2.8.1",
-        "typescript": "5.8.2",
+        "typescript": "5.8.3",
         "webpack": "^5.98.0",
         "webpack-cli": "^6.0.1",
         "webpack-merge": "^6.0.1",
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index 5df634e7..93b071dd 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -15,7 +15,7 @@
         "sync-client": "file:../sync-client",
         "ts-loader": "^9.5.2",
         "tslib": "2.8.1",
-        "typescript": "5.8.2",
+        "typescript": "5.8.3",
         "uuid": "^11.1.0",
         "webpack": "^5.98.0",
         "webpack-cli": "^6.0.1",

From b5a6c6a993b4157b7a46a08f2d3943027a9a6b01 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 23 May 2025 23:08:13 +0100
Subject: [PATCH 498/761] Bump clap-verbosity-flag from 3.0.2 to 3.0.3 in
 /backend (#41)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 backend/Cargo.lock             | 4 ++--
 backend/sync_server/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 3acaa70c..2fecf479 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -461,9 +461,9 @@ dependencies = [
 
 [[package]]
 name = "clap-verbosity-flag"
-version = "3.0.2"
+version = "3.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2678fade3b77aa3a8ff3aae87e9c008d3fb00473a41c71fbf74e91c8c7b37e84"
+checksum = "eeab6a5cdfc795a05538422012f20a5496f050223c91be4e5420bfd13c641fb1"
 dependencies = [
  "clap",
  "log",
diff --git a/backend/sync_server/Cargo.toml b/backend/sync_server/Cargo.toml
index 40011c38..4dfffdf5 100644
--- a/backend/sync_server/Cargo.toml
+++ b/backend/sync_server/Cargo.toml
@@ -35,7 +35,7 @@ regex = "1.11.1"
 clap = { version = "4.5.38", features = ["derive"] }
 futures = "0.3.31"
 serde_json = "1.0.140"
-clap-verbosity-flag = "3.0.2"
+clap-verbosity-flag = "3.0.3"
 
 [lints]
 workspace = true

From 88be6f93b2b767983d273890c0e7b76e27d81ac6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 23 May 2025 23:08:20 +0100
Subject: [PATCH 499/761] Bump ts-jest from 29.3.1 to 29.3.4 in /frontend (#45)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 frontend/obsidian-plugin/package.json |  2 +-
 frontend/package-lock.json            | 26 +++++++++++++-------------
 frontend/sync-client/package.json     |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index 589e2ed9..e4689b04 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -27,7 +27,7 @@
 		"sass-loader": "^16.0.5",
 		"sync-client": "file:../sync-client",
 		"terser-webpack-plugin": "^5.3.14",
-		"ts-jest": "^29.3.1",
+		"ts-jest": "^29.3.4",
 		"ts-loader": "^9.5.2",
 		"tslib": "2.8.1",
 		"typescript": "5.8.3",
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index a4f4f43b..f0eeb90e 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -6574,9 +6574,9 @@
 			}
 		},
 		"node_modules/semver": {
-			"version": "7.7.1",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
-			"integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
+			"version": "7.7.2",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+			"integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
 			"dev": true,
 			"license": "ISC",
 			"bin": {
@@ -7136,9 +7136,9 @@
 			}
 		},
 		"node_modules/ts-jest": {
-			"version": "29.3.1",
-			"resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.3.1.tgz",
-			"integrity": "sha512-FT2PIRtZABwl6+ZCry8IY7JZ3xMuppsEV9qFVHOVe8jDzggwUZ9TsM4chyJxL9yi6LvkqcZYU3LmapEE454zBQ==",
+			"version": "29.3.4",
+			"resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.3.4.tgz",
+			"integrity": "sha512-Iqbrm8IXOmV+ggWHOTEbjwyCf2xZlUMv5npExksXohL+tk8va4Fjhb+X2+Rt9NBmgO7bJ8WpnMLOwih/DnMlFA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -7149,8 +7149,8 @@
 				"json5": "^2.2.3",
 				"lodash.memoize": "^4.1.2",
 				"make-error": "^1.3.6",
-				"semver": "^7.7.1",
-				"type-fest": "^4.38.0",
+				"semver": "^7.7.2",
+				"type-fest": "^4.41.0",
 				"yargs-parser": "^21.1.1"
 			},
 			"bin": {
@@ -7186,9 +7186,9 @@
 			}
 		},
 		"node_modules/ts-jest/node_modules/type-fest": {
-			"version": "4.38.0",
-			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.38.0.tgz",
-			"integrity": "sha512-2dBz5D5ycHIoliLYLi0Q2V7KRaDlH0uWIvmk7TYlAg5slqwiPv1ezJdZm1QEM0xgk29oYWMCbIG7E6gHpvChlg==",
+			"version": "4.41.0",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.41.0.tgz",
+			"integrity": "sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==",
 			"dev": true,
 			"license": "(MIT OR CC0-1.0)",
 			"engines": {
@@ -7880,7 +7880,7 @@
 				"sass-loader": "^16.0.5",
 				"sync-client": "file:../sync-client",
 				"terser-webpack-plugin": "^5.3.14",
-				"ts-jest": "^29.3.1",
+				"ts-jest": "^29.3.4",
 				"ts-loader": "^9.5.2",
 				"tslib": "2.8.1",
 				"typescript": "5.8.3",
@@ -7905,7 +7905,7 @@
 				"@types/node": "^22.14.0",
 				"jest": "^29.7.0",
 				"sync_lib": "file:../../backend/sync_lib/pkg",
-				"ts-jest": "^29.3.1",
+				"ts-jest": "^29.3.4",
 				"ts-loader": "^9.5.2",
 				"tslib": "2.8.1",
 				"typescript": "5.8.3",
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index 893463d4..79693be3 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -25,7 +25,7 @@
         "@types/node": "^22.14.0",
         "jest": "^29.7.0",
         "sync_lib": "file:../../backend/sync_lib/pkg",
-        "ts-jest": "^29.3.1",
+        "ts-jest": "^29.3.4",
         "ts-loader": "^9.5.2",
         "tslib": "2.8.1",
         "typescript": "5.8.3",

From d73f2a000940cba61b1fa63e5066e6c31fd67758 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 23 May 2025 23:08:31 +0100
Subject: [PATCH 500/761] Bump sqlx from 0.8.5 to 0.8.6 in /backend (#44)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 backend/Cargo.lock             | 29 ++++++++++++++---------------
 backend/sync_server/Cargo.toml |  2 +-
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 2fecf479..553ef415 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -2295,9 +2295,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3c3a85280daca669cfd3bcb68a337882a8bc57ec882f72c5d13a430613a738e"
+checksum = "1fefb893899429669dcdd979aff487bd78f4064e5e7907e4269081e0ef7d97dc"
 dependencies = [
  "sqlx-core",
  "sqlx-macros",
@@ -2308,9 +2308,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx-core"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f743f2a3cea30a58cd479013f75550e879009e3a02f616f18ca699335aa248c3"
+checksum = "ee6798b1838b6a0f69c007c133b8df5866302197e404e8b6ee8ed3e3a5e68dc6"
 dependencies = [
  "base64 0.22.1",
  "bytes",
@@ -2344,9 +2344,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx-macros"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f4200e0fde19834956d4252347c12a083bdcb237d7a1a1446bffd8768417dce"
+checksum = "a2d452988ccaacfbf5e0bdbc348fb91d7c8af5bee192173ac3636b5fb6e6715d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2357,9 +2357,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx-macros-core"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "882ceaa29cade31beca7129b6beeb05737f44f82dbe2a9806ecea5a7093d00b7"
+checksum = "19a9c1841124ac5a61741f96e1d9e2ec77424bf323962dd894bdb93f37d5219b"
 dependencies = [
  "dotenvy",
  "either",
@@ -2376,16 +2376,15 @@ dependencies = [
  "sqlx-postgres",
  "sqlx-sqlite",
  "syn 2.0.90",
- "tempfile",
  "tokio",
  "url",
 ]
 
 [[package]]
 name = "sqlx-mysql"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0afdd3aa7a629683c2d750c2df343025545087081ab5942593a5288855b1b7a7"
+checksum = "aa003f0038df784eb8fecbbac13affe3da23b45194bd57dba231c8f48199c526"
 dependencies = [
  "atoi",
  "base64 0.22.1",
@@ -2427,9 +2426,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx-postgres"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0bedbe1bbb5e2615ef347a5e9d8cd7680fb63e77d9dafc0f29be15e53f1ebe6"
+checksum = "db58fcd5a53cf07c184b154801ff91347e4c30d17a3562a635ff028ad5deda46"
 dependencies = [
  "atoi",
  "base64 0.22.1",
@@ -2466,9 +2465,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx-sqlite"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c26083e9a520e8eb87a06b12347679b142dc2ea29e6e409f805644a7a979a5bc"
+checksum = "c2d12fe70b2c1b4401038055f90f151b78208de1f9f89a7dbfd41587a10c3eea"
 dependencies = [
  "atoi",
  "chrono",
diff --git a/backend/sync_server/Cargo.toml b/backend/sync_server/Cargo.toml
index 4dfffdf5..b8ff1549 100644
--- a/backend/sync_server/Cargo.toml
+++ b/backend/sync_server/Cargo.toml
@@ -23,7 +23,7 @@ axum_typed_multipart = "0.11.0"
 tower-http = { version = "0.6.1", features = ["cors", "trace", "limit", "timeout"] }
 tracing-subscriber = { version = "0.3.19", features = ["fmt", "env-filter"]}
 serde_yaml = "0.9.34"
-sqlx = { version = "0.8.5", features = ["sqlite", "runtime-tokio", "uuid", "chrono"] }
+sqlx = { version = "0.8.6", features = ["sqlite", "runtime-tokio", "uuid", "chrono"] }
 chrono = { version = "0.4.41", features = ["serde"] }
 aide = { version = "0.13.5", features = ["axum", "axum-ws", "scalar", "axum-headers"] }
 schemars = { version = "0.8.22", features = ["chrono", "uuid1", "bytes"] }

From ffeec19ca79e2127006bcd9aab4ea09285191efe Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 24 May 2025 11:17:25 +0100
Subject: [PATCH 501/761] Include content size in response

---
 backend/sync_server/src/app_state/database.rs | 44 ++++++++++++++++---
 .../src/app_state/database/models.rs          |  2 +
 frontend/sync-client/src/services/types.ts    |  4 ++
 3 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/backend/sync_server/src/app_state/database.rs b/backend/sync_server/src/app_state/database.rs
index 1e26e142..2ef03ba1 100644
--- a/backend/sync_server/src/app_state/database.rs
+++ b/backend/sync_server/src/app_state/database.rs
@@ -135,8 +135,7 @@ impl Database {
         vault: &VaultId,
         transaction: Option<&mut Transaction<'_>>,
     ) -> Result<Vec<DocumentVersionWithoutContent>> {
-        let query = sqlx::query_as!(
-            DocumentVersionWithoutContent,
+        let query = sqlx::query!(
             r#"
             select
                 vault_update_id,
@@ -145,7 +144,8 @@ impl Database {
                 updated_date as "updated_date: chrono::DateTime<Utc>",
                 is_deleted,
                 user_id,
-                device_id
+                device_id,
+                length(content) as "content_size: u64"
             from latest_document_versions
             order by vault_update_id
             "#,
@@ -159,6 +159,22 @@ impl Database {
                 .await
         }
         .context("Cannot fetch latest documents")
+        .map(|rows| {
+            rows.into_iter()
+                .map(|row| DocumentVersionWithoutContent {
+                    vault_update_id: row.vault_update_id,
+                    document_id: row.document_id.into(),
+                    relative_path: row.relative_path,
+                    updated_date: row.updated_date,
+                    is_deleted: row.is_deleted,
+                    user_id: row.user_id,
+                    device_id: row.device_id,
+                    content_size: row
+                        .content_size
+                        .expect("Content size can't be null but sqlx can't infer it"),
+                })
+                .collect()
+        })
     }
 
     /// Return the latest state of all documents (including deleted) in the
@@ -169,8 +185,7 @@ impl Database {
         vault_update_id: VaultUpdateId,
         transaction: Option<&mut Transaction<'_>>,
     ) -> Result<Vec<DocumentVersionWithoutContent>> {
-        let query = sqlx::query_as!(
-            DocumentVersionWithoutContent,
+        let query = sqlx::query!(
             r#"
             select
                 vault_update_id,
@@ -179,7 +194,8 @@ impl Database {
                 updated_date as "updated_date: chrono::DateTime<Utc>",
                 is_deleted,
                 user_id,
-                device_id
+                device_id,
+                length(content) as "content_size: u64"
             from latest_document_versions
             where vault_update_id > ?
             order by vault_update_id
@@ -197,6 +213,22 @@ impl Database {
         .with_context(|| {
             format!("Cannot fetch latest documents since vault_update_id {vault_update_id}")
         })
+        .map(|rows| {
+            rows.into_iter()
+                .map(|row| DocumentVersionWithoutContent {
+                    vault_update_id: row.vault_update_id,
+                    document_id: row.document_id.into(),
+                    relative_path: row.relative_path,
+                    updated_date: row.updated_date,
+                    is_deleted: row.is_deleted,
+                    user_id: row.user_id,
+                    device_id: row.device_id,
+                    content_size: row
+                        .content_size
+                        .expect("Content size can't be null but sqlx can't infer it"),
+                })
+                .collect()
+        })
     }
 
     pub async fn get_max_update_id_in_vault(
diff --git a/backend/sync_server/src/app_state/database/models.rs b/backend/sync_server/src/app_state/database/models.rs
index 9f896ac5..62ba66b6 100644
--- a/backend/sync_server/src/app_state/database/models.rs
+++ b/backend/sync_server/src/app_state/database/models.rs
@@ -35,6 +35,7 @@ pub struct DocumentVersionWithoutContent {
     pub is_deleted: bool,
     pub user_id: UserId,
     pub device_id: DeviceId,
+    pub content_size: u64,
 }
 
 impl From<StoredDocumentVersion> for DocumentVersionWithoutContent {
@@ -47,6 +48,7 @@ impl From<StoredDocumentVersion> for DocumentVersionWithoutContent {
             is_deleted: value.is_deleted,
             user_id: value.user_id,
             device_id: value.device_id,
+            content_size: value.content.len() as u64,
         }
     }
 }
diff --git a/frontend/sync-client/src/services/types.ts b/frontend/sync-client/src/services/types.ts
index 4fff201c..893eea70 100644
--- a/frontend/sync-client/src/services/types.ts
+++ b/frontend/sync-client/src/services/types.ts
@@ -516,6 +516,8 @@ export interface components {
 		/** @description Response to an update document request. */
 		DocumentUpdateResponse:
 			| {
+					/** Format: uint64 */
+					contentSize: number;
 					deviceId: string;
 					/** Format: uuid */
 					documentId: string;
@@ -558,6 +560,8 @@ export interface components {
 			vaultUpdateId: number;
 		};
 		DocumentVersionWithoutContent: {
+			/** Format: uint64 */
+			contentSize: number;
 			deviceId: string;
 			/** Format: uuid */
 			documentId: string;

From b17f34d402a89f1efeebc4ea05bb5577e53d108b Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 24 May 2025 13:21:37 +0100
Subject: [PATCH 502/761] Fix ignore patterns

---
 .../obsidian-plugin/src/obsidian-file-system.ts  |  4 +++-
 .../obsidian-plugin/src/vault-link-plugin.ts     |  2 +-
 .../src/utils/globs-to-regexes.test.ts           | 10 ++++++++++
 .../sync-client/src/utils/globs-to-regexes.ts    | 16 ++++++++++++++++
 4 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 frontend/sync-client/src/utils/globs-to-regexes.test.ts
 create mode 100644 frontend/sync-client/src/utils/globs-to-regexes.ts

diff --git a/frontend/obsidian-plugin/src/obsidian-file-system.ts b/frontend/obsidian-plugin/src/obsidian-file-system.ts
index 1a4d7099..9905b036 100644
--- a/frontend/obsidian-plugin/src/obsidian-file-system.ts
+++ b/frontend/obsidian-plugin/src/obsidian-file-system.ts
@@ -26,7 +26,9 @@ export class ObsidianFileSystemOperations implements FileSystemOperations {
 				break;
 			}
 
-			if (folder.includes(".obsidian")) {
+			// This would be a very bad idea to sync as it would mess with
+			// the integrity of the sync database.
+			if (folder.endsWith(".obsidian/plugins/vault-link/data.json")) {
 				continue;
 			}
 
diff --git a/frontend/obsidian-plugin/src/vault-link-plugin.ts b/frontend/obsidian-plugin/src/vault-link-plugin.ts
index 68be059f..1e4fafb7 100644
--- a/frontend/obsidian-plugin/src/vault-link-plugin.ts
+++ b/frontend/obsidian-plugin/src/vault-link-plugin.ts
@@ -27,7 +27,7 @@ export default class VaultLinkPlugin extends Plugin {
 	>();
 
 	public async onload(): Promise<void> {
-		DEFAULT_SETTINGS.ignorePatterns.push(".obsidian", ".git");
+		DEFAULT_SETTINGS.ignorePatterns.push(".obsidian/**", ".git/**");
 
 		this.client = await SyncClient.create({
 			fs: new ObsidianFileSystemOperations(
diff --git a/frontend/sync-client/src/utils/globs-to-regexes.test.ts b/frontend/sync-client/src/utils/globs-to-regexes.test.ts
new file mode 100644
index 00000000..ae1643e7
--- /dev/null
+++ b/frontend/sync-client/src/utils/globs-to-regexes.test.ts
@@ -0,0 +1,10 @@
+import { Logger } from "../tracing/logger";
+import { globsToRegex } from "./globs-to-regexes";
+
+describe("globsToRegexes", () => {
+	it("basicExample", async () => {
+		const regex = globsToRegex([".git/**"], new Logger())[0];
+
+		expect(regex.test(".git/objects/object")).toBeTruthy();
+	});
+});
diff --git a/frontend/sync-client/src/utils/globs-to-regexes.ts b/frontend/sync-client/src/utils/globs-to-regexes.ts
new file mode 100644
index 00000000..3839fb99
--- /dev/null
+++ b/frontend/sync-client/src/utils/globs-to-regexes.ts
@@ -0,0 +1,16 @@
+import { makeRe } from "minimatch";
+import { Logger } from "../tracing/logger";
+
+export function globsToRegex(globs: string[], logger: Logger): RegExp[] {
+	return globs
+		.map((pattern) => {
+			const result = makeRe(pattern);
+			if (result === false) {
+				logger.warn(
+					`Failed to parse ${pattern}' as a glob pattern, skipping it`
+				);
+			}
+			return result;
+		})
+		.filter((pattern) => pattern !== false);
+}

From 4040c98754a3db45117ae94aca21e11d8dd5255d Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 24 May 2025 13:23:17 +0100
Subject: [PATCH 503/761] Allow multiple E2E test iterations

---
 frontend/test-client/src/cli.ts | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/frontend/test-client/src/cli.ts b/frontend/test-client/src/cli.ts
index 6e5ede93..ae4f7e84 100644
--- a/frontend/test-client/src/cli.ts
+++ b/frontend/test-client/src/cli.ts
@@ -4,6 +4,8 @@ import { sleep } from "./utils/sleep";
 import { v4 as uuidv4 } from "uuid";
 import { randomCasing } from "./utils/random-casing";
 
+const TEST_ITERATIONS = 5;
+
 // Simulate async file access by injecting waiting time before returning from file operations.
 let slowFileEvents = false;
 
@@ -109,20 +111,22 @@ async function runTest({
 }
 
 async function runTests(): Promise<void> {
-	for (const useSlowFileEvents of [false, true]) {
-		for (const concurrency of [
-			16,
-			1 // test with concurrency 1 to check for deadlocks
-		]) {
-			for (const doDeletes of [true, false]) {
-				await runTest({
-					agentCount: 2,
-					concurrency,
-					iterations: 100,
-					doDeletes,
-					useSlowFileEvents,
-					jitterScaleInSeconds: 0.75
-				});
+	for (let i = 0; i < TEST_ITERATIONS; i++) {
+		for (const useSlowFileEvents of [false, true]) {
+			for (const concurrency of [
+				16,
+				1 // test with concurrency 1 to check for deadlocks
+			]) {
+				for (const doDeletes of [true, false]) {
+					await runTest({
+						agentCount: 2,
+						concurrency,
+						iterations: 100,
+						doDeletes,
+						useSlowFileEvents,
+						jitterScaleInSeconds: 0.75
+					});
+				}
 			}
 		}
 	}

From e0b83bbc7a40649e13542f62ac1e9c6c64296a5f Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 24 May 2025 13:23:24 +0100
Subject: [PATCH 504/761] Rename

---
 frontend/sync-client/src/utils/globs-to-regexes.test.ts | 4 ++--
 frontend/sync-client/src/utils/globs-to-regexes.ts      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/sync-client/src/utils/globs-to-regexes.test.ts b/frontend/sync-client/src/utils/globs-to-regexes.test.ts
index ae1643e7..aec9d885 100644
--- a/frontend/sync-client/src/utils/globs-to-regexes.test.ts
+++ b/frontend/sync-client/src/utils/globs-to-regexes.test.ts
@@ -1,9 +1,9 @@
 import { Logger } from "../tracing/logger";
-import { globsToRegex } from "./globs-to-regexes";
+import { globsToRegexes } from "./globs-to-regexes";
 
 describe("globsToRegexes", () => {
 	it("basicExample", async () => {
-		const regex = globsToRegex([".git/**"], new Logger())[0];
+		const regex = globsToRegexes([".git/**"], new Logger())[0];
 
 		expect(regex.test(".git/objects/object")).toBeTruthy();
 	});
diff --git a/frontend/sync-client/src/utils/globs-to-regexes.ts b/frontend/sync-client/src/utils/globs-to-regexes.ts
index 3839fb99..54ee0a5b 100644
--- a/frontend/sync-client/src/utils/globs-to-regexes.ts
+++ b/frontend/sync-client/src/utils/globs-to-regexes.ts
@@ -1,7 +1,7 @@
 import { makeRe } from "minimatch";
 import { Logger } from "../tracing/logger";
 
-export function globsToRegex(globs: string[], logger: Logger): RegExp[] {
+export function globsToRegexes(globs: string[], logger: Logger): RegExp[] {
 	return globs
 		.map((pattern) => {
 			const result = makeRe(pattern);

From 383e2868c2cc76f5ee782ec6167bf74aaf65ff1a Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 24 May 2025 13:56:06 +0100
Subject: [PATCH 505/761] Small improvements

---
 .../src/file-operations/safe-filesystem-operations.ts       | 2 +-
 frontend/sync-client/src/persistence/database.ts            | 2 +-
 frontend/sync-client/src/sync-operations/syncer.ts          | 6 ++++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts b/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
index 6297af90..304723b2 100644
--- a/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
+++ b/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
@@ -60,7 +60,7 @@ export class SafeFileSystemOperations implements FileSystemOperations {
 	}
 
 	public async getFileSize(path: RelativePath): Promise<number> {
-		this.logger.debug(`Getting size of file '${path}'`);
+		// Logging this would be too noisy
 		return this.safeOperation(
 			path,
 			this.decorateToHoldLock(path, async () =>
diff --git a/frontend/sync-client/src/persistence/database.ts b/frontend/sync-client/src/persistence/database.ts
index 3edbec80..f3b6011e 100644
--- a/frontend/sync-client/src/persistence/database.ts
+++ b/frontend/sync-client/src/persistence/database.ts
@@ -292,7 +292,7 @@ export class Database {
 		return this.lastSeenUpdateIds.min;
 	}
 
-	public addLastSeenUpdateId(value: number): void {
+	public addSeenUpdateId(value: number): void {
 		const previousMin = this.lastSeenUpdateIds.min;
 		this.lastSeenUpdateIds.add(value);
 		if (previousMin !== this.lastSeenUpdateIds.min) {
diff --git a/frontend/sync-client/src/sync-operations/syncer.ts b/frontend/sync-client/src/sync-operations/syncer.ts
index aa7ff7fe..20e50120 100644
--- a/frontend/sync-client/src/sync-operations/syncer.ts
+++ b/frontend/sync-client/src/sync-operations/syncer.ts
@@ -385,7 +385,8 @@ export class Syncer {
 
 		let hasLockToRelease = false;
 		if (document === undefined) {
-			// Let's avoid the same documents getting created in parallel multiple times
+			// Let's avoid the same documents getting created in parallel multiple times.
+			// There might be multiple tasks waiting for the lock
 			await this.remoteDocumentsLock.waitForLock(
 				remoteVersion.documentId
 			);
@@ -396,6 +397,7 @@ export class Syncer {
 		}
 
 		try {
+			// We're either the first one to get the lock, so we have to create the document in `unrestrictedSyncRemotelyUpdatedFile`
 			if (document === undefined) {
 				await this.syncQueue.add(async () =>
 					this.internalSyncer.unrestrictedSyncRemotelyUpdatedFile(
@@ -427,7 +429,7 @@ export class Syncer {
 				}
 			}
 
-			this.database.addLastSeenUpdateId(remoteVersion.vaultUpdateId);
+			this.database.addSeenUpdateId(remoteVersion.vaultUpdateId);
 		} finally {
 			if (hasLockToRelease) {
 				this.remoteDocumentsLock.unlock(remoteVersion.documentId);

From 22a13e015230e7a207a6703c61aa8ad982da58b1 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 24 May 2025 13:56:36 +0100
Subject: [PATCH 506/761] Change file limit from slider to number

---
 .../src/views/settings/settings-tab.ts        | 29 ++++++++++++++-----
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/frontend/obsidian-plugin/src/views/settings/settings-tab.ts b/frontend/obsidian-plugin/src/views/settings/settings-tab.ts
index 31e9182b..c413203d 100644
--- a/frontend/obsidian-plugin/src/views/settings/settings-tab.ts
+++ b/frontend/obsidian-plugin/src/views/settings/settings-tab.ts
@@ -297,15 +297,28 @@ export class SyncSettingsTab extends PluginSettingTab {
 			.setDesc(
 				"Set the maximum file size that can be uploaded to the server. Files larger than this size will be ignored."
 			)
-			.addSlider((slider) =>
-				slider
-					.setLimits(1, 64, 1)
-					.setDynamicTooltip()
-					.setInstant(false)
-					.setValue(this.syncClient.getSettings().maxFileSizeMB)
-					.onChange(async (value) =>
-						this.syncClient.setSetting("maxFileSizeMB", value)
+			.addText((input) =>
+				input
+					.setValue(
+						this.syncClient.getSettings().maxFileSizeMB.toString()
 					)
+					.onChange(async (value) => {
+						if (value === "") {
+							return;
+						}
+						let parsedValue = Number.parseFloat(value);
+						if (Number.isNaN(parsedValue) || parsedValue < 0) {
+							parsedValue =
+								this.syncClient.getSettings().maxFileSizeMB;
+						}
+						this.syncClient.setSetting(
+							"maxFileSizeMB",
+							parsedValue
+						);
+						if (value !== parsedValue.toString()) {
+							input.setValue(parsedValue.toString());
+						}
+					})
 			);
 
 		new Setting(containerEl)

From 5d33b3de7981f2da93d7183291ec91abb5abf0ea Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 24 May 2025 14:05:38 +0100
Subject: [PATCH 507/761] Rename dev version of plugin

---
 frontend/obsidian-plugin/webpack.config.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/obsidian-plugin/webpack.config.js b/frontend/obsidian-plugin/webpack.config.js
index 75c87fb7..2b5a803d 100644
--- a/frontend/obsidian-plugin/webpack.config.js
+++ b/frontend/obsidian-plugin/webpack.config.js
@@ -36,9 +36,9 @@ module.exports = (env, argv) => ({
 				compiler.hooks.done.tap("Copy Files Plugin", (stats) => {
 					const source = path.resolve(__dirname, "dist");
 					const destinations = [
-						"/mnt/c/Users/Andras/Desktop/test/test/.obsidian/plugins/my-plugin",
-						"/mnt/c/Users/Andras/Desktop/test/test2/.obsidian/plugins/my-plugin",
-						"/home/andras/obsidian-test/.obsidian/plugins/my-plugin"
+						"/mnt/c/Users/Andras/Desktop/test/test/.obsidian/plugins/vault-link",
+						"/mnt/c/Users/Andras/Desktop/test/test2/.obsidian/plugins/vault-link",
+						"/home/andras/obsidian-test/.obsidian/plugins/vault-link"
 					];
 					destinations.forEach((destination) => {
 						fs.copy(source, destination)

From 76a17c4221b2ce0a28cd11cb614d4da67bb02fea Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 24 May 2025 14:35:16 +0100
Subject: [PATCH 508/761] Better default ignores

---
 frontend/obsidian-plugin/src/vault-link-plugin.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/frontend/obsidian-plugin/src/vault-link-plugin.ts b/frontend/obsidian-plugin/src/vault-link-plugin.ts
index 1e4fafb7..e889bf9b 100644
--- a/frontend/obsidian-plugin/src/vault-link-plugin.ts
+++ b/frontend/obsidian-plugin/src/vault-link-plugin.ts
@@ -27,7 +27,11 @@ export default class VaultLinkPlugin extends Plugin {
 	>();
 
 	public async onload(): Promise<void> {
-		DEFAULT_SETTINGS.ignorePatterns.push(".obsidian/**", ".git/**");
+		DEFAULT_SETTINGS.ignorePatterns.push(
+			".obsidian/**",
+			".git/**",
+			".trash/**"
+		);
 
 		this.client = await SyncClient.create({
 			fs: new ObsidianFileSystemOperations(

From 31833a9f470700f026ce9fcae584e07c92e3d383 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 24 May 2025 14:35:25 +0100
Subject: [PATCH 509/761] Match dotfiles

---
 frontend/sync-client/src/utils/globs-to-regexes.test.ts | 1 +
 frontend/sync-client/src/utils/globs-to-regexes.ts      | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/frontend/sync-client/src/utils/globs-to-regexes.test.ts b/frontend/sync-client/src/utils/globs-to-regexes.test.ts
index aec9d885..753a8289 100644
--- a/frontend/sync-client/src/utils/globs-to-regexes.test.ts
+++ b/frontend/sync-client/src/utils/globs-to-regexes.test.ts
@@ -6,5 +6,6 @@ describe("globsToRegexes", () => {
 		const regex = globsToRegexes([".git/**"], new Logger())[0];
 
 		expect(regex.test(".git/objects/object")).toBeTruthy();
+		expect(regex.test(".git/objects/.object")).toBeTruthy();
 	});
 });
diff --git a/frontend/sync-client/src/utils/globs-to-regexes.ts b/frontend/sync-client/src/utils/globs-to-regexes.ts
index 54ee0a5b..fdeb445e 100644
--- a/frontend/sync-client/src/utils/globs-to-regexes.ts
+++ b/frontend/sync-client/src/utils/globs-to-regexes.ts
@@ -4,7 +4,9 @@ import { Logger } from "../tracing/logger";
 export function globsToRegexes(globs: string[], logger: Logger): RegExp[] {
 	return globs
 		.map((pattern) => {
-			const result = makeRe(pattern);
+			const result = makeRe(pattern, {
+				dot: true
+			});
 			if (result === false) {
 				logger.warn(
 					`Failed to parse ${pattern}' as a glob pattern, skipping it`

From 0f5bfa3d5eb56b250e1432f0ff20a017e1e09a84 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 24 May 2025 18:45:33 +0100
Subject: [PATCH 510/761] Validate user config

---
 backend/Cargo.lock                            |   7 ++
 backend/config-e2e.yml                        |   7 +-
 backend/sync_server/Cargo.toml                |   1 +
 backend/sync_server/src/config/user_config.rs | 113 +++++++++++++++++-
 4 files changed, 122 insertions(+), 6 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 553ef415..f33914fb 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -362,6 +362,12 @@ version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
 
+[[package]]
+name = "bimap"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "230c5f1ca6a325a32553f8640d31ac9b49f2411e901e427570154868b46da4f7"
+
 [[package]]
 name = "bit-set"
 version = "0.5.3"
@@ -2563,6 +2569,7 @@ dependencies = [
  "axum-extra",
  "axum-jsonschema",
  "axum_typed_multipart",
+ "bimap",
  "chrono",
  "clap",
  "clap-verbosity-flag",
diff --git a/backend/config-e2e.yml b/backend/config-e2e.yml
index 40df4c89..17b745ea 100644
--- a/backend/config-e2e.yml
+++ b/backend/config-e2e.yml
@@ -10,12 +10,17 @@ server:
   response_timeout_seconds: 60
 
 users:
-  user_tokens:
+  user_configs:
     - name: admin
       token: test-token-change-me
       vault_access:
         type: allow_access_to_all
 
+    - name: other-admin
+      token: test-token-change-me2
+      vault_access:
+        type: allow_access_to_all
+
     - name: test
       token: other-test-token
       vault_access:
diff --git a/backend/sync_server/Cargo.toml b/backend/sync_server/Cargo.toml
index b8ff1549..a483ed5c 100644
--- a/backend/sync_server/Cargo.toml
+++ b/backend/sync_server/Cargo.toml
@@ -36,6 +36,7 @@ clap = { version = "4.5.38", features = ["derive"] }
 futures = "0.3.31"
 serde_json = "1.0.140"
 clap-verbosity-flag = "3.0.3"
+bimap = "0.6.3"
 
 [lints]
 workspace = true
diff --git a/backend/sync_server/src/config/user_config.rs b/backend/sync_server/src/config/user_config.rs
index 2450c3aa..ed7ecc23 100644
--- a/backend/sync_server/src/config/user_config.rs
+++ b/backend/sync_server/src/config/user_config.rs
@@ -1,17 +1,47 @@
+use bimap::BiHashMap;
 use rand::{Rng, distr::Alphanumeric, rng};
-use serde::{Deserialize, Serialize};
+use serde::{Deserialize, Deserializer, Serialize, de::Error};
 
 use crate::app_state::database::models::VaultId;
 
 #[derive(Debug, Deserialize, Serialize, Clone)]
 pub struct UserConfig {
-    #[serde(default = "default_users")]
-    pub user_tokens: Vec<User>,
+    #[serde(default = "default_users", deserialize_with = "validate_users")]
+    pub user_configs: Vec<User>,
+}
+
+fn validate_users<'de, D>(deserializer: D) -> Result<Vec<User>, D::Error>
+where
+    D: Deserializer<'de>,
+{
+    let users = Vec::<User>::deserialize(deserializer)?;
+
+    let mut user_token_map = BiHashMap::new();
+    for user in &users {
+        if let Some(existing_name) = user_token_map.get_by_right(&user.token) {
+            return Err(D::Error::custom(format!(
+                "Duplicate user token found: '{}' for users '{}' and '{}'. User tokens must be \
+                 unique.",
+                user.token, existing_name, user.name
+            )));
+        }
+
+        if user_token_map.contains_left(&user.name) {
+            return Err(D::Error::custom(format!(
+                "Duplicate user name found: '{}'. User names must be unique.",
+                user.name
+            )));
+        }
+
+        user_token_map.insert(user.name.clone(), user.token.clone());
+    }
+
+    Ok(users)
 }
 
 impl UserConfig {
     pub fn get_user(&self, token: &str) -> Option<&User> {
-        self.user_tokens.iter().find(|u| u.token == token)
+        self.user_configs.iter().find(|u| u.token == token)
     }
 }
 
@@ -25,7 +55,7 @@ pub struct User {
 impl Default for UserConfig {
     fn default() -> Self {
         Self {
-            user_tokens: default_users(),
+            user_configs: default_users(),
         }
     }
 }
@@ -59,3 +89,76 @@ pub fn get_random_token() -> String {
         .map(char::from)
         .collect()
 }
+#[cfg(test)]
+mod tests {
+    use serde_json::json;
+
+    use super::*;
+
+    #[test]
+    fn test_validate_users_unique_names_and_tokens() {
+        let config_json = json!({
+            "user_configs": [
+                {
+                    "name": "alice",
+                    "token": "token1",
+                    "vault_access": { "type": "allow_access_to_all" }
+                },
+                {
+                    "name": "bob",
+                    "token": "token2",
+                    "vault_access": { "type": "allow_access_to_all" }
+                }
+            ]
+        });
+
+        let config: Result<UserConfig, _> = serde_json::from_value(config_json);
+        assert!(config.is_ok());
+    }
+
+    #[test]
+    fn test_validate_users_duplicate_names() {
+        let config_json = json!({
+            "user_configs": [
+                {
+                    "name": "alice",
+                    "token": "token1",
+                    "vault_access": { "type": "allow_access_to_all" }
+                },
+                {
+                    "name": "alice",
+                    "token": "token2",
+                    "vault_access": { "type": "allow_access_to_all" }
+                }
+            ]
+        });
+
+        let config: Result<UserConfig, _> = serde_json::from_value(config_json);
+        assert!(config.is_err());
+        let err = config.unwrap_err().to_string();
+        assert!(err.contains("Duplicate user name found"));
+    }
+
+    #[test]
+    fn test_validate_users_duplicate_tokens() {
+        let config_json = json!({
+            "user_configs": [
+                {
+                    "name": "alice",
+                    "token": "token1",
+                    "vault_access": { "type": "allow_access_to_all" }
+                },
+                {
+                    "name": "bob",
+                    "token": "token1",
+                    "vault_access": { "type": "allow_access_to_all" }
+                }
+            ]
+        });
+
+        let config: Result<UserConfig, _> = serde_json::from_value(config_json);
+        assert!(config.is_err());
+        let err = config.unwrap_err().to_string();
+        assert!(err.contains("Duplicate user token found"));
+    }
+}

From 063d78fad5748f10943294605de27938aed86ea7 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 24 May 2025 18:51:59 +0100
Subject: [PATCH 511/761] Support more history entry types

---
 frontend/sync-client/src/index.ts             |  7 +-
 .../sync-client/src/tracing/sync-history.ts   | 81 ++++++++++++++-----
 2 files changed, 69 insertions(+), 19 deletions(-)

diff --git a/frontend/sync-client/src/index.ts b/frontend/sync-client/src/index.ts
index 324312b5..7079f707 100644
--- a/frontend/sync-client/src/index.ts
+++ b/frontend/sync-client/src/index.ts
@@ -2,7 +2,12 @@ export {
 	SyncType,
 	SyncStatus,
 	type HistoryStats,
-	type HistoryEntry
+	type HistoryEntry,
+	type SyncDetails,
+	type SyncCreateDetails,
+	type SyncUpdateDetails,
+	type SyncMovedDetails,
+	type SyncDeleteDetails
 } from "./tracing/sync-history";
 export { Logger, LogLevel, LogLine } from "./tracing/logger";
 export { type SyncSettings, DEFAULT_SETTINGS } from "./persistence/settings";
diff --git a/frontend/sync-client/src/tracing/sync-history.ts b/frontend/sync-client/src/tracing/sync-history.ts
index 38f8320c..40a27ea8 100644
--- a/frontend/sync-client/src/tracing/sync-history.ts
+++ b/frontend/sync-client/src/tracing/sync-history.ts
@@ -1,17 +1,55 @@
 import type { RelativePath } from "../persistence/database";
 import type { Logger } from "./logger";
 
+export interface SyncCreateDetails {
+	type: SyncType.CREATE;
+	relativePath: RelativePath;
+	author?: string;
+}
+
+export interface SyncUpdateDetails {
+	type: SyncType.UPDATE;
+	relativePath: RelativePath;
+	author?: string;
+}
+
+export interface SyncMovedDetails {
+	type: SyncType.MOVE;
+	relativePath: RelativePath;
+	movedFrom: RelativePath;
+	author?: string;
+}
+
+export interface SyncDeleteDetails {
+	type: SyncType.DELETE;
+	relativePath: RelativePath;
+	author?: string;
+}
+
+export interface SyncSkippedDetails {
+	type: SyncType.SKIPPED;
+	relativePath: RelativePath;
+}
+
+export type SyncDetails =
+	| SyncCreateDetails
+	| SyncUpdateDetails
+	| SyncDeleteDetails
+	| SyncMovedDetails
+	| SyncSkippedDetails;
+
 export interface CommonHistoryEntry {
 	status: SyncStatus;
-	relativePath: RelativePath;
 	message: string;
-	type?: SyncType;
+	details: SyncDetails;
 }
 
 export enum SyncType {
 	CREATE = "CREATE",
 	UPDATE = "UPDATE",
-	DELETE = "DELETE"
+	DELETE = "DELETE",
+	MOVE = "MOVE",
+	SKIPPED = "SKIPPED"
 }
 
 export enum SyncStatus {
@@ -28,8 +66,8 @@ export interface HistoryStats {
 }
 
 export class SyncHistory {
-	private static readonly MAX_ENTRIES = 500;
-	private static readonly TIMEOUT_FOR_MERGING_ENTRIES_IN_SECONDS = 15;
+	private static readonly MAX_ENTRIES = 5000;
+	private static readonly TIMEOUT_FOR_MERGING_ENTRIES_IN_SECONDS = 60;
 
 	private _entries: HistoryEntry[] = [];
 
@@ -60,7 +98,7 @@ export class SyncHistory {
 			timestamp: new Date()
 		};
 
-		const candidate = this.findSimilarRecentEntry(historyEntry);
+		const candidate = this.findSimilarRecentUpdateEntry(historyEntry);
 		if (candidate !== undefined) {
 			this._entries = this._entries.filter((e) => e !== candidate);
 		}
@@ -93,11 +131,17 @@ export class SyncHistory {
 		});
 	}
 
-	private findSimilarRecentEntry(
+	private findSimilarRecentUpdateEntry(
 		entry: HistoryEntry
 	): HistoryEntry | undefined {
+		if (entry.details.type !== SyncType.UPDATE) {
+			return;
+		}
+
 		const candidate = this._entries.find(
-			(e) => e.relativePath === entry.relativePath
+			(e) =>
+				e.details.type === SyncType.UPDATE &&
+				e.details.relativePath === entry.details.relativePath
 		);
 		if (
 			candidate !== undefined &&
@@ -111,17 +155,18 @@ export class SyncHistory {
 	}
 
 	private updateSuccessCount(entry: HistoryEntry): void {
-		if (entry.status === SyncStatus.SUCCESS) {
-			this.status.success++;
-			this.logger.info(
-				`History entry: ${entry.relativePath} - ${entry.message}`
-			);
-		} else {
-			this.status.error++;
-			this.logger.error(
-				`Cannot sync file: ${entry.relativePath} - ${entry.message}`
-			);
+		const message = `${entry.details.relativePath} - ${entry.message} (${entry.details.type.toLocaleLowerCase()})`;
+		switch (entry.status) {
+			case SyncStatus.SUCCESS:
+				this.status.success++;
+				this.logger.info(`History entry: ${message}`);
+				break;
+			case SyncStatus.ERROR:
+				this.status.error++;
+				this.logger.error(`Cannot sync file: ${message}`);
+				break;
 		}
+
 		this.syncHistoryUpdateListeners.forEach((listener) => {
 			listener(this.status);
 		});

From 1b21e194cfc9001fe4e63193090c25830c918279 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 24 May 2025 19:02:27 +0100
Subject: [PATCH 512/761] Update types

---
 frontend/sync-client/src/tracing/sync-history.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/sync-client/src/tracing/sync-history.ts b/frontend/sync-client/src/tracing/sync-history.ts
index 40a27ea8..4cc5e77e 100644
--- a/frontend/sync-client/src/tracing/sync-history.ts
+++ b/frontend/sync-client/src/tracing/sync-history.ts
@@ -4,26 +4,22 @@ import type { Logger } from "./logger";
 export interface SyncCreateDetails {
 	type: SyncType.CREATE;
 	relativePath: RelativePath;
-	author?: string;
 }
 
 export interface SyncUpdateDetails {
 	type: SyncType.UPDATE;
 	relativePath: RelativePath;
-	author?: string;
 }
 
 export interface SyncMovedDetails {
 	type: SyncType.MOVE;
 	relativePath: RelativePath;
 	movedFrom: RelativePath;
-	author?: string;
 }
 
 export interface SyncDeleteDetails {
 	type: SyncType.DELETE;
 	relativePath: RelativePath;
-	author?: string;
 }
 
 export interface SyncSkippedDetails {
@@ -42,6 +38,7 @@ export interface CommonHistoryEntry {
 	status: SyncStatus;
 	message: string;
 	details: SyncDetails;
+	author?: string;
 }
 
 export enum SyncType {
@@ -165,6 +162,9 @@ export class SyncHistory {
 				this.status.error++;
 				this.logger.error(`Cannot sync file: ${message}`);
 				break;
+			case SyncStatus.SKIPPED:
+				this.logger.error(`Skipping file: ${message}`);
+				break;
 		}
 
 		this.syncHistoryUpdateListeners.forEach((listener) => {

From 5c8b02f69c37f014706c5c845e971cca2d092fc4 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 24 May 2025 19:02:50 +0100
Subject: [PATCH 513/761] Lint

---
 .../obsidian-plugin/src/views/settings/settings-tab.ts | 10 ++++++----
 .../sync-client/src/utils/globs-to-regexes.test.ts     |  2 +-
 frontend/sync-client/src/utils/globs-to-regexes.ts     |  2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/frontend/obsidian-plugin/src/views/settings/settings-tab.ts b/frontend/obsidian-plugin/src/views/settings/settings-tab.ts
index c413203d..34d1760a 100644
--- a/frontend/obsidian-plugin/src/views/settings/settings-tab.ts
+++ b/frontend/obsidian-plugin/src/views/settings/settings-tab.ts
@@ -311,13 +311,15 @@ export class SyncSettingsTab extends PluginSettingTab {
 							parsedValue =
 								this.syncClient.getSettings().maxFileSizeMB;
 						}
-						this.syncClient.setSetting(
-							"maxFileSizeMB",
-							parsedValue
-						);
+
 						if (value !== parsedValue.toString()) {
 							input.setValue(parsedValue.toString());
 						}
+
+						return this.syncClient.setSetting(
+							"maxFileSizeMB",
+							parsedValue
+						);
 					})
 			);
 
diff --git a/frontend/sync-client/src/utils/globs-to-regexes.test.ts b/frontend/sync-client/src/utils/globs-to-regexes.test.ts
index 753a8289..71639a38 100644
--- a/frontend/sync-client/src/utils/globs-to-regexes.test.ts
+++ b/frontend/sync-client/src/utils/globs-to-regexes.test.ts
@@ -3,7 +3,7 @@ import { globsToRegexes } from "./globs-to-regexes";
 
 describe("globsToRegexes", () => {
 	it("basicExample", async () => {
-		const regex = globsToRegexes([".git/**"], new Logger())[0];
+		const [regex] = globsToRegexes([".git/**"], new Logger());
 
 		expect(regex.test(".git/objects/object")).toBeTruthy();
 		expect(regex.test(".git/objects/.object")).toBeTruthy();
diff --git a/frontend/sync-client/src/utils/globs-to-regexes.ts b/frontend/sync-client/src/utils/globs-to-regexes.ts
index fdeb445e..1e8ad775 100644
--- a/frontend/sync-client/src/utils/globs-to-regexes.ts
+++ b/frontend/sync-client/src/utils/globs-to-regexes.ts
@@ -1,5 +1,5 @@
 import { makeRe } from "minimatch";
-import { Logger } from "../tracing/logger";
+import type { Logger } from "../tracing/logger";
 
 export function globsToRegexes(globs: string[], logger: Logger): RegExp[] {
 	return globs

From f93ca447d8e1f049b33208138c87c5f58a26e51e Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 24 May 2025 19:05:12 +0100
Subject: [PATCH 514/761] Improve history view UX

---
 .../src/views/history/history-view.scss       |  8 ++++
 .../src/views/history/history-view.ts         | 48 +++++++++++++------
 2 files changed, 42 insertions(+), 14 deletions(-)

diff --git a/frontend/obsidian-plugin/src/views/history/history-view.scss b/frontend/obsidian-plugin/src/views/history/history-view.scss
index deabf59f..6033fd2b 100644
--- a/frontend/obsidian-plugin/src/views/history/history-view.scss
+++ b/frontend/obsidian-plugin/src/views/history/history-view.scss
@@ -17,6 +17,10 @@
 		background-color: rgba(var(--color-red-rgb), 0.2);
 	}
 
+	&.skipped {
+		background-color: rgba(var(--color-green-rgb), 0.08);
+	}
+
 	.history-card-header {
 		display: flex;
 		justify-content: space-between;
@@ -36,6 +40,10 @@
 			gap: var(--size-4-2);
 			word-break: break-all;
 			margin: 0;
+
+			> span {
+				margin-bottom: var(--size-4-1);
+			}
 		}
 
 		.history-card-timestamp {
diff --git a/frontend/obsidian-plugin/src/views/history/history-view.ts b/frontend/obsidian-plugin/src/views/history/history-view.ts
index d766e754..ea1803fa 100644
--- a/frontend/obsidian-plugin/src/views/history/history-view.ts
+++ b/frontend/obsidian-plugin/src/views/history/history-view.ts
@@ -42,6 +42,10 @@ export class HistoryView extends ItemView {
 				return "trash-2";
 			case SyncType.UPDATE:
 				return "file-pen-line";
+			case SyncType.MOVE:
+				return "move-right";
+			case SyncType.SKIPPED:
+				return "circle-slash";
 			case undefined:
 			default:
 				return "";
@@ -52,13 +56,17 @@ export class HistoryView extends ItemView {
 		element: HTMLElement,
 		entry: HistoryEntry
 	): void {
-		const syncTypeIcon = HistoryView.getSyncTypeIcon(entry.type);
+		const syncTypeIcon = HistoryView.getSyncTypeIcon(entry.details.type);
 		if (syncTypeIcon) {
 			setIcon(element.createDiv(), syncTypeIcon);
 		}
 
+		const fileName = entry.details.relativePath.split("/").pop();
 		element.createEl("span", {
-			text: entry.relativePath.split("/").pop()
+			text:
+				entry.details.type === SyncType.SKIPPED
+					? `Skipped: ${fileName}`
+					: fileName
 		});
 	}
 
@@ -69,14 +77,21 @@ export class HistoryView extends ItemView {
 		const timestampElement = element.querySelector(
 			".history-card-timestamp"
 		);
+
 		if (timestampElement != null) {
-			timestampElement.textContent = intlFormatDistance(
-				entry.timestamp,
-				new Date()
-			);
+			timestampElement.textContent =
+				HistoryView.getTimestampAndAuthor(entry);
 		}
 	}
 
+	private static getTimestampAndAuthor(entry: HistoryEntry): string {
+		let content = intlFormatDistance(entry.timestamp, new Date());
+		if ("author" in entry && entry.author !== undefined) {
+			content += ` by ${entry.author}`;
+		}
+		return content;
+	}
+
 	public getViewType(): string {
 		return HistoryView.TYPE;
 	}
@@ -152,11 +167,14 @@ export class HistoryView extends ItemView {
 				cls: ["history-card", entry.status.toLocaleLowerCase()]
 			},
 			(card) => {
-				if (this.app.vault.getFileByPath(entry.relativePath) !== null) {
+				if (
+					this.app.vault.getFileByPath(entry.details.relativePath) !==
+					null
+				) {
 					card.addEventListener("click", () => {
 						void this.app.workspace.openLinkText(
-							entry.relativePath,
-							entry.relativePath,
+							entry.details.relativePath,
+							entry.details.relativePath,
 							false
 						);
 					});
@@ -180,17 +198,19 @@ export class HistoryView extends ItemView {
 						);
 
 						header.createSpan({
-							text: intlFormatDistance(
-								entry.timestamp,
-								new Date()
-							),
+							text: HistoryView.getTimestampAndAuthor(entry),
 							cls: "history-card-timestamp"
 						});
 					}
 				);
 
+				const body =
+					entry.details.type === SyncType.MOVE
+						? `${entry.message}. Moved from '${entry.details.movedFrom}' to '${entry.details.relativePath}'`
+						: `${entry.message}.`;
+
 				card.createEl("p", {
-					text: `${entry.message}.`,
+					text: body,
 					cls: "history-card-message"
 				});
 			}

From a34003930110927794b5d6397ed941b55633cba2 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 25 May 2025 09:57:22 +0100
Subject: [PATCH 515/761] Remove double-delete notifications

---
 frontend/sync-client/src/sync-operations/syncer.ts | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/frontend/sync-client/src/sync-operations/syncer.ts b/frontend/sync-client/src/sync-operations/syncer.ts
index 20e50120..7b4ce461 100644
--- a/frontend/sync-client/src/sync-operations/syncer.ts
+++ b/frontend/sync-client/src/sync-operations/syncer.ts
@@ -155,6 +155,18 @@ export class Syncer {
 	public async syncLocallyDeletedFile(
 		relativePath: RelativePath
 	): Promise<void> {
+		if (
+			this.database.getLatestDocumentByRelativePath(relativePath)
+				?.isDeleted === true
+		) {
+			// This is must be a consequence of us deleting a file because of a remote update
+			// which triggered a local delete, so we don't need to do anything here.
+			this.logger.debug(
+				`Document ${relativePath} has already been markes as deleted, skipping`
+			);
+			return;
+		}
+
 		// We have to have a record of the delete in case there's an in-flight update for the same
 		// document which finishes after the delete has succeeded and would introduce a phantom metadata record.
 		this.database.delete(relativePath);

From d59203b5b90db68d88c033ac111be470c4716f08 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 25 May 2025 11:35:20 +0100
Subject: [PATCH 516/761] Improve vault history messages

---
 .../sync-client/src/persistence/database.ts   |   6 +-
 .../sync-client/src/sync-operations/syncer.ts |  37 +-
 .../sync-operations/unrestricted-syncer.ts    | 700 ++++++++++--------
 3 files changed, 404 insertions(+), 339 deletions(-)

diff --git a/frontend/sync-client/src/persistence/database.ts b/frontend/sync-client/src/persistence/database.ts
index f3b6011e..824ac6e7 100644
--- a/frontend/sync-client/src/persistence/database.ts
+++ b/frontend/sync-client/src/persistence/database.ts
@@ -9,12 +9,14 @@ export type RelativePath = string;
 export interface DocumentMetadata {
 	parentVersionId: VaultUpdateId;
 	hash: string;
+	remoteRelativePath?: RelativePath;
 }
 
 export interface StoredDocumentMetadata {
 	relativePath: RelativePath;
 	documentId: DocumentId;
 	parentVersionId: VaultUpdateId;
+	remoteRelativePath?: RelativePath;
 	hash: string;
 }
 
@@ -120,6 +122,7 @@ export class Database {
 		metadata: {
 			parentVersionId: VaultUpdateId;
 			hash: string;
+			remoteRelativePath: RelativePath;
 		},
 		toUpdate: DocumentRecord
 	): void {
@@ -221,7 +224,8 @@ export class Database {
 			documentId,
 			metadata: {
 				parentVersionId,
-				hash: EMPTY_HASH
+				hash: EMPTY_HASH,
+				remoteRelativePath: relativePath
 			},
 			isDeleted: false,
 			updates: [],
diff --git a/frontend/sync-client/src/sync-operations/syncer.ts b/frontend/sync-client/src/sync-operations/syncer.ts
index 7b4ce461..e141ce9d 100644
--- a/frontend/sync-client/src/sync-operations/syncer.ts
+++ b/frontend/sync-client/src/sync-operations/syncer.ts
@@ -200,25 +200,38 @@ export class Syncer {
 		oldPath?: RelativePath;
 		relativePath: RelativePath;
 	}): Promise<void> {
-		if (
-			oldPath !== undefined &&
-			(this.database.getLatestDocumentByRelativePath(relativePath) ===
-				undefined ||
+		if (oldPath !== undefined) {
+			// We might have moved the document in the database before calling this method,
+			// in that case, we mustn't move it again.
+			if (
+				this.database.getLatestDocumentByRelativePath(relativePath) ===
+					undefined ||
 				this.database.getLatestDocumentByRelativePath(relativePath)
-					?.isDeleted === true)
-		) {
-			if (oldPath === relativePath) {
-				throw new Error(
-					`Old path and new path are the same: ${oldPath}`
-				);
-			}
+					?.isDeleted === true
+			) {
+				if (oldPath === relativePath) {
+					throw new Error(
+						`Old path and new path are the same: ${oldPath}`
+					);
+				}
 
-			this.database.move(oldPath, relativePath);
+				this.database.move(oldPath, relativePath);
+			}
 		}
 
 		let document =
 			this.database.getLatestDocumentByRelativePath(relativePath);
 
+		if (
+			oldPath !== undefined &&
+			document?.metadata?.remoteRelativePath === relativePath
+		) {
+			this.logger.debug(
+				`Document ${relativePath} has been moved as a result of a remote update, skipping sync`
+			);
+			return;
+		}
+
 		if (document === undefined) {
 			this.logger.debug(
 				`Cannot find document ${relativePath} in the database, skipping`
diff --git a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
index 58e88943..b9780939 100644
--- a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
+++ b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
@@ -6,7 +6,15 @@ import type {
 
 import type { SyncService } from "../services/sync-service";
 import type { Logger } from "../tracing/logger";
-import type { SyncHistory } from "../tracing/sync-history";
+import type {
+	CommonHistoryEntry,
+	SyncCreateDetails,
+	SyncDeleteDetails,
+	SyncDetails,
+	SyncHistory,
+	SyncMovedDetails,
+	SyncUpdateDetails
+} from "../tracing/sync-history";
 import { SyncStatus, SyncType } from "../tracing/sync-history";
 import { EMPTY_HASH, hash } from "../utils/hash";
 import type { components } from "../services/types";
@@ -16,7 +24,7 @@ import type { FileOperations } from "../file-operations/file-operations";
 import { createPromise } from "../utils/create-promise";
 import { FileNotFoundError } from "../file-operations/file-not-found-error";
 import { SyncResetError } from "../services/sync-reset-error";
-import { makeRe } from "minimatch";
+import { globsToRegexes } from "../utils/globs-to-regexes";
 
 export class UnrestrictedSyncer {
 	private ignorePatterns: RegExp[];
@@ -29,90 +37,97 @@ export class UnrestrictedSyncer {
 		private readonly operations: FileOperations,
 		private readonly history: SyncHistory
 	) {
-		this.ignorePatterns = this.globsToRegex(
-			this.settings.getSettings().ignorePatterns
+		this.ignorePatterns = globsToRegexes(
+			this.settings.getSettings().ignorePatterns,
+			this.logger
 		);
 
 		this.settings.addOnSettingsChangeListener((newSettings) => {
-			this.ignorePatterns = this.globsToRegex(newSettings.ignorePatterns);
+			this.ignorePatterns = globsToRegexes(
+				newSettings.ignorePatterns,
+				this.logger
+			);
 		});
 	}
 
 	public async unrestrictedSyncLocallyCreatedFile(
 		document: DocumentRecord
 	): Promise<void> {
-		return this.executeSync(
-			document.relativePath,
-			SyncType.CREATE,
-			async () => {
-				if (document.isDeleted) {
-					this.logger.debug(
-						`Document ${document.relativePath} has been already deleted, no need to update it`
-					);
-					return;
-				}
+		const updateDetails: SyncCreateDetails = {
+			type: SyncType.CREATE,
+			relativePath: document.relativePath
+		};
 
-				const contentBytes = await this.operations.read(
-					document.relativePath
-				); // this can throw FileNotFoundError
-				const contentHash = hash(contentBytes);
-
-				const response = await this.syncService.create({
-					documentId: document.documentId,
-					relativePath: document.relativePath,
-					contentBytes
-				});
-
-				this.history.addHistoryEntry({
-					status: SyncStatus.SUCCESS,
-					relativePath: document.relativePath,
-					message: `Successfully uploaded locally created file`,
-					type: SyncType.CREATE
-				});
-
-				this.database.updateDocumentMetadata(
-					{
-						parentVersionId: response.vaultUpdateId,
-						hash: contentHash
-					},
-					document
+		return this.executeSync(updateDetails, async () => {
+			if (document.isDeleted) {
+				this.logger.debug(
+					`Document ${document.relativePath} has been already deleted, no need to create it`
 				);
-
-				this.database.addLastSeenUpdateId(response.vaultUpdateId);
+				return;
 			}
-		);
+
+			const contentBytes = await this.operations.read(
+				document.relativePath
+			); // this can throw FileNotFoundError
+			const contentHash = hash(contentBytes);
+
+			const response = await this.syncService.create({
+				documentId: document.documentId,
+				relativePath: document.relativePath,
+				contentBytes
+			});
+
+			this.database.updateDocumentMetadata(
+				{
+					parentVersionId: response.vaultUpdateId,
+					hash: contentHash,
+					remoteRelativePath: response.relativePath
+				},
+				document
+			);
+
+			this.database.addSeenUpdateId(response.vaultUpdateId);
+
+			this.history.addHistoryEntry({
+				status: SyncStatus.SUCCESS,
+				details: updateDetails,
+				message: `Successfully uploaded locally created file`
+			});
+		});
 	}
 
 	public async unrestrictedSyncLocallyDeletedFile(
 		document: DocumentRecord
 	): Promise<void> {
-		await this.executeSync(
-			document.relativePath,
-			SyncType.DELETE,
-			async () => {
-				const response = await this.syncService.delete({
-					documentId: document.documentId,
-					relativePath: document.relativePath
-				});
+		const updateDetails: SyncDeleteDetails = {
+			type: SyncType.DELETE,
+			relativePath: document.relativePath
+		};
 
-				this.history.addHistoryEntry({
-					status: SyncStatus.SUCCESS,
-					relativePath: document.relativePath,
-					message: `Successfully deleted locally deleted file on the remote server`,
-					type: SyncType.DELETE
-				});
+		await this.executeSync(updateDetails, async () => {
+			const response = await this.syncService.delete({
+				documentId: document.documentId,
+				relativePath: document.relativePath
+			});
 
-				this.database.updateDocumentMetadata(
-					{
-						parentVersionId: response.vaultUpdateId,
-						hash: EMPTY_HASH
-					},
-					document
-				);
+			this.database.updateDocumentMetadata(
+				{
+					parentVersionId: response.vaultUpdateId,
+					hash: EMPTY_HASH,
+					remoteRelativePath: document.relativePath
+				},
+				document
+			);
 
-				this.database.addLastSeenUpdateId(response.vaultUpdateId);
-			}
-		);
+			this.database.addSeenUpdateId(response.vaultUpdateId);
+
+			this.history.addHistoryEntry({
+				status: SyncStatus.SUCCESS,
+				details: updateDetails,
+				message: `Successfully deleted locally deleted file on the server`,
+				author: response.userId
+			});
+		});
 	}
 
 	public async unrestrictedSyncLocallyUpdatedFile({
@@ -126,299 +141,327 @@ export class UnrestrictedSyncer {
 		force?: boolean;
 		document: DocumentRecord;
 	}): Promise<void> {
-		await this.executeSync(
-			document.relativePath,
-			SyncType.UPDATE,
-			async () => {
-				const originalRelativePath = document.relativePath;
-
-				if (document.isDeleted || document.metadata === undefined) {
-					this.logger.debug(
-						`Document ${document.relativePath} has been already deleted, no need to update it`
-					);
-					return;
-				}
-
-				const contentBytes = await this.operations.read(
-					document.relativePath
-				); // this can throw FileNotFoundError
-				let contentHash = hash(contentBytes);
-
-				let response:
-					| components["schemas"]["DocumentVersion"]
-					| components["schemas"]["DocumentUpdateResponse"]
-					| undefined = undefined;
-				if (
-					document.metadata.hash === contentHash &&
-					oldPath === undefined
-				) {
-					if (!force) {
-						this.logger.debug(
-							`File hash of ${document.relativePath} matches with last synced version and the path hasn't changed; no need to sync`
-						);
-						return;
-					}
-
-					response = await this.syncService.get({
-						documentId: document.documentId
-					});
-				} else {
-					response = await this.syncService.put({
-						documentId: document.documentId,
-						parentVersionId: document.metadata.parentVersionId,
+		const updateDetails: SyncUpdateDetails | SyncMovedDetails =
+			oldPath !== undefined
+				? {
+						type: SyncType.MOVE,
 						relativePath: document.relativePath,
-						contentBytes
-					});
-				}
+						movedFrom: oldPath
+					}
+				: {
+						type: SyncType.UPDATE,
+						relativePath: document.relativePath
+					};
 
-				// `document` is mutable and reflects the latest state in the local database
-				// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-				if (document.isDeleted) {
-					this.logger.info(
-						`Document ${document.relativePath} has been deleted before we could finish updating it`
-					);
-					this.database.addLastSeenUpdateId(response.vaultUpdateId);
-					return;
-				}
+		await this.executeSync(updateDetails, async () => {
+			const originalRelativePath = document.relativePath;
 
-				// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-				if (document.metadata === undefined) {
-					throw new Error(
-						`Document ${document.relativePath} no longer has metadata after updating it, this cannot happen`
-					);
-				}
+			if (document.isDeleted || document.metadata === undefined) {
+				this.logger.debug(
+					`Document ${document.relativePath} has been already deleted, no need to update it`
+				);
+				return;
+			}
 
-				if (
-					// `Syncer` creates fake local document metadata for all remote docs with invalid hashes. The parent IDs will likely match
-					// the latest versions so we still need to update the local versions to turn the fakes into real metadata.
-					document.metadata.parentVersionId > response.vaultUpdateId
-				) {
+			const contentBytes = await this.operations.read(
+				document.relativePath
+			); // this can throw FileNotFoundError
+			let contentHash = hash(contentBytes);
+
+			const areThereLocalChanges = !(
+				document.metadata.hash === contentHash && oldPath === undefined
+			);
+
+			let response:
+				| components["schemas"]["DocumentVersion"]
+				| components["schemas"]["DocumentUpdateResponse"]
+				| undefined = undefined;
+
+			if (areThereLocalChanges) {
+				response = await this.syncService.put({
+					documentId: document.documentId,
+					parentVersionId: document.metadata.parentVersionId,
+					relativePath: document.relativePath,
+					contentBytes
+				});
+			} else {
+				if (!force) {
 					this.logger.debug(
-						`Document ${document.relativePath} is already more up to date than the fetched version`
+						`File hash of ${document.relativePath} matches with last synced version and the path hasn't changed; no need to sync`
 					);
-					this.database.addLastSeenUpdateId(response.vaultUpdateId); // in case the previous `vaultUpdateId` update hasn't made it through
 					return;
 				}
 
+				response = await this.syncService.get({
+					documentId: document.documentId
+				});
+			}
+
+			// `document` is mutable and reflects the latest state in the local database
+			// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+			if (document.isDeleted) {
+				this.logger.info(
+					`Document ${document.relativePath} has been deleted before we could finish updating it`
+				);
+				this.database.addSeenUpdateId(response.vaultUpdateId);
+				return;
+			}
+
+			if (
+				// `Syncer` creates fake local document metadata for all remote docs with invalid hashes. The parent IDs will likely match
+				// the latest versions so we still need to update the local versions to turn the fakes into real metadata.
+				document.metadata.parentVersionId > response.vaultUpdateId
+			) {
+				this.logger.debug(
+					`Document ${document.relativePath} is already more up to date than the fetched version`
+				);
+				this.database.addSeenUpdateId(response.vaultUpdateId); // in case the previous `vaultUpdateId` update hasn't made it through
+				return;
+			}
+
+			if (response.isDeleted) {
+				this.history.addHistoryEntry({
+					status: SyncStatus.SUCCESS,
+					details: {
+						type: SyncType.DELETE,
+						relativePath: document.relativePath
+					},
+					message:
+						"File has been deleted remotely, so we deleted it locally",
+					author: response.userId
+				});
+
+				this.database.delete(document.relativePath);
+				this.database.updateDocumentMetadata(
+					{
+						parentVersionId: response.vaultUpdateId,
+						hash: EMPTY_HASH,
+						remoteRelativePath: response.relativePath
+					},
+					document
+				);
+
+				await this.operations.delete(document.relativePath);
+
+				this.database.addSeenUpdateId(response.vaultUpdateId);
+
+				return;
+			}
+
+			let actualPath = document.relativePath;
+
+			if (response.relativePath != originalRelativePath) {
+				actualPath = response.relativePath;
+				// Make sure to update the remote relative path to avoid uploading
+				// the file as a result of this filesystem event.
+				document.metadata.remoteRelativePath = response.relativePath;
+				await this.operations.move(
+					document.relativePath,
+					response.relativePath
+				); // this can throw FileNotFoundError
+			}
+
+			if (!("type" in response) || response.type === "MergingUpdate") {
+				const responseBytes = deserialize(response.contentBase64);
+				contentHash = hash(responseBytes);
+
+				this.database.updateDocumentMetadata(
+					{
+						parentVersionId: response.vaultUpdateId,
+						hash: contentHash,
+						remoteRelativePath: response.relativePath
+					},
+					document
+				);
+
+				await this.operations.write(
+					actualPath,
+					contentBytes,
+					responseBytes
+				);
+
 				if (!force) {
 					this.history.addHistoryEntry({
 						status: SyncStatus.SUCCESS,
-						relativePath: document.relativePath,
-						message: `Successfully uploaded locally updated file to the remote server`,
-						type: SyncType.UPDATE
+						details: updateDetails,
+						message: `The file we updated had been updated remotely, so we downloaded the merged version`
 					});
 				}
-
-				if (response.isDeleted) {
-					this.history.addHistoryEntry({
-						status: SyncStatus.SUCCESS,
-						relativePath: document.relativePath,
-						message:
-							"The file we tried to update had been deleted remotely, therefore, we have deleted it locally",
-						type: SyncType.DELETE
-					});
-
-					this.database.delete(document.relativePath);
-					this.database.updateDocumentMetadata(
-						{
-							parentVersionId: response.vaultUpdateId,
-							hash: EMPTY_HASH
-						},
-						document
-					);
-
-					await this.operations.delete(document.relativePath);
-
-					this.database.addLastSeenUpdateId(response.vaultUpdateId);
-
-					return;
-				}
-
-				let actualPath = document.relativePath;
-
-				if (response.relativePath != originalRelativePath) {
-					actualPath = response.relativePath;
-					await this.operations.move(
-						document.relativePath,
-						response.relativePath
-					); // this can throw FileNotFoundError
-				}
-
-				if (
-					!("type" in response) ||
-					response.type === "MergingUpdate"
-				) {
-					const responseBytes = deserialize(response.contentBase64);
-					contentHash = hash(responseBytes);
-
-					this.database.updateDocumentMetadata(
-						{
-							parentVersionId: response.vaultUpdateId,
-							hash: contentHash
-						},
-						document
-					);
-
-					await this.operations.write(
-						actualPath,
-						contentBytes,
-						responseBytes
-					);
-
-					if (!force) {
-						this.history.addHistoryEntry({
-							status: SyncStatus.SUCCESS,
-							relativePath: document.relativePath,
-							message: `The file we updated had been updated remotely, so we downloaded the merged version`,
-							type: SyncType.UPDATE
-						});
-					}
-				} else {
-					this.database.updateDocumentMetadata(
-						{
-							parentVersionId: response.vaultUpdateId,
-							hash: contentHash
-						},
-						document
-					);
-				}
-
-				this.database.addLastSeenUpdateId(response.vaultUpdateId);
+			} else {
+				this.database.updateDocumentMetadata(
+					{
+						parentVersionId: response.vaultUpdateId,
+						hash: contentHash,
+						remoteRelativePath: response.relativePath
+					},
+					document
+				);
 			}
-		);
+
+			this.database.addSeenUpdateId(response.vaultUpdateId);
+
+			const actualUpdateDetails: SyncUpdateDetails | SyncMovedDetails =
+				oldPath !== undefined ||
+				response.relativePath != originalRelativePath
+					? {
+							type: SyncType.MOVE,
+							relativePath: response.relativePath,
+							movedFrom: originalRelativePath
+						}
+					: {
+							type: SyncType.UPDATE,
+							relativePath: response.relativePath
+						};
+
+			if (areThereLocalChanges) {
+				this.history.addHistoryEntry({
+					status: SyncStatus.SUCCESS,
+					details: actualUpdateDetails,
+					message: `Successfully uploaded locally updated file to the server`,
+					author: response.userId
+				});
+			} else {
+				this.history.addHistoryEntry({
+					status: SyncStatus.SUCCESS,
+					details: actualUpdateDetails,
+					message: `Successfully downloaded remotely updated file from the server`,
+					author: response.userId
+				});
+			}
+		});
 	}
 
 	public async unrestrictedSyncRemotelyUpdatedFile(
 		remoteVersion: components["schemas"]["DocumentVersionWithoutContent"],
 		document?: DocumentRecord
 	): Promise<void> {
-		await this.executeSync(
-			remoteVersion.relativePath,
-			SyncType.UPDATE,
-			async () => {
-				if (document?.metadata !== undefined) {
-					// If the file exists locally, let's pretend the user has updated it
-					// and deal with remote update/deletion within `unrestrictedSyncLocallyUpdatedFile`
-					if (
-						document.metadata.parentVersionId >=
-						remoteVersion.vaultUpdateId
-					) {
-						this.logger.debug(
-							`Document ${remoteVersion.relativePath} is already at least as up to date as the fetched version`
-						);
-
-						return;
-					}
-
-					return this.unrestrictedSyncLocallyUpdatedFile({
-						document,
-						force: true
-					});
-				} else if (remoteVersion.isDeleted) {
-					// Either the doc hasn't made it to us before and therefore we don't need to delete it,
-					// or we already have it, in which case the preceeding if will deal with it
-					this.logger.debug(
-						`Document ${remoteVersion.relativePath} has been deleted remotely, no need to sync`
-					);
-					return;
-				}
-
-				const content = (
-					await this.syncService.get({
-						documentId: remoteVersion.documentId
-					})
-				).contentBase64;
-
-				document = this.database.getDocumentByDocumentId(
-					remoteVersion.documentId
-				);
-
-				if (document?.isDeleted === true) {
-					this.logger.info(
-						`Document ${remoteVersion.relativePath} has been deleted locally before we could finish updating it`
-					);
-					return;
-				}
+		const updateDetails: SyncCreateDetails = {
+			type: SyncType.CREATE,
+			relativePath: remoteVersion.relativePath
+		};
 
+		await this.executeSync(updateDetails, async () => {
+			if (document?.metadata !== undefined) {
+				// If the file exists locally, let's pretend the user has updated it
+				// and deal with remote update/deletion within `unrestrictedSyncLocallyUpdatedFile`
 				if (
-					(document?.metadata?.parentVersionId ?? -1) >=
+					document.metadata.parentVersionId >=
 					remoteVersion.vaultUpdateId
 				) {
 					this.logger.debug(
-						`Document ${remoteVersion.relativePath} is already more up to date than the fetched version`
+						`Document ${remoteVersion.relativePath} is already at least as up to date as the fetched version`
 					);
+
 					return;
 				}
 
-				const contentBytes = deserialize(content);
+				return this.unrestrictedSyncLocallyUpdatedFile({
+					document,
+					force: true
+				});
+			} else if (remoteVersion.isDeleted) {
+				// Either the document hasn't made it to us before and therefore we don't need to delete it,
+				// or we already have it, in which case the preceeding if would've dealt with it
+				this.logger.debug(
+					`Document ${remoteVersion.relativePath} has been deleted remotely, no need to sync`
+				);
+				return;
+			}
 
-				await this.operations.ensureClearPath(
+			// Don't download oversized files
+			const historyEntryForSkippedOversizedFile =
+				this.getHistoryEntryForSkippedOversizedFile(
+					remoteVersion.contentSize,
 					remoteVersion.relativePath
 				);
-
-				const [promise, resolve] = createPromise();
-				this.database.updateDocumentMetadata(
-					{
-						parentVersionId: remoteVersion.vaultUpdateId,
-						hash: hash(contentBytes)
-					},
-					this.database.createNewPendingDocument(
-						remoteVersion.documentId,
-						remoteVersion.relativePath,
-						promise
-					)
+			if (historyEntryForSkippedOversizedFile !== undefined) {
+				this.history.addHistoryEntry(
+					historyEntryForSkippedOversizedFile
 				);
-
-				await this.operations.create(
-					remoteVersion.relativePath,
-					contentBytes
-				);
-
-				resolve();
-				this.database.removeDocumentPromise(promise);
-
-				this.history.addHistoryEntry({
-					status: SyncStatus.SUCCESS,
-					relativePath: remoteVersion.relativePath,
-					message: `Successfully downloaded remote file which hadn't existed locally`,
-					type: SyncType.CREATE
-				});
+				return;
 			}
-		);
+
+			const content = (
+				await this.syncService.get({
+					documentId: remoteVersion.documentId
+				})
+			).contentBase64;
+
+			// We're trying to create an entirely new document that didn't exist locally
+			document = this.database.getDocumentByDocumentId(
+				remoteVersion.documentId
+			);
+			// It can happen that a concurrent sync operation has already created the document, so we can bail here
+			if (document !== undefined) {
+				this.logger.debug(
+					`Document ${remoteVersion.relativePath} has already been created locally, no need to create it again`
+				);
+				return;
+			}
+
+			const contentBytes = deserialize(content);
+
+			await this.operations.ensureClearPath(remoteVersion.relativePath);
+
+			const [promise, resolve] = createPromise();
+			this.database.updateDocumentMetadata(
+				{
+					parentVersionId: remoteVersion.vaultUpdateId,
+					hash: hash(contentBytes),
+					remoteRelativePath: remoteVersion.relativePath
+				},
+				this.database.createNewPendingDocument(
+					remoteVersion.documentId,
+					remoteVersion.relativePath,
+					promise
+				)
+			);
+
+			await this.operations.create(
+				remoteVersion.relativePath,
+				contentBytes
+			);
+
+			resolve();
+			this.database.removeDocumentPromise(promise);
+
+			this.history.addHistoryEntry({
+				status: SyncStatus.SUCCESS,
+				details: updateDetails,
+				message: `Successfully downloaded remote file which hadn't existed locally`,
+				author: remoteVersion.userId
+			});
+		});
 	}
 
 	public async executeSync<T>(
-		relativePath: RelativePath,
-		syncType: SyncType,
+		details: SyncDetails,
 		fn: () => Promise<T>
 	): Promise<T | undefined> {
 		for (const pattern of this.ignorePatterns) {
-			if (pattern.test(relativePath)) {
+			if (pattern.test(details.relativePath)) {
 				this.logger.debug(
-					`File '${relativePath}' is ignored by the ignore pattern: ${pattern}`
+					`File '${details.relativePath}' is ignored by the ignore pattern: ${pattern}`
 				);
 				return; // bail without SKIPPED status because we were told to ignore this file and we shouldn't clutter up the history
 			}
 		}
 
 		try {
-			if (await this.operations.exists(relativePath)) {
-				const sizeInMB = Math.round(
-					(await this.operations.getFileSize(relativePath)) /
-						1024 /
-						1024
+			// Only check the size of files which already exist locally.
+			if (await this.operations.exists(details.relativePath)) {
+				const sizeInBytes = await this.operations.getFileSize(
+					details.relativePath
 				);
-
-				if (sizeInMB > this.settings.getSettings().maxFileSizeMB) {
-					this.history.addHistoryEntry({
-						status: SyncStatus.SKIPPED,
-						relativePath,
-						message: `File size of ${sizeInMB} MB exceeds the maximum file size limit of ${
-							this.settings.getSettings().maxFileSizeMB
-						} MB`,
-						type: syncType
-					});
-
+				const historyEntryForSkippedOversizedFile =
+					this.getHistoryEntryForSkippedOversizedFile(
+						sizeInBytes,
+						details.relativePath
+					);
+				if (historyEntryForSkippedOversizedFile !== undefined) {
+					this.history.addHistoryEntry(
+						historyEntryForSkippedOversizedFile
+					);
 					return;
 				}
 			}
@@ -428,7 +471,7 @@ export class UnrestrictedSyncer {
 			if (e instanceof FileNotFoundError) {
 				// A subsequent sync operation must have been creating to deal with this
 				this.logger.info(
-					`Skiping file '${relativePath}' because it no longer exists when trying to ${syncType.toLocaleLowerCase()} it`
+					`Skiping file '${details.relativePath}' because it no longer exists when trying to ${details.type.toLocaleLowerCase()} it`
 				);
 				return;
 			}
@@ -440,26 +483,31 @@ export class UnrestrictedSyncer {
 			} else {
 				this.history.addHistoryEntry({
 					status: SyncStatus.ERROR,
-					relativePath,
-					message: `Failed to sync file '${relativePath}' because of ${e} when trying to ${syncType.toLocaleLowerCase()} it`,
-					type: syncType
+					details,
+					message: `Failed to sync file '${details.relativePath}' because of ${e} when trying to ${details.type.toLocaleLowerCase()} it`
 				});
 				throw e;
 			}
 		}
 	}
 
-	private globsToRegex(globs: string[]): RegExp[] {
-		return globs
-			.map((pattern) => {
-				const result = makeRe(pattern);
-				if (result === false) {
-					this.logger.warn(
-						`Failed to parse ${pattern}' as a glob pattern, skipping it`
-					);
-				}
-				return result;
-			})
-			.filter((pattern) => pattern !== false);
+	private getHistoryEntryForSkippedOversizedFile(
+		sizeInBytes: number,
+		relativePath: RelativePath
+	): CommonHistoryEntry | undefined {
+		const sizeInMB = Math.round(sizeInBytes / 1024 / 1024);
+		const { maxFileSizeMB } = this.settings.getSettings();
+		if (sizeInMB > maxFileSizeMB) {
+			return {
+				status: SyncStatus.SKIPPED,
+				details: {
+					type: SyncType.SKIPPED,
+					relativePath
+				},
+				message: `File size of ${sizeInMB} MB exceeds the maximum file size limit of ${
+					maxFileSizeMB
+				} MB`
+			};
+		}
 	}
 }

From b72b3488d88cc5af3505500a5c7b2ab08bf9d57e Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 25 May 2025 11:35:42 +0100
Subject: [PATCH 517/761] Don't show .md extensions

---
 frontend/obsidian-plugin/src/views/history/history-view.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/frontend/obsidian-plugin/src/views/history/history-view.ts b/frontend/obsidian-plugin/src/views/history/history-view.ts
index ea1803fa..977138a2 100644
--- a/frontend/obsidian-plugin/src/views/history/history-view.ts
+++ b/frontend/obsidian-plugin/src/views/history/history-view.ts
@@ -61,7 +61,9 @@ export class HistoryView extends ItemView {
 			setIcon(element.createDiv(), syncTypeIcon);
 		}
 
-		const fileName = entry.details.relativePath.split("/").pop();
+		let fileName = entry.details.relativePath.split("/").pop() ?? "";
+		fileName = fileName.replace(/\.md$/, "");
+
 		element.createEl("span", {
 			text:
 				entry.details.type === SyncType.SKIPPED
@@ -168,7 +170,7 @@ export class HistoryView extends ItemView {
 			},
 			(card) => {
 				if (
-					this.app.vault.getFileByPath(entry.details.relativePath) !==
+					this.app.vault.getFileByPath(entry.details.relativePath) !=
 					null
 				) {
 					card.addEventListener("click", () => {

From 483e03e2de8225ac38f0ae5cde317ab664ad846d Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 25 May 2025 11:58:00 +0100
Subject: [PATCH 518/761] Bump versions to 0.3.15

---
 backend/Cargo.lock                     | 6 +++---
 backend/Cargo.toml                     | 2 +-
 backend/sync_lib/pkg/package.json      | 2 +-
 frontend/obsidian-plugin/manifest.json | 2 +-
 frontend/obsidian-plugin/package.json  | 2 +-
 frontend/package-lock.json             | 8 ++++----
 frontend/sync-client/package.json      | 2 +-
 frontend/test-client/package.json      | 2 +-
 manifest.json                          | 2 +-
 9 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index f33914fb..adbb5d20 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1928,7 +1928,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile"
-version = "0.3.14"
+version = "0.3.15"
 dependencies = [
  "insta",
  "pretty_assertions",
@@ -2547,7 +2547,7 @@ dependencies = [
 
 [[package]]
 name = "sync_lib"
-version = "0.3.14"
+version = "0.3.15"
 dependencies = [
  "base64 0.22.1",
  "console_error_panic_hook",
@@ -2560,7 +2560,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.3.14"
+version = "0.3.15"
 dependencies = [
  "aide",
  "aide-axum-typed-multipart",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index ad8d2d09..a12333c3 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -12,7 +12,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.3.14"
+version = "0.3.15"
 
 [workspace.dependencies]
 serde = { version = "1.0.219", default-features = false, features = ["derive"] }
diff --git a/backend/sync_lib/pkg/package.json b/backend/sync_lib/pkg/package.json
index babe4225..9fe627d6 100644
--- a/backend/sync_lib/pkg/package.json
+++ b/backend/sync_lib/pkg/package.json
@@ -4,7 +4,7 @@
   "collaborators": [
     "Andras Schmelczer <andras@schmelczer.dev>"
   ],
-  "version": "0.3.14",
+  "version": "0.3.15",
   "license": "MIT",
   "repository": {
     "type": "git",
diff --git a/frontend/obsidian-plugin/manifest.json b/frontend/obsidian-plugin/manifest.json
index 8ea69649..af653f50 100644
--- a/frontend/obsidian-plugin/manifest.json
+++ b/frontend/obsidian-plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.3.14",
+	"version": "0.3.15",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index e4689b04..cf72934b 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "vault-link-obsidian-plugin",
-	"version": "0.3.14",
+	"version": "0.3.15",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index f0eeb90e..a7b5cc01 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -21,7 +21,7 @@
 		},
 		"../backend/sync_lib/pkg": {
 			"name": "sync_lib",
-			"version": "0.3.14",
+			"version": "0.3.15",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -7863,7 +7863,7 @@
 		},
 		"obsidian-plugin": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.3.14",
+			"version": "0.3.15",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
@@ -7891,7 +7891,7 @@
 			}
 		},
 		"sync-client": {
-			"version": "0.3.14",
+			"version": "0.3.15",
 			"dependencies": {
 				"byte-base64": "^1.1.0",
 				"minimatch": "^10.0.1",
@@ -7940,7 +7940,7 @@
 			}
 		},
 		"test-client": {
-			"version": "0.3.14",
+			"version": "0.3.15",
 			"bin": {
 				"test-client": "dist/cli.js"
 			},
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index 79693be3..655dd8a4 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "sync-client",
-    "version": "0.3.14",
+    "version": "0.3.15",
     "main": "dist/sync-client.node.js",
     "browser": "dist/sync-client.web.js",
     "types": "dist/types/index.d.ts",
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index 93b071dd..73c6cd7d 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "test-client",
-    "version": "0.3.14",
+    "version": "0.3.15",
     "private": true,
     "bin": {
         "test-client": "./dist/cli.js"
diff --git a/manifest.json b/manifest.json
index 8ea69649..af653f50 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.3.14",
+	"version": "0.3.15",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",

From 8daecb9b097e294e65c48e7673940a244fdbf12d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 30 May 2025 19:15:42 +0100
Subject: [PATCH 519/761] Bump ws from 8.18.1 to 8.18.2 in /frontend (#52)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 frontend/package-lock.json        | 8 ++++----
 frontend/sync-client/package.json | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index a7b5cc01..9227389b 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -7776,9 +7776,9 @@
 			}
 		},
 		"node_modules/ws": {
-			"version": "8.18.1",
-			"resolved": "https://registry.npmjs.org/ws/-/ws-8.18.1.tgz",
-			"integrity": "sha512-RKW2aJZMXeMxVpnZ6bck+RswznaxmzdULiBr6KY7XkTnW8uvt0iT9H5DkHUChXrc+uurzwa0rVI16n/Xzjdz1w==",
+			"version": "8.18.2",
+			"resolved": "https://registry.npmjs.org/ws/-/ws-8.18.2.tgz",
+			"integrity": "sha512-DMricUmwGZUVr++AEAe2uiVM7UoO9MAVZMDu05UQOaUII0lp+zOzLLU4Xqh/JvTqklB1T4uELaaPBKyjE1r4fQ==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -7912,7 +7912,7 @@
 				"webpack": "^5.98.0",
 				"webpack-cli": "^6.0.1",
 				"webpack-merge": "^6.0.1",
-				"ws": "^8.18.1"
+				"ws": "^8.18.2"
 			}
 		},
 		"sync-client/node_modules/brace-expansion": {
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index 655dd8a4..84bb53c9 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -32,6 +32,6 @@
         "webpack": "^5.98.0",
         "webpack-cli": "^6.0.1",
         "webpack-merge": "^6.0.1",
-        "ws": "^8.18.1"
+        "ws": "^8.18.2"
     }
 }

From f97193e2878461d8999ac70b0aa22e1a4ecac170 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 30 May 2025 19:15:53 +0100
Subject: [PATCH 520/761] Bump @types/node from 22.14.0 to 22.15.27 in
 /frontend (#55)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 frontend/obsidian-plugin/package.json |  2 +-
 frontend/package-lock.json            | 12 ++++++------
 frontend/sync-client/package.json     |  2 +-
 frontend/test-client/package.json     |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index cf72934b..95f41b60 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -14,7 +14,7 @@
 	"license": "MIT",
 	"devDependencies": {
 		"@types/jest": "^29.5.14",
-		"@types/node": "^22.14.0",
+		"@types/node": "^22.15.27",
 		"css-loader": "^7.1.2",
 		"date-fns": "^4.1.0",
 		"file-loader": "^6.2.0",
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 9227389b..0990a050 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1857,9 +1857,9 @@
 			"license": "MIT"
 		},
 		"node_modules/@types/node": {
-			"version": "22.14.0",
-			"resolved": "https://registry.npmjs.org/@types/node/-/node-22.14.0.tgz",
-			"integrity": "sha512-Kmpl+z84ILoG+3T/zQFyAJsU6EPTmOCj8/2+83fSN6djd6I4o7uOuGIH6vq3PrjY5BGitSbFuMN18j3iknubbA==",
+			"version": "22.15.27",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.27.tgz",
+			"integrity": "sha512-5fF+eu5mwihV2BeVtX5vijhdaZOfkQTATrePEaXTcKqI16LhJ7gi2/Vhd9OZM0UojcdmiOCVg5rrax+i1MdoQQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -7867,7 +7867,7 @@
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
-				"@types/node": "^22.14.0",
+				"@types/node": "^22.15.27",
 				"css-loader": "^7.1.2",
 				"date-fns": "^4.1.0",
 				"file-loader": "^6.2.0",
@@ -7902,7 +7902,7 @@
 			},
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
-				"@types/node": "^22.14.0",
+				"@types/node": "^22.15.27",
 				"jest": "^29.7.0",
 				"sync_lib": "file:../../backend/sync_lib/pkg",
 				"ts-jest": "^29.3.4",
@@ -7945,7 +7945,7 @@
 				"test-client": "dist/cli.js"
 			},
 			"devDependencies": {
-				"@types/node": "^22.14.0",
+				"@types/node": "^22.15.27",
 				"bufferutil": "^4.0.9",
 				"sync-client": "file:../sync-client",
 				"ts-loader": "^9.5.2",
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index 84bb53c9..b13942dd 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -22,7 +22,7 @@
     },
     "devDependencies": {
         "@types/jest": "^29.5.14",
-        "@types/node": "^22.14.0",
+        "@types/node": "^22.15.27",
         "jest": "^29.7.0",
         "sync_lib": "file:../../backend/sync_lib/pkg",
         "ts-jest": "^29.3.4",
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index 73c6cd7d..b5910d9f 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -11,7 +11,7 @@
         "test": "jest"
     },
     "devDependencies": {
-        "@types/node": "^22.14.0",
+        "@types/node": "^22.15.27",
         "sync-client": "file:../sync-client",
         "ts-loader": "^9.5.2",
         "tslib": "2.8.1",

From e8b9bf40c5b02778ce20e131e5e22fb8f22d2ae4 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 8 Jun 2025 20:20:52 +0100
Subject: [PATCH 521/761] Add API for propagating cursor locations (#61)

---
 .gitignore                                    |  35 +-
 backend/Cargo.lock                            | 381 +++-------
 backend/Cargo.toml                            |   1 -
 backend/config-e2e.yml                        |  33 +-
 .../operation_transformation/merge_context.rs |   9 +-
 backend/rust-toolchain.toml                   |   2 +-
 backend/sync_server/Cargo.toml                |  10 +-
 backend/sync_server/src/app_state.rs          |  13 +-
 backend/sync_server/src/app_state/cursors.rs  | 128 ++++
 backend/sync_server/src/app_state/database.rs |  28 +-
 .../src/app_state/database/models.rs          |  13 +-
 .../sync_server/src/app_state/websocket.rs    |   3 +
 .../app_state/{ => websocket}/broadcasts.rs   |  36 +-
 .../src/app_state/websocket/models.rs         |  88 +++
 .../src/app_state/websocket/utils.rs          |  80 +++
 backend/sync_server/src/config.rs             |  24 +-
 .../sync_server/src/config/database_config.rs |  18 +-
 backend/sync_server/src/consts.rs             |   7 +-
 backend/sync_server/src/errors.rs             |  38 +-
 backend/sync_server/src/server.rs             |  91 +--
 .../sync_server/src/server/assets/index.html  |   9 +
 backend/sync_server/src/server/auth.rs        |  11 +-
 .../sync_server/src/server/create_document.rs |  99 +--
 .../sync_server/src/server/delete_document.rs |  23 +-
 .../src/server/fetch_document_version.rs      |  10 +-
 .../server/fetch_document_version_content.rs  |   4 +-
 .../server/fetch_latest_document_version.rs   |  10 +-
 .../src/server/fetch_latest_documents.rs      |  13 +-
 backend/sync_server/src/server/index.rs       |   7 +
 backend/sync_server/src/server/ping.rs        |   4 +-
 backend/sync_server/src/server/requests.rs    |  38 +-
 backend/sync_server/src/server/responses.rs   |  11 +-
 .../sync_server/src/server/update_document.rs | 104 +--
 backend/sync_server/src/server/websocket.rs   | 221 +++---
 frontend/obsidian-plugin/package.json         |  76 +-
 .../src/obsidian-file-system.ts               |  26 +-
 .../src/utils/get-random-color.ts             |   9 +
 .../obsidian-plugin/src/vault-link-plugin.ts  |  38 +-
 .../views/cursors/get-cursors-from-editor.ts  |  17 +
 .../cursors/local-cursor-update-listener.ts   |  58 ++
 .../src/views/cursors/remote-cursor-theme.ts  |  63 ++
 .../src/views/cursors/remote-cursor-widget.ts |  46 ++
 .../views/cursors/remote-cursors-plugin.ts    | 134 ++++
 .../src/views/history/history-view.ts         |   4 +-
 .../status-description/status-description.ts  |   2 +-
 frontend/obsidian-plugin/webpack.config.js    |  11 +-
 frontend/package-lock.json                    | 484 ++++---------
 frontend/package.json                         |   6 +-
 frontend/sync-client/package.json             |   8 +-
 frontend/sync-client/src/index.ts             |   3 +-
 .../sync-client/src/persistence/settings.ts   |   4 +-
 .../src/services/connection-status.ts         |   7 +-
 .../sync-client/src/services/sync-service.ts  | 301 ++++----
 frontend/sync-client/src/services/types.ts    | 655 ------------------
 .../src/services/types/ClientCursors.ts       |   8 +
 .../services/types/CreateDocumentVersion.ts   |  13 +
 .../types/CursorPositionFromClient.ts         |   6 +
 .../types/CursorPositionFromServer.ts         |   6 +
 .../src/services/types/CursorSpan.ts          |   6 +
 .../services/types/DeleteDocumentVersion.ts   |   5 +
 .../services/types/DocumentUpdateResponse.ts  |  10 +
 .../src/services/types/DocumentVersion.ts     |  12 +
 .../types/DocumentVersionWithoutContent.ts    |  12 +
 .../types/FetchLatestDocumentsResponse.ts     |  13 +
 .../src/services/types/PingResponse.ts        |  16 +
 .../src/services/types/SerializedError.ts     |   7 +
 .../services/types/UpdateDocumentVersion.ts   |   7 +
 .../services/types/WebSocketClientMessage.ts  |   7 +
 .../src/services/types/WebSocketHandshake.ts  |   7 +
 .../services/types/WebSocketServerMessage.ts  |   7 +
 .../services/types/WebSocketVaultUpdate.ts    |   7 +
 .../src/services/websocket-manager.ts         | 209 ++++++
 frontend/sync-client/src/sync-client.ts       |  44 +-
 .../sync-client/src/sync-operations/syncer.ts | 155 +----
 .../sync-operations/unrestricted-syncer.ts    |  12 +-
 .../sync-client/src/utils/create-client-id.ts |  15 +
 .../sync-client/src/utils/create-promise.ts   |   4 +
 frontend/sync-client/src/utils/locks.ts       |   2 +-
 frontend/test-client/package.json             |   6 +-
 scripts/update-api-types.sh                   |   9 +-
 80 files changed, 1930 insertions(+), 2229 deletions(-)
 create mode 100644 backend/sync_server/src/app_state/cursors.rs
 create mode 100644 backend/sync_server/src/app_state/websocket.rs
 rename backend/sync_server/src/app_state/{ => websocket}/broadcasts.rs (53%)
 create mode 100644 backend/sync_server/src/app_state/websocket/models.rs
 create mode 100644 backend/sync_server/src/app_state/websocket/utils.rs
 create mode 100644 backend/sync_server/src/server/assets/index.html
 create mode 100644 backend/sync_server/src/server/index.rs
 create mode 100644 frontend/obsidian-plugin/src/utils/get-random-color.ts
 create mode 100644 frontend/obsidian-plugin/src/views/cursors/get-cursors-from-editor.ts
 create mode 100644 frontend/obsidian-plugin/src/views/cursors/local-cursor-update-listener.ts
 create mode 100644 frontend/obsidian-plugin/src/views/cursors/remote-cursor-theme.ts
 create mode 100644 frontend/obsidian-plugin/src/views/cursors/remote-cursor-widget.ts
 create mode 100644 frontend/obsidian-plugin/src/views/cursors/remote-cursors-plugin.ts
 delete mode 100644 frontend/sync-client/src/services/types.ts
 create mode 100644 frontend/sync-client/src/services/types/ClientCursors.ts
 create mode 100644 frontend/sync-client/src/services/types/CreateDocumentVersion.ts
 create mode 100644 frontend/sync-client/src/services/types/CursorPositionFromClient.ts
 create mode 100644 frontend/sync-client/src/services/types/CursorPositionFromServer.ts
 create mode 100644 frontend/sync-client/src/services/types/CursorSpan.ts
 create mode 100644 frontend/sync-client/src/services/types/DeleteDocumentVersion.ts
 create mode 100644 frontend/sync-client/src/services/types/DocumentUpdateResponse.ts
 create mode 100644 frontend/sync-client/src/services/types/DocumentVersion.ts
 create mode 100644 frontend/sync-client/src/services/types/DocumentVersionWithoutContent.ts
 create mode 100644 frontend/sync-client/src/services/types/FetchLatestDocumentsResponse.ts
 create mode 100644 frontend/sync-client/src/services/types/PingResponse.ts
 create mode 100644 frontend/sync-client/src/services/types/SerializedError.ts
 create mode 100644 frontend/sync-client/src/services/types/UpdateDocumentVersion.ts
 create mode 100644 frontend/sync-client/src/services/types/WebSocketClientMessage.ts
 create mode 100644 frontend/sync-client/src/services/types/WebSocketHandshake.ts
 create mode 100644 frontend/sync-client/src/services/types/WebSocketServerMessage.ts
 create mode 100644 frontend/sync-client/src/services/types/WebSocketVaultUpdate.ts
 create mode 100644 frontend/sync-client/src/services/websocket-manager.ts
 create mode 100644 frontend/sync-client/src/utils/create-client-id.ts

diff --git a/.gitignore b/.gitignore
index a91ed90b..384c91eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,17 +1,18 @@
-# npm
-node_modules
-
-# Exclude macOS Finder (System Explorer) View States
-.DS_Store
-
-# Rust build folder
-backend/target
-
-frontend/*/dist
-
-backend/db.sqlite3*
-backend/databases
-
-*.log
-
-*.sqlx
+# npm
+node_modules
+
+# Exclude macOS Finder (System Explorer) View States
+.DS_Store
+
+# Rust build folder
+backend/target
+
+# Frontend build folders
+frontend/*/dist
+
+backend/db.sqlite3*
+backend/databases
+backend/sync_server/bindings/*.ts
+
+*.log
+*.sqlx
diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index adbb5d20..bab8d80a 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -17,20 +17,6 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
 
-[[package]]
-name = "ahash"
-version = "0.8.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
-dependencies = [
- "cfg-if",
- "getrandom 0.2.15",
- "once_cell",
- "serde",
- "version_check",
- "zerocopy 0.7.35",
-]
-
 [[package]]
 name = "aho-corasick"
 version = "1.1.3"
@@ -40,41 +26,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "aide"
-version = "0.13.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5678d2978845ddb4bd736a026f467dd652d831e9e6254b0e41b07f7ee7523309"
-dependencies = [
- "axum",
- "axum-extra",
- "bytes",
- "cfg-if",
- "http",
- "indexmap",
- "schemars",
- "serde",
- "serde_json",
- "serde_qs",
- "thiserror 1.0.69",
- "tower-layer",
- "tower-service",
- "tracing",
-]
-
-[[package]]
-name = "aide-axum-typed-multipart"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b8f5c830a08754addfa31fa09e6c183bac8d2ae7bd007131f9eb84fcb87a40e"
-dependencies = [
- "aide",
- "axum",
- "axum_typed_multipart",
- "indexmap",
- "schemars",
-]
-
 [[package]]
 name = "allocator-api2"
 version = "0.2.21"
@@ -265,26 +216,6 @@ dependencies = [
  "tower-service",
 ]
 
-[[package]]
-name = "axum-jsonschema"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcffe29ca1b60172349fea781ec34441d598809bd227ccbb5bf5dc2879cd9c78"
-dependencies = [
- "aide",
- "async-trait",
- "axum",
- "http",
- "http-body",
- "itertools",
- "jsonschema",
- "schemars",
- "serde",
- "serde_json",
- "serde_path_to_error",
- "tracing",
-]
-
 [[package]]
 name = "axum-macros"
 version = "0.4.2"
@@ -368,21 +299,6 @@ version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "230c5f1ca6a325a32553f8640d31ac9b49f2411e901e427570154868b46da4f7"
 
-[[package]]
-name = "bit-set"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1"
-dependencies = [
- "bit-vec",
-]
-
-[[package]]
-name = "bit-vec"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
-
 [[package]]
 name = "bitflags"
 version = "2.6.0"
@@ -407,12 +323,6 @@ version = "3.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
 
-[[package]]
-name = "bytecount"
-version = "0.6.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ce89b21cab1437276d2650d57e971f9d548a2d9037cc231abdc0562b97498ce"
-
 [[package]]
 name = "byteorder"
 version = "1.5.0"
@@ -662,6 +572,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
 dependencies = [
  "powerfmt",
+ "serde",
 ]
 
 [[package]]
@@ -699,12 +610,6 @@ version = "0.15.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b"
 
-[[package]]
-name = "dyn-clone"
-version = "1.0.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
-
 [[package]]
 name = "either"
 version = "1.13.0"
@@ -767,16 +672,6 @@ dependencies = [
  "pin-project-lite",
 ]
 
-[[package]]
-name = "fancy-regex"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b95f7c0680e4142284cf8b22c14a476e87d61b004a3a0861872b32ef7ead40a2"
-dependencies = [
- "bit-set",
- "regex",
-]
-
 [[package]]
 name = "fastrand"
 version = "2.2.0"
@@ -815,16 +710,6 @@ dependencies = [
  "percent-encoding",
 ]
 
-[[package]]
-name = "fraction"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3027ae1df8d41b4bed2241c8fdad4acc1e7af60c8e17743534b545e77182d678"
-dependencies = [
- "lazy_static",
- "num",
-]
-
 [[package]]
 name = "futures"
 version = "0.3.31"
@@ -942,10 +827,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
  "cfg-if",
- "js-sys",
  "libc",
  "wasi 0.11.0+wasi-snapshot-preview1",
- "wasm-bindgen",
 ]
 
 [[package]]
@@ -966,6 +849,12 @@ version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
+[[package]]
+name = "hashbrown"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+
 [[package]]
 name = "hashbrown"
 version = "0.15.2"
@@ -983,7 +872,7 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1"
 dependencies = [
- "hashbrown",
+ "hashbrown 0.15.2",
 ]
 
 [[package]]
@@ -1298,6 +1187,17 @@ dependencies = [
  "icu_properties",
 ]
 
+[[package]]
+name = "indexmap"
+version = "1.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
+dependencies = [
+ "autocfg",
+ "hashbrown 0.12.3",
+ "serde",
+]
+
 [[package]]
 name = "indexmap"
 version = "2.7.0"
@@ -1305,7 +1205,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f"
 dependencies = [
  "equivalent",
- "hashbrown",
+ "hashbrown 0.15.2",
  "serde",
 ]
 
@@ -1328,24 +1228,6 @@ version = "1.70.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
 
-[[package]]
-name = "iso8601"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "924e5d73ea28f59011fec52a0d12185d496a9b075d360657aed2a5707f701153"
-dependencies = [
- "nom",
-]
-
-[[package]]
-name = "itertools"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
-dependencies = [
- "either",
-]
-
 [[package]]
 name = "itoa"
 version = "1.0.14"
@@ -1362,34 +1244,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "jsonschema"
-version = "0.17.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a071f4f7efc9a9118dfb627a0a94ef247986e1ab8606a4c806ae2b3aa3b6978"
-dependencies = [
- "ahash",
- "anyhow",
- "base64 0.21.7",
- "bytecount",
- "fancy-regex",
- "fraction",
- "getrandom 0.2.15",
- "iso8601",
- "itoa",
- "memchr",
- "num-cmp",
- "once_cell",
- "parking_lot",
- "percent-encoding",
- "regex",
- "serde",
- "serde_json",
- "time",
- "url",
- "uuid",
-]
-
 [[package]]
 name = "lazy_static"
 version = "1.5.0"
@@ -1503,12 +1357,6 @@ dependencies = [
  "walkdir",
 ]
 
-[[package]]
-name = "minimal-lexical"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
-
 [[package]]
 name = "miniz_oxide"
 version = "0.8.0"
@@ -1546,16 +1394,6 @@ dependencies = [
  "version_check",
 ]
 
-[[package]]
-name = "nom"
-version = "7.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
-dependencies = [
- "memchr",
- "minimal-lexical",
-]
-
 [[package]]
 name = "nu-ansi-term"
 version = "0.46.0"
@@ -1566,30 +1404,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "num"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23"
-dependencies = [
- "num-bigint",
- "num-complex",
- "num-integer",
- "num-iter",
- "num-rational",
- "num-traits",
-]
-
-[[package]]
-name = "num-bigint"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
-dependencies = [
- "num-integer",
- "num-traits",
-]
-
 [[package]]
 name = "num-bigint-dig"
 version = "0.8.4"
@@ -1607,21 +1421,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "num-cmp"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63335b2e2c34fae2fb0aa2cecfd9f0832a1e24b3b32ecec612c3426d46dc8aaa"
-
-[[package]]
-name = "num-complex"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495"
-dependencies = [
- "num-traits",
-]
-
 [[package]]
 name = "num-conv"
 version = "0.1.0"
@@ -1648,17 +1447,6 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "num-rational"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824"
-dependencies = [
- "num-bigint",
- "num-integer",
- "num-traits",
-]
-
 [[package]]
 name = "num-traits"
 version = "0.2.19"
@@ -2059,34 +1847,6 @@ dependencies = [
  "regex",
 ]
 
-[[package]]
-name = "schemars"
-version = "0.8.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fbf2ae1b8bc8e02df939598064d22402220cd5bbcca1c76f7d6a310974d5615"
-dependencies = [
- "bytes",
- "chrono",
- "dyn-clone",
- "indexmap",
- "schemars_derive",
- "serde",
- "serde_json",
- "uuid",
-]
-
-[[package]]
-name = "schemars_derive"
-version = "0.8.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32e265784ad618884abaea0600a9adf15393368d840e0222d101a072f3f7534d"
-dependencies = [
- "proc-macro2",
- "quote",
- "serde_derive_internals",
- "syn 2.0.90",
-]
-
 [[package]]
 name = "scoped-tls"
 version = "1.0.1"
@@ -2119,17 +1879,6 @@ dependencies = [
  "syn 2.0.90",
 ]
 
-[[package]]
-name = "serde_derive_internals"
-version = "0.29.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.90",
-]
-
 [[package]]
 name = "serde_json"
 version = "1.0.140"
@@ -2152,19 +1901,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "serde_qs"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd34f36fe4c5ba9654417139a9b3a20d2e1de6012ee678ad14d240c22c78d8d6"
-dependencies = [
- "axum",
- "futures",
- "percent-encoding",
- "serde",
- "thiserror 1.0.69",
-]
-
 [[package]]
 name = "serde_urlencoded"
 version = "0.7.1"
@@ -2177,13 +1913,43 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "serde_with"
+version = "3.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6b6f7f2fcb69f747921f79f3926bd1e203fce4fef62c268dd3abfb6d86029aa"
+dependencies = [
+ "base64 0.22.1",
+ "chrono",
+ "hex",
+ "indexmap 1.9.3",
+ "indexmap 2.7.0",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "serde_with_macros",
+ "time",
+]
+
+[[package]]
+name = "serde_with_macros"
+version = "3.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d00caa5193a3c8362ac2b73be6b9e768aa5a4b2f721d8f4b339600c3cb51f8e"
+dependencies = [
+ "darling",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
 [[package]]
 name = "serde_yaml"
 version = "0.9.34+deprecated"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
 dependencies = [
- "indexmap",
+ "indexmap 2.7.0",
  "itoa",
  "ryu",
  "serde",
@@ -2329,9 +2095,9 @@ dependencies = [
  "futures-intrusive",
  "futures-io",
  "futures-util",
- "hashbrown",
+ "hashbrown 0.15.2",
  "hashlink",
- "indexmap",
+ "indexmap 2.7.0",
  "log",
  "memchr",
  "once_cell",
@@ -2562,12 +2328,9 @@ dependencies = [
 name = "sync_server"
 version = "0.3.15"
 dependencies = [
- "aide",
- "aide-axum-typed-multipart",
  "anyhow",
  "axum",
  "axum-extra",
- "axum-jsonschema",
  "axum_typed_multipart",
  "bimap",
  "chrono",
@@ -2578,9 +2341,9 @@ dependencies = [
  "rand 0.9.0",
  "regex",
  "sanitize-filename",
- "schemars",
  "serde",
  "serde_json",
+ "serde_with",
  "serde_yaml",
  "sqlx",
  "sync_lib",
@@ -2589,6 +2352,7 @@ dependencies = [
  "tower-http",
  "tracing",
  "tracing-subscriber",
+ "ts-rs",
  "uuid",
 ]
 
@@ -2622,6 +2386,15 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
+[[package]]
+name = "termcolor"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
+dependencies = [
+ "winapi-util",
+]
+
 [[package]]
 name = "test-case"
 version = "3.3.1"
@@ -2712,6 +2485,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21"
 dependencies = [
  "deranged",
+ "itoa",
  "num-conv",
  "powerfmt",
  "serde",
@@ -2920,6 +2694,31 @@ dependencies = [
  "tracing-log",
 ]
 
+[[package]]
+name = "ts-rs"
+version = "10.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e640d9b0964e9d39df633548591090ab92f7a4567bc31d3891af23471a3365c6"
+dependencies = [
+ "chrono",
+ "lazy_static",
+ "thiserror 2.0.12",
+ "ts-rs-macros",
+ "uuid",
+]
+
+[[package]]
+name = "ts-rs-macros"
+version = "10.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e9d8656589772eeec2cf7a8264d9cda40fb28b9bc53118ceb9e8c07f8f38730"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+ "termcolor",
+]
+
 [[package]]
 name = "tungstenite"
 version = "0.24.0"
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index a12333c3..907b201b 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -43,7 +43,6 @@ inefficient_to_string = "warn"
 linkedlist = "warn"
 lossy_float_literal = "warn"
 macro_use_imports = "warn"
-match_on_vec_items = "warn"
 match_wildcard_for_single_variants = "warn"
 mem_forget = "warn"
 needless_borrow = "warn"
diff --git a/backend/config-e2e.yml b/backend/config-e2e.yml
index 17b745ea..5f2346d6 100644
--- a/backend/config-e2e.yml
+++ b/backend/config-e2e.yml
@@ -1,29 +1,26 @@
 database:
   databases_directory_path: databases
   max_connections_per_vault: 12
-
+  cursor_timeout_seconds: 60
 server:
   host: 0.0.0.0
   port: 3000
   max_body_size_mb: 512
   max_clients_per_vault: 256
   response_timeout_seconds: 60
-
 users:
   user_configs:
-    - name: admin
-      token: test-token-change-me
-      vault_access:
-        type: allow_access_to_all
-
-    - name: other-admin
-      token: test-token-change-me2
-      vault_access:
-        type: allow_access_to_all
-
-    - name: test
-      token: other-test-token
-      vault_access:
-        type: allow_list
-        allowed:
-          - default
+  - name: admin
+    token: test-token-change-me
+    vault_access:
+      type: allow_access_to_all
+  - name: other-admin
+    token: test-token-change-me2
+    vault_access:
+      type: allow_access_to_all
+  - name: test
+    token: other-test-token
+    vault_access:
+      type: allow_list
+      allowed:
+      - default
diff --git a/backend/reconcile/src/operation_transformation/merge_context.rs b/backend/reconcile/src/operation_transformation/merge_context.rs
index d45f08ad..5cf0972d 100644
--- a/backend/reconcile/src/operation_transformation/merge_context.rs
+++ b/backend/reconcile/src/operation_transformation/merge_context.rs
@@ -62,12 +62,11 @@ where
                     self.shift -= *deleted_character_count as i64;
                     self.last_operation = None;
                 }
-            } else if let Operation::Insert { .. } = last_operation {
-                if threshold_index + self.shift - last_operation.len() as i64
+            } else if let Operation::Insert { .. } = last_operation
+                && threshold_index + self.shift - last_operation.len() as i64
                     > last_operation.end_index() as i64
-                {
-                    self.last_operation = None;
-                }
+            {
+                self.last_operation = None;
             }
         }
     }
diff --git a/backend/rust-toolchain.toml b/backend/rust-toolchain.toml
index 8e466642..0d5c6104 100644
--- a/backend/rust-toolchain.toml
+++ b/backend/rust-toolchain.toml
@@ -1,4 +1,4 @@
 [toolchain]
-channel = "nightly-2025-03-14"
+channel = "nightly-2025-06-06"
 targets = [ "x86_64-unknown-linux-gnu", "x86_64-unknown-linux-musl" ]
 profile = "default"
diff --git a/backend/sync_server/Cargo.toml b/backend/sync_server/Cargo.toml
index a483ed5c..3ca2c75a 100644
--- a/backend/sync_server/Cargo.toml
+++ b/backend/sync_server/Cargo.toml
@@ -18,25 +18,23 @@ log = { version = "0.4.27" }
 anyhow =  { version = "1.0.98", features = ["backtrace"] }
 axum = { version = "0.7.4", features = ["ws", "macros", "tracing", "multipart"]}
 axum-extra = { version = "0.9.6", features = ["typed-header"] }
-aide-axum-typed-multipart = "0.13.0"
 axum_typed_multipart = "0.11.0"
 tower-http = { version = "0.6.1", features = ["cors", "trace", "limit", "timeout"] }
+tracing = "0.1.41"
 tracing-subscriber = { version = "0.3.19", features = ["fmt", "env-filter"]}
-serde_yaml = "0.9.34"
 sqlx = { version = "0.8.6", features = ["sqlite", "runtime-tokio", "uuid", "chrono"] }
 chrono = { version = "0.4.41", features = ["serde"] }
-aide = { version = "0.13.5", features = ["axum", "axum-ws", "scalar", "axum-headers"] }
-schemars = { version = "0.8.22", features = ["chrono", "uuid1", "bytes"] }
-tracing = "0.1.41"
 rand = "0.9.0"
 sanitize-filename = "0.6.0"
-axum-jsonschema = { version = "0.8.0", features = ["aide"] }
 regex = "1.11.1"
 clap = { version = "4.5.38", features = ["derive"] }
 futures = "0.3.31"
+serde_yaml = "0.9.34"
 serde_json = "1.0.140"
 clap-verbosity-flag = "3.0.3"
 bimap = "0.6.3"
+ts-rs =  { version = "10.1", features = ["uuid-impl", "chrono-impl"] }
+serde_with = "3.12.0"
 
 [lints]
 workspace = true
diff --git a/backend/sync_server/src/app_state.rs b/backend/sync_server/src/app_state.rs
index 1cad9149..a61467d5 100644
--- a/backend/sync_server/src/app_state.rs
+++ b/backend/sync_server/src/app_state.rs
@@ -1,11 +1,13 @@
-pub mod broadcasts;
+pub mod cursors;
 pub mod database;
+pub mod websocket;
 
 use std::ffi::OsString;
 
 use anyhow::Result;
-use broadcasts::Broadcasts;
+use cursors::Cursors;
 use database::Database;
+use websocket::broadcasts::Broadcasts;
 
 use crate::{config::Config, consts::DEFAULT_CONFIG_PATH};
 
@@ -13,6 +15,7 @@ use crate::{config::Config, consts::DEFAULT_CONFIG_PATH};
 pub struct AppState {
     pub config: Config,
     pub database: Database,
+    pub cursors: Cursors,
     pub broadcasts: Broadcasts,
 }
 
@@ -22,12 +25,16 @@ impl AppState {
         let path = std::path::PathBuf::from(config_path);
 
         let config = Config::read_or_create(&path).await?;
-        let database = Database::try_new(&config.database).await?;
         let broadcasts = Broadcasts::new(&config.server);
+        let database = Database::try_new(&config.database, &broadcasts).await?;
+        let cursors: Cursors = Cursors::new(&config.database, &broadcasts);
+
+        Cursors::start_background_task(cursors.clone());
 
         Ok(Self {
             config,
             database,
+            cursors,
             broadcasts,
         })
     }
diff --git a/backend/sync_server/src/app_state/cursors.rs b/backend/sync_server/src/app_state/cursors.rs
new file mode 100644
index 00000000..245109c2
--- /dev/null
+++ b/backend/sync_server/src/app_state/cursors.rs
@@ -0,0 +1,128 @@
+use core::time::Duration;
+use std::{collections::HashMap, sync::Arc};
+
+use tokio::sync::Mutex;
+
+use super::{
+    database::models::{DeviceId, VaultId},
+    websocket::{
+        broadcasts::Broadcasts,
+        models::{
+            ClientCursors, CursorPositionFromServer, CursorSpan, WebSocketServerMessage,
+            WebSocketServerMessageWithOrigin,
+        },
+    },
+};
+use crate::config::database_config::DatabaseConfig;
+
+#[derive(Clone, Debug)]
+pub struct Cursors {
+    config: DatabaseConfig,
+    broadcasts: Broadcasts,
+    vault_to_cursors: Arc<Mutex<HashMap<VaultId, Vec<ClientCursorsWithTimeToLive>>>>,
+}
+
+impl Cursors {
+    pub fn new(config: &DatabaseConfig, broadcasts: &Broadcasts) -> Self {
+        Self {
+            config: config.clone(),
+            broadcasts: broadcasts.clone(),
+            vault_to_cursors: Arc::new(Mutex::new(HashMap::new())),
+        }
+    }
+
+    pub async fn update_cursors(
+        &self,
+        vault_id: VaultId,
+        user_name: String,
+        device_id: &DeviceId,
+        document_to_cursors: HashMap<String, Vec<CursorSpan>>,
+    ) {
+        let mut vault_to_cursors = self.vault_to_cursors.lock().await;
+
+        let all_device_cursors = vault_to_cursors.entry(vault_id).or_insert_with(Vec::new);
+
+        all_device_cursors.retain(|c| &c.client_cursors.device_id != device_id);
+        all_device_cursors.push(ClientCursorsWithTimeToLive::new(ClientCursors {
+            user_name,
+            device_id: device_id.to_string(),
+            cursors: document_to_cursors,
+        }));
+
+        drop(vault_to_cursors); // Explicitly drop the lock before broadcasting to avoid deadlock
+        self.broadcast_cursors().await;
+    }
+
+    pub async fn get_cursors(&self, vault_id: &VaultId) -> Vec<ClientCursors> {
+        let vault_to_cursors = self.vault_to_cursors.lock().await;
+        vault_to_cursors
+            .get(vault_id)
+            .map(|cursors| {
+                cursors
+                    .iter()
+                    .cloned()
+                    .map(|with_ttl| with_ttl.client_cursors)
+                    .collect::<Vec<_>>()
+            })
+            .unwrap_or_default()
+    }
+
+    pub fn start_background_task(self) {
+        tokio::spawn(async move {
+            loop {
+                self.remove_expired_cursors().await;
+                tokio::time::sleep(Duration::from_secs(1)).await;
+            }
+        });
+    }
+
+    async fn remove_expired_cursors(&self) {
+        let mut vault_to_cursors = self.vault_to_cursors.lock().await;
+
+        for (_vault_id, cursors) in vault_to_cursors.iter_mut() {
+            cursors.retain(|cursor| !cursor.is_expired(self.config.cursor_timeout));
+        }
+    }
+
+    async fn broadcast_cursors(&self) {
+        let vault_to_cursors = self.vault_to_cursors.lock().await;
+
+        for (vault_id, cursors) in vault_to_cursors.iter() {
+            self.broadcasts
+                .send_document_update(
+                    vault_id.clone(),
+                    WebSocketServerMessageWithOrigin::new(WebSocketServerMessage::CursorPositions(
+                        CursorPositionFromServer {
+                            clients: cursors.iter().map(|c| c.client_cursors.clone()).collect(),
+                        },
+                    )),
+                )
+                .await;
+        }
+    }
+
+    pub async fn remove_cursors_of_device(&self, vault_id: &str, device_id: &str) {
+        let mut vault_to_cursors = self.vault_to_cursors.lock().await;
+
+        if let Some(cursors) = vault_to_cursors.get_mut(vault_id) {
+            cursors.retain(|c| c.client_cursors.device_id != device_id);
+        }
+    }
+}
+
+#[derive(Clone, Debug)]
+struct ClientCursorsWithTimeToLive {
+    client_cursors: ClientCursors,
+    last_updated: std::time::Instant,
+}
+
+impl ClientCursorsWithTimeToLive {
+    fn new(client_cursors: ClientCursors) -> Self {
+        Self {
+            client_cursors,
+            last_updated: std::time::Instant::now(),
+        }
+    }
+
+    pub fn is_expired(&self, ttl: Duration) -> bool { self.last_updated.elapsed() > ttl }
+}
diff --git a/backend/sync_server/src/app_state/database.rs b/backend/sync_server/src/app_state/database.rs
index 2ef03ba1..f8940140 100644
--- a/backend/sync_server/src/app_state/database.rs
+++ b/backend/sync_server/src/app_state/database.rs
@@ -6,23 +6,29 @@ use models::{
     DocumentId, DocumentVersionWithoutContent, StoredDocumentVersion, VaultId, VaultUpdateId,
 };
 use sqlx::{sqlite::SqliteConnectOptions, types::chrono::Utc};
+
 pub mod models;
 use sqlx::{Pool, Sqlite, sqlite::SqlitePoolOptions};
 use tokio::sync::Mutex;
 use uuid::fmt::Hyphenated;
 
+use super::websocket::{
+    broadcasts::Broadcasts,
+    models::{WebSocketServerMessage, WebSocketServerMessageWithOrigin, WebSocketVaultUpdate},
+};
 use crate::config::database_config::DatabaseConfig;
 
 #[derive(Clone, Debug)]
 pub struct Database {
     config: DatabaseConfig,
+    broadcasts: Broadcasts,
     connection_pools: Arc<Mutex<HashMap<VaultId, Pool<Sqlite>>>>,
 }
 
 pub type Transaction<'a> = sqlx::Transaction<'a, Sqlite>;
 
 impl Database {
-    pub async fn try_new(config: &DatabaseConfig) -> Result<Self> {
+    pub async fn try_new(config: &DatabaseConfig, broadcasts: &Broadcasts) -> Result<Self> {
         tokio::fs::create_dir_all(&config.databases_directory_path)
             .await
             .with_context(|| {
@@ -55,6 +61,7 @@ impl Database {
         Ok(Self {
             config: config.clone(),
             connection_pools: Arc::new(Mutex::new(connection_pools)),
+            broadcasts: broadcasts.clone(),
         })
     }
 
@@ -362,7 +369,7 @@ impl Database {
 
     pub async fn insert_document_version(
         &self,
-        vault: &VaultId,
+        vault_id: &VaultId,
         version: &StoredDocumentVersion,
         transaction: Option<&mut Transaction<'_>>,
     ) -> Result<()> {
@@ -394,10 +401,25 @@ impl Database {
         if let Some(transaction) = transaction {
             query.execute(&mut **transaction).await
         } else {
-            query.execute(&self.get_connection_pool(vault).await?).await
+            query
+                .execute(&self.get_connection_pool(vault_id).await?)
+                .await
         }
         .context("Cannot insert document version")?;
 
+        self.broadcasts
+            .send_document_update(
+                vault_id.clone(),
+                WebSocketServerMessageWithOrigin::with_origin(
+                    version.device_id.clone(),
+                    WebSocketServerMessage::VaultUpdate(WebSocketVaultUpdate {
+                        documents: vec![version.clone().into()],
+                        is_initial_sync: false,
+                    }),
+                ),
+            )
+            .await;
+
         Ok(())
     }
 }
diff --git a/backend/sync_server/src/app_state/database/models.rs b/backend/sync_server/src/app_state/database/models.rs
index 62ba66b6..e995611e 100644
--- a/backend/sync_server/src/app_state/database/models.rs
+++ b/backend/sync_server/src/app_state/database/models.rs
@@ -1,10 +1,11 @@
 use chrono::{DateTime, Utc};
-use schemars::JsonSchema;
 use serde::Serialize;
 use sync_lib::bytes_to_base64;
+use ts_rs::TS;
 
 pub type VaultId = String;
 pub type VaultUpdateId = i64;
+
 pub type DocumentId = uuid::Uuid;
 pub type UserId = String;
 pub type DeviceId = String;
@@ -25,16 +26,20 @@ impl PartialEq<Self> for StoredDocumentVersion {
     fn eq(&self, other: &Self) -> bool { self.vault_update_id == other.vault_update_id }
 }
 
-#[derive(Debug, Clone, Serialize, JsonSchema)]
+#[derive(TS, Debug, Clone, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct DocumentVersionWithoutContent {
+    #[ts(as = "i32")]
     pub vault_update_id: VaultUpdateId,
+
     pub document_id: DocumentId,
     pub relative_path: String,
     pub updated_date: DateTime<Utc>,
     pub is_deleted: bool,
     pub user_id: UserId,
     pub device_id: DeviceId,
+
+    #[ts(as = "i32")]
     pub content_size: u64,
 }
 
@@ -53,10 +58,12 @@ impl From<StoredDocumentVersion> for DocumentVersionWithoutContent {
     }
 }
 
-#[derive(Debug, Clone, Serialize, JsonSchema)]
+#[derive(TS, Debug, Clone, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct DocumentVersion {
+    #[ts(as = "i32")]
     pub vault_update_id: VaultUpdateId,
+
     pub document_id: DocumentId,
     pub relative_path: String,
     pub updated_date: DateTime<Utc>,
diff --git a/backend/sync_server/src/app_state/websocket.rs b/backend/sync_server/src/app_state/websocket.rs
new file mode 100644
index 00000000..b945606f
--- /dev/null
+++ b/backend/sync_server/src/app_state/websocket.rs
@@ -0,0 +1,3 @@
+pub mod broadcasts;
+pub mod models;
+pub mod utils;
diff --git a/backend/sync_server/src/app_state/broadcasts.rs b/backend/sync_server/src/app_state/websocket/broadcasts.rs
similarity index 53%
rename from backend/sync_server/src/app_state/broadcasts.rs
rename to backend/sync_server/src/app_state/websocket/broadcasts.rs
index f71886cf..cef6ee6a 100644
--- a/backend/sync_server/src/app_state/broadcasts.rs
+++ b/backend/sync_server/src/app_state/websocket/broadcasts.rs
@@ -3,19 +3,15 @@ use std::{collections::HashMap, sync::Arc};
 use anyhow::Context;
 use tokio::sync::{Mutex, broadcast};
 
-use super::database::models::{DeviceId, DocumentVersionWithoutContent, VaultId};
-use crate::{config::server_config::ServerConfig, errors::server_error};
+use super::models::WebSocketServerMessageWithOrigin;
+use crate::{
+    app_state::database::models::VaultId, config::server_config::ServerConfig, errors::server_error,
+};
 
 #[derive(Debug, Clone)]
 pub struct Broadcasts {
     max_clients_per_vault: usize,
-    tx: Arc<Mutex<HashMap<VaultId, broadcast::Sender<VaultUpdate>>>>,
-}
-
-#[derive(Debug, Clone)]
-pub struct VaultUpdate {
-    pub origin_device_id: Option<DeviceId>,
-    pub document: DocumentVersionWithoutContent,
+    tx: Arc<Mutex<HashMap<VaultId, broadcast::Sender<WebSocketServerMessageWithOrigin>>>>,
 }
 
 impl Broadcasts {
@@ -26,20 +22,27 @@ impl Broadcasts {
         }
     }
 
-    pub async fn get_receiver(&self, vault: VaultId) -> broadcast::Receiver<VaultUpdate> {
+    pub async fn get_receiver(
+        &self,
+        vault: VaultId,
+    ) -> broadcast::Receiver<WebSocketServerMessageWithOrigin> {
         let tx = self.get_or_create(vault).await;
 
         tx.subscribe()
     }
 
-    /// Sent a document update to all clients subscribed to the vault.
-    /// We ignore & log failures.
-    pub async fn send(&self, vault: VaultId, document: VaultUpdate) {
+    /// Notify all clients (who are subscribed to the vault) about an update.
+    /// We only log failures.
+    pub async fn send_document_update(
+        &self,
+        vault: VaultId,
+        document: WebSocketServerMessageWithOrigin,
+    ) {
         let tx = self.get_or_create(vault).await;
 
         let result = tx
             .send(document)
-            .context("Cannot broadcast update message to websocket listeners")
+            .context("Cannot broadcast server message to websocket listeners")
             .map_err(server_error);
 
         if result.is_err() {
@@ -47,7 +50,10 @@ impl Broadcasts {
         }
     }
 
-    async fn get_or_create(&self, vault: VaultId) -> broadcast::Sender<VaultUpdate> {
+    async fn get_or_create(
+        &self,
+        vault: VaultId,
+    ) -> broadcast::Sender<WebSocketServerMessageWithOrigin> {
         let mut tx = self.tx.lock().await;
 
         tx.entry(vault)
diff --git a/backend/sync_server/src/app_state/websocket/models.rs b/backend/sync_server/src/app_state/websocket/models.rs
new file mode 100644
index 00000000..6bb4f4e1
--- /dev/null
+++ b/backend/sync_server/src/app_state/websocket/models.rs
@@ -0,0 +1,88 @@
+use std::collections::HashMap;
+
+use serde::{Deserialize, Serialize};
+use ts_rs::TS;
+
+use crate::app_state::database::models::{DeviceId, DocumentVersionWithoutContent, VaultUpdateId};
+
+#[derive(TS, Deserialize, Clone, Debug)]
+#[serde(rename_all = "camelCase")]
+pub struct WebSocketHandshake {
+    pub token: String,
+    pub device_id: DeviceId,
+
+    #[ts(as = "Option<i32>")]
+    pub last_seen_vault_update_id: Option<VaultUpdateId>,
+}
+
+#[derive(TS, Serialize, Deserialize, Clone, Debug)]
+#[serde(rename_all = "camelCase")]
+pub struct CursorSpan {
+    pub start: usize,
+    pub end: usize,
+}
+
+#[derive(TS, Deserialize, Clone, Debug)]
+#[serde(rename_all = "camelCase")]
+pub struct CursorPositionFromClient {
+    pub document_to_cursors: HashMap<String, Vec<CursorSpan>>,
+}
+
+#[derive(TS, Serialize, Clone, Debug)]
+#[serde(rename_all = "camelCase")]
+pub struct ClientCursors {
+    pub user_name: String,
+    pub device_id: DeviceId,
+    pub cursors: HashMap<String, Vec<CursorSpan>>,
+}
+
+#[derive(TS, Serialize, Clone, Debug)]
+#[serde(rename_all = "camelCase")]
+pub struct CursorPositionFromServer {
+    pub clients: Vec<ClientCursors>,
+}
+
+#[derive(TS, Serialize, Clone, Debug)]
+#[serde(rename_all = "camelCase")]
+pub struct WebSocketVaultUpdate {
+    pub documents: Vec<DocumentVersionWithoutContent>,
+    pub is_initial_sync: bool,
+}
+
+#[derive(TS, Deserialize, Clone, Debug)]
+#[serde(rename_all = "camelCase", tag = "type")]
+#[ts(export)]
+pub enum WebSocketClientMessage {
+    Handshake(WebSocketHandshake),
+    CursorPositions(CursorPositionFromClient),
+}
+
+#[derive(TS, Serialize, Clone, Debug)]
+#[serde(rename_all = "camelCase", tag = "type")]
+#[ts(export)]
+pub enum WebSocketServerMessage {
+    VaultUpdate(WebSocketVaultUpdate),
+    CursorPositions(CursorPositionFromServer),
+}
+
+#[derive(Clone, Debug)]
+pub struct WebSocketServerMessageWithOrigin {
+    pub origin_device_id: Option<DeviceId>,
+    pub message: WebSocketServerMessage,
+}
+
+impl WebSocketServerMessageWithOrigin {
+    pub fn new(message: WebSocketServerMessage) -> Self {
+        Self {
+            origin_device_id: None,
+            message,
+        }
+    }
+
+    pub fn with_origin(origin_device_id: DeviceId, message: WebSocketServerMessage) -> Self {
+        Self {
+            origin_device_id: Some(origin_device_id),
+            message,
+        }
+    }
+}
diff --git a/backend/sync_server/src/app_state/websocket/utils.rs b/backend/sync_server/src/app_state/websocket/utils.rs
new file mode 100644
index 00000000..1e0dd243
--- /dev/null
+++ b/backend/sync_server/src/app_state/websocket/utils.rs
@@ -0,0 +1,80 @@
+use anyhow::Context;
+use axum::extract::ws::{Message, WebSocket};
+use futures::{sink::SinkExt, stream::SplitSink};
+
+use super::models::{WebSocketClientMessage, WebSocketHandshake, WebSocketServerMessage};
+use crate::{
+    app_state::{
+        AppState,
+        database::models::{DocumentVersionWithoutContent, VaultId, VaultUpdateId},
+    },
+    config::user_config::User,
+    errors::{SyncServerError, server_error, unauthenticated_error},
+    server::auth::auth,
+};
+
+pub struct AuthenticatedWebSocketHandshake {
+    pub handshake: WebSocketHandshake,
+    pub user: User,
+}
+
+pub fn get_authenticated_handshake(
+    state: &AppState,
+    vault_id: &VaultId,
+    message: Option<Message>,
+) -> Result<AuthenticatedWebSocketHandshake, SyncServerError> {
+    if let Some(Message::Text(message)) = message {
+        let message: WebSocketClientMessage = serde_json::from_str(&message)
+            .context("Failed to parse message")
+            .map_err(server_error)?;
+
+        match message {
+            WebSocketClientMessage::Handshake(handshake) => {
+                let user = auth(state, handshake.token.trim(), vault_id)?;
+                Ok(AuthenticatedWebSocketHandshake { handshake, user })
+            }
+            WebSocketClientMessage::CursorPositions(_) => Err(unauthenticated_error(
+                anyhow::anyhow!("Expected a handshake message"),
+            )),
+        }
+    } else {
+        Err(unauthenticated_error(anyhow::anyhow!(
+            "Failed to authenticate due to invalid message"
+        )))
+    }
+}
+
+pub async fn get_unseen_documents(
+    state: &AppState,
+    vault_id: &VaultId,
+    last_seen_vault_update_id: Option<VaultUpdateId>,
+) -> Result<Vec<DocumentVersionWithoutContent>, SyncServerError> {
+    if let Some(update_id) = last_seen_vault_update_id {
+        state
+            .database
+            .get_latest_documents_since(vault_id, update_id, None)
+            .await
+            .map_err(server_error)
+    } else {
+        state
+            .database
+            .get_latest_documents(vault_id, None)
+            .await
+            .map_err(server_error)
+    }
+}
+
+pub async fn send_update_over_websocket(
+    update: &WebSocketServerMessage,
+    sender: &mut SplitSink<WebSocket, Message>,
+) -> Result<(), SyncServerError> {
+    let serialized_update = serde_json::to_string(update)
+        .context("Failed to serialize update")
+        .map_err(server_error)?;
+
+    sender
+        .send(Message::Text(serialized_update))
+        .await
+        .context("Failed to send message over websocket")
+        .map_err(server_error)
+}
diff --git a/backend/sync_server/src/config.rs b/backend/sync_server/src/config.rs
index 8e4dcef3..700b1ea8 100644
--- a/backend/sync_server/src/config.rs
+++ b/backend/sync_server/src/config.rs
@@ -2,7 +2,7 @@ use std::path::Path;
 
 use anyhow::{Context as _, Result};
 use database_config::DatabaseConfig;
-use log::{info, warn};
+use log::info;
 use serde::{Deserialize, Serialize};
 use server_config::ServerConfig;
 use tokio::fs;
@@ -24,21 +24,23 @@ pub struct Config {
 
 impl Config {
     pub async fn read_or_create(path: &Path) -> Result<Self> {
-        if path.exists() {
+        let config = if path.exists() {
             info!(
                 "Loading configuration from '{}'",
                 path.canonicalize().unwrap().display()
             );
-            Self::load_from_file(path).await
+            Self::load_from_file(path).await?
         } else {
-            let config = Self::default();
-            config.write(path).await?;
-            warn!(
-                "Configuration file not found, wrote default configuration to '{}'",
-                path.canonicalize().unwrap().display()
-            );
-            Ok(config)
-        }
+            Self::default()
+        };
+
+        config.write(path).await?;
+        info!(
+            "Updated configuration at '{}'",
+            path.canonicalize().unwrap().display()
+        );
+
+        Ok(config)
     }
 
     pub async fn load_from_file(path: &Path) -> Result<Self> {
diff --git a/backend/sync_server/src/config/database_config.rs b/backend/sync_server/src/config/database_config.rs
index ef26a09d..f1c92d9d 100644
--- a/backend/sync_server/src/config/database_config.rs
+++ b/backend/sync_server/src/config/database_config.rs
@@ -1,10 +1,14 @@
-use std::path::PathBuf;
+use std::{path::PathBuf, time::Duration};
 
 use log::debug;
 use serde::{Deserialize, Serialize};
+use serde_with::serde_as;
 
-use crate::consts::{DEFAULT_DATABASES_DIRECTORY_PATH, DEFAULT_MAX_CONNECTIONS_PER_VAULT};
+use crate::consts::{
+    DEFAULT_CURSOR_TIMEOUT, DEFAULT_DATABASES_DIRECTORY_PATH, DEFAULT_MAX_CONNECTIONS_PER_VAULT,
+};
 
+#[serde_with::serde_as]
 #[derive(Debug, Deserialize, Serialize, Clone)]
 pub struct DatabaseConfig {
     #[serde(default = "default_databases_directory_path")]
@@ -12,6 +16,10 @@ pub struct DatabaseConfig {
 
     #[serde(default = "default_max_connections_per_vault")]
     pub max_connections_per_vault: u32,
+
+    #[serde(default = "default_cursor_timeout", rename = "cursor_timeout_seconds")]
+    #[serde_as(as = "serde_with::DurationSeconds<u64>")]
+    pub cursor_timeout: Duration,
 }
 
 fn default_databases_directory_path() -> PathBuf {
@@ -24,11 +32,17 @@ fn default_max_connections_per_vault() -> u32 {
     DEFAULT_MAX_CONNECTIONS_PER_VAULT
 }
 
+fn default_cursor_timeout() -> Duration {
+    debug!("Using default cursor timeout: {DEFAULT_CURSOR_TIMEOUT:?}");
+    DEFAULT_CURSOR_TIMEOUT
+}
+
 impl Default for DatabaseConfig {
     fn default() -> Self {
         Self {
             databases_directory_path: default_databases_directory_path(),
             max_connections_per_vault: default_max_connections_per_vault(),
+            cursor_timeout: default_cursor_timeout(),
         }
     }
 }
diff --git a/backend/sync_server/src/consts.rs b/backend/sync_server/src/consts.rs
index 57fb2559..df5a2844 100644
--- a/backend/sync_server/src/consts.rs
+++ b/backend/sync_server/src/consts.rs
@@ -1,8 +1,13 @@
+use std::time::Duration;
+
 pub const DEFAULT_CONFIG_PATH: &str = "config.yml";
+
 pub const DEFAULT_DATABASES_DIRECTORY_PATH: &str = "databases";
+pub const DEFAULT_MAX_CONNECTIONS_PER_VAULT: u32 = 12;
+pub const DEFAULT_CURSOR_TIMEOUT: Duration = Duration::from_secs(60);
+
 pub const DEFAULT_HOST: &str = "127.0.0.1";
 pub const DEFAULT_PORT: u16 = 3000;
-pub const DEFAULT_MAX_CONNECTIONS_PER_VAULT: u32 = 12;
 pub const DEFAULT_MAX_BODY_SIZE_MB: usize = 4096;
 pub const DEFAULT_RESPONSE_TIMEOUT_SECONDS: u64 = 60;
 pub const DEFAULT_MAX_CLIENTS_PER_VAULT: usize = 256;
diff --git a/backend/sync_server/src/errors.rs b/backend/sync_server/src/errors.rs
index a16f7137..987c3011 100644
--- a/backend/sync_server/src/errors.rs
+++ b/backend/sync_server/src/errors.rs
@@ -1,15 +1,14 @@
 use std::fmt::Display;
 
-use aide::OperationOutput;
 use axum::{
     Json,
     http::StatusCode,
     response::{IntoResponse, Response},
 };
-use log::{error, info};
-use schemars::JsonSchema;
+use log::{debug, error};
 use serde::Serialize;
 use thiserror::Error;
+use ts_rs::TS;
 
 #[derive(Error, Debug)]
 pub enum SyncServerError {
@@ -45,8 +44,11 @@ impl SyncServerError {
     }
 }
 
-#[derive(Debug, Clone, Serialize, JsonSchema)]
+#[derive(TS, Debug, Clone, Serialize)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
 pub struct SerializedError {
+    pub error_type: &'static str,
     pub message: String,
     pub causes: Vec<String>,
 }
@@ -90,41 +92,49 @@ impl From<&anyhow::Error> for SerializedError {
         }
 
         SerializedError {
+            error_type: error.downcast_ref::<SyncServerError>().map_or(
+                "UnknownError",
+                |e| match e {
+                    SyncServerError::InitError(_) => "InitError",
+                    SyncServerError::ClientError(_) => "ClientError",
+                    SyncServerError::ServerError(_) => "ServerError",
+                    SyncServerError::NotFound(_) => "NotFound",
+                    SyncServerError::Unauthenticated(_) => "Unauthenticated",
+                    SyncServerError::PermissionDeniedError(_) => "PermissionDeniedError",
+                },
+            ),
             message: error.to_string(),
             causes,
         }
     }
 }
 
-impl OperationOutput for SyncServerError {
-    type Inner = Self;
-}
-
-pub const fn init_error(error: anyhow::Error) -> SyncServerError {
+pub fn init_error(error: anyhow::Error) -> SyncServerError {
+    debug!("Initialization error: {error:?}");
     SyncServerError::InitError(error)
 }
 
 pub fn server_error(error: anyhow::Error) -> SyncServerError {
-    error!("Server error: {error:?}");
+    debug!("Server error: {error:?}");
     SyncServerError::ServerError(error)
 }
 
 pub fn client_error(error: anyhow::Error) -> SyncServerError {
-    info!("Client error: {error:?}");
+    debug!("Client error: {error:?}");
     SyncServerError::ClientError(error)
 }
 
 pub fn not_found_error(error: anyhow::Error) -> SyncServerError {
-    info!("Not found: {error:?}");
+    debug!("Not found: {error:?}");
     SyncServerError::NotFound(error)
 }
 
 pub fn unauthenticated_error(error: anyhow::Error) -> SyncServerError {
-    info!("Unauthenticated user: {error:?}");
+    debug!("Unauthenticated user: {error:?}");
     SyncServerError::Unauthenticated(error)
 }
 
 pub fn permission_denied_error(error: anyhow::Error) -> SyncServerError {
-    info!("Permission denied: {error:?}");
+    debug!("Permission denied: {error:?}");
     SyncServerError::PermissionDeniedError(error)
 }
diff --git a/backend/sync_server/src/server.rs b/backend/sync_server/src/server.rs
index 0fd5fa03..3f659c97 100644
--- a/backend/sync_server/src/server.rs
+++ b/backend/sync_server/src/server.rs
@@ -1,4 +1,4 @@
-mod auth;
+pub mod auth;
 mod create_document;
 mod delete_document;
 mod device_id_header;
@@ -6,35 +6,27 @@ mod fetch_document_version;
 mod fetch_document_version_content;
 mod fetch_latest_document_version;
 mod fetch_latest_documents;
+mod index;
 mod ping;
 mod requests;
 mod responses;
 mod update_document;
 mod websocket;
 
-use std::{ffi::OsString, sync::Arc, time::Duration};
+use std::{ffi::OsString, time::Duration};
 
-use aide::{
-    axum::{
-        ApiRouter,
-        routing::{delete, get, post, put},
-    },
-    openapi::{Info, OpenApi},
-    scalar::Scalar,
-    transform::TransformOpenApi,
-};
 use anyhow::{Context as _, Result, anyhow};
 use auth::auth_middleware;
 use axum::{
-    Extension, Json,
+    Router,
     extract::{DefaultBodyLimit, Request},
     http::{self, HeaderValue, Method},
     middleware,
     response::IntoResponse,
-    routing::IntoMakeService,
+    routing::{IntoMakeService, delete, get, post, put},
 };
 use device_id_header::DEVICE_ID_HEADER_NAME;
-use log::{error, info};
+use log::info;
 use tokio::signal;
 use tower_http::{
     LatencyUnit,
@@ -51,26 +43,21 @@ use tracing::{Level, info_span};
 use crate::{
     app_state::AppState,
     config::server_config::ServerConfig,
-    errors::{SerializedError, client_error, not_found_error},
+    errors::{client_error, not_found_error},
 };
 
 pub async fn create_server(config_path: Option<OsString>) -> Result<()> {
-    aide::r#gen::on_error(|err| error!("{err}"));
-    aide::r#gen::extract_schemas(true);
-
     let app_state = AppState::try_new(config_path)
         .await
         .context("Failed to initialise app state")?;
 
     let server_config = app_state.config.server.clone();
 
-    let mut api = create_open_api();
-    let app = ApiRouter::new()
+    let app = Router::new()
         .nest("/", get_authed_routes(app_state.clone()))
-        .api_route("/vaults/:vault_id/ping", get(ping::ping))
+        .route("/", get(index::index))
+        .route("/vaults/:vault_id/ping", get(ping::ping))
         .route("/vaults/:vault_id/ws", get(websocket::websocket_handler))
-        .route("/", Scalar::new("/api.json").axum_route())
-        .route("/api.json", axum::routing::get(serve_api))
         .layer(DefaultBodyLimit::disable())
         .layer(RequestBodyLimitLayer::new(
             app_state.config.server.max_body_size_mb * 1024 * 1024,
@@ -108,8 +95,6 @@ pub async fn create_server(config_path: Option<OsString>) -> Result<()> {
                 .on_failure(DefaultOnFailure::new().level(Level::ERROR)),
         )
         .with_state(app_state)
-        .finish_api_with(&mut api, add_api_docs_error_example)
-        .layer(Extension(Arc::new(api))) // https://github.com/tamasfe/aide/blob/507f4a8822bc0c13cbda0f589da1e0f4cbcdb812/examples/example-axum/src/main.rs#L39
         .fallback(handle_404)
         .fallback(handle_405)
         .into_make_service();
@@ -117,67 +102,33 @@ pub async fn create_server(config_path: Option<OsString>) -> Result<()> {
     start_server(app, &server_config).await
 }
 
-async fn serve_api(Extension(api): Extension<Arc<OpenApi>>) -> impl IntoResponse { Json(api) }
-
-fn create_open_api() -> OpenApi {
-    OpenApi {
-        info: Info {
-            title: "VaultLink sync server".to_owned(),
-            summary: Some(
-                "Simple API for syncing documents between concurrent clients.".to_owned(),
-            ),
-            description: Some(include_str!("../README.md").to_owned()),
-            version: env!("CARGO_PKG_VERSION").to_owned(),
-            ..Info::default()
-        },
-        ..OpenApi::default()
-    }
-}
-
-fn add_api_docs_error_example(api: TransformOpenApi<'_>) -> TransformOpenApi<'_> {
-    api.default_response_with::<Json<SerializedError>, _>(|res| {
-        res.example(SerializedError {
-            message: "An error has occurred".to_owned(),
-            causes: vec![],
-        })
-    })
-}
-
-fn get_authed_routes(app_state: AppState) -> ApiRouter<AppState> {
-    ApiRouter::new()
-        .api_route(
+fn get_authed_routes(app_state: AppState) -> Router<AppState> {
+    Router::new()
+        .route(
             "/vaults/:vault_id/documents",
             get(fetch_latest_documents::fetch_latest_documents),
         )
-        .api_route(
+        .route(
             "/vaults/:vault_id/documents",
-            post(create_document::create_document_multipart),
+            post(create_document::create_document),
         )
-        .api_route(
-            "/vaults/:vault_id/documents/json",
-            post(create_document::create_document_json),
-        )
-        .api_route(
+        .route(
             "/vaults/:vault_id/documents/:document_id",
             get(fetch_latest_document_version::fetch_latest_document_version),
         )
-        .api_route(
+        .route(
             "/vaults/:vault_id/documents/:document_id",
-            put(update_document::update_document_multipart),
+            put(update_document::update_document),
         )
-        .api_route(
-            "/vaults/:vault_id/documents/:document_id/json",
-            put(update_document::update_document_json),
-        )
-        .api_route(
+        .route(
             "/vaults/:vault_id/documents/:document_id/versions/:version_id",
             put(fetch_document_version::fetch_document_version),
         )
-        .api_route(
+        .route(
             "/vaults/:vault_id/documents/:document_id/versions/:version_id/content",
             put(fetch_document_version_content::fetch_document_version_content),
         )
-        .api_route(
+        .route(
             "/vaults/:vault_id/documents/:document_id",
             delete(delete_document::delete_document),
         )
diff --git a/backend/sync_server/src/server/assets/index.html b/backend/sync_server/src/server/assets/index.html
new file mode 100644
index 00000000..ef9c5a6d
--- /dev/null
+++ b/backend/sync_server/src/server/assets/index.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>VaultLink</title>
+    </head>
+    <body>
+        <h1>VaultLink server</h1>
+    </body>
+</html>
diff --git a/backend/sync_server/src/server/auth.rs b/backend/sync_server/src/server/auth.rs
index 6727501e..d27c16e3 100644
--- a/backend/sync_server/src/server/auth.rs
+++ b/backend/sync_server/src/server/auth.rs
@@ -47,19 +47,22 @@ pub fn auth(state: &AppState, token: &str, vault_id: &VaultId) -> Result<User, S
         .cloned()
         .ok_or_else(|| unauthenticated_error(anyhow::anyhow!("Invalid token")))?;
 
-    info!("User `{}` authenticated", user.name);
-
     if match user.vault_access {
         VaultAccess::AllowAccessToAll => true,
         VaultAccess::AllowList(AllowListedVaults { ref allowed }) => allowed.contains(vault_id),
     } {
         info!(
-            "User `{}` is authorised to access to vault `{}`",
-            user.name, vault_id
+            "User '{}' is authenticated and is authorised to access to vault '{vault_id}'",
+            user.name
         );
 
         Ok(user)
     } else {
+        info!(
+            "User '{}' is authenticated but is not authorised to access vault '{vault_id}'",
+            user.name
+        );
+
         Err(permission_denied_error(anyhow::anyhow!(
             "Permission denied for vault `{vault_id}`"
         )))
diff --git a/backend/sync_server/src/server/create_document.rs b/backend/sync_server/src/server/create_document.rs
index b9459df5..7018d8cf 100644
--- a/backend/sync_server/src/server/create_document.rs
+++ b/backend/sync_server/src/server/create_document.rs
@@ -1,34 +1,24 @@
-use aide_axum_typed_multipart::TypedMultipart;
 use anyhow::Context as _;
 use axum::{
-    Extension,
+    Extension, Json,
     extract::{Path, State},
 };
 use axum_extra::TypedHeader;
-use axum_jsonschema::Json;
-use schemars::JsonSchema;
+use axum_typed_multipart::TypedMultipart;
 use serde::Deserialize;
-use sync_lib::base64_to_bytes;
 
-use super::{
-    device_id_header::DeviceIdHeader,
-    requests::{CreateDocumentVersion, CreateDocumentVersionMultipart},
-};
+use super::{device_id_header::DeviceIdHeader, requests::CreateDocumentVersion};
 use crate::{
     app_state::{
         AppState,
-        broadcasts::VaultUpdate,
-        database::models::{
-            DeviceId, DocumentId, DocumentVersionWithoutContent, StoredDocumentVersion, VaultId,
-        },
+        database::models::{DocumentVersionWithoutContent, StoredDocumentVersion, VaultId},
     },
     config::user_config::User,
     errors::{SyncServerError, client_error, server_error},
     utils::{normalize::normalize, sanitize_path::sanitize_path},
 };
 
-// This is required for aide to infer the path parameter types and names
-#[derive(Deserialize, JsonSchema)]
+#[derive(Deserialize)]
 pub struct CreateDocumentPathParams {
     #[serde(deserialize_with = "normalize")]
     vault_id: VaultId,
@@ -38,66 +28,12 @@ pub struct CreateDocumentPathParams {
 /// already. If a document with the same path exists, a new version is created
 /// with their content merged.
 #[axum::debug_handler]
-pub async fn create_document_multipart(
+pub async fn create_document(
     Path(CreateDocumentPathParams { vault_id }): Path<CreateDocumentPathParams>,
     Extension(user): Extension<User>,
-    TypedHeader(user_agent): TypedHeader<DeviceIdHeader>,
+    TypedHeader(device_id): TypedHeader<DeviceIdHeader>,
     State(state): State<AppState>,
-    TypedMultipart(axum_typed_multipart::TypedMultipart(request)): TypedMultipart<
-        CreateDocumentVersionMultipart,
-    >,
-) -> Result<Json<DocumentVersionWithoutContent>, SyncServerError> {
-    internal_create_document(
-        user,
-        user_agent,
-        state,
-        vault_id,
-        request.document_id,
-        request.relative_path,
-        request.device_id,
-        request.content.contents.to_vec(),
-    )
-    .await
-}
-
-/// Create a new document in case a document with the same doesn't exist
-/// already. If a document with the same path exists, a new version is created
-/// with their content merged.
-#[axum::debug_handler]
-pub async fn create_document_json(
-    Path(CreateDocumentPathParams { vault_id }): Path<CreateDocumentPathParams>,
-    Extension(user): Extension<User>,
-    TypedHeader(user_agent): TypedHeader<DeviceIdHeader>,
-    State(state): State<AppState>,
-    Json(request): Json<CreateDocumentVersion>,
-) -> Result<Json<DocumentVersionWithoutContent>, SyncServerError> {
-    let content_bytes = base64_to_bytes(&request.content_base64)
-        .context("Failed to decode base64 content in request")
-        .map_err(client_error)?;
-
-    internal_create_document(
-        user,
-        user_agent,
-        state,
-        vault_id,
-        request.document_id,
-        request.relative_path,
-        request.device_id,
-        content_bytes,
-    )
-    .await
-}
-
-#[allow(clippy::too_many_arguments)]
-async fn internal_create_document(
-    user: User,
-    user_agent: DeviceIdHeader,
-    state: AppState,
-    vault_id: VaultId,
-    document_id: Option<DocumentId>,
-    relative_path: String,
-    device_id: Option<DeviceId>,
-    content: Vec<u8>,
+    TypedMultipart(request): TypedMultipart<CreateDocumentVersion>,
 ) -> Result<Json<DocumentVersionWithoutContent>, SyncServerError> {
     let mut transaction = state
         .database
@@ -105,7 +41,7 @@ async fn internal_create_document(
         .await
         .map_err(server_error)?;
 
-    let document_id = match document_id {
+    let document_id = match request.document_id {
         Some(document_id) => {
             let existing_version = state
                 .database
@@ -130,17 +66,17 @@ async fn internal_create_document(
         .await
         .map_err(server_error)?;
 
-    let sanitized_relative_path = sanitize_path(&relative_path);
+    let sanitized_relative_path = sanitize_path(&request.relative_path);
 
     let new_version = StoredDocumentVersion {
         vault_update_id: last_update_id + 1,
         document_id,
         relative_path: sanitized_relative_path,
-        content,
+        content: request.content.contents.to_vec(),
         updated_date: chrono::Utc::now(),
         is_deleted: false,
         user_id: user.name,
-        device_id: user_agent.0,
+        device_id: device_id.0,
     };
 
     state
@@ -155,16 +91,5 @@ async fn internal_create_document(
         .context("Failed to commit successful transaction")
         .map_err(server_error)?;
 
-    state
-        .broadcasts
-        .send(
-            vault_id,
-            VaultUpdate {
-                origin_device_id: device_id,
-                document: new_version.clone().into(),
-            },
-        )
-        .await;
-
     Ok(Json(new_version.into()))
 }
diff --git a/backend/sync_server/src/server/delete_document.rs b/backend/sync_server/src/server/delete_document.rs
index dbb9a0df..5b7cd6ef 100644
--- a/backend/sync_server/src/server/delete_document.rs
+++ b/backend/sync_server/src/server/delete_document.rs
@@ -1,18 +1,15 @@
 use anyhow::Context as _;
 use axum::{
-    Extension,
+    Extension, Json,
     extract::{Path, State},
 };
 use axum_extra::TypedHeader;
-use axum_jsonschema::Json;
-use schemars::JsonSchema;
 use serde::Deserialize;
 
 use super::{device_id_header::DeviceIdHeader, requests::DeleteDocumentVersion};
 use crate::{
     app_state::{
         AppState,
-        broadcasts::VaultUpdate,
         database::models::{
             DocumentId, DocumentVersionWithoutContent, StoredDocumentVersion, VaultId,
         },
@@ -22,8 +19,7 @@ use crate::{
     utils::{normalize::normalize, sanitize_path::sanitize_path},
 };
 
-// This is required for aide to infer the path parameter types and names
-#[derive(Deserialize, JsonSchema)]
+#[derive(Deserialize)]
 pub struct DeleteDocumentPathParams {
     #[serde(deserialize_with = "normalize")]
     vault_id: VaultId,
@@ -38,7 +34,7 @@ pub async fn delete_document(
         document_id,
     }): Path<DeleteDocumentPathParams>,
     Extension(user): Extension<User>,
-    TypedHeader(user_agent): TypedHeader<DeviceIdHeader>,
+    TypedHeader(device_id): TypedHeader<DeviceIdHeader>,
     State(state): State<AppState>,
     Json(request): Json<DeleteDocumentVersion>,
 ) -> Result<Json<DocumentVersionWithoutContent>, SyncServerError> {
@@ -69,7 +65,7 @@ pub async fn delete_document(
         updated_date: chrono::Utc::now(),
         is_deleted: true,
         user_id: user.name,
-        device_id: user_agent.0,
+        device_id: device_id.0,
     };
 
     state
@@ -84,16 +80,5 @@ pub async fn delete_document(
         .context("Failed to commit successful transaction")
         .map_err(server_error)?;
 
-    state
-        .broadcasts
-        .send(
-            vault_id,
-            VaultUpdate {
-                origin_device_id: request.device_id,
-                document: new_version.clone().into(),
-            },
-        )
-        .await;
-
     Ok(Json(new_version.into()))
 }
diff --git a/backend/sync_server/src/server/fetch_document_version.rs b/backend/sync_server/src/server/fetch_document_version.rs
index ee8f6c55..5b571a7b 100644
--- a/backend/sync_server/src/server/fetch_document_version.rs
+++ b/backend/sync_server/src/server/fetch_document_version.rs
@@ -1,7 +1,8 @@
 use anyhow::anyhow;
-use axum::extract::{Path, State};
-use axum_jsonschema::Json;
-use schemars::JsonSchema;
+use axum::{
+    Json,
+    extract::{Path, State},
+};
 use serde::Deserialize;
 
 use crate::{
@@ -13,8 +14,7 @@ use crate::{
     utils::normalize::normalize,
 };
 
-// This is required for aide to infer the path parameter types and names
-#[derive(Deserialize, JsonSchema)]
+#[derive(Deserialize)]
 pub struct FetchDocumentVersionPathParams {
     #[serde(deserialize_with = "normalize")]
     vault_id: VaultId,
diff --git a/backend/sync_server/src/server/fetch_document_version_content.rs b/backend/sync_server/src/server/fetch_document_version_content.rs
index 50cacca1..a419b7bf 100644
--- a/backend/sync_server/src/server/fetch_document_version_content.rs
+++ b/backend/sync_server/src/server/fetch_document_version_content.rs
@@ -3,7 +3,6 @@ use axum::{
     body::Bytes,
     extract::{Path, State},
 };
-use schemars::JsonSchema;
 use serde::Deserialize;
 
 use crate::{
@@ -15,8 +14,7 @@ use crate::{
     utils::normalize::normalize,
 };
 
-// This is required for aide to infer the path parameter types and names
-#[derive(Deserialize, JsonSchema)]
+#[derive(Deserialize)]
 pub struct FetchDocumentVersionContentPathParams {
     #[serde(deserialize_with = "normalize")]
     vault_id: VaultId,
diff --git a/backend/sync_server/src/server/fetch_latest_document_version.rs b/backend/sync_server/src/server/fetch_latest_document_version.rs
index 3b85ed37..07f07860 100644
--- a/backend/sync_server/src/server/fetch_latest_document_version.rs
+++ b/backend/sync_server/src/server/fetch_latest_document_version.rs
@@ -1,7 +1,8 @@
 use anyhow::anyhow;
-use axum::extract::{Path, State};
-use axum_jsonschema::Json;
-use schemars::JsonSchema;
+use axum::{
+    Json,
+    extract::{Path, State},
+};
 use serde::Deserialize;
 
 use crate::{
@@ -13,8 +14,7 @@ use crate::{
     utils::normalize::normalize,
 };
 
-// This is required for aide to infer the path parameter types and names
-#[derive(Deserialize, JsonSchema)]
+#[derive(Deserialize)]
 pub struct FetchLatestDocumentVersionPathParams {
     #[serde(deserialize_with = "normalize")]
     vault_id: VaultId,
diff --git a/backend/sync_server/src/server/fetch_latest_documents.rs b/backend/sync_server/src/server/fetch_latest_documents.rs
index e78b7594..6101f55c 100644
--- a/backend/sync_server/src/server/fetch_latest_documents.rs
+++ b/backend/sync_server/src/server/fetch_latest_documents.rs
@@ -1,6 +1,7 @@
-use axum::extract::{Path, Query, State};
-use axum_jsonschema::Json;
-use schemars::JsonSchema;
+use axum::{
+    Json,
+    extract::{Path, Query, State},
+};
 use serde::Deserialize;
 
 use super::responses::FetchLatestDocumentsResponse;
@@ -13,15 +14,13 @@ use crate::{
     utils::normalize::normalize,
 };
 
-// This is required for aide to infer the path parameter types and names
-#[derive(Deserialize, JsonSchema)]
+#[derive(Deserialize)]
 pub struct FetchLatestDocumentsPathParams {
     #[serde(deserialize_with = "normalize")]
     vault_id: VaultId,
 }
 
-// This is required for aide to infer the path parameter types and names
-#[derive(Deserialize, JsonSchema)]
+#[derive(Deserialize)]
 pub struct QueryParams {
     since_update_id: Option<VaultUpdateId>,
 }
diff --git a/backend/sync_server/src/server/index.rs b/backend/sync_server/src/server/index.rs
new file mode 100644
index 00000000..64b053f7
--- /dev/null
+++ b/backend/sync_server/src/server/index.rs
@@ -0,0 +1,7 @@
+use axum::response::{Html, IntoResponse};
+
+pub async fn index() -> impl IntoResponse {
+    const HTML_CONTENT: &str = include_str!("./assets/index.html");
+    let html_content = HTML_CONTENT;
+    Html(html_content)
+}
diff --git a/backend/sync_server/src/server/ping.rs b/backend/sync_server/src/server/ping.rs
index 96a8d82a..620ef0d4 100644
--- a/backend/sync_server/src/server/ping.rs
+++ b/backend/sync_server/src/server/ping.rs
@@ -6,7 +6,6 @@ use axum_extra::{
     TypedHeader,
     headers::{Authorization, authorization::Bearer},
 };
-use schemars::JsonSchema;
 use serde::Deserialize;
 
 use super::{auth::auth, responses::PingResponse};
@@ -16,8 +15,7 @@ use crate::{
     utils::normalize::normalize,
 };
 
-// This is required for aide to infer the path parameter types and names
-#[derive(Deserialize, JsonSchema)]
+#[derive(Deserialize)]
 pub struct PingPathParams {
     #[serde(deserialize_with = "normalize")]
     vault_id: VaultId,
diff --git a/backend/sync_server/src/server/requests.rs b/backend/sync_server/src/server/requests.rs
index 26e6a398..9d1e478b 100644
--- a/backend/sync_server/src/server/requests.rs
+++ b/backend/sync_server/src/server/requests.rs
@@ -1,13 +1,12 @@
-use aide_axum_typed_multipart::FieldData;
 use axum::body::Bytes;
-use axum_typed_multipart::TryFromMultipart;
-use schemars::JsonSchema;
+use axum_typed_multipart::{FieldData, TryFromMultipart};
 use serde::{self, Deserialize};
+use ts_rs::TS;
 
-use crate::app_state::database::models::{DeviceId, DocumentId, VaultUpdateId};
+use crate::app_state::database::models::{DocumentId, VaultUpdateId};
 
-#[derive(Debug, Deserialize, JsonSchema)]
-#[serde(rename_all = "camelCase")]
+#[derive(TS, Debug, TryFromMultipart)]
+#[ts(export)]
 pub struct CreateDocumentVersion {
     /// The client can decide the document id (if it wishes to) in order
     /// to help with syncing. If the client does not provide a document id,
@@ -15,41 +14,26 @@ pub struct CreateDocumentVersion {
     /// it must not already exist in the database.
     pub document_id: Option<DocumentId>,
     pub relative_path: String,
-    pub content_base64: String,
-    pub device_id: Option<DeviceId>,
-}
 
-#[derive(Debug, TryFromMultipart, JsonSchema)]
-pub struct CreateDocumentVersionMultipart {
-    pub document_id: Option<DocumentId>,
-    pub relative_path: String,
+    #[ts(as = "Vec<u8>")]
     #[form_data(limit = "unlimited")]
     pub content: FieldData<Bytes>,
-    pub device_id: Option<DeviceId>,
 }
 
-#[derive(Debug, Deserialize, JsonSchema)]
-#[serde(rename_all = "camelCase")]
+#[derive(TS, Debug, TryFromMultipart)]
+#[ts(export)]
 pub struct UpdateDocumentVersion {
     pub parent_version_id: VaultUpdateId,
     pub relative_path: String,
-    pub content_base64: String,
-    pub device_id: Option<DeviceId>,
-}
 
-#[derive(Debug, TryFromMultipart, JsonSchema)]
-#[serde(rename_all = "camelCase")]
-pub struct UpdateDocumentVersionMultipart {
-    pub parent_version_id: VaultUpdateId,
-    pub relative_path: String,
+    #[ts(as = "Vec<u8>")]
     #[form_data(limit = "unlimited")]
     pub content: FieldData<Bytes>,
-    pub device_id: Option<DeviceId>,
 }
 
-#[derive(Debug, Deserialize, JsonSchema)]
+#[derive(TS, Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
+#[ts(export)]
 pub struct DeleteDocumentVersion {
     pub relative_path: String,
-    pub device_id: Option<DeviceId>,
 }
diff --git a/backend/sync_server/src/server/responses.rs b/backend/sync_server/src/server/responses.rs
index 993bc7e7..5cfaa5d5 100644
--- a/backend/sync_server/src/server/responses.rs
+++ b/backend/sync_server/src/server/responses.rs
@@ -1,13 +1,14 @@
-use schemars::JsonSchema;
 use serde::{self, Serialize};
+use ts_rs::TS;
 
 use crate::app_state::database::models::{
     DocumentVersion, DocumentVersionWithoutContent, VaultUpdateId,
 };
 
 /// Response to a ping request.
-#[derive(Debug, Clone, Serialize, JsonSchema)]
+#[derive(TS, Debug, Clone, Serialize)]
 #[serde(rename_all = "camelCase")]
+#[ts(export)]
 pub struct PingResponse {
     /// Semantic version of the server.
     pub server_version: String,
@@ -18,8 +19,9 @@ pub struct PingResponse {
 }
 
 /// Response to a fetch latest documents request.
-#[derive(Debug, Clone, Serialize, JsonSchema)]
+#[derive(TS, Debug, Clone, Serialize)]
 #[serde(rename_all = "camelCase")]
+#[ts(export)]
 pub struct FetchLatestDocumentsResponse {
     pub latest_documents: Vec<DocumentVersionWithoutContent>,
 
@@ -28,8 +30,9 @@ pub struct FetchLatestDocumentsResponse {
 }
 
 /// Response to an update document request.
-#[derive(Debug, Clone, Serialize, JsonSchema)]
+#[derive(TS, Debug, Clone, Serialize)]
 #[serde(tag = "type")]
+#[ts(export)]
 pub enum DocumentUpdateResponse {
     /// Returned when the created/updated document's content is the same as was
     /// sent in the create/update request and thus the response doesn't contain
diff --git a/backend/sync_server/src/server/update_document.rs b/backend/sync_server/src/server/update_document.rs
index 22eb38b0..a3ab25e1 100644
--- a/backend/sync_server/src/server/update_document.rs
+++ b/backend/sync_server/src/server/update_document.rs
@@ -1,34 +1,29 @@
-use aide_axum_typed_multipart::TypedMultipart;
 use anyhow::{Context as _, anyhow};
 use axum::{
-    Extension,
+    Extension, Json,
     extract::{Path, State},
 };
 use axum_extra::TypedHeader;
-use axum_jsonschema::Json;
+use axum_typed_multipart::TypedMultipart;
 use log::info;
-use schemars::JsonSchema;
 use serde::Deserialize;
-use sync_lib::{base64_to_bytes, is_file_type_mergable, merge};
+use sync_lib::{is_file_type_mergable, merge};
 
 use super::{
-    device_id_header::DeviceIdHeader,
-    requests::{UpdateDocumentVersion, UpdateDocumentVersionMultipart},
+    device_id_header::DeviceIdHeader, requests::UpdateDocumentVersion,
     responses::DocumentUpdateResponse,
 };
 use crate::{
     app_state::{
         AppState,
-        broadcasts::VaultUpdate,
-        database::models::{DeviceId, DocumentId, StoredDocumentVersion, VaultId, VaultUpdateId},
+        database::models::{DocumentId, StoredDocumentVersion, VaultId},
     },
     config::user_config::User,
-    errors::{SyncServerError, client_error, not_found_error, server_error},
+    errors::{SyncServerError, not_found_error, server_error},
     utils::{dedup_paths::dedup_paths, normalize::normalize, sanitize_path::sanitize_path},
 };
 
-// This is required for aide to infer the path parameter types and names
-#[derive(Deserialize, JsonSchema)]
+#[derive(Deserialize)]
 pub struct UpdateDocumentPathParams {
     #[serde(deserialize_with = "normalize")]
     vault_id: VaultId,
@@ -37,90 +32,34 @@ pub struct UpdateDocumentPathParams {
 }
 
 #[axum::debug_handler]
-pub async fn update_document_multipart(
+#[allow(clippy::too_many_lines)]
+pub async fn update_document(
     Path(UpdateDocumentPathParams {
         vault_id,
         document_id,
     }): Path<UpdateDocumentPathParams>,
     Extension(user): Extension<User>,
-    TypedHeader(user_agent): TypedHeader<DeviceIdHeader>,
+    TypedHeader(device_id): TypedHeader<DeviceIdHeader>,
     State(state): State<AppState>,
-    TypedMultipart(axum_typed_multipart::TypedMultipart(request)): TypedMultipart<
-        UpdateDocumentVersionMultipart,
-    >,
-) -> Result<Json<DocumentUpdateResponse>, SyncServerError> {
-    internal_update_document(
-        user,
-        user_agent,
-        state,
-        vault_id,
-        document_id,
-        request.parent_version_id,
-        request.relative_path,
-        request.device_id,
-        request.content.contents.to_vec(),
-    )
-    .await
-}
-
-#[axum::debug_handler]
-pub async fn update_document_json(
-    Path(UpdateDocumentPathParams {
-        vault_id,
-        document_id,
-    }): Path<UpdateDocumentPathParams>,
-    Extension(user): Extension<User>,
-    TypedHeader(user_agent): TypedHeader<DeviceIdHeader>,
-    State(state): State<AppState>,
-    Json(request): Json<UpdateDocumentVersion>,
-) -> Result<Json<DocumentUpdateResponse>, SyncServerError> {
-    let content_bytes = base64_to_bytes(&request.content_base64)
-        .context("Failed to decode base64 content in request")
-        .map_err(client_error)?;
-
-    internal_update_document(
-        user,
-        user_agent,
-        state,
-        vault_id,
-        document_id,
-        request.parent_version_id,
-        request.relative_path,
-        request.device_id,
-        content_bytes,
-    )
-    .await
-}
-
-#[allow(clippy::too_many_arguments, clippy::too_many_lines)]
-async fn internal_update_document(
-    user: User,
-    user_agent: DeviceIdHeader,
-    state: AppState,
-    vault_id: VaultId,
-    document_id: DocumentId,
-    parent_version_id: VaultUpdateId,
-    relative_path: String,
-    device_id: Option<DeviceId>,
-    content: Vec<u8>,
+    TypedMultipart(request): TypedMultipart<UpdateDocumentVersion>,
 ) -> Result<Json<DocumentUpdateResponse>, SyncServerError> {
     // No need for a transaction as document versions are immutable
     let parent_document = state
         .database
-        .get_document_version(&vault_id, parent_version_id, None)
+        .get_document_version(&vault_id, request.parent_version_id, None)
         .await
         .map_err(server_error)?
         .map_or_else(
             || {
                 Err(not_found_error(anyhow!(
                     "Parent version with id `{}` not found",
-                    parent_version_id
+                    request.parent_version_id
                 )))
             },
             Ok,
         )?;
 
-    let sanitized_relative_path = sanitize_path(&relative_path);
+    let sanitized_relative_path = sanitize_path(&request.relative_path);
 
     let mut transaction = state
         .database
@@ -160,6 +99,8 @@ async fn internal_update_document(
         )));
     }
 
+    let content = request.content.contents.to_vec();
+
     // Return the latest version if the content and path are the same as the latest
     // version
     if content == latest_version.content && sanitized_relative_path == latest_version.relative_path
@@ -215,7 +156,7 @@ async fn internal_update_document(
         updated_date: chrono::Utc::now(),
         is_deleted: false,
         user_id: user.name,
-        device_id: user_agent.0,
+        device_id: device_id.0,
     };
 
     state
@@ -230,17 +171,6 @@ async fn internal_update_document(
         .context("Failed to commit successful transaction")
         .map_err(server_error)?;
 
-    state
-        .broadcasts
-        .send(
-            vault_id,
-            VaultUpdate {
-                origin_device_id: device_id,
-                document: new_version.clone().into(),
-            },
-        )
-        .await;
-
     Ok(Json(if is_different_from_request_content {
         DocumentUpdateResponse::MergingUpdate(new_version.into())
     } else {
diff --git a/backend/sync_server/src/server/websocket.rs b/backend/sync_server/src/server/websocket.rs
index 2517fe88..e9dd8867 100644
--- a/backend/sync_server/src/server/websocket.rs
+++ b/backend/sync_server/src/server/websocket.rs
@@ -6,165 +6,176 @@ use axum::{
     },
     response::Response,
 };
-use futures::{
-    sink::SinkExt,
-    stream::{SplitSink, StreamExt},
-};
-use log::{error, info, warn};
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
+use futures::stream::StreamExt;
+use log::{debug, info};
+use serde::Deserialize;
 
-use super::auth::auth;
 use crate::{
     app_state::{
         AppState,
-        database::models::{DeviceId, DocumentVersionWithoutContent, VaultId, VaultUpdateId},
+        database::models::VaultId,
+        websocket::{
+            models::{
+                CursorPositionFromServer, WebSocketClientMessage, WebSocketServerMessage,
+                WebSocketVaultUpdate,
+            },
+            utils::{
+                get_authenticated_handshake, get_unseen_documents, send_update_over_websocket,
+            },
+        },
     },
-    errors::{SyncServerError, server_error, unauthenticated_error},
+    errors::{SyncServerError, client_error, server_error},
     utils::normalize::normalize,
 };
 
-// This is required for aide to infer the path parameter types and names
-#[derive(Deserialize, JsonSchema)]
-pub struct WebsocketPathParams {
+#[derive(Deserialize)]
+pub struct WebSocketPathParams {
     #[serde(deserialize_with = "normalize")]
     vault_id: VaultId,
 }
 
 pub async fn websocket_handler(
     ws: WebSocketUpgrade,
-    Path(WebsocketPathParams { vault_id }): Path<WebsocketPathParams>,
+    Path(WebSocketPathParams { vault_id }): Path<WebSocketPathParams>,
     State(state): State<AppState>,
 ) -> Result<Response, SyncServerError> {
     Ok(ws.on_upgrade(move |socket| websocket_wrapped(state, socket, vault_id)))
 }
 
 async fn websocket_wrapped(state: AppState, stream: WebSocket, vault_id: VaultId) {
-    info!("Websocket connection opened on vault '{vault_id}'");
+    info!("WebSocket connection opened on vault '{vault_id}'");
 
     let result = websocket(state, stream, vault_id.clone()).await;
 
     if let Err(err) = result {
-        error!("Websocket connection error on vault '{vault_id}': {err}");
+        debug!("WebSocket connection error on vault '{vault_id}': {err}");
     }
-
-    warn!("Websocket connection closed on vault '{vault_id}'");
-}
-
-#[derive(Deserialize)]
-#[serde(rename_all = "camelCase")]
-struct WebsocketHandshake {
-    pub token: String,
-    pub device_id: DeviceId,
-    pub last_seen_vault_update_id: Option<VaultUpdateId>,
-}
-
-#[derive(Serialize)]
-#[serde(rename_all = "camelCase")]
-struct WebsocketVaultUpdate {
-    pub documents: Vec<DocumentVersionWithoutContent>,
-    pub is_initial_sync: bool,
 }
 
+#[allow(clippy::too_many_lines)]
 async fn websocket(
     state: AppState,
     stream: WebSocket,
     vault_id: VaultId,
 ) -> Result<(), SyncServerError> {
-    let (mut sender, mut receiver) = stream.split();
+    let (mut sender, mut websocket_receiver) = stream.split();
 
-    let handshake = if let Some(Ok(Message::Text(token))) = receiver.next().await {
-        let handshake: WebsocketHandshake = serde_json::from_str(&token)
-            .context("Failed to parse token")
-            .map_err(server_error)?;
-
-        auth(&state, handshake.token.trim(), &vault_id)?;
-
-        handshake
-    } else {
-        return Err(unauthenticated_error(anyhow::anyhow!(
-            "Failed to authenticate"
-        )));
-    };
-
-    let mut rx = state.broadcasts.get_receiver(vault_id.clone()).await;
-
-    let documents = if let Some(update_id) = handshake.last_seen_vault_update_id {
-        state
-            .database
-            .get_latest_documents_since(&vault_id, update_id, None)
+    let authed_handshake = get_authenticated_handshake(
+        &state,
+        &vault_id,
+        websocket_receiver
+            .next()
             .await
-            .map_err(server_error)
-    } else {
-        state
-            .database
-            .get_latest_documents(&vault_id, None)
-            .await
-            .map_err(server_error)
-    }?;
+            .transpose()
+            .unwrap_or_default(),
+    )?;
+
+    info!(
+        "WebSocket handshake successful for vault '{vault_id}' for '{}'",
+        authed_handshake.handshake.device_id
+    );
+
+    let mut broadcast_receiver = state.broadcasts.get_receiver(vault_id.clone()).await;
 
     send_update_over_websocket(
-        &WebsocketVaultUpdate {
-            documents,
+        &WebSocketServerMessage::VaultUpdate(WebSocketVaultUpdate {
+            documents: get_unseen_documents(
+                &state,
+                &vault_id,
+                authed_handshake.handshake.last_seen_vault_update_id,
+            )
+            .await?,
             is_initial_sync: true,
-        },
+        }),
         &mut sender,
     )
     .await?;
 
+    send_update_over_websocket(
+        &WebSocketServerMessage::CursorPositions(CursorPositionFromServer {
+            clients: state.cursors.get_cursors(&vault_id).await,
+        }),
+        &mut sender,
+    )
+    .await?;
+
+    let device_id = authed_handshake.handshake.device_id.clone();
     let mut send_task = tokio::spawn(async move {
-        while let Ok(update) = rx.recv().await {
-            if Some(&handshake.device_id) == update.origin_device_id.as_ref() {
+        while let Ok(update) = broadcast_receiver.recv().await {
+            if Some(&device_id) == update.origin_device_id.as_ref() {
                 continue;
             }
 
-            send_update_over_websocket(
-                &WebsocketVaultUpdate {
-                    documents: vec![update.document],
-                    is_initial_sync: false,
-                },
-                &mut sender,
-            )
-            .await?;
+            send_update_over_websocket(&update.message, &mut sender).await?;
         }
 
         Ok::<(), SyncServerError>(())
     });
 
-    let mut recv_task =
-        tokio::spawn(
-            async move { while let Some(Ok(Message::Text(_text))) = receiver.next().await {} },
-        );
+    let device_id = authed_handshake.handshake.device_id.clone();
+    let vault_id_clone = vault_id.clone();
+    let cursor_manager = state.cursors.clone();
+    let mut receive_task = tokio::spawn(async move {
+        while let Some(Ok(Message::Text(message))) = websocket_receiver.next().await {
+            let message: WebSocketClientMessage = serde_json::from_str(&message)
+                .context("Failed to parse WebSocket message from client")
+                .map_err(server_error)?;
+
+            match message {
+                WebSocketClientMessage::Handshake(_) => {
+                    return Err(client_error(anyhow::anyhow!(
+                        "Unexpected handshake message"
+                    )));
+                }
+                WebSocketClientMessage::CursorPositions(cursors) => {
+                    cursor_manager
+                        .update_cursors(
+                            vault_id_clone.clone(),
+                            authed_handshake.user.name.clone(),
+                            &device_id,
+                            cursors.document_to_cursors,
+                        )
+                        .await;
+                }
+            }
+        }
+
+        Ok::<(), SyncServerError>(())
+    });
 
     tokio::select! {
-        _ = &mut send_task => recv_task.abort(),
-        _ = &mut recv_task => send_task.abort(),
+        _ = &mut send_task => receive_task.abort(),
+        _ = &mut receive_task => send_task.abort(),
     };
 
-    send_task
-        .await
-        .context("Websocket send task failed")
-        .map_err(server_error)??;
+    let result: Result<(), SyncServerError> = (async {
+        send_task
+            .await
+            .context("WebSocket send task failed")
+            .map_err(client_error)
+            .and_then(|err| err)?;
 
-    recv_task
-        .await
-        .context("Websocket receive task failed")
-        .map_err(server_error)?;
+        receive_task
+            .await
+            .context("WebSocket receive task failed")
+            .map_err(client_error)
+            .and_then(|err| err)?;
 
-    Ok(())
-}
-
-async fn send_update_over_websocket(
-    update: &WebsocketVaultUpdate,
-    sender: &mut SplitSink<WebSocket, Message>,
-) -> Result<(), SyncServerError> {
-    let serialized_update = serde_json::to_string(update)
-        .context("Failed to serialize update")
-        .map_err(server_error)?;
-
-    sender
-        .send(Message::Text(serialized_update))
-        .await
-        .context("Failed to send message over websocket")
-        .map_err(server_error)
+        Ok(())
+    })
+    .await;
+
+    state
+        .cursors
+        .remove_cursors_of_device(&vault_id, &authed_handshake.handshake.device_id)
+        .await;
+
+    if result.is_err() {
+        info!(
+            "WebSocket disconnected on vault '{vault_id}' for '{}'",
+            authed_handshake.handshake.device_id
+        );
+    }
+
+    result
 }
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index 95f41b60..c69b74ea 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -1,39 +1,39 @@
 {
-	"name": "vault-link-obsidian-plugin",
-	"version": "0.3.15",
-	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
-	"main": "main.js",
-	"scripts": {
-		"dev": "webpack watch --mode development",
-		"build": "webpack --mode production",
-		"test": "jest",
-		"version": "node version-bump.mjs"
-	},
-	"keywords": [],
-	"author": "",
-	"license": "MIT",
-	"devDependencies": {
-		"@types/jest": "^29.5.14",
-		"@types/node": "^22.15.27",
-		"css-loader": "^7.1.2",
-		"date-fns": "^4.1.0",
-		"file-loader": "^6.2.0",
-		"fs-extra": "^11.3.0",
-		"jest": "^29.7.0",
-		"mini-css-extract-plugin": "^2.9.2",
-		"obsidian": "1.8.7",
-		"resolve-url-loader": "^5.0.0",
-		"sass": "^1.89.0",
-		"sass-loader": "^16.0.5",
-		"sync-client": "file:../sync-client",
-		"terser-webpack-plugin": "^5.3.14",
-		"ts-jest": "^29.3.4",
-		"ts-loader": "^9.5.2",
-		"tslib": "2.8.1",
-		"typescript": "5.8.3",
-		"url": "^0.11.4",
-		"virtual-scroller": "^1.13.1",
-		"webpack": "^5.98.0",
-		"webpack-cli": "^6.0.1"
-	}
-}
+    "name": "vault-link-obsidian-plugin",
+    "version": "0.3.15",
+    "description": "This is a sample plugin for Obsidian (https://obsidian.md)",
+    "main": "main.js",
+    "scripts": {
+        "dev": "webpack watch --mode development",
+        "build": "webpack --mode production",
+        "test": "jest",
+        "version": "node version-bump.mjs"
+    },
+    "keywords": [],
+    "author": "",
+    "license": "MIT",
+    "devDependencies": {
+        "@types/jest": "^29.5.14",
+        "@types/node": "^22.15.30",
+        "css-loader": "^7.1.2",
+        "date-fns": "^4.1.0",
+        "file-loader": "^6.2.0",
+        "fs-extra": "^11.3.0",
+        "jest": "^29.7.0",
+        "mini-css-extract-plugin": "^2.9.2",
+        "obsidian": "1.8.7",
+        "resolve-url-loader": "^5.0.0",
+        "sass": "^1.89.1",
+        "sass-loader": "^16.0.5",
+        "sync-client": "file:../sync-client",
+        "terser-webpack-plugin": "^5.3.14",
+        "ts-jest": "^29.3.4",
+        "ts-loader": "^9.5.2",
+        "tslib": "2.8.1",
+        "typescript": "5.8.3",
+        "url": "^0.11.4",
+        "virtual-scroller": "^1.13.1",
+        "webpack": "^5.99.9",
+        "webpack-cli": "^6.0.1"
+    }
+}
\ No newline at end of file
diff --git a/frontend/obsidian-plugin/src/obsidian-file-system.ts b/frontend/obsidian-plugin/src/obsidian-file-system.ts
index 9905b036..adf78a16 100644
--- a/frontend/obsidian-plugin/src/obsidian-file-system.ts
+++ b/frontend/obsidian-plugin/src/obsidian-file-system.ts
@@ -7,6 +7,7 @@ import type {
 } from "sync-client";
 import { lineAndColumnToPosition } from "./utils/line-and-column-to-position";
 import { positionToLineAndColumn } from "./utils/position-to-line-and-column";
+import { getCursorsFromEditor } from "./views/cursors/get-cursors-from-editor";
 
 export class ObsidianFileSystemOperations implements FileSystemOperations {
 	public constructor(
@@ -78,26 +79,19 @@ export class ObsidianFileSystemOperations implements FileSystemOperations {
 
 		if (view?.file?.path === path) {
 			const text = view.editor.getValue();
-			const cursors = view.editor
-				.listSelections()
-				.flatMap(({ anchor, head }, i) => [
+
+			const cursors = getCursorsFromEditor(view.editor).flatMap(
+				({ id, start: anchor, end: head }) => [
 					{
-						id: 2 * i,
-						characterPosition: lineAndColumnToPosition(
-							text,
-							anchor.line,
-							anchor.ch
-						)
+						id: 2 * id,
+						characterPosition: anchor
 					},
 					{
-						id: 2 * i + 1,
-						characterPosition: lineAndColumnToPosition(
-							text,
-							head.line,
-							head.ch
-						)
+						id: 2 * id + 1,
+						characterPosition: head
 					}
-				]);
+				]
+			);
 
 			const result = updater({
 				text,
diff --git a/frontend/obsidian-plugin/src/utils/get-random-color.ts b/frontend/obsidian-plugin/src/utils/get-random-color.ts
new file mode 100644
index 00000000..5b2d33dc
--- /dev/null
+++ b/frontend/obsidian-plugin/src/utils/get-random-color.ts
@@ -0,0 +1,9 @@
+export function getRandomColor(name: string): string {
+	let hash = 0;
+	for (let i = 0; i < name.length; i++) {
+		hash = (hash << 5) - hash + name.charCodeAt(i);
+		hash |= 0; // Convert to 32bit integer
+	}
+	const normalised = hash / 0x7fffffff;
+	return `hsl(${Math.abs(normalised * 360)}, 55%, 55%)`; // HSL color
+}
diff --git a/frontend/obsidian-plugin/src/vault-link-plugin.ts b/frontend/obsidian-plugin/src/vault-link-plugin.ts
index e889bf9b..315e2d19 100644
--- a/frontend/obsidian-plugin/src/vault-link-plugin.ts
+++ b/frontend/obsidian-plugin/src/vault-link-plugin.ts
@@ -1,24 +1,36 @@
 import type {
 	Editor,
+	EventRef,
 	MarkdownFileInfo,
-	MarkdownView,
 	TAbstractFile,
+	Workspace,
 	WorkspaceLeaf
 } from "obsidian";
+import type { MarkdownView } from "obsidian";
 import { Platform, Plugin, TFile } from "obsidian";
 import "../manifest.json";
 import { HistoryView } from "./views/history/history-view";
 import { StatusBar } from "./views/status-bar/status-bar";
 import { LogsView } from "./views/logs/logs-view";
 import { StatusDescription } from "./views/status-description/status-description";
+import type { CursorSpan, RelativePath } from "sync-client";
 import { SyncClient, rateLimit, DEFAULT_SETTINGS } from "sync-client";
 import { ObsidianFileSystemOperations } from "./obsidian-file-system";
 import { SyncSettingsTab } from "./views/settings/settings-tab";
 import { registerConsoleForLogging } from "./utils/register-console-for-logging";
 import { updateEditorStatusDisplay } from "./views/editor-sync-line/editor-sync-line";
+import { remoteCursorsTheme } from "./views/cursors/remote-cursor-theme";
+import {
+	remoteCursorsPlugin,
+	setCursors
+} from "./views/cursors/remote-cursors-plugin";
+import { getCursorsFromEditor } from "./views/cursors/get-cursors-from-editor";
+import { LocalCursorUpdateListener } from "./views/cursors/local-cursor-update-listener";
 
+const MIN_WAIT_BETWEEN_UPDATES_IN_MS = 250;
 export default class VaultLinkPlugin extends Plugin {
-	private readonly disposables: (() => void)[] = [];
+	private readonly disposables: (() => unknown)[] = [];
+
 	private settingsTab: SyncSettingsTab | undefined;
 	private client!: SyncClient;
 	private readonly rateLimitedUpdatesPerFile = new Map<
@@ -61,18 +73,36 @@ export default class VaultLinkPlugin extends Plugin {
 
 		this.registerView(
 			HistoryView.TYPE,
-			(leaf) => new HistoryView(leaf, this.client)
+			(leaf) => new HistoryView(this.client, leaf)
 		);
+
 		this.registerView(
 			LogsView.TYPE,
 			(leaf) => new LogsView(this.client, leaf)
 		);
 
+		this.registerEditorExtension([remoteCursorsTheme, remoteCursorsPlugin]);
+
+		this.client.addRemoteCursorsUpdateListener((cursors) => {
+			setCursors(cursors, this.app);
+		});
+
+		const cursorListener = new LocalCursorUpdateListener(
+			this.client,
+			this.app.workspace
+		);
+		this.disposables.push(() => {
+			cursorListener.dispose();
+		});
+
+		this.app.workspace.updateOptions();
+
 		this.addRibbonIcon(
 			HistoryView.ICON,
 			"Open VaultLink events",
 			async (_: MouseEvent) => this.activateView(HistoryView.TYPE)
 		);
+
 		this.addRibbonIcon(
 			LogsView.ICON,
 			"Open VaultLink logs",
@@ -181,7 +211,7 @@ export default class VaultLinkPlugin extends Plugin {
 						this.client.syncLocallyUpdatedFile({
 							relativePath: path
 						}),
-					250
+					MIN_WAIT_BETWEEN_UPDATES_IN_MS
 				)
 			);
 		}
diff --git a/frontend/obsidian-plugin/src/views/cursors/get-cursors-from-editor.ts b/frontend/obsidian-plugin/src/views/cursors/get-cursors-from-editor.ts
new file mode 100644
index 00000000..f5ea0a85
--- /dev/null
+++ b/frontend/obsidian-plugin/src/views/cursors/get-cursors-from-editor.ts
@@ -0,0 +1,17 @@
+import type { Editor } from "obsidian";
+import { lineAndColumnToPosition } from "../../utils/line-and-column-to-position";
+
+export interface Cursor {
+	id: number;
+	start: number;
+	end: number;
+}
+
+export function getCursorsFromEditor(editor: Editor): Cursor[] {
+	const text = editor.getValue();
+	return editor.listSelections().map(({ anchor, head }, i) => ({
+		id: i,
+		start: lineAndColumnToPosition(text, anchor.line, anchor.ch),
+		end: lineAndColumnToPosition(text, head.line, head.ch)
+	}));
+}
diff --git a/frontend/obsidian-plugin/src/views/cursors/local-cursor-update-listener.ts b/frontend/obsidian-plugin/src/views/cursors/local-cursor-update-listener.ts
new file mode 100644
index 00000000..99a9828d
--- /dev/null
+++ b/frontend/obsidian-plugin/src/views/cursors/local-cursor-update-listener.ts
@@ -0,0 +1,58 @@
+import type { Workspace } from "obsidian";
+import { EventRef, Editor, MarkdownView, MarkdownFileInfo } from "obsidian";
+import type { Logger, SyncClient } from "sync-client";
+import type { Cursor } from "./get-cursors-from-editor";
+import { getCursorsFromEditor } from "./get-cursors-from-editor";
+
+export class LocalCursorUpdateListener {
+	private static readonly UPDATE_INTERVAL_MS = 50;
+	private readonly eventHandle: NodeJS.Timeout;
+	private lastCursorState: Record<string, Cursor[]> = {};
+
+	public constructor(
+		private readonly client: SyncClient,
+		private readonly workspace: Workspace
+	) {
+		this.eventHandle = setInterval(() => {
+			this.updateAllCursors();
+		}, LocalCursorUpdateListener.UPDATE_INTERVAL_MS);
+	}
+
+	public dispose(): void {
+		clearInterval(this.eventHandle);
+	}
+
+	private updateAllCursors(): void {
+		const currentCursors = this.getAllCursors();
+		if (
+			JSON.stringify(this.lastCursorState) ===
+			JSON.stringify(currentCursors)
+		) {
+			return;
+		}
+		this.lastCursorState = currentCursors;
+		this.client
+			.updateLocalCursors(currentCursors)
+			.catch((error: unknown) => {
+				this.client.logger.error(
+					`Failed to update local cursors: ${error}`
+				);
+			});
+	}
+
+	private getAllCursors(): Record<string, Cursor[]> {
+		const cursors: Record<string, Cursor[]> = {};
+		this.workspace
+			.getLeavesOfType("markdown")
+			.map((leaf) => leaf.view)
+			.filter((view) => view instanceof MarkdownView)
+			.forEach((view) => {
+				const { file } = view;
+				if (!file) {
+					return;
+				}
+				cursors[file.path] = getCursorsFromEditor(view.editor);
+			});
+		return cursors;
+	}
+}
diff --git a/frontend/obsidian-plugin/src/views/cursors/remote-cursor-theme.ts b/frontend/obsidian-plugin/src/views/cursors/remote-cursor-theme.ts
new file mode 100644
index 00000000..3af2692d
--- /dev/null
+++ b/frontend/obsidian-plugin/src/views/cursors/remote-cursor-theme.ts
@@ -0,0 +1,63 @@
+import { EditorView } from "@codemirror/view";
+
+const CARET_WIDTH = 2;
+const DOT_RADIUS = 4;
+
+export const remoteCursorsTheme = EditorView.baseTheme({
+	".selection-caret": {
+		position: "relative"
+	},
+
+	".selection-caret > *": {
+		position: "absolute",
+		backgroundColor: "inherit"
+	},
+
+	".selection-caret > .stick": {
+		left: 0,
+		top: 0,
+		transform: "translateX(-50%)",
+		width: `${CARET_WIDTH}px`,
+		height: "100%",
+		display: "block",
+		borderRadius: `${CARET_WIDTH / 2}px`,
+		animation: "blink-stick 1s steps(1) infinite"
+	},
+
+	"@keyframes blink-stick": {
+		"0%, 100%": { opacity: 1 },
+		"50%": { opacity: 0 }
+	},
+
+	".selection-caret > .dot": {
+		borderRadius: "50%",
+		width: `${DOT_RADIUS * 2}px`,
+		height: `${DOT_RADIUS * 2}px`,
+		top: `-${DOT_RADIUS}px`,
+		left: `-${DOT_RADIUS}px`,
+		transition: "transform .3s ease-in-out",
+		transformOrigin: "bottom center",
+		boxSizing: "border-box"
+	},
+
+	".selection-caret:hover > .dot": {
+		transform: "scale(0)"
+	},
+
+	".selection-caret > .info": {
+		top: "-1.3em",
+		left: `-${CARET_WIDTH / 2}px`,
+		fontSize: "0.9em",
+		userSelect: "none",
+		color: "white",
+		padding: "0 2px",
+		transition: "opacity .3s ease-in-out",
+		opacity: 0,
+		whiteSpace: "nowrap",
+		borderRadius: "3px 3px 3px 0"
+	},
+
+	".selection-caret:hover > .info": {
+		opacity: 1
+	}
+});
diff --git a/frontend/obsidian-plugin/src/views/cursors/remote-cursor-widget.ts b/frontend/obsidian-plugin/src/views/cursors/remote-cursor-widget.ts
new file mode 100644
index 00000000..e3273484
--- /dev/null
+++ b/frontend/obsidian-plugin/src/views/cursors/remote-cursor-widget.ts
@@ -0,0 +1,46 @@
+import { AnnotationType, Annotation, RangeSet, Range } from "@codemirror/state";
+import {
+	ViewUpdate,
+	ViewPlugin,
+	Decoration,
+	WidgetType
+} from "@codemirror/view";
+
+import type { PluginValue, DecorationSet, EditorView } from "@codemirror/view";
+
+export class RemoteCursorWidget extends WidgetType {
+	public constructor(
+		private readonly color: string,
+		private readonly name: string
+	) {
+		super();
+	}
+
+	public toDOM(editor: EditorView): HTMLElement {
+		return editor.contentDOM.createEl(
+			"span",
+			{
+				cls: "selection-caret",
+				attr: {
+					style: `background-color: ${this.color}; border-color: ${this.color}`
+				}
+			},
+			(span) => {
+				span.createEl("div", {
+					cls: "stick"
+				});
+				span.createEl("div", {
+					cls: "dot"
+				});
+				span.createEl("div", {
+					cls: "info",
+					text: this.name
+				});
+			}
+		);
+	}
+
+	public eq(other: RemoteCursorWidget): boolean {
+		return other.color === this.color && other.name === this.name;
+	}
+}
diff --git a/frontend/obsidian-plugin/src/views/cursors/remote-cursors-plugin.ts b/frontend/obsidian-plugin/src/views/cursors/remote-cursors-plugin.ts
new file mode 100644
index 00000000..e7797d1a
--- /dev/null
+++ b/frontend/obsidian-plugin/src/views/cursors/remote-cursors-plugin.ts
@@ -0,0 +1,134 @@
+import type { Range } from "@codemirror/state";
+import { RangeSet, Annotation, AnnotationType } from "@codemirror/state";
+import { ViewPlugin, Decoration, WidgetType } from "@codemirror/view";
+
+import type {
+	PluginValue,
+	DecorationSet,
+	EditorView,
+	ViewUpdate
+} from "@codemirror/view";
+import { RemoteCursorWidget } from "./remote-cursor-widget";
+import type { ClientCursors, CursorSpan } from "sync-client";
+import type { App } from "obsidian";
+import { MarkdownView } from "obsidian";
+
+let cursors: {
+	name: string;
+	path: string;
+	span: CursorSpan;
+}[] = [];
+
+import { StateEffect } from "@codemirror/state";
+import { getRandomColor } from "src/utils/get-random-color";
+
+const forceUpdate = StateEffect.define();
+
+export class RemoteCursorsPluginValue implements PluginValue {
+	public decorations: DecorationSet = RangeSet.of([]);
+
+	public update(update: ViewUpdate): void {
+		const decorations: Range<Decoration>[] = [];
+
+		cursors.forEach(({ name, span: { start, end } }) => {
+			const color = getRandomColor(name);
+			const startLine = update.view.state.doc.lineAt(start);
+			const endLine = update.view.state.doc.lineAt(end);
+
+			const attributes = {
+				style: `background-color: ${color};`
+			};
+
+			if (startLine.number === endLine.number) {
+				// selected content in a single line.
+				decorations.push({
+					from: start,
+					to: end,
+					value: Decoration.mark({
+						attributes
+					})
+				});
+			} else {
+				// selected content in multiple lines
+				// first, render text-selection in the first line
+				decorations.push({
+					from: start,
+					to: startLine.from + startLine.length,
+					value: Decoration.mark({
+						attributes
+					})
+				});
+
+				// render text-selection in the lines between the first and last line
+				for (let i = startLine.number + 1; i < endLine.number; i++) {
+					const currentLine = update.view.state.doc.line(i);
+					decorations.push({
+						from: currentLine.from,
+						to: currentLine.to,
+						value: Decoration.mark({
+							attributes
+						})
+					});
+				}
+
+				// render text-selection in the last line
+				decorations.push({
+					from: endLine.from,
+					to: end,
+					value: Decoration.mark({
+						attributes
+					})
+				});
+			}
+
+			decorations.push({
+				from: end,
+				to: end,
+				value: Decoration.widget({
+					side: end - start > 0 ? -1 : 1, // the local cursor should be rendered outside the remote selection
+					block: false,
+					widget: new RemoteCursorWidget(color, name)
+				})
+			});
+		});
+
+		this.decorations = Decoration.set(decorations, true);
+	}
+}
+
+export const remoteCursorsPlugin = ViewPlugin.fromClass(
+	RemoteCursorsPluginValue,
+	{
+		decorations: (v) => v.decorations
+	}
+);
+
+export function setCursors(clients: ClientCursors[], app: App): void {
+	cursors = clients.flatMap((client) => {
+		const clientCursors = client.cursors;
+		return Object.keys(clientCursors).flatMap((path) => {
+			const spans = clientCursors[path];
+			return spans
+				? spans.map((span) => ({
+						name: client.userName,
+						path,
+						span
+					}))
+				: [];
+		});
+	});
+
+	app.workspace
+		.getLeavesOfType("markdown")
+		.map((leaf) => leaf.view)
+		.filter((view) => view instanceof MarkdownView)
+		.forEach((view) => {
+			// @ts-expect-error, not typed
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+			const editor = view.editor.cm as EditorView;
+
+			editor.dispatch({
+				effects: [forceUpdate.of(null)]
+			});
+		});
+}
diff --git a/frontend/obsidian-plugin/src/views/history/history-view.ts b/frontend/obsidian-plugin/src/views/history/history-view.ts
index 977138a2..68681f3e 100644
--- a/frontend/obsidian-plugin/src/views/history/history-view.ts
+++ b/frontend/obsidian-plugin/src/views/history/history-view.ts
@@ -18,8 +18,8 @@ export class HistoryView extends ItemView {
 	>();
 
 	public constructor(
-		leaf: WorkspaceLeaf,
-		private readonly client: SyncClient
+		private readonly client: SyncClient,
+		leaf: WorkspaceLeaf
 	) {
 		super(leaf);
 		this.icon = HistoryView.ICON;
diff --git a/frontend/obsidian-plugin/src/views/status-description/status-description.ts b/frontend/obsidian-plugin/src/views/status-description/status-description.ts
index 6d5ac693..3bf41759 100644
--- a/frontend/obsidian-plugin/src/views/status-description/status-description.ts
+++ b/frontend/obsidian-plugin/src/views/status-description/status-description.ts
@@ -11,7 +11,7 @@ export class StatusDescription {
 	private lastRemaining: number | undefined;
 	private lastConnectionState: NetworkConnectionStatus | undefined;
 
-	private statusChangeListeners: (() => void)[] = [];
+	private statusChangeListeners: (() => unknown)[] = [];
 
 	public constructor(private readonly syncClient: SyncClient) {
 		void this.updateConnectionState();
diff --git a/frontend/obsidian-plugin/webpack.config.js b/frontend/obsidian-plugin/webpack.config.js
index 2b5a803d..8a193c3e 100644
--- a/frontend/obsidian-plugin/webpack.config.js
+++ b/frontend/obsidian-plugin/webpack.config.js
@@ -12,7 +12,16 @@ module.exports = (env, argv) => ({
 		ignored: "**/node_modules"
 	},
 	externals: {
-		obsidian: "commonjs obsidian"
+		obsidian: "commonjs obsidian",
+		electron: "commonjs electron",
+		"@codemirror/autocomplete": "commonjs @codemirror/autocomplete",
+		"@codemirror/collab": "commonjs @codemirror/collab",
+		"@codemirror/commands": "commonjs @codemirror/commands",
+		"@codemirror/language": "commonjs @codemirror/language",
+		"@codemirror/lint": "commonjs @codemirror/lint",
+		"@codemirror/search": "commonjs @codemirror/search",
+		"@codemirror/state": "commonjs @codemirror/state",
+		"@codemirror/view": "commonjs @codemirror/view"
 	},
 	optimization: {
 		minimizer: [
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 0990a050..a5343d78 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -12,11 +12,11 @@
 			],
 			"devDependencies": {
 				"concurrently": "^9.1.2",
-				"eslint": "9.23.0",
+				"eslint": "9.28.0",
 				"eslint-plugin-unused-imports": "^4.1.4",
-				"npm-check-updates": "^17.1.16",
+				"npm-check-updates": "^18.0.1",
 				"prettier": "^3.5.3",
-				"typescript-eslint": "8.32.1"
+				"typescript-eslint": "8.33.1"
 			}
 		},
 		"../backend/sync_lib/pkg": {
@@ -43,6 +43,7 @@
 			"version": "7.26.2",
 			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz",
 			"integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==",
+			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"@babel/helper-validator-identifier": "^7.25.9",
@@ -204,6 +205,7 @@
 			"version": "7.25.9",
 			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
 			"integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==",
+			"dev": true,
 			"license": "MIT",
 			"engines": {
 				"node": ">=6.9.0"
@@ -630,9 +632,9 @@
 			}
 		},
 		"node_modules/@eslint/config-array": {
-			"version": "0.19.2",
-			"resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.19.2.tgz",
-			"integrity": "sha512-GNKqxfHG2ySmJOBSHg7LxeUx4xpuCoFjacmlCoYWEbaPXLwvfIjixRI12xCQZeULksQb23uiA8F40w5TojpV7w==",
+			"version": "0.20.0",
+			"resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.20.0.tgz",
+			"integrity": "sha512-fxlS1kkIjx8+vy2SjuCB94q3htSNrufYTXubwiBFeaQHbH6Ipi43gFJq2zCMt6PHhImH3Xmr0NksKDvchWlpQQ==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"dependencies": {
@@ -655,9 +657,9 @@
 			}
 		},
 		"node_modules/@eslint/core": {
-			"version": "0.12.0",
-			"resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.12.0.tgz",
-			"integrity": "sha512-cmrR6pytBuSMTaBweKoGMwu3EiHiEC+DoyupPmlZ0HxBJBtIxwe+j/E4XPIKNx+Q74c8lXKPwYawBf5glsTkHg==",
+			"version": "0.14.0",
+			"resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.14.0.tgz",
+			"integrity": "sha512-qIbV0/JZr7iSDjqAc60IqbLdsj9GDt16xQtWD+B78d/HAlvysGdZZ6rpJHGAc2T0FQx1X6thsSPdnoiGKdNtdg==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"dependencies": {
@@ -692,13 +694,16 @@
 			}
 		},
 		"node_modules/@eslint/js": {
-			"version": "9.23.0",
-			"resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.23.0.tgz",
-			"integrity": "sha512-35MJ8vCPU0ZMxo7zfev2pypqTwWTofFZO6m4KAtdoFhRpLJUpHTZZ+KB3C7Hb1d7bULYwO4lJXGCi5Se+8OMbw==",
+			"version": "9.28.0",
+			"resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.28.0.tgz",
+			"integrity": "sha512-fnqSjGWd/CoIp4EXIxWVK/sHA6DOHN4+8Ix2cX5ycOY7LG0UY8nHCU5pIp2eaE1Mc7Qd8kHspYNzYXT2ojPLzg==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
 				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+			},
+			"funding": {
+				"url": "https://eslint.org/donate"
 			}
 		},
 		"node_modules/@eslint/object-schema": {
@@ -712,13 +717,13 @@
 			}
 		},
 		"node_modules/@eslint/plugin-kit": {
-			"version": "0.2.7",
-			"resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.7.tgz",
-			"integrity": "sha512-JubJ5B2pJ4k4yGxaNLdbjrnk9d/iDz6/q8wOilpIowd6PJPgaxCuHBnBszq7Ce2TyMrywm5r4PnKm6V3iiZF+g==",
+			"version": "0.3.1",
+			"resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.1.tgz",
+			"integrity": "sha512-0J+zgWxHN+xXONWIyPWKFMgVuJoZuGiIFu8yxk7RJjxkzpGmyja5wRFqZIVtjDVOQpV+Rw0iOAjYPE2eQyjr0w==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"dependencies": {
-				"@eslint/core": "^0.12.0",
+				"@eslint/core": "^0.14.0",
 				"levn": "^0.4.1"
 			},
 			"engines": {
@@ -1620,76 +1625,6 @@
 				"url": "https://opencollective.com/parcel"
 			}
 		},
-		"node_modules/@redocly/ajv": {
-			"version": "8.11.2",
-			"resolved": "https://registry.npmjs.org/@redocly/ajv/-/ajv-8.11.2.tgz",
-			"integrity": "sha512-io1JpnwtIcvojV7QKDUSIuMN/ikdOUd1ReEnUnMKGfDVridQZ31J0MmIuqwuRjWDZfmvr+Q0MqCcfHM2gTivOg==",
-			"license": "MIT",
-			"dependencies": {
-				"fast-deep-equal": "^3.1.1",
-				"json-schema-traverse": "^1.0.0",
-				"require-from-string": "^2.0.2",
-				"uri-js-replace": "^1.0.1"
-			},
-			"funding": {
-				"type": "github",
-				"url": "https://github.com/sponsors/epoberezkin"
-			}
-		},
-		"node_modules/@redocly/ajv/node_modules/json-schema-traverse": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-			"license": "MIT"
-		},
-		"node_modules/@redocly/config": {
-			"version": "0.22.1",
-			"resolved": "https://registry.npmjs.org/@redocly/config/-/config-0.22.1.tgz",
-			"integrity": "sha512-1CqQfiG456v9ZgYBG9xRQHnpXjt8WoSnDwdkX6gxktuK69v2037hTAR1eh0DGIqpZ1p4k82cGH8yTNwt7/pI9g==",
-			"license": "MIT"
-		},
-		"node_modules/@redocly/openapi-core": {
-			"version": "1.34.0",
-			"resolved": "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.34.0.tgz",
-			"integrity": "sha512-Ji00EiLQRXq0pJIz5pAjGF9MfQvQVsQehc6uIis6sqat8tG/zh25Zi64w6HVGEDgJEzUeq/CuUlD0emu3Hdaqw==",
-			"license": "MIT",
-			"dependencies": {
-				"@redocly/ajv": "^8.11.2",
-				"@redocly/config": "^0.22.0",
-				"colorette": "^1.2.0",
-				"https-proxy-agent": "^7.0.5",
-				"js-levenshtein": "^1.1.6",
-				"js-yaml": "^4.1.0",
-				"minimatch": "^5.0.1",
-				"pluralize": "^8.0.0",
-				"yaml-ast-parser": "0.0.43"
-			},
-			"engines": {
-				"node": ">=18.17.0",
-				"npm": ">=9.5.0"
-			}
-		},
-		"node_modules/@redocly/openapi-core/node_modules/brace-expansion": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-			"integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-			"license": "MIT",
-			"dependencies": {
-				"balanced-match": "^1.0.0"
-			}
-		},
-		"node_modules/@redocly/openapi-core/node_modules/minimatch": {
-			"version": "5.1.6",
-			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
-			"integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
-			"license": "ISC",
-			"dependencies": {
-				"brace-expansion": "^2.0.1"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
 		"node_modules/@sinclair/typebox": {
 			"version": "0.27.8",
 			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
@@ -1857,9 +1792,9 @@
 			"license": "MIT"
 		},
 		"node_modules/@types/node": {
-			"version": "22.15.27",
-			"resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.27.tgz",
-			"integrity": "sha512-5fF+eu5mwihV2BeVtX5vijhdaZOfkQTATrePEaXTcKqI16LhJ7gi2/Vhd9OZM0UojcdmiOCVg5rrax+i1MdoQQ==",
+			"version": "22.15.30",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.30.tgz",
+			"integrity": "sha512-6Q7lr06bEHdlfplU6YRbgG1SFBdlsfNC4/lX+SkhiTs0cpJkOElmWls8PxDFv4yY/xKb8Y6SO0OmSX4wgqTZbA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1901,17 +1836,17 @@
 			"license": "MIT"
 		},
 		"node_modules/@typescript-eslint/eslint-plugin": {
-			"version": "8.32.1",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.32.1.tgz",
-			"integrity": "sha512-6u6Plg9nP/J1GRpe/vcjjabo6Uc5YQPAMxsgQyGC/I0RuukiG1wIe3+Vtg3IrSCVJDmqK3j8adrtzXSENRtFgg==",
+			"version": "8.33.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.33.1.tgz",
+			"integrity": "sha512-TDCXj+YxLgtvxvFlAvpoRv9MAncDLBV2oT9Bd7YBGC/b/sEURoOYuIwLI99rjWOfY3QtDzO+mk0n4AmdFExW8A==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"@eslint-community/regexpp": "^4.10.0",
-				"@typescript-eslint/scope-manager": "8.32.1",
-				"@typescript-eslint/type-utils": "8.32.1",
-				"@typescript-eslint/utils": "8.32.1",
-				"@typescript-eslint/visitor-keys": "8.32.1",
+				"@typescript-eslint/scope-manager": "8.33.1",
+				"@typescript-eslint/type-utils": "8.33.1",
+				"@typescript-eslint/utils": "8.33.1",
+				"@typescript-eslint/visitor-keys": "8.33.1",
 				"graphemer": "^1.4.0",
 				"ignore": "^7.0.0",
 				"natural-compare": "^1.4.0",
@@ -1925,7 +1860,7 @@
 				"url": "https://opencollective.com/typescript-eslint"
 			},
 			"peerDependencies": {
-				"@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0",
+				"@typescript-eslint/parser": "^8.33.1",
 				"eslint": "^8.57.0 || ^9.0.0",
 				"typescript": ">=4.8.4 <5.9.0"
 			}
@@ -1941,16 +1876,16 @@
 			}
 		},
 		"node_modules/@typescript-eslint/parser": {
-			"version": "8.32.1",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.32.1.tgz",
-			"integrity": "sha512-LKMrmwCPoLhM45Z00O1ulb6jwyVr2kr3XJp+G+tSEZcbauNnScewcQwtJqXDhXeYPDEjZ8C1SjXm015CirEmGg==",
+			"version": "8.33.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.33.1.tgz",
+			"integrity": "sha512-qwxv6dq682yVvgKKp2qWwLgRbscDAYktPptK4JPojCwwi3R9cwrvIxS4lvBpzmcqzR4bdn54Z0IG1uHFskW4dA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@typescript-eslint/scope-manager": "8.32.1",
-				"@typescript-eslint/types": "8.32.1",
-				"@typescript-eslint/typescript-estree": "8.32.1",
-				"@typescript-eslint/visitor-keys": "8.32.1",
+				"@typescript-eslint/scope-manager": "8.33.1",
+				"@typescript-eslint/types": "8.33.1",
+				"@typescript-eslint/typescript-estree": "8.33.1",
+				"@typescript-eslint/visitor-keys": "8.33.1",
 				"debug": "^4.3.4"
 			},
 			"engines": {
@@ -1965,15 +1900,37 @@
 				"typescript": ">=4.8.4 <5.9.0"
 			}
 		},
-		"node_modules/@typescript-eslint/scope-manager": {
-			"version": "8.32.1",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.32.1.tgz",
-			"integrity": "sha512-7IsIaIDeZn7kffk7qXC3o6Z4UblZJKV3UBpkvRNpr5NSyLji7tvTcvmnMNYuYLyh26mN8W723xpo3i4MlD33vA==",
+		"node_modules/@typescript-eslint/project-service": {
+			"version": "8.33.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.33.1.tgz",
+			"integrity": "sha512-DZR0efeNklDIHHGRpMpR5gJITQpu6tLr9lDJnKdONTC7vvzOlLAG/wcfxcdxEWrbiZApcoBCzXqU/Z458Za5Iw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@typescript-eslint/types": "8.32.1",
-				"@typescript-eslint/visitor-keys": "8.32.1"
+				"@typescript-eslint/tsconfig-utils": "^8.33.1",
+				"@typescript-eslint/types": "^8.33.1",
+				"debug": "^4.3.4"
+			},
+			"engines": {
+				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			},
+			"peerDependencies": {
+				"typescript": ">=4.8.4 <5.9.0"
+			}
+		},
+		"node_modules/@typescript-eslint/scope-manager": {
+			"version": "8.33.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.33.1.tgz",
+			"integrity": "sha512-dM4UBtgmzHR9bS0Rv09JST0RcHYearoEoo3pG5B6GoTR9XcyeqX87FEhPo+5kTvVfKCvfHaHrcgeJQc6mrDKrA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@typescript-eslint/types": "8.33.1",
+				"@typescript-eslint/visitor-keys": "8.33.1"
 			},
 			"engines": {
 				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -1983,15 +1940,32 @@
 				"url": "https://opencollective.com/typescript-eslint"
 			}
 		},
+		"node_modules/@typescript-eslint/tsconfig-utils": {
+			"version": "8.33.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.33.1.tgz",
+			"integrity": "sha512-STAQsGYbHCF0/e+ShUQ4EatXQ7ceh3fBCXkNU7/MZVKulrlq1usH7t2FhxvCpuCi5O5oi1vmVaAjrGeL71OK1g==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			},
+			"peerDependencies": {
+				"typescript": ">=4.8.4 <5.9.0"
+			}
+		},
 		"node_modules/@typescript-eslint/type-utils": {
-			"version": "8.32.1",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.32.1.tgz",
-			"integrity": "sha512-mv9YpQGA8iIsl5KyUPi+FGLm7+bA4fgXaeRcFKRDRwDMu4iwrSHeDPipwueNXhdIIZltwCJv+NkxftECbIZWfA==",
+			"version": "8.33.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.33.1.tgz",
+			"integrity": "sha512-1cG37d9xOkhlykom55WVwG2QRNC7YXlxMaMzqw2uPeJixBFfKWZgaP/hjAObqMN/u3fr5BrTwTnc31/L9jQ2ww==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@typescript-eslint/typescript-estree": "8.32.1",
-				"@typescript-eslint/utils": "8.32.1",
+				"@typescript-eslint/typescript-estree": "8.33.1",
+				"@typescript-eslint/utils": "8.33.1",
 				"debug": "^4.3.4",
 				"ts-api-utils": "^2.1.0"
 			},
@@ -2008,9 +1982,9 @@
 			}
 		},
 		"node_modules/@typescript-eslint/types": {
-			"version": "8.32.1",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.32.1.tgz",
-			"integrity": "sha512-YmybwXUJcgGqgAp6bEsgpPXEg6dcCyPyCSr0CAAueacR/CCBi25G3V8gGQ2kRzQRBNol7VQknxMs9HvVa9Rvfg==",
+			"version": "8.33.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.33.1.tgz",
+			"integrity": "sha512-xid1WfizGhy/TKMTwhtVOgalHwPtV8T32MS9MaH50Cwvz6x6YqRIPdD2WvW0XaqOzTV9p5xdLY0h/ZusU5Lokg==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -2022,14 +1996,16 @@
 			}
 		},
 		"node_modules/@typescript-eslint/typescript-estree": {
-			"version": "8.32.1",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.32.1.tgz",
-			"integrity": "sha512-Y3AP9EIfYwBb4kWGb+simvPaqQoT5oJuzzj9m0i6FCY6SPvlomY2Ei4UEMm7+FXtlNJbor80ximyslzaQF6xhg==",
+			"version": "8.33.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.33.1.tgz",
+			"integrity": "sha512-+s9LYcT8LWjdYWu7IWs7FvUxpQ/DGkdjZeE/GGulHvv8rvYwQvVaUZ6DE+j5x/prADUgSbbCWZ2nPI3usuVeOA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@typescript-eslint/types": "8.32.1",
-				"@typescript-eslint/visitor-keys": "8.32.1",
+				"@typescript-eslint/project-service": "8.33.1",
+				"@typescript-eslint/tsconfig-utils": "8.33.1",
+				"@typescript-eslint/types": "8.33.1",
+				"@typescript-eslint/visitor-keys": "8.33.1",
 				"debug": "^4.3.4",
 				"fast-glob": "^3.3.2",
 				"is-glob": "^4.0.3",
@@ -2075,16 +2051,16 @@
 			}
 		},
 		"node_modules/@typescript-eslint/utils": {
-			"version": "8.32.1",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.32.1.tgz",
-			"integrity": "sha512-DsSFNIgLSrc89gpq1LJB7Hm1YpuhK086DRDJSNrewcGvYloWW1vZLHBTIvarKZDcAORIy/uWNx8Gad+4oMpkSA==",
+			"version": "8.33.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.33.1.tgz",
+			"integrity": "sha512-52HaBiEQUaRYqAXpfzWSR2U3gxk92Kw006+xZpElaPMg3C4PgM+A5LqwoQI1f9E5aZ/qlxAZxzm42WX+vn92SQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"@eslint-community/eslint-utils": "^4.7.0",
-				"@typescript-eslint/scope-manager": "8.32.1",
-				"@typescript-eslint/types": "8.32.1",
-				"@typescript-eslint/typescript-estree": "8.32.1"
+				"@typescript-eslint/scope-manager": "8.33.1",
+				"@typescript-eslint/types": "8.33.1",
+				"@typescript-eslint/typescript-estree": "8.33.1"
 			},
 			"engines": {
 				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2099,13 +2075,13 @@
 			}
 		},
 		"node_modules/@typescript-eslint/visitor-keys": {
-			"version": "8.32.1",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.32.1.tgz",
-			"integrity": "sha512-ar0tjQfObzhSaW3C3QNmTc5ofj0hDoNQ5XWrCy6zDyabdr0TWhCkClp+rywGNj/odAFBVzzJrK4tEq5M4Hmu4w==",
+			"version": "8.33.1",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.33.1.tgz",
+			"integrity": "sha512-3i8NrFcZeeDHJ+7ZUuDkGT+UHq+XoFGsymNK2jZCOHcfEzRQ0BdpRtdpSx/Iyf3MHLWIcLS0COuOPibKQboIiQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@typescript-eslint/types": "8.32.1",
+				"@typescript-eslint/types": "8.33.1",
 				"eslint-visitor-keys": "^4.2.0"
 			},
 			"engines": {
@@ -2375,15 +2351,6 @@
 				"node": ">=8.9"
 			}
 		},
-		"node_modules/agent-base": {
-			"version": "7.1.3",
-			"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
-			"integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==",
-			"license": "MIT",
-			"engines": {
-				"node": ">= 14"
-			}
-		},
 		"node_modules/ajv": {
 			"version": "6.12.6",
 			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
@@ -2453,15 +2420,6 @@
 				"ajv": "^6.9.1"
 			}
 		},
-		"node_modules/ansi-colors": {
-			"version": "4.1.3",
-			"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
-			"integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
-			"license": "MIT",
-			"engines": {
-				"node": ">=6"
-			}
-		},
 		"node_modules/ansi-escapes": {
 			"version": "4.3.2",
 			"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
@@ -2522,6 +2480,7 @@
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
 			"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+			"dev": true,
 			"license": "Python-2.0"
 		},
 		"node_modules/async": {
@@ -2882,12 +2841,6 @@
 				"node": ">=8"
 			}
 		},
-		"node_modules/change-case": {
-			"version": "5.4.4",
-			"resolved": "https://registry.npmjs.org/change-case/-/change-case-5.4.4.tgz",
-			"integrity": "sha512-HRQyTk2/YPEkt9TnUPbOpr64Uw3KOicFWPVBb+xiHvd6eBx/qPr9xqfBFDT8P2vWsvvz4jbEkfDe71W3VyNu2w==",
-			"license": "MIT"
-		},
 		"node_modules/char-regex": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
@@ -3015,12 +2968,6 @@
 			"dev": true,
 			"license": "MIT"
 		},
-		"node_modules/colorette": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/colorette/-/colorette-1.4.0.tgz",
-			"integrity": "sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==",
-			"license": "MIT"
-		},
 		"node_modules/commander": {
 			"version": "2.20.3",
 			"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
@@ -3169,6 +3116,7 @@
 			"version": "4.4.0",
 			"resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
 			"integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
+			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"ms": "^2.1.3"
@@ -3417,20 +3365,20 @@
 			}
 		},
 		"node_modules/eslint": {
-			"version": "9.23.0",
-			"resolved": "https://registry.npmjs.org/eslint/-/eslint-9.23.0.tgz",
-			"integrity": "sha512-jV7AbNoFPAY1EkFYpLq5bslU9NLNO8xnEeQXwErNibVryjk67wHVmddTBilc5srIttJDBrB0eMHKZBFbSIABCw==",
+			"version": "9.28.0",
+			"resolved": "https://registry.npmjs.org/eslint/-/eslint-9.28.0.tgz",
+			"integrity": "sha512-ocgh41VhRlf9+fVpe7QKzwLj9c92fDiqOj8Y3Sd4/ZmVA4Btx4PlUYPq4pp9JDyupkf1upbEXecxL2mwNV7jPQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"@eslint-community/eslint-utils": "^4.2.0",
 				"@eslint-community/regexpp": "^4.12.1",
-				"@eslint/config-array": "^0.19.2",
-				"@eslint/config-helpers": "^0.2.0",
-				"@eslint/core": "^0.12.0",
+				"@eslint/config-array": "^0.20.0",
+				"@eslint/config-helpers": "^0.2.1",
+				"@eslint/core": "^0.14.0",
 				"@eslint/eslintrc": "^3.3.1",
-				"@eslint/js": "9.23.0",
-				"@eslint/plugin-kit": "^0.2.7",
+				"@eslint/js": "9.28.0",
+				"@eslint/plugin-kit": "^0.3.1",
 				"@humanfs/node": "^0.16.6",
 				"@humanwhocodes/module-importer": "^1.0.1",
 				"@humanwhocodes/retry": "^0.4.2",
@@ -3671,6 +3619,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-glob": {
@@ -4146,19 +4095,6 @@
 			"dev": true,
 			"license": "MIT"
 		},
-		"node_modules/https-proxy-agent": {
-			"version": "7.0.6",
-			"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
-			"integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
-			"license": "MIT",
-			"dependencies": {
-				"agent-base": "^7.1.2",
-				"debug": "4"
-			},
-			"engines": {
-				"node": ">= 14"
-			}
-		},
 		"node_modules/human-signals": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
@@ -4246,18 +4182,6 @@
 				"node": ">=0.8.19"
 			}
 		},
-		"node_modules/index-to-position": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/index-to-position/-/index-to-position-1.0.0.tgz",
-			"integrity": "sha512-sCO7uaLVhRJ25vz1o8s9IFM3nVS4DkuQnyjMwiQPKvQuBYBDmb8H7zx8ki7nVh4HJQOdVWebyvLE0qt+clruxA==",
-			"license": "MIT",
-			"engines": {
-				"node": ">=18"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
 		"node_modules/inflight": {
 			"version": "1.0.6",
 			"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -5076,25 +5000,18 @@
 				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
 			}
 		},
-		"node_modules/js-levenshtein": {
-			"version": "1.1.6",
-			"resolved": "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.6.tgz",
-			"integrity": "sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==",
-			"license": "MIT",
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
 		"node_modules/js-tokens": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
 			"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/js-yaml": {
 			"version": "4.1.0",
 			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
 			"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"argparse": "^2.0.1"
@@ -5515,6 +5432,7 @@
 			"version": "2.1.3",
 			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
 			"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/nanoid": {
@@ -5595,9 +5513,9 @@
 			}
 		},
 		"node_modules/npm-check-updates": {
-			"version": "17.1.16",
-			"resolved": "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-17.1.16.tgz",
-			"integrity": "sha512-9nohkfjLRzLfsLVGbO34eXBejvrOOTuw5tvNammH73KEFG5XlFoi3G2TgjTExHtnrKWCbZ+mTT+dbNeSjASIPw==",
+			"version": "18.0.1",
+			"resolved": "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-18.0.1.tgz",
+			"integrity": "sha512-MO7mLp/8nm6kZNLLyPgz4gHmr9tLoU+pWPLdXuGAx+oZydBHkHWN0ibTonsrfwC2WEQNIQxuZagYwB67JQpAuw==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"bin": {
@@ -5676,82 +5594,6 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/openapi-fetch": {
-			"version": "0.14.0",
-			"resolved": "https://registry.npmjs.org/openapi-fetch/-/openapi-fetch-0.14.0.tgz",
-			"integrity": "sha512-PshIdm1NgdLvb05zp8LqRQMNSKzIlPkyMxYFxwyHR+UlKD4t2nUjkDhNxeRbhRSEd3x5EUNh2w5sJYwkhOH4fg==",
-			"license": "MIT",
-			"dependencies": {
-				"openapi-typescript-helpers": "^0.0.15"
-			}
-		},
-		"node_modules/openapi-typescript": {
-			"version": "7.6.1",
-			"resolved": "https://registry.npmjs.org/openapi-typescript/-/openapi-typescript-7.6.1.tgz",
-			"integrity": "sha512-F7RXEeo/heF3O9lOXo2bNjCOtfp7u+D6W3a3VNEH2xE6v+fxLtn5nq0uvUcA1F5aT+CMhNeC5Uqtg5tlXFX/ag==",
-			"license": "MIT",
-			"dependencies": {
-				"@redocly/openapi-core": "^1.28.0",
-				"ansi-colors": "^4.1.3",
-				"change-case": "^5.4.4",
-				"parse-json": "^8.1.0",
-				"supports-color": "^9.4.0",
-				"yargs-parser": "^21.1.1"
-			},
-			"bin": {
-				"openapi-typescript": "bin/cli.js"
-			},
-			"peerDependencies": {
-				"typescript": "^5.x"
-			}
-		},
-		"node_modules/openapi-typescript-helpers": {
-			"version": "0.0.15",
-			"resolved": "https://registry.npmjs.org/openapi-typescript-helpers/-/openapi-typescript-helpers-0.0.15.tgz",
-			"integrity": "sha512-opyTPaunsklCBpTK8JGef6mfPhLSnyy5a0IN9vKtx3+4aExf+KxEqYwIy3hqkedXIB97u357uLMJsOnm3GVjsw==",
-			"license": "MIT"
-		},
-		"node_modules/openapi-typescript/node_modules/parse-json": {
-			"version": "8.2.0",
-			"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-8.2.0.tgz",
-			"integrity": "sha512-eONBZy4hm2AgxjNFd8a4nyDJnzUAH0g34xSQAwWEVGCjdZ4ZL7dKZBfq267GWP/JaS9zW62Xs2FeAdDvpHHJGQ==",
-			"license": "MIT",
-			"dependencies": {
-				"@babel/code-frame": "^7.26.2",
-				"index-to-position": "^1.0.0",
-				"type-fest": "^4.37.0"
-			},
-			"engines": {
-				"node": ">=18"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/openapi-typescript/node_modules/supports-color": {
-			"version": "9.4.0",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-9.4.0.tgz",
-			"integrity": "sha512-VL+lNrEoIXww1coLPOmiEmK/0sGigko5COxI09KzHc2VJXJsQ37UaQ+8quuxjDeA7+KnLGTWRyOXSLLR2Wb4jw==",
-			"license": "MIT",
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/supports-color?sponsor=1"
-			}
-		},
-		"node_modules/openapi-typescript/node_modules/type-fest": {
-			"version": "4.38.0",
-			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.38.0.tgz",
-			"integrity": "sha512-2dBz5D5ycHIoliLYLi0Q2V7KRaDlH0uWIvmk7TYlAg5slqwiPv1ezJdZm1QEM0xgk29oYWMCbIG7E6gHpvChlg==",
-			"license": "(MIT OR CC0-1.0)",
-			"engines": {
-				"node": ">=16"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
 		"node_modules/optionator": {
 			"version": "0.9.4",
 			"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
@@ -5913,6 +5755,7 @@
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
 			"integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+			"dev": true,
 			"license": "ISC"
 		},
 		"node_modules/picomatch": {
@@ -6007,15 +5850,6 @@
 				"node": ">=8"
 			}
 		},
-		"node_modules/pluralize": {
-			"version": "8.0.0",
-			"resolved": "https://registry.npmjs.org/pluralize/-/pluralize-8.0.0.tgz",
-			"integrity": "sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==",
-			"license": "MIT",
-			"engines": {
-				"node": ">=4"
-			}
-		},
 		"node_modules/postcss": {
 			"version": "8.5.3",
 			"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz",
@@ -6333,6 +6167,7 @@
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
 			"integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+			"dev": true,
 			"license": "MIT",
 			"engines": {
 				"node": ">=0.10.0"
@@ -6493,9 +6328,9 @@
 			"license": "MIT"
 		},
 		"node_modules/sass": {
-			"version": "1.89.0",
-			"resolved": "https://registry.npmjs.org/sass/-/sass-1.89.0.tgz",
-			"integrity": "sha512-ld+kQU8YTdGNjOLfRWBzewJpU5cwEv/h5yyqlSeJcj6Yh8U4TDA9UA5FPicqDz/xgRPWRSYIQNiFks21TbA9KQ==",
+			"version": "1.89.1",
+			"resolved": "https://registry.npmjs.org/sass/-/sass-1.89.1.tgz",
+			"integrity": "sha512-eMLLkl+qz7tx/0cJ9wI+w09GQ2zodTkcE/aVfywwdlRcI3EO19xGnbmJwg/JMIm+5MxVJ6outddLZ4Von4E++Q==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -7276,6 +7111,7 @@
 			"version": "5.8.3",
 			"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.3.tgz",
 			"integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==",
+			"dev": true,
 			"license": "Apache-2.0",
 			"bin": {
 				"tsc": "bin/tsc",
@@ -7286,15 +7122,15 @@
 			}
 		},
 		"node_modules/typescript-eslint": {
-			"version": "8.32.1",
-			"resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.32.1.tgz",
-			"integrity": "sha512-D7el+eaDHAmXvrZBy1zpzSNIRqnCOrkwTgZxTu3MUqRWk8k0q9m9Ho4+vPf7iHtgUfrK/o8IZaEApsxPlHTFCg==",
+			"version": "8.33.1",
+			"resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.33.1.tgz",
+			"integrity": "sha512-AgRnV4sKkWOiZ0Kjbnf5ytTJXMUZQ0qhSVdQtDNYLPLnjsATEYhaO94GlRQwi4t4gO8FfjM6NnikHeKjUm8D7A==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@typescript-eslint/eslint-plugin": "8.32.1",
-				"@typescript-eslint/parser": "8.32.1",
-				"@typescript-eslint/utils": "8.32.1"
+				"@typescript-eslint/eslint-plugin": "8.33.1",
+				"@typescript-eslint/parser": "8.33.1",
+				"@typescript-eslint/utils": "8.33.1"
 			},
 			"engines": {
 				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -7366,12 +7202,6 @@
 				"punycode": "^2.1.0"
 			}
 		},
-		"node_modules/uri-js-replace": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/uri-js-replace/-/uri-js-replace-1.0.1.tgz",
-			"integrity": "sha512-W+C9NWNLFOoBI2QWDp4UT9pv65r2w5Cx+3sTYFvtMdDBxkKt1syCqsUdSFAChbEe1uK5TfS04wt/nGwmaeIQ0g==",
-			"license": "MIT"
-		},
 		"node_modules/url": {
 			"version": "0.11.4",
 			"resolved": "https://registry.npmjs.org/url/-/url-0.11.4.tgz",
@@ -7491,14 +7321,15 @@
 			}
 		},
 		"node_modules/webpack": {
-			"version": "5.98.0",
-			"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.98.0.tgz",
-			"integrity": "sha512-UFynvx+gM44Gv9qFgj0acCQK2VE1CtdfwFdimkapco3hlPCJ/zeq73n2yVKimVbtm+TnApIugGhLJnkU6gjYXA==",
+			"version": "5.99.9",
+			"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.99.9.tgz",
+			"integrity": "sha512-brOPwM3JnmOa+7kd3NsmOUOwbDAj8FT9xDsG3IW0MgbN9yZV7Oi/s/+MNQ/EcSMqw7qfoRyXPoeEWT8zLVdVGg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"@types/eslint-scope": "^3.7.7",
 				"@types/estree": "^1.0.6",
+				"@types/json-schema": "^7.0.15",
 				"@webassemblyjs/ast": "^1.14.1",
 				"@webassemblyjs/wasm-edit": "^1.14.1",
 				"@webassemblyjs/wasm-parser": "^1.14.1",
@@ -7515,7 +7346,7 @@
 				"loader-runner": "^4.2.0",
 				"mime-types": "^2.1.27",
 				"neo-async": "^2.6.2",
-				"schema-utils": "^4.3.0",
+				"schema-utils": "^4.3.2",
 				"tapable": "^2.1.1",
 				"terser-webpack-plugin": "^5.3.11",
 				"watchpack": "^2.4.1",
@@ -7684,9 +7515,9 @@
 			"license": "MIT"
 		},
 		"node_modules/webpack/node_modules/schema-utils": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.0.tgz",
-			"integrity": "sha512-Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g==",
+			"version": "4.3.2",
+			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.2.tgz",
+			"integrity": "sha512-Gn/JaSk/Mt9gYubxTtSn/QCV4em9mpAPiR1rqy/Ocu19u/G9J5WWdNoUT4SiV6mFC3y6cxyFcFwdzPM3FgxGAQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -7814,12 +7645,6 @@
 			"dev": true,
 			"license": "ISC"
 		},
-		"node_modules/yaml-ast-parser": {
-			"version": "0.0.43",
-			"resolved": "https://registry.npmjs.org/yaml-ast-parser/-/yaml-ast-parser-0.0.43.tgz",
-			"integrity": "sha512-2PTINUwsRqSd+s8XxKaJWQlUuEMHJQyEuh2edBbW8KNJz0SJPwUSD2zRWqezFEdN7IzAgeuYHFUCF7o8zRdZ0A==",
-			"license": "Apache-2.0"
-		},
 		"node_modules/yargs": {
 			"version": "17.7.2",
 			"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
@@ -7843,6 +7668,7 @@
 			"version": "21.1.1",
 			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
 			"integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+			"dev": true,
 			"license": "ISC",
 			"engines": {
 				"node": ">=12"
@@ -7867,7 +7693,7 @@
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
-				"@types/node": "^22.15.27",
+				"@types/node": "^22.15.30",
 				"css-loader": "^7.1.2",
 				"date-fns": "^4.1.0",
 				"file-loader": "^6.2.0",
@@ -7876,7 +7702,7 @@
 				"mini-css-extract-plugin": "^2.9.2",
 				"obsidian": "1.8.7",
 				"resolve-url-loader": "^5.0.0",
-				"sass": "^1.89.0",
+				"sass": "^1.89.1",
 				"sass-loader": "^16.0.5",
 				"sync-client": "file:../sync-client",
 				"terser-webpack-plugin": "^5.3.14",
@@ -7886,7 +7712,7 @@
 				"typescript": "5.8.3",
 				"url": "^0.11.4",
 				"virtual-scroller": "^1.13.1",
-				"webpack": "^5.98.0",
+				"webpack": "^5.99.9",
 				"webpack-cli": "^6.0.1"
 			}
 		},
@@ -7895,21 +7721,19 @@
 			"dependencies": {
 				"byte-base64": "^1.1.0",
 				"minimatch": "^10.0.1",
-				"openapi-fetch": "0.14.0",
-				"openapi-typescript": "7.6.1",
 				"p-queue": "^8.1.0",
 				"uuid": "^11.1.0"
 			},
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
-				"@types/node": "^22.15.27",
+				"@types/node": "^22.15.30",
 				"jest": "^29.7.0",
 				"sync_lib": "file:../../backend/sync_lib/pkg",
 				"ts-jest": "^29.3.4",
 				"ts-loader": "^9.5.2",
 				"tslib": "2.8.1",
 				"typescript": "5.8.3",
-				"webpack": "^5.98.0",
+				"webpack": "^5.99.9",
 				"webpack-cli": "^6.0.1",
 				"webpack-merge": "^6.0.1",
 				"ws": "^8.18.2"
@@ -7945,14 +7769,14 @@
 				"test-client": "dist/cli.js"
 			},
 			"devDependencies": {
-				"@types/node": "^22.15.27",
+				"@types/node": "^22.15.30",
 				"bufferutil": "^4.0.9",
 				"sync-client": "file:../sync-client",
 				"ts-loader": "^9.5.2",
 				"tslib": "2.8.1",
 				"typescript": "5.8.3",
 				"uuid": "^11.1.0",
-				"webpack": "^5.98.0",
+				"webpack": "^5.99.9",
 				"webpack-cli": "^6.0.1"
 			}
 		}
diff --git a/frontend/package.json b/frontend/package.json
index 7a542ef0..6c51ddcf 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -21,10 +21,10 @@
 	},
 	"devDependencies": {
 		"concurrently": "^9.1.2",
-		"eslint": "9.23.0",
+		"eslint": "9.28.0",
 		"eslint-plugin-unused-imports": "^4.1.4",
-		"npm-check-updates": "^17.1.16",
+		"npm-check-updates": "^18.0.1",
 		"prettier": "^3.5.3",
-		"typescript-eslint": "8.32.1"
+		"typescript-eslint": "8.33.1"
 	}
 }
\ No newline at end of file
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index b13942dd..4c4b2ca0 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -15,23 +15,21 @@
     "dependencies": {
         "byte-base64": "^1.1.0",
         "minimatch": "^10.0.1",
-        "openapi-fetch": "0.14.0",
-        "openapi-typescript": "7.6.1",
         "p-queue": "^8.1.0",
         "uuid": "^11.1.0"
     },
     "devDependencies": {
         "@types/jest": "^29.5.14",
-        "@types/node": "^22.15.27",
+        "@types/node": "^22.15.30",
         "jest": "^29.7.0",
         "sync_lib": "file:../../backend/sync_lib/pkg",
         "ts-jest": "^29.3.4",
         "ts-loader": "^9.5.2",
         "tslib": "2.8.1",
         "typescript": "5.8.3",
-        "webpack": "^5.98.0",
+        "webpack": "^5.99.9",
         "webpack-cli": "^6.0.1",
         "webpack-merge": "^6.0.1",
         "ws": "^8.18.2"
     }
-}
+}
\ No newline at end of file
diff --git a/frontend/sync-client/src/index.ts b/frontend/sync-client/src/index.ts
index 7079f707..0cd94277 100644
--- a/frontend/sync-client/src/index.ts
+++ b/frontend/sync-client/src/index.ts
@@ -19,7 +19,8 @@ export type {
 	Cursor
 } from "./file-operations/filesystem-operations";
 export type { PersistenceProvider } from "./persistence/persistence";
-
+export type { CursorSpan } from "./services/types/CursorSpan";
+export type { ClientCursors } from "./services/types/ClientCursors";
 export type { NetworkConnectionStatus } from "./types/network-connection-status";
 export { DocumentUpdateStatus } from "./types/document-update-status";
 export { SyncClient } from "./sync-client";
diff --git a/frontend/sync-client/src/persistence/settings.ts b/frontend/sync-client/src/persistence/settings.ts
index a62e4f0c..bcb32531 100644
--- a/frontend/sync-client/src/persistence/settings.ts
+++ b/frontend/sync-client/src/persistence/settings.ts
@@ -8,6 +8,7 @@ export interface SyncSettings {
 	isSyncEnabled: boolean;
 	maxFileSizeMB: number;
 	ignorePatterns: string[];
+	webSocketRetryIntervalMs: number;
 }
 
 export const DEFAULT_SETTINGS: SyncSettings = {
@@ -17,7 +18,8 @@ export const DEFAULT_SETTINGS: SyncSettings = {
 	syncConcurrency: 1,
 	isSyncEnabled: false,
 	maxFileSizeMB: 10,
-	ignorePatterns: []
+	ignorePatterns: [],
+	webSocketRetryIntervalMs: 3500
 };
 
 export class Settings {
diff --git a/frontend/sync-client/src/services/connection-status.ts b/frontend/sync-client/src/services/connection-status.ts
index 572d8895..3934639f 100644
--- a/frontend/sync-client/src/services/connection-status.ts
+++ b/frontend/sync-client/src/services/connection-status.ts
@@ -51,7 +51,10 @@ export class ConnectionStatus {
 		logger: Logger,
 		fetch: typeof globalThis.fetch = globalThis.fetch
 	): typeof globalThis.fetch {
-		return async (input: RequestInfo | URL): Promise<Response> => {
+		return async (
+			input: RequestInfo | URL,
+			init?: RequestInit
+		): Promise<Response> => {
 			while (!this.canFetch) {
 				await this.until;
 			}
@@ -63,7 +66,7 @@ export class ConnectionStatus {
 						? input.clone()
 						: input;
 
-				const fetchPromise = fetch(_input);
+				const fetchPromise = fetch(_input, init);
 
 				// We only want to catch rejections from `this.until`
 				let result: symbol | Response | undefined = undefined;
diff --git a/frontend/sync-client/src/services/sync-service.ts b/frontend/sync-client/src/services/sync-service.ts
index 741aa012..5ac81d5b 100644
--- a/frontend/sync-client/src/services/sync-service.ts
+++ b/frontend/sync-client/src/services/sync-service.ts
@@ -1,16 +1,21 @@
-import type { Client } from "openapi-fetch";
-import createClient from "openapi-fetch";
-import type { components, paths } from "./types"; // generated by openapi-typescript
 import type {
 	DocumentId,
 	RelativePath,
 	VaultUpdateId
 } from "../persistence/database";
+
 import type { Logger } from "../tracing/logger";
 import type { Settings } from "../persistence/settings";
 import type { ConnectionStatus } from "./connection-status";
 import { sleep } from "../utils/sleep";
 import { SyncResetError } from "./sync-reset-error";
+import type { SerializedError } from "./types/SerializedError";
+import type { DocumentVersionWithoutContent } from "./types/DocumentVersionWithoutContent";
+import type { DocumentUpdateResponse } from "./types/DocumentUpdateResponse";
+import type { DocumentVersion } from "./types/DocumentVersion";
+import type { FetchLatestDocumentsResponse } from "./types/FetchLatestDocumentsResponse";
+import type { PingResponse } from "./types/PingResponse";
+import type { DeleteDocumentVersion } from "./types/DeleteDocumentVersion";
 
 export interface CheckConnectionResult {
 	isSuccessful: boolean;
@@ -19,47 +24,28 @@ export interface CheckConnectionResult {
 
 export class SyncService {
 	private static readonly NETWORK_RETRY_INTERVAL_MS = 1000;
-	private client: Client<paths>;
-	private pingClient: Client<paths>;
+	private readonly client: typeof globalThis.fetch;
+	private readonly pingClient: typeof globalThis.fetch;
 
 	public constructor(
 		private readonly deviceId: string,
 		private readonly connectionStatus: ConnectionStatus,
 		private readonly settings: Settings,
 		private readonly logger: Logger,
-		private readonly fetchImplementation: typeof globalThis.fetch = globalThis.fetch
+		fetchImplementation: typeof globalThis.fetch = globalThis.fetch
 	) {
-		[this.client, this.pingClient] = this.createClient(
-			this.settings.getSettings().remoteUri
+		// ensure that if it's called a method, `this` won't be bound to the instance
+		const unboundFetch: typeof globalThis.fetch = async (...args) =>
+			fetchImplementation(...args);
+
+		this.client = this.connectionStatus.getFetchImplementation(
+			this.logger,
+			unboundFetch
 		);
-
-		settings.addOnSettingsChangeListener((newSettings, oldSettings) => {
-			if (newSettings.remoteUri === oldSettings.remoteUri) {
-				return;
-			}
-
-			[this.client, this.pingClient] = this.createClient(
-				newSettings.remoteUri
-			);
-		});
+		this.pingClient = unboundFetch;
 	}
 
-	private get deviceIdHeader(): string {
-		// @ts-expect-error, injected by webpack
-		const packageVersion = __CURRENT_VERSION__; // eslint-disable-line
-
-		const platform =
-			typeof navigator !== "undefined"
-				? navigator.platform // eslint-disable-line @typescript-eslint/no-deprecated
-				: typeof process !== "undefined"
-					? process.platform
-					: "unknown";
-		return `vault-link/${packageVersion} (${this.deviceId}; ${platform})`;
-	}
-
-	private static formatError(
-		error: components["schemas"]["SerializedError"]
-	): string {
+	private static formatError(error: SerializedError): string {
 		let result = error.message;
 		if (error.causes.length > 0) {
 			const causes = error.causes.join(", ");
@@ -77,47 +63,39 @@ export class SyncService {
 		documentId?: DocumentId;
 		relativePath: RelativePath;
 		contentBytes: Uint8Array;
-	}): Promise<components["schemas"]["DocumentVersionWithoutContent"]> {
-		const { vaultName } = this.settings.getSettings();
-
+	}): Promise<DocumentVersionWithoutContent> {
 		return this.withRetries(async () => {
 			const formData = new FormData();
 			if (documentId !== undefined) {
 				formData.append("document_id", documentId);
 			}
 			formData.append("relative_path", relativePath);
-			formData.append("device_id", this.deviceId);
 			formData.append("content", new Blob([contentBytes]));
 
-			const response = await this.client.POST(
-				"/vaults/{vault_id}/documents",
-				{
-					params: {
-						path: {
-							vault_id: vaultName
-						},
-						header: {
-							"device-id": this.deviceIdHeader
-						}
-					},
-					// eslint-disable-next-line
-					body: formData as any // FormData is not supported by openapi-fetch
-				}
-			);
+			const response = await this.client(this.getUrl("/documents"), {
+				method: "POST",
+				body: formData,
+				headers: this.getDefaultHeaders()
+			});
 
-			if (!response.data) {
+			const result: SerializedError | DocumentVersionWithoutContent =
+				(await response.json()) as  // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+					| SerializedError
+					| DocumentVersionWithoutContent;
+
+			if ("errorType" in result) {
 				throw new Error(
-					`Failed to create document: ${SyncService.formatError(response.error)}`
+					`Failed to create document: ${SyncService.formatError(result)}`
 				);
 			}
 
 			this.logger.debug(
-				`Created document ${JSON.stringify(response.data)} with id ${
-					response.data.documentId
+				`Created document ${JSON.stringify(result)} with id ${
+					result.documentId
 				}`
 			);
 
-			return response.data;
+			return result;
 		});
 	}
 
@@ -131,9 +109,7 @@ export class SyncService {
 		documentId: DocumentId;
 		relativePath: RelativePath;
 		contentBytes: Uint8Array;
-	}): Promise<components["schemas"]["DocumentUpdateResponse"]> {
-		const { vaultName } = this.settings.getSettings();
-
+	}): Promise<DocumentUpdateResponse> {
 		return this.withRetries(async () => {
 			this.logger.debug(
 				`Updating document ${documentId} with parent version ${parentVersionId} and relative path ${relativePath}`
@@ -141,39 +117,35 @@ export class SyncService {
 			const formData = new FormData();
 			formData.append("parent_version_id", parentVersionId.toString());
 			formData.append("relative_path", relativePath);
-			formData.append("device_id", this.deviceId);
 			formData.append("content", new Blob([contentBytes]));
 
-			const response = await this.client.PUT(
-				"/vaults/{vault_id}/documents/{document_id}",
+			const response = await this.client(
+				this.getUrl(`/documents/${documentId}`),
 				{
-					params: {
-						path: {
-							vault_id: vaultName,
-							document_id: documentId
-						},
-						header: {
-							"device-id": this.deviceIdHeader
-						}
-					},
-					// eslint-disable-next-line
-					body: formData as any // FormData is not supported by openapi-fetch
+					method: "PUT",
+					body: formData,
+					headers: this.getDefaultHeaders()
 				}
 			);
 
-			if (!response.data) {
+			const result: SerializedError | DocumentUpdateResponse =
+				(await response.json()) as  // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+					| SerializedError
+					| DocumentUpdateResponse;
+
+			if ("errorType" in result) {
 				throw new Error(
-					`Failed to update document: ${SyncService.formatError(response.error)}`
+					`Failed to update document: ${SyncService.formatError(result)}`
 				);
 			}
 
 			this.logger.debug(
-				`Updated document ${JSON.stringify(response.data)} with id ${
-					response.data.documentId
-				}`
+				`Updated document ${JSON.stringify(result)} with id ${
+					result.documentId
+				}}`
 			);
 
-			return response.data;
+			return result;
 		});
 	}
 
@@ -183,39 +155,39 @@ export class SyncService {
 	}: {
 		documentId: DocumentId;
 		relativePath: RelativePath;
-	}): Promise<components["schemas"]["DocumentVersionWithoutContent"]> {
+	}): Promise<DocumentVersionWithoutContent> {
 		return this.withRetries(async () => {
-			const { vaultName } = this.settings.getSettings();
-
-			const response = await this.client.DELETE(
-				"/vaults/{vault_id}/documents/{document_id}",
+			const request: DeleteDocumentVersion = {
+				relativePath
+			};
+			const response = await this.client(
+				this.getUrl(`/documents/${documentId}`),
 				{
-					params: {
-						path: {
-							vault_id: vaultName,
-							document_id: documentId
-						},
-						header: {
-							"device-id": this.deviceIdHeader
-						}
-					},
-
-					body: {
-						relativePath,
-						deviceId: this.deviceId
+					method: "DELETE",
+					body: JSON.stringify(request),
+					headers: {
+						"Content-Type": "application/json",
+						...this.getDefaultHeaders()
 					}
 				}
 			);
 
-			if (response.error) {
-				throw new Error(`Failed to delete document`);
+			const result: SerializedError | DocumentVersionWithoutContent =
+				(await response.json()) as  // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+					| SerializedError
+					| DocumentVersionWithoutContent;
+
+			if ("errorType" in result) {
+				throw new Error(
+					`Failed to delete document: ${SyncService.formatError(result)}`
+				);
 			}
 
 			this.logger.debug(
 				`Deleted document ${relativePath} with id ${documentId}`
 			);
 
-			return response.data;
+			return result;
 		});
 	}
 
@@ -223,100 +195,77 @@ export class SyncService {
 		documentId
 	}: {
 		documentId: DocumentId;
-	}): Promise<components["schemas"]["DocumentVersion"]> {
-		const { vaultName } = this.settings.getSettings();
-
+	}): Promise<DocumentVersion> {
 		return this.withRetries(async () => {
-			const response = await this.client.GET(
-				"/vaults/{vault_id}/documents/{document_id}",
+			const response = await this.client(
+				this.getUrl(`/documents/${documentId}`),
 				{
-					params: {
-						path: {
-							vault_id: vaultName,
-							document_id: documentId
-						}
-					}
+					headers: this.getDefaultHeaders()
 				}
 			);
 
-			if (!response.data) {
+			const result: SerializedError | DocumentVersion =
+				(await response.json()) as SerializedError | DocumentVersion; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+
+			if ("errorType" in result) {
 				throw new Error(
-					`Failed to get document: ${SyncService.formatError(response.error)}`
+					`Failed to get document: ${SyncService.formatError(result)}`
 				);
 			}
 
 			this.logger.debug(
-				`Get document ${response.data.relativePath} with id ${response.data.documentId}`
+				`Get document ${result.relativePath} with id ${result.documentId}`
 			);
 
-			return response.data;
+			return result;
 		});
 	}
 
 	public async getAll(
 		since?: VaultUpdateId
-	): Promise<components["schemas"]["FetchLatestDocumentsResponse"]> {
+	): Promise<FetchLatestDocumentsResponse> {
 		return this.withRetries(async () => {
-			const { vaultName } = this.settings.getSettings();
+			const url = new URL(this.getUrl("/documents"));
+			if (since !== undefined) {
+				url.searchParams.append("since", since.toString());
+			}
+			const response = await this.client(url.toString(), {
+				headers: this.getDefaultHeaders()
+			});
 
-			const response = await this.client.GET(
-				"/vaults/{vault_id}/documents",
-				{
-					params: {
-						path: {
-							vault_id: vaultName
-						},
-						query: {
-							since_update_id: since
-						}
-					}
-				}
-			);
+			const result: SerializedError | FetchLatestDocumentsResponse =
+				(await response.json()) as  // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+					| SerializedError
+					| FetchLatestDocumentsResponse;
 
-			const { error } = response;
-			if (error) {
+			if ("errorType" in result) {
 				throw new Error(
-					`Failed to get documents: ${SyncService.formatError(response.error)}`
+					`Failed to get documents: ${SyncService.formatError(result)}`
 				);
 			}
 
 			this.logger.debug(
-				`Got ${response.data.latestDocuments.length} document metadata`
+				`Got ${result.latestDocuments.length} document metadata`
 			);
 
-			return response.data;
+			return result;
 		});
 	}
 
 	public async checkConnection(): Promise<CheckConnectionResult> {
-		const { vaultName } = this.settings.getSettings();
-
 		try {
-			const response = await this.pingClient.GET(
-				"/vaults/{vault_id}/ping",
-				{
-					params: {
-						header: {
-							authorization: `Bearer ${this.settings.getSettings().token}`
-						},
-						path: {
-							vault_id: vaultName
-						}
-					}
-				}
-			);
+			const response = await this.pingClient(this.getUrl("/ping"), {
+				headers: this.getDefaultHeaders()
+			});
+			const result: PingResponse | SerializedError =
+				(await response.json()) as PingResponse | SerializedError; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
 
-			this.logger.debug(
-				`Ping response: ${JSON.stringify(response.data)}`
-			);
-
-			if (!response.data) {
+			if ("errorType" in result) {
 				throw new Error(
-					`Failed to ping server: ${SyncService.formatError(response.error)}`
+					`Failed to ping server: ${SyncService.formatError(result)}`
 				);
 			}
 
-			const result = response.data;
 			if (result.isAuthenticated) {
 				return {
 					isSuccessful: true,
@@ -336,29 +285,17 @@ export class SyncService {
 		}
 	}
 
-	/**
-	 * Create a client and a ping client for the given remote URI.
-	 */
-	private createClient(remoteUri: string): [Client<paths>, Client<paths>] {
-		return [
-			createClient<paths>({
-				baseUrl: remoteUri,
-				fetch: this.connectionStatus.getFetchImplementation(
-					this.logger,
-					this.fetchImplementation
-				),
-				headers: {
-					authorization: `Bearer ${this.settings.getSettings().token}`
-				}
-			}),
-			createClient<paths>({
-				baseUrl: remoteUri,
-				fetch: this.fetchImplementation,
-				headers: {
-					authorization: `Bearer ${this.settings.getSettings().token}`
-				}
-			})
-		];
+	private getUrl(path: string): string {
+		const { vaultName, remoteUri } = this.settings.getSettings();
+		const safeRemoteUri = remoteUri.replace(/\/+$/, "");
+		return `${safeRemoteUri}/vaults/${vaultName}${path}`;
+	}
+
+	private getDefaultHeaders(): Record<string, string> {
+		return {
+			"device-id": this.deviceId,
+			authorization: `Bearer ${this.settings.getSettings().token}`
+		};
 	}
 
 	private async withRetries<T>(fn: () => Promise<T>): Promise<T> {
diff --git a/frontend/sync-client/src/services/types.ts b/frontend/sync-client/src/services/types.ts
deleted file mode 100644
index 893eea70..00000000
--- a/frontend/sync-client/src/services/types.ts
+++ /dev/null
@@ -1,655 +0,0 @@
-/**
- * This file was auto-generated by openapi-typescript.
- * Do not make direct changes to the file.
- */
-
-export interface paths {
-	"/vaults/{vault_id}/documents": {
-		parameters: {
-			query?: never;
-			header?: never;
-			path?: never;
-			cookie?: never;
-		};
-		get: {
-			parameters: {
-				query?: {
-					since_update_id?: number | null;
-				};
-				header?: never;
-				path: {
-					vault_id: string;
-				};
-				cookie?: never;
-			};
-			requestBody?: never;
-			responses: {
-				200: {
-					headers: {
-						[name: string]: unknown;
-					};
-					content: {
-						"application/json": components["schemas"]["FetchLatestDocumentsResponse"];
-					};
-				};
-				default: {
-					headers: {
-						[name: string]: unknown;
-					};
-					content: {
-						/** @example {
-						 *       "causes": [],
-						 *       "message": "An error has occurred"
-						 *     } */
-						"application/json": components["schemas"]["SerializedError"];
-					};
-				};
-			};
-		};
-		put?: never;
-		post: {
-			parameters: {
-				query?: never;
-				header: {
-					"device-id": string;
-				};
-				path: {
-					vault_id: string;
-				};
-				cookie?: never;
-			};
-			requestBody: {
-				content: {
-					"multipart/form-data": components["schemas"]["CreateDocumentVersionMultipart"];
-				};
-			};
-			responses: {
-				200: {
-					headers: {
-						[name: string]: unknown;
-					};
-					content: {
-						"application/json": components["schemas"]["DocumentVersionWithoutContent"];
-					};
-				};
-				default: {
-					headers: {
-						[name: string]: unknown;
-					};
-					content: {
-						/** @example {
-						 *       "causes": [],
-						 *       "message": "An error has occurred"
-						 *     } */
-						"application/json": components["schemas"]["SerializedError"];
-					};
-				};
-			};
-		};
-		delete?: never;
-		options?: never;
-		head?: never;
-		patch?: never;
-		trace?: never;
-	};
-	"/vaults/{vault_id}/documents/json": {
-		parameters: {
-			query?: never;
-			header?: never;
-			path?: never;
-			cookie?: never;
-		};
-		get?: never;
-		put?: never;
-		post: {
-			parameters: {
-				query?: never;
-				header: {
-					"device-id": string;
-				};
-				path: {
-					vault_id: string;
-				};
-				cookie?: never;
-			};
-			requestBody: {
-				content: {
-					"application/json": components["schemas"]["CreateDocumentVersion"];
-				};
-			};
-			responses: {
-				200: {
-					headers: {
-						[name: string]: unknown;
-					};
-					content: {
-						"application/json": components["schemas"]["DocumentVersionWithoutContent"];
-					};
-				};
-				default: {
-					headers: {
-						[name: string]: unknown;
-					};
-					content: {
-						/** @example {
-						 *       "causes": [],
-						 *       "message": "An error has occurred"
-						 *     } */
-						"application/json": components["schemas"]["SerializedError"];
-					};
-				};
-			};
-		};
-		delete?: never;
-		options?: never;
-		head?: never;
-		patch?: never;
-		trace?: never;
-	};
-	"/vaults/{vault_id}/documents/{document_id}": {
-		parameters: {
-			query?: never;
-			header?: never;
-			path?: never;
-			cookie?: never;
-		};
-		get: {
-			parameters: {
-				query?: never;
-				header?: never;
-				path: {
-					document_id: string;
-					vault_id: string;
-				};
-				cookie?: never;
-			};
-			requestBody?: never;
-			responses: {
-				200: {
-					headers: {
-						[name: string]: unknown;
-					};
-					content: {
-						"application/json": components["schemas"]["DocumentVersion"];
-					};
-				};
-				default: {
-					headers: {
-						[name: string]: unknown;
-					};
-					content: {
-						/** @example {
-						 *       "causes": [],
-						 *       "message": "An error has occurred"
-						 *     } */
-						"application/json": components["schemas"]["SerializedError"];
-					};
-				};
-			};
-		};
-		put: {
-			parameters: {
-				query?: never;
-				header: {
-					"device-id": string;
-				};
-				path: {
-					document_id: string;
-					vault_id: string;
-				};
-				cookie?: never;
-			};
-			requestBody: {
-				content: {
-					"multipart/form-data": components["schemas"]["UpdateDocumentVersionMultipart"];
-				};
-			};
-			responses: {
-				200: {
-					headers: {
-						[name: string]: unknown;
-					};
-					content: {
-						"application/json": components["schemas"]["DocumentUpdateResponse"];
-					};
-				};
-				default: {
-					headers: {
-						[name: string]: unknown;
-					};
-					content: {
-						/** @example {
-						 *       "causes": [],
-						 *       "message": "An error has occurred"
-						 *     } */
-						"application/json": components["schemas"]["SerializedError"];
-					};
-				};
-			};
-		};
-		post?: never;
-		delete: {
-			parameters: {
-				query?: never;
-				header: {
-					"device-id": string;
-				};
-				path: {
-					document_id: string;
-					vault_id: string;
-				};
-				cookie?: never;
-			};
-			requestBody: {
-				content: {
-					"application/json": components["schemas"]["DeleteDocumentVersion"];
-				};
-			};
-			responses: {
-				200: {
-					headers: {
-						[name: string]: unknown;
-					};
-					content: {
-						"application/json": components["schemas"]["DocumentVersionWithoutContent"];
-					};
-				};
-				default: {
-					headers: {
-						[name: string]: unknown;
-					};
-					content: {
-						/** @example {
-						 *       "causes": [],
-						 *       "message": "An error has occurred"
-						 *     } */
-						"application/json": components["schemas"]["SerializedError"];
-					};
-				};
-			};
-		};
-		options?: never;
-		head?: never;
-		patch?: never;
-		trace?: never;
-	};
-	"/vaults/{vault_id}/documents/{document_id}/json": {
-		parameters: {
-			query?: never;
-			header?: never;
-			path?: never;
-			cookie?: never;
-		};
-		get?: never;
-		put: {
-			parameters: {
-				query?: never;
-				header: {
-					"device-id": string;
-				};
-				path: {
-					document_id: string;
-					vault_id: string;
-				};
-				cookie?: never;
-			};
-			requestBody: {
-				content: {
-					"application/json": components["schemas"]["UpdateDocumentVersion"];
-				};
-			};
-			responses: {
-				200: {
-					headers: {
-						[name: string]: unknown;
-					};
-					content: {
-						"application/json": components["schemas"]["DocumentUpdateResponse"];
-					};
-				};
-				default: {
-					headers: {
-						[name: string]: unknown;
-					};
-					content: {
-						/** @example {
-						 *       "causes": [],
-						 *       "message": "An error has occurred"
-						 *     } */
-						"application/json": components["schemas"]["SerializedError"];
-					};
-				};
-			};
-		};
-		post?: never;
-		delete?: never;
-		options?: never;
-		head?: never;
-		patch?: never;
-		trace?: never;
-	};
-	"/vaults/{vault_id}/documents/{document_id}/versions/{version_id}": {
-		parameters: {
-			query?: never;
-			header?: never;
-			path?: never;
-			cookie?: never;
-		};
-		get?: never;
-		put: {
-			parameters: {
-				query?: never;
-				header?: never;
-				path: {
-					document_id: string;
-					vault_id: string;
-					vault_update_id: number;
-				};
-				cookie?: never;
-			};
-			requestBody?: never;
-			responses: {
-				200: {
-					headers: {
-						[name: string]: unknown;
-					};
-					content: {
-						"application/json": components["schemas"]["DocumentVersion"];
-					};
-				};
-				default: {
-					headers: {
-						[name: string]: unknown;
-					};
-					content: {
-						/** @example {
-						 *       "causes": [],
-						 *       "message": "An error has occurred"
-						 *     } */
-						"application/json": components["schemas"]["SerializedError"];
-					};
-				};
-			};
-		};
-		post?: never;
-		delete?: never;
-		options?: never;
-		head?: never;
-		patch?: never;
-		trace?: never;
-	};
-	"/vaults/{vault_id}/documents/{document_id}/versions/{version_id}/content": {
-		parameters: {
-			query?: never;
-			header?: never;
-			path?: never;
-			cookie?: never;
-		};
-		get?: never;
-		put: {
-			parameters: {
-				query?: never;
-				header?: never;
-				path: {
-					document_id: string;
-					vault_id: string;
-					vault_update_id: number;
-				};
-				cookie?: never;
-			};
-			requestBody?: never;
-			responses: {
-				/** @description byte stream */
-				200: {
-					headers: {
-						[name: string]: unknown;
-					};
-					content: {
-						"application/octet-stream": unknown;
-					};
-				};
-				default: {
-					headers: {
-						[name: string]: unknown;
-					};
-					content: {
-						/** @example {
-						 *       "causes": [],
-						 *       "message": "An error has occurred"
-						 *     } */
-						"application/json": components["schemas"]["SerializedError"];
-					};
-				};
-			};
-		};
-		post?: never;
-		delete?: never;
-		options?: never;
-		head?: never;
-		patch?: never;
-		trace?: never;
-	};
-	"/vaults/{vault_id}/ping": {
-		parameters: {
-			query?: never;
-			header?: never;
-			path?: never;
-			cookie?: never;
-		};
-		get: {
-			parameters: {
-				query?: never;
-				header?: {
-					authorization?: string;
-				};
-				path: {
-					vault_id: string;
-				};
-				cookie?: never;
-			};
-			requestBody?: never;
-			responses: {
-				200: {
-					headers: {
-						[name: string]: unknown;
-					};
-					content: {
-						"application/json": components["schemas"]["PingResponse"];
-					};
-				};
-				default: {
-					headers: {
-						[name: string]: unknown;
-					};
-					content: {
-						/** @example {
-						 *       "causes": [],
-						 *       "message": "An error has occurred"
-						 *     } */
-						"application/json": components["schemas"]["SerializedError"];
-					};
-				};
-			};
-		};
-		put?: never;
-		post?: never;
-		delete?: never;
-		options?: never;
-		head?: never;
-		patch?: never;
-		trace?: never;
-	};
-}
-export type webhooks = Record<string, never>;
-export interface components {
-	schemas: {
-		Array_of_uint8: number[];
-		CreateDocumentPathParams: {
-			vault_id: string;
-		};
-		CreateDocumentVersion: {
-			contentBase64: string;
-			deviceId?: string | null;
-			/**
-			 * Format: uuid
-			 * @description The client can decide the document id (if it wishes to) in order to help with syncing. If the client does not provide a document id, the server will generate one. If the client provides a document id it must not already exist in the database.
-			 */
-			documentId?: string | null;
-			relativePath: string;
-		};
-		CreateDocumentVersionMultipart: {
-			content: components["schemas"]["Array_of_uint8"];
-			device_id?: string | null;
-			/** Format: uuid */
-			document_id?: string | null;
-			relative_path: string;
-		};
-		DeleteDocumentPathParams: {
-			/** Format: uuid */
-			document_id: string;
-			vault_id: string;
-		};
-		DeleteDocumentVersion: {
-			deviceId?: string | null;
-			relativePath: string;
-		};
-		/** @description Response to an update document request. */
-		DocumentUpdateResponse:
-			| {
-					/** Format: uint64 */
-					contentSize: number;
-					deviceId: string;
-					/** Format: uuid */
-					documentId: string;
-					isDeleted: boolean;
-					relativePath: string;
-					/** @enum {string} */
-					type: "FastForwardUpdate";
-					/** Format: date-time */
-					updatedDate: string;
-					userId: string;
-					/** Format: int64 */
-					vaultUpdateId: number;
-			  }
-			| {
-					contentBase64: string;
-					deviceId: string;
-					/** Format: uuid */
-					documentId: string;
-					isDeleted: boolean;
-					relativePath: string;
-					/** @enum {string} */
-					type: "MergingUpdate";
-					/** Format: date-time */
-					updatedDate: string;
-					userId: string;
-					/** Format: int64 */
-					vaultUpdateId: number;
-			  };
-		DocumentVersion: {
-			contentBase64: string;
-			deviceId: string;
-			/** Format: uuid */
-			documentId: string;
-			isDeleted: boolean;
-			relativePath: string;
-			/** Format: date-time */
-			updatedDate: string;
-			userId: string;
-			/** Format: int64 */
-			vaultUpdateId: number;
-		};
-		DocumentVersionWithoutContent: {
-			/** Format: uint64 */
-			contentSize: number;
-			deviceId: string;
-			/** Format: uuid */
-			documentId: string;
-			isDeleted: boolean;
-			relativePath: string;
-			/** Format: date-time */
-			updatedDate: string;
-			userId: string;
-			/** Format: int64 */
-			vaultUpdateId: number;
-		};
-		FetchDocumentVersionContentPathParams: {
-			/** Format: uuid */
-			document_id: string;
-			vault_id: string;
-			/** Format: int64 */
-			vault_update_id: number;
-		};
-		FetchDocumentVersionPathParams: {
-			/** Format: uuid */
-			document_id: string;
-			vault_id: string;
-			/** Format: int64 */
-			vault_update_id: number;
-		};
-		FetchLatestDocumentVersionPathParams: {
-			/** Format: uuid */
-			document_id: string;
-			vault_id: string;
-		};
-		FetchLatestDocumentsPathParams: {
-			vault_id: string;
-		};
-		/** @description Response to a fetch latest documents request. */
-		FetchLatestDocumentsResponse: {
-			/**
-			 * Format: int64
-			 * @description The update ID of the latest document in the response.
-			 */
-			lastUpdateId: number;
-			latestDocuments: components["schemas"]["DocumentVersionWithoutContent"][];
-		};
-		PingPathParams: {
-			vault_id: string;
-		};
-		/** @description Response to a ping request. */
-		PingResponse: {
-			/** @description Whether the client is authenticated based on the sent Authorization header. */
-			isAuthenticated: boolean;
-			/** @description Semantic version of the server. */
-			serverVersion: string;
-		};
-		QueryParams: {
-			/** Format: int64 */
-			since_update_id?: number | null;
-		};
-		SerializedError: {
-			causes: string[];
-			message: string;
-		};
-		UpdateDocumentPathParams: {
-			/** Format: uuid */
-			document_id: string;
-			vault_id: string;
-		};
-		UpdateDocumentVersion: {
-			contentBase64: string;
-			deviceId?: string | null;
-			/** Format: int64 */
-			parentVersionId: number;
-			relativePath: string;
-		};
-		UpdateDocumentVersionMultipart: {
-			content: components["schemas"]["Array_of_uint8"];
-			deviceId?: string | null;
-			/** Format: int64 */
-			parentVersionId: number;
-			relativePath: string;
-		};
-		WebsocketPathParams: {
-			vault_id: string;
-		};
-	};
-	responses: never;
-	parameters: never;
-	requestBodies: never;
-	headers: never;
-	pathItems: never;
-}
-export type $defs = Record<string, never>;
-export type operations = Record<string, never>;
diff --git a/frontend/sync-client/src/services/types/ClientCursors.ts b/frontend/sync-client/src/services/types/ClientCursors.ts
new file mode 100644
index 00000000..9bf8739f
--- /dev/null
+++ b/frontend/sync-client/src/services/types/ClientCursors.ts
@@ -0,0 +1,8 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { CursorSpan } from "./CursorSpan";
+
+export interface ClientCursors {
+	userName: string;
+	deviceId: string;
+	cursors: Partial<Record<string, CursorSpan[]>>;
+}
diff --git a/frontend/sync-client/src/services/types/CreateDocumentVersion.ts b/frontend/sync-client/src/services/types/CreateDocumentVersion.ts
new file mode 100644
index 00000000..d4bd376b
--- /dev/null
+++ b/frontend/sync-client/src/services/types/CreateDocumentVersion.ts
@@ -0,0 +1,13 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export interface CreateDocumentVersion {
+	/**
+	 * The client can decide the document id (if it wishes to) in order
+	 * to help with syncing. If the client does not provide a document id,
+	 * the server will generate one. If the client provides a document id
+	 * it must not already exist in the database.
+	 */
+	document_id: string | null;
+	relative_path: string;
+	content: number[];
+}
diff --git a/frontend/sync-client/src/services/types/CursorPositionFromClient.ts b/frontend/sync-client/src/services/types/CursorPositionFromClient.ts
new file mode 100644
index 00000000..d33c0c8e
--- /dev/null
+++ b/frontend/sync-client/src/services/types/CursorPositionFromClient.ts
@@ -0,0 +1,6 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { CursorSpan } from "./CursorSpan";
+
+export interface CursorPositionFromClient {
+	documentToCursors: Partial<Record<string, CursorSpan[]>>;
+}
diff --git a/frontend/sync-client/src/services/types/CursorPositionFromServer.ts b/frontend/sync-client/src/services/types/CursorPositionFromServer.ts
new file mode 100644
index 00000000..2556b748
--- /dev/null
+++ b/frontend/sync-client/src/services/types/CursorPositionFromServer.ts
@@ -0,0 +1,6 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { ClientCursors } from "./ClientCursors";
+
+export interface CursorPositionFromServer {
+	clients: ClientCursors[];
+}
diff --git a/frontend/sync-client/src/services/types/CursorSpan.ts b/frontend/sync-client/src/services/types/CursorSpan.ts
new file mode 100644
index 00000000..5bc2542e
--- /dev/null
+++ b/frontend/sync-client/src/services/types/CursorSpan.ts
@@ -0,0 +1,6 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export interface CursorSpan {
+	start: number;
+	end: number;
+}
diff --git a/frontend/sync-client/src/services/types/DeleteDocumentVersion.ts b/frontend/sync-client/src/services/types/DeleteDocumentVersion.ts
new file mode 100644
index 00000000..9edb09ed
--- /dev/null
+++ b/frontend/sync-client/src/services/types/DeleteDocumentVersion.ts
@@ -0,0 +1,5 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export interface DeleteDocumentVersion {
+	relativePath: string;
+}
diff --git a/frontend/sync-client/src/services/types/DocumentUpdateResponse.ts b/frontend/sync-client/src/services/types/DocumentUpdateResponse.ts
new file mode 100644
index 00000000..f0ed7abf
--- /dev/null
+++ b/frontend/sync-client/src/services/types/DocumentUpdateResponse.ts
@@ -0,0 +1,10 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { DocumentVersion } from "./DocumentVersion";
+import type { DocumentVersionWithoutContent } from "./DocumentVersionWithoutContent";
+
+/**
+ * Response to an update document request.
+ */
+export type DocumentUpdateResponse =
+	| ({ type: "FastForwardUpdate" } & DocumentVersionWithoutContent)
+	| ({ type: "MergingUpdate" } & DocumentVersion);
diff --git a/frontend/sync-client/src/services/types/DocumentVersion.ts b/frontend/sync-client/src/services/types/DocumentVersion.ts
new file mode 100644
index 00000000..2076d296
--- /dev/null
+++ b/frontend/sync-client/src/services/types/DocumentVersion.ts
@@ -0,0 +1,12 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export interface DocumentVersion {
+	vaultUpdateId: number;
+	documentId: string;
+	relativePath: string;
+	updatedDate: string;
+	contentBase64: string;
+	isDeleted: boolean;
+	userId: string;
+	deviceId: string;
+}
diff --git a/frontend/sync-client/src/services/types/DocumentVersionWithoutContent.ts b/frontend/sync-client/src/services/types/DocumentVersionWithoutContent.ts
new file mode 100644
index 00000000..cb23f6a5
--- /dev/null
+++ b/frontend/sync-client/src/services/types/DocumentVersionWithoutContent.ts
@@ -0,0 +1,12 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export interface DocumentVersionWithoutContent {
+	vaultUpdateId: number;
+	documentId: string;
+	relativePath: string;
+	updatedDate: string;
+	isDeleted: boolean;
+	userId: string;
+	deviceId: string;
+	contentSize: number;
+}
diff --git a/frontend/sync-client/src/services/types/FetchLatestDocumentsResponse.ts b/frontend/sync-client/src/services/types/FetchLatestDocumentsResponse.ts
new file mode 100644
index 00000000..67c19b2d
--- /dev/null
+++ b/frontend/sync-client/src/services/types/FetchLatestDocumentsResponse.ts
@@ -0,0 +1,13 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { DocumentVersionWithoutContent } from "./DocumentVersionWithoutContent";
+
+/**
+ * Response to a fetch latest documents request.
+ */
+export interface FetchLatestDocumentsResponse {
+	latestDocuments: DocumentVersionWithoutContent[];
+	/**
+	 * The update ID of the latest document in the response.
+	 */
+	lastUpdateId: bigint;
+}
diff --git a/frontend/sync-client/src/services/types/PingResponse.ts b/frontend/sync-client/src/services/types/PingResponse.ts
new file mode 100644
index 00000000..b0d993f2
--- /dev/null
+++ b/frontend/sync-client/src/services/types/PingResponse.ts
@@ -0,0 +1,16 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+/**
+ * Response to a ping request.
+ */
+export interface PingResponse {
+	/**
+	 * Semantic version of the server.
+	 */
+	serverVersion: string;
+	/**
+	 * Whether the client is authenticated based on the sent Authorization
+	 * header.
+	 */
+	isAuthenticated: boolean;
+}
diff --git a/frontend/sync-client/src/services/types/SerializedError.ts b/frontend/sync-client/src/services/types/SerializedError.ts
new file mode 100644
index 00000000..c0979c5a
--- /dev/null
+++ b/frontend/sync-client/src/services/types/SerializedError.ts
@@ -0,0 +1,7 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export interface SerializedError {
+	errorType: string;
+	message: string;
+	causes: string[];
+}
diff --git a/frontend/sync-client/src/services/types/UpdateDocumentVersion.ts b/frontend/sync-client/src/services/types/UpdateDocumentVersion.ts
new file mode 100644
index 00000000..bc3d54e5
--- /dev/null
+++ b/frontend/sync-client/src/services/types/UpdateDocumentVersion.ts
@@ -0,0 +1,7 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export interface UpdateDocumentVersion {
+	parent_version_id: bigint;
+	relative_path: string;
+	content: number[];
+}
diff --git a/frontend/sync-client/src/services/types/WebSocketClientMessage.ts b/frontend/sync-client/src/services/types/WebSocketClientMessage.ts
new file mode 100644
index 00000000..e7de2cf3
--- /dev/null
+++ b/frontend/sync-client/src/services/types/WebSocketClientMessage.ts
@@ -0,0 +1,7 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { CursorPositionFromClient } from "./CursorPositionFromClient";
+import type { WebSocketHandshake } from "./WebSocketHandshake";
+
+export type WebSocketClientMessage =
+	| ({ type: "handshake" } & WebSocketHandshake)
+	| ({ type: "cursorPositions" } & CursorPositionFromClient);
diff --git a/frontend/sync-client/src/services/types/WebSocketHandshake.ts b/frontend/sync-client/src/services/types/WebSocketHandshake.ts
new file mode 100644
index 00000000..068b3505
--- /dev/null
+++ b/frontend/sync-client/src/services/types/WebSocketHandshake.ts
@@ -0,0 +1,7 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export interface WebSocketHandshake {
+	token: string;
+	deviceId: string;
+	lastSeenVaultUpdateId: number | null;
+}
diff --git a/frontend/sync-client/src/services/types/WebSocketServerMessage.ts b/frontend/sync-client/src/services/types/WebSocketServerMessage.ts
new file mode 100644
index 00000000..8ebf8911
--- /dev/null
+++ b/frontend/sync-client/src/services/types/WebSocketServerMessage.ts
@@ -0,0 +1,7 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { CursorPositionFromServer } from "./CursorPositionFromServer";
+import type { WebSocketVaultUpdate } from "./WebSocketVaultUpdate";
+
+export type WebSocketServerMessage =
+	| ({ type: "vaultUpdate" } & WebSocketVaultUpdate)
+	| ({ type: "cursorPositions" } & CursorPositionFromServer);
diff --git a/frontend/sync-client/src/services/types/WebSocketVaultUpdate.ts b/frontend/sync-client/src/services/types/WebSocketVaultUpdate.ts
new file mode 100644
index 00000000..ad50c25d
--- /dev/null
+++ b/frontend/sync-client/src/services/types/WebSocketVaultUpdate.ts
@@ -0,0 +1,7 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { DocumentVersionWithoutContent } from "./DocumentVersionWithoutContent";
+
+export interface WebSocketVaultUpdate {
+	documents: DocumentVersionWithoutContent[];
+	isInitialSync: boolean;
+}
diff --git a/frontend/sync-client/src/services/websocket-manager.ts b/frontend/sync-client/src/services/websocket-manager.ts
new file mode 100644
index 00000000..285d51f9
--- /dev/null
+++ b/frontend/sync-client/src/services/websocket-manager.ts
@@ -0,0 +1,209 @@
+import type { Database } from "../persistence/database";
+import type { Logger } from "../tracing/logger";
+import type { Settings, SyncSettings } from "../persistence/settings";
+import type { WebSocketServerMessage } from "./types/WebSocketServerMessage";
+import type { Syncer } from "../sync-operations/syncer";
+import type { WebSocketClientMessage } from "./types/WebSocketClientMessage";
+import type { CursorPositionFromClient } from "./types/CursorPositionFromClient";
+import type { ClientCursors } from "./types/ClientCursors";
+
+export class WebSocketManager {
+	private readonly webSocketStatusChangeListeners: (() => unknown)[] = [];
+	private readonly remoteCursorsUpdateListeners: ((
+		cursors: ClientCursors[]
+	) => unknown)[] = [];
+
+	private refreshWebSocketInterval: NodeJS.Timeout | undefined;
+
+	private webSocket: WebSocket | undefined;
+
+	private readonly webSocketFactoryImplementation: typeof globalThis.WebSocket;
+
+	public constructor(
+		private readonly deviceId: string,
+		private readonly logger: Logger,
+		private readonly database: Database,
+		private readonly settings: Settings,
+		private readonly syncer: Syncer,
+		webSocketImplementation?: typeof globalThis.WebSocket
+	) {
+		if (webSocketImplementation) {
+			this.webSocketFactoryImplementation = webSocketImplementation;
+		} else {
+			if (
+				typeof globalThis !== "undefined" &&
+				typeof globalThis.WebSocket === "undefined"
+			) {
+				// eslint-disable-next-line
+				this.webSocketFactoryImplementation = require("ws"); // polyfill for WebSocket in Node.js
+			} else {
+				this.webSocketFactoryImplementation = WebSocket;
+			}
+		}
+
+		this.updateWebSocket(settings.getSettings());
+
+		settings.addOnSettingsChangeListener((newSettings, oldSettings) => {
+			if (
+				newSettings.remoteUri !== oldSettings.remoteUri ||
+				newSettings.vaultName !== oldSettings.vaultName ||
+				newSettings.token !== oldSettings.token ||
+				newSettings.isSyncEnabled !== oldSettings.isSyncEnabled
+			) {
+				this.updateWebSocket(newSettings);
+			}
+		});
+
+		this.setWebSocketRefreshInterval();
+	}
+
+	public get isWebSocketConnected(): boolean {
+		return (
+			this.webSocket?.readyState ===
+			this.webSocketFactoryImplementation.OPEN
+		);
+	}
+
+	public addWebSocketStatusChangeListener(listener: () => void): void {
+		this.webSocketStatusChangeListeners.push(listener);
+	}
+
+	public addRemoteCursorsUpdateListener(
+		listener: (cursors: ClientCursors[]) => void
+	): void {
+		this.remoteCursorsUpdateListeners.push(listener);
+	}
+
+	public async reset(): Promise<void> {
+		this.setWebSocketRefreshInterval();
+		this.updateWebSocket(this.settings.getSettings());
+	}
+
+	public stop(): void {
+		clearInterval(this.refreshWebSocketInterval);
+
+		try {
+			this.webSocket?.close();
+		} catch (e) {
+			this.logger.warn(`Failed to close WebSocket: ${e}`);
+		}
+	}
+
+	public updateLocalCursors(cursorPositions: CursorPositionFromClient): void {
+		if (!this.isWebSocketConnected) {
+			this.logger.warn(
+				"WebSocket is not connected, cannot send cursor positions"
+			);
+			return;
+		}
+		const message: WebSocketClientMessage = {
+			type: "cursorPositions",
+			...cursorPositions
+		};
+		this.webSocket?.send(JSON.stringify(message));
+		this.logger.info(
+			`Sent cursor positions: ${JSON.stringify(cursorPositions)}`
+		);
+	}
+
+	private updateWebSocket(settings: SyncSettings): void {
+		try {
+			this.webSocket?.close();
+		} catch (e) {
+			this.logger.warn(`Failed to close WebSocket: ${e}`);
+		}
+
+		if (!settings.isSyncEnabled) {
+			this.webSocket = undefined;
+			return;
+		}
+
+		const wsUri = new URL(settings.remoteUri);
+		wsUri.protocol = wsUri.protocol === "https" ? "wss" : "ws";
+		wsUri.pathname = `/vaults/${settings.vaultName}/ws`;
+
+		this.logger.info(`Connecting to WebSocket at ${wsUri.toString()}`);
+
+		this.webSocket = new this.webSocketFactoryImplementation(wsUri);
+
+		this.webSocket.onmessage = async (event): Promise<void> => {
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+			const message = JSON.parse(event.data) as WebSocketServerMessage;
+
+			if (message.type === "vaultUpdate") {
+				try {
+					await Promise.all(
+						message.documents.map(async (document) =>
+							this.syncer.syncRemotelyUpdatedFile(document)
+						)
+					);
+
+					if (message.isInitialSync && message.documents.length > 0) {
+						this.database.setLastSeenUpdateId(
+							message.documents
+								.map((document) => document.vaultUpdateId)
+								.reduce((a, b) => Math.max(a, b))
+						);
+					}
+				} catch (e) {
+					this.logger.error(
+						`Failed to sync remotely updated file: ${e}`
+					);
+				}
+				// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+			} else if (message.type === "cursorPositions") {
+				this.logger.info(
+					`Received cursor positions for ${JSON.stringify(message.clients)}`
+				);
+				this.remoteCursorsUpdateListeners.forEach((listener) => {
+					listener(
+						message.clients.filter(
+							(client) => client.deviceId !== this.deviceId
+						)
+					);
+				});
+			} else {
+				this.logger.warn(
+					`Received unknown message type: ${JSON.stringify(message)}`
+				);
+			}
+		};
+
+		// The JS WebSocket API doesn't support setting headers, so we have to send the token as a message
+		this.webSocket.onopen = (): void => {
+			this.logger.info("WebSocket connection opened");
+			this.webSocketStatusChangeListeners.forEach((listener) => {
+				listener();
+			});
+
+			const message: WebSocketClientMessage = {
+				type: "handshake",
+				deviceId: this.deviceId,
+				token: settings.token,
+				lastSeenVaultUpdateId: this.database.getLastSeenUpdateId()
+			};
+			this.webSocket?.send(JSON.stringify(message));
+		};
+
+		this.webSocket.onclose = (event): void => {
+			this.logger.warn(
+				`WebSocket closed with code ${event.code} (${event.reason == "" ? "unknown reason" : event.reason})`
+			);
+			this.webSocketStatusChangeListeners.forEach((listener) => {
+				listener();
+			});
+		};
+	}
+
+	private setWebSocketRefreshInterval(): void {
+		this.refreshWebSocketInterval = setInterval(() => {
+			if (
+				this.webSocket?.readyState ===
+				this.webSocketFactoryImplementation.CLOSED
+			) {
+				this.logger.info("WebSocket is closed, reconnecting...");
+				this.updateWebSocket(this.settings.getSettings());
+			}
+		}, this.settings.getSettings().webSocketRetryIntervalMs);
+	}
+}
diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts
index 94c446e8..6d51212e 100644
--- a/frontend/sync-client/src/sync-client.ts
+++ b/frontend/sync-client/src/sync-client.ts
@@ -15,9 +15,12 @@ import { FileOperations } from "./file-operations/file-operations";
 import { ConnectionStatus } from "./services/connection-status";
 import { UnrestrictedSyncer } from "./sync-operations/unrestricted-syncer";
 import { rateLimit } from "./utils/rate-limit";
-import { v4 as uuidv4 } from "uuid";
 import type { NetworkConnectionStatus } from "./types/network-connection-status";
 import { DocumentUpdateStatus } from "./types/document-update-status";
+import { WebSocketManager } from "./services/websocket-manager";
+import { createClientId } from "./utils/create-client-id";
+import type { CursorSpan } from "./services/types/CursorSpan";
+import type { ClientCursors } from "./services/types/ClientCursors";
 
 export class SyncClient {
 	private static readonly MINIMUM_SAVE_INTERVAL_MS = 1000;
@@ -29,6 +32,7 @@ export class SyncClient {
 		private readonly database: Database,
 		private readonly syncer: Syncer,
 		private readonly syncService: SyncService,
+		private readonly webSocketManager: WebSocketManager,
 		private readonly _logger: Logger,
 		private readonly connectionStatus: ConnectionStatus
 	) {
@@ -68,7 +72,10 @@ export class SyncClient {
 		nativeLineEndings?: string;
 	}): Promise<SyncClient> {
 		const logger = new Logger();
-		logger.info("Initialising SyncClient");
+
+		const deviceId = createClientId();
+
+		logger.info(`Initialising SyncClient with client id ${deviceId}`);
 
 		const history = new SyncHistory(logger);
 
@@ -104,7 +111,6 @@ export class SyncClient {
 				await rateLimitedSave(state);
 			}
 		);
-		const deviceId = uuidv4();
 
 		const connectionStatus = new ConnectionStatus(settings, logger);
 		const syncService = new SyncService(
@@ -121,6 +127,7 @@ export class SyncClient {
 			fs,
 			nativeLineEndings
 		);
+
 		const unrestrictedSyncer = new UnrestrictedSyncer(
 			logger,
 			database,
@@ -129,6 +136,7 @@ export class SyncClient {
 			fileOperations,
 			history
 		);
+
 		const syncer = new Syncer(
 			deviceId,
 			logger,
@@ -136,7 +144,15 @@ export class SyncClient {
 			settings,
 			syncService,
 			fileOperations,
-			unrestrictedSyncer,
+			unrestrictedSyncer
+		);
+
+		const webSocketManager = new WebSocketManager(
+			deviceId,
+			logger,
+			database,
+			settings,
+			syncer,
 			webSocket
 		);
 
@@ -146,6 +162,7 @@ export class SyncClient {
 			database,
 			syncer,
 			syncService,
+			webSocketManager,
 			logger,
 			connectionStatus
 		);
@@ -160,7 +177,7 @@ export class SyncClient {
 		return {
 			isSuccessful: server.isSuccessful,
 			serverMessage: server.message,
-			isWebSocketConnected: this.syncer.isWebSocketConnected
+			isWebSocketConnected: this.webSocketManager.isWebSocketConnected
 		};
 	}
 
@@ -179,7 +196,7 @@ export class SyncClient {
 	}
 
 	public stop(): void {
-		this.syncer.stop();
+		this.webSocketManager.stop();
 	}
 
 	public async waitAndStop(): Promise<void> {
@@ -194,6 +211,7 @@ export class SyncClient {
 		this.stop();
 		this.connectionStatus.startReset();
 		await this.syncer.reset();
+		await this.webSocketManager.reset();
 		this.history.reset();
 		this.database.reset();
 		this._logger.reset();
@@ -229,7 +247,7 @@ export class SyncClient {
 	}
 
 	public addWebSocketStatusChangeListener(listener: () => void): void {
-		this.syncer.addWebSocketStatusChangeListener(listener);
+		this.webSocketManager.addWebSocketStatusChangeListener(listener);
 	}
 
 	public async syncLocallyCreatedFile(
@@ -257,6 +275,18 @@ export class SyncClient {
 		});
 	}
 
+	public async updateLocalCursors(
+		documentToCursors: Record<RelativePath, CursorSpan[]>
+	): Promise<void> {
+		this.webSocketManager.updateLocalCursors({ documentToCursors });
+	}
+
+	public addRemoteCursorsUpdateListener(
+		listener: (cursors: ClientCursors[]) => void
+	): void {
+		this.webSocketManager.addRemoteCursorsUpdateListener(listener);
+	}
+
 	public getDocumentSyncingStatus(
 		relativePath: RelativePath
 	): DocumentUpdateStatus {
diff --git a/frontend/sync-client/src/sync-operations/syncer.ts b/frontend/sync-client/src/sync-operations/syncer.ts
index e141ce9d..30e012d9 100644
--- a/frontend/sync-client/src/sync-operations/syncer.ts
+++ b/frontend/sync-client/src/sync-operations/syncer.ts
@@ -9,7 +9,6 @@ import type { Logger } from "../tracing/logger";
 import PQueue from "p-queue";
 import { hash } from "../utils/hash";
 import { v4 as uuidv4 } from "uuid";
-import type { components } from "../services/types";
 import type { Settings, SyncSettings } from "../persistence/settings";
 import type { FileOperations } from "../file-operations/file-operations";
 import { findMatchingFile } from "../utils/find-matching-file";
@@ -17,27 +16,16 @@ import type { UnrestrictedSyncer } from "./unrestricted-syncer";
 import { createPromise } from "../utils/create-promise";
 import { SyncResetError } from "../services/sync-reset-error";
 import { Locks } from "../utils/locks";
-
-interface WebsocketVaultUpdate {
-	documents: components["schemas"]["DocumentVersionWithoutContent"][];
-	isInitialSync: boolean;
-}
+import type { DocumentVersionWithoutContent } from "../services/types/DocumentVersionWithoutContent";
 
 export class Syncer {
 	private readonly remoteDocumentsLock: Locks<DocumentId>;
 	private readonly remainingOperationsListeners: ((
 		remainingOperations: number
 	) => void)[] = [];
-	private readonly webSocketStatusChangeListeners: (() => void)[] = [];
 	private readonly syncQueue: PQueue;
 
 	private runningScheduleSyncForOfflineChanges: Promise<void> | undefined;
-	private refreshApplyRemoteChangesWebSocketInterval:
-		| NodeJS.Timeout
-		| undefined;
-	private applyRemoteChangesWebSocket: WebSocket | undefined;
-
-	private readonly webSocketImplementation: typeof globalThis.WebSocket;
 
 	// eslint-disable-next-line @typescript-eslint/max-params
 	public constructor(
@@ -47,41 +35,15 @@ export class Syncer {
 		private readonly settings: Settings,
 		private readonly syncService: SyncService,
 		private readonly operations: FileOperations,
-		private readonly internalSyncer: UnrestrictedSyncer,
-		webSocketImplementation?: typeof globalThis.WebSocket
+		private readonly internalSyncer: UnrestrictedSyncer
 	) {
 		this.syncQueue = new PQueue({
 			concurrency: settings.getSettings().syncConcurrency
 		});
 
-		if (webSocketImplementation) {
-			this.webSocketImplementation = webSocketImplementation;
-		} else {
-			if (
-				typeof globalThis !== "undefined" &&
-				typeof globalThis.WebSocket === "undefined"
-			) {
-				// eslint-disable-next-line
-				this.webSocketImplementation = require("ws"); // polyfill for WebSocket in Node.js
-			} else {
-				this.webSocketImplementation = WebSocket;
-			}
-		}
-
-		this.updateWebSocket(settings.getSettings());
-
 		this.remoteDocumentsLock = new Locks<DocumentId>(this.logger);
 
 		settings.addOnSettingsChangeListener((newSettings, oldSettings) => {
-			if (
-				newSettings.remoteUri !== oldSettings.remoteUri ||
-				newSettings.vaultName !== oldSettings.vaultName ||
-				newSettings.token !== oldSettings.token ||
-				newSettings.isSyncEnabled !== oldSettings.isSyncEnabled
-			) {
-				this.updateWebSocket(newSettings);
-			}
-
 			if (newSettings.syncConcurrency !== oldSettings.syncConcurrency) {
 				this.syncQueue.concurrency = newSettings.syncConcurrency;
 			}
@@ -92,15 +54,6 @@ export class Syncer {
 				listener(this.syncQueue.size);
 			});
 		});
-
-		this.setWebSocketRefreshInterval();
-	}
-
-	public get isWebSocketConnected(): boolean {
-		return (
-			this.applyRemoteChangesWebSocket?.readyState ===
-			this.webSocketImplementation.OPEN
-		);
 	}
 
 	public addRemainingOperationsListener(
@@ -109,10 +62,6 @@ export class Syncer {
 		this.remainingOperationsListeners.push(listener);
 	}
 
-	public addWebSocketStatusChangeListener(listener: () => void): void {
-		this.webSocketStatusChangeListeners.push(listener);
-	}
-
 	public async syncLocallyCreatedFile(
 		relativePath: RelativePath
 	): Promise<void> {
@@ -303,106 +252,10 @@ export class Syncer {
 
 	public async reset(): Promise<void> {
 		await this.waitUntilFinished();
-		this.setWebSocketRefreshInterval();
-		this.updateWebSocket(this.settings.getSettings());
 	}
 
-	public stop(): void {
-		clearInterval(this.refreshApplyRemoteChangesWebSocketInterval);
-
-		try {
-			this.applyRemoteChangesWebSocket?.close();
-		} catch (e) {
-			this.logger.warn(`Failed to close WebSocket: ${e}`);
-		}
-	}
-
-	private updateWebSocket(settings: SyncSettings): void {
-		try {
-			this.applyRemoteChangesWebSocket?.close();
-		} catch (e) {
-			this.logger.warn(`Failed to close WebSocket: ${e}`);
-		}
-
-		if (!settings.isSyncEnabled) {
-			this.applyRemoteChangesWebSocket = undefined;
-			return;
-		}
-
-		const wsUri = new URL(settings.remoteUri);
-		wsUri.protocol = wsUri.protocol === "https" ? "wss" : "ws";
-		wsUri.pathname = `/vaults/${settings.vaultName}/ws`;
-
-		this.logger.info(`Connecting to WebSocket at ${wsUri.toString()}`);
-
-		this.applyRemoteChangesWebSocket = new this.webSocketImplementation(
-			wsUri
-		);
-
-		this.applyRemoteChangesWebSocket.onmessage = async (
-			event
-		): Promise<void> => {
-			// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-			const message = JSON.parse(event.data) as WebsocketVaultUpdate;
-
-			try {
-				await Promise.all(
-					message.documents.map(async (document) =>
-						this.syncRemotelyUpdatedFile(document)
-					)
-				);
-
-				if (message.isInitialSync && message.documents.length > 0) {
-					this.database.setLastSeenUpdateId(
-						message.documents
-							.map((document) => document.vaultUpdateId)
-							.reduce((a, b) => Math.max(a, b))
-					);
-				}
-			} catch (e) {
-				this.logger.error(`Failed to sync remotely updated file: ${e}`);
-			}
-		};
-
-		// The JS WebSocket API doesn't support setting headers, so we have to send the token as a message
-		this.applyRemoteChangesWebSocket.onopen = (): void => {
-			this.logger.info("WebSocket connection opened");
-			this.applyRemoteChangesWebSocket?.send(
-				JSON.stringify({
-					deviceId: this.deviceId,
-					token: settings.token,
-					lastSeenVaultUpdateId: this.database.getLastSeenUpdateId()
-				})
-			);
-			this.webSocketStatusChangeListeners.forEach((listener) => {
-				listener();
-			});
-		};
-
-		this.applyRemoteChangesWebSocket.onclose = (event): void => {
-			this.logger.warn(
-				`WebSocket closed with code ${event.code} (${event.reason == "" ? "unknown reason" : event.reason})`
-			);
-			this.webSocketStatusChangeListeners.forEach((listener) => {
-				listener();
-			});
-		};
-	}
-
-	private setWebSocketRefreshInterval(): void {
-		this.refreshApplyRemoteChangesWebSocketInterval = setInterval(() => {
-			if (
-				this.applyRemoteChangesWebSocket?.readyState ===
-				this.webSocketImplementation.OPEN
-			) {
-				return;
-			}
-			this.updateWebSocket(this.settings.getSettings());
-		}, 5000);
-	}
-
-	private async syncRemotelyUpdatedFile(
-		remoteVersion: components["schemas"]["DocumentVersionWithoutContent"]
+	public async syncRemotelyUpdatedFile(
+		remoteVersion: DocumentVersionWithoutContent
 	): Promise<void> {
 		let document = this.database.getDocumentByDocumentId(
 			remoteVersion.documentId
diff --git a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
index b9780939..0d0f45ef 100644
--- a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
+++ b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
@@ -17,7 +17,6 @@ import type {
 } from "../tracing/sync-history";
 import { SyncStatus, SyncType } from "../tracing/sync-history";
 import { EMPTY_HASH, hash } from "../utils/hash";
-import type { components } from "../services/types";
 import { deserialize } from "../utils/deserialize";
 import type { Settings } from "../persistence/settings";
 import type { FileOperations } from "../file-operations/file-operations";
@@ -25,6 +24,9 @@ import { createPromise } from "../utils/create-promise";
 import { FileNotFoundError } from "../file-operations/file-not-found-error";
 import { SyncResetError } from "../services/sync-reset-error";
 import { globsToRegexes } from "../utils/globs-to-regexes";
+import type { DocumentVersion } from "../services/types/DocumentVersion";
+import type { DocumentUpdateResponse } from "../services/types/DocumentUpdateResponse";
+import type { DocumentVersionWithoutContent } from "../services/types/DocumentVersionWithoutContent";
 
 export class UnrestrictedSyncer {
 	private ignorePatterns: RegExp[];
@@ -172,10 +174,8 @@ export class UnrestrictedSyncer {
 				document.metadata.hash === contentHash && oldPath === undefined
 			);
 
-			let response:
-				| components["schemas"]["DocumentVersion"]
-				| components["schemas"]["DocumentUpdateResponse"]
-				| undefined = undefined;
+			let response: DocumentVersion | DocumentUpdateResponse | undefined =
+				undefined;
 
 			if (areThereLocalChanges) {
 				response = await this.syncService.put({
@@ -332,7 +332,7 @@ export class UnrestrictedSyncer {
 	}
 
 	public async unrestrictedSyncRemotelyUpdatedFile(
-		remoteVersion: components["schemas"]["DocumentVersionWithoutContent"],
+		remoteVersion: DocumentVersionWithoutContent,
 		document?: DocumentRecord
 	): Promise<void> {
 		const updateDetails: SyncCreateDetails = {
diff --git a/frontend/sync-client/src/utils/create-client-id.ts b/frontend/sync-client/src/utils/create-client-id.ts
new file mode 100644
index 00000000..60143b75
--- /dev/null
+++ b/frontend/sync-client/src/utils/create-client-id.ts
@@ -0,0 +1,15 @@
+import { v4 as uuidv4 } from "uuid";
+
+export function createClientId(): string {
+	// @ts-expect-error, injected by webpack
+	const packageVersion = __CURRENT_VERSION__; // eslint-disable-line
+
+	const platform =
+		typeof navigator !== "undefined"
+			? navigator.platform // eslint-disable-line @typescript-eslint/no-deprecated
+			: typeof process !== "undefined"
+				? process.platform
+				: "unknown";
+
+	return `vault-link/${packageVersion} (${uuidv4()}; ${platform})`;
+}
diff --git a/frontend/sync-client/src/utils/create-promise.ts b/frontend/sync-client/src/utils/create-promise.ts
index 056c169c..4004ac81 100644
--- a/frontend/sync-client/src/utils/create-promise.ts
+++ b/frontend/sync-client/src/utils/create-promise.ts
@@ -1,3 +1,7 @@
+/**
+ * A type-safe utility function to create a Promise with resolve and reject functions.
+ * @returns A tuple containing a Promise, a resolve function, and a reject function.
+ */
 export function createPromise<T = void>(): [
 	Promise<T>,
 	(value: T) => void,
diff --git a/frontend/sync-client/src/utils/locks.ts b/frontend/sync-client/src/utils/locks.ts
index 542f8a88..7e75bd3d 100644
--- a/frontend/sync-client/src/utils/locks.ts
+++ b/frontend/sync-client/src/utils/locks.ts
@@ -5,7 +5,7 @@ import type { Logger } from "../tracing/logger";
 // Locks are granted in a first-in-first-out order.
 export class Locks<T> {
 	private readonly locked = new Set<T>();
-	private readonly waiters = new Map<T, (() => void)[]>();
+	private readonly waiters = new Map<T, (() => unknown)[]>();
 
 	public constructor(private readonly logger: Logger) {}
 
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index b5910d9f..90e82ea3 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -11,14 +11,14 @@
         "test": "jest"
     },
     "devDependencies": {
-        "@types/node": "^22.15.27",
+        "@types/node": "^22.15.30",
         "sync-client": "file:../sync-client",
         "ts-loader": "^9.5.2",
         "tslib": "2.8.1",
         "typescript": "5.8.3",
         "uuid": "^11.1.0",
-        "webpack": "^5.98.0",
+        "webpack": "^5.99.9",
         "webpack-cli": "^6.0.1",
         "bufferutil": "^4.0.9"
     }
-}
+}
\ No newline at end of file
diff --git a/scripts/update-api-types.sh b/scripts/update-api-types.sh
index d9f39566..aea8a890 100755
--- a/scripts/update-api-types.sh
+++ b/scripts/update-api-types.sh
@@ -2,7 +2,10 @@
 
 set -e
 
-./scripts/utils/wait-for-server.sh
+rm -rf backend/sync_server/bindings
 
-npm install -g openapi-typescript
-openapi-typescript http://localhost:3000/api.json --output frontend/sync-client/src/services/types.ts
+cd backend
+cargo test export_bindings
+cd -
+
+cp -r backend/sync_server/bindings/* frontend/sync-client/src/services/types/

From 433e8f390f76e184bacef4b172d6305266261dd7 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 8 Jun 2025 20:58:30 +0100
Subject: [PATCH 522/761] Bump versions to 0.4.0

---
 backend/Cargo.lock                     | 6 +++---
 backend/Cargo.toml                     | 2 +-
 backend/sync_lib/pkg/package.json      | 2 +-
 frontend/obsidian-plugin/manifest.json | 2 +-
 frontend/obsidian-plugin/package.json  | 4 ++--
 frontend/package-lock.json             | 8 ++++----
 frontend/sync-client/package.json      | 4 ++--
 frontend/test-client/package.json      | 4 ++--
 manifest.json                          | 2 +-
 9 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index bab8d80a..4d40e80e 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -1716,7 +1716,7 @@ dependencies = [
 
 [[package]]
 name = "reconcile"
-version = "0.3.15"
+version = "0.4.0"
 dependencies = [
  "insta",
  "pretty_assertions",
@@ -2313,7 +2313,7 @@ dependencies = [
 
 [[package]]
 name = "sync_lib"
-version = "0.3.15"
+version = "0.4.0"
 dependencies = [
  "base64 0.22.1",
  "console_error_panic_hook",
@@ -2326,7 +2326,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.3.15"
+version = "0.4.0"
 dependencies = [
  "anyhow",
  "axum",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 907b201b..5fb4a5a5 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -12,7 +12,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.3.15"
+version = "0.4.0"
 
 [workspace.dependencies]
 serde = { version = "1.0.219", default-features = false, features = ["derive"] }
diff --git a/backend/sync_lib/pkg/package.json b/backend/sync_lib/pkg/package.json
index 9fe627d6..9bb9b50e 100644
--- a/backend/sync_lib/pkg/package.json
+++ b/backend/sync_lib/pkg/package.json
@@ -4,7 +4,7 @@
   "collaborators": [
     "Andras Schmelczer <andras@schmelczer.dev>"
   ],
-  "version": "0.3.15",
+  "version": "0.4.0",
   "license": "MIT",
   "repository": {
     "type": "git",
diff --git a/frontend/obsidian-plugin/manifest.json b/frontend/obsidian-plugin/manifest.json
index af653f50..5834f714 100644
--- a/frontend/obsidian-plugin/manifest.json
+++ b/frontend/obsidian-plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.3.15",
+	"version": "0.4.0",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index c69b74ea..fdfb14df 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -1,6 +1,6 @@
 {
     "name": "vault-link-obsidian-plugin",
-    "version": "0.3.15",
+    "version": "0.4.0",
     "description": "This is a sample plugin for Obsidian (https://obsidian.md)",
     "main": "main.js",
     "scripts": {
@@ -36,4 +36,4 @@
         "webpack": "^5.99.9",
         "webpack-cli": "^6.0.1"
     }
-}
\ No newline at end of file
+}
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index a5343d78..330f85ea 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -21,7 +21,7 @@
 		},
 		"../backend/sync_lib/pkg": {
 			"name": "sync_lib",
-			"version": "0.3.15",
+			"version": "0.4.0",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -7689,7 +7689,7 @@
 		},
 		"obsidian-plugin": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.3.15",
+			"version": "0.4.0",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
@@ -7717,7 +7717,7 @@
 			}
 		},
 		"sync-client": {
-			"version": "0.3.15",
+			"version": "0.4.0",
 			"dependencies": {
 				"byte-base64": "^1.1.0",
 				"minimatch": "^10.0.1",
@@ -7764,7 +7764,7 @@
 			}
 		},
 		"test-client": {
-			"version": "0.3.15",
+			"version": "0.4.0",
 			"bin": {
 				"test-client": "dist/cli.js"
 			},
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index 4c4b2ca0..74efc30a 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "sync-client",
-    "version": "0.3.15",
+    "version": "0.4.0",
     "main": "dist/sync-client.node.js",
     "browser": "dist/sync-client.web.js",
     "types": "dist/types/index.d.ts",
@@ -32,4 +32,4 @@
         "webpack-merge": "^6.0.1",
         "ws": "^8.18.2"
     }
-}
\ No newline at end of file
+}
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index 90e82ea3..c95328b7 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "test-client",
-    "version": "0.3.15",
+    "version": "0.4.0",
     "private": true,
     "bin": {
         "test-client": "./dist/cli.js"
@@ -21,4 +21,4 @@
         "webpack-cli": "^6.0.1",
         "bufferutil": "^4.0.9"
     }
-}
\ No newline at end of file
+}
diff --git a/manifest.json b/manifest.json
index af653f50..5834f714 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.3.15",
+	"version": "0.4.0",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",

From 8602b1c9a32a9c253d18d5e238df7fe7fe80b0c5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 8 Jun 2025 21:07:59 +0100
Subject: [PATCH 523/761] Bump typescript-eslint from 8.32.1 to 8.33.1 in
 /frontend (#60)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

From 75b020146a80a4d2a2620696e5f637cda1a0615e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 8 Jun 2025 21:08:11 +0100
Subject: [PATCH 524/761] Bump alpine from 3.21.3 to 3.22.0 in /backend (#59)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 backend/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/Dockerfile b/backend/Dockerfile
index 4f3021eb..d9fa92d1 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -13,7 +13,7 @@ RUN sqlx migrate run --source sync_server/src/app_state/database/migrations --da
 RUN cargo build --package sync_server --release --target x86_64-unknown-linux-musl
 
 # Runtime image
-FROM alpine:3.21.3
+FROM alpine:3.22.0
 
 LABEL org.opencontainers.image.authors="andras@schmelczer.dev"
 

From bb0e44f06f5caa16139fb40cda43720a6f0961f1 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 13 Jul 2025 11:06:42 +0100
Subject: [PATCH 525/761] Extract reconcile (#85)

---
 .github/workflows/check.yml                   |    24 +-
 .github/workflows/e2e.yml                     |    15 +-
 .github/workflows/publish-docker.yml          |     2 +-
 .github/workflows/publish-plugin.yml          |     6 -
 .gitignore                                    |    12 +-
 README.md                                     |     2 +-
 backend/Dockerfile                            |     4 +-
 backend/reconcile/Cargo.toml                  |    23 -
 backend/reconcile/src/diffs.rs                |     2 -
 backend/reconcile/src/diffs/myers.rs          |   357 -
 backend/reconcile/src/diffs/raw_operation.rs  |    64 -
 ...le__diffs__myers__tests__complex_diff.snap |    67 -
 ...ile__diffs__myers__tests__delete_only.snap |    27 -
 ...iffs__myers__tests__identical_content.snap |    37 -
 ...ile__diffs__myers__tests__insert_only.snap |    27 -
 ...iffs__myers__tests__prefix_and_suffix.snap |    57 -
 backend/reconcile/src/lib.rs                  |    10 -
 .../reconcile/src/operation_transformation.rs |   166 -
 .../src/operation_transformation/cursor.rs    |    57 -
 .../operation_transformation/edited_text.rs   |   381 -
 .../operation_transformation/merge_context.rs |    73 -
 .../src/operation_transformation/operation.rs |   513 -
 .../ordered_operation.rs                      |    14 -
 ...ted_text__tests__calculate_operations.snap |    43 -
 ...ts__calculate_operations_with_no_diff.snap |    23 -
 ...ted_text__tests__calculate_operations.snap |    61 -
 ...sequence__tests__calculate_operations.snap |    60 -
 backend/reconcile/src/tokenizer.rs            |     6 -
 ...rd_tokenizer__tests__with_snapshots-2.snap |     6 -
 ...rd_tokenizer__tests__with_snapshots-3.snap |    25 -
 ...rd_tokenizer__tests__with_snapshots-4.snap |    55 -
 ...rd_tokenizer__tests__with_snapshots-5.snap |    39 -
 ...word_tokenizer__tests__with_snapshots.snap |    25 -
 backend/reconcile/src/tokenizer/token.rs      |    64 -
 .../reconcile/src/tokenizer/word_tokenizer.rs |    60 -
 backend/reconcile/src/utils.rs                |     6 -
 .../reconcile/src/utils/common_prefix_len.rs  |    47 -
 .../reconcile/src/utils/common_suffix_len.rs  |    48 -
 .../find_longest_prefix_contained_within.rs   |   103 -
 backend/reconcile/src/utils/merge_iters.rs    |    86 -
 backend/reconcile/src/utils/side.rs           |    16 -
 backend/reconcile/src/utils/string_builder.rs |   111 -
 backend/reconcile/tests/example_document.rs   |   103 -
 backend/reconcile/tests/examples/README.md    |     1 -
 backend/reconcile/tests/examples/deletes.yml  |    31 -
 .../tests/examples/deletes_and_inserts.yml    |    12 -
 .../tests/examples/idempotent_inserts.yml     |    24 -
 .../reconcile/tests/examples/multiline.yml    |    63 -
 .../reconcile/tests/examples/replacing.yml    |    19 -
 backend/reconcile/tests/examples/utf-8.yml    |    10 -
 backend/reconcile/tests/examples/various.yml  |   130 -
 backend/reconcile/tests/resources/blns.txt    |   742 -
 backend/reconcile/tests/resources/kun_lu.txt  |  6438 -------
 .../tests/resources/pride_and_prejudice.txt   | 14910 ----------------
 .../tests/resources/room_with_a_view.txt      |  9105 ----------
 backend/reconcile/tests/test.rs               |    76 -
 backend/sync_lib/Cargo.toml                   |    32 -
 backend/sync_lib/pkg/package.json             |    23 -
 backend/sync_lib/src/cursor.rs                |    88 -
 backend/sync_lib/src/errors.rs                |    29 -
 backend/sync_lib/src/lib.rs                   |   152 -
 .../snapshots/web__base64_to_bytes_error.snap |    10 -
 backend/sync_lib/tests/web.rs                 |    99 -
 backend/sync_server/Cargo.toml                |    40 -
 frontend/obsidian-plugin/jest.config.js       |     2 +-
 .../src/obsidian-file-system.ts               |    41 +-
 .../obsidian-plugin/src/vault-link-plugin.ts  |     4 -
 ...ditor.ts => get-selections-from-editor.ts} |     4 +-
 .../cursors/local-cursor-update-listener.ts   |    22 +-
 frontend/package-lock.json                    |  1346 +-
 frontend/sync-client/jest.config.js           |     2 +-
 frontend/sync-client/package.json             |     8 +-
 .../file-operations/file-operations.test.ts   |    15 +-
 .../src/file-operations/file-operations.ts    |    50 +-
 .../file-operations/filesystem-operations.ts  |    12 +-
 .../safe-filesystem-operations.ts             |     6 +-
 frontend/sync-client/src/index.ts             |     6 +-
 frontend/sync-client/src/sync-client.ts       |     7 -
 .../src/utils/assert-set-contains-exactly.ts  |     2 +-
 .../sync-client/src/utils/deserialize.test.ts |    18 -
 .../src/utils/is-file-type-mergable.test.ts   |    28 +
 .../src/utils/is-file-type-mergable.ts        |     6 +
 .../sync-client/src/utils/serialize.test.ts   |    18 -
 frontend/sync-client/src/utils/serialize.ts   |     5 -
 frontend/test-client/jest.config.js           |     2 +-
 frontend/test-client/src/agent/mock-client.ts |     4 +-
 frontend/test-client/src/cli.ts               |     2 +-
 scripts/bump-version.sh                       |    12 +-
 scripts/clean-up.sh                           |     2 +-
 scripts/update-api-types.sh                   |     6 +-
 {backend => sync-server}/.dockerignore        |     1 -
 {backend => sync-server}/.env                 |     0
 {backend => sync-server}/Cargo.lock           |   244 +-
 {backend => sync-server}/Cargo.toml           |    49 +-
 sync-server/Dockerfile                        |    33 +
 .../sync_server => sync-server}/README.md     |     2 +-
 {backend/sync_server => sync-server}/build.rs |     0
 sync-server/config-e2e.yml                    |    26 +
 sync-server/rust-toolchain.toml               |     4 +
 sync-server/rustfmt.toml                      |     8 +
 .../src/app_state.rs                          |     0
 .../src/app_state/cursors.rs                  |     0
 .../src/app_state/database.rs                 |     0
 .../migrations/20241207143519_bootstrap.sql   |     0
 .../20250522192949_add_provenance_columns.sql |     0
 .../src/app_state/database/models.rs          |     4 +-
 .../src/app_state/websocket.rs                |     0
 .../src/app_state/websocket/broadcasts.rs     |     0
 .../src/app_state/websocket/models.rs         |     0
 .../src/app_state/websocket/utils.rs          |     0
 .../sync_server => sync-server}/src/cli.rs    |     0
 .../src/cli/args.rs                           |     0
 .../src/cli/color_when.rs                     |     0
 .../sync_server => sync-server}/src/config.rs |     0
 .../src/config/database_config.rs             |     0
 .../src/config/server_config.rs               |     0
 .../src/config/user_config.rs                 |     0
 .../sync_server => sync-server}/src/consts.rs |     0
 .../sync_server => sync-server}/src/errors.rs |     0
 .../sync_server => sync-server}/src/main.rs   |     0
 .../sync_server => sync-server}/src/server.rs |     0
 .../src/server/assets/index.html              |     0
 .../src/server/auth.rs                        |     0
 .../src/server/create_document.rs             |     0
 .../src/server/delete_document.rs             |     0
 .../src/server/device_id_header.rs            |     0
 .../src/server/fetch_document_version.rs      |     0
 .../server/fetch_document_version_content.rs  |     0
 .../server/fetch_latest_document_version.rs   |     0
 .../src/server/fetch_latest_documents.rs      |     0
 .../src/server/index.rs                       |     0
 .../src/server/ping.rs                        |     0
 .../src/server/requests.rs                    |     0
 .../src/server/responses.rs                   |     0
 .../src/server/update_document.rs             |    28 +-
 .../src/server/websocket.rs                   |     0
 .../sync_server => sync-server}/src/utils.rs  |     1 +
 .../src/utils/dedup_paths.rs                  |     0
 .../src/utils/is_file_type_mergable.rs        |    23 +
 .../src/utils/normalize.rs                    |     0
 .../src/utils/sanitize_path.rs                |     0
 141 files changed, 294 insertions(+), 36720 deletions(-)
 delete mode 100644 backend/reconcile/Cargo.toml
 delete mode 100644 backend/reconcile/src/diffs.rs
 delete mode 100644 backend/reconcile/src/diffs/myers.rs
 delete mode 100644 backend/reconcile/src/diffs/raw_operation.rs
 delete mode 100644 backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__complex_diff.snap
 delete mode 100644 backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__delete_only.snap
 delete mode 100644 backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__identical_content.snap
 delete mode 100644 backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__insert_only.snap
 delete mode 100644 backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__prefix_and_suffix.snap
 delete mode 100644 backend/reconcile/src/lib.rs
 delete mode 100644 backend/reconcile/src/operation_transformation.rs
 delete mode 100644 backend/reconcile/src/operation_transformation/cursor.rs
 delete mode 100644 backend/reconcile/src/operation_transformation/edited_text.rs
 delete mode 100644 backend/reconcile/src/operation_transformation/merge_context.rs
 delete mode 100644 backend/reconcile/src/operation_transformation/operation.rs
 delete mode 100644 backend/reconcile/src/operation_transformation/ordered_operation.rs
 delete mode 100644 backend/reconcile/src/operation_transformation/snapshots/reconcile__operation_transformation__edited_text__tests__calculate_operations.snap
 delete mode 100644 backend/reconcile/src/operation_transformation/snapshots/reconcile__operation_transformation__edited_text__tests__calculate_operations_with_no_diff.snap
 delete mode 100644 backend/reconcile/src/operation_transformation/snapshots/reconcile__operations__edited_text__tests__calculate_operations.snap
 delete mode 100644 backend/reconcile/src/operation_transformation/snapshots/reconcile__operations__operation_sequence__tests__calculate_operations.snap
 delete mode 100644 backend/reconcile/src/tokenizer.rs
 delete mode 100644 backend/reconcile/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots-2.snap
 delete mode 100644 backend/reconcile/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots-3.snap
 delete mode 100644 backend/reconcile/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots-4.snap
 delete mode 100644 backend/reconcile/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots-5.snap
 delete mode 100644 backend/reconcile/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots.snap
 delete mode 100644 backend/reconcile/src/tokenizer/token.rs
 delete mode 100644 backend/reconcile/src/tokenizer/word_tokenizer.rs
 delete mode 100644 backend/reconcile/src/utils.rs
 delete mode 100644 backend/reconcile/src/utils/common_prefix_len.rs
 delete mode 100644 backend/reconcile/src/utils/common_suffix_len.rs
 delete mode 100644 backend/reconcile/src/utils/find_longest_prefix_contained_within.rs
 delete mode 100644 backend/reconcile/src/utils/merge_iters.rs
 delete mode 100644 backend/reconcile/src/utils/side.rs
 delete mode 100644 backend/reconcile/src/utils/string_builder.rs
 delete mode 100644 backend/reconcile/tests/example_document.rs
 delete mode 100644 backend/reconcile/tests/examples/README.md
 delete mode 100644 backend/reconcile/tests/examples/deletes.yml
 delete mode 100644 backend/reconcile/tests/examples/deletes_and_inserts.yml
 delete mode 100644 backend/reconcile/tests/examples/idempotent_inserts.yml
 delete mode 100644 backend/reconcile/tests/examples/multiline.yml
 delete mode 100644 backend/reconcile/tests/examples/replacing.yml
 delete mode 100644 backend/reconcile/tests/examples/utf-8.yml
 delete mode 100644 backend/reconcile/tests/examples/various.yml
 delete mode 100644 backend/reconcile/tests/resources/blns.txt
 delete mode 100644 backend/reconcile/tests/resources/kun_lu.txt
 delete mode 100644 backend/reconcile/tests/resources/pride_and_prejudice.txt
 delete mode 100644 backend/reconcile/tests/resources/room_with_a_view.txt
 delete mode 100644 backend/reconcile/tests/test.rs
 delete mode 100644 backend/sync_lib/Cargo.toml
 delete mode 100644 backend/sync_lib/pkg/package.json
 delete mode 100644 backend/sync_lib/src/cursor.rs
 delete mode 100644 backend/sync_lib/src/errors.rs
 delete mode 100644 backend/sync_lib/src/lib.rs
 delete mode 100644 backend/sync_lib/tests/snapshots/web__base64_to_bytes_error.snap
 delete mode 100644 backend/sync_lib/tests/web.rs
 delete mode 100644 backend/sync_server/Cargo.toml
 rename frontend/obsidian-plugin/src/views/cursors/{get-cursors-from-editor.ts => get-selections-from-editor.ts} (80%)
 delete mode 100644 frontend/sync-client/src/utils/deserialize.test.ts
 create mode 100644 frontend/sync-client/src/utils/is-file-type-mergable.test.ts
 create mode 100644 frontend/sync-client/src/utils/is-file-type-mergable.ts
 delete mode 100644 frontend/sync-client/src/utils/serialize.test.ts
 delete mode 100644 frontend/sync-client/src/utils/serialize.ts
 rename {backend => sync-server}/.dockerignore (78%)
 rename {backend => sync-server}/.env (100%)
 rename {backend => sync-server}/Cargo.lock (93%)
 rename {backend => sync-server}/Cargo.toml (60%)
 create mode 100644 sync-server/Dockerfile
 rename {backend/sync_server => sync-server}/README.md (60%)
 rename {backend/sync_server => sync-server}/build.rs (100%)
 create mode 100644 sync-server/config-e2e.yml
 create mode 100644 sync-server/rust-toolchain.toml
 create mode 100644 sync-server/rustfmt.toml
 rename {backend/sync_server => sync-server}/src/app_state.rs (100%)
 rename {backend/sync_server => sync-server}/src/app_state/cursors.rs (100%)
 rename {backend/sync_server => sync-server}/src/app_state/database.rs (100%)
 rename {backend/sync_server => sync-server}/src/app_state/database/migrations/20241207143519_bootstrap.sql (100%)
 rename {backend/sync_server => sync-server}/src/app_state/database/migrations/20250522192949_add_provenance_columns.sql (100%)
 rename {backend/sync_server => sync-server}/src/app_state/database/models.rs (95%)
 rename {backend/sync_server => sync-server}/src/app_state/websocket.rs (100%)
 rename {backend/sync_server => sync-server}/src/app_state/websocket/broadcasts.rs (100%)
 rename {backend/sync_server => sync-server}/src/app_state/websocket/models.rs (100%)
 rename {backend/sync_server => sync-server}/src/app_state/websocket/utils.rs (100%)
 rename {backend/sync_server => sync-server}/src/cli.rs (100%)
 rename {backend/sync_server => sync-server}/src/cli/args.rs (100%)
 rename {backend/sync_server => sync-server}/src/cli/color_when.rs (100%)
 rename {backend/sync_server => sync-server}/src/config.rs (100%)
 rename {backend/sync_server => sync-server}/src/config/database_config.rs (100%)
 rename {backend/sync_server => sync-server}/src/config/server_config.rs (100%)
 rename {backend/sync_server => sync-server}/src/config/user_config.rs (100%)
 rename {backend/sync_server => sync-server}/src/consts.rs (100%)
 rename {backend/sync_server => sync-server}/src/errors.rs (100%)
 rename {backend/sync_server => sync-server}/src/main.rs (100%)
 rename {backend/sync_server => sync-server}/src/server.rs (100%)
 rename {backend/sync_server => sync-server}/src/server/assets/index.html (100%)
 rename {backend/sync_server => sync-server}/src/server/auth.rs (100%)
 rename {backend/sync_server => sync-server}/src/server/create_document.rs (100%)
 rename {backend/sync_server => sync-server}/src/server/delete_document.rs (100%)
 rename {backend/sync_server => sync-server}/src/server/device_id_header.rs (100%)
 rename {backend/sync_server => sync-server}/src/server/fetch_document_version.rs (100%)
 rename {backend/sync_server => sync-server}/src/server/fetch_document_version_content.rs (100%)
 rename {backend/sync_server => sync-server}/src/server/fetch_latest_document_version.rs (100%)
 rename {backend/sync_server => sync-server}/src/server/fetch_latest_documents.rs (100%)
 rename {backend/sync_server => sync-server}/src/server/index.rs (100%)
 rename {backend/sync_server => sync-server}/src/server/ping.rs (100%)
 rename {backend/sync_server => sync-server}/src/server/requests.rs (100%)
 rename {backend/sync_server => sync-server}/src/server/responses.rs (100%)
 rename {backend/sync_server => sync-server}/src/server/update_document.rs (84%)
 rename {backend/sync_server => sync-server}/src/server/websocket.rs (100%)
 rename {backend/sync_server => sync-server}/src/utils.rs (67%)
 rename {backend/sync_server => sync-server}/src/utils/dedup_paths.rs (100%)
 create mode 100644 sync-server/src/utils/is_file_type_mergable.rs
 rename {backend/sync_server => sync-server}/src/utils/normalize.rs (100%)
 rename {backend/sync_server => sync-server}/src/utils/sanitize_path.rs (100%)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 41b35a96..cb54ca89 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -25,29 +25,22 @@ jobs:
 
       - name: Setup rust
         run: |
-          cargo install sqlx-cli wasm-pack cargo-machete
-          cd backend
+          cargo install sqlx-cli cargo-machete
+          cd sync-server
           sqlx database create --database-url sqlite://db.sqlite3
-          sqlx migrate run --source sync_server/src/app_state/database/migrations --database-url sqlite://db.sqlite3
+          sqlx migrate run --source src/app_state/database/migrations --database-url sqlite://db.sqlite3
 
-      - name: Build wasm
+      - name: Lint sync-server
         run: |
-          cd backend
-          wasm-pack build --target web sync_lib
-
-      - name: Lint backend
-        run: |
-          cd backend
+          cd sync-server
           cargo clippy --all-targets --all-features
           cargo fmt --all -- --check
           cargo machete
 
-      - name: Test backend
+      - name: Test sync-server
         run: |
-          cd backend
-          cargo test --verbose -- --include-ignored
-          cd sync_lib
-          wasm-pack test --node
+          cd sync-server
+          cargo test --verbose
 
       - name: Lint frontend
         run: |
@@ -64,4 +57,5 @@ jobs:
       - name: Test frontend
         run: |
           cd frontend
+          npm ci
           npm run test
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index ad7523f5..1371303d 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -25,20 +25,15 @@ jobs:
 
       - name: Setup rust
         run: |
-          cargo install sqlx-cli wasm-pack
-          cd backend
+          cargo install sqlx-cli
+          cd sync-server
           sqlx database create --database-url sqlite://db.sqlite3
-          sqlx migrate run --source sync_server/src/app_state/database/migrations --database-url sqlite://db.sqlite3
-
-      - name: Build wasm
-        run: |
-          cd backend
-          wasm-pack build --target web sync_lib
+          sqlx migrate run --source src/app_state/database/migrations --database-url sqlite://db.sqlite3
 
       - name: E2E tests
         run: |
-          cd backend
-          cargo run -p sync_server config-e2e.yml --color never &
+          cd sync-server
+          cargo run config-e2e.yml --color never &
           cd ..
 
           scripts/update-api-types.sh
diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml
index 7113992f..b205448f 100644
--- a/.github/workflows/publish-docker.yml
+++ b/.github/workflows/publish-docker.yml
@@ -66,7 +66,7 @@ jobs:
         id: build-and-push
         uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
         with:
-          context: backend
+          context: sync-server
           push: ${{ github.ref_type == 'tag' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/.github/workflows/publish-plugin.yml b/.github/workflows/publish-plugin.yml
index 19bcc788..18c934bb 100644
--- a/.github/workflows/publish-plugin.yml
+++ b/.github/workflows/publish-plugin.yml
@@ -20,12 +20,6 @@ jobs:
           node-version: "22.x"
           check-latest: true
 
-      - name: Build wasm
-        run: |
-          cd backend
-          cargo install wasm-pack
-          wasm-pack build --target web sync_lib
-
       - name: Build plugin
         run: |
           cd frontend
diff --git a/.gitignore b/.gitignore
index 384c91eb..98a00712 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,15 +4,17 @@ node_modules
 # Exclude macOS Finder (System Explorer) View States
 .DS_Store
 
-# Rust build folder
-backend/target
+
 
 # Frontend build folders
 frontend/*/dist
 
-backend/db.sqlite3*
-backend/databases
-backend/sync_server/bindings/*.ts
+sync-server/db.sqlite3*
+sync-server/databases
+
+# Rust build folders
+sync-server/target
+sync-server/bindings/*.ts
 
 *.log
 *.sqlx
diff --git a/README.md b/README.md
index 4735cf5f..d0bbb264 100644
--- a/README.md
+++ b/README.md
@@ -56,4 +56,4 @@ And to clean up the logs & database files, run `scripts/clean-up.sh`
 
 ## Projects
 
-- [Sync server](./backend/sync_server/README.md)
+- [Sync server](./sync-server/README.md)
diff --git a/backend/Dockerfile b/backend/Dockerfile
index d9fa92d1..a5b2f9a5 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -8,9 +8,9 @@ RUN cargo install sqlx-cli
 COPY . .
 
 RUN sqlx database create --database-url sqlite://db.sqlite3
-RUN sqlx migrate run --source sync_server/src/app_state/database/migrations --database-url sqlite://db.sqlite3
+RUN sqlx migrate run --source sync-server/src/app_state/database/migrations --database-url sqlite://db.sqlite3
 
-RUN cargo build --package sync_server --release --target x86_64-unknown-linux-musl
+RUN cargo build --release --target x86_64-unknown-linux-musl
 
 # Runtime image
 FROM alpine:3.22.0
diff --git a/backend/reconcile/Cargo.toml b/backend/reconcile/Cargo.toml
deleted file mode 100644
index 61e7edf8..00000000
--- a/backend/reconcile/Cargo.toml
+++ /dev/null
@@ -1,23 +0,0 @@
-[package]
-name = "reconcile"
-version.workspace = true
-edition.workspace = true
-authors.workspace = true
-license.workspace = true
-repository.workspace = true
-
-[dependencies]
-serde = { version = "1.0.219", optional = true, features = ["derive"] }
-
-[features]
-serde = [ "dep:serde" ]
-
-[dev-dependencies]
-insta = "1.42.2"
-pretty_assertions = "1.4.1"
-serde = { version = "1.0.219", features = ["derive"] }
-serde_yaml ="0.9.34"
-test-case = "3.3.1"
-
-[lints]
-workspace = true
diff --git a/backend/reconcile/src/diffs.rs b/backend/reconcile/src/diffs.rs
deleted file mode 100644
index b57139a5..00000000
--- a/backend/reconcile/src/diffs.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-pub mod myers;
-pub mod raw_operation;
diff --git a/backend/reconcile/src/diffs/myers.rs b/backend/reconcile/src/diffs/myers.rs
deleted file mode 100644
index c0be1d78..00000000
--- a/backend/reconcile/src/diffs/myers.rs
+++ /dev/null
@@ -1,357 +0,0 @@
-//! Taken from <https://github.com/mitsuhiko/similar/blob/7e15c44de11a1cd61e1149189929e189ef977fd8/src/algorithms/myers.rs>
-//!
-//! Myers' diff algorithm.
-//!
-//! * time: `O((N+M)D)`
-//! * space `O(N+M)`
-//!
-//! See [the original article by Eugene W. Myers](http://www.xmailserver.org/diff2.pdf)
-//! describing it.
-//!
-//! The implementation of this algorithm is based on the implementation by
-//! Brandon Williams.
-//!
-//! # Heuristics
-//!
-//! At present this implementation of Myers' does not implement any more
-//! advanced heuristics that would solve some pathological cases.  For instance
-//! passing two large and completely distinct sequences to the algorithm will
-//! make it spin without making reasonable progress.
-//! For potential improvements here see [similar#15](https://github.com/mitsuhiko/similar/issues/15).
-
-use std::{
-    ops::{Index, IndexMut, Range},
-    vec,
-};
-
-use super::raw_operation::RawOperation;
-use crate::{
-    tokenizer::token::Token,
-    utils::{common_prefix_len::common_prefix_len, common_suffix_len::common_suffix_len},
-};
-
-/// Myers' diff algorithm with deadline.
-///
-/// Diff `old`, between indices `old_range` and `new` between indices
-/// `new_range`.
-///
-/// The returned `RawOperations` all have a token count of 1.
-pub fn diff<T>(old: &[Token<T>], new: &[Token<T>]) -> Vec<RawOperation<T>>
-where
-    T: PartialEq + Clone + std::fmt::Debug,
-{
-    let max_d = (old.len() + new.len()).div_ceil(2) + 1;
-    let mut vb = V::new(max_d);
-    let mut vf = V::new(max_d);
-    let mut result: Vec<RawOperation<T>> = vec![];
-
-    conquer(
-        old,
-        0..old.len(),
-        new,
-        0..new.len(),
-        &mut vf,
-        &mut vb,
-        &mut result,
-    );
-
-    debug_assert!(
-        result.iter().all(|op| op.tokens().len() == 1),
-        "All operations should be of length 1"
-    );
-
-    result
-}
-
-// A D-path is a path which starts at (0,0) that has exactly D non-diagonal
-// edges. All D-paths consist of a (D - 1)-path followed by a non-diagonal edge
-// and then a possibly empty sequence of diagonal edges called a snake.
-
-/// `V` contains the endpoints of the furthest reaching `D-paths`. For each
-/// recorded endpoint `(x,y)` in diagonal `k`, we only need to retain `x`
-/// because `y` can be computed from `x - k`. In other words, `V` is an array of
-/// integers where `V[k]` contains the row index of the endpoint of the furthest
-/// reaching path in diagonal `k`.
-///
-/// We can't use a traditional Vec to represent `V` since we use `k` as an index
-/// and it can take on negative values. So instead `V` is represented as a
-/// light-weight wrapper around a Vec plus an `offset` which is the maximum
-/// value `k` can take on in order to map negative `k`'s back to a value >= 0.
-#[derive(Debug)]
-struct V {
-    offset: isize,
-    v: Vec<usize>, // Look into initializing this to -1 and storing isize
-}
-
-impl V {
-    fn new(max_d: usize) -> Self {
-        Self {
-            offset: max_d as isize,
-            v: vec![0; 2 * max_d],
-        }
-    }
-
-    fn len(&self) -> usize { self.v.len() }
-}
-
-impl Index<isize> for V {
-    type Output = usize;
-
-    fn index(&self, index: isize) -> &Self::Output { &self.v[(index + self.offset) as usize] }
-}
-
-impl IndexMut<isize> for V {
-    fn index_mut(&mut self, index: isize) -> &mut Self::Output {
-        &mut self.v[(index + self.offset) as usize]
-    }
-}
-
-fn split_at(range: Range<usize>, at: usize) -> (Range<usize>, Range<usize>) {
-    (range.start..at, at..range.end)
-}
-
-/// A `Snake` is a sequence of diagonal edges in the edit graph.  Normally
-/// a snake has a start end end point (and it is possible for a snake to have
-/// a length of zero, meaning the start and end points are the same) however
-/// we do not need the end point which is why it's not implemented here.
-///
-/// The divide part of a divide-and-conquer strategy. A D-path has D+1 snakes
-/// some of which may be empty. The divide step requires finding the ceil(D/2) +
-/// 1 or middle snake of an optimal D-path. The idea for doing so is to
-/// simultaneously run the basic algorithm in both the forward and reverse
-/// directions until furthest reaching forward and reverse paths starting at
-/// opposing corners 'overlap'.
-fn find_middle_snake<T>(
-    old: &[Token<T>],
-    old_range: Range<usize>,
-    new: &[Token<T>],
-    new_range: Range<usize>,
-    vf: &mut V,
-    vb: &mut V,
-) -> Option<(usize, usize)>
-where
-    T: PartialEq + Clone + std::fmt::Debug,
-{
-    let n = old_range.len();
-    let m = new_range.len();
-
-    // By Lemma 1 in the paper, the optimal edit script length is odd or even as
-    // `delta` is odd or even.
-    let delta = n as isize - m as isize;
-    let odd = delta & 1 == 1;
-
-    // The initial point at (0, -1)
-    vf[1] = 0;
-    // The initial point at (N, M+1)
-    vb[1] = 0;
-
-    let d_max = (n + m).div_ceil(2) + 1;
-    assert!(vf.len() >= d_max);
-    assert!(vb.len() >= d_max);
-
-    for d in 0..d_max as isize {
-        // Forward path
-        for k in (-d..=d).rev().step_by(2) {
-            let mut x = if k == -d || (k != d && vf[k - 1] < vf[k + 1]) {
-                vf[k + 1]
-            } else {
-                vf[k - 1] + 1
-            };
-            let y = (x as isize - k) as usize;
-
-            // The coordinate of the start of a snake
-            let (x0, y0) = (x, y);
-            //  While these sequences are identical, keep moving through the
-            //  graph with no cost
-            if x < old_range.len() && y < new_range.len() {
-                let advance = common_prefix_len(
-                    old,
-                    old_range.start + x..old_range.end,
-                    new,
-                    new_range.start + y..new_range.end,
-                );
-                x += advance;
-            }
-
-            // This is the new best x value
-            vf[k] = x;
-
-            // Only check for connections from the forward search when N - M is
-            // odd and when there is a reciprocal k line coming from the other
-            // direction.
-            if odd && (k - delta).abs() <= (d - 1) {
-                // TODO optimize this so we don't have to compare against n
-                if vf[k] + vb[-(k - delta)] >= n {
-                    // Return the snake
-                    return Some((x0 + old_range.start, y0 + new_range.start));
-                }
-            }
-        }
-
-        // Backward path
-        for k in (-d..=d).rev().step_by(2) {
-            let mut x = if k == -d || (k != d && vb[k - 1] < vb[k + 1]) {
-                vb[k + 1]
-            } else {
-                vb[k - 1] + 1
-            };
-            let mut y = (x as isize - k) as usize;
-
-            // The coordinate of the start of a snake
-            if x < n && y < m {
-                let advance = common_suffix_len(
-                    old,
-                    old_range.start..old_range.start + n - x,
-                    new,
-                    new_range.start..new_range.start + m - y,
-                );
-                x += advance;
-                y += advance;
-            }
-
-            // This is the new best x value
-            vb[k] = x;
-
-            if !odd && (k - delta).abs() <= d {
-                // TODO optimize this so we don't have to compare against n
-                if vb[k] + vf[-(k - delta)] >= n {
-                    // Return the snake
-                    return Some((n - x + old_range.start, m - y + new_range.start));
-                }
-            }
-        }
-
-        // TODO: Maybe there's an opportunity to optimize and bail early?
-    }
-
-    None
-}
-
-fn conquer<T>(
-    old: &[Token<T>],
-    mut old_range: Range<usize>,
-    new: &[Token<T>],
-    mut new_range: Range<usize>,
-    vf: &mut V,
-    vb: &mut V,
-    result: &mut Vec<RawOperation<T>>,
-) where
-    T: PartialEq + Clone + std::fmt::Debug,
-{
-    // Check for common prefix
-    let common_prefix_len = common_prefix_len(old, old_range.clone(), new, new_range.clone());
-    if common_prefix_len > 0 {
-        result.extend(
-            old[old_range.start..old_range.start + common_prefix_len]
-                .iter()
-                .map(|token| RawOperation::Equal(vec![token.clone()])),
-        );
-    }
-    old_range.start += common_prefix_len;
-    new_range.start += common_prefix_len;
-
-    // Check for common suffix
-    let common_suffix_len = common_suffix_len(old, old_range.clone(), new, new_range.clone());
-    let common_suffix = (
-        old_range.end - common_suffix_len,
-        new_range.end - common_suffix_len,
-    );
-    old_range.end -= common_suffix_len;
-    new_range.end -= common_suffix_len;
-
-    if old_range.is_empty() && new_range.is_empty() {
-        // do nothing
-    } else if new_range.is_empty() {
-        result.extend(
-            old[old_range.start..old_range.start + old_range.len()]
-                .iter()
-                .map(|token| RawOperation::Delete(vec![token.clone()])),
-        );
-    } else if old_range.is_empty() {
-        result.extend(
-            new[new_range.start..new_range.start + new_range.len()]
-                .iter()
-                .map(|token| RawOperation::Insert(vec![token.clone()])),
-        );
-    } else if let Some((x_start, y_start)) =
-        find_middle_snake(old, old_range.clone(), new, new_range.clone(), vf, vb)
-    {
-        let (old_a, old_b) = split_at(old_range, x_start);
-        let (new_a, new_b) = split_at(new_range, y_start);
-        conquer(old, old_a, new, new_a, vf, vb, result);
-        conquer(old, old_b, new, new_b, vf, vb, result);
-    } else {
-        result.extend(
-            old[old_range.start..old_range.end]
-                .iter()
-                .map(|token| RawOperation::Delete(vec![token.clone()])),
-        );
-        result.extend(
-            new[new_range.start..new_range.end]
-                .iter()
-                .map(|token| RawOperation::Insert(vec![token.clone()])),
-        );
-    }
-
-    if common_suffix_len > 0 {
-        result.extend(
-            old[common_suffix.0..common_suffix.0 + common_suffix_len]
-                .iter()
-                .map(|token| RawOperation::Equal(vec![token.clone()])),
-        );
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use insta::assert_debug_snapshot;
-
-    use super::*;
-
-    #[test]
-    fn test_empty_diff() {
-        let old: Vec<Token<String>> = vec![];
-        let new: Vec<Token<String>> = vec![];
-        let result = diff(&old, &new);
-        assert_eq!(result.len(), 0);
-    }
-
-    #[test]
-    fn test_identical_content() {
-        let content = vec!["a".into(), "b".into(), "c".into()];
-        let result = diff(&content, &content);
-        assert_debug_snapshot!(result);
-    }
-
-    #[test]
-    fn test_insert_only() {
-        let old: Vec<Token<String>> = vec![];
-        let new: Vec<Token<String>> = vec!["a".into(), "b".into()];
-        let result = diff(&old, &new);
-        assert_debug_snapshot!(result);
-    }
-
-    #[test]
-    fn test_delete_only() {
-        let old = vec!["a".into(), "b".into()];
-        let new: Vec<Token<String>> = vec![];
-        let result = diff(&old, &new);
-        assert_debug_snapshot!(result);
-    }
-
-    #[test]
-    fn test_prefix_and_suffix() {
-        let old = vec!["a".into(), "b".into(), "c".into(), "d".into()];
-        let new = vec!["a".into(), "x".into(), "d".into()];
-        let result = diff(&old, &new);
-        assert_debug_snapshot!(result);
-    }
-
-    #[test]
-    fn test_complex_diff() {
-        let old = vec!["a".into(), "b".into(), "c".into(), "d".into()];
-        let new = vec!["a".into(), "x".into(), "c".into(), "y".into()];
-        let result = diff(&old, &new);
-        assert_debug_snapshot!(result);
-    }
-}
diff --git a/backend/reconcile/src/diffs/raw_operation.rs b/backend/reconcile/src/diffs/raw_operation.rs
deleted file mode 100644
index 7630ff7f..00000000
--- a/backend/reconcile/src/diffs/raw_operation.rs
+++ /dev/null
@@ -1,64 +0,0 @@
-use crate::tokenizer::token::Token;
-
-#[derive(Debug, Clone, PartialEq)]
-pub enum RawOperation<T>
-where
-    T: PartialEq + Clone + std::fmt::Debug,
-{
-    Insert(Vec<Token<T>>),
-    Delete(Vec<Token<T>>),
-    Equal(Vec<Token<T>>),
-}
-
-impl<T> RawOperation<T>
-where
-    T: PartialEq + Clone + std::fmt::Debug,
-{
-    pub fn tokens(&self) -> &Vec<Token<T>> {
-        match self {
-            RawOperation::Insert(tokens)
-            | RawOperation::Delete(tokens)
-            | RawOperation::Equal(tokens) => tokens,
-        }
-    }
-
-    pub fn original_text_length(&self) -> usize {
-        self.tokens().iter().map(Token::get_original_length).sum()
-    }
-
-    pub fn get_original_text(self) -> String { self.tokens().iter().map(Token::original).collect() }
-
-    pub fn is_left_joinable(&self) -> bool {
-        let first_token = self.tokens().first();
-        first_token.is_none_or(super::super::tokenizer::token::Token::get_is_left_joinable)
-    }
-
-    pub fn is_right_joinable(&self) -> bool {
-        let last_token = self.tokens().last();
-        last_token.is_none_or(super::super::tokenizer::token::Token::get_is_right_joinable)
-    }
-
-    /// Extends the operation with another operation. Only operations of the
-    /// same type as self can be used to extend self, otherwise the function
-    /// will panic.
-    pub fn extend(self, other: RawOperation<T>) -> RawOperation<T> {
-        debug_assert!(
-            std::mem::discriminant(&self) == std::mem::discriminant(&other),
-            "Cannot extend operations of different types. This should have been handled before \
-             calling this function."
-        );
-
-        match (self, other) {
-            (RawOperation::Insert(tokens1), RawOperation::Insert(tokens2)) => {
-                RawOperation::Insert(tokens1.into_iter().chain(tokens2).collect())
-            }
-            (RawOperation::Delete(tokens1), RawOperation::Delete(tokens2)) => {
-                RawOperation::Delete(tokens1.into_iter().chain(tokens2).collect())
-            }
-            (RawOperation::Equal(tokens1), RawOperation::Equal(tokens2)) => {
-                RawOperation::Equal(tokens1.into_iter().chain(tokens2).collect())
-            }
-            _ => unreachable!("Only operations of the same type can be extended"),
-        }
-    }
-}
diff --git a/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__complex_diff.snap b/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__complex_diff.snap
deleted file mode 100644
index 57ee0865..00000000
--- a/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__complex_diff.snap
+++ /dev/null
@@ -1,67 +0,0 @@
----
-source: reconcile/src/diffs/myers.rs
-expression: result
-snapshot_kind: text
----
-[
-    Equal(
-        [
-            Token {
-                normalised: "a",
-                original: "a",
-                is_left_joinable: true,
-                is_right_joinable: true,
-            },
-        ],
-    ),
-    Insert(
-        [
-            Token {
-                normalised: "x",
-                original: "x",
-                is_left_joinable: true,
-                is_right_joinable: true,
-            },
-        ],
-    ),
-    Delete(
-        [
-            Token {
-                normalised: "b",
-                original: "b",
-                is_left_joinable: true,
-                is_right_joinable: true,
-            },
-        ],
-    ),
-    Equal(
-        [
-            Token {
-                normalised: "c",
-                original: "c",
-                is_left_joinable: true,
-                is_right_joinable: true,
-            },
-        ],
-    ),
-    Insert(
-        [
-            Token {
-                normalised: "y",
-                original: "y",
-                is_left_joinable: true,
-                is_right_joinable: true,
-            },
-        ],
-    ),
-    Delete(
-        [
-            Token {
-                normalised: "d",
-                original: "d",
-                is_left_joinable: true,
-                is_right_joinable: true,
-            },
-        ],
-    ),
-]
diff --git a/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__delete_only.snap b/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__delete_only.snap
deleted file mode 100644
index 93bb5298..00000000
--- a/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__delete_only.snap
+++ /dev/null
@@ -1,27 +0,0 @@
----
-source: reconcile/src/diffs/myers.rs
-expression: result
-snapshot_kind: text
----
-[
-    Delete(
-        [
-            Token {
-                normalised: "a",
-                original: "a",
-                is_left_joinable: true,
-                is_right_joinable: true,
-            },
-        ],
-    ),
-    Delete(
-        [
-            Token {
-                normalised: "b",
-                original: "b",
-                is_left_joinable: true,
-                is_right_joinable: true,
-            },
-        ],
-    ),
-]
diff --git a/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__identical_content.snap b/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__identical_content.snap
deleted file mode 100644
index f82d4ac5..00000000
--- a/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__identical_content.snap
+++ /dev/null
@@ -1,37 +0,0 @@
----
-source: reconcile/src/diffs/myers.rs
-expression: result
-snapshot_kind: text
----
-[
-    Equal(
-        [
-            Token {
-                normalised: "a",
-                original: "a",
-                is_left_joinable: true,
-                is_right_joinable: true,
-            },
-        ],
-    ),
-    Equal(
-        [
-            Token {
-                normalised: "b",
-                original: "b",
-                is_left_joinable: true,
-                is_right_joinable: true,
-            },
-        ],
-    ),
-    Equal(
-        [
-            Token {
-                normalised: "c",
-                original: "c",
-                is_left_joinable: true,
-                is_right_joinable: true,
-            },
-        ],
-    ),
-]
diff --git a/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__insert_only.snap b/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__insert_only.snap
deleted file mode 100644
index 0f61f3c5..00000000
--- a/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__insert_only.snap
+++ /dev/null
@@ -1,27 +0,0 @@
----
-source: reconcile/src/diffs/myers.rs
-expression: result
-snapshot_kind: text
----
-[
-    Insert(
-        [
-            Token {
-                normalised: "a",
-                original: "a",
-                is_left_joinable: true,
-                is_right_joinable: true,
-            },
-        ],
-    ),
-    Insert(
-        [
-            Token {
-                normalised: "b",
-                original: "b",
-                is_left_joinable: true,
-                is_right_joinable: true,
-            },
-        ],
-    ),
-]
diff --git a/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__prefix_and_suffix.snap b/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__prefix_and_suffix.snap
deleted file mode 100644
index e50984ff..00000000
--- a/backend/reconcile/src/diffs/snapshots/reconcile__diffs__myers__tests__prefix_and_suffix.snap
+++ /dev/null
@@ -1,57 +0,0 @@
----
-source: reconcile/src/diffs/myers.rs
-expression: result
-snapshot_kind: text
----
-[
-    Equal(
-        [
-            Token {
-                normalised: "a",
-                original: "a",
-                is_left_joinable: true,
-                is_right_joinable: true,
-            },
-        ],
-    ),
-    Delete(
-        [
-            Token {
-                normalised: "b",
-                original: "b",
-                is_left_joinable: true,
-                is_right_joinable: true,
-            },
-        ],
-    ),
-    Delete(
-        [
-            Token {
-                normalised: "c",
-                original: "c",
-                is_left_joinable: true,
-                is_right_joinable: true,
-            },
-        ],
-    ),
-    Insert(
-        [
-            Token {
-                normalised: "x",
-                original: "x",
-                is_left_joinable: true,
-                is_right_joinable: true,
-            },
-        ],
-    ),
-    Equal(
-        [
-            Token {
-                normalised: "d",
-                original: "d",
-                is_left_joinable: true,
-                is_right_joinable: true,
-            },
-        ],
-    ),
-]
diff --git a/backend/reconcile/src/lib.rs b/backend/reconcile/src/lib.rs
deleted file mode 100644
index a04ae853..00000000
--- a/backend/reconcile/src/lib.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-mod diffs;
-mod operation_transformation;
-mod tokenizer;
-mod utils;
-
-pub use operation_transformation::{
-    CursorPosition, EditedText, TextWithCursors, reconcile, reconcile_with_cursors,
-    reconcile_with_tokenizer,
-};
-pub use tokenizer::{Tokenizer, token::Token};
diff --git a/backend/reconcile/src/operation_transformation.rs b/backend/reconcile/src/operation_transformation.rs
deleted file mode 100644
index 08a55a94..00000000
--- a/backend/reconcile/src/operation_transformation.rs
+++ /dev/null
@@ -1,166 +0,0 @@
-mod cursor;
-mod edited_text;
-mod merge_context;
-mod operation;
-mod ordered_operation;
-
-pub use cursor::{CursorPosition, TextWithCursors};
-pub use edited_text::EditedText;
-pub use operation::Operation;
-
-use crate::Tokenizer;
-
-#[must_use]
-pub fn reconcile(original: &str, left: &str, right: &str) -> String {
-    reconcile_with_cursors(original, left.into(), right.into())
-        .text
-        .to_string()
-}
-
-#[must_use]
-pub fn reconcile_with_cursors<'a>(
-    original: &'a str,
-    left: TextWithCursors<'a>,
-    right: TextWithCursors<'a>,
-) -> TextWithCursors<'static> {
-    let left_operations = EditedText::from_strings(original, left);
-    let right_operations = EditedText::from_strings(original, right);
-
-    let merged_operations = left_operations.merge(right_operations);
-
-    TextWithCursors::new_owned(merged_operations.apply(), merged_operations.cursors)
-}
-
-#[must_use]
-pub fn reconcile_with_tokenizer<'a, F, T>(
-    original: &str,
-    left: TextWithCursors<'a>,
-    right: TextWithCursors<'a>,
-    tokenizer: &Tokenizer<T>,
-) -> TextWithCursors<'static>
-where
-    T: PartialEq + Clone + std::fmt::Debug,
-{
-    let left_operations = EditedText::from_strings_with_tokenizer(original, left, tokenizer);
-    let right_operations = EditedText::from_strings_with_tokenizer(original, right, tokenizer);
-
-    let merged_operations = left_operations.merge(right_operations);
-
-    TextWithCursors::new_owned(merged_operations.apply(), merged_operations.cursors)
-}
-
-#[cfg(test)]
-mod test {
-    use std::{fs, ops::Range, path::Path};
-
-    use pretty_assertions::assert_eq;
-    use test_case::test_matrix;
-
-    use super::*;
-    use crate::CursorPosition;
-
-    #[test]
-    fn test_cursor_complex() {
-        let original = "this is some complex text to test cursor positions";
-        let left = TextWithCursors::new(
-            "this is really complex text for testing cursor positions",
-            vec![
-                CursorPosition {
-                    id: 0,
-                    char_index: 8,
-                }, // after "this is "
-                CursorPosition {
-                    id: 1,
-                    char_index: 22,
-                }, // after "this is really complex text"
-            ],
-        );
-        let right = TextWithCursors::new(
-            "that was some complex sample to test cursor movements",
-            vec![
-                CursorPosition {
-                    id: 2,
-                    char_index: 5,
-                }, // after "that "
-                CursorPosition {
-                    id: 3,
-                    char_index: 29,
-                }, // after "some complex sample "
-            ],
-        );
-
-        let merged = reconcile_with_cursors(original, left, right);
-
-        assert_eq!(
-            merged,
-            TextWithCursors::new(
-                "that was really complex sample for testing cursor movements",
-                vec![
-                    CursorPosition {
-                        id: 2,
-                        char_index: 5
-                    }, // unchanged
-                    CursorPosition {
-                        id: 0,
-                        char_index: 9
-                    }, // before "really"
-                    CursorPosition {
-                        id: 1,
-                        char_index: 23
-                    }, // inside of "s|ample" because "text" got replaced by "sample"
-                    CursorPosition {
-                        id: 3,
-                        char_index: 43
-                    }, // before "cursor movements"
-                ]
-            )
-        );
-    }
-
-    #[ignore = "expensive to run, only run in CI"]
-    #[test_matrix( [
-        "pride_and_prejudice.txt",
-        "room_with_a_view.txt",
-        "kun_lu.txt",
-        "blns.txt"
-    ],  [
-        "pride_and_prejudice.txt",
-        "room_with_a_view.txt",
-        "kun_lu.txt",
-        "blns.txt"
-    ],  [
-        "pride_and_prejudice.txt",
-        "room_with_a_view.txt",
-        "kun_lu.txt",
-        "blns.txt"
-    ], [0..10000, 10000..20000], [0..10000, 10000..20000], [0..10000, 10000..20000])]
-    fn test_merge_files_without_panic(
-        file_name_1: &str,
-        file_name_2: &str,
-        file_name_3: &str,
-        range_1: Range<usize>,
-        range_2: Range<usize>,
-        range_3: Range<usize>,
-    ) {
-        let files = [file_name_1, file_name_2, file_name_3];
-        let permutations = [range_1, range_2, range_3];
-
-        let root = Path::new("tests/resources/");
-
-        let contents = files
-            .iter()
-            .zip(permutations.iter())
-            .map(|(file, range)| {
-                let path = root.join(file);
-                fs::read_to_string(&path)
-                    .unwrap()
-                    .chars()
-                    .skip(range.start)
-                    .take(range.end)
-                    .collect::<String>()
-            })
-            .collect::<Vec<_>>();
-
-        let _ = reconcile(&contents[0], &contents[1], &contents[2]);
-    }
-}
diff --git a/backend/reconcile/src/operation_transformation/cursor.rs b/backend/reconcile/src/operation_transformation/cursor.rs
deleted file mode 100644
index f1452734..00000000
--- a/backend/reconcile/src/operation_transformation/cursor.rs
+++ /dev/null
@@ -1,57 +0,0 @@
-use std::borrow::Cow;
-
-#[cfg(feature = "serde")]
-use serde::{Deserialize, Serialize};
-
-// CursorPosition represents the position of an identifiable cursor in a text
-// document based on its (UTF-8) character index.
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[derive(Debug, Clone, PartialEq, Default)]
-pub struct CursorPosition {
-    pub id: usize,
-    pub char_index: usize,
-}
-
-impl CursorPosition {
-    #[must_use]
-    pub fn with_index(&self, index: usize) -> Self {
-        CursorPosition {
-            id: self.id,
-            char_index: index,
-        }
-    }
-}
-
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[derive(Debug, Clone, PartialEq, Default)]
-pub struct TextWithCursors<'a> {
-    pub text: Cow<'a, str>,
-    pub cursors: Vec<CursorPosition>,
-}
-
-impl<'a> TextWithCursors<'a> {
-    #[must_use]
-    pub fn new(text: &'a str, cursors: Vec<CursorPosition>) -> Self {
-        Self {
-            text: text.into(),
-            cursors,
-        }
-    }
-
-    #[must_use]
-    pub fn new_owned(text: String, cursors: Vec<CursorPosition>) -> Self {
-        Self {
-            text: text.into(),
-            cursors,
-        }
-    }
-}
-
-impl<'a> From<&'a str> for TextWithCursors<'a> {
-    fn from(text: &'a str) -> Self {
-        Self {
-            text: text.into(),
-            cursors: Vec::new(),
-        }
-    }
-}
diff --git a/backend/reconcile/src/operation_transformation/edited_text.rs b/backend/reconcile/src/operation_transformation/edited_text.rs
deleted file mode 100644
index b83441f6..00000000
--- a/backend/reconcile/src/operation_transformation/edited_text.rs
+++ /dev/null
@@ -1,381 +0,0 @@
-use core::iter;
-
-#[cfg(feature = "serde")]
-use serde::{Deserialize, Serialize};
-
-use super::{CursorPosition, Operation, TextWithCursors, ordered_operation::OrderedOperation};
-use crate::{
-    diffs::{myers::diff, raw_operation::RawOperation},
-    operation_transformation::merge_context::MergeContext,
-    tokenizer::{Tokenizer, word_tokenizer::word_tokenizer},
-    utils::{merge_iters::MergeSorted as _, side::Side, string_builder::StringBuilder},
-};
-
-/// A sequence of operations that can be applied to a text document.
-/// `EditedText` supports merging two sequences of operations using the
-/// principle of Operational Transformation.
-///
-/// It's mainly created through the `from_strings` method, then merged with
-/// another `EditedText` derived from the same original text and then applied to
-/// the original text to get the reconciled text of concurrent edits.
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[derive(Debug, Clone, PartialEq, Default)]
-pub struct EditedText<'a, T>
-where
-    T: PartialEq + Clone + std::fmt::Debug,
-{
-    text: &'a str,
-    operations: Vec<OrderedOperation<T>>,
-    pub(crate) cursors: Vec<CursorPosition>,
-}
-
-impl<'a> EditedText<'a, String> {
-    /// Create an `EditedText` from the given original (old) and updated (new)
-    /// strings. The returned `EditedText` represents the changes from the
-    /// original to the updated text. When the return value is applied to
-    /// the original text, it will result in the updated text. The default
-    /// word tokenizer is used to tokenize the text which splits the text on
-    /// whitespaces.
-    #[must_use]
-    pub fn from_strings(original: &'a str, updated: TextWithCursors<'a>) -> Self {
-        Self::from_strings_with_tokenizer(original, updated, &word_tokenizer)
-    }
-}
-
-impl<'a, T> EditedText<'a, T>
-where
-    T: PartialEq + Clone + std::fmt::Debug,
-{
-    /// Create an `EditedText` from the given original (old) and updated (new)
-    /// strings. The returned `EditedText` represents the changes from the
-    /// original to the updated text. When the return value is applied to
-    /// the original text, it will result in the updated text. The tokenizer
-    /// function is used to tokenize the text.
-    pub fn from_strings_with_tokenizer(
-        original: &'a str,
-        updated: TextWithCursors<'a>,
-        tokenizer: &Tokenizer<T>,
-    ) -> Self {
-        let original_tokens = (tokenizer)(original);
-        let updated_tokens = (tokenizer)(&updated.text);
-
-        let diff: Vec<RawOperation<T>> = diff(&original_tokens, &updated_tokens);
-
-        Self::new(
-            original,
-            Self::cook_operations(Self::elongate_operations(diff)).collect(),
-            updated.cursors,
-        )
-    }
-
-    fn elongate_operations<I>(raw_operations: I) -> Vec<RawOperation<T>>
-    where
-        I: IntoIterator<Item = RawOperation<T>>,
-    {
-        // This might look bad, but this makes sense. The inserts and deltes can be
-        // interleaved, such as: IDIDID and we need to turn this into IIIDDD.
-        // So we need to keep track of both the last insert and delete operations, not
-        // just the last one.
-        let mut maybe_previous_insert: Option<RawOperation<T>> = None;
-        let mut maybe_previous_delete: Option<RawOperation<T>> = None;
-
-        let mut result: Vec<RawOperation<T>> = raw_operations
-            .into_iter()
-            .flat_map(|next| match next {
-                RawOperation::Insert(..) => match maybe_previous_insert.take() {
-                    Some(prev) if prev.is_right_joinable() && next.is_left_joinable() => {
-                        maybe_previous_insert = Some(prev.extend(next));
-                        Box::new(iter::empty()) as Box<dyn Iterator<Item = RawOperation<T>>>
-                    }
-                    prev => {
-                        maybe_previous_insert = Some(next);
-                        Box::new(prev.into_iter())
-                    }
-                },
-                RawOperation::Delete(..) => match maybe_previous_delete.take() {
-                    Some(prev) if prev.is_right_joinable() && next.is_left_joinable() => {
-                        maybe_previous_delete = Some(prev.extend(next));
-                        Box::new(iter::empty()) as Box<dyn Iterator<Item = RawOperation<T>>>
-                    }
-                    prev => {
-                        maybe_previous_delete = Some(next);
-                        Box::new(prev.into_iter())
-                    }
-                },
-                RawOperation::Equal(..) => Box::new(
-                    maybe_previous_insert
-                        .take()
-                        .into_iter()
-                        .chain(maybe_previous_delete.take())
-                        .chain(iter::once(next)),
-                )
-                    as Box<dyn Iterator<Item = RawOperation<T>>>,
-            })
-            .collect();
-
-        if let Some(prev) = maybe_previous_insert {
-            result.push(prev);
-        }
-
-        if let Some(prev) = maybe_previous_delete {
-            result.push(prev);
-        }
-
-        result
-    }
-
-    // Turn raw operations into ordered operations while keeping track of old & new
-    // indexes.
-    fn cook_operations<I>(raw_operations: I) -> impl Iterator<Item = OrderedOperation<T>>
-    where
-        I: IntoIterator<Item = RawOperation<T>>,
-    {
-        let mut new_index = 0; // this is the start index of the operation on the new text
-        let mut order = 0; // this is the start index of the operation on the original text
-
-        raw_operations.into_iter().filter_map(move |raw_operation| {
-            let length = raw_operation.original_text_length();
-
-            match raw_operation {
-                RawOperation::Equal(..) => {
-                    let op = if cfg!(debug_assertions) {
-                        Operation::create_equal_with_text(
-                            new_index,
-                            raw_operation.get_original_text(),
-                        )
-                    } else {
-                        Operation::create_equal(new_index, length)
-                    }
-                    .map(|operation| OrderedOperation { order, operation });
-
-                    new_index += length;
-                    order += length;
-
-                    op
-                }
-                RawOperation::Insert(tokens) => {
-                    let op = Operation::create_insert(new_index, tokens)
-                        .map(|operation| OrderedOperation { order, operation });
-
-                    new_index += length;
-
-                    op
-                }
-                RawOperation::Delete(..) => {
-                    let op = if cfg!(debug_assertions) {
-                        Operation::create_delete_with_text(
-                            new_index,
-                            raw_operation.get_original_text(),
-                        )
-                    } else {
-                        Operation::create_delete(new_index, length)
-                    }
-                    .map(|operation| OrderedOperation { order, operation });
-
-                    order += length;
-
-                    op
-                }
-            }
-        })
-    }
-
-    /// Create a new `EditedText` with the given operations.
-    /// The operations must be in the order in which they are meant to be
-    /// applied. The operations must not overlap.
-    fn new(
-        text: &'a str,
-        operations: Vec<OrderedOperation<T>>,
-        mut cursors: Vec<CursorPosition>,
-    ) -> Self {
-        operations
-            .iter()
-            .zip(operations.iter().skip(1))
-            .for_each(|(previous, next)| {
-                debug_assert!(
-                    previous.operation.start_index() <= next.operation.start_index(),
-                    "{} must not come before {} yet it does",
-                    previous.operation,
-                    next.operation
-                );
-            });
-
-        cursors.sort_by_key(|cursor| cursor.char_index);
-
-        Self {
-            text,
-            operations,
-            cursors,
-        }
-    }
-
-    #[must_use]
-    pub fn merge(self, other: Self) -> Self {
-        debug_assert_eq!(
-            self.text, other.text,
-            "`EditedText`-s must be derived from the same text to be mergable"
-        );
-
-        let mut left_merge_context = MergeContext::default();
-        let mut right_merge_context = MergeContext::default();
-
-        let mut merged_cursors = Vec::with_capacity(self.cursors.len() + other.cursors.len());
-        let mut left_cursors = self.cursors.into_iter().peekable();
-        let mut right_cursors = other.cursors.into_iter().peekable();
-
-        let merged_operations: Vec<OrderedOperation<T>> = self
-            .operations
-            .into_iter()
-            // The current text is always the left; the other operation is the right side.
-            .map(|op| (op, Side::Left))
-            .merge_sorted_by_key(
-                other.operations.into_iter().map(|op| (op, Side::Right)),
-                |(operation, _)| {
-                    (
-                        operation.order,
-                        operation.operation.start_index(),
-                        // Make sure that the ordering is deterministic regardless which text
-                        // is left or right.
-                        match &operation.operation {
-                            Operation::Equal { index, .. } => index.to_string(),
-                            Operation::Insert { text, .. } => text
-                                .iter()
-                                .map(crate::tokenizer::token::Token::original)
-                                .collect::<String>(),
-                            Operation::Delete {
-                                deleted_character_count,
-                                ..
-                            } => deleted_character_count.to_string(),
-                        },
-                    )
-                },
-            )
-            .flat_map(|(OrderedOperation { order, operation }, side)| {
-                let original_start = operation.start_index() as i64;
-                let original_end = operation.end_index();
-                let original_length = operation.len() as i64;
-
-                let result = match side {
-                    Side::Left => operation.merge_operations_with_context(
-                        &mut right_merge_context,
-                        &mut left_merge_context,
-                    ),
-                    Side::Right => operation.merge_operations_with_context(
-                        &mut left_merge_context,
-                        &mut right_merge_context,
-                    ),
-                };
-
-                if let Some(ref op @ (Operation::Insert { .. } | Operation::Equal { .. })) = result
-                {
-                    let shift = op.start_index() as i64 - original_start + op.len() as i64
-                        - original_length;
-                    match side {
-                        Side::Left => {
-                            while let Some(cursor) =
-                                left_cursors.next_if(|cursor| cursor.char_index <= original_end + 1)
-                            {
-                                merged_cursors.push(cursor.with_index(
-                                    (op.start_index() as i64).max(cursor.char_index as i64 + shift)
-                                        as usize,
-                                ));
-                            }
-                        }
-                        Side::Right => {
-                            while let Some(cursor) = right_cursors
-                                .next_if(|cursor| cursor.char_index <= original_end + 1)
-                            {
-                                merged_cursors.push(cursor.with_index(
-                                    (op.start_index() as i64).max(cursor.char_index as i64 + shift)
-                                        as usize,
-                                ));
-                            }
-                        }
-                    }
-                }
-
-                result
-                    .map(|operation| OrderedOperation { order, operation })
-                    .into_iter()
-            })
-            .collect();
-
-        let last_index = merged_operations
-            .iter()
-            .filter(|operation| {
-                matches!(
-                    operation.operation,
-                    Operation::Insert { .. } | Operation::Equal { .. }
-                )
-            })
-            .next_back()
-            .map_or(0, |op| op.operation.end_index());
-
-        for cursor in left_cursors.chain(right_cursors) {
-            merged_cursors.push(cursor.with_index(last_index));
-        }
-
-        Self::new(self.text, merged_operations, merged_cursors)
-    }
-
-    /// Apply the operations to the text and return the resulting text.
-    #[must_use]
-    pub fn apply(&self) -> String {
-        let mut builder: StringBuilder<'_> = StringBuilder::new(self.text);
-
-        for OrderedOperation { operation, .. } in &self.operations {
-            builder = operation.apply(builder);
-        }
-
-        builder.build()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::env;
-
-    use insta::assert_debug_snapshot;
-    use pretty_assertions::assert_eq;
-
-    use super::*;
-
-    #[test]
-    fn test_calculate_operations() {
-        let left = "hello world! How are you?  Adam";
-        let right = "Hello, my friend! How are you doing? Albert";
-
-        let operations = EditedText::from_strings(left, right.into());
-
-        insta::assert_debug_snapshot!(operations);
-
-        let new_right = operations.apply();
-        assert_eq!(new_right.to_string(), right);
-    }
-
-    #[test]
-    fn test_calculate_operations_with_no_diff() {
-        let text = "hello world!";
-
-        let operations = EditedText::from_strings(text, text.into());
-
-        assert_debug_snapshot!(operations);
-
-        let new_right = operations.apply();
-        assert_eq!(new_right.to_string(), text);
-    }
-
-    #[test]
-    fn test_calculate_operations_with_insert() {
-        let original = "hello world! ...";
-        let left = "Hello world! I'm Andras.";
-        let right = "Hello world! How are you?";
-        let expected = "Hello world! How are you? I'm Andras.";
-
-        let operations_1 = EditedText::from_strings(original, left.into());
-        let operations_2 = EditedText::from_strings(original, right.into());
-
-        let operations = operations_1.merge(operations_2);
-        assert_eq!(operations.apply(), expected);
-    }
-}
diff --git a/backend/reconcile/src/operation_transformation/merge_context.rs b/backend/reconcile/src/operation_transformation/merge_context.rs
deleted file mode 100644
index 5cf0972d..00000000
--- a/backend/reconcile/src/operation_transformation/merge_context.rs
+++ /dev/null
@@ -1,73 +0,0 @@
-use core::fmt::Debug;
-
-use crate::operation_transformation::Operation;
-
-#[derive(Clone, Debug)]
-pub struct MergeContext<T>
-where
-    T: PartialEq + Clone + std::fmt::Debug,
-{
-    last_operation: Option<Operation<T>>,
-    pub shift: i64,
-}
-
-impl<T> Default for MergeContext<T>
-where
-    T: PartialEq + Clone + std::fmt::Debug,
-{
-    fn default() -> Self {
-        MergeContext {
-            last_operation: None,
-            shift: 0,
-        }
-    }
-}
-
-impl<T> MergeContext<T>
-where
-    T: PartialEq + Clone + std::fmt::Debug,
-{
-    pub fn last_operation(&self) -> Option<&Operation<T>> { self.last_operation.as_ref() }
-
-    pub fn replace_last_operation(&mut self, operation: Option<Operation<T>>) {
-        self.last_operation = operation;
-    }
-
-    /// Replace the last delete operation (if there was one) with a new one
-    /// while applying it to the `shift` in case the last operation
-    /// was a delete.
-    pub fn consume_and_replace_last_operation(&mut self, operation: Option<Operation<T>>) {
-        if let Some(Operation::Delete {
-            deleted_character_count,
-            ..
-        }) = self.last_operation.take()
-        {
-            self.shift -= deleted_character_count as i64;
-        }
-
-        self.last_operation = operation;
-    }
-
-    /// Remove the last operation (if there was one) in case it is behind the
-    /// threshold operation. This updates the `shift` in case the last operation
-    /// was a delete.
-    pub fn consume_last_operation_if_it_is_too_behind(&mut self, threshold_index: i64) {
-        if let Some(last_operation) = self.last_operation.as_ref() {
-            if let Operation::Delete {
-                deleted_character_count,
-                ..
-            } = last_operation
-            {
-                if threshold_index + self.shift > last_operation.end_index() as i64 {
-                    self.shift -= *deleted_character_count as i64;
-                    self.last_operation = None;
-                }
-            } else if let Operation::Insert { .. } = last_operation
-                && threshold_index + self.shift - last_operation.len() as i64
-                    > last_operation.end_index() as i64
-            {
-                self.last_operation = None;
-            }
-        }
-    }
-}
diff --git a/backend/reconcile/src/operation_transformation/operation.rs b/backend/reconcile/src/operation_transformation/operation.rs
deleted file mode 100644
index e194f9c3..00000000
--- a/backend/reconcile/src/operation_transformation/operation.rs
+++ /dev/null
@@ -1,513 +0,0 @@
-use core::fmt::{Debug, Display};
-use std::ops::Range;
-
-#[cfg(feature = "serde")]
-use serde::{Deserialize, Serialize};
-
-use super::merge_context::MergeContext;
-use crate::{
-    Token,
-    utils::{
-        find_longest_prefix_contained_within::find_longest_prefix_contained_within,
-        string_builder::StringBuilder,
-    },
-};
-
-/// Represents a change that can be applied on a `StringBuilder`.
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[derive(Clone, PartialEq)]
-pub enum Operation<T>
-where
-    T: PartialEq + Clone + std::fmt::Debug,
-{
-    Equal {
-        index: usize,
-        length: usize,
-
-        #[cfg(debug_assertions)]
-        text: Option<String>,
-    },
-
-    Insert {
-        index: usize,
-        text: Vec<Token<T>>,
-    },
-
-    Delete {
-        index: usize,
-        deleted_character_count: usize,
-
-        #[cfg(debug_assertions)]
-        deleted_text: Option<String>,
-    },
-}
-
-impl<T> Operation<T>
-where
-    T: PartialEq + Clone + std::fmt::Debug,
-{
-    /// Creates an equal operation with the given index.
-    /// This operation is used to indicate that the text at the given index
-    /// is unchanged.
-    pub fn create_equal(index: usize, length: usize) -> Option<Self> {
-        if length == 0 {
-            return None;
-        }
-
-        Some(Operation::Equal {
-            index,
-            length,
-
-            #[cfg(debug_assertions)]
-            text: None,
-        })
-    }
-
-    pub fn create_equal_with_text(index: usize, text: String) -> Option<Self> {
-        if text.is_empty() {
-            return None;
-        }
-
-        Some(Operation::Equal {
-            index,
-            length: text.chars().count(),
-
-            #[cfg(debug_assertions)]
-            text: Some(text),
-        })
-    }
-
-    /// Creates an insert operation with the given index and text.
-    /// If the text is empty (meaning that the operation would be a no-op),
-    /// returns None.
-    pub fn create_insert(index: usize, text: Vec<Token<T>>) -> Option<Self> {
-        if text.is_empty() {
-            return None;
-        }
-
-        Some(Operation::Insert { index, text })
-    }
-
-    /// Creates a delete operation with the given index and number of
-    /// to-be-deleted characters. If the operation would delete 0 (meaning
-    /// that the operation would be a no-op), returns None.
-    pub fn create_delete(index: usize, deleted_character_count: usize) -> Option<Self> {
-        if deleted_character_count == 0 {
-            return None;
-        }
-
-        Some(Operation::Delete {
-            index,
-            deleted_character_count,
-
-            #[cfg(debug_assertions)]
-            deleted_text: None,
-        })
-    }
-
-    pub fn create_delete_with_text(index: usize, text: String) -> Option<Self> {
-        if text.is_empty() {
-            return None;
-        }
-
-        Some(Operation::Delete {
-            index,
-            deleted_character_count: text.chars().count(),
-
-            #[cfg(debug_assertions)]
-            deleted_text: Some(text),
-        })
-    }
-
-    /// Applies the operation to the given `StringBuilder`, returning the
-    /// modified `StringBuilder`.
-    ///
-    /// When compiled in debug mode, panics if a delete operation is attempted
-    /// on a range of text that does not match the text to be deleted.
-    pub fn apply<'a>(&self, mut builder: StringBuilder<'a>) -> StringBuilder<'a> {
-        match self {
-            Operation::Equal {
-                #[cfg(debug_assertions)]
-                text,
-                ..
-            } => {
-                #[cfg(debug_assertions)]
-                debug_assert!(
-                    text.as_ref()
-                        .is_none_or(|text| builder.get_slice(self.range()) == *text),
-                    "Text which is supposed to be equal does not match the text in the range"
-                );
-
-                return builder;
-            }
-            Operation::Insert { text, .. } => builder.insert(
-                self.start_index(),
-                &text.iter().map(Token::original).collect::<String>(),
-            ),
-            Operation::Delete {
-                #[cfg(debug_assertions)]
-                deleted_text,
-                ..
-            } => {
-                #[cfg(debug_assertions)]
-                debug_assert!(
-                    deleted_text
-                        .as_ref()
-                        .is_none_or(|text| builder.get_slice(self.range()) == *text),
-                    "Text to delete does not match the text in the range"
-                );
-
-                builder.delete(self.range());
-            }
-        }
-
-        builder
-    }
-
-    /// Returns the index of the first character that the operation affects.
-    pub fn start_index(&self) -> usize {
-        match self {
-            Operation::Equal { index, .. }
-            | Operation::Insert { index, .. }
-            | Operation::Delete { index, .. } => *index,
-        }
-    }
-
-    /// Returns the index of the last character that the operation affects.
-    pub fn end_index(&self) -> usize {
-        debug_assert!(
-            self.len() > 0,
-            " len() must be greater than 0 because operations must be non-empty"
-        );
-        self.start_index() + self.len() - 1
-    }
-
-    /// Returns the range of indices of characters that the operation affects.
-    #[allow(clippy::range_plus_one)]
-    pub fn range(&self) -> Range<usize> { self.start_index()..self.end_index() + 1 }
-
-    /// Returns the number of affected characters. It is always greater than 0
-    /// because empty operations cannot be created.
-    pub fn len(&self) -> usize {
-        match self {
-            Operation::Equal { length, .. } => *length,
-            Operation::Insert { text, .. } => text.iter().map(Token::get_original_length).sum(),
-            Operation::Delete {
-                deleted_character_count,
-                ..
-            } => *deleted_character_count,
-        }
-    }
-
-    /// Creates a new operation with the same type and text but with the given
-    /// index.
-    pub fn with_index(self, index: usize) -> Self {
-        match self {
-            Operation::Equal {
-                length,
-
-                #[cfg(debug_assertions)]
-                text,
-                ..
-            } => Operation::Equal {
-                index,
-                length,
-
-                #[cfg(debug_assertions)]
-                text,
-            },
-            Operation::Insert { text, .. } => Operation::Insert { index, text },
-            Operation::Delete {
-                deleted_character_count,
-
-                #[cfg(debug_assertions)]
-                deleted_text,
-                ..
-            } => Operation::Delete {
-                index,
-                deleted_character_count,
-
-                #[cfg(debug_assertions)]
-                deleted_text,
-            },
-        }
-    }
-
-    /// Creates a new operation with the same type and text but with the index
-    /// shifted by the given offset. The offset can be negative but the
-    /// resulting index must be non-negative.
-    ///
-    /// # Panics
-    ///
-    /// In debug mode, panics if the resulting index is negative.
-    pub fn with_shifted_index(self, offset: i64) -> Self {
-        let index = self.start_index() as i64 + offset;
-        debug_assert!(index >= 0, "Shifted index must be non-negative");
-
-        self.with_index(index as usize)
-    }
-
-    /// Merges the operation with the given context, producing a new operation
-    /// and updating the context. This implements a comples FSM that handles
-    /// the merging of operations in a way that is consistent with the text.
-    /// The contexts are updated in-place.
-    #[allow(clippy::too_many_lines)]
-    pub fn merge_operations_with_context(
-        self,
-        affecting_context: &mut MergeContext<T>,
-        produced_context: &mut MergeContext<T>,
-    ) -> Option<Operation<T>> {
-        affecting_context.consume_last_operation_if_it_is_too_behind(self.start_index() as i64);
-        let operation = self.with_shifted_index(affecting_context.shift);
-
-        match (operation, affecting_context.last_operation()) {
-            (operation @ Operation::Insert { .. }, None | Some(Operation::Equal { .. })) => {
-                produced_context.shift += operation.len() as i64;
-                produced_context.consume_and_replace_last_operation(Some(operation.clone()));
-                Some(operation)
-            }
-
-            (
-                Operation::Insert { text, index },
-                Some(Operation::Insert {
-                    text: previous_inserted_text,
-                    ..
-                }),
-            ) => {
-                // In case the current insert's prefix appears in the previously inserted text,
-                // we can trim the current insert to only include the non-overlapping part.
-                // This way, we don't end up duplicating text.
-                let offset_in_tokens =
-                    find_longest_prefix_contained_within(previous_inserted_text, &text);
-                let offset_in_length = text
-                    .iter()
-                    .take(offset_in_tokens)
-                    .map(Token::get_original_length)
-                    .sum::<usize>();
-                let trimmed_operation =
-                    Operation::create_insert(index, text[offset_in_tokens..].to_vec());
-
-                affecting_context.shift -= offset_in_length as i64;
-                produced_context.shift += trimmed_operation
-                    .as_ref()
-                    .map(Operation::len)
-                    .unwrap_or_default() as i64;
-                produced_context.consume_and_replace_last_operation(trimmed_operation.clone());
-
-                trimmed_operation
-            }
-
-            (
-                operation @ Operation::Delete { .. },
-                None | Some(Operation::Insert { .. } | Operation::Equal { .. }),
-            ) => {
-                produced_context.consume_and_replace_last_operation(Some(operation.clone()));
-                Some(operation)
-            }
-
-            (
-                operation @ Operation::Insert { .. },
-                Some(last_delete @ Operation::Delete { .. }),
-            ) => {
-                produced_context.shift += operation.len() as i64;
-
-                debug_assert!(
-                    last_delete.range().contains(&operation.start_index()),
-                    "There is a last delete ({last_delete}) but the operation ({operation}) is \
-                     not contained in it"
-                );
-
-                let difference = operation.start_index() as i64 - last_delete.start_index() as i64;
-
-                let moved_operation = operation.with_index(last_delete.start_index());
-
-                affecting_context.replace_last_operation(Operation::create_delete(
-                    moved_operation.end_index() + 1,
-                    (last_delete.len() as i64 - difference) as usize,
-                ));
-                affecting_context.shift -= difference;
-
-                produced_context.consume_and_replace_last_operation(Some(moved_operation.clone()));
-
-                Some(moved_operation)
-            }
-
-            (
-                operation @ Operation::Delete { .. },
-                Some(last_delete @ Operation::Delete { .. }),
-            ) => {
-                debug_assert!(
-                    last_delete.range().contains(&operation.start_index()),
-                    "There is a last delete ({last_delete}) but the operation ({operation}) is \
-                     not contained in it"
-                );
-
-                let difference = operation.start_index() as i64 - last_delete.start_index() as i64;
-
-                let updated_delete = Operation::create_delete(
-                    last_delete.start_index(),
-                    0.max(operation.end_index() as i64 - last_delete.end_index() as i64) as usize,
-                );
-
-                affecting_context.replace_last_operation(Operation::create_delete(
-                    last_delete.start_index(),
-                    0.max(last_delete.end_index() as i64 - operation.end_index() as i64) as usize,
-                ));
-                affecting_context.shift -= difference;
-
-                produced_context.consume_and_replace_last_operation(updated_delete.clone());
-
-                updated_delete
-            }
-            (
-                ref operation @ Operation::Equal {
-                    length,
-                    #[cfg(debug_assertions)]
-                    ref text,
-                    ..
-                },
-                Some(last_delete @ Operation::Delete { .. }),
-            ) => {
-                debug_assert!(
-                    last_delete.range().contains(&operation.start_index()),
-                    "There is a last delete ({last_delete}) but the operation ({operation}) is \
-                     not contained in it"
-                );
-
-                let overlap = (length as i64)
-                    .min(last_delete.end_index() as i64 - operation.start_index() as i64 + 1);
-
-                #[cfg(debug_assertions)]
-                let result = text.as_ref().map_or_else(
-                    || {
-                        Operation::create_equal(
-                            operation.end_index().min(last_delete.end_index()),
-                            (length as i64 - overlap) as usize,
-                        )
-                    },
-                    |text| {
-                        Operation::create_equal_with_text(
-                            operation.end_index().min(last_delete.end_index()),
-                            text.chars().skip(overlap as usize).collect::<String>(),
-                        )
-                    },
-                );
-
-                #[cfg(not(debug_assertions))]
-                let result = Operation::create_equal(
-                    operation.end_index().min(last_delete.end_index()),
-                    (length as i64 - overlap) as usize,
-                );
-
-                result
-            }
-            (operation @ Operation::Equal { .. }, _) => Some(operation),
-        }
-    }
-}
-
-impl<T> Display for Operation<T>
-where
-    T: PartialEq + Clone + std::fmt::Debug,
-{
-    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
-        match self {
-            Operation::Equal {
-                index,
-                length,
-
-                #[cfg(debug_assertions)]
-                text,
-            } => {
-                #[cfg(debug_assertions)]
-                write!(
-                    f,
-                    "<equal {} from index {}>",
-                    text.as_ref()
-                        .map(|text| format!("'{text}'"))
-                        .unwrap_or(format!("{length} characters")),
-                    index
-                )?;
-
-                #[cfg(not(debug_assertions))]
-                write!(f, "<equal {length} from index {index}>")?;
-
-                Ok(())
-            }
-            Operation::Insert { index, text } => {
-                write!(
-                    f,
-                    "<insert '{}' from index {}>",
-                    text.iter().map(Token::original).collect::<String>(),
-                    index
-                )
-            }
-            Operation::Delete {
-                index,
-                deleted_character_count,
-
-                #[cfg(debug_assertions)]
-                deleted_text,
-            } => {
-                #[cfg(debug_assertions)]
-                write!(
-                    f,
-                    "<delete {} from index {}>",
-                    deleted_text
-                        .as_ref()
-                        .map(|text| format!("'{text}'"))
-                        .unwrap_or(format!("{deleted_character_count} characters")),
-                    index
-                )?;
-
-                #[cfg(not(debug_assertions))]
-                write!(
-                    f,
-                    "<delete {deleted_character_count} characters from index {index}>",
-                )?;
-
-                Ok(())
-            }
-        }
-    }
-}
-
-impl<T> Debug for Operation<T>
-where
-    T: PartialEq + Clone + std::fmt::Debug,
-{
-    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { write!(f, "{self}") }
-}
-
-#[cfg(test)]
-mod tests {
-    use pretty_assertions::assert_eq;
-
-    use super::*;
-
-    #[test]
-    #[should_panic(expected = "Shifted index must be non-negative")]
-    fn test_shifting_error() {
-        insta::assert_debug_snapshot!(
-            Operation::create_insert(1, vec!["hi".into()])
-                .unwrap()
-                .with_shifted_index(-2)
-        );
-    }
-
-    #[test]
-    fn test_apply_delete_with_create() {
-        let builder = StringBuilder::new("hello world");
-        let operation = Operation::<()>::create_delete_with_text(5, " world".to_owned()).unwrap();
-
-        assert_eq!(operation.apply(builder).build(), "hello");
-    }
-
-    #[test]
-    fn test_apply_insert() {
-        let builder = StringBuilder::new("hello");
-        let operation = Operation::create_insert(5, vec![" my friend".into()]).unwrap();
-
-        assert_eq!(operation.apply(builder).build(), "hello my friend");
-    }
-}
diff --git a/backend/reconcile/src/operation_transformation/ordered_operation.rs b/backend/reconcile/src/operation_transformation/ordered_operation.rs
deleted file mode 100644
index 116b6372..00000000
--- a/backend/reconcile/src/operation_transformation/ordered_operation.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-#[cfg(feature = "serde")]
-use serde::{Deserialize, Serialize};
-
-use crate::operation_transformation::Operation;
-
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[derive(Debug, Clone, PartialEq)]
-pub struct OrderedOperation<T>
-where
-    T: PartialEq + Clone + std::fmt::Debug,
-{
-    pub order: usize,
-    pub operation: Operation<T>,
-}
diff --git a/backend/reconcile/src/operation_transformation/snapshots/reconcile__operation_transformation__edited_text__tests__calculate_operations.snap b/backend/reconcile/src/operation_transformation/snapshots/reconcile__operation_transformation__edited_text__tests__calculate_operations.snap
deleted file mode 100644
index 246b2fe0..00000000
--- a/backend/reconcile/src/operation_transformation/snapshots/reconcile__operation_transformation__edited_text__tests__calculate_operations.snap
+++ /dev/null
@@ -1,43 +0,0 @@
----
-source: reconcile/src/operation_transformation/edited_text.rs
-expression: operations
-snapshot_kind: text
----
-EditedText {
-    text: "hello world! How are you?  Adam",
-    operations: [
-        OrderedOperation {
-            order: 0,
-            operation: <insert 'Hello, my friend!' from index 0>,
-        },
-        OrderedOperation {
-            order: 0,
-            operation: <delete 'hello world!' from index 17>,
-        },
-        OrderedOperation {
-            order: 12,
-            operation: <equal ' ' from index 17>,
-        },
-        OrderedOperation {
-            order: 13,
-            operation: <equal 'How' from index 18>,
-        },
-        OrderedOperation {
-            order: 16,
-            operation: <equal ' ' from index 21>,
-        },
-        OrderedOperation {
-            order: 17,
-            operation: <equal 'are' from index 22>,
-        },
-        OrderedOperation {
-            order: 20,
-            operation: <insert ' you doing? Albert' from index 25>,
-        },
-        OrderedOperation {
-            order: 20,
-            operation: <delete ' you?  Adam' from index 43>,
-        },
-    ],
-    cursors: [],
-}
diff --git a/backend/reconcile/src/operation_transformation/snapshots/reconcile__operation_transformation__edited_text__tests__calculate_operations_with_no_diff.snap b/backend/reconcile/src/operation_transformation/snapshots/reconcile__operation_transformation__edited_text__tests__calculate_operations_with_no_diff.snap
deleted file mode 100644
index 33414f8c..00000000
--- a/backend/reconcile/src/operation_transformation/snapshots/reconcile__operation_transformation__edited_text__tests__calculate_operations_with_no_diff.snap
+++ /dev/null
@@ -1,23 +0,0 @@
----
-source: reconcile/src/operation_transformation/edited_text.rs
-expression: operations
-snapshot_kind: text
----
-EditedText {
-    text: "hello world!",
-    operations: [
-        OrderedOperation {
-            order: 0,
-            operation: <equal 'hello' from index 0>,
-        },
-        OrderedOperation {
-            order: 5,
-            operation: <equal ' ' from index 5>,
-        },
-        OrderedOperation {
-            order: 6,
-            operation: <equal 'world!' from index 6>,
-        },
-    ],
-    cursors: [],
-}
diff --git a/backend/reconcile/src/operation_transformation/snapshots/reconcile__operations__edited_text__tests__calculate_operations.snap b/backend/reconcile/src/operation_transformation/snapshots/reconcile__operations__edited_text__tests__calculate_operations.snap
deleted file mode 100644
index 02956ef0..00000000
--- a/backend/reconcile/src/operation_transformation/snapshots/reconcile__operations__edited_text__tests__calculate_operations.snap
+++ /dev/null
@@ -1,61 +0,0 @@
----
-source: reconcile/src/operations/edited_text.rs
-expression: operations
-snapshot_kind: text
----
-EditedText {
-    text: "hello world! How are you?  Adam",
-    operations: [
-        OrderedOperation {
-            order: 0,
-            operation: Insert {
-                index: 0,
-                text: "Hello, my friend! ",
-            },
-        },
-        OrderedOperation {
-            order: 0,
-            operation: Delete {
-                index: 18,
-                deleted_character_count: 13,
-                deleted_text: Some(
-                    "hello world! ",
-                ),
-            },
-        },
-        OrderedOperation {
-            order: 21,
-            operation: Delete {
-                index: 26,
-                deleted_character_count: 5,
-                deleted_text: Some(
-                    "you? ",
-                ),
-            },
-        },
-        OrderedOperation {
-            order: 26,
-            operation: Delete {
-                index: 26,
-                deleted_character_count: 5,
-                deleted_text: Some(
-                    " Adam",
-                ),
-            },
-        },
-        OrderedOperation {
-            order: 31,
-            operation: Insert {
-                index: 26,
-                text: "you ",
-            },
-        },
-        OrderedOperation {
-            order: 31,
-            operation: Insert {
-                index: 30,
-                text: "doing? Albert",
-            },
-        },
-    ],
-}
diff --git a/backend/reconcile/src/operation_transformation/snapshots/reconcile__operations__operation_sequence__tests__calculate_operations.snap b/backend/reconcile/src/operation_transformation/snapshots/reconcile__operations__operation_sequence__tests__calculate_operations.snap
deleted file mode 100644
index 1ba51561..00000000
--- a/backend/reconcile/src/operation_transformation/snapshots/reconcile__operations__operation_sequence__tests__calculate_operations.snap
+++ /dev/null
@@ -1,60 +0,0 @@
----
-source: reconcile/src/operations/operation_sequence.rs
-expression: operations
-snapshot_kind: text
----
-EditedText {
-    operations: [
-        OrderedOperation {
-            order: 0,
-            operation: Insert {
-                index: 0,
-                text: "Hello, my friend! ",
-            },
-        },
-        OrderedOperation {
-            order: 0,
-            operation: Delete {
-                index: 18,
-                deleted_character_count: 13,
-                deleted_text: Some(
-                    "hello world! ",
-                ),
-            },
-        },
-        OrderedOperation {
-            order: 21,
-            operation: Delete {
-                index: 26,
-                deleted_character_count: 5,
-                deleted_text: Some(
-                    "you? ",
-                ),
-            },
-        },
-        OrderedOperation {
-            order: 26,
-            operation: Delete {
-                index: 26,
-                deleted_character_count: 5,
-                deleted_text: Some(
-                    " Adam",
-                ),
-            },
-        },
-        OrderedOperation {
-            order: 31,
-            operation: Insert {
-                index: 26,
-                text: "you ",
-            },
-        },
-        OrderedOperation {
-            order: 31,
-            operation: Insert {
-                index: 30,
-                text: "doing? Albert",
-            },
-        },
-    ],
-}
diff --git a/backend/reconcile/src/tokenizer.rs b/backend/reconcile/src/tokenizer.rs
deleted file mode 100644
index 7ce6463c..00000000
--- a/backend/reconcile/src/tokenizer.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-use token::Token;
-
-pub mod token;
-pub mod word_tokenizer;
-
-pub type Tokenizer<T> = dyn Fn(&str) -> Vec<Token<T>>;
diff --git a/backend/reconcile/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots-2.snap b/backend/reconcile/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots-2.snap
deleted file mode 100644
index 892e524c..00000000
--- a/backend/reconcile/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots-2.snap
+++ /dev/null
@@ -1,6 +0,0 @@
----
-source: reconcile/src/tokenizer/word_tokenizer.rs
-expression: "word_tokenizer(\"\")"
-snapshot_kind: text
----
-[]
diff --git a/backend/reconcile/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots-3.snap b/backend/reconcile/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots-3.snap
deleted file mode 100644
index d1c94e1e..00000000
--- a/backend/reconcile/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots-3.snap
+++ /dev/null
@@ -1,25 +0,0 @@
----
-source: reconcile/src/tokenizer/word_tokenizer.rs
-expression: "word_tokenizer(\" what? \")"
-snapshot_kind: text
----
-[
-    Token {
-        normalised: " what?",
-        original: " ",
-        is_left_joinable: true,
-        is_right_joinable: true,
-    },
-    Token {
-        normalised: "what?",
-        original: "what?",
-        is_left_joinable: true,
-        is_right_joinable: true,
-    },
-    Token {
-        normalised: " ",
-        original: " ",
-        is_left_joinable: true,
-        is_right_joinable: true,
-    },
-]
diff --git a/backend/reconcile/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots-4.snap b/backend/reconcile/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots-4.snap
deleted file mode 100644
index 6740dbc0..00000000
--- a/backend/reconcile/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots-4.snap
+++ /dev/null
@@ -1,55 +0,0 @@
----
-source: reconcile/src/tokenizer/word_tokenizer.rs
-expression: "word_tokenizer(\" hello, \\nwhere are you?\")"
-snapshot_kind: text
----
-[
-    Token {
-        normalised: " hello,",
-        original: " ",
-        is_left_joinable: true,
-        is_right_joinable: true,
-    },
-    Token {
-        normalised: "hello,",
-        original: "hello,",
-        is_left_joinable: true,
-        is_right_joinable: true,
-    },
-    Token {
-        normalised: " \nwhere",
-        original: " \n",
-        is_left_joinable: true,
-        is_right_joinable: true,
-    },
-    Token {
-        normalised: "where",
-        original: "where",
-        is_left_joinable: true,
-        is_right_joinable: true,
-    },
-    Token {
-        normalised: " are",
-        original: " ",
-        is_left_joinable: true,
-        is_right_joinable: true,
-    },
-    Token {
-        normalised: "are",
-        original: "are",
-        is_left_joinable: true,
-        is_right_joinable: true,
-    },
-    Token {
-        normalised: " you?",
-        original: " ",
-        is_left_joinable: true,
-        is_right_joinable: true,
-    },
-    Token {
-        normalised: "you?",
-        original: "you?",
-        is_left_joinable: true,
-        is_right_joinable: true,
-    },
-]
diff --git a/backend/reconcile/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots-5.snap b/backend/reconcile/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots-5.snap
deleted file mode 100644
index 832147ec..00000000
--- a/backend/reconcile/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots-5.snap
+++ /dev/null
@@ -1,39 +0,0 @@
----
-source: reconcile/src/tokenizer/word_tokenizer.rs
-expression: "word_tokenizer(\" hello, \\nwhere are you?\")"
-snapshot_kind: text
----
-[
-    Token {
-        normalised: " ",
-        original: " ",
-    },
-    Token {
-        normalised: "hello,",
-        original: "hello,",
-    },
-    Token {
-        normalised: " \n",
-        original: " \n",
-    },
-    Token {
-        normalised: "where",
-        original: "where",
-    },
-    Token {
-        normalised: " ",
-        original: " ",
-    },
-    Token {
-        normalised: "are",
-        original: "are",
-    },
-    Token {
-        normalised: " ",
-        original: " ",
-    },
-    Token {
-        normalised: "you?",
-        original: "you?",
-    },
-]
diff --git a/backend/reconcile/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots.snap b/backend/reconcile/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots.snap
deleted file mode 100644
index 95c8db5f..00000000
--- a/backend/reconcile/src/tokenizer/snapshots/reconcile__tokenizer__word_tokenizer__tests__with_snapshots.snap
+++ /dev/null
@@ -1,25 +0,0 @@
----
-source: reconcile/src/tokenizer/word_tokenizer.rs
-expression: "word_tokenizer(\"Hi there!\")"
-snapshot_kind: text
----
-[
-    Token {
-        normalised: "Hi",
-        original: "Hi",
-        is_left_joinable: true,
-        is_right_joinable: true,
-    },
-    Token {
-        normalised: " there!",
-        original: " ",
-        is_left_joinable: true,
-        is_right_joinable: true,
-    },
-    Token {
-        normalised: "there!",
-        original: "there!",
-        is_left_joinable: true,
-        is_right_joinable: true,
-    },
-]
diff --git a/backend/reconcile/src/tokenizer/token.rs b/backend/reconcile/src/tokenizer/token.rs
deleted file mode 100644
index 86cbb92f..00000000
--- a/backend/reconcile/src/tokenizer/token.rs
+++ /dev/null
@@ -1,64 +0,0 @@
-#[cfg(feature = "serde")]
-use serde::{Deserialize, Serialize};
-
-/// A token is a string that has been normalised in some way.
-/// The normalised form is used for comparison, while the original form is used
-/// for applying `Operation`-s.
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[derive(Debug, Clone)]
-pub struct Token<T>
-where
-    T: PartialEq + Clone + std::fmt::Debug,
-{
-    /// The normalised form of the token used deriving the diff.
-    pub normalised: T,
-
-    /// The original string, that should be inserted or deleted in the document.
-    original: String,
-
-    /// Whether the token is joinable with the previous token.
-    is_left_joinable: bool,
-
-    /// Whether the token is joinable with the next token.
-    is_right_joinable: bool,
-}
-
-impl From<&str> for Token<String> {
-    fn from(text: &str) -> Self { Token::new(text.to_owned(), text.to_owned(), true, true) }
-}
-
-impl<T> Token<T>
-where
-    T: PartialEq + Clone + std::fmt::Debug,
-{
-    pub fn new(
-        normalised: T,
-        original: String,
-        is_left_joinable: bool,
-        is_right_joinable: bool,
-    ) -> Self {
-        Token {
-            normalised,
-            original,
-            is_left_joinable,
-            is_right_joinable,
-        }
-    }
-
-    pub fn original(&self) -> &str { &self.original }
-
-    pub fn normalised(&self) -> &T { &self.normalised }
-
-    pub fn get_original_length(&self) -> usize { self.original.chars().count() }
-
-    pub fn get_is_left_joinable(&self) -> bool { self.is_left_joinable }
-
-    pub fn get_is_right_joinable(&self) -> bool { self.is_right_joinable }
-}
-
-impl<T> PartialEq for Token<T>
-where
-    T: PartialEq + Clone + std::fmt::Debug,
-{
-    fn eq(&self, other: &Self) -> bool { self.normalised == other.normalised }
-}
diff --git a/backend/reconcile/src/tokenizer/word_tokenizer.rs b/backend/reconcile/src/tokenizer/word_tokenizer.rs
deleted file mode 100644
index 2267f69f..00000000
--- a/backend/reconcile/src/tokenizer/word_tokenizer.rs
+++ /dev/null
@@ -1,60 +0,0 @@
-use super::token::Token;
-
-/// Splits on word boundaries creating alternating words and whitespaces with
-/// the whitesspaces getting unique IDs.
-///
-/// ## Example
-///
-/// ```not_rust
-/// "Hi there!" -> ["Hi", " ", "there!"]
-/// ```
-pub fn word_tokenizer(text: &str) -> Vec<Token<String>> {
-    let mut result: Vec<Token<String>> = Vec::new();
-
-    let mut previous_boundary_index = 0;
-    let mut previous_char_is_whitespace = text.chars().next().is_none_or(char::is_whitespace);
-
-    for (i, c) in text.char_indices() {
-        let is_current_char_whitespace = c.is_whitespace();
-        if previous_char_is_whitespace != is_current_char_whitespace {
-            result.push(text[previous_boundary_index..i].into());
-            previous_boundary_index = i;
-        }
-
-        previous_char_is_whitespace = is_current_char_whitespace;
-    }
-
-    if previous_boundary_index < text.len() {
-        result.push(text[previous_boundary_index..].into());
-    }
-
-    if result.is_empty() {
-        return result;
-    }
-
-    for i in 0..result.len() - 1 {
-        if result[i].original().chars().all(char::is_whitespace) {
-            result[i].normalised = result[i].normalised().to_owned() + result[i + 1].original();
-        }
-    }
-
-    result
-}
-
-#[cfg(test)]
-mod tests {
-    use insta::assert_debug_snapshot;
-
-    use super::*;
-
-    #[test]
-    fn test_with_snapshots() {
-        assert_debug_snapshot!(word_tokenizer("Hi there!"));
-
-        assert_debug_snapshot!(word_tokenizer(""));
-
-        assert_debug_snapshot!(word_tokenizer(" what? "));
-
-        assert_debug_snapshot!(word_tokenizer(" hello, \nwhere are you?"));
-    }
-}
diff --git a/backend/reconcile/src/utils.rs b/backend/reconcile/src/utils.rs
deleted file mode 100644
index 105719bd..00000000
--- a/backend/reconcile/src/utils.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-pub mod common_prefix_len;
-pub mod common_suffix_len;
-pub mod find_longest_prefix_contained_within;
-pub mod merge_iters;
-pub mod side;
-pub mod string_builder;
diff --git a/backend/reconcile/src/utils/common_prefix_len.rs b/backend/reconcile/src/utils/common_prefix_len.rs
deleted file mode 100644
index 5c1a5c12..00000000
--- a/backend/reconcile/src/utils/common_prefix_len.rs
+++ /dev/null
@@ -1,47 +0,0 @@
-use core::ops::{Index, Range};
-
-/// Given two lookups and ranges calculates the length of the common prefix.
-/// Copied from <https://github.com/mitsuhiko/similar/blob/7e15c44de11a1cd61e1149189929e189ef977fd8/src/algorithms/utils.rs>
-pub fn common_prefix_len<Old, New>(
-    old: &Old,
-    old_range: Range<usize>,
-    new: &New,
-    new_range: Range<usize>,
-) -> usize
-where
-    Old: Index<usize> + ?Sized,
-    New: Index<usize> + ?Sized,
-    New::Output: PartialEq<Old::Output>,
-{
-    new_range
-        .zip(old_range)
-        .take_while(|x| new[x.0] == old[x.1])
-        .count()
-}
-
-#[cfg(test)]
-mod tests {
-    use pretty_assertions::assert_eq;
-
-    use super::*;
-
-    #[test]
-    fn test_common_prefix_len() {
-        assert_eq!(
-            common_prefix_len("".as_bytes(), 0..0, "".as_bytes(), 0..0),
-            0
-        );
-        assert_eq!(
-            common_prefix_len("foobarbaz".as_bytes(), 0..9, "foobarblah".as_bytes(), 0..10),
-            7
-        );
-        assert_eq!(
-            common_prefix_len("foobarbaz".as_bytes(), 0..9, "blablabla".as_bytes(), 0..9),
-            0
-        );
-        assert_eq!(
-            common_prefix_len("foobarbaz".as_bytes(), 3..9, "foobarblah".as_bytes(), 3..10),
-            4
-        );
-    }
-}
diff --git a/backend/reconcile/src/utils/common_suffix_len.rs b/backend/reconcile/src/utils/common_suffix_len.rs
deleted file mode 100644
index c17a979c..00000000
--- a/backend/reconcile/src/utils/common_suffix_len.rs
+++ /dev/null
@@ -1,48 +0,0 @@
-use core::ops::{Index, Range};
-
-/// Given two lookups and ranges calculates the length of common suffix.
-/// Copied from <https://github.com/mitsuhiko/similar/blob/7e15c44de11a1cd61e1149189929e189ef977fd8/src/algorithms/utils.rs>
-pub fn common_suffix_len<Old, New>(
-    old: &Old,
-    old_range: Range<usize>,
-    new: &New,
-    new_range: Range<usize>,
-) -> usize
-where
-    Old: Index<usize> + ?Sized,
-    New: Index<usize> + ?Sized,
-    New::Output: PartialEq<Old::Output>,
-{
-    new_range
-        .rev()
-        .zip(old_range.rev())
-        .take_while(|x| new[x.0] == old[x.1])
-        .count()
-}
-
-#[cfg(test)]
-mod tests {
-    use pretty_assertions::assert_eq;
-
-    use super::*;
-
-    #[test]
-    fn test_common_suffix_len() {
-        assert_eq!(
-            common_suffix_len("".as_bytes(), 0..0, "".as_bytes(), 0..0),
-            0
-        );
-        assert_eq!(
-            common_suffix_len("1234".as_bytes(), 0..4, "X0001234".as_bytes(), 0..8),
-            4
-        );
-        assert_eq!(
-            common_suffix_len("1234".as_bytes(), 0..4, "Xxxx".as_bytes(), 0..4),
-            0
-        );
-        assert_eq!(
-            common_suffix_len("1234".as_bytes(), 2..4, "01234".as_bytes(), 2..5),
-            2
-        );
-    }
-}
diff --git a/backend/reconcile/src/utils/find_longest_prefix_contained_within.rs b/backend/reconcile/src/utils/find_longest_prefix_contained_within.rs
deleted file mode 100644
index eb4b8264..00000000
--- a/backend/reconcile/src/utils/find_longest_prefix_contained_within.rs
+++ /dev/null
@@ -1,103 +0,0 @@
-use crate::Token;
-
-/// Given two lists of tokens, returns `length` where `old` list somewhere
-/// within contains the `length` prefix of the `new` list.
-///
-/// ## Example
-///
-/// ```not_rust
-/// old: [0, 1, 9, 0, 2, 5]
-/// new:       [9, 0, 2, 5, 1]
-/// ```
-/// > results in an length of 4
-///
-///
-/// ```not_rust
-/// old: [0, 1, 9, 0, 2, 5]
-/// new:          [0, 2]
-/// ```
-/// > results in an length of 2
-///
-/// ```not_rust
-/// old: [0, 1, 9, 0, 2, 5]
-/// new:          [0, 4]
-/// ```
-/// > results in an length of 1
-pub fn find_longest_prefix_contained_within<T>(old: &[Token<T>], new: &[Token<T>]) -> usize
-where
-    T: PartialEq + Clone + std::fmt::Debug,
-{
-    let max_possible = new.len().min(old.len());
-
-    for len in (1..=max_possible).rev() {
-        let prefix = &new[..len];
-        if old.windows(len).any(|window| window == prefix) {
-            return len;
-        }
-    }
-
-    0
-}
-
-#[cfg(test)]
-mod tests {
-    use pretty_assertions::assert_eq;
-
-    use super::*;
-
-    #[test]
-    fn test_common_overlap() {
-        assert_eq!(
-            find_longest_prefix_contained_within(&["".into()], &["".into()]),
-            1
-        );
-
-        assert_eq!(
-            find_longest_prefix_contained_within(
-                &["a".into(), "b".into(), "c".into()],
-                &["b".into(), "c".into(), "a".into()]
-            ),
-            2
-        );
-
-        assert_eq!(
-            find_longest_prefix_contained_within(
-                &["a".into(), "b".into(), "c".into()],
-                &["b".into(), "c".into()]
-            ),
-            2
-        );
-
-        assert_eq!(
-            find_longest_prefix_contained_within(
-                &["a".into(), "b".into(), "c".into()],
-                &["b".into()]
-            ),
-            1
-        );
-
-        assert_eq!(
-            find_longest_prefix_contained_within(
-                &["a".into(), "b".into(), "c".into(), "b".into(), "a".into()],
-                &["b".into(), "a".into()]
-            ),
-            2
-        );
-
-        assert_eq!(
-            find_longest_prefix_contained_within(
-                &["a".into(), "a".into(), "a".into()],
-                &["a".into(), "b".into(), "c".into()]
-            ),
-            1
-        );
-
-        assert_eq!(
-            find_longest_prefix_contained_within(
-                &["a".into(), "b".into(), "c".into()],
-                &["d".into(), "e".into(), "a".into()]
-            ),
-            0
-        );
-    }
-}
diff --git a/backend/reconcile/src/utils/merge_iters.rs b/backend/reconcile/src/utils/merge_iters.rs
deleted file mode 100644
index 2730c336..00000000
--- a/backend/reconcile/src/utils/merge_iters.rs
+++ /dev/null
@@ -1,86 +0,0 @@
-use core::{cmp::Ordering, iter::Peekable};
-
-pub struct MergeAscending<L, R, F, O>
-where
-    L: Iterator<Item = R::Item>,
-    R: Iterator,
-    F: Fn(&R::Item) -> O,
-    O: PartialOrd,
-{
-    left: Peekable<L>,
-    right: Peekable<R>,
-    get_key: F,
-}
-
-impl<L, R, F, O> MergeAscending<L, R, F, O>
-where
-    L: Iterator<Item = R::Item>,
-    R: Iterator,
-    F: Fn(&R::Item) -> O,
-    O: PartialOrd,
-{
-    fn new(left: L, right: R, get_key: F) -> Self {
-        MergeAscending {
-            left: left.peekable(),
-            right: right.peekable(),
-            get_key,
-        }
-    }
-}
-
-impl<L, R, F, O> Iterator for MergeAscending<L, R, F, O>
-where
-    L: Iterator<Item = R::Item>,
-    R: Iterator,
-    F: Fn(&R::Item) -> O,
-    O: PartialOrd,
-{
-    type Item = L::Item;
-
-    fn next(&mut self) -> Option<L::Item> {
-        let order = match (self.left.peek(), self.right.peek()) {
-            (Some(l), Some(r)) => (self.get_key)(l).partial_cmp(&(self.get_key)(r)),
-            (Some(_), None) => Some(Ordering::Less),
-            (None, Some(_)) => Some(Ordering::Greater),
-            (None, None) => return None,
-        };
-
-        match order {
-            Some(Ordering::Less | Ordering::Equal) | None => self.left.next(),
-            Some(Ordering::Greater) => self.right.next(),
-        }
-    }
-}
-
-pub trait MergeSorted: Iterator {
-    fn merge_sorted_by_key<R, F, O>(self, other: R, get_key: F) -> MergeAscending<Self, R, F, O>
-    where
-        Self: Sized,
-        R: Iterator<Item = Self::Item>,
-        F: Fn(&Self::Item) -> O,
-        O: PartialOrd,
-    {
-        MergeAscending::new(self, other, get_key)
-    }
-}
-
-impl<T: ?Sized> MergeSorted for T where T: Iterator {}
-
-#[cfg(test)]
-mod tests {
-    use pretty_assertions::assert_eq;
-
-    use super::*;
-
-    #[test]
-    fn test_merge_sorted_by_key() {
-        let left = [9, 7, 5, 3, 1];
-        let right = [7, 6, 5, 4, 3];
-
-        let result: Vec<i32> = left
-            .into_iter()
-            .merge_sorted_by_key(right.into_iter(), |x| -1 * x)
-            .collect();
-        assert_eq!(result, vec![9, 7, 7, 6, 5, 5, 4, 3, 3, 1]);
-    }
-}
diff --git a/backend/reconcile/src/utils/side.rs b/backend/reconcile/src/utils/side.rs
deleted file mode 100644
index 825fa9e2..00000000
--- a/backend/reconcile/src/utils/side.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-use std::fmt::Display;
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum Side {
-    Left,
-    Right,
-}
-
-impl Display for Side {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Side::Left => write!(f, "Left"),
-            Side::Right => write!(f, "Right"),
-        }
-    }
-}
diff --git a/backend/reconcile/src/utils/string_builder.rs b/backend/reconcile/src/utils/string_builder.rs
deleted file mode 100644
index b19bcbb4..00000000
--- a/backend/reconcile/src/utils/string_builder.rs
+++ /dev/null
@@ -1,111 +0,0 @@
-use core::ops::Range;
-
-/// A helper for building a string in order based on an original string and a
-/// series of insertions and deletions applied to it. It is safe to use with
-/// UTF-8 strings as all operations are based on character indices.
-#[derive(Debug, Clone)]
-pub struct StringBuilder<'a> {
-    original: &'a str,
-    last_old_char_index: usize,
-    buffer: String,
-}
-
-impl StringBuilder<'_> {
-    pub fn new(original: &str) -> StringBuilder<'_> {
-        StringBuilder {
-            original,
-            last_old_char_index: 0,
-            buffer: String::with_capacity(original.len()),
-        }
-    }
-
-    /// Insert a string at the given index after copying the original string up
-    /// to that index from the last insertion or deletion.
-    pub fn insert(&mut self, from: usize, text: &str) {
-        self.copy_until(from);
-        self.buffer.push_str(text);
-    }
-
-    /// Delete a string at the given index after copying the original string up
-    /// to that index from the last insertion or deletion.
-    pub fn delete(&mut self, range: core::ops::Range<usize>) {
-        self.copy_until(range.start);
-        self.last_old_char_index += range.len();
-    }
-
-    fn copy_until(&mut self, index: usize) {
-        let current_char_count = self.buffer.chars().count();
-        debug_assert!(
-            index >= current_char_count,
-            "String builder only support building in order"
-        );
-
-        let jump = index - current_char_count;
-
-        self.buffer.push_str(
-            &self
-                .original
-                .chars()
-                .skip(self.last_old_char_index)
-                .take(jump)
-                .collect::<String>(),
-        );
-        self.last_old_char_index += jump;
-    }
-
-    /// Finish building the string after copying the remaining original string
-    /// since the last insertion or deletion.
-    pub fn build(mut self) -> String {
-        self.buffer.push_str(
-            &self
-                .original
-                .chars()
-                .skip(self.last_old_char_index)
-                .collect::<String>(),
-        );
-
-        self.buffer
-    }
-
-    #[allow(dead_code)]
-    pub fn get_slice(&self, range: Range<usize>) -> String {
-        let result = self
-            .buffer
-            .chars()
-            .chain(self.original.chars().skip(self.last_old_char_index))
-            .skip(range.start)
-            .take(range.end - range.start)
-            .collect::<String>();
-
-        debug_assert_eq!(result.chars().count(), range.len(), "Range out of bounds",);
-
-        result
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_string_builder() {
-        let original = "aaa bbb ccc";
-        let mut builder = StringBuilder::new(original);
-
-        builder.insert(0, "ddd ");
-        builder.delete(4..8);
-        builder.insert(11, " eee");
-
-        assert_eq!(builder.build(), "ddd bbb ccc eee");
-    }
-
-    #[test]
-    fn test_string_builder2() {
-        let original = "abcde";
-        let mut builder = StringBuilder::new(original);
-
-        builder.delete(1..4);
-
-        assert_eq!(builder.build(), "ae");
-    }
-}
diff --git a/backend/reconcile/tests/example_document.rs b/backend/reconcile/tests/example_document.rs
deleted file mode 100644
index 277e49e1..00000000
--- a/backend/reconcile/tests/example_document.rs
+++ /dev/null
@@ -1,103 +0,0 @@
-use pretty_assertions::assert_eq;
-use reconcile::{CursorPosition, TextWithCursors};
-use serde::Deserialize;
-
-/// `ExampleDocument` represents a test case for the reconciliation process.
-/// It contains a parent string, left and right strings with cursor positions,
-/// and the expected result after reconciliation.
-///
-/// '|' characters in the left, right, and expected strings are treated as
-/// cursor positions and are converted into `CursorPosition` objects.
-#[derive(Debug, Deserialize, Clone, PartialEq, Eq)]
-pub struct ExampleDocument {
-    parent: String,
-    left: String,
-    right: String,
-    expected: String,
-}
-
-impl ExampleDocument {
-    #[must_use]
-    pub fn parent(&self) -> String { self.parent.clone() }
-
-    #[must_use]
-    pub fn left(&self) -> TextWithCursors<'static> {
-        ExampleDocument::string_to_text_with_cursors(&self.left)
-    }
-
-    #[must_use]
-    pub fn right(&self) -> TextWithCursors<'static> {
-        ExampleDocument::string_to_text_with_cursors(&self.right)
-    }
-
-    /// Asserts that the result string matches the expected string,
-    /// including cursor positions.
-    ///
-    /// # Panics
-    ///
-    /// If the result string does not match the expected string, the program
-    /// will panic.
-    pub fn assert_eq(&self, result: &TextWithCursors<'static>) {
-        let result_str = ExampleDocument::text_with_cursors_to_string(result);
-        assert_eq!(
-            self.expected, result_str,
-            "Left (expected) isn't equal to right (actual). Actual: ```\n{result_str}```",
-        );
-    }
-
-    /// Asserts that the result string matches the expected string,
-    /// ignoring cursor positions.
-    ///
-    /// # Panics
-    ///
-    /// If the result string does not match the expected string, the program
-    /// will panic.
-    pub fn assert_eq_without_cursors(&self, result: &str) {
-        let expected = ExampleDocument::string_to_text_with_cursors(&self.expected).text;
-        assert_eq!(
-            expected, result,
-            "Left (expected) isn't equal to right (actual), Actual: ```\n{result}```",
-        );
-    }
-
-    fn text_with_cursors_to_string(text: &TextWithCursors<'_>) -> String {
-        let mut result = text.text.clone().into_owned();
-        for (i, cursor) in text.cursors.iter().enumerate() {
-            assert!(
-                cursor.char_index <= result.len(), // equals in case of insert at the end
-                "Cursor index out of bounds: {} > {} when testing for '{result}'",
-                cursor.char_index,
-                result.len()
-            );
-
-            result.insert(
-                result
-                    .char_indices()
-                    .nth(cursor.char_index + i)
-                    .map_or_else(|| result.len(), |(byte_index, _)| byte_index), /* find the utf8 char index of the insert
-                                                                                  * in byte index */
-                '|',
-            );
-        }
-        result
-    }
-
-    fn string_to_text_with_cursors(text: &str) -> TextWithCursors<'static> {
-        let cursors = Self::parse_cursors(text);
-        let text = text.replace('|', "");
-        TextWithCursors::new_owned(text, cursors)
-    }
-
-    fn parse_cursors(text: &str) -> Vec<CursorPosition> {
-        let mut cursors = Vec::new();
-        for (i, c) in text.chars().enumerate() {
-            if c == '|' {
-                cursors.push(CursorPosition {
-                    id: 0,
-                    char_index: i - cursors.len(),
-                });
-            }
-        }
-        cursors
-    }
-}
diff --git a/backend/reconcile/tests/examples/README.md b/backend/reconcile/tests/examples/README.md
deleted file mode 100644
index f5fafa78..00000000
--- a/backend/reconcile/tests/examples/README.md
+++ /dev/null
@@ -1 +0,0 @@
-The `|` characters denote cursor positions which are stripped before the actual reconcile logic is run
diff --git a/backend/reconcile/tests/examples/deletes.yml b/backend/reconcile/tests/examples/deletes.yml
deleted file mode 100644
index c4c145b8..00000000
--- a/backend/reconcile/tests/examples/deletes.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-# Both delete the same range
-parent: original_1 original_2 original_3 original_4 original_5
-left: original_1 original_5|
-right: "|original_1 original_5"
-expected: "|original_1 original_5|"
-
----
-# Both delete a range and one range contains the other
-parent: original_1 original_2 original_3 original_4 original_5
-left: original_1 original_5
-right: original_1 original_4 original_5
-expected: original_1 original_5
-
----
-# Deleting overlapping ranges
-parent: original_1 original_2 original_3 original_4 original_5
-left: original_1 original_4| original_5
-right: original_1 original_2| original_5
-expected: original_1|| original_5
-
----
-parent: long text with one big delete and many small
-left: long small
-right: long with big and small
-expected: long small
-
----
-parent: long text where the cursor has to be clamped after delete
-left: long text where the cursor has to be clamped after delete|
-right: long text where the cursor
-expected: long text where the cursor|
diff --git a/backend/reconcile/tests/examples/deletes_and_inserts.yml b/backend/reconcile/tests/examples/deletes_and_inserts.yml
deleted file mode 100644
index fe0e7c1a..00000000
--- a/backend/reconcile/tests/examples/deletes_and_inserts.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# One deleted a large range, the other deleted subranges and inserted as well
-parent: original_1 original_2 original_3 original_4 original_5
-left: original_1 original_5
-right: original_1 edit_1 original_3 edit_2 original_5
-expected: original_1 edit_1 edit_2 original_5
-
----
-# One deleted a large range, the other inserted and deleted a partially overlapping range
-parent: original_1 original_2 original_3 original_4 original_5
-left: original_1 original_5
-right: original_1 edit_1 original_3 edit_2
-expected: original_1 edit_1 edit_2
diff --git a/backend/reconcile/tests/examples/idempotent_inserts.yml b/backend/reconcile/tests/examples/idempotent_inserts.yml
deleted file mode 100644
index a48952be..00000000
--- a/backend/reconcile/tests/examples/idempotent_inserts.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-# Both inserted the same prefix; this should get deduplicateed
-parent: "hi "
-left: "hi there "
-right: "hi there my friend "
-expected: "hi there my friend "
-
----
-# The prefix of the 2nd appears on the 1st so it shouldn't get duplicatelicated
-parent: "hi "
-left: "hi there you "
-right: "hi there my friend "
-expected: "hi there my friend you "
-
----
-parent: a
-left: a b c
-right: a b c d
-expected: a b c d
-
----
-parent: a
-left: abc
-right: abcd
-expected: abcabcd
diff --git a/backend/reconcile/tests/examples/multiline.yml b/backend/reconcile/tests/examples/multiline.yml
deleted file mode 100644
index 3f2d096d..00000000
--- a/backend/reconcile/tests/examples/multiline.yml
+++ /dev/null
@@ -1,63 +0,0 @@
-parent: Hello!
-left: |
-  Hello there!
-
-  How are you?
-
-right: |
-  Hello there!
-
-  Best,
-  Andras
-
-expected: |
-  Hello there!
-
-  Best,
-  Andras
-
-
-  How are you?
-
----
-parent: |
-  - my list
-  - 2nd item
-  - 3rd item
-
-left: |
-  - my list
-  - 2nd item
-      - nested list
-        - very nested  list
-  - 3rd item
-
-right: |
-  - my list
-    - nested list
-  - 2nd item
-  - 3rd item
-    - another nested list
-
-expected: |
-  - my list
-    - nested list
-  - 2nd item
-      - nested list
-        - very nested  list
-  - 3rd item
-    - another nested list
-
----
-parent: |
-  a
-  a
-left: |
-  a|
-    a
-right: |
-  a|
-  a
-expected: |
-  a||
-    a
diff --git a/backend/reconcile/tests/examples/replacing.yml b/backend/reconcile/tests/examples/replacing.yml
deleted file mode 100644
index cea57b89..00000000
--- a/backend/reconcile/tests/examples/replacing.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-# Both replaced one token but the tokens are different
-parent: original_1 original_2 original_3
-left: original_1 edit_1| original_3
-right: original_1 original_2| edit_2
-expected: original_1 edit_1|| edit_2
-
----
-# Both replace the same token with the same value
-parent: original_1 original_2 original_3
-left: original_1 edit_1| original_3
-right: original_1 edit_1 original_3|
-expected: original_1 edit_1| original_3|
-
----
-# Both replace the same token with different value
-parent: original_1 original_2 original_3
-left: original_1 edit_1| original_3
-right: original_1 conflicting_edit_1| original_3
-expected: original_1 conflicting_edit_1| edit_1| original_3
diff --git a/backend/reconcile/tests/examples/utf-8.yml b/backend/reconcile/tests/examples/utf-8.yml
deleted file mode 100644
index 8aac95fe..00000000
--- a/backend/reconcile/tests/examples/utf-8.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-parent: Meeting at 2pm in 会议室
-left: Meeting at |3pm in 会议室
-right: Team meeting at 2pm in conference room|
-expected: Team meeting at |3pm in conference room|
-
----
-parent: "    "
-left: "it’|s utf-8!"
-right: "    "
-expected: "it’|s utf-8!"
diff --git a/backend/reconcile/tests/examples/various.yml b/backend/reconcile/tests/examples/various.yml
deleted file mode 100644
index cfbeb423..00000000
--- a/backend/reconcile/tests/examples/various.yml
+++ /dev/null
@@ -1,130 +0,0 @@
-parent: You're Annual Savings Statement is available in our online portal
-left: Your| annual record is available in our online portal|
-right: You're Annual Savings information| is available online
-expected: Your| annual record information| is available online|
-
----
-parent: Party A shall pay Party B
-left: Party C shall pay Party B
-right: Party A shall receive from Party B
-expected: Party C shall receive from Party B
-
----
-parent:
-left: hi my friend|
-right: hi there|
-expected: hi my friend| there|
-
----
-parent: ""
-left: ""
-right: ""
-expected: ""
-
----
-parent: ""
-left: "|"
-right: "|"
-expected: "||"
-
----
-parent: Buy milk and eggs
-left: Buy organic milk| and eggs|
-right: Buy milk and eggs| and bread
-expected: Buy organic milk| and eggs|| and bread
-
----
-parent: Send the report to the team
-left: Send the |detailed report to the |entire |team
-right: Send the |quarterly |detailed report to the team
-expected: Send the |detailed |quarterly |detailed report to the |entire |team
-
----
-parent: Ready, Set go
-left: Ready! Set go|
-right: Ready, Set, go!|
-expected: Ready! Set, go!||
-
----
-parent: "Total: $100"
-left: "Total: |$150"
-right: "Total: |€100"
-expected: "Total: |$150 |€100"
-
----
-parent: Start middle end
-left: Start [important] middle end|
-right: Start middle [critical] end|
-expected: Start [important] middle [critical] end||
-
----
-parent: marketplace
-left: market| place
-right: market|space
-expected: market| placemarket|space
-
----
-parent: A B C D
-left: A X B D|
-right: A B Y|
-expected: A X B |Y|
-
----
-parent: Please submit your assignment by Friday
-left: Please submit your |completed |assignment by Friday
-right: Please submit your assignment |online |by Friday
-expected: Please submit your |completed |assignment |online |by Friday
-
----
-parent: "a b "
-left: "c d "
-right: "a b c d "
-expected: "c d c d "
-
----
-parent: a b c d e
-left: a e|
-right: a c e|
-expected: a e||
-
----
-parent: a 0 1 2 b
-left: a 0 1| 2 b
-right: a b|
-expected: a| b|
-
----
-parent: a 0 1 2 b
-left: "|a b"
-right: "|a E 1 F b"
-expected: "||a E F b"
-
----
-parent: a this one delete b
-left: a b|
-right: a my one change b|
-expected: a my change b||
-
----
-parent: this stays, this is one big delete, don't touch this
-left: this stays, don't touch this|
-right: this stays, my one change, don't touch this|
-expected: this stays, my change, don't touch this||
-
----
-parent: 1 2 3 4 5 6
-left: 1| 6
-right: 1 2 4|
-expected: 1||
-
----
-parent: hello world
-left: hi, world
-right: hello my friend!
-expected: hi, my friend!
-
----
-parent: a a
-left: a
-right: a
-expected: a
diff --git a/backend/reconcile/tests/resources/blns.txt b/backend/reconcile/tests/resources/blns.txt
deleted file mode 100644
index 62352e35..00000000
--- a/backend/reconcile/tests/resources/blns.txt
+++ /dev/null
@@ -1,742 +0,0 @@
-#	Reserved Strings
-#
-#	Strings which may be used elsewhere in code
-
-undefined
-undef
-null
-NULL
-(null)
-nil
-NIL
-true
-false
-True
-False
-TRUE
-FALSE
-None
-hasOwnProperty
-then
-constructor
-\
-\\
-
-#	Numeric Strings
-#
-#	Strings which can be interpreted as numeric
-
-0
-1
-1.00
-$1.00
-1/2
-1E2
-1E02
-1E+02
--1
--1.00
--$1.00
--1/2
--1E2
--1E02
--1E+02
-1/0
-0/0
--2147483648/-1
--9223372036854775808/-1
--0
--0.0
-+0
-+0.0
-0.00
-0..0
-.
-0.0.0
-0,00
-0,,0
-,
-0,0,0
-0.0/0
-1.0/0.0
-0.0/0.0
-1,0/0,0
-0,0/0,0
---1
--
--.
--,
-999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999
-NaN
-Infinity
--Infinity
-INF
-1#INF
--1#IND
-1#QNAN
-1#SNAN
-1#IND
-0x0
-0xffffffff
-0xffffffffffffffff
-0xabad1dea
-123456789012345678901234567890123456789
-1,000.00
-1 000.00
-1'000.00
-1,000,000.00
-1 000 000.00
-1'000'000.00
-1.000,00
-1 000,00
-1'000,00
-1.000.000,00
-1 000 000,00
-1'000'000,00
-01000
-08
-09
-2.2250738585072011e-308
-
-#	Special Characters
-#
-# ASCII punctuation.  All of these characters may need to be escaped in some
-# contexts.  Divided into three groups based on (US-layout) keyboard position.
-
-,./;'[]\-=
-<>?:"{}|_+
-!@#$%^&*()`~
-
-# Non-whitespace C0 controls: U+0001 through U+0008, U+000E through U+001F,
-# and U+007F (DEL)
-# Often forbidden to appear in various text-based file formats (e.g. XML),
-# or reused for internal delimiters on the theory that they should never
-# appear in input.
-# The next line may appear to be blank or mojibake in some viewers.
-

-
-# Non-whitespace C1 controls: U+0080 through U+0084 and U+0086 through U+009F.
-# Commonly misinterpreted as additional graphic characters.
-# The next line may appear to be blank, mojibake, or dingbats in some viewers.
-€‚ƒ„†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ
-
-# Whitespace: all of the characters with category Zs, Zl, or Zp (in Unicode
-# version 8.0.0), plus U+0009 (HT), U+000B (VT), U+000C (FF), U+0085 (NEL),
-# and U+200B (ZERO WIDTH SPACE), which are in the C categories but are often
-# treated as whitespace in some contexts.
-# This file unfortunately cannot express strings containing
-# U+0000, U+000A, or U+000D (NUL, LF, CR).
-# The next line may appear to be blank or mojibake in some viewers.
-# The next line may be flagged for "trailing whitespace" in some viewers.
-	 …             ​

  　
-
-# Unicode additional control characters: all of the characters with
-# general category Cf (in Unicode 8.0.0).
-# The next line may appear to be blank or mojibake in some viewers.
-­؀؁؂؃؄؅؜۝܏᠎​‌‍‎‏‪‫‬‭‮⁠⁡⁢⁣⁤⁦⁧⁨⁩𑂽𛲠𛲡𛲢𛲣𝅳𝅴𝅵𝅶𝅷𝅸𝅹𝅺󠀁󠀠󠀡󠀢󠀣󠀤󠀥󠀦󠀧󠀨󠀩󠀪󠀫󠀬󠀭󠀮󠀯󠀰󠀱󠀲󠀳󠀴󠀵󠀶󠀷󠀸󠀹󠀺󠀻󠀼󠀽󠀾󠀿󠁀󠁁󠁂󠁃󠁄󠁅󠁆󠁇󠁈󠁉󠁊󠁋󠁌󠁍󠁎󠁏󠁐󠁑󠁒󠁓󠁔󠁕󠁖󠁗󠁘󠁙󠁚󠁛󠁜󠁝󠁞󠁟󠁠󠁡󠁢󠁣󠁤󠁥󠁦󠁧󠁨󠁩󠁪󠁫󠁬󠁭󠁮󠁯󠁰󠁱󠁲󠁳󠁴󠁵󠁶󠁷󠁸󠁹󠁺󠁻󠁼󠁽󠁾󠁿
-
-# "Byte order marks", U+FEFF and U+FFFE, each on its own line.
-# The next two lines may appear to be blank or mojibake in some viewers.
-
-￾
-
-#	Unicode Symbols
-#
-#	Strings which contain common unicode symbols (e.g. smart quotes)
-
-Ω≈ç√∫˜µ≤≥÷
-åß∂ƒ©˙∆˚¬…æ
-œ∑´®†¥¨ˆøπ“‘
-¡™£¢∞§¶•ªº–≠
-¸˛Ç◊ı˜Â¯˘¿
-ÅÍÎÏ˝ÓÔÒÚÆ☃
-Œ„´‰ˇÁ¨ˆØ∏”’
-`⁄€‹›fifl‡°·‚—±
-⅛⅜⅝⅞
-ЁЂЃЄЅІЇЈЉЊЋЌЍЎЏАБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюя
-٠١٢٣٤٥٦٧٨٩
-
-#	Unicode Subscript/Superscript/Accents
-#
-#	Strings which contain unicode subscripts/superscripts; can cause rendering issues
-
-⁰⁴⁵
-₀₁₂
-⁰⁴⁵₀₁₂
-ด้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็ ด้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็ ด้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็
-
-#	Quotation Marks
-#
-#	Strings which contain misplaced quotation marks; can cause encoding errors
-
-'
-"
-''
-""
-'"'
-"''''"'"
-"'"'"''''"
-<foo val=“bar” />
-<foo val=“bar” />
-<foo val=”bar“ />
-<foo val=`bar' />
-
-#	Two-Byte Characters
-#
-#	Strings which contain two-byte characters: can cause rendering issues or character-length issues
-
-田中さんにあげて下さい
-パーティーへ行かないか
-和製漢語
-部落格
-사회과학원 어학연구소
-찦차를 타고 온 펲시맨과 쑛다리 똠방각하
-社會科學院語學研究所
-울란바토르
-𠜎𠜱𠝹𠱓𠱸𠲖𠳏
-
-#	Strings which contain two-byte letters: can cause issues with naïve UTF-16 capitalizers which think that 16 bits == 1 character
-
-𐐜 𐐔𐐇𐐝𐐀𐐡𐐇𐐓 𐐙𐐊𐐡𐐝𐐓/𐐝𐐇𐐗𐐊𐐤𐐔 𐐒𐐋𐐗 𐐒𐐌 𐐜 𐐡𐐀𐐖𐐇𐐤𐐓𐐝 𐐱𐑂 𐑄 𐐔𐐇𐐝𐐀𐐡𐐇𐐓 𐐏𐐆𐐅𐐤𐐆𐐚𐐊𐐡𐐝𐐆𐐓𐐆
-
-#	Special Unicode Characters Union
-#
-#	A super string recommended by VMware Inc. Globalization Team: can effectively cause rendering issues or character-length issues to validate product globalization readiness.
-#
-#	表          CJK_UNIFIED_IDEOGRAPHS (U+8868)
-#	ポ          KATAKANA LETTER PO (U+30DD)
-#	あ          HIRAGANA LETTER A (U+3042)
-#	A           LATIN CAPITAL LETTER A (U+0041)
-#	鷗          CJK_UNIFIED_IDEOGRAPHS (U+9DD7)
-#	Π          LATIN SMALL LIGATURE OE (U+0153)
-#	é           LATIN SMALL LETTER E WITH ACUTE (U+00E9)
-#	Ｂ           FULLWIDTH LATIN CAPITAL LETTER B (U+FF22)
-#	逍          CJK_UNIFIED_IDEOGRAPHS (U+900D)
-#	Ü           LATIN SMALL LETTER U WITH DIAERESIS (U+00FC)
-#	ß           LATIN SMALL LETTER SHARP S (U+00DF)
-#	ª           FEMININE ORDINAL INDICATOR (U+00AA)
-#	ą           LATIN SMALL LETTER A WITH OGONEK (U+0105)
-#	ñ           LATIN SMALL LETTER N WITH TILDE (U+00F1)
-#	丂          CJK_UNIFIED_IDEOGRAPHS (U+4E02)
-#	㐀          CJK Ideograph Extension A, First (U+3400)
-#	𠀀          CJK Ideograph Extension B, First (U+20000)
-
-表ポあA鷗ŒéＢ逍Üߪąñ丂㐀𠀀
-
-#	Changing length when lowercased
-#
-#	Characters which increase in length (2 to 3 bytes) when lowercased
-#	Credit: https://twitter.com/jifa/status/625776454479970304
-
-Ⱥ
-Ⱦ
-
-#	Japanese Emoticons
-#
-#	Strings which consists of Japanese-style emoticons which are popular on the web
-
-ヽ༼ຈل͜ຈ༽ﾉ ヽ༼ຈل͜ຈ༽ﾉ
-(｡◕ ∀ ◕｡)
-｀ｨ(´∀｀∩
-__ﾛ(,_,*)
-・(￣∀￣)・:*:
-ﾟ･✿ヾ╲(｡◕‿◕｡)╱✿･ﾟ
-,。・:*:・゜’( ☻ ω ☻ )。・:*:・゜’
-(╯°□°）╯︵ ┻━┻)
-(ﾉಥ益ಥ）ﾉ ┻━┻
-┬─┬ノ( º _ ºノ)
-( ͡° ͜ʖ ͡°)
-¯\_(ツ)_/¯
-
-#	Emoji
-#
-#	Strings which contain Emoji; should be the same behavior as two-byte characters, but not always
-
-😍
-👩🏽
-👨‍🦰 👨🏿‍🦰 👨‍🦱 👨🏿‍🦱 🦹🏿‍♂️
-👾 🙇 💁 🙅 🙆 🙋 🙎 🙍
-🐵 🙈 🙉 🙊
-❤️ 💔 💌 💕 💞 💓 💗 💖 💘 💝 💟 💜 💛 💚 💙
-✋🏿 💪🏿 👐🏿 🙌🏿 👏🏿 🙏🏿
-👨‍👩‍👦 👨‍👩‍👧‍👦 👨‍👨‍👦 👩‍👩‍👧 👨‍👦 👨‍👧‍👦 👩‍👦 👩‍👧‍👦
-🚾 🆒 🆓 🆕 🆖 🆗 🆙 🏧
-0️⃣ 1️⃣ 2️⃣ 3️⃣ 4️⃣ 5️⃣ 6️⃣ 7️⃣ 8️⃣ 9️⃣ 🔟
-
-#       Regional Indicator Symbols
-#
-#       Regional Indicator Symbols can be displayed differently across
-#       fonts, and have a number of special behaviors
-
-🇺🇸🇷🇺🇸 🇦🇫🇦🇲🇸
-🇺🇸🇷🇺🇸🇦🇫🇦🇲
-🇺🇸🇷🇺🇸🇦
-
-#	Unicode Numbers
-#
-#	Strings which contain unicode numbers; if the code is localized, it should see the input as numeric
-
-１２３
-١٢٣
-
-#	Right-To-Left Strings
-#
-#	Strings which contain text that should be rendered RTL if possible (e.g. Arabic, Hebrew)
-
-ثم نفس سقطت وبالتحديد،, جزيرتي باستخدام أن دنو. إذ هنا؟ الستار وتنصيب كان. أهّل ايطاليا، بريطانيا-فرنسا قد أخذ. سليمان، إتفاقية بين ما, يذكر الحدود أي بعد, معاملة بولندا، الإطلاق عل إيو.
-בְּרֵאשִׁית, בָּרָא אֱלֹהִים, אֵת הַשָּׁמַיִם, וְאֵת הָאָרֶץ
-הָיְתָהtestالصفحات التّحول
-﷽
-ﷺ
-مُنَاقَشَةُ سُبُلِ اِسْتِخْدَامِ اللُّغَةِ فِي النُّظُمِ الْقَائِمَةِ وَفِيم يَخُصَّ التَّطْبِيقَاتُ الْحاسُوبِيَّةُ،
-الكل في المجمو عة (5)
-
-#	Ogham Text
-#
-#	The only unicode alphabet to use a space which isn't empty but should still act like a space.
-
-᚛ᚄᚓᚐᚋᚒᚄ ᚑᚄᚂᚑᚏᚅ᚜
-᚛                 ᚜
-
-#	Trick Unicode
-#
-#	Strings which contain unicode with unusual properties (e.g. Right-to-left override) (c.f. http://www.unicode.org/charts/PDF/U2000.pdf)
-
-‪‪test‪
-‫test‫
-
test

-test⁠test‫
-⁦test⁧
-
-#	Zalgo Text
-#
-#	Strings which contain "corrupted" text. The corruption will not appear in non-HTML text, however. (via http://www.eeemo.net)
-
-Ṱ̺̺̕o͞ ̷i̲̬͇̪͙n̝̗͕v̟̜̘̦͟o̶̙̰̠kè͚̮̺̪̹̱̤ ̖t̝͕̳̣̻̪͞h̼͓̲̦̳̘̲e͇̣̰̦̬͎ ̢̼̻̱̘h͚͎͙̜̣̲ͅi̦̲̣̰̤v̻͍e̺̭̳̪̰-m̢iͅn̖̺̞̲̯̰d̵̼̟͙̩̼̘̳ ̞̥̱̳̭r̛̗̘e͙p͠r̼̞̻̭̗e̺̠̣͟s̘͇̳͍̝͉e͉̥̯̞̲͚̬͜ǹ̬͎͎̟̖͇̤t͍̬̤͓̼̭͘ͅi̪̱n͠g̴͉ ͏͉ͅc̬̟h͡a̫̻̯͘o̫̟̖͍̙̝͉s̗̦̲.̨̹͈̣
-̡͓̞ͅI̗̘̦͝n͇͇͙v̮̫ok̲̫̙͈i̖͙̭̹̠̞n̡̻̮̣̺g̲͈͙̭͙̬͎ ̰t͔̦h̞̲e̢̤ ͍̬̲͖f̴̘͕̣è͖ẹ̥̩l͖͔͚i͓͚̦͠n͖͍̗͓̳̮g͍ ̨o͚̪͡f̘̣̬ ̖̘͖̟͙̮c҉͔̫͖͓͇͖ͅh̵̤̣͚͔á̗̼͕ͅo̼̣̥s̱͈̺̖̦̻͢.̛̖̞̠̫̰
-̗̺͖̹̯͓Ṯ̤͍̥͇͈h̲́e͏͓̼̗̙̼̣͔ ͇̜̱̠͓͍ͅN͕͠e̗̱z̘̝̜̺͙p̤̺̹͍̯͚e̠̻̠͜r̨̤͍̺̖͔̖̖d̠̟̭̬̝͟i̦͖̩͓͔̤a̠̗̬͉̙n͚͜ ̻̞̰͚ͅh̵͉i̳̞v̢͇ḙ͎͟-҉̭̩̼͔m̤̭̫i͕͇̝̦n̗͙ḍ̟ ̯̲͕͞ǫ̟̯̰̲͙̻̝f ̪̰̰̗̖̭̘͘c̦͍̲̞͍̩̙ḥ͚a̮͎̟̙͜ơ̩̹͎s̤.̝̝ ҉Z̡̖̜͖̰̣͉̜a͖̰͙̬͡l̲̫̳͍̩g̡̟̼̱͚̞̬ͅo̗͜.̟
-̦H̬̤̗̤͝e͜ ̜̥̝̻͍̟́w̕h̖̯͓o̝͙̖͎̱̮ ҉̺̙̞̟͈W̷̼̭a̺̪͍į͈͕̭͙̯̜t̶̼̮s̘͙͖̕ ̠̫̠B̻͍͙͉̳ͅe̵h̵̬͇̫͙i̹͓̳̳̮͎̫̕n͟d̴̪̜̖ ̰͉̩͇͙̲͞ͅT͖̼͓̪͢h͏͓̮̻e̬̝̟ͅ ̤̹̝W͙̞̝͔͇͝ͅa͏͓͔̹̼̣l̴͔̰̤̟͔ḽ̫.͕
-Z̮̞̠͙͔ͅḀ̗̞͈̻̗Ḷ͙͎̯̹̞͓G̻O̭̗̮
-
-#	Unicode Upsidedown
-#
-#	Strings which contain unicode with an "upsidedown" effect (via http://www.upsidedowntext.com)
-
-˙ɐnbᴉlɐ ɐuƃɐɯ ǝɹolop ʇǝ ǝɹoqɐl ʇn ʇunpᴉpᴉɔuᴉ ɹodɯǝʇ poɯsnᴉǝ op pǝs 'ʇᴉlǝ ƃuᴉɔsᴉdᴉpɐ ɹnʇǝʇɔǝsuoɔ 'ʇǝɯɐ ʇᴉs ɹolop ɯnsdᴉ ɯǝɹo˥
-00˙Ɩ$-
-
-#	Unicode font
-#
-#	Strings which contain bold/italic/etc. versions of normal characters
-
-Ｔｈｅ ｑｕｉｃｋ ｂｒｏｗｎ ｆｏｘ ｊｕｍｐｓ ｏｖｅｒ ｔｈｅ ｌａｚｙ ｄｏｇ
-𝐓𝐡𝐞 𝐪𝐮𝐢𝐜𝐤 𝐛𝐫𝐨𝐰𝐧 𝐟𝐨𝐱 𝐣𝐮𝐦𝐩𝐬 𝐨𝐯𝐞𝐫 𝐭𝐡𝐞 𝐥𝐚𝐳𝐲 𝐝𝐨𝐠
-𝕿𝖍𝖊 𝖖𝖚𝖎𝖈𝖐 𝖇𝖗𝖔𝖜𝖓 𝖋𝖔𝖝 𝖏𝖚𝖒𝖕𝖘 𝖔𝖛𝖊𝖗 𝖙𝖍𝖊 𝖑𝖆𝖟𝖞 𝖉𝖔𝖌
-𝑻𝒉𝒆 𝒒𝒖𝒊𝒄𝒌 𝒃𝒓𝒐𝒘𝒏 𝒇𝒐𝒙 𝒋𝒖𝒎𝒑𝒔 𝒐𝒗𝒆𝒓 𝒕𝒉𝒆 𝒍𝒂𝒛𝒚 𝒅𝒐𝒈
-𝓣𝓱𝓮 𝓺𝓾𝓲𝓬𝓴 𝓫𝓻𝓸𝔀𝓷 𝓯𝓸𝔁 𝓳𝓾𝓶𝓹𝓼 𝓸𝓿𝓮𝓻 𝓽𝓱𝓮 𝓵𝓪𝔃𝔂 𝓭𝓸𝓰
-𝕋𝕙𝕖 𝕢𝕦𝕚𝕔𝕜 𝕓𝕣𝕠𝕨𝕟 𝕗𝕠𝕩 𝕛𝕦𝕞𝕡𝕤 𝕠𝕧𝕖𝕣 𝕥𝕙𝕖 𝕝𝕒𝕫𝕪 𝕕𝕠𝕘
-𝚃𝚑𝚎 𝚚𝚞𝚒𝚌𝚔 𝚋𝚛𝚘𝚠𝚗 𝚏𝚘𝚡 𝚓𝚞𝚖𝚙𝚜 𝚘𝚟𝚎𝚛 𝚝𝚑𝚎 𝚕𝚊𝚣𝚢 𝚍𝚘𝚐
-⒯⒣⒠ ⒬⒰⒤⒞⒦ ⒝⒭⒪⒲⒩ ⒡⒪⒳ ⒥⒰⒨⒫⒮ ⒪⒱⒠⒭ ⒯⒣⒠ ⒧⒜⒵⒴ ⒟⒪⒢
-
-#	Script Injection
-#
-#	Strings which attempt to invoke a benign script injection; shows vulnerability to XSS
-
-<script>alert(0)</script>
-&lt;script&gt;alert(&#39;1&#39;);&lt;/script&gt;
-<img src=x onerror=alert(2) />
-<svg><script>123<1>alert(3)</script>
-"><script>alert(4)</script>
-'><script>alert(5)</script>
-><script>alert(6)</script>
-</script><script>alert(7)</script>
-< / script >< script >alert(8)< / script >
- onfocus=JaVaSCript:alert(9) autofocus
-" onfocus=JaVaSCript:alert(10) autofocus
-' onfocus=JaVaSCript:alert(11) autofocus
-＜script＞alert(12)＜/script＞
-<sc<script>ript>alert(13)</sc</script>ript>
---><script>alert(14)</script>
-";alert(15);t="
-';alert(16);t='
-JavaSCript:alert(17)
-;alert(18);
-src=JaVaSCript:prompt(19)
-"><script>alert(20);</script x="
-'><script>alert(21);</script x='
-><script>alert(22);</script x=
-" autofocus onkeyup="javascript:alert(23)
-' autofocus onkeyup='javascript:alert(24)
-<script\x20type="text/javascript">javascript:alert(25);</script>
-<script\x3Etype="text/javascript">javascript:alert(26);</script>
-<script\x0Dtype="text/javascript">javascript:alert(27);</script>
-<script\x09type="text/javascript">javascript:alert(28);</script>
-<script\x0Ctype="text/javascript">javascript:alert(29);</script>
-<script\x2Ftype="text/javascript">javascript:alert(30);</script>
-<script\x0Atype="text/javascript">javascript:alert(31);</script>
-'`"><\x3Cscript>javascript:alert(32)</script>
-'`"><\x00script>javascript:alert(33)</script>
-ABC<div style="x\x3Aexpression(javascript:alert(34)">DEF
-ABC<div style="x:expression\x5C(javascript:alert(35)">DEF
-ABC<div style="x:expression\x00(javascript:alert(36)">DEF
-ABC<div style="x:exp\x00ression(javascript:alert(37)">DEF
-ABC<div style="x:exp\x5Cression(javascript:alert(38)">DEF
-ABC<div style="x:\x0Aexpression(javascript:alert(39)">DEF
-ABC<div style="x:\x09expression(javascript:alert(40)">DEF
-ABC<div style="x:\xE3\x80\x80expression(javascript:alert(41)">DEF
-ABC<div style="x:\xE2\x80\x84expression(javascript:alert(42)">DEF
-ABC<div style="x:\xC2\xA0expression(javascript:alert(43)">DEF
-ABC<div style="x:\xE2\x80\x80expression(javascript:alert(44)">DEF
-ABC<div style="x:\xE2\x80\x8Aexpression(javascript:alert(45)">DEF
-ABC<div style="x:\x0Dexpression(javascript:alert(46)">DEF
-ABC<div style="x:\x0Cexpression(javascript:alert(47)">DEF
-ABC<div style="x:\xE2\x80\x87expression(javascript:alert(48)">DEF
-ABC<div style="x:\xEF\xBB\xBFexpression(javascript:alert(49)">DEF
-ABC<div style="x:\x20expression(javascript:alert(50)">DEF
-ABC<div style="x:\xE2\x80\x88expression(javascript:alert(51)">DEF
-ABC<div style="x:\x00expression(javascript:alert(52)">DEF
-ABC<div style="x:\xE2\x80\x8Bexpression(javascript:alert(53)">DEF
-ABC<div style="x:\xE2\x80\x86expression(javascript:alert(54)">DEF
-ABC<div style="x:\xE2\x80\x85expression(javascript:alert(55)">DEF
-ABC<div style="x:\xE2\x80\x82expression(javascript:alert(56)">DEF
-ABC<div style="x:\x0Bexpression(javascript:alert(57)">DEF
-ABC<div style="x:\xE2\x80\x81expression(javascript:alert(58)">DEF
-ABC<div style="x:\xE2\x80\x83expression(javascript:alert(59)">DEF
-ABC<div style="x:\xE2\x80\x89expression(javascript:alert(60)">DEF
-<a href="\x0Bjavascript:javascript:alert(61)" id="fuzzelement1">test</a>
-<a href="\x0Fjavascript:javascript:alert(62)" id="fuzzelement1">test</a>
-<a href="\xC2\xA0javascript:javascript:alert(63)" id="fuzzelement1">test</a>
-<a href="\x05javascript:javascript:alert(64)" id="fuzzelement1">test</a>
-<a href="\xE1\xA0\x8Ejavascript:javascript:alert(65)" id="fuzzelement1">test</a>
-<a href="\x18javascript:javascript:alert(66)" id="fuzzelement1">test</a>
-<a href="\x11javascript:javascript:alert(67)" id="fuzzelement1">test</a>
-<a href="\xE2\x80\x88javascript:javascript:alert(68)" id="fuzzelement1">test</a>
-<a href="\xE2\x80\x89javascript:javascript:alert(69)" id="fuzzelement1">test</a>
-<a href="\xE2\x80\x80javascript:javascript:alert(70)" id="fuzzelement1">test</a>
-<a href="\x17javascript:javascript:alert(71)" id="fuzzelement1">test</a>
-<a href="\x03javascript:javascript:alert(72)" id="fuzzelement1">test</a>
-<a href="\x0Ejavascript:javascript:alert(73)" id="fuzzelement1">test</a>
-<a href="\x1Ajavascript:javascript:alert(74)" id="fuzzelement1">test</a>
-<a href="\x00javascript:javascript:alert(75)" id="fuzzelement1">test</a>
-<a href="\x10javascript:javascript:alert(76)" id="fuzzelement1">test</a>
-<a href="\xE2\x80\x82javascript:javascript:alert(77)" id="fuzzelement1">test</a>
-<a href="\x20javascript:javascript:alert(78)" id="fuzzelement1">test</a>
-<a href="\x13javascript:javascript:alert(79)" id="fuzzelement1">test</a>
-<a href="\x09javascript:javascript:alert(80)" id="fuzzelement1">test</a>
-<a href="\xE2\x80\x8Ajavascript:javascript:alert(81)" id="fuzzelement1">test</a>
-<a href="\x14javascript:javascript:alert(82)" id="fuzzelement1">test</a>
-<a href="\x19javascript:javascript:alert(83)" id="fuzzelement1">test</a>
-<a href="\xE2\x80\xAFjavascript:javascript:alert(84)" id="fuzzelement1">test</a>
-<a href="\x1Fjavascript:javascript:alert(85)" id="fuzzelement1">test</a>
-<a href="\xE2\x80\x81javascript:javascript:alert(86)" id="fuzzelement1">test</a>
-<a href="\x1Djavascript:javascript:alert(87)" id="fuzzelement1">test</a>
-<a href="\xE2\x80\x87javascript:javascript:alert(88)" id="fuzzelement1">test</a>
-<a href="\x07javascript:javascript:alert(89)" id="fuzzelement1">test</a>
-<a href="\xE1\x9A\x80javascript:javascript:alert(90)" id="fuzzelement1">test</a>
-<a href="\xE2\x80\x83javascript:javascript:alert(91)" id="fuzzelement1">test</a>
-<a href="\x04javascript:javascript:alert(92)" id="fuzzelement1">test</a>
-<a href="\x01javascript:javascript:alert(93)" id="fuzzelement1">test</a>
-<a href="\x08javascript:javascript:alert(94)" id="fuzzelement1">test</a>
-<a href="\xE2\x80\x84javascript:javascript:alert(95)" id="fuzzelement1">test</a>
-<a href="\xE2\x80\x86javascript:javascript:alert(96)" id="fuzzelement1">test</a>
-<a href="\xE3\x80\x80javascript:javascript:alert(97)" id="fuzzelement1">test</a>
-<a href="\x12javascript:javascript:alert(98)" id="fuzzelement1">test</a>
-<a href="\x0Djavascript:javascript:alert(99)" id="fuzzelement1">test</a>
-<a href="\x0Ajavascript:javascript:alert(100)" id="fuzzelement1">test</a>
-<a href="\x0Cjavascript:javascript:alert(101)" id="fuzzelement1">test</a>
-<a href="\x15javascript:javascript:alert(102)" id="fuzzelement1">test</a>
-<a href="\xE2\x80\xA8javascript:javascript:alert(103)" id="fuzzelement1">test</a>
-<a href="\x16javascript:javascript:alert(104)" id="fuzzelement1">test</a>
-<a href="\x02javascript:javascript:alert(105)" id="fuzzelement1">test</a>
-<a href="\x1Bjavascript:javascript:alert(106)" id="fuzzelement1">test</a>
-<a href="\x06javascript:javascript:alert(107)" id="fuzzelement1">test</a>
-<a href="\xE2\x80\xA9javascript:javascript:alert(108)" id="fuzzelement1">test</a>
-<a href="\xE2\x80\x85javascript:javascript:alert(109)" id="fuzzelement1">test</a>
-<a href="\x1Ejavascript:javascript:alert(110)" id="fuzzelement1">test</a>
-<a href="\xE2\x81\x9Fjavascript:javascript:alert(111)" id="fuzzelement1">test</a>
-<a href="\x1Cjavascript:javascript:alert(112)" id="fuzzelement1">test</a>
-<a href="javascript\x00:javascript:alert(113)" id="fuzzelement1">test</a>
-<a href="javascript\x3A:javascript:alert(114)" id="fuzzelement1">test</a>
-<a href="javascript\x09:javascript:alert(115)" id="fuzzelement1">test</a>
-<a href="javascript\x0D:javascript:alert(116)" id="fuzzelement1">test</a>
-<a href="javascript\x0A:javascript:alert(117)" id="fuzzelement1">test</a>
-`"'><img src=xxx:x \x0Aonerror=javascript:alert(118)>
-`"'><img src=xxx:x \x22onerror=javascript:alert(119)>
-`"'><img src=xxx:x \x0Bonerror=javascript:alert(120)>
-`"'><img src=xxx:x \x0Donerror=javascript:alert(121)>
-`"'><img src=xxx:x \x2Fonerror=javascript:alert(122)>
-`"'><img src=xxx:x \x09onerror=javascript:alert(123)>
-`"'><img src=xxx:x \x0Conerror=javascript:alert(124)>
-`"'><img src=xxx:x \x00onerror=javascript:alert(125)>
-`"'><img src=xxx:x \x27onerror=javascript:alert(126)>
-`"'><img src=xxx:x \x20onerror=javascript:alert(127)>
-"`'><script>\x3Bjavascript:alert(128)</script>
-"`'><script>\x0Djavascript:alert(129)</script>
-"`'><script>\xEF\xBB\xBFjavascript:alert(130)</script>
-"`'><script>\xE2\x80\x81javascript:alert(131)</script>
-"`'><script>\xE2\x80\x84javascript:alert(132)</script>
-"`'><script>\xE3\x80\x80javascript:alert(133)</script>
-"`'><script>\x09javascript:alert(134)</script>
-"`'><script>\xE2\x80\x89javascript:alert(135)</script>
-"`'><script>\xE2\x80\x85javascript:alert(136)</script>
-"`'><script>\xE2\x80\x88javascript:alert(137)</script>
-"`'><script>\x00javascript:alert(138)</script>
-"`'><script>\xE2\x80\xA8javascript:alert(139)</script>
-"`'><script>\xE2\x80\x8Ajavascript:alert(140)</script>
-"`'><script>\xE1\x9A\x80javascript:alert(141)</script>
-"`'><script>\x0Cjavascript:alert(142)</script>
-"`'><script>\x2Bjavascript:alert(143)</script>
-"`'><script>\xF0\x90\x96\x9Ajavascript:alert(144)</script>
-"`'><script>-javascript:alert(145)</script>
-"`'><script>\x0Ajavascript:alert(146)</script>
-"`'><script>\xE2\x80\xAFjavascript:alert(147)</script>
-"`'><script>\x7Ejavascript:alert(148)</script>
-"`'><script>\xE2\x80\x87javascript:alert(149)</script>
-"`'><script>\xE2\x81\x9Fjavascript:alert(150)</script>
-"`'><script>\xE2\x80\xA9javascript:alert(151)</script>
-"`'><script>\xC2\x85javascript:alert(152)</script>
-"`'><script>\xEF\xBF\xAEjavascript:alert(153)</script>
-"`'><script>\xE2\x80\x83javascript:alert(154)</script>
-"`'><script>\xE2\x80\x8Bjavascript:alert(155)</script>
-"`'><script>\xEF\xBF\xBEjavascript:alert(156)</script>
-"`'><script>\xE2\x80\x80javascript:alert(157)</script>
-"`'><script>\x21javascript:alert(158)</script>
-"`'><script>\xE2\x80\x82javascript:alert(159)</script>
-"`'><script>\xE2\x80\x86javascript:alert(160)</script>
-"`'><script>\xE1\xA0\x8Ejavascript:alert(161)</script>
-"`'><script>\x0Bjavascript:alert(162)</script>
-"`'><script>\x20javascript:alert(163)</script>
-"`'><script>\xC2\xA0javascript:alert(164)</script>
-<img \x00src=x onerror="alert(165)">
-<img \x47src=x onerror="javascript:alert(166)">
-<img \x11src=x onerror="javascript:alert(167)">
-<img \x12src=x onerror="javascript:alert(168)">
-<img\x47src=x onerror="javascript:alert(169)">
-<img\x10src=x onerror="javascript:alert(170)">
-<img\x13src=x onerror="javascript:alert(171)">
-<img\x32src=x onerror="javascript:alert(172)">
-<img\x47src=x onerror="javascript:alert(173)">
-<img\x11src=x onerror="javascript:alert(174)">
-<img \x47src=x onerror="javascript:alert(175)">
-<img \x34src=x onerror="javascript:alert(176)">
-<img \x39src=x onerror="javascript:alert(177)">
-<img \x00src=x onerror="javascript:alert(178)">
-<img src\x09=x onerror="javascript:alert(179)">
-<img src\x10=x onerror="javascript:alert(180)">
-<img src\x13=x onerror="javascript:alert(181)">
-<img src\x32=x onerror="javascript:alert(182)">
-<img src\x12=x onerror="javascript:alert(183)">
-<img src\x11=x onerror="javascript:alert(184)">
-<img src\x00=x onerror="javascript:alert(185)">
-<img src\x47=x onerror="javascript:alert(186)">
-<img src=x\x09onerror="javascript:alert(187)">
-<img src=x\x10onerror="javascript:alert(188)">
-<img src=x\x11onerror="javascript:alert(189)">
-<img src=x\x12onerror="javascript:alert(190)">
-<img src=x\x13onerror="javascript:alert(191)">
-<img[a][b][c]src[d]=x[e]onerror=[f]"alert(192)">
-<img src=x onerror=\x09"javascript:alert(193)">
-<img src=x onerror=\x10"javascript:alert(194)">
-<img src=x onerror=\x11"javascript:alert(195)">
-<img src=x onerror=\x12"javascript:alert(196)">
-<img src=x onerror=\x32"javascript:alert(197)">
-<img src=x onerror=\x00"javascript:alert(198)">
-<a href=java&#1&#2&#3&#4&#5&#6&#7&#8&#11&#12script:javascript:alert(199)>XXX</a>
-<img src="x` `<script>javascript:alert(200)</script>"` `>
-<img src onerror /" '"= alt=javascript:alert(201)//">
-<title onpropertychange=javascript:alert(202)></title><title title=>
-<a href=http://foo.bar/#x=`y></a><img alt="`><img src=x:x onerror=javascript:alert(203)></a>">
-<!--[if]><script>javascript:alert(204)</script -->
-<!--[if<img src=x onerror=javascript:alert(205)//]> -->
-<script src="/\%(jscript)s"></script>
-<script src="\\%(jscript)s"></script>
-<IMG """><SCRIPT>alert("206")</SCRIPT>">
-<IMG SRC=javascript:alert(String.fromCharCode(50,48,55))>
-<IMG SRC=# onmouseover="alert('208')">
-<IMG SRC= onmouseover="alert('209')">
-<IMG onmouseover="alert('210')">
-<IMG SRC=&#106;&#97;&#118;&#97;&#115;&#99;&#114;&#105;&#112;&#116;&#58;&#97;&#108;&#101;&#114;&#116;&#40;&#39;&#50;&#49;&#49;&#39;&#41;>
-<IMG SRC=&#0000106&#0000097&#0000118&#0000097&#0000115&#0000099&#0000114&#0000105&#0000112&#0000116&#0000058&#0000097&#0000108&#0000101&#0000114&#0000116&#0000040&#0000039&#0000050&#0000049&#0000050&#0000039&#0000041>
-<IMG SRC=&#x6A&#x61&#x76&#x61&#x73&#x63&#x72&#x69&#x70&#x74&#x3A&#x61&#x6C&#x65&#x72&#x74&#x28&#x27&#x32&#x31&#x33&#x27&#x29>
-<IMG SRC="jav   ascript:alert('214');">
-<IMG SRC="jav&#x09;ascript:alert('215');">
-<IMG SRC="jav&#x0A;ascript:alert('216');">
-<IMG SRC="jav&#x0D;ascript:alert('217');">
-perl -e 'print "<IMG SRC=java\0script:alert(\"218\")>";' > out
-<IMG SRC=" &#14;  javascript:alert('219');">
-<SCRIPT/XSS SRC="http://ha.ckers.org/xss.js"></SCRIPT>
-<BODY onload!#$%&()*~+-_.,:;?@[/|\]^`=alert("220")>
-<SCRIPT/SRC="http://ha.ckers.org/xss.js"></SCRIPT>
-<<SCRIPT>alert("221");//<</SCRIPT>
-<SCRIPT SRC=http://ha.ckers.org/xss.js?< B >
-<SCRIPT SRC=//ha.ckers.org/.j>
-<IMG SRC="javascript:alert('222')"
-<iframe src=http://ha.ckers.org/scriptlet.html <
-\";alert('223');//
-<u oncopy=alert()> Copy me</u>
-<i onwheel=alert(224)> Scroll over me </i>
-<plaintext>
-http://a/%%30%30
-</textarea><script>alert(225)</script>
-
-#	SQL Injection
-#
-#	Strings which can cause a SQL injection if inputs are not sanitized
-
-1;DROP TABLE users
-1'; DROP TABLE users-- 1
-' OR 1=1 -- 1
-' OR '1'='1
-'; EXEC sp_MSForEachTable 'DROP TABLE ?'; --
-
-%
-_
-
-#	Server Code Injection
-#
-#	Strings which can cause user to run code on server as a privileged user (c.f. https://news.ycombinator.com/item?id=7665153)
-
--
---
---version
---help
-$USER
-/dev/null; touch /tmp/blns.fail ; echo
-`touch /tmp/blns.fail`
-$(touch /tmp/blns.fail)
-@{[system "touch /tmp/blns.fail"]}
-
-#	Command Injection (Ruby)
-#
-#	Strings which can call system commands within Ruby/Rails applications
-
-eval("puts 'hello world'")
-System("ls -al /")
-`ls -al /`
-Kernel.exec("ls -al /")
-Kernel.exit(1)
-%x('ls -al /')
-
-#      XXE Injection (XML)
-#
-#	String which can reveal system files when parsed by a badly configured XML parser
-
-<?xml version="1.0" encoding="ISO-8859-1"?><!DOCTYPE foo [ <!ELEMENT foo ANY ><!ENTITY xxe SYSTEM "file:///etc/passwd" >]><foo>&xxe;</foo>
-
-#	Unwanted Interpolation
-#
-#	Strings which can be accidentally expanded into different strings if evaluated in the wrong context, e.g. used as a printf format string or via Perl or shell eval. Might expose sensitive data from the program doing the interpolation, or might just represent the wrong string.
-
-$HOME
-$ENV{'HOME'}
-%d
-%s%s%s%s%s
-{0}
-%*.*s
-%@
-%n
-File:///
-
-#	File Inclusion
-#
-#	Strings which can cause user to pull in files that should not be a part of a web server
-
-../../../../../../../../../../../etc/passwd%00
-../../../../../../../../../../../etc/hosts
-
-#	Known CVEs and Vulnerabilities
-#
-#	Strings that test for known vulnerabilities
-
-() { 0; }; touch /tmp/blns.shellshock1.fail;
-() { _; } >_[$($())] { touch /tmp/blns.shellshock2.fail; }
-<<< %s(un='%s') = %u
-+++ATH0
-
-#	MSDOS/Windows Special Filenames
-#
-#	Strings which are reserved characters in MSDOS/Windows
-
-CON
-PRN
-AUX
-CLOCK$
-NUL
-A:
-ZZ:
-COM1
-LPT1
-LPT2
-LPT3
-COM2
-COM3
-COM4
-
-#   IRC specific strings
-#
-#   Strings that may occur on IRC clients that make security products freak out
-
-DCC SEND STARTKEYLOGGER 0 0 0
-
-#	Scunthorpe Problem
-#
-#	Innocuous strings which may be blocked by profanity filters (https://en.wikipedia.org/wiki/Scunthorpe_problem)
-
-Scunthorpe General Hospital
-Penistone Community Church
-Lightwater Country Park
-Jimmy Clitheroe
-Horniman Museum
-shitake mushrooms
-RomansInSussex.co.uk
-http://www.cum.qc.ca/
-Craig Cockburn, Software Specialist
-Linda Callahan
-Dr. Herman I. Libshitz
-magna cum laude
-Super Bowl XXX
-medieval erection of parapets
-evaluate
-mocha
-expression
-Arsenal canal
-classic
-Tyson Gay
-Dick Van Dyke
-basement
-
-#	Human injection
-#
-#	Strings which may cause human to reinterpret worldview
-
-If you're reading this, you've been in a coma for almost 20 years now. We're trying a new technique. We don't know where this message will end up in your dream, but we hope it works. Please wake up, we miss you.
-
-#	Terminal escape codes
-#
-#	Strings which punish the fools who use cat/type on this file
-
-Roses are red, violets are blue. Hope you enjoy terminal hue
-But now...for my greatest trick...
-The quick brown fox... [Beeeep]
-
-#	iOS Vulnerabilities
-#
-#	Strings which crashed iMessage in various versions of iOS
-
-Powerلُلُصّبُلُلصّبُررً ॣ ॣh ॣ ॣ冗
-🏳0🌈️
-జ్ఞ‌ా
-
-# Persian special characters
-#
-# This is a four characters string which includes Persian special characters (گچپژ)
-
-گچپژ
-
-# jinja2 injection
-#
-# first one is supposed to raise "MemoryError" exception
-# second, obviously, prints contents of /etc/passwd
-
-{% print 'x' * 64 * 1024**3 %}
-{{ "".__class__.__mro__[2].__subclasses__()[40]("/etc/passwd").read() }}
diff --git a/backend/reconcile/tests/resources/kun_lu.txt b/backend/reconcile/tests/resources/kun_lu.txt
deleted file mode 100644
index 0bf6cdfe..00000000
--- a/backend/reconcile/tests/resources/kun_lu.txt
+++ /dev/null
@@ -1,6438 +0,0 @@
-The Project Gutenberg eBook of 呻吟語
-    
-This ebook is for the use of anyone anywhere in the United States and
-most other parts of the world at no cost and with almost no restrictions
-whatsoever. You may copy it, give it away or re-use it under the terms
-of the Project Gutenberg License included with this ebook or online
-at www.gutenberg.org. If you are not located in the United States,
-you will have to check the laws of the country where you are located
-before using this eBook.
-
-Title: 呻吟語
-
-Author: Kun Lü
-
-Release date: May 22, 2008 [eBook #25558]
-
-Language: Chinese
-
-Credits: Produced by Chu-Yu Huang
-
-
-*** START OF THE PROJECT GUTENBERG EBOOK 呻吟語 ***
-
-
-
-
-Produced by Chu-Yu Huang
-
-
-
-
-  序
-
-
-　　呻吟，病聲也。呻吟語，病時語也。病中疾痛，惟病者知，難與他人道，亦惟病時
-覺，既瘉，旋復忘也。
-　　予小子生而昏弱善病，病時呻吟，輒志所苦以自恨曰：「慎疾，無復病。」已而弗
-慎，又復病，輒又志之。蓋世病備經，不可勝志。一病數經，竟不能懲。語曰：「三折
-肱成良醫。」予乃九折臂矣。㽸痼年年，呻吟猶昨。嗟嗟！多病無完身，久病無完氣，予
-奄奄視息，而人也哉？
-　　三十年來，所志《呻吟語》，凡若干卷，攜以自藥。司農大夫劉景澤，攝心繕性，
-平生無所呻吟，予甚愛之。頃共事鴈門，各談所苦，予出《呻吟語》眎景澤。景澤曰：
-「吾亦有所呻吟而未之志也。吾人之病，大都相同。子既志之矣，盍以公人？蓋三益焉
-：醫病者，見子呻吟，起將死病；同病者，見子呻吟，醫各有病；未病者，見子呻吟，
-謹未然病。是子以一身示懲於天下，而所壽者眾也。既子不瘉，能以瘉人，不既多乎？
-」余矍然曰：「病語狂，又以其狂者惑人聞聽，可乎？」因擇其狂而未甚者存之。
-　　嗚呼！使予視息苟存，當求三年艾，健此餘生，何敢以㽸痼自棄？景澤，景澤，其尚
-醫予也夫！
-
-　　萬曆癸巳三月，抱獨居士寧陵呂坤書。
-
-
-     性命
-
-
-　　正命者，完卻正理，全卻初氣，未嘗以我害之，雖桎梏而死，不害其為正命。若初
-氣所鑿喪，正理不完，即正寢告終，恐非正命也。
-
-　　德性以收斂沉著為第一，收斂沉著中，又以精明平易為第一。大段收斂沉著人怕含
-糊，怕深險。淺浮子雖光明洞達，非蓄德之器也。
-
-
-　　或問：「人將死而見鬼神，真耶？幻耶？」曰：「人寤則為真見，夢則為妄見。魂
-游而不附體，故隨所之而見物，此外妄也。神與心離合而不安定，故隨所交而成景，此
-內妄也。故至人無夢，愚人無夢，無妄念也。人之將死，如夢然，魂飛揚而神亂於目，
-氣浮散而邪客於心，故所見皆妄，非真有也。或有將死而見人拘繫者，尤妄也。異端之
-語，入人骨髓，將死而懼，故常若有見。若死必有召之者，則牛羊蚊蟻之死，果亦有召
-之者耶？大抵草木之生枯、土石之凝散、人與眾動之生始終有無，只是一理，更無他說
-。萬一有之，亦怪異也。」
-
-　　氣，無終盡之時；形，無不毀之理。
-
-　　真機、真味要涵蓄，休點破。其妙無窮，不可言喻。所以聖人無言。一犯口頰，窮
-年說不盡，又離披澆漓，無一些咀嚼處矣。
-
-　　性分不可使虧欠，故其取數也常多，曰窮理，曰盡性，曰達天，曰入神，曰致廣大
-、極高明。情慾不可使贏餘，故其取數也常少，曰謹言，曰慎行，曰約己，曰清心，曰
-節飲食、寡嗜慾。
-
-　　深沉厚重，是第一等資質；磊落豪雄，是第二等資質；聰明才辨，是第三等資質。
-
-　　六合原是個情世界，故萬物以之相苦樂，而至人聖人不與焉。
-
-　　凡人光明博大、渾厚含蓄，是天地之氣；溫煦和平，是陽春之氣；寬縱任物，是長
-夏之氣；嚴凝斂約、喜刑好殺，是秋之氣；沉藏固嗇，
-是冬之氣；暴怒，是震雷之氣；狂肆，是疾風之氣；昏惑，是霾霧之氣；隱恨留連，是
-積陰之氣；從容溫潤，是和風甘雨之氣；聰明洞達，是青天朗月之氣。有所鍾者，必有
-所似。
-
-　　先天之氣，發洩處不過毫釐；後天之氣，擴充之必極分量。其實分量極處原是毫釐
-中有底，若毫釐中合下原無，便是一些增不去。萬物之形色才情，種種可驗也。
-
-　　蝸藏於殼，烈日經年而不枯，必有所以不枯者在也。此之謂以神用，先天造物命脈
-處。
-
-　　蘭以火而香，亦以火而滅；膏以火而明，亦以火而竭；炮以火而聲，亦以火而泄。
-陰者所以存也，陽者所以亡也，豈獨聲色、氣味然哉？世知鬱者之為足，是謂萬年之燭。
-
-　　火性發揚，水性流動，木性條暢，金性堅剛，土性重厚。其生物也亦然。
-
-　　一則見性，兩則生情。人未有偶而能靜者，物未有偶而無聲者。
-
-　　聲無形色，寄之於器；火無體質，寄之於薪；色無著落，寄之草木。故五行惟火無
-體，而用不窮。
-
-　　人之念頭與氣血同為消長，四十以前是個進心，識見未定而敢於有為；四十以後是
-個定心，識見既定而事有酌量；六十以後是個退心，見識雖真而精力不振。未必人人皆
-此，而此其大凡也。古者四十仕，六十、七十致仕，蓋審之矣。人亦有少年退縮不任事
-，厭厭若泉下人者；亦有衰年狂躁妄動喜事者，皆非常理。若乃以見事風生之少年為任
-事，以念頭灰冷之衰夫為老成，則誤矣。鄧禹沉毅，馬援矍鑠，古誠有之，豈多得哉！
-
-　　命本在天，君子之命在我，小人之命亦在我。君子以義處命，不以其道得之不處，
-命不足道也；小人以欲犯命，不可得而必欲得之，命不肯受也。但君子謂命在我，得天
-命之本然；小人謂命在我，幸氣數之或然。是以君子之心常泰，小人之心常勞。
-
-　　性者，理氣之總名，無不善之理，無皆善之氣。論性善者，純以理言也；論性惡與
-善惡混者，兼氣而言也。故經傳言性各各不同，惟孔子無病。
-
-　　氣、習，學者之二障也。仁者與義者相非，禮者與信者相左，皆氣質障也。高髻而
-笑低髽，長裾而譏短袂，皆習見障也。大道明，率天下氣質而歸之，即不能歸，不敢以
-所偏者病人矣；王制一，齊天下趨向而同之，即不能同，不敢以所狃者病人矣。哀哉！
-茲誰任之？
-
-　　父母全而生之，子全而歸之，髮膚還父母之初，無些毀傷，親之孝子也；天全而生
-之，人全而歸之，心性還天之初，無些缺欠，天之孝子也。
-
-　　虞廷不專言性善，曰「人心惟危，道心惟微」，或曰「人心非性」。曰：「非性可
-矣，亦是陰陽五行化生否？」六經不專言性善，曰「惟皇上帝，降衷下民，厥有恒性」
-。又曰「天生蒸民有欲，無主乃亂」。孔子不專言性善，曰「繼之者，善也；成之者，
-性也。」又曰「性相近也」，「惟上智與下愚不移」。才說相近，便不是一個。相遠從
-相近起腳。子思不專言性善，曰「修道之謂教」。性皆善矣，道胡可修？孟子不專言性
-善，曰「聲色、臭味、安佚，性也」，或曰「這性是好性」。曰：「好性如何君子不謂
-？」又曰「動心忍性」。善性豈可忍乎？犬之性，牛之性，豈非性乎？犬、牛之性，亦
-仁、義、禮、智、信之性乎？細推之，犬之性猶犬之性，牛之性猶牛之性乎？周茂叔不
-專言性善，曰「五性想感而善惡分，萬事出矣」，又曰：「幾善惡。」程伯淳不專言性
-善，曰「惡亦不可不謂之性」。大抵言性善者，主義理而不言氣質，蓋自孟子之折諸家
-始。後來諸儒遂主此說，而不敢異同，是未觀於天地萬物之情也。義理固是天賦，氣質
-亦豈人為哉？無論眾人，即堯舜禹湯文武周孔，豈是一樣氣質哉？愚僭為之說曰：「義
-理之性，有善無惡；氣質之性，有善有惡。氣質亦天命於人而與生俱生者，不謂之性可
-乎？程子云：『論性不論氣不備，論氣不論性不明。』將性氣分作兩項，便不透徹。張
-子以善為天地之性，清濁純駁為氣質之性，似覺支離。其實，天地只是一個氣，理在氣
-之中，賦於萬物，方以性言。故性字從生從心，言有生之心也。設使沒有氣質，只是一
-個德性，人人都是生知聖人，千古聖賢千言萬語、教化刑名都是多了底，何所苦而如此
-乎？這都是降伏氣質，扶持德性。立案於此，俟千百世之後駁之。」
-
-　　性，一母而五子，五性者，一性之子也。情者，五性之子也。一性靜，靜者陰；五
-性動，動者陽。性本渾淪，至靜不動，故曰：「人生而靜，天之性也。」才說性，便已
-不是性矣。此一性之說也。
-
-　　宋儒有功於孟子，只是補出個氣質之性來，省多少口脗！
-
-　　問：「禽獸草木亦有性否？」曰：「有。」再問：「其生亦天命否？」曰：「天以
-陰陽五行化生萬物，安得非天命？」
-
-　　或問：「孔子教人，性非所先。」曰：「聖人開口處都是性。」
-
-　　水無渣，著土便濁；火無氣，著木便煙。性無二，著氣質便雜。
-
-　　滿方寸渾成一個德性，無分毫私欲便是一心之仁；六尺渾成一個沖和，無分毫病痛
-便是一身之仁；滿六合渾成一個身軀，無分毫間隔便是合天下以成其仁。仁是全體，無
-毫髮欠缺；仁是純體，無纖芥瑕疪；仁是天成，無些子造作。眾人分一心為胡越，聖人
-會天下以成其身。愚嘗謂：「兩間無物我，萬古一呼吸。」
-
-
-
-
-存心
-
-
-　　心要如天平，稱物時，物忙而衡不忙；物去時，即懸空在此。只恁靜虛中正，何等
-自在！
-
-　　收放心休要如追放豚，既入苙了，便要使他從容閑暢，無拘迫懊憹之狀。若恨他難
-收，一向束縛在此，與放失同。何者？同歸於無得也。故再放便奔逸不可收拾。君子之
-心，如習鷹馴雉，搏擊飛騰，主人略不防閑；及上臂歸庭，卻恁忘機自得，略不驚畏。
-
-　　學者只事事留心，一毫不肯苟且，德業之進也，如流水矣。
-
-　　不動氣，事事好。
-
-　　心放不放，要在邪正上說，不在出入上說。且如高臥山林遊心廊廟，身處衰世夢想
-唐虞，游子思親，貞婦懷夫，這是個放心否？若不論邪正，只較出入，卻是禪定之學。
-
-　　或問：「放心如何收？」余曰：「只君此問，便是收了。這放收甚容易，才昏昏便
-出去，才惺惺便在此。」
-
-　　常使精神在心目間，便有主而不眩。於客感之交，只一昏昏，便是胡亂應酬。豈無
-偶合？終非心上經歷過，竟無長進，譬之夢食，豈能飽哉？
-
-　　防欲如挽逆水之舟，才歇力便下流；力善如緣無枝之樹，才住腳便下墜。是以君子
-之心，無時而不敬畏也。
-
-　　一善念發，未說到擴充，且先執持住，此萬善之囮也。若隨來隨去，更不操存此心
-，如驛傳然，終身無主人住矣。
-
-　　千日集義，禁不得一刻不慊於心，是以君子瞬存息養，無一刻不在道義上。其防不
-義也，如千金之子之防盜，懼餒之故也。
-
-　　無屋漏工夫，做不得宇宙事業。
-
-　　君子口中無慣語，存心故也。故曰：「修辭立其誠。」不誠，何以修辭？
-
-　　一念收斂，則萬善來同；一念放恣，則百邪乘釁。
-
-　　得罪於法，尚可逃避；得罪於理，更沒處存身。只我底心，便放不過我。是故君子
-畏理甚於畏法。
-
-　　或問：「雞鳴而起，若未接物，如何為善？」程子曰：「只主於敬，便是善。」愚
-謂：惟聖人未接物時，何思何慮？賢人以下，睡覺時，合下便動個念頭，或昨日已行事
-，或今日當行事，便來心上。只看這念頭如何，如一念向好處想，便是舜邊人；若一念
-向不好處想，便是跖邊人。若念中是善，而本意卻有所為，這又是舜中跖，漸來漸去，
-還向跖邊去矣。此是務頭工夫。此時克己更覺容易，點檢更覺精明，所謂「去惡在纖微
-，持善在根本」也。
-
-　　目中有花，則視萬物皆妄見也；耳中有聲，則聽萬物皆妄聞也；心中有物，則處萬
-物皆妄意也。是故此心貴虛。
-
-　　忘是無心之病，助長是有心之病。心要從容自在，活潑於有無之間。
-
-　　靜之一字，十二時離不了，一刻才離，便亂了。門盡日開闔，樞常靜；妍媸盡日往
-來，鏡常靜；人盡日應酬，心常靜。惟靜也，故能張主得動，若逐動而去，應事定不分
-曉。便是睡時，此念不靜，作個夢兒也胡亂。
-
-
-　　把意念沉潛得下，何理不可得？把志氣奮發得起，何事不可做？今之學者，將個浮
-躁心觀理，將個委靡心臨事，只模糊過了一生。
-
-
-　　心平氣和，此四字非涵養不能做，工夫只在個定火。火定則百物兼照，萬事得理。
-水明而火昏，靜屬水，動屬火，故病人火動則躁擾狂越，及其蘇定，渾不能記。蘇定者
-，水澄清而火熄也。故人非火不生，非火不死；事非火不濟，非火不敗。惟君子善處火
-，故身安而德滋。
-
-　　當可怨可怒、可辯可訴、可喜可愕之際，其氣甚平，這是多大涵養。
-
-　　天地間真滋味，惟靜者能嘗得出；天地間真機括，惟靜者能看得透；天地間真情景
-，惟靜者能題得破。作熱鬧人，說孟浪語，豈無一得？皆偶合也。
-
-　　未有甘心快意而不殃身者。惟理義之悅我心，卻步步是安樂境。
-
-　　問：「慎獨如何解？」曰：「先要認住獨字，獨字就是意字。稠人廣坐、千軍萬馬
-中，都有個獨。只這意念發出來是大中至正底，這不勞慎就將這獨字做去，便是天德王
-道。這意念發出來，九分九釐是，只有一釐苟且為人之意，便要點檢克治，這便是慎獨
-了。」
-
-　　用三十年心力，除一個偽字不得。或曰：「君盡尚實矣。」余曰：「所謂偽者，豈
-必在言行間哉？實心為民，雜一念德我之心便是偽；實心為善，雜一念求知之心便是偽
-；道理上該做十分，只爭一毫未滿足便是偽；汲汲於向義，才有二三心便是偽；白晝所
-為皆善，而夢寐有非僻之干便是偽；心中有九分，外面做得恰象十分便是偽。此獨覺之
-偽也，余皆不能去，恐漸漬防閑，延惡於言行間耳。」
-
-　　自家好處掩藏幾分，這是涵蓄以養深；別人不好處要掩藏幾分，這是渾厚以養大。
-
-　　寧耐，是思事第一法；安詳，是處事第一法；謙退，是保身第一法；涵容，是處人
-第一法；置富貴、貧賤、死生、常變於度外，是養心第一法。
-
-　　胸中情景，要看得春不是繁華、夏不是發暢、秋不是寥落、冬不是枯槁，方為我境。
-
-　　大丈夫不怕人，只是怕理；不恃人，只是恃道。
-
-　　靜裡看物欲，如業鏡照妖。
-
-　　「躁心浮氣，淺衷狹量」，此八字，進德者之大忌也。去此八字，只用得一字，曰
-主靜。靜則凝重。靜中境自是寬闊。
-
-　　士君子要養心氣，心氣一衰，天下萬事分毫做不得。冉有只是個心氣不足。
-
-　　主靜之力，大於千牛，勇於十虎。
-
-　　君子洗得此心淨，則兩間不見一塵；充得此心盡，則兩間不見一礙；養得此心定，
-則兩間不見一怖；持得此心堅，則兩間不見一難。
-
-　　人只是心不放肆，便無過差；只是心不怠忽，便無遺忘。
-
-　　胸中只擺脫一「戀」字，便十分爽淨，十分自在。人生最苦處，只是此心沾泥帶水
-，明是知得，不能斷割耳。
-
-　　盜，只是欺人。此心有一毫欺人、一事欺人、一語欺人，人雖不知，即未發覺之盜
-也。言如是而行欺之，是行者言之盜也；心如是而口欺之，是口者心之盜也；才發一個
-真實心，驟發一個偽妄心，是心者心之盜也。諺云：「瞞心昧己。」有味哉其言之矣。
-欺世盜名，其過大；瞞心昧己，其過深。
-
-　　此心果有不可昧之真知，不可強之定見，雖斷舌可也，決不可從人然諾。
-
-　　才要說睡，便睡不著；才說要忘，便忘不得。
-
-　　舉世都是我心，去了這我心，便是四通八達，六合內無一些界限。要去我心，須要
-時時省察：這念頭是為天地萬物？是為我？
-
-　　目不容一塵，齒不容一芥，非我固有也。如何靈台內許多荊榛，卻自容得？
-
-　　手有手之道，足有足之道，耳目鼻口有耳目鼻口之道。但此輩皆是奴婢，都聽天君
-使令。使之以正也，順從，使之以邪也，順從。渠自沒罪過，若有罪過，都是天君承當。
-
-　　心一鬆散，萬事不可收拾；心一疏忽，萬事不入耳目；心一執著，萬事不得自然。
-
-　　當尊嚴之地、大眾之前、震怖之景，而心動氣懾，只是涵養不定。
-
-　　久視則熟字不識，注視則靜物若動，乃知蓄疑者，亂真知；過思者，迷正應。
-
-　　常使天君為主、萬感為客，便好。只與他平交，已自褻其居尊之體。若跟他走去走
-來，被他愚弄綴哄，這是小兒童，這是真奴婢，有甚面目來靈台上坐、役使四肢百骸？
-可羞可笑！示兒。
-
-　　不存心，看不出自家不是。只於動靜語默、接物應事時，件件想一想，便見渾身都
-是過失。須動合天則，然後為是。日用間，如何疏忽得一時？學者思之。
-
-　　人生在天地間，無日不動念，就有個動念底道理；無日不說話，就有個說話底道理
-；無日不處事，就有個處事底道理；無日不接人，就有個接人底道理；無日不理物，就
-有個理物底道理；以至怨怒笑歌、傷悲感歎、顧盼指示、咳唾涕洟、隱微委曲、造次顛
-沛、疾病危亡，莫不各有道理。只是時時體認，件件講求。細行小物尚求合則，彝倫大
-節豈可逾閑？故始自垂髫，終於屬纊，持一個自強不息之心，通乎晝夜，要之於純一不
-已之地，忘乎死生。此還本歸全之道，戴天履地之宜。不然，恣情縱意而各求遂其所欲
-，凡有知覺運動者皆然，無取於萬物之靈矣。或曰：「有要乎？」曰：「有。其要只在
-存心。」「心何以存？」曰：「只在主靜。只靜了，千酬萬應都在道理上，事事不錯。
-」
-
-　　迷人之迷，其覺也易；明人之迷，其覺也難。
-
-　　心相信，則跡者土苴也，何煩語言？相疑，則跡者媒孽也，益生猜貳。故有誓心不
-足自明，避嫌反成自誣者，相疑之故也。是故心一而跡萬，故君子治心不修跡。中孚，
-治心之至也，豚魚且信，何疑之有？
-
-　　君子畏天不畏人，畏名教不畏刑罰，畏不義不畏不利，畏徒生不畏捨生。
-
-　　「忍」「激」二字，是禍福關。
-
-　　殃咎之來，未有不始於快心者，故君子得意而憂，逢喜而懼。
-
-
-　　一念孳孳，惟善是圖，曰正思；一念孳孳，惟欲是願，曰邪思；非分之福，期望太
-高，曰越思；先事徘徊，後事懊恨，曰縈思；遊心千里，岐慮百端，曰浮思；事無可疑
-，當斷不斷，曰惑思；事不涉己，為他人憂，曰狂思；無可奈何，當罷不罷，曰徒思；
-日用職業，本分工夫，朝惟暮圖，期無曠廢，曰本思。此九思者，日用之間，不在此則
-在彼。善攝心者，其惟本思乎？身有定業，日有定務，暮則省白晝之所行，朝則計今日
-之所事，念茲在茲，不肯一事苟且，不肯一時放過，庶心有著落，不得他適，而德業日
-有長進矣。
-
-　　學者只多忻喜心，便不是凝道之器。
-
-　　小人亦有坦蕩蕩處，無忌憚是已；君子亦有常戚戚處，終身之憂是已。
-
-　　只脫盡輕薄心，便可達天德。漢唐以下儒者，脫盡此二字，不多人。
-
-　　斯道這個擔子，海內必有人負荷。有能概然自任者，願以綿弱筋骨助一肩之力，雖
-走僵死不恨。
-
-　　耳目之玩，偶當於心，得之則喜，失之則悲，此兒女子常態也。世間甚物與我相關
-，而以得喜、以失悲耶？聖人看得此身，亦不關悲喜，是吾道之一囊橐耳。愛囊橐之所
-受者，不以囊橐易所受，如之何以囊橐棄所受也？而況耳目之玩，又囊橐之外物乎？
-
-　　寐是情生景，無情而景者，兆也；寤後景生情，無景而情者，妄也。
-
-　　人情有當然之願，有過分之欲。聖王者，足其當然之願而裁其過分之欲，非以相苦
-也。天地間欲願只有此數，此有餘而彼不足，聖王調劑而均釐之，裁其過分者以益其當
-然。夫是之謂至平，而人無淫情、無觖望。
-
-　　惡惡太嚴，便是一惡；樂善甚亟，便是一善。
-
-　　「投佳果於便溺，濯而獻之，食乎？」曰：「不食。」「不見而食之，病乎？」曰
-：「不病。」「隔山而指罵之，聞乎？」曰：「不聞。」「對面而指罵之，怒乎？」曰
-：「怒。」曰：「此見聞障也。夫能使見而食，聞而不怒，雖入黑海、蹈白刃，可也！
-此煉心者之所當知也。」
-
-　　只有一毫麄疏處，便認理不真，所以說惟精，不然眾論淆之而必疑；只有一毫二三
-心，便守理不定，所以說惟一，不然利害臨之而必變。
-
-　　種豆，其苗必豆；種瓜，其苗必瓜，未有所存如是而所發不如是者。心本人欲而事
-欲天理，心本邪曲而言欲正直，其將能乎？是以君子慎其所存，所存是，種種皆是；所
-存非，種種皆非，未有分毫爽者。
-
-　　屬纊之時，般般都帶不得，惟是帶得此心。卻教壞了，是空身歸去矣，可為萬古一
-恨。
-
-　　吾輩所欠，只是涵養不純不定。故言則矢口所發，不當事，不循物，不宜人；事則
-恣意所行，或太過，或不及，或悖理。若涵養得定，如熟視正鵠而後開弓，矢矢中的；
-細量分寸而後投針，處處中穴，此是真正體驗，實用工夫，總來只是個沉靜。沉靜了，
-發出來，件件都是天則。
-
-　　定靜中境界，與六合一般大，裡面空空寂寂，無一個事物；才問他索時，般般足，
-樣樣有。
-
-　　暮夜無知，此四字，百惡之總根也。人之罪莫大於欺，欺者，利其無知也。大奸大
-盜，皆自無知之心充之。天下大惡只有二種：欺無知、不畏有知。欺無知，還是有所忌
-憚心，此是誠偽關；不畏有知，是個無所忌憚心，此是死生關。猶知有畏，良心尚未死
-也。
-
-　　天地萬物之理，出於靜，入於靜；人心之理，發於靜，歸於靜。靜者，萬理之橐籥
-，萬化之樞紐也。動中發出來，與天則便不相似。故雖暴肆之人，平旦皆有良心，發於
-靜也；過後皆有悔心，歸於靜也。
-
-　　動時只見發揮不盡，那裡覺錯？故君子主靜而慎動。主靜，則動者靜之枝葉也；慎
-動，則動者靜之約束也。又何過焉？
-
-　　童心最是作人一大病，只脫了童心，便是大人君子。或問之，曰：「凡炎熱念、驕
-矜念、華美念、欲速念、浮薄念、聲名念，皆童心也。」
-
-　　吾輩終日念頭離不了四個字，曰「得失毀譽」。其為善也，先動個得與譽底念頭；
-其不敢為惡也，先動個失與毀底念頭。總是欲心偽心，與聖人天地懸隔。聖人發出善念
-，如饑者之必食，渴者之必飲。其必不為不善，如烈火之不入，深淵之不投，任其自然
-而已。賢人念頭只認個可否，理所當為，則自強不息；所不可為，則堅忍不行。然則得
-失毀譽之念可盡去乎？曰：「胡可去也！」天地間，惟中人最多，此四字者，聖賢籍以
-訓世，君子藉以檢身。曰「作善降之百祥，作不善降之百殃」，以得失訓世也。曰「疾
-沒世而名不稱」、曰「年四十而見惡」，以毀譽訓世也。此聖人待衰世之心也。彼中人
-者，不畏此以檢身，將何所不至哉？故堯舜能去此四字，無為而善，忘得失毀譽之心也
-。桀紂能去此四字，敢於為惡，不得失毀譽之恤也。
-
-
-　　心要虛，無一點渣滓；心要實，無一毫欠缺。
-
-　　只一事不留心，便有一事不得其理；一物不留心，便有一物不得其所。
-
-　　只大公了，便是包涵天下氣象。
-
-　　士君子作人，事事時時只要個用心。一事不從心中出，便是亂舉動；一刻心不在腔
-子裡，便是空軀殼。
-
-　　古人也算一個人，我輩成底是甚麼人？若不愧不奮，便是無志。
-
-　　聖、狂之分，只在苟、不苟兩字。
-
-　　余甚愛萬籟無聲、蕭然一室之趣。或曰：「無乃太寂滅乎？」曰：「無邊風月自在
-。」
-
-　　無技癢心，是多大涵養！故程子見獵而癢。學者各有所癢，便當各就癢處搔之。
-
-　　欲，只是有進氣無退氣；理，只是有退氣無進氣。善學者，審於進退之間而已。
-
-　　聖人懸虛明以待天下之感，不先意以感天下之事。其感也，以我胸中道理順應之；
-其無感也，此心空空洞洞，寂然曠然。譬之鑑，光明在此，物來則照之，物去則光明自
-在。彼事未來而意必，是持鑑覓物也。嘗謂鏡是物之聖人，鏡日照萬物而常明，無心而
-不勞故也。聖人日應萬事而不累，有心而不役故也。夫惟為物役而後累心，而後應有偏
-著。
-
-　　恕心養到極處，只看得世間人都無罪過。
-
-　　物有以慢藏而失，亦有以謹藏而失者；禮有以疏忽而誤，亦有以敬畏而誤者。故用
-心在有無之間。
-
-　　說不得真知明見，一些涵養不到，發出來便是本象，倉卒之際，自然掩護不得。
-
-　　一友人沉雅從容，若溫而不理者。隨身急用之物，座客失備者三人，此友取之袖中
-，皆足以應之。或難以數物，呼左右取之攜中，黎然在也。余歎服曰：「君不窮於用哉
-！」曰：「我無以用為也。此第二著，偶備其萬一耳。備之心，慎之心也，慎在備先。
-凡所以需吾備者，吾已先圖，無賴於備。故自有備以來，吾無萬一，故備常餘而不用。
-」或曰：「是無用備矣。」曰：「無萬一而猶備，此吾之所以為慎也。若恃備而不慎，
-則備也者，長吾之怠者也，久之，必窮於所備之外；恃慎而不備，是慎也者，限吾之用
-者也，久之，必窮於所慎之外。故寧備而不用，不可用而無備。」余歎服曰：「此存心
-之至者也。《易》曰：『藉之用茅，又何咎焉？』其斯之謂與？」吾識之，以為疏忽者
-之戒。
-
-　　欲理會七尺，先理會方寸；欲理會六合，先理會一腔。
-
-　　靜者生門，躁者死戶。
-
-　　士君子一出口，無反悔之言；一動手，無更改之事。誠之於思，故也。
-
-　　只此一念公正了，我於天地鬼神通是一個，而鬼神之有邪氣者，且跧伏退避之不暇
-。庶民何私何怨，而忍枉其是非腹誹巷議者乎？
-
-　　和氣平心發出來，如春風拂弱柳，細雨潤新苗，何等舒泰！何等感通！疾風迅雷，
-暴雨酷霜，傷損必多。或曰：「不似無骨力乎？」余曰：「譬之玉，堅剛未嘗不堅剛，
-溫潤未嘗不溫潤。」余嚴毅多，和平少，近悟得此。
-
-　　儉則約，約則百善俱興；侈則肆，肆則百惡俱縱。
-
-　　天下國家之存亡、身之生死，只系「敬」「怠」兩字。敬則慎，慎則百務脩舉；怠
-則苟，苟則萬事隳頹。自天子以至於庶人，莫不如此。此千古聖賢之所兢兢，而世人之
-所必由也。
-
-　　每日點檢，要見這念頭自德性上發出，自氣質上發出，自習識上發出，自物欲上發
-出。如此省察，久久自識得本來面目。初學最要知此。
-
-　　道義心胸發出來，自無暴戾氣象，怒也怒得有禮。若說聖人不怒，聖人只是六情？
-
-　　過差遺忘，只是昏忽，昏忽，只是不敬。若小心慎密，自無過差遺忘之病。孔子曰
-：「敬事。」樊遲粗鄙，告之曰：「執事敬。」子張意廣，告之曰：「無小大，無敢慢
-。」今人只是懶散，過差遺忘，安得不多？
-
-　　吾初念只怕天知，久久來不怕天知，又久久來只求天知。但未到那何必天知地步耳
-。
-
-　　氣盛便沒涵養。
-
-　　定靜安慮，聖人胸中無一刻不如此。或曰：「喜怒哀樂到面前，何如？」曰：「只
-恁喜怒哀樂，定靜安慮，胸次無分毫加損。」
-
-　　憂世者與忘世者談，忘世者笑；忘世者與憂世者談，憂世者悲。嗟夫！六合骨肉之
-淚，肯向一室胡越之人哭哉？彼且謂我為病狂，而又安能自知其喪心哉？
-
-　　「得」之一字，最壞此心。不但鄙夫患得，年老戒得為不可。只明其道而計功，有
-事而正心，先事而動得心，先難而動獲心，便是雜霸雜夷。一念不極其純，萬善不造其
-極。此作聖者之大戒也。
-
-　　充一個公己公人心，便是胡越一家；任一個自私自利心，便中父子仇讎。天下興亡
-、國家治亂、萬姓死生，只爭這個些子。
-
-　　廁牏之中，可以迎賓客；牀第之間，可以交神明。必如此，而後謂之不苟。
-
-　　為人辨冤白謗，是第一天理。
-
-　　治心之學，莫妙於「瑟僩」二字。瑟訓嚴密，譬之重關天險，無隙可乘，此謂不疏
-，物欲自消其窺伺之心。僩訓武毅，譬之將軍按劍，見者股慄，此謂不弱，物欲自奪其
-猖獗之氣。而今吾輩靈台，四無牆戶，如露地錢財，有手皆取；又孱弱無能，如殺殘俘
-虜，落膽從人。物欲不須投間抵隙，都是他家產業；不須硬迫柔求，都是他家奴婢，更
-有那個關防？何人喘息？可哭可恨！
-
-　　沉靜，非緘默之謂也。意淵涵而態閑正，此謂真沉靜。雖終日言語，或千軍萬馬中
-相攻擊，或稠人廣眾中應繁劇，不害其為沉靜，神定故也。一有飛揚動擾之意，雖端坐
-終日，寂無一語，而色貌自浮。或意雖不飛揚動擾，而昏昏欲睡，皆不得謂沉靜。真沉
-靜底自是惺憽，包一段全副精神在裡。
-
-　　明者料人之所避，而狡者避人之所料，以此相與，是賊本真而長奸偽也。是以君子
-寧犯人之疑，而不賊己之心。
-
-　　室中之鬥，市上之爭，彼所據各有一方也。一方之見皆是己非人，而濟之以不相下
-之氣，故寧死而不平。嗚呼！此猶愚人也。賢臣之爭政，賢士之爭理，亦然。此言語之
-所以日多，而後來者益莫知所決擇也。故為下愚人作法吏易，為士君子所折衷難。非斷
-之難，而服之難也。根本處，在不見心而任口，恥屈人而好勝，是室人市兒之見也。
-
-　　大利不換小義，況以小利壞大義乎？貪者可以戒矣。
-
-　　殺身者不是刀劍，不是寇讐，乃是自家心殺了自家。
-
-　　知識，帝則之賊也。惟忘知識以任帝則，此謂天真，此謂自然。一著念便乖違，愈
-著念愈乖違。乍見之心歇息一刻，別是一個光景。
-
-　　為惡惟恐人知，為善惟恐人不知，這是一副甚心腸？安得長進？
-
-
-　　或問：「虛靈二字，如何分別？」曰：「惟虛故靈。頑金無聲，鑄為鐘磬則有聲；
-鐘磬有聲，實之以物則無聲。聖心無所不有，而一無所有，故『感而遂通天下之故』。
-」
-
-　　渾身五臟六腑、百脈千絡、耳目口鼻、四肢百骸、毛髮甲爪，以至衣裳冠履，都無
-分毫罪過，都與堯舜一般，只是一點方寸之心，千過萬罪，禽獸不如。千古聖賢只是治
-心，更不說別個。學者只是知得這個可恨，便有許大見識。
-
-　　人心是個猖狂自在之物、隕身敗家之賊，如何縱容得他？
-
-　　良知何處來？生於良心；良心何處來？生於天命。
-
-
-
-　　心要實，又要虛。無物之謂虛，無妄之謂實；惟虛故實，惟實故虛。心要小，又要
-大。大其心，能體天下之物；小其心，不僨天下之事。
-
-　　要補必須補個完，要拆必須拆個淨。
-
-　　學術以不愧於心、無惡於志為第一。也要點檢這心志，是天理？是人欲？便是天理
-，也要點檢是邊見？是天則？
-
-　　堯眉舜目、文王之身、仲尼之步，而盜跖其心，君子不貴也。有數聖賢之心，何妨
-貌似盜跖？
-
-　　學者欲在自家心上做工夫，只在人心做工夫。
-
-　　此心要常適，雖是憂勤惕勵中、困窮抑鬱際，也要有這般胸次。
-
-　　不怕來濃艷，只怕去沾戀。
-
-　　原不萌芽，說甚生機。
-
-　　平居時，有心訒言還容易，何也？有意收斂故耳。只是當喜怒愛憎時，發當其可、
-無一厭人語，才見涵養。
-
-　　口有慣言，身有誤動，皆不存心之故也。故君子未事前定，當事凝一。識所不逮，
-力所不能，雖過無愧心矣。
-
-　　世之人何嘗不用心？都只將此心錯用了。故學者要知所用心，用於正而不用於邪，
-用於要而不用於雜，用於大而不用於小。
-
-　　予嘗怒一卒，欲重治之。召之，久不至，減予怒之半。又久而後至，詬之而止。因
-自笑曰：「是怒也，始發而中節邪？中減而中節邪？終止而中節邪？」惟聖人之怒，初
-發時便恰好，終始只一個念頭不變。
-
-　　世間好底分數休佔多了，我這裡消受幾何，其餘分數任世間人佔去。
-
-　　京師僦宅，多擇吉數。有喪者，人多棄之曰：「能禍人。」予曰：「是人為室禍，
-非室能禍人也。人之死生，受於有生之初，豈室所能移？室不幸而遭當死之人，遂為人
-所棄耳。惟君子能自信而付死生於天則，不為往事所感矣。」
-
-　　不見可欲時，人人都是君子；一見可欲，不是滑了腳跟，便是擺動念頭。老子曰：
-「不見可欲，使心不亂。」此是閉目塞耳之學。一入耳目來，便了不得。今欲與諸君在
-可欲上做工夫，淫聲美色滿前，但如鑒照物，見在妍媸，不侵鏡光；過去妍媸，不留鏡
-裡，何嫌於坐懷？何事於閉門？推之可怖可驚、可怒可惑、可憂可恨之事，無不皆然。
-到此才是工夫，才見手段。把持則為賢者，兩忘則為聖人。予嘗有詩云：「百尺竿頭著
-腳，千層浪裡翻身。個中如履平地，此是誰何道人。」
-
-
-　　一里人事專利己，屢為訓說不從。後每每作善事，好施貧救難，予喜之，稱曰：「
-君近日作事，每每在天理上留心，何所感悟而然？」曰：「近日讀司馬溫公語，有云：
-『不如積陰德於冥冥之中，以為子孫長久之計。』」予笑曰：「君依舊是利心，子孫安
-得受福？」
-
-　　小人終日苦心，無甚受用處。即欲趨利，又欲貪名；即欲掩惡，又欲詐善。虛文浮
-禮，惟恐其疏略；消沮閉藏，惟恐其敗露。又患得患失，只是求富求貴；畏首畏尾，只
-是怕事怕人。要之溫飽之外，也只與人一般，何苦自令天君無一息寧泰處？
-
-　　滿面目都是富貴，此是市井小兒，不堪入有道門墻，徒令人嘔吐而為之羞耳。若見
-得大時，舜禹有天下而不與。
-
-　　讀書人只是個氣高，欲人尊己；志卑，欲人利己，便是至愚極陋。只看四書六經千
-言萬語教人是如此不是？士之所以可尊可貴者，以有道也。這般見識，有什麼可尊貴處
-？小子戒之。
-
-　　第一受用，胸中乾淨；第二受用，外來不動；第三受用，合家沒病；第四受用，與
-物無競。
-
-　　欣喜歡愛處，便藏煩惱機關，乃知雅淡者，百祥之本；怠惰放肆時，都是私欲世界
-，始信懶散者，萬惡之宗。
-
-　　求道學真傳，且高閣百氏諸儒，先看孔孟以前胸次；問治平要旨，只遠宗三皇五帝
-，淨洗漢唐而下心腸。
-
-　　看得真幻景，即身不吾有何傷？況把世情嬰肺腑；信得過此心，雖天莫我知奚病？
-那教流語惱胸腸。
-
-　　善根中才發萌蘗，即著意栽培，須教千枝萬葉；惡源處略有涓流，便極力壅塞，莫
-令暗長潛滋。
-
-　　處世莫驚毀譽，只我是，無我非，任人短長；立身休問吉凶，但為善，不為惡，憑
-天禍福。
-
-　　念念可與天知，盡其在我；事事不執己見，樂取諸人。
-
-　　淺狹一心，到處便招尤悔；因循兩字，從來誤盡英雄。
-
-　　齋戒神明其德，洗心退藏於密。
-
-　　常將半夜縈千歲，只恐一朝便百年。
-
-　　試心石上即平地，沒足池中有隱潭。
-
-　　心無一事累，物有十分春。
-
-　　神明七尺體，天地一腔心。
-
-　　終有歸來日，不知到幾時。
-
-　　吾心原止水，世態任浮雲。
-
-
-倫理
-
-
-　　宇宙內大情種，男女居其第一。聖王不欲裁割而矯拂之，亦不能裁割矯拂也。故通
-之以不可已之情，約之以不可犯之禮，繩之以必不赦之法，使縱之而相安相久也。聖人
-亦不若是之亟也，故五倫中父子、君臣、兄弟、朋友，篤了又篤，厚了又厚，惟恐情意
-之薄。惟男女一倫，是聖人苦心處，故有別先自夫婦始。本與之以無別也，而又教之以
-有別，況有別者而肯使之混乎？聖人之用意深矣！是死生之衢而大亂之首也，不可以不
-慎也。
-
-　　親母之愛子也，無心於用愛，亦不知其為用愛，若渴飲饑食然，何嘗勉強？子之得
-愛於親母也，若謂應得，習於自然，如夏葛冬裘然，何嘗歸功？至於繼母之慈，則有德
-色，有矜語矣。前子之得慈於繼母，則有感心，有頌聲矣。
-
-　　一家之中，要看得尊長尊，則家治。若看得尊長不尊，如何齊他？得其要在尊長自
-脩。
-
-　　人子之事親也，事心為上，事身次之；最下，事身而不恤其心；又其下，事之以文
-而不恤其身。
-
-　　孝子之事親也，禮卑伏如下僕，情柔婉如小兒。
-
-　　進食於親，侑而不勸；進言於親，論而不諫；進侍於親，和而不莊。親有疾，憂而
-不悲；身有疾，形而不聲。
-
-　　侍疾，憂而不食，不如努力而加餐。使此身不能侍疾，不孝之大者也；居喪，羸而
-廢禮，不如節哀而慎終，此身不能襄事，不孝之大者也。
-
-　　朝廷之上，紀綱定而臣民可守，是曰朝常；公卿大夫、百司庶官，各有定法，可使
-持循，是曰官常；一門之內，父子兄弟、長幼尊卑，各有條理，不變不亂，是曰家常；
-飲食起居、動靜語默，擇其中正者守而勿失，是曰身常。得其常則治，失其常則亂，未
-有苟且冥行而不取敗者也。
-
-　　雨澤過潤，萬物之災也；恩寵過禮，臣妾之災也；情愛過義，子孫之災也。
-
-　　人心喜則志意暢達，飲食多進而不傷，血氣沖和而不鬱，自然無病而體充身健，安
-得不壽？故孝子之於親也，終日乾乾，惟恐有一毫不快事到父母心頭。自家既不惹起，
-外觸又極防閒，無論貧富貴賤、常變順逆，只是以悅親為主。蓋悅之一字，乃事親第一
-傳心口訣也。即不幸而親有過，亦須在悅字上用工夫。幾諫積誠，耐煩留意，委曲方略
-，自有回天妙用。若直諍以甚其過，暴棄以增其怒，不悅莫大焉。故曰：「不順乎親，
-不可以為子。」
-
-　　郊社，報天地生成之大德也，然災沴有禳，順成有祈，君為私田則仁，民為公田則
-忠，不嫌於求福，不嫌於免禍。子孫之祭先祖，以追養繼孝也，自我祖父母以有此身也
-，曰：「賴先人之澤，以享其餘慶也。」曰：「吾朝夕奉養承歡，而一旦不復獻杯棬，
-心悲思而無寄，故祭薦以伸吾情也。」曰：「吾貧賤不足以供菽水，今鼎食而親不逮，
-心悲思而莫及，故祭薦以志吾悔也。」豈為其遊魂虛位能福我而求之哉？求福已非君子
-之心，而以一飯之設，數拜之勤，求福於先人，仁孝誠敬之心果如是乎？不謀利，不責
-報，不望其感激，雖在他人猶然，而況我先人乎？《詩》之祭必言福，而《楚茨》諸詩
-為尤甚，豈可為訓耶？吾獨有取於《采蘩》、《采蘋》二詩，盡物盡志，以達吾子孫之
-誠敬而已，他不及也。明乎此道，則天下萬事萬物皆盡我所當為，禍福利害皆聽其自至
-，人事脩而外慕之心息，向道專而作輟之念忘矣。何者？明於性分而無所冀悻也。
-
-　　友道極關係，故與君父並列而為五。人生德業成就，少朋友不得。君以法行，治我
-者也。父以恩行，不責善者也。兄弟怡怡，不欲以切偲傷愛。婦人主內事，不得相追隨
-。規過，子雖敢爭，終有可避之嫌。至於對嚴師，則矜持收斂而過無可見。在家庭，則
-狎昵親習而正言不入。惟夫朋友者，朝夕相與，既不若師之進見有時，情禮無嫌，又不
-若父子兄弟之言語有忌。一德虧，則友責之；一業廢，則友責之。美則相與獎勸，非則
-相與匡救，日更月變，互感交摩，駸駸然不覺其勞且難，而入於君子之域矣。是朋友者
-，四倫之所賴也。嗟夫！斯道之亡久矣。言語嬉媟，樽俎嫗煦，無論事之善惡，以順我
-者為厚交；無論人之奸賢，以敬我者為君子。躡足附耳，自謂知心；接膝拍肩，濫許刎
-頸。大家同陷於小人而不知，可哀也已！是故物相反者相成，見相左者相益。孔子取友
-，曰「直」、「諒」、「多聞」，此三友者，皆與我不相附會者也，故曰益。是故，得
-三友難，能為人三友更難。天地間，不論天南地北、縉紳草莽，得一好友，道同志合，
-亦人生一大快也。
-
-　　長者有議論，唯唯而聽，無相直也；有諮詢，謇謇而對，無遽盡也。此卑幼之道也。
-
-　　陽稱其善以悅彼之心，陰養其惡以快己之意，此友道之大戮也。青天白日之下，有
-此魑魅魍魎之俗，可哀也已！
-
-　　古稱「君門遠於萬里」，謂情隔也。豈惟君門？父子殊心，一堂遠於萬里；兄弟離
-情，一門遠於萬里；夫妻反目，一榻遠於萬里。苟情聯志通，則萬里之外，猶同堂共門
-而比肩一榻也。以此推之，同時不相知，而神交於千百世之上下亦然。是知離合在心期
-，不專在躬逢。躬逢而心期，則天下至遇也：君臣之堯、舜，父子之文、周，師弟之孔
-、顏。
-
-　　「隔」之一字，人情之大患。故君臣、父子、夫婦、朋友、上下之交，務去隔，此
-字不去而不怨叛者，未之有也。
-
-　　仁者之家：父子愉愉如也，夫婦雝雝如也，兄弟怡怡如也，僮僕訢訢如也，一家之
-氣象融融如也。義者之家：父子凜凜如也，夫婦嗃嗃如也，兄弟翼翼如也，僮僕肅肅如
-也，一家之氣象慄慄如也。仁者以恩勝，其流也知和而和；義者以嚴勝，其流也疏而寡
-恩。故聖人之居家也，仁以主之，義以輔之，洽其太和之情，但不潰其防，斯已矣。其
-井井然嚴城深塹，則男女之辨也！雖聖人不敢與家人相忘。
-
-　　父在居母喪，母在居父喪，以從生者之命為重。故孝子不以死者憂生者，不以小節
-傷大體，不泥經而廢權，不徇名而害實，不全我而傷親。所貴乎孝子者，心親之心而已。
-
-　　天下不可一日無君，故夷、齊非湯、武，明臣道也。此天下之大妨也！不然，則亂
-臣賊子接踵矣，而難為君。天下不可一日無民，故孔、孟是湯、武，明君道也。此天下
-之大懼也！不然，則暴君亂主接踵矣，而難為民。
-
-　　爵祿恩寵，聖人未嘗不以為榮，聖人非以此為加損也。朝廷重之以示勸，而我輕之
-以示高，是與君忤也，是窮君鼓舞天下之權也。故聖人雖不以爵祿恩寵為榮，而未嘗不
-榮之，以重帝王之權，以示天下帝王之權之可重，此臣道也。
-
-　　人子和氣、愉色、婉容，發得深時，養得定時，任父母冷面寒鐵，雷霆震怒，只是
-這一腔溫意、一面春風，則自無不回之天，自無屢變之天，讒譖何由入？嫌隙何由作？
-其次莫如敬慎，夔夔齋栗，敬慎之至也，故瞽瞍亦允若。溫和示人以可愛，消融父母之
-惡怒；敬慎示人以可矜，激發父母之悲憐。所謂積誠意以感動之者，養和致敬之謂也。
-蓋格親之功，惟和為妙、為深、為速、為難，非至性純孝者不能。敬慎猶可勉強耳。而
-今人子以涼薄之色、惰慢之身、驕蹇之性，及犯父母之怒，既不肯挽回，又倨傲以甚之
-，此其人在孝弟之外，故不足論。即有平日溫愉之子，當父母不悅而亦慍見，或生疑而
-遷怒者；或無意遷怒而不避嫌者；或不善避嫌愈避而愈冒嫌者，積隙成釁，遂致不祥。
-豈父母之不慈？此孤臣孽子之法戒，堅志熟仁之妙道也。
-
-
-　　孝子之事親也，上焉者先意，其次承志，其次共命。共命，則親有未言之志，不得
-承也；承志，則親有未萌之意，不得將也；至於先意，而悅親之道至矣。或曰：「安得
-許多心思能推至此乎？」曰：「事親者，以悅親為事者也。以悅親為事，則孳孳皇皇無
-以尚之者，只是這個念頭，親有多少意志，終日體認不得？」
-
-　　或問：「共事一人，未有不妒者，何也？」曰：「人之才能、性行、容貌、辭色，
-種種不同，所事者必悅其能事我者，惡其不能事我者。能事者見悅，則不能事者必疏。
-是我之見疏，彼之能事成之也，焉得不妒？既妒，安得不相傾？相傾，安得不受禍？故
-見疏者妒，妒其形己也；見悅者亦妒，妒其妒己也。」「然則奈何？」曰：「居寵，則
-思分而推之以均眾；居尊，則思和而下之以相忘，人何妒之有？緣分以安心，緣遇以安
-命，反己而不尤人，何妒人之有？此入宮入朝者之所當知也。」
-
-　　孝子侍親，不可有沉靜態，不可有莊肅態，不可有枯淡態，不可有豪雄態，不可有
-勞倦態，不可有病疾態，不可有愁苦態，不可有怨怒態。
-
-　　子弟生富貴家，十九多驕惰淫泆，大不長進。古人謂之豢養，言甘食美服養此血肉
-之軀，與犬豕等。此輩闒茸，士君子見之為羞，而彼方且志得意滿，以此誇人。父兄之
-孽，莫大乎是！
-
-
-　　男女遠別，雖父女、母子、兄妹、姊弟，亦有別嫌明微之禮，故男女八歲不同食。
-子婦事舅姑，禮也，本不遠別，而世俗最嚴翁婦之禮，影響間，即疾趨而藏匿之；其次
-夫兄弟婦相避。此外，一無所避，已亂綱常。乃至叔嫂、姊夫、妻妹、妻弟之妻互相嘲
-謔以為常，不幾於夷風乎？不知，古者遠別，止於授受不親，非避匿之謂。而男女所包
-甚廣，自妻妾外，皆當遠授受之嫌。愛禮者，不可不明辨也！
-
-　　子、婦事人者也，未為父兄以前，莫令奴婢奉事，長其驕惰之情。當日使勤勞，常
-令卑屈，此終身之福。不然，是殺之也。昏愚父母、驕奢子弟，不可不知。
-
-　　問安，問侍者不問病者，問病者，非所以安之也。
-
-　　喪服之制，以緣人情，亦以立世教。故有引而致之者，有推而遠之者，要不出恩、
-義兩字，而不可曉亦多。達觀會通之君子，當制作之權，必有一番見識。泥古，非達觀
-也。
-
-　　親沒而遺物在眼，與其不忍見而毀之也，不若不忍忘而存之。
-
-　　示兒云：「門戶高一尺，氣燄低一丈。華山只讓天，不怕沒人上。」
-
-　　慎言之地，惟家庭為要；應慎言之人，惟妻子、僕隸為要。此理亂之原而禍福之本
-也。人往往忽之，悲夫！
-
-　　門戶可以托父兄，而喪德辱名非父兄所能庇；生育可以由父母，而求疾蹈險非父母
-所得由。為人子弟者，不可不知。
-
-　　繼母之虐，嫡妻之妒，古今以為恨者也；而前子不孝，丈夫不端，則捨然不問焉。
-世情之偏也，久矣！懷非母之跡而因似生嫌，借恃父之名而無端造謗，怨讟忤逆，父亦
-被誣者，世豈無耶？恣淫狎之性而恩重綠絲，挾城社之威而侮及黃裡，《谷風》、《栢
-舟》，妻亦失所者，世豈無耶？惟子孝夫端，然後繼母嫡妻無辭於姻族矣！居官不可不
-知。
-
-
-　　齊以刀切物，使參差者就於一致也。家人恩勝之地，情多而義少，私易而公難，若
-人人遂其欲，勢將無極。故古人以父母為嚴君，而家法要威如，蓋對症之治也。
-
-　　閨門之中少了個禮字，便自天翻地覆。百禍千殃，身亡家破，皆從此起。
-
-　　家長，一家之君也。上焉者使人歡愛而敬重之，次則使人有所嚴憚，故曰嚴君。下
-則使人慢，下則使人陵，最下則使人恨。使人慢，未有不亂者；使人陵，未有不敗者；
-使人恨，未有不亡者。嗚呼！齊家豈小故哉？今之人皆以治生為急，而齊家之道不講久
-矣！
-
-　　兒女輩，常著他拳拳曲曲，緊緊恰恰，動必有畏，言必有驚，到自專時，尚不可知
-。若使之快意適情，是殺之也。此愚父母之所當知也。
-
-　　責人到閉口捲舌、面赤背汗時，猶刺刺不已，豈不快心？然淺隘刻薄甚矣！故君子
-攻人，不盡其過，須含蓄以餘人之愧懼，令其自新，方有趣味，是謂以善養人。
-
-　　曲木惡繩，頑石惡攻，責善之言，不可不慎也。
-
-　　恩禮出於人情之自然，不可強致。然禮係體面，猶可責人；恩出於根心，反以責而
-失之矣。故恩薄可結之使厚，恩離可結之使固，一相責望，為怨滋深。古父子、兄弟、
-夫婦之間，使骨肉為寇讐，皆坐責之一字耳。
-
-　　宋儒云：「宗法明而家道正。」豈惟家道？將天下之治亂，恒必由之。宇宙內，無
-有一物不相貫屬、不相統攝者。人以一身統四肢，一肢統五指。木以株統榦，以榦統枝
-，以枝統葉。百穀以莖統穗，以穗統，以統粒。蓋同根一脈，聯屬成體。此操一舉萬之
-術而治天下之要道也。天子統六卿，六卿統九牧，九牧統郡邑，郡邑統鄉正，鄉正統宗
-子。事則以次責成，恩則以次流布，教則以次傳宣，法則以次繩督，夫然後上不勞下不
-亂而政易行。自宗法廢而人各為身，家各為政，彼此如飄絮飛沙，不相維繫，是以上勞
-而無要領可持，下散而無脈胳相貫，奸盜易生而難知，教化易格而難達。故宗法立而百
-善興，宗法廢而萬事弛。或曰：「宗子而賤、而弱、而幼、而不肖，何以統宗？」曰：
-「古之宗法也，如封建，世世以嫡長。嫡長不得其人，則一宗受其敝，且豪強得以䐁鼠視
-宗子，而魚肉孤弱。其誰制之？蓋有宗子又當立家長，宗子以世世長子孫為之；家長以
-闔族之有德望而眾所推服能佐宗子者為之，胥重其權而互救其失。此二者，宗人一委聽
-焉，則有司有所責成，而紀法易於修舉矣。」
-
-　　責善之道，不使其有我所無，不使其無我所有，此古人之所以貴友也。
-
-　　「母氏聖善，我無令人」，孝子不可不知。「臣罪當誅兮，天王聖明」，忠臣不可
-不知。
-
-　　士大夫以上，有祠堂、有正寢、有客位。祠堂，有齋房、神庫，四世之祖考居焉，
-先世之遺物藏焉，子孫立拜之位在焉，犧牲、鼎俎、盥尊之器物陳焉，堂上堂下之樂列
-焉，主人之周旋升降由焉。正寢，吉禮則生忌之考妣遷焉，凶禮則屍柩停焉，柩前之食
-案、香几、衣冠設焉，朝夕哭奠之位容焉，柩旁牀帳諸器之陳設、五服之喪次，男女之
-哭位分焉，堂外弔奠之客、祭器之羅列在焉。客位，則將葬之遷柩宿焉，冠禮之曲折、
-男女之醮位、賓客之宴饗行焉。此三所者，皆有兩階，皆有位次。故居室寧陋，而四禮
-之所斷乎其不可陋。近見名公，有以旋馬容膝、繩樞甕牖為清節高品者，余甚慕之，而
-愛禮一念甚於愛名。故力可勉為，不嫌弘裕，敢為大夫以上者告焉。
-
-　　守禮不足愧，抗於禮乃可愧也。禮當下則下，何愧之有？
-
-
-　　家人之害莫大於卑幼各恣其無厭之情而上之人阿其意而不之禁，猶莫大於婢子造言
-而婦人悅之，婦人附會而丈夫信之。禁此二害而家不和睦者鮮矣。
-
-　　只拿定一個是字做，便是「建諸天地而不悖，質諸鬼神而無疑」底道理，更問甚占
-卜，信甚星命！或曰：「趨吉避凶，保身之道。」曰：「君父在難，正臣子死忠死孝之
-時，而趨吉避凶可乎？」或曰：「智者明義理、識時勢，君無乃專明於義理乎？」曰：
-「有可奈何時，正須審時因勢，時勢亦求之識見中，豈於讖緯陰陽家求之邪？」或曰：
-「氣數自然，亦強作不成。」曰：「君子所安者義命，故以氣數從義理，不以義理從氣
-數。富貴利達則付之天，進退行藏則決之己。」或曰：「到無奈何時何如？」曰：「這
-也看道理，病在膏肓，望之而走，扁鵲之道當如是也。若屬纊頃刻，萬無一生，偶得良
-方，猶然忙走灌藥，孝子慈孫之道當如是也。」
-
-　　謹言不但外面，雖家庭間，沒個該說的話；不但大賓，雖親厚友，沒個該任口底話。
-
-
-
-
-
-
-談道
-
-
-　　大道有一條正路，進道有一定等級。聖人教人只示以一定之成法，在人自理會；理
-會得一步，再說與一步，其第一步不理會到十分，也不說與第二步。非是苦人，等級原
-是如此。第一步差一寸，也到第二步不得。孔子於賜，才說與他「一貫」，又先難他「
-多學而識」一語。至於仁者之事，又說：「賜也，非爾所及。」今人開口便講學脈，便
-說本體，以此接引後學，何似癡人前說夢？孔門無此教法。
-
-　　有處常之五常，有處變之五常。處常之五常是經，人所共知；處變之五常是權，非
-識道者不能知也。「不擒二毛」不以仁稱，而血流漂杵不害其為仁；「二子乘舟」不以
-義稱，而管、霍被戮不害其為義。由此推之，不可勝數也。嗟夫！世無有識者，每泥於
-常而不通其變；世無識有識者，每責其經而不諒其權。此兩人皆道之賊也，事之所以難
-濟也。噫！非精義擇中之君子，其誰能用之？其誰能識之？
-
-　　談道者雖極精切，須向苦心人說，可使手舞足蹈，可使大叫垂泣。何者？以求通未
-得之心，聞了然透徹之語，如饑得珍饈，如旱得霖雨。相悅以解，妙不容言。其不然者
-，如麻木之肌，針灸終日尚不能覺，而以爪搔之，安知痛癢哉？吾竊為言者惜也。故大
-道獨契，至理不言，非聖賢之忍於棄人，徒嘵嘵無益耳。是以聖人待問而後言，猶因人
-而就事。
-
-　　廟堂之樂，淡之至也，淡則無欲，無欲之道與神明通；素之至也，素則無文，無文
-之妙與本始通。
-
-　　真器不修，修者偽物也；真情不飾，飾者偽交也。家人父子之間不讓而登堂，非簡
-也；不侑而飽食，非饕也，所謂真也。惟待讓而入，而後有讓亦不入者矣；惟待侑而飽
-，而後有侑亦不飽者矣，是兩修文也。廢文不可為禮，文至掩真，禮之賊也，君子不尚
-焉。
-
-　　百姓得所，是人君太平；君民安業，是人臣太平；五穀豐登，是百姓太平；大小和
-順，是一家太平；父母無疾，是人子太平；胸中無累，是一腔太平。
-
-　　至道之妙，不可意思，如何可言？可以言，皆道之淺也。玄之又玄，猶龍公亦說不
-破，蓋公亦囿於玄玄之中耳。要說，說個甚然？卻只在匹夫匹婦共知共行之中，外了這
-個，便是虛無。
-
-　　除了個中字，更定道統不得。傍流之至聖，不如正路之賢人，故道統寧中絕，不以
-傍流繼嗣。何者？氣脈不同也。予嘗曰：「寧為道統家奴婢，不為傍流家宗子。」
-
-　　或問：「聖人有可克之己否？」曰：「惟堯、舜、文王、周、孔無己可克，其餘聖
-人都有。己任是伊尹底，己和是柳下惠底，己清是伯夷底，己志向偏於那一邊便是己。
-己者，我也，不能忘我而任意見也，狃於氣質之偏而離中也。這己便是人欲，勝不得這
-己，都不成個剛者。
-
-　　自然者，發之不可遏，禁之不能止，才說是當然，便沒氣力。然反之之聖，都在當
-然上做工夫，所以說勉然。勉然做到底，知之成功，雖一分數境界，到那難題試驗處，
-終是微有不同，此難以形跡語也。
-
-　　堯、舜、周、孔之道，只是傍人情、依物理，拈出個天然自有之中行將去，不驚人
-，不苦人，所以難及。後來人勝他不得，卻尋出甚高難行之事，玄冥隱僻之言，怪異新
-奇、偏曲幻妄以求勝，不知聖人妙處只是個庸常。看《六經》、《四書》語言何等平易
-，不害其為聖人之筆，亦未嘗有不明不備之道。嗟夫！賢智者過之，佛、老、楊、墨、
-莊、列、申、韓是已。彼其意見，才是聖人中萬分之一，而漫衍閎肆以至偏重而賊道，
-後學無識，遂至棄菽粟而餐玉屑、厭布帛而慕火浣，無補饑寒，反生奇病。悲夫！
-
-　　「中」之一字，是無天於上，無地於下，無東西南北於四方。此是南面獨尊道中底
-天子，仁義禮智信都是東西侍立，百行萬善都是北面受成者也。不意宇宙間有此一妙字
-，有了這一個，別個都可勾銷，五常、百行、萬善但少了這個，都是一家貨，更成甚麼
-道理？
-
-　　愚不肖者不能任道，亦不能賊道，賊道全是賢智。後世無識之人不察道之本然面目
-，示天下以大中至正之矩，而但以賢智者為標的。世間有了賢智，便看底中道尋常，無
-以過人，不起名譽，遂薄中道而不為。道之壞也，不獨賢智者之罪，而惟崇賢智，其罪
-亦不小矣。《中庸》為賢智而作也，中足矣，又下個庸字，旨深哉！此難與曲局之士道。
-
-
-　　道者，天下古今共公之理，人人都有分底。道不自私，聖人不私道，而儒者每私之
-曰「聖人之道」，言必循經，事必稽古，曰「衛道」。嗟夫！此千古之大防也，誰敢決
-之？然道無津涯，非聖人之言所能限；事有時勢，非聖人之制所能盡。後世苟有明者出
-，發聖人所未發而默契聖人欲言之心，為聖人所未為而吻合聖人必為之事，此固聖人之
-深幸而拘儒之所大駭也。嗚呼！此可與通者道，漢唐以來鮮若人矣。
-
-　　《易》道，渾身都是，滿眼都是，盈六合都是。三百八四十爻，聖人特拈起三百八
-十四事來做題目，使千聖作《易》，人人另有三百八十四說，都外不了那陰陽道理。後
-之學者求易於《易》，穿鑿附會以求通，不知易是個活底，學者看做死底；易是個無方
-體底，學者看做有定象底。故論簡要，乾坤二卦已多了；論窮盡，雖萬卷書說不盡《易
-》的道理，何止三百八十四爻？
-
-　　「中」之一字，不但道理當然，雖氣數離了中，亦成不得寒暑；災祥失中，則萬物
-殃；飲食起居失中，則一身病。故四時各順其序，五臟各得其職，此之謂中。差分毫便
-有分毫驗應，是以聖人執中以立天地萬物之極。
-
-　　學者只看得世上萬事萬物種種是道，此心才覺暢然。
-
-　　在舉世塵俗中，另識一種意味，又不輕與鮮能知味者嘗，才是真趣。守此便是至寶。
-
-　　五色勝則相掩，然必厚益之，猶不能渾然無跡，惟黑一染不可辨矣。故黑者，萬事
-之府也，斂藏之道也。帝王之道黑，故能容保無疆；聖人之心黑，故能容會萬理。蓋含
-英采、韜精明、養元氣、蓄天機，皆黑之道也，故曰「惟玄催默」。玄，黑色也；默，
-黑象也。《書》稱舜曰「玄德升聞」，《老子》曰「知其白，守其黑」，得黑之精者也
-。故外著而不可掩，皆道之淺者也。雖然，儒道內黑而外白，黑為體，白為用；老氏內
-白而外黑，白安身，黑善世。
-
-　　道在天地間，不限於取數之多，心力勤者得多，心力衰者得少，昏弱者一無所得。
-假使天下皆聖人，道亦足以供其求；苟皆為盜跖，道之本體自在也，分毫無損。畢竟是
-世有聖人，道斯有主；道附聖人，道斯有用。
-
-　　漢唐而下，議論駁而至理雜，吾師宋儒。宋儒求以明道而多穿鑿附會之談，失平正
-通達之旨，吾師先聖之言。先聖之言煨於秦火、雜於百家，莠苗朱紫，使後學尊信之而
-不敢異同，吾師道。苟協諸道而協，則千聖萬世無不吻合，何則？道無二也。
-
-　　或問：「中之道，堯舜傳心，必有至玄至妙之理？」余歎曰：「只就我兩人眼前說
-這飲酒，不為限量，不至過醉，這就是飲酒之中；這說話，不緘默，不狂誕，這就是說
-話之中；這作揖跪拜，不煩不疏，不疾不徐，這就是作揖跪拜之中。一事得中，就是一
-事底堯舜，推之萬事皆然。又到那安行處，便是十全底堯舜。」
-
-　　形神一息不相離，道器一息不相無，故道無精粗，言精粗者，妄也。因與一客共酌
-，指案上羅列者謂之曰：「這安排必有停妥處，是天然自有底道理；那僮僕見一豆上案
-，將滿案樽俎東移西動，莫知措手，那知底入眼便有定位，未來便有安排。新者近前，
-舊者退後，飲食居左，匙箸居右，重積不相掩，參錯不相亂，佈置得宜，楚楚齊齊，這
-個是粗底。若說神化性命不在此，卻在何處？若說這裡有神化性命，這個工夫還欠缺否
-？推之耕耘簸揚之夫、炊爨烹調之婦，莫不有神化性命之理，都能到神化性命之極。學
-者把神化性命看得太玄，把日用事物看得太粗，原不曾理會。理會得來，這案上羅列得
-，天下古今萬事萬物都在這裡，橫豎推行、撲頭蓋面、腳踏身坐底都是神化性命，乃知
-神化性命極粗淺底。」
-
-　　有大一貫，有小一貫。小一貫，貫萬殊；大一貫，貫小一貫。大一貫一，小一貫千
-百。無大一貫，則小一貫終是零星；無小一貫，則大一貫終是渾沌。
-
-　　靜中看天地萬物都無些子。
-
-　　一門人向予數四窮問無極、太極及理氣同異、性命精粗、性善是否。予曰：「此等
-語，予亦能剿先儒之成說及一己之謬見以相發明，然非汝今日急務。假若了悟性命，洞
-達天人，也只於性理書上添了『某氏曰』一段言語，講學衙門中多了一宗卷案。後世窮
-理之人，信彼駁此，服此辟彼，百世後汗牛充棟，都是這樁話說，不知於國家之存亡、
-萬姓之生死、身心之邪正，見在得濟否？我只有個粗法子，汝只把存心制行、處事接物
-、齊家治國平天下，大本小節都事事心下信得過了，再講這話不遲。」曰：「理氣、性
-命，終身不可談耶？」曰：「這便是理氣、性命顯設處，除了撒數沒總數。」
-
-　　陽為客，陰為主；動為客，靜為主；有為客，無為主；萬為客，一為主。
-
-　　理路直截，欲路多岐；理路光明，欲路微曖；理路爽暢，欲路懊煩；理路逸樂，欲
-路憂勞。
-
-　　無萬，則一何處著落？無一，則萬誰為張主？此二字一時離不得。一只在萬中走，
-故有正一，無邪萬；有治一，無亂萬；有中一，無偏萬；有活一，無死萬。
-
-　　天下之大防五，不可一毫潰也，一潰則決裂不可收拾。宇內之大防，上下名分是已
-；境外之大防，夷夏出入是已；一家之大防，男女嫌微是已；一身之大防，理欲消長是
-已；萬世之大防，道脈純雜是已。
-
-　　儒者之末流與異端之末流何異？似不可以相誚也。故明於醫，可以攻病人之標本；
-精於儒，可以中邪說之膏盲。闢邪不得其情，則邪愈肆；攻病不對其症，則病癒劇。何
-者？授之以話柄而借之以反攻，自救之策也。
-
-　　人皆知異端之害道，而不知儒者之言亦害道也。見理不明，似是而非，或騁浮詞以
-亂真，或執偏見以奪正，或狃目前而昧萬世之常經，或徇小道而潰天下之大防，而其聞
-望又足以行其學術，為天下後世人心害，良亦不細。是故，有異端之異端，有吾儒之異
-端。異端之異端，真非也，其害小；吾儒之異端似是也，其害大。有衛道之心者，如之
-何而不辨哉？
-
-　　天下事皆實理所為，未有無實理而有事物者也。幻家者流，無實用而以形惑人，嗚
-呼！不窺其實而眩於形以求理，愚矣。
-
-　　公卿爭議於朝，曰天子有命，則屏然不敢屈直矣；師儒相辯於學，曰孔於有言，則
-寂然不敢異同矣。故天地間，惟理與勢為最尊，雖然，理又尊之尊也。廟堂之上言理，
-則天子不得以勢相奪，即相奪焉，而理則常伸於天下萬世。故勢者，帝王之權也；理者
-，聖人之權也。帝王無聖人之理，則其權有時而屈。然則理也者，又勢之所恃以為存亡
-者也。以莫大之權無僭竊之禁，此儒者之所不辭而敢於任斯道之南面也。
-
-　　陽道生，陰道養。故向陽者先發，向陰者後枯。
-
-　　正學不明，聰明才辯之士各枝葉其一隅之見以成一家之說，而道始千岐百徑矣。豈
-無各得？終是偏術。到孔門，只如枉木著繩，一毫邪氣不得。
-
-　　禪家有理障之說。愚謂理無障，畢竟是識障。無意識，心何障之有？
-
-　　道莫要於損己，學莫急於矯偏。
-
-　　七情總是個欲，只得其正了，都是天理；五性總是個仁，只不仁了，都是人欲。
-
-　　萬籟之聲，皆自然也。自然，皆真也。物各自鳴其真，何天何人？何今何古？《六
-經》，籟道者也，統一聖真，而漢宋以來胥執一響以吹之，而曰是外無聲矣。觀俳謔者
-，萬人粲然皆笑，聲不同也而樂同。人各笑其所樂，何清濁高下妍媸之足云？故見各鳴
-其自得。語不詭於《六經》，皆吾道之眾響也，不必言言同、事事同矣。
-
-　　氣者，形之精華；形者，氣之渣滓。故形中有氣，無氣則形不生；氣中無形，有形
-則氣不載。故有無形之氣，無無氣之形。星隕為石者，先感於形也。
-
-　　天地萬物只到和平處，無一些不好，何等暢快！
-
-　　莊、列見得道理原著不得人為，故一向不盡人事。不知一任自然，成甚世界？聖人
-明知自然，卻把自然閣起，只說個當然，聽那個自然。
-
-　　私恩煦感，仁之賊也；直往輕擔，義之賊也；足恭偽態，禮之賊也；苛察岐疑，智
-之賊也；苟約固守，信之賊也。此五賊者，破道亂正，聖門斥之。後世儒者往往稱之以
-訓世，無識也與！
-
-　　道有二然，舉世皆顛倒之。有個當然是屬人底，不問吉凶禍福，要向前做去；有個
-自然是屬天底，任你躑躅咆哮，自勉強不來。舉世昏迷，專在自然上錯用工夫，是謂替
-天忙，徒勞無益。卻將當然底全不著意，是謂棄人道，成個甚人？聖賢看著自然可得底
-，果於當然有礙，定不肯受，況未必得乎？只把二「然」字看得真，守得定，有多少受
-用處！
-
-　　氣用形，形盡而氣不盡；火用薪，薪盡而火不盡。故天地惟無能用有，五行惟火為
-氣，其四者皆形也。
-
-　　氣盛便不見涵養。浩然之氣雖充塞天地間，其實本體間定冉冉口鼻中，不足以呼吸。
-
-　　有天欲，有人欲。吟風弄月，傍花隨柳，此天欲也。聲色貸利，此人欲也。天欲不
-可無，無則禪；人欲不可有，有則穢。天欲即好底人欲，人欲即不好底天欲。
-
-　　朱子云：「不求人知，而求天知。」為初學言也。君子為善，只為性中當如此，或
-此心過不去。天知、地知、人知、我知，渾是不求底。有一求心，便是偽，求而不得，
-此念定是衰歇。
-
-　　以吾身為內，則吾身之外皆外物也。故富貴利達，可生可榮，苟非道焉，而君子不
-居。以吾心為內，則吾身亦外物也。故貧賤憂慼，可辱可殺，苟道焉，而君子不辭。
-
-　　或問敬之道。曰：「外面整齊嚴肅，內面齊莊中正，是靜時涵養底敬。讀書則心在
-於所讀，治事則心在於所治，是主一無適底敬。出門如見大賓，使民如承大祭，是隨事
-小心底敬。」或曰：「若笑談歌詠、宴息造次之時，恐如是則矜持不泰然矣。」曰：「
-敬以端嚴為體，以虛活為用，以不離於正為主。齋日衣冠而寢，夢寐乎所祭者也。不齋
-之寢，則解衣脫冕矣，未有釋衣冕而持敬也。然而心不流於邪僻，事不詭於道義，則不
-害其為敬矣。君若專去端嚴上求敬，則荷鋤負畚、執轡御車、鄙事賤役，古聖賢皆為之
-矣，豈能日日手容恭、足容重耶？又若孔子曲肱指掌，及居不容，點之浴沂，何害其為
-敬耶？大端心與正依，事與道合，雖不拘拘於端嚴，不害其為敬。苟心游千里、意逐百
-欲，而此身卻兀然端嚴在此，這是敬否？譬如謹避深藏，秉燭鳴珮，緩步輕聲，女教《
-內則》原是如此，所以養貞信也。若饁婦汲妻及當顛沛奔走之際，自是迴避不得，然而
-貞信之守與深藏謹避者同，是何害其為女教哉？是故敬不擇人，敬不擇事，敬不擇時，
-敬不擇地，只要個心與正依，事與道合。」
-
-　　先難後獲，此是立德立功第一個張主。若認得先難是了，只一向持循去，任千毀萬
-謗也莫動心，年如是，月如是，竟無效驗也只如是，久則自無不獲之理。故工夫循序以
-進之，效驗從容以俟之，若欲速，便是揠苗者，自是欲速不來。
-
-　　造化之精，性天之妙，惟靜觀者知之，惟靜養者契之，難與紛擾者道。故止水見星
-月，才動便光芒錯雜矣。悲夫！紛擾者，昏昏以終身，而一無所見也。
-
-　　滿腔子是惻隱之心，滿六合是運惻隱之心處。君子於六合飛潛動植、纖細毫末之物
-，見其得所，則油然而喜，與自家得所一般；見其失所，則閔然而戚，與自家失所一般
-。位育念頭，如何一刻放得下？
-
-　　萬物生於性，死於情。故上智去情，君子正情，眾人任情，小人肆情。夫知情之能
-死人也，則當遊心於淡泊無味之鄉，而於世之所欣戚趨避，漠然不以嬰其慮，則身苦而
-心樂，感殊而應一。其所不能逃者，與天下同；其所了然獨得者，與天下異。
-
-　　此身要與世融液，不見有萬物形跡、六合界限，此之謂化。然中間卻不模糊，自有
-各正底道理，此之謂精。
-
-　　人一生不聞道　，真是可憐！
-
-　　已欲立而立人，己欲達而達人，便是肫肫其仁、天下一家滋味。然須推及鳥獸，又
-推及草木，方充得盡。若父子兄弟間便有各自立達、爭先求勝的念頭，更那顧得別個。
-
-　　天德只是個無我，王道只是個愛人。
-
-　　道是第一等，德是第二等，功是第三等，名是第四等。自然之謂道，與自然遊謂之
-道士。體道之謂德，百行俱修謂之德士。濟世成物謂之功。一味為天下潔身著世謂之名
-。一味為自家立言者，亦不出此四家之言。下此不入等矣。
-
-　　凡動天感物，皆純氣也。至剛至柔，與中和之氣皆有所感動，純故也。十分純裡才
-有一毫雜，便不能感動。無論佳氣、戾氣，只純了，其應便捷於影響。
-
-　　萬事萬物有分別，聖人之心無分別，因而付之耳。譬之日因萬物以為影，水因萬川
-以順流，而日水原無兩，未嘗不分別，而非以我分別之也。以我分別，自是分別不得。
-
-　　下學學個什麼？上達達個什麼？下學者，學其所達也；上達者，達其所學也。
-
-　　弘毅，坤道也。《易》曰「含弘光大」，言弘也；「利永貞」，言毅也。不毅不弘
-，何以載物？
-
-　　六經言道而不辨，辨自孟子始；漢儒解經而不論，論自宋儒始；宋儒尊理而不僭，
-僭自世儒始。
-
-　　聖賢學問是一套，行王道必本天德；後世學問是兩截，不修己只管治人。
-
-　　自非生知之聖，未有言而不思者。貌深沉而言安定，若蹇若疑，欲發欲留。雖有失
-焉者，寡矣。神奮揚而語急速，若湧若懸，半跲半晦，雖有得焉者，寡矣。夫一言之發
-，四面皆淵阱也。喜言之則以為驕，戚言之則以為懦，謙言之則以為諂，直言之則以為
-陵，微言之則以為險，明言之則以為浮。無心犯諱則謂有心之譏，無為發端則疑有為之
-說。簡而當事，曲而當情，精而當理，確而當時，一言而濟事，一言而服人，一言而明
-道，是謂修辭之善者。其要有二：曰澄心，曰定氣。余多言而無當，真知病本云云，當
-與同志者共改之。
-
-　　知彼知我，不獨是兵法，處人處事一些少不得底。
-
-　　靜中真味至淡至冷，及應事接物時，自有一段不冷不淡天趣。只是眾人習染世味十
-分濃豔，便看得他冷淡。然冷而難親，淡而可厭，原不是真味，是謂撥寒灰、嚼淨蠟。
-
-　　明體全為適用。明也者，明其所適也，不能適用，何貴明體？然未有明體而不適用
-者。樹有根，自然千枝萬葉；水有泉，自然千流萬派。
-
-　　天地人物原來只是一個身體、一個心腸，同了，便是一家，異了，便是萬類。而今
-看著風雲雷雨都是我胸中發出，虎豹蛇蠍都是我身上分來，那個是天地？那個是萬物？
-
-　　萬事萬物都有個一，千頭萬緒皆發於一，千言萬語皆明此一，千體認萬推行皆做此
-一。得此一，則萬皆舉；求諸萬，則一反迷。但二氏只是守一，吾儒卻會用一。
-
-　　三氏傳心要法，總之不離一「靜」字。下手處皆是制欲，歸宿處都是無欲，是則同。
-
-　　「予欲無言」，非雅言也，言之所不能顯者也。「吾無隱爾」，非文辭也，性與天
-道也。說便說不來，藏也藏不得，然則無言即無隱也，在學者之自悟耳。天地何嘗言？
-何嘗隱？以是知不可言傳者，皆日用流行於事物者也。
-
-　　天地間道理，如白日青天；聖賢心事，如光風霽月。若說出一段話，說千解萬，解
-說者再不痛快，聽者再不惺憽，豈舉世人皆愚哉？此立言者之大病。
-
-　　罕譬而喻者，至言也；譬而喻者，微言也；譬而不喻者，玄言也。玄言者，道之無
-以為者也。不理會玄言，不害其為聖人。
-
-　　正大光明，透徹簡易，如天地之為形，如日月之垂象，足以開物成務，足以濟世安
-民，達之天下萬世而無弊，此謂天言。平易明白，切近精實，出於吾口而當於天下之心
-，載之典籍而裨於古人之道，是謂人言。艱深幽僻，弔詭探奇，不自句讀不能通其文，
-通則無分毫會心之理趣；不考音韻不能識其字，識則皆常行日用之形聲，是謂鬼言。鬼
-言者，道之賊也，木之孽也，經生學士之殃也。然而世人崇尚之者，何逃之？怪異足以
-文凡陋之筆，見其怪異，易以駭膚淺之目。此光明平易大雅君子為之汗顏泚顙，而彼方
-以為得意者也。哀哉！
-
-
-　　衰世尚同，盛世未嘗不尚同。衰世尚同流合污，盛世尚同心合德。虞廷同寅協恭，
-修政無異識，圮族者殛之；孔門同道協志，修身無異術，非吾徒者攻之。故曰道德一、
-風俗同。二之非帝王之治，二之非聖賢之教，是謂敗常亂俗，是謂邪說破道。衰世尚同
-，則異是矣。逐波隨風，共撼中流之砥柱；一頹百靡，誰容盡醉之醒人？讀《桃園》、
-誦《板蕩》，自古然矣。乃知盛世貴同，衰世貴獨。獨非立異也，眾人皆我之獨，即盛
-世之同矣。
-
-　　世間物一無可戀，只是既生在此中，不得不相與耳。不宜著情，著情便生無限愛欲
-，便招無限煩惱。
-
-　　「安而後能慮」，止水能照也。
-
-　　君子之於事也，行乎其所不得不行，止乎其所不得不止；於言也，語乎其所不得不
-語，默乎其所不得不默，尤悔庶幾寡矣。
-
-　　發不中節，過不在已發之後。
-
-　　才有一分自滿之心，面上便帶自滿之色，口中便出自滿之聲，此有道之所恥也。見
-得大時，世間再無可滿之事，吾分再無能滿之時，何可滿之有？故盛德容貌若愚。
-
-　　「相在爾室，尚不愧於屋漏」，此是千古嚴師。「十目所視，十手所指」，此是千
-古嚴刑。
-
-　　誠與才合，畢竟是兩個，原無此理。蓋才自誠出，才不出於誠算不得個才，誠了自
-然有才。今人不患無才，只是討一誠字不得。
-
-　　斷則心無累。或曰：「斷用在何處？」曰：「謀後當斷，行後當斷。」
-
-　　道盡於一，二則贅；體道者不出一，二則支。天無二氣，物無二本，心無二理，世
-無二權。一則萬，二則不萬，道也，二乎哉？故執一者得萬，求萬者失一。水壅萬川未
-必能塞，木滋萬葉未必能榮，失一故也。
-
-　　道有一真，而意見常千百也，故言多而道愈漓；事有一是，而意見常千百也，故議
-多而事愈僨。
-
-　　吾黨望人甚厚，自治甚疏，只在口脗上做工夫，如何要得長進？
-
-　　宇宙內原來是一個，才說同，便不是。
-
-　　周子《太極圖》第二圈子是分陰分陽，不是根陰根陽。世間沒有這般截然氣化，都
-是互為其根耳。
-
-　　說自然是第一等話，無所為而為；說當然是第二等話，性分之所當盡，職分之所當
-為；說不可不然是第三等話，是非毀譽是已；說不敢不然是第四等話，利害禍福是已。
-
-　　人欲擾害天理，眾人都曉得；天理擾害天理，雖君子亦迷，況在眾人！而今只說慈
-悲是仁，謙恭是禮，不取是廉，慷慨是義，果敢是勇，然諾是信。這個念頭真實發出，
-難說不是天理，卻是大中至正天理被他擾害，正是執一賊道。舉世所謂君子者，都是這
-裡看不破，故曰「道之不明」也。
-
-　　「二女同居，其志不同行」，見孤陽也。若無陽，則二女何不同行之有？二陽同居
-，其志同行，不見陰也。若見孤陰，則二男亦不可以同居矣。故曰「一陰一陽之謂道」
-，六爻雖具陰陽之偏，然各成一體，故無嫌。
-
-　　利刃斲木綿，迅炮擊風幟，必無害矣。
-
-　　士之於道也，始也求得，既也得得，既也養得，既也忘得。不養得則得也不固，不
-忘得則得也未融。學而至於忘得，是謂無得。得者，自外之名，既失之名，還我故物，
-如未嘗失，何得之有？心放失，故言得心，從古未言得耳目口鼻四肢者，無失故也。
-
-　　聖人作用，皆以陰為主，以陽為客。陰所養者也，陽所用者也。天地亦主陰而客陽
-。二氏家全是陰，道家以陰養純陽而嗇之，釋家以陰養純陰而寶之。凡人陰多者，多壽
-多福；陽多者，多夭多禍。
-
-　　只隔一絲，便算不得透徹之悟，須是入筋肉、沁骨髓。
-
-　　異端者，本無不同，而端緒異也。千古以來，惟堯、舜、禹、湯、文、武、孔、孟
-一脈是正端，千古不異。無論佛、老、莊、列、申、韓、管、商，即伯夷、伊尹、柳下
-惠，都是異端，子貢、子夏之徒，都流而異端。蓋端之初分也，如路之有岐，未分之初
-都是一處發腳，既出門後，一股向西南走，一股向東南走，走到極處，末路梢頭，相去
-不知幾千萬里，其始何嘗不一本哉？故學問要析同異於毫釐，非是好辨，懼末流之可哀
-也。
-
-　　天下之事，真知再沒個不行，真行再沒個不誠，真誠之行再沒個不自然底。自然之
-行不至其極不止，不死不止，故曰「明則誠」矣。
-
-　　千萬病痛只有一個根本，治千病萬痛只治一個根本。
-
-　　宇宙內主張萬物底只是一塊氣，氣即是理。理者，氣之自然者也。
-
-　　到至誠地位，誠固誠，偽亦誠；未到至誠地位，偽固偽，誠亦偽。
-
-　　義襲取不得。
-
-　　信知困窮抑鬱、貧賤勞苦是我應得底，安富薄榮、歡欣如意是我儻來底，胸中便無
-許多冰炭。
-
-　　事有豫而立，亦有豫而廢者。吾曾豫以有待，臨事鑿枘不成，竟成棄擲者。所謂權
-不可豫設，變不可先圖，又難執一論也。
-
-　　任是千變萬化、千奇萬異，畢竟落在平常處歇。
-
-　　善是性，性未必是善；秤錘是鐵，鐵不是秤錘。或曰：「孟子道性善，非與？」曰
-：「余所言，孟子之言也。孟子以耳目口鼻四肢之欲為性，此性善否？」或曰：「欲當
-乎理，即是善。」曰：「如子所言，『動心忍性』，亦忍善性與？」或曰：「孔子繫《
-易》，言『繼善成性』，非與？」曰：「世儒解經，皆不善讀《易》者也。孔子云『一
-陰一陽之謂道』，謂一陰一陽均調而不偏，乃天地中和之氣，故謂之道。人繼之則為善
-，繼者，稟受之初；人成之則為性，成者，不作之謂。假若一陰則偏於柔，一陽則偏於
-剛，皆落氣質，不可謂之道。蓋純陰純陽之謂偏，一陰二陽、二陰一陽之謂駁，一陰三
-四五陽、五陰一三四陽之謂雜，故仁智之見，皆落了氣質一邊，何況百姓？仁智兩字，
-拈此以見例，禮者見之謂之禮，義者見之謂之義，皆是邊見。朱注以繼為天，誤矣；又
-以仁智分陰陽，又誤矣。抑嘗考之，天自有兩種天，有理道之天，有氣數之天。故賦之
-於人，有義理之性，有氣質之性。二天皆出於太極，理道之天是先天，未著陰陽五行以
-前，純善無惡，《書》所謂『惟皇降衷，厥有恒性』，《詩》所謂『天生烝民，有物有
-則』是也。氣數之天是後天，落陰陽五行之後，有善有惡，《書》所謂『天生烝民，有
-欲』，孔子所謂『惟上知與下愚不移』是也。孟子道性善，只言個德性。」
-
-　　物欲從氣質來，只變化了氣質，更說甚物欲。
-
-　　耳目口鼻四肢有何罪過？堯、舜、周、孔之身都是有底；聲色貨利、可愛可欲有何
-罪過？堯、舜、周、孔之世都是有底。千萬罪惡都是這點心，孟子「耳目之官不思而蔽
-物」，太株連了，只是先立乎其大，有了張主，小者都是好奴婢，何小之敢奪？沒了窩
-主，那怕盜賊？問：「誰立大？」曰：「大立大。」
-
-　　威儀養得定了，才有脫略，便害羞赧；放肆慣得久了，才入禮群，便害拘束。習不
-可不慎也。
-
-　　絜矩是強恕事，聖人不絜矩。他這一副心腸原與天下打成一片，那個是矩？那個是
-絜？
-
-　　仁以為己任，死而後已，此是大擔當；老者衣帛食肉，黎民不饑不寒，此是大快樂。
-
-　　內外本末交相培養，此語余所未喻。只有內與本，那外與末張主得甚？
-　　不是與諸君不談奧妙，古今奧妙不似《易》與《中庸》，至今解說二書，不似青天
-白日，如何又於晦夜添濃雲也？望諸君哀此後學，另說一副當言語，須是十指露縫，八
-面開窗，你見我知，更無躲閃，方是正大光明男子。
-
-　　形而上與形而下，不是兩般道理；下學上達，不是兩截工夫。
-
-　　世之欲惡無窮，人之精力有限，以有限與無窮鬥，則物之勝人，不啻千萬，奈之何
-不病且死也。
-
-　　冷淡中有無限受用處。都戀戀炎熱，抵死不悟，既悟不知回頭，既回頭卻又羨慕，
-此是一種依羶附腥底人，切莫與談真滋味。
-
-　　處明燭幽，未能見物而物先見之矣；處幽燭明，是謂神照。是故不言者非喑，不視
-者非盲，不聽者非聾。
-
-　　儒戒聲色貨利，釋戒色聲香味，道戒酒色財氣。總歸之無欲，此三氏所同也。儒衣
-儒冠而多欲，怎笑得釋道？
-
-　　敬事鬼神，聖人維持世教之大端也。其義深，其功大。但自不可鑿求，不可道破耳。
-
-　　天下之治亂，只在「相責各盡」四字。
-
-　　世之治亂，國之存亡，民之死生，只是個我心作用。只無我了，便是天清地寧、民
-安物阜世界。
-
-　　惟得道之深者，然後能淺言；凡深言者，得道之淺者也。
-
-　　以虛養心，以德養身，以善養人，以仁養天下萬物，以道養萬世。養之義，大矣哉！
-
-　　萬物皆能昏人，是人皆有所昏。有所不見，為不見者所昏；有所見，為見者所昏。
-惟一無所見者不昏，不昏然後見天下。
-
-　　道非淡不入，非靜不進，非冷不凝。
-
-　　三千三百，便是無聲無臭。
-
-　　天德王道不是兩事，內聖外王不是兩人。
-
-　　損之而不見其少者，必贅物也；益之而不見其多者，必缺處也。惟分定者，加一毫
-不得、減一毫不得。
-
-　　知是一雙眼，行是一雙腳。不知而行，前有淵谷而不見，傍有狼虎而不聞，如中州
-之人適燕而南、之粵而北也，雖乘千里之馬，愈疾愈遠。知而不行，如痿痹之人數路程
-、畫山水。行更無多說，只用得一「篤」字。知底工夫千頭萬緒，所謂「匪知之艱，惟
-行之艱」、「匪苟知之，亦允蹈之」、「知至至之，知終終之」、「窮神知化」、「窮
-理盡性」、「幾深研極」、「探頣索隱」、「多聞多見」。知也者，知所行也；行也者
-，行所知也。知也者，知此也；行也者，行此也。原不是兩個。世俗知行不分，直與千
-古聖人駁難，以為行即是知。余以為：「能行方算得知，徒知難算得行。」
-
-　　有殺之為仁，生之為不仁者；有取之為義，與之為不義者；有卑之為禮，尊之為非
-禮者；有不知為智，知之為不智者；有違言為信，踐言為非信者。
-
-
-　　覓物者，苦求而不得或視之而不見，他日無事於覓也，乃得之。非物有趨避，目眩
-於急求也。天下之事，每得於從容而失之急遽。
-
-　　山峙川流、鳥啼花落、風清月白，自是各適其天，各得其分。我亦然，彼此無干涉
-也。才生繫戀心，便是歆羨，便有沾著。主人淡無世好，與世相忘而已。惟並育而不有
-情，故並育而不相害。
-
-　　公生明，誠生明，從容生明。公生明者，不蔽於私也；誠生明者，清虛所通也；從
-容生明者，不淆於感也。舍是無明道矣。
-
-　　「喜怒哀樂之未發謂之中」，自有《中庸》以來，無人看破此一語。此吾道與佛、
-老異處，最不可忽。
-
-　　知識，心之孽也；才能，身之妖也；貴寵，家之禍也；富足，子孫之殃也。
-
-　　只泰了，天地萬物皆志暢意得，欣喜歡愛。心身家國天下無一毫鬱閼不平之氣，所
-謂八達四通，千昌萬遂，太和之至也。然泰極則肆，肆則不可收拾；而入於否。故《泰
-》之後繼以《大壯》，而聖人戒之曰：「君子以非禮弗履。」用是見古人憂勤惕勵之意
-多，豪雄曠達之心少。六十四卦，惟有《泰》是快樂時又恁極中極正，且懼且危，此所
-以致泰保泰而無意外之患也。
-
-　　今古紛紛辨口，聚訟盈庭，積書充棟，皆起於世教之不明，而聰明才辨者各執意見
-以求勝。故爭輕重者至衡而息，爭短長者至度而息，爭多寡者至量而息，爭是非者至聖
-人而息。中道者，聖人之權衡度量也。聖人往矣，而中道自在，安用是嘵嘵強口而逞辨
-以自是哉？嗟夫！難言之矣。
-
-　　人只認得「義命」兩字真，隨事隨時在這邊體認，果得趣味，一生受用不了。
-
-　　「夫焉有所倚」，此至誠之胸次也。空空洞洞，一無所著，一無所有，只是不倚著
-。才倚一分，便是一分偏；才著一釐，便是一釐礙。
-
-　　形用事，則神者亦形；神用事，則形者亦神。
-
-　　威儀三千，禮儀三百，五刑之屬三千，皆法也。法是死底，令人可守；道是活底，
-令人變通。賢者持循於法之中，聖人變易於法之外。自非聖人而言變易，皆亂法也。
-
-　　道不可言，才落言筌，便有倚著。
-
-　　禮教大明，中有犯禮者一人焉，則眾以為肆而無所容；禮教不明，中有守禮者一人
-焉，則眾以為怪而無所容。禮之於世大矣哉！
-
-　　良知之說亦是致曲擴端學問，只是作用大端費力。作聖工夫當從天上做，培樹工夫
-當從土上做。射之道，中者矢也，矢由弦，弦由手，手由心，用工當在心，不在矢；御
-之道，用者銜也，銜由轡，轡由手，手由心，用工當在心，不在銜。
-
-　　聖門工夫有兩途：「克己復禮」，是領惡以全好也，四夷靖則中國安；「先立乎其
-大者」，是正己而物正也，內順治則外威嚴。
-
-　　中，是千古道脈宗；敬，是聖學一字訣。
-
-　　性，只有一個，才說五便著情種矣。
-
-　　敬肆是死生關。
-
-　　瓜、李將熟，浮白生焉。禮由情生，後世乃以禮為情，哀哉！
-
-　　道理甚明、甚淺、甚易，只被後儒到今說底玄冥，只似真禪，如何使俗學不一切抵
-毀而盡叛之！
-
-　　生成者，天之道心；災害者，天之人心。道心者，人之生成；人心者，人之災害。
-此語眾人驚駭死，必有能理會者。
-
-　　道器非兩物，理氣非兩件。成象成形者器，所以然者道；生物成物者氣，所以然者
-理。道與理，視之無跡，捫之無物，必分道器、理氣為兩項，殊為未精。《易》曰：「
-形而上者謂之道，形而下者謂之器。」蓋形而上，無體者也，萬有之父母，故曰道；形
-而下，有體者也，一道之凝結，故曰器。理氣亦然，生天、生地、生人、生物，皆氣也
-，所以然者，理也。安得對待而言之？若對待為二，則費隱亦二矣。
-
-　　先天，理而已矣；後天，氣而已矣；天下，勢而已矣；人情，利而已矣。理一，而
-氣、勢、利三，勝負可知矣。
-
-　　人事就是天命。
-
-　　我盛則萬物皆為我用，我衰則萬物皆為我病。盛衰勝負，宇宙內只有一個消息。
-
-　　天地間惟無無累，有即為累。有身則身為我累，有物則物為我累。惟至人則有我而
-無我，有物而忘物，此身如在太虛中，何累之有？故能物我兩化。化則何有何無？何非
-有何非無？故二氏逃有，聖人善處有。
-
-　　義，合外內之道也。外無感，則義只是渾然在中之理，見物而裁制之則為義。義不
-生於物，亦緣物而後見。告子只說義外，故孟子只說義內，各說一邊以相駁，故窮年相
-辨而不服。孟子若說義雖緣外而形，實根吾心而生，物不是義，而處物乃為義也，告子
-再怎開口？性，合理氣之道也。理不雜氣，則純粹以精，有善無惡，所謂義理之性也。
-理一雜氣，則五行紛糅，有善有惡，所謂氣質之性也。諸家所盲皆落氣質之後之性，孟
-子所言皆未著氣質之先之性，各指一邊以相駁，故窮年相辨而不服。孟子若說有善有惡
-者雜於氣質之性，有善無惡者，上帝降衷之性，學問之道正要變化那氣質之性，完復吾
-降衷之性，諸家再怎開口？
-
-　　乾與姤，坤與復，對頭相接不間一發，乾坤盡頭處即姤復起頭處，如呼吸之相連，
-無有斷續，一斷便是生死之界。
-
-　　知費之為省，善省者也，而以省為省者愚，其費必倍。知勞之為逸者，善逸者也，
-而以逸為逸者昏，其勞必多。知苦之為樂者，善樂者也，而以樂為樂者癡，一苦不返。
-知通之為塞者，善塞者也，而以塞為塞者拙，一通必竭。
-
-　　秦火之後，三代制作湮滅幾盡。漢時購書之賞重，胡漢儒附會之書多。其倖存者，
-則焚書以前之宿儒尚存而不死，如伏生口授之類。好古之君子壁藏而石函，如《周禮》
-出於屋壁之類。後儒不考古今之文，概云先王製作而不敢易，即使盡屬先王制作，然而
-議禮制度考文，沿世道民俗而調劑之，易姓受命之天子皆可變通，故曰刑法世輕重，三
-王不沿禮襲樂。若一切泥古而求通，則茹毛飲血、土鼓汙尊皆可行之今日矣。堯舜而當
-此時，其制度文為必因時順勢，豈能反後世而躋之唐虞？或曰：「自秦火後，先王制作
-何以別之？」曰：「打起一道大中至正線來，真偽分毫不錯。」
-
-　　理會得「簡」之一字，自家身心、天地萬物、天下萬事盡之矣。一粒金丹不載多藥
-，一分銀魂不攜錢幣。
-
-　　耳聞底、眼見底、身觸頭戴足踏底，燦然確然，無非都是這個，拈起一端來，色色
-都是這個。卻向古人千言萬語、陳爛葛藤鑽研窮究，意亂神昏了不可得，則多言之誤後
-人也噫！
-
-　　鬼神無聲無臭，而有聲有臭者，乃無聲無臭之散殊也。故先王以聲息為感格鬼神之
-妙機。周人尚臭，商人尚聲，自非達幽明之故者難以語此。
-
-　　三千三百，繭絲牛毛，聖人之精細入淵微矣。然皆自性真流出，非由強作，此之謂
-天理。
-
-　　事事只在道理上商量，便是真體認。
-
-　　使人收斂莊重莫如禮，使人溫厚和平莫如樂。德性之有資於禮樂，猶身體之有資於
-衣食，極重大，極急切。人君治天下，士君子治身，惟禮樂之用為急耳。自禮廢，而惰
-慢放肆之態慣習於身體矣；自樂亡，而乖戾忿恨之氣充滿於一腔矣。三代以降，無論典
-秩之本，聲氣之元，即儀文器數，夢寐不及。悠悠六合，貿貿百年，豈非靈於萬物，而
-萬物且能笑之？細思先儒「不可斯須去身」六字，可為流涕長太息矣。
-
-　　惟平脈無病，七表、八裡、九道，皆病名也；惟中道無名，五常、百行、萬善，皆
-偏名也。
-
-　　千載而下，最可恨者樂之無傳。士大夫視為迂闊無用之物，而不知其有切於身心性
-命也。
-
-　　一、中、平、常、白、淡、無，謂之七，無對。一不對萬；萬者，一之分也。太過
-不及對；中者，太過不及之君也。高下對；平者，高下之准也。吉凶禍福貧富貴賤對；
-常者，不增不減之物也。青黃碧紫赤黑對；白者，青、黃、碧、紫、赤之質也。酸鹹甘
-苦辛對；淡者，受和五味之主也。有不與無對；無者，萬有之母也。
-
-　　或問：「格物之物是何物？」曰：「至善是已。」「如何格？」曰：「知止是已。
-」「《中庸》不言格物，何也？」曰：「舜之執兩端於問察，回之擇一善而服膺，皆格
-物也。」「擇善與格物同否？」曰：「博學、審問、慎思、明辨，皆格物也；致知、誠
-正，修、齊、治、平，皆擇善也。除了善，更無物。除了擇善，更無格物之功。」「至
-善即中乎？」曰：「不中，不得謂之至善。不明乎善，不得謂之格物。故不明善不能誠
-身，不格物不能誠意。明瞭善，欲不誠身不得；格了物，欲不誠意不得。」「不格物亦
-能致知否？」曰：「有。佛、老、莊、列皆致知也，非不格物；而非吾之所謂物。」「
-不致知亦能誠意否？」曰：「有。尾生、孝己皆誠意也，乃氣質之知，而非格物之知。
-」格物二字，在宇宙間乃鬼神訶護真靈至寶，要在個中人神解妙悟，不可與口耳家道也。
-
-　　學術要辨邪正。既正矣，又要辨真偽。既真矣，又要辨念頭切不切、嚮往力不力，
-無以空言輒便許人也。
-
-　　百姓凍餒謂之國窮，妻子困乏謂之家窮，氣血虛弱謂之身窮，學問空疏謂之心窮。
-
-　　人問：「君是道學否？」曰：「我不是道學。」「是仙學否？」曰：「我不是仙學
-。」「是釋學否？」曰：「我不是釋學。」「是老、莊、申、韓學否？」曰：「我不是
-老、莊、申、韓學。」「畢竟是誰家門戶？」曰：「我只是我。」
-
-　　與友人論天下無一物無禮樂，因指几上香曰：「此香便是禮，香煙便是樂；坐在此
-便是禮，一笑便是樂。」
-
-　　心之好惡不可迷也，耳目口鼻四肢之好惡不可徇也。瞽者不辨蒼素，聾者不辨宮商
-，鼽者不辨香臭，狂者不辨辛酸，逃難而追亡者不辨險夷遠近。然於我無損也，於道無
-損也，於事無損也，而有益於世、有益於我者無窮。乃知五者之知覺，道之賊而心之殃
-也，天下之禍也。
-
-　　氣有三散：苦散，樂散，自然散。苦散、樂散可以復聚，自然散不復聚矣。
-
-　　悟有頓，修無頓。立志在堯，即一念之堯；一語近舜，即一言之舜；一行師孔，即
-一事之孔，而況悟乎？若成一個堯、舜、孔子，非真積力充、斃而後已不能。
-
-　　有人於此，其孫呼之曰祖、其祖呼之曰孫、其子呼之曰父、其父呼之曰子、其舅呼
-之曰甥、其甥呼之曰舅、其伯叔呼之曰侄、其侄呼之曰伯叔、其兄呼之曰弟、其弟呼之
-曰兄、其翁呼之曰婿、其婿呼之曰翁，畢竟是幾人？曰：「一人也。」「呼之畢竟孰是
-？」曰：「皆是也。」吁！「仁者見之謂之仁，知者見之謂之知」，無怪矣，道二乎哉！
-
-　　豪放之心非道之所棲也，是故道凝於寧靜。
-
-　　聖人制規矩不制方圓，謂規矩可為方圓，方圓不能為方圓耳。
-
-　　終身不照鏡，終身不認得自家。乍照鏡，猶疑我是別人，常磨常照，才認得本來面
-目。故君子不可以無友。
-
-　　輕重只在毫釐，長短只爭分寸。明者以少為多，昏者惜零棄頓。
-
-　　天地所以循環無端積成萬古者，只是四個字，曰「無息有漸」。聖學亦然，縱使生
-知之聖，敏則有之矣，離此四字不得。
-
-　　下手處是自強不息，成就處是至誠無息。
-
-　　聖學入門先要克己，歸宿只是無我。蓋自私自利之心是立人達人之障，此便是舜、
-跖關頭，死生歧路。
-
-　　心於淡裡見天真，嚼破後許多滋味；學向淵中尋理趣，湧出來無限波瀾。
-
-　　百毒惟有恩毒苦，萬味無如淡味長。
-
-　　總埋泉壤終須白，才露天機便不玄。
-
-　　橫吞八極水，細數九牛毛。
-
-
-
-
-修身
-
-
-　　六合是我底六合，那個是人？我是六合底我，那個是我？
-
-　　世上沒個分外好底，便到天地位，萬物育底功用，也是性分中應盡底事業。今人才
-有一善，便向人有矜色，便見得世上人都有不是，余甚恥之。若說分外好，這又是賢智
-之過，便不是好。
-
-　　率真者無心過，殊多躁言輕舉之失；慎密者無口過，不免厚貌深情之累。心事如青
-天白日，言動如履薄臨深，其惟君子乎？
-
-　　沉靜最是美質，蓋心存而不放者。今人獨居無事，已自岑寂難堪，才應事接人，便
-任口恣情，即是清狂，亦非蓄德之器。
-
-　　攻己惡者，顧不得攻人之惡。若嘵嘵爾雌黃人，定是自治疏底。
-
-　　大事難事看擔當，逆境順境看襟度，臨喜臨怒看涵養，群行群止看識見。
-
-　　身是心當，家是主人翁當，郡邑是守令當，九邊是將帥當，千官是冢宰當，天下是
-天子當，道是聖人當。故宇宙內幾樁大事，學者要挺身獨任，讓不得人，亦與人計行止
-不得。
-
-　　作人怕似渴睡漢，才喚醒時睜眼若有知，旋復沉困，竟是寐中人。須如朝興櫛盥之
-後，神爽氣清，冷冷勁勁，方是真醒。
-
-　　人生得有餘氣，便有受用處。言盡口說，事盡意做，此是薄命子。
-
-　　清人不借外景為襟懷，高士不以塵識染情性。
-
-　　官吏不要錢，男兒不做賊，女子不失身，才有了一分人。連這個也犯了，再休說別
-個。
-
-　　才有一段公直之氣，而出言做事便露圭角，是大病痛。
-
-　　講學論道於師友之時，知其心術之所藏何如也；飭躬勵行於見聞之地，知其暗室之
-所為何知也。然則盜跖非元憝也，彼盜利而不盜名也。世之大盜，名利兩得者居其最。
-
-　　圓融者無詭隨之態，精細者無苛察之心，方正者無乖拂之失，沉默者無陰險之術，
-誠篤者無椎魯之累，光明者無淺露之病，勁直者無徑情之偏，執持者無拘泥之跡，敏練
-者無輕浮之狀，此是全才。有所長而矯其長之失，此是善學。
-
-　　不足與有為者自附於行所無事之名，和光同塵者自附於無可無不可之名。聖人惡莠
-也以此。
-
-　　古之士民，各安其業，策勵精神，點檢心事。晝之所為，夜而思之，又思明日之所
-為。君子汲汲其德，小人汲汲其業，日累月進，旦興晏息，不敢有一息惰慢之氣。夫是
-以士無慆德，民無怠行；夫是以家給人足，道明德積，身用康強，不即於禍。今也不然
-，百畝之家不親力作，一命之士不治常業，浪談邪議，聚笑覓歡，耽心耳目之玩，騁情
-遊戲之樂，身衣綺縠，口厭芻豢，志溺驕佚，懵然不知日用之所為，而其室家土田百物
-往來之費又足以荒志而養其淫，消耗年華，妄費日用。噫！是亦名為人也，無惑乎後艱
-之踵至也！
-
-　　世人之形容人過，只象個盜跖；迴護自家，只象個堯舜。不知這卻是以堯舜望人，
-而以盜跖自待也。
-
-　　孟子看鄉黨自好看得甚卑。近年看鄉黨人自好底不多。愛名惜節，自好之謂也。
-
-　　少年之情，欲收斂不欲豪暢，可以謹德；老人之情，欲豪暢不欲鬱閼，可以養生。
-
-　　廣所依不如擇所依，擇所依不如無所依。無所依者，依天也。依天者，有獨知之契
-，雖獨立宇宙之內而不謂孤；眾傾之、眾毀之而不為動，此之謂男子。
-
-　　坐間皆談笑而我色莊，坐間皆悲感而我色怡，此之謂乖戾，處己處人兩失之。
-
-　　精明也要十分，只須藏在渾厚裡作用。古今得禍，精明人十居其九，未有渾厚而得
-禍者。今之人惟恐精明不至，乃所以為愚也。
-
-　　分明認得自家是，只管擔當直前做去。卻因毀言輒便消沮，這是極無定力底，不可
-以任天下之重。
-
-　　小屈以求大伸，聖賢不為。吾道必大行之日然後見，便是抱關擊柝，自有不可枉之
-道。松柏生來便直，士君子窮居便正。若曰在下位、遇難事姑韜光忍恥，以圖他日貴達
-之時，然後直躬行道，此不但出處為兩截人，即既仕之後，又為兩截人矣。又安知大任
-到手不放過耶？
-
-　　才能技藝，讓他占個高名，莫與角勝。至於綱常大節，則定要自家努力，不可退居
-人後。
-
-　　處眾人中，孤另另的別作一色人，亦吾道之所不取也。子曰：「群而不黨。」群占
-了八九分，不黨，只到那不可處方用。其用之也，不害其群，才見把持，才見涵養。
-
-　　今之人只是將「好名」二字坐君子罪，不知名是自好不將去。分人以財者，實費財
-；教人以善者，實勞心；臣死忠、子死孝、婦死節者，實殺身；一介不取者，實無所得
-。試著渠將這好名兒好一好，肯不肯？即使真正好名，所為卻是道理。彼不好名者，舜
-乎？跖乎？果舜耶，真加於好名一等矣；果跖耶，是不好美名而好惡名也。愚悲世之人
-以好名沮君子，而君子亦畏好名之譏而自沮，吾道之大害也，故不得不辨。凡我君子，
-其尚獨，復自持，毋為嘵嘵者所撼哉。
-
-　　大其心容天下之物，虛其心受天下之善，平其心論天下之事，潛其心觀天下之理，
-定其心應天下之變。
-
-　　古之居民上者，治一邑則任一邑之重，治一郡則任一郡之重，治天下則任天下之重
-。朝夕思慮其事，日夜經紀其務。一物失所，不遑安席；一事失理，不遑安食。限於才
-者求盡吾心，限於勢者求滿吾分，不愧於君之付托、民之仰望，然後食君之祿，享民之
-奉，泰然無所歉，反焉無所傀。否則是食浮於功也，君子恥之。
-
-　　盜嫂之誣直不疑，撾婦翁之誣第五倫，皆二子之幸也。何者？誣其所無。無近似之
-跡也，雖不辯而久則自明矣。或曰：「使二子有嫂、有婦翁，亦當辯否？」曰：「嫌疑
-之跡，君子安得不辯？『予所否者，天厭之，天厭之。』若付之無言，是與馬償金之類
-也，君子之所惡也。故君子不潔己以病人，亦不自污以徇世。」
-
-　　聽言不爽，非聖人不能。根以有成之心，蜚以近似之語，加之以不避嫌之事，當倉
-卒無及之際，懷隔閡難辯之恨，父子可以相賊，死亡可以不顧，怒室鬩牆，稽唇反目，
-何足道哉！古今國家之敗亡，此居強半。聖人忘於無言，智者照以先覺，賢者熄於未著
-，剛者絕其口語，忍者斷於不行。非此五者，無良術矣。
-
-
-　　榮辱繫乎所立，所立者固，則榮隨之，雖有可辱，人不忍加也；所立者廢，則辱隨
-之，雖有可榮，人不屑及也。是故君子愛其所自立，懼其所自廢。
-
-　　掩護勿攻，屈服勿怒，此用威者之所當知也；無功勿賞，盛寵勿加，此用愛者之所
-當知也。反是皆敗道也。
-
-　　稱人之善，我有一善，又何妒焉？稱人之惡，我有一惡，又何毀焉？
-
-　　善居功者，讓大美而不居；善居名者，避大名而不受。
-
-　　善者不必福，惡者不必禍，君子稔知之也，寧禍而不肯為惡。忠直者窮，諛佞者通
-，君子稔知之也，寧窮而不肯為佞。非但知理有當然，亦其心有所不容已耳。
-
-　　居尊大之位，而使賢者忘其貴重，卑者樂於親炙，則其人可知矣。
-
-　　人不難於違眾，而難於違己。能違己矣，違眾何難？
-
-　　攻我之過者，未必皆無過之人也。苟求無過之人攻我，則終身不得聞過矣。我當感
-其攻我之益而已，彼有過無過何暇計哉？
-
-　　恬淡老成人又不能俯仰，一世便覺乾燥；圓和甘潤人又不能把持，一身便覺脂韋。
-
-　　做人要做個萬全，至於名利地步休要十分占盡，常要分與大家，就帶些缺綻不妨。
-何者？天下無人己俱遂之事，我得人必失，我利人必害，我榮人必辱，我有美名人必有
-愧色。是以君子貪德而讓名，辭完而處缺，使人我一般，不嶢嶢露頭角、立標臬，而胸
-中自有無限之樂。孔子謙己，嘗自附於尋常人，此中極有意趣。
-
-　　「明理省事」甚難，此四字終身理會不盡，得了時，無往而不裕如。
-
-　　胸中有一個見識，則不惑於紛雜之說；有一段道理，則不撓於鄙俗之見。《詩》云
-：「匪先民是程，匪大猷是經，……惟邇言是爭。」平生讀聖賢書，某事與之合，某事
-與之背，即知所適從，知所去取。否則口《詩》《書》而心眾人也，身儒衣冠而行鄙夫
-也。此士之稂莠也。
-
-　　世人喜言無好人，此孟浪語也。今且不須擇人，只於市井稠人中聚百人而各取其所
-長，人必有一善，集百人之善可以為賢人；人必有一見，集百人之見可以決大計。恐我
-於百人中未必人人高出之也，而安可忽匹夫匹婦哉？
-
-　　學欲博，技欲工，難說不是一長，總較作人只是夠了便止。學如班、馬，字如鍾、
-王，文如曹、劉，詩如李；杜，錚錚千古知名，只是個小藝習，所貴在作人好。
-
-　　到當說處，一句便有千鈞之力，卻又不激不疏，此是言之上乘。除此雖十緘也不妨。
-
-　　循弊規若時王之制，守時套若先聖之經，侈己自得，惡聞正論，是人也，亦大可憐
-矣，世教奚賴焉！
-
-　　心要常操，身要常勞。心愈操愈精明，身愈勞愈強健。但自不可過耳。
-
-　　未適可，必止可；既適可，不過可，務求適可而止。此吾人日用持循，須臾粗心不
-得。
-
-　　士君子之偶聚也，不言身心性命，則言天下國家；不言物理人情，則言風俗世道；
-不規目前過失，則問平生德業。傍花隨柳之間，吟風弄月之際，都無鄙俗媟嫚之談，謂
-此心不可一時流於邪僻，此身不可一日令之偷惰也。若一相逢，不是褻狎，便是亂講，
-此與僕隸下人何異？只多了這衣冠耳。
-
-　　作人要如神龍，屈伸變化，自得自如，不可為勢利術數所拘縛。若羈絆隨人，不能
-自決，只是個牛羊。然亦不可嘵嘵悻悻。故大智上哲看得幾事分明，外面要無跡無言，
-胸中要獨往獨來，怎被機械人駕馭得？
-
-　　「財色名位」，此四字考人品之大節目也。這裡打不過，小善不足錄矣。自古砥礪
-名節者，兢兢在這裡做工夫，最不可容易放過。
-
-　　古之人非曰位居貴要、分為尊長而遂無可言之人、無可指之過也；非曰卑幼貧賤之
-人一無所知識、即有知識而亦不當言也。蓋體統名分確然不可易者，在道義之外；以道
-相成、以心相與，在體統名分之外。哀哉！後世之貴要尊長而遂無過也。
-
-　　只盡日點檢自家，發出念頭來，果是人心？果是道心？出言行事果是公正？果是私
-曲？自家人品自家定了幾分？何暇非笑人，又何敢喜人之譽己耶？
-
-　　往見泰山喬岳，以立身四語甚愛之，疑有未盡，因推廣為男兒八景，云：「泰山喬
-岳之身，海闊天空之腹，和風甘雨之色，日照月臨之目，旋乾轉坤之手，磐石砥柱之足
-，臨深履薄之心，玉潔冰清之骨。」此八景予甚愧之，當與同志者竭力從事焉。
-
-　　求人已不可，又求人之轉求；徇人之求已不可，又轉求人之徇人；患難求人已不可
-，又以富貴利達求人。此丈夫之恥也。
-
-　　文名、才名、藝名、勇名，人盡讓得過，惟是道德之名，則妒者眾矣；無文、無才
-、無藝、無勇，人盡謙得起，惟是無道德之名，則愧者眾矣。君子以道德之實潛修，以
-道德之名自掩。
-
-　　「有諸己而後求諸人，無諸己而後非諸人」，固是藏身之恕；有諸己而不求諸人，
-無諸己而不非諸人，自是無言之感。《大學》為居上者言，若士君子守身之常法，則余
-言亦蓄德之道也。
-
-　　乾坤盡大，何處容我不得？而到處不為人所容，則我之難容也。眇然一身而為世上
-難容之人，乃號於人曰：「人之不能容我也。」吁！亦愚矣哉。
-
-　　名分者，天下之所共守者也。名分不立，則朝廷之紀綱不尊而法令不行。聖人以名
-分行道，曲士恃道以壓名分，不知孔子之道視魯侯奚啻天壤，而《鄉黨》一篇何等盡君
-臣之禮！乃知尊名分與諂時勢不同，名分所在，一毫不敢傲惰；時勢所在，一毫不敢阿
-諛。固哉！世之腐儒以尊名分為諂時勢也；卑哉！世之鄙夫以諂時勢為尊名分也。
-
-　　聖人之道，太和而已，故萬物皆育。便是秋冬不害其為太和，況太和又未嘗不在秋
-冬宇宙間哉！余性褊，無弘度、平心、溫容、巽語，願從事於太和之道以自廣焉。
-
-　　只竟夕點檢，今日說得幾句話關係身心，行得幾件事有益世道，自慊自愧，恍然獨
-覺矣。若醉酒飽肉、恣談浪笑，卻不錯過了一日；亂言妄動、昧理從欲，卻不作孽了一
-日。
-
-　　只一個俗念頭，錯做了一生人；只一雙俗眼目，錯認了一生人。
-
-　　少年只要想我見在幹些甚麼事，到頭成個甚麼人，這便有多少恨心！多少愧汗！如
-何放得自家過？
-
-　　明鏡雖足以照秋毫之末，然持以照面不照手者何？面不自見，借鏡以見，若手則吾
-自見之矣。鏡雖明，不明於目也，故君子貴自知自信。以人言為進止，是照手之識也。
-若耳目識見所不及，則匪天下之見聞不濟矣。
-
-　　義、命、法，此三者，君子之所以定身，而眾人之所妄念者也。從妄念而巧邪，圖
-以幸其私，君子恥之。夫義不當為，命不能為，法不敢為，雖欲強之，豈惟無獲，所喪
-多矣。即獲亦非福也。
-
-　　避嫌者，尋嫌者也；自辯者，自誣者也。心事重門洞達，略不回邪；行事八窗玲瓏
-，毫無遮障，則見者服，聞者信。稍有不白之誣，將家家為吾稱冤，人人為吾置喙矣。
-此之謂潔品，不自潔而人潔之。
-
-　　善之當為，如飲食衣服然，乃吾人日用常行事也。人未聞有以禍福廢衣食者，而為
-善則以禍福為行止；未聞有以毀譽廢衣食者，而為善則以毀譽為行止。惟為善心不真誠
-之故耳。果真、果誠，尚有甘死饑寒而樂於趨善者。
-
-　　有象而無體者，畫人也，欲為而不能為。有體而無用者，塑人也，清淨尊嚴，享犧
-牲香火，而一無所為。有運動而無知覺者，偶人也，持提掇指使而後為。此三人者，身
-無血氣，心無靈明，吾無責矣。
-
-　　我身原無貧富貴賤得失榮辱字，我只是個我，故富貴貧賤得失榮辱如春風秋月，自
-去自來，與心全不牽掛，我到底只是個我。夫如是，故可貧可富，可貴可賤，可得可失
-，可榮可辱。今人惟富貴是貪，其得之也必喜，其失之也如何不悲？其得之也為榮，其
-失之也如何不辱？全是靠著假景作真身，外物為分內，此二氏之所笑也，況吾儒乎？吾
-輩做工夫，這個是第一。吾愧不能，以告同志者。
-
-　　「本分」二字，妙不容言。君子持身不可不知本分，知本分則千態萬狀一毫加損不
-得。聖王為治，當使民得其本分，得本分則榮辱死生一毫怨望不得。子弒父，臣弒君，
-皆由不知本分始。
-
-　　兩柔無聲，合也；一柔無聲，受也。兩剛必碎，激也；一剛必損，積也。故《易》
-取一剛一柔，是謂乎中，以成天下之務，以和一身之德，君子尚之。
-
-　　毋以人譽而遂謂無過。世道尚渾厚，人人有心史也。人之心史真，惟我有心史而後
-無畏人之心史矣。
-
-　　淫怒是大惡，裡面御不住氣，外面顧不得人，成甚涵養？或曰：「涵養獨無怒乎？
-」曰：「聖賢之怒自別。」
-
-　　凡智愚無他，在讀書與不讀書；禍福無他，在為善與不為善；貧富無他，在勤儉與
-不勤儉；毀譽無他，在仁恕與不仁恕。
-
-　　古人之寬大，非直為道理當如此，然煞有受用處。弘器度以養德也，省怨怒以養氣
-也，絕仇讎以遠禍也。
-
-　　平日讀書，惟有做官是展布時。將窮居所見聞及生平所欲為者一一試嘗之，須是所
-理之政事各得其宜，所治之人物各得其所，才是滿了本然底分量。
-
-　　只見得眼前都不可意，便是個礙世之人。人不可我意，我必不可人意。不可人意者
-我一人，不可我意者千萬人。嗚呼！未有不可千萬人意而不危者也。是故智者能與世宜
-，至人不與世礙。
-
-　　性分、職分、名分、勢分，此四者，宇內之大物。性分、職分在己，在己者不可不
-盡；名分、勢分在上，在上者不可不守。
-
-　　初看得我污了世界，便是個盜跖；後看得世界污了我，便是個伯夷；最後看得世界
-也不污我，我也不污世界，便是個老子。
-
-　　心要有城池，口要有門戶。有城池則不出，有門戶則不縱。
-
-　　士君子作人不長進，只是不用心、不著力。其所以不用心、不著力者，只是不愧不
-奮。能愧能奮，聖人可至。
-
-　　有道之言，將之心悟；有德之言，得之躬行。有道之言弘暢，有德之言親切。有道
-之言如遊萬貨之肆，有德之言如發萬貨之商。有道者不容不言；有德者無俟於言，雖然
-，未嘗不言也，故曰：「有德者必有言。」
-
-　　學者說話要簡重從容，循物傍事，這便是說話中涵養。
-
-　　或問：「不怨不尤了，恐於事天處人上更要留心不？」曰：「這天人兩項，千頭萬
-緒，如何照管得來？有個簡便之法，只在自家身上做，一念、一言、一事都點檢得，沒
-我分毫不是，那禍福毀譽都不須理會。我無求禍之道而禍來，自有天耽錯；我無致毀之
-道而毀來，自有人耽錯，與我全不干涉。若福與譽是我應得底，我不加喜；是我倖得底
-，我且惶懼愧赧。況天也有力量不能底，人也有知識不到底，也要體悉他。卻有一件緊
-要，生怕我不能格天動物，這個稍有欠缺，自怨自尤且不暇，又那顧得別個？孔子說個
-「上不怨，下不尤」，是不願乎其外道理；孟子說個「仰不愧，俯不怍」，是素位而行
-道理，此二意常相須。
-
-
-　　天理本自廉退，而吾又處之以疏；人欲本善夤緣，而吾又狎之以親。小人滿方寸而
-君子在千里之外矣，欲身之修，得乎？故學者與天理處，始則敬之如師保，既而親之如
-骨肉，久則渾化為一體。人欲雖欲乘間而入也，無從矣。
-
-　　氣忌盛，心忌滿，才忌露。
-
-　　外勍敵五：聲色、貸利、名位、患難、晏安。內勍敵五：惡怒、喜好、牽纏、褊急
-、積慣。世君子終日被這個昏惑凌駕，此小勇者之所納款，而大勇者之所務克也。
-
-　　玄奇之疾，醫以平易；英發之疾，醫以深沉；闊大之疾，醫以充實。不遠之復，不
-若未行之審也。
-
-　　奮始怠終，修業之賊也；緩前急後，應事之賊也；躁心浮氣，畜德之賊也；疾言厲
-色，處眾之賊也。
-
-　　名心盛者必作偽。
-
-　　做大官底是一樣家數，做好人底是一樣家數。
-
-　　見義不為，又托之違眾，此力行者之大戒也。若肯務實，又自逃名，不患於無術，
-吾竊以自恨焉。
-
-　　「恭敬謙謹」，此四字有心之善也；「狎侮傲凌」，此四字有心之惡也，人所易知
-也。至於「怠忽惰慢」，此四字乃無心之失耳。而丹書之戒，怠勝敬者凶，論治忽者，
-至分存亡；《大學》以傲惰同論；曾子以暴慢連語者，何哉？蓋天下之禍患皆起於四字
-，一身之罪過皆生於四字，怠則一切苟且，忽則一切昏忘，惰則一切疏懶，慢則一切延
-遲。以之應事則萬事皆廢，以之接人則眾心皆離。古人臨民如馭朽索，使人如承大祭，
-況接平交以上者乎？古人處事不泄邇，不忘遠，況目前之親切重大者乎？故曰「無眾寡
-，無大小，無敢慢」，此九字即「毋不敬」。「毋不敬」三字，非但聖狂之分，存亡治
-亂、死生禍福之關也，必然不易之理也。沉心精應者始真知之。
-
-　　人一生大罪過只在「自是自私」四字。
-
-　　古人慎言，每云「有餘不敢盡」。今人只盡其餘，還不成大過。只是附會支吾，心
-知其非而取辯於口，不至屈人不止，則又盡有餘者之罪人也。
-
-　　真正受用處，十分用不得一分，那九分都無些干係。而拼死忘生、忍辱動氣以求之
-者，皆九分也，何術悟得他醒？可笑可歎！
-
-　　貧不足羞，可羞是貧而無志；賤不足惡，可惡是賤而無能；老不足歎，可歎是老而
-虛生；死不足悲，可悲是死而無聞。
-
-　　聖人之聞善言也，欣欣然惟恐尼之，故和之以同言，以開其樂告之誠；聖人之聞過
-言也，引引然惟恐拂之，故內之以溫色，以誘其忠告之實。何也？進德改過為其有益於
-我也。此之謂至知。
-
-　　古者招隱逸，今也獎恬退，吾黨可以愧矣。古者隱逸養道，不得已而後出；今者恬
-退養望，邀虛名以干進，吾黨可以戒矣。
-
-　　喜來時一點檢，怒來時一點檢，怠惰時一點檢，放肆時一點檢，此是省察大條款。
-人到此多想不起、顧不得，一錯了，便悔不及。
-
-　　治亂繫所用事。天下國家，君子用事則治，小人用事則亂；一身，德性用事則治，
-氣習用事則亂。
-
-　　難管底是任意，難防底是慣病。此處著力，便是穴上著針、癢處著手。
-
-　　試點檢終日說話，有幾句恰好底，便見所養。
-
-　　業刻木如鋸齒，古無文字，用以記日行之事數也。一事畢則去一刻，事俱畢則盡去
-之，謂之修業。更事則再刻如前。大事則大刻，謂之大業；多事則多刻，謂之廣業。士
-農工商所業不同，謂之常業。農為士則改刻，謂之易業。古人未有一生無所業者，未有
-一日不修業者，故古人身修事理而無怠惰荒寧之時，常有憂勤惕勵之志。一日無事則一
-日不安，懼業之不修而曠日之不可也。今也昏昏蕩蕩，四肢不可收拾，窮年終日無一猷
-為，放逸而入於禽獸者，無業之故也。人生兩間，無一事可見，無一善可稱，資衣藉食
-於人而偷安惰行以死，可羞也已。
-
-　　古之謗人也，忠厚誠篤。《株林》之語，何等渾涵！輿人之謠，猶道實事。後世則
-不然，所怨在此，所謗在彼。彼固知其所怨者未必上之非而其謗不足以行也，乃別生一
-項議論。其才辯附會足以泯吾怨之之實，啟人信之之心，能使被謗者不能免謗之之禍，
-而我逃謗人之罪。嗚呼！今之謗，雖古之君子且避忌之矣。聖賢處謗無別法，只是自修
-，其禍福則聽之耳。
-
-　　處利則要人做君子，我做小人；處名則要人做小人，我做君子，斯惑之甚也。聖賢
-處利讓利，處名讓名，故淡然恬然，不與世忤。
-
-　　任教萬分矜持，千分點檢，裡面無自然根本，倉卒之際、忽突之頃，本態自然露出
-。是以君子慎獨。獨中只有這個，發出來只是這個，何勞迴護？何用支吾？
-
-　　力有所不能，聖人不以無可奈何者責人；心有所當盡，聖人不以無可奈何者自諉。
-
-　　或問：「孔子緇衣羔裘，素衣麑裘，黃衣狐裘，無乃非位素之義與？」曰：「公此
-問甚好。慎修君子，寧失之儉素不妨。若論大中至正之道，得之為，有財卻儉不中禮，
-與無財不得為而侈然自奉者相去雖遠，而失中則均。聖賢不諱奢之名，不貪儉之美，只
-要道理上恰好耳。」
-
-　　寡恩曰薄，傷恩曰刻，盡事曰切，過事曰激。此四者，寬厚之所深戒也。
-
-　　《易》稱「道濟天下」，而吾儒事業動稱行道濟時、濟世安民。聖人未嘗不貴濟也
-。舟覆矣，而保得舟在，謂之濟可乎？故為天下者，患知有其身，有其身不可以為天下。
-
-　　萬物安於知足，死於無厭。
-
-　　足恭過厚，多文密節，皆名教之罪人也。聖人之道自有中正。彼鄉愿者，徼名懼譏
-，希進求榮，辱身降志，皆所不恤，遂成舉世通套。雖直道清節之君子，稍無砥柱之力
-，不免逐波隨流，其砥柱者旋以得罪。嗟夫！佞風諛俗不有持衡當路者一極力挽回之，
-世道何時復古耶？
-
-　　時時體悉人情，念念持循天理。
-
-　　愈進修愈覺不長，愈點檢愈覺有非。何者？不留意作人，自家盡看得過；只日日留
-意向上，看得自家都是病痛。那有些好處？初頭只見得人欲中過失，到久久又見得天理
-中過失，到無天理過失則中行矣。又有不自然、不渾化、著色吃力過失，走出這個邊境
-才是聖人，能立無過之地。故學者以有一善自多、以寡一過自幸，皆無志者也。急行者
-只見道遠而足不前，急耘者只見草多而鋤不利。
-
-　　禮義之大防，壞於眾人一念之苟。譬如由徑之人，只為一時倦行幾步，便平地踏破
-一條蹊徑。後來人跟尋舊跡，踵成不可塞之大道。是以君子當眾人所驚之事略不動容，
-才干礙禮義上些須，便愕然變色，若觸大刑憲然，懼大防之不可潰，而微端之不可開也
-。嗟夫！此眾人之所謂迂而不以為重輕者也。此開天下不可塞之釁者，自苟且之人始也。
-
-　　大行之美，以孝為第一；細行之美，以廉為第一。此二者，君子之所務敦也。然而
-不辨之申生不如不告之舜，井上之李不如受饋之鵝。此二者，孝廉之所務辨也。
-
-　　吉凶禍福是天主張，毀譽予奪是人主張，立身行已是我主張。此三者，不相奪也。
-
-　　不得罪於法易，不得罪於理難。君子只是不得罪於理耳。
-
-　　凡在我者都是分內底，在天、在人者都是分外底。學者要明於內外之分，則在內缺
-一分便是不成人處，在外得一分便是該知足處。
-
-　　聽言觀行，是取人之道；樂其言而不問其人，是取善之道。今人惡聞善言，便訑訑
-曰：「彼能言而行不逮，言何足取？」是弗思也。吾之聽言也，為其言之有益於我耳。
-苟益於我，人之賢否奚問焉？衣敝枲者市文繡，食糟糠者市粱肉，將以人棄之乎？
-
-　　取善而不用，依舊是尋常人，何貴於取？譬之八珍方丈而不下箸，依然餓死耳。
-
-　　有德之容，深沉凝重，內充然有餘，外闃然無跡。若面目都是精神，即不出諸口，
-而漏泄已多矣。畢竟是養得浮淺，譬之無量人，一杯酒便達於面目。
-
-　　人人各有一句終身用之不盡者，但在存心著力耳。或問之，曰：「只是對症之藥便
-是。如子張只消得『存誠』二字，宰我只消得『警惰』二字，子路只消得『擇善』二字
-，子夏只消得『見大』二字。」
-
-　　言一也，出由之口，則信且從；出跖之口，則三令五申而人且疑之矣。故有言者，
-有所以重其言者。素行孚人，是所以重其言者也。不然，且為言累矣。
-
-　　世人皆知笑人，笑人不妨，笑到是處便難，到可以笑人時則更難。
-
-　　毀我之言可聞，毀我之人不必問也。使我有此事也，彼雖不言，必有言之者。我聞
-而改之，是又得一不受業之師也。使我無此事耶，我雖不辯，必有辯之者。若聞而怒之
-，是又多一不受言之過也。
-
-　　精明，世所畏也而暴之；才能，世所妒也而市之，不沒也夫！
-
-　　只一個貪愛心，第一可賤可恥。羊馬之於水草，蠅蟻之於腥羶，蜣螂之於積糞，都
-是這個念頭。是以君子制欲。
-　　清議酷於律令，清議之人酷於治獄之吏。律令所冤，賴清議以明之，雖死猶生也；
-清議所冤，萬古無反案矣。是以君子不輕議人，懼冤之也。惟此事得罪於天甚重，報必
-及之。
-
-　　權貴之門，雖係通家知已，也須見面稀、行蹤少就好。嘗愛唐詩有「終日帝城裡，
-不識五侯門」之句，可為新進之法。
-
-　　聞世上有不平事，便滿腔憤懑，出激切之語，此最淺夫薄子，士君子之大戒。
-
-　　仁厚刻薄是修短關，行止語默是禍福關，勤惰儉奢是成敗關，飲食男女是死生關。
-
-　　言出諸口，身何與焉？而身亡。五味宜於口，腹何知焉？而腹病。小害大，昭昭也
-，而人每縱之徇之，恣其所出，供其所入。
-
-　　渾身都遮蓋得，惟有面目不可掩。面目者，公之證也。即有厚貌者，卒然難做預備
-，不覺心中事都發在面目上。故君子無愧心則無怍容。中心之達達以此也，肺肝之視視
-以此也。此修己者之所畏也。
-　　韋弁布衣，是我生初服，不愧，此生儘可以還大造。軒冕是甚物事？將個丈夫來做
-壞了，有甚面目對那青天白日？是宇宙中一腐臭物也，乃揚眉吐氣，以此誇人，而世人
-共榮慕之，亦大異事。
-　　多少英雄豪傑可與為善而卒無成，只為拔此身於習俗中不出。若不恤群謗，斷以必
-行，以古人為契友，以天地為知己，任他千誣萬毀何妨？
-　　為人無復揚善者之心，無實稱惡者之口，亦可以語真修矣。
-　　身者，道之輿也。身載道以行，道非載身以行也。故君子道行，則身從之以進；道
-不行，則身從之以退。道不行而求進不已，譬之大賈百貨山積不售，不載以歸，而又以
-空輿僱錢也；販夫笑之，貪鄙孰甚焉？故出處之分，只有工語：道行則仕，　道不行則
-卷而懷之。舍是皆非也。
-　　世間至貴，莫如人品與天地參，與古人友，帝王且為之屈，天下不易其守。而乃以
-聲色、財貨、富貴、利達，輕輕將個人品賣了，此之謂自賤。商賈得奇貨亦須待價，況
-士君子之身乎？
-　　身以不護短為第一長進人。能不護短，則長進至矣。
-　　世有十態，君子免焉：無武人之態（粗豪），無婦人之態（柔懦），無兒女之態（
-嬌稚），無市井之態（貪鄙），無俗子之態（庸陋）；無蕩子之態（儇佻），無伶優之
-態（滑稽）；無閭閻之態（村野），無堂下人之態（局迫），無婢子之態：（卑諂），
-無偵諜之態（詭暗），無商賈之態（衒售）。
-　　作本色人，說根心話，幹近情事。
-　　君子有過不辭謗，無過不反謗，共過不推謗。謗無所損於君子也。
-　　惟聖賢終日說話無一字差失。其餘都要擬之而後言，有餘，不敢盡，不然未有無過
-者。故惟寡言者寡過。
-　　心無留言，言無擇人，雖露肺肝，君子不取也。彼固自以為光明矣，君子何嘗不光
-明？自不輕言，言則心口如一耳。
-　　保身底是德義，害身底是才能。德義中之才能，嗚呼！免矣。
-　　恒言「疏懶勤謹」，此四字每相因。懶生疏，謹自勤。聖賢之身豈生而惡逸好勞哉
-？知天下皆惰慢則百務廢弛，而亂亡隨之矣。先正云：古之聖賢未嘗不以怠惰荒寧為懼
-，勤勵不息自強；曰懼；曰強而聖賢之情見矣，所謂憂勤惕勵者也。惟憂故勤，惟惕故
-勵。
-　　謔非有道之言也。孔於豈不戲？竟是道理上脫灑。今之戲者，媟矣，即有滑稽之巧
-，亦近俳優之流。凝靜者恥之。
-　　無責人，自修之第一要道；能體人，養量之第一要法。
-　　予不好走貴公之門，雖情義所關，每以無謂而止。或讓予曰：「奔走貴公，得不謂
-其喜乎？」或曰：「懼彼以不奔走為罪也。」
-　　予歎曰：「不然。貴公之門奔走如市，彼固厭苦之甚者見於顏面，但渾厚忍不發於
-聲耳。徒輸自己一勤勞，徒增貴公一厭惡。且入門一揖之後，賓主各無可言，此面愧郝
-已無髮付處矣。予恐初入仕者犯於眾套而不敢獨異，故發明之。」
-　　亡我者，我也。人不自亡，誰能亡之？
-　　沾沾煦煦，柔潤可人，丈夫之大恥也。君子豈欲與人乖戾？　但自有正情真味故柔
-嘉不是軟美，自愛者不可不辨。
-　　士大夫一身，斯世之奉弘矣。不蠶織而文繡，不耕畜而膏梁，不僱貸而本馬，不商
-販而積蓄，此何以故也？乃於世分毫無補，慚負兩間。『人又以大官詫市井兒，蓋棺有
-餘愧矣。
-　　且莫論身體力行，只聽隨在聚談間曾幾個說天下、國家、身心、性命正經道理？終
-日嘵嘵刺刺，滿口都是閒談亂談。吾輩試一猛省，士君子在天地間可否如此度日？
-　　君子慎求人。講道問德，雖屈已折節，自是好學者事。若富貴利達向人開口，最傷
-士氣，寧困頓沒齒也。
-　　言語之惡，莫大於造誣，行事之惡，莫大於苛刻；心術之惡，莫大於深險。
-　　自家才德，自家明白的。才短德微，即卑官薄祿，已為難稱。若已逾涘分而觖望無
-窮，卻是難為了造物。孔孟身不遇，又當如何？
-　　不善之名，每成於一事，後有諸長，不能掩也；而惟一不善傳。君子之動可不慎與
-？
-　　一日與友人論身修道理，友人曰：「吾老矣。」某曰：「公無自棄。平日為惡，即
-屬行時幹一好事，不失為改過之鬼，況一息尚存乎？」
-　　既做人在世間，便要勁爽爽、立錚錚的。若如春蚓秋蛇，風花雨絮，一生靠人作骨
-，恰似世上多了這個人。
-　　有人於此，精密者病其疏，靡綺者病其陋，繁縟者病其簡，謙恭者病其倨，委曲者
-病其直，無能可於一世之人，奈何？曰：一身怎可得一世之人，只自點檢吾身果如所病
-否？若以一身就眾口，孔子不能，即能之，成個甚麼人品？放君子以中道為從違，不以
-眾言為憂喜。
-　　夫禮非徒親人，乃君子之所以自愛也；非徒尊人，乃君子之所以敬身也。
-　　君子之出言也，如嗇夫之用財；其見義也，如貪夫之趨利。
-　　古之人勤勵，今之人惰慢。勤勵故精明，而德日修；惰慢故昏蔽，而欲日肆。是以
-聖人貴憂勤惕勵。
-　　先王之禮文用以飾情，後世之禮文用以飾偽。飾情則三千三百，雖至繁也，不害其
-為率真；飾偽則雖一揖一拜，已自多矣。後之惡飾偽者，乃一切苟簡決裂，以潰天下之
-防，而自謂之率真，將流於伯子之簡而不可行，又禮之賊也。
-　　清者濁所妒也，而又激之淺之乎？其為量矣。是故君子於已諱美，於人藏疾。若有
-激濁之任者，不害其為分曉。
-　　處世以譏訕為第一病痛。不善在彼，我何與焉？
-　　余待小人不能假辭色，小人或不能堪。年友王道源危之曰：「今世居官切宜戒此。
-法度是朝廷的，財貨是百姓的，真借不得人情。至於辭色，卻是我的；假借些兒何害？
-」余深感之，因識而改焉。
-　　剛、明，世之礙也。剛而婉，明而晦，免禍也夫！
-
-　　君子之所持循，只有兩條路：非先聖之成規，則時王之定制。此外悉邪也、俗也，
-君子不由。
-　　非直之難，而善用其直之難；非用直之難，而善養其直之難。
-　　處身不妨於薄，待人不妨於厚；責己不妨於厚，責人不妨於薄。
-　　坐於廣眾之中，四顧而後語，不先聲，不揚聲，不獨聲。
-　　苦處是正容謹節，樂處是手舞足蹈。這個樂又從那苦處來。
-　　滑稽談諧，言畢而左右顧，惟恐人無笑容，此所謂巧言令色者也。小人側媚皆此態
-耳。小子戒之。
-　　人之視小過也，愧作悔恨如犯大惡，夫然後能改。無傷二字，修己者之大戒也。
-　　有過是一過，不肯認過又是一過。一認則兩過都無，一不認則兩過不免。彼強辯以
-飾非者，果何為也？
-　　一友與人爭，而歷指其短。予曰，「於十分中，君有一分不是否？」友曰：「我難
-說沒一二分。」予曰：「且將這一二分都沒了才好責人。」
-　　余二十年前曾有心跡雙清之志，十年來有四語云：「行欲清，名欲濁；道欲進，身
-欲退；利欲後，害欲前；人欲豐，己欲約。」
-　　近看來，太執著，大矯激，只以無心任自然求當其可耳。名跡一任去來，不須照管
-。
-　　君子之為善也，以為理所當為，非要福，非干祿；其不為不善也，以為理所不當為
-，非懼禍，非遠罪。至於垂世教，則諄諄以禍福刑賞為言。此天地聖王勸懲之大權，君
-子不敢不奉若而與眾共守也，
-　　茂林芳樹，好鳥之媒也；污池濁渠，穢蟲之母也，氣類之自然也。善不與福期，惡
-不與禍招。君子見正人而合，邪人見憸夫而密。
-　　吾觀於射，而知言行矣。夫射審而後發，有定見也；滿而後發，有定力也。夫言能
-審滿，則言無不中；行能審滿，則行無不得。今之言行皆亂放矢也，即中，幸耳。
-　　蝸以涎見覓，蟬以身見黏，螢以光見獲。故愛身者，不貴赫赫之名。
-　　大相反者大相似，此理勢之自然也。故怒極則笑，喜極則悲。
-　　敬者，不苟之謂也，故反苟為敬。
-　　多門之室生風，多口之人生禍。
-　　磨磚砌壁不涂以堊，惡掩其真也。一堊則人謂糞土之牆矣。
-　　凡外飾者，皆內不足者。至道無言，至言無文，至文無法。
-　　苦毒易避，甘毒難避。晉人之壁馬，齊人之女樂，越人之子女玉帛，其毒甚矣，而
-愚者如飴，即知之亦不復顧也。由是推之，人皆有甘毒，不必自外饋，而眈眈求之者且
-眾焉。豈獨虞人、魯人、吳人愚哉？知味者可以懼矣。
-　　好逸惡勞，甘食悅色，適己害群，擇便逞忿，雖鳥獸亦能之。靈於萬物者，當求有
-別，不然，類之矣。且風德麟仁，鶴清豸直，烏孝雁貞，苟擇鳥獸之有知者而效法之，
-且不失為君子矣。可以人而不如乎？
-　　萬事都要個本意；宮室之設，只為安居；衣之設，只為蔽體；食之設，只為充饑；
-器之設，只為利用；妻之設，只為有後。推此類不可盡窮。苟知其本意，只在本意上求
-，分外的都是多了。
-　　士大夫殃及子孫者有十：一曰優免太侈。二日侵奪太多。三曰請托滅公。四曰恃勢
-凌人。五曰困累鄉黨。六曰要結權貴，損國病人。七曰盜上剝下，以實私橐。八曰簧鼓
-邪說，搖亂國是。九曰樹黨報復，明中善人。十曰引用邪昵，虐民病國。
-　　兒輩問立身之道。曰：「本分之內，不欠纖微；本分之外，不加毫末。今也本分弗
-圖，而加於本分之外者，不啻千萬矣。
-　　內外之分何處別白？況敢問纖徽毫末間耶？
-　　智者不與命鬥，不與法鬥，不與理鬥，不與勢鬥。
-　　學者事事要自責，慎無責人。人不可我意，自是我無量；　我不可人意，自是我無
-能。時時自反，才德無不進之理。
-　　氣質之病小，心術之病大。
-　　童心俗態，此二者士人之大恥也。二恥不服，終不可以入君子之路。
-　　習成儀容止甚不打緊，必須是瑟僩中發出來，才是盛德光輝。那個不嚴厲？不放肆
-莊重？不為矜持戲濾？不為媟慢？惟有道者能之，惟有德者識之。
-　　容貌要沉雅自然，只有一些浮淺之色，作為之狀，便是屋漏少工夫。
-　　德不怕難積，只怕易累。千日之積不禁一日之累，是故君子防所以累者。
-　　枕席之言，房闥之行，通乎四海。牆卑室淺者無論，即宮禁之深嚴，無有言而不知
-，動而不聞者。士君子不愛名節則已，如有一毫自好之心，幽獨盲動可不慎與？
-　　富以能施為德，貧以無求為德，貴以下人為德，賤以忘勢為德。
-　　入廟不期敬而自敬，入朝不期肅而自肅，是以君子慎所入也。見嚴師則收斂，見狎
-友則放恣，是以君子慎所接也。
-　　《氓》之詩，悔恨之極也，可為士君子殷鑒，當三復之。唐詩有云：「兩落不上天
-，水覆難再收。」又近世有名言一偶云：「一失腳為千古恨，再回頭是百年身。」此語
-足道《氓》詩心事，其曰亦已焉哉。所謂何嗟及矣，無可奈何之辭也。
-　　平生所為，使怨我者得以指摘，愛我者不能掩護，此省身之大懼也。士君子慎之。
-故我無過，而謗語滔天不足諒也，可談笑而受之；我有過，而幸不及聞，當寢不貼席、
-食不下咽矣。
-　　是以君子貴無惡於志。
-　　謹言慎動，省事清心，與世無礙，與人無求，此謂小跳脫。
-　　身要嚴重，意要安定，色要溫雅，氣要和平，語要簡切，心要慈祥，志要果毅，機
-要縝密。
-　　善養身者，饑渴、寒暑、勞役，外感屢變，而氣體若一，未嘗變也；善養德者，死
-生、榮辱、夷險，外感屢變，而意念若一，未嘗變也。夫藏令之身，至發揚時而解〔亻
-亦〕；長令之身，至收斂時而鬱閼，不得謂之定氣。宿稱鎮靜，至倉卒而色變；宿稱淡
-泊，至紛華而心動，不得謂之定力。斯二者皆無養之過也。
-　　裡面要活潑於規短之中，無令怠忽；外面要溜脫於禮法之中，無今矯強。
-　　四十以前養得定，則老而愈堅；養不定，則老而愈壞。百年實難，是以君子進德修
-業貴及對也。
-　　涵養如培脆萌，省察如搜田蠹，克治如去盤根。涵養如女子坐幽閨，省察如邏卒緝
-奸細，克治如將軍戰勍敵。涵養用勿忘勿助工夫，省察用無怠無荒工夫，克治用是絕是
-忽工夫。
-　　世上只有個道理是可貪可欲的，初不限於取數之多，何者？
-　　所性分定原是無限量的，終身行之不盡。此外都是人欲，最不可萌一毫歆羨心。天
-之生人各有一定的分涯，聖人制人各有一定的品節，譬之擔夫欲肩輿，丐人欲鼎食，徒
-爾勞心，竟亦何益？嗟夫！篡奪之所由生，而大亂之所由起，皆恥其分內之不足安，而
-惟見分外者之可貪可欲故也。故學者養心先要個知分。
-　　知分者，心常寧，欲常得，所欲得自足以安身利用。
-　　心術以光明篤實為第一，容貌以正大老成為第一，言語以簡重真切為第一。
-　　學者只把性分之所固有，職分之所當為；時時留心，件件努力，便駸駸乎聖賢之域
-。非此二者，皆是對外物，皆是妄為。
-　　進德莫如不苟，不苟先要個耐煩。今人只為有躁心而不耐煩，故一切苟且卒至破大
-防而不顧，棄大義而不為，其始皆起於一念之苟也。
-　　不能長進，只為昏弱兩字所苦。昏宜靜以澄神，神定則漸精明；弱宜奮以養氣，氣
-壯則漸強健。
-　　一切言行，只是平心易氣就好。
-　　恣縱既成，不惟禮法所不能制，雖自家悔恨，亦制自家不得。善愛人者，無使恣縱
-；善自愛者，亦無使恣縱。
-　　天理與人欲交戰時，要如百戰健兒，九死不移，百折不回，其奈我何？如何堂堂天
-君，卻為人欲臣僕？內款受降，腔子中成甚世界？
-　　有問密語者囑曰：「望以實心相告！」余笑曰：「吾內有不可瞞之本心，上有不可
-欺之天日，在本人有不可掩之是非，在通國有不容泯之公論，一有不實，自負四愆矣。
-何暇以貌言誑門下哉？」
-　　士君子澡心浴德，要使咳唾為玉，便溺皆香，才見工夫圓滿。若靈台中有一點污濁
-，便如瓜蒂藜蘆，入胃不嘔吐盡不止，
-　　豈可使一刻容留此中耶？夫如是，然後圂涵廁可沉，緇泥可入。
-　　與其抑暴戾之氣，不若養和平之心；與其裁既溢之恩，不若絕分外之望；與其為後
-事之厚，不若施先事之簿；與其服延年之藥，不若守保身之方。
-　　猥繁拂逆，生厭噁心，奮守耐之力；柔豔芳濃，生沾惹心，奮跳脫之力；推挽衝突
-，生隨逐心，奮執持之力；長途末路，生衰歇心，奮鼓舞之力；急遽疲勞，生苟且心，
-奮敬慎之力。
-　　進道入德莫要於有恒。有恒則不必欲速，不必助長，優優漸漸自到神聖地位。故天
-道只是個恒，每日定準是三百六十五度四分度之一，分毫不損不加，流行不緩不急，而
-萬古常存，萬物得所。只無恒了，萬事都成不得。余最坐此病。古人云：「有勤心，無
-遠道。」只有人勝道，無道勝人之理。
-　　士君子只求四真：真心、真口、真耳、真眼。真心，無妄念；真口，無雜語；真耳
-，無邪聞；真眼，無錯識。
-　　愚者人笑之，聰明者人疑之。聰明而愚，其大智也。夫《詩》云：「靡哲不愚」，
-則知不愚非哲也。
-　　以精到之識，用堅持之心，運精進之力，便是金石可穿，豚魚可格，更有甚麼難做
-之事功？難造之聖神？士君子碌碌一生，百事無成，只是無志。
-　　其有善而彰者，必其有惡而掩者也。君子不彰善以損德，不掩惡以長慝。
-　　余日日有過，然自信過發吾心，如清水之魚，才發即見，小發即覺，所以卒不得遂
-其豪悍，至流浪不可收拾者。胸中是非，原先有以照之也。所以常發者何也？只是心不
-存，養不定。
-　　才為不善，怕污了名兒，此是徇外心，苟可瞞人，還是要做；才為不善，怕污了身
-子，此是為己心，即人不知，成為人疑謗，都不照管。是故欺大庭易，欺屋漏難；欺屋
-漏易，欺方寸難。
-　　吾輩終日不長進處，只是個怨尤兩字，全不反己。聖賢學問，只是個自責自盡，自
-責自盡之道原無邊界，亦無盡頭。若完了自家分數，還要聽其在天在人，不敢怨尤。況
-自家舉動又多鬼責人非底罪過，卻敢怨尤耶？以是知自責自盡底人，決不怨尤；怨尤底
-人，決不肯自責自盡。吾輩不可不自家一照看，才照看，便知天人待我原不薄，惡只是
-我多慚負處。
-　　果是瑚璉，人不忍以盛腐殠；果是荼蓼，人不肯以薦宗祊；履也，人不肯以加諸首
-；冠也，人不忍以籍其足。物猶然，而況於人乎？榮辱在所自樹，無以致之，何由及之
-？此自修者所　當知也。
-　　無以小事動聲色，褻大人之體。
-　　立身行已，服人甚難，也要看甚麼人不服，若中道君子不服，當蚤夜省惕。其意見
-不同、性術各別、志向相反者，只要求我一個是，也不須與他別自理會。
-　　其惡惡不嚴者，必有惡於己者也；其好善不亟者，必無善於已者也。仁人之好善也
-，不啻口出；其惡惡也，迸諸四夷不與同中國。孟子曰：「無羞惡之心，非人也。」則
-惡惡亦君子所不免者，但恐為己私，作惡在他人，非可惡耳。若民之所惡而不惡；謂為
-民之父母可乎？
-　　世人糊塗，只是抵死沒自家不是，卻不自想，我是堯、舜乎？果是堯、舜，真是沒
-一毫不是？我若是湯武，未反之前也有分毫錯誤。如何盛氣拒人，巧言飾已，再不認一
-分過差耶？
-　　懶散二字，立身之賊也。千德萬業，日怠廢而無成；千罪萬惡，日橫恣而無制，皆
-此二字為之。西晉仇禮法而樂豪放，病本正在此安肆日偷。安肆，懶散之謂也。此聖賢
-之大成也。
-　　甚麼降伏得此之字，日勤慎。勤慎者，敬之謂也。
-　　不難天下相忘，只怕一人竊笑。夫舉世之不聞道也久矣，而聞道者未必無人。苟為
-聞道者所知，雖一世非之可也；苟為聞道者所笑，雖天下是之，終非純正之學。故曰：
-眾皆悅之，其為士者笑之，有識之君子必不以眾悅博一笑也。
-　　以聖賢之道教人易，以聖賢之道治人難，以聖賢之道出口易，以聖賢之道躬行難；
-以聖賢之道奮始易，以聖賢之道克終難；以聖賢之道當人易，以聖賢之道慎獨難；以聖
-賢之道口耳易，以聖賢之道心得難；以聖賢之道處常易，以聖賢之道處變難。過此六難
-，真到聖賢地步。區區六易，豈不君子路上人？終不得謂篤實之士也。
-　　山西臬司書齋，余新置一榻銘於其上左曰：「爾酣餘夢，得無有宵征露宿者乎？爾
-灸重衾，得無有抱肩裂膚者乎？古之人臥八埏於襁褓，置萬姓於衽席，而後突然得一夕
-之安。嗚呼！古之人亦人也夫？古之民亦民也夫？」右曰：「獨室不觸欲，君子所以養
-精；獨處不交言，君子所以養氣；獨魂不著礙，君子所以養神；獨寢不愧衾，君子所以
-養德。」
-　　慎者之有餘，足以及人；不慎者之所積，不能保身。
-　　近世料度人意，常向不好邊說去，固是衰世人心無忠厚之意。然土君子不可不自責
-。若是素行孚人，便是別念頭人亦向好邊料度，何者？所以自立者，足信也。是故君子
-慎所以立。
-　　人不自愛，則無所不為；過於自愛，則一無可為。自愛者，先占名，實利於天下國
-家，而跡不足以白其心則不為；自愛者，先占利，有利於天下國家，而有損於富貴利達
-則不為。上之者即不為富貴利達，而有累於身家妻子則不為。天下事待其名利兩全而後
-為之，則所為者無幾矣。
-　　與其喜聞人之過，不若喜聞已之過；與其樂道己之善，不若樂道人之善。
-　　要非人，先要認的自家是個甚麼人；要認的自家，先看古人是個甚麼人。
-　　口之罪大於百體，一進去百川灌不滿，一出來萬馬追不回。
-　　家長不能令人敬，則教令不行？不能令人愛，則心志不孚。
-　　自心得者，尚不能必其身體力行，自耳目入者，欲其勉從而強改焉，萬萬其難矣。
-故三達德不恃知也，而又欲其仁；不恃仁也，而又欲其勇。
-　　合下作人自有作人道理，不為別個。
-　　認得真了，便要不候終日，坐以待旦，成功而後止。
-　　人生惟有說話是第一難事。
-　　或問修己之道。曰：「無鮮克有終。」問治人之道。曰：「無忿疾於頑。」
-　　人生天地間，要做有益於世底人。縱沒這心腸、這本事，也休作有損於世底人。
-　　說話如作文字，字在心頭打點過，是心為草稿而口謄真也，猶不能無過，而況由易
-之言，真是病狂喪心者。
-　　心不堅確，志不奮揚，力不勇猛，而欲徒義改過，雖千悔萬悔，競無補於分毫。
-　　人到自家沒奈自家何時，便可慟哭。
-　　福莫美於安常，禍莫危於盛滿。天地間萬物萬事未有盛滿而不衰者也。而盛滿各有
-分量，惟智者能知之。是故卮以一勺為盛滿，甕以數石為盛滿；有甕之容而懷勺之懼，
-則慶有餘矣。
-　　禍福是氣運，善惡是人事。理常相應，類亦相求。若執福善禍淫之說，而使之不爽
-，則為善之心衰矣。大叚氣運只是偶然，故善獲福、淫獲禍者半，善獲禍、淫獲福者亦
-半，不善不淫而獲禍獲福者亦半，人事只是個當然。善者獲福，吾非為福而修善；淫者
-獲禍，吾非為禍而改淫。善獲禍而淫獲福，吾　寧善而處禍，不肯淫而要福。是故君子
-論天道不言禍福，論人事不言利害。自吾性分當為之外，皆不庸心，其言禍福利害，為
-世教發也。
-　　自天子以至於庶人，來有無所畏而不亡者也。天子者，上畏天，下畏民，畏言官於
-一時，畏史官於後世。百官畏君，群吏畏長吏，百姓畏上，君子畏公議，小人畏刑，子
-弟畏父兄，卑幼畏家長。畏則不敢肆而德以成，無畏則從其所欲而及於禍。
-　　非生知，安行之？聖人未有無所畏而能成其德者也。
-　　物忌全盛，事忌全美，人忌全名。是故天地有欠缺之體，聖賢無快足之心。而況瑣
-屑群氓，不安淺薄之分，而欲滿其難厭之欲，豈不安哉？是以君子見益而思損，持滿而
-思溢，不敢恣無涯之望。
-　　靜定後看自家是甚麼一個人。
-　　少年大病，第一怕是氣高。
-　　余參政東藩日，與年友張督糧臨碧在座。余以朱判封筆濃字大，臨碧曰：「可惜！
-可惜！」余擎筆舉手曰：「年兄此一念，天下受其福矣。判筆一字所費絲毫硃耳，積日
-積歲，省費不知幾萬倍。克用硃之心，萬事皆然。天下各衙門積日積歲省費又不知幾萬
-倍。且心不侈然自放，足以養德；財不侈然浪費，足以養福。不但天物不宜暴殄，民膏
-不宜慢棄而已。夫事有重於費者，過費不為奢；省有不廢事者，過省不為吝。」余在撫
-院日，不儉於紙，而戒示吏書片紙皆使有用。比見富貴家子弟，用財貨如泥沙，長餘之
-惠既不及人，有用之物皆棄於地，胸中無不忍一念，口中無可惜兩字。人或勸之，則曰
-：「所值幾何？」余嘗號為溝壑之鬼，而彼方侈然自以為大手段，不小家勢。痛哉！兒
-曹志之。
-　　言語不到千該萬該，再休開口。
-　　今人苦不肯謙，只要拿得架子定，以為存體。夫子告子張從政，以無小大、無眾寡
-、無敢慢為不驕，而周公為相，吐握下白屋甚者。父師有道之君，子不知損了甚體？若
-名分所在，自是貶損不得。
-　　過寬殺人，過美殺身。是以君子不縱民情以全之也，不盈己欲以生之也。
-　　閨門之事可傳，而後知君子之家法矣；近習之人起敬，而後知君子之身法矣。其作
-用處只是無不敬。
-　　宋儒紛紛聚訟語且莫理會，只理會自家何等簡逕。
-　　各自責，則天清地寧；各相責，則天翻地覆。
-　　不逐物是大雄力量，學者第一工夫全在這裡做。
-　　手容恭，足容重，頭容直，口容止，坐如屍，立如齋，儼若思，目無狂視，耳無傾
-聽，此外景也。外景是整齊嚴肅，內景是齋莊中正，未有不整齊嚴肅而能齋莊中正者。
-故撿束五宮百體，只為收攝此心。此心若從容和順於禮法之中，則曲肱指掌、浴沂行歌
-、吟風弄月、隨柳傍花，何適不可？所謂登彼岸無所事筏也。
-　　天地位，萬物育，幾千年有一會，幾百年有一會，幾十年有一會。故天地之中和甚
-難。
-　　敬對肆而言。敬是一步一步收斂向內，收斂至無內處，發出來自然暢四肢，發事業
-，瀰漫六合；肆是一步一步放縱外面去，肆之流禍不言可知。所以千古聖人只一敬字為
-允執的關捩子。堯欽明允恭，舜溫恭允塞，禹之安汝止，湯之聖敬日躋，文之朗恭，武
-之敬勝，孔於之恭而安。講學家不講這個，不知怎麼做工夫。
-　　竊歎近來世道，在上者積寬成柔，積柔成怯，積怯成畏，積畏成廢；在下者積慢成
-驕，積驕成怨，積怨成橫，積橫成敢。
-　　吾不知此時治體當如何反也。體面二字，法度之賊也。體面重，法度輕；法度弛，
-紀綱壞。昔也病在法度，今也病在紀綱。名分者，紀綱之大物也。今也在朝小臣藐大臣
-，在邊軍士輕主帥，在家子婦蔑父母，在學校弟子慢師，後進凌先進，在鄉里卑幼軋尊
-長。惟貪肆是恣，不知禮法為何物，漸不可長。今已長矣，極之必亂必亡，勢已重矣，
-反已難矣。無識者猶然，甚之，奈何？
-　　禍福者，天司之；榮辱者，君司之；毀譽者，人司之；善惡者，我司之。我只理會
-我司，別個都莫照管。
-　　吾人終日最不可悠悠蕩蕩作空軀殼。
-　　業有不得不廢時，至於德，則自有知以至無知時，不可一息斷進修之功也。
-　　清無事澄，濁降則自清；禮無事復，己克則自復。去了病，便是好人；去了雲，便
-是晴天。
-　　七尺之軀，戴天覆地，抵死不屈於人，乃自落草，以至蓋棺降志辱身、奉承物欲，
-不啻奴隸，到那魂升於天之上，見那維皇上帝有何顏面？愧死！愧死！
-　　受不得誣謗，只是無識度。除是當罪臨刑，不得含冤而死，須是辯明。若污蔑名行
-，閒言長語，愈辨則愈加，徒自憤懑耳。
-　　不若付之忘言，久則明也。得不明也，得自有天在耳。
-　　作一節之士也要成章，不成章便是苗而不秀。
-　　不患無人所共知之顯名，而患有人所不知之隱惡。顯明雖著遠邇，而隱惡獲罪神明
-。省躬者懼之。
-　　蹈邪僻，則肆志抗額略無所顧忌；由義禮，則羞頭愧面若無以自容。此愚不肖之恒
-態，而士君子之大恥也。
-　　物欲生於氣質。
-　　要得富貴福澤，天主張，由不得我；要做賢人君子，我主張，由不得天。
-　　為惡再沒個勉強底，為善再沒個自然底。學者勘破此念頭，寧不愧奮？
-　　不為三氏奴婢，便是兩間翁主。三氏者何？一曰氣質氏，生來氣稟在身，舉動皆其
-作使，如勇者多暴戾，懦者多退怯是已。二曰習俗氏，世態即成，賢者不能自免，只得
-與世浮沉，與世依違，明知之而不能獨立。三曰物欲氏，滿世皆可殢之物，每日皆殉欲
-之事，㽸痼流連，至死不能跳脫。魁然七尺之軀，奔走三家之門，不在此則在彼。降志辱
-身，心安意肯，迷戀不能自知，即知亦不愧憤，大丈夫立身天地之間，與兩儀參，為萬
-物靈，不能挺身自豎而倚門傍戶於三家，轟轟烈烈，以富貴利達自雄，亦可憐矣。予即
-非忠藏義獲，亦豪奴悍婢也，咆哮躑躅，不能解粘去縛，安得挺然脫然獨自當家為兩間
-一主人翁乎！可嘆可恨。
-　　自家作人，自家十分曉底，乃虛美薰心，而喜動顏色，是為自欺。別人作人，自家
-十分曉底，乃明知其惡，而譽侈口頰，是謂欺人。二者皆可恥也。
-　　知覺二字，奚翹天淵。致了知才覺，覺了才算知，不覺算不得知。而今說瘡痛，人
-人都知，惟病瘡者謂之覺。今人為善去惡不成，只是不覺，覺後便由不得不為善不去惡。
-　　順其自然，只有一毫矯強，便不是；得其本有，只有一毫增益，便不是。
-　　度之於長短也，權之於輕重也，不爽毫髮，也要個掌尺提秤底。
-　　四端自有分量，擴充到盡處，只滿得原來分量，再增不得些子。
-　　見義不為，立志無恒，只是腎氣不足。
-　　過也，人皆見之，乃見君子。今人無過可見，豈能賢於君子哉？緣只在文飾彌縫上
-做工夫，費盡了無限巧回護，成就了一個真小人。
-　　自家身子，原是自己心去害他，取禍招尤，陷於危敗，更不幹別個事。
-　　六經四書，君子之律令。小人犯法，原不曾讀法律。士君子讀聖賢書而一一犯之，
-是又在小人下矣。
-　　慎言動於妻子僕隸之間，檢身心於食息起居之際，這工夫便密了。
-　　休諉罪於氣化，一切責之人事；休過望於世間，一切求之我身。
-　　常看得自家未必是，他人未必非，便有長進。再看得他人皆有可取，吾身只是過多
-，更有長進。
-　　理會得義命兩字，自然不肯做低人。
-　　稠眾中一言一動，大家環向而視之，口雖不言，而是非之公自在。果善也，大家同
-萌愛敬之念；果不善也，大家同萌厭惡之念，雖小言動，不可不謹。
-　　或問：「傲為凶德，則謙為吉德矣？」曰：「謙真是吉，然謙不中禮，所損亦多。
-」在上者為非禮之謙，則亂名份、紊紀網，久之法令不行。在下者為非禮之謙，則取賤
-辱、喪氣節，久之廉恥掃地。君子接人未嘗不謹飭，持身未嘗不正大，有子曰：「恭近
-於禮，遠恥辱也。」孔子曰：「恭而無禮則勞。」又曰：「巧言令色足恭，某亦恥之。
-」曾子曰：「脅肩諂笑，病於夏畦。」君子無眾寡，無小大，無敢慢，何嘗貴傲哉？而
-其羞卑佞也又如此，可為立身行己者之法戒。
-　　凡處人不繫確然之名分，便小有謙下不妨。得為而為之，雖無暫辱，必有後憂。即
-不論利害論道理，亦云居上不驕民，可近不可下。
-　　只人情世故熟了，甚麼大官做不到？只天理人心合了，甚麼好事做不成？
-　　士君子常自點檢，晝思夜想，不得一時閑，郤思想個甚事？果為天下國家乎？抑為
-身家妻子乎？飛禽走獸，東鶩西奔，爭食奪巢；販夫豎子，朝出暮歸，風餐水宿，他自
-食其力，原為溫飽，又不曾受人付托，享人供奉，有何不可？士君子高官重祿，上藉之
-以名份，下奉之以尊榮，為汝乎？不為汝乎？乃資權勢而營鳥哭巿井之圖，細思真是愧
-死。
-　　古者鄉有縉紳，家邦受其庇蔭，士民視為準繩。今也鄉有縉紳，增家邦陵奪勞費之
-憂，開土民奢靡浮薄之俗。然則鄉有縉紳，鄉之殃也，風教之蠹也。吾黨可自愧自恨矣。
-　　俗氣入膏肓，扁鵲不能治。為人胸中無分毫道理，而庸調卑職、虛文濫套認之極真
-，而執之甚定，是人也，將欲救藥，知不可入。吾黨戒之。
-　　士大夫居鄉，無論大有裨益，只不違禁出息，倚勢侵陵，受賄囑托，討佔夫役，無
-此四惡，也還算一分人。或曰：「家計蕭條，安得不治生？」曰：「治生有道，如此而
-後治生，無勢可藉者死乎？」或曰：「親族有事，安得不伸理？」曰：「官自有法，有
-訟必藉請謁，無力可通者死乎？」士大夫無窮餓而死之理，安用寡廉喪恥若是。
-　　學者視人欲如寇仇，不患無攻治之力，只緣一向姑息他如驕子，所以養成猖獗之勢
-，無可奈何，故曰識不早，力不易也。制人欲在初發時，極易剿捕，到那橫流時，須要
-奮萬夫莫當之勇，才得濟事。
-　　宇宙內事，皆備此身，即一種未完，一毫未盡，便是一分破綻；天地間生，莫非吾
-體，即一夫不獲，一物失所，便是一處瘡痍。
-　　克一分、百分、千萬分，克得盡時，才見有生真我；退一步、百步、千萬步，退到
-極處，不愁無處安身。
-　　事到放得心下，還慎一慎何妨？言於來向口邊，再思一步更好。
-　　萬般好事說為，終日不為；百種貪心要足，何時是足？
-　　回著頭看，年年有過差；放開腳行，日日見長進。
-　　難消客氣衰猶壯，不盡塵心老尚童。
-　　但持鐵石同堅志，即有金鋼不壞身。
-
-
-
-
-
-問學
-
-
-　　學必相講而後明，講必相宜而後盡。孔門師友不厭窮問極言，不相然諾承順，所謂
-審問明辨也。故當其時，道學大明，如撥雲披霧，白日青天，無纖毫障蔽。講學須要如
-此，無堅自是之心，惡人相直也。
-　　熟思審處，此四字德業之首務；銳意極力，此四字德業之要務；有漸無已，此四字
-德業之成務；深憂過計，此四字德業之終務。
-　　靜是個見道的妙訣，只在靜處潛觀，六合中動的機括都解破。若見了，還有個妙訣
-以守之，只是一，一是大根本，運這一卻要因的通變。
-　　學者只該說下學，更不消說上達。其未達也，空勞你說；其既達也，不須你說。故
-一貫惟參、賜可與，又到可語地位，
-　　才語又一個直語之，二個啟語之，便見孔子誨人妙處。
-　　讀書人最怕誦底是古人語，做底是自家人。這等讀書雖閉戶十年，破卷五車，成甚
-麼用！
-　　能辨真假是一種大學問。世之所抵死奔走者，皆假也。萬古惟有真之一字磨滅不了
-，蓋藏不了。此鬼神之所把握，風雷之所呵護；天地無此不能發育，聖人無此不能參贊
-；朽腐得此可為神奇，鳥獸得此可為精怪。道也者，道此也；學也者，學此也。
-　　或問：「孔子素位而行，非政不謀，而儒者著書立言，便談帝王之略，何也？」曰
-：古者十五而入大學，修齊治平此時便要理會。故陋巷而問為邦，布衣而許南面。由、
-求之志富強，孔子之志三代，孟子樂中，天下而立定，四海之民何曾便到手，但所志不
-得不然。所謂「如或知爾，則何以哉？」要知以個甚麼；苟有用我者，執此以往，要知
-此是甚麼；大人之事備矣，要知備個甚麼。若是平日如醉夢〔全〕不講求，到手如癡呆
-胡亂了事。
-　　如此作人，只是一塊頑肉，成甚學者。即有聰明材辨之士，不過學眼前見識，作口
-頭話說，妝點支吾亦足塞責。如此作人，只是一場傀儡，有甚實用。修業盡職之人，到
-手未嘗不學，待汝學成，而事先受其敝，民已受其病，尋又遷官矣。譬之饑始種粟，寒
-始紡綿，怎得奏功？此凡事所以貴豫也。
-　　不由心上做出，此是噴葉學問；不在獨中慎超，此是洗面工夫，成得甚事。
-　　「堯、舜事功，孔、孟學術。」此八字是君子終身急務。或問：「堯、舜事功，孔
-、孟學術，何處下手？」曰：「以天地萬物為一體，此是孔、孟學術；使天下萬物各得
-其所，此是堯、舜事功。總來是一個念頭。」
-　　上吐下瀉之疾，雖日進飲食，無補於憔悴；入耳出口之學，雖日事講究，無益於身
-心。
-　　天地萬物只是個漸，理氣原是如此，雖欲不漸不得。而世儒好講一頓字，便是無根
-學問。
-　　只人人去了我心，便是天清地寧世界。
-　　塞乎天地之間，盡是浩然了。愚謂根荄須栽入九地之下，枝梢須插入九天之上，橫
-拓須透過八荒之外，才是個圓滿工夫，無量學問。
-　　我信得過我，人未必信得過我，故君子避嫌。若以正大光明之心如青天白日，又以
-至誠惻怛之意如火熱水寒，何嫌之可避。故君子學問第一要體信，只信了，天下無些子
-事。
-　　要體認，不須讀盡古今書，只一部《千字文》，終身受用不盡。要不體認，即三墳
-以來卷卷精熟，也只是個博學之士，資談口、侈文筆、長盛氣、助驕心耳。故君子貴體
-認。
-　　悟者，吾心也。能見吾心，便是真悟。
-　　明理省事，此四字學者之要務。
-　　今人不如古人，只是無學無識。學識須從三代以上來，才正大，才中平。今只將秦
-漢以來見識抵死與人爭是非，已自可笑，況將眼前聞見、自己聰明，翹然不肯下人，尤
-可笑也。
-　　學者大病痛，只是器度小。
-　　識見議論，最怕小家子勢。
-　　默契之妙，越過六經千聖，直與天地談，又不須與天交一語，只對越仰觀，兩心一
-個耳。
-　　學者只是氣盈，便不長進。含六合如一粒，覓之不見；吐一粒於六合，出之不窮，
-可謂大人矣。而自處如庸人，初不自表異；退讓如空夫，初不自滿足，抵掌攘臂而視世
-無人，謂之以善服人則可。
-
-　　心術、學術、政術，此三者不可不辨也。心術要辨個誠偽，學術要辨個邪正，政術
-要辨個王伯。總是心術誠了，別個再不差。
-
-　　聖門學問心訣，只是不做賊就好。或問之。曰：「做賊是個自欺心，自利心，學者
-於此二心，一毫擺脫不盡，與做賊何異？」
-　　脫盡氣習二字，便是英雄。
-　　理以心得為精，故當沉潛。不然，耳邊口頭也。事以典故為據，故當博洽。不然，
-臆說杜撰也。
-　　天是我底天，物是我底物。至誠所通，無不感格，而乃與之扞隔抵牾，只是自修之
-功未至。自修到格天動物處，方是學問，方是工夫。未至於此者，自愧自責不暇，豈可
-又萌出個怨尤底意思？
-　　世間事無巨細，都有古人留下底法程。才行一事，便思古人處這般事如何？才處一
-人，便思古人處這般人如何？至於起居、言動、語默，無不如此，久則古人與稽，而動
-與道合矣。
-　　其要在存心，其工夫又只在誦詩讀書時便想曰：「此可以為我某事之法，可以藥我
-某事之病。」如此則臨事時觸之即應，不待思索矣。
-　　扶持資質，全在學問，任是天資近聖，少此二字不得。三代而下無全才，都是負了
-在天的，欠了在我的，縱做出掀天揭地事業來，仔細看他，多少病痛！
-　　勸學者歆之以名利，勸善者歆之以福樣。哀哉！
-　　道理書盡讀，事務書多讀，文章書少讀，閒雜書休讀，邪妄書焚之可也。
-　　君子知其可知，不知其不可知。不知其可知則愚，知其不可知則鑿。
-　　余有責善之友，既別兩月矣，見而問之曰：「近不聞僕有過？」友曰：「子無過。
-」余曰：「此吾之大過也。有過之過小，無過之過大，何者？拒諫自矜而人不敢言，飾
-非掩惡而人不能知，過有大於此者乎？使余即聖人也，則可。余非聖人，而人謂無過，
-余其大過哉！」
-　　工夫全在冷清時，力量全在濃豔時。
-　　萬仞崚嶒而呼人以登，登者必少。故聖人之道平，賢者之道峻。穴隙迫窄而招人以
-入，入者必少。故聖人之道博，賢者之道狹。
-　　以是非決行止，而以利害生悔心，見道不明甚矣。
-　　自天子以至於庶人，自堯、舜以至於途之人，必有所以汲汲皇皇者，而後其德進，
-其業成。故曰：雞鳴而起，舜、跖之徒皆有所孳孳也。無所用心，孔子憂之曰：「不有
-博奕者乎？」懼無所孳孳者，不舜則跖也。今之君子縱無所用心，而不至於為跖，然飽
-食終日，惰慢彌年，既不作山林散客，又不問廟堂急務，如醉如癡，以了日月。《易》
-所謂「君子進德修業，欲及時也」，果是之謂乎？如是而自附於清品高賢，吾不信也。
-孟子論歷聖道統心傳，不出憂勤惕勵四字。其最親切者，曰：「仰而思之，夜以繼日；
-幸而得之，坐以待旦。」此四語不獨作相，士、農、工、商皆可作座右銘也。
-　　怠惰時看工夫，脫略時看點檢，喜怒時看涵養，患難時看力量。
-　　今之為舉子文者，遇為學題目，每以知行作比。試思知個甚麼？行個甚麼？遇為政
-題目，每以教養作比。試問做官養了那個？教了那個？若資口舌浮談，以自致其身，以
-要國家寵利，此與誆騙何異？吾輩宜惕然省矣。
-　　聖人以見義不為屬無勇，世儒以知而不行屬無知。聖人體道有三達德，曰：智、仁
-、勇。世儒曰知行。只是一個不知，誰說得是？愚謂自道統初開，工夫就是兩項，曰惟
-精察之也，　曰惟一守之也。千聖授受，惟此一道。蓋不精則為孟浪之守，不一則為想
-象之知。曰思，曰學，曰致知，曰力行，曰至明，曰至健，曰問察，曰用中，曰擇乎中
-庸、服膺勿失，曰非知之艱、惟行之艱，曰非苟知之、亦允蹈之，曰知及之、仁守之，
-曰不明乎善、不誠乎身。
-　　自德性中來，生死不變；自識見中來，則有時而變矣。故君子以識見養德性。德性
-堅定則可生可死。
-　　昏弱二字是立身大業障，去此二字不得，做不出一分好人。
-　　學問之功，生知聖人亦不敢廢。不從學問中來，任從有掀天揭地事業，都是氣質作
-用。氣象豈不炫赫可觀，一入聖賢秤尺，坐定不妥貼。學問之要如何？隨事用中而矣。
-　　學者，窮經博古，涉事籌今，只見日之不足，惟恐一登薦舉，不能有所建樹。仕者
-，修政立事，淑世安民，只見日之不足，惟恐一旦升遷，不獲竟其施為。此是確實心腸
-，真正學問，為學為政之得真味也。
-　　進德修業在少年，道明德立在中年，義精仁熟在晚年。若五十以前德性不能堅定，
-五十以後愈懶散，愈昏弱，再休說那中興之力矣。
-　　世間無一件可驕人之事。才藝不足驕人，德行是我性分事，不到堯、舜、周、孔，
-便是欠缺，欠缺便自可恥，如何驕得人？
-　　有希天之學，有達天之學，有合天之學，有為天之學。
-　　聖學下手處，是無不敬；住腳處，是恭而安。
-　　小家學問不可以語廣大，圂障學問不可以語易簡。
-　　天下至精之理，至難之事，若以潛玩沉思求之，無厭無躁，雖中人以下，未有不得
-者。
-　　為學第一工夫，要降得浮躁之氣定。
-　　學者萬病，只個靜字治得。
-　　學問以澄心為大根本，以慎口為大節目。
-　　讀書能使人寡過，不獨明理。此心日與道俱，邪念自不得乘之。
-　　無所為而為，這五字是聖學根源。學者入門念頭就要在這上做。今人說話第二三句
-便落在有所為上來，只為毀譽利害心脫不去，開口便是如此。
-　　已所獨知，盡是方便；人所不見，盡得自由。君子必兢兢然細行，必謹小物不遺者
-，懼工夫之間斷也，懼善念之停息也，懼私欲之乘間也，懼自欺之萌櫱也，懼一事苟而
-其徐皆苟也，懼閒居忽而大庭亦忽也。故廣眾者，幽獨之證佐；言動者，意念之枝葉。
-意中過，獨處疏，而十目十手能指視之者，枝葉、證佐上得之也。君子奈何其慢獨？不
-然，苟且於人不見之時，而矜持於視爾友之際，豈得自然？豈能周悉？徒爾勞心，而慎
-獨君子己見其肺肝矣。
-　　古之學者在心上做工夫，故發之外面者為盛德之符；今之學者在外面做工夫，故反
-之於心則為實德之病。
-　　事事有實際，言言有妙境，物物有至理，人人有處法，所貴乎學者，學此而已。無
-地而不學，無時而不學，無念而不學，不會其全、不詣其極不止，此之謂學者。今之學
-者果如是乎？
-
-　　留心於浩瀚博雜之書，役志於靡麗刻削之辭，耽心於鑿真亂俗之技，爭勝於煩勞苛
-瑣之儀，可哀矣！而醉夢者又貿貿昏昏，若癡若病，華衣甘食而一無所用心，不尤可哀
-哉？是故學者貴好學，尤貴知學。
-　　天地萬物，其情無一毫不與吾身相干涉，其理無一毫不與吾身相發明。
-　　凡字不見經傳，語不根義理，君子不出諸口。
-　　古之君子病其無能也，學之；今之君子恥其無能也，諱之。
-　　無才無學，士之羞也；有才有學，士之憂也。夫才學非有之為難，降伏之難。君子
-貴才學以成身也，非以矜己也；以濟世也，非以誇人也。故才學如劍，當可試之時一試
-，不則藏諸室，無以衒弄，不然，鮮不為身禍者。自古十人而十，百人而百，無一倖免
-，可不憂哉？
-　　人生氣質都有個好處，都有個不好處、學問之道無他，只是培養那自家好處，救正
-那自家不好處便了。
-　　道學不行，只為自家根腳站立不住。或倡而不和，則勢孤；或守而眾撓，則志惑，
-或為而不成，則氣沮；或奪於風俗，則念雜。要挺身自拔，須是有萬夫莫當之勇，死而
-後已之心。不然，終日三五聚談，焦唇敝舌，成得甚事？
-　　役一己之聰明，雖聖人不能智；用天下之耳目，雖眾人不能愚。
-　　涵養不定底，自初生至蓋棺時凡幾變？即知識已到，尚保不定畢竟作何種人，所以
-學者要德性堅定。到堅定時，隨常變、窮達、生死只一般；即有難料理處，亦自無難。
-若乎日不
-　　遇事時，盡算好人，一遇個小小題目，便考出本態，假遇著難者、大者，知成個甚
-麼人？所以古人不可輕易笑，恐我當此未便在渠上也。
-　　屋漏之地可服鬼神，室家之中不厭妻子，然後謂之真學、真養。勉強於大庭廣眾之
-中，幸一時一事不露本象，遂稱之曰賢人，君子恐未必然。
-　　這一口呼吸去，萬古再無復返之理。呼吸暗積，不覺白頭，靜觀君子所以撫髀而愛
-時也。然而愛時不同，富貴之士歎榮顯之未極，功名之士歎事業之末成，放達之士恣情
-於酒以樂餘年，貪鄙之士苦心于家以遺後嗣。然猶可取者，功名之士耳。彼三人者，何
-貴於愛時哉？惟知道君子憂年數之日促，歎義理之無窮，天生此身無以稱塞，誠恐性分
-有缺，不能全歸，錯過一生也。此之謂真愛時。所謂此日不再得，此日足可惜者，皆救
-火追亡之念，踐形盡性之心也。嗚呼！不患無時，而患奔時。苟不棄時，而此心快足，
-雖夕死何恨？不然，即百歲，幸生也。
-　　身不修而惴惴焉，毀譽之是恤；學不進而汲汲焉，榮辱之是憂，此學者之通病也。
-　　冰見烈火，吾知其易易也，然而以熾炭鑠堅冰，必舒徐而後盡；盡為寒水，又必待
-舒徐而後溫；溫為沸湯，又必待舒徐而後竭。夫學豈有速化之理哉？是故善學者無躁心
-，有事勿忘從容以俟之而巳。
-　　學問大要，須把天道、人情、物理、世故識得透徹，卻以胸中獨得中正底道理消息
-之。
-　　與人為善，真是好念頭。不知心無理路者，淡而不覺；道不相同者，拂而不入。強
-聒雜施，吾儒之戒也。孔子啟憤發、悱復、三隅，中人以下不語上，豈是倦於誨人？謂
-兩無益耳。
-　　故大聲不煩奏，至教不苟傳。
-　　羅百家者，多浩瀚之詞；工一家者，有獨詣之語。學者欲以有限之目力，而欲竟其
-律涯；以鹵莽之心思，而欲探其蘊奧，豈不難哉？故學貴有擇。
-　　講學人不必另尋題目，只將四書六經發明得聖賢之道精盡有心得。此心默契千古，
-便是真正學問。
-　　善學者如鬧市求前，摩肩重足得一步便緊一步。
-　　有志之士要百行兼修，萬善俱足。若只作一種人，硜硜自守，沾沾自多，這便不長
-進。
-　　《大學》一部書，統於明德兩字；《中庸》一部書，統於修道兩字。
-　　學識一分不到，便有一分遮障。譬之掘河分隔，一界土不通，便是一段流不去，須
-是衝開，要一點礙不得。涵養一分不到，便有一分氣質。譬之燒炭成熟，一分木未透，
-便是一分煙不止，須待灼透，要一點煙也不得。
-　　除了中字，再沒道理；除了敬字，再投學問。
-　　心得之學，難與口耳者道；口耳之學，到心得者前，如權度之於輕重短長，一毫掩
-護不得。
-　　學者只能使心平氣和，便有幾分工夫。心乎氣和人遇事卻執持擔當，毅然不撓，便
-有幾分人品。
-　　學莫大於明分。進德要知是性分，修業要知是職分，所遇之窮通，要知是定分。
-　　一率作，則覺有意味，日濃日豔，雖難事，不至成功不休；一間斷，則漸覺疏離，
-日畏日怯，雖易事，再使繼續甚難。是以聖學在無息，聖心曰不已。一息一已，難接難
-起，此學者之大懼也。余平生德業無成，正坐此病。《詩》曰：「日就月將，學有緝熙
-於光明。」吾黨日宜三復之。
-　　堯、舜、禹、湯、文、武全從「不自滿假」四字做出，至於孔子，平生謙退沖虛，
-引過自責，只看著世間有無窮之道理，自家有未盡之分量。聖人之心蓋如此。孟子自任
-太勇，自視太高，而孜孜向學，〔舀欠〕〔舀欠〕自歉之意，似不見有宋儒口中談論都
-是道理，身所持循亦不著世俗，豈不聖賢路上人哉？但人非堯、舜，誰無氣質？稍偏，
-造詣未至，識見未融，體驗未到，物欲未忘底過失，只是自家平生之所不足者，再不肯
-口中說出，以自勉自責，亦不肯向別人招認，以求相勸相規。所以自孟子以來，學問都
-似登壇說法，直下承當，終日說短道長，談天論性，看著自家便是聖人，更無分毫可增
-益處。只這見識，便與聖人作用已自不同，如何到得聖人地位？
-　　性躁急人，常令之理紛解結；性遲緩人，常令之逐獵追奔。
-　　推此類，則氣質之性無不漸反。
-　　恒言平穩二宇極可玩。蓋天下之事，惟平則穩，行險亦有得的，終是不穩。故君子
-居易。
-　　二分寒暑之中也，晝夜分停，多不過七、八日；二至寒暑之偏也，晝夜偏長，每每
-二十三日。始知中道難持，偏氣易勝，天且然也。故堯舜毅然曰允執，蓋以人事勝耳。
-　　裡面五分，外面只發得五分，多一釐不得；裡面十分，外面自發得十分，少一釐不
-得。誠之不可掩如此，夫故曰不誠無物。
-　　休躡著人家腳跟走，此是自得學問。
-　　正門學脈切近精實，旁門學脈奇特玄遠；正門工夫戒慎恐懼，旁門工夫曠大逍遙；
-正門宗指漸次，旁門宗指逕頓；正門造詣俟其自然，旁門造詣矯揉造作。
-　　或問：「仁、義、禮、智發而為惻隱、羞惡、辭讓、是非，便是天則否？」曰，「
-聖人發出來便是天則，眾人發出來都落氣質，不免有太過不及之病。只如好生一念，豈
-非惻隱？至以面為犧牲，便非天則。」
-　　學問博識強記易，會通解悟難。會通到天地萬物[ 已難] ，解悟到幽明古今無間為
-尤難。
-　　強恕是最拙底學問，三近人皆可行，下此無工夫矣。
-　　王心齋每以樂為學，此等學問是不會苦的甜瓜。入門就學樂，其樂也，逍遙自在耳
-，不自深造真積、憂勤惕勵中得來。孔子之樂以忘憂，由於發憤忘食；顏子之不改其樂
-，由於博約克復。其樂也，優游自得，無意於歡欣，而自不擾，無心於曠達，而自不悶
-。若覺有可樂，還是乍得心；著意學樂，便是助長心，幾何而不為猖狂自恣也乎？
-　　余講學只主六字，曰天地萬物一體。或曰：「公亦另立門戶耶？」曰：「否。只是
-孔門一個仁字。」
-　　無慎獨工夫，不是真學問；無大庭效驗，不是真慎獨。終日嘵嘵，只是口頭禪耳。
-　　體認要嘗出悅心真味工夫，更要進到百尺竿頭始為真儒。
-　　向與二三子暑月飲池上，因指水中蓮房以談學問曰：「山中人不識蓮，於藥鋪買得
-乾蓮肉，食之稱美。後入市買得久摘鮮蓮，食之更稱美也。」余歎曰：「渠食池上新摘
-，美當何如？一摘出池，真味猶漓，若臥蓮舟挽碧筒就房而裂食之，美更何如？今之體
-認皆食乾蓮肉者也。又如這樹上胡桃，連皮吞之，不可謂之不吃，不知此果須去厚肉皮
-，不則麻口；再去硬骨皮，不則損牙；再去瓤上粗皮，不則澀舌；再去薄皮內萌皮，不
-則欠細膩。如是而漬以蜜，煎以糖，始為盡美。今之工夫，皆囫圇吞胡桃者也。如此體
-認，始為精義入神；如此工夫，始為義精仁熟。」
-　　上達無一頓底。一事有一事之上達，如灑掃應對，食息起居，皆有精義入神處。一
-步有一步上達，到有恒處達君子，到君子處達聖人，到湯、武聖人達堯、舜。堯、舜自
-視亦有上達，自歎不如無懷葛天之世矣。
-　　學者不長進，病根只在護短。聞一善言，不知不肯問；理有所疑，對人不肯問，恐
-人笑己之不知也。孔文子不恥下問，今也恥上問；顏子以能問不能，今也以不能問能。
-若怕人笑，比德山捧臨濟喝法壇對眾如何承受？這般護短，到底成個人笑之人。一笑之
-恥，而終身之笑顧不恥乎？兒曹戒之。
-　　學問之道，便是正也，怕雜。不一則不真，不真則不精。入萬景之山，處處堪游，
-我原要到一處，只休亂了腳；入萬花之谷，朵朵堪觀，我原要折一枝，只休花了眼。
-　　日落趕城門，遲一腳便關了，何處止宿？故學貴及時。懸崖抱孤樹，鬆一手便脫了
-，何處落身？故學貴著力。故傷悲於老大，要追時除是再生；既失於將得，要仍前除是
-從頭。
-　　學問要訣只有八個字：「涵養德性，變化氣質。」守住這個，再莫問迷津問渡。
-　　點檢將來，無愧心，無悔言，無恥行，胸中何等快樂！只苦不能，所以君子有終身
-之憂。常見王心齋「學樂歌」，心頗疑之，樂是自然養盛所致，如何學得。
-　　除不了「我」，算不得學問。
-　　學問二字原自外面得來。蓋學問之理，雖全於吾心，而學問之事，則皆古今名物，
-人人而學，事事而問，攢零合整，融化貫串，然後此心與道方浹洽暢快。若怠於考古，
-恥於問人，聰明只自己出，不知怎麼叫做學者。
-　　聖人千言萬語，經史千帙萬卷，都是教人學好，禁人為非。若以先哲為依歸，前言
-為律令，即一二語受用不盡。若依舊作世上人，或更污下，即將蒼頡以來書讀盡，也只
-是個沒學問底人。
-　　萬金之賈，貨雖不售不憂；販夫閉門數曰，則愁苦不任矣。凡不見知而慍，不見是
-而悶，皆中淺狹而養不厚者也。
-　　善人無邪夢，夢是心上有底。男不夢生子，女不夢娶妻，念不及也。只到夢境，都
-是道理上做。這便是許大工夫，許大造詣。
-　　天下難降伏、難管攝底，古今人都做得來，不謂難事。惟有降伏管攝自家難，聖賢
-做工夫只在這裡。
-　　吾友楊道淵常自嘆恨，以為學者讀書，當失意時便奮發，曰：「到家郤要如何？」
-及奮發數日，或倦怠，或應酬，則曰：「且歇下一時，明日再做。」且、卻二字循環過
-了一生。予深味其言。士君子進德修業皆為且、卻二字所牽縛，白首竟成浩嘆。果能一
-旦奮發有為，鼓舞不倦，除卻進德是斃而後已工夫，其餘事業，不過五年七年，無不成
-就之理。
-　　君子言見聞，不言不見聞；言有益，不言不益。
-　　對左右言，四顧無愧色；對朋友言，臨別無戒語，可謂光明矣，胸中何累之有？
-　　學者常看得為我之念輕，則欲念自薄，仁心自達。是以為仁工夫曰「克己」，成仁
-地位曰「無我」。
-　　天下事皆不可溺，惟是好德欲仁不嫌於溺。
-　　把矜心要去得毫髮都盡，只有些須意念之萌，面上便帶著。聖賢志大心虛，只見得
-事事不如人，只見得人人皆可取，矜念安從生？此念不忘，只一善便自足，淺中狹量之
-鄙夫耳。
-　　師無往而不在也，鄉國天下古人師善人也，三人行則師惡人矣。予師不止此也，鶴
-之父子，蟻之君臣，鴛鴦之夫婦，果然之朋友，鳥之孝，騶虞之仁，雉之耿介，鳩之守
-拙，則觀禽哭而得吾師矣。松柏之孤直，蘭芷之清芳，萍藻之潔，桐之高秀，蓮之淄泥
-不染，菊之晚節愈芳，梅之貞白，竹之內虛外直、圓通有節，則觀草木而得吾師矣。山
-之鎮重，川之委曲而直，石之堅貞，淵之涵蓄，土之渾厚，火之光明，金之剛健，則觀
-五行而得吾師矣。鑒之明，衡之直，權之通變，量之有容，機之經綸，則觀雜物而得吾
-師矣。嗟夫！能自得師，則盈天地間皆師也。不然堯舜自堯舜，朱均自朱均耳。
-　　聖賢只在與人同欲惡，「己欲立而立人，己欲達而達人。」，「我不欲人之加諸我
-也，吾亦欲無加諸人」，便是聖人。能近取譬，施諸己而不願，亦勿施於人，便是賢者
-。專所欲於己，施所惡於人，便是小人。學者用情，只在此二字上體認，最為吃緊，充
-得盡時，六合都是個，有甚一己。
-
-　　人情只是個好惡，立身要在端好惡，治人要在同好惡。故好惡異，夫妻、父子、兄
-弟皆寇仇；好惡同，四海、九夷、八蠻皆骨肉。
-　　「好學近乎知，力行近乎仁，知恥近乎勇。」有志者事竟成，那怕一生昏弱。「內
-視之謂明，反聽之謂聰，自勝之謂強。」外求則失愈遠，空勞百倍精神。
-　　寄講學諸云：「白日當天，又向蟻封尋爝火；黃金滿室，卻穿鶉結丐藜羹。
-　　歲首桃符：「新德隨年進，昨非與歲除。」
-　　縱作神仙，到頭也要盡；莫言風水，何地不堪埋？
-
-
-
-
-
-應務
-
-
-　　閒暇時留心不成，倉卒時措手不得。胡亂支吾，任其成敗，或悔或不悔，事過後依
-然如昨世之人。如此者，百人而百也。
-　　凡事豫則立，此五字極當理會。
-　　道眼在是非上見，情眼在愛憎上見，物眼無別白，渾沌而已。
-　　實見得是時，便要斬釘截鐵，脫然爽潔，做成一件事，不可拖泥帶水，靠壁倚牆。
-　　人定真足勝天。今人但委於天，而不知人事之未定耳。夫冬氣閉藏不能生物，而老
-圃能開冬花，結春實；物性蠢愚不解人事，而鳥師能使雀奕棋，蛙教書，況於能為之人
-事而可委之天乎？
-　　責善要看其人何如，其人可責以善，又當自盡長善救失之道。無指摘其所忌，無盡
-數其所失，無對人，無峭直，無長言，無累言，犯此六戒，雖忠告，非善道矣。其不見
-聽，我亦且有過焉，何以責人？
-　　余行年五十，悟得五不爭之味。人問之。曰：「不與居積人爭富，不與進取人爭貴
-，不與矜飾人爭名，不與簡傲人爭禮，不與盛氣人爭是非。」
-　　眾人之所混同，賢者執之；賢者之所束縛，聖人融之。
-　　做天下好事，既度德量力，又審勢擇人。專欲難成，眾怒難犯。此八字者，不獨妄
-動人宜慎，雖以至公無私之心，行正大光明之事，亦須調劑人情，發明事理，俾大家信
-從，然後動有成，事可久。盤庚遷殷，武王伐紂，三令五申猶恐弗從。蓋恒情多暗於遠
-識，小人不便於己私；群起而壞之，雖有良法，胡成胡久？自古皆然，故君子慎之。
-　　辨學術，談治理，直須窮到至處，讓人不得，所謂宗廟朝廷便便言者。蓋道理，古
-今之道理，政事，國家之政事，務須求是乃已。我兩人皆置之度外，非求伸我也，非求
-勝人也，何讓人之有？只是平心易氣，為辨家第一法。才聲高色厲，便是沒涵養。
-　　五月繅絲，正為寒時用；八月績麻，正為暑時用；平日涵養，正為臨時用。若臨時
-不能駕御氣質、張主物欲，平日而曰「我涵養」，吾不信也。夫涵養工夫豈為涵養時用
-哉？故馬蹷而後求轡，不如操持之有常；輻拆而後為輪，不如約束之有素。
-　　其備之也若迂，正為有時而用也。
-　　膚淺之見，偏執之說，傍經據傳也近一種道理，究竟到精處都是浮說陂辭。所以知
-言必須胸中有一副極准秤尺，又須在堂上，而後人始從。不然，窮年聚訟，其誰主持耶
-？
-　　纖芥眾人能見，置纖芥於百里外，非驪龍不能見，疑似賢人能辨，精義而至入神，
-非聖人不解辨。夫以聖人之辨語賢人，且滋其感，況眾人乎？是故微言不入世人之耳。
-　　理直而出之以婉，善言也，善道也。
-　　因之一字妙不可言。因利者無一錢之費，因害者無一力之勞，因情者無一念之拂，
-因言者無一語之爭。或曰：「不幾於徇乎？」曰：「此轉入而徇我者也。」或曰：「不
-幾於術乎？」曰：「此因勢而利導者也。」故惟聖人善用因，智者善用因。
-　　處世常過厚無害，惟為公持法則不可。
-　　天下之物紆徐柔和者多長，迫切躁急者多短。故烈風驟雨無祟朝之威，暴漲狂瀾無
-三日之勢，催拍促調非百板之聲，疾策緊銜非千里之轡。人生壽夭禍福無一不然，褊急
-者可以思矣。
-　　干天下事無以期限自寬。事有不測，時有不給，常有餘於期限之內，有多少受用處！
-　　將事而能弭，當事而能救，既事而能挽，此之謂達權，此之謂才；未事而知其來，
-始事而要其終，定事而知其變，此之謂長慮，此之謂識。
-　　凡禍患，以安樂生，以憂勤免；以奢肆生，以謹約免；以觖望生，以知足免；以多
-事生，以慎動免。
-　　任難任之事，要有力而無氣；處難處之人，要有知而無言。
-　　撼大摧堅，要徐徐下手，久久見功，默默留意，攘臂極力，一犯手自家先敗。
-　　昏暗難諭之識，優柔不斷之性，剛慎自是之心，皆不可與謀天下之事。智者一見即
-透，練者觸類而通，困者熟思而得。
-　　三者之所長，謀事之資也，奈之何其自用也？
-　　事必要其所終，慮必防其所至。若見眼前快意便了，此最無識，故事有當怒，而君
-子不怒；當喜，而君子不喜；當為，而君子不為，當已，而君子不已者，眾人知其一，
-君子知其他也。
-　　柔而從人於惡，不若直而挽人於善；直而挽人於善，不若柔而挽人於善之為妙也。
-　　激之以理法，則未至於惡也，而奮然為惡；愧之以情好，則本不徙義也，而奮然向
-義。此游說者所當知也。
-　　善處世者，要得人自然之情。得人自然之情，則何所不得？
-　　失人自然之情，則何所不失？不惟帝王為然，雖二人同行，亦離此道不得。
-　　察言觀色，度德量力，此八字處世處人一時少不得底。
-　　人有言不能達意者，有其狀非其本心者，有其言貌誣其本心者。君子現人與其過察
-而誣人之心，寧過恕以逃人之情。
-　　人情天下古今所同，聖人防其肆，特為之立中以的之。故立法不可太極，制禮不可
-太嚴，責人不可太盡，然後可以同歸於道。不然，是驅之使畔也。
-
-　　天下之事，有速而迫之者，有遲而耐之者，有勇而劫之者，有柔而折之者，有憤而
-激之者，有喻而悟之者，有獎而歆之者，有甚而談之者，有順而緩之者，有積誠而感之
-者，要在相機。　因時舛施，未有不敗者也。
-　　論眼前事，就要說眼前處置，無追既往，無道遠圖，此等語雖精，無裨見在也。
-　　我益智，人益愚；我益巧，人益拙。何者？相去之遠而相責之深也。惟有道者，智
-能諒人之愚，巧能容人之拙，知分量不相及，而人各有能不能也。
-　　天下之事，只定了便無事。物無定主而爭，言無定見而爭，事無定體而爭。
-　　至人無好惡，聖人公好惡，眾人隨好惡，小人作好惡。
-　　僕隸下人昏愚者多，而理會人意，動必有合，又千萬人不一二也。後上者往往以我
-責之，不合則艴然怒，甚者繼以鞭答，則被愈惶惑而錯亂愈甚。是我之過大於彼也，彼
-不明而我當明也，彼無能事上而我無量容下也，彼無心之失而我有心之惡也。
-　　若忍性平氣，指使而面命之，是兩益也。彼我無苦而事有濟，不亦可乎？《詩》曰
-：「匪怒伊教。」《書》曰：「無忿疾於頑。」此學者涵養氣質第一要務也。
-　　或問：「士大夫交際禮與？」曰：「禮也。古者，睦鄰國有享禮、有私覿，士大夫
-相見各有所贄，鄉黨亦然，婦人亦然，何可廢也？」曰：「近者嚴禁之，何也？」曰：
-「非禁交際，禁以交際行賄賂者也。夫無緣而交，無處而饋，其饋也過情，謂之賄可也
-。豈惟嚴禁，即不禁，君子不受焉。乃若宿在交，知情猶骨肉，數年不見，一飯不相留
-，人情乎？數千里來，一揖而告別，人情乎？則彼有饋遺，我有贈送，皆天理人情之不
-可已者也。士君子立身行己自有法度，絕人逃世，情所不安。余謂秉大政者貴持平，不
-貴一切。持平則有節，一切則愈潰，何者？勢不能也。」
-　　古人愛人之意多，今日惡人之意多。愛人，故人易於改過；而視我也常親，我之教
-常易行；惡人，故人甘於自棄，而視我也常仇，我之言益不入。
-　　觀一葉而知樹之死生，觀一面而知人之病否，現一言而知識之是非，現一事而知心
-之邪正。
-　　論理要精詳，論事要剴切，論人須帶二三分渾厚。若切中人情，人必難堪。故君子
-不盡人之情，不盡人之過，非直遠禍，亦以留人掩飾之路，觸人悔悟之機，養人體面之
-餘，亦天地涵蓄之氣也。
-　　「父母在難，盜能為我救之，感乎？」曰：「此不世之恩也，何可以弗感？」「設
-當用人之權，此人求用，可薦之乎？」曰：「何可薦也？天命有德，帝王之公典也，我
-何敢以私恩奸之？」「設當理刑之職，此人在獄，可縱之乎？」曰：「何可縱也？天討
-有罪，天下之公法也，我何敢以私恩骫之？」曰：「何以報之？」曰：「用吾身時，為
-之死可也；用吾家時，為之破可也。其他患難與之共可也。」
-　　凡有橫逆來侵，先思所以取之之故，即思所以處之之法，不可便動氣。兩個動氣，
-一對小人一般受禍。
-　　喜奉承是個愚障。彼之甘言、卑辭、隆禮、過情，冀得其所欲，而免其可罪也，而
-我喜之，感之，遂其不當得之欲，而免其不可已之罪。以自蹈於廢公黨惡之大咎；以自
-犯於難事易悅之小人。是奉承人者智巧，而喜奉承者愚也。乃以為相沿舊規，責望於賢
-者，遂以不奉承恨之，甚者羅織而害之，其獲罪國法聖訓深矣。此居要路者之大戒也。
-雖然，奉承人者未嘗不愚也。使其所奉承而小人也，則可果；君子也，彼未嘗不以此觀
-人品也。
-　　疑心最害事。二則疑，不二則不疑。然則聖人無疑乎？曰，「聖人只認得一個理，
-因理以思，順理以行，何疑之有？賢人有疑惑於理也，眾人多疑惑於情也。」或曰：「
-不疑而為人所欺奈何？」曰：「學到不疑時自然能先覺。況不疑之學，至誠之學也，狡
-偽亦不忍欺矣。」
-　　以時勢低昂理者，眾人也；以理低昂時勢者，賢人也；推理是視，無所低昂者，聖
-人也。
-　　貧賤以傲為德，富貴以謙為德，皆賢人之見耳。聖人只看理當何如，富貴貧賤除外
-算。
-　　成心者，見成之心也。聖人胸中洞然清虛，無個見成念頭，故曰絕四。今人應事宰
-物都是成心，縱使聰明照得破，畢竟是意見障。
-　　凡聽言，先要知言者人品，又要知言者意向，又要知言者識見，又要知言者氣質，
-則聽不爽矣。
-　　不須犯一口說，不須著一意念，只恁真真誠誠行將去，久則自有不言之信，默成之
-孚，薰之善良，遍為爾德者矣。碱蓬生於碱地，燃之可碱；鹽蓬生於鹽地，燃之可鹽。
-　　世人相與，非面上則口中也。人之心固不能掩於面與口，而不可測者則不盡於面與
-口也。故惟人心最可畏，人心最不可知。此天下之陷阱，而古今生死之衢也。余有一拙
-法，推之以至誠，施之以至厚，持之以至慎，遠是非，讓利名，處後下，則夷狄鳥獸可
-骨肉而腹心矣。將令深者且傾心，險者且化德，而何陷阱之予及哉？不然，必予道之未
-盡也。
-　　處世只一恕字，可謂以已及人，視人猶己矣。然有不足以　盡者。天下之事，有已
-所不欲而人欲者，有己所欲而人不欲者。
-　　這裡還須理會，有無限妙處。
-　　寧開怨府，無開恩竇。怨府難充，而恩竇易擴也；怨府易閉，而恩竇難塞也。閉怨
-府為福，而塞恩竇為禍也。怨府一仁者能閉之，思竇非仁、義、禮、智、信備不能塞也
-。仁考布大德，不干小譽；義者能果斷，不為姑息；禮者有等差節文，不一切以苦人情
-；智者有權宜運用，不張皇以駭聞聽；信者素孚人，舉措不生眾疑，缺一必無全計矣。
-　　君子與小人共事必敗，君子與君子共事亦未必無敗，何者？
-　　意見不同也。今有仁者、義者、禮者、智者、信者五人焉，而共一事，五相濟則事
-無不成，五有主，則事無不敗。仁者欲寬，義者欲嚴，智者欲巧，信者欲實，禮者欲文
-，事胡以成？此無他，自是之心勝，而相持之勢均也。歷觀往事，每有以意見相爭至亡
-人國家，釀成禍變而不顧。君子之罪大矣哉！然則何如？
-　　曰：「勢不可均。勢均則不相下，勢均則無忌憚而行其胸臆。三軍之事，卒伍獻計
-，偏裨謀事，主將斷一，何意見之敢爭？然則善天下之事，亦在乎通者當權而已。
-　　萬弊都有個由來，只救枝葉成得甚事？
-　　與小人處，一分計較不得，須要放寬一步。
-　　處天下事，只消得安詳二字。雖兵貴神速，也須從此二字做出。然安詳非遲緩之謂
-也，從容詳審養奮發於凝定之中耳。
-　　是故不閒則不忙，不逸則不勞。若先怠緩，則後必急躁，是事之殃也。十行九悔，
-豈得謂之安詳？
-　　果決人似忙，心中常有餘閒；因循人似閒，心中常有餘累。
-　　君子應事接物，常贏得心中有從容閒暇時便好。若應酬時勞擾，不應酬時牽掛，極
-是吃累的。
-　　為善而偏於所向，亦是病。聖人之為善，度德量力，審勢順時，且如發棠不勸，非
-忍萬民之死也，時勢不可也。若認煞民窮可悲，而枉巳徇人，便是欲矣。
-　　分明不動聲色，濟之有餘，卻露許多痕跡，費許大張皇，最是拙工。
-　　天下有兩可之事，非義精者不能擇。若到精處，畢竟只有一可耳。
-　　聖人處事，有變易無方底，有執極不變底，有一事而所處不同底，有殊事而所處一
-致底，惟其可而已。自古聖人，適當其可者，堯、舜、禹、文、周、孔數聖人而已。當
-可而又無跡，此之謂至聖。
-　　聖人處事，如日月之四照，隨物為影；如水之四流，隨地成形，己不與也。
-　　使氣最害事，使心最害理，君子臨事平心易氣。
-　　昧者知其一。不知其二，見其所見而不見其所不見，故於事鮮克有濟。惟智者能柔
-能剛，能圓能方，能存能亡，能顯能藏，舉世懼且疑，而彼確然為之，卒如所料者，見
-先定也。
-　　字到不擇筆處，文到不修句處，話到不檢口處，事到不苦心處，皆謂之自得。自得
-者與天遇。
-　　無用之樸，君子不貴。雖不事機械變詐，至於德慧術知，亦不可無。
-　　神清人無忽語，機活人無癡事。
-　　非謀之難，而斷之難也。謀者盡事物之理，達時勢之宜，意見所到不思其不精也，
-然眾精集而兩可，斷斯難矣。故謀者較尺寸，斷者較毫釐；謀者見一方至盡，斷者會八
-方取中。故賢者皆可與謀，而斷非聖人不能也。
-　　人情不便處，便要迴避。彼雖難於言；而心厭苦之，此慧者之所必覺也。是以君子
-體悉人情。悉者，委曲周至之謂也。
-　　恤其私、濟其願、成其名、泯其跡，體悉之至也，感人淪於心骨矣。故察言觀色者
-，學之粗也；達情會意者，學之精也。
-　　天下事只怕認不真，故依違觀望，看人言為行止。認得真時，則有不敢從之君親，
-更那管一國非之，天下非之。若作事先怕人議論，做到中間一被謗誹，消然中止，這不
-止無定力，且是無定見。民各有心，豈得人人識見與我相同；民心至愚，豈得人人意思
-與我相信。是以作事君子要見事後功業，休恤事前議論，事成後眾論自息。即萬一不成
-，而我所為者，合下便是當為也，論不得成敗。
-　　審勢量力，固智者事，然理所當為，而值可為之地，聖人必做一番，計不得成敗。
-如圍成不克，何損於舉動，竟是成當墮耳。孔子為政於衛，定要下手正名，便正不來，
-去衛也得。
-　　只事這個，事定姑息不過。今人做事只計成敗，都是利害心害了是非之公。
-　　或問：「慮以下人，是應得下他不？」曰：「若應得下他，如子弟之下父兄，這何
-足道？然亦不是卑諂而徇人以非禮之恭，只是無分毫上人之心，把上一著，前一步，盡
-著別人占，天地間惟有下面底最寬，後面底最長。」
-　　士君子在朝則論政，在野則論俗，在廟則論祭禮，在喪則論喪禮，在邊國則論戰守
-，非其地也，謂之羨談。
-
-　　處天下事，前面常長出一分，此之謂豫；後面常餘出一分，此之謂裕。如此則事無
-不濟，而心有餘樂。若扣殺分數做去，必有後悔處。人亦然，施在我有餘之恩，則可以
-廣德，留在人不盡之情，則可以全好。
-　　非首任，非獨任，不可為禍福先。福始禍端，皆危道也。
-　　士君子當大事時，先人而任，當知慎果二字；從人而行，當知明哲二字。明哲非避
-難也，無裨於事而只自沒耳。
-　　養態，士大夫之陋習也。古之君子養德，德成而見諸外者有德容。見可怒，則有剛
-正之德容；見可行，則有果毅之德容。
-　　當言，則終日不虛口，不害其為默；當刑，則不宥小故，不害其為量。今之人，士
-大夫以寬厚渾涵為盛德，以任事敢言為性氣，銷磨憂國濟時者之志，使之就文法，走俗
-狀，而一無所展布。
-　　嗟夫！治平之世宜爾，萬一多故，不知張眉吐膽、奮身前步者誰也？此前代之覆轍
-也。
-　　處事先求大體，居官先厚民風。
-　　臨義莫計利害，論人莫計成敗。
-　　一人覆屋以瓦，一人覆屋以茅，謂覆瓦者曰：「子之費十倍予，然而蔽風雨一也。
-」覆瓦者曰：「茅十年腐，而瓦百年不碎，子百年十更，而多以工力之費、屢變之勞也
-。」嗟夫！天下之患莫大於有堅久之費，貽屢變之勞，是之謂工無用，害有益。天下之
-思，亦莫大於狃朝夕之近，忘久遠之安，是之謂欲速成見小利。是故樸素渾堅，聖人制
-物利用之道也。彼好文者，惟樸素之恥而靡麗，夫易敗之物，不智甚矣。或曰：「糜麗
-其渾堅者可乎？」曰：「既渾堅矣，靡麗奚為？苟以靡麗之費而為渾堅之資，豈不尤渾
-堅哉？是故君子作有益，則輕千金；作無益，則惜一介。假令無一介之費，君子亦不作
-無益，何也？不敢以耳目之玩，啟天下民窮財盡之禍也。」
-　　遇事不妨詳問、廣問，但不可有偏主心。
-　　輕言驟發，聽言之大戒也。
-　　君子處事主之以鎮靜有主之心，運之以圓活不拘之用，養之以從容敦大之度，循之
-以推行有漸之序，待之以序盡必至之效，又未嘗有心勤效遠之悔。今人臨事，才去安排
-，又不耐躊腸，草率含糊，與事拂亂，豈無幸成？競不成個處事之道。
-　　君子與人共事，當公人己而不私。苟事之成，不必功之出自我也；不幸而敗，不必
-咎之歸諸人也。
-　　有當然、有自然、有偶然。君子盡其當然，聽其自然，而不感於偶然；小人泥於偶
-然，拂其自然，而棄其當然。噫！偶然不可得，並其當然者失之，可哀也。
-　　不為外撼，不以物移，而後可以任天下之大事。彼悅之則悅，怒之則怒，淺衷狹量
-，粗心浮氣，婦人孺子能笑之，而欲有所樹立，難矣。何也？其所以待用者無具也。
-　　明白簡易，此四字可行之終身。役心機，擾事端，是自投劇網也。
-　　水之流行也，礙於剛，則求通於柔；智者之於事也，礙於此，則求通於被。執礙以
-求通，則愚之甚也，徒勞而事不濟。
-　　計天下大事，只在緊要處一著留心用力，別個都顧不得。
-　　譬之奕棋，只在輸贏上留心，一馬一卒之失渾不放在心下，若觀者以此預計其高低
-，奕者以此預亂其心目，便不濟事。況善籌者以與為取，以喪為得；善奕者餌之使吞，
-誘之使進，此豈尋常識見所能策哉？乃見其小失而遽沮撓之，擯斥之，英雄豪傑可為竊
-笑矣，可為慟惋矣。
-
-　　夫勢，智者之所藉以成功，愚者之所逆以取敗者也。夫勢之盛也，天地聖人不能裁
-，勢之衰也，天地聖人不能振，亦因之而已。因之中寓處之權，此善用勢者也，乃所以
-裁之振之也。
-　　士君子抱經世之具，必先知五用。五用之道未將，而漫嘗試之，此小丈夫技癢、童
-心之所為也，事必不濟。是故貴擇人。
-　　不擇可與共事之人，則不既厥心，不堪其任。或以虛文相欺，或以意見相傾，譬以
-玉杯付小兒，而奔走於崎嶇之峰也。是故貴達時。時者，成事之期也。機有可乘，會有
-可際，不先不後，則其道易行。不達於時。譬投種於堅凍之候也。是故貴審勢。
-　　者，成事之藉也。登高而招，順風而呼，不勞不費，而其易就。不審於勢，譬行舟
-於平陸之地也。是故貴慎發。左盼望，長慮卻顧，實見得利矣，又思其害，實見得成矣
-，又慮其敗，萬無可虞則執極而不變。不慎所發，譬夜射儀的也。是故貴宜物。夫事有
-當蹈常襲故者，有當改弦易轍者，有當興廢舉墜者，有當救偏補救者，有以小棄大而卒
-以成其大者，有理屈於勢而不害其為理者，有當三令五申者，有當不動聲色者。不宜於
-物，譬苗莠兼存，而玉石俱焚也。溠夫！非有其具之難，而用其具者之難也。
-　　腐儒之迂說，曲士之拘談，俗子之庸識，躁人之淺覓，譎者之異言，憸夫之邪語，
-皆事之成也，謀斷家之所忌也。
-　　智者之於事，有言之而不行者，有所言非所行者，有先言而後行者，有先行而後言
-者，有行之既成而始終不言其故者，要亦為國家深遠之慮，而求以必濟而已。
-　　善用力者就力，善用勢者就勢，善用智者就智，善用財者就財，夫是之謂乘。乘者
-，知幾之謂也。失其所乘，則倍勞而力不就，得其所乘，則與物無忤，於我無困，而天
-下享其利。
-　　凡酌量天下大事，全要個融通周密，憂深慮遠。營室者之正方面也，遠視近視，日
-有近視正而遠視不正者；較長較短，曰有准於短而不准於長者；應上應下，曰有合於上
-而不合於下者；顧左顧右，曰有協於左而不協於右者。既而遠近長短上下左右之皆宜也
-，然後執繩墨、運木石、鳩器用以定萬世不拔之基。今之處天下事者，粗心浮氣，淺見
-薄識，得其一方而固執以求勝。以此圖久大之業，為治安之計，難矣。
-　　字經三書，未可遽真也；言傳三口，未可遽信也。
-　　巧者，氣化之賊也，萬物之禍也，心術之蠹也，財用之災也，君子不貴焉。
-　　君子之處事有真見矣，不遽行也，又驗眾見，察眾情，協諸理而協，協諸眾情、眾
-見而協，則斷以必行；果理當然，而眾情、眾見之不協也，又委曲以行吾理。既不貶理
-，又不駭人，此之謂理術。噫！惟聖人者能之，獵較之類是也。
-　　干天下大事非氣不濟。然氣欲藏，不欲露；欲抑，不欲揚。
-　　掀天揭地事業不動聲色，不驚耳目，做得停停妥妥，此為第一妙手，便是入神。譬
-之天地當春夏之時，發育萬物，何等盛大流行之氣！然視之不見，聽之不聞，豈無風雨
-雷霆，亦只時發間出，不顯匠作萬物之跡，這才是化工。
-　　疏於料事，而拙於謀身，明哲者之所懼也。
-　　實處著腳，穩處下手。
-　　姑息依戀，是處人大病痛，當義處，雖處骨肉亦要果斷；鹵莽逕宜，是處事大病痛
-，當緊要處，雖細微亦要檢點。
-　　正直之人能任天下之事。其才、其守小事自可見。若說小事且放過，大事到手才見
-擔當，這便是飾說，到大事定然也放過了。松柏生，小便直，未有始曲而終直者也。若
-用權變時另有較量，又是一副當說話。
-　　無損損，無益益，無通通，無塞塞，此調天地之道，理人物之宜也。然人君自奉無
-嫌於損損，於百姓無嫌於益益；君子擴理路無嫌於通通，杜欲竇無嫌於塞塞。
-　　事物之理有定，而人情意見千歧萬逕，吾得其定者而行之，即形跡可疑，心事難白
-，亦付之無可奈何。若惴惴畏譏，瑣瑣自明，豈能家置一喙哉？且人不我信，辯之何益
-？人若我信，何事於辯？若事有關涉，則不當以緘默妨大計。
-　　處人、處已、處事都要有餘，無餘便無救性，此裡甚難言。
-　　悔前莫如慎始，悔後莫如改圖，徒悔無益也。
-　　居鄉而囿於數十里之見，硜硜然守之也，百攻不破，及游大都，見千里之事，茫然
-自失矣。居今而囿於千萬人之見，硜硜然守之也，百攻不破，及觀墳典，見千萬年之事
-，茫然自失矣。是故囿見不可狃，狃則狹，狹則不足以善天下之事。
-　　事出於意外，雖智者亦窮，不可以苛責也。
-　　天下之禍多隱成而卒至，或偶激而遂成。隱成者貴預防，偶激者貴堅忍。
-　　當事有四要：際畔要果決，怕是綿；執持要堅耐，怕是脆；機括要深沉，怕是淺；
-應變要機警，伯是遲。
-　　君子動大事十利而無一害，其舉之也，必矣。然天下無十利之事，不得已而權其分
-數之多寡，利七而害三則吾全其利而防其害。又較其事勢之輕重，亦有九害而一利者為
-之，所利重而所害輕也，所利急而所害緩也，所利難得而所害可救也，所利久遠而所害
-一時也。此不可與淺見薄識者道。
-　　當需莫厭久，久時與得時相鄰。若憤其久也，而決絕之，是不能忍於斯須，而甘棄
-前勞，坐失後得也。此從事者之大戒也。若看得事體審，便不必需，即需之久，亦當速
-去。
-　　朝三暮四，用術者誠詐矣，人情之極致，有以朝三暮四為便者，有以朝四暮三為便
-者，要在當其所急。猿非愚，其中必有所當也。
-　　天下之禍非偶然而成也，有輳合，有搏激，有積漸。輳合者，雜而不可解，在天為
-風雨雷電，在身為多過，在人為朋奸，在事為眾惡遭會，在病為風寒暑濕，合而成痹。
-搏激者，勇而不可御，在天為迅雷大雹，在身為忿狠，在人為橫逆卒加，在事為驟感成
-凶，在病為中寒暴厥。積漸者，極重而不可反，在天為寒暑之序，在身為罪惡貫盈，在
-人為包藏待逞，在事為大敝極壞，在病為血氣衰羸、痰火蘊鬱，；奄奄不可支。此三成
-者，理勢之自然，天地萬物皆不能外，禍福之來，恒必由之。故君子為善則籍眾美，而
-防錯履之多，奮志節而戒一朝之怒，體道以終身，孜孜不倦，而絕不可長之欲。
-　　再之略，不如一之詳也；一之詳，不如再之詳也，再詳無後憂矣。
-　　有徐，當事之妙道也。故萬無可慮之事備十一，難事備百一，大事備千一，不測之
-事備萬一。
-　　在我有餘則足以當天下之感，以不足當感，未有不困者。
-　　識有餘，理感而即透；才有餘，事感而即辦；力有餘，任感而即勝；氣有餘，變感
-而不震；身有餘，內外感而不病。
-　　語之不從，爭之愈勍，名之乃驚。不語不爭，無所事名，忽忽冥冥，吾事已成，彼
-亦懵懵。昔人謂不動聲色而措天下於泰山，予以為動聲色則不能措天下於泰山矣。故曰
-默而成之，不言而信，存乎德行。
-　　天下之事，在意外者常多。眾人見得眼前無事都放下心，明哲之士只在意外做工夫
-，故每萬全而無後憂。
-　　不以外至者為榮辱，極有受用處，然須是裡面分數足始得。
-　　今人見人敬慢，輒有喜慍，心皆外重者也。此迷不破，胸中冰炭一生。
-　　有一介必吝者，有千金可輕者，而世之論取與動，曰所直幾何？此亂語耳。
-　　才猶兵也，用之伐罪弔民，則為仁義之師；用之暴寡凌弱，則為劫奪之盜。是故君
-子非無才之患，患不善用才耳。故惟有德者能用才。
-　　藏莫大之害，而以小利中其意；藏莫大之利，而以小害疑其心。此思者之所必墮，
-而智者之所獨覺也。
-　　今人見前輩先達作事不自振拔，輒生歎恨，不知渠當我時也會歎恨人否？我當渠時
-能免後人歎恨否？事不到手，責人盡易，待君到手時，事事努力不輕放過便好。只任嘵
-嘵責人，他日縱無可歎恨，今日亦浮薄子也。
-　　區區與人較是非，其量與所較之人相去幾何？
-　　無識見底人，難與說話；偏識見底人，更難與說話。
-　　兩君子無爭，相讓故也；一君子一小人無爭，有容故也。
-　　爭者，兩小人也。有識者奈何自處於小人？即得之未必榮，而況無益於得以博小人
-之名，又小人而愚者。
-　　方嚴是處人大病痛。聖賢處世離一溫厚不得，故曰泛愛眾，曰和而不同，曰和而不
-流，曰群而不黨，曰周而不比，曰愛人，曰慈樣，曰豈弟，曰樂只，曰親民，曰容眾，
-曰萬物一體，曰天下一家，中國一人。只恁踽踽涼涼冷落難親，便是世上一個礙物。即
-使持正守方，獨立不苟，亦非用世之才，只是一節狷介之土耳。
-　　謀天下後世事最不可草草，當深思遠慮。眾人之識，天下所同也，淺昧而狃於目前
-，其次有眾人看得一半者，其次豪傑之士與練達之人得其大概者，其次精識之人有曠世
-獨得之見者，其次經綸措置、當時不動聲色，後世不能變易者，至此則精矣，盡矣，無
-以復加矣，此之謂大智，此之謂真才。若偶得之見，借聽之言，翹能自喜而攘臂直言天
-
-下事，此老成者之所哀，而深沉者之所懼也。
-　　而今只一個苟字支吾世界，萬事安得不廢弛？
-　　天下事要乘勢待時，譬之決癰待其將潰，則病者不苦而癰自愈，若虺蝮毒人，雖即
-砭手斷臂，猶遲也。
-　　飯休不嚼就咽，路休不看就走，人休不擇就交，話休不想就說，事休不思就做。
-　　參苓歸芪本益人也，而與身無當，反以益病；親厚懇切本愛人也，而與人無當，反
-以速禍，故君子慎焉。
-　　兩相磨蕩，有皆損無俱全，特大小久近耳。利刃終日斷割，必有缺折之時；砥石終
-日磨礱，亦有虧消之漸。故君子不欲敵人以自全也。
-　　見前面之千里，不若見背後之一寸。故達現非難，而反觀為難；見見非難，而見不
-見為難；此舉世之所迷，而智者之獨覺也。
-　　譽既汝歸，毀將安辭？利既汝歸，害將安辭？巧既汝歸，罪將安辭？
-　　上士會意，故體人也以意，觀人也亦以意。意之感人也深於骨肉，怠之殺人也毒於
-斧鉞。鷗鳥知漁父之機，會意也，可以人而不如鷗乎？至於征色發聲而不觀察，則又在
-色斯舉矣之下。
-　　士君子要任天下國家事，先把本身除外。所以說策名委質，言自策名之後身已非我
-有矣，況富貴乎？若營營於富貴身家，卻是社稷蒼生委質於我也，君之賊臣乎？天之僇
-民乎？
-　　聖賢之量空闊，事到胸中如一葉之泛滄海。
-　　聖賢處天下事，委曲紆徐，不輕徇一已之情，以違天下之欲，以破天下之防。是故
-道有不當直，事有不必果者，此類是也。
-　　譬之行道然，循曲從遠順其成跡，而不敢以欲速適已之便者，勢不可也。若必欲簡
-捷直遂，則兩京程途正以繩墨，破城除邑，塞河夷山，終有數百里之近矣，而人情事勢
-不可也。是以處事要遜以出之，而學者接物怕徑情直行。
-　　熱鬧中空老了多少豪傑，閒淡滋味惟聖賢嘗得出，及當熱鬧時也只以這閒淡心應之
-。天下萬事萬物之理都是閒淡中求來，熱鬧處使用。是故，靜者，動之母。
-　　胸中無一毫欠缺，身上無一些點染，便是羲皇以上人，即在夷狄患難中，何異玉燭
-春台上？
-　　聖人掀天揭地事業只管做，只是不費力；除害去惡只管做，只是不動氣；蹈險投艱
-只管做，只是不動心。
-　　聖賢用剛，只夠濟那一件事便了；用明，只夠得那件情便了；分外不剩分毫。所以
-作事無痕跡，甚渾厚，事既有成，而亦無議。
-　　聖人只有一種才，千通萬貫隨事合宜，譬如富貴只積一種錢，貿易百貨都得。眾人
-之材如貨，輕縠雖美，不可禦寒；輕裘雖溫，不可當暑。又養才要有根本，則隨遇不窮
-；運才要有機括，故隨感不滯；持才要有涵蓄，故隨事不敗。
-　　坐疑似之跡者，百口不能自辨；犯一見之真者，百口難奪其執。此世之通患也。聖
-
-〔人〕虛明通變吻合人情，如人之肝肺在其腹中，既無遁情，亦無誣執。故人有感泣者
-，有愧服者，有歡悅者。故曰惟聖人為能通天下之志，不能如聖人，先要個虛心。
-　　聖人處小人不露形跡，中間自有得已，處高崖陡塹，直氣壯頄皆偏也，即不論取禍
-，近小文夫矣。孟子見樂正子從王驩，何等深惡！及處王驩，與行而不與比，雖然，猶
-形跡矣。孔子處陽貨只是個紿法，處向魋只是個躲法。
-　　君子所得不問，故其所行亦異。有小人於此，仁者憐之，義者惡之，禮者處之不失
-禮，智者處之不取禍，信者推誠以御之而不計利害，惟聖人處小人得當可之宜。
-　　被發於鄉鄰之鬥，豈是惡念頭？但類於從井救人矣。聖賢不為善於性分之外。
-　　仕途上只應酬無益人事，工夫占了八分，更有甚精力時候修正經職業？我嘗自喜行
-三種方便，甚於彼我有益：不面謁人，省其疲於應接；不輕寄書，省其困於裁答；不乞
-求人看顧，省其難於區處。
-　　士君子終身應酬不止一事，全要將一個靜定心酌量緩急輕重為後先。若應轇轕情處
-紛雜事，都是一味熱忙，顛倒亂應，只此便不見存心定性之功，當事處物之法。
-　　儒者先要個不俗，才不俗又怕乖俗。聖人只是和人一般，中間自有妙處。
-　　處天下事，先把我字閣起，千軍萬馬中，先把人字閣起。
-　　處毀譽，要有識有量。今之學者，盡有向上底，見世所譽而趨之，見世所毀而避之
-，只是識不定；聞譽我而喜，聞毀我而怒，只是量不廣。真善惡在我，毀譽於我無分毫
-相干。
-　　某平生只欲開口見心，不解作吞吐語。或曰：「恐非其難其慎之義。」予矍然驚謝
-曰：「公言甚是。但其難其慎在未言之前，心中擇個是字才脫口，更不復疑，何吞吐之
-有？吞吐者，半明半暗，似於開成心三字礙。」
-　　接人要和中有介，處事要精中有果，認理要正中有通。
-　　天下之事常鼓舞不見罷勞，一衰歇便難振舉。是以君子提醒精神不令昏眩，役使筋
-骨不令怠惰，懼振舉之難也。
-　　實官、實行、實心，無不孚人之理。
-　　當大事，要心神定，心氣足。
-　　世間無一處無拂意事，無一日無拂意事，椎度量寬弘有受用處，彼局量褊淺者空自
-懊恨耳。
-　　聽言之道徐審為先，執不信之心與執必信之心，其失一也。
-　　惟聖人能先覺，其次莫如徐審。
-　　君子之處事也，要我就事，不令事就我；其長民也，要我就民，不令民就我。
-　　上智不悔，詳於事先也；下愚不悔，迷於事後也。惟君子多悔。雖然，悔人事，不
-悔天命，悔我不悔人。我無可悔，則天也、人也，聽之矣。
-　　某應酬時有一大病痛，每於事前疏忽，事後點檢，點檢後輒悔吝；閒時慵獺，忙時
-迫急，迫急後輒差錯。或曰：「此失先後著耳。」肯把點檢心放在事前，省得點檢，又
-省得悔吝。肯把急迫心放在閒時，省得差錯，又省得牽掛。大率我輩不是事累心，乃是
-心累心。一謹之不能，而謹無益之謹；一勤之不能，而勤無及之勤，於此心倍苦，而於
-事反不詳焉，昏懦甚矣！書此以自讓。
-　　無謂人唯唯，遂以為是我也；無謂人默默，遂以為服我也，無謂人煦煦，遂以為愛
-我也；無謂人卑卑，遂以為恭我也。
-　　事到手且莫急，便要緩緩想；想得時切莫緩，便要急急行。
-　　我不能寧耐事，而令事如吾意，不則躁煩；我不能涵容人，而令人如吾意，不則譴
-怒。如是則終日無自在時矣，而事卒以僨，人卒以怨，我卒以損，此謂至愚。
-　　有由衷之言，有由口之言；有根心之色，有浮面之色。各不同也，應之者貴審。
-　　富貴，家之災也；才能，身之殃也；聲名，謗之媒也；歡樂，悲之藉也。故惟處順
-境為難。只是常有懼心，遲一步做，則免於禍。
-　　語雲一錯二誤最好理會。凡一錯者，必二誤，蓋錯必悔怍，悔怍則心凝於所悔，不
-暇他思，又錯一事。是以無心成一錯，有心成二誤也。禮節應對間最多此失。苟有錯處
-，更宜鎮定，不可忙亂，一忙亂則相因而錯者無窮矣。
-　　衝繁地，頑鈍人，紛雜事，遲滯期，拂逆時，此中最好養火。若決裂憤激，悔不可
-言；耐得過時，有無限受用。
-　　當繁迫事，使聾瞽人；值追逐時，騎瘦病馬；對昏殘燭，理爛亂絲，而能意念不躁
-，聲色不動，亦不後事者，其才器吾誠服之矣。
-　　義所當為，力所能為，心欲有為，而親友挽得回，妻拏勸得止，只是無志。
-　　妙處先定不得，口傳不得，臨事臨時，相幾度勢，或只須色意，或只須片言，或用
-疾雷，或用積陰，務在當可，不必彼覺，不必人驚，卻要善持善發，一錯便是死生關。
-　　意主於愛，則詬罵撲擊皆所以親之也；意主於惡，則獎譽綢繆皆所以仇之也。
-　　養定者，上交則恭而不迫，下交則泰而不忽，處親則愛而不狎，處疏則真而不厭。
-　　有進用，有退用，有虛用，有實用，有緩用，有驟用，有默用，有不用之用，此八
-用者，宰事之權也。而要之歸於濟義，不義，雖濟，君子不貴也。
-　　責人要含蓄，忌太盡；要委婉，忌太直；要疑似，忌太真。
-　　今子弟受父兄之責也，尚有所不堪，而況他人乎？孔子曰：「忠告而善道之，不可
-則止。」此語不止全交，亦可養氣。
-　　禍莫大於不仇人而有仇人之辭色，恥莫大於不恩人而詐恩人之狀態。
-　　柔勝剛，訥止辯，讓愧爭，謙伏傲。是故退者得常倍，進者失常倍。
-　　余少時曾泄當密之語，先君責之，對曰：「已戒聞者使勿泄矣。」先君曰：「子不
-能必子之口，而能必人之口乎？且戒人與戒己孰難？小子慎之。」
-　　中孚，妙之至也。格天動物不在形跡言語。事為之末；苟無誠以孚之，諸皆糟粕耳
-，徒勤無益於義；鳥抱卵曰孚，從爪從子，血氣潛入而子隨母化，豈在聲色？豈事造作
-？學者悟此，自不怨天尤人。
-　　應萬變，索萬理，惟沉靜者得之。是故水止則能照，衡定則能稱。世亦有昏昏應酬
-而亦濟事，夢夢談道而亦有發明者，非資質高，則偶然合也，所不合者何限？
-　　禍莫大於不體人之私而又苦之，仇莫深於不諱人之短而又訐之。
-　　肯替別人想，是第一等學問。
-　　不怕千日密，只愁一事疏。誠了再無疏處，小人掩著，徒勞爾心矣。譬之於物，一
-毫欠缺，久則自有欠缺承當時；譬之於身，一毫虛弱，久則自有虛弱承當時。
-　　置其身於是非之外，而後可以折是非之中；置其身於利害之外，而後可以觀利害之
-變。
-　　余觀察晉中，每升堂，首領官凡四人，先揖堂官，次分班對揖，將退，則余揖手，
-四人又一躬而行。一日，三人者以公出，一人在堂，偶忘對班之無人，又忽揖下，起，
-愧不可言，群吏忍口而笑。余揖手謂之曰：「有事不妨先退。」揖者退，其色頓平。昔
-余令大同日，縣丞到任，余讓筆揖手，丞他顧而失瞻，余面責簿吏曰：「奈何不以禮告
-新官？」丞愧謝，終公宴不解容，余甚悔之。偶此舉能掩人過，可補前失矣。因識之以
-充忠厚之端云。
-　　善用人底，是個人都用得；不善用人底，是個人用不得。
-　　以多惡棄人，而以小失發端，是藉棄者以口實而自取不韙之譏也。曾有一隸，怒撻
-人，余杖而恕之。又竊同舍錢，又杖而恕之，且戒之曰：「汝慎，三犯不汝容矣！」一
-日在燕，醉而寢。余既行矣，而呼之不至，既至，托疾，實醉也。余逐之。出語人曰：
-「余病不能從，遂逐我。」人曰：「某公有德器，乃以疾逐人耶？」不知余惡之也，以
-積愆而逐之也。以小失則余之拙也。雖然，彼藉口以自白，可為他日更主之先容，余拙
-何悔！
-　　手段不可太闊，太闊則填塞難完；頭緒不可太繁，太繁則照管不到。
-　　得了真是非，才論公是非。而今是非不但捉風捕影，且無風無影，不知何處生來，
-妄聽者遽信是實以定是非。曰：我無私也。噫！固無私矣，《采苓》止棘，暴公《巷伯
-》，孰為辯之？
-　　固可使之愧也，乃使之怨；固可使之悔也，乃使之怒；固可使之感也，乃使之恨。
-曉人當如是耶？
-　　不要使人有過。
-　　謙忍皆居尊之道，儉樸皆居富之道。故曰：卑不學恭，貧不學儉。
-　　豪雄之氣雖正多粗，只用他一分，便足濟事，那九分都多了，反以憤事矣。
-　　君子不受人不得已之情，不苦人不敢不從之事。
-　　教人十六字：誘掖，獎勸，提撕，警覺，涵育；薰陶，鼓舞，興作。
-　　水激逆流，火激橫發，人激亂作，君子慎其所以激者。愧之，則小人可使為君子，
-激之，則君子可使為小人。
-　　事前忍易，正事忍難；正事悔易，事後悔難。
-　　說盡有千說，是卻無兩是。故談道者必要諸一是而後精，謀事者必定於一是而後濟。
-　　世間事各有恰好處，慎一分者得一分，忽一分者失一分，全慎全得，全忽全失。小
-事多忽，忽小則失大；易事多忽，忽易則失難。存心君子自得之體驗中耳。
-　　到一處問一處風俗，果不大害，相與循之，無與相忤。果於義有妨，或不言而默默
-轉移，或婉言而徐徐感動，彼將不覺而同歸於我矣。若疾言厲色，是己非人，是激也，
-自家取禍不惜，可惜好事做不成。
-　　事有可以義起者，不必泥守舊例；有可以獨斷者，不必觀望眾人。若舊例當，眾人
-是，莫非胸中道理而彼先得之者也，方喜舊例免吾勞，方喜眾見印吾是，何可別生意見
-以作聰明哉？
-　　此繼人之後者之所當知也。
-　　善用明者，用之於暗；善用密者，用之於疏。
-　　你說底是我便從，我不是從你，我自從是，仍私之有？你說底不是我便不從，不是
-不從你，我自不從不是，何嫌之有？
-　　日用酬酢，事事物物要合天理人情。所謂合者，如物之有底蓋然，方者不與圓者合
-，大者不與小者合，欹者不與正者合。
-　　覆諸其上而不廣不狹，旁視其隙而若有若無。一物有一物之合，不相苦窳；萬物各
-有其合，不相假借。此之謂天則，此之謂大中，此之謂天下萬事萬物各得其所，而聖人
-之所以從容中，賢者之所以精一求，眾人之所以醉心夢意、錯行亂施者也。
-　　事有不當為而為者，固不是；有不當悔而悔者，亦不是。
-　　聖賢終始無二心，只是見得定了。做時原不錯，做後如何悔？
-　　即有凶咎，亦是做時便大[ 扌棄] 如此。
-　　心實不然，而跡實然。人執其然之跡，我辨其不然之心，雖百口，不相信也。故君
-子不示人以可疑之跡，不自誣其難辨之心。何者？正大之心孚人有素，光明之行無所掩
-覆也。倘有疑我者，任之而已，嘵嘵何為？
-　　大丈夫看得生死最輕，所以不肯死者，將以求死所也。死得其所，則為善用死矣。
-成仁取義，死之所也，雖死賢於生也。
-　　將祭而齊其思慮之不齊者，不惟惡念，就是善念也是不該動的。這三日裡，時時刻
-刻只在那所祭者身上，更無別個想頭，故曰精白一心。才一毫雜便不是精白，才二便不
-是一心，故君子平日無邪夢，齊日無雜夢。
-　　彰死友之過，此是第一不仁。生而告之也，望其能改，彼及聞之也，尚能自白，死
-而彰之，夫何為者？雖實過也，吾為掩之。
-　　爭利起於人各有欲，爭言起於人各有見。惟君子以淡泊自處，以知能讓人，胸中有
-無限快活處。
-　　吃這一箸飯，是何人種獲底？穿這一匹帛，是何人織染底？
-　　大廈高堂，如何該我住居？安車駟馬，如何該我乘坐？獲飽暖之休，思作者之勞；
-享尊榮之樂，思供者之苦，此士大夫日夜不可忘情者也。不然，其負斯世斯民多矣。
-　　只大公了，便是包涵天下氣象。
-　　定、靜、安、慮、得，此五字時時有，事事有，離了此五字便是孟浪做。
-　　公人易，公己難；公己易，公己於人難；公已於人易，忘人己之界而不知我之為誰
-難。公人處，人能公者也；公已處，己亦公者也。至於公己於人，則不以我為嫌時，當
-貴我富我。
-　　泰然處之而不嫌於尊己事，當逸我利我。公然行之而不嫌於厲民，非富貴我，逸利
-我也。我者，天下之我也。天下名分紀綱於我乎寄，則我者，名分紀綱之具也。何嫌之
-有？此之謂公己於人，雖然，猶未能忘其道，未化也。聖人處富貴逸利之地，而忘其身
-；為天下勞苦卑因，而亦忘其身。非曰我分當然也，非曰我志欲然也。譬痛者之必呻吟
-，樂者之必談笑，癢者之必爬搔，自然而已。譬蟬之鳴秋，雞之啼曉，草木之榮枯，自
-然而已。夫如是，雖負之使灰其心，怒之使薄其意，不能也；況此分不盡，而此心少怠
-乎？況人情未孚，而惟人是責乎？夫是之謂忘人己之界，而不知我之為誰。不知我之為
-誰，則亦不知人之為誰矣。不知人我之為誰，則六合混一，而太和元氣塞於天地之間矣
-。必如是而後謂之仁。
-　　才下手便想到究竟處。
-　　理、勢、數皆有自然。聖人不與自然鬥，先之不敢於之，從之不敢迎之，待之不敢
-奈之，養之不敢強之。功在凝精不攖其鋒，妙在默成不揭其名。夫是以理、勢、數皆為
-我用，而相忘於不爭。噫！非善濟天下之事者，不足以語此。
-　　心一氣純，可以格天動物，天下無不成之務矣。
-　　握其機使自息，開其竅使自噭，發其萌使自崢，提其綱使自張，此老氏之術乎？曰
-：非也。二帝三王御世之大法不過是也。解其所不得不動，投其所不得不好，示其所不
-得不避。天下固有抵死而惟吾意指者，操之有要而敁敪其心故也。化工無他術，亦只是
-如此。
-　　對憂人勿樂，對哭人勿笑，對失意人勿矜。
-　　與禽獸奚擇哉？於禽獸又何難焉？此是孟子大排遣。初愛敬人時，就安排這念頭，
-再不生氣。余因擴充排遺橫逆之法，此外有十：一曰與小人處，進德之資也。彼侮愈甚
-，我忍愈堅，於我奚損哉？《詩》曰：「他山之石，可以攻玉。」二曰不遇小人，不足
-以驗我之量。《書》曰：「有容德乃大。」三曰彼橫逆者至於自反，而忠猶不得免焉。
-其人之頑悖甚矣，一與之校必起禍端。兵法云：「求而不得者，挑也無應。」四曰始愛
-敬矣，又自反而仁禮矣，又自反而忠矣。我理益直，我過益寡。其卒也乃不忍於一逞以
-掩舊善，而與彼分惡，智者不為。太史公曰：「無棄前修而祟新過。」五曰是非之心，
-人皆有之。彼固自昧其天，而責我無已，公論自明，吾亦付之不辯；古人云：「桃李不
-言，下自成蹊。」六曰自反無闕。彼欲難盈，安心以待之，緘口以聽之，彼計必窮。
-　　兵志曰：「不應不動，敵將自靜。」七曰可避則避之，如太王之去邠；可下則下之
-，如韓信之跨下。古人云：「身愈詘，道愈尊。」
-　　又曰：「終身讓畔，不失一段。」八曰付之天。天道有知，知我者其天乎？《詩》
-曰：「投彼有昊。」九曰委之命。人生相與，或順或忤，或合或離，或疏之而親，或厚
-之而疑，或偶遭而解，或久構而危。魯平公將出而遇臧倉，司馬牛為弟子而有桓魋，豈
-非命耶？十曰外寧必有內憂。小人侵陵則懼患、防危、長慮、卻顧，而不敢侈然。有肆
-心則百禍潛消。孟子曰：「出則無敵國外患者，國恒亡。」三自反後，君子存心猶如此
-。彼愛人不親禮，人不答而遽怒，與夫不愛人、不敬人而望人之愛敬己也，其去。
-　　橫逆能幾何哉？
-　　過責望人，亡身之念也。君子相與，要兩有退心，不可兩有進心。自反者，退心也
-。故剛兩進則碎，柔兩進則屈，萬福皆生於退反。
-　　施者不知，受者不知，誠動於天之南，而心通於海之北，是謂神應；我意才萌，彼
-意即覺，不俟出言，可以默會，是謂念應；我以目授之，彼以目受之，人皆不知，商人
-獨覺，是謂不言之應；我固強之，彼固拂之，陽異而陰同，是謂不應之應。
-　　明乎此者，可以談兵矣。
-　　卑幼有過，慎其所以責讓之者：對眾不責，愧悔不責，暮夜不則，正飲食不責，正
-歡慶不責，正悲憂不責，疾病不責。
-　　舉世之議論有五：求之天理而順，即之人情而安，可按聖賢，可質神明，而不必於
-天下所同，曰公論。情有所便，意有所拂，逞辯博以濟其一偏之說，曰私論。心無私曲
-，氣甚豪雄，不察事之虛實、勢之難易、理之可否，執一隅之見，狃時俗之習，既不正
-大，又不精明，蠅哄蛙嗷，通國成一家之說，而不可與聖賢平正通達之識，曰妄論。造
-偽投奸，滃訾詭秘，為不根之言，播眾人之耳，千口成公，久傳成實，卒使夷由為蹻跖
-，曰誣論。稱人之善，胸無秤尺，惑於小廉曲謹，感其照意象恭，喜一激之義氣，悅一
-霎之道言，不觀大節，不較生平，不舉全體，不要永終，而遽許之，曰無識之論。嗚呼
-！議論之難也久矣，聽之者可弗察與？
-　　簡靜沉默之人發用出來不可當，故停蓄之水一決不可御也，蟄處之物其毒不可當也
-，潛伏之獸一猛不可禁也。輕泄驟舉，暴雨疾風耳，智者不懼焉。
-　　平居無事之時，則丈夫不可繩以婦人之守也，及其臨難守死，則當與貞女烈婦比節
-；接人處眾之際，則君子未嘗示人以廉隅之跡也，及其任道徒義，則當與壯士健卒爭勇。
-　　禍之成也必有漸，其激也奮於積。智者於其漸也絕之，於其積也消之，甚則決之。
-決之必須妙手，譬之瘍然，鬱而內潰，不如外決；成而後決，不如早散。
-　　涵養不定的，惡言到耳先思馭氣，氣平再沒錯的。一不平，饒你做得是，也帶著五
-分過失在。
-　　疾言、遽色、厲聲、怒氣，原無用處。萬事萬物只以心平氣和處之，自有妙應。余
-褊，每坐此失，書以自警。
-　　嘗見一論人者云：「渠只把天下事認真做，安得不敗？」余聞之甚驚訝，竊意天下
-事盡認真做去，還做得不象，若只在假借面目上做工夫，成甚道理？天下事只認真做了
-。更有甚說？何事不成？方今大病痛，正患在不肯認真做，所以大綱常、正道理無人扶
-持，大可傷心。嗟夫！武子之愚，所謂認真也與？
-　　人人因循昏忽，在醉夢中過了一生，壞廢了天下多少事！
-　　惟憂勤惕勵之君子，常自惺惺爽覺。
-　　明義理易，識時勢難；明義理腐儒可能，識時勢非通儒不能也。識時易，識勢難；
-識時見者可能，識勢非蚤見者不能也。
-　　識勢而蚤圖之，自不至於極重，何時之足憂？
-　　只有無跡而生疑，再無有意而能掩者，可不畏哉？
-　　令人可畏，未有不惡之者，惡生毀；令人可親，未有不愛之者，愛生譽。
-　　先事體怠神昏，事到手忙腳亂，事過心安意散，此事之賊也。兵家尤不利此。
-　　善用力者，舉百鈞若一羽，善用眾者，操萬旅若一人。
-　　沒這點真情，可惜了繁文侈費；有這點真情，何嫌於二簋一掬？
-　　百代而下，百里而外，論人只是個耳邊紙上，並跡而誣之，那能論心？嗚呼！文士
-尚可輕論人乎哉？此天譴鬼責所繫，慎之！
-　　或問：「怨尤之念，底是難克，奈何？」曰：「君自來怨尤，怨尤出甚的？天之水
-旱為虐不怕人怨，死自死耳，水旱白若也；人之貪殘無厭不伯你尤，恨自恨耳，貪殘自
-若也。此皆無可奈何者。今且不望君自修自責，只將這無可奈何事惱亂心腸，又添了許
-多痛苦，不若淡然安之，討些便宜。」其人大笑而去。
-　　見事易，任事難。當局者只怕不能實見得，果實見得，則死生以之，榮辱以之，更
-管甚一家非之，全國非之，天下非之。
-　　人事者，事由人生也。清心省事，豈不在人？
-　　閉戶於鄉鄰之鬥，雖有解紛之智，息爭之力，不為也，雖忍而不得謂之楊朱。忘家
-於懷襄之時，雖有室家之憂，骨肉之難，不顧也，雖勞而不得謂之墨翟。
-　　流俗污世中真難做人，又跳脫不出，只是清而不激就好。
-　　恩莫到無以加處：情薄易厚，愛重成隙。
-　　欲為便為，空言何益？不為便不為，空言何益？
-　　以至公之耳聽至私之口，舜、跖易名矣；以至公之心行至私之聞，黜陟易法矣。故
-兼聽則不蔽，精察則不眩，事可從容，不必急遽也。
-　　某居官，厭無情者之多言，每裁抑之。蓋無厭之欲，非分之求，若以溫顏接之，彼
-懇乞無已，煩瑣不休，非嚴拒則一日之應酬幾何？及部署日看得人有不盡之情，抑不使
-通，亦未盡善。嘗題二語於私署云：「要說的盡著都說，我不嗔你；不該從未敢輕從，
-你休怪我。」或曰：「畢竟往日是。」
-　　同途而遇，男避女，騎避步，輕避重，易避難，卑幼避尊長。
-　　勢之所極，理之所截，聖人不得而毫髮也。故保辜以時刻分死生，名次以相鄰分得
-失。引繩之絕，墮瓦之碎，非必當斷當敝之處，君子不必如此區區也。
-　　制禮法以垂萬世、繩天下者，須是時中之聖人斟酌天理人情之至而為之。一以立極
-，無一毫矯拂心，無一毫懲創心，無一毫一切心，嚴也而於人情不苦，寬也而於天則不
-亂，俾天下肯從而萬世相安。故曰：「禮之用，和為貴。」和之一字，制禮法時合下便
-有，豈不為美？《儀禮》不知是何人製作，有近於迂闊者，有近於迫隘者，有近於矯拂
-者，大率是個嚴苛繁細之聖人所為，胸中又帶個懲創矯拂心，而一切之。後世以為周公
-也，遂相沿而守之，畢竟不便於人情者，成了個萬世虛車。是以繁密者激人躁心，而天
-下皆逃於闊大簡直之中；嚴峻者激人畔心，而天下皆逃於逍遙放恣之地。甚之者，乃所
-驅之也。此不可一二指。余讀《禮》，蓋心不安而口不敢道者，不啻百餘事也。而宋儒
-不察《禮》之情，又於節文上增一重鎖鑰，予小子何敢言？
-　　禮無不報，不必開多事之端怨；無不酬，不可種難言之恨。
-　　舟中失火，須思救法。
-　　象箸夾冰丸，須要夾得起。
-　　相嫌之敬慎，不若相忘之怒詈。
-　　士君子之相與也，必求協諸禮義，將世俗計較一切脫盡。今世號為知禮者全不理會
-聖賢本意，只是節文習熟，事體諳練，燦然可觀，人便稱之，自家欣然自得，泰然責人
-。嗟夫！自繁文彌尚而先王之道湮沒，天下之苦相責，群相逐者，皆末世之靡文也。求
-之於道，十九不合，此之謂習尚。習尚壞人，如飲狂泉。
-　　學者處事處人，先要識個禮義之中。正這個中正處，要析之無毫釐之差，處之無過
-不及之謬，便是聖人。
-　　當急遽冗雜時，只不動火，則神有餘而不勞事，從容而就理。一動火，種種都不濟。
-　　予平生處人處事，淚切之病卄居其九，一向在這裡克，只憑消磨不去。始知不美之
-質變化甚難，而況以無恒之志、不深之養，如何能變化得？若志定而養深，便是下愚也
-移得一半。
-　　予平生做事發言，有一大病痛，只是個盡字，是以無涵蓄，不渾厚，為終身之大戒。
-　　凡當事，無論是非邪正，都要從容蘊藉，若一不當意便忿恚而決裂之，此人終非遠
-器。
-　　以淚而發者，必以無而癈，此不自涵養中來，算不得有根本底學者。涵養中人，遇
-當為之事，來得不徙，若懶若遲，持得甚堅，不移不歇。彼攘臂抵掌而任天下之事，難
-說不是義氣，畢竟到盡頭處不全美。
-　　天地萬物之理皆始於從容，而卒於急促。急促者盡氣也，從容者初氣也。事從容則
-有餘味，人從容則有餘年。
-　　凡人應酬多不經思，一向任情做去，所以動多有悔。若心頭有一分檢點，便有一分
-得處，智者之忽固不若愚者之詳也。
-　　日日行不怕千萬里，常常做不怕千萬事。
-　　事見到無不可時便斬截做，不要留戀，兒女子之情不足以語辦大事者也。
-　　斷之一事，原謂義所當行，郤念有牽纏，事有掣礙，不得脫然爽潔，才痛煞煞下一
-個斷字，如刀斬斧齊一般。總然只在大頭腦處成一個是字，第二義又都放下，況兒女情
-、利害念，那顧得他？若待你百可意、千趁心，一些好事做不成。
-　　先眾人而為，後眾人而言。
-　　在邪人前發正論，不問有心無心，此是不磨之恨。見貪者談廉道，已不堪聞；又說
-某官如何廉，益難堪；又說某官貪，愈益難堪；況又勸汝當廉，況又責汝如何貪，彼何
-以當之？或曰：「當如何？」曰：「位在，則進退在我，行法可也。位不在，而情意相
-關，密諷可也。若與我無干涉，則鉗口而已。」禮入門而問諱，此亦當諱者。
-　　天下事最不可先必而豫道之，已定矣，臨時還有變更，況未定者乎？故寧有不知之
-名，無貽失言之悔。
-　　舉世囂囂兢兢不得相安，只是抵死沒自家不是耳。若只把自家不是都認，再替別人
-認一分，便是清寧世界，兩忘言矣。
-　　人人自責自盡，不直四海無爭，彌宇宙間皆太和之氣矣。
-　　▉當處都要個自強不息之心，天下何事不得了？天下何人不能處？
-　　規模先要個闊大，意思先要個安閑，古之人約己而豐人，故群下樂為之用，而所得
-常倍。徐思而審處，故己不勞而事極精詳。褊急二字，處世之大礙也。
-　　凡人初動一念是如此，及做出來郤不是如此，事去回顧又覺不是如此，只是識見不
-定。聖賢才發一念，始終如一，即有思索，不過周詳此一念耳。蓋聖賢有得於豫養，故
-安閑；眾人取辦於臨時，故昡惑。
-　　處人不可任己意，要悉人之情；處事不可任己見，要悉事之理。
-　　天下無難處之事，只消得兩個「如之何」；天下無難處之人，只消得三個「必自成
-」。
-　　人情要耐心體他，體到悉處，則人可寡過，我可寡怨。
-　　事不關係都歇過到關係時悔之何及？事幸不敗都饒過，到敗事時懲之何益？是以君
-子不忽小防，其敗也不恕敗，防其再展。此心與旁觀者一般，何事不濟？
-　　世道、人心、民生、國計，此是士君子四大責任。這裡都有經略，都能張主，此是
-士君子四大功業。
-　　情有可通，莫於舊有者過裁抑，以生寡恩之怨；事在得已，莫於舊無者妄增設，以
-開多事之門。若理當革、時當興，合於事勢人情，則非所拘矣。
-　　毅然奮有為之志，到手來只做得五分。渠非不自信，未臨事之志向雖篤，既臨事之
-力量不足也。故平居觀人以自省，只可信得一半。
-　　辦天下大事，要精詳，要通變，要果斷，要執持。才鬆軟怠弛，何異鼠頭蛇尾？除
-天下大奸，要顧慮，要深沉，要突卒，要潔絕，才張皇疏慢，是攖虎欿龍鱗。
-　　利害死生間有毅然不奪之介，此謂大執持。驚急喜怒事無卒然遽變之容，此謂真涵
-養。
-　　力負邱山未足雄，地負萬山，此身還負地。量包滄海不為大，天包四海，吾量欲包
-天。
-　　天不可欺，人不可欺，何處瞞藏些子？性分當盡職分當盡，莫教久缺分毫。
-　　何是何非，何長何短，但看百忍之圖。不喑不瞽，不痴不聾，自取一朝之忿。
-　　植萬古綱常，先立定自家地步；做兩間事業，先推開物我藩籬。
-　　捱不過底事，莫如早行；悔無及之言，何似休說。
-　　苟時不苟真不苟，忙處無忙再無忙。
-　　《謙》六爻，畫畫皆吉；恕一字，處處可行。
-　　才逢樂處須知苦，既沒閑時那有忙。
-　　生來不敢拂吾髮，義到何妨斷此頭。
-　　量嫌六合隘，身負五岳輕。
-　　休買貴後賤，休逐眾人見。
-　　難乎能忍，妙在不言。
-　　休忙休懶，不懶不忙。
-
-
-
-
-養生
-
-
-　　夫水遏之，乃所以多之；泄之，乃所以竭之。惟仁者能泄。
-　　惟智者知泄。
-　　天地間之禍人者，莫如多；令人易多者，莫如美。美味令人多食，美色令人多欲，
-美聲令人多聽，美物令人多貪，美官令人多求，美室令人多居，美田令人多置，美寢令
-人多逸，美言令人多入，美事令人多戀，美景令人多留，美趣令人多思，皆禍媒也。不
-美則不令人多。不多則不令人敗。予有一室，題之曰「遠美軒」，而扁其中曰「冷淡」
-。非不愛美，懼禍之及也。
-
-　　夫魚見餌不見鉤，虎見羊不見阱。猩猩見酒不見人，非不見也，迷於所美而不暇顧
-也。此心一冷，則熱鬧之景不能入；一淡，則豔冶之物不能動。夫能知困窮、抑鬱、貧
-賤，坎坷之為詳，則可與言道矣。
-　　以肥甘愛兒女而不思其傷身，以姑息愛兒女而不恤其敗德，
-　　甚至病以死，患大辟而不知悔者，皆婦人之仁也。噫！舉世之自愛而陷於自殺者，
-又十人而九矣。
-　　五閉，養德養生之道也。或問之曰：「視、聽、言、動、思將不啟與？」曰：「常
-閉而時啟之，不弛於事可矣。此之謂夷夏關。」
-　　今之養生者，餌藥、服氣、避險、辭難、慎時、寡慾，誠要法也。嵇康善養生，而
-其死也卻在所慮之外。乃知養德尤養生之第一要也。德在我，而蹈白刃以死，何害其為
-養生哉？
-　　愚愛談醫，久則厭之，客言及者，告之曰：「以寡慾為四物，以食淡為二陳，以清
-心省事為四君子。無價之藥，不名之醫，取諸身而已。」
-　　仁者壽，生理完也；默者壽，元氣定也；拙者壽，元神固也。反比皆妖道也。其不
-然，非常理耳。
-　　盜為男戎，色為女戎。人皆知盜之劫殺為可畏。而忘女戎之劫殺。悲夫！
-　　太樸，天地之命脈也。太樸散而天地之壽妖可卜矣。故萬物蕃，則造化之元精耗散
-。木多實者根傷，草出莖者根虛，費用廣者家貧，言行多者神竭，皆妖道也。老子受用
-處，盡在此中看破。
-　　饑寒痛癢，此我獨覺，雖父母不之覺也；衰老病死，此我獨當，雖妻子不能代也。
-自愛自全之道，不自留心，將誰賴哉？
-　　氣有為而無知，神有知而無為。精者，無知無為，而有知有為之母也。精天一也，
-屬水，水生氣；氣純陽也，屬火，火生神；神太虛也，屬無，而麗於有。精盛則氣盛，
-精衰則氣衰，故甑涸而不蒸。氣存則神存，氣亡則神亡，故燭盡而火滅。
-　　氣只夠喘息底，聲只夠聽聞底，切莫長餘分毫，以耗無聲無臭之真體。
-
-　　語云：「縱欲忘身」，忘之一字最宜體玩。昏不省記謂之忘，欲迷而不悟，情勝而
-不顧也。夜氣清明時，都一一分曉，著迷處，便思不起，沉溺者可以驚心回首矣。
-　　在篋香韞，在几香損，在爐香燼。
-　　書室聯：「曙枕酣餘夢，旭窗閑展書。」
-
-
-
-
-
-天地
-
-
-　　濕溫生物，濕熱長物，燥熱成物，淒涼殺物，嚴寒養物。
-　　濕溫，沖和之氣也；濕熱，蒸發之氣也；燥熱，燔灼之氣也；淒涼，殺氣，陰壯而
-陽微也，嚴寒，斂氣，陰外激而陽內培也。
-　　五氣惟嚴寒最仁。
-　　渾厚，天之道也。是故處萬物而忘言，然不能無日月星辰以昭示之，是寓精明於渾
-厚之中。
-　　精存則生神，精散則生形。太乙者，天地之神也；萬物者，天地之形也。太乙不盡
-而天地存，萬物不已而天地毀。人亦然。
-　　天地只一個光明，故不言而人信。
-　　天地不可知也，而吾知天地之所生，觀其所生，而天地之性情形體懼見之矣。是故
-觀子而知父母，觀器而知模範。天地者，萬物之父母而造物之模範也。
-　　天地之氣化，生於不齊，而死於齊。故萬物參差，萬事雜揉，勢固然耳，天地亦主
-張不得。
-　　觀七十二候者，謂物知時，非也，乃時變物耳。
-　　天地盈虛消息是一個套子，萬物生長收藏是一副印板。
-　　天積氣所成，自吾身以上皆天也。日月星辰去地八萬四千里，囿於積氣中，無纖隔
-微礙，徹地光明者，天氣清甚無分毫渣滓耳。故曰太清。不然，雖薄霧輕煙，一里外有
-不見之物矣。
-　　地道，好生之至也，凡物之有根種者，必與之生。盡物之分量，盡己之力量，不至
-寒凝枯敗不止也、故曰坤稱母。
-　　四時惟冬是天地之性，春夏秋皆天地之情。故其生萬物也，動氣多而靜氣少。
-　　萬物得天地之氣以生，有宜溫者，有宜微溫者，有宜太溫者，有宜溫而風者，有宜
-溫而濕者，有宜溫而燥者，有宜溫而時風時濕者。何氣所生，則宜何氣，得之則長養，
-失之則傷病。
-　　氣有一毫之爽，萬物陰受一毫之病。其宜涼、宜寒、宜暑，無不皆然。飛潛動植，
-蠛蠓之物，無不皆然。故天地位則萬物育，王道平則萬民遂。
-　　六合中洪纖動植之物，都是天出氣、地出質熔鑄將出來，都要消磨無跡還他。故物
-不怕是金石，也要歸於無。蓋從無中生來，定要都歸無去。譬之一盆水，打攪起來大小
-浮漚以千萬計，原是假借成的，少安靜時，還化為一盆水。
-　　先天立命處，是萬物自具的，天地只是個生息培養。只如草木原無個生理，天地好
-生亦無如之何。
-　　天地間萬物，都是陰陽兩個共成的。其獨得於陰者，見陽必避，蝸牛壁蘚之類是也
-；其獨得於陽者，見陰必枯，夏枯草之類是也。
-　　陰陽合時只管合，合極則離；窩時只管離，離極則合。不極則不離不合，極則必離
-必合。
-　　定則水，燥則火，吾心自有水火；靜則寒，動則熱，吾身自有冰炭。然則天地之冰
-炭誰為之？亦動靜為之。一陰生而宇宙入靜，至十月閉塞而成寒；一陽生而宇宙入動，
-至五月薰蒸而成暑。或曰，「五月陰生矣，而六月大暑，十一月陽生矣，而十二月大寒
-；何也？」曰：「陽不極則不能生陰，陰不極則不能生陽，勢窮則反也。微陰激陽，則
-陽不受激而愈熾；微陽激陰，則陰不受激而愈溢，氣逼則甚也。至七月、正月，則陰陽
-相戰，客不勝主，衰不勝旺，過去者不勝方來。故七月大火西流，而金漸生水；正月析
-木用事，而水漸生火。蓋陰陽之氣續接非直接，直接則絕，父母死而子始生，有是理乎
-？漸至非驟至，驟至則激，五穀種而能即熟，有是理乎？二氣萬古長存，萬物四時成遂
-，皆續與漸為之也。惟續，故不已；惟漸，故無跡。
-　　既有個陰氣，必有聚結，故為月；既有個陽氣，必有精華，故為日。晦是月之體，
-本是純陰無光之物，其光也映日得之，客也，非主也。
-　　天地原無晝夜，日出而成晝，日入而成夜。星常在天，日出而不顯其光，日入乃顯
-耳。古人云星從日生。細看來，星不借日之光以為光。嘉靖壬寅日食，既滿天有星，當
-是時，日且無光，安能生星之光乎？
-　　水靜柔而動剛，金動柔而靜剛，木生柔而死剛，火生剛而死柔。土有剛有柔，不剛
-不柔，故金、木、水、火皆從鍾焉，得中故也，天地之全氣也。
-　　噓氣自內而之外也，吸氣自外而之內也。天地之初噓為春，噓盡為夏，故萬物隨噓
-而生長；天地之初吸為秋，吸盡為冬，故萬物隨吸而收藏。噓者，上升陽氣也，陽主發
-；吸者，下降陰氣也，陰主成。噓氣溫，故為春夏；吸氣寒，故為秋冬。一噓一吸，自
-開闢以來至混沌之後，只這一絲氣有毫髮斷處，萬物滅，天地毀。萬物，天地之於也，
-一氣生死無不肖之。
-　　風惟知其吹拂而已，雨惟知其淋漓而已，雪惟知其嚴凝而已，水惟知其流行而已，
-火惟知其燔灼而已。不足則屏息而各藏其用，有餘則猖狂而各恣其性。卒然而感則強者
-勝，若兩軍交戰，相下而後已。是故久陰則權在雨，而日月難為明；久旱則權在風，而
-雲雨難為澤，以至水火霜雪莫不皆然。誰為之？
-　　曰：明陽為之。陰陽誰為之？曰：自然為之。
-　　陰陽征應，自漢儒穿鑿附會，以為某災樣應某政事，最迂。
-　　大抵和氣致祥，戾氣致妖，與作善降樣，作惡降殃，道理原是如此。故聖人只說人
-事，只盡道理，應不應，在我不在我都不管。若求一一征應，如鼓答桴，堯、舜其猶病
-矣。大叚氣數有一定的，有偶然的，天地不能違，天地亦順之而已。旱而雩，水而滎，
-彗孛而禳，火而祓，日月食而救，君子畏天威，謹天戒當如是爾。若雲隨禱輒應，則日
-月盈虧豈繫於救不救之間哉？
-　　大抵陰陽之氣一偏必極，勢極必反。陰陽乖戾而分，故孤陽亢而不下陰則旱，無其
-極，陽極必生陰，故久而雨；陰陽和合而留，故淫陰升而不捨陽則雨，無其極，陰極必
-生陽，故久而睛。
-　　草木一衰不至遽茂，一茂不至遽衰；夫婦朋友失好不能遽合，合不至遽乖。天道物
-理人情自然如此是一定的，星隕地震，山崩雨血，火見河清此是偶然的。吉凶先見，。
-自非常理，故臣子以修德望君，不必以災異恐之。若因災而懼，困可修德。一有祥瑞使
-可謂德已足而罷修乎？乃若至德回天，災祥立應，桑穀枯，彗星退，冤獄釋而驟雨，忠
-心白而反風，亦間有之。但曰必然事，吾不能確確然信也。
-　　氣化無一息之停，不屬進，就屬退。動植之物其氣機亦無一息之停，不屬生，就屬
-死，再無不進不退而止之理。
-　　形生於氣。氣化沒有底，天地定然沒有；天地沒有底，萬物定然沒有。
-　　生氣醇濃渾濁，殺氣清爽澄澈；生氣牽戀優柔，殺氣果決脆斷；生氣寬平溫厚，殺
-氣峻隘涼薄。故春氣絪縕，萬物以生：夏氣薰蒸，萬物以長；秋氣嚴肅，萬物以入；冬
-氣閉藏，萬物以亡。
-　　一呼一吸，不得分毫有餘，不得分毫不足；不得連呼，不得連吸；不得一呼無吸，
-不得一吸無呼，此盈虛之自然也。
-　　水質也，以萬物為用；火氣也，以萬物為體。及其化也，同歸於無跡。水性徐，火
-性疾，故水之入物也，因火而疾。水有定氣，火無定氣，放火附剛則剛，附柔則柔，水
-則入柔不入剛也。
-　　陽不能藏，陰不能顯。才有藏處，便是陽中之陰：才有顯處，便是陰中之陽。
-　　水能實虛，火能虛實。
-　　乾坤是毀的，故開闢後必有混沌所以主宰？乾坤是不毀的，故混沌還成開闢。主宰
-者何？元氣是已。元氣亙萬億歲年終不磨滅，是形化氣化之祖也。
-
-　　天地全不張主，任陰陽；陰陽全不擺佈，任自然。世之人趨避祈禳徒自苦耳。其奪
-自然者，惟至誠。
-　　天地發萬物之氣到無外處，止收斂之氣到無內處。止不至而止者，非本氣不足，則
-客氣相奪也。
-　　靜生動長，動消靜息。總則生，生則長，長則消，消則息。
-　　萬物生於陰陽，死於陰陽。陰陽於萬物原不相干，任其自然而已。雨非欲潤物，旱
-非欲熯物，風非欲撓物，雷非欲震物，陰陽任其氣之自然，而萬物因之以生死耳。《易
-》稱「鼓之以雷霆，潤之以風雨」，另是一種道理，不然，是天地有心而成化也。若有
-心成化，則寒暑災樣得其正，乃見天心矣。
-　　天極從容，故三百六十日為一噓吸；極次第，故溫暑涼寒不驀越而雜至；極精明，
-故晝有容光之照而夜有月星；極平常，寒暑旦夜、生長收藏，萬古如斯而無新奇之調；
-極含蓄，並包萬象而不見其滿塞；極沉默，無所不分明而無一言；極精細，色色象象條
-分縷析而不厭其繁；極周匹，疏而不漏；極凝定，風雲雷雨變態於胸中，悲歡叫號怨德
-於地下，而不惡其擾；極通變，普物因材不可執為定局；極自然，任陰陽氣數理勢之所
-極所生，而已不與；極堅耐，萬古不易而無欲速求進之心，消磨曲折之患；極勤敏，無
-一息之停；極聰明，亙古今無一人一事能欺罔之者，極老成，有虧欠而不隱藏；極知足
-，滿必損，盛必定；極仁慈，雨露霜雪無非生物之心；極正直，始終計量，未嘗養人之
-奸、容人之惡；極公平，抑高舉下，貧富貴賤一視同仁；極簡易，無瑣屑曲局示人以繁
-難；極雅淡，青蒼自若，更無炫飾；極靈爽，精誠所至，有感必通；極謙虛，四時之氣
-常下交；極正大，擅六合之恩威而不自有；極誠實，無一毫偽妄心，虛假事；極有信，
-萬物皆任之而不疑。故人當法天。人，天所生也。如之者存，反之者亡，本其氣而失之
-也。
-　　春夏後看萬物繁華，造化有多少淫巧，多少發揮，多少張大，元氣安得不斲喪？機
-緘安得不窮盡？此所以虛損之極，成否塞，成渾沌也。
-　　形者，氣之橐囊也。氣者，形之線索也。無形，則氣無所憑籍以生；無氣，則形無
-所鼓舞以為生。形須臾不可無氣，氣無形則萬古依然在宇宙間也。
-　　要知道雷霆霜雪都是太和。
-　　濁氣醇，清氣漓；濁氣厚，清氣薄；濁氣同，清氣分；濁氣溫，清氣寒；濁氣柔，
-清氣剛；濁氣陰，消氣陽；濁氣豐，清氣嗇；濁氣甘，清氣苦；濁氣喜，清氣惡；濁氣
-榮，清氣枯；濁氣融，清氣孤；濁氣生，清氣殺。
-　　一陰一陽之謂道。二陰二陽之謂駁。陰多陽少、陽多陰少之謂偏。有陰無陽、有陽
-無陰之謂孤。一陰一陽，乾坤兩卦，不二不雜，純粹以精，此天地中和之氣，天地至善
-也。是道也，上帝降衷，君子衷之。是故繼之即善，成之為性，更無偏駁，不假修為，
-是一陰一陽屬之君子之身矣。故曰，君子之道，仁者見之謂之仁，智者見之謂之智，此
-之謂偏。百勝日用而不知，此之謂駁。至於孤氣所生，大乖常理。孤陰之善，慈悲如母
-，惡則險毒如虺；孤陽之善，嫉惡如仇，惡則凶橫如虎。此篇夫子論性純以善者言之，
-與性相近，稍稍不同。
-　　天地萬物只是一個漸，故能成，故能久。所以成物悠者，漸之象也；久者，漸之積
-也。天地萬物不能頓也，而況於人乎？
-　　故悟能頓，成不能頓。
-　　盛德莫如地，萬物於地，惡道無以加矣。聽其所為而莫之憾也，負菏生成而莫之厭
-也。故君子卑法地，樂莫大焉。
-　　日正午，月正圓，一呼吸間耳。呼吸之前，未午未圓；呼吸之後，午過圓過。善觀
-中者，此亦足觀矣。
-　　中和之氣，萬物之所由以立命者也，故無所不宜；偏盛之氣，萬物之所由以盛衰者
-也，故有宜有不宜。
-　　祿、位、名、壽、康、寧、順、適、子孫賢達，此天福人之大權也。然嘗輕以與人
-，所最靳而不輕以與人者，惟名。福善禍淫之言，至名而始信。大聖得大名，其次得名
-，視德無分毫爽者，惡亦然。祿、位、壽、康在一身，名在天下；祿、位、壽、康在一
-時，名在萬世。其惡者備有百福，惡名愈著；善者備嘗艱苦，善譽日彰。桀、封、幽、
-厲之名，孝子慈孫百世不能改。此固天道報應之微權也。天之以百福予人者，恃有此耳
-。
-　　彼天下萬世之所以仰慕欽承痰惡笑罵，其禍福固亦不小也。
-　　以理言之，則當然者謂之天，命有德討有罪，奉三尺無私是已；以命言之，則自然
-者謂之天，莫之為而為，莫之致而至，定於有生之初是已；以數言之，則偶然者謂之天
-，會逢其適，偶值其際是已。
-　　造物之氣有十：有中氣，有純氣，有雜氣，有戾氣，有似氣，有大氣，有細氣，有
-間氣，有變氣，有常氣，皆不外於五行。中氣，五行均調，精粹之氣也，人鍾之而為堯
-、舜、禹、文、周、孔，物得之而為鱗鳳之類是也。純氣，五行各具純一之氣也，人得
-之而為伯夷、伊尹、柳下惠，物得之而為龍虎之類是也。雜氣，五行交亂之氣也。戾氣
-，五行粗惡之氣也。
-　　似氣，五行假借之氣也。大氣，磅磅渾淪之氣也。細氣，纖蒙浮渺之氣也。間氣，
-積久充溢會合之氣也。變氣，偶爾遭逢之氣也。常氣，流行一定之氣也。萬物各有所受
-以為生，萬物各有所屬以為類，萬物不自由也。惟有學問之功，變九氣以歸中氣。
-　　火性發揚，水性流動，木性條暢，金性堅剛，土性重厚，其生物也亦然。
-　　太和在我，則天地在我，何動不臧？何往不得？
-　　彌六合皆動氣之所為也，靜氣一粒伏在九地之下以胎之。
-
-　　故動者靜之死鄉，靜者動之生門。無靜不生，無動不死。靜者常施，動者不還。發
-大造之生氣者動也，耗大造之生氣者亦動也。聖人主靜以涵元理，道家主靜以留元氣。
-　　萬物發生，皆是流於既溢之餘，萬物收斂，皆是勞於既極之後。天地一歲一呼吸，
-而萬物隨之。
-　　天地萬物到頭來皆歸於母。故水、火、金、木有盡，而土不盡。何者？水、火、金
-、木，氣盡於天，質盡於地，而土無可盡。故真氣無歸，真形無藏。萬古不可磨滅，滅
-了更無開闢之時。所謂混沌者，真氣與真形不分也。形氣混而生天地，形氣分而生萬物
-。
-　　天欲大小人之惡，必使其惡常得志。彼小人者，惟恐其惡之不遂也，故貪天禍以至
-於亡。
-　　自然謂之天，當然謂之天，不得不然謂之天；陽亢必旱，久旱必陰，久陰必雨，久
-雨必晴，此之謂自然。君尊臣卑，父坐子立，夫唱婦隨，兄友弟恭，此之謂當然。小役
-大，弱役強，貧役富，賤役貴，此之謂不得不然。
-　　心就是天，欺心便是欺天，事心便是事天，更不須向蒼蒼上面討。
-　　天者，未定之命；命者，已定之天。天者，大家之命，命者，各物之天。命定而吉
-凶禍福隨之也，由不得天，天亦再不照管。
-　　天地萬物只是一氣聚散，更無別個。形者，氣所附以為凝結；氣者，形所托以為運
-動。無氣則形不存，無形則氣不住。
-　　天地既生人物，則人物各具一天地。天地之天地由得天地，人物之天地由不得天地
-。人各任其氣質之天地至於無涯牿，其降衷之天地幾於澌盡，天地亦無如之何也已。其
-吉凶禍福率由自造，天何尤乎而怨之？
-　　吾人渾是一天，故日用起居食總念念時時事事便當以天自處。
-　　朱子云：「天者，理也。」余曰：「理者，天也。」
-　　有在天之天，有在人之天。有在天之先天，太極是已；有在天之後天，陰陽五行是
-已。有在人之先天，元氣、無理是已；有在人之後天，血氣、心知是已。
-　　問：「天地開闢之初，其狀何似？」曰：「未易形容。」因指齋前盆沼，令滿貯帶
-沙水一盆，投以瓦礫數小塊，雜穀豆升許，令人攪水渾濁，曰：「此是混沌未分之狀。
-待三日後再來看開闢。」至日而濁者清矣，輕清上浮。曰：「此是天開於子。沉底渾泥
-，此是地辟於丑。中間瓦礫出露，此是山陵，是時穀豆芽生，月餘而水中小蟲浮沉奔逐
-，此是人與萬物生於寅。徹底是水，天包乎地之象也。地從上下，故山上銳而下廣，象
-糧穀堆也。氣化日繁華，日廣侈，日消耗，萬物毀而生機微。天地雖不毀，至亥而又成
-混沌之世矣。」
-　　雪非薰蒸之化也。天氣上升，地氣下降，是乾涸世界矣。然陰陽之氣不交則絕，故
-有留滯之餘陰，始生之嫩陽，往來交結，久久不散而迫於嚴寒，遂為雪為霰。白者，少
-明之色也，水之母也。盛則為雪，微則為霜，冬月片瓦半磚之下著濕地，皆有霜，陰氣
-所呵也，土乾則否。
-　　兩間氣化，總是一副大蒸籠。
-　　天地之於萬物，因之而已，分毫不與焉。
-　　世界雖大，容得千萬人忍讓，容不得一兩個縱橫。
-　　天地之於萬物原是一貫。
-　　輕清之氣為霜露，濃濁之氣為雲雨。春雨少者，薰蒸之氣未濃也。春多雨則沁夏之
-氣，而夏雨必少，夏多雨者，薰蒸之氣有餘也。夏少雨則積氣之餘，而秋雨必多，此謂
-氣之常耳。至於霪潦之年，必有亢陽之年，則數年總計也。蜀中之漏天，四時多雨；雲
-中之高地，四時多旱；吳下之水鄉，黃梅之雨為多，則四方互計也。總之，一個陰陽，
-一般分數，先有餘則後不足，此有餘則彼不足，均則各足，是謂太和，太和之歲，九有
-皆豐。
-　　冬者，萬物之夜，所以待勞倦養精神者也。春生、夏長、秋成，而不培養之以冬，
-則萬物之滅久矣。是知大冬嚴寒，所以仁萬物也。愈嚴凝則愈收斂，愈收斂則愈精神，
-愈精神則生發之氣愈條暢。譬之人須要安歇，今夜能熟睡，則明日必精神。故曰：冬者
-萬物之所以歸命也。
-
-
-
-
-
-世運
-
-
-　　勢之所在，天地聖人不能違也。勢來時即摧之，未必遽壞；勢去時即挽之，未必能
-回。然而聖人每與勢忤，而不肯甘心從之者，人事宜然也。
-　　世人賤老，而聖王尊之；世人棄愚，而君子取之；世人恥貧，而高士清之；世人厭
-淡，而智者味之；世人惡冷，而幽人寶之；世人薄素，而有道者尚之。悲夫！世之人難
-與言矣。
-　　壞世教者，不是宦官宮安，不是農工商貿，不是衙門市井，不是囗囗。
-　　古昔盛時，民自飽暖之外無過求，自利用之外無異好，安身家之便而不恣耳目之欲
-。家無奇貨，人無玩物，餘珠玉於山澤而不知寶，贏繭絲於箱篋而不知繡。偶行於途而
-知貴賤之等，創見於席而知隆殺之理。農於桑麻之外無異聞，士於禮義之外
-　　無羨談；公卿大夫於勸深訓迪之外無簿書。知官之貴，而不知為民之難；知貧之可
-憂，而不知人富之可嫉。夜行不以兵，遠行不以餱. 施人者非欲其我德，施於人者不疑
-其欲我之德。訴訢渾渾，其時之春乎？其物之胚孽乎？吁！可想也已。
-　　伏羲以前是一截世道，其治任之而已，己無所與也。五帝是一截世道，其治安之而
-已，不擾民也。三王是一截世道，其治正之而已，不使縱也。秦以後是一截世道，其治
-劫之而已，愚之而已，不以德也。
-　　世界一般是唐虞時世界，黎民一般是唐虞時黎民，而治不古若，非氣化之罪也。
-　　終極與始接，困極與亨接。
-　　三皇是道德世界，五帝是仁義世界，三王是禮義世界，春秋是威力世界，戰國是智
-巧世界，漢以後是勢利世界。
-　　士鮮衣美食，浮淡怪說、玩日愒時，而以農工為村鄙；女傅粉簪花、冶容學態、袖
-手樂游，而以勤儉為羞辱；官盛從豐供、繁文縟節、奔逐世態，而以教養為迂腐。世道
-可為傷心矣。
-　　喜殺人是泰，愁殺人也是泰。泰之人昏惰侈肆，泰之事廢墜寬罷，泰之風紛華驕蹇
-，泰之前如上水之篙，泰之世如高竿之頂，泰之後如下坂之車。故否可以致泰，泰必至
-於否。故聖人憂泰不憂否。否易振，泰難持。
-　　世之衰也，卑幼賤微氣高志肆而無上，子弟不知有父母，婦不知有舅姑，後進不知
-有先達，士民不知有官師，郎署不知有公卿，偏稗軍士不知有主帥。目空空而氣勃勃，
-恥於分義而敢於陵駕。嗚呼！世道至此，未有不亂不亡者也。
-　　節文度數，聖人之所以防肆也。偽禮文不如真愛敬，真簡率不如偽禮文。偽禮文猶
-足以成體，真簡率每至於逾閒；偽禮文流而為象恭滔天，真簡率而為禮法掃地。七賢八
-達，簡率之極也。舉世牛馬而晉因以亡。近世士風祟尚簡率；蕩然無檢，嗟嗟！吾莫知
-所終矣。
-　　天下之勢頓可為也，漸不可為也。頓之來也驟驟多無根，漸之來也深深則難撼。頓
-著力在終，漸著力在始。
-　　造物有涯而人情無涯，以有涯足無涯，勢必爭，故人人知足則天下有餘。造物有定
-而人心無定，以無定撼有定，勢必敗。
-　　故人人安分則天下無事。
-　　天地有真氣，有似氣。故有鳳皇則有昭明，有粟穀則有稂莠，兔葵似葵，燕麥似麥
-，野菽似菽，槐藍似槐之類。人亦然皆似氣之所鍾也。
-　　六合是個情世界，萬物生於情死於情。至人無情，聖人調情，君子制情，小人縱情。
-　　變民風易，變士風難；變士風易，變仕風難。仕風變，天下治矣。
-　　古之居官也，在下民身上做工夫；今之居官也，在上官眼底做工夫。古之居官也尚
-正直，今之居官也尚縠阿。
-　　任俠氣質皆賢者也，使人聖賢繩墨，皆光明俊偉之人。世教不明，紀法陵替，使此
-輩成此等氣習，誰之罪哉！
-　　世界畢竟是吾儒世界，雖二氏之教雜出其間，而紀綱法度、教化風俗，都是二帝三
-王一派家數。即百家井出，只要主僕分明，所謂元氣充實，即風寒入肌，瘡瘍在身，終
-非危症也。
-　　一種不萌芽，六塵不締構，何須度萬眾成羅漢三千？九邊無夷狄，四海無奸雄，只
-宜銷五兵鑄金人十二。
-
-
-
-
-聖賢
-
-
-　　孔子是五行造身，兩儀成性。其餘聖人得金氣多者則剛明果斷，得木氣多者則樸素
-質直，得火氣多者則發揚奮迅，得水氣多者則明徹圓融，得土氣多者則鎮靜渾厚，得陽
-氣多者則光明軒豁，得陰氣多者則沉默精細。氣質既有所限，雖造其極，終是一偏底聖
-人。此七子者，共事多不相合，共言多不相入，所同者大根本大節目耳。
-　　孔顏窮居，不害其為仁覆天下，何則？仁覆天下之具在我，而仁覆天下之心未嘗一
-日忘也。
-　　聖人不落氣質，賢人不渾厚便直方，便著了氣質色相；聖人不帶風土，賢人生燕趙
-則慷慨，生吳越則寬柔，就染了風土氣習。
-　　性之聖人，只是個與理相忘，與道為體，不待思，惟橫行直撞，恰與時中吻合。反
-之，聖人常常小心，循規蹈矩，前望後顧，才執得中字，稍放鬆便有過不及之差。是以
-希聖君子心上無一時任情恣意處。
-　　聖人一，聖人全，一則獨詣其極，全則各臻其妙。惜哉！
-　　至人有聖人之功而無聖人之全者，囿於見也。
-　　所貴乎剛者，貴其能勝己也，非以其能勝人也。子路不勝其好勇之私，是為勇字所
-伏，終不成個剛者。聖門稱剛者誰？吾以為恂恂之顏子，其次魯鈍之曾子而已，餘無聞
-也。
-　　天下古今一條大路，曰大中至正，是天造地設的。這個路上古今不多幾人走，曰堯
-、舜、禹、湯、文、武、周、孔、顏、曾、思、孟，其餘識得的周、程、張、朱，雖走
-不到盡頭，畢竟是這路上人。將這個路來比較古今人，雖伯夷、伊、惠也是異端，更那
-說那佛、老、楊、墨、陰陽術數諸家。若論個分曉，伯夷、伊、惠是旁行的，佛、老、
-楊、墨是斜行的，陰陽星數是歧行的。本原處都從正路起，卻念頭一差，走下路去，愈
-遠愈繆。所以說，異端言本原不異而發端異也。何也？佛之虛無是吾道中寂然不動差去
-，老之無為是吾道中守約施博差去，為我是吾道中正靜自守差去，兼愛是吾道中萬物一
-體差去，陰陽家是吾道中敬授人時差去，術數家是吾道中至誠前知差去。看來大路上人
-時為佛，時為老，時為楊，時為墨，時為陰陽術數，是合數家之所長。岔路上人佛是佛
-，老是老，楊是楊，墨是墨，陰陽術數是陰陽術數，殊失聖人之初意。譬之五味不適均
-不可以專用也，四時不錯行不可以專今也。
-　　聖人之道不奇，才奇便是賢者。
-　　戰國是個慘酷的氣運，巧偽的世道，君非富強之術不講，臣非功利之策不行，六合
-正氣獨鍾在孟子身上。故在當時疾世太嚴，憂民甚切。
-　　清任和時，是孟子與四聖人議定的諡法。祖術堯、舜，憲章文、武，上律天時，下
-襲水土，是子思作仲尼的贊語。
-　　聖賢養得天所賦之理完，仙家養得天所賦之氣完。然出陽脫殼，仙家未嘗不死，特
-留得此氣常存。性盡道全，聖賢未嘗不死，只是為此理常存。若修短存亡，則又繫乎氣
-質之厚薄，聖賢不計也。
-　　賢人之言視聖人未免有病，此其大較耳。可怪俗儒見說是聖人語，便迴護其短而推
-類以求通；見說是賢人之言，便洗索其疵而深文以求過。設有附會者從而欺之，則陽虎
-優孟皆失其真，而不免徇名得象之譏矣。是故儒者要認理，理之所在，雖狂夫之言，不
-異於聖人。聖人豈無出於一時之感，而不可為當然不易之訓者哉？
-　　堯、舜功業如此之大，道德如此之全，孔子稱贊不啻口出。
-　　在堯、舜心上有多少缺然不滿足處！道原體不盡，心原趁不滿，勢分不可強，力量
-不可勉，聖人怎放得下？是以聖人身囿於勢分，力量之中，心長於勢分、力量之外，才
-覺足了，便不是堯、舜。
-　　伊尹看天下人無一個不是可憐的，伯夷看天下人無一個不是可惡的，柳下惠看天下
-人無個不是可與的。
-　　浩然之氣孔子非無，但用的妙耳。孟子一生受用全是這兩字。我嘗云：「孟於是浩
-然之氣，孔於是渾然之氣。渾然是浩然的歸宿。浩然是渾然的作用。惜也！孟子未能到
-渾然耳。」
-　　聖學專責人事，專言實理。
-　　二女試舜，所謂書不可盡信也，且莫說玄德升聞，四岳共薦。以聖人遇聖人，一見
-而人品可定，一語而心理相符，又何須試？　即帝艱知人，還須一試，假若舜不能諧二
-女，將若之何？是堯輕視骨肉，而以二女為市貨也，有是哉？
-　　自古功業，惟孔孟最大且久。時雍風動，今日百姓也沒受用處，賴孔孟與之發揮，
-而堯、舜之業至今在。
-　　堯、舜、周、孔之道，如九達之衢，無所不通；如代明之日月，無所不照。其餘有
-所明，必有所昏，夷、尹、柳下惠昏於清、任、和，佛氏昏於寂，老氏昏於裔，楊氏昏
-於義，墨氏昏於仁，管、商昏於法。其心有所向也，譬之鵑鴿知南；其心有所厭也，譬
-之盍旦惡夜。豈不純然成一家人物？競是偏氣。
-　　堯、舜、禹、文、周、孔，振古聖人無一毫偏倚，然五行所鍾，各有所厚，畢竟各
-人有各人氣質。堯敦大之氣多，舜精明之氣多，禹收斂之氣多，文王柔嘉之氣多，周公
-文為之氣多，孔子莊嚴之氣多，熟讀經史自見。若說天縱聖人，如太和元氣流行略不沾
-著一些，四時之氣純是德性，用事不落一毫氣質，則六聖人須索一個氣象無毫髮不同方
-是。
-　　讀書要看聖人氣象性情。鄉黨見孔子氣象十九至其七情。
-　　如回非助我牛刀割雞，見其喜處；由之瑟，由之使門人為臣，仍然於沮溺之對，見
-其怒處；喪予之慟，獲麟之泣，見其哀處；侍側言志之問，與人歌和之時，見其樂處；
-山梁雌雉之歎，見其愛處；斥由之佞，答子貢「君子有惡」之語，見其惡處；周公之夢
-，東周之想，見其欲處。便見他發而皆中節處。
-　　費宰之辭，長府之止，看閔子議論，全是一個機軸，便見他和悅而諍。處人論事之
-法，莫妙於閔於天生的一段中平之氣。
-　　聖人妙處在轉移人不覺，賢者以下便露圭角，費聲色，做出來只見張皇。
-　　或問，「孔、孟周流，到處欲行其道，似技癢的？」曰：「聖賢自家看的分數真，
-天生出我來，抱千古帝王道術，有旋乾轉坤手投，只兀兀家居，甚是自負，所以遍行天
-下以求遇夫可行之君。既而天下皆無一遇，猶有九夷、浮海之思，公山佛肸之往。
-　　夫子豈真欲如此？只見吾道有起死回生之力，天下有垂死欲生之民，必得君而後術
-可施也。譬之他人孺子入井與已無干，既在井畔，又知救法，豈忍袖手？
-　　明道答安石能使愧屈，伊川答子由，遂激成三黨，可以觀二公所得。
-　　休作世上另一種人，形一世之短。聖人也只是與人一般，才使人覺異樣便不是聖人。
-　　平生不作圓軟態，此是丈夫。能軟而不失剛方之氣，此是大丈夫。聖賢之所以分也。
-　　聖人於萬事也，以無定體為定體，以無定用為定用，以無定見為定見，以無定守為
-定守。賢人有定體，有定用，有定見，有定守。故聖人為從心所欲，賢人為立身行己，
-自有法度。
-　　聖賢之私書，可與天下人見；密事，可與天下人知；不意之言，可與天下人聞；暗
-室之中，可與天下人窺。
-　　好問、好察時，著一我字不得，此之謂能忘。執兩端時，著一人字不得，此之謂能
-定。欲見之施行，略無人己之嫌，此之謂能化。
-　　無過之外，更無聖人；無病之外，更無好人。賢智者於無過之外求奇，此道之賊也。
-　　積愛所移，雖至惡不能怒，狃於愛故也；積惡所習，雖至感莫能回，狃於惡故也。
-惟聖人之用情不狃。
-　　聖人有功於天地，只是人事二字。其盡人事也，不言天命，非不知回天無力，人事
-當然，成敗不暇計也。
-　　或問：「狂者動稱古人，而行不掩言，無乃行本顧言乎？孔子奚取焉？」曰：「此
-與行不顧言者人品懸絕。譬之於射，立拱把於百步之外，九矢參連，此養由基能事也。
-孱夫拙射，引弦之初，亦望拱把而從事焉，即發，不出十步之遠，中不近方丈之鵠，何
-害其為志士？又安知日關弓，月抽矢，白首終身，有不為由基者乎？是故學者貴有志，
-聖人取有志。狷者言尺行尺，見寸守寸，孔子以為次者，取其守之確，而恨其志之隘也
-。今人安於凡陋，惡彼激昂，一切以行不顧言沮之，又甚者，以言是行非謗之，不知聖
-人豈有一蹴可至之理？希聖人豈有一朝逕頓之術？只有有志而廢於半途，未有無志而能
-行跬步者。」或曰：「不言而躬行何如？」曰：「此上智也，中人以下須要講求博學、
-審問、明辯，與同志之人相砥礪奮發，皆所以講求之也，安得不言？若行不顧言，則言
-如此，而行如彼，口古人，而心衰世，豈得與狂者同日語哉！」
-　　君子立身行已自有法度，此有道之言也。但法度自堯、舜、禹、湯、文、武、周、
-孔以來只有一個，譬如律令一般，天下古今所共守者。若家自為律，人自為令，則為伯
-夷、伊尹、柳下惠之法度。故以道為法度者，時中之聖；以氣質為法度者，一偏之聖。
-　　聖人是物來順應，眾人也是物來順應。聖人之順應也，從廓然太公來，故言之應人
-如響，而吻合乎當言之理；行之應物也，如取詣宮中，而吻合乎當行之理。眾人之順應
-也，從任情信意來，故言之應人也，好莠自口，而鮮與理合；事之應物也，可否惟欲，
-而鮮與理合。君子則不然，其不能順應也，不敢以順應也。議之而後言，言猶恐尤也；
-擬之而後動，動猶恐悔也。
-　　卻從存養省察來。噫！今之物來順應者，人人是也，果聖人乎？
-　　可哀也已！
-　　聖人與眾人一般，只是盡得眾人的道理，其不同者，乃眾人自異於聖人也。
-　　天道以無常為常，以無為為為。聖人以無心為心，以無事為事。
-　　萬物之情，各求自遂者也。惟聖人之心，則欲遂萬物而志自遂。
-　　為宇宙完人甚難，自初生以至屬纊，徹頭徹尾無些子破綻尤難，恐亙古以來不多幾
-人。其徐聖人都是半截人，前面破綻，後來修補，以至終年晚歲，才得乾淨成就了一個
-好人，還天付本來面目，故曰湯武反之也。曰反，則未反之前便有許多欠缺處。今人有
-過便甘自棄，以為不可復入聖人境域，不知盜賊也許改惡從善，何害其為有過哉？只看
-歸宿處成個甚人，以前都饒得過。
-　　聖人低昂氣化，挽回事勢，如調劑氣血，損其侈不益其強，補其虛不甚其弱，要歸
-於平而已。不平則偏，偏則病，大偏則大病，小偏則小病。聖人雖欲不平，不可得也。
-　　聖人絕四，不惟纖塵微障無處著腳，即萬理亦無作用處，所謂順萬事而無情也。
-　　聖人胸中萬理渾然，寂時則如懸衡鑒，感之則若決江河，未有無故自發一善念。善
-念之發，胸中不純善之故也。故惟旦晝之牿食，然後有夜氣之清明。聖人無時不夜氣，
-是以胸中無無故自見光景。
-　　法令所行，可以使土偶奔趨；惠澤所浸，可以使枯木萌孽；教化所孚，可以使鳥獸
-伏馴；精神所極，可以使鬼神感格，吾必以為聖人矣。
-　　聖人不強人以太難，只是撥轉他一點自然底肯心。
-　　參贊化育底聖人，雖在人類中，其實是個活天，吾嘗謂之人天。
-　　孔子只是一個通，通外更無孔子。
-　　聖人不隨氣運走。不隨風俗走，不隨氣質走。
-　　聖人平天下，不是夷山填海，高一寸還他一寸，低一分還他一分。
-　　聖而不可知之之謂神。不可知，可知之祖也。無不可知做可知不出，無可知則不可
-知何所附屬？
-　　只為多了這知覺，便生出許多情緣，添了許多苦惱。落花飛絮豈無死生？他只恁委
-和委順而已。或曰：「聖學當如是乎？」
-　　曰：「富貴、貧賤、壽夭、寵辱，聖人末嘗不落花飛絮之耳。雖有知覺，心不為知
-覺苦。」
-　　聖人心上再無分毫不自在處。內省不疚，既無憂懼，外至之患，又不怨尤，只是一
-段不釋然，卻是畏天命，悲人窮也。
-
-　　定靜安慮，聖人無一刻不如此。或曰：「喜怒哀樂到面前何如？」曰：「只恁喜怒
-哀樂，定靜安慮，胸次無分毫加損。」
-　　有相予者，謂面上部位多貴，處處指之。予曰：「所憂不在此也。汝相予一心要包
-藏得天下理，相予兩肩要擔當得天下事，相予兩腳要踏得萬事定，雖不貴，子奚憂？不
-然，予有愧於面也。」
-　　物之入物者染物，入於物者染於物；惟聖人無所入，萬物亦不得而入之。惟無所入
-，故無所不入。惟不為物入，故物亦不得而離之。
-　　人於吃飯穿衣，不曾說我當然不得不然，至於五常百行，卻說是當然不得不然，又
-竟不能然。
-　　孔子七十而後從心，六十九歲未敢從也。眾人一生只是從心，從心安得好？聖學戰
-戰兢兢，只是降伏一個從字，不曰戒慎恐懼，則日憂勤惕勵，防其從也。豈無樂的，樂
-也只是樂天。眾人之樂則異是矣。任意若不離道，聖賢性不與人殊，何苦若此？
-　　日之於萬形也，鑒之於萬象也，風之於萬籟也，尺度權衡之於輕重長短也，聖人之
-於萬事萬物也，因其本然付以自然，分毫我無所與焉。然後感者常平，應者常逸，喜亦
-天，怒亦天，而吾心之天如故也。萬感劻勷，眾動轇轕，而吾心之天如故也。
-　　平生無一事可瞞人，此是大快樂。
-
-　　堯、舜雖是生知安行，然堯、舜自有堯、舜工夫。學問但聰明睿智，千百眾人豈能
-不資見聞，不待思索？朱文公云：聖人生知安行，更無積累之漸。聖人有聖人底積累，
-豈儒者所能測識哉？
-　　聖人不矯。
-　　聖人一無所昏。
-　　孟子謂文王取之，而燕民不悅則勿取，雖非文王之心，最看得時勢定。文王非利天
-下而取之，亦非惡富貴而逃之，順天命之予奪，聽人心之向背，而我不與焉。當是時，
-三分天下才有其二，即武王亦動手不得，若三分天下有其三，即文王亦束手不得。《酌
-》之詩曰：「遵養時晦，時純熙矣，是用大介。」天命人心一毫假借不得。商家根深蒂
-固，須要失天命人心到極處，周家積功累仁，須要收天命人心到極處，然後得失界限決
-絕潔淨，無一毫黏帶。如瓜熟自落，栗熟自墜，不待剝摘之力；且莫道文王時動得手，
-即到武王時，紂又失了幾年人心，武王又收了幾年人心。牧誓武成取得，何等費唇舌！
-多士多方守得，何等耽驚怕；則武王者，生摘勁剝之所致也。又譬之瘡落痂、雞出卵，
-爭一刻不得。若文王到武王時定不犯手，或讓位微箕為南河陽城之避，徐觀天命人心之
-所屬，屬我我不卻之使去，不屬我我不招之使來，安心定志，任其自去來耳。此文王之
-所以為至德。使安受二分之歸，不惟至德有損，若紂發兵而問，叛人即不勝，文王將何
-辭？雖萬萬出文王下者，亦不敢安受商之叛國也。用是見文王仁熟智精，所以為宣哲之
-聖也。
-　　湯禱桑林以身為犧，此史氏之妄也。按湯世十八年旱，至二十三年禱桑林責六事，
-於是早七年矣，天乃雨。夫農事冬旱不禁三月，夏旱不禁十日，使湯持七年而後禱，則
-民已無孑遺矣，何以為聖人？即湯以身禱而天不雨，將自殺，與是絕民也，將不自殺，
-與是要天也，湯有一身能供幾禱？天雖享祭，寧欲食湯哉？是七年之間，歲歲有早，未
-必不禱，歲歲禱雨，未必不應，六事自責，史醫特紀其一時然耳。以人禱，斷斷乎其無
-
-也。
-　　伯夷見冠不正，望望然去之，何不告之使正？柳下惠見袒裼裸程，而由由與偕，何
-不告之使衣？故曰：不夷不惠，君子後身之珍也。
-　　亙古五帝三王不散之精英，鑄成一個孔子，餘者猶成顏、曾以下諸賢至思、孟，而
-天地純粹之氣索然一空矣。春秋戰國君臣之不肖也宜哉！後乎此者無聖人出焉。靳孔、
-孟諸賢之精英，而未盡泄與！
-　　周子謂：「聖可學乎？曰無欲。」愚謂聖人不能無欲，七情中合下有欲。孔子曰己
-欲立欲達。孟子有云：「廣土眾民，君子欲之。」天欲不可無，人欲不可有。天欲，公
-也；人欲，私也。周子云「聖無欲」，愚云：「不如聖無私。」此二字者，三氏之所以
-異也。
-　　聖人沒自家底見識。
-　　對境忘情，猶分彼我，聖人可能入塵不染，則境我為一矣。而渾然無點染，所謂「
-入水不溺，入火不焚」，非聖人之至者不能也。若塵為我役，化而為一，則天矣。
-　　聖人學問只是人定勝天。
-　　聖人之私，公；眾人之公，私。
-　　聖人無夜氣。
-　　「衣錦尚絅」，自是學者作用，聖人無尚。
-　　聖王不必天而必我，我之天定而天之天隨之。
-　　生知之聖人不長進。
-　　學問到孔子地位才算得個通，通之外無學問矣。
-　　聖人嘗自視不如人，故天下無有如聖者，非聖人之過虛也，四海之廣，兆民之眾，
-其一才一智未必皆出聖人下也。以聖人無所不能，豈無一毫之未至；以眾人之無所能，
-豈無一見之獨精。以獨精補未至，固聖人之所樂取也。此聖人之心日歉然不自滿足，日
-汲汲然不已於取善也。
-
-　　聖人不示人以難法，其所行者，天下萬世之可能者也；其所言者，天下萬世之可知
-者也。非聖人貶以徇人也，聖人雖欲行其所不能，言其所不知，而不可得也。道本如是
-，其易知易從也。
-
-
-
-
-
-品藻
-
-
-　　獨處看不破，忽處看不破，勞倦時看不破，急遽倉卒時看不破，驚憂驟感時看不破
-，重大獨當時看不破，吾必以為聖人。
-　　聖人做出來都是德性，賢人做出來都是氣質，眾人做出來都是習俗，小人做出來都
-是私欲。
-　　漢儒雜道，宋儒隘道。宋儒自有宋儒局面，學者若入道，且休著宋儒橫其胸中，只
-讀六經四書而體玩之，久久胸次自是不同。若看宋儒，先看濂溪、明道。
-　　一種人難悅亦難事，只是度量褊狹，不失為君子；一種人易事亦易悅，這是貪污軟
-弱，不失為小人。
-　　為小人所薦者，辱也；為君子所棄者，恥也。
-　　小人有恁一副邪心腸，便有一段邪見識；有一段邪見識，便有一段邪議論；有一段
-邪議論，便引一項邪朋黨，做出一番邪舉動。其議論也，援引附會，盡成一家之言，攻
-之則圓轉遷就而本可破；其舉動也，借善攻善，匿惡濟惡，善為騎牆之計，擊之則疑似
-牽纏而不可斷。此小人之尤，而借君子之跡者也。
-　　此藉君子之名，而濟小人之私者也。亡國敗家，端是斯人。
-　　明白小人，剛戾小人，這都不足恨。所以易惡陰柔陽只是一個，惟陰險伏而多瑞，
-變幻而莫測，駁雜而疑似，譬之光天化日，黑白分明，人所共見，暗室晦夜，多少埋伏
-，多少類象，此陰陽之所以別也。虞廷黜陟，惟曰幽明，其以是夫？
-　　富於道德者不矜事功，猶矜事功，道德不足也；富於心得者不矜聞見，猶矜獲見，
-心得不足也。文藝自多浮薄之心也，富貴自雄，卑陋之見也。此二人者，皆可憐也，而
-雄富貴者更不數於丈夫。行彼其冬烘盛大之態，皆君子之所欲嘔者也。而彼且志驕意得
-，可鄙孰甚焉？
-　　士君子在塵世中，擺脫得開，不為所束縛；擺脫得淨，不為所污蔑，此之謂天挺人
-豪。
-　　藏名遠利，夙夜汲汲乎實行者，聖人也。為名修，為利勸，夙夜汲汲乎實行者，賢
-人也。不占名標，不尋利孔，氣昏志惰，荒德廢業者，眾人也。炫虛名，漁實利，而內
-存狡獪之心，陰為鳥獸之行者，盜賊也。
-　　圈子裡幹實事，賢者可能；圈子外幹大事，非豪傑不能。或曰：「圈子外可幹乎？
-」曰：「世俗所謂圈子外，乃聖賢所謂性分內也。人守一官，官求一稱，內外皆若人焉
-，天下可庶幾矣，所謂圈子內幹實事者也。心切憂世，志在匡時，苟利天下，文法所不
-能拘，苟計成功，形跡所不必避，則圈子外幹大事者也。
-　　識高千古，慮週六合，挽末世之頹風，還先王之雅道，使海內復嘗秦漢以前之滋味
-，則又圈子以上人矣。世有斯人乎？吾將與之共流涕矣。乃若硜硜狃眾見，惴惴循弊規
-，威儀文辭，燦然可觀，勤慎謙默，居然寡過，是人也，但可為高官耳，世道奚賴焉？
-　　達人落葉窮通，浮雲生死；高士睥睨古今，玩弄六合；聖人古今一息，萬物一身；
-眾人塵棄天真，腥集世味。
-　　陽君子取禍，陰君子獨免；陽小人取禍，陰小人得福。陽君子剛正直方，陰君子柔
-嘉溫厚；陽小人暴慶放肆，陰小人奸回智巧。
-　　古今士率有三品：上士不好名，中士好名，下士不知好名。
-　　上士宜道德，中士重功名，下士重辭章，斗筲之人重富貴。
-　　人流品格，以君子小人定之，大率有九等，有君子中君子，才全德備，無往不宜者
-也。有君子，優於德而短於才者也。有善人，恂雅溫樸，僅足自守，識見雖正，而不能
-自決，躬行雖力，而不能自保。有眾人，才德識見俱無足取，與世浮沉，趨利避害，祿
-祿風俗中無自表異。有小人，偏氣邪心，惟己私是殖，苟得所欲，亦不害物。有小人中
-小人，貪殘陰狠，恣意所極，而才足以濟之，斂怨怙終，無所顧忌。外有似小人之君子
-，高峻奇絕，不就俗檢，然規模弘遠，小疵常類，不足以病之。有似君子之小人，老詐
-濃文，善藏巧借，為天下之大惡，占天下之大名，事幸不敗當時，後世皆為所欺而競不
-知者。有君子小人之間，行亦近正而偏，語亦近道而雜，學圓通便近於俗，尚古樸則入
-於腐，寬便姑息，嚴便猛鷙。是人也，有君子之心，有小人之過者也，每至害道，學者
-成之。
-　　有俗檢，有禮檢。有通達，有放達。君子通達於禮檢之中，騷士放達於俗檢之外。
-世之無識者，專以小節細行定人品，大可笑也。
-　　上才為而不為，中才只見有為，下才一無所為。
-　　心術平易，制行誠直，語言疏爽，文章明達，其人必君子也。心術微暖，制行詭秘
-，語言吞吐，文章晦澀，其人亦可知矣。
-　　有過不害為君子，無過可指底，真則聖人，偽則大奸，非鄉願之媚世，則小人之欺
-世也。
-　　從欲則如附羶，見道則若嚼蠟，此下愚之極者也。
-　　有涵養人心思極細，雖應倉卒，而胸中依然暇豫，自無粗疏之病。心粗便是學不濟
-處。
-　　功業之士，清虛者以為粗才，不知堯、舜、禹、湯、臯、夔、稷、契功業乎？清虛
-乎？飽食暖衣而工騷墨之事，話玄虛之理，謂勤政事者為俗吏，謂工農桑者為鄙夫，此
-敝化之民也，堯、舜之世無之。
-　　觀人括以五品：高、正、雜、庸、下。獨行奇識曰高品，賢智者流。擇中有執曰正
-品，聖賢者流。有善有過曰雜品，勸懲可用。無短無長曰庸品，無益世用。邪偽二種曰
-下品，慎無用之。
-　　氣節信不過人，有出一時之感慨，則小人能為君子之事；有出於一念之剽竊，則小
-人能盜君子之名。亦有初念甚力，久而屈其雅操，當危能奮安而喪其平生者，此皆不自
-涵養中來。
-　　若聖賢學問，至死更無破綻。
-
-　　無根本底氣節，如酒漢毆人，醉時勇，醒時索然無分毫氣力。無學問底識見，如庖
-人煬灶，面前明，背後左右無一些照顧，而無知者賞其一時，惑其一偏，每擊節歎服，
-信以終身。
-　　吁！難言也。
-　　眾惡必察，是仁者之心。不仁者聞人之惡，喜談樂道。疏薄者聞人之惡，深信不疑
-。惟長者知惡名易以污人，而作惡者之好為誣善也，既察為人所惡者何人，又察言者何
-心，又察致惡者何由，耐心留意，獨得其真，果在位也，則信任不疑，果不在位也，則
-舉辟無貳，果如人所中傷也，則扶救必力。嗚呼！此道不明久矣。
-　　黨錮諸君，只是褊淺無度量。身當濁世，自處清流，譬之涇渭，不言自別。正當遵
-海濱而處，以待天下之清也，卻乃名檢自負，氣節相高，志滿意得，卑視一世而踐踏之
-，譏謗權勢而狗彘之，使人畏忌奉承愈熾愈驕，積津要之怒，潰權勢之毒，一朝而成載
-胥之凶，其死不足惜也。《詩》稱「明哲保身」，孔稱「默足有容，免於刑戮」，豈貴
-貨清市直，甘鼎鑊如飴哉？申、陳二子，得之郭林宗幾矣。顧廚俊及吾道中之罪人也，
-僅愈於卑污耳。若張儉則又李膺、范滂之罪人，可誅也夫！
-　　問：「嚴子陵何如？」曰：「富貴利達之世不可無此種高人，但朋友不得加於君臣
-之上。五臣與舜同僚友，今日比肩，明日北面而臣之，何害其為聖人？若有用世之才，
-抱憂世之志，朋時之所講求，正欲大行，竟施以康，天下孰君孰臣，正不必爾。
-　　如欲遠引高蹈，何處不可藏身，便不見光武也得，既見矣，猶友視帝，而加足其腹
-焉，恐道理不當如是，若光武者則大矣。
-　　見是賢者，就著意迴護，雖有過差，都向好邊替他想；見是不賢者，就著意搜索，
-雖有偏長，都向惡邊替他想，自宋儒以來率坐此失。大叚都是個偏識見，所謂好而不知
-其惡，惡而不知其美者。惟聖人便無此失，只是此心虛平。
-　　蘊藉之士深沉，負荷之士弘重，斡旋之士圓通，康濟之士精敏。反是皆凡才也，即
-聰明辯博無補焉。
-　　君子之交怕激，小人之交怕合。斯二者，禍人之國，其罪均也。
-　　聖人把得定理，把不得定勢。是非，理也。成敗，勢也。
-　　有勢不可為而猶為之者，惟其理而已。知此則三仁可與五臣比事功，孔子可與堯、
-舜較政治。
-　　未試於火，皆純金也。未試於事，皆完人也。惟聖人無往而不可。下聖人一等皆有
-所不足，皆可試而敗。夫三代而下人物，豈甚相遠哉？生而所短不遇於所試，則全名定
-論，可以蓋棺，不幸而偶試其所不足，則不免為累。夫試不試之間，不可以定人品也。
-故君子觀人不待試，而人物高下終身事業不爽分毫，彼其神識自在世眼之外耳。
-　　世之頹波，明知其當變，狃於眾皆為之而不敢動；事之義舉，明知其當為，狃於眾
-皆不為而不敢動，是亦眾人而已。提抱之兒得一果餅，未敢輒食，母嘗之而後入口，彼
-不知其可食與否也。既知之矣，猶以眾人為行止，可愧也夫惟英雄豪傑不徇習以居非，
-能違俗而任道，夫是之謂獨復。嗚呼！此庸人智巧之士，所謂生事而好異者也。
-　　土氣不可無，傲氣不可有。士氣者，明於人己之分，守正而不詭隨。傲氣者，昧於
-上下之等，好高而不素位。自處者每以傲人為士氣，觀人者每以士氣為傲人。悲夫！故
-惟有士氣者能謙己下人。彼做人者昏夜乞哀，或不可知矣。
-　　體解神昏、志消氣沮，天下事不是這般人幹底。接臂抵掌，矢志奮心，天下事也不
-是這般人幹底。干天下事者，智深勇沉、神閒氣定，有所不言，言必當，有所不為，為
-必成。不自好而露才，不輕試以倖功，此真才也，世鮮識之。近世惟前二種人，乃互相
-譏，識者胥笑之。
-　　賢人君子，那一種人裡沒有？鄙夫小人，那一種人裡沒有？
-　　世俗都在那爵位上定人品，把那邪正卻作第二著看。今有僕隸乞丐之人，特地做忠
-孝節義之事，為天地間立大綱常，我當北面師事之；環視達官貴人，似俛首居其下矣。
-論到此，那富貴利達與這忠孝節義比來，豈直太山鴻毛哉？然則匹夫匹婦未可輕，而下
-士寒儒其自視亦不可渺然小也。故論勢分，雖抱關之吏，亦有所下以伸其尊。論性分，
-則堯、舜與途人可揖讓於一堂。論心談道，孰貴孰賤？孰尊孰卑？故天地問惟道貴，天
-地間人惟得道者貴。
-　　山林處士常養一個傲慢輕人之象，常積一腹痛憤不平之氣，此是大病痛。
-　　好名之人充其心，父母兄弟妻子都顧不得，何者？名無兩成，必相形而後顯。葉人
-證父攘羊，陳仲子惡兄受鵝，周澤奏妻破戒，皆好名之心為之也。
-　　世之人常把好事讓與他人做，而甘居已於不肖，又要掠個好名兒在身上，而詆他人
-為不肖。悲夫！是益其不肖也。
-　　理聖人之口易，理眾人之口難。至人之口易為眾人，眾人之口難為聖人，豈直當時
-之毀譽，即千古英雄豪傑之士，節義正直之人，一入議論之家，彼臧此否，各騁偏執，
-互為雌黃。
-　　譬之舞文吏出入人罪，惟其所欲，求其有大公至正之見，死者復生。而響服者幾人
-？是生者肆口，而死者含冤也。噫！使臧否人物者，而出於無聞之士，猶昔人之幸也。
-彼擅著作之名，號為一世人傑，而立言不慎，則是獄成於廷尉，就死而莫之辯也，不仁
-莫大焉。是故君子之論人，與其刻也寧恕。
-　　正直者必不忠厚，忠厚者必不正直。正直人植綱常扶世道，忠厚人養和平培根本。
-然而激天下之禍者，正直之人；養天下之禍者，忠厚之過也。此四字兼而有之，惟時中
-之聖。
-　　露才是士君子大病痛，尤其甚於飾才。露者，不藏其所有也。飾者，虛剽其所無也。
-　　士有三不顧：行道濟時人顧不得愛身，富貴利達人顧不得愛德，全身遠害人顧不得
-愛天下。
-　　其事難言而於心無愧者，寧滅其可知之跡。故君子為心受惡，太伯是已。情有所不
-忍，而義不得不然者，寧負大不韙之名。故君子為理受惡，周公是已。情有可矜，而法
-不可廢者，寧自居於忍以伸法。故君子為法受惡，武侯是已。人皆為之，而我獨不為，
-則掩其名以分謗。故君子為眾受惡，宋子罕是已。
-　　不欲為小人，不能為君子。畢竟作甚麼人？曰：眾人。既眾人，當與眾人伍矣，而
-列其身名於士大夫之林可乎？故眾人而有士大夫之行者榮，士大夫而為眾人之行者辱。
-　　天之生人，雖下愚亦有一竅之明聽其自為用。而極致之，亦有可觀而不可謂之才。
-所謂才者，能為人用，可圓可方，能陰能陽，而不以已用者也，以己用皆偏才也。
-　　心平氣和而有強毅不可奪之力，秉公持正而有圓通不可拘之權，可以語人品矣。
-　　從容而不後事，急遽而不失容，脫略而不疏忽，簡靜而不涼薄，真率而不鄙俚，溫
-潤而不脂韋，光明而不淺浮，沉靜而不陰險，嚴毅而不苛刻，周匝而不煩碎，權變而不
-譎詐，精明而不猜察，亦可以為成人矣。
-　　厚德之士能掩人過，盛德之士不令人有過。不令人有過者，體其不得已之心，知其
-必至之情，而預遂之者也。
-　　烈士死志，守士死職，任士死怨，忿士死鬥，貪士死財，躁士死言。
-　　知其不可為而遂安之者，達人智士之見也；知其不可為而猶極力以圖之者，忠臣孝
-子之心也。
-　　無識之士有三恥：恥貧，恥賤，恥老。或曰：「君子獨無恥與？」曰：「有恥。親
-在而貧恥，用賢之世而賤恥，年老而德業無聞恥。」
-　　初開口便是煞尾語，初下手便是盡頭著，此人大無含蓄，大不濟事，學者戒之。
-　　一個俗念頭，一雙俗眼目，一口俗話說，任教聰明才辯，可惜錯活了一生。
-　　或問：「君子小人辯之最難？」曰：「君子而近小人之跡，小人而為君子之態，此
-誠難辯。若其大都，則如皂白不可掩也。君子容貌敦大老成，小人容貌浮薄瑣屑。君子
-平易，小人蹺蹊；君子誠實，小人奸詐；君子多讓，小人多爭；君子少文，小人多態。
-君子之心正直光明，小人之心邪曲微暖。君子之言雅淡質直，惟以達意；小人之言鮮濃
-柔澤，務於可人。君子與人親而不昵，宜諒而不養其過；小人與人狎而致情，諛悅而多
-濟其非。君子處事可以盟天質日，雖骨肉而不阿；小人處事低昂世態人情，雖昧理而不
-顧。君子臨義慷慨當前，惟視天下國家人物之利病，其禍福毀譽了不關心；小人防義則
-觀望顧忌，先慮爵祿身家妻子之便否，視社稷蒼生漫不屬己。君子事上，禮不敢不恭，
-難使任道；小人事上，身不知為我，側意隨人。君子御下，防其邪而體其必至之情；小
-人御下，遂吾欲而忘彼同然之願。君子自奉節儉恬雅，小人自奉汰侈彌文。君子親賢愛
-士，樂道人之善；小人嫉賢妒能，樂道人之非。如此類者，色色頓殊。孔子曰「患不知
-人」，吾以為終日相與，其類可分，雖善矜持，自有不可掩者在也。
-　　今之論人者，於辭受不論道義，只以辭為是，故辭寧矯廉，而避貪愛之嫌。於取與
-不論道義，只以與為是，故與寧傷惠，而避吝嗇之嫌。於怨怒不論道義，只以忍為是，
-故禮雖當校，而避無量之嫌。義當明分，人皆病其諛而以倨傲矜陵為節概；禮當持體，
-人皆病其倨而以過禮足恭為盛德。惟儉是取者，不辯禮有當豐；惟默是貴者，不論事有
-當言。此皆察理不精，貴賢知而忘其過者也。噫！與不及者誠有間矣，其賊道均也。
-　　狃淺識狹聞，執偏見曲說，守陋規格套，斯人也若為鄉里常人，不足輕重，若居高
-位有令名，其壞世教不細。
-　　以粗疏心看古人親切之語，以煩躁心看古人靜深之語，以浮泛心看古人玄細之語，
-以淺狹心看古人博洽之語，便加品隲，真孟浪人也。
-　　文姜與弒桓公，武后滅唐子孫，更其國廟，此二婦者，皆國賊也，而祔葬於墓，祔
-祭於廟，禮法安在？此千古未反一大案也。或曰：「子無廢母之義。」噫！是言也，閭
-閻市井兒女之識也。以禮言，三綱之重等於天地，天下共之。子之身，祖廟承繼之身，
-非人子所得而有也。母之罪，宗廟君父之罪，非人子所得而庇也。文姜、武后，莊公、
-中宗安得而私之？以情言，弒吾身者與我同丘陵，易吾姓者與我同血食；祖父之心悅乎
-？怒乎？對子而言，則母尊；對祖父而言，則吾母臣妾也。以血屬而言，祖父我同姓，
-而母異姓也。子為母忘身可也，不敢讐；雖殺我可也，不敢讐。宗廟也，父也，我得而
-專之乎？。專祖父之廟以濟其私，不孝；重生我之恩，而忘祖父之讐，亦不孝；不體祖
-父之心，強所讐而與之共土同牢，亦不孝。二婦之罪當誅，吾為人子不忍行，亦不敢行
-也。有為國討賊者，吾不當聞，亦不敢罪也。不誅不討，為吾母者逋戮之元凶也。葬於
-他所，食於別宮，稱后夫人而不係於夫，終身哀悼，以傷吾之不幸而已。莊公、中宗，
-皆昏庸之主，吾無責矣。吾恨當時大臣陷君於大過而不顧也。或曰：「葬我小君文姜。
-夫子既許之矣，子何罪焉？」曰：「此胡氏失仲尼之意也。仲尼蓋傷魯君臣之昧禮，而
-特著其事以示譏爾。曰『我』言不當我而我之也，曰『小君』言不成小君而小君之也，
-與歷世夫人同書而不異其詞，仲尼之心豈無別白至此哉？不然，姜氏會齊侯，每行必書
-其惡，惡之深如此，而肯許其為『我小君』耶？」或曰：「子狃於母重而不敢不尊，授
-狃於君命而不敢不從，是亦權變之禮耳。」余曰：「否！否！宋桓夫人出耳，襄公立而
-不敢迎其母，聖人不罪襄公之薄恩而美夫人之守禮。況二婦之罪瀰漫宇宙萬倍於出者，
-臣子忘祖父之重，而尊一罪大惡極之母，以伸其私，天理民彝滅矣。道之不明一至是哉
-！余安得而忘言？」
-　　平生無一人稱譽，其人可知矣。平生無一人詆毀，其人亦可知矣。大如天，聖如孔
-子，未嘗盡可人意。是人也，無分君子小人皆感激之，是在天與聖人上，賢耶？不肖耶
-？我不可知矣。
-
-　　尋行數墨是頭巾見識，慎步矜趨是釵裙見識，大刀闊斧是丈夫見識，能方能圓、能
-大能小是聖人見識。
-　　春秋人計可否，畏禮義，惜體面。戰國人只是計利害，機械變詐，苟謀成計得，顧
-甚體面？說甚羞恥？
-　　太和中發出，金石可穿，何況民物有不孚格者乎？
-　　自古聖賢孜孜汲汲，惕勵憂勤，只是以濟世安民為己任，以檢身約己為先圖。自有
-知以至於蓋棺，尚有未畢之性分，不了之心緣，不惟孔、孟，雖佛、老、墨翟、申、韓
-皆有一種斃而後已念頭，是以生不為世間贅疣之物，死不為幽冥浮蕩之鬼。
-　　乃西晉王衍輩一出，以身為懶散之物，百不經心，放蕩於禮法之外，一無所忌，以
-浮談玄語為得聖之清，以滅理廢教為得道之本，以浪遊於山水之間為高人，以銜杯於糟
-曲之林為達士，人廢職業，家尚虛無，不止亡晉，又開天下後世登臨題詠之禍；長惰慢
-放肆之風，以至於今。追原亂本，益開釁於莊、列、而基惡於巢、由。有世道之責者，
-宜所戒矣。
-　　微子抱祭器歸周，為宗祀也。有宋之封，但使先王血食，則數十世之神靈有托，我
-可也，箕子可也，但屬子姓者一人亦可也，若曰事異姓以苟富貴而避之嫌，則淺之乎其
-為識也。惟是箕子可為夷齊，而《洪範》之陳、朝鮮之封，是亦不可以已乎？曰：「繫
-累之臣，釋囚訪道，待以不臣之禮，而使作賓，固聖人之所不忍負也。此亦達節之一事
-，不可為後世宗臣借口。」
-　　無心者公，無我者明。當局之君子不如旁觀之眾人者，有心有我之故也。
-　　君子豪傑戰兢惕勵，當大事勇往直前；小人豪傑放縱恣睢，拼一命橫行直撞。
-　　老子猶龍不是尊美之辭，蓋變化莫測，淵深不露之謂也。
-　　樂要知內外。聖賢之樂在心，故順逆窮通隨處皆泰；眾人之樂在物，故山溪花鳥遇
-境才生。
-　　可恨讀底是古人書，作底是俗人事。
-　　言語以不肖而多，若皆上智人，更不須一語。
-　　能用天下而不能用其身，君子惜之。善用其身者，善用天下者也。
-　　粗豪人也自正氣，但一向恁底便不可與人道。
-　　學者不能徙義改過，非是不知，只是積慵久慣。自家由不得自家，便沒一些指望。
-若真正格致了，便由不得自家，欲罷不能矣。
-　　孔、孟以前人物只是見大，見大便不拘孿小家勢，人尋行數墨，使殺了只成就個狷
-者。
-　　終日不歇口，無一句可議之言，高於緘默者百倍矣。
-　　越是聰明人越教誨不得。
-　　強恕，須是有這恕心才好。勉強推去，若視他人饑寒痛楚漠然通不動心，是恕念已
-無，更強個甚？還須是養個恕出來，才好與他說強。
-　　盜莫大於瞞心昧己，而竊劫次之。
-　　明道受用處，陰得之佛、老，康節受用處，陰得之莊、列，然作用自是吾儒。蓋能
-奴僕四氏，而不為其所用者。此語人不敢道，深於佛、老之莊、列者自然默識得。
-　　鄉原是似不是偽，孟子也只定他個似字。今人卻把似字作偽字看，不惟欠確，且末
-減了他罪。
-　　不當事，不知自家不濟。才隨遇長，識以窮精。坐談先生只好說理耳。
-　　沉溺了，如神附，如鬼迷，全由不得自家，不怕你明見真知。眼見得深淵陡澗，心
-安意肯底直前撞去，到此翻然跳出，無分毫黏帶，非天下第一大勇不能。學者須要知此
-。
-　　巢父、許由，世間要此等人作甚？荷蕢晨門，長沮架溺知世道已不可為，自有無道
-則隱一種道理。巢、由一派有許多人皆污濁堯、舜，噦吐臯、夔，自謂曠古高人，而不
-知不仕無義潔一身以病天下，吾道之罪人也。且世無巢、許不害其為唐虞，無堯、舜、
-臯、夔，巢、許也沒安頓處，誰成就你個高人？
-　　而今士大夫聚首時，只問我輩奔奔忙忙、熬熬煎煎，是為天下國家，欲濟世安民乎
-？是為身家妻子，欲位高金多乎？世之治亂，民之死生，國之安危，只於這兩個念頭定
-了。嗟夫！
-　　吾輩日多而世益苦，吾輩日貴而民日窮，世何貴於有吾輩哉？
-
-　　只氣盛而色浮，便見所得底淺。邃養之人安詳沉靜，豈無慷慨激切，發強剛毅時，
-畢竟不輕恁的。
-　　以激為直，以淺為誠，皆賢者之過。
-　　評品古人，必須胸中有段道理，如權平衡直，然後能稱輕重。若執偏見曲說，昧於
-時不知其勢，責其病不察其心，未嘗身處其地，未嘗心籌其事，而日某非也，某過也，
-是瞽指星、聾議樂，大可笑也。君子恥之。
-　　小勇噭燥，巧勇色笑，大勇沉毅，至勇無氣。
-　　為善去惡是，趨吉避凶惑矣。陰陽異端之說也，祀非類之
-　　鬼，禳白致之災，祈難得之福，泥無損益之時，日宗趨避之邪術。悲夫！愚民之抵
-死而不悟也。即悟之者，亦狃天下皆然，而不敢異。至有名公大人，尤極信尚。嗚呼！
-反經以正邪慝，將誰望哉？
-
-　　夫物愚者真，智者偽；愚者完，智者喪。無論人，即鳥之返哺，雉之耿介鳴鳩，均
-平專一，睢鳩和而不流，雁之貞靜自守，騶虞之仁，獬豸之隸正嫉邪，何嘗有矯偽哉？
-人亦然，人之全其天者，皆非智巧者也。才智巧，則其天漓矣；漓則其天可奪，惟愚者
-之天不可奪。故求道真，當求之愚；求不二心之臣以任天下事，亦當求之愚。夫愚者何
-嘗不智哉？愚者之智，純正專一之智也。
-　　面色不浮，眼光不亂，便知胸中靜定非久養不能。《禮》曰：「儼若思，安定辭，
-善形容，有道氣象矣。」
-　　於天理汲汲者，於人欲必淡；於私事耽耽者，於公務必疏；於虛文燁燁者，於本實
-必薄。
-　　聖賢把持得義字最乾淨，無分毫利字干擾。眾人才有義舉，便不免有個利字來擾亂
-。利字不得，便做義字不成。
-　　道自孔、孟以後，無人識三代以上面目。漢儒無見於精，宋儒無見於大。
-　　有憂世之實心，泫然欲淚，有濟世之實才，施處輒宜。斯人也，我願為曳履執鞭。
-若聚談紙上，微言不關國家治忽；爭走塵中，眾轍不知黎庶死生，即品格有清濁，均於
-宇宙無補也。
-　　安重深沉是第一美質。定天下之大難者，此人也。辯天下之大事者，此人也。剛明
-果斷次之。其他浮薄好任，翹能自喜，皆行不逮者也。即見諸行事而施為無術，反以僨
-事，此等只可居談論之科耳。
-　　任有七難：繁任要提綱摯領，宜綜核之才。重任要審謀獨斷，宜鎮靜之才。急任要
-觀變會通，宜明敏之才。密任要藏機相可，宜周慎之才。獨任要擔當執持，宜剛毅之才
-。兼任要任賢取善，宜博大之才。疑任要內明外朗，宜駕馭之才。天之生人，各有偏長
-。國家之用人，備用群長。然而投之所向輒不濟事者，所用非所長，所長非所用也。
-　　操進退用舍之權者，要知大體。若專以小知觀人，則卓犖奇偉之士都在所遺。何者
-？敦大節者不為細謹，有遠略者或無小才，肩巨任者或無捷識；而聰明材辯、敏給圓通
-之士，節文習熟、聞見廣洽之人，類不能裨緩急之用。嗟夫！難言之矣。
-　　士之遇不遇，顧上之所愛憎也。
-　　居官念頭有三用：念念用之君民，則為吉士。念念用之套數，則為俗吏。念念用之
-身家，則為賊臣。
-　　小廉曲謹之土，循涂守轍之人，當太平時，使治一方、理一事，盡能本職。若定難
-決疑，應卒蹈險，寧用破綻人，不用尋常人。雖豪悍之魁，任俠之雄，駕御有方，更足
-以建奇功，成大務。噫！難與曲局者道。
-　　聖人悲時憫俗，賢人痛世疾俗，眾人混世逐俗，小人敗常亂俗。嗚呼！小人壞之，
-眾人從之，雖憫雖疾，、競無益矣。故明王在上，則移風易俗。
-　　觀人只諒其心，心苟無他跡，皆可原。如下官之供應未備，禮節偶疏，此豈有意簡
-傲乎？簡傲上官以取罪，甚愚者不為也，何怒之有？供應豐溢，禮節卑屈，此豈敬戎乎
-？將以說我為進取之地也，何感之有？
-　　今之國語鄉評，皆繩人以細行，細行一虧，若不可容於清議，至於大節都脫略廢墜
-，渾不說起。道之不明，亦至此乎？
-　　可歎也已！
-　　凡見識，出於道理者第一，出於氣質者第二，出於世俗者第三，出於自私者為下。
-道理見識，可建天地，可質鬼神，可推四海，可達萬世，正大公平，光明易簡，此堯、
-舜、禹、湯文、武、周、孔相與授受者是也。氣質見識，仁者謂之仁，智者謂之智。剛
-氣多者為賢智，為高明；柔氣多者為沉潛，為謙忍。夷、惠、伊尹、老、莊、申、韓各
-發明其質之所近是已。
-　　世俗見識，狃於傳習之舊，不辯是非；安於耳目之常，遂為依據。教之則藐不相入
-，攻之則牢不可破；淺庸卑陋而不可談王道。自秦、漢、唐、宋以彩，創業中興，往往
-多坐此病。故禮樂文章，因陋就簡，紀綱法度，緣勢因時。二帝三王旨趣〔楞去木加氵
-〕不曾試嘗，邈不入夢寐，可為流涕者，此輩也已。私見識，利害榮辱橫於胸次，是非
-可否迷其本真，援引根據亦足成一家之說，附會擴充盡可眩眾人之聽。秦皇本游觀也，
-而托言巡狩四岳；漢武本窮兵也，而托言張皇六師。道自多歧，事有兩端，善辯者不能
-使服，不知者皆為所惑。是人也設使旁觀，未嘗不明，惟是當局，便不除己，其流之弊
-，至於禍國家亂世道而不顧，豈不大可憂大可懼哉？故聖賢蹈險履危，把自家搭在中間
-；定議決謀，把自家除在外面，即見識短長不敢自必，不害其大公無我之心也。
-　　凡為外所勝者，皆內不足也；為邪所奪者，皆正不足也。
-　　二者如持衡然，這邊低一分，那邊即昂一分，未有毫髮相下者也。
-　　善為名者，借口以掩真心；不善為名者，無心而受惡名。
-　　心跡之間，不可以不辯也。此觀人者之所忽也。
-　　自中庸之道不明，而人之相病無終已。狷介之人病和易者為熟軟，和易之人病狷介
-者為乖戾；率真之人病慎密者為深險，慎密之人病率真者為粗疏；精明之人病渾厚者為
-含糊，渾厚之人病精明者為苛刻。使質於孔子，吾知其必有公案矣；孔子者，合千聖於
-一身，萃萬善於一心，隨事而時出之，因人而通變之，圓神不滯，化裁無端。其所自為
-，不可以教人者也。何也？難以言傳也。見人之為，不以備責也。伺也？難以速化也。
-　　觀操存在利害時，觀精力在饑疲時，觀度量在喜怒時，觀存養在紛華時，觀鎮定在
-震驚時。
-　　人言之不實者十九，聽言而易信者十九，聽言而易傳者十九。以易信之心，聽不實
-之言，播喜傳之口，何由何跖？而流傳海內，紀載史冊，冤者冤，幸者幸。嗚呼！難言
-之矣。
-　　孔門心傳，惟有顏子一人，曾子便屬第二等。
-　　名望甚隆，非大臣之福也；如素行無愆，人言不足仇也。
-　　盡聰明底是盡昏愚，盡木訥底是盡智慧。
-　　透悟天地萬物之情，然後可與言性。
-　　僧道、宦官、乞丐，未有不許其為聖賢者。我儒衣儒冠且不類儒，彼顧得以嗤之，
-奈何以為異類也，而鄙夷之乎？
-　　盈山寶玉，滿海珠璣，任人恣意採取，並無禁厲榷奪，而束手畏足，甘守艱難，愚
-亦爾此乎？
-
-　　告子許大力量，無論可否，只一個不動心，豈無骨氣人所能？可惜只是沒學問，所
-謂其至爾力也。
-　　千古一條大路，堯、舜、禹、湯、文、武、孔、孟由之。
-　　此是官路古路，乞人盜跖都有分，都許由，人自不由耳。或曰：「須是跟著數聖人
-走。」曰：「各人走各人路。數聖人者，走底是誰底路？肯實在走，腳蹤兒自是暗合。」
-　　功士後名，名士後功。三代而下，其功名之士絕少。聖人以道德為功名者也，賢人
-以功名為功名者也，眾人以富貴為功名者也。
-　　建天下之大事功者，全要眼界大。眼界大則識見自別。
-　　談治道，數千年來只有個唐虞禹湯文武，作用自是不侔。
-　　衰周而後，直到於今，高之者為小康，卑之者為庸陋。唐虞時光景，百姓夢也夢不
-著。創業垂統之君臣，必有二帝五臣之學術而後可。若將後世眼界立一代規模，如何是
-好？
-　　一切人為惡，猶可言也，惟讀書人不可為惡。讀書人為惡，更無教化之人矣。一切
-人犯法猶可言也，做官人不可犯法。做官人犯法，更無禁治之人矣。
-　　自有書契以來，穿鑿附會，作聰明以亂真者，不可勝紀。
-　　無知者借信而好古之名，以誤天下後世蒼生。不有洞見天地萬物之性情者出而正之
-，迷誤何有極哉？虛心君子，寧闕疑可也。
-　　君子當事，則小人皆為君子，至此不為君子，真小人也；小人當事，則中人皆為小
-人，至此不為小人，真君子也。
-　　小人亦有好事，惡其人則並疵共事；君子亦有過差，好其人則並飾其非，皆偏也。
-　　無欲底有，無私底難。二氏能無情慾，而不能無私。無私無欲，正三教之所分也。
-此中最要留心理會，非狃於聞見、章句之所能悟也。
-　　道理中作人，天下古今都是一樣；氣質中作人，便自千狀萬態。
-　　論造道之等級，士不能越賢而聖，越聖而天。論為學之志向，不分士、聖、賢，便
-要希天。
-　　額淵透徹，曾子敦樸，子思縝細，孟子豪爽。
-　　多學而識，原是中人以下一種學問。故夫子自言多聞，擇其善而從之，多見而識之
-。教子張多聞闕疑，多見闕殆。教人博學於文。教顏子博之以文。但不到一貫地位，終
-不成究竟。
-　　故頓漸兩門，各緣資性。今人以一貫為入門上等天資，自是了悟，非所望於中人，
-其誤後學不細。
-　　無理之言，不能惑世誣人。只是他聰明才辯，附會成一段話說，甚有滋味，無知之
-人欣然從之，亂道之罪不細。世間此種話十居其六七，既博且久，非知道之君子，孰能
-辯之？
-　　間中都不容發，此智者之所乘，而思者之所昧也。
-　　明道在朱、陸之間。
-　　明道不落塵埃，多了看釋、老；伊川終是拘泥，少了看莊、列。
-　　迷迷易悟，明迷難醒。明迷愚，迷明智。迷人之迷，一明則跳脫；明人之迷，明知
-而陷溺。明人之明，不保其身；迷人之明，默操其柄。明明可與共太平，明迷可與共患
-憂。
-　　巢、由披卷佛、老、莊、列，只是認得我字真，將天地萬物只是成就我。堯、舜、
-禹、湯、文、武、孔、孟，只是認得人字真，將此身心性命只是為天下國家。
-　　聞毀不可遽信，要看毀人者與毀於人者之人品。毀人者賢，則所毀者損；毀人者不
-肖，則所毀者重。考察之年，聞一毀言如獲珙璧，不暇計所從來，枉人多矣。
-　　是眾人，即當取其偏長；是賢者，則當望以中道。
-
-　　士君子高談闊論，語細探玄，皆非實際，緊要在適用濟事。
-　　故今之稱拙鈍者曰不中用，稱昏庸者曰不濟事。此雖諺語口頭，余嘗愧之同志者，
-盍亦是務乎？
-　　秀雅溫文，正容謹節，清廟明堂所宜。若蹈湯火，衽金革，食牛吞象之氣，填海移
-山之志，死孝死忠，千捶百折，未可專望之斯人。
-　　不做討便宜底學問，便是真儒。
-　　千萬人吾往，赫殺老子。老子是保身學問。
-　　親疏生愛憎，愛憎生毀譽，毀譽生禍福。此智者之所耽耽注意，而端人正士之所脫
-略而不顧者也。此個題目考人品者不可不知。
-　　精神只顧得一邊，任你聰明智巧，有所密必有所疏。惟平心率物，無毫髮私意者，
-當疏當密，一准予道而人自相忘。
-　　讀書要看三代以上人物是甚學識，甚氣度，甚作用。漢之粗淺，便著世俗；宋之侷
-促，使落迂腐，如何見三代以前景象？
-　　真是真非，惟是非者知之，旁觀者不免信跡而誣其心，況門外之人，況千里之外，
-百年之後乎？其不虞之譽，求全之毀，皆愛憎也。其愛僧者，皆恩怨也。故公史易，信
-史難。
-　　或問：「某公如何？」曰：「可謂豪傑英雄，不可謂端人正士。」
-　　問：「某公如何？」曰：「可謂端人正士，不可謂達節通儒。」達節通儒，乃端人
-正士中豪傑英雄者也。
-　　名實如形影。無實之名，造物所忌，而矯偽者貪之，暗修者避之。
-
-
-　　「遺葛牛羊，亳眾往耕」，似無此事。聖人雖委曲教人，未嘗不以誠心直道交鄰國
-。桀在則葛非湯之屬國也，奚問其不招，即知其無犧牲矣。亳之牛羊，豈可以常遺葛伯
-耶？葛豈真無牛羊耶？有亳之眾，自耕不暇，而又使為葛耕，無乃後世市恩好名、沾沾
-煦煦者之所為乎？不然，葛雖小，亦先王之建國也，寧至無牛羊粢盛哉？即可以供而不
-祭，當勸諭之矣。或告之天子，以明正其罪矣。何至遺牛羊往為之耕哉？可以不告天子
-而滅其國，顧可以不教之，自供祭事而代之勞且費乎？不然，是多彼之罪，而我得以藉
-口也。是伯者，假仁義濟貪欲之所為也。孟子此言，其亦劉太王好貨好色之類與？
-　　漢以來儒者一件大病痛，只是是古非今。今人見識作為不如古人，此其大都。至於
-風會所宜，勢極所變，禮義所起，自有今人精於古人處。二帝者，夏之古也。夏者，殷
-之古也。殷者，周之古也。其實制度文為三代不相祖述，而達者皆以為是。
-　　宋儒泥古，更不考古昔真偽，今世是非。只如祭祀一節，古人席地不便於飲食，故
-尚簠簋籩豆，其器皆高。今祭古人用之，從其時也。子孫祭祖考，只宜用祖考常用所宜
-，而簠簋籩豆是設可乎？古者墓而不墳，不可識也，故不墓祭。後世父母體魄所藏，巍
-然丘壠，今欲舍人子所睹記者而敬數寸之木可乎？則墓祭似不可已也。諸如此類甚多，
-皆古人所笑者也。使古人生於今，舉動必不如此。
-　　儒者惟有建業立功是難事。自古儒者成名多是講學著述，人未嘗盡試所言，恐試後
-縱不邪氣，其實成個事功不狼狽以敗者定不多人。
-　　而今講學不為明道，只為角勝，字面詞語間拿住一點半點錯，便要連篇累牘辨個足
-。這是甚麼心腸？講甚學問？
-　　得人不敢不然之情易，得人自然之情難。秦、漢而後皆得人不敢不然之情者也。
-　　眾人但於義中尋個利字，再沒於利中尋個義字。
-　　性分、名分不是兩項，盡性分底不傲名分。召之見，不肯見之；召之役，往執役之
-事。今之講學者，陵犯名分，自謂高潔。孔子乘田委吏何嘗不折腰屈膝於大夫之庭乎？
-噫！道不明久矣。
-　　中高第，做美官，欲得願足，這不是了卻一生事。只是作人不端，或無過可稱，而
-分毫無補於世，則高第美官反以益吾之▉者也。而世顧以此自多，予不知其何心。
-　　隱逸之士只優於貪榮戀勢人，畢竟在行道濟時者之下。君子重之，所以羞富貴利達
-之流也。若高自標榜，塵視朝紳而自謂清流，傲然獨得，則聖世之罪人也。夫不仕無義
-，宇宙內皆儒者事，奈之何潔身娛己棄天下理亂於不聞，而又非笑堯舜稷契之儔哉？使
-天下而皆我也，我且不得有其身，況有此樂乎？予無用世具，行將老桑麻間，故敢云。
-　　古之論賢不肖者，不曰幽明則曰枉直，則知光明洞達者為賢，隱伏深險者為不肖。
-真率爽快者為賢，斡旋轉折者為不肖。故賢者如白日青天，一見即知其心事。不肖者如
-深谷晦夜，窮年莫測其淺深。賢者如疾矢急弦，更無一些回顧。枉者如曲▉盤繩，不知
-多少機關。故虞廷曰「黜陟幽明」，孔子曰「舉直錯枉」。觀人者之用明，捨是無所取
-矣。
-　　品第大臣率有六等，上焉者寬厚深沉，遠識兼照，造福於無形，消禍於未然，無智
-名勇功，而天下陰受其賜。其次剛明任事，慷慨敢言，愛國如家，憂時如病，而不免太
-露鋒芒，得失相半。其次恬靜逐時，動循故事，利不能興，害不能除。其次持祿養望，
-保身固寵，國家安危，略不介懷。其次貪功啟▉，怙寵張威，愎是任情，擾亂國政。其
-次奸險凶淫，煽虐肆毒，賊傷善類，蠱惑君心，斷國家命脈，失四海人望。
-　　極寬過厚足恭曲謹之人，亂世可以保身，治世可以敦俗。若草昧經綸，倉卒籌畫，
-荷天下之重，襄四海之難，永百世之休，旋乾轉坤，安民阜物，自有一等英雄豪傑，渠
-輩當束之高閣。
-　　棄此身操執之常而以圓軟沽俗譽，忘國家遠大之患而以寬厚巿私恩，巧趨人所未見
-之利，善避人所未識之害，立身於百禍不侵之地，事成而我有功，事敗而我無咎，此智
-巧士也，國家奚賴焉！
-　　委罪掠功，此小人事。掩罪誇功，此眾人事。讓美歸功，此君子事。分怨共過，此
-盛德事。
-　　士君子立身難，是不苟；識見難，是不俗。
-　　十分識見人與九分者說，便不能了悟，況愚智相去不翅倍蓗。而一不當意輒怒而棄
-之，則皋、夔、稷、契、伊、傅、周、召棄人多矣。所貴乎有識而居人上者，正以其能
-就無識之人，因其微長而善用之也。
-　　大凡與人情不近，即行能卓越，道之賊也。聖人之道，人情而已。
-　　以林皋安樂懶散心做官，未有不荒怠者。以在家治生營產心做官，未有不貪鄙者。
-　　守先王之大防，不為苟且人開蹊竇，此儒者之操尚也。敷先王之道而布之宇宙，此
-儒者之事功也。
-　　士君子須有三代以前一副見識，然後可以進退今，權衡道法，可以成濟世之業，可
-以建不世之功。
-　　矯激之人加卑庸一等，其害道均也。吳季札、陳仲子、時苗、郭巨之類是已。君子
-矯世俗只到恰好處便止，矯枉只是求直，若過直則彼左枉而我右枉也。故聖賢之如衡，
-處事與事低昂，分毫不得高下，使天下曉然知大中至正之所在，然後為不詭於道。
-　　曲如煉鐵鉤，直似脫弓弦，不覓封侯貴，何為死道邊。
-　　雅士無奇名，幽人絕隱慝。
-　　題湯陰廟末聯：千古形銷骨已朽，丹心猶自血鮮鮮。
-　　寄所知云：道高毀自來，名重身難隱。
-
-
-
-
-治道
-
-
-　　廟堂之上，以養正氣為先；海字之內，以養元氣為本。能使賢人君子無鬱心之言，
-則正氣培矣；能使群黎百姓無腹誹之語，則元氣固矣。此萬世帝王保天下之要道也。
-　　六合之內，有一事一物相凌奪假借，而不各居其正位，不成清世界；有匹夫匹婦冤
-抑憤懑，而不得其分願，不成平世界。
-
-　　天下萬事萬物皆要求個實用。實用者，與吾身心關損益者也。凡一切不急之物，供
-耳目之玩好，皆非實用也，愚者甚至喪其實用以求無用。悲夫！是故明君治天下，必先
-盡革靡文，而嚴誅淫巧。
-　　當事者若執一簿書，尋故事，循弊規，只用積年書手也得。
-　　興利無太急，要左視右盼；革弊無太驟，要長慮卻顧。
-　　苟可以柔道理，不必悻直也；苟可以無為理，不必多事也。
-　　經濟之士，一居言官便一建白，此是上等人，去緘默保位者遠，只是治不古。若非
-前人議論不精，乃今人推行不力。試稽舊讀，今日我所言，昔人曾道否？若只一篇文章
-了事，雖牘如山，只為紙筆作孽障，架閣上添鼠食耳。夫土君子建白，豈欲文章奕世哉
-？冀諫行而民受其福也。今詔令刊布遏中外，而民間疾苦自若，當求其故。故在實政不
-行而虛文搪塞耳。綜核不力，罪將誰歸？
-　　為政之道，以不擾為安，以不取為與，以不害為利，以行所無事為興廢起敝。
-　　從政自有個大體。大體既立，則小節雖抵〔牜吾〕，當別作張弛，以輔吾大體之所
-未備，不可便改弦易轍。譬如待民貴有恩，此大體也，即有頑暴不化者，重刑之，而待
-民之大體不變。待士有禮，此大體也，即有淫肆不檢者，嚴治之，而待士之大嚴不變。
-彼始之寬也，既養士民之惡，終之猛也，概及士民之善，非政也，不立大體故也。
-　　為政先以扶持世教為主。在上者一舉措間，而世教之隆污、風俗之美惡繫焉。若不
-管大體何如，而執一時之偏見，雖一事未為不得，而風化所傷甚大，是謂亂常之政。先
-王慎之。
-　　人情之所易忽，莫如漸；天下之大可畏，莫如漸。漸之始也，雖君子不以為意。有
-謂其當防者，雖君子亦以為迂。不知其極重不反之勢，天地聖人亦無如之奈何，其所由
-來者漸也。
-　　周、鄭交質，若出於驟然，天子雖孱懦甚，亦必有恚心，諸侯雖豪橫極，豈敢生此
-念？迨積漸所成，其流不覺，至是故步視千里為遠，前步視後步為近。千里者，步步之
-積也。是以驟者舉世所驚，漸者聖人獨懼。明以燭之，堅以守之，毫髮不以假借，此慎
-漸之道也。
-　　君子之於風俗也，守先王之禮而儉約是崇，不妄開事端以貽可長之漸。是故漆器不
-至金玉，而刻鏤之不止；黼黻不至庶人，錦繡被牆屋不止。民貧盜起不顧也，嚴刑峻法
-莫禁也。是故君子謹其事端，不開人情竇而恣小人無厭之欲。
-　　著令甲者，凡以示天下萬世，最不可草率，草率則行時必有滯礙；最不可含糊，含
-糊則行者得以舞文；最不可疏漏，疏漏則出於吾令之外者無以憑藉，而行者得以專輒。
-　　築基樹臬者，千年之計也；改弦易轍者，百年之計也；興廢補敝者，十年之計也；
-堊白黝青者，一時之計也。因仍苟且，勢必積衰。助波覆傾，反以裕蠱。先天下之憂者
-，可以審矣。
-　　氣運怕盈，故天下之勢不可使之盈。既盈之勢，便當使之損。是故不測之禍，一朝
-之忿，非目前之積也，成於勢盈。勢盈者，不可不自損。捧盈卮者，徐行不如少挹。
-　　微者正之，甚者從之。從微則甚，正甚愈甚，天地萬物、氣化人事，莫不皆然。是
-故正微從甚，皆所以禁之也。此二帝三王之所以治也。
-　　聖人治天下，常今天下之人精神奮發，意念斂束。奮發則萬民無棄業，而兵食足，
-義氣充，平居可以勤國，有事可以捐軀。斂束則萬民無邪行，而身家重名檢修。世治則
-禮法易行，國衰則奸盜不起。後世之民怠惰放肆甚矣。臣民而怠惰放肆，明主之憂也。
-
-　　能使天下之人者，惟神、惟德、惟惠、惟威。神則無言無為，而妙應如響。德則共
-尊共親，而歸附自同。惠則民利其利，威則民畏其法。非是則動眾無術矣。
-　　只有不容己之真心，自有不可易之良法。其處之未必當者，必其思之不精者也。其
-思之不精者，必其心之不切者也。故有純王之心，方有純王之政。
-　　《關睢》是個和平之心，《麟趾》是個仁厚之德。只將和平仁厚念頭行政，則仁民
-愛物，天下各得其所。不然，周官法度以虛文行之，豈但無益，且以病民。
-　　民胞物與子厚，胸中合下有這段著痛著癢，心方說出此等語。不然，只是做戲的一
-殷，雖是學哭學笑，有甚悲喜？故天下事只是要心真。二帝三王親親、仁民、愛物，不
-是向人學得來，亦不是見得道理當如此。曰親、曰仁、曰愛，看是何等心腸，只是這點
-念頭懇切殷濃，至誠惻怛，譬之慈母愛子，由不得自家。所以有許多生息愛養之政。悲
-夫！可為痛哭也己。
-
-　　為人上者，只是使所治之民個個要聊生，人人要安分，物物要得所，事事要協宜。
-這是本然職分。遂了這個心，才得暢然一霎歡，安然一覺睡。稍有一民一物一事不妥貼
-，此心如何放得下？何者？為一郡邑長，一郡邑皆待命於我者也；為一國君，一國皆待
-命於我者也；為天下主，天下皆待命於我者也。
-　　無以答其望，何以稱此職？何以居此位？夙夜汲汲圖，惟之不暇，而暇於安富尊榮
-之奉，身家妻子之謀，一不遂心，而淫怒是逞耶？夫付之以生民之寄，寧為盈一已之欲
-哉？試一反思，便當愧汗。
-　　王法上承天道，下顧人情，要個大中至正，不容有一毫偏重偏輕之制。行法者，要
-個大公無我，不容有一毫故出故入之心，則是天也。君臣以天行法，而後下民以天相安。
-　　人情天下古今所同，聖人懼其肆，特為之立中以防之，故民易從。有亂道者從而矯
-之，為天下古今所難為之事，以為名高，無識者相與駭異之，祟獎之，以率天下，不知
-凡於人情不近者，皆道之賊也。故立法不可太激，制禮不可太嚴，責人不可太盡，然後
-可以同歸於道。不然，是驅之使畔也。
-　　振玩興廢，用重典；懲奸止亂，用重典；齊眾摧強，用重典。
-　　民情有五，皆生於便。見利則趨，見色則愛，見飲食則貪，見安逸則就，見愚弱則
-欺，皆便於己故也。惟便，則術不期工而自工；惟便，則奸不期多而自多。君子固知其
-難禁也，而德以柔之，教以偷之，禮以禁之，法以懲之，終日與便為敵，而競不能衰止
-。禁其所便，與強其所不便，其難一也。故聖人治民如治水，不能使不就下，能分之使
-不泛溢而已。堤之使不決，雖堯、舜不能。
-　　堯、舜無不弊之法，而恃有不弊之身，用救弊之人以善天下之治，如此而已。今也
-不然，法有九利，不能必其無一害；法有始利，不能必其不終弊。嫉才妒能之人，惰身
-利口之士，執其一害終弊者訕笑之。謀國不切而慮事不深者，從而附和之。不曰天下本
-無事，安常襲故何妨，則曰時勢本難為，好動喜事何益。至大壞極弊，瓦解土崩，而後
-付之天命焉。嗚呼！
-　　國家養士何為哉？士君子委質何為哉？儒者以宇宙為分內何為哉？
-　　官多設而數易，事多議而屢更，生民之殃未知所極。古人慎擇人而久任，慎立政而
-久行。一年如是，百千年亦如是。不易代不改政，不弊事不更法。故百官法守一，不敢
-作聰明以擅更張；百姓耳目一，不至亂聽聞以乖政令。日漸月漬，莫不遵上之紀綱法度
-以淑其身，習上之政教號令以成其俗。譬之寒暑不易，而興作者歲歲有持循焉；道路不
-易，而往來者年年知遠近焉。何其定靜！何其經常！何其相安！何其易行！何其省勞費！
-　　或曰：「法久而弊奈何？」曰：「尋立法之本意，而救偏補弊耳。善醫者，去其疾
-不易五臟，攻本髒不及四髒；善補者，縫其破不剪餘完，浣其垢不改故制。
-　　聖明之世，情禮法三者不相忤也。末世，情勝則奪法，法勝則奪禮。
-　　湯、武之誥誓，堯、舜之所悲，桀、紂之所笑也。是豈不示信於民，而白已之心乎
-？堯、舜曰：何待嘵嘵爾！示民民不忍不從。桀、紂曰：何待嘵嘵爾！示民民不敢不從
-。觀《書》之誥誓，而知王道之衰矣。世道至湯、武，其勢必桀、紂，又其勢必至有秦
-、項、莽、操也。是故維持世道者，不可不慮其流。
-　　聖人能用天下，而後天下樂為之用。聖人以心用，天下以形用。心用者，無用者也
-。眾用之所恃，以為用者也。若與天下競智勇、角聰明，則窮矣。
-　　後世無人才，病本只是學政不修。而今把作萬分不急之務，才振舉這個題目，便笑
-倒人。官之無良，國家不受其福，蒼生且被其禍。不知當何如處？
-　　聖人感人心於患難處更驗。蓋聖人平日仁漸義摩，深思厚澤，入於人心者化矣。及
-臨難處倉卒之際，何暇思圖，拿出見成的念頭來，便足以捐軀赴義。非曰我以此成名也
-，我以此報君也。彼固亦不自知其何為，而迫切至此也。其次捐軀而志在圖報。其次易
-感而終難。其次厚賞以激其感。噫！至此而上下之相與薄矣，交孚之志解矣。嗟夫！先
-王何以得此於人哉？
-　　聖人在上，能使天下萬物各止其當然之所，而無陵奪假借之患，夫是之謂各安其分
-，而天地位焉；能使天地萬物各遂其同然之情，而無抑鬱倔強之態，夫是之謂各得其願
-，而萬物育焉。
-　　民情既溢，裁之為難。裁溢如割駢拇贅疣，人甚不堪。故裁之也欲令民堪，有漸而
-已矣。安靜而不震激，此裁溢之道也。
-　　故聖王在上，慎所以溢之者，不生民情。禮義以馴之，法制以防之，不使潛滋暴決
-，此慎溢之道也。二者帝王調劑民情之大機也，天下治亂恒必由之。
-　　創業之君，當海內屬目傾聽之時，為一切雷厲風行之法。
-　　故今行如流，民應如響。承平日久，法度疏闊，人心散而不收，惰而不振，頑而不
-爽。譬如熟睡之人，百呼若聾；欠倦之身，兩足如跛，惟是盜賊所追，水火所迫，或可
-猛醒而急奔。是以詔今廢格，政事頹靡，條上者紛紛，中傷者累累，而聽之者若罔聞知
-，徒多書發之勞，紙墨之費耳。即殺其尤者一人，以號召之，未知肅然改視易聽否。而
-迂腐之儒，猶曰宜崇長厚，勿為激切。嗟夫！養天下之禍，甚天下之弊者，必是人也。
-故物垢則浣，甚則改為；室傾則支，甚則改作。中興之君，綜核名實，整頓紀綱，當與
-創業等而後可。
-　　先王為政，全在人心上用工夫。其體人心，在我心上用工夫。何者？同然之故也。
-故先王體人於我，而民心得，天下治。
-　　天下之思，莫大於「苟可以」而止。養頹靡不復振之習，成亟重不可反之勢，皆「
-苟可以」三字為之也。是以聖人之治身也，勤勵不息；其治民也，鼓舞不倦。不以無事
-廢常規，不以無害忽小失。非多事，非好勞也，誠知夫天下之事，廑未然之憂者尚多；
-或然之悔懷，太過之慮者猶貽不及之；憂兢慎始之圖者，不免怠終之患故耳。
-　　天下之禍，成於怠忽者居其半，成於激迫者居其半。惟聖人能銷禍於未形，弭思於
-既著。夫是之謂知微知彰。知微者不動聲色，要在能察幾；知彰者不激怒濤，要在能審
-勢。嗚呼！非聖人之智，其誰與於此？
-　　精神爽奮，則百廢俱興；肢體怠弛，則百興俱廢。聖人之治天下，鼓舞人心，振作
-士氣，務使天下之人如含露之朝葉，不欲如久旱之午苗。
-　　而今不要掀揭天地、驚駭世俗，也須拆洗乾坤、一新光景。
-　　無治人，則良法美意反以殃民；有治人，則弊習陋規皆成善政。故有文武之政，須
-待文武之君臣。不然，青萍結綠，非不良劍也；烏號繁弱，非不良弓矢也，用之非人，
-反以資敵。予觀放賑、均田、減糶、檢災、鄉約、保甲、社倉、官牛八政而傷心焉。不
-肖有司放流，有餘罪矣。
-　　振則須起風雷之《益》，懲則須奮剛健之《乾》，不如是，海內大可憂矣。
-　　一呼吸間，四肢百骸無所不到；一痛癢間，手足心知無所不通，一身之故也。無論
-人生，即偶提一線而渾身俱動矣，一脈之故也。守令者，一郡縣之線也。監司者，一省
-路之線也。君相者，天下之線也。心知所及，而四海莫不精神；政令所加，而萬姓莫不
-鼓舞者何？提其線故也。令一身有痛癢而不知覺，則為癡迷之心矣。手足不顧，則為痿
-痹之手足矣。三代以來，上下不聯屬久矣。是人各一身，而家各一情也，死生欣戚不相
-感，其罪不在下也。
-　　夫民懷敢怒之心，畏不敢犯之法，以待可乘之釁。眾心已離，而上之人且恣其虐以
-甚之，此桀紂之所以亡也。是以明王推自然之心，置同然之腹，不恃其順我者之跡，而
-欲得其無怨我者之心。體其意欲而不忍拂，知民之心不盡見之於聲色，而有隱而難知者
-在也。此所以因結深厚，而子孫終必賴之也。
-　　聖主在上，只留得一種天理、民彝、經常之道在，其餘小道、曲說、異端、橫議斬
-然芟除，不遺餘類。使天下之人易耳改目、洗心濯慮，於一切亂政之術，如再生，如夢
-覺，若未嘗見聞。然後道德一而風俗同，然後為純王之治。
-　　治世莫先無偽，教民只是不爭。
-　　任是權奸當國，也用幾個好人做公道，也行幾件好事收人心。繼之者欲矯前人以自
-高，所用之人一切罷去，所行之政一切更張，小人奉承以干進，又從而巧言附和，盡改
-良法而還弊規焉。這個念頭為國為民乎？為自家乎？果曰為國為民，識見已自聾瞽；果
-為自家，此之舉動二帝三王之所不赦者也，更說甚麼事業？
-　　至人無奇名，太平無奇事，何者？皇錫此極，民歸此極，道德一，風俗同，何奇之
-有？
-　　勢有時而窮。始皇以天下全盛之威力，受制於匹夫，何者？
-　　匹夫者，天子之所恃以成勢者也。自傾其勢反為勢所傾，故明王不恃蕭牆之防禦，
-而以天下為藩籬。德之所漸，薄海皆腹心之兵；怨之所結，衽席皆肘腋之冠。故帝王虐
-民是自虐其身者也，愛民是自愛其身者也。覆轍滿前，而驅車者接踵，可慟哉！
-
-　　如今天下人，譬之驕子，不敢熱氣，唐突便艴然起怒，縉紳稍加綜核，則曰苛刻；
-學校稍加嚴明，則曰寡恩；軍士稍加斂戢，則曰凌虐；鄉官稍加持正，則曰踐踏。今縱
-不敢任怨，而廢公法以市恩，獨不可已乎？如今天下事，譬之敝屋，輕手推扶，便愕然
-咋舌。今縱不敢更張，而毀拆以滋壞，獨不可已乎？
-　　公私兩字，是宇宙的人鬼關。若自朝堂以至閭裡，只把持得公字定，便自天清地寧
-，政清訟息；只一個私字，擾攘得不成世界。
-　　王道感人處，只在以我真誠怛惻之心，體其委曲必至之情。
-　　是故不賞而勸，不激而奮，出一言而能使人致其死命，誠故也。
-　　人君者，天下之所依以欣戚者也。一念怠荒，則四海必有廢弛之事，一念縱逸，則
-四海必有不得其所之民。故常一日之間，幾運心思於四海，而天下尚有君門萬里之歎。
-苟不察群情之向背，而惟己欲之是恣，嗚呼！可懼也。
-　　天下之存亡繫兩字，曰「天命」。天下之去就繫兩字，曰「人心」。
-　　耐煩則為三王，不耐煩則為五霸。
-　　一人憂，則天下樂；一人樂，則天下憂。
-　　聖人聯天下為一身，運天下於一心。今夫四肢百骸、五臟六腑皆吾身也，痛癢之微
-，無有不覺，無有不顧。四海之痛癢，豈帝王所可忽哉？夫一指之疔如粟，可以致人之
-死命。國之存亡不在耳目聞見時，聞見時則無及矣。此以利害言之耳。一身麻木若不是
-我，非身也。人君者，天下之人君。天下者，人君之天下。而血氣不相通，心知不相及
-，豈天立君之意耶？
-　　無厭之欲，亂之所自生也。不平之氣，亂之所由成也。皆有國者之所懼也。
-　　用威行法，宜有三豫，一曰上下情通，二曰惠愛素孚，三曰公道難容。如此則雖死
-而人無怨矣。
-　　第一要愛百姓。朝廷以赤子相付托，而士民以父母相稱謂。
-　　試看父母之於赤子，是甚情懷，便知長民底道理。就是愚頑梗化之人，也須耐心漸
-漸馴服。王者必世而後仁，揣我自己德教有俄頃過化手段否？奈何以積習慣惡之人，而
-遽使之帖然我順，一教不從，而遽赫然武怒耶？此居官第一戒也。有一種不可馴化之民
-，有一種不教而殺之罪。此特萬分一耳，不可以立治體。
-　　天下所望於聖人，只是個安字。聖人所以安天下，只是個平字。平則安，不平則不
-安矣。
-　　三軍要他輕生，萬姓要他重生。不輕生不能勘亂，不重生易於為亂。
-　　太古之世，上下相忘，不言而信。中古上下求相孚。後世上下求相勝：上用法勝下
-，下用欺以避法；下以術勝上，上用智以防術。以是而欲求治，胡可得哉？欲復古道，
-不如一待以至誠。誠之所不學者，法以輔之，庶幾不死之人心，尚可與還三代之舊乎？
-　　治道尚陽，兵道尚陰；治道尚方，兵道尚圓。是惟無言，言必行；是惟無行，行必
-竟。易簡明達者，治之用也。有言之不必行者，有言之即行者，有行之後言者，有行之
-竟不言者，有行之非其所言者。融通變化，信我疑彼者，兵之用也。二者雜施，鮮不敗
-矣。
-　　任人不任法，此惟堯、舜在上，五臣在下可矣。非是而任人，未有不亂者。二帝三
-王非不知通變宜民、達權宜事之為善也，以為吾常御天下，則吾身即法也，何以法為？
-惟夫後世庸君具臣之不能興道致治，暴君邪臣之敢於恣惡肆奸也，故大綱細目備載具陳
-，以防檢之，以詔示之。固知夫今日之畫一，必有不便於後世之推行也，以為聖子神孫
-自能師其意，而善用於不窮，且尤足以濟吾法之所未及，庸君具臣相與守之而不敢變，
-亦不失為半得。暴君邪臣即欲變亂，而奔髦之猶必有所顧忌，而法家拂士亦得執祖宗之
-成憲，以匡正其惡，而不苟從，暴君邪臣亦畏其義正事核也，而不敢遽肆，則法之不可
-廢也明矣。
-　　善用威者不輕怒，善用恩者不安施。
-　　居上之患，莫大於賞無功，赦有罪；尤莫大於有功不賞，而罰及無罪。是故王者任
-功罪，不任喜怒；任是非，不任毀譽。
-　　所以平天下之情，而防其變也。此有國家者之大戒也。
-　　事有知其當變而不得不因者，善救之而已矣；人有知其當退而不得不用者，善馭之
-而已矣。
-　　下情之通於上也，如嬰兒之於慈母，無小弗達；上德之及於下也，如流水之於間隙
-，無微不入。如此而天下亂亡者，未之有也。故壅蔽之奸，為亡國罪首。
-　　不齊，天之道也，數之自然也。故萬物生於不齊，而死於齊。而世之任情厭事者，
-乃欲一切齊之，是益以甚其不齊者也。夫不齊其不齊，則簡而易治；齊其不齊，則亂而
-多端。
-　　宇宙有三綱，智巧者不能逃也。一王法，二天理，三公論。
-　　可畏哉！
-　　《詩》云：「樂只君子，民之父母。」又曰：「豈弟君子，民之父母。」君子觀於
-《詩》而知為政之道矣。
-　　既成德矣，而誦其童年之小失；既成功矣，而笑其往日之偶敗，皆刻薄之見也。君
-子不為。
-　　任是最愚拙人，必有一般可用，在善用之者耳。
-　　公論，非眾口一詞之謂也。滿朝皆非，而一人是，則公論在一人。
-　　為政者，非謂得行即行，從可行則行耳。有得行之勢，而昧可行之理，是位以濟其
-惡也。君子謂之賊。
-　　使眾之道，不分職守，則分日月，然後有所責成而上不勞，無所推委而下不奸。混
-呼雜命，概怒偏勞，此不可以使二人，況眾人乎？勤者苦，惰者逸，訥者冤，辯者欺，
-貪者飽，廉者饑，是人也，即為人下且不能，而使之為人上，可歎也夫！
-　　世教不明，風俗不美，只是策勵士大夫。
-　　治病要擇良醫，安民要擇良吏。良吏不患無人，在選擇有法，而激勸有道耳。
-　　孔子在魯，中大夫耳，下大夫僚儕也，而猶侃侃。今監司見屬吏，煦煦沾沾，溫之
-以兒女子之情，才正體統，輒曰示人以難堪，才尚綜核，則曰待人以苛刻。上務以長厚
-悅下官心，以樹他日之桃李；下務以彌文塗上官耳，以了今日之簿書。
-　　吏治安得修舉？民生安得輯寧？憂時者，傷心慟之。
-　　據冊點選，據俸升宮，據單進退，據本題覆，持至公無私之心，守畫一不二之法，
-此守常吏部也。選人嚴於所用，遷官定於所宜，進退則出精識於撫按之外，題覆則持定
-見於科道之中，此有數吏部也。外而與士民同好惡，內而與君相爭是非。銓注為地方，
-不為其人去留；為其人，不為其出身與所恃品材官。
-　　如辨白黑，果黜陟，不論久新。任宇宙於一肩，等富貴於土苴。
-　　庶幾哉其稱職矣。嗚呼！非大丈夫孰足以語此？乃若用一人則注聽宰執口脗，退一
-人則凝視相公眉睫，借公名以濟私，實結士口而灰民心，背公市譽、負國殖身。是人也
-，吾不忍道之。
-　　藏人為君守財，吏為君守法，其守一也。藏人竊藏以營私，謂之盜。吏以法市恩，
-不曰盜乎？賣公法以酬私德，剝民財以樹厚交，恬然以為當然，可歎哉！若吾身家，慨
-以許人，則吾專之矣。
-　　弭盜之末務，莫如保甲；弭之本務，莫如教養。故鬥米十錢，夜戶不閉，足食之效
-也。守遺待主，始於盜牛，教化之功也。夫盜，辱名也。死，重法也。而人猶為之，此
-其罪豈獨在民哉？而惟城池是恃，關鍵是嚴，巡緝是密，可笑也已。
-　　整頓世界，全要鼓舞天下人心。鼓舞人心，先要振作自家神氣。而今提綱摯領之人
-，奄奄氣不足以息，如何教海內不軟手折腳、零骨懈髓底！
-　　事有大於勞民傷財者，雖勞民傷財亦所不顧。事有不關利國安民者，雖不勞民傷財
-亦不可為。
-　　足民，王政之大本。百姓足，萬政舉；百姓不足，萬政廢。
-　　孔於告子貢以足食，告冉有以富之。孟子告梁王以養生、送死、無憾，告齊王以制
-田裡、教樹畜。堯、舜告此無良法矣。哀哉！
-　　百姓只幹正經事，不怕衣食不豐足。君臣只幹正經事，不怕天下不太平。試問百司
-庶府所職者何官？終日所幹者何事？有道者可以自省矣。
-　　法至於平靜矣，君子又加之以恕。乃知平者，聖人之公也。
-　　恕者，聖人之仁也。彼不平者，加之以深，不恕者，加之以刻，其傷天地之和多矣。
-　　化民成俗之道，除卻身教，再無巧術；除卻久道，再無頓法。
-　　禮之有次第也，猶堂之有階，使人不得驟僭也。故等級不妨於太煩。階有級，雖疾
-足者不得闊步；禮有等，雖倨傲者不敢凌節。
-　　人才邪正，世道為之也。世道污隆，君相為之也。君人者何嘗不費富貴哉？以正富
-貴人，則小人皆化為君子；以邪富貴人，則君子皆化為小人。
-　　滿目所見，世上無一物不有淫巧。這淫巧耗了世上多少生成底財貨，誤了世上多少
-生財底工夫，淫巧不誅，而欲講理財，皆苟且之談也。
-　　天地之財，要看他從來處，又要看他歸宿處。從來處要豐要養，歸宿處要約要節。
-　　將三代以來陋習敞規一洗而更之，還三代以上一半古意，
-　　也是一個相業。若改正朔、易服色，都是腐儒作用；茸傾廈，逐頹波，都是俗吏作
-用，於蒼生奚補？噫！此可與有識者道。
-　　御戎之道，上焉者德化心孚，其次講信修睦，其次遠駕長驅，其次堅壁清野，其次
-陰符智運，其次接刃交鋒，其下叩關開市，又其下納幣和親。
-　　為政之道，第一要德感誠服孚，第二要令行禁止。令不行，禁不止，與無官無政同
-，雖堯、舜不能治一鄉，而況天下乎！
-　　防奸之法，畢竟疏於作姦之人。彼作姦者，拙則作偽以逃防，巧則就法以生弊，不
-但去害，而反益其害。彼作者十，而犯者一耳。又輕其罪以為未犯者勸，法奈何得行？
-故行法不嚴，不如無法。
-　　世道有三責：責貴，責賢，責壞綱亂紀之最者。三責而世道可回矣。貴者握風俗教
-化之權，而首壞以為庶人倡，則庶人莫不象之。賢者明風俗教化之道，而自壞以為不肖
-者倡，則不肖者莫不象之。責此二人，此謂治本。風教既壞，誅之不可勝誅，故擇其最
-甚者以令天下，此渭治末。本末兼治，不三年而四海內光景自別。乃今貴者、賢者為教
-化風俗之大蠢，而以體面寬假之，少嚴則曰苛刻以傷士大夫之體，不知二帝三王曾有是
-說否乎？世教衰微，人心昏醉，不知此等見識何處來？所謂淫朋比德，相為庇護，以藏
-其短，而道與法兩病矣。天下如何不敝且亂也？
-　　印書先要個印板真，為陶先要個模子好。以邪官舉邪官，以俗士取俗士，國欲治，
-得乎？
-　　不傷財，不害民，只是不為虐耳。苟設官而惟虐之慮也，不設官其誰虐之？正為家
-給人足，風移俗易，興利除害，轉危就安耳。設廉靜寡慾，分毫無損於民，而萬事廢弛
-，分毫無益於民也，逃不得尸位素餐四字。
-　　天地所以信萬物，聖人所以安天下，只是一個常字。常也者，帝王所以定民志者也
-。常一定，則樂者以樂為常，不知德；苦者以苦為常，不知怨。若謂當然，有趨避而無
-恩仇，非有大奸臣凶，不敢輒生厭足之望，忿恨之心，何則？狃於常故也。
-　　故常不至大壞極敝，只宜調適，不可輕變，一變則人人生覬覦。
-　　心，一覬覦則大家引領垂涎，生怨起紛，數年不能定。是以聖人只是慎常，不敢輕
-變；必不得已，默變，不敢明變；公變，不敢私變；分變，不敢圂變。
-　　紀綱法度，整齊嚴密，政教號令，委曲周詳，原是實踐躬行，期於有實用，得實力
-。今也自貪暴者好法，昏惰者廢法，延及今日萬事虛文，甚者迷製作之本意而不知，遂
-欲並其文而去之。只今文如學校，武如教場，書聲軍容，非不可觀可聽，將這二途作養
-人用出來，令人哀傷憤懑欲死。推之萬事，莫不
-　　皆然。安用縉紳簪嬰塞破世間哉？
-　　安內攘外之略，須責之將吏。將吏不得其人，軍民且不得其所，安問夷狄？是將吏
-也，養之不善則責之文武二學校，用之不善則責吏兵兩尚書。或曰：「養有術乎？」曰
-：「何患於無術？
-　　儒學之大壞極矣，不十年不足以望成材。武學之不行久矣，不十年不足以求名。將
-至於遴選於未用之先，條責於方用之際，綜核於既用之後，黜陟於效不效之時，盡有良
-法可旋至，而立有驗者。
-　　而今舉世有一大迷，自秦、漢以來，無人悟得。官高權重，原是投大遺艱。譬如百
-鈞重擔，須尋烏獲來擔；連雲大廈，須用大木為柱。乃朝廷求賢才，借之名器以任重，
-非朝廷市私思，假之權勢以榮人也。今也崇階重地，用者以為榮，人重以予其所愛，而
-固以吝於所疏，不論其賢不賢。其用者以為榮，己未得則眼穿涎流以干人，既得則捐身
-樓骨以感德，不計其勝不勝。
-
-　　旁觀者不論其官之稱不稱，人之宜不宜，而以資淺議驟遷，以格卑議冒進，皆視官
-為富貴之物，而不知富貴之也，欲以何用？果朝廷為天下求人耶？抑君相為士人擇官耶
-？此三人者，皆可憐也。叔季之世生人，其識見固如此可笑也！
-　　漢始興郡守某者，御州兵，常操之內免操二月，繼之者罷操，又繼之者常給之外冬
-加酒銀人五錢，又繼之者加肉銀人五錢，又繼之者加花布銀人一兩。倉庫不足，括稅給
-之，猶不足，履畝加賦給之。兵不見德也，而民怨又繼之者，曰：「加吾不能，而損吾
-不敢。」競無加。兵相與鼓噪曰：「郡長無恩。」率怨民以叛，肆行攻掠。元帝命刺史
-按之，報曰：「郡守不職，不能撫鎮軍民，而致之叛。」竟棄市。嗟夫！當棄市者誰耶
-？識治體者為之傷心矣。
-　　人情不論是非利害，莫不樂便已者，惡不便己者。居官立政，無論殃民，即教養諄
-諄，禁令惓惓，何嘗不欲其相養相安、免禍遠罪哉？然政一行，而未有不怨者。故聖人
-先之以躬行，浸之以口語，示之以好惡，激之以賞罰，日積月累，耐意精心，但盡薰陶
-之功，不計俄頃之效，然後民知善之當為，惡之可恥，默化潛移，而服從乎聖人。今以
-無本之令，責久散之民，求旦夕之效，逞不從之怒，忿疾於頑，而望敏德之治，即我且
-亦愚不肖者，而何怪乎蚩蚩之氓哉？
-　　嘉靖間，南京軍以放糧過期，減短常例，殺戶部侍郎，散銀數十萬，以安撫之。萬
-曆間，杭州軍以減月糧，又給以不通行之錢，欲殺巡撫不果，既而軍驕，散銀萬餘乃定
-。後嚴火夫夜巡之禁，寬免士夫而繩督市民，既而民變，殺數十人乃定。
-　　鄖陽巡撫以風水之故，欲毀參將公署為學宮，激軍士變，致毆兵備副使幾死，巡撫
-被其把持，奏疏上，必露章明示之乃得行。
-　　陝西兵以冬操太早，行法太嚴，再三請寬，不從，謀殺撫按總兵不成。論者曰：「
-兵驕卒悍如此，奈何？」余曰：「不然，工不信度而亂常規，恩不下究而犯眾怒，罪不
-在軍也。上人者，體其必至之情，寬其不能之罪，省其煩苛之法，養以忠義之教，明約
-束，信號令，我不負彼而彼奸，吾令即殺之，彼有愧懼而已。
-　　鳥獸來必無知覺，而謂三軍之士無良心可乎？亂法壞政，以激軍士之暴，以損國家
-之威，以動天下之心，以開無窮之釁，當事者之罪，不容誅矣。裴度所謂韓洪輿疾討賊
-，承宗斂手削地。非朝廷之力能制其死命，特以處置得宜，能服其心故耳。
-　　處置得宜四字，此統大眾之要法也。
-　　霸者，豪強威武之名，非奸盜詐偽之類。小人之情，有力便挾力，不用偽，力不足
-而濟以謀，便用偽。若力量自足以壓服天下，震懾諸侯，直恁做將去，不怕他不從，便
-靠不到智術上，如何肯偽？王霸以誠偽分，自宋儒始。其實誤在五伯假之以力、假仁二
-「假」字上，不知這假字只是借字。二帝三王以天德為本，便自能行仁，夫焉有所倚？
-霸者要做好事，原沒本領，便少不得借勢力以行之，不然，令不行、禁不止矣，乃是借
-威力以行仁義。故孟子曰：「以力假仁者霸。」以其非身有之，故曰假借耳。人之服之
-也，非為他智能愚人，沒奈他威力何，只得服他。服人者，以強；服於人者，以偽。管
-、商都是霸佐，看他作用都是威力制縛人，非略人，略賣人者。故夫子只說他器小，孟
-子只說他功烈，如彼其卑。而今定公孫鞅罪，只說他慘刻，更不說他奸詐。如今官府教
-民遷善遠罪，只靠那刑威，全是霸道，他有甚詐偽？看來王霸考語，自有見成公案。曰
-以德以力所行底，門面都是一般仁義，如五禁之盟，二帝三王難道說他不是？難道反其
-所為？他只是以力行之耳。德力二字最確，誠偽二字未穩，何也？王霸是個粗分別，不
-消說到誠偽上。
-　　若到細分別處，二帝三王便有誠偽之分，何況霸者？
-　　驟制則小者未必貼服，以漸則天下豪傑皆就我羈靮矣。明制則愚者亦生機械，默制
-則天下無智巧皆入我範圍矣。此馭夷狄待小人之微權，君子用之則為術知，小人用之則
-為智巧，舍是未有能濟者也。或曰：「何不以至誠行之？」曰：「此何嘗不至誠？
-　　但不淺露輕率耳。孔子曰：「機事不密則害成。『此之謂與？」
-　　迂儒識見，看得二帝三王事功，只似陽春雨露，嫗煦可人，再無一些冷落嚴肅之氣
-。便是慈母，也有訶罵小兒時，不知天地只恁陽春，成甚世界？故雷霆霜雪不備，不足
-以成天；威怒刑罰不用，不足以成治。只五臣耳，還要一個臯陶。而二十有二人，猶有
-四凶之誅。今只把天德王道看得恁秀雅溫柔，豈知殺之而不怨，便是存神過化處。目下
-作用，須是汗吐下後，服四君子四物百十劑，才是治體。
-　　三公示無私也，三孤示無黨也，九卿示無隱也。事無私曲，心無閉藏，何隱之有？
-嗚呼！顧名思義，官職亦少稱矣。
-　　要天下太平，滿朝只消三個人，一省只消兩個人。
-　　賢者只是一味，聖人備五味。一味之人，其性執，其見偏，自有用其一味處，但當
-因才器使耳。
-　　天之氣運有常，人依之以事作，而百務成；因之以長養，而百病少。上之政體有常
-，則下之志趨定，而漸可責成。人之耳目一，而因以寡過。
-　　君子見獄囚而加禮焉。今以後皆君子人也，可無敬與？噫！
-　　刑法之設，明王之所以愛小人，而示之以君子之路也。然則囹圄者，小人之學校與？
-　　小人只怕他有才，有才以濟之，流害無窮。君子只怕他無才，無才以行之，斯世何
-補？
-　　事有便於官吏之私者，百世常行，天下通行，或日盛月新，至瀰漫而不可救。若不
-便於己私，雖天下國家以為極，便屢加申飭，每不能行，即暫行亦不能久。負國負民，
-吾黨之罪大矣。
-　　恩威當使有餘，不可窮也。天子之恩威，止於爵三公、夷九族。恩威盡，而人思以
-勝之矣。故明君養恩不盡，常使人有餘榮；養威不盡，常使人有餘懼。此久安長治之道
-也。
-　　封建自五帝已然，三王明知不便勢與情，不得不用耳。夏繼虞，而諸侯無罪，安得
-廢之？湯放桀，費征伐者十一國，餘皆服從，安得而廢之？武伐紂，不期而會者八百，
-其不會者，或遠或不聞，亦在三分有二之數，安得而廢之？使六國尊秦為帝，秦亦不廢
-六國。緣他不肯服，勢必畢六王而後已。武王興滅繼絕，孔子之繼絕舉廢，亦自其先世
-曾有功德，及滅之，不以其罪言之耳。非謂六師所移及九族無血食者，必求復其國也。
-故封建不必是，郡縣不必非。郡縣者，無定之封建；封建者，有定之郡縣也。
-　　刑禮非二物也，皆令人遷善而去惡也。故遠於禮，則近於刑。
-　　上德默成示意而已。其次示觀動其自然。其次示聲色。其次示是非，使知當然。其
-次示毀譽，使不得不然。其次示禍福。
-　　其次示賞罰。其次示生殺，使不敢不然。蓋至於示生殺，而御世之術窮矣。叔季之
-世，自生殺之外無示也。悲夫！
-　　權之所在，利之所歸也。聖人以權行道，小人以權濟私。
-　　在上者慎以權與人。
-　　太平之時，文武將吏習於懶散，拾前人之唾餘，高談闊論，盡似真才。乃稍稍艱，
-大事到手，倉皇迷悶，無一干濟之術，可歎可恨！士君子平日事事講求，在在體驗，臨
-時只辦得三五分，若全然不理會，只似紙舟塵飯耳。
-　　聖人之殺，所以止殺也。故果於殺，而不為姑息。故殺者一二，而所全活者千萬。
-後世之不殺，所以滋殺也。不忍於殺一二，以養天下之奸，故生其可殺，而生者多陷於
-殺。嗚呼！後世民多犯死，則為人上者婦人之仁為之也。世欲治得乎？
-　　天下事，不是一人做底，故舜五臣，周十亂，其餘所用皆小德小賢，方能興化致治
-。天下事，不是一時做底，故堯、舜相繼百五十年，然後黎民於變。文、武、周公相繼
-百年，然後教化大行。今無一人談治道，而孤掌欲鳴。一人倡之，眾人從而詆訾之；一
-時作之，後人從而傾記之。嗚呼！世道終不三代耶？振教鐸以化，吾儕得數人焉，相引
-而在事權，庶幾或可望乎？
-　　兩精兩備，兩勇兩智，兩愚兩意，則多寡強弱在所必較。
-　　以精乘雜，以備乘疏，以勇乘怯，以智乘愚，以有餘乘不足，以有意乘不意，以決
-乘二三，以合德乘離心，以銳乘疲，以慎乘怠，則多寡強弱非所論矣。故戰之勝負無他
-，得其所乘與為人所乘，其得失不啻百也。實精也，而示之以雜；實備也，而示之以疏
-；實勇也，而示之以怯；實智也，而示之以愚；實有餘也，而示之以不足；實有意也，
-而示之以不意；實有決也，而示之以二三；實合德也，而示之以離心；實銳也，而示之
-以疲；實慎也，而示之以怠，則多寡強弱亦非所論矣。故乘之可否無他，知其所示，知
-其無所示，其得失亦不啻百也。故不藏其所示，凶也。誤中於所示，凶也。此將家之所
-務審也。
-　　守令於民，先有知疼知熱，如兒如女一副真心腸，甚麼愛養曲成事業做不出。只是
-生來沒此念頭，便與說綻唇舌，渾如醉夢。
-　　兵士二黨，。近世之隱憂也。士黨易散，兵黨難馴，看來亦有法處。我欲三月而令
-可殺，殺之可令心服而無怨，何者？罪不在下故也。
-　　或問：「宰相之道？」曰：「無私有識。」「塚宰之道？」曰：「知人善任使。」
-　　當事者，須有賢聖心腸，英雄才識。其謀國憂民也，出於惻怛至誠；其圖事揆策也
-，必極詳慎精密、躊躕及於九有，計算至於千年，其所施設，安得不事善功成、宜民利
-國？今也懷貪功喜事之念，為孟浪苟且之圖，工粉飾彌縫之計，以遂其要榮取貴之奸，
-為萬姓造殃不計也，為百年開釁不計也，為四海耗蠹不計也，計吾利否耳。嗚呼！可勝
-歎哉！
-　　為人上者，最怕器局小，見識俗。吏胥輿皂盡能笑人，不可不慎也。
-　　為政者，立科條，發號令，寧寬些兒，只要真實行，永久行。若法極精密，而督責
-不嚴，綜核不至，總歸虛彌，反增煩擾。此為政者之大戒也。
-　　民情不可使不便，不可使甚使。不便則壅閼而不通，甚者令之不行，必潰決而不可
-收拾；甚便則縱肆而不檢，甚者法不能制，必放溢而不敢約束。故聖人同其好惡，以休
-其必至之情，納之禮法，以防其不可長之漸。故能相安相習，而不至於為亂。
-　　居官只一個快性，自家討了多少便宜，左右省了多少負累，百姓省了多少勞費。
-　　自委質後，終日做底是朝廷官，執底是朝廷法，幹底是朝廷事。榮辱在君，愛憎在
-人，進退在我。吾輩而今錯處，把官認作自家官，所以萬事顧不得，只要保全這個在，
-扶持這個尊，此雖是第二等說話，然見得這個透，還算五分久。
-　　銛矛而秫挺，金矢而稭弓，雖有周官之法度，而無奉行之人，典訓謨訓何益哉？
-　　二帝三王功業，原不難做，只是人不曾理會。譬之遙望萬丈高峰，何等巍峨，他地
-步原自逶迤，上面亦不陡峻，不信只小試一試便見得。
-
-　　洗漆以油，洗污以灰，洗油以膩，去小人以小人，此古今妙手也。昔人明此意者幾
-？故以君子去小人，正治之法也。正治是堂堂之陣，妙手是玄玄之機。玄玄之機，非聖
-人不能用也。
-　　吏治不但錯枉去慵懦無用之人，清仕路之最急者。長厚者誤國蠹民，以相培植，奈
-何？
-　　余佐司寇日，有罪人情極可恨，而法無以加者，司官曲擬重條，余不可。司官曰：
-「非私惡也，以懲惡耳。」余曰：「謂非私惡誠然，謂非作惡可乎？君以公惡輕重法，
-安知他日無以私惡輕重法者乎？刑部只有個法字，刑官只有個執宇，君其慎之！」
-　　有聖人於此，與十人論爭，聖人之論是矣，十人亦各是己論以相持，莫之能下。旁
-觀者至有是聖人者，有是十人者，莫之能定。必有一聖人至，方是聖人之論；而十人者
-，旁觀者，又未必以後至者為聖人，又未必是聖人之是聖人也，然則是非將安取決哉？
-昊天詩人，怨王惑於邪謀，不能斷以從善。噫！
-　　彼王也，未必不以邪謀為正謀，為先民之經，為大猶之程。當時在朝之臣，又安知
-不謂大夫為邪謀，為邇言也？是故執兩端而用中，必聖人在天子之位，獨斷堅持，必聖
-人居父師之尊，誠格意孚，不然人各有口，人各有心，在下者多指亂視，在上者蓄疑敗
-謀，孰得而禁之？孰得而定之？
-　　易衰歇而難奮發者，我也。易懶散而難振作者，眾也。易壞亂而難整飭者，事也。
-易蠱敝而難久當者，物也。此所以治日常少，而亂日常多也。故為政要鼓舞不倦，綱常
-張，紀常理。
-　　濫准、株連、差拘、監禁、保押、淹久、解審、照提，此八者，獄情之大忌也，仁
-人之所隱也。居官者慎之。
-　　養民之政，孟子云：「老者衣帛食肉，黎民不飢不寒。」韓子云：「鰥寡孤獨廢疾
-者皆有養也。」教民之道，孟子云：「使契為司徒，教以人倫，父子有親，君臣有義，
-夫婦有別，長幼有序，朋友有信。放勛曰：『勞之來之，匡之直之，輔之翼之，使自得
-之，又從而振德之。』」《洪範》曰：「無偏無陂，遵王之義；無有作好，遵王之道；
-無有作惡，遵王之路；無偏無黨，王道蕩蕩；無黨無偏，王道平平；無反無側，王道正
-直。會其有極，歸其有極。」予每三復斯言，汗輒浹背；三嘆斯語，淚便交頤。嗟夫！
-今之民非古之民乎？今之道非古之道乎？抑世變若江河，世道終不可反乎？爵祿事勢視
-古人有何靳嗇？俾六合景象若斯，辱此七尺之軀，靦面萬民之上矣。
-
-　　智慧長於精神，精神生於喜悅，喜悅生於歡愛。故責人者，與其怒之也，不若教之
-；與其教之也，不若化之。從容寬大，諒其所不能而容其所不及，恕其所不知而體其所
-不欲，隨事講說，隨時開諭。彼樂接引之誠而喜於所好，感督責之寬而愧其不材，人非
-木石，無不長進。故曰：「敬敷五教在寬。」又曰：「無忿疾於頑。」又曰：「匪怒伊
-教。」又曰：「善誘人。」今也不令而責之豫，不言而責之意，不明而責之喻，未及令
-人，先懷怒意，梃詬恣加，既罪矣而不詳其故，是兩相仇、兩相苦也，智者之所笑而有
-量者之所羞也。為人上者切宜戒之。
-　　德立行成了，論不得人之貴賤、家之富貧、分之尊卑。自然上下格心，大小象指，
-歷山耕夫有甚威靈氣焰？故曰：「默而成之，不言而信，存乎德行。」
-　　寬人之惡者，化人之惡者也；激人之過者，甚人之過者也。
-　　五刑不如一恥，百戰不如一禮，萬勸不如一悔。
-　　舉大事，動眾情，必協眾心而後濟。不能盡協者，須以誠意格之，懇言入之。如不
-格不入，須委曲以求濟事。不然彼其氣力智術足以撼眾而敗吾之謀，而吾又以直道行之
-，非所以成天下之務也。古之人神謀鬼謀，以卜以筮，豈真有惑於不可知哉？定眾志也
-，此濟事之微權也。
-　　世間萬物皆有欲，其欲亦是天理人情。天下萬世公共之心，每憐萬物有多少不得其
-欲處，有餘者盈溢於所欲之外而死，不足者奔走於所欲之內而死，二者均，俱生之道也
-。常思天地生許多人物，自足以養之，然而不得其欲者，正緣不均之故耳。此無天地不
-是處，宇宙內自有任其責者。是以聖王治天下不說均就說平，其均平之術只是絜矩，絜
-矩之方，只是個同好惡。
-　　做官都是苦事，為官是苦人，官職高一步，責任便大一步，憂勤便增一步。聖人胼
-手胝足，勞心焦思，惟天下之安而後樂，是樂者，樂其所苦者也。眾人快欲適情，身尊
-家潤，惟富貴之得而後樂，是樂者，樂其所樂者也。
-　　法有定而持循之不易，則下之耳目心志習而上逸。無定，則上之指授口頰煩而下亂。
-　　世人作無益事常十九，論有益惟有暖衣、飽食、安居、利用四者而已。臣子事君親
-，婦事夫，弟事兄，老慈幼，上惠下，不出乎此。《豳風》一章，萬世生人之大法，看
-他舉動，種種皆有益事。
-　　天下之事，要其終而後知。君子之用心、君子之建立，要其成後見事功之濟否。可
-奈庸人俗識，讒夫利口，君子才一施設輒生議論，或附會以誣其心，或造言以甚其過，
-是以志趣不堅、人言是恤者輒灰心喪氣，竟不卒功。識見不真、人言是聽者輒罷居子之
-所為，不使終事。鳴呼！大可憤心矣。古之大建立者，或利於千萬世而不利於一時，或
-利於千萬人而不利於一人，或利於千萬事而不利於一事。其有所費也似貪，其有所勞也
-似虐，其不避嫌也易以招摘取議。及其成功而心事如青天白日矣，奈之何鑠金銷骨之口
-奪未竟之施，誣不白之心哉？嗚呼！英雄豪傑冷眼天下之事，袖手天下之敝，付之長吁
-冷笑，任其腐潰決裂而不之理，玩日遬月，尸位素餐而苟且目前以全軀保妻子者豈得已
-哉？蓋懼此也。
-　　變法者變時勢不變道，變枝葉不變本。吾怪夫後之議法者偶有意見，妄逞聰明，不
-知前人立法千思萬慮而後決。後人之所以新奇自喜，皆前人之所熟思而棄者也，豈前人
-之見不及此哉！
-　　鰥寡孤獨、疲癃殘疾、顛連無告之失所者，惟冬為甚。故凡詠紅爐錦帳之歡、忘雪
-夜呻吟之苦者，皆不仁者也。
-　　天下之財，生者一人，食者九人；興者四人，害者六人。其涷餒而死者，生之人十
-九，食之人十一。其飽暖而樂者，害之人十九，興之人十一。嗚呼！可為傷心矣。三代
-之政行，寧有此哉！
-　　居生殺予奪之柄，而中奸細之術以陷正人君子，是受顧之刺客也。傷我天道，殃我
-子孫，而為他人快意，愚亦甚矣。愚嘗戲謂一友人曰：「能辱能榮，能殺能生，不當為
-人作荊卿。」友人謝曰：「此語可為當路藥石。」
-　　秦家得罪於萬世，在變了井田上。春秋以後井田已是十分病民了，但當復十一之舊
-，正九一之界，不當一變而為阡陌。後世厚取重斂，與秦自不相干。至於貧富不均，開
-天下奢靡之俗，生天下竊劫之盜，廢比閭族黨之法，使後世十人九貧，死於飢寒者多有
-，則壞井田之禍也。三代井田之法，能使家給人足、俗儉倫明、盜息訟簡，天下各得其
-所。只一復了井田，萬事俱理。
-　　赦何為者？以為冤邪，當罪不明之有司；以為不冤邪，當報無辜之死恨。聖王有大
-慶雖枯骨罔不蒙恩。今傷者傷矣，死者死矣，含憤鬱鬱莫不欲仇我者速罹於法以快吾心
-，而乃赦之，是何仁於有罪而不仁於於無辜也。將殘賊幸赦而屢逞，善良聞赦而傷心，
-非聖王之政也。故聖王眚災宥過不待慶時，其刑故也不論慶時，夫是之謂大公至正之道
-。而不以一時之喜濫恩，則法執而小人懼，小人懼則善良得其所。
-　　廟堂之上聚議者，其虛文也。當路者持不虛之成心，循不可廢之故事，特借群在以
-示公耳。是以尊者嚅囁，卑者唯諾，移日而退。巧於逢迎者觀其頤指意向而極口稱道，
-他日驟得殊榮；激於公直者知其無益有害而奮色極言，他日中以奇禍。
-　　近世士風大可哀已。英雄豪傑本欲為宇宙樹立大綱常、大事業，今也，驅之俗套，
-繩以虛文，不俯首吞聲以從，惟有引身而退耳。是以道德之士遠引高蹈，功名之士以屈
-養伸。彼在上者倨傲成習，看下面人皆王順長息耳。
-　　今四海九州之人，郡異風，鄉殊俗，道德不一故也。故天下皆守先王之禮，事上接
-下，交際往來，揆事宰物，率遵一個成法，尚安有詆笑者乎？故惟守禮可以笑人。
-　　凡名器服飾，自天子而下庶人而上，各有一定籌差，不可僭逼。上太殺是謂逼下，
-下太隆是謂僭上，先王不裁抑以逼下也，而下不敢僭。
-　　禮與刑二者常相資也，禮先刑後，禮行則刑措，刑行則禮衰。
-　　官貴精不貴多，權貴一不貴分。大都之內，法令不行，則官多權分之故也，故萬事
-俱馳。
-　　名器於人無分毫之益，而國之存亡、民之死生於是乎系。是故衮冕非暖於綸巾，黃
-瓦非堅於白屋，別等威者非有利於身，受跪拜者非有益於己，然而聖王重之者，亂臣賊
-子非此無以防其漸而示之殊也。是故雖有大奸惡，而以區區之名分折之，莫不失辭喪氣
-。吁！名器之義大矣哉！
-　　今之用人，只怕無去處，不知其病根在來處。今之理財，只怕無來處，不知其病根
-在去處。
-　　用人之道，貴當其才；理財之道，貴去其蠹。人君以識深慮遠者謀社稷，以老成持
-重者養國脈，以振勵明作者起頹敝，以通時達變者調治化，以秉公持正者寄鈞衡，以燭
-奸嫉邪者為按察，以厚下愛民者居守牧，以智深勇沉者典兵戎，以平恕明允者治刑獄，
-以廉靜綜核者掌會計，以惜恥養德者司教化，則用人當其才矣。宮妾無慢棄之帛，殿廷
-無金珠之玩，近侍絕賄賂之通，寵幸無不貲之賞，臣工嚴貪墨之誅，迎送懲威福之濫，
-工商重淫巧之罰，眾庶謹僭奢之戒，游惰杜幸食之門，緇黃示誑誘之罪，倡優就耕織之
-業，則理財得其道矣。
-　　古之官人也擇而後用，故其考課也常恕。何也？不以小過棄所擇也。今之官人也用
-而後擇，郤又以姑息行之，是無擇也，是容保奸回也。豈不渾厚？哀哉萬姓矣！
-　　世無全才久矣，用人者各因其長可也。夫目不能聽，耳不能視，鼻不能食，口不能
-臭，勢也。今之用人不審其才之所堪，資格所及，雜然授之。方司會計，輒理刑名；既
-典文銓，又握兵柄。養之不得其道，用之不當其才，受之者但悅美秩而不自量。以此而
-求濟事，豈不難哉！夫公綽但宜為老而裨諶不可謀邑，今之人才豈能倍蓗古昔？愚以為
-學校養士，科目進人，便當如溫公條議，分為數科，使各學其才之所近，而質性英發能
-奮眾長者特設全才一科，及其授官，各任所長。夫資有所近，習有所通，施之政事，必
-有可觀。蓋古者以仕學為一事，今日分體用為兩截。窮居草澤，止事詞章；一入廟廊，
-方學政事。雖有明敏之才，英達之識，豈能觀政數月便得每事盡善？不免鹵莽施設，鶻
-突支吾。苟不大敗，輒得遷升。以此用人，雖堯舜不治。夫古之明體也養適用之才，致
-君澤民之術固已熟於畎畝之中，苟能用我者，執此以往耳。今之學校，可為流涕矣。
-　　官之所居曰任，此意最可玩。不惟取責仕負之義，任者，任也。聽其便宜信任而責
-成也。若牽制束縛，非任矣。
-　　廝隸之言直徹之九重，台省以之為藏否，部院以之為進退，世道大可恨也。或訝之
-。愚曰：「天子之用舍托之吏部，吏部之賢不肖托之撫按，撫按之耳目托之兩司，兩司
-之心腹托之守令，守令之見聞托之皂快，皂快之採訪托之他邑別邵之皂快。彼其以恩仇
-為是非，以謬妄為情實，以前令為後宮，以舊愆為新過，以小失為大辜，密報密收，信
-如金石；愈偽愈詳，獲如至寶。謂夷、由污，謂蹻、跖廉，往往有之。而撫按據以上聞
-，吏部據以黜陟。一吏之榮辱不足惜，而奪所愛以失民望，培所恨以滋民殃，好惡拂人
-甚矣。
-　　居官有五要：「休錯問一件事，休屈打一個人，休妄費一分財，休輕勞一夫力，休
-苟取一文錢。」
-　　吳越之戰利用智，羌胡之戰利用勇。智在相機，勇在養氣。相機者務使鬼神不可知
-，養氣者務使身家不肯顧，此百姓之道也。
-　　兵以死使人者也。用眾怒，用義怒，用恩怒。眾怒仇在萬姓也，湯武之師是已。義
-怒以直攻曲也，三軍縞素是已。恩怒感淚思奮也，李牧犒三軍，吳起同甘苦是已。此三
-者，用人之心，可以死人之身，非是皆強驅之也。猛虎在前，利兵在後，以死毆死，不
-戰安之？然而取勝者幸也，敗與潰者十九。
-　　寓兵於農，三代聖王行之甚好，家家知耕，人人知戰，無論即戎，亦可弭盜，且經
-數十百年不用兵。說用兵，才用農十分之一耳。何者？有不道之國則天子命曰：「某國
-不道，某方伯連師討之。」天下無與也，天下所以享兵農未分之利。春秋以後，諸侯日
-尋干戈，農胥變而為兵，舍穡不事則吾國貧，因糧於敵則他國貧。與其農胥變而兵也，
-不如兵農分。
-　　凡戰之道，貪生者死，忘死者生，狃勝者敗，恥敗者勝。
-　　疏法勝於密心，寬令勝於嚴主。
-　　天下之事倡於作俑而濫於助波鼓焰之徒，至於大壞極敝，非截然毅然者不能救。於
-是而猶曰循舊安常，無更張以拂人意，不知其可也。
-　　在上者能使人忘其尊而親之，可謂盛德也已。因偶然之事，立不變之法；懲一夫之
-失，苦天下之人。法莫病於此矣。近日建白，往往而然。
-　　禮繁則難行，卒成廢閣之書；法繁則易犯，益甚決裂之罪。
-　　為堯舜之民者逸於堯舜之臣，唐、虞世界全靠四岳、九官、十二牧，當時君民各享
-無為之業而已。臣勞之系於國家也，大哉！是故百官逸則君勞，而天下不得其所。
-　　治世用端人正士，衰世用庸夫俗子，亂世用憤夫佞人。憸夫佞人盛，而英雄豪傑之
-士不伸。夫惟不伸也，而奮於一伸，遂至於亡天下。故明主在上必先平天下之情，將英
-雄豪傑服其心志，就我羈掗，不蓄其奮而使之逞。
-　　天下之民皆朝廷之民，皆天地之民，皆吾民。
-　　愈上則愈聾瞽，其壅蔽者眾也。愈下則愈聰明，其見聞者真也故論見聞則君之知不
-如相，相之知不如監司，監司之知不如守令，守令之知不如民。論壅蔽，則守令蔽監司
-，監司蔽相，相蔽君。惜哉！愈下之真情不能使愈上者聞之也。
-　　周公是一部活《周禮》，世只有周公不必有《周禮》，使周公而生於今，寧一一用
-《周禮》哉！愚謂有周公雖無《周禮》可也，無周公雖無《周禮》可也。
-　　民鮮恥可以觀上之德，民鮮畏可以觀上之威，更不須求之民。
-　　民情甚不可鬱也。防以鬱水，一決則漂屋推山；炮以鬱火，一發則碎石破木。桀、
-紂鬱民情而湯、武通之，此存亡之大機也。有天下者之所夙夜孜孜者也。
-　　天之生民非為君也，天之立君以為民也，奈何以我病百姓？夫為君之道無他，因天
-地自然之利而為民開尋撙節之，因人生固有之性而為民倡率裁制之，足其同欲，去其同
-惡，凡以安定之使無失所，而後立君之意終矣。豈其使一人肆於民上而剝天下以自奉哉
-？嗚呼！堯舜其知此也夫。
-　　三代之法，井田、學校，萬世不可廢。世官、封建，廢之已晚矣。此難與不思者道。
-　　聖王同民心而出治道，此成務者之要言也。夫民心之難同久矣。欲多而見鄙，聖王
-識度豈能同之？噫！治道以治民也，治民而不同之，其何能從？即從，其何能久？禹之
-戒舜曰：「罔咈百姓以從己之欲。」夫舜之欲豈適己自便哉？以為民也，而曰：「罔咈
-。」盤庚之遷殷也，再四曉譬；武王之伐紂也，三令五申。必如此而後事克有濟。故曰
-：「專欲難成，眾怒難犯。」我之欲未必非，彼之怒未必是，聖王求以濟事，則知專之
-不勝眾也，而不動聲色以因之，明其是非以悟之，陳其利害以動之，待其心安而意順也
-，然後行之。是謂以天下人成天下事，事不勞而底績。雖然，亦有先發後聞者，亦有不
-謀而斷者，有擬議已成，料度已審，疾雷迅電而民不得不然者。此特十一耳、百一耳，
-不可為典則也。
-　　人君有欲，前後左右之幸也。君欲一，彼欲百，致天下亂亡，則一欲者受禍，而百
-欲者轉事他人矣。此古今之明鑑，而有天下者之所當悟也。
-　　平之一字極有意味，所以至治之世只說個天下平。或言：「水無高下，一經流注無
-不得平。」曰：「此是一味平了。世間千種人，萬般物，百樣事，各有分量，各有差等
-，只各安其位而無一毫拂淚不安之意，這便是太平。如君說則是等尊卑貴賤小大而齊之
-矣，不平莫大乎是。
-　　國家之取士以言也，固將曰言如是行必如是也。及他日效用，舉背之矣。今閭閆小
-民立片紙，憑一人，終其身執所書而責之不敢二，何也？我之所言，昭然在紙筆間也，
-人已據之矣。吁！執卷上數千言，憑滿闈之士大夫，且播之天下，視小民片紙何如？奈
-之何吾資之以進身，人君資之以進人，而自處於小民之下也哉？噫！無怪也。彼固以空
-言求之，而終身不復責券也。
-　　漆器之諫，非為舜憂也，憂天下後世極欲之君自此而開其萌也。天下之勢，無必有
-，有必文，文必靡麗，靡麗必亡。漆器之諫，慎其有也。
-　　矩之不可以不直方也，是萬物之所以曲直斜正也。是故矩無言而萬物則之無毫髮違
-，直方也。哀哉！為政之徒言也。
-暑之將退也先燠，天之將旦也先晦。投丸於壁，疾則內射，物極則反，不極則不反也。
-故愚者惟樂其極，智者先懼其反。然則否不害於極，泰極其可懼乎！
-　　余每食雖無肉味，而蔬食菜羹嘗足。因嘆曰：「嗟夫！使天下皆如此而後盜可誅也
-。」枵腹菜色，盜亦死，不盜亦死。夫守廉而俟死，此士君子之所難也。奈何以不能士
-君子之行而遂誅之乎？此富民為王道之首務也。
-　　窮寇不可追也，遁辭不可攻也，貧民不可威也。
-　　無事時埋藏著許多小人，多事時識破了許多君子。
-　　法者，御世宰物之神器，人君本天理人情而定之，人君不得與；人臣為天下萬世守
-之，人臣不得與。譬之執圭捧節，奉持惟謹而已。非我物也，我何敢私？今也不然，人
-藉之以濟私，請托公行；我藉之以巿恩，聽從如響。而辯言亂政之徒又借曰長厚、曰慈
-仁、曰報德、曰崇尊。夫長厚慈仁當施於法之所不犯，報德崇尊當求諸己之所得為，奈
-何以朝廷公法徇人情、伸己私哉？此大公之賊也。
-　　治世之大臣不避嫌，治世之小臣無橫議。
-　　姑息之禍甚於威嚴，此不可與長厚者道。
-　　卑卑世態，裊裊人情，在下者工不以道之悅，在上者悅不以道之工。奔走揖拜之日
-多，而公務填委；簡書酬酢之文盛，而民事罔聞。時光只有此時光，精神只有此精神，
-所專在此，則所疏在彼。朝廷設官本勞己以安民，今也憂民以相奉矣。
-　　天下存亡繫人君喜好，鶴乘軒，何損於民？且足以亡國，而況大於此者乎？
-　　動大眾，齊萬民，要主之以慈愛，而行之以威嚴，故曰：「威克厥愛。」又曰：「
-一怒而安天下之民。」若姑息寬緩，煦煦沾沾，便是婦人之仁，一些事濟不得。
-　　為政以徇私、弭謗、違道、干譽為第一恥，為人上者自有應行道理，合則行，不合
-則去。若委曲遷就，計利慮害，不如奉身而退。孟子謂枉尺直尋，不可推起來。雖枉一
-寸，直千尺，恐亦未可也。或曰：「處君親之際，恐有當枉處。」曰：「當枉則不得謂
-之枉矣，是謂權以行經，畢竟是直道而行。」
-　　「與其殺不辜，寧失不經。」此舜時獄也。以舜之聖，皋陶之明，聽比屋可封之民
-，當淳朴未散之世，宜無不得其情者，何疑而有不經之失哉？則知五聽之法不足以盡民
-，而疑獄難決自古有之，故聖人寧不明也而不忍不仁。今之決獄輒恥不明而以臆度之見
-、偏主之失殺人，大可恨也。夫天道好生，鬼神有知，奈何為此？故寧錯生了人，休錯
-殺了人。錯生則生者尚有悔過之時，錯殺則我亦有殺人之罪。司刑者慎之。
-　　大纛高牙，鳴金奏管，飛旌卷蓋，清道唱騶，輿中之人志驕意得矣。蒼生之疾苦幾
-何？職業之修廢幾何？使無愧於心焉，即匹馬單車，如聽鈞天之樂。不然是益厚吾過也
-。婦人孺子豈不驚炫，恐有道者笑之。故君子之車服儀從足以辨等威而已，所汲汲者固
-自有在也。
-
-　　徇情而不廢法，執法而不病情，居官之妙悟也。聖人未嘗不屐正奉公，至其接人處
-事大段圓融渾厚，是以法紀不失而人亦不怨。何者？無躁急之心而不狃一切之術也。
-　　寬簡二字，為政之大體。不寬則威令嚴，不簡則科條密。以至嚴之法繩至密之事，
-是謂煩苛暴虐之政也。困己憂民，明王戒之。
-　　世上沒個好做底官，雖抱關之吏，也須夜行早起，方為稱職。才說做官好，便不是
-做官的人。
-　　罪不當笞，一朴便不是；罪不當怒，一叱便不是。為人上者慎之。
-　　君子之事君也，道則直身而行，禮則鞠躬而盡，誠則開心而獻，禍福榮辱則順命而
-受。
-　　弊端最不可開，弊風最不可成。禁弊端於未開之先易，挽弊風於既成之後難。識弊
-端而絕之，非知者不能；疾弊風而挽之，非勇者不能。聖王在上，誅開弊端者以徇天下
-，則弊風自革矣。
-　　避其來銳，擊其惰歸，此之謂大智，大智者不敢常在我。擊其銳，避其惰歸，此之
-謂神武，神武者心服常在人。大智者可以常戰，神武者無俟再戰。
-　　御眾之道，賞罰其小者，賞罰小，則大者勸懲；甚者，賞罰甚者費省而人不驚；明
-者，人所共知；公者，不以己私。如是雖百萬人可為一將用，不然必勞、必費、必不行
-，徒多賞罰耳。
-　　為政要使百姓大家相安，其大利害當興革者不過什一，外此只宜行所無事，不可有
-意立名建功以求烜赫之譽。故君子之建白，以無智名勇功為第一。至於雷厲風行，未嘗
-不用，譬之天道然，以沖和鎮靜為常，疾風迅雷間用之而已。
-　　罰人不盡數其罪，則有餘懼；賞人不盡數其功，則有餘望。
-　　匹夫有不可奪之志，雖天子亦無可奈何。天子但能令人死，有視死如飴者，而天子
-之權窮矣。然而竟令之死，是天子自取過也。不若容而遂之，以成盛德。是以聖人體群
-情，不敢奪人之志，以傷天下之心，以成己之惡。
-　　臨民要莊謹，即近習門吏起居常侍之間，不可示之以可慢。
-　　聖王之道以簡為先，其繁者，其簡之所不能者也。故惟簡可以清心，惟簡可以率人
-，惟簡可以省人己之過，惟簡可以培壽命之原，惟簡可以養天下之財，惟簡可以不耗天
-地之氣。
-　　聖人不以天下易一人之命，後世乃以天下之命易一身之尊，悲夫！吾不知得天下將
-以何為也。
-　　聖君賢相在位，不必將在朝小人一網盡去之，只去元惡大奸，每種芟其甚者一二，
-示吾意向之所在。彼群小眾邪與中人之可惡者莫不回心向道，以逃吾之所去，舊惡掩覆
-不暇，新善積累不及，而何敢怙終以自溺邪？故舉皋陶，不仁者遠；去四凶，不仁者亦
-遠。
-　　有一種人，以姑息匪人巿寬厚名；有一種人，以毛舉細故巿精明名，皆偏也。聖人
-之寬厚不使人有所恃，聖人之精明不使人無所容，敦大中自有分曉。
-　　申、韓亦王道之，聖人何嘗廢刑名不綜核？四凶之誅，舜之申、韓也；少正卯之誅
-，侏儒之斬，三都之墮，孔子之申、韓也。即雷霆霜雪，天亦何嘗不申、韓哉？故慈父
-梃詬，愛肉有針石。
-　　三千三百，聖人靡文是尚而勞苦是甘也。人心無所存屬則惡念潛伏，人身有所便安
-則惡行滋長。禮之繁文使人心有所用而不得他適也，使人觀文得情而習於善也，使人勞
-其筋骨手足而不偷慢以養其淫也，使彼此相親相敬而不傷好以起爭也，是範身聯世、制
-欲已亂之大防也。故曠達者槳於簡便，一決而潰之則大亂起。後世之所謂禮者則異是矣
-，先王情文廢無一在而乃習容止，多揖拜，寀顏色，柔聲氣，工頌諛，艷交游，密附耳
-躡足之語，極籩豆筐之費，工書刺候問之文，君子所以深疾之，欲一洗而入於崇真尚簡
-之歸，是救俗之大要也。雖然，不講求先王之禮而一入於放達，樂有簡便，久而不流於
-西晉者幾希。
-　　在上者無過，在下者多過。非在上者之無過，有過而人莫敢言。在下者非多過，誣
-之而人莫敢辯。夫惟使人無心言，然後為上者真無過；使人心服，而後為下者真多過也
-。
-　　為政者貴因時。事在當因，不為後人開無故之端；事在當革，不為後人長不救之禍
-。
-　　夫治水者，通之乃所以窮之，塞之乃所以決之也。民情亦然。故先王引民情於正，
-不裁於法。法與情不俱行，一存則一亡。三代之得天下，得民情也；其守天下也，調民
-情也。順之而使不拂，節之而使不過，是謂之調。
-　　治道之衰，起於文法之盛；弊蠹之滋，始於簿書之繁。彼所謂文法簿書者，不但經
-生黔首懵不見聞，即有司專職，亦未嘗檢閱校勘。何者？千宗百架，鼠蠹雨浥，或一事
-反覆異同，或一時互有可否。後欲遵守，何所適從？只為積年老猾媒利巿權之資耳，其
-實於事體無裨，弊蠹無損也。嗚呼！百家之言不火而道終不明，後世之文法不省而世終
-不治。
-　　六合都是情世界，惟朝堂官府為法世界，若也只徇情，世間更無處覓公道。
-　　進賢舉才而自以為恩，此斯世之大惑也。退不肖之怨，誰其當之？失賢之罪，誰其
-當之？奉君之命，盡己之職，而公法廢於私恩，舉世迷焉，亦可悲矣。
-　　進言有四難：「審人、審己、審事、審時。」一有未審，事必不濟。
-　　法不欲驟變，驟變雖美，駭人耳目，議論之媒也。法不欲硬變，硬變雖美，拂人心
-志，矯抗之藉也。故變法欲詳審，欲有漸，欲不動聲色，欲同民心而與之反覆其議論。
-欲心跡如青天白日，欲獨任躬行不令左右惜其名以行胸臆。欲明且確，不可含糊，使人
-得持兩可以為重輕。欲著實舉行，期有成效，無虛文搪塞，反貽實害。必如是而後法可
-變也。不然，寧仍舊貫而損益修舉之。無喜事，喜事人上者之僇也。
-　　新法非十有益於前，百無慮於後，不可立也。舊法非於事萬無益，於理大有害，不
-可更也。要在文者實之，偏者救之，敝者補之，流者反之，怠廢者申明而振作之。此治
-體調停之中策，百世可循者也。
-　　用三代以前見識而不迂，就三代以後家數而不俗，可以當國矣。
-　　善處世者，要得人自然之情。得人自然之情，則何所不得？失人自然之情，則何所
-不失？不惟帝王為然，雖二人同行，亦離此道不得。
-　　夫坐法堂，厲聲色，侍列武卒，錯陳嚴刑，可生可殺，惟吾所欲為而莫之禁，非不
-泰然得志也。俄而有狂士直言正色，詆過攻失，不畏尊嚴，則王公貴人為之奪氣。於斯
-時也，威非不足使之死也，理屈而威以劫之，則能使之死而不能使之服矣。大盜昏夜持
-利刃而加人之頸，人焉得而不畏哉？伸無理之威以服人，盜之類也，在上者之所恥也。
-彼以理伸，我以威伸，則彼之所伸者蓋多矣。故為上者之用威，所以行理也，非以行勢
-也。
-　　禮之一字，全是個虛文，而國之治亂、家之存亡、人之死生、事之成敗罔不由之。
-故君子重禮，非謂其能厚生利用人，而厚生利用者之所必賴也。
-　　兵革之用，德化之衰也。自古聖人亦甚盛德，即不過化存神，亦能久道成孚，使彼
-此相安於無事。豈有四夷不可講信修睦作鄰國邪？何至高城深池以為衛，堅甲利兵以崇
-誅，侈萬乘之師，靡數百萬之財以困民，塗百萬生靈之肝腦以角力，聖人之智術而止於
-是邪？將至愚極拙者謀之，其計豈出此下哉？若曰無可奈何不得不爾，無為貴聖人矣。
-將干羽曲格、因壘崇降，盡虛語矣乎？夫無德化可恃，無恩信可結，而曰去兵，則外夷
-交侵，內寇嘯聚，何以應敵？不知所以使之不侵不聚者，亦有道否也？古稱「四夷來王
-」，八蠻通道，越裳重譯，日月霜露之所照墮者莫不尊親，斷非虛語。苟於此而歲歲求
-之，日日講之，必有良法，何至因天下之半而為此無可奈何之策哉！
-　　事無定分則人人各諉其勞而萬事廢，物無定分則人人各滿其欲而萬物爭。分也者，
-物各付物，息人奸懶貪得之心，而使事得其理、人得其情者也。分定雖萬人不須交一言
-。此修齊治平之要務，二帝三王之所不能外也。
-　　驕慣之極，父不能制子，君不能制臣，夫不能制妻，身不能自制。視死如飴，何威
-之能加？視恩為玩，何惠之能益？不禍不止。故君子情盛不敢廢紀綱，兢兢然使所愛者
-知恩而不敢肆，所以生之也，所以全之也。
-　　物理人情，自然而已。聖人得其自然者以觀天下，而天下之人不能逃聖人之洞察；
-握其自然者以運天下，而天下之人不覺為聖人所斡旋。即其軌物所繩於矯拂，然拂其人
-欲自然之私，而順其天理自然之公。故雖有倔強錮蔽之人，莫不憬悟而馴服，則聖人觸
-其自然之機而鼓其自然之情也。
-　　監司視小民譪然，待左右肅然，待寮寀溫然，待屬官侃然，庶幾乎得體矣。
-　　自委質後，此身原不屬我。朝廷名分，為朝廷守之。一毫貶損不得，非抗也；一毫
-高亢不得，非卑也。朝廷法紀為朝廷執之，一毫徇人不得，非固也；一毫任己不得，非
-葸也。
-　　未到手時，嫌於出位而不敢學；既到手時，迫於應酬而不及學。一世業官苟且，只
-於虛套搪塞，竟不嚼真味，竟不見成功。雖位至三公，點檢真足愧汗。學者思之。
-　　今天下一切人、一切事，都是苟且做，尋不著真正題目。便認了題目，嘗不著真正
-滋味。欲望三代之治甚難。
-　　凡居官，為前人者，無幹譽矯情立一切不可常之法以難後人；為後人者，無矜能露
-跡為一朝即改革之政以苦前人。此不惟不近人情，政體自不宜爾。若惡政弊規，不防改
-圖，只是渾厚便好。
-　　將古人心信今人，真是信不過；若以古人至誠之道感今人，今人未必在豚魚下也。
-　　泰極必有受其否者，否極必有受其泰者。故水一壅必決，水一決必涸。世道縱極，
-必有操切者出，出則不分賢愚，一番人受其敝。嚴極必有長厚者出，出則不分賢愚，一
-番人受其福。此非獨人事，氣數固然也。故智者乘時因勢，不以否為憂，而以泰為俱。
-審勢相時，不決裂於一懲之後，而驟更以一切之法。昔有獵者入山，見騶虞以為虎也，
-殺之，尋復悔。明日見虎以為騶虞也，捨之，又復悔。主時勢者之過於所懲也，亦若是
-夫。
-　　法多則遁情愈多，譬之逃者，入千人之群則不可覓，入三人之群則不可藏矣。
-　　兵，陰物也；用兵，陰道也，故貴謀。不好謀不成。我之動定敵人不聞，敵之動定
-盡在我心，此萬全之計也。
-　　取天下，守天下，只在一種人上加意念，一個字上做工夫。一種人是那個？曰民。
-一個字是甚麼？曰安。
-　　禮重而法輕，禮嚴而法恕，此二者常相權也。故禮不得不嚴，不嚴則肆而入於法；
-法不得不恕，不恕則激而法窮。
-　　夫禮也，嚴於婦人之守貞而疏於男子之縱欲，亦聖人之偏也。今輿隸僕僮皆有婢妾
-娼女，小童莫不淫狎，以為丈夫之小節而莫之問，陵嫡失所，逼妾殞身者紛紛。恐非聖
-王之世所宜也，此不可不嚴為之禁也。
-　　西門疆尹河西，以賞勸民。道有遺羊，值五百，一人守而待。失者謝之，不受。疆
-曰：「是義民也。」賞之千。其人喜，他日謂所知曰：「汝遺金，我拾之以還。」所知
-者從之。以告疆曰：「小人遺金一兩，某拾而還之。」疆曰：「義民也。」賞之二金。
-其人愈益喜。曰：「我貪，每得利則失名，今也名利兩得，何憚而不為？」
-　　篤恭之所發，事事皆純王，如何天下不平？或曰：才說所發，不動聲色乎？曰：「
-日月星辰皆天之文章，風雷雨露皆天之政令，上天依舊篤恭在那裡。篤恭，君子之無聲
-無臭也。無聲無臭，天之篤恭也。」
-　　君子小人調停，則勢不兩立，畢竟是君子易退，小人難除。若攻之太慘，處之太激
-，是謂土障狂瀾，灰埋烈火。不若君子秉成而擇才以使之，任使不效，而次第裁抑之。
-我懸富貴之權而示之的曰：「如此則富貴，不如此則貧賤。」彼小人者，不過得富貴耳
-，其才可以僨天下之事，亦可以成天下之功；可激之釀天下之禍，亦可養之興天下之利
-。大都中人十居八九，其大奸凶極頑悍者亦自有數。棄人於惡而迫之自棄，俾中人為小
-人，小小人為大小人，甘心抵死而不反顧者，則吾黨之罪也。噫！此難與君子道，三代
-以還，覆轍一一可鑒。此品題人物者所以先器識也。
-　　當多事之秋，用無才之君子，不如用有才之小人。
-　　肩天下之任者全要個氣，御天下之氣者全要個理。
-　　無事時惟有邱民好蹂踐，自吏卒以上，人人得而魚肉之。有事時惟有邱民難收拾，
-雖天子亦無躲避處，何況衣冠？此難與誦詩讀書者道也。
-　　余居官有六自：「簿均徭先令自審，均地先令自丈，未完令其自限，紙贖令其自催
-，幹証催詞訟令其自拘，幹証拘小事令其自處。」鄉約亦往往行得去，官逸而事亦理，
-欠之可省刑罰。當今天下之民極苦官之繁苛，一與寬仁，其應如響。
-　　自井田廢而竊劫始多矣。飽暖無資，飢寒難耐，等死耳。與其瘠僵於溝壑無人稱廉
-，不若苟活於旦夕未必即犯。彼義士廉夫尚難責以餓死，而況種種貧民半於天下乎？彼
-膏粱文繡坐於法堂而嚴刑峻法以正竊劫之罪者，不患無人，所謂「哀矜而勿喜」者誰與
-？余以為，衣食足而為盜者，殺無赦；其迫於飢寒者，皆宜有以處之。不然罪有所由而
-獨誅盜，亦可愧矣。
-　　余作《原財》一篇，有六生十二耗。六生者何？曰墾荒閑之田，曰通水泉之利，曰
-教農桑之務，曰招流移之民，曰當時事之宜，曰詳積貯之法。十二耗者何？曰嚴造飲之
-禁，曰懲淫巧之工，曰重游手之罰，曰絕倡優劇戲，曰限在官之役，曰抑僭奢之俗，曰
-禁寺廟之建，曰戒坊第游觀之所刻無益之書，曰禁邪教之倡，曰重迎送供張之罪，曰定
-學校之額、科舉之制，曰誅貪墨之使。語多憤世，其文不傳。
-　　太和之氣雖貫徹於四時，然炎徼以南常熱，朔方以北常寒姑無論，只以中土言之，
-純然暄燠而無一毫寒涼之氣者，惟是五月半後、八月半前九十日耳。中間亦有夜用袷綿
-時。至七月而暑已處，八月而白露零，九月寒露霜降，亥子丑寅其寒無俟言矣。二三月
-後猶未脫綿，穀雨以後始得斷霜。四月已夏，猶謂清和，大都嚴肅之氣歲常十八，而草
-木二月萌芽，十月猶有生意，乃生育長養不專在於暄燠，而嚴肅之中正所以操縱沖和之
-機者也。聖人之為政也法天，當寬則用春夏，當嚴則用秋冬，而常持之體則於嚴威之中
-施長養之惠。何者？嚴不匱，惠易窮，威中之惠鼓舞人群，惠中之惠驕馳眾志。子產相
-鄰，鑄刑書，誅強宗，伍田疇，褚衣冠。及語子太叔，他日又曰子產眾人之母。孔子之
-為政可考矣。彼沾沾煦煦，尚姑息以養民之惡，卒至廢馳玩遫，令不行，禁不止，小人
-縱恣，善良吞泣，則孔子之罪人也。故曰居上以寬為本，未嘗以寬為政。嚴也者，所以
-成其寬也。故懷寬心不宜任寬政，是以懦主殺臣，慈母殺子。
-　　余息而在溝壑，斗珠不如升糠；祼裎而臥冰雪，敗絮重於繡縠。舉世用人，皆珠縠
-
-之貴也。有甚高品，有甚清流？不適緩急之用，即真非所急矣。
-　　盈天地間只靠二種人為命，曰農夫、織婦。郤又沒人重他，是自戕其命也。
-　　一代人才自足以成一代之治，既養無術而用之者又非其人，無怪乎萬事不理也。
-　　三代之後，治天下只求個不敢。不知其不敢者，皆苟文以應上也。真敢在心，暗則
-足以盅國家，明之足以亡社稷，乃知不敢不足恃也。
-　　古者國不易君，家不易大夫，故其治因民宜俗，立綱陳紀。百姓與己相安，然後從
-容漸漬，日新月盛，而治功成。故曰「必世後仁」，曰「欠道成化」。譬之天地不悠欠
-便成物不得。自封建變而為郡懸，官無欠暖之席，民無盡識之官，施設未竟而讒毀隨之
-，建官未久而黜陟隨之。方朘熊蹯而奪之薪，方繅茧絲而截其緒。一番人至，一度更張
-。各有性情，各有識見。百姓聞其政令半不及理會，聽其教化尚未及信從，而新者卒至
-，舊政廢閣。何所信從？何所遵守？況加以監司之掣肘，制一幘而不問首之大小，都使
-之冠；制一衣而不問時之冬夏，必使之服。不審民情便否，先以書督責，即高才疾足之
-士，俄頃措置之功，亦不過目前小康，一事小補，而上以此為殿最，下以此為歡虞，嗚
-呼！傷心矣。先正有言，人不里居，田不井授，雖欲言治，皆苟而已。愚謂建官亦然，
-政因地而定之，官擇人而守之，政善不得更張，民安不得易法。其多事擾民，任情變法
-，與惰政慢法者斥遂之，更其人不易其治，則郡懸賢於封建遠矣。
-　　法之立也，體其必至之情，寬以自生之路，而後繩其逾分之私，則上有直色而下無
-心言。今也小官之俸不足供饔飧，偶受常例而輒以貪法罷之，是小官終不可設也。識體
-者欲廣其公而閉之私，而當事者又計其私，某常例、某從來也。夫寬其所應得而後罪其
-不義之取，與夫因有不義之取也遂儉於應得焉孰是？蓋倉官月糧一石而驛丞俸金歲七兩
-云。
-　　順心之言易入也，有害於治；逆耳之言裨治也，不可於人。可恨也！夫惟聖君以逆
-耳者順於心，故天下治。
-　　使馬者知地險，操舟者觀水勢，馭天下者察民情，此安危之機也。
-　　宇內有三權：「天之權曰禍福，人君之權曰刑賞，天下之權曰褒貶。」禍福不爽，
-曰天道之清平，有不盡然者，奪於氣數。刑賞不忒，曰君道之清平，有不盡然者，限於
-見聞，蔽於喜怒。褒貶不誣，日人道之清平，有不盡然者，偏於愛憎，誤於聲響。褒貶
-者，天之所恃以為禍福者也，故曰：「天視自我民視，天聽自我民聽。」君之所恃以為
-刑賞者也，故曰：「好人之所惡，惡人之所好，是謂拂人之性。」褒貶不可以不慎也，
-是天道、君道之所用也。一有作好作惡，是謂天之罪人，君之戮民。
-　　而今當民窮財盡之時，動稱礦稅之害。以為事幹君父，諫之不行，總付無可奈何。
-吾且就吾輩安民節用以自便者言之。飲食入腹，三分銀用之不盡，而食前方丈，總屬暴
-殄，要他何用？僕隸二人，無三十里不肉食者，不程飯桌，要他何用？轎扛人夫，吏書
-馬匹，寬然有餘，而鼓吹旌旗，要他何用？下莞上簟，公座圍裙，盡章物采矣，而滿房
-鋪氈，要他何用？上司新到，須要參謁，而節壽之日，各州懸幣帛下程，充庭盈門，要
-他何用？前呼後擁，不減百人，巡捕聽事，不缺官吏，而司道府官交界送接，到處追隨
-，要他何用？隨巡司道，拜揖之外，張筵互款，期會不遑，而帶道文卷盡取抬隨，帶道
-書吏盡人跟隨，要他何用？官官如此，在在如此，民間節省，一歲盡多，此豈朝廷令之
-不得不如此邪？吾輩可以深省矣。
-　　酒之為害不可勝紀也，有天下者不知嚴酒禁，雖談教養，皆苟道耳。此可與留心治
-道者道。
-　　簿書所以防奸也，簿書愈多而奸愈黠，何也？千冊萬簿，何官經眼？不過為左右開
-打點之門，廣刁難之計，為下司增紙筆之孽，為百姓添需索之名。舉世昏迷，了不經意
-，以為當然，一細思之，可為大笑。有識者裁簿書十分之九而上下相安，弊端自清矣。
-　　養士用人，國家存亡第一緊事，而今只當故事。
-　　臣是皋、夔、稷、契，君自然是堯、舜，民自然是唐、虞。士君子當自責我是皋、
-夔、稷、契否？終日悠悠泄泄，只說吾君不堯、舜，弗俾厥後惟堯、舜，是誰之愧恥？
-吾輩高爵厚祿，寧不遑汗。
-　　惟有為上底難，今人都容易做。
-　　聽訟者要如天平，未稱物先須是對針，則稱物不爽。聽訟之時心不虛平，色態才有
-所著，中証便有趨向，況以辭示之意乎？當官先要慎此。
-　　天下之勢，頓可為也，漸不可為也。頓之來也驟，漸之來也遠。頓之著力在終，漸
-之著力在始。
-　　屋漏尚有十目十手，為人上者，大庭廣眾之中，萬手千目之地，譬之懸日月以示人
-，分毫掩護不得，如之何弗慎？
-　　事休問大家行不行，舊規有不有，只看義上協不協。勢不在我，而於義無害，且須
-勉從，若有害於義，即有主之者，吾不敢從也。
-　　有美意，必須有良法乃可行。有良法，又須有良吏乃能成。良吏者，本真實之心，
-有通變之才，厲明作之政者也。心真則為民懇至，終始如一；才通則因地宜民，不狃於
-法；明作則禁止令行，察奸釐弊，如是而民必受福。故天下好事，要做必須實做，虛者
-為之，則文具以擾人；不肖者為之，則濟私以害政。不如不做，無損無益。
-　　把天地間真實道理作虛套子幹，把世間虛套子作實事幹，吁！所從來久矣。非霹靂
-手段，變此錮習不得。
-　　自家官靠著別人做，只是不肯踏定腳跟挺身自拔，此縉紳第一恥事。若鐵錚錚底做
-將去，任他如何，亦有不顛躓僵僕時。縱教顛躓僵僕，也無可奈何，自是照管不得。
-　　作「焉能為有無」底人，以之居鄉，盡可容得。只是受一命之寄，便是曠一命之官
-；在一日之職，便是廢一日之業。況碌碌苟苟，久居高華。唐、虞、三代課官是如此否
-？今以其不貪酷也而容之，以其善夤緣也而進之，國一無所賴，民一無所裨，而俾之貪
-位竊祿，此人何足責？用人者無辭矣。
-　　近日居官，動說舊規，彼相沿以來，不便於己者悉去之，便於己者悉存之，如此，
-舊規百世不變。只將這念頭移在百姓身上，有利於民者悉修舉之，有害於民者悉掃除之
-，豈不是居官真正道理。噫！利於民生者皆不便於己，便於己者豈能不害於民？從古以
-來，民生不遂，事故日多，其由可知己。
-　　古人事業精專，志向果確，一到手便做，故孔子治魯三日而教化大行。今世居官，
-奔走奉承，簿書期會，不緊要底虛文，先佔了大半工夫，況平日又無修政立事之心、急
-君愛民之志，蹉跎因循，但以浮泛之精神了目前之俗事。即有志者，亦不過將正經職業
-帶修一二足矣。誰始此風？誰甚此風？誰當責任而不易此風？此三人之罪不止於罷黜矣
-。
-　　做上官底只是要尊重，迎送欲遠，稱呼欲尊，拜跪欲恭，供具欲麗，酒席欲豐，騶
-從欲都，伺候欲謹。行部所至，萬人負累，千家愁苦，即使於地方有益，蒼生所損已多
-。及問其職業，舉是譽文濫套，縱虎狼之吏胥騷擾傳郵，重瑣尾之文移督繩郡懸，括奇
-異之貨幣交結要津，習圓軟之容辭網羅聲譽。至生民疾苦，若聾瞽然。豈不驟貴躐遷，
-然而顯負君恩，陰觸天怒，吾黨恥之。
-　　士君子到一個地位，就理會一個地位底職分，無逆料時之久暫而苟且其行，無期必
-人之用否而感忽其心。入門就心安志定，為久遠之計。即使不久於此，而一日在官，一
-日盡職，豈容一日苟祿尸位哉！
-
-　　水以潤苗，水多則苗腐；膏以助焰，膏重則焰滅。為治一寬，非民之福也。故善人
-百年始可去殺。天有四時，不能去秋。
-　　古之為人上者，不虐人以示威，而道法自可畏也；不卑人以示尊，而德容自可敬也
-。脫勢分於堂階而居尊之休未嘗褻，見腹心於詞色而防檢之法未嘗疏。嗚呼！可想矣。
-　　為政以問察為第一要，此堯舜治天下之妙法也。今人塞耳閉目只憑獨斷，以寧錯勿
-問，恐蹈耳軟之病，大可笑。此不求本原耳。吾心果明，則擇眾論以取中，自無偏聽之
-失。心一愚暗，即詢岳牧芻蕘，尚不能自決，況獨斷乎？所謂獨斷者，先集謀之謂也。
-謀非集眾不精，斷非一己不決。
-　　治道只要有先王一點心，至於制度文為，不必一一復古。有好古者，將一切典章文
-物都要反太古之初，而先王精意全不理會，譬之刻木肖人，形貌絕似，無一些精神貫徹
-，依然是死底。故為政不能因民隨時，以寓潛移默化之機，輒紛紛更變，驚世駭俗，紹
-先復古，此天下之拙夫愚子也。意念雖佳，一無可取。
-
-　　賞及淫人則善者不以賞為榮，罰及善人則惡者不以罰為辱。是故君子不輕施恩，施
-恩則勸；不輕動罰，動罰則懲。
-　　在上者當慎無名之賞。眾皆藉口以希恩，歲遂相沿為故事。故君子惡苟恩。苟恩之
-人，顧一時，巿小惠，徇無厭者之情，而財用之賊也。
-　　要知用刑本意原為弼教，苟寬能教，更是聖德感人，更見妙手作用。若只恃雷霆之
-威，霜雪之法，民知畏而不知愧，待無可畏時，依舊為惡，何能成化？故畏之不如愧之
-，忿之不如訓之，遠之不如感之。
-　　法者，一也。法曹者，執此一也。以貧富貴賤二之，則非法矣。或曰：「親貴難與
-疏賤同法。」曰：「是也，八議已別之矣。」八議之所不別而亦二之，將何說之辭？夫
-執天子之法而顧忌己之爵祿，以徇高明而虐煢獨，如國法天道何？裂綱壞紀，摧善長惡
-，國必病焉。
-　　治人治法不可相無，聖人竭耳目力，此治人也。繼之以規矩準繩、六律五音，此治
-法也。說者猶曰有治人無治法。然則治人無矣，治法可盡廢乎？夫以藏在盟府之空言，
-猶足以伏六百年後之霸主，而況法乎？故治天下者以治人立治法，法無不善；留治法以
-待治人，法無不行。
-　　君子有君子之長，小人有小人之長。用君子易，用小人難，惟聖人能用小人。用君
-子在當其才，用小人在制其毒。
-　　只用人得其當，委任而責成之，不患天下不治。二帝三王急親賢，作當務之急第一
-事。
-　　古之聖王不盡人之情，故下之忠愛嘗有餘。後世不然，平日君臣相與僅足以存體面
-而無可感之恩，甚或拂其心而壞待逞之志，至其趨大事、犯大難，皆出於分之不得已。
-以不得已之心供所不欲之役，雖臨時固結，猶死不親，而上之誅求責又復太過，故其空
-名積勢不足以鎮服人心而庇其身國。嗚呼！民無自然之感而徒迫於不得不然之勢，君無
-油然之愛而徒劫之不敢不然之威，殆哉！
-　　古之學者，窮居而籌兼善之略。今也同為僚殠，後進不敢問先達之事，右署不敢知
-左署之職。在我避侵職之嫌，在彼生望蜀之議。是以未至其地也不敢圖，既至其地也不
-及習，急遽苟且，了目前之套數而已，安得樹可久之功，張無前之業哉？
-　　百姓寧賤售而與民為巿，不貴值而與官為巿。故物滿於廛，貨充於肆，官求之則不
-得，益價而求之亦不得。有一官府欲採繒，知巿直，密使吏增直，得之。既行，而商知
-其官買也，追之，已入公門矣。是商也，明日逃去。人謂商曰：「此公物不虧值。」曰
-：「吾非為此公。今日得我一繒，他日責我無極。人人未必皆此公，後日未必猶此公也
-。減直何害？甚者經年不予直；遲直何害？甚者竟不予直；一物無直何害？甚者數取皆
-無直。吏卒因而附取亦無直。無直何害？甚者無是貨也而責之有，捶楚亂加。為之遍索
-而不得，為之遠求而難待。誅求者非一官，逼取者非一貨，公差之需索，公門之侵扣，
-價銀之低假又不暇論心。嗟夫！寧逢盜劫，無逢官賒。盜劫猶申冤於官，官賒則無所赴
-訴矣。」予聞之，謂僚友曰：「民不我信，非民之罪也。彼固求貨之出手耳，何擇於官
-民？又何親於民而何仇於官哉？無輕取，無多取，與民同直而即日面給焉，年年如是，
-人人如是，又禁府州懸之不如是者，百姓獨非人哉？無彼尤也。」
-　　公正二字是撐持世界底，沒了這二字，便塌了天。
-
-　　人臣有二懲，曰私，曰偽。私則利己徇人而公法壞，偽則彌縫粉飾而實政墮。公法
-壞則豪強得以橫恣，貧賤無所控訴而愁怨多。實政墮則視國民不啻越秦，逐勢利如同商
-賈而身家肥。此亂亡之漸也，何可不懲。
-　　「與上大夫言，誾誾如也」朱注云：「誾誾，和悅而諍。」只一諍字，十分扶持世
-道。近世見上大夫，少不了和悅，只欠一諍字。
-　　古今觀人，離不了好惡，武叔毀仲尼，伯寮訴子路，臧倉沮孟子，從來聖賢未有不
-遭謗毀者，故曰：「其不善者惡之，不為不善所惡，不成君子。後世執進退之柄者只在
-鄉人皆好之上取人，千人之譽不足以敵一人之毀，更不察這毀言從何處來，更不察這毀
-人者是小人是君子。是以正士傷心，端人喪氣。一入仕途，只在彌縫塗抹上做工夫，更
-不敢得罪一人。嗚呼！端人正士叛中行而惟鄉愿是師，皆由是非失真、進退失當者驅之
-也。
-　　圖大於細，不勞力，不費財，不動聲色，暗收百倍之功。用柔為剛，愈涵容；愈愧
-屈，愈契腹心，化作兩人之美。
-　　銓署楹帖：「直者無庸我力，枉者我無庸力，何敢貪天之功；恩則以奸為賢，怨則
-以賢為奸，豈能逃鬼之責。」
-　　公署楹帖：「只一個志誠，任從你千欺百罔；有三尺明法，休犯他十惡五刑。」
-　　公署楹帖二：「皇天下鑒此心，敢不光明正直；赤子來游吾腹，願言豈弟慈祥。」
-　　按察司署楹帖：「光天化日之下，四方陰邪休行；大冬嚴雪之中，一點陽春自在。」
-　　發示驛遞：「痛蒼赤食草飯沙，安忍吸民膏以縱口腹；睹閭閻賣妻鬻子，豈容窮物
-力而擁車徒。」
-　　發示州懸：「憫其飢，念其寒，誰不可憐子女，肯推毫髮與蒼生，不枉為民父母；
-受若直，怠若事，誰能放過僕童，況糜膏脂無治狀，也應念及兒孫。」
-　　襄垣懸署楹帖：「百姓有知，願教竹頭生筍；三堂無事，任從門外張羅。」
-　　莫以勤勞怨辛苦，朝庭覓你做奶母。
-　　城門四聯：「東延和門：『青帝布陽春，鬱鬱蔥蔥生氣溢沙隨之外；黃堂流德澤，
-融融液液太和在梁苑之西。』南文明門：『萬丈文光北射斗牛通魁柄；三星物採東聯箕
-尾上台躔。』西寶成門：『萬寶告成，耕夫織婦白叟黃童年年歌大有；五徵來備，東舍
-西鄰南村北疃處處樂同人。』北鍾祥門：『洪濤來萬里恩波，遠抱崇墉浮瑞靄；玄女注
-千年聖水，潛滋環海護生靈。』」
-
-
-
-
-
-
-人情
-
-
-　　無所樂有所苦，即父子不相保也，而況民乎？有所樂無所苦，即戎狄且相親也，而
-況民乎？
-　　世之人，聞人過失，便喜談而樂道之；見人規已之過，既掩護之，又痛疾之；聞人
-稱譽，便欣喜而誇張之；見人稱人之善，既蓋藏之，又搜索之。試思這個念頭是君子乎
-？是小人乎？
-　　乍見之患，愚者所驚；漸至之殃，智者所忽也。以愚者而當智者之所忽，可畏哉！
-　　論人情只往薄處求，說人心只往惡邊想，此是私而刻底念頭，自家便是個小人。古
-人貴人每於有過中求無過，此是長厚心、盛德事，學者熟思，自有滋味。
-　　人說己善則喜，人說己過則怒。自家善惡自家真知，待禍
-　　敗時欺人不得。人說體實則喜，人說體虛則怒，自家病痛自家獨覺，到死亡時欺人
-不得。
-　　一巨卿還家，門戶不如做官時，悄然不樂曰：「世態炎涼如是，人何以堪？」余曰
-：「君自炎涼，非獨世態之過也。平常淡素是我本來事，熱鬧紛華是我倘來事。君留戀
-富貴以為當然，厭惡貧賤以為遭際，何炎涼如之，而暇歎世情哉？」
-　　迷莫迷於明知，愚莫愚於用智，辱莫辱於求榮，小莫小於好大。
-　　兩人相非，不破家不止，只回頭任自家一句錯，便是無邊受用；兩人自是，不反面
-稽唇不止，只溫語稱人一句好，便是無限歡欣。
-　　將好名兒都收在自家身上，將惡名幾都推在別人身上，此天下通情。不知此兩個念
-頭都攬個惡名在身，不如讓善引過。
-　　露己之美者惡，分入之美者尤惡，而況專人之美，竊人之美乎？吾黨戒之。
-　　守義禮者，今人以為倨傲；工諛佞者，今人以為謙恭。舉世名公達宦自號儒流，亦
-迷亂相責而不悟，大可笑也。
-　　愛人以德而令人仇，人以德愛我而仇之，此二人者皆愚也。
-　　無可知處盡有可知之人而忽之，謂之瞽；可知處盡有不可知之人而忽之，亦謂之瞽。
-　　世間有三利衢壞人心術，有四要路壞人氣質，當此地而不壞者，可謂定守矣。君門
-，士大夫之利衢也。公門，吏胥之利衢也。市門，商賈之利衢也。翰林、吏部、台、省
-，四要路也。
-　　有道者處之，在在都是真我。
-　　朝廷法紀做不得人情，天下名分做不得人情，聖賢道理做不得人情，他人事做不得
-人情，我無力量做不得人情。以此五者徇人，皆安也。君子慎之。
-　　古人之相與也，明目張膽，推心置腔。其未言也，無先疑；其既言也，無後慮。今
-人之相與也，小心屏息，藏意飾容。其未言也，懷疑畏；其既言也，觸禍機。哀哉！安
-得心地光明之君子，而與之披情愫、論肝膈也？哀哉！彼亦示人以光明，而以機阱陷人
-也。
-　　古之君子，不以其所能者病人；今人卻以其所不能者病人。
-　　古人名望相近則相得，今人名望相近則相妒。
-　　福莫大於無禍，禍莫大於求福。
-　　言在行先，名在實先，食在事先，皆君子之所恥也。
-　　兩悔無不釋之怨，兩求無不合之交，兩怒無不成之禍。
-　　已無才而不讓能，甚則害之；己為惡而惡人之為善，甚則誣之；己貧賤而惡人之富
-貴，甚則傾之；此三妒者，人之大戮也。
-　　以患難時，心居安樂；以貧賤時，心居富貴；以屈局時，心居廣大，則無往而不泰
-然。以淵谷視康莊，以疾病視強健，以不測視無事，則無往而不安穩。
-　　不怕在朝市中無泉石心，只怕歸泉石時動朝市心。
-　　積威與積恩，二者皆禍也。積威之禍可救，積恩之禍難救。
-　　積威之後，寬一分則安，恩二分則悅；積恩之後，止而不加則以為薄，才減毫髮則
-以為怨。恩極則窮，窮則難繼；愛極則縱，縱則難堪。不可繼則不進，其勢必退。故威
-退為福，恩退為禍；恩進為福，威進為禍。聖人非靳恩也，懼禍也。濕薪之解也易，燥
-薪之束也難。聖人之靳恩也，其愛人無已之至情，調劑人情之微權也。
-　　人皆知少之為憂，而不知多之為憂也。惟智者憂多。
-　　眾惡之必察焉，眾好之必察焉，易；自惡之必察焉，自好之必察焉，難。
-　　有人情之識，有物理之識，有事體之識，有事勢之識，有事變之識，有精細之識，
-有闊大之識。此皆不可兼也，而事變之識為難，闊大之識為貴。
-　　聖人之道，本不拂人，然亦不求可人。人情原無限量，務可人不惟不是，亦自不能
-。故君子只務可理。
-　　施人者雖無已，而我常慎所求，是謂養施；報我者雖無已，而我常不敢當，是謂養
-報；此不盡人之情，而全交之道也。
-　　攻人者，有五分過惡，只攻他三四分，不惟彼有餘懼，而亦傾心引服，足以塞其辯
-口。攻到五分，已傷渾厚，而我無救性矣。若更多一分，是貽之以自解之資，彼據其一
-而得五，我貪其一而失五矣。此言責家之大戒也。
-　　見利向前，見害退後，同功專美於已，同過委罪於人，此小人恒態，而丈夫之恥行
-也。
-　　任彼薄惡，而吾以厚道敦之，則薄惡者必愧感，而情好愈篤。若因其薄惡也，而亦
-以薄惡報之，則彼我同非，特分先後耳，畢竟何時解釋？此庸人之行，而君子不由也。
-　　恕人有六：或彼識見有不到處，或彼聽聞有未真處，或彼力量有不及處，或彼心事
-有所苦處，或彼精神有所忽處，或彼微意有所在處。先此六恕而命之不從，教之不改，
-然後可罪也已。是以君子教人而後責人，體人而後怒人。
-　　直友難得，而吾又拒以諱過之聲色；佞人不少，而吾又接以喜諛之意態。嗚呼！欲
-不日入於惡也難矣。
-　　笞、杖、徒、流、死，此五者小人之律今也；禮、義、廉、恥，此四者君子之律令
-也。小人犯津令刑於有司，君子犯律令刑於公論。雖然，刑罰濫及，小人不懼，何也？
-非至當之刑也；毀謗交攻，君子不懼，何也？非至公之論也。
-　　情不足而文之以言，其言不可親也；誠不足而文之以貌，其貌不足信也。是以天下
-之事貴真，真不容掩，而見之言貌，其可親可信也夫！
-　　勢、利、術、言，此四者公道之敵也。炙手可熱則公道為屈，賄賂潛通則公道為屈
-，智巧陰投則公道為屈，毀譽肆行則公道為屈。世之冀幸受誣者，不啻十五也，可慨夫！
-　　聖人處世只於人情上做工夫，其於人情又只於未言之先、不言之表上做工夫。
-　　美生愛，愛生狎，狎生玩，玩生驕，驕生悍，悍生死。
-　　禮是聖人制底，情不是聖人制底。聖人緣情而生禮，君子見禮而得情。眾人以禮視
-禮，而不知其情，由是禮為天下虛文，而崇真者思棄之矣。
-　　人到無所顧惜時，君父之尊不能使之嚴，鼎鑊之威不能使之懼，千言萬語不能使之
-喻，雖聖人亦無如之何也已。聖人知其然也，每養其體面，體其情私，而不使至於無所
-顧惜。
-　　稱人以顏子，無不悅者，忘其貧賤而夭；稱人以桀、紂、盜跖，無不怒者，忘其富
-貴而壽。好善惡惡之同然如此，而作人卻與桀、紂、盜跖同歸，何惡其名而好其實耶？
-　　今人骨肉之好不終，只為看得爾我二字太分曉。
-　　聖人制禮本以體人情，非以拂之也。聖人之心非不因人情之所便而各順之，然順一
-時便一人，而後天下之大不順便者因之矣。故聖人不敢恤小便拂大順，徇一時弊萬世，
-其拂人情者，乃所以宜人情也。
-　　好人之善，惡人之惡，不難於過甚。只是好己之善，惡己之惡，便不如此痛切。
-　　誠則無心，無心則無跡，無跡則人不疑，即疑，久將自消。
-　　我一著意，自然著跡，著跡則兩相疑，兩相疑則似者皆真，故著意之害大。三五歲
-之男女終日談笑於市，男女不相嫌，見者亦無疑於男女，兩誠故也。繼母之慈，嫡妻之
-惠，不能脫然自忘，人未必脫然相信，則著意之故耳。
-　　一人運一甓，其行疾，一人運三甓，其行遲，又二人共輿十甓，其行又遲，比暮而
-較之，此四人者其數均。天下之事苟從其所便，而足以濟事，不必律之使一也，一則人
-情必有所苦。
-　　先王不苦人所便以就吾之一而又病於事。
-　　人之情，有言然而意未必然，有事然而意未必然者，非勉強於事勢，則束縛於體面
-。善體人者要在識其難言之情，而不使其為言與事所苦。此聖人之所以感人心，而人樂
-為之死也。
-　　人情愈體悉愈有趣味，物理愈玩索愈有入頭。
-　　不怕多感，只怕愛感。世之逐逐戀戀，皆愛感者也。
-
-
-　　人情之險也，極矣。一令貪，上官欲論之而事泄，彼陽以他事得罪，上官避嫌，遂
-不敢論，世謂之箝口計。
-　　「有二三道義之友，數日別便相思，以為世俗之念，一別便生親厚之情，一別便疏
-。」余曰：「君此語甚有趣向，與淫朋狎友滋味迥然不同，但真味未深耳。孔、孟、顏
-、思，我輩平生何嘗一接？只今誦讀體認間如朝夕同堂對語，如家人父子相依，何者？
-心交神契，千載一時，萬里一身也。久之，彼我且無，孰離孰合，孰親孰疏哉？若相與
-而善念生，相違而欲心長，即旦暮一生，濟得甚事？」
-　　受病於平日，而歸咎於一旦。發源於臟腑，而求效於皮毛。太倉之竭也，責窮於囤
-底。大廈之傾也，歸罪於一霖。
-　　世之人，聞稱人之善輒有妒心，聞稱人之惡輒有喜心，此天理忘而人欲肆者也。孔
-子所惡，惡稱人之惡；孔子所樂，樂道人之善。吾人豈可另有一副心腸。
-　　人欲之動，初念最熾，須要遲遲，就做便差了。天理之動，初念最勇，須要就做，
-遲遲便歇了。
-　　凡人為不善，其初皆不忍也，其後忍不忍半，其後忍之，其後安之，其後樂之。鳴
-呼！至於樂為不善而後良心死矣。
-　　聞人之善而掩覆之，或文致以誣其心；聞人之過而播揚之，或枝葉以多其罪。此皆
-得罪於鬼神者也，吾黨戒之。
-　　恕之一字，是個好道理，看那惟心者是甚麼念頭。好色者恕人之淫，好貨者恕人之
-貪，好飲者恕人之醉，好安逸者恕人之惰慢，未嘗不以己度人，未嘗不視人猶己，而道
-之賊也。故行恕者，不可以不審也。
-　　心怕二三，情怕一。
-　　別個短長作己事，自家痛癢問他人。
-　　休將煩惱求恩愛，不得恩愛將煩惱。
-　　利算無餘處，禍防不意中。
-
-
-
-
-物理
-
-
-　　鴟鴉，其本聲也如鵲鳩然，第其聲可憎，聞者以為不祥，每彈殺之。夫物之飛鳴，何
-嘗擇地哉？集屋鳴屋，集樹鳴樹。
-　　彼鳴屋者，主人疑之矣，不知其鳴於野樹，主何人不祥也？至於犬人行、鼠人言、豕
-人立，真大異事，然不祥在物，無與於人。即使於人為凶，然亦不過感戾氣而呈兆，在物
-亦莫知所以然耳。蓋鬼神愛人，每示人以趨避之幾，人能恐懼修省，則可轉禍為福。如景
-公之退孛星，高宗之枯桑穀，妖不勝德，理氣必然。然則妖異之呈兆，即蓍龜之告繇，是
-吾師也，何深惡而痛去之哉？
-　　春夏秋冬不是四個天，東西南北不是四個地，溫涼寒熱不是四個氣，喜怒哀樂不是四
-個面。
-　　臨池者不必仰觀，而日月星辰可知也；閉戶者不必遊覽，而陰睛寒暑可知也。
-　　有國家者要知真正祥瑞，真正祥瑞者，致祥瑞之根本也。
-　　民安物阜，四海清寧，和氣薰蒸，而樣瑞生焉，此至治之符也。
-　　至治已成，而應征乃見者也，即無祥瑞，何害其為至治哉？若世亂而祥瑞生焉，則祥
-瑞乃災異耳。是故災祥無定名，治亂有定象。庭生桑穀未必為妖，殿生玉芝未必為瑞。是
-故聖君不懼災異，不喜祥瑞，盡吾自修之道而已。不然，豈後世祥瑞之主出二帝三王上哉
-？
-　　先得天氣而生者，本上而末下人是已。先得地氣而生者，本下而末上草木是已。得氣
-中之質者；飛。得質中之氣者，走。
-　　得渾淪磅礡之氣質者，為山河，為巨體之物。得游散纖細之氣質者，為蠛蠓蚊蟻蠢動
-之蟲，為苔蘚萍蓬藂蔇之草。
-　　入釘惟恐其不堅，拔釘推恐其不出。下鎖惟恐其不嚴，開鎖惟恐其不易。
-　　以恒常度氣數，以知識定窈冥，皆造化之所笑者也。造化亦定不得，造化尚聽命於自
-然，而況為造化所造化者乎？堪輿星卜諸書，皆屢中者也。
-　　古今載藉，莫濫於今日。括之有九：有全書，有要書，有贅書，有經世之書，有益人
-之書，有無用之書，有病道之書，有雜道之書，有敗俗之書。《十三經注疏》，《二十一
-史》，此謂全書。
-　　或撮其要領，或類其雋腴，如《四書》、《六經集注》、《通簽》之類，此謂要書。
-當時務，中機宜，用之而物阜民安，功成事濟，此謂經世之書。言雖近理；而掇拾陳言，
-不足以羽翼經史，是謂贅書。醫技農卜，養生防患，勸善懲惡，是謂益人之書。無關於天
-下國家，無益於身心性命，語不根心，言皆應世，而妨當世之務，是謂無用之書。又不如
-贅佛老莊列，是謂病道之書。迂儒腐說，賢智偏言，是謂雜道之書，淫邪幻誕，機械誇張
-，是謂敗俗之書。有世道之責者，不毅然沙汰而芟鋤之，其為世教人心之害也不小。
-　　火不自知其熱，水不自知其寒，鵬不自知其大，蟻不自知其小，相忘於所生也。
-　　聲無形色，寄之於器；火無體質，寄之於薪；色無著落，寄之草木。故五行惟火無體
-，而用不窮。
-　　大風無聲，湍水無浪，烈火無燄，萬物無影。
-　　萬物得氣之先
-　　無功而食，雀鼠是已；肆害而食，虎狼是已。士大夫可圖諸座右。
-　　薰香蕕臭，蕕固不可有，薰也是多了的，不如無臭。無臭者，臭之母也。
-　　聖人因蛛而知網罟，蛛非學聖人而布絲也；因蠅而悟作繩，蠅非學聖人而交足也。物
-者，天能；聖人者，人能。
-　　執火不焦指，輪圓不及下者，速也。
-　　柳炭鬆弱無力，見火即盡。榆炭稍強，火稍烈。桑炭強，山栗炭更強。皆逼人而耐久
-。木死成灰，其性自在。
-　　莫向落花長太息，世間何物無終盡。
-
-
-
-
-
-廣喻
-
-
-
-　　劍長三尺，用在一絲之銛刃；筆長三寸，用在一端之銳毫，其餘皆無用之羨物也。雖
-然，使劍與筆但有其銛者銳者焉，則其用不可施。則知無用者，有用之資；有用者，無用
-之施。易牙不能無爨子，歐冶不能無砧手，工輸不能無鑽廝。苟不能無，則與有用者等也
-，若之何而可以相病也？
-　　坐井者不可與言一度之天，出而四顧，則始覺其大矣。雖然，雲木礙眼，所見猶拘也
-，登泰山之巔，則視天莫知其際矣。
-　　雖然，不如身游八極之表，心通九垓之外。天在胸中如太倉一粒，然後可以語通達之
-識。
-　　著味非至味也，故玄酒為五味先；著色非至色也，故太素為五色主；著象非至象也，
-故無象為萬象母；著力非至力也，故大塊載萬物而不負；著情非至情也，故太清生萬物而
-不親；著心非至心也，故聖人應萬事而不有。
-　　凡病人面紅如赭、發潤如油者不治，蓋萃一身之元氣血脈盡於面目之上也。嗚呼！人
-君富四海，貧可以懼矣。
-　　有國家者，厚下恤民，非獨為民也。譬之於墉，廣其下，削其上，乃可固也；譬之於
-木，溉其本，剔其末，乃可茂也。
-　　夫墉未有上豐下狹而不傾，木未有露本繁末而不斃者。可畏也夫！
-　　天下之勢，積漸成之也。無忽一毫輿羽拆軸者，積也。無忽寒露尋至堅冰者，漸也。
-自古天下國家、身之敗亡，不出積漸二字。積之微漸之始，可為寒心哉！
-　　火之大灼者無煙，水之順流者無聲，人之情平者無語。
-　　風之初發於谷也，拔木走石，漸遠而減，又遠而弱，又遠而微，又遠而盡。其勢然也
-。使風出谷也，僅能振葉拂毛，即咫尺不能推行矣。京師號令之首也，紀法不可以不振也。
-　　背上有物，反顧千萬轉而不可見也，遂謂人言不可信，若必待自見，則無見時矣。
-　　人有畏更衣之寒而忍一歲之凍，懼一針之痛而甘必死之瘍者。一勞永逸，可與有識者
-道。齒之密比，不嫌於相逼，固有故也。落而補之，則覺有物矣。夫惟固有者多不得，少
-不得。
-　　嬰珠珮玉，服錦曳羅，而餓死於室中，不如丐人持一升之粟。是以明王貴用物，而誅
-尚無用者。
-　　元氣已虛，而血肉未潰，飲食起居不甚覺也，一旦外邪襲之，溘然死矣。不怕千日怕
-一旦，一旦者，千日之積也。千日可為，一旦不可為矣。故慎於千日，正以防其一旦也。
-有天下國家者，可惕然懼矣。
-　　以果下車駕騏驥，以盆池水養蛟龍，以小廉細謹繩英雄豪傑，善官人者笑之。
-　　水千流萬派，始於一源，木千枝萬葉，出於一本；人千酬萬應，發於一心；身千病萬
-症，根於一髒。眩於千萬，舉世之大迷也；直指原頭，智者之獨見也。故病治一，而千萬
-皆除；政理一，而千萬皆舉矣。
-　　水簽、燈燭、日、月、眼，世間惟此五照，宜謂五明。
-　　毫釐之輕，斤鈞之所藉以為重者也；合勺之微，斛鬥之所賴以為多者也；分寸之短，
-丈尺之所需以為長者也。
-　　人中黃之穢，天靈蓋之凶，人人畏惡之矣。臥病於牀，命在須臾，片腦蘇合，玉屑金
-泊，固有視為無用之物，而唯彼之亟亟者，時有所需也。膠柱用人於緩急之際，良可悲矣！
-　　長戟利於錐，而戟不可以為錐；猛虎勇於狸，而虎不可以為狸。用小者無取於大，猶
-用大者無取於小，二者不可以相誚也。
-　　夭喬之物利於水澤，土燥烈，天暵乾，固枯稿矣。然沃以鹵水則黃，沃以油漿則病，
-沃以沸湯則死，惟井水則生，又不如河水之王。雖然，倘浸漬汪洋，泥淖經月，惟水物則
-生，其他未有不死者。用思顧不難哉！
-　　鑒不能自照，尺不能自度，權不能自稱，圍於物也。聖人則自照、自度、自稱，成其
-為鑒、為尺、為權，而後能妍媸長短，輕重天下。
-　　冰凌燒不熟，石砂蒸不黏。
-　　火性空，故以蘭麝投之則香，以毛骨投之則臭；水性空，故烹茶清苦，煮肉則腥羶，
-無我故也。無我故能物物，若自家有一種氣味雜於其間，則物矣。物與物交，兩無賓主，
-同歸於雜。如煮肉於茶，投毛骨於蘭麝，是謂渾淆駁雜。物且不物，況語道乎？
-　　大車滿載，蚊蚋千萬集焉，其去其來，無加於重輕也。
-　　蒼松古柏與夭桃穠李爭妍，重較鸞鑣與衝車獵馬爭步，豈宜不能？亦可醜矣。
-　　射之不中也，弓無罪，矢無罪，鵠無罪；書之弗工也，筆無罪，墨無罪，紙無罪。
-　　鎖鑰各有合，合則開，不合則不開。亦有合而不開者，必有所以合而不開之故也。亦
-有終日開，偶然抵死不開，必有所以偶然不開之故也。萬事必有故，應萬事必求其故。
-　　窗間一紙，能障拔木之風；胸前一瓠，不溺拍天之浪。其所托者然也。
-　　人有饋一木者，家僮曰：「留以為梁。」余曰：「木小不堪也。」
-　　僮曰：「留以為棟。」余曰：「木大不宜也。」僮笑曰：「木一也，忽病其大，又病
-其小。」余曰：「小子聽之，物各有宜用也，言各有攸當也，豈惟木哉？」他日為餘生炭
-滿爐烘人。余曰：「太多矣。」乃盡溫之，留星星三二點，欲明欲滅。余曰：「太少矣。
-」僮怨曰：「火一也，既嫌其多，又嫌其少。」余曰：「小子聽之，情各有所適也，事各
-有所量也，豈惟火哉？」
-　　海投以污穢，投以瓦礫，無所不容；取其寶藏，取其生育，無所不與。廣博之量足以
-納，觸忤而不驚；富有之積足以供，採取而不竭。聖人者，萬物之海也。
-　　鏡空而無我相，故照物不爽分毫。若有一絲痕，照人面上便有一絲；若有一點瘢，照
-人面上便有一點，差不在人面也。
-　　心體不虛，而應物亦然。故禪家嘗教人空諸有，而吾儒惟有喜怒哀樂未發之中，故有
-發而中節之和。
-　　人未有洗面而不閉目，撮紅而不慮手者，此猶愛小體也。
-　　人未有過簷滴而不疾走，踐泥塗而不揭足者，此直愛衣履耳。
-　　七尺之軀顧不如一履哉？乃沉之滔天情慾之海，拼於焚林暴怒之場，粉身碎體甘心焉
-而不顧，悲夫！
-　　惡言如鴟梟之噭，閒言如燕雀之喧，正言如狻猊之吼，仁言如鸞鳳之鳴。以此思之，
-言可弗慎歟？
-　　左手畫圓，右手畫方，是可能也。鼻左受香，右受惡；耳左聽絲，右聽竹；目左視東
-，右視西，是不可能也。二體且難分，況一念而可雜乎？
-　　擲發於地，雖烏獲不能使有聲；投核於石，雖童子不能使無聲。人豈能使我輕重哉？
-自輕重耳。
-　　澤潞之役，餘與僚友並肩輿。日莫矣，僚友問輿夫：「去路幾何？」曰：「五十里。
-」僚友憮然。少間又問：「尚有幾何？」曰：「四十五里。」如此者數問，而聲愈厲，意
-迫切不可言，甚者怒罵。
-　　余少憩車中，既下車，戲之曰：「君費力如許，到來與我一般。」
-　　僚友笑曰：「餘口津且竭矣，而咽若火，始信兄討得便宜多也。」
-　　問卜築者亦然。天下豈有兒不下迫而強自催生之理乎？大抵皆揠苗之見也。
-　　進香叫佛某不禁，同僚非之。餘憮然曰：「王道荊榛而後蹊逕多。彼所為誠非善事，
-而心且福利之，為何可弗禁？所賴者緣是以自戒，而不敢為惡也。故歲饑不禁草木之實，
-待年豐彼自不食矣。善乎孟子之言曰『君子反經而已矣』。『而已矣』三字，旨哉妙哉！
-涵蓄多少趣味！」
-　　日食膾炙者，日見其美，若不可一日無。素食三月，聞肉味只覺其腥矣。今與膾炙人
-言腥，豈不訝哉？
-　　鉤吻、砒霜也，都治病，看是甚麼醫手。
-　　家家有路到長安，莫辨東西與南北。
-　　一薪無燄，而百枝之束燎原；一泉無渠，而萬泉之會溢海。
-　　鐘一鳴，而萬戶千門有耳者莫不入其聲，而聲非不足。使鐘鳴於百里無人之野，無一
-人聞之，而聲非有餘。鐘非人人分送其聲而使之入，人人非取足於鐘之聲以盈吾耳，此一
-貫之說也。
-　　未有有其心而無其政，如漬種之必苗，爇蘭之必香；未有無其心而有其政者，如塑人
-之無語，畫鳥之不飛。
-　　某嘗與友人論一事，友人曰：「我胸中自有權量。」某曰：「雖婦人孺子未嘗不權量
-，只怕他大鬥小秤。」
-　　齁鼾驚鄰而睡者不聞，垢污滿背而負者不見。
-　　愛虺蝮而撫摩之，鮮不受其毒矣；惡虎豹而搏之，鮮不受其噬矣。處小人在不遠不近
-之間。
-　　玄奇之疾，醫以平易。英發之疾，醫以深沉；闊大之疾，醫以充實。
-　　不遠之復，不若未行之審也。
-　　千金之子非一日而貧也。日朘月削，損於平日而貧於一旦，不咎其積，而咎其一旦，
-愚也。是故君子重小損，矜細行，防微敝。
-　　上等手段用賊，其次拿賊，其次躲著賊走。
-　　曳新屨者，行必擇地。苟擇地而行，則屨可以常新矣。
-　　被桐以絲，其聲兩相借也。道不孤成，功不獨立。
-　　坐對明燈，不可以見暗，而暗中人見對燈者甚真。是故君子貴處幽。
-　　無涵養之功，一開口動身便露出本象，說不得你有灼見真知；無保養之實，遇外感內
-傷依舊是病人，說不得你有真傳口授。
-　　磨墨得省身克已之法，膏筆得用人處事之法，寫字得經世宰物之法。
-　　不知天地觀四時，不知四時觀萬物。四時分成是四截，總是一氣呼吸，譬如釜水寒溫
-熱涼，隨火之有無而變，不可謂之四水。萬物分來是萬種，總來一氣薰陶，譬如一樹花，
-大小後先，隨氣之完欠而成，不可謂之殊花。
-　　陽主動，動生燥，有得於陽，則袒裼可以臥冰雪，陰主靜，靜生寒，有得於靜，則盛
-暑可以衣裘褐。君子有得於道焉，往如不裕如哉？外若可撓，必內無所得者也。
-　　或問：「士希賢，賢希聖，聖希天，何如？」曰：「體味之不免有病。士賢聖皆志於
-天，而分量有大小，造詣有淺深者也。譬之適長安者，皆志於長安，其行有疾遲，有止不
-止耳。若曰跬步者希百里，百里者希千里，則非也。故造道之等，必由賢而後能聖，志之
-所希，則合下便欲與聖人一般。」
-　　言教不如身教之行也，事化不如意化之妙也。事化信，信則不勞而教成；意化神，神
-則不知而俗變。螟蛉語生，言化也。
-　　鳥孚生，氣化也。鱉思生，神化也。
-　　天道漸則生，躐則殺。陰陽之氣皆以漸，故萬物長養而百化昌遂。冬燠則生氣散，夏
-寒則生氣收，皆躐也。故聖人舉事，不駭人聽聞。
-　　只一條線，把緊要機括提掇得醒，滿眼景物都生色，到處鬼神都響應。
-　　一法立而一弊生，誠是，然因弊生而不立法，未見其為是也。夫立法以禁弊，猶為防
-以止水也，堤薄土疏而乘隙決潰誠有之矣，未有因決而廢防者。無弊之法，雖堯、舜不能
-。生弊之法亦立法者之拙也。故聖人不苟立法，不立一事之法，不為一切之法，不懲小弊
-而廢良法，不為一對之弊而廢可久之法。
-　　廟堂之上最要蕩蕩平平，寧留有餘不盡之意，無為一著快心之事。或者不然予言，予
-曰：「君見懸墜乎？懸墜者，以一線繫重物下垂，往來不定者也。當兩壁之間，人以一手
-撼之，撞於東壁重則反於西壁亦重，無撞而不反之理，無撞重而反輕之理，待其定也，中
-懸而止。君快於東壁之一撞，而不慮西壁之一反乎？國家以無事無福，無心處事，當可而
-止，則無事矣。
-　　地以一氣噓萬物，而使之生，而物之受其氣者，早暮不同，則物之性殊也，氣無早暮
-，夭喬不同，物之體殊也，氣無天喬，甘苦不同，物之味殊也，氣無甘苦，紅白不同，物
-之色殊也，氣無紅白，榮悴不同，物之稟遇殊也，氣無榮悴。盡吾發育之力，滿物各足之
-分量；順吾生植之道，聽其取足之多寡，如此而已。聖人之治天下也亦然。
-　　口塞而鼻氣盛，鼻塞而口氣盛，鼻口俱塞，脹悶而死。治河者不可不知也。故欲其力
-大而勢急，則塞其旁流，欲其力微而勢殺也，則多其支派，欲其蓄積而有用也，則節其急
-流。治天下之於民情也亦然。
-　　木鐘撞之也有木聲，土鼓擊之也有土響，未有感而不應者也，如何只是怨尤？或曰：
-「亦有感而不應者。」曰：「以發擊鼓，以羽撞鐘，何應之有？」
-　　四時之氣，先感萬物，而萬物應。所以應者何也？天地萬物一氣也。故春感而糞壤氣
-升，雨感而礎石先潤，磁石動而針轉，陽燧映而火生，況有知乎？格天動物，只是這個道
-理。
-　　積衰之難振也，如痿人之不能起。然若久痿，須補養之，使之漸起，若新痿，須針砭
-之，使之驟起。
-　　器械與其備二之不精，不如精其一之為約。二而精之，萬全之慮也。
-　　我之子我憐之，鄰人之子鄰人憐之，非我非鄰人之子，而轉相鬻育，則不死為恩矣。
-是故公衙不如私。舍之堅，驛馬不如家騎之肥，不以我有視之也。苟擴其無我之心，則垂
-永逸者不憚。今日之一勞，惟民財與力之可惜耳，奚必我居也？懷一體者，當使芻牧之常
-足，惟造物生命之可憫耳，奚必我乘也？嗚呼！天下之有我久矣，不獨此一二事也。學者
-須要打破這藩籬，才成大世界。
-　　膾炙之處，蠅飛滿幾，而太羹玄酒不至。膾炙日增，而欲蠅之集太羹玄酒，雖驅之不
-至也。膾炙徹而蠅不得不趨於太羹玄酒矣。是故返樸還淳，莫如崇儉而禁其可欲。
-　　駝負百鈞，蟻負一粒，各盡其力也，象飲數石，鼷飲一勺，各充其量也。君子之用人
-，不必其效之同，各盡所長而已。
-　　古人云：「聲色之於以化民，末也。」這個末，好容易底。近世聲色不行，動大聲色
-，大聲色不行，動大刑罰，大刑罰才濟得一半事，化不化全不暇理會。常言三代之民與禮
-教習，若有姦宄然後麗刑，如腹與菽粟，偶一失調，始用藥餌。後世之民與刑罰習，若德
-化不由，日積月累，如孔子之三年，王者之必世，驟使欣然向道，萬萬不能。譬之剛腸硬
-腹之人，服大承氣湯三五劑始覺，而卻以四物，君子補之，非不養人，殊與疾悖，而反生
-他症矣。卻要在刑政中兼德禮，則德禮可行，所謂兼攻兼補，以攻為補，先攻後補，有宜
-攻有宜補，惟在劑量。民情不拂不縱始得，噫！可與良醫道。
-　　得良醫而撓之，與委庸醫而聽之，其失均。
-　　以莫耶授嬰兒而使之御虜，以繁弱授矇瞍而使之中的，其不勝任，授者之罪也。
-　　道途不治，不責婦人，中饋不治，不責僕夫。各有所官也。
-　　齊有南北官道洿下者裡餘，雨多行潦，行者不便則傍西踏人田行，行數日而成路。田
-家苦之，斷以橫牆，十步一堵，堵數十焉，行者避牆，更西踏田愈廣，數日又成路。田家
-無計，乃蹲田邊且罵且泣，欲止欲訟，而無如多人何也。或告之曰：「牆之所斷，已成棄
-地矣。胡不僕牆而使之通，猶得省於牆之更西者乎？」予笑曰：「更有奇法，以築牆之土
-垫道，則道平矣。道平人皆由道，又不省於道之西者乎？安用牆為？」越數日道成，而道
-傍無一人跡矣。
-　　瓦礫在道，過者皆弗見也，裹之以紙，人必拾之矣，十襲而櫝之，人必盜之矣。故藏
-之，人思亡之，掩之，人思檢之；圍之，人思窺之；障之，人思望之，惟光明者不令人疑
-。故君子置其身於光天化日之下，丑好在我，我無飾也，愛憎在人，我無與也。
-　　穩卓腳者於平處著力，益甚其不平。不平有二：有兩聥不平，有一隅不平。於不少處
-著力，必致其欹斜。
-　　極必反，自然之勢也。故繩過絞則反轉，擲過急則反射。
-　　無知之物尚爾，勢使然也。
-　　是把鑰匙都開底鎖，只看投簧不投簧。
-　　蜀道不難，有難於蜀道者，只要在人得步。得步則蜀道若周行，失步則家庭皆蜀道矣。
-　　未有冥行疾走於斷崖絕壁之道而不傾跌者。
-　　張敬伯常經山險，謂余曰，「天下事常震於始，而安於習。
-　　某數過棧道，初不敢移足，今如履平地矣。余曰：「君始以為險，是不險；近以為不
-險，卻是險。」
-　　君子之教人也，能妙夫因材之術，不能變其各具之質。譬之地然，發育萬物者，其性
-也，草得之而為柔，木得之而為剛，不能使草之為木，而木之為草也。是故君子以人治人
-，不以我治人。
-　　無星之秤，公則公矣，而不分明，無權之秤，平則平矣，而不通變。君子不法焉。
-　　羊腸之隘，前車覆而後車協力，非以厚之也。前車當關，後車停駕，匪惟同緩急，亦
-且共利害。為人也，而實自為也。
-　　嗚呼！士君子共事而忘人之急，無乃所以自孤也夫？
-　　萬水自發源處入百川，容不得，入江、淮、河、漢，容不得，直流至海，則浩浩恢恢
-，不知江、淮幾時入，河、漢何處來，兼收而並容之矣。閒雜懊惱，無端謗讟，償來橫逆
-，加之眾人，不受，加之賢人，不受，加之聖人，則了不見其辭色，自有道以處之。故聖
-人者，疾垢之海也。
-　　兩物交必有聲，兩人交必有爭。有聲，兩剛之故也。兩柔則無聲，一柔一剛亦無聲矣
-。有爭，兩貪之故也。兩讓則無爭，一貪一讓亦無爭矣。抑有進焉，一柔可以馴剛，一讓
-可以化貪。
-　　石不入水者，堅也，磁不入水者，密也。人身內堅而外密；何外感之能入？物有一隙
-，水即入一隙，物虛一寸，水即入一寸。
-
-　　人有兄弟爭長者，其一生於甲子八月二十五日，其一生於乙丑二月初三日。一曰：「
-我多汝一歲。」一曰：「我多汝月與日。」
-　　不決，訟於有司，有司無以自斷，曰：「汝兩人者，均平不相兄，更不然，遞相兄可
-也。」（此河圖太衍對待流行之全數）
-　　撻人者梃也，而受撻者不怨梃，殺人者刃也，而受殺者不怨刃。
-　　人間等子多不准，自有准等兒，人又不識。我自是定等子底人，用底是時行天平法馬。
-　　頸檠一首，足荷七尺，終身由之而不覺其重，固有之也。
-　　使他人之首枕我肩，他人之身在我足，則不勝其重矣。
-　　不怕炊不熟，只愁斷了火。火不斷時，煉金煮砂可使為水作泥。而今冷灶清鍋，卻恁
-空忙作甚？
-　　王酒者，京師富店也。樹百尺之竿揭，金書之簾羅，玉相之器，繪五楹之室，出十石
-之壺，名其館曰「五美」，飲者爭趨之也。然而酒惡，明日酒惡之名遍都市。又明日，門
-外有張羅者。予歎曰：「嘻！王酒以五美之名而彰一惡之實，自取窮也。夫京師之市酒者
-不減萬家，其為酒惡者多矣，必人人嘗之，人人始知之，待人人知之，已三二歲矣。彼無
-所表著以彰其惡，而飲者亦無所指記以名其惡也，計所獲視王酒亦百涪焉。朱酒者，酒美
-亦無所表著，計所獲視王酒亦百倍焉。」或曰：「為酒者將掩名以售其惡乎？」曰：「二
-者吾不居焉，吾居朱氏。夫名為善之累也，故藏修者惡之。彼朱酒者無名，何害其為美酒
-哉？」
-　　有膾炙於此，一人曰鹹，一人曰酸，一人曰淡，一人曰辛，一人曰精，一人曰粗，一
-人曰生，一人曰熟，一人曰適口，未知誰是。質之易牙而味定矣。夫明知易牙之知味，而
-未必已口之信從，人之情也。況世未必有易牙，而易牙又未易識，識之又來必信從已。嗚
-呼！是非之難一久矣。
-　　余燕服長公服少許，余惡之，令差短焉。或曰：「何害？」余曰：「為下者出其分寸
-長，以形在上者乏短，身之災也，害孰大焉？」
-
-　　水至清不掩魚鮞之細，練至白不藏蠅點之緇。故清白二宇，君子以持身則可，若以處
-世，道之賊而禍之藪也。故渾淪無所不包，幽晦無所不藏。
-　　人入餅肆，問：「餅直幾何？」館人曰：「餅一錢一。」食數餅矣，錢如數與之，館
-人曰：「餅不用面乎？應面錢若干。」食者曰，「是也，」與之，又曰：「不用薪水乎？
-應薪水錢若干。」食者曰：「是也。」與之。又曰：「不用人工為之乎？應工錢若干。」
-食者曰，「是也。」與之。歸而思於路曰：「吾愚也哉！出此三色錢，不應又有餅錢矣。」
-　　一人買布一匹，價錢百五十，令染人青之，染人曰：「欲青，錢三百。」既染矣，
-逾年而不能取，染人牽而索之曰：「若負我錢三百，何久不與？吾訟汝。」買布者懼，跽
-而懇之曰：「我布值已百五十矣，再益百五十，其免我乎？」染人得錢而釋之。
-　　無鹽而脂粉，猶可言也，西施而脂粉，不仁甚矣。
-　　昨見一少婦行哭甚哀，聲似賢節，意甚憐之。友人曰：「子得無視婦女乎？」曰：「
-非視也，見也。大都廣衙之中，好醜雜沓，情態繽紛，入吾目者千般萬狀，不可勝數也，
-吾何嘗視？吾何嘗不見？吾見此婦亦如不可勝數者而已。夫能使聰明不為所留，心志不為
-所引，如風聲日影然，何害其為見哉？子欲入市而閉目乎？將有所擇而見乎？雖然，吾猶
-感心也，見可惡而惡之，見可哀而哀之，見可好而好之。雖惰性之正猶感也，感則人，無
-感則天。感之正者聖人，感之雜者眾人，感之邪者小人。君子不能無感，慎其所以感之者
-。此謂動處試靜，亂中見治，工夫效驗都在這裡。」
-　　嘗與友人游圃，品題眾芳，渠以豔色濃香為第一。余曰：「濃香不如清香，清香不若
-無香之為香；豔色不如淺色，淺色不如白色之為色。」友人曰：「既謂之花，不厭濃豔矣
-。」余曰：「花也，而能淡素，豈不尤難哉？若松柏本淡素，則不須稱矣。」
-　　服砒霜巴豆者，豈不得腸胃一時之快？而留毒五臟，以賊元氣，病者暗受而不知也。
-養虎以除豺狼，豺狼盡而虎將何食哉？主人亦可寒心矣。是故梁冀去而五侯來，宦官滅而
-董卓起。
-　　以佳兒易一跛子，子之父母不從，非不辨美惡也，各有所愛也。
-　　一人多避忌，家有慶賀，一切尚紅而惡素。客有乘白馬者，不令入廄。閒有少年面白
-者，善諧謔，以朱塗面入，主人驚問，生曰：「知翁之惡素也，不敢以白面取罪。」滿座
-大笑，主人愧而改之。
-　　有過彭澤者，值盛夏風濤拍天，及其反也，則隆冬矣，堅冰可履。問舊館人：「此何
-所也？」曰：「彭澤。」怒曰：「欺我哉！吾始過彭澤可舟也，而今可車。始也水活潑，
-而今堅結，無一似昔也，而君曰彭澤，欺我哉！」
-　　人有夫婦將他出者，托僕守戶。愛子在牀，火延寢室。及歸，婦人震號，其夫環庭追
-僕而杖之。當是時也，汲水撲火，其兒尚可免與！
-　　發去木一段，造神櫝一，鏡台一，腳桶一。錫五斤，造香爐一，酒壺一，溺器一。（
-此造物之象也。一段之木，五斤之錫，初無貴賤榮辱之等，賦畀之初無心，而成形之後各
-殊，造物者亦不知莫之為而為耳。木造物之不還者，貧賤憂慼，當安於有生之初，錫造物
-之循環者，富貴福澤，莫恃為固有之物。）
-　　某嘗入一富室，見四海奇珍山積，曰：「某物予取諸蜀，某物予取諸越，不遠數千里
-，積數十年以有今日。」謂予：「公有此否？」曰：「予性無所嗜，設有所嗜，則百物無
-足而至前。」問：「何以得此？」曰：「我只是積錢。」
-　　弄潮於萬層波面，進步於百尺竿頭。
-　　人之手無異於己之手也，腋肋足底，己摸之不癢，而人摸之則癢。補之齒不大於己之
-齒也，己之齒不覺塞，而補之齒覺塞。
-　　四腳平穩不須又加搘墊。
-　　只見倒了牆，幾曾見倒了地。
-　　無垢子浴面，拭之以巾，既而洗足，仍以其巾拭之。弟子曰：「”夕手”矣，先生之
-用物也，即不為物分清濁，豈不為身分貴賤乎？」無垢子曰：「嘻！汝何太分別也。足未
-濯時，面潔於足；足既濯時，何殊於面？面若不浴，面同於足，潔足污面，孰貴孰賤？」
-予謂弟子曰：「此禪宗也。」分別與不分別，此孔、釋之所以殊也。
-　　兩家比舍而居，南鄰牆頹，北鄰為之塗埴丹堊而南鄰不歸德，南鄰失火，北鄰為之焦
-頭爛額而南鄰不謝勞。
-　　喜者大笑，而怒者亦大笑；哀者痛哭，而樂者亦痛哭；歡暢者歌，而憂思者亦歌；逃
-亡者走，而追逐者亦走。豈可以形論心哉。
-　　抱得不哭孩兒易，抱得孩兒不哭難。
-　　疥癬雖小疾，只不染在身上就好。一到身上，難說是無病底人。
-　　一滴多於一斝，一分長似一尋，誰謂細微可忽？死生只系滴分。
-　　四板築牆，下面仍為上面；兩杆推磨，前頭即是後頭。
-　　白花菜，掐不盡，一股掗十頭，一夜生三寸。
-　　鑽腦既滑忙扯索，軋頭才轉緊蹬杆。
-　　誰見八珍能半飽，我欲一捷便收兵。
-　　水銀豈可蕩漾，沐猴更莫教調。
-　　賦蠶一聯：苟絲綸之既盡，雖鼎鑊其奚辭。
-　　詠輿夫一聯：倒垂背上珍珠樹，高起肩頭瑪瑙峰。
-
-
-
-
-
-詞章
-
-
-　　六經之文不相師也，而後世不敢軒輊。後之為文者，吾惑矣。
-
-
-　　擬韓臨柳，效馬學班，代相祖述，竊其糟粕，謬矣。夫文以載道也，苟文足以明道，
-謂吾之文為六經可也。何也？與六經不相叛也。否則，發明申、韓之學術，飾以六經之文
-法，有道君子以之覆瓿矣。
-　　詩、詞、文、賦，都要有個憂君愛國之意，濟人利物之心，春風舞雩之趣，達天見性
-之精；不為贅言，不襲餘緒，不道鄙迂，不言幽僻，不事刻削，不徇偏執。
-　　一先達為文示予，令改之，予謙讓。先達曰：「某不護短，即令公笑我，只是一人笑
-。若為我迴護，是令天下笑也。」予極服其誠，又服其智。嗟夫！惡一人面指，而安受天
-下之背笑者，豈獨文哉？豈獨一二人哉？觀此可以悟矣。
-　　議論之家，旁引根據，然而，據傳莫如據經，據經莫如據理。
-　　古今載籍之言率有七種：一曰天分語。身為道鑄，心是理成，自然而然，毫無所為，
-生知安行之聖人。二曰性分語。理所當然，職所當盡，務滿分量，斃而後已，學知利行之
-聖人。
-　　三曰是非語。為善者為君子，為惡者為小人，以勸賢者。四曰利害語。作善降之百祥
-，作不善降之百殃，以策眾人。五曰權變語。托詞畫策以應務。六曰威令語。五刑以防淫
-。七曰無奈語。五兵以禁亂。此語之外，皆亂道之談也，學者之所務辨也。
-　　疏狂之人多豪興，其詩雄，讀之令人灑落，有起懦之功。
-　　清逸之人多芳興，其詩俊，讀之令人自愛，脫粗鄙之態。沉潛之人多幽興，其詩淡，
-讀之令人寂靜，動深遠之思。沖淡之人多雅興，其詩老，讀之令人平易，消童稚之氣。
-　　愁紅怨綠，是兒女語，對白抽黃，是騷墨語，歎老嗟卑，是寒酸語，慕羶附腥，是乞
-丐語。
-　　艱語深辭，險句怪字，文章之妖而道之賊也，後學之殃而木之災也。路本平，而山溪
-之，日月本明，而雲霧之。無異理，有異言，無深情，有深語。是人不誡，而是書不焚，
-有世教之責者之罪也。若曰其人學博而識深，意奧而語奇，然則孔、孟之言淺鄙甚矣。
-　　聖人不作無用文章，其論道則為有德之言，其論事則為有見之言，其敘述歌詠則為有
-益世教之言。
-　　真字要如聖人燕居危坐，端莊而和氣自在，草字要如聖人應物，進退存亡，辭受取予
-，變化不測，因事異施而不失其中。
-　　要之同歸於任其自然，不事造作。
-　　聖人作經，有指時物者，有指時事者，有指方事者，有論心事者，當時精意與身往矣
-。話言所遺，不能寫心之十一，而儒者以後世之事物，一己之意見度之，不得則強為訓詁
-。嗚呼！
-　　漢宋諸儒不生，則先聖經旨後世誠不得十一，然以牽合附會而失其自然之旨者，亦不
-少也。
-　　聖人垂世則為持衡之言，救世則有偏重之言。持衡之言達之天下萬世者也，可以示極
-，偏重之言因事因人者也，可以矯枉。
-　　而不善讀書者，每以偏重之言垂訓，亂道也夫！誣聖也夫！
-　　言語者，聖人之糟粕也。聖人不可言之妙，非言語所能形容。漢宋以來，解經諸儒泥
-文拘字，破碎牽合，失聖人天然自得之趣，晦天下本然自在之道，不近人情，不合物理，
-使後世學者無所適從。且其負一世之高明，繫千古之重望，遂成百世不刊之典。後學者豈
-無千慮一得，發前聖之心傳，而救先儒之小失？然一下筆開喙，腐儒俗士不辨是非，噬指
-而驚，掩口而笑，且曰：「茲先哲之明訓也，安得妄議？」噫！此誠信而好古之義也。泥
-傳離經，勉從強信，是先儒阿意曲從之子也。昔朱子將終，尚改誠意注說，使朱子先一年
-而卒，則誠意章必非精到之語；使天假朱子數年，所改寧止誠意章哉？
-　　聖人之言，簡淡明直中有無窮之味，大羹玄酒也；賢人之言，一見便透，而理趣充溢
-，讀之使人豁然，膾炙珍羞也。
-　　聖人終日信口開闔，千言萬語，隨事問答，無一字不可為訓。賢者深沉而思，稽留而
-應，平氣而言，易心而語，始免於過。出此二者，而恣口放言，皆狂迷醉夢語也，終日言
-無一字近道，何以多為？
-　　詩低處在覓故事尋對頭，高處在寫胸中自得之趣，說眼前見在之景
-　　自孔子時便說「史不闕文」，又曰「文勝質則史」，把史字就作了一偽字看。如今讀
-史只看他治亂興亡，足為法戒，至於是非真偽，總是除外底。譬之聽戲文一般，何須問他
-真假，只是足為感創，便於風化有關。但有一樁可恨處，只緣當真看，把偽底當真，只緣
-當偽看，又把真底當偽。這裡便宜了多少小人，虧枉了多少君子。
-　　詩辭要如哭笑，發乎情之不容已，則真切而有味。果真矣，不必較工拙。後世只要學
-詩辭，然工而失真，非詩辭之本意矣。
-　　故詩辭以情真切、語自然者為第一。
-　　古人無無益之文章，其明道也不得不形而為言，其發言也不得不成而為文。所謂因文
-見道者也，其文之古今工拙無論。
-　　唐宋以來，漸尚文章，然猶以道飾文，意雖非古，而文猶可傳，後世則專為文章矣。
-工其辭語，涣其波瀾，煉其字句，怪其機軸，深其意指，而道則破碎支離，晦盲否塞矣，
-是道之賊也。
-　　而無識者猶以文章崇尚之，哀哉！
-　　文章有八要，簡、切、明、盡、正、大、溫、雅。不簡則失之繁冗，不切則失之浮泛
-，不明則失之含糊，不盡則失之疏遺，不正則理不足以服人，不大則失冠冕之體，不溫則
-暴厲刻削，不雅則鄙陋淺俗。廟堂文要有天覆地載，山林文要有仙風道骨，征伐文要有吞
-象食牛，奏對文要有忠肝義膽。諸如此類，可以例求。
-　　學者讀書只替前人解說，全不向自家身上照一照。譬之小郎替人負貨，努盡筋力，覓
-得幾文錢，更不知此中是何細軟珍重。
-　　《太玄》雖終身不看亦可。
-　　自鄉舉裡選之法廢，而後世率尚詞章。唐以詩賦求真才，更為可歎。宋以經義取士，
-而我朝因之。夫取士以文，已為言舉人矣。然猶曰：言，心聲也。因文可得其心，因心可
-知其人。
-　　其文爽亮者，其心必光明，而察其粗淺之病；其文勁直者，其人必剛方，而察其豪悍
-之病；其文藻麗者，其人必文采，而察其靡曼之病；其文莊重者，其人必端嚴，而察其寥
-落之病；其文飄逸者，其人必流動，而察其浮薄之病；其文典雅者，其人必質實，而察其
-樸鈍之病；其文雄暢者，其人必揮霍，而察其弛跅之病；其文溫潤者，其人必和順，而察
-其巽軟之病；其文簡潔者，其人必修謹，而察其拘攣之病；其文深沉者，其人必精細，而
-察其陰險之病；其文沖淡者，其人必恬雅，而察其懶散之病；其文變化者，其人必圓通，
-而察其機械之病；其文奇巧者，其人必聰明，而察其怪誕之病；其文蒼老者，其人必不俗
-，而察其迂腐之病。有文之長，而無文之病，則其人可知矣，文即未純，必不可棄。今也
-但取其文而已。見欲深邃，調欲新脫，意欲奇特，句欲飣餖，鍛鍊欲工，態度欲俏，粉黛
-欲濃，面皮欲厚。是以業舉之家，棄理而工辭，忘我而徇世，剽竊湊泊，全無自己神情，
-口語筆端，迎合主司好尚。沿習之調既成，本然之天不露，而校文者亦迷於世調，取其文
-而忘其人，何異暗摸而辨蒼黃，隔壁而察妍媸？欲得真才，豈不難哉？
-　　隆慶戊辰，永城胡君格誠登第，三場文字皆塗抹過半，西安鄭給諫大經所取士也，人
-皆笑之。後餘閱其卷，乃歎曰：「塗抹即盡，棄擲不能，何者？其荒疏狂誕，繩之以舉業
-，自當落地，而一段雄偉器度、爽朗精神，英英然一世豪傑如對其面，其人之可收，自在
-文章之外耳。胡君不羈之才，難挫之氣，吞牛食象，倒海衝山，自非尋常庸眾人。惜也！
-以不合世調，竟使沉淪。」餘因拈出以為取士者不專在數篇工拙，當得之牝牡驪黃之外也。
-　　萬曆丙戌而後，舉業文字如晦夜濃陰封地穴，閉目蒙被滅燈光；又如墓中人說鬼話，
-顛狂人說風話，伏章人說天話，又如楞嚴孔雀，咒語真言，世道之大妖也。其名家云：「
-文到人不省得處才中，到自家不省得處才高中。」不重其法，人心日趨於魑魅魍魎矣。或
-曰：「文章關甚麼人心世道？」嗟嗟！此醉生夢死語也。國家以文取士，非取其文，因文
-而知其心，因心而知其人，故取之耳。言若此矣，謂其人曰光明正大之君子，吾不信也。
-且錄其人曰中式，進呈其文曰中式之文，試問其式安在乃？
-　　高皇帝所謂文理平通，明順典實者也，今以編造晦澀妄誕放恣之辭為式，悖典甚矣。
-今之選試官者，必以高科，其高科所中，便非明順典實之文。其典試也，安得不黜明順典
-實之士乎？人心巧偽，皆此文為之祟耳。噫！是言也，向誰人道？不過仰屋長太息而已。
-使禮曹禮科得正大光明、執持風力之士，無所畏徇，重一懲創，一兩科後，無劉幾矣。
-　　《左傳》、《國語，、《戰國策》，春秋之時文也，未嘗見春秋時人學三代。《史記
-》、《漢書》，西漢之時文也，未嘗見班、馬學《國》、《左》。今之時文，安知非後世
-之古文？而不擬《國》、《左》，則擬《史》、《漢》，陋矣，人之棄己而襲人也！六經
-四書，三代以上之古文也，而不擬者何？習見也。甚矣人之厭常而喜異也！餘以為文貴理
-勝，得理，何古何今？苟理不如人而摹仿於句字之間，以希博洽之譽，有識者恥之。
-　　詩家無拘鄙之氣，然令人放曠；詞家無暴戾之氣，然令人淫靡。道學自有泰而不驕、
-樂而不淫氣象，雖寄意於詩詞，而綴景言情皆自義理中流出，所謂吟風弄月，有「吾與點
-也」之意。
-
-
-
-
-
-
-
-
-
-
-
-
-
-*** END OF THE PROJECT GUTENBERG EBOOK 呻吟語 ***
-
-
-    
-
-Updated editions will replace the previous one—the old editions will
-be renamed.
-
-Creating the works from print editions not protected by U.S. copyright
-law means that no one owns a United States copyright in these works,
-so the Foundation (and you!) can copy and distribute it in the United
-States without permission and without paying copyright
-royalties. Special rules, set forth in the General Terms of Use part
-of this license, apply to copying and distributing Project
-Gutenberg™ electronic works to protect the PROJECT GUTENBERG™
-concept and trademark. Project Gutenberg is a registered trademark,
-and may not be used if you charge for an eBook, except by following
-the terms of the trademark license, including paying royalties for use
-of the Project Gutenberg trademark. If you do not charge anything for
-copies of this eBook, complying with the trademark license is very
-easy. You may use this eBook for nearly any purpose such as creation
-of derivative works, reports, performances and research. Project
-Gutenberg eBooks may be modified and printed and given away—you may
-do practically ANYTHING in the United States with eBooks not protected
-by U.S. copyright law. Redistribution is subject to the trademark
-license, especially commercial redistribution.
-
-
-START: FULL LICENSE
-
-THE FULL PROJECT GUTENBERG LICENSE
-
-PLEASE READ THIS BEFORE YOU DISTRIBUTE OR USE THIS WORK
-
-To protect the Project Gutenberg™ mission of promoting the free
-distribution of electronic works, by using or distributing this work
-(or any other work associated in any way with the phrase “Project
-Gutenberg”), you agree to comply with all the terms of the Full
-Project Gutenberg™ License available with this file or online at
-www.gutenberg.org/license.
-
-Section 1. General Terms of Use and Redistributing Project Gutenberg™
-electronic works
-
-1.A. By reading or using any part of this Project Gutenberg™
-electronic work, you indicate that you have read, understand, agree to
-and accept all the terms of this license and intellectual property
-(trademark/copyright) agreement. If you do not agree to abide by all
-the terms of this agreement, you must cease using and return or
-destroy all copies of Project Gutenberg™ electronic works in your
-possession. If you paid a fee for obtaining a copy of or access to a
-Project Gutenberg™ electronic work and you do not agree to be bound
-by the terms of this agreement, you may obtain a refund from the person
-or entity to whom you paid the fee as set forth in paragraph 1.E.8.
-
-1.B. “Project Gutenberg” is a registered trademark. It may only be
-used on or associated in any way with an electronic work by people who
-agree to be bound by the terms of this agreement. There are a few
-things that you can do with most Project Gutenberg™ electronic works
-even without complying with the full terms of this agreement. See
-paragraph 1.C below. There are a lot of things you can do with Project
-Gutenberg™ electronic works if you follow the terms of this
-agreement and help preserve free future access to Project Gutenberg™
-electronic works. See paragraph 1.E below.
-
-1.C. The Project Gutenberg Literary Archive Foundation (“the
-Foundation” or PGLAF), owns a compilation copyright in the collection
-of Project Gutenberg™ electronic works. Nearly all the individual
-works in the collection are in the public domain in the United
-States. If an individual work is unprotected by copyright law in the
-United States and you are located in the United States, we do not
-claim a right to prevent you from copying, distributing, performing,
-displaying or creating derivative works based on the work as long as
-all references to Project Gutenberg are removed. Of course, we hope
-that you will support the Project Gutenberg™ mission of promoting
-free access to electronic works by freely sharing Project Gutenberg™
-works in compliance with the terms of this agreement for keeping the
-Project Gutenberg™ name associated with the work. You can easily
-comply with the terms of this agreement by keeping this work in the
-same format with its attached full Project Gutenberg™ License when
-you share it without charge with others.
-
-1.D. The copyright laws of the place where you are located also govern
-what you can do with this work. Copyright laws in most countries are
-in a constant state of change. If you are outside the United States,
-check the laws of your country in addition to the terms of this
-agreement before downloading, copying, displaying, performing,
-distributing or creating derivative works based on this work or any
-other Project Gutenberg™ work. The Foundation makes no
-representations concerning the copyright status of any work in any
-country other than the United States.
-
-1.E. Unless you have removed all references to Project Gutenberg:
-
-1.E.1. The following sentence, with active links to, or other
-immediate access to, the full Project Gutenberg™ License must appear
-prominently whenever any copy of a Project Gutenberg™ work (any work
-on which the phrase “Project Gutenberg” appears, or with which the
-phrase “Project Gutenberg” is associated) is accessed, displayed,
-performed, viewed, copied or distributed:
-
-    This eBook is for the use of anyone anywhere in the United States and most
-    other parts of the world at no cost and with almost no restrictions
-    whatsoever. You may copy it, give it away or re-use it under the terms
-    of the Project Gutenberg License included with this eBook or online
-    at www.gutenberg.org. If you
-    are not located in the United States, you will have to check the laws
-    of the country where you are located before using this eBook.
-  
-1.E.2. If an individual Project Gutenberg™ electronic work is
-derived from texts not protected by U.S. copyright law (does not
-contain a notice indicating that it is posted with permission of the
-copyright holder), the work can be copied and distributed to anyone in
-the United States without paying any fees or charges. If you are
-redistributing or providing access to a work with the phrase “Project
-Gutenberg” associated with or appearing on the work, you must comply
-either with the requirements of paragraphs 1.E.1 through 1.E.7 or
-obtain permission for the use of the work and the Project Gutenberg™
-trademark as set forth in paragraphs 1.E.8 or 1.E.9.
-
-1.E.3. If an individual Project Gutenberg™ electronic work is posted
-with the permission of the copyright holder, your use and distribution
-must comply with both paragraphs 1.E.1 through 1.E.7 and any
-additional terms imposed by the copyright holder. Additional terms
-will be linked to the Project Gutenberg™ License for all works
-posted with the permission of the copyright holder found at the
-beginning of this work.
-
-1.E.4. Do not unlink or detach or remove the full Project Gutenberg™
-License terms from this work, or any files containing a part of this
-work or any other work associated with Project Gutenberg™.
-
-1.E.5. Do not copy, display, perform, distribute or redistribute this
-electronic work, or any part of this electronic work, without
-prominently displaying the sentence set forth in paragraph 1.E.1 with
-active links or immediate access to the full terms of the Project
-Gutenberg™ License.
-
-1.E.6. You may convert to and distribute this work in any binary,
-compressed, marked up, nonproprietary or proprietary form, including
-any word processing or hypertext form. However, if you provide access
-to or distribute copies of a Project Gutenberg™ work in a format
-other than “Plain Vanilla ASCII” or other format used in the official
-version posted on the official Project Gutenberg™ website
-(www.gutenberg.org), you must, at no additional cost, fee or expense
-to the user, provide a copy, a means of exporting a copy, or a means
-of obtaining a copy upon request, of the work in its original “Plain
-Vanilla ASCII” or other form. Any alternate format must include the
-full Project Gutenberg™ License as specified in paragraph 1.E.1.
-
-1.E.7. Do not charge a fee for access to, viewing, displaying,
-performing, copying or distributing any Project Gutenberg™ works
-unless you comply with paragraph 1.E.8 or 1.E.9.
-
-1.E.8. You may charge a reasonable fee for copies of or providing
-access to or distributing Project Gutenberg™ electronic works
-provided that:
-
-    • You pay a royalty fee of 20% of the gross profits you derive from
-        the use of Project Gutenberg™ works calculated using the method
-        you already use to calculate your applicable taxes. The fee is owed
-        to the owner of the Project Gutenberg™ trademark, but he has
-        agreed to donate royalties under this paragraph to the Project
-        Gutenberg Literary Archive Foundation. Royalty payments must be paid
-        within 60 days following each date on which you prepare (or are
-        legally required to prepare) your periodic tax returns. Royalty
-        payments should be clearly marked as such and sent to the Project
-        Gutenberg Literary Archive Foundation at the address specified in
-        Section 4, “Information about donations to the Project Gutenberg
-        Literary Archive Foundation.”
-    
-    • You provide a full refund of any money paid by a user who notifies
-        you in writing (or by e-mail) within 30 days of receipt that s/he
-        does not agree to the terms of the full Project Gutenberg™
-        License. You must require such a user to return or destroy all
-        copies of the works possessed in a physical medium and discontinue
-        all use of and all access to other copies of Project Gutenberg™
-        works.
-    
-    • You provide, in accordance with paragraph 1.F.3, a full refund of
-        any money paid for a work or a replacement copy, if a defect in the
-        electronic work is discovered and reported to you within 90 days of
-        receipt of the work.
-    
-    • You comply with all other terms of this agreement for free
-        distribution of Project Gutenberg™ works.
-    
-
-1.E.9. If you wish to charge a fee or distribute a Project
-Gutenberg™ electronic work or group of works on different terms than
-are set forth in this agreement, you must obtain permission in writing
-from the Project Gutenberg Literary Archive Foundation, the manager of
-the Project Gutenberg™ trademark. Contact the Foundation as set
-forth in Section 3 below.
-
-1.F.
-
-1.F.1. Project Gutenberg volunteers and employees expend considerable
-effort to identify, do copyright research on, transcribe and proofread
-works not protected by U.S. copyright law in creating the Project
-Gutenberg™ collection. Despite these efforts, Project Gutenberg™
-electronic works, and the medium on which they may be stored, may
-contain “Defects,” such as, but not limited to, incomplete, inaccurate
-or corrupt data, transcription errors, a copyright or other
-intellectual property infringement, a defective or damaged disk or
-other medium, a computer virus, or computer codes that damage or
-cannot be read by your equipment.
-
-1.F.2. LIMITED WARRANTY, DISCLAIMER OF DAMAGES - Except for the “Right
-of Replacement or Refund” described in paragraph 1.F.3, the Project
-Gutenberg Literary Archive Foundation, the owner of the Project
-Gutenberg™ trademark, and any other party distributing a Project
-Gutenberg™ electronic work under this agreement, disclaim all
-liability to you for damages, costs and expenses, including legal
-fees. YOU AGREE THAT YOU HAVE NO REMEDIES FOR NEGLIGENCE, STRICT
-LIABILITY, BREACH OF WARRANTY OR BREACH OF CONTRACT EXCEPT THOSE
-PROVIDED IN PARAGRAPH 1.F.3. YOU AGREE THAT THE FOUNDATION, THE
-TRADEMARK OWNER, AND ANY DISTRIBUTOR UNDER THIS AGREEMENT WILL NOT BE
-LIABLE TO YOU FOR ACTUAL, DIRECT, INDIRECT, CONSEQUENTIAL, PUNITIVE OR
-INCIDENTAL DAMAGES EVEN IF YOU GIVE NOTICE OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-1.F.3. LIMITED RIGHT OF REPLACEMENT OR REFUND - If you discover a
-defect in this electronic work within 90 days of receiving it, you can
-receive a refund of the money (if any) you paid for it by sending a
-written explanation to the person you received the work from. If you
-received the work on a physical medium, you must return the medium
-with your written explanation. The person or entity that provided you
-with the defective work may elect to provide a replacement copy in
-lieu of a refund. If you received the work electronically, the person
-or entity providing it to you may choose to give you a second
-opportunity to receive the work electronically in lieu of a refund. If
-the second copy is also defective, you may demand a refund in writing
-without further opportunities to fix the problem.
-
-1.F.4. Except for the limited right of replacement or refund set forth
-in paragraph 1.F.3, this work is provided to you ‘AS-IS’, WITH NO
-OTHER WARRANTIES OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
-LIMITED TO WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PURPOSE.
-
-1.F.5. Some states do not allow disclaimers of certain implied
-warranties or the exclusion or limitation of certain types of
-damages. If any disclaimer or limitation set forth in this agreement
-violates the law of the state applicable to this agreement, the
-agreement shall be interpreted to make the maximum disclaimer or
-limitation permitted by the applicable state law. The invalidity or
-unenforceability of any provision of this agreement shall not void the
-remaining provisions.
-
-1.F.6. INDEMNITY - You agree to indemnify and hold the Foundation, the
-trademark owner, any agent or employee of the Foundation, anyone
-providing copies of Project Gutenberg™ electronic works in
-accordance with this agreement, and any volunteers associated with the
-production, promotion and distribution of Project Gutenberg™
-electronic works, harmless from all liability, costs and expenses,
-including legal fees, that arise directly or indirectly from any of
-the following which you do or cause to occur: (a) distribution of this
-or any Project Gutenberg™ work, (b) alteration, modification, or
-additions or deletions to any Project Gutenberg™ work, and (c) any
-Defect you cause.
-
-Section 2. Information about the Mission of Project Gutenberg™
-
-Project Gutenberg™ is synonymous with the free distribution of
-electronic works in formats readable by the widest variety of
-computers including obsolete, old, middle-aged and new computers. It
-exists because of the efforts of hundreds of volunteers and donations
-from people in all walks of life.
-
-Volunteers and financial support to provide volunteers with the
-assistance they need are critical to reaching Project Gutenberg™’s
-goals and ensuring that the Project Gutenberg™ collection will
-remain freely available for generations to come. In 2001, the Project
-Gutenberg Literary Archive Foundation was created to provide a secure
-and permanent future for Project Gutenberg™ and future
-generations. To learn more about the Project Gutenberg Literary
-Archive Foundation and how your efforts and donations can help, see
-Sections 3 and 4 and the Foundation information page at www.gutenberg.org.
-
-Section 3. Information about the Project Gutenberg Literary Archive Foundation
-
-The Project Gutenberg Literary Archive Foundation is a non-profit
-501(c)(3) educational corporation organized under the laws of the
-state of Mississippi and granted tax exempt status by the Internal
-Revenue Service. The Foundation’s EIN or federal tax identification
-number is 64-6221541. Contributions to the Project Gutenberg Literary
-Archive Foundation are tax deductible to the full extent permitted by
-U.S. federal laws and your state’s laws.
-
-The Foundation’s business office is located at 809 North 1500 West,
-Salt Lake City, UT 84116, (801) 596-1887. Email contact links and up
-to date contact information can be found at the Foundation’s website
-and official page at www.gutenberg.org/contact
-
-Section 4. Information about Donations to the Project Gutenberg
-Literary Archive Foundation
-
-Project Gutenberg™ depends upon and cannot survive without widespread
-public support and donations to carry out its mission of
-increasing the number of public domain and licensed works that can be
-freely distributed in machine-readable form accessible by the widest
-array of equipment including outdated equipment. Many small donations
-($1 to $5,000) are particularly important to maintaining tax exempt
-status with the IRS.
-
-The Foundation is committed to complying with the laws regulating
-charities and charitable donations in all 50 states of the United
-States. Compliance requirements are not uniform and it takes a
-considerable effort, much paperwork and many fees to meet and keep up
-with these requirements. We do not solicit donations in locations
-where we have not received written confirmation of compliance. To SEND
-DONATIONS or determine the status of compliance for any particular state
-visit www.gutenberg.org/donate.
-
-While we cannot and do not solicit contributions from states where we
-have not met the solicitation requirements, we know of no prohibition
-against accepting unsolicited donations from donors in such states who
-approach us with offers to donate.
-
-International donations are gratefully accepted, but we cannot make
-any statements concerning tax treatment of donations received from
-outside the United States. U.S. laws alone swamp our small staff.
-
-Please check the Project Gutenberg web pages for current donation
-methods and addresses. Donations are accepted in a number of other
-ways including checks, online payments and credit card donations. To
-donate, please visit: www.gutenberg.org/donate.
-
-Section 5. General Information About Project Gutenberg™ electronic works
-
-Professor Michael S. Hart was the originator of the Project
-Gutenberg™ concept of a library of electronic works that could be
-freely shared with anyone. For forty years, he produced and
-distributed Project Gutenberg™ eBooks with only a loose network of
-volunteer support.
-
-Project Gutenberg™ eBooks are often created from several printed
-editions, all of which are confirmed as not protected by copyright in
-the U.S. unless a copyright notice is included. Thus, we do not
-necessarily keep eBooks in compliance with any particular paper
-edition.
-
-Most people start at our website which has the main PG search
-facility: www.gutenberg.org.
-
-This website includes information about Project Gutenberg™,
-including how to make donations to the Project Gutenberg Literary
-Archive Foundation, how to help produce our new eBooks, and how to
-subscribe to our email newsletter to hear about new eBooks.
-
diff --git a/backend/reconcile/tests/resources/pride_and_prejudice.txt b/backend/reconcile/tests/resources/pride_and_prejudice.txt
deleted file mode 100644
index 2dd9de33..00000000
--- a/backend/reconcile/tests/resources/pride_and_prejudice.txt
+++ /dev/null
@@ -1,14910 +0,0 @@
-prThe Project Gutenberg eBook of Pride and Prejudice
-    
-This ebook is for the use of anyone anywhere in the United States and
-most other parts of the world at no cost and with almost no restrictions
-whatsoever. You may copy it, give it away or re-use it under the terms
-of the Project Gutenberg License included with this ebook or online
-at www.gutenberg.org. If you are not located in the United States,
-you will have to check the laws of the country where you are located
-before using this eBook.
-
-Title: Pride and Prejudice
-
-Author: Jane Austen
-
-Release date: June 1, 1998 [eBook #1342]
-                Most recently updated: June 17, 2024
-
-Language: English
-
-Credits: Chuck Greif and the Online Distributed Proofreading Team at http://www.pgdp.net (This file was produced from images available at The Internet Archive)
-
-
-*** START OF THE PROJECT GUTENBERG EBOOK PRIDE AND PREJUDICE ***
-
-
-
-
-                            [Illustration:
-
-                             GEORGE ALLEN
-                               PUBLISHER
-
-                        156 CHARING CROSS ROAD
-                                LONDON
-
-                             RUSKIN HOUSE
-                                   ]
-
-                            [Illustration:
-
-               _Reading Jane’s Letters._      _Chap 34._
-                                   ]
-
-
-
-
-                                PRIDE.
-                                  and
-                               PREJUDICE
-
-                                  by
-                             Jane Austen,
-
-                           with a Preface by
-                           George Saintsbury
-                                  and
-                           Illustrations by
-                             Hugh Thomson
-
-                         [Illustration: 1894]
-
-                       Ruskin       156. Charing
-                       House.        Cross Road.
-
-                                London
-                             George Allen.
-
-
-
-
-             CHISWICK PRESS:--CHARLES WHITTINGHAM AND CO.
-                  TOOKS COURT, CHANCERY LANE, LONDON.
-
-
-
-
-                            [Illustration:
-
-                          _To J. Comyns Carr
-                      in acknowledgment of all I
-                       owe to his friendship and
-                    advice, these illustrations are
-                         gratefully inscribed_
-
-                            _Hugh Thomson_
-                                   ]
-
-
-
-
-PREFACE.
-
-[Illustration]
-
-
-_Walt Whitman has somewhere a fine and just distinction between “loving
-by allowance” and “loving with personal love.” This distinction applies
-to books as well as to men and women; and in the case of the not very
-numerous authors who are the objects of the personal affection, it
-brings a curious consequence with it. There is much more difference as
-to their best work than in the case of those others who are loved “by
-allowance” by convention, and because it is felt to be the right and
-proper thing to love them. And in the sect--fairly large and yet
-unusually choice--of Austenians or Janites, there would probably be
-found partisans of the claim to primacy of almost every one of the
-novels. To some the delightful freshness and humour of_ Northanger
-Abbey, _its completeness, finish, and_ entrain, _obscure the undoubted
-critical facts that its scale is small, and its scheme, after all, that
-of burlesque or parody, a kind in which the first rank is reached with
-difficulty._ Persuasion, _relatively faint in tone, and not enthralling
-in interest, has devotees who exalt above all the others its exquisite
-delicacy and keeping. The catastrophe of_ Mansfield Park _is admittedly
-theatrical, the hero and heroine are insipid, and the author has almost
-wickedly destroyed all romantic interest by expressly admitting that
-Edmund only took Fanny because Mary shocked him, and that Fanny might
-very likely have taken Crawford if he had been a little more assiduous;
-yet the matchless rehearsal-scenes and the characters of Mrs. Norris and
-others have secured, I believe, a considerable party for it._ Sense and
-Sensibility _has perhaps the fewest out-and-out admirers; but it does
-not want them._
-
-_I suppose, however, that the majority of at least competent votes
-would, all things considered, be divided between_ Emma _and the present
-book; and perhaps the vulgar verdict (if indeed a fondness for Miss
-Austen be not of itself a patent of exemption from any possible charge
-of vulgarity) would go for_ Emma. _It is the larger, the more varied, the
-more popular; the author had by the time of its composition seen rather
-more of the world, and had improved her general, though not her most
-peculiar and characteristic dialogue; such figures as Miss Bates, as the
-Eltons, cannot but unite the suffrages of everybody. On the other hand,
-I, for my part, declare for_ Pride and Prejudice _unhesitatingly. It
-seems to me the most perfect, the most characteristic, the most
-eminently quintessential of its author’s works; and for this contention
-in such narrow space as is permitted to me, I propose here to show
-cause._
-
-_In the first place, the book (it may be barely necessary to remind the
-reader) was in its first shape written very early, somewhere about 1796,
-when Miss Austen was barely twenty-one; though it was revised and
-finished at Chawton some fifteen years later, and was not published till
-1813, only four years before her death. I do not know whether, in this
-combination of the fresh and vigorous projection of youth, and the
-critical revision of middle life, there may be traced the distinct
-superiority in point of construction, which, as it seems to me, it
-possesses over all the others. The plot, though not elaborate, is almost
-regular enough for Fielding; hardly a character, hardly an incident
-could be retrenched without loss to the story. The elopement of Lydia
-and Wickham is not, like that of Crawford and Mrs. Rushworth, a_ coup de
-théâtre; _it connects itself in the strictest way with the course of the
-story earlier, and brings about the denouement with complete propriety.
-All the minor passages--the loves of Jane and Bingley, the advent of Mr.
-Collins, the visit to Hunsford, the Derbyshire tour--fit in after the
-same unostentatious, but masterly fashion. There is no attempt at the
-hide-and-seek, in-and-out business, which in the transactions between
-Frank Churchill and Jane Fairfax contributes no doubt a good deal to the
-intrigue of_ Emma, _but contributes it in a fashion which I do not think
-the best feature of that otherwise admirable book. Although Miss Austen
-always liked something of the misunderstanding kind, which afforded her
-opportunities for the display of the peculiar and incomparable talent to
-be noticed presently, she has been satisfied here with the perfectly
-natural occasions provided by the false account of Darcy’s conduct given
-by Wickham, and by the awkwardness (arising with equal naturalness) from
-the gradual transformation of Elizabeth’s own feelings from positive
-aversion to actual love. I do not know whether the all-grasping hand of
-the playwright has ever been laid upon_ Pride and Prejudice; _and I dare
-say that, if it were, the situations would prove not startling or
-garish enough for the footlights, the character-scheme too subtle and
-delicate for pit and gallery. But if the attempt were made, it would
-certainly not be hampered by any of those loosenesses of construction,
-which, sometimes disguised by the conveniences of which the novelist can
-avail himself, appear at once on the stage._
-
-_I think, however, though the thought will doubtless seem heretical to
-more than one school of critics, that construction is not the highest
-merit, the choicest gift, of the novelist. It sets off his other gifts
-and graces most advantageously to the critical eye; and the want of it
-will sometimes mar those graces--appreciably, though not quite
-consciously--to eyes by no means ultra-critical. But a very badly-built
-novel which excelled in pathetic or humorous character, or which
-displayed consummate command of dialogue--perhaps the rarest of all
-faculties--would be an infinitely better thing than a faultless plot
-acted and told by puppets with pebbles in their mouths. And despite the
-ability which Miss Austen has shown in working out the story, I for one
-should put_ Pride and Prejudice _far lower if it did not contain what
-seem to me the very masterpieces of Miss Austen’s humour and of her
-faculty of character-creation--masterpieces who may indeed admit John
-Thorpe, the Eltons, Mrs. Norris, and one or two others to their company,
-but who, in one instance certainly, and perhaps in others, are still
-superior to them._
-
-_The characteristics of Miss Austen’s humour are so subtle and delicate
-that they are, perhaps, at all times easier to apprehend than to
-express, and at any particular time likely to be differently
-apprehended by different persons. To me this humour seems to possess a
-greater affinity, on the whole, to that of Addison than to any other of
-the numerous species of this great British genus. The differences of
-scheme, of time, of subject, of literary convention, are, of course,
-obvious enough; the difference of sex does not, perhaps, count for much,
-for there was a distinctly feminine element in “Mr. Spectator,” and in
-Jane Austen’s genius there was, though nothing mannish, much that was
-masculine. But the likeness of quality consists in a great number of
-common subdivisions of quality--demureness, extreme minuteness of touch,
-avoidance of loud tones and glaring effects. Also there is in both a
-certain not inhuman or unamiable cruelty. It is the custom with those
-who judge grossly to contrast the good nature of Addison with the
-savagery of Swift, the mildness of Miss Austen with the boisterousness
-of Fielding and Smollett, even with the ferocious practical jokes that
-her immediate predecessor, Miss Burney, allowed without very much
-protest. Yet, both in Mr. Addison and in Miss Austen there is, though a
-restrained and well-mannered, an insatiable and ruthless delight in
-roasting and cutting up a fool. A man in the early eighteenth century,
-of course, could push this taste further than a lady in the early
-nineteenth; and no doubt Miss Austen’s principles, as well as her heart,
-would have shrunk from such things as the letter from the unfortunate
-husband in the_ Spectator, _who describes, with all the gusto and all the
-innocence in the world, how his wife and his friend induce him to play
-at blind-man’s-buff. But another_ Spectator _letter--that of the damsel
-of fourteen who wishes to marry Mr. Shapely, and assures her selected
-Mentor that “he admires your_ Spectators _mightily”--might have been
-written by a rather more ladylike and intelligent Lydia Bennet in the
-days of Lydia’s great-grandmother; while, on the other hand, some (I
-think unreasonably) have found “cynicism” in touches of Miss Austen’s
-own, such as her satire of Mrs. Musgrove’s self-deceiving regrets over
-her son. But this word “cynical” is one of the most misused in the
-English language, especially when, by a glaring and gratuitous
-falsification of its original sense, it is applied, not to rough and
-snarling invective, but to gentle and oblique satire. If cynicism means
-the perception of “the other side,” the sense of “the accepted hells
-beneath,” the consciousness that motives are nearly always mixed, and
-that to seem is not identical with to be--if this be cynicism, then
-every man and woman who is not a fool, who does not care to live in a
-fool’s paradise, who has knowledge of nature and the world and life, is
-a cynic. And in that sense Miss Austen certainly was one. She may even
-have been one in the further sense that, like her own Mr. Bennet, she
-took an epicurean delight in dissecting, in displaying, in setting at
-work her fools and her mean persons. I think she did take this delight,
-and I do not think at all the worse of her for it as a woman, while she
-was immensely the better for it as an artist._
-
-_In respect of her art generally, Mr. Goldwin Smith has truly observed
-that “metaphor has been exhausted in depicting the perfection of it,
-combined with the narrowness of her field;” and he has justly added that
-we need not go beyond her own comparison to the art of a miniature
-painter. To make this latter observation quite exact we must not use the
-term miniature in its restricted sense, and must think rather of Memling
-at one end of the history of painting and Meissonier at the other, than
-of Cosway or any of his kind. And I am not so certain that I should
-myself use the word “narrow” in connection with her. If her world is a
-microcosm, the cosmic quality of it is at least as eminent as the
-littleness. She does not touch what she did not feel herself called to
-paint; I am not so sure that she could not have painted what she did not
-feel herself called to touch. It is at least remarkable that in two very
-short periods of writing--one of about three years, and another of not
-much more than five--she executed six capital works, and has not left a
-single failure. It is possible that the romantic paste in her
-composition was defective: we must always remember that hardly
-anybody born in her decade--that of the eighteenth-century
-seventies--independently exhibited the full romantic quality. Even Scott
-required hill and mountain and ballad, even Coleridge metaphysics and
-German to enable them to chip the classical shell. Miss Austen was an
-English girl, brought up in a country retirement, at the time when
-ladies went back into the house if there was a white frost which might
-pierce their kid shoes, when a sudden cold was the subject of the
-gravest fears, when their studies, their ways, their conduct were
-subject to all those fantastic limits and restrictions against which
-Mary Wollstonecraft protested with better general sense than particular
-taste or judgment. Miss Austen, too, drew back when the white frost
-touched her shoes; but I think she would have made a pretty good journey
-even in a black one._
-
-_For if her knowledge was not very extended, she knew two things which
-only genius knows. The one was humanity, and the other was art. On the
-first head she could not make a mistake; her men, though limited, are
-true, and her women are, in the old sense, “absolute.” As to art, if she
-has never tried idealism, her realism is real to a degree which makes
-the false realism of our own day look merely dead-alive. Take almost any
-Frenchman, except the late M. de Maupassant, and watch him laboriously
-piling up strokes in the hope of giving a complete impression. You get
-none; you are lucky if, discarding two-thirds of what he gives, you can
-shape a real impression out of the rest. But with Miss Austen the
-myriad, trivial, unforced strokes build up the picture like magic.
-Nothing is false; nothing is superfluous. When (to take the present book
-only) Mr. Collins changed his mind from Jane to Elizabeth “while Mrs.
-Bennet was stirring the fire” (and we know_ how _Mrs. Bennet would have
-stirred the fire), when Mr. Darcy “brought his coffee-cup back_
-himself,” _the touch in each case is like that of Swift--“taller by the
-breadth of my nail”--which impressed the half-reluctant Thackeray with
-just and outspoken admiration. Indeed, fantastic as it may seem, I
-should put Miss Austen as near to Swift in some ways, as I have put her
-to Addison in others._
-
-_This Swiftian quality appears in the present novel as it appears
-nowhere else in the character of the immortal, the ineffable Mr.
-Collins. Mr. Collins is really_ great; _far greater than anything Addison
-ever did, almost great enough for Fielding or for Swift himself. It has
-been said that no one ever was like him. But in the first place,_ he
-_was like him; he is there--alive, imperishable, more real than hundreds
-of prime ministers and archbishops, of “metals, semi-metals, and
-distinguished philosophers.” In the second place, it is rash, I think,
-to conclude that an actual Mr. Collins was impossible or non-existent at
-the end of the eighteenth century. It is very interesting that we
-possess, in this same gallery, what may be called a spoiled first
-draught, or an unsuccessful study of him, in John Dashwood. The
-formality, the under-breeding, the meanness, are there; but the portrait
-is only half alive, and is felt to be even a little unnatural. Mr.
-Collins is perfectly natural, and perfectly alive. In fact, for all the
-“miniature,” there is something gigantic in the way in which a certain
-side, and more than one, of humanity, and especially eighteenth-century
-humanity, its Philistinism, its well-meaning but hide-bound morality,
-its formal pettiness, its grovelling respect for rank, its materialism,
-its selfishness, receives exhibition. I will not admit that one speech
-or one action of this inestimable man is incapable of being reconciled
-with reality, and I should not wonder if many of these words and actions
-are historically true._
-
-_But the greatness of Mr. Collins could not have been so satisfactorily
-exhibited if his creatress had not adjusted so artfully to him the
-figures of Mr. Bennet and of Lady Catherine de Bourgh. The latter, like
-Mr. Collins himself, has been charged with exaggeration. There is,
-perhaps, a very faint shade of colour for the charge; but it seems to me
-very faint indeed. Even now I do not think that it would be impossible
-to find persons, especially female persons, not necessarily of noble
-birth, as overbearing, as self-centred, as neglectful of good manners,
-as Lady Catherine. A hundred years ago, an earl’s daughter, the Lady
-Powerful (if not exactly Bountiful) of an out-of-the-way country parish,
-rich, long out of marital authority, and so forth, had opportunities of
-developing these agreeable characteristics which seldom present
-themselves now. As for Mr. Bennet, Miss Austen, and Mr. Darcy, and even
-Miss Elizabeth herself, were, I am inclined to think, rather hard on him
-for the “impropriety” of his conduct. His wife was evidently, and must
-always have been, a quite irreclaimable fool; and unless he had shot her
-or himself there was no way out of it for a man of sense and spirit but
-the ironic. From no other point of view is he open to any reproach,
-except for an excusable and not unnatural helplessness at the crisis of
-the elopement, and his utterances are the most acutely delightful in the
-consciously humorous kind--in the kind that we laugh with, not at--that
-even Miss Austen has put into the mouth of any of her characters. It is
-difficult to know whether he is most agreeable when talking to his wife,
-or when putting Mr. Collins through his paces; but the general sense of
-the world has probably been right in preferring to the first rank his
-consolation to the former when she maunders over the entail, “My dear,
-do not give way to such gloomy thoughts. Let us hope for better things.
-Let us flatter ourselves that_ I _may be the survivor;” and his inquiry
-to his colossal cousin as to the compliments which Mr. Collins has just
-related as made by himself to Lady Catherine, “May I ask whether these
-pleasing attentions proceed from the impulse of the moment, or are the
-result of previous study?” These are the things which give Miss Austen’s
-readers the pleasant shocks, the delightful thrills, which are felt by
-the readers of Swift, of Fielding, and we may here add, of Thackeray, as
-they are felt by the readers of no other English author of fiction
-outside of these four._
-
-_The goodness of the minor characters in_ Pride and Prejudice _has been
-already alluded to, and it makes a detailed dwelling on their beauties
-difficult in any space, and impossible in this. Mrs. Bennet we have
-glanced at, and it is not easy to say whether she is more exquisitely
-amusing or more horribly true. Much the same may be said of Kitty and
-Lydia; but it is not every author, even of genius, who would have
-differentiated with such unerring skill the effects of folly and
-vulgarity of intellect and disposition working upon the common
-weaknesses of woman at such different ages. With Mary, Miss Austen has
-taken rather less pains, though she has been even more unkind to her;
-not merely in the text, but, as we learn from those interesting
-traditional appendices which Mr. Austen Leigh has given us, in dooming
-her privately to marry “one of Mr. Philips’s clerks.” The habits of
-first copying and then retailing moral sentiments, of playing and
-singing too long in public, are, no doubt, grievous and criminal; but
-perhaps poor Mary was rather the scapegoat of the sins of blue stockings
-in that Fordyce-belectured generation. It is at any rate difficult not
-to extend to her a share of the respect and affection (affection and
-respect of a peculiar kind; doubtless), with which one regards Mr.
-Collins, when she draws the moral of Lydia’s fall. I sometimes wish
-that the exigencies of the story had permitted Miss Austen to unite
-these personages, and thus at once achieve a notable mating and soothe
-poor Mrs. Bennet’s anguish over the entail._
-
-_The Bingleys and the Gardiners and the Lucases, Miss Darcy and Miss de
-Bourgh, Jane, Wickham, and the rest, must pass without special comment,
-further than the remark that Charlotte Lucas (her egregious papa, though
-delightful, is just a little on the thither side of the line between
-comedy and farce) is a wonderfully clever study in drab of one kind, and
-that Wickham (though something of Miss Austen’s hesitation of touch in
-dealing with young men appears) is a not much less notable sketch in
-drab of another. Only genius could have made Charlotte what she is, yet
-not disagreeable; Wickham what he is, without investing him either with
-a cheap Don Juanish attractiveness or a disgusting rascality. But the
-hero and the heroine are not tints to be dismissed._
-
-_Darcy has always seemed to me by far the best and most interesting of
-Miss Austen’s heroes; the only possible competitor being Henry Tilney,
-whose part is so slight and simple that it hardly enters into
-comparison. It has sometimes, I believe, been urged that his pride is
-unnatural at first in its expression and later in its yielding, while
-his falling in love at all is not extremely probable. Here again I
-cannot go with the objectors. Darcy’s own account of the way in which
-his pride had been pampered, is perfectly rational and sufficient; and
-nothing could be, psychologically speaking, a_ causa verior _for its
-sudden restoration to healthy conditions than the shock of Elizabeth’s
-scornful refusal acting on a nature_ ex hypothesi _generous. Nothing in
-even our author is finer and more delicately touched than the change of
-his demeanour at the sudden meeting in the grounds of Pemberley. Had he
-been a bad prig or a bad coxcomb, he might have been still smarting
-under his rejection, or suspicious that the girl had come
-husband-hunting. His being neither is exactly consistent with the
-probable feelings of a man spoilt in the common sense, but not really
-injured in disposition, and thoroughly in love. As for his being in
-love, Elizabeth has given as just an exposition of the causes of that
-phenomenon as Darcy has of the conditions of his unregenerate state,
-only she has of course not counted in what was due to her own personal
-charm._
-
-_The secret of that charm many men and not a few women, from Miss Austen
-herself downwards, have felt, and like most charms it is a thing rather
-to be felt than to be explained. Elizabeth of course belongs to the_
-allegro _or_ allegra _division of the army of Venus. Miss Austen was
-always provokingly chary of description in regard to her beauties; and
-except the fine eyes, and a hint or two that she had at any rate
-sometimes a bright complexion, and was not very tall, we hear nothing
-about her looks. But her chief difference from other heroines of the
-lively type seems to lie first in her being distinctly clever--almost
-strong-minded, in the better sense of that objectionable word--and
-secondly in her being entirely destitute of ill-nature for all her
-propensity to tease and the sharpness of her tongue. Elizabeth can give
-at least as good as she gets when she is attacked; but she never
-“scratches,” and she never attacks first. Some of the merest
-obsoletenesses of phrase and manner give one or two of her early
-speeches a slight pertness, but that is nothing, and when she comes to
-serious business, as in the great proposal scene with Darcy (which is,
-as it should be, the climax of the interest of the book), and in the
-final ladies’ battle with Lady Catherine, she is unexceptionable. Then
-too she is a perfectly natural girl. She does not disguise from herself
-or anybody that she resents Darcy’s first ill-mannered personality with
-as personal a feeling. (By the way, the reproach that the ill-manners of
-this speech are overdone is certainly unjust; for things of the same
-kind, expressed no doubt less stiltedly but more coarsely, might have
-been heard in more than one ball-room during this very year from persons
-who ought to have been no worse bred than Darcy.) And she lets the
-injury done to Jane and the contempt shown to the rest of her family
-aggravate this resentment in the healthiest way in the world._
-
-_Still, all this does not explain her charm, which, taking beauty as a
-common form of all heroines, may perhaps consist in the addition to her
-playfulness, her wit, her affectionate and natural disposition, of a
-certain fearlessness very uncommon in heroines of her type and age.
-Nearly all of them would have been in speechless awe of the magnificent
-Darcy; nearly all of them would have palpitated and fluttered at the
-idea of proposals, even naughty ones, from the fascinating Wickham.
-Elizabeth, with nothing offensive, nothing_ viraginous, _nothing of the
-“New Woman” about her, has by nature what the best modern (not “new”)
-women have by education and experience, a perfect freedom from the idea
-that all men may bully her if they choose, and that most will away with
-her if they can. Though not in the least “impudent and mannish grown,”
-she has no mere sensibility, no nasty niceness about her. The form of
-passion common and likely to seem natural in Miss Austen’s day was so
-invariably connected with the display of one or the other, or both of
-these qualities, that she has not made Elizabeth outwardly passionate.
-But I, at least, have not the slightest doubt that she would have
-married Darcy just as willingly without Pemberley as with it, and
-anybody who can read between lines will not find the lovers’
-conversations in the final chapters so frigid as they might have looked
-to the Della Cruscans of their own day, and perhaps do look to the Della
-Cruscans of this._
-
-_And, after all, what is the good of seeking for the reason of
-charm?--it is there. There were better sense in the sad mechanic
-exercise of determining the reason of its absence where it is not. In
-the novels of the last hundred years there are vast numbers of young
-ladies with whom it might be a pleasure to fall in love; there are at
-least five with whom, as it seems to me, no man of taste and spirit can
-help doing so. Their names are, in chronological order, Elizabeth
-Bennet, Diana Vernon, Argemone Lavington, Beatrix Esmond, and Barbara
-Grant. I should have been most in love with Beatrix and Argemone; I
-should, I think, for mere occasional companionship, have preferred Diana
-and Barbara. But to live with and to marry, I do not know that any one
-of the four can come into competition with Elizabeth._
-
-_GEORGE SAINTSBURY._
-
-
-
-
-[Illustration: List of Illustrations.]
-
-
-                                                                    PAGE
-
-Frontispiece                                                          iv
-
-Title-page                                                             v
-
-Dedication                                                           vii
-
-Heading to Preface                                                    ix
-
-Heading to List of Illustrations                                     xxv
-
-Heading to Chapter I.                                                  1
-
-“He came down to see the place”                                        2
-
-Mr. and Mrs. Bennet                                                    5
-
-“I hope Mr. Bingley will like it”                                      6
-
-“I’m the tallest”                                                      9
-
-“He rode a black horse”                                               10
-
-“When the party entered”                                              12
-
-“She is tolerable”                                                    15
-
-Heading to Chapter IV.                                                18
-
-Heading to Chapter V.                                                 22
-
-“Without once opening his lips”                                       24
-
-Tailpiece to Chapter V.                                               26
-
-Heading to Chapter VI.                                                27
-
-“The entreaties of several”                                           31
-
-“A note for Miss Bennet”                                              36
-
-“Cheerful prognostics”                                                40
-
-“The apothecary came”                                                 43
-
-“Covering a screen”                                                   45
-
-“Mrs. Bennet and her two youngest girls”                              53
-
-Heading to Chapter X.                                                 60
-
-“No, no; stay where you are”                                          67
-
-“Piling up the fire”                                                  69
-
-Heading to Chapter XII.                                               75
-
-Heading to Chapter XIII.                                              78
-
-Heading to Chapter XIV.                                               84
-
-“Protested that he never read novels”                                 87
-
-Heading to Chapter XV.                                                89
-
-Heading to Chapter XVI.                                               95
-
-“The officers of the ----shire”                                       97
-
-“Delighted to see their dear friend again”                           108
-
-Heading to Chapter XVIII.                                            113
-
-“Such very superior dancing is not often seen”                       118
-
-“To assure you in the most animated language”                        132
-
-Heading to Chapter XX.                                               139
-
-“They entered the breakfast-room”                                    143
-
-Heading to Chapter XXI.                                              146
-
-“Walked back with them”                                              148
-
-Heading to Chapter XXII.                                             154
-
-“So much love and eloquence”                                         156
-
-“Protested he must be entirely mistaken”                             161
-
-“Whenever she spoke in a low voice”                                  166
-
-Heading to Chapter XXIV.                                             168
-
-Heading to Chapter XXV.                                              175
-
-“Offended two or three young ladies”                                 177
-
-“Will you come and see me?”                                          181
-
-“On the stairs”                                                      189
-
-“At the door”                                                        194
-
-“In conversation with the ladies”                                    198
-
-“Lady Catherine,” said she, “you have given me a treasure”           200
-
-Heading to Chapter XXX.                                              209
-
-“He never failed to inform them”                                     211
-
-“The gentlemen accompanied him”                                      213
-
-Heading to Chapter XXXI.                                             215
-
-Heading to Chapter XXXII.                                            221
-
-“Accompanied by their aunt”                                          225
-
-“On looking up”                                                      228
-
-Heading to Chapter XXXIV.                                            235
-
-“Hearing herself called”                                             243
-
-Heading to Chapter XXXVI.                                            253
-
-“Meeting accidentally in town”                                       256
-
-“His parting obeisance”                                              261
-
-“Dawson”                                                             263
-
-“The elevation of his feelings”                                      267
-
-“They had forgotten to leave any message”                            270
-
-“How nicely we are crammed in!”                                      272
-
-Heading to Chapter XL.                                               278
-
-“I am determined never to speak of it again”                         283
-
-“When Colonel Miller’s regiment went away”                           285
-
-“Tenderly flirting”                                                  290
-
-The arrival of the Gardiners                                         294
-
-“Conjecturing as to the date”                                        301
-
-Heading to Chapter XLIV.                                             318
-
-“To make herself agreeable to all”                                   321
-
-“Engaged by the river”                                               327
-
-Heading to Chapter XLVI.                                             334
-
-“I have not an instant to lose”                                      339
-
-“The first pleasing earnest of their welcome”                        345
-
-The Post                                                             359
-
-“To whom I have related the affair”                                  363
-
-Heading to Chapter XLIX.                                             368
-
-“But perhaps you would like to read it”                              370
-
-“The spiteful old ladies”                                            377
-
-“With an affectionate smile”                                         385
-
-“I am sure she did not listen”                                       393
-
-“Mr. Darcy with him”                                                 404
-
-“Jane happened to look round”                                        415
-
-“Mrs. Long and her nieces”                                           420
-
-“Lizzy, my dear, I want to speak to you”                             422
-
-Heading to Chapter LVI.                                              431
-
-“After a short survey”                                               434
-
-“But now it comes out”                                               442
-
-“The efforts of his aunt”                                            448
-
-“Unable to utter a syllable”                                         457
-
-“The obsequious civility”                                            466
-
-Heading to Chapter LXI.                                              472
-
-The End                                                              476
-
-
-
-
-[Illustration: ·PRIDE AND PREJUDICE·
-
-
-
-
-Chapter I.]
-
-
-It is a truth universally acknowledged, that a single man in possession
-of a good fortune must be in want of a wife.
-
-However little known the feelings or views of such a man may be on his
-first entering a neighbourhood, this truth is so well fixed in the minds
-of the surrounding families, that he is considered as the rightful
-property of some one or other of their daughters.
-
-“My dear Mr. Bennet,” said his lady to him one day, “have you heard that
-Netherfield Park is let at last?”
-
-Mr. Bennet replied that he had not.
-
-“But it is,” returned she; “for Mrs. Long has just been here, and she
-told me all about it.”
-
-Mr. Bennet made no answer.
-
-“Do not you want to know who has taken it?” cried his wife, impatiently.
-
-“_You_ want to tell me, and I have no objection to hearing it.”
-
-[Illustration:
-
-“He came down to see the place”
-
-[_Copyright 1894 by George Allen._]]
-
-This was invitation enough.
-
-“Why, my dear, you must know, Mrs. Long says that Netherfield is taken
-by a young man of large fortune from the north of England; that he came
-down on Monday in a chaise and four to see the place, and was so much
-delighted with it that he agreed with Mr. Morris immediately; that he is
-to take possession before Michaelmas, and some of his servants are to be
-in the house by the end of next week.”
-
-“What is his name?”
-
-“Bingley.”
-
-“Is he married or single?”
-
-“Oh, single, my dear, to be sure! A single man of large fortune; four or
-five thousand a year. What a fine thing for our girls!”
-
-“How so? how can it affect them?”
-
-“My dear Mr. Bennet,” replied his wife, “how can you be so tiresome? You
-must know that I am thinking of his marrying one of them.”
-
-“Is that his design in settling here?”
-
-“Design? Nonsense, how can you talk so! But it is very likely that he
-_may_ fall in love with one of them, and therefore you must visit him as
-soon as he comes.”
-
-“I see no occasion for that. You and the girls may go--or you may send
-them by themselves, which perhaps will be still better; for as you are
-as handsome as any of them, Mr. Bingley might like you the best of the
-party.”
-
-“My dear, you flatter me. I certainly _have_ had my share of beauty, but
-I do not pretend to be anything extraordinary now. When a woman has five
-grown-up daughters, she ought to give over thinking of her own beauty.”
-
-“In such cases, a woman has not often much beauty to think of.”
-
-“But, my dear, you must indeed go and see Mr. Bingley when he comes into
-the neighbourhood.”
-
-“It is more than I engage for, I assure you.”
-
-“But consider your daughters. Only think what an establishment it would
-be for one of them. Sir William and Lady Lucas are determined to go,
-merely on that account; for in general, you know, they visit no new
-comers. Indeed you must go, for it will be impossible for _us_ to visit
-him, if you do not.”
-
-“You are over scrupulous, surely. I dare say Mr. Bingley will be very
-glad to see you; and I will send a few lines by you to assure him of my
-hearty consent to his marrying whichever he chooses of the girls--though
-I must throw in a good word for my little Lizzy.”
-
-“I desire you will do no such thing. Lizzy is not a bit better than the
-others: and I am sure she is not half so handsome as Jane, nor half so
-good-humoured as Lydia. But you are always giving _her_ the preference.”
-
-“They have none of them much to recommend them,” replied he: “they are
-all silly and ignorant like other girls; but Lizzy has something more of
-quickness than her sisters.”
-
-“Mr. Bennet, how can you abuse your own children in such a way? You take
-delight in vexing me. You have no compassion on my poor nerves.”
-
-“You mistake me, my dear. I have a high respect for your nerves. They
-are my old friends. I have heard you mention them with consideration
-these twenty years at least.”
-
-“Ah, you do not know what I suffer.”
-
-“But I hope you will get over it, and live to see many young men of four
-thousand a year come into the neighbourhood.”
-
-“It will be no use to us, if twenty such should come, since you will not
-visit them.”
-
-“Depend upon it, my dear, that when there are twenty, I will visit them
-all.”
-
-Mr. Bennet was so odd a mixture of quick parts, sarcastic humour,
-reserve, and caprice, that the experience of three-and-twenty years had
-been insufficient to make his wife understand his character. _Her_ mind
-was less difficult to develope. She was a woman of mean understanding,
-little information, and uncertain temper. When she was discontented, she
-fancied herself nervous. The business of her life was to get her
-daughters married: its solace was visiting and news.
-
-[Illustration: M^{r.} & M^{rs.} Bennet
-
-[_Copyright 1894 by George Allen._]]
-
-
-
-
-[Illustration:
-
-“I hope Mr. Bingley will like it”
-
-[_Copyright 1894 by George Allen._]]
-
-
-
-
-CHAPTER II.
-
-
-[Illustration]
-
-Mr. Bennet was among the earliest of those who waited on Mr. Bingley. He
-had always intended to visit him, though to the last always assuring his
-wife that he should not go; and till the evening after the visit was
-paid she had no knowledge of it. It was then disclosed in the following
-manner. Observing his second daughter employed in trimming a hat, he
-suddenly addressed her with,--
-
-“I hope Mr. Bingley will like it, Lizzy.”
-
-“We are not in a way to know _what_ Mr. Bingley likes,” said her mother,
-resentfully, “since we are not to visit.”
-
-“But you forget, mamma,” said Elizabeth, “that we shall meet him at the
-assemblies, and that Mrs. Long has promised to introduce him.”
-
-“I do not believe Mrs. Long will do any such thing. She has two nieces
-of her own. She is a selfish, hypocritical woman, and I have no opinion
-of her.”
-
-“No more have I,” said Mr. Bennet; “and I am glad to find that you do
-not depend on her serving you.”
-
-Mrs. Bennet deigned not to make any reply; but, unable to contain
-herself, began scolding one of her daughters.
-
-“Don’t keep coughing so, Kitty, for heaven’s sake! Have a little
-compassion on my nerves. You tear them to pieces.”
-
-“Kitty has no discretion in her coughs,” said her father; “she times
-them ill.”
-
-“I do not cough for my own amusement,” replied Kitty, fretfully. “When
-is your next ball to be, Lizzy?”
-
-“To-morrow fortnight.”
-
-“Ay, so it is,” cried her mother, “and Mrs. Long does not come back till
-the day before; so, it will be impossible for her to introduce him, for
-she will not know him herself.”
-
-“Then, my dear, you may have the advantage of your friend, and introduce
-Mr. Bingley to _her_.”
-
-“Impossible, Mr. Bennet, impossible, when I am not acquainted with him
-myself; how can you be so teasing?”
-
-“I honour your circumspection. A fortnight’s acquaintance is certainly
-very little. One cannot know what a man really is by the end of a
-fortnight. But if _we_ do not venture, somebody else will; and after
-all, Mrs. Long and her nieces must stand their chance; and, therefore,
-as she will think it an act of kindness, if you decline the office, I
-will take it on myself.”
-
-The girls stared at their father. Mrs. Bennet said only, “Nonsense,
-nonsense!”
-
-“What can be the meaning of that emphatic exclamation?” cried he. “Do
-you consider the forms of introduction, and the stress that is laid on
-them, as nonsense? I cannot quite agree with you _there_. What say you,
-Mary? For you are a young lady of deep reflection, I know, and read
-great books, and make extracts.”
-
-Mary wished to say something very sensible, but knew not how.
-
-“While Mary is adjusting her ideas,” he continued, “let us return to Mr.
-Bingley.”
-
-“I am sick of Mr. Bingley,” cried his wife.
-
-“I am sorry to hear _that_; but why did you not tell me so before? If I
-had known as much this morning, I certainly would not have called on
-him. It is very unlucky; but as I have actually paid the visit, we
-cannot escape the acquaintance now.”
-
-The astonishment of the ladies was just what he wished--that of Mrs.
-Bennet perhaps surpassing the rest; though when the first tumult of joy
-was over, she began to declare that it was what she had expected all the
-while.
-
-“How good it was in you, my dear Mr. Bennet! But I knew I should
-persuade you at last. I was sure you loved your girls too well to
-neglect such an acquaintance. Well, how pleased I am! And it is such a
-good joke, too, that you should have gone this morning, and never said a
-word about it till now.”
-
-“Now, Kitty, you may cough as much as you choose,” said Mr. Bennet; and,
-as he spoke, he left the room, fatigued with the raptures of his wife.
-
-“What an excellent father you have, girls,” said she, when the door was
-shut. “I do not know how you will ever make him amends for his kindness;
-or me either, for that matter. At our time of life, it is not so
-pleasant, I can tell you, to be making new acquaintances every day; but
-for your sakes we would do anything. Lydia, my love, though you _are_
-the youngest, I dare say Mr. Bingley will dance with you at the next
-ball.”
-
-“Oh,” said Lydia, stoutly, “I am not afraid; for though I _am_ the
-youngest, I’m the tallest.”
-
-The rest of the evening was spent in conjecturing how soon he would
-return Mr. Bennet’s visit, and determining when they should ask him to
-dinner.
-
-[Illustration: “I’m the tallest”]
-
-
-
-
-[Illustration:
-
-     “He rode a black horse”
-]
-
-
-
-
-CHAPTER III.
-
-
-[Illustration]
-
-Not all that Mrs. Bennet, however, with the assistance of her five
-daughters, could ask on the subject, was sufficient to draw from her
-husband any satisfactory description of Mr. Bingley. They attacked him
-in various ways, with barefaced questions, ingenious suppositions, and
-distant surmises; but he eluded the skill of them all; and they were at
-last obliged to accept the second-hand intelligence of their neighbour,
-Lady Lucas. Her report was highly favourable. Sir William had been
-delighted with him. He was quite young, wonderfully handsome, extremely
-agreeable, and, to crown the whole, he meant to be at the next assembly
-with a large party. Nothing could be more delightful! To be fond of
-dancing was a certain step towards falling in love; and very lively
-hopes of Mr. Bingley’s heart were entertained.
-
-“If I can but see one of my daughters happily settled at Netherfield,”
-said Mrs. Bennet to her husband, “and all the others equally well
-married, I shall have nothing to wish for.”
-
-In a few days Mr. Bingley returned Mr. Bennet’s visit, and sat about ten
-minutes with him in his library. He had entertained hopes of being
-admitted to a sight of the young ladies, of whose beauty he had heard
-much; but he saw only the father. The ladies were somewhat more
-fortunate, for they had the advantage of ascertaining, from an upper
-window, that he wore a blue coat and rode a black horse.
-
-An invitation to dinner was soon afterwards despatched; and already had
-Mrs. Bennet planned the courses that were to do credit to her
-housekeeping, when an answer arrived which deferred it all. Mr. Bingley
-was obliged to be in town the following day, and consequently unable to
-accept the honour of their invitation, etc. Mrs. Bennet was quite
-disconcerted. She could not imagine what business he could have in town
-so soon after his arrival in Hertfordshire; and she began to fear that
-he might always be flying about from one place to another, and never
-settled at Netherfield as he ought to be. Lady Lucas quieted her fears a
-little by starting the idea of his
-
-[Illustration:
-
-     “When the Party entered”
-
-[_Copyright 1894 by George Allen._]]
-
-being gone to London only to get a large party for the ball; and a
-report soon followed that Mr. Bingley was to bring twelve ladies and
-seven gentlemen with him to the assembly. The girls grieved over such a
-number of ladies; but were comforted the day before the ball by hearing
-that, instead of twelve, he had brought only six with him from London,
-his five sisters and a cousin. And when the party entered the
-assembly-room, it consisted of only five altogether: Mr. Bingley, his
-two sisters, the husband of the eldest, and another young man.
-
-Mr. Bingley was good-looking and gentlemanlike: he had a pleasant
-countenance, and easy, unaffected manners. His sisters were fine women,
-with an air of decided fashion. His brother-in-law, Mr. Hurst, merely
-looked the gentleman; but his friend Mr. Darcy soon drew the attention
-of the room by his fine, tall person, handsome features, noble mien, and
-the report, which was in general circulation within five minutes after
-his entrance, of his having ten thousand a year. The gentlemen
-pronounced him to be a fine figure of a man, the ladies declared he was
-much handsomer than Mr. Bingley, and he was looked at with great
-admiration for about half the evening, till his manners gave a disgust
-which turned the tide of his popularity; for he was discovered to be
-proud, to be above his company, and above being pleased; and not all his
-large estate in Derbyshire could save him from having a most forbidding,
-disagreeable countenance, and being unworthy to be compared with his
-friend.
-
-Mr. Bingley had soon made himself acquainted with all the principal
-people in the room: he was lively and unreserved, danced every dance,
-was angry that the ball closed so early, and talked of giving one
-himself at Netherfield. Such amiable qualities must speak for
-themselves. What a contrast between him and his friend! Mr. Darcy danced
-only once with Mrs. Hurst and once with Miss Bingley, declined being
-introduced to any other lady, and spent the rest of the evening in
-walking about the room, speaking occasionally to one of his own party.
-His character was decided. He was the proudest, most disagreeable man in
-the world, and everybody hoped that he would never come there again.
-Amongst the most violent against him was Mrs. Bennet, whose dislike of
-his general behaviour was sharpened into particular resentment by his
-having slighted one of her daughters.
-
-Elizabeth Bennet had been obliged, by the scarcity of gentlemen, to sit
-down for two dances; and during part of that time, Mr. Darcy had been
-standing near enough for her to overhear a conversation between him and
-Mr. Bingley, who came from the dance for a few minutes to press his
-friend to join it.
-
-“Come, Darcy,” said he, “I must have you dance. I hate to see you
-standing about by yourself in this stupid manner. You had much better
-dance.”
-
-“I certainly shall not. You know how I detest it, unless I am
-particularly acquainted with my partner. At such an assembly as this, it
-would be insupportable. Your sisters are engaged, and there is not
-another woman in the room whom it would not be a punishment to me to
-stand up with.”
-
-“I would not be so fastidious as you are,” cried Bingley, “for a
-kingdom! Upon my honour, I never met with so many pleasant girls in my
-life as I have this evening; and there are several of them, you see,
-uncommonly pretty.”
-
-“_You_ are dancing with the only handsome girl in the room,” said Mr.
-Darcy, looking at the eldest Miss Bennet.
-
-“Oh, she is the most beautiful creature I ever beheld! But there is one
-of her sisters sitting down just behind you, who is very pretty, and I
-dare say very agreeable. Do let me ask my partner to introduce you.”
-
-[Illustration:
-
-“She is tolerable”
-
-[_Copyright 1894 by George Allen._]]
-
-“Which do you mean?” and turning round, he looked for a moment at
-Elizabeth, till, catching her eye, he withdrew his own, and coldly said,
-“She is tolerable: but not handsome enough to tempt _me_; and I am in no
-humour at present to give consequence to young ladies who are slighted
-by other men. You had better return to your partner and enjoy her
-smiles, for you are wasting your time with me.”
-
-Mr. Bingley followed his advice. Mr. Darcy walked off; and Elizabeth
-remained with no very cordial feelings towards him. She told the story,
-however, with great spirit among her friends; for she had a lively,
-playful disposition, which delighted in anything ridiculous.
-
-The evening altogether passed off pleasantly to the whole family. Mrs.
-Bennet had seen her eldest daughter much admired by the Netherfield
-party. Mr. Bingley had danced with her twice, and she had been
-distinguished by his sisters. Jane was as much gratified by this as her
-mother could be, though in a quieter way. Elizabeth felt Jane’s
-pleasure. Mary had heard herself mentioned to Miss Bingley as the most
-accomplished girl in the neighbourhood; and Catherine and Lydia had been
-fortunate enough to be never without partners, which was all that they
-had yet learnt to care for at a ball. They returned, therefore, in good
-spirits to Longbourn, the village where they lived, and of which they
-were the principal inhabitants. They found Mr. Bennet still up. With a
-book, he was regardless of time; and on the present occasion he had a
-good deal of curiosity as to the event of an evening which had raised
-such splendid expectations. He had rather hoped that all his wife’s
-views on the stranger would be disappointed; but he soon found that he
-had a very different story to hear.
-
-“Oh, my dear Mr. Bennet,” as she entered the room, “we have had a most
-delightful evening, a most excellent ball. I wish you had been there.
-Jane was so admired, nothing could be like it. Everybody said how well
-she looked; and Mr. Bingley thought her quite beautiful, and danced with
-her twice. Only think of _that_, my dear: he actually danced with her
-twice; and she was the only creature in the room that he asked a second
-time. First of all, he asked Miss Lucas. I was so vexed to see him stand
-up with her; but, however, he did not admire her at all; indeed, nobody
-can, you know; and he seemed quite struck with Jane as she was going
-down the dance. So he inquired who she was, and got introduced, and
-asked her for the two next. Then, the two third he danced with Miss
-King, and the two fourth with Maria Lucas, and the two fifth with Jane
-again, and the two sixth with Lizzy, and the _Boulanger_----”
-
-“If he had had any compassion for _me_,” cried her husband impatiently,
-“he would not have danced half so much! For God’s sake, say no more of
-his partners. O that he had sprained his ancle in the first dance!”
-
-“Oh, my dear,” continued Mrs. Bennet, “I am quite delighted with him. He
-is so excessively handsome! and his sisters are charming women. I never
-in my life saw anything more elegant than their dresses. I dare say the
-lace upon Mrs. Hurst’s gown----”
-
-Here she was interrupted again. Mr. Bennet protested against any
-description of finery. She was therefore obliged to seek another branch
-of the subject, and related, with much bitterness of spirit, and some
-exaggeration, the shocking rudeness of Mr. Darcy.
-
-“But I can assure you,” she added, “that Lizzy does not lose much by not
-suiting _his_ fancy; for he is a most disagreeable, horrid man, not at
-all worth pleasing. So high and so conceited, that there was no enduring
-him! He walked here, and he walked there, fancying himself so very
-great! Not handsome enough to dance with! I wish you had been there, my
-dear, to have given him one of your set-downs. I quite detest the man.”
-
-
-
-
-[Illustration]
-
-
-
-
-CHAPTER IV.
-
-
-[Illustration]
-
-When Jane and Elizabeth were alone, the former, who had been cautious in
-her praise of Mr. Bingley before, expressed to her sister how very much
-she admired him.
-
-“He is just what a young-man ought to be,” said she, “sensible,
-good-humoured, lively; and I never saw such happy manners! so much ease,
-with such perfect good breeding!”
-
-“He is also handsome,” replied Elizabeth, “which a young man ought
-likewise to be if he possibly can. His character is thereby complete.”
-
-“I was very much flattered by his asking me to dance a second time. I
-did not expect such a compliment.”
-
-“Did not you? _I_ did for you. But that is one great difference between
-us. Compliments always take _you_ by surprise, and _me_ never. What
-could be more natural than his asking you again? He could not help
-seeing that you were about five times as pretty as every other woman in
-the room. No thanks to his gallantry for that. Well, he certainly is
-very agreeable, and I give you leave to like him. You have liked many a
-stupider person.”
-
-“Dear Lizzy!”
-
-“Oh, you are a great deal too apt, you know, to like people in general.
-You never see a fault in anybody. All the world are good and agreeable
-in your eyes. I never heard you speak ill of a human being in my life.”
-
-“I would wish not to be hasty in censuring anyone; but I always speak
-what I think.”
-
-“I know you do: and it is _that_ which makes the wonder. With _your_
-good sense, to be so honestly blind to the follies and nonsense of
-others! Affectation of candour is common enough; one meets with it
-everywhere. But to be candid without ostentation or design,--to take the
-good of everybody’s character and make it still better, and say nothing
-of the bad,--belongs to you alone. And so, you like this man’s sisters,
-too, do you? Their manners are not equal to his.”
-
-“Certainly not, at first; but they are very pleasing women when you
-converse with them. Miss Bingley is to live with her brother, and keep
-his house; and I am much mistaken if we shall not find a very charming
-neighbour in her.”
-
-Elizabeth listened in silence, but was not convinced: their behaviour at
-the assembly had not been calculated to please in general; and with more
-quickness of observation and less pliancy of temper than her sister, and
-with a judgment, too, unassailed by any attention to herself, she was
-very little disposed to approve them. They were, in fact, very fine
-ladies; not deficient in good-humour when they were pleased, nor in the
-power of being agreeable where they chose it; but proud and conceited.
-They were rather handsome; had been educated in one of the first private
-seminaries in town; had a fortune of twenty thousand pounds; were in the
-habit of spending more than they ought, and of associating with people
-of rank; and were, therefore, in every respect entitled to think well of
-themselves and meanly of others. They were of a respectable family in
-the north of England; a circumstance more deeply impressed on their
-memories than that their brother’s fortune and their own had been
-acquired by trade.
-
-Mr. Bingley inherited property to the amount of nearly a hundred
-thousand pounds from his father, who had intended to purchase an estate,
-but did not live to do it. Mr. Bingley intended it likewise, and
-sometimes made choice of his county; but, as he was now provided with a
-good house and the liberty of a manor, it was doubtful to many of those
-who best knew the easiness of his temper, whether he might not spend the
-remainder of his days at Netherfield, and leave the next generation to
-purchase.
-
-His sisters were very anxious for his having an estate of his own; but
-though he was now established only as a tenant, Miss Bingley was by no
-means unwilling to preside at his table; nor was Mrs. Hurst, who had
-married a man of more fashion than fortune, less disposed to consider
-his house as her home when it suited her. Mr. Bingley had not been of
-age two years when he was tempted, by an accidental recommendation, to
-look at Netherfield House. He did look at it, and into it, for half an
-hour; was pleased with the situation and the principal rooms, satisfied
-with what the owner said in its praise, and took it immediately.
-
-Between him and Darcy there was a very steady friendship, in spite of a
-great opposition of character. Bingley was endeared to Darcy by the
-easiness, openness, and ductility of his temper, though no disposition
-could offer a greater contrast to his own, and though with his own he
-never appeared dissatisfied. On the strength of Darcy’s regard, Bingley
-had the firmest reliance, and of his judgment the highest opinion. In
-understanding, Darcy was the superior. Bingley was by no means
-deficient; but Darcy was clever. He was at the same time haughty,
-reserved, and fastidious; and his manners, though well bred, were not
-inviting. In that respect his friend had greatly the advantage. Bingley
-was sure of being liked wherever he appeared; Darcy was continually
-giving offence.
-
-The manner in which they spoke of the Meryton assembly was sufficiently
-characteristic. Bingley had never met with pleasanter people or prettier
-girls in his life; everybody had been most kind and attentive to him;
-there had been no formality, no stiffness; he had soon felt acquainted
-with all the room; and as to Miss Bennet, he could not conceive an angel
-more beautiful. Darcy, on the contrary, had seen a collection of people
-in whom there was little beauty and no fashion, for none of whom he had
-felt the smallest interest, and from none received either attention or
-pleasure. Miss Bennet he acknowledged to be pretty; but she smiled too
-much.
-
-Mrs. Hurst and her sister allowed it to be so; but still they admired
-her and liked her, and pronounced her to be a sweet girl, and one whom
-they should not object to know more of. Miss Bennet was therefore
-established as a sweet girl; and their brother felt authorized by such
-commendation to think of her as he chose.
-
-
-
-
-[Illustration: [_Copyright 1894 by George Allen._]]
-
-
-
-
-CHAPTER V.
-
-
-[Illustration]
-
-Within a short walk of Longbourn lived a family with whom the Bennets
-were particularly intimate. Sir William Lucas had been formerly in trade
-in Meryton, where he had made a tolerable fortune, and risen to the
-honour of knighthood by an address to the king during his mayoralty. The
-distinction had, perhaps, been felt too strongly. It had given him a
-disgust to his business and to his residence in a small market town;
-and, quitting them both, he had removed with his family to a house about
-a mile from Meryton, denominated from that period Lucas Lodge; where he
-could think with pleasure of his own importance, and, unshackled by
-business, occupy himself solely in being civil to all the world. For,
-though elated by his rank, it did not render him supercilious; on the
-contrary, he was all attention to everybody. By nature inoffensive,
-friendly, and obliging, his presentation at St. James’s had made him
-courteous.
-
-Lady Lucas was a very good kind of woman, not too clever to be a
-valuable neighbour to Mrs. Bennet. They had several children. The eldest
-of them, a sensible, intelligent young woman, about twenty-seven, was
-Elizabeth’s intimate friend.
-
-That the Miss Lucases and the Miss Bennets should meet to talk over a
-ball was absolutely necessary; and the morning after the assembly
-brought the former to Longbourn to hear and to communicate.
-
-“_You_ began the evening well, Charlotte,” said Mrs. Bennet, with civil
-self-command, to Miss Lucas. “_You_ were Mr. Bingley’s first choice.”
-
-“Yes; but he seemed to like his second better.”
-
-“Oh, you mean Jane, I suppose, because he danced with her twice. To be
-sure that _did_ seem as if he admired her--indeed, I rather believe he
-_did_--I heard something about it--but I hardly know what--something
-about Mr. Robinson.”
-
-“Perhaps you mean what I overheard between him and Mr. Robinson: did not
-I mention it to you? Mr. Robinson’s asking him how he liked our Meryton
-assemblies, and whether he did not think there were a great many pretty
-women in the room, and _which_ he thought the prettiest? and his
-answering immediately to the last question, ‘Oh, the eldest Miss Bennet,
-beyond a doubt: there cannot be two opinions on that point.’”
-
-“Upon my word! Well, that was very decided, indeed--that does seem as
-if--but, however, it may all come to nothing, you know.”
-
-“_My_ overhearings were more to the purpose than _yours_, Eliza,” said
-Charlotte. “Mr. Darcy is not so well worth listening to as his friend,
-is he? Poor Eliza! to be only just _tolerable_.”
-
-“I beg you will not put it into Lizzy’s head to be vexed by his
-ill-treatment, for he is such a disagreeable man that it would be quite
-a misfortune to be liked by him. Mrs. Long told me last night that he
-sat close to her for half an hour without once opening his lips.”
-
-[Illustration: “Without once opening his lips”
-
-[_Copyright 1894 by George Allen._]]
-
-“Are you quite sure, ma’am? Is not there a little mistake?” said Jane.
-“I certainly saw Mr. Darcy speaking to her.”
-
-“Ay, because she asked him at last how he liked Netherfield, and he
-could not help answering her; but she said he seemed very angry at being
-spoke to.”
-
-“Miss Bingley told me,” said Jane, “that he never speaks much unless
-among his intimate acquaintance. With _them_ he is remarkably
-agreeable.”
-
-“I do not believe a word of it, my dear. If he had been so very
-agreeable, he would have talked to Mrs. Long. But I can guess how it
-was; everybody says that he is eat up with pride, and I dare say he had
-heard somehow that Mrs. Long does not keep a carriage, and had to come
-to the ball in a hack chaise.”
-
-“I do not mind his not talking to Mrs. Long,” said Miss Lucas, “but I
-wish he had danced with Eliza.”
-
-“Another time, Lizzy,” said her mother, “I would not dance with _him_,
-if I were you.”
-
-“I believe, ma’am, I may safely promise you _never_ to dance with him.”
-
-“His pride,” said Miss Lucas, “does not offend _me_ so much as pride
-often does, because there is an excuse for it. One cannot wonder that so
-very fine a young man, with family, fortune, everything in his favour,
-should think highly of himself. If I may so express it, he has a _right_
-to be proud.”
-
-“That is very true,” replied Elizabeth, “and I could easily forgive
-_his_ pride, if he had not mortified _mine_.”
-
-“Pride,” observed Mary, who piqued herself upon the solidity of her
-reflections, “is a very common failing, I believe. By all that I have
-ever read, I am convinced that it is very common indeed; that human
-nature is particularly prone to it, and that there are very few of us
-who do not cherish a feeling of self-complacency on the score of some
-quality or other, real or imaginary. Vanity and pride are different
-things, though the words are often used synonymously. A person may be
-proud without being vain. Pride relates more to our opinion of
-ourselves; vanity to what we would have others think of us.”
-
-“If I were as rich as Mr. Darcy,” cried a young Lucas, who came with his
-sisters, “I should not care how proud I was. I would keep a pack of
-foxhounds, and drink a bottle of wine every day.”
-
-“Then you would drink a great deal more than you ought,” said Mrs.
-Bennet; “and if I were to see you at it, I should take away your bottle
-directly.”
-
-The boy protested that she should not; she continued to declare that she
-would; and the argument ended only with the visit.
-
-[Illustration]
-
-
-
-
-[Illustration]
-
-
-
-
-CHAPTER VI.
-
-
-[Illustration]
-
-The ladies of Longbourn soon waited on those of Netherfield. The visit
-was returned in due form. Miss Bennet’s pleasing manners grew on the
-good-will of Mrs. Hurst and Miss Bingley; and though the mother was
-found to be intolerable, and the younger sisters not worth speaking to,
-a wish of being better acquainted with _them_ was expressed towards the
-two eldest. By Jane this attention was received with the greatest
-pleasure; but Elizabeth still saw superciliousness in their treatment of
-everybody, hardly excepting even her sister, and could not like them;
-though their kindness to Jane, such as it was, had a value, as arising,
-in all probability, from the influence of their brother’s admiration. It
-was generally evident, whenever they met, that he _did_ admire her; and
-to _her_ it was equally evident that Jane was yielding to the preference
-which she had begun to entertain for him from the first, and was in a
-way to be very much in love; but she considered with pleasure that it
-was not likely to be discovered by the world in general, since Jane
-united with great strength of feeling, a composure of temper and an
-uniform cheerfulness of manner, which would guard her from the
-suspicions of the impertinent. She mentioned this to her friend, Miss
-Lucas.
-
-“It may, perhaps, be pleasant,” replied Charlotte, “to be able to impose
-on the public in such a case; but it is sometimes a disadvantage to be
-so very guarded. If a woman conceals her affection with the same skill
-from the object of it, she may lose the opportunity of fixing him; and
-it will then be but poor consolation to believe the world equally in the
-dark. There is so much of gratitude or vanity in almost every
-attachment, that it is not safe to leave any to itself. We can all
-_begin_ freely--a slight preference is natural enough; but there are
-very few of us who have heart enough to be really in love without
-encouragement. In nine cases out of ten, a woman had better show _more_
-affection than she feels. Bingley likes your sister undoubtedly; but he
-may never do more than like her, if she does not help him on.”
-
-“But she does help him on, as much as her nature will allow. If _I_ can
-perceive her regard for him, he must be a simpleton indeed not to
-discover it too.”
-
-“Remember, Eliza, that he does not know Jane’s disposition as you do.”
-
-“But if a woman is partial to a man, and does not endeavor to conceal
-it, he must find it out.”
-
-“Perhaps he must, if he sees enough of her. But though Bingley and Jane
-meet tolerably often, it is never for many hours together; and as they
-always see each other in large mixed parties, it is impossible that
-every moment should be employed in conversing together. Jane should
-therefore make the most of every half hour in which she can command his
-attention. When she is secure of him, there will be leisure for falling
-in love as much as she chooses.”
-
-“Your plan is a good one,” replied Elizabeth, “where nothing is in
-question but the desire of being well married; and if I were determined
-to get a rich husband, or any husband, I dare say I should adopt it. But
-these are not Jane’s feelings; she is not acting by design. As yet she
-cannot even be certain of the degree of her own regard, nor of its
-reasonableness. She has known him only a fortnight. She danced four
-dances with him at Meryton; she saw him one morning at his own house,
-and has since dined in company with him four times. This is not quite
-enough to make her understand his character.”
-
-“Not as you represent it. Had she merely _dined_ with him, she might
-only have discovered whether he had a good appetite; but you must
-remember that four evenings have been also spent together--and four
-evenings may do a great deal.”
-
-“Yes: these four evenings have enabled them to ascertain that they both
-like Vingt-un better than Commerce, but with respect to any other
-leading characteristic, I do not imagine that much has been unfolded.”
-
-“Well,” said Charlotte, “I wish Jane success with all my heart; and if
-she were married to him to-morrow, I should think she had as good a
-chance of happiness as if she were to be studying his character for a
-twelvemonth. Happiness in marriage is entirely a matter of chance. If
-the dispositions of the parties are ever so well known to each other, or
-ever so similar beforehand, it does not advance their felicity in the
-least. They always continue to grow sufficiently unlike afterwards to
-have their share of vexation; and it is better to know as little as
-possible of the defects of the person with whom you are to pass your
-life.”
-
-“You make me laugh, Charlotte; but it is not sound. You know it is not
-sound, and that you would never act in this way yourself.”
-
-Occupied in observing Mr. Bingley’s attention to her sister, Elizabeth
-was far from suspecting that she was herself becoming an object of some
-interest in the eyes of his friend. Mr. Darcy had at first scarcely
-allowed her to be pretty: he had looked at her without admiration at the
-ball; and when they next met, he looked at her only to criticise. But no
-sooner had he made it clear to himself and his friends that she had
-hardly a good feature in her face, than he began to find it was rendered
-uncommonly intelligent by the beautiful expression of her dark eyes. To
-this discovery succeeded some others equally mortifying. Though he had
-detected with a critical eye more than one failure of perfect symmetry
-in her form, he was forced to acknowledge her figure to be light and
-pleasing; and in spite of his asserting that her manners were not those
-of the fashionable world, he was caught by their easy playfulness. Of
-this she was perfectly unaware: to her he was only the man who made
-himself agreeable nowhere, and who had not thought her handsome enough
-to dance with.
-
-He began to wish to know more of her; and, as a step towards conversing
-with her himself, attended to her conversation with others. His doing so
-drew her notice. It was at Sir William Lucas’s, where a large party were
-assembled.
-
-“What does Mr. Darcy mean,” said she to Charlotte, “by listening to my
-conversation with Colonel Forster?”
-
-“That is a question which Mr. Darcy only can answer.”
-
-“But if he does it any more, I shall certainly let him know that I see
-what he is about. He has a very satirical eye, and if I do not begin by
-being impertinent myself, I shall soon grow afraid of him.”
-
-[Illustration: “The entreaties of several” [_Copyright 1894 by George
-Allen._]]
-
-On his approaching them soon afterwards, though without seeming to have
-any intention of speaking, Miss Lucas defied her friend to mention such
-a subject to him, which immediately provoking Elizabeth to do it, she
-turned to him and said,--
-
-“Did not you think, Mr. Darcy, that I expressed myself uncommonly well
-just now, when I was teasing Colonel Forster to give us a ball at
-Meryton?”
-
-“With great energy; but it is a subject which always makes a lady
-energetic.”
-
-“You are severe on us.”
-
-“It will be _her_ turn soon to be teased,” said Miss Lucas. “I am going
-to open the instrument, Eliza, and you know what follows.”
-
-“You are a very strange creature by way of a friend!--always wanting me
-to play and sing before anybody and everybody! If my vanity had taken a
-musical turn, you would have been invaluable; but as it is, I would
-really rather not sit down before those who must be in the habit of
-hearing the very best performers.” On Miss Lucas’s persevering, however,
-she added, “Very well; if it must be so, it must.” And gravely glancing
-at Mr. Darcy, “There is a very fine old saying, which everybody here is
-of course familiar with--‘Keep your breath to cool your porridge,’--and
-I shall keep mine to swell my song.”
-
-Her performance was pleasing, though by no means capital. After a song
-or two, and before she could reply to the entreaties of several that she
-would sing again, she was eagerly succeeded at the instrument by her
-sister Mary, who having, in consequence of being the only plain one in
-the family, worked hard for knowledge and accomplishments, was always
-impatient for display.
-
-Mary had neither genius nor taste; and though vanity had given her
-application, it had given her likewise a pedantic air and conceited
-manner, which would have injured a higher degree of excellence than she
-had reached. Elizabeth, easy and unaffected, had been listened to with
-much more pleasure, though not playing half so well; and Mary, at the
-end of a long concerto, was glad to purchase praise and gratitude by
-Scotch and Irish airs, at the request of her younger sisters, who with
-some of the Lucases, and two or three officers, joined eagerly in
-dancing at one end of the room.
-
-Mr. Darcy stood near them in silent indignation at such a mode of
-passing the evening, to the exclusion of all conversation, and was too
-much engrossed by his own thoughts to perceive that Sir William Lucas
-was his neighbour, till Sir William thus began:--
-
-“What a charming amusement for young people this is, Mr. Darcy! There is
-nothing like dancing, after all. I consider it as one of the first
-refinements of polished societies.”
-
-“Certainly, sir; and it has the advantage also of being in vogue amongst
-the less polished societies of the world: every savage can dance.”
-
-Sir William only smiled. “Your friend performs delightfully,” he
-continued, after a pause, on seeing Bingley join the group; “and I doubt
-not that you are an adept in the science yourself, Mr. Darcy.”
-
-“You saw me dance at Meryton, I believe, sir.”
-
-“Yes, indeed, and received no inconsiderable pleasure from the sight. Do
-you often dance at St. James’s?”
-
-“Never, sir.”
-
-“Do you not think it would be a proper compliment to the place?”
-
-“It is a compliment which I never pay to any place if I can avoid it.”
-
-“You have a house in town, I conclude?”
-
-Mr. Darcy bowed.
-
-“I had once some thoughts of fixing in town myself, for I am fond of
-superior society; but I did not feel quite certain that the air of
-London would agree with Lady Lucas.”
-
-He paused in hopes of an answer: but his companion was not disposed to
-make any; and Elizabeth at that instant moving towards them, he was
-struck with the notion of doing a very gallant thing, and called out to
-her,--
-
-“My dear Miss Eliza, why are not you dancing? Mr. Darcy, you must allow
-me to present this young lady to you as a very desirable partner. You
-cannot refuse to dance, I am sure, when so much beauty is before you.”
-And, taking her hand, he would have given it to Mr. Darcy, who, though
-extremely surprised, was not unwilling to receive it, when she instantly
-drew back, and said with some discomposure to Sir William,--
-
-“Indeed, sir, I have not the least intention of dancing. I entreat you
-not to suppose that I moved this way in order to beg for a partner.”
-
-Mr. Darcy, with grave propriety, requested to be allowed the honour of
-her hand, but in vain. Elizabeth was determined; nor did Sir William at
-all shake her purpose by his attempt at persuasion.
-
-“You excel so much in the dance, Miss Eliza, that it is cruel to deny me
-the happiness of seeing you; and though this gentleman dislikes the
-amusement in general, he can have no objection, I am sure, to oblige us
-for one half hour.”
-
-“Mr. Darcy is all politeness,” said Elizabeth, smiling.
-
-“He is, indeed: but considering the inducement, my dear Miss Eliza, we
-cannot wonder at his complaisance; for who would object to such a
-partner?”
-
-Elizabeth looked archly, and turned away. Her resistance had not injured
-her with the gentleman, and he was thinking of her with some
-complacency, when thus accosted by Miss Bingley,--
-
-“I can guess the subject of your reverie.”
-
-“I should imagine not.”
-
-“You are considering how insupportable it would be to pass many
-evenings in this manner,--in such society; and, indeed, I am quite of
-your opinion. I was never more annoyed! The insipidity, and yet the
-noise--the nothingness, and yet the self-importance, of all these
-people! What would I give to hear your strictures on them!”
-
-“Your conjecture is totally wrong, I assure you. My mind was more
-agreeably engaged. I have been meditating on the very great pleasure
-which a pair of fine eyes in the face of a pretty woman can bestow.”
-
-Miss Bingley immediately fixed her eyes on his face, and desired he
-would tell her what lady had the credit of inspiring such reflections.
-Mr. Darcy replied, with great intrepidity,--
-
-“Miss Elizabeth Bennet.”
-
-“Miss Elizabeth Bennet!” repeated Miss Bingley. “I am all astonishment.
-How long has she been such a favourite? and pray when am I to wish you
-joy?”
-
-“That is exactly the question which I expected you to ask. A lady’s
-imagination is very rapid; it jumps from admiration to love, from love
-to matrimony, in a moment. I knew you would be wishing me joy.”
-
-“Nay, if you are so serious about it, I shall consider the matter as
-absolutely settled. You will have a charming mother-in-law, indeed, and
-of course she will be always at Pemberley with you.”
-
-He listened to her with perfect indifference, while she chose to
-entertain herself in this manner; and as his composure convinced her
-that all was safe, her wit flowed along.
-
-
-
-
-[Illustration:
-
-     “A note for Miss Bennet”
-
-[_Copyright 1894 by George Allen._]]
-
-
-
-
-CHAPTER VII.
-
-
-[Illustration]
-
-Mr. Bennet’s property consisted almost entirely in an estate of two
-thousand a year, which, unfortunately for his daughters, was entailed,
-in default of heirs male, on a distant relation; and their mother’s
-fortune, though ample for her situation in life, could but ill supply
-the deficiency of his. Her father had been an attorney in Meryton, and
-had left her four thousand pounds.
-
-She had a sister married to a Mr. Philips, who had been a clerk to their
-father and succeeded him in the business, and a brother settled in
-London in a respectable line of trade.
-
-The village of Longbourn was only one mile from Meryton; a most
-convenient distance for the young ladies, who were usually tempted
-thither three or four times a week, to pay their duty to their aunt, and
-to a milliner’s shop just over the way. The two youngest of the family,
-Catherine and Lydia, were particularly frequent in these attentions:
-their minds were more vacant than their sisters’, and when nothing
-better offered, a walk to Meryton was necessary to amuse their morning
-hours and furnish conversation for the evening; and, however bare of
-news the country in general might be, they always contrived to learn
-some from their aunt. At present, indeed, they were well supplied both
-with news and happiness by the recent arrival of a militia regiment in
-the neighbourhood; it was to remain the whole winter, and Meryton was
-the head-quarters.
-
-Their visits to Mrs. Philips were now productive of the most interesting
-intelligence. Every day added something to their knowledge of the
-officers’ names and connections. Their lodgings were not long a secret,
-and at length they began to know the officers themselves. Mr. Philips
-visited them all, and this opened to his nieces a source of felicity
-unknown before. They could talk of nothing but officers; and Mr.
-Bingley’s large fortune, the mention of which gave animation to their
-mother, was worthless in their eyes when opposed to the regimentals of
-an ensign.
-
-After listening one morning to their effusions on this subject, Mr.
-Bennet coolly observed,--
-
-“From all that I can collect by your manner of talking, you must be two
-of the silliest girls in the country. I have suspected it some time, but
-I am now convinced.”
-
-Catherine was disconcerted, and made no answer; but Lydia, with perfect
-indifference, continued to express her admiration of Captain Carter, and
-her hope of seeing him in the course of the day, as he was going the
-next morning to London.
-
-“I am astonished, my dear,” said Mrs. Bennet, “that you should be so
-ready to think your own children silly. If I wished to think slightingly
-of anybody’s children, it should not be of my own, however.”
-
-“If my children are silly, I must hope to be always sensible of it.”
-
-“Yes; but as it happens, they are all of them very clever.”
-
-“This is the only point, I flatter myself, on which we do not agree. I
-had hoped that our sentiments coincided in every particular, but I must
-so far differ from you as to think our two youngest daughters uncommonly
-foolish.”
-
-“My dear Mr. Bennet, you must not expect such girls to have the sense of
-their father and mother. When they get to our age, I dare say they will
-not think about officers any more than we do. I remember the time when I
-liked a red coat myself very well--and, indeed, so I do still at my
-heart; and if a smart young colonel, with five or six thousand a year,
-should want one of my girls, I shall not say nay to him; and I thought
-Colonel Forster looked very becoming the other night at Sir William’s in
-his regimentals.”
-
-“Mamma,” cried Lydia, “my aunt says that Colonel Forster and Captain
-Carter do not go so often to Miss Watson’s as they did when they first
-came; she sees them now very often standing in Clarke’s library.”
-
-Mrs. Bennet was prevented replying by the entrance of the footman with a
-note for Miss Bennet; it came from Netherfield, and the servant waited
-for an answer. Mrs. Bennet’s eyes sparkled with pleasure, and she was
-eagerly calling out, while her daughter read,--
-
-“Well, Jane, who is it from? What is it about? What does he say? Well,
-Jane, make haste and tell us; make haste, my love.”
-
-“It is from Miss Bingley,” said Jane, and then read it aloud.
-
-     /* NIND “My dear friend, */
-
-     “If you are not so compassionate as to dine to-day with Louisa and
-     me, we shall be in danger of hating each other for the rest of our
-     lives; for a whole day’s _tête-à-tête_ between two women can never
-     end without a quarrel. Come as soon as you can on the receipt of
-     this. My brother and the gentlemen are to dine with the officers.
-     Yours ever,
-
-“CAROLINE BINGLEY.”
-
-“With the officers!” cried Lydia: “I wonder my aunt did not tell us of
-_that_.”
-
-“Dining out,” said Mrs. Bennet; “that is very unlucky.”
-
-“Can I have the carriage?” said Jane.
-
-“No, my dear, you had better go on horseback, because it seems likely to
-rain; and then you must stay all night.”
-
-“That would be a good scheme,” said Elizabeth, “if you were sure that
-they would not offer to send her home.”
-
-“Oh, but the gentlemen will have Mr. Bingley’s chaise to go to Meryton;
-and the Hursts have no horses to theirs.”
-
-“I had much rather go in the coach.”
-
-“But, my dear, your father cannot spare the horses, I am sure. They are
-wanted in the farm, Mr. Bennet, are not they?”
-
-[Illustration: Cheerful prognostics]
-
-“They are wanted in the farm much oftener than I can get them.”
-
-“But if you have got them to-day,” said Elizabeth, “my mother’s purpose
-will be answered.”
-
-She did at last extort from her father an acknowledgment that the horses
-were engaged; Jane was therefore obliged to go on horseback, and her
-mother attended her to the door with many cheerful prognostics of a bad
-day. Her hopes were answered; Jane had not been gone long before it
-rained hard. Her sisters were uneasy for her, but her mother was
-delighted. The rain continued the whole evening without intermission;
-Jane certainly could not come back.
-
-“This was a lucky idea of mine, indeed!” said Mrs. Bennet, more than
-once, as if the credit of making it rain were all her own. Till the next
-morning, however, she was not aware of all the felicity of her
-contrivance. Breakfast was scarcely over when a servant from Netherfield
-brought the following note for Elizabeth:--
-
-     /* NIND “My dearest Lizzie, */
-
-     “I find myself very unwell this morning, which, I suppose, is to be
-     imputed to my getting wet through yesterday. My kind friends will
-     not hear of my returning home till I am better. They insist also on
-     my seeing Mr. Jones--therefore do not be alarmed if you should hear
-     of his having been to me--and, excepting a sore throat and a
-     headache, there is not much the matter with me.
-
-“Yours, etc.”
-
-“Well, my dear,” said Mr. Bennet, when Elizabeth had read the note
-aloud, “if your daughter should have a dangerous fit of illness--if she
-should die--it would be a comfort to know that it was all in pursuit of
-Mr. Bingley, and under your orders.”
-
-“Oh, I am not at all afraid of her dying. People do not die of little
-trifling colds. She will be taken good care of. As long as she stays
-there, it is all very well. I would go and see her if I could have the
-carriage.”
-
-Elizabeth, feeling really anxious, determined to go to her, though the
-carriage was not to be had: and as she was no horsewoman, walking was
-her only alternative. She declared her resolution.
-
-“How can you be so silly,” cried her mother, “as to think of such a
-thing, in all this dirt! You will not be fit to be seen when you get
-there.”
-
-“I shall be very fit to see Jane--which is all I want.”
-
-“Is this a hint to me, Lizzy,” said her father, “to send for the
-horses?”
-
-“No, indeed. I do not wish to avoid the walk. The distance is nothing,
-when one has a motive; only three miles. I shall be back by dinner.”
-
-“I admire the activity of your benevolence,” observed Mary, “but every
-impulse of feeling should be guided by reason; and, in my opinion,
-exertion should always be in proportion to what is required.”
-
-“We will go as far as Meryton with you,” said Catherine and Lydia.
-Elizabeth accepted their company, and the three young ladies set off
-together.
-
-“If we make haste,” said Lydia, as they walked along, “perhaps we may
-see something of Captain Carter, before he goes.”
-
-In Meryton they parted: the two youngest repaired to the lodgings of one
-of the officers’ wives, and Elizabeth continued her walk alone, crossing
-field after field at a quick pace, jumping over stiles and springing
-over puddles, with impatient activity, and finding herself at last
-within view of the house, with weary ancles, dirty stockings, and a face
-glowing with the warmth of exercise.
-
-She was shown into the breakfast parlour, where all but Jane were
-assembled, and where her appearance created a great deal of surprise.
-That she should have walked three miles so early in the day in such
-dirty weather, and by herself, was almost incredible to Mrs. Hurst and
-Miss Bingley; and Elizabeth was convinced that they held her in contempt
-for it. She was received, however, very politely by them; and in their
-brother’s manners there was something better than politeness--there was
-good-humour and kindness. Mr. Darcy said very little, and Mr. Hurst
-nothing at all. The former was divided between admiration of the
-brilliancy which exercise had given to her complexion and doubt as to
-the occasion’s justifying her coming so far alone. The latter was
-thinking only of his breakfast.
-
-Her inquiries after her sister were not very favourably answered. Miss
-Bennet had slept ill, and though up, was very feverish, and not well
-enough to leave her room. Elizabeth was glad to be taken to her
-immediately; and Jane, who had only been withheld by the fear of giving
-alarm or inconvenience, from expressing in her note how much she longed
-for such a visit, was delighted at her entrance. She was not equal,
-however, to much conversation; and when Miss Bingley left them together,
-could attempt little beside expressions of gratitude for the
-extraordinary kindness she was treated with. Elizabeth silently attended
-her.
-
-When breakfast was over, they were joined by the sisters; and Elizabeth
-began to like them herself, when she saw how much affection and
-solicitude they showed for Jane. The apothecary came; and having
-examined his patient, said, as might be supposed, that she had caught a
-violent cold, and that they must endeavour to get the better of it;
-advised her to return to bed, and promised her some draughts. The advice
-was followed readily, for the feverish symptoms increased, and her head
-ached acutely. Elizabeth did not quit her room for a moment, nor were
-the other ladies often absent; the gentlemen being out, they had in fact
-nothing to do elsewhere.
-
-When the clock struck three, Elizabeth felt that she must go, and very
-unwillingly said so. Miss Bingley offered her the carriage, and she only
-wanted a little pressing to accept it, when Jane testified such concern
-at parting with her that Miss Bingley was obliged to convert the offer
-of the chaise into an invitation to remain at Netherfield for the
-present. Elizabeth most thankfully consented, and a servant was
-despatched to Longbourn, to acquaint the family with her stay, and bring
-back a supply of clothes.
-
-[Illustration:
-
-“The Apothecary came”
-]
-
-
-
-
-[Illustration:
-
-“covering a screen”
-]
-
-
-
-
-CHAPTER VIII.
-
-
-[Illustration]
-
-At five o’clock the two ladies retired to dress, and at half-past six
-Elizabeth was summoned to dinner. To the civil inquiries which then
-poured in, and amongst which she had the pleasure of distinguishing the
-much superior solicitude of Mr. Bingley, she could not make a very
-favourable answer. Jane was by no means better. The sisters, on hearing
-this, repeated three or four times how much they were grieved, how
-shocking it was to have a bad cold, and how excessively they disliked
-being ill themselves; and then thought no more of the matter: and their
-indifference towards Jane, when not immediately before them, restored
-Elizabeth to the enjoyment of all her original dislike.
-
-Their brother, indeed, was the only one of the party whom she could
-regard with any complacency. His anxiety for Jane was evident, and his
-attentions to herself most pleasing; and they prevented her feeling
-herself so much an intruder as she believed she was considered by the
-others. She had very little notice from any but him. Miss Bingley was
-engrossed by Mr. Darcy, her sister scarcely less so; and as for Mr.
-Hurst, by whom Elizabeth sat, he was an indolent man, who lived only to
-eat, drink, and play at cards, who, when he found her prefer a plain
-dish to a ragout, had nothing to say to her.
-
-When dinner was over, she returned directly to Jane, and Miss Bingley
-began abusing her as soon as she was out of the room. Her manners were
-pronounced to be very bad indeed,--a mixture of pride and impertinence:
-she had no conversation, no style, no taste, no beauty. Mrs. Hurst
-thought the same, and added,--
-
-“She has nothing, in short, to recommend her, but being an excellent
-walker. I shall never forget her appearance this morning. She really
-looked almost wild.”
-
-“She did indeed, Louisa. I could hardly keep my countenance. Very
-nonsensical to come at all! Why must _she_ be scampering about the
-country, because her sister had a cold? Her hair so untidy, so blowzy!”
-
-“Yes, and her petticoat; I hope you saw her petticoat, six inches deep
-in mud, I am absolutely certain, and the gown which had been let down to
-hide it not doing its office.”
-
-“Your picture may be very exact, Louisa,” said Bingley; “but this was
-all lost upon me. I thought Miss Elizabeth Bennet looked remarkably well
-when she came into the room this morning. Her dirty petticoat quite
-escaped my notice.”
-
-“_You_ observed it, Mr. Darcy, I am sure,” said Miss Bingley; “and I am
-inclined to think that you would not wish to see _your sister_ make such
-an exhibition.”
-
-“Certainly not.”
-
-“To walk three miles, or four miles, or five miles, or whatever it is,
-above her ancles in dirt, and alone, quite alone! what could she mean by
-it? It seems to me to show an abominable sort of conceited independence,
-a most country-town indifference to decorum.”
-
-“It shows an affection for her sister that is very pleasing,” said
-Bingley.
-
-“I am afraid, Mr. Darcy,” observed Miss Bingley, in a half whisper,
-“that this adventure has rather affected your admiration of her fine
-eyes.”
-
-“Not at all,” he replied: “they were brightened by the exercise.” A
-short pause followed this speech, and Mrs. Hurst began again,--
-
-“I have an excessive regard for Jane Bennet,--she is really a very sweet
-girl,--and I wish with all my heart she were well settled. But with such
-a father and mother, and such low connections, I am afraid there is no
-chance of it.”
-
-“I think I have heard you say that their uncle is an attorney in
-Meryton?”
-
-“Yes; and they have another, who lives somewhere near Cheapside.”
-
-“That is capital,” added her sister; and they both laughed heartily.
-
-“If they had uncles enough to fill _all_ Cheapside,” cried Bingley, “it
-would not make them one jot less agreeable.”
-
-“But it must very materially lessen their chance of marrying men of any
-consideration in the world,” replied Darcy.
-
-To this speech Bingley made no answer; but his sisters gave it their
-hearty assent, and indulged their mirth for some time at the expense of
-their dear friend’s vulgar relations.
-
-With a renewal of tenderness, however, they repaired to her room on
-leaving the dining-parlour, and sat with her till summoned to coffee.
-She was still very poorly, and Elizabeth would not quit her at all, till
-late in the evening, when she had the comfort of seeing her asleep, and
-when it appeared to her rather right than pleasant that she should go
-down stairs herself. On entering the drawing-room, she found the whole
-party at loo, and was immediately invited to join them; but suspecting
-them to be playing high, she declined it, and making her sister the
-excuse, said she would amuse herself, for the short time she could stay
-below, with a book. Mr. Hurst looked at her with astonishment.
-
-“Do you prefer reading to cards?” said he; “that is rather singular.”
-
-“Miss Eliza Bennet,” said Miss Bingley, “despises cards. She is a great
-reader, and has no pleasure in anything else.”
-
-“I deserve neither such praise nor such censure,” cried Elizabeth; “I
-am _not_ a great reader, and I have pleasure in many things.”
-
-“In nursing your sister I am sure you have pleasure,” said Bingley; “and
-I hope it will soon be increased by seeing her quite well.”
-
-Elizabeth thanked him from her heart, and then walked towards a table
-where a few books were lying. He immediately offered to fetch her
-others; all that his library afforded.
-
-“And I wish my collection were larger for your benefit and my own
-credit; but I am an idle fellow; and though I have not many, I have more
-than I ever looked into.”
-
-Elizabeth assured him that she could suit herself perfectly with those
-in the room.
-
-“I am astonished,” said Miss Bingley, “that my father should have left
-so small a collection of books. What a delightful library you have at
-Pemberley, Mr. Darcy!”
-
-“It ought to be good,” he replied: “it has been the work of many
-generations.”
-
-“And then you have added so much to it yourself--you are always buying
-books.”
-
-“I cannot comprehend the neglect of a family library in such days as
-these.”
-
-“Neglect! I am sure you neglect nothing that can add to the beauties of
-that noble place. Charles, when you build _your_ house, I wish it may be
-half as delightful as Pemberley.”
-
-“I wish it may.”
-
-“But I would really advise you to make your purchase in that
-neighbourhood, and take Pemberley for a kind of model. There is not a
-finer county in England than Derbyshire.”
-
-“With all my heart: I will buy Pemberley itself, if Darcy will sell it.”
-
-“I am talking of possibilities, Charles.”
-
-“Upon my word, Caroline, I should think it more possible to get
-Pemberley by purchase than by imitation.”
-
-Elizabeth was so much caught by what passed, as to leave her very little
-attention for her book; and, soon laying it wholly aside, she drew near
-the card-table, and stationed herself between Mr. Bingley and his eldest
-sister, to observe the game.
-
-“Is Miss Darcy much grown since the spring?” said Miss Bingley: “will
-she be as tall as I am?”
-
-“I think she will. She is now about Miss Elizabeth Bennet’s height, or
-rather taller.”
-
-“How I long to see her again! I never met with anybody who delighted me
-so much. Such a countenance, such manners, and so extremely accomplished
-for her age! Her performance on the pianoforte is exquisite.”
-
-“It is amazing to me,” said Bingley, “how young ladies can have patience
-to be so very accomplished as they all are.”
-
-“All young ladies accomplished! My dear Charles, what do you mean?”
-
-“Yes, all of them, I think. They all paint tables, cover screens, and
-net purses. I scarcely know any one who cannot do all this; and I am
-sure I never heard a young lady spoken of for the first time, without
-being informed that she was very accomplished.”
-
-“Your list of the common extent of accomplishments,” said Darcy, “has
-too much truth. The word is applied to many a woman who deserves it no
-otherwise than by netting a purse or covering a screen; but I am very
-far from agreeing with you in your estimation of ladies in general. I
-cannot boast of knowing more than half-a-dozen in the whole range of my
-acquaintance that are really accomplished.”
-
-“Nor I, I am sure,” said Miss Bingley.
-
-“Then,” observed Elizabeth, “you must comprehend a great deal in your
-idea of an accomplished woman.”
-
-“Yes; I do comprehend a great deal in it.”
-
-“Oh, certainly,” cried his faithful assistant, “no one can be really
-esteemed accomplished who does not greatly surpass what is usually met
-with. A woman must have a thorough knowledge of music, singing, drawing,
-dancing, and the modern languages, to deserve the word; and, besides all
-this, she must possess a certain something in her air and manner of
-walking, the tone of her voice, her address and expressions, or the word
-will be but half deserved.”
-
-“All this she must possess,” added Darcy; “and to all she must yet add
-something more substantial in the improvement of her mind by extensive
-reading.”
-
-“I am no longer surprised at your knowing _only_ six accomplished women.
-I rather wonder now at your knowing _any_.”
-
-“Are you so severe upon your own sex as to doubt the possibility of all
-this?”
-
-“_I_ never saw such a woman. _I_ never saw such capacity, and taste, and
-application, and elegance, as you describe, united.”
-
-Mrs. Hurst and Miss Bingley both cried out against the injustice of her
-implied doubt, and were both protesting that they knew many women who
-answered this description, when Mr. Hurst called them to order, with
-bitter complaints of their inattention to what was going forward. As all
-conversation was thereby at an end, Elizabeth soon afterwards left the
-room.
-
-“Eliza Bennet,” said Miss Bingley, when the door was closed on her, “is
-one of those young ladies who seek to recommend themselves to the other
-sex by undervaluing their own; and with many men, I daresay, it
-succeeds; but, in my opinion, it is a paltry device, a very mean art.”
-
-“Undoubtedly,” replied Darcy, to whom this remark was chiefly addressed,
-“there is meanness in _all_ the arts which ladies sometimes condescend
-to employ for captivation. Whatever bears affinity to cunning is
-despicable.”
-
-Miss Bingley was not so entirely satisfied with this reply as to
-continue the subject.
-
-Elizabeth joined them again only to say that her sister was worse, and
-that she could not leave her. Bingley urged Mr. Jones’s being sent for
-immediately; while his sisters, convinced that no country advice could
-be of any service, recommended an express to town for one of the most
-eminent physicians. This she would not hear of; but she was not so
-unwilling to comply with their brother’s proposal; and it was settled
-that Mr. Jones should be sent for early in the morning, if Miss Bennet
-were not decidedly better. Bingley was quite uncomfortable; his sisters
-declared that they were miserable. They solaced their wretchedness,
-however, by duets after supper; while he could find no better relief to
-his feelings than by giving his housekeeper directions that every
-possible attention might be paid to the sick lady and her sister.
-
-
-
-
-[Illustration:
-
-M^{rs} Bennet and her two youngest girls
-
-[_Copyright 1894 by George Allen._]]
-
-
-
-
-CHAPTER IX.
-
-
-[Illustration]
-
-Elizabeth passed the chief of the night in her sister’s room, and in the
-morning had the pleasure of being able to send a tolerable answer to the
-inquiries which she very early received from Mr. Bingley by a housemaid,
-and some time afterwards from the two elegant ladies who waited on his
-sisters. In spite of this amendment, however, she requested to have a
-note sent to Longbourn, desiring her mother to visit Jane, and form her
-own judgment of her situation. The note was immediately despatched, and
-its contents as quickly complied with. Mrs. Bennet, accompanied by her
-two youngest girls, reached Netherfield soon after the family breakfast.
-
-Had she found Jane in any apparent danger, Mrs. Bennet would have been
-very miserable; but being satisfied on seeing her that her illness was
-not alarming, she had no wish of her recovering immediately, as her
-restoration to health would probably remove her from Netherfield. She
-would not listen, therefore, to her daughter’s proposal of being carried
-home; neither did the apothecary, who arrived about the same time, think
-it at all advisable. After sitting a little while with Jane, on Miss
-Bingley’s appearance and invitation, the mother and three daughters all
-attended her into the breakfast parlour. Bingley met them with hopes
-that Mrs. Bennet had not found Miss Bennet worse than she expected.
-
-“Indeed I have, sir,” was her answer. “She is a great deal too ill to be
-moved. Mr. Jones says we must not think of moving her. We must trespass
-a little longer on your kindness.”
-
-“Removed!” cried Bingley. “It must not be thought of. My sister, I am
-sure, will not hear of her removal.”
-
-“You may depend upon it, madam,” said Miss Bingley, with cold civility,
-“that Miss Bennet shall receive every possible attention while she
-remains with us.”
-
-Mrs. Bennet was profuse in her acknowledgments.
-
-“I am sure,” she added, “if it was not for such good friends, I do not
-know what would become of her, for she is very ill indeed, and suffers a
-vast deal, though with the greatest patience in the world, which is
-always the way with her, for she has, without exception, the sweetest
-temper I ever met with. I often tell my other girls they are nothing to
-_her_. You have a sweet room here, Mr. Bingley, and a charming prospect
-over that gravel walk. I do not know a place in the country that is
-equal to Netherfield. You will not think of quitting it in a hurry, I
-hope, though you have but a short lease.”
-
-“Whatever I do is done in a hurry,” replied he; “and therefore if I
-should resolve to quit Netherfield, I should probably be off in five
-minutes. At present, however, I consider myself as quite fixed here.”
-
-“That is exactly what I should have supposed of you,” said Elizabeth.
-
-“You begin to comprehend me, do you?” cried he, turning towards her.
-
-“Oh yes--I understand you perfectly.”
-
-“I wish I might take this for a compliment; but to be so easily seen
-through, I am afraid, is pitiful.”
-
-“That is as it happens. It does not necessarily follow that a deep,
-intricate character is more or less estimable than such a one as yours.”
-
-“Lizzy,” cried her mother, “remember where you are, and do not run on in
-the wild manner that you are suffered to do at home.”
-
-“I did not know before,” continued Bingley, immediately, “that you were
-a studier of character. It must be an amusing study.”
-
-“Yes; but intricate characters are the _most_ amusing. They have at
-least that advantage.”
-
-“The country,” said Darcy, “can in general supply but few subjects for
-such a study. In a country neighbourhood you move in a very confined and
-unvarying society.”
-
-“But people themselves alter so much, that there is something new to be
-observed in them for ever.”
-
-“Yes, indeed,” cried Mrs. Bennet, offended by his manner of mentioning a
-country neighbourhood. “I assure you there is quite as much of _that_
-going on in the country as in town.”
-
-Everybody was surprised; and Darcy, after looking at her for a moment,
-turned silently away. Mrs. Bennet, who fancied she had gained a complete
-victory over him, continued her triumph,--
-
-“I cannot see that London has any great advantage over the country, for
-my part, except the shops and public places. The country is a vast deal
-pleasanter, is not it, Mr. Bingley?”
-
-“When I am in the country,” he replied, “I never wish to leave it; and
-when I am in town, it is pretty much the same. They have each their
-advantages, and I can be equally happy in either.”
-
-“Ay, that is because you have the right disposition. But that
-gentleman,” looking at Darcy, “seemed to think the country was nothing
-at all.”
-
-“Indeed, mamma, you are mistaken,” said Elizabeth, blushing for her
-mother. “You quite mistook Mr. Darcy. He only meant that there was not
-such a variety of people to be met with in the country as in town, which
-you must acknowledge to be true.”
-
-“Certainly, my dear, nobody said there were; but as to not meeting with
-many people in this neighbourhood, I believe there are few
-neighbourhoods larger. I know we dine with four-and-twenty families.”
-
-Nothing but concern for Elizabeth could enable Bingley to keep his
-countenance. His sister was less delicate, and directed her eye towards
-Mr. Darcy with a very expressive smile. Elizabeth, for the sake of
-saying something that might turn her mother’s thoughts, now asked her if
-Charlotte Lucas had been at Longbourn since _her_ coming away.
-
-“Yes, she called yesterday with her father. What an agreeable man Sir
-William is, Mr. Bingley--is not he? so much the man of fashion! so
-genteel and so easy! He has always something to say to everybody. _That_
-is my idea of good breeding; and those persons who fancy themselves very
-important and never open their mouths quite mistake the matter.”
-
-“Did Charlotte dine with you?”
-
-“No, she would go home. I fancy she was wanted about the mince-pies. For
-my part, Mr. Bingley, _I_ always keep servants that can do their own
-work; _my_ daughters are brought up differently. But everybody is to
-judge for themselves, and the Lucases are a very good sort of girls, I
-assure you. It is a pity they are not handsome! Not that _I_ think
-Charlotte so _very_ plain; but then she is our particular friend.”
-
-“She seems a very pleasant young woman,” said Bingley.
-
-“Oh dear, yes; but you must own she is very plain. Lady Lucas herself
-has often said so, and envied me Jane’s beauty. I do not like to boast
-of my own child; but to be sure, Jane--one does not often see anybody
-better looking. It is what everybody says. I do not trust my own
-partiality. When she was only fifteen there was a gentleman at my
-brother Gardiner’s in town so much in love with her, that my
-sister-in-law was sure he would make her an offer before we came away.
-But, however, he did not. Perhaps he thought her too young. However, he
-wrote some verses on her, and very pretty they were.”
-
-“And so ended his affection,” said Elizabeth, impatiently. “There has
-been many a one, I fancy, overcome in the same way. I wonder who first
-discovered the efficacy of poetry in driving away love!”
-
-“I have been used to consider poetry as the _food_ of love,” said Darcy.
-
-“Of a fine, stout, healthy love it may. Everything nourishes what is
-strong already. But if it be only a slight, thin sort of inclination, I
-am convinced that one good sonnet will starve it entirely away.”
-
-Darcy only smiled; and the general pause which ensued made Elizabeth
-tremble lest her mother should be exposing herself again. She longed to
-speak, but could think of nothing to say; and after a short silence Mrs.
-Bennet began repeating her thanks to Mr. Bingley for his kindness to
-Jane, with an apology for troubling him also with Lizzy. Mr. Bingley was
-unaffectedly civil in his answer, and forced his younger sister to be
-civil also, and say what the occasion required. She performed her part,
-indeed, without much graciousness, but Mrs. Bennet was satisfied, and
-soon afterwards ordered her carriage. Upon this signal, the youngest of
-her daughters put herself forward. The two girls had been whispering to
-each other during the whole visit; and the result of it was, that the
-youngest should tax Mr. Bingley with having promised on his first coming
-into the country to give a ball at Netherfield.
-
-Lydia was a stout, well-grown girl of fifteen, with a fine complexion
-and good-humoured countenance; a favourite with her mother, whose
-affection had brought her into public at an early age. She had high
-animal spirits, and a sort of natural self-consequence, which the
-attentions of the officers, to whom her uncle’s good dinners and her
-own easy manners recommended her, had increased into assurance. She was
-very equal, therefore, to address Mr. Bingley on the subject of the
-ball, and abruptly reminded him of his promise; adding, that it would be
-the most shameful thing in the world if he did not keep it. His answer
-to this sudden attack was delightful to her mother’s ear.
-
-“I am perfectly ready, I assure you, to keep my engagement; and, when
-your sister is recovered, you shall, if you please, name the very day of
-the ball. But you would not wish to be dancing while she is ill?”
-
-Lydia declared herself satisfied. “Oh yes--it would be much better to
-wait till Jane was well; and by that time, most likely, Captain Carter
-would be at Meryton again. And when you have given _your_ ball,” she
-added, “I shall insist on their giving one also. I shall tell Colonel
-Forster it will be quite a shame if he does not.”
-
-Mrs. Bennet and her daughters then departed, and Elizabeth returned
-instantly to Jane, leaving her own and her relations’ behaviour to the
-remarks of the two ladies and Mr. Darcy; the latter of whom, however,
-could not be prevailed on to join in their censure of _her_, in spite of
-all Miss Bingley’s witticisms on _fine eyes_.
-
-
-
-
-[Illustration]
-
-
-
-
-CHAPTER X.
-
-
-[Illustration]
-
-The day passed much as the day before had done. Mrs. Hurst and Miss
-Bingley had spent some hours of the morning with the invalid, who
-continued, though slowly, to mend; and, in the evening, Elizabeth joined
-their party in the drawing-room. The loo table, however, did not appear.
-Mr. Darcy was writing, and Miss Bingley, seated near him, was watching
-the progress of his letter, and repeatedly calling off his attention by
-messages to his sister. Mr. Hurst and Mr. Bingley were at piquet, and
-Mrs. Hurst was observing their game.
-
-Elizabeth took up some needlework, and was sufficiently amused in
-attending to what passed between Darcy and his companion. The perpetual
-commendations of the lady either on his hand-writing, or on the evenness
-of his lines, or on the length of his letter, with the perfect unconcern
-with which her praises were received, formed a curious dialogue, and was
-exactly in unison with her opinion of each.
-
-“How delighted Miss Darcy will be to receive such a letter!”
-
-He made no answer.
-
-“You write uncommonly fast.”
-
-“You are mistaken. I write rather slowly.”
-
-“How many letters you must have occasion to write in the course of a
-year! Letters of business, too! How odious I should think them!”
-
-“It is fortunate, then, that they fall to my lot instead of to yours.”
-
-“Pray tell your sister that I long to see her.”
-
-“I have already told her so once, by your desire.”
-
-“I am afraid you do not like your pen. Let me mend it for you. I mend
-pens remarkably well.”
-
-“Thank you--but I always mend my own.”
-
-“How can you contrive to write so even?”
-
-He was silent.
-
-“Tell your sister I am delighted to hear of her improvement on the harp,
-and pray let her know that I am quite in raptures with her beautiful
-little design for a table, and I think it infinitely superior to Miss
-Grantley’s.”
-
-“Will you give me leave to defer your raptures till I write again? At
-present I have not room to do them justice.”
-
-“Oh, it is of no consequence. I shall see her in January. But do you
-always write such charming long letters to her, Mr. Darcy?”
-
-“They are generally long; but whether always charming, it is not for me
-to determine.”
-
-“It is a rule with me, that a person who can write a long letter with
-ease cannot write ill.”
-
-“That will not do for a compliment to Darcy, Caroline,” cried her
-brother, “because he does _not_ write with ease. He studies too much
-for words of four syllables. Do not you, Darcy?”
-
-“My style of writing is very different from yours.”
-
-“Oh,” cried Miss Bingley, “Charles writes in the most careless way
-imaginable. He leaves out half his words, and blots the rest.”
-
-“My ideas flow so rapidly that I have not time to express them; by which
-means my letters sometimes convey no ideas at all to my correspondents.”
-
-“Your humility, Mr. Bingley,” said Elizabeth, “must disarm reproof.”
-
-“Nothing is more deceitful,” said Darcy, “than the appearance of
-humility. It is often only carelessness of opinion, and sometimes an
-indirect boast.”
-
-“And which of the two do you call _my_ little recent piece of modesty?”
-
-“The indirect boast; for you are really proud of your defects in
-writing, because you consider them as proceeding from a rapidity of
-thought and carelessness of execution, which, if not estimable, you
-think at least highly interesting. The power of doing anything with
-quickness is always much prized by the possessor, and often without any
-attention to the imperfection of the performance. When you told Mrs.
-Bennet this morning, that if you ever resolved on quitting Netherfield
-you should be gone in five minutes, you meant it to be a sort of
-panegyric, of compliment to yourself; and yet what is there so very
-laudable in a precipitance which must leave very necessary business
-undone, and can be of no real advantage to yourself or anyone else?”
-
-“Nay,” cried Bingley, “this is too much, to remember at night all the
-foolish things that were said in the morning. And yet, upon my honour, I
-believed what I said of myself to be true, and I believe it at this
-moment. At least, therefore, I did not assume the character of needless
-precipitance merely to show off before the ladies.”
-
-“I daresay you believed it; but I am by no means convinced that you
-would be gone with such celerity. Your conduct would be quite as
-dependent on chance as that of any man I know; and if, as you were
-mounting your horse, a friend were to say, ‘Bingley, you had better stay
-till next week,’ you would probably do it--you would probably not
-go--and, at another word, might stay a month.”
-
-“You have only proved by this,” cried Elizabeth, “that Mr. Bingley did
-not do justice to his own disposition. You have shown him off now much
-more than he did himself.”
-
-“I am exceedingly gratified,” said Bingley, “by your converting what my
-friend says into a compliment on the sweetness of my temper. But I am
-afraid you are giving it a turn which that gentleman did by no means
-intend; for he would certainly think the better of me if, under such a
-circumstance, I were to give a flat denial, and ride off as fast as I
-could.”
-
-“Would Mr. Darcy then consider the rashness of your original intention
-as atoned for by your obstinacy in adhering to it?”
-
-“Upon my word, I cannot exactly explain the matter--Darcy must speak for
-himself.”
-
-“You expect me to account for opinions which you choose to call mine,
-but which I have never acknowledged. Allowing the case, however, to
-stand according to your representation, you must remember, Miss Bennet,
-that the friend who is supposed to desire his return to the house, and
-the delay of his plan, has merely desired it, asked it without offering
-one argument in favour of its propriety.”
-
-“To yield readily--easily--to the _persuasion_ of a friend is no merit
-with you.”
-
-“To yield without conviction is no compliment to the understanding of
-either.”
-
-“You appear to me, Mr. Darcy, to allow nothing for the influence of
-friendship and affection. A regard for the requester would often make
-one readily yield to a request, without waiting for arguments to reason
-one into it. I am not particularly speaking of such a case as you have
-supposed about Mr. Bingley. We may as well wait, perhaps, till the
-circumstance occurs, before we discuss the discretion of his behaviour
-thereupon. But in general and ordinary cases, between friend and friend,
-where one of them is desired by the other to change a resolution of no
-very great moment, should you think ill of that person for complying
-with the desire, without waiting to be argued into it?”
-
-“Will it not be advisable, before we proceed on this subject, to arrange
-with rather more precision the degree of importance which is to
-appertain to this request, as well as the degree of intimacy subsisting
-between the parties?”
-
-“By all means,” cried Bingley; “let us hear all the particulars, not
-forgetting their comparative height and size, for that will have more
-weight in the argument, Miss Bennet, than you may be aware of. I assure
-you that if Darcy were not such a great tall fellow, in comparison with
-myself, I should not pay him half so much deference. I declare I do not
-know a more awful object than Darcy on particular occasions, and in
-particular places; at his own house especially, and of a Sunday evening,
-when he has nothing to do.”
-
-Mr. Darcy smiled; but Elizabeth thought she could perceive that he was
-rather offended, and therefore checked her laugh. Miss Bingley warmly
-resented the indignity he had received, in an expostulation with her
-brother for talking such nonsense.
-
-“I see your design, Bingley,” said his friend. “You dislike an argument,
-and want to silence this.”
-
-“Perhaps I do. Arguments are too much like disputes. If you and Miss
-Bennet will defer yours till I am out of the room, I shall be very
-thankful; and then you may say whatever you like of me.”
-
-“What you ask,” said Elizabeth, “is no sacrifice on my side; and Mr.
-Darcy had much better finish his letter.”
-
-Mr. Darcy took her advice, and did finish his letter.
-
-When that business was over, he applied to Miss Bingley and Elizabeth
-for the indulgence of some music. Miss Bingley moved with alacrity to
-the pianoforte, and after a polite request that Elizabeth would lead the
-way, which the other as politely and more earnestly negatived, she
-seated herself.
-
-Mrs. Hurst sang with her sister; and while they were thus employed,
-Elizabeth could not help observing, as she turned over some music-books
-that lay on the instrument, how frequently Mr. Darcy’s eyes were fixed
-on her. She hardly knew how to suppose that she could be an object of
-admiration to so great a man, and yet that he should look at her because
-he disliked her was still more strange. She could only imagine, however,
-at last, that she drew his notice because there was something about her
-more wrong and reprehensible, according to his ideas of right, than in
-any other person present. The supposition did not pain her. She liked
-him too little to care for his approbation.
-
-After playing some Italian songs, Miss Bingley varied the charm by a
-lively Scotch air; and soon afterwards Mr. Darcy, drawing near
-Elizabeth, said to her,--
-
-“Do you not feel a great inclination, Miss Bennet, to seize such an
-opportunity of dancing a reel?”
-
-She smiled, but made no answer. He repeated the question, with some
-surprise at her silence.
-
-“Oh,” said she, “I heard you before; but I could not immediately
-determine what to say in reply. You wanted me, I know, to say ‘Yes,’
-that you might have the pleasure of despising my taste; but I always
-delight in overthrowing those kind of schemes, and cheating a person of
-their premeditated contempt. I have, therefore, made up my mind to tell
-you that I do not want to dance a reel at all; and now despise me if you
-dare.”
-
-“Indeed I do not dare.”
-
-Elizabeth, having rather expected to affront him, was amazed at his
-gallantry; but there was a mixture of sweetness and archness in her
-manner which made it difficult for her to affront anybody, and Darcy had
-never been so bewitched by any woman as he was by her. He really
-believed that, were it not for the inferiority of her connections, he
-should be in some danger.
-
-Miss Bingley saw, or suspected, enough to be jealous; and her great
-anxiety for the recovery of her dear friend Jane received some
-assistance from her desire of getting rid of Elizabeth.
-
-She often tried to provoke Darcy into disliking her guest, by talking of
-their supposed marriage, and planning his happiness in such an alliance.
-
-“I hope,” said she, as they were walking together in the shrubbery the
-next day, “you will give your mother-in-law a few hints, when this
-desirable event takes place, as to the advantage of holding her tongue;
-and if you can compass it, to cure the younger girls of running after
-the officers. And, if I may mention so delicate a subject, endeavour to
-check that little something, bordering on conceit and impertinence,
-which your lady possesses.”
-
-[Illustration:
-
-     “No, no; stay where you are”
-
-[_Copyright 1894 by George Allen._]]
-
-“Have you anything else to propose for my domestic felicity?”
-
-“Oh yes. Do let the portraits of your uncle and aunt Philips be placed
-in the gallery at Pemberley. Put them next to your great-uncle the
-judge. They are in the same profession, you know, only in different
-lines. As for your Elizabeth’s picture, you must not attempt to have it
-taken, for what painter could do justice to those beautiful eyes?”
-
-“It would not be easy, indeed, to catch their expression; but their
-colour and shape, and the eyelashes, so remarkably fine, might be
-copied.”
-
-At that moment they were met from another walk by Mrs. Hurst and
-Elizabeth herself.
-
-“I did not know that you intended to walk,” said Miss Bingley, in some
-confusion, lest they had been overheard.
-
-“You used us abominably ill,” answered Mrs. Hurst, “running away without
-telling us that you were coming out.”
-
-Then taking the disengaged arm of Mr. Darcy, she left Elizabeth to walk
-by herself. The path just admitted three. Mr. Darcy felt their rudeness,
-and immediately said,--
-
-“This walk is not wide enough for our party. We had better go into the
-avenue.”
-
-But Elizabeth, who had not the least inclination to remain with them,
-laughingly answered,--
-
-“No, no; stay where you are. You are charmingly grouped, and appear to
-uncommon advantage. The picturesque would be spoilt by admitting a
-fourth. Good-bye.”
-
-She then ran gaily off, rejoicing, as she rambled about, in the hope of
-being at home again in a day or two. Jane was already so much recovered
-as to intend leaving her room for a couple of hours that evening.
-
-
-
-
-[Illustration:
-
-     “Piling up the fire”
-
-[_Copyright 1894 by George Allen._]]
-
-
-
-
-CHAPTER XI.
-
-
-[Illustration]
-
-When the ladies removed after dinner Elizabeth ran up to her sister, and
-seeing her well guarded from cold, attended her into the drawing-room,
-where she was welcomed by her two friends with many professions of
-pleasure; and Elizabeth had never seen them so agreeable as they were
-during the hour which passed before the gentlemen appeared. Their powers
-of conversation were considerable. They could describe an entertainment
-with accuracy, relate an anecdote with humour, and laugh at their
-acquaintance with spirit.
-
-But when the gentlemen entered, Jane was no longer the first object;
-Miss Bingley’s eyes were instantly turned towards Darcy, and she had
-something to say to him before he had advanced many steps. He addressed
-himself directly to Miss Bennet with a polite congratulation; Mr. Hurst
-also made her a slight bow, and said he was “very glad;” but diffuseness
-and warmth remained for Bingley’s salutation. He was full of joy and
-attention. The first half hour was spent in piling up the fire, lest she
-should suffer from the change of room; and she removed, at his desire,
-to the other side of the fireplace, that she might be farther from the
-door. He then sat down by her, and talked scarcely to anyone else.
-Elizabeth, at work in the opposite corner, saw it all with great
-delight.
-
-When tea was over Mr. Hurst reminded his sister-in-law of the
-card-table--but in vain. She had obtained private intelligence that Mr.
-Darcy did not wish for cards, and Mr. Hurst soon found even his open
-petition rejected. She assured him that no one intended to play, and the
-silence of the whole party on the subject seemed to justify her. Mr.
-Hurst had, therefore, nothing to do but to stretch himself on one of the
-sofas and go to sleep. Darcy took up a book. Miss Bingley did the same;
-and Mrs. Hurst, principally occupied in playing with her bracelets and
-rings, joined now and then in her brother’s conversation with Miss
-Bennet.
-
-Miss Bingley’s attention was quite as much engaged in watching Mr.
-Darcy’s progress through _his_ book, as in reading her own; and she was
-perpetually either making some inquiry, or looking at his page. She
-could not win him, however, to any conversation; he merely answered her
-question and read on. At length, quite exhausted by the attempt to be
-amused with her own book, which she had only chosen because it was the
-second volume of his, she gave a great yawn and said, “How pleasant it
-is to spend an evening in this way! I declare, after all, there is no
-enjoyment like reading! How much sooner one tires of anything than of a
-book! When I have a house of my own, I shall be miserable if I have not
-an excellent library.”
-
-No one made any reply. She then yawned again, threw aside her book, and
-cast her eyes round the room in quest of some amusement; when, hearing
-her brother mentioning a ball to Miss Bennet, she turned suddenly
-towards him and said,--
-
-“By the bye Charles, are you really serious in meditating a dance at
-Netherfield? I would advise you, before you determine on it, to consult
-the wishes of the present party; I am much mistaken if there are not
-some among us to whom a ball would be rather a punishment than a
-pleasure.”
-
-“If you mean Darcy,” cried her brother, “he may go to bed, if he
-chooses, before it begins; but as for the ball, it is quite a settled
-thing, and as soon as Nicholls has made white soup enough I shall send
-round my cards.”
-
-“I should like balls infinitely better,” she replied, “if they were
-carried on in a different manner; but there is something insufferably
-tedious in the usual process of such a meeting. It would surely be much
-more rational if conversation instead of dancing made the order of the
-day.”
-
-“Much more rational, my dear Caroline, I dare say; but it would not be
-near so much like a ball.”
-
-Miss Bingley made no answer, and soon afterwards got up and walked about
-the room. Her figure was elegant, and she walked well; but Darcy, at
-whom it was all aimed, was still inflexibly studious. In the
-desperation of her feelings, she resolved on one effort more; and,
-turning to Elizabeth, said,--
-
-“Miss Eliza Bennet, let me persuade you to follow my example, and take a
-turn about the room. I assure you it is very refreshing after sitting so
-long in one attitude.”
-
-Elizabeth was surprised, but agreed to it immediately. Miss Bingley
-succeeded no less in the real object of her civility: Mr. Darcy looked
-up. He was as much awake to the novelty of attention in that quarter as
-Elizabeth herself could be, and unconsciously closed his book. He was
-directly invited to join their party, but he declined it, observing that
-he could imagine but two motives for their choosing to walk up and down
-the room together, with either of which motives his joining them would
-interfere. What could he mean? She was dying to know what could be his
-meaning--and asked Elizabeth whether she could at all understand him.
-
-“Not at all,” was her answer; “but, depend upon it, he means to be
-severe on us, and our surest way of disappointing him will be to ask
-nothing about it.”
-
-Miss Bingley, however, was incapable of disappointing Mr. Darcy in
-anything, and persevered, therefore, in requiring an explanation of his
-two motives.
-
-“I have not the smallest objection to explaining them,” said he, as soon
-as she allowed him to speak. “You either choose this method of passing
-the evening because you are in each other’s confidence, and have secret
-affairs to discuss, or because you are conscious that your figures
-appear to the greatest advantage in walking: if the first, I should be
-completely in your way; and if the second, I can admire you much better
-as I sit by the fire.”
-
-“Oh, shocking!” cried Miss Bingley. “I never heard anything so
-abominable. How shall we punish him for such a speech?”
-
-“Nothing so easy, if you have but the inclination,” said Elizabeth. “We
-can all plague and punish one another. Tease him--laugh at him. Intimate
-as you are, you must know how it is to be done.”
-
-“But upon my honour I do _not_. I do assure you that my intimacy has not
-yet taught me _that_. Tease calmness of temper and presence of mind! No,
-no; I feel he may defy us there. And as to laughter, we will not expose
-ourselves, if you please, by attempting to laugh without a subject. Mr.
-Darcy may hug himself.”
-
-“Mr. Darcy is not to be laughed at!” cried Elizabeth. “That is an
-uncommon advantage, and uncommon I hope it will continue, for it would
-be a great loss to _me_ to have many such acquaintance. I dearly love a
-laugh.”
-
-“Miss Bingley,” said he, “has given me credit for more than can be. The
-wisest and best of men,--nay, the wisest and best of their actions,--may
-be rendered ridiculous by a person whose first object in life is a
-joke.”
-
-“Certainly,” replied Elizabeth, “there are such people, but I hope I am
-not one of _them_. I hope I never ridicule what is wise or good. Follies
-and nonsense, whims and inconsistencies, _do_ divert me, I own, and I
-laugh at them whenever I can. But these, I suppose, are precisely what
-you are without.”
-
-“Perhaps that is not possible for anyone. But it has been the study of
-my life to avoid those weaknesses which often expose a strong
-understanding to ridicule.”
-
-“Such as vanity and pride.”
-
-“Yes, vanity is a weakness indeed. But pride--where there is a real
-superiority of mind--pride will be always under good regulation.”
-
-Elizabeth turned away to hide a smile.
-
-“Your examination of Mr. Darcy is over, I presume,” said Miss Bingley;
-“and pray what is the result?”
-
-“I am perfectly convinced by it that Mr. Darcy has no defect. He owns it
-himself without disguise.”
-
-“No,” said Darcy, “I have made no such pretension. I have faults enough,
-but they are not, I hope, of understanding. My temper I dare not vouch
-for. It is, I believe, too little yielding; certainly too little for the
-convenience of the world. I cannot forget the follies and vices of
-others so soon as I ought, nor their offences against myself. My
-feelings are not puffed about with every attempt to move them. My temper
-would perhaps be called resentful. My good opinion once lost is lost for
-ever.”
-
-“_That_ is a failing, indeed!” cried Elizabeth. “Implacable resentment
-_is_ a shade in a character. But you have chosen your fault well. I
-really cannot _laugh_ at it. You are safe from me.”
-
-“There is, I believe, in every disposition a tendency to some particular
-evil, a natural defect, which not even the best education can overcome.”
-
-“And _your_ defect is a propensity to hate everybody.”
-
-“And yours,” he replied, with a smile, “is wilfully to misunderstand
-them.”
-
-“Do let us have a little music,” cried Miss Bingley, tired of a
-conversation in which she had no share. “Louisa, you will not mind my
-waking Mr. Hurst.”
-
-Her sister made not the smallest objection, and the pianoforte was
-opened; and Darcy, after a few moments’ recollection, was not sorry for
-it. He began to feel the danger of paying Elizabeth too much attention.
-
-
-
-
-[Illustration]
-
-
-
-
-CHAPTER XII.
-
-
-[Illustration]
-
-In consequence of an agreement between the sisters, Elizabeth wrote the
-next morning to her mother, to beg that the carriage might be sent for
-them in the course of the day. But Mrs. Bennet, who had calculated on
-her daughters remaining at Netherfield till the following Tuesday, which
-would exactly finish Jane’s week, could not bring herself to receive
-them with pleasure before. Her answer, therefore, was not propitious, at
-least not to Elizabeth’s wishes, for she was impatient to get home. Mrs.
-Bennet sent them word that they could not possibly have the carriage
-before Tuesday; and in her postscript it was added, that if Mr. Bingley
-and his sister pressed them to stay longer, she could spare them very
-well. Against staying longer, however, Elizabeth was positively
-resolved--nor did she much expect it would be asked; and fearful, on the
-contrary, of being considered as intruding themselves needlessly long,
-she urged Jane to borrow Mr. Bingley’s carriage immediately, and at
-length it was settled that their original design of leaving Netherfield
-that morning should be mentioned, and the request made.
-
-The communication excited many professions of concern; and enough was
-said of wishing them to stay at least till the following day to work on
-Jane; and till the morrow their going was deferred. Miss Bingley was
-then sorry that she had proposed the delay; for her jealousy and dislike
-of one sister much exceeded her affection for the other.
-
-The master of the house heard with real sorrow that they were to go so
-soon, and repeatedly tried to persuade Miss Bennet that it would not be
-safe for her--that she was not enough recovered; but Jane was firm where
-she felt herself to be right.
-
-To Mr. Darcy it was welcome intelligence: Elizabeth had been at
-Netherfield long enough. She attracted him more than he liked; and Miss
-Bingley was uncivil to _her_ and more teasing than usual to himself. He
-wisely resolved to be particularly careful that no sign of admiration
-should _now_ escape him--nothing that could elevate her with the hope of
-influencing his felicity; sensible that, if such an idea had been
-suggested, his behaviour during the last day must have material weight
-in confirming or crushing it. Steady to his purpose, he scarcely spoke
-ten words to her through the whole of Saturday: and though they were at
-one time left by themselves for half an hour, he adhered most
-conscientiously to his book, and would not even look at her.
-
-On Sunday, after morning service, the separation, so agreeable to almost
-all, took place. Miss Bingley’s civility to Elizabeth increased at last
-very rapidly, as well as her affection for Jane; and when they parted,
-after assuring the latter of the pleasure it would always give her to
-see her either at Longbourn or Netherfield, and embracing her most
-tenderly, she even shook hands with the former. Elizabeth took leave of
-the whole party in the liveliest spirits.
-
-They were not welcomed home very cordially by their mother. Mrs. Bennet
-wondered at their coming, and thought them very wrong to give so much
-trouble, and was sure Jane would have caught cold again. But their
-father, though very laconic in his expressions of pleasure, was really
-glad to see them; he had felt their importance in the family circle. The
-evening conversation, when they were all assembled, had lost much of its
-animation, and almost all its sense, by the absence of Jane and
-Elizabeth.
-
-They found Mary, as usual, deep in the study of thorough bass and human
-nature; and had some new extracts to admire and some new observations of
-threadbare morality to listen to. Catherine and Lydia had information
-for them of a different sort. Much had been done, and much had been said
-in the regiment since the preceding Wednesday; several of the officers
-had dined lately with their uncle; a private had been flogged; and it
-had actually been hinted that Colonel Forster was going to be married.
-
-
-
-
-[Illustration]
-
-
-
-
-CHAPTER XIII
-
-
-[Illustration]
-
-“I hope, my dear,” said Mr. Bennet to his wife, as they were at
-breakfast the next morning, “that you have ordered a good dinner to-day,
-because I have reason to expect an addition to our family party.”
-
-“Who do you mean, my dear? I know of nobody that is coming, I am sure,
-unless Charlotte Lucas should happen to call in; and I hope _my_ dinners
-are good enough for her. I do not believe she often sees such at home.”
-
-“The person of whom I speak is a gentleman and a stranger.”
-
-Mrs. Bennet’s eyes sparkled. “A gentleman and a stranger! It is Mr.
-Bingley, I am sure. Why, Jane--you never dropped a word of this--you sly
-thing! Well, I am sure I shall be extremely glad to see Mr. Bingley.
-But--good Lord! how unlucky! there is not a bit of fish to be got
-to-day. Lydia, my love, ring the bell. I must speak to Hill this
-moment.”
-
-“It is _not_ Mr. Bingley,” said her husband; “it is a person whom I
-never saw in the whole course of my life.”
-
-This roused a general astonishment; and he had the pleasure of being
-eagerly questioned by his wife and five daughters at once.
-
-After amusing himself some time with their curiosity, he thus
-explained:--“About a month ago I received this letter, and about a
-fortnight ago I answered it; for I thought it a case of some delicacy,
-and requiring early attention. It is from my cousin, Mr. Collins, who,
-when I am dead, may turn you all out of this house as soon as he
-pleases.”
-
-“Oh, my dear,” cried his wife, “I cannot bear to hear that mentioned.
-Pray do not talk of that odious man. I do think it is the hardest thing
-in the world, that your estate should be entailed away from your own
-children; and I am sure, if I had been you, I should have tried long ago
-to do something or other about it.”
-
-Jane and Elizabeth attempted to explain to her the nature of an entail.
-They had often attempted it before: but it was a subject on which Mrs.
-Bennet was beyond the reach of reason; and she continued to rail
-bitterly against the cruelty of settling an estate away from a family of
-five daughters, in favour of a man whom nobody cared anything about.
-
-“It certainly is a most iniquitous affair,” said Mr. Bennet; “and
-nothing can clear Mr. Collins from the guilt of inheriting Longbourn.
-But if you will listen to his letter, you may, perhaps, be a little
-softened by his manner of expressing himself.”
-
-“No, that I am sure I shall not: and I think it was very impertinent of
-him to write to you at all, and very hypocritical. I hate such false
-friends. Why could not he keep on quarrelling with you, as his father
-did before him?”
-
-“Why, indeed, he does seem to have had some filial scruples on that
-head, as you will hear.”
-
-     /* RIGHT “Hunsford, near Westerham, Kent, _15th October_. */
-
-“Dear Sir,
-
-     “The disagreement subsisting between yourself and my late honoured
-     father always gave me much uneasiness; and, since I have had the
-     misfortune to lose him, I have frequently wished to heal the
-     breach: but, for some time, I was kept back by my own doubts,
-     fearing lest it might seem disrespectful to his memory for me to be
-     on good terms with anyone with whom it had always pleased him to be
-     at variance.”--‘There, Mrs. Bennet.’--“My mind, however, is now
-     made up on the subject; for, having received ordination at Easter,
-     I have been so fortunate as to be distinguished by the patronage of
-     the Right Honourable Lady Catherine de Bourgh, widow of Sir Lewis
-     de Bourgh, whose bounty and beneficence has preferred me to the
-     valuable rectory of this parish, where it shall be my earnest
-     endeavour to demean myself with grateful respect towards her
-     Ladyship, and be ever ready to perform those rites and ceremonies
-     which are instituted by the Church of England. As a clergyman,
-     moreover, I feel it my duty to promote and establish the blessing
-     of peace in all families within the reach of my influence; and on
-     these grounds I flatter myself that my present overtures of
-     good-will are highly commendable, and that the circumstance of my
-     being next in the entail of Longbourn estate will be kindly
-     overlooked on your side, and not lead you to reject the offered
-     olive branch. I cannot be otherwise than concerned at being the
-     means of injuring your amiable daughters, and beg leave to
-     apologize for it, as well as to assure you of my readiness to make
-     them every possible amends; but of this hereafter. If you should
-     have no objection to receive me into your house, I propose myself
-     the satisfaction of waiting on you and your family, Monday,
-     November 18th, by four o’clock, and shall probably trespass on your
-     hospitality till the Saturday se’nnight following, which I can do
-     without any inconvenience, as Lady Catherine is far from objecting
-     to my occasional absence on a Sunday, provided that some other
-     clergyman is engaged to do the duty of the day. I remain, dear sir,
-     with respectful compliments to your lady and daughters, your
-     well-wisher and friend,
-
-“WILLIAM COLLINS.”
-
-“At four o’clock, therefore, we may expect this peace-making gentleman,”
-said Mr. Bennet, as he folded up the letter. “He seems to be a most
-conscientious and polite young man, upon my word; and, I doubt not, will
-prove a valuable acquaintance, especially if Lady Catherine should be so
-indulgent as to let him come to us again.”
-
-“There is some sense in what he says about the girls, however; and, if
-he is disposed to make them any amends, I shall not be the person to
-discourage him.”
-
-“Though it is difficult,” said Jane, “to guess in what way he can mean
-to make us the atonement he thinks our due, the wish is certainly to his
-credit.”
-
-Elizabeth was chiefly struck with his extraordinary deference for Lady
-Catherine, and his kind intention of christening, marrying, and burying
-his parishioners whenever it were required.
-
-“He must be an oddity, I think,” said she. “I cannot make him out. There
-is something very pompous in his style. And what can he mean by
-apologizing for being next in the entail? We cannot suppose he would
-help it, if he could. Can he be a sensible man, sir?”
-
-“No, my dear; I think not. I have great hopes of finding him quite the
-reverse. There is a mixture of servility and self-importance in his
-letter which promises well. I am impatient to see him.”
-
-“In point of composition,” said Mary, “his letter does not seem
-defective. The idea of the olive branch perhaps is not wholly new, yet I
-think it is well expressed.”
-
-To Catherine and Lydia neither the letter nor its writer were in any
-degree interesting. It was next to impossible that their cousin should
-come in a scarlet coat, and it was now some weeks since they had
-received pleasure from the society of a man in any other colour. As for
-their mother, Mr. Collins’s letter had done away much of her ill-will,
-and she was preparing to see him with a degree of composure which
-astonished her husband and daughters.
-
-Mr. Collins was punctual to his time, and was received with great
-politeness by the whole family. Mr. Bennet indeed said little; but the
-ladies were ready enough to talk, and Mr. Collins seemed neither in need
-of encouragement, nor inclined to be silent himself. He was a tall,
-heavy-looking young man of five-and-twenty. His air was grave and
-stately, and his manners were very formal. He had not been long seated
-before he complimented Mrs. Bennet on having so fine a family of
-daughters, said he had heard much of their beauty, but that, in this
-instance, fame had fallen short of the truth; and added, that he did not
-doubt her seeing them all in due time well disposed of in marriage. This
-gallantry was not much to the taste of some of his hearers; but Mrs.
-Bennet, who quarrelled with no compliments, answered most readily,--
-
-“You are very kind, sir, I am sure; and I wish with all my heart it may
-prove so; for else they will be destitute enough. Things are settled so
-oddly.”
-
-“You allude, perhaps, to the entail of this estate.”
-
-“Ah, sir, I do indeed. It is a grievous affair to my poor girls, you
-must confess. Not that I mean to find fault with _you_, for such things,
-I know, are all chance in this world. There is no knowing how estates
-will go when once they come to be entailed.”
-
-“I am very sensible, madam, of the hardship to my fair cousins, and
-could say much on the subject, but that I am cautious of appearing
-forward and precipitate. But I can assure the young ladies that I come
-prepared to admire them. At present I will not say more, but, perhaps,
-when we are better acquainted----”
-
-He was interrupted by a summons to dinner; and the girls smiled on each
-other. They were not the only objects of Mr. Collins’s admiration. The
-hall, the dining-room, and all its furniture, were examined and praised;
-and his commendation of everything would have touched Mrs. Bennet’s
-heart, but for the mortifying supposition of his viewing it all as his
-own future property. The dinner, too, in its turn, was highly admired;
-and he begged to know to which of his fair cousins the excellence of its
-cookery was owing. But here he was set right by Mrs. Bennet, who assured
-him, with some asperity, that they were very well able to keep a good
-cook, and that her daughters had nothing to do in the kitchen. He begged
-pardon for having displeased her. In a softened tone she declared
-herself not at all offended; but he continued to apologize for about a
-quarter of an hour.
-
-
-
-
-[Illustration]
-
-
-
-
-CHAPTER XIV
-
-
-[Illustration]
-
-During dinner, Mr. Bennet scarcely spoke at all; but when the servants
-were withdrawn, he thought it time to have some conversation with his
-guest, and therefore started a subject in which he expected him to
-shine, by observing that he seemed very fortunate in his patroness. Lady
-Catherine de Bourgh’s attention to his wishes, and consideration for his
-comfort, appeared very remarkable. Mr. Bennet could not have chosen
-better. Mr. Collins was eloquent in her praise. The subject elevated him
-to more than usual solemnity of manner; and with a most important aspect
-he protested that he had never in his life witnessed such behaviour in a
-person of rank--such affability and condescension, as he had himself
-experienced from Lady Catherine. She had been graciously pleased to
-approve of both the discourses which he had already had the honour of
-preaching before her. She had also asked him twice to dine at Rosings,
-and had sent for him only the Saturday before, to make up her pool of
-quadrille in the evening. Lady Catherine was reckoned proud by many
-people, he knew, but _he_ had never seen anything but affability in her.
-She had always spoken to him as she would to any other gentleman; she
-made not the smallest objection to his joining in the society of the
-neighbourhood, nor to his leaving his parish occasionally for a week or
-two to visit his relations. She had even condescended to advise him to
-marry as soon as he could, provided he chose with discretion; and had
-once paid him a visit in his humble parsonage, where she had perfectly
-approved all the alterations he had been making, and had even vouchsafed
-to suggest some herself,--some shelves in the closets upstairs.
-
-“That is all very proper and civil, I am sure,” said Mrs. Bennet, “and I
-dare say she is a very agreeable woman. It is a pity that great ladies
-in general are not more like her. Does she live near you, sir?”
-
-“The garden in which stands my humble abode is separated only by a lane
-from Rosings Park, her Ladyship’s residence.”
-
-“I think you said she was a widow, sir? has she any family?”
-
-“She has one only daughter, the heiress of Rosings, and of very
-extensive property.”
-
-“Ah,” cried Mrs. Bennet, shaking her head, “then she is better off than
-many girls. And what sort of young lady is she? Is she handsome?”
-
-“She is a most charming young lady, indeed. Lady Catherine herself says
-that, in point of true beauty, Miss de Bourgh is far superior to the
-handsomest of her sex; because there is that in her features which marks
-the young woman of distinguished birth. She is unfortunately of a sickly
-constitution, which has prevented her making that progress in many
-accomplishments which she could not otherwise have failed of, as I am
-informed by the lady who superintended her education, and who still
-resides with them. But she is perfectly amiable, and often condescends
-to drive by my humble abode in her little phaeton and ponies.”
-
-“Has she been presented? I do not remember her name among the ladies at
-court.”
-
-“Her indifferent state of health unhappily prevents her being in town;
-and by that means, as I told Lady Catherine myself one day, has deprived
-the British Court of its brightest ornament. Her Ladyship seemed pleased
-with the idea; and you may imagine that I am happy on every occasion to
-offer those little delicate compliments which are always acceptable to
-ladies. I have more than once observed to Lady Catherine, that her
-charming daughter seemed born to be a duchess; and that the most
-elevated rank, instead of giving her consequence, would be adorned by
-her. These are the kind of little things which please her Ladyship, and
-it is a sort of attention which I conceive myself peculiarly bound to
-pay.”
-
-“You judge very properly,” said Mr. Bennet; “and it is happy for you
-that you possess the talent of flattering with delicacy. May I ask
-whether these pleasing attentions proceed from the impulse of the
-moment, or are the result of previous study?”
-
-“They arise chiefly from what is passing at the time; and though I
-sometimes amuse myself with suggesting and arranging such little elegant
-compliments as may be adapted to ordinary occasions, I always wish to
-give them as unstudied an air as possible.”
-
-Mr. Bennet’s expectations were fully answered. His cousin was as absurd
-as he had hoped; and he listened to him with the keenest enjoyment,
-maintaining at the same time the most resolute composure of countenance,
-and, except in an occasional glance at Elizabeth, requiring no partner
-in his pleasure.
-
-By tea-time, however, the dose had been enough, and Mr. Bennet was glad
-to take his guest into the drawing-room again, and when tea was over,
-glad to invite him
-
-[Illustration:
-
-“Protested
-that he never read novels”      H.T Feb 94
-]
-
-to read aloud to the ladies. Mr. Collins readily assented, and a book
-was produced; but on beholding it (for everything announced it to be
-from a circulating library) he started back, and, begging pardon,
-protested that he never read novels. Kitty stared at him, and Lydia
-exclaimed. Other books were produced, and after some deliberation he
-chose “Fordyce’s Sermons.” Lydia gaped as he opened the volume; and
-before he had, with very monotonous solemnity, read three pages, she
-interrupted him with,--
-
-“Do you know, mamma, that my uncle Philips talks of turning away
-Richard? and if he does, Colonel Forster will hire him. My aunt told me
-so herself on Saturday. I shall walk to Meryton to-morrow to hear more
-about it, and to ask when Mr. Denny comes back from town.”
-
-Lydia was bid by her two eldest sisters to hold her tongue; but Mr.
-Collins, much offended, laid aside his book, and said,--
-
-“I have often observed how little young ladies are interested by books
-of a serious stamp, though written solely for their benefit. It amazes
-me, I confess; for certainly there can be nothing so advantageous to
-them as instruction. But I will no longer importune my young cousin.”
-
-Then, turning to Mr. Bennet, he offered himself as his antagonist at
-backgammon. Mr. Bennet accepted the challenge, observing that he acted
-very wisely in leaving the girls to their own trifling amusements. Mrs.
-Bennet and her daughters apologized most civilly for Lydia’s
-interruption, and promised that it should not occur again, if he would
-resume his book; but Mr. Collins, after assuring them that he bore his
-young cousin no ill-will, and should never resent her behaviour as any
-affront, seated himself at another table with Mr. Bennet, and prepared
-for backgammon.
-
-
-
-
-[Illustration]
-
-
-
-
-CHAPTER XV.
-
-
-[Illustration]
-
-Mr. Collins was not a sensible man, and the deficiency of nature had
-been but little assisted by education or society; the greatest part of
-his life having been spent under the guidance of an illiterate and
-miserly father; and though he belonged to one of the universities, he
-had merely kept the necessary terms without forming at it any useful
-acquaintance. The subjection in which his father had brought him up had
-given him originally great humility of manner; but it was now a good
-deal counteracted by the self-conceit of a weak head, living in
-retirement, and the consequential feelings of early and unexpected
-prosperity. A fortunate chance had recommended him to Lady Catherine de
-Bourgh when the living of Hunsford was vacant; and the respect which he
-felt for her high rank, and his veneration for her as his patroness,
-mingling with a very good opinion of himself, of his authority as a
-clergyman, and his right as a rector, made him altogether a mixture of
-pride and obsequiousness, self-importance and humility.
-
-Having now a good house and a very sufficient income, he intended to
-marry; and in seeking a reconciliation with the Longbourn family he had
-a wife in view, as he meant to choose one of the daughters, if he found
-them as handsome and amiable as they were represented by common report.
-This was his plan of amends--of atonement--for inheriting their father’s
-estate; and he thought it an excellent one, full of eligibility and
-suitableness, and excessively generous and disinterested on his own
-part.
-
-His plan did not vary on seeing them. Miss Bennet’s lovely face
-confirmed his views, and established all his strictest notions of what
-was due to seniority; and for the first evening _she_ was his settled
-choice. The next morning, however, made an alteration; for in a quarter
-of an hour’s _tête-à-tête_ with Mrs. Bennet before breakfast, a
-conversation beginning with his parsonage-house, and leading naturally
-to the avowal of his hopes, that a mistress for it might be found at
-Longbourn, produced from her, amid very complaisant smiles and general
-encouragement, a caution against the very Jane he had fixed on. “As to
-her _younger_ daughters, she could not take upon her to say--she could
-not positively answer--but she did not _know_ of any prepossession;--her
-_eldest_ daughter she must just mention--she felt it incumbent on her to
-hint, was likely to be very soon engaged.”
-
-Mr. Collins had only to change from Jane to Elizabeth--and it was soon
-done--done while Mrs. Bennet was stirring the fire. Elizabeth, equally
-next to Jane in birth and beauty, succeeded her of course.
-
-Mrs. Bennet treasured up the hint, and trusted that she might soon have
-two daughters married; and the man whom she could not bear to speak of
-the day before, was now high in her good graces.
-
-Lydia’s intention of walking to Meryton was not forgotten: every sister
-except Mary agreed to go with her; and Mr. Collins was to attend them,
-at the request of Mr. Bennet, who was most anxious to get rid of him,
-and have his library to himself; for thither Mr. Collins had followed
-him after breakfast, and there he would continue, nominally engaged with
-one of the largest folios in the collection, but really talking to Mr.
-Bennet, with little cessation, of his house and garden at Hunsford. Such
-doings discomposed Mr. Bennet exceedingly. In his library he had been
-always sure of leisure and tranquillity; and though prepared, as he told
-Elizabeth, to meet with folly and conceit in every other room in the
-house, he was used to be free from them there: his civility, therefore,
-was most prompt in inviting Mr. Collins to join his daughters in their
-walk; and Mr. Collins, being in fact much better fitted for a walker
-than a reader, was extremely well pleased to close his large book, and
-go.
-
-In pompous nothings on his side, and civil assents on that of his
-cousins, their time passed till they entered Meryton. The attention of
-the younger ones was then no longer to be gained by _him_. Their eyes
-were immediately wandering up the street in quest of the officers, and
-nothing less than a very smart bonnet, indeed, or a really new muslin in
-a shop window, could recall them.
-
-But the attention of every lady was soon caught by a young man, whom
-they had never seen before, of most gentlemanlike appearance, walking
-with an officer on the other side of the way. The officer was the very
-Mr. Denny concerning whose return from London Lydia came to inquire, and
-he bowed as they passed. All were struck with the stranger’s air, all
-wondered who he could be; and Kitty and Lydia, determined if possible
-to find out, led the way across the street, under pretence of wanting
-something in an opposite shop, and fortunately had just gained the
-pavement, when the two gentlemen, turning back, had reached the same
-spot. Mr. Denny addressed them directly, and entreated permission to
-introduce his friend, Mr. Wickham, who had returned with him the day
-before from town, and, he was happy to say, had accepted a commission in
-their corps. This was exactly as it should be; for the young man wanted
-only regimentals to make him completely charming. His appearance was
-greatly in his favour: he had all the best parts of beauty, a fine
-countenance, a good figure, and very pleasing address. The introduction
-was followed up on his side by a happy readiness of conversation--a
-readiness at the same time perfectly correct and unassuming; and the
-whole party were still standing and talking together very agreeably,
-when the sound of horses drew their notice, and Darcy and Bingley were
-seen riding down the street. On distinguishing the ladies of the group
-the two gentlemen came directly towards them, and began the usual
-civilities. Bingley was the principal spokesman, and Miss Bennet the
-principal object. He was then, he said, on his way to Longbourn on
-purpose to inquire after her. Mr. Darcy corroborated it with a bow, and
-was beginning to determine not to fix his eyes on Elizabeth, when they
-were suddenly arrested by the sight of the stranger; and Elizabeth
-happening to see the countenance of both as they looked at each other,
-was all astonishment at the effect of the meeting. Both changed colour,
-one looked white, the other red. Mr. Wickham, after a few moments,
-touched his hat--a salutation which Mr. Darcy just deigned to return.
-What could be the meaning of it? It was impossible to imagine; it was
-impossible not to long to know.
-
-In another minute Mr. Bingley, but without seeming to have noticed what
-passed, took leave and rode on with his friend.
-
-Mr. Denny and Mr. Wickham walked with the young ladies to the door of
-Mr. Philips’s house, and then made their bows, in spite of Miss Lydia’s
-pressing entreaties that they would come in, and even in spite of Mrs.
-Philips’s throwing up the parlour window, and loudly seconding the
-invitation.
-
-Mrs. Philips was always glad to see her nieces; and the two eldest, from
-their recent absence, were particularly welcome; and she was eagerly
-expressing her surprise at their sudden return home, which, as their own
-carriage had not fetched them, she should have known nothing about, if
-she had not happened to see Mr. Jones’s shopboy in the street, who had
-told her that they were not to send any more draughts to Netherfield,
-because the Miss Bennets were come away, when her civility was claimed
-towards Mr. Collins by Jane’s introduction of him. She received him with
-her very best politeness, which he returned with as much more,
-apologizing for his intrusion, without any previous acquaintance with
-her, which he could not help flattering himself, however, might be
-justified by his relationship to the young ladies who introduced him to
-her notice. Mrs. Philips was quite awed by such an excess of good
-breeding; but her contemplation of one stranger was soon put an end to
-by exclamations and inquiries about the other, of whom, however, she
-could only tell her nieces what they already knew, that Mr. Denny had
-brought him from London, and that he was to have a lieutenant’s
-commission in the ----shire. She had been watching him the last hour,
-she said, as he walked up and down the street,--and had Mr. Wickham
-appeared, Kitty and Lydia would certainly have continued the occupation;
-but unluckily no one passed the windows now except a few of the
-officers, who, in comparison with the stranger, were become “stupid,
-disagreeable fellows.” Some of them were to dine with the Philipses the
-next day, and their aunt promised to make her husband call on Mr.
-Wickham, and give him an invitation also, if the family from Longbourn
-would come in the evening. This was agreed to; and Mrs. Philips
-protested that they would have a nice comfortable noisy game of lottery
-tickets, and a little bit of hot supper afterwards. The prospect of such
-delights was very cheering, and they parted in mutual good spirits. Mr.
-Collins repeated his apologies in quitting the room, and was assured,
-with unwearying civility, that they were perfectly needless.
-
-As they walked home, Elizabeth related to Jane what she had seen pass
-between the two gentlemen; but though Jane would have defended either or
-both, had they appeared to be wrong, she could no more explain such
-behaviour than her sister.
-
-Mr. Collins on his return highly gratified Mrs. Bennet by admiring Mrs.
-Philips’s manners and politeness. He protested that, except Lady
-Catherine and her daughter, he had never seen a more elegant woman; for
-she had not only received him with the utmost civility, but had even
-pointedly included him in her invitation for the next evening, although
-utterly unknown to her before. Something, he supposed, might be
-attributed to his connection with them, but yet he had never met with so
-much attention in the whole course of his life.
-
-
-
-
-[Illustration]
-
-
-
-
-CHAPTER XVI.
-
-
-[Illustration]
-
-As no objection was made to the young people’s engagement with their
-aunt, and all Mr. Collins’s scruples of leaving Mr. and Mrs. Bennet for
-a single evening during his visit were most steadily resisted, the coach
-conveyed him and his five cousins at a suitable hour to Meryton; and the
-girls had the pleasure of hearing, as they entered the drawing-room,
-that Mr. Wickham had accepted their uncle’s invitation, and was then in
-the house.
-
-When this information was given, and they had all taken their seats, Mr.
-Collins was at leisure to look around him and admire, and he was so much
-struck with the size and furniture of the apartment, that he declared he
-might almost have supposed himself in the small summer breakfast parlour
-at Rosings; a comparison that did not at first convey much
-gratification; but when Mrs. Philips understood from him what Rosings
-was, and who was its proprietor, when she had listened to the
-description of only one of Lady Catherine’s drawing-rooms, and found
-that the chimney-piece alone had cost eight hundred pounds, she felt all
-the force of the compliment, and would hardly have resented a comparison
-with the housekeeper’s room.
-
-In describing to her all the grandeur of Lady Catherine and her mansion,
-with occasional digressions in praise of his own humble abode, and the
-improvements it was receiving, he was happily employed until the
-gentlemen joined them; and he found in Mrs. Philips a very attentive
-listener, whose opinion of his consequence increased with what she
-heard, and who was resolving to retail it all among her neighbours as
-soon as she could. To the girls, who could not listen to their cousin,
-and who had nothing to do but to wish for an instrument, and examine
-their own indifferent imitations of china on the mantel-piece, the
-interval of waiting appeared very long. It was over at last, however.
-The gentlemen did approach: and when Mr. Wickham walked into the room,
-Elizabeth felt that she had neither been seeing him before, nor thinking
-of him since, with the smallest degree of unreasonable admiration. The
-officers of the ----shire were in general a very creditable,
-gentlemanlike set and the best of them were of the present party; but
-Mr, Wickham was as far beyond them all in person, countenance, air, and
-walk, as _they_ were superior to the broad-faced stuffy uncle Philips,
-breathing port wine, who followed them into the room.
-
-[Illustration:
-
-“The officers of the ----shire”
-
-[_Copyright 1894 by George Allen._]]
-
-Mr. Wickham was the happy man towards whom almost every female eye was
-turned, and Elizabeth was the happy woman by whom he finally seated
-himself; and the agreeable manner in which he immediately fell into
-conversation, though it was only on its being a wet night, and on the
-probability of a rainy season, made her feel that the commonest,
-dullest, most threadbare topic might be rendered interesting by the
-skill of the speaker.
-
-With such rivals for the notice of the fair as Mr. Wickham and the
-officers, Mr. Collins seemed to sink into insignificance; to the young
-ladies he certainly was nothing; but he had still at intervals a kind
-listener in Mrs. Philips, and was, by her watchfulness, most abundantly
-supplied with coffee and muffin.
-
-When the card tables were placed, he had an opportunity of obliging her,
-in return, by sitting down to whist.
-
-“I know little of the game at present,” said he, “but I shall be glad to
-improve myself; for in my situation of life----” Mrs. Philips was very
-thankful for his compliance, but could not wait for his reason.
-
-Mr. Wickham did not play at whist, and with ready delight was he
-received at the other table between Elizabeth and Lydia. At first there
-seemed danger of Lydia’s engrossing him entirely, for she was a most
-determined talker; but being likewise extremely fond of lottery tickets,
-she soon grew too much interested in the game, too eager in making bets
-and exclaiming after prizes, to have attention for anyone in particular.
-Allowing for the common demands of the game, Mr. Wickham was therefore
-at leisure to talk to Elizabeth, and she was very willing to hear him,
-though what she chiefly wished to hear she could not hope to be told,
-the history of his acquaintance with Mr. Darcy. She dared not even
-mention that gentleman. Her curiosity, however, was unexpectedly
-relieved. Mr. Wickham began the subject himself. He inquired how far
-Netherfield was from Meryton; and, after receiving her answer, asked in
-a hesitating manner how long Mr. Darcy had been staying there.
-
-“About a month,” said Elizabeth; and then, unwilling to let the subject
-drop, added, “he is a man of very large property in Derbyshire, I
-understand.”
-
-“Yes,” replied Wickham; “his estate there is a noble one. A clear ten
-thousand per annum. You could not have met with a person more capable of
-giving you certain information on that head than myself--for I have been
-connected with his family, in a particular manner, from my infancy.”
-
-Elizabeth could not but look surprised.
-
-“You may well be surprised, Miss Bennet, at such an assertion, after
-seeing, as you probably might, the very cold manner of our meeting
-yesterday. Are you much acquainted with Mr. Darcy?”
-
-“As much as I ever wish to be,” cried Elizabeth, warmly. “I have spent
-four days in the same house with him, and I think him very
-disagreeable.”
-
-“I have no right to give _my_ opinion,” said Wickham, “as to his being
-agreeable or otherwise. I am not qualified to form one. I have known him
-too long and too well to be a fair judge. It is impossible for _me_ to
-be impartial. But I believe your opinion of him would in general
-astonish--and, perhaps, you would not express it quite so strongly
-anywhere else. Here you are in your own family.”
-
-“Upon my word I say no more _here_ than I might say in any house in the
-neighbourhood, except Netherfield. He is not at all liked in
-Hertfordshire. Everybody is disgusted with his pride. You will not find
-him more favourably spoken of by anyone.”
-
-“I cannot pretend to be sorry,” said Wickham, after a short
-interruption, “that he or that any man should not be estimated beyond
-their deserts; but with _him_ I believe it does not often happen. The
-world is blinded by his fortune and consequence, or frightened by his
-high and imposing manners, and sees him only as he chooses to be seen.”
-
-“I should take him, even on _my_ slight acquaintance, to be an
-ill-tempered man.”
-
-Wickham only shook his head.
-
-“I wonder,” said he, at the next opportunity of speaking, “whether he is
-likely to be in this country much longer.”
-
-“I do not at all know; but I _heard_ nothing of his going away when I
-was at Netherfield. I hope your plans in favour of the ----shire will
-not be affected by his being in the neighbourhood.”
-
-“Oh no--it is not for _me_ to be driven away by Mr. Darcy. If _he_
-wishes to avoid seeing _me_ he must go. We are not on friendly terms,
-and it always gives me pain to meet him, but I have no reason for
-avoiding _him_ but what I might proclaim to all the world--a sense of
-very great ill-usage, and most painful regrets at his being what he is.
-His father, Miss Bennet, the late Mr. Darcy, was one of the best men
-that ever breathed, and the truest friend I ever had; and I can never be
-in company with this Mr. Darcy without being grieved to the soul by a
-thousand tender recollections. His behaviour to myself has been
-scandalous; but I verily believe I could forgive him anything and
-everything, rather than his disappointing the hopes and disgracing the
-memory of his father.”
-
-Elizabeth found the interest of the subject increase, and listened with
-all her heart; but the delicacy of it prevented further inquiry.
-
-Mr. Wickham began to speak on more general topics, Meryton, the
-neighbourhood, the society, appearing highly pleased with all that he
-had yet seen, and speaking of the latter, especially, with gentle but
-very intelligible gallantry.
-
-“It was the prospect of constant society, and good society,” he added,
-“which was my chief inducement to enter the ----shire. I know it to be a
-most respectable, agreeable corps; and my friend Denny tempted me
-further by his account of their present quarters, and the very great
-attentions and excellent acquaintance Meryton had procured them.
-Society, I own, is necessary to me. I have been a disappointed man, and
-my spirits will not bear solitude. I _must_ have employment and society.
-A military life is not what I was intended for, but circumstances have
-now made it eligible. The church _ought_ to have been my profession--I
-was brought up for the church; and I should at this time have been in
-possession of a most valuable living, had it pleased the gentleman we
-were speaking of just now.”
-
-“Indeed!”
-
-“Yes--the late Mr. Darcy bequeathed me the next presentation of the best
-living in his gift. He was my godfather, and excessively attached to me.
-I cannot do justice to his kindness. He meant to provide for me amply,
-and thought he had done it; but when the living fell, it was given
-elsewhere.”
-
-“Good heavens!” cried Elizabeth; “but how could _that_ be? How could his
-will be disregarded? Why did not you seek legal redress?”
-
-“There was just such an informality in the terms of the bequest as to
-give me no hope from law. A man of honour could not have doubted the
-intention, but Mr. Darcy chose to doubt it--or to treat it as a merely
-conditional recommendation, and to assert that I had forfeited all claim
-to it by extravagance, imprudence, in short, anything or nothing.
-Certain it is that the living became vacant two years ago, exactly as I
-was of an age to hold it, and that it was given to another man; and no
-less certain is it, that I cannot accuse myself of having really done
-anything to deserve to lose it. I have a warm unguarded temper, and I
-may perhaps have sometimes spoken my opinion _of_ him, and _to_ him, too
-freely. I can recall nothing worse. But the fact is, that we are very
-different sort of men, and that he hates me.”
-
-“This is quite shocking! He deserves to be publicly disgraced.”
-
-“Some time or other he _will_ be--but it shall not be by _me_. Till I
-can forget his father, I can never defy or expose _him_.”
-
-Elizabeth honoured him for such feelings, and thought him handsomer than
-ever as he expressed them.
-
-“But what,” said she, after a pause, “can have been his motive? what can
-have induced him to behave so cruelly?”
-
-“A thorough, determined dislike of me--a dislike which I cannot but
-attribute in some measure to jealousy. Had the late Mr. Darcy liked me
-less, his son might have borne with me better; but his father’s uncommon
-attachment to me irritated him, I believe, very early in life. He had
-not a temper to bear the sort of competition in which we stood--the sort
-of preference which was often given me.”
-
-“I had not thought Mr. Darcy so bad as this--though I have never liked
-him, I had not thought so very ill of him--I had supposed him to be
-despising his fellow-creatures in general, but did not suspect him of
-descending to such malicious revenge, such injustice, such inhumanity as
-this!”
-
-After a few minutes’ reflection, however, she continued, “I _do_
-remember his boasting one day, at Netherfield, of the implacability of
-his resentments, of his having an unforgiving temper. His disposition
-must be dreadful.”
-
-“I will not trust myself on the subject,” replied Wickham; “_I_ can
-hardly be just to him.”
-
-Elizabeth was again deep in thought, and after a time exclaimed, “To
-treat in such a manner the godson, the friend, the favourite of his
-father!” She could have added, “A young man, too, like _you_, whose very
-countenance may vouch for your being amiable.” But she contented herself
-with--“And one, too, who had probably been his own companion from
-childhood, connected together, as I think you said, in the closest
-manner.”
-
-“We were born in the same parish, within the same park; the greatest
-part of our youth was passed together: inmates of the same house,
-sharing the same amusements, objects of the same parental care. _My_
-father began life in the profession which your uncle, Mr. Philips,
-appears to do so much credit to; but he gave up everything to be of use
-to the late Mr. Darcy, and devoted all his time to the care of the
-Pemberley property. He was most highly esteemed by Mr. Darcy, a most
-intimate, confidential friend. Mr. Darcy often acknowledged himself to
-be under the greatest obligations to my father’s active superintendence;
-and when, immediately before my father’s death, Mr. Darcy gave him a
-voluntary promise of providing for me, I am convinced that he felt it
-to be as much a debt of gratitude to _him_ as of affection to myself.”
-
-“How strange!” cried Elizabeth. “How abominable! I wonder that the very
-pride of this Mr. Darcy has not made him just to you. If from no better
-motive, that he should not have been too proud to be dishonest,--for
-dishonesty I must call it.”
-
-“It _is_ wonderful,” replied Wickham; “for almost all his actions may be
-traced to pride; and pride has often been his best friend. It has
-connected him nearer with virtue than any other feeling. But we are none
-of us consistent; and in his behaviour to me there were stronger
-impulses even than pride.”
-
-“Can such abominable pride as his have ever done him good?”
-
-“Yes; it has often led him to be liberal and generous; to give his money
-freely, to display hospitality, to assist his tenants, and relieve the
-poor. Family pride, and _filial_ pride, for he is very proud of what his
-father was, have done this. Not to appear to disgrace his family, to
-degenerate from the popular qualities, or lose the influence of the
-Pemberley House, is a powerful motive. He has also _brotherly_ pride,
-which, with _some_ brotherly affection, makes him a very kind and
-careful guardian of his sister; and you will hear him generally cried up
-as the most attentive and best of brothers.”
-
-“What sort of a girl is Miss Darcy?”
-
-He shook his head. “I wish I could call her amiable. It gives me pain to
-speak ill of a Darcy; but she is too much like her brother,--very, very
-proud. As a child, she was affectionate and pleasing, and extremely fond
-of me; and I have devoted hours and hours to her amusement. But she is
-nothing to me now. She is a handsome girl, about fifteen or sixteen,
-and, I understand, highly accomplished. Since her father’s death her
-home has been London, where a lady lives with her, and superintends her
-education.”
-
-After many pauses and many trials of other subjects, Elizabeth could not
-help reverting once more to the first, and saying,--
-
-“I am astonished at his intimacy with Mr. Bingley. How can Mr. Bingley,
-who seems good-humour itself, and is, I really believe, truly amiable,
-be in friendship with such a man? How can they suit each other? Do you
-know Mr. Bingley?”
-
-“Not at all.”
-
-“He is a sweet-tempered, amiable, charming man. He cannot know what Mr.
-Darcy is.”
-
-“Probably not; but Mr. Darcy can please where he chooses. He does not
-want abilities. He can be a conversible companion if he thinks it worth
-his while. Among those who are at all his equals in consequence, he is a
-very different man from what he is to the less prosperous. His pride
-never deserts him; but with the rich he is liberal-minded, just,
-sincere, rational, honourable, and, perhaps, agreeable,--allowing
-something for fortune and figure.”
-
-The whist party soon afterwards breaking up, the players gathered round
-the other table, and Mr. Collins took his station between his cousin
-Elizabeth and Mrs. Philips. The usual inquiries as to his success were
-made by the latter. It had not been very great; he had lost every point;
-but when Mrs. Philips began to express her concern thereupon, he assured
-her, with much earnest gravity, that it was not of the least importance;
-that he considered the money as a mere trifle, and begged she would not
-make herself uneasy.
-
-“I know very well, madam,” said he, “that when persons sit down to a
-card table they must take their chance of these things,--and happily I
-am not in such circumstances as to make five shillings any object. There
-are, undoubtedly, many who could not say the same; but, thanks to Lady
-Catherine de Bourgh, I am removed far beyond the necessity of regarding
-little matters.”
-
-Mr. Wickham’s attention was caught; and after observing Mr. Collins for
-a few moments, he asked Elizabeth in a low voice whether her relations
-were very intimately acquainted with the family of De Bourgh.
-
-“Lady Catherine de Bourgh,” she replied, “has very lately given him a
-living. I hardly know how Mr. Collins was first introduced to her
-notice, but he certainly has not known her long.”
-
-“You know of course that Lady Catherine de Bourgh and Lady Anne Darcy
-were sisters; consequently that she is aunt to the present Mr. Darcy.”
-
-“No, indeed, I did not. I knew nothing at all of Lady Catherine’s
-connections. I never heard of her existence till the day before
-yesterday.”
-
-“Her daughter, Miss de Bourgh, will have a very large fortune, and it is
-believed that she and her cousin will unite the two estates.”
-
-This information made Elizabeth smile, as she thought of poor Miss
-Bingley. Vain indeed must be all her attentions, vain and useless her
-affection for his sister and her praise of himself, if he were already
-self-destined to another.
-
-“Mr. Collins,” said she, “speaks highly both of Lady Catherine and her
-daughter; but, from some particulars that he has related of her
-Ladyship, I suspect his gratitude misleads him; and that, in spite of
-her being his patroness, she is an arrogant, conceited woman.”
-
-“I believe her to be both in a great degree,” replied Wickham; “I have
-not seen her for many years; but I very well remember that I never liked
-her, and that her manners were dictatorial and insolent. She has the
-reputation of being remarkably sensible and clever; but I rather believe
-she derives part of her abilities from her rank and fortune, part from
-her authoritative manner, and the rest from the pride of her nephew, who
-chooses that everyone connected with him should have an understanding of
-the first class.”
-
-Elizabeth allowed that he had given a very rational account of it, and
-they continued talking together with mutual satisfaction till supper put
-an end to cards, and gave the rest of the ladies their share of Mr.
-Wickham’s attentions. There could be no conversation in the noise of
-Mrs. Philips’s supper party, but his manners recommended him to
-everybody. Whatever he said, was said well; and whatever he did, done
-gracefully. Elizabeth went away with her head full of him. She could
-think of nothing but of Mr. Wickham, and of what he had told her, all
-the way home; but there was not time for her even to mention his name as
-they went, for neither Lydia nor Mr. Collins were once silent. Lydia
-talked incessantly of lottery tickets, of the fish she had lost and the
-fish she had won; and Mr. Collins, in describing the civility of Mr. and
-Mrs. Philips, protesting that he did not in the least regard his losses
-at whist, enumerating all the dishes at supper, and repeatedly fearing
-that he crowded his cousins, had more to say than he could well manage
-before the carriage stopped at Longbourn House.
-
-
-
-
-[Illustration:
-
-     “delighted to see their dear friend again”
-]
-
-
-
-
-CHAPTER XVII.
-
-
-[Illustration]
-
-Elizabeth related to Jane, the next day, what had passed between Mr.
-Wickham and herself. Jane listened with astonishment and concern: she
-knew not how to believe that Mr. Darcy could be so unworthy of Mr.
-Bingley’s regard; and yet it was not in her nature to question the
-veracity of a young man of such amiable appearance as Wickham. The
-possibility of his having really endured such unkindness was enough to
-interest all her tender feelings; and nothing therefore remained to be
-done but to think well of them both, to defend the conduct of each, and
-throw into the account of accident or mistake whatever could not be
-otherwise explained.
-
-“They have both,” said she, “been deceived, I dare say, in some way or
-other, of which we can form no idea. Interested people have perhaps
-misrepresented each to the other. It is, in short, impossible for us to
-conjecture the causes or circumstances which may have alienated them,
-without actual blame on either side.”
-
-“Very true, indeed; and now, my dear Jane, what have you got to say in
-behalf of the interested people who have probably been concerned in the
-business? Do clear _them_, too, or we shall be obliged to think ill of
-somebody.”
-
-“Laugh as much as you choose, but you will not laugh me out of my
-opinion. My dearest Lizzy, do but consider in what a disgraceful light
-it places Mr. Darcy, to be treating his father’s favourite in such a
-manner,--one whom his father had promised to provide for. It is
-impossible. No man of common humanity, no man who had any value for his
-character, could be capable of it. Can his most intimate friends be so
-excessively deceived in him? Oh no.”
-
-“I can much more easily believe Mr. Bingley’s being imposed on than that
-Mr. Wickham should invent such a history of himself as he gave me last
-night; names, facts, everything mentioned without ceremony. If it be not
-so, let Mr. Darcy contradict it. Besides, there was truth in his looks.”
-
-“It is difficult, indeed--it is distressing. One does not know what to
-think.”
-
-“I beg your pardon;--one knows exactly what to think.”
-
-But Jane could think with certainty on only one point,--that Mr.
-Bingley, if he _had been_ imposed on, would have much to suffer when
-the affair became public.
-
-The two young ladies were summoned from the shrubbery, where this
-conversation passed, by the arrival of some of the very persons of whom
-they had been speaking; Mr. Bingley and his sisters came to give their
-personal invitation for the long expected ball at Netherfield, which was
-fixed for the following Tuesday. The two ladies were delighted to see
-their dear friend again, called it an age since they had met, and
-repeatedly asked what she had been doing with herself since their
-separation. To the rest of the family they paid little attention;
-avoiding Mrs. Bennet as much as possible, saying not much to Elizabeth,
-and nothing at all to the others. They were soon gone again, rising from
-their seats with an activity which took their brother by surprise, and
-hurrying off as if eager to escape from Mrs. Bennet’s civilities.
-
-The prospect of the Netherfield ball was extremely agreeable to every
-female of the family. Mrs. Bennet chose to consider it as given in
-compliment to her eldest daughter, and was particularly flattered by
-receiving the invitation from Mr. Bingley himself, instead of a
-ceremonious card. Jane pictured to herself a happy evening in the
-society of her two friends, and the attentions of their brother; and
-Elizabeth thought with pleasure of dancing a great deal with Mr.
-Wickham, and of seeing a confirmation of everything in Mr. Darcy’s look
-and behaviour. The happiness anticipated by Catherine and Lydia depended
-less on any single event, or any particular person; for though they
-each, like Elizabeth, meant to dance half the evening with Mr. Wickham,
-he was by no means the only partner who could satisfy them, and a ball
-was, at any rate, a ball. And even Mary could assure her family that she
-had no disinclination for it.
-
-“While I can have my mornings to myself,” said she, “it is enough. I
-think it is no sacrifice to join occasionally in evening engagements.
-Society has claims on us all; and I profess myself one of those who
-consider intervals of recreation and amusement as desirable for
-everybody.”
-
-Elizabeth’s spirits were so high on the occasion, that though she did
-not often speak unnecessarily to Mr. Collins, she could not help asking
-him whether he intended to accept Mr. Bingley’s invitation, and if he
-did, whether he would think it proper to join in the evening’s
-amusement; and she was rather surprised to find that he entertained no
-scruple whatever on that head, and was very far from dreading a rebuke,
-either from the Archbishop or Lady Catherine de Bourgh, by venturing to
-dance.
-
-“I am by no means of opinion, I assure you,” said he, “that a ball of
-this kind, given by a young man of character, to respectable people, can
-have any evil tendency; and I am so far from objecting to dancing
-myself, that I shall hope to be honoured with the hands of all my fair
-cousins in the course of the evening; and I take this opportunity of
-soliciting yours, Miss Elizabeth, for the two first dances especially; a
-preference which I trust my cousin Jane will attribute to the right
-cause, and not to any disrespect for her.”
-
-Elizabeth felt herself completely taken in. She had fully proposed being
-engaged by Wickham for those very dances; and to have Mr. Collins
-instead!--her liveliness had been never worse timed. There was no help
-for it, however. Mr. Wickham’s happiness and her own was perforce
-delayed a little longer, and Mr. Collins’s proposal accepted with as
-good a grace as she could. She was not the better pleased with his
-gallantry, from the idea it suggested of something more. It now first
-struck her, that _she_ was selected from among her sisters as worthy of
-being the mistress of Hunsford Parsonage, and of assisting to form a
-quadrille table at Rosings, in the absence of more eligible visitors.
-The idea soon reached to conviction, as she observed his increasing
-civilities towards herself, and heard his frequent attempt at a
-compliment on her wit and vivacity; and though more astonished than
-gratified herself by this effect of her charms, it was not long before
-her mother gave her to understand that the probability of their marriage
-was exceedingly agreeable to _her_. Elizabeth, however, did not choose
-to take the hint, being well aware that a serious dispute must be the
-consequence of any reply. Mr. Collins might never make the offer, and,
-till he did, it was useless to quarrel about him.
-
-If there had not been a Netherfield ball to prepare for and talk of, the
-younger Miss Bennets would have been in a pitiable state at this time;
-for, from the day of the invitation to the day of the ball, there was
-such a succession of rain as prevented their walking to Meryton once. No
-aunt, no officers, no news could be sought after; the very shoe-roses
-for Netherfield were got by proxy. Even Elizabeth might have found some
-trial of her patience in weather which totally suspended the improvement
-of her acquaintance with Mr. Wickham; and nothing less than a dance on
-Tuesday could have made such a Friday, Saturday, Sunday, and Monday
-endurable to Kitty and Lydia.
-
-
-
-
-[Illustration]
-
-
-
-
-CHAPTER XVIII.
-
-
-[Illustration]
-
-Till Elizabeth entered the drawing-room at Netherfield, and looked in
-vain for Mr. Wickham among the cluster of red coats there assembled, a
-doubt of his being present had never occurred to her. The certainty of
-meeting him had not been checked by any of those recollections that
-might not unreasonably have alarmed her. She had dressed with more than
-usual care, and prepared in the highest spirits for the conquest of all
-that remained unsubdued of his heart, trusting that it was not more than
-might be won in the course of the evening. But in an instant arose the
-dreadful suspicion of his being purposely omitted, for Mr. Darcy’s
-pleasure, in the Bingleys’ invitation to the officers; and though this
-was not exactly the case, the absolute fact of his absence was
-pronounced by his friend Mr. Denny, to whom Lydia eagerly applied, and
-who told them that Wickham had been obliged to go to town on business
-the day before, and was not yet returned; adding, with a significant
-smile,--
-
-“I do not imagine his business would have called him away just now, if
-he had not wished to avoid a certain gentleman here.”
-
-This part of his intelligence, though unheard by Lydia, was caught by
-Elizabeth; and, as it assured her that Darcy was not less answerable for
-Wickham’s absence than if her first surmise had been just, every feeling
-of displeasure against the former was so sharpened by immediate
-disappointment, that she could hardly reply with tolerable civility to
-the polite inquiries which he directly afterwards approached to make.
-Attention, forbearance, patience with Darcy, was injury to Wickham. She
-was resolved against any sort of conversation with him, and turned away
-with a degree of ill-humour which she could not wholly surmount even in
-speaking to Mr. Bingley, whose blind partiality provoked her.
-
-But Elizabeth was not formed for ill-humour; and though every prospect
-of her own was destroyed for the evening, it could not dwell long on her
-spirits; and, having told all her griefs to Charlotte Lucas, whom she
-had not seen for a week, she was soon able to make a voluntary
-transition to the oddities of her cousin, and to point him out to her
-particular notice. The two first dances, however, brought a return of
-distress: they were dances of mortification. Mr. Collins, awkward and
-solemn, apologizing instead of attending, and often moving wrong
-without being aware of it, gave her all the shame and misery which a
-disagreeable partner for a couple of dances can give. The moment of her
-release from him was ecstasy.
-
-She danced next with an officer, and had the refreshment of talking of
-Wickham, and of hearing that he was universally liked. When those dances
-were over, she returned to Charlotte Lucas, and was in conversation with
-her, when she found herself suddenly addressed by Mr. Darcy, who took
-her so much by surprise in his application for her hand, that, without
-knowing what she did, she accepted him. He walked away again
-immediately, and she was left to fret over her own want of presence of
-mind: Charlotte tried to console her.
-
-“I dare say you will find him very agreeable.”
-
-“Heaven forbid! _That_ would be the greatest misfortune of all! To find
-a man agreeable whom one is determined to hate! Do not wish me such an
-evil.”
-
-When the dancing recommenced, however, and Darcy approached to claim her
-hand, Charlotte could not help cautioning her, in a whisper, not to be a
-simpleton, and allow her fancy for Wickham to make her appear unpleasant
-in the eyes of a man often times his consequence. Elizabeth made no
-answer, and took her place in the set, amazed at the dignity to which
-she was arrived in being allowed to stand opposite to Mr. Darcy, and
-reading in her neighbours’ looks their equal amazement in beholding it.
-They stood for some time without speaking a word; and she began to
-imagine that their silence was to last through the two dances, and, at
-first, was resolved not to break it; till suddenly fancying that it
-would be the greater punishment to her partner to oblige him to talk,
-she made some slight observation on the dance. He replied, and was again
-silent. After a pause of some minutes, she addressed him a second time,
-with--
-
-“It is _your_ turn to say something now, Mr. Darcy. _I_ talked about the
-dance, and _you_ ought to make some kind of remark on the size of the
-room, or the number of couples.”
-
-He smiled, and assured her that whatever she wished him to say should be
-said.
-
-“Very well; that reply will do for the present. Perhaps, by-and-by, I
-may observe that private balls are much pleasanter than public ones; but
-_now_ we may be silent.”
-
-“Do you talk by rule, then, while you are dancing?”
-
-“Sometimes. One must speak a little, you know. It would look odd to be
-entirely silent for half an hour together; and yet, for the advantage of
-_some_, conversation ought to be so arranged as that they may have the
-trouble of saying as little as possible.”
-
-“Are you consulting your own feelings in the present case, or do you
-imagine that you are gratifying mine?”
-
-“Both,” replied Elizabeth archly; “for I have always seen a great
-similarity in the turn of our minds. We are each of an unsocial,
-taciturn disposition, unwilling to speak, unless we expect to say
-something that will amaze the whole room, and be handed down to
-posterity with all the _éclat_ of a proverb.”
-
-“This is no very striking resemblance of your own character, I am sure,”
-said he. “How near it may be to _mine_, I cannot pretend to say. _You_
-think it a faithful portrait, undoubtedly.”
-
-“I must not decide on my own performance.”
-
-He made no answer; and they were again silent till they had gone down
-the dance, when he asked her if she and her sisters did not very often
-walk to Meryton. She answered in the affirmative; and, unable to resist
-the temptation, added, “When you met us there the other day, we had just
-been forming a new acquaintance.”
-
-The effect was immediate. A deeper shade of _hauteur_ overspread his
-features, but he said not a word; and Elizabeth, though blaming herself
-for her own weakness, could not go on. At length Darcy spoke, and in a
-constrained manner said,--
-
-“Mr. Wickham is blessed with such happy manners as may insure his
-_making_ friends; whether he may be equally capable of _retaining_ them,
-is less certain.”
-
-“He has been so unlucky as to lose your friendship,” replied Elizabeth,
-with emphasis, “and in a manner which he is likely to suffer from all
-his life.”
-
-Darcy made no answer, and seemed desirous of changing the subject. At
-that moment Sir William Lucas appeared close to them, meaning to pass
-through the set to the other side of the room; but, on perceiving Mr.
-Darcy, he stopped, with a bow of superior courtesy, to compliment him on
-his dancing and his partner.
-
-“I have been most highly gratified, indeed, my dear sir; such very
-superior dancing is not often seen. It is evident that you belong to the
-first circles. Allow me to say, however, that your fair partner does not
-disgrace you: and that I must hope to have this pleasure often repeated,
-especially when a certain desirable event, my dear Miss Eliza (glancing
-at her sister and Bingley), shall take place. What congratulations will
-then flow in! I appeal to Mr. Darcy;--but let me not interrupt you, sir.
-You will not thank me for detaining you from the bewitching converse of
-that young lady, whose bright eyes are also upbraiding me.”
-
-[Illustration:
-
-“Such very superior dancing is not
-often seen.”
-
-[_Copyright 1894 by George Allen._]]
-
-The latter part of this address was scarcely heard by Darcy; but Sir
-William’s allusion to his friend seemed to strike him forcibly, and his
-eyes were directed, with a very serious expression, towards Bingley and
-Jane, who were dancing together. Recovering himself, however, shortly,
-he turned to his partner, and said,--
-
-“Sir William’s interruption has made me forget what we were talking
-of.”
-
-“I do not think we were speaking at all. Sir William could not have
-interrupted any two people in the room who had less to say for
-themselves. We have tried two or three subjects already without success,
-and what we are to talk of next I cannot imagine.”
-
-“What think you of books?” said he, smiling.
-
-“Books--oh no!--I am sure we never read the same, or not with the same
-feelings.”
-
-“I am sorry you think so; but if that be the case, there can at least be
-no want of subject. We may compare our different opinions.”
-
-“No--I cannot talk of books in a ball-room; my head is always full of
-something else.”
-
-“The _present_ always occupies you in such scenes--does it?” said he,
-with a look of doubt.
-
-“Yes, always,” she replied, without knowing what she said; for her
-thoughts had wandered far from the subject, as soon afterwards appeared
-by her suddenly exclaiming, “I remember hearing you once say, Mr. Darcy,
-that you hardly ever forgave;--that your resentment, once created, was
-unappeasable. You are very cautious, I suppose, as to its _being
-created_?”
-
-“I am,” said he, with a firm voice.
-
-“And never allow yourself to be blinded by prejudice?”
-
-“I hope not.”
-
-“It is particularly incumbent on those who never change their opinion,
-to be secure of judging properly at first.”
-
-“May I ask to what these questions tend?”
-
-“Merely to the illustration of _your_ character,” said she, endeavouring
-to shake off her gravity. “I am trying to make it out.”
-
-“And what is your success?”
-
-She shook her head. “I do not get on at all. I hear such different
-accounts of you as puzzle me exceedingly.”
-
-“I can readily believe,” answered he, gravely, “that reports may vary
-greatly with respect to me; and I could wish, Miss Bennet, that you were
-not to sketch my character at the present moment, as there is reason to
-fear that the performance would reflect no credit on either.”
-
-“But if I do not take your likeness now, I may never have another
-opportunity.”
-
-“I would by no means suspend any pleasure of yours,” he coldly replied.
-She said no more, and they went down the other dance and parted in
-silence; on each side dissatisfied, though not to an equal degree; for
-in Darcy’s breast there was a tolerably powerful feeling towards her,
-which soon procured her pardon, and directed all his anger against
-another.
-
-They had not long separated when Miss Bingley came towards her, and,
-with an expression of civil disdain, thus accosted her,--
-
-“So, Miss Eliza, I hear you are quite delighted with George Wickham?
-Your sister has been talking to me about him, and asking me a thousand
-questions; and I find that the young man forgot to tell you, among his
-other communications, that he was the son of old Wickham, the late Mr.
-Darcy’s steward. Let me recommend you, however, as a friend, not to give
-implicit confidence to all his assertions; for, as to Mr. Darcy’s using
-him ill, it is perfectly false: for, on the contrary, he has been always
-remarkably kind to him, though George Wickham has treated Mr. Darcy in a
-most infamous manner. I do not know the particulars, but I know very
-well that Mr. Darcy is not in the least to blame; that he cannot bear
-to hear George Wickham mentioned; and that though my brother thought he
-could not well avoid including him in his invitation to the officers, he
-was excessively glad to find that he had taken himself out of the way.
-His coming into the country at all is a most insolent thing, indeed, and
-I wonder how he could presume to do it. I pity you, Miss Eliza, for this
-discovery of your favourite’s guilt; but really, considering his
-descent, one could not expect much better.”
-
-“His guilt and his descent appear, by your account, to be the same,”
-said Elizabeth, angrily; “for I have heard you accuse him of nothing
-worse than of being the son of Mr. Darcy’s steward, and of _that_, I can
-assure you, he informed me himself.”
-
-“I beg your pardon,” replied Miss Bingley, turning away with a sneer.
-“Excuse my interference; it was kindly meant.”
-
-“Insolent girl!” said Elizabeth to herself. “You are much mistaken if
-you expect to influence me by such a paltry attack as this. I see
-nothing in it but your own wilful ignorance and the malice of Mr.
-Darcy.” She then sought her eldest sister, who had undertaken to make
-inquiries on the same subject of Bingley. Jane met her with a smile of
-such sweet complacency, a glow of such happy expression, as sufficiently
-marked how well she was satisfied with the occurrences of the evening.
-Elizabeth instantly read her feelings; and, at that moment, solicitude
-for Wickham, resentment against his enemies, and everything else, gave
-way before the hope of Jane’s being in the fairest way for happiness.
-
-“I want to know,” said she, with a countenance no less smiling than her
-sister’s, “what you have learnt about Mr. Wickham. But perhaps you have
-been too pleasantly engaged to think of any third person, in which case
-you may be sure of my pardon.”
-
-“No,” replied Jane, “I have not forgotten him; but I have nothing
-satisfactory to tell you. Mr. Bingley does not know the whole of his
-history, and is quite ignorant of the circumstances which have
-principally offended Mr. Darcy; but he will vouch for the good conduct,
-the probity and honour, of his friend, and is perfectly convinced that
-Mr. Wickham has deserved much less attention from Mr. Darcy than he has
-received; and I am sorry to say that by his account, as well as his
-sister’s, Mr. Wickham is by no means a respectable young man. I am
-afraid he has been very imprudent, and has deserved to lose Mr. Darcy’s
-regard.”
-
-“Mr. Bingley does not know Mr. Wickham himself.”
-
-“No; he never saw him till the other morning at Meryton.”
-
-“This account then is what he has received from Mr. Darcy. I am
-perfectly satisfied. But what does he say of the living?”
-
-“He does not exactly recollect the circumstances, though he has heard
-them from Mr. Darcy more than once, but he believes that it was left to
-him _conditionally_ only.”
-
-“I have not a doubt of Mr. Bingley’s sincerity,” said Elizabeth warmly,
-“but you must excuse my not being convinced by assurances only. Mr.
-Bingley’s defence of his friend was a very able one, I dare say; but
-since he is unacquainted with several parts of the story, and has learnt
-the rest from that friend himself, I shall venture still to think of
-both gentlemen as I did before.”
-
-She then changed the discourse to one more gratifying to each, and on
-which there could be no difference of sentiment. Elizabeth listened with
-delight to the happy though modest hopes which Jane entertained of
-Bingley’s regard, and said all in her power to heighten her confidence
-in it. On their being joined by Mr. Bingley himself, Elizabeth withdrew
-to Miss Lucas; to whose inquiry after the pleasantness of her last
-partner she had scarcely replied, before Mr. Collins came up to them,
-and told her with great exultation, that he had just been so fortunate
-as to make a most important discovery.
-
-“I have found out,” said he, “by a singular accident, that there is now
-in the room a near relation to my patroness. I happened to overhear the
-gentleman himself mentioning to the young lady who does the honours of
-this house the names of his cousin Miss De Bourgh, and of her mother,
-Lady Catherine. How wonderfully these sort of things occur! Who would
-have thought of my meeting with--perhaps--a nephew of Lady Catherine de
-Bourgh in this assembly! I am most thankful that the discovery is made
-in time for me to pay my respects to him, which I am now going to do,
-and trust he will excuse my not having done it before. My total
-ignorance of the connection must plead my apology.”
-
-“You are not going to introduce yourself to Mr. Darcy?”
-
-“Indeed I am. I shall entreat his pardon for not having done it earlier.
-I believe him to be Lady Catherine’s _nephew_. It will be in my power to
-assure him that her Ladyship was quite well yesterday se’nnight.”
-
-Elizabeth tried hard to dissuade him from such a scheme; assuring him
-that Mr. Darcy would consider his addressing him without introduction as
-an impertinent freedom, rather than a compliment to his aunt; that it
-was not in the least necessary there should be any notice on either
-side, and that if it were, it must belong to Mr. Darcy, the superior in
-consequence, to begin the acquaintance. Mr. Collins listened to her with
-the determined air of following his own inclination, and when she ceased
-speaking, replied thus,--
-
-“My dear Miss Elizabeth, I have the highest opinion in the world of your
-excellent judgment in all matters within the scope of your
-understanding, but permit me to say that there must be a wide difference
-between the established forms of ceremony amongst the laity and those
-which regulate the clergy; for, give me leave to observe that I consider
-the clerical office as equal in point of dignity with the highest rank
-in the kingdom--provided that a proper humility of behaviour is at the
-same time maintained. You must, therefore, allow me to follow the
-dictates of my conscience on this occasion, which lead me to perform
-what I look on as a point of duty. Pardon me for neglecting to profit by
-your advice, which on every other subject shall be my constant guide,
-though in the case before us I consider myself more fitted by education
-and habitual study to decide on what is right than a young lady like
-yourself;” and with a low bow he left her to attack Mr. Darcy, whose
-reception of his advances she eagerly watched, and whose astonishment at
-being so addressed was very evident. Her cousin prefaced his speech with
-a solemn bow, and though she could not hear a word of it, she felt as if
-hearing it all, and saw in the motion of his lips the words “apology,”
-“Hunsford,” and “Lady Catherine de Bourgh.” It vexed her to see him
-expose himself to such a man. Mr. Darcy was eyeing him with
-unrestrained wonder; and when at last Mr. Collins allowed him to speak,
-replied with an air of distant civility. Mr. Collins, however, was not
-discouraged from speaking again, and Mr. Darcy’s contempt seemed
-abundantly increasing with the length of his second speech; and at the
-end of it he only made him a slight bow, and moved another way: Mr.
-Collins then returned to Elizabeth.
-
-“I have no reason, I assure you,” said he, “to be dissatisfied with my
-reception. Mr. Darcy seemed much pleased with the attention. He answered
-me with the utmost civility, and even paid me the compliment of saying,
-that he was so well convinced of Lady Catherine’s discernment as to be
-certain she could never bestow a favour unworthily. It was really a very
-handsome thought. Upon the whole, I am much pleased with him.”
-
-As Elizabeth had no longer any interest of her own to pursue, she turned
-her attention almost entirely on her sister and Mr. Bingley; and the
-train of agreeable reflections which her observations gave birth to made
-her perhaps almost as happy as Jane. She saw her in idea settled in that
-very house, in all the felicity which a marriage of true affection could
-bestow; and she felt capable, under such circumstances, of endeavouring
-even to like Bingley’s two sisters. Her mother’s thoughts she plainly
-saw were bent the same way, and she determined not to venture near her,
-lest she might hear too much. When they sat down to supper, therefore,
-she considered it a most unlucky perverseness which placed them within
-one of each other; and deeply was she vexed to find that her mother was
-talking to that one person (Lady Lucas) freely, openly, and of nothing
-else but of her expectation that Jane would be soon married to Mr.
-Bingley. It was an animating subject, and Mrs. Bennet seemed incapable
-of fatigue while enumerating the advantages of the match. His being such
-a charming young man, and so rich, and living but three miles from them,
-were the first points of self-gratulation; and then it was such a
-comfort to think how fond the two sisters were of Jane, and to be
-certain that they must desire the connection as much as she could do. It
-was, moreover, such a promising thing for her younger daughters, as
-Jane’s marrying so greatly must throw them in the way of other rich men;
-and, lastly, it was so pleasant at her time of life to be able to
-consign her single daughters to the care of their sister, that she might
-not be obliged to go into company more than she liked. It was necessary
-to make this circumstance a matter of pleasure, because on such
-occasions it is the etiquette; but no one was less likely than Mrs.
-Bennet to find comfort in staying at home at any period of her life. She
-concluded with many good wishes that Lady Lucas might soon be equally
-fortunate, though evidently and triumphantly believing there was no
-chance of it.
-
-In vain did Elizabeth endeavour to check the rapidity of her mother’s
-words, or persuade her to describe her felicity in a less audible
-whisper; for to her inexpressible vexation she could perceive that the
-chief of it was overheard by Mr. Darcy, who sat opposite to them. Her
-mother only scolded her for being nonsensical.
-
-“What is Mr. Darcy to me, pray, that I should be afraid of him? I am
-sure we owe him no such particular civility as to be obliged to say
-nothing _he_ may not like to hear.”
-
-“For heaven’s sake, madam, speak lower. What advantage can it be to you
-to offend Mr. Darcy? You will never recommend yourself to his friend by
-so doing.”
-
-Nothing that she could say, however, had any influence. Her mother would
-talk of her views in the same intelligible tone. Elizabeth blushed and
-blushed again with shame and vexation. She could not help frequently
-glancing her eye at Mr. Darcy, though every glance convinced her of what
-she dreaded; for though he was not always looking at her mother, she was
-convinced that his attention was invariably fixed by her. The expression
-of his face changed gradually from indignant contempt to a composed and
-steady gravity.
-
-At length, however, Mrs. Bennet had no more to say; and Lady Lucas, who
-had been long yawning at the repetition of delights which she saw no
-likelihood of sharing, was left to the comforts of cold ham and chicken.
-Elizabeth now began to revive. But not long was the interval of
-tranquillity; for when supper was over, singing was talked of, and she
-had the mortification of seeing Mary, after very little entreaty,
-preparing to oblige the company. By many significant looks and silent
-entreaties did she endeavour to prevent such a proof of
-complaisance,--but in vain; Mary would not understand them; such an
-opportunity of exhibiting was delightful to her, and she began her song.
-Elizabeth’s eyes were fixed on her, with most painful sensations; and
-she watched her progress through the several stanzas with an impatience
-which was very ill rewarded at their close; for Mary, on receiving
-amongst the thanks of the table the hint of a hope that she might be
-prevailed on to favour them again, after the pause of half a minute
-began another. Mary’s powers were by no means fitted for such a display;
-her voice was weak, and her manner affected. Elizabeth was in agonies.
-She looked at Jane to see how she bore it; but Jane was very composedly
-talking to Bingley. She looked at his two sisters, and saw them making
-signs of derision at each other, and at Darcy, who continued, however,
-impenetrably grave. She looked at her father to entreat his
-interference, lest Mary should be singing all night. He took the hint,
-and, when Mary had finished her second song, said aloud,--
-
-“That will do extremely well, child. You have delighted us long enough.
-Let the other young ladies have time to exhibit.”
-
-Mary, though pretending not to hear, was somewhat disconcerted; and
-Elizabeth, sorry for her, and sorry for her father’s speech, was afraid
-her anxiety had done no good. Others of the party were now applied to.
-
-“If I,” said Mr. Collins, “were so fortunate as to be able to sing, I
-should have great pleasure, I am sure, in obliging the company with an
-air; for I consider music as a very innocent diversion, and perfectly
-compatible with the profession of a clergyman. I do not mean, however,
-to assert that we can be justified in devoting too much of our time to
-music, for there are certainly other things to be attended to. The
-rector of a parish has much to do. In the first place, he must make such
-an agreement for tithes as may be beneficial to himself and not
-offensive to his patron. He must write his own sermons; and the time
-that remains will not be too much for his parish duties, and the care
-and improvement of his dwelling, which he cannot be excused from making
-as comfortable as possible. And I do not think it of light importance
-that he should have attentive and conciliatory manners towards
-everybody, especially towards those to whom he owes his preferment. I
-cannot acquit him of that duty; nor could I think well of the man who
-should omit an occasion of testifying his respect towards anybody
-connected with the family.” And with a bow to Mr. Darcy, he concluded
-his speech, which had been spoken so loud as to be heard by half the
-room. Many stared--many smiled; but no one looked more amused than Mr.
-Bennet himself, while his wife seriously commended Mr. Collins for
-having spoken so sensibly, and observed, in a half-whisper to Lady
-Lucas, that he was a remarkably clever, good kind of young man.
-
-To Elizabeth it appeared, that had her family made an agreement to
-expose themselves as much as they could during the evening, it would
-have been impossible for them to play their parts with more spirit, or
-finer success; and happy did she think it for Bingley and her sister
-that some of the exhibition had escaped his notice, and that his
-feelings were not of a sort to be much distressed by the folly which he
-must have witnessed. That his two sisters and Mr. Darcy, however, should
-have such an opportunity of ridiculing her relations was bad enough; and
-she could not determine whether the silent contempt of the gentleman, or
-the insolent smiles of the ladies, were more intolerable.
-
-The rest of the evening brought her little amusement. She was teased by
-Mr. Collins, who continued most perseveringly by her side; and though he
-could not prevail with her to dance with him again, put it out of her
-power to dance with others. In vain did she entreat him to stand up with
-somebody else, and offered to introduce him to any young lady in the
-room. He assured her that, as to dancing, he was perfectly indifferent
-to it; that his chief object was, by delicate attentions, to recommend
-himself to her; and that he should therefore make a point of remaining
-close to her the whole evening. There was no arguing upon such a
-project. She owed her greatest relief to her friend Miss Lucas, who
-often joined them, and good-naturedly engaged Mr. Collins’s conversation
-to herself.
-
-She was at least free from the offence of Mr. Darcy’s further notice:
-though often standing within a very short distance of her, quite
-disengaged, he never came near enough to speak. She felt it to be the
-probable consequence of her allusions to Mr. Wickham, and rejoiced in
-it.
-
-The Longbourn party were the last of all the company to depart; and by a
-manœuvre of Mrs. Bennet had to wait for their carriage a quarter of an
-hour after everybody else was gone, which gave them time to see how
-heartily they were wished away by some of the family. Mrs. Hurst and her
-sister scarcely opened their mouths except to complain of fatigue, and
-were evidently impatient to have the house to themselves. They repulsed
-every attempt of Mrs. Bennet at conversation, and, by so doing, threw a
-languor over the whole party, which was very little relieved by the long
-speeches of Mr. Collins, who was complimenting Mr. Bingley and his
-sisters on the elegance of their entertainment, and the hospitality and
-politeness which had marked their behaviour to their guests. Darcy said
-nothing at all. Mr. Bennet, in equal silence, was enjoying the scene.
-Mr. Bingley and Jane were standing together a little detached from the
-rest, and talked only to each other. Elizabeth preserved as steady a
-silence as either Mrs. Hurst or Miss Bingley; and even Lydia was too
-much fatigued to utter more than the occasional exclamation of “Lord,
-how tired I am!” accompanied by a violent yawn.
-
-When at length they arose to take leave, Mrs. Bennet was most pressingly
-civil in her hope of seeing the whole family soon at Longbourn; and
-addressed herself particularly to Mr. Bingley, to assure him how happy
-he would make them, by eating a family dinner with them at any time,
-without the ceremony of a formal invitation. Bingley was all grateful
-pleasure; and he readily engaged for taking the earliest opportunity of
-waiting on her after his return from London, whither he was obliged to
-go the next day for a short time.
-
-Mrs. Bennet was perfectly satisfied; and quitted the house under the
-delightful persuasion that, allowing for the necessary preparations of
-settlements, new carriages, and wedding clothes, she should undoubtedly
-see her daughter settled at Netherfield in the course of three or four
-months. Of having another daughter married to Mr. Collins she thought
-with equal certainty, and with considerable, though not equal, pleasure.
-Elizabeth was the least dear to her of all her children; and though the
-man and the match were quite good enough for _her_, the worth of each
-was eclipsed by Mr. Bingley and Netherfield.
-
-
-
-
-[Illustration:
-
-     “to assure you in the most animated language”
-]
-
-
-
-
-CHAPTER XIX.
-
-
-[Illustration]
-
-The next day opened a new scene at Longbourn. Mr. Collins made his
-declaration in form. Having resolved to do it without loss of time, as
-his leave of absence extended only to the following Saturday, and having
-no feelings of diffidence to make it distressing to himself even at the
-moment, he set about it in a very orderly manner, with all the
-observances which he supposed a regular part of the business. On finding
-Mrs. Bennet, Elizabeth, and one of the younger girls together, soon
-after breakfast, he addressed the mother in these words,--
-
-“May I hope, madam, for your interest with your fair daughter Elizabeth,
-when I solicit for the honour of a private audience with her in the
-course of this morning?”
-
-Before Elizabeth had time for anything but a blush of surprise, Mrs.
-Bennet instantly answered,--
-
-“Oh dear! Yes, certainly. I am sure Lizzy will be very happy--I am sure
-she can have no objection. Come, Kitty, I want you upstairs.” And
-gathering her work together, she was hastening away, when Elizabeth
-called out,--
-
-“Dear ma’am, do not go. I beg you will not go. Mr. Collins must excuse
-me. He can have nothing to say to me that anybody need not hear. I am
-going away myself.”
-
-“No, no, nonsense, Lizzy. I desire you will stay where you are.” And
-upon Elizabeth’s seeming really, with vexed and embarrassed looks, about
-to escape, she added, “Lizzy, I _insist_ upon your staying and hearing
-Mr. Collins.”
-
-Elizabeth would not oppose such an injunction; and a moment’s
-consideration making her also sensible that it would be wisest to get it
-over as soon and as quietly as possible, she sat down again, and tried
-to conceal, by incessant employment, the feelings which were divided
-between distress and diversion. Mrs. Bennet and Kitty walked off, and as
-soon as they were gone, Mr. Collins began,--
-
-“Believe me, my dear Miss Elizabeth, that your modesty, so far from
-doing you any disservice, rather adds to your other perfections. You
-would have been less amiable in my eyes had there _not_ been this little
-unwillingness; but allow me to assure you that I have your respected
-mother’s permission for this address. You can hardly doubt the purport
-of my discourse, however your natural delicacy may lead you to
-dissemble; my attentions have been too marked to be mistaken. Almost as
-soon as I entered the house I singled you out as the companion of my
-future life. But before I am run away with by my feelings on this
-subject, perhaps it will be advisable for me to state my reasons for
-marrying--and, moreover, for coming into Hertfordshire with the design
-of selecting a wife, as I certainly did.”
-
-The idea of Mr. Collins, with all his solemn composure, being run away
-with by his feelings, made Elizabeth so near laughing that she could not
-use the short pause he allowed in any attempt to stop him farther, and
-he continued,--
-
-“My reasons for marrying are, first, that I think it a right thing for
-every clergyman in easy circumstances (like myself) to set the example
-of matrimony in his parish; secondly, that I am convinced it will add
-very greatly to my happiness; and, thirdly, which perhaps I ought to
-have mentioned earlier, that it is the particular advice and
-recommendation of the very noble lady whom I have the honour of calling
-patroness. Twice has she condescended to give me her opinion (unasked
-too!) on this subject; and it was but the very Saturday night before I
-left Hunsford,--between our pools at quadrille, while Mrs. Jenkinson was
-arranging Miss De Bourgh’s footstool,--that she said, ‘Mr. Collins, you
-must marry. A clergyman like you must marry. Choose properly, choose a
-gentlewoman for _my_ sake, and for your _own_; let her be an active,
-useful sort of person, not brought up high, but able to make a small
-income go a good way. This is my advice. Find such a woman as soon as
-you can, bring her to Hunsford, and I will visit her.’ Allow me, by the
-way, to observe, my fair cousin, that I do not reckon the notice and
-kindness of Lady Catherine de Bourgh as among the least of the
-advantages in my power to offer. You will find her manners beyond
-anything I can describe; and your wit and vivacity, I think, must be
-acceptable to her, especially when tempered with the silence and respect
-which her rank will inevitably excite. Thus much for my general
-intention in favour of matrimony; it remains to be told why my views
-were directed to Longbourn instead of my own neighbourhood, where I
-assure you there are many amiable young women. But the fact is, that
-being, as I am, to inherit this estate after the death of your honoured
-father (who, however, may live many years longer), I could not satisfy
-myself without resolving to choose a wife from among his daughters, that
-the loss to them might be as little as possible when the melancholy
-event takes place--which, however, as I have already said, may not be
-for several years. This has been my motive, my fair cousin, and I
-flatter myself it will not sink me in your esteem. And now nothing
-remains for me but to assure you in the most animated language of the
-violence of my affection. To fortune I am perfectly indifferent, and
-shall make no demand of that nature on your father, since I am well
-aware that it could not be complied with; and that one thousand pounds
-in the 4 per cents., which will not be yours till after your mother’s
-decease, is all that you may ever be entitled to. On that head,
-therefore, I shall be uniformly silent: and you may assure yourself that
-no ungenerous reproach shall ever pass my lips when we are married.”
-
-It was absolutely necessary to interrupt him now.
-
-“You are too hasty, sir,” she cried. “You forget that I have made no
-answer. Let me do it without further loss of time. Accept my thanks for
-the compliment you are paying me. I am very sensible of the honour of
-your proposals, but it is impossible for me to do otherwise than decline
-them.”
-
-“I am not now to learn,” replied Mr. Collins, with a formal wave of the
-hand, “that it is usual with young ladies to reject the addresses of the
-man whom they secretly mean to accept, when he first applies for their
-favour; and that sometimes the refusal is repeated a second or even a
-third time. I am, therefore, by no means discouraged by what you have
-just said, and shall hope to lead you to the altar ere long.”
-
-“Upon my word, sir,” cried Elizabeth, “your hope is rather an
-extraordinary one after my declaration. I do assure you that I am not
-one of those young ladies (if such young ladies there are) who are so
-daring as to risk their happiness on the chance of being asked a second
-time. I am perfectly serious in my refusal. You could not make _me_
-happy, and I am convinced that I am the last woman in the world who
-would make _you_ so. Nay, were your friend Lady Catherine to know me, I
-am persuaded she would find me in every respect ill qualified for the
-situation.”
-
-“Were it certain that Lady Catherine would think so,” said Mr. Collins,
-very gravely--“but I cannot imagine that her Ladyship would at all
-disapprove of you. And you may be certain that when I have the honour of
-seeing her again I shall speak in the highest terms of your modesty,
-economy, and other amiable qualifications.”
-
-“Indeed, Mr. Collins, all praise of me will be unnecessary. You must
-give me leave to judge for myself, and pay me the compliment of
-believing what I say. I wish you very happy and very rich, and by
-refusing your hand, do all in my power to prevent your being otherwise.
-In making me the offer, you must have satisfied the delicacy of your
-feelings with regard to my family, and may take possession of Longbourn
-estate whenever it falls, without any self-reproach. This matter may be
-considered, therefore, as finally settled.” And rising as she thus
-spoke, she would have quitted the room, had not Mr. Collins thus
-addressed her,--
-
-“When I do myself the honour of speaking to you next on the subject, I
-shall hope to receive a more favourable answer than you have now given
-me; though I am far from accusing you of cruelty at present, because I
-know it to be the established custom of your sex to reject a man on the
-first application, and, perhaps, you have even now said as much to
-encourage my suit as would be consistent with the true delicacy of the
-female character.”
-
-“Really, Mr. Collins,” cried Elizabeth, with some warmth, “you puzzle me
-exceedingly. If what I have hitherto said can appear to you in the form
-of encouragement, I know not how to express my refusal in such a way as
-may convince you of its being one.”
-
-“You must give me leave to flatter myself, my dear cousin, that your
-refusal of my addresses are merely words of course. My reasons for
-believing it are briefly these:--It does not appear to me that my hand
-is unworthy of your acceptance, or that the establishment I can offer
-would be any other than highly desirable. My situation in life, my
-connections with the family of De Bourgh, and my relationship to your
-own, are circumstances highly in my favour; and you should take it into
-further consideration that, in spite of your manifold attractions, it is
-by no means certain that another offer of marriage may ever be made you.
-Your portion is unhappily so small, that it will in all likelihood undo
-the effects of your loveliness and amiable qualifications. As I must,
-therefore, conclude that you are not serious in your rejection of me, I
-shall choose to attribute it to your wish of increasing my love by
-suspense, according to the usual practice of elegant females.”
-
-“I do assure you, sir, that I have no pretensions whatever to that kind
-of elegance which consists in tormenting a respectable man. I would
-rather be paid the compliment of being believed sincere. I thank you
-again and again for the honour you have done me in your proposals, but
-to accept them is absolutely impossible. My feelings in every respect
-forbid it. Can I speak plainer? Do not consider me now as an elegant
-female intending to plague you, but as a rational creature speaking the
-truth from her heart.”
-
-“You are uniformly charming!” cried he, with an air of awkward
-gallantry; “and I am persuaded that, when sanctioned by the express
-authority of both your excellent parents, my proposals will not fail of
-being acceptable.”
-
-To such perseverance in wilful self-deception Elizabeth would make no
-reply, and immediately and in silence withdrew; determined, that if he
-persisted in considering her repeated refusals as flattering
-encouragement, to apply to her father, whose negative might be uttered
-in such a manner as must be decisive, and whose behaviour at least could
-not be mistaken for the affectation and coquetry of an elegant female.
-
-
-
-
-[Illustration]
-
-
-
-
-CHAPTER XX.
-
-
-[Illustration]
-
-Mr. Collins was not left long to the silent contemplation of his
-successful love; for Mrs. Bennet, having dawdled about in the vestibule
-to watch for the end of the conference, no sooner saw Elizabeth open the
-door and with quick step pass her towards the staircase, than she
-entered the breakfast-room, and congratulated both him and herself in
-warm terms on the happy prospect of their nearer connection. Mr. Collins
-received and returned these felicitations with equal pleasure, and then
-proceeded to relate the particulars of their interview, with the result
-of which he trusted he had every reason to be satisfied, since the
-refusal which his cousin had steadfastly given him would naturally flow
-from her bashful modesty and the genuine delicacy of her character.
-
-This information, however, startled Mrs. Bennet: she would have been
-glad to be equally satisfied that her daughter had meant to encourage
-him by protesting against his proposals, but she dared not believe it,
-and could not help saying so.
-
-“But depend upon it, Mr. Collins,” she added, “that Lizzy shall be
-brought to reason. I will speak to her about it myself directly. She is
-a very headstrong, foolish girl, and does not know her own interest; but
-I will _make_ her know it.”
-
-“Pardon me for interrupting you, madam,” cried Mr. Collins; “but if she
-is really headstrong and foolish, I know not whether she would
-altogether be a very desirable wife to a man in my situation, who
-naturally looks for happiness in the marriage state. If, therefore, she
-actually persists in rejecting my suit, perhaps it were better not to
-force her into accepting me, because, if liable to such defects of
-temper, she could not contribute much to my felicity.”
-
-“Sir, you quite misunderstand me,” said Mrs. Bennet, alarmed. “Lizzy is
-only headstrong in such matters as these. In everything else she is as
-good-natured a girl as ever lived. I will go directly to Mr. Bennet, and
-we shall very soon settle it with her, I am sure.”
-
-She would not give him time to reply, but hurrying instantly to her
-husband, called out, as she entered the library,--
-
-“Oh, Mr. Bennet, you are wanted immediately; we are all in an uproar.
-You must come and make Lizzy marry Mr. Collins, for she vows she will
-not have him; and if you do not make haste he will change his mind and
-not have _her_.”
-
-Mr. Bennet raised his eyes from his book as she entered, and fixed them
-on her face with a calm unconcern, which was not in the least altered by
-her communication.
-
-“I have not the pleasure of understanding you,” said he, when she had
-finished her speech. “Of what are you talking?”
-
-“Of Mr. Collins and Lizzy. Lizzy declares she will not have Mr. Collins,
-and Mr. Collins begins to say that he will not have Lizzy.”
-
-“And what am I to do on the occasion? It seems a hopeless business.”
-
-“Speak to Lizzy about it yourself. Tell her that you insist upon her
-marrying him.”
-
-“Let her be called down. She shall hear my opinion.”
-
-Mrs. Bennet rang the bell, and Miss Elizabeth was summoned to the
-library.
-
-“Come here, child,” cried her father as she appeared. “I have sent for
-you on an affair of importance. I understand that Mr. Collins has made
-you an offer of marriage. Is it true?”
-
-Elizabeth replied that it was.
-
-“Very well--and this offer of marriage you have refused?”
-
-“I have, sir.”
-
-“Very well. We now come to the point. Your mother insists upon your
-accepting it. Is it not so, Mrs. Bennet?”
-
-“Yes, or I will never see her again.”
-
-“An unhappy alternative is before you, Elizabeth. From this day you must
-be a stranger to one of your parents. Your mother will never see you
-again if you do _not_ marry Mr. Collins, and I will never see you again
-if you _do_.”
-
-Elizabeth could not but smile at such a conclusion of such a beginning;
-but Mrs. Bennet, who had persuaded herself that her husband regarded the
-affair as she wished, was excessively disappointed.
-
-“What do you mean, Mr. Bennet, by talking in this way? You promised me
-to _insist_ upon her marrying him.”
-
-“My dear,” replied her husband, “I have two small favours to request.
-First, that you will allow me the free use of my understanding on the
-present occasion; and, secondly, of my room. I shall be glad to have the
-library to myself as soon as may be.”
-
-Not yet, however, in spite of her disappointment in her husband, did
-Mrs. Bennet give up the point. She talked to Elizabeth again and again;
-coaxed and threatened her by turns. She endeavoured to secure Jane in
-her interest, but Jane, with all possible mildness, declined
-interfering; and Elizabeth, sometimes with real earnestness, and
-sometimes with playful gaiety, replied to her attacks. Though her manner
-varied, however, her determination never did.
-
-Mr. Collins, meanwhile, was meditating in solitude on what had passed.
-He thought too well of himself to comprehend on what motive his cousin
-could refuse him; and though his pride was hurt, he suffered in no other
-way. His regard for her was quite imaginary; and the possibility of her
-deserving her mother’s reproach prevented his feeling any regret.
-
-While the family were in this confusion, Charlotte Lucas came to spend
-the day with them. She was met in the vestibule by Lydia, who, flying to
-her, cried in a half whisper, “I am glad you are come, for there is such
-fun here! What do you think has happened this morning? Mr. Collins has
-made an offer to Lizzy, and she will not have him.”
-
-[Illustration:
-
-     “they entered the breakfast room”
-]
-
-Charlotte had hardly time to answer before they were joined by Kitty,
-who came to tell the same news; and no sooner had they entered the
-breakfast-room, where Mrs. Bennet was alone, than she likewise began on
-the subject, calling on Miss Lucas for her compassion, and entreating
-her to persuade her friend Lizzy to comply with the wishes of her
-family. “Pray do, my dear Miss Lucas,” she added, in a melancholy tone;
-“for nobody is on my side, nobody takes part with me; I am cruelly used,
-nobody feels for my poor nerves.”
-
-Charlotte’s reply was spared by the entrance of Jane and Elizabeth.
-
-“Ay, there she comes,” continued Mrs. Bennet, “looking as unconcerned as
-may be, and caring no more for us than if we were at York, provided she
-can have her own way. But I tell you what, Miss Lizzy, if you take it
-into your head to go on refusing every offer of marriage in this way,
-you will never get a husband at all--and I am sure I do not know who is
-to maintain you when your father is dead. _I_ shall not be able to keep
-you--and so I warn you. I have done with you from this very day. I told
-you in the library, you know, that I should never speak to you again,
-and you will find me as good as my word. I have no pleasure in talking
-to undutiful children. Not that I have much pleasure, indeed, in talking
-to anybody. People who suffer as I do from nervous complaints can have
-no great inclination for talking. Nobody can tell what I suffer! But it
-is always so. Those who do not complain are never pitied.”
-
-Her daughters listened in silence to this effusion, sensible that any
-attempt to reason with or soothe her would only increase the irritation.
-She talked on, therefore, without interruption from any of them till
-they were joined by Mr. Collins, who entered with an air more stately
-than usual, and on perceiving whom, she said to the girls,--
-
-“Now, I do insist upon it, that you, all of you, hold your tongues, and
-let Mr. Collins and me have a little conversation together.”
-
-Elizabeth passed quietly out of the room, Jane and Kitty followed, but
-Lydia stood her ground, determined to hear all she could; and Charlotte,
-detained first by the civility of Mr. Collins, whose inquiries after
-herself and all her family were very minute, and then by a little
-curiosity, satisfied herself with walking to the window and pretending
-not to hear. In a doleful voice Mrs. Bennet thus began the projected
-conversation:--
-
-“Oh, Mr. Collins!”
-
-“My dear madam,” replied he, “let us be for ever silent on this point.
-Far be it from me,” he presently continued, in a voice that marked his
-displeasure, “to resent the behaviour of your daughter. Resignation to
-inevitable evils is the duty of us all: the peculiar duty of a young man
-who has been so fortunate as I have been, in early preferment; and, I
-trust, I am resigned. Perhaps not the less so from feeling a doubt of my
-positive happiness had my fair cousin honoured me with her hand; for I
-have often observed, that resignation is never so perfect as when the
-blessing denied begins to lose somewhat of its value in our estimation.
-You will not, I hope, consider me as showing any disrespect to your
-family, my dear madam, by thus withdrawing my pretensions to your
-daughter’s favour, without having paid yourself and Mr. Bennet the
-compliment of requesting you to interpose your authority in my behalf.
-My conduct may, I fear, be objectionable in having accepted my
-dismission from your daughter’s lips instead of your own; but we are all
-liable to error. I have certainly meant well through the whole affair.
-My object has been to secure an amiable companion for myself, with due
-consideration for the advantage of all your family; and if my _manner_
-has been at all reprehensible, I here beg leave to apologize.”
-
-
-
-
-[Illustration]
-
-
-
-
-CHAPTER XXI.
-
-
-[Illustration]
-
-The discussion of Mr. Collins’s offer was now nearly at an end, and
-Elizabeth had only to suffer from the uncomfortable feelings necessarily
-attending it, and occasionally from some peevish allusion of her mother.
-As for the gentleman himself, _his_ feelings were chiefly expressed, not
-by embarrassment or dejection, or by trying to avoid her, but by
-stiffness of manner and resentful silence. He scarcely ever spoke to
-her; and the assiduous attentions which he had been so sensible of
-himself were transferred for the rest of the day to Miss Lucas, whose
-civility in listening to him was a seasonable relief to them all, and
-especially to her friend.
-
-The morrow produced no abatement of Mrs. Bennet’s ill humour or ill
-health. Mr. Collins was also in the same state of angry pride. Elizabeth
-had hoped that his resentment might shorten his visit, but his plan did
-not appear in the least affected by it. He was always to have gone on
-Saturday, and to Saturday he still meant to stay.
-
-After breakfast, the girls walked to Meryton, to inquire if Mr. Wickham
-were returned, and to lament over his absence from the Netherfield ball.
-He joined them on their entering the town, and attended them to their
-aunt’s, where his regret and vexation and the concern of everybody were
-well talked over. To Elizabeth, however, he voluntarily acknowledged
-that the necessity of his absence _had_ been self-imposed.
-
-“I found,” said he, “as the time drew near, that I had better not meet
-Mr. Darcy;--that to be in the same room, the same party with him for so
-many hours together, might be more than I could bear, and that scenes
-might arise unpleasant to more than myself.”
-
-She highly approved his forbearance; and they had leisure for a full
-discussion of it, and for all the commendations which they civilly
-bestowed on each other, as Wickham and another officer walked back with
-them to Longbourn, and during the walk he particularly attended to her.
-His accompanying them was a double advantage: she felt all the
-compliment it offered to herself; and it was most acceptable as an
-occasion of introducing him to her father and mother.
-
-[Illustration: “Walked back with them”
-
-[_Copyright 1894 by George Allen._]]
-
-Soon after their return, a letter was delivered to Miss Bennet; it came
-from Netherfield, and was opened immediately. The envelope contained a
-sheet of elegant, little, hot-pressed paper, well covered with a lady’s
-fair, flowing hand; and Elizabeth saw her sister’s countenance change as
-she read it, and saw her dwelling intently on some particular passages.
-Jane recollected herself soon; and putting the letter away, tried to
-join, with her usual cheerfulness, in the general conversation: but
-Elizabeth felt an anxiety on the subject which drew off her attention
-even from Wickham; and no sooner had he and his companion taken leave,
-than a glance from Jane invited her to follow her upstairs. When they
-had gained their own room, Jane, taking out her letter, said, “This is
-from Caroline Bingley: what it contains has surprised me a good deal.
-The whole party have left Netherfield by this time, and are on their way
-to town; and without any intention of coming back again. You shall hear
-what she says.”
-
-She then read the first sentence aloud, which comprised the information
-of their having just resolved to follow their brother to town directly,
-and of their meaning to dine that day in Grosvenor Street, where Mr.
-Hurst had a house. The next was in these words:--“‘I do not pretend to
-regret anything I shall leave in Hertfordshire except your society, my
-dearest friend; but we will hope, at some future period, to enjoy many
-returns of that delightful intercourse we have known, and in the
-meanwhile may lessen the pain of separation by a very frequent and most
-unreserved correspondence. I depend on you for that.’” To these
-high-flown expressions Elizabeth listened with all the insensibility of
-distrust; and though the suddenness of their removal surprised her, she
-saw nothing in it really to lament: it was not to be supposed that their
-absence from Netherfield would prevent Mr. Bingley’s being there; and as
-to the loss of their society, she was persuaded that Jane must soon
-cease to regard it in the enjoyment of his.
-
-“It is unlucky,” said she, after a short pause, “that you should not be
-able to see your friends before they leave the country. But may we not
-hope that the period of future happiness, to which Miss Bingley looks
-forward, may arrive earlier than she is aware, and that the delightful
-intercourse you have known as friends will be renewed with yet greater
-satisfaction as sisters? Mr. Bingley will not be detained in London by
-them.”
-
-“Caroline decidedly says that none of the party will return into
-Hertfordshire this winter. I will read it to you.
-
-“‘When my brother left us yesterday, he imagined that the business which
-took him to London might be concluded in three or four days; but as we
-are certain it cannot be so, and at the same time convinced that when
-Charles gets to town he will be in no hurry to leave it again, we have
-determined on following him thither, that he may not be obliged to spend
-his vacant hours in a comfortless hotel. Many of my acquaintance are
-already there for the winter: I wish I could hear that you, my dearest
-friend, had any intention of making one in the crowd, but of that I
-despair. I sincerely hope your Christmas in Hertfordshire may abound in
-the gaieties which that season generally brings, and that your beaux
-will be so numerous as to prevent your feeling the loss of the three of
-whom we shall deprive you.’
-
-“It is evident by this,” added Jane, “that he comes back no more this
-winter.”
-
-“It is only evident that Miss Bingley does not mean he _should_.”
-
-“Why will you think so? It must be his own doing; he is his own master.
-But you do not know _all_. I _will_ read you the passage which
-particularly hurts me. I will have no reserves from _you_. ‘Mr. Darcy is
-impatient to see his sister; and to confess the truth, _we_ are scarcely
-less eager to meet her again. I really do not think Georgiana Darcy has
-her equal for beauty, elegance, and accomplishments; and the affection
-she inspires in Louisa and myself is heightened into something still
-more interesting from the hope we dare to entertain of her being
-hereafter our sister. I do not know whether I ever before mentioned to
-you my feelings on this subject, but I will not leave the country
-without confiding them, and I trust you will not esteem them
-unreasonable. My brother admires her greatly already; he will have
-frequent opportunity now of seeing her on the most intimate footing; her
-relations all wish the connection as much as his own; and a sister’s
-partiality is not misleading me, I think, when I call Charles most
-capable of engaging any woman’s heart. With all these circumstances to
-favour an attachment, and nothing to prevent it, am I wrong, my dearest
-Jane, in indulging the hope of an event which will secure the happiness
-of so many?’ What think you of _this_ sentence, my dear Lizzy?” said
-Jane, as she finished it. “Is it not clear enough? Does it not expressly
-declare that Caroline neither expects nor wishes me to be her sister;
-that she is perfectly convinced of her brother’s indifference; and that
-if she suspects the nature of my feelings for him she means (most
-kindly!) to put me on my guard. Can there be any other opinion on the
-subject?”
-
-“Yes, there can; for mine is totally different. Will you hear it?”
-
-“Most willingly.”
-
-“You shall have it in a few words. Miss Bingley sees that her brother is
-in love with you and wants him to marry Miss Darcy. She follows him to
-town in the hope of keeping him there, and tries to persuade you that he
-does not care about you.”
-
-Jane shook her head.
-
-“Indeed, Jane, you ought to believe me. No one who has ever seen you
-together can doubt his affection; Miss Bingley, I am sure, cannot: she
-is not such a simpleton. Could she have seen half as much love in Mr.
-Darcy for herself, she would have ordered her wedding clothes. But the
-case is this:--we are not rich enough or grand enough for them; and she
-is the more anxious to get Miss Darcy for her brother, from the notion
-that when there has been _one_ inter-marriage, she may have less trouble
-in achieving a second; in which there is certainly some ingenuity, and I
-dare say it would succeed if Miss de Bourgh were out of the way. But, my
-dearest Jane, you cannot seriously imagine that, because Miss Bingley
-tells you her brother greatly admires Miss Darcy, he is in the smallest
-degree less sensible of _your_ merit than when he took leave of you on
-Tuesday; or that it will be in her power to persuade him that, instead
-of being in love with you, he is very much in love with her friend.”
-
-“If we thought alike of Miss Bingley,” replied Jane, “your
-representation of all this might make me quite easy. But I know the
-foundation is unjust. Caroline is incapable of wilfully deceiving
-anyone; and all that I can hope in this case is, that she is deceived
-herself.”
-
-“That is right. You could not have started a more happy idea, since you
-will not take comfort in mine: believe her to be deceived, by all means.
-You have now done your duty by her, and must fret no longer.”
-
-“But, my dear sister, can I be happy, even supposing the best, in
-accepting a man whose sisters and friends are all wishing him to marry
-elsewhere?”
-
-“You must decide for yourself,” said Elizabeth; “and if, upon mature
-deliberation, you find that the misery of disobliging his two sisters is
-more than equivalent to the happiness of being his wife, I advise you,
-by all means, to refuse him.”
-
-“How can you talk so?” said Jane, faintly smiling; “you must know, that,
-though I should be exceedingly grieved at their disapprobation, I could
-not hesitate.”
-
-“I did not think you would; and that being the case, I cannot consider
-your situation with much compassion.”
-
-“But if he returns no more this winter, my choice will never be
-required. A thousand things may arise in six months.”
-
-The idea of his returning no more Elizabeth treated with the utmost
-contempt. It appeared to her merely the suggestion of Caroline’s
-interested wishes; and she could not for a moment suppose that those
-wishes, however openly or artfully spoken, could influence a young man
-so totally independent of everyone.
-
-She represented to her sister, as forcibly as possible, what she felt on
-the subject, and had soon the pleasure of seeing its happy effect.
-Jane’s temper was not desponding; and she was gradually led to hope,
-though the diffidence of affection sometimes overcame the hope, that
-Bingley would return to Netherfield, and answer every wish of her heart.
-
-They agreed that Mrs. Bennet should only hear of the departure of the
-family, without being alarmed on the score of the gentleman’s conduct;
-but even this partial communication gave her a great deal of concern,
-and she bewailed it as exceedingly unlucky that the ladies should happen
-to go away just as they were all getting so intimate together. After
-lamenting it, however, at some length, she had the consolation of
-thinking that Mr. Bingley would be soon down again, and soon dining at
-Longbourn; and the conclusion of all was the comfortable declaration,
-that, though he had been invited only to a family dinner, she would take
-care to have two full courses.
-
-
-
-
-[Illustration]
-
-
-
-
-CHAPTER XXII.
-
-
-[Illustration]
-
-The Bennets were engaged to dine with the Lucases; and again, during the
-chief of the day, was Miss Lucas so kind as to listen to Mr. Collins.
-Elizabeth took an opportunity of thanking her. “It keeps him in good
-humour,” said she, “and I am more obliged to you than I can express.”
-
-Charlotte assured her friend of her satisfaction in being useful, and
-that it amply repaid her for the little sacrifice of her time. This was
-very amiable; but Charlotte’s kindness extended farther than Elizabeth
-had any conception of:--its object was nothing less than to secure her
-from any return of Mr. Collins’s addresses, by engaging them towards
-herself. Such was Miss Lucas’s scheme; and appearances were so
-favourable, that when they parted at night, she would have felt almost
-sure of success if he had not been to leave Hertfordshire so very soon.
-But here she did injustice to the fire and independence of his
-character; for it led him to escape out of Longbourn House the next
-morning with admirable slyness, and hasten to Lucas Lodge to throw
-himself at her feet. He was anxious to avoid the notice of his cousins,
-from a conviction that, if they saw him depart, they could not fail to
-conjecture his design, and he was not willing to have the attempt known
-till its success could be known likewise; for, though feeling almost
-secure, and with reason, for Charlotte had been tolerably encouraging,
-he was comparatively diffident since the adventure of Wednesday. His
-reception, however, was of the most flattering kind. Miss Lucas
-perceived him from an upper window as he walked towards the house, and
-instantly set out to meet him accidentally in the lane. But little had
-she dared to hope that so much love and eloquence awaited her there.
-
-In as short a time as Mr. Collins’s long speeches would allow,
-everything was settled between them to the satisfaction of both; and as
-they entered the house, he earnestly entreated her to name the day that
-was to make him the happiest of men; and though such a solicitation must
-be waived for the present, the lady felt no inclination to trifle with
-his happiness. The stupidity with which he was favoured by nature must
-guard his courtship from any charm that could make a woman wish for its
-continuance; and Miss Lucas, who accepted him solely from the pure and
-disinterested desire of an establishment, cared not how soon that
-establishment were gained.
-
-Sir William and Lady Lucas were speedily applied to for their consent;
-and it was bestowed with a most joyful alacrity. Mr. Collins’s present
-circumstances made it a most eligible match for their daughter, to whom
-they could give little fortune; and his prospects of future wealth were
-exceedingly fair. Lady Lucas began directly to calculate, with more
-interest than the matter had ever
-
-[Illustration:
-
-     “So much love and eloquence”
-
-[_Copyright 1894 by George Allen._]]
-
-excited before, how many years longer Mr. Bennet was likely to live; and
-Sir William gave it as his decided opinion, that whenever Mr. Collins
-should be in possession of the Longbourn estate, it would be highly
-expedient that both he and his wife should make their appearance at St.
-James’s. The whole family in short were properly overjoyed on the
-occasion. The younger girls formed hopes of _coming out_ a year or two
-sooner than they might otherwise have done; and the boys were relieved
-from their apprehension of Charlotte’s dying an old maid. Charlotte
-herself was tolerably composed. She had gained her point, and had time
-to consider of it. Her reflections were in general satisfactory. Mr.
-Collins, to be sure, was neither sensible nor agreeable: his society was
-irksome, and his attachment to her must be imaginary. But still he would
-be her husband. Without thinking highly either of men or of matrimony,
-marriage had always been her object: it was the only honourable
-provision for well-educated young women of small fortune, and, however
-uncertain of giving happiness, must be their pleasantest preservative
-from want. This preservative she had now obtained; and at the age of
-twenty-seven, without having ever been handsome, she felt all the good
-luck of it. The least agreeable circumstance in the business was the
-surprise it must occasion to Elizabeth Bennet, whose friendship she
-valued beyond that of any other person. Elizabeth would wonder, and
-probably would blame her; and though her resolution was not to be
-shaken, her feelings must be hurt by such a disapprobation. She resolved
-to give her the information herself; and therefore charged Mr. Collins,
-when he returned to Longbourn to dinner, to drop no hint of what had
-passed before any of the family. A promise of secrecy was of course very
-dutifully given, but it could not be kept without difficulty; for the
-curiosity excited by his long absence burst forth in such very direct
-questions on his return, as required some ingenuity to evade, and he was
-at the same time exercising great self-denial, for he was longing to
-publish his prosperous love.
-
-As he was to begin his journey too early on the morrow to see any of
-the family, the ceremony of leave-taking was performed when the ladies
-moved for the night; and Mrs. Bennet, with great politeness and
-cordiality, said how happy they should be to see him at Longbourn again,
-whenever his other engagements might allow him to visit them.
-
-“My dear madam,” he replied, “this invitation is particularly
-gratifying, because it is what I have been hoping to receive; and you
-may be very certain that I shall avail myself of it as soon as
-possible.”
-
-They were all astonished; and Mr. Bennet, who could by no means wish for
-so speedy a return, immediately said,--
-
-“But is there not danger of Lady Catherine’s disapprobation here, my
-good sir? You had better neglect your relations than run the risk of
-offending your patroness.”
-
-“My dear sir,” replied Mr. Collins, “I am particularly obliged to you
-for this friendly caution, and you may depend upon my not taking so
-material a step without her Ladyship’s concurrence.”
-
-“You cannot be too much on your guard. Risk anything rather than her
-displeasure; and if you find it likely to be raised by your coming to us
-again, which I should think exceedingly probable, stay quietly at home,
-and be satisfied that _we_ shall take no offence.”
-
-“Believe me, my dear sir, my gratitude is warmly excited by such
-affectionate attention; and, depend upon it, you will speedily receive
-from me a letter of thanks for this as well as for every other mark of
-your regard during my stay in Hertfordshire. As for my fair cousins,
-though my absence may not be long enough to render it necessary, I shall
-now take the liberty of wishing them health and happiness, not excepting
-my cousin Elizabeth.”
-
-With proper civilities, the ladies then withdrew; all of them equally
-surprised to find that he meditated a quick return. Mrs. Bennet wished
-to understand by it that he thought of paying his addresses to one of
-her younger girls, and Mary might have been prevailed on to accept him.
-She rated his abilities much higher than any of the others: there was a
-solidity in his reflections which often struck her; and though by no
-means so clever as herself, she thought that, if encouraged to read and
-improve himself by such an example as hers, he might become a very
-agreeable companion. But on the following morning every hope of this
-kind was done away. Miss Lucas called soon after breakfast, and in a
-private conference with Elizabeth related the event of the day before.
-
-The possibility of Mr. Collins’s fancying himself in love with her
-friend had once occurred to Elizabeth within the last day or two: but
-that Charlotte could encourage him seemed almost as far from possibility
-as that she could encourage him herself; and her astonishment was
-consequently so great as to overcome at first the bounds of decorum, and
-she could not help crying out,--
-
-“Engaged to Mr. Collins! my dear Charlotte, impossible!”
-
-The steady countenance which Miss Lucas had commanded in telling her
-story gave way to a momentary confusion here on receiving so direct a
-reproach; though, as it was no more than she expected, she soon regained
-her composure, and calmly replied,--
-
-“Why should you be surprised, my dear Eliza? Do you think it incredible
-that Mr. Collins should be able to procure any woman’s good opinion,
-because he was not so happy as to succeed with you?”
-
-But Elizabeth had now recollected herself; and, making a strong effort
-for it, was able to assure her, with tolerable firmness, that the
-prospect of their relationship was highly grateful to her, and that she
-wished her all imaginable happiness.
-
-“I see what you are feeling,” replied Charlotte; “you must be surprised,
-very much surprised, so lately as Mr. Collins was wishing to marry you.
-But when you have had time to think it all over, I hope you will be
-satisfied with what I have done. I am not romantic, you know. I never
-was. I ask only a comfortable home; and, considering Mr. Collins’s
-character, connections, and situation in life, I am convinced that my
-chance of happiness with him is as fair as most people can boast on
-entering the marriage state.”
-
-Elizabeth quietly answered “undoubtedly;” and, after an awkward pause,
-they returned to the rest of the family. Charlotte did not stay much
-longer; and Elizabeth was then left to reflect on what she had heard. It
-was a long time before she became at all reconciled to the idea of so
-unsuitable a match. The strangeness of Mr. Collins’s making two offers
-of marriage within three days was nothing in comparison of his being now
-accepted. She had always felt that Charlotte’s opinion of matrimony was
-not exactly like her own; but she could not have supposed it possible
-that, when called into action, she would have sacrificed every better
-feeling to worldly advantage. Charlotte, the wife of Mr. Collins, was a
-most humiliating picture! And to the pang of a friend disgracing
-herself, and sunk in her esteem, was added the distressing conviction
-that it was impossible for that friend to be tolerably happy in the lot
-she had chosen.
-
-
-
-
-[Illustration:
-
-     “Protested he must be entirely mistaken.”
-
-[_Copyright 1894 by George Allen._]]
-
-
-
-
-CHAPTER XXIII.
-
-
-[Illustration]
-
-Elizabeth was sitting with her mother and sisters, reflecting on what
-she had heard, and doubting whether she was authorized to mention it,
-when Sir William Lucas himself appeared, sent by his daughter to
-announce her engagement to the family. With many compliments to them,
-and much self-gratulation on the prospect of a connection between the
-houses, he unfolded the matter,--to an audience not merely wondering,
-but incredulous; for Mrs. Bennet, with more perseverance than
-politeness, protested he must be entirely mistaken; and Lydia, always
-unguarded and often uncivil, boisterously exclaimed,--
-
-“Good Lord! Sir William, how can you tell such a story? Do not you know
-that Mr. Collins wants to marry Lizzy?”
-
-Nothing less than the complaisance of a courtier could have borne
-without anger such treatment: but Sir William’s good-breeding carried
-him through it all; and though he begged leave to be positive as to the
-truth of his information, he listened to all their impertinence with the
-most forbearing courtesy.
-
-Elizabeth, feeling it incumbent on her to relieve him from so unpleasant
-a situation, now put herself forward to confirm his account, by
-mentioning her prior knowledge of it from Charlotte herself; and
-endeavoured to put a stop to the exclamations of her mother and sisters,
-by the earnestness of her congratulations to Sir William, in which she
-was readily joined by Jane, and by making a variety of remarks on the
-happiness that might be expected from the match, the excellent character
-of Mr. Collins, and the convenient distance of Hunsford from London.
-
-Mrs. Bennet was, in fact, too much overpowered to say a great deal while
-Sir William remained; but no sooner had he left them than her feelings
-found a rapid vent. In the first place, she persisted in disbelieving
-the whole of the matter; secondly, she was very sure that Mr. Collins
-had been taken in; thirdly, she trusted that they would never be happy
-together; and, fourthly, that the match might be broken off. Two
-inferences, however, were plainly deduced from the whole: one, that
-Elizabeth was the real cause of all the mischief; and the other, that
-she herself had been barbarously used by them all; and on these two
-points she principally dwelt during the rest of the day. Nothing could
-console and nothing appease her. Nor did that day wear out her
-resentment. A week elapsed before she could see Elizabeth without
-scolding her: a month passed away before she could speak to Sir William
-or Lady Lucas without being rude; and many months were gone before she
-could at all forgive their daughter.
-
-Mr. Bennet’s emotions were much more tranquil on the occasion, and such
-as he did experience he pronounced to be of a most agreeable sort; for
-it gratified him, he said, to discover that Charlotte Lucas, whom he had
-been used to think tolerably sensible, was as foolish as his wife, and
-more foolish than his daughter!
-
-Jane confessed herself a little surprised at the match: but she said
-less of her astonishment than of her earnest desire for their happiness;
-nor could Elizabeth persuade her to consider it as improbable. Kitty and
-Lydia were far from envying Miss Lucas, for Mr. Collins was only a
-clergyman; and it affected them in no other way than as a piece of news
-to spread at Meryton.
-
-Lady Lucas could not be insensible of triumph on being able to retort on
-Mrs. Bennet the comfort of having a daughter well married; and she
-called at Longbourn rather oftener than usual to say how happy she was,
-though Mrs. Bennet’s sour looks and ill-natured remarks might have been
-enough to drive happiness away.
-
-Between Elizabeth and Charlotte there was a restraint which kept them
-mutually silent on the subject; and Elizabeth felt persuaded that no
-real confidence could ever subsist between them again. Her
-disappointment in Charlotte made her turn with fonder regard to her
-sister, of whose rectitude and delicacy she was sure her opinion could
-never be shaken, and for whose happiness she grew daily more anxious, as
-Bingley had now been gone a week, and nothing was heard of his return.
-
-Jane had sent Caroline an early answer to her letter, and was counting
-the days till she might reasonably hope to hear again. The promised
-letter of thanks from Mr. Collins arrived on Tuesday, addressed to their
-father, and written with all the solemnity of gratitude which a
-twelve-month’s abode in the family might have prompted. After
-discharging his conscience on that head, he proceeded to inform them,
-with many rapturous expressions, of his happiness in having obtained the
-affection of their amiable neighbour, Miss Lucas, and then explained
-that it was merely with the view of enjoying her society that he had
-been so ready to close with their kind wish of seeing him again at
-Longbourn, whither he hoped to be able to return on Monday fortnight;
-for Lady Catherine, he added, so heartily approved his marriage, that
-she wished it to take place as soon as possible, which he trusted would
-be an unanswerable argument with his amiable Charlotte to name an early
-day for making him the happiest of men.
-
-Mr. Collins’s return into Hertfordshire was no longer a matter of
-pleasure to Mrs. Bennet. On the contrary, she was as much disposed to
-complain of it as her husband. It was very strange that he should come
-to Longbourn instead of to Lucas Lodge; it was also very inconvenient
-and exceedingly troublesome. She hated having visitors in the house
-while her health was so indifferent, and lovers were of all people the
-most disagreeable. Such were the gentle murmurs of Mrs. Bennet, and they
-gave way only to the greater distress of Mr. Bingley’s continued
-absence.
-
-Neither Jane nor Elizabeth were comfortable on this subject. Day after
-day passed away without bringing any other tidings of him than the
-report which shortly prevailed in Meryton of his coming no more to
-Netherfield the whole winter; a report which highly incensed Mrs.
-Bennet, and which she never failed to contradict as a most scandalous
-falsehood.
-
-Even Elizabeth began to fear--not that Bingley was indifferent--but that
-his sisters would be successful in keeping him away. Unwilling as she
-was to admit an idea so destructive to Jane’s happiness, and so
-dishonourable to the stability of her lover, she could not prevent its
-frequently recurring. The united efforts of his two unfeeling sisters,
-and of his overpowering friend, assisted by the attractions of Miss
-Darcy and the amusements of London, might be too much, she feared, for
-the strength of his attachment.
-
-As for Jane, _her_ anxiety under this suspense was, of course, more
-painful than Elizabeth’s: but whatever she felt she was desirous of
-concealing; and between herself and Elizabeth, therefore, the subject
-was never alluded to. But as no such delicacy restrained her mother, an
-hour seldom passed in which she did not talk of Bingley, express her
-impatience for his arrival, or even require Jane to confess that if he
-did not come back she should think herself very ill-used. It needed all
-Jane’s steady mildness to bear these attacks with tolerable
-tranquillity.
-
-Mr. Collins returned most punctually on the Monday fortnight, but his
-reception at Longbourn was not quite so gracious as it had been on his
-first introduction. He was too happy, however, to need much attention;
-and, luckily for the others, the business of love-making relieved them
-from a great deal of his company. The chief of every day was spent by
-him at Lucas Lodge, and he sometimes returned to Longbourn only in time
-to make an apology for his absence before the family went to bed.
-
-[Illustration:
-
-     “_Whenever she spoke in a low voice_”
-]
-
-Mrs. Bennet was really in a most pitiable state. The very mention of
-anything concerning the match threw her into an agony of ill-humour, and
-wherever she went she was sure of hearing it talked of. The sight of
-Miss Lucas was odious to her. As her successor in that house, she
-regarded her with jealous abhorrence. Whenever Charlotte came to see
-them, she concluded her to be anticipating the hour of possession; and
-whenever she spoke in a low voice to Mr. Collins, was convinced that
-they were talking of the Longbourn estate, and resolving to turn herself
-and her daughters out of the house as soon as Mr. Bennet was dead. She
-complained bitterly of all this to her husband.
-
-“Indeed, Mr. Bennet,” said she, “it is very hard to think that Charlotte
-Lucas should ever be mistress of this house, that _I_ should be forced
-to make way for _her_, and live to see her take my place in it!”
-
-“My dear, do not give way to such gloomy thoughts. Let us hope for
-better things. Let us flatter ourselves that _I_ may be the survivor.”
-
-This was not very consoling to Mrs. Bennet; and, therefore, instead of
-making any answer, she went on as before.
-
-“I cannot bear to think that they should have all this estate. If it was
-not for the entail, I should not mind it.”
-
-“What should not you mind?”
-
-“I should not mind anything at all.”
-
-“Let us be thankful that you are preserved from a state of such
-insensibility.”
-
-“I never can be thankful, Mr. Bennet, for anything about the entail. How
-anyone could have the conscience to entail away an estate from one’s own
-daughters I cannot understand; and all for the sake of Mr. Collins, too!
-Why should _he_ have it more than anybody else?”
-
-“I leave it to yourself to determine,” said Mr. Bennet.
-
-
-
-
-[Illustration]
-
-
-
-
-CHAPTER XXIV.
-
-
-[Illustration]
-
-Miss Bingley’s letter arrived, and put an end to doubt. The very first
-sentence conveyed the assurance of their being all settled in London for
-the winter, and concluded with her brother’s regret at not having had
-time to pay his respects to his friends in Hertfordshire before he left
-the country.
-
-Hope was over, entirely over; and when Jane could attend to the rest of
-the letter, she found little, except the professed affection of the
-writer, that could give her any comfort. Miss Darcy’s praise occupied
-the chief of it. Her many attractions were again dwelt on; and Caroline
-boasted joyfully of their increasing intimacy, and ventured to predict
-the accomplishment of the wishes which had been unfolded in her former
-letter. She wrote also with great pleasure of her brother’s being an
-inmate of Mr. Darcy’s house, and mentioned with raptures some plans of
-the latter with regard to new furniture.
-
-Elizabeth, to whom Jane very soon communicated the chief of all this,
-heard it in silent indignation. Her heart was divided between concern
-for her sister and resentment against all others. To Caroline’s
-assertion of her brother’s being partial to Miss Darcy, she paid no
-credit. That he was really fond of Jane, she doubted no more than she
-had ever done; and much as she had always been disposed to like him, she
-could not think without anger, hardly without contempt, on that easiness
-of temper, that want of proper resolution, which now made him the slave
-of his designing friends, and led him to sacrifice his own happiness to
-the caprice of their inclinations. Had his own happiness, however, been
-the only sacrifice, he might have been allowed to sport with it in
-whatever manner he thought best; but her sister’s was involved in it, as
-she thought he must be sensible himself. It was a subject, in short, on
-which reflection would be long indulged, and must be unavailing. She
-could think of nothing else; and yet, whether Bingley’s regard had
-really died away, or were suppressed by his friends’ interference;
-whether he had been aware of Jane’s attachment, or whether it had
-escaped his observation; whichever were the case, though her opinion of
-him must be materially affected by the difference, her sister’s
-situation remained the same, her peace equally wounded.
-
-A day or two passed before Jane had courage to speak of her feelings to
-Elizabeth; but at last, on Mrs. Bennet’s leaving them together, after a
-longer irritation than usual about Netherfield and its master, she could
-not help saying,--
-
-“O that my dear mother had more command over herself! she can have no
-idea of the pain she gives me by her continual reflections on him. But I
-will not repine. It cannot last long. He will be forgot, and we shall
-all be as we were before.”
-
-Elizabeth looked at her sister with incredulous solicitude, but said
-nothing.
-
-“You doubt me,” cried Jane, slightly colouring; “indeed, you have no
-reason. He may live in my memory as the most amiable man of my
-acquaintance but that is all. I have nothing either to hope or fear, and
-nothing to reproach him with. Thank God I have not _that_ pain. A little
-time, therefore--I shall certainly try to get the better----”
-
-With a stronger voice she soon added, “I have this comfort immediately,
-that it has not been more than an error of fancy on my side, and that it
-has done no harm to anyone but myself.”
-
-“My dear Jane,” exclaimed Elizabeth, “you are too good. Your sweetness
-and disinterestedness are really angelic; I do not know what to say to
-you. I feel as if I had never done you justice, or loved you as you
-deserve.”
-
-Miss Bennet eagerly disclaimed all extraordinary merit, and threw back
-the praise on her sister’s warm affection.
-
-“Nay,” said Elizabeth, “this is not fair. _You_ wish to think all the
-world respectable, and are hurt if I speak ill of anybody. _I_ only want
-to think _you_ perfect, and you set yourself against it. Do not be
-afraid of my running into any excess, of my encroaching on your
-privilege of universal good-will. You need not. There are few people
-whom I really love, and still fewer of whom I think well. The more I see
-of the world the more am I dissatisfied with it; and every day confirms
-my belief of the inconsistency of all human characters, and of the
-little dependence that can be placed on the appearance of either merit
-or sense. I have met with two instances lately: one I will not mention,
-the other is Charlotte’s marriage. It is unaccountable! in every view it
-is unaccountable!”
-
-“My dear Lizzy, do not give way to such feelings as these. They will
-ruin your happiness. You do not make allowance enough for difference of
-situation and temper. Consider Mr. Collins’s respectability, and
-Charlotte’s prudent, steady character. Remember that she is one of a
-large family; that as to fortune it is a most eligible match; and be
-ready to believe, for everybody’s sake, that she may feel something like
-regard and esteem for our cousin.”
-
-“To oblige you, I would try to believe almost anything, but no one else
-could be benefited by such a belief as this; for were I persuaded that
-Charlotte had any regard for him, I should only think worse of her
-understanding than I now do of her heart. My dear Jane, Mr. Collins is a
-conceited, pompous, narrow-minded, silly man: you know he is, as well as
-I do; and you must feel, as well as I do, that the woman who marries him
-cannot have a proper way of thinking. You shall not defend her, though
-it is Charlotte Lucas. You shall not, for the sake of one individual,
-change the meaning of principle and integrity, nor endeavour to persuade
-yourself or me, that selfishness is prudence, and insensibility of
-danger security for happiness.”
-
-“I must think your language too strong in speaking of both,” replied
-Jane; “and I hope you will be convinced of it, by seeing them happy
-together. But enough of this. You alluded to something else. You
-mentioned _two_ instances. I cannot misunderstand you, but I entreat
-you, dear Lizzy, not to pain me by thinking _that person_ to blame, and
-saying your opinion of him is sunk. We must not be so ready to fancy
-ourselves intentionally injured. We must not expect a lively young man
-to be always so guarded and circumspect. It is very often nothing but
-our own vanity that deceives us. Women fancy admiration means more than
-it does.”
-
-“And men take care that they should.”
-
-“If it is designedly done, they cannot be justified; but I have no idea
-of there being so much design in the world as some persons imagine.”
-
-“I am far from attributing any part of Mr. Bingley’s conduct to design,”
-said Elizabeth; “but, without scheming to do wrong, or to make others
-unhappy, there may be error and there may be misery. Thoughtlessness,
-want of attention to other people’s feelings, and want of resolution,
-will do the business.”
-
-“And do you impute it to either of those?”
-
-“Yes; to the last. But if I go on I shall displease you by saying what I
-think of persons you esteem. Stop me, whilst you can.”
-
-“You persist, then, in supposing his sisters influence him?”
-
-“Yes, in conjunction with his friend.”
-
-“I cannot believe it. Why should they try to influence him? They can
-only wish his happiness; and if he is attached to me no other woman can
-secure it.”
-
-“Your first position is false. They may wish many things besides his
-happiness: they may wish his increase of wealth and consequence; they
-may wish him to marry a girl who has all the importance of money, great
-connections, and pride.”
-
-“Beyond a doubt they do wish him to choose Miss Darcy,” replied Jane;
-“but this may be from better feelings than you are supposing. They have
-known her much longer than they have known me; no wonder if they love
-her better. But, whatever may be their own wishes, it is very unlikely
-they should have opposed their brother’s. What sister would think
-herself at liberty to do it, unless there were something very
-objectionable? If they believed him attached to me they would not try to
-part us; if he were so, they could not succeed. By supposing such an
-affection, you make everybody acting unnaturally and wrong, and me most
-unhappy. Do not distress me by the idea. I am not ashamed of having been
-mistaken--or, at least, it is slight, it is nothing in comparison of
-what I should feel in thinking ill of him or his sisters. Let me take it
-in the best light, in the light in which it may be understood.”
-
-Elizabeth could not oppose such a wish; and from this time Mr. Bingley’s
-name was scarcely ever mentioned between them.
-
-Mrs. Bennet still continued to wonder and repine at his returning no
-more; and though a day seldom passed in which Elizabeth did not account
-for it clearly, there seemed little chance of her ever considering it
-with less perplexity. Her daughter endeavoured to convince her of what
-she did not believe herself, that his attentions to Jane had been merely
-the effect of a common and transient liking, which ceased when he saw
-her no more; but though the probability of the statement was admitted at
-the time, she had the same story to repeat every day. Mrs. Bennet’s best
-comfort was, that Mr. Bingley must be down again in the summer.
-
-Mr. Bennet treated the matter differently. “So, Lizzy,” said he, one
-day, “your sister is crossed in love, I find. I congratulate her. Next
-to being married, a girl likes to be crossed in love a little now and
-then. It is something to think of, and gives her a sort of distinction
-among her companions. When is your turn to come? You will hardly bear to
-be long outdone by Jane. Now is your time. Here are officers enough at
-Meryton to disappoint all the young ladies in the country. Let Wickham
-be your man. He is a pleasant fellow, and would jilt you creditably.”
-
-“Thank you, sir, but a less agreeable man would satisfy me. We must not
-all expect Jane’s good fortune.”
-
-“True,” said Mr. Bennet; “but it is a comfort to think that, whatever of
-that kind may befall you, you have an affectionate mother who will
-always make the most of it.”
-
-Mr. Wickham’s society was of material service in dispelling the gloom
-which the late perverse occurrences had thrown on many of the Longbourn
-family. They saw him often, and to his other recommendations was now
-added that of general unreserve. The whole of what Elizabeth had already
-heard, his claims on Mr. Darcy, and all that he had suffered from him,
-was now openly acknowledged and publicly canvassed; and everybody was
-pleased to think how much they had always disliked Mr. Darcy before they
-had known anything of the matter.
-
-Miss Bennet was the only creature who could suppose there might be any
-extenuating circumstances in the case unknown to the society of
-Hertfordshire: her mild and steady candour always pleaded for
-allowances, and urged the possibility of mistakes; but by everybody else
-Mr. Darcy was condemned as the worst of men.
-
-
-
-
-[Illustration]
-
-
-
-
-CHAPTER XXV.
-
-
-[Illustration]
-
-After a week spent in professions of love and schemes of felicity, Mr.
-Collins was called from his amiable Charlotte by the arrival of
-Saturday. The pain of separation, however, might be alleviated on his
-side by preparations for the reception of his bride, as he had reason to
-hope, that shortly after his next return into Hertfordshire, the day
-would be fixed that was to make him the happiest of men. He took leave
-of his relations at Longbourn with as much solemnity as before; wished
-his fair cousins health and happiness again, and promised their father
-another letter of thanks.
-
-On the following Monday, Mrs. Bennet had the pleasure of receiving her
-brother and his wife, who came, as usual, to spend the Christmas at
-Longbourn. Mr. Gardiner was a sensible, gentlemanlike man, greatly
-superior to his sister, as well by nature as education. The Netherfield
-ladies would have had difficulty in believing that a man who lived by
-trade, and within view of his own warehouses, could have been so
-well-bred and agreeable. Mrs. Gardiner, who was several years younger
-than Mrs. Bennet and Mrs. Philips, was an amiable, intelligent, elegant
-woman, and a great favourite with her Longbourn nieces. Between the two
-eldest and herself especially, there subsisted a very particular regard.
-They had frequently been staying with her in town.
-
-The first part of Mrs. Gardiner’s business, on her arrival, was to
-distribute her presents and describe the newest fashions. When this was
-done, she had a less active part to play. It became her turn to listen.
-Mrs. Bennet had many grievances to relate, and much to complain of. They
-had all been very ill-used since she last saw her sister. Two of her
-girls had been on the point of marriage, and after all there was nothing
-in it.
-
-“I do not blame Jane,” she continued, “for Jane would have got Mr.
-Bingley if she could. But, Lizzy! Oh, sister! it is very hard to think
-that she might have been Mr. Collins’s wife by this time, had not it
-been for her own perverseness. He made her an offer in this very room,
-and she refused him. The consequence of it is, that Lady Lucas will have
-a daughter married before I have, and that Longbourn estate is just as
-much entailed as ever. The Lucases are very artful people, indeed,
-sister. They are all for what they can get. I am sorry to say it of
-them, but so it is. It makes me very nervous and poorly, to be thwarted
-so in my own family, and to have neighbours who think of themselves
-before anybody else. However, your coming just at this time is the
-greatest of comforts, and I am very glad to hear what you tell us of
-long sleeves.”
-
-Mrs. Gardiner, to whom the chief of this news had been given before, in
-the course of Jane and Elizabeth’s correspondence with her, made her
-sister a slight answer, and, in compassion to her nieces, turned the
-conversation.
-
-When alone with Elizabeth afterwards, she spoke more on the subject.
-“It seems likely to have been a desirable match for Jane,” said she. “I
-am sorry it went off. But these things happen so often! A young man,
-such as you describe Mr. Bingley, so easily falls in love with a pretty
-girl for a few weeks, and, when accident separates them, so easily
-forgets her, that these sort of inconstancies are very frequent.”
-
-[Illustration:
-
-     “Offended two or three young ladies”
-
-[_Copyright 1894 by George Allen._]]
-
-“An excellent consolation in its way,” said Elizabeth; “but it will not
-do for _us_. We do not suffer by accident. It does not often happen
-that the interference of friends will persuade a young man of
-independent fortune to think no more of a girl whom he was violently in
-love with only a few days before.”
-
-“But that expression of ‘violently in love’ is so hackneyed, so
-doubtful, so indefinite, that it gives me very little idea. It is as
-often applied to feelings which arise only from a half hour’s
-acquaintance, as to a real, strong attachment. Pray, how _violent was_
-Mr. Bingley’s love?”
-
-“I never saw a more promising inclination; he was growing quite
-inattentive to other people, and wholly engrossed by her. Every time
-they met, it was more decided and remarkable. At his own ball he
-offended two or three young ladies by not asking them to dance; and I
-spoke to him twice myself without receiving an answer. Could there be
-finer symptoms? Is not general incivility the very essence of love?”
-
-“Oh, yes! of that kind of love which I suppose him to have felt. Poor
-Jane! I am sorry for her, because, with her disposition, she may not get
-over it immediately. It had better have happened to _you_, Lizzy; you
-would have laughed yourself out of it sooner. But do you think she would
-be prevailed on to go back with us? Change of scene might be of
-service--and perhaps a little relief from home may be as useful as
-anything.”
-
-Elizabeth was exceedingly pleased with this proposal, and felt persuaded
-of her sister’s ready acquiescence.
-
-“I hope,” added Mrs. Gardiner, “that no consideration with regard to
-this young man will influence her. We live in so different a part of
-town, all our connections are so different, and, as you well know, we go
-out so little, that it is very improbable they should meet at all,
-unless he really comes to see her.”
-
-“And _that_ is quite impossible; for he is now in the custody of his
-friend, and Mr. Darcy would no more suffer him to call on Jane in such a
-part of London! My dear aunt, how could you think of it? Mr. Darcy may,
-perhaps, have _heard_ of such a place as Gracechurch Street, but he
-would hardly think a month’s ablution enough to cleanse him from its
-impurities, were he once to enter it; and, depend upon it, Mr. Bingley
-never stirs without him.”
-
-“So much the better. I hope they will not meet at all. But does not Jane
-correspond with his sister? _She_ will not be able to help calling.”
-
-“She will drop the acquaintance entirely.”
-
-But, in spite of the certainty in which Elizabeth affected to place this
-point, as well as the still more interesting one of Bingley’s being
-withheld from seeing Jane, she felt a solicitude on the subject which
-convinced her, on examination, that she did not consider it entirely
-hopeless. It was possible, and sometimes she thought it probable, that
-his affection might be re-animated, and the influence of his friends
-successfully combated by the more natural influence of Jane’s
-attractions.
-
-Miss Bennet accepted her aunt’s invitation with pleasure; and the
-Bingleys were no otherwise in her thoughts at the same time than as she
-hoped, by Caroline’s not living in the same house with her brother, she
-might occasionally spend a morning with her, without any danger of
-seeing him.
-
-The Gardiners stayed a week at Longbourn; and what with the Philipses,
-the Lucases, and the officers, there was not a day without its
-engagement. Mrs. Bennet had so carefully provided for the entertainment
-of her brother and sister, that they did not once sit down to a family
-dinner. When the engagement was for home, some of the officers always
-made part of it, of which officers Mr. Wickham was sure to be one; and
-on these occasions Mrs. Gardiner, rendered suspicious by Elizabeth’s
-warm commendation of him, narrowly observed them both. Without supposing
-them, from what she saw, to be very seriously in love, their preference
-of each other was plain enough to make her a little uneasy; and she
-resolved to speak to Elizabeth on the subject before she left
-Hertfordshire, and represent to her the imprudence of encouraging such
-an attachment.
-
-To Mrs. Gardiner, Wickham had one means of affording pleasure,
-unconnected with his general powers. About ten or a dozen years ago,
-before her marriage, she had spent a considerable time in that very part
-of Derbyshire to which he belonged. They had, therefore, many
-acquaintance in common; and, though Wickham had been little there since
-the death of Darcy’s father, five years before, it was yet in his power
-to give her fresher intelligence of her former friends than she had been
-in the way of procuring.
-
-Mrs. Gardiner had seen Pemberley, and known the late Mr. Darcy by
-character perfectly well. Here, consequently, was an inexhaustible
-subject of discourse. In comparing her recollection of Pemberley with
-the minute description which Wickham could give, and in bestowing her
-tribute of praise on the character of its late possessor, she was
-delighting both him and herself. On being made acquainted with the
-present Mr. Darcy’s treatment of him, she tried to remember something of
-that gentleman’s reputed disposition, when quite a lad, which might
-agree with it; and was confident, at last, that she recollected having
-heard Mr. Fitzwilliam Darcy formerly spoken of as a very proud,
-ill-natured boy.
-
-
-
-
-[Illustration:
-
-     “Will you come and see me?”
-]
-
-
-
-
-CHAPTER XXVI.
-
-
-[Illustration]
-
-Mrs. Gardiner’s caution to Elizabeth was punctually and kindly given on
-the first favourable opportunity of speaking to her alone: after
-honestly telling her what she thought, she thus went on:--
-
-“You are too sensible a girl, Lizzy, to fall in love merely because you
-are warned against it; and, therefore, I am not afraid of speaking
-openly. Seriously, I would have you be on your guard. Do not involve
-yourself, or endeavour to involve him, in an affection which the want of
-fortune would make so very imprudent. I have nothing to say against
-_him_: he is a most interesting young man; and if he had the fortune he
-ought to have, I should think you could not do better. But as it is--you
-must not let your fancy run away with you. You have sense, and we all
-expect you to use it. Your father would depend on _your_ resolution and
-good conduct, I am sure. You must not disappoint your father.”
-
-“My dear aunt, this is being serious indeed.”
-
-“Yes, and I hope to engage you to be serious likewise.”
-
-“Well, then, you need not be under any alarm. I will take care of
-myself, and of Mr. Wickham too. He shall not be in love with me, if I
-can prevent it.”
-
-“Elizabeth, you are not serious now.”
-
-“I beg your pardon. I will try again. At present I am not in love with
-Mr. Wickham; no, I certainly am not. But he is, beyond all comparison,
-the most agreeable man I ever saw--and if he becomes really attached to
-me--I believe it will be better that he should not. I see the imprudence
-of it. Oh, _that_ abominable Mr. Darcy! My father’s opinion of me does
-me the greatest honour; and I should be miserable to forfeit it. My
-father, however, is partial to Mr. Wickham. In short, my dear aunt, I
-should be very sorry to be the means of making any of you unhappy; but
-since we see, every day, that where there is affection young people are
-seldom withheld, by immediate want of fortune, from entering into
-engagements with each other, how can I promise to be wiser than so many
-of my fellow-creatures, if I am tempted, or how am I even to know that
-it would be wiser to resist? All that I can promise you, therefore, is
-not to be in a hurry. I will not be in a hurry to believe myself his
-first object. When I am in company with him, I will not be wishing. In
-short, I will do my best.”
-
-“Perhaps it will be as well if you discourage his coming here so very
-often. At least you should not _remind_ your mother of inviting him.”
-
-“As I did the other day,” said Elizabeth, with a conscious smile; “very
-true, it will be wise in me to refrain from _that_. But do not imagine
-that he is always here so often. It is on your account that he has been
-so frequently invited this week. You know my mother’s ideas as to the
-necessity of constant company for her friends. But really, and upon my
-honour, I will try to do what I think to be wisest; and now I hope you
-are satisfied.”
-
-Her aunt assured her that she was; and Elizabeth, having thanked her for
-the kindness of her hints, they parted,--a wonderful instance of advice
-being given on such a point without being resented.
-
-Mr. Collins returned into Hertfordshire soon after it had been quitted
-by the Gardiners and Jane; but, as he took up his abode with the
-Lucases, his arrival was no great inconvenience to Mrs. Bennet. His
-marriage was now fast approaching; and she was at length so far resigned
-as to think it inevitable, and even repeatedly to say, in an ill-natured
-tone, that she “_wished_ they might be happy.” Thursday was to be the
-wedding-day, and on Wednesday Miss Lucas paid her farewell visit; and
-when she rose to take leave, Elizabeth, ashamed of her mother’s
-ungracious and reluctant good wishes, and sincerely affected herself,
-accompanied her out of the room. As they went down stairs together,
-Charlotte said,--
-
-“I shall depend on hearing from you very often, Eliza.”
-
-“_That_ you certainly shall.”
-
-“And I have another favour to ask. Will you come and see me?”
-
-“We shall often meet, I hope, in Hertfordshire.”
-
-“I am not likely to leave Kent for some time. Promise me, therefore, to
-come to Hunsford.”
-
-Elizabeth could not refuse, though she foresaw little pleasure in the
-visit.
-
-“My father and Maria are to come to me in March,” added Charlotte, “and
-I hope you will consent to be of the party. Indeed, Eliza, you will be
-as welcome to me as either of them.”
-
-The wedding took place: the bride and bridegroom set off for Kent from
-the church door, and everybody had as much to say or to hear on the
-subject as usual. Elizabeth soon heard from her friend, and their
-correspondence was as regular and frequent as it ever had been: that it
-should be equally unreserved was impossible. Elizabeth could never
-address her without feeling that all the comfort of intimacy was over;
-and, though determined not to slacken as a correspondent, it was for the
-sake of what had been rather than what was. Charlotte’s first letters
-were received with a good deal of eagerness: there could not but be
-curiosity to know how she would speak of her new home, how she would
-like Lady Catherine, and how happy she would dare pronounce herself to
-be; though, when the letters were read, Elizabeth felt that Charlotte
-expressed herself on every point exactly as she might have foreseen. She
-wrote cheerfully, seemed surrounded with comforts, and mentioned nothing
-which she could not praise. The house, furniture, neighbourhood, and
-roads, were all to her taste, and Lady Catherine’s behaviour was most
-friendly and obliging. It was Mr. Collins’s picture of Hunsford and
-Rosings rationally softened; and Elizabeth perceived that she must wait
-for her own visit there, to know the rest.
-
-Jane had already written a few lines to her sister, to announce their
-safe arrival in London; and when she wrote again, Elizabeth hoped it
-would be in her power to say something of the Bingleys.
-
-Her impatience for this second letter was as well rewarded as impatience
-generally is. Jane had been a week in town, without either seeing or
-hearing from Caroline. She accounted for it, however, by supposing that
-her last letter to her friend from Longbourn had by some accident been
-lost.
-
-“My aunt,” she continued, “is going to-morrow into that part of the
-town, and I shall take the opportunity of calling in Grosvenor Street.”
-
-She wrote again when the visit was paid, and she had seen Miss Bingley.
-“I did not think Caroline in spirits,” were her words, “but she was very
-glad to see me, and reproached me for giving her no notice of my coming
-to London. I was right, therefore; my last letter had never reached her.
-I inquired after their brother, of course. He was well, but so much
-engaged with Mr. Darcy that they scarcely ever saw him. I found that
-Miss Darcy was expected to dinner: I wish I could see her. My visit was
-not long, as Caroline and Mrs. Hurst were going out. I dare say I shall
-soon see them here.”
-
-Elizabeth shook her head over this letter. It convinced her that
-accident only could discover to Mr. Bingley her sister’s being in town.
-
-Four weeks passed away, and Jane saw nothing of him. She endeavoured to
-persuade herself that she did not regret it; but she could no longer be
-blind to Miss Bingley’s inattention. After waiting at home every morning
-for a fortnight, and inventing every evening a fresh excuse for her, the
-visitor did at last appear; but the shortness of her stay, and, yet
-more, the alteration of her manner, would allow Jane to deceive herself
-no longer. The letter which she wrote on this occasion to her sister
-will prove what she felt:--
-
-     “My dearest Lizzy will, I am sure, be incapable of triumphing in
-     her better judgment, at my expense, when I confess myself to have
-     been entirely deceived in Miss Bingley’s regard for me. But, my
-     dear sister, though the event has proved you right, do not think me
-     obstinate if I still assert that, considering what her behaviour
-     was, my confidence was as natural as your suspicion. I do not at
-     all comprehend her reason for wishing to be intimate with me; but,
-     if the same circumstances were to happen again, I am sure I should
-     be deceived again. Caroline did not return my visit till yesterday;
-     and not a note, not a line, did I receive in the meantime. When she
-     did come, it was very evident that she had no pleasure in it; she
-     made a slight, formal apology for not calling before, said not a
-     word of wishing to see me again, and was, in every respect, so
-     altered a creature, that when she went away I was perfectly
-     resolved to continue the acquaintance no longer. I pity, though I
-     cannot help blaming, her. She was very wrong in singling me out as
-     she did; I can safely say, that every advance to intimacy began on
-     her side. But I pity her, because she must feel that she has been
-     acting wrong, and because I am very sure that anxiety for her
-     brother is the cause of it. I need not explain myself farther; and
-     though _we_ know this anxiety to be quite needless, yet if she
-     feels it, it will easily account for her behaviour to me; and so
-     deservedly dear as he is to his sister, whatever anxiety she may
-     feel on his behalf is natural and amiable. I cannot but wonder,
-     however, at her having any such fears now, because if he had at all
-     cared about me, we must have met long, long ago. He knows of my
-     being in town, I am certain, from something she said herself; and
-     yet it would seem, by her manner of talking, as if she wanted to
-     persuade herself that he is really partial to Miss Darcy. I cannot
-     understand it. If I were not afraid of judging harshly, I should be
-     almost tempted to say, that there is a strong appearance of
-     duplicity in all this. I will endeavour to banish every painful
-     thought, and think only of what will make me happy, your affection,
-     and the invariable kindness of my dear uncle and aunt. Let me hear
-     from you very soon. Miss Bingley said something of his never
-     returning to Netherfield again, of giving up the house, but not
-     with any certainty. We had better not mention it. I am extremely
-     glad that you have such pleasant accounts from our friends at
-     Hunsford. Pray go to see them, with Sir William and Maria. I am
-     sure you will be very comfortable there.
-
-“Yours, etc.”
-
-This letter gave Elizabeth some pain; but her spirits returned, as she
-considered that Jane would no longer be duped, by the sister at least.
-All expectation from the brother was now absolutely over. She would not
-even wish for any renewal of his attentions. His character sunk on every
-review of it; and, as a punishment for him, as well as a possible
-advantage to Jane, she seriously hoped he might really soon marry Mr.
-Darcy’s sister, as, by Wickham’s account, she would make him abundantly
-regret what he had thrown away.
-
-Mrs. Gardiner about this time reminded Elizabeth of her promise
-concerning that gentleman, and required information; and Elizabeth had
-such to send as might rather give contentment to her aunt than to
-herself. His apparent partiality had subsided, his attentions were over,
-he was the admirer of some one else. Elizabeth was watchful enough to
-see it all, but she could see it and write of it without material pain.
-Her heart had been but slightly touched, and her vanity was satisfied
-with believing that _she_ would have been his only choice, had fortune
-permitted it. The sudden acquisition of ten thousand pounds was the most
-remarkable charm of the young lady to whom he was now rendering himself
-agreeable; but Elizabeth, less clear-sighted perhaps in this case than
-in Charlotte’s, did not quarrel with him for his wish of independence.
-Nothing, on the contrary, could be more natural; and, while able to
-suppose that it cost him a few struggles to relinquish her, she was
-ready to allow it a wise and desirable measure for both, and could very
-sincerely wish him happy.
-
-All this was acknowledged to Mrs. Gardiner; and, after relating the
-circumstances, she thus went on:--“I am now convinced, my dear aunt,
-that I have never been much in love; for had I really experienced that
-pure and elevating passion, I should at present detest his very name,
-and wish him all manner of evil. But my feelings are not only cordial
-towards _him_, they are even impartial towards Miss King. I cannot find
-out that I hate her at all, or that I am in the least unwilling to think
-her a very good sort of girl. There can be no love in all this. My
-watchfulness has been effectual; and though I should certainly be a more
-interesting object to all my acquaintance, were I distractedly in love
-with him, I cannot say that I regret my comparative insignificance.
-Importance may sometimes be purchased too dearly. Kitty and Lydia take
-his defection much more to heart than I do. They are young in the ways
-of the world, and not yet open to the mortifying conviction that
-handsome young men must have something to live on as well as the
-plain.”
-
-
-
-
-[Illustration:
-
-     “On the Stairs”
-]
-
-
-
-
-CHAPTER XXVII.
-
-
-[Illustration]
-
-With no greater events than these in the Longbourn family, and otherwise
-diversified by little beyond the walks to Meryton, sometimes dirty and
-sometimes cold, did January and February pass away. March was to take
-Elizabeth to Hunsford. She had not at first thought very seriously of
-going thither; but Charlotte, she soon found, was depending on the
-plan, and she gradually learned to consider it herself with greater
-pleasure as well as greater certainty. Absence had increased her desire
-of seeing Charlotte again, and weakened her disgust of Mr. Collins.
-There was novelty in the scheme; and as, with such a mother and such
-uncompanionable sisters, home could not be faultless, a little change
-was not unwelcome for its own sake. The journey would, moreover, give
-her a peep at Jane; and, in short, as the time drew near, she would have
-been very sorry for any delay. Everything, however, went on smoothly,
-and was finally settled according to Charlotte’s first sketch. She was
-to accompany Sir William and his second daughter. The improvement of
-spending a night in London was added in time, and the plan became as
-perfect as plan could be.
-
-The only pain was in leaving her father, who would certainly miss her,
-and who, when it came to the point, so little liked her going, that he
-told her to write to him, and almost promised to answer her letter.
-
-The farewell between herself and Mr. Wickham was perfectly friendly; on
-his side even more. His present pursuit could not make him forget that
-Elizabeth had been the first to excite and to deserve his attention, the
-first to listen and to pity, the first to be admired; and in his manner
-of bidding her adieu, wishing her every enjoyment, reminding her of what
-she was to expect in Lady Catherine de Bourgh, and trusting their
-opinion of her--their opinion of everybody--would always coincide, there
-was a solicitude, an interest, which she felt must ever attach her to
-him with a most sincere regard; and she parted from him convinced, that,
-whether married or single, he must always be her model of the amiable
-and pleasing.
-
-Her fellow-travellers the next day were not of a kind to make her think
-him less agreeable. Sir William Lucas, and his daughter Maria, a
-good-humoured girl, but as empty-headed as himself, had nothing to say
-that could be worth hearing, and were listened to with about as much
-delight as the rattle of the chaise. Elizabeth loved absurdities, but
-she had known Sir William’s too long. He could tell her nothing new of
-the wonders of his presentation and knighthood; and his civilities were
-worn out, like his information.
-
-It was a journey of only twenty-four miles, and they began it so early
-as to be in Gracechurch Street by noon. As they drove to Mr. Gardiner’s
-door, Jane was at a drawing-room window watching their arrival: when
-they entered the passage, she was there to welcome them, and Elizabeth,
-looking earnestly in her face, was pleased to see it healthful and
-lovely as ever. On the stairs were a troop of little boys and girls,
-whose eagerness for their cousin’s appearance would not allow them to
-wait in the drawing-room, and whose shyness, as they had not seen her
-for a twelvemonth, prevented their coming lower. All was joy and
-kindness. The day passed most pleasantly away; the morning in bustle and
-shopping, and the evening at one of the theatres.
-
-Elizabeth then contrived to sit by her aunt. Their first subject was her
-sister; and she was more grieved than astonished to hear, in reply to
-her minute inquiries, that though Jane always struggled to support her
-spirits, there were periods of dejection. It was reasonable, however, to
-hope that they would not continue long. Mrs. Gardiner gave her the
-particulars also of Miss Bingley’s visit in Gracechurch Street, and
-repeated conversations occurring at different times between Jane and
-herself, which proved that the former had, from her heart, given up the
-acquaintance.
-
-Mrs. Gardiner then rallied her niece on Wickham’s desertion, and
-complimented her on bearing it so well.
-
-“But, my dear Elizabeth,” she added, “what sort of girl is Miss King? I
-should be sorry to think our friend mercenary.”
-
-“Pray, my dear aunt, what is the difference in matrimonial affairs,
-between the mercenary and the prudent motive? Where does discretion end,
-and avarice begin? Last Christmas you were afraid of his marrying me,
-because it would be imprudent; and now, because he is trying to get a
-girl with only ten thousand pounds, you want to find out that he is
-mercenary.”
-
-“If you will only tell me what sort of girl Miss King is, I shall know
-what to think.”
-
-“She is a very good kind of girl, I believe. I know no harm of her.”
-
-“But he paid her not the smallest attention till her grandfather’s death
-made her mistress of this fortune?”
-
-“No--why should he? If it were not allowable for him to gain _my_
-affections, because I had no money, what occasion could there be for
-making love to a girl whom he did not care about, and who was equally
-poor?”
-
-“But there seems indelicacy in directing his attentions towards her so
-soon after this event.”
-
-“A man in distressed circumstances has not time for all those elegant
-decorums which other people may observe. If _she_ does not object to it,
-why should _we_?”
-
-“_Her_ not objecting does not justify _him_. It only shows her being
-deficient in something herself--sense or feeling.”
-
-“Well,” cried Elizabeth, “have it as you choose. _He_ shall be
-mercenary, and _she_ shall be foolish.”
-
-“No, Lizzy, that is what I do _not_ choose. I should be sorry, you know,
-to think ill of a young man who has lived so long in Derbyshire.”
-
-“Oh, if that is all, I have a very poor opinion of young men who live in
-Derbyshire; and their intimate friends who live in Hertfordshire are not
-much better. I am sick of them all. Thank heaven! I am going to-morrow
-where I shall find a man who has not one agreeable quality, who has
-neither manners nor sense to recommend him. Stupid men are the only ones
-worth knowing, after all.”
-
-“Take care, Lizzy; that speech savours strongly of disappointment.”
-
-Before they were separated by the conclusion of the play, she had the
-unexpected happiness of an invitation to accompany her uncle and aunt in
-a tour of pleasure which they proposed taking in the summer.
-
-“We have not quite determined how far it shall carry us,” said Mrs.
-Gardiner; “but perhaps, to the Lakes.”
-
-No scheme could have been more agreeable to Elizabeth, and her
-acceptance of the invitation was most ready and grateful. “My dear, dear
-aunt,” she rapturously cried, “what delight! what felicity! You give me
-fresh life and vigour. Adieu to disappointment and spleen. What are men
-to rocks and mountains? Oh, what hours of transport we shall spend! And
-when we _do_ return, it shall not be like other travellers, without
-being able to give one accurate idea of anything. We _will_ know where
-we have gone--we _will_ recollect what we have seen. Lakes, mountains,
-and rivers, shall not be jumbled together in our imaginations; nor, when
-we attempt to describe any particular scene, will we begin quarrelling
-about its relative situation. Let _our_ first effusions be less
-insupportable than those of the generality of travellers.”
-
-
-
-
-[Illustration:
-
-     “At the door”
-]
-
-
-
-
-CHAPTER XXVIII.
-
-
-[Illustration]
-
-Every object in the next day’s journey was new and interesting to
-Elizabeth; and her spirits were in a state of enjoyment; for she had
-seen her sister looking so well as to banish all fear for her health,
-and the prospect of her northern tour was a constant source of delight.
-
-When they left the high road for the lane to Hunsford, every eye was in
-search of the Parsonage, and every turning expected to bring it in view.
-The paling of Rosings park was their boundary on one side. Elizabeth
-smiled at the recollection of all that she had heard of its inhabitants.
-
-At length the Parsonage was discernible. The garden sloping to the
-road, the house standing in it, the green pales and the laurel hedge,
-everything declared they were arriving. Mr. Collins and Charlotte
-appeared at the door, and the carriage stopped at the small gate, which
-led by a short gravel walk to the house, amidst the nods and smiles of
-the whole party. In a moment they were all out of the chaise, rejoicing
-at the sight of each other. Mrs. Collins welcomed her friend with the
-liveliest pleasure, and Elizabeth was more and more satisfied with
-coming, when she found herself so affectionately received. She saw
-instantly that her cousin’s manners were not altered by his marriage:
-his formal civility was just what it had been; and he detained her some
-minutes at the gate to hear and satisfy his inquiries after all her
-family. They were then, with no other delay than his pointing out the
-neatness of the entrance, taken into the house; and as soon as they were
-in the parlour, he welcomed them a second time, with ostentatious
-formality, to his humble abode, and punctually repeated all his wife’s
-offers of refreshment.
-
-Elizabeth was prepared to see him in his glory; and she could not help
-fancying that in displaying the good proportion of the room, its aspect,
-and its furniture, he addressed himself particularly to her, as if
-wishing to make her feel what she had lost in refusing him. But though
-everything seemed neat and comfortable, she was not able to gratify him
-by any sigh of repentance; and rather looked with wonder at her friend,
-that she could have so cheerful an air with such a companion. When Mr.
-Collins said anything of which his wife might reasonably be ashamed,
-which certainly was not seldom, she involuntarily turned her eye on
-Charlotte. Once or twice she could discern a faint blush; but in general
-Charlotte wisely did not hear. After sitting long enough to admire
-every article of furniture in the room, from the sideboard to the
-fender, to give an account of their journey, and of all that had
-happened in London, Mr. Collins invited them to take a stroll in the
-garden, which was large and well laid out, and to the cultivation of
-which he attended himself. To work in his garden was one of his most
-respectable pleasures; and Elizabeth admired the command of countenance
-with which Charlotte talked of the healthfulness of the exercise, and
-owned she encouraged it as much as possible. Here, leading the way
-through every walk and cross walk, and scarcely allowing them an
-interval to utter the praises he asked for, every view was pointed out
-with a minuteness which left beauty entirely behind. He could number the
-fields in every direction, and could tell how many trees there were in
-the most distant clump. But of all the views which his garden, or which
-the country or the kingdom could boast, none were to be compared with
-the prospect of Rosings, afforded by an opening in the trees that
-bordered the park nearly opposite the front of his house. It was a
-handsome modern building, well situated on rising ground.
-
-From his garden, Mr. Collins would have led them round his two meadows;
-but the ladies, not having shoes to encounter the remains of a white
-frost, turned back; and while Sir William accompanied him, Charlotte
-took her sister and friend over the house, extremely well pleased,
-probably, to have the opportunity of showing it without her husband’s
-help. It was rather small, but well built and convenient; and everything
-was fitted up and arranged with a neatness and consistency, of which
-Elizabeth gave Charlotte all the credit. When Mr. Collins could be
-forgotten, there was really a great air of comfort throughout, and by
-Charlotte’s evident enjoyment of it, Elizabeth supposed he must be often
-forgotten.
-
-She had already learnt that Lady Catherine was still in the country. It
-was spoken of again while they were at dinner, when Mr. Collins joining
-in, observed,--
-
-“Yes, Miss Elizabeth, you will have the honour of seeing Lady Catherine
-de Bourgh on the ensuing Sunday at church, and I need not say you will
-be delighted with her. She is all affability and condescension, and I
-doubt not but you will be honoured with some portion of her notice when
-service is over. I have scarcely any hesitation in saying that she will
-include you and my sister Maria in every invitation with which she
-honours us during your stay here. Her behaviour to my dear Charlotte is
-charming. We dine at Rosings twice every week, and are never allowed to
-walk home. Her Ladyship’s carriage is regularly ordered for us. I
-_should_ say, one of her Ladyship’s carriages, for she has several.”
-
-“Lady Catherine is a very respectable, sensible woman, indeed,” added
-Charlotte, “and a most attentive neighbour.”
-
-“Very true, my dear, that is exactly what I say. She is the sort of
-woman whom one cannot regard with too much deference.”
-
-The evening was spent chiefly in talking over Hertfordshire news, and
-telling again what had been already written; and when it closed,
-Elizabeth, in the solitude of her chamber, had to meditate upon
-Charlotte’s degree of contentment, to understand her address in guiding,
-and composure in bearing with, her husband, and to acknowledge that it
-was all done very well. She had also to anticipate how her visit would
-pass, the quiet tenour of their usual employments, the vexatious
-interruptions of Mr. Collins, and the gaieties of their intercourse
-with Rosings. A lively imagination soon settled it all.
-
-About the middle of the next day, as she was in her room getting ready
-for a walk, a sudden noise below seemed to speak the whole house in
-confusion; and, after listening a moment, she heard somebody running
-upstairs in a violent hurry, and calling loudly after her. She opened
-the door, and met Maria in the landing-place, who, breathless with
-agitation, cried out,--
-
-[Illustration:
-
-     “In Conversation with the ladies”
-
-[Copyright 1894 by George Allen.]]
-
-“Oh, my dear Eliza! pray make haste and come into the dining-room, for
-there is such a sight to be seen! I will not tell you what it is. Make
-haste, and come down this moment.”
-
-Elizabeth asked questions in vain; Maria would tell her nothing more;
-and down they ran into the dining-room which fronted the lane, in quest
-of this wonder; it was two ladies, stopping in a low phaeton at the
-garden gate.
-
-“And is this all?” cried Elizabeth. “I expected at least that the pigs
-were got into the garden, and here is nothing but Lady Catherine and her
-daughter!”
-
-“La! my dear,” said Maria, quite shocked at the mistake, “it is not Lady
-Catherine. The old lady is Mrs. Jenkinson, who lives with them. The
-other is Miss De Bourgh. Only look at her. She is quite a little
-creature. Who would have thought she could be so thin and small!”
-
-“She is abominably rude to keep Charlotte out of doors in all this wind.
-Why does she not come in?”
-
-“Oh, Charlotte says she hardly ever does. It is the greatest of favours
-when Miss De Bourgh comes in.”
-
-“I like her appearance,” said Elizabeth, struck with other ideas. “She
-looks sickly and cross. Yes, she will do for him very well. She will
-make him a very proper wife.”
-
-Mr. Collins and Charlotte were both standing at the gate in conversation
-with the ladies; and Sir William, to Elizabeth’s high diversion, was
-stationed in the doorway, in earnest contemplation of the greatness
-before him, and constantly bowing whenever Miss De Bourgh looked that
-way.
-
-At length there was nothing more to be said; the ladies drove on, and
-the others returned into the house. Mr. Collins no sooner saw the two
-girls than he began to congratulate them on their good fortune, which
-Charlotte explained by letting them know that the whole party was asked
-to dine at Rosings the next day.
-
-
-
-
-[Illustration:
-
-     ‘Lady Catherine, said she, you have given me a treasure.’
-
-[_Copyright 1894 by George Allen._]]
-
-
-
-
-CHAPTER XXIX.
-
-
-[Illustration]
-
-Mr. Collins’s triumph, in consequence of this invitation, was complete.
-The power of displaying the grandeur of his patroness to his wondering
-visitors, and of letting them see her civility towards himself and his
-wife, was exactly what he had wished for; and that an opportunity of
-doing it should be given so soon was such an instance of Lady
-Catherine’s condescension as he knew not how to admire enough.
-
-“I confess,” said he, “that I should not have been at all surprised by
-her Ladyship’s asking us on Sunday to drink tea and spend the evening
-at Rosings. I rather expected, from my knowledge of her affability, that
-it would happen. But who could have foreseen such an attention as this?
-Who could have imagined that we should receive an invitation to dine
-there (an invitation, moreover, including the whole party) so
-immediately after your arrival?”
-
-“I am the less surprised at what has happened,” replied Sir William,
-“from that knowledge of what the manners of the great really are, which
-my situation in life has allowed me to acquire. About the court, such
-instances of elegant breeding are not uncommon.”
-
-Scarcely anything was talked of the whole day or next morning but their
-visit to Rosings. Mr. Collins was carefully instructing them in what
-they were to expect, that the sight of such rooms, so many servants, and
-so splendid a dinner, might not wholly overpower them.
-
-When the ladies were separating for the toilette, he said to
-Elizabeth,--
-
-“Do not make yourself uneasy, my dear cousin, about your apparel. Lady
-Catherine is far from requiring that elegance of dress in us which
-becomes herself and daughter. I would advise you merely to put on
-whatever of your clothes is superior to the rest--there is no occasion
-for anything more. Lady Catherine will not think the worse of you for
-being simply dressed. She likes to have the distinction of rank
-preserved.”
-
-While they were dressing, he came two or three times to their different
-doors, to recommend their being quick, as Lady Catherine very much
-objected to be kept waiting for her dinner. Such formidable accounts of
-her Ladyship, and her manner of living, quite frightened Maria Lucas,
-who had been little used to company; and she looked forward to her
-introduction at Rosings with as much apprehension as her father had done
-to his presentation at St. James’s.
-
-As the weather was fine, they had a pleasant walk of about half a mile
-across the park. Every park has its beauty and its prospects; and
-Elizabeth saw much to be pleased with, though she could not be in such
-raptures as Mr. Collins expected the scene to inspire, and was but
-slightly affected by his enumeration of the windows in front of the
-house, and his relation of what the glazing altogether had originally
-cost Sir Lewis de Bourgh.
-
-When they ascended the steps to the hall, Maria’s alarm was every moment
-increasing, and even Sir William did not look perfectly calm.
-Elizabeth’s courage did not fail her. She had heard nothing of Lady
-Catherine that spoke her awful from any extraordinary talents or
-miraculous virtue, and the mere stateliness of money and rank she
-thought she could witness without trepidation.
-
-From the entrance hall, of which Mr. Collins pointed out, with a
-rapturous air, the fine proportion and finished ornaments, they followed
-the servants through an antechamber to the room where Lady Catherine,
-her daughter, and Mrs. Jenkinson were sitting. Her Ladyship, with great
-condescension, arose to receive them; and as Mrs. Collins had settled it
-with her husband that the office of introduction should be hers, it was
-performed in a proper manner, without any of those apologies and thanks
-which he would have thought necessary.
-
-In spite of having been at St. James’s, Sir William was so completely
-awed by the grandeur surrounding him, that he had but just courage
-enough to make a very low bow, and take his seat without saying a word;
-and his daughter, frightened almost out of her senses, sat on the edge
-of her chair, not knowing which way to look. Elizabeth found herself
-quite equal to the scene, and could observe the three ladies before her
-composedly. Lady Catherine was a tall, large woman, with strongly-marked
-features, which might once have been handsome. Her air was not
-conciliating, nor was her manner of receiving them such as to make her
-visitors forget their inferior rank. She was not rendered formidable by
-silence: but whatever she said was spoken in so authoritative a tone as
-marked her self-importance, and brought Mr. Wickham immediately to
-Elizabeth’s mind; and, from the observation of the day altogether, she
-believed Lady Catherine to be exactly what he had represented.
-
-When, after examining the mother, in whose countenance and deportment
-she soon found some resemblance of Mr. Darcy, she turned her eyes on the
-daughter, she could almost have joined in Maria’s astonishment at her
-being so thin and so small. There was neither in figure nor face any
-likeness between the ladies. Miss de Bourgh was pale and sickly: her
-features, though not plain, were insignificant; and she spoke very
-little, except in a low voice, to Mrs. Jenkinson, in whose appearance
-there was nothing remarkable, and who was entirely engaged in listening
-to what she said, and placing a screen in the proper direction before
-her eyes.
-
-After sitting a few minutes, they were all sent to one of the windows to
-admire the view, Mr. Collins attending them to point out its beauties,
-and Lady Catherine kindly informing them that it was much better worth
-looking at in the summer.
-
-The dinner was exceedingly handsome, and there were all the servants,
-and all the articles of plate which Mr. Collins had promised; and, as he
-had likewise foretold, he took his seat at the bottom of the table, by
-her Ladyship’s desire, and looked as if he felt that life could furnish
-nothing greater. He carved and ate and praised with delighted alacrity;
-and every dish was commended first by him, and then by Sir William, who
-was now enough recovered to echo whatever his son-in-law said, in a
-manner which Elizabeth wondered Lady Catherine could bear. But Lady
-Catherine seemed gratified by their excessive admiration, and gave most
-gracious smiles, especially when any dish on the table proved a novelty
-to them. The party did not supply much conversation. Elizabeth was ready
-to speak whenever there was an opening, but she was seated between
-Charlotte and Miss de Bourgh--the former of whom was engaged in
-listening to Lady Catherine, and the latter said not a word to her all
-the dinnertime. Mrs. Jenkinson was chiefly employed in watching how
-little Miss de Bourgh ate, pressing her to try some other dish and
-fearing she was indisposed. Maria thought speaking out of the question,
-and the gentlemen did nothing but eat and admire.
-
-When the ladies returned to the drawing-room, there was little to be
-done but to hear Lady Catherine talk, which she did without any
-intermission till coffee came in, delivering her opinion on every
-subject in so decisive a manner as proved that she was not used to have
-her judgment controverted. She inquired into Charlotte’s domestic
-concerns familiarly and minutely, and gave her a great deal of advice as
-to the management of them all; told her how everything ought to be
-regulated in so small a family as hers, and instructed her as to the
-care of her cows and her poultry. Elizabeth found that nothing was
-beneath this great lady’s attention which could furnish her with an
-occasion for dictating to others. In the intervals of her discourse with
-Mrs. Collins, she addressed a variety of questions to Maria and
-Elizabeth, but especially to the latter, of whose connections she knew
-the least, and who, she observed to Mrs. Collins, was a very genteel,
-pretty kind of girl. She asked her at different times how many sisters
-she had, whether they were older or younger than herself, whether any of
-them were likely to be married, whether they were handsome, where they
-had been educated, what carriage her father kept, and what had been her
-mother’s maiden name? Elizabeth felt all the impertinence of her
-questions, but answered them very composedly. Lady Catherine then
-observed,--
-
-“Your father’s estate is entailed on Mr. Collins, I think? For your
-sake,” turning to Charlotte, “I am glad of it; but otherwise I see no
-occasion for entailing estates from the female line. It was not thought
-necessary in Sir Lewis de Bourgh’s family. Do you play and sing, Miss
-Bennet?”
-
-“A little.”
-
-“Oh then--some time or other we shall be happy to hear you. Our
-instrument is a capital one, probably superior to ---- you shall try it
-some day. Do your sisters play and sing?”
-
-“One of them does.”
-
-“Why did not you all learn? You ought all to have learned. The Miss
-Webbs all play, and their father has not so good an income as yours. Do
-you draw?”
-
-“No, not at all.”
-
-“What, none of you?”
-
-“Not one.”
-
-“That is very strange. But I suppose you had no opportunity. Your mother
-should have taken you to town every spring for the benefit of masters.”
-
-“My mother would have no objection, but my father hates London.”
-
-“Has your governess left you?”
-
-“We never had any governess.”
-
-“No governess! How was that possible? Five daughters brought up at home
-without a governess! I never heard of such a thing. Your mother must
-have been quite a slave to your education.”
-
-Elizabeth could hardly help smiling, as she assured her that had not
-been the case.
-
-“Then who taught you? who attended to you? Without a governess, you must
-have been neglected.”
-
-“Compared with some families, I believe we were; but such of us as
-wished to learn never wanted the means. We were always encouraged to
-read, and had all the masters that were necessary. Those who chose to be
-idle certainly might.”
-
-“Ay, no doubt: but that is what a governess will prevent; and if I had
-known your mother, I should have advised her most strenuously to engage
-one. I always say that nothing is to be done in education without steady
-and regular instruction, and nobody but a governess can give it. It is
-wonderful how many families I have been the means of supplying in that
-way. I am always glad to get a young person well placed out. Four nieces
-of Mrs. Jenkinson are most delightfully situated through my means; and
-it was but the other day that I recommended another young person, who
-was merely accidentally mentioned to me, and the family are quite
-delighted with her. Mrs. Collins, did I tell you of Lady Metcalfe’s
-calling yesterday to thank me? She finds Miss Pope a treasure. ‘Lady
-Catherine,’ said she, ‘you have given me a treasure.’ Are any of your
-younger sisters out, Miss Bennet?”
-
-“Yes, ma’am, all.”
-
-“All! What, all five out at once? Very odd! And you only the second. The
-younger ones out before the elder are married! Your younger sisters must
-be very young?”
-
-“Yes, my youngest is not sixteen. Perhaps _she_ is full young to be much
-in company. But really, ma’am, I think it would be very hard upon
-younger sisters that they should not have their share of society and
-amusement, because the elder may not have the means or inclination to
-marry early. The last born has as good a right to the pleasures of youth
-as the first. And to be kept back on _such_ a motive! I think it would
-not be very likely to promote sisterly affection or delicacy of mind.”
-
-“Upon my word,” said her Ladyship, “you give your opinion very decidedly
-for so young a person. Pray, what is your age?”
-
-“With three younger sisters grown up,” replied Elizabeth, smiling, “your
-Ladyship can hardly expect me to own it.”
-
-Lady Catherine seemed quite astonished at not receiving a direct answer;
-and Elizabeth suspected herself to be the first creature who had ever
-dared to trifle with so much dignified impertinence.
-
-“You cannot be more than twenty, I am sure,--therefore you need not
-conceal your age.”
-
-“I am not one-and-twenty.”
-
-When the gentlemen had joined them, and tea was over, the card tables
-were placed. Lady Catherine, Sir William, and Mr. and Mrs. Collins sat
-down to quadrille; and as Miss De Bourgh chose to play at cassino, the
-two girls had the honour of assisting Mrs. Jenkinson to make up her
-party. Their table was superlatively stupid. Scarcely a syllable was
-uttered that did not relate to the game, except when Mrs. Jenkinson
-expressed her fears of Miss De Bourgh’s being too hot or too cold, or
-having too much or too little light. A great deal more passed at the
-other table. Lady Catherine was generally speaking--stating the mistakes
-of the three others, or relating some anecdote of herself. Mr. Collins
-was employed in agreeing to everything her Ladyship said, thanking her
-for every fish he won, and apologizing if he thought he won too many.
-Sir William did not say much. He was storing his memory with anecdotes
-and noble names.
-
-When Lady Catherine and her daughter had played as long as they chose,
-the tables were broken up, the carriage was offered to Mrs. Collins,
-gratefully accepted, and immediately ordered. The party then gathered
-round the fire to hear Lady Catherine determine what weather they were
-to have on the morrow. From these instructions they were summoned by the
-arrival of the coach; and with many speeches of thankfulness on Mr.
-Collins’s side, and as many bows on Sir William’s, they departed. As
-soon as they had driven from the door, Elizabeth was called on by her
-cousin to give her opinion of all that she had seen at Rosings, which,
-for Charlotte’s sake, she made more favourable than it really was. But
-her commendation, though costing her some trouble, could by no means
-satisfy Mr. Collins, and he was very soon obliged to take her Ladyship’s
-praise into his own hands.
-
-
-
-
-[Illustration]
-
-
-
-
-CHAPTER XXX.
-
-
-[Illustration]
-
-Sir William stayed only a week at Hunsford; but his visit was long
-enough to convince him of his daughter’s being most comfortably settled,
-and of her possessing such a husband and such a neighbour as were not
-often met with. While Sir William was with them, Mr. Collins devoted his
-mornings to driving him out in his gig, and showing him the country: but
-when he went away, the whole family returned to their usual employments,
-and Elizabeth was thankful to find that they did not see more of her
-cousin by the alteration; for the chief of the time between breakfast
-and dinner was now passed by him either at work in the garden, or in
-reading and writing, and looking out of window in his own book room,
-which fronted the road. The room in which the ladies sat was backwards.
-Elizabeth at first had rather wondered that Charlotte should not prefer
-the dining parlour for common use; it was a better sized room, and had a
-pleasanter aspect: but she soon saw that her friend had an excellent
-reason for what she did, for Mr. Collins would undoubtedly have been
-much less in his own apartment had they sat in one equally lively; and
-she gave Charlotte credit for the arrangement.
-
-From the drawing-room they could distinguish nothing in the lane, and
-were indebted to Mr. Collins for the knowledge of what carriages went
-along, and how often especially Miss De Bourgh drove by in her phaeton,
-which he never failed coming to inform them of, though it happened
-almost every day. She not unfrequently stopped at the Parsonage, and had
-a few minutes’ conversation with Charlotte, but was scarcely ever
-prevailed on to get out.
-
-Very few days passed in which Mr. Collins did not walk to Rosings, and
-not many in which his wife did not think it necessary to go likewise;
-and till Elizabeth recollected that there might be other family livings
-to be disposed of, she could not understand the sacrifice of so many
-hours. Now and then they were honoured with a call from her Ladyship,
-and nothing escaped her observation that was passing in the room during
-these visits. She examined into their employments, looked at their work,
-and advised them to do it differently; found fault with the arrangement
-of the furniture, or detected the housemaid in negligence; and if she
-accepted any refreshment, seemed to do it only for the sake of finding
-out that Mrs. Collins’s joints of meat were too large for her family.
-
-Elizabeth soon perceived, that though this great lady was not in the
-commission of the peace for the county, she was a most active magistrate
-in her own parish, the minutest concerns of which were carried to her by
-Mr. Collins; and whenever any of the cottagers were disposed to be
-quarrelsome, discontented, or too poor, she sallied forth into the
-village to settle their differences, silence their complaints, and scold
-them into harmony and plenty.
-
-[Illustration:
-
-     “he never failed to inform them”
-]
-
-The entertainment of dining at Rosings was repeated about twice a week;
-and, allowing for the loss of Sir William, and there being only one
-card-table in the evening, every such entertainment was the counterpart
-of the first. Their other engagements were few, as the style of living
-of the neighbourhood in general was beyond the Collinses’ reach. This,
-however, was no evil to Elizabeth, and upon the whole she spent her time
-comfortably enough: there were half hours of pleasant conversation with
-Charlotte, and the weather was so fine for the time of year, that she
-had often great enjoyment out of doors. Her favourite walk, and where
-she frequently went while the others were calling on Lady Catherine, was
-along the open grove which edged that side of the park, where there was
-a nice sheltered path, which no one seemed to value but herself, and
-where she felt beyond the reach of Lady Catherine’s curiosity.
-
-In this quiet way the first fortnight of her visit soon passed away.
-Easter was approaching, and the week preceding it was to bring an
-addition to the family at Rosings, which in so small a circle must be
-important. Elizabeth had heard, soon after her arrival, that Mr. Darcy
-was expected there in the course of a few weeks; and though there were
-not many of her acquaintance whom she did not prefer, his coming would
-furnish one comparatively new to look at in their Rosings parties, and
-she might be amused in seeing how hopeless Miss Bingley’s designs on him
-were, by his behaviour to his cousin, for whom he was evidently destined
-by Lady Catherine, who talked of his coming with the greatest
-satisfaction, spoke of him in terms of the highest admiration, and
-seemed almost angry to find that he had already been frequently seen by
-Miss Lucas and herself.
-
-His arrival was soon known at the Parsonage; for Mr. Collins was walking
-the whole morning within view of the lodges opening into Hunsford Lane,
-in order to have
-
-[Illustration:
-
-“The gentlemen accompanied him.”
-
-[_Copyright 1894 by George Allen._]]
-
-the earliest assurance of it; and, after making his bow as the carriage
-turned into the park, hurried home with the great intelligence. On the
-following morning he hastened to Rosings to pay his respects. There were
-two nephews of Lady Catherine to require them, for Mr. Darcy had brought
-with him a Colonel Fitzwilliam, the younger son of his uncle, Lord ----;
-and, to the great surprise of all the party, when Mr. Collins returned,
-the gentlemen accompanied him. Charlotte had seen them from her
-husband’s room, crossing the road, and immediately running into the
-other, told the girls what an honour they might expect, adding,--
-
-“I may thank you, Eliza, for this piece of civility. Mr. Darcy would
-never have come so soon to wait upon me.”
-
-Elizabeth had scarcely time to disclaim all right to the compliment
-before their approach was announced by the door-bell, and shortly
-afterwards the three gentlemen entered the room. Colonel Fitzwilliam,
-who led the way, was about thirty, not handsome, but in person and
-address most truly the gentleman. Mr. Darcy looked just as he had been
-used to look in Hertfordshire, paid his compliments, with his usual
-reserve, to Mrs. Collins; and whatever might be his feelings towards her
-friend, met her with every appearance of composure. Elizabeth merely
-courtesied to him, without saying a word.
-
-Colonel Fitzwilliam entered into conversation directly, with the
-readiness and ease of a well-bred man, and talked very pleasantly; but
-his cousin, after having addressed a slight observation on the house and
-garden to Mrs. Collins, sat for some time without speaking to anybody.
-At length, however, his civility was so far awakened as to inquire of
-Elizabeth after the health of her family. She answered him in the usual
-way; and, after a moment’s pause, added,--
-
-“My eldest sister has been in town these three months. Have you never
-happened to see her there?”
-
-She was perfectly sensible that he never had: but she wished to see
-whether he would betray any consciousness of what had passed between the
-Bingleys and Jane; and she thought he looked a little confused as he
-answered that he had never been so fortunate as to meet Miss Bennet. The
-subject was pursued no further, and the gentlemen soon afterwards went
-away.
-
-
-
-
-[Illustration:
-
-“At Church”
-]
-
-
-
-
-CHAPTER XXXI.
-
-
-[Illustration]
-
-Colonel Fitzwilliam’s manners were very much admired at the Parsonage,
-and the ladies all felt that he must add considerably to the pleasure of
-their engagements at Rosings. It was some days, however, before they
-received any invitation thither, for while there were visitors in the
-house they could not be necessary; and it was not till Easter-day,
-almost a week after the gentlemen’s arrival, that they were honoured by
-such an attention, and then they were merely asked on leaving church to
-come there in the evening. For the last week they had seen very little
-of either Lady Catherine or her daughter. Colonel Fitzwilliam had called
-at the Parsonage more than once during the time, but Mr. Darcy they had
-only seen at church.
-
-The invitation was accepted, of course, and at a proper hour they joined
-the party in Lady Catherine’s drawing-room. Her Ladyship received them
-civilly, but it was plain that their company was by no means so
-acceptable as when she could get nobody else; and she was, in fact,
-almost engrossed by her nephews, speaking to them, especially to Darcy,
-much more than to any other person in the room.
-
-Colonel Fitzwilliam seemed really glad to see them: anything was a
-welcome relief to him at Rosings; and Mrs. Collins’s pretty friend had,
-moreover, caught his fancy very much. He now seated himself by her, and
-talked so agreeably of Kent and Hertfordshire, of travelling and staying
-at home, of new books and music, that Elizabeth had never been half so
-well entertained in that room before; and they conversed with so much
-spirit and flow as to draw the attention of Lady Catherine herself, as
-well as of Mr. Darcy. _His_ eyes had been soon and repeatedly turned
-towards them with a look of curiosity; and that her Ladyship, after a
-while, shared the feeling, was more openly acknowledged, for she did not
-scruple to call out,--
-
-“What is that you are saying, Fitzwilliam? What is it you are talking
-of? What are you telling Miss Bennet? Let me hear what it is.”
-
-“We were talking of music, madam,” said he, when no longer able to avoid
-a reply.
-
-“Of music! Then pray speak aloud. It is of all subjects my delight. I
-must have my share in the conversation, if you are speaking of music.
-There are few people in England, I suppose, who have more true
-enjoyment of music than myself, or a better natural taste. If I had ever
-learnt, I should have been a great proficient. And so would Anne, if her
-health had allowed her to apply. I am confident that she would have
-performed delightfully. How does Georgiana get on, Darcy?”
-
-Mr. Darcy spoke with affectionate praise of his sister’s proficiency.
-
-“I am very glad to hear such a good account of her,” said Lady
-Catherine; “and pray tell her from me, that she cannot expect to excel,
-if she does not practise a great deal.”
-
-“I assure you, madam,” he replied, “that she does not need such advice.
-She practises very constantly.”
-
-“So much the better. It cannot be done too much; and when I next write
-to her, I shall charge her not to neglect it on any account. I often
-tell young ladies, that no excellence in music is to be acquired without
-constant practice. I have told Miss Bennet several times, that she will
-never play really well, unless she practises more; and though Mrs.
-Collins has no instrument, she is very welcome, as I have often told
-her, to come to Rosings every day, and play on the pianoforte in Mrs.
-Jenkinson’s room. She would be in nobody’s way, you know, in that part
-of the house.”
-
-Mr. Darcy looked a little ashamed of his aunt’s ill-breeding, and made
-no answer.
-
-When coffee was over, Colonel Fitzwilliam reminded Elizabeth of having
-promised to play to him; and she sat down directly to the instrument. He
-drew a chair near her. Lady Catherine listened to half a song, and then
-talked, as before, to her other nephew; till the latter walked away from
-her, and moving with his usual deliberation towards the pianoforte,
-stationed himself so as to command a full view of the fair performer’s
-countenance. Elizabeth saw what he was doing, and at the first
-convenient pause turned to him with an arch smile, and said,--
-
-“You mean to frighten me, Mr. Darcy, by coming in all this state to hear
-me. But I will not be alarmed, though your sister _does_ play so well.
-There is a stubbornness about me that never can bear to be frightened at
-the will of others. My courage always rises with every attempt to
-intimidate me.”
-
-“I shall not say that you are mistaken,” he replied, “because you could
-not really believe me to entertain any design of alarming you; and I
-have had the pleasure of your acquaintance long enough to know, that you
-find great enjoyment in occasionally professing opinions which, in fact,
-are not your own.”
-
-Elizabeth laughed heartily at this picture of herself, and said to
-Colonel Fitzwilliam, “Your cousin will give you a very pretty notion of
-me, and teach you not to believe a word I say. I am particularly unlucky
-in meeting with a person so well able to expose my real character, in a
-part of the world where I had hoped to pass myself off with some degree
-of credit. Indeed, Mr. Darcy, it is very ungenerous in you to mention
-all that you knew to my disadvantage in Hertfordshire--and, give me
-leave to say, very impolitic too--for it is provoking me to retaliate,
-and such things may come out as will shock your relations to hear.”
-
-“I am not afraid of you,” said he, smilingly.
-
-“Pray let me hear what you have to accuse him of,” cried Colonel
-Fitzwilliam. “I should like to know how he behaves among strangers.”
-
-“You shall hear, then--but prepare for something very dreadful. The
-first time of my ever seeing him in Hertfordshire, you must know, was at
-a ball--and at this ball, what do you think he did? He danced only four
-dances! I am sorry to pain you, but so it was. He danced only four
-dances, though gentlemen were scarce; and, to my certain knowledge, more
-than one young lady was sitting down in want of a partner. Mr. Darcy,
-you cannot deny the fact.”
-
-“I had not at that time the honour of knowing any lady in the assembly
-beyond my own party.”
-
-“True; and nobody can ever be introduced in a ball-room. Well, Colonel
-Fitzwilliam, what do I play next? My fingers wait your orders.”
-
-“Perhaps,” said Darcy, “I should have judged better had I sought an
-introduction, but I am ill-qualified to recommend myself to strangers.”
-
-“Shall we ask your cousin the reason of this?” said Elizabeth, still
-addressing Colonel Fitzwilliam. “Shall we ask him why a man of sense and
-education, and who has lived in the world, is ill-qualified to recommend
-himself to strangers?”
-
-“I can answer your question,” said Fitzwilliam, “without applying to
-him. It is because he will not give himself the trouble.”
-
-“I certainly have not the talent which some people possess,” said Darcy,
-“of conversing easily with those I have never seen before. I cannot
-catch their tone of conversation, or appear interested in their
-concerns, as I often see done.”
-
-“My fingers,” said Elizabeth, “do not move over this instrument in the
-masterly manner which I see so many women’s do. They have not the same
-force or rapidity, and do not produce the same expression. But then I
-have always supposed it to be my own fault--because I would not take
-the trouble of practising. It is not that I do not believe _my_ fingers
-as capable as any other woman’s of superior execution.”
-
-Darcy smiled and said, “You are perfectly right. You have employed your
-time much better. No one admitted to the privilege of hearing you can
-think anything wanting. We neither of us perform to strangers.”
-
-Here they were interrupted by Lady Catherine, who called out to know
-what they were talking of. Elizabeth immediately began playing again.
-Lady Catherine approached, and, after listening for a few minutes, said
-to Darcy,--
-
-“Miss Bennet would not play at all amiss if she practised more, and
-could have the advantage of a London master. She has a very good notion
-of fingering, though her taste is not equal to Anne’s. Anne would have
-been a delightful performer, had her health allowed her to learn.”
-
-Elizabeth looked at Darcy, to see how cordially he assented to his
-cousin’s praise: but neither at that moment nor at any other could she
-discern any symptom of love; and from the whole of his behaviour to Miss
-De Bourgh she derived this comfort for Miss Bingley, that he might have
-been just as likely to marry _her_, had she been his relation.
-
-Lady Catherine continued her remarks on Elizabeth’s performance, mixing
-with them many instructions on execution and taste. Elizabeth received
-them with all the forbearance of civility; and at the request of the
-gentlemen remained at the instrument till her Ladyship’s carriage was
-ready to take them all home.
-
-
-
-
-[Illustration]
-
-
-
-
-CHAPTER XXXII.
-
-
-[Illustration]
-
-Elizabeth was sitting by herself the next morning, and writing to Jane,
-while Mrs. Collins and Maria were gone on business into the village,
-when she was startled by a ring at the door, the certain signal of a
-visitor. As she had heard no carriage, she thought it not unlikely to be
-Lady Catherine; and under that apprehension was putting away her
-half-finished letter, that she might escape all impertinent questions,
-when the door opened, and to her very great surprise Mr. Darcy, and Mr.
-Darcy only, entered the room.
-
-He seemed astonished too on finding her alone, and apologized for his
-intrusion, by letting her know that he had understood all the ladies to
-be within.
-
-They then sat down, and when her inquiries after Rosings were made,
-seemed in danger of sinking into total silence. It was absolutely
-necessary, therefore, to think of something; and in this emergency
-recollecting _when_ she had seen him last in Hertfordshire, and feeling
-curious to know what he would say on the subject of their hasty
-departure, she observed,--
-
-“How very suddenly you all quitted Netherfield last November, Mr. Darcy!
-It must have been a most agreeable surprise to Mr. Bingley to see you
-all after him so soon; for, if I recollect right, he went but the day
-before. He and his sisters were well, I hope, when you left London?”
-
-“Perfectly so, I thank you.”
-
-She found that she was to receive no other answer; and, after a short
-pause, added,--
-
-“I think I have understood that Mr. Bingley has not much idea of ever
-returning to Netherfield again?”
-
-“I have never heard him say so; but it is probable that he may spend
-very little of his time there in future. He has many friends, and he is
-at a time of life when friends and engagements are continually
-increasing.”
-
-“If he means to be but little at Netherfield, it would be better for the
-neighbourhood that he should give up the place entirely, for then we
-might possibly get a settled family there. But, perhaps, Mr. Bingley did
-not take the house so much for the convenience of the neighbourhood as
-for his own, and we must expect him to keep or quit it on the same
-principle.”
-
-“I should not be surprised,” said Darcy, “if he were to give it up as
-soon as any eligible purchase offers.”
-
-Elizabeth made no answer. She was afraid of talking longer of his
-friend; and, having nothing else to say, was now determined to leave the
-trouble of finding a subject to him.
-
-He took the hint and soon began with, “This seems a very comfortable
-house. Lady Catherine, I believe, did a great deal to it when Mr.
-Collins first came to Hunsford.”
-
-“I believe she did--and I am sure she could not have bestowed her
-kindness on a more grateful object.”
-
-“Mr. Collins appears very fortunate in his choice of a wife.”
-
-“Yes, indeed; his friends may well rejoice in his having met with one of
-the very few sensible women who would have accepted him, or have made
-him happy if they had. My friend has an excellent understanding--though
-I am not certain that I consider her marrying Mr. Collins as the wisest
-thing she ever did. She seems perfectly happy, however; and, in a
-prudential light, it is certainly a very good match for her.”
-
-“It must be very agreeable to her to be settled within so easy a
-distance of her own family and friends.”
-
-“An easy distance do you call it? It is nearly fifty miles.”
-
-“And what is fifty miles of good road? Little more than half a day’s
-journey. Yes, I call it a very easy distance.”
-
-“I should never have considered the distance as one of the _advantages_
-of the match,” cried Elizabeth. “I should never have said Mrs. Collins
-was settled _near_ her family.”
-
-“It is a proof of your own attachment to Hertfordshire. Anything beyond
-the very neighbourhood of Longbourn, I suppose, would appear far.”
-
-As he spoke there was a sort of smile, which Elizabeth fancied she
-understood; he must be supposing her to be thinking of Jane and
-Netherfield, and she blushed as she answered,--
-
-“I do not mean to say that a woman may not be settled too near her
-family. The far and the near must be relative, and depend on many
-varying circumstances. Where there is fortune to make the expense of
-travelling unimportant, distance becomes no evil. But that is not the
-case _here_. Mr. and Mrs. Collins have a comfortable income, but not
-such a one as will allow of frequent journeys--and I am persuaded my
-friend would not call herself _near_ her family under less than _half_
-the present distance.”
-
-Mr. Darcy drew his chair a little towards her, and said, “_You_ cannot
-have a right to such very strong local attachment. _You_ cannot have
-been always at Longbourn.”
-
-Elizabeth looked surprised. The gentleman experienced some change of
-feeling; he drew back his chair, took a newspaper from the table, and,
-glancing over it, said, in a colder voice,--
-
-“Are you pleased with Kent?”
-
-A short dialogue on the subject of the country ensued, on either side
-calm and concise--and soon put an end to by the entrance of Charlotte
-and her sister, just returned from their walk. The _tête-à-tête_
-surprised them. Mr. Darcy related the mistake which had occasioned his
-intruding on Miss Bennet, and, after sitting a few minutes longer,
-without saying much to anybody, went away.
-
-[Illustration: “Accompanied by their aunt”
-
-[_Copyright 1894 by George Allen._]]
-
-“What can be the meaning of this?” said Charlotte, as soon as he was
-gone. “My dear Eliza, he must be in love with you, or he would never
-have called on us in this familiar way.”
-
-But when Elizabeth told of his silence, it did not seem very likely,
-even to Charlotte’s wishes, to be the case; and, after various
-conjectures, they could at last only suppose his visit to proceed from
-the difficulty of finding anything to do, which was the more probable
-from the time of year. All field sports were over. Within doors there
-was Lady Catherine, books, and a billiard table, but gentlemen cannot be
-always within doors; and in the nearness of the Parsonage, or the
-pleasantness of the walk to it, or of the people who lived in it, the
-two cousins found a temptation from this period of walking thither
-almost every day. They called at various times of the morning, sometimes
-separately, sometimes together, and now and then accompanied by their
-aunt. It was plain to them all that Colonel Fitzwilliam came because he
-had pleasure in their society, a persuasion which of course recommended
-him still more; and Elizabeth was reminded by her own satisfaction in
-being with him, as well as by his evident admiration, of her former
-favourite, George Wickham; and though, in comparing them, she saw there
-was less captivating softness in Colonel Fitzwilliam’s manners, she
-believed he might have the best informed mind.
-
-But why Mr. Darcy came so often to the Parsonage it was more difficult
-to understand. It could not be for society, as he frequently sat there
-ten minutes together without opening his lips; and when he did speak, it
-seemed the effect of necessity rather than of choice--a sacrifice to
-propriety, not a pleasure to himself. He seldom appeared really
-animated. Mrs. Collins knew not what to make of him. Colonel
-Fitzwilliam’s occasionally laughing at his stupidity proved that he was
-generally different, which her own knowledge of him could not have told
-her; and as she would have liked to believe this change the effect of
-love, and the object of that love her friend Eliza, she set herself
-seriously to work to find it out: she watched him whenever they were at
-Rosings, and whenever he came to Hunsford; but without much success. He
-certainly looked at her friend a great deal, but the expression of that
-look was disputable. It was an earnest, steadfast gaze, but she often
-doubted whether there were much admiration in it, and sometimes it
-seemed nothing but absence of mind.
-
-She had once or twice suggested to Elizabeth the possibility of his
-being partial to her, but Elizabeth always laughed at the idea; and Mrs.
-Collins did not think it right to press the subject, from the danger of
-raising expectations which might only end in disappointment; for in her
-opinion it admitted not of a doubt, that all her friend’s dislike would
-vanish, if she could suppose him to be in her power.
-
-In her kind schemes for Elizabeth, she sometimes planned her marrying
-Colonel Fitzwilliam. He was, beyond comparison, the pleasantest man: he
-certainly admired her, and his situation in life was most eligible; but,
-to counterbalance these advantages, Mr. Darcy had considerable patronage
-in the church, and his cousin could have none at all.
-
-
-
-
-[Illustration: “On looking up”]
-
-
-
-
-CHAPTER XXXIII.
-
-
-[Illustration]
-
-More than once did Elizabeth, in her ramble within the park,
-unexpectedly meet Mr. Darcy. She felt all the perverseness of the
-mischance that should bring him where no one else was brought; and, to
-prevent its ever happening again, took care to inform him, at first,
-that it was a favourite haunt of hers. How it could occur a second time,
-therefore, was very odd! Yet it did, and even the third. It seemed like
-wilful ill-nature, or a voluntary penance; for on these occasions it was
-not merely a few formal inquiries and an awkward pause and then away,
-but he actually thought it necessary to turn back and walk with her. He
-never said a great deal, nor did she give herself the trouble of talking
-or of listening much; but it struck her in the course of their third
-encounter that he was asking some odd unconnected questions--about her
-pleasure in being at Hunsford, her love of solitary walks, and her
-opinion of Mr. and Mrs. Collins’s happiness; and that in speaking of
-Rosings, and her not perfectly understanding the house, he seemed to
-expect that whenever she came into Kent again she would be staying
-_there_ too. His words seemed to imply it. Could he have Colonel
-Fitzwilliam in his thoughts? She supposed, if he meant anything, he must
-mean an allusion to what might arise in that quarter. It distressed her
-a little, and she was quite glad to find herself at the gate in the
-pales opposite the Parsonage.
-
-She was engaged one day, as she walked, in re-perusing Jane’s last
-letter, and dwelling on some passages which proved that Jane had not
-written in spirits, when, instead of being again surprised by Mr. Darcy,
-she saw, on looking up, that Colonel Fitzwilliam was meeting her.
-Putting away the letter immediately, and forcing a smile, she said,--
-
-“I did not know before that you ever walked this way.”
-
-“I have been making the tour of the park,” he replied, “as I generally
-do every year, and intended to close it with a call at the Parsonage.
-Are you going much farther?”
-
-“No, I should have turned in a moment.”
-
-And accordingly she did turn, and they walked towards the Parsonage
-together.
-
-“Do you certainly leave Kent on Saturday?” said she.
-
-“Yes--if Darcy does not put it off again. But I am at his disposal. He
-arranges the business just as he pleases.”
-
-“And if not able to please himself in the arrangement, he has at least
-great pleasure in the power of choice. I do not know anybody who seems
-more to enjoy the power of doing what he likes than Mr. Darcy.”
-
-“He likes to have his own way very well,” replied Colonel Fitzwilliam.
-“But so we all do. It is only that he has better means of having it than
-many others, because he is rich, and many others are poor. I speak
-feelingly. A younger son, you know, must be inured to self-denial and
-dependence.”
-
-“In my opinion, the younger son of an earl can know very little of
-either. Now, seriously, what have you ever known of self-denial and
-dependence? When have you been prevented by want of money from going
-wherever you chose or procuring anything you had a fancy for?”
-
-“These are home questions--and perhaps I cannot say that I have
-experienced many hardships of that nature. But in matters of greater
-weight, I may suffer from the want of money. Younger sons cannot marry
-where they like.”
-
-“Unless where they like women of fortune, which I think they very often
-do.”
-
-“Our habits of expense make us too dependent, and there are not many in
-my rank of life who can afford to marry without some attention to
-money.”
-
-“Is this,” thought Elizabeth, “meant for me?” and she coloured at the
-idea; but, recovering herself, said in a lively tone, “And pray, what is
-the usual price of an earl’s younger son? Unless the elder brother is
-very sickly, I suppose you would not ask above fifty thousand pounds.”
-
-He answered her in the same style, and the subject dropped. To interrupt
-a silence which might make him fancy her affected with what had passed,
-she soon afterwards said,--
-
-“I imagine your cousin brought you down with him chiefly for the sake of
-having somebody at his disposal. I wonder he does not marry, to secure a
-lasting convenience of that kind. But, perhaps, his sister does as well
-for the present; and, as she is under his sole care, he may do what he
-likes with her.”
-
-“No,” said Colonel Fitzwilliam, “that is an advantage which he must
-divide with me. I am joined with him in the guardianship of Miss Darcy.”
-
-“Are you, indeed? And pray what sort of a guardian do you make? Does
-your charge give you much trouble? Young ladies of her age are sometimes
-a little difficult to manage; and if she has the true Darcy spirit, she
-may like to have her own way.”
-
-As she spoke, she observed him looking at her earnestly; and the manner
-in which he immediately asked her why she supposed Miss Darcy likely to
-give them any uneasiness, convinced her that she had somehow or other
-got pretty near the truth. She directly replied,--
-
-“You need not be frightened. I never heard any harm of her; and I dare
-say she is one of the most tractable creatures in the world. She is a
-very great favourite with some ladies of my acquaintance, Mrs. Hurst and
-Miss Bingley. I think I have heard you say that you know them.”
-
-“I know them a little. Their brother is a pleasant, gentlemanlike
-man--he is a great friend of Darcy’s.”
-
-“Oh yes,” said Elizabeth drily--“Mr. Darcy is uncommonly kind to Mr.
-Bingley, and takes a prodigious deal of care of him.”
-
-“Care of him! Yes, I really believe Darcy _does_ take care of him in
-those points where he most wants care. From something that he told me
-in our journey hither, I have reason to think Bingley very much indebted
-to him. But I ought to beg his pardon, for I have no right to suppose
-that Bingley was the person meant. It was all conjecture.”
-
-“What is it you mean?”
-
-“It is a circumstance which Darcy of course could not wish to be
-generally known, because if it were to get round to the lady’s family it
-would be an unpleasant thing.”
-
-“You may depend upon my not mentioning it.”
-
-“And remember that I have not much reason for supposing it to be
-Bingley. What he told me was merely this: that he congratulated himself
-on having lately saved a friend from the inconveniences of a most
-imprudent marriage, but without mentioning names or any other
-particulars; and I only suspected it to be Bingley from believing him
-the kind of young man to get into a scrape of that sort, and from
-knowing them to have been together the whole of last summer.”
-
-“Did Mr. Darcy give you his reasons for this interference?”
-
-“I understood that there were some very strong objections against the
-lady.”
-
-“And what arts did he use to separate them?”
-
-“He did not talk to me of his own arts,” said Fitzwilliam, smiling. “He
-only told me what I have now told you.”
-
-Elizabeth made no answer, and walked on, her heart swelling with
-indignation. After watching her a little, Fitzwilliam asked her why she
-was so thoughtful.
-
-“I am thinking of what you have been telling me,” said she. “Your
-cousin’s conduct does not suit my feelings. Why was he to be the
-judge?”
-
-“You are rather disposed to call his interference officious?”
-
-“I do not see what right Mr. Darcy had to decide on the propriety of his
-friend’s inclination; or why, upon his own judgment alone, he was to
-determine and direct in what manner that friend was to be happy. But,”
-she continued, recollecting herself, “as we know none of the
-particulars, it is not fair to condemn him. It is not to be supposed
-that there was much affection in the case.”
-
-“That is not an unnatural surmise,” said Fitzwilliam; “but it is
-lessening the honour of my cousin’s triumph very sadly.”
-
-This was spoken jestingly, but it appeared to her so just a picture of
-Mr. Darcy, that she would not trust herself with an answer; and,
-therefore, abruptly changing the conversation, talked on indifferent
-matters till they reached the Parsonage. There, shut into her own room,
-as soon as their visitor left them, she could think without interruption
-of all that she had heard. It was not to be supposed that any other
-people could be meant than those with whom she was connected. There
-could not exist in the world _two_ men over whom Mr. Darcy could have
-such boundless influence. That he had been concerned in the measures
-taken to separate Mr. Bingley and Jane, she had never doubted; but she
-had always attributed to Miss Bingley the principal design and
-arrangement of them. If his own vanity, however, did not mislead him,
-_he_ was the cause--his pride and caprice were the cause--of all that
-Jane had suffered, and still continued to suffer. He had ruined for a
-while every hope of happiness for the most affectionate, generous heart
-in the world; and no one could say how lasting an evil he might have
-inflicted.
-
-“There were some very strong objections against the lady,” were Colonel
-Fitzwilliam’s words; and these strong objections probably were, her
-having one uncle who was a country attorney, and another who was in
-business in London.
-
-“To Jane herself,” she exclaimed, “there could be no possibility of
-objection,--all loveliness and goodness as she is! Her understanding
-excellent, her mind improved, and her manners captivating. Neither could
-anything be urged against my father, who, though with some
-peculiarities, has abilities which Mr. Darcy himself need not disdain,
-and respectability which he will probably never reach.” When she thought
-of her mother, indeed, her confidence gave way a little; but she would
-not allow that any objections _there_ had material weight with Mr.
-Darcy, whose pride, she was convinced, would receive a deeper wound from
-the want of importance in his friend’s connections than from their want
-of sense; and she was quite decided, at last, that he had been partly
-governed by this worst kind of pride, and partly by the wish of
-retaining Mr. Bingley for his sister.
-
-The agitation and tears which the subject occasioned brought on a
-headache; and it grew so much worse towards the evening that, added to
-her unwillingness to see Mr. Darcy, it determined her not to attend her
-cousins to Rosings, where they were engaged to drink tea. Mrs. Collins,
-seeing that she was really unwell, did not press her to go, and as much
-as possible prevented her husband from pressing her; but Mr. Collins
-could not conceal his apprehension of Lady Catherine’s being rather
-displeased by her staying at home.
-
-
-
-
-[Illustration]
-
-
-
-
-CHAPTER XXXIV.
-
-
-[Illustration]
-
-When they were gone, Elizabeth, as if intending to exasperate herself as
-much as possible against Mr. Darcy, chose for her employment the
-examination of all the letters which Jane had written to her since her
-being in Kent. They contained no actual complaint, nor was there any
-revival of past occurrences, or any communication of present suffering.
-But in all, and in almost every line of each, there was a want of that
-cheerfulness which had been used to characterize her style, and which,
-proceeding from the serenity of a mind at ease with itself, and kindly
-disposed towards everyone, had been scarcely ever clouded. Elizabeth
-noticed every sentence conveying the idea of uneasiness, with an
-attention which it had hardly received on the first perusal. Mr. Darcy’s
-shameful boast of what misery he had been able to inflict gave her a
-keener sense of her sister’s sufferings. It was some consolation to
-think that his visit to Rosings was to end on the day after the next,
-and a still greater that in less than a fortnight she should herself be
-with Jane again, and enabled to contribute to the recovery of her
-spirits, by all that affection could do.
-
-She could not think of Darcy’s leaving Kent without remembering that his
-cousin was to go with him; but Colonel Fitzwilliam had made it clear
-that he had no intentions at all, and, agreeable as he was, she did not
-mean to be unhappy about him.
-
-While settling this point, she was suddenly roused by the sound of the
-door-bell; and her spirits were a little fluttered by the idea of its
-being Colonel Fitzwilliam himself, who had once before called late in
-the evening, and might now come to inquire particularly after her. But
-this idea was soon banished, and her spirits were very differently
-affected, when, to her utter amazement, she saw Mr. Darcy walk into the
-room. In a hurried manner he immediately began an inquiry after her
-health, imputing his visit to a wish of hearing that she were better.
-She answered him with cold civility. He sat down for a few moments, and
-then getting up walked about the room. Elizabeth was surprised, but
-said not a word. After a silence of several minutes, he came towards her
-in an agitated manner, and thus began:--
-
-“In vain have I struggled. It will not do. My feelings will not be
-repressed. You must allow me to tell you how ardently I admire and love
-you.”
-
-Elizabeth’s astonishment was beyond expression. She stared, coloured,
-doubted, and was silent. This he considered sufficient encouragement,
-and the avowal of all that he felt and had long felt for her immediately
-followed. He spoke well; but there were feelings besides those of the
-heart to be detailed, and he was not more eloquent on the subject of
-tenderness than of pride. His sense of her inferiority, of its being a
-degradation, of the family obstacles which judgment had always opposed
-to inclination, were dwelt on with a warmth which seemed due to the
-consequence he was wounding, but was very unlikely to recommend his
-suit.
-
-In spite of her deeply-rooted dislike, she could not be insensible to
-the compliment of such a man’s affection, and though her intentions did
-not vary for an instant, she was at first sorry for the pain he was to
-receive; till roused to resentment by his subsequent language, she lost
-all compassion in anger. She tried, however, to compose herself to
-answer him with patience, when he should have done. He concluded with
-representing to her the strength of that attachment which in spite of
-all his endeavours he had found impossible to conquer; and with
-expressing his hope that it would now be rewarded by her acceptance of
-his hand. As he said this she could easily see that he had no doubt of a
-favourable answer. He _spoke_ of apprehension and anxiety, but his
-countenance expressed real security. Such a circumstance could only
-exasperate farther; and when he ceased the colour rose into her cheeks
-and she said,--
-
-“In such cases as this, it is, I believe, the established mode to
-express a sense of obligation for the sentiments avowed, however
-unequally they may be returned. It is natural that obligation should be
-felt, and if I could _feel_ gratitude, I would now thank you. But I
-cannot--I have never desired your good opinion, and you have certainly
-bestowed it most unwillingly. I am sorry to have occasioned pain to
-anyone. It has been most unconsciously done, however, and I hope will be
-of short duration. The feelings which you tell me have long prevented
-the acknowledgment of your regard can have little difficulty in
-overcoming it after this explanation.”
-
-Mr. Darcy, who was leaning against the mantel-piece with his eyes fixed
-on her face, seemed to catch her words with no less resentment than
-surprise. His complexion became pale with anger, and the disturbance of
-his mind was visible in every feature. He was struggling for the
-appearance of composure, and would not open his lips till he believed
-himself to have attained it. The pause was to Elizabeth’s feelings
-dreadful. At length, in a voice of forced calmness, he said,--
-
-“And this is all the reply which I am to have the honour of expecting! I
-might, perhaps, wish to be informed why, with so little _endeavour_ at
-civility, I am thus rejected. But it is of small importance.”
-
-“I might as well inquire,” replied she, “why, with so evident a design
-of offending and insulting me, you chose to tell me that you liked me
-against your will, against your reason, and even against your character?
-Was not this some excuse for incivility, if I _was_ uncivil? But I have
-other provocations. You know I have. Had not my own feelings decided
-against you, had they been indifferent, or had they even been
-favourable, do you think that any consideration would tempt me to accept
-the man who has been the means of ruining, perhaps for ever, the
-happiness of a most beloved sister?”
-
-As she pronounced these words, Mr. Darcy changed colour; but the emotion
-was short, and he listened without attempting to interrupt her while she
-continued,--
-
-“I have every reason in the world to think ill of you. No motive can
-excuse the unjust and ungenerous part you acted _there_. You dare not,
-you cannot deny that you have been the principal, if not the only means
-of dividing them from each other, of exposing one to the censure of the
-world for caprice and instability, the other to its derision for
-disappointed hopes, and involving them both in misery of the acutest
-kind.”
-
-She paused, and saw with no slight indignation that he was listening
-with an air which proved him wholly unmoved by any feeling of remorse.
-He even looked at her with a smile of affected incredulity.
-
-“Can you deny that you have done it?” she repeated.
-
-With assumed tranquillity he then replied, “I have no wish of denying
-that I did everything in my power to separate my friend from your
-sister, or that I rejoice in my success. Towards _him_ I have been
-kinder than towards myself.”
-
-Elizabeth disdained the appearance of noticing this civil reflection,
-but its meaning did not escape, nor was it likely to conciliate her.
-
-“But it is not merely this affair,” she continued, “on which my dislike
-is founded. Long before it had taken place, my opinion of you was
-decided. Your character was unfolded in the recital which I received
-many months ago from Mr. Wickham. On this subject, what can you have to
-say? In what imaginary act of friendship can you here defend yourself?
-or under what misrepresentation can you here impose upon others?”
-
-“You take an eager interest in that gentleman’s concerns,” said Darcy,
-in a less tranquil tone, and with a heightened colour.
-
-“Who that knows what his misfortunes have been can help feeling an
-interest in him?”
-
-“His misfortunes!” repeated Darcy, contemptuously,--“yes, his
-misfortunes have been great indeed.”
-
-“And of your infliction,” cried Elizabeth, with energy; “You have
-reduced him to his present state of poverty--comparative poverty. You
-have withheld the advantages which you must know to have been designed
-for him. You have deprived the best years of his life of that
-independence which was no less his due than his desert. You have done
-all this! and yet you can treat the mention of his misfortunes with
-contempt and ridicule.”
-
-“And this,” cried Darcy, as he walked with quick steps across the room,
-“is your opinion of me! This is the estimation in which you hold me! I
-thank you for explaining it so fully. My faults, according to this
-calculation, are heavy indeed! But, perhaps,” added he, stopping in his
-walk, and turning towards her, “these offences might have been
-overlooked, had not your pride been hurt by my honest confession of the
-scruples that had long prevented my forming any serious design. These
-bitter accusations might have been suppressed, had I, with greater
-policy, concealed my struggles, and flattered you into the belief of my
-being impelled by unqualified, unalloyed inclination; by reason, by
-reflection, by everything. But disguise of every sort is my abhorrence.
-Nor am I ashamed of the feelings I related. They were natural and just.
-Could you expect me to rejoice in the inferiority of your
-connections?--to congratulate myself on the hope of relations whose
-condition in life is so decidedly beneath my own?”
-
-Elizabeth felt herself growing more angry every moment; yet she tried to
-the utmost to speak with composure when she said,--
-
-“You are mistaken, Mr. Darcy, if you suppose that the mode of your
-declaration affected me in any other way than as it spared me the
-concern which I might have felt in refusing you, had you behaved in a
-more gentlemanlike manner.”
-
-She saw him start at this; but he said nothing, and she continued,--
-
-“You could not have made me the offer of your hand in any possible way
-that would have tempted me to accept it.”
-
-Again his astonishment was obvious; and he looked at her with an
-expression of mingled incredulity and mortification. She went on,--
-
-“From the very beginning, from the first moment, I may almost say, of my
-acquaintance with you, your manners impressing me with the fullest
-belief of your arrogance, your conceit, and your selfish disdain of the
-feelings of others, were such as to form that groundwork of
-disapprobation, on which succeeding events have built so immovable a
-dislike; and I had not known you a month before I felt that you were the
-last man in the world whom I could ever be prevailed on to marry.”
-
-“You have said quite enough, madam. I perfectly comprehend your
-feelings, and have now only to be ashamed of what my own have been.
-Forgive me for having taken up so much of your time, and accept my best
-wishes for your health and happiness.”
-
-And with these words he hastily left the room, and Elizabeth heard him
-the next moment open the front door and quit the house. The tumult of
-her mind was now painfully great. She knew not how to support herself,
-and, from actual weakness, sat down and cried for half an hour. Her
-astonishment, as she reflected on what had passed, was increased by
-every review of it. That she should receive an offer of marriage from
-Mr. Darcy! that he should have been in love with her for so many months!
-so much in love as to wish to marry her in spite of all the objections
-which had made him prevent his friend’s marrying her sister, and which
-must appear at least with equal force in his own case, was almost
-incredible! it was gratifying to have inspired unconsciously so strong
-an affection. But his pride, his abominable pride, his shameless avowal
-of what he had done with respect to Jane, his unpardonable assurance in
-acknowledging, though he could not justify it, and the unfeeling manner
-which he had mentioned Mr. Wickham, his cruelty towards whom he had not
-attempted to deny, soon overcame the pity which the consideration of his
-attachment had for a moment excited.
-
-She continued in very agitating reflections till the sound of Lady
-Catherine’s carriage made her feel how unequal she was to encounter
-Charlotte’s observation, and hurried her away to her room.
-
-
-
-
-[Illustration:
-
-“Hearing herself called”
-]
-
-
-
-
-CHAPTER XXXV.
-
-
-[Illustration]
-
-Elizabeth awoke the next morning to the same thoughts and meditations
-which had at length closed her eyes. She could not yet recover from the
-surprise of what had happened: it was impossible to think of anything
-else; and, totally indisposed for employment, she resolved soon after
-breakfast to indulge herself in air and exercise. She was proceeding
-directly to her favourite walk, when the recollection of Mr. Darcy’s
-sometimes coming there stopped her, and instead of entering the park,
-she turned up the lane which led her farther from the turnpike road. The
-park paling was still the boundary on one side, and she soon passed one
-of the gates into the ground.
-
-After walking two or three times along that part of the lane, she was
-tempted, by the pleasantness of the morning, to stop at the gates and
-look into the park. The five weeks which she had now passed in Kent had
-made a great difference in the country, and every day was adding to the
-verdure of the early trees. She was on the point of continuing her
-walk, when she caught a glimpse of a gentleman within the sort of grove
-which edged the park: he was moving that way; and fearful of its being
-Mr. Darcy, she was directly retreating. But the person who advanced was
-now near enough to see her, and stepping forward with eagerness,
-pronounced her name. She had turned away; but on hearing herself called,
-though in a voice which proved it to be Mr. Darcy, she moved again
-towards the gate. He had by that time reached it also; and, holding out
-a letter, which she instinctively took, said, with a look of haughty
-composure, “I have been walking in the grove some time, in the hope of
-meeting you. Will you do me the honour of reading that letter?” and
-then, with a slight bow, turned again into the plantation, and was soon
-out of sight.
-
-With no expectation of pleasure, but with the strongest curiosity,
-Elizabeth opened the letter, and to her still increasing wonder,
-perceived an envelope containing two sheets of letter paper, written
-quite through, in a very close hand. The envelope itself was likewise
-full. Pursuing her way along the lane, she then began it. It was dated
-from Rosings, at eight o’clock in the morning, and was as follows:--
-
-“Be not alarmed, madam, on receiving this letter, by the apprehension of
-its containing any repetition of those sentiments, or renewal of those
-offers, which were last night so disgusting to you. I write without any
-intention of paining you, or humbling myself, by dwelling on wishes,
-which, for the happiness of both, cannot be too soon forgotten; and the
-effort which the formation and the perusal of this letter must occasion,
-should have been spared, had not my character required it to be written
-and read. You must, therefore, pardon the freedom with which I demand
-your attention; your feelings, I know, will bestow it unwillingly, but I
-demand it of your justice.
-
-“Two offences of a very different nature, and by no means of equal
-magnitude, you last night laid to my charge. The first mentioned was,
-that, regardless of the sentiments of either, I had detached Mr. Bingley
-from your sister,--and the other, that I had, in defiance of various
-claims, in defiance of honour and humanity, ruined the immediate
-prosperity and blasted the prospects of Mr. Wickham. Wilfully and
-wantonly to have thrown off the companion of my youth, the acknowledged
-favourite of my father, a young man who had scarcely any other
-dependence than on our patronage, and who had been brought up to expect
-its exertion, would be a depravity, to which the separation of two young
-persons whose affection could be the growth of only a few weeks, could
-bear no comparison. But from the severity of that blame which was last
-night so liberally bestowed, respecting each circumstance, I shall hope
-to be in future secured, when the following account of my actions and
-their motives has been read. If, in the explanation of them which is due
-to myself, I am under the necessity of relating feelings which may be
-offensive to yours, I can only say that I am sorry. The necessity must
-be obeyed, and further apology would be absurd. I had not been long in
-Hertfordshire before I saw, in common with others, that Bingley
-preferred your elder sister to any other young woman in the country. But
-it was not till the evening of the dance at Netherfield that I had any
-apprehension of his feeling a serious attachment. I had often seen him
-in love before. At that ball, while I had the honour of dancing with
-you, I was first made acquainted, by Sir William Lucas’s accidental
-information, that Bingley’s attentions to your sister had given rise to
-a general expectation of their marriage. He spoke of it as a certain
-event, of which the time alone could be undecided. From that moment I
-observed my friend’s behaviour attentively; and I could then perceive
-that his partiality for Miss Bennet was beyond what I had ever witnessed
-in him. Your sister I also watched. Her look and manners were open,
-cheerful, and engaging as ever, but without any symptom of peculiar
-regard; and I remained convinced, from the evening’s scrutiny, that
-though she received his attentions with pleasure, she did not invite
-them by any participation of sentiment. If _you_ have not been mistaken
-here, _I_ must have been in an error. Your superior knowledge of your
-sister must make the latter probable. If it be so, if I have been misled
-by such error to inflict pain on her, your resentment has not been
-unreasonable. But I shall not scruple to assert, that the serenity of
-your sister’s countenance and air was such as might have given the most
-acute observer a conviction that, however amiable her temper, her heart
-was not likely to be easily touched. That I was desirous of believing
-her indifferent is certain; but I will venture to say that my
-investigations and decisions are not usually influenced by my hopes or
-fears. I did not believe her to be indifferent because I wished it; I
-believed it on impartial conviction, as truly as I wished it in reason.
-My objections to the marriage were not merely those which I last night
-acknowledged to have required the utmost force of passion to put aside
-in my own case; the want of connection could not be so great an evil to
-my friend as to me. But there were other causes of repugnance; causes
-which, though still existing, and existing to an equal degree in both
-instances, I had myself endeavoured to forget, because they were not
-immediately before me. These causes must be stated, though briefly. The
-situation of your mother’s family, though objectionable, was nothing in
-comparison of that total want of propriety so frequently, so almost
-uniformly betrayed by herself, by your three younger sisters, and
-occasionally even by your father:--pardon me,--it pains me to offend
-you. But amidst your concern for the defects of your nearest relations,
-and your displeasure at this representation of them, let it give you
-consolation to consider that to have conducted yourselves so as to avoid
-any share of the like censure is praise no less generally bestowed on
-you and your eldest sister than it is honourable to the sense and
-disposition of both. I will only say, farther, that from what passed
-that evening my opinion of all parties was confirmed, and every
-inducement heightened, which could have led me before to preserve my
-friend from what I esteemed a most unhappy connection. He left
-Netherfield for London on the day following, as you, I am certain,
-remember, with the design of soon returning. The part which I acted is
-now to be explained. His sisters’ uneasiness had been equally excited
-with my own: our coincidence of feeling was soon discovered; and, alike
-sensible that no time was to be lost in detaching their brother, we
-shortly resolved on joining him directly in London. We accordingly
-went--and there I readily engaged in the office of pointing out to my
-friend the certain evils of such a choice. I described and enforced them
-earnestly. But however this remonstrance might have staggered or delayed
-his determination, I do not suppose that it would ultimately have
-prevented the marriage, had it not been seconded by the assurance, which
-I hesitated not in giving, of your sister’s indifference. He had before
-believed her to return his affection with sincere, if not with equal,
-regard. But Bingley has great natural modesty, with a stronger
-dependence on my judgment than on his own. To convince him, therefore,
-that he had deceived himself was no very difficult point. To persuade
-him against returning into Hertfordshire, when that conviction had been
-given, was scarcely the work of a moment. I cannot blame myself for
-having done thus much. There is but one part of my conduct, in the whole
-affair, on which I do not reflect with satisfaction; it is that I
-condescended to adopt the measures of art so far as to conceal from him
-your sister’s being in town. I knew it myself, as it was known to Miss
-Bingley; but her brother is even yet ignorant of it. That they might
-have met without ill consequence is, perhaps, probable; but his regard
-did not appear to me enough extinguished for him to see her without some
-danger. Perhaps this concealment, this disguise, was beneath me. It is
-done, however, and it was done for the best. On this subject I have
-nothing more to say, no other apology to offer. If I have wounded your
-sister’s feelings, it was unknowingly done; and though the motives which
-governed me may to you very naturally appear insufficient, I have not
-yet learnt to condemn them.--With respect to that other, more weighty
-accusation, of having injured Mr. Wickham, I can only refute it by
-laying before you the whole of his connection with my family. Of what he
-has _particularly_ accused me I am ignorant; but of the truth of what I
-shall relate I can summon more than one witness of undoubted veracity.
-Mr. Wickham is the son of a very respectable man, who had for many years
-the management of all the Pemberley estates, and whose good conduct in
-the discharge of his trust naturally inclined my father to be of service
-to him; and on George Wickham, who was his godson, his kindness was
-therefore liberally bestowed. My father supported him at school, and
-afterwards at Cambridge; most important assistance, as his own father,
-always poor from the extravagance of his wife, would have been unable to
-give him a gentleman’s education. My father was not only fond of this
-young man’s society, whose manners were always engaging, he had also the
-highest opinion of him, and hoping the church would be his profession,
-intended to provide for him in it. As for myself, it is many, many years
-since I first began to think of him in a very different manner. The
-vicious propensities, the want of principle, which he was careful to
-guard from the knowledge of his best friend, could not escape the
-observation of a young man of nearly the same age with himself, and who
-had opportunities of seeing him in unguarded moments, which Mr. Darcy
-could not have. Here again I shall give you pain--to what degree you
-only can tell. But whatever may be the sentiments which Mr. Wickham has
-created, a suspicion of their nature shall not prevent me from unfolding
-his real character. It adds even another motive. My excellent father
-died about five years ago; and his attachment to Mr. Wickham was to the
-last so steady, that in his will he particularly recommended it to me to
-promote his advancement in the best manner that his profession might
-allow, and if he took orders, desired that a valuable family living
-might be his as soon as it became vacant. There was also a legacy of
-one thousand pounds. His own father did not long survive mine; and
-within half a year from these events Mr. Wickham wrote to inform me
-that, having finally resolved against taking orders, he hoped I should
-not think it unreasonable for him to expect some more immediate
-pecuniary advantage, in lieu of the preferment, by which he could not be
-benefited. He had some intention, he added, of studying the law, and I
-must be aware that the interest of one thousand pounds would be a very
-insufficient support therein. I rather wished than believed him to be
-sincere; but, at any rate, was perfectly ready to accede to his
-proposal. I knew that Mr. Wickham ought not to be a clergyman. The
-business was therefore soon settled. He resigned all claim to assistance
-in the church, were it possible that he could ever be in a situation to
-receive it, and accepted in return three thousand pounds. All connection
-between us seemed now dissolved. I thought too ill of him to invite him
-to Pemberley, or admit his society in town. In town, I believe, he
-chiefly lived, but his studying the law was a mere pretence; and being
-now free from all restraint, his life was a life of idleness and
-dissipation. For about three years I heard little of him; but on the
-decease of the incumbent of the living which had been designed for him,
-he applied to me again by letter for the presentation. His
-circumstances, he assured me, and I had no difficulty in believing it,
-were exceedingly bad. He had found the law a most unprofitable study,
-and was now absolutely resolved on being ordained, if I would present
-him to the living in question--of which he trusted there could be little
-doubt, as he was well assured that I had no other person to provide for,
-and I could not have forgotten my revered father’s intentions. You will
-hardly blame me for refusing to comply with this entreaty, or for
-resisting every repetition of it. His resentment was in proportion to
-the distress of his circumstances--and he was doubtless as violent in
-his abuse of me to others as in his reproaches to myself. After this
-period, every appearance of acquaintance was dropped. How he lived, I
-know not. But last summer he was again most painfully obtruded on my
-notice. I must now mention a circumstance which I would wish to forget
-myself, and which no obligation less than the present should induce me
-to unfold to any human being. Having said thus much, I feel no doubt of
-your secrecy. My sister, who is more than ten years my junior, was left
-to the guardianship of my mother’s nephew, Colonel Fitzwilliam, and
-myself. About a year ago, she was taken from school, and an
-establishment formed for her in London; and last summer she went with
-the lady who presided over it to Ramsgate; and thither also went Mr.
-Wickham, undoubtedly by design; for there proved to have been a prior
-acquaintance between him and Mrs. Younge, in whose character we were
-most unhappily deceived; and by her connivance and aid he so far
-recommended himself to Georgiana, whose affectionate heart retained a
-strong impression of his kindness to her as a child, that she was
-persuaded to believe herself in love and to consent to an elopement. She
-was then but fifteen, which must be her excuse; and after stating her
-imprudence, I am happy to add, that I owed the knowledge of it to
-herself. I joined them unexpectedly a day or two before the intended
-elopement; and then Georgiana, unable to support the idea of grieving
-and offending a brother whom she almost looked up to as a father,
-acknowledged the whole to me. You may imagine what I felt and how I
-acted. Regard for my sister’s credit and feelings prevented any public
-exposure; but I wrote to Mr. Wickham, who left the place immediately,
-and Mrs. Younge was of course removed from her charge. Mr. Wickham’s
-chief object was unquestionably my sister’s fortune, which is thirty
-thousand pounds; but I cannot help supposing that the hope of revenging
-himself on me was a strong inducement. His revenge would have been
-complete indeed. This, madam, is a faithful narrative of every event in
-which we have been concerned together; and if you do not absolutely
-reject it as false, you will, I hope, acquit me henceforth of cruelty
-towards Mr. Wickham. I know not in what manner, under what form of
-falsehood, he has imposed on you; but his success is not perhaps to be
-wondered at, ignorant as you previously were of everything concerning
-either. Detection could not be in your power, and suspicion certainly
-not in your inclination. You may possibly wonder why all this was not
-told you last night. But I was not then master enough of myself to know
-what could or ought to be revealed. For the truth of everything here
-related, I can appeal more particularly to the testimony of Colonel
-Fitzwilliam, who, from our near relationship and constant intimacy, and
-still more as one of the executors of my father’s will, has been
-unavoidably acquainted with every particular of these transactions. If
-your abhorrence of _me_ should make _my_ assertions valueless, you
-cannot be prevented by the same cause from confiding in my cousin; and
-that there may be the possibility of consulting him, I shall endeavour
-to find some opportunity of putting this letter in your hands in the
-course of the morning. I will only add, God bless you.
-
-“FITZWILLIAM DARCY.”
-
-
-
-
-[Illustration]
-
-
-
-
-CHAPTER XXXVI.
-
-
-[Illustration]
-
-Elizabeth, when Mr. Darcy gave her the letter, did not expect it to
-contain a renewal of his offers, she had formed no expectation at all of
-its contents. But such as they were, it may be well supposed how eagerly
-she went through them, and what a contrariety of emotion they excited.
-Her feelings as she read were scarcely to be defined. With amazement did
-she first understand that he believed any apology to be in his power;
-and steadfastly was she persuaded, that he could have no explanation to
-give, which a just sense of shame would not conceal. With a strong
-prejudice against everything he might say, she began his account of
-what had happened at Netherfield. She read with an eagerness which
-hardly left her power of comprehension; and from impatience of knowing
-what the next sentence might bring, was incapable of attending to the
-sense of the one before her eyes. His belief of her sister’s
-insensibility she instantly resolved to be false; and his account of the
-real, the worst objections to the match, made her too angry to have any
-wish of doing him justice. He expressed no regret for what he had done
-which satisfied her; his style was not penitent, but haughty. It was all
-pride and insolence.
-
-But when this subject was succeeded by his account of Mr. Wickham--when
-she read, with somewhat clearer attention, a relation of events which,
-if true, must overthrow every cherished opinion of his worth, and which
-bore so alarming an affinity to his own history of himself--her feelings
-were yet more acutely painful and more difficult of definition.
-Astonishment, apprehension, and even horror, oppressed her. She wished
-to discredit it entirely, repeatedly exclaiming, “This must be false!
-This cannot be! This must be the grossest falsehood!”--and when she had
-gone through the whole letter, though scarcely knowing anything of the
-last page or two, put it hastily away, protesting that she would not
-regard it, that she would never look in it again.
-
-In this perturbed state of mind, with thoughts that could rest on
-nothing, she walked on; but it would not do: in half a minute the letter
-was unfolded again; and collecting herself as well as she could, she
-again began the mortifying perusal of all that related to Wickham, and
-commanded herself so far as to examine the meaning of every sentence.
-The account of his connection with the Pemberley family was exactly
-what he had related himself; and the kindness of the late Mr. Darcy,
-though she had not before known its extent, agreed equally well with his
-own words. So far each recital confirmed the other; but when she came to
-the will, the difference was great. What Wickham had said of the living
-was fresh in her memory; and as she recalled his very words, it was
-impossible not to feel that there was gross duplicity on one side or the
-other, and, for a few moments, she flattered herself that her wishes did
-not err. But when she read and re-read, with the closest attention, the
-particulars immediately following of Wickham’s resigning all pretensions
-to the living, of his receiving in lieu so considerable a sum as three
-thousand pounds, again was she forced to hesitate. She put down the
-letter, weighed every circumstance with what she meant to be
-impartiality--deliberated on the probability of each statement--but with
-little success. On both sides it was only assertion. Again she read on.
-But every line proved more clearly that the affair, which she had
-believed it impossible that any contrivance could so represent as to
-render Mr. Darcy’s conduct in it less than infamous, was capable of a
-turn which must make him entirely blameless throughout the whole.
-
-The extravagance and general profligacy which he scrupled not to lay to
-Mr. Wickham’s charge exceedingly shocked her; the more so, as she could
-bring no proof of its injustice. She had never heard of him before his
-entrance into the ----shire militia, in which he had engaged at the
-persuasion of the young man, who, on meeting him accidentally in town,
-had there renewed a slight acquaintance. Of his former way of life,
-nothing had been known in Hertfordshire but what he told
-
-[Illustration:
-
-     “Meeting accidentally in Town”
-
-[_Copyright 1894 by George Allen._]]
-
-himself. As to his real character, had information been in her power,
-she had never felt a wish of inquiring. His countenance, voice, and
-manner, had established him at once in the possession of every virtue.
-She tried to recollect some instance of goodness, some distinguished
-trait of integrity or benevolence, that might rescue him from the
-attacks of Mr. Darcy; or at least, by the predominance of virtue, atone
-for those casual errors, under which she would endeavour to class what
-Mr. Darcy had described as the idleness and vice of many years’
-continuance. But no such recollection befriended her. She could see him
-instantly before her, in every charm of air and address, but she could
-remember no more substantial good than the general approbation of the
-neighbourhood, and the regard which his social powers had gained him in
-the mess. After pausing on this point a considerable while, she once
-more continued to read. But, alas! the story which followed, of his
-designs on Miss Darcy, received some confirmation from what had passed
-between Colonel Fitzwilliam and herself only the morning before; and at
-last she was referred for the truth of every particular to Colonel
-Fitzwilliam himself--from whom she had previously received the
-information of his near concern in all his cousin’s affairs and whose
-character she had no reason to question. At one time she had almost
-resolved on applying to him, but the idea was checked by the awkwardness
-of the application, and at length wholly banished by the conviction that
-Mr. Darcy would never have hazarded such a proposal, if he had not been
-well assured of his cousin’s corroboration.
-
-She perfectly remembered everything that had passed in conversation
-between Wickham and herself in their first evening at Mr. Philips’s.
-Many of his expressions were still fresh in her memory. She was _now_
-struck with the impropriety of such communications to a stranger, and
-wondered it had escaped her before. She saw the indelicacy of putting
-himself forward as he had done, and the inconsistency of his professions
-with his conduct. She remembered that he had boasted of having no fear
-of seeing Mr. Darcy--that Mr. Darcy might leave the country, but that
-_he_ should stand his ground; yet he had avoided the Netherfield ball
-the very next week. She remembered, also, that till the Netherfield
-family had quitted the country, he had told his story to no one but
-herself; but that after their removal, it had been everywhere discussed;
-that he had then no reserves, no scruples in sinking Mr. Darcy’s
-character, though he had assured her that respect for the father would
-always prevent his exposing the son.
-
-How differently did everything now appear in which he was concerned! His
-attentions to Miss King were now the consequence of views solely and
-hatefully mercenary; and the mediocrity of her fortune proved no longer
-the moderation of his wishes, but his eagerness to grasp at anything.
-His behaviour to herself could now have had no tolerable motive: he had
-either been deceived with regard to her fortune, or had been gratifying
-his vanity by encouraging the preference which she believed she had most
-incautiously shown. Every lingering struggle in his favour grew fainter
-and fainter; and in further justification of Mr. Darcy, she could not
-but allow that Mr. Bingley, when questioned by Jane, had long ago
-asserted his blamelessness in the affair;--that, proud and repulsive as
-were his manners, she had never, in the whole course of their
-acquaintance--an acquaintance which had latterly brought them much
-together, and given her a sort of intimacy with his ways--seen anything
-that betrayed him to be unprincipled or unjust--anything that spoke him
-of irreligious or immoral habits;--that among his own connections he was
-esteemed and valued;--that even Wickham had allowed him merit as a
-brother, and that she had often heard him speak so affectionately of his
-sister as to prove him capable of some amiable feeling;--that had his
-actions been what Wickham represented them, so gross a violation of
-everything right could hardly have been concealed from the world; and
-that friendship between a person capable of it and such an amiable man
-as Mr. Bingley was incomprehensible.
-
-She grew absolutely ashamed of herself. Of neither Darcy nor Wickham
-could she think, without feeling that she had been blind, partial,
-prejudiced, absurd.
-
-“How despicably have I acted!” she cried. “I, who have prided myself on
-my discernment! I, who have valued myself on my abilities! who have
-often disdained the generous candour of my sister, and gratified my
-vanity in useless or blameless distrust. How humiliating is this
-discovery! Yet, how just a humiliation! Had I been in love, I could not
-have been more wretchedly blind. But vanity, not love, has been my
-folly. Pleased with the preference of one, and offended by the neglect
-of the other, on the very beginning of our acquaintance, I have courted
-prepossession and ignorance, and driven reason away where either were
-concerned. Till this moment, I never knew myself.”
-
-From herself to Jane, from Jane to Bingley, her thoughts were in a line
-which soon brought to her recollection that Mr. Darcy’s explanation
-_there_ had appeared very insufficient; and she read it again. Widely
-different was the effect of a second perusal. How could she deny that
-credit to his assertions, in one instance, which she had been obliged to
-give in the other? He declared himself to have been totally unsuspicious
-of her sister’s attachment; and she could not help remembering what
-Charlotte’s opinion had always been. Neither could she deny the justice
-of his description of Jane. She felt that Jane’s feelings, though
-fervent, were little displayed, and that there was a constant
-complacency in her air and manner, not often united with great
-sensibility.
-
-When she came to that part of the letter in which her family were
-mentioned, in tones of such mortifying, yet merited, reproach, her sense
-of shame was severe. The justice of the charge struck her too forcibly
-for denial; and the circumstances to which he particularly alluded, as
-having passed at the Netherfield ball, and as confirming all his first
-disapprobation, could not have made a stronger impression on his mind
-than on hers.
-
-The compliment to herself and her sister was not unfelt. It soothed, but
-it could not console her for the contempt which had been thus
-self-attracted by the rest of her family; and as she considered that
-Jane’s disappointment had, in fact, been the work of her nearest
-relations, and reflected how materially the credit of both must be hurt
-by such impropriety of conduct, she felt depressed beyond anything she
-had ever known before.
-
-After wandering along the lane for two hours, giving way to every
-variety of thought, reconsidering events, determining probabilities, and
-reconciling herself, as well as she could, to a change so sudden and so
-important, fatigue, and a recollection of her long absence, made her at
-length return home; and she entered the house with the wish of appearing
-cheerful as usual, and the resolution of repressing such reflections as
-must make her unfit for conversation.
-
-She was immediately told, that the two gentlemen from Rosings had each
-called during her absence; Mr. Darcy, only for a few minutes, to take
-leave, but that Colonel Fitzwilliam had been sitting with them at least
-an hour, hoping for her return, and almost resolving to walk after her
-till she could be found. Elizabeth could but just _affect_ concern in
-missing him; she really rejoiced at it. Colonel Fitzwilliam was no
-longer an object. She could think only of her letter.
-
-
-
-
-[Illustration:
-
-“His parting obeisance”
-]
-
-
-
-
-CHAPTER XXXVII.
-
-
-[Illustration]
-
-The two gentlemen left Rosings the next morning; and Mr. Collins having
-been in waiting near the lodges, to make them his parting obeisance, was
-able to bring home the pleasing intelligence of their appearing in very
-good health, and in as tolerable spirits as could be expected, after the
-melancholy scene so lately gone through at Rosings. To Rosings he then
-hastened to console Lady Catherine and her daughter; and on his return
-brought back, with great satisfaction, a message from her Ladyship,
-importing that she felt herself so dull as to make her very desirous of
-having them all to dine with her.
-
-Elizabeth could not see Lady Catherine without recollecting that, had
-she chosen it, she might by this time have been presented to her as her
-future niece; nor could she think, without a smile, of what her
-Ladyship’s indignation would have been. “What would she have said? how
-would she have behaved?” were the questions with which she amused
-herself.
-
-Their first subject was the diminution of the Rosings’ party. “I assure
-you, I feel it exceedingly,” said Lady Catherine; “I believe nobody
-feels the loss of friends so much as I do. But I am particularly
-attached to these young men; and know them to be so much attached to me!
-They were excessively sorry to go! But so they always are. The dear
-Colonel rallied his spirits tolerably till just at last; but Darcy
-seemed to feel it most acutely--more, I think, than last year. His
-attachment to Rosings certainly increases.”
-
-Mr. Collins had a compliment and an allusion to throw in here, which
-were kindly smiled on by the mother and daughter.
-
-Lady Catherine observed, after dinner, that Miss Bennet seemed out of
-spirits; and immediately accounting for it herself, by supposing that
-she did not like to go home again so soon, she added,--
-
-“But if that is the case, you must write to your mother to beg that you
-may stay a little longer. Mrs. Collins will be very glad of your
-company, I am sure.”
-
-“I am much obliged to your Ladyship for your kind invitation,” replied
-Elizabeth; “but it is not in my power to accept it. I must be in town
-next Saturday.”
-
-“Why, at that rate, you will have been here only six weeks. I expected
-you to stay two months. I told Mrs. Collins so before you came. There
-can be no occasion for your going so soon. Mrs. Bennet could certainly
-spare you for another fortnight.”
-
-“But my father cannot. He wrote last week to hurry my return.”
-
-[Illustration:
-
-“Dawson”
-
-[_Copyright 1894 by George Allen._]]
-
-“Oh, your father, of course, may spare you, if your mother can.
-Daughters are never of so much consequence to a father. And if you will
-stay another _month_ complete, it will be in my power to take one of you
-as far as London, for I am going there early in June, for a week; and
-as Dawson does not object to the barouche-box, there will be very good
-room for one of you--and, indeed, if the weather should happen to be
-cool, I should not object to taking you both, as you are neither of you
-large.”
-
-“You are all kindness, madam; but I believe we must abide by our
-original plan.”
-
-Lady Catherine seemed resigned. “Mrs. Collins, you must send a servant
-with them. You know I always speak my mind, and I cannot bear the idea
-of two young women travelling post by themselves. It is highly improper.
-You must contrive to send somebody. I have the greatest dislike in the
-world to that sort of thing. Young women should always be properly
-guarded and attended, according to their situation in life. When my
-niece Georgiana went to Ramsgate last summer, I made a point of her
-having two men-servants go with her. Miss Darcy, the daughter of Mr.
-Darcy of Pemberley, and Lady Anne, could not have appeared with
-propriety in a different manner. I am excessively attentive to all those
-things. You must send John with the young ladies, Mrs. Collins. I am
-glad it occurred to me to mention it; for it would really be
-discreditable to _you_ to let them go alone.”
-
-“My uncle is to send a servant for us.”
-
-“Oh! Your uncle! He keeps a man-servant, does he? I am very glad you
-have somebody who thinks of those things. Where shall you change horses?
-Oh, Bromley, of course. If you mention my name at the Bell, you will be
-attended to.”
-
-Lady Catherine had many other questions to ask respecting their journey;
-and as she did not answer them all herself attention was
-necessary--which Elizabeth believed to be lucky for her; or, with a
-mind so occupied, she might have forgotten where she was. Reflection
-must be reserved for solitary hours: whenever she was alone, she gave
-way to it as the greatest relief; and not a day went by without a
-solitary walk, in which she might indulge in all the delight of
-unpleasant recollections.
-
-Mr. Darcy’s letter she was in a fair way of soon knowing by heart. She
-studied every sentence; and her feelings towards its writer were at
-times widely different. When she remembered the style of his address,
-she was still full of indignation: but when she considered how unjustly
-she had condemned and upbraided him, her anger was turned against
-herself; and his disappointed feelings became the object of compassion.
-His attachment excited gratitude, his general character respect: but she
-could not approve him; nor could she for a moment repent her refusal, or
-feel the slightest inclination ever to see him again. In her own past
-behaviour, there was a constant source of vexation and regret: and in
-the unhappy defects of her family, a subject of yet heavier chagrin.
-They were hopeless of remedy. Her father, contented with laughing at
-them, would never exert himself to restrain the wild giddiness of his
-youngest daughters; and her mother, with manners so far from right
-herself, was entirely insensible of the evil. Elizabeth had frequently
-united with Jane in an endeavour to check the imprudence of Catherine
-and Lydia; but while they were supported by their mother’s indulgence,
-what chance could there be of improvement? Catherine, weak-spirited,
-irritable, and completely under Lydia’s guidance, had been always
-affronted by their advice; and Lydia, self-willed and careless, would
-scarcely give them a hearing. They were ignorant, idle, and vain. While
-there was an officer in Meryton, they would flirt with him; and while
-Meryton was within a walk of Longbourn, they would be going there for
-ever.
-
-Anxiety on Jane’s behalf was another prevailing concern; and Mr. Darcy’s
-explanation, by restoring Bingley to all her former good opinion,
-heightened the sense of what Jane had lost. His affection was proved to
-have been sincere, and his conduct cleared of all blame, unless any
-could attach to the implicitness of his confidence in his friend. How
-grievous then was the thought that, of a situation so desirable in every
-respect, so replete with advantage, so promising for happiness, Jane had
-been deprived, by the folly and indecorum of her own family!
-
-When to these recollections was added the development of Wickham’s
-character, it may be easily believed that the happy spirits which had
-seldom been depressed before were now so much affected as to make it
-almost impossible for her to appear tolerably cheerful.
-
-Their engagements at Rosings were as frequent during the last week of
-her stay as they had been at first. The very last evening was spent
-there; and her Ladyship again inquired minutely into the particulars of
-their journey, gave them directions as to the best method of packing,
-and was so urgent on the necessity of placing gowns in the only right
-way, that Maria thought herself obliged, on her return, to undo all the
-work of the morning, and pack her trunk afresh.
-
-When they parted, Lady Catherine, with great condescension, wished them
-a good journey, and invited them to come to Hunsford again next year;
-and Miss de Bourgh exerted herself so far as to courtesy and hold out
-her hand to both.
-
-
-
-
-[Illustration:
-
-“The elevation of his feelings.”
-]
-
-
-
-
-CHAPTER XXXVIII.
-
-
-[Illustration]
-
-On Saturday morning Elizabeth and Mr. Collins met for breakfast a few
-minutes before the others appeared; and he took the opportunity of
-paying the parting civilities which he deemed indispensably necessary.
-
-“I know not, Miss Elizabeth,” said he, “whether Mrs. Collins has yet
-expressed her sense of your kindness in coming to us; but I am very
-certain you will not leave the house without receiving her thanks for
-it. The favour of your company has been much felt, I assure you. We know
-how little there is to tempt anyone to our humble abode. Our plain
-manner of living, our small rooms, and few domestics, and the little we
-see of the world, must make Hunsford extremely dull to a young lady like
-yourself; but I hope you will believe us grateful for the condescension,
-and that we have done everything in our power to prevent you spending
-your time unpleasantly.”
-
-Elizabeth was eager with her thanks and assurances of happiness. She had
-spent six weeks with great enjoyment; and the pleasure of being with
-Charlotte, and the kind attention she had received, must make _her_ feel
-the obliged. Mr. Collins was gratified; and with a more smiling
-solemnity replied,--
-
-“It gives me the greatest pleasure to hear that you have passed your
-time not disagreeably. We have certainly done our best; and most
-fortunately having it in our power to introduce you to very superior
-society, and from our connection with Rosings, the frequent means of
-varying the humble home scene, I think we may flatter ourselves that
-your Hunsford visit cannot have been entirely irksome. Our situation
-with regard to Lady Catherine’s family is, indeed, the sort of
-extraordinary advantage and blessing which few can boast. You see on
-what a footing we are. You see how continually we are engaged there. In
-truth, I must acknowledge, that, with all the disadvantages of this
-humble parsonage, I should not think anyone abiding in it an object of
-compassion, while they are sharers of our intimacy at Rosings.”
-
-Words were insufficient for the elevation of his feelings; and he was
-obliged to walk about the room, while Elizabeth tried to unite civility
-and truth in a few short sentences.
-
-“You may, in fact, carry a very favourable report of us into
-Hertfordshire, my dear cousin. I flatter myself, at least, that you will
-be able to do so. Lady Catherine’s great attentions to Mrs. Collins you
-have been a daily witness of; and altogether I trust it does not appear
-that your friend has drawn an unfortunate--but on this point it will be
-as well to be silent. Only let me assure you, my dear Miss Elizabeth,
-that I can from my heart most cordially wish you equal felicity in
-marriage. My dear Charlotte and I have but one mind and one way of
-thinking. There is in everything a most remarkable resemblance of
-character and ideas between us. We seem to have been designed for each
-other.”
-
-Elizabeth could safely say that it was a great happiness where that was
-the case, and with equal sincerity could add, that she firmly believed
-and rejoiced in his domestic comforts. She was not sorry, however, to
-have the recital of them interrupted by the entrance of the lady from
-whom they sprang. Poor Charlotte! it was melancholy to leave her to such
-society! But she had chosen it with her eyes open; and though evidently
-regretting that her visitors were to go, she did not seem to ask for
-compassion. Her home and her housekeeping, her parish and her poultry,
-and all their dependent concerns, had not yet lost their charms.
-
-At length the chaise arrived, the trunks were fastened on, the parcels
-placed within, and it was pronounced to be ready. After an affectionate
-parting between the friends, Elizabeth was attended to the carriage by
-Mr. Collins; and as they walked down the garden, he was commissioning
-her with his best respects to all her family, not forgetting his thanks
-for the kindness he had received at Longbourn in the winter, and his
-compliments to Mr. and Mrs. Gardiner, though unknown. He then handed
-her in, Maria followed, and the door was on the point of being closed,
-when he suddenly reminded them, with some consternation, that they had
-hitherto forgotten to leave any message for the ladies of Rosings.
-
-[Illustration:
-
-“They had forgotten to leave any message”
-]
-
-“But,” he added, “you will of course wish to have your humble respects
-delivered to them, with your grateful thanks for their kindness to you
-while you have been here.”
-
-Elizabeth made no objection: the door was then allowed to be shut, and
-the carriage drove off.
-
-“Good gracious!” cried Maria, after a few minutes’ silence, “it seems
-but a day or two since we first came! and yet how many things have
-happened!”
-
-“A great many indeed,” said her companion, with a sigh.
-
-“We have dined nine times at Rosings, besides drinking tea there twice!
-How much I shall have to tell!”
-
-Elizabeth privately added, “And how much I shall have to conceal!”
-
-Their journey was performed without much conversation, or any alarm; and
-within four hours of their leaving Hunsford they reached Mr. Gardiner’s
-house, where they were to remain a few days.
-
-Jane looked well, and Elizabeth had little opportunity of studying her
-spirits, amidst the various engagements which the kindness of her aunt
-had reserved for them. But Jane was to go home with her, and at
-Longbourn there would be leisure enough for observation.
-
-It was not without an effort, meanwhile, that she could wait even for
-Longbourn, before she told her sister of Mr. Darcy’s proposals. To know
-that she had the power of revealing what would so exceedingly astonish
-Jane, and must, at the same time, so highly gratify whatever of her own
-vanity she had not yet been able to reason away, was such a temptation
-to openness as nothing could have conquered, but the state of indecision
-in which she remained as to the extent of what she should communicate,
-and her fear, if she once entered on the subject, of being hurried into
-repeating something of Bingley, which might only grieve her sister
-further.
-
-
-
-
-[Illustration:
-
-     “How nicely we are crammed in”
-]
-
-
-
-
-CHAPTER XXXIX.
-
-
-[Illustration]
-
-It was the second week in May, in which the three young ladies set out
-together from Gracechurch Street for the town of ----, in Hertfordshire;
-and, as they drew near the appointed inn where Mr. Bennet’s carriage was
-to meet them, they quickly perceived, in token of the coachman’s
-punctuality, both Kitty and Lydia looking out of a dining-room upstairs.
-These two girls had been above an hour in the place, happily employed
-in visiting an opposite milliner, watching the sentinel on guard, and
-dressing a salad and cucumber.
-
-After welcoming their sisters, they triumphantly displayed a table set
-out with such cold meat as an inn larder usually affords, exclaiming,
-“Is not this nice? is not this an agreeable surprise?”
-
-“And we mean to treat you all,” added Lydia; “but you must lend us the
-money, for we have just spent ours at the shop out there.” Then showing
-her purchases,--“Look here, I have bought this bonnet. I do not think it
-is very pretty; but I thought I might as well buy it as not. I shall
-pull it to pieces as soon as I get home, and see if I can make it up any
-better.”
-
-And when her sisters abused it as ugly, she added, with perfect
-unconcern, “Oh, but there were two or three much uglier in the shop; and
-when I have bought some prettier-coloured satin to trim it with fresh, I
-think it will be very tolerable. Besides, it will not much signify what
-one wears this summer, after the ----shire have left Meryton, and they
-are going in a fortnight.”
-
-“Are they, indeed?” cried Elizabeth, with the greatest satisfaction.
-
-“They are going to be encamped near Brighton; and I do so want papa to
-take us all there for the summer! It would be such a delicious scheme,
-and I dare say would hardly cost anything at all. Mamma would like to
-go, too, of all things! Only think what a miserable summer else we shall
-have!”
-
-“Yes,” thought Elizabeth; “_that_ would be a delightful scheme, indeed,
-and completely do for us at once. Good Heaven! Brighton and a whole
-campful of soldiers, to us, who have been overset already by one poor
-regiment of militia, and the monthly balls of Meryton!”
-
-“Now I have got some news for you,” said Lydia, as they sat down to
-table. “What do you think? It is excellent news, capital news, and about
-a certain person that we all like.”
-
-Jane and Elizabeth looked at each other, and the waiter was told that he
-need not stay. Lydia laughed, and said,--
-
-“Ay, that is just like your formality and discretion. You thought the
-waiter must not hear, as if he cared! I dare say he often hears worse
-things said than I am going to say. But he is an ugly fellow! I am glad
-he is gone. I never saw such a long chin in my life. Well, but now for
-my news: it is about dear Wickham; too good for the waiter, is not it?
-There is no danger of Wickham’s marrying Mary King--there’s for you! She
-is gone down to her uncle at Liverpool; gone to stay. Wickham is safe.”
-
-“And Mary King is safe!” added Elizabeth; “safe from a connection
-imprudent as to fortune.”
-
-“She is a great fool for going away, if she liked him.”
-
-“But I hope there is no strong attachment on either side,” said Jane.
-
-“I am sure there is not on _his_. I will answer for it, he never cared
-three straws about her. Who _could_ about such a nasty little freckled
-thing?”
-
-Elizabeth was shocked to think that, however incapable of such
-coarseness of _expression_ herself, the coarseness of the _sentiment_
-was little other than her own breast had formerly harboured and fancied
-liberal!
-
-As soon as all had ate, and the elder ones paid, the carriage was
-ordered; and, after some contrivance, the whole party, with all their
-boxes, workbags, and parcels, and the unwelcome addition of Kitty’s and
-Lydia’s purchases, were seated in it.
-
-“How nicely we are crammed in!” cried Lydia. “I am glad I brought my
-bonnet, if it is only for the fun of having another band-box! Well, now
-let us be quite comfortable and snug, and talk and laugh all the way
-home. And in the first place, let us hear what has happened to you all
-since you went away. Have you seen any pleasant men? Have you had any
-flirting? I was in great hopes that one of you would have got a husband
-before you came back. Jane will be quite an old maid soon, I declare.
-She is almost three-and-twenty! Lord! how ashamed I should be of not
-being married before three-and-twenty! My aunt Philips wants you so to
-get husbands you can’t think. She says Lizzy had better have taken Mr.
-Collins; but _I_ do not think there would have been any fun in it. Lord!
-how I should like to be married before any of you! and then I would
-_chaperon_ you about to all the balls. Dear me! we had such a good piece
-of fun the other day at Colonel Forster’s! Kitty and me were to spend
-the day there, and Mrs. Forster promised to have a little dance in the
-evening; (by-the-bye, Mrs. Forster and me are _such_ friends!) and so
-she asked the two Harringtons to come: but Harriet was ill, and so Pen
-was forced to come by herself; and then, what do you think we did? We
-dressed up Chamberlayne in woman’s clothes, on purpose to pass for a
-lady,--only think what fun! Not a soul knew of it, but Colonel and Mrs.
-Forster, and Kitty and me, except my aunt, for we were forced to borrow
-one of her gowns; and you cannot imagine how well he looked! When Denny,
-and Wickham, and Pratt, and two or three more of the men came in, they
-did not know him in the least. Lord! how I laughed! and so did Mrs.
-Forster. I thought I should have died. And _that_ made the men suspect
-something, and then they soon found out what was the matter.”
-
-With such kind of histories of their parties and good jokes did Lydia,
-assisted by Kitty’s hints and additions, endeavour to amuse her
-companions all the way to Longbourn. Elizabeth listened as little as she
-could, but there was no escaping the frequent mention of Wickham’s name.
-
-Their reception at home was most kind. Mrs. Bennet rejoiced to see Jane
-in undiminished beauty; and more than once during dinner did Mr. Bennet
-say voluntarily to Elizabeth,----
-
-“I am glad you are come back, Lizzy.”
-
-Their party in the dining-room was large, for almost all the Lucases
-came to meet Maria and hear the news; and various were the subjects
-which occupied them: Lady Lucas was inquiring of Maria, across the
-table, after the welfare and poultry of her eldest daughter; Mrs. Bennet
-was doubly engaged, on one hand collecting an account of the present
-fashions from Jane, who sat some way below her, and on the other,
-retailing them all to the younger Miss Lucases; and Lydia, in a voice
-rather louder than any other person’s, was enumerating the various
-pleasures of the morning to anybody who would hear her.
-
-“Oh, Mary,” said she, “I wish you had gone with us, for we had such fun!
-as we went along Kitty and me drew up all the blinds, and pretended
-there was nobody in the coach; and I should have gone so all the way, if
-Kitty had not been sick; and when we got to the George, I do think we
-behaved very handsomely, for we treated the other three with the nicest
-cold luncheon in the world, and if you would have gone, we would have
-treated you too. And then when we came away it was such fun! I thought
-we never should have got into the coach. I was ready to die of laughter.
-And then we were so merry all the way home! we talked and laughed so
-loud, that anybody might have heard us ten miles off!”
-
-To this, Mary very gravely replied, “Far be it from me, my dear sister,
-to depreciate such pleasures. They would doubtless be congenial with the
-generality of female minds. But I confess they would have no charms for
-_me_. I should infinitely prefer a book.”
-
-But of this answer Lydia heard not a word. She seldom listened to
-anybody for more than half a minute, and never attended to Mary at all.
-
-In the afternoon Lydia was urgent with the rest of the girls to walk to
-Meryton, and see how everybody went on; but Elizabeth steadily opposed
-the scheme. It should not be said, that the Miss Bennets could not be at
-home half a day before they were in pursuit of the officers. There was
-another reason, too, for her opposition. She dreaded seeing Wickham
-again, and was resolved to avoid it as long as possible. The comfort to
-_her_, of the regiment’s approaching removal, was indeed beyond
-expression. In a fortnight they were to go, and once gone, she hoped
-there could be nothing more to plague her on his account.
-
-She had not been many hours at home, before she found that the Brighton
-scheme, of which Lydia had given them a hint at the inn, was under
-frequent discussion between her parents. Elizabeth saw directly that her
-father had not the smallest intention of yielding; but his answers were
-at the same time so vague and equivocal, that her mother, though often
-disheartened, had never yet despaired of succeeding at last.
-
-
-
-
-[Illustration]
-
-
-
-
-CHAPTER XL.
-
-
-[Illustration]
-
-Elizabeth’s impatience to acquaint Jane with what had happened could no
-longer be overcome; and at length resolving to suppress every particular
-in which her sister was concerned, and preparing her to be surprised,
-she related to her the next morning the chief of the scene between Mr.
-Darcy and herself.
-
-Miss Bennet’s astonishment was soon lessened by the strong sisterly
-partiality which made any admiration of Elizabeth appear perfectly
-natural; and all surprise was shortly lost in other feelings. She was
-sorry that Mr. Darcy should have delivered his sentiments in a manner so
-little suited to recommend them; but still more was she grieved for the
-unhappiness which her sister’s refusal must have given him.
-
-“His being so sure of succeeding was wrong,” said she, “and certainly
-ought not to have appeared; but consider how much it must increase his
-disappointment.”
-
-“Indeed,” replied Elizabeth, “I am heartily sorry for him; but he has
-other feelings which will probably soon drive away his regard for me.
-You do not blame me, however, for refusing him?”
-
-“Blame you! Oh, no.”
-
-“But you blame me for having spoken so warmly of Wickham?”
-
-“No--I do not know that you were wrong in saying what you did.”
-
-“But you _will_ know it, when I have told you what happened the very
-next day.”
-
-She then spoke of the letter, repeating the whole of its contents as far
-as they concerned George Wickham. What a stroke was this for poor Jane,
-who would willingly have gone through the world without believing that
-so much wickedness existed in the whole race of mankind as was here
-collected in one individual! Nor was Darcy’s vindication, though
-grateful to her feelings, capable of consoling her for such discovery.
-Most earnestly did she labour to prove the probability of error, and
-seek to clear one, without involving the other.
-
-“This will not do,” said Elizabeth; “you never will be able to make both
-of them good for anything. Take your choice, but you must be satisfied
-with only one. There is but such a quantity of merit between them; just
-enough to make one good sort of man; and of late it has been shifting
-about pretty much. For my part, I am inclined to believe it all Mr.
-Darcy’s, but you shall do as you choose.”
-
-It was some time, however, before a smile could be extorted from Jane.
-
-“I do not know when I have been more shocked,” said she. “Wickham so
-very bad! It is almost past belief. And poor Mr. Darcy! dear Lizzy,
-only consider what he must have suffered. Such a disappointment! and
-with the knowledge of your ill opinion too! and having to relate such a
-thing of his sister! It is really too distressing, I am sure you must
-feel it so.”
-
-“Oh no, my regret and compassion are all done away by seeing you so full
-of both. I know you will do him such ample justice, that I am growing
-every moment more unconcerned and indifferent. Your profusion makes me
-saving; and if you lament over him much longer, my heart will be as
-light as a feather.”
-
-“Poor Wickham! there is such an expression of goodness in his
-countenance! such an openness and gentleness in his manner.”
-
-“There certainly was some great mismanagement in the education of those
-two young men. One has got all the goodness, and the other all the
-appearance of it.”
-
-“I never thought Mr. Darcy so deficient in the _appearance_ of it as you
-used to do.”
-
-“And yet I meant to be uncommonly clever in taking so decided a dislike
-to him, without any reason. It is such a spur to one’s genius, such an
-opening for wit, to have a dislike of that kind. One may be continually
-abusive without saying anything just; but one cannot be always laughing
-at a man without now and then stumbling on something witty.”
-
-“Lizzy, when you first read that letter, I am sure you could not treat
-the matter as you do now.”
-
-“Indeed, I could not. I was uncomfortable enough, I was very
-uncomfortable--I may say unhappy. And with no one to speak to of what I
-felt, no Jane to comfort me, and say that I had not been so very weak,
-and vain, and nonsensical, as I knew I had! Oh, how I wanted you!”
-
-“How unfortunate that you should have used such very strong expressions
-in speaking of Wickham to Mr. Darcy, for now they _do_ appear wholly
-undeserved.”
-
-“Certainly. But the misfortune of speaking with bitterness is a most
-natural consequence of the prejudices I had been encouraging. There is
-one point on which I want your advice. I want to be told whether I
-ought, or ought not, to make our acquaintance in general understand
-Wickham’s character.”
-
-Miss Bennet paused a little, and then replied, “Surely there can be no
-occasion for exposing him so dreadfully. What is your own opinion?”
-
-“That it ought not to be attempted. Mr. Darcy has not authorized me to
-make his communication public. On the contrary, every particular
-relative to his sister was meant to be kept as much as possible to
-myself; and if I endeavour to undeceive people as to the rest of his
-conduct, who will believe me? The general prejudice against Mr. Darcy is
-so violent, that it would be the death of half the good people in
-Meryton, to attempt to place him in an amiable light. I am not equal to
-it. Wickham will soon be gone; and, therefore, it will not signify to
-anybody here what he really is. Some time hence it will be all found
-out, and then we may laugh at their stupidity in not knowing it before.
-At present I will say nothing about it.”
-
-“You are quite right. To have his errors made public might ruin him for
-ever. He is now, perhaps, sorry for what he has done, and anxious to
-re-establish a character. We must not make him desperate.”
-
-The tumult of Elizabeth’s mind was allayed by this conversation. She
-had got rid of two of the secrets which had weighed on her for a
-fortnight, and was certain of a willing listener in Jane, whenever she
-might wish to talk again of either. But there was still something
-lurking behind, of which prudence forbade the disclosure. She dared not
-relate the other half of Mr. Darcy’s letter, nor explain to her sister
-how sincerely she had been valued by his friend. Here was knowledge in
-which no one could partake; and she was sensible that nothing less than
-a perfect understanding between the parties could justify her in
-throwing off this last encumbrance of mystery. “And then,” said she, “if
-that very improbable event should ever take place, I shall merely be
-able to tell what Bingley may tell in a much more agreeable manner
-himself. The liberty of communication cannot be mine till it has lost
-all its value!”
-
-She was now, on being settled at home, at leisure to observe the real
-state of her sister’s spirits. Jane was not happy. She still cherished a
-very tender affection for Bingley. Having never even fancied herself in
-love before, her regard had all the warmth of first attachment, and from
-her age and disposition, greater steadiness than first attachments often
-boast; and so fervently did she value his remembrance, and prefer him to
-every other man, that all her good sense, and all her attention to the
-feelings of her friends, were requisite to check the indulgence of those
-regrets which must have been injurious to her own health and their
-tranquillity.
-
-“Well, Lizzy,” said Mrs. Bennet, one day, “what is your opinion _now_ of
-this sad business of Jane’s? For my part, I am determined never to speak
-of it again to anybody. I told my sister Philips so the other day. But I
-cannot find out that Jane saw anything of him in London. Well, he is a
-very undeserving young man--and I do not suppose there is the least
-chance in the world of her ever getting him now. There is no talk of his
-coming to Netherfield again in the summer; and I have inquired of
-everybody, too, who is likely to know.”
-
-[Illustration:
-
-     “I am determined never to speak of it again”
-]
-
-“I do not believe that he will ever live at Netherfield any more.”
-
-“Oh, well! it is just as he chooses. Nobody wants him to come; though I
-shall always say that he used my daughter extremely ill; and, if I was
-her, I would not have put up with it. Well, my comfort is, I am sure
-Jane will die of a broken heart, and then he will be sorry for what he
-has done.”
-
-But as Elizabeth could not receive comfort from any such expectation she
-made no answer.
-
-“Well, Lizzy,” continued her mother, soon afterwards, “and so the
-Collinses live very comfortable, do they? Well, well, I only hope it
-will last. And what sort of table do they keep? Charlotte is an
-excellent manager, I dare say. If she is half as sharp as her mother,
-she is saving enough. There is nothing extravagant in _their_
-housekeeping, I dare say.”
-
-“No, nothing at all.”
-
-“A great deal of good management, depend upon it. Yes, yes. _They_ will
-take care not to outrun their income. _They_ will never be distressed
-for money. Well, much good may it do them! And so, I suppose, they often
-talk of having Longbourn when your father is dead. They look upon it
-quite as their own, I dare say, whenever that happens.”
-
-“It was a subject which they could not mention before me.”
-
-“No; it would have been strange if they had. But I make no doubt they
-often talk of it between themselves. Well, if they can be easy with an
-estate that is not lawfully their own, so much the better. _I_ should be
-ashamed of having one that was only entailed on me.”
-
-
-
-
-[Illustration:
-
-“When Colonel Miller’s regiment went away”
-
-[_Copyright 1894 by George Allen._]]
-
-
-
-
-CHAPTER XLI.
-
-
-[Illustration]
-
-The first week of their return was soon gone. The second began. It was
-the last of the regiment’s stay in Meryton, and all the young ladies in
-the neighbourhood were drooping apace. The dejection was almost
-universal. The elder Miss Bennets alone were still able to eat, drink,
-and sleep, and pursue the usual course of their employments. Very
-frequently were they reproached for this insensibility by Kitty and
-Lydia, whose own misery was extreme, and who could not comprehend such
-hard-heartedness in any of the family.
-
-“Good Heaven! What is to become of us? What are we to do?” would they
-often exclaim in the bitterness of woe. “How can you be smiling so,
-Lizzy?”
-
-Their affectionate mother shared all their grief; she remembered what
-she had herself endured on a similar occasion five-and-twenty years ago.
-
-“I am sure,” said she, “I cried for two days together when Colonel
-Miller’s regiment went away. I thought I should have broke my heart.”
-
-“I am sure I shall break _mine_,” said Lydia.
-
-“If one could but go to Brighton!” observed Mrs. Bennet.
-
-“Oh yes!--if one could but go to Brighton! But papa is so disagreeable.”
-
-“A little sea-bathing would set me up for ever.”
-
-“And my aunt Philips is sure it would do _me_ a great deal of good,”
-added Kitty.
-
-Such were the kind of lamentations resounding perpetually through
-Longbourn House. Elizabeth tried to be diverted by them; but all sense
-of pleasure was lost in shame. She felt anew the justice of Mr. Darcy’s
-objections; and never had she before been so much disposed to pardon his
-interference in the views of his friend.
-
-But the gloom of Lydia’s prospect was shortly cleared away; for she
-received an invitation from Mrs. Forster, the wife of the colonel of the
-regiment, to accompany her to Brighton. This invaluable friend was a
-very young woman, and very lately married. A resemblance in good-humour
-and good spirits had recommended her and Lydia to each other, and out of
-their _three_ months’ acquaintance they had been intimate _two_.
-
-The rapture of Lydia on this occasion, her adoration of Mrs. Forster,
-the delight of Mrs. Bennet, and the mortification of Kitty, are scarcely
-to be described. Wholly inattentive to her sister’s feelings, Lydia flew
-about the house in restless ecstasy, calling for everyone’s
-congratulations, and laughing and talking with more violence than ever;
-whilst the luckless Kitty continued in the parlour repining at her fate
-in terms as unreasonable as her accent was peevish.
-
-“I cannot see why Mrs. Forster should not ask _me_ as well as Lydia,”
-said she, “though I am _not_ her particular friend. I have just as much
-right to be asked as she has, and more too, for I am two years older.”
-
-In vain did Elizabeth attempt to make her reasonable, and Jane to make
-her resigned. As for Elizabeth herself, this invitation was so far from
-exciting in her the same feelings as in her mother and Lydia, that she
-considered it as the death-warrant of all possibility of common sense
-for the latter; and detestable as such a step must make her, were it
-known, she could not help secretly advising her father not to let her
-go. She represented to him all the improprieties of Lydia’s general
-behaviour, the little advantage she could derive from the friendship of
-such a woman as Mrs. Forster, and the probability of her being yet more
-imprudent with such a companion at Brighton, where the temptations must
-be greater than at home. He heard her attentively, and then said,--
-
-“Lydia will never be easy till she has exposed herself in some public
-place or other, and we can never expect her to do it with so little
-expense or inconvenience to her family as under the present
-circumstances.”
-
-“If you were aware,” said Elizabeth, “of the very great disadvantage to
-us all, which must arise from the public notice of Lydia’s unguarded and
-imprudent manner, nay, which has already arisen from it, I am sure you
-would judge differently in the affair.”
-
-“Already arisen!” repeated Mr. Bennet. “What! has she frightened away
-some of your lovers? Poor little Lizzy! But do not be cast down. Such
-squeamish youths as cannot bear to be connected with a little absurdity
-are not worth a regret. Come, let me see the list of the pitiful fellows
-who have been kept aloof by Lydia’s folly.”
-
-“Indeed, you are mistaken. I have no such injuries to resent. It is not
-of peculiar, but of general evils, which I am now complaining. Our
-importance, our respectability in the world, must be affected by the
-wild volatility, the assurance and disdain of all restraint which mark
-Lydia’s character. Excuse me,--for I must speak plainly. If you, my dear
-father, will not take the trouble of checking her exuberant spirits, and
-of teaching her that her present pursuits are not to be the business of
-her life, she will soon be beyond the reach of amendment. Her character
-will be fixed; and she will, at sixteen, be the most determined flirt
-that ever made herself and her family ridiculous;--a flirt, too, in the
-worst and meanest degree of flirtation; without any attraction beyond
-youth and a tolerable person; and, from the ignorance and emptiness of
-her mind, wholly unable to ward off any portion of that universal
-contempt which her rage for admiration will excite. In this danger Kitty
-is also comprehended. She will follow wherever Lydia leads. Vain,
-ignorant, idle, and absolutely uncontrolled! Oh, my dear father, can you
-suppose it possible that they will not be censured and despised wherever
-they are known, and that their sisters will not be often involved in the
-disgrace?”
-
-Mr. Bennet saw that her whole heart was in the subject; and,
-affectionately taking her hand, said, in reply,--
-
-“Do not make yourself uneasy, my love. Wherever you and Jane are known,
-you must be respected and valued; and you will not appear to less
-advantage for having a couple of--or I may say, three--very silly
-sisters. We shall have no peace at Longbourn if Lydia does not go to
-Brighton. Let her go, then. Colonel Forster is a sensible man, and will
-keep her out of any real mischief; and she is luckily too poor to be an
-object of prey to anybody. At Brighton she will be of less importance
-even as a common flirt than she has been here. The officers will find
-women better worth their notice. Let us hope, therefore, that her being
-there may teach her her own insignificance. At any rate, she cannot grow
-many degrees worse, without authorizing us to lock her up for the rest
-of her life.”
-
-With this answer Elizabeth was forced to be content; but her own opinion
-continued the same, and she left him disappointed and sorry. It was not
-in her nature, however, to increase her vexations by dwelling on them.
-She was confident of having performed her duty; and to fret over
-unavoidable evils, or augment them by anxiety, was no part of her
-disposition.
-
-Had Lydia and her mother known the substance of her conference with her
-father, their indignation would hardly have found expression in their
-united volubility. In Lydia’s imagination, a visit to Brighton comprised
-every possibility of earthly happiness. She saw, with the creative eye
-of fancy, the streets of that gay bathing-place covered with officers.
-She saw herself the object of attention to tens and to scores of them at
-present unknown. She saw all the glories of the camp: its tents
-stretched forth in beauteous uniformity of lines, crowded with the young
-and the gay, and dazzling with scarlet; and, to complete the view, she
-saw herself seated beneath a tent, tenderly flirting with at least six
-officers at once.
-
-[Illustration:
-
-“Tenderly flirting”
-
-[_Copyright 1894 by George Allen._]]
-
-Had she known that her sister sought to tear her from such prospects and
-such realities as these, what would have been her sensations? They could
-have been understood only by her mother, who might have felt nearly the
-same. Lydia’s going to Brighton was all that consoled her for the
-melancholy conviction of her husband’s never intending to go there
-himself.
-
-But they were entirely ignorant of what had passed; and their raptures
-continued, with little intermission, to the very day of Lydia’s leaving
-home.
-
-Elizabeth was now to see Mr. Wickham for the last time. Having been
-frequently in company with him since her return, agitation was pretty
-well over; the agitations of former partiality entirely so. She had even
-learnt to detect, in the very gentleness which had first delighted her,
-an affectation and a sameness to disgust and weary. In his present
-behaviour to herself, moreover, she had a fresh source of displeasure;
-for the inclination he soon testified of renewing those attentions which
-had marked the early part of their acquaintance could only serve, after
-what had since passed, to provoke her. She lost all concern for him in
-finding herself thus selected as the object of such idle and frivolous
-gallantry; and while she steadily repressed it, could not but feel the
-reproof contained in his believing, that however long, and for whatever
-cause, his attentions had been withdrawn, her vanity would be gratified,
-and her preference secured, at any time, by their renewal.
-
-On the very last day of the regiment’s remaining in Meryton, he dined,
-with others of the officers, at Longbourn; and so little was Elizabeth
-disposed to part from him in good-humour, that, on his making some
-inquiry as to the manner in which her time had passed at Hunsford, she
-mentioned Colonel Fitzwilliam’s and Mr. Darcy’s having both spent three
-weeks at Rosings, and asked him if he were acquainted with the former.
-
-He looked surprised, displeased, alarmed; but, with a moment’s
-recollection, and a returning smile, replied, that he had formerly seen
-him often; and, after observing that he was a very gentlemanlike man,
-asked her how she had liked him. Her answer was warmly in his favour.
-With an air of indifference, he soon afterwards added, “How long did you
-say that he was at Rosings?”
-
-“Nearly three weeks.”
-
-“And you saw him frequently?”
-
-“Yes, almost every day.”
-
-“His manners are very different from his cousin’s.”
-
-“Yes, very different; but I think Mr. Darcy improves on acquaintance.”
-
-“Indeed!” cried Wickham, with a look which did not escape her. “And pray
-may I ask--” but checking himself, he added, in a gayer tone, “Is it in
-address that he improves? Has he deigned to add aught of civility to his
-ordinary style? for I dare not hope,” he continued, in a lower and more
-serious tone, “that he is improved in essentials.”
-
-“Oh, no!” said Elizabeth. “In essentials, I believe, he is very much
-what he ever was.”
-
-While she spoke, Wickham looked as if scarcely knowing whether to
-rejoice over her words or to distrust their meaning. There was a
-something in her countenance which made him listen with an apprehensive
-and anxious attention, while she added,--
-
-“When I said that he improved on acquaintance, I did not mean that
-either his mind or manners were in a state of improvement; but that,
-from knowing him better, his disposition was better understood.”
-
-Wickham’s alarm now appeared in a heightened complexion and agitated
-look; for a few minutes he was silent; till, shaking off his
-embarrassment, he turned to her again, and said in the gentlest of
-accents,--
-
-“You, who so well know my feelings towards Mr. Darcy, will readily
-comprehend how sincerely I must rejoice that he is wise enough to assume
-even the _appearance_ of what is right. His pride, in that direction,
-may be of service, if not to himself, to many others, for it must deter
-him from such foul misconduct as I have suffered by. I only fear that
-the sort of cautiousness to which you, I imagine, have been alluding, is
-merely adopted on his visits to his aunt, of whose good opinion and
-judgment he stands much in awe. His fear of her has always operated, I
-know, when they were together; and a good deal is to be imputed to his
-wish of forwarding the match with Miss de Bourgh, which I am certain he
-has very much at heart.”
-
-Elizabeth could not repress a smile at this, but she answered only by a
-slight inclination of the head. She saw that he wanted to engage her on
-the old subject of his grievances, and she was in no humour to indulge
-him. The rest of the evening passed with the _appearance_, on his side,
-of usual cheerfulness, but with no further attempt to distinguish
-Elizabeth; and they parted at last with mutual civility, and possibly a
-mutual desire of never meeting again.
-
-When the party broke up, Lydia returned with Mrs. Forster to Meryton,
-from whence they were to set out early the next morning. The separation
-between her and her family was rather noisy than pathetic. Kitty was the
-only one who shed tears; but she did weep from vexation and envy. Mrs.
-Bennet was diffuse in her good wishes for the felicity of her daughter,
-and impressive in her injunctions that she would not miss the
-opportunity of enjoying herself as much as possible,--advice which there
-was every reason to believe would be attended to; and, in the clamorous
-happiness of Lydia herself in bidding farewell, the more gentle adieus
-of her sisters were uttered without being heard.
-
-
-
-
-[Illustration:
-
-The arrival of the
-Gardiners
-]
-
-
-
-
-CHAPTER XLII.
-
-
-[Illustration]
-
-Had Elizabeth’s opinion been all drawn from her own family, she could
-not have formed a very pleasing picture of conjugal felicity or domestic
-comfort. Her father, captivated by youth and beauty, and that appearance
-of good-humour which youth and beauty generally give, had married a
-woman whose weak understanding and illiberal mind had very early in
-their marriage put an end to all real affection for her. Respect,
-esteem, and confidence had vanished for ever; and all his views of
-domestic happiness were overthrown. But Mr. Bennet was not of a
-disposition to seek comfort for the disappointment which his own
-imprudence had brought on in any of those pleasures which too often
-console the unfortunate for their folly or their vice. He was fond of
-the country and of books; and from these tastes had arisen his principal
-enjoyments. To his wife he was very little otherwise indebted than as
-her ignorance and folly had contributed to his amusement. This is not
-the sort of happiness which a man would in general wish to owe to his
-wife; but where other powers of entertainment are wanting, the true
-philosopher will derive benefit from such as are given.
-
-Elizabeth, however, had never been blind to the impropriety of her
-father’s behaviour as a husband. She had always seen it with pain; but
-respecting his abilities, and grateful for his affectionate treatment of
-herself, she endeavoured to forget what she could not overlook, and to
-banish from her thoughts that continual breach of conjugal obligation
-and decorum which, in exposing his wife to the contempt of her own
-children, was so highly reprehensible. But she had never felt so
-strongly as now the disadvantages which must attend the children of so
-unsuitable a marriage, nor ever been so fully aware of the evils arising
-from so ill-judged a direction of talents--talents which, rightly used,
-might at least have preserved the respectability of his daughters, even
-if incapable of enlarging the mind of his wife.
-
-When Elizabeth had rejoiced over Wickham’s departure, she found little
-other cause for satisfaction in the loss of the regiment. Their parties
-abroad were less varied than before; and at home she had a mother and
-sister, whose constant repinings at the dulness of everything around
-them threw a real gloom over their domestic circle; and, though Kitty
-might in time regain her natural degree of sense, since the disturbers
-of her brain were removed, her other sister, from whose disposition
-greater evil might be apprehended, was likely to be hardened in all her
-folly and assurance, by a situation of such double danger as a
-watering-place and a camp. Upon the whole, therefore, she found, what
-has been sometimes found before, that an event to which she had looked
-forward with impatient desire, did not, in taking place, bring all the
-satisfaction she had promised herself. It was consequently necessary to
-name some other period for the commencement of actual felicity; to have
-some other point on which her wishes and hopes might be fixed, and by
-again enjoying the pleasure of anticipation, console herself for the
-present, and prepare for another disappointment. Her tour to the Lakes
-was now the object of her happiest thoughts: it was her best consolation
-for all the uncomfortable hours which the discontentedness of her mother
-and Kitty made inevitable; and could she have included Jane in the
-scheme, every part of it would have been perfect.
-
-“But it is fortunate,” thought she, “that I have something to wish for.
-Were the whole arrangement complete, my disappointment would be certain.
-But here, by carrying with me one ceaseless source of regret in my
-sister’s absence, I may reasonably hope to have all my expectations of
-pleasure realized. A scheme of which every part promises delight can
-never be successful; and general disappointment is only warded off by
-the defence of some little peculiar vexation.”
-
-When Lydia went away she promised to write very often and very minutely
-to her mother and Kitty; but her letters were always long expected, and
-always very short. Those to her mother contained little else than that
-they were just returned from the library, where such and such officers
-had attended them, and where she had seen such beautiful ornaments as
-made her quite wild; that she had a new gown, or a new parasol, which
-she would have described more fully, but was obliged to leave off in a
-violent hurry, as Mrs. Forster called her, and they were going to the
-camp; and from her correspondence with her sister there was still less
-to be learnt, for her letters to Kitty, though rather longer, were much
-too full of lines under the words to be made public.
-
-After the first fortnight or three weeks of her absence, health,
-good-humour, and cheerfulness began to reappear at Longbourn. Everything
-wore a happier aspect. The families who had been in town for the winter
-came back again, and summer finery and summer engagements arose. Mrs.
-Bennet was restored to her usual querulous serenity; and by the middle
-of June Kitty was so much recovered as to be able to enter Meryton
-without tears,--an event of such happy promise as to make Elizabeth
-hope, that by the following Christmas she might be so tolerably
-reasonable as not to mention an officer above once a day, unless, by
-some cruel and malicious arrangement at the War Office, another regiment
-should be quartered in Meryton.
-
-The time fixed for the beginning of their northern tour was now fast
-approaching; and a fortnight only was wanting of it, when a letter
-arrived from Mrs. Gardiner, which at once delayed its commencement and
-curtailed its extent. Mr. Gardiner would be prevented by business from
-setting out till a fortnight later in July, and must be in London again
-within a month; and as that left too short a period for them to go so
-far, and see so much as they had proposed, or at least to see it with
-the leisure and comfort they had built on, they were obliged to give up
-the Lakes, and substitute a more contracted tour; and, according to the
-present plan, were to go no farther northward than Derbyshire. In that
-county there was enough to be seen to occupy the chief of their three
-weeks; and to Mrs. Gardiner it had a peculiarly strong attraction. The
-town where she had formerly passed some years of her life, and where
-they were now to spend a few days, was probably as great an object of
-her curiosity as all the celebrated beauties of Matlock, Chatsworth,
-Dovedale, or the Peak.
-
-Elizabeth was excessively disappointed: she had set her heart on seeing
-the Lakes; and still thought there might have been time enough. But it
-was her business to be satisfied--and certainly her temper to be happy;
-and all was soon right again.
-
-With the mention of Derbyshire, there were many ideas connected. It was
-impossible for her to see the word without thinking of Pemberley and its
-owner. “But surely,” said she, “I may enter his county with impunity,
-and rob it of a few petrified spars, without his perceiving me.”
-
-The period of expectation was now doubled. Four weeks were to pass away
-before her uncle and aunt’s arrival. But they did pass away, and Mr. and
-Mrs. Gardiner, with their four children, did at length appear at
-Longbourn. The children, two girls of six and eight years old, and two
-younger boys, were to be left under the particular care of their cousin
-Jane, who was the general favourite, and whose steady sense and
-sweetness of temper exactly adapted her for attending to them in every
-way--teaching them, playing with them, and loving them.
-
-The Gardiners stayed only one night at Longbourn, and set off the next
-morning with Elizabeth in pursuit of novelty and amusement. One
-enjoyment was certain--that of suitableness as companions; a
-suitableness which comprehended health and temper to bear
-inconveniences--cheerfulness to enhance every pleasure--and affection
-and intelligence, which might supply it among themselves if there were
-disappointments abroad.
-
-It is not the object of this work to give a description of Derbyshire,
-nor of any of the remarkable places through which their route thither
-lay--Oxford, Blenheim, Warwick, Kenilworth, Birmingham, etc., are
-sufficiently known. A small part of Derbyshire is all the present
-concern. To the little town of Lambton, the scene of Mrs. Gardiner’s
-former residence, and where she had lately learned that some
-acquaintance still remained, they bent their steps, after having seen
-all the principal wonders of the country; and within five miles of
-Lambton, Elizabeth found, from her aunt, that Pemberley was situated. It
-was not in their direct road; nor more than a mile or two out of it. In
-talking over their route the evening before, Mrs. Gardiner expressed an
-inclination to see the place again. Mr. Gardiner declared his
-willingness, and Elizabeth was applied to for her approbation.
-
-“My love, should not you like to see a place of which you have heard so
-much?” said her aunt. “A place, too, with which so many of your
-acquaintance are connected. Wickham passed all his youth there, you
-know.”
-
-Elizabeth was distressed. She felt that she had no business at
-Pemberley, and was obliged to assume a disinclination for seeing it. She
-must own that she was tired of great houses: after going over so many,
-she really had no pleasure in fine carpets or satin curtains.
-
-Mrs. Gardiner abused her stupidity. “If it were merely a fine house
-richly furnished,” said she, “I should not care about it myself; but the
-grounds are delightful. They have some of the finest woods in the
-country.”
-
-Elizabeth said no more; but her mind could not acquiesce. The
-possibility of meeting Mr. Darcy, while viewing the place, instantly
-occurred. It would be dreadful! She blushed at the very idea; and
-thought it would be better to speak openly to her aunt, than to run such
-a risk. But against this there were objections; and she finally resolved
-that it could be the last resource, if her private inquiries as to the
-absence of the family were unfavourably answered.
-
-Accordingly, when she retired at night, she asked the chambermaid
-whether Pemberley were not a very fine place, what was the name of its
-proprietor, and, with no little alarm, whether the family were down for
-the summer? A most welcome negative followed the last question; and her
-alarms being now removed, she was at leisure to feel a great deal of
-curiosity to see the house herself; and when the subject was revived the
-next morning, and she was again applied to, could readily answer, and
-with a proper air of indifference, that she had not really any dislike
-to the scheme.
-
-To Pemberley, therefore, they were to go.
-
-
-
-
-[Illustration:
-
-     “Conjecturing as to the date”
-]
-
-
-
-
-CHAPTER XLIII.
-
-
-[Illustration]
-
-Elizabeth, as they drove along, watched for the first appearance of
-Pemberley Woods with some perturbation; and when at length they turned
-in at the lodge, her spirits were in a high flutter.
-
-The park was very large, and contained great variety of ground. They
-entered it in one of its lowest points, and drove for some time through
-a beautiful wood stretching over a wide extent.
-
-Elizabeth’s mind was too full for conversation, but she saw and admired
-every remarkable spot and point of view. They gradually ascended for
-half a mile, and then found themselves at the top of a considerable
-eminence, where the wood ceased, and the eye was instantly caught by
-Pemberley House, situated on the opposite side of the valley, into which
-the road with some abruptness wound. It was a large, handsome stone
-building, standing well on rising ground, and backed by a ridge of high
-woody hills; and in front a stream of some natural importance was
-swelled into greater, but without any artificial appearance. Its banks
-were neither formal nor falsely adorned. Elizabeth was delighted. She
-had never seen a place for which nature had done more, or where natural
-beauty had been so little counteracted by an awkward taste. They were
-all of them warm in their admiration; and at that moment she felt that
-to be mistress of Pemberley might be something!
-
-They descended the hill, crossed the bridge, and drove to the door; and,
-while examining the nearer aspect of the house, all her apprehension of
-meeting its owner returned. She dreaded lest the chambermaid had been
-mistaken. On applying to see the place, they were admitted into the
-hall; and Elizabeth, as they waited for the housekeeper, had leisure to
-wonder at her being where she was.
-
-The housekeeper came; a respectable looking elderly woman, much less
-fine, and more civil, than she had any notion of finding her. They
-followed her into the dining-parlour. It was a large, well-proportioned
-room, handsomely fitted up. Elizabeth, after slightly surveying it, went
-to a window to enjoy its prospect. The hill, crowned with wood, from
-which they had descended, receiving increased abruptness from the
-distance, was a beautiful object. Every disposition of the ground was
-good; and she looked on the whole scene, the river, the trees scattered
-on its banks, and the winding of the valley, as far as she could trace
-it, with delight. As they passed into other rooms, these objects were
-taking different positions; but from every window there were beauties
-to be seen. The rooms were lofty and handsome, and their furniture
-suitable to the fortune of their proprietor; but Elizabeth saw, with
-admiration of his taste, that it was neither gaudy nor uselessly
-fine,--with less of splendour, and more real elegance, than the
-furniture of Rosings.
-
-“And of this place,” thought she, “I might have been mistress! With
-these rooms I might have now been familiarly acquainted! Instead of
-viewing them as a stranger, I might have rejoiced in them as my own, and
-welcomed to them as visitors my uncle and aunt. But, no,” recollecting
-herself, “that could never be; my uncle and aunt would have been lost to
-me; I should not have been allowed to invite them.”
-
-This was a lucky recollection--it saved her from something like regret.
-
-She longed to inquire of the housekeeper whether her master were really
-absent, but had not courage for it. At length, however, the question was
-asked by her uncle; and she turned away with alarm, while Mrs. Reynolds
-replied, that he was; adding, “But we expect him to-morrow, with a large
-party of friends.” How rejoiced was Elizabeth that their own journey had
-not by any circumstance been delayed a day!
-
-Her aunt now called her to look at a picture. She approached, and saw
-the likeness of Mr. Wickham, suspended, amongst several other
-miniatures, over the mantel-piece. Her aunt asked her, smilingly, how
-she liked it. The housekeeper came forward, and told them it was the
-picture of a young gentleman, the son of her late master’s steward, who
-had been brought up by him at his own expense. “He is now gone into the
-army,” she added; “but I am afraid he has turned out very wild.”
-
-Mrs. Gardiner looked at her niece with a smile, but Elizabeth could not
-return it.
-
-“And that,” said Mrs. Reynolds, pointing to another of the miniatures,
-“is my master--and very like him. It was drawn at the same time as the
-other--about eight years ago.”
-
-“I have heard much of your master’s fine person,” said Mrs. Gardiner,
-looking at the picture; “it is a handsome face. But, Lizzy, you can tell
-us whether it is like or not.”
-
-Mrs. Reynolds’ respect for Elizabeth seemed to increase on this
-intimation of her knowing her master.
-
-“Does that young lady know Mr. Darcy?”
-
-Elizabeth coloured, and said, “A little.”
-
-“And do not you think him a very handsome gentleman, ma’am?”
-
-“Yes, very handsome.”
-
-“I am sure _I_ know none so handsome; but in the gallery upstairs you
-will see a finer, larger picture of him than this. This room was my late
-master’s favourite room, and these miniatures are just as they used to
-be then. He was very fond of them.”
-
-This accounted to Elizabeth for Mr. Wickham’s being among them.
-
-Mrs. Reynolds then directed their attention to one of Miss Darcy, drawn
-when she was only eight years old.
-
-“And is Miss Darcy as handsome as her brother?” said Mr. Gardiner.
-
-“Oh, yes--the handsomest young lady that ever was seen; and so
-accomplished! She plays and sings all day long. In the next room is a
-new instrument just come down for her--a present from my master: she
-comes here to-morrow with him.”
-
-Mr. Gardiner, whose manners were easy and pleasant, encouraged her
-communicativeness by his questions and remarks: Mrs. Reynolds, either
-from pride or attachment, had evidently great pleasure in talking of her
-master and his sister.
-
-“Is your master much at Pemberley in the course of the year?”
-
-“Not so much as I could wish, sir: but I dare say he may spend half his
-time here; and Miss Darcy is always down for the summer months.”
-
-“Except,” thought Elizabeth, “when she goes to Ramsgate.”
-
-“If your master would marry, you might see more of him.”
-
-“Yes, sir; but I do not know when _that_ will be. I do not know who is
-good enough for him.”
-
-Mr. and Mrs. Gardiner smiled. Elizabeth could not help saying, “It is
-very much to his credit, I am sure, that you should think so.”
-
-“I say no more than the truth, and what everybody will say that knows
-him,” replied the other. Elizabeth thought this was going pretty far;
-and she listened with increasing astonishment as the housekeeper added,
-“I have never had a cross word from him in my life, and I have known him
-ever since he was four years old.”
-
-This was praise of all others most extraordinary, most opposite to her
-ideas. That he was not a good-tempered man had been her firmest opinion.
-Her keenest attention was awakened: she longed to hear more; and was
-grateful to her uncle for saying,--
-
-“There are very few people of whom so much can be said. You are lucky in
-having such a master.”
-
-“Yes, sir, I know I am. If I were to go through the world, I could not
-meet with a better. But I have always observed, that they who are
-good-natured when children, are good-natured when they grow up; and he
-was always the sweetest tempered, most generous-hearted boy in the
-world.”
-
-Elizabeth almost stared at her. “Can this be Mr. Darcy?” thought she.
-
-“His father was an excellent man,” said Mrs. Gardiner.
-
-“Yes, ma’am, that he was indeed; and his son will be just like him--just
-as affable to the poor.”
-
-Elizabeth listened, wondered, doubted, and was impatient for more. Mrs.
-Reynolds could interest her on no other point. She related the subjects
-of the pictures, the dimensions of the rooms, and the price of the
-furniture in vain. Mr. Gardiner, highly amused by the kind of family
-prejudice, to which he attributed her excessive commendation of her
-master, soon led again to the subject; and she dwelt with energy on his
-many merits, as they proceeded together up the great staircase.
-
-“He is the best landlord, and the best master,” said she, “that ever
-lived. Not like the wild young men now-a-days, who think of nothing but
-themselves. There is not one of his tenants or servants but what will
-give him a good name. Some people call him proud; but I am sure I never
-saw anything of it. To my fancy, it is only because he does not rattle
-away like other young men.”
-
-“In what an amiable light does this place him!” thought Elizabeth.
-
-“This fine account of him,” whispered her aunt as they walked, “is not
-quite consistent with his behaviour to our poor friend.”
-
-“Perhaps we might be deceived.”
-
-“That is not very likely; our authority was too good.”
-
-On reaching the spacious lobby above, they were shown into a very pretty
-sitting-room, lately fitted up with greater elegance and lightness than
-the apartments below; and were informed that it was but just done to
-give pleasure to Miss Darcy, who had taken a liking to the room, when
-last at Pemberley.
-
-“He is certainly a good brother,” said Elizabeth, as she walked towards
-one of the windows.
-
-Mrs. Reynolds anticipated Miss Darcy’s delight, when she should enter
-the room. “And this is always the way with him,” she added. “Whatever
-can give his sister any pleasure, is sure to be done in a moment. There
-is nothing he would not do for her.”
-
-The picture gallery, and two or three of the principal bed-rooms, were
-all that remained to be shown. In the former were many good paintings:
-but Elizabeth knew nothing of the art; and from such as had been already
-visible below, she had willingly turned to look at some drawings of Miss
-Darcy’s, in crayons, whose subjects were usually more interesting, and
-also more intelligible.
-
-In the gallery there were many family portraits, but they could have
-little to fix the attention of a stranger. Elizabeth walked on in quest
-of the only face whose features would be known to her. At last it
-arrested her--and she beheld a striking resemblance of Mr. Darcy, with
-such a smile over the face, as she remembered to have sometimes seen,
-when he looked at her. She stood several minutes before the picture, in
-earnest contemplation, and returned to it again before they quitted the
-gallery. Mrs. Reynolds informed them, that it had been taken in his
-father’s lifetime.
-
-There was certainly at this moment, in Elizabeth’s mind, a more gentle
-sensation towards the original than she had ever felt in the height of
-their acquaintance. The commendation bestowed on him by Mrs. Reynolds
-was of no trifling nature. What praise is more valuable than the praise
-of an intelligent servant? As a brother, a landlord, a master, she
-considered how many people’s happiness were in his guardianship! How
-much of pleasure or pain it was in his power to bestow! How much of good
-or evil must be done by him! Every idea that had been brought forward by
-the housekeeper was favourable to his character; and as she stood before
-the canvas, on which he was represented, and fixed his eyes upon
-herself, she thought of his regard with a deeper sentiment of gratitude
-than it had ever raised before: she remembered its warmth, and softened
-its impropriety of expression.
-
-When all of the house that was open to general inspection had been seen,
-they returned down stairs; and, taking leave of the housekeeper, were
-consigned over to the gardener, who met them at the hall door.
-
-As they walked across the lawn towards the river, Elizabeth turned back
-to look again; her uncle and aunt stopped also; and while the former was
-conjecturing as to the date of the building, the owner of it himself
-suddenly came forward from the road which led behind it to the stables.
-
-They were within twenty yards of each other; and so abrupt was his
-appearance, that it was impossible to avoid his sight. Their eyes
-instantly met, and the cheeks of each were overspread with the deepest
-blush. He absolutely started, and for a moment seemed immovable from
-surprise; but shortly recovering himself, advanced towards the party,
-and spoke to Elizabeth, if not in terms of perfect composure, at least
-of perfect civility.
-
-She had instinctively turned away; but stopping on his approach,
-received his compliments with an embarrassment impossible to be
-overcome. Had his first appearance, or his resemblance to the picture
-they had just been examining, been insufficient to assure the other two
-that they now saw Mr. Darcy, the gardener’s expression of surprise, on
-beholding his master, must immediately have told it. They stood a little
-aloof while he was talking to their niece, who, astonished and confused,
-scarcely dared lift her eyes to his face, and knew not what answer she
-returned to his civil inquiries after her family. Amazed at the
-alteration of his manner since they last parted, every sentence that he
-uttered was increasing her embarrassment; and every idea of the
-impropriety of her being found there recurring to her mind, the few
-minutes in which they continued together were some of the most
-uncomfortable of her life. Nor did he seem much more at ease; when he
-spoke, his accent had none of its usual sedateness; and he repeated his
-inquiries as to the time of her having left Longbourn, and of her stay
-in Derbyshire, so often, and in so hurried a way, as plainly spoke the
-distraction of his thoughts.
-
-At length, every idea seemed to fail him; and after standing a few
-moments without saying a word, he suddenly recollected himself, and took
-leave.
-
-The others then joined her, and expressed their admiration of his
-figure; but Elizabeth heard not a word, and, wholly engrossed by her own
-feelings, followed them in silence. She was overpowered by shame and
-vexation. Her coming there was the most unfortunate, the most ill-judged
-thing in the world! How strange must it appear to him! In what a
-disgraceful light might it not strike so vain a man! It might seem as if
-she had purposely thrown herself in his way again! Oh! why did she come?
-or, why did he thus come a day before he was expected? Had they been
-only ten minutes sooner, they should have been beyond the reach of his
-discrimination; for it was plain that he was that moment arrived, that
-moment alighted from his horse or his carriage. She blushed again and
-again over the perverseness of the meeting. And his behaviour, so
-strikingly altered,--what could it mean? That he should even speak to
-her was amazing!--but to speak with such civility, to inquire after her
-family! Never in her life had she seen his manners so little dignified,
-never had he spoken with such gentleness as on this unexpected meeting.
-What a contrast did it offer to his last address in Rosings Park, when
-he put his letter into her hand! She knew not what to think, or how to
-account for it.
-
-They had now entered a beautiful walk by the side of the water, and
-every step was bringing forward a nobler fall of ground, or a finer
-reach of the woods to which they were approaching: but it was some time
-before Elizabeth was sensible of any of it; and, though she answered
-mechanically to the repeated appeals of her uncle and aunt, and seemed
-to direct her eyes to such objects as they pointed out, she
-distinguished no part of the scene. Her thoughts were all fixed on that
-one spot of Pemberley House, whichever it might be, where Mr. Darcy then
-was. She longed to know what at that moment was passing in his mind; in
-what manner he thought of her, and whether, in defiance of everything,
-she was still dear to him. Perhaps he had been civil only because he
-felt himself at ease; yet there had been _that_ in his voice, which was
-not like ease. Whether he had felt more of pain or of pleasure in seeing
-her, she could not tell, but he certainly had not seen her with
-composure.
-
-At length, however, the remarks of her companions on her absence of mind
-roused her, and she felt the necessity of appearing more like herself.
-
-They entered the woods, and, bidding adieu to the river for a while,
-ascended some of the higher grounds; whence, in spots where the opening
-of the trees gave the eye power to wander, were many charming views of
-the valley, the opposite hills, with the long range of woods
-overspreading many, and occasionally part of the stream. Mr. Gardiner
-expressed a wish of going round the whole park, but feared it might be
-beyond a walk. With a triumphant smile, they were told, that it was ten
-miles round. It settled the matter; and they pursued the accustomed
-circuit; which brought them again, after some time, in a descent among
-hanging woods, to the edge of the water, and one of its narrowest parts.
-They crossed it by a simple bridge, in character with the general air of
-the scene: it was a spot less adorned than any they had yet visited; and
-the valley, here contracted into a glen, allowed room only for the
-stream, and a narrow walk amidst the rough coppice-wood which bordered
-it. Elizabeth longed to explore its windings; but when they had crossed
-the bridge, and perceived their distance from the house, Mrs. Gardiner,
-who was not a great walker, could go no farther, and thought only of
-returning to the carriage as quickly as possible. Her niece was,
-therefore, obliged to submit, and they took their way towards the house
-on the opposite side of the river, in the nearest direction; but their
-progress was slow, for Mr. Gardiner, though seldom able to indulge the
-taste, was very fond of fishing, and was so much engaged in watching the
-occasional appearance of some trout in the water, and talking to the man
-about them, that he advanced but little. Whilst wandering on in this
-slow manner, they were again surprised, and Elizabeth’s astonishment was
-quite equal to what it had been at first, by the sight of Mr. Darcy
-approaching them, and at no great distance. The walk being here less
-sheltered than on the other side, allowed them to see him before they
-met. Elizabeth, however astonished, was at least more prepared for an
-interview than before, and resolved to appear and to speak with
-calmness, if he really intended to meet them. For a few moments, indeed,
-she felt that he would probably strike into some other path. The idea
-lasted while a turning in the walk concealed him from their view; the
-turning past, he was immediately before them. With a glance she saw that
-he had lost none of his recent civility; and, to imitate his politeness,
-she began as they met to admire the beauty of the place; but she had not
-got beyond the words “delightful,” and “charming,” when some unlucky
-recollections obtruded, and she fancied that praise of Pemberley from
-her might be mischievously construed. Her colour changed, and she said
-no more.
-
-Mrs. Gardiner was standing a little behind; and on her pausing, he asked
-her if she would do him the honour of introducing him to her friends.
-This was a stroke of civility for which she was quite unprepared; and
-she could hardly suppress a smile at his being now seeking the
-acquaintance of some of those very people, against whom his pride had
-revolted, in his offer to herself. “What will be his surprise,” thought
-she, “when he knows who they are! He takes them now for people of
-fashion.”
-
-The introduction, however, was immediately made; and as she named their
-relationship to herself, she stole a sly look at him, to see how he bore
-it; and was not without the expectation of his decamping as fast as he
-could from such disgraceful companions. That he was _surprised_ by the
-connection was evident: he sustained it, however, with fortitude: and,
-so far from going away, turned back with them, and entered into
-conversation with Mr. Gardiner. Elizabeth could not but be pleased,
-could not but triumph. It was consoling that he should know she had some
-relations for whom there was no need to blush. She listened most
-attentively to all that passed between them, and gloried in every
-expression, every sentence of her uncle, which marked his intelligence,
-his taste, or his good manners.
-
-The conversation soon turned upon fishing; and she heard Mr. Darcy
-invite him, with the greatest civility, to fish there as often as he
-chose, while he continued in the neighbourhood, offering at the same
-time to supply him with fishing tackle, and pointing out those parts of
-the stream where there was usually most sport. Mrs. Gardiner, who was
-walking arm in arm with Elizabeth, gave her a look expressive of her
-wonder. Elizabeth said nothing, but it gratified her exceedingly; the
-compliment must be all for herself. Her astonishment, however, was
-extreme; and continually was she repeating, “Why is he so altered? From
-what can it proceed? It cannot be for _me_, it cannot be for _my_ sake
-that his manners are thus softened. My reproofs at Hunsford could not
-work such a change as this. It is impossible that he should still love
-me.”
-
-After walking some time in this way, the two ladies in front, the two
-gentlemen behind, on resuming their places, after descending to the
-brink of the river for the better inspection of some curious
-water-plant, there chanced to be a little alteration. It originated in
-Mrs. Gardiner, who, fatigued by the exercise of the morning, found
-Elizabeth’s arm inadequate to her support, and consequently preferred
-her husband’s. Mr. Darcy took her place by her niece, and they walked on
-together. After a short silence the lady first spoke. She wished him to
-know that she had been assured of his absence before she came to the
-place, and accordingly began by observing, that his arrival had been
-very unexpected--“for your housekeeper,” she added, “informed us that
-you would certainly not be here till to-morrow; and, indeed, before we
-left Bakewell, we understood that you were not immediately expected in
-the country.” He acknowledged the truth of it all; and said that
-business with his steward had occasioned his coming forward a few hours
-before the rest of the party with whom he had been travelling. “They
-will join me early to-morrow,” he continued, “and among them are some
-who will claim an acquaintance with you,--Mr. Bingley and his sisters.”
-
-Elizabeth answered only by a slight bow. Her thoughts were instantly
-driven back to the time when Mr. Bingley’s name had been last mentioned
-between them; and if she might judge from his complexion, _his_ mind was
-not very differently engaged.
-
-“There is also one other person in the party,” he continued after a
-pause, “who more particularly wishes to be known to you. Will you allow
-me, or do I ask too much, to introduce my sister to your acquaintance
-during your stay at Lambton?”
-
-The surprise of such an application was great indeed; it was too great
-for her to know in what manner she acceded to it. She immediately felt
-that whatever desire Miss Darcy might have of being acquainted with her,
-must be the work of her brother, and without looking farther, it was
-satisfactory; it was gratifying to know that his resentment had not made
-him think really ill of her.
-
-They now walked on in silence; each of them deep in thought. Elizabeth
-was not comfortable; that was impossible; but she was flattered and
-pleased. His wish of introducing his sister to her was a compliment of
-the highest kind. They soon outstripped the others; and when they had
-reached the carriage, Mr. and Mrs. Gardiner were half a quarter of a
-mile behind.
-
-He then asked her to walk into the house--but she declared herself not
-tired, and they stood together on the lawn. At such a time much might
-have been said, and silence was very awkward. She wanted to talk, but
-there seemed an embargo on every subject. At last she recollected that
-she had been travelling, and they talked of Matlock and Dovedale with
-great perseverance. Yet time and her aunt moved slowly--and her patience
-and her ideas were nearly worn out before the _tête-à-tête_ was over.
-
-On Mr. and Mrs. Gardiner’s coming up they were all pressed to go into
-the house and take some refreshment; but this was declined, and they
-parted on each side with the utmost politeness. Mr. Darcy handed the
-ladies into the carriage; and when it drove off, Elizabeth saw him
-walking slowly towards the house.
-
-The observations of her uncle and aunt now began; and each of them
-pronounced him to be infinitely superior to anything they had expected.
-
-“He is perfectly well-behaved, polite, and unassuming,” said her uncle.
-
-“There _is_ something a little stately in him, to be sure,” replied her
-aunt; “but it is confined to his air, and is not unbecoming. I can now
-say with the housekeeper, that though some people may call him proud,
-_I_ have seen nothing of it.”
-
-“I was never more surprised than by his behaviour to us. It was more
-than civil; it was really attentive; and there was no necessity for such
-attention. His acquaintance with Elizabeth was very trifling.”
-
-“To be sure, Lizzy,” said her aunt, “he is not so handsome as Wickham;
-or rather he has not Wickham’s countenance, for his features are
-perfectly good. But how came you to tell us that he was so
-disagreeable?”
-
-Elizabeth excused herself as well as she could: said that she had liked
-him better when they met in Kent than before, and that she had never
-seen him so pleasant as this morning.
-
-“But perhaps he may be a little whimsical in his civilities,” replied
-her uncle. “Your great men often are; and therefore I shall not take him
-at his word about fishing, as he might change his mind another day, and
-warn me off his grounds.”
-
-Elizabeth felt that they had entirely mistaken his character, but said
-nothing.
-
-“From what we have seen of him,” continued Mrs. Gardiner, “I really
-should not have thought that he could have behaved in so cruel a way by
-anybody as he has done by poor Wickham. He has not an ill-natured look.
-On the contrary, there is something pleasing about his mouth when he
-speaks. And there is something of dignity in his countenance, that would
-not give one an unfavourable idea of his heart. But, to be sure, the
-good lady who showed us the house did give him a most flaming character!
-I could hardly help laughing aloud sometimes. But he is a liberal
-master, I suppose, and _that_, in the eye of a servant, comprehends
-every virtue.”
-
-Elizabeth here felt herself called on to say something in vindication of
-his behaviour to Wickham; and, therefore, gave them to understand, in as
-guarded a manner as she could, that by what she had heard from his
-relations in Kent, his actions were capable of a very different
-construction; and that his character was by no means so faulty, nor
-Wickham’s so amiable, as they had been considered in Hertfordshire. In
-confirmation of this, she related the particulars of all the pecuniary
-transactions in which they had been connected, without actually naming
-her authority, but stating it to be such as might be relied on.
-
-Mrs. Gardiner was surprised and concerned: but as they were now
-approaching the scene of her former pleasures, every idea gave way to
-the charm of recollection; and she was too much engaged in pointing out
-to her husband all the interesting spots in its environs, to think of
-anything else. Fatigued as she had been by the morning’s walk, they had
-no sooner dined than she set off again in quest of her former
-acquaintance, and the evening was spent in the satisfactions of an
-intercourse renewed after many years’ discontinuance.
-
-The occurrences of the day were too full of interest to leave Elizabeth
-much attention for any of these new friends; and she could do nothing
-but think, and think with wonder, of Mr. Darcy’s civility, and, above
-all, of his wishing her to be acquainted with his sister.
-
-
-
-
-[Illustration]
-
-
-
-
-CHAPTER XLIV.
-
-
-[Illustration]
-
-Elizabeth had settled it that Mr. Darcy would bring his sister to visit
-her the very day after her reaching Pemberley; and was, consequently,
-resolved not to be out of sight of the inn the whole of that morning.
-But her conclusion was false; for on the very morning after their own
-arrival at Lambton these visitors came. They had been walking about the
-place with some of their new friends, and were just returned to the inn
-to dress themselves for dining with the same family, when the sound of a
-carriage drew them to a window, and they saw a gentleman and lady in a
-curricle driving up the street. Elizabeth, immediately recognizing the
-livery, guessed what it meant, and imparted no small degree of surprise
-to her relations, by acquainting them with the honour which she
-expected. Her uncle and aunt were all amazement; and the embarrassment
-of her manner as she spoke, joined to the circumstance itself, and many
-of the circumstances of the preceding day, opened to them a new idea on
-the business. Nothing had ever suggested it before, but they now felt
-that there was no other way of accounting for such attentions from such
-a quarter than by supposing a partiality for their niece. While these
-newly-born notions were passing in their heads, the perturbation of
-Elizabeth’s feelings was every moment increasing. She was quite amazed
-at her own discomposure; but, amongst other causes of disquiet, she
-dreaded lest the partiality of the brother should have said too much in
-her favour; and, more than commonly anxious to please, she naturally
-suspected that every power of pleasing would fail her.
-
-She retreated from the window, fearful of being seen; and as she walked
-up and down the room, endeavouring to compose herself, saw such looks of
-inquiring surprise in her uncle and aunt as made everything worse.
-
-Miss Darcy and her brother appeared, and this formidable introduction
-took place. With astonishment did Elizabeth see that her new
-acquaintance was at least as much embarrassed as herself. Since her
-being at Lambton, she had heard that Miss Darcy was exceedingly proud;
-but the observation of a very few minutes convinced her that she was
-only exceedingly shy. She found it difficult to obtain even a word from
-her beyond a monosyllable.
-
-Miss Darcy was tall, and on a larger scale than Elizabeth; and, though
-little more than sixteen, her figure was formed, and her appearance
-womanly and graceful. She was less handsome than her brother, but there
-was sense and good-humour in her face, and her manners were perfectly
-unassuming and gentle. Elizabeth, who had expected to find in her as
-acute and unembarrassed an observer as ever Mr. Darcy had been, was much
-relieved by discerning such different feelings.
-
-They had not been long together before Darcy told her that Bingley was
-also coming to wait on her; and she had barely time to express her
-satisfaction, and prepare for such a visitor, when Bingley’s quick step
-was heard on the stairs, and in a moment he entered the room. All
-Elizabeth’s anger against him had been long done away; but had she still
-felt any, it could hardly have stood its ground against the unaffected
-cordiality with which he expressed himself on seeing her again. He
-inquired in a friendly, though general, way, after her family, and
-looked and spoke with the same good-humoured ease that he had ever done.
-
-To Mr. and Mrs. Gardiner he was scarcely a less interesting personage
-than to herself. They had long wished to see him. The whole party before
-them, indeed, excited a lively attention. The suspicions which had just
-arisen of Mr. Darcy and their niece, directed their observation towards
-each with an earnest, though guarded, inquiry; and they soon drew from
-those inquiries the full conviction that one of them at least knew what
-it was to love. Of the lady’s sensations they remained a little in
-doubt; but that the gentleman was overflowing with admiration was
-evident enough.
-
-Elizabeth, on her side, had much to do. She wanted to ascertain the
-feelings of each of her visitors, she wanted to compose her own, and to
-make herself agreeable to all; and in the latter object, where she
-feared most to fail, she was most sure of success, for those to whom
-she endeavoured to give pleasure were pre-possessed in her favour.
-Bingley was ready, Georgiana was eager, and Darcy determined, to be
-pleased.
-
-[Illustration:
-
-     “To make herself agreeable to all”
-
-[_Copyright 1894 by George Allen._]]
-
-In seeing Bingley, her thoughts naturally flew to her sister; and oh!
-how ardently did she long to know whether any of his were directed in a
-like manner. Sometimes she could fancy that he talked less than on
-former occasions, and once or twice pleased herself with the notion
-that, as he looked at her, he was trying to trace a resemblance. But,
-though this might be imaginary, she could not be deceived as to his
-behaviour to Miss Darcy, who had been set up as a rival to Jane. No
-look appeared on either side that spoke particular regard. Nothing
-occurred between them that could justify the hopes of his sister. On
-this point she was soon satisfied; and two or three little circumstances
-occurred ere they parted, which, in her anxious interpretation, denoted
-a recollection of Jane, not untinctured by tenderness, and a wish of
-saying more that might lead to the mention of her, had he dared. He
-observed to her, at a moment when the others were talking together, and
-in a tone which had something of real regret, that it “was a very long
-time since he had had the pleasure of seeing her;” and, before she could
-reply, he added, “It is above eight months. We have not met since the
-26th of November, when we were all dancing together at Netherfield.”
-
-Elizabeth was pleased to find his memory so exact; and he afterwards
-took occasion to ask her, when unattended to by any of the rest, whether
-_all_ her sisters were at Longbourn. There was not much in the question,
-nor in the preceding remark; but there was a look and a manner which
-gave them meaning.
-
-It was not often that she could turn her eyes on Mr. Darcy himself; but
-whenever she did catch a glimpse she saw an expression of general
-complaisance, and in all that he said, she heard an accent so far
-removed from _hauteur_ or disdain of his companions, as convinced her
-that the improvement of manners which she had yesterday witnessed,
-however temporary its existence might prove, had at least outlived one
-day. When she saw him thus seeking the acquaintance, and courting the
-good opinion of people with whom any intercourse a few months ago would
-have been a disgrace; when she saw him thus civil, not only to herself,
-but to the very relations whom he had openly disdained, and recollected
-their last lively scene in Hunsford Parsonage, the difference, the
-change was so great, and struck so forcibly on her mind, that she could
-hardly restrain her astonishment from being visible. Never, even in the
-company of his dear friends at Netherfield, or his dignified relations
-at Rosings, had she seen him so desirous to please, so free from
-self-consequence or unbending reserve, as now, when no importance could
-result from the success of his endeavours, and when even the
-acquaintance of those to whom his attentions were addressed, would draw
-down the ridicule and censure of the ladies both of Netherfield and
-Rosings.
-
-Their visitors stayed with them above half an hour; and when they arose
-to depart, Mr. Darcy called on his sister to join him in expressing
-their wish of seeing Mr. and Mrs. Gardiner, and Miss Bennet, to dinner
-at Pemberley, before they left the country. Miss Darcy, though with a
-diffidence which marked her little in the habit of giving invitations,
-readily obeyed. Mrs. Gardiner looked at her niece, desirous of knowing
-how _she_, whom the invitation most concerned, felt disposed as to its
-acceptance, but Elizabeth had turned away her head. Presuming, however,
-that this studied avoidance spoke rather a momentary embarrassment than
-any dislike of the proposal, and seeing in her husband, who was fond of
-society, a perfect willingness to accept it, she ventured to engage for
-her attendance, and the day after the next was fixed on.
-
-Bingley expressed great pleasure in the certainty of seeing Elizabeth
-again, having still a great deal to say to her, and many inquiries to
-make after all their Hertfordshire friends. Elizabeth, construing all
-this into a wish of hearing her speak of her sister, was pleased; and
-on this account, as well as some others, found herself, when their
-visitors left them, capable of considering the last half hour with some
-satisfaction, though while it was passing the enjoyment of it had been
-little. Eager to be alone, and fearful of inquiries or hints from her
-uncle and aunt, she stayed with them only long enough to hear their
-favourable opinion of Bingley, and then hurried away to dress.
-
-But she had no reason to fear Mr. and Mrs. Gardiner’s curiosity; it was
-not their wish to force her communication. It was evident that she was
-much better acquainted with Mr. Darcy than they had before any idea of;
-it was evident that he was very much in love with her. They saw much to
-interest, but nothing to justify inquiry.
-
-Of Mr. Darcy it was now a matter of anxiety to think well; and, as far
-as their acquaintance reached, there was no fault to find. They could
-not be untouched by his politeness; and had they drawn his character
-from their own feelings and his servant’s report, without any reference
-to any other account, the circle in Hertfordshire to which he was known
-would not have recognized it for Mr. Darcy. There was now an interest,
-however, in believing the housekeeper; and they soon became sensible
-that the authority of a servant, who had known him since he was four
-years old, and whose own manners indicated respectability, was not to be
-hastily rejected. Neither had anything occurred in the intelligence of
-their Lambton friends that could materially lessen its weight. They had
-nothing to accuse him of but pride; pride he probably had, and if not,
-it would certainly be imputed by the inhabitants of a small market town
-where the family did not visit. It was acknowledged, however, that he
-was a liberal man, and did much good among the poor.
-
-With respect to Wickham, the travellers soon found that he was not held
-there in much estimation; for though the chief of his concerns with the
-son of his patron were imperfectly understood, it was yet a well-known
-fact that, on his quitting Derbyshire, he had left many debts behind
-him, which Mr. Darcy afterwards discharged.
-
-As for Elizabeth, her thoughts were at Pemberley this evening more than
-the last; and the evening, though as it passed it seemed long, was not
-long enough to determine her feelings towards _one_ in that mansion; and
-she lay awake two whole hours, endeavouring to make them out. She
-certainly did not hate him. No; hatred had vanished long ago, and she
-had almost as long been ashamed of ever feeling a dislike against him,
-that could be so called. The respect created by the conviction of his
-valuable qualities, though at first unwillingly admitted, had for some
-time ceased to be repugnant to her feelings; and it was now heightened
-into somewhat of a friendlier nature by the testimony so highly in his
-favour, and bringing forward his disposition in so amiable a light,
-which yesterday had produced. But above all, above respect and esteem,
-there was a motive within her of good-will which could not be
-overlooked. It was gratitude;--gratitude, not merely for having once
-loved her, but for loving her still well enough to forgive all the
-petulance and acrimony of her manner in rejecting him, and all the
-unjust accusations accompanying her rejection. He who, she had been
-persuaded, would avoid her as his greatest enemy, seemed, on this
-accidental meeting, most eager to preserve the acquaintance; and
-without any indelicate display of regard, or any peculiarity of manner,
-where their two selves only were concerned, was soliciting the good
-opinion of her friends, and bent on making her known to his sister. Such
-a change in a man of so much pride excited not only astonishment but
-gratitude--for to love, ardent love, it must be attributed; and, as
-such, its impression on her was of a sort to be encouraged, as by no
-means unpleasing, though it could not be exactly defined. She respected,
-she esteemed, she was grateful to him, she felt a real interest in his
-welfare; and she only wanted to know how far she wished that welfare to
-depend upon herself, and how far it would be for the happiness of both
-that she should employ the power, which her fancy told her she still
-possessed, of bringing on the renewal of his addresses.
-
-It had been settled in the evening, between the aunt and niece, that
-such a striking civility as Miss Darcy’s, in coming to them on the very
-day of her arrival at Pemberley--for she had reached it only to a late
-breakfast--ought to be imitated, though it could not be equalled, by
-some exertion of politeness on their side; and, consequently, that it
-would be highly expedient to wait on her at Pemberley the following
-morning. They were, therefore, to go. Elizabeth was pleased; though when
-she asked herself the reason, she had very little to say in reply.
-
-Mr. Gardiner left them soon after breakfast. The fishing scheme had been
-renewed the day before, and a positive engagement made of his meeting
-some of the gentlemen at Pemberley by noon.
-
-
-
-
-[Illustration:
-
-     “Engaged by the river”
-]
-
-
-
-
-CHAPTER XLV.
-
-
-[Illustration]
-
-Convinced as Elizabeth now was that Miss Bingley’s dislike of her had
-originated in jealousy, she could not help feeling how very unwelcome
-her appearance at Pemberley must be to her, and was curious to know
-with how much civility on that lady’s side the acquaintance would now
-be renewed.
-
-On reaching the house, they were shown through the hall into the saloon,
-whose northern aspect rendered it delightful for summer. Its windows,
-opening to the ground, admitted a most refreshing view of the high woody
-hills behind the house, and of the beautiful oaks and Spanish chestnuts
-which were scattered over the intermediate lawn.
-
-In this room they were received by Miss Darcy, who was sitting there
-with Mrs. Hurst and Miss Bingley, and the lady with whom she lived in
-London. Georgiana’s reception of them was very civil, but attended with
-all that embarrassment which, though proceeding from shyness and the
-fear of doing wrong, would easily give to those who felt themselves
-inferior the belief of her being proud and reserved. Mrs. Gardiner and
-her niece, however, did her justice, and pitied her.
-
-By Mrs. Hurst and Miss Bingley they were noticed only by a courtesy; and
-on their being seated, a pause, awkward as such pauses must always be,
-succeeded for a few moments. It was first broken by Mrs. Annesley, a
-genteel, agreeable-looking woman, whose endeavour to introduce some kind
-of discourse proved her to be more truly well-bred than either of the
-others; and between her and Mrs. Gardiner, with occasional help from
-Elizabeth, the conversation was carried on. Miss Darcy looked as if she
-wished for courage enough to join in it; and sometimes did venture a
-short sentence, when there was least danger of its being heard.
-
-Elizabeth soon saw that she was herself closely watched by Miss Bingley,
-and that she could not speak a word, especially to Miss Darcy, without
-calling her attention. This observation would not have prevented her
-from trying to talk to the latter, had they not been seated at an
-inconvenient distance; but she was not sorry to be spared the necessity
-of saying much: her own thoughts were employing her. She expected every
-moment that some of the gentlemen would enter the room: she wished, she
-feared, that the master of the house might be amongst them; and whether
-she wished or feared it most, she could scarcely determine. After
-sitting in this manner a quarter of an hour, without hearing Miss
-Bingley’s voice, Elizabeth was roused by receiving from her a cold
-inquiry after the health of her family. She answered with equal
-indifference and brevity, and the other said no more.
-
-The next variation which their visit afforded was produced by the
-entrance of servants with cold meat, cake, and a variety of all the
-finest fruits in season; but this did not take place till after many a
-significant look and smile from Mrs. Annesley to Miss Darcy had been
-given, to remind her of her post. There was now employment for the whole
-party; for though they could not all talk, they could all eat; and the
-beautiful pyramids of grapes, nectarines, and peaches, soon collected
-them round the table.
-
-While thus engaged, Elizabeth had a fair opportunity of deciding whether
-she most feared or wished for the appearance of Mr. Darcy, by the
-feelings which prevailed on his entering the room; and then, though but
-a moment before she had believed her wishes to predominate, she began to
-regret that he came.
-
-He had been some time with Mr. Gardiner, who, with two or three other
-gentlemen from the house, was engaged by the river; and had left him
-only on learning that the ladies of the family intended a visit to
-Georgiana that morning. No sooner did he appear, than Elizabeth wisely
-resolved to be perfectly easy and unembarrassed;--a resolution the more
-necessary to be made, but perhaps not the more easily kept, because she
-saw that the suspicions of the whole party were awakened against them,
-and that there was scarcely an eye which did not watch his behaviour
-when he first came into the room. In no countenance was attentive
-curiosity so strongly marked as in Miss Bingley’s, in spite of the
-smiles which overspread her face whenever she spoke to one of its
-objects; for jealousy had not yet made her desperate, and her attentions
-to Mr. Darcy were by no means over. Miss Darcy, on her brother’s
-entrance, exerted herself much more to talk; and Elizabeth saw that he
-was anxious for his sister and herself to get acquainted, and forwarded,
-as much as possible, every attempt at conversation on either side. Miss
-Bingley saw all this likewise; and, in the imprudence of anger, took the
-first opportunity of saying, with sneering civility,--
-
-“Pray, Miss Eliza, are not the ----shire militia removed from Meryton?
-They must be a great loss to _your_ family.”
-
-In Darcy’s presence she dared not mention Wickham’s name: but Elizabeth
-instantly comprehended that he was uppermost in her thoughts; and the
-various recollections connected with him gave her a moment’s distress;
-but, exerting herself vigorously to repel the ill-natured attack, she
-presently answered the question in a tolerably disengaged tone. While
-she spoke, an involuntary glance showed her Darcy with a heightened
-complexion, earnestly looking at her, and his sister overcome with
-confusion, and unable to lift up her eyes. Had Miss Bingley known what
-pain she was then giving her beloved friend, she undoubtedly would have
-refrained from the hint; but she had merely intended to discompose
-Elizabeth, by bringing forward the idea of a man to whom she believed
-her partial, to make her betray a sensibility which might injure her in
-Darcy’s opinion, and, perhaps, to remind the latter of all the follies
-and absurdities by which some part of her family were connected with
-that corps. Not a syllable had ever reached her of Miss Darcy’s
-meditated elopement. To no creature had it been revealed, where secrecy
-was possible, except to Elizabeth; and from all Bingley’s connections
-her brother was particularly anxious to conceal it, from that very wish
-which Elizabeth had long ago attributed to him, of their becoming
-hereafter her own. He had certainly formed such a plan; and without
-meaning that it should affect his endeavour to separate him from Miss
-Bennet, it is probable that it might add something to his lively concern
-for the welfare of his friend.
-
-Elizabeth’s collected behaviour, however, soon quieted his emotion; and
-as Miss Bingley, vexed and disappointed, dared not approach nearer to
-Wickham, Georgiana also recovered in time, though not enough to be able
-to speak any more. Her brother, whose eye she feared to meet, scarcely
-recollected her interest in the affair; and the very circumstance which
-had been designed to turn his thoughts from Elizabeth, seemed to have
-fixed them on her more and more cheerfully.
-
-Their visit did not continue long after the question and answer above
-mentioned; and while Mr. Darcy was attending them to their carriage,
-Miss Bingley was venting her feelings in criticisms on Elizabeth’s
-person, behaviour, and dress. But Georgiana would not join her. Her
-brother’s recommendation was enough to insure her favour: his judgment
-could not err; and he had spoken in such terms of Elizabeth, as to leave
-Georgiana without the power of finding her otherwise than lovely and
-amiable. When Darcy returned to the saloon, Miss Bingley could not help
-repeating to him some part of what she had been saying to his sister.
-
-“How very ill Eliza Bennet looks this morning, Mr. Darcy,” she cried: “I
-never in my life saw anyone so much altered as she is since the winter.
-She is grown so brown and coarse! Louisa and I were agreeing that we
-should not have known her again.”
-
-However little Mr. Darcy might have liked such an address, he contented
-himself with coolly replying, that he perceived no other alteration than
-her being rather tanned,--no miraculous consequence of travelling in the
-summer.
-
-“For my own part,” she rejoined, “I must confess that I never could see
-any beauty in her. Her face is too thin; her complexion has no
-brilliancy; and her features are not at all handsome. Her nose wants
-character; there is nothing marked in its lines. Her teeth are
-tolerable, but not out of the common way; and as for her eyes, which
-have sometimes been called so fine, I never could perceive anything
-extraordinary in them. They have a sharp, shrewish look, which I do not
-like at all; and in her air altogether, there is a self-sufficiency
-without fashion, which is intolerable.”
-
-Persuaded as Miss Bingley was that Darcy admired Elizabeth, this was not
-the best method of recommending herself; but angry people are not always
-wise; and in seeing him at last look somewhat nettled, she had all the
-success she expected. He was resolutely silent, however; and, from a
-determination of making him speak, she continued,--
-
-“I remember, when we first knew her in Hertfordshire, how amazed we all
-were to find that she was a reputed beauty; and I particularly recollect
-your saying one night, after they had been dining at Netherfield, ‘_She_
-a beauty! I should as soon call her mother a wit.’ But afterwards she
-seemed to improve on you, and I believe you thought her rather pretty at
-one time.”
-
-“Yes,” replied Darcy, who could contain himself no longer, “but _that_
-was only when I first knew her; for it is many months since I have
-considered her as one of the handsomest women of my acquaintance.”
-
-He then went away, and Miss Bingley was left to all the satisfaction of
-having forced him to say what gave no one any pain but herself.
-
-Mrs. Gardiner and Elizabeth talked of all that had occurred during their
-visit, as they returned, except what had particularly interested them
-both. The looks and behaviour of everybody they had seen were discussed,
-except of the person who had mostly engaged their attention. They talked
-of his sister, his friends, his house, his fruit, of everything but
-himself; yet Elizabeth was longing to know what Mrs. Gardiner thought of
-him, and Mrs. Gardiner would have been highly gratified by her niece’s
-beginning the subject.
-
-
-
-
-[Illustration]
-
-
-
-
-Chapter XLVI.
-
-
-[Illustration]
-
-Elizabeth had been a good deal disappointed in not finding a letter from
-Jane on their first arrival at Lambton; and this disappointment had been
-renewed on each of the mornings that had now been spent there; but on
-the third her repining was over, and her sister justified, by the
-receipt of two letters from her at once, on one of which was marked that
-it had been mis-sent elsewhere. Elizabeth was not surprised at it, as
-Jane had written the direction remarkably ill.
-
-They had just been preparing to walk as the letters came in; and her
-uncle and aunt, leaving her to enjoy them in quiet, set off by
-themselves. The one mis-sent must be first attended to; it had been
-written five days ago. The beginning contained an account of all their
-little parties and engagements, with such news as the country afforded;
-but the latter half, which was dated a day later, and written in evident
-agitation, gave more important intelligence. It was to this effect:--
-
-“Since writing the above, dearest Lizzy, something has occurred of a
-most unexpected and serious nature; but I am afraid of alarming you--be
-assured that we are all well. What I have to say relates to poor Lydia.
-An express came at twelve last night, just as we were all gone to bed,
-from Colonel Forster, to inform us that she was gone off to Scotland
-with one of his officers; to own the truth, with Wickham! Imagine our
-surprise. To Kitty, however, it does not seem so wholly unexpected. I am
-very, very sorry. So imprudent a match on both sides! But I am willing
-to hope the best, and that his character has been misunderstood.
-Thoughtless and indiscreet I can easily believe him, but this step (and
-let us rejoice over it) marks nothing bad at heart. His choice is
-disinterested at least, for he must know my father can give her nothing.
-Our poor mother is sadly grieved. My father bears it better. How
-thankful am I, that we never let them know what has been said against
-him; we must forget it ourselves. They were off Saturday night about
-twelve, as is conjectured, but were not missed till yesterday morning at
-eight. The express was sent off directly. My dear Lizzy, they must have
-passed within ten miles of us. Colonel Forster gives us reason to expect
-him here soon. Lydia left a few lines for his wife, informing her of
-their intention. I must conclude, for I cannot be long from my poor
-mother. I am afraid you will not be able to make it out, but I hardly
-know what I have written.”
-
-Without allowing herself time for consideration, and scarcely knowing
-what she felt, Elizabeth, on finishing this letter, instantly seized the
-other, and opening it with the utmost impatience, read as follows: it
-had been written a day later than the conclusion of the first.
-
-“By this time, my dearest sister, you have received my hurried letter; I
-wish this may be more intelligible, but though not confined for time, my
-head is so bewildered that I cannot answer for being coherent. Dearest
-Lizzy, I hardly know what I would write, but I have bad news for you,
-and it cannot be delayed. Imprudent as a marriage between Mr. Wickham
-and our poor Lydia would be, we are now anxious to be assured it has
-taken place, for there is but too much reason to fear they are not gone
-to Scotland. Colonel Forster came yesterday, having left Brighton the
-day before, not many hours after the express. Though Lydia’s short
-letter to Mrs. F. gave them to understand that they were going to Gretna
-Green, something was dropped by Denny expressing his belief that W.
-never intended to go there, or to marry Lydia at all, which was repeated
-to Colonel F., who, instantly taking the alarm, set off from B.,
-intending to trace their route. He did trace them easily to Clapham, but
-no farther; for on entering that place, they removed into a
-hackney-coach, and dismissed the chaise that brought them from Epsom.
-All that is known after this is, that they were seen to continue the
-London road. I know not what to think. After making every possible
-inquiry on that side of London, Colonel F. came on into Hertfordshire,
-anxiously renewing them at all the turnpikes, and at the inns in Barnet
-and Hatfield, but without any success,--no such people had been seen to
-pass through. With the kindest concern he came on to Longbourn, and
-broke his apprehensions to us in a manner most creditable to his heart.
-I am sincerely grieved for him and Mrs. F.; but no one can throw any
-blame on them. Our distress, my dear Lizzy, is very great. My father and
-mother believe the worst, but I cannot think so ill of him. Many
-circumstances might make it more eligible for them to be married
-privately in town than to pursue their first plan; and even if _he_
-could form such a design against a young woman of Lydia’s connections,
-which is not likely, can I suppose her so lost to everything?
-Impossible! I grieve to find, however, that Colonel F. is not disposed
-to depend upon their marriage: he shook his head when I expressed my
-hopes, and said he feared W. was not a man to be trusted. My poor mother
-is really ill, and keeps her room. Could she exert herself, it would be
-better, but this is not to be expected; and as to my father, I never in
-my life saw him so affected. Poor Kitty has anger for having concealed
-their attachment; but as it was a matter of confidence, one cannot
-wonder. I am truly glad, dearest Lizzy, that you have been spared
-something of these distressing scenes; but now, as the first shock is
-over, shall I own that I long for your return? I am not so selfish,
-however, as to press for it, if inconvenient. Adieu! I take up my pen
-again to do, what I have just told you I would not; but circumstances
-are such, that I cannot help earnestly begging you all to come here as
-soon as possible. I know my dear uncle and aunt so well, that I am not
-afraid of requesting it, though I have still something more to ask of
-the former. My father is going to London with Colonel Forster instantly,
-to try to discover her. What he means to do, I am sure I know not; but
-his excessive distress will not allow him to pursue any measure in the
-best and safest way, and Colonel Forster is obliged to be at Brighton
-again to-morrow evening. In such an exigence my uncle’s advice and
-assistance would be everything in the world; he will immediately
-comprehend what I must feel, and I rely upon his goodness.”
-
-“Oh! where, where is my uncle?” cried Elizabeth, darting from her seat
-as she finished the letter, in eagerness to follow him, without losing a
-moment of the time so precious; but as she reached the door, it was
-opened by a servant, and Mr. Darcy appeared. Her pale face and
-impetuous manner made him start, and before he could recover himself
-enough to speak, she, in whose mind every idea was superseded by Lydia’s
-situation, hastily exclaimed, “I beg your pardon, but I must leave you.
-I must find Mr. Gardiner this moment on business that cannot be delayed;
-I have not an instant to lose.”
-
-“Good God! what is the matter?” cried he, with more feeling than
-politeness; then recollecting himself, “I will not detain you a minute;
-but let me, or let the servant, go after Mr. and Mrs. Gardiner. You are
-not well enough; you cannot go yourself.”
-
-Elizabeth hesitated; but her knees trembled under her, and she felt how
-little would be gained by her attempting to pursue them. Calling back
-the servant, therefore, she commissioned him, though in so breathless an
-accent as made her almost unintelligible, to fetch his master and
-mistress home instantly.
-
-On his quitting the room, she sat down, unable to support herself, and
-looking so miserably ill, that it was impossible for Darcy to leave her,
-or to refrain from saying, in a tone of gentleness and commiseration,
-“Let me call your maid. Is there nothing you could take to give you
-present relief? A glass of wine; shall I get you one? You are very ill.”
-
-“No, I thank you,” she replied, endeavouring to recover herself. “There
-is nothing the matter with me. I am quite well, I am only distressed by
-some dreadful news which I have just received from Longbourn.”
-
-She burst into tears as she alluded to it, and for a few minutes could
-not speak another word. Darcy, in wretched suspense, could only say
-something indistinctly of his
-
-[Illustration:
-
-     “I have not an instant to lose”
-]
-
-concern, and observe her in compassionate silence. At length she spoke
-again. “I have just had a letter from Jane, with such dreadful news. It
-cannot be concealed from anyone. My youngest sister has left all her
-friends--has eloped; has thrown herself into the power of--of Mr.
-Wickham. They are gone off together from Brighton. _You_ know him too
-well to doubt the rest. She has no money, no connections, nothing that
-can tempt him to--she is lost for ever.”
-
-Darcy was fixed in astonishment.
-
-“When I consider,” she added, in a yet more agitated voice, “that _I_
-might have prevented it! _I_ who knew what he was. Had I but explained
-some part of it only--some part of what I learnt, to my own family! Had
-his character been known, this could not have happened. But it is all,
-all too late now.”
-
-“I am grieved, indeed,” cried Darcy: “grieved--shocked. But is it
-certain, absolutely certain?”
-
-“Oh, yes! They left Brighton together on Sunday night, and were traced
-almost to London, but not beyond: they are certainly not gone to
-Scotland.”
-
-“And what has been done, what has been attempted, to recover her?”
-
-“My father has gone to London, and Jane has written to beg my uncle’s
-immediate assistance, and we shall be off, I hope, in half an hour. But
-nothing can be done; I know very well that nothing can be done. How is
-such a man to be worked on? How are they even to be discovered? I have
-not the smallest hope. It is every way horrible!”
-
-Darcy shook his head in silent acquiescence.
-
-“When _my_ eyes were opened to his real character, oh! had I known what
-I ought, what I dared to do! But I knew not--I was afraid of doing too
-much. Wretched, wretched mistake!”
-
-Darcy made no answer. He seemed scarcely to hear her, and was walking up
-and down the room in earnest meditation; his brow contracted, his air
-gloomy. Elizabeth soon observed, and instantly understood it. Her power
-was sinking; everything _must_ sink under such a proof of family
-weakness, such an assurance of the deepest disgrace. She could neither
-wonder nor condemn; but the belief of his self-conquest brought nothing
-consolatory to her bosom, afforded no palliation of her distress. It
-was, on the contrary, exactly calculated to make her understand her own
-wishes; and never had she so honestly felt that she could have loved
-him, as now, when all love must be vain.
-
-But self, though it would intrude, could not engross her. Lydia--the
-humiliation, the misery she was bringing on them all--soon swallowed up
-every private care; and covering her face with her handkerchief,
-Elizabeth was soon lost to everything else; and, after a pause of
-several minutes, was only recalled to a sense of her situation by the
-voice of her companion, who, in a manner which, though it spoke
-compassion, spoke likewise restraint, said,--
-
-“I am afraid you have been long desiring my absence, nor have I anything
-to plead in excuse of my stay, but real, though unavailing concern.
-Would to Heaven that anything could be either said or done on my part,
-that might offer consolation to such distress! But I will not torment
-you with vain wishes, which may seem purposely to ask for your thanks.
-This unfortunate affair will, I fear, prevent my sister’s having the
-pleasure of seeing you at Pemberley to-day.”
-
-“Oh, yes! Be so kind as to apologize for us to Miss Darcy. Say that
-urgent business calls us home immediately. Conceal the unhappy truth as
-long as it is possible. I know it cannot be long.”
-
-He readily assured her of his secrecy, again expressed his sorrow for
-her distress, wished it a happier conclusion than there was at present
-reason to hope, and, leaving his compliments for her relations, with
-only one serious parting look, went away.
-
-As he quitted the room, Elizabeth felt how improbable it was that they
-should ever see each other again on such terms of cordiality as had
-marked their several meetings in Derbyshire; and as she threw a
-retrospective glance over the whole of their acquaintance, so full of
-contradictions and varieties, sighed at the perverseness of those
-feelings which would now have promoted its continuance, and would
-formerly have rejoiced in its termination.
-
-If gratitude and esteem are good foundations of affection, Elizabeth’s
-change of sentiment will be neither improbable nor faulty. But if
-otherwise, if the regard springing from such sources is unreasonable or
-unnatural, in comparison of what is so often described as arising on a
-first interview with its object, and even before two words have been
-exchanged, nothing can be said in her defence, except that she had given
-somewhat of a trial to the latter method, in her partiality for Wickham,
-and that its ill success might, perhaps, authorize her to seek the other
-less interesting mode of attachment. Be that as it may, she saw him go
-with regret; and in this early example of what Lydia’s infamy must
-produce, found additional anguish as she reflected on that wretched
-business. Never since reading Jane’s second letter had she entertained a
-hope of Wickham’s meaning to marry her. No one but Jane, she thought,
-could flatter herself with such an expectation. Surprise was the least
-of all her feelings on this development. While the contents of the first
-letter remained on her mind, she was all surprise, all astonishment,
-that Wickham should marry a girl whom it was impossible he could marry
-for money; and how Lydia could ever have attached him had appeared
-incomprehensible. But now it was all too natural. For such an attachment
-as this, she might have sufficient charms; and though she did not
-suppose Lydia to be deliberately engaging in an elopement, without the
-intention of marriage, she had no difficulty in believing that neither
-her virtue nor her understanding would preserve her from falling an easy
-prey.
-
-She had never perceived, while the regiment was in Hertfordshire, that
-Lydia had any partiality for him; but she was convinced that Lydia had
-wanted only encouragement to attach herself to anybody. Sometimes one
-officer, sometimes another, had been her favourite, as their attentions
-raised them in her opinion. Her affections had been continually
-fluctuating, but never without an object. The mischief of neglect and
-mistaken indulgence towards such a girl--oh! how acutely did she now
-feel it!
-
-She was wild to be at home--to hear, to see, to be upon the spot to
-share with Jane in the cares that must now fall wholly upon her, in a
-family so deranged; a father absent, a mother incapable of exertion, and
-requiring constant attendance; and though almost persuaded that nothing
-could be done for Lydia, her uncle’s interference seemed of the utmost
-importance, and till he entered the room the misery of her impatience
-was severe. Mr. and Mrs. Gardiner had hurried back in alarm, supposing,
-by the servant’s account, that their niece was taken suddenly ill; but
-satisfying them instantly on that head, she eagerly communicated the
-cause of their summons, reading the two letters aloud, and dwelling on
-the postscript of the last with trembling energy. Though Lydia had never
-been a favourite with them, Mr. and Mrs. Gardiner could not but be
-deeply affected. Not Lydia only, but all were concerned in it; and after
-the first exclamations of surprise and horror, Mr. Gardiner readily
-promised every assistance in his power. Elizabeth, though expecting no
-less, thanked him with tears of gratitude; and all three being actuated
-by one spirit, everything relating to their journey was speedily
-settled. They were to be off as soon as possible. “But what is to be
-done about Pemberley?” cried Mrs. Gardiner. “John told us Mr. Darcy was
-here when you sent for us;--was it so?”
-
-“Yes; and I told him we should not be able to keep our engagement.
-_That_ is all settled.”
-
-“What is all settled?” repeated the other, as she ran into her room to
-prepare. “And are they upon such terms as for her to disclose the real
-truth? Oh, that I knew how it was!”
-
-But wishes were vain; or, at best, could serve only to amuse her in the
-hurry and confusion of the following hour. Had Elizabeth been at leisure
-to be idle, she would have remained certain that all employment was
-impossible to one so wretched as herself; but she had her share of
-business as well as her aunt, and amongst the rest there were notes to
-be written to all their friends at Lambton, with false excuses for their
-sudden departure. An hour, however, saw the whole completed; and Mr.
-Gardiner, meanwhile, having settled his account at the inn, nothing
-remained to be done but to go; and Elizabeth, after all the misery of
-the morning, found herself, in a shorter space of time than she could
-have supposed, seated in the carriage, and on the road to Longbourn.
-
-
-
-
-[Illustration:
-
-     “The first pleasing earnest of their welcome”
-]
-
-
-
-
-CHAPTER XLVII.
-
-
-[Illustration]
-
-“I have been thinking it over again, Elizabeth,” said her uncle, as they
-drove from the town; “and really, upon serious consideration, I am much
-more inclined than I was to judge as your eldest sister does of the
-matter. It appears to me so very unlikely that any young man should form
-such a design against a girl who is by no means unprotected or
-friendless, and who was actually staying in his Colonel’s family, that I
-am strongly inclined to hope the best. Could he expect that her friends
-would not step forward? Could he expect to be noticed again by the
-regiment, after such an affront to Colonel Forster? His temptation is
-not adequate to the risk.”
-
-“Do you really think so?” cried Elizabeth, brightening up for a moment.
-
-“Upon my word,” said Mrs. Gardiner, “I begin to be of your uncle’s
-opinion. It is really too great a violation of decency, honour, and
-interest, for him to be guilty of it. I cannot think so very ill of
-Wickham. Can you, yourself, Lizzie, so wholly give him up, as to believe
-him capable of it?”
-
-“Not perhaps of neglecting his own interest. But of every other neglect
-I can believe him capable. If, indeed, it should be so! But I dare not
-hope it. Why should they not go on to Scotland, if that had been the
-case?”
-
-“In the first place,” replied Mr. Gardiner, “there is no absolute proof
-that they are not gone to Scotland.”
-
-“Oh, but their removing from the chaise into a hackney coach is such a
-presumption! And, besides, no traces of them were to be found on the
-Barnet road.”
-
-“Well, then,--supposing them to be in London--they may be there, though
-for the purpose of concealment, for no more exceptionable purpose. It is
-not likely that money should be very abundant on either side; and it
-might strike them that they could be more economically, though less
-expeditiously, married in London, than in Scotland.”
-
-“But why all this secrecy? Why any fear of detection? Why must their
-marriage be private? Oh, no, no--this is not likely. His most particular
-friend, you see by Jane’s account, was persuaded of his never intending
-to marry her. Wickham will never marry a woman without some money. He
-cannot afford it. And what claims has Lydia, what attractions has she
-beyond youth, health, and good humour, that could make him for her sake
-forego every chance of benefiting himself by marrying well? As to what
-restraint the apprehensions of disgrace in the corps might throw on a
-dishonourable elopement with her, I am not able to judge; for I know
-nothing of the effects that such a step might produce. But as to your
-other objection, I am afraid it will hardly hold good. Lydia has no
-brothers to step forward; and he might imagine, from my father’s
-behaviour, from his indolence and the little attention he has ever
-seemed to give to what was going forward in his family, that _he_ would
-do as little and think as little about it, as any father could do, in
-such a matter.”
-
-“But can you think that Lydia is so lost to everything but love of him,
-as to consent to live with him on any other terms than marriage?”
-
-“It does seem, and it is most shocking, indeed,” replied Elizabeth, with
-tears in her eyes, “that a sister’s sense of decency and virtue in such
-a point should admit of doubt. But, really, I know not what to say.
-Perhaps I am not doing her justice. But she is very young: she has never
-been taught to think on serious subjects; and for the last half year,
-nay, for a twelvemonth, she has been given up to nothing but amusement
-and vanity. She has been allowed to dispose of her time in the most idle
-and frivolous manner, and to adopt any opinions that came in her way.
-Since the ----shire were first quartered in Meryton, nothing but love,
-flirtation, and officers, have been in her head. She has been doing
-everything in her power, by thinking and talking on the subject, to give
-greater--what shall I call it?--susceptibility to her feelings; which
-are naturally lively enough. And we all know that Wickham has every
-charm of person and address that can captivate a woman.”
-
-“But you see that Jane,” said her aunt, “does not think so ill of
-Wickham, as to believe him capable of the attempt.”
-
-“Of whom does Jane ever think ill? And who is there, whatever might be
-their former conduct, that she would believe capable of such an attempt,
-till it were proved against them? But Jane knows, as well as I do, what
-Wickham really is. We both know that he has been profligate in every
-sense of the word; that he has neither integrity nor honour; that he is
-as false and deceitful as he is insinuating.”
-
-“And do you really know all this?” cried Mrs. Gardiner, whose curiosity
-as to the mode of her intelligence was all alive.
-
-“I do, indeed,” replied Elizabeth, colouring. “I told you the other day
-of his infamous behaviour to Mr. Darcy; and you, yourself, when last at
-Longbourn, heard in what manner he spoke of the man who had behaved with
-such forbearance and liberality towards him. And there are other
-circumstances which I am not at liberty--which it is not worth while to
-relate; but his lies about the whole Pemberley family are endless. From
-what he said of Miss Darcy, I was thoroughly prepared to see a proud,
-reserved, disagreeable girl. Yet he knew to the contrary himself. He
-must know that she was as amiable and unpretending as we have found
-her.”
-
-“But does Lydia know nothing of this? can she be ignorant of what you
-and Jane seem so well to understand?”
-
-“Oh, yes!--that, that is the worst of all. Till I was in Kent, and saw
-so much both of Mr. Darcy and his relation Colonel Fitzwilliam, I was
-ignorant of the truth myself. And when I returned home the ----shire
-was to leave Meryton in a week or fortnight’s time. As that was the
-case, neither Jane, to whom I related the whole, nor I, thought it
-necessary to make our knowledge public; for of what use could it
-apparently be to anyone, that the good opinion, which all the
-neighbourhood had of him, should then be overthrown? And even when it
-was settled that Lydia should go with Mrs. Forster, the necessity of
-opening her eyes to his character never occurred to me. That _she_ could
-be in any danger from the deception never entered my head. That such a
-consequence as _this_ should ensue, you may easily believe was far
-enough from my thoughts.”
-
-“When they all removed to Brighton, therefore, you had no reason, I
-suppose, to believe them fond of each other?”
-
-“Not the slightest. I can remember no symptom of affection on either
-side; and had anything of the kind been perceptible, you must be aware
-that ours is not a family on which it could be thrown away. When first
-he entered the corps, she was ready enough to admire him; but so we all
-were. Every girl in or near Meryton was out of her senses about him for
-the first two months: but he never distinguished _her_ by any particular
-attention; and, consequently, after a moderate period of extravagant and
-wild admiration, her fancy for him gave way, and others of the regiment,
-who treated her with more distinction, again became her favourites.”
-
-It may be easily believed, that however little of novelty could be added
-to their fears, hopes, and conjectures, on this interesting subject by
-its repeated discussion, no other could detain them from it long, during
-the whole of the journey. From Elizabeth’s thoughts it was never absent.
-Fixed there by the keenest of all anguish, self-reproach, she could
-find no interval of ease or forgetfulness.
-
-They travelled as expeditiously as possible; and sleeping one night on
-the road, reached Longbourn by dinnertime the next day. It was a comfort
-to Elizabeth to consider that Jane could not have been wearied by long
-expectations.
-
-The little Gardiners, attracted by the sight of a chaise, were standing
-on the steps of the house, as they entered the paddock; and when the
-carriage drove up to the door, the joyful surprise that lighted up their
-faces and displayed itself over their whole bodies, in a variety of
-capers and frisks, was the first pleasing earnest of their welcome.
-
-Elizabeth jumped out; and after giving each of them a hasty kiss,
-hurried into the vestibule, where Jane, who came running downstairs from
-her mother’s apartment, immediately met her.
-
-Elizabeth, as she affectionately embraced her, whilst tears filled the
-eyes of both, lost not a moment in asking whether anything had been
-heard of the fugitives.
-
-“Not yet,” replied Jane. “But now that my dear uncle is come, I hope
-everything will be well.”
-
-“Is my father in town?”
-
-“Yes, he went on Tuesday, as I wrote you word.”
-
-“And have you heard from him often?”
-
-“We have heard only once. He wrote me a few lines on Wednesday, to say
-that he had arrived in safety, and to give me his directions, which I
-particularly begged him to do. He merely added, that he should not write
-again, till he had something of importance to mention.”
-
-“And my mother--how is she? How are you all?”
-
-“My mother is tolerably well, I trust; though her spirits are greatly
-shaken. She is upstairs, and will have great satisfaction in seeing you
-all. She does not yet leave her dressing-room. Mary and Kitty, thank
-Heaven! are quite well.”
-
-“But you--how are you?” cried Elizabeth. “You look pale. How much you
-must have gone through!”
-
-Her sister, however, assured her of her being perfectly well; and their
-conversation, which had been passing while Mr. and Mrs. Gardiner were
-engaged with their children, was now put an end to by the approach of
-the whole party. Jane ran to her uncle and aunt, and welcomed and
-thanked them both, with alternate smiles and tears.
-
-When they were all in the drawing-room, the questions which Elizabeth
-had already asked were of course repeated by the others, and they soon
-found that Jane had no intelligence to give. The sanguine hope of good,
-however, which the benevolence of her heart suggested, had not yet
-deserted her; she still expected that it would all end well, and that
-every morning would bring some letter, either from Lydia or her father,
-to explain their proceedings, and, perhaps, announce the marriage.
-
-Mrs. Bennet, to whose apartment they all repaired, after a few minutes’
-conversation together, received them exactly as might be expected; with
-tears and lamentations of regret, invectives against the villainous
-conduct of Wickham, and complaints of her own sufferings and ill-usage;
-blaming everybody but the person to whose ill-judging indulgence the
-errors of her daughter must be principally owing.
-
-“If I had been able,” said she, “to carry my point in going to Brighton
-with all my family, _this_ would not have happened: but poor dear Lydia
-had nobody to take care of her. Why did the Forsters ever let her go out
-of their sight? I am sure there was some great neglect or other on their
-side, for she is not the kind of girl to do such a thing, if she had
-been well looked after. I always thought they were very unfit to have
-the charge of her; but I was over-ruled, as I always am. Poor, dear
-child! And now here’s Mr. Bennet gone away, and I know he will fight
-Wickham, wherever he meets him, and then he will be killed, and what is
-to become of us all? The Collinses will turn us out, before he is cold
-in his grave; and if you are not kind to us, brother, I do not know what
-we shall do.”
-
-They all exclaimed against such terrific ideas; and Mr. Gardiner, after
-general assurances of his affection for her and all her family, told her
-that he meant to be in London the very next day, and would assist Mr.
-Bennet in every endeavour for recovering Lydia.
-
-“Do not give way to useless alarm,” added he: “though it is right to be
-prepared for the worst, there is no occasion to look on it as certain.
-It is not quite a week since they left Brighton. In a few days more, we
-may gain some news of them; and till we know that they are not married,
-and have no design of marrying, do not let us give the matter over as
-lost. As soon as I get to town, I shall go to my brother, and make him
-come home with me to Gracechurch Street, and then we may consult
-together as to what is to be done.”
-
-“Oh, my dear brother,” replied Mrs. Bennet, “that is exactly what I
-could most wish for. And now do, when you get to town, find them out,
-wherever they may be; and if they are not married already, _make_ them
-marry. And as for wedding clothes, do not let them wait for that, but
-tell Lydia she shall have as much money as she chooses to buy them,
-after they are married. And, above all things, keep Mr. Bennet from
-fighting. Tell him what a dreadful state I am in--that I am frightened
-out of my wits; and have such tremblings, such flutterings all over me,
-such spasms in my side, and pains in my head, and such beatings at my
-heart, that I can get no rest by night nor by day. And tell my dear
-Lydia not to give any directions about her clothes till she has seen me,
-for she does not know which are the best warehouses. Oh, brother, how
-kind you are! I know you will contrive it all.”
-
-But Mr. Gardiner, though he assured her again of his earnest endeavours
-in the cause, could not avoid recommending moderation to her, as well in
-her hopes as her fears; and after talking with her in this manner till
-dinner was on table, they left her to vent all her feelings on the
-housekeeper, who attended in the absence of her daughters.
-
-Though her brother and sister were persuaded that there was no real
-occasion for such a seclusion from the family, they did not attempt to
-oppose it; for they knew that she had not prudence enough to hold her
-tongue before the servants, while they waited at table, and judged it
-better that _one_ only of the household, and the one whom they could
-most trust, should comprehend all her fears and solicitude on the
-subject.
-
-In the dining-room they were soon joined by Mary and Kitty, who had been
-too busily engaged in their separate apartments to make their appearance
-before. One came from her books, and the other from her toilette. The
-faces of both, however, were tolerably calm; and no change was visible
-in either, except that the loss of her favourite sister, or the anger
-which she had herself incurred in the business, had given something more
-of fretfulness than usual to the accents of Kitty. As for Mary, she was
-mistress enough of herself to whisper to Elizabeth, with a countenance
-of grave reflection, soon after they were seated at table,--
-
-“This is a most unfortunate affair, and will probably be much talked of.
-But we must stem the tide of malice, and pour into the wounded bosoms of
-each other the balm of sisterly consolation.”
-
-Then perceiving in Elizabeth no inclination of replying, she added,
-“Unhappy as the event must be for Lydia, we may draw from it this useful
-lesson:--that loss of virtue in a female is irretrievable, that one
-false step involves her in endless ruin, that her reputation is no less
-brittle than it is beautiful, and that she cannot be too much guarded in
-her behaviour towards the undeserving of the other sex.”
-
-Elizabeth lifted up her eyes in amazement, but was too much oppressed to
-make any reply. Mary, however, continued to console herself with such
-kind of moral extractions from the evil before them.
-
-In the afternoon, the two elder Miss Bennets were able to be for half an
-hour by themselves; and Elizabeth instantly availed herself of the
-opportunity of making any inquiries which Jane was equally eager to
-satisfy. After joining in general lamentations over the dreadful sequel
-of this event, which Elizabeth considered as all but certain, and Miss
-Bennet could not assert to be wholly impossible, the former continued
-the subject by saying, “But tell me all and everything about it which I
-have not already heard. Give me further particulars. What did Colonel
-Forster say? Had they no apprehension of anything before the elopement
-took place? They must have seen them together for ever.”
-
-“Colonel Forster did own that he had often suspected some partiality,
-especially on Lydia’s side, but nothing to give him any alarm. I am so
-grieved for him. His behaviour was attentive and kind to the utmost. He
-_was_ coming to us, in order to assure us of his concern, before he had
-any idea of their not being gone to Scotland: when that apprehension
-first got abroad, it hastened his journey.”
-
-“And was Denny convinced that Wickham would not marry? Did he know of
-their intending to go off? Had Colonel Forster seen Denny himself?”
-
-“Yes; but when questioned by _him_, Denny denied knowing anything of
-their plan, and would not give his real opinion about it. He did not
-repeat his persuasion of their not marrying, and from _that_ I am
-inclined to hope he might have been misunderstood before.”
-
-“And till Colonel Forster came himself, not one of you entertained a
-doubt, I suppose, of their being really married?”
-
-“How was it possible that such an idea should enter our brains? I felt a
-little uneasy--a little fearful of my sister’s happiness with him in
-marriage, because I knew that his conduct had not been always quite
-right. My father and mother knew nothing of that; they only felt how
-imprudent a match it must be. Kitty then owned, with a very natural
-triumph on knowing more than the rest of us, that in Lydia’s last letter
-she had prepared her for such a step. She had known, it seems, of their
-being in love with each other many weeks.”
-
-“But not before they went to Brighton?”
-
-“No, I believe not.”
-
-“And did Colonel Forster appear to think ill of Wickham himself? Does he
-know his real character?”
-
-“I must confess that he did not speak so well of Wickham as he formerly
-did. He believed him to be imprudent and extravagant; and since this sad
-affair has taken place, it is said that he left Meryton greatly in debt:
-but I hope this may be false.”
-
-“Oh, Jane, had we been less secret, had we told what we knew of him,
-this could not have happened!”
-
-“Perhaps it would have been better,” replied her sister.
-
-“But to expose the former faults of any person, without knowing what
-their present feelings were, seemed unjustifiable.”
-
-“We acted with the best intentions.”
-
-“Could Colonel Forster repeat the particulars of Lydia’s note to his
-wife?”
-
-“He brought it with him for us to see.”
-
-Jane then took it from her pocket-book, and gave it to Elizabeth. These
-were the contents:--
-
-     /* NIND “My dear Harriet, */
-
-     “You will laugh when you know where I am gone, and I cannot help
-     laughing myself at your surprise to-morrow morning, as soon as I am
-     missed. I am going to Gretna Green, and if you cannot guess with
-     who, I shall think you a simpleton, for there is but one man in the
-     world I love, and he is an angel. I should never be happy without
-     him, so think it no harm to be off. You need not send them word at
-     Longbourn of my going, if you do not like it, for it will make the
-     surprise the greater when I write to them, and sign my name Lydia
-     Wickham. What a good joke it will be! I can hardly write for
-     laughing. Pray make my excuses to Pratt for not keeping my
-     engagement, and dancing with him to-night. Tell him I hope he will
-     excuse me when he knows all, and tell him I will dance with him at
-     the next ball we meet with great pleasure. I shall send for my
-     clothes when I get to Longbourn; but I wish you would tell Sally to
-     mend a great slit in my worked muslin gown before they are packed
-     up. Good-bye. Give my love to Colonel Forster. I hope you will
-     drink to our good journey.
-
-“Your affectionate friend,
-
-“LYDIA BENNET.”
-
-
-“Oh, thoughtless, thoughtless Lydia!” cried Elizabeth when she had
-finished it. “What a letter is this, to be written at such a moment! But
-at least it shows that _she_ was serious in the object of her journey.
-Whatever he might afterwards persuade her to, it was not on her side a
-_scheme_ of infamy. My poor father! how he must have felt it!”
-
-“I never saw anyone so shocked. He could not speak a word for full ten
-minutes. My mother was taken ill immediately, and the whole house in
-such confusion!”
-
-“Oh, Jane,” cried Elizabeth, “was there a servant belonging to it who
-did not know the whole story before the end of the day?”
-
-“I do not know: I hope there was. But to be guarded at such a time is
-very difficult. My mother was in hysterics; and though I endeavoured to
-give her every assistance in my power, I am afraid I did not do so much
-as I might have done. But the horror of what might possibly happen
-almost took from me my faculties.”
-
-“Your attendance upon her has been too much for you. You do not look
-well. Oh that I had been with you! you have had every care and anxiety
-upon yourself alone.”
-
-“Mary and Kitty have been very kind, and would have shared in every
-fatigue, I am sure, but I did not think it right for either of them.
-Kitty is slight and delicate, and Mary studies so much that her hours of
-repose should not be broken in on. My aunt Philips came to Longbourn on
-Tuesday, after my father went away; and was so good as to stay till
-Thursday with me. She was of great use and comfort to us all, and Lady
-Lucas has been very kind: she walked here on Wednesday morning to
-condole with us, and offered her services, or any of her daughters, if
-they could be of use to us.”
-
-“She had better have stayed at home,” cried Elizabeth: “perhaps she
-_meant_ well, but, under such a misfortune as this, one cannot see too
-little of one’s neighbours. Assistance is impossible; condolence,
-insufferable. Let them triumph over us at a distance, and be satisfied.”
-
-She then proceeded to inquire into the measures which her father had
-intended to pursue, while in town, for the recovery of his daughter.
-
-“He meant, I believe,” replied Jane, “to go to Epsom, the place where
-they last changed horses, see the postilions, and try if anything could
-be made out from them. His principal object must be to discover the
-number of the hackney coach which took them from Clapham. It had come
-with a fare from London; and as he thought the circumstance of a
-gentleman and lady’s removing from one carriage into another might be
-remarked, he meant to make inquiries at Clapham. If he could anyhow
-discover at what house the coachman had before set down his fare, he
-determined to make inquiries there, and hoped it might not be impossible
-to find out the stand and number of the coach. I do not know of any
-other designs that he had formed; but he was in such a hurry to be gone,
-and his spirits so greatly discomposed, that I had difficulty in finding
-out even so much as this.”
-
-
-
-
-[Illustration:
-
-     The Post
-]
-
-
-
-
-CHAPTER XLVIII.
-
-
-[Illustration]
-
-The whole party were in hopes of a letter from Mr. Bennet the next
-morning, but the post came in without bringing a single line from him.
-His family knew him to be, on all common occasions, a most negligent and
-dilatory correspondent; but at such a time they had hoped for exertion.
-They were forced to conclude, that he had no pleasing intelligence to
-send; but even of _that_ they would have been glad to be certain. Mr.
-Gardiner had waited only for the letters before he set off.
-
-When he was gone, they were certain at least of receiving constant
-information of what was going on; and their uncle promised, at parting,
-to prevail on Mr. Bennet to return to Longbourn as soon as he could, to
-the great consolation of his sister, who considered it as the only
-security for her husband’s not being killed in a duel.
-
-Mrs. Gardiner and the children were to remain in Hertfordshire a few
-days longer, as the former thought her presence might be serviceable to
-her nieces. She shared in their attendance on Mrs. Bennet, and was a
-great comfort to them in their hours of freedom. Their other aunt also
-visited them frequently, and always, as she said, with the design of
-cheering and heartening them up--though, as she never came without
-reporting some fresh instance of Wickham’s extravagance or irregularity,
-she seldom went away without leaving them more dispirited than she found
-them.
-
-All Meryton seemed striving to blacken the man who, but three months
-before, had been almost an angel of light. He was declared to be in debt
-to every tradesman in the place, and his intrigues, all honoured with
-the title of seduction, had been extended into every tradesman’s family.
-Everybody declared that he was the wickedest young man in the world; and
-everybody began to find out that they had always distrusted the
-appearance of his goodness. Elizabeth, though she did not credit above
-half of what was said, believed enough to make her former assurance of
-her sister’s ruin still more certain; and even Jane, who believed still
-less of it, became almost hopeless, more especially as the time was now
-come, when, if they had gone to Scotland, which she had never before
-entirely despaired of, they must in all probability have gained some
-news of them.
-
-Mr. Gardiner left Longbourn on Sunday; on Tuesday, his wife received a
-letter from him: it told them, that on his arrival he had immediately
-found out his brother, and persuaded him to come to Gracechurch Street.
-That Mr. Bennet had been to Epsom and Clapham, before his arrival, but
-without gaining any satisfactory information; and that he was now
-determined to inquire at all the principal hotels in town, as Mr. Bennet
-thought it possible they might have gone to one of them, on their first
-coming to London, before they procured lodgings. Mr. Gardiner himself
-did not expect any success from this measure; but as his brother was
-eager in it, he meant to assist him in pursuing it. He added, that Mr.
-Bennet seemed wholly disinclined at present to leave London, and
-promised to write again very soon. There was also a postscript to this
-effect:--
-
-“I have written to Colonel Forster to desire him to find out, if
-possible, from some of the young man’s intimates in the regiment,
-whether Wickham has any relations or connections who would be likely to
-know in what part of the town he has now concealed himself. If there
-were anyone that one could apply to, with a probability of gaining such
-a clue as that, it might be of essential consequence. At present we have
-nothing to guide us. Colonel Forster will, I dare say, do everything in
-his power to satisfy us on this head. But, on second thoughts, perhaps
-Lizzy could tell us what relations he has now living better than any
-other person.”
-
-Elizabeth was at no loss to understand from whence this deference for
-her authority proceeded; but it was not in her power to give any
-information of so satisfactory a nature as the compliment deserved.
-
-She had never heard of his having had any relations, except a father
-and mother, both of whom had been dead many years. It was possible,
-however, that some of his companions in the ----shire might be able to
-give more information; and though she was not very sanguine in expecting
-it, the application was a something to look forward to.
-
-Every day at Longbourn was now a day of anxiety; but the most anxious
-part of each was when the post was expected. The arrival of letters was
-the first grand object of every morning’s impatience. Through letters,
-whatever of good or bad was to be told would be communicated; and every
-succeeding day was expected to bring some news of importance.
-
-But before they heard again from Mr. Gardiner, a letter arrived for
-their father, from a different quarter, from Mr. Collins; which, as Jane
-had received directions to open all that came for him in his absence,
-she accordingly read; and Elizabeth, who knew what curiosities his
-letters always were, looked over her, and read it likewise. It was as
-follows:--
-
-     /* “My dear Sir, */
-
-     “I feel myself called upon, by our relationship, and my situation
-     in life, to condole with you on the grievous affliction you are now
-     suffering under, of which we were yesterday informed by a letter
-     from Hertfordshire. Be assured, my dear sir, that Mrs. Collins and
-     myself sincerely sympathize with you, and all your respectable
-     family, in your present distress, which must be of the bitterest
-     kind, because proceeding from a cause which no time can remove. No
-     arguments shall be wanting on my part, that can alleviate so severe
-     a misfortune; or that may comfort you, under a circumstance that
-     must be, of all others, most afflicting to a parent’s mind. The
-     death of your daughter would have been a blessing in comparison of
-     this. And it is the more to be lamented, because there is reason to
-     suppose, as my dear Charlotte informs me, that this licentiousness
-     of behaviour in your
-
-     [Illustration:
-
-“To whom I have related the affair”
-
-     [_Copyright 1894 by George Allen._]]
-
-     daughter has proceeded from a faulty degree of indulgence; though,
-     at the same time, for the consolation of yourself and Mrs. Bennet,
-     I am inclined to think that her own disposition must be naturally
-     bad, or she could not be guilty of such an enormity, at so early an
-     age. Howsoever that may be, you are grievously to be pitied; in
-     which opinion I am not only joined by Mrs. Collins, but likewise by
-     Lady Catherine and her daughter, to whom I have related the affair.
-     They agree with me in apprehending that this false step in one
-     daughter will be injurious to the fortunes of all the others: for
-     who, as Lady Catherine herself condescendingly says, will connect
-     themselves with such a family? And this consideration leads me,
-     moreover, to reflect, with augmented satisfaction, on a certain
-     event of last November; for had it been otherwise, I must have been
-     involved in all your sorrow and disgrace. Let me advise you, then,
-     my dear sir, to console yourself as much as possible, to throw off
-     your unworthy child from your affection for ever, and leave her to
-     reap the fruits of her own heinous offence.
-
-“I am, dear sir,” etc., etc.
-
-Mr. Gardiner did not write again, till he had received an answer from
-Colonel Forster; and then he had nothing of a pleasant nature to send.
-It was not known that Wickham had a single relation with whom he kept up
-any connection, and it was certain that he had no near one living. His
-former acquaintance had been numerous; but since he had been in the
-militia, it did not appear that he was on terms of particular friendship
-with any of them. There was no one, therefore, who could be pointed out
-as likely to give any news of him. And in the wretched state of his own
-finances, there was a very powerful motive for secrecy, in addition to
-his fear of discovery by Lydia’s relations; for it had just transpired
-that he had left gaming debts behind him to a very considerable amount.
-Colonel Forster believed that more than a thousand pounds would be
-necessary to clear his expenses at Brighton. He owed a good deal in the
-town, but his debts of honour were still more formidable. Mr. Gardiner
-did not attempt to conceal these particulars from the Longbourn family;
-Jane heard them with horror. “A gamester!” she cried. “This is wholly
-unexpected; I had not an idea of it.”
-
-Mr. Gardiner added, in his letter, that they might expect to see their
-father at home on the following day, which was Saturday. Rendered
-spiritless by the ill success of all their endeavours, he had yielded to
-his brother-in-law’s entreaty that he would return to his family and
-leave it to him to do whatever occasion might suggest to be advisable
-for continuing their pursuit. When Mrs. Bennet was told of this, she did
-not express so much satisfaction as her children expected, considering
-what her anxiety for his life had been before.
-
-“What! is he coming home, and without poor Lydia?” she cried. “Sure he
-will not leave London before he has found them. Who is to fight Wickham,
-and make him marry her, if he comes away?”
-
-As Mrs. Gardiner began to wish to be at home, it was settled that she
-and her children should go to London at the same time that Mr. Bennet
-came from it. The coach, therefore, took them the first stage of their
-journey, and brought its master back to Longbourn.
-
-Mrs. Gardiner went away in all the perplexity about Elizabeth and her
-Derbyshire friend, that had attended her from that part of the world.
-His name had never been voluntarily mentioned before them by her niece;
-and the kind of half-expectation which Mrs. Gardiner had formed, of
-their being followed by a letter from him, had ended in nothing.
-Elizabeth had received none since her return, that could come from
-Pemberley.
-
-The present unhappy state of the family rendered any other excuse for
-the lowness of her spirits unnecessary; nothing, therefore, could be
-fairly conjectured from _that_,--though Elizabeth, who was by this time
-tolerably well acquainted with her own feelings, was perfectly aware
-that, had she known nothing of Darcy, she could have borne the dread of
-Lydia’s infamy somewhat better. It would have spared her, she thought,
-one sleepless night out of two.
-
-When Mr. Bennet arrived, he had all the appearance of his usual
-philosophic composure. He said as little as he had ever been in the
-habit of saying; made no mention of the business that had taken him
-away; and it was some time before his daughters had courage to speak of
-it.
-
-It was not till the afternoon, when he joined them at tea, that
-Elizabeth ventured to introduce the subject; and then, on her briefly
-expressing her sorrow for what he must have endured, he replied, “Say
-nothing of that. Who should suffer but myself? It has been my own doing,
-and I ought to feel it.”
-
-“You must not be too severe upon yourself,” replied Elizabeth.
-
-“You may well warn me against such an evil. Human nature is so prone to
-fall into it! No, Lizzy, let me once in my life feel how much I have
-been to blame. I am not afraid of being overpowered by the impression.
-It will pass away soon enough.”
-
-“Do you suppose them to be in London?”
-
-“Yes; where else can they be so well concealed?”
-
-“And Lydia used to want to go to London,” added Kitty.
-
-“She is happy, then,” said her father, drily; “and her residence there
-will probably be of some duration.”
-
-Then, after a short silence, he continued, “Lizzy, I bear you no
-ill-will for being justified in your advice to me last May, which,
-considering the event, shows some greatness of mind.”
-
-They were interrupted by Miss Bennet, who came to fetch her mother’s
-tea.
-
-“This is a parade,” cried he, “which does one good; it gives such an
-elegance to misfortune! Another day I will do the same; I will sit in my
-library, in my nightcap and powdering gown, and give as much trouble as
-I can,--or perhaps I may defer it till Kitty runs away.”
-
-“I am not going to run away, papa,” said Kitty, fretfully. “If _I_
-should ever go to Brighton, I would behave better than Lydia.”
-
-“_You_ go to Brighton! I would not trust you so near it as Eastbourne,
-for fifty pounds! No, Kitty, I have at least learnt to be cautious, and
-you will feel the effects of it. No officer is ever to enter my house
-again, nor even to pass through the village. Balls will be absolutely
-prohibited, unless you stand up with one of your sisters. And you are
-never to stir out of doors, till you can prove that you have spent ten
-minutes of every day in a rational manner.”
-
-Kitty, who took all these threats in a serious light, began to cry.
-
-“Well, well,” said he, “do not make yourself unhappy. If you are a good
-girl for the next ten years, I will take you to a review at the end of
-them.”
-
-
-
-
-[Illustration]
-
-
-
-
-CHAPTER XLIX.
-
-
-[Illustration]
-
-Two days after Mr. Bennet’s return, as Jane and Elizabeth were walking
-together in the shrubbery behind the house, they saw the housekeeper
-coming towards them, and concluding that she came to call them to their
-mother, went forward to meet her; but instead of the expected summons,
-when they approached her, she said to Miss Bennet, “I beg your pardon,
-madam, for interrupting you, but I was in hopes you might have got some
-good news from town, so I took the liberty of coming to ask.”
-
-“What do you mean, Hill? We have heard nothing from town.”
-
-“Dear madam,” cried Mrs. Hill, in great astonishment, “don’t you know
-there is an express come for master from Mr. Gardiner? He has been here
-this half hour, and master has had a letter.”
-
-Away ran the girls, too eager to get in to have time for speech. They
-ran through the vestibule into the breakfast-room; from thence to the
-library;--their father was in neither; and they were on the point of
-seeking him upstairs with their mother, when they were met by the
-butler, who said,--
-
-“If you are looking for my master, ma’am, he is walking towards the
-little copse.”
-
-Upon this information, they instantly passed through the hall once more,
-and ran across the lawn after their father, who was deliberately
-pursuing his way towards a small wood on one side of the paddock.
-
-Jane, who was not so light, nor so much in the habit of running as
-Elizabeth, soon lagged behind, while her sister, panting for breath,
-came up with him, and eagerly cried out,--
-
-“Oh, papa, what news? what news? have you heard from my uncle?”
-
-“Yes, I have had a letter from him by express.”
-
-“Well, and what news does it bring--good or bad?”
-
-“What is there of good to be expected?” said he, taking the letter from
-his pocket; “but perhaps you would like to read it.”
-
-Elizabeth impatiently caught it from his hand. Jane now came up.
-
-“Read it aloud,” said their father, “for I hardly know myself what it is
-about.”
-
-     /* RIGHT “Gracechurch Street, _Monday, August 2_. */
-
-“My dear Brother,
-
-     “At last I am able to send you some tidings of my niece, and such
-     as, upon the whole, I hope will give you satisfaction. Soon after
-     you left me on Saturday, I was fortunate enough to find out in what
-     part of London they were. The particulars I reserve till we meet.
-     It is enough to know they are discovered: I have seen them
-     both----”
-
-     [Illustration:
-
-“But perhaps you would like to read it”
-
-     [_Copyright 1894 by George Allen._]]
-
-     “Then it is as I always hoped,” cried Jane: “they are married!”
-
-     Elizabeth read on: “I have seen them both. They are not married,
-     nor can I find there was any intention of being so; but if you are
-     willing to perform the engagements which I have ventured to make on
-     your side, I hope it will not be long before they are. All that is
-     required of you is, to assure to your daughter, by settlement, her
-     equal share of the five thousand pounds, secured among your
-     children after the decease of yourself and my sister; and,
-     moreover, to enter into an engagement of allowing her, during your
-     life, one hundred pounds per annum. These are conditions which,
-     considering everything, I had no hesitation in complying with, as
-     far as I thought myself privileged, for you. I shall send this by
-     express, that no time may be lost in bringing me your answer. You
-     will easily comprehend, from these particulars, that Mr. Wickham’s
-     circumstances are not so hopeless as they are generally believed to
-     be. The world has been deceived in that respect; and I am happy to
-     say, there will be some little money, even when all his debts are
-     discharged, to settle on my niece, in addition to her own fortune.
-     If, as I conclude will be the case, you send me full powers to act
-     in your name throughout the whole of this business, I will
-     immediately give directions to Haggerston for preparing a proper
-     settlement. There will not be the smallest occasion for your coming
-     to town again; therefore stay quietly at Longbourn, and depend on
-     my diligence and care. Send back your answer as soon as you can,
-     and be careful to write explicitly. We have judged it best that my
-     niece should be married from this house, of which I hope you will
-     approve. She comes to us to-day. I shall write again as soon as
-     anything more is determined on. Yours, etc.
-
-“EDW. GARDINER.”
-
-“Is it possible?” cried Elizabeth, when she had finished. “Can it be
-possible that he will marry her?”
-
-“Wickham is not so undeserving, then, as we have thought him,” said her
-sister. “My dear father, I congratulate you.”
-
-“And have you answered the letter?” said Elizabeth.
-
-“No; but it must be done soon.”
-
-Most earnestly did she then entreat him to lose no more time before he
-wrote.
-
-“Oh! my dear father,” she cried, “come back and write immediately.
-Consider how important every moment is in such a case.”
-
-“Let me write for you,” said Jane, “if you dislike the trouble
-yourself.”
-
-“I dislike it very much,” he replied; “but it must be done.”
-
-And so saying, he turned back with them, and walked towards the house.
-
-“And--may I ask?” said Elizabeth; “but the terms, I suppose, must be
-complied with.”
-
-“Complied with! I am only ashamed of his asking so little.”
-
-“And they _must_ marry! Yet he is _such_ a man.”
-
-“Yes, yes, they must marry. There is nothing else to be done. But there
-are two things that I want very much to know:--one is, how much money
-your uncle has laid down to bring it about; and the other, how I am ever
-to pay him.”
-
-“Money! my uncle!” cried Jane, “what do you mean, sir?”
-
-“I mean that no man in his proper senses would marry Lydia on so slight
-a temptation as one hundred a year during my life, and fifty after I am
-gone.”
-
-“That is very true,” said Elizabeth; “though it had not occurred to me
-before. His debts to be discharged, and something still to remain! Oh,
-it must be my uncle’s doings! Generous, good man, I am afraid he has
-distressed himself. A small sum could not do all this.”
-
-“No,” said her father. “Wickham’s a fool if he takes her with a farthing
-less than ten thousand pounds: I should be sorry to think so ill of him,
-in the very beginning of our relationship.”
-
-“Ten thousand pounds! Heaven forbid! How is half such a sum to be
-repaid?”
-
-Mr. Bennet made no answer; and each of them, deep in thought, continued
-silent till they reached the house. Their father then went to the
-library to write, and the girls walked into the breakfast-room.
-
-“And they are really to be married!” cried Elizabeth, as soon as they
-were by themselves. “How strange this is! and for _this_ we are to be
-thankful. That they should marry, small as is their chance of happiness,
-and wretched as is his character, we are forced to rejoice! Oh, Lydia!”
-
-“I comfort myself with thinking,” replied Jane, “that he certainly would
-not marry Lydia, if he had not a real regard for her. Though our kind
-uncle has done something towards clearing him, I cannot believe that ten
-thousand pounds, or anything like it, has been advanced. He has children
-of his own, and may have more. How could he spare half ten thousand
-pounds?”
-
-“If we are ever able to learn what Wickham’s debts have been,” said
-Elizabeth, “and how much is settled on his side on our sister, we shall
-exactly know what Mr. Gardiner has done for them, because Wickham has
-not sixpence of his own. The kindness of my uncle and aunt can never be
-requited. Their taking her home, and affording her their personal
-protection and countenance, is such a sacrifice to her advantage as
-years of gratitude cannot enough acknowledge. By this time she is
-actually with them! If such goodness does not make her miserable now,
-she will never deserve to be happy! What a meeting for her, when she
-first sees my aunt!”
-
-“We must endeavour to forget all that has passed on either side,” said
-Jane: “I hope and trust they will yet be happy. His consenting to marry
-her is a proof, I will believe, that he is come to a right way of
-thinking. Their mutual affection will steady them; and I flatter myself
-they will settle so quietly, and live in so rational a manner, as may in
-time make their past imprudence forgotten.”
-
-“Their conduct has been such,” replied Elizabeth, “as neither you, nor
-I, nor anybody, can ever forget. It is useless to talk of it.”
-
-It now occurred to the girls that their mother was in all likelihood
-perfectly ignorant of what had happened. They went to the library,
-therefore, and asked their father whether he would not wish them to make
-it known to her. He was writing, and, without raising his head, coolly
-replied,--
-
-“Just as you please.”
-
-“May we take my uncle’s letter to read to her?”
-
-“Take whatever you like, and get away.”
-
-Elizabeth took the letter from his writing-table, and they went upstairs
-together. Mary and Kitty were both with Mrs. Bennet: one communication
-would, therefore, do for all. After a slight preparation for good news,
-the letter was read aloud. Mrs. Bennet could hardly contain herself. As
-soon as Jane had read Mr. Gardiner’s hope of Lydia’s being soon married,
-her joy burst forth, and every following sentence added to its
-exuberance. She was now in an irritation as violent from delight as she
-had ever been fidgety from alarm and vexation. To know that her daughter
-would be married was enough. She was disturbed by no fear for her
-felicity, nor humbled by any remembrance of her misconduct.
-
-“My dear, dear Lydia!” she cried: “this is delightful indeed! She will
-be married! I shall see her again! She will be married at sixteen! My
-good, kind brother! I knew how it would be--I knew he would manage
-everything. How I long to see her! and to see dear Wickham too! But the
-clothes, the wedding clothes! I will write to my sister Gardiner about
-them directly. Lizzy, my dear, run down to your father, and ask him how
-much he will give her. Stay, stay, I will go myself. Ring the bell,
-Kitty, for Hill. I will put on my things in a moment. My dear, dear
-Lydia! How merry we shall be together when we meet!”
-
-Her eldest daughter endeavoured to give some relief to the violence of
-these transports, by leading her thoughts to the obligations which Mr.
-Gardiner’s behaviour laid them all under.
-
-“For we must attribute this happy conclusion,” she added, “in a great
-measure to his kindness. We are persuaded that he has pledged himself to
-assist Mr. Wickham with money.”
-
-“Well,” cried her mother, “it is all very right; who should do it but
-her own uncle? If he had not had a family of his own, I and my children
-must have had all his money, you know; and it is the first time we have
-ever had anything from him except a few presents. Well! I am so happy.
-In a short time, I shall have a daughter married. Mrs. Wickham! How well
-it sounds! And she was only sixteen last June. My dear Jane, I am in
-such a flutter, that I am sure I can’t write; so I will dictate, and you
-write for me. We will settle with your father about the money
-afterwards; but the things should be ordered immediately.”
-
-She was then proceeding to all the particulars of calico, muslin, and
-cambric, and would shortly have dictated some very plentiful orders, had
-not Jane, though with some difficulty, persuaded her to wait till her
-father was at leisure to be consulted. One day’s delay, she observed,
-would be of small importance; and her mother was too happy to be quite
-so obstinate as usual. Other schemes, too, came into her head.
-
-“I will go to Meryton,” said she, “as soon as I am dressed, and tell the
-good, good news to my sister Philips. And as I come back, I can call on
-Lady Lucas and Mrs. Long. Kitty, run down and order the carriage. An
-airing would do me a great deal of good, I am sure. Girls, can I do
-anything for you in Meryton? Oh! here comes Hill. My dear Hill, have you
-heard the good news? Miss Lydia is going to be married; and you shall
-all have a bowl of punch to make merry at her wedding.”
-
-Mrs. Hill began instantly to express her joy. Elizabeth received her
-congratulations amongst the rest, and then, sick of this folly, took
-refuge in her own room, that she might think with freedom. Poor Lydia’s
-situation must, at best, be bad enough; but that it was no worse, she
-had need to be thankful. She felt it so; and though, in looking forward,
-neither rational happiness, nor worldly prosperity could be justly
-expected for her sister, in looking back to what they had feared, only
-two hours ago, she felt all the advantages of what they had gained.
-
-
-
-
-[Illustration:
-
-“The spiteful old ladies”
-
-[_Copyright 1894 by George Allen._]]
-
-
-
-
-CHAPTER L.
-
-
-[Illustration]
-
-Mr. Bennet had very often wished, before this period of his life, that,
-instead of spending his whole income, he had laid by an annual sum, for
-the better provision of his children, and of his wife, if she survived
-him. He now wished it more than ever. Had he done his duty in that
-respect, Lydia need not have been indebted to her uncle for whatever of
-honour or credit could now be purchased for her. The satisfaction of
-prevailing on one of the most worthless young men in Great Britain to
-be her husband might then have rested in its proper place.
-
-He was seriously concerned that a cause of so little advantage to anyone
-should be forwarded at the sole expense of his brother-in-law; and he
-was determined, if possible, to find out the extent of his assistance,
-and to discharge the obligation as soon as he could.
-
-When first Mr. Bennet had married, economy was held to be perfectly
-useless; for, of course, they were to have a son. This son was to join
-in cutting off the entail, as soon as he should be of age, and the widow
-and younger children would by that means be provided for. Five daughters
-successively entered the world, but yet the son was to come; and Mrs.
-Bennet, for many years after Lydia’s birth, had been certain that he
-would. This event had at last been despaired of, but it was then too
-late to be saving. Mrs. Bennet had no turn for economy; and her
-husband’s love of independence had alone prevented their exceeding their
-income.
-
-Five thousand pounds was settled by marriage articles on Mrs. Bennet and
-the children. But in what proportions it should be divided amongst the
-latter depended on the will of the parents. This was one point, with
-regard to Lydia at least, which was now to be settled, and Mr. Bennet
-could have no hesitation in acceding to the proposal before him. In
-terms of grateful acknowledgment for the kindness of his brother, though
-expressed most concisely, he then delivered on paper his perfect
-approbation of all that was done, and his willingness to fulfil the
-engagements that had been made for him. He had never before supposed
-that, could Wickham be prevailed on to marry his daughter, it would be
-done with so little inconvenience to himself as by the present
-arrangement. He would scarcely be ten pounds a year the loser, by the
-hundred that was to be paid them; for, what with her board and pocket
-allowance, and the continual presents in money which passed to her
-through her mother’s hands, Lydia’s expenses had been very little within
-that sum.
-
-That it would be done with such trifling exertion on his side, too, was
-another very welcome surprise; for his chief wish at present was to have
-as little trouble in the business as possible. When the first transports
-of rage which had produced his activity in seeking her were over, he
-naturally returned to all his former indolence. His letter was soon
-despatched; for though dilatory in undertaking business, he was quick in
-its execution. He begged to know further particulars of what he was
-indebted to his brother; but was too angry with Lydia to send any
-message to her.
-
-The good news quickly spread through the house; and with proportionate
-speed through the neighbourhood. It was borne in the latter with decent
-philosophy. To be sure, it would have been more for the advantage of
-conversation, had Miss Lydia Bennet come upon the town; or, as the
-happiest alternative, been secluded from the world in some distant
-farm-house. But there was much to be talked of, in marrying her; and the
-good-natured wishes for her well-doing, which had proceeded before from
-all the spiteful old ladies in Meryton, lost but little of their spirit
-in this change of circumstances, because with such a husband her misery
-was considered certain.
-
-It was a fortnight since Mrs. Bennet had been down stairs, but on this
-happy day she again took her seat at the head of her table, and in
-spirits oppressively high. No sentiment of shame gave a damp to her
-triumph. The marriage of a daughter, which had been the first object of
-her wishes since Jane was sixteen, was now on the point of
-accomplishment, and her thoughts and her words ran wholly on those
-attendants of elegant nuptials, fine muslins, new carriages, and
-servants. She was busily searching through the neighbourhood for a
-proper situation for her daughter; and, without knowing or considering
-what their income might be, rejected many as deficient in size and
-importance.
-
-“Haye Park might do,” said she, “if the Gouldings would quit it, or the
-great house at Stoke, if the drawing-room were larger; but Ashworth is
-too far off. I could not bear to have her ten miles from me; and as for
-Purvis Lodge, the attics are dreadful.”
-
-Her husband allowed her to talk on without interruption while the
-servants remained. But when they had withdrawn, he said to her, “Mrs.
-Bennet, before you take any, or all of these houses, for your son and
-daughter, let us come to a right understanding. Into _one_ house in this
-neighbourhood they shall never have admittance. I will not encourage the
-imprudence of either, by receiving them at Longbourn.”
-
-A long dispute followed this declaration; but Mr. Bennet was firm: it
-soon led to another; and Mrs. Bennet found, with amazement and horror,
-that her husband would not advance a guinea to buy clothes for his
-daughter. He protested that she should receive from him no mark of
-affection whatever on the occasion. Mrs. Bennet could hardly comprehend
-it. That his anger could be carried to such a point of inconceivable
-resentment as to refuse his daughter a privilege, without which her
-marriage would scarcely seem valid, exceeded all that she could believe
-possible. She was more alive to the disgrace, which her want of new
-clothes must reflect on her daughter’s nuptials, than to any sense of
-shame at her eloping and living with Wickham a fortnight before they
-took place.
-
-Elizabeth was now most heartily sorry that she had, from the distress of
-the moment, been led to make Mr. Darcy acquainted with their fears for
-her sister; for since her marriage would so shortly give the proper
-termination to the elopement, they might hope to conceal its
-unfavourable beginning from all those who were not immediately on the
-spot.
-
-She had no fear of its spreading farther, through his means. There were
-few people on whose secrecy she would have more confidently depended;
-but at the same time there was no one whose knowledge of a sister’s
-frailty would have mortified her so much. Not, however, from any fear of
-disadvantage from it individually to herself; for at any rate there
-seemed a gulf impassable between them. Had Lydia’s marriage been
-concluded on the most honourable terms, it was not to be supposed that
-Mr. Darcy would connect himself with a family, where to every other
-objection would now be added an alliance and relationship of the nearest
-kind with the man whom he so justly scorned.
-
-From such a connection she could not wonder that he should shrink. The
-wish of procuring her regard, which she had assured herself of his
-feeling in Derbyshire, could not in rational expectation survive such a
-blow as this. She was humbled, she was grieved; she repented, though she
-hardly knew of what. She became jealous of his esteem, when she could no
-longer hope to be benefited by it. She wanted to hear of him, when there
-seemed the least chance of gaining intelligence. She was convinced that
-she could have been happy with him, when it was no longer likely they
-should meet.
-
-What a triumph for him, as she often thought, could he know that the
-proposals which she had proudly spurned only four months ago would now
-have been gladly and gratefully received! He was as generous, she
-doubted not, as the most generous of his sex. But while he was mortal,
-there must be a triumph.
-
-She began now to comprehend that he was exactly the man who, in
-disposition and talents, would most suit her. His understanding and
-temper, though unlike her own, would have answered all her wishes. It
-was an union that must have been to the advantage of both: by her ease
-and liveliness, his mind might have been softened, his manners improved;
-and from his judgment, information, and knowledge of the world, she must
-have received benefit of greater importance.
-
-But no such happy marriage could now teach the admiring multitude what
-connubial felicity really was. An union of a different tendency, and
-precluding the possibility of the other, was soon to be formed in their
-family.
-
-How Wickham and Lydia were to be supported in tolerable independence she
-could not imagine. But how little of permanent happiness could belong to
-a couple who were only brought together because their passions were
-stronger than their virtue, she could easily conjecture.
-
-Mr. Gardiner soon wrote again to his brother. To Mr. Bennet’s
-acknowledgments he briefly replied, with assurances of his eagerness to
-promote the welfare of any of his family; and concluded with entreaties
-that the subject might never be mentioned to him again. The principal
-purport of his letter was to inform them, that Mr. Wickham had resolved
-on quitting the militia.
-
-“It was greatly my wish that he should do so,” he added, “as soon as his
-marriage was fixed on. And I think you will agree with me, in
-considering a removal from that corps as highly advisable, both on his
-account and my niece’s. It is Mr. Wickham’s intention to go into the
-Regulars; and, among his former friends, there are still some who are
-able and willing to assist him in the army. He has the promise of an
-ensigncy in General----’s regiment, now quartered in the north. It is
-an advantage to have it so far from this part of the kingdom. He
-promises fairly; and I hope among different people, where they may each
-have a character to preserve, they will both be more prudent. I have
-written to Colonel Forster, to inform him of our present arrangements,
-and to request that he will satisfy the various creditors of Mr. Wickham
-in and near Brighton with assurances of speedy payment, for which I have
-pledged myself. And will you give yourself the trouble of carrying
-similar assurances to his creditors in Meryton, of whom I shall subjoin
-a list, according to his information? He has given in all his debts; I
-hope at least he has not deceived us. Haggerston has our directions, and
-all will be completed in a week. They will then join his regiment,
-unless they are first invited to Longbourn; and I understand from Mrs.
-Gardiner that my niece is very desirous of seeing you all before she
-leaves the south. She is well, and begs to be dutifully remembered to
-you and her mother.--Yours, etc.
-
-“E. GARDINER.”
-
-Mr. Bennet and his daughters saw all the advantages of Wickham’s
-removal from the ----shire, as clearly as Mr. Gardiner could do. But
-Mrs. Bennet was not so well pleased with it. Lydia’s being settled in
-the north, just when she had expected most pleasure and pride in her
-company, for she had by no means given up her plan of their residing in
-Hertfordshire, was a severe disappointment; and, besides, it was such a
-pity that Lydia should be taken from a regiment where she was acquainted
-with everybody, and had so many favourites.
-
-“She is so fond of Mrs. Forster,” said she, “it will be quite shocking
-to send her away! And there are several of the young men, too, that she
-likes very much. The officers may not be so pleasant in General----’s
-regiment.”
-
-His daughter’s request, for such it might be considered, of being
-admitted into her family again, before she set off for the north,
-received at first an absolute negative. But Jane and Elizabeth, who
-agreed in wishing, for the sake of their sister’s feelings and
-consequence, that she should be noticed on her marriage by her parents,
-urged him so earnestly, yet so rationally and so mildly, to receive her
-and her husband at Longbourn, as soon as they were married, that he was
-prevailed on to think as they thought, and act as they wished. And their
-mother had the satisfaction of knowing, that she should be able to show
-her married daughter in the neighbourhood, before she was banished to
-the north. When Mr. Bennet wrote again to his brother, therefore, he
-sent his permission for them to come; and it was settled, that, as soon
-as the ceremony was over, they should proceed to Longbourn. Elizabeth
-was surprised, however, that Wickham should consent to such a scheme;
-and, had she consulted only her own inclination, any meeting with him
-would have been the last object of her wishes.
-
-
-
-
-[Illustration:
-
-“With an affectionate smile”
-
-[_Copyright 1894 by George Allen._]]
-
-
-
-
-CHAPTER LI.
-
-
-[Illustration]
-
-Their sister’s wedding-day arrived; and Jane and Elizabeth felt for her
-probably more than she felt for herself. The carriage was sent to meet
-them at----, and they were to return in it by dinnertime. Their arrival
-was dreaded by the elder Miss Bennets--and Jane more especially, who
-gave Lydia the feelings which would have attended herself, had _she_
-been the culprit, and was wretched in the thought of what her sister
-must endure.
-
-They came. The family were assembled in the breakfast-room to receive
-them. Smiles decked the face of Mrs. Bennet, as the carriage drove up to
-the door; her husband looked impenetrably grave; her daughters, alarmed,
-anxious, uneasy.
-
-Lydia’s voice was heard in the vestibule; the door was thrown open, and
-she ran into the room. Her mother stepped forwards, embraced her, and
-welcomed her with rapture; gave her hand with an affectionate smile to
-Wickham, who followed his lady; and wished them both joy, with an
-alacrity which showed no doubt of their happiness.
-
-Their reception from Mr. Bennet, to whom they then turned, was not quite
-so cordial. His countenance rather gained in austerity; and he scarcely
-opened his lips. The easy assurance of the young couple, indeed, was
-enough to provoke him.
-
-Elizabeth was disgusted, and even Miss Bennet was shocked. Lydia was
-Lydia still; untamed, unabashed, wild, noisy, and fearless. She turned
-from sister to sister, demanding their congratulations; and when at
-length they all sat down, looked eagerly round the room, took notice of
-some little alteration in it, and observed, with a laugh, that it was a
-great while since she had been there.
-
-Wickham was not at all more distressed than herself; but his manners
-were always so pleasing, that, had his character and his marriage been
-exactly what they ought, his smiles and his easy address, while he
-claimed their relationship, would have delighted them all. Elizabeth
-had not before believed him quite equal to such assurance; but she sat
-down, resolving within herself to draw no limits in future to the
-impudence of an impudent man. _She_ blushed, and Jane blushed; but the
-cheeks of the two who caused their confusion suffered no variation of
-colour.
-
-There was no want of discourse. The bride and her mother could neither
-of them talk fast enough; and Wickham, who happened to sit near
-Elizabeth, began inquiring after his acquaintance in that neighbourhood,
-with a good-humoured ease, which she felt very unable to equal in her
-replies. They seemed each of them to have the happiest memories in the
-world. Nothing of the past was recollected with pain; and Lydia led
-voluntarily to subjects which her sisters would not have alluded to for
-the world.
-
-“Only think of its being three months,” she cried, “since I went away:
-it seems but a fortnight, I declare; and yet there have been things
-enough happened in the time. Good gracious! when I went away, I am sure
-I had no more idea of being married till I came back again! though I
-thought it would be very good fun if I was.”
-
-Her father lifted up his eyes, Jane was distressed, Elizabeth looked
-expressively at Lydia; but she, who never heard nor saw anything of
-which she chose to be insensible, gaily continued,--
-
-“Oh, mamma, do the people hereabouts know I am married to-day? I was
-afraid they might not; and we overtook William Goulding in his curricle,
-so I was determined he should know it, and so I let down the side glass
-next to him, and took off my glove and let my hand just rest upon the
-window frame, so that he might see the ring, and then I bowed and
-smiled like anything.”
-
-Elizabeth could bear it no longer. She got up and ran out of the room;
-and returned no more, till she heard them passing through the hall to
-the dining-parlour. She then joined them soon enough to see Lydia, with
-anxious parade, walk up to her mother’s right hand, and hear her say to
-her eldest sister,--
-
-“Ah, Jane, I take your place now, and you must go lower, because I am a
-married woman.”
-
-It was not to be supposed that time would give Lydia that embarrassment
-from which she had been so wholly free at first. Her ease and good
-spirits increased. She longed to see Mrs. Philips, the Lucases, and all
-their other neighbours, and to hear herself called “Mrs. Wickham” by
-each of them; and in the meantime she went after dinner to show her ring
-and boast of being married to Mrs. Hill and the two housemaids.
-
-“Well, mamma,” said she, when they were all returned to the
-breakfast-room, “and what do you think of my husband? Is not he a
-charming man? I am sure my sisters must all envy me. I only hope they
-may have half my good luck. They must all go to Brighton. That is the
-place to get husbands. What a pity it is, mamma, we did not all go!”
-
-“Very true; and if I had my will we should. But, my dear Lydia, I don’t
-at all like your going such a way off. Must it be so?”
-
-“Oh, Lord! yes; there is nothing in that. I shall like it of all things.
-You and papa, and my sisters, must come down and see us. We shall be at
-Newcastle all the winter, and I dare say there will be some balls, and I
-will take care to get good partners for them all.”
-
-“I should like it beyond anything!” said her mother.
-
-“And then when you go away, you may leave one or two of my sisters
-behind you; and I dare say I shall get husbands for them before the
-winter is over.”
-
-“I thank you for my share of the favour,” said Elizabeth; “but I do not
-particularly like your way of getting husbands.”
-
-Their visitors were not to remain above ten days with them. Mr. Wickham
-had received his commission before he left London, and he was to join
-his regiment at the end of a fortnight.
-
-No one but Mrs. Bennet regretted that their stay would be so short; and
-she made the most of the time by visiting about with her daughter, and
-having very frequent parties at home. These parties were acceptable to
-all; to avoid a family circle was even more desirable to such as did
-think than such as did not.
-
-Wickham’s affection for Lydia was just what Elizabeth had expected to
-find it; not equal to Lydia’s for him. She had scarcely needed her
-present observation to be satisfied, from the reason of things, that
-their elopement had been brought on by the strength of her love rather
-than by his; and she would have wondered why, without violently caring
-for her, he chose to elope with her at all, had she not felt certain
-that his flight was rendered necessary by distress of circumstances; and
-if that were the case, he was not the young man to resist an opportunity
-of having a companion.
-
-Lydia was exceedingly fond of him. He was her dear Wickham on every
-occasion; no one was to be put in competition with him. He did
-everything best in the world; and she was sure he would kill more birds
-on the first of September than anybody else in the country.
-
-One morning, soon after their arrival, as she was sitting with her two
-elder sisters, she said to Elizabeth,--
-
-“Lizzy, I never gave _you_ an account of my wedding, I believe. You were
-not by, when I told mamma, and the others, all about it. Are not you
-curious to hear how it was managed?”
-
-“No, really,” replied Elizabeth; “I think there cannot be too little
-said on the subject.”
-
-“La! You are so strange! But I must tell you how it went off. We were
-married, you know, at St. Clement’s, because Wickham’s lodgings were in
-that parish. And it was settled that we should all be there by eleven
-o’clock. My uncle and aunt and I were to go together; and the others
-were to meet us at the church.
-
-“Well, Monday morning came, and I was in such a fuss! I was so afraid,
-you know, that something would happen to put it off, and then I should
-have gone quite distracted. And there was my aunt, all the time I was
-dressing, preaching and talking away just as if she was reading a
-sermon. However, I did not hear above one word in ten, for I was
-thinking, you may suppose, of my dear Wickham. I longed to know whether
-he would be married in his blue coat.
-
-“Well, and so we breakfasted at ten as usual: I thought it would never
-be over; for, by the bye, you are to understand that my uncle and aunt
-were horrid unpleasant all the time I was with them. If you’ll believe
-me, I did not once put my foot out of doors, though I was there a
-fortnight. Not one party, or scheme, or anything! To be sure, London was
-rather thin, but, however, the Little Theatre was open.
-
-“Well, and so, just as the carriage came to the door, my uncle was
-called away upon business to that horrid man Mr. Stone. And then, you
-know, when once they get together, there is no end of it. Well, I was so
-frightened I did not know what to do, for my uncle was to give me away;
-and if we were beyond the hour we could not be married all day. But,
-luckily, he came back again in ten minutes’ time, and then we all set
-out. However, I recollected afterwards, that if he _had_ been prevented
-going, the wedding need not be put off, for Mr. Darcy might have done as
-well.”
-
-“Mr. Darcy!” repeated Elizabeth, in utter amazement.
-
-“Oh, yes! he was to come there with Wickham, you know. But, gracious me!
-I quite forgot! I ought not to have said a word about it. I promised
-them so faithfully! What will Wickham say? It was to be such a secret!”
-
-“If it was to be a secret,” said Jane, “say not another word on the
-subject. You may depend upon my seeking no further.”
-
-“Oh, certainly,” said Elizabeth, though burning with curiosity; “we will
-ask you no questions.”
-
-“Thank you,” said Lydia; “for if you did, I should certainly tell you
-all, and then Wickham would be so angry.”
-
-On such encouragement to ask, Elizabeth was forced to put it out of her
-power, by running away.
-
-But to live in ignorance on such a point was impossible; or at least it
-was impossible not to try for information. Mr. Darcy had been at her
-sister’s wedding. It was exactly a scene, and exactly among people,
-where he had apparently least to do, and least temptation to go.
-Conjectures as to the meaning of it, rapid and wild, hurried into her
-brain; but she was satisfied with none. Those that best pleased her, as
-placing his conduct in the noblest light, seemed most improbable. She
-could not bear such suspense; and hastily seizing a sheet of paper,
-wrote a short letter to her aunt, to request an explanation of what
-Lydia had dropped, if it were compatible with the secrecy which had been
-intended.
-
-“You may readily comprehend,” she added, “what my curiosity must be to
-know how a person unconnected with any of us, and, comparatively
-speaking, a stranger to our family, should have been amongst you at such
-a time. Pray write instantly, and let me understand it--unless it is,
-for very cogent reasons, to remain in the secrecy which Lydia seems to
-think necessary; and then I must endeavour to be satisfied with
-ignorance.”
-
-“Not that I _shall_, though,” she added to herself, and she finished the
-letter; “and, my dear aunt, if you do not tell me in an honourable
-manner, I shall certainly be reduced to tricks and stratagems to find it
-out.”
-
-Jane’s delicate sense of honour would not allow her to speak to
-Elizabeth privately of what Lydia had let fall; Elizabeth was glad of
-it:--till it appeared whether her inquiries would receive any
-satisfaction, she had rather be without a confidante.
-
-
-
-
-[Illustration:
-
-“I am sure she did not listen.”
-]
-
-
-
-
-CHAPTER LII.
-
-
-[Illustration]
-
-Elizabeth had the satisfaction of receiving an answer to her letter as
-soon as she possibly could. She was no sooner in possession of it, than
-hurrying into the little copse, where she was least likely to be
-interrupted, she sat down on one of the benches, and prepared to be
-happy; for the length of the letter convinced her that it did not
-contain a denial.
-
-     /* RIGHT “Gracechurch Street, _Sept. 6_. */
-
-“My dear Niece,
-
-     “I have just received your letter, and shall devote this whole
-     morning to answering it, as I foresee that a _little_ writing will
-     not comprise what I have to tell you. I must confess myself
-     surprised by your application; I did not expect it from _you_.
-     Don’t think me angry, however, for I only mean to let you know,
-     that I had not imagined such inquiries to be necessary on _your_
-     side. If you do not choose to understand me, forgive my
-     impertinence. Your uncle is as much surprised as I am; and nothing
-     but the belief of your being a party concerned would have allowed
-     him to act as he has done. But if you are really innocent and
-     ignorant, I must be more explicit. On the very day of my coming
-     home from Longbourn, your uncle had a most unexpected visitor. Mr.
-     Darcy called, and was shut up with him several hours. It was all
-     over before I arrived; so my curiosity was not so dreadfully racked
-     as _yours_ seems to have been. He came to tell Mr. Gardiner that he
-     had found out where your sister and Mr. Wickham were, and that he
-     had seen and talked with them both--Wickham repeatedly, Lydia once.
-     From what I can collect, he left Derbyshire only one day after
-     ourselves, and came to town with the resolution of hunting for
-     them. The motive professed was his conviction of its being owing to
-     himself that Wickham’s worthlessness had not been so well known as
-     to make it impossible for any young woman of character to love or
-     confide in him. He generously imputed the whole to his mistaken
-     pride, and confessed that he had before thought it beneath him to
-     lay his private actions open to the world. His character was to
-     speak for itself. He called it, therefore, his duty to step
-     forward, and endeavour to remedy an evil which had been brought on
-     by himself. If he _had another_ motive, I am sure it would never
-     disgrace him. He had been some days in town before he was able to
-     discover them; but he had something to direct his search, which was
-     more than _we_ had; and the consciousness of this was another
-     reason for his resolving to follow us. There is a lady, it seems, a
-     Mrs. Younge, who was some time ago governess to Miss Darcy, and was
-     dismissed from her charge on some cause of disapprobation, though
-     he did not say what. She then took a large house in Edward Street,
-     and has since maintained herself by letting lodgings. This Mrs.
-     Younge was, he knew, intimately acquainted with Wickham; and he
-     went to her for intelligence of him, as soon as he got to town. But
-     it was two or three days before he could get from her what he
-     wanted. She would not betray her trust, I suppose, without bribery
-     and corruption, for she really did know where her friend was to be
-     found. Wickham, indeed, had gone to her on their first arrival in
-     London; and had she been able to receive them into her house, they
-     would have taken up their abode with her. At length, however, our
-     kind friend procured the wished-for direction. They were in ----
-     Street. He saw Wickham, and afterwards insisted on seeing Lydia.
-     His first object with her, he acknowledged, had been to persuade
-     her to quit her present disgraceful situation, and return to her
-     friends as soon as they could be prevailed on to receive her,
-     offering his assistance as far as it would go. But he found Lydia
-     absolutely resolved on remaining where she was. She cared for none
-     of her friends; she wanted no help of his; she would not hear of
-     leaving Wickham. She was sure they should be married some time or
-     other, and it did not much signify when. Since such were her
-     feelings, it only remained, he thought, to secure and expedite a
-     marriage, which, in his very first conversation with Wickham, he
-     easily learnt had never been _his_ design. He confessed himself
-     obliged to leave the regiment on account of some debts of honour
-     which were very pressing; and scrupled not to lay all the ill
-     consequences of Lydia’s flight on her own folly alone. He meant to
-     resign his commission immediately; and as to his future situation,
-     he could conjecture very little about it. He must go somewhere, but
-     he did not know where, and he knew he should have nothing to live
-     on. Mr. Darcy asked why he did not marry your sister at once.
-     Though Mr. Bennet was not imagined to be very rich, he would have
-     been able to do something for him, and his situation must have been
-     benefited by marriage. But he found, in reply to this question,
-     that Wickham still cherished the hope of more effectually making
-     his fortune by marriage, in some other country. Under such
-     circumstances, however, he was not likely to be proof against the
-     temptation of immediate relief. They met several times, for there
-     was much to be discussed. Wickham, of course, wanted more than he
-     could get; but at length was reduced to be reasonable. Everything
-     being settled between _them_, Mr. Darcy’s next step was to make
-     your uncle acquainted with it, and he first called in Gracechurch
-     Street the evening before I came home. But Mr. Gardiner could not
-     be seen; and Mr. Darcy found, on further inquiry, that your father
-     was still with him, but would quit town the next morning. He did
-     not judge your father to be a person whom he could so properly
-     consult as your uncle, and therefore readily postponed seeing him
-     till after the departure of the former. He did not leave his name,
-     and till the next day it was only known that a gentleman had called
-     on business. On Saturday he came again. Your father was gone, your
-     uncle at home, and, as I said before, they had a great deal of talk
-     together. They met again on Sunday, and then _I_ saw him too. It
-     was not all settled before Monday: as soon as it was, the express
-     was sent off to Longbourn. But our visitor was very obstinate. I
-     fancy, Lizzy, that obstinacy is the real defect of his character,
-     after all. He has been accused of many faults at different times;
-     but _this_ is the true one. Nothing was to be done that he did not
-     do himself; though I am sure (and I do not speak it to be thanked,
-     therefore say nothing about it) your uncle would most readily have
-     settled the whole. They battled it together for a long time, which
-     was more than either the gentleman or lady concerned in it
-     deserved. But at last your uncle was forced to yield, and instead
-     of being allowed to be of use to his niece, was forced to put up
-     with only having the probable credit of it, which went sorely
-     against the grain; and I really believe your letter this morning
-     gave him great pleasure, because it required an explanation that
-     would rob him of his borrowed feathers, and give the praise where
-     it was due. But, Lizzy, this must go no further than yourself, or
-     Jane at most. You know pretty well, I suppose, what has been done
-     for the young people. His debts are to be paid, amounting, I
-     believe, to considerably more than a thousand pounds, another
-     thousand in addition to her own settled upon _her_, and his
-     commission purchased. The reason why all this was to be done by him
-     alone, was such as I have given above. It was owing to him, to his
-     reserve and want of proper consideration, that Wickham’s character
-     had been so misunderstood, and consequently that he had been
-     received and noticed as he was. Perhaps there was some truth in
-     _this_; though I doubt whether _his_ reserve, or _anybody’s_
-     reserve can be answerable for the event. But in spite of all this
-     fine talking, my dear Lizzy, you may rest perfectly assured that
-     your uncle would never have yielded, if we had not given him credit
-     for _another interest_ in the affair. When all this was resolved
-     on, he returned again to his friends, who were still staying at
-     Pemberley; but it was agreed that he should be in London once more
-     when the wedding took place, and all money matters were then to
-     receive the last finish. I believe I have now told you everything.
-     It is a relation which you tell me is to give you great surprise; I
-     hope at least it will not afford you any displeasure. Lydia came to
-     us, and Wickham had constant admission to the house. _He_ was
-     exactly what he had been when I knew him in Hertfordshire; but I
-     would not tell you how little I was satisfied with _her_ behaviour
-     while she stayed with us, if I had not perceived, by Jane’s letter
-     last Wednesday, that her conduct on coming home was exactly of a
-     piece with it, and therefore what I now tell you can give you no
-     fresh pain. I talked to her repeatedly in the most serious manner,
-     representing to her the wickedness of what she had done, and all
-     the unhappiness she had brought on her family. If she heard me, it
-     was by good luck, for I am sure she did not listen. I was sometimes
-     quite provoked; but then I recollected my dear Elizabeth and Jane,
-     and for their sakes had patience with her. Mr. Darcy was punctual
-     in his return, and, as Lydia informed you, attended the wedding. He
-     dined with us the next day, and was to leave town again on
-     Wednesday or Thursday. Will you be very angry with me, my dear
-     Lizzy, if I take this opportunity of saying (what I was never bold
-     enough to say before) how much I like him? His behaviour to us has,
-     in every respect, been as pleasing as when we were in Derbyshire.
-     His understanding and opinions all please me; he wants nothing but
-     a little more liveliness, and _that_, if he marry _prudently_, his
-     wife may teach him. I thought him very sly; he hardly ever
-     mentioned your name. But slyness seems the fashion. Pray forgive
-     me, if I have been very presuming, or at least do not punish me so
-     far as to exclude me from P. I shall never be quite happy till I
-     have been all round the park. A low phaeton with a nice little pair
-     of ponies would be the very thing. But I must write no more. The
-     children have been wanting me this half hour.
-
-“Yours, very sincerely,
-
-“M. GARDINER.”
-
-
-The contents of this letter threw Elizabeth into a flutter of spirits,
-in which it was difficult to determine whether pleasure or pain bore the
-greatest share. The vague and unsettled suspicions which uncertainty had
-produced, of what Mr. Darcy might have been doing to forward her
-sister’s match--which she had feared to encourage, as an exertion of
-goodness too great to be probable, and at the same time dreaded to be
-just, from the pain of obligation--were proved beyond their greatest
-extent to be true! He had followed them purposely to town, he had taken
-on himself all the trouble and mortification attendant on such a
-research; in which supplication had been necessary to a woman whom he
-must abominate and despise, and where he was reduced to meet, frequently
-meet, reason with, persuade, and finally bribe the man whom he always
-most wished to avoid, and whose very name it was punishment to him to
-pronounce. He had done all this for a girl whom he could neither regard
-nor esteem. Her heart did whisper that he had done it for her. But it
-was a hope shortly checked by other considerations; and she soon felt
-that even her vanity was insufficient, when required to depend on his
-affection for her, for a woman who had already refused him, as able to
-overcome a sentiment so natural as abhorrence against relationship with
-Wickham. Brother-in-law of Wickham! Every kind of pride must revolt from
-the connection. He had, to be sure, done much. She was ashamed to think
-how much. But he had given a reason for his interference, which asked no
-extraordinary stretch of belief. It was reasonable that he should feel
-he had been wrong; he had liberality, and he had the means of exercising
-it; and though she would not place herself as his principal inducement,
-she could perhaps believe, that remaining partiality for her might
-assist his endeavours in a cause where her peace of mind must be
-materially concerned. It was painful, exceedingly painful, to know that
-they were under obligations to a person who could never receive a
-return. They owed the restoration of Lydia, her character, everything to
-him. Oh, how heartily did she grieve over every ungracious sensation she
-had ever encouraged, every saucy speech she had ever directed towards
-him! For herself she was humbled; but she was proud of him,--proud that
-in a cause of compassion and honour he had been able to get the better
-of himself. She read over her aunt’s commendation of him again and
-again. It was hardly enough; but it pleased her. She was even sensible
-of some pleasure, though mixed with regret, on finding how steadfastly
-both she and her uncle had been persuaded that affection and confidence
-subsisted between Mr. Darcy and herself.
-
-She was roused from her seat and her reflections, by someone’s approach;
-and, before she could strike into another path, she was overtaken by
-Wickham.
-
-“I am afraid I interrupt your solitary ramble, my dear sister?” said he,
-as he joined her.
-
-“You certainly do,” she replied with a smile; “but it does not follow
-that the interruption must be unwelcome.”
-
-“I should be sorry, indeed, if it were. _We_ were always good friends,
-and now we are better.”
-
-“True. Are the others coming out?”
-
-“I do not know. Mrs. Bennet and Lydia are going in the carriage to
-Meryton. And so, my dear sister, I find, from our uncle and aunt, that
-you have actually seen Pemberley.”
-
-She replied in the affirmative.
-
-“I almost envy you the pleasure, and yet I believe it would be too much
-for me, or else I could take it in my way to Newcastle. And you saw the
-old housekeeper, I suppose? Poor Reynolds, she was always very fond of
-me. But of course she did not mention my name to you.”
-
-“Yes, she did.”
-
-“And what did she say?”
-
-“That you were gone into the army, and she was afraid had--not turned
-out well. At such a distance as _that_, you know, things are strangely
-misrepresented.”
-
-“Certainly,” he replied, biting his lips. Elizabeth hoped she had
-silenced him; but he soon afterwards said,--
-
-“I was surprised to see Darcy in town last month. We passed each other
-several times. I wonder what he can be doing there.”
-
-“Perhaps preparing for his marriage with Miss de Bourgh,” said
-Elizabeth. “It must be something particular to take him there at this
-time of year.”
-
-“Undoubtedly. Did you see him while you were at Lambton? I thought I
-understood from the Gardiners that you had.”
-
-“Yes; he introduced us to his sister.”
-
-“And do you like her?”
-
-“Very much.”
-
-“I have heard, indeed, that she is uncommonly improved within this year
-or two. When I last saw her, she was not very promising. I am very glad
-you liked her. I hope she will turn out well.”
-
-“I dare say she will; she has got over the most trying age.”
-
-“Did you go by the village of Kympton?”
-
-“I do not recollect that we did.”
-
-“I mention it because it is the living which I ought to have had. A most
-delightful place! Excellent parsonage-house! It would have suited me in
-every respect.”
-
-“How should you have liked making sermons?”
-
-“Exceedingly well. I should have considered it as part of my duty, and
-the exertion would soon have been nothing. One ought not to repine; but,
-to be sure, it would have been such a thing for me! The quiet, the
-retirement of such a life, would have answered all my ideas of
-happiness! But it was not to be. Did you ever hear Darcy mention the
-circumstance when you were in Kent?”
-
-“I _have_ heard from authority, which I thought _as good_, that it was
-left you conditionally only, and at the will of the present patron.”
-
-“You have! Yes, there was something in _that_; I told you so from the
-first, you may remember.”
-
-“I _did_ hear, too, that there was a time when sermon-making was not so
-palatable to you as it seems to be at present; that you actually
-declared your resolution of never taking orders, and that the business
-had been compromised accordingly.”
-
-“You did! and it was not wholly without foundation. You may remember
-what I told you on that point, when first we talked of it.”
-
-They were now almost at the door of the house, for she had walked fast
-to get rid of him; and unwilling, for her sister’s sake, to provoke him,
-she only said in reply, with a good-humoured smile,--
-
-“Come, Mr. Wickham, we are brother and sister, you know. Do not let us
-quarrel about the past. In future, I hope we shall be always of one
-mind.”
-
-She held out her hand: he kissed it with affectionate gallantry, though
-he hardly knew how to look, and they entered the house.
-
-
-
-
-[Illustration:
-
-“Mr. Darcy with him.”
-]
-
-
-
-
-CHAPTER LIII.
-
-
-[Illustration]
-
-Mr. Wickham was so perfectly satisfied with this conversation, that he
-never again distressed himself, or provoked his dear sister Elizabeth,
-by introducing the subject of it; and she was pleased to find that she
-had said enough to keep him quiet.
-
-The day of his and Lydia’s departure soon came; and Mrs. Bennet was
-forced to submit to a separation, which, as her husband by no means
-entered into her scheme of their all going to Newcastle, was likely to
-continue at least a twelvemonth.
-
-“Oh, my dear Lydia,” she cried, “when shall we meet again?”
-
-“Oh, Lord! I don’t know. Not these two or three years, perhaps.”
-
-“Write to me very often, my dear.”
-
-“As often as I can. But you know married women have never much time for
-writing. My sisters may write to _me_. They will have nothing else to
-do.”
-
-Mr. Wickham’s adieus were much more affectionate than his wife’s. He
-smiled, looked handsome, and said many pretty things.
-
-“He is as fine a fellow,” said Mr. Bennet, as soon as they were out of
-the house, “as ever I saw. He simpers, and smirks, and makes love to us
-all. I am prodigiously proud of him. I defy even Sir William Lucas
-himself to produce a more valuable son-in-law.”
-
-The loss of her daughter made Mrs. Bennet very dull for several days.
-
-“I often think,” said she, “that there is nothing so bad as parting with
-one’s friends. One seems so forlorn without them.”
-
-“This is the consequence, you see, madam, of marrying a daughter,” said
-Elizabeth. “It must make you better satisfied that your other four are
-single.”
-
-“It is no such thing. Lydia does not leave me because she is married;
-but only because her husband’s regiment happens to be so far off. If
-that had been nearer, she would not have gone so soon.”
-
-But the spiritless condition which this event threw her into was shortly
-relieved, and her mind opened again to the agitation of hope, by an
-article of news which then began to be in circulation. The housekeeper
-at Netherfield had received orders to prepare for the arrival of her
-master, who was coming down in a day or two, to shoot there for several
-weeks. Mrs. Bennet was quite in the fidgets. She looked at Jane, and
-smiled, and shook her head, by turns.
-
-“Well, well, and so Mr. Bingley is coming down, sister,” (for Mrs.
-Philips first brought her the news). “Well, so much the better. Not that
-I care about it, though. He is nothing to us, you know, and I am sure I
-never want to see him again. But, however, he is very welcome to come to
-Netherfield, if he likes it. And who knows what _may_ happen? But that
-is nothing to us. You know, sister, we agreed long ago never to mention
-a word about it. And so, it is quite certain he is coming?”
-
-“You may depend on it,” replied the other, “for Mrs. Nichols was in
-Meryton last night: I saw her passing by, and went out myself on purpose
-to know the truth of it; and she told me that it was certainly true. He
-comes down on Thursday, at the latest, very likely on Wednesday. She was
-going to the butcher’s, she told me, on purpose to order in some meat on
-Wednesday, and she has got three couple of ducks just fit to be killed.”
-
-Miss Bennet had not been able to hear of his coming without changing
-colour. It was many months since she had mentioned his name to
-Elizabeth; but now, as soon as they were alone together, she said,--
-
-“I saw you look at me to-day, Lizzy, when my aunt told us of the present
-report; and I know I appeared distressed; but don’t imagine it was from
-any silly cause. I was only confused for the moment, because I felt that
-I _should_ be looked at. I do assure you that the news does not affect
-me either with pleasure or pain. I am glad of one thing, that he comes
-alone; because we shall see the less of him. Not that I am afraid of
-_myself_, but I dread other people’s remarks.”
-
-Elizabeth did not know what to make of it. Had she not seen him in
-Derbyshire, she might have supposed him capable of coming there with no
-other view than what was acknowledged; but she still thought him partial
-to Jane, and she wavered as to the greater probability of his coming
-there _with_ his friend’s permission, or being bold enough to come
-without it.
-
-“Yet it is hard,” she sometimes thought, “that this poor man cannot come
-to a house, which he has legally hired, without raising all this
-speculation! I _will_ leave him to himself.”
-
-In spite of what her sister declared, and really believed to be her
-feelings, in the expectation of his arrival, Elizabeth could easily
-perceive that her spirits were affected by it. They were more disturbed,
-more unequal, than she had often seen them.
-
-The subject which had been so warmly canvassed between their parents,
-about a twelvemonth ago, was now brought forward again.
-
-“As soon as ever Mr. Bingley comes, my dear,” said Mrs. Bennet, “you
-will wait on him, of course.”
-
-“No, no. You forced me into visiting him last year, and promised, if I
-went to see him, he should marry one of my daughters. But it ended in
-nothing, and I will not be sent on a fool’s errand again.”
-
-His wife represented to him how absolutely necessary such an attention
-would be from all the neighbouring gentlemen, on his returning to
-Netherfield.
-
-“’Tis an _etiquette_ I despise,” said he. “If he wants our society, let
-him seek it. He knows where we live. I will not spend _my_ hours in
-running after my neighbours every time they go away and come back
-again.”
-
-“Well, all I know is, that it will be abominably rude if you do not wait
-on him. But, however, that shan’t prevent my asking him to dine here, I
-am determined. We must have Mrs. Long and the Gouldings soon. That will
-make thirteen with ourselves, so there will be just room at table for
-him.”
-
-Consoled by this resolution, she was the better able to bear her
-husband’s incivility; though it was very mortifying to know that her
-neighbours might all see Mr. Bingley, in consequence of it, before
-_they_ did. As the day of his arrival drew near,--
-
-“I begin to be sorry that he comes at all,” said Jane to her sister. “It
-would be nothing; I could see him with perfect indifference; but I can
-hardly bear to hear it thus perpetually talked of. My mother means well;
-but she does not know, no one can know, how much I suffer from what she
-says. Happy shall I be when his stay at Netherfield is over!”
-
-“I wish I could say anything to comfort you,” replied Elizabeth; “but it
-is wholly out of my power. You must feel it; and the usual satisfaction
-of preaching patience to a sufferer is denied me, because you have
-always so much.”
-
-Mr. Bingley arrived. Mrs. Bennet, through the assistance of servants,
-contrived to have the earliest tidings of it, that the period of anxiety
-and fretfulness on her side be as long as it could. She counted the days
-that must intervene before their invitation could be sent--hopeless of
-seeing him before. But on the third morning after his arrival in
-Hertfordshire, she saw him from her dressing-room window enter the
-paddock, and ride towards the house.
-
-Her daughters were eagerly called to partake of her joy. Jane resolutely
-kept her place at the table; but Elizabeth, to satisfy her mother, went
-to the window--she looked--she saw Mr. Darcy with him, and sat down
-again by her sister.
-
-“There is a gentleman with him, mamma,” said Kitty; “who can it be?”
-
-“Some acquaintance or other, my dear, I suppose; I am sure I do not
-know.”
-
-“La!” replied Kitty, “it looks just like that man that used to be with
-him before. Mr. what’s his name--that tall, proud man.”
-
-“Good gracious! Mr. Darcy!--and so it does, I vow. Well, any friend of
-Mr. Bingley’s will always be welcome here, to be sure; but else I must
-say that I hate the very sight of him.”
-
-Jane looked at Elizabeth with surprise and concern. She knew but little
-of their meeting in Derbyshire, and therefore felt for the awkwardness
-which must attend her sister, in seeing him almost for the first time
-after receiving his explanatory letter. Both sisters were uncomfortable
-enough. Each felt for the other, and of course for themselves; and their
-mother talked on of her dislike of Mr. Darcy, and her resolution to be
-civil to him only as Mr. Bingley’s friend, without being heard by either
-of them. But Elizabeth had sources of uneasiness which could not yet be
-suspected by Jane, to whom she had never yet had courage to show Mrs.
-Gardiner’s letter, or to relate her own change of sentiment towards
-him. To Jane, he could be only a man whose proposals she had refused,
-and whose merits she had undervalued; but to her own more extensive
-information, he was the person to whom the whole family were indebted
-for the first of benefits, and whom she regarded herself with an
-interest, if not quite so tender, at least as reasonable and just, as
-what Jane felt for Bingley. Her astonishment at his coming--at his
-coming to Netherfield, to Longbourn, and voluntarily seeking her again,
-was almost equal to what she had known on first witnessing his altered
-behaviour in Derbyshire.
-
-The colour which had been driven from her face returned for half a
-minute with an additional glow, and a smile of delight added lustre to
-her eyes, as she thought for that space of time that his affection and
-wishes must still be unshaken; but she would not be secure.
-
-“Let me first see how he behaves,” said she; “it will then be early
-enough for expectation.”
-
-She sat intently at work, striving to be composed, and without daring to
-lift up her eyes, till anxious curiosity carried them to the face of her
-sister as the servant was approaching the door. Jane looked a little
-paler than usual, but more sedate than Elizabeth had expected. On the
-gentlemen’s appearing, her colour increased; yet she received them with
-tolerable ease, and with a propriety of behaviour equally free from any
-symptom of resentment, or any unnecessary complaisance.
-
-Elizabeth said as little to either as civility would allow, and sat down
-again to her work, with an eagerness which it did not often command. She
-had ventured only one glance at Darcy. He looked serious as usual; and,
-she thought, more as he had been used to look in Hertfordshire, than as
-she had seen him at Pemberley. But, perhaps, he could not in her
-mother’s presence be what he was before her uncle and aunt. It was a
-painful, but not an improbable, conjecture.
-
-Bingley she had likewise seen for an instant, and in that short period
-saw him looking both pleased and embarrassed. He was received by Mrs.
-Bennet with a degree of civility which made her two daughters ashamed,
-especially when contrasted with the cold and ceremonious politeness of
-her courtesy and address of his friend.
-
-Elizabeth particularly, who knew that her mother owed to the latter the
-preservation of her favourite daughter from irremediable infamy, was
-hurt and distressed to a most painful degree by a distinction so ill
-applied.
-
-Darcy, after inquiring of her how Mr. and Mrs. Gardiner did--a question
-which she could not answer without confusion--said scarcely anything. He
-was not seated by her: perhaps that was the reason of his silence; but
-it had not been so in Derbyshire. There he had talked to her friends
-when he could not to herself. But now several minutes elapsed, without
-bringing the sound of his voice; and when occasionally, unable to resist
-the impulse of curiosity, she raised her eyes to his face, she as often
-found him looking at Jane as at herself, and frequently on no object but
-the ground. More thoughtfulness and less anxiety to please, than when
-they last met, were plainly expressed. She was disappointed, and angry
-with herself for being so.
-
-“Could I expect it to be otherwise?” said she. “Yet why did he come?”
-
-She was in no humour for conversation with anyone but himself; and to
-him she had hardly courage to speak.
-
-She inquired after his sister, but could do no more.
-
-“It is a long time, Mr. Bingley, since you went away,” said Mrs. Bennet.
-
-He readily agreed to it.
-
-“I began to be afraid you would never come back again. People _did_ say,
-you meant to quit the place entirely at Michaelmas; but, however, I hope
-it is not true. A great many changes have happened in the neighbourhood
-since you went away. Miss Lucas is married and settled: and one of my
-own daughters. I suppose you have heard of it; indeed, you must have
-seen it in the papers. It was in the ‘Times’ and the ‘Courier,’ I know;
-though it was not put in as it ought to be. It was only said, ‘Lately,
-George Wickham, Esq., to Miss Lydia Bennet,’ without there being a
-syllable said of her father, or the place where she lived, or anything.
-It was my brother Gardiner’s drawing up, too, and I wonder how he came
-to make such an awkward business of it. Did you see it?”
-
-Bingley replied that he did, and made his congratulations. Elizabeth
-dared not lift up her eyes. How Mr. Darcy looked, therefore, she could
-not tell.
-
-“It is a delightful thing, to be sure, to have a daughter well married,”
-continued her mother; “but at the same time, Mr. Bingley, it is very
-hard to have her taken away from me. They are gone down to Newcastle, a
-place quite northward it seems, and there they are to stay, I do not
-know how long. His regiment is there; for I suppose you have heard of
-his leaving the ----shire, and of his being gone into the Regulars.
-Thank heaven! he has _some_ friends, though, perhaps, not so many as he
-deserves.”
-
-Elizabeth, who knew this to be levelled at Mr. Darcy, was in such misery
-of shame that she could hardly keep her seat. It drew from her, however,
-the exertion of speaking, which nothing else had so effectually done
-before; and she asked Bingley whether he meant to make any stay in the
-country at present. A few weeks, he believed.
-
-“When you have killed all your own birds, Mr. Bingley,” said her mother,
-“I beg you will come here and shoot as many as you please on Mr.
-Bennet’s manor. I am sure he will be vastly happy to oblige you, and
-will save all the best of the coveys for you.”
-
-Elizabeth’s misery increased at such unnecessary, such officious
-attention! Were the same fair prospect to arise at present, as had
-flattered them a year ago, everything, she was persuaded, would be
-hastening to the same vexatious conclusion. At that instant she felt,
-that years of happiness could not make Jane or herself amends for
-moments of such painful confusion.
-
-“The first wish of my heart,” said she to herself, “is never more to be
-in company with either of them. Their society can afford no pleasure
-that will atone for such wretchedness as this! Let me never see either
-one or the other again!”
-
-Yet the misery, for which years of happiness were to offer no
-compensation, received soon afterwards material relief, from observing
-how much the beauty of her sister rekindled the admiration of her former
-lover. When first he came in, he had spoken to her but little, but every
-five minutes seemed to be giving her more of his attention. He found her
-as handsome as she had been last year; as good-natured, and as
-unaffected, though not quite so chatty. Jane was anxious that no
-difference should be perceived in her at all, and was really persuaded
-that she talked as much as ever; but her mind was so busily engaged,
-that she did not always know when she was silent.
-
-When the gentlemen rose to go away, Mrs. Bennet was mindful of her
-intended civility, and they were invited and engaged to dine at
-Longbourn in a few days’ time.
-
-“You are quite a visit in my debt, Mr. Bingley,” she added; “for when
-you went to town last winter, you promised to take a family dinner with
-us as soon as you returned. I have not forgot, you see; and I assure you
-I was very much disappointed that you did not come back and keep your
-engagement.”
-
-Bingley looked a little silly at this reflection, and said something of
-his concern at having been prevented by business. They then went away.
-
-Mrs. Bennet had been strongly inclined to ask them to stay and dine
-there that day; but, though she always kept a very good table, she did
-not think anything less than two courses could be good enough for a man
-on whom she had such anxious designs, or satisfy the appetite and pride
-of one who had ten thousand a year.
-
-
-
-
-[Illustration:
-
-     “Jane happened to look round”
-]
-
-
-
-
-CHAPTER LIV.
-
-
-[Illustration]
-
-As soon as they were gone, Elizabeth walked out to recover her spirits;
-or, in other words, to dwell without interruption on those subjects
-which must deaden them more. Mr. Darcy’s behaviour astonished and vexed
-her.
-
-“Why, if he came only to be silent, grave, and indifferent,” said she,
-“did he come at all?”
-
-She could settle it in no way that gave her pleasure.
-
-“He could be still amiable, still pleasing to my uncle and aunt, when he
-was in town; and why not to me? If he fears me, why come hither? If he
-no longer cares for me, why silent? Teasing, teasing man! I will think
-no more about him.”
-
-Her resolution was for a short time involuntarily kept by the approach
-of her sister, who joined her with a cheerful look which showed her
-better satisfied with their visitors than Elizabeth.
-
-“Now,” said she, “that this first meeting is over, I feel perfectly
-easy. I know my own strength, and I shall never be embarrassed again by
-his coming. I am glad he dines here on Tuesday. It will then be publicly
-seen, that on both sides we meet only as common and indifferent
-acquaintance.”
-
-“Yes, very indifferent, indeed,” said Elizabeth, laughingly. “Oh, Jane!
-take care.”
-
-“My dear Lizzy, you cannot think me so weak as to be in danger now.”
-
-“I think you are in very great danger of making him as much in love with
-you as ever.”
-
-They did not see the gentlemen again till Tuesday; and Mrs. Bennet, in
-the meanwhile, was giving way to all the happy schemes which the
-good-humour and common politeness of Bingley, in half an hour’s visit,
-had revived.
-
-On Tuesday there was a large party assembled at Longbourn; and the two
-who were most anxiously expected, to the credit of their punctuality as
-sportsmen, were in very good time. When they repaired to the
-dining-room, Elizabeth eagerly watched to see whether Bingley would take
-the place which, in all their former parties, had belonged to him, by
-her sister. Her prudent mother, occupied by the same ideas, forbore to
-invite him to sit by herself. On entering the room, he seemed to
-hesitate; but Jane happened to look round, and happened to smile: it was
-decided. He placed himself by her.
-
-Elizabeth, with a triumphant sensation, looked towards his friend. He
-bore it with noble indifference; and she would have imagined that
-Bingley had received his sanction to be happy, had she not seen his eyes
-likewise turned towards Mr. Darcy, with an expression of half-laughing
-alarm.
-
-His behaviour to her sister was such during dinnertime as showed an
-admiration of her, which, though more guarded than formerly, persuaded
-Elizabeth, that, if left wholly to himself, Jane’s happiness, and his
-own, would be speedily secured. Though she dared not depend upon the
-consequence, she yet received pleasure from observing his behaviour. It
-gave her all the animation that her spirits could boast; for she was in
-no cheerful humour. Mr. Darcy was almost as far from her as the table
-could divide them. He was on one side of her mother. She knew how little
-such a situation would give pleasure to either, or make either appear to
-advantage. She was not near enough to hear any of their discourse; but
-she could see how seldom they spoke to each other, and how formal and
-cold was their manner whenever they did. Her mother’s ungraciousness
-made the sense of what they owed him more painful to Elizabeth’s mind;
-and she would, at times, have given anything to be privileged to tell
-him, that his kindness was neither unknown nor unfelt by the whole of
-the family.
-
-She was in hopes that the evening would afford some opportunity of
-bringing them together; that the whole of the visit would not pass away
-without enabling them to enter into something more of conversation,
-than the mere ceremonious salutation attending his entrance. Anxious and
-uneasy, the period which passed in the drawing-room before the gentlemen
-came, was wearisome and dull to a degree that almost made her uncivil.
-She looked forward to their entrance as the point on which all her
-chance of pleasure for the evening must depend.
-
-“If he does not come to me, _then_,” said she, “I shall give him up for
-ever.”
-
-The gentlemen came; and she thought he looked as if he would have
-answered her hopes; but, alas! the ladies had crowded round the table,
-where Miss Bennet was making tea, and Elizabeth pouring out the coffee,
-in so close a confederacy, that there was not a single vacancy near her
-which would admit of a chair. And on the gentlemen’s approaching, one of
-the girls moved closer to her than ever, and said, in a whisper,--
-
-“The men shan’t come and part us, I am determined. We want none of them;
-do we?”
-
-Darcy had walked away to another part of the room. She followed him with
-her eyes, envied everyone to whom he spoke, had scarcely patience enough
-to help anybody to coffee, and then was enraged against herself for
-being so silly!
-
-“A man who has once been refused! How could I ever be foolish enough to
-expect a renewal of his love? Is there one among the sex who would not
-protest against such a weakness as a second proposal to the same woman?
-There is no indignity so abhorrent to their feelings.”
-
-She was a little revived, however, by his bringing back his coffee-cup
-himself; and she seized the opportunity of saying,--
-
-“Is your sister at Pemberley still?”
-
-“Yes; she will remain there till Christmas.”
-
-“And quite alone? Have all her friends left her?”
-
-“Mrs. Annesley is with her. The others have been gone on to Scarborough
-these three weeks.”
-
-She could think of nothing more to say; but if he wished to converse
-with her, he might have better success. He stood by her, however, for
-some minutes, in silence; and, at last, on the young lady’s whispering
-to Elizabeth again, he walked away.
-
-When the tea things were removed, and the card tables placed, the ladies
-all rose; and Elizabeth was then hoping to be soon joined by him, when
-all her views were overthrown, by seeing him fall a victim to her
-mother’s rapacity for whist players, and in a few moments after seated
-with the rest of the party. She now lost every expectation of pleasure.
-They were confined for the evening at different tables; and she had
-nothing to hope, but that his eyes were so often turned towards her side
-of the room, as to make him play as unsuccessfully as herself.
-
-Mrs. Bennet had designed to keep the two Netherfield gentlemen to
-supper; but their carriage was, unluckily, ordered before any of the
-others, and she had no opportunity of detaining them.
-
-“Well, girls,” said she, as soon as they were left to themselves, “what
-say you to the day? I think everything has passed off uncommonly well, I
-assure you. The dinner was as well dressed as any I ever saw. The
-venison was roasted to a turn--and everybody said, they never saw so fat
-a haunch. The soup was fifty times better than what we had at the
-Lucases’ last week; and even Mr. Darcy acknowledged that the partridges
-were remarkably well done; and I suppose he has two or three French
-cooks at least. And, my dear Jane, I never saw you look in greater
-beauty. Mrs. Long said so too, for I asked her whether you did not. And
-what do you think she said besides? ‘Ah! Mrs. Bennet, we shall have her
-at Netherfield at last!’ She did, indeed. I do think Mrs. Long is as
-good a creature as ever lived--and her nieces are very pretty behaved
-girls, and not at all handsome: I like them prodigiously.”
-
-[Illustration:
-
-     “M^{rs}. Long and her nieces.”
-]
-
-Mrs. Bennet, in short, was in very great spirits: she had seen enough of
-Bingley’s behaviour to Jane to be convinced that she would get him at
-last; and her expectations of advantage to her family, when in a happy
-humour, were so far beyond reason, that she was quite disappointed at
-not seeing him there again the next day, to make his proposals.
-
-“It has been a very agreeable day,” said Miss Bennet to Elizabeth. “The
-party seemed so well selected, so suitable one with the other. I hope we
-may often meet again.”
-
-Elizabeth smiled.
-
-“Lizzy, you must not do so. You must not suspect me. It mortifies me. I
-assure you that I have now learnt to enjoy his conversation as an
-agreeable and sensible young man without having a wish beyond it. I am
-perfectly satisfied, from what his manners now are, that he never had
-any design of engaging my affection. It is only that he is blessed with
-greater sweetness of address, and a stronger desire of generally
-pleasing, than any other man.”
-
-“You are very cruel,” said her sister, “you will not let me smile, and
-are provoking me to it every moment.”
-
-“How hard it is in some cases to be believed! And how impossible in
-others! But why should you wish to persuade me that I feel more than I
-acknowledge?”
-
-“That is a question which I hardly know how to answer. We all love to
-instruct, though we can teach only what is not worth knowing. Forgive
-me; and if you persist in indifference, do not make _me_ your
-confidante.”
-
-
-
-
-[Illustration:
-
-     “Lizzy, my dear, I want to speak to you.”
-]
-
-
-
-
-CHAPTER LV.
-
-
-[Illustration]
-
-A few days after this visit, Mr. Bingley called again, and alone. His
-friend had left him that morning for London, but was to return home in
-ten days’ time. He sat with them above an hour, and was in remarkably
-good spirits. Mrs. Bennet invited him to dine with them; but, with many
-expressions of concern, he confessed himself engaged elsewhere.
-
-“Next time you call,” said she, “I hope we shall be more lucky.”
-
-He should be particularly happy at any time, etc., etc.; and if she
-would give him leave, would take an early opportunity of waiting on
-them.
-
-“Can you come to-morrow?”
-
-Yes, he had no engagement at all for to-morrow; and her invitation was
-accepted with alacrity.
-
-He came, and in such very good time, that the ladies were none of them
-dressed. In ran Mrs. Bennet to her daughters’ room, in her
-dressing-gown, and with her hair half finished, crying out,--
-
-“My dear Jane, make haste and hurry down. He is come--Mr. Bingley is
-come. He is, indeed. Make haste, make haste. Here, Sarah, come to Miss
-Bennet this moment, and help her on with her gown. Never mind Miss
-Lizzy’s hair.”
-
-“We will be down as soon as we can,” said Jane; “but I dare say Kitty is
-forwarder than either of us, for she went upstairs half an hour ago.”
-
-“Oh! hang Kitty! what has she to do with it? Come, be quick, be quick!
-where is your sash, my dear?”
-
-But when her mother was gone, Jane would not be prevailed on to go down
-without one of her sisters.
-
-The same anxiety to get them by themselves was visible again in the
-evening. After tea, Mr. Bennet retired to the library, as was his
-custom, and Mary went upstairs to her instrument. Two obstacles of the
-five being thus removed, Mrs. Bennet sat looking and winking at
-Elizabeth and Catherine for a considerable time, without making any
-impression on them. Elizabeth would not observe her; and when at last
-Kitty did, she very innocently said, “What is the matter, mamma? What do
-you keep winking at me for? What am I to do?”
-
-“Nothing, child, nothing. I did not wink at you.” She then sat still
-five minutes longer; but unable to waste such a precious occasion, she
-suddenly got up, and saying to Kitty,--
-
-“Come here, my love, I want to speak to you,” took her out of the room.
-Jane instantly gave a look at Elizabeth which spoke her distress at such
-premeditation, and her entreaty that _she_ would not give in to it. In a
-few minutes, Mrs. Bennet half opened the door and called out,--
-
-“Lizzy, my dear, I want to speak with you.”
-
-Elizabeth was forced to go.
-
-“We may as well leave them by themselves, you know,” said her mother as
-soon as she was in the hall. “Kitty and I are going upstairs to sit in
-my dressing-room.”
-
-Elizabeth made no attempt to reason with her mother, but remained
-quietly in the hall till she and Kitty were out of sight, then returned
-into the drawing-room.
-
-Mrs. Bennet’s schemes for this day were ineffectual. Bingley was
-everything that was charming, except the professed lover of her
-daughter. His ease and cheerfulness rendered him a most agreeable
-addition to their evening party; and he bore with the ill-judged
-officiousness of the mother, and heard all her silly remarks with a
-forbearance and command of countenance particularly grateful to the
-daughter.
-
-He scarcely needed an invitation to stay supper; and before he went away
-an engagement was formed, chiefly through his own and Mrs. Bennet’s
-means, for his coming next morning to shoot with her husband.
-
-After this day, Jane said no more of her indifference. Not a word passed
-between the sisters concerning Bingley; but Elizabeth went to bed in the
-happy belief that all must speedily be concluded, unless Mr. Darcy
-returned within the stated time. Seriously, however, she felt tolerably
-persuaded that all this must have taken place with that gentleman’s
-concurrence.
-
-Bingley was punctual to his appointment; and he and Mr. Bennet spent the
-morning together, as had been agreed on. The latter was much more
-agreeable than his companion expected. There was nothing of presumption
-or folly in Bingley that could provoke his ridicule, or disgust him into
-silence; and he was more communicative, and less eccentric, than the
-other had ever seen him. Bingley of course returned with him to dinner;
-and in the evening Mrs. Bennet’s invention was again at work to get
-everybody away from him and her daughter. Elizabeth, who had a letter to
-write, went into the breakfast-room for that purpose soon after tea; for
-as the others were all going to sit down to cards, she could not be
-wanted to counteract her mother’s schemes.
-
-But on her returning to the drawing-room, when her letter was finished,
-she saw, to her infinite surprise, there was reason to fear that her
-mother had been too ingenious for her. On opening the door, she
-perceived her sister and Bingley standing together over the hearth, as
-if engaged in earnest conversation; and had this led to no suspicion,
-the faces of both, as they hastily turned round and moved away from each
-other, would have told it all. _Their_ situation was awkward enough; but
-_hers_ she thought was still worse. Not a syllable was uttered by
-either; and Elizabeth was on the point of going away again, when
-Bingley, who as well as the other had sat down, suddenly rose, and,
-whispering a few words to her sister, ran out of the room.
-
-Jane could have no reserves from Elizabeth, where confidence would give
-pleasure; and, instantly embracing her, acknowledged, with the liveliest
-emotion, that she was the happiest creature in the world.
-
-“’Tis too much!” she added, “by far too much. I do not deserve it. Oh,
-why is not everybody as happy?”
-
-Elizabeth’s congratulations were given with a sincerity, a warmth, a
-delight, which words could but poorly express. Every sentence of
-kindness was a fresh source of happiness to Jane. But she would not
-allow herself to stay with her sister, or say half that remained to be
-said, for the present.
-
-“I must go instantly to my mother,” she cried. “I would not on any
-account trifle with her affectionate solicitude, or allow her to hear it
-from anyone but myself. He is gone to my father already. Oh, Lizzy, to
-know that what I have to relate will give such pleasure to all my dear
-family! how shall I bear so much happiness?”
-
-She then hastened away to her mother, who had purposely broken up the
-card-party, and was sitting upstairs with Kitty.
-
-Elizabeth, who was left by herself, now smiled at the rapidity and ease
-with which an affair was finally settled, that had given them so many
-previous months of suspense and vexation.
-
-“And this,” said she, “is the end of all his friend’s anxious
-circumspection! of all his sister’s falsehood and contrivance! the
-happiest, wisest, and most reasonable end!”
-
-In a few minutes she was joined by Bingley, whose conference with her
-father had been short and to the purpose.
-
-“Where is your sister?” said he hastily, as he opened the door.
-
-“With my mother upstairs. She will be down in a moment, I dare say.”
-
-He then shut the door, and, coming up to her, claimed the good wishes
-and affection of a sister. Elizabeth honestly and heartily expressed her
-delight in the prospect of their relationship. They shook hands with
-great cordiality; and then, till her sister came down, she had to listen
-to all he had to say of his own happiness, and of Jane’s perfections;
-and in spite of his being a lover, Elizabeth really believed all his
-expectations of felicity to be rationally founded, because they had for
-basis the excellent understanding and super-excellent disposition of
-Jane, and a general similarity of feeling and taste between her and
-himself.
-
-It was an evening of no common delight to them all; the satisfaction of
-Miss Bennet’s mind gave such a glow of sweet animation to her face, as
-made her look handsomer than ever. Kitty simpered and smiled, and hoped
-her turn was coming soon. Mrs. Bennet could not give her consent, or
-speak her approbation in terms warm enough to satisfy her feelings,
-though she talked to Bingley of nothing else, for half an hour; and when
-Mr. Bennet joined them at supper, his voice and manner plainly showed
-how really happy he was.
-
-Not a word, however, passed his lips in allusion to it, till their
-visitor took his leave for the night; but as soon as he was gone, he
-turned to his daughter and said,--
-
-“Jane, I congratulate you. You will be a very happy woman.”
-
-Jane went to him instantly, kissed him, and thanked him for his
-goodness.
-
-“You are a good girl,” he replied, “and I have great pleasure in
-thinking you will be so happily settled. I have not a doubt of your
-doing very well together. Your tempers are by no means unlike. You are
-each of you so complying, that nothing will ever be resolved on; so
-easy, that every servant will cheat you; and so generous, that you will
-always exceed your income.”
-
-“I hope not so. Imprudence or thoughtlessness in money matters would be
-unpardonable in _me_.”
-
-“Exceed their income! My dear Mr. Bennet,” cried his wife, “what are you
-talking of? Why, he has four or five thousand a year, and very likely
-more.” Then addressing her daughter, “Oh, my dear, dear Jane, I am so
-happy! I am sure I shan’t get a wink of sleep all night. I knew how it
-would be. I always said it must be so, at last. I was sure you could not
-be so beautiful for nothing! I remember, as soon as ever I saw him, when
-he first came into Hertfordshire last year, I thought how likely it was
-that you should come together. Oh, he is the handsomest young man that
-ever was seen!”
-
-Wickham, Lydia, were all forgotten. Jane was beyond competition her
-favourite child. At that moment she cared for no other. Her younger
-sisters soon began to make interest with her for objects of happiness
-which she might in future be able to dispense.
-
-Mary petitioned for the use of the library at Netherfield; and Kitty
-begged very hard for a few balls there every winter.
-
-Bingley, from this time, was of course a daily visitor at Longbourn;
-coming frequently before breakfast, and always remaining till after
-supper; unless when some barbarous neighbour, who could not be enough
-detested, had given him an invitation to dinner, which he thought
-himself obliged to accept.
-
-Elizabeth had now but little time for conversation with her sister; for
-while he was present Jane had no attention to bestow on anyone else: but
-she found herself considerably useful to both of them, in those hours of
-separation that must sometimes occur. In the absence of Jane, he always
-attached himself to Elizabeth for the pleasure of talking of her; and
-when Bingley was gone, Jane constantly sought the same means of relief.
-
-“He has made me so happy,” said she, one evening, “by telling me that he
-was totally ignorant of my being in town last spring! I had not believed
-it possible.”
-
-“I suspected as much,” replied Elizabeth. “But how did he account for
-it?”
-
-“It must have been his sisters’ doing. They were certainly no friends to
-his acquaintance with me, which I cannot wonder at, since he might have
-chosen so much more advantageously in many respects. But when they see,
-as I trust they will, that their brother is happy with me, they will
-learn to be contented, and we shall be on good terms again: though we
-can never be what we once were to each other.”
-
-“That is the most unforgiving speech,” said Elizabeth, “that I ever
-heard you utter. Good girl! It would vex me, indeed, to see you again
-the dupe of Miss Bingley’s pretended regard.”
-
-“Would you believe it, Lizzy, that when he went to town last November he
-really loved me, and nothing but a persuasion of _my_ being indifferent
-would have prevented his coming down again?”
-
-“He made a little mistake, to be sure; but it is to the credit of his
-modesty.”
-
-This naturally introduced a panegyric from Jane on his diffidence, and
-the little value he put on his own good qualities.
-
-Elizabeth was pleased to find that he had not betrayed the interference
-of his friend; for, though Jane had the most generous and forgiving
-heart in the world, she knew it was a circumstance which must prejudice
-her against him.
-
-“I am certainly the most fortunate creature that ever existed!” cried
-Jane. “Oh, Lizzy, why am I thus singled from my family, and blessed
-above them all? If I could but see you as happy! If there were but such
-another man for you!”
-
-“If you were to give me forty such men I never could be so happy as you.
-Till I have your disposition, your goodness, I never can have your
-happiness. No, no, let me shift for myself; and, perhaps, if I have very
-good luck, I may meet with another Mr. Collins in time.”
-
-The situation of affairs in the Longbourn family could not be long a
-secret. Mrs. Bennet was privileged to whisper it to Mrs. Philips, and
-she ventured, without any permission, to do the same by all her
-neighbours in Meryton.
-
-The Bennets were speedily pronounced to be the luckiest family in the
-world; though only a few weeks before, when Lydia had first run away,
-they had been generally proved to be marked out for misfortune.
-
-
-
-
-[Illustration]
-
-
-
-
-CHAPTER LVI.
-
-
-[Illustration]
-
-One morning, about a week after Bingley’s engagement with Jane had been
-formed, as he and the females of the family were sitting together in the
-dining-room, their attention was suddenly drawn to the window by the
-sound of a carriage; and they perceived a chaise and four driving up the
-lawn. It was too early in the morning for visitors; and besides, the
-equipage did not answer to that of any of their neighbours. The horses
-were post; and neither the carriage, nor the livery of the servant who
-preceded it, were familiar to them. As it was certain, however, that
-somebody was coming, Bingley instantly prevailed on Miss Bennet to avoid
-the confinement of such an intrusion, and walk away with him into the
-shrubbery. They both set off; and the conjectures of the remaining three
-continued, though with little satisfaction, till the door was thrown
-open, and their visitor entered. It was Lady Catherine de Bourgh.
-
-They were of course all intending to be surprised: but their
-astonishment was beyond their expectation; and on the part of Mrs.
-Bennet and Kitty, though she was perfectly unknown to them, even
-inferior to what Elizabeth felt.
-
-She entered the room with an air more than usually ungracious, made no
-other reply to Elizabeth’s salutation than a slight inclination of the
-head, and sat down without saying a word. Elizabeth had mentioned her
-name to her mother on her Ladyship’s entrance, though no request of
-introduction had been made.
-
-Mrs. Bennet, all amazement, though flattered by having a guest of such
-high importance, received her with the utmost politeness. After sitting
-for a moment in silence, she said, very stiffly, to Elizabeth,--
-
-“I hope you are well, Miss Bennet. That lady, I suppose, is your
-mother?”
-
-Elizabeth replied very concisely that she was.
-
-“And _that_, I suppose, is one of your sisters?”
-
-“Yes, madam,” said Mrs. Bennet, delighted to speak to a Lady Catherine.
-“She is my youngest girl but one. My youngest of all is lately married,
-and my eldest is somewhere about the ground, walking with a young man,
-who, I believe, will soon become a part of the family.”
-
-“You have a very small park here,” returned Lady Catherine, after a
-short silence.
-
-“It is nothing in comparison of Rosings, my Lady, I dare say; but, I
-assure you, it is much larger than Sir William Lucas’s.”
-
-“This must be a most inconvenient sitting-room for the evening in
-summer: the windows are full west.”
-
-Mrs. Bennet assured her that they never sat there after dinner; and then
-added,--
-
-“May I take the liberty of asking your Ladyship whether you left Mr. and
-Mrs. Collins well?”
-
-“Yes, very well. I saw them the night before last.”
-
-Elizabeth now expected that she would produce a letter for her from
-Charlotte, as it seemed the only probable motive for her calling. But no
-letter appeared, and she was completely puzzled.
-
-Mrs. Bennet, with great civility, begged her Ladyship to take some
-refreshment: but Lady Catherine very resolutely, and not very politely,
-declined eating anything; and then, rising up, said to Elizabeth,--
-
-“Miss Bennet, there seemed to be a prettyish kind of a little wilderness
-on one side of your lawn. I should be glad to take a turn in it, if you
-will favour me with your company.”
-
-“Go, my dear,” cried her mother, “and show her Ladyship about the
-different walks. I think she will be pleased with the hermitage.”
-
-Elizabeth obeyed; and, running into her own room for her parasol,
-attended her noble guest downstairs. As they passed through the hall,
-Lady Catherine opened the doors into the dining-parlour and
-drawing-room, and pronouncing them, after a short survey, to be
-decent-looking rooms, walked on.
-
-Her carriage remained at the door, and Elizabeth saw that her
-waiting-woman was in it. They proceeded in silence along the gravel walk
-that led to the copse; Elizabeth was determined to make no effort for
-conversation with a woman who was now more than usually insolent and
-disagreeable.
-
-[Illustration:
-
-“After a short survey”
-
-[_Copyright 1894 by George Allen._]]
-
-“How could I ever think her like her nephew?” said she, as she looked in
-her face.
-
-As soon as they entered the copse, Lady Catherine began in the following
-manner:--
-
-“You can be at no loss, Miss Bennet, to understand the reason of my
-journey hither. Your own heart, your own conscience, must tell you why I
-come.”
-
-Elizabeth looked with unaffected astonishment.
-
-“Indeed, you are mistaken, madam; I have not been at all able to account
-for the honour of seeing you here.”
-
-“Miss Bennet,” replied her Ladyship, in an angry tone, “you ought to
-know that I am not to be trifled with. But however insincere _you_ may
-choose to be, you shall not find _me_ so. My character has ever been
-celebrated for its sincerity and frankness; and in a cause of such
-moment as this, I shall certainly not depart from it. A report of a most
-alarming nature reached me two days ago. I was told, that not only your
-sister was on the point of being most advantageously married, but that
-_you_--that Miss Elizabeth Bennet would, in all likelihood, be soon
-afterwards united to my nephew--my own nephew, Mr. Darcy. Though I
-_know_ it must be a scandalous falsehood, though I would not injure him
-so much as to suppose the truth of it possible, I instantly resolved on
-setting off for this place, that I might make my sentiments known to
-you.”
-
-“If you believed it impossible to be true,” said Elizabeth, colouring
-with astonishment and disdain, “I wonder you took the trouble of coming
-so far. What could your Ladyship propose by it?”
-
-“At once to insist upon having such a report universally contradicted.”
-
-“Your coming to Longbourn, to see me and my family,” said Elizabeth
-coolly, “will be rather a confirmation of it--if, indeed, such a report
-is in existence.”
-
-“If! do you then pretend to be ignorant of it? Has it not been
-industriously circulated by yourselves? Do you not know that such a
-report is spread abroad?”
-
-“I never heard that it was.”
-
-“And can you likewise declare, that there is no _foundation_ for it?”
-
-“I do not pretend to possess equal frankness with your Ladyship. _You_
-may ask questions which _I_ shall not choose to answer.”
-
-“This is not to be borne. Miss Bennet, I insist on being satisfied. Has
-he, has my nephew, made you an offer of marriage?”
-
-“Your Ladyship has declared it to be impossible.”
-
-“It ought to be so; it must be so, while he retains the use of his
-reason. But _your_ arts and allurements may, in a moment of infatuation,
-have made him forget what he owes to himself and to all his family. You
-may have drawn him in.”
-
-“If I have, I shall be the last person to confess it.”
-
-“Miss Bennet, do you know who I am? I have not been accustomed to such
-language as this. I am almost the nearest relation he has in the world,
-and am entitled to know all his dearest concerns.”
-
-“But you are not entitled to know _mine_; nor will such behaviour as
-this ever induce me to be explicit.”
-
-“Let me be rightly understood. This match, to which you have the
-presumption to aspire, can never take place. No, never. Mr. Darcy is
-engaged to _my daughter_. Now, what have you to say?”
-
-“Only this,--that if he is so, you can have no reason to suppose he will
-make an offer to me.”
-
-Lady Catherine hesitated for a moment, and then replied,--
-
-“The engagement between them is of a peculiar kind. From their infancy,
-they have been intended for each other. It was the favourite wish of
-_his_ mother, as well as of hers. While in their cradles we planned the
-union; and now, at the moment when the wishes of both sisters would be
-accomplished, is their marriage to be prevented by a young woman of
-inferior birth, of no importance in the world, and wholly unallied to
-the family? Do you pay no regard to the wishes of his friends--to his
-tacit engagement with Miss de Bourgh? Are you lost to every feeling of
-propriety and delicacy? Have you not heard me say, that from his
-earliest hours he was destined for his cousin?”
-
-“Yes; and I had heard it before. But what is that to me? If there is no
-other objection to my marrying your nephew, I shall certainly not be
-kept from it by knowing that his mother and aunt wished him to marry
-Miss de Bourgh. You both did as much as you could in planning the
-marriage. Its completion depended on others. If Mr. Darcy is neither by
-honour nor inclination confined to his cousin, why is not he to make
-another choice? And if I am that choice, why may not I accept him?”
-
-“Because honour, decorum, prudence--nay, interest--forbid it. Yes, Miss
-Bennet, interest; for do not expect to be noticed by his family or
-friends, if you wilfully act against the inclinations of all. You will
-be censured, slighted, and despised, by everyone connected with him.
-Your alliance will be a disgrace; your name will never even be mentioned
-by any of us.”
-
-“These are heavy misfortunes,” replied Elizabeth. “But the wife of Mr.
-Darcy must have such extraordinary sources of happiness necessarily
-attached to her situation, that she could, upon the whole, have no cause
-to repine.”
-
-“Obstinate, headstrong girl! I am ashamed of you! Is this your gratitude
-for my attentions to you last spring? Is nothing due to me on that
-score? Let us sit down. You are to understand, Miss Bennet, that I came
-here with the determined resolution of carrying my purpose; nor will I
-be dissuaded from it. I have not been used to submit to any person’s
-whims. I have not been in the habit of brooking disappointment.”
-
-“_That_ will make your Ladyship’s situation at present more pitiable;
-but it will have no effect on _me_.”
-
-“I will not be interrupted! Hear me in silence. My daughter and my
-nephew are formed for each other. They are descended, on the maternal
-side, from the same noble line; and, on the father’s, from respectable,
-honourable, and ancient, though untitled, families. Their fortune on
-both sides is splendid. They are destined for each other by the voice of
-every member of their respective houses; and what is to divide
-them?--the upstart pretensions of a young woman without family,
-connections, or fortune! Is this to be endured? But it must not, shall
-not be! If you were sensible of your own good, you would not wish to
-quit the sphere in which you have been brought up.”
-
-“In marrying your nephew, I should not consider myself as quitting that
-sphere. He is a gentleman; I am a gentleman’s daughter; so far we are
-equal.”
-
-“True. You _are_ a gentleman’s daughter. But what was your mother? Who
-are your uncles and aunts? Do not imagine me ignorant of their
-condition.”
-
-“Whatever my connections may be,” said Elizabeth, “if your nephew does
-not object to them, they can be nothing to _you_.”
-
-“Tell me, once for all, are you engaged to him?”
-
-Though Elizabeth would not, for the mere purpose of obliging Lady
-Catherine, have answered this question, she could not but say, after a
-moment’s deliberation,--
-
-“I am not.”
-
-Lady Catherine seemed pleased.
-
-“And will you promise me never to enter into such an engagement?”
-
-“I will make no promise of the kind.”
-
-“Miss Bennet, I am shocked and astonished. I expected to find a more
-reasonable young woman. But do not deceive yourself into a belief that I
-will ever recede. I shall not go away till you have given me the
-assurance I require.”
-
-“And I certainly _never_ shall give it. I am not to be intimidated into
-anything so wholly unreasonable. Your Ladyship wants Mr. Darcy to marry
-your daughter; but would my giving you the wished-for promise make
-_their_ marriage at all more probable? Supposing him to be attached to
-me, would _my_ refusing to accept his hand make him wish to bestow it on
-his cousin? Allow me to say, Lady Catherine, that the arguments with
-which you have supported this extraordinary application have been as
-frivolous as the application was ill-judged. You have widely mistaken my
-character, if you think I can be worked on by such persuasions as these.
-How far your nephew might approve of your interference in _his_ affairs,
-I cannot tell; but you have certainly no right to concern yourself in
-mine. I must beg, therefore, to be importuned no further on the
-subject.”
-
-“Not so hasty, if you please. I have by no means done. To all the
-objections I have already urged I have still another to add. I am no
-stranger to the particulars of your youngest sister’s infamous
-elopement. I know it all; that the young man’s marrying her was a
-patched-up business, at the expense of your father and uncle. And is
-_such_ a girl to be my nephew’s sister? Is _her_ husband, who is the son
-of his late father’s steward, to be his brother? Heaven and earth!--of
-what are you thinking? Are the shades of Pemberley to be thus polluted?”
-
-“You can _now_ have nothing further to say,” she resentfully answered.
-“You have insulted me, in every possible method. I must beg to return to
-the house.”
-
-And she rose as she spoke. Lady Catherine rose also, and they turned
-back. Her Ladyship was highly incensed.
-
-“You have no regard, then, for the honour and credit of my nephew!
-Unfeeling, selfish girl! Do you not consider that a connection with you
-must disgrace him in the eyes of everybody?”
-
-“Lady Catherine, I have nothing further to say. You know my sentiments.”
-
-“You are then resolved to have him?”
-
-“I have said no such thing. I am only resolved to act in that manner,
-which will, in my own opinion, constitute my happiness, without
-reference to _you_, or to any person so wholly unconnected with me.”
-
-“It is well. You refuse, then, to oblige me. You refuse to obey the
-claims of duty, honour, and gratitude. You are determined to ruin him in
-the opinion of all his friends, and make him the contempt of the world.”
-
-“Neither duty, nor honour, nor gratitude,” replied Elizabeth, “has any
-possible claim on me, in the present instance. No principle of either
-would be violated by my marriage with Mr. Darcy. And with regard to the
-resentment of his family, or the indignation of the world, if the former
-_were_ excited by his marrying me, it would not give me one moment’s
-concern--and the world in general would have too much sense to join in
-the scorn.”
-
-“And this is your real opinion! This is your final resolve! Very well. I
-shall now know how to act. Do not imagine, Miss Bennet, that your
-ambition will ever be gratified. I came to try you. I hoped to find you
-reasonable; but depend upon it I will carry my point.”
-
-In this manner Lady Catherine talked on till they were at the door of
-the carriage, when, turning hastily round, she added,--
-
-“I take no leave of you, Miss Bennet. I send no compliments to your
-mother. You deserve no such attention. I am most seriously displeased.”
-
-Elizabeth made no answer; and without attempting to persuade her
-Ladyship to return into the house, walked quietly into it herself. She
-heard the carriage drive away as she proceeded upstairs. Her mother
-impatiently met her at the door of her dressing-room, to ask why Lady
-Catherine would not come in again and rest herself.
-
-“She did not choose it,” said her daughter; “she would go.”
-
-“She is a very fine-looking woman! and her calling here was prodigiously
-civil! for she only came, I suppose, to tell us the Collinses were well.
-She is on her road somewhere, I dare say; and so, passing through
-Meryton, thought she might as well call on you. I suppose she had
-nothing particular to say to you, Lizzy?”
-
-Elizabeth was forced to give in to a little falsehood here; for to
-acknowledge the substance of their conversation was impossible.
-
-
-
-
-[Illustration:
-
-     “But now it comes out”
-]
-
-
-
-
-CHAPTER LVII.
-
-
-[Illustration]
-
-The discomposure of spirits which this extraordinary visit threw
-Elizabeth into could not be easily overcome; nor could she for many
-hours learn to think of it less than incessantly. Lady Catherine, it
-appeared, had actually taken the trouble of this journey from Rosings
-for the sole purpose of breaking off her supposed engagement with Mr.
-Darcy. It was a rational scheme, to be sure! but from what the report of
-their engagement could originate, Elizabeth was at a loss to imagine;
-till she recollected that _his_ being the intimate friend of Bingley,
-and _her_ being the sister of Jane, was enough, at a time when the
-expectation of one wedding made everybody eager for another, to supply
-the idea. She had not herself forgotten to feel that the marriage of her
-sister must bring them more frequently together. And her neighbours at
-Lucas Lodge, therefore, (for through their communication with the
-Collinses, the report, she concluded, had reached Lady Catherine,) had
-only set _that_ down as almost certain and immediate which _she_ had
-looked forward to as possible at some future time.
-
-In revolving Lady Catherine’s expressions, however, she could not help
-feeling some uneasiness as to the possible consequence of her persisting
-in this interference. From what she had said of her resolution to
-prevent the marriage, it occurred to Elizabeth that she must meditate an
-application to her nephew; and how he might take a similar
-representation of the evils attached to a connection with her she dared
-not pronounce. She knew not the exact degree of his affection for his
-aunt, or his dependence on her judgment, but it was natural to suppose
-that he thought much higher of her Ladyship than _she_ could do; and it
-was certain, that in enumerating the miseries of a marriage with _one_
-whose immediate connections were so unequal to his own, his aunt would
-address him on his weakest side. With his notions of dignity, he would
-probably feel that the arguments, which to Elizabeth had appeared weak
-and ridiculous, contained much good sense and solid reasoning.
-
-If he had been wavering before, as to what he should do, which had often
-seemed likely, the advice and entreaty of so near a relation might
-settle every doubt, and determine him at once to be as happy as dignity
-unblemished could make him. In that case he would return no more. Lady
-Catherine might see him in her way through town; and his engagement to
-Bingley of coming again to Netherfield must give way.
-
-“If, therefore, an excuse for not keeping his promise should come to his
-friend within a few days,” she added, “I shall know how to understand
-it. I shall then give over every expectation, every wish of his
-constancy. If he is satisfied with only regretting me, when he might
-have obtained my affections and hand, I shall soon cease to regret him
-at all.”
-
-The surprise of the rest of the family, on hearing who their visitor had
-been, was very great: but they obligingly satisfied it with the same
-kind of supposition which had appeased Mrs. Bennet’s curiosity; and
-Elizabeth was spared from much teasing on the subject.
-
-The next morning, as she was going down stairs, she was met by her
-father, who came out of his library with a letter in his hand.
-
-“Lizzy,” said he, “I was going to look for you: come into my room.”
-
-She followed him thither; and her curiosity to know what he had to tell
-her was heightened by the supposition of its being in some manner
-connected with the letter he held. It suddenly struck her that it might
-be from Lady Catherine, and she anticipated with dismay all the
-consequent explanations.
-
-She followed her father to the fireplace, and they both sat down. He
-then said,--
-
-“I have received a letter this morning that has astonished me
-exceedingly. As it principally concerns yourself, you ought to know its
-contents. I did not know before that I had _two_ daughters on the brink
-of matrimony. Let me congratulate you on a very important conquest.”
-
-The colour now rushed into Elizabeth’s cheeks in the instantaneous
-conviction of its being a letter from the nephew, instead of the aunt;
-and she was undetermined whether most to be pleased that he explained
-himself at all, or offended that his letter was not rather addressed to
-herself, when her father continued,--
-
-“You look conscious. Young ladies have great penetration in such matters
-as these; but I think I may defy even _your_ sagacity to discover the
-name of your admirer. This letter is from Mr. Collins.”
-
-“From Mr. Collins! and what can _he_ have to say?”
-
-“Something very much to the purpose, of course. He begins with
-congratulations on the approaching nuptials of my eldest daughter, of
-which, it seems, he has been told by some of the good-natured, gossiping
-Lucases. I shall not sport with your impatience by reading what he says
-on that point. What relates to yourself is as follows:--‘Having thus
-offered you the sincere congratulations of Mrs. Collins and myself on
-this happy event, let me now add a short hint on the subject of another,
-of which we have been advertised by the same authority. Your daughter
-Elizabeth, it is presumed, will not long bear the name of Bennet, after
-her eldest sister has resigned it; and the chosen partner of her fate
-may be reasonably looked up to as one of the most illustrious personages
-in this land.’ Can you possibly guess, Lizzy, who is meant by this?
-‘This young gentleman is blessed, in a peculiar way, with everything the
-heart of mortal can most desire,--splendid property, noble kindred, and
-extensive patronage. Yet, in spite of all these temptations, let me warn
-my cousin Elizabeth, and yourself, of what evils you may incur by a
-precipitate closure with this gentleman’s proposals, which, of course,
-you will be inclined to take immediate advantage of.’ Have you any idea,
-Lizzy, who this gentleman is? But now it comes out. ‘My motive for
-cautioning you is as follows:--We have reason to imagine that his aunt,
-Lady Catherine de Bourgh, does not look on the match with a friendly
-eye.’ _Mr. Darcy_, you see, is the man! Now, Lizzy, I think I _have_
-surprised you. Could he, or the Lucases, have pitched on any man, within
-the circle of our acquaintance, whose name would have given the lie more
-effectually to what they related? Mr. Darcy, who never looks at any
-woman but to see a blemish, and who probably never looked at _you_ in
-his life! It is admirable!”
-
-Elizabeth tried to join in her father’s pleasantry, but could only force
-one most reluctant smile. Never had his wit been directed in a manner so
-little agreeable to her.
-
-“Are you not diverted?”
-
-“Oh, yes. Pray read on.”
-
-“‘After mentioning the likelihood of this marriage to her Ladyship last
-night, she immediately, with her usual condescension, expressed what she
-felt on the occasion; when it became apparent, that, on the score of
-some family objections on the part of my cousin, she would never give
-her consent to what she termed so disgraceful a match. I thought it my
-duty to give the speediest intelligence of this to my cousin, that she
-and her noble admirer may be aware of what they are about, and not run
-hastily into a marriage which has not been properly sanctioned.’ Mr.
-Collins, moreover, adds, ‘I am truly rejoiced that my cousin Lydia’s sad
-business has been so well hushed up, and am only concerned that their
-living together before the marriage took place should be so generally
-known. I must not, however, neglect the duties of my station, or refrain
-from declaring my amazement, at hearing that you received the young
-couple into your house as soon as they were married. It was an
-encouragement of vice; and had I been the rector of Longbourn, I should
-very strenuously have opposed it. You ought certainly to forgive them as
-a Christian, but never to admit them in your sight, or allow their
-names to be mentioned in your hearing.’ _That_ is his notion of
-Christian forgiveness! The rest of his letter is only about his dear
-Charlotte’s situation, and his expectation of a young olive-branch. But,
-Lizzy, you look as if you did not enjoy it. You are not going to be
-_missish_, I hope, and pretend to be affronted at an idle report. For
-what do we live, but to make sport for our neighbours, and laugh at them
-in our turn?”
-
-“Oh,” cried Elizabeth, “I am exceedingly diverted. But it is so
-strange!”
-
-“Yes, _that_ is what makes it amusing. Had they fixed on any other man
-it would have been nothing; but _his_ perfect indifference and _your_
-pointed dislike make it so delightfully absurd! Much as I abominate
-writing, I would not give up Mr. Collins’s correspondence for any
-consideration. Nay, when I read a letter of his, I cannot help giving
-him the preference even over Wickham, much as I value the impudence and
-hypocrisy of my son-in-law. And pray, Lizzy, what said Lady Catherine
-about this report? Did she call to refuse her consent?”
-
-To this question his daughter replied only with a laugh; and as it had
-been asked without the least suspicion, she was not distressed by his
-repeating it. Elizabeth had never been more at a loss to make her
-feelings appear what they were not. It was necessary to laugh when she
-would rather have cried. Her father had most cruelly mortified her by
-what he said of Mr. Darcy’s indifference; and she could do nothing but
-wonder at such a want of penetration, or fear that, perhaps, instead of
-his seeing too _little_, she might have fancied too _much_.
-
-
-
-
-[Illustration:
-
-“The efforts of his aunt”
-
-[_Copyright 1894 by George Allen._]]
-
-
-
-
-CHAPTER LVIII.
-
-
-[Illustration]
-
-Instead of receiving any such letter of excuse from his friend, as
-Elizabeth half expected Mr. Bingley to do, he was able to bring Darcy
-with him to Longbourn before many days had passed after Lady Catherine’s
-visit. The gentlemen arrived early; and, before Mrs. Bennet had time to
-tell him of their having seen his aunt, of which her daughter sat in
-momentary dread, Bingley, who wanted to be alone with Jane, proposed
-their all walking out. It was agreed to. Mrs. Bennet was not in the
-habit of walking, Mary could never spare time, but the remaining five
-set off together. Bingley and Jane, however, soon allowed the others to
-outstrip them. They lagged behind, while Elizabeth, Kitty, and Darcy
-were to entertain each other. Very little was said by either; Kitty was
-too much afraid of him to talk; Elizabeth was secretly forming a
-desperate resolution; and, perhaps, he might be doing the same.
-
-They walked towards the Lucases’, because Kitty wished to call upon
-Maria; and as Elizabeth saw no occasion for making it a general concern,
-when Kitty left them she went boldly on with him alone. Now was the
-moment for her resolution to be executed; and while her courage was
-high, she immediately said,--
-
-“Mr. Darcy, I am a very selfish creature, and for the sake of giving
-relief to my own feelings care not how much I may be wounding yours. I
-can no longer help thanking you for your unexampled kindness to my poor
-sister. Ever since I have known it I have been most anxious to
-acknowledge to you how gratefully I feel it. Were it known to the rest
-of my family I should not have merely my own gratitude to express.”
-
-“I am sorry, exceedingly sorry,” replied Darcy, in a tone of surprise
-and emotion, “that you have ever been informed of what may, in a
-mistaken light, have given you uneasiness. I did not think Mrs. Gardiner
-was so little to be trusted.”
-
-“You must not blame my aunt. Lydia’s thoughtlessness first betrayed to
-me that you had been concerned in the matter; and, of course, I could
-not rest till I knew the particulars. Let me thank you again and again,
-in the name of all my family, for that generous compassion which induced
-you to take so much trouble, and bear so many mortifications, for the
-sake of discovering them.”
-
-“If you _will_ thank me,” he replied, “let it be for yourself alone.
-That the wish of giving happiness to you might add force to the other
-inducements which led me on, I shall not attempt to deny. But your
-_family_ owe me nothing. Much as I respect them, I believe I thought
-only of _you_.”
-
-Elizabeth was too much embarrassed to say a word. After a short pause,
-her companion added, “You are too generous to trifle with me. If your
-feelings are still what they were last April, tell me so at once. _My_
-affections and wishes are unchanged; but one word from you will silence
-me on this subject for ever.”
-
-Elizabeth, feeling all the more than common awkwardness and anxiety of
-his situation, now forced herself to speak; and immediately, though not
-very fluently, gave him to understand that her sentiments had undergone
-so material a change since the period to which he alluded, as to make
-her receive with gratitude and pleasure his present assurances. The
-happiness which this reply produced was such as he had probably never
-felt before; and he expressed himself on the occasion as sensibly and as
-warmly as a man violently in love can be supposed to do. Had Elizabeth
-been able to encounter his eyes, she might have seen how well the
-expression of heartfelt delight diffused over his face became him: but
-though she could not look she could listen; and he told her of feelings
-which, in proving of what importance she was to him, made his affection
-every moment more valuable.
-
-They walked on without knowing in what direction. There was too much to
-be thought, and felt, and said, for attention to any other objects. She
-soon learnt that they were indebted for their present good understanding
-to the efforts of his aunt, who _did_ call on him in her return through
-London, and there relate her journey to Longbourn, its motive, and the
-substance of her conversation with Elizabeth; dwelling emphatically on
-every expression of the latter, which, in her Ladyship’s apprehension,
-peculiarly denoted her perverseness and assurance, in the belief that
-such a relation must assist her endeavours to obtain that promise from
-her nephew which _she_ had refused to give. But, unluckily for her
-Ladyship, its effect had been exactly contrariwise.
-
-“It taught me to hope,” said he, “as I had scarcely ever allowed myself
-to hope before. I knew enough of your disposition to be certain, that
-had you been absolutely, irrevocably decided against me, you would have
-acknowledged it to Lady Catherine frankly and openly.”
-
-Elizabeth coloured and laughed as she replied, “Yes, you know enough of
-my _frankness_ to believe me capable of _that_. After abusing you so
-abominably to your face, I could have no scruple in abusing you to all
-your relations.”
-
-“What did you say of me that I did not deserve? For though your
-accusations were ill-founded, formed on mistaken premises, my behaviour
-to you at the time had merited the severest reproof. It was
-unpardonable. I cannot think of it without abhorrence.”
-
-“We will not quarrel for the greater share of blame annexed to that
-evening,” said Elizabeth. “The conduct of neither, if strictly
-examined, will be irreproachable; but since then we have both, I hope,
-improved in civility.”
-
-“I cannot be so easily reconciled to myself. The recollection of what I
-then said, of my conduct, my manners, my expressions during the whole of
-it, is now, and has been many months, inexpressibly painful to me. Your
-reproof, so well applied, I shall never forget: ‘Had you behaved in a
-more gentlemanlike manner.’ Those were your words. You know not, you can
-scarcely conceive, how they have tortured me; though it was some time, I
-confess, before I was reasonable enough to allow their justice.”
-
-“I was certainly very far from expecting them to make so strong an
-impression. I had not the smallest idea of their being ever felt in such
-a way.”
-
-“I can easily believe it. You thought me then devoid of every proper
-feeling, I am sure you did. The turn of your countenance I shall never
-forget, as you said that I could not have addressed you in any possible
-way that would induce you to accept me.”
-
-“Oh, do not repeat what I then said. These recollections will not do at
-all. I assure you that I have long been most heartily ashamed of it.”
-
-Darcy mentioned his letter. “Did it,” said he,--“did it _soon_ make you
-think better of me? Did you, on reading it, give any credit to its
-contents?”
-
-She explained what its effects on her had been, and how gradually all
-her former prejudices had been removed.
-
-“I knew,” said he, “that what I wrote must give you pain, but it was
-necessary. I hope you have destroyed the letter. There was one part,
-especially the opening of it, which I should dread your having the power
-of reading again. I can remember some expressions which might justly
-make you hate me.”
-
-“The letter shall certainly be burnt, if you believe it essential to the
-preservation of my regard; but, though we have both reason to think my
-opinions not entirely unalterable, they are not, I hope, quite so easily
-changed as that implies.”
-
-“When I wrote that letter,” replied Darcy, “I believed myself perfectly
-calm and cool; but I am since convinced that it was written in a
-dreadful bitterness of spirit.”
-
-“The letter, perhaps, began in bitterness, but it did not end so. The
-adieu is charity itself. But think no more of the letter. The feelings
-of the person who wrote and the person who received it are now so widely
-different from what they were then, that every unpleasant circumstance
-attending it ought to be forgotten. You must learn some of my
-philosophy. Think only of the past as its remembrance gives you
-pleasure.”
-
-“I cannot give you credit for any philosophy of the kind. _Your_
-retrospections must be so totally void of reproach, that the contentment
-arising from them is not of philosophy, but, what is much better, of
-ignorance. But with _me_, it is not so. Painful recollections will
-intrude, which cannot, which ought not to be repelled. I have been a
-selfish being all my life, in practice, though not in principle. As a
-child I was taught what was _right_, but I was not taught to correct my
-temper. I was given good principles, but left to follow them in pride
-and conceit. Unfortunately an only son (for many years an only _child_),
-I was spoiled by my parents, who, though good themselves, (my father
-particularly, all that was benevolent and amiable,) allowed, encouraged,
-almost taught me to be selfish and overbearing, to care for none beyond
-my own family circle, to think meanly of all the rest of the world, to
-_wish_ at least to think meanly of their sense and worth compared with
-my own. Such I was, from eight to eight-and-twenty; and such I might
-still have been but for you, dearest, loveliest Elizabeth! What do I not
-owe you! You taught me a lesson, hard indeed at first, but most
-advantageous. By you, I was properly humbled. I came to you without a
-doubt of my reception. You showed me how insufficient were all my
-pretensions to please a woman worthy of being pleased.”
-
-“Had you then persuaded yourself that I should?”
-
-“Indeed I had. What will you think of my vanity? I believed you to be
-wishing, expecting my addresses.”
-
-“My manners must have been in fault, but not intentionally, I assure
-you. I never meant to deceive you, but my spirits might often lead me
-wrong. How you must have hated me after _that_ evening!”
-
-“Hate you! I was angry, perhaps, at first, but my anger soon began to
-take a proper direction.”
-
-“I am almost afraid of asking what you thought of me when we met at
-Pemberley. You blamed me for coming?”
-
-“No, indeed, I felt nothing but surprise.”
-
-“Your surprise could not be greater than _mine_ in being noticed by you.
-My conscience told me that I deserved no extraordinary politeness, and I
-confess that I did not expect to receive _more_ than my due.”
-
-“My object _then_,” replied Darcy, “was to show you, by every civility
-in my power, that I was not so mean as to resent the past; and I hoped
-to obtain your forgiveness, to lessen your ill opinion, by letting you
-see that your reproofs had been attended to. How soon any other wishes
-introduced themselves, I can hardly tell, but I believe in about half
-an hour after I had seen you.”
-
-He then told her of Georgiana’s delight in her acquaintance, and of her
-disappointment at its sudden interruption; which naturally leading to
-the cause of that interruption, she soon learnt that his resolution of
-following her from Derbyshire in quest of her sister had been formed
-before he quitted the inn, and that his gravity and thoughtfulness there
-had arisen from no other struggles than what such a purpose must
-comprehend.
-
-She expressed her gratitude again, but it was too painful a subject to
-each to be dwelt on farther.
-
-After walking several miles in a leisurely manner, and too busy to know
-anything about it, they found at last, on examining their watches, that
-it was time to be at home.
-
-“What could have become of Mr. Bingley and Jane?” was a wonder which
-introduced the discussion of _their_ affairs. Darcy was delighted with
-their engagement; his friend had given him the earliest information of
-it.
-
-“I must ask whether you were surprised?” said Elizabeth.
-
-“Not at all. When I went away, I felt that it would soon happen.”
-
-“That is to say, you had given your permission. I guessed as much.” And
-though he exclaimed at the term, she found that it had been pretty much
-the case.
-
-“On the evening before my going to London,” said he, “I made a
-confession to him, which I believe I ought to have made long ago. I told
-him of all that had occurred to make my former interference in his
-affairs absurd and impertinent. His surprise was great. He had never had
-the slightest suspicion. I told him, moreover, that I believed myself
-mistaken in supposing, as I had done, that your sister was indifferent
-to him; and as I could easily perceive that his attachment to her was
-unabated, I felt no doubt of their happiness together.”
-
-Elizabeth could not help smiling at his easy manner of directing his
-friend.
-
-“Did you speak from your own observation,” said she, “when you told him
-that my sister loved him, or merely from my information last spring?”
-
-“From the former. I had narrowly observed her, during the two visits
-which I had lately made her here; and I was convinced of her affection.”
-
-“And your assurance of it, I suppose, carried immediate conviction to
-him.”
-
-“It did. Bingley is most unaffectedly modest. His diffidence had
-prevented his depending on his own judgment in so anxious a case, but
-his reliance on mine made everything easy. I was obliged to confess one
-thing, which for a time, and not unjustly, offended him. I could not
-allow myself to conceal that your sister had been in town three months
-last winter, that I had known it, and purposely kept it from him. He was
-angry. But his anger, I am persuaded, lasted no longer than he remained
-in any doubt of your sister’s sentiments. He has heartily forgiven me
-now.”
-
-Elizabeth longed to observe that Mr. Bingley had been a most delightful
-friend; so easily guided that his worth was invaluable; but she checked
-herself. She remembered that he had yet to learn to be laughed at, and
-it was rather too early to begin. In anticipating the happiness of
-Bingley, which of course was to be inferior only to his own, he
-continued the conversation till they reached the house. In the hall they
-parted.
-
-
-
-
-[Illustration:
-
-     “Unable to utter a syllable”
-
-[_Copyright 1894 by George Allen._]]
-
-
-
-
-CHAPTER LIX.
-
-
-[Illustration]
-
-“My dear Lizzy, where can you have been walking to?” was a question
-which Elizabeth received from Jane as soon as she entered the room, and
-from all the others when they sat down to table. She had only to say in
-reply, that they had wandered about till she was beyond her own
-knowledge. She coloured as she spoke; but neither that, nor anything
-else, awakened a suspicion of the truth.
-
-The evening passed quietly, unmarked by anything extraordinary. The
-acknowledged lovers talked and laughed; the unacknowledged were silent.
-Darcy was not of a disposition in which happiness overflows in mirth;
-and Elizabeth, agitated and confused, rather _knew_ that she was happy
-than _felt_ herself to be so; for, besides the immediate embarrassment,
-there were other evils before her. She anticipated what would be felt in
-the family when her situation became known: she was aware that no one
-liked him but Jane; and even feared that with the others it was a
-_dislike_ which not all his fortune and consequence might do away.
-
-At night she opened her heart to Jane. Though suspicion was very far
-from Miss Bennet’s general habits, she was absolutely incredulous here.
-
-“You are joking, Lizzy. This cannot be! Engaged to Mr. Darcy! No, no,
-you shall not deceive me: I know it to be impossible.”
-
-“This is a wretched beginning, indeed! My sole dependence was on you;
-and I am sure nobody else will believe me, if you do not. Yet, indeed, I
-am in earnest. I speak nothing but the truth. He still loves me, and we
-are engaged.”
-
-Jane looked at her doubtingly. “Oh, Lizzy! it cannot be. I know how much
-you dislike him.”
-
-“You know nothing of the matter. _That_ is all to be forgot. Perhaps I
-did not always love him so well as I do now; but in such cases as these
-a good memory is unpardonable. This is the last time I shall ever
-remember it myself.”
-
-Miss Bennet still looked all amazement. Elizabeth again, and more
-seriously, assured her of its truth.
-
-“Good heaven! can it be really so? Yet now I must believe you,” cried
-Jane. “My dear, dear Lizzy, I would, I do congratulate you; but are you
-certain--forgive the question--are you quite certain that you can be
-happy with him?”
-
-“There can be no doubt of that. It is settled between us already that we
-are to be the happiest couple in the world. But are you pleased, Jane?
-Shall you like to have such a brother?”
-
-“Very, very much. Nothing could give either Bingley or myself more
-delight. But we considered it, we talked of it as impossible. And do you
-really love him quite well enough? Oh, Lizzy! do anything rather than
-marry without affection. Are you quite sure that you feel what you ought
-to do?”
-
-“Oh, yes! You will only think I feel _more_ than I ought to do when I
-tell you all.”
-
-“What do you mean?”
-
-“Why, I must confess that I love him better than I do Bingley. I am
-afraid you will be angry.”
-
-“My dearest sister, now be, _be_ serious. I want to talk very seriously.
-Let me know everything that I am to know without delay. Will you tell me
-how long you have loved him?”
-
-“It has been coming on so gradually, that I hardly know when it began;
-but I believe I must date it from my first seeing his beautiful grounds
-at Pemberley.”
-
-Another entreaty that she would be serious, however, produced the
-desired effect; and she soon satisfied Jane by her solemn assurances of
-attachment. When convinced on that article, Miss Bennet had nothing
-further to wish.
-
-“Now I am quite happy,” said she, “for you will be as happy as myself. I
-always had a value for him. Were it for nothing but his love of you, I
-must always have esteemed him; but now, as Bingley’s friend and your
-husband, there can be only Bingley and yourself more dear to me. But,
-Lizzy, you have been very sly, very reserved with me. How little did you
-tell me of what passed at Pemberley and Lambton! I owe all that I know
-of it to another, not to you.”
-
-Elizabeth told her the motives of her secrecy. She had been unwilling to
-mention Bingley; and the unsettled state of her own feelings had made
-her equally avoid the name of his friend: but now she would no longer
-conceal from her his share in Lydia’s marriage. All was acknowledged,
-and half the night spent in conversation.
-
-“Good gracious!” cried Mrs. Bennet, as she stood at a window the next
-morning, “if that disagreeable Mr. Darcy is not coming here again with
-our dear Bingley! What can he mean by being so tiresome as to be always
-coming here? I had no notion but he would go a-shooting, or something or
-other, and not disturb us with his company. What shall we do with him?
-Lizzy, you must walk out with him again, that he may not be in Bingley’s
-way.”
-
-Elizabeth could hardly help laughing at so convenient a proposal; yet
-was really vexed that her mother should be always giving him such an
-epithet.
-
-As soon as they entered, Bingley looked at her so expressively, and
-shook hands with such warmth, as left no doubt of his good information;
-and he soon afterwards said aloud, “Mrs. Bennet, have you no more lanes
-hereabouts in which Lizzy may lose her way again to-day?”
-
-“I advise Mr. Darcy, and Lizzy, and Kitty,” said Mrs. Bennet, “to walk
-to Oakham Mount this morning. It is a nice long walk, and Mr. Darcy has
-never seen the view.”
-
-“It may do very well for the others,” replied Mr. Bingley; “but I am
-sure it will be too much for Kitty. Won’t it, Kitty?”
-
-Kitty owned that she had rather stay at home. Darcy professed a great
-curiosity to see the view from the Mount, and Elizabeth silently
-consented. As she went upstairs to get ready, Mrs. Bennet followed her,
-saying,--
-
-“I am quite sorry, Lizzy, that you should be forced to have that
-disagreeable man all to yourself; but I hope you will not mind it. It is
-all for Jane’s sake, you know; and there is no occasion for talking to
-him except just now and then; so do not put yourself to inconvenience.”
-
-During their walk, it was resolved that Mr. Bennet’s consent should be
-asked in the course of the evening: Elizabeth reserved to herself the
-application for her mother’s. She could not determine how her mother
-would take it; sometimes doubting whether all his wealth and grandeur
-would be enough to overcome her abhorrence of the man; but whether she
-were violently set against the match, or violently delighted with it, it
-was certain that her manner would be equally ill adapted to do credit to
-her sense; and she could no more bear that Mr. Darcy should hear the
-first raptures of her joy, than the first vehemence of her
-disapprobation.
-
-In the evening, soon after Mr. Bennet withdrew to the library, she saw
-Mr. Darcy rise also and follow him, and her agitation on seeing it was
-extreme. She did not fear her father’s opposition, but he was going to
-be made unhappy, and that it should be through her means; that _she_,
-his favourite child, should be distressing him by her choice, should be
-filling him with fears and regrets in disposing of her, was a wretched
-reflection, and she sat in misery till Mr. Darcy appeared again, when,
-looking at him, she was a little relieved by his smile. In a few minutes
-he approached the table where she was sitting with Kitty; and, while
-pretending to admire her work, said in a whisper, “Go to your father; he
-wants you in the library.” She was gone directly.
-
-Her father was walking about the room, looking grave and anxious.
-“Lizzy,” said he, “what are you doing? Are you out of your senses to be
-accepting this man? Have not you always hated him?”
-
-How earnestly did she then wish that her former opinions had been more
-reasonable, her expressions more moderate! It would have spared her from
-explanations and professions which it was exceedingly awkward to give;
-but they were now necessary, and she assured him, with some confusion,
-of her attachment to Mr. Darcy.
-
-“Or, in other words, you are determined to have him. He is rich, to be
-sure, and you may have more fine clothes and fine carriages than Jane.
-But will they make you happy?”
-
-“Have you any other objection,” said Elizabeth, “than your belief of my
-indifference?”
-
-“None at all. We all know him to be a proud, unpleasant sort of man; but
-this would be nothing if you really liked him.”
-
-“I do, I do like him,” she replied, with tears in her eyes; “I love him.
-Indeed he has no improper pride. He is perfectly amiable. You do not
-know what he really is; then pray do not pain me by speaking of him in
-such terms.”
-
-“Lizzy,” said her father, “I have given him my consent. He is the kind
-of man, indeed, to whom I should never dare refuse anything, which he
-condescended to ask. I now give it to _you_, if you are resolved on
-having him. But let me advise you to think better of it. I know your
-disposition, Lizzy. I know that you could be neither happy nor
-respectable, unless you truly esteemed your husband, unless you looked
-up to him as a superior. Your lively talents would place you in the
-greatest danger in an unequal marriage. You could scarcely escape
-discredit and misery. My child, let me not have the grief of seeing
-_you_ unable to respect your partner in life. You know not what you are
-about.”
-
-Elizabeth, still more affected, was earnest and solemn in her reply;
-and, at length, by repeated assurances that Mr. Darcy was really the
-object of her choice, by explaining the gradual change which her
-estimation of him had undergone, relating her absolute certainty that
-his affection was not the work of a day, but had stood the test of many
-months’ suspense, and enumerating with energy all his good qualities,
-she did conquer her father’s incredulity, and reconcile him to the
-match.
-
-“Well, my dear,” said he, when she ceased speaking, “I have no more to
-say. If this be the case, he deserves you. I could not have parted with
-you, my Lizzy, to anyone less worthy.”
-
-To complete the favourable impression, she then told him what Mr. Darcy
-had voluntarily done for Lydia. He heard her with astonishment.
-
-“This is an evening of wonders, indeed! And so, Darcy did everything;
-made up the match, gave the money, paid the fellow’s debts, and got him
-his commission! So much the better. It will save me a world of trouble
-and economy. Had it been your uncle’s doing, I must and _would_ have
-paid him; but these violent young lovers carry everything their own
-way. I shall offer to pay him to-morrow, he will rant and storm about
-his love for you, and there will be an end of the matter.”
-
-He then recollected her embarrassment a few days before on his reading
-Mr. Collins’s letter; and after laughing at her some time, allowed her
-at last to go, saying, as she quitted the room, “If any young men come
-for Mary or Kitty, send them in, for I am quite at leisure.”
-
-Elizabeth’s mind was now relieved from a very heavy weight; and, after
-half an hour’s quiet reflection in her own room, she was able to join
-the others with tolerable composure. Everything was too recent for
-gaiety, but the evening passed tranquilly away; there was no longer
-anything material to be dreaded, and the comfort of ease and familiarity
-would come in time.
-
-When her mother went up to her dressing-room at night, she followed her,
-and made the important communication. Its effect was most extraordinary;
-for, on first hearing it, Mrs. Bennet sat quite still, and unable to
-utter a syllable. Nor was it under many, many minutes, that she could
-comprehend what she heard, though not in general backward to credit what
-was for the advantage of her family, or that came in the shape of a
-lover to any of them. She began at length to recover, to fidget about in
-her chair, get up, sit down again, wonder, and bless herself.
-
-“Good gracious! Lord bless me! only think! dear me! Mr. Darcy! Who would
-have thought it? And is it really true? Oh, my sweetest Lizzy! how rich
-and how great you will be! What pin-money, what jewels, what carriages
-you will have! Jane’s is nothing to it--nothing at all. I am so
-pleased--so happy. Such a charming man! so handsome! so tall! Oh, my
-dear Lizzy! pray apologize for my having disliked him so much before. I
-hope he will overlook it. Dear, dear Lizzy. A house in town! Everything
-that is charming! Three daughters married! Ten thousand a year! Oh,
-Lord! what will become of me? I shall go distracted.”
-
-This was enough to prove that her approbation need not be doubted; and
-Elizabeth, rejoicing that such an effusion was heard only by herself,
-soon went away. But before she had been three minutes in her own room,
-her mother followed her.
-
-“My dearest child,” she cried, “I can think of nothing else. Ten
-thousand a year, and very likely more! ’Tis as good as a lord! And a
-special licence--you must and shall be married by a special licence.
-But, my dearest love, tell me what dish Mr. Darcy is particularly fond
-of, that I may have it to-morrow.”
-
-This was a sad omen of what her mother’s behaviour to the gentleman
-himself might be; and Elizabeth found that, though in the certain
-possession of his warmest affection, and secure of her relations’
-consent, there was still something to be wished for. But the morrow
-passed off much better than she expected; for Mrs. Bennet luckily stood
-in such awe of her intended son-in-law, that she ventured not to speak
-to him, unless it was in her power to offer him any attention, or mark
-her deference for his opinion.
-
-Elizabeth had the satisfaction of seeing her father taking pains to get
-acquainted with him; and Mr. Bennet soon assured her that he was rising
-every hour in his esteem.
-
-“I admire all my three sons-in-law highly,” said he. “Wickham, perhaps,
-is my favourite; but I think I shall like _your_ husband quite as well
-as Jane’s.”
-
-
-
-
-[Illustration:
-
-“The obsequious civility.”
-
-[_Copyright 1894 by George Allen._]]
-
-
-
-
-CHAPTER LX.
-
-
-[Illustration]
-
-Elizabeth’s spirits soon rising to playfulness again, she wanted Mr.
-Darcy to account for his having ever fallen in love with her. “How could
-you begin?” said she. “I can comprehend your going on charmingly, when
-you had once made a beginning; but what could set you off in the first
-place?”
-
-“I cannot fix on the hour, or the spot, or the look, or the words, which
-laid the foundation. It is too long ago. I was in the middle before I
-knew that I _had_ begun.”
-
-“My beauty you had early withstood, and as for my manners--my behaviour
-to _you_ was at least always bordering on the uncivil, and I never spoke
-to you without rather wishing to give you pain than not. Now, be
-sincere; did you admire me for my impertinence?”
-
-“For the liveliness of your mind I did.”
-
-“You may as well call it impertinence at once. It was very little less.
-The fact is, that you were sick of civility, of deference, of officious
-attention. You were disgusted with the women who were always speaking,
-and looking, and thinking for _your_ approbation alone. I roused and
-interested you, because I was so unlike _them_. Had you not been really
-amiable you would have hated me for it: but in spite of the pains you
-took to disguise yourself, your feelings were always noble and just; and
-in your heart you thoroughly despised the persons who so assiduously
-courted you. There--I have saved you the trouble of accounting for it;
-and really, all things considered, I begin to think it perfectly
-reasonable. To be sure you know no actual good of me--but nobody thinks
-of _that_ when they fall in love.”
-
-“Was there no good in your affectionate behaviour to Jane, while she was
-ill at Netherfield?”
-
-“Dearest Jane! who could have done less for her? But make a virtue of it
-by all means. My good qualities are under your protection, and you are
-to exaggerate them as much as possible; and, in return, it belongs to me
-to find occasions for teasing and quarrelling with you as often as may
-be; and I shall begin directly, by asking you what made you so unwilling
-to come to the point at last? What made you so shy of me, when you
-first called, and afterwards dined here? Why, especially, when you
-called, did you look as if you did not care about me?”
-
-“Because you were grave and silent, and gave me no encouragement.”
-
-“But I was embarrassed.”
-
-“And so was I.”
-
-“You might have talked to me more when you came to dinner.”
-
-“A man who had felt less might.”
-
-“How unlucky that you should have a reasonable answer to give, and that
-I should be so reasonable as to admit it! But I wonder how long you
-_would_ have gone on, if you had been left to yourself. I wonder when
-you _would_ have spoken if I had not asked you! My resolution of
-thanking you for your kindness to Lydia had certainly great effect. _Too
-much_, I am afraid; for what becomes of the moral, if our comfort
-springs from a breach of promise, for I ought not to have mentioned the
-subject? This will never do.”
-
-“You need not distress yourself. The moral will be perfectly fair. Lady
-Catherine’s unjustifiable endeavours to separate us were the means of
-removing all my doubts. I am not indebted for my present happiness to
-your eager desire of expressing your gratitude. I was not in a humour to
-wait for an opening of yours. My aunt’s intelligence had given me hope,
-and I was determined at once to know everything.”
-
-“Lady Catherine has been of infinite use, which ought to make her happy,
-for she loves to be of use. But tell me, what did you come down to
-Netherfield for? Was it merely to ride to Longbourn and be embarrassed?
-or had you intended any more serious consequences?”
-
-“My real purpose was to see _you_, and to judge, if I could, whether I
-might ever hope to make you love me. My avowed one, or what I avowed to
-myself, was to see whether your sister was still partial to Bingley, and
-if she were, to make the confession to him which I have since made.”
-
-“Shall you ever have courage to announce to Lady Catherine what is to
-befall her?”
-
-“I am more likely to want time than courage, Elizabeth. But it ought to
-be done; and if you will give me a sheet of paper it shall be done
-directly.”
-
-“And if I had not a letter to write myself, I might sit by you, and
-admire the evenness of your writing, as another young lady once did. But
-I have an aunt, too, who must not be longer neglected.”
-
-From an unwillingness to confess how much her intimacy with Mr. Darcy
-had been overrated, Elizabeth had never yet answered Mrs. Gardiner’s
-long letter; but now, having _that_ to communicate which she knew would
-be most welcome, she was almost ashamed to find that her uncle and aunt
-had already lost three days of happiness, and immediately wrote as
-follows:--
-
-“I would have thanked you before, my dear aunt, as I ought to have done,
-for your long, kind, satisfactory detail of particulars; but, to say the
-truth, I was too cross to write. You supposed more than really existed.
-But _now_ suppose as much as you choose; give a loose to your fancy,
-indulge your imagination in every possible flight which the subject will
-afford, and unless you believe me actually married, you cannot greatly
-err. You must write again very soon, and praise him a great deal more
-than you did in your last. I thank you again and again, for not going to
-the Lakes. How could I be so silly as to wish it! Your idea of the
-ponies is delightful. We will go round the park every day. I am the
-happiest creature in the world. Perhaps other people have said so
-before, but no one with such justice. I am happier even than Jane; she
-only smiles, I laugh. Mr. Darcy sends you all the love in the world that
-can be spared from me. You are all to come to Pemberley at Christmas.
-Yours,” etc.
-
-Mr. Darcy’s letter to Lady Catherine was in a different style, and still
-different from either was what Mr. Bennet sent to Mr. Collins, in return
-for his last.
-
-     /* “Dear Sir, */
-
-     “I must trouble you once more for congratulations. Elizabeth will
-     soon be the wife of Mr. Darcy. Console Lady Catherine as well as
-     you can. But, if I were you, I would stand by the nephew. He has
-     more to give.
-
-“Yours sincerely,” etc.
-
-Miss Bingley’s congratulations to her brother on his approaching
-marriage were all that was affectionate and insincere. She wrote even to
-Jane on the occasion, to express her delight, and repeat all her former
-professions of regard. Jane was not deceived, but she was affected; and
-though feeling no reliance on her, could not help writing her a much
-kinder answer than she knew was deserved.
-
-The joy which Miss Darcy expressed on receiving similar information was
-as sincere as her brother’s in sending it. Four sides of paper were
-insufficient to contain all her delight, and all her earnest desire of
-being loved by her sister.
-
-Before any answer could arrive from Mr. Collins, or any congratulations
-to Elizabeth from his wife, the Longbourn family heard that the
-Collinses were come themselves to Lucas Lodge. The reason of this
-sudden removal was soon evident. Lady Catherine had been rendered so
-exceedingly angry by the contents of her nephew’s letter, that
-Charlotte, really rejoicing in the match, was anxious to get away till
-the storm was blown over. At such a moment, the arrival of her friend
-was a sincere pleasure to Elizabeth, though in the course of their
-meetings she must sometimes think the pleasure dearly bought, when she
-saw Mr. Darcy exposed to all the parading and obsequious civility of her
-husband. He bore it, however, with admirable calmness. He could even
-listen to Sir William Lucas, when he complimented him on carrying away
-the brightest jewel of the country, and expressed his hopes of their all
-meeting frequently at St. James’s, with very decent composure. If he did
-shrug his shoulders, it was not till Sir William was out of sight.
-
-Mrs. Philips’s vulgarity was another, and, perhaps, a greater tax on his
-forbearance; and though Mrs. Philips, as well as her sister, stood in
-too much awe of him to speak with the familiarity which Bingley’s
-good-humour encouraged; yet, whenever she _did_ speak, she must be
-vulgar. Nor was her respect for him, though it made her more quiet, at
-all likely to make her more elegant. Elizabeth did all she could to
-shield him from the frequent notice of either, and was ever anxious to
-keep him to herself, and to those of her family with whom he might
-converse without mortification; and though the uncomfortable feelings
-arising from all this took from the season of courtship much of its
-pleasure, it added to the hope of the future; and she looked forward
-with delight to the time when they should be removed from society so
-little pleasing to either, to all the comfort and elegance of their
-family party at Pemberley.
-
-
-
-
-[Illustration]
-
-
-
-
-CHAPTER LXI.
-
-
-[Illustration]
-
-Happy for all her maternal feelings was the day on which Mrs. Bennet got
-rid of her two most deserving daughters. With what delighted pride she
-afterwards visited Mrs. Bingley, and talked of Mrs. Darcy, may be
-guessed. I wish I could say, for the sake of her family, that the
-accomplishment of her earnest desire in the establishment of so many of
-her children produced so happy an effect as to make her a sensible,
-amiable, well-informed woman for the rest of her life; though, perhaps,
-it was lucky for her husband, who might not have relished domestic
-felicity in so unusual a form, that she still was occasionally nervous
-and invariably silly.
-
-Mr. Bennet missed his second daughter exceedingly; his affection for her
-drew him oftener from home than anything else could do. He delighted in
-going to Pemberley, especially when he was least expected.
-
-Mr. Bingley and Jane remained at Netherfield only a twelvemonth. So near
-a vicinity to her mother and Meryton relations was not desirable even to
-_his_ easy temper, or _her_ affectionate heart. The darling wish of his
-sisters was then gratified: he bought an estate in a neighbouring county
-to Derbyshire; and Jane and Elizabeth, in addition to every other source
-of happiness, were within thirty miles of each other.
-
-Kitty, to her very material advantage, spent the chief of her time with
-her two elder sisters. In society so superior to what she had generally
-known, her improvement was great. She was not of so ungovernable a
-temper as Lydia; and, removed from the influence of Lydia’s example, she
-became, by proper attention and management, less irritable, less
-ignorant, and less insipid. From the further disadvantage of Lydia’s
-society she was of course carefully kept; and though Mrs. Wickham
-frequently invited her to come and stay with her, with the promise of
-balls and young men, her father would never consent to her going.
-
-Mary was the only daughter who remained at home; and she was necessarily
-drawn from the pursuit of accomplishments by Mrs. Bennet’s being quite
-unable to sit alone. Mary was obliged to mix more with the world, but
-she could still moralize over every morning visit; and as she was no
-longer mortified by comparisons between her sisters’ beauty and her own,
-it was suspected by her father that she submitted to the change without
-much reluctance.
-
-As for Wickham and Lydia, their characters suffered no revolution from
-the marriage of her sisters. He bore with philosophy the conviction that
-Elizabeth must now become acquainted with whatever of his ingratitude
-and falsehood had before been unknown to her; and, in spite of
-everything, was not wholly without hope that Darcy might yet be
-prevailed on to make his fortune. The congratulatory letter which
-Elizabeth received from Lydia on her marriage explained to her that, by
-his wife at least, if not by himself, such a hope was cherished. The
-letter was to this effect:--
-
-     /* “My dear Lizzy, */
-
-     “I wish you joy. If you love Mr. Darcy half so well as I do my dear
-     Wickham, you must be very happy. It is a great comfort to have you
-     so rich; and when you have nothing else to do, I hope you will
-     think of us. I am sure Wickham would like a place at court very
-     much; and I do not think we shall have quite money enough to live
-     upon without some help. Any place would do of about three or four
-     hundred a year; but, however, do not speak to Mr. Darcy about it,
-     if you had rather not.
-
-“Yours,” etc.
-
-As it happened that Elizabeth had much rather not, she endeavoured in
-her answer to put an end to every entreaty and expectation of the kind.
-Such relief, however, as it was in her power to afford, by the practice
-of what might be called economy in her own private expenses, she
-frequently sent them. It had always been evident to her that such an
-income as theirs, under the direction of two persons so extravagant in
-their wants, and heedless of the future, must be very insufficient to
-their support; and whenever they changed their quarters, either Jane or
-herself were sure of being applied to for some little assistance towards
-discharging their bills. Their manner of living, even when the
-restoration of peace dismissed them to a home, was unsettled in the
-extreme. They were always moving from place to place in quest of a
-cheap situation, and always spending more than they ought. His affection
-for her soon sunk into indifference: hers lasted a little longer; and,
-in spite of her youth and her manners, she retained all the claims to
-reputation which her marriage had given her. Though Darcy could never
-receive _him_ at Pemberley, yet, for Elizabeth’s sake, he assisted him
-further in his profession. Lydia was occasionally a visitor there, when
-her husband was gone to enjoy himself in London or Bath; and with the
-Bingleys they both of them frequently stayed so long, that even
-Bingley’s good-humour was overcome, and he proceeded so far as to _talk_
-of giving them a hint to be gone.
-
-Miss Bingley was very deeply mortified by Darcy’s marriage; but as she
-thought it advisable to retain the right of visiting at Pemberley, she
-dropped all her resentment; was fonder than ever of Georgiana, almost as
-attentive to Darcy as heretofore, and paid off every arrear of civility
-to Elizabeth.
-
-Pemberley was now Georgiana’s home; and the attachment of the sisters
-was exactly what Darcy had hoped to see. They were able to love each
-other, even as well as they intended. Georgiana had the highest opinion
-in the world of Elizabeth; though at first she often listened with an
-astonishment bordering on alarm at her lively, sportive manner of
-talking to her brother. He, who had always inspired in herself a respect
-which almost overcame her affection, she now saw the object of open
-pleasantry. Her mind received knowledge which had never before fallen in
-her way. By Elizabeth’s instructions she began to comprehend that a
-woman may take liberties with her husband, which a brother will not
-always allow in a sister more than ten years younger than himself.
-
-Lady Catherine was extremely indignant on the marriage of her nephew;
-and as she gave way to all the genuine frankness of her character, in
-her reply to the letter which announced its arrangement, she sent him
-language so very abusive, especially of Elizabeth, that for some time
-all intercourse was at an end. But at length, by Elizabeth’s persuasion,
-he was prevailed on to overlook the offence, and seek a reconciliation;
-and, after a little further resistance on the part of his aunt, her
-resentment gave way, either to her affection for him, or her curiosity
-to see how his wife conducted herself; and she condescended to wait on
-them at Pemberley, in spite of that pollution which its woods had
-received, not merely from the presence of such a mistress, but the
-visits of her uncle and aunt from the city.
-
-With the Gardiners they were always on the most intimate terms. Darcy,
-as well as Elizabeth, really loved them; and they were both ever
-sensible of the warmest gratitude towards the persons who, by bringing
-her into Derbyshire, had been the means of uniting them.
-
-                            [Illustration:
-
-                                  THE
-                                  END
-                                   ]
-
-
-
-
-             CHISWICK PRESS:--CHARLES WHITTINGHAM AND CO.
-                  TOOKS COURT, CHANCERY LANE, LONDON.
-
-
-
-
-*** END OF THE PROJECT GUTENBERG EBOOK PRIDE AND PREJUDICE ***
-
-
-    
-
-Updated editions will replace the previous one—the old editions will
-be renamed.
-
-Creating the works from print editions not protected by U.S. copyright
-law means that no one owns a United States copyright in these works,
-so the Foundation (and you!) can copy and distribute it in the United
-States without permission and without paying copyright
-royalties. Special rules, set forth in the General Terms of Use part
-of this license, apply to copying and distributing Project
-Gutenberg™ electronic works to protect the PROJECT GUTENBERG™
-concept and trademark. Project Gutenberg is a registered trademark,
-and may not be used if you charge for an eBook, except by following
-the terms of the trademark license, including paying royalties for use
-of the Project Gutenberg trademark. If you do not charge anything for
-copies of this eBook, complying with the trademark license is very
-easy. You may use this eBook for nearly any purpose such as creation
-of derivative works, reports, performances and research. Project
-Gutenberg eBooks may be modified and printed and given away—you may
-do practically ANYTHING in the United States with eBooks not protected
-by U.S. copyright law. Redistribution is subject to the trademark
-license, especially commercial redistribution.
-
-
-START: FULL LICENSE
-
-THE FULL PROJECT GUTENBERG LICENSE
-
-PLEASE READ THIS BEFORE YOU DISTRIBUTE OR USE THIS WORK
-
-To protect the Project Gutenberg™ mission of promoting the free
-distribution of electronic works, by using or distributing this work
-(or any other work associated in any way with the phrase “Project
-Gutenberg”), you agree to comply with all the terms of the Full
-Project Gutenberg™ License available with this file or online at
-www.gutenberg.org/license.
-
-Section 1. General Terms of Use and Redistributing Project Gutenberg™
-electronic works
-
-1.A. By reading or using any part of this Project Gutenberg™
-electronic work, you indicate that you have read, understand, agree to
-and accept all the terms of this license and intellectual property
-(trademark/copyright) agreement. If you do not agree to abide by all
-the terms of this agreement, you must cease using and return or
-destroy all copies of Project Gutenberg™ electronic works in your
-possession. If you paid a fee for obtaining a copy of or access to a
-Project Gutenberg™ electronic work and you do not agree to be bound
-by the terms of this agreement, you may obtain a refund from the person
-or entity to whom you paid the fee as set forth in paragraph 1.E.8.
-
-1.B. “Project Gutenberg” is a registered trademark. It may only be
-used on or associated in any way with an electronic work by people who
-agree to be bound by the terms of this agreement. There are a few
-things that you can do with most Project Gutenberg™ electronic works
-even without complying with the full terms of this agreement. See
-paragraph 1.C below. There are a lot of things you can do with Project
-Gutenberg™ electronic works if you follow the terms of this
-agreement and help preserve free future access to Project Gutenberg™
-electronic works. See paragraph 1.E below.
-
-1.C. The Project Gutenberg Literary Archive Foundation (“the
-Foundation” or PGLAF), owns a compilation copyright in the collection
-of Project Gutenberg™ electronic works. Nearly all the individual
-works in the collection are in the public domain in the United
-States. If an individual work is unprotected by copyright law in the
-United States and you are located in the United States, we do not
-claim a right to prevent you from copying, distributing, performing,
-displaying or creating derivative works based on the work as long as
-all references to Project Gutenberg are removed. Of course, we hope
-that you will support the Project Gutenberg™ mission of promoting
-free access to electronic works by freely sharing Project Gutenberg™
-works in compliance with the terms of this agreement for keeping the
-Project Gutenberg™ name associated with the work. You can easily
-comply with the terms of this agreement by keeping this work in the
-same format with its attached full Project Gutenberg™ License when
-you share it without charge with others.
-
-1.D. The copyright laws of the place where you are located also govern
-what you can do with this work. Copyright laws in most countries are
-in a constant state of change. If you are outside the United States,
-check the laws of your country in addition to the terms of this
-agreement before downloading, copying, displaying, performing,
-distributing or creating derivative works based on this work or any
-other Project Gutenberg™ work. The Foundation makes no
-representations concerning the copyright status of any work in any
-country other than the United States.
-
-1.E. Unless you have removed all references to Project Gutenberg:
-
-1.E.1. The following sentence, with active links to, or other
-immediate access to, the full Project Gutenberg™ License must appear
-prominently whenever any copy of a Project Gutenberg™ work (any work
-on which the phrase “Project Gutenberg” appears, or with which the
-phrase “Project Gutenberg” is associated) is accessed, displayed,
-performed, viewed, copied or distributed:
-
-    This eBook is for the use of anyone anywhere in the United States and most
-    other parts of the world at no cost and with almost no restrictions
-    whatsoever. You may copy it, give it away or re-use it under the terms
-    of the Project Gutenberg License included with this eBook or online
-    at www.gutenberg.org. If you
-    are not located in the United States, you will have to check the laws
-    of the country where you are located before using this eBook.
-  
-1.E.2. If an individual Project Gutenberg™ electronic work is
-derived from texts not protected by U.S. copyright law (does not
-contain a notice indicating that it is posted with permission of the
-copyright holder), the work can be copied and distributed to anyone in
-the United States without paying any fees or charges. If you are
-redistributing or providing access to a work with the phrase “Project
-Gutenberg” associated with or appearing on the work, you must comply
-either with the requirements of paragraphs 1.E.1 through 1.E.7 or
-obtain permission for the use of the work and the Project Gutenberg™
-trademark as set forth in paragraphs 1.E.8 or 1.E.9.
-
-1.E.3. If an individual Project Gutenberg™ electronic work is posted
-with the permission of the copyright holder, your use and distribution
-must comply with both paragraphs 1.E.1 through 1.E.7 and any
-additional terms imposed by the copyright holder. Additional terms
-will be linked to the Project Gutenberg™ License for all works
-posted with the permission of the copyright holder found at the
-beginning of this work.
-
-1.E.4. Do not unlink or detach or remove the full Project Gutenberg™
-License terms from this work, or any files containing a part of this
-work or any other work associated with Project Gutenberg™.
-
-1.E.5. Do not copy, display, perform, distribute or redistribute this
-electronic work, or any part of this electronic work, without
-prominently displaying the sentence set forth in paragraph 1.E.1 with
-active links or immediate access to the full terms of the Project
-Gutenberg™ License.
-
-1.E.6. You may convert to and distribute this work in any binary,
-compressed, marked up, nonproprietary or proprietary form, including
-any word processing or hypertext form. However, if you provide access
-to or distribute copies of a Project Gutenberg™ work in a format
-other than “Plain Vanilla ASCII” or other format used in the official
-version posted on the official Project Gutenberg™ website
-(www.gutenberg.org), you must, at no additional cost, fee or expense
-to the user, provide a copy, a means of exporting a copy, or a means
-of obtaining a copy upon request, of the work in its original “Plain
-Vanilla ASCII” or other form. Any alternate format must include the
-full Project Gutenberg™ License as specified in paragraph 1.E.1.
-
-1.E.7. Do not charge a fee for access to, viewing, displaying,
-performing, copying or distributing any Project Gutenberg™ works
-unless you comply with paragraph 1.E.8 or 1.E.9.
-
-1.E.8. You may charge a reasonable fee for copies of or providing
-access to or distributing Project Gutenberg™ electronic works
-provided that:
-
-    • You pay a royalty fee of 20% of the gross profits you derive from
-        the use of Project Gutenberg™ works calculated using the method
-        you already use to calculate your applicable taxes. The fee is owed
-        to the owner of the Project Gutenberg™ trademark, but he has
-        agreed to donate royalties under this paragraph to the Project
-        Gutenberg Literary Archive Foundation. Royalty payments must be paid
-        within 60 days following each date on which you prepare (or are
-        legally required to prepare) your periodic tax returns. Royalty
-        payments should be clearly marked as such and sent to the Project
-        Gutenberg Literary Archive Foundation at the address specified in
-        Section 4, “Information about donations to the Project Gutenberg
-        Literary Archive Foundation.”
-    
-    • You provide a full refund of any money paid by a user who notifies
-        you in writing (or by e-mail) within 30 days of receipt that s/he
-        does not agree to the terms of the full Project Gutenberg™
-        License. You must require such a user to return or destroy all
-        copies of the works possessed in a physical medium and discontinue
-        all use of and all access to other copies of Project Gutenberg™
-        works.
-    
-    • You provide, in accordance with paragraph 1.F.3, a full refund of
-        any money paid for a work or a replacement copy, if a defect in the
-        electronic work is discovered and reported to you within 90 days of
-        receipt of the work.
-    
-    • You comply with all other terms of this agreement for free
-        distribution of Project Gutenberg™ works.
-    
-
-1.E.9. If you wish to charge a fee or distribute a Project
-Gutenberg™ electronic work or group of works on different terms than
-are set forth in this agreement, you must obtain permission in writing
-from the Project Gutenberg Literary Archive Foundation, the manager of
-the Project Gutenberg™ trademark. Contact the Foundation as set
-forth in Section 3 below.
-
-1.F.
-
-1.F.1. Project Gutenberg volunteers and employees expend considerable
-effort to identify, do copyright research on, transcribe and proofread
-works not protected by U.S. copyright law in creating the Project
-Gutenberg™ collection. Despite these efforts, Project Gutenberg™
-electronic works, and the medium on which they may be stored, may
-contain “Defects,” such as, but not limited to, incomplete, inaccurate
-or corrupt data, transcription errors, a copyright or other
-intellectual property infringement, a defective or damaged disk or
-other medium, a computer virus, or computer codes that damage or
-cannot be read by your equipment.
-
-1.F.2. LIMITED WARRANTY, DISCLAIMER OF DAMAGES - Except for the “Right
-of Replacement or Refund” described in paragraph 1.F.3, the Project
-Gutenberg Literary Archive Foundation, the owner of the Project
-Gutenberg™ trademark, and any other party distributing a Project
-Gutenberg™ electronic work under this agreement, disclaim all
-liability to you for damages, costs and expenses, including legal
-fees. YOU AGREE THAT YOU HAVE NO REMEDIES FOR NEGLIGENCE, STRICT
-LIABILITY, BREACH OF WARRANTY OR BREACH OF CONTRACT EXCEPT THOSE
-PROVIDED IN PARAGRAPH 1.F.3. YOU AGREE THAT THE FOUNDATION, THE
-TRADEMARK OWNER, AND ANY DISTRIBUTOR UNDER THIS AGREEMENT WILL NOT BE
-LIABLE TO YOU FOR ACTUAL, DIRECT, INDIRECT, CONSEQUENTIAL, PUNITIVE OR
-INCIDENTAL DAMAGES EVEN IF YOU GIVE NOTICE OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-1.F.3. LIMITED RIGHT OF REPLACEMENT OR REFUND - If you discover a
-defect in this electronic work within 90 days of receiving it, you can
-receive a refund of the money (if any) you paid for it by sending a
-written explanation to the person you received the work from. If you
-received the work on a physical medium, you must return the medium
-with your written explanation. The person or entity that provided you
-with the defective work may elect to provide a replacement copy in
-lieu of a refund. If you received the work electronically, the person
-or entity providing it to you may choose to give you a second
-opportunity to receive the work electronically in lieu of a refund. If
-the second copy is also defective, you may demand a refund in writing
-without further opportunities to fix the problem.
-
-1.F.4. Except for the limited right of replacement or refund set forth
-in paragraph 1.F.3, this work is provided to you ‘AS-IS’, WITH NO
-OTHER WARRANTIES OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
-LIMITED TO WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PURPOSE.
-
-1.F.5. Some states do not allow disclaimers of certain implied
-warranties or the exclusion or limitation of certain types of
-damages. If any disclaimer or limitation set forth in this agreement
-violates the law of the state applicable to this agreement, the
-agreement shall be interpreted to make the maximum disclaimer or
-limitation permitted by the applicable state law. The invalidity or
-unenforceability of any provision of this agreement shall not void the
-remaining provisions.
-
-1.F.6. INDEMNITY - You agree to indemnify and hold the Foundation, the
-trademark owner, any agent or employee of the Foundation, anyone
-providing copies of Project Gutenberg™ electronic works in
-accordance with this agreement, and any volunteers associated with the
-production, promotion and distribution of Project Gutenberg™
-electronic works, harmless from all liability, costs and expenses,
-including legal fees, that arise directly or indirectly from any of
-the following which you do or cause to occur: (a) distribution of this
-or any Project Gutenberg™ work, (b) alteration, modification, or
-additions or deletions to any Project Gutenberg™ work, and (c) any
-Defect you cause.
-
-Section 2. Information about the Mission of Project Gutenberg™
-
-Project Gutenberg™ is synonymous with the free distribution of
-electronic works in formats readable by the widest variety of
-computers including obsolete, old, middle-aged and new computers. It
-exists because of the efforts of hundreds of volunteers and donations
-from people in all walks of life.
-
-Volunteers and financial support to provide volunteers with the
-assistance they need are critical to reaching Project Gutenberg™’s
-goals and ensuring that the Project Gutenberg™ collection will
-remain freely available for generations to come. In 2001, the Project
-Gutenberg Literary Archive Foundation was created to provide a secure
-and permanent future for Project Gutenberg™ and future
-generations. To learn more about the Project Gutenberg Literary
-Archive Foundation and how your efforts and donations can help, see
-Sections 3 and 4 and the Foundation information page at www.gutenberg.org.
-
-Section 3. Information about the Project Gutenberg Literary Archive Foundation
-
-The Project Gutenberg Literary Archive Foundation is a non-profit
-501(c)(3) educational corporation organized under the laws of the
-state of Mississippi and granted tax exempt status by the Internal
-Revenue Service. The Foundation’s EIN or federal tax identification
-number is 64-6221541. Contributions to the Project Gutenberg Literary
-Archive Foundation are tax deductible to the full extent permitted by
-U.S. federal laws and your state’s laws.
-
-The Foundation’s business office is located at 809 North 1500 West,
-Salt Lake City, UT 84116, (801) 596-1887. Email contact links and up
-to date contact information can be found at the Foundation’s website
-and official page at www.gutenberg.org/contact
-
-Section 4. Information about Donations to the Project Gutenberg
-Literary Archive Foundation
-
-Project Gutenberg™ depends upon and cannot survive without widespread
-public support and donations to carry out its mission of
-increasing the number of public domain and licensed works that can be
-freely distributed in machine-readable form accessible by the widest
-array of equipment including outdated equipment. Many small donations
-($1 to $5,000) are particularly important to maintaining tax exempt
-status with the IRS.
-
-The Foundation is committed to complying with the laws regulating
-charities and charitable donations in all 50 states of the United
-States. Compliance requirements are not uniform and it takes a
-considerable effort, much paperwork and many fees to meet and keep up
-with these requirements. We do not solicit donations in locations
-where we have not received written confirmation of compliance. To SEND
-DONATIONS or determine the status of compliance for any particular state
-visit www.gutenberg.org/donate.
-
-While we cannot and do not solicit contributions from states where we
-have not met the solicitation requirements, we know of no prohibition
-against accepting unsolicited donations from donors in such states who
-approach us with offers to donate.
-
-International donations are gratefully accepted, but we cannot make
-any statements concerning tax treatment of donations received from
-outside the United States. U.S. laws alone swamp our small staff.
-
-Please check the Project Gutenberg web pages for current donation
-methods and addresses. Donations are accepted in a number of other
-ways including checks, online payments and credit card donations. To
-donate, please visit: www.gutenberg.org/donate.
-
-Section 5. General Information About Project Gutenberg™ electronic works
-
-Professor Michael S. Hart was the originator of the Project
-Gutenberg™ concept of a library of electronic works that could be
-freely shared with anyone. For forty years, he produced and
-distributed Project Gutenberg™ eBooks with only a loose network of
-volunteer support.
-
-Project Gutenberg™ eBooks are often created from several printed
-editions, all of which are confirmed as not protected by copyright in
-the U.S. unless a copyright notice is included. Thus, we do not
-necessarily keep eBooks in compliance with any particular paper
-edition.
-
-Most people start at our website which has the main PG search
-facility: www.gutenberg.org.
-
-This website includes information about Project Gutenberg™,
-including how to make donations to the Project Gutenberg Literary
-Archive Foundation, how to help produce our new eBooks, and how to
-subscribe to our email newsletter to hear about new eBooks.
-
diff --git a/backend/reconcile/tests/resources/room_with_a_view.txt b/backend/reconcile/tests/resources/room_with_a_view.txt
deleted file mode 100644
index 5f5ec21e..00000000
--- a/backend/reconcile/tests/resources/room_with_a_view.txt
+++ /dev/null
@@ -1,9105 +0,0 @@
-The Project Gutenberg eBook of A Room with a View
-    
-This ebook is for the use of anyone anywhere in the United States and
-most other parts of the world at no cost and with almost no restrictions
-whatsoever. You may copy it, give it away or re-use it under the terms
-of the Project Gutenberg License included with this ebook or online
-at www.gutenberg.org. If you are not located in the United States,
-you will have to check the laws of the country where you are located
-before using this eBook.
-
-Title: A Room with a View
-
-Author: E. M. Forster
-
-Release date: May 1, 2001 [eBook #2641]
-                Most recently updated: May 4, 2024
-
-Language: English
-
-
-
-*** START OF THE PROJECT GUTENBERG EBOOK A ROOM WITH A VIEW ***
-
-
-
-
-[Illustration]
-
-
-
-
-A Room With A View
-
-By E. M. Forster
-
-
-
-
-CONTENTS
-
- Part One.
- Chapter I. The Bertolini
- Chapter II. In Santa Croce with No Baedeker
- Chapter III. Music, Violets, and the Letter “S”
- Chapter IV. Fourth Chapter
- Chapter V. Possibilities of a Pleasant Outing
- Chapter VI. The Reverend Arthur Beebe, the Reverend Cuthbert Eager, Mr. Emerson, Mr. George Emerson, Miss Eleanor Lavish, Miss Charlotte Bartlett, and Miss Lucy Honeychurch Drive Out in Carriages to See a View; Italians Drive Them
- Chapter VII. They Return
-
- Part Two.
- Chapter VIII. Medieval
- Chapter IX. Lucy As a Work of Art
- Chapter X. Cecil as a Humourist
- Chapter XI. In Mrs. Vyse’s Well-Appointed Flat
- Chapter XII. Twelfth Chapter
- Chapter XIII. How Miss Bartlett’s Boiler Was So Tiresome
- Chapter XIV. How Lucy Faced the External Situation Bravely
- Chapter XV. The Disaster Within
- Chapter XVI. Lying to George
- Chapter XVII. Lying to Cecil
- Chapter XVIII. Lying to Mr. Beebe, Mrs. Honeychurch, Freddy, and The Servants
- Chapter XIX. Lying to Mr. Emerson
- Chapter XX. The End of the Middle Ages
-
-
-
-
-PART ONE
-
-
-
-
-Chapter I
-The Bertolini
-
-
-“The Signora had no business to do it,” said Miss Bartlett, “no
-business at all. She promised us south rooms with a view close
-together, instead of which here are north rooms, looking into a
-courtyard, and a long way apart. Oh, Lucy!”
-
-“And a Cockney, besides!” said Lucy, who had been further saddened by
-the Signora’s unexpected accent. “It might be London.” She looked at
-the two rows of English people who were sitting at the table; at the
-row of white bottles of water and red bottles of wine that ran between
-the English people; at the portraits of the late Queen and the late
-Poet Laureate that hung behind the English people, heavily framed; at
-the notice of the English church (Rev. Cuthbert Eager, M. A. Oxon.),
-that was the only other decoration of the wall. “Charlotte, don’t you
-feel, too, that we might be in London? I can hardly believe that all
-kinds of other things are just outside. I suppose it is one’s being so
-tired.”
-
-“This meat has surely been used for soup,” said Miss Bartlett, laying
-down her fork.
-
-“I want so to see the Arno. The rooms the Signora promised us in her
-letter would have looked over the Arno. The Signora had no business to
-do it at all. Oh, it is a shame!”
-
-“Any nook does for me,” Miss Bartlett continued; “but it does seem hard
-that you shouldn’t have a view.”
-
-Lucy felt that she had been selfish. “Charlotte, you mustn’t spoil me:
-of course, you must look over the Arno, too. I meant that. The first
-vacant room in the front—” “You must have it,” said Miss Bartlett, part
-of whose travelling expenses were paid by Lucy’s mother—a piece of
-generosity to which she made many a tactful allusion.
-
-“No, no. You must have it.”
-
-“I insist on it. Your mother would never forgive me, Lucy.”
-
-“She would never forgive _me_.”
-
-The ladies’ voices grew animated, and—if the sad truth be owned—a
-little peevish. They were tired, and under the guise of unselfishness
-they wrangled. Some of their neighbours interchanged glances, and one
-of them—one of the ill-bred people whom one does meet abroad—leant
-forward over the table and actually intruded into their argument. He
-said:
-
-“I have a view, I have a view.”
-
-Miss Bartlett was startled. Generally at a pension people looked them
-over for a day or two before speaking, and often did not find out that
-they would “do” till they had gone. She knew that the intruder was
-ill-bred, even before she glanced at him. He was an old man, of heavy
-build, with a fair, shaven face and large eyes. There was something
-childish in those eyes, though it was not the childishness of senility.
-What exactly it was Miss Bartlett did not stop to consider, for her
-glance passed on to his clothes. These did not attract her. He was
-probably trying to become acquainted with them before they got into the
-swim. So she assumed a dazed expression when he spoke to her, and then
-said: “A view? Oh, a view! How delightful a view is!”
-
-“This is my son,” said the old man; “his name’s George. He has a view
-too.”
-
-“Ah,” said Miss Bartlett, repressing Lucy, who was about to speak.
-
-“What I mean,” he continued, “is that you can have our rooms, and we’ll
-have yours. We’ll change.”
-
-The better class of tourist was shocked at this, and sympathized with
-the new-comers. Miss Bartlett, in reply, opened her mouth as little as
-possible, and said “Thank you very much indeed; that is out of the
-question.”
-
-“Why?” said the old man, with both fists on the table.
-
-“Because it is quite out of the question, thank you.”
-
-“You see, we don’t like to take—” began Lucy. Her cousin again
-repressed her.
-
-“But why?” he persisted. “Women like looking at a view; men don’t.” And
-he thumped with his fists like a naughty child, and turned to his son,
-saying, “George, persuade them!”
-
-“It’s so obvious they should have the rooms,” said the son. “There’s
-nothing else to say.”
-
-He did not look at the ladies as he spoke, but his voice was perplexed
-and sorrowful. Lucy, too, was perplexed; but she saw that they were in
-for what is known as “quite a scene,” and she had an odd feeling that
-whenever these ill-bred tourists spoke the contest widened and deepened
-till it dealt, not with rooms and views, but with—well, with something
-quite different, whose existence she had not realized before. Now the
-old man attacked Miss Bartlett almost violently: Why should she not
-change? What possible objection had she? They would clear out in half
-an hour.
-
-Miss Bartlett, though skilled in the delicacies of conversation, was
-powerless in the presence of brutality. It was impossible to snub any
-one so gross. Her face reddened with displeasure. She looked around as
-much as to say, “Are you all like this?” And two little old ladies, who
-were sitting further up the table, with shawls hanging over the backs
-of the chairs, looked back, clearly indicating “We are not; we are
-genteel.”
-
-“Eat your dinner, dear,” she said to Lucy, and began to toy again with
-the meat that she had once censured.
-
-Lucy mumbled that those seemed very odd people opposite.
-
-“Eat your dinner, dear. This pension is a failure. To-morrow we will
-make a change.”
-
-Hardly had she announced this fell decision when she reversed it. The
-curtains at the end of the room parted, and revealed a clergyman, stout
-but attractive, who hurried forward to take his place at the table,
-cheerfully apologizing for his lateness. Lucy, who had not yet acquired
-decency, at once rose to her feet, exclaiming: “Oh, oh! Why, it’s Mr.
-Beebe! Oh, how perfectly lovely! Oh, Charlotte, we must stop now,
-however bad the rooms are. Oh!”
-
-Miss Bartlett said, with more restraint:
-
-“How do you do, Mr. Beebe? I expect that you have forgotten us: Miss
-Bartlett and Miss Honeychurch, who were at Tunbridge Wells when you
-helped the Vicar of St. Peter’s that very cold Easter.”
-
-The clergyman, who had the air of one on a holiday, did not remember
-the ladies quite as clearly as they remembered him. But he came forward
-pleasantly enough and accepted the chair into which he was beckoned by
-Lucy.
-
-“I _am_ so glad to see you,” said the girl, who was in a state of
-spiritual starvation, and would have been glad to see the waiter if her
-cousin had permitted it. “Just fancy how small the world is. Summer
-Street, too, makes it so specially funny.”
-
-“Miss Honeychurch lives in the parish of Summer Street,” said Miss
-Bartlett, filling up the gap, “and she happened to tell me in the
-course of conversation that you have just accepted the living—”
-
-“Yes, I heard from mother so last week. She didn’t know that I knew you
-at Tunbridge Wells; but I wrote back at once, and I said: ‘Mr. Beebe
-is—’”
-
-“Quite right,” said the clergyman. “I move into the Rectory at Summer
-Street next June. I am lucky to be appointed to such a charming
-neighbourhood.”
-
-“Oh, how glad I am! The name of our house is Windy Corner.” Mr. Beebe
-bowed.
-
-“There is mother and me generally, and my brother, though it’s not
-often we get him to ch—— The church is rather far off, I mean.”
-
-“Lucy, dearest, let Mr. Beebe eat his dinner.”
-
-“I am eating it, thank you, and enjoying it.”
-
-He preferred to talk to Lucy, whose playing he remembered, rather than
-to Miss Bartlett, who probably remembered his sermons. He asked the
-girl whether she knew Florence well, and was informed at some length
-that she had never been there before. It is delightful to advise a
-newcomer, and he was first in the field. “Don’t neglect the country
-round,” his advice concluded. “The first fine afternoon drive up to
-Fiesole, and round by Settignano, or something of that sort.”
-
-“No!” cried a voice from the top of the table. “Mr. Beebe, you are
-wrong. The first fine afternoon your ladies must go to Prato.”
-
-“That lady looks so clever,” whispered Miss Bartlett to her cousin. “We
-are in luck.”
-
-And, indeed, a perfect torrent of information burst on them. People
-told them what to see, when to see it, how to stop the electric trams,
-how to get rid of the beggars, how much to give for a vellum blotter,
-how much the place would grow upon them. The Pension Bertolini had
-decided, almost enthusiastically, that they would do. Whichever way
-they looked, kind ladies smiled and shouted at them. And above all rose
-the voice of the clever lady, crying: “Prato! They must go to Prato.
-That place is too sweetly squalid for words. I love it; I revel in
-shaking off the trammels of respectability, as you know.”
-
-The young man named George glanced at the clever lady, and then
-returned moodily to his plate. Obviously he and his father did not do.
-Lucy, in the midst of her success, found time to wish they did. It gave
-her no extra pleasure that any one should be left in the cold; and when
-she rose to go, she turned back and gave the two outsiders a nervous
-little bow.
-
-The father did not see it; the son acknowledged it, not by another bow,
-but by raising his eyebrows and smiling; he seemed to be smiling across
-something.
-
-She hastened after her cousin, who had already disappeared through the
-curtains—curtains which smote one in the face, and seemed heavy with
-more than cloth. Beyond them stood the unreliable Signora, bowing
-good-evening to her guests, and supported by ’Enery, her little boy,
-and Victorier, her daughter. It made a curious little scene, this
-attempt of the Cockney to convey the grace and geniality of the South.
-And even more curious was the drawing-room, which attempted to rival
-the solid comfort of a Bloomsbury boarding-house. Was this really
-Italy?
-
-Miss Bartlett was already seated on a tightly stuffed arm-chair, which
-had the colour and the contours of a tomato. She was talking to Mr.
-Beebe, and as she spoke, her long narrow head drove backwards and
-forwards, slowly, regularly, as though she were demolishing some
-invisible obstacle. “We are most grateful to you,” she was saying. “The
-first evening means so much. When you arrived we were in for a
-peculiarly _mauvais quart d’heure_.”
-
-He expressed his regret.
-
-“Do you, by any chance, know the name of an old man who sat opposite us
-at dinner?”
-
-“Emerson.”
-
-“Is he a friend of yours?”
-
-“We are friendly—as one is in pensions.”
-
-“Then I will say no more.”
-
-He pressed her very slightly, and she said more.
-
-“I am, as it were,” she concluded, “the chaperon of my young cousin,
-Lucy, and it would be a serious thing if I put her under an obligation
-to people of whom we know nothing. His manner was somewhat unfortunate.
-I hope I acted for the best.”
-
-“You acted very naturally,” said he. He seemed thoughtful, and after a
-few moments added: “All the same, I don’t think much harm would have
-come of accepting.”
-
-“No _harm_, of course. But we could not be under an obligation.”
-
-“He is rather a peculiar man.” Again he hesitated, and then said
-gently: “I think he would not take advantage of your acceptance, nor
-expect you to show gratitude. He has the merit—if it is one—of saying
-exactly what he means. He has rooms he does not value, and he thinks
-you would value them. He no more thought of putting you under an
-obligation than he thought of being polite. It is so difficult—at
-least, I find it difficult—to understand people who speak the truth.”
-
-Lucy was pleased, and said: “I was hoping that he was nice; I do so
-always hope that people will be nice.”
-
-“I think he is; nice and tiresome. I differ from him on almost every
-point of any importance, and so, I expect—I may say I hope—you will
-differ. But his is a type one disagrees with rather than deplores. When
-he first came here he not unnaturally put people’s backs up. He has no
-tact and no manners—I don’t mean by that that he has bad manners—and he
-will not keep his opinions to himself. We nearly complained about him
-to our depressing Signora, but I am glad to say we thought better of
-it.”
-
-“Am I to conclude,” said Miss Bartlett, “that he is a Socialist?”
-
-Mr. Beebe accepted the convenient word, not without a slight twitching
-of the lips.
-
-“And presumably he has brought up his son to be a Socialist, too?”
-
-“I hardly know George, for he hasn’t learnt to talk yet. He seems a
-nice creature, and I think he has brains. Of course, he has all his
-father’s mannerisms, and it is quite possible that he, too, may be a
-Socialist.”
-
-“Oh, you relieve me,” said Miss Bartlett. “So you think I ought to have
-accepted their offer? You feel I have been narrow-minded and
-suspicious?”
-
-“Not at all,” he answered; “I never suggested that.”
-
-“But ought I not to apologize, at all events, for my apparent
-rudeness?”
-
-He replied, with some irritation, that it would be quite unnecessary,
-and got up from his seat to go to the smoking-room.
-
-“Was I a bore?” said Miss Bartlett, as soon as he had disappeared. “Why
-didn’t you talk, Lucy? He prefers young people, I’m sure. I do hope I
-haven’t monopolized him. I hoped you would have him all the evening, as
-well as all dinner-time.”
-
-“He is nice,” exclaimed Lucy. “Just what I remember. He seems to see
-good in everyone. No one would take him for a clergyman.”
-
-“My dear Lucia—”
-
-“Well, you know what I mean. And you know how clergymen generally
-laugh; Mr. Beebe laughs just like an ordinary man.”
-
-“Funny girl! How you do remind me of your mother. I wonder if she will
-approve of Mr. Beebe.”
-
-“I’m sure she will; and so will Freddy.”
-
-“I think everyone at Windy Corner will approve; it is the fashionable
-world. I am used to Tunbridge Wells, where we are all hopelessly behind
-the times.”
-
-“Yes,” said Lucy despondently.
-
-There was a haze of disapproval in the air, but whether the disapproval
-was of herself, or of Mr. Beebe, or of the fashionable world at Windy
-Corner, or of the narrow world at Tunbridge Wells, she could not
-determine. She tried to locate it, but as usual she blundered. Miss
-Bartlett sedulously denied disapproving of any one, and added “I am
-afraid you are finding me a very depressing companion.”
-
-And the girl again thought: “I must have been selfish or unkind; I must
-be more careful. It is so dreadful for Charlotte, being poor.”
-
-Fortunately one of the little old ladies, who for some time had been
-smiling very benignly, now approached and asked if she might be allowed
-to sit where Mr. Beebe had sat. Permission granted, she began to
-chatter gently about Italy, the plunge it had been to come there, the
-gratifying success of the plunge, the improvement in her sister’s
-health, the necessity of closing the bed-room windows at night, and of
-thoroughly emptying the water-bottles in the morning. She handled her
-subjects agreeably, and they were, perhaps, more worthy of attention
-than the high discourse upon Guelfs and Ghibellines which was
-proceeding tempestuously at the other end of the room. It was a real
-catastrophe, not a mere episode, that evening of hers at Venice, when
-she had found in her bedroom something that is one worse than a flea,
-though one better than something else.
-
-“But here you are as safe as in England. Signora Bertolini is so
-English.”
-
-“Yet our rooms smell,” said poor Lucy. “We dread going to bed.”
-
-“Ah, then you look into the court.” She sighed. “If only Mr. Emerson
-was more tactful! We were so sorry for you at dinner.”
-
-“I think he was meaning to be kind.”
-
-“Undoubtedly he was,” said Miss Bartlett.
-
-“Mr. Beebe has just been scolding me for my suspicious nature. Of
-course, I was holding back on my cousin’s account.”
-
-“Of course,” said the little old lady; and they murmured that one could
-not be too careful with a young girl.
-
-Lucy tried to look demure, but could not help feeling a great fool. No
-one was careful with her at home; or, at all events, she had not
-noticed it.
-
-“About old Mr. Emerson—I hardly know. No, he is not tactful; yet, have
-you ever noticed that there are people who do things which are most
-indelicate, and yet at the same time—beautiful?”
-
-“Beautiful?” said Miss Bartlett, puzzled at the word. “Are not beauty
-and delicacy the same?”
-
-“So one would have thought,” said the other helplessly. “But things are
-so difficult, I sometimes think.”
-
-She proceeded no further into things, for Mr. Beebe reappeared, looking
-extremely pleasant.
-
-“Miss Bartlett,” he cried, “it’s all right about the rooms. I’m so
-glad. Mr. Emerson was talking about it in the smoking-room, and knowing
-what I did, I encouraged him to make the offer again. He has let me
-come and ask you. He would be so pleased.”
-
-“Oh, Charlotte,” cried Lucy to her cousin, “we must have the rooms now.
-The old man is just as nice and kind as he can be.”
-
-Miss Bartlett was silent.
-
-“I fear,” said Mr. Beebe, after a pause, “that I have been officious. I
-must apologize for my interference.”
-
-Gravely displeased, he turned to go. Not till then did Miss Bartlett
-reply: “My own wishes, dearest Lucy, are unimportant in comparison with
-yours. It would be hard indeed if I stopped you doing as you liked at
-Florence, when I am only here through your kindness. If you wish me to
-turn these gentlemen out of their rooms, I will do it. Would you then,
-Mr. Beebe, kindly tell Mr. Emerson that I accept his kind offer, and
-then conduct him to me, in order that I may thank him personally?”
-
-She raised her voice as she spoke; it was heard all over the
-drawing-room, and silenced the Guelfs and the Ghibellines. The
-clergyman, inwardly cursing the female sex, bowed, and departed with
-her message.
-
-“Remember, Lucy, I alone am implicated in this. I do not wish the
-acceptance to come from you. Grant me that, at all events.”
-
-Mr. Beebe was back, saying rather nervously:
-
-“Mr. Emerson is engaged, but here is his son instead.”
-
-The young man gazed down on the three ladies, who felt seated on the
-floor, so low were their chairs.
-
-“My father,” he said, “is in his bath, so you cannot thank him
-personally. But any message given by you to me will be given by me to
-him as soon as he comes out.”
-
-Miss Bartlett was unequal to the bath. All her barbed civilities came
-forth wrong end first. Young Mr. Emerson scored a notable triumph to
-the delight of Mr. Beebe and to the secret delight of Lucy.
-
-“Poor young man!” said Miss Bartlett, as soon as he had gone.
-
-“How angry he is with his father about the rooms! It is all he can do
-to keep polite.”
-
-“In half an hour or so your rooms will be ready,” said Mr. Beebe. Then
-looking rather thoughtfully at the two cousins, he retired to his own
-rooms, to write up his philosophic diary.
-
-“Oh, dear!” breathed the little old lady, and shuddered as if all the
-winds of heaven had entered the apartment. “Gentlemen sometimes do not
-realize—” Her voice faded away, but Miss Bartlett seemed to understand
-and a conversation developed, in which gentlemen who did not thoroughly
-realize played a principal part. Lucy, not realizing either, was
-reduced to literature. Taking up Baedeker’s Handbook to Northern Italy,
-she committed to memory the most important dates of Florentine History.
-For she was determined to enjoy herself on the morrow. Thus the
-half-hour crept profitably away, and at last Miss Bartlett rose with a
-sigh, and said:
-
-“I think one might venture now. No, Lucy, do not stir. I will
-superintend the move.”
-
-“How you do do everything,” said Lucy.
-
-“Naturally, dear. It is my affair.”
-
-“But I would like to help you.”
-
-“No, dear.”
-
-Charlotte’s energy! And her unselfishness! She had been thus all her
-life, but really, on this Italian tour, she was surpassing herself. So
-Lucy felt, or strove to feel. And yet—there was a rebellious spirit in
-her which wondered whether the acceptance might not have been less
-delicate and more beautiful. At all events, she entered her own room
-without any feeling of joy.
-
-“I want to explain,” said Miss Bartlett, “why it is that I have taken
-the largest room. Naturally, of course, I should have given it to you;
-but I happen to know that it belongs to the young man, and I was sure
-your mother would not like it.”
-
-Lucy was bewildered.
-
-“If you are to accept a favour it is more suitable you should be under
-an obligation to his father than to him. I am a woman of the world, in
-my small way, and I know where things lead to. However, Mr. Beebe is a
-guarantee of a sort that they will not presume on this.”
-
-“Mother wouldn’t mind I’m sure,” said Lucy, but again had the sense of
-larger and unsuspected issues.
-
-Miss Bartlett only sighed, and enveloped her in a protecting embrace as
-she wished her good-night. It gave Lucy the sensation of a fog, and
-when she reached her own room she opened the window and breathed the
-clean night air, thinking of the kind old man who had enabled her to
-see the lights dancing in the Arno and the cypresses of San Miniato,
-and the foot-hills of the Apennines, black against the rising moon.
-
-Miss Bartlett, in her room, fastened the window-shutters and locked the
-door, and then made a tour of the apartment to see where the cupboards
-led, and whether there were any oubliettes or secret entrances. It was
-then that she saw, pinned up over the washstand, a sheet of paper on
-which was scrawled an enormous note of interrogation. Nothing more.
-
-“What does it mean?” she thought, and she examined it carefully by the
-light of a candle. Meaningless at first, it gradually became menacing,
-obnoxious, portentous with evil. She was seized with an impulse to
-destroy it, but fortunately remembered that she had no right to do so,
-since it must be the property of young Mr. Emerson. So she unpinned it
-carefully, and put it between two pieces of blotting-paper to keep it
-clean for him. Then she completed her inspection of the room, sighed
-heavily according to her habit, and went to bed.
-
-
-
-
-Chapter II
-In Santa Croce with No Baedeker
-
-
-It was pleasant to wake up in Florence, to open the eyes upon a bright
-bare room, with a floor of red tiles which look clean though they are
-not; with a painted ceiling whereon pink griffins and blue amorini
-sport in a forest of yellow violins and bassoons. It was pleasant, too,
-to fling wide the windows, pinching the fingers in unfamiliar
-fastenings, to lean out into sunshine with beautiful hills and trees
-and marble churches opposite, and close below, the Arno, gurgling
-against the embankment of the road.
-
-Over the river men were at work with spades and sieves on the sandy
-foreshore, and on the river was a boat, also diligently employed for
-some mysterious end. An electric tram came rushing underneath the
-window. No one was inside it, except one tourist; but its platforms
-were overflowing with Italians, who preferred to stand. Children tried
-to hang on behind, and the conductor, with no malice, spat in their
-faces to make them let go. Then soldiers appeared—good-looking,
-undersized men—wearing each a knapsack covered with mangy fur, and a
-great-coat which had been cut for some larger soldier. Beside them
-walked officers, looking foolish and fierce, and before them went
-little boys, turning somersaults in time with the band. The tramcar
-became entangled in their ranks, and moved on painfully, like a
-caterpillar in a swarm of ants. One of the little boys fell down, and
-some white bullocks came out of an archway. Indeed, if it had not been
-for the good advice of an old man who was selling button-hooks, the
-road might never have got clear.
-
-Over such trivialities as these many a valuable hour may slip away, and
-the traveller who has gone to Italy to study the tactile values of
-Giotto, or the corruption of the Papacy, may return remembering nothing
-but the blue sky and the men and women who live under it. So it was as
-well that Miss Bartlett should tap and come in, and having commented on
-Lucy’s leaving the door unlocked, and on her leaning out of the window
-before she was fully dressed, should urge her to hasten herself, or the
-best of the day would be gone. By the time Lucy was ready her cousin
-had done her breakfast, and was listening to the clever lady among the
-crumbs.
-
-A conversation then ensued, on not unfamiliar lines. Miss Bartlett was,
-after all, a wee bit tired, and thought they had better spend the
-morning settling in; unless Lucy would at all like to go out? Lucy
-would rather like to go out, as it was her first day in Florence, but,
-of course, she could go alone. Miss Bartlett could not allow this. Of
-course she would accompany Lucy everywhere. Oh, certainly not; Lucy
-would stop with her cousin. Oh, no! that would never do. Oh, yes!
-
-At this point the clever lady broke in.
-
-“If it is Mrs. Grundy who is troubling you, I do assure you that you
-can neglect the good person. Being English, Miss Honeychurch will be
-perfectly safe. Italians understand. A dear friend of mine, Contessa
-Baroncelli, has two daughters, and when she cannot send a maid to
-school with them, she lets them go in sailor-hats instead. Every one
-takes them for English, you see, especially if their hair is strained
-tightly behind.”
-
-Miss Bartlett was unconvinced by the safety of Contessa Baroncelli’s
-daughters. She was determined to take Lucy herself, her head not being
-so very bad. The clever lady then said that she was going to spend a
-long morning in Santa Croce, and if Lucy would come too, she would be
-delighted.
-
-“I will take you by a dear dirty back way, Miss Honeychurch, and if you
-bring me luck, we shall have an adventure.”
-
-Lucy said that this was most kind, and at once opened the Baedeker, to
-see where Santa Croce was.
-
-“Tut, tut! Miss Lucy! I hope we shall soon emancipate you from
-Baedeker. He does but touch the surface of things. As to the true
-Italy—he does not even dream of it. The true Italy is only to be found
-by patient observation.”
-
-This sounded very interesting, and Lucy hurried over her breakfast, and
-started with her new friend in high spirits. Italy was coming at last.
-The Cockney Signora and her works had vanished like a bad dream.
-
-Miss Lavish—for that was the clever lady’s name—turned to the right
-along the sunny Lung’ Arno. How delightfully warm! But a wind down the
-side streets cut like a knife, didn’t it? Ponte alle
-Grazie—particularly interesting, mentioned by Dante. San
-Miniato—beautiful as well as interesting; the crucifix that kissed a
-murderer—Miss Honeychurch would remember the story. The men on the
-river were fishing. (Untrue; but then, so is most information.) Then
-Miss Lavish darted under the archway of the white bullocks, and she
-stopped, and she cried:
-
-“A smell! a true Florentine smell! Every city, let me teach you, has
-its own smell.”
-
-“Is it a very nice smell?” said Lucy, who had inherited from her mother
-a distaste to dirt.
-
-“One doesn’t come to Italy for niceness,” was the retort; “one comes
-for life. Buon giorno! Buon giorno!” bowing right and left. “Look at
-that adorable wine-cart! How the driver stares at us, dear, simple
-soul!”
-
-So Miss Lavish proceeded through the streets of the city of Florence,
-short, fidgety, and playful as a kitten, though without a kitten’s
-grace. It was a treat for the girl to be with any one so clever and so
-cheerful; and a blue military cloak, such as an Italian officer wears,
-only increased the sense of festivity.
-
-“Buon giorno! Take the word of an old woman, Miss Lucy: you will never
-repent of a little civility to your inferiors. _That_ is the true
-democracy. Though I am a real Radical as well. There, now you’re
-shocked.”
-
-“Indeed, I’m not!” exclaimed Lucy. “We are Radicals, too, out and out.
-My father always voted for Mr. Gladstone, until he was so dreadful
-about Ireland.”
-
-“I see, I see. And now you have gone over to the enemy.”
-
-“Oh, please—! If my father was alive, I am sure he would vote Radical
-again now that Ireland is all right. And as it is, the glass over our
-front door was broken last election, and Freddy is sure it was the
-Tories; but mother says nonsense, a tramp.”
-
-“Shameful! A manufacturing district, I suppose?”
-
-“No—in the Surrey hills. About five miles from Dorking, looking over
-the Weald.”
-
-Miss Lavish seemed interested, and slackened her trot.
-
-“What a delightful part; I know it so well. It is full of the very
-nicest people. Do you know Sir Harry Otway—a Radical if ever there
-was?”
-
-“Very well indeed.”
-
-“And old Mrs. Butterworth the philanthropist?”
-
-“Why, she rents a field of us! How funny!”
-
-Miss Lavish looked at the narrow ribbon of sky, and murmured: “Oh, you
-have property in Surrey?”
-
-“Hardly any,” said Lucy, fearful of being thought a snob. “Only thirty
-acres—just the garden, all downhill, and some fields.”
-
-Miss Lavish was not disgusted, and said it was just the size of her
-aunt’s Suffolk estate. Italy receded. They tried to remember the last
-name of Lady Louisa someone, who had taken a house near Summer Street
-the other year, but she had not liked it, which was odd of her. And
-just as Miss Lavish had got the name, she broke off and exclaimed:
-
-“Bless us! Bless us and save us! We’ve lost the way.”
-
-Certainly they had seemed a long time in reaching Santa Croce, the
-tower of which had been plainly visible from the landing window. But
-Miss Lavish had said so much about knowing her Florence by heart, that
-Lucy had followed her with no misgivings.
-
-“Lost! lost! My dear Miss Lucy, during our political diatribes we have
-taken a wrong turning. How those horrid Conservatives would jeer at us!
-What are we to do? Two lone females in an unknown town. Now, this is
-what _I_ call an adventure.”
-
-Lucy, who wanted to see Santa Croce, suggested, as a possible solution,
-that they should ask the way there.
-
-“Oh, but that is the word of a craven! And no, you are not, not, _not_
-to look at your Baedeker. Give it to me; I shan’t let you carry it. We
-will simply drift.”
-
-Accordingly they drifted through a series of those grey-brown streets,
-neither commodious nor picturesque, in which the eastern quarter of the
-city abounds. Lucy soon lost interest in the discontent of Lady Louisa,
-and became discontented herself. For one ravishing moment Italy
-appeared. She stood in the Square of the Annunziata and saw in the
-living terra-cotta those divine babies whom no cheap reproduction can
-ever stale. There they stood, with their shining limbs bursting from
-the garments of charity, and their strong white arms extended against
-circlets of heaven. Lucy thought she had never seen anything more
-beautiful; but Miss Lavish, with a shriek of dismay, dragged her
-forward, declaring that they were out of their path now by at least a
-mile.
-
-The hour was approaching at which the continental breakfast begins, or
-rather ceases, to tell, and the ladies bought some hot chestnut paste
-out of a little shop, because it looked so typical. It tasted partly of
-the paper in which it was wrapped, partly of hair oil, partly of the
-great unknown. But it gave them strength to drift into another Piazza,
-large and dusty, on the farther side of which rose a black-and-white
-façade of surpassing ugliness. Miss Lavish spoke to it dramatically. It
-was Santa Croce. The adventure was over.
-
-“Stop a minute; let those two people go on, or I shall have to speak to
-them. I do detest conventional intercourse. Nasty! they are going into
-the church, too. Oh, the Britisher abroad!”
-
-“We sat opposite them at dinner last night. They have given us their
-rooms. They were so very kind.”
-
-“Look at their figures!” laughed Miss Lavish. “They walk through my
-Italy like a pair of cows. It’s very naughty of me, but I would like to
-set an examination paper at Dover, and turn back every tourist who
-couldn’t pass it.”
-
-“What would you ask us?”
-
-Miss Lavish laid her hand pleasantly on Lucy’s arm, as if to suggest
-that she, at all events, would get full marks. In this exalted mood
-they reached the steps of the great church, and were about to enter it
-when Miss Lavish stopped, squeaked, flung up her arms, and cried:
-
-“There goes my local-colour box! I must have a word with him!”
-
-And in a moment she was away over the Piazza, her military cloak
-flapping in the wind; nor did she slacken speed till she caught up an
-old man with white whiskers, and nipped him playfully upon the arm.
-
-Lucy waited for nearly ten minutes. Then she began to get tired. The
-beggars worried her, the dust blew in her eyes, and she remembered that
-a young girl ought not to loiter in public places. She descended slowly
-into the Piazza with the intention of rejoining Miss Lavish, who was
-really almost too original. But at that moment Miss Lavish and her
-local-colour box moved also, and disappeared down a side street, both
-gesticulating largely. Tears of indignation came to Lucy’s eyes partly
-because Miss Lavish had jilted her, partly because she had taken her
-Baedeker. How could she find her way home? How could she find her way
-about in Santa Croce? Her first morning was ruined, and she might never
-be in Florence again. A few minutes ago she had been all high spirits,
-talking as a woman of culture, and half persuading herself that she was
-full of originality. Now she entered the church depressed and
-humiliated, not even able to remember whether it was built by the
-Franciscans or the Dominicans. Of course, it must be a wonderful
-building. But how like a barn! And how very cold! Of course, it
-contained frescoes by Giotto, in the presence of whose tactile values
-she was capable of feeling what was proper. But who was to tell her
-which they were? She walked about disdainfully, unwilling to be
-enthusiastic over monuments of uncertain authorship or date. There was
-no one even to tell her which, of all the sepulchral slabs that paved
-the nave and transepts, was the one that was really beautiful, the one
-that had been most praised by Mr. Ruskin.
-
-Then the pernicious charm of Italy worked on her, and, instead of
-acquiring information, she began to be happy. She puzzled out the
-Italian notices—the notices that forbade people to introduce dogs into
-the church—the notice that prayed people, in the interest of health and
-out of respect to the sacred edifice in which they found themselves,
-not to spit. She watched the tourists; their noses were as red as their
-Baedekers, so cold was Santa Croce. She beheld the horrible fate that
-overtook three Papists—two he-babies and a she-baby—who began their
-career by sousing each other with the Holy Water, and then proceeded to
-the Machiavelli memorial, dripping but hallowed. Advancing towards it
-very slowly and from immense distances, they touched the stone with
-their fingers, with their handkerchiefs, with their heads, and then
-retreated. What could this mean? They did it again and again. Then Lucy
-realized that they had mistaken Machiavelli for some saint, hoping to
-acquire virtue. Punishment followed quickly. The smallest he-baby
-stumbled over one of the sepulchral slabs so much admired by Mr.
-Ruskin, and entangled his feet in the features of a recumbent bishop.
-Protestant as she was, Lucy darted forward. She was too late. He fell
-heavily upon the prelate’s upturned toes.
-
-“Hateful bishop!” exclaimed the voice of old Mr. Emerson, who had
-darted forward also. “Hard in life, hard in death. Go out into the
-sunshine, little boy, and kiss your hand to the sun, for that is where
-you ought to be. Intolerable bishop!”
-
-The child screamed frantically at these words, and at these dreadful
-people who picked him up, dusted him, rubbed his bruises, and told him
-not to be superstitious.
-
-“Look at him!” said Mr. Emerson to Lucy. “Here’s a mess: a baby hurt,
-cold, and frightened! But what else can you expect from a church?”
-
-The child’s legs had become as melting wax. Each time that old Mr.
-Emerson and Lucy set it erect it collapsed with a roar. Fortunately an
-Italian lady, who ought to have been saying her prayers, came to the
-rescue. By some mysterious virtue, which mothers alone possess, she
-stiffened the little boy’s back-bone and imparted strength to his
-knees. He stood. Still gibbering with agitation, he walked away.
-
-“You are a clever woman,” said Mr. Emerson. “You have done more than
-all the relics in the world. I am not of your creed, but I do believe
-in those who make their fellow-creatures happy. There is no scheme of
-the universe—”
-
-He paused for a phrase.
-
-“Niente,” said the Italian lady, and returned to her prayers.
-
-“I’m not sure she understands English,” suggested Lucy.
-
-In her chastened mood she no longer despised the Emersons. She was
-determined to be gracious to them, beautiful rather than delicate, and,
-if possible, to erase Miss Bartlett’s civility by some gracious
-reference to the pleasant rooms.
-
-“That woman understands everything,” was Mr. Emerson’s reply. “But what
-are you doing here? Are you doing the church? Are you through with the
-church?”
-
-“No,” cried Lucy, remembering her grievance. “I came here with Miss
-Lavish, who was to explain everything; and just by the door—it is too
-bad!—she simply ran away, and after waiting quite a time, I had to come
-in by myself.”
-
-“Why shouldn’t you?” said Mr. Emerson.
-
-“Yes, why shouldn’t you come by yourself?” said the son, addressing the
-young lady for the first time.
-
-“But Miss Lavish has even taken away Baedeker.”
-
-“Baedeker?” said Mr. Emerson. “I’m glad it’s _that_ you minded. It’s
-worth minding, the loss of a Baedeker. _That’s_ worth minding.”
-
-Lucy was puzzled. She was again conscious of some new idea, and was not
-sure whither it would lead her.
-
-“If you’ve no Baedeker,” said the son, “you’d better join us.” Was this
-where the idea would lead? She took refuge in her dignity.
-
-“Thank you very much, but I could not think of that. I hope you do not
-suppose that I came to join on to you. I really came to help with the
-child, and to thank you for so kindly giving us your rooms last night.
-I hope that you have not been put to any great inconvenience.”
-
-“My dear,” said the old man gently, “I think that you are repeating
-what you have heard older people say. You are pretending to be touchy;
-but you are not really. Stop being so tiresome, and tell me instead
-what part of the church you want to see. To take you to it will be a
-real pleasure.”
-
-Now, this was abominably impertinent, and she ought to have been
-furious. But it is sometimes as difficult to lose one’s temper as it is
-difficult at other times to keep it. Lucy could not get cross. Mr.
-Emerson was an old man, and surely a girl might humour him. On the
-other hand, his son was a young man, and she felt that a girl ought to
-be offended with him, or at all events be offended before him. It was
-at him that she gazed before replying.
-
-“I am not touchy, I hope. It is the Giottos that I want to see, if you
-will kindly tell me which they are.”
-
-The son nodded. With a look of sombre satisfaction, he led the way to
-the Peruzzi Chapel. There was a hint of the teacher about him. She felt
-like a child in school who had answered a question rightly.
-
-The chapel was already filled with an earnest congregation, and out of
-them rose the voice of a lecturer, directing them how to worship
-Giotto, not by tactful valuations, but by the standards of the spirit.
-
-“Remember,” he was saying, “the facts about this church of Santa Croce;
-how it was built by faith in the full fervour of medievalism, before
-any taint of the Renaissance had appeared. Observe how Giotto in these
-frescoes—now, unhappily, ruined by restoration—is untroubled by the
-snares of anatomy and perspective. Could anything be more majestic,
-more pathetic, beautiful, true? How little, we feel, avails knowledge
-and technical cleverness against a man who truly feels!”
-
-“No!” exclaimed Mr. Emerson, in much too loud a voice for church.
-“Remember nothing of the sort! Built by faith indeed! That simply means
-the workmen weren’t paid properly. And as for the frescoes, I see no
-truth in them. Look at that fat man in blue! He must weigh as much as I
-do, and he is shooting into the sky like an air balloon.”
-
-He was referring to the fresco of the “Ascension of St. John.” Inside,
-the lecturer’s voice faltered, as well it might. The audience shifted
-uneasily, and so did Lucy. She was sure that she ought not to be with
-these men; but they had cast a spell over her. They were so serious and
-so strange that she could not remember how to behave.
-
-“Now, did this happen, or didn’t it? Yes or no?”
-
-George replied:
-
-“It happened like this, if it happened at all. I would rather go up to
-heaven by myself than be pushed by cherubs; and if I got there I should
-like my friends to lean out of it, just as they do here.”
-
-“You will never go up,” said his father. “You and I, dear boy, will lie
-at peace in the earth that bore us, and our names will disappear as
-surely as our work survives.”
-
-“Some of the people can only see the empty grave, not the saint,
-whoever he is, going up. It did happen like that, if it happened at
-all.”
-
-“Pardon me,” said a frigid voice. “The chapel is somewhat small for two
-parties. We will incommode you no longer.”
-
-The lecturer was a clergyman, and his audience must be also his flock,
-for they held prayer-books as well as guide-books in their hands. They
-filed out of the chapel in silence. Amongst them were the two little
-old ladies of the Pension Bertolini—Miss Teresa and Miss Catherine
-Alan.
-
-“Stop!” cried Mr. Emerson. “There’s plenty of room for us all. Stop!”
-
-The procession disappeared without a word.
-
-Soon the lecturer could be heard in the next chapel, describing the
-life of St. Francis.
-
-“George, I do believe that clergyman is the Brixton curate.”
-
-George went into the next chapel and returned, saying “Perhaps he is. I
-don’t remember.”
-
-“Then I had better speak to him and remind him who I am. It’s that Mr.
-Eager. Why did he go? Did we talk too loud? How vexatious. I shall go
-and say we are sorry. Hadn’t I better? Then perhaps he will come back.”
-
-“He will not come back,” said George.
-
-But Mr. Emerson, contrite and unhappy, hurried away to apologize to the
-Rev. Cuthbert Eager. Lucy, apparently absorbed in a lunette, could hear
-the lecture again interrupted, the anxious, aggressive voice of the old
-man, the curt, injured replies of his opponent. The son, who took every
-little contretemps as if it were a tragedy, was listening also.
-
-“My father has that effect on nearly everyone,” he informed her. “He
-will try to be kind.”
-
-“I hope we all try,” said she, smiling nervously.
-
-“Because we think it improves our characters. But he is kind to people
-because he loves them; and they find him out, and are offended, or
-frightened.”
-
-“How silly of them!” said Lucy, though in her heart she sympathized; “I
-think that a kind action done tactfully—”
-
-“Tact!”
-
-He threw up his head in disdain. Apparently she had given the wrong
-answer. She watched the singular creature pace up and down the chapel.
-For a young man his face was rugged, and—until the shadows fell upon
-it—hard. Enshadowed, it sprang into tenderness. She saw him once again
-at Rome, on the ceiling of the Sistine Chapel, carrying a burden of
-acorns. Healthy and muscular, he yet gave her the feeling of greyness,
-of tragedy that might only find solution in the night. The feeling soon
-passed; it was unlike her to have entertained anything so subtle. Born
-of silence and of unknown emotion, it passed when Mr. Emerson returned,
-and she could re-enter the world of rapid talk, which was alone
-familiar to her.
-
-“Were you snubbed?” asked his son tranquilly.
-
-“But we have spoilt the pleasure of I don’t know how many people. They
-won’t come back.”
-
-“...full of innate sympathy...quickness to perceive good in
-others...vision of the brotherhood of man...” Scraps of the lecture on
-St. Francis came floating round the partition wall.
-
-“Don’t let us spoil yours,” he continued to Lucy. “Have you looked at
-those saints?”
-
-“Yes,” said Lucy. “They are lovely. Do you know which is the tombstone
-that is praised in Ruskin?”
-
-He did not know, and suggested that they should try to guess it.
-George, rather to her relief, refused to move, and she and the old man
-wandered not unpleasantly about Santa Croce, which, though it is like a
-barn, has harvested many beautiful things inside its walls. There were
-also beggars to avoid and guides to dodge round the pillars, and an old
-lady with her dog, and here and there a priest modestly edging to his
-Mass through the groups of tourists. But Mr. Emerson was only half
-interested. He watched the lecturer, whose success he believed he had
-impaired, and then he anxiously watched his son.
-
-“Why will he look at that fresco?” he said uneasily. “I saw nothing in
-it.”
-
-“I like Giotto,” she replied. “It is so wonderful what they say about
-his tactile values. Though I like things like the Della Robbia babies
-better.”
-
-“So you ought. A baby is worth a dozen saints. And my baby’s worth the
-whole of Paradise, and as far as I can see he lives in Hell.”
-
-Lucy again felt that this did not do.
-
-“In Hell,” he repeated. “He’s unhappy.”
-
-“Oh, dear!” said Lucy.
-
-“How can he be unhappy when he is strong and alive? What more is one to
-give him? And think how he has been brought up—free from all the
-superstition and ignorance that lead men to hate one another in the
-name of God. With such an education as that, I thought he was bound to
-grow up happy.”
-
-She was no theologian, but she felt that here was a very foolish old
-man, as well as a very irreligious one. She also felt that her mother
-might not like her talking to that kind of person, and that Charlotte
-would object most strongly.
-
-“What are we to do with him?” he asked. “He comes out for his holiday
-to Italy, and behaves—like that; like the little child who ought to
-have been playing, and who hurt himself upon the tombstone. Eh? What
-did you say?”
-
-Lucy had made no suggestion. Suddenly he said:
-
-“Now don’t be stupid over this. I don’t require you to fall in love
-with my boy, but I do think you might try and understand him. You are
-nearer his age, and if you let yourself go I am sure you are sensible.
-You might help me. He has known so few women, and you have the time.
-You stop here several weeks, I suppose? But let yourself go. You are
-inclined to get muddled, if I may judge from last night. Let yourself
-go. Pull out from the depths those thoughts that you do not understand,
-and spread them out in the sunlight and know the meaning of them. By
-understanding George you may learn to understand yourself. It will be
-good for both of you.”
-
-To this extraordinary speech Lucy found no answer.
-
-“I only know what it is that’s wrong with him; not why it is.”
-
-“And what is it?” asked Lucy fearfully, expecting some harrowing tale.
-
-“The old trouble; things won’t fit.”
-
-“What things?”
-
-“The things of the universe. It is quite true. They don’t.”
-
-“Oh, Mr. Emerson, whatever do you mean?”
-
-In his ordinary voice, so that she scarcely realized he was quoting
-poetry, he said:
-
-“‘From far, from eve and morning,
-    And yon twelve-winded sky,
-The stuff of life to knit me
-    Blew hither: here am I’
-
-
-George and I both know this, but why does it distress him? We know that
-we come from the winds, and that we shall return to them; that all life
-is perhaps a knot, a tangle, a blemish in the eternal smoothness. But
-why should this make us unhappy? Let us rather love one another, and
-work and rejoice. I don’t believe in this world sorrow.”
-
-Miss Honeychurch assented.
-
-“Then make my boy think like us. Make him realize that by the side of
-the everlasting Why there is a Yes—a transitory Yes if you like, but a
-Yes.”
-
-Suddenly she laughed; surely one ought to laugh. A young man melancholy
-because the universe wouldn’t fit, because life was a tangle or a wind,
-or a Yes, or something!
-
-“I’m very sorry,” she cried. “You’ll think me unfeeling, but—but—” Then
-she became matronly. “Oh, but your son wants employment. Has he no
-particular hobby? Why, I myself have worries, but I can generally
-forget them at the piano; and collecting stamps did no end of good for
-my brother. Perhaps Italy bores him; you ought to try the Alps or the
-Lakes.”
-
-The old man’s face saddened, and he touched her gently with his hand.
-This did not alarm her; she thought that her advice had impressed him
-and that he was thanking her for it. Indeed, he no longer alarmed her
-at all; she regarded him as a kind thing, but quite silly. Her feelings
-were as inflated spiritually as they had been an hour ago esthetically,
-before she lost Baedeker. The dear George, now striding towards them
-over the tombstones, seemed both pitiable and absurd. He approached,
-his face in the shadow. He said:
-
-“Miss Bartlett.”
-
-“Oh, good gracious me!” said Lucy, suddenly collapsing and again seeing
-the whole of life in a new perspective. “Where? Where?”
-
-“In the nave.”
-
-“I see. Those gossiping little Miss Alans must have—” She checked
-herself.
-
-“Poor girl!” exploded Mr. Emerson. “Poor girl!”
-
-She could not let this pass, for it was just what she was feeling
-herself.
-
-“Poor girl? I fail to understand the point of that remark. I think
-myself a very fortunate girl, I assure you. I’m thoroughly happy, and
-having a splendid time. Pray don’t waste time mourning over _me_.
-There’s enough sorrow in the world, isn’t there, without trying to
-invent it. Good-bye. Thank you both so much for all your kindness. Ah,
-yes! there does come my cousin. A delightful morning! Santa Croce is a
-wonderful church.”
-
-She joined her cousin.
-
-
-
-
-Chapter III
-Music, Violets, and the Letter “S”
-
-
-It so happened that Lucy, who found daily life rather chaotic, entered
-a more solid world when she opened the piano. She was then no longer
-either deferential or patronizing; no longer either a rebel or a slave.
-The kingdom of music is not the kingdom of this world; it will accept
-those whom breeding and intellect and culture have alike rejected. The
-commonplace person begins to play, and shoots into the empyrean without
-effort, whilst we look up, marvelling how he has escaped us, and
-thinking how we could worship him and love him, would he but translate
-his visions into human words, and his experiences into human actions.
-Perhaps he cannot; certainly he does not, or does so very seldom. Lucy
-had done so never.
-
-She was no dazzling _exécutante;_ her runs were not at all like strings
-of pearls, and she struck no more right notes than was suitable for one
-of her age and situation. Nor was she the passionate young lady, who
-performs so tragically on a summer’s evening with the window open.
-Passion was there, but it could not be easily labelled; it slipped
-between love and hatred and jealousy, and all the furniture of the
-pictorial style. And she was tragical only in the sense that she was
-great, for she loved to play on the side of Victory. Victory of what
-and over what—that is more than the words of daily life can tell us.
-But that some sonatas of Beethoven are written tragic no one can
-gainsay; yet they can triumph or despair as the player decides, and
-Lucy had decided that they should triumph.
-
-A very wet afternoon at the Bertolini permitted her to do the thing she
-really liked, and after lunch she opened the little draped piano. A few
-people lingered round and praised her playing, but finding that she
-made no reply, dispersed to their rooms to write up their diaries or to
-sleep. She took no notice of Mr. Emerson looking for his son, nor of
-Miss Bartlett looking for Miss Lavish, nor of Miss Lavish looking for
-her cigarette-case. Like every true performer, she was intoxicated by
-the mere feel of the notes: they were fingers caressing her own; and by
-touch, not by sound alone, did she come to her desire.
-
-Mr. Beebe, sitting unnoticed in the window, pondered this illogical
-element in Miss Honeychurch, and recalled the occasion at Tunbridge
-Wells when he had discovered it. It was at one of those entertainments
-where the upper classes entertain the lower. The seats were filled with
-a respectful audience, and the ladies and gentlemen of the parish,
-under the auspices of their vicar, sang, or recited, or imitated the
-drawing of a champagne cork. Among the promised items was “Miss
-Honeychurch. Piano. Beethoven,” and Mr. Beebe was wondering whether it
-would be Adelaida, or the march of The Ruins of Athens, when his
-composure was disturbed by the opening bars of Opus III. He was in
-suspense all through the introduction, for not until the pace quickens
-does one know what the performer intends. With the roar of the opening
-theme he knew that things were going extraordinarily; in the chords
-that herald the conclusion he heard the hammer strokes of victory. He
-was glad that she only played the first movement, for he could have
-paid no attention to the winding intricacies of the measures of
-nine-sixteen. The audience clapped, no less respectful. It was Mr.
-Beebe who started the stamping; it was all that one could do.
-
-“Who is she?” he asked the vicar afterwards.
-
-“Cousin of one of my parishioners. I do not consider her choice of a
-piece happy. Beethoven is so usually simple and direct in his appeal
-that it is sheer perversity to choose a thing like that, which, if
-anything, disturbs.”
-
-“Introduce me.”
-
-“She will be delighted. She and Miss Bartlett are full of the praises
-of your sermon.”
-
-“My sermon?” cried Mr. Beebe. “Why ever did she listen to it?”
-
-When he was introduced he understood why, for Miss Honeychurch,
-disjoined from her music stool, was only a young lady with a quantity
-of dark hair and a very pretty, pale, undeveloped face. She loved going
-to concerts, she loved stopping with her cousin, she loved iced coffee
-and meringues. He did not doubt that she loved his sermon also. But
-before he left Tunbridge Wells he made a remark to the vicar, which he
-now made to Lucy herself when she closed the little piano and moved
-dreamily towards him:
-
-“If Miss Honeychurch ever takes to live as she plays, it will be very
-exciting both for us and for her.”
-
-Lucy at once re-entered daily life.
-
-“Oh, what a funny thing! Some one said just the same to mother, and she
-said she trusted I should never live a duet.”
-
-“Doesn’t Mrs. Honeychurch like music?”
-
-“She doesn’t mind it. But she doesn’t like one to get excited over
-anything; she thinks I am silly about it. She thinks—I can’t make out.
-Once, you know, I said that I liked my own playing better than any
-one’s. She has never got over it. Of course, I didn’t mean that I
-played well; I only meant—”
-
-“Of course,” said he, wondering why she bothered to explain.
-
-“Music—” said Lucy, as if attempting some generality. She could not
-complete it, and looked out absently upon Italy in the wet. The whole
-life of the South was disorganized, and the most graceful nation in
-Europe had turned into formless lumps of clothes.
-
-The street and the river were dirty yellow, the bridge was dirty grey,
-and the hills were dirty purple. Somewhere in their folds were
-concealed Miss Lavish and Miss Bartlett, who had chosen this afternoon
-to visit the Torre del Gallo.
-
-“What about music?” said Mr. Beebe.
-
-“Poor Charlotte will be sopped,” was Lucy’s reply.
-
-The expedition was typical of Miss Bartlett, who would return cold,
-tired, hungry, and angelic, with a ruined skirt, a pulpy Baedeker, and
-a tickling cough in her throat. On another day, when the whole world
-was singing and the air ran into the mouth, like wine, she would refuse
-to stir from the drawing-room, saying that she was an old thing, and no
-fit companion for a hearty girl.
-
-“Miss Lavish has led your cousin astray. She hopes to find the true
-Italy in the wet I believe.”
-
-“Miss Lavish is so original,” murmured Lucy. This was a stock remark,
-the supreme achievement of the Pension Bertolini in the way of
-definition. Miss Lavish was so original. Mr. Beebe had his doubts, but
-they would have been put down to clerical narrowness. For that, and for
-other reasons, he held his peace.
-
-“Is it true,” continued Lucy in awe-struck tone, “that Miss Lavish is
-writing a book?”
-
-“They do say so.”
-
-“What is it about?”
-
-“It will be a novel,” replied Mr. Beebe, “dealing with modern Italy.
-Let me refer you for an account to Miss Catharine Alan, who uses words
-herself more admirably than any one I know.”
-
-“I wish Miss Lavish would tell me herself. We started such friends. But
-I don’t think she ought to have run away with Baedeker that morning in
-Santa Croce. Charlotte was most annoyed at finding me practically
-alone, and so I couldn’t help being a little annoyed with Miss Lavish.”
-
-“The two ladies, at all events, have made it up.”
-
-He was interested in the sudden friendship between women so apparently
-dissimilar as Miss Bartlett and Miss Lavish. They were always in each
-other’s company, with Lucy a slighted third. Miss Lavish he believed he
-understood, but Miss Bartlett might reveal unknown depths of
-strangeness, though not perhaps, of meaning. Was Italy deflecting her
-from the path of prim chaperon, which he had assigned to her at
-Tunbridge Wells? All his life he had loved to study maiden ladies; they
-were his specialty, and his profession had provided him with ample
-opportunities for the work. Girls like Lucy were charming to look at,
-but Mr. Beebe was, from rather profound reasons, somewhat chilly in his
-attitude towards the other sex, and preferred to be interested rather
-than enthralled.
-
-Lucy, for the third time, said that poor Charlotte would be sopped. The
-Arno was rising in flood, washing away the traces of the little carts
-upon the foreshore. But in the south-west there had appeared a dull
-haze of yellow, which might mean better weather if it did not mean
-worse. She opened the window to inspect, and a cold blast entered the
-room, drawing a plaintive cry from Miss Catharine Alan, who entered at
-the same moment by the door.
-
-“Oh, dear Miss Honeychurch, you will catch a chill! And Mr. Beebe here
-besides. Who would suppose this is Italy? There is my sister actually
-nursing the hot-water can; no comforts or proper provisions.”
-
-She sidled towards them and sat down, self-conscious as she always was
-on entering a room which contained one man, or a man and one woman.
-
-“I could hear your beautiful playing, Miss Honeychurch, though I was in
-my room with the door shut. Doors shut; indeed, most necessary. No one
-has the least idea of privacy in this country. And one person catches
-it from another.”
-
-Lucy answered suitably. Mr. Beebe was not able to tell the ladies of
-his adventure at Modena, where the chambermaid burst in upon him in his
-bath, exclaiming cheerfully, “Fa niente, sono vecchia.” He contented
-himself with saying: “I quite agree with you, Miss Alan. The Italians
-are a most unpleasant people. They pry everywhere, they see everything,
-and they know what we want before we know it ourselves. We are at their
-mercy. They read our thoughts, they foretell our desires. From the
-cab-driver down to—to Giotto, they turn us inside out, and I resent it.
-Yet in their heart of hearts they are—how superficial! They have no
-conception of the intellectual life. How right is Signora Bertolini,
-who exclaimed to me the other day: ‘Ho, Mr. Beebe, if you knew what I
-suffer over the children’s edjucaishion. _Hi_ won’t ’ave my little
-Victorier taught by a hignorant Italian what can’t explain nothink!’”
-
-Miss Alan did not follow, but gathered that she was being mocked in an
-agreeable way. Her sister was a little disappointed in Mr. Beebe,
-having expected better things from a clergyman whose head was bald and
-who wore a pair of russet whiskers. Indeed, who would have supposed
-that tolerance, sympathy, and a sense of humour would inhabit that
-militant form?
-
-In the midst of her satisfaction she continued to sidle, and at last
-the cause was disclosed. From the chair beneath her she extracted a
-gun-metal cigarette-case, on which were powdered in turquoise the
-initials “E. L.”
-
-“That belongs to Lavish.” said the clergyman. “A good fellow, Lavish,
-but I wish she’d start a pipe.”
-
-“Oh, Mr. Beebe,” said Miss Alan, divided between awe and mirth.
-“Indeed, though it is dreadful for her to smoke, it is not quite as
-dreadful as you suppose. She took to it, practically in despair, after
-her life’s work was carried away in a landslip. Surely that makes it
-more excusable.”
-
-“What was that?” asked Lucy.
-
-Mr. Beebe sat back complacently, and Miss Alan began as follows: “It
-was a novel—and I am afraid, from what I can gather, not a very nice
-novel. It is so sad when people who have abilities misuse them, and I
-must say they nearly always do. Anyhow, she left it almost finished in
-the Grotto of the Calvary at the Capuccini Hotel at Amalfi while she
-went for a little ink. She said: ‘Can I have a little ink, please?’ But
-you know what Italians are, and meanwhile the Grotto fell roaring on to
-the beach, and the saddest thing of all is that she cannot remember
-what she has written. The poor thing was very ill after it, and so got
-tempted into cigarettes. It is a great secret, but I am glad to say
-that she is writing another novel. She told Teresa and Miss Pole the
-other day that she had got up all the local colour—this novel is to be
-about modern Italy; the other was historical—but that she could not
-start till she had an idea. First she tried Perugia for an inspiration,
-then she came here—this must on no account get round. And so cheerful
-through it all! I cannot help thinking that there is something to
-admire in everyone, even if you do not approve of them.”
-
-Miss Alan was always thus being charitable against her better
-judgement. A delicate pathos perfumed her disconnected remarks, giving
-them unexpected beauty, just as in the decaying autumn woods there
-sometimes rise odours reminiscent of spring. She felt she had made
-almost too many allowances, and apologized hurriedly for her
-toleration.
-
-“All the same, she is a little too—I hardly like to say unwomanly, but
-she behaved most strangely when the Emersons arrived.”
-
-Mr. Beebe smiled as Miss Alan plunged into an anecdote which he knew
-she would be unable to finish in the presence of a gentleman.
-
-“I don’t know, Miss Honeychurch, if you have noticed that Miss Pole,
-the lady who has so much yellow hair, takes lemonade. That old Mr.
-Emerson, who puts things very strangely—”
-
-Her jaw dropped. She was silent. Mr. Beebe, whose social resources were
-endless, went out to order some tea, and she continued to Lucy in a
-hasty whisper:
-
-“Stomach. He warned Miss Pole of her stomach-acidity, he called it—and
-he may have meant to be kind. I must say I forgot myself and laughed;
-it was so sudden. As Teresa truly said, it was no laughing matter. But
-the point is that Miss Lavish was positively _attracted_ by his
-mentioning S., and said she liked plain speaking, and meeting different
-grades of thought. She thought they were commercial
-travellers—‘drummers’ was the word she used—and all through dinner she
-tried to prove that England, our great and beloved country, rests on
-nothing but commerce. Teresa was very much annoyed, and left the table
-before the cheese, saying as she did so: ‘There, Miss Lavish, is one
-who can confute you better than I,’ and pointed to that beautiful
-picture of Lord Tennyson. Then Miss Lavish said: ‘Tut! The early
-Victorians.’ Just imagine! ‘Tut! The early Victorians.’ My sister had
-gone, and I felt bound to speak. I said: ‘Miss Lavish, _I_ am an early
-Victorian; at least, that is to say, I will hear no breath of censure
-against our dear Queen.’ It was horrible speaking. I reminded her how
-the Queen had been to Ireland when she did not want to go, and I must
-say she was dumbfounded, and made no reply. But, unluckily, Mr. Emerson
-overheard this part, and called in his deep voice: ‘Quite so, quite so!
-I honour the woman for her Irish visit.’ The woman! I tell things so
-badly; but you see what a tangle we were in by this time, all on
-account of S. having been mentioned in the first place. But that was
-not all. After dinner Miss Lavish actually came up and said: ‘Miss
-Alan, I am going into the smoking-room to talk to those two nice men.
-Come, too.’ Needless to say, I refused such an unsuitable invitation,
-and she had the impertinence to tell me that it would broaden my ideas,
-and said that she had four brothers, all University men, except one who
-was in the army, who always made a point of talking to commercial
-travellers.”
-
-“Let me finish the story,” said Mr. Beebe, who had returned.
-
-“Miss Lavish tried Miss Pole, myself, everyone, and finally said: ‘I
-shall go alone.’ She went. At the end of five minutes she returned
-unobtrusively with a green baize board, and began playing patience.”
-
-“Whatever happened?” cried Lucy.
-
-“No one knows. No one will ever know. Miss Lavish will never dare to
-tell, and Mr. Emerson does not think it worth telling.”
-
-“Mr. Beebe—old Mr. Emerson, is he nice or not nice? I do so want to
-know.”
-
-Mr. Beebe laughed and suggested that she should settle the question for
-herself.
-
-“No; but it is so difficult. Sometimes he is so silly, and then I do
-not mind him. Miss Alan, what do you think? Is he nice?”
-
-The little old lady shook her head, and sighed disapprovingly. Mr.
-Beebe, whom the conversation amused, stirred her up by saying:
-
-“I consider that you are bound to class him as nice, Miss Alan, after
-that business of the violets.”
-
-“Violets? Oh, dear! Who told you about the violets? How do things get
-round? A pension is a bad place for gossips. No, I cannot forget how
-they behaved at Mr. Eager’s lecture at Santa Croce. Oh, poor Miss
-Honeychurch! It really was too bad. No, I have quite changed. I do
-_not_ like the Emersons. They are _not_ nice.”
-
-Mr. Beebe smiled nonchalantly. He had made a gentle effort to introduce
-the Emersons into Bertolini society, and the effort had failed. He was
-almost the only person who remained friendly to them. Miss Lavish, who
-represented intellect, was avowedly hostile, and now the Miss Alans,
-who stood for good breeding, were following her. Miss Bartlett,
-smarting under an obligation, would scarcely be civil. The case of Lucy
-was different. She had given him a hazy account of her adventures in
-Santa Croce, and he gathered that the two men had made a curious and
-possibly concerted attempt to annex her, to show her the world from
-their own strange standpoint, to interest her in their private sorrows
-and joys. This was impertinent; he did not wish their cause to be
-championed by a young girl: he would rather it should fail. After all,
-he knew nothing about them, and pension joys, pension sorrows, are
-flimsy things; whereas Lucy would be his parishioner.
-
-Lucy, with one eye upon the weather, finally said that she thought the
-Emersons were nice; not that she saw anything of them now. Even their
-seats at dinner had been moved.
-
-“But aren’t they always waylaying you to go out with them, dear?” said
-the little lady inquisitively.
-
-“Only once. Charlotte didn’t like it, and said something—quite
-politely, of course.”
-
-“Most right of her. They don’t understand our ways. They must find
-their level.”
-
-Mr. Beebe rather felt that they had gone under. They had given up their
-attempt—if it was one—to conquer society, and now the father was almost
-as silent as the son. He wondered whether he would not plan a pleasant
-day for these folk before they left—some expedition, perhaps, with Lucy
-well chaperoned to be nice to them. It was one of Mr. Beebe’s chief
-pleasures to provide people with happy memories.
-
-Evening approached while they chatted; the air became brighter; the
-colours on the trees and hills were purified, and the Arno lost its
-muddy solidity and began to twinkle. There were a few streaks of
-bluish-green among the clouds, a few patches of watery light upon the
-earth, and then the dripping façade of San Miniato shone brilliantly in
-the declining sun.
-
-“Too late to go out,” said Miss Alan in a voice of relief. “All the
-galleries are shut.”
-
-“I think I shall go out,” said Lucy. “I want to go round the town in
-the circular tram—on the platform by the driver.”
-
-Her two companions looked grave. Mr. Beebe, who felt responsible for
-her in the absence of Miss Bartlett, ventured to say:
-
-“I wish we could. Unluckily I have letters. If you do want to go out
-alone, won’t you be better on your feet?”
-
-“Italians, dear, you know,” said Miss Alan.
-
-“Perhaps I shall meet someone who reads me through and through!”
-
-But they still looked disapproval, and she so far conceded to Mr. Beebe
-as to say that she would only go for a little walk, and keep to the
-street frequented by tourists.
-
-“She oughtn’t really to go at all,” said Mr. Beebe, as they watched her
-from the window, “and she knows it. I put it down to too much
-Beethoven.”
-
-
-
-
-Chapter IV
-Fourth Chapter
-
-
-Mr. Beebe was right. Lucy never knew her desires so clearly as after
-music. She had not really appreciated the clergyman’s wit, nor the
-suggestive twitterings of Miss Alan. Conversation was tedious; she
-wanted something big, and she believed that it would have come to her
-on the wind-swept platform of an electric tram. This she might not
-attempt. It was unladylike. Why? Why were most big things unladylike?
-Charlotte had once explained to her why. It was not that ladies were
-inferior to men; it was that they were different. Their mission was to
-inspire others to achievement rather than to achieve themselves.
-Indirectly, by means of tact and a spotless name, a lady could
-accomplish much. But if she rushed into the fray herself she would be
-first censured, then despised, and finally ignored. Poems had been
-written to illustrate this point.
-
-There is much that is immortal in this medieval lady. The dragons have
-gone, and so have the knights, but still she lingers in our midst. She
-reigned in many an early Victorian castle, and was Queen of much early
-Victorian song. It is sweet to protect her in the intervals of
-business, sweet to pay her honour when she has cooked our dinner well.
-But alas! the creature grows degenerate. In her heart also there are
-springing up strange desires. She too is enamoured of heavy winds, and
-vast panoramas, and green expanses of the sea. She has marked the
-kingdom of this world, how full it is of wealth, and beauty, and war—a
-radiant crust, built around the central fires, spinning towards the
-receding heavens. Men, declaring that she inspires them to it, move
-joyfully over the surface, having the most delightful meetings with
-other men, happy, not because they are masculine, but because they are
-alive. Before the show breaks up she would like to drop the august
-title of the Eternal Woman, and go there as her transitory self.
-
-Lucy does not stand for the medieval lady, who was rather an ideal to
-which she was bidden to lift her eyes when feeling serious. Nor has she
-any system of revolt. Here and there a restriction annoyed her
-particularly, and she would transgress it, and perhaps be sorry that
-she had done so. This afternoon she was peculiarly restive. She would
-really like to do something of which her well-wishers disapproved. As
-she might not go on the electric tram, she went to Alinari’s shop.
-
-There she bought a photograph of Botticelli’s “Birth of Venus.” Venus,
-being a pity, spoilt the picture, otherwise so charming, and Miss
-Bartlett had persuaded her to do without it. (A pity in art of course
-signified the nude.) Giorgione’s “Tempesta,” the “Idolino,” some of the
-Sistine frescoes and the Apoxyomenos, were added to it. She felt a
-little calmer then, and bought Fra Angelico’s “Coronation,” Giotto’s
-“Ascension of St. John,” some Della Robbia babies, and some Guido Reni
-Madonnas. For her taste was catholic, and she extended uncritical
-approval to every well-known name.
-
-But though she spent nearly seven lire, the gates of liberty seemed
-still unopened. She was conscious of her discontent; it was new to her
-to be conscious of it. “The world,” she thought, “is certainly full of
-beautiful things, if only I could come across them.” It was not
-surprising that Mrs. Honeychurch disapproved of music, declaring that
-it always left her daughter peevish, unpractical, and touchy.
-
-“Nothing ever happens to me,” she reflected, as she entered the Piazza
-Signoria and looked nonchalantly at its marvels, now fairly familiar to
-her. The great square was in shadow; the sunshine had come too late to
-strike it. Neptune was already unsubstantial in the twilight, half god,
-half ghost, and his fountain plashed dreamily to the men and satyrs who
-idled together on its marge. The Loggia showed as the triple entrance
-of a cave, wherein many a deity, shadowy, but immortal, looking forth
-upon the arrivals and departures of mankind. It was the hour of
-unreality—the hour, that is, when unfamiliar things are real. An older
-person at such an hour and in such a place might think that sufficient
-was happening to him, and rest content. Lucy desired more.
-
-She fixed her eyes wistfully on the tower of the palace, which rose out
-of the lower darkness like a pillar of roughened gold. It seemed no
-longer a tower, no longer supported by earth, but some unattainable
-treasure throbbing in the tranquil sky. Its brightness mesmerized her,
-still dancing before her eyes when she bent them to the ground and
-started towards home.
-
-Then something did happen.
-
-Two Italians by the Loggia had been bickering about a debt. “Cinque
-lire,” they had cried, “cinque lire!” They sparred at each other, and
-one of them was hit lightly upon the chest. He frowned; he bent towards
-Lucy with a look of interest, as if he had an important message for
-her. He opened his lips to deliver it, and a stream of red came out
-between them and trickled down his unshaven chin.
-
-That was all. A crowd rose out of the dusk. It hid this extraordinary
-man from her, and bore him away to the fountain. Mr. George Emerson
-happened to be a few paces away, looking at her across the spot where
-the man had been. How very odd! Across something. Even as she caught
-sight of him he grew dim; the palace itself grew dim, swayed above her,
-fell on to her softly, slowly, noiselessly, and the sky fell with it.
-
-She thought: “Oh, what have I done?”
-
-“Oh, what have I done?” she murmured, and opened her eyes.
-
-George Emerson still looked at her, but not across anything. She had
-complained of dullness, and lo! one man was stabbed, and another held
-her in his arms.
-
-They were sitting on some steps in the Uffizi Arcade. He must have
-carried her. He rose when she spoke, and began to dust his knees. She
-repeated:
-
-“Oh, what have I done?”
-
-“You fainted.”
-
-“I—I am very sorry.”
-
-“How are you now?”
-
-“Perfectly well—absolutely well.” And she began to nod and smile.
-
-“Then let us come home. There’s no point in our stopping.”
-
-He held out his hand to pull her up. She pretended not to see it. The
-cries from the fountain—they had never ceased—rang emptily. The whole
-world seemed pale and void of its original meaning.
-
-“How very kind you have been! I might have hurt myself falling. But now
-I am well. I can go alone, thank you.”
-
-His hand was still extended.
-
-“Oh, my photographs!” she exclaimed suddenly.
-
-“What photographs?”
-
-“I bought some photographs at Alinari’s. I must have dropped them out
-there in the square.” She looked at him cautiously. “Would you add to
-your kindness by fetching them?”
-
-He added to his kindness. As soon as he had turned his back, Lucy arose
-with the running of a maniac and stole down the arcade towards the
-Arno.
-
-“Miss Honeychurch!”
-
-She stopped with her hand on her heart.
-
-“You sit still; you aren’t fit to go home alone.”
-
-“Yes, I am, thank you so very much.”
-
-“No, you aren’t. You’d go openly if you were.”
-
-“But I had rather—”
-
-“Then I don’t fetch your photographs.”
-
-“I had rather be alone.”
-
-He said imperiously: “The man is dead—the man is probably dead; sit
-down till you are rested.” She was bewildered, and obeyed him. “And
-don’t move till I come back.”
-
-In the distance she saw creatures with black hoods, such as appear in
-dreams. The palace tower had lost the reflection of the declining day,
-and joined itself to earth. How should she talk to Mr. Emerson when he
-returned from the shadowy square? Again the thought occurred to her,
-“Oh, what have I done?”—the thought that she, as well as the dying man,
-had crossed some spiritual boundary.
-
-He returned, and she talked of the murder. Oddly enough, it was an easy
-topic. She spoke of the Italian character; she became almost garrulous
-over the incident that had made her faint five minutes before. Being
-strong physically, she soon overcame the horror of blood. She rose
-without his assistance, and though wings seemed to flutter inside her,
-she walked firmly enough towards the Arno. There a cabman signalled to
-them; they refused him.
-
-“And the murderer tried to kiss him, you say—how very odd Italians
-are!—and gave himself up to the police! Mr. Beebe was saying that
-Italians know everything, but I think they are rather childish. When my
-cousin and I were at the Pitti yesterday—What was that?”
-
-He had thrown something into the stream.
-
-“What did you throw in?”
-
-“Things I didn’t want,” he said crossly.
-
-“Mr. Emerson!”
-
-“Well?”
-
-“Where are the photographs?”
-
-He was silent.
-
-“I believe it was my photographs that you threw away.”
-
-“I didn’t know what to do with them,” he cried, and his voice was that
-of an anxious boy. Her heart warmed towards him for the first time.
-“They were covered with blood. There! I’m glad I’ve told you; and all
-the time we were making conversation I was wondering what to do with
-them.” He pointed down-stream. “They’ve gone.” The river swirled under
-the bridge, “I did mind them so, and one is so foolish, it seemed
-better that they should go out to the sea—I don’t know; I may just mean
-that they frightened me.” Then the boy verged into a man. “For
-something tremendous has happened; I must face it without getting
-muddled. It isn’t exactly that a man has died.”
-
-Something warned Lucy that she must stop him.
-
-“It has happened,” he repeated, “and I mean to find out what it is.”
-
-“Mr. Emerson—”
-
-He turned towards her frowning, as if she had disturbed him in some
-abstract quest.
-
-“I want to ask you something before we go in.”
-
-They were close to their pension. She stopped and leant her elbows
-against the parapet of the embankment. He did likewise. There is at
-times a magic in identity of position; it is one of the things that
-have suggested to us eternal comradeship. She moved her elbows before
-saying:
-
-“I have behaved ridiculously.”
-
-He was following his own thoughts.
-
-“I was never so much ashamed of myself in my life; I cannot think what
-came over me.”
-
-“I nearly fainted myself,” he said; but she felt that her attitude
-repelled him.
-
-“Well, I owe you a thousand apologies.”
-
-“Oh, all right.”
-
-“And—this is the real point—you know how silly people are
-gossiping—ladies especially, I am afraid—you understand what I mean?”
-
-“I’m afraid I don’t.”
-
-“I mean, would you not mention it to any one, my foolish behaviour?”
-
-“Your behaviour? Oh, yes, all right—all right.”
-
-“Thank you so much. And would you—”
-
-She could not carry her request any further. The river was rushing
-below them, almost black in the advancing night. He had thrown her
-photographs into it, and then he had told her the reason. It struck her
-that it was hopeless to look for chivalry in such a man. He would do
-her no harm by idle gossip; he was trustworthy, intelligent, and even
-kind; he might even have a high opinion of her. But he lacked chivalry;
-his thoughts, like his behaviour, would not be modified by awe. It was
-useless to say to him, “And would you—” and hope that he would complete
-the sentence for himself, averting his eyes from her nakedness like the
-knight in that beautiful picture. She had been in his arms, and he
-remembered it, just as he remembered the blood on the photographs that
-she had bought in Alinari’s shop. It was not exactly that a man had
-died; something had happened to the living: they had come to a
-situation where character tells, and where childhood enters upon the
-branching paths of Youth.
-
-“Well, thank you so much,” she repeated, “How quickly these accidents
-do happen, and then one returns to the old life!”
-
-“I don’t.”
-
-Anxiety moved her to question him.
-
-His answer was puzzling: “I shall probably want to live.”
-
-“But why, Mr. Emerson? What do you mean?”
-
-“I shall want to live, I say.”
-
-Leaning her elbows on the parapet, she contemplated the River Arno,
-whose roar was suggesting some unexpected melody to her ears.
-
-
-
-
-Chapter V
-Possibilities of a Pleasant Outing
-
-
-It was a family saying that “you never knew which way Charlotte
-Bartlett would turn.” She was perfectly pleasant and sensible over
-Lucy’s adventure, found the abridged account of it quite adequate, and
-paid suitable tribute to the courtesy of Mr. George Emerson. She and
-Miss Lavish had had an adventure also. They had been stopped at the
-Dazio coming back, and the young officials there, who seemed impudent
-and _désœuvré_, had tried to search their reticules for provisions. It
-might have been most unpleasant. Fortunately Miss Lavish was a match
-for any one.
-
-For good or for evil, Lucy was left to face her problem alone. None of
-her friends had seen her, either in the Piazza or, later on, by the
-embankment. Mr. Beebe, indeed, noticing her startled eyes at
-dinner-time, had again passed to himself the remark of “Too much
-Beethoven.” But he only supposed that she was ready for an adventure,
-not that she had encountered it. This solitude oppressed her; she was
-accustomed to have her thoughts confirmed by others or, at all events,
-contradicted; it was too dreadful not to know whether she was thinking
-right or wrong.
-
-At breakfast next morning she took decisive action. There were two
-plans between which she had to choose. Mr. Beebe was walking up to the
-Torre del Gallo with the Emersons and some American ladies. Would Miss
-Bartlett and Miss Honeychurch join the party? Charlotte declined for
-herself; she had been there in the rain the previous afternoon. But she
-thought it an admirable idea for Lucy, who hated shopping, changing
-money, fetching letters, and other irksome duties—all of which Miss
-Bartlett must accomplish this morning and could easily accomplish
-alone.
-
-“No, Charlotte!” cried the girl, with real warmth. “It’s very kind of
-Mr. Beebe, but I am certainly coming with you. I had much rather.”
-
-“Very well, dear,” said Miss Bartlett, with a faint flush of pleasure
-that called forth a deep flush of shame on the cheeks of Lucy. How
-abominably she behaved to Charlotte, now as always! But now she should
-alter. All morning she would be really nice to her.
-
-She slipped her arm into her cousin’s, and they started off along the
-Lung’ Arno. The river was a lion that morning in strength, voice, and
-colour. Miss Bartlett insisted on leaning over the parapet to look at
-it. She then made her usual remark, which was “How I do wish Freddy and
-your mother could see this, too!”
-
-Lucy fidgeted; it was tiresome of Charlotte to have stopped exactly
-where she did.
-
-“Look, Lucia! Oh, you are watching for the Torre del Gallo party. I
-feared you would repent you of your choice.”
-
-Serious as the choice had been, Lucy did not repent. Yesterday had been
-a muddle—queer and odd, the kind of thing one could not write down
-easily on paper—but she had a feeling that Charlotte and her shopping
-were preferable to George Emerson and the summit of the Torre del
-Gallo. Since she could not unravel the tangle, she must take care not
-to re-enter it. She could protest sincerely against Miss Bartlett’s
-insinuations.
-
-But though she had avoided the chief actor, the scenery unfortunately
-remained. Charlotte, with the complacency of fate, led her from the
-river to the Piazza Signoria. She could not have believed that stones,
-a Loggia, a fountain, a palace tower, would have such significance. For
-a moment she understood the nature of ghosts.
-
-The exact site of the murder was occupied, not by a ghost, but by Miss
-Lavish, who had the morning newspaper in her hand. She hailed them
-briskly. The dreadful catastrophe of the previous day had given her an
-idea which she thought would work up into a book.
-
-“Oh, let me congratulate you!” said Miss Bartlett. “After your despair
-of yesterday! What a fortunate thing!”
-
-“Aha! Miss Honeychurch, come you here I am in luck. Now, you are to
-tell me absolutely everything that you saw from the beginning.” Lucy
-poked at the ground with her parasol.
-
-“But perhaps you would rather not?”
-
-“I’m sorry—if you could manage without it, I think I would rather not.”
-
-The elder ladies exchanged glances, not of disapproval; it is suitable
-that a girl should feel deeply.
-
-“It is I who am sorry,” said Miss Lavish. “We literary hacks are
-shameless creatures. I believe there’s no secret of the human heart
-into which we wouldn’t pry.”
-
-She marched cheerfully to the fountain and back, and did a few
-calculations in realism. Then she said that she had been in the Piazza
-since eight o’clock collecting material. A good deal of it was
-unsuitable, but of course one always had to adapt. The two men had
-quarrelled over a five-franc note. For the five-franc note she should
-substitute a young lady, which would raise the tone of the tragedy, and
-at the same time furnish an excellent plot.
-
-“What is the heroine’s name?” asked Miss Bartlett.
-
-“Leonora,” said Miss Lavish; her own name was Eleanor.
-
-“I do hope she’s nice.”
-
-That desideratum would not be omitted.
-
-“And what is the plot?”
-
-Love, murder, abduction, revenge, was the plot. But it all came while
-the fountain plashed to the satyrs in the morning sun.
-
-“I hope you will excuse me for boring on like this,” Miss Lavish
-concluded. “It is so tempting to talk to really sympathetic people. Of
-course, this is the barest outline. There will be a deal of local
-colouring, descriptions of Florence and the neighbourhood, and I shall
-also introduce some humorous characters. And let me give you all fair
-warning: I intend to be unmerciful to the British tourist.”
-
-“Oh, you wicked woman,” cried Miss Bartlett. “I am sure you are
-thinking of the Emersons.”
-
-Miss Lavish gave a Machiavellian smile.
-
-“I confess that in Italy my sympathies are not with my own countrymen.
-It is the neglected Italians who attract me, and whose lives I am going
-to paint so far as I can. For I repeat and I insist, and I have always
-held most strongly, that a tragedy such as yesterday’s is not the less
-tragic because it happened in humble life.”
-
-There was a fitting silence when Miss Lavish had concluded. Then the
-cousins wished success to her labours, and walked slowly away across
-the square.
-
-“She is my idea of a really clever woman,” said Miss Bartlett. “That
-last remark struck me as so particularly true. It should be a most
-pathetic novel.”
-
-Lucy assented. At present her great aim was not to get put into it. Her
-perceptions this morning were curiously keen, and she believed that
-Miss Lavish had her on trial for an _ingenué_.
-
-“She is emancipated, but only in the very best sense of the word,”
-continued Miss Bartlett slowly. “None but the superficial would be
-shocked at her. We had a long talk yesterday. She believes in justice
-and truth and human interest. She told me also that she has a high
-opinion of the destiny of woman—Mr. Eager! Why, how nice! What a
-pleasant surprise!”
-
-“Ah, not for me,” said the chaplain blandly, “for I have been watching
-you and Miss Honeychurch for quite a little time.”
-
-“We were chatting to Miss Lavish.”
-
-His brow contracted.
-
-“So I saw. Were you indeed? Andate via! sono occupato!” The last remark
-was made to a vender of panoramic photographs who was approaching with
-a courteous smile. “I am about to venture a suggestion. Would you and
-Miss Honeychurch be disposed to join me in a drive some day this week—a
-drive in the hills? We might go up by Fiesole and back by Settignano.
-There is a point on that road where we could get down and have an
-hour’s ramble on the hillside. The view thence of Florence is most
-beautiful—far better than the hackneyed view of Fiesole. It is the view
-that Alessio Baldovinetti is fond of introducing into his pictures.
-That man had a decided feeling for landscape. Decidedly. But who looks
-at it to-day? Ah, the world is too much for us.”
-
-Miss Bartlett had not heard of Alessio Baldovinetti, but she knew that
-Mr. Eager was no commonplace chaplain. He was a member of the
-residential colony who had made Florence their home. He knew the people
-who never walked about with Baedekers, who had learnt to take a siesta
-after lunch, who took drives the pension tourists had never heard of,
-and saw by private influence galleries which were closed to them.
-Living in delicate seclusion, some in furnished flats, others in
-Renaissance villas on Fiesole’s slope, they read, wrote, studied, and
-exchanged ideas, thus attaining to that intimate knowledge, or rather
-perception, of Florence which is denied to all who carry in their
-pockets the coupons of Cook.
-
-Therefore an invitation from the chaplain was something to be proud of.
-Between the two sections of his flock he was often the only link, and
-it was his avowed custom to select those of his migratory sheep who
-seemed worthy, and give them a few hours in the pastures of the
-permanent. Tea at a Renaissance villa? Nothing had been said about it
-yet. But if it did come to that—how Lucy would enjoy it!
-
-A few days ago and Lucy would have felt the same. But the joys of life
-were grouping themselves anew. A drive in the hills with Mr. Eager and
-Miss Bartlett—even if culminating in a residential tea-party—was no
-longer the greatest of them. She echoed the raptures of Charlotte
-somewhat faintly. Only when she heard that Mr. Beebe was also coming
-did her thanks become more sincere.
-
-“So we shall be a _partie carrée_,” said the chaplain. “In these days
-of toil and tumult one has great needs of the country and its message
-of purity. Andate via! andate presto, presto! Ah, the town! Beautiful
-as it is, it is the town.”
-
-They assented.
-
-“This very square—so I am told—witnessed yesterday the most sordid of
-tragedies. To one who loves the Florence of Dante and Savonarola there
-is something portentous in such desecration—portentous and
-humiliating.”
-
-“Humiliating indeed,” said Miss Bartlett. “Miss Honeychurch happened to
-be passing through as it happened. She can hardly bear to speak of it.”
-She glanced at Lucy proudly.
-
-“And how came we to have you here?” asked the chaplain paternally.
-
-Miss Bartlett’s recent liberalism oozed away at the question. “Do not
-blame her, please, Mr. Eager. The fault is mine: I left her
-unchaperoned.”
-
-“So you were here alone, Miss Honeychurch?” His voice suggested
-sympathetic reproof but at the same time indicated that a few harrowing
-details would not be unacceptable. His dark, handsome face drooped
-mournfully towards her to catch her reply.
-
-“Practically.”
-
-“One of our pension acquaintances kindly brought her home,” said Miss
-Bartlett, adroitly concealing the sex of the preserver.
-
-“For her also it must have been a terrible experience. I trust that
-neither of you was at all—that it was not in your immediate proximity?”
-
-Of the many things Lucy was noticing to-day, not the least remarkable
-was this: the ghoulish fashion in which respectable people will nibble
-after blood. George Emerson had kept the subject strangely pure.
-
-“He died by the fountain, I believe,” was her reply.
-
-“And you and your friend—”
-
-“Were over at the Loggia.”
-
-“That must have saved you much. You have not, of course, seen the
-disgraceful illustrations which the gutter Press—This man is a public
-nuisance; he knows that I am a resident perfectly well, and yet he goes
-on worrying me to buy his vulgar views.”
-
-Surely the vendor of photographs was in league with Lucy—in the eternal
-league of Italy with youth. He had suddenly extended his book before
-Miss Bartlett and Mr. Eager, binding their hands together by a long
-glossy ribbon of churches, pictures, and views.
-
-“This is too much!” cried the chaplain, striking petulantly at one of
-Fra Angelico’s angels. She tore. A shrill cry rose from the vendor. The
-book it seemed, was more valuable than one would have supposed.
-
-“Willingly would I purchase—” began Miss Bartlett.
-
-“Ignore him,” said Mr. Eager sharply, and they all walked rapidly away
-from the square.
-
-But an Italian can never be ignored, least of all when he has a
-grievance. His mysterious persecution of Mr. Eager became relentless;
-the air rang with his threats and lamentations. He appealed to Lucy;
-would not she intercede? He was poor—he sheltered a family—the tax on
-bread. He waited, he gibbered, he was recompensed, he was dissatisfied,
-he did not leave them until he had swept their minds clean of all
-thoughts whether pleasant or unpleasant.
-
-Shopping was the topic that now ensued. Under the chaplain’s guidance
-they selected many hideous presents and mementoes—florid little
-picture-frames that seemed fashioned in gilded pastry; other little
-frames, more severe, that stood on little easels, and were carven out
-of oak; a blotting book of vellum; a Dante of the same material; cheap
-mosaic brooches, which the maids, next Christmas, would never tell from
-real; pins, pots, heraldic saucers, brown art-photographs; Eros and
-Psyche in alabaster; St. Peter to match—all of which would have cost
-less in London.
-
-This successful morning left no pleasant impressions on Lucy. She had
-been a little frightened, both by Miss Lavish and by Mr. Eager, she
-knew not why. And as they frightened her, she had, strangely enough,
-ceased to respect them. She doubted that Miss Lavish was a great
-artist. She doubted that Mr. Eager was as full of spirituality and
-culture as she had been led to suppose. They were tried by some new
-test, and they were found wanting. As for Charlotte—as for Charlotte
-she was exactly the same. It might be possible to be nice to her; it
-was impossible to love her.
-
-“The son of a labourer; I happen to know it for a fact. A mechanic of
-some sort himself when he was young; then he took to writing for the
-Socialistic Press. I came across him at Brixton.”
-
-They were talking about the Emersons.
-
-“How wonderfully people rise in these days!” sighed Miss Bartlett,
-fingering a model of the leaning Tower of Pisa.
-
-“Generally,” replied Mr. Eager, “one has only sympathy for their
-success. The desire for education and for social advance—in these
-things there is something not wholly vile. There are some working men
-whom one would be very willing to see out here in Florence—little as
-they would make of it.”
-
-“Is he a journalist now?” Miss Bartlett asked.
-
-“He is not; he made an advantageous marriage.”
-
-He uttered this remark with a voice full of meaning, and ended with a
-sigh.
-
-“Oh, so he has a wife.”
-
-“Dead, Miss Bartlett, dead. I wonder—yes I wonder how he has the
-effrontery to look me in the face, to dare to claim acquaintance with
-me. He was in my London parish long ago. The other day in Santa Croce,
-when he was with Miss Honeychurch, I snubbed him. Let him beware that
-he does not get more than a snub.”
-
-“What?” cried Lucy, flushing.
-
-“Exposure!” hissed Mr. Eager.
-
-He tried to change the subject; but in scoring a dramatic point he had
-interested his audience more than he had intended. Miss Bartlett was
-full of very natural curiosity. Lucy, though she wished never to see
-the Emersons again, was not disposed to condemn them on a single word.
-
-“Do you mean,” she asked, “that he is an irreligious man? We know that
-already.”
-
-“Lucy, dear—” said Miss Bartlett, gently reproving her cousin’s
-penetration.
-
-“I should be astonished if you knew all. The boy—an innocent child at
-the time—I will exclude. God knows what his education and his inherited
-qualities may have made him.”
-
-“Perhaps,” said Miss Bartlett, “it is something that we had better not
-hear.”
-
-“To speak plainly,” said Mr. Eager, “it is. I will say no more.” For
-the first time Lucy’s rebellious thoughts swept out in words—for the
-first time in her life.
-
-“You have said very little.”
-
-“It was my intention to say very little,” was his frigid reply.
-
-He gazed indignantly at the girl, who met him with equal indignation.
-She turned towards him from the shop counter; her breast heaved
-quickly. He observed her brow, and the sudden strength of her lips. It
-was intolerable that she should disbelieve him.
-
-“Murder, if you want to know,” he cried angrily. “That man murdered his
-wife!”
-
-“How?” she retorted.
-
-“To all intents and purposes he murdered her. That day in Santa
-Croce—did they say anything against me?”
-
-“Not a word, Mr. Eager—not a single word.”
-
-“Oh, I thought they had been libelling me to you. But I suppose it is
-only their personal charms that makes you defend them.”
-
-“I’m not defending them,” said Lucy, losing her courage, and relapsing
-into the old chaotic methods. “They’re nothing to me.”
-
-“How could you think she was defending them?” said Miss Bartlett, much
-discomfited by the unpleasant scene. The shopman was possibly
-listening.
-
-“She will find it difficult. For that man has murdered his wife in the
-sight of God.”
-
-The addition of God was striking. But the chaplain was really trying to
-qualify a rash remark. A silence followed which might have been
-impressive, but was merely awkward. Then Miss Bartlett hastily
-purchased the Leaning Tower, and led the way into the street.
-
-“I must be going,” said he, shutting his eyes and taking out his watch.
-
-Miss Bartlett thanked him for his kindness, and spoke with enthusiasm
-of the approaching drive.
-
-“Drive? Oh, is our drive to come off?”
-
-Lucy was recalled to her manners, and after a little exertion the
-complacency of Mr. Eager was restored.
-
-“Bother the drive!” exclaimed the girl, as soon as he had departed. “It
-is just the drive we had arranged with Mr. Beebe without any fuss at
-all. Why should he invite us in that absurd manner? We might as well
-invite him. We are each paying for ourselves.”
-
-Miss Bartlett, who had intended to lament over the Emersons, was
-launched by this remark into unexpected thoughts.
-
-“If that is so, dear—if the drive we and Mr. Beebe are going with Mr.
-Eager is really the same as the one we are going with Mr. Beebe, then I
-foresee a sad kettle of fish.”
-
-“How?”
-
-“Because Mr. Beebe has asked Eleanor Lavish to come, too.”
-
-“That will mean another carriage.”
-
-“Far worse. Mr. Eager does not like Eleanor. She knows it herself. The
-truth must be told; she is too unconventional for him.”
-
-They were now in the newspaper-room at the English bank. Lucy stood by
-the central table, heedless of Punch and the Graphic, trying to answer,
-or at all events to formulate the questions rioting in her brain. The
-well-known world had broken up, and there emerged Florence, a magic
-city where people thought and did the most extraordinary things.
-Murder, accusations of murder, a lady clinging to one man and being
-rude to another—were these the daily incidents of her streets? Was
-there more in her frank beauty than met the eye—the power, perhaps, to
-evoke passions, good and bad, and to bring them speedily to a
-fulfillment?
-
-Happy Charlotte, who, though greatly troubled over things that did not
-matter, seemed oblivious to things that did; who could conjecture with
-admirable delicacy “where things might lead to,” but apparently lost
-sight of the goal as she approached it. Now she was crouching in the
-corner trying to extract a circular note from a kind of linen nose-bag
-which hung in chaste concealment round her neck. She had been told that
-this was the only safe way to carry money in Italy; it must only be
-broached within the walls of the English bank. As she groped she
-murmured: “Whether it is Mr. Beebe who forgot to tell Mr. Eager, or Mr.
-Eager who forgot when he told us, or whether they have decided to leave
-Eleanor out altogether—which they could scarcely do—but in any case we
-must be prepared. It is you they really want; I am only asked for
-appearances. You shall go with the two gentlemen, and I and Eleanor
-will follow behind. A one-horse carriage would do for us. Yet how
-difficult it is!”
-
-“It is indeed,” replied the girl, with a gravity that sounded
-sympathetic.
-
-“What do you think about it?” asked Miss Bartlett, flushed from the
-struggle, and buttoning up her dress.
-
-“I don’t know what I think, nor what I want.”
-
-“Oh, dear, Lucy! I do hope Florence isn’t boring you. Speak the word,
-and, as you know, I would take you to the ends of the earth to-morrow.”
-
-“Thank you, Charlotte,” said Lucy, and pondered over the offer.
-
-There were letters for her at the bureau—one from her brother, full of
-athletics and biology; one from her mother, delightful as only her
-mother’s letters could be. She had read in it of the crocuses which had
-been bought for yellow and were coming up puce, of the new
-parlour-maid, who had watered the ferns with essence of lemonade, of
-the semi-detached cottages which were ruining Summer Street, and
-breaking the heart of Sir Harry Otway. She recalled the free, pleasant
-life of her home, where she was allowed to do everything, and where
-nothing ever happened to her. The road up through the pine-woods, the
-clean drawing-room, the view over the Sussex Weald—all hung before her
-bright and distinct, but pathetic as the pictures in a gallery to
-which, after much experience, a traveller returns.
-
-“And the news?” asked Miss Bartlett.
-
-“Mrs. Vyse and her son have gone to Rome,” said Lucy, giving the news
-that interested her least. “Do you know the Vyses?”
-
-“Oh, not that way back. We can never have too much of the dear Piazza
-Signoria.”
-
-“They’re nice people, the Vyses. So clever—my idea of what’s really
-clever. Don’t you long to be in Rome?”
-
-“I die for it!”
-
-The Piazza Signoria is too stony to be brilliant. It has no grass, no
-flowers, no frescoes, no glittering walls of marble or comforting
-patches of ruddy brick. By an odd chance—unless we believe in a
-presiding genius of places—the statues that relieve its severity
-suggest, not the innocence of childhood, nor the glorious bewilderment
-of youth, but the conscious achievements of maturity. Perseus and
-Judith, Hercules and Thusnelda, they have done or suffered something,
-and though they are immortal, immortality has come to them after
-experience, not before. Here, not only in the solitude of Nature, might
-a hero meet a goddess, or a heroine a god.
-
-“Charlotte!” cried the girl suddenly. “Here’s an idea. What if we
-popped off to Rome to-morrow—straight to the Vyses’ hotel? For I do
-know what I want. I’m sick of Florence. No, you said you’d go to the
-ends of the earth! Do! Do!”
-
-Miss Bartlett, with equal vivacity, replied:
-
-“Oh, you droll person! Pray, what would become of your drive in the
-hills?”
-
-They passed together through the gaunt beauty of the square, laughing
-over the unpractical suggestion.
-
-
-
-
-Chapter VI
-The Reverend Arthur Beebe, the Reverend Cuthbert Eager, Mr. Emerson,
-Mr. George Emerson, Miss Eleanor Lavish, Miss Charlotte Bartlett, and
-Miss Lucy Honeychurch Drive Out in Carriages to See a View; Italians
-Drive Them.
-
-
-It was Phaethon who drove them to Fiesole that memorable day, a youth
-all irresponsibility and fire, recklessly urging his master’s horses up
-the stony hill. Mr. Beebe recognized him at once. Neither the Ages of
-Faith nor the Age of Doubt had touched him; he was Phaethon in Tuscany
-driving a cab. And it was Persephone whom he asked leave to pick up on
-the way, saying that she was his sister—Persephone, tall and slender
-and pale, returning with the Spring to her mother’s cottage, and still
-shading her eyes from the unaccustomed light. To her Mr. Eager
-objected, saying that here was the thin edge of the wedge, and one must
-guard against imposition. But the ladies interceded, and when it had
-been made clear that it was a very great favour, the goddess was
-allowed to mount beside the god.
-
-Phaethon at once slipped the left rein over her head, thus enabling
-himself to drive with his arm round her waist. She did not mind. Mr.
-Eager, who sat with his back to the horses, saw nothing of the
-indecorous proceeding, and continued his conversation with Lucy. The
-other two occupants of the carriage were old Mr. Emerson and Miss
-Lavish. For a dreadful thing had happened: Mr. Beebe, without
-consulting Mr. Eager, had doubled the size of the party. And though
-Miss Bartlett and Miss Lavish had planned all the morning how the
-people were to sit, at the critical moment when the carriages came
-round they lost their heads, and Miss Lavish got in with Lucy, while
-Miss Bartlett, with George Emerson and Mr. Beebe, followed on behind.
-
-It was hard on the poor chaplain to have his _partie carrée_ thus
-transformed. Tea at a Renaissance villa, if he had ever meditated it,
-was now impossible. Lucy and Miss Bartlett had a certain style about
-them, and Mr. Beebe, though unreliable, was a man of parts. But a
-shoddy lady writer and a journalist who had murdered his wife in the
-sight of God—they should enter no villa at his introduction.
-
-Lucy, elegantly dressed in white, sat erect and nervous amid these
-explosive ingredients, attentive to Mr. Eager, repressive towards Miss
-Lavish, watchful of old Mr. Emerson, hitherto fortunately asleep,
-thanks to a heavy lunch and the drowsy atmosphere of Spring. She looked
-on the expedition as the work of Fate. But for it she would have
-avoided George Emerson successfully. In an open manner he had shown
-that he wished to continue their intimacy. She had refused, not because
-she disliked him, but because she did not know what had happened, and
-suspected that he did know. And this frightened her.
-
-For the real event—whatever it was—had taken place, not in the Loggia,
-but by the river. To behave wildly at the sight of death is pardonable.
-But to discuss it afterwards, to pass from discussion into silence, and
-through silence into sympathy, that is an error, not of a startled
-emotion, but of the whole fabric. There was really something
-blameworthy (she thought) in their joint contemplation of the shadowy
-stream, in the common impulse which had turned them to the house
-without the passing of a look or word. This sense of wickedness had
-been slight at first. She had nearly joined the party to the Torre del
-Gallo. But each time that she avoided George it became more imperative
-that she should avoid him again. And now celestial irony, working
-through her cousin and two clergymen, did not suffer her to leave
-Florence till she had made this expedition with him through the hills.
-
-Meanwhile Mr. Eager held her in civil converse; their little tiff was
-over.
-
-“So, Miss Honeychurch, you are travelling? As a student of art?”
-
-“Oh, dear me, no—oh, no!”
-
-“Perhaps as a student of human nature,” interposed Miss Lavish, “like
-myself?”
-
-“Oh, no. I am here as a tourist.”
-
-“Oh, indeed,” said Mr. Eager. “Are you indeed? If you will not think me
-rude, we residents sometimes pity you poor tourists not a little—handed
-about like a parcel of goods from Venice to Florence, from Florence to
-Rome, living herded together in pensions or hotels, quite unconscious
-of anything that is outside Baedeker, their one anxiety to get ‘done’
-or ‘through’ and go on somewhere else. The result is, they mix up
-towns, rivers, palaces in one inextricable whirl. You know the American
-girl in Punch who says: ‘Say, poppa, what did we see at Rome?’ And the
-father replies: ‘Why, guess Rome was the place where we saw the yaller
-dog.’ There’s travelling for you. Ha! ha! ha!”
-
-“I quite agree,” said Miss Lavish, who had several times tried to
-interrupt his mordant wit. “The narrowness and superficiality of the
-Anglo-Saxon tourist is nothing less than a menace.”
-
-“Quite so. Now, the English colony at Florence, Miss Honeychurch—and it
-is of considerable size, though, of course, not all equally—a few are
-here for trade, for example. But the greater part are students. Lady
-Helen Laverstock is at present busy over Fra Angelico. I mention her
-name because we are passing her villa on the left. No, you can only see
-it if you stand—no, do not stand; you will fall. She is very proud of
-that thick hedge. Inside, perfect seclusion. One might have gone back
-six hundred years. Some critics believe that her garden was the scene
-of The Decameron, which lends it an additional interest, does it not?”
-
-“It does indeed!” cried Miss Lavish. “Tell me, where do they place the
-scene of that wonderful seventh day?”
-
-But Mr. Eager proceeded to tell Miss Honeychurch that on the right
-lived Mr. Someone Something, an American of the best type—so rare!—and
-that the Somebody Elses were farther down the hill. “Doubtless you know
-her monographs in the series of ‘Mediæval Byways’? He is working at
-Gemistus Pletho. Sometimes as I take tea in their beautiful grounds I
-hear, over the wall, the electric tram squealing up the new road with
-its loads of hot, dusty, unintelligent tourists who are going to ‘do’
-Fiesole in an hour in order that they may say they have been there, and
-I think—think—I think how little they think what lies so near them.”
-
-During this speech the two figures on the box were sporting with each
-other disgracefully. Lucy had a spasm of envy. Granted that they wished
-to misbehave, it was pleasant for them to be able to do so. They were
-probably the only people enjoying the expedition. The carriage swept
-with agonizing jolts up through the Piazza of Fiesole and into the
-Settignano road.
-
-“Piano! piano!” said Mr. Eager, elegantly waving his hand over his
-head.
-
-“Va bene, signore, va bene, va bene,” crooned the driver, and whipped
-his horses up again.
-
-Now Mr. Eager and Miss Lavish began to talk against each other on the
-subject of Alessio Baldovinetti. Was he a cause of the Renaissance, or
-was he one of its manifestations? The other carriage was left behind.
-As the pace increased to a gallop the large, slumbering form of Mr.
-Emerson was thrown against the chaplain with the regularity of a
-machine.
-
-“Piano! piano!” said he, with a martyred look at Lucy.
-
-An extra lurch made him turn angrily in his seat. Phaethon, who for
-some time had been endeavouring to kiss Persephone, had just succeeded.
-
-A little scene ensued, which, as Miss Bartlett said afterwards, was
-most unpleasant. The horses were stopped, the lovers were ordered to
-disentangle themselves, the boy was to lose his _pourboire_, the girl
-was immediately to get down.
-
-“She is my sister,” said he, turning round on them with piteous eyes.
-
-Mr. Eager took the trouble to tell him that he was a liar.
-
-Phaethon hung down his head, not at the matter of the accusation, but
-at its manner. At this point Mr. Emerson, whom the shock of stopping
-had awoke, declared that the lovers must on no account be separated,
-and patted them on the back to signify his approval. And Miss Lavish,
-though unwilling to ally him, felt bound to support the cause of
-Bohemianism.
-
-“Most certainly I would let them be,” she cried. “But I dare say I
-shall receive scant support. I have always flown in the face of the
-conventions all my life. This is what _I_ call an adventure.”
-
-“We must not submit,” said Mr. Eager. “I knew he was trying it on. He
-is treating us as if we were a party of Cook’s tourists.”
-
-“Surely no!” said Miss Lavish, her ardour visibly decreasing.
-
-The other carriage had drawn up behind, and sensible Mr. Beebe called
-out that after this warning the couple would be sure to behave
-themselves properly.
-
-“Leave them alone,” Mr. Emerson begged the chaplain, of whom he stood
-in no awe. “Do we find happiness so often that we should turn it off
-the box when it happens to sit there? To be driven by lovers—A king
-might envy us, and if we part them it’s more like sacrilege than
-anything I know.”
-
-Here the voice of Miss Bartlett was heard saying that a crowd had begun
-to collect.
-
-Mr. Eager, who suffered from an over-fluent tongue rather than a
-resolute will, was determined to make himself heard. He addressed the
-driver again. Italian in the mouth of Italians is a deep-voiced stream,
-with unexpected cataracts and boulders to preserve it from monotony. In
-Mr. Eager’s mouth it resembled nothing so much as an acid whistling
-fountain which played ever higher and higher, and quicker and quicker,
-and more and more shrilly, till abruptly it was turned off with a
-click.
-
-“Signorina!” said the man to Lucy, when the display had ceased. Why
-should he appeal to Lucy?
-
-“Signorina!” echoed Persephone in her glorious contralto. She pointed
-at the other carriage. Why?
-
-For a moment the two girls looked at each other. Then Persephone got
-down from the box.
-
-“Victory at last!” said Mr. Eager, smiting his hands together as the
-carriages started again.
-
-“It is not victory,” said Mr. Emerson. “It is defeat. You have parted
-two people who were happy.”
-
-Mr. Eager shut his eyes. He was obliged to sit next to Mr. Emerson, but
-he would not speak to him. The old man was refreshed by sleep, and took
-up the matter warmly. He commanded Lucy to agree with him; he shouted
-for support to his son.
-
-“We have tried to buy what cannot be bought with money. He has
-bargained to drive us, and he is doing it. We have no rights over his
-soul.”
-
-Miss Lavish frowned. It is hard when a person you have classed as
-typically British speaks out of his character.
-
-“He was not driving us well,” she said. “He jolted us.”
-
-“That I deny. It was as restful as sleeping. Aha! he is jolting us now.
-Can you wonder? He would like to throw us out, and most certainly he is
-justified. And if I were superstitious I’d be frightened of the girl,
-too. It doesn’t do to injure young people. Have you ever heard of
-Lorenzo de Medici?”
-
-Miss Lavish bristled.
-
-“Most certainly I have. Do you refer to Lorenzo il Magnifico, or to
-Lorenzo, Duke of Urbino, or to Lorenzo surnamed Lorenzino on account of
-his diminutive stature?”
-
-“The Lord knows. Possibly he does know, for I refer to Lorenzo the
-poet. He wrote a line—so I heard yesterday—which runs like this: ‘Don’t
-go fighting against the Spring.’”
-
-Mr. Eager could not resist the opportunity for erudition.
-
-“Non fate guerra al Maggio,” he murmured. “‘War not with the May’ would
-render a correct meaning.”
-
-“The point is, we have warred with it. Look.” He pointed to the Val
-d’Arno, which was visible far below them, through the budding trees.
-“Fifty miles of Spring, and we’ve come up to admire them. Do you
-suppose there’s any difference between Spring in nature and Spring in
-man? But there we go, praising the one and condemning the other as
-improper, ashamed that the same laws work eternally through both.”
-
-No one encouraged him to talk. Presently Mr. Eager gave a signal for
-the carriages to stop and marshalled the party for their ramble on the
-hill. A hollow like a great amphitheatre, full of terraced steps and
-misty olives, now lay between them and the heights of Fiesole, and the
-road, still following its curve, was about to sweep on to a promontory
-which stood out in the plain. It was this promontory, uncultivated,
-wet, covered with bushes and occasional trees, which had caught the
-fancy of Alessio Baldovinetti nearly five hundred years before. He had
-ascended it, that diligent and rather obscure master, possibly with an
-eye to business, possibly for the joy of ascending. Standing there, he
-had seen that view of the Val d’Arno and distant Florence, which he
-afterwards had introduced not very effectively into his work. But where
-exactly had he stood? That was the question which Mr. Eager hoped to
-solve now. And Miss Lavish, whose nature was attracted by anything
-problematical, had become equally enthusiastic.
-
-But it is not easy to carry the pictures of Alessio Baldovinetti in
-your head, even if you have remembered to look at them before starting.
-And the haze in the valley increased the difficulty of the quest.
-
-The party sprang about from tuft to tuft of grass, their anxiety to
-keep together being only equalled by their desire to go different
-directions. Finally they split into groups. Lucy clung to Miss Bartlett
-and Miss Lavish; the Emersons returned to hold laborious converse with
-the drivers; while the two clergymen, who were expected to have topics
-in common, were left to each other.
-
-The two elder ladies soon threw off the mask. In the audible whisper
-that was now so familiar to Lucy they began to discuss, not Alessio
-Baldovinetti, but the drive. Miss Bartlett had asked Mr. George Emerson
-what his profession was, and he had answered “the railway.” She was
-very sorry that she had asked him. She had no idea that it would be
-such a dreadful answer, or she would not have asked him. Mr. Beebe had
-turned the conversation so cleverly, and she hoped that the young man
-was not very much hurt at her asking him.
-
-“The railway!” gasped Miss Lavish. “Oh, but I shall die! Of course it
-was the railway!” She could not control her mirth. “He is the image of
-a porter—on, on the South-Eastern.”
-
-“Eleanor, be quiet,” plucking at her vivacious companion. “Hush!
-They’ll hear—the Emersons—”
-
-“I can’t stop. Let me go my wicked way. A porter—”
-
-“Eleanor!”
-
-“I’m sure it’s all right,” put in Lucy. “The Emersons won’t hear, and
-they wouldn’t mind if they did.”
-
-Miss Lavish did not seem pleased at this.
-
-“Miss Honeychurch listening!” she said rather crossly. “Pouf! Wouf! You
-naughty girl! Go away!”
-
-“Oh, Lucy, you ought to be with Mr. Eager, I’m sure.”
-
-“I can’t find them now, and I don’t want to either.”
-
-“Mr. Eager will be offended. It is your party.”
-
-“Please, I’d rather stop here with you.”
-
-“No, I agree,” said Miss Lavish. “It’s like a school feast; the boys
-have got separated from the girls. Miss Lucy, you are to go. We wish to
-converse on high topics unsuited for your ear.”
-
-The girl was stubborn. As her time at Florence drew to its close she
-was only at ease amongst those to whom she felt indifferent. Such a one
-was Miss Lavish, and such for the moment was Charlotte. She wished she
-had not called attention to herself; they were both annoyed at her
-remark and seemed determined to get rid of her.
-
-“How tired one gets,” said Miss Bartlett. “Oh, I do wish Freddy and
-your mother could be here.”
-
-Unselfishness with Miss Bartlett had entirely usurped the functions of
-enthusiasm. Lucy did not look at the view either. She would not enjoy
-anything till she was safe at Rome.
-
-“Then sit you down,” said Miss Lavish. “Observe my foresight.”
-
-With many a smile she produced two of those mackintosh squares that
-protect the frame of the tourist from damp grass or cold marble steps.
-She sat on one; who was to sit on the other?
-
-“Lucy; without a moment’s doubt, Lucy. The ground will do for me.
-Really I have not had rheumatism for years. If I do feel it coming on I
-shall stand. Imagine your mother’s feelings if I let you sit in the wet
-in your white linen.” She sat down heavily where the ground looked
-particularly moist. “Here we are, all settled delightfully. Even if my
-dress is thinner it will not show so much, being brown. Sit down, dear;
-you are too unselfish; you don’t assert yourself enough.” She cleared
-her throat. “Now don’t be alarmed; this isn’t a cold. It’s the tiniest
-cough, and I have had it three days. It’s nothing to do with sitting
-here at all.”
-
-There was only one way of treating the situation. At the end of five
-minutes Lucy departed in search of Mr. Beebe and Mr. Eager, vanquished
-by the mackintosh square.
-
-She addressed herself to the drivers, who were sprawling in the
-carriages, perfuming the cushions with cigars. The miscreant, a bony
-young man scorched black by the sun, rose to greet her with the
-courtesy of a host and the assurance of a relative.
-
-“Dove?” said Lucy, after much anxious thought.
-
-His face lit up. Of course he knew where. Not so far either. His arm
-swept three-fourths of the horizon. He should just think he did know
-where. He pressed his finger-tips to his forehead and then pushed them
-towards her, as if oozing with visible extract of knowledge.
-
-More seemed necessary. What was the Italian for “clergyman”?
-
-“Dove buoni uomini?” said she at last.
-
-Good? Scarcely the adjective for those noble beings! He showed her his
-cigar.
-
-“Uno—piu—piccolo,” was her next remark, implying “Has the cigar been
-given to you by Mr. Beebe, the smaller of the two good men?”
-
-She was correct as usual. He tied the horse to a tree, kicked it to
-make it stay quiet, dusted the carriage, arranged his hair, remoulded
-his hat, encouraged his moustache, and in rather less than a quarter of
-a minute was ready to conduct her. Italians are born knowing the way.
-It would seem that the whole earth lay before them, not as a map, but
-as a chess-board, whereon they continually behold the changing pieces
-as well as the squares. Any one can find places, but the finding of
-people is a gift from God.
-
-He only stopped once, to pick her some great blue violets. She thanked
-him with real pleasure. In the company of this common man the world was
-beautiful and direct. For the first time she felt the influence of
-Spring. His arm swept the horizon gracefully; violets, like other
-things, existed in great profusion there; “would she like to see them?”
-
-“Ma buoni uomini.”
-
-He bowed. Certainly. Good men first, violets afterwards. They proceeded
-briskly through the undergrowth, which became thicker and thicker. They
-were nearing the edge of the promontory, and the view was stealing
-round them, but the brown network of the bushes shattered it into
-countless pieces. He was occupied in his cigar, and in holding back the
-pliant boughs. She was rejoicing in her escape from dullness. Not a
-step, not a twig, was unimportant to her.
-
-“What is that?”
-
-There was a voice in the wood, in the distance behind them. The voice
-of Mr. Eager? He shrugged his shoulders. An Italian’s ignorance is
-sometimes more remarkable than his knowledge. She could not make him
-understand that perhaps they had missed the clergymen. The view was
-forming at last; she could discern the river, the golden plain, other
-hills.
-
-“Eccolo!” he exclaimed.
-
-At the same moment the ground gave way, and with a cry she fell out of
-the wood. Light and beauty enveloped her. She had fallen on to a little
-open terrace, which was covered with violets from end to end.
-
-“Courage!” cried her companion, now standing some six feet above.
-“Courage and love.”
-
-She did not answer. From her feet the ground sloped sharply into view,
-and violets ran down in rivulets and streams and cataracts, irrigating
-the hillside with blue, eddying round the tree stems collecting into
-pools in the hollows, covering the grass with spots of azure foam. But
-never again were they in such profusion; this terrace was the
-well-head, the primal source whence beauty gushed out to water the
-earth.
-
-Standing at its brink, like a swimmer who prepares, was the good man.
-But he was not the good man that she had expected, and he was alone.
-
-George had turned at the sound of her arrival. For a moment he
-contemplated her, as one who had fallen out of heaven. He saw radiant
-joy in her face, he saw the flowers beat against her dress in blue
-waves. The bushes above them closed. He stepped quickly forward and
-kissed her.
-
-Before she could speak, almost before she could feel, a voice called,
-“Lucy! Lucy! Lucy!” The silence of life had been broken by Miss
-Bartlett who stood brown against the view.
-
-
-
-
-Chapter VII
-They Return
-
-
-Some complicated game had been playing up and down the hillside all the
-afternoon. What it was and exactly how the players had sided, Lucy was
-slow to discover. Mr. Eager had met them with a questioning eye.
-Charlotte had repulsed him with much small talk. Mr. Emerson, seeking
-his son, was told whereabouts to find him. Mr. Beebe, who wore the
-heated aspect of a neutral, was bidden to collect the factions for the
-return home. There was a general sense of groping and bewilderment. Pan
-had been amongst them—not the great god Pan, who has been buried these
-two thousand years, but the little god Pan, who presides over social
-contretemps and unsuccessful picnics. Mr. Beebe had lost everyone, and
-had consumed in solitude the tea-basket which he had brought up as a
-pleasant surprise. Miss Lavish had lost Miss Bartlett. Lucy had lost
-Mr. Eager. Mr. Emerson had lost George. Miss Bartlett had lost a
-mackintosh square. Phaethon had lost the game.
-
-That last fact was undeniable. He climbed on to the box shivering, with
-his collar up, prophesying the swift approach of bad weather. “Let us
-go immediately,” he told them. “The signorino will walk.”
-
-“All the way? He will be hours,” said Mr. Beebe.
-
-“Apparently. I told him it was unwise.” He would look no one in the
-face; perhaps defeat was particularly mortifying for him. He alone had
-played skilfully, using the whole of his instinct, while the others had
-used scraps of their intelligence. He alone had divined what things
-were, and what he wished them to be. He alone had interpreted the
-message that Lucy had received five days before from the lips of a
-dying man. Persephone, who spends half her life in the grave—she could
-interpret it also. Not so these English. They gain knowledge slowly,
-and perhaps too late.
-
-The thoughts of a cab-driver, however just, seldom affect the lives of
-his employers. He was the most competent of Miss Bartlett’s opponents,
-but infinitely the least dangerous. Once back in the town, he and his
-insight and his knowledge would trouble English ladies no more. Of
-course, it was most unpleasant; she had seen his black head in the
-bushes; he might make a tavern story out of it. But after all, what
-have we to do with taverns? Real menace belongs to the drawing-room. It
-was of drawing-room people that Miss Bartlett thought as she journeyed
-downwards towards the fading sun. Lucy sat beside her; Mr. Eager sat
-opposite, trying to catch her eye; he was vaguely suspicious. They
-spoke of Alessio Baldovinetti.
-
-Rain and darkness came on together. The two ladies huddled together
-under an inadequate parasol. There was a lightning flash, and Miss
-Lavish who was nervous, screamed from the carriage in front. At the
-next flash, Lucy screamed also. Mr. Eager addressed her professionally:
-
-“Courage, Miss Honeychurch, courage and faith. If I might say so, there
-is something almost blasphemous in this horror of the elements. Are we
-seriously to suppose that all these clouds, all this immense electrical
-display, is simply called into existence to extinguish you or me?”
-
-“No—of course—”
-
-“Even from the scientific standpoint the chances against our being
-struck are enormous. The steel knives, the only articles which might
-attract the current, are in the other carriage. And, in any case, we
-are infinitely safer than if we were walking. Courage—courage and
-faith.”
-
-Under the rug, Lucy felt the kindly pressure of her cousin’s hand. At
-times our need for a sympathetic gesture is so great that we care not
-what exactly it signifies or how much we may have to pay for it
-afterwards. Miss Bartlett, by this timely exercise of her muscles,
-gained more than she would have got in hours of preaching or cross
-examination.
-
-She renewed it when the two carriages stopped, half into Florence.
-
-“Mr. Eager!” called Mr. Beebe. “We want your assistance. Will you
-interpret for us?”
-
-“George!” cried Mr. Emerson. “Ask your driver which way George went.
-The boy may lose his way. He may be killed.”
-
-“Go, Mr. Eager,” said Miss Bartlett, “don’t ask our driver; our driver
-is no help. Go and support poor Mr. Beebe—, he is nearly demented.”
-
-“He may be killed!” cried the old man. “He may be killed!”
-
-“Typical behaviour,” said the chaplain, as he quitted the carriage. “In
-the presence of reality that kind of person invariably breaks down.”
-
-“What does he know?” whispered Lucy as soon as they were alone.
-“Charlotte, how much does Mr. Eager know?”
-
-“Nothing, dearest; he knows nothing. But—” she pointed at the
-driver—“_he_ knows everything. Dearest, had we better? Shall I?” She
-took out her purse. “It is dreadful to be entangled with low-class
-people. He saw it all.” Tapping Phaethon’s back with her guide-book,
-she said, “Silenzio!” and offered him a franc.
-
-“Va bene,” he replied, and accepted it. As well this ending to his day
-as any. But Lucy, a mortal maid, was disappointed in him.
-
-There was an explosion up the road. The storm had struck the overhead
-wire of the tramline, and one of the great supports had fallen. If they
-had not stopped perhaps they might have been hurt. They chose to regard
-it as a miraculous preservation, and the floods of love and sincerity,
-which fructify every hour of life, burst forth in tumult. They
-descended from the carriages; they embraced each other. It was as
-joyful to be forgiven past unworthinesses as to forgive them. For a
-moment they realized vast possibilities of good.
-
-The older people recovered quickly. In the very height of their emotion
-they knew it to be unmanly or unladylike. Miss Lavish calculated that,
-even if they had continued, they would not have been caught in the
-accident. Mr. Eager mumbled a temperate prayer. But the drivers,
-through miles of dark squalid road, poured out their souls to the
-dryads and the saints, and Lucy poured out hers to her cousin.
-
-“Charlotte, dear Charlotte, kiss me. Kiss me again. Only you can
-understand me. You warned me to be careful. And I—I thought I was
-developing.”
-
-“Do not cry, dearest. Take your time.”
-
-“I have been obstinate and silly—worse than you know, far worse. Once
-by the river—Oh, but he isn’t killed—he wouldn’t be killed, would he?”
-
-The thought disturbed her repentance. As a matter of fact, the storm
-was worst along the road; but she had been near danger, and so she
-thought it must be near to everyone.
-
-“I trust not. One would always pray against that.”
-
-“He is really—I think he was taken by surprise, just as I was before.
-But this time I’m not to blame; I want you to believe that. I simply
-slipped into those violets. No, I want to be really truthful. I am a
-little to blame. I had silly thoughts. The sky, you know, was gold, and
-the ground all blue, and for a moment he looked like someone in a
-book.”
-
-“In a book?”
-
-“Heroes—gods—the nonsense of schoolgirls.”
-
-“And then?”
-
-“But, Charlotte, you know what happened then.”
-
-Miss Bartlett was silent. Indeed, she had little more to learn. With a
-certain amount of insight she drew her young cousin affectionately to
-her. All the way back Lucy’s body was shaken by deep sighs, which
-nothing could repress.
-
-“I want to be truthful,” she whispered. “It is so hard to be absolutely
-truthful.”
-
-“Don’t be troubled, dearest. Wait till you are calmer. We will talk it
-over before bed-time in my room.”
-
-So they re-entered the city with hands clasped. It was a shock to the
-girl to find how far emotion had ebbed in others. The storm had ceased,
-and Mr. Emerson was easier about his son. Mr. Beebe had regained good
-humour, and Mr. Eager was already snubbing Miss Lavish. Charlotte alone
-she was sure of—Charlotte, whose exterior concealed so much insight and
-love.
-
-The luxury of self-exposure kept her almost happy through the long
-evening. She thought not so much of what had happened as of how she
-should describe it. All her sensations, her spasms of courage, her
-moments of unreasonable joy, her mysterious discontent, should be
-carefully laid before her cousin. And together in divine confidence
-they would disentangle and interpret them all.
-
-“At last,” thought she, “I shall understand myself. I shan’t again be
-troubled by things that come out of nothing, and mean I don’t know
-what.”
-
-Miss Alan asked her to play. She refused vehemently. Music seemed to
-her the employment of a child. She sat close to her cousin, who, with
-commendable patience, was listening to a long story about lost luggage.
-When it was over she capped it by a story of her own. Lucy became
-rather hysterical with the delay. In vain she tried to check, or at all
-events to accelerate, the tale. It was not till a late hour that Miss
-Bartlett had recovered her luggage and could say in her usual tone of
-gentle reproach:
-
-“Well, dear, I at all events am ready for Bedfordshire. Come into my
-room, and I will give a good brush to your hair.”
-
-With some solemnity the door was shut, and a cane chair placed for the
-girl. Then Miss Bartlett said “So what is to be done?”
-
-She was unprepared for the question. It had not occurred to her that
-she would have to do anything. A detailed exhibition of her emotions
-was all that she had counted upon.
-
-“What is to be done? A point, dearest, which you alone can settle.”
-
-The rain was streaming down the black windows, and the great room felt
-damp and chilly. One candle burnt trembling on the chest of drawers
-close to Miss Bartlett’s toque, which cast monstrous and fantastic
-shadows on the bolted door. A tram roared by in the dark, and Lucy felt
-unaccountably sad, though she had long since dried her eyes. She lifted
-them to the ceiling, where the griffins and bassoons were colourless
-and vague, the very ghosts of joy.
-
-“It has been raining for nearly four hours,” she said at last.
-
-Miss Bartlett ignored the remark.
-
-“How do you propose to silence him?”
-
-“The driver?”
-
-“My dear girl, no; Mr. George Emerson.”
-
-Lucy began to pace up and down the room.
-
-“I don’t understand,” she said at last.
-
-She understood very well, but she no longer wished to be absolutely
-truthful.
-
-“How are you going to stop him talking about it?”
-
-“I have a feeling that talk is a thing he will never do.”
-
-“I, too, intend to judge him charitably. But unfortunately I have met
-the type before. They seldom keep their exploits to themselves.”
-
-“Exploits?” cried Lucy, wincing under the horrible plural.
-
-“My poor dear, did you suppose that this was his first? Come here and
-listen to me. I am only gathering it from his own remarks. Do you
-remember that day at lunch when he argued with Miss Alan that liking
-one person is an extra reason for liking another?”
-
-“Yes,” said Lucy, whom at the time the argument had pleased.
-
-“Well, I am no prude. There is no need to call him a wicked young man,
-but obviously he is thoroughly unrefined. Let us put it down to his
-deplorable antecedents and education, if you wish. But we are no
-farther on with our question. What do you propose to do?”
-
-An idea rushed across Lucy’s brain, which, had she thought of it sooner
-and made it part of her, might have proved victorious.
-
-“I propose to speak to him,” said she.
-
-Miss Bartlett uttered a cry of genuine alarm.
-
-“You see, Charlotte, your kindness—I shall never forget it. But—as you
-said—it is my affair. Mine and his.”
-
-“And you are going to _implore_ him, to _beg_ him to keep silence?”
-
-“Certainly not. There would be no difficulty. Whatever you ask him he
-answers, yes or no; then it is over. I have been frightened of him. But
-now I am not one little bit.”
-
-“But we fear him for you, dear. You are so young and inexperienced, you
-have lived among such nice people, that you cannot realize what men can
-be—how they can take a brutal pleasure in insulting a woman whom her
-sex does not protect and rally round. This afternoon, for example, if I
-had not arrived, what would have happened?”
-
-“I can’t think,” said Lucy gravely.
-
-Something in her voice made Miss Bartlett repeat her question, intoning
-it more vigorously.
-
-“What would have happened if I hadn’t arrived?”
-
-“I can’t think,” said Lucy again.
-
-“When he insulted you, how would you have replied?”
-
-“I hadn’t time to think. You came.”
-
-“Yes, but won’t you tell me now what you would have done?”
-
-“I should have—” She checked herself, and broke the sentence off. She
-went up to the dripping window and strained her eyes into the darkness.
-She could not think what she would have done.
-
-“Come away from the window, dear,” said Miss Bartlett. “You will be
-seen from the road.”
-
-Lucy obeyed. She was in her cousin’s power. She could not modulate out
-the key of self-abasement in which she had started. Neither of them
-referred again to her suggestion that she should speak to George and
-settle the matter, whatever it was, with him.
-
-Miss Bartlett became plaintive.
-
-“Oh, for a real man! We are only two women, you and I. Mr. Beebe is
-hopeless. There is Mr. Eager, but you do not trust him. Oh, for your
-brother! He is young, but I know that his sister’s insult would rouse
-in him a very lion. Thank God, chivalry is not yet dead. There are
-still left some men who can reverence woman.”
-
-As she spoke, she pulled off her rings, of which she wore several, and
-ranged them upon the pin cushion. Then she blew into her gloves and
-said:
-
-“It will be a push to catch the morning train, but we must try.”
-
-“What train?”
-
-“The train to Rome.” She looked at her gloves critically.
-
-The girl received the announcement as easily as it had been given.
-
-“When does the train to Rome go?”
-
-“At eight.”
-
-“Signora Bertolini would be upset.”
-
-“We must face that,” said Miss Bartlett, not liking to say that she had
-given notice already.
-
-“She will make us pay for a whole week’s pension.”
-
-“I expect she will. However, we shall be much more comfortable at the
-Vyses’ hotel. Isn’t afternoon tea given there for nothing?”
-
-“Yes, but they pay extra for wine.” After this remark she remained
-motionless and silent. To her tired eyes Charlotte throbbed and swelled
-like a ghostly figure in a dream.
-
-They began to sort their clothes for packing, for there was no time to
-lose, if they were to catch the train to Rome. Lucy, when admonished,
-began to move to and fro between the rooms, more conscious of the
-discomforts of packing by candlelight than of a subtler ill. Charlotte,
-who was practical without ability, knelt by the side of an empty trunk,
-vainly endeavouring to pave it with books of varying thickness and
-size. She gave two or three sighs, for the stooping posture hurt her
-back, and, for all her diplomacy, she felt that she was growing old.
-The girl heard her as she entered the room, and was seized with one of
-those emotional impulses to which she could never attribute a cause.
-She only felt that the candle would burn better, the packing go easier,
-the world be happier, if she could give and receive some human love.
-The impulse had come before to-day, but never so strongly. She knelt
-down by her cousin’s side and took her in her arms.
-
-Miss Bartlett returned the embrace with tenderness and warmth. But she
-was not a stupid woman, and she knew perfectly well that Lucy did not
-love her, but needed her to love. For it was in ominous tones that she
-said, after a long pause:
-
-“Dearest Lucy, how will you ever forgive me?”
-
-Lucy was on her guard at once, knowing by bitter experience what
-forgiving Miss Bartlett meant. Her emotion relaxed, she modified her
-embrace a little, and she said:
-
-“Charlotte dear, what do you mean? As if I have anything to forgive!”
-
-“You have a great deal, and I have a very great deal to forgive myself,
-too. I know well how much I vex you at every turn.”
-
-“But no—”
-
-Miss Bartlett assumed her favourite role, that of the prematurely aged
-martyr.
-
-“Ah, but yes! I feel that our tour together is hardly the success I had
-hoped. I might have known it would not do. You want someone younger and
-stronger and more in sympathy with you. I am too uninteresting and
-old-fashioned—only fit to pack and unpack your things.”
-
-“Please—”
-
-“My only consolation was that you found people more to your taste, and
-were often able to leave me at home. I had my own poor ideas of what a
-lady ought to do, but I hope I did not inflict them on you more than
-was necessary. You had your own way about these rooms, at all events.”
-
-“You mustn’t say these things,” said Lucy softly.
-
-She still clung to the hope that she and Charlotte loved each other,
-heart and soul. They continued to pack in silence.
-
-“I have been a failure,” said Miss Bartlett, as she struggled with the
-straps of Lucy’s trunk instead of strapping her own. “Failed to make
-you happy; failed in my duty to your mother. She has been so generous
-to me; I shall never face her again after this disaster.”
-
-“But mother will understand. It is not your fault, this trouble, and it
-isn’t a disaster either.”
-
-“It is my fault, it is a disaster. She will never forgive me, and
-rightly. For instance, what right had I to make friends with Miss
-Lavish?”
-
-“Every right.”
-
-“When I was here for your sake? If I have vexed you it is equally true
-that I have neglected you. Your mother will see this as clearly as I
-do, when you tell her.”
-
-Lucy, from a cowardly wish to improve the situation, said:
-
-“Why need mother hear of it?”
-
-“But you tell her everything?”
-
-“I suppose I do generally.”
-
-“I dare not break your confidence. There is something sacred in it.
-Unless you feel that it is a thing you could not tell her.”
-
-The girl would not be degraded to this.
-
-“Naturally I should have told her. But in case she should blame you in
-any way, I promise I will not, I am very willing not to. I will never
-speak of it either to her or to any one.”
-
-Her promise brought the long-drawn interview to a sudden close. Miss
-Bartlett pecked her smartly on both cheeks, wished her good-night, and
-sent her to her own room.
-
-For a moment the original trouble was in the background. George would
-seem to have behaved like a cad throughout; perhaps that was the view
-which one would take eventually. At present she neither acquitted nor
-condemned him; she did not pass judgement. At the moment when she was
-about to judge him her cousin’s voice had intervened, and, ever since,
-it was Miss Bartlett who had dominated; Miss Bartlett who, even now,
-could be heard sighing into a crack in the partition wall; Miss
-Bartlett, who had really been neither pliable nor humble nor
-inconsistent. She had worked like a great artist; for a time—indeed,
-for years—she had been meaningless, but at the end there was presented
-to the girl the complete picture of a cheerless, loveless world in
-which the young rush to destruction until they learn better—a
-shamefaced world of precautions and barriers which may avert evil, but
-which do not seem to bring good, if we may judge from those who have
-used them most.
-
-Lucy was suffering from the most grievous wrong which this world has
-yet discovered: diplomatic advantage had been taken of her sincerity,
-of her craving for sympathy and love. Such a wrong is not easily
-forgotten. Never again did she expose herself without due consideration
-and precaution against rebuff. And such a wrong may react disastrously
-upon the soul.
-
-The door-bell rang, and she started to the shutters. Before she reached
-them she hesitated, turned, and blew out the candle. Thus it was that,
-though she saw someone standing in the wet below, he, though he looked
-up, did not see her.
-
-To reach his room he had to go by hers. She was still dressed. It
-struck her that she might slip into the passage and just say that she
-would be gone before he was up, and that their extraordinary
-intercourse was over.
-
-Whether she would have dared to do this was never proved. At the
-critical moment Miss Bartlett opened her own door, and her voice said:
-
-“I wish one word with you in the drawing-room, Mr. Emerson, please.”
-
-Soon their footsteps returned, and Miss Bartlett said: “Good-night, Mr.
-Emerson.”
-
-His heavy, tired breathing was the only reply; the chaperon had done
-her work.
-
-Lucy cried aloud: “It isn’t true. It can’t all be true. I want not to
-be muddled. I want to grow older quickly.”
-
-Miss Bartlett tapped on the wall.
-
-“Go to bed at once, dear. You need all the rest you can get.”
-
-In the morning they left for Rome.
-
-
-
-
-PART TWO
-
-
-
-
-Chapter VIII
-Medieval
-
-
-The drawing-room curtains at Windy Corner had been pulled to meet, for
-the carpet was new and deserved protection from the August sun. They
-were heavy curtains, reaching almost to the ground, and the light that
-filtered through them was subdued and varied. A poet—none was
-present—might have quoted, “Life like a dome of many coloured glass,”
-or might have compared the curtains to sluice-gates, lowered against
-the intolerable tides of heaven. Without was poured a sea of radiance;
-within, the glory, though visible, was tempered to the capacities of
-man.
-
-Two pleasant people sat in the room. One—a boy of nineteen—was studying
-a small manual of anatomy, and peering occasionally at a bone which lay
-upon the piano. From time to time he bounced in his chair and puffed
-and groaned, for the day was hot and the print small, and the human
-frame fearfully made; and his mother, who was writing a letter, did
-continually read out to him what she had written. And continually did
-she rise from her seat and part the curtains so that a rivulet of light
-fell across the carpet, and make the remark that they were still there.
-
-“Where aren’t they?” said the boy, who was Freddy, Lucy’s brother. “I
-tell you I’m getting fairly sick.”
-
-“For goodness’ sake go out of my drawing-room, then?” cried Mrs.
-Honeychurch, who hoped to cure her children of slang by taking it
-literally.
-
-Freddy did not move or reply.
-
-“I think things are coming to a head,” she observed, rather wanting her
-son’s opinion on the situation if she could obtain it without undue
-supplication.
-
-“Time they did.”
-
-“I am glad that Cecil is asking her this once more.”
-
-“It’s his third go, isn’t it?”
-
-“Freddy I do call the way you talk unkind.”
-
-“I didn’t mean to be unkind.” Then he added: “But I do think Lucy might
-have got this off her chest in Italy. I don’t know how girls manage
-things, but she can’t have said ‘No’ properly before, or she wouldn’t
-have to say it again now. Over the whole thing—I can’t explain—I do
-feel so uncomfortable.”
-
-“Do you indeed, dear? How interesting!”
-
-“I feel—never mind.”
-
-He returned to his work.
-
-“Just listen to what I have written to Mrs. Vyse. I said: ‘Dear Mrs.
-Vyse.’”
-
-“Yes, mother, you told me. A jolly good letter.”
-
-“I said: ‘Dear Mrs. Vyse, Cecil has just asked my permission about it,
-and I should be delighted, if Lucy wishes it. But—’” She stopped
-reading, “I was rather amused at Cecil asking my permission at all. He
-has always gone in for unconventionality, and parents nowhere, and so
-forth. When it comes to the point, he can’t get on without me.”
-
-“Nor me.”
-
-“You?”
-
-Freddy nodded.
-
-“What do you mean?”
-
-“He asked me for my permission also.”
-
-She exclaimed: “How very odd of him!”
-
-“Why so?” asked the son and heir. “Why shouldn’t my permission be
-asked?”
-
-“What do you know about Lucy or girls or anything? What ever did you
-say?”
-
-“I said to Cecil, ‘Take her or leave her; it’s no business of mine!’”
-
-“What a helpful answer!” But her own answer, though more normal in its
-wording, had been to the same effect.
-
-“The bother is this,” began Freddy.
-
-Then he took up his work again, too shy to say what the bother was.
-Mrs. Honeychurch went back to the window.
-
-“Freddy, you must come. There they still are!”
-
-“I don’t see you ought to go peeping like that.”
-
-“Peeping like that! Can’t I look out of my own window?”
-
-But she returned to the writing-table, observing, as she passed her
-son, “Still page 322?” Freddy snorted, and turned over two leaves. For
-a brief space they were silent. Close by, beyond the curtains, the
-gentle murmur of a long conversation had never ceased.
-
-“The bother is this: I have put my foot in it with Cecil most awfully.”
-He gave a nervous gulp. “Not content with ‘permission’, which I did
-give—that is to say, I said, ‘I don’t mind’—well, not content with
-that, he wanted to know whether I wasn’t off my head with joy. He
-practically put it like this: Wasn’t it a splendid thing for Lucy and
-for Windy Corner generally if he married her? And he would have an
-answer—he said it would strengthen his hand.”
-
-“I hope you gave a careful answer, dear.”
-
-“I answered ‘No’” said the boy, grinding his teeth. “There! Fly into a
-stew! I can’t help it—had to say it. I had to say no. He ought never to
-have asked me.”
-
-“Ridiculous child!” cried his mother. “You think you’re so holy and
-truthful, but really it’s only abominable conceit. Do you suppose that
-a man like Cecil would take the slightest notice of anything you say? I
-hope he boxed your ears. How dare you say no?”
-
-“Oh, do keep quiet, mother! I had to say no when I couldn’t say yes. I
-tried to laugh as if I didn’t mean what I said, and, as Cecil laughed
-too, and went away, it may be all right. But I feel my foot’s in it.
-Oh, do keep quiet, though, and let a man do some work.”
-
-“No,” said Mrs. Honeychurch, with the air of one who has considered the
-subject, “I shall not keep quiet. You know all that has passed between
-them in Rome; you know why he is down here, and yet you deliberately
-insult him, and try to turn him out of my house.”
-
-“Not a bit!” he pleaded. “I only let out I didn’t like him. I don’t
-hate him, but I don’t like him. What I mind is that he’ll tell Lucy.”
-
-He glanced at the curtains dismally.
-
-“Well, _I_ like him,” said Mrs. Honeychurch. “I know his mother; he’s
-good, he’s clever, he’s rich, he’s well connected—Oh, you needn’t kick
-the piano! He’s well connected—I’ll say it again if you like: he’s well
-connected.” She paused, as if rehearsing her eulogy, but her face
-remained dissatisfied. She added: “And he has beautiful manners.”
-
-“I liked him till just now. I suppose it’s having him spoiling Lucy’s
-first week at home; and it’s also something that Mr. Beebe said, not
-knowing.”
-
-“Mr. Beebe?” said his mother, trying to conceal her interest. “I don’t
-see how Mr. Beebe comes in.”
-
-“You know Mr. Beebe’s funny way, when you never quite know what he
-means. He said: ‘Mr. Vyse is an ideal bachelor.’ I was very cute, I
-asked him what he meant. He said ‘Oh, he’s like me—better detached.’ I
-couldn’t make him say any more, but it set me thinking. Since Cecil has
-come after Lucy he hasn’t been so pleasant, at least—I can’t explain.”
-
-“You never can, dear. But I can. You are jealous of Cecil because he
-may stop Lucy knitting you silk ties.”
-
-The explanation seemed plausible, and Freddy tried to accept it. But at
-the back of his brain there lurked a dim mistrust. Cecil praised one
-too much for being athletic. Was that it? Cecil made one talk in one’s
-own way. This tired one. Was that it? And Cecil was the kind of fellow
-who would never wear another fellow’s cap. Unaware of his own
-profundity, Freddy checked himself. He must be jealous, or he would not
-dislike a man for such foolish reasons.
-
-“Will this do?” called his mother. “‘Dear Mrs. Vyse,—Cecil has just
-asked my permission about it, and I should be delighted if Lucy wishes
-it.’ Then I put in at the top, ‘and I have told Lucy so.’ I must write
-the letter out again—‘and I have told Lucy so. But Lucy seems very
-uncertain, and in these days young people must decide for themselves.’
-I said that because I didn’t want Mrs. Vyse to think us old-fashioned.
-She goes in for lectures and improving her mind, and all the time a
-thick layer of flue under the beds, and the maid’s dirty thumb-marks
-where you turn on the electric light. She keeps that flat abominably—”
-
-“Suppose Lucy marries Cecil, would she live in a flat, or in the
-country?”
-
-“Don’t interrupt so foolishly. Where was I? Oh yes—‘Young people must
-decide for themselves. I know that Lucy likes your son, because she
-tells me everything, and she wrote to me from Rome when he asked her
-first.’ No, I’ll cross that last bit out—it looks patronizing. I’ll
-stop at ‘because she tells me everything.’ Or shall I cross that out,
-too?”
-
-“Cross it out, too,” said Freddy.
-
-Mrs. Honeychurch left it in.
-
-“Then the whole thing runs: ‘Dear Mrs. Vyse.—Cecil has just asked my
-permission about it, and I should be delighted if Lucy wishes it, and I
-have told Lucy so. But Lucy seems very uncertain, and in these days
-young people must decide for themselves. I know that Lucy likes your
-son, because she tells me everything. But I do not know—’”
-
-“Look out!” cried Freddy.
-
-The curtains parted.
-
-Cecil’s first movement was one of irritation. He couldn’t bear the
-Honeychurch habit of sitting in the dark to save the furniture.
-Instinctively he gave the curtains a twitch, and sent them swinging
-down their poles. Light entered. There was revealed a terrace, such as
-is owned by many villas with trees each side of it, and on it a little
-rustic seat, and two flower-beds. But it was transfigured by the view
-beyond, for Windy Corner was built on the range that overlooks the
-Sussex Weald. Lucy, who was in the little seat, seemed on the edge of a
-green magic carpet which hovered in the air above the tremulous world.
-
-Cecil entered.
-
-Appearing thus late in the story, Cecil must be at once described. He
-was medieval. Like a Gothic statue. Tall and refined, with shoulders
-that seemed braced square by an effort of the will, and a head that was
-tilted a little higher than the usual level of vision, he resembled
-those fastidious saints who guard the portals of a French cathedral.
-Well educated, well endowed, and not deficient physically, he remained
-in the grip of a certain devil whom the modern world knows as
-self-consciousness, and whom the medieval, with dimmer vision,
-worshipped as asceticism. A Gothic statue implies celibacy, just as a
-Greek statue implies fruition, and perhaps this was what Mr. Beebe
-meant. And Freddy, who ignored history and art, perhaps meant the same
-when he failed to imagine Cecil wearing another fellow’s cap.
-
-Mrs. Honeychurch left her letter on the writing table and moved towards
-her young acquaintance.
-
-“Oh, Cecil!” she exclaimed—“oh, Cecil, do tell me!”
-
-“I promessi sposi,” said he.
-
-They stared at him anxiously.
-
-“She has accepted me,” he said, and the sound of the thing in English
-made him flush and smile with pleasure, and look more human.
-
-“I am so glad,” said Mrs. Honeychurch, while Freddy proffered a hand
-that was yellow with chemicals. They wished that they also knew
-Italian, for our phrases of approval and of amazement are so connected
-with little occasions that we fear to use them on great ones. We are
-obliged to become vaguely poetic, or to take refuge in Scriptural
-reminiscences.
-
-“Welcome as one of the family!” said Mrs. Honeychurch, waving her hand
-at the furniture. “This is indeed a joyous day! I feel sure that you
-will make our dear Lucy happy.”
-
-“I hope so,” replied the young man, shifting his eyes to the ceiling.
-
-“We mothers—” simpered Mrs. Honeychurch, and then realized that she was
-affected, sentimental, bombastic—all the things she hated most. Why
-could she not be Freddy, who stood stiff in the middle of the room;
-looking very cross and almost handsome?
-
-“I say, Lucy!” called Cecil, for conversation seemed to flag.
-
-Lucy rose from the seat. She moved across the lawn and smiled in at
-them, just as if she was going to ask them to play tennis. Then she saw
-her brother’s face. Her lips parted, and she took him in her arms. He
-said, “Steady on!”
-
-“Not a kiss for me?” asked her mother.
-
-Lucy kissed her also.
-
-“Would you take them into the garden and tell Mrs. Honeychurch all
-about it?” Cecil suggested. “And I’d stop here and tell my mother.”
-
-“We go with Lucy?” said Freddy, as if taking orders.
-
-“Yes, you go with Lucy.”
-
-They passed into the sunlight. Cecil watched them cross the terrace,
-and descend out of sight by the steps. They would descend—he knew their
-ways—past the shrubbery, and past the tennis-lawn and the dahlia-bed,
-until they reached the kitchen garden, and there, in the presence of
-the potatoes and the peas, the great event would be discussed.
-
-Smiling indulgently, he lit a cigarette, and rehearsed the events that
-had led to such a happy conclusion.
-
-He had known Lucy for several years, but only as a commonplace girl who
-happened to be musical. He could still remember his depression that
-afternoon at Rome, when she and her terrible cousin fell on him out of
-the blue, and demanded to be taken to St. Peter’s. That day she had
-seemed a typical tourist—shrill, crude, and gaunt with travel. But
-Italy worked some marvel in her. It gave her light, and—which he held
-more precious—it gave her shadow. Soon he detected in her a wonderful
-reticence. She was like a woman of Leonardo da Vinci’s, whom we love
-not so much for herself as for the things that she will not tell us.
-The things are assuredly not of this life; no woman of Leonardo’s could
-have anything so vulgar as a “story.” She did develop most wonderfully
-day by day.
-
-So it happened that from patronizing civility he had slowly passed if
-not to passion, at least to a profound uneasiness. Already at Rome he
-had hinted to her that they might be suitable for each other. It had
-touched him greatly that she had not broken away at the suggestion. Her
-refusal had been clear and gentle; after it—as the horrid phrase
-went—she had been exactly the same to him as before. Three months
-later, on the margin of Italy, among the flower-clad Alps, he had asked
-her again in bald, traditional language. She reminded him of a Leonardo
-more than ever; her sunburnt features were shadowed by fantastic rock;
-at his words she had turned and stood between him and the light with
-immeasurable plains behind her. He walked home with her unashamed,
-feeling not at all like a rejected suitor. The things that really
-mattered were unshaken.
-
-So now he had asked her once more, and, clear and gentle as ever, she
-had accepted him, giving no coy reasons for her delay, but simply
-saying that she loved him and would do her best to make him happy. His
-mother, too, would be pleased; she had counselled the step; he must
-write her a long account.
-
-Glancing at his hand, in case any of Freddy’s chemicals had come off on
-it, he moved to the writing table. There he saw “Dear Mrs. Vyse,”
-followed by many erasures. He recoiled without reading any more, and
-after a little hesitation sat down elsewhere, and pencilled a note on
-his knee.
-
-Then he lit another cigarette, which did not seem quite as divine as
-the first, and considered what might be done to make Windy Corner
-drawing-room more distinctive. With that outlook it should have been a
-successful room, but the trail of Tottenham Court Road was upon it; he
-could almost visualize the motor-vans of Messrs. Shoolbred and Messrs.
-Maple arriving at the door and depositing this chair, those varnished
-book-cases, that writing-table. The table recalled Mrs. Honeychurch’s
-letter. He did not want to read that letter—his temptations never lay
-in that direction; but he worried about it none the less. It was his
-own fault that she was discussing him with his mother; he had wanted
-her support in his third attempt to win Lucy; he wanted to feel that
-others, no matter who they were, agreed with him, and so he had asked
-their permission. Mrs. Honeychurch had been civil, but obtuse in
-essentials, while as for Freddy—“He is only a boy,” he reflected. “I
-represent all that he despises. Why should he want me for a
-brother-in-law?”
-
-The Honeychurches were a worthy family, but he began to realize that
-Lucy was of another clay; and perhaps—he did not put it very
-definitely—he ought to introduce her into more congenial circles as
-soon as possible.
-
-“Mr. Beebe!” said the maid, and the new rector of Summer Street was
-shown in; he had at once started on friendly relations, owing to Lucy’s
-praise of him in her letters from Florence.
-
-Cecil greeted him rather critically.
-
-“I’ve come for tea, Mr. Vyse. Do you suppose that I shall get it?”
-
-“I should say so. Food is the thing one does get here—Don’t sit in that
-chair; young Honeychurch has left a bone in it.”
-
-“Pfui!”
-
-“I know,” said Cecil. “I know. I can’t think why Mrs. Honeychurch
-allows it.”
-
-For Cecil considered the bone and the Maples’ furniture separately; he
-did not realize that, taken together, they kindled the room into the
-life that he desired.
-
-“I’ve come for tea and for gossip. Isn’t this news?”
-
-“News? I don’t understand you,” said Cecil. “News?”
-
-Mr. Beebe, whose news was of a very different nature, prattled forward.
-
-“I met Sir Harry Otway as I came up; I have every reason to hope that I
-am first in the field. He has bought Cissie and Albert from Mr. Flack!”
-
-“Has he indeed?” said Cecil, trying to recover himself. Into what a
-grotesque mistake had he fallen! Was it likely that a clergyman and a
-gentleman would refer to his engagement in a manner so flippant? But
-his stiffness remained, and, though he asked who Cissie and Albert
-might be, he still thought Mr. Beebe rather a bounder.
-
-“Unpardonable question! To have stopped a week at Windy Corner and not
-to have met Cissie and Albert, the semi-detached villas that have been
-run up opposite the church! I’ll set Mrs. Honeychurch after you.”
-
-“I’m shockingly stupid over local affairs,” said the young man
-languidly. “I can’t even remember the difference between a Parish
-Council and a Local Government Board. Perhaps there is no difference,
-or perhaps those aren’t the right names. I only go into the country to
-see my friends and to enjoy the scenery. It is very remiss of me. Italy
-and London are the only places where I don’t feel to exist on
-sufferance.”
-
-Mr. Beebe, distressed at this heavy reception of Cissie and Albert,
-determined to shift the subject.
-
-“Let me see, Mr. Vyse—I forget—what is your profession?”
-
-“I have no profession,” said Cecil. “It is another example of my
-decadence. My attitude—quite an indefensible one—is that so long as I
-am no trouble to any one I have a right to do as I like. I know I ought
-to be getting money out of people, or devoting myself to things I don’t
-care a straw about, but somehow, I’ve not been able to begin.”
-
-“You are very fortunate,” said Mr. Beebe. “It is a wonderful
-opportunity, the possession of leisure.”
-
-His voice was rather parochial, but he did not quite see his way to
-answering naturally. He felt, as all who have regular occupation must
-feel, that others should have it also.
-
-“I am glad that you approve. I daren’t face the healthy person—for
-example, Freddy Honeychurch.”
-
-“Oh, Freddy’s a good sort, isn’t he?”
-
-“Admirable. The sort who has made England what she is.”
-
-Cecil wondered at himself. Why, on this day of all others, was he so
-hopelessly contrary? He tried to get right by inquiring effusively
-after Mr. Beebe’s mother, an old lady for whom he had no particular
-regard. Then he flattered the clergyman, praised his
-liberal-mindedness, his enlightened attitude towards philosophy and
-science.
-
-“Where are the others?” said Mr. Beebe at last, “I insist on extracting
-tea before evening service.”
-
-“I suppose Anne never told them you were here. In this house one is so
-coached in the servants the day one arrives. The fault of Anne is that
-she begs your pardon when she hears you perfectly, and kicks the
-chair-legs with her feet. The faults of Mary—I forget the faults of
-Mary, but they are very grave. Shall we look in the garden?”
-
-“I know the faults of Mary. She leaves the dust-pans standing on the
-stairs.”
-
-“The fault of Euphemia is that she will not, simply will not, chop the
-suet sufficiently small.”
-
-They both laughed, and things began to go better.
-
-“The faults of Freddy—” Cecil continued.
-
-“Ah, he has too many. No one but his mother can remember the faults of
-Freddy. Try the faults of Miss Honeychurch; they are not innumerable.”
-
-“She has none,” said the young man, with grave sincerity.
-
-“I quite agree. At present she has none.”
-
-“At present?”
-
-“I’m not cynical. I’m only thinking of my pet theory about Miss
-Honeychurch. Does it seem reasonable that she should play so
-wonderfully, and live so quietly? I suspect that one day she will be
-wonderful in both. The water-tight compartments in her will break down,
-and music and life will mingle. Then we shall have her heroically good,
-heroically bad—too heroic, perhaps, to be good or bad.”
-
-Cecil found his companion interesting.
-
-“And at present you think her not wonderful as far as life goes?”
-
-“Well, I must say I’ve only seen her at Tunbridge Wells, where she was
-not wonderful, and at Florence. Since I came to Summer Street she has
-been away. You saw her, didn’t you, at Rome and in the Alps. Oh, I
-forgot; of course, you knew her before. No, she wasn’t wonderful in
-Florence either, but I kept on expecting that she would be.”
-
-“In what way?”
-
-Conversation had become agreeable to them, and they were pacing up and
-down the terrace.
-
-“I could as easily tell you what tune she’ll play next. There was
-simply the sense that she had found wings, and meant to use them. I can
-show you a beautiful picture in my Italian diary: Miss Honeychurch as a
-kite, Miss Bartlett holding the string. Picture number two: the string
-breaks.”
-
-The sketch was in his diary, but it had been made afterwards, when he
-viewed things artistically. At the time he had given surreptitious tugs
-to the string himself.
-
-“But the string never broke?”
-
-“No. I mightn’t have seen Miss Honeychurch rise, but I should certainly
-have heard Miss Bartlett fall.”
-
-“It has broken now,” said the young man in low, vibrating tones.
-
-Immediately he realized that of all the conceited, ludicrous,
-contemptible ways of announcing an engagement this was the worst. He
-cursed his love of metaphor; had he suggested that he was a star and
-that Lucy was soaring up to reach him?
-
-“Broken? What do you mean?”
-
-“I meant,” said Cecil stiffly, “that she is going to marry me.”
-
-The clergyman was conscious of some bitter disappointment which he
-could not keep out of his voice.
-
-“I am sorry; I must apologize. I had no idea you were intimate with
-her, or I should never have talked in this flippant, superficial way.
-Mr. Vyse, you ought to have stopped me.” And down the garden he saw
-Lucy herself; yes, he was disappointed.
-
-Cecil, who naturally preferred congratulations to apologies, drew down
-his mouth at the corners. Was this the reception his action would get
-from the world? Of course, he despised the world as a whole; every
-thoughtful man should; it is almost a test of refinement. But he was
-sensitive to the successive particles of it which he encountered.
-
-Occasionally he could be quite crude.
-
-“I am sorry I have given you a shock,” he said dryly. “I fear that
-Lucy’s choice does not meet with your approval.”
-
-“Not that. But you ought to have stopped me. I know Miss Honeychurch
-only a little as time goes. Perhaps I oughtn’t to have discussed her so
-freely with any one; certainly not with you.”
-
-“You are conscious of having said something indiscreet?”
-
-Mr. Beebe pulled himself together. Really, Mr. Vyse had the art of
-placing one in the most tiresome positions. He was driven to use the
-prerogatives of his profession.
-
-“No, I have said nothing indiscreet. I foresaw at Florence that her
-quiet, uneventful childhood must end, and it has ended. I realized
-dimly enough that she might take some momentous step. She has taken it.
-She has learnt—you will let me talk freely, as I have begun freely—she
-has learnt what it is to love: the greatest lesson, some people will
-tell you, that our earthly life provides.” It was now time for him to
-wave his hat at the approaching trio. He did not omit to do so. “She
-has learnt through you,” and if his voice was still clerical, it was
-now also sincere; “let it be your care that her knowledge is profitable
-to her.”
-
-“Grazie tante!” said Cecil, who did not like parsons.
-
-“Have you heard?” shouted Mrs. Honeychurch as she toiled up the sloping
-garden. “Oh, Mr. Beebe, have you heard the news?”
-
-Freddy, now full of geniality, whistled the wedding march. Youth seldom
-criticizes the accomplished fact.
-
-“Indeed I have!” he cried. He looked at Lucy. In her presence he could
-not act the parson any longer—at all events not without apology. “Mrs.
-Honeychurch, I’m going to do what I am always supposed to do, but
-generally I’m too shy. I want to invoke every kind of blessing on them,
-grave and gay, great and small. I want them all their lives to be
-supremely good and supremely happy as husband and wife, as father and
-mother. And now I want my tea.”
-
-“You only asked for it just in time,” the lady retorted. “How dare you
-be serious at Windy Corner?”
-
-He took his tone from her. There was no more heavy beneficence, no more
-attempts to dignify the situation with poetry or the Scriptures. None
-of them dared or was able to be serious any more.
-
-An engagement is so potent a thing that sooner or later it reduces all
-who speak of it to this state of cheerful awe. Away from it, in the
-solitude of their rooms, Mr. Beebe, and even Freddy, might again be
-critical. But in its presence and in the presence of each other they
-were sincerely hilarious. It has a strange power, for it compels not
-only the lips, but the very heart. The chief parallel to compare one
-great thing with another—is the power over us of a temple of some alien
-creed. Standing outside, we deride or oppose it, or at the most feel
-sentimental. Inside, though the saints and gods are not ours, we become
-true believers, in case any true believer should be present.
-
-So it was that after the gropings and the misgivings of the afternoon
-they pulled themselves together and settled down to a very pleasant
-tea-party. If they were hypocrites they did not know it, and their
-hypocrisy had every chance of setting and of becoming true. Anne,
-putting down each plate as if it were a wedding present, stimulated
-them greatly. They could not lag behind that smile of hers which she
-gave them ere she kicked the drawing-room door. Mr. Beebe chirruped.
-Freddy was at his wittiest, referring to Cecil as the “Fiasco”—family
-honoured pun on fiance. Mrs. Honeychurch, amusing and portly, promised
-well as a mother-in-law. As for Lucy and Cecil, for whom the temple had
-been built, they also joined in the merry ritual, but waited, as
-earnest worshippers should, for the disclosure of some holier shrine of
-joy.
-
-
-
-
-Chapter IX
-Lucy As a Work of Art
-
-
-A few days after the engagement was announced Mrs. Honeychurch made
-Lucy and her Fiasco come to a little garden-party in the neighbourhood,
-for naturally she wanted to show people that her daughter was marrying
-a presentable man.
-
-Cecil was more than presentable; he looked distinguished, and it was
-very pleasant to see his slim figure keeping step with Lucy, and his
-long, fair face responding when Lucy spoke to him. People congratulated
-Mrs. Honeychurch, which is, I believe, a social blunder, but it pleased
-her, and she introduced Cecil rather indiscriminately to some stuffy
-dowagers.
-
-At tea a misfortune took place: a cup of coffee was upset over Lucy’s
-figured silk, and though Lucy feigned indifference, her mother feigned
-nothing of the sort but dragged her indoors to have the frock treated
-by a sympathetic maid. They were gone some time, and Cecil was left
-with the dowagers. When they returned he was not as pleasant as he had
-been.
-
-“Do you go to much of this sort of thing?” he asked when they were
-driving home.
-
-“Oh, now and then,” said Lucy, who had rather enjoyed herself.
-
-“Is it typical of country society?”
-
-“I suppose so. Mother, would it be?”
-
-“Plenty of society,” said Mrs. Honeychurch, who was trying to remember
-the hang of one of the dresses.
-
-Seeing that her thoughts were elsewhere, Cecil bent towards Lucy and
-said:
-
-“To me it seemed perfectly appalling, disastrous, portentous.”
-
-“I am so sorry that you were stranded.”
-
-“Not that, but the congratulations. It is so disgusting, the way an
-engagement is regarded as public property—a kind of waste place where
-every outsider may shoot his vulgar sentiment. All those old women
-smirking!”
-
-“One has to go through it, I suppose. They won’t notice us so much next
-time.”
-
-“But my point is that their whole attitude is wrong. An
-engagement—horrid word in the first place—is a private matter, and
-should be treated as such.”
-
-Yet the smirking old women, however wrong individually, were racially
-correct. The spirit of the generations had smiled through them,
-rejoicing in the engagement of Cecil and Lucy because it promised the
-continuance of life on earth. To Cecil and Lucy it promised something
-quite different—personal love. Hence Cecil’s irritation and Lucy’s
-belief that his irritation was just.
-
-“How tiresome!” she said. “Couldn’t you have escaped to tennis?”
-
-“I don’t play tennis—at least, not in public. The neighbourhood is
-deprived of the romance of me being athletic. Such romance as I have is
-that of the Inglese Italianato.”
-
-“Inglese Italianato?”
-
-“E un diavolo incarnato! You know the proverb?”
-
-She did not. Nor did it seem applicable to a young man who had spent a
-quiet winter in Rome with his mother. But Cecil, since his engagement,
-had taken to affect a cosmopolitan naughtiness which he was far from
-possessing.
-
-“Well,” said he, “I cannot help it if they do disapprove of me. There
-are certain irremovable barriers between myself and them, and I must
-accept them.”
-
-“We all have our limitations, I suppose,” said wise Lucy.
-
-“Sometimes they are forced on us, though,” said Cecil, who saw from her
-remark that she did not quite understand his position.
-
-“How?”
-
-“It makes a difference doesn’t it, whether we fully fence ourselves in,
-or whether we are fenced out by the barriers of others?”
-
-She thought a moment, and agreed that it did make a difference.
-
-“Difference?” cried Mrs. Honeychurch, suddenly alert. “I don’t see any
-difference. Fences are fences, especially when they are in the same
-place.”
-
-“We were speaking of motives,” said Cecil, on whom the interruption
-jarred.
-
-“My dear Cecil, look here.” She spread out her knees and perched her
-card-case on her lap. “This is me. That’s Windy Corner. The rest of the
-pattern is the other people. Motives are all very well, but the fence
-comes here.”
-
-“We weren’t talking of real fences,” said Lucy, laughing.
-
-“Oh, I see, dear—poetry.”
-
-She leant placidly back. Cecil wondered why Lucy had been amused.
-
-“I tell you who has no ‘fences,’ as you call them,” she said, “and
-that’s Mr. Beebe.”
-
-“A parson fenceless would mean a parson defenceless.”
-
-Lucy was slow to follow what people said, but quick enough to detect
-what they meant. She missed Cecil’s epigram, but grasped the feeling
-that prompted it.
-
-“Don’t you like Mr. Beebe?” she asked thoughtfully.
-
-“I never said so!” he cried. “I consider him far above the average. I
-only denied—” And he swept off on the subject of fences again, and was
-brilliant.
-
-“Now, a clergyman that I do hate,” said she wanting to say something
-sympathetic, “a clergyman that does have fences, and the most dreadful
-ones, is Mr. Eager, the English chaplain at Florence. He was truly
-insincere—not merely the manner unfortunate. He was a snob, and so
-conceited, and he did say such unkind things.”
-
-“What sort of things?”
-
-“There was an old man at the Bertolini whom he said had murdered his
-wife.”
-
-“Perhaps he had.”
-
-“No!”
-
-“Why ‘no’?”
-
-“He was such a nice old man, I’m sure.”
-
-Cecil laughed at her feminine inconsequence.
-
-“Well, I did try to sift the thing. Mr. Eager would never come to the
-point. He prefers it vague—said the old man had ‘practically’ murdered
-his wife—had murdered her in the sight of God.”
-
-“Hush, dear!” said Mrs. Honeychurch absently.
-
-“But isn’t it intolerable that a person whom we’re told to imitate
-should go round spreading slander? It was, I believe, chiefly owing to
-him that the old man was dropped. People pretended he was vulgar, but
-he certainly wasn’t that.”
-
-“Poor old man! What was his name?”
-
-“Harris,” said Lucy glibly.
-
-“Let’s hope that Mrs. Harris there warn’t no sich person,” said her
-mother.
-
-Cecil nodded intelligently.
-
-“Isn’t Mr. Eager a parson of the cultured type?” he asked.
-
-“I don’t know. I hate him. I’ve heard him lecture on Giotto. I hate
-him. Nothing can hide a petty nature. I _hate_ him.”
-
-“My goodness gracious me, child!” said Mrs. Honeychurch. “You’ll blow
-my head off! Whatever is there to shout over? I forbid you and Cecil to
-hate any more clergymen.”
-
-He smiled. There was indeed something rather incongruous in Lucy’s
-moral outburst over Mr. Eager. It was as if one should see the Leonardo
-on the ceiling of the Sistine. He longed to hint to her that not here
-lay her vocation; that a woman’s power and charm reside in mystery, not
-in muscular rant. But possibly rant is a sign of vitality: it mars the
-beautiful creature, but shows that she is alive. After a moment, he
-contemplated her flushed face and excited gestures with a certain
-approval. He forebore to repress the sources of youth.
-
-Nature—simplest of topics, he thought—lay around them. He praised the
-pine-woods, the deep lasts of bracken, the crimson leaves that spotted
-the hurt-bushes, the serviceable beauty of the turnpike road. The
-outdoor world was not very familiar to him, and occasionally he went
-wrong in a question of fact. Mrs. Honeychurch’s mouth twitched when he
-spoke of the perpetual green of the larch.
-
-“I count myself a lucky person,” he concluded, “When I’m in London I
-feel I could never live out of it. When I’m in the country I feel the
-same about the country. After all, I do believe that birds and trees
-and the sky are the most wonderful things in life, and that the people
-who live amongst them must be the best. It’s true that in nine cases
-out of ten they don’t seem to notice anything. The country gentleman
-and the country labourer are each in their way the most depressing of
-companions. Yet they may have a tacit sympathy with the workings of
-Nature which is denied to us of the town. Do you feel that, Mrs.
-Honeychurch?”
-
-Mrs. Honeychurch started and smiled. She had not been attending. Cecil,
-who was rather crushed on the front seat of the victoria, felt
-irritable, and determined not to say anything interesting again.
-
-Lucy had not attended either. Her brow was wrinkled, and she still
-looked furiously cross—the result, he concluded, of too much moral
-gymnastics. It was sad to see her thus blind to the beauties of an
-August wood.
-
-“‘Come down, O maid, from yonder mountain height,’” he quoted, and
-touched her knee with his own.
-
-She flushed again and said: “What height?”
-
-“‘Come down, O maid, from yonder mountain height,
-What pleasure lives in height (the shepherd sang).
-In height and in the splendour of the hills?’
-
-
-Let us take Mrs. Honeychurch’s advice and hate clergymen no more.
-What’s this place?”
-
-“Summer Street, of course,” said Lucy, and roused herself.
-
-The woods had opened to leave space for a sloping triangular meadow.
-Pretty cottages lined it on two sides, and the upper and third side was
-occupied by a new stone church, expensively simple, a charming shingled
-spire. Mr. Beebe’s house was near the church. In height it scarcely
-exceeded the cottages. Some great mansions were at hand, but they were
-hidden in the trees. The scene suggested a Swiss Alp rather than the
-shrine and centre of a leisured world, and was marred only by two ugly
-little villas—the villas that had competed with Cecil’s engagement,
-having been acquired by Sir Harry Otway the very afternoon that Lucy
-had been acquired by Cecil.
-
-“Cissie” was the name of one of these villas, “Albert” of the other.
-These titles were not only picked out in shaded Gothic on the garden
-gates, but appeared a second time on the porches, where they followed
-the semicircular curve of the entrance arch in block capitals. “Albert”
-was inhabited. His tortured garden was bright with geraniums and
-lobelias and polished shells. His little windows were chastely swathed
-in Nottingham lace. “Cissie” was to let. Three notice-boards, belonging
-to Dorking agents, lolled on her fence and announced the not surprising
-fact. Her paths were already weedy; her pocket-handkerchief of a lawn
-was yellow with dandelions.
-
-“The place is ruined!” said the ladies mechanically. “Summer Street
-will never be the same again.”
-
-As the carriage passed, “Cissie’s” door opened, and a gentleman came
-out of her.
-
-“Stop!” cried Mrs. Honeychurch, touching the coachman with her parasol.
-“Here’s Sir Harry. Now we shall know. Sir Harry, pull those things down
-at once!”
-
-Sir Harry Otway—who need not be described—came to the carriage and said
-“Mrs. Honeychurch, I meant to. I can’t, I really can’t turn out Miss
-Flack.”
-
-“Am I not always right? She ought to have gone before the contract was
-signed. Does she still live rent free, as she did in her nephew’s
-time?”
-
-“But what can I do?” He lowered his voice. “An old lady, so very
-vulgar, and almost bedridden.”
-
-“Turn her out,” said Cecil bravely.
-
-Sir Harry sighed, and looked at the villas mournfully. He had had full
-warning of Mr. Flack’s intentions, and might have bought the plot
-before building commenced: but he was apathetic and dilatory. He had
-known Summer Street for so many years that he could not imagine it
-being spoilt. Not till Mrs. Flack had laid the foundation stone, and
-the apparition of red and cream brick began to rise did he take alarm.
-He called on Mr. Flack, the local builder,—a most reasonable and
-respectful man—who agreed that tiles would have made more artistic
-roof, but pointed out that slates were cheaper. He ventured to differ,
-however, about the Corinthian columns which were to cling like leeches
-to the frames of the bow windows, saying that, for his part, he liked
-to relieve the façade by a bit of decoration. Sir Harry hinted that a
-column, if possible, should be structural as well as decorative.
-
-Mr. Flack replied that all the columns had been ordered, adding, “and
-all the capitals different—one with dragons in the foliage, another
-approaching to the Ionian style, another introducing Mrs. Flack’s
-initials—every one different.” For he had read his Ruskin. He built his
-villas according to his desire; and not until he had inserted an
-immovable aunt into one of them did Sir Harry buy.
-
-This futile and unprofitable transaction filled the knight with sadness
-as he leant on Mrs. Honeychurch’s carriage. He had failed in his duties
-to the country-side, and the country-side was laughing at him as well.
-He had spent money, and yet Summer Street was spoilt as much as ever.
-All he could do now was to find a desirable tenant for “Cissie”—someone
-really desirable.
-
-“The rent is absurdly low,” he told them, “and perhaps I am an easy
-landlord. But it is such an awkward size. It is too large for the
-peasant class and too small for any one the least like ourselves.”
-
-Cecil had been hesitating whether he should despise the villas or
-despise Sir Harry for despising them. The latter impulse seemed the
-more fruitful.
-
-“You ought to find a tenant at once,” he said maliciously. “It would be
-a perfect paradise for a bank clerk.”
-
-“Exactly!” said Sir Harry excitedly. “That is exactly what I fear, Mr.
-Vyse. It will attract the wrong type of people. The train service has
-improved—a fatal improvement, to my mind. And what are five miles from
-a station in these days of bicycles?”
-
-“Rather a strenuous clerk it would be,” said Lucy.
-
-Cecil, who had his full share of mediaeval mischievousness, replied
-that the physique of the lower middle classes was improving at a most
-appalling rate. She saw that he was laughing at their harmless
-neighbour, and roused herself to stop him.
-
-“Sir Harry!” she exclaimed, “I have an idea. How would you like
-spinsters?”
-
-“My dear Lucy, it would be splendid. Do you know any such?”
-
-“Yes; I met them abroad.”
-
-“Gentlewomen?” he asked tentatively.
-
-“Yes, indeed, and at the present moment homeless. I heard from them
-last week—Miss Teresa and Miss Catharine Alan. I’m really not joking.
-They are quite the right people. Mr. Beebe knows them, too. May I tell
-them to write to you?”
-
-“Indeed you may!” he cried. “Here we are with the difficulty solved
-already. How delightful it is! Extra facilities—please tell them they
-shall have extra facilities, for I shall have no agents’ fees. Oh, the
-agents! The appalling people they have sent me! One woman, when I
-wrote—a tactful letter, you know—asking her to explain her social
-position to me, replied that she would pay the rent in advance. As if
-one cares about that! And several references I took up were most
-unsatisfactory—people swindlers, or not respectable. And oh, the
-deceit! I have seen a good deal of the seamy side this last week. The
-deceit of the most promising people. My dear Lucy, the deceit!”
-
-She nodded.
-
-“My advice,” put in Mrs. Honeychurch, “is to have nothing to do with
-Lucy and her decayed gentlewomen at all. I know the type. Preserve me
-from people who have seen better days, and bring heirlooms with them
-that make the house smell stuffy. It’s a sad thing, but I’d far rather
-let to some one who is going up in the world than to someone who has
-come down.”
-
-“I think I follow you,” said Sir Harry; “but it is, as you say, a very
-sad thing.”
-
-“The Misses Alan aren’t that!” cried Lucy.
-
-“Yes, they are,” said Cecil. “I haven’t met them but I should say they
-were a highly unsuitable addition to the neighbourhood.”
-
-“Don’t listen to him, Sir Harry—he’s tiresome.”
-
-“It’s I who am tiresome,” he replied. “I oughtn’t to come with my
-troubles to young people. But really I am so worried, and Lady Otway
-will only say that I cannot be too careful, which is quite true, but no
-real help.”
-
-“Then may I write to my Misses Alan?”
-
-“Please!”
-
-But his eye wavered when Mrs. Honeychurch exclaimed:
-
-“Beware! They are certain to have canaries. Sir Harry, beware of
-canaries: they spit the seed out through the bars of the cages and then
-the mice come. Beware of women altogether. Only let to a man.”
-
-“Really—” he murmured gallantly, though he saw the wisdom of her
-remark.
-
-“Men don’t gossip over tea-cups. If they get drunk, there’s an end of
-them—they lie down comfortably and sleep it off. If they’re vulgar,
-they somehow keep it to themselves. It doesn’t spread so. Give me a
-man—of course, provided he’s clean.”
-
-Sir Harry blushed. Neither he nor Cecil enjoyed these open compliments
-to their sex. Even the exclusion of the dirty did not leave them much
-distinction. He suggested that Mrs. Honeychurch, if she had time,
-should descend from the carriage and inspect “Cissie” for herself. She
-was delighted. Nature had intended her to be poor and to live in such a
-house. Domestic arrangements always attracted her, especially when they
-were on a small scale.
-
-Cecil pulled Lucy back as she followed her mother.
-
-“Mrs. Honeychurch,” he said, “what if we two walk home and leave you?”
-
-“Certainly!” was her cordial reply.
-
-Sir Harry likewise seemed almost too glad to get rid of them. He beamed
-at them knowingly, said, “Aha! young people, young people!” and then
-hastened to unlock the house.
-
-“Hopeless vulgarian!” exclaimed Cecil, almost before they were out of
-earshot.
-
-“Oh, Cecil!”
-
-“I can’t help it. It would be wrong not to loathe that man.”
-
-“He isn’t clever, but really he is nice.”
-
-“No, Lucy, he stands for all that is bad in country life. In London he
-would keep his place. He would belong to a brainless club, and his wife
-would give brainless dinner parties. But down here he acts the little
-god with his gentility, and his patronage, and his sham aesthetics, and
-every one—even your mother—is taken in.”
-
-“All that you say is quite true,” said Lucy, though she felt
-discouraged. “I wonder whether—whether it matters so very much.”
-
-“It matters supremely. Sir Harry is the essence of that garden-party.
-Oh, goodness, how cross I feel! How I do hope he’ll get some vulgar
-tenant in that villa—some woman so really vulgar that he’ll notice it.
-_Gentlefolks!_ Ugh! with his bald head and retreating chin! But let’s
-forget him.”
-
-This Lucy was glad enough to do. If Cecil disliked Sir Harry Otway and
-Mr. Beebe, what guarantee was there that the people who really mattered
-to her would escape? For instance, Freddy. Freddy was neither clever,
-nor subtle, nor beautiful, and what prevented Cecil from saying, any
-minute, “It would be wrong not to loathe Freddy”? And what would she
-reply? Further than Freddy she did not go, but he gave her anxiety
-enough. She could only assure herself that Cecil had known Freddy some
-time, and that they had always got on pleasantly, except, perhaps,
-during the last few days, which was an accident, perhaps.
-
-“Which way shall we go?” she asked him.
-
-Nature—simplest of topics, she thought—was around them. Summer Street
-lay deep in the woods, and she had stopped where a footpath diverged
-from the highroad.
-
-“Are there two ways?”
-
-“Perhaps the road is more sensible, as we’re got up smart.”
-
-“I’d rather go through the wood,” said Cecil, with that subdued
-irritation that she had noticed in him all the afternoon. “Why is it,
-Lucy, that you always say the road? Do you know that you have never
-once been with me in the fields or the wood since we were engaged?”
-
-“Haven’t I? The wood, then,” said Lucy, startled at his queerness, but
-pretty sure that he would explain later; it was not his habit to leave
-her in doubt as to his meaning.
-
-She led the way into the whispering pines, and sure enough he did
-explain before they had gone a dozen yards.
-
-“I had got an idea—I dare say wrongly—that you feel more at home with
-me in a room.”
-
-“A room?” she echoed, hopelessly bewildered.
-
-“Yes. Or, at the most, in a garden, or on a road. Never in the real
-country like this.”
-
-“Oh, Cecil, whatever do you mean? I have never felt anything of the
-sort. You talk as if I was a kind of poetess sort of person.”
-
-“I don’t know that you aren’t. I connect you with a view—a certain type
-of view. Why shouldn’t you connect me with a room?”
-
-She reflected a moment, and then said, laughing:
-
-“Do you know that you’re right? I do. I must be a poetess after all.
-When I think of you it’s always as in a room. How funny!”
-
-To her surprise, he seemed annoyed.
-
-“A drawing-room, pray? With no view?”
-
-“Yes, with no view, I fancy. Why not?”
-
-“I’d rather,” he said reproachfully, “that you connected me with the
-open air.”
-
-She said again, “Oh, Cecil, whatever do you mean?”
-
-As no explanation was forthcoming, she shook off the subject as too
-difficult for a girl, and led him further into the wood, pausing every
-now and then at some particularly beautiful or familiar combination of
-the trees. She had known the wood between Summer Street and Windy
-Corner ever since she could walk alone; she had played at losing Freddy
-in it, when Freddy was a purple-faced baby; and though she had been to
-Italy, it had lost none of its charm.
-
-Presently they came to a little clearing among the pines—another tiny
-green alp, solitary this time, and holding in its bosom a shallow pool.
-
-She exclaimed, “The Sacred Lake!”
-
-“Why do you call it that?”
-
-“I can’t remember why. I suppose it comes out of some book. It’s only a
-puddle now, but you see that stream going through it? Well, a good deal
-of water comes down after heavy rains, and can’t get away at once, and
-the pool becomes quite large and beautiful. Then Freddy used to bathe
-there. He is very fond of it.”
-
-“And you?”
-
-He meant, “Are you fond of it?” But she answered dreamily, “I bathed
-here, too, till I was found out. Then there was a row.”
-
-At another time he might have been shocked, for he had depths of
-prudishness within him. But now? with his momentary cult of the fresh
-air, he was delighted at her admirable simplicity. He looked at her as
-she stood by the pool’s edge. She was got up smart, as she phrased it,
-and she reminded him of some brilliant flower that has no leaves of its
-own, but blooms abruptly out of a world of green.
-
-“Who found you out?”
-
-“Charlotte,” she murmured. “She was stopping with us.
-Charlotte—Charlotte.”
-
-“Poor girl!”
-
-She smiled gravely. A certain scheme, from which hitherto he had
-shrunk, now appeared practical.
-
-“Lucy!”
-
-“Yes, I suppose we ought to be going,” was her reply.
-
-“Lucy, I want to ask something of you that I have never asked before.”
-
-At the serious note in his voice she stepped frankly and kindly towards
-him.
-
-“What, Cecil?”
-
-“Hitherto never—not even that day on the lawn when you agreed to marry
-me—”
-
-He became self-conscious and kept glancing round to see if they were
-observed. His courage had gone.
-
-“Yes?”
-
-“Up to now I have never kissed you.”
-
-She was as scarlet as if he had put the thing most indelicately.
-
-“No—more you have,” she stammered.
-
-“Then I ask you—may I now?”
-
-“Of course, you may, Cecil. You might before. I can’t run at you, you
-know.”
-
-At that supreme moment he was conscious of nothing but absurdities. Her
-reply was inadequate. She gave such a business-like lift to her veil.
-As he approached her he found time to wish that he could recoil. As he
-touched her, his gold pince-nez became dislodged and was flattened
-between them.
-
-Such was the embrace. He considered, with truth, that it had been a
-failure. Passion should believe itself irresistible. It should forget
-civility and consideration and all the other curses of a refined
-nature. Above all, it should never ask for leave where there is a right
-of way. Why could he not do as any labourer or navvy—nay, as any young
-man behind the counter would have done? He recast the scene. Lucy was
-standing flowerlike by the water, he rushed up and took her in his
-arms; she rebuked him, permitted him and revered him ever after for his
-manliness. For he believed that women revere men for their manliness.
-
-They left the pool in silence, after this one salutation. He waited for
-her to make some remark which should show him her inmost thoughts. At
-last she spoke, and with fitting gravity.
-
-“Emerson was the name, not Harris.”
-
-“What name?”
-
-“The old man’s.”
-
-“What old man?”
-
-“That old man I told you about. The one Mr. Eager was so unkind to.”
-
-He could not know that this was the most intimate conversation they had
-ever had.
-
-
-
-
-Chapter X
-Cecil as a Humourist
-
-
-The society out of which Cecil proposed to rescue Lucy was perhaps no
-very splendid affair, yet it was more splendid than her antecedents
-entitled her to. Her father, a prosperous local solicitor, had built
-Windy Corner, as a speculation at the time the district was opening up,
-and, falling in love with his own creation, had ended by living there
-himself. Soon after his marriage the social atmosphere began to alter.
-Other houses were built on the brow of that steep southern slope and
-others, again, among the pine-trees behind, and northward on the chalk
-barrier of the downs. Most of these houses were larger than Windy
-Corner, and were filled by people who came, not from the district, but
-from London, and who mistook the Honeychurches for the remnants of an
-indigenous aristocracy. He was inclined to be frightened, but his wife
-accepted the situation without either pride or humility. “I cannot
-think what people are doing,” she would say, “but it is extremely
-fortunate for the children.” She called everywhere; her calls were
-returned with enthusiasm, and by the time people found out that she was
-not exactly of their _milieu_, they liked her, and it did not seem to
-matter. When Mr. Honeychurch died, he had the satisfaction—which few
-honest solicitors despise—of leaving his family rooted in the best
-society obtainable.
-
-The best obtainable. Certainly many of the immigrants were rather dull,
-and Lucy realized this more vividly since her return from Italy.
-Hitherto she had accepted their ideals without questioning—their kindly
-affluence, their inexplosive religion, their dislike of paper-bags,
-orange-peel, and broken bottles. A Radical out and out, she learnt to
-speak with horror of Suburbia. Life, so far as she troubled to conceive
-it, was a circle of rich, pleasant people, with identical interests and
-identical foes. In this circle, one thought, married, and died. Outside
-it were poverty and vulgarity for ever trying to enter, just as the
-London fog tries to enter the pine-woods pouring through the gaps in
-the northern hills. But, in Italy, where any one who chooses may warm
-himself in equality, as in the sun, this conception of life vanished.
-Her senses expanded; she felt that there was no one whom she might not
-get to like, that social barriers were irremovable, doubtless, but not
-particularly high. You jump over them just as you jump into a peasant’s
-olive-yard in the Apennines, and he is glad to see you. She returned
-with new eyes.
-
-So did Cecil; but Italy had quickened Cecil, not to tolerance, but to
-irritation. He saw that the local society was narrow, but, instead of
-saying, “Does that very much matter?” he rebelled, and tried to
-substitute for it the society he called broad. He did not realize that
-Lucy had consecrated her environment by the thousand little civilities
-that create a tenderness in time, and that though her eyes saw its
-defects, her heart refused to despise it entirely. Nor did he realize a
-more important point—that if she was too great for this society, she
-was too great for all society, and had reached the stage where personal
-intercourse would alone satisfy her. A rebel she was, but not of the
-kind he understood—a rebel who desired, not a wider dwelling-room, but
-equality beside the man she loved. For Italy was offering her the most
-priceless of all possessions—her own soul.
-
-Playing bumble-puppy with Minnie Beebe, niece to the rector, and aged
-thirteen—an ancient and most honourable game, which consists in
-striking tennis-balls high into the air, so that they fall over the net
-and immoderately bounce; some hit Mrs. Honeychurch; others are lost.
-The sentence is confused, but the better illustrates Lucy’s state of
-mind, for she was trying to talk to Mr. Beebe at the same time.
-
-“Oh, it has been such a nuisance—first he, then they—no one knowing
-what they wanted, and everyone so tiresome.”
-
-“But they really are coming now,” said Mr. Beebe. “I wrote to Miss
-Teresa a few days ago—she was wondering how often the butcher called,
-and my reply of once a month must have impressed her favourably. They
-are coming. I heard from them this morning.
-
-“I shall hate those Miss Alans!” Mrs. Honeychurch cried. “Just because
-they’re old and silly one’s expected to say ‘How sweet!’ I hate their
-‘if’-ing and ‘but’-ing and ‘and’-ing. And poor Lucy—serve her
-right—worn to a shadow.”
-
-Mr. Beebe watched the shadow springing and shouting over the
-tennis-court. Cecil was absent—one did not play bumble-puppy when he
-was there.
-
-“Well, if they are coming—No, Minnie, not Saturn.” Saturn was a
-tennis-ball whose skin was partially unsewn. When in motion his orb was
-encircled by a ring. “If they are coming, Sir Harry will let them move
-in before the twenty-ninth, and he will cross out the clause about
-whitewashing the ceilings, because it made them nervous, and put in the
-fair wear and tear one.—That doesn’t count. I told you not Saturn.”
-
-“Saturn’s all right for bumble-puppy,” cried Freddy, joining them.
-“Minnie, don’t you listen to her.”
-
-“Saturn doesn’t bounce.”
-
-“Saturn bounces enough.”
-
-“No, he doesn’t.”
-
-“Well; he bounces better than the Beautiful White Devil.”
-
-“Hush, dear,” said Mrs. Honeychurch.
-
-“But look at Lucy—complaining of Saturn, and all the time’s got the
-Beautiful White Devil in her hand, ready to plug it in. That’s right,
-Minnie, go for her—get her over the shins with the racquet—get her over
-the shins!”
-
-Lucy fell, the Beautiful White Devil rolled from her hand.
-
-Mr. Beebe picked it up, and said: “The name of this ball is Vittoria
-Corombona, please.” But his correction passed unheeded.
-
-Freddy possessed to a high degree the power of lashing little girls to
-fury, and in half a minute he had transformed Minnie from a
-well-mannered child into a howling wilderness. Up in the house Cecil
-heard them, and, though he was full of entertaining news, he did not
-come down to impart it, in case he got hurt. He was not a coward and
-bore necessary pain as well as any man. But he hated the physical
-violence of the young. How right it was! Sure enough it ended in a cry.
-
-“I wish the Miss Alans could see this,” observed Mr. Beebe, just as
-Lucy, who was nursing the injured Minnie, was in turn lifted off her
-feet by her brother.
-
-“Who are the Miss Alans?” Freddy panted.
-
-“They have taken Cissie Villa.”
-
-“That wasn’t the name—”
-
-Here his foot slipped, and they all fell most agreeably on to the
-grass. An interval elapses.
-
-“Wasn’t what name?” asked Lucy, with her brother’s head in her lap.
-
-“Alan wasn’t the name of the people Sir Harry’s let to.”
-
-“Nonsense, Freddy! You know nothing about it.”
-
-“Nonsense yourself! I’ve this minute seen him. He said to me: ‘Ahem!
-Honeychurch,’”—Freddy was an indifferent mimic—“‘ahem! ahem! I have at
-last procured really dee-sire-rebel tenants.’ I said, ‘ooray, old boy!’
-and slapped him on the back.”
-
-“Exactly. The Miss Alans?”
-
-“Rather not. More like Anderson.”
-
-“Oh, good gracious, there isn’t going to be another muddle!” Mrs.
-Honeychurch exclaimed. “Do you notice, Lucy, I’m always right? I _said_
-don’t interfere with Cissie Villa. I’m always right. I’m quite uneasy
-at being always right so often.”
-
-“It’s only another muddle of Freddy’s. Freddy doesn’t even know the
-name of the people he pretends have taken it instead.”
-
-“Yes, I do. I’ve got it. Emerson.”
-
-“What name?”
-
-“Emerson. I’ll bet you anything you like.”
-
-“What a weathercock Sir Harry is,” said Lucy quietly. “I wish I had
-never bothered over it at all.”
-
-Then she lay on her back and gazed at the cloudless sky. Mr. Beebe,
-whose opinion of her rose daily, whispered to his niece that _that_ was
-the proper way to behave if any little thing went wrong.
-
-Meanwhile the name of the new tenants had diverted Mrs. Honeychurch
-from the contemplation of her own abilities.
-
-“Emerson, Freddy? Do you know what Emersons they are?”
-
-“I don’t know whether they’re any Emersons,” retorted Freddy, who was
-democratic. Like his sister and like most young people, he was
-naturally attracted by the idea of equality, and the undeniable fact
-that there are different kinds of Emersons annoyed him beyond measure.
-
-“I trust they are the right sort of person. All right, Lucy”—she was
-sitting up again—“I see you looking down your nose and thinking your
-mother’s a snob. But there is a right sort and a wrong sort, and it’s
-affectation to pretend there isn’t.”
-
-“Emerson’s a common enough name,” Lucy remarked.
-
-She was gazing sideways. Seated on a promontory herself, she could see
-the pine-clad promontories descending one beyond another into the
-Weald. The further one descended the garden, the more glorious was this
-lateral view.
-
-“I was merely going to remark, Freddy, that I trusted they were no
-relations of Emerson the philosopher, a most trying man. Pray, does
-that satisfy you?”
-
-“Oh, yes,” he grumbled. “And you will be satisfied, too, for they’re
-friends of Cecil; so”—elaborate irony—“you and the other country
-families will be able to call in perfect safety.”
-
-“_Cecil?_” exclaimed Lucy.
-
-“Don’t be rude, dear,” said his mother placidly. “Lucy, don’t screech.
-It’s a new bad habit you’re getting into.”
-
-“But has Cecil—”
-
-“Friends of Cecil’s,” he repeated, “‘and so really dee-sire-rebel.
-Ahem! Honeychurch, I have just telegraphed to them.’”
-
-She got up from the grass.
-
-It was hard on Lucy. Mr. Beebe sympathized with her very much. While
-she believed that her snub about the Miss Alans came from Sir Harry
-Otway, she had borne it like a good girl. She might well “screech” when
-she heard that it came partly from her lover. Mr. Vyse was a
-tease—something worse than a tease: he took a malicious pleasure in
-thwarting people. The clergyman, knowing this, looked at Miss
-Honeychurch with more than his usual kindness.
-
-When she exclaimed, “But Cecil’s Emersons—they can’t possibly be the
-same ones—there is that—” he did not consider that the exclamation was
-strange, but saw in it an opportunity of diverting the conversation
-while she recovered her composure. He diverted it as follows:
-
-“The Emersons who were at Florence, do you mean? No, I don’t suppose it
-will prove to be them. It is probably a long cry from them to friends
-of Mr. Vyse’s. Oh, Mrs. Honeychurch, the oddest people! The queerest
-people! For our part we liked them, didn’t we?” He appealed to Lucy.
-“There was a great scene over some violets. They picked violets and
-filled all the vases in the room of these very Miss Alans who have
-failed to come to Cissie Villa. Poor little ladies! So shocked and so
-pleased. It used to be one of Miss Catharine’s great stories. ‘My dear
-sister loves flowers,’ it began. They found the whole room a mass of
-blue—vases and jugs—and the story ends with ‘So ungentlemanly and yet
-so beautiful.’ It is all very difficult. Yes, I always connect those
-Florentine Emersons with violets.”
-
-“Fiasco’s done you this time,” remarked Freddy, not seeing that his
-sister’s face was very red. She could not recover herself. Mr. Beebe
-saw it, and continued to divert the conversation.
-
-“These particular Emersons consisted of a father and a son—the son a
-goodly, if not a good young man; not a fool, I fancy, but very
-immature—pessimism, et cetera. Our special joy was the father—such a
-sentimental darling, and people declared he had murdered his wife.”
-
-In his normal state Mr. Beebe would never have repeated such gossip,
-but he was trying to shelter Lucy in her little trouble. He repeated
-any rubbish that came into his head.
-
-“Murdered his wife?” said Mrs. Honeychurch. “Lucy, don’t desert us—go
-on playing bumble-puppy. Really, the Pension Bertolini must have been
-the oddest place. That’s the second murderer I’ve heard of as being
-there. Whatever was Charlotte doing to stop? By-the-by, we really must
-ask Charlotte here some time.”
-
-Mr. Beebe could recall no second murderer. He suggested that his
-hostess was mistaken. At the hint of opposition she warmed. She was
-perfectly sure that there had been a second tourist of whom the same
-story had been told. The name escaped her. What was the name? Oh, what
-was the name? She clasped her knees for the name. Something in
-Thackeray. She struck her matronly forehead.
-
-Lucy asked her brother whether Cecil was in.
-
-“Oh, don’t go!” he cried, and tried to catch her by the ankles.
-
-“I must go,” she said gravely. “Don’t be silly. You always overdo it
-when you play.”
-
-As she left them her mother’s shout of “Harris!” shivered the tranquil
-air, and reminded her that she had told a lie and had never put it
-right. Such a senseless lie, too, yet it shattered her nerves and made
-her connect these Emersons, friends of Cecil’s, with a pair of
-nondescript tourists. Hitherto truth had come to her naturally. She saw
-that for the future she must be more vigilant, and be—absolutely
-truthful? Well, at all events, she must not tell lies. She hurried up
-the garden, still flushed with shame. A word from Cecil would soothe
-her, she was sure.
-
-“Cecil!”
-
-“Hullo!” he called, and leant out of the smoking-room window. He seemed
-in high spirits. “I was hoping you’d come. I heard you all
-bear-gardening, but there’s better fun up here. I, even I, have won a
-great victory for the Comic Muse. George Meredith’s right—the cause of
-Comedy and the cause of Truth are really the same; and I, even I, have
-found tenants for the distressful Cissie Villa. Don’t be angry! Don’t
-be angry! You’ll forgive me when you hear it all.”
-
-He looked very attractive when his face was bright, and he dispelled
-her ridiculous forebodings at once.
-
-“I have heard,” she said. “Freddy has told us. Naughty Cecil! I suppose
-I must forgive you. Just think of all the trouble I took for nothing!
-Certainly the Miss Alans are a little tiresome, and I’d rather have
-nice friends of yours. But you oughtn’t to tease one so.”
-
-“Friends of mine?” he laughed. “But, Lucy, the whole joke is to come!
-Come here.” But she remained standing where she was. “Do you know where
-I met these desirable tenants? In the National Gallery, when I was up
-to see my mother last week.”
-
-“What an odd place to meet people!” she said nervously. “I don’t quite
-understand.”
-
-“In the Umbrian Room. Absolute strangers. They were admiring Luca
-Signorelli—of course, quite stupidly. However, we got talking, and they
-refreshed me not a little. They had been to Italy.”
-
-“But, Cecil—” proceeded hilariously.
-
-“In the course of conversation they said that they wanted a country
-cottage—the father to live there, the son to run down for week-ends. I
-thought, ‘What a chance of scoring off Sir Harry!’ and I took their
-address and a London reference, found they weren’t actual
-blackguards—it was great sport—and wrote to him, making out—”
-
-“Cecil! No, it’s not fair. I’ve probably met them before—”
-
-He bore her down.
-
-“Perfectly fair. Anything is fair that punishes a snob. That old man
-will do the neighbourhood a world of good. Sir Harry is too disgusting
-with his ‘decayed gentlewomen.’ I meant to read him a lesson some time.
-No, Lucy, the classes ought to mix, and before long you’ll agree with
-me. There ought to be intermarriage—all sorts of things. I believe in
-democracy—”
-
-“No, you don’t,” she snapped. “You don’t know what the word means.”
-
-He stared at her, and felt again that she had failed to be
-Leonardesque. “No, you don’t!”
-
-Her face was inartistic—that of a peevish virago.
-
-“It isn’t fair, Cecil. I blame you—I blame you very much indeed. You
-had no business to undo my work about the Miss Alans, and make me look
-ridiculous. You call it scoring off Sir Harry, but do you realize that
-it is all at my expense? I consider it most disloyal of you.”
-
-She left him.
-
-“Temper!” he thought, raising his eyebrows.
-
-No, it was worse than temper—snobbishness. As long as Lucy thought that
-his own smart friends were supplanting the Miss Alans, she had not
-minded. He perceived that these new tenants might be of value
-educationally. He would tolerate the father and draw out the son, who
-was silent. In the interests of the Comic Muse and of Truth, he would
-bring them to Windy Corner.
-
-
-
-
-Chapter XI
-In Mrs. Vyse’s Well-Appointed Flat
-
-
-The Comic Muse, though able to look after her own interests, did not
-disdain the assistance of Mr. Vyse. His idea of bringing the Emersons
-to Windy Corner struck her as decidedly good, and she carried through
-the negotiations without a hitch. Sir Harry Otway signed the agreement,
-met Mr. Emerson, who was duly disillusioned. The Miss Alans were duly
-offended, and wrote a dignified letter to Lucy, whom they held
-responsible for the failure. Mr. Beebe planned pleasant moments for the
-new-comers, and told Mrs. Honeychurch that Freddy must call on them as
-soon as they arrived. Indeed, so ample was the Muse’s equipment that
-she permitted Mr. Harris, never a very robust criminal, to droop his
-head, to be forgotten, and to die.
-
-Lucy—to descend from bright heaven to earth, whereon there are shadows
-because there are hills—Lucy was at first plunged into despair, but
-settled after a little thought that it did not matter the very least.
-Now that she was engaged, the Emersons would scarcely insult her and
-were welcome into the neighbourhood. And Cecil was welcome to bring
-whom he would into the neighbourhood. Therefore Cecil was welcome to
-bring the Emersons into the neighbourhood. But, as I say, this took a
-little thinking, and—so illogical are girls—the event remained rather
-greater and rather more dreadful than it should have done. She was glad
-that a visit to Mrs. Vyse now fell due; the tenants moved into Cissie
-Villa while she was safe in the London flat.
-
-“Cecil—Cecil darling,” she whispered the evening she arrived, and crept
-into his arms.
-
-Cecil, too, became demonstrative. He saw that the needful fire had been
-kindled in Lucy. At last she longed for attention, as a woman should,
-and looked up to him because he was a man.
-
-“So you do love me, little thing?” he murmured.
-
-“Oh, Cecil, I do, I do! I don’t know what I should do without you.”
-
-Several days passed. Then she had a letter from Miss Bartlett. A
-coolness had sprung up between the two cousins, and they had not
-corresponded since they parted in August. The coolness dated from what
-Charlotte would call “the flight to Rome,” and in Rome it had increased
-amazingly. For the companion who is merely uncongenial in the mediaeval
-world becomes exasperating in the classical. Charlotte, unselfish in
-the Forum, would have tried a sweeter temper than Lucy’s, and once, in
-the Baths of Caracalla, they had doubted whether they could continue
-their tour. Lucy had said she would join the Vyses—Mrs. Vyse was an
-acquaintance of her mother, so there was no impropriety in the plan and
-Miss Bartlett had replied that she was quite used to being abandoned
-suddenly. Finally nothing happened; but the coolness remained, and, for
-Lucy, was even increased when she opened the letter and read as
-follows. It had been forwarded from Windy Corner.
-
-“TUNBRIDGE WELLS,
-“_September_.
-
-
-“DEAREST LUCIA,
-
-
-“I have news of you at last! Miss Lavish has been bicycling in your
-parts, but was not sure whether a call would be welcome. Puncturing her
-tire near Summer Street, and it being mended while she sat very
-woebegone in that pretty churchyard, she saw to her astonishment, a
-door open opposite and the younger Emerson man come out. He said his
-father had just taken the house. He _said_ he did not know that you
-lived in the neighbourhood (?). He never suggested giving Eleanor a cup
-of tea. Dear Lucy, I am much worried, and I advise you to make a clean
-breast of his past behaviour to your mother, Freddy, and Mr. Vyse, who
-will forbid him to enter the house, etc. That was a great misfortune,
-and I dare say you have told them already. Mr. Vyse is so sensitive. I
-remember how I used to get on his nerves at Rome. I am very sorry about
-it all, and should not feel easy unless I warned you.
-
-
-“Believe me,
-“Your anxious and loving cousin,
-“CHARLOTTE.”
-
-
-Lucy was much annoyed, and replied as follows:
-
-“BEAUCHAMP MANSIONS, S.W.
-
-
-
-
-“DEAR CHARLOTTE,
-
-“Many thanks for your warning. When Mr. Emerson forgot himself on the
-mountain, you made me promise not to tell mother, because you said she
-would blame you for not being always with me. I have kept that promise,
-and cannot possibly tell her now. I have said both to her and Cecil
-that I met the Emersons at Florence, and that they are respectable
-people—which I _do_ think—and the reason that he offered Miss Lavish no
-tea was probably that he had none himself. She should have tried at the
-Rectory. I cannot begin making a fuss at this stage. You must see that
-it would be too absurd. If the Emersons heard I had complained of them,
-they would think themselves of importance, which is exactly what they
-are not. I like the old father, and look forward to seeing him again.
-As for the son, I am sorry for _him_ when we meet, rather than for
-myself. They are known to Cecil, who is very well and spoke of you the
-other day. We expect to be married in January.
-
-“Miss Lavish cannot have told you much about me, for I am not at Windy
-Corner at all, but here. Please do not put ‘Private’ outside your
-envelope again. No one opens my letters.
-
-
-“Yours affectionately,
-“L. M. HONEYCHURCH.”
-
-
-Secrecy has this disadvantage: we lose the sense of proportion; we
-cannot tell whether our secret is important or not. Were Lucy and her
-cousin closeted with a great thing which would destroy Cecil’s life if
-he discovered it, or with a little thing which he would laugh at? Miss
-Bartlett suggested the former. Perhaps she was right. It had become a
-great thing now. Left to herself, Lucy would have told her mother and
-her lover ingenuously, and it would have remained a little thing.
-“Emerson, not Harris”; it was only that a few weeks ago. She tried to
-tell Cecil even now when they were laughing about some beautiful lady
-who had smitten his heart at school. But her body behaved so
-ridiculously that she stopped.
-
-She and her secret stayed ten days longer in the deserted Metropolis
-visiting the scenes they were to know so well later on. It did her no
-harm, Cecil thought, to learn the framework of society, while society
-itself was absent on the golf-links or the moors. The weather was cool,
-and it did her no harm. In spite of the season, Mrs. Vyse managed to
-scrape together a dinner-party consisting entirely of the grandchildren
-of famous people. The food was poor, but the talk had a witty weariness
-that impressed the girl. One was tired of everything, it seemed. One
-launched into enthusiasms only to collapse gracefully, and pick oneself
-up amid sympathetic laughter. In this atmosphere the Pension Bertolini
-and Windy Corner appeared equally crude, and Lucy saw that her London
-career would estrange her a little from all that she had loved in the
-past.
-
-The grandchildren asked her to play the piano.
-
-She played Schumann. “Now some Beethoven” called Cecil, when the
-querulous beauty of the music had died. She shook her head and played
-Schumann again. The melody rose, unprofitably magical. It broke; it was
-resumed broken, not marching once from the cradle to the grave. The
-sadness of the incomplete—the sadness that is often Life, but should
-never be Art—throbbed in its disjected phrases, and made the nerves of
-the audience throb. Not thus had she played on the little draped piano
-at the Bertolini, and “Too much Schumann” was not the remark that Mr.
-Beebe had passed to himself when she returned.
-
-When the guests were gone, and Lucy had gone to bed, Mrs. Vyse paced up
-and down the drawing-room, discussing her little party with her son.
-Mrs. Vyse was a nice woman, but her personality, like many another’s,
-had been swamped by London, for it needs a strong head to live among
-many people. The too vast orb of her fate had crushed her; and she had
-seen too many seasons, too many cities, too many men, for her
-abilities, and even with Cecil she was mechanical, and behaved as if he
-was not one son, but, so to speak, a filial crowd.
-
-“Make Lucy one of us,” she said, looking round intelligently at the end
-of each sentence, and straining her lips apart until she spoke again.
-“Lucy is becoming wonderful—wonderful.”
-
-“Her music always was wonderful.”
-
-“Yes, but she is purging off the Honeychurch taint, most excellent
-Honeychurches, but you know what I mean. She is not always quoting
-servants, or asking one how the pudding is made.”
-
-“Italy has done it.”
-
-“Perhaps,” she murmured, thinking of the museum that represented Italy
-to her. “It is just possible. Cecil, mind you marry her next January.
-She is one of us already.”
-
-“But her music!” he exclaimed. “The style of her! How she kept to
-Schumann when, like an idiot, I wanted Beethoven. Schumann was right
-for this evening. Schumann was the thing. Do you know, mother, I shall
-have our children educated just like Lucy. Bring them up among honest
-country folks for freshness, send them to Italy for subtlety, and
-then—not till then—let them come to London. I don’t believe in these
-London educations—” He broke off, remembering that he had had one
-himself, and concluded, “At all events, not for women.”
-
-“Make her one of us,” repeated Mrs. Vyse, and processed to bed.
-
-As she was dozing off, a cry—the cry of nightmare—rang from Lucy’s
-room. Lucy could ring for the maid if she liked but Mrs. Vyse thought
-it kind to go herself. She found the girl sitting upright with her hand
-on her cheek.
-
-“I am so sorry, Mrs. Vyse—it is these dreams.”
-
-“Bad dreams?”
-
-“Just dreams.”
-
-The elder lady smiled and kissed her, saying very distinctly: “You
-should have heard us talking about you, dear. He admires you more than
-ever. Dream of that.”
-
-Lucy returned the kiss, still covering one cheek with her hand. Mrs.
-Vyse recessed to bed. Cecil, whom the cry had not awoke, snored.
-Darkness enveloped the flat.
-
-
-
-
-Chapter XII
-Twelfth Chapter
-
-
-It was a Saturday afternoon, gay and brilliant after abundant rains,
-and the spirit of youth dwelt in it, though the season was now autumn.
-All that was gracious triumphed. As the motorcars passed through Summer
-Street they raised only a little dust, and their stench was soon
-dispersed by the wind and replaced by the scent of the wet birches or
-of the pines. Mr. Beebe, at leisure for life’s amenities, leant over
-his Rectory gate. Freddy leant by him, smoking a pendant pipe.
-
-“Suppose we go and hinder those new people opposite for a little.”
-
-“M’m.”
-
-“They might amuse you.”
-
-Freddy, whom his fellow-creatures never amused, suggested that the new
-people might be feeling a bit busy, and so on, since they had only just
-moved in.
-
-“I suggested we should hinder them,” said Mr. Beebe. “They are worth
-it.” Unlatching the gate, he sauntered over the triangular green to
-Cissie Villa. “Hullo!” he cried, shouting in at the open door, through
-which much squalor was visible.
-
-A grave voice replied, “Hullo!”
-
-“I’ve brought someone to see you.”
-
-“I’ll be down in a minute.”
-
-The passage was blocked by a wardrobe, which the removal men had failed
-to carry up the stairs. Mr. Beebe edged round it with difficulty. The
-sitting-room itself was blocked with books.
-
-“Are these people great readers?” Freddy whispered. “Are they that
-sort?”
-
-“I fancy they know how to read—a rare accomplishment. What have they
-got? Byron. Exactly. A Shropshire Lad. Never heard of it. The Way of
-All Flesh. Never heard of it. Gibbon. Hullo! dear George reads German.
-Um—um—Schopenhauer, Nietzsche, and so we go on. Well, I suppose your
-generation knows its own business, Honeychurch.”
-
-“Mr. Beebe, look at that,” said Freddy in awestruck tones.
-
-On the cornice of the wardrobe, the hand of an amateur had painted this
-inscription: “Mistrust all enterprises that require new clothes.”
-
-“I know. Isn’t it jolly? I like that. I’m certain that’s the old man’s
-doing.”
-
-“How very odd of him!”
-
-“Surely you agree?”
-
-But Freddy was his mother’s son and felt that one ought not to go on
-spoiling the furniture.
-
-“Pictures!” the clergyman continued, scrambling about the room.
-“Giotto—they got that at Florence, I’ll be bound.”
-
-“The same as Lucy’s got.”
-
-“Oh, by-the-by, did Miss Honeychurch enjoy London?”
-
-“She came back yesterday.”
-
-“I suppose she had a good time?”
-
-“Yes, very,” said Freddy, taking up a book. “She and Cecil are thicker
-than ever.”
-
-“That’s good hearing.”
-
-“I wish I wasn’t such a fool, Mr. Beebe.”
-
-Mr. Beebe ignored the remark.
-
-“Lucy used to be nearly as stupid as I am, but it’ll be very different
-now, mother thinks. She will read all kinds of books.”
-
-“So will you.”
-
-“Only medical books. Not books that you can talk about afterwards.
-Cecil is teaching Lucy Italian, and he says her playing is wonderful.
-There are all kinds of things in it that we have never noticed. Cecil
-says—”
-
-“What on earth are those people doing upstairs? Emerson—we think we’ll
-come another time.”
-
-George ran down-stairs and pushed them into the room without speaking.
-
-“Let me introduce Mr. Honeychurch, a neighbour.”
-
-Then Freddy hurled one of the thunderbolts of youth. Perhaps he was
-shy, perhaps he was friendly, or perhaps he thought that George’s face
-wanted washing. At all events he greeted him with, “How d’ye do? Come
-and have a bathe.”
-
-“Oh, all right,” said George, impassive.
-
-Mr. Beebe was highly entertained.
-
-“‘How d’ye do? how d’ye do? Come and have a bathe,’” he chuckled.
-“That’s the best conversational opening I’ve ever heard. But I’m afraid
-it will only act between men. Can you picture a lady who has been
-introduced to another lady by a third lady opening civilities with ‘How
-do you do? Come and have a bathe’? And yet you will tell me that the
-sexes are equal.”
-
-“I tell you that they shall be,” said Mr. Emerson, who had been slowly
-descending the stairs. “Good afternoon, Mr. Beebe. I tell you they
-shall be comrades, and George thinks the same.”
-
-“We are to raise ladies to our level?” the clergyman inquired.
-
-“The Garden of Eden,” pursued Mr. Emerson, still descending, “which you
-place in the past, is really yet to come. We shall enter it when we no
-longer despise our bodies.”
-
-Mr. Beebe disclaimed placing the Garden of Eden anywhere.
-
-“In this—not in other things—we men are ahead. We despise the body less
-than women do. But not until we are comrades shall we enter the
-garden.”
-
-“I say, what about this bathe?” murmured Freddy, appalled at the mass
-of philosophy that was approaching him.
-
-“I believed in a return to Nature once. But how can we return to Nature
-when we have never been with her? To-day, I believe that we must
-discover Nature. After many conquests we shall attain simplicity. It is
-our heritage.”
-
-“Let me introduce Mr. Honeychurch, whose sister you will remember at
-Florence.”
-
-“How do you do? Very glad to see you, and that you are taking George
-for a bathe. Very glad to hear that your sister is going to marry.
-Marriage is a duty. I am sure that she will be happy, for we know Mr.
-Vyse, too. He has been most kind. He met us by chance in the National
-Gallery, and arranged everything about this delightful house. Though I
-hope I have not vexed Sir Harry Otway. I have met so few Liberal
-landowners, and I was anxious to compare his attitude towards the game
-laws with the Conservative attitude. Ah, this wind! You do well to
-bathe. Yours is a glorious country, Honeychurch!”
-
-“Not a bit!” mumbled Freddy. “I must—that is to say, I have to—have the
-pleasure of calling on you later on, my mother says, I hope.”
-
-“_Call_, my lad? Who taught us that drawing-room twaddle? Call on your
-grandmother! Listen to the wind among the pines! Yours is a glorious
-country.”
-
-Mr. Beebe came to the rescue.
-
-“Mr. Emerson, he will call, I shall call; you or your son will return
-our calls before ten days have elapsed. I trust that you have realized
-about the ten days’ interval. It does not count that I helped you with
-the stair-eyes yesterday. It does not count that they are going to
-bathe this afternoon.”
-
-“Yes, go and bathe, George. Why do you dawdle talking? Bring them back
-to tea. Bring back some milk, cakes, honey. The change will do you
-good. George has been working very hard at his office. I can’t believe
-he’s well.”
-
-George bowed his head, dusty and sombre, exhaling the peculiar smell of
-one who has handled furniture.
-
-“Do you really want this bathe?” Freddy asked him. “It is only a pond,
-don’t you know. I dare say you are used to something better.”
-
-“Yes—I have said ‘Yes’ already.”
-
-Mr. Beebe felt bound to assist his young friend, and led the way out of
-the house and into the pine-woods. How glorious it was! For a little
-time the voice of old Mr. Emerson pursued them dispensing good wishes
-and philosophy. It ceased, and they only heard the fair wind blowing
-the bracken and the trees. Mr. Beebe, who could be silent, but who
-could not bear silence, was compelled to chatter, since the expedition
-looked like a failure, and neither of his companions would utter a
-word. He spoke of Florence. George attended gravely, assenting or
-dissenting with slight but determined gestures that were as
-inexplicable as the motions of the tree-tops above their heads.
-
-“And what a coincidence that you should meet Mr. Vyse! Did you realize
-that you would find all the Pension Bertolini down here?”
-
-“I did not. Miss Lavish told me.”
-
-“When I was a young man, I always meant to write a ‘History of
-Coincidence.’”
-
-No enthusiasm.
-
-“Though, as a matter of fact, coincidences are much rarer than we
-suppose. For example, it isn’t purely coincidentally that you are here
-now, when one comes to reflect.”
-
-To his relief, George began to talk.
-
-“It is. I have reflected. It is Fate. Everything is Fate. We are flung
-together by Fate, drawn apart by Fate—flung together, drawn apart. The
-twelve winds blow us—we settle nothing—”
-
-“You have not reflected at all,” rapped the clergyman. “Let me give you
-a useful tip, Emerson: attribute nothing to Fate. Don’t say, ‘I didn’t
-do this,’ for you did it, ten to one. Now I’ll cross-question you.
-Where did you first meet Miss Honeychurch and myself?”
-
-“Italy.”
-
-“And where did you meet Mr. Vyse, who is going to marry Miss
-Honeychurch?”
-
-“National Gallery.”
-
-“Looking at Italian art. There you are, and yet you talk of coincidence
-and Fate. You naturally seek out things Italian, and so do we and our
-friends. This narrows the field immeasurably we meet again in it.”
-
-“It is Fate that I am here,” persisted George. “But you can call it
-Italy if it makes you less unhappy.”
-
-Mr. Beebe slid away from such heavy treatment of the subject. But he
-was infinitely tolerant of the young, and had no desire to snub George.
-
-“And so for this and for other reasons my ‘History of Coincidence’ is
-still to write.”
-
-Silence.
-
-Wishing to round off the episode, he added; “We are all so glad that
-you have come.”
-
-Silence.
-
-“Here we are!” called Freddy.
-
-“Oh, good!” exclaimed Mr. Beebe, mopping his brow.
-
-“In there’s the pond. I wish it was bigger,” he added apologetically.
-
-They climbed down a slippery bank of pine-needles. There lay the pond,
-set in its little alp of green—only a pond, but large enough to contain
-the human body, and pure enough to reflect the sky. On account of the
-rains, the waters had flooded the surrounding grass, which showed like
-a beautiful emerald path, tempting these feet towards the central pool.
-
-“It’s distinctly successful, as ponds go,” said Mr. Beebe. “No
-apologies are necessary for the pond.”
-
-George sat down where the ground was dry, and drearily unlaced his
-boots.
-
-“Aren’t those masses of willow-herb splendid? I love willow-herb in
-seed. What’s the name of this aromatic plant?”
-
-No one knew, or seemed to care.
-
-“These abrupt changes of vegetation—this little spongeous tract of
-water plants, and on either side of it all the growths are tough or
-brittle—heather, bracken, hurts, pines. Very charming, very charming.”
-
-“Mr. Beebe, aren’t you bathing?” called Freddy, as he stripped himself.
-
-Mr. Beebe thought he was not.
-
-“Water’s wonderful!” cried Freddy, prancing in.
-
-“Water’s water,” murmured George. Wetting his hair first—a sure sign of
-apathy—he followed Freddy into the divine, as indifferent as if he were
-a statue and the pond a pail of soapsuds. It was necessary to use his
-muscles. It was necessary to keep clean. Mr. Beebe watched them, and
-watched the seeds of the willow-herb dance chorically above their
-heads.
-
-“Apooshoo, apooshoo, apooshoo,” went Freddy, swimming for two strokes
-in either direction, and then becoming involved in reeds or mud.
-
-“Is it worth it?” asked the other, Michelangelesque on the flooded
-margin.
-
-The bank broke away, and he fell into the pool before he had weighed
-the question properly.
-
-“Hee-poof—I’ve swallowed a pollywog, Mr. Beebe, water’s wonderful,
-water’s simply ripping.”
-
-“Water’s not so bad,” said George, reappearing from his plunge, and
-sputtering at the sun.
-
-“Water’s wonderful. Mr. Beebe, do.”
-
-“Apooshoo, kouf.”
-
-Mr. Beebe, who was hot, and who always acquiesced where possible,
-looked around him. He could detect no parishioners except the
-pine-trees, rising up steeply on all sides, and gesturing to each other
-against the blue. How glorious it was! The world of motor-cars and
-rural Deans receded inimitably. Water, sky, evergreens, a wind—these
-things not even the seasons can touch, and surely they lie beyond the
-intrusion of man?
-
-“I may as well wash too”; and soon his garments made a third little
-pile on the sward, and he too asserted the wonder of the water.
-
-It was ordinary water, nor was there very much of it, and, as Freddy
-said, it reminded one of swimming in a salad. The three gentlemen
-rotated in the pool breast high, after the fashion of the nymphs in
-Götterdämmerung. But either because the rains had given a freshness or
-because the sun was shedding a most glorious heat, or because two of
-the gentlemen were young in years and the third young in spirit—for
-some reason or other a change came over them, and they forgot Italy and
-Botany and Fate. They began to play. Mr. Beebe and Freddy splashed each
-other. A little deferentially, they splashed George. He was quiet: they
-feared they had offended him. Then all the forces of youth burst out.
-He smiled, flung himself at them, splashed them, ducked them, kicked
-them, muddied them, and drove them out of the pool.
-
-“Race you round it, then,” cried Freddy, and they raced in the
-sunshine, and George took a short cut and dirtied his shins, and had to
-bathe a second time. Then Mr. Beebe consented to run—a memorable sight.
-
-They ran to get dry, they bathed to get cool, they played at being
-Indians in the willow-herbs and in the bracken, they bathed to get
-clean. And all the time three little bundles lay discreetly on the
-sward, proclaiming:
-
-“No. We are what matters. Without us shall no enterprise begin. To us
-shall all flesh turn in the end.”
-
-“A try! A try!” yelled Freddy, snatching up George’s bundle and placing
-it beside an imaginary goal-post.
-
-“Socker rules,” George retorted, scattering Freddy’s bundle with a
-kick.
-
-“Goal!”
-
-“Goal!”
-
-“Pass!”
-
-“Take care my watch!” cried Mr. Beebe.
-
-Clothes flew in all directions.
-
-“Take care my hat! No, that’s enough, Freddy. Dress now. No, I say!”
-
-But the two young men were delirious. Away they twinkled into the
-trees, Freddy with a clerical waistcoat under his arm, George with a
-wide-awake hat on his dripping hair.
-
-“That’ll do!” shouted Mr. Beebe, remembering that after all he was in
-his own parish. Then his voice changed as if every pine-tree was a
-Rural Dean. “Hi! Steady on! I see people coming you fellows!”
-
-Yells, and widening circles over the dappled earth.
-
-“Hi! hi! _Ladies!_”
-
-Neither George nor Freddy was truly refined. Still, they did not hear
-Mr. Beebe’s last warning or they would have avoided Mrs. Honeychurch,
-Cecil, and Lucy, who were walking down to call on old Mrs. Butterworth.
-Freddy dropped the waistcoat at their feet, and dashed into some
-bracken. George whooped in their faces, turned and scudded away down
-the path to the pond, still clad in Mr. Beebe’s hat.
-
-“Gracious alive!” cried Mrs. Honeychurch. “Whoever were those
-unfortunate people? Oh, dears, look away! And poor Mr. Beebe, too!
-Whatever has happened?”
-
-“Come this way immediately,” commanded Cecil, who always felt that he
-must lead women, though he knew not whither, and protect them, though
-he knew not against what. He led them now towards the bracken where
-Freddy sat concealed.
-
-“Oh, poor Mr. Beebe! Was that his waistcoat we left in the path? Cecil,
-Mr. Beebe’s waistcoat—”
-
-No business of ours, said Cecil, glancing at Lucy, who was all parasol
-and evidently “minded.”
-
-“I fancy Mr. Beebe jumped back into the pond.”
-
-“This way, please, Mrs. Honeychurch, this way.”
-
-They followed him up the bank attempting the tense yet nonchalant
-expression that is suitable for ladies on such occasions.
-
-“Well, _I_ can’t help it,” said a voice close ahead, and Freddy reared
-a freckled face and a pair of snowy shoulders out of the fronds. “I
-can’t be trodden on, can I?”
-
-“Good gracious me, dear; so it’s you! What miserable management! Why
-not have a comfortable bath at home, with hot and cold laid on?”
-
-“Look here, mother, a fellow must wash, and a fellow’s got to dry, and
-if another fellow—”
-
-“Dear, no doubt you’re right as usual, but you are in no position to
-argue. Come, Lucy.” They turned. “Oh, look—don’t look! Oh, poor Mr.
-Beebe! How unfortunate again—”
-
-For Mr. Beebe was just crawling out of the pond, on whose surface
-garments of an intimate nature did float; while George, the world-weary
-George, shouted to Freddy that he had hooked a fish.
-
-“And me, I’ve swallowed one,” answered he of the bracken. “I’ve
-swallowed a pollywog. It wriggleth in my tummy. I shall die—Emerson you
-beast, you’ve got on my bags.”
-
-“Hush, dears,” said Mrs. Honeychurch, who found it impossible to remain
-shocked. “And do be sure you dry yourselves thoroughly first. All these
-colds come of not drying thoroughly.”
-
-“Mother, do come away,” said Lucy. “Oh for goodness’ sake, do come.”
-
-“Hullo!” cried George, so that again the ladies stopped.
-
-He regarded himself as dressed. Barefoot, bare-chested, radiant and
-personable against the shadowy woods, he called:
-
-“Hullo, Miss Honeychurch! Hullo!”
-
-“Bow, Lucy; better bow. Whoever is it? I shall bow.”
-
-Miss Honeychurch bowed.
-
-That evening and all that night the water ran away. On the morrow the
-pool had shrunk to its old size and lost its glory. It had been a call
-to the blood and to the relaxed will, a passing benediction whose
-influence did not pass, a holiness, a spell, a momentary chalice for
-youth.
-
-
-
-
-Chapter XIII
-How Miss Bartlett’s Boiler Was So Tiresome
-
-
-How often had Lucy rehearsed this bow, this interview! But she had
-always rehearsed them indoors, and with certain accessories, which
-surely we have a right to assume. Who could foretell that she and
-George would meet in the rout of a civilization, amidst an army of
-coats and collars and boots that lay wounded over the sunlit earth? She
-had imagined a young Mr. Emerson, who might be shy or morbid or
-indifferent or furtively impudent. She was prepared for all of these.
-But she had never imagined one who would be happy and greet her with
-the shout of the morning star.
-
-Indoors herself, partaking of tea with old Mrs. Butterworth, she
-reflected that it is impossible to foretell the future with any degree
-of accuracy, that it is impossible to rehearse life. A fault in the
-scenery, a face in the audience, an irruption of the audience on to the
-stage, and all our carefully planned gestures mean nothing, or mean too
-much. “I will bow,” she had thought. “I will not shake hands with him.
-That will be just the proper thing.” She had bowed—but to whom? To
-gods, to heroes, to the nonsense of school-girls! She had bowed across
-the rubbish that cumbers the world.
-
-So ran her thoughts, while her faculties were busy with Cecil. It was
-another of those dreadful engagement calls. Mrs. Butterworth had wanted
-to see him, and he did not want to be seen. He did not want to hear
-about hydrangeas, why they change their colour at the seaside. He did
-not want to join the C. O. S. When cross he was always elaborate, and
-made long, clever answers where “Yes” or “No” would have done. Lucy
-soothed him and tinkered at the conversation in a way that promised
-well for their married peace. No one is perfect, and surely it is wiser
-to discover the imperfections before wedlock. Miss Bartlett, indeed,
-though not in word, had taught the girl that this our life contains
-nothing satisfactory. Lucy, though she disliked the teacher, regarded
-the teaching as profound, and applied it to her lover.
-
-“Lucy,” said her mother, when they got home, “is anything the matter
-with Cecil?”
-
-The question was ominous; up till now Mrs. Honeychurch had behaved with
-charity and restraint.
-
-“No, I don’t think so, mother; Cecil’s all right.”
-
-“Perhaps he’s tired.”
-
-Lucy compromised: perhaps Cecil was a little tired.
-
-“Because otherwise”—she pulled out her bonnet-pins with gathering
-displeasure—“because otherwise I cannot account for him.”
-
-“I do think Mrs. Butterworth is rather tiresome, if you mean that.”
-
-“Cecil has told you to think so. You were devoted to her as a little
-girl, and nothing will describe her goodness to you through the typhoid
-fever. No—it is just the same thing everywhere.”
-
-“Let me just put your bonnet away, may I?”
-
-“Surely he could answer her civilly for one half-hour?”
-
-“Cecil has a very high standard for people,” faltered Lucy, seeing
-trouble ahead. “It’s part of his ideals—it is really that that makes
-him sometimes seem—”
-
-“Oh, rubbish! If high ideals make a young man rude, the sooner he gets
-rid of them the better,” said Mrs. Honeychurch, handing her the bonnet.
-
-“Now, mother! I’ve seen you cross with Mrs. Butterworth yourself!”
-
-“Not in that way. At times I could wring her neck. But not in that way.
-No. It is the same with Cecil all over.”
-
-“By-the-by—I never told you. I had a letter from Charlotte while I was
-away in London.”
-
-This attempt to divert the conversation was too puerile, and Mrs.
-Honeychurch resented it.
-
-“Since Cecil came back from London, nothing appears to please him.
-Whenever I speak he winces;—I see him, Lucy; it is useless to
-contradict me. No doubt I am neither artistic nor literary nor
-intellectual nor musical, but I cannot help the drawing-room furniture;
-your father bought it and we must put up with it, will Cecil kindly
-remember.”
-
-“I—I see what you mean, and certainly Cecil oughtn’t to. But he does
-not mean to be uncivil—he once explained—it is the _things_ that upset
-him—he is easily upset by ugly things—he is not uncivil to _people_.”
-
-“Is it a thing or a person when Freddy sings?”
-
-“You can’t expect a really musical person to enjoy comic songs as we
-do.”
-
-“Then why didn’t he leave the room? Why sit wriggling and sneering and
-spoiling everyone’s pleasure?”
-
-“We mustn’t be unjust to people,” faltered Lucy. Something had
-enfeebled her, and the case for Cecil, which she had mastered so
-perfectly in London, would not come forth in an effective form. The two
-civilizations had clashed—Cecil hinted that they might—and she was
-dazzled and bewildered, as though the radiance that lies behind all
-civilization had blinded her eyes. Good taste and bad taste were only
-catchwords, garments of diverse cut; and music itself dissolved to a
-whisper through pine-trees, where the song is not distinguishable from
-the comic song.
-
-She remained in much embarrassment, while Mrs. Honeychurch changed her
-frock for dinner; and every now and then she said a word, and made
-things no better. There was no concealing the fact, Cecil had meant to
-be supercilious, and he had succeeded. And Lucy—she knew not why—wished
-that the trouble could have come at any other time.
-
-“Go and dress, dear; you’ll be late.”
-
-“All right, mother—”
-
-“Don’t say ‘All right’ and stop. Go.”
-
-She obeyed, but loitered disconsolately at the landing window. It faced
-north, so there was little view, and no view of the sky. Now, as in the
-winter, the pine-trees hung close to her eyes. One connected the
-landing window with depression. No definite problem menaced her, but
-she sighed to herself, “Oh, dear, what shall I do, what shall I do?” It
-seemed to her that everyone else was behaving very badly. And she ought
-not to have mentioned Miss Bartlett’s letter. She must be more careful;
-her mother was rather inquisitive, and might have asked what it was
-about. Oh, dear, what should she do?—and then Freddy came bounding
-upstairs, and joined the ranks of the ill-behaved.
-
-“I say, those are topping people.”
-
-“My dear baby, how tiresome you’ve been! You have no business to take
-them bathing in the Sacred Lake; it’s much too public. It was all right
-for you but most awkward for everyone else. Do be more careful. You
-forget the place is growing half suburban.”
-
-“I say, is anything on to-morrow week?”
-
-“Not that I know of.”
-
-“Then I want to ask the Emersons up to Sunday tennis.”
-
-“Oh, I wouldn’t do that, Freddy, I wouldn’t do that with all this
-muddle.”
-
-“What’s wrong with the court? They won’t mind a bump or two, and I’ve
-ordered new balls.”
-
-“I meant _it’s_ better not. I really mean it.”
-
-He seized her by the elbows and humorously danced her up and down the
-passage. She pretended not to mind, but she could have screamed with
-temper. Cecil glanced at them as he proceeded to his toilet and they
-impeded Mary with her brood of hot-water cans. Then Mrs. Honeychurch
-opened her door and said: “Lucy, what a noise you’re making! I have
-something to say to you. Did you say you had had a letter from
-Charlotte?” and Freddy ran away.
-
-“Yes. I really can’t stop. I must dress too.”
-
-“How’s Charlotte?”
-
-“All right.”
-
-“Lucy!”
-
-The unfortunate girl returned.
-
-“You’ve a bad habit of hurrying away in the middle of one’s sentences.
-Did Charlotte mention her boiler?”
-
-“Her _what?_”
-
-“Don’t you remember that her boiler was to be had out in October, and
-her bath cistern cleaned out, and all kinds of terrible to-doings?”
-
-“I can’t remember all Charlotte’s worries,” said Lucy bitterly. “I
-shall have enough of my own, now that you are not pleased with Cecil.”
-
-Mrs. Honeychurch might have flamed out. She did not. She said: “Come
-here, old lady—thank you for putting away my bonnet—kiss me.” And,
-though nothing is perfect, Lucy felt for the moment that her mother and
-Windy Corner and the Weald in the declining sun were perfect.
-
-So the grittiness went out of life. It generally did at Windy Corner.
-At the last minute, when the social machine was clogged hopelessly, one
-member or other of the family poured in a drop of oil. Cecil despised
-their methods—perhaps rightly. At all events, they were not his own.
-
-Dinner was at half-past seven. Freddy gabbled the grace, and they drew
-up their heavy chairs and fell to. Fortunately, the men were hungry.
-Nothing untoward occurred until the pudding. Then Freddy said:
-
-“Lucy, what’s Emerson like?”
-
-“I saw him in Florence,” said Lucy, hoping that this would pass for a
-reply.
-
-“Is he the clever sort, or is he a decent chap?”
-
-“Ask Cecil; it is Cecil who brought him here.”
-
-“He is the clever sort, like myself,” said Cecil.
-
-Freddy looked at him doubtfully.
-
-“How well did you know them at the Bertolini?” asked Mrs. Honeychurch.
-
-“Oh, very slightly. I mean, Charlotte knew them even less than I did.”
-
-“Oh, that reminds me—you never told me what Charlotte said in her
-letter.”
-
-“One thing and another,” said Lucy, wondering whether she would get
-through the meal without a lie. “Among other things, that an awful
-friend of hers had been bicycling through Summer Street, wondered if
-she’d come up and see us, and mercifully didn’t.”
-
-“Lucy, I do call the way you talk unkind.”
-
-“She was a novelist,” said Lucy craftily. The remark was a happy one,
-for nothing roused Mrs. Honeychurch so much as literature in the hands
-of females. She would abandon every topic to inveigh against those
-women who (instead of minding their houses and their children) seek
-notoriety by print. Her attitude was: “If books must be written, let
-them be written by men”; and she developed it at great length, while
-Cecil yawned and Freddy played at “This year, next year, now, never,”
-with his plum-stones, and Lucy artfully fed the flames of her mother’s
-wrath. But soon the conflagration died down, and the ghosts began to
-gather in the darkness. There were too many ghosts about. The original
-ghost—that touch of lips on her cheek—had surely been laid long ago; it
-could be nothing to her that a man had kissed her on a mountain once.
-But it had begotten a spectral family—Mr. Harris, Miss Bartlett’s
-letter, Mr. Beebe’s memories of violets—and one or other of these was
-bound to haunt her before Cecil’s very eyes. It was Miss Bartlett who
-returned now, and with appalling vividness.
-
-“I have been thinking, Lucy, of that letter of Charlotte’s. How is
-she?”
-
-“I tore the thing up.”
-
-“Didn’t she say how she was? How does she sound? Cheerful?”
-
-“Oh, yes I suppose so—no—not very cheerful, I suppose.”
-
-“Then, depend upon it, it _is_ the boiler. I know myself how water
-preys upon one’s mind. I would rather anything else—even a misfortune
-with the meat.”
-
-Cecil laid his hand over his eyes.
-
-“So would I,” asserted Freddy, backing his mother up—backing up the
-spirit of her remark rather than the substance.
-
-“And I have been thinking,” she added rather nervously, “surely we
-could squeeze Charlotte in here next week, and give her a nice holiday
-while the plumbers at Tunbridge Wells finish. I have not seen poor
-Charlotte for so long.”
-
-It was more than her nerves could stand. And she could not protest
-violently after her mother’s goodness to her upstairs.
-
-“Mother, no!” she pleaded. “It’s impossible. We can’t have Charlotte on
-the top of the other things; we’re squeezed to death as it is. Freddy’s
-got a friend coming Tuesday, there’s Cecil, and you’ve promised to take
-in Minnie Beebe because of the diphtheria scare. It simply can’t be
-done.”
-
-“Nonsense! It can.”
-
-“If Minnie sleeps in the bath. Not otherwise.”
-
-“Minnie can sleep with you.”
-
-“I won’t have her.”
-
-“Then, if you’re so selfish, Mr. Floyd must share a room with Freddy.”
-
-“Miss Bartlett, Miss Bartlett, Miss Bartlett,” moaned Cecil, again
-laying his hand over his eyes.
-
-“It’s impossible,” repeated Lucy. “I don’t want to make difficulties,
-but it really isn’t fair on the maids to fill up the house so.”
-
-Alas!
-
-“The truth is, dear, you don’t like Charlotte.”
-
-“No, I don’t. And no more does Cecil. She gets on our nerves. You
-haven’t seen her lately, and don’t realize how tiresome she can be,
-though so good. So please, mother, don’t worry us this last summer; but
-spoil us by not asking her to come.”
-
-“Hear, hear!” said Cecil.
-
-Mrs. Honeychurch, with more gravity than usual, and with more feeling
-than she usually permitted herself, replied: “This isn’t very kind of
-you two. You have each other and all these woods to walk in, so full of
-beautiful things; and poor Charlotte has only the water turned off and
-plumbers. You are young, dears, and however clever young people are,
-and however many books they read, they will never guess what it feels
-like to grow old.”
-
-Cecil crumbled his bread.
-
-“I must say Cousin Charlotte was very kind to me that year I called on
-my bike,” put in Freddy. “She thanked me for coming till I felt like
-such a fool, and fussed round no end to get an egg boiled for my tea
-just right.”
-
-“I know, dear. She is kind to everyone, and yet Lucy makes this
-difficulty when we try to give her some little return.”
-
-But Lucy hardened her heart. It was no good being kind to Miss
-Bartlett. She had tried herself too often and too recently. One might
-lay up treasure in heaven by the attempt, but one enriched neither Miss
-Bartlett nor any one else upon earth. She was reduced to saying: “I
-can’t help it, mother. I don’t like Charlotte. I admit it’s horrid of
-me.”
-
-“From your own account, you told her as much.”
-
-“Well, she would leave Florence so stupidly. She flurried—”
-
-The ghosts were returning; they filled Italy, they were even usurping
-the places she had known as a child. The Sacred Lake would never be the
-same again, and, on Sunday week, something would even happen to Windy
-Corner. How would she fight against ghosts? For a moment the visible
-world faded away, and memories and emotions alone seemed real.
-
-“I suppose Miss Bartlett must come, since she boils eggs so well,” said
-Cecil, who was in rather a happier frame of mind, thanks to the
-admirable cooking.
-
-“I didn’t mean the egg was _well_ boiled,” corrected Freddy, “because
-in point of fact she forgot to take it off, and as a matter of fact I
-don’t care for eggs. I only meant how jolly kind she seemed.”
-
-Cecil frowned again. Oh, these Honeychurches! Eggs, boilers,
-hydrangeas, maids—of such were their lives compact. “May me and Lucy
-get down from our chairs?” he asked, with scarcely veiled insolence.
-“We don’t want no dessert.”
-
-
-
-
-Chapter XIV
-How Lucy Faced the External Situation Bravely
-
-
-Of course Miss Bartlett accepted. And, equally of course, she felt sure
-that she would prove a nuisance, and begged to be given an inferior
-spare room—something with no view, anything. Her love to Lucy. And,
-equally of course, George Emerson could come to tennis on the Sunday
-week.
-
-Lucy faced the situation bravely, though, like most of us, she only
-faced the situation that encompassed her. She never gazed inwards. If
-at times strange images rose from the depths, she put them down to
-nerves. When Cecil brought the Emersons to Summer Street, it had upset
-her nerves. Charlotte would burnish up past foolishness, and this might
-upset her nerves. She was nervous at night. When she talked to
-George—they met again almost immediately at the Rectory—his voice moved
-her deeply, and she wished to remain near him. How dreadful if she
-really wished to remain near him! Of course, the wish was due to
-nerves, which love to play such perverse tricks upon us. Once she had
-suffered from “things that came out of nothing and meant she didn’t
-know what.” Now Cecil had explained psychology to her one wet
-afternoon, and all the troubles of youth in an unknown world could be
-dismissed.
-
-It is obvious enough for the reader to conclude, “She loves young
-Emerson.” A reader in Lucy’s place would not find it obvious. Life is
-easy to chronicle, but bewildering to practice, and we welcome “nerves”
-or any other shibboleth that will cloak our personal desire. She loved
-Cecil; George made her nervous; will the reader explain to her that the
-phrases should have been reversed?
-
-But the external situation—she will face that bravely.
-
-The meeting at the Rectory had passed off well enough. Standing between
-Mr. Beebe and Cecil, she had made a few temperate allusions to Italy,
-and George had replied. She was anxious to show that she was not shy,
-and was glad that he did not seem shy either.
-
-“A nice fellow,” said Mr. Beebe afterwards “He will work off his
-crudities in time. I rather mistrust young men who slip into life
-gracefully.”
-
-Lucy said, “He seems in better spirits. He laughs more.”
-
-“Yes,” replied the clergyman. “He is waking up.”
-
-That was all. But, as the week wore on, more of her defences fell, and
-she entertained an image that had physical beauty. In spite of the
-clearest directions, Miss Bartlett contrived to bungle her arrival. She
-was due at the South-Eastern station at Dorking, whither Mrs.
-Honeychurch drove to meet her. She arrived at the London and Brighton
-station, and had to hire a cab up. No one was at home except Freddy and
-his friend, who had to stop their tennis and to entertain her for a
-solid hour. Cecil and Lucy turned up at four o’clock, and these, with
-little Minnie Beebe, made a somewhat lugubrious sextette upon the upper
-lawn for tea.
-
-“I shall never forgive myself,” said Miss Bartlett, who kept on rising
-from her seat, and had to be begged by the united company to remain. “I
-have upset everything. Bursting in on young people! But I insist on
-paying for my cab up. Grant that, at any rate.”
-
-“Our visitors never do such dreadful things,” said Lucy, while her
-brother, in whose memory the boiled egg had already grown
-unsubstantial, exclaimed in irritable tones: “Just what I’ve been
-trying to convince Cousin Charlotte of, Lucy, for the last half hour.”
-
-“I do not feel myself an ordinary visitor,” said Miss Bartlett, and
-looked at her frayed glove.
-
-“All right, if you’d really rather. Five shillings, and I gave a bob to
-the driver.”
-
-Miss Bartlett looked in her purse. Only sovereigns and pennies. Could
-any one give her change? Freddy had half a quid and his friend had four
-half-crowns. Miss Bartlett accepted their moneys and then said: “But
-who am I to give the sovereign to?”
-
-“Let’s leave it all till mother comes back,” suggested Lucy.
-
-“No, dear; your mother may take quite a long drive now that she is not
-hampered with me. We all have our little foibles, and mine is the
-prompt settling of accounts.”
-
-Here Freddy’s friend, Mr. Floyd, made the one remark of his that need
-be quoted: he offered to toss Freddy for Miss Bartlett’s quid. A
-solution seemed in sight, and even Cecil, who had been ostentatiously
-drinking his tea at the view, felt the eternal attraction of Chance,
-and turned round.
-
-But this did not do, either.
-
-“Please—please—I know I am a sad spoil-sport, but it would make me
-wretched. I should practically be robbing the one who lost.”
-
-“Freddy owes me fifteen shillings,” interposed Cecil. “So it will work
-out right if you give the pound to me.”
-
-“Fifteen shillings,” said Miss Bartlett dubiously. “How is that, Mr.
-Vyse?”
-
-“Because, don’t you see, Freddy paid your cab. Give me the pound, and
-we shall avoid this deplorable gambling.”
-
-Miss Bartlett, who was poor at figures, became bewildered and rendered
-up the sovereign, amidst the suppressed gurgles of the other youths.
-For a moment Cecil was happy. He was playing at nonsense among his
-peers. Then he glanced at Lucy, in whose face petty anxieties had
-marred the smiles. In January he would rescue his Leonardo from this
-stupefying twaddle.
-
-“But I don’t see that!” exclaimed Minnie Beebe who had narrowly watched
-the iniquitous transaction. “I don’t see why Mr. Vyse is to have the
-quid.”
-
-“Because of the fifteen shillings and the five,” they said solemnly.
-“Fifteen shillings and five shillings make one pound, you see.”
-
-“But I don’t see—”
-
-They tried to stifle her with cake.
-
-“No, thank you. I’m done. I don’t see why—Freddy, don’t poke me. Miss
-Honeychurch, your brother’s hurting me. Ow! What about Mr. Floyd’s ten
-shillings? Ow! No, I don’t see and I never shall see why Miss
-What’s-her-name shouldn’t pay that bob for the driver.”
-
-“I had forgotten the driver,” said Miss Bartlett, reddening. “Thank
-you, dear, for reminding me. A shilling was it? Can any one give me
-change for half a crown?”
-
-“I’ll get it,” said the young hostess, rising with decision.
-
-“Cecil, give me that sovereign. No, give me up that sovereign. I’ll get
-Euphemia to change it, and we’ll start the whole thing again from the
-beginning.”
-
-“Lucy—Lucy—what a nuisance I am!” protested Miss Bartlett, and followed
-her across the lawn. Lucy tripped ahead, simulating hilarity. When they
-were out of earshot Miss Bartlett stopped her wails and said quite
-briskly: “Have you told him about him yet?”
-
-“No, I haven’t,” replied Lucy, and then could have bitten her tongue
-for understanding so quickly what her cousin meant. “Let me see—a
-sovereign’s worth of silver.”
-
-She escaped into the kitchen. Miss Bartlett’s sudden transitions were
-too uncanny. It sometimes seemed as if she planned every word she spoke
-or caused to be spoken; as if all this worry about cabs and change had
-been a ruse to surprise the soul.
-
-“No, I haven’t told Cecil or any one,” she remarked, when she returned.
-“I promised you I shouldn’t. Here is your money—all shillings, except
-two half-crowns. Would you count it? You can settle your debt nicely
-now.”
-
-Miss Bartlett was in the drawing-room, gazing at the photograph of St.
-John ascending, which had been framed.
-
-“How dreadful!” she murmured, “how more than dreadful, if Mr. Vyse
-should come to hear of it from some other source.”
-
-“Oh, no, Charlotte,” said the girl, entering the battle. “George
-Emerson is all right, and what other source is there?”
-
-Miss Bartlett considered. “For instance, the driver. I saw him looking
-through the bushes at you, remember he had a violet between his teeth.”
-
-Lucy shuddered a little. “We shall get the silly affair on our nerves
-if we aren’t careful. How could a Florentine cab-driver ever get hold
-of Cecil?”
-
-“We must think of every possibility.”
-
-“Oh, it’s all right.”
-
-“Or perhaps old Mr. Emerson knows. In fact, he is certain to know.”
-
-“I don’t care if he does. I was grateful to you for your letter, but
-even if the news does get round, I think I can trust Cecil to laugh at
-it.”
-
-“To contradict it?”
-
-“No, to laugh at it.” But she knew in her heart that she could not
-trust him, for he desired her untouched.
-
-“Very well, dear, you know best. Perhaps gentlemen are different to
-what they were when I was young. Ladies are certainly different.”
-
-“Now, Charlotte!” She struck at her playfully. “You kind, anxious
-thing. What _would_ you have me do? First you say ‘Don’t tell’; and
-then you say, ‘Tell’. Which is it to be? Quick!”
-
-Miss Bartlett sighed “I am no match for you in conversation, dearest. I
-blush when I think how I interfered at Florence, and you so well able
-to look after yourself, and so much cleverer in all ways than I am. You
-will never forgive me.”
-
-“Shall we go out, then. They will smash all the china if we don’t.”
-
-For the air rang with the shrieks of Minnie, who was being scalped with
-a teaspoon.
-
-“Dear, one moment—we may not have this chance for a chat again. Have
-you seen the young one yet?”
-
-“Yes, I have.”
-
-“What happened?”
-
-“We met at the Rectory.”
-
-“What line is he taking up?”
-
-“No line. He talked about Italy, like any other person. It is really
-all right. What advantage would he get from being a cad, to put it
-bluntly? I do wish I could make you see it my way. He really won’t be
-any nuisance, Charlotte.”
-
-“Once a cad, always a cad. That is my poor opinion.”
-
-Lucy paused. “Cecil said one day—and I thought it so profound—that
-there are two kinds of cads—the conscious and the subconscious.” She
-paused again, to be sure of doing justice to Cecil’s profundity.
-Through the window she saw Cecil himself, turning over the pages of a
-novel. It was a new one from Smith’s library. Her mother must have
-returned from the station.
-
-“Once a cad, always a cad,” droned Miss Bartlett.
-
-“What I mean by subconscious is that Emerson lost his head. I fell into
-all those violets, and he was silly and surprised. I don’t think we
-ought to blame him very much. It makes such a difference when you see a
-person with beautiful things behind him unexpectedly. It really does;
-it makes an enormous difference, and he lost his head: he doesn’t
-admire me, or any of that nonsense, one straw. Freddy rather likes him,
-and has asked him up here on Sunday, so you can judge for yourself. He
-has improved; he doesn’t always look as if he’s going to burst into
-tears. He is a clerk in the General Manager’s office at one of the big
-railways—not a porter! and runs down to his father for week-ends. Papa
-was to do with journalism, but is rheumatic and has retired. There! Now
-for the garden.” She took hold of her guest by the arm. “Suppose we
-don’t talk about this silly Italian business any more. We want you to
-have a nice restful visit at Windy Corner, with no worriting.”
-
-Lucy thought this rather a good speech. The reader may have detected an
-unfortunate slip in it. Whether Miss Bartlett detected the slip one
-cannot say, for it is impossible to penetrate into the minds of elderly
-people. She might have spoken further, but they were interrupted by the
-entrance of her hostess. Explanations took place, and in the midst of
-them Lucy escaped, the images throbbing a little more vividly in her
-brain.
-
-
-
-
-Chapter XV
-The Disaster Within
-
-
-The Sunday after Miss Bartlett’s arrival was a glorious day, like most
-of the days of that year. In the Weald, autumn approached, breaking up
-the green monotony of summer, touching the parks with the grey bloom of
-mist, the beech-trees with russet, the oak-trees with gold. Up on the
-heights, battalions of black pines witnessed the change, themselves
-unchangeable. Either country was spanned by a cloudless sky, and in
-either arose the tinkle of church bells.
-
-The garden of Windy Corners was deserted except for a red book, which
-lay sunning itself upon the gravel path. From the house came incoherent
-sounds, as of females preparing for worship. “The men say they won’t
-go”—“Well, I don’t blame them”—Minnie says, “need she go?”—“Tell her,
-no nonsense”—“Anne! Mary! Hook me behind!”—“Dearest Lucia, may I
-trespass upon you for a pin?” For Miss Bartlett had announced that she
-at all events was one for church.
-
-The sun rose higher on its journey, guided, not by Phaethon, but by
-Apollo, competent, unswerving, divine. Its rays fell on the ladies
-whenever they advanced towards the bedroom windows; on Mr. Beebe down
-at Summer Street as he smiled over a letter from Miss Catharine Alan;
-on George Emerson cleaning his father’s boots; and lastly, to complete
-the catalogue of memorable things, on the red book mentioned
-previously. The ladies move, Mr. Beebe moves, George moves, and
-movement may engender shadow. But this book lies motionless, to be
-caressed all the morning by the sun and to raise its covers slightly,
-as though acknowledging the caress.
-
-Presently Lucy steps out of the drawing-room window. Her new cerise
-dress has been a failure, and makes her look tawdry and wan. At her
-throat is a garnet brooch, on her finger a ring set with rubies—an
-engagement ring. Her eyes are bent to the Weald. She frowns a
-little—not in anger, but as a brave child frowns when he is trying not
-to cry. In all that expanse no human eye is looking at her, and she may
-frown unrebuked and measure the spaces that yet survive between Apollo
-and the western hills.
-
-“Lucy! Lucy! What’s that book? Who’s been taking a book out of the
-shelf and leaving it about to spoil?”
-
-“It’s only the library book that Cecil’s been reading.”
-
-“But pick it up, and don’t stand idling there like a flamingo.”
-
-Lucy picked up the book and glanced at the title listlessly, Under a
-Loggia. She no longer read novels herself, devoting all her spare time
-to solid literature in the hope of catching Cecil up. It was dreadful
-how little she knew, and even when she thought she knew a thing, like
-the Italian painters, she found she had forgotten it. Only this morning
-she had confused Francesco Francia with Piero della Francesca, and
-Cecil had said, “What! you aren’t forgetting your Italy already?” And
-this too had lent anxiety to her eyes when she saluted the dear view
-and the dear garden in the foreground, and above them, scarcely
-conceivable elsewhere, the dear sun.
-
-“Lucy—have you a sixpence for Minnie and a shilling for yourself?”
-
-She hastened in to her mother, who was rapidly working herself into a
-Sunday fluster.
-
-“It’s a special collection—I forget what for. I do beg, no vulgar
-clinking in the plate with halfpennies; see that Minnie has a nice
-bright sixpence. Where is the child? Minnie! That book’s all warped.
-(Gracious, how plain you look!) Put it under the Atlas to press.
-Minnie!”
-
-“Oh, Mrs. Honeychurch—” from the upper regions.
-
-“Minnie, don’t be late. Here comes the horse”—it was always the horse,
-never the carriage. “Where’s Charlotte? Run up and hurry her. Why is
-she so long? She had nothing to do. She never brings anything but
-blouses. Poor Charlotte—How I do detest blouses! Minnie!”
-
-Paganism is infectious—more infectious than diphtheria or piety—and the
-Rector’s niece was taken to church protesting. As usual, she didn’t see
-why. Why shouldn’t she sit in the sun with the young men? The young
-men, who had now appeared, mocked her with ungenerous words. Mrs.
-Honeychurch defended orthodoxy, and in the midst of the confusion Miss
-Bartlett, dressed in the very height of the fashion, came strolling
-down the stairs.
-
-“Dear Marian, I am very sorry, but I have no small change—nothing but
-sovereigns and half crowns. Could any one give me—”
-
-“Yes, easily. Jump in. Gracious me, how smart you look! What a lovely
-frock! You put us all to shame.”
-
-“If I did not wear my best rags and tatters now, when should I wear
-them?” said Miss Bartlett reproachfully. She got into the victoria and
-placed herself with her back to the horse. The necessary roar ensued,
-and then they drove off.
-
-“Good-bye! Be good!” called out Cecil.
-
-Lucy bit her lip, for the tone was sneering. On the subject of “church
-and so on” they had had rather an unsatisfactory conversation. He had
-said that people ought to overhaul themselves, and she did not want to
-overhaul herself; she did not know it was done. Honest orthodoxy Cecil
-respected, but he always assumed that honesty is the result of a
-spiritual crisis; he could not imagine it as a natural birthright, that
-might grow heavenward like flowers. All that he said on this subject
-pained her, though he exuded tolerance from every pore; somehow the
-Emersons were different.
-
-She saw the Emersons after church. There was a line of carriages down
-the road, and the Honeychurch vehicle happened to be opposite Cissie
-Villa. To save time, they walked over the green to it, and found father
-and son smoking in the garden.
-
-“Introduce me,” said her mother. “Unless the young man considers that
-he knows me already.”
-
-He probably did; but Lucy ignored the Sacred Lake and introduced them
-formally. Old Mr. Emerson claimed her with much warmth, and said how
-glad he was that she was going to be married. She said yes, she was
-glad too; and then, as Miss Bartlett and Minnie were lingering behind
-with Mr. Beebe, she turned the conversation to a less disturbing topic,
-and asked him how he liked his new house.
-
-“Very much,” he replied, but there was a note of offence in his voice;
-she had never known him offended before. He added: “We find, though,
-that the Miss Alans were coming, and that we have turned them out.
-Women mind such a thing. I am very much upset about it.”
-
-“I believe that there was some misunderstanding,” said Mrs. Honeychurch
-uneasily.
-
-“Our landlord was told that we should be a different type of person,”
-said George, who seemed disposed to carry the matter further. “He
-thought we should be artistic. He is disappointed.”
-
-“And I wonder whether we ought to write to the Miss Alans and offer to
-give it up. What do you think?” He appealed to Lucy.
-
-“Oh, stop now you have come,” said Lucy lightly. She must avoid
-censuring Cecil. For it was on Cecil that the little episode turned,
-though his name was never mentioned.
-
-“So George says. He says that the Miss Alans must go to the wall. Yet
-it does seem so unkind.”
-
-“There is only a certain amount of kindness in the world,” said George,
-watching the sunlight flash on the panels of the passing carriages.
-
-“Yes!” exclaimed Mrs. Honeychurch. “That’s exactly what I say. Why all
-this twiddling and twaddling over two Miss Alans?”
-
-“There is a certain amount of kindness, just as there is a certain
-amount of light,” he continued in measured tones. “We cast a shadow on
-something wherever we stand, and it is no good moving from place to
-place to save things; because the shadow always follows. Choose a place
-where you won’t do harm—yes, choose a place where you won’t do very
-much harm, and stand in it for all you are worth, facing the sunshine.”
-
-“Oh, Mr. Emerson, I see you’re clever!”
-
-“Eh—?”
-
-“I see you’re going to be clever. I hope you didn’t go behaving like
-that to poor Freddy.”
-
-George’s eyes laughed, and Lucy suspected that he and her mother would
-get on rather well.
-
-“No, I didn’t,” he said. “He behaved that way to me. It is his
-philosophy. Only he starts life with it; and I have tried the Note of
-Interrogation first.”
-
-“What _do_ you mean? No, never mind what you mean. Don’t explain. He
-looks forward to seeing you this afternoon. Do you play tennis? Do you
-mind tennis on Sunday—?”
-
-“George mind tennis on Sunday! George, after his education, distinguish
-between Sunday—”
-
-“Very well, George doesn’t mind tennis on Sunday. No more do I. That’s
-settled. Mr. Emerson, if you could come with your son we should be so
-pleased.”
-
-He thanked her, but the walk sounded rather far; he could only potter
-about in these days.
-
-She turned to George: “And then he wants to give up his house to the
-Miss Alans.”
-
-“I know,” said George, and put his arm round his father’s neck. The
-kindness that Mr. Beebe and Lucy had always known to exist in him came
-out suddenly, like sunlight touching a vast landscape—a touch of the
-morning sun? She remembered that in all his perversities he had never
-spoken against affection.
-
-Miss Bartlett approached.
-
-“You know our cousin, Miss Bartlett,” said Mrs. Honeychurch pleasantly.
-“You met her with my daughter in Florence.”
-
-“Yes, indeed!” said the old man, and made as if he would come out of
-the garden to meet the lady. Miss Bartlett promptly got into the
-victoria. Thus entrenched, she emitted a formal bow. It was the pension
-Bertolini again, the dining-table with the decanters of water and wine.
-It was the old, old battle of the room with the view.
-
-George did not respond to the bow. Like any boy, he blushed and was
-ashamed; he knew that the chaperon remembered. He said: “I—I’ll come up
-to tennis if I can manage it,” and went into the house. Perhaps
-anything that he did would have pleased Lucy, but his awkwardness went
-straight to her heart; men were not gods after all, but as human and as
-clumsy as girls; even men might suffer from unexplained desires, and
-need help. To one of her upbringing, and of her destination, the
-weakness of men was a truth unfamiliar, but she had surmised it at
-Florence, when George threw her photographs into the River Arno.
-
-“George, don’t go,” cried his father, who thought it a great treat for
-people if his son would talk to them. “George has been in such good
-spirits today, and I am sure he will end by coming up this afternoon.”
-
-Lucy caught her cousin’s eye. Something in its mute appeal made her
-reckless. “Yes,” she said, raising her voice, “I do hope he will.” Then
-she went to the carriage and murmured, “The old man hasn’t been told; I
-knew it was all right.” Mrs. Honeychurch followed her, and they drove
-away.
-
-Satisfactory that Mr. Emerson had not been told of the Florence
-escapade; yet Lucy’s spirits should not have leapt up as if she had
-sighted the ramparts of heaven. Satisfactory; yet surely she greeted it
-with disproportionate joy. All the way home the horses’ hoofs sang a
-tune to her: “He has not told, he has not told.” Her brain expanded the
-melody: “He has not told his father—to whom he tells all things. It was
-not an exploit. He did not laugh at me when I had gone.” She raised her
-hand to her cheek. “He does not love me. No. How terrible if he did!
-But he has not told. He will not tell.”
-
-She longed to shout the words: “It is all right. It’s a secret between
-us two for ever. Cecil will never hear.” She was even glad that Miss
-Bartlett had made her promise secrecy, that last dark evening at
-Florence, when they had knelt packing in his room. The secret, big or
-little, was guarded.
-
-Only three English people knew of it in the world. Thus she interpreted
-her joy. She greeted Cecil with unusual radiance, because she felt so
-safe. As he helped her out of the carriage, she said:
-
-“The Emersons have been so nice. George Emerson has improved
-enormously.”
-
-“How are my protégés?” asked Cecil, who took no real interest in them,
-and had long since forgotten his resolution to bring them to Windy
-Corner for educational purposes.
-
-“Protégés!” she exclaimed with some warmth. For the only relationship
-which Cecil conceived was feudal: that of protector and protected. He
-had no glimpse of the comradeship after which the girl’s soul yearned.
-
-“You shall see for yourself how your protégés are. George Emerson is
-coming up this afternoon. He is a most interesting man to talk to. Only
-don’t—” She nearly said, “Don’t protect him.” But the bell was ringing
-for lunch, and, as often happened, Cecil had paid no great attention to
-her remarks. Charm, not argument, was to be her forte.
-
-Lunch was a cheerful meal. Generally Lucy was depressed at meals. Some
-one had to be soothed—either Cecil or Miss Bartlett or a Being not
-visible to the mortal eye—a Being who whispered to her soul: “It will
-not last, this cheerfulness. In January you must go to London to
-entertain the grandchildren of celebrated men.” But to-day she felt she
-had received a guarantee. Her mother would always sit there, her
-brother here. The sun, though it had moved a little since the morning,
-would never be hidden behind the western hills. After luncheon they
-asked her to play. She had seen Gluck’s Armide that year, and played
-from memory the music of the enchanted garden—the music to which Renaud
-approaches, beneath the light of an eternal dawn, the music that never
-gains, never wanes, but ripples for ever like the tideless seas of
-fairyland. Such music is not for the piano, and her audience began to
-get restive, and Cecil, sharing the discontent, called out: “Now play
-us the other garden—the one in Parsifal.”
-
-She closed the instrument.
-
-“Not very dutiful,” said her mother’s voice.
-
-Fearing that she had offended Cecil, she turned quickly round. There
-George was. He had crept in without interrupting her.
-
-“Oh, I had no idea!” she exclaimed, getting very red; and then, without
-a word of greeting, she reopened the piano. Cecil should have the
-Parsifal, and anything else that he liked.
-
-“Our performer has changed her mind,” said Miss Bartlett, perhaps
-implying, she will play the music to Mr. Emerson. Lucy did not know
-what to do nor even what she wanted to do. She played a few bars of the
-Flower Maidens’ song very badly and then she stopped.
-
-“I vote tennis,” said Freddy, disgusted at the scrappy entertainment.
-
-“Yes, so do I.” Once more she closed the unfortunate piano. “I vote you
-have a men’s four.”
-
-“All right.”
-
-“Not for me, thank you,” said Cecil. “I will not spoil the set.” He
-never realized that it may be an act of kindness in a bad player to
-make up a fourth.
-
-“Oh, come along Cecil. I’m bad, Floyd’s rotten, and so I dare say’s
-Emerson.”
-
-George corrected him: “I am not bad.”
-
-One looked down one’s nose at this. “Then certainly I won’t play,” said
-Cecil, while Miss Bartlett, under the impression that she was snubbing
-George, added: “I agree with you, Mr. Vyse. You had much better not
-play. Much better not.”
-
-Minnie, rushing in where Cecil feared to tread, announced that she
-would play. “I shall miss every ball anyway, so what does it matter?”
-But Sunday intervened and stamped heavily upon the kindly suggestion.
-
-“Then it will have to be Lucy,” said Mrs. Honeychurch; “you must fall
-back on Lucy. There is no other way out of it. Lucy, go and change your
-frock.”
-
-Lucy’s Sabbath was generally of this amphibious nature. She kept it
-without hypocrisy in the morning, and broke it without reluctance in
-the afternoon. As she changed her frock, she wondered whether Cecil was
-sneering at her; really she must overhaul herself and settle everything
-up before she married him.
-
-Mr. Floyd was her partner. She liked music, but how much better tennis
-seemed. How much better to run about in comfortable clothes than to sit
-at the piano and feel girt under the arms. Once more music appeared to
-her the employment of a child. George served, and surprised her by his
-anxiety to win. She remembered how he had sighed among the tombs at
-Santa Croce because things wouldn’t fit; how after the death of that
-obscure Italian he had leant over the parapet by the Arno and said to
-her: “I shall want to live, I tell you.” He wanted to live now, to win
-at tennis, to stand for all he was worth in the sun—the sun which had
-begun to decline and was shining in her eyes; and he did win.
-
-Ah, how beautiful the Weald looked! The hills stood out above its
-radiance, as Fiesole stands above the Tuscan Plain, and the South
-Downs, if one chose, were the mountains of Carrara. She might be
-forgetting her Italy, but she was noticing more things in her England.
-One could play a new game with the view, and try to find in its
-innumerable folds some town or village that would do for Florence. Ah,
-how beautiful the Weald looked!
-
-But now Cecil claimed her. He chanced to be in a lucid critical mood,
-and would not sympathize with exaltation. He had been rather a nuisance
-all through the tennis, for the novel that he was reading was so bad
-that he was obliged to read it aloud to others. He would stroll round
-the precincts of the court and call out: “I say, listen to this, Lucy.
-Three split infinitives.”
-
-“Dreadful!” said Lucy, and missed her stroke. When they had finished
-their set, he still went on reading; there was some murder scene, and
-really everyone must listen to it. Freddy and Mr. Floyd were obliged to
-hunt for a lost ball in the laurels, but the other two acquiesced.
-
-“The scene is laid in Florence.”
-
-“What fun, Cecil! Read away. Come, Mr. Emerson, sit down after all your
-energy.” She had “forgiven” George, as she put it, and she made a point
-of being pleasant to him.
-
-He jumped over the net and sat down at her feet asking: “You—and are
-you tired?”
-
-“Of course I’m not!”
-
-“Do you mind being beaten?”
-
-She was going to answer, “No,” when it struck her that she did mind, so
-she answered, “Yes.” She added merrily, “I don’t see _you’re_ such a
-splendid player, though. The light was behind you, and it was in my
-eyes.”
-
-“I never said I was.”
-
-“Why, you did!”
-
-“You didn’t attend.”
-
-“You said—oh, don’t go in for accuracy at this house. We all
-exaggerate, and we get very angry with people who don’t.”
-
-“‘The scene is laid in Florence,’” repeated Cecil, with an upward note.
-
-Lucy recollected herself.
-
-“‘Sunset. Leonora was speeding—’”
-
-Lucy interrupted. “Leonora? Is Leonora the heroine? Who’s the book by?”
-
-“Joseph Emery Prank. ‘Sunset. Leonora speeding across the square. Pray
-the saints she might not arrive too late. Sunset—the sunset of Italy.
-Under Orcagna’s Loggia—the Loggia de’ Lanzi, as we sometimes call it
-now—’”
-
-Lucy burst into laughter. “‘Joseph Emery Prank’ indeed! Why it’s Miss
-Lavish! It’s Miss Lavish’s novel, and she’s publishing it under
-somebody else’s name.”
-
-“Who may Miss Lavish be?”
-
-“Oh, a dreadful person—Mr. Emerson, you remember Miss Lavish?”
-
-Excited by her pleasant afternoon, she clapped her hands.
-
-George looked up. “Of course I do. I saw her the day I arrived at
-Summer Street. It was she who told me that you lived here.”
-
-“Weren’t you pleased?” She meant “to see Miss Lavish,” but when he bent
-down to the grass without replying, it struck her that she could mean
-something else. She watched his head, which was almost resting against
-her knee, and she thought that the ears were reddening. “No wonder the
-novel’s bad,” she added. “I never liked Miss Lavish. But I suppose one
-ought to read it as one’s met her.”
-
-“All modern books are bad,” said Cecil, who was annoyed at her
-inattention, and vented his annoyance on literature. “Every one writes
-for money in these days.”
-
-“Oh, Cecil—!”
-
-“It is so. I will inflict Joseph Emery Prank on you no longer.”
-
-Cecil, this afternoon seemed such a twittering sparrow. The ups and
-downs in his voice were noticeable, but they did not affect her. She
-had dwelt amongst melody and movement, and her nerves refused to answer
-to the clang of his. Leaving him to be annoyed, she gazed at the black
-head again. She did not want to stroke it, but she saw herself wanting
-to stroke it; the sensation was curious.
-
-“How do you like this view of ours, Mr. Emerson?”
-
-“I never notice much difference in views.”
-
-“What do you mean?”
-
-“Because they’re all alike. Because all that matters in them is
-distance and air.”
-
-“H’m!” said Cecil, uncertain whether the remark was striking or not.
-
-“My father”—he looked up at her (and he was a little flushed)—“says
-that there is only one perfect view—the view of the sky straight over
-our heads, and that all these views on earth are but bungled copies of
-it.”
-
-“I expect your father has been reading Dante,” said Cecil, fingering
-the novel, which alone permitted him to lead the conversation.
-
-“He told us another day that views are really crowds—crowds of trees
-and houses and hills—and are bound to resemble each other, like human
-crowds—and that the power they have over us is sometimes supernatural,
-for the same reason.”
-
-Lucy’s lips parted.
-
-“For a crowd is more than the people who make it up. Something gets
-added to it—no one knows how—just as something has got added to those
-hills.”
-
-He pointed with his racquet to the South Downs.
-
-“What a splendid idea!” she murmured. “I shall enjoy hearing your
-father talk again. I’m so sorry he’s not so well.”
-
-“No, he isn’t well.”
-
-“There’s an absurd account of a view in this book,” said Cecil. “Also
-that men fall into two classes—those who forget views and those who
-remember them, even in small rooms.”
-
-“Mr. Emerson, have you any brothers or sisters?”
-
-“None. Why?”
-
-“You spoke of ‘us.’”
-
-“My mother, I was meaning.”
-
-Cecil closed the novel with a bang.
-
-“Oh, Cecil—how you made me jump!”
-
-“I will inflict Joseph Emery Prank on you no longer.”
-
-“I can just remember us all three going into the country for the day
-and seeing as far as Hindhead. It is the first thing that I remember.”
-
-Cecil got up; the man was ill-bred—he hadn’t put on his coat after
-tennis—he didn’t do. He would have strolled away if Lucy had not
-stopped him.
-
-“Cecil, do read the thing about the view.”
-
-“Not while Mr. Emerson is here to entertain us.”
-
-“No—read away. I think nothing’s funnier than to hear silly things read
-out loud. If Mr. Emerson thinks us frivolous, he can go.”
-
-This struck Cecil as subtle, and pleased him. It put their visitor in
-the position of a prig. Somewhat mollified, he sat down again.
-
-“Mr. Emerson, go and find tennis balls.” She opened the book. Cecil
-must have his reading and anything else that he liked. But her
-attention wandered to George’s mother, who—according to Mr. Eager—had
-been murdered in the sight of God and—according to her son—had seen as
-far as Hindhead.
-
-“Am I really to go?” asked George.
-
-“No, of course not really,” she answered.
-
-“Chapter two,” said Cecil, yawning. “Find me chapter two, if it isn’t
-bothering you.”
-
-Chapter two was found, and she glanced at its opening sentences.
-
-She thought she had gone mad.
-
-“Here—hand me the book.”
-
-She heard her voice saying: “It isn’t worth reading—it’s too silly to
-read—I never saw such rubbish—it oughtn’t to be allowed to be printed.”
-
-He took the book from her.
-
-“‘Leonora,’” he read, “‘sat pensive and alone. Before her lay the rich
-champaign of Tuscany, dotted over with many a smiling village. The
-season was spring.’”
-
-Miss Lavish knew, somehow, and had printed the past in draggled prose,
-for Cecil to read and for George to hear.
-
-“‘A golden haze,’” he read. He read: “‘Afar off the towers of Florence,
-while the bank on which she sat was carpeted with violets. All
-unobserved Antonio stole up behind her—’”
-
-Lest Cecil should see her face she turned to George and saw his face.
-
-He read: “‘There came from his lips no wordy protestation such as
-formal lovers use. No eloquence was his, nor did he suffer from the
-lack of it. He simply enfolded her in his manly arms.’”
-
-“This isn’t the passage I wanted,” he informed them, “there is another
-much funnier, further on.” He turned over the leaves.
-
-“Should we go in to tea?” said Lucy, whose voice remained steady.
-
-She led the way up the garden, Cecil following her, George last. She
-thought a disaster was averted. But when they entered the shrubbery it
-came. The book, as if it had not worked mischief enough, had been
-forgotten, and Cecil must go back for it; and George, who loved
-passionately, must blunder against her in the narrow path.
-
-“No—” she gasped, and, for the second time, was kissed by him.
-
-As if no more was possible, he slipped back; Cecil rejoined her; they
-reached the upper lawn alone.
-
-
-
-
-Chapter XVI
-Lying to George
-
-
-But Lucy had developed since the spring. That is to say, she was now
-better able to stifle the emotions of which the conventions and the
-world disapprove. Though the danger was greater, she was not shaken by
-deep sobs. She said to Cecil, “I am not coming in to tea—tell mother—I
-must write some letters,” and went up to her room. Then she prepared
-for action. Love felt and returned, love which our bodies exact and our
-hearts have transfigured, love which is the most real thing that we
-shall ever meet, reappeared now as the world’s enemy, and she must
-stifle it.
-
-She sent for Miss Bartlett.
-
-The contest lay not between love and duty. Perhaps there never is such
-a contest. It lay between the real and the pretended, and Lucy’s first
-aim was to defeat herself. As her brain clouded over, as the memory of
-the views grew dim and the words of the book died away, she returned to
-her old shibboleth of nerves. She “conquered her breakdown.” Tampering
-with the truth, she forgot that the truth had ever been. Remembering
-that she was engaged to Cecil, she compelled herself to confused
-remembrances of George; he was nothing to her; he never had been
-anything; he had behaved abominably; she had never encouraged him. The
-armour of falsehood is subtly wrought out of darkness, and hides a man
-not only from others, but from his own soul. In a few moments Lucy was
-equipped for battle.
-
-“Something too awful has happened,” she began, as soon as her cousin
-arrived. “Do you know anything about Miss Lavish’s novel?”
-
-Miss Bartlett looked surprised, and said that she had not read the
-book, nor known that it was published; Eleanor was a reticent woman at
-heart.
-
-“There is a scene in it. The hero and heroine make love. Do you know
-about that?”
-
-“Dear—?”
-
-“Do you know about it, please?” she repeated. “They are on a hillside,
-and Florence is in the distance.”
-
-“My good Lucia, I am all at sea. I know nothing about it whatever.”
-
-“There are violets. I cannot believe it is a coincidence. Charlotte,
-Charlotte, how _could_ you have told her? I have thought before
-speaking; it _must_ be you.”
-
-“Told her what?” she asked, with growing agitation.
-
-“About that dreadful afternoon in February.”
-
-Miss Bartlett was genuinely moved. “Oh, Lucy, dearest girl—she hasn’t
-put that in her book?”
-
-Lucy nodded.
-
-“Not so that one could recognize it. Yes.”
-
-“Then never—never—never more shall Eleanor Lavish be a friend of mine.”
-
-“So you did tell?”
-
-“I did just happen—when I had tea with her at Rome—in the course of
-conversation—”
-
-“But Charlotte—what about the promise you gave me when we were packing?
-Why did you tell Miss Lavish, when you wouldn’t even let me tell
-mother?”
-
-“I will never forgive Eleanor. She has betrayed my confidence.”
-
-“Why did you tell her, though? This is a most serious thing.”
-
-Why does any one tell anything? The question is eternal, and it was not
-surprising that Miss Bartlett should only sigh faintly in response. She
-had done wrong—she admitted it, she only hoped that she had not done
-harm; she had told Eleanor in the strictest confidence.
-
-Lucy stamped with irritation.
-
-“Cecil happened to read out the passage aloud to me and to Mr. Emerson;
-it upset Mr. Emerson and he insulted me again. Behind Cecil’s back.
-Ugh! Is it possible that men are such brutes? Behind Cecil’s back as we
-were walking up the garden.”
-
-Miss Bartlett burst into self-accusations and regrets.
-
-“What is to be done now? Can you tell me?”
-
-“Oh, Lucy—I shall never forgive myself, never to my dying day. Fancy if
-your prospects—”
-
-“I know,” said Lucy, wincing at the word. “I see now why you wanted me
-to tell Cecil, and what you meant by ‘some other source.’ You knew that
-you had told Miss Lavish, and that she was not reliable.”
-
-It was Miss Bartlett’s turn to wince. “However,” said the girl,
-despising her cousin’s shiftiness, “What’s done’s done. You have put me
-in a most awkward position. How am I to get out of it?”
-
-Miss Bartlett could not think. The days of her energy were over. She
-was a visitor, not a chaperon, and a discredited visitor at that. She
-stood with clasped hands while the girl worked herself into the
-necessary rage.
-
-“He must—that man must have such a setting down that he won’t forget.
-And who’s to give it him? I can’t tell mother now—owing to you. Nor
-Cecil, Charlotte, owing to you. I am caught up every way. I think I
-shall go mad. I have no one to help me. That’s why I’ve sent for you.
-What’s wanted is a man with a whip.”
-
-Miss Bartlett agreed: one wanted a man with a whip.
-
-“Yes—but it’s no good agreeing. What’s to be _done?_ We women go
-maundering on. What _does_ a girl do when she comes across a cad?”
-
-“I always said he was a cad, dear. Give me credit for that, at all
-events. From the very first moment—when he said his father was having a
-bath.”
-
-“Oh, bother the credit and who’s been right or wrong! We’ve both made a
-muddle of it. George Emerson is still down the garden there, and is he
-to be left unpunished, or isn’t he? I want to know.”
-
-Miss Bartlett was absolutely helpless. Her own exposure had unnerved
-her, and thoughts were colliding painfully in her brain. She moved
-feebly to the window, and tried to detect the cad’s white flannels
-among the laurels.
-
-“You were ready enough at the Bertolini when you rushed me off to Rome.
-Can’t you speak again to him now?”
-
-“Willingly would I move heaven and earth—”
-
-“I want something more definite,” said Lucy contemptuously. “Will you
-speak to him? It is the least you can do, surely, considering it all
-happened because you broke your word.”
-
-“Never again shall Eleanor Lavish be a friend of mine.”
-
-Really, Charlotte was outdoing herself.
-
-“Yes or no, please; yes or no.”
-
-“It is the kind of thing that only a gentleman can settle.” George
-Emerson was coming up the garden with a tennis ball in his hand.
-
-“Very well,” said Lucy, with an angry gesture. “No one will help me. I
-will speak to him myself.” And immediately she realized that this was
-what her cousin had intended all along.
-
-“Hullo, Emerson!” called Freddy from below. “Found the lost ball? Good
-man! Want any tea?” And there was an irruption from the house on to the
-terrace.
-
-“Oh, Lucy, but that is brave of you! I admire you—”
-
-They had gathered round George, who beckoned, she felt, over the
-rubbish, the sloppy thoughts, the furtive yearnings that were beginning
-to cumber her soul. Her anger faded at the sight of him. Ah! The
-Emersons were fine people in their way. She had to subdue a rush in her
-blood before saying:
-
-“Freddy has taken him into the dining-room. The others are going down
-the garden. Come. Let us get this over quickly. Come. I want you in the
-room, of course.”
-
-“Lucy, do you mind doing it?”
-
-“How can you ask such a ridiculous question?”
-
-“Poor Lucy—” She stretched out her hand. “I seem to bring nothing but
-misfortune wherever I go.” Lucy nodded. She remembered their last
-evening at Florence—the packing, the candle, the shadow of Miss
-Bartlett’s toque on the door. She was not to be trapped by pathos a
-second time. Eluding her cousin’s caress, she led the way downstairs.
-
-“Try the jam,” Freddy was saying. “The jam’s jolly good.”
-
-George, looking big and dishevelled, was pacing up and down the
-dining-room. As she entered he stopped, and said:
-
-“No—nothing to eat.”
-
-“You go down to the others,” said Lucy; “Charlotte and I will give Mr.
-Emerson all he wants. Where’s mother?”
-
-“She’s started on her Sunday writing. She’s in the drawing-room.”
-
-“That’s all right. You go away.”
-
-He went off singing.
-
-Lucy sat down at the table. Miss Bartlett, who was thoroughly
-frightened, took up a book and pretended to read.
-
-She would not be drawn into an elaborate speech. She just said: “I
-can’t have it, Mr. Emerson. I cannot even talk to you. Go out of this
-house, and never come into it again as long as I live here—” flushing
-as she spoke and pointing to the door. “I hate a row. Go please.”
-
-“What—”
-
-“No discussion.”
-
-“But I can’t—”
-
-She shook her head. “Go, please. I do not want to call in Mr. Vyse.”
-
-“You don’t mean,” he said, absolutely ignoring Miss Bartlett—“you don’t
-mean that you are going to marry that man?”
-
-The line was unexpected.
-
-She shrugged her shoulders, as if his vulgarity wearied her. “You are
-merely ridiculous,” she said quietly.
-
-Then his words rose gravely over hers: “You cannot live with Vyse. He’s
-only for an acquaintance. He is for society and cultivated talk. He
-should know no one intimately, least of all a woman.”
-
-It was a new light on Cecil’s character.
-
-“Have you ever talked to Vyse without feeling tired?”
-
-“I can scarcely discuss—”
-
-“No, but have you ever? He is the sort who are all right so long as
-they keep to things—books, pictures—but kill when they come to people.
-That’s why I’ll speak out through all this muddle even now. It’s
-shocking enough to lose you in any case, but generally a man must deny
-himself joy, and I would have held back if your Cecil had been a
-different person. I would never have let myself go. But I saw him first
-in the National Gallery, when he winced because my father mispronounced
-the names of great painters. Then he brings us here, and we find it is
-to play some silly trick on a kind neighbour. That is the man all
-over—playing tricks on people, on the most sacred form of life that he
-can find. Next, I meet you together, and find him protecting and
-teaching you and your mother to be shocked, when it was for _you_ to
-settle whether you were shocked or no. Cecil all over again. He daren’t
-let a woman decide. He’s the type who’s kept Europe back for a thousand
-years. Every moment of his life he’s forming you, telling you what’s
-charming or amusing or ladylike, telling you what a man thinks womanly;
-and you, you of all women, listen to his voice instead of to your own.
-So it was at the Rectory, when I met you both again; so it has been the
-whole of this afternoon. Therefore—not ‘therefore I kissed you,’
-because the book made me do that, and I wish to goodness I had more
-self-control. I’m not ashamed. I don’t apologize. But it has frightened
-you, and you may not have noticed that I love you. Or would you have
-told me to go, and dealt with a tremendous thing so lightly? But
-therefore—therefore I settled to fight him.”
-
-Lucy thought of a very good remark.
-
-“You say Mr. Vyse wants me to listen to him, Mr. Emerson. Pardon me for
-suggesting that you have caught the habit.”
-
-And he took the shoddy reproof and touched it into immortality. He
-said:
-
-“Yes, I have,” and sank down as if suddenly weary. “I’m the same kind
-of brute at bottom. This desire to govern a woman—it lies very deep,
-and men and women must fight it together before they shall enter the
-garden. But I do love you surely in a better way than he does.” He
-thought. “Yes—really in a better way. I want you to have your own
-thoughts even when I hold you in my arms.” He stretched them towards
-her. “Lucy, be quick—there’s no time for us to talk now—come to me as
-you came in the spring, and afterwards I will be gentle and explain. I
-have cared for you since that man died. I cannot live without you, ‘No
-good,’ I thought; ‘she is marrying someone else’; but I meet you again
-when all the world is glorious water and sun. As you came through the
-wood I saw that nothing else mattered. I called. I wanted to live and
-have my chance of joy.”
-
-“And Mr. Vyse?” said Lucy, who kept commendably calm. “Does he not
-matter? That I love Cecil and shall be his wife shortly? A detail of no
-importance, I suppose?”
-
-But he stretched his arms over the table towards her.
-
-“May I ask what you intend to gain by this exhibition?”
-
-He said: “It is our last chance. I shall do all that I can.” And as if
-he had done all else, he turned to Miss Bartlett, who sat like some
-portent against the skies of the evening. “You wouldn’t stop us this
-second time if you understood,” he said. “I have been into the dark,
-and I am going back into it, unless you will try to understand.”
-
-Her long, narrow head drove backwards and forwards, as though
-demolishing some invisible obstacle. She did not answer.
-
-“It is being young,” he said quietly, picking up his racquet from the
-floor and preparing to go. “It is being certain that Lucy cares for me
-really. It is that love and youth matter intellectually.”
-
-In silence the two women watched him. His last remark, they knew, was
-nonsense, but was he going after it or not? Would not he, the cad, the
-charlatan, attempt a more dramatic finish? No. He was apparently
-content. He left them, carefully closing the front door; and when they
-looked through the hall window, they saw him go up the drive and begin
-to climb the slopes of withered fern behind the house. Their tongues
-were loosed, and they burst into stealthy rejoicings.
-
-“Oh, Lucia—come back here—oh, what an awful man!”
-
-Lucy had no reaction—at least, not yet. “Well, he amuses me,” she said.
-“Either I’m mad, or else he is, and I’m inclined to think it’s the
-latter. One more fuss through with you, Charlotte. Many thanks. I
-think, though, that this is the last. My admirer will hardly trouble me
-again.”
-
-And Miss Bartlett, too, essayed the roguish:
-
-“Well, it isn’t everyone who could boast such a conquest, dearest, is
-it? Oh, one oughtn’t to laugh, really. It might have been very serious.
-But you were so sensible and brave—so unlike the girls of my day.”
-
-“Let’s go down to them.”
-
-But, once in the open air, she paused. Some emotion—pity, terror, love,
-but the emotion was strong—seized her, and she was aware of autumn.
-Summer was ending, and the evening brought her odours of decay, the
-more pathetic because they were reminiscent of spring. That something
-or other mattered intellectually? A leaf, violently agitated, danced
-past her, while other leaves lay motionless. That the earth was
-hastening to re-enter darkness, and the shadows of those trees over
-Windy Corner?
-
-“Hullo, Lucy! There’s still light enough for another set, if you two’ll
-hurry.”
-
-“Mr. Emerson has had to go.”
-
-“What a nuisance! That spoils the four. I say, Cecil, do play, do,
-there’s a good chap. It’s Floyd’s last day. Do play tennis with us,
-just this once.”
-
-Cecil’s voice came: “My dear Freddy, I am no athlete. As you well
-remarked this very morning, ‘There are some chaps who are no good for
-anything but books’; I plead guilty to being such a chap, and will not
-inflict myself on you.”
-
-The scales fell from Lucy’s eyes. How had she stood Cecil for a moment?
-He was absolutely intolerable, and the same evening she broke off her
-engagement.
-
-
-
-
-Chapter XVII
-Lying to Cecil
-
-
-He was bewildered. He had nothing to say. He was not even angry, but
-stood, with a glass of whiskey between his hands, trying to think what
-had led her to such a conclusion.
-
-She had chosen the moment before bed, when, in accordance with their
-bourgeois habit, she always dispensed drinks to the men. Freddy and Mr.
-Floyd were sure to retire with their glasses, while Cecil invariably
-lingered, sipping at his while she locked up the sideboard.
-
-“I am very sorry about it,” she said; “I have carefully thought things
-over. We are too different. I must ask you to release me, and try to
-forget that there ever was such a foolish girl.”
-
-It was a suitable speech, but she was more angry than sorry, and her
-voice showed it.
-
-“Different—how—how—”
-
-“I haven’t had a really good education, for one thing,” she continued,
-still on her knees by the sideboard. “My Italian trip came too late,
-and I am forgetting all that I learnt there. I shall never be able to
-talk to your friends, or behave as a wife of yours should.”
-
-“I don’t understand you. You aren’t like yourself. You’re tired, Lucy.”
-
-“Tired!” she retorted, kindling at once. “That is exactly like you. You
-always think women don’t mean what they say.”
-
-“Well, you sound tired, as if something has worried you.”
-
-“What if I do? It doesn’t prevent me from realizing the truth. I can’t
-marry you, and you will thank me for saying so some day.”
-
-“You had that bad headache yesterday—All right”—for she had exclaimed
-indignantly: “I see it’s much more than headaches. But give me a
-moment’s time.” He closed his eyes. “You must excuse me if I say stupid
-things, but my brain has gone to pieces. Part of it lives three minutes
-back, when I was sure that you loved me, and the other part—I find it
-difficult—I am likely to say the wrong thing.”
-
-It struck her that he was not behaving so badly, and her irritation
-increased. She again desired a struggle, not a discussion. To bring on
-the crisis, she said:
-
-“There are days when one sees clearly, and this is one of them. Things
-must come to a breaking-point some time, and it happens to be to-day.
-If you want to know, quite a little thing decided me to speak to
-you—when you wouldn’t play tennis with Freddy.”
-
-“I never do play tennis,” said Cecil, painfully bewildered; “I never
-could play. I don’t understand a word you say.”
-
-“You can play well enough to make up a four. I thought it abominably
-selfish of you.”
-
-“No, I can’t—well, never mind the tennis. Why couldn’t you—couldn’t you
-have warned me if you felt anything wrong? You talked of our wedding at
-lunch—at least, you let me talk.”
-
-“I knew you wouldn’t understand,” said Lucy quite crossly. “I might
-have known there would have been these dreadful explanations. Of
-course, it isn’t the tennis—that was only the last straw to all I have
-been feeling for weeks. Surely it was better not to speak until I felt
-certain.” She developed this position. “Often before I have wondered if
-I was fitted for your wife—for instance, in London; and are you fitted
-to be my husband? I don’t think so. You don’t like Freddy, nor my
-mother. There was always a lot against our engagement, Cecil, but all
-our relations seemed pleased, and we met so often, and it was no good
-mentioning it until—well, until all things came to a point. They have
-to-day. I see clearly. I must speak. That’s all.”
-
-“I cannot think you were right,” said Cecil gently. “I cannot tell why,
-but though all that you say sounds true, I feel that you are not
-treating me fairly. It’s all too horrible.”
-
-“What’s the good of a scene?”
-
-“No good. But surely I have a right to hear a little more.”
-
-He put down his glass and opened the window. From where she knelt,
-jangling her keys, she could see a slit of darkness, and, peering into
-it, as if it would tell him that “little more,” his long, thoughtful
-face.
-
-“Don’t open the window; and you’d better draw the curtain, too; Freddy
-or any one might be outside.” He obeyed. “I really think we had better
-go to bed, if you don’t mind. I shall only say things that will make me
-unhappy afterwards. As you say it is all too horrible, and it is no
-good talking.”
-
-But to Cecil, now that he was about to lose her, she seemed each moment
-more desirable. He looked at her, instead of through her, for the first
-time since they were engaged. From a Leonardo she had become a living
-woman, with mysteries and forces of her own, with qualities that even
-eluded art. His brain recovered from the shock, and, in a burst of
-genuine devotion, he cried: “But I love you, and I did think you loved
-me!”
-
-“I did not,” she said. “I thought I did at first. I am sorry, and ought
-to have refused you this last time, too.”
-
-He began to walk up and down the room, and she grew more and more vexed
-at his dignified behaviour. She had counted on his being petty. It
-would have made things easier for her. By a cruel irony she was drawing
-out all that was finest in his disposition.
-
-“You don’t love me, evidently. I dare say you are right not to. But it
-would hurt a little less if I knew why.”
-
-“Because”—a phrase came to her, and she accepted it—“you’re the sort
-who can’t know any one intimately.”
-
-A horrified look came into his eyes.
-
-“I don’t mean exactly that. But you will question me, though I beg you
-not to, and I must say something. It is that, more or less. When we
-were only acquaintances, you let me be myself, but now you’re always
-protecting me.” Her voice swelled. “I won’t be protected. I will choose
-for myself what is ladylike and right. To shield me is an insult. Can’t
-I be trusted to face the truth but I must get it second-hand through
-you? A woman’s place! You despise my mother—I know you do—because she’s
-conventional and bothers over puddings; but, oh goodness!”—she rose to
-her feet—“conventional, Cecil, you’re that, for you may understand
-beautiful things, but you don’t know how to use them; and you wrap
-yourself up in art and books and music, and would try to wrap up me. I
-won’t be stifled, not by the most glorious music, for people are more
-glorious, and you hide them from me. That’s why I break off my
-engagement. You were all right as long as you kept to things, but when
-you came to people—” She stopped.
-
-There was a pause. Then Cecil said with great emotion:
-
-“It is true.”
-
-“True on the whole,” she corrected, full of some vague shame.
-
-“True, every word. It is a revelation. It is—I.”
-
-“Anyhow, those are my reasons for not being your wife.”
-
-He repeated: “‘The sort that can know no one intimately.’ It is true. I
-fell to pieces the very first day we were engaged. I behaved like a cad
-to Beebe and to your brother. You are even greater than I thought.” She
-withdrew a step. “I’m not going to worry you. You are far too good to
-me. I shall never forget your insight; and, dear, I only blame you for
-this: you might have warned me in the early stages, before you felt you
-wouldn’t marry me, and so have given me a chance to improve. I have
-never known you till this evening. I have just used you as a peg for my
-silly notions of what a woman should be. But this evening you are a
-different person: new thoughts—even a new voice—”
-
-“What do you mean by a new voice?” she asked, seized with
-incontrollable anger.
-
-“I mean that a new person seems speaking through you,” said he.
-
-Then she lost her balance. She cried: “If you think I am in love with
-some one else, you are very much mistaken.”
-
-“Of course I don’t think that. You are not that kind, Lucy.”
-
-“Oh, yes, you do think it. It’s your old idea, the idea that has kept
-Europe back—I mean the idea that women are always thinking of men. If a
-girl breaks off her engagement, everyone says: ‘Oh, she had someone
-else in her mind; she hopes to get someone else.’ It’s disgusting,
-brutal! As if a girl can’t break it off for the sake of freedom.”
-
-He answered reverently: “I may have said that in the past. I shall
-never say it again. You have taught me better.”
-
-She began to redden, and pretended to examine the windows again.
-
-“Of course, there is no question of ‘someone else’ in this, no
-‘jilting’ or any such nauseous stupidity. I beg your pardon most humbly
-if my words suggested that there was. I only meant that there was a
-force in you that I hadn’t known of up till now.”
-
-“All right, Cecil, that will do. Don’t apologize to me. It was my
-mistake.”
-
-“It is a question between ideals, yours and mine—pure abstract ideals,
-and yours are the nobler. I was bound up in the old vicious notions,
-and all the time you were splendid and new.” His voice broke. “I must
-actually thank you for what you have done—for showing me what I really
-am. Solemnly, I thank you for showing me a true woman. Will you shake
-hands?”
-
-“Of course I will,” said Lucy, twisting up her other hand in the
-curtains. “Good-night, Cecil. Good-bye. That’s all right. I’m sorry
-about it. Thank you very much for your gentleness.”
-
-“Let me light your candle, shall I?”
-
-They went into the hall.
-
-“Thank you. Good-night again. God bless you, Lucy!”
-
-“Good-bye, Cecil.”
-
-She watched him steal up-stairs, while the shadows from three banisters
-passed over her face like the beat of wings. On the landing he paused
-strong in his renunciation, and gave her a look of memorable beauty.
-For all his culture, Cecil was an ascetic at heart, and nothing in his
-love became him like the leaving of it.
-
-She could never marry. In the tumult of her soul, that stood firm.
-Cecil believed in her; she must some day believe in herself. She must
-be one of the women whom she had praised so eloquently, who care for
-liberty and not for men; she must forget that George loved her, that
-George had been thinking through her and gained her this honourable
-release, that George had gone away into—what was it?—the darkness.
-
-She put out the lamp.
-
-It did not do to think, nor, for the matter of that, to feel. She gave
-up trying to understand herself, and joined the vast armies of the
-benighted, who follow neither the heart nor the brain, and march to
-their destiny by catch-words. The armies are full of pleasant and pious
-folk. But they have yielded to the only enemy that matters—the enemy
-within. They have sinned against passion and truth, and vain will be
-their strife after virtue. As the years pass, they are censured. Their
-pleasantry and their piety show cracks, their wit becomes cynicism,
-their unselfishness hypocrisy; they feel and produce discomfort
-wherever they go. They have sinned against Eros and against Pallas
-Athene, and not by any heavenly intervention, but by the ordinary
-course of nature, those allied deities will be avenged.
-
-Lucy entered this army when she pretended to George that she did not
-love him, and pretended to Cecil that she loved no one. The night
-received her, as it had received Miss Bartlett thirty years before.
-
-
-
-
-Chapter XVIII
-Lying to Mr. Beebe, Mrs. Honeychurch, Freddy, and The Servants
-
-
-Windy Corner lay, not on the summit of the ridge, but a few hundred
-feet down the southern slope, at the springing of one of the great
-buttresses that supported the hill. On either side of it was a shallow
-ravine, filled with ferns and pine-trees, and down the ravine on the
-left ran the highway into the Weald.
-
-Whenever Mr. Beebe crossed the ridge and caught sight of these noble
-dispositions of the earth, and, poised in the middle of them, Windy
-Corner,—he laughed. The situation was so glorious, the house so
-commonplace, not to say impertinent. The late Mr. Honeychurch had
-affected the cube, because it gave him the most accommodation for his
-money, and the only addition made by his widow had been a small turret,
-shaped like a rhinoceros’ horn, where she could sit in wet weather and
-watch the carts going up and down the road. So impertinent—and yet the
-house “did,” for it was the home of people who loved their surroundings
-honestly. Other houses in the neighborhood had been built by expensive
-architects, over others their inmates had fidgeted sedulously, yet all
-these suggested the accidental, the temporary; while Windy Corner
-seemed as inevitable as an ugliness of Nature’s own creation. One might
-laugh at the house, but one never shuddered. Mr. Beebe was bicycling
-over this Monday afternoon with a piece of gossip. He had heard from
-the Miss Alans. These admirable ladies, since they could not go to
-Cissie Villa, had changed their plans. They were going to Greece
-instead.
-
-“Since Florence did my poor sister so much good,” wrote Miss Catharine,
-“we do not see why we should not try Athens this winter. Of course,
-Athens is a plunge, and the doctor has ordered her special digestive
-bread; but, after all, we can take that with us, and it is only getting
-first into a steamer and then into a train. But is there an English
-Church?” And the letter went on to say: “I do not expect we shall go
-any further than Athens, but if you knew of a really comfortable
-pension at Constantinople, we should be so grateful.”
-
-Lucy would enjoy this letter, and the smile with which Mr. Beebe
-greeted Windy Corner was partly for her. She would see the fun of it,
-and some of its beauty, for she must see some beauty. Though she was
-hopeless about pictures, and though she dressed so unevenly—oh, that
-cerise frock yesterday at church!—she must see some beauty in life, or
-she could not play the piano as she did. He had a theory that musicians
-are incredibly complex, and know far less than other artists what they
-want and what they are; that they puzzle themselves as well as their
-friends; that their psychology is a modern development, and has not yet
-been understood. This theory, had he known it, had possibly just been
-illustrated by facts. Ignorant of the events of yesterday he was only
-riding over to get some tea, to see his niece, and to observe whether
-Miss Honeychurch saw anything beautiful in the desire of two old ladies
-to visit Athens.
-
-A carriage was drawn up outside Windy Corner, and just as he caught
-sight of the house it started, bowled up the drive, and stopped
-abruptly when it reached the main road. Therefore it must be the horse,
-who always expected people to walk up the hill in case they tired him.
-The door opened obediently, and two men emerged, whom Mr. Beebe
-recognized as Cecil and Freddy. They were an odd couple to go driving;
-but he saw a trunk beside the coachman’s legs. Cecil, who wore a
-bowler, must be going away, while Freddy (a cap)—was seeing him to the
-station. They walked rapidly, taking the short cuts, and reached the
-summit while the carriage was still pursuing the windings of the road.
-
-They shook hands with the clergyman, but did not speak.
-
-“So you’re off for a minute, Mr. Vyse?” he asked.
-
-Cecil said, “Yes,” while Freddy edged away.
-
-“I was coming to show you this delightful letter from those friends of
-Miss Honeychurch.” He quoted from it. “Isn’t it wonderful? Isn’t it
-romance? Most certainly they will go to Constantinople. They are taken
-in a snare that cannot fail. They will end by going round the world.”
-
-Cecil listened civilly, and said he was sure that Lucy would be amused
-and interested.
-
-“Isn’t Romance capricious! I never notice it in you young people; you
-do nothing but play lawn tennis, and say that romance is dead, while
-the Miss Alans are struggling with all the weapons of propriety against
-the terrible thing. ‘A really comfortable pension at Constantinople!’
-So they call it out of decency, but in their hearts they want a pension
-with magic windows opening on the foam of perilous seas in fairyland
-forlorn! No ordinary view will content the Miss Alans. They want the
-Pension Keats.”
-
-“I’m awfully sorry to interrupt, Mr. Beebe,” said Freddy, “but have you
-any matches?”
-
-“I have,” said Cecil, and it did not escape Mr. Beebe’s notice that he
-spoke to the boy more kindly.
-
-“You have never met these Miss Alans, have you, Mr. Vyse?”
-
-“Never.”
-
-“Then you don’t see the wonder of this Greek visit. I haven’t been to
-Greece myself, and don’t mean to go, and I can’t imagine any of my
-friends going. It is altogether too big for our little lot. Don’t you
-think so? Italy is just about as much as we can manage. Italy is
-heroic, but Greece is godlike or devilish—I am not sure which, and in
-either case absolutely out of our suburban focus. All right, Freddy—I
-am not being clever, upon my word I am not—I took the idea from another
-fellow; and give me those matches when you’ve done with them.” He lit a
-cigarette, and went on talking to the two young men. “I was saying, if
-our poor little Cockney lives must have a background, let it be
-Italian. Big enough in all conscience. The ceiling of the Sistine
-Chapel for me. There the contrast is just as much as I can realize. But
-not the Parthenon, not the frieze of Phidias at any price; and here
-comes the victoria.”
-
-“You’re quite right,” said Cecil. “Greece is not for our little lot”;
-and he got in. Freddy followed, nodding to the clergyman, whom he
-trusted not to be pulling one’s leg, really. And before they had gone a
-dozen yards he jumped out, and came running back for Vyse’s match-box,
-which had not been returned. As he took it, he said: “I’m so glad you
-only talked about books. Cecil’s hard hit. Lucy won’t marry him. If
-you’d gone on about her, as you did about them, he might have broken
-down.”
-
-“But when—”
-
-“Late last night. I must go.”
-
-“Perhaps they won’t want me down there.”
-
-“No—go on. Good-bye.”
-
-“Thank goodness!” exclaimed Mr. Beebe to himself, and struck the saddle
-of his bicycle approvingly, “It was the one foolish thing she ever did.
-Oh, what a glorious riddance!” And, after a little thought, he
-negotiated the slope into Windy Corner, light of heart. The house was
-again as it ought to be—cut off forever from Cecil’s pretentious world.
-
-He would find Miss Minnie down in the garden.
-
-In the drawing-room Lucy was tinkling at a Mozart Sonata. He hesitated
-a moment, but went down the garden as requested. There he found a
-mournful company. It was a blustering day, and the wind had taken and
-broken the dahlias. Mrs. Honeychurch, who looked cross, was tying them
-up, while Miss Bartlett, unsuitably dressed, impeded her with offers of
-assistance. At a little distance stood Minnie and the “garden-child,” a
-minute importation, each holding either end of a long piece of bass.
-
-“Oh, how do you do, Mr. Beebe? Gracious what a mess everything is! Look
-at my scarlet pompoms, and the wind blowing your skirts about, and the
-ground so hard that not a prop will stick in, and then the carriage
-having to go out, when I had counted on having Powell, who—give
-everyone their due—does tie up dahlias properly.”
-
-Evidently Mrs. Honeychurch was shattered.
-
-“How do you do?” said Miss Bartlett, with a meaning glance, as though
-conveying that more than dahlias had been broken off by the autumn
-gales.
-
-“Here, Lennie, the bass,” cried Mrs. Honeychurch. The garden-child, who
-did not know what bass was, stood rooted to the path with horror.
-Minnie slipped to her uncle and whispered that everyone was very
-disagreeable to-day, and that it was not her fault if dahlia-strings
-would tear longways instead of across.
-
-“Come for a walk with me,” he told her. “You have worried them as much
-as they can stand. Mrs. Honeychurch, I only called in aimlessly. I
-shall take her up to tea at the Beehive Tavern, if I may.”
-
-“Oh, must you? Yes do.—Not the scissors, thank you, Charlotte, when
-both my hands are full already—I’m perfectly certain that the orange
-cactus will go before I can get to it.”
-
-Mr. Beebe, who was an adept at relieving situations, invited Miss
-Bartlett to accompany them to this mild festivity.
-
-“Yes, Charlotte, I don’t want you—do go; there’s nothing to stop about
-for, either in the house or out of it.”
-
-Miss Bartlett said that her duty lay in the dahlia bed, but when she
-had exasperated everyone, except Minnie, by a refusal, she turned round
-and exasperated Minnie by an acceptance. As they walked up the garden,
-the orange cactus fell, and Mr. Beebe’s last vision was of the
-garden-child clasping it like a lover, his dark head buried in a wealth
-of blossom.
-
-“It is terrible, this havoc among the flowers,” he remarked.
-
-“It is always terrible when the promise of months is destroyed in a
-moment,” enunciated Miss Bartlett.
-
-“Perhaps we ought to send Miss Honeychurch down to her mother. Or will
-she come with us?”
-
-“I think we had better leave Lucy to herself, and to her own pursuits.”
-
-“They’re angry with Miss Honeychurch because she was late for
-breakfast,” whispered Minnie, “and Floyd has gone, and Mr. Vyse has
-gone, and Freddy won’t play with me. In fact, Uncle Arthur, the house
-is not _at all_ what it was yesterday.”
-
-“Don’t be a prig,” said her Uncle Arthur. “Go and put on your boots.”
-
-He stepped into the drawing-room, where Lucy was still attentively
-pursuing the Sonatas of Mozart. She stopped when he entered.
-
-“How do you do? Miss Bartlett and Minnie are coming with me to tea at
-the Beehive. Would you come too?”
-
-“I don’t think I will, thank you.”
-
-“No, I didn’t suppose you would care to much.”
-
-Lucy turned to the piano and struck a few chords.
-
-“How delicate those Sonatas are!” said Mr. Beebe, though at the bottom
-of his heart, he thought them silly little things.
-
-Lucy passed into Schumann.
-
-“Miss Honeychurch!”
-
-“Yes.”
-
-“I met them on the hill. Your brother told me.”
-
-“Oh he did?” She sounded annoyed. Mr. Beebe felt hurt, for he had
-thought that she would like him to be told.
-
-“I needn’t say that it will go no further.”
-
-“Mother, Charlotte, Cecil, Freddy, you,” said Lucy, playing a note for
-each person who knew, and then playing a sixth note.
-
-“If you’ll let me say so, I am very glad, and I am certain that you
-have done the right thing.”
-
-“So I hoped other people would think, but they don’t seem to.”
-
-“I could see that Miss Bartlett thought it unwise.”
-
-“So does mother. Mother minds dreadfully.”
-
-“I am very sorry for that,” said Mr. Beebe with feeling.
-
-Mrs. Honeychurch, who hated all changes, did mind, but not nearly as
-much as her daughter pretended, and only for the minute. It was really
-a ruse of Lucy’s to justify her despondency—a ruse of which she was not
-herself conscious, for she was marching in the armies of darkness.
-
-“And Freddy minds.”
-
-“Still, Freddy never hit it off with Vyse much, did he? I gathered that
-he disliked the engagement, and felt it might separate him from you.”
-
-“Boys are so odd.”
-
-Minnie could be heard arguing with Miss Bartlett through the floor. Tea
-at the Beehive apparently involved a complete change of apparel. Mr.
-Beebe saw that Lucy—very properly—did not wish to discuss her action,
-so after a sincere expression of sympathy, he said, “I have had an
-absurd letter from Miss Alan. That was really what brought me over. I
-thought it might amuse you all.”
-
-“How delightful!” said Lucy, in a dull voice.
-
-For the sake of something to do, he began to read her the letter. After
-a few words her eyes grew alert, and soon she interrupted him with
-“Going abroad? When do they start?”
-
-“Next week, I gather.”
-
-“Did Freddy say whether he was driving straight back?”
-
-“No, he didn’t.”
-
-“Because I do hope he won’t go gossiping.”
-
-So she did want to talk about her broken engagement. Always
-complaisant, he put the letter away. But she, at once exclaimed in a
-high voice, “Oh, do tell me more about the Miss Alans! How perfectly
-splendid of them to go abroad!”
-
-“I want them to start from Venice, and go in a cargo steamer down the
-Illyrian coast!”
-
-She laughed heartily. “Oh, delightful! I wish they’d take me.”
-
-“Has Italy filled you with the fever of travel? Perhaps George Emerson
-is right. He says that ‘Italy is only an euphuism for Fate.’”
-
-“Oh, not Italy, but Constantinople. I have always longed to go to
-Constantinople. Constantinople is practically Asia, isn’t it?”
-
-Mr. Beebe reminded her that Constantinople was still unlikely, and that
-the Miss Alans only aimed at Athens, “with Delphi, perhaps, if the
-roads are safe.” But this made no difference to her enthusiasm. She had
-always longed to go to Greece even more, it seemed. He saw, to his
-surprise, that she was apparently serious.
-
-“I didn’t realize that you and the Miss Alans were still such friends,
-after Cissie Villa.”
-
-“Oh, that’s nothing; I assure you Cissie Villa’s nothing to me; I would
-give anything to go with them.”
-
-“Would your mother spare you again so soon? You have scarcely been home
-three months.”
-
-“She _must_ spare me!” cried Lucy, in growing excitement. “I simply
-_must_ go away. I have to.” She ran her fingers hysterically through
-her hair. “Don’t you see that I _have_ to go away? I didn’t realize at
-the time—and of course I want to see Constantinople so particularly.”
-
-“You mean that since you have broken off your engagement you feel—”
-
-“Yes, yes. I knew you’d understand.”
-
-Mr. Beebe did not quite understand. Why could not Miss Honeychurch
-repose in the bosom of her family? Cecil had evidently taken up the
-dignified line, and was not going to annoy her. Then it struck him that
-her family itself might be annoying. He hinted this to her, and she
-accepted the hint eagerly.
-
-“Yes, of course; to go to Constantinople until they are used to the
-idea and everything has calmed down.”
-
-“I am afraid it has been a bothersome business,” he said gently.
-
-“No, not at all. Cecil was very kind indeed; only—I had better tell you
-the whole truth, since you have heard a little—it was that he is so
-masterful. I found that he wouldn’t let me go my own way. He would
-improve me in places where I can’t be improved. Cecil won’t let a woman
-decide for herself—in fact, he daren’t. What nonsense I do talk! But
-that is the kind of thing.”
-
-“It is what I gathered from my own observation of Mr. Vyse; it is what
-I gather from all that I have known of you. I do sympathize and agree
-most profoundly. I agree so much that you must let me make one little
-criticism: Is it worth while rushing off to Greece?”
-
-“But I must go somewhere!” she cried. “I have been worrying all the
-morning, and here comes the very thing.” She struck her knees with
-clenched fists, and repeated: “I must! And the time I shall have with
-mother, and all the money she spent on me last spring. You all think
-much too highly of me. I wish you weren’t so kind.” At this moment Miss
-Bartlett entered, and her nervousness increased. “I must get away, ever
-so far. I must know my own mind and where I want to go.”
-
-“Come along; tea, tea, tea,” said Mr. Beebe, and bustled his guests out
-of the front-door. He hustled them so quickly that he forgot his hat.
-When he returned for it he heard, to his relief and surprise, the
-tinkling of a Mozart Sonata.
-
-“She is playing again,” he said to Miss Bartlett.
-
-“Lucy can always play,” was the acid reply.
-
-“One is very thankful that she has such a resource. She is evidently
-much worried, as, of course, she ought to be. I know all about it. The
-marriage was so near that it must have been a hard struggle before she
-could wind herself up to speak.”
-
-Miss Bartlett gave a kind of wriggle, and he prepared for a discussion.
-He had never fathomed Miss Bartlett. As he had put it to himself at
-Florence, “she might yet reveal depths of strangeness, if not of
-meaning.” But she was so unsympathetic that she must be reliable. He
-assumed that much, and he had no hesitation in discussing Lucy with
-her. Minnie was fortunately collecting ferns.
-
-She opened the discussion with: “We had much better let the matter
-drop.”
-
-“I wonder.”
-
-“It is of the highest importance that there should be no gossip in
-Summer Street. It would be _death_ to gossip about Mr. Vyse’s dismissal
-at the present moment.”
-
-Mr. Beebe raised his eyebrows. Death is a strong word—surely too
-strong. There was no question of tragedy. He said: “Of course, Miss
-Honeychurch will make the fact public in her own way, and when she
-chooses. Freddy only told me because he knew she would not mind.”
-
-“I know,” said Miss Bartlett civilly. “Yet Freddy ought not to have
-told even you. One cannot be too careful.”
-
-“Quite so.”
-
-“I do implore absolute secrecy. A chance word to a chattering friend,
-and—”
-
-“Exactly.” He was used to these nervous old maids and to the
-exaggerated importance that they attach to words. A rector lives in a
-web of petty secrets, and confidences and warnings, and the wiser he is
-the less he will regard them. He will change the subject, as did Mr.
-Beebe, saying cheerfully: “Have you heard from any Bertolini people
-lately? I believe you keep up with Miss Lavish. It is odd how we of
-that pension, who seemed such a fortuitous collection, have been
-working into one another’s lives. Two, three, four, six of us—no,
-eight; I had forgotten the Emersons—have kept more or less in touch. We
-must really give the Signora a testimonial.”
-
-And, Miss Bartlett not favouring the scheme, they walked up the hill in
-a silence which was only broken by the rector naming some fern. On the
-summit they paused. The sky had grown wilder since he stood there last
-hour, giving to the land a tragic greatness that is rare in Surrey.
-Grey clouds were charging across tissues of white, which stretched and
-shredded and tore slowly, until through their final layers there
-gleamed a hint of the disappearing blue. Summer was retreating. The
-wind roared, the trees groaned, yet the noise seemed insufficient for
-those vast operations in heaven. The weather was breaking up, breaking,
-broken, and it is a sense of the fit rather than of the supernatural
-that equips such crises with the salvos of angelic artillery. Mr.
-Beebe’s eyes rested on Windy Corner, where Lucy sat, practising Mozart.
-No smile came to his lips, and, changing the subject again, he said:
-“We shan’t have rain, but we shall have darkness, so let us hurry on.
-The darkness last night was appalling.”
-
-They reached the Beehive Tavern at about five o’clock. That amiable
-hostelry possesses a verandah, in which the young and the unwise do
-dearly love to sit, while guests of more mature years seek a pleasant
-sanded room, and have tea at a table comfortably. Mr. Beebe saw that
-Miss Bartlett would be cold if she sat out, and that Minnie would be
-dull if she sat in, so he proposed a division of forces. They would
-hand the child her food through the window. Thus he was incidentally
-enabled to discuss the fortunes of Lucy.
-
-“I have been thinking, Miss Bartlett,” he said, “and, unless you very
-much object, I would like to reopen that discussion.” She bowed.
-“Nothing about the past. I know little and care less about that; I am
-absolutely certain that it is to your cousin’s credit. She has acted
-loftily and rightly, and it is like her gentle modesty to say that we
-think too highly of her. But the future. Seriously, what do you think
-of this Greek plan?” He pulled out the letter again. “I don’t know
-whether you overheard, but she wants to join the Miss Alans in their
-mad career. It’s all—I can’t explain—it’s wrong.”
-
-Miss Bartlett read the letter in silence, laid it down, seemed to
-hesitate, and then read it again.
-
-“I can’t see the point of it myself.”
-
-To his astonishment, she replied: “There I cannot agree with you. In it
-I spy Lucy’s salvation.”
-
-“Really. Now, why?”
-
-“She wanted to leave Windy Corner.”
-
-“I know—but it seems so odd, so unlike her, so—I was going to
-say—selfish.”
-
-“It is natural, surely—after such painful scenes—that she should desire
-a change.”
-
-Here, apparently, was one of those points that the male intellect
-misses. Mr. Beebe exclaimed: “So she says herself, and since another
-lady agrees with her, I must own that I am partially convinced. Perhaps
-she must have a change. I have no sisters or—and I don’t understand
-these things. But why need she go as far as Greece?”
-
-“You may well ask that,” replied Miss Bartlett, who was evidently
-interested, and had almost dropped her evasive manner. “Why Greece?
-(What is it, Minnie dear—jam?) Why not Tunbridge Wells? Oh, Mr. Beebe!
-I had a long and most unsatisfactory interview with dear Lucy this
-morning. I cannot help her. I will say no more. Perhaps I have already
-said too much. I am not to talk. I wanted her to spend six months with
-me at Tunbridge Wells, and she refused.”
-
-Mr. Beebe poked at a crumb with his knife.
-
-“But my feelings are of no importance. I know too well that I get on
-Lucy’s nerves. Our tour was a failure. She wanted to leave Florence,
-and when we got to Rome she did not want to be in Rome, and all the
-time I felt that I was spending her mother’s money—.”
-
-“Let us keep to the future, though,” interrupted Mr. Beebe. “I want
-your advice.”
-
-“Very well,” said Charlotte, with a choky abruptness that was new to
-him, though familiar to Lucy. “I for one will help her to go to Greece.
-Will you?”
-
-Mr. Beebe considered.
-
-“It is absolutely necessary,” she continued, lowering her veil and
-whispering through it with a passion, an intensity, that surprised him.
-“I know—I _know_.” The darkness was coming on, and he felt that this
-odd woman really did know. “She must not stop here a moment, and we
-must keep quiet till she goes. I trust that the servants know nothing.
-Afterwards—but I may have said too much already. Only, Lucy and I are
-helpless against Mrs. Honeychurch alone. If you help we may succeed.
-Otherwise—”
-
-“Otherwise—?”
-
-“Otherwise,” she repeated as if the word held finality.
-
-“Yes, I will help her,” said the clergyman, setting his jaw firm.
-“Come, let us go back now, and settle the whole thing up.”
-
-Miss Bartlett burst into florid gratitude. The tavern sign—a beehive
-trimmed evenly with bees—creaked in the wind outside as she thanked
-him. Mr. Beebe did not quite understand the situation; but then, he did
-not desire to understand it, nor to jump to the conclusion of “another
-man” that would have attracted a grosser mind. He only felt that Miss
-Bartlett knew of some vague influence from which the girl desired to be
-delivered, and which might well be clothed in the fleshly form. Its
-very vagueness spurred him into knight-errantry. His belief in
-celibacy, so reticent, so carefully concealed beneath his tolerance and
-culture, now came to the surface and expanded like some delicate
-flower. “They that marry do well, but they that refrain do better.” So
-ran his belief, and he never heard that an engagement was broken off
-but with a slight feeling of pleasure. In the case of Lucy, the feeling
-was intensified through dislike of Cecil; and he was willing to go
-further—to place her out of danger until she could confirm her
-resolution of virginity. The feeling was very subtle and quite
-undogmatic, and he never imparted it to any other of the characters in
-this entanglement. Yet it existed, and it alone explains his action
-subsequently, and his influence on the action of others. The compact
-that he made with Miss Bartlett in the tavern, was to help not only
-Lucy, but religion also.
-
-They hurried home through a world of black and grey. He conversed on
-indifferent topics: the Emersons’ need of a housekeeper; servants;
-Italian servants; novels about Italy; novels with a purpose; could
-literature influence life? Windy Corner glimmered. In the garden, Mrs.
-Honeychurch, now helped by Freddy, still wrestled with the lives of her
-flowers.
-
-“It gets too dark,” she said hopelessly. “This comes of putting off. We
-might have known the weather would break up soon; and now Lucy wants to
-go to Greece. I don’t know what the world’s coming to.”
-
-“Mrs. Honeychurch,” he said, “go to Greece she must. Come up to the
-house and let’s talk it over. Do you, in the first place, mind her
-breaking with Vyse?”
-
-“Mr. Beebe, I’m thankful—simply thankful.”
-
-“So am I,” said Freddy.
-
-“Good. Now come up to the house.”
-
-They conferred in the dining-room for half an hour.
-
-Lucy would never have carried the Greek scheme alone. It was expensive
-and dramatic—both qualities that her mother loathed. Nor would
-Charlotte have succeeded. The honours of the day rested with Mr. Beebe.
-By his tact and common sense, and by his influence as a clergyman—for a
-clergyman who was not a fool influenced Mrs. Honeychurch greatly—he
-bent her to their purpose, “I don’t see why Greece is necessary,” she
-said; “but as you do, I suppose it is all right. It must be something I
-can’t understand. Lucy! Let’s tell her. Lucy!”
-
-“She is playing the piano,” Mr. Beebe said. He opened the door, and
-heard the words of a song:
-
-“Look not thou on beauty’s charming.”
-
-
-“I didn’t know that Miss Honeychurch sang, too.”
-
-“Sit thou still when kings are arming,
-Taste not when the wine-cup glistens——”
-
-
-“It’s a song that Cecil gave her. How odd girls are!”
-
-“What’s that?” called Lucy, stopping short.
-
-“All right, dear,” said Mrs. Honeychurch kindly. She went into the
-drawing-room, and Mr. Beebe heard her kiss Lucy and say: “I am sorry I
-was so cross about Greece, but it came on the top of the dahlias.”
-
-Rather a hard voice said: “Thank you, mother; that doesn’t matter a
-bit.”
-
-“And you are right, too—Greece will be all right; you can go if the
-Miss Alans will have you.”
-
-“Oh, splendid! Oh, thank you!”
-
-Mr. Beebe followed. Lucy still sat at the piano with her hands over the
-keys. She was glad, but he had expected greater gladness. Her mother
-bent over her. Freddy, to whom she had been singing, reclined on the
-floor with his head against her, and an unlit pipe between his lips.
-Oddly enough, the group was beautiful. Mr. Beebe, who loved the art of
-the past, was reminded of a favourite theme, the _Santa Conversazione_,
-in which people who care for one another are painted chatting together
-about noble things—a theme neither sensual nor sensational, and
-therefore ignored by the art of to-day. Why should Lucy want either to
-marry or to travel when she had such friends at home?
-
-“Taste not when the wine-cup glistens,
-Speak not when the people listens,”
-
-
-she continued.
-
-“Here’s Mr. Beebe.”
-
-“Mr. Beebe knows my rude ways.”
-
-“It’s a beautiful song and a wise one,” said he. “Go on.”
-
-“It isn’t very good,” she said listlessly. “I forget why—harmony or
-something.”
-
-“I suspected it was unscholarly. It’s so beautiful.”
-
-“The tune’s right enough,” said Freddy, “but the words are rotten. Why
-throw up the sponge?”
-
-“How stupidly you talk!” said his sister. The _Santa Conversazione_ was
-broken up. After all, there was no reason that Lucy should talk about
-Greece or thank him for persuading her mother, so he said good-bye.
-
-Freddy lit his bicycle lamp for him in the porch, and with his usual
-felicity of phrase, said: “This has been a day and a half.”
-
-“Stop thine ear against the singer—”
-
-
-“Wait a minute; she is finishing.”
-
-“From the red gold keep thy finger;
-Vacant heart and hand and eye
-Easy live and quiet die.”
-
-
-“I love weather like this,” said Freddy.
-
-Mr. Beebe passed into it.
-
-The two main facts were clear. She had behaved splendidly, and he had
-helped her. He could not expect to master the details of so big a
-change in a girl’s life. If here and there he was dissatisfied or
-puzzled, he must acquiesce; she was choosing the better part.
-
-“Vacant heart and hand and eye—”
-
-
-Perhaps the song stated “the better part” rather too strongly. He half
-fancied that the soaring accompaniment—which he did not lose in the
-shout of the gale—really agreed with Freddy, and was gently criticizing
-the words that it adorned:
-
-“Vacant heart and hand and eye
-Easy live and quiet die.”
-
-
-However, for the fourth time Windy Corner lay poised below him—now as a
-beacon in the roaring tides of darkness.
-
-
-
-
-Chapter XIX
-Lying to Mr. Emerson
-
-
-The Miss Alans were found in their beloved temperance hotel near
-Bloomsbury—a clean, airless establishment much patronized by provincial
-England. They always perched there before crossing the great seas, and
-for a week or two would fidget gently over clothes, guide-books,
-mackintosh squares, digestive bread, and other Continental necessaries.
-That there are shops abroad, even in Athens, never occurred to them,
-for they regarded travel as a species of warfare, only to be undertaken
-by those who have been fully armed at the Haymarket Stores. Miss
-Honeychurch, they trusted, would take care to equip herself duly.
-Quinine could now be obtained in tabloids; paper soap was a great help
-towards freshening up one’s face in the train. Lucy promised, a little
-depressed.
-
-“But, of course, you know all about these things, and you have Mr. Vyse
-to help you. A gentleman is such a stand-by.”
-
-Mrs. Honeychurch, who had come up to town with her daughter, began to
-drum nervously upon her card-case.
-
-“We think it so good of Mr. Vyse to spare you,” Miss Catharine
-continued. “It is not every young man who would be so unselfish. But
-perhaps he will come out and join you later on.”
-
-“Or does his work keep him in London?” said Miss Teresa, the more acute
-and less kindly of the two sisters.
-
-“However, we shall see him when he sees you off. I do so long to see
-him.”
-
-“No one will see Lucy off,” interposed Mrs. Honeychurch. “She doesn’t
-like it.”
-
-“No, I hate seeings-off,” said Lucy.
-
-“Really? How funny! I should have thought that in this case—”
-
-“Oh, Mrs. Honeychurch, you aren’t going? It is such a pleasure to have
-met you!”
-
-They escaped, and Lucy said with relief: “That’s all right. We just got
-through that time.”
-
-But her mother was annoyed. “I should be told, dear, that I am
-unsympathetic. But I cannot see why you didn’t tell your friends about
-Cecil and be done with it. There all the time we had to sit fencing,
-and almost telling lies, and be seen through, too, I dare say, which is
-most unpleasant.”
-
-Lucy had plenty to say in reply. She described the Miss Alans’
-character: they were such gossips, and if one told them, the news would
-be everywhere in no time.
-
-“But why shouldn’t it be everywhere in no time?”
-
-“Because I settled with Cecil not to announce it until I left England.
-I shall tell them then. It’s much pleasanter. How wet it is! Let’s turn
-in here.”
-
-“Here” was the British Museum. Mrs. Honeychurch refused. If they must
-take shelter, let it be in a shop. Lucy felt contemptuous, for she was
-on the tack of caring for Greek sculpture, and had already borrowed a
-mythical dictionary from Mr. Beebe to get up the names of the goddesses
-and gods.
-
-“Oh, well, let it be shop, then. Let’s go to Mudie’s. I’ll buy a
-guide-book.”
-
-“You know, Lucy, you and Charlotte and Mr. Beebe all tell me I’m so
-stupid, so I suppose I am, but I shall never understand this
-hole-and-corner work. You’ve got rid of Cecil—well and good, and I’m
-thankful he’s gone, though I did feel angry for the minute. But why not
-announce it? Why this hushing up and tip-toeing?”
-
-“It’s only for a few days.”
-
-“But why at all?”
-
-Lucy was silent. She was drifting away from her mother. It was quite
-easy to say, “Because George Emerson has been bothering me, and if he
-hears I’ve given up Cecil may begin again”—quite easy, and it had the
-incidental advantage of being true. But she could not say it. She
-disliked confidences, for they might lead to self-knowledge and to that
-king of terrors—Light. Ever since that last evening at Florence she had
-deemed it unwise to reveal her soul.
-
-Mrs. Honeychurch, too, was silent. She was thinking, “My daughter won’t
-answer me; she would rather be with those inquisitive old maids than
-with Freddy and me. Any rag, tag, and bobtail apparently does if she
-can leave her home.” And as in her case thoughts never remained
-unspoken long, she burst out with: “You’re tired of Windy Corner.”
-
-This was perfectly true. Lucy had hoped to return to Windy Corner when
-she escaped from Cecil, but she discovered that her home existed no
-longer. It might exist for Freddy, who still lived and thought
-straight, but not for one who had deliberately warped the brain. She
-did not acknowledge that her brain was warped, for the brain itself
-must assist in that acknowledgment, and she was disordering the very
-instruments of life. She only felt, “I do not love George; I broke off
-my engagement because I did not love George; I must go to Greece
-because I do not love George; it is more important that I should look
-up gods in the dictionary than that I should help my mother; everyone
-else is behaving very badly.” She only felt irritable and petulant, and
-anxious to do what she was not expected to do, and in this spirit she
-proceeded with the conversation.
-
-“Oh, mother, what rubbish you talk! Of course I’m not tired of Windy
-Corner.”
-
-“Then why not say so at once, instead of considering half an hour?”
-
-She laughed faintly, “Half a _minute_ would be nearer.”
-
-“Perhaps you would like to stay away from your home altogether?”
-
-“Hush, mother! People will hear you”; for they had entered Mudie’s. She
-bought Baedeker, and then continued: “Of course I want to live at home;
-but as we are talking about it, I may as well say that I shall want to
-be away in the future more than I have been. You see, I come into my
-money next year.”
-
-Tears came into her mother’s eyes.
-
-Driven by nameless bewilderment, by what is in older people termed
-“eccentricity,” Lucy determined to make this point clear. “I’ve seen
-the world so little—I felt so out of things in Italy. I have seen so
-little of life; one ought to come up to London more—not a cheap ticket
-like to-day, but to stop. I might even share a flat for a little with
-some other girl.”
-
-“And mess with typewriters and latch-keys,” exploded Mrs. Honeychurch.
-“And agitate and scream, and be carried off kicking by the police. And
-call it a Mission—when no one wants you! And call it Duty—when it means
-that you can’t stand your own home! And call it Work—when thousands of
-men are starving with the competition as it is! And then to prepare
-yourself, find two doddering old ladies, and go abroad with them.”
-
-“I want more independence,” said Lucy lamely; she knew that she wanted
-something, and independence is a useful cry; we can always say that we
-have not got it. She tried to remember her emotions in Florence: those
-had been sincere and passionate, and had suggested beauty rather than
-short skirts and latch-keys. But independence was certainly her cue.
-
-“Very well. Take your independence and be gone. Rush up and down and
-round the world, and come back as thin as a lath with the bad food.
-Despise the house that your father built and the garden that he
-planted, and our dear view—and then share a flat with another girl.”
-
-Lucy screwed up her mouth and said: “Perhaps I spoke hastily.”
-
-“Oh, goodness!” her mother flashed. “How you do remind me of Charlotte
-Bartlett!”
-
-“_Charlotte?_” flashed Lucy in her turn, pierced at last by a vivid
-pain.
-
-“More every moment.”
-
-“I don’t know what you mean, mother; Charlotte and I are not the very
-least alike.”
-
-“Well, I see the likeness. The same eternal worrying, the same taking
-back of words. You and Charlotte trying to divide two apples among
-three people last night might be sisters.”
-
-“What rubbish! And if you dislike Charlotte so, it’s rather a pity you
-asked her to stop. I warned you about her; I begged you, implored you
-not to, but of course it was not listened to.”
-
-“There you go.”
-
-“I beg your pardon?”
-
-“Charlotte again, my dear; that’s all; her very words.”
-
-Lucy clenched her teeth. “My point is that you oughtn’t to have asked
-Charlotte to stop. I wish you would keep to the point.” And the
-conversation died off into a wrangle.
-
-She and her mother shopped in silence, spoke little in the train,
-little again in the carriage, which met them at Dorking Station. It had
-poured all day and as they ascended through the deep Surrey lanes
-showers of water fell from the over-hanging beech-trees and rattled on
-the hood. Lucy complained that the hood was stuffy. Leaning forward,
-she looked out into the steaming dusk, and watched the carriage-lamp
-pass like a search-light over mud and leaves, and reveal nothing
-beautiful. “The crush when Charlotte gets in will be abominable,” she
-remarked. For they were to pick up Miss Bartlett at Summer Street,
-where she had been dropped as the carriage went down, to pay a call on
-Mr. Beebe’s old mother. “We shall have to sit three a side, because the
-trees drop, and yet it isn’t raining. Oh, for a little air!” Then she
-listened to the horse’s hoofs—“He has not told—he has not told.” That
-melody was blurred by the soft road. “_Can’t_ we have the hood down?”
-she demanded, and her mother, with sudden tenderness, said: “Very well,
-old lady, stop the horse.” And the horse was stopped, and Lucy and
-Powell wrestled with the hood, and squirted water down Mrs.
-Honeychurch’s neck. But now that the hood was down, she did see
-something that she would have missed—there were no lights in the
-windows of Cissie Villa, and round the garden gate she fancied she saw
-a padlock.
-
-“Is that house to let again, Powell?” she called.
-
-“Yes, miss,” he replied.
-
-“Have they gone?”
-
-“It is too far out of town for the young gentleman, and his father’s
-rheumatism has come on, so he can’t stop on alone, so they are trying
-to let furnished,” was the answer.
-
-“They have gone, then?”
-
-“Yes, miss, they have gone.”
-
-Lucy sank back. The carriage stopped at the Rectory. She got out to
-call for Miss Bartlett. So the Emersons had gone, and all this bother
-about Greece had been unnecessary. Waste! That word seemed to sum up
-the whole of life. Wasted plans, wasted money, wasted love, and she had
-wounded her mother. Was it possible that she had muddled things away?
-Quite possible. Other people had. When the maid opened the door, she
-was unable to speak, and stared stupidly into the hall.
-
-Miss Bartlett at once came forward, and after a long preamble asked a
-great favour: might she go to church? Mr. Beebe and his mother had
-already gone, but she had refused to start until she obtained her
-hostess’s full sanction, for it would mean keeping the horse waiting a
-good ten minutes more.
-
-“Certainly,” said the hostess wearily. “I forgot it was Friday. Let’s
-all go. Powell can go round to the stables.”
-
-“Lucy dearest—”
-
-“No church for me, thank you.”
-
-A sigh, and they departed. The church was invisible, but up in the
-darkness to the left there was a hint of colour. This was a stained
-window, through which some feeble light was shining, and when the door
-opened Lucy heard Mr. Beebe’s voice running through the litany to a
-minute congregation. Even their church, built upon the slope of the
-hill so artfully, with its beautiful raised transept and its spire of
-silvery shingle—even their church had lost its charm; and the thing one
-never talked about—religion—was fading like all the other things.
-
-She followed the maid into the Rectory.
-
-Would she object to sitting in Mr. Beebe’s study? There was only that
-one fire.
-
-She would not object.
-
-Some one was there already, for Lucy heard the words: “A lady to wait,
-sir.”
-
-Old Mr. Emerson was sitting by the fire, with his foot upon a
-gout-stool.
-
-“Oh, Miss Honeychurch, that you should come!” he quavered; and Lucy saw
-an alteration in him since last Sunday.
-
-Not a word would come to her lips. George she had faced, and could have
-faced again, but she had forgotten how to treat his father.
-
-“Miss Honeychurch, dear, we are so sorry! George is so sorry! He
-thought he had a right to try. I cannot blame my boy, and yet I wish he
-had told me first. He ought not to have tried. I knew nothing about it
-at all.”
-
-If only she could remember how to behave!
-
-He held up his hand. “But you must not scold him.”
-
-Lucy turned her back, and began to look at Mr. Beebe’s books.
-
-“I taught him,” he quavered, “to trust in love. I said: ‘When love
-comes, that is reality.’ I said: ‘Passion does not blind. No. Passion
-is sanity, and the woman you love, she is the only person you will ever
-really understand.’” He sighed: “True, everlastingly true, though my
-day is over, and though there is the result. Poor boy! He is so sorry!
-He said he knew it was madness when you brought your cousin in; that
-whatever you felt you did not mean. Yet”—his voice gathered strength:
-he spoke out to make certain—“Miss Honeychurch, do you remember Italy?”
-
-Lucy selected a book—a volume of Old Testament commentaries. Holding it
-up to her eyes, she said: “I have no wish to discuss Italy or any
-subject connected with your son.”
-
-“But you do remember it?”
-
-“He has misbehaved himself from the first.”
-
-“I only was told that he loved you last Sunday. I never could judge
-behaviour. I—I—suppose he has.”
-
-Feeling a little steadier, she put the book back and turned round to
-him. His face was drooping and swollen, but his eyes, though they were
-sunken deep, gleamed with a child’s courage.
-
-“Why, he has behaved abominably,” she said. “I am glad he is sorry. Do
-you know what he did?”
-
-“Not ‘abominably,’” was the gentle correction. “He only tried when he
-should not have tried. You have all you want, Miss Honeychurch: you are
-going to marry the man you love. Do not go out of George’s life saying
-he is abominable.”
-
-“No, of course,” said Lucy, ashamed at the reference to Cecil.
-“‘Abominable’ is much too strong. I am sorry I used it about your son.
-I think I will go to church, after all. My mother and my cousin have
-gone. I shall not be so very late—”
-
-“Especially as he has gone under,” he said quietly.
-
-“What was that?”
-
-“Gone under naturally.” He beat his palms together in silence; his head
-fell on his chest.
-
-“I don’t understand.”
-
-“As his mother did.”
-
-“But, Mr. Emerson—_Mr. Emerson_—what are you talking about?”
-
-“When I wouldn’t have George baptized,” said he.
-
-Lucy was frightened.
-
-“And she agreed that baptism was nothing, but he caught that fever when
-he was twelve and she turned round. She thought it a judgement.” He
-shuddered. “Oh, horrible, when we had given up that sort of thing and
-broken away from her parents. Oh, horrible—worst of all—worse than
-death, when you have made a little clearing in the wilderness, planted
-your little garden, let in your sunlight, and then the weeds creep in
-again! A judgement! And our boy had typhoid because no clergyman had
-dropped water on him in church! Is it possible, Miss Honeychurch? Shall
-we slip back into the darkness for ever?”
-
-“I don’t know,” gasped Lucy. “I don’t understand this sort of thing. I
-was not meant to understand it.”
-
-“But Mr. Eager—he came when I was out, and acted according to his
-principles. I don’t blame him or any one... but by the time George was
-well she was ill. He made her think about sin, and she went under
-thinking about it.”
-
-It was thus that Mr. Emerson had murdered his wife in the sight of God.
-
-“Oh, how terrible!” said Lucy, forgetting her own affairs at last.
-
-“He was not baptized,” said the old man. “I did hold firm.” And he
-looked with unwavering eyes at the rows of books, as if—at what
-cost!—he had won a victory over them. “My boy shall go back to the
-earth untouched.”
-
-She asked whether young Mr. Emerson was ill.
-
-“Oh—last Sunday.” He started into the present. “George last Sunday—no,
-not ill: just gone under. He is never ill. But he is his mother’s son.
-Her eyes were his, and she had that forehead that I think so beautiful,
-and he will not think it worth while to live. It was always touch and
-go. He will live; but he will not think it worth while to live. He will
-never think anything worth while. You remember that church at
-Florence?”
-
-Lucy did remember, and how she had suggested that George should collect
-postage stamps.
-
-“After you left Florence—horrible. Then we took the house here, and he
-goes bathing with your brother, and became better. You saw him
-bathing?”
-
-“I am so sorry, but it is no good discussing this affair. I am deeply
-sorry about it.”
-
-“Then there came something about a novel. I didn’t follow it at all; I
-had to hear so much, and he minded telling me; he finds me too old. Ah,
-well, one must have failures. George comes down to-morrow, and takes me
-up to his London rooms. He can’t bear to be about here, and I must be
-where he is.”
-
-“Mr. Emerson,” cried the girl, “don’t leave at least, not on my
-account. I am going to Greece. Don’t leave your comfortable house.”
-
-It was the first time her voice had been kind and he smiled. “How good
-everyone is! And look at Mr. Beebe housing me—came over this morning
-and heard I was going! Here I am so comfortable with a fire.”
-
-“Yes, but you won’t go back to London. It’s absurd.”
-
-“I must be with George; I must make him care to live, and down here he
-can’t. He says the thought of seeing you and of hearing about you—I am
-not justifying him: I am only saying what has happened.”
-
-“Oh, Mr. Emerson”—she took hold of his hand—“you mustn’t. I’ve been
-bother enough to the world by now. I can’t have you moving out of your
-house when you like it, and perhaps losing money through it—all on my
-account. You must stop! I am just going to Greece.”
-
-“All the way to Greece?”
-
-Her manner altered.
-
-“To Greece?”
-
-“So you must stop. You won’t talk about this business, I know. I can
-trust you both.”
-
-“Certainly you can. We either have you in our lives, or leave you to
-the life that you have chosen.”
-
-“I shouldn’t want—”
-
-“I suppose Mr. Vyse is very angry with George? No, it was wrong of
-George to try. We have pushed our beliefs too far. I fancy that we
-deserve sorrow.”
-
-She looked at the books again—black, brown, and that acrid theological
-blue. They surrounded the visitors on every side; they were piled on
-the tables, they pressed against the very ceiling. To Lucy who could
-not see that Mr. Emerson was profoundly religious, and differed from
-Mr. Beebe chiefly by his acknowledgment of passion—it seemed dreadful
-that the old man should crawl into such a sanctum, when he was unhappy,
-and be dependent on the bounty of a clergyman.
-
-More certain than ever that she was tired, he offered her his chair.
-
-“No, please sit still. I think I will sit in the carriage.”
-
-“Miss Honeychurch, you do sound tired.”
-
-“Not a bit,” said Lucy, with trembling lips.
-
-“But you are, and there’s a look of George about you. And what were you
-saying about going abroad?”
-
-She was silent.
-
-“Greece”—and she saw that he was thinking the word over—“Greece; but
-you were to be married this year, I thought.”
-
-“Not till January, it wasn’t,” said Lucy, clasping her hands. Would she
-tell an actual lie when it came to the point?
-
-“I suppose that Mr. Vyse is going with you. I hope—it isn’t because
-George spoke that you are both going?”
-
-“No.”
-
-“I hope that you will enjoy Greece with Mr. Vyse.”
-
-“Thank you.”
-
-At that moment Mr. Beebe came back from church. His cassock was covered
-with rain. “That’s all right,” he said kindly. “I counted on you two
-keeping each other company. It’s pouring again. The entire
-congregation, which consists of your cousin, your mother, and my
-mother, stands waiting in the church, till the carriage fetches it. Did
-Powell go round?”
-
-“I think so; I’ll see.”
-
-“No—of course, I’ll see. How are the Miss Alans?”
-
-“Very well, thank you.”
-
-“Did you tell Mr. Emerson about Greece?”
-
-“I—I did.”
-
-“Don’t you think it very plucky of her, Mr. Emerson, to undertake the
-two Miss Alans? Now, Miss Honeychurch, go back—keep warm. I think three
-is such a courageous number to go travelling.” And he hurried off to
-the stables.
-
-“He is not going,” she said hoarsely. “I made a slip. Mr. Vyse does
-stop behind in England.”
-
-Somehow it was impossible to cheat this old man. To George, to Cecil,
-she would have lied again; but he seemed so near the end of things, so
-dignified in his approach to the gulf, of which he gave one account,
-and the books that surrounded him another, so mild to the rough paths
-that he had traversed, that the true chivalry—not the worn-out chivalry
-of sex, but the true chivalry that all the young may show to all the
-old—awoke in her, and, at whatever risk, she told him that Cecil was
-not her companion to Greece. And she spoke so seriously that the risk
-became a certainty, and he, lifting his eyes, said: “You are leaving
-him? You are leaving the man you love?”
-
-“I—I had to.”
-
-“Why, Miss Honeychurch, why?”
-
-Terror came over her, and she lied again. She made the long, convincing
-speech that she had made to Mr. Beebe, and intended to make to the
-world when she announced that her engagement was no more. He heard her
-in silence, and then said: “My dear, I am worried about you. It seems
-to me”—dreamily; she was not alarmed—“that you are in a muddle.”
-
-She shook her head.
-
-“Take an old man’s word; there’s nothing worse than a muddle in all the
-world. It is easy to face Death and Fate, and the things that sound so
-dreadful. It is on my muddles that I look back with horror—on the
-things that I might have avoided. We can help one another but little. I
-used to think I could teach young people the whole of life, but I know
-better now, and all my teaching of George has come down to this: beware
-of muddle. Do you remember in that church, when you pretended to be
-annoyed with me and weren’t? Do you remember before, when you refused
-the room with the view? Those were muddles—little, but ominous—and I am
-fearing that you are in one now.” She was silent. “Don’t trust me, Miss
-Honeychurch. Though life is very glorious, it is difficult.” She was
-still silent. “‘Life’ wrote a friend of mine, ‘is a public performance
-on the violin, in which you must learn the instrument as you go along.’
-I think he puts it well. Man has to pick up the use of his functions as
-he goes along—especially the function of Love.” Then he burst out
-excitedly; “That’s it; that’s what I mean. You love George!” And after
-his long preamble, the three words burst against Lucy like waves from
-the open sea.
-
-“But you do,” he went on, not waiting for contradiction. “You love the
-boy body and soul, plainly, directly, as he loves you, and no other
-word expresses it. You won’t marry the other man for his sake.”
-
-“How dare you!” gasped Lucy, with the roaring of waters in her ears.
-“Oh, how like a man!—I mean, to suppose that a woman is always thinking
-about a man.”
-
-“But you are.”
-
-She summoned physical disgust.
-
-“You’re shocked, but I mean to shock you. It’s the only hope at times.
-I can reach you no other way. You must marry, or your life will be
-wasted. You have gone too far to retreat. I have no time for the
-tenderness, and the comradeship, and the poetry, and the things that
-really matter, and _for which_ you marry. I know that, with George, you
-will find them, and that you love him. Then be his wife. He is already
-part of you. Though you fly to Greece, and never see him again, or
-forget his very name, George will work in your thoughts till you die.
-It isn’t possible to love and to part. You will wish that it was. You
-can transmute love, ignore it, muddle it, but you can never pull it out
-of you. I know by experience that the poets are right: love is
-eternal.”
-
-Lucy began to cry with anger, and though her anger passed away soon,
-her tears remained.
-
-“I only wish poets would say this, too: love is of the body; not the
-body, but of the body. Ah! the misery that would be saved if we
-confessed that! Ah! for a little directness to liberate the soul! Your
-soul, dear Lucy! I hate the word now, because of all the cant with
-which superstition has wrapped it round. But we have souls. I cannot
-say how they came nor whither they go, but we have them, and I see you
-ruining yours. I cannot bear it. It is again the darkness creeping in;
-it is hell.” Then he checked himself. “What nonsense I have talked—how
-abstract and remote! And I have made you cry! Dear girl, forgive my
-prosiness; marry my boy. When I think what life is, and how seldom love
-is answered by love—Marry him; it is one of the moments for which the
-world was made.”
-
-She could not understand him; the words were indeed remote. Yet as he
-spoke the darkness was withdrawn, veil after veil, and she saw to the
-bottom of her soul.
-
-“Then, Lucy—”
-
-“You’ve frightened me,” she moaned. “Cecil—Mr. Beebe—the ticket’s
-bought—everything.” She fell sobbing into the chair. “I’m caught in the
-tangle. I must suffer and grow old away from him. I cannot break the
-whole of life for his sake. They trusted me.”
-
-A carriage drew up at the front-door.
-
-“Give George my love—once only. Tell him ‘muddle.’” Then she arranged
-her veil, while the tears poured over her cheeks inside.
-
-“Lucy—”
-
-“No—they are in the hall—oh, please not, Mr. Emerson—they trust me—”
-
-“But why should they, when you have deceived them?”
-
-Mr. Beebe opened the door, saying: “Here’s my mother.”
-
-“You’re not worthy of their trust.”
-
-“What’s that?” said Mr. Beebe sharply.
-
-“I was saying, why should you trust her when she deceived you?”
-
-“One minute, mother.” He came in and shut the door.
-
-“I don’t follow you, Mr. Emerson. To whom do you refer? Trust whom?”
-
-“I mean she has pretended to you that she did not love George. They
-have loved one another all along.”
-
-Mr. Beebe looked at the sobbing girl. He was very quiet, and his white
-face, with its ruddy whiskers, seemed suddenly inhuman. A long black
-column, he stood and awaited her reply.
-
-“I shall never marry him,” quavered Lucy.
-
-A look of contempt came over him, and he said, “Why not?”
-
-“Mr. Beebe—I have misled you—I have misled myself—”
-
-“Oh, rubbish, Miss Honeychurch!”
-
-“It is not rubbish!” said the old man hotly. “It’s the part of people
-that you don’t understand.”
-
-Mr. Beebe laid his hand on the old man’s shoulder pleasantly.
-
-“Lucy! Lucy!” called voices from the carriage.
-
-“Mr. Beebe, could you help me?”
-
-He looked amazed at the request, and said in a low, stern voice: “I am
-more grieved than I can possibly express. It is lamentable,
-lamentable—incredible.”
-
-“What’s wrong with the boy?” fired up the other again.
-
-“Nothing, Mr. Emerson, except that he no longer interests me. Marry
-George, Miss Honeychurch. He will do admirably.”
-
-He walked out and left them. They heard him guiding his mother
-up-stairs.
-
-“Lucy!” the voices called.
-
-She turned to Mr. Emerson in despair. But his face revived her. It was
-the face of a saint who understood.
-
-“Now it is all dark. Now Beauty and Passion seem never to have existed.
-I know. But remember the mountains over Florence and the view. Ah,
-dear, if I were George, and gave you one kiss, it would make you brave.
-You have to go cold into a battle that needs warmth, out into the
-muddle that you have made yourself; and your mother and all your
-friends will despise you, oh, my darling, and rightly, if it is ever
-right to despise. George still dark, all the tussle and the misery
-without a word from him. Am I justified?” Into his own eyes tears came.
-“Yes, for we fight for more than Love or Pleasure; there is Truth.
-Truth counts, Truth does count.”
-
-“You kiss me,” said the girl. “You kiss me. I will try.”
-
-He gave her a sense of deities reconciled, a feeling that, in gaining
-the man she loved, she would gain something for the whole world.
-Throughout the squalor of her homeward drive—she spoke at once—his
-salutation remained. He had robbed the body of its taint, the world’s
-taunts of their sting; he had shown her the holiness of direct desire.
-She “never exactly understood,” she would say in after years, “how he
-managed to strengthen her. It was as if he had made her see the whole
-of everything at once.”
-
-
-
-
-Chapter XX
-The End of the Middle Ages
-
-
-The Miss Alans did go to Greece, but they went by themselves. They
-alone of this little company will double Malea and plough the waters of
-the Saronic gulf. They alone will visit Athens and Delphi, and either
-shrine of intellectual song—that upon the Acropolis, encircled by blue
-seas; that under Parnassus, where the eagles build and the bronze
-charioteer drives undismayed towards infinity. Trembling, anxious,
-cumbered with much digestive bread, they did proceed to Constantinople,
-they did go round the world. The rest of us must be contented with a
-fair, but a less arduous, goal. Italiam petimus: we return to the
-Pension Bertolini.
-
-George said it was his old room.
-
-“No, it isn’t,” said Lucy; “because it is the room I had, and I had
-your father’s room. I forget why; Charlotte made me, for some reason.”
-
-He knelt on the tiled floor, and laid his face in her lap.
-
-“George, you baby, get up.”
-
-“Why shouldn’t I be a baby?” murmured George.
-
-Unable to answer this question, she put down his sock, which she was
-trying to mend, and gazed out through the window. It was evening and
-again the spring.
-
-“Oh, bother Charlotte,” she said thoughtfully. “What can such people be
-made of?”
-
-“Same stuff as parsons are made of.”
-
-“Nonsense!”
-
-“Quite right. It is nonsense.”
-
-“Now you get up off the cold floor, or you’ll be starting rheumatism
-next, and you stop laughing and being so silly.”
-
-“Why shouldn’t I laugh?” he asked, pinning her with his elbows, and
-advancing his face to hers. “What’s there to cry at? Kiss me here.” He
-indicated the spot where a kiss would be welcome.
-
-He was a boy after all. When it came to the point, it was she who
-remembered the past, she into whose soul the iron had entered, she who
-knew whose room this had been last year. It endeared him to her
-strangely that he should be sometimes wrong.
-
-“Any letters?” he asked.
-
-“Just a line from Freddy.”
-
-“Now kiss me here; then here.”
-
-Then, threatened again with rheumatism, he strolled to the window,
-opened it (as the English will), and leant out. There was the parapet,
-there the river, there to the left the beginnings of the hills. The
-cab-driver, who at once saluted him with the hiss of a serpent, might
-be that very Phaethon who had set this happiness in motion twelve
-months ago. A passion of gratitude—all feelings grow to passions in the
-South—came over the husband, and he blessed the people and the things
-who had taken so much trouble about a young fool. He had helped
-himself, it is true, but how stupidly!
-
-All the fighting that mattered had been done by others—by Italy, by his
-father, by his wife.
-
-“Lucy, you come and look at the cypresses; and the church, whatever its
-name is, still shows.”
-
-“San Miniato. I’ll just finish your sock.”
-
-“Signorino, domani faremo uno giro,” called the cabman, with engaging
-certainty.
-
-George told him that he was mistaken; they had no money to throw away
-on driving.
-
-And the people who had not meant to help—the Miss Lavishes, the Cecils,
-the Miss Bartletts! Ever prone to magnify Fate, George counted up the
-forces that had swept him into this contentment.
-
-“Anything good in Freddy’s letter?”
-
-“Not yet.”
-
-His own content was absolute, but hers held bitterness: the
-Honeychurches had not forgiven them; they were disgusted at her past
-hypocrisy; she had alienated Windy Corner, perhaps for ever.
-
-“What does he say?”
-
-“Silly boy! He thinks he’s being dignified. He knew we should go off in
-the spring—he has known it for six months—that if mother wouldn’t give
-her consent we should take the thing into our own hands. They had fair
-warning, and now he calls it an elopement. Ridiculous boy—”
-
-“Signorino, domani faremo uno giro—”
-
-“But it will all come right in the end. He has to build us both up from
-the beginning again. I wish, though, that Cecil had not turned so
-cynical about women. He has, for the second time, quite altered. Why
-will men have theories about women? I haven’t any about men. I wish,
-too, that Mr. Beebe—”
-
-“You may well wish that.”
-
-“He will never forgive us—I mean, he will never be interested in us
-again. I wish that he did not influence them so much at Windy Corner. I
-wish he hadn’t—But if we act the truth, the people who really love us
-are sure to come back to us in the long run.”
-
-“Perhaps.” Then he said more gently: “Well, I acted the truth—the only
-thing I did do—and you came back to me. So possibly you know.” He
-turned back into the room. “Nonsense with that sock.” He carried her to
-the window, so that she, too, saw all the view. They sank upon their
-knees, invisible from the road, they hoped, and began to whisper one
-another’s names. Ah! it was worth while; it was the great joy that they
-had expected, and countless little joys of which they had never dreamt.
-They were silent.
-
-“Signorino, domani faremo—”
-
-“Oh, bother that man!”
-
-But Lucy remembered the vendor of photographs and said, “No, don’t be
-rude to him.” Then with a catching of her breath, she murmured: “Mr.
-Eager and Charlotte, dreadful frozen Charlotte. How cruel she would be
-to a man like that!”
-
-“Look at the lights going over the bridge.”
-
-“But this room reminds me of Charlotte. How horrible to grow old in
-Charlotte’s way! To think that evening at the rectory that she
-shouldn’t have heard your father was in the house. For she would have
-stopped me going in, and he was the only person alive who could have
-made me see sense. You couldn’t have made me. When I am very happy”—she
-kissed him—“I remember on how little it all hangs. If Charlotte had
-only known, she would have stopped me going in, and I should have gone
-to silly Greece, and become different for ever.”
-
-“But she did know,” said George; “she did see my father, surely. He
-said so.”
-
-“Oh, no, she didn’t see him. She was upstairs with old Mrs. Beebe,
-don’t you remember, and then went straight to the church. She said so.”
-
-George was obstinate again. “My father,” said he, “saw her, and I
-prefer his word. He was dozing by the study fire, and he opened his
-eyes, and there was Miss Bartlett. A few minutes before you came in.
-She was turning to go as he woke up. He didn’t speak to her.”
-
-Then they spoke of other things—the desultory talk of those who have
-been fighting to reach one another, and whose reward is to rest quietly
-in each other’s arms. It was long ere they returned to Miss Bartlett,
-but when they did her behaviour seemed more interesting. George, who
-disliked any darkness, said: “It’s clear that she knew. Then, why did
-she risk the meeting? She knew he was there, and yet she went to
-church.”
-
-They tried to piece the thing together.
-
-As they talked, an incredible solution came into Lucy’s mind. She
-rejected it, and said: “How like Charlotte to undo her work by a feeble
-muddle at the last moment.” But something in the dying evening, in the
-roar of the river, in their very embrace warned them that her words
-fell short of life, and George whispered: “Or did she mean it?”
-
-“Mean what?”
-
-“Signorino, domani faremo uno giro—”
-
-Lucy bent forward and said with gentleness: “Lascia, prego, lascia.
-Siamo sposati.”
-
-“Scusi tanto, signora,” he replied in tones as gentle and whipped up
-his horse.
-
-“Buona sera—e grazie.”
-
-“Niente.”
-
-The cabman drove away singing.
-
-“Mean what, George?”
-
-He whispered: “Is it this? Is this possible? I’ll put a marvel to you.
-That your cousin has always hoped. That from the very first moment we
-met, she hoped, far down in her mind, that we should be like this—of
-course, very far down. That she fought us on the surface, and yet she
-hoped. I can’t explain her any other way. Can you? Look how she kept me
-alive in you all the summer; how she gave you no peace; how month after
-month she became more eccentric and unreliable. The sight of us haunted
-her—or she couldn’t have described us as she did to her friend. There
-are details—it burnt. I read the book afterwards. She is not frozen,
-Lucy, she is not withered up all through. She tore us apart twice, but
-in the rectory that evening she was given one more chance to make us
-happy. We can never make friends with her or thank her. But I do
-believe that, far down in her heart, far below all speech and
-behaviour, she is glad.”
-
-“It is impossible,” murmured Lucy, and then, remembering the
-experiences of her own heart, she said: “No—it is just possible.”
-
-Youth enwrapped them; the song of Phaethon announced passion requited,
-love attained. But they were conscious of a love more mysterious than
-this. The song died away; they heard the river, bearing down the snows
-of winter into the Mediterranean.
-
-
-
-
-*** END OF THE PROJECT GUTENBERG EBOOK A ROOM WITH A VIEW ***
-
-
-    
-
-Updated editions will replace the previous one—the old editions will
-be renamed.
-
-Creating the works from print editions not protected by U.S. copyright
-law means that no one owns a United States copyright in these works,
-so the Foundation (and you!) can copy and distribute it in the United
-States without permission and without paying copyright
-royalties. Special rules, set forth in the General Terms of Use part
-of this license, apply to copying and distributing Project
-Gutenberg™ electronic works to protect the PROJECT GUTENBERG™
-concept and trademark. Project Gutenberg is a registered trademark,
-and may not be used if you charge for an eBook, except by following
-the terms of the trademark license, including paying royalties for use
-of the Project Gutenberg trademark. If you do not charge anything for
-copies of this eBook, complying with the trademark license is very
-easy. You may use this eBook for nearly any purpose such as creation
-of derivative works, reports, performances and research. Project
-Gutenberg eBooks may be modified and printed and given away—you may
-do practically ANYTHING in the United States with eBooks not protected
-by U.S. copyright law. Redistribution is subject to the trademark
-license, especially commercial redistribution.
-
-
-START: FULL LICENSE
-
-THE FULL PROJECT GUTENBERG LICENSE
-
-PLEASE READ THIS BEFORE YOU DISTRIBUTE OR USE THIS WORK
-
-To protect the Project Gutenberg™ mission of promoting the free
-distribution of electronic works, by using or distributing this work
-(or any other work associated in any way with the phrase “Project
-Gutenberg”), you agree to comply with all the terms of the Full
-Project Gutenberg™ License available with this file or online at
-www.gutenberg.org/license.
-
-Section 1. General Terms of Use and Redistributing Project Gutenberg™
-electronic works
-
-1.A. By reading or using any part of this Project Gutenberg™
-electronic work, you indicate that you have read, understand, agree to
-and accept all the terms of this license and intellectual property
-(trademark/copyright) agreement. If you do not agree to abide by all
-the terms of this agreement, you must cease using and return or
-destroy all copies of Project Gutenberg™ electronic works in your
-possession. If you paid a fee for obtaining a copy of or access to a
-Project Gutenberg™ electronic work and you do not agree to be bound
-by the terms of this agreement, you may obtain a refund from the person
-or entity to whom you paid the fee as set forth in paragraph 1.E.8.
-
-1.B. “Project Gutenberg” is a registered trademark. It may only be
-used on or associated in any way with an electronic work by people who
-agree to be bound by the terms of this agreement. There are a few
-things that you can do with most Project Gutenberg™ electronic works
-even without complying with the full terms of this agreement. See
-paragraph 1.C below. There are a lot of things you can do with Project
-Gutenberg™ electronic works if you follow the terms of this
-agreement and help preserve free future access to Project Gutenberg™
-electronic works. See paragraph 1.E below.
-
-1.C. The Project Gutenberg Literary Archive Foundation (“the
-Foundation” or PGLAF), owns a compilation copyright in the collection
-of Project Gutenberg™ electronic works. Nearly all the individual
-works in the collection are in the public domain in the United
-States. If an individual work is unprotected by copyright law in the
-United States and you are located in the United States, we do not
-claim a right to prevent you from copying, distributing, performing,
-displaying or creating derivative works based on the work as long as
-all references to Project Gutenberg are removed. Of course, we hope
-that you will support the Project Gutenberg™ mission of promoting
-free access to electronic works by freely sharing Project Gutenberg™
-works in compliance with the terms of this agreement for keeping the
-Project Gutenberg™ name associated with the work. You can easily
-comply with the terms of this agreement by keeping this work in the
-same format with its attached full Project Gutenberg™ License when
-you share it without charge with others.
-
-1.D. The copyright laws of the place where you are located also govern
-what you can do with this work. Copyright laws in most countries are
-in a constant state of change. If you are outside the United States,
-check the laws of your country in addition to the terms of this
-agreement before downloading, copying, displaying, performing,
-distributing or creating derivative works based on this work or any
-other Project Gutenberg™ work. The Foundation makes no
-representations concerning the copyright status of any work in any
-country other than the United States.
-
-1.E. Unless you have removed all references to Project Gutenberg:
-
-1.E.1. The following sentence, with active links to, or other
-immediate access to, the full Project Gutenberg™ License must appear
-prominently whenever any copy of a Project Gutenberg™ work (any work
-on which the phrase “Project Gutenberg” appears, or with which the
-phrase “Project Gutenberg” is associated) is accessed, displayed,
-performed, viewed, copied or distributed:
-
-    This eBook is for the use of anyone anywhere in the United States and most
-    other parts of the world at no cost and with almost no restrictions
-    whatsoever. You may copy it, give it away or re-use it under the terms
-    of the Project Gutenberg License included with this eBook or online
-    at www.gutenberg.org. If you
-    are not located in the United States, you will have to check the laws
-    of the country where you are located before using this eBook.
-  
-1.E.2. If an individual Project Gutenberg™ electronic work is
-derived from texts not protected by U.S. copyright law (does not
-contain a notice indicating that it is posted with permission of the
-copyright holder), the work can be copied and distributed to anyone in
-the United States without paying any fees or charges. If you are
-redistributing or providing access to a work with the phrase “Project
-Gutenberg” associated with or appearing on the work, you must comply
-either with the requirements of paragraphs 1.E.1 through 1.E.7 or
-obtain permission for the use of the work and the Project Gutenberg™
-trademark as set forth in paragraphs 1.E.8 or 1.E.9.
-
-1.E.3. If an individual Project Gutenberg™ electronic work is posted
-with the permission of the copyright holder, your use and distribution
-must comply with both paragraphs 1.E.1 through 1.E.7 and any
-additional terms imposed by the copyright holder. Additional terms
-will be linked to the Project Gutenberg™ License for all works
-posted with the permission of the copyright holder found at the
-beginning of this work.
-
-1.E.4. Do not unlink or detach or remove the full Project Gutenberg™
-License terms from this work, or any files containing a part of this
-work or any other work associated with Project Gutenberg™.
-
-1.E.5. Do not copy, display, perform, distribute or redistribute this
-electronic work, or any part of this electronic work, without
-prominently displaying the sentence set forth in paragraph 1.E.1 with
-active links or immediate access to the full terms of the Project
-Gutenberg™ License.
-
-1.E.6. You may convert to and distribute this work in any binary,
-compressed, marked up, nonproprietary or proprietary form, including
-any word processing or hypertext form. However, if you provide access
-to or distribute copies of a Project Gutenberg™ work in a format
-other than “Plain Vanilla ASCII” or other format used in the official
-version posted on the official Project Gutenberg™ website
-(www.gutenberg.org), you must, at no additional cost, fee or expense
-to the user, provide a copy, a means of exporting a copy, or a means
-of obtaining a copy upon request, of the work in its original “Plain
-Vanilla ASCII” or other form. Any alternate format must include the
-full Project Gutenberg™ License as specified in paragraph 1.E.1.
-
-1.E.7. Do not charge a fee for access to, viewing, displaying,
-performing, copying or distributing any Project Gutenberg™ works
-unless you comply with paragraph 1.E.8 or 1.E.9.
-
-1.E.8. You may charge a reasonable fee for copies of or providing
-access to or distributing Project Gutenberg™ electronic works
-provided that:
-
-    • You pay a royalty fee of 20% of the gross profits you derive from
-        the use of Project Gutenberg™ works calculated using the method
-        you already use to calculate your applicable taxes. The fee is owed
-        to the owner of the Project Gutenberg™ trademark, but he has
-        agreed to donate royalties under this paragraph to the Project
-        Gutenberg Literary Archive Foundation. Royalty payments must be paid
-        within 60 days following each date on which you prepare (or are
-        legally required to prepare) your periodic tax returns. Royalty
-        payments should be clearly marked as such and sent to the Project
-        Gutenberg Literary Archive Foundation at the address specified in
-        Section 4, “Information about donations to the Project Gutenberg
-        Literary Archive Foundation.”
-    
-    • You provide a full refund of any money paid by a user who notifies
-        you in writing (or by e-mail) within 30 days of receipt that s/he
-        does not agree to the terms of the full Project Gutenberg™
-        License. You must require such a user to return or destroy all
-        copies of the works possessed in a physical medium and discontinue
-        all use of and all access to other copies of Project Gutenberg™
-        works.
-    
-    • You provide, in accordance with paragraph 1.F.3, a full refund of
-        any money paid for a work or a replacement copy, if a defect in the
-        electronic work is discovered and reported to you within 90 days of
-        receipt of the work.
-    
-    • You comply with all other terms of this agreement for free
-        distribution of Project Gutenberg™ works.
-    
-
-1.E.9. If you wish to charge a fee or distribute a Project
-Gutenberg™ electronic work or group of works on different terms than
-are set forth in this agreement, you must obtain permission in writing
-from the Project Gutenberg Literary Archive Foundation, the manager of
-the Project Gutenberg™ trademark. Contact the Foundation as set
-forth in Section 3 below.
-
-1.F.
-
-1.F.1. Project Gutenberg volunteers and employees expend considerable
-effort to identify, do copyright research on, transcribe and proofread
-works not protected by U.S. copyright law in creating the Project
-Gutenberg™ collection. Despite these efforts, Project Gutenberg™
-electronic works, and the medium on which they may be stored, may
-contain “Defects,” such as, but not limited to, incomplete, inaccurate
-or corrupt data, transcription errors, a copyright or other
-intellectual property infringement, a defective or damaged disk or
-other medium, a computer virus, or computer codes that damage or
-cannot be read by your equipment.
-
-1.F.2. LIMITED WARRANTY, DISCLAIMER OF DAMAGES - Except for the “Right
-of Replacement or Refund” described in paragraph 1.F.3, the Project
-Gutenberg Literary Archive Foundation, the owner of the Project
-Gutenberg™ trademark, and any other party distributing a Project
-Gutenberg™ electronic work under this agreement, disclaim all
-liability to you for damages, costs and expenses, including legal
-fees. YOU AGREE THAT YOU HAVE NO REMEDIES FOR NEGLIGENCE, STRICT
-LIABILITY, BREACH OF WARRANTY OR BREACH OF CONTRACT EXCEPT THOSE
-PROVIDED IN PARAGRAPH 1.F.3. YOU AGREE THAT THE FOUNDATION, THE
-TRADEMARK OWNER, AND ANY DISTRIBUTOR UNDER THIS AGREEMENT WILL NOT BE
-LIABLE TO YOU FOR ACTUAL, DIRECT, INDIRECT, CONSEQUENTIAL, PUNITIVE OR
-INCIDENTAL DAMAGES EVEN IF YOU GIVE NOTICE OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-1.F.3. LIMITED RIGHT OF REPLACEMENT OR REFUND - If you discover a
-defect in this electronic work within 90 days of receiving it, you can
-receive a refund of the money (if any) you paid for it by sending a
-written explanation to the person you received the work from. If you
-received the work on a physical medium, you must return the medium
-with your written explanation. The person or entity that provided you
-with the defective work may elect to provide a replacement copy in
-lieu of a refund. If you received the work electronically, the person
-or entity providing it to you may choose to give you a second
-opportunity to receive the work electronically in lieu of a refund. If
-the second copy is also defective, you may demand a refund in writing
-without further opportunities to fix the problem.
-
-1.F.4. Except for the limited right of replacement or refund set forth
-in paragraph 1.F.3, this work is provided to you ‘AS-IS’, WITH NO
-OTHER WARRANTIES OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
-LIMITED TO WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PURPOSE.
-
-1.F.5. Some states do not allow disclaimers of certain implied
-warranties or the exclusion or limitation of certain types of
-damages. If any disclaimer or limitation set forth in this agreement
-violates the law of the state applicable to this agreement, the
-agreement shall be interpreted to make the maximum disclaimer or
-limitation permitted by the applicable state law. The invalidity or
-unenforceability of any provision of this agreement shall not void the
-remaining provisions.
-
-1.F.6. INDEMNITY - You agree to indemnify and hold the Foundation, the
-trademark owner, any agent or employee of the Foundation, anyone
-providing copies of Project Gutenberg™ electronic works in
-accordance with this agreement, and any volunteers associated with the
-production, promotion and distribution of Project Gutenberg™
-electronic works, harmless from all liability, costs and expenses,
-including legal fees, that arise directly or indirectly from any of
-the following which you do or cause to occur: (a) distribution of this
-or any Project Gutenberg™ work, (b) alteration, modification, or
-additions or deletions to any Project Gutenberg™ work, and (c) any
-Defect you cause.
-
-Section 2. Information about the Mission of Project Gutenberg™
-
-Project Gutenberg™ is synonymous with the free distribution of
-electronic works in formats readable by the widest variety of
-computers including obsolete, old, middle-aged and new computers. It
-exists because of the efforts of hundreds of volunteers and donations
-from people in all walks of life.
-
-Volunteers and financial support to provide volunteers with the
-assistance they need are critical to reaching Project Gutenberg™’s
-goals and ensuring that the Project Gutenberg™ collection will
-remain freely available for generations to come. In 2001, the Project
-Gutenberg Literary Archive Foundation was created to provide a secure
-and permanent future for Project Gutenberg™ and future
-generations. To learn more about the Project Gutenberg Literary
-Archive Foundation and how your efforts and donations can help, see
-Sections 3 and 4 and the Foundation information page at www.gutenberg.org.
-
-Section 3. Information about the Project Gutenberg Literary Archive Foundation
-
-The Project Gutenberg Literary Archive Foundation is a non-profit
-501(c)(3) educational corporation organized under the laws of the
-state of Mississippi and granted tax exempt status by the Internal
-Revenue Service. The Foundation’s EIN or federal tax identification
-number is 64-6221541. Contributions to the Project Gutenberg Literary
-Archive Foundation are tax deductible to the full extent permitted by
-U.S. federal laws and your state’s laws.
-
-The Foundation’s business office is located at 809 North 1500 West,
-Salt Lake City, UT 84116, (801) 596-1887. Email contact links and up
-to date contact information can be found at the Foundation’s website
-and official page at www.gutenberg.org/contact
-
-Section 4. Information about Donations to the Project Gutenberg
-Literary Archive Foundation
-
-Project Gutenberg™ depends upon and cannot survive without widespread
-public support and donations to carry out its mission of
-increasing the number of public domain and licensed works that can be
-freely distributed in machine-readable form accessible by the widest
-array of equipment including outdated equipment. Many small donations
-($1 to $5,000) are particularly important to maintaining tax exempt
-status with the IRS.
-
-The Foundation is committed to complying with the laws regulating
-charities and charitable donations in all 50 states of the United
-States. Compliance requirements are not uniform and it takes a
-considerable effort, much paperwork and many fees to meet and keep up
-with these requirements. We do not solicit donations in locations
-where we have not received written confirmation of compliance. To SEND
-DONATIONS or determine the status of compliance for any particular state
-visit www.gutenberg.org/donate.
-
-While we cannot and do not solicit contributions from states where we
-have not met the solicitation requirements, we know of no prohibition
-against accepting unsolicited donations from donors in such states who
-approach us with offers to donate.
-
-International donations are gratefully accepted, but we cannot make
-any statements concerning tax treatment of donations received from
-outside the United States. U.S. laws alone swamp our small staff.
-
-Please check the Project Gutenberg web pages for current donation
-methods and addresses. Donations are accepted in a number of other
-ways including checks, online payments and credit card donations. To
-donate, please visit: www.gutenberg.org/donate.
-
-Section 5. General Information About Project Gutenberg™ electronic works
-
-Professor Michael S. Hart was the originator of the Project
-Gutenberg™ concept of a library of electronic works that could be
-freely shared with anyone. For forty years, he produced and
-distributed Project Gutenberg™ eBooks with only a loose network of
-volunteer support.
-
-Project Gutenberg™ eBooks are often created from several printed
-editions, all of which are confirmed as not protected by copyright in
-the U.S. unless a copyright notice is included. Thus, we do not
-necessarily keep eBooks in compliance with any particular paper
-edition.
-
-Most people start at our website which has the main PG search
-facility: www.gutenberg.org.
-
-This website includes information about Project Gutenberg™,
-including how to make donations to the Project Gutenberg Literary
-Archive Foundation, how to help produce our new eBooks, and how to
-subscribe to our email newsletter to hear about new eBooks.
-
diff --git a/backend/reconcile/tests/test.rs b/backend/reconcile/tests/test.rs
deleted file mode 100644
index 088a93e9..00000000
--- a/backend/reconcile/tests/test.rs
+++ /dev/null
@@ -1,76 +0,0 @@
-mod example_document;
-
-use std::{fs, path::Path};
-
-use example_document::ExampleDocument;
-use reconcile::{reconcile, reconcile_with_cursors};
-use serde::Deserialize;
-
-#[test]
-fn test_document_one_way_without_cursors() {
-    for doc in &get_all_documents() {
-        doc.assert_eq_without_cursors(&reconcile(
-            &doc.parent(),
-            &doc.left().text,
-            &doc.right().text,
-        ));
-    }
-}
-
-#[test]
-fn test_document_one_way_with_cursors() {
-    for doc in &get_all_documents() {
-        doc.assert_eq(&reconcile_with_cursors(
-            &doc.parent(),
-            doc.left(),
-            doc.right(),
-        ));
-    }
-}
-
-#[test]
-fn test_document_inverse_way_without_cursors() {
-    for doc in &get_all_documents() {
-        doc.assert_eq_without_cursors(&reconcile(
-            &doc.parent(),
-            &doc.right().text,
-            &doc.left().text,
-        ));
-    }
-}
-
-#[test]
-fn test_document_inverse_way_with_cursors() {
-    for doc in &get_all_documents() {
-        doc.assert_eq(&reconcile_with_cursors(
-            &doc.parent(),
-            doc.right(),
-            doc.left(),
-        ));
-    }
-}
-
-fn get_all_documents() -> Vec<ExampleDocument> {
-    let examples_dir = Path::new("tests/examples");
-    let entries = fs::read_dir(examples_dir)
-        .expect("Failed to read examples directory")
-        .collect::<Vec<_>>();
-
-    let mut documents = Vec::new();
-
-    for entry in entries {
-        let entry = entry.expect("Failed to read directory entry");
-        let path = entry.path();
-
-        if path.is_file() && path.extension().and_then(|ext| ext.to_str()) == Some("yml") {
-            let file = fs::File::open(&path).expect("Failed to open example file");
-            for document in serde_yaml::Deserializer::from_reader(file) {
-                let doc =
-                    ExampleDocument::deserialize(document).expect("Failed to deserialize document");
-                documents.push(doc);
-            }
-        }
-    }
-
-    documents
-}
diff --git a/backend/sync_lib/Cargo.toml b/backend/sync_lib/Cargo.toml
deleted file mode 100644
index 72f3de87..00000000
--- a/backend/sync_lib/Cargo.toml
+++ /dev/null
@@ -1,32 +0,0 @@
-[package]
-name = "sync_lib"
-version.workspace = true
-edition.workspace = true
-authors.workspace = true
-license.workspace = true
-repository.workspace = true
-
-[lib]
-crate-type = ["cdylib", "rlib"]
-
-[dependencies]
-base64 = "0.22.1"
-reconcile = { path = "../reconcile" }
-wasm-bindgen = "0.2.99"
-thiserror = { workspace = true }
-
-# The `console_error_panic_hook` crate provides better debugging of panics by
-# logging them with `console.error`. This is great for development, but requires
-# all the `std::fmt` and `std::panicking` infrastructure, so isn't great for
-# code size when deploying.
-console_error_panic_hook = { version = "0.1.7", optional = true }
-
-[dev-dependencies]
-wasm-bindgen-test = "0.3.49"
-insta = "1.42.2"
-
-[features]
-default = ["console_error_panic_hook"]
-
-[lints]
-workspace = true
diff --git a/backend/sync_lib/pkg/package.json b/backend/sync_lib/pkg/package.json
deleted file mode 100644
index 9bb9b50e..00000000
--- a/backend/sync_lib/pkg/package.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "name": "sync_lib",
-  "type": "module",
-  "collaborators": [
-    "Andras Schmelczer <andras@schmelczer.dev>"
-  ],
-  "version": "0.4.0",
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/schmelczer/vault-link"
-  },
-  "files": [
-    "sync_lib_bg.wasm",
-    "sync_lib.js",
-    "sync_lib.d.ts"
-  ],
-  "main": "sync_lib.js",
-  "types": "sync_lib.d.ts",
-  "sideEffects": [
-    "./snippets/*"
-  ]
-}
\ No newline at end of file
diff --git a/backend/sync_lib/src/cursor.rs b/backend/sync_lib/src/cursor.rs
deleted file mode 100644
index 2f7135eb..00000000
--- a/backend/sync_lib/src/cursor.rs
+++ /dev/null
@@ -1,88 +0,0 @@
-use wasm_bindgen::prelude::*;
-
-/// Wrapper type to expose `TextWithCursors` to JS.
-#[wasm_bindgen]
-#[derive(Debug, Clone, PartialEq)]
-pub struct TextWithCursors {
-    text: String,
-    cursors: Vec<CursorPosition>,
-}
-
-#[wasm_bindgen]
-impl TextWithCursors {
-    #[wasm_bindgen(constructor)]
-    #[must_use]
-    pub fn new(text: String, cursors: Vec<CursorPosition>) -> Self { Self { text, cursors } }
-
-    #[must_use]
-    pub fn text(&self) -> String { self.text.clone() }
-
-    #[must_use]
-    pub fn cursors(&self) -> Vec<CursorPosition> { self.cursors.clone() }
-}
-
-impl From<TextWithCursors> for reconcile::TextWithCursors<'_> {
-    fn from(owned: TextWithCursors) -> Self {
-        reconcile::TextWithCursors::new_owned(
-            owned.text.to_string(),
-            owned
-                .cursors
-                .into_iter()
-                .map(std::convert::Into::into)
-                .collect(),
-        )
-    }
-}
-
-impl From<reconcile::TextWithCursors<'_>> for TextWithCursors {
-    fn from(text_with_cursors: reconcile::TextWithCursors<'_>) -> Self {
-        TextWithCursors {
-            text: text_with_cursors.text.into_owned(),
-            cursors: text_with_cursors
-                .cursors
-                .into_iter()
-                .map(std::convert::Into::into)
-                .collect(),
-        }
-    }
-}
-
-/// Wrapper type to expose `CursorPosition` to JS.
-#[wasm_bindgen]
-#[derive(Debug, Clone, PartialEq)]
-pub struct CursorPosition {
-    id: usize,
-    char_index: usize,
-}
-
-#[wasm_bindgen]
-impl CursorPosition {
-    #[wasm_bindgen(constructor)]
-    #[must_use]
-    pub fn new(id: usize, char_index: usize) -> Self { Self { id, char_index } }
-
-    #[must_use]
-    pub fn id(&self) -> usize { self.id }
-
-    #[wasm_bindgen(js_name = characterPosition)]
-    #[must_use]
-    pub fn char_index(&self) -> usize { self.char_index }
-}
-
-impl From<CursorPosition> for reconcile::CursorPosition {
-    fn from(owned: CursorPosition) -> Self {
-        reconcile::CursorPosition {
-            id: owned.id,
-            char_index: owned.char_index,
-        }
-    }
-}
-
-impl From<reconcile::CursorPosition> for CursorPosition {
-    fn from(cursor: reconcile::CursorPosition) -> Self {
-        CursorPosition {
-            id: cursor.id,
-            char_index: cursor.char_index,
-        }
-    }
-}
diff --git a/backend/sync_lib/src/errors.rs b/backend/sync_lib/src/errors.rs
deleted file mode 100644
index c09eafb1..00000000
--- a/backend/sync_lib/src/errors.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-use base64::DecodeError;
-use thiserror::Error;
-use wasm_bindgen::JsValue;
-
-#[derive(Error, Debug)]
-pub enum SyncLibError {
-    #[error("Base64 decoding error because of {}", .reason)]
-    Base64DecodingError { reason: String },
-}
-
-impl From<DecodeError> for SyncLibError {
-    fn from(e: DecodeError) -> Self {
-        SyncLibError::Base64DecodingError {
-            reason: e.to_string(),
-        }
-    }
-}
-
-impl From<std::string::FromUtf8Error> for SyncLibError {
-    fn from(e: std::string::FromUtf8Error) -> Self {
-        SyncLibError::Base64DecodingError {
-            reason: e.to_string(),
-        }
-    }
-}
-
-impl From<SyncLibError> for JsValue {
-    fn from(val: SyncLibError) -> Self { JsValue::from_str(&val.to_string()) }
-}
diff --git a/backend/sync_lib/src/lib.rs b/backend/sync_lib/src/lib.rs
deleted file mode 100644
index d2a54cf9..00000000
--- a/backend/sync_lib/src/lib.rs
+++ /dev/null
@@ -1,152 +0,0 @@
-//! This crate provides utilities for easily communicating between backend &
-//! frontend and ensuring the same logic for encoding and decoding binary data,
-//! and 3-way-merging documents in Rust and JavaScript.
-//!
-//! The crate is designed to be used as a Rust library and as a
-//! TypeScript/JavaScript package through WebAssembly (WASM).
-//!
-//! # Modules
-//!
-//! - `errors`: Contains error types used in this crate.
-
-use core::str;
-
-use base64::{Engine as _, engine::general_purpose::STANDARD};
-use cursor::TextWithCursors;
-use errors::SyncLibError;
-use wasm_bindgen::prelude::*;
-
-pub mod cursor;
-pub mod errors;
-
-/// Encode binary data for easy transport over HTTP. Inverse of
-/// `base64_to_bytes`.
-///
-/// # Arguments
-///
-/// - `input`: The binary data to encode.
-///
-/// # Returns
-///
-/// The base64-encoded string.
-///
-/// # Panics
-///
-/// If the input is not valid UTF-8.
-#[wasm_bindgen(js_name = bytesToBase64)]
-#[must_use]
-pub fn bytes_to_base64(input: &[u8]) -> String {
-    set_panic_hook();
-
-    STANDARD.encode(input)
-}
-
-/// Inverse of `bytes_to_base64`.
-/// Decode base64-encoded data into binary data.
-///
-/// # Arguments
-///
-/// - `input`: The base64-encoded string.
-///
-/// # Returns
-///
-/// The decoded binary data.
-///
-/// # Errors
-///
-/// If the input is not valid base64.
-#[wasm_bindgen(js_name = base64ToBytes)]
-pub fn base64_to_bytes(input: &str) -> Result<Vec<u8>, SyncLibError> {
-    set_panic_hook();
-
-    STANDARD.decode(input).map_err(SyncLibError::from)
-}
-
-/// Merge two documents with a common parent. Relies on `reconcile::reconcile`
-/// for texts and returns the right document as-is if either of the updated
-/// documents is binary.
-///
-/// # Arguments
-///
-/// - `parent`: The common parent document.
-/// - `left`: The left document updated by one user.
-/// - `right`: The right document updated by another user.
-///
-/// # Returns
-///
-/// The merged document.
-///
-/// # Panics
-///
-/// If any of the input documents are not valid UTF-8 strings.
-#[wasm_bindgen]
-#[must_use]
-pub fn merge(parent: &[u8], left: &[u8], right: &[u8]) -> Vec<u8> {
-    set_panic_hook();
-
-    if is_binary(parent) || is_binary(left) || is_binary(right) {
-        right.to_vec()
-    } else {
-        reconcile::reconcile(
-            str::from_utf8(parent).expect("parent must be valid UTF-8 because it's not binary"),
-            str::from_utf8(left).expect("left must be valid UTF-8 because it's not binary"),
-            str::from_utf8(right).expect("right must be valid UTF-8 because it's not binary"),
-        )
-        .into_bytes()
-    }
-}
-
-/// WASM wrapper around `reconcile::reconcile` for merging text.
-#[wasm_bindgen(js_name = mergeText)]
-#[must_use]
-pub fn merge_text(parent: &str, left: &str, right: &str) -> String {
-    set_panic_hook();
-
-    reconcile::reconcile(parent, left, right)
-}
-
-/// WASM wrapper around `reconcile::reconcile_with_cursors` for merging text.
-#[wasm_bindgen(js_name = mergeTextWithCursors)]
-#[must_use]
-pub fn merge_text_with_cursors(
-    parent: &str,
-    left: TextWithCursors,
-    right: TextWithCursors,
-) -> TextWithCursors {
-    set_panic_hook();
-
-    reconcile::reconcile_with_cursors(parent, left.into(), right.into()).into()
-}
-
-/// Heuristically determine if the given data is a binary or a text file's
-/// content.
-#[wasm_bindgen(js_name = isBinary)]
-#[must_use]
-pub fn is_binary(data: &[u8]) -> bool {
-    set_panic_hook();
-
-    if data.contains(&0) {
-        // Even though the NUL character is valid in UTF-8, it's highly suspicious in
-        // human-readable text.
-        return true;
-    }
-
-    std::str::from_utf8(data).is_err()
-}
-
-/// We don't want to support merging structured data like JSON, YAML, etc.
-#[wasm_bindgen(js_name = isFileTypeMergable)]
-#[must_use]
-pub fn is_file_type_mergable(path_or_file_name: &str) -> bool {
-    set_panic_hook();
-
-    let file_extension = path_or_file_name.split('.').next_back().unwrap_or_default();
-
-    matches!(file_extension.to_lowercase().as_str(), "md" | "txt")
-}
-
-fn set_panic_hook() {
-    // https://github.com/rustwasm/console_error_panic_hook#readme
-    #[cfg(feature = "console_error_panic_hook")]
-    console_error_panic_hook::set_once();
-}
diff --git a/backend/sync_lib/tests/snapshots/web__base64_to_bytes_error.snap b/backend/sync_lib/tests/snapshots/web__base64_to_bytes_error.snap
deleted file mode 100644
index fa178767..00000000
--- a/backend/sync_lib/tests/snapshots/web__base64_to_bytes_error.snap
+++ /dev/null
@@ -1,10 +0,0 @@
----
-source: sync_lib/tests/web.rs
-expression: base64_to_bytes(input)
-snapshot_kind: text
----
-Err(
-    Base64DecodingError {
-        reason: "Invalid symbol 61, offset 0.",
-    },
-)
diff --git a/backend/sync_lib/tests/web.rs b/backend/sync_lib/tests/web.rs
deleted file mode 100644
index cf82aa7e..00000000
--- a/backend/sync_lib/tests/web.rs
+++ /dev/null
@@ -1,99 +0,0 @@
-use insta::assert_debug_snapshot;
-use sync_lib::{
-    cursor::{CursorPosition, TextWithCursors},
-    *,
-};
-use wasm_bindgen_test::*;
-
-#[wasm_bindgen_test(unsupported = test)]
-fn test_bytes_to_base64() {
-    let input = b"hello";
-    let expected = "aGVsbG8=";
-    assert_eq!(bytes_to_base64(input), expected);
-}
-
-#[wasm_bindgen_test(unsupported = test)]
-fn test_base64_to_bytes() {
-    let input = "aGVsbG8=";
-    let expected = b"hello".to_vec();
-    assert_eq!(base64_to_bytes(input).unwrap(), expected);
-}
-
-#[test] // insta doesn't support wasm-bindgen-test
-fn test_base64_to_bytes_error() {
-    let input = "===";
-    assert_debug_snapshot!(base64_to_bytes(input));
-}
-
-#[wasm_bindgen_test(unsupported = test)]
-fn test_merge() {
-    let left = b"hello ";
-    let right = b"world";
-    let result = merge(b"", left, right);
-    assert_eq!(result, b"hello world");
-
-    let left = b"\0binary";
-    let right = b"other";
-    let result = merge(b"", left, right);
-    assert_eq!(result, right);
-}
-
-#[wasm_bindgen_test(unsupported = test)]
-fn test_merge_text() {
-    let left = "hello ";
-    let right = "world";
-    let result = merge_text("", left, right);
-    assert_eq!(result, "hello world");
-}
-
-#[wasm_bindgen_test(unsupported = test)]
-fn test_merge_text_with_cursors() {
-    let result = merge_text_with_cursors(
-        "hi",
-        TextWithCursors::new("hi world".to_owned(), vec![]),
-        TextWithCursors::new(
-            "hi".to_owned(),
-            vec![CursorPosition::new(0, 1), CursorPosition::new(1, 2)],
-        ),
-    );
-
-    assert_eq!(
-        result,
-        TextWithCursors::new(
-            "hi world".to_owned(),
-            vec![CursorPosition::new(0, 1), CursorPosition::new(1, 2)]
-        ),
-    );
-}
-
-#[wasm_bindgen_test(unsupported = test)]
-fn merge_binary() {
-    let left = [0, 1, 2];
-    let right = [3, 4, 5];
-    assert_eq!(merge(b"", &left, &right), right);
-}
-
-#[wasm_bindgen_test(unsupported = test)]
-fn test_is_binary() {
-    assert!(is_binary(&[0, 159, 146, 150]));
-    assert!(is_binary(&[0, 12]));
-    assert!(!is_binary(b"hello"));
-}
-
-#[wasm_bindgen_test(unsupported = test)]
-fn test_is_binary_empty() {
-    assert!(!is_binary(b""));
-}
-
-#[wasm_bindgen_test(unsupported = test)]
-fn test_is_file_type_mergable() {
-    assert!(is_file_type_mergable(".md"));
-    assert!(is_file_type_mergable("hi.md"));
-    assert!(is_file_type_mergable("my/path/to/my/document.md"));
-    assert!(is_file_type_mergable("hi.MD"));
-    assert!(is_file_type_mergable("my/path/to/my/DOCUMENT.MD"));
-
-    assert!(!is_file_type_mergable(".json"));
-    assert!(!is_file_type_mergable("HELLO.JSON"));
-    assert!(!is_file_type_mergable("my/config.yml"));
-}
diff --git a/backend/sync_server/Cargo.toml b/backend/sync_server/Cargo.toml
deleted file mode 100644
index 3ca2c75a..00000000
--- a/backend/sync_server/Cargo.toml
+++ /dev/null
@@ -1,40 +0,0 @@
-[package]
-name = "sync_server"
-version.workspace = true
-edition.workspace = true
-authors.workspace = true
-license.workspace = true
-repository.workspace = true
-
-[dependencies]
-sync_lib = { path = "../sync_lib" }
-
-serde = { workspace = true }
-thiserror = { workspace = true }
-
-tokio = { version = "1.44.2", features = ["full"]}
-uuid = { version = "1.16.0", features = ["v4", "serde"] }
-log = { version = "0.4.27" }
-anyhow =  { version = "1.0.98", features = ["backtrace"] }
-axum = { version = "0.7.4", features = ["ws", "macros", "tracing", "multipart"]}
-axum-extra = { version = "0.9.6", features = ["typed-header"] }
-axum_typed_multipart = "0.11.0"
-tower-http = { version = "0.6.1", features = ["cors", "trace", "limit", "timeout"] }
-tracing = "0.1.41"
-tracing-subscriber = { version = "0.3.19", features = ["fmt", "env-filter"]}
-sqlx = { version = "0.8.6", features = ["sqlite", "runtime-tokio", "uuid", "chrono"] }
-chrono = { version = "0.4.41", features = ["serde"] }
-rand = "0.9.0"
-sanitize-filename = "0.6.0"
-regex = "1.11.1"
-clap = { version = "4.5.38", features = ["derive"] }
-futures = "0.3.31"
-serde_yaml = "0.9.34"
-serde_json = "1.0.140"
-clap-verbosity-flag = "3.0.3"
-bimap = "0.6.3"
-ts-rs =  { version = "10.1", features = ["uuid-impl", "chrono-impl"] }
-serde_with = "3.12.0"
-
-[lints]
-workspace = true
diff --git a/frontend/obsidian-plugin/jest.config.js b/frontend/obsidian-plugin/jest.config.js
index 8c1027ee..d1cbaca2 100644
--- a/frontend/obsidian-plugin/jest.config.js
+++ b/frontend/obsidian-plugin/jest.config.js
@@ -1,3 +1,3 @@
 module.exports = {
-	preset: "ts-jest/presets/js-with-babel-esm"
+	preset: "ts-jest"
 };
diff --git a/frontend/obsidian-plugin/src/obsidian-file-system.ts b/frontend/obsidian-plugin/src/obsidian-file-system.ts
index adf78a16..9609e8b0 100644
--- a/frontend/obsidian-plugin/src/obsidian-file-system.ts
+++ b/frontend/obsidian-plugin/src/obsidian-file-system.ts
@@ -1,13 +1,9 @@
 import type { Stat, Vault, Workspace } from "obsidian";
 import { MarkdownView, normalizePath } from "obsidian";
-import type {
-	FileSystemOperations,
-	RelativePath,
-	TextWithCursors
-} from "sync-client";
-import { lineAndColumnToPosition } from "./utils/line-and-column-to-position";
+import type { FileSystemOperations, RelativePath } from "sync-client";
 import { positionToLineAndColumn } from "./utils/position-to-line-and-column";
-import { getCursorsFromEditor } from "./views/cursors/get-cursors-from-editor";
+import { getSelectionsFromEditor } from "./views/cursors/get-selections-from-editor";
+import type { TextWithCursors, CursorPosition } from "reconcile-text";
 
 export class ObsidianFileSystemOperations implements FileSystemOperations {
 	public constructor(
@@ -80,18 +76,18 @@ export class ObsidianFileSystemOperations implements FileSystemOperations {
 		if (view?.file?.path === path) {
 			const text = view.editor.getValue();
 
-			const cursors = getCursorsFromEditor(view.editor).flatMap(
-				({ id, start: anchor, end: head }) => [
-					{
-						id: 2 * id,
-						characterPosition: anchor
-					},
-					{
-						id: 2 * id + 1,
-						characterPosition: head
-					}
-				]
-			);
+			const cursors: CursorPosition[] = getSelectionsFromEditor(
+				view.editor
+			).flatMap(({ id, start: anchor, end: head }) => [
+				{
+					id: 2 * id,
+					position: anchor
+				},
+				{
+					id: 2 * id + 1,
+					position: head
+				}
+			]);
 
 			const result = updater({
 				text,
@@ -109,13 +105,10 @@ export class ObsidianFileSystemOperations implements FileSystemOperations {
 				const from = result.cursors[2 * i];
 				const to = result.cursors[2 * i + 1];
 				const { line: fromLine, column: fromColumn } =
-					positionToLineAndColumn(
-						result.text,
-						from.characterPosition
-					);
+					positionToLineAndColumn(result.text, from.position);
 
 				const { line: toLine, column: toColumn } =
-					positionToLineAndColumn(result.text, to.characterPosition);
+					positionToLineAndColumn(result.text, to.position);
 
 				selections.push({
 					anchor: { line: fromLine, ch: fromColumn },
diff --git a/frontend/obsidian-plugin/src/vault-link-plugin.ts b/frontend/obsidian-plugin/src/vault-link-plugin.ts
index 315e2d19..c013e8f7 100644
--- a/frontend/obsidian-plugin/src/vault-link-plugin.ts
+++ b/frontend/obsidian-plugin/src/vault-link-plugin.ts
@@ -1,9 +1,7 @@
 import type {
 	Editor,
-	EventRef,
 	MarkdownFileInfo,
 	TAbstractFile,
-	Workspace,
 	WorkspaceLeaf
 } from "obsidian";
 import type { MarkdownView } from "obsidian";
@@ -13,7 +11,6 @@ import { HistoryView } from "./views/history/history-view";
 import { StatusBar } from "./views/status-bar/status-bar";
 import { LogsView } from "./views/logs/logs-view";
 import { StatusDescription } from "./views/status-description/status-description";
-import type { CursorSpan, RelativePath } from "sync-client";
 import { SyncClient, rateLimit, DEFAULT_SETTINGS } from "sync-client";
 import { ObsidianFileSystemOperations } from "./obsidian-file-system";
 import { SyncSettingsTab } from "./views/settings/settings-tab";
@@ -24,7 +21,6 @@ import {
 	remoteCursorsPlugin,
 	setCursors
 } from "./views/cursors/remote-cursors-plugin";
-import { getCursorsFromEditor } from "./views/cursors/get-cursors-from-editor";
 import { LocalCursorUpdateListener } from "./views/cursors/local-cursor-update-listener";
 
 const MIN_WAIT_BETWEEN_UPDATES_IN_MS = 250;
diff --git a/frontend/obsidian-plugin/src/views/cursors/get-cursors-from-editor.ts b/frontend/obsidian-plugin/src/views/cursors/get-selections-from-editor.ts
similarity index 80%
rename from frontend/obsidian-plugin/src/views/cursors/get-cursors-from-editor.ts
rename to frontend/obsidian-plugin/src/views/cursors/get-selections-from-editor.ts
index f5ea0a85..03cce4a8 100644
--- a/frontend/obsidian-plugin/src/views/cursors/get-cursors-from-editor.ts
+++ b/frontend/obsidian-plugin/src/views/cursors/get-selections-from-editor.ts
@@ -1,13 +1,13 @@
 import type { Editor } from "obsidian";
 import { lineAndColumnToPosition } from "../../utils/line-and-column-to-position";
 
-export interface Cursor {
+export interface Selection {
 	id: number;
 	start: number;
 	end: number;
 }
 
-export function getCursorsFromEditor(editor: Editor): Cursor[] {
+export function getSelectionsFromEditor(editor: Editor): Selection[] {
 	const text = editor.getValue();
 	return editor.listSelections().map(({ anchor, head }, i) => ({
 		id: i,
diff --git a/frontend/obsidian-plugin/src/views/cursors/local-cursor-update-listener.ts b/frontend/obsidian-plugin/src/views/cursors/local-cursor-update-listener.ts
index 99a9828d..883a92ea 100644
--- a/frontend/obsidian-plugin/src/views/cursors/local-cursor-update-listener.ts
+++ b/frontend/obsidian-plugin/src/views/cursors/local-cursor-update-listener.ts
@@ -1,20 +1,20 @@
 import type { Workspace } from "obsidian";
-import { EventRef, Editor, MarkdownView, MarkdownFileInfo } from "obsidian";
-import type { Logger, SyncClient } from "sync-client";
-import type { Cursor } from "./get-cursors-from-editor";
-import { getCursorsFromEditor } from "./get-cursors-from-editor";
+import { MarkdownView } from "obsidian";
+import type { SyncClient } from "sync-client";
+import type { Selection } from "./get-selections-from-editor";
+import { getSelectionsFromEditor } from "./get-selections-from-editor";
 
 export class LocalCursorUpdateListener {
 	private static readonly UPDATE_INTERVAL_MS = 50;
 	private readonly eventHandle: NodeJS.Timeout;
-	private lastCursorState: Record<string, Cursor[]> = {};
+	private lastCursorState: Record<string, Selection[]> = {};
 
 	public constructor(
 		private readonly client: SyncClient,
 		private readonly workspace: Workspace
 	) {
 		this.eventHandle = setInterval(() => {
-			this.updateAllCursors();
+			this.updateAllSelections();
 		}, LocalCursorUpdateListener.UPDATE_INTERVAL_MS);
 	}
 
@@ -22,8 +22,8 @@ export class LocalCursorUpdateListener {
 		clearInterval(this.eventHandle);
 	}
 
-	private updateAllCursors(): void {
-		const currentCursors = this.getAllCursors();
+	private updateAllSelections(): void {
+		const currentCursors = this.getAllSelections();
 		if (
 			JSON.stringify(this.lastCursorState) ===
 			JSON.stringify(currentCursors)
@@ -40,8 +40,8 @@ export class LocalCursorUpdateListener {
 			});
 	}
 
-	private getAllCursors(): Record<string, Cursor[]> {
-		const cursors: Record<string, Cursor[]> = {};
+	private getAllSelections(): Record<string, Selection[]> {
+		const cursors: Record<string, Selection[]> = {};
 		this.workspace
 			.getLeavesOfType("markdown")
 			.map((leaf) => leaf.view)
@@ -51,7 +51,7 @@ export class LocalCursorUpdateListener {
 				if (!file) {
 					return;
 				}
-				cursors[file.path] = getCursorsFromEditor(view.editor);
+				cursors[file.path] = getSelectionsFromEditor(view.editor);
 			});
 		return cursors;
 	}
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 330f85ea..7abb5162 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -19,16 +19,8 @@
 				"typescript-eslint": "8.33.1"
 			}
 		},
-		"../backend/sync_lib/pkg": {
-			"name": "sync_lib",
-			"version": "0.4.0",
-			"dev": true,
-			"license": "MIT"
-		},
 		"node_modules/@ampproject/remapping": {
 			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
-			"integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"dependencies": {
@@ -41,8 +33,6 @@
 		},
 		"node_modules/@babel/code-frame": {
 			"version": "7.26.2",
-			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz",
-			"integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -56,8 +46,6 @@
 		},
 		"node_modules/@babel/compat-data": {
 			"version": "7.26.8",
-			"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.8.tgz",
-			"integrity": "sha512-oH5UPLMWR3L2wEFLnFJ1TZXqHufiTKAiLfqw5zkhS4dKXLJ10yVztfil/twG8EDTA4F/tvVNw9nOl4ZMslB8rQ==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -66,8 +54,6 @@
 		},
 		"node_modules/@babel/core": {
 			"version": "7.26.10",
-			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.10.tgz",
-			"integrity": "sha512-vMqyb7XCDMPvJFFOaT9kxtiRh42GwlZEg1/uIgtZshS5a/8OaduUfCi7kynKgc3Tw/6Uo2D+db9qBttghhmxwQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -97,8 +83,6 @@
 		},
 		"node_modules/@babel/core/node_modules/semver": {
 			"version": "6.3.1",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
 			"dev": true,
 			"license": "ISC",
 			"bin": {
@@ -107,8 +91,6 @@
 		},
 		"node_modules/@babel/generator": {
 			"version": "7.27.0",
-			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.27.0.tgz",
-			"integrity": "sha512-VybsKvpiN1gU1sdMZIp7FcqphVVKEwcuj02x73uvcHE0PTihx1nlBcowYWhDwjpoAXRv43+gDzyggGnn1XZhVw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -124,8 +106,6 @@
 		},
 		"node_modules/@babel/helper-compilation-targets": {
 			"version": "7.27.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.0.tgz",
-			"integrity": "sha512-LVk7fbXml0H2xH34dFzKQ7TDZ2G4/rVTOrq9V+icbbadjbVxxeFeDsNHv2SrZeWoA+6ZiTyWYWtScEIW07EAcA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -141,8 +121,6 @@
 		},
 		"node_modules/@babel/helper-compilation-targets/node_modules/semver": {
 			"version": "6.3.1",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
 			"dev": true,
 			"license": "ISC",
 			"bin": {
@@ -151,8 +129,6 @@
 		},
 		"node_modules/@babel/helper-module-imports": {
 			"version": "7.25.9",
-			"resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz",
-			"integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -165,8 +141,6 @@
 		},
 		"node_modules/@babel/helper-module-transforms": {
 			"version": "7.26.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz",
-			"integrity": "sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -183,8 +157,6 @@
 		},
 		"node_modules/@babel/helper-plugin-utils": {
 			"version": "7.26.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.26.5.tgz",
-			"integrity": "sha512-RS+jZcRdZdRFzMyr+wcsaqOmld1/EqTghfaBGQQd/WnRdzdlvSZ//kF7U8VQTxf1ynZ4cjUcYgjVGx13ewNPMg==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -193,8 +165,6 @@
 		},
 		"node_modules/@babel/helper-string-parser": {
 			"version": "7.25.9",
-			"resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
-			"integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -203,8 +173,6 @@
 		},
 		"node_modules/@babel/helper-validator-identifier": {
 			"version": "7.25.9",
-			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
-			"integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -213,8 +181,6 @@
 		},
 		"node_modules/@babel/helper-validator-option": {
 			"version": "7.25.9",
-			"resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz",
-			"integrity": "sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -223,8 +189,6 @@
 		},
 		"node_modules/@babel/helpers": {
 			"version": "7.27.0",
-			"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.27.0.tgz",
-			"integrity": "sha512-U5eyP/CTFPuNE3qk+WZMxFkp/4zUzdceQlfzf7DdGdhp+Fezd7HD+i8Y24ZuTMKX3wQBld449jijbGq6OdGNQg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -237,8 +201,6 @@
 		},
 		"node_modules/@babel/parser": {
 			"version": "7.27.0",
-			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.27.0.tgz",
-			"integrity": "sha512-iaepho73/2Pz7w2eMS0Q5f83+0RKI7i4xmiYeBmDzfRVbQtTOG7Ts0S4HzJVsTMGI9keU8rNfuZr8DKfSt7Yyg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -253,8 +215,6 @@
 		},
 		"node_modules/@babel/plugin-syntax-async-generators": {
 			"version": "7.8.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
-			"integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -266,8 +226,6 @@
 		},
 		"node_modules/@babel/plugin-syntax-bigint": {
 			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
-			"integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -279,8 +237,6 @@
 		},
 		"node_modules/@babel/plugin-syntax-class-properties": {
 			"version": "7.12.13",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
-			"integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -292,8 +248,6 @@
 		},
 		"node_modules/@babel/plugin-syntax-class-static-block": {
 			"version": "7.14.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
-			"integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -308,8 +262,6 @@
 		},
 		"node_modules/@babel/plugin-syntax-import-attributes": {
 			"version": "7.26.0",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.26.0.tgz",
-			"integrity": "sha512-e2dttdsJ1ZTpi3B9UYGLw41hifAubg19AtCu/2I/F1QNVclOBr1dYpTdmdyZ84Xiz43BS/tCUkMAZNLv12Pi+A==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -324,8 +276,6 @@
 		},
 		"node_modules/@babel/plugin-syntax-import-meta": {
 			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
-			"integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -337,8 +287,6 @@
 		},
 		"node_modules/@babel/plugin-syntax-json-strings": {
 			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
-			"integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -350,8 +298,6 @@
 		},
 		"node_modules/@babel/plugin-syntax-jsx": {
 			"version": "7.25.9",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.25.9.tgz",
-			"integrity": "sha512-ld6oezHQMZsZfp6pWtbjaNDF2tiiCYYDqQszHt5VV437lewP9aSi2Of99CK0D0XB21k7FLgnLcmQKyKzynfeAA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -366,8 +312,6 @@
 		},
 		"node_modules/@babel/plugin-syntax-logical-assignment-operators": {
 			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
-			"integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -379,8 +323,6 @@
 		},
 		"node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
 			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
-			"integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -392,8 +334,6 @@
 		},
 		"node_modules/@babel/plugin-syntax-numeric-separator": {
 			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
-			"integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -405,8 +345,6 @@
 		},
 		"node_modules/@babel/plugin-syntax-object-rest-spread": {
 			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
-			"integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -418,8 +356,6 @@
 		},
 		"node_modules/@babel/plugin-syntax-optional-catch-binding": {
 			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
-			"integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -431,8 +367,6 @@
 		},
 		"node_modules/@babel/plugin-syntax-optional-chaining": {
 			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
-			"integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -444,8 +378,6 @@
 		},
 		"node_modules/@babel/plugin-syntax-private-property-in-object": {
 			"version": "7.14.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
-			"integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -460,8 +392,6 @@
 		},
 		"node_modules/@babel/plugin-syntax-top-level-await": {
 			"version": "7.14.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
-			"integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -476,8 +406,6 @@
 		},
 		"node_modules/@babel/plugin-syntax-typescript": {
 			"version": "7.25.9",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.25.9.tgz",
-			"integrity": "sha512-hjMgRy5hb8uJJjUcdWunWVcoi9bGpJp8p5Ol1229PoN6aytsLwNMgmdftO23wnCLMfVmTwZDWMPNq/D1SY60JQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -492,8 +420,6 @@
 		},
 		"node_modules/@babel/template": {
 			"version": "7.27.0",
-			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.0.tgz",
-			"integrity": "sha512-2ncevenBqXI6qRMukPlXwHKHchC7RyMuu4xv5JBXRfOGVcTy1mXCD12qrp7Jsoxll1EV3+9sE4GugBVRjT2jFA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -507,8 +433,6 @@
 		},
 		"node_modules/@babel/traverse": {
 			"version": "7.27.0",
-			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.27.0.tgz",
-			"integrity": "sha512-19lYZFzYVQkkHkl4Cy4WrAVcqBkgvV2YM2TU3xG6DIwO7O3ecbDPfW3yM3bjAGcqcQHi+CCtjMR3dIEHxsd6bA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -526,8 +450,6 @@
 		},
 		"node_modules/@babel/traverse/node_modules/globals": {
 			"version": "11.12.0",
-			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -536,8 +458,6 @@
 		},
 		"node_modules/@babel/types": {
 			"version": "7.27.0",
-			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.27.0.tgz",
-			"integrity": "sha512-H45s8fVLYjbhFH62dIJ3WtmJ6RSPt/3DRO0ZcT2SUiYiQyz3BLVb9ADEnLl91m74aQPS3AzzeajZHYOalWe3bg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -550,15 +470,11 @@
 		},
 		"node_modules/@bcoe/v8-coverage": {
 			"version": "0.2.3",
-			"resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
-			"integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@codemirror/state": {
 			"version": "6.5.2",
-			"resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.5.2.tgz",
-			"integrity": "sha512-FVqsPqtPWKVVL3dPSxy8wEF/ymIEuVzF1PK3VbUgrxXpJUSHQWWZz4JMToquRxnkw+36LTamCZG2iua2Ptq0fA==",
 			"dev": true,
 			"license": "MIT",
 			"peer": true,
@@ -568,8 +484,6 @@
 		},
 		"node_modules/@codemirror/view": {
 			"version": "6.36.4",
-			"resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.36.4.tgz",
-			"integrity": "sha512-ZQ0V5ovw/miKEXTvjgzRyjnrk9TwriUB1k4R5p7uNnHR9Hus+D1SXHGdJshijEzPFjU25xea/7nhIeSqYFKdbA==",
 			"dev": true,
 			"license": "MIT",
 			"peer": true,
@@ -581,8 +495,6 @@
 		},
 		"node_modules/@discoveryjs/json-ext": {
 			"version": "0.6.3",
-			"resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.6.3.tgz",
-			"integrity": "sha512-4B4OijXeVNOPZlYA2oEwWOTkzyltLao+xbotHQeqN++Rv27Y6s818+n2Qkp8q+Fxhn0t/5lA5X1Mxktud8eayQ==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -591,8 +503,6 @@
 		},
 		"node_modules/@eslint-community/eslint-utils": {
 			"version": "4.7.0",
-			"resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz",
-			"integrity": "sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -610,8 +520,6 @@
 		},
 		"node_modules/@eslint-community/eslint-utils/node_modules/eslint-visitor-keys": {
 			"version": "3.4.3",
-			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
-			"integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"engines": {
@@ -623,8 +531,6 @@
 		},
 		"node_modules/@eslint-community/regexpp": {
 			"version": "4.12.1",
-			"resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz",
-			"integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -633,8 +539,6 @@
 		},
 		"node_modules/@eslint/config-array": {
 			"version": "0.20.0",
-			"resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.20.0.tgz",
-			"integrity": "sha512-fxlS1kkIjx8+vy2SjuCB94q3htSNrufYTXubwiBFeaQHbH6Ipi43gFJq2zCMt6PHhImH3Xmr0NksKDvchWlpQQ==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"dependencies": {
@@ -648,8 +552,6 @@
 		},
 		"node_modules/@eslint/config-helpers": {
 			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.2.1.tgz",
-			"integrity": "sha512-RI17tsD2frtDu/3dmI7QRrD4bedNKPM08ziRYaC5AhkGrzIAJelm9kJU1TznK+apx6V+cqRz8tfpEeG3oIyjxw==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"engines": {
@@ -658,8 +560,6 @@
 		},
 		"node_modules/@eslint/core": {
 			"version": "0.14.0",
-			"resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.14.0.tgz",
-			"integrity": "sha512-qIbV0/JZr7iSDjqAc60IqbLdsj9GDt16xQtWD+B78d/HAlvysGdZZ6rpJHGAc2T0FQx1X6thsSPdnoiGKdNtdg==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"dependencies": {
@@ -671,8 +571,6 @@
 		},
 		"node_modules/@eslint/eslintrc": {
 			"version": "3.3.1",
-			"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.1.tgz",
-			"integrity": "sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -695,8 +593,6 @@
 		},
 		"node_modules/@eslint/js": {
 			"version": "9.28.0",
-			"resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.28.0.tgz",
-			"integrity": "sha512-fnqSjGWd/CoIp4EXIxWVK/sHA6DOHN4+8Ix2cX5ycOY7LG0UY8nHCU5pIp2eaE1Mc7Qd8kHspYNzYXT2ojPLzg==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -708,8 +604,6 @@
 		},
 		"node_modules/@eslint/object-schema": {
 			"version": "2.1.6",
-			"resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.6.tgz",
-			"integrity": "sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"engines": {
@@ -718,8 +612,6 @@
 		},
 		"node_modules/@eslint/plugin-kit": {
 			"version": "0.3.1",
-			"resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.1.tgz",
-			"integrity": "sha512-0J+zgWxHN+xXONWIyPWKFMgVuJoZuGiIFu8yxk7RJjxkzpGmyja5wRFqZIVtjDVOQpV+Rw0iOAjYPE2eQyjr0w==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"dependencies": {
@@ -732,8 +624,6 @@
 		},
 		"node_modules/@humanfs/core": {
 			"version": "0.19.1",
-			"resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz",
-			"integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"engines": {
@@ -742,8 +632,6 @@
 		},
 		"node_modules/@humanfs/node": {
 			"version": "0.16.6",
-			"resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz",
-			"integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"dependencies": {
@@ -756,8 +644,6 @@
 		},
 		"node_modules/@humanfs/node/node_modules/@humanwhocodes/retry": {
 			"version": "0.3.1",
-			"resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz",
-			"integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"engines": {
@@ -770,8 +656,6 @@
 		},
 		"node_modules/@humanwhocodes/module-importer": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
-			"integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"engines": {
@@ -784,8 +668,6 @@
 		},
 		"node_modules/@humanwhocodes/retry": {
 			"version": "0.4.2",
-			"resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.2.tgz",
-			"integrity": "sha512-xeO57FpIu4p1Ri3Jq/EXq4ClRm86dVF2z/+kvFnyqVYRavTZmaFaUBbWCOuuTh0o/g7DSsk6kc2vrS4Vl5oPOQ==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"engines": {
@@ -798,8 +680,6 @@
 		},
 		"node_modules/@istanbuljs/load-nyc-config": {
 			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
-			"integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
 			"dev": true,
 			"license": "ISC",
 			"dependencies": {
@@ -815,8 +695,6 @@
 		},
 		"node_modules/@istanbuljs/load-nyc-config/node_modules/argparse": {
 			"version": "1.0.10",
-			"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-			"integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -825,8 +703,6 @@
 		},
 		"node_modules/@istanbuljs/load-nyc-config/node_modules/find-up": {
 			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-			"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -839,8 +715,6 @@
 		},
 		"node_modules/@istanbuljs/load-nyc-config/node_modules/js-yaml": {
 			"version": "3.14.1",
-			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-			"integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -853,8 +727,6 @@
 		},
 		"node_modules/@istanbuljs/load-nyc-config/node_modules/locate-path": {
 			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-			"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -866,8 +738,6 @@
 		},
 		"node_modules/@istanbuljs/load-nyc-config/node_modules/p-limit": {
 			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-			"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -882,8 +752,6 @@
 		},
 		"node_modules/@istanbuljs/load-nyc-config/node_modules/p-locate": {
 			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-			"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -895,8 +763,6 @@
 		},
 		"node_modules/@istanbuljs/load-nyc-config/node_modules/resolve-from": {
 			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-			"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -905,8 +771,6 @@
 		},
 		"node_modules/@istanbuljs/schema": {
 			"version": "0.1.3",
-			"resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
-			"integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -915,8 +779,6 @@
 		},
 		"node_modules/@jest/console": {
 			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz",
-			"integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -933,8 +795,6 @@
 		},
 		"node_modules/@jest/core": {
 			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/@jest/core/-/core-29.7.0.tgz",
-			"integrity": "sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -981,8 +841,6 @@
 		},
 		"node_modules/@jest/environment": {
 			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz",
-			"integrity": "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -997,8 +855,6 @@
 		},
 		"node_modules/@jest/expect": {
 			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz",
-			"integrity": "sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1011,8 +867,6 @@
 		},
 		"node_modules/@jest/expect-utils": {
 			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz",
-			"integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1024,8 +878,6 @@
 		},
 		"node_modules/@jest/fake-timers": {
 			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz",
-			"integrity": "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1042,8 +894,6 @@
 		},
 		"node_modules/@jest/globals": {
 			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz",
-			"integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1058,8 +908,6 @@
 		},
 		"node_modules/@jest/reporters": {
 			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz",
-			"integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1102,8 +950,6 @@
 		},
 		"node_modules/@jest/schemas": {
 			"version": "29.6.3",
-			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
-			"integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1115,8 +961,6 @@
 		},
 		"node_modules/@jest/source-map": {
 			"version": "29.6.3",
-			"resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz",
-			"integrity": "sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1130,8 +974,6 @@
 		},
 		"node_modules/@jest/test-result": {
 			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz",
-			"integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1146,8 +988,6 @@
 		},
 		"node_modules/@jest/test-sequencer": {
 			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz",
-			"integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1162,8 +1002,6 @@
 		},
 		"node_modules/@jest/transform": {
 			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz",
-			"integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1189,8 +1027,6 @@
 		},
 		"node_modules/@jest/types": {
 			"version": "29.6.3",
-			"resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
-			"integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1207,8 +1043,6 @@
 		},
 		"node_modules/@jridgewell/gen-mapping": {
 			"version": "0.3.8",
-			"resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz",
-			"integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1222,8 +1056,6 @@
 		},
 		"node_modules/@jridgewell/resolve-uri": {
 			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
-			"integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -1232,8 +1064,6 @@
 		},
 		"node_modules/@jridgewell/set-array": {
 			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
-			"integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -1242,8 +1072,6 @@
 		},
 		"node_modules/@jridgewell/source-map": {
 			"version": "0.3.6",
-			"resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz",
-			"integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1253,15 +1081,11 @@
 		},
 		"node_modules/@jridgewell/sourcemap-codec": {
 			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
-			"integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@jridgewell/trace-mapping": {
 			"version": "0.3.25",
-			"resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
-			"integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1271,16 +1095,12 @@
 		},
 		"node_modules/@marijn/find-cluster-break": {
 			"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==",
 			"dev": true,
 			"license": "MIT",
 			"peer": true
 		},
 		"node_modules/@nodelib/fs.scandir": {
 			"version": "2.1.5",
-			"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-			"integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1293,8 +1113,6 @@
 		},
 		"node_modules/@nodelib/fs.stat": {
 			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-			"integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -1303,8 +1121,6 @@
 		},
 		"node_modules/@nodelib/fs.walk": {
 			"version": "1.2.8",
-			"resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-			"integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1317,8 +1133,6 @@
 		},
 		"node_modules/@parcel/watcher": {
 			"version": "2.5.1",
-			"resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.1.tgz",
-			"integrity": "sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==",
 			"dev": true,
 			"hasInstallScript": true,
 			"license": "MIT",
@@ -1352,178 +1166,8 @@
 				"@parcel/watcher-win32-x64": "2.5.1"
 			}
 		},
-		"node_modules/@parcel/watcher-android-arm64": {
-			"version": "2.5.1",
-			"resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.1.tgz",
-			"integrity": "sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"android"
-			],
-			"engines": {
-				"node": ">= 10.0.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/parcel"
-			}
-		},
-		"node_modules/@parcel/watcher-darwin-arm64": {
-			"version": "2.5.1",
-			"resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.1.tgz",
-			"integrity": "sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"darwin"
-			],
-			"engines": {
-				"node": ">= 10.0.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/parcel"
-			}
-		},
-		"node_modules/@parcel/watcher-darwin-x64": {
-			"version": "2.5.1",
-			"resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.1.tgz",
-			"integrity": "sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"darwin"
-			],
-			"engines": {
-				"node": ">= 10.0.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/parcel"
-			}
-		},
-		"node_modules/@parcel/watcher-freebsd-x64": {
-			"version": "2.5.1",
-			"resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.1.tgz",
-			"integrity": "sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"freebsd"
-			],
-			"engines": {
-				"node": ">= 10.0.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/parcel"
-			}
-		},
-		"node_modules/@parcel/watcher-linux-arm-glibc": {
-			"version": "2.5.1",
-			"resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.1.tgz",
-			"integrity": "sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA==",
-			"cpu": [
-				"arm"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": ">= 10.0.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/parcel"
-			}
-		},
-		"node_modules/@parcel/watcher-linux-arm-musl": {
-			"version": "2.5.1",
-			"resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.1.tgz",
-			"integrity": "sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==",
-			"cpu": [
-				"arm"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": ">= 10.0.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/parcel"
-			}
-		},
-		"node_modules/@parcel/watcher-linux-arm64-glibc": {
-			"version": "2.5.1",
-			"resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.1.tgz",
-			"integrity": "sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": ">= 10.0.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/parcel"
-			}
-		},
-		"node_modules/@parcel/watcher-linux-arm64-musl": {
-			"version": "2.5.1",
-			"resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.1.tgz",
-			"integrity": "sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": ">= 10.0.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/parcel"
-			}
-		},
 		"node_modules/@parcel/watcher-linux-x64-glibc": {
 			"version": "2.5.1",
-			"resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.1.tgz",
-			"integrity": "sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==",
 			"cpu": [
 				"x64"
 			],
@@ -1543,8 +1187,6 @@
 		},
 		"node_modules/@parcel/watcher-linux-x64-musl": {
 			"version": "2.5.1",
-			"resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.1.tgz",
-			"integrity": "sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==",
 			"cpu": [
 				"x64"
 			],
@@ -1562,80 +1204,13 @@
 				"url": "https://opencollective.com/parcel"
 			}
 		},
-		"node_modules/@parcel/watcher-win32-arm64": {
-			"version": "2.5.1",
-			"resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.1.tgz",
-			"integrity": "sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"win32"
-			],
-			"engines": {
-				"node": ">= 10.0.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/parcel"
-			}
-		},
-		"node_modules/@parcel/watcher-win32-ia32": {
-			"version": "2.5.1",
-			"resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.1.tgz",
-			"integrity": "sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ==",
-			"cpu": [
-				"ia32"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"win32"
-			],
-			"engines": {
-				"node": ">= 10.0.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/parcel"
-			}
-		},
-		"node_modules/@parcel/watcher-win32-x64": {
-			"version": "2.5.1",
-			"resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.1.tgz",
-			"integrity": "sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"win32"
-			],
-			"engines": {
-				"node": ">= 10.0.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/parcel"
-			}
-		},
 		"node_modules/@sinclair/typebox": {
 			"version": "0.27.8",
-			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
-			"integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@sinonjs/commons": {
 			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz",
-			"integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==",
 			"dev": true,
 			"license": "BSD-3-Clause",
 			"dependencies": {
@@ -1644,8 +1219,6 @@
 		},
 		"node_modules/@sinonjs/fake-timers": {
 			"version": "10.3.0",
-			"resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz",
-			"integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==",
 			"dev": true,
 			"license": "BSD-3-Clause",
 			"dependencies": {
@@ -1654,8 +1227,6 @@
 		},
 		"node_modules/@types/babel__core": {
 			"version": "7.20.5",
-			"resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
-			"integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1668,8 +1239,6 @@
 		},
 		"node_modules/@types/babel__generator": {
 			"version": "7.6.8",
-			"resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz",
-			"integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1678,8 +1247,6 @@
 		},
 		"node_modules/@types/babel__template": {
 			"version": "7.4.4",
-			"resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz",
-			"integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1689,8 +1256,6 @@
 		},
 		"node_modules/@types/babel__traverse": {
 			"version": "7.20.7",
-			"resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.7.tgz",
-			"integrity": "sha512-dkO5fhS7+/oos4ciWxyEyjWe48zmG6wbCheo/G2ZnHx4fs3EU6YC6UM8rk56gAjNJ9P3MTH2jo5jb92/K6wbng==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1699,8 +1264,6 @@
 		},
 		"node_modules/@types/codemirror": {
 			"version": "5.60.8",
-			"resolved": "https://registry.npmjs.org/@types/codemirror/-/codemirror-5.60.8.tgz",
-			"integrity": "sha512-VjFgDF/eB+Aklcy15TtOTLQeMjTo07k7KAjql8OK5Dirr7a6sJY4T1uVBDuTVG9VEmn1uUsohOpYnVfgC6/jyw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1709,8 +1272,6 @@
 		},
 		"node_modules/@types/eslint": {
 			"version": "9.6.1",
-			"resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz",
-			"integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1720,8 +1281,6 @@
 		},
 		"node_modules/@types/eslint-scope": {
 			"version": "3.7.7",
-			"resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
-			"integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1731,15 +1290,11 @@
 		},
 		"node_modules/@types/estree": {
 			"version": "1.0.7",
-			"resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz",
-			"integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@types/graceful-fs": {
 			"version": "4.1.9",
-			"resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz",
-			"integrity": "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1748,15 +1303,11 @@
 		},
 		"node_modules/@types/istanbul-lib-coverage": {
 			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz",
-			"integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@types/istanbul-lib-report": {
 			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz",
-			"integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1765,8 +1316,6 @@
 		},
 		"node_modules/@types/istanbul-reports": {
 			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz",
-			"integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1775,8 +1324,6 @@
 		},
 		"node_modules/@types/jest": {
 			"version": "29.5.14",
-			"resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.14.tgz",
-			"integrity": "sha512-ZN+4sdnLUbo8EVvVc2ao0GFW6oVrQRPn4K2lglySj7APvSrgzxHiNNK99us4WDMi57xxA2yggblIAMNhXOotLQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1786,15 +1333,11 @@
 		},
 		"node_modules/@types/json-schema": {
 			"version": "7.0.15",
-			"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
-			"integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@types/node": {
 			"version": "22.15.30",
-			"resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.30.tgz",
-			"integrity": "sha512-6Q7lr06bEHdlfplU6YRbgG1SFBdlsfNC4/lX+SkhiTs0cpJkOElmWls8PxDFv4yY/xKb8Y6SO0OmSX4wgqTZbA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1803,15 +1346,11 @@
 		},
 		"node_modules/@types/stack-utils": {
 			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz",
-			"integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@types/tern": {
 			"version": "0.23.9",
-			"resolved": "https://registry.npmjs.org/@types/tern/-/tern-0.23.9.tgz",
-			"integrity": "sha512-ypzHFE/wBzh+BlH6rrBgS5I/Z7RD21pGhZ2rltb/+ZrVM1awdZwjx7hE5XfuYgHWk9uvV5HLZN3SloevCAp3Bw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1820,8 +1359,6 @@
 		},
 		"node_modules/@types/yargs": {
 			"version": "17.0.33",
-			"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.33.tgz",
-			"integrity": "sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1830,15 +1367,11 @@
 		},
 		"node_modules/@types/yargs-parser": {
 			"version": "21.0.3",
-			"resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz",
-			"integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@typescript-eslint/eslint-plugin": {
 			"version": "8.33.1",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.33.1.tgz",
-			"integrity": "sha512-TDCXj+YxLgtvxvFlAvpoRv9MAncDLBV2oT9Bd7YBGC/b/sEURoOYuIwLI99rjWOfY3QtDzO+mk0n4AmdFExW8A==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1867,8 +1400,6 @@
 		},
 		"node_modules/@typescript-eslint/eslint-plugin/node_modules/ignore": {
 			"version": "7.0.4",
-			"resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.4.tgz",
-			"integrity": "sha512-gJzzk+PQNznz8ysRrC0aOkBNVRBDtE1n53IqyqEf3PXrYwomFs5q4pGMizBMJF+ykh03insJ27hB8gSrD2Hn8A==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -1877,8 +1408,6 @@
 		},
 		"node_modules/@typescript-eslint/parser": {
 			"version": "8.33.1",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.33.1.tgz",
-			"integrity": "sha512-qwxv6dq682yVvgKKp2qWwLgRbscDAYktPptK4JPojCwwi3R9cwrvIxS4lvBpzmcqzR4bdn54Z0IG1uHFskW4dA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1902,8 +1431,6 @@
 		},
 		"node_modules/@typescript-eslint/project-service": {
 			"version": "8.33.1",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.33.1.tgz",
-			"integrity": "sha512-DZR0efeNklDIHHGRpMpR5gJITQpu6tLr9lDJnKdONTC7vvzOlLAG/wcfxcdxEWrbiZApcoBCzXqU/Z458Za5Iw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1924,8 +1451,6 @@
 		},
 		"node_modules/@typescript-eslint/scope-manager": {
 			"version": "8.33.1",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.33.1.tgz",
-			"integrity": "sha512-dM4UBtgmzHR9bS0Rv09JST0RcHYearoEoo3pG5B6GoTR9XcyeqX87FEhPo+5kTvVfKCvfHaHrcgeJQc6mrDKrA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1942,8 +1467,6 @@
 		},
 		"node_modules/@typescript-eslint/tsconfig-utils": {
 			"version": "8.33.1",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.33.1.tgz",
-			"integrity": "sha512-STAQsGYbHCF0/e+ShUQ4EatXQ7ceh3fBCXkNU7/MZVKulrlq1usH7t2FhxvCpuCi5O5oi1vmVaAjrGeL71OK1g==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -1959,8 +1482,6 @@
 		},
 		"node_modules/@typescript-eslint/type-utils": {
 			"version": "8.33.1",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.33.1.tgz",
-			"integrity": "sha512-1cG37d9xOkhlykom55WVwG2QRNC7YXlxMaMzqw2uPeJixBFfKWZgaP/hjAObqMN/u3fr5BrTwTnc31/L9jQ2ww==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1983,8 +1504,6 @@
 		},
 		"node_modules/@typescript-eslint/types": {
 			"version": "8.33.1",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.33.1.tgz",
-			"integrity": "sha512-xid1WfizGhy/TKMTwhtVOgalHwPtV8T32MS9MaH50Cwvz6x6YqRIPdD2WvW0XaqOzTV9p5xdLY0h/ZusU5Lokg==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -1997,8 +1516,6 @@
 		},
 		"node_modules/@typescript-eslint/typescript-estree": {
 			"version": "8.33.1",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.33.1.tgz",
-			"integrity": "sha512-+s9LYcT8LWjdYWu7IWs7FvUxpQ/DGkdjZeE/GGulHvv8rvYwQvVaUZ6DE+j5x/prADUgSbbCWZ2nPI3usuVeOA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2026,8 +1543,6 @@
 		},
 		"node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
 			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-			"integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2036,8 +1551,6 @@
 		},
 		"node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": {
 			"version": "9.0.5",
-			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-			"integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
 			"dev": true,
 			"license": "ISC",
 			"dependencies": {
@@ -2052,8 +1565,6 @@
 		},
 		"node_modules/@typescript-eslint/utils": {
 			"version": "8.33.1",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.33.1.tgz",
-			"integrity": "sha512-52HaBiEQUaRYqAXpfzWSR2U3gxk92Kw006+xZpElaPMg3C4PgM+A5LqwoQI1f9E5aZ/qlxAZxzm42WX+vn92SQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2076,8 +1587,6 @@
 		},
 		"node_modules/@typescript-eslint/visitor-keys": {
 			"version": "8.33.1",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.33.1.tgz",
-			"integrity": "sha512-3i8NrFcZeeDHJ+7ZUuDkGT+UHq+XoFGsymNK2jZCOHcfEzRQ0BdpRtdpSx/Iyf3MHLWIcLS0COuOPibKQboIiQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2094,8 +1603,6 @@
 		},
 		"node_modules/@webassemblyjs/ast": {
 			"version": "1.14.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz",
-			"integrity": "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2105,29 +1612,21 @@
 		},
 		"node_modules/@webassemblyjs/floating-point-hex-parser": {
 			"version": "1.13.2",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz",
-			"integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@webassemblyjs/helper-api-error": {
 			"version": "1.13.2",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz",
-			"integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@webassemblyjs/helper-buffer": {
 			"version": "1.14.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz",
-			"integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@webassemblyjs/helper-numbers": {
 			"version": "1.13.2",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz",
-			"integrity": "sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2138,15 +1637,11 @@
 		},
 		"node_modules/@webassemblyjs/helper-wasm-bytecode": {
 			"version": "1.13.2",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz",
-			"integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@webassemblyjs/helper-wasm-section": {
 			"version": "1.14.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz",
-			"integrity": "sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2158,8 +1653,6 @@
 		},
 		"node_modules/@webassemblyjs/ieee754": {
 			"version": "1.13.2",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz",
-			"integrity": "sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2168,8 +1661,6 @@
 		},
 		"node_modules/@webassemblyjs/leb128": {
 			"version": "1.13.2",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz",
-			"integrity": "sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"dependencies": {
@@ -2178,15 +1669,11 @@
 		},
 		"node_modules/@webassemblyjs/utf8": {
 			"version": "1.13.2",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz",
-			"integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@webassemblyjs/wasm-edit": {
 			"version": "1.14.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz",
-			"integrity": "sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2202,8 +1689,6 @@
 		},
 		"node_modules/@webassemblyjs/wasm-gen": {
 			"version": "1.14.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz",
-			"integrity": "sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2216,8 +1701,6 @@
 		},
 		"node_modules/@webassemblyjs/wasm-opt": {
 			"version": "1.14.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz",
-			"integrity": "sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2229,8 +1712,6 @@
 		},
 		"node_modules/@webassemblyjs/wasm-parser": {
 			"version": "1.14.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz",
-			"integrity": "sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2244,8 +1725,6 @@
 		},
 		"node_modules/@webassemblyjs/wast-printer": {
 			"version": "1.14.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz",
-			"integrity": "sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2255,8 +1734,6 @@
 		},
 		"node_modules/@webpack-cli/configtest": {
 			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-3.0.1.tgz",
-			"integrity": "sha512-u8d0pJ5YFgneF/GuvEiDA61Tf1VDomHHYMjv/wc9XzYj7nopltpG96nXN5dJRstxZhcNpV1g+nT6CydO7pHbjA==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -2269,8 +1746,6 @@
 		},
 		"node_modules/@webpack-cli/info": {
 			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-3.0.1.tgz",
-			"integrity": "sha512-coEmDzc2u/ffMvuW9aCjoRzNSPDl/XLuhPdlFRpT9tZHmJ/039az33CE7uH+8s0uL1j5ZNtfdv0HkfaKRBGJsQ==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -2283,8 +1758,6 @@
 		},
 		"node_modules/@webpack-cli/serve": {
 			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-3.0.1.tgz",
-			"integrity": "sha512-sbgw03xQaCLiT6gcY/6u3qBDn01CWw/nbaXl3gTdTFuJJ75Gffv3E3DBpgvY2fkkrdS1fpjaXNOmJlnbtKauKg==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -2302,22 +1775,16 @@
 		},
 		"node_modules/@xtuc/ieee754": {
 			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-			"integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
 			"dev": true,
 			"license": "BSD-3-Clause"
 		},
 		"node_modules/@xtuc/long": {
 			"version": "4.2.2",
-			"resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-			"integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
 			"dev": true,
 			"license": "Apache-2.0"
 		},
 		"node_modules/acorn": {
 			"version": "8.14.1",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz",
-			"integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==",
 			"dev": true,
 			"license": "MIT",
 			"bin": {
@@ -2329,8 +1796,6 @@
 		},
 		"node_modules/acorn-jsx": {
 			"version": "5.3.2",
-			"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-			"integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
 			"dev": true,
 			"license": "MIT",
 			"peerDependencies": {
@@ -2339,8 +1804,6 @@
 		},
 		"node_modules/adjust-sourcemap-loader": {
 			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-4.0.0.tgz",
-			"integrity": "sha512-OXwN5b9pCUXNQHJpwwD2qP40byEmSgzj8B4ydSN0uMNYWiFmJ6x6KwUllMmfk8Rwu/HJDFR7U8ubsWBoN0Xp0A==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2353,8 +1816,6 @@
 		},
 		"node_modules/ajv": {
 			"version": "6.12.6",
-			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-			"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2370,8 +1831,6 @@
 		},
 		"node_modules/ajv-formats": {
 			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
-			"integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2388,8 +1847,6 @@
 		},
 		"node_modules/ajv-formats/node_modules/ajv": {
 			"version": "8.17.1",
-			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
-			"integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2405,15 +1862,11 @@
 		},
 		"node_modules/ajv-formats/node_modules/json-schema-traverse": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/ajv-keywords": {
 			"version": "3.5.2",
-			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-			"integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
 			"dev": true,
 			"license": "MIT",
 			"peerDependencies": {
@@ -2422,8 +1875,6 @@
 		},
 		"node_modules/ansi-escapes": {
 			"version": "4.3.2",
-			"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
-			"integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2438,8 +1889,6 @@
 		},
 		"node_modules/ansi-regex": {
 			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-			"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -2448,8 +1897,6 @@
 		},
 		"node_modules/ansi-styles": {
 			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2464,8 +1911,6 @@
 		},
 		"node_modules/anymatch": {
 			"version": "3.1.3",
-			"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
-			"integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
 			"dev": true,
 			"license": "ISC",
 			"dependencies": {
@@ -2478,22 +1923,16 @@
 		},
 		"node_modules/argparse": {
 			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-			"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
 			"dev": true,
 			"license": "Python-2.0"
 		},
 		"node_modules/async": {
 			"version": "3.2.6",
-			"resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
-			"integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/babel-jest": {
 			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz",
-			"integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2514,8 +1953,6 @@
 		},
 		"node_modules/babel-plugin-istanbul": {
 			"version": "6.1.1",
-			"resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
-			"integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
 			"dev": true,
 			"license": "BSD-3-Clause",
 			"dependencies": {
@@ -2531,8 +1968,6 @@
 		},
 		"node_modules/babel-plugin-istanbul/node_modules/istanbul-lib-instrument": {
 			"version": "5.2.1",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
-			"integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
 			"dev": true,
 			"license": "BSD-3-Clause",
 			"dependencies": {
@@ -2548,8 +1983,6 @@
 		},
 		"node_modules/babel-plugin-istanbul/node_modules/semver": {
 			"version": "6.3.1",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
 			"dev": true,
 			"license": "ISC",
 			"bin": {
@@ -2558,8 +1991,6 @@
 		},
 		"node_modules/babel-plugin-jest-hoist": {
 			"version": "29.6.3",
-			"resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz",
-			"integrity": "sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2574,8 +2005,6 @@
 		},
 		"node_modules/babel-preset-current-node-syntax": {
 			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.1.0.tgz",
-			"integrity": "sha512-ldYss8SbBlWva1bs28q78Ju5Zq1F+8BrqBZZ0VFhLBvhh6lCpC2o3gDJi/5DRLs9FgYZCnmPYIVFU4lRXCkyUw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2601,8 +2030,6 @@
 		},
 		"node_modules/babel-preset-jest": {
 			"version": "29.6.3",
-			"resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz",
-			"integrity": "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2618,14 +2045,10 @@
 		},
 		"node_modules/balanced-match": {
 			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-			"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
 			"license": "MIT"
 		},
 		"node_modules/big.js": {
 			"version": "5.2.2",
-			"resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
-			"integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -2634,8 +2057,6 @@
 		},
 		"node_modules/brace-expansion": {
 			"version": "1.1.11",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2645,8 +2066,6 @@
 		},
 		"node_modules/braces": {
 			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
-			"integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2658,8 +2077,6 @@
 		},
 		"node_modules/browserslist": {
 			"version": "4.24.4",
-			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz",
-			"integrity": "sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==",
 			"dev": true,
 			"funding": [
 				{
@@ -2691,8 +2108,6 @@
 		},
 		"node_modules/bs-logger": {
 			"version": "0.2.6",
-			"resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz",
-			"integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2704,8 +2119,6 @@
 		},
 		"node_modules/bser": {
 			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
-			"integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"dependencies": {
@@ -2714,15 +2127,11 @@
 		},
 		"node_modules/buffer-from": {
 			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-			"integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/bufferutil": {
 			"version": "4.0.9",
-			"resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.9.tgz",
-			"integrity": "sha512-WDtdLmJvAuNNPzByAYpRo2rF1Mmradw6gvWsQKf63476DDXmomT9zUiGypLcG4ibIM67vhAj8jJRdbmEws2Aqw==",
 			"dev": true,
 			"hasInstallScript": true,
 			"license": "MIT",
@@ -2735,14 +2144,10 @@
 		},
 		"node_modules/byte-base64": {
 			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/byte-base64/-/byte-base64-1.1.0.tgz",
-			"integrity": "sha512-56cXelkJrVMdCY9V/3RfDxTh4VfMFCQ5km7B7GkIGfo4bcPL9aACyJLB0Ms3Ezu5rsHmLB2suis96z4fLM03DA==",
 			"license": "MIT"
 		},
 		"node_modules/call-bind-apply-helpers": {
 			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
-			"integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2755,8 +2160,6 @@
 		},
 		"node_modules/call-bound": {
 			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz",
-			"integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2772,8 +2175,6 @@
 		},
 		"node_modules/callsites": {
 			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-			"integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -2782,8 +2183,6 @@
 		},
 		"node_modules/camelcase": {
 			"version": "5.3.1",
-			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-			"integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -2792,8 +2191,6 @@
 		},
 		"node_modules/caniuse-lite": {
 			"version": "1.0.30001707",
-			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001707.tgz",
-			"integrity": "sha512-3qtRjw/HQSMlDWf+X79N206fepf4SOOU6SQLMaq/0KkZLmSjPxAkBOQQ+FxbHKfHmYLZFfdWsO3KA90ceHPSnw==",
 			"dev": true,
 			"funding": [
 				{
@@ -2813,8 +2210,6 @@
 		},
 		"node_modules/chalk": {
 			"version": "4.1.2",
-			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2830,8 +2225,6 @@
 		},
 		"node_modules/chalk/node_modules/supports-color": {
 			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2843,8 +2236,6 @@
 		},
 		"node_modules/char-regex": {
 			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
-			"integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -2853,8 +2244,6 @@
 		},
 		"node_modules/chokidar": {
 			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
-			"integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2869,8 +2258,6 @@
 		},
 		"node_modules/chrome-trace-event": {
 			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz",
-			"integrity": "sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -2879,8 +2266,6 @@
 		},
 		"node_modules/ci-info": {
 			"version": "3.9.0",
-			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
-			"integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
 			"dev": true,
 			"funding": [
 				{
@@ -2895,15 +2280,11 @@
 		},
 		"node_modules/cjs-module-lexer": {
 			"version": "1.4.3",
-			"resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.3.tgz",
-			"integrity": "sha512-9z8TZaGM1pfswYeXrUpzPrkx8UnWYdhJclsiYMm6x/w5+nN+8Tf/LnAgfLGQCm59qAOxU8WwHEq2vNwF6i4j+Q==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/cliui": {
 			"version": "8.0.1",
-			"resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
-			"integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
 			"dev": true,
 			"license": "ISC",
 			"dependencies": {
@@ -2917,8 +2298,6 @@
 		},
 		"node_modules/clone-deep": {
 			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
-			"integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2932,8 +2311,6 @@
 		},
 		"node_modules/co": {
 			"version": "4.6.0",
-			"resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-			"integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -2943,15 +2320,11 @@
 		},
 		"node_modules/collect-v8-coverage": {
 			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz",
-			"integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/color-convert": {
 			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2963,29 +2336,21 @@
 		},
 		"node_modules/color-name": {
 			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/commander": {
 			"version": "2.20.3",
-			"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-			"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/concat-map": {
 			"version": "0.0.1",
-			"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-			"integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/concurrently": {
 			"version": "9.1.2",
-			"resolved": "https://registry.npmjs.org/concurrently/-/concurrently-9.1.2.tgz",
-			"integrity": "sha512-H9MWcoPsYddwbOGM6difjVwVZHl63nwMEwDJG/L7VGtuaJhb12h2caPG2tVPWs7emuYix252iGfqOyrz1GczTQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -3010,15 +2375,11 @@
 		},
 		"node_modules/convert-source-map": {
 			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
-			"integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/create-jest": {
 			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz",
-			"integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -3039,8 +2400,6 @@
 		},
 		"node_modules/cross-spawn": {
 			"version": "7.0.6",
-			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
-			"integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -3054,8 +2413,6 @@
 		},
 		"node_modules/css-loader": {
 			"version": "7.1.2",
-			"resolved": "https://registry.npmjs.org/css-loader/-/css-loader-7.1.2.tgz",
-			"integrity": "sha512-6WvYYn7l/XEGN8Xu2vWFt9nVzrCn39vKyTEFf/ExEyoksJjjSZV/0/35XPlMbpnr6VGhZIUg5yJrL8tGfes/FA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -3090,8 +2447,6 @@
 		},
 		"node_modules/cssesc": {
 			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-			"integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
 			"dev": true,
 			"license": "MIT",
 			"bin": {
@@ -3103,8 +2458,6 @@
 		},
 		"node_modules/date-fns": {
 			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-4.1.0.tgz",
-			"integrity": "sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==",
 			"dev": true,
 			"license": "MIT",
 			"funding": {
@@ -3114,8 +2467,6 @@
 		},
 		"node_modules/debug": {
 			"version": "4.4.0",
-			"resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
-			"integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -3132,8 +2483,6 @@
 		},
 		"node_modules/dedent": {
 			"version": "1.5.3",
-			"resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.3.tgz",
-			"integrity": "sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==",
 			"dev": true,
 			"license": "MIT",
 			"peerDependencies": {
@@ -3147,15 +2496,11 @@
 		},
 		"node_modules/deep-is": {
 			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-			"integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/deepmerge": {
 			"version": "4.3.1",
-			"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
-			"integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -3164,8 +2509,6 @@
 		},
 		"node_modules/detect-libc": {
 			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
-			"integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"optional": true,
@@ -3178,8 +2521,6 @@
 		},
 		"node_modules/detect-newline": {
 			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
-			"integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -3188,8 +2529,6 @@
 		},
 		"node_modules/diff-sequences": {
 			"version": "29.6.3",
-			"resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
-			"integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -3198,8 +2537,6 @@
 		},
 		"node_modules/dunder-proto": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
-			"integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -3213,8 +2550,6 @@
 		},
 		"node_modules/ejs": {
 			"version": "3.1.10",
-			"resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
-			"integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"dependencies": {
@@ -3229,15 +2564,11 @@
 		},
 		"node_modules/electron-to-chromium": {
 			"version": "1.5.127",
-			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.127.tgz",
-			"integrity": "sha512-Ke5OggqOtEqzCzcUyV+9jgO6L6sv1gQVKGtSExXHjD/FK0p4qzPZbrDsrCdy0DptcQprD0V80RCBYSWLMhTTgQ==",
 			"dev": true,
 			"license": "ISC"
 		},
 		"node_modules/emittery": {
 			"version": "0.13.1",
-			"resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz",
-			"integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -3249,15 +2580,11 @@
 		},
 		"node_modules/emoji-regex": {
 			"version": "8.0.0",
-			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/emojis-list": {
 			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
-			"integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -3266,8 +2593,6 @@
 		},
 		"node_modules/enhanced-resolve": {
 			"version": "5.18.1",
-			"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.1.tgz",
-			"integrity": "sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -3280,8 +2605,6 @@
 		},
 		"node_modules/envinfo": {
 			"version": "7.14.0",
-			"resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.14.0.tgz",
-			"integrity": "sha512-CO40UI41xDQzhLB1hWyqUKgFhs250pNcGbyGKe1l/e4FSaI/+YE4IMG76GDt0In67WLPACIITC+sOi08x4wIvg==",
 			"dev": true,
 			"license": "MIT",
 			"bin": {
@@ -3293,8 +2616,6 @@
 		},
 		"node_modules/error-ex": {
 			"version": "1.3.2",
-			"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-			"integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -3303,8 +2624,6 @@
 		},
 		"node_modules/es-define-property": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
-			"integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -3313,8 +2632,6 @@
 		},
 		"node_modules/es-errors": {
 			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
-			"integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -3323,15 +2640,11 @@
 		},
 		"node_modules/es-module-lexer": {
 			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.6.0.tgz",
-			"integrity": "sha512-qqnD1yMU6tk/jnaMosogGySTZP8YtUgAffA9nMN+E/rjxcfRQ6IEk7IiozUjgxKoFHBGjTLnrHB/YC45r/59EQ==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/es-object-atoms": {
 			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
-			"integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -3343,8 +2656,6 @@
 		},
 		"node_modules/escalade": {
 			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
-			"integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -3353,8 +2664,6 @@
 		},
 		"node_modules/escape-string-regexp": {
 			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-			"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -3366,8 +2675,6 @@
 		},
 		"node_modules/eslint": {
 			"version": "9.28.0",
-			"resolved": "https://registry.npmjs.org/eslint/-/eslint-9.28.0.tgz",
-			"integrity": "sha512-ocgh41VhRlf9+fVpe7QKzwLj9c92fDiqOj8Y3Sd4/ZmVA4Btx4PlUYPq4pp9JDyupkf1upbEXecxL2mwNV7jPQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -3427,8 +2734,6 @@
 		},
 		"node_modules/eslint-plugin-unused-imports": {
 			"version": "4.1.4",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-unused-imports/-/eslint-plugin-unused-imports-4.1.4.tgz",
-			"integrity": "sha512-YptD6IzQjDardkl0POxnnRBhU1OEePMV0nd6siHaRBbd+lyh6NAhFEobiznKU7kTsSsDeSD62Pe7kAM1b7dAZQ==",
 			"dev": true,
 			"license": "MIT",
 			"peerDependencies": {
@@ -3443,8 +2748,6 @@
 		},
 		"node_modules/eslint-scope": {
 			"version": "8.3.0",
-			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.3.0.tgz",
-			"integrity": "sha512-pUNxi75F8MJ/GdeKtVLSbYg4ZI34J6C0C7sbL4YOp2exGwen7ZsuBqKzUhXd0qMQ362yET3z+uPwKeg/0C2XCQ==",
 			"dev": true,
 			"license": "BSD-2-Clause",
 			"dependencies": {
@@ -3460,8 +2763,6 @@
 		},
 		"node_modules/eslint-visitor-keys": {
 			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
-			"integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"engines": {
@@ -3473,8 +2774,6 @@
 		},
 		"node_modules/espree": {
 			"version": "10.3.0",
-			"resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz",
-			"integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==",
 			"dev": true,
 			"license": "BSD-2-Clause",
 			"dependencies": {
@@ -3491,8 +2790,6 @@
 		},
 		"node_modules/esprima": {
 			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-			"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
 			"dev": true,
 			"license": "BSD-2-Clause",
 			"bin": {
@@ -3505,8 +2802,6 @@
 		},
 		"node_modules/esquery": {
 			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
-			"integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
 			"dev": true,
 			"license": "BSD-3-Clause",
 			"dependencies": {
@@ -3518,8 +2813,6 @@
 		},
 		"node_modules/esrecurse": {
 			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-			"integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
 			"dev": true,
 			"license": "BSD-2-Clause",
 			"dependencies": {
@@ -3531,8 +2824,6 @@
 		},
 		"node_modules/estraverse": {
 			"version": "5.3.0",
-			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-			"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
 			"dev": true,
 			"license": "BSD-2-Clause",
 			"engines": {
@@ -3541,8 +2832,6 @@
 		},
 		"node_modules/esutils": {
 			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-			"integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
 			"dev": true,
 			"license": "BSD-2-Clause",
 			"engines": {
@@ -3551,14 +2840,10 @@
 		},
 		"node_modules/eventemitter3": {
 			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz",
-			"integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==",
 			"license": "MIT"
 		},
 		"node_modules/events": {
 			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
-			"integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -3567,8 +2852,6 @@
 		},
 		"node_modules/execa": {
 			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-			"integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -3591,8 +2874,6 @@
 		},
 		"node_modules/exit": {
 			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-			"integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",
 			"dev": true,
 			"engines": {
 				"node": ">= 0.8.0"
@@ -3600,8 +2881,6 @@
 		},
 		"node_modules/expect": {
 			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz",
-			"integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -3617,15 +2896,11 @@
 		},
 		"node_modules/fast-deep-equal": {
 			"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-glob": {
 			"version": "3.3.3",
-			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
-			"integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -3641,8 +2916,6 @@
 		},
 		"node_modules/fast-glob/node_modules/glob-parent": {
 			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-			"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
 			"dev": true,
 			"license": "ISC",
 			"dependencies": {
@@ -3654,22 +2927,16 @@
 		},
 		"node_modules/fast-json-stable-stringify": {
 			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-			"integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/fast-levenshtein": {
 			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-			"integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/fast-uri": {
 			"version": "3.0.6",
-			"resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.6.tgz",
-			"integrity": "sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw==",
 			"dev": true,
 			"funding": [
 				{
@@ -3685,8 +2952,6 @@
 		},
 		"node_modules/fastest-levenshtein": {
 			"version": "1.0.16",
-			"resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz",
-			"integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -3695,8 +2960,6 @@
 		},
 		"node_modules/fastq": {
 			"version": "1.19.1",
-			"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz",
-			"integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==",
 			"dev": true,
 			"license": "ISC",
 			"dependencies": {
@@ -3705,8 +2968,6 @@
 		},
 		"node_modules/fb-watchman": {
 			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz",
-			"integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"dependencies": {
@@ -3715,8 +2976,6 @@
 		},
 		"node_modules/file-entry-cache": {
 			"version": "8.0.0",
-			"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz",
-			"integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -3728,8 +2987,6 @@
 		},
 		"node_modules/file-loader": {
 			"version": "6.2.0",
-			"resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz",
-			"integrity": "sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -3749,8 +3006,6 @@
 		},
 		"node_modules/filelist": {
 			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
-			"integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"dependencies": {
@@ -3759,8 +3014,6 @@
 		},
 		"node_modules/filelist/node_modules/brace-expansion": {
 			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-			"integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -3769,8 +3022,6 @@
 		},
 		"node_modules/filelist/node_modules/minimatch": {
 			"version": "5.1.6",
-			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
-			"integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
 			"dev": true,
 			"license": "ISC",
 			"dependencies": {
@@ -3782,8 +3033,6 @@
 		},
 		"node_modules/fill-range": {
 			"version": "7.1.1",
-			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
-			"integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -3795,8 +3044,6 @@
 		},
 		"node_modules/find-up": {
 			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-			"integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -3812,8 +3059,6 @@
 		},
 		"node_modules/flat": {
 			"version": "5.0.2",
-			"resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
-			"integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
 			"dev": true,
 			"license": "BSD-3-Clause",
 			"bin": {
@@ -3822,8 +3067,6 @@
 		},
 		"node_modules/flat-cache": {
 			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz",
-			"integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -3836,15 +3079,11 @@
 		},
 		"node_modules/flatted": {
 			"version": "3.3.3",
-			"resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz",
-			"integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==",
 			"dev": true,
 			"license": "ISC"
 		},
 		"node_modules/fs-extra": {
 			"version": "11.3.0",
-			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.0.tgz",
-			"integrity": "sha512-Z4XaCL6dUDHfP/jT25jJKMmtxvuwbkrD1vNSMFlo9lNLY2c5FHYSQgHPRZUjAB26TpDEoW9HCOgplrdbaPV/ew==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -3858,30 +3097,11 @@
 		},
 		"node_modules/fs.realpath": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-			"integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
 			"dev": true,
 			"license": "ISC"
 		},
-		"node_modules/fsevents": {
-			"version": "2.3.3",
-			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-			"integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-			"dev": true,
-			"hasInstallScript": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"darwin"
-			],
-			"engines": {
-				"node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-			}
-		},
 		"node_modules/function-bind": {
 			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
-			"integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
 			"dev": true,
 			"license": "MIT",
 			"funding": {
@@ -3890,8 +3110,6 @@
 		},
 		"node_modules/gensync": {
 			"version": "1.0.0-beta.2",
-			"resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-			"integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -3900,8 +3118,6 @@
 		},
 		"node_modules/get-caller-file": {
 			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-			"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
 			"dev": true,
 			"license": "ISC",
 			"engines": {
@@ -3910,8 +3126,6 @@
 		},
 		"node_modules/get-intrinsic": {
 			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
-			"integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -3935,8 +3149,6 @@
 		},
 		"node_modules/get-package-type": {
 			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
-			"integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -3945,8 +3157,6 @@
 		},
 		"node_modules/get-proto": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
-			"integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -3959,8 +3169,6 @@
 		},
 		"node_modules/get-stream": {
 			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-			"integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -3972,9 +3180,6 @@
 		},
 		"node_modules/glob": {
 			"version": "7.2.3",
-			"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-			"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-			"deprecated": "Glob versions prior to v9 are no longer supported",
 			"dev": true,
 			"license": "ISC",
 			"dependencies": {
@@ -3994,8 +3199,6 @@
 		},
 		"node_modules/glob-parent": {
 			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-			"integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
 			"dev": true,
 			"license": "ISC",
 			"dependencies": {
@@ -4007,15 +3210,11 @@
 		},
 		"node_modules/glob-to-regexp": {
 			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
-			"integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
 			"dev": true,
 			"license": "BSD-2-Clause"
 		},
 		"node_modules/globals": {
 			"version": "14.0.0",
-			"resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz",
-			"integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -4027,8 +3226,6 @@
 		},
 		"node_modules/gopd": {
 			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
-			"integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -4040,22 +3237,16 @@
 		},
 		"node_modules/graceful-fs": {
 			"version": "4.2.11",
-			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
-			"integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
 			"dev": true,
 			"license": "ISC"
 		},
 		"node_modules/graphemer": {
 			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
-			"integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/has-flag": {
 			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -4064,8 +3255,6 @@
 		},
 		"node_modules/has-symbols": {
 			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
-			"integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -4077,8 +3266,6 @@
 		},
 		"node_modules/hasown": {
 			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
-			"integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4090,15 +3277,11 @@
 		},
 		"node_modules/html-escaper": {
 			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
-			"integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/human-signals": {
 			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-			"integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"engines": {
@@ -4107,8 +3290,6 @@
 		},
 		"node_modules/icss-utils": {
 			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
-			"integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
 			"dev": true,
 			"license": "ISC",
 			"engines": {
@@ -4120,8 +3301,6 @@
 		},
 		"node_modules/ignore": {
 			"version": "5.3.2",
-			"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
-			"integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -4130,15 +3309,11 @@
 		},
 		"node_modules/immutable": {
 			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.1.tgz",
-			"integrity": "sha512-3jatXi9ObIsPGr3N5hGw/vWWcTkq6hUYhpQz4k0wLC+owqWi/LiugIw9x0EdNZ2yGedKN/HzePiBvaJRXa0Ujg==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/import-fresh": {
 			"version": "3.3.1",
-			"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz",
-			"integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4154,8 +3329,6 @@
 		},
 		"node_modules/import-local": {
 			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz",
-			"integrity": "sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4174,8 +3347,6 @@
 		},
 		"node_modules/imurmurhash": {
 			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-			"integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -4184,9 +3355,6 @@
 		},
 		"node_modules/inflight": {
 			"version": "1.0.6",
-			"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-			"integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-			"deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
 			"dev": true,
 			"license": "ISC",
 			"dependencies": {
@@ -4196,15 +3364,11 @@
 		},
 		"node_modules/inherits": {
 			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-			"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
 			"dev": true,
 			"license": "ISC"
 		},
 		"node_modules/interpret": {
 			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/interpret/-/interpret-3.1.1.tgz",
-			"integrity": "sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -4213,15 +3377,11 @@
 		},
 		"node_modules/is-arrayish": {
 			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-			"integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/is-core-module": {
 			"version": "2.16.1",
-			"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
-			"integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4236,8 +3396,6 @@
 		},
 		"node_modules/is-extglob": {
 			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-			"integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -4246,8 +3404,6 @@
 		},
 		"node_modules/is-fullwidth-code-point": {
 			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-			"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -4256,8 +3412,6 @@
 		},
 		"node_modules/is-generator-fn": {
 			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
-			"integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -4266,8 +3420,6 @@
 		},
 		"node_modules/is-glob": {
 			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-			"integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4279,8 +3431,6 @@
 		},
 		"node_modules/is-number": {
 			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-			"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -4289,8 +3439,6 @@
 		},
 		"node_modules/is-plain-object": {
 			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-			"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4302,8 +3450,6 @@
 		},
 		"node_modules/is-stream": {
 			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-			"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -4315,15 +3461,11 @@
 		},
 		"node_modules/isexe": {
 			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-			"integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
 			"dev": true,
 			"license": "ISC"
 		},
 		"node_modules/isobject": {
 			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-			"integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -4332,8 +3474,6 @@
 		},
 		"node_modules/istanbul-lib-coverage": {
 			"version": "3.2.2",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
-			"integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
 			"dev": true,
 			"license": "BSD-3-Clause",
 			"engines": {
@@ -4342,8 +3482,6 @@
 		},
 		"node_modules/istanbul-lib-instrument": {
 			"version": "6.0.3",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz",
-			"integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==",
 			"dev": true,
 			"license": "BSD-3-Clause",
 			"dependencies": {
@@ -4359,8 +3497,6 @@
 		},
 		"node_modules/istanbul-lib-report": {
 			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
-			"integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
 			"dev": true,
 			"license": "BSD-3-Clause",
 			"dependencies": {
@@ -4374,8 +3510,6 @@
 		},
 		"node_modules/istanbul-lib-report/node_modules/supports-color": {
 			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4387,8 +3521,6 @@
 		},
 		"node_modules/istanbul-lib-source-maps": {
 			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
-			"integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
 			"dev": true,
 			"license": "BSD-3-Clause",
 			"dependencies": {
@@ -4402,8 +3534,6 @@
 		},
 		"node_modules/istanbul-reports": {
 			"version": "3.1.7",
-			"resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz",
-			"integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==",
 			"dev": true,
 			"license": "BSD-3-Clause",
 			"dependencies": {
@@ -4416,8 +3546,6 @@
 		},
 		"node_modules/jake": {
 			"version": "10.9.2",
-			"resolved": "https://registry.npmjs.org/jake/-/jake-10.9.2.tgz",
-			"integrity": "sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"dependencies": {
@@ -4435,8 +3563,6 @@
 		},
 		"node_modules/jest": {
 			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz",
-			"integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4462,8 +3588,6 @@
 		},
 		"node_modules/jest-changed-files": {
 			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz",
-			"integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4477,8 +3601,6 @@
 		},
 		"node_modules/jest-circus": {
 			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz",
-			"integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4509,8 +3631,6 @@
 		},
 		"node_modules/jest-cli": {
 			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz",
-			"integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4543,8 +3663,6 @@
 		},
 		"node_modules/jest-config": {
 			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz",
-			"integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4589,8 +3707,6 @@
 		},
 		"node_modules/jest-diff": {
 			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz",
-			"integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4605,8 +3721,6 @@
 		},
 		"node_modules/jest-docblock": {
 			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz",
-			"integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4618,8 +3732,6 @@
 		},
 		"node_modules/jest-each": {
 			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz",
-			"integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4635,8 +3747,6 @@
 		},
 		"node_modules/jest-environment-node": {
 			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz",
-			"integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4653,8 +3763,6 @@
 		},
 		"node_modules/jest-get-type": {
 			"version": "29.6.3",
-			"resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz",
-			"integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -4663,8 +3771,6 @@
 		},
 		"node_modules/jest-haste-map": {
 			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz",
-			"integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4689,8 +3795,6 @@
 		},
 		"node_modules/jest-leak-detector": {
 			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz",
-			"integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4703,8 +3807,6 @@
 		},
 		"node_modules/jest-matcher-utils": {
 			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz",
-			"integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4719,8 +3821,6 @@
 		},
 		"node_modules/jest-message-util": {
 			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz",
-			"integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4740,8 +3840,6 @@
 		},
 		"node_modules/jest-mock": {
 			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz",
-			"integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4755,8 +3853,6 @@
 		},
 		"node_modules/jest-pnp-resolver": {
 			"version": "1.2.3",
-			"resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
-			"integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -4773,8 +3869,6 @@
 		},
 		"node_modules/jest-regex-util": {
 			"version": "29.6.3",
-			"resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz",
-			"integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -4783,8 +3877,6 @@
 		},
 		"node_modules/jest-resolve": {
 			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz",
-			"integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4804,8 +3896,6 @@
 		},
 		"node_modules/jest-resolve-dependencies": {
 			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz",
-			"integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4818,8 +3908,6 @@
 		},
 		"node_modules/jest-runner": {
 			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz",
-			"integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4851,8 +3939,6 @@
 		},
 		"node_modules/jest-runtime": {
 			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz",
-			"integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4885,8 +3971,6 @@
 		},
 		"node_modules/jest-snapshot": {
 			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz",
-			"integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4917,8 +4001,6 @@
 		},
 		"node_modules/jest-util": {
 			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
-			"integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4935,8 +4017,6 @@
 		},
 		"node_modules/jest-validate": {
 			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz",
-			"integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4953,8 +4033,6 @@
 		},
 		"node_modules/jest-validate/node_modules/camelcase": {
 			"version": "6.3.0",
-			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
-			"integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -4966,8 +4044,6 @@
 		},
 		"node_modules/jest-watcher": {
 			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz",
-			"integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4986,8 +4062,6 @@
 		},
 		"node_modules/jest-worker": {
 			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz",
-			"integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5002,15 +4076,11 @@
 		},
 		"node_modules/js-tokens": {
 			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-			"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/js-yaml": {
 			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-			"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5022,8 +4092,6 @@
 		},
 		"node_modules/jsesc": {
 			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
-			"integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",
 			"dev": true,
 			"license": "MIT",
 			"bin": {
@@ -5035,36 +4103,26 @@
 		},
 		"node_modules/json-buffer": {
 			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
-			"integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/json-parse-even-better-errors": {
 			"version": "2.3.1",
-			"resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-			"integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/json-schema-traverse": {
 			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/json-stable-stringify-without-jsonify": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-			"integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/json5": {
 			"version": "2.2.3",
-			"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
-			"integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
 			"dev": true,
 			"license": "MIT",
 			"bin": {
@@ -5076,8 +4134,6 @@
 		},
 		"node_modules/jsonfile": {
 			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-			"integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5089,8 +4145,6 @@
 		},
 		"node_modules/keyv": {
 			"version": "4.5.4",
-			"resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
-			"integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5099,8 +4153,6 @@
 		},
 		"node_modules/kind-of": {
 			"version": "6.0.3",
-			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-			"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -5109,8 +4161,6 @@
 		},
 		"node_modules/kleur": {
 			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
-			"integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -5119,8 +4169,6 @@
 		},
 		"node_modules/leven": {
 			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
-			"integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -5129,8 +4177,6 @@
 		},
 		"node_modules/levn": {
 			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-			"integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5143,15 +4189,11 @@
 		},
 		"node_modules/lines-and-columns": {
 			"version": "1.2.4",
-			"resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-			"integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/loader-runner": {
 			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
-			"integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -5160,8 +4202,6 @@
 		},
 		"node_modules/loader-utils": {
 			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
-			"integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5175,8 +4215,6 @@
 		},
 		"node_modules/locate-path": {
 			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-			"integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5191,29 +4229,21 @@
 		},
 		"node_modules/lodash": {
 			"version": "4.17.21",
-			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-			"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/lodash.memoize": {
 			"version": "4.1.2",
-			"resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
-			"integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/lodash.merge": {
 			"version": "4.6.2",
-			"resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-			"integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/lru-cache": {
 			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-			"integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
 			"dev": true,
 			"license": "ISC",
 			"dependencies": {
@@ -5222,8 +4252,6 @@
 		},
 		"node_modules/make-dir": {
 			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
-			"integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5238,15 +4266,11 @@
 		},
 		"node_modules/make-error": {
 			"version": "1.3.6",
-			"resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
-			"integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
 			"dev": true,
 			"license": "ISC"
 		},
 		"node_modules/makeerror": {
 			"version": "1.0.12",
-			"resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
-			"integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
 			"dev": true,
 			"license": "BSD-3-Clause",
 			"dependencies": {
@@ -5255,8 +4279,6 @@
 		},
 		"node_modules/math-intrinsics": {
 			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
-			"integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -5265,15 +4287,11 @@
 		},
 		"node_modules/merge-stream": {
 			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-			"integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/merge2": {
 			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-			"integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -5282,8 +4300,6 @@
 		},
 		"node_modules/micromatch": {
 			"version": "4.0.8",
-			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
-			"integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5296,8 +4312,6 @@
 		},
 		"node_modules/mime-db": {
 			"version": "1.52.0",
-			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-			"integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -5306,8 +4320,6 @@
 		},
 		"node_modules/mime-types": {
 			"version": "2.1.35",
-			"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-			"integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5319,8 +4331,6 @@
 		},
 		"node_modules/mimic-fn": {
 			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-			"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -5329,8 +4339,6 @@
 		},
 		"node_modules/mini-css-extract-plugin": {
 			"version": "2.9.2",
-			"resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.2.tgz",
-			"integrity": "sha512-GJuACcS//jtq4kCtd5ii/M0SZf7OZRH+BxdqXZHaJfb8TJiVl+NgQRPwiYt2EuqeSkNydn/7vP+bcE27C5mb9w==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5350,8 +4358,6 @@
 		},
 		"node_modules/mini-css-extract-plugin/node_modules/ajv": {
 			"version": "8.17.1",
-			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
-			"integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5367,8 +4373,6 @@
 		},
 		"node_modules/mini-css-extract-plugin/node_modules/ajv-keywords": {
 			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-			"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5380,15 +4384,11 @@
 		},
 		"node_modules/mini-css-extract-plugin/node_modules/json-schema-traverse": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/mini-css-extract-plugin/node_modules/schema-utils": {
 			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.0.tgz",
-			"integrity": "sha512-Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5407,8 +4407,6 @@
 		},
 		"node_modules/minimatch": {
 			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-			"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
 			"dev": true,
 			"license": "ISC",
 			"dependencies": {
@@ -5420,8 +4418,6 @@
 		},
 		"node_modules/moment": {
 			"version": "2.29.4",
-			"resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
-			"integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -5430,15 +4426,11 @@
 		},
 		"node_modules/ms": {
 			"version": "2.1.3",
-			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-			"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/nanoid": {
 			"version": "3.3.11",
-			"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
-			"integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
 			"dev": true,
 			"funding": [
 				{
@@ -5456,30 +4448,22 @@
 		},
 		"node_modules/natural-compare": {
 			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-			"integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/neo-async": {
 			"version": "2.6.2",
-			"resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
-			"integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/node-addon-api": {
 			"version": "7.1.1",
-			"resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz",
-			"integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==",
 			"dev": true,
 			"license": "MIT",
 			"optional": true
 		},
 		"node_modules/node-gyp-build": {
 			"version": "4.8.4",
-			"resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.4.tgz",
-			"integrity": "sha512-LA4ZjwlnUblHVgq0oBF3Jl/6h/Nvs5fzBLwdEF4nuxnFdsfajde4WfxtJr3CaiH+F6ewcIB/q4jQ4UzPyid+CQ==",
 			"dev": true,
 			"license": "MIT",
 			"bin": {
@@ -5490,22 +4474,16 @@
 		},
 		"node_modules/node-int64": {
 			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
-			"integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/node-releases": {
 			"version": "2.0.19",
-			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
-			"integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/normalize-path": {
 			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-			"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -5514,8 +4492,6 @@
 		},
 		"node_modules/npm-check-updates": {
 			"version": "18.0.1",
-			"resolved": "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-18.0.1.tgz",
-			"integrity": "sha512-MO7mLp/8nm6kZNLLyPgz4gHmr9tLoU+pWPLdXuGAx+oZydBHkHWN0ibTonsrfwC2WEQNIQxuZagYwB67JQpAuw==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"bin": {
@@ -5529,8 +4505,6 @@
 		},
 		"node_modules/npm-run-path": {
 			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-			"integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5542,8 +4516,6 @@
 		},
 		"node_modules/object-inspect": {
 			"version": "1.13.4",
-			"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
-			"integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -5555,8 +4527,6 @@
 		},
 		"node_modules/obsidian": {
 			"version": "1.8.7",
-			"resolved": "https://registry.npmjs.org/obsidian/-/obsidian-1.8.7.tgz",
-			"integrity": "sha512-h4bWwNFAGRXlMlMAzdEiIM2ppTGlrh7uGOJS6w4gClrsjc+ei/3YAtU2VdFUlCiPuTHpY4aBpFJJW75S1Tl/JA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5570,8 +4540,6 @@
 		},
 		"node_modules/once": {
 			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-			"integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
 			"dev": true,
 			"license": "ISC",
 			"dependencies": {
@@ -5580,8 +4548,6 @@
 		},
 		"node_modules/onetime": {
 			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-			"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5596,8 +4562,6 @@
 		},
 		"node_modules/optionator": {
 			"version": "0.9.4",
-			"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
-			"integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5614,8 +4578,6 @@
 		},
 		"node_modules/p-limit": {
 			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-			"integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5630,8 +4592,6 @@
 		},
 		"node_modules/p-locate": {
 			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-			"integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5646,8 +4606,6 @@
 		},
 		"node_modules/p-queue": {
 			"version": "8.1.0",
-			"resolved": "https://registry.npmjs.org/p-queue/-/p-queue-8.1.0.tgz",
-			"integrity": "sha512-mxLDbbGIBEXTJL0zEx8JIylaj3xQ7Z/7eEVjcF9fJX4DBiH9oqe+oahYnlKKxm0Ci9TlWTyhSHgygxMxjIB2jw==",
 			"license": "MIT",
 			"dependencies": {
 				"eventemitter3": "^5.0.1",
@@ -5662,8 +4620,6 @@
 		},
 		"node_modules/p-timeout": {
 			"version": "6.1.4",
-			"resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-6.1.4.tgz",
-			"integrity": "sha512-MyIV3ZA/PmyBN/ud8vV9XzwTrNtR4jFrObymZYnZqMmW0zA8Z17vnT0rBgFE/TlohB+YCHqXMgZzb3Csp49vqg==",
 			"license": "MIT",
 			"engines": {
 				"node": ">=14.16"
@@ -5674,8 +4630,6 @@
 		},
 		"node_modules/p-try": {
 			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-			"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -5684,8 +4638,6 @@
 		},
 		"node_modules/parent-module": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-			"integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5697,8 +4649,6 @@
 		},
 		"node_modules/parse-json": {
 			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
-			"integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5716,8 +4666,6 @@
 		},
 		"node_modules/path-exists": {
 			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-			"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -5726,8 +4674,6 @@
 		},
 		"node_modules/path-is-absolute": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-			"integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -5736,8 +4682,6 @@
 		},
 		"node_modules/path-key": {
 			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -5746,22 +4690,16 @@
 		},
 		"node_modules/path-parse": {
 			"version": "1.0.7",
-			"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-			"integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/picocolors": {
 			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
-			"integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
 			"dev": true,
 			"license": "ISC"
 		},
 		"node_modules/picomatch": {
 			"version": "2.3.1",
-			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-			"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -5773,8 +4711,6 @@
 		},
 		"node_modules/pirates": {
 			"version": "4.0.7",
-			"resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.7.tgz",
-			"integrity": "sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -5783,8 +4719,6 @@
 		},
 		"node_modules/pkg-dir": {
 			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-			"integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5796,8 +4730,6 @@
 		},
 		"node_modules/pkg-dir/node_modules/find-up": {
 			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-			"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5810,8 +4742,6 @@
 		},
 		"node_modules/pkg-dir/node_modules/locate-path": {
 			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-			"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5823,8 +4753,6 @@
 		},
 		"node_modules/pkg-dir/node_modules/p-limit": {
 			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-			"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5839,8 +4767,6 @@
 		},
 		"node_modules/pkg-dir/node_modules/p-locate": {
 			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-			"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5852,8 +4778,6 @@
 		},
 		"node_modules/postcss": {
 			"version": "8.5.3",
-			"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz",
-			"integrity": "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==",
 			"dev": true,
 			"funding": [
 				{
@@ -5881,8 +4805,6 @@
 		},
 		"node_modules/postcss-modules-extract-imports": {
 			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.1.0.tgz",
-			"integrity": "sha512-k3kNe0aNFQDAZGbin48pL2VNidTF0w4/eASDsxlyspobzU3wZQLOGj7L9gfRe0Jo9/4uud09DsjFNH7winGv8Q==",
 			"dev": true,
 			"license": "ISC",
 			"engines": {
@@ -5894,8 +4816,6 @@
 		},
 		"node_modules/postcss-modules-local-by-default": {
 			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.2.0.tgz",
-			"integrity": "sha512-5kcJm/zk+GJDSfw+V/42fJ5fhjL5YbFDl8nVdXkJPLLW+Vf9mTD5Xe0wqIaDnLuL2U6cDNpTr+UQ+v2HWIBhzw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5912,8 +4832,6 @@
 		},
 		"node_modules/postcss-modules-scope": {
 			"version": "3.2.1",
-			"resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.2.1.tgz",
-			"integrity": "sha512-m9jZstCVaqGjTAuny8MdgE88scJnCiQSlSrOWcTQgM2t32UBe+MUmFSO5t7VMSfAf/FJKImAxBav8ooCHJXCJA==",
 			"dev": true,
 			"license": "ISC",
 			"dependencies": {
@@ -5928,8 +4846,6 @@
 		},
 		"node_modules/postcss-modules-values": {
 			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
-			"integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
 			"dev": true,
 			"license": "ISC",
 			"dependencies": {
@@ -5944,8 +4860,6 @@
 		},
 		"node_modules/postcss-selector-parser": {
 			"version": "7.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
-			"integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5958,15 +4872,11 @@
 		},
 		"node_modules/postcss-value-parser": {
 			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/prelude-ls": {
 			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-			"integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -5975,8 +4885,6 @@
 		},
 		"node_modules/prettier": {
 			"version": "3.5.3",
-			"resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.3.tgz",
-			"integrity": "sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==",
 			"dev": true,
 			"license": "MIT",
 			"bin": {
@@ -5991,8 +4899,6 @@
 		},
 		"node_modules/pretty-format": {
 			"version": "29.7.0",
-			"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
-			"integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -6006,8 +4912,6 @@
 		},
 		"node_modules/pretty-format/node_modules/ansi-styles": {
 			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-			"integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -6019,8 +4923,6 @@
 		},
 		"node_modules/prompts": {
 			"version": "2.4.2",
-			"resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
-			"integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -6033,8 +4935,6 @@
 		},
 		"node_modules/punycode": {
 			"version": "2.3.1",
-			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
-			"integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -6043,8 +4943,6 @@
 		},
 		"node_modules/pure-rand": {
 			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.1.0.tgz",
-			"integrity": "sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==",
 			"dev": true,
 			"funding": [
 				{
@@ -6060,8 +4958,6 @@
 		},
 		"node_modules/qs": {
 			"version": "6.14.0",
-			"resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz",
-			"integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==",
 			"dev": true,
 			"license": "BSD-3-Clause",
 			"dependencies": {
@@ -6076,8 +4972,6 @@
 		},
 		"node_modules/queue-microtask": {
 			"version": "1.2.3",
-			"resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-			"integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
 			"dev": true,
 			"funding": [
 				{
@@ -6097,8 +4991,6 @@
 		},
 		"node_modules/randombytes": {
 			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
-			"integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -6107,15 +4999,11 @@
 		},
 		"node_modules/react-is": {
 			"version": "18.3.1",
-			"resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
-			"integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/readdirp": {
 			"version": "4.1.2",
-			"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz",
-			"integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -6128,8 +5016,6 @@
 		},
 		"node_modules/rechoir": {
 			"version": "0.8.0",
-			"resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.8.0.tgz",
-			"integrity": "sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -6139,24 +5025,24 @@
 				"node": ">= 10.13.0"
 			}
 		},
+		"node_modules/reconcile-text": {
+			"version": "0.5.0",
+			"resolved": "https://registry.npmjs.org/reconcile-text/-/reconcile-text-0.5.0.tgz",
+			"integrity": "sha512-zki3lqw9Oxdhm9ZvDN17VyYoL1Isc8BEL07ILVDE2yGfNEI7thrkczoNCUr+hkFU2rzZtfxECTG0b7p61AJ6wg==",
+			"license": "MIT"
+		},
 		"node_modules/regex-parser": {
 			"version": "2.3.1",
-			"resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.3.1.tgz",
-			"integrity": "sha512-yXLRqatcCuKtVHsWrNg0JL3l1zGfdXeEvDa0bdu4tCDQw0RpMDZsqbkyRTUnKMR0tXF627V2oEWjBEaEdqTwtQ==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/request-animation-frame-timeout": {
 			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/request-animation-frame-timeout/-/request-animation-frame-timeout-2.0.4.tgz",
-			"integrity": "sha512-5oYwRBYjrMSU/YHHXj5AM/nv96ZE0b8WZoA3FqnkeDDPXoprxUCZFK4IWZTl+y3RJQtaihiJPiKOB4NZfZ7C7A==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/require-directory": {
 			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-			"integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -6165,8 +5051,6 @@
 		},
 		"node_modules/require-from-string": {
 			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-			"integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -6175,8 +5059,6 @@
 		},
 		"node_modules/resolve": {
 			"version": "1.22.10",
-			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz",
-			"integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -6196,8 +5078,6 @@
 		},
 		"node_modules/resolve-cwd": {
 			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
-			"integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -6209,8 +5089,6 @@
 		},
 		"node_modules/resolve-cwd/node_modules/resolve-from": {
 			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-			"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -6219,8 +5097,6 @@
 		},
 		"node_modules/resolve-from": {
 			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-			"integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -6229,8 +5105,6 @@
 		},
 		"node_modules/resolve-url-loader": {
 			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-5.0.0.tgz",
-			"integrity": "sha512-uZtduh8/8srhBoMx//5bwqjQ+rfYOUq8zC9NrMUGtjBiGTtFJM42s58/36+hTqeqINcnYe08Nj3LkK9lW4N8Xg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -6246,15 +5120,11 @@
 		},
 		"node_modules/resolve-url-loader/node_modules/convert-source-map": {
 			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
-			"integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/resolve.exports": {
 			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.3.tgz",
-			"integrity": "sha512-OcXjMsGdhL4XnbShKpAcSqPMzQoYkYyhbEaeSko47MjRP9NfEQMhZkXL1DoFlt9LWQn4YttrdnV6X2OiyzBi+A==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -6263,8 +5133,6 @@
 		},
 		"node_modules/reusify": {
 			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz",
-			"integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -6274,8 +5142,6 @@
 		},
 		"node_modules/run-parallel": {
 			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-			"integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
 			"dev": true,
 			"funding": [
 				{
@@ -6298,8 +5164,6 @@
 		},
 		"node_modules/rxjs": {
 			"version": "7.8.2",
-			"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.2.tgz",
-			"integrity": "sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"dependencies": {
@@ -6308,8 +5172,6 @@
 		},
 		"node_modules/safe-buffer": {
 			"version": "5.2.1",
-			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-			"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
 			"dev": true,
 			"funding": [
 				{
@@ -6329,8 +5191,6 @@
 		},
 		"node_modules/sass": {
 			"version": "1.89.1",
-			"resolved": "https://registry.npmjs.org/sass/-/sass-1.89.1.tgz",
-			"integrity": "sha512-eMLLkl+qz7tx/0cJ9wI+w09GQ2zodTkcE/aVfywwdlRcI3EO19xGnbmJwg/JMIm+5MxVJ6outddLZ4Von4E++Q==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -6350,8 +5210,6 @@
 		},
 		"node_modules/sass-loader": {
 			"version": "16.0.5",
-			"resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-16.0.5.tgz",
-			"integrity": "sha512-oL+CMBXrj6BZ/zOq4os+UECPL+bWqt6OAC6DWS8Ln8GZRcMDjlJ4JC3FBDuHJdYaFWIdKNIBYmtZtK2MaMkNIw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -6391,8 +5249,6 @@
 		},
 		"node_modules/schema-utils": {
 			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
-			"integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -6410,8 +5266,6 @@
 		},
 		"node_modules/semver": {
 			"version": "7.7.2",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
-			"integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
 			"dev": true,
 			"license": "ISC",
 			"bin": {
@@ -6423,8 +5277,6 @@
 		},
 		"node_modules/serialize-javascript": {
 			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
-			"integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
 			"dev": true,
 			"license": "BSD-3-Clause",
 			"dependencies": {
@@ -6433,8 +5285,6 @@
 		},
 		"node_modules/shallow-clone": {
 			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
-			"integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -6446,8 +5296,6 @@
 		},
 		"node_modules/shebang-command": {
 			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -6459,8 +5307,6 @@
 		},
 		"node_modules/shebang-regex": {
 			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -6469,8 +5315,6 @@
 		},
 		"node_modules/shell-quote": {
 			"version": "1.8.2",
-			"resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.2.tgz",
-			"integrity": "sha512-AzqKpGKjrj7EM6rKVQEPpB288oCfnrEIuyoT9cyF4nmGa7V8Zk6f7RRqYisX8X9m+Q7bd632aZW4ky7EhbQztA==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -6482,8 +5326,6 @@
 		},
 		"node_modules/side-channel": {
 			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
-			"integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -6502,8 +5344,6 @@
 		},
 		"node_modules/side-channel-list": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz",
-			"integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -6519,8 +5359,6 @@
 		},
 		"node_modules/side-channel-map": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz",
-			"integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -6538,8 +5376,6 @@
 		},
 		"node_modules/side-channel-weakmap": {
 			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz",
-			"integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -6558,22 +5394,16 @@
 		},
 		"node_modules/signal-exit": {
 			"version": "3.0.7",
-			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-			"integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
 			"dev": true,
 			"license": "ISC"
 		},
 		"node_modules/sisteransi": {
 			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
-			"integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/slash": {
 			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-			"integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -6582,8 +5412,6 @@
 		},
 		"node_modules/source-map": {
 			"version": "0.6.1",
-			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-			"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
 			"dev": true,
 			"license": "BSD-3-Clause",
 			"engines": {
@@ -6592,8 +5420,6 @@
 		},
 		"node_modules/source-map-js": {
 			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
-			"integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
 			"dev": true,
 			"license": "BSD-3-Clause",
 			"engines": {
@@ -6602,8 +5428,6 @@
 		},
 		"node_modules/source-map-support": {
 			"version": "0.5.13",
-			"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
-			"integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -6613,15 +5437,11 @@
 		},
 		"node_modules/sprintf-js": {
 			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-			"integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
 			"dev": true,
 			"license": "BSD-3-Clause"
 		},
 		"node_modules/stack-utils": {
 			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
-			"integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -6633,8 +5453,6 @@
 		},
 		"node_modules/stack-utils/node_modules/escape-string-regexp": {
 			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-			"integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -6643,8 +5461,6 @@
 		},
 		"node_modules/string-length": {
 			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
-			"integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -6657,8 +5473,6 @@
 		},
 		"node_modules/string-width": {
 			"version": "4.2.3",
-			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -6672,8 +5486,6 @@
 		},
 		"node_modules/strip-ansi": {
 			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-			"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -6685,8 +5497,6 @@
 		},
 		"node_modules/strip-bom": {
 			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
-			"integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -6695,8 +5505,6 @@
 		},
 		"node_modules/strip-final-newline": {
 			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
-			"integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -6705,8 +5513,6 @@
 		},
 		"node_modules/strip-json-comments": {
 			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-			"integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -6718,16 +5524,12 @@
 		},
 		"node_modules/style-mod": {
 			"version": "4.1.2",
-			"resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.1.2.tgz",
-			"integrity": "sha512-wnD1HyVqpJUI2+eKZ+eo1UwghftP6yuFheBqqe+bWCotBjC2K1YnteJILRMs3SM4V/0dLEW1SC27MWP5y+mwmw==",
 			"dev": true,
 			"license": "MIT",
 			"peer": true
 		},
 		"node_modules/supports-color": {
 			"version": "8.1.1",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-			"integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -6742,8 +5544,6 @@
 		},
 		"node_modules/supports-preserve-symlinks-flag": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-			"integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -6753,18 +5553,12 @@
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"node_modules/sync_lib": {
-			"resolved": "../backend/sync_lib/pkg",
-			"link": true
-		},
 		"node_modules/sync-client": {
 			"resolved": "sync-client",
 			"link": true
 		},
 		"node_modules/tapable": {
 			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
-			"integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -6773,8 +5567,6 @@
 		},
 		"node_modules/terser": {
 			"version": "5.39.0",
-			"resolved": "https://registry.npmjs.org/terser/-/terser-5.39.0.tgz",
-			"integrity": "sha512-LBAhFyLho16harJoWMg/nZsQYgTrg5jXOn2nCYjRUcZZEdE3qa2zb8QEDRUGVZBW4rlazf2fxkg8tztybTaqWw==",
 			"dev": true,
 			"license": "BSD-2-Clause",
 			"dependencies": {
@@ -6792,8 +5584,6 @@
 		},
 		"node_modules/terser-webpack-plugin": {
 			"version": "5.3.14",
-			"resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.14.tgz",
-			"integrity": "sha512-vkZjpUjb6OMS7dhV+tILUW6BhpDR7P2L/aQSAv+Uwk+m8KATX9EccViHTJR2qDtACKPIYndLGCyl3FMo+r2LMw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -6827,8 +5617,6 @@
 		},
 		"node_modules/terser-webpack-plugin/node_modules/ajv": {
 			"version": "8.17.1",
-			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
-			"integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -6844,8 +5632,6 @@
 		},
 		"node_modules/terser-webpack-plugin/node_modules/ajv-keywords": {
 			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-			"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -6857,8 +5643,6 @@
 		},
 		"node_modules/terser-webpack-plugin/node_modules/jest-worker": {
 			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
-			"integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -6872,15 +5656,11 @@
 		},
 		"node_modules/terser-webpack-plugin/node_modules/json-schema-traverse": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/terser-webpack-plugin/node_modules/schema-utils": {
 			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.0.tgz",
-			"integrity": "sha512-Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -6899,8 +5679,6 @@
 		},
 		"node_modules/terser/node_modules/source-map-support": {
 			"version": "0.5.21",
-			"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
-			"integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -6914,8 +5692,6 @@
 		},
 		"node_modules/test-exclude": {
 			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
-			"integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
 			"dev": true,
 			"license": "ISC",
 			"dependencies": {
@@ -6929,15 +5705,11 @@
 		},
 		"node_modules/tmpl": {
 			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
-			"integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
 			"dev": true,
 			"license": "BSD-3-Clause"
 		},
 		"node_modules/to-regex-range": {
 			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-			"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -6949,8 +5721,6 @@
 		},
 		"node_modules/tree-kill": {
 			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",
-			"integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==",
 			"dev": true,
 			"license": "MIT",
 			"bin": {
@@ -6959,8 +5729,6 @@
 		},
 		"node_modules/ts-api-utils": {
 			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.1.0.tgz",
-			"integrity": "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -6972,8 +5740,6 @@
 		},
 		"node_modules/ts-jest": {
 			"version": "29.3.4",
-			"resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.3.4.tgz",
-			"integrity": "sha512-Iqbrm8IXOmV+ggWHOTEbjwyCf2xZlUMv5npExksXohL+tk8va4Fjhb+X2+Rt9NBmgO7bJ8WpnMLOwih/DnMlFA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -7022,8 +5788,6 @@
 		},
 		"node_modules/ts-jest/node_modules/type-fest": {
 			"version": "4.41.0",
-			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.41.0.tgz",
-			"integrity": "sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==",
 			"dev": true,
 			"license": "(MIT OR CC0-1.0)",
 			"engines": {
@@ -7035,8 +5799,6 @@
 		},
 		"node_modules/ts-loader": {
 			"version": "9.5.2",
-			"resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.5.2.tgz",
-			"integrity": "sha512-Qo4piXvOTWcMGIgRiuFa6nHNm+54HbYaZCKqc9eeZCLRy3XqafQgwX2F7mofrbJG3g7EEb+lkiR+z2Lic2s3Zw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -7056,8 +5818,6 @@
 		},
 		"node_modules/ts-loader/node_modules/source-map": {
 			"version": "0.7.4",
-			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
-			"integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
 			"dev": true,
 			"license": "BSD-3-Clause",
 			"engines": {
@@ -7066,15 +5826,11 @@
 		},
 		"node_modules/tslib": {
 			"version": "2.8.1",
-			"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
-			"integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
 			"dev": true,
 			"license": "0BSD"
 		},
 		"node_modules/type-check": {
 			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-			"integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -7086,8 +5842,6 @@
 		},
 		"node_modules/type-detect": {
 			"version": "4.0.8",
-			"resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-			"integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -7096,8 +5850,6 @@
 		},
 		"node_modules/type-fest": {
 			"version": "0.21.3",
-			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
-			"integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
 			"dev": true,
 			"license": "(MIT OR CC0-1.0)",
 			"engines": {
@@ -7109,8 +5861,6 @@
 		},
 		"node_modules/typescript": {
 			"version": "5.8.3",
-			"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.3.tgz",
-			"integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"bin": {
@@ -7123,8 +5873,6 @@
 		},
 		"node_modules/typescript-eslint": {
 			"version": "8.33.1",
-			"resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.33.1.tgz",
-			"integrity": "sha512-AgRnV4sKkWOiZ0Kjbnf5ytTJXMUZQ0qhSVdQtDNYLPLnjsATEYhaO94GlRQwi4t4gO8FfjM6NnikHeKjUm8D7A==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -7146,15 +5894,11 @@
 		},
 		"node_modules/undici-types": {
 			"version": "6.21.0",
-			"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
-			"integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/universalify": {
 			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
-			"integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -7163,8 +5907,6 @@
 		},
 		"node_modules/update-browserslist-db": {
 			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz",
-			"integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==",
 			"dev": true,
 			"funding": [
 				{
@@ -7194,8 +5936,6 @@
 		},
 		"node_modules/uri-js": {
 			"version": "4.4.1",
-			"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-			"integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
 			"dev": true,
 			"license": "BSD-2-Clause",
 			"dependencies": {
@@ -7204,8 +5944,6 @@
 		},
 		"node_modules/url": {
 			"version": "0.11.4",
-			"resolved": "https://registry.npmjs.org/url/-/url-0.11.4.tgz",
-			"integrity": "sha512-oCwdVC7mTuWiPyjLUz/COz5TLk6wgp0RCsN+wHZ2Ekneac9w8uuV0njcbbie2ME+Vs+d6duwmYuR3HgQXs1fOg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -7218,15 +5956,11 @@
 		},
 		"node_modules/url/node_modules/punycode": {
 			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-			"integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/utf-8-validate": {
 			"version": "6.0.5",
-			"resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-6.0.5.tgz",
-			"integrity": "sha512-EYZR+OpIXp9Y1eG1iueg8KRsY8TuT8VNgnanZ0uA3STqhHQTLwbl+WX76/9X5OY12yQubymBpaBSmMPkSTQcKA==",
 			"dev": true,
 			"hasInstallScript": true,
 			"license": "MIT",
@@ -7241,15 +5975,11 @@
 		},
 		"node_modules/util-deprecate": {
 			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-			"integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/uuid": {
 			"version": "11.1.0",
-			"resolved": "https://registry.npmjs.org/uuid/-/uuid-11.1.0.tgz",
-			"integrity": "sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A==",
 			"funding": [
 				"https://github.com/sponsors/broofa",
 				"https://github.com/sponsors/ctavan"
@@ -7261,8 +5991,6 @@
 		},
 		"node_modules/v8-to-istanbul": {
 			"version": "9.3.0",
-			"resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz",
-			"integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==",
 			"dev": true,
 			"license": "ISC",
 			"dependencies": {
@@ -7280,8 +6008,6 @@
 		},
 		"node_modules/virtual-scroller": {
 			"version": "1.13.1",
-			"resolved": "https://registry.npmjs.org/virtual-scroller/-/virtual-scroller-1.13.1.tgz",
-			"integrity": "sha512-sui46QUBOIfHyXYjdGkxoze/GlCZFUFRxzxEvsu06UQ4iPc3uRfGnm/Qj7195hiMVOYQW9lDn+m3sD7sRMYdYg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -7290,16 +6016,12 @@
 		},
 		"node_modules/w3c-keyname": {
 			"version": "2.2.8",
-			"resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.8.tgz",
-			"integrity": "sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==",
 			"dev": true,
 			"license": "MIT",
 			"peer": true
 		},
 		"node_modules/walker": {
 			"version": "1.0.8",
-			"resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
-			"integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"dependencies": {
@@ -7308,8 +6030,6 @@
 		},
 		"node_modules/watchpack": {
 			"version": "2.4.2",
-			"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz",
-			"integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -7322,8 +6042,6 @@
 		},
 		"node_modules/webpack": {
 			"version": "5.99.9",
-			"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.99.9.tgz",
-			"integrity": "sha512-brOPwM3JnmOa+7kd3NsmOUOwbDAj8FT9xDsG3IW0MgbN9yZV7Oi/s/+MNQ/EcSMqw7qfoRyXPoeEWT8zLVdVGg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -7370,8 +6088,6 @@
 		},
 		"node_modules/webpack-cli": {
 			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-6.0.1.tgz",
-			"integrity": "sha512-MfwFQ6SfwinsUVi0rNJm7rHZ31GyTcpVE5pgVA3hwFRb7COD4TzjUUwhGWKfO50+xdc2MQPuEBBJoqIMGt3JDw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -7413,15 +6129,11 @@
 		},
 		"node_modules/webpack-cli/node_modules/colorette": {
 			"version": "2.0.20",
-			"resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
-			"integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/webpack-cli/node_modules/commander": {
 			"version": "12.1.0",
-			"resolved": "https://registry.npmjs.org/commander/-/commander-12.1.0.tgz",
-			"integrity": "sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -7430,8 +6142,6 @@
 		},
 		"node_modules/webpack-merge": {
 			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-6.0.1.tgz",
-			"integrity": "sha512-hXXvrjtx2PLYx4qruKl+kyRSLc52V+cCvMxRjmKwoA+CBbbF5GfIBtR6kCvl0fYGqTUPKB+1ktVmTHqMOzgCBg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -7445,8 +6155,6 @@
 		},
 		"node_modules/webpack-sources": {
 			"version": "3.2.3",
-			"resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
-			"integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -7455,8 +6163,6 @@
 		},
 		"node_modules/webpack/node_modules/ajv": {
 			"version": "8.17.1",
-			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
-			"integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -7472,8 +6178,6 @@
 		},
 		"node_modules/webpack/node_modules/ajv-keywords": {
 			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-			"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -7485,8 +6189,6 @@
 		},
 		"node_modules/webpack/node_modules/eslint-scope": {
 			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-			"integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
 			"dev": true,
 			"license": "BSD-2-Clause",
 			"dependencies": {
@@ -7499,8 +6201,6 @@
 		},
 		"node_modules/webpack/node_modules/estraverse": {
 			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-			"integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
 			"dev": true,
 			"license": "BSD-2-Clause",
 			"engines": {
@@ -7509,15 +6209,11 @@
 		},
 		"node_modules/webpack/node_modules/json-schema-traverse": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/webpack/node_modules/schema-utils": {
 			"version": "4.3.2",
-			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.2.tgz",
-			"integrity": "sha512-Gn/JaSk/Mt9gYubxTtSn/QCV4em9mpAPiR1rqy/Ocu19u/G9J5WWdNoUT4SiV6mFC3y6cxyFcFwdzPM3FgxGAQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -7536,8 +6232,6 @@
 		},
 		"node_modules/which": {
 			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-			"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
 			"dev": true,
 			"license": "ISC",
 			"dependencies": {
@@ -7552,15 +6246,11 @@
 		},
 		"node_modules/wildcard": {
 			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz",
-			"integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/word-wrap": {
 			"version": "1.2.5",
-			"resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
-			"integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -7569,8 +6259,6 @@
 		},
 		"node_modules/wrap-ansi": {
 			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-			"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -7587,15 +6275,11 @@
 		},
 		"node_modules/wrappy": {
 			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-			"integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
 			"dev": true,
 			"license": "ISC"
 		},
 		"node_modules/write-file-atomic": {
 			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
-			"integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
 			"dev": true,
 			"license": "ISC",
 			"dependencies": {
@@ -7608,8 +6292,6 @@
 		},
 		"node_modules/ws": {
 			"version": "8.18.2",
-			"resolved": "https://registry.npmjs.org/ws/-/ws-8.18.2.tgz",
-			"integrity": "sha512-DMricUmwGZUVr++AEAe2uiVM7UoO9MAVZMDu05UQOaUII0lp+zOzLLU4Xqh/JvTqklB1T4uELaaPBKyjE1r4fQ==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -7630,8 +6312,6 @@
 		},
 		"node_modules/y18n": {
 			"version": "5.0.8",
-			"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-			"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
 			"dev": true,
 			"license": "ISC",
 			"engines": {
@@ -7640,15 +6320,11 @@
 		},
 		"node_modules/yallist": {
 			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-			"integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
 			"dev": true,
 			"license": "ISC"
 		},
 		"node_modules/yargs": {
 			"version": "17.7.2",
-			"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
-			"integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -7666,8 +6342,6 @@
 		},
 		"node_modules/yargs-parser": {
 			"version": "21.1.1",
-			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-			"integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
 			"dev": true,
 			"license": "ISC",
 			"engines": {
@@ -7676,8 +6350,6 @@
 		},
 		"node_modules/yocto-queue": {
 			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-			"integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -7722,13 +6394,13 @@
 				"byte-base64": "^1.1.0",
 				"minimatch": "^10.0.1",
 				"p-queue": "^8.1.0",
+				"reconcile-text": "^0.5.0",
 				"uuid": "^11.1.0"
 			},
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
 				"@types/node": "^22.15.30",
 				"jest": "^29.7.0",
-				"sync_lib": "file:../../backend/sync_lib/pkg",
 				"ts-jest": "^29.3.4",
 				"ts-loader": "^9.5.2",
 				"tslib": "2.8.1",
@@ -7741,8 +6413,6 @@
 		},
 		"sync-client/node_modules/brace-expansion": {
 			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-			"integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
 			"license": "MIT",
 			"dependencies": {
 				"balanced-match": "^1.0.0"
@@ -7750,8 +6420,6 @@
 		},
 		"sync-client/node_modules/minimatch": {
 			"version": "10.0.1",
-			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.1.tgz",
-			"integrity": "sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==",
 			"license": "ISC",
 			"dependencies": {
 				"brace-expansion": "^2.0.1"
diff --git a/frontend/sync-client/jest.config.js b/frontend/sync-client/jest.config.js
index 8c1027ee..d1cbaca2 100644
--- a/frontend/sync-client/jest.config.js
+++ b/frontend/sync-client/jest.config.js
@@ -1,3 +1,3 @@
 module.exports = {
-	preset: "ts-jest/presets/js-with-babel-esm"
+	preset: "ts-jest"
 };
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index 74efc30a..8128d4de 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -10,19 +10,19 @@
     "scripts": {
         "dev": "webpack watch --mode development",
         "build": "webpack --mode production",
-        "test": "NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules\" jest"
+        "test": "jest"
     },
     "dependencies": {
         "byte-base64": "^1.1.0",
         "minimatch": "^10.0.1",
         "p-queue": "^8.1.0",
-        "uuid": "^11.1.0"
+        "uuid": "^11.1.0",
+        "reconcile-text": "^0.5.0"
     },
     "devDependencies": {
         "@types/jest": "^29.5.14",
         "@types/node": "^22.15.30",
         "jest": "^29.7.0",
-        "sync_lib": "file:../../backend/sync_lib/pkg",
         "ts-jest": "^29.3.4",
         "ts-loader": "^9.5.2",
         "tslib": "2.8.1",
@@ -32,4 +32,4 @@
         "webpack-merge": "^6.0.1",
         "ws": "^8.18.2"
     }
-}
+}
\ No newline at end of file
diff --git a/frontend/sync-client/src/file-operations/file-operations.test.ts b/frontend/sync-client/src/file-operations/file-operations.test.ts
index 2529bab2..82a96f9d 100644
--- a/frontend/sync-client/src/file-operations/file-operations.test.ts
+++ b/frontend/sync-client/src/file-operations/file-operations.test.ts
@@ -6,12 +6,8 @@ import type {
 import { FileOperations } from "./file-operations";
 import { Logger } from "../tracing/logger";
 import { assertSetContainsExactly } from "../utils/assert-set-contains-exactly";
-import type {
-	FileSystemOperations,
-	TextWithCursors
-} from "./filesystem-operations";
-import init, { base64ToBytes } from "sync_lib";
-import fs from "fs";
+import type { FileSystemOperations } from "./filesystem-operations";
+import type { TextWithCursors } from "reconcile-text";
 
 class MockDatabase implements Partial<Database> {
 	public getLatestDocumentByRelativePath(
@@ -75,13 +71,6 @@ class FakeFileSystemOperations implements FileSystemOperations {
 }
 
 describe("File operations", () => {
-	beforeEach(async () => {
-		const wasmBin = fs.readFileSync(
-			"../../backend/sync_lib/pkg/sync_lib_bg.wasm"
-		);
-		await init({ module_or_path: wasmBin });
-	});
-
 	it("should deconflict renames", async () => {
 		const fileSystemOperations = new FakeFileSystemOperations();
 		const fileOperations = new FileOperations(
diff --git a/frontend/sync-client/src/file-operations/file-operations.ts b/frontend/sync-client/src/file-operations/file-operations.ts
index e6e42c9d..38f624e5 100644
--- a/frontend/sync-client/src/file-operations/file-operations.ts
+++ b/frontend/sync-client/src/file-operations/file-operations.ts
@@ -1,18 +1,10 @@
 import type { Logger } from "../tracing/logger";
-import type {
-	FileSystemOperations,
-	TextWithCursors
-} from "./filesystem-operations";
+import type { FileSystemOperations } from "./filesystem-operations";
 import type { Database, RelativePath } from "../persistence/database";
-import {
-	CursorPosition,
-	isBinary,
-	isFileTypeMergable,
-	mergeTextWithCursors,
-	TextWithCursors as RustTextWithCursors
-} from "sync_lib";
 import { SafeFileSystemOperations } from "./safe-filesystem-operations";
-
+import type { TextWithCursors } from "reconcile-text";
+import { isBinary, reconcile } from "reconcile-text";
+import { isFileTypeMergable } from "../utils/is-file-type-mergable";
 export class FileOperations {
 	private static readonly PARENTHESES_REGEX = / \((\d+)\)$/;
 	private readonly fs: SafeFileSystemOperations;
@@ -102,39 +94,25 @@ export class FileOperations {
 		await this.fs.atomicUpdateText(
 			path,
 			({ text, cursors }: TextWithCursors): TextWithCursors => {
-				text = text.replace(this.nativeLineEndings, "\n");
-
 				this.logger.debug(
 					`Performing a 3-way merge for ${path} with the expected content`
 				);
 
-				const left = new RustTextWithCursors(
-					text,
-					cursors.map(
-						(cursor) =>
-							new CursorPosition(
-								cursor.id,
-								cursor.characterPosition
-							)
-					)
+				text = text.replace(this.nativeLineEndings, "\n");
+				const merged = reconcile(
+					expectedText,
+					{ text, cursors },
+					newText
 				);
-				const right = new RustTextWithCursors(newText, []);
-				const merged = mergeTextWithCursors(expectedText, left, right);
 
-				const resultText = merged
-					.text()
-					.replace("\n", this.nativeLineEndings);
-
-				const resultCursors = merged.cursors().map((cursor) => ({
-					id: cursor.id(),
-					characterPosition: cursor.characterPosition()
-				}));
-
-				merged.free();
+				const resultText = merged.text.replace(
+					"\n",
+					this.nativeLineEndings
+				);
 
 				return {
 					text: resultText,
-					cursors: resultCursors
+					cursors: merged.cursors
 				};
 			}
 		);
diff --git a/frontend/sync-client/src/file-operations/filesystem-operations.ts b/frontend/sync-client/src/file-operations/filesystem-operations.ts
index 4caf538d..d5d1eedc 100644
--- a/frontend/sync-client/src/file-operations/filesystem-operations.ts
+++ b/frontend/sync-client/src/file-operations/filesystem-operations.ts
@@ -1,16 +1,6 @@
 import type { RelativePath } from "../persistence/database";
 
-export interface Cursor {
-	id: number;
-
-	/// The character position is the index of the character in the text where the text lines are separated by '\n' new line character even if the actual text uses different line endings.
-	characterPosition: number;
-}
-
-export interface TextWithCursors {
-	text: string;
-	cursors: Cursor[];
-}
+import type { TextWithCursors } from "reconcile-text";
 
 export interface FileSystemOperations {
 	// List all files that should be synced.
diff --git a/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts b/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
index 304723b2..214f9f6e 100644
--- a/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
+++ b/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
@@ -1,11 +1,9 @@
 import type { RelativePath } from "../persistence/database";
-import type {
-	FileSystemOperations,
-	TextWithCursors
-} from "./filesystem-operations";
+import type { FileSystemOperations } from "./filesystem-operations";
 import type { Logger } from "../tracing/logger";
 import { Locks } from "../utils/locks";
 import { FileNotFoundError } from "./file-not-found-error";
+import type { TextWithCursors } from "reconcile-text";
 
 /**
  * Decorates `FileSystemOperations` to replace errors with `FileNotFoundError`
diff --git a/frontend/sync-client/src/index.ts b/frontend/sync-client/src/index.ts
index 0cd94277..e984794d 100644
--- a/frontend/sync-client/src/index.ts
+++ b/frontend/sync-client/src/index.ts
@@ -13,11 +13,7 @@ export { Logger, LogLevel, LogLine } from "./tracing/logger";
 export { type SyncSettings, DEFAULT_SETTINGS } from "./persistence/settings";
 export { rateLimit } from "./utils/rate-limit";
 export type { RelativePath, StoredDatabase } from "./persistence/database";
-export type {
-	FileSystemOperations,
-	TextWithCursors,
-	Cursor
-} from "./file-operations/filesystem-operations";
+export type { FileSystemOperations } from "./file-operations/filesystem-operations";
 export type { PersistenceProvider } from "./persistence/persistence";
 export type { CursorSpan } from "./services/types/CursorSpan";
 export type { ClientCursors } from "./services/types/ClientCursors";
diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts
index 6d51212e..41ab6781 100644
--- a/frontend/sync-client/src/sync-client.ts
+++ b/frontend/sync-client/src/sync-client.ts
@@ -1,5 +1,3 @@
-import initWasm from "sync_lib";
-import wasmBin from "../../../backend/sync_lib/pkg/sync_lib_bg.wasm";
 import type { PersistenceProvider } from "./persistence/persistence";
 import type { HistoryEntry, HistoryStats } from "./tracing/sync-history";
 import { SyncHistory } from "./tracing/sync-history";
@@ -79,11 +77,6 @@ export class SyncClient {
 
 		const history = new SyncHistory(logger);
 
-		await initWasm(
-			// eslint-disable-next-line
-			(wasmBin as any).default // it is loaded as a base64 string by webpack
-		);
-
 		let state = (await persistence.load()) ?? {
 			settings: undefined,
 			database: undefined
diff --git a/frontend/sync-client/src/utils/assert-set-contains-exactly.ts b/frontend/sync-client/src/utils/assert-set-contains-exactly.ts
index 9682044e..0532a3d3 100644
--- a/frontend/sync-client/src/utils/assert-set-contains-exactly.ts
+++ b/frontend/sync-client/src/utils/assert-set-contains-exactly.ts
@@ -1,4 +1,4 @@
-import assert from "assert";
+import * as assert from "assert";
 
 export function assertSetContainsExactly<T>(set: Set<T>, ...values: T[]): void {
 	assert(
diff --git a/frontend/sync-client/src/utils/deserialize.test.ts b/frontend/sync-client/src/utils/deserialize.test.ts
deleted file mode 100644
index b053c2a3..00000000
--- a/frontend/sync-client/src/utils/deserialize.test.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import init, { base64ToBytes } from "sync_lib";
-import fs from "fs";
-
-describe("deserialize", () => {
-	it("should serialize a Uint8Array to a base64 string", async () => {
-		const wasmBin = fs.readFileSync(
-			"../../backend/sync_lib/pkg/sync_lib_bg.wasm"
-		);
-		await init({ module_or_path: wasmBin });
-
-		const base64 = "SGVsbG8=";
-		const jsResult = base64ToBytes(base64);
-		const expected = new Uint8Array([72, 101, 108, 108, 111]);
-		expect(jsResult).toEqual(expected);
-		const rustResult = base64ToBytes(base64);
-		expect(jsResult).toEqual(rustResult);
-	});
-});
diff --git a/frontend/sync-client/src/utils/is-file-type-mergable.test.ts b/frontend/sync-client/src/utils/is-file-type-mergable.test.ts
new file mode 100644
index 00000000..1b3c6557
--- /dev/null
+++ b/frontend/sync-client/src/utils/is-file-type-mergable.test.ts
@@ -0,0 +1,28 @@
+import { isFileTypeMergable } from "./is-file-type-mergable";
+
+describe("isFileTypeMergable", () => {
+	it("should return true for .md files", () => {
+		expect(isFileTypeMergable(".md")).toBe(true);
+		expect(isFileTypeMergable("hi.md")).toBe(true);
+		expect(isFileTypeMergable("my/path/to/my/document.md")).toBe(true);
+	});
+
+	it("should return true for .txt files", () => {
+		expect(isFileTypeMergable(".txt")).toBe(true);
+		expect(isFileTypeMergable("hi.txt")).toBe(true);
+		expect(isFileTypeMergable("my/path/to/my/document.txt")).toBe(true);
+	});
+
+	it("should be case insensitive", () => {
+		expect(isFileTypeMergable("hi.MD")).toBe(true);
+		expect(isFileTypeMergable("my/path/to/my/DOCUMENT.MD")).toBe(true);
+		expect(isFileTypeMergable("hi.TXT")).toBe(true);
+		expect(isFileTypeMergable("my/path/to/my/DOCUMENT.TXT")).toBe(true);
+	});
+
+	it("should return false for non-mergable file types", () => {
+		expect(isFileTypeMergable(".json")).toBe(false);
+		expect(isFileTypeMergable("HELLO.JSON")).toBe(false);
+		expect(isFileTypeMergable("my/config.yml")).toBe(false);
+	});
+});
diff --git a/frontend/sync-client/src/utils/is-file-type-mergable.ts b/frontend/sync-client/src/utils/is-file-type-mergable.ts
new file mode 100644
index 00000000..3b149285
--- /dev/null
+++ b/frontend/sync-client/src/utils/is-file-type-mergable.ts
@@ -0,0 +1,6 @@
+export function isFileTypeMergable(pathOrFileName: string): boolean {
+	const parts = pathOrFileName.split(".");
+	const fileExtension = parts.at(-1) ?? "";
+
+	return ["md", "txt"].includes(fileExtension.toLowerCase());
+}
diff --git a/frontend/sync-client/src/utils/serialize.test.ts b/frontend/sync-client/src/utils/serialize.test.ts
deleted file mode 100644
index d01fae18..00000000
--- a/frontend/sync-client/src/utils/serialize.test.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { serialize } from "./serialize";
-import init, { bytesToBase64 } from "sync_lib";
-import fs from "fs";
-
-describe("serialize", () => {
-	it("should serialize a Uint8Array to a base64 string", async () => {
-		const wasmBin = fs.readFileSync(
-			"../../backend/sync_lib/pkg/sync_lib_bg.wasm"
-		);
-		await init({ module_or_path: wasmBin });
-
-		const data = new Uint8Array([72, 101, 108, 108, 111]);
-		const jsResult = serialize(data);
-		const rustResult = bytesToBase64(data);
-		expect(rustResult).toBe("SGVsbG8=");
-		expect(jsResult).toBe(rustResult);
-	});
-});
diff --git a/frontend/sync-client/src/utils/serialize.ts b/frontend/sync-client/src/utils/serialize.ts
deleted file mode 100644
index 79eedaab..00000000
--- a/frontend/sync-client/src/utils/serialize.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { bytesToBase64 } from "byte-base64";
-
-export function serialize(data: Uint8Array): string {
-	return bytesToBase64(data);
-}
diff --git a/frontend/test-client/jest.config.js b/frontend/test-client/jest.config.js
index 8c1027ee..d1cbaca2 100644
--- a/frontend/test-client/jest.config.js
+++ b/frontend/test-client/jest.config.js
@@ -1,3 +1,3 @@
 module.exports = {
-	preset: "ts-jest/presets/js-with-babel-esm"
+	preset: "ts-jest"
 };
diff --git a/frontend/test-client/src/agent/mock-client.ts b/frontend/test-client/src/agent/mock-client.ts
index ae465473..73235298 100644
--- a/frontend/test-client/src/agent/mock-client.ts
+++ b/frontend/test-client/src/agent/mock-client.ts
@@ -1,4 +1,4 @@
-import type { StoredDatabase, TextWithCursors } from "sync-client";
+import type { StoredDatabase } from "sync-client";
 import { assert } from "../utils/assert";
 import {
 	type RelativePath,
@@ -6,7 +6,7 @@ import {
 	type SyncSettings,
 	SyncClient
 } from "sync-client";
-
+import type { TextWithCursors } from "reconcile-text";
 export class MockClient implements FileSystemOperations {
 	protected readonly localFiles = new Map<string, Uint8Array>();
 	protected client!: SyncClient;
diff --git a/frontend/test-client/src/cli.ts b/frontend/test-client/src/cli.ts
index ae4f7e84..4a3aab4f 100644
--- a/frontend/test-client/src/cli.ts
+++ b/frontend/test-client/src/cli.ts
@@ -33,7 +33,7 @@ async function runTest({
 	console.info(`Using vault name: ${vaultName}`);
 	const initialSettings: Partial<SyncSettings> = {
 		isSyncEnabled: true,
-		token: "   test-token-change-me     ", // same as in backend/config-e2e.yml with spaces
+		token: "   test-token-change-me     ", // same as in sync-server/config-e2e.yml with spaces
 		vaultName: randomCasing(vaultName) + (Math.random() > 0.5 ? "  " : ""), // extra spaces shouldn't matter
 		syncConcurrency: concurrency,
 		remoteUri: "http://localhost:3000"
diff --git a/scripts/bump-version.sh b/scripts/bump-version.sh
index 55813bd8..60f9391e 100755
--- a/scripts/bump-version.sh
+++ b/scripts/bump-version.sh
@@ -22,22 +22,14 @@ else
   echo "Your working directory is clean."
 fi
 
-echo "Bumping backend versions"
-cd backend
+echo "Bumping sync-server versions"
+cd sync-server
 cargo set-version --bump $1
 
 echo "Bumping frontend versions"
 cd ../frontend
 npm version $1 --workspaces
 
-echo "Updating frontend dependencies to match the new backend versions"
-cd ../backend/sync_lib
-wasm-pack build --target web --features console_error_panic_hook
-
-cd ../../frontend
-npm install
-
-cd ..
 cp frontend/obsidian-plugin/manifest.json manifest.json  # for BRAT, otherwise it wouldn't update
 
 # Commit and tag
diff --git a/scripts/clean-up.sh b/scripts/clean-up.sh
index 85c12d10..4dfbf4a0 100755
--- a/scripts/clean-up.sh
+++ b/scripts/clean-up.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-rm -rf backend/databases
+rm -rf sync-server/databases
 rm -rf logs
diff --git a/scripts/update-api-types.sh b/scripts/update-api-types.sh
index aea8a890..7aa8238c 100755
--- a/scripts/update-api-types.sh
+++ b/scripts/update-api-types.sh
@@ -2,10 +2,10 @@
 
 set -e
 
-rm -rf backend/sync_server/bindings
+rm -rf sync-server/bindings
 
-cd backend
+cd sync-server
 cargo test export_bindings
 cd -
 
-cp -r backend/sync_server/bindings/* frontend/sync-client/src/services/types/
+cp -r sync-server/bindings/* frontend/sync-client/src/services/types/
diff --git a/backend/.dockerignore b/sync-server/.dockerignore
similarity index 78%
rename from backend/.dockerignore
rename to sync-server/.dockerignore
index 985e2cd4..091f4766 100644
--- a/backend/.dockerignore
+++ b/sync-server/.dockerignore
@@ -2,5 +2,4 @@ target
 Dockerfile
 .dockerignore
 databases
-sync_lib/pkg
 *.yml
diff --git a/backend/.env b/sync-server/.env
similarity index 100%
rename from backend/.env
rename to sync-server/.env
diff --git a/backend/Cargo.lock b/sync-server/Cargo.lock
similarity index 93%
rename from backend/Cargo.lock
rename to sync-server/Cargo.lock
index 4d40e80e..c6f607be 100644
--- a/backend/Cargo.lock
+++ b/sync-server/Cargo.lock
@@ -346,9 +346,9 @@ dependencies = [
 
 [[package]]
 name = "cfg-if"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"
 
 [[package]]
 name = "chrono"
@@ -430,28 +430,6 @@ dependencies = [
  "crossbeam-utils",
 ]
 
-[[package]]
-name = "console"
-version = "0.15.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb"
-dependencies = [
- "encode_unicode",
- "lazy_static",
- "libc",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "console_error_panic_hook"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc"
-dependencies = [
- "cfg-if",
- "wasm-bindgen",
-]
-
 [[package]]
 name = "const-oid"
 version = "0.9.6"
@@ -575,12 +553,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "diff"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
-
 [[package]]
 name = "digest"
 version = "0.10.7"
@@ -619,12 +591,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "encode_unicode"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
-
 [[package]]
 name = "encoding_rs"
 version = "0.8.35"
@@ -1209,19 +1175,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "insta"
-version = "1.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50259abbaa67d11d2bcafc7ba1d094ed7a0c70e3ce893f0d0997f73558cb3084"
-dependencies = [
- "console",
- "linked-hash-map",
- "once_cell",
- "pin-project",
- "similar",
-]
-
 [[package]]
 name = "is_terminal_polyfill"
 version = "1.70.1"
@@ -1276,12 +1229,6 @@ dependencies = [
  "vcpkg",
 ]
 
-[[package]]
-name = "linked-hash-map"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
-
 [[package]]
 name = "linux-raw-sys"
 version = "0.4.14"
@@ -1347,16 +1294,6 @@ version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
-[[package]]
-name = "minicov"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f27fe9f1cc3c22e1687f9446c2083c4c5fc7f0bcf1c7a86bdbded14985895b4b"
-dependencies = [
- "cc",
- "walkdir",
-]
-
 [[package]]
 name = "miniz_oxide"
 version = "0.8.0"
@@ -1522,26 +1459,6 @@ version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
-[[package]]
-name = "pin-project"
-version = "1.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677f1add503faace112b9f1373e43e9e054bfdd22ff1a63c1bc485eaec6a6a8a"
-dependencies = [
- "pin-project-internal",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "1.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.90",
-]
-
 [[package]]
 name = "pin-project-lite"
 version = "0.2.15"
@@ -1596,16 +1513,6 @@ dependencies = [
  "zerocopy 0.7.35",
 ]
 
-[[package]]
-name = "pretty_assertions"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d"
-dependencies = [
- "diff",
- "yansi",
-]
-
 [[package]]
 name = "proc-macro-error"
 version = "1.0.4"
@@ -1715,15 +1622,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "reconcile"
-version = "0.4.0"
-dependencies = [
- "insta",
- "pretty_assertions",
- "serde",
- "serde_yaml",
- "test-case",
-]
+name = "reconcile-text"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8d690c19b0bf6574cd3591d10f20df5aa52d2af95b8dcaacbc86893292ac8c5"
 
 [[package]]
 name = "redox_syscall"
@@ -1829,15 +1731,6 @@ version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
-[[package]]
-name = "same-file"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
-dependencies = [
- "winapi-util",
-]
-
 [[package]]
 name = "sanitize-filename"
 version = "0.6.0"
@@ -1847,12 +1740,6 @@ dependencies = [
  "regex",
 ]
 
-[[package]]
-name = "scoped-tls"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
-
 [[package]]
 name = "scopeguard"
 version = "1.2.0"
@@ -2012,12 +1899,6 @@ dependencies = [
  "rand_core 0.6.4",
 ]
 
-[[package]]
-name = "similar"
-version = "2.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1de1d4f81173b03af4c0cbed3c898f6bff5b870e4a7f5d6f4057d62a7a4b686e"
-
 [[package]]
 name = "slab"
 version = "0.4.9"
@@ -2311,19 +2192,6 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "sync_lib"
-version = "0.4.0"
-dependencies = [
- "base64 0.22.1",
- "console_error_panic_hook",
- "insta",
- "reconcile",
- "thiserror 2.0.12",
- "wasm-bindgen",
- "wasm-bindgen-test",
-]
-
 [[package]]
 name = "sync_server"
 version = "0.4.0"
@@ -2332,6 +2200,7 @@ dependencies = [
  "axum",
  "axum-extra",
  "axum_typed_multipart",
+ "base64 0.22.1",
  "bimap",
  "chrono",
  "clap",
@@ -2339,6 +2208,7 @@ dependencies = [
  "futures",
  "log",
  "rand 0.9.0",
+ "reconcile-text",
  "regex",
  "sanitize-filename",
  "serde",
@@ -2346,7 +2216,6 @@ dependencies = [
  "serde_with",
  "serde_yaml",
  "sqlx",
- "sync_lib",
  "thiserror 2.0.12",
  "tokio",
  "tower-http",
@@ -2395,39 +2264,6 @@ dependencies = [
  "winapi-util",
 ]
 
-[[package]]
-name = "test-case"
-version = "3.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb2550dd13afcd286853192af8601920d959b14c401fcece38071d53bf0768a8"
-dependencies = [
- "test-case-macros",
-]
-
-[[package]]
-name = "test-case-core"
-version = "3.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adcb7fd841cd518e279be3d5a3eb0636409487998a4aff22f3de87b81e88384f"
-dependencies = [
- "cfg-if",
- "proc-macro2",
- "quote",
- "syn 2.0.90",
-]
-
-[[package]]
-name = "test-case-macros"
-version = "3.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.90",
- "test-case-core",
-]
-
 [[package]]
 name = "thiserror"
 version = "1.0.69"
@@ -2845,16 +2681,6 @@ version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
-[[package]]
-name = "walkdir"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
-dependencies = [
- "same-file",
- "winapi-util",
-]
-
 [[package]]
 name = "wasi"
 version = "0.11.0+wasi-snapshot-preview1"
@@ -2901,19 +2727,6 @@ dependencies = [
  "wasm-bindgen-shared",
 ]
 
-[[package]]
-name = "wasm-bindgen-futures"
-version = "0.4.49"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38176d9b44ea84e9184eff0bc34cc167ed044f816accfe5922e54d84cf48eca2"
-dependencies = [
- "cfg-if",
- "js-sys",
- "once_cell",
- "wasm-bindgen",
- "web-sys",
-]
-
 [[package]]
 name = "wasm-bindgen-macro"
 version = "0.2.99"
@@ -2943,41 +2756,6 @@ version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6"
 
-[[package]]
-name = "wasm-bindgen-test"
-version = "0.3.49"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61d44563646eb934577f2772656c7ad5e9c90fac78aa8013d776fcdaf24625d"
-dependencies = [
- "js-sys",
- "minicov",
- "scoped-tls",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "wasm-bindgen-test-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-test-macro"
-version = "0.3.49"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54171416ce73aa0b9c377b51cc3cb542becee1cd678204812e8392e5b0e4a031"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.90",
-]
-
-[[package]]
-name = "web-sys"
-version = "0.3.76"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
 [[package]]
 name = "whoami"
 version = "1.5.2"
@@ -3203,12 +2981,6 @@ version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
 
-[[package]]
-name = "yansi"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
-
 [[package]]
 name = "yoke"
 version = "0.7.5"
diff --git a/backend/Cargo.toml b/sync-server/Cargo.toml
similarity index 60%
rename from backend/Cargo.toml
rename to sync-server/Cargo.toml
index 5fb4a5a5..5b0c8b44 100644
--- a/backend/Cargo.toml
+++ b/sync-server/Cargo.toml
@@ -1,22 +1,40 @@
-[workspace]
-resolver = "2"
-members = [
-    "reconcile",
-    "sync_server",
-    "sync_lib"
-]
-
-[workspace.package]
-rust-version = "1.83"
+[package]
+name = "sync_server"
+rust-version = "1.87.0"
 authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
 version = "0.4.0"
 
-[workspace.dependencies]
+[dependencies]
 serde = { version = "1.0.219", default-features = false, features = ["derive"] }
 thiserror = { version = "2.0.12", default-features = false  }
+tokio = { version = "1.44.2", features = ["full"]}
+uuid = { version = "1.16.0", features = ["v4", "serde"] }
+log = { version = "0.4.27" }
+anyhow =  { version = "1.0.98", features = ["backtrace"] }
+axum = { version = "0.7.4", features = ["ws", "macros", "tracing", "multipart"]}
+axum-extra = { version = "0.9.6", features = ["typed-header"] }
+axum_typed_multipart = "0.11.0"
+tower-http = { version = "0.6.1", features = ["cors", "trace", "limit", "timeout"] }
+tracing = "0.1.41"
+tracing-subscriber = { version = "0.3.19", features = ["fmt", "env-filter"]}
+sqlx = { version = "0.8.6", features = ["sqlite", "runtime-tokio", "uuid", "chrono"] }
+chrono = { version = "0.4.41", features = ["serde"] }
+rand = "0.9.0"
+sanitize-filename = "0.6.0"
+regex = "1.11.1"
+clap = { version = "4.5.38", features = ["derive"] }
+futures = "0.3.31"
+serde_yaml = "0.9.34"
+serde_json = "1.0.140"
+clap-verbosity-flag = "3.0.3"
+bimap = "0.6.3"
+ts-rs =  { version = "10.1", features = ["uuid-impl", "chrono-impl"] }
+serde_with = "3.12.0"
+base64 = "0.22.1"
+reconcile-text = "0.5.0"
 
 [profile.release]
 codegen-units = 1
@@ -24,12 +42,12 @@ lto = true
 opt-level = 3
 strip="debuginfo"  # Keep some info for better panics
 
-[workspace.lints.rust]
+[lints.rust]
 unsafe_code = "forbid"
 rust_2018_idioms = { level = "warn", priority = -1 }
 missing_debug_implementations = "warn"
 
-[workspace.lints.clippy]
+[lints.clippy]
 await_holding_lock = "warn"
 dbg_macro = "warn"
 empty_enum = "warn"
@@ -59,11 +77,6 @@ verbose_file_reads = "warn"
 
 large_stack_arrays = { level = "allow", priority = 1 } # https://github.com/rust-lang/rust-clippy/issues/13774
 
-# TODO: fix these
-cast_possible_truncation = { level = "allow", priority = 1 }
-cast_sign_loss = { level = "allow", priority = 1 }
-cast_possible_wrap = { level = "allow", priority = 1 }
-
 # Silly lints
 implicit_return = { level = "allow", priority = 1 }
 question_mark_used =  { level = "allow", priority = 1 }
diff --git a/sync-server/Dockerfile b/sync-server/Dockerfile
new file mode 100644
index 00000000..576a0f96
--- /dev/null
+++ b/sync-server/Dockerfile
@@ -0,0 +1,33 @@
+FROM rust:1.87 AS builder
+
+WORKDIR /usr/src/backend
+
+RUN apt update && apt install -y musl-tools
+RUN cargo install sqlx-cli
+
+COPY . .
+
+RUN sqlx database create --database-url sqlite://db.sqlite3
+RUN sqlx migrate run --source src/app_state/database/migrations --database-url sqlite://db.sqlite3
+
+RUN cargo build --release --target x86_64-unknown-linux-musl
+
+# Runtime image
+FROM alpine:3.22.0
+
+LABEL org.opencontainers.image.authors="andras@schmelczer.dev"
+
+RUN apk add --no-cache curl
+
+COPY --from=builder /usr/src/backend/target/x86_64-unknown-linux-musl/release /app/sync_server
+
+VOLUME /data
+EXPOSE 3000/tcp
+WORKDIR /data
+
+HEALTHCHECK \
+    --interval=30s \
+    --timeout=5s \
+    CMD curl -f http://localhost:3000/vaults/fake/ping || exit 1
+
+ENTRYPOINT ["/app/sync_server"]
diff --git a/backend/sync_server/README.md b/sync-server/README.md
similarity index 60%
rename from backend/sync_server/README.md
rename to sync-server/README.md
index 7d61209a..4576162c 100644
--- a/backend/sync_server/README.md
+++ b/sync-server/README.md
@@ -4,6 +4,6 @@
 
 ```sh
 sqlx database create --database-url sqlite://db.sqlite3
-sqlx migrate run --source sync_server/src/app_state/database/migrations --database-url sqlite://db.sqlite3
+sqlx migrate run --source src/app_state/database/migrations --database-url sqlite://db.sqlite3
 cargo sqlx prepare --workspace
 ```
diff --git a/backend/sync_server/build.rs b/sync-server/build.rs
similarity index 100%
rename from backend/sync_server/build.rs
rename to sync-server/build.rs
diff --git a/sync-server/config-e2e.yml b/sync-server/config-e2e.yml
new file mode 100644
index 00000000..5f2346d6
--- /dev/null
+++ b/sync-server/config-e2e.yml
@@ -0,0 +1,26 @@
+database:
+  databases_directory_path: databases
+  max_connections_per_vault: 12
+  cursor_timeout_seconds: 60
+server:
+  host: 0.0.0.0
+  port: 3000
+  max_body_size_mb: 512
+  max_clients_per_vault: 256
+  response_timeout_seconds: 60
+users:
+  user_configs:
+  - name: admin
+    token: test-token-change-me
+    vault_access:
+      type: allow_access_to_all
+  - name: other-admin
+    token: test-token-change-me2
+    vault_access:
+      type: allow_access_to_all
+  - name: test
+    token: other-test-token
+    vault_access:
+      type: allow_list
+      allowed:
+      - default
diff --git a/sync-server/rust-toolchain.toml b/sync-server/rust-toolchain.toml
new file mode 100644
index 00000000..0d5c6104
--- /dev/null
+++ b/sync-server/rust-toolchain.toml
@@ -0,0 +1,4 @@
+[toolchain]
+channel = "nightly-2025-06-06"
+targets = [ "x86_64-unknown-linux-gnu", "x86_64-unknown-linux-musl" ]
+profile = "default"
diff --git a/sync-server/rustfmt.toml b/sync-server/rustfmt.toml
new file mode 100644
index 00000000..6640f544
--- /dev/null
+++ b/sync-server/rustfmt.toml
@@ -0,0 +1,8 @@
+imports_granularity = "crate"
+condense_wildcard_suffixes = true
+fn_single_line = true
+format_strings = true
+reorder_impl_items = true
+group_imports = "StdExternalCrate"
+use_field_init_shorthand = true
+wrap_comments=true
diff --git a/backend/sync_server/src/app_state.rs b/sync-server/src/app_state.rs
similarity index 100%
rename from backend/sync_server/src/app_state.rs
rename to sync-server/src/app_state.rs
diff --git a/backend/sync_server/src/app_state/cursors.rs b/sync-server/src/app_state/cursors.rs
similarity index 100%
rename from backend/sync_server/src/app_state/cursors.rs
rename to sync-server/src/app_state/cursors.rs
diff --git a/backend/sync_server/src/app_state/database.rs b/sync-server/src/app_state/database.rs
similarity index 100%
rename from backend/sync_server/src/app_state/database.rs
rename to sync-server/src/app_state/database.rs
diff --git a/backend/sync_server/src/app_state/database/migrations/20241207143519_bootstrap.sql b/sync-server/src/app_state/database/migrations/20241207143519_bootstrap.sql
similarity index 100%
rename from backend/sync_server/src/app_state/database/migrations/20241207143519_bootstrap.sql
rename to sync-server/src/app_state/database/migrations/20241207143519_bootstrap.sql
diff --git a/backend/sync_server/src/app_state/database/migrations/20250522192949_add_provenance_columns.sql b/sync-server/src/app_state/database/migrations/20250522192949_add_provenance_columns.sql
similarity index 100%
rename from backend/sync_server/src/app_state/database/migrations/20250522192949_add_provenance_columns.sql
rename to sync-server/src/app_state/database/migrations/20250522192949_add_provenance_columns.sql
diff --git a/backend/sync_server/src/app_state/database/models.rs b/sync-server/src/app_state/database/models.rs
similarity index 95%
rename from backend/sync_server/src/app_state/database/models.rs
rename to sync-server/src/app_state/database/models.rs
index e995611e..7796f627 100644
--- a/backend/sync_server/src/app_state/database/models.rs
+++ b/sync-server/src/app_state/database/models.rs
@@ -1,6 +1,6 @@
+use base64::{Engine as _, engine::general_purpose::STANDARD};
 use chrono::{DateTime, Utc};
 use serde::Serialize;
-use sync_lib::bytes_to_base64;
 use ts_rs::TS;
 
 pub type VaultId = String;
@@ -80,7 +80,7 @@ impl From<StoredDocumentVersion> for DocumentVersion {
             document_id: value.document_id,
             relative_path: value.relative_path,
             updated_date: value.updated_date,
-            content_base64: bytes_to_base64(&value.content),
+            content_base64: STANDARD.encode(&value.content),
             is_deleted: value.is_deleted,
             user_id: value.user_id,
             device_id: value.device_id,
diff --git a/backend/sync_server/src/app_state/websocket.rs b/sync-server/src/app_state/websocket.rs
similarity index 100%
rename from backend/sync_server/src/app_state/websocket.rs
rename to sync-server/src/app_state/websocket.rs
diff --git a/backend/sync_server/src/app_state/websocket/broadcasts.rs b/sync-server/src/app_state/websocket/broadcasts.rs
similarity index 100%
rename from backend/sync_server/src/app_state/websocket/broadcasts.rs
rename to sync-server/src/app_state/websocket/broadcasts.rs
diff --git a/backend/sync_server/src/app_state/websocket/models.rs b/sync-server/src/app_state/websocket/models.rs
similarity index 100%
rename from backend/sync_server/src/app_state/websocket/models.rs
rename to sync-server/src/app_state/websocket/models.rs
diff --git a/backend/sync_server/src/app_state/websocket/utils.rs b/sync-server/src/app_state/websocket/utils.rs
similarity index 100%
rename from backend/sync_server/src/app_state/websocket/utils.rs
rename to sync-server/src/app_state/websocket/utils.rs
diff --git a/backend/sync_server/src/cli.rs b/sync-server/src/cli.rs
similarity index 100%
rename from backend/sync_server/src/cli.rs
rename to sync-server/src/cli.rs
diff --git a/backend/sync_server/src/cli/args.rs b/sync-server/src/cli/args.rs
similarity index 100%
rename from backend/sync_server/src/cli/args.rs
rename to sync-server/src/cli/args.rs
diff --git a/backend/sync_server/src/cli/color_when.rs b/sync-server/src/cli/color_when.rs
similarity index 100%
rename from backend/sync_server/src/cli/color_when.rs
rename to sync-server/src/cli/color_when.rs
diff --git a/backend/sync_server/src/config.rs b/sync-server/src/config.rs
similarity index 100%
rename from backend/sync_server/src/config.rs
rename to sync-server/src/config.rs
diff --git a/backend/sync_server/src/config/database_config.rs b/sync-server/src/config/database_config.rs
similarity index 100%
rename from backend/sync_server/src/config/database_config.rs
rename to sync-server/src/config/database_config.rs
diff --git a/backend/sync_server/src/config/server_config.rs b/sync-server/src/config/server_config.rs
similarity index 100%
rename from backend/sync_server/src/config/server_config.rs
rename to sync-server/src/config/server_config.rs
diff --git a/backend/sync_server/src/config/user_config.rs b/sync-server/src/config/user_config.rs
similarity index 100%
rename from backend/sync_server/src/config/user_config.rs
rename to sync-server/src/config/user_config.rs
diff --git a/backend/sync_server/src/consts.rs b/sync-server/src/consts.rs
similarity index 100%
rename from backend/sync_server/src/consts.rs
rename to sync-server/src/consts.rs
diff --git a/backend/sync_server/src/errors.rs b/sync-server/src/errors.rs
similarity index 100%
rename from backend/sync_server/src/errors.rs
rename to sync-server/src/errors.rs
diff --git a/backend/sync_server/src/main.rs b/sync-server/src/main.rs
similarity index 100%
rename from backend/sync_server/src/main.rs
rename to sync-server/src/main.rs
diff --git a/backend/sync_server/src/server.rs b/sync-server/src/server.rs
similarity index 100%
rename from backend/sync_server/src/server.rs
rename to sync-server/src/server.rs
diff --git a/backend/sync_server/src/server/assets/index.html b/sync-server/src/server/assets/index.html
similarity index 100%
rename from backend/sync_server/src/server/assets/index.html
rename to sync-server/src/server/assets/index.html
diff --git a/backend/sync_server/src/server/auth.rs b/sync-server/src/server/auth.rs
similarity index 100%
rename from backend/sync_server/src/server/auth.rs
rename to sync-server/src/server/auth.rs
diff --git a/backend/sync_server/src/server/create_document.rs b/sync-server/src/server/create_document.rs
similarity index 100%
rename from backend/sync_server/src/server/create_document.rs
rename to sync-server/src/server/create_document.rs
diff --git a/backend/sync_server/src/server/delete_document.rs b/sync-server/src/server/delete_document.rs
similarity index 100%
rename from backend/sync_server/src/server/delete_document.rs
rename to sync-server/src/server/delete_document.rs
diff --git a/backend/sync_server/src/server/device_id_header.rs b/sync-server/src/server/device_id_header.rs
similarity index 100%
rename from backend/sync_server/src/server/device_id_header.rs
rename to sync-server/src/server/device_id_header.rs
diff --git a/backend/sync_server/src/server/fetch_document_version.rs b/sync-server/src/server/fetch_document_version.rs
similarity index 100%
rename from backend/sync_server/src/server/fetch_document_version.rs
rename to sync-server/src/server/fetch_document_version.rs
diff --git a/backend/sync_server/src/server/fetch_document_version_content.rs b/sync-server/src/server/fetch_document_version_content.rs
similarity index 100%
rename from backend/sync_server/src/server/fetch_document_version_content.rs
rename to sync-server/src/server/fetch_document_version_content.rs
diff --git a/backend/sync_server/src/server/fetch_latest_document_version.rs b/sync-server/src/server/fetch_latest_document_version.rs
similarity index 100%
rename from backend/sync_server/src/server/fetch_latest_document_version.rs
rename to sync-server/src/server/fetch_latest_document_version.rs
diff --git a/backend/sync_server/src/server/fetch_latest_documents.rs b/sync-server/src/server/fetch_latest_documents.rs
similarity index 100%
rename from backend/sync_server/src/server/fetch_latest_documents.rs
rename to sync-server/src/server/fetch_latest_documents.rs
diff --git a/backend/sync_server/src/server/index.rs b/sync-server/src/server/index.rs
similarity index 100%
rename from backend/sync_server/src/server/index.rs
rename to sync-server/src/server/index.rs
diff --git a/backend/sync_server/src/server/ping.rs b/sync-server/src/server/ping.rs
similarity index 100%
rename from backend/sync_server/src/server/ping.rs
rename to sync-server/src/server/ping.rs
diff --git a/backend/sync_server/src/server/requests.rs b/sync-server/src/server/requests.rs
similarity index 100%
rename from backend/sync_server/src/server/requests.rs
rename to sync-server/src/server/requests.rs
diff --git a/backend/sync_server/src/server/responses.rs b/sync-server/src/server/responses.rs
similarity index 100%
rename from backend/sync_server/src/server/responses.rs
rename to sync-server/src/server/responses.rs
diff --git a/backend/sync_server/src/server/update_document.rs b/sync-server/src/server/update_document.rs
similarity index 84%
rename from backend/sync_server/src/server/update_document.rs
rename to sync-server/src/server/update_document.rs
index a3ab25e1..99d3f490 100644
--- a/backend/sync_server/src/server/update_document.rs
+++ b/sync-server/src/server/update_document.rs
@@ -6,8 +6,8 @@ use axum::{
 use axum_extra::TypedHeader;
 use axum_typed_multipart::TypedMultipart;
 use log::info;
+use reconcile_text::{BuiltinTokenizer, is_binary, reconcile};
 use serde::Deserialize;
-use sync_lib::{is_file_type_mergable, merge};
 
 use super::{
     device_id_header::DeviceIdHeader, requests::UpdateDocumentVersion,
@@ -20,7 +20,10 @@ use crate::{
     },
     config::user_config::User,
     errors::{SyncServerError, not_found_error, server_error},
-    utils::{dedup_paths::dedup_paths, normalize::normalize, sanitize_path::sanitize_path},
+    utils::{
+        dedup_paths::dedup_paths, is_file_type_mergable::is_file_type_mergable,
+        normalize::normalize, sanitize_path::sanitize_path,
+    },
 };
 
 #[derive(Deserialize)]
@@ -117,8 +120,25 @@ pub async fn update_document(
         )));
     }
 
-    let merged_content = if is_file_type_mergable(&sanitized_relative_path) {
-        merge(&parent_document.content, &latest_version.content, &content)
+    let merged_content = if is_file_type_mergable(&sanitized_relative_path)
+        && !is_binary(&parent_document.content)
+        && !is_binary(&latest_version.content)
+        && !is_binary(&content)
+    {
+        reconcile(
+            str::from_utf8(&parent_document.content)
+                .expect("parent must be valid UTF-8 because it's not binary"),
+            &str::from_utf8(&latest_version.content)
+                .expect("latest_version must be valid UTF-8 because it's not binary")
+                .into(),
+            &str::from_utf8(&content)
+                .expect("content must be valid UTF-8 because it's not binary")
+                .into(),
+            &*BuiltinTokenizer::Word,
+        )
+        .apply()
+        .text()
+        .into_bytes()
     } else {
         content.clone()
     };
diff --git a/backend/sync_server/src/server/websocket.rs b/sync-server/src/server/websocket.rs
similarity index 100%
rename from backend/sync_server/src/server/websocket.rs
rename to sync-server/src/server/websocket.rs
diff --git a/backend/sync_server/src/utils.rs b/sync-server/src/utils.rs
similarity index 67%
rename from backend/sync_server/src/utils.rs
rename to sync-server/src/utils.rs
index 870f4ae5..010524de 100644
--- a/backend/sync_server/src/utils.rs
+++ b/sync-server/src/utils.rs
@@ -1,3 +1,4 @@
 pub mod dedup_paths;
+pub mod is_file_type_mergable;
 pub mod normalize;
 pub mod sanitize_path;
diff --git a/backend/sync_server/src/utils/dedup_paths.rs b/sync-server/src/utils/dedup_paths.rs
similarity index 100%
rename from backend/sync_server/src/utils/dedup_paths.rs
rename to sync-server/src/utils/dedup_paths.rs
diff --git a/sync-server/src/utils/is_file_type_mergable.rs b/sync-server/src/utils/is_file_type_mergable.rs
new file mode 100644
index 00000000..fba4b323
--- /dev/null
+++ b/sync-server/src/utils/is_file_type_mergable.rs
@@ -0,0 +1,23 @@
+pub fn is_file_type_mergable(path_or_file_name: &str) -> bool {
+    let file_extension = path_or_file_name.split('.').next_back().unwrap_or_default();
+
+    matches!(file_extension.to_lowercase().as_str(), "md" | "txt")
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_is_file_type_mergable() {
+        assert!(is_file_type_mergable(".md"));
+        assert!(is_file_type_mergable("hi.md"));
+        assert!(is_file_type_mergable("my/path/to/my/document.md"));
+        assert!(is_file_type_mergable("hi.MD"));
+        assert!(is_file_type_mergable("my/path/to/my/DOCUMENT.MD"));
+
+        assert!(!is_file_type_mergable(".json"));
+        assert!(!is_file_type_mergable("HELLO.JSON"));
+        assert!(!is_file_type_mergable("my/config.yml"));
+    }
+}
diff --git a/backend/sync_server/src/utils/normalize.rs b/sync-server/src/utils/normalize.rs
similarity index 100%
rename from backend/sync_server/src/utils/normalize.rs
rename to sync-server/src/utils/normalize.rs
diff --git a/backend/sync_server/src/utils/sanitize_path.rs b/sync-server/src/utils/sanitize_path.rs
similarity index 100%
rename from backend/sync_server/src/utils/sanitize_path.rs
rename to sync-server/src/utils/sanitize_path.rs

From 019858917eae648ec388c442df28898b3f78f292 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 13 Jul 2025 11:07:52 +0100
Subject: [PATCH 526/761] Fix script

---
 scripts/bump-version.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/bump-version.sh b/scripts/bump-version.sh
index 60f9391e..57a78fd6 100755
--- a/scripts/bump-version.sh
+++ b/scripts/bump-version.sh
@@ -29,6 +29,7 @@ cargo set-version --bump $1
 echo "Bumping frontend versions"
 cd ../frontend
 npm version $1 --workspaces
+cd ..
 
 cp frontend/obsidian-plugin/manifest.json manifest.json  # for BRAT, otherwise it wouldn't update
 

From 700903647efb389d617817153d524b63108755d3 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 13 Jul 2025 11:07:55 +0100
Subject: [PATCH 527/761] Bump versions to 0.5.0

---
 frontend/obsidian-plugin/manifest.json | 2 +-
 frontend/obsidian-plugin/package.json  | 2 +-
 frontend/package-lock.json             | 6 +++---
 frontend/sync-client/package.json      | 4 ++--
 frontend/test-client/package.json      | 2 +-
 manifest.json                          | 2 +-
 sync-server/Cargo.lock                 | 2 +-
 sync-server/Cargo.toml                 | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/frontend/obsidian-plugin/manifest.json b/frontend/obsidian-plugin/manifest.json
index 5834f714..d1a50232 100644
--- a/frontend/obsidian-plugin/manifest.json
+++ b/frontend/obsidian-plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.4.0",
+	"version": "0.5.0",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index fdfb14df..e7b18a35 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -1,6 +1,6 @@
 {
     "name": "vault-link-obsidian-plugin",
-    "version": "0.4.0",
+    "version": "0.5.0",
     "description": "This is a sample plugin for Obsidian (https://obsidian.md)",
     "main": "main.js",
     "scripts": {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 7abb5162..549f88e6 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -6361,7 +6361,7 @@
 		},
 		"obsidian-plugin": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.4.0",
+			"version": "0.5.0",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
@@ -6389,7 +6389,7 @@
 			}
 		},
 		"sync-client": {
-			"version": "0.4.0",
+			"version": "0.5.0",
 			"dependencies": {
 				"byte-base64": "^1.1.0",
 				"minimatch": "^10.0.1",
@@ -6432,7 +6432,7 @@
 			}
 		},
 		"test-client": {
-			"version": "0.4.0",
+			"version": "0.5.0",
 			"bin": {
 				"test-client": "dist/cli.js"
 			},
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index 8128d4de..7231c099 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "sync-client",
-    "version": "0.4.0",
+    "version": "0.5.0",
     "main": "dist/sync-client.node.js",
     "browser": "dist/sync-client.web.js",
     "types": "dist/types/index.d.ts",
@@ -32,4 +32,4 @@
         "webpack-merge": "^6.0.1",
         "ws": "^8.18.2"
     }
-}
\ No newline at end of file
+}
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index c95328b7..096b82af 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "test-client",
-    "version": "0.4.0",
+    "version": "0.5.0",
     "private": true,
     "bin": {
         "test-client": "./dist/cli.js"
diff --git a/manifest.json b/manifest.json
index 5834f714..d1a50232 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.4.0",
+	"version": "0.5.0",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/sync-server/Cargo.lock b/sync-server/Cargo.lock
index c6f607be..ef7d3e6c 100644
--- a/sync-server/Cargo.lock
+++ b/sync-server/Cargo.lock
@@ -2194,7 +2194,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.4.0"
+version = "0.5.0"
 dependencies = [
  "anyhow",
  "axum",
diff --git a/sync-server/Cargo.toml b/sync-server/Cargo.toml
index 5b0c8b44..0d328cb9 100644
--- a/sync-server/Cargo.toml
+++ b/sync-server/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.4.0"
+version = "0.5.0"
 
 [dependencies]
 serde = { version = "1.0.219", default-features = false, features = ["derive"] }

From 49dcc229825e78e3c816d67023c7267e8c5c6a94 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 13 Jul 2025 11:51:15 +0100
Subject: [PATCH 528/761] Remove clutter

---
 backend/Dockerfile          | 33 ---------------------------------
 backend/config-e2e.yml      | 26 --------------------------
 backend/rust-toolchain.toml |  4 ----
 backend/rustfmt.toml        |  8 --------
 4 files changed, 71 deletions(-)
 delete mode 100644 backend/Dockerfile
 delete mode 100644 backend/config-e2e.yml
 delete mode 100644 backend/rust-toolchain.toml
 delete mode 100644 backend/rustfmt.toml

diff --git a/backend/Dockerfile b/backend/Dockerfile
deleted file mode 100644
index a5b2f9a5..00000000
--- a/backend/Dockerfile
+++ /dev/null
@@ -1,33 +0,0 @@
-FROM rust:1.87 AS builder
-
-WORKDIR /usr/src/backend
-
-RUN apt update && apt install -y musl-tools
-RUN cargo install sqlx-cli
-
-COPY . .
-
-RUN sqlx database create --database-url sqlite://db.sqlite3
-RUN sqlx migrate run --source sync-server/src/app_state/database/migrations --database-url sqlite://db.sqlite3
-
-RUN cargo build --release --target x86_64-unknown-linux-musl
-
-# Runtime image
-FROM alpine:3.22.0
-
-LABEL org.opencontainers.image.authors="andras@schmelczer.dev"
-
-RUN apk add --no-cache curl
-
-COPY --from=builder /usr/src/backend/target/x86_64-unknown-linux-musl/release/sync_server /app/sync_server
-
-VOLUME /data
-EXPOSE 3000/tcp
-WORKDIR /data
-
-HEALTHCHECK \
-    --interval=30s \
-    --timeout=5s \
-    CMD curl -f http://localhost:3000/vaults/fake/ping || exit 1
-
-ENTRYPOINT ["/app/sync_server"]
diff --git a/backend/config-e2e.yml b/backend/config-e2e.yml
deleted file mode 100644
index 5f2346d6..00000000
--- a/backend/config-e2e.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-database:
-  databases_directory_path: databases
-  max_connections_per_vault: 12
-  cursor_timeout_seconds: 60
-server:
-  host: 0.0.0.0
-  port: 3000
-  max_body_size_mb: 512
-  max_clients_per_vault: 256
-  response_timeout_seconds: 60
-users:
-  user_configs:
-  - name: admin
-    token: test-token-change-me
-    vault_access:
-      type: allow_access_to_all
-  - name: other-admin
-    token: test-token-change-me2
-    vault_access:
-      type: allow_access_to_all
-  - name: test
-    token: other-test-token
-    vault_access:
-      type: allow_list
-      allowed:
-      - default
diff --git a/backend/rust-toolchain.toml b/backend/rust-toolchain.toml
deleted file mode 100644
index 0d5c6104..00000000
--- a/backend/rust-toolchain.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-[toolchain]
-channel = "nightly-2025-06-06"
-targets = [ "x86_64-unknown-linux-gnu", "x86_64-unknown-linux-musl" ]
-profile = "default"
diff --git a/backend/rustfmt.toml b/backend/rustfmt.toml
deleted file mode 100644
index 6640f544..00000000
--- a/backend/rustfmt.toml
+++ /dev/null
@@ -1,8 +0,0 @@
-imports_granularity = "crate"
-condense_wildcard_suffixes = true
-fn_single_line = true
-format_strings = true
-reorder_impl_items = true
-group_imports = "StdExternalCrate"
-use_field_init_shorthand = true
-wrap_comments=true

From e8a719f844a08c24500bac3dcc2581d0c159d626 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 13 Jul 2025 11:51:20 +0100
Subject: [PATCH 529/761] Fix docker

---
 sync-server/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sync-server/Dockerfile b/sync-server/Dockerfile
index 576a0f96..e729c2bf 100644
--- a/sync-server/Dockerfile
+++ b/sync-server/Dockerfile
@@ -19,7 +19,7 @@ LABEL org.opencontainers.image.authors="andras@schmelczer.dev"
 
 RUN apk add --no-cache curl
 
-COPY --from=builder /usr/src/backend/target/x86_64-unknown-linux-musl/release /app/sync_server
+COPY --from=builder /usr/src/backend/target/x86_64-unknown-linux-musl/release/sync_server /app/sync_server
 
 VOLUME /data
 EXPOSE 3000/tcp

From 396d07be6607df5b1625aefa8af5e32ee59f9266 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 13 Jul 2025 11:51:26 +0100
Subject: [PATCH 530/761] Bump versions to 0.5.1

---
 frontend/obsidian-plugin/manifest.json | 2 +-
 frontend/obsidian-plugin/package.json  | 2 +-
 frontend/package-lock.json             | 6 +++---
 frontend/sync-client/package.json      | 2 +-
 frontend/test-client/package.json      | 2 +-
 manifest.json                          | 2 +-
 sync-server/Cargo.lock                 | 2 +-
 sync-server/Cargo.toml                 | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/frontend/obsidian-plugin/manifest.json b/frontend/obsidian-plugin/manifest.json
index d1a50232..42ebe6da 100644
--- a/frontend/obsidian-plugin/manifest.json
+++ b/frontend/obsidian-plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.5.0",
+	"version": "0.5.1",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index e7b18a35..24a95e03 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -1,6 +1,6 @@
 {
     "name": "vault-link-obsidian-plugin",
-    "version": "0.5.0",
+    "version": "0.5.1",
     "description": "This is a sample plugin for Obsidian (https://obsidian.md)",
     "main": "main.js",
     "scripts": {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 549f88e6..36221400 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -6361,7 +6361,7 @@
 		},
 		"obsidian-plugin": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.5.0",
+			"version": "0.5.1",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
@@ -6389,7 +6389,7 @@
 			}
 		},
 		"sync-client": {
-			"version": "0.5.0",
+			"version": "0.5.1",
 			"dependencies": {
 				"byte-base64": "^1.1.0",
 				"minimatch": "^10.0.1",
@@ -6432,7 +6432,7 @@
 			}
 		},
 		"test-client": {
-			"version": "0.5.0",
+			"version": "0.5.1",
 			"bin": {
 				"test-client": "dist/cli.js"
 			},
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index 7231c099..f80fb672 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "sync-client",
-    "version": "0.5.0",
+    "version": "0.5.1",
     "main": "dist/sync-client.node.js",
     "browser": "dist/sync-client.web.js",
     "types": "dist/types/index.d.ts",
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index 096b82af..f0d4d533 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "test-client",
-    "version": "0.5.0",
+    "version": "0.5.1",
     "private": true,
     "bin": {
         "test-client": "./dist/cli.js"
diff --git a/manifest.json b/manifest.json
index d1a50232..42ebe6da 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.5.0",
+	"version": "0.5.1",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/sync-server/Cargo.lock b/sync-server/Cargo.lock
index ef7d3e6c..6080baf4 100644
--- a/sync-server/Cargo.lock
+++ b/sync-server/Cargo.lock
@@ -2194,7 +2194,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.5.0"
+version = "0.5.1"
 dependencies = [
  "anyhow",
  "axum",
diff --git a/sync-server/Cargo.toml b/sync-server/Cargo.toml
index 0d328cb9..94539a48 100644
--- a/sync-server/Cargo.toml
+++ b/sync-server/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.5.0"
+version = "0.5.1"
 
 [dependencies]
 serde = { version = "1.0.219", default-features = false, features = ["derive"] }

From b56e8f6c15bb51226a0fb76e0f057eb88dc96a4c Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 10 Aug 2025 12:59:14 +0100
Subject: [PATCH 531/761] Rename

---
 .../{register-console-for-logging.ts => log-to-console.ts}    | 2 +-
 frontend/obsidian-plugin/src/vault-link-plugin.ts             | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename frontend/obsidian-plugin/src/utils/{register-console-for-logging.ts => log-to-console.ts} (88%)

diff --git a/frontend/obsidian-plugin/src/utils/register-console-for-logging.ts b/frontend/obsidian-plugin/src/utils/log-to-console.ts
similarity index 88%
rename from frontend/obsidian-plugin/src/utils/register-console-for-logging.ts
rename to frontend/obsidian-plugin/src/utils/log-to-console.ts
index e898f380..2579f6a5 100644
--- a/frontend/obsidian-plugin/src/utils/register-console-for-logging.ts
+++ b/frontend/obsidian-plugin/src/utils/log-to-console.ts
@@ -1,7 +1,7 @@
 import type { LogLine, SyncClient } from "sync-client";
 import { LogLevel } from "sync-client";
 
-export function registerConsoleForLogging(client: SyncClient): void {
+export function logToConsole(client: SyncClient): void {
 	client.logger.addOnMessageListener((logLine: LogLine) => {
 		const formatted = `${logLine.timestamp.toISOString()} ${logLine.level} ${logLine.message}`;
 
diff --git a/frontend/obsidian-plugin/src/vault-link-plugin.ts b/frontend/obsidian-plugin/src/vault-link-plugin.ts
index c013e8f7..6e8e4cf7 100644
--- a/frontend/obsidian-plugin/src/vault-link-plugin.ts
+++ b/frontend/obsidian-plugin/src/vault-link-plugin.ts
@@ -14,7 +14,7 @@ import { StatusDescription } from "./views/status-description/status-description
 import { SyncClient, rateLimit, DEFAULT_SETTINGS } from "sync-client";
 import { ObsidianFileSystemOperations } from "./obsidian-file-system";
 import { SyncSettingsTab } from "./views/settings/settings-tab";
-import { registerConsoleForLogging } from "./utils/register-console-for-logging";
+import { logToConsole } from "./utils/log-to-console";
 import { updateEditorStatusDisplay } from "./views/editor-sync-line/editor-sync-line";
 import { remoteCursorsTheme } from "./views/cursors/remote-cursor-theme";
 import {
@@ -53,7 +53,7 @@ export default class VaultLinkPlugin extends Plugin {
 			nativeLineEndings: Platform.isWin ? "\r\n" : "\n"
 		});
 
-		registerConsoleForLogging(this.client);
+		logToConsole(this.client);
 
 		const statusDescription = new StatusDescription(this.client);
 

From d9ffcfeb5c607f821b78fdc4eb95d603a12ba1fb Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 10 Aug 2025 12:59:33 +0100
Subject: [PATCH 532/761] Expose locks utils

---
 frontend/sync-client/src/index.ts       |  5 +++
 frontend/sync-client/src/utils/locks.ts | 42 ++++++++++++++++++++++---
 2 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/frontend/sync-client/src/index.ts b/frontend/sync-client/src/index.ts
index e984794d..4a5f5d1e 100644
--- a/frontend/sync-client/src/index.ts
+++ b/frontend/sync-client/src/index.ts
@@ -20,3 +20,8 @@ export type { ClientCursors } from "./services/types/ClientCursors";
 export type { NetworkConnectionStatus } from "./types/network-connection-status";
 export { DocumentUpdateStatus } from "./types/document-update-status";
 export { SyncClient } from "./sync-client";
+
+import { Locks } from "./utils/locks";
+export const helpers = {
+	Locks
+};
diff --git a/frontend/sync-client/src/utils/locks.ts b/frontend/sync-client/src/utils/locks.ts
index 7e75bd3d..8e52cba0 100644
--- a/frontend/sync-client/src/utils/locks.ts
+++ b/frontend/sync-client/src/utils/locks.ts
@@ -1,14 +1,27 @@
 import type { Logger } from "../tracing/logger";
 
-// Manages locks on T to prevent concurrent modifications
-// allowing the client's FileOperations implementation to be simpler.
-// Locks are granted in a first-in-first-out order.
+/**
+ * Manages exclusive locks on items to prevent concurrent modifications.
+ * Locks are granted in FIFO order.
+ *
+ * @template T The type of the key used for locking
+ */
 export class Locks<T> {
+	/** Currently locked keys */
 	private readonly locked = new Set<T>();
+
+	/** Queue of resolve functions waiting for each key */
 	private readonly waiters = new Map<T, (() => unknown)[]>();
 
 	public constructor(private readonly logger: Logger) {}
 
+	/**
+	 * Attempts to acquire a lock immediately without waiting.
+	 * Must call `unlock()` if successful.
+	 *
+	 * @param key The key to lock
+	 * @returns `true` if lock acquired, `false` if already locked
+	 */
 	public tryLock(key: T): boolean {
 		if (this.locked.has(key)) {
 			return false;
@@ -19,6 +32,13 @@ export class Locks<T> {
 		return true;
 	}
 
+	/**
+	 * Waits to acquire a lock, blocking until available.
+	 * Operations are queued in FIFO order. Must call `unlock()` when done.
+	 *
+	 * @param key The key to wait for and lock
+	 * @returns Promise that resolves when lock is acquired
+	 */
 	public async waitForLock(key: T): Promise<void> {
 		if (this.tryLock(key)) {
 			return Promise.resolve();
@@ -27,6 +47,7 @@ export class Locks<T> {
 		this.logger.debug(`Waiting for lock on ${key}`);
 
 		return new Promise((resolve) => {
+			// DefaultDict behavior
 			let waiting = this.waiters.get(key);
 			if (!waiting) {
 				waiting = [];
@@ -37,12 +58,19 @@ export class Locks<T> {
 		});
 	}
 
+	/**
+	 * Releases a lock and grants access to the next waiting operation in FIFO order.
+	 * Removes the key from locked set if no waiters.
+	 *
+	 * @param key The key to unlock
+	 * @throws {Error} If key is not currently locked
+	 */
 	public unlock(key: T): void {
 		if (!this.locked.has(key)) {
-			throw new Error(`Document ${key} is not locked, cannot unlock`);
+			throw new Error(`Key ${key} is not locked, cannot unlock`);
 		}
 
-		// Remove the first element to ensure FIFO unblocking order
+		// Remove first waiter to ensure FIFO order
 		const nextWaiting = this.waiters.get(key)?.shift();
 
 		if (nextWaiting) {
@@ -53,6 +81,10 @@ export class Locks<T> {
 		}
 	}
 
+	/**
+	 * Clears all locks and waiters. Causes waiting operations to hang indefinitely.
+	 * Use with caution.
+	 */
 	public reset(): void {
 		this.locked.clear();
 		this.waiters.clear();

From bb07602c689c22242cfb4f5bd4aea29d1b6ffc7e Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 10 Aug 2025 14:55:40 +0100
Subject: [PATCH 533/761] Send document versions with cursors

---
 .../src/services/types/ClientCursors.ts       |  4 +--
 .../types/CursorPositionFromClient.ts         |  4 +--
 .../src/services/types/DocumentWithCursors.ts |  9 ++++++
 scripts/update-api-types.sh                   |  4 +++
 sync-server/src/app_state/cursors.rs          |  8 +++--
 sync-server/src/app_state/websocket/models.rs | 30 ++++++++++++-------
 sync-server/src/server/websocket.rs           |  2 +-
 7 files changed, 43 insertions(+), 18 deletions(-)
 create mode 100644 frontend/sync-client/src/services/types/DocumentWithCursors.ts

diff --git a/frontend/sync-client/src/services/types/ClientCursors.ts b/frontend/sync-client/src/services/types/ClientCursors.ts
index 9bf8739f..65da35e3 100644
--- a/frontend/sync-client/src/services/types/ClientCursors.ts
+++ b/frontend/sync-client/src/services/types/ClientCursors.ts
@@ -1,8 +1,8 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { CursorSpan } from "./CursorSpan";
+import type { DocumentWithCursors } from "./DocumentWithCursors";
 
 export interface ClientCursors {
 	userName: string;
 	deviceId: string;
-	cursors: Partial<Record<string, CursorSpan[]>>;
+	cursors: DocumentWithCursors[];
 }
diff --git a/frontend/sync-client/src/services/types/CursorPositionFromClient.ts b/frontend/sync-client/src/services/types/CursorPositionFromClient.ts
index d33c0c8e..ca940e3e 100644
--- a/frontend/sync-client/src/services/types/CursorPositionFromClient.ts
+++ b/frontend/sync-client/src/services/types/CursorPositionFromClient.ts
@@ -1,6 +1,6 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { CursorSpan } from "./CursorSpan";
+import type { DocumentWithCursors } from "./DocumentWithCursors";
 
 export interface CursorPositionFromClient {
-	documentToCursors: Partial<Record<string, CursorSpan[]>>;
+	documentsWithCursors: DocumentWithCursors[];
 }
diff --git a/frontend/sync-client/src/services/types/DocumentWithCursors.ts b/frontend/sync-client/src/services/types/DocumentWithCursors.ts
new file mode 100644
index 00000000..cbe56399
--- /dev/null
+++ b/frontend/sync-client/src/services/types/DocumentWithCursors.ts
@@ -0,0 +1,9 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { CursorSpan } from "./CursorSpan";
+
+export interface DocumentWithCursors {
+	vault_update_id: number;
+	document_id: string;
+	relative_path: string;
+	cursors: CursorSpan[];
+}
diff --git a/scripts/update-api-types.sh b/scripts/update-api-types.sh
index 7aa8238c..5aa05d99 100755
--- a/scripts/update-api-types.sh
+++ b/scripts/update-api-types.sh
@@ -9,3 +9,7 @@ cargo test export_bindings
 cd -
 
 cp -r sync-server/bindings/* frontend/sync-client/src/services/types/
+
+cd frontend
+npm run lint || npx prettier --write sync-client/src/services/types/*.ts
+cd -
diff --git a/sync-server/src/app_state/cursors.rs b/sync-server/src/app_state/cursors.rs
index 245109c2..14bfb020 100644
--- a/sync-server/src/app_state/cursors.rs
+++ b/sync-server/src/app_state/cursors.rs
@@ -8,12 +8,14 @@ use super::{
     websocket::{
         broadcasts::Broadcasts,
         models::{
-            ClientCursors, CursorPositionFromServer, CursorSpan, WebSocketServerMessage,
+            ClientCursors, CursorPositionFromServer, WebSocketServerMessage,
             WebSocketServerMessageWithOrigin,
         },
     },
 };
-use crate::config::database_config::DatabaseConfig;
+use crate::{
+    app_state::websocket::models::DocumentWithCursors, config::database_config::DatabaseConfig,
+};
 
 #[derive(Clone, Debug)]
 pub struct Cursors {
@@ -36,7 +38,7 @@ impl Cursors {
         vault_id: VaultId,
         user_name: String,
         device_id: &DeviceId,
-        document_to_cursors: HashMap<String, Vec<CursorSpan>>,
+        document_to_cursors: Vec<DocumentWithCursors>,
     ) {
         let mut vault_to_cursors = self.vault_to_cursors.lock().await;
 
diff --git a/sync-server/src/app_state/websocket/models.rs b/sync-server/src/app_state/websocket/models.rs
index 6bb4f4e1..fca0dfb7 100644
--- a/sync-server/src/app_state/websocket/models.rs
+++ b/sync-server/src/app_state/websocket/models.rs
@@ -1,9 +1,9 @@
-use std::collections::HashMap;
-
 use serde::{Deserialize, Serialize};
 use ts_rs::TS;
 
-use crate::app_state::database::models::{DeviceId, DocumentVersionWithoutContent, VaultUpdateId};
+use crate::app_state::database::models::{
+    DeviceId, DocumentId, DocumentVersionWithoutContent, VaultUpdateId,
+};
 
 #[derive(TS, Deserialize, Clone, Debug)]
 #[serde(rename_all = "camelCase")]
@@ -15,6 +15,22 @@ pub struct WebSocketHandshake {
     pub last_seen_vault_update_id: Option<VaultUpdateId>,
 }
 
+#[derive(TS, Deserialize, Clone, Debug)]
+#[serde(rename_all = "camelCase")]
+pub struct CursorPositionFromClient {
+    pub documents_with_cursors: Vec<DocumentWithCursors>,
+}
+
+#[derive(TS, Serialize, Deserialize, Clone, Debug)]
+pub struct DocumentWithCursors {
+    #[ts(as = "u32")]
+    pub vault_update_id: VaultUpdateId,
+
+    pub document_id: DocumentId,
+    pub relative_path: String,
+    pub cursors: Vec<CursorSpan>,
+}
+
 #[derive(TS, Serialize, Deserialize, Clone, Debug)]
 #[serde(rename_all = "camelCase")]
 pub struct CursorSpan {
@@ -22,18 +38,12 @@ pub struct CursorSpan {
     pub end: usize,
 }
 
-#[derive(TS, Deserialize, Clone, Debug)]
-#[serde(rename_all = "camelCase")]
-pub struct CursorPositionFromClient {
-    pub document_to_cursors: HashMap<String, Vec<CursorSpan>>,
-}
-
 #[derive(TS, Serialize, Clone, Debug)]
 #[serde(rename_all = "camelCase")]
 pub struct ClientCursors {
     pub user_name: String,
     pub device_id: DeviceId,
-    pub cursors: HashMap<String, Vec<CursorSpan>>,
+    pub cursors: Vec<DocumentWithCursors>,
 }
 
 #[derive(TS, Serialize, Clone, Debug)]
diff --git a/sync-server/src/server/websocket.rs b/sync-server/src/server/websocket.rs
index e9dd8867..0e4f705f 100644
--- a/sync-server/src/server/websocket.rs
+++ b/sync-server/src/server/websocket.rs
@@ -133,7 +133,7 @@ async fn websocket(
                             vault_id_clone.clone(),
                             authed_handshake.user.name.clone(),
                             &device_id,
-                            cursors.document_to_cursors,
+                            cursors.documents_with_cursors,
                         )
                         .await;
                 }

From 6da107ff3a19c65475b8e0fa3b9cf4b3bd6067a3 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 10 Aug 2025 22:20:46 +0100
Subject: [PATCH 534/761] Fix flaky websocket

---
 frontend/test-client/src/agent/mock-agent.ts  |  7 +++--
 .../test-client/src/utils/flaky-websocket.ts  | 26 ++++++++++++++-----
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/frontend/test-client/src/agent/mock-agent.ts b/frontend/test-client/src/agent/mock-agent.ts
index 35dfe132..160a782e 100644
--- a/frontend/test-client/src/agent/mock-agent.ts
+++ b/frontend/test-client/src/agent/mock-agent.ts
@@ -2,7 +2,7 @@ import { choose } from "../utils/choose";
 import { v4 as uuidv4 } from "uuid";
 import { assert } from "../utils/assert";
 import type { RelativePath, SyncSettings } from "sync-client";
-import { LogLevel } from "sync-client";
+import { Logger, LogLevel } from "sync-client";
 import { MockClient } from "./mock-client";
 import { sleep } from "../utils/sleep";
 import type { LogLine } from "sync-client/dist/types/tracing/logger";
@@ -29,7 +29,10 @@ export class MockAgent extends MockClient {
 	public async init(): Promise<void> {
 		await super.init(
 			flakyFetchFactory(this.jitterScaleInSeconds),
-			flakyWebSocketFactory(this.jitterScaleInSeconds)
+			flakyWebSocketFactory(
+				this.jitterScaleInSeconds,
+				new Logger() // this logger isn't wired anywhere, so messages to it will be ignored
+			)
 		);
 
 		assert(
diff --git a/frontend/test-client/src/utils/flaky-websocket.ts b/frontend/test-client/src/utils/flaky-websocket.ts
index f30c7f66..df1a98cd 100644
--- a/frontend/test-client/src/utils/flaky-websocket.ts
+++ b/frontend/test-client/src/utils/flaky-websocket.ts
@@ -1,12 +1,19 @@
+import type { Logger } from "sync-client";
+import { helpers } from "sync-client";
 import { sleep } from "./sleep";
 
 export function flakyWebSocketFactory(
-	jitterScaleInSeconds: number
+	jitterScaleInSeconds: number,
+	logger: Logger
 ): typeof WebSocket {
 	// eslint-disable-next-line
-	return class FlakyWebSocket extends require("ws") {
+	return class FlakyWebSocket extends WebSocket {
+		private static readonly RECEIVE_KEY = "websocket-receive";
+		private static readonly SEND_KEY = "websocket-send";
+
+		private readonly locks = new helpers.Locks(logger);
+
 		public set onopen(callback: (event: Event) => void) {
-			// eslint-disable-next-line
 			super.onopen = async (event: Event): Promise<void> => {
 				if (jitterScaleInSeconds > 0) {
 					await sleep(Math.random() * jitterScaleInSeconds * 1000);
@@ -17,18 +24,20 @@ export function flakyWebSocketFactory(
 		}
 
 		public set onmessage(callback: (event: MessageEvent) => void) {
-			// eslint-disable-next-line
 			super.onmessage = async (event: MessageEvent): Promise<void> => {
+				await this.locks.waitForLock(FlakyWebSocket.RECEIVE_KEY);
+
 				if (jitterScaleInSeconds > 0) {
 					await sleep(Math.random() * jitterScaleInSeconds * 1000);
 				}
 
 				callback(event);
+
+				this.locks.unlock(FlakyWebSocket.RECEIVE_KEY);
 			};
 		}
 
 		public set onclose(callback: (event: CloseEvent) => void) {
-			// eslint-disable-next-line
 			super.onclose = async (event: CloseEvent): Promise<void> => {
 				if (jitterScaleInSeconds > 0) {
 					await sleep(Math.random() * jitterScaleInSeconds * 1000);
@@ -38,7 +47,6 @@ export function flakyWebSocketFactory(
 		}
 
 		public set onerror(callback: (event: Event) => void) {
-			// eslint-disable-next-line
 			super.onerror = async (event: Event): Promise<void> => {
 				if (jitterScaleInSeconds > 0) {
 					await sleep(Math.random() * jitterScaleInSeconds * 1000);
@@ -50,12 +58,16 @@ export function flakyWebSocketFactory(
 		public async send(
 			data: string | ArrayBufferLike | Blob | ArrayBufferView
 		): Promise<void> {
+			// maintain message order
+			await this.locks.waitForLock(FlakyWebSocket.SEND_KEY);
+
 			if (jitterScaleInSeconds > 0) {
 				await sleep(Math.random() * jitterScaleInSeconds * 1000);
 			}
 
-			// eslint-disable-next-line
 			super.send(data);
+
+			this.locks.unlock(FlakyWebSocket.SEND_KEY);
 		}
 	} as unknown as typeof WebSocket;
 }

From a2cbcf05191f98c501c6cf4c8a6636f8222115dc Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 16 Aug 2025 12:21:41 +0100
Subject: [PATCH 535/761] SLow down requests for development

---
 .../src/debugging/flaky-websocket-factory.ts  | 71 +++++++++++++++++++
 .../src/debugging/slow-fetch-factory.ts       | 14 ++++
 frontend/obsidian-plugin/src/utils/sleep.ts   |  3 +
 .../obsidian-plugin/src/vault-link-plugin.ts  | 11 +++
 4 files changed, 99 insertions(+)
 create mode 100644 frontend/obsidian-plugin/src/debugging/flaky-websocket-factory.ts
 create mode 100644 frontend/obsidian-plugin/src/debugging/slow-fetch-factory.ts
 create mode 100644 frontend/obsidian-plugin/src/utils/sleep.ts

diff --git a/frontend/obsidian-plugin/src/debugging/flaky-websocket-factory.ts b/frontend/obsidian-plugin/src/debugging/flaky-websocket-factory.ts
new file mode 100644
index 00000000..f2f3db0a
--- /dev/null
+++ b/frontend/obsidian-plugin/src/debugging/flaky-websocket-factory.ts
@@ -0,0 +1,71 @@
+import { helpers, Logger } from "sync-client";
+
+export function flakyWebSocketFactory(
+	jitterScaleInSeconds: number,
+	logger: Logger
+): typeof WebSocket {
+	// eslint-disable-next-line
+	return class FlakyWebSocket extends WebSocket {
+		private static readonly RECEIVE_KEY = "websocket-receive";
+		private static readonly SEND_KEY = "websocket-send";
+
+		private readonly locks = new helpers.Locks(logger);
+
+		public set onopen(callback: (event: Event) => void) {
+			super.onopen = async (event: Event): Promise<void> => {
+				if (jitterScaleInSeconds > 0) {
+					await sleep(Math.random() * jitterScaleInSeconds * 1000);
+				}
+
+				callback(event);
+			};
+		}
+
+		public set onmessage(callback: (event: MessageEvent) => void) {
+			super.onmessage = async (event: MessageEvent): Promise<void> => {
+				await this.locks.waitForLock(FlakyWebSocket.RECEIVE_KEY);
+
+				if (jitterScaleInSeconds > 0) {
+					await sleep(Math.random() * jitterScaleInSeconds * 1000);
+				}
+
+				callback(event);
+
+				this.locks.unlock(FlakyWebSocket.RECEIVE_KEY);
+			};
+		}
+
+		public set onclose(callback: (event: CloseEvent) => void) {
+			super.onclose = async (event: CloseEvent): Promise<void> => {
+				if (jitterScaleInSeconds > 0) {
+					await sleep(Math.random() * jitterScaleInSeconds * 1000);
+				}
+				callback(event);
+			};
+		}
+
+		public set onerror(callback: (event: Event) => void) {
+			super.onerror = async (event: Event): Promise<void> => {
+				if (jitterScaleInSeconds > 0) {
+					await sleep(Math.random() * jitterScaleInSeconds * 1000);
+				}
+				callback(event);
+			};
+		}
+
+		public async send(
+			data: string | ArrayBufferLike | Blob | ArrayBufferView
+		): Promise<void> {
+			// maintain message order
+			await this.locks.waitForLock(FlakyWebSocket.SEND_KEY);
+
+			if (jitterScaleInSeconds > 0) {
+				await sleep(Math.random() * jitterScaleInSeconds * 1000);
+			}
+
+			super.send(data);
+
+			this.locks.unlock(FlakyWebSocket.SEND_KEY);
+		}
+	} as unknown as typeof WebSocket;
+}
diff --git a/frontend/obsidian-plugin/src/debugging/slow-fetch-factory.ts b/frontend/obsidian-plugin/src/debugging/slow-fetch-factory.ts
new file mode 100644
index 00000000..5fe6c3ef
--- /dev/null
+++ b/frontend/obsidian-plugin/src/debugging/slow-fetch-factory.ts
@@ -0,0 +1,14 @@
+export const slowFetchFactory =
+	(jitterScaleInSeconds: number) =>
+	async (
+		input: string | URL | globalThis.Request,
+		init?: RequestInit
+	): Promise<Response> => {
+		if (jitterScaleInSeconds > 0) {
+			await sleep(Math.random() * jitterScaleInSeconds * 1000);
+		}
+
+		const response = await fetch(input, init);
+
+		return response;
+	};
diff --git a/frontend/obsidian-plugin/src/utils/sleep.ts b/frontend/obsidian-plugin/src/utils/sleep.ts
new file mode 100644
index 00000000..638fc019
--- /dev/null
+++ b/frontend/obsidian-plugin/src/utils/sleep.ts
@@ -0,0 +1,3 @@
+export async function sleep(ms: number): Promise<void> {
+	return new Promise((resolve) => setTimeout(resolve, ms));
+}
diff --git a/frontend/obsidian-plugin/src/vault-link-plugin.ts b/frontend/obsidian-plugin/src/vault-link-plugin.ts
index 6e8e4cf7..0f3e5fb8 100644
--- a/frontend/obsidian-plugin/src/vault-link-plugin.ts
+++ b/frontend/obsidian-plugin/src/vault-link-plugin.ts
@@ -22,6 +22,8 @@ import {
 	setCursors
 } from "./views/cursors/remote-cursors-plugin";
 import { LocalCursorUpdateListener } from "./views/cursors/local-cursor-update-listener";
+import { slowFetchFactory } from "./debugging/slow-fetch-factory";
+import { flakyWebSocketFactory } from "./debugging/flaky-websocket-factory";
 
 const MIN_WAIT_BETWEEN_UPDATES_IN_MS = 250;
 export default class VaultLinkPlugin extends Plugin {
@@ -41,6 +43,15 @@ export default class VaultLinkPlugin extends Plugin {
 			".trash/**"
 		);
 
+		const isDebugBuild = process.env.NODE_ENV === "development";
+
+		const debugOptions = isDebugBuild
+			? {
+					fetch: slowFetchFactory(1),
+					webSocket: flakyWebSocketFactory(1, new Logger())
+				}
+			: {};
+
 		this.client = await SyncClient.create({
 			fs: new ObsidianFileSystemOperations(
 				this.app.vault,

From cf8c9ebe000a84893eb504fdd0c86443dfa212f5 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 17 Aug 2025 10:56:43 +0100
Subject: [PATCH 536/761] Exclude target

---
 .vscode/settings.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index ce20ced2..88d395f5 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -5,5 +5,6 @@
         "**/dist": true,
         "**/node_modules": true,
         "**/.sqlx": true,
-    }
+        "**/target": true,
+    },
 }

From 278fa912df4f5d37992a4bd5916ef01c435c2ff6 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 17 Aug 2025 10:57:50 +0100
Subject: [PATCH 537/761] Rename field

---
 frontend/sync-client/src/services/types/ClientCursors.ts     | 2 +-
 .../sync-client/src/types/maybe-outdated-client-cursors.ts   | 5 +++++
 sync-server/src/app_state/cursors.rs                         | 2 +-
 sync-server/src/app_state/websocket/models.rs                | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 frontend/sync-client/src/types/maybe-outdated-client-cursors.ts

diff --git a/frontend/sync-client/src/services/types/ClientCursors.ts b/frontend/sync-client/src/services/types/ClientCursors.ts
index 65da35e3..8222bfb0 100644
--- a/frontend/sync-client/src/services/types/ClientCursors.ts
+++ b/frontend/sync-client/src/services/types/ClientCursors.ts
@@ -4,5 +4,5 @@ import type { DocumentWithCursors } from "./DocumentWithCursors";
 export interface ClientCursors {
 	userName: string;
 	deviceId: string;
-	cursors: DocumentWithCursors[];
+	documentsWithCursors: DocumentWithCursors[];
 }
diff --git a/frontend/sync-client/src/types/maybe-outdated-client-cursors.ts b/frontend/sync-client/src/types/maybe-outdated-client-cursors.ts
new file mode 100644
index 00000000..acced952
--- /dev/null
+++ b/frontend/sync-client/src/types/maybe-outdated-client-cursors.ts
@@ -0,0 +1,5 @@
+import type { ClientCursors } from "../services/types/ClientCursors";
+
+export interface DocumentWithMaybeOutdatedClientCursors extends ClientCursors {
+	isOutdated: boolean;
+}
diff --git a/sync-server/src/app_state/cursors.rs b/sync-server/src/app_state/cursors.rs
index 14bfb020..1e6509c7 100644
--- a/sync-server/src/app_state/cursors.rs
+++ b/sync-server/src/app_state/cursors.rs
@@ -48,7 +48,7 @@ impl Cursors {
         all_device_cursors.push(ClientCursorsWithTimeToLive::new(ClientCursors {
             user_name,
             device_id: device_id.to_string(),
-            cursors: document_to_cursors,
+            documents_with_cursors: document_to_cursors,
         }));
 
         drop(vault_to_cursors); // Explicitly drop the lock before broadcasting to avoid deadlock
diff --git a/sync-server/src/app_state/websocket/models.rs b/sync-server/src/app_state/websocket/models.rs
index fca0dfb7..ed61177c 100644
--- a/sync-server/src/app_state/websocket/models.rs
+++ b/sync-server/src/app_state/websocket/models.rs
@@ -43,7 +43,7 @@ pub struct CursorSpan {
 pub struct ClientCursors {
     pub user_name: String,
     pub device_id: DeviceId,
-    pub cursors: Vec<DocumentWithCursors>,
+    pub documents_with_cursors: Vec<DocumentWithCursors>,
 }
 
 #[derive(TS, Serialize, Clone, Debug)]

From 0916f54045ac39a32a68a3951f54150fd1a71f06 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 17 Aug 2025 14:59:21 +0100
Subject: [PATCH 538/761] Small readme improvements

---
 README.md | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index d0bbb264..1eb7a1c2 100644
--- a/README.md
+++ b/README.md
@@ -5,22 +5,20 @@
 [![Publish server Docker image](https://github.com/schmelczer/vault-link/actions/workflows/publish-docker.yml/badge.svg)](https://github.com/schmelczer/vault-link/actions/workflows/publish-docker.yml)
 [![Publish Obsidian plugin](https://github.com/schmelczer/vault-link/actions/workflows/publish-plugin.yml/badge.svg)](https://github.com/schmelczer/vault-link/actions/workflows/publish-plugin.yml)
 
-
 ## Develop
 
 ### Install [nvm](https://github.com/nvm-sh/nvm)
 
-- `curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | bash`
-- `nvm install 22`
-- `nvm use 22`
-- Optionally set the system-wide default: `nvm alias default 22`
-
+-   `curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | bash`
+-   `nvm install 22`
+-   `nvm use 22`
+-   Optionally set the system-wide default: `nvm alias default 22`
 
 ### Set up Rust
 
-- Install [`rustup`](https://rustup.rs): `curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh`
-- Install [`wasm-pack`](https://rustwasm.github.io/wasm-pack/installer): `curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh`
-- `cargo install cargo-insta sqlx-cli cargo-edit`
+-   Install [`rustup`](https://rustup.rs): `curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh`
+-   Install [`wasm-pack`](https://rustwasm.github.io/wasm-pack/installer): `curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh`
+-   `cargo install cargo-insta sqlx-cli cargo-edit`
 
 ### Install Obsidian on Linux
 
@@ -31,6 +29,18 @@ flatpak install flathub md.obsidian.Obsidian
 flatpak run md.obsidian.Obsidian
 ```
 
+#### Run in development mode
+
+Start the server:
+
+```sh
+cd sync-server && cargo run config-e2e.yml
+```
+
+```sh
+cd frontend && npm run dev
+```
+
 ### Scripts
 
 #### Update HTTP API TS bindings
@@ -45,7 +55,6 @@ scripts/update-api-types.sh
 scripts/bump-version.sh patch
 ```
 
-
 #### Run E2E tests
 
 ```sh
@@ -56,4 +65,4 @@ And to clean up the logs & database files, run `scripts/clean-up.sh`
 
 ## Projects
 
-- [Sync server](./sync-server/README.md)
+-   [Sync server](./sync-server/README.md)

From a9ddd1032faef405639e16696e95bc3e9e1f429a Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 17 Aug 2025 14:59:41 +0100
Subject: [PATCH 539/761] Lint flaky websocket factory

---
 .../src/debugging/flaky-websocket-factory.ts        | 13 +++++++++++--
 ...laky-websocket.ts => flaky-websocket-factory.ts} | 10 +++++++++-
 2 files changed, 20 insertions(+), 3 deletions(-)
 rename frontend/test-client/src/utils/{flaky-websocket.ts => flaky-websocket-factory.ts} (89%)

diff --git a/frontend/obsidian-plugin/src/debugging/flaky-websocket-factory.ts b/frontend/obsidian-plugin/src/debugging/flaky-websocket-factory.ts
index f2f3db0a..56310aa6 100644
--- a/frontend/obsidian-plugin/src/debugging/flaky-websocket-factory.ts
+++ b/frontend/obsidian-plugin/src/debugging/flaky-websocket-factory.ts
@@ -1,4 +1,5 @@
-import { helpers, Logger } from "sync-client";
+import type { Logger } from "sync-client";
+import { helpers } from "sync-client";
 
 export function flakyWebSocketFactory(
 	jitterScaleInSeconds: number,
@@ -53,7 +54,15 @@ export function flakyWebSocketFactory(
 			};
 		}
 
-		public async send(
+		public send(
+			data: string | ArrayBufferLike | Blob | ArrayBufferView
+		): void {
+			this.waitingSend(data).catch((error: unknown) => {
+				logger.error(`Error sending WebSocket message: ${error}`);
+			});
+		}
+
+		private async waitingSend(
 			data: string | ArrayBufferLike | Blob | ArrayBufferView
 		): Promise<void> {
 			// maintain message order
diff --git a/frontend/test-client/src/utils/flaky-websocket.ts b/frontend/test-client/src/utils/flaky-websocket-factory.ts
similarity index 89%
rename from frontend/test-client/src/utils/flaky-websocket.ts
rename to frontend/test-client/src/utils/flaky-websocket-factory.ts
index df1a98cd..6a146de2 100644
--- a/frontend/test-client/src/utils/flaky-websocket.ts
+++ b/frontend/test-client/src/utils/flaky-websocket-factory.ts
@@ -55,7 +55,15 @@ export function flakyWebSocketFactory(
 			};
 		}
 
-		public async send(
+		public send(
+			data: string | ArrayBufferLike | Blob | ArrayBufferView
+		): void {
+			this.waitingSend(data).catch((error: unknown) => {
+				logger.error(`Error sending WebSocket message: ${error}`);
+			});
+		}
+
+		private async waitingSend(
 			data: string | ArrayBufferLike | Blob | ArrayBufferView
 		): Promise<void> {
 			// maintain message order

From 2d016c44bd321dcd4cdfb10cb304979afa95227e Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 17 Aug 2025 15:01:38 +0100
Subject: [PATCH 540/761] Add local selection update

---
 .../views/cursors/update-selection.test.ts    | 111 ++++++++++++++++++
 .../src/views/cursors/update-selection.ts     |  37 ++++++
 2 files changed, 148 insertions(+)
 create mode 100644 frontend/obsidian-plugin/src/views/cursors/update-selection.test.ts
 create mode 100644 frontend/obsidian-plugin/src/views/cursors/update-selection.ts

diff --git a/frontend/obsidian-plugin/src/views/cursors/update-selection.test.ts b/frontend/obsidian-plugin/src/views/cursors/update-selection.test.ts
new file mode 100644
index 00000000..991ff76b
--- /dev/null
+++ b/frontend/obsidian-plugin/src/views/cursors/update-selection.test.ts
@@ -0,0 +1,111 @@
+import { updateSelection } from "./update-selection";
+
+describe("Selection update", () => {
+	it("should handle span fully before - insert", () => {
+		const spans = [{ start: 3, end: 5 }];
+		updateSelection({
+			fromA: 0,
+			toA: 0,
+			fromB: 0,
+			toB: 2,
+			spans
+		});
+		expect(spans).toEqual([{ start: 5, end: 7 }]);
+	});
+
+	it("should handle span fully before - delete", () => {
+		const spans = [{ start: 3, end: 5 }];
+		updateSelection({
+			fromA: 0,
+			toA: 2,
+			fromB: 0,
+			toB: 0,
+			spans
+		});
+		expect(spans).toEqual([{ start: 1, end: 3 }]);
+	});
+
+	it("should handle span fully after - insert", () => {
+		const spans = [{ start: 3, end: 5 }];
+		updateSelection({
+			fromA: 6,
+			toA: 6,
+			fromB: 6,
+			toB: 10,
+			spans
+		});
+		expect(spans).toEqual([{ start: 3, end: 5 }]);
+	});
+
+	it("should handle span fully after - delete", () => {
+		const spans = [{ start: 3, end: 5 }];
+		updateSelection({
+			fromA: 6,
+			toA: 10,
+			fromB: 6,
+			toB: 6,
+			spans
+		});
+		expect(spans).toEqual([{ start: 3, end: 5 }]);
+	});
+
+	it("should handle span fully within - insert", () => {
+		const spans = [{ start: 3, end: 5 }];
+		updateSelection({
+			fromA: 4,
+			toA: 4,
+			fromB: 4,
+			toB: 6,
+			spans
+		});
+		expect(spans).toEqual([{ start: 3, end: 7 }]);
+	});
+
+	it("should handle span fully within - delete", () => {
+		const spans = [{ start: 3, end: 5 }];
+		updateSelection({
+			fromA: 4,
+			toA: 5,
+			fromB: 4,
+			toB: 4,
+			spans
+		});
+		expect(spans).toEqual([{ start: 3, end: 4 }]);
+	});
+
+	it("should handle span overlapping with start", () => {
+		const spans = [{ start: 3, end: 5 }];
+		updateSelection({
+			fromA: 2,
+			toA: 4,
+			fromB: 2,
+			toB: 2,
+			spans
+		});
+		expect(spans).toEqual([{ start: 2, end: 4 }]);
+	});
+
+	it("should handle span overlapping with end", () => {
+		const spans = [{ start: 3, end: 5 }];
+		updateSelection({
+			fromA: 4,
+			toA: 6,
+			fromB: 4,
+			toB: 4,
+			spans
+		});
+		expect(spans).toEqual([{ start: 3, end: 4 }]);
+	});
+
+	it("delete entire selection", () => {
+		const spans = [{ start: 3, end: 5 }];
+		updateSelection({
+			fromA: 0,
+			toA: 10,
+			fromB: 0,
+			toB: 0,
+			spans
+		});
+		expect(spans).toEqual([{ start: 0, end: 0 }]);
+	});
+});
diff --git a/frontend/obsidian-plugin/src/views/cursors/update-selection.ts b/frontend/obsidian-plugin/src/views/cursors/update-selection.ts
new file mode 100644
index 00000000..2551f863
--- /dev/null
+++ b/frontend/obsidian-plugin/src/views/cursors/update-selection.ts
@@ -0,0 +1,37 @@
+import type { CursorSpan } from "sync-client";
+
+export const updateSelection = ({
+	fromA,
+	toA,
+	toB,
+	spans
+}: {
+	fromA: number;
+	toA: number;
+	fromB: number;
+	toB: number;
+	spans: CursorSpan[];
+}): void => {
+	spans.forEach((span) => {
+		if (fromA <= span.start) {
+			// The change covers the entirety of the selection
+			if (toA > span.end) {
+				span.start = toB;
+				span.end = toB;
+				return;
+			}
+
+			let change = toB - toA;
+			if (change < 0) {
+				change = Math.max(change, fromA - span.start);
+			}
+
+			span.start += change;
+			span.end += change;
+		} else if (toA <= span.end) {
+			span.end += toB - toA;
+		} else if (toB <= span.end) {
+			span.end = toB;
+		}
+	});
+};

From b7e80c39f19434c5f863bcec2e5fd8add42c982b Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 17 Aug 2025 15:01:45 +0100
Subject: [PATCH 541/761] Fix tests

---
 frontend/sync-client/src/utils/locks.test.ts | 2 +-
 frontend/sync-client/src/utils/locks.ts      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/sync-client/src/utils/locks.test.ts b/frontend/sync-client/src/utils/locks.test.ts
index f545e957..33d99da9 100644
--- a/frontend/sync-client/src/utils/locks.test.ts
+++ b/frontend/sync-client/src/utils/locks.test.ts
@@ -35,7 +35,7 @@ describe("Document lock", () => {
 	test("should throw an error when unlocking a document that is not locked", () => {
 		expect(() => {
 			locks.unlock(testPath);
-		}).toThrow(`Document ${testPath} is not locked, cannot unlock`);
+		}).toThrow(`Key '${testPath}' is not locked, cannot unlock`);
 	});
 
 	test("should wait for a document lock and resolve when unlocked", async () => {
diff --git a/frontend/sync-client/src/utils/locks.ts b/frontend/sync-client/src/utils/locks.ts
index 8e52cba0..77b3b767 100644
--- a/frontend/sync-client/src/utils/locks.ts
+++ b/frontend/sync-client/src/utils/locks.ts
@@ -67,7 +67,7 @@ export class Locks<T> {
 	 */
 	public unlock(key: T): void {
 		if (!this.locked.has(key)) {
-			throw new Error(`Key ${key} is not locked, cannot unlock`);
+			throw new Error(`Key '${key}' is not locked, cannot unlock`);
 		}
 
 		// Remove first waiter to ensure FIFO order

From e73f147fbc82cb085f34029ab6cda5286ad027fc Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 17 Aug 2025 15:03:34 +0100
Subject: [PATCH 542/761] Add local prediction for remote cursor updates

---
 .../obsidian-plugin/src/vault-link-plugin.ts  |   6 +-
 .../cursors/local-cursor-update-listener.ts   |   8 -
 .../views/cursors/remote-cursors-plugin.ts    |  54 ++++--
 frontend/sync-client/src/index.ts             |   1 +
 frontend/sync-client/src/sync-client.ts       | 174 ++++++++++++++++--
 frontend/test-client/src/agent/mock-agent.ts  |   4 +-
 6 files changed, 207 insertions(+), 40 deletions(-)

diff --git a/frontend/obsidian-plugin/src/vault-link-plugin.ts b/frontend/obsidian-plugin/src/vault-link-plugin.ts
index 0f3e5fb8..50048e83 100644
--- a/frontend/obsidian-plugin/src/vault-link-plugin.ts
+++ b/frontend/obsidian-plugin/src/vault-link-plugin.ts
@@ -11,7 +11,7 @@ import { HistoryView } from "./views/history/history-view";
 import { StatusBar } from "./views/status-bar/status-bar";
 import { LogsView } from "./views/logs/logs-view";
 import { StatusDescription } from "./views/status-description/status-description";
-import { SyncClient, rateLimit, DEFAULT_SETTINGS } from "sync-client";
+import { SyncClient, rateLimit, DEFAULT_SETTINGS, Logger } from "sync-client";
 import { ObsidianFileSystemOperations } from "./obsidian-file-system";
 import { SyncSettingsTab } from "./views/settings/settings-tab";
 import { logToConsole } from "./utils/log-to-console";
@@ -26,6 +26,7 @@ import { slowFetchFactory } from "./debugging/slow-fetch-factory";
 import { flakyWebSocketFactory } from "./debugging/flaky-websocket-factory";
 
 const MIN_WAIT_BETWEEN_UPDATES_IN_MS = 250;
+
 export default class VaultLinkPlugin extends Plugin {
 	private readonly disposables: (() => unknown)[] = [];
 
@@ -61,7 +62,8 @@ export default class VaultLinkPlugin extends Plugin {
 				load: this.loadData.bind(this),
 				save: this.saveData.bind(this)
 			},
-			nativeLineEndings: Platform.isWin ? "\r\n" : "\n"
+			nativeLineEndings: Platform.isWin ? "\r\n" : "\n",
+			...debugOptions
 		});
 
 		logToConsole(this.client);
diff --git a/frontend/obsidian-plugin/src/views/cursors/local-cursor-update-listener.ts b/frontend/obsidian-plugin/src/views/cursors/local-cursor-update-listener.ts
index 883a92ea..da67c70d 100644
--- a/frontend/obsidian-plugin/src/views/cursors/local-cursor-update-listener.ts
+++ b/frontend/obsidian-plugin/src/views/cursors/local-cursor-update-listener.ts
@@ -7,7 +7,6 @@ import { getSelectionsFromEditor } from "./get-selections-from-editor";
 export class LocalCursorUpdateListener {
 	private static readonly UPDATE_INTERVAL_MS = 50;
 	private readonly eventHandle: NodeJS.Timeout;
-	private lastCursorState: Record<string, Selection[]> = {};
 
 	public constructor(
 		private readonly client: SyncClient,
@@ -24,13 +23,6 @@ export class LocalCursorUpdateListener {
 
 	private updateAllSelections(): void {
 		const currentCursors = this.getAllSelections();
-		if (
-			JSON.stringify(this.lastCursorState) ===
-			JSON.stringify(currentCursors)
-		) {
-			return;
-		}
-		this.lastCursorState = currentCursors;
 		this.client
 			.updateLocalCursors(currentCursors)
 			.catch((error: unknown) => {
diff --git a/frontend/obsidian-plugin/src/views/cursors/remote-cursors-plugin.ts b/frontend/obsidian-plugin/src/views/cursors/remote-cursors-plugin.ts
index e7797d1a..661aa452 100644
--- a/frontend/obsidian-plugin/src/views/cursors/remote-cursors-plugin.ts
+++ b/frontend/obsidian-plugin/src/views/cursors/remote-cursors-plugin.ts
@@ -1,6 +1,6 @@
 import type { Range } from "@codemirror/state";
-import { RangeSet, Annotation, AnnotationType } from "@codemirror/state";
-import { ViewPlugin, Decoration, WidgetType } from "@codemirror/view";
+import { RangeSet } from "@codemirror/state";
+import { ViewPlugin, Decoration } from "@codemirror/view";
 
 import type {
 	PluginValue,
@@ -9,7 +9,10 @@ import type {
 	ViewUpdate
 } from "@codemirror/view";
 import { RemoteCursorWidget } from "./remote-cursor-widget";
-import type { ClientCursors, CursorSpan } from "sync-client";
+import type {
+	CursorSpan,
+	DocumentWithMaybeOutdatedClientCursors
+} from "sync-client";
 import type { App } from "obsidian";
 import { MarkdownView } from "obsidian";
 
@@ -17,10 +20,12 @@ let cursors: {
 	name: string;
 	path: string;
 	span: CursorSpan;
+	deviceId: string;
 }[] = [];
 
 import { StateEffect } from "@codemirror/state";
 import { getRandomColor } from "src/utils/get-random-color";
+import { updateSelection } from "./update-selection";
 
 const forceUpdate = StateEffect.define();
 
@@ -28,6 +33,17 @@ export class RemoteCursorsPluginValue implements PluginValue {
 	public decorations: DecorationSet = RangeSet.of([]);
 
 	public update(update: ViewUpdate): void {
+		update.changes.iterChanges((fromA, toA, fromB, toB, _inserted) => {
+			const spans = cursors.map((cursor) => cursor.span);
+			updateSelection({
+				fromA,
+				toA,
+				fromB,
+				toB,
+				spans
+			});
+		});
+
 		const decorations: Range<Decoration>[] = [];
 
 		cursors.forEach(({ name, span: { start, end } }) => {
@@ -103,20 +119,30 @@ export const remoteCursorsPlugin = ViewPlugin.fromClass(
 	}
 );
 
-export function setCursors(clients: ClientCursors[], app: App): void {
-	cursors = clients.flatMap((client) => {
-		const clientCursors = client.cursors;
-		return Object.keys(clientCursors).flatMap((path) => {
-			const spans = clientCursors[path];
-			return spans
-				? spans.map((span) => ({
+export function setCursors(
+	clients: DocumentWithMaybeOutdatedClientCursors[],
+	app: App
+): void {
+	cursors = [
+		...cursors.filter(({ deviceId }) =>
+			clients.some(
+				(client) => client.deviceId === deviceId && client.isOutdated
+			)
+		),
+		...clients
+			.filter(({ isOutdated }) => !isOutdated)
+			.flatMap((client) => {
+				const clientCursors = client.documentsWithCursors;
+				return clientCursors.flatMap((cursor) =>
+					cursor.cursors.map((span) => ({
 						name: client.userName,
-						path,
+						path: cursor.relative_path,
+						deviceId: client.deviceId,
 						span
 					}))
-				: [];
-		});
-	});
+				);
+			})
+	];
 
 	app.workspace
 		.getLeavesOfType("markdown")
diff --git a/frontend/sync-client/src/index.ts b/frontend/sync-client/src/index.ts
index 4a5f5d1e..ce903f25 100644
--- a/frontend/sync-client/src/index.ts
+++ b/frontend/sync-client/src/index.ts
@@ -18,6 +18,7 @@ export type { PersistenceProvider } from "./persistence/persistence";
 export type { CursorSpan } from "./services/types/CursorSpan";
 export type { ClientCursors } from "./services/types/ClientCursors";
 export type { NetworkConnectionStatus } from "./types/network-connection-status";
+export type { DocumentWithMaybeOutdatedClientCursors } from "./types/maybe-outdated-client-cursors";
 export { DocumentUpdateStatus } from "./types/document-update-status";
 export { SyncClient } from "./sync-client";
 
diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts
index 41ab6781..972d2cd3 100644
--- a/frontend/sync-client/src/sync-client.ts
+++ b/frontend/sync-client/src/sync-client.ts
@@ -19,9 +19,21 @@ import { WebSocketManager } from "./services/websocket-manager";
 import { createClientId } from "./utils/create-client-id";
 import type { CursorSpan } from "./services/types/CursorSpan";
 import type { ClientCursors } from "./services/types/ClientCursors";
+import type { DocumentWithCursors } from "./services/types/DocumentWithCursors";
+import { hash } from "./utils/hash";
+import type { DocumentWithMaybeOutdatedClientCursors } from "./types/maybe-outdated-client-cursors";
+
+enum DocumentUpToDateness {
+	UpToDate = "UpToDate",
+	Prior = "Prior",
+	Later = "Later"
+}
 
 export class SyncClient {
 	private static readonly MINIMUM_SAVE_INTERVAL_MS = 1000;
+	private lastCursorState: DocumentWithCursors[] = [];
+
+	private readonly knownClientCursors: ClientCursors[] = [];
 
 	// eslint-disable-next-line @typescript-eslint/max-params
 	private constructor(
@@ -32,7 +44,8 @@ export class SyncClient {
 		private readonly syncService: SyncService,
 		private readonly webSocketManager: WebSocketManager,
 		private readonly _logger: Logger,
-		private readonly connectionStatus: ConnectionStatus
+		private readonly connectionStatus: ConnectionStatus,
+		private readonly fileOperations: FileOperations
 	) {
 		this.settings.addOnSettingsChangeListener(
 			(newSettings, oldSettings) => {
@@ -41,6 +54,10 @@ export class SyncClient {
 				}
 			}
 		);
+
+		this.webSocketManager.addRemoteCursorsUpdateListener((cursors) => {
+			this.knownClientCursors.push(...cursors);
+		});
 	}
 
 	public get logger(): Logger {
@@ -157,7 +174,8 @@ export class SyncClient {
 			syncService,
 			webSocketManager,
 			logger,
-			connectionStatus
+			connectionStatus,
+			fileOperations
 		);
 
 		logger.info("SyncClient initialised");
@@ -268,18 +286,6 @@ export class SyncClient {
 		});
 	}
 
-	public async updateLocalCursors(
-		documentToCursors: Record<RelativePath, CursorSpan[]>
-	): Promise<void> {
-		this.webSocketManager.updateLocalCursors({ documentToCursors });
-	}
-
-	public addRemoteCursorsUpdateListener(
-		listener: (cursors: ClientCursors[]) => void
-	): void {
-		this.webSocketManager.addRemoteCursorsUpdateListener(listener);
-	}
-
 	public getDocumentSyncingStatus(
 		relativePath: RelativePath
 	): DocumentUpdateStatus {
@@ -292,4 +298,144 @@ export class SyncClient {
 			? DocumentUpdateStatus.SYNCING
 			: DocumentUpdateStatus.UP_TO_DATE;
 	}
+
+	/// Update the local cursors for the given documents.
+	/// Can be called frequently as it only emits an event
+	// if the state has actually changed.
+	public async updateLocalCursors(
+		documentToCursors: Record<RelativePath, CursorSpan[]>
+	): Promise<void> {
+		const documentsWithCursors: DocumentWithCursors[] = [];
+
+		for (const [relativePath, cursors] of Object.entries(
+			documentToCursors
+		)) {
+			const record =
+				this.database.getLatestDocumentByRelativePath(relativePath);
+
+			if (!record) {
+				continue; // Let's wait for the file to be created before sending cursors
+			}
+
+			const readContent = await this.fileOperations.read(relativePath);
+
+			if (record.metadata?.hash !== hash(readContent)) {
+				continue; // Wouldn't make sense to sync the positions in a dirty file
+			}
+
+			documentsWithCursors.push({
+				relative_path: relativePath,
+				document_id: record.documentId,
+				vault_update_id: record.metadata.parentVersionId,
+				cursors
+			});
+		}
+
+		if (
+			JSON.stringify(this.lastCursorState) ===
+			JSON.stringify(documentsWithCursors)
+		) {
+			return;
+		}
+
+		this.lastCursorState = documentsWithCursors;
+
+		this.webSocketManager.updateLocalCursors({ documentsWithCursors });
+	}
+
+	public addRemoteCursorsUpdateListener(
+		listener: (cursors: DocumentWithMaybeOutdatedClientCursors[]) => void
+	): void {
+		this.webSocketManager.addRemoteCursorsUpdateListener(async () => {
+			listener(await this.getRelevantClientCursors());
+		});
+	}
+
+	private async getRelevantClientCursors(): Promise<
+		DocumentWithMaybeOutdatedClientCursors[]
+	> {
+		const result: DocumentWithMaybeOutdatedClientCursors[] = [];
+		const included = new Set<string>();
+		for (const clientCursors of [...this.knownClientCursors].reverse()) {
+			if (included.has(clientCursors.deviceId)) {
+				continue;
+			}
+
+			const upToDateness =
+				await this.getDocumentsUpToDateness(clientCursors);
+			if (upToDateness == DocumentUpToDateness.Later) {
+				continue;
+			}
+
+			result.push({
+				...clientCursors,
+				isOutdated: upToDateness == DocumentUpToDateness.Prior
+			});
+
+			included.add(clientCursors.deviceId);
+		}
+
+		return result;
+	}
+
+	private async getDocumentsUpToDateness(
+		clientCursor: ClientCursors
+	): Promise<DocumentUpToDateness> {
+		const results = [];
+		for (const document of clientCursor.documentsWithCursors) {
+			results.push(await this.getDocumentUpToDateness(document));
+		}
+
+		if (
+			results.every((result) => result === DocumentUpToDateness.UpToDate)
+		) {
+			return DocumentUpToDateness.UpToDate;
+		}
+
+		if (
+			results.every(
+				(result) =>
+					result === DocumentUpToDateness.UpToDate ||
+					result === DocumentUpToDateness.Prior
+			)
+		) {
+			return DocumentUpToDateness.Prior;
+		}
+
+		return DocumentUpToDateness.Later;
+	}
+
+	private async getDocumentUpToDateness(
+		document: DocumentWithCursors
+	): Promise<DocumentUpToDateness> {
+		const record = this.database.getLatestDocumentByRelativePath(
+			document.relative_path
+		);
+
+		if (!record) {
+			// the document of the cursor must be from the future
+			return DocumentUpToDateness.Later;
+		}
+
+		if (
+			(record.metadata?.parentVersionId ?? 0) < document.vault_update_id
+		) {
+			return DocumentUpToDateness.Later;
+		} else if (
+			document.vault_update_id < (record.metadata?.parentVersionId ?? 0)
+		) {
+			// the document of the cursor must be from the past
+			return DocumentUpToDateness.Prior;
+		}
+
+		const currentContent = await this.fileOperations.read(
+			document.relative_path
+		);
+
+		return this.database.getLatestDocumentByRelativePath(
+			document.relative_path
+		)?.metadata?.hash === hash(currentContent)
+			? DocumentUpToDateness.UpToDate
+			: DocumentUpToDateness.Prior;
+	}
 }
diff --git a/frontend/test-client/src/agent/mock-agent.ts b/frontend/test-client/src/agent/mock-agent.ts
index 160a782e..b4d1a62e 100644
--- a/frontend/test-client/src/agent/mock-agent.ts
+++ b/frontend/test-client/src/agent/mock-agent.ts
@@ -7,7 +7,7 @@ import { MockClient } from "./mock-client";
 import { sleep } from "../utils/sleep";
 import type { LogLine } from "sync-client/dist/types/tracing/logger";
 import { flakyFetchFactory } from "../utils/flaky-fetch";
-import { flakyWebSocketFactory } from "../utils/flaky-websocket";
+import { flakyWebSocketFactory } from "../utils/flaky-websocket-factory";
 
 export class MockAgent extends MockClient {
 	private readonly writtenContents: string[] = [];
@@ -62,7 +62,7 @@ export class MockAgent extends MockClient {
 					console.error(formatted);
 
 					if (!this.useSlowFileEvents) {
-						// Let's not ignore errors
+						// Let's wait for the error to be caught if there was one
 						// eslint-disable-next-line @typescript-eslint/no-floating-promises
 						sleep(100).then(() => process.exit(1));
 					}

From 81b81e30ff1eed5a97895a0ce352b87cef00107f Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 17 Aug 2025 15:12:31 +0100
Subject: [PATCH 543/761] Use unknown return type for callbacks

---
 .../obsidian-plugin/src/vault-link-plugin.ts  |  2 +-
 .../src/views/cursors/update-selection.ts     |  5 ++-
 .../src/views/history/history-view.ts         | 39 ++++++++++++-------
 .../src/views/settings/settings-tab.ts        | 15 +++----
 .../src/views/status-bar/status-bar.ts        |  4 +-
 .../status-description/status-description.ts  | 12 +++---
 .../sync-client/src/persistence/database.ts   |  2 +
 .../sync-client/src/persistence/settings.ts   |  4 +-
 .../src/services/connection-status.ts         |  4 +-
 .../src/services/websocket-manager.ts         |  4 +-
 frontend/sync-client/src/sync-client.ts       | 16 ++++----
 .../sync-client/src/sync-operations/syncer.ts |  4 +-
 frontend/sync-client/src/tracing/logger.ts    |  8 ++--
 .../sync-client/src/tracing/sync-history.ts   |  4 +-
 .../sync-client/src/utils/create-promise.ts   | 10 ++---
 frontend/test-client/src/agent/mock-client.ts | 38 +++++++++---------
 16 files changed, 95 insertions(+), 76 deletions(-)

diff --git a/frontend/obsidian-plugin/src/vault-link-plugin.ts b/frontend/obsidian-plugin/src/vault-link-plugin.ts
index 50048e83..0d4c1a1d 100644
--- a/frontend/obsidian-plugin/src/vault-link-plugin.ts
+++ b/frontend/obsidian-plugin/src/vault-link-plugin.ts
@@ -120,7 +120,7 @@ export default class VaultLinkPlugin extends Plugin {
 
 		this.app.workspace.onLayoutReady(async () => {
 			this.registerEditorEvents();
-			void this.client.start();
+			await this.client.start();
 
 			const interval = setInterval(() => {
 				updateEditorStatusDisplay(this.app.workspace, this.client);
diff --git a/frontend/obsidian-plugin/src/views/cursors/update-selection.ts b/frontend/obsidian-plugin/src/views/cursors/update-selection.ts
index 2551f863..9ff7c207 100644
--- a/frontend/obsidian-plugin/src/views/cursors/update-selection.ts
+++ b/frontend/obsidian-plugin/src/views/cursors/update-selection.ts
@@ -14,7 +14,7 @@ export const updateSelection = ({
 }): void => {
 	spans.forEach((span) => {
 		if (fromA <= span.start) {
-			// The change covers the entirety of the selection
+			// the change covers the entirety of the selection
 			if (toA > span.end) {
 				span.start = toB;
 				span.end = toB;
@@ -23,6 +23,8 @@ export const updateSelection = ({
 
 			let change = toB - toA;
 			if (change < 0) {
+				// it's a deletion
+				// if overlaps with the start, we can't move it back more than the deleted range
 				change = Math.max(change, fromA - span.start);
 			}
 
@@ -31,6 +33,7 @@ export const updateSelection = ({
 		} else if (toA <= span.end) {
 			span.end += toB - toA;
 		} else if (toB <= span.end) {
+			// a deletion overlaps with the end, so we move the end
 			span.end = toB;
 		}
 	});
diff --git a/frontend/obsidian-plugin/src/views/history/history-view.ts b/frontend/obsidian-plugin/src/views/history/history-view.ts
index 68681f3e..631fde72 100644
--- a/frontend/obsidian-plugin/src/views/history/history-view.ts
+++ b/frontend/obsidian-plugin/src/views/history/history-view.ts
@@ -24,13 +24,12 @@ export class HistoryView extends ItemView {
 		super(leaf);
 		this.icon = HistoryView.ICON;
 
-		this.client.addSyncHistoryUpdateListener(
-			() =>
-				void this.updateView().catch((error: unknown) => {
-					this.client.logger.error(
-						`Failed to update history view: ${error}`
-					);
-				})
+		this.client.addSyncHistoryUpdateListener(async () =>
+			this.updateView().catch((error: unknown) => {
+				this.client.logger.error(
+					`Failed to update history view: ${error}`
+				);
+			})
 		);
 	}
 
@@ -109,7 +108,15 @@ export class HistoryView extends ItemView {
 		this.historyContainer = container.createDiv({ cls: "logs-container" });
 
 		await this.updateView();
-		this.timer = setInterval(() => void this.updateView(), 1000);
+		this.timer = setInterval(
+			() =>
+				void this.updateView().catch((error: unknown) => {
+					this.client.logger.error(
+						`Failed to update history view: ${error}`
+					);
+				}),
+			1000
+		);
 	}
 
 	public async onClose(): Promise<void> {
@@ -174,11 +181,17 @@ export class HistoryView extends ItemView {
 					null
 				) {
 					card.addEventListener("click", () => {
-						void this.app.workspace.openLinkText(
-							entry.details.relativePath,
-							entry.details.relativePath,
-							false
-						);
+						this.app.workspace
+							.openLinkText(
+								entry.details.relativePath,
+								entry.details.relativePath,
+								false
+							)
+							.catch((error: unknown) => {
+								this.client.logger.error(
+									`Failed to open link for ${entry.details.relativePath}: ${error}`
+								);
+							});
 					});
 
 					card.addClass("clickable");
diff --git a/frontend/obsidian-plugin/src/views/settings/settings-tab.ts b/frontend/obsidian-plugin/src/views/settings/settings-tab.ts
index 34d1760a..2d129edc 100644
--- a/frontend/obsidian-plugin/src/views/settings/settings-tab.ts
+++ b/frontend/obsidian-plugin/src/views/settings/settings-tab.ts
@@ -16,7 +16,7 @@ export class SyncSettingsTab extends PluginSettingTab {
 	private readonly plugin: VaultLinkPlugin;
 	private readonly syncClient: SyncClient;
 	private readonly statusDescription: StatusDescription;
-	private statusDescriptionSubscription: (() => void) | undefined;
+	private statusDescriptionSubscription: (() => unknown) | undefined;
 
 	public constructor({
 		app,
@@ -90,11 +90,12 @@ export class SyncSettingsTab extends PluginSettingTab {
 				cls: "description"
 			},
 			(descriptionContainer) => {
-				this.setStatusDescriptionSubscription((): void => {
-					this.statusDescription.renderStatusDescription(
+				this.setStatusDescriptionSubscription(
+					this.statusDescription.renderStatusDescription.bind(
+						this.statusDescription,
 						descriptionContainer
-					);
-				});
+					)
+				);
 			}
 		);
 
@@ -339,7 +340,7 @@ export class SyncSettingsTab extends PluginSettingTab {
 	}
 
 	private setStatusDescriptionSubscription(
-		newSubscription?: () => void
+		newSubscription?: () => unknown
 	): void {
 		if (this.statusDescriptionSubscription) {
 			this.statusDescription.removeStatusChangeListener(
@@ -360,7 +361,7 @@ export class SyncSettingsTab extends PluginSettingTab {
 		settingName: keyof SyncSettings
 	): [
 		DocumentFragment,
-		(newValue: SyncSettings[keyof SyncSettings]) => void
+		(newValue: SyncSettings[keyof SyncSettings]) => unknown
 	] {
 		const titleContainer = document.createDocumentFragment();
 		const title = titleContainer.createEl("div", {
diff --git a/frontend/obsidian-plugin/src/views/status-bar/status-bar.ts b/frontend/obsidian-plugin/src/views/status-bar/status-bar.ts
index 6289b0ca..6466601c 100644
--- a/frontend/obsidian-plugin/src/views/status-bar/status-bar.ts
+++ b/frontend/obsidian-plugin/src/views/status-bar/status-bar.ts
@@ -42,9 +42,7 @@ export class StatusBar {
 				text: "VaultLink is disabled, click to configure",
 				cls: "initialize-button"
 			});
-			button.onclick = (): void => {
-				this.plugin.openSettings();
-			};
+			button.onclick = this.plugin.openSettings.bind(this.plugin);
 
 			return;
 		}
diff --git a/frontend/obsidian-plugin/src/views/status-description/status-description.ts b/frontend/obsidian-plugin/src/views/status-description/status-description.ts
index 3bf41759..666c107b 100644
--- a/frontend/obsidian-plugin/src/views/status-description/status-description.ts
+++ b/frontend/obsidian-plugin/src/views/status-description/status-description.ts
@@ -28,12 +28,12 @@ export class StatusDescription {
 			}
 		);
 
-		this.syncClient.addWebSocketStatusChangeListener(
-			() => void this.updateConnectionState()
+		this.syncClient.addWebSocketStatusChangeListener(async () =>
+			this.updateConnectionState()
 		);
 
-		this.syncClient.addOnSettingsChangeListener(
-			() => void this.updateConnectionState()
+		this.syncClient.addOnSettingsChangeListener(async () =>
+			this.updateConnectionState()
 		);
 	}
 
@@ -42,10 +42,10 @@ export class StatusDescription {
 		this.updateDescription();
 	}
 
-	public addStatusChangeListener(listener: () => void): void {
+	public addStatusChangeListener(listener: () => unknown): void {
 		this.statusChangeListeners.push(listener);
 	}
-	public removeStatusChangeListener(listener: () => void): void {
+	public removeStatusChangeListener(listener: () => unknown): void {
 		this.statusChangeListeners = this.statusChangeListeners.filter(
 			(l) => l !== listener
 		);
diff --git a/frontend/sync-client/src/persistence/database.ts b/frontend/sync-client/src/persistence/database.ts
index 824ac6e7..0abefd4f 100644
--- a/frontend/sync-client/src/persistence/database.ts
+++ b/frontend/sync-client/src/persistence/database.ts
@@ -331,6 +331,8 @@ export class Database {
 			),
 			lastSeenUpdateId: this.lastSeenUpdateIds.min,
 			hasInitialSyncCompleted: this.hasInitialSyncCompleted
+		}).catch((error: unknown) => {
+			this.logger.error(`Error saving data: ${error}`);
 		});
 	}
 
diff --git a/frontend/sync-client/src/persistence/settings.ts b/frontend/sync-client/src/persistence/settings.ts
index bcb32531..b0aff937 100644
--- a/frontend/sync-client/src/persistence/settings.ts
+++ b/frontend/sync-client/src/persistence/settings.ts
@@ -28,7 +28,7 @@ export class Settings {
 	private readonly onSettingsChangeHandlers: ((
 		newSettings: SyncSettings,
 		oldSettings: SyncSettings
-	) => void)[] = [];
+	) => unknown)[] = [];
 
 	public constructor(
 		private readonly logger: Logger,
@@ -50,7 +50,7 @@ export class Settings {
 	}
 
 	public addOnSettingsChangeListener(
-		handler: (settings: SyncSettings, oldSettings: SyncSettings) => void
+		handler: (settings: SyncSettings, oldSettings: SyncSettings) => unknown
 	): void {
 		this.onSettingsChangeHandlers.push(handler);
 	}
diff --git a/frontend/sync-client/src/services/connection-status.ts b/frontend/sync-client/src/services/connection-status.ts
index 3934639f..18f53a0d 100644
--- a/frontend/sync-client/src/services/connection-status.ts
+++ b/frontend/sync-client/src/services/connection-status.ts
@@ -7,8 +7,8 @@ export class ConnectionStatus {
 	private static readonly UNTIL_RESOLUTION = Symbol();
 	private canFetch: boolean;
 	private until: Promise<symbol>;
-	private resolveUntil: (result: symbol) => void;
-	private rejectUntil: (reason: unknown) => void;
+	private resolveUntil: (result: symbol) => unknown;
+	private rejectUntil: (reason: unknown) => unknown;
 
 	public constructor(
 		settings: Settings,
diff --git a/frontend/sync-client/src/services/websocket-manager.ts b/frontend/sync-client/src/services/websocket-manager.ts
index 285d51f9..3a5b32b4 100644
--- a/frontend/sync-client/src/services/websocket-manager.ts
+++ b/frontend/sync-client/src/services/websocket-manager.ts
@@ -64,12 +64,12 @@ export class WebSocketManager {
 		);
 	}
 
-	public addWebSocketStatusChangeListener(listener: () => void): void {
+	public addWebSocketStatusChangeListener(listener: () => unknown): void {
 		this.webSocketStatusChangeListeners.push(listener);
 	}
 
 	public addRemoteCursorsUpdateListener(
-		listener: (cursors: ClientCursors[]) => void
+		listener: (cursors: ClientCursors[]) => unknown
 	): void {
 		this.remoteCursorsUpdateListeners.push(listener);
 	}
diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts
index 972d2cd3..c7f0ea1b 100644
--- a/frontend/sync-client/src/sync-client.ts
+++ b/frontend/sync-client/src/sync-client.ts
@@ -48,9 +48,9 @@ export class SyncClient {
 		private readonly fileOperations: FileOperations
 	) {
 		this.settings.addOnSettingsChangeListener(
-			(newSettings, oldSettings) => {
+			async (newSettings, oldSettings) => {
 				if (newSettings.vaultName !== oldSettings.vaultName) {
-					void this.reset();
+					await this.reset();
 				}
 			}
 		);
@@ -197,7 +197,7 @@ export class SyncClient {
 	}
 
 	public addSyncHistoryUpdateListener(
-		listener: (stats: HistoryStats) => void
+		listener: (stats: HistoryStats) => unknown
 	): void {
 		this.history.addSyncHistoryUpdateListener(listener);
 	}
@@ -227,7 +227,7 @@ export class SyncClient {
 		this.database.reset();
 		this._logger.reset();
 		this.connectionStatus.finishReset();
-		void this.start();
+		await this.start();
 	}
 
 	public getSettings(): SyncSettings {
@@ -246,18 +246,18 @@ export class SyncClient {
 	}
 
 	public addOnSettingsChangeListener(
-		handler: (settings: SyncSettings, oldSettings: SyncSettings) => void
+		handler: (settings: SyncSettings, oldSettings: SyncSettings) => unknown
 	): void {
 		this.settings.addOnSettingsChangeListener(handler);
 	}
 
 	public addRemainingSyncOperationsListener(
-		listener: (remainingOperations: number) => void
+		listener: (remainingOperations: number) => unknown
 	): void {
 		this.syncer.addRemainingOperationsListener(listener);
 	}
 
-	public addWebSocketStatusChangeListener(listener: () => void): void {
+	public addWebSocketStatusChangeListener(listener: () => unknown): void {
 		this.webSocketManager.addWebSocketStatusChangeListener(listener);
 	}
 
@@ -344,7 +344,7 @@ export class SyncClient {
 	}
 
 	public addRemoteCursorsUpdateListener(
-		listener: (cursors: DocumentWithMaybeOutdatedClientCursors[]) => void
+		listener: (cursors: DocumentWithMaybeOutdatedClientCursors[]) => unknown
 	): void {
 		this.webSocketManager.addRemoteCursorsUpdateListener(async () => {
 			listener(await this.getRelevantClientCursors());
diff --git a/frontend/sync-client/src/sync-operations/syncer.ts b/frontend/sync-client/src/sync-operations/syncer.ts
index 30e012d9..7e9301a5 100644
--- a/frontend/sync-client/src/sync-operations/syncer.ts
+++ b/frontend/sync-client/src/sync-operations/syncer.ts
@@ -22,7 +22,7 @@ export class Syncer {
 	private readonly remoteDocumentsLock: Locks<DocumentId>;
 	private readonly remainingOperationsListeners: ((
 		remainingOperations: number
-	) => void)[] = [];
+	) => unknown)[] = [];
 	private readonly syncQueue: PQueue;
 
 	private runningScheduleSyncForOfflineChanges: Promise<void> | undefined;
@@ -57,7 +57,7 @@ export class Syncer {
 	}
 
 	public addRemainingOperationsListener(
-		listener: (remainingOperations: number) => void
+		listener: (remainingOperations: number) => unknown
 	): void {
 		this.remainingOperationsListeners.push(listener);
 	}
diff --git a/frontend/sync-client/src/tracing/logger.ts b/frontend/sync-client/src/tracing/logger.ts
index dc259320..cf39e4de 100644
--- a/frontend/sync-client/src/tracing/logger.ts
+++ b/frontend/sync-client/src/tracing/logger.ts
@@ -23,9 +23,11 @@ export class LogLine {
 export class Logger {
 	private static readonly MAX_MESSAGES = 100000;
 	private readonly messages: LogLine[] = [];
-	private readonly onMessageListeners: ((message: LogLine) => void)[] = [];
+	private readonly onMessageListeners: ((message: LogLine) => unknown)[] = [];
 
-	public constructor(...onMessageListeners: ((message: LogLine) => void)[]) {
+	public constructor(
+		...onMessageListeners: ((message: LogLine) => unknown)[]
+	) {
 		this.onMessageListeners = onMessageListeners;
 	}
 
@@ -53,7 +55,7 @@ export class Logger {
 		);
 	}
 
-	public addOnMessageListener(listener: (message: LogLine) => void): void {
+	public addOnMessageListener(listener: (message: LogLine) => unknown): void {
 		this.onMessageListeners.push(listener);
 	}
 
diff --git a/frontend/sync-client/src/tracing/sync-history.ts b/frontend/sync-client/src/tracing/sync-history.ts
index 4cc5e77e..6890688b 100644
--- a/frontend/sync-client/src/tracing/sync-history.ts
+++ b/frontend/sync-client/src/tracing/sync-history.ts
@@ -70,7 +70,7 @@ export class SyncHistory {
 
 	private readonly syncHistoryUpdateListeners: ((
 		status: HistoryStats
-	) => void)[] = [];
+	) => unknown)[] = [];
 
 	private status: HistoryStats = {
 		success: 0,
@@ -111,7 +111,7 @@ export class SyncHistory {
 	}
 
 	public addSyncHistoryUpdateListener(
-		listener: (stats: HistoryStats) => void
+		listener: (stats: HistoryStats) => unknown
 	): void {
 		this.syncHistoryUpdateListeners.push(listener);
 		listener({ ...this.status });
diff --git a/frontend/sync-client/src/utils/create-promise.ts b/frontend/sync-client/src/utils/create-promise.ts
index 4004ac81..959183f1 100644
--- a/frontend/sync-client/src/utils/create-promise.ts
+++ b/frontend/sync-client/src/utils/create-promise.ts
@@ -2,13 +2,13 @@
  * A type-safe utility function to create a Promise with resolve and reject functions.
  * @returns A tuple containing a Promise, a resolve function, and a reject function.
  */
-export function createPromise<T = void>(): [
+export function createPromise<T = unknown>(): [
 	Promise<T>,
-	(value: T) => void,
-	(error: unknown) => void
+	(value: T) => unknown,
+	(error: unknown) => unknown
 ] {
-	let resolve: undefined | ((resolved: T) => void) = undefined;
-	let reject: undefined | ((error: unknown) => void) = undefined;
+	let resolve: undefined | ((resolved: T) => unknown) = undefined;
+	let reject: undefined | ((error: unknown) => unknown) = undefined;
 
 	const creationPromise = new Promise<T>(
 		(resolve_, reject_) => ((resolve = resolve_), (reject = reject_))
diff --git a/frontend/test-client/src/agent/mock-client.ts b/frontend/test-client/src/agent/mock-client.ts
index 73235298..2833ba29 100644
--- a/frontend/test-client/src/agent/mock-client.ts
+++ b/frontend/test-client/src/agent/mock-client.ts
@@ -37,7 +37,7 @@ export class MockClient implements FileSystemOperations {
 			fs: this,
 			persistence: {
 				load: async () => this.data,
-				save: async (data) => void (this.data = data)
+				save: async (data) => (this.data = data)
 			},
 			fetch: fetchImplementation,
 			webSocket: webSocketImplementation
@@ -78,9 +78,9 @@ export class MockClient implements FileSystemOperations {
 		);
 		this.localFiles.set(path, newContent);
 
-		this.executeFileOperation(() => {
-			void this.client.syncLocallyCreatedFile(path);
-		});
+		this.executeFileOperation(async () =>
+			this.client.syncLocallyCreatedFile(path)
+		);
 	}
 
 	public async createDirectory(_path: RelativePath): Promise<void> {
@@ -120,11 +120,11 @@ export class MockClient implements FileSystemOperations {
 			`Updated file ${path} with:\n  current content: ${currentContent}\n  new content: ${newContent}`
 		);
 
-		this.executeFileOperation(() => {
-			void this.client.syncLocallyUpdatedFile({
+		this.executeFileOperation(async () =>
+			this.client.syncLocallyUpdatedFile({
 				relativePath: path
-			});
-		});
+			})
+		);
 
 		return newContent;
 	}
@@ -137,13 +137,13 @@ export class MockClient implements FileSystemOperations {
 			`Updated file ${path} with:\n  new content: ${new TextDecoder().decode(content)}`
 		);
 
-		this.executeFileOperation(() => {
+		this.executeFileOperation(async () => {
 			if (hasExisted) {
-				void this.client.syncLocallyUpdatedFile({
+				return this.client.syncLocallyUpdatedFile({
 					relativePath: path
 				});
 			} else {
-				void this.client.syncLocallyCreatedFile(path);
+				return this.client.syncLocallyCreatedFile(path);
 			}
 		});
 	}
@@ -154,9 +154,9 @@ export class MockClient implements FileSystemOperations {
 		);
 		this.localFiles.delete(path);
 
-		this.executeFileOperation(() => {
-			void this.client.syncLocallyDeletedFile(path);
-		});
+		this.executeFileOperation(async () =>
+			this.client.syncLocallyDeletedFile(path)
+		);
 	}
 
 	public async rename(
@@ -176,15 +176,15 @@ export class MockClient implements FileSystemOperations {
 			`Renamed file: ${oldPath} -> ${newPath} with:\n  content ${new TextDecoder().decode(file)}`
 		);
 
-		this.executeFileOperation(() => {
-			void this.client.syncLocallyUpdatedFile({
+		this.executeFileOperation(async () =>
+			this.client.syncLocallyUpdatedFile({
 				oldPath,
 				relativePath: newPath
-			});
-		});
+			})
+		);
 	}
 
-	private executeFileOperation(callback: () => void): void {
+	private executeFileOperation(callback: () => unknown): void {
 		if (this.useSlowFileEvents) {
 			// we aren't the best client and it takes some time to notice changes
 			setTimeout(callback, Math.random() * 100);

From a36a24effc2c75ffd91b0ae8e4984695cce4a944 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Mon, 25 Aug 2025 17:15:52 +0100
Subject: [PATCH 544/761] Fix main & improve cursor sync (#101)

---
 .github/workflows/check.yml                   |  31 +-
 frontend/obsidian-plugin/package.json         |   3 +-
 .../src/debugging/flaky-websocket-factory.ts  |  34 +--
 .../obsidian-plugin/src/vault-link-plugin.ts  |   4 +-
 .../views/cursors/remote-cursors-plugin.ts    | 273 +++++++++++-------
 .../views/cursors/update-selection.test.ts    | 111 -------
 .../src/views/cursors/update-selection.ts     |  40 ---
 .../editor-sync-line/editor-sync-line.ts      |   4 +-
 frontend/package-lock.json                    |   1 +
 .../safe-filesystem-operations.ts             |  70 ++---
 frontend/sync-client/src/index.ts             |   4 +-
 .../sync-client/src/persistence/database.ts   |   8 +-
 .../src/services/types/DocumentWithCursors.ts |   2 +-
 .../src/services/websocket-manager.ts         |   2 +-
 frontend/sync-client/src/sync-client.ts       | 181 ++----------
 .../src/sync-operations/cursor-tracker.ts     | 253 ++++++++++++++++
 .../sync-operations/file-change-notifier.ts   |  15 +
 .../sync-client/src/sync-operations/syncer.ts | 109 ++++---
 ...date-status.ts => document-sync-status.ts} |   2 +-
 .../src/types/document-up-to-dateness.ts      |   5 +
 .../types/maybe-outdated-client-cursors.ts    |   2 +-
 .../sync-client/src/utils/create-promise.ts   |  14 +-
 frontend/sync-client/src/utils/locks.test.ts  | 257 +++++++++++++----
 frontend/sync-client/src/utils/locks.ts       |  76 ++++-
 frontend/test-client/src/agent/mock-client.ts |   2 +-
 .../src/utils/flaky-websocket-factory.ts      |  33 ++-
 scripts/check.sh                              |  27 ++
 sync-server/Cargo.toml                        |   2 +-
 sync-server/rust-toolchain.toml               |   2 +-
 sync-server/rustfmt.toml                      |   8 -
 sync-server/src/app_state/cursors.rs          |   6 +-
 sync-server/src/app_state/database/models.rs  |   4 +-
 sync-server/src/app_state/websocket/models.rs |   9 +-
 sync-server/src/server.rs                     |   8 +-
 sync-server/src/server/device_id_header.rs    |   6 +-
 sync-server/src/utils/normalize.rs            |   4 +-
 36 files changed, 926 insertions(+), 686 deletions(-)
 delete mode 100644 frontend/obsidian-plugin/src/views/cursors/update-selection.test.ts
 delete mode 100644 frontend/obsidian-plugin/src/views/cursors/update-selection.ts
 create mode 100644 frontend/sync-client/src/sync-operations/cursor-tracker.ts
 create mode 100644 frontend/sync-client/src/sync-operations/file-change-notifier.ts
 rename frontend/sync-client/src/types/{document-update-status.ts => document-sync-status.ts} (59%)
 create mode 100644 frontend/sync-client/src/types/document-up-to-dateness.ts
 create mode 100755 scripts/check.sh
 delete mode 100644 sync-server/rustfmt.toml

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index cb54ca89..0f0d18e1 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -30,32 +30,5 @@ jobs:
           sqlx database create --database-url sqlite://db.sqlite3
           sqlx migrate run --source src/app_state/database/migrations --database-url sqlite://db.sqlite3
 
-      - name: Lint sync-server
-        run: |
-          cd sync-server
-          cargo clippy --all-targets --all-features
-          cargo fmt --all -- --check
-          cargo machete
-
-      - name: Test sync-server
-        run: |
-          cd sync-server
-          cargo test --verbose
-
-      - name: Lint frontend
-        run: |
-          cd frontend
-          npm ci
-          npm run build
-          npm run lint
-          if [[ $(git status --porcelain) ]]; then
-              git status --porcelain
-              echo "Failing CI because the working directory is not clean after linting"
-              exit 1
-          fi
-
-      - name: Test frontend
-        run: |
-          cd frontend
-          npm ci
-          npm run test
+      - name: Lint & test
+        run: scripts/check.sh
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index 24a95e03..0d004408 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -34,6 +34,7 @@
         "url": "^0.11.4",
         "virtual-scroller": "^1.13.1",
         "webpack": "^5.99.9",
-        "webpack-cli": "^6.0.1"
+        "webpack-cli": "^6.0.1",
+        "reconcile-text": "^0.5.0"
     }
 }
diff --git a/frontend/obsidian-plugin/src/debugging/flaky-websocket-factory.ts b/frontend/obsidian-plugin/src/debugging/flaky-websocket-factory.ts
index 56310aa6..f59cce19 100644
--- a/frontend/obsidian-plugin/src/debugging/flaky-websocket-factory.ts
+++ b/frontend/obsidian-plugin/src/debugging/flaky-websocket-factory.ts
@@ -24,15 +24,18 @@ export function flakyWebSocketFactory(
 
 		public set onmessage(callback: (event: MessageEvent) => void) {
 			super.onmessage = async (event: MessageEvent): Promise<void> => {
-				await this.locks.waitForLock(FlakyWebSocket.RECEIVE_KEY);
+				await this.locks.withLock(
+					FlakyWebSocket.RECEIVE_KEY,
+					async () => {
+						if (jitterScaleInSeconds > 0) {
+							await sleep(
+								Math.random() * jitterScaleInSeconds * 1000
+							);
+						}
 
-				if (jitterScaleInSeconds > 0) {
-					await sleep(Math.random() * jitterScaleInSeconds * 1000);
-				}
-
-				callback(event);
-
-				this.locks.unlock(FlakyWebSocket.RECEIVE_KEY);
+						callback(event);
+					}
+				);
 			};
 		}
 
@@ -66,15 +69,12 @@ export function flakyWebSocketFactory(
 			data: string | ArrayBufferLike | Blob | ArrayBufferView
 		): Promise<void> {
 			// maintain message order
-			await this.locks.waitForLock(FlakyWebSocket.SEND_KEY);
-
-			if (jitterScaleInSeconds > 0) {
-				await sleep(Math.random() * jitterScaleInSeconds * 1000);
-			}
-
-			super.send(data);
-
-			this.locks.unlock(FlakyWebSocket.SEND_KEY);
+			await this.locks.withLock(FlakyWebSocket.SEND_KEY, async () => {
+				if (jitterScaleInSeconds > 0) {
+					await sleep(Math.random() * jitterScaleInSeconds * 1000);
+				}
+				super.send(data);
+			});
 		}
 	} as unknown as typeof WebSocket;
 }
diff --git a/frontend/obsidian-plugin/src/vault-link-plugin.ts b/frontend/obsidian-plugin/src/vault-link-plugin.ts
index 0d4c1a1d..7e0eff1b 100644
--- a/frontend/obsidian-plugin/src/vault-link-plugin.ts
+++ b/frontend/obsidian-plugin/src/vault-link-plugin.ts
@@ -19,7 +19,7 @@ import { updateEditorStatusDisplay } from "./views/editor-sync-line/editor-sync-
 import { remoteCursorsTheme } from "./views/cursors/remote-cursor-theme";
 import {
 	remoteCursorsPlugin,
-	setCursors
+	RemoteCursorsPluginValue
 } from "./views/cursors/remote-cursors-plugin";
 import { LocalCursorUpdateListener } from "./views/cursors/local-cursor-update-listener";
 import { slowFetchFactory } from "./debugging/slow-fetch-factory";
@@ -93,7 +93,7 @@ export default class VaultLinkPlugin extends Plugin {
 		this.registerEditorExtension([remoteCursorsTheme, remoteCursorsPlugin]);
 
 		this.client.addRemoteCursorsUpdateListener((cursors) => {
-			setCursors(cursors, this.app);
+			RemoteCursorsPluginValue.setCursors(cursors, this.app);
 		});
 
 		const cursorListener = new LocalCursorUpdateListener(
diff --git a/frontend/obsidian-plugin/src/views/cursors/remote-cursors-plugin.ts b/frontend/obsidian-plugin/src/views/cursors/remote-cursors-plugin.ts
index 661aa452..5dff2c59 100644
--- a/frontend/obsidian-plugin/src/views/cursors/remote-cursors-plugin.ts
+++ b/frontend/obsidian-plugin/src/views/cursors/remote-cursors-plugin.ts
@@ -9,104 +9,201 @@ import type {
 	ViewUpdate
 } from "@codemirror/view";
 import { RemoteCursorWidget } from "./remote-cursor-widget";
-import type {
-	CursorSpan,
-	DocumentWithMaybeOutdatedClientCursors
-} from "sync-client";
+import type { CursorSpan, MaybeOutdatedClientCursors } from "sync-client";
 import type { App } from "obsidian";
 import { MarkdownView } from "obsidian";
 
-let cursors: {
-	name: string;
-	path: string;
-	span: CursorSpan;
-	deviceId: string;
-}[] = [];
-
 import { StateEffect } from "@codemirror/state";
 import { getRandomColor } from "src/utils/get-random-color";
-import { updateSelection } from "./update-selection";
+import type { SpanWithHistory } from "reconcile-text";
+import { reconcileWithHistory } from "reconcile-text";
+
+function findWhereToMoveCursor(
+	cursor: number,
+	spans: SpanWithHistory[]
+): number | null {
+	let position = 0;
+	for (const span of spans) {
+		// left and origin are the same
+		if (position === cursor && span.history === "AddedFromRight") {
+			return position + span.text.length;
+		}
+		position += span.text.length;
+		if (position === cursor && span.history === "RemovedFromRight") {
+			return position - span.text.length;
+		}
+	}
+
+	return null;
+}
 
 const forceUpdate = StateEffect.define();
 
 export class RemoteCursorsPluginValue implements PluginValue {
+	private static cursors: {
+		name: string;
+		path: string;
+		span: CursorSpan;
+		deviceId: string;
+		isOutdated: boolean;
+	}[] = [];
+
 	public decorations: DecorationSet = RangeSet.of([]);
 
-	public update(update: ViewUpdate): void {
-		update.changes.iterChanges((fromA, toA, fromB, toB, _inserted) => {
-			const spans = cursors.map((cursor) => cursor.span);
-			updateSelection({
-				fromA,
-				toA,
-				fromB,
-				toB,
-				spans
+	public static setCursors(
+		clients: MaybeOutdatedClientCursors[],
+		app: App
+	): void {
+		RemoteCursorsPluginValue.cursors = [
+			...RemoteCursorsPluginValue.cursors.filter(({ deviceId }) =>
+				clients.some(
+					(client) =>
+						client.deviceId === deviceId && client.isOutdated
+				)
+			),
+			...clients
+				.filter(
+					({ isOutdated, deviceId }) =>
+						!isOutdated ||
+						RemoteCursorsPluginValue.cursors.every(
+							(c) => deviceId !== c.deviceId
+						)
+				)
+				.flatMap((client) => {
+					const clientCursors = client.documentsWithCursors;
+					return clientCursors.flatMap((cursor) =>
+						cursor.cursors.map((span) => ({
+							name: client.userName,
+							path: cursor.relative_path,
+							deviceId: client.deviceId,
+							isOutdated: client.isOutdated,
+							span: { ...span }
+						}))
+					);
+				})
+		];
+
+		app.workspace
+			.getLeavesOfType("markdown")
+			.map((leaf) => leaf.view)
+			.filter((view) => view instanceof MarkdownView)
+			.forEach((view) => {
+				// @ts-expect-error, not typed
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+				const editor = view.editor.cm as EditorView;
+
+				editor.dispatch({
+					effects: [forceUpdate.of(null)]
+				});
 			});
+	}
+
+	public update(update: ViewUpdate): void {
+		const original = update.startState.doc.toString();
+		const edited = update.state.doc.toString();
+
+		const updatedPositions: number[] = [];
+		const reconciled = reconcileWithHistory(
+			original,
+			{
+				text: original,
+				cursors: RemoteCursorsPluginValue.cursors.flatMap(
+					({ span }, i) => [
+						{ id: i * 2, position: span.start },
+						{ id: i * 2 + 1, position: span.end }
+					]
+				)
+			},
+			edited,
+			"Character"
+		);
+
+		reconciled.cursors.forEach(({ id, position }) => {
+			const whereToJump = findWhereToMoveCursor(
+				position,
+				reconciled.history
+			);
+			if (whereToJump !== null) {
+				updatedPositions[id] = whereToJump;
+			} else {
+				updatedPositions[id] = position;
+			}
+		});
+
+		RemoteCursorsPluginValue.cursors.forEach(({ span }, i) => {
+			span.start = updatedPositions[i * 2];
+			span.end = updatedPositions[i * 2 + 1];
 		});
 
 		const decorations: Range<Decoration>[] = [];
 
-		cursors.forEach(({ name, span: { start, end } }) => {
-			const color = getRandomColor(name);
-			const startLine = update.view.state.doc.lineAt(start);
-			const endLine = update.view.state.doc.lineAt(end);
+		RemoteCursorsPluginValue.cursors.forEach(
+			({ name, span: { start, end } }) => {
+				const color = getRandomColor(name);
+				const startLine = update.view.state.doc.lineAt(start);
+				const endLine = update.view.state.doc.lineAt(end);
 
-			const attributes = {
-				style: `background-color: ${color};`
-			};
+				const attributes = {
+					style: `background-color: ${color};`
+				};
 
-			if (startLine.number === endLine.number) {
-				// selected content in a single line.
-				decorations.push({
-					from: start,
-					to: end,
-					value: Decoration.mark({
-						attributes
-					})
-				});
-			} else {
-				// selected content in multiple lines
-				// first, render text-selection in the first line
-				decorations.push({
-					from: start,
-					to: startLine.from + startLine.length,
-					value: Decoration.mark({
-						attributes
-					})
-				});
-
-				// render text-selection in the lines between the first and last line
-				for (let i = startLine.number + 1; i < endLine.number; i++) {
-					const currentLine = update.view.state.doc.line(i);
+				if (startLine.number === endLine.number) {
+					// selected content in a single line.
 					decorations.push({
-						from: currentLine.from,
-						to: currentLine.to,
+						from: start,
+						to: end,
+						value: Decoration.mark({
+							attributes
+						})
+					});
+				} else {
+					// selected content in multiple lines
+					// first, render text-selection in the first line
+					decorations.push({
+						from: start,
+						to: startLine.from + startLine.length,
+						value: Decoration.mark({
+							attributes
+						})
+					});
+
+					// render text-selection in the lines between the first and last line
+					for (
+						let i = startLine.number + 1;
+						i < endLine.number;
+						i++
+					) {
+						const currentLine = update.view.state.doc.line(i);
+						decorations.push({
+							from: currentLine.from,
+							to: currentLine.to,
+							value: Decoration.mark({
+								attributes
+							})
+						});
+					}
+
+					// render text-selection in the last line
+					decorations.push({
+						from: endLine.from,
+						to: end,
 						value: Decoration.mark({
 							attributes
 						})
 					});
 				}
 
-				// render text-selection in the last line
 				decorations.push({
-					from: endLine.from,
+					from: end,
 					to: end,
-					value: Decoration.mark({
-						attributes
+					value: Decoration.widget({
+						side: end - start > 0 ? -1 : 1, // the local cursor should be rendered outside the remote selection
+						block: false,
+						widget: new RemoteCursorWidget(color, name)
 					})
 				});
 			}
-
-			decorations.push({
-				from: end,
-				to: end,
-				value: Decoration.widget({
-					side: end - start > 0 ? -1 : 1, // the local cursor should be rendered outside the remote selection
-					block: false,
-					widget: new RemoteCursorWidget(color, name)
-				})
-			});
-		});
+		);
 
 		this.decorations = Decoration.set(decorations, true);
 	}
@@ -118,43 +215,3 @@ export const remoteCursorsPlugin = ViewPlugin.fromClass(
 		decorations: (v) => v.decorations
 	}
 );
-
-export function setCursors(
-	clients: DocumentWithMaybeOutdatedClientCursors[],
-	app: App
-): void {
-	cursors = [
-		...cursors.filter(({ deviceId }) =>
-			clients.some(
-				(client) => client.deviceId === deviceId && client.isOutdated
-			)
-		),
-		...clients
-			.filter(({ isOutdated }) => !isOutdated)
-			.flatMap((client) => {
-				const clientCursors = client.documentsWithCursors;
-				return clientCursors.flatMap((cursor) =>
-					cursor.cursors.map((span) => ({
-						name: client.userName,
-						path: cursor.relative_path,
-						deviceId: client.deviceId,
-						span
-					}))
-				);
-			})
-	];
-
-	app.workspace
-		.getLeavesOfType("markdown")
-		.map((leaf) => leaf.view)
-		.filter((view) => view instanceof MarkdownView)
-		.forEach((view) => {
-			// @ts-expect-error, not typed
-			// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-			const editor = view.editor.cm as EditorView;
-
-			editor.dispatch({
-				effects: [forceUpdate.of(null)]
-			});
-		});
-}
diff --git a/frontend/obsidian-plugin/src/views/cursors/update-selection.test.ts b/frontend/obsidian-plugin/src/views/cursors/update-selection.test.ts
deleted file mode 100644
index 991ff76b..00000000
--- a/frontend/obsidian-plugin/src/views/cursors/update-selection.test.ts
+++ /dev/null
@@ -1,111 +0,0 @@
-import { updateSelection } from "./update-selection";
-
-describe("Selection update", () => {
-	it("should handle span fully before - insert", () => {
-		const spans = [{ start: 3, end: 5 }];
-		updateSelection({
-			fromA: 0,
-			toA: 0,
-			fromB: 0,
-			toB: 2,
-			spans
-		});
-		expect(spans).toEqual([{ start: 5, end: 7 }]);
-	});
-
-	it("should handle span fully before - delete", () => {
-		const spans = [{ start: 3, end: 5 }];
-		updateSelection({
-			fromA: 0,
-			toA: 2,
-			fromB: 0,
-			toB: 0,
-			spans
-		});
-		expect(spans).toEqual([{ start: 1, end: 3 }]);
-	});
-
-	it("should handle span fully after - insert", () => {
-		const spans = [{ start: 3, end: 5 }];
-		updateSelection({
-			fromA: 6,
-			toA: 6,
-			fromB: 6,
-			toB: 10,
-			spans
-		});
-		expect(spans).toEqual([{ start: 3, end: 5 }]);
-	});
-
-	it("should handle span fully after - delete", () => {
-		const spans = [{ start: 3, end: 5 }];
-		updateSelection({
-			fromA: 6,
-			toA: 10,
-			fromB: 6,
-			toB: 6,
-			spans
-		});
-		expect(spans).toEqual([{ start: 3, end: 5 }]);
-	});
-
-	it("should handle span fully within - insert", () => {
-		const spans = [{ start: 3, end: 5 }];
-		updateSelection({
-			fromA: 4,
-			toA: 4,
-			fromB: 4,
-			toB: 6,
-			spans
-		});
-		expect(spans).toEqual([{ start: 3, end: 7 }]);
-	});
-
-	it("should handle span fully within - delete", () => {
-		const spans = [{ start: 3, end: 5 }];
-		updateSelection({
-			fromA: 4,
-			toA: 5,
-			fromB: 4,
-			toB: 4,
-			spans
-		});
-		expect(spans).toEqual([{ start: 3, end: 4 }]);
-	});
-
-	it("should handle span overlapping with start", () => {
-		const spans = [{ start: 3, end: 5 }];
-		updateSelection({
-			fromA: 2,
-			toA: 4,
-			fromB: 2,
-			toB: 2,
-			spans
-		});
-		expect(spans).toEqual([{ start: 2, end: 4 }]);
-	});
-
-	it("should handle span overlapping with end", () => {
-		const spans = [{ start: 3, end: 5 }];
-		updateSelection({
-			fromA: 4,
-			toA: 6,
-			fromB: 4,
-			toB: 4,
-			spans
-		});
-		expect(spans).toEqual([{ start: 3, end: 4 }]);
-	});
-
-	it("delete entire selection", () => {
-		const spans = [{ start: 3, end: 5 }];
-		updateSelection({
-			fromA: 0,
-			toA: 10,
-			fromB: 0,
-			toB: 0,
-			spans
-		});
-		expect(spans).toEqual([{ start: 0, end: 0 }]);
-	});
-});
diff --git a/frontend/obsidian-plugin/src/views/cursors/update-selection.ts b/frontend/obsidian-plugin/src/views/cursors/update-selection.ts
deleted file mode 100644
index 9ff7c207..00000000
--- a/frontend/obsidian-plugin/src/views/cursors/update-selection.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import type { CursorSpan } from "sync-client";
-
-export const updateSelection = ({
-	fromA,
-	toA,
-	toB,
-	spans
-}: {
-	fromA: number;
-	toA: number;
-	fromB: number;
-	toB: number;
-	spans: CursorSpan[];
-}): void => {
-	spans.forEach((span) => {
-		if (fromA <= span.start) {
-			// the change covers the entirety of the selection
-			if (toA > span.end) {
-				span.start = toB;
-				span.end = toB;
-				return;
-			}
-
-			let change = toB - toA;
-			if (change < 0) {
-				// it's a deletion
-				// if overlaps with the start, we can't move it back more than the deleted range
-				change = Math.max(change, fromA - span.start);
-			}
-
-			span.start += change;
-			span.end += change;
-		} else if (toA <= span.end) {
-			span.end += toB - toA;
-		} else if (toB <= span.end) {
-			// a deletion overlaps with the end, so we move the end
-			span.end = toB;
-		}
-	});
-};
diff --git a/frontend/obsidian-plugin/src/views/editor-sync-line/editor-sync-line.ts b/frontend/obsidian-plugin/src/views/editor-sync-line/editor-sync-line.ts
index 67750687..78ef1bd8 100644
--- a/frontend/obsidian-plugin/src/views/editor-sync-line/editor-sync-line.ts
+++ b/frontend/obsidian-plugin/src/views/editor-sync-line/editor-sync-line.ts
@@ -1,7 +1,7 @@
 import type { Workspace } from "obsidian";
 import { FileView, setIcon } from "obsidian";
 import type { SyncClient } from "sync-client";
-import { DocumentUpdateStatus } from "sync-client";
+import { DocumentSyncStatus } from "sync-client";
 import "./editor-sync-line.scss";
 
 export function updateEditorStatusDisplay(
@@ -35,7 +35,7 @@ export function updateEditorStatusDisplay(
 
 			const isLoading =
 				client.getDocumentSyncingStatus(filePath) ==
-				DocumentUpdateStatus.SYNCING;
+				DocumentSyncStatus.SYNCING;
 
 			if (isLoading) {
 				element.classList.add("loading");
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 36221400..f73ac157 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -6373,6 +6373,7 @@
 				"jest": "^29.7.0",
 				"mini-css-extract-plugin": "^2.9.2",
 				"obsidian": "1.8.7",
+				"reconcile-text": "^0.5.0",
 				"resolve-url-loader": "^5.0.0",
 				"sass": "^1.89.1",
 				"sass-loader": "^16.0.5",
diff --git a/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts b/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
index 214f9f6e..2b1f908a 100644
--- a/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
+++ b/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
@@ -31,16 +31,17 @@ export class SafeFileSystemOperations implements FileSystemOperations {
 		this.logger.debug(`Reading file '${path}'`);
 		return this.safeOperation(
 			path,
-			this.decorateToHoldLock(path, async () => this.fs.read(path)),
+			async () =>
+				this.locks.withLock(path, async () => this.fs.read(path)),
 			"read"
 		);
 	}
 
 	public async write(path: RelativePath, content: Uint8Array): Promise<void> {
 		this.logger.debug(`Writing to file '${path}'`);
-		return this.decorateToHoldLock(path, async () =>
+		return this.locks.withLock(path, async () =>
 			this.fs.write(path, content)
-		)();
+		);
 	}
 
 	public async atomicUpdateText(
@@ -50,9 +51,10 @@ export class SafeFileSystemOperations implements FileSystemOperations {
 		this.logger.debug(`Atomically updating file '${path}'`);
 		return this.safeOperation(
 			path,
-			this.decorateToHoldLock(path, async () =>
-				this.fs.atomicUpdateText(path, updater)
-			),
+			async () =>
+				this.locks.withLock(path, async () =>
+					this.fs.atomicUpdateText(path, updater)
+				),
 			"atomicUpdateText"
 		);
 	}
@@ -61,32 +63,29 @@ export class SafeFileSystemOperations implements FileSystemOperations {
 		// Logging this would be too noisy
 		return this.safeOperation(
 			path,
-			this.decorateToHoldLock(path, async () =>
-				this.fs.getFileSize(path)
-			),
+			async () =>
+				this.locks.withLock(path, async () =>
+					this.fs.getFileSize(path)
+				),
 			"getFileSize"
 		);
 	}
 
 	public async exists(path: RelativePath): Promise<boolean> {
 		this.logger.debug(`Checking if file '${path}' exists`);
-		return this.decorateToHoldLock(path, async () =>
-			this.fs.exists(path)
-		)();
+		return this.locks.withLock(path, async () => this.fs.exists(path));
 	}
 
 	public async createDirectory(path: RelativePath): Promise<void> {
 		this.logger.debug(`Creating directory '${path}'`);
-		return this.decorateToHoldLock(path, async () =>
+		return this.locks.withLock(path, async () =>
 			this.fs.createDirectory(path)
-		)();
+		);
 	}
 
 	public async delete(path: RelativePath): Promise<void> {
 		this.logger.debug(`Deleting file '${path}'`);
-		return this.decorateToHoldLock(path, async () =>
-			this.fs.delete(path)
-		)();
+		return this.locks.withLock(path, async () => this.fs.delete(path));
 	}
 
 	public async rename(
@@ -96,43 +95,14 @@ export class SafeFileSystemOperations implements FileSystemOperations {
 		this.logger.debug(`Renaming file '${oldPath}' to '${newPath}'`);
 		return this.safeOperation(
 			oldPath,
-			this.decorateToHoldLock([oldPath, newPath], async () =>
-				this.fs.rename(oldPath, newPath)
-			),
+			async () =>
+				this.locks.withLock([oldPath, newPath], async () =>
+					this.fs.rename(oldPath, newPath)
+				),
 			"rename"
 		);
 	}
 
-	/**
-	 * Decorate an operation to ensure that the file is locked before running it
-	 * and that the lock is released afterwards. This results in at-most one
-	 * concurrent operation running per file.
-	 */
-	private decorateToHoldLock<T>(
-		pathOrPaths: RelativePath | RelativePath[],
-		operation: () => Promise<T>
-	): () => Promise<T> {
-		return async () => {
-			const paths = Array.isArray(pathOrPaths)
-				? pathOrPaths
-				: [pathOrPaths];
-
-			await Promise.all(
-				paths.map(async (path) => this.locks.waitForLock(path))
-			);
-
-			try {
-				return await operation();
-			} finally {
-				await Promise.all(
-					paths.map((path) => {
-						this.locks.unlock(path);
-					})
-				);
-			}
-		};
-	}
-
 	/**
 	 * Decorate an operation to ensure that the file exists before running it.
 	 * If the operation fails, it will check if the file still exists and throw
diff --git a/frontend/sync-client/src/index.ts b/frontend/sync-client/src/index.ts
index ce903f25..00b19940 100644
--- a/frontend/sync-client/src/index.ts
+++ b/frontend/sync-client/src/index.ts
@@ -18,8 +18,8 @@ export type { PersistenceProvider } from "./persistence/persistence";
 export type { CursorSpan } from "./services/types/CursorSpan";
 export type { ClientCursors } from "./services/types/ClientCursors";
 export type { NetworkConnectionStatus } from "./types/network-connection-status";
-export type { DocumentWithMaybeOutdatedClientCursors } from "./types/maybe-outdated-client-cursors";
-export { DocumentUpdateStatus } from "./types/document-update-status";
+export type { MaybeOutdatedClientCursors } from "./types/maybe-outdated-client-cursors";
+export { DocumentSyncStatus } from "./types/document-sync-status";
 export { SyncClient } from "./sync-client";
 
 import { Locks } from "./utils/locks";
diff --git a/frontend/sync-client/src/persistence/database.ts b/frontend/sync-client/src/persistence/database.ts
index 0abefd4f..9425c629 100644
--- a/frontend/sync-client/src/persistence/database.ts
+++ b/frontend/sync-client/src/persistence/database.ts
@@ -37,7 +37,7 @@ export interface DocumentRecord {
 	documentId: DocumentId;
 	metadata: DocumentMetadata | undefined;
 	isDeleted: boolean;
-	updates: Promise<void>[];
+	updates: Promise<unknown>[];
 	parallelVersion: number;
 }
 
@@ -135,7 +135,7 @@ export class Database {
 		this.save();
 	}
 
-	public removeDocumentPromise(promise: Promise<void>): void {
+	public removeDocumentPromise(promise: Promise<unknown>): void {
 		const entry = this.documents.find(({ updates }) =>
 			updates.includes(promise)
 		);
@@ -167,7 +167,7 @@ export class Database {
 
 	public async getResolvedDocumentByRelativePath(
 		relativePath: RelativePath,
-		promise: Promise<void>
+		promise: Promise<unknown>
 	): Promise<DocumentRecord> {
 		const entry = this.getLatestDocumentByRelativePath(relativePath);
 
@@ -191,7 +191,7 @@ export class Database {
 	public createNewPendingDocument(
 		documentId: DocumentId,
 		relativePath: RelativePath,
-		promise: Promise<void>
+		promise: Promise<unknown>
 	): DocumentRecord {
 		const previousEntry =
 			this.getLatestDocumentByRelativePath(relativePath);
diff --git a/frontend/sync-client/src/services/types/DocumentWithCursors.ts b/frontend/sync-client/src/services/types/DocumentWithCursors.ts
index cbe56399..dae654c7 100644
--- a/frontend/sync-client/src/services/types/DocumentWithCursors.ts
+++ b/frontend/sync-client/src/services/types/DocumentWithCursors.ts
@@ -2,7 +2,7 @@
 import type { CursorSpan } from "./CursorSpan";
 
 export interface DocumentWithCursors {
-	vault_update_id: number;
+	vault_update_id: number | null;
 	document_id: string;
 	relative_path: string;
 	cursors: CursorSpan[];
diff --git a/frontend/sync-client/src/services/websocket-manager.ts b/frontend/sync-client/src/services/websocket-manager.ts
index 3a5b32b4..dde8f068 100644
--- a/frontend/sync-client/src/services/websocket-manager.ts
+++ b/frontend/sync-client/src/services/websocket-manager.ts
@@ -152,7 +152,7 @@ export class WebSocketManager {
 				}
 				// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
 			} else if (message.type === "cursorPositions") {
-				this.logger.info(
+				this.logger.debug(
 					`Received cursor positions for ${JSON.stringify(message.clients)}`
 				);
 				this.remoteCursorsUpdateListeners.forEach((listener) => {
diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts
index c7f0ea1b..ddab8860 100644
--- a/frontend/sync-client/src/sync-client.ts
+++ b/frontend/sync-client/src/sync-client.ts
@@ -14,26 +14,16 @@ import { ConnectionStatus } from "./services/connection-status";
 import { UnrestrictedSyncer } from "./sync-operations/unrestricted-syncer";
 import { rateLimit } from "./utils/rate-limit";
 import type { NetworkConnectionStatus } from "./types/network-connection-status";
-import { DocumentUpdateStatus } from "./types/document-update-status";
+import { DocumentSyncStatus } from "./types/document-sync-status";
 import { WebSocketManager } from "./services/websocket-manager";
 import { createClientId } from "./utils/create-client-id";
+import { CursorTracker } from "./sync-operations/cursor-tracker";
 import type { CursorSpan } from "./services/types/CursorSpan";
-import type { ClientCursors } from "./services/types/ClientCursors";
-import type { DocumentWithCursors } from "./services/types/DocumentWithCursors";
-import { hash } from "./utils/hash";
-import type { DocumentWithMaybeOutdatedClientCursors } from "./types/maybe-outdated-client-cursors";
-
-enum DocumentUpToDateness {
-	UpToDate = "UpToDate",
-	Prior = "Prior",
-	Later = "Later"
-}
+import type { MaybeOutdatedClientCursors } from "./types/maybe-outdated-client-cursors";
+import { FileChangeNotifier } from "./sync-operations/file-change-notifier";
 
 export class SyncClient {
 	private static readonly MINIMUM_SAVE_INTERVAL_MS = 1000;
-	private lastCursorState: DocumentWithCursors[] = [];
-
-	private readonly knownClientCursors: ClientCursors[] = [];
 
 	// eslint-disable-next-line @typescript-eslint/max-params
 	private constructor(
@@ -45,7 +35,8 @@ export class SyncClient {
 		private readonly webSocketManager: WebSocketManager,
 		private readonly _logger: Logger,
 		private readonly connectionStatus: ConnectionStatus,
-		private readonly fileOperations: FileOperations
+		private readonly cursorTracker: CursorTracker,
+		private readonly fileChangeNotifier: FileChangeNotifier
 	) {
 		this.settings.addOnSettingsChangeListener(
 			async (newSettings, oldSettings) => {
@@ -54,10 +45,6 @@ export class SyncClient {
 				}
 			}
 		);
-
-		this.webSocketManager.addRemoteCursorsUpdateListener((cursors) => {
-			this.knownClientCursors.push(...cursors);
-		});
 	}
 
 	public get logger(): Logger {
@@ -148,7 +135,6 @@ export class SyncClient {
 		);
 
 		const syncer = new Syncer(
-			deviceId,
 			logger,
 			database,
 			settings,
@@ -166,6 +152,13 @@ export class SyncClient {
 			webSocket
 		);
 
+		const fileChangeNotifier = new FileChangeNotifier();
+		const cursorTracker = new CursorTracker(
+			database,
+			webSocketManager,
+			fileOperations,
+			fileChangeNotifier
+		);
 		const client = new SyncClient(
 			history,
 			settings,
@@ -175,7 +168,8 @@ export class SyncClient {
 			webSocketManager,
 			logger,
 			connectionStatus,
-			fileOperations
+			cursorTracker,
+			fileChangeNotifier
 		);
 
 		logger.info("SyncClient initialised");
@@ -264,12 +258,14 @@ export class SyncClient {
 	public async syncLocallyCreatedFile(
 		relativePath: RelativePath
 	): Promise<void> {
+		this.fileChangeNotifier.notifyOfFileChange(relativePath);
 		return this.syncer.syncLocallyCreatedFile(relativePath);
 	}
 
 	public async syncLocallyDeletedFile(
 		relativePath: RelativePath
 	): Promise<void> {
+		this.fileChangeNotifier.notifyOfFileChange(relativePath);
 		return this.syncer.syncLocallyDeletedFile(relativePath);
 	}
 
@@ -280,6 +276,7 @@ export class SyncClient {
 		oldPath?: RelativePath;
 		relativePath: RelativePath;
 	}): Promise<void> {
+		this.fileChangeNotifier.notifyOfFileChange(relativePath);
 		return this.syncer.syncLocallyUpdatedFile({
 			oldPath,
 			relativePath
@@ -288,154 +285,26 @@ export class SyncClient {
 
 	public getDocumentSyncingStatus(
 		relativePath: RelativePath
-	): DocumentUpdateStatus {
+	): DocumentSyncStatus {
 		const document =
 			this.database.getLatestDocumentByRelativePath(relativePath);
 		if (document === undefined) {
-			return DocumentUpdateStatus.SYNCING;
+			return DocumentSyncStatus.SYNCING;
 		}
 		return document.updates.length > 0
-			? DocumentUpdateStatus.SYNCING
-			: DocumentUpdateStatus.UP_TO_DATE;
+			? DocumentSyncStatus.SYNCING
+			: DocumentSyncStatus.UP_TO_DATE;
 	}
 
-	/// Update the local cursors for the given documents.
-	/// Can be called frequently as it only emits an event
-	// if the state has actually changed.
 	public async updateLocalCursors(
 		documentToCursors: Record<RelativePath, CursorSpan[]>
 	): Promise<void> {
-		const documentsWithCursors: DocumentWithCursors[] = [];
-
-		for (const [relativePath, cursors] of Object.entries(
-			documentToCursors
-		)) {
-			const record =
-				this.database.getLatestDocumentByRelativePath(relativePath);
-
-			if (!record) {
-				continue; // Let's wait for the file to be created before sending cursors
-			}
-
-			const readContent = await this.fileOperations.read(relativePath);
-
-			if (record.metadata?.hash !== hash(readContent)) {
-				continue; // Wouldn't make sense to sync the positions in a dirty file
-			}
-
-			documentsWithCursors.push({
-				relative_path: relativePath,
-				document_id: record.documentId,
-				vault_update_id: record.metadata.parentVersionId,
-				cursors
-			});
-		}
-
-		if (
-			JSON.stringify(this.lastCursorState) ===
-			JSON.stringify(documentsWithCursors)
-		) {
-			return;
-		}
-
-		this.lastCursorState = documentsWithCursors;
-
-		this.webSocketManager.updateLocalCursors({ documentsWithCursors });
+		await this.cursorTracker.sendLocalCursorsToServer(documentToCursors);
 	}
 
 	public addRemoteCursorsUpdateListener(
-		listener: (cursors: DocumentWithMaybeOutdatedClientCursors[]) => unknown
+		listener: (cursors: MaybeOutdatedClientCursors[]) => unknown
 	): void {
-		this.webSocketManager.addRemoteCursorsUpdateListener(async () => {
-			listener(await this.getRelevantClientCursors());
-		});
-	}
-
-	private async getRelevantClientCursors(): Promise<
-		DocumentWithMaybeOutdatedClientCursors[]
-	> {
-		const result: DocumentWithMaybeOutdatedClientCursors[] = [];
-		const included = new Set<string>();
-		for (const clientCursors of [...this.knownClientCursors].reverse()) {
-			if (included.has(clientCursors.deviceId)) {
-				continue;
-			}
-
-			const upToDateness =
-				await this.getDocumentsUpToDateness(clientCursors);
-			if (upToDateness == DocumentUpToDateness.Later) {
-				continue;
-			}
-
-			result.push({
-				...clientCursors,
-				isOutdated: upToDateness == DocumentUpToDateness.Prior
-			});
-
-			included.add(clientCursors.deviceId);
-		}
-
-		return result;
-	}
-
-	private async getDocumentsUpToDateness(
-		clientCursor: ClientCursors
-	): Promise<DocumentUpToDateness> {
-		const results = [];
-		for (const document of clientCursor.documentsWithCursors) {
-			results.push(await this.getDocumentUpToDateness(document));
-		}
-
-		if (
-			results.every((result) => result === DocumentUpToDateness.UpToDate)
-		) {
-			return DocumentUpToDateness.UpToDate;
-		}
-
-		if (
-			results.every(
-				(result) =>
-					result === DocumentUpToDateness.UpToDate ||
-					result === DocumentUpToDateness.Prior
-			)
-		) {
-			return DocumentUpToDateness.Prior;
-		}
-
-		return DocumentUpToDateness.Later;
-	}
-
-	private async getDocumentUpToDateness(
-		document: DocumentWithCursors
-	): Promise<DocumentUpToDateness> {
-		const record = this.database.getLatestDocumentByRelativePath(
-			document.relative_path
-		);
-
-		if (!record) {
-			// the document of the cursor must be from the future
-			return DocumentUpToDateness.Later;
-		}
-
-		if (
-			(record.metadata?.parentVersionId ?? 0) < document.vault_update_id
-		) {
-			return DocumentUpToDateness.Later;
-		} else if (
-			document.vault_update_id < (record.metadata?.parentVersionId ?? 0)
-		) {
-			// the document of the cursor must be from the past
-			return DocumentUpToDateness.Prior;
-		}
-
-		const currentContent = await this.fileOperations.read(
-			document.relative_path
-		);
-
-		return this.database.getLatestDocumentByRelativePath(
-			document.relative_path
-		)?.metadata?.hash === hash(currentContent)
-			? DocumentUpToDateness.UpToDate
-			: DocumentUpToDateness.Prior;
+		this.cursorTracker.addRemoteCursorsUpdateListener(listener);
 	}
 }
diff --git a/frontend/sync-client/src/sync-operations/cursor-tracker.ts b/frontend/sync-client/src/sync-operations/cursor-tracker.ts
new file mode 100644
index 00000000..17f166c4
--- /dev/null
+++ b/frontend/sync-client/src/sync-operations/cursor-tracker.ts
@@ -0,0 +1,253 @@
+import type { FileOperations } from "../file-operations/file-operations";
+import type { Database, RelativePath } from "../persistence/database";
+import type { ClientCursors } from "../services/types/ClientCursors";
+import type { CursorSpan } from "../services/types/CursorSpan";
+import type { DocumentWithCursors } from "../services/types/DocumentWithCursors";
+import type { WebSocketManager } from "../services/websocket-manager";
+import type { MaybeOutdatedClientCursors } from "../types/maybe-outdated-client-cursors";
+import { DocumentUpToDateness } from "../types/document-up-to-dateness";
+import { hash } from "../utils/hash";
+import type { FileChangeNotifier } from "./file-change-notifier";
+import { Lock } from "../utils/locks";
+
+// Cursor positions are updated separately from documents. However, a given cursor position is only
+// valid within a certain version of the document it belongs to. This class tracks previous and the latest
+// known remote cursor positions, and for each document, tries to return the latest cursor positions that are
+// not from the future.
+export class CursorTracker {
+	private readonly updateLock = new Lock();
+
+	private knownRemoteCursors: (ClientCursors & {
+		upToDateness: DocumentUpToDateness;
+	})[] = [];
+
+	private lastLocalCursorState: DocumentWithCursors[] = [];
+	private lastLocalCursorStateWithoutDirtyDocuments: DocumentWithCursors[] =
+		[];
+
+	public constructor(
+		private readonly database: Database,
+		private readonly webSocketManager: WebSocketManager,
+		private readonly fileOperations: FileOperations,
+		private readonly fileChangeNotifier: FileChangeNotifier
+	) {
+		this.webSocketManager.addRemoteCursorsUpdateListener(
+			async (clientCursors) => {
+				await this.updateLock.withLock(async () => {
+					// The latest message will contain all active clients, so we can delete the ones
+					// from the local list which are no longer active.
+					const allIds = new Set(
+						clientCursors.map((c) => c.deviceId)
+					);
+					const updatedKnownRemoteCursors =
+						this.knownRemoteCursors.filter((c) =>
+							allIds.has(c.deviceId)
+						);
+
+					for (const cursor of clientCursors.filter((client) =>
+						client.documentsWithCursors.every(
+							(doc) => doc.vault_update_id != null
+						)
+					)) {
+						updatedKnownRemoteCursors.push({
+							...cursor,
+							upToDateness:
+								await this.getDocumentsUpToDateness(cursor)
+						});
+					}
+
+					this.knownRemoteCursors = updatedKnownRemoteCursors;
+				});
+			}
+		);
+
+		this.fileChangeNotifier.addFileChangeListener(async (relativePath) =>
+			this.updateLock.withLock(async () => {
+				for (const clientCursor of this.knownRemoteCursors) {
+					if (
+						clientCursor.documentsWithCursors.some(
+							(document) =>
+								document.relative_path === relativePath
+						)
+					) {
+						clientCursor.upToDateness =
+							await this.getDocumentsUpToDateness(clientCursor);
+					}
+				}
+			})
+		);
+	}
+
+	/// Update the local cursors for the given documents.
+	/// Can be called frequently as it only emits an event
+	/// if the state has actually changed.
+	public async sendLocalCursorsToServer(
+		documentToCursors: Record<RelativePath, CursorSpan[]>
+	): Promise<void> {
+		const documentsWithCursors: DocumentWithCursors[] = [];
+
+		for (const [relativePath, cursors] of Object.entries(
+			documentToCursors
+		)) {
+			const record =
+				this.database.getLatestDocumentByRelativePath(relativePath);
+
+			if (!record) {
+				continue; // Let's wait for the file to be created before sending cursors
+			}
+
+			if (!record.metadata) {
+				continue; // this is a new document, no need to sync the cursors
+			}
+
+			documentsWithCursors.push({
+				relative_path: relativePath,
+				document_id: record.documentId,
+				vault_update_id: record.metadata.parentVersionId,
+				cursors: cursors.map(({ start, end }) => ({
+					start: Math.min(start, end),
+					end: Math.max(start, end)
+				})) // the client might send directional selections
+			});
+		}
+
+		if (
+			JSON.stringify(this.lastLocalCursorState) ===
+			JSON.stringify(documentsWithCursors)
+		) {
+			// Caching step to avoid reading the edited files all the time
+			return;
+		}
+		this.lastLocalCursorState = documentsWithCursors;
+
+		for (const doc of documentsWithCursors) {
+			const readContent = await this.fileOperations.read(
+				doc.relative_path
+			);
+			const record = this.database.getLatestDocumentByRelativePath(
+				doc.relative_path
+			);
+			if (record?.metadata?.hash !== hash(readContent)) {
+				doc.vault_update_id = null;
+			}
+		}
+
+		if (
+			JSON.stringify(this.lastLocalCursorStateWithoutDirtyDocuments) ===
+			JSON.stringify(documentsWithCursors)
+		) {
+			return;
+		}
+
+		this.lastLocalCursorStateWithoutDirtyDocuments = documentsWithCursors;
+
+		this.webSocketManager.updateLocalCursors({ documentsWithCursors });
+	}
+
+	// The returned position may be accurate, if it matches the document version, or outdated, in which case
+	// the client has to heuristically guess it's current position based on the local edits.
+	public addRemoteCursorsUpdateListener(
+		listener: (cursors: MaybeOutdatedClientCursors[]) => unknown
+	): void {
+		// CursorTracker registers its own event listener in the constructor so it must have been called before this
+		this.webSocketManager.addRemoteCursorsUpdateListener(async () => {
+			await this.updateLock.withLock(() =>
+				listener(this.getRelevantAndPruneKnownClientCursors())
+			);
+		});
+	}
+
+	private getRelevantAndPruneKnownClientCursors(): MaybeOutdatedClientCursors[] {
+		const result: MaybeOutdatedClientCursors[] = [];
+		const included = new Set<string>();
+
+		const relevantCursors = [];
+		for (const clientCursors of [...this.knownRemoteCursors].reverse()) {
+			if (included.has(clientCursors.deviceId)) {
+				continue;
+			}
+
+			if (clientCursors.upToDateness == DocumentUpToDateness.Later) {
+				continue;
+			}
+
+			result.push({
+				...clientCursors,
+				isOutdated:
+					clientCursors.upToDateness == DocumentUpToDateness.Prior
+			});
+
+			included.add(clientCursors.deviceId);
+			relevantCursors.unshift(clientCursors); // to reverse order back to normal
+		}
+
+		this.knownRemoteCursors = relevantCursors;
+
+		return result;
+	}
+
+	// We store up-to-dateness on a per-client basis to simplify the implementation.
+	// An individual client won't have too many documents open at once, so this is a reasonable trade-off.
+	private async getDocumentsUpToDateness(
+		clientCursor: ClientCursors
+	): Promise<DocumentUpToDateness> {
+		const results = [];
+		for (const document of clientCursor.documentsWithCursors) {
+			results.push(await this.getDocumentUpToDateness(document));
+		}
+
+		if (
+			results.every((result) => result === DocumentUpToDateness.UpToDate)
+		) {
+			return DocumentUpToDateness.UpToDate;
+		}
+
+		if (
+			results.every(
+				(result) =>
+					result === DocumentUpToDateness.UpToDate ||
+					result === DocumentUpToDateness.Prior
+			)
+		) {
+			return DocumentUpToDateness.Prior;
+		}
+
+		return DocumentUpToDateness.Later;
+	}
+
+	private async getDocumentUpToDateness(
+		document: DocumentWithCursors
+	): Promise<DocumentUpToDateness> {
+		const record = this.database.getLatestDocumentByRelativePath(
+			document.relative_path
+		);
+
+		if (!record) {
+			// the document of the cursor must be from the future
+			return DocumentUpToDateness.Later;
+		}
+
+		if (
+			(record.metadata?.parentVersionId ?? 0) <
+			(document.vault_update_id ?? 0)
+		) {
+			return DocumentUpToDateness.Later;
+		} else if (
+			(document.vault_update_id ?? 0) <
+			(record.metadata?.parentVersionId ?? 0)
+		) {
+			// the document of the cursor must be from the past
+			return DocumentUpToDateness.Prior;
+		}
+
+		const currentContent = await this.fileOperations.read(
+			document.relative_path
+		);
+
+		return this.database.getLatestDocumentByRelativePath(
+			document.relative_path
+		)?.metadata?.hash === hash(currentContent)
+			? DocumentUpToDateness.UpToDate
+			: DocumentUpToDateness.Prior;
+	}
+}
diff --git a/frontend/sync-client/src/sync-operations/file-change-notifier.ts b/frontend/sync-client/src/sync-operations/file-change-notifier.ts
new file mode 100644
index 00000000..8a7af66c
--- /dev/null
+++ b/frontend/sync-client/src/sync-operations/file-change-notifier.ts
@@ -0,0 +1,15 @@
+import type { RelativePath } from "../persistence/database";
+
+export class FileChangeNotifier {
+	private readonly listeners: ((filePath: RelativePath) => unknown)[] = [];
+
+	public addFileChangeListener(
+		listener: (filePath: RelativePath) => unknown
+	): void {
+		this.listeners.push(listener);
+	}
+
+	public notifyOfFileChange(filePath: RelativePath): void {
+		this.listeners.forEach((listener) => listener(filePath));
+	}
+}
diff --git a/frontend/sync-client/src/sync-operations/syncer.ts b/frontend/sync-client/src/sync-operations/syncer.ts
index 7e9301a5..186b9a9b 100644
--- a/frontend/sync-client/src/sync-operations/syncer.ts
+++ b/frontend/sync-client/src/sync-operations/syncer.ts
@@ -9,7 +9,7 @@ import type { Logger } from "../tracing/logger";
 import PQueue from "p-queue";
 import { hash } from "../utils/hash";
 import { v4 as uuidv4 } from "uuid";
-import type { Settings, SyncSettings } from "../persistence/settings";
+import type { Settings } from "../persistence/settings";
 import type { FileOperations } from "../file-operations/file-operations";
 import { findMatchingFile } from "../utils/find-matching-file";
 import type { UnrestrictedSyncer } from "./unrestricted-syncer";
@@ -27,12 +27,10 @@ export class Syncer {
 
 	private runningScheduleSyncForOfflineChanges: Promise<void> | undefined;
 
-	// eslint-disable-next-line @typescript-eslint/max-params
 	public constructor(
-		private readonly deviceId: string,
 		private readonly logger: Logger,
 		private readonly database: Database,
-		private readonly settings: Settings,
+		settings: Settings,
 		private readonly syncService: SyncService,
 		private readonly operations: FileOperations,
 		private readonly internalSyncer: UnrestrictedSyncer
@@ -261,58 +259,77 @@ export class Syncer {
 			remoteVersion.documentId
 		);
 
-		let hasLockToRelease = false;
 		if (document === undefined) {
 			// Let's avoid the same documents getting created in parallel multiple times.
 			// There might be multiple tasks waiting for the lock
-			await this.remoteDocumentsLock.waitForLock(
-				remoteVersion.documentId
-			);
-			hasLockToRelease = true;
-			document = this.database.getDocumentByDocumentId(
-				remoteVersion.documentId
+			return this.remoteDocumentsLock.withLock(
+				remoteVersion.documentId,
+				async () => {
+					document = this.database.getDocumentByDocumentId(
+						remoteVersion.documentId
+					);
+
+					// We're either the first one to get the lock, so we have to create the document in `unrestrictedSyncRemotelyUpdatedFile`
+					if (document === undefined) {
+						await this.syncQueue.add(async () =>
+							this.internalSyncer.unrestrictedSyncRemotelyUpdatedFile(
+								remoteVersion
+							)
+						);
+					} else {
+						const [promise, resolve, reject] = createPromise();
+
+						document =
+							await this.database.getResolvedDocumentByRelativePath(
+								document.relativePath,
+								promise
+							);
+
+						try {
+							await this.syncQueue.add(async () =>
+								this.internalSyncer.unrestrictedSyncRemotelyUpdatedFile(
+									remoteVersion,
+									document
+								)
+							);
+
+							resolve();
+						} catch (e) {
+							reject(e);
+						} finally {
+							this.database.removeDocumentPromise(promise);
+						}
+					}
+
+					this.database.addSeenUpdateId(remoteVersion.vaultUpdateId);
+				}
 			);
 		}
 
+		// We're either the first one to get the lock, so we have to create the document in `unrestrictedSyncRemotelyUpdatedFile`
+		const [promise, resolve, reject] = createPromise();
+
+		document = await this.database.getResolvedDocumentByRelativePath(
+			document.relativePath,
+			promise
+		);
+
 		try {
-			// We're either the first one to get the lock, so we have to create the document in `unrestrictedSyncRemotelyUpdatedFile`
-			if (document === undefined) {
-				await this.syncQueue.add(async () =>
-					this.internalSyncer.unrestrictedSyncRemotelyUpdatedFile(
-						remoteVersion
-					)
-				);
-			} else {
-				const [promise, resolve, reject] = createPromise();
+			await this.syncQueue.add(async () =>
+				this.internalSyncer.unrestrictedSyncRemotelyUpdatedFile(
+					remoteVersion,
+					document
+				)
+			);
 
-				document =
-					await this.database.getResolvedDocumentByRelativePath(
-						document.relativePath,
-						promise
-					);
-
-				try {
-					await this.syncQueue.add(async () =>
-						this.internalSyncer.unrestrictedSyncRemotelyUpdatedFile(
-							remoteVersion,
-							document
-						)
-					);
-
-					resolve();
-				} catch (e) {
-					reject(e);
-				} finally {
-					this.database.removeDocumentPromise(promise);
-				}
-			}
-
-			this.database.addSeenUpdateId(remoteVersion.vaultUpdateId);
+			resolve();
+		} catch (e) {
+			reject(e);
 		} finally {
-			if (hasLockToRelease) {
-				this.remoteDocumentsLock.unlock(remoteVersion.documentId);
-			}
+			this.database.removeDocumentPromise(promise);
 		}
+
+		this.database.addSeenUpdateId(remoteVersion.vaultUpdateId);
 	}
 
 	private async internalScheduleSyncForOfflineChanges(): Promise<void> {
diff --git a/frontend/sync-client/src/types/document-update-status.ts b/frontend/sync-client/src/types/document-sync-status.ts
similarity index 59%
rename from frontend/sync-client/src/types/document-update-status.ts
rename to frontend/sync-client/src/types/document-sync-status.ts
index 7fa1c888..a2ec01c2 100644
--- a/frontend/sync-client/src/types/document-update-status.ts
+++ b/frontend/sync-client/src/types/document-sync-status.ts
@@ -1,4 +1,4 @@
-export enum DocumentUpdateStatus {
+export enum DocumentSyncStatus {
 	UP_TO_DATE = "UP_TO_DATE",
 	SYNCING = "SYNCING"
 }
diff --git a/frontend/sync-client/src/types/document-up-to-dateness.ts b/frontend/sync-client/src/types/document-up-to-dateness.ts
new file mode 100644
index 00000000..2f93f9b4
--- /dev/null
+++ b/frontend/sync-client/src/types/document-up-to-dateness.ts
@@ -0,0 +1,5 @@
+export enum DocumentUpToDateness {
+	UpToDate = "UpToDate", // easiest case, the client can just show the cursors as-is
+	Prior = "Prior", // The cursors are outdated, so the client has to guess the cursor positions based on local updates. This is only possible if this client's cursor has once been up-to-date in a given document.
+	Later = "Later" // The cursors are from a future version of a document, there's no way we can accuratly show them locally.
+}
diff --git a/frontend/sync-client/src/types/maybe-outdated-client-cursors.ts b/frontend/sync-client/src/types/maybe-outdated-client-cursors.ts
index acced952..e062f84e 100644
--- a/frontend/sync-client/src/types/maybe-outdated-client-cursors.ts
+++ b/frontend/sync-client/src/types/maybe-outdated-client-cursors.ts
@@ -1,5 +1,5 @@
 import type { ClientCursors } from "../services/types/ClientCursors";
 
-export interface DocumentWithMaybeOutdatedClientCursors extends ClientCursors {
+export interface MaybeOutdatedClientCursors extends ClientCursors {
 	isOutdated: boolean;
 }
diff --git a/frontend/sync-client/src/utils/create-promise.ts b/frontend/sync-client/src/utils/create-promise.ts
index 959183f1..3099f0da 100644
--- a/frontend/sync-client/src/utils/create-promise.ts
+++ b/frontend/sync-client/src/utils/create-promise.ts
@@ -1,17 +1,25 @@
+type ResolveFunction<T> = undefined extends T
+	? (value?: T) => unknown
+	: (value: T) => unknown;
+
 /**
  * A type-safe utility function to create a Promise with resolve and reject functions.
  * @returns A tuple containing a Promise, a resolve function, and a reject function.
  */
 export function createPromise<T = unknown>(): [
 	Promise<T>,
-	(value: T) => unknown,
+	ResolveFunction<T>,
 	(error: unknown) => unknown
 ] {
-	let resolve: undefined | ((resolved: T) => unknown) = undefined;
+	let resolve: undefined | ResolveFunction<T> = undefined;
 	let reject: undefined | ((error: unknown) => unknown) = undefined;
 
 	const creationPromise = new Promise<T>(
-		(resolve_, reject_) => ((resolve = resolve_), (reject = reject_))
+		(resolve_, reject_) =>
+			(
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+				(resolve = resolve_ as ResolveFunction<T>), (reject = reject_)
+			)
 	);
 
 	// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
diff --git a/frontend/sync-client/src/utils/locks.test.ts b/frontend/sync-client/src/utils/locks.test.ts
index 33d99da9..1e6bd38b 100644
--- a/frontend/sync-client/src/utils/locks.test.ts
+++ b/frontend/sync-client/src/utils/locks.test.ts
@@ -2,8 +2,9 @@ import { Logger } from "../tracing/logger";
 import type { RelativePath } from "../persistence/database";
 import { Locks } from "./locks";
 
-describe("Document lock", () => {
+describe("withLock", () => {
 	const testPath: RelativePath = "test/document/path";
+	const testPath2: RelativePath = "test/document/path2";
 	const logger = new Logger();
 
 	// eslint-disable-next-line @typescript-eslint/init-declarations
@@ -13,77 +14,211 @@ describe("Document lock", () => {
 		locks = new Locks<RelativePath>(logger);
 	});
 
-	test("should lock a document successfully", () => {
-		const result = locks.tryLock(testPath);
-		expect(result).toBe(true);
-	});
-
-	test("should not lock a document that is already locked", () => {
-		locks.tryLock(testPath);
-		const result = locks.tryLock(testPath);
-		expect(result).toBe(false);
-	});
-
-	test("should unlock a locked document", () => {
-		locks.tryLock(testPath);
-		locks.unlock(testPath);
-		const result = locks.tryLock(testPath);
-		expect(result).toBe(true);
-		locks.unlock(testPath);
-	});
-
-	test("should throw an error when unlocking a document that is not locked", () => {
-		expect(() => {
-			locks.unlock(testPath);
-		}).toThrow(`Key '${testPath}' is not locked, cannot unlock`);
-	});
-
-	test("should wait for a document lock and resolve when unlocked", async () => {
-		locks.tryLock(testPath);
-
-		let resolved = false;
-		const waitPromise = locks.waitForLock(testPath).then(() => {
-			resolved = true;
+	test("should execute function with single key lock", async () => {
+		let executionCount = 0;
+		const result = await locks.withLock(testPath, () => {
+			executionCount++;
+			return "success";
 		});
 
-		locks.unlock(testPath);
-		await waitPromise;
-
-		expect(resolved).toBe(true);
+		expect(result).toBe("success");
+		expect(executionCount).toBe(1);
 	});
 
-	test("should resolve multiple waiters in FIFO order", async () => {
-		locks.tryLock(testPath);
-
-		let firstResolved = false;
-		let secondResolved = false;
-		let thirdResolved = false;
-
-		const firstWaitPromise = locks.waitForLock(testPath).then(() => {
-			firstResolved = true;
+	test("should execute async function with single key lock", async () => {
+		let executionCount = 0;
+		const result = await locks.withLock(testPath, async () => {
+			executionCount++;
+			await new Promise((resolve) => setTimeout(resolve, 10));
+			return "async-success";
 		});
 
-		const secondWaitPromise = locks.waitForLock(testPath).then(() => {
-			secondResolved = true;
+		expect(result).toBe("async-success");
+		expect(executionCount).toBe(1);
+	});
+
+	test("should execute function with multiple key locks", async () => {
+		let executionCount = 0;
+		const result = await locks.withLock([testPath, testPath2], () => {
+			executionCount++;
+			return "multi-success";
 		});
 
-		const thirdWaitPromise = locks.waitForLock(testPath).then(() => {
-			thirdResolved = true;
+		expect(result).toBe("multi-success");
+		expect(executionCount).toBe(1);
+	});
+
+	test("should sort multiple keys to prevent deadlocks", async () => {
+		const executionOrder: string[] = [];
+
+		// Start two concurrent operations with keys in different orders
+		const promise1 = locks.withLock([testPath2, testPath], async () => {
+			executionOrder.push("operation1-start");
+			await new Promise((resolve) => setTimeout(resolve, 50));
+			executionOrder.push("operation1-end");
+			return "result1";
 		});
 
-		locks.unlock(testPath);
-		await firstWaitPromise;
-		expect(firstResolved).toBe(true);
-		expect(secondResolved).toBe(false);
-		expect(thirdResolved).toBe(false);
+		const promise2 = locks.withLock([testPath, testPath2], async () => {
+			executionOrder.push("operation2-start");
+			await new Promise((resolve) => setTimeout(resolve, 50));
+			executionOrder.push("operation2-end");
+			return "result2";
+		});
 
-		locks.unlock(testPath);
-		await secondWaitPromise;
-		expect(secondResolved).toBe(true);
-		expect(thirdResolved).toBe(false);
+		const [result1, result2] = await Promise.all([promise1, promise2]);
 
-		locks.unlock(testPath);
-		await thirdWaitPromise;
-		expect(thirdResolved).toBe(true);
+		expect(result1).toBe("result1");
+		expect(result2).toBe("result2");
+		// One operation should complete entirely before the other starts
+		expect(executionOrder).toEqual([
+			"operation1-start",
+			"operation1-end",
+			"operation2-start",
+			"operation2-end"
+		]);
+	});
+
+	test("should serialize access to same key", async () => {
+		const executionOrder: string[] = [];
+
+		const promise1 = locks.withLock(testPath, async () => {
+			executionOrder.push("operation1-start");
+			await new Promise((resolve) => setTimeout(resolve, 50));
+			executionOrder.push("operation1-end");
+			return "result1";
+		});
+
+		const promise2 = locks.withLock(testPath, async () => {
+			executionOrder.push("operation2-start");
+			await new Promise((resolve) => setTimeout(resolve, 30));
+			executionOrder.push("operation2-end");
+			return "result2";
+		});
+
+		const [result1, result2] = await Promise.all([promise1, promise2]);
+
+		expect(result1).toBe("result1");
+		expect(result2).toBe("result2");
+		expect(executionOrder).toEqual([
+			"operation1-start",
+			"operation1-end",
+			"operation2-start",
+			"operation2-end"
+		]);
+	});
+
+	test("should allow concurrent access to different keys", async () => {
+		const executionOrder: string[] = [];
+
+		const promise1 = locks.withLock(testPath, async () => {
+			executionOrder.push("operation1-start");
+			await new Promise((resolve) => setTimeout(resolve, 50));
+			executionOrder.push("operation1-end");
+			return "result1";
+		});
+
+		const promise2 = locks.withLock(testPath2, async () => {
+			executionOrder.push("operation2-start");
+			await new Promise((resolve) => setTimeout(resolve, 30));
+			executionOrder.push("operation2-end");
+			return "result2";
+		});
+
+		const [result1, result2] = await Promise.all([promise1, promise2]);
+
+		expect(result1).toBe("result1");
+		expect(result2).toBe("result2");
+		// Both operations should run concurrently
+		expect(executionOrder[0]).toBe("operation1-start");
+		expect(executionOrder[1]).toBe("operation2-start");
+	});
+
+	test("should release locks even if function throws", async () => {
+		const error = new Error("test error");
+
+		await expect(
+			locks.withLock(testPath, () => {
+				throw error;
+			})
+		).rejects.toThrow("test error");
+
+		// Lock should be released, allowing another operation
+		const result = await locks.withLock(
+			testPath,
+			() => "success-after-error"
+		);
+		expect(result).toBe("success-after-error");
+	});
+
+	test("should release locks even if async function throws", async () => {
+		const error = new Error("async test error");
+
+		await expect(
+			locks.withLock(testPath, async () => {
+				await new Promise((resolve) => setTimeout(resolve, 10));
+				throw error;
+			})
+		).rejects.toThrow("async test error");
+
+		// Lock should be released, allowing another operation
+		const result = await locks.withLock(
+			testPath,
+			() => "success-after-async-error"
+		);
+		expect(result).toBe("success-after-async-error");
+	});
+
+	test("should handle empty array of keys", async () => {
+		const result = await locks.withLock([], () => "empty-keys");
+		expect(result).toBe("empty-keys");
+	});
+
+	test("should maintain FIFO order for multiple waiters", async () => {
+		const executionOrder: string[] = [];
+
+		// Start first operation that holds the lock
+		const firstPromise = locks.withLock(testPath, async () => {
+			executionOrder.push("first-start");
+			await new Promise((resolve) => setTimeout(resolve, 100));
+			executionOrder.push("first-end");
+			return "first";
+		});
+
+		// Small delay to ensure first operation starts
+		await new Promise((resolve) => setTimeout(resolve, 10));
+
+		// Queue second and third operations
+		const secondPromise = locks.withLock(testPath, async () => {
+			executionOrder.push("second-start");
+			await new Promise((resolve) => setTimeout(resolve, 30));
+			executionOrder.push("second-end");
+			return "second";
+		});
+
+		const thirdPromise = locks.withLock(testPath, async () => {
+			executionOrder.push("third-start");
+			await new Promise((resolve) => setTimeout(resolve, 20));
+			executionOrder.push("third-end");
+			return "third";
+		});
+
+		const [first, second, third] = await Promise.all([
+			firstPromise,
+			secondPromise,
+			thirdPromise
+		]);
+
+		expect(first).toBe("first");
+		expect(second).toBe("second");
+		expect(third).toBe("third");
+		expect(executionOrder).toEqual([
+			"first-start",
+			"first-end",
+			"second-start",
+			"second-end",
+			"third-start",
+			"third-end"
+		]);
 	});
 });
diff --git a/frontend/sync-client/src/utils/locks.ts b/frontend/sync-client/src/utils/locks.ts
index 77b3b767..e09da236 100644
--- a/frontend/sync-client/src/utils/locks.ts
+++ b/frontend/sync-client/src/utils/locks.ts
@@ -13,7 +13,54 @@ export class Locks<T> {
 	/** Queue of resolve functions waiting for each key */
 	private readonly waiters = new Map<T, (() => unknown)[]>();
 
-	public constructor(private readonly logger: Logger) {}
+	public constructor(private readonly logger?: Logger) {}
+
+	/**
+	 * Executes a function while holding exclusive locks on one or more keys.
+	 *
+	 * This method ensures that the provided function runs with exclusive access to the
+	 * specified key(s). Multiple keys are sorted to prevent deadlocks when different
+	 * operations request the same keys in different orders.
+	 *
+	 * @template R The return type of the function to execute
+	 * @param keyOrKeys A single key or array of keys to lock during function execution
+	 * @param fn The function to execute while holding the lock(s). Can be sync or async.
+	 * @returns A Promise that resolves to the return value of the executed function
+	 *
+	 * @example
+	 * ```typescript
+	 * // Lock a single key
+	 * const result = await locks.withLock('file1', () => {
+	 *   // Critical section - only one operation can access 'file1' at a time
+	 *   return processFile('file1');
+	 * });
+	 *
+	 * // Lock multiple keys (prevents deadlocks through consistent ordering)
+	 * await locks.withLock(['file1', 'file2'], async () => {
+	 *   // Critical section - exclusive access to both files
+	 *   await moveFile('file1', 'file2');
+	 * });
+	 * ```
+	 *
+	 * @throws Any error thrown by the provided function will be propagated after locks are released
+	 */
+	public async withLock<R>(
+		keyOrKeys: T | T[],
+		fn: () => R | Promise<R>
+	): Promise<R> {
+		const keys = Array.isArray(keyOrKeys) ? keyOrKeys : [keyOrKeys];
+		keys.sort((a, b) => String(a).localeCompare(String(b))); // Ensure consistent order to prevent deadlocks
+
+		await Promise.all(keys.map(async (key) => this.waitForLock(key)));
+
+		try {
+			return await fn();
+		} finally {
+			keys.forEach((key) => {
+				this.unlock(key);
+			});
+		}
+	}
 
 	/**
 	 * Attempts to acquire a lock immediately without waiting.
@@ -22,7 +69,7 @@ export class Locks<T> {
 	 * @param key The key to lock
 	 * @returns `true` if lock acquired, `false` if already locked
 	 */
-	public tryLock(key: T): boolean {
+	private tryLock(key: T): boolean {
 		if (this.locked.has(key)) {
 			return false;
 		}
@@ -39,12 +86,12 @@ export class Locks<T> {
 	 * @param key The key to wait for and lock
 	 * @returns Promise that resolves when lock is acquired
 	 */
-	public async waitForLock(key: T): Promise<void> {
+	private async waitForLock(key: T): Promise<void> {
 		if (this.tryLock(key)) {
 			return Promise.resolve();
 		}
 
-		this.logger.debug(`Waiting for lock on ${key}`);
+		this.logger?.debug(`Waiting for lock on ${key}`);
 
 		return new Promise((resolve) => {
 			// DefaultDict behavior
@@ -65,7 +112,7 @@ export class Locks<T> {
 	 * @param key The key to unlock
 	 * @throws {Error} If key is not currently locked
 	 */
-	public unlock(key: T): void {
+	private unlock(key: T): void {
 		if (!this.locked.has(key)) {
 			throw new Error(`Key '${key}' is not locked, cannot unlock`);
 		}
@@ -74,19 +121,22 @@ export class Locks<T> {
 		const nextWaiting = this.waiters.get(key)?.shift();
 
 		if (nextWaiting) {
-			this.logger.debug(`Granted lock on ${key}`);
+			this.logger?.debug(`Granted lock on ${key}`);
 			nextWaiting();
 		} else {
 			this.locked.delete(key);
 		}
 	}
+}
 
-	/**
-	 * Clears all locks and waiters. Causes waiting operations to hang indefinitely.
-	 * Use with caution.
-	 */
-	public reset(): void {
-		this.locked.clear();
-		this.waiters.clear();
+export class Lock {
+	private readonly locks: Locks<boolean>;
+
+	public constructor(logger?: Logger) {
+		this.locks = new Locks(logger);
+	}
+
+	public async withLock<R>(fn: () => R | Promise<R>): Promise<R> {
+		return this.locks.withLock(true, fn);
 	}
 }
diff --git a/frontend/test-client/src/agent/mock-client.ts b/frontend/test-client/src/agent/mock-client.ts
index 2833ba29..3ef55c8f 100644
--- a/frontend/test-client/src/agent/mock-client.ts
+++ b/frontend/test-client/src/agent/mock-client.ts
@@ -37,7 +37,7 @@ export class MockClient implements FileSystemOperations {
 			fs: this,
 			persistence: {
 				load: async () => this.data,
-				save: async (data) => (this.data = data)
+				save: async (data) => void (this.data = data)
 			},
 			fetch: fetchImplementation,
 			webSocket: webSocketImplementation
diff --git a/frontend/test-client/src/utils/flaky-websocket-factory.ts b/frontend/test-client/src/utils/flaky-websocket-factory.ts
index 6a146de2..c2c13525 100644
--- a/frontend/test-client/src/utils/flaky-websocket-factory.ts
+++ b/frontend/test-client/src/utils/flaky-websocket-factory.ts
@@ -25,15 +25,18 @@ export function flakyWebSocketFactory(
 
 		public set onmessage(callback: (event: MessageEvent) => void) {
 			super.onmessage = async (event: MessageEvent): Promise<void> => {
-				await this.locks.waitForLock(FlakyWebSocket.RECEIVE_KEY);
+				return this.locks.withLock(
+					FlakyWebSocket.RECEIVE_KEY,
+					async () => {
+						if (jitterScaleInSeconds > 0) {
+							await sleep(
+								Math.random() * jitterScaleInSeconds * 1000
+							);
+						}
 
-				if (jitterScaleInSeconds > 0) {
-					await sleep(Math.random() * jitterScaleInSeconds * 1000);
-				}
-
-				callback(event);
-
-				this.locks.unlock(FlakyWebSocket.RECEIVE_KEY);
+						callback(event);
+					}
+				);
 			};
 		}
 
@@ -67,15 +70,13 @@ export function flakyWebSocketFactory(
 			data: string | ArrayBufferLike | Blob | ArrayBufferView
 		): Promise<void> {
 			// maintain message order
-			await this.locks.waitForLock(FlakyWebSocket.SEND_KEY);
+			return this.locks.withLock(FlakyWebSocket.SEND_KEY, async () => {
+				if (jitterScaleInSeconds > 0) {
+					await sleep(Math.random() * jitterScaleInSeconds * 1000);
+				}
 
-			if (jitterScaleInSeconds > 0) {
-				await sleep(Math.random() * jitterScaleInSeconds * 1000);
-			}
-
-			super.send(data);
-
-			this.locks.unlock(FlakyWebSocket.SEND_KEY);
+				super.send(data);
+			});
 		}
 	} as unknown as typeof WebSocket;
 }
diff --git a/scripts/check.sh b/scripts/check.sh
new file mode 100755
index 00000000..f807d2c8
--- /dev/null
+++ b/scripts/check.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+set -e
+
+echo "Running checks in sync-server"
+cd sync-server
+cargo clippy --all-targets --all-features
+cargo fmt --all -- --check
+cargo machete
+cargo test --verbose
+
+echo "Running checks in frontend"
+cd ../frontend
+npm ci
+npm run build
+npm run lint
+npm run test
+
+if [[ $(git status --porcelain) ]]; then
+    git status --porcelain
+    echo "Failing CI because the working directory is not clean after linting"
+    exit 1
+fi
+
+echo "Success"
+
+cd ..
diff --git a/sync-server/Cargo.toml b/sync-server/Cargo.toml
index 94539a48..cbbaa14c 100644
--- a/sync-server/Cargo.toml
+++ b/sync-server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sync_server"
-rust-version = "1.87.0"
+rust-version = "1.89.0"
 authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
diff --git a/sync-server/rust-toolchain.toml b/sync-server/rust-toolchain.toml
index 0d5c6104..ed32db00 100644
--- a/sync-server/rust-toolchain.toml
+++ b/sync-server/rust-toolchain.toml
@@ -1,4 +1,4 @@
 [toolchain]
-channel = "nightly-2025-06-06"
+channel = "1.89.0"
 targets = [ "x86_64-unknown-linux-gnu", "x86_64-unknown-linux-musl" ]
 profile = "default"
diff --git a/sync-server/rustfmt.toml b/sync-server/rustfmt.toml
deleted file mode 100644
index 6640f544..00000000
--- a/sync-server/rustfmt.toml
+++ /dev/null
@@ -1,8 +0,0 @@
-imports_granularity = "crate"
-condense_wildcard_suffixes = true
-fn_single_line = true
-format_strings = true
-reorder_impl_items = true
-group_imports = "StdExternalCrate"
-use_field_init_shorthand = true
-wrap_comments=true
diff --git a/sync-server/src/app_state/cursors.rs b/sync-server/src/app_state/cursors.rs
index 1e6509c7..d083e1ac 100644
--- a/sync-server/src/app_state/cursors.rs
+++ b/sync-server/src/app_state/cursors.rs
@@ -47,7 +47,7 @@ impl Cursors {
         all_device_cursors.retain(|c| &c.client_cursors.device_id != device_id);
         all_device_cursors.push(ClientCursorsWithTimeToLive::new(ClientCursors {
             user_name,
-            device_id: device_id.to_string(),
+            device_id: device_id.clone(),
             documents_with_cursors: document_to_cursors,
         }));
 
@@ -126,5 +126,7 @@ impl ClientCursorsWithTimeToLive {
         }
     }
 
-    pub fn is_expired(&self, ttl: Duration) -> bool { self.last_updated.elapsed() > ttl }
+    pub fn is_expired(&self, ttl: Duration) -> bool {
+        self.last_updated.elapsed() > ttl
+    }
 }
diff --git a/sync-server/src/app_state/database/models.rs b/sync-server/src/app_state/database/models.rs
index 7796f627..24c0c370 100644
--- a/sync-server/src/app_state/database/models.rs
+++ b/sync-server/src/app_state/database/models.rs
@@ -23,7 +23,9 @@ pub struct StoredDocumentVersion {
 }
 
 impl PartialEq<Self> for StoredDocumentVersion {
-    fn eq(&self, other: &Self) -> bool { self.vault_update_id == other.vault_update_id }
+    fn eq(&self, other: &Self) -> bool {
+        self.vault_update_id == other.vault_update_id
+    }
 }
 
 #[derive(TS, Debug, Clone, Serialize)]
diff --git a/sync-server/src/app_state/websocket/models.rs b/sync-server/src/app_state/websocket/models.rs
index ed61177c..e037fb7e 100644
--- a/sync-server/src/app_state/websocket/models.rs
+++ b/sync-server/src/app_state/websocket/models.rs
@@ -23,8 +23,13 @@ pub struct CursorPositionFromClient {
 
 #[derive(TS, Serialize, Deserialize, Clone, Debug)]
 pub struct DocumentWithCursors {
-    #[ts(as = "u32")]
-    pub vault_update_id: VaultUpdateId,
+    // It's None in case the document is dirty.
+    // We still want to sync the cursor to mark
+    // that it exists and can be client-side
+    // interpolated. However, the actual
+    // position is meaningless.
+    #[ts(as = "Option<u32>")]
+    pub vault_update_id: Option<VaultUpdateId>,
 
     pub document_id: DocumentId,
     pub relative_path: String,
diff --git a/sync-server/src/server.rs b/sync-server/src/server.rs
index 3f659c97..cddcc1b5 100644
--- a/sync-server/src/server.rs
+++ b/sync-server/src/server.rs
@@ -179,6 +179,10 @@ async fn shutdown_signal() {
     }
 }
 
-async fn handle_404() -> impl IntoResponse { not_found_error(anyhow!("Page not found")) }
+async fn handle_404() -> impl IntoResponse {
+    not_found_error(anyhow!("Page not found"))
+}
 
-async fn handle_405() -> impl IntoResponse { client_error(anyhow!("Method not allowed")) }
+async fn handle_405() -> impl IntoResponse {
+    client_error(anyhow!("Method not allowed"))
+}
diff --git a/sync-server/src/server/device_id_header.rs b/sync-server/src/server/device_id_header.rs
index be36c8d8..af9d6413 100644
--- a/sync-server/src/server/device_id_header.rs
+++ b/sync-server/src/server/device_id_header.rs
@@ -6,7 +6,9 @@ pub struct DeviceIdHeader(pub String);
 pub static DEVICE_ID_HEADER_NAME: HeaderName = HeaderName::from_static("device-id");
 
 impl Header for DeviceIdHeader {
-    fn name() -> &'static HeaderName { &DEVICE_ID_HEADER_NAME }
+    fn name() -> &'static HeaderName {
+        &DEVICE_ID_HEADER_NAME
+    }
 
     fn decode<'i, I>(values: &mut I) -> Result<Self, headers::Error>
     where
@@ -26,7 +28,7 @@ impl Header for DeviceIdHeader {
     where
         E: Extend<HeaderValue>,
     {
-        let value = HeaderValue::from_static(Box::leak(self.0.to_string().into_boxed_str()));
+        let value = HeaderValue::from_static(Box::leak(self.0.clone().into_boxed_str()));
 
         values.extend(std::iter::once(value));
     }
diff --git a/sync-server/src/utils/normalize.rs b/sync-server/src/utils/normalize.rs
index adb83ac1..6553dd25 100644
--- a/sync-server/src/utils/normalize.rs
+++ b/sync-server/src/utils/normalize.rs
@@ -8,4 +8,6 @@ where
     Ok(normalize_string(&s))
 }
 
-pub fn normalize_string(s: &str) -> String { s.trim().to_lowercase() }
+pub fn normalize_string(s: &str) -> String {
+    s.trim().to_lowercase()
+}

From 8c6271cd0e14c68792742e8f7ac9e08a49758c22 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Aug 2025 17:16:56 +0100
Subject: [PATCH 545/761] Bump tokio from 1.44.2 to 1.47.1 in /sync-server
 (#94)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 sync-server/Cargo.lock | 29 +++++++++++++++++++++--------
 sync-server/Cargo.toml |  2 +-
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/sync-server/Cargo.lock b/sync-server/Cargo.lock
index 6080baf4..8c7b90cb 100644
--- a/sync-server/Cargo.lock
+++ b/sync-server/Cargo.lock
@@ -1175,6 +1175,17 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "io-uring"
+version = "0.7.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d93587f37623a1a17d94ef2bc9ada592f5465fe7732084ab7beefabe5c77c0c4"
+dependencies = [
+ "bitflags",
+ "cfg-if",
+ "libc",
+]
+
 [[package]]
 name = "is_terminal_polyfill"
 version = "1.70.1"
@@ -1208,9 +1219,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.171"
+version = "0.2.174"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6"
+checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776"
 
 [[package]]
 name = "libm"
@@ -1919,12 +1930,12 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.5.8"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
+checksum = "233504af464074f9d066d7b5416c5f9b894a5862a6506e306f7b816cdd6f1807"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -2372,20 +2383,22 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.44.2"
+version = "1.47.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6b88822cbe49de4185e3a4cbf8321dd487cf5fe0c5c65695fef6346371e9c48"
+checksum = "89e49afdadebb872d3145a5638b59eb0691ea23e46ca484037cfab3b76b95038"
 dependencies = [
  "backtrace",
  "bytes",
+ "io-uring",
  "libc",
  "mio",
  "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
+ "slab",
  "socket2",
  "tokio-macros",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
diff --git a/sync-server/Cargo.toml b/sync-server/Cargo.toml
index cbbaa14c..1a7111cd 100644
--- a/sync-server/Cargo.toml
+++ b/sync-server/Cargo.toml
@@ -10,7 +10,7 @@ version = "0.5.1"
 [dependencies]
 serde = { version = "1.0.219", default-features = false, features = ["derive"] }
 thiserror = { version = "2.0.12", default-features = false  }
-tokio = { version = "1.44.2", features = ["full"]}
+tokio = { version = "1.47.1", features = ["full"]}
 uuid = { version = "1.16.0", features = ["v4", "serde"] }
 log = { version = "0.4.27" }
 anyhow =  { version = "1.0.98", features = ["backtrace"] }

From a27b039646933b9b95c21af854f3573a9ecd0c45 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Aug 2025 17:17:18 +0100
Subject: [PATCH 546/761] Bump rust from 1.87 to 1.89 in /sync-server (#99)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 sync-server/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sync-server/Dockerfile b/sync-server/Dockerfile
index e729c2bf..00d05ea5 100644
--- a/sync-server/Dockerfile
+++ b/sync-server/Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.87 AS builder
+FROM rust:1.89 AS builder
 
 WORKDIR /usr/src/backend
 

From 43311ed30bbe1b98fd6e21784c29160e2e8aca86 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Mon, 25 Aug 2025 19:25:03 +0100
Subject: [PATCH 547/761] Update e2e tests

---
 .github/workflows/e2e.yml | 12 ------------
 scripts/check.sh          | 29 +++++++++++++++++++++++++++++
 scripts/e2e.sh            |  3 ++-
 3 files changed, 31 insertions(+), 13 deletions(-)
 create mode 100755 scripts/check.sh

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 1371303d..23f57786 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -36,16 +36,4 @@ jobs:
           cargo run config-e2e.yml --color never &
           cd ..
 
-          scripts/update-api-types.sh
-          cd frontend
-          npm ci
-          npm run build
-          npm run lint
-          if [[ $(git status --porcelain) ]]; then
-              git status --porcelain
-              echo "Failing CI because the working directory is not clean after updating the API types"
-              exit 1
-          fi
-
-          cd ..
           scripts/e2e.sh 32
diff --git a/scripts/check.sh b/scripts/check.sh
new file mode 100755
index 00000000..750831ed
--- /dev/null
+++ b/scripts/check.sh
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+
+set -e
+
+echo "Running checks in sync-server"
+cd sync-server
+cargo clippy --all-targets --all-features
+cargo fmt --all -- --check
+cargo machete
+cargo test --verbose
+
+scripts/update-api-types.sh
+
+echo "Running checks in frontend"
+cd ../frontend
+npm ci
+npm run build
+npm run lint
+npm run test
+
+if [[ $(git status --porcelain) ]]; then
+    git status --porcelain
+    echo "Failing CI because the working directory is not clean after linting"
+    exit 1
+fi
+
+echo "Success"
+
+cd ..
diff --git a/scripts/e2e.sh b/scripts/e2e.sh
index 149d76f9..55cb1ac8 100755
--- a/scripts/e2e.sh
+++ b/scripts/e2e.sh
@@ -15,6 +15,7 @@ process_count=$1
 mkdir -p logs
 
 cd frontend
+npm ci
 npm run build
 
 ../scripts/utils/wait-for-server.sh
@@ -33,7 +34,7 @@ print_failed_log() {
             # Get the exit code of the process
             wait ${pids[$i-1]}
             exit_code=$?
-            
+
             # Only consider non-zero exit codes as failures
             if [ $exit_code -ne 0 ]; then
                 cat "$(pwd)/logs/log_${i}.log"

From 16fc3a8234c75058c23a2377e6649245a8b47a0a Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Mon, 25 Aug 2025 19:25:31 +0100
Subject: [PATCH 548/761] Bump versions to 0.6.0

---
 frontend/obsidian-plugin/manifest.json | 2 +-
 frontend/obsidian-plugin/package.json  | 2 +-
 frontend/package-lock.json             | 6 +++---
 frontend/sync-client/package.json      | 2 +-
 frontend/test-client/package.json      | 2 +-
 manifest.json                          | 2 +-
 sync-server/Cargo.lock                 | 2 +-
 sync-server/Cargo.toml                 | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/frontend/obsidian-plugin/manifest.json b/frontend/obsidian-plugin/manifest.json
index 42ebe6da..c4464e91 100644
--- a/frontend/obsidian-plugin/manifest.json
+++ b/frontend/obsidian-plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.5.1",
+	"version": "0.6.0",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index 0d004408..0bd87b36 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -1,6 +1,6 @@
 {
     "name": "vault-link-obsidian-plugin",
-    "version": "0.5.1",
+    "version": "0.6.0",
     "description": "This is a sample plugin for Obsidian (https://obsidian.md)",
     "main": "main.js",
     "scripts": {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index f73ac157..54efe68d 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -6361,7 +6361,7 @@
 		},
 		"obsidian-plugin": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.5.1",
+			"version": "0.6.0",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
@@ -6390,7 +6390,7 @@
 			}
 		},
 		"sync-client": {
-			"version": "0.5.1",
+			"version": "0.6.0",
 			"dependencies": {
 				"byte-base64": "^1.1.0",
 				"minimatch": "^10.0.1",
@@ -6433,7 +6433,7 @@
 			}
 		},
 		"test-client": {
-			"version": "0.5.1",
+			"version": "0.6.0",
 			"bin": {
 				"test-client": "dist/cli.js"
 			},
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index f80fb672..1d32c118 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "sync-client",
-    "version": "0.5.1",
+    "version": "0.6.0",
     "main": "dist/sync-client.node.js",
     "browser": "dist/sync-client.web.js",
     "types": "dist/types/index.d.ts",
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index f0d4d533..0c8e69ea 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "test-client",
-    "version": "0.5.1",
+    "version": "0.6.0",
     "private": true,
     "bin": {
         "test-client": "./dist/cli.js"
diff --git a/manifest.json b/manifest.json
index 42ebe6da..c4464e91 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.5.1",
+	"version": "0.6.0",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/sync-server/Cargo.lock b/sync-server/Cargo.lock
index 8c7b90cb..9e9574d7 100644
--- a/sync-server/Cargo.lock
+++ b/sync-server/Cargo.lock
@@ -2205,7 +2205,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.5.1"
+version = "0.6.0"
 dependencies = [
  "anyhow",
  "axum",
diff --git a/sync-server/Cargo.toml b/sync-server/Cargo.toml
index 1a7111cd..b4e5b1f8 100644
--- a/sync-server/Cargo.toml
+++ b/sync-server/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.5.1"
+version = "0.6.0"
 
 [dependencies]
 serde = { version = "1.0.219", default-features = false, features = ["derive"] }

From 6afb828bd9c33750b616cd10805ef5d59baedc54 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Tue, 26 Aug 2025 21:06:22 +0100
Subject: [PATCH 549/761] Fix CI

---
 scripts/check.sh |  2 --
 scripts/e2e.sh   | 13 +++++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/scripts/check.sh b/scripts/check.sh
index 750831ed..f807d2c8 100755
--- a/scripts/check.sh
+++ b/scripts/check.sh
@@ -9,8 +9,6 @@ cargo fmt --all -- --check
 cargo machete
 cargo test --verbose
 
-scripts/update-api-types.sh
-
 echo "Running checks in frontend"
 cd ../frontend
 npm ci
diff --git a/scripts/e2e.sh b/scripts/e2e.sh
index 55cb1ac8..821bd0bc 100755
--- a/scripts/e2e.sh
+++ b/scripts/e2e.sh
@@ -3,6 +3,12 @@
 set -e
 set -o pipefail
 
+node_version=$(node -v | sed 's/^v\([0-9]*\).*/\1/')
+if [ "$node_version" != "22" ]; then
+    echo "Error: This script requires Node.js version 22, found: $node_version"
+    exit 1
+fi
+
 # Check if the argument is provided
 if [ $# -eq 0 ]; then
     echo "Usage: $0 <number_of_processes>"
@@ -20,6 +26,13 @@ npm run build
 
 ../scripts/utils/wait-for-server.sh
 
+../scripts/update-api-types.sh
+if [[ $(git status --porcelain) ]]; then
+    git status --porcelain
+    echo "Failing CI because the working directory is not clean after generating api types"
+    exit 1
+fi
+
 pids=()
 for i in $(seq 1 $process_count); do
     node test-client/dist/cli.js > "../logs/log_${i}.log" 2>&1 &

From 2ff1384fde1db5c3051ff8e4e39764452ddf64b3 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Tue, 26 Aug 2025 21:17:57 +0100
Subject: [PATCH 550/761] Fix cursor moving perf

---
 .../views/cursors/remote-cursors-plugin.ts    | 76 +++++++++++--------
 1 file changed, 46 insertions(+), 30 deletions(-)

diff --git a/frontend/obsidian-plugin/src/views/cursors/remote-cursors-plugin.ts b/frontend/obsidian-plugin/src/views/cursors/remote-cursors-plugin.ts
index 5dff2c59..04669a16 100644
--- a/frontend/obsidian-plugin/src/views/cursors/remote-cursors-plugin.ts
+++ b/frontend/obsidian-plugin/src/views/cursors/remote-cursors-plugin.ts
@@ -102,39 +102,11 @@ export class RemoteCursorsPluginValue implements PluginValue {
 		const original = update.startState.doc.toString();
 		const edited = update.state.doc.toString();
 
-		const updatedPositions: number[] = [];
-		const reconciled = reconcileWithHistory(
+		RemoteCursorsPluginValue.interpolateRemoteCursorPositions(
 			original,
-			{
-				text: original,
-				cursors: RemoteCursorsPluginValue.cursors.flatMap(
-					({ span }, i) => [
-						{ id: i * 2, position: span.start },
-						{ id: i * 2 + 1, position: span.end }
-					]
-				)
-			},
-			edited,
-			"Character"
+			edited
 		);
 
-		reconciled.cursors.forEach(({ id, position }) => {
-			const whereToJump = findWhereToMoveCursor(
-				position,
-				reconciled.history
-			);
-			if (whereToJump !== null) {
-				updatedPositions[id] = whereToJump;
-			} else {
-				updatedPositions[id] = position;
-			}
-		});
-
-		RemoteCursorsPluginValue.cursors.forEach(({ span }, i) => {
-			span.start = updatedPositions[i * 2];
-			span.end = updatedPositions[i * 2 + 1];
-		});
-
 		const decorations: Range<Decoration>[] = [];
 
 		RemoteCursorsPluginValue.cursors.forEach(
@@ -207,6 +179,50 @@ export class RemoteCursorsPluginValue implements PluginValue {
 
 		this.decorations = Decoration.set(decorations, true);
 	}
+
+	private static interpolateRemoteCursorPositions(
+		original: string,
+		edited: string
+	): void {
+		if (
+			original === edited ||
+			RemoteCursorsPluginValue.cursors.length === 0
+		) {
+			return;
+		}
+
+		const updatedPositions: number[] = [];
+		const reconciled = reconcileWithHistory(
+			original,
+			{
+				text: original,
+				cursors: RemoteCursorsPluginValue.cursors.flatMap(
+					({ span }, i) => [
+						{ id: i * 2, position: span.start },
+						{ id: i * 2 + 1, position: span.end }
+					]
+				)
+			},
+			edited
+		);
+
+		reconciled.cursors.forEach(({ id, position }) => {
+			const whereToJump = findWhereToMoveCursor(
+				position,
+				reconciled.history
+			);
+			if (whereToJump !== null) {
+				updatedPositions[id] = whereToJump;
+			} else {
+				updatedPositions[id] = position;
+			}
+		});
+
+		RemoteCursorsPluginValue.cursors.forEach(({ span }, i) => {
+			span.start = updatedPositions[i * 2];
+			span.end = updatedPositions[i * 2 + 1];
+		});
+	}
 }
 
 export const remoteCursorsPlugin = ViewPlugin.fromClass(

From d6e4305588693c13a653aa04845357748172621c Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Tue, 26 Aug 2025 21:22:18 +0100
Subject: [PATCH 551/761] Fix lint

---
 .../views/cursors/remote-cursors-plugin.ts    | 126 +++++++++---------
 scripts/e2e.sh                                |   6 +-
 2 files changed, 67 insertions(+), 65 deletions(-)

diff --git a/frontend/obsidian-plugin/src/views/cursors/remote-cursors-plugin.ts b/frontend/obsidian-plugin/src/views/cursors/remote-cursors-plugin.ts
index 04669a16..8801ecda 100644
--- a/frontend/obsidian-plugin/src/views/cursors/remote-cursors-plugin.ts
+++ b/frontend/obsidian-plugin/src/views/cursors/remote-cursors-plugin.ts
@@ -18,25 +18,6 @@ import { getRandomColor } from "src/utils/get-random-color";
 import type { SpanWithHistory } from "reconcile-text";
 import { reconcileWithHistory } from "reconcile-text";
 
-function findWhereToMoveCursor(
-	cursor: number,
-	spans: SpanWithHistory[]
-): number | null {
-	let position = 0;
-	for (const span of spans) {
-		// left and origin are the same
-		if (position === cursor && span.history === "AddedFromRight") {
-			return position + span.text.length;
-		}
-		position += span.text.length;
-		if (position === cursor && span.history === "RemovedFromRight") {
-			return position - span.text.length;
-		}
-	}
-
-	return null;
-}
-
 const forceUpdate = StateEffect.define();
 
 export class RemoteCursorsPluginValue implements PluginValue {
@@ -98,6 +79,69 @@ export class RemoteCursorsPluginValue implements PluginValue {
 			});
 	}
 
+	private static interpolateRemoteCursorPositions(
+		original: string,
+		edited: string
+	): void {
+		if (
+			original === edited ||
+			RemoteCursorsPluginValue.cursors.length === 0
+		) {
+			return;
+		}
+
+		const updatedPositions: number[] = [];
+		const reconciled = reconcileWithHistory(
+			original,
+			{
+				text: original,
+				cursors: RemoteCursorsPluginValue.cursors.flatMap(
+					({ span }, i) => [
+						{ id: i * 2, position: span.start },
+						{ id: i * 2 + 1, position: span.end }
+					]
+				)
+			},
+			edited
+		);
+
+		reconciled.cursors.forEach(({ id, position }) => {
+			const whereToJump = RemoteCursorsPluginValue.findWhereToMoveCursor(
+				position,
+				reconciled.history
+			);
+			if (whereToJump !== null) {
+				updatedPositions[id] = whereToJump;
+			} else {
+				updatedPositions[id] = position;
+			}
+		});
+
+		RemoteCursorsPluginValue.cursors.forEach(({ span }, i) => {
+			span.start = updatedPositions[i * 2];
+			span.end = updatedPositions[i * 2 + 1];
+		});
+	}
+
+	private static findWhereToMoveCursor(
+		cursor: number,
+		spans: SpanWithHistory[]
+	): number | null {
+		let position = 0;
+		for (const span of spans) {
+			// left and origin are the same
+			if (position === cursor && span.history === "AddedFromRight") {
+				return position + span.text.length;
+			}
+			position += span.text.length;
+			if (position === cursor && span.history === "RemovedFromRight") {
+				return position - span.text.length;
+			}
+		}
+
+		return null;
+	}
+
 	public update(update: ViewUpdate): void {
 		const original = update.startState.doc.toString();
 		const edited = update.state.doc.toString();
@@ -179,50 +223,6 @@ export class RemoteCursorsPluginValue implements PluginValue {
 
 		this.decorations = Decoration.set(decorations, true);
 	}
-
-	private static interpolateRemoteCursorPositions(
-		original: string,
-		edited: string
-	): void {
-		if (
-			original === edited ||
-			RemoteCursorsPluginValue.cursors.length === 0
-		) {
-			return;
-		}
-
-		const updatedPositions: number[] = [];
-		const reconciled = reconcileWithHistory(
-			original,
-			{
-				text: original,
-				cursors: RemoteCursorsPluginValue.cursors.flatMap(
-					({ span }, i) => [
-						{ id: i * 2, position: span.start },
-						{ id: i * 2 + 1, position: span.end }
-					]
-				)
-			},
-			edited
-		);
-
-		reconciled.cursors.forEach(({ id, position }) => {
-			const whereToJump = findWhereToMoveCursor(
-				position,
-				reconciled.history
-			);
-			if (whereToJump !== null) {
-				updatedPositions[id] = whereToJump;
-			} else {
-				updatedPositions[id] = position;
-			}
-		});
-
-		RemoteCursorsPluginValue.cursors.forEach(({ span }, i) => {
-			span.start = updatedPositions[i * 2];
-			span.end = updatedPositions[i * 2 + 1];
-		});
-	}
 }
 
 export const remoteCursorsPlugin = ViewPlugin.fromClass(
diff --git a/scripts/e2e.sh b/scripts/e2e.sh
index 821bd0bc..952e1855 100755
--- a/scripts/e2e.sh
+++ b/scripts/e2e.sh
@@ -26,12 +26,14 @@ npm run build
 
 ../scripts/utils/wait-for-server.sh
 
-../scripts/update-api-types.sh
+cd ..
+scripts/update-api-types.sh
 if [[ $(git status --porcelain) ]]; then
     git status --porcelain
     echo "Failing CI because the working directory is not clean after generating api types"
     exit 1
 fi
+cd frontend
 
 pids=()
 for i in $(seq 1 $process_count); do
@@ -39,7 +41,7 @@ for i in $(seq 1 $process_count); do
     pids+=($!)
 done
 
-cd -
+cd ..
 
 print_failed_log() {
     for i in $(seq 1 $process_count); do

From d513ad9824aa105767bab3867e439e05e084ae45 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Tue, 26 Aug 2025 22:23:05 +0100
Subject: [PATCH 552/761] Bump versions to 0.6.1

---
 frontend/obsidian-plugin/manifest.json | 2 +-
 frontend/obsidian-plugin/package.json  | 2 +-
 frontend/package-lock.json             | 6 +++---
 frontend/sync-client/package.json      | 2 +-
 frontend/test-client/package.json      | 2 +-
 manifest.json                          | 2 +-
 sync-server/Cargo.lock                 | 2 +-
 sync-server/Cargo.toml                 | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/frontend/obsidian-plugin/manifest.json b/frontend/obsidian-plugin/manifest.json
index c4464e91..a15afeab 100644
--- a/frontend/obsidian-plugin/manifest.json
+++ b/frontend/obsidian-plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.6.0",
+	"version": "0.6.1",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index 0bd87b36..ce8f8b1a 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -1,6 +1,6 @@
 {
     "name": "vault-link-obsidian-plugin",
-    "version": "0.6.0",
+    "version": "0.6.1",
     "description": "This is a sample plugin for Obsidian (https://obsidian.md)",
     "main": "main.js",
     "scripts": {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 54efe68d..73309f06 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -6361,7 +6361,7 @@
 		},
 		"obsidian-plugin": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.6.0",
+			"version": "0.6.1",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^29.5.14",
@@ -6390,7 +6390,7 @@
 			}
 		},
 		"sync-client": {
-			"version": "0.6.0",
+			"version": "0.6.1",
 			"dependencies": {
 				"byte-base64": "^1.1.0",
 				"minimatch": "^10.0.1",
@@ -6433,7 +6433,7 @@
 			}
 		},
 		"test-client": {
-			"version": "0.6.0",
+			"version": "0.6.1",
 			"bin": {
 				"test-client": "dist/cli.js"
 			},
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index 1d32c118..b44ac8cc 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "sync-client",
-    "version": "0.6.0",
+    "version": "0.6.1",
     "main": "dist/sync-client.node.js",
     "browser": "dist/sync-client.web.js",
     "types": "dist/types/index.d.ts",
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index 0c8e69ea..dc5d2d44 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "test-client",
-    "version": "0.6.0",
+    "version": "0.6.1",
     "private": true,
     "bin": {
         "test-client": "./dist/cli.js"
diff --git a/manifest.json b/manifest.json
index c4464e91..a15afeab 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.6.0",
+	"version": "0.6.1",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/sync-server/Cargo.lock b/sync-server/Cargo.lock
index 9e9574d7..7bcdcb6b 100644
--- a/sync-server/Cargo.lock
+++ b/sync-server/Cargo.lock
@@ -2205,7 +2205,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.6.0"
+version = "0.6.1"
 dependencies = [
  "anyhow",
  "axum",
diff --git a/sync-server/Cargo.toml b/sync-server/Cargo.toml
index b4e5b1f8..7565adde 100644
--- a/sync-server/Cargo.toml
+++ b/sync-server/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.6.0"
+version = "0.6.1"
 
 [dependencies]
 serde = { version = "1.0.219", default-features = false, features = ["derive"] }

From 79279df5b09d9b9e0b6936f20d19e58d0f39000a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 27 Aug 2025 20:19:57 +0100
Subject: [PATCH 553/761] Bump typescript-eslint from 8.33.1 to 8.41.0 in
 /frontend (#105)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 frontend/package-lock.json | 150 +++++++++++++++++++++++++------------
 frontend/package.json      |   2 +-
 2 files changed, 102 insertions(+), 50 deletions(-)

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 73309f06..e4724a23 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -16,7 +16,7 @@
 				"eslint-plugin-unused-imports": "^4.1.4",
 				"npm-check-updates": "^18.0.1",
 				"prettier": "^3.5.3",
-				"typescript-eslint": "8.33.1"
+				"typescript-eslint": "8.41.0"
 			}
 		},
 		"node_modules/@ampproject/remapping": {
@@ -1101,6 +1101,8 @@
 		},
 		"node_modules/@nodelib/fs.scandir": {
 			"version": "2.1.5",
+			"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+			"integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1113,6 +1115,8 @@
 		},
 		"node_modules/@nodelib/fs.stat": {
 			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+			"integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -1121,6 +1125,8 @@
 		},
 		"node_modules/@nodelib/fs.walk": {
 			"version": "1.2.8",
+			"resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+			"integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1371,15 +1377,17 @@
 			"license": "MIT"
 		},
 		"node_modules/@typescript-eslint/eslint-plugin": {
-			"version": "8.33.1",
+			"version": "8.41.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.41.0.tgz",
+			"integrity": "sha512-8fz6oa6wEKZrhXWro/S3n2eRJqlRcIa6SlDh59FXJ5Wp5XRZ8B9ixpJDcjadHq47hMx0u+HW6SNa6LjJQ6NLtw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"@eslint-community/regexpp": "^4.10.0",
-				"@typescript-eslint/scope-manager": "8.33.1",
-				"@typescript-eslint/type-utils": "8.33.1",
-				"@typescript-eslint/utils": "8.33.1",
-				"@typescript-eslint/visitor-keys": "8.33.1",
+				"@typescript-eslint/scope-manager": "8.41.0",
+				"@typescript-eslint/type-utils": "8.41.0",
+				"@typescript-eslint/utils": "8.41.0",
+				"@typescript-eslint/visitor-keys": "8.41.0",
 				"graphemer": "^1.4.0",
 				"ignore": "^7.0.0",
 				"natural-compare": "^1.4.0",
@@ -1393,9 +1401,9 @@
 				"url": "https://opencollective.com/typescript-eslint"
 			},
 			"peerDependencies": {
-				"@typescript-eslint/parser": "^8.33.1",
+				"@typescript-eslint/parser": "^8.41.0",
 				"eslint": "^8.57.0 || ^9.0.0",
-				"typescript": ">=4.8.4 <5.9.0"
+				"typescript": ">=4.8.4 <6.0.0"
 			}
 		},
 		"node_modules/@typescript-eslint/eslint-plugin/node_modules/ignore": {
@@ -1407,14 +1415,16 @@
 			}
 		},
 		"node_modules/@typescript-eslint/parser": {
-			"version": "8.33.1",
+			"version": "8.41.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.41.0.tgz",
+			"integrity": "sha512-gTtSdWX9xiMPA/7MV9STjJOOYtWwIJIYxkQxnSV1U3xcE+mnJSH3f6zI0RYP+ew66WSlZ5ed+h0VCxsvdC1jJg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@typescript-eslint/scope-manager": "8.33.1",
-				"@typescript-eslint/types": "8.33.1",
-				"@typescript-eslint/typescript-estree": "8.33.1",
-				"@typescript-eslint/visitor-keys": "8.33.1",
+				"@typescript-eslint/scope-manager": "8.41.0",
+				"@typescript-eslint/types": "8.41.0",
+				"@typescript-eslint/typescript-estree": "8.41.0",
+				"@typescript-eslint/visitor-keys": "8.41.0",
 				"debug": "^4.3.4"
 			},
 			"engines": {
@@ -1426,16 +1436,18 @@
 			},
 			"peerDependencies": {
 				"eslint": "^8.57.0 || ^9.0.0",
-				"typescript": ">=4.8.4 <5.9.0"
+				"typescript": ">=4.8.4 <6.0.0"
 			}
 		},
 		"node_modules/@typescript-eslint/project-service": {
-			"version": "8.33.1",
+			"version": "8.41.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.41.0.tgz",
+			"integrity": "sha512-b8V9SdGBQzQdjJ/IO3eDifGpDBJfvrNTp2QD9P2BeqWTGrRibgfgIlBSw6z3b6R7dPzg752tOs4u/7yCLxksSQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@typescript-eslint/tsconfig-utils": "^8.33.1",
-				"@typescript-eslint/types": "^8.33.1",
+				"@typescript-eslint/tsconfig-utils": "^8.41.0",
+				"@typescript-eslint/types": "^8.41.0",
 				"debug": "^4.3.4"
 			},
 			"engines": {
@@ -1446,16 +1458,18 @@
 				"url": "https://opencollective.com/typescript-eslint"
 			},
 			"peerDependencies": {
-				"typescript": ">=4.8.4 <5.9.0"
+				"typescript": ">=4.8.4 <6.0.0"
 			}
 		},
 		"node_modules/@typescript-eslint/scope-manager": {
-			"version": "8.33.1",
+			"version": "8.41.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.41.0.tgz",
+			"integrity": "sha512-n6m05bXn/Cd6DZDGyrpXrELCPVaTnLdPToyhBoFkLIMznRUQUEQdSp96s/pcWSQdqOhrgR1mzJ+yItK7T+WPMQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@typescript-eslint/types": "8.33.1",
-				"@typescript-eslint/visitor-keys": "8.33.1"
+				"@typescript-eslint/types": "8.41.0",
+				"@typescript-eslint/visitor-keys": "8.41.0"
 			},
 			"engines": {
 				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -1466,7 +1480,9 @@
 			}
 		},
 		"node_modules/@typescript-eslint/tsconfig-utils": {
-			"version": "8.33.1",
+			"version": "8.41.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.41.0.tgz",
+			"integrity": "sha512-TDhxYFPUYRFxFhuU5hTIJk+auzM/wKvWgoNYOPcOf6i4ReYlOoYN8q1dV5kOTjNQNJgzWN3TUUQMtlLOcUgdUw==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -1477,16 +1493,19 @@
 				"url": "https://opencollective.com/typescript-eslint"
 			},
 			"peerDependencies": {
-				"typescript": ">=4.8.4 <5.9.0"
+				"typescript": ">=4.8.4 <6.0.0"
 			}
 		},
 		"node_modules/@typescript-eslint/type-utils": {
-			"version": "8.33.1",
+			"version": "8.41.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.41.0.tgz",
+			"integrity": "sha512-63qt1h91vg3KsjVVonFJWjgSK7pZHSQFKH6uwqxAH9bBrsyRhO6ONoKyXxyVBzG1lJnFAJcKAcxLS54N1ee1OQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@typescript-eslint/typescript-estree": "8.33.1",
-				"@typescript-eslint/utils": "8.33.1",
+				"@typescript-eslint/types": "8.41.0",
+				"@typescript-eslint/typescript-estree": "8.41.0",
+				"@typescript-eslint/utils": "8.41.0",
 				"debug": "^4.3.4",
 				"ts-api-utils": "^2.1.0"
 			},
@@ -1499,11 +1518,13 @@
 			},
 			"peerDependencies": {
 				"eslint": "^8.57.0 || ^9.0.0",
-				"typescript": ">=4.8.4 <5.9.0"
+				"typescript": ">=4.8.4 <6.0.0"
 			}
 		},
 		"node_modules/@typescript-eslint/types": {
-			"version": "8.33.1",
+			"version": "8.41.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.41.0.tgz",
+			"integrity": "sha512-9EwxsWdVqh42afLbHP90n2VdHaWU/oWgbH2P0CfcNfdKL7CuKpwMQGjwev56vWu9cSKU7FWSu6r9zck6CVfnag==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -1515,14 +1536,16 @@
 			}
 		},
 		"node_modules/@typescript-eslint/typescript-estree": {
-			"version": "8.33.1",
+			"version": "8.41.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.41.0.tgz",
+			"integrity": "sha512-D43UwUYJmGhuwHfY7MtNKRZMmfd8+p/eNSfFe6tH5mbVDto+VQCayeAt35rOx3Cs6wxD16DQtIKw/YXxt5E0UQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@typescript-eslint/project-service": "8.33.1",
-				"@typescript-eslint/tsconfig-utils": "8.33.1",
-				"@typescript-eslint/types": "8.33.1",
-				"@typescript-eslint/visitor-keys": "8.33.1",
+				"@typescript-eslint/project-service": "8.41.0",
+				"@typescript-eslint/tsconfig-utils": "8.41.0",
+				"@typescript-eslint/types": "8.41.0",
+				"@typescript-eslint/visitor-keys": "8.41.0",
 				"debug": "^4.3.4",
 				"fast-glob": "^3.3.2",
 				"is-glob": "^4.0.3",
@@ -1538,11 +1561,13 @@
 				"url": "https://opencollective.com/typescript-eslint"
 			},
 			"peerDependencies": {
-				"typescript": ">=4.8.4 <5.9.0"
+				"typescript": ">=4.8.4 <6.0.0"
 			}
 		},
 		"node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
-			"version": "2.0.1",
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+			"integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1551,6 +1576,8 @@
 		},
 		"node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": {
 			"version": "9.0.5",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+			"integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
 			"dev": true,
 			"license": "ISC",
 			"dependencies": {
@@ -1564,14 +1591,16 @@
 			}
 		},
 		"node_modules/@typescript-eslint/utils": {
-			"version": "8.33.1",
+			"version": "8.41.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.41.0.tgz",
+			"integrity": "sha512-udbCVstxZ5jiPIXrdH+BZWnPatjlYwJuJkDA4Tbo3WyYLh8NvB+h/bKeSZHDOFKfphsZYJQqaFtLeXEqurQn1A==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"@eslint-community/eslint-utils": "^4.7.0",
-				"@typescript-eslint/scope-manager": "8.33.1",
-				"@typescript-eslint/types": "8.33.1",
-				"@typescript-eslint/typescript-estree": "8.33.1"
+				"@typescript-eslint/scope-manager": "8.41.0",
+				"@typescript-eslint/types": "8.41.0",
+				"@typescript-eslint/typescript-estree": "8.41.0"
 			},
 			"engines": {
 				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -1582,16 +1611,18 @@
 			},
 			"peerDependencies": {
 				"eslint": "^8.57.0 || ^9.0.0",
-				"typescript": ">=4.8.4 <5.9.0"
+				"typescript": ">=4.8.4 <6.0.0"
 			}
 		},
 		"node_modules/@typescript-eslint/visitor-keys": {
-			"version": "8.33.1",
+			"version": "8.41.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.41.0.tgz",
+			"integrity": "sha512-+GeGMebMCy0elMNg67LRNoVnUFPIm37iu5CmHESVx56/9Jsfdpsvbv605DQ81Pi/x11IdKUsS5nzgTYbCQU9fg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@typescript-eslint/types": "8.33.1",
-				"eslint-visitor-keys": "^4.2.0"
+				"@typescript-eslint/types": "8.41.0",
+				"eslint-visitor-keys": "^4.2.1"
 			},
 			"engines": {
 				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2762,7 +2793,9 @@
 			}
 		},
 		"node_modules/eslint-visitor-keys": {
-			"version": "4.2.0",
+			"version": "4.2.1",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
+			"integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"engines": {
@@ -2901,6 +2934,8 @@
 		},
 		"node_modules/fast-glob": {
 			"version": "3.3.3",
+			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
+			"integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2916,6 +2951,8 @@
 		},
 		"node_modules/fast-glob/node_modules/glob-parent": {
 			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+			"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
 			"dev": true,
 			"license": "ISC",
 			"dependencies": {
@@ -2960,6 +2997,8 @@
 		},
 		"node_modules/fastq": {
 			"version": "1.19.1",
+			"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz",
+			"integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==",
 			"dev": true,
 			"license": "ISC",
 			"dependencies": {
@@ -4292,6 +4331,8 @@
 		},
 		"node_modules/merge2": {
 			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+			"integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -4972,6 +5013,8 @@
 		},
 		"node_modules/queue-microtask": {
 			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+			"integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
 			"dev": true,
 			"funding": [
 				{
@@ -5133,6 +5176,8 @@
 		},
 		"node_modules/reusify": {
 			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz",
+			"integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -5142,6 +5187,8 @@
 		},
 		"node_modules/run-parallel": {
 			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+			"integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
 			"dev": true,
 			"funding": [
 				{
@@ -5729,6 +5776,8 @@
 		},
 		"node_modules/ts-api-utils": {
 			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.1.0.tgz",
+			"integrity": "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -5872,13 +5921,16 @@
 			}
 		},
 		"node_modules/typescript-eslint": {
-			"version": "8.33.1",
+			"version": "8.41.0",
+			"resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.41.0.tgz",
+			"integrity": "sha512-n66rzs5OBXW3SFSnZHr2T685q1i4ODm2nulFJhMZBotaTavsS8TrI3d7bDlRSs9yWo7HmyWrN9qDu14Qv7Y0Dw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@typescript-eslint/eslint-plugin": "8.33.1",
-				"@typescript-eslint/parser": "8.33.1",
-				"@typescript-eslint/utils": "8.33.1"
+				"@typescript-eslint/eslint-plugin": "8.41.0",
+				"@typescript-eslint/parser": "8.41.0",
+				"@typescript-eslint/typescript-estree": "8.41.0",
+				"@typescript-eslint/utils": "8.41.0"
 			},
 			"engines": {
 				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -5889,7 +5941,7 @@
 			},
 			"peerDependencies": {
 				"eslint": "^8.57.0 || ^9.0.0",
-				"typescript": ">=4.8.4 <5.9.0"
+				"typescript": ">=4.8.4 <6.0.0"
 			}
 		},
 		"node_modules/undici-types": {
diff --git a/frontend/package.json b/frontend/package.json
index 6c51ddcf..d126b0e3 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -25,6 +25,6 @@
 		"eslint-plugin-unused-imports": "^4.1.4",
 		"npm-check-updates": "^18.0.1",
 		"prettier": "^3.5.3",
-		"typescript-eslint": "8.33.1"
+		"typescript-eslint": "8.41.0"
 	}
 }
\ No newline at end of file

From 6b12603915199b8b4817c0047b2b1b2bc720ff5a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 27 Aug 2025 20:20:13 +0100
Subject: [PATCH 554/761] Bump sass from 1.89.1 to 1.91.0 in /frontend (#104)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 frontend/obsidian-plugin/package.json | 2 +-
 frontend/package-lock.json            | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index ce8f8b1a..5d516f3c 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -23,7 +23,7 @@
         "mini-css-extract-plugin": "^2.9.2",
         "obsidian": "1.8.7",
         "resolve-url-loader": "^5.0.0",
-        "sass": "^1.89.1",
+        "sass": "^1.91.0",
         "sass-loader": "^16.0.5",
         "sync-client": "file:../sync-client",
         "terser-webpack-plugin": "^5.3.14",
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index e4724a23..e1524384 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -5237,7 +5237,9 @@
 			"license": "MIT"
 		},
 		"node_modules/sass": {
-			"version": "1.89.1",
+			"version": "1.91.0",
+			"resolved": "https://registry.npmjs.org/sass/-/sass-1.91.0.tgz",
+			"integrity": "sha512-aFOZHGf+ur+bp1bCHZ+u8otKGh77ZtmFyXDo4tlYvT7PWql41Kwd8wdkPqhhT+h2879IVblcHFglIMofsFd1EA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -6427,7 +6429,7 @@
 				"obsidian": "1.8.7",
 				"reconcile-text": "^0.5.0",
 				"resolve-url-loader": "^5.0.0",
-				"sass": "^1.89.1",
+				"sass": "^1.91.0",
 				"sass-loader": "^16.0.5",
 				"sync-client": "file:../sync-client",
 				"terser-webpack-plugin": "^5.3.14",

From 2500378de0b9488a1d79b85aad8578a6d49e7b69 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 27 Aug 2025 21:49:17 +0100
Subject: [PATCH 555/761] Bump jest and @types/jest in /frontend (#71)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 frontend/obsidian-plugin/package.json |    4 +-
 frontend/package-lock.json            | 4763 ++++++++++++++++++++++---
 frontend/sync-client/package.json     |    4 +-
 3 files changed, 4285 insertions(+), 486 deletions(-)

diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index 5d516f3c..66828a64 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -13,13 +13,13 @@
     "author": "",
     "license": "MIT",
     "devDependencies": {
-        "@types/jest": "^29.5.14",
+        "@types/jest": "^30.0.0",
         "@types/node": "^22.15.30",
         "css-loader": "^7.1.2",
         "date-fns": "^4.1.0",
         "file-loader": "^6.2.0",
         "fs-extra": "^11.3.0",
-        "jest": "^29.7.0",
+        "jest": "^30.1.1",
         "mini-css-extract-plugin": "^2.9.2",
         "obsidian": "1.8.7",
         "resolve-url-loader": "^5.0.0",
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index e1524384..2d23f3be 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -32,20 +32,24 @@
 			}
 		},
 		"node_modules/@babel/code-frame": {
-			"version": "7.26.2",
+			"version": "7.27.1",
+			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz",
+			"integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-validator-identifier": "^7.25.9",
+				"@babel/helper-validator-identifier": "^7.27.1",
 				"js-tokens": "^4.0.0",
-				"picocolors": "^1.0.0"
+				"picocolors": "^1.1.1"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/compat-data": {
-			"version": "7.26.8",
+			"version": "7.28.0",
+			"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.28.0.tgz",
+			"integrity": "sha512-60X7qkglvrap8mn1lh2ebxXdZYtUcpd7gsmy9kLaBJ4i/WdY8PqTSdxyA8qraikqKQK5C1KRBKXqznrVapyNaw==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -53,20 +57,22 @@
 			}
 		},
 		"node_modules/@babel/core": {
-			"version": "7.26.10",
+			"version": "7.28.3",
+			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.3.tgz",
+			"integrity": "sha512-yDBHV9kQNcr2/sUr9jghVyz9C3Y5G2zUM2H2lo+9mKv4sFgbA8s8Z9t8D1jiTkGoO/NoIfKMyKWr4s6CN23ZwQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"@ampproject/remapping": "^2.2.0",
-				"@babel/code-frame": "^7.26.2",
-				"@babel/generator": "^7.26.10",
-				"@babel/helper-compilation-targets": "^7.26.5",
-				"@babel/helper-module-transforms": "^7.26.0",
-				"@babel/helpers": "^7.26.10",
-				"@babel/parser": "^7.26.10",
-				"@babel/template": "^7.26.9",
-				"@babel/traverse": "^7.26.10",
-				"@babel/types": "^7.26.10",
+				"@babel/code-frame": "^7.27.1",
+				"@babel/generator": "^7.28.3",
+				"@babel/helper-compilation-targets": "^7.27.2",
+				"@babel/helper-module-transforms": "^7.28.3",
+				"@babel/helpers": "^7.28.3",
+				"@babel/parser": "^7.28.3",
+				"@babel/template": "^7.27.2",
+				"@babel/traverse": "^7.28.3",
+				"@babel/types": "^7.28.2",
 				"convert-source-map": "^2.0.0",
 				"debug": "^4.1.0",
 				"gensync": "^1.0.0-beta.2",
@@ -90,14 +96,16 @@
 			}
 		},
 		"node_modules/@babel/generator": {
-			"version": "7.27.0",
+			"version": "7.28.3",
+			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.3.tgz",
+			"integrity": "sha512-3lSpxGgvnmZznmBkCRnVREPUFJv2wrv9iAoFDvADJc0ypmdOxdUtcLeBgBJ6zE0PMeTKnxeQzyk0xTBq4Ep7zw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@babel/parser": "^7.27.0",
-				"@babel/types": "^7.27.0",
-				"@jridgewell/gen-mapping": "^0.3.5",
-				"@jridgewell/trace-mapping": "^0.3.25",
+				"@babel/parser": "^7.28.3",
+				"@babel/types": "^7.28.2",
+				"@jridgewell/gen-mapping": "^0.3.12",
+				"@jridgewell/trace-mapping": "^0.3.28",
 				"jsesc": "^3.0.2"
 			},
 			"engines": {
@@ -105,12 +113,14 @@
 			}
 		},
 		"node_modules/@babel/helper-compilation-targets": {
-			"version": "7.27.0",
+			"version": "7.27.2",
+			"resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.2.tgz",
+			"integrity": "sha512-2+1thGUUWWjLTYTHZWK1n8Yga0ijBz1XAhUXcKy81rd5g6yh7hGqMp45v7cadSbEHc9G3OTv45SyneRN3ps4DQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@babel/compat-data": "^7.26.8",
-				"@babel/helper-validator-option": "^7.25.9",
+				"@babel/compat-data": "^7.27.2",
+				"@babel/helper-validator-option": "^7.27.1",
 				"browserslist": "^4.24.0",
 				"lru-cache": "^5.1.1",
 				"semver": "^6.3.1"
@@ -121,32 +131,48 @@
 		},
 		"node_modules/@babel/helper-compilation-targets/node_modules/semver": {
 			"version": "6.3.1",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
 			"dev": true,
 			"license": "ISC",
 			"bin": {
 				"semver": "bin/semver.js"
 			}
 		},
+		"node_modules/@babel/helper-globals": {
+			"version": "7.28.0",
+			"resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.28.0.tgz",
+			"integrity": "sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
 		"node_modules/@babel/helper-module-imports": {
-			"version": "7.25.9",
+			"version": "7.27.1",
+			"resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.27.1.tgz",
+			"integrity": "sha512-0gSFWUPNXNopqtIPQvlD5WgXYI5GY2kP2cCvoT8kczjbfcfuIljTbcWrulD1CIPIX2gt1wghbDy08yE1p+/r3w==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@babel/traverse": "^7.25.9",
-				"@babel/types": "^7.25.9"
+				"@babel/traverse": "^7.27.1",
+				"@babel/types": "^7.27.1"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/helper-module-transforms": {
-			"version": "7.26.0",
+			"version": "7.28.3",
+			"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.28.3.tgz",
+			"integrity": "sha512-gytXUbs8k2sXS9PnQptz5o0QnpLL51SwASIORY6XaBKF88nsOT0Zw9szLqlSGQDP/4TljBAD5y98p2U1fqkdsw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-module-imports": "^7.25.9",
-				"@babel/helper-validator-identifier": "^7.25.9",
-				"@babel/traverse": "^7.25.9"
+				"@babel/helper-module-imports": "^7.27.1",
+				"@babel/helper-validator-identifier": "^7.27.1",
+				"@babel/traverse": "^7.28.3"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -156,7 +182,9 @@
 			}
 		},
 		"node_modules/@babel/helper-plugin-utils": {
-			"version": "7.26.5",
+			"version": "7.27.1",
+			"resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.27.1.tgz",
+			"integrity": "sha512-1gn1Up5YXka3YYAHGKpbideQ5Yjf1tDa9qYcgysz+cNCXukyLl6DjPXhD3VRwSb8c0J9tA4b2+rHEZtc6R0tlw==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -164,7 +192,9 @@
 			}
 		},
 		"node_modules/@babel/helper-string-parser": {
-			"version": "7.25.9",
+			"version": "7.27.1",
+			"resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz",
+			"integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -172,7 +202,9 @@
 			}
 		},
 		"node_modules/@babel/helper-validator-identifier": {
-			"version": "7.25.9",
+			"version": "7.27.1",
+			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz",
+			"integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -180,7 +212,9 @@
 			}
 		},
 		"node_modules/@babel/helper-validator-option": {
-			"version": "7.25.9",
+			"version": "7.27.1",
+			"resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz",
+			"integrity": "sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -188,23 +222,27 @@
 			}
 		},
 		"node_modules/@babel/helpers": {
-			"version": "7.27.0",
+			"version": "7.28.3",
+			"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.28.3.tgz",
+			"integrity": "sha512-PTNtvUQihsAsDHMOP5pfobP8C6CM4JWXmP8DrEIt46c3r2bf87Ua1zoqevsMo9g+tWDwgWrFP5EIxuBx5RudAw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@babel/template": "^7.27.0",
-				"@babel/types": "^7.27.0"
+				"@babel/template": "^7.27.2",
+				"@babel/types": "^7.28.2"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/parser": {
-			"version": "7.27.0",
+			"version": "7.28.3",
+			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.3.tgz",
+			"integrity": "sha512-7+Ey1mAgYqFAx2h0RuoxcQT5+MlG3GTV0TQrgr7/ZliKsm/MNDxVVutlWaziMq7wJNAz8MTqz55XLpWvva6StA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@babel/types": "^7.27.0"
+				"@babel/types": "^7.28.2"
 			},
 			"bin": {
 				"parser": "bin/babel-parser.js"
@@ -297,11 +335,13 @@
 			}
 		},
 		"node_modules/@babel/plugin-syntax-jsx": {
-			"version": "7.25.9",
+			"version": "7.27.1",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.27.1.tgz",
+			"integrity": "sha512-y8YTNIeKoyhGd9O0Jiyzyyqk8gdjnumGTQPsz0xOZOQ2RmkVJeZ1vmmfIvFEKqucBG6axJGBZDE/7iI5suUI/w==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.25.9"
+				"@babel/helper-plugin-utils": "^7.27.1"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -405,11 +445,13 @@
 			}
 		},
 		"node_modules/@babel/plugin-syntax-typescript": {
-			"version": "7.25.9",
+			"version": "7.27.1",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.27.1.tgz",
+			"integrity": "sha512-xfYCBMxveHrRMnAWl1ZlPXOZjzkN82THFvLhQhFXFt81Z5HnN+EtUkZhv/zcKpmT3fzmWZB0ywiBrbC3vogbwQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.25.9"
+				"@babel/helper-plugin-utils": "^7.27.1"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -419,50 +461,48 @@
 			}
 		},
 		"node_modules/@babel/template": {
-			"version": "7.27.0",
+			"version": "7.27.2",
+			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.2.tgz",
+			"integrity": "sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@babel/code-frame": "^7.26.2",
-				"@babel/parser": "^7.27.0",
-				"@babel/types": "^7.27.0"
+				"@babel/code-frame": "^7.27.1",
+				"@babel/parser": "^7.27.2",
+				"@babel/types": "^7.27.1"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/traverse": {
-			"version": "7.27.0",
+			"version": "7.28.3",
+			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.3.tgz",
+			"integrity": "sha512-7w4kZYHneL3A6NP2nxzHvT3HCZ7puDZZjFMqDpBPECub79sTtSO5CGXDkKrTQq8ksAwfD/XI2MRFX23njdDaIQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@babel/code-frame": "^7.26.2",
-				"@babel/generator": "^7.27.0",
-				"@babel/parser": "^7.27.0",
-				"@babel/template": "^7.27.0",
-				"@babel/types": "^7.27.0",
-				"debug": "^4.3.1",
-				"globals": "^11.1.0"
+				"@babel/code-frame": "^7.27.1",
+				"@babel/generator": "^7.28.3",
+				"@babel/helper-globals": "^7.28.0",
+				"@babel/parser": "^7.28.3",
+				"@babel/template": "^7.27.2",
+				"@babel/types": "^7.28.2",
+				"debug": "^4.3.1"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
-		"node_modules/@babel/traverse/node_modules/globals": {
-			"version": "11.12.0",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=4"
-			}
-		},
 		"node_modules/@babel/types": {
-			"version": "7.27.0",
+			"version": "7.28.2",
+			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.2.tgz",
+			"integrity": "sha512-ruv7Ae4J5dUYULmeXw1gmb7rYRz57OWCPM57pHojnLq/3Z1CK2lNSLTCVjxVk1F/TZHwOZZrOWi0ur95BbLxNQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@babel/helper-string-parser": "^7.25.9",
-				"@babel/helper-validator-identifier": "^7.25.9"
+				"@babel/helper-string-parser": "^7.27.1",
+				"@babel/helper-validator-identifier": "^7.27.1"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -470,6 +510,8 @@
 		},
 		"node_modules/@bcoe/v8-coverage": {
 			"version": "0.2.3",
+			"resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
+			"integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -501,6 +543,40 @@
 				"node": ">=14.17.0"
 			}
 		},
+		"node_modules/@emnapi/core": {
+			"version": "1.4.5",
+			"resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.4.5.tgz",
+			"integrity": "sha512-XsLw1dEOpkSX/WucdqUhPWP7hDxSvZiY+fsUC14h+FtQ2Ifni4znbBt8punRX+Uj2JG/uDb8nEHVKvrVlvdZ5Q==",
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"dependencies": {
+				"@emnapi/wasi-threads": "1.0.4",
+				"tslib": "^2.4.0"
+			}
+		},
+		"node_modules/@emnapi/runtime": {
+			"version": "1.4.5",
+			"resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.4.5.tgz",
+			"integrity": "sha512-++LApOtY0pEEz1zrd9vy1/zXVaVJJ/EbAF3u0fXIzPJEDtnITsBGbbK0EkM72amhl/R5b+5xx0Y/QhcVOpuulg==",
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"dependencies": {
+				"tslib": "^2.4.0"
+			}
+		},
+		"node_modules/@emnapi/wasi-threads": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.0.4.tgz",
+			"integrity": "sha512-PJR+bOmMOPH8AtcTGAyYNiuJ3/Fcoj2XN/gBEWzDIKh254XO+mM9XoXHk5GNEhodxeMznbg7BlRojVbKN+gC6g==",
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"dependencies": {
+				"tslib": "^2.4.0"
+			}
+		},
 		"node_modules/@eslint-community/eslint-utils": {
 			"version": "4.7.0",
 			"dev": true,
@@ -678,6 +754,109 @@
 				"url": "https://github.com/sponsors/nzakas"
 			}
 		},
+		"node_modules/@isaacs/cliui": {
+			"version": "8.0.2",
+			"resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
+			"integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"string-width": "^5.1.2",
+				"string-width-cjs": "npm:string-width@^4.2.0",
+				"strip-ansi": "^7.0.1",
+				"strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
+				"wrap-ansi": "^8.1.0",
+				"wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@isaacs/cliui/node_modules/ansi-regex": {
+			"version": "6.2.0",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.0.tgz",
+			"integrity": "sha512-TKY5pyBkHyADOPYlRT9Lx6F544mPl0vS5Ew7BJ45hA08Q+t3GjbueLliBWN3sMICk6+y7HdyxSzC4bWS8baBdg==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-regex?sponsor=1"
+			}
+		},
+		"node_modules/@isaacs/cliui/node_modules/ansi-styles": {
+			"version": "6.2.1",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+			"integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/@isaacs/cliui/node_modules/emoji-regex": {
+			"version": "9.2.2",
+			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+			"integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/@isaacs/cliui/node_modules/string-width": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+			"integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"eastasianwidth": "^0.2.0",
+				"emoji-regex": "^9.2.2",
+				"strip-ansi": "^7.0.1"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/@isaacs/cliui/node_modules/strip-ansi": {
+			"version": "7.1.0",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+			"integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-regex": "^6.0.1"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/strip-ansi?sponsor=1"
+			}
+		},
+		"node_modules/@isaacs/cliui/node_modules/wrap-ansi": {
+			"version": "8.1.0",
+			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+			"integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-styles": "^6.1.0",
+				"string-width": "^5.0.1",
+				"strip-ansi": "^7.0.1"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+			}
+		},
 		"node_modules/@istanbuljs/load-nyc-config": {
 			"version": "1.1.0",
 			"dev": true,
@@ -778,57 +957,147 @@
 			}
 		},
 		"node_modules/@jest/console": {
-			"version": "29.7.0",
+			"version": "30.1.1",
+			"resolved": "https://registry.npmjs.org/@jest/console/-/console-30.1.1.tgz",
+			"integrity": "sha512-f7TGqR1k4GtN5pyFrKmq+ZVndesiwLU33yDpJIGMS9aW+j6hKjue7ljeAdznBsH9kAnxUWe2Y+Y3fLV/FJt3gA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@jest/types": "^29.6.3",
+				"@jest/types": "30.0.5",
 				"@types/node": "*",
-				"chalk": "^4.0.0",
-				"jest-message-util": "^29.7.0",
-				"jest-util": "^29.7.0",
+				"chalk": "^4.1.2",
+				"jest-message-util": "30.1.0",
+				"jest-util": "30.0.5",
 				"slash": "^3.0.0"
 			},
 			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
 			}
 		},
-		"node_modules/@jest/core": {
-			"version": "29.7.0",
+		"node_modules/@jest/console/node_modules/@jest/schemas": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
+			"integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@jest/console": "^29.7.0",
-				"@jest/reporters": "^29.7.0",
-				"@jest/test-result": "^29.7.0",
-				"@jest/transform": "^29.7.0",
-				"@jest/types": "^29.6.3",
-				"@types/node": "*",
-				"ansi-escapes": "^4.2.1",
-				"chalk": "^4.0.0",
-				"ci-info": "^3.2.0",
-				"exit": "^0.1.2",
-				"graceful-fs": "^4.2.9",
-				"jest-changed-files": "^29.7.0",
-				"jest-config": "^29.7.0",
-				"jest-haste-map": "^29.7.0",
-				"jest-message-util": "^29.7.0",
-				"jest-regex-util": "^29.6.3",
-				"jest-resolve": "^29.7.0",
-				"jest-resolve-dependencies": "^29.7.0",
-				"jest-runner": "^29.7.0",
-				"jest-runtime": "^29.7.0",
-				"jest-snapshot": "^29.7.0",
-				"jest-util": "^29.7.0",
-				"jest-validate": "^29.7.0",
-				"jest-watcher": "^29.7.0",
-				"micromatch": "^4.0.4",
-				"pretty-format": "^29.7.0",
-				"slash": "^3.0.0",
-				"strip-ansi": "^6.0.0"
+				"@sinclair/typebox": "^0.34.0"
 			},
 			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/@jest/console/node_modules/@jest/types": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.5.tgz",
+			"integrity": "sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/pattern": "30.0.1",
+				"@jest/schemas": "30.0.5",
+				"@types/istanbul-lib-coverage": "^2.0.6",
+				"@types/istanbul-reports": "^3.0.4",
+				"@types/node": "*",
+				"@types/yargs": "^17.0.33",
+				"chalk": "^4.1.2"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/@jest/console/node_modules/@sinclair/typebox": {
+			"version": "0.34.40",
+			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.40.tgz",
+			"integrity": "sha512-gwBNIP8ZAYev/ORDWW0QvxdwPXwxBtLsdsJgSc7eDIRt8ubP+rxUBzPsrwnu16fgEF8Bx4lh/+mvQvJzcTM6Kw==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/@jest/console/node_modules/ci-info": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.0.tgz",
+			"integrity": "sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/sibiraj-s"
+				}
+			],
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@jest/console/node_modules/jest-util": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-30.0.5.tgz",
+			"integrity": "sha512-pvyPWssDZR0FlfMxCBoc0tvM8iUEskaRFALUtGQYzVEAqisAztmy+R8LnU14KT4XA0H/a5HMVTXat1jLne010g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/types": "30.0.5",
+				"@types/node": "*",
+				"chalk": "^4.1.2",
+				"ci-info": "^4.2.0",
+				"graceful-fs": "^4.2.11",
+				"picomatch": "^4.0.2"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/@jest/console/node_modules/picomatch": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+			"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/jonschlinkert"
+			}
+		},
+		"node_modules/@jest/core": {
+			"version": "30.1.1",
+			"resolved": "https://registry.npmjs.org/@jest/core/-/core-30.1.1.tgz",
+			"integrity": "sha512-3ncU9peZ3D2VdgRkdZtUceTrDgX5yiDRwAFjtxNfU22IiZrpVWlv/FogzDLYSJQptQGfFo3PcHK86a2oG6WUGg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/console": "30.1.1",
+				"@jest/pattern": "30.0.1",
+				"@jest/reporters": "30.1.1",
+				"@jest/test-result": "30.1.1",
+				"@jest/transform": "30.1.1",
+				"@jest/types": "30.0.5",
+				"@types/node": "*",
+				"ansi-escapes": "^4.3.2",
+				"chalk": "^4.1.2",
+				"ci-info": "^4.2.0",
+				"exit-x": "^0.2.2",
+				"graceful-fs": "^4.2.11",
+				"jest-changed-files": "30.0.5",
+				"jest-config": "30.1.1",
+				"jest-haste-map": "30.1.0",
+				"jest-message-util": "30.1.0",
+				"jest-regex-util": "30.0.1",
+				"jest-resolve": "30.1.0",
+				"jest-resolve-dependencies": "30.1.1",
+				"jest-runner": "30.1.1",
+				"jest-runtime": "30.1.1",
+				"jest-snapshot": "30.1.1",
+				"jest-util": "30.0.5",
+				"jest-validate": "30.1.0",
+				"jest-watcher": "30.1.1",
+				"micromatch": "^4.0.8",
+				"pretty-format": "30.0.5",
+				"slash": "^3.0.0"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
 			},
 			"peerDependencies": {
 				"node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
@@ -839,105 +1108,533 @@
 				}
 			}
 		},
-		"node_modules/@jest/environment": {
-			"version": "29.7.0",
+		"node_modules/@jest/core/node_modules/@jest/schemas": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
+			"integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@jest/fake-timers": "^29.7.0",
-				"@jest/types": "^29.6.3",
-				"@types/node": "*",
-				"jest-mock": "^29.7.0"
+				"@sinclair/typebox": "^0.34.0"
 			},
 			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
 			}
 		},
-		"node_modules/@jest/expect": {
-			"version": "29.7.0",
+		"node_modules/@jest/core/node_modules/@jest/transform": {
+			"version": "30.1.1",
+			"resolved": "https://registry.npmjs.org/@jest/transform/-/transform-30.1.1.tgz",
+			"integrity": "sha512-PHIA2AbAASBfk6evkNifvmx9lkOSkmvaQoO6VSpuL8+kQqDMHeDoJ7RU3YP1wWAMD7AyQn9UL5iheuFYCC4lqQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"expect": "^29.7.0",
-				"jest-snapshot": "^29.7.0"
+				"@babel/core": "^7.27.4",
+				"@jest/types": "30.0.5",
+				"@jridgewell/trace-mapping": "^0.3.25",
+				"babel-plugin-istanbul": "^7.0.0",
+				"chalk": "^4.1.2",
+				"convert-source-map": "^2.0.0",
+				"fast-json-stable-stringify": "^2.1.0",
+				"graceful-fs": "^4.2.11",
+				"jest-haste-map": "30.1.0",
+				"jest-regex-util": "30.0.1",
+				"jest-util": "30.0.5",
+				"micromatch": "^4.0.8",
+				"pirates": "^4.0.7",
+				"slash": "^3.0.0",
+				"write-file-atomic": "^5.0.1"
 			},
 			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/@jest/core/node_modules/@jest/types": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.5.tgz",
+			"integrity": "sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/pattern": "30.0.1",
+				"@jest/schemas": "30.0.5",
+				"@types/istanbul-lib-coverage": "^2.0.6",
+				"@types/istanbul-reports": "^3.0.4",
+				"@types/node": "*",
+				"@types/yargs": "^17.0.33",
+				"chalk": "^4.1.2"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/@jest/core/node_modules/@sinclair/typebox": {
+			"version": "0.34.40",
+			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.40.tgz",
+			"integrity": "sha512-gwBNIP8ZAYev/ORDWW0QvxdwPXwxBtLsdsJgSc7eDIRt8ubP+rxUBzPsrwnu16fgEF8Bx4lh/+mvQvJzcTM6Kw==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/@jest/core/node_modules/babel-plugin-istanbul": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-7.0.0.tgz",
+			"integrity": "sha512-C5OzENSx/A+gt7t4VH1I2XsflxyPUmXRFPKBxt33xncdOmq7oROVM3bZv9Ysjjkv8OJYDMa+tKuKMvqU/H3xdw==",
+			"dev": true,
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.0.0",
+				"@istanbuljs/load-nyc-config": "^1.0.0",
+				"@istanbuljs/schema": "^0.1.3",
+				"istanbul-lib-instrument": "^6.0.2",
+				"test-exclude": "^6.0.0"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@jest/core/node_modules/ci-info": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.0.tgz",
+			"integrity": "sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/sibiraj-s"
+				}
+			],
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@jest/core/node_modules/jest-haste-map": {
+			"version": "30.1.0",
+			"resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-30.1.0.tgz",
+			"integrity": "sha512-JLeM84kNjpRkggcGpQLsV7B8W4LNUWz7oDNVnY1Vjj22b5/fAb3kk3htiD+4Na8bmJmjJR7rBtS2Rmq/NEcADg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/types": "30.0.5",
+				"@types/node": "*",
+				"anymatch": "^3.1.3",
+				"fb-watchman": "^2.0.2",
+				"graceful-fs": "^4.2.11",
+				"jest-regex-util": "30.0.1",
+				"jest-util": "30.0.5",
+				"jest-worker": "30.1.0",
+				"micromatch": "^4.0.8",
+				"walker": "^1.0.8"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			},
+			"optionalDependencies": {
+				"fsevents": "^2.3.3"
+			}
+		},
+		"node_modules/@jest/core/node_modules/jest-regex-util": {
+			"version": "30.0.1",
+			"resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-30.0.1.tgz",
+			"integrity": "sha512-jHEQgBXAgc+Gh4g0p3bCevgRCVRkB4VB70zhoAE48gxeSr1hfUOsM/C2WoJgVL7Eyg//hudYENbm3Ne+/dRVVA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/@jest/core/node_modules/jest-util": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-30.0.5.tgz",
+			"integrity": "sha512-pvyPWssDZR0FlfMxCBoc0tvM8iUEskaRFALUtGQYzVEAqisAztmy+R8LnU14KT4XA0H/a5HMVTXat1jLne010g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/types": "30.0.5",
+				"@types/node": "*",
+				"chalk": "^4.1.2",
+				"ci-info": "^4.2.0",
+				"graceful-fs": "^4.2.11",
+				"picomatch": "^4.0.2"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/@jest/core/node_modules/jest-worker": {
+			"version": "30.1.0",
+			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-30.1.0.tgz",
+			"integrity": "sha512-uvWcSjlwAAgIu133Tt77A05H7RIk3Ho8tZL50bQM2AkvLdluw9NG48lRCl3Dt+MOH719n/0nnb5YxUwcuJiKRA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@types/node": "*",
+				"@ungap/structured-clone": "^1.3.0",
+				"jest-util": "30.0.5",
+				"merge-stream": "^2.0.0",
+				"supports-color": "^8.1.1"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/@jest/core/node_modules/picomatch": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+			"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/jonschlinkert"
+			}
+		},
+		"node_modules/@jest/core/node_modules/signal-exit": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+			"integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+			"dev": true,
+			"license": "ISC",
+			"engines": {
+				"node": ">=14"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
+		"node_modules/@jest/core/node_modules/write-file-atomic": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz",
+			"integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"imurmurhash": "^0.1.4",
+				"signal-exit": "^4.0.1"
+			},
+			"engines": {
+				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+			}
+		},
+		"node_modules/@jest/diff-sequences": {
+			"version": "30.0.1",
+			"resolved": "https://registry.npmjs.org/@jest/diff-sequences/-/diff-sequences-30.0.1.tgz",
+			"integrity": "sha512-n5H8QLDJ47QqbCNn5SuFjCRDrOLEZ0h8vAHCK5RL9Ls7Xa8AQLa/YxAc9UjFqoEDM48muwtBGjtMY5cr0PLDCw==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/@jest/environment": {
+			"version": "30.1.1",
+			"resolved": "https://registry.npmjs.org/@jest/environment/-/environment-30.1.1.tgz",
+			"integrity": "sha512-yWHbU+3j7ehQE+NRpnxRvHvpUhoohIjMePBbIr8lfe0cWVb0WeTf80DNux1GPJa18CDHiIU5DtksGUfxcDE+Rw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/fake-timers": "30.1.1",
+				"@jest/types": "30.0.5",
+				"@types/node": "*",
+				"jest-mock": "30.0.5"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/@jest/environment/node_modules/@jest/schemas": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
+			"integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@sinclair/typebox": "^0.34.0"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/@jest/environment/node_modules/@jest/types": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.5.tgz",
+			"integrity": "sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/pattern": "30.0.1",
+				"@jest/schemas": "30.0.5",
+				"@types/istanbul-lib-coverage": "^2.0.6",
+				"@types/istanbul-reports": "^3.0.4",
+				"@types/node": "*",
+				"@types/yargs": "^17.0.33",
+				"chalk": "^4.1.2"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/@jest/environment/node_modules/@sinclair/typebox": {
+			"version": "0.34.40",
+			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.40.tgz",
+			"integrity": "sha512-gwBNIP8ZAYev/ORDWW0QvxdwPXwxBtLsdsJgSc7eDIRt8ubP+rxUBzPsrwnu16fgEF8Bx4lh/+mvQvJzcTM6Kw==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/@jest/expect": {
+			"version": "30.1.1",
+			"resolved": "https://registry.npmjs.org/@jest/expect/-/expect-30.1.1.tgz",
+			"integrity": "sha512-3vHIHsF+qd3D8FU2c7U5l3rg1fhDwAYcGyHyZAi94YIlTwcJ+boNhRyJf373cl4wxbOX+0Q7dF40RTrTFTSuig==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"expect": "30.1.1",
+				"jest-snapshot": "30.1.1"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
 			}
 		},
 		"node_modules/@jest/expect-utils": {
-			"version": "29.7.0",
+			"version": "30.1.1",
+			"resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-30.1.1.tgz",
+			"integrity": "sha512-5YUHr27fpJ64dnvtu+tt11ewATynrHkGYD+uSFgRr8V2eFJis/vEXgToyLwccIwqBihVfz9jwio+Zr1ab1Zihw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"jest-get-type": "^29.6.3"
+				"@jest/get-type": "30.1.0"
 			},
 			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
 			}
 		},
 		"node_modules/@jest/fake-timers": {
-			"version": "29.7.0",
+			"version": "30.1.1",
+			"resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-30.1.1.tgz",
+			"integrity": "sha512-fK/25dNgBNYPw3eLi2CRs57g1H04qBAFNMsUY3IRzkfx/m4THe0E1zF+yGQBOMKKc2XQVdc9EYbJ4hEm7/2UtA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@jest/types": "^29.6.3",
-				"@sinonjs/fake-timers": "^10.0.2",
+				"@jest/types": "30.0.5",
+				"@sinonjs/fake-timers": "^13.0.0",
 				"@types/node": "*",
-				"jest-message-util": "^29.7.0",
-				"jest-mock": "^29.7.0",
-				"jest-util": "^29.7.0"
+				"jest-message-util": "30.1.0",
+				"jest-mock": "30.0.5",
+				"jest-util": "30.0.5"
 			},
 			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/@jest/fake-timers/node_modules/@jest/schemas": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
+			"integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@sinclair/typebox": "^0.34.0"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/@jest/fake-timers/node_modules/@jest/types": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.5.tgz",
+			"integrity": "sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/pattern": "30.0.1",
+				"@jest/schemas": "30.0.5",
+				"@types/istanbul-lib-coverage": "^2.0.6",
+				"@types/istanbul-reports": "^3.0.4",
+				"@types/node": "*",
+				"@types/yargs": "^17.0.33",
+				"chalk": "^4.1.2"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/@jest/fake-timers/node_modules/@sinclair/typebox": {
+			"version": "0.34.40",
+			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.40.tgz",
+			"integrity": "sha512-gwBNIP8ZAYev/ORDWW0QvxdwPXwxBtLsdsJgSc7eDIRt8ubP+rxUBzPsrwnu16fgEF8Bx4lh/+mvQvJzcTM6Kw==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/@jest/fake-timers/node_modules/ci-info": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.0.tgz",
+			"integrity": "sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/sibiraj-s"
+				}
+			],
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@jest/fake-timers/node_modules/jest-util": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-30.0.5.tgz",
+			"integrity": "sha512-pvyPWssDZR0FlfMxCBoc0tvM8iUEskaRFALUtGQYzVEAqisAztmy+R8LnU14KT4XA0H/a5HMVTXat1jLne010g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/types": "30.0.5",
+				"@types/node": "*",
+				"chalk": "^4.1.2",
+				"ci-info": "^4.2.0",
+				"graceful-fs": "^4.2.11",
+				"picomatch": "^4.0.2"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/@jest/fake-timers/node_modules/picomatch": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+			"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/jonschlinkert"
+			}
+		},
+		"node_modules/@jest/get-type": {
+			"version": "30.1.0",
+			"resolved": "https://registry.npmjs.org/@jest/get-type/-/get-type-30.1.0.tgz",
+			"integrity": "sha512-eMbZE2hUnx1WV0pmURZY9XoXPkUYjpc55mb0CrhtdWLtzMQPFvu/rZkTLZFTsdaVQa+Tr4eWAteqcUzoawq/uA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
 			}
 		},
 		"node_modules/@jest/globals": {
-			"version": "29.7.0",
+			"version": "30.1.1",
+			"resolved": "https://registry.npmjs.org/@jest/globals/-/globals-30.1.1.tgz",
+			"integrity": "sha512-NNUUkHT2TU/xztZl6r1UXvJL+zvCwmZsQDmK69fVHHcB9fBtlu3FInnzOve/ZoyKnWY8JXWJNT+Lkmu1+ubXUA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@jest/environment": "^29.7.0",
-				"@jest/expect": "^29.7.0",
-				"@jest/types": "^29.6.3",
-				"jest-mock": "^29.7.0"
+				"@jest/environment": "30.1.1",
+				"@jest/expect": "30.1.1",
+				"@jest/types": "30.0.5",
+				"jest-mock": "30.0.5"
 			},
 			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/@jest/globals/node_modules/@jest/schemas": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
+			"integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@sinclair/typebox": "^0.34.0"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/@jest/globals/node_modules/@jest/types": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.5.tgz",
+			"integrity": "sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/pattern": "30.0.1",
+				"@jest/schemas": "30.0.5",
+				"@types/istanbul-lib-coverage": "^2.0.6",
+				"@types/istanbul-reports": "^3.0.4",
+				"@types/node": "*",
+				"@types/yargs": "^17.0.33",
+				"chalk": "^4.1.2"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/@jest/globals/node_modules/@sinclair/typebox": {
+			"version": "0.34.40",
+			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.40.tgz",
+			"integrity": "sha512-gwBNIP8ZAYev/ORDWW0QvxdwPXwxBtLsdsJgSc7eDIRt8ubP+rxUBzPsrwnu16fgEF8Bx4lh/+mvQvJzcTM6Kw==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/@jest/pattern": {
+			"version": "30.0.1",
+			"resolved": "https://registry.npmjs.org/@jest/pattern/-/pattern-30.0.1.tgz",
+			"integrity": "sha512-gWp7NfQW27LaBQz3TITS8L7ZCQ0TLvtmI//4OwlQRx4rnWxcPNIYjxZpDcN4+UlGxgm3jS5QPz8IPTCkb59wZA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@types/node": "*",
+				"jest-regex-util": "30.0.1"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/@jest/pattern/node_modules/jest-regex-util": {
+			"version": "30.0.1",
+			"resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-30.0.1.tgz",
+			"integrity": "sha512-jHEQgBXAgc+Gh4g0p3bCevgRCVRkB4VB70zhoAE48gxeSr1hfUOsM/C2WoJgVL7Eyg//hudYENbm3Ne+/dRVVA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
 			}
 		},
 		"node_modules/@jest/reporters": {
-			"version": "29.7.0",
+			"version": "30.1.1",
+			"resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-30.1.1.tgz",
+			"integrity": "sha512-Hb2Bq80kahOC6Sv2waEaH1rEU6VdFcM6WHaRBWQF9tf30+nJHxhl/Upbgo9+25f0mOgbphxvbwSMjSgy9gW/FA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"@bcoe/v8-coverage": "^0.2.3",
-				"@jest/console": "^29.7.0",
-				"@jest/test-result": "^29.7.0",
-				"@jest/transform": "^29.7.0",
-				"@jest/types": "^29.6.3",
-				"@jridgewell/trace-mapping": "^0.3.18",
+				"@jest/console": "30.1.1",
+				"@jest/test-result": "30.1.1",
+				"@jest/transform": "30.1.1",
+				"@jest/types": "30.0.5",
+				"@jridgewell/trace-mapping": "^0.3.25",
 				"@types/node": "*",
-				"chalk": "^4.0.0",
-				"collect-v8-coverage": "^1.0.0",
-				"exit": "^0.1.2",
-				"glob": "^7.1.3",
-				"graceful-fs": "^4.2.9",
+				"chalk": "^4.1.2",
+				"collect-v8-coverage": "^1.0.2",
+				"exit-x": "^0.2.2",
+				"glob": "^10.3.10",
+				"graceful-fs": "^4.2.11",
 				"istanbul-lib-coverage": "^3.0.0",
 				"istanbul-lib-instrument": "^6.0.0",
 				"istanbul-lib-report": "^3.0.0",
-				"istanbul-lib-source-maps": "^4.0.0",
+				"istanbul-lib-source-maps": "^5.0.0",
 				"istanbul-reports": "^3.1.3",
-				"jest-message-util": "^29.7.0",
-				"jest-util": "^29.7.0",
-				"jest-worker": "^29.7.0",
+				"jest-message-util": "30.1.0",
+				"jest-util": "30.0.5",
+				"jest-worker": "30.1.0",
 				"slash": "^3.0.0",
-				"string-length": "^4.0.1",
-				"strip-ansi": "^6.0.0",
+				"string-length": "^4.0.2",
 				"v8-to-istanbul": "^9.0.1"
 			},
 			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
 			},
 			"peerDependencies": {
 				"node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
@@ -948,6 +1645,262 @@
 				}
 			}
 		},
+		"node_modules/@jest/reporters/node_modules/@jest/schemas": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
+			"integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@sinclair/typebox": "^0.34.0"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/@jest/reporters/node_modules/@jest/transform": {
+			"version": "30.1.1",
+			"resolved": "https://registry.npmjs.org/@jest/transform/-/transform-30.1.1.tgz",
+			"integrity": "sha512-PHIA2AbAASBfk6evkNifvmx9lkOSkmvaQoO6VSpuL8+kQqDMHeDoJ7RU3YP1wWAMD7AyQn9UL5iheuFYCC4lqQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/core": "^7.27.4",
+				"@jest/types": "30.0.5",
+				"@jridgewell/trace-mapping": "^0.3.25",
+				"babel-plugin-istanbul": "^7.0.0",
+				"chalk": "^4.1.2",
+				"convert-source-map": "^2.0.0",
+				"fast-json-stable-stringify": "^2.1.0",
+				"graceful-fs": "^4.2.11",
+				"jest-haste-map": "30.1.0",
+				"jest-regex-util": "30.0.1",
+				"jest-util": "30.0.5",
+				"micromatch": "^4.0.8",
+				"pirates": "^4.0.7",
+				"slash": "^3.0.0",
+				"write-file-atomic": "^5.0.1"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/@jest/reporters/node_modules/@jest/types": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.5.tgz",
+			"integrity": "sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/pattern": "30.0.1",
+				"@jest/schemas": "30.0.5",
+				"@types/istanbul-lib-coverage": "^2.0.6",
+				"@types/istanbul-reports": "^3.0.4",
+				"@types/node": "*",
+				"@types/yargs": "^17.0.33",
+				"chalk": "^4.1.2"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/@jest/reporters/node_modules/@sinclair/typebox": {
+			"version": "0.34.40",
+			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.40.tgz",
+			"integrity": "sha512-gwBNIP8ZAYev/ORDWW0QvxdwPXwxBtLsdsJgSc7eDIRt8ubP+rxUBzPsrwnu16fgEF8Bx4lh/+mvQvJzcTM6Kw==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/@jest/reporters/node_modules/babel-plugin-istanbul": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-7.0.0.tgz",
+			"integrity": "sha512-C5OzENSx/A+gt7t4VH1I2XsflxyPUmXRFPKBxt33xncdOmq7oROVM3bZv9Ysjjkv8OJYDMa+tKuKMvqU/H3xdw==",
+			"dev": true,
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.0.0",
+				"@istanbuljs/load-nyc-config": "^1.0.0",
+				"@istanbuljs/schema": "^0.1.3",
+				"istanbul-lib-instrument": "^6.0.2",
+				"test-exclude": "^6.0.0"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@jest/reporters/node_modules/brace-expansion": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+			"integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"balanced-match": "^1.0.0"
+			}
+		},
+		"node_modules/@jest/reporters/node_modules/ci-info": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.0.tgz",
+			"integrity": "sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/sibiraj-s"
+				}
+			],
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@jest/reporters/node_modules/glob": {
+			"version": "10.4.5",
+			"resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+			"integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"foreground-child": "^3.1.0",
+				"jackspeak": "^3.1.2",
+				"minimatch": "^9.0.4",
+				"minipass": "^7.1.2",
+				"package-json-from-dist": "^1.0.0",
+				"path-scurry": "^1.11.1"
+			},
+			"bin": {
+				"glob": "dist/esm/bin.mjs"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
+		"node_modules/@jest/reporters/node_modules/jest-haste-map": {
+			"version": "30.1.0",
+			"resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-30.1.0.tgz",
+			"integrity": "sha512-JLeM84kNjpRkggcGpQLsV7B8W4LNUWz7oDNVnY1Vjj22b5/fAb3kk3htiD+4Na8bmJmjJR7rBtS2Rmq/NEcADg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/types": "30.0.5",
+				"@types/node": "*",
+				"anymatch": "^3.1.3",
+				"fb-watchman": "^2.0.2",
+				"graceful-fs": "^4.2.11",
+				"jest-regex-util": "30.0.1",
+				"jest-util": "30.0.5",
+				"jest-worker": "30.1.0",
+				"micromatch": "^4.0.8",
+				"walker": "^1.0.8"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			},
+			"optionalDependencies": {
+				"fsevents": "^2.3.3"
+			}
+		},
+		"node_modules/@jest/reporters/node_modules/jest-regex-util": {
+			"version": "30.0.1",
+			"resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-30.0.1.tgz",
+			"integrity": "sha512-jHEQgBXAgc+Gh4g0p3bCevgRCVRkB4VB70zhoAE48gxeSr1hfUOsM/C2WoJgVL7Eyg//hudYENbm3Ne+/dRVVA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/@jest/reporters/node_modules/jest-util": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-30.0.5.tgz",
+			"integrity": "sha512-pvyPWssDZR0FlfMxCBoc0tvM8iUEskaRFALUtGQYzVEAqisAztmy+R8LnU14KT4XA0H/a5HMVTXat1jLne010g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/types": "30.0.5",
+				"@types/node": "*",
+				"chalk": "^4.1.2",
+				"ci-info": "^4.2.0",
+				"graceful-fs": "^4.2.11",
+				"picomatch": "^4.0.2"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/@jest/reporters/node_modules/jest-worker": {
+			"version": "30.1.0",
+			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-30.1.0.tgz",
+			"integrity": "sha512-uvWcSjlwAAgIu133Tt77A05H7RIk3Ho8tZL50bQM2AkvLdluw9NG48lRCl3Dt+MOH719n/0nnb5YxUwcuJiKRA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@types/node": "*",
+				"@ungap/structured-clone": "^1.3.0",
+				"jest-util": "30.0.5",
+				"merge-stream": "^2.0.0",
+				"supports-color": "^8.1.1"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/@jest/reporters/node_modules/minimatch": {
+			"version": "9.0.5",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+			"integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"brace-expansion": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=16 || 14 >=14.17"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
+		"node_modules/@jest/reporters/node_modules/picomatch": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+			"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/jonschlinkert"
+			}
+		},
+		"node_modules/@jest/reporters/node_modules/signal-exit": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+			"integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+			"dev": true,
+			"license": "ISC",
+			"engines": {
+				"node": ">=14"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
+		"node_modules/@jest/reporters/node_modules/write-file-atomic": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz",
+			"integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"imurmurhash": "^0.1.4",
+				"signal-exit": "^4.0.1"
+			},
+			"engines": {
+				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+			}
+		},
 		"node_modules/@jest/schemas": {
 			"version": "29.6.3",
 			"dev": true,
@@ -959,51 +1912,291 @@
 				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
 			}
 		},
-		"node_modules/@jest/source-map": {
-			"version": "29.6.3",
+		"node_modules/@jest/snapshot-utils": {
+			"version": "30.1.1",
+			"resolved": "https://registry.npmjs.org/@jest/snapshot-utils/-/snapshot-utils-30.1.1.tgz",
+			"integrity": "sha512-TkVBc9wuN22TT8hESRFmjjg/xIMu7z0J3UDYtIRydzCqlLPTB7jK1DDBKdnTUZ4zL3z3rnPpzV6rL1Uzh87sXg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@jridgewell/trace-mapping": "^0.3.18",
-				"callsites": "^3.0.0",
-				"graceful-fs": "^4.2.9"
+				"@jest/types": "30.0.5",
+				"chalk": "^4.1.2",
+				"graceful-fs": "^4.2.11",
+				"natural-compare": "^1.4.0"
 			},
 			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/@jest/snapshot-utils/node_modules/@jest/schemas": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
+			"integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@sinclair/typebox": "^0.34.0"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/@jest/snapshot-utils/node_modules/@jest/types": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.5.tgz",
+			"integrity": "sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/pattern": "30.0.1",
+				"@jest/schemas": "30.0.5",
+				"@types/istanbul-lib-coverage": "^2.0.6",
+				"@types/istanbul-reports": "^3.0.4",
+				"@types/node": "*",
+				"@types/yargs": "^17.0.33",
+				"chalk": "^4.1.2"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/@jest/snapshot-utils/node_modules/@sinclair/typebox": {
+			"version": "0.34.40",
+			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.40.tgz",
+			"integrity": "sha512-gwBNIP8ZAYev/ORDWW0QvxdwPXwxBtLsdsJgSc7eDIRt8ubP+rxUBzPsrwnu16fgEF8Bx4lh/+mvQvJzcTM6Kw==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/@jest/source-map": {
+			"version": "30.0.1",
+			"resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-30.0.1.tgz",
+			"integrity": "sha512-MIRWMUUR3sdbP36oyNyhbThLHyJ2eEDClPCiHVbrYAe5g3CHRArIVpBw7cdSB5fr+ofSfIb2Tnsw8iEHL0PYQg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jridgewell/trace-mapping": "^0.3.25",
+				"callsites": "^3.1.0",
+				"graceful-fs": "^4.2.11"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
 			}
 		},
 		"node_modules/@jest/test-result": {
-			"version": "29.7.0",
+			"version": "30.1.1",
+			"resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-30.1.1.tgz",
+			"integrity": "sha512-bMdj7fNu8iZuBPSnbVir5ezvWmVo4jrw7xDE+A33Yb3ENCoiJK9XgOLgal+rJ9XSKjsL7aPUMIo87zhN7I5o2w==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@jest/console": "^29.7.0",
-				"@jest/types": "^29.6.3",
-				"@types/istanbul-lib-coverage": "^2.0.0",
-				"collect-v8-coverage": "^1.0.0"
+				"@jest/console": "30.1.1",
+				"@jest/types": "30.0.5",
+				"@types/istanbul-lib-coverage": "^2.0.6",
+				"collect-v8-coverage": "^1.0.2"
 			},
 			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
 			}
 		},
-		"node_modules/@jest/test-sequencer": {
-			"version": "29.7.0",
+		"node_modules/@jest/test-result/node_modules/@jest/schemas": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
+			"integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@jest/test-result": "^29.7.0",
-				"graceful-fs": "^4.2.9",
-				"jest-haste-map": "^29.7.0",
+				"@sinclair/typebox": "^0.34.0"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/@jest/test-result/node_modules/@jest/types": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.5.tgz",
+			"integrity": "sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/pattern": "30.0.1",
+				"@jest/schemas": "30.0.5",
+				"@types/istanbul-lib-coverage": "^2.0.6",
+				"@types/istanbul-reports": "^3.0.4",
+				"@types/node": "*",
+				"@types/yargs": "^17.0.33",
+				"chalk": "^4.1.2"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/@jest/test-result/node_modules/@sinclair/typebox": {
+			"version": "0.34.40",
+			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.40.tgz",
+			"integrity": "sha512-gwBNIP8ZAYev/ORDWW0QvxdwPXwxBtLsdsJgSc7eDIRt8ubP+rxUBzPsrwnu16fgEF8Bx4lh/+mvQvJzcTM6Kw==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/@jest/test-sequencer": {
+			"version": "30.1.1",
+			"resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-30.1.1.tgz",
+			"integrity": "sha512-yruRdLXSA3HYD/MTNykgJ6VYEacNcXDFRMqKVAwlYegmxICUiT/B++CNuhJnYJzKYks61iYnjVsMwbUqmmAYJg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/test-result": "30.1.1",
+				"graceful-fs": "^4.2.11",
+				"jest-haste-map": "30.1.0",
 				"slash": "^3.0.0"
 			},
 			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/@jest/test-sequencer/node_modules/@jest/schemas": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
+			"integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@sinclair/typebox": "^0.34.0"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/@jest/test-sequencer/node_modules/@jest/types": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.5.tgz",
+			"integrity": "sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/pattern": "30.0.1",
+				"@jest/schemas": "30.0.5",
+				"@types/istanbul-lib-coverage": "^2.0.6",
+				"@types/istanbul-reports": "^3.0.4",
+				"@types/node": "*",
+				"@types/yargs": "^17.0.33",
+				"chalk": "^4.1.2"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/@jest/test-sequencer/node_modules/@sinclair/typebox": {
+			"version": "0.34.40",
+			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.40.tgz",
+			"integrity": "sha512-gwBNIP8ZAYev/ORDWW0QvxdwPXwxBtLsdsJgSc7eDIRt8ubP+rxUBzPsrwnu16fgEF8Bx4lh/+mvQvJzcTM6Kw==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/@jest/test-sequencer/node_modules/ci-info": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.0.tgz",
+			"integrity": "sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/sibiraj-s"
+				}
+			],
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@jest/test-sequencer/node_modules/jest-haste-map": {
+			"version": "30.1.0",
+			"resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-30.1.0.tgz",
+			"integrity": "sha512-JLeM84kNjpRkggcGpQLsV7B8W4LNUWz7oDNVnY1Vjj22b5/fAb3kk3htiD+4Na8bmJmjJR7rBtS2Rmq/NEcADg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/types": "30.0.5",
+				"@types/node": "*",
+				"anymatch": "^3.1.3",
+				"fb-watchman": "^2.0.2",
+				"graceful-fs": "^4.2.11",
+				"jest-regex-util": "30.0.1",
+				"jest-util": "30.0.5",
+				"jest-worker": "30.1.0",
+				"micromatch": "^4.0.8",
+				"walker": "^1.0.8"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			},
+			"optionalDependencies": {
+				"fsevents": "^2.3.3"
+			}
+		},
+		"node_modules/@jest/test-sequencer/node_modules/jest-regex-util": {
+			"version": "30.0.1",
+			"resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-30.0.1.tgz",
+			"integrity": "sha512-jHEQgBXAgc+Gh4g0p3bCevgRCVRkB4VB70zhoAE48gxeSr1hfUOsM/C2WoJgVL7Eyg//hudYENbm3Ne+/dRVVA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/@jest/test-sequencer/node_modules/jest-util": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-30.0.5.tgz",
+			"integrity": "sha512-pvyPWssDZR0FlfMxCBoc0tvM8iUEskaRFALUtGQYzVEAqisAztmy+R8LnU14KT4XA0H/a5HMVTXat1jLne010g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/types": "30.0.5",
+				"@types/node": "*",
+				"chalk": "^4.1.2",
+				"ci-info": "^4.2.0",
+				"graceful-fs": "^4.2.11",
+				"picomatch": "^4.0.2"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/@jest/test-sequencer/node_modules/jest-worker": {
+			"version": "30.1.0",
+			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-30.1.0.tgz",
+			"integrity": "sha512-uvWcSjlwAAgIu133Tt77A05H7RIk3Ho8tZL50bQM2AkvLdluw9NG48lRCl3Dt+MOH719n/0nnb5YxUwcuJiKRA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@types/node": "*",
+				"@ungap/structured-clone": "^1.3.0",
+				"jest-util": "30.0.5",
+				"merge-stream": "^2.0.0",
+				"supports-color": "^8.1.1"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/@jest/test-sequencer/node_modules/picomatch": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+			"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/jonschlinkert"
 			}
 		},
 		"node_modules/@jest/transform": {
 			"version": "29.7.0",
 			"dev": true,
 			"license": "MIT",
+			"optional": true,
+			"peer": true,
 			"dependencies": {
 				"@babel/core": "^7.11.6",
 				"@jest/types": "^29.6.3",
@@ -1042,16 +2235,14 @@
 			}
 		},
 		"node_modules/@jridgewell/gen-mapping": {
-			"version": "0.3.8",
+			"version": "0.3.13",
+			"resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz",
+			"integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@jridgewell/set-array": "^1.2.1",
-				"@jridgewell/sourcemap-codec": "^1.4.10",
+				"@jridgewell/sourcemap-codec": "^1.5.0",
 				"@jridgewell/trace-mapping": "^0.3.24"
-			},
-			"engines": {
-				"node": ">=6.0.0"
 			}
 		},
 		"node_modules/@jridgewell/resolve-uri": {
@@ -1062,14 +2253,6 @@
 				"node": ">=6.0.0"
 			}
 		},
-		"node_modules/@jridgewell/set-array": {
-			"version": "1.2.1",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6.0.0"
-			}
-		},
 		"node_modules/@jridgewell/source-map": {
 			"version": "0.3.6",
 			"dev": true,
@@ -1085,7 +2268,9 @@
 			"license": "MIT"
 		},
 		"node_modules/@jridgewell/trace-mapping": {
-			"version": "0.3.25",
+			"version": "0.3.30",
+			"resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.30.tgz",
+			"integrity": "sha512-GQ7Nw5G2lTu/BtHTKfXhKHok2WGetd4XYcVKGx00SjAk8GMwgJM3zr6zORiPGuOE+/vkc90KtTosSSvaCjKb2Q==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1099,6 +2284,19 @@
 			"license": "MIT",
 			"peer": true
 		},
+		"node_modules/@napi-rs/wasm-runtime": {
+			"version": "0.2.12",
+			"resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.12.tgz",
+			"integrity": "sha512-ZVWUcfwY4E/yPitQJl481FjFo3K22D6qF0DuFH6Y/nbnE11GY5uguDxZMGXPQ8WQ0128MXQD7TnfHyK4oWoIJQ==",
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"dependencies": {
+				"@emnapi/core": "^1.4.3",
+				"@emnapi/runtime": "^1.4.3",
+				"@tybys/wasm-util": "^0.10.0"
+			}
+		},
 		"node_modules/@nodelib/fs.scandir": {
 			"version": "2.1.5",
 			"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -1210,6 +2408,30 @@
 				"url": "https://opencollective.com/parcel"
 			}
 		},
+		"node_modules/@pkgjs/parseargs": {
+			"version": "0.11.0",
+			"resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
+			"integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"engines": {
+				"node": ">=14"
+			}
+		},
+		"node_modules/@pkgr/core": {
+			"version": "0.2.9",
+			"resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.2.9.tgz",
+			"integrity": "sha512-QNqXyfVS2wm9hweSYD2O7F0G06uurj9kZ96TRQE5Y9hU7+tgdZwIkbAKc5Ocy1HxEY2kuDQa6cQ1WRs/O5LFKA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": "^12.20.0 || ^14.18.0 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://opencollective.com/pkgr"
+			}
+		},
 		"node_modules/@sinclair/typebox": {
 			"version": "0.27.8",
 			"dev": true,
@@ -1217,6 +2439,8 @@
 		},
 		"node_modules/@sinonjs/commons": {
 			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz",
+			"integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==",
 			"dev": true,
 			"license": "BSD-3-Clause",
 			"dependencies": {
@@ -1224,11 +2448,24 @@
 			}
 		},
 		"node_modules/@sinonjs/fake-timers": {
-			"version": "10.3.0",
+			"version": "13.0.5",
+			"resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-13.0.5.tgz",
+			"integrity": "sha512-36/hTbH2uaWuGVERyC6da9YwGWnzUZXuPro/F2LfsdOsLnCojz/iSH8MxUt/FD2S5XBSVPhmArFUXcpCQ2Hkiw==",
 			"dev": true,
 			"license": "BSD-3-Clause",
 			"dependencies": {
-				"@sinonjs/commons": "^3.0.0"
+				"@sinonjs/commons": "^3.0.1"
+			}
+		},
+		"node_modules/@tybys/wasm-util": {
+			"version": "0.10.0",
+			"resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.0.tgz",
+			"integrity": "sha512-VyyPYFlOMNylG45GoAe0xDoLwWuowvf92F9kySqzYh8vmYm7D2u4iUJKa1tOUpS70Ku13ASrOkS4ScXFsTaCNQ==",
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"dependencies": {
+				"tslib": "^2.4.0"
 			}
 		},
 		"node_modules/@types/babel__core": {
@@ -1303,6 +2540,8 @@
 			"version": "4.1.9",
 			"dev": true,
 			"license": "MIT",
+			"optional": true,
+			"peer": true,
 			"dependencies": {
 				"@types/node": "*"
 			}
@@ -1329,12 +2568,14 @@
 			}
 		},
 		"node_modules/@types/jest": {
-			"version": "29.5.14",
+			"version": "30.0.0",
+			"resolved": "https://registry.npmjs.org/@types/jest/-/jest-30.0.0.tgz",
+			"integrity": "sha512-XTYugzhuwqWjws0CVz8QpM36+T+Dz5mTEBKhNs/esGLnCIlGdRy+Dq78NRjd7ls7r8BC8ZRMOrKlkO1hU0JOwA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"expect": "^29.0.0",
-				"pretty-format": "^29.0.0"
+				"expect": "^30.0.0",
+				"pretty-format": "^30.0.0"
 			}
 		},
 		"node_modules/@types/json-schema": {
@@ -1352,6 +2593,8 @@
 		},
 		"node_modules/@types/stack-utils": {
 			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz",
+			"integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -1632,6 +2875,282 @@
 				"url": "https://opencollective.com/typescript-eslint"
 			}
 		},
+		"node_modules/@ungap/structured-clone": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.0.tgz",
+			"integrity": "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==",
+			"dev": true,
+			"license": "ISC"
+		},
+		"node_modules/@unrs/resolver-binding-android-arm-eabi": {
+			"version": "1.11.1",
+			"resolved": "https://registry.npmjs.org/@unrs/resolver-binding-android-arm-eabi/-/resolver-binding-android-arm-eabi-1.11.1.tgz",
+			"integrity": "sha512-ppLRUgHVaGRWUx0R0Ut06Mjo9gBaBkg3v/8AxusGLhsIotbBLuRk51rAzqLC8gq6NyyAojEXglNjzf6R948DNw==",
+			"cpu": [
+				"arm"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"android"
+			]
+		},
+		"node_modules/@unrs/resolver-binding-android-arm64": {
+			"version": "1.11.1",
+			"resolved": "https://registry.npmjs.org/@unrs/resolver-binding-android-arm64/-/resolver-binding-android-arm64-1.11.1.tgz",
+			"integrity": "sha512-lCxkVtb4wp1v+EoN+HjIG9cIIzPkX5OtM03pQYkG+U5O/wL53LC4QbIeazgiKqluGeVEeBlZahHalCaBvU1a2g==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"android"
+			]
+		},
+		"node_modules/@unrs/resolver-binding-darwin-arm64": {
+			"version": "1.11.1",
+			"resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-arm64/-/resolver-binding-darwin-arm64-1.11.1.tgz",
+			"integrity": "sha512-gPVA1UjRu1Y/IsB/dQEsp2V1pm44Of6+LWvbLc9SDk1c2KhhDRDBUkQCYVWe6f26uJb3fOK8saWMgtX8IrMk3g==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"darwin"
+			]
+		},
+		"node_modules/@unrs/resolver-binding-darwin-x64": {
+			"version": "1.11.1",
+			"resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-x64/-/resolver-binding-darwin-x64-1.11.1.tgz",
+			"integrity": "sha512-cFzP7rWKd3lZaCsDze07QX1SC24lO8mPty9vdP+YVa3MGdVgPmFc59317b2ioXtgCMKGiCLxJ4HQs62oz6GfRQ==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"darwin"
+			]
+		},
+		"node_modules/@unrs/resolver-binding-freebsd-x64": {
+			"version": "1.11.1",
+			"resolved": "https://registry.npmjs.org/@unrs/resolver-binding-freebsd-x64/-/resolver-binding-freebsd-x64-1.11.1.tgz",
+			"integrity": "sha512-fqtGgak3zX4DCB6PFpsH5+Kmt/8CIi4Bry4rb1ho6Av2QHTREM+47y282Uqiu3ZRF5IQioJQ5qWRV6jduA+iGw==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"freebsd"
+			]
+		},
+		"node_modules/@unrs/resolver-binding-linux-arm-gnueabihf": {
+			"version": "1.11.1",
+			"resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-gnueabihf/-/resolver-binding-linux-arm-gnueabihf-1.11.1.tgz",
+			"integrity": "sha512-u92mvlcYtp9MRKmP+ZvMmtPN34+/3lMHlyMj7wXJDeXxuM0Vgzz0+PPJNsro1m3IZPYChIkn944wW8TYgGKFHw==",
+			"cpu": [
+				"arm"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			]
+		},
+		"node_modules/@unrs/resolver-binding-linux-arm-musleabihf": {
+			"version": "1.11.1",
+			"resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-musleabihf/-/resolver-binding-linux-arm-musleabihf-1.11.1.tgz",
+			"integrity": "sha512-cINaoY2z7LVCrfHkIcmvj7osTOtm6VVT16b5oQdS4beibX2SYBwgYLmqhBjA1t51CarSaBuX5YNsWLjsqfW5Cw==",
+			"cpu": [
+				"arm"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			]
+		},
+		"node_modules/@unrs/resolver-binding-linux-arm64-gnu": {
+			"version": "1.11.1",
+			"resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-gnu/-/resolver-binding-linux-arm64-gnu-1.11.1.tgz",
+			"integrity": "sha512-34gw7PjDGB9JgePJEmhEqBhWvCiiWCuXsL9hYphDF7crW7UgI05gyBAi6MF58uGcMOiOqSJ2ybEeCvHcq0BCmQ==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			]
+		},
+		"node_modules/@unrs/resolver-binding-linux-arm64-musl": {
+			"version": "1.11.1",
+			"resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-musl/-/resolver-binding-linux-arm64-musl-1.11.1.tgz",
+			"integrity": "sha512-RyMIx6Uf53hhOtJDIamSbTskA99sPHS96wxVE/bJtePJJtpdKGXO1wY90oRdXuYOGOTuqjT8ACccMc4K6QmT3w==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			]
+		},
+		"node_modules/@unrs/resolver-binding-linux-ppc64-gnu": {
+			"version": "1.11.1",
+			"resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-ppc64-gnu/-/resolver-binding-linux-ppc64-gnu-1.11.1.tgz",
+			"integrity": "sha512-D8Vae74A4/a+mZH0FbOkFJL9DSK2R6TFPC9M+jCWYia/q2einCubX10pecpDiTmkJVUH+y8K3BZClycD8nCShA==",
+			"cpu": [
+				"ppc64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			]
+		},
+		"node_modules/@unrs/resolver-binding-linux-riscv64-gnu": {
+			"version": "1.11.1",
+			"resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-riscv64-gnu/-/resolver-binding-linux-riscv64-gnu-1.11.1.tgz",
+			"integrity": "sha512-frxL4OrzOWVVsOc96+V3aqTIQl1O2TjgExV4EKgRY09AJ9leZpEg8Ak9phadbuX0BA4k8U5qtvMSQQGGmaJqcQ==",
+			"cpu": [
+				"riscv64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			]
+		},
+		"node_modules/@unrs/resolver-binding-linux-riscv64-musl": {
+			"version": "1.11.1",
+			"resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-riscv64-musl/-/resolver-binding-linux-riscv64-musl-1.11.1.tgz",
+			"integrity": "sha512-mJ5vuDaIZ+l/acv01sHoXfpnyrNKOk/3aDoEdLO/Xtn9HuZlDD6jKxHlkN8ZhWyLJsRBxfv9GYM2utQ1SChKew==",
+			"cpu": [
+				"riscv64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			]
+		},
+		"node_modules/@unrs/resolver-binding-linux-s390x-gnu": {
+			"version": "1.11.1",
+			"resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-s390x-gnu/-/resolver-binding-linux-s390x-gnu-1.11.1.tgz",
+			"integrity": "sha512-kELo8ebBVtb9sA7rMe1Cph4QHreByhaZ2QEADd9NzIQsYNQpt9UkM9iqr2lhGr5afh885d/cB5QeTXSbZHTYPg==",
+			"cpu": [
+				"s390x"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			]
+		},
+		"node_modules/@unrs/resolver-binding-linux-x64-gnu": {
+			"version": "1.11.1",
+			"resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-gnu/-/resolver-binding-linux-x64-gnu-1.11.1.tgz",
+			"integrity": "sha512-C3ZAHugKgovV5YvAMsxhq0gtXuwESUKc5MhEtjBpLoHPLYM+iuwSj3lflFwK3DPm68660rZ7G8BMcwSro7hD5w==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			]
+		},
+		"node_modules/@unrs/resolver-binding-linux-x64-musl": {
+			"version": "1.11.1",
+			"resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-musl/-/resolver-binding-linux-x64-musl-1.11.1.tgz",
+			"integrity": "sha512-rV0YSoyhK2nZ4vEswT/QwqzqQXw5I6CjoaYMOX0TqBlWhojUf8P94mvI7nuJTeaCkkds3QE4+zS8Ko+GdXuZtA==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			]
+		},
+		"node_modules/@unrs/resolver-binding-wasm32-wasi": {
+			"version": "1.11.1",
+			"resolved": "https://registry.npmjs.org/@unrs/resolver-binding-wasm32-wasi/-/resolver-binding-wasm32-wasi-1.11.1.tgz",
+			"integrity": "sha512-5u4RkfxJm+Ng7IWgkzi3qrFOvLvQYnPBmjmZQ8+szTK/b31fQCnleNl1GgEt7nIsZRIf5PLhPwT0WM+q45x/UQ==",
+			"cpu": [
+				"wasm32"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"dependencies": {
+				"@napi-rs/wasm-runtime": "^0.2.11"
+			},
+			"engines": {
+				"node": ">=14.0.0"
+			}
+		},
+		"node_modules/@unrs/resolver-binding-win32-arm64-msvc": {
+			"version": "1.11.1",
+			"resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-arm64-msvc/-/resolver-binding-win32-arm64-msvc-1.11.1.tgz",
+			"integrity": "sha512-nRcz5Il4ln0kMhfL8S3hLkxI85BXs3o8EYoattsJNdsX4YUU89iOkVn7g0VHSRxFuVMdM4Q1jEpIId1Ihim/Uw==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"win32"
+			]
+		},
+		"node_modules/@unrs/resolver-binding-win32-ia32-msvc": {
+			"version": "1.11.1",
+			"resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-ia32-msvc/-/resolver-binding-win32-ia32-msvc-1.11.1.tgz",
+			"integrity": "sha512-DCEI6t5i1NmAZp6pFonpD5m7i6aFrpofcp4LA2i8IIq60Jyo28hamKBxNrZcyOwVOZkgsRp9O2sXWBWP8MnvIQ==",
+			"cpu": [
+				"ia32"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"win32"
+			]
+		},
+		"node_modules/@unrs/resolver-binding-win32-x64-msvc": {
+			"version": "1.11.1",
+			"resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-x64-msvc/-/resolver-binding-win32-x64-msvc-1.11.1.tgz",
+			"integrity": "sha512-lrW200hZdbfRtztbygyaq/6jP6AKE8qQN2KvPcJ+x7wiD038YtnYtZ82IMNJ69GJibV7bwL3y9FgK+5w/pYt6g==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"win32"
+			]
+		},
 		"node_modules/@webassemblyjs/ast": {
 			"version": "1.14.1",
 			"dev": true,
@@ -1906,6 +3425,8 @@
 		},
 		"node_modules/ansi-escapes": {
 			"version": "4.3.2",
+			"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+			"integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1966,6 +3487,8 @@
 			"version": "29.7.0",
 			"dev": true,
 			"license": "MIT",
+			"optional": true,
+			"peer": true,
 			"dependencies": {
 				"@jest/transform": "^29.7.0",
 				"@types/babel__core": "^7.1.14",
@@ -1986,6 +3509,8 @@
 			"version": "6.1.1",
 			"dev": true,
 			"license": "BSD-3-Clause",
+			"optional": true,
+			"peer": true,
 			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.0.0",
 				"@istanbuljs/load-nyc-config": "^1.0.0",
@@ -2001,6 +3526,8 @@
 			"version": "5.2.1",
 			"dev": true,
 			"license": "BSD-3-Clause",
+			"optional": true,
+			"peer": true,
 			"dependencies": {
 				"@babel/core": "^7.12.3",
 				"@babel/parser": "^7.14.7",
@@ -2016,6 +3543,8 @@
 			"version": "6.3.1",
 			"dev": true,
 			"license": "ISC",
+			"optional": true,
+			"peer": true,
 			"bin": {
 				"semver": "bin/semver.js"
 			}
@@ -2024,6 +3553,8 @@
 			"version": "29.6.3",
 			"dev": true,
 			"license": "MIT",
+			"optional": true,
+			"peer": true,
 			"dependencies": {
 				"@babel/template": "^7.3.3",
 				"@babel/types": "^7.3.3",
@@ -2063,6 +3594,8 @@
 			"version": "29.6.3",
 			"dev": true,
 			"license": "MIT",
+			"optional": true,
+			"peer": true,
 			"dependencies": {
 				"babel-plugin-jest-hoist": "^29.6.3",
 				"babel-preset-current-node-syntax": "^1.0.0"
@@ -2267,6 +3800,8 @@
 		},
 		"node_modules/char-regex": {
 			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
+			"integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -2310,7 +3845,9 @@
 			}
 		},
 		"node_modules/cjs-module-lexer": {
-			"version": "1.4.3",
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-2.1.0.tgz",
+			"integrity": "sha512-UX0OwmYRYQQetfrLEZeewIFFI+wSTofC+pMBLNuH3RUuu/xzG1oz84UCEDOSoQlN3fZ4+AzmV50ZYvGqkMh9yA==",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -2342,6 +3879,8 @@
 		},
 		"node_modules/co": {
 			"version": "4.6.0",
+			"resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+			"integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -2351,6 +3890,8 @@
 		},
 		"node_modules/collect-v8-coverage": {
 			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz",
+			"integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -2409,26 +3950,6 @@
 			"dev": true,
 			"license": "MIT"
 		},
-		"node_modules/create-jest": {
-			"version": "29.7.0",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/types": "^29.6.3",
-				"chalk": "^4.0.0",
-				"exit": "^0.1.2",
-				"graceful-fs": "^4.2.9",
-				"jest-config": "^29.7.0",
-				"jest-util": "^29.7.0",
-				"prompts": "^2.0.1"
-			},
-			"bin": {
-				"create-jest": "bin/create-jest.js"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
 		"node_modules/cross-spawn": {
 			"version": "7.0.6",
 			"dev": true,
@@ -2513,7 +4034,9 @@
 			}
 		},
 		"node_modules/dedent": {
-			"version": "1.5.3",
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/dedent/-/dedent-1.6.0.tgz",
+			"integrity": "sha512-F1Z+5UCFpmQUzJa11agbyPVMbpgT/qA3/SKyJ1jyBgm7dUcUEa8v9JwDkerSQXfakBwFljIxhOJqGkjUwZ9FSA==",
 			"dev": true,
 			"license": "MIT",
 			"peerDependencies": {
@@ -2532,6 +4055,8 @@
 		},
 		"node_modules/deepmerge": {
 			"version": "4.3.1",
+			"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
+			"integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -2552,20 +4077,14 @@
 		},
 		"node_modules/detect-newline": {
 			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
+			"integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
 				"node": ">=8"
 			}
 		},
-		"node_modules/diff-sequences": {
-			"version": "29.6.3",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
 		"node_modules/dunder-proto": {
 			"version": "1.0.1",
 			"dev": true,
@@ -2579,6 +4098,13 @@
 				"node": ">= 0.4"
 			}
 		},
+		"node_modules/eastasianwidth": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+			"integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
+			"dev": true,
+			"license": "MIT"
+		},
 		"node_modules/ejs": {
 			"version": "3.1.10",
 			"dev": true,
@@ -2600,6 +4126,8 @@
 		},
 		"node_modules/emittery": {
 			"version": "0.13.1",
+			"resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz",
+			"integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -2647,6 +4175,8 @@
 		},
 		"node_modules/error-ex": {
 			"version": "1.3.2",
+			"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+			"integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2885,6 +4415,8 @@
 		},
 		"node_modules/execa": {
 			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+			"integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2905,26 +4437,118 @@
 				"url": "https://github.com/sindresorhus/execa?sponsor=1"
 			}
 		},
-		"node_modules/exit": {
-			"version": "0.1.2",
+		"node_modules/exit-x": {
+			"version": "0.2.2",
+			"resolved": "https://registry.npmjs.org/exit-x/-/exit-x-0.2.2.tgz",
+			"integrity": "sha512-+I6B/IkJc1o/2tiURyz/ivu/O0nKNEArIUB5O7zBrlDVJr22SCLH3xTeEry428LvFhRzIA1g8izguxJ/gbNcVQ==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">= 0.8.0"
 			}
 		},
 		"node_modules/expect": {
-			"version": "29.7.0",
+			"version": "30.1.1",
+			"resolved": "https://registry.npmjs.org/expect/-/expect-30.1.1.tgz",
+			"integrity": "sha512-OKe7cdic4qbfWd/CcgwJvvCrNX2KWfuMZee9AfJHL1gTYmvqjBjZG1a2NwfhspBzxzlXwsN75WWpKTYfsJpBxg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@jest/expect-utils": "^29.7.0",
-				"jest-get-type": "^29.6.3",
-				"jest-matcher-utils": "^29.7.0",
-				"jest-message-util": "^29.7.0",
-				"jest-util": "^29.7.0"
+				"@jest/expect-utils": "30.1.1",
+				"@jest/get-type": "30.1.0",
+				"jest-matcher-utils": "30.1.1",
+				"jest-message-util": "30.1.0",
+				"jest-mock": "30.0.5",
+				"jest-util": "30.0.5"
 			},
 			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/expect/node_modules/@jest/schemas": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
+			"integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@sinclair/typebox": "^0.34.0"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/expect/node_modules/@jest/types": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.5.tgz",
+			"integrity": "sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/pattern": "30.0.1",
+				"@jest/schemas": "30.0.5",
+				"@types/istanbul-lib-coverage": "^2.0.6",
+				"@types/istanbul-reports": "^3.0.4",
+				"@types/node": "*",
+				"@types/yargs": "^17.0.33",
+				"chalk": "^4.1.2"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/expect/node_modules/@sinclair/typebox": {
+			"version": "0.34.40",
+			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.40.tgz",
+			"integrity": "sha512-gwBNIP8ZAYev/ORDWW0QvxdwPXwxBtLsdsJgSc7eDIRt8ubP+rxUBzPsrwnu16fgEF8Bx4lh/+mvQvJzcTM6Kw==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/expect/node_modules/ci-info": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.0.tgz",
+			"integrity": "sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/sibiraj-s"
+				}
+			],
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/expect/node_modules/jest-util": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-30.0.5.tgz",
+			"integrity": "sha512-pvyPWssDZR0FlfMxCBoc0tvM8iUEskaRFALUtGQYzVEAqisAztmy+R8LnU14KT4XA0H/a5HMVTXat1jLne010g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/types": "30.0.5",
+				"@types/node": "*",
+				"chalk": "^4.1.2",
+				"ci-info": "^4.2.0",
+				"graceful-fs": "^4.2.11",
+				"picomatch": "^4.0.2"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/expect/node_modules/picomatch": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+			"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/jonschlinkert"
 			}
 		},
 		"node_modules/fast-deep-equal": {
@@ -3121,6 +4745,36 @@
 			"dev": true,
 			"license": "ISC"
 		},
+		"node_modules/foreground-child": {
+			"version": "3.3.1",
+			"resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz",
+			"integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"cross-spawn": "^7.0.6",
+				"signal-exit": "^4.0.1"
+			},
+			"engines": {
+				"node": ">=14"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
+		"node_modules/foreground-child/node_modules/signal-exit": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+			"integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+			"dev": true,
+			"license": "ISC",
+			"engines": {
+				"node": ">=14"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
 		"node_modules/fs-extra": {
 			"version": "11.3.0",
 			"dev": true,
@@ -3139,6 +4793,21 @@
 			"dev": true,
 			"license": "ISC"
 		},
+		"node_modules/fsevents": {
+			"version": "2.3.3",
+			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+			"integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+			"dev": true,
+			"hasInstallScript": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"darwin"
+			],
+			"engines": {
+				"node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+			}
+		},
 		"node_modules/function-bind": {
 			"version": "1.1.2",
 			"dev": true,
@@ -3208,6 +4877,8 @@
 		},
 		"node_modules/get-stream": {
 			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+			"integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -3316,11 +4987,15 @@
 		},
 		"node_modules/html-escaper": {
 			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+			"integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/human-signals": {
 			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+			"integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"engines": {
@@ -3416,6 +5091,8 @@
 		},
 		"node_modules/is-arrayish": {
 			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+			"integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -3451,6 +5128,8 @@
 		},
 		"node_modules/is-generator-fn": {
 			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
+			"integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -3489,6 +5168,8 @@
 		},
 		"node_modules/is-stream": {
 			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+			"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -3521,6 +5202,8 @@
 		},
 		"node_modules/istanbul-lib-instrument": {
 			"version": "6.0.3",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz",
+			"integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==",
 			"dev": true,
 			"license": "BSD-3-Clause",
 			"dependencies": {
@@ -3536,6 +5219,8 @@
 		},
 		"node_modules/istanbul-lib-report": {
 			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
+			"integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
 			"dev": true,
 			"license": "BSD-3-Clause",
 			"dependencies": {
@@ -3549,6 +5234,8 @@
 		},
 		"node_modules/istanbul-lib-report/node_modules/supports-color": {
 			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -3559,20 +5246,24 @@
 			}
 		},
 		"node_modules/istanbul-lib-source-maps": {
-			"version": "4.0.1",
+			"version": "5.0.6",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-5.0.6.tgz",
+			"integrity": "sha512-yg2d+Em4KizZC5niWhQaIomgf5WlL4vOOjZ5xGCmF8SnPE/mDWWXgvRExdcpCgh9lLRRa1/fSYp2ymmbJ1pI+A==",
 			"dev": true,
 			"license": "BSD-3-Clause",
 			"dependencies": {
+				"@jridgewell/trace-mapping": "^0.3.23",
 				"debug": "^4.1.1",
-				"istanbul-lib-coverage": "^3.0.0",
-				"source-map": "^0.6.1"
+				"istanbul-lib-coverage": "^3.0.0"
 			},
 			"engines": {
 				"node": ">=10"
 			}
 		},
 		"node_modules/istanbul-reports": {
-			"version": "3.1.7",
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.2.0.tgz",
+			"integrity": "sha512-HGYWWS/ehqTV3xN10i23tkPkpH46MLCIMFNCaaKNavAXTF1RkqxawEPtnjnGZ6XKSInBKkiOA5BKS+aZiY3AvA==",
 			"dev": true,
 			"license": "BSD-3-Clause",
 			"dependencies": {
@@ -3583,6 +5274,22 @@
 				"node": ">=8"
 			}
 		},
+		"node_modules/jackspeak": {
+			"version": "3.4.3",
+			"resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
+			"integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
+			"dev": true,
+			"license": "BlueOak-1.0.0",
+			"dependencies": {
+				"@isaacs/cliui": "^8.0.2"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			},
+			"optionalDependencies": {
+				"@pkgjs/parseargs": "^0.11.0"
+			}
+		},
 		"node_modules/jake": {
 			"version": "10.9.2",
 			"dev": true,
@@ -3601,20 +5308,22 @@
 			}
 		},
 		"node_modules/jest": {
-			"version": "29.7.0",
+			"version": "30.1.1",
+			"resolved": "https://registry.npmjs.org/jest/-/jest-30.1.1.tgz",
+			"integrity": "sha512-yC3JvpP/ZcAZX5rYCtXO/g9k6VTCQz0VFE2v1FpxytWzUqfDtu0XL/pwnNvptzYItvGwomh1ehomRNMOyhCJKw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@jest/core": "^29.7.0",
-				"@jest/types": "^29.6.3",
-				"import-local": "^3.0.2",
-				"jest-cli": "^29.7.0"
+				"@jest/core": "30.1.1",
+				"@jest/types": "30.0.5",
+				"import-local": "^3.2.0",
+				"jest-cli": "30.1.1"
 			},
 			"bin": {
 				"jest": "bin/jest.js"
 			},
 			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
 			},
 			"peerDependencies": {
 				"node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
@@ -3626,70 +5335,247 @@
 			}
 		},
 		"node_modules/jest-changed-files": {
-			"version": "29.7.0",
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-30.0.5.tgz",
+			"integrity": "sha512-bGl2Ntdx0eAwXuGpdLdVYVr5YQHnSZlQ0y9HVDu565lCUAe9sj6JOtBbMmBBikGIegne9piDDIOeiLVoqTkz4A==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"execa": "^5.0.0",
-				"jest-util": "^29.7.0",
+				"execa": "^5.1.1",
+				"jest-util": "30.0.5",
 				"p-limit": "^3.1.0"
 			},
 			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-changed-files/node_modules/@jest/schemas": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
+			"integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@sinclair/typebox": "^0.34.0"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-changed-files/node_modules/@jest/types": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.5.tgz",
+			"integrity": "sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/pattern": "30.0.1",
+				"@jest/schemas": "30.0.5",
+				"@types/istanbul-lib-coverage": "^2.0.6",
+				"@types/istanbul-reports": "^3.0.4",
+				"@types/node": "*",
+				"@types/yargs": "^17.0.33",
+				"chalk": "^4.1.2"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-changed-files/node_modules/@sinclair/typebox": {
+			"version": "0.34.40",
+			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.40.tgz",
+			"integrity": "sha512-gwBNIP8ZAYev/ORDWW0QvxdwPXwxBtLsdsJgSc7eDIRt8ubP+rxUBzPsrwnu16fgEF8Bx4lh/+mvQvJzcTM6Kw==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/jest-changed-files/node_modules/ci-info": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.0.tgz",
+			"integrity": "sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/sibiraj-s"
+				}
+			],
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/jest-changed-files/node_modules/jest-util": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-30.0.5.tgz",
+			"integrity": "sha512-pvyPWssDZR0FlfMxCBoc0tvM8iUEskaRFALUtGQYzVEAqisAztmy+R8LnU14KT4XA0H/a5HMVTXat1jLne010g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/types": "30.0.5",
+				"@types/node": "*",
+				"chalk": "^4.1.2",
+				"ci-info": "^4.2.0",
+				"graceful-fs": "^4.2.11",
+				"picomatch": "^4.0.2"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-changed-files/node_modules/picomatch": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+			"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/jonschlinkert"
 			}
 		},
 		"node_modules/jest-circus": {
-			"version": "29.7.0",
+			"version": "30.1.1",
+			"resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-30.1.1.tgz",
+			"integrity": "sha512-M3Vd4x5wD7eSJspuTvRF55AkOOBndRxgW3gqQBDlFvbH3X+ASdi8jc+EqXEeAFd/UHulVYIlC4XKJABOhLw6UA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@jest/environment": "^29.7.0",
-				"@jest/expect": "^29.7.0",
-				"@jest/test-result": "^29.7.0",
-				"@jest/types": "^29.6.3",
+				"@jest/environment": "30.1.1",
+				"@jest/expect": "30.1.1",
+				"@jest/test-result": "30.1.1",
+				"@jest/types": "30.0.5",
 				"@types/node": "*",
-				"chalk": "^4.0.0",
+				"chalk": "^4.1.2",
 				"co": "^4.6.0",
-				"dedent": "^1.0.0",
-				"is-generator-fn": "^2.0.0",
-				"jest-each": "^29.7.0",
-				"jest-matcher-utils": "^29.7.0",
-				"jest-message-util": "^29.7.0",
-				"jest-runtime": "^29.7.0",
-				"jest-snapshot": "^29.7.0",
-				"jest-util": "^29.7.0",
+				"dedent": "^1.6.0",
+				"is-generator-fn": "^2.1.0",
+				"jest-each": "30.1.0",
+				"jest-matcher-utils": "30.1.1",
+				"jest-message-util": "30.1.0",
+				"jest-runtime": "30.1.1",
+				"jest-snapshot": "30.1.1",
+				"jest-util": "30.0.5",
 				"p-limit": "^3.1.0",
-				"pretty-format": "^29.7.0",
-				"pure-rand": "^6.0.0",
+				"pretty-format": "30.0.5",
+				"pure-rand": "^7.0.0",
 				"slash": "^3.0.0",
-				"stack-utils": "^2.0.3"
+				"stack-utils": "^2.0.6"
 			},
 			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-circus/node_modules/@jest/schemas": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
+			"integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@sinclair/typebox": "^0.34.0"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-circus/node_modules/@jest/types": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.5.tgz",
+			"integrity": "sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/pattern": "30.0.1",
+				"@jest/schemas": "30.0.5",
+				"@types/istanbul-lib-coverage": "^2.0.6",
+				"@types/istanbul-reports": "^3.0.4",
+				"@types/node": "*",
+				"@types/yargs": "^17.0.33",
+				"chalk": "^4.1.2"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-circus/node_modules/@sinclair/typebox": {
+			"version": "0.34.40",
+			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.40.tgz",
+			"integrity": "sha512-gwBNIP8ZAYev/ORDWW0QvxdwPXwxBtLsdsJgSc7eDIRt8ubP+rxUBzPsrwnu16fgEF8Bx4lh/+mvQvJzcTM6Kw==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/jest-circus/node_modules/ci-info": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.0.tgz",
+			"integrity": "sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/sibiraj-s"
+				}
+			],
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/jest-circus/node_modules/jest-util": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-30.0.5.tgz",
+			"integrity": "sha512-pvyPWssDZR0FlfMxCBoc0tvM8iUEskaRFALUtGQYzVEAqisAztmy+R8LnU14KT4XA0H/a5HMVTXat1jLne010g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/types": "30.0.5",
+				"@types/node": "*",
+				"chalk": "^4.1.2",
+				"ci-info": "^4.2.0",
+				"graceful-fs": "^4.2.11",
+				"picomatch": "^4.0.2"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-circus/node_modules/picomatch": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+			"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/jonschlinkert"
 			}
 		},
 		"node_modules/jest-cli": {
-			"version": "29.7.0",
+			"version": "30.1.1",
+			"resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-30.1.1.tgz",
+			"integrity": "sha512-xm9llxuh5OoI5KZaYzlMhklryHBwg9LZy/gEaaMlXlxb+cZekGNzukU0iblbDo3XOBuN6N0CgK4ykgNRYSEb6g==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@jest/core": "^29.7.0",
-				"@jest/test-result": "^29.7.0",
-				"@jest/types": "^29.6.3",
-				"chalk": "^4.0.0",
-				"create-jest": "^29.7.0",
-				"exit": "^0.1.2",
-				"import-local": "^3.0.2",
-				"jest-config": "^29.7.0",
-				"jest-util": "^29.7.0",
-				"jest-validate": "^29.7.0",
-				"yargs": "^17.3.1"
+				"@jest/core": "30.1.1",
+				"@jest/test-result": "30.1.1",
+				"@jest/types": "30.0.5",
+				"chalk": "^4.1.2",
+				"exit-x": "^0.2.2",
+				"import-local": "^3.2.0",
+				"jest-config": "30.1.1",
+				"jest-util": "30.0.5",
+				"jest-validate": "30.1.0",
+				"yargs": "^17.7.2"
 			},
 			"bin": {
 				"jest": "bin/jest.js"
 			},
 			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
 			},
 			"peerDependencies": {
 				"node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
@@ -3700,118 +5586,697 @@
 				}
 			}
 		},
-		"node_modules/jest-config": {
-			"version": "29.7.0",
+		"node_modules/jest-cli/node_modules/@jest/schemas": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
+			"integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@babel/core": "^7.11.6",
-				"@jest/test-sequencer": "^29.7.0",
-				"@jest/types": "^29.6.3",
-				"babel-jest": "^29.7.0",
-				"chalk": "^4.0.0",
-				"ci-info": "^3.2.0",
-				"deepmerge": "^4.2.2",
-				"glob": "^7.1.3",
-				"graceful-fs": "^4.2.9",
-				"jest-circus": "^29.7.0",
-				"jest-environment-node": "^29.7.0",
-				"jest-get-type": "^29.6.3",
-				"jest-regex-util": "^29.6.3",
-				"jest-resolve": "^29.7.0",
-				"jest-runner": "^29.7.0",
-				"jest-util": "^29.7.0",
-				"jest-validate": "^29.7.0",
-				"micromatch": "^4.0.4",
+				"@sinclair/typebox": "^0.34.0"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-cli/node_modules/@jest/types": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.5.tgz",
+			"integrity": "sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/pattern": "30.0.1",
+				"@jest/schemas": "30.0.5",
+				"@types/istanbul-lib-coverage": "^2.0.6",
+				"@types/istanbul-reports": "^3.0.4",
+				"@types/node": "*",
+				"@types/yargs": "^17.0.33",
+				"chalk": "^4.1.2"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-cli/node_modules/@sinclair/typebox": {
+			"version": "0.34.40",
+			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.40.tgz",
+			"integrity": "sha512-gwBNIP8ZAYev/ORDWW0QvxdwPXwxBtLsdsJgSc7eDIRt8ubP+rxUBzPsrwnu16fgEF8Bx4lh/+mvQvJzcTM6Kw==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/jest-cli/node_modules/ci-info": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.0.tgz",
+			"integrity": "sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/sibiraj-s"
+				}
+			],
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/jest-cli/node_modules/jest-util": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-30.0.5.tgz",
+			"integrity": "sha512-pvyPWssDZR0FlfMxCBoc0tvM8iUEskaRFALUtGQYzVEAqisAztmy+R8LnU14KT4XA0H/a5HMVTXat1jLne010g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/types": "30.0.5",
+				"@types/node": "*",
+				"chalk": "^4.1.2",
+				"ci-info": "^4.2.0",
+				"graceful-fs": "^4.2.11",
+				"picomatch": "^4.0.2"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-cli/node_modules/picomatch": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+			"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/jonschlinkert"
+			}
+		},
+		"node_modules/jest-config": {
+			"version": "30.1.1",
+			"resolved": "https://registry.npmjs.org/jest-config/-/jest-config-30.1.1.tgz",
+			"integrity": "sha512-xuPGUGDw+9fPPnGmddnLnHS/mhKUiJOW7K65vErYmglEPKq65NKwSRchkQ7iv6gqjs2l+YNEsAtbsplxozdOWg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/core": "^7.27.4",
+				"@jest/get-type": "30.1.0",
+				"@jest/pattern": "30.0.1",
+				"@jest/test-sequencer": "30.1.1",
+				"@jest/types": "30.0.5",
+				"babel-jest": "30.1.1",
+				"chalk": "^4.1.2",
+				"ci-info": "^4.2.0",
+				"deepmerge": "^4.3.1",
+				"glob": "^10.3.10",
+				"graceful-fs": "^4.2.11",
+				"jest-circus": "30.1.1",
+				"jest-docblock": "30.0.1",
+				"jest-environment-node": "30.1.1",
+				"jest-regex-util": "30.0.1",
+				"jest-resolve": "30.1.0",
+				"jest-runner": "30.1.1",
+				"jest-util": "30.0.5",
+				"jest-validate": "30.1.0",
+				"micromatch": "^4.0.8",
 				"parse-json": "^5.2.0",
-				"pretty-format": "^29.7.0",
+				"pretty-format": "30.0.5",
 				"slash": "^3.0.0",
 				"strip-json-comments": "^3.1.1"
 			},
 			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
 			},
 			"peerDependencies": {
 				"@types/node": "*",
+				"esbuild-register": ">=3.4.0",
 				"ts-node": ">=9.0.0"
 			},
 			"peerDependenciesMeta": {
 				"@types/node": {
 					"optional": true
 				},
+				"esbuild-register": {
+					"optional": true
+				},
 				"ts-node": {
 					"optional": true
 				}
 			}
 		},
-		"node_modules/jest-diff": {
-			"version": "29.7.0",
+		"node_modules/jest-config/node_modules/@jest/schemas": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
+			"integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"chalk": "^4.0.0",
-				"diff-sequences": "^29.6.3",
-				"jest-get-type": "^29.6.3",
-				"pretty-format": "^29.7.0"
+				"@sinclair/typebox": "^0.34.0"
 			},
 			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-config/node_modules/@jest/transform": {
+			"version": "30.1.1",
+			"resolved": "https://registry.npmjs.org/@jest/transform/-/transform-30.1.1.tgz",
+			"integrity": "sha512-PHIA2AbAASBfk6evkNifvmx9lkOSkmvaQoO6VSpuL8+kQqDMHeDoJ7RU3YP1wWAMD7AyQn9UL5iheuFYCC4lqQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/core": "^7.27.4",
+				"@jest/types": "30.0.5",
+				"@jridgewell/trace-mapping": "^0.3.25",
+				"babel-plugin-istanbul": "^7.0.0",
+				"chalk": "^4.1.2",
+				"convert-source-map": "^2.0.0",
+				"fast-json-stable-stringify": "^2.1.0",
+				"graceful-fs": "^4.2.11",
+				"jest-haste-map": "30.1.0",
+				"jest-regex-util": "30.0.1",
+				"jest-util": "30.0.5",
+				"micromatch": "^4.0.8",
+				"pirates": "^4.0.7",
+				"slash": "^3.0.0",
+				"write-file-atomic": "^5.0.1"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-config/node_modules/@jest/types": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.5.tgz",
+			"integrity": "sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/pattern": "30.0.1",
+				"@jest/schemas": "30.0.5",
+				"@types/istanbul-lib-coverage": "^2.0.6",
+				"@types/istanbul-reports": "^3.0.4",
+				"@types/node": "*",
+				"@types/yargs": "^17.0.33",
+				"chalk": "^4.1.2"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-config/node_modules/@sinclair/typebox": {
+			"version": "0.34.40",
+			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.40.tgz",
+			"integrity": "sha512-gwBNIP8ZAYev/ORDWW0QvxdwPXwxBtLsdsJgSc7eDIRt8ubP+rxUBzPsrwnu16fgEF8Bx4lh/+mvQvJzcTM6Kw==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/jest-config/node_modules/babel-jest": {
+			"version": "30.1.1",
+			"resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-30.1.1.tgz",
+			"integrity": "sha512-1bZfC/V03qBCzASvZpNFhx3Ouj6LgOd4KFJm4br/fYOS+tSSvVCE61QmcAVbMTwq/GoB7KN4pzGMoyr9cMxSvQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/transform": "30.1.1",
+				"@types/babel__core": "^7.20.5",
+				"babel-plugin-istanbul": "^7.0.0",
+				"babel-preset-jest": "30.0.1",
+				"chalk": "^4.1.2",
+				"graceful-fs": "^4.2.11",
+				"slash": "^3.0.0"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.11.0"
+			}
+		},
+		"node_modules/jest-config/node_modules/babel-plugin-istanbul": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-7.0.0.tgz",
+			"integrity": "sha512-C5OzENSx/A+gt7t4VH1I2XsflxyPUmXRFPKBxt33xncdOmq7oROVM3bZv9Ysjjkv8OJYDMa+tKuKMvqU/H3xdw==",
+			"dev": true,
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.0.0",
+				"@istanbuljs/load-nyc-config": "^1.0.0",
+				"@istanbuljs/schema": "^0.1.3",
+				"istanbul-lib-instrument": "^6.0.2",
+				"test-exclude": "^6.0.0"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/jest-config/node_modules/babel-plugin-jest-hoist": {
+			"version": "30.0.1",
+			"resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-30.0.1.tgz",
+			"integrity": "sha512-zTPME3pI50NsFW8ZBaVIOeAxzEY7XHlmWeXXu9srI+9kNfzCUTy8MFan46xOGZY8NZThMqq+e3qZUKsvXbasnQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/template": "^7.27.2",
+				"@babel/types": "^7.27.3",
+				"@types/babel__core": "^7.20.5"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-config/node_modules/babel-preset-jest": {
+			"version": "30.0.1",
+			"resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-30.0.1.tgz",
+			"integrity": "sha512-+YHejD5iTWI46cZmcc/YtX4gaKBtdqCHCVfuVinizVpbmyjO3zYmeuyFdfA8duRqQZfgCAMlsfmkVbJ+e2MAJw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"babel-plugin-jest-hoist": "30.0.1",
+				"babel-preset-current-node-syntax": "^1.1.0"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.11.0"
+			}
+		},
+		"node_modules/jest-config/node_modules/brace-expansion": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+			"integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"balanced-match": "^1.0.0"
+			}
+		},
+		"node_modules/jest-config/node_modules/ci-info": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.0.tgz",
+			"integrity": "sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/sibiraj-s"
+				}
+			],
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/jest-config/node_modules/glob": {
+			"version": "10.4.5",
+			"resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+			"integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"foreground-child": "^3.1.0",
+				"jackspeak": "^3.1.2",
+				"minimatch": "^9.0.4",
+				"minipass": "^7.1.2",
+				"package-json-from-dist": "^1.0.0",
+				"path-scurry": "^1.11.1"
+			},
+			"bin": {
+				"glob": "dist/esm/bin.mjs"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
+		"node_modules/jest-config/node_modules/jest-haste-map": {
+			"version": "30.1.0",
+			"resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-30.1.0.tgz",
+			"integrity": "sha512-JLeM84kNjpRkggcGpQLsV7B8W4LNUWz7oDNVnY1Vjj22b5/fAb3kk3htiD+4Na8bmJmjJR7rBtS2Rmq/NEcADg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/types": "30.0.5",
+				"@types/node": "*",
+				"anymatch": "^3.1.3",
+				"fb-watchman": "^2.0.2",
+				"graceful-fs": "^4.2.11",
+				"jest-regex-util": "30.0.1",
+				"jest-util": "30.0.5",
+				"jest-worker": "30.1.0",
+				"micromatch": "^4.0.8",
+				"walker": "^1.0.8"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			},
+			"optionalDependencies": {
+				"fsevents": "^2.3.3"
+			}
+		},
+		"node_modules/jest-config/node_modules/jest-regex-util": {
+			"version": "30.0.1",
+			"resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-30.0.1.tgz",
+			"integrity": "sha512-jHEQgBXAgc+Gh4g0p3bCevgRCVRkB4VB70zhoAE48gxeSr1hfUOsM/C2WoJgVL7Eyg//hudYENbm3Ne+/dRVVA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-config/node_modules/jest-util": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-30.0.5.tgz",
+			"integrity": "sha512-pvyPWssDZR0FlfMxCBoc0tvM8iUEskaRFALUtGQYzVEAqisAztmy+R8LnU14KT4XA0H/a5HMVTXat1jLne010g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/types": "30.0.5",
+				"@types/node": "*",
+				"chalk": "^4.1.2",
+				"ci-info": "^4.2.0",
+				"graceful-fs": "^4.2.11",
+				"picomatch": "^4.0.2"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-config/node_modules/jest-worker": {
+			"version": "30.1.0",
+			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-30.1.0.tgz",
+			"integrity": "sha512-uvWcSjlwAAgIu133Tt77A05H7RIk3Ho8tZL50bQM2AkvLdluw9NG48lRCl3Dt+MOH719n/0nnb5YxUwcuJiKRA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@types/node": "*",
+				"@ungap/structured-clone": "^1.3.0",
+				"jest-util": "30.0.5",
+				"merge-stream": "^2.0.0",
+				"supports-color": "^8.1.1"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-config/node_modules/minimatch": {
+			"version": "9.0.5",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+			"integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"brace-expansion": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=16 || 14 >=14.17"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
+		"node_modules/jest-config/node_modules/picomatch": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+			"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/jonschlinkert"
+			}
+		},
+		"node_modules/jest-config/node_modules/signal-exit": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+			"integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+			"dev": true,
+			"license": "ISC",
+			"engines": {
+				"node": ">=14"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
+		"node_modules/jest-config/node_modules/write-file-atomic": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz",
+			"integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"imurmurhash": "^0.1.4",
+				"signal-exit": "^4.0.1"
+			},
+			"engines": {
+				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-diff": {
+			"version": "30.1.1",
+			"resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-30.1.1.tgz",
+			"integrity": "sha512-LUU2Gx8EhYxpdzTR6BmjL1ifgOAQJQELTHOiPv9KITaKjZvJ9Jmgigx01tuZ49id37LorpGc9dPBPlXTboXScw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/diff-sequences": "30.0.1",
+				"@jest/get-type": "30.1.0",
+				"chalk": "^4.1.2",
+				"pretty-format": "30.0.5"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
 			}
 		},
 		"node_modules/jest-docblock": {
-			"version": "29.7.0",
+			"version": "30.0.1",
+			"resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-30.0.1.tgz",
+			"integrity": "sha512-/vF78qn3DYphAaIc3jy4gA7XSAz167n9Bm/wn/1XhTLW7tTBIzXtCJpb/vcmc73NIIeeohCbdL94JasyXUZsGA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"detect-newline": "^3.0.0"
+				"detect-newline": "^3.1.0"
 			},
 			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
 			}
 		},
 		"node_modules/jest-each": {
-			"version": "29.7.0",
+			"version": "30.1.0",
+			"resolved": "https://registry.npmjs.org/jest-each/-/jest-each-30.1.0.tgz",
+			"integrity": "sha512-A+9FKzxPluqogNahpCv04UJvcZ9B3HamqpDNWNKDjtxVRYB8xbZLFuCr8JAJFpNp83CA0anGQFlpQna9Me+/tQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@jest/types": "^29.6.3",
-				"chalk": "^4.0.0",
-				"jest-get-type": "^29.6.3",
-				"jest-util": "^29.7.0",
-				"pretty-format": "^29.7.0"
+				"@jest/get-type": "30.1.0",
+				"@jest/types": "30.0.5",
+				"chalk": "^4.1.2",
+				"jest-util": "30.0.5",
+				"pretty-format": "30.0.5"
 			},
 			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-each/node_modules/@jest/schemas": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
+			"integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@sinclair/typebox": "^0.34.0"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-each/node_modules/@jest/types": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.5.tgz",
+			"integrity": "sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/pattern": "30.0.1",
+				"@jest/schemas": "30.0.5",
+				"@types/istanbul-lib-coverage": "^2.0.6",
+				"@types/istanbul-reports": "^3.0.4",
+				"@types/node": "*",
+				"@types/yargs": "^17.0.33",
+				"chalk": "^4.1.2"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-each/node_modules/@sinclair/typebox": {
+			"version": "0.34.40",
+			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.40.tgz",
+			"integrity": "sha512-gwBNIP8ZAYev/ORDWW0QvxdwPXwxBtLsdsJgSc7eDIRt8ubP+rxUBzPsrwnu16fgEF8Bx4lh/+mvQvJzcTM6Kw==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/jest-each/node_modules/ci-info": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.0.tgz",
+			"integrity": "sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/sibiraj-s"
+				}
+			],
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/jest-each/node_modules/jest-util": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-30.0.5.tgz",
+			"integrity": "sha512-pvyPWssDZR0FlfMxCBoc0tvM8iUEskaRFALUtGQYzVEAqisAztmy+R8LnU14KT4XA0H/a5HMVTXat1jLne010g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/types": "30.0.5",
+				"@types/node": "*",
+				"chalk": "^4.1.2",
+				"ci-info": "^4.2.0",
+				"graceful-fs": "^4.2.11",
+				"picomatch": "^4.0.2"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-each/node_modules/picomatch": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+			"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/jonschlinkert"
 			}
 		},
 		"node_modules/jest-environment-node": {
-			"version": "29.7.0",
+			"version": "30.1.1",
+			"resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-30.1.1.tgz",
+			"integrity": "sha512-IaMoaA6saxnJimqCppUDqKck+LKM0Jg+OxyMUIvs1yGd2neiC22o8zXo90k04+tO+49OmgMR4jTgM5e4B0S62Q==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@jest/environment": "^29.7.0",
-				"@jest/fake-timers": "^29.7.0",
-				"@jest/types": "^29.6.3",
+				"@jest/environment": "30.1.1",
+				"@jest/fake-timers": "30.1.1",
+				"@jest/types": "30.0.5",
 				"@types/node": "*",
-				"jest-mock": "^29.7.0",
-				"jest-util": "^29.7.0"
+				"jest-mock": "30.0.5",
+				"jest-util": "30.0.5",
+				"jest-validate": "30.1.0"
 			},
 			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
 			}
 		},
-		"node_modules/jest-get-type": {
-			"version": "29.6.3",
+		"node_modules/jest-environment-node/node_modules/@jest/schemas": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
+			"integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@sinclair/typebox": "^0.34.0"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-environment-node/node_modules/@jest/types": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.5.tgz",
+			"integrity": "sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/pattern": "30.0.1",
+				"@jest/schemas": "30.0.5",
+				"@types/istanbul-lib-coverage": "^2.0.6",
+				"@types/istanbul-reports": "^3.0.4",
+				"@types/node": "*",
+				"@types/yargs": "^17.0.33",
+				"chalk": "^4.1.2"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-environment-node/node_modules/@sinclair/typebox": {
+			"version": "0.34.40",
+			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.40.tgz",
+			"integrity": "sha512-gwBNIP8ZAYev/ORDWW0QvxdwPXwxBtLsdsJgSc7eDIRt8ubP+rxUBzPsrwnu16fgEF8Bx4lh/+mvQvJzcTM6Kw==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/jest-environment-node/node_modules/ci-info": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.0.tgz",
+			"integrity": "sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/sibiraj-s"
+				}
+			],
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/jest-environment-node/node_modules/jest-util": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-30.0.5.tgz",
+			"integrity": "sha512-pvyPWssDZR0FlfMxCBoc0tvM8iUEskaRFALUtGQYzVEAqisAztmy+R8LnU14KT4XA0H/a5HMVTXat1jLne010g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/types": "30.0.5",
+				"@types/node": "*",
+				"chalk": "^4.1.2",
+				"ci-info": "^4.2.0",
+				"graceful-fs": "^4.2.11",
+				"picomatch": "^4.0.2"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-environment-node/node_modules/picomatch": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+			"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/jonschlinkert"
 			}
 		},
 		"node_modules/jest-haste-map": {
 			"version": "29.7.0",
 			"dev": true,
 			"license": "MIT",
+			"optional": true,
+			"peer": true,
 			"dependencies": {
 				"@jest/types": "^29.6.3",
 				"@types/graceful-fs": "^4.1.3",
@@ -3833,65 +6298,200 @@
 			}
 		},
 		"node_modules/jest-leak-detector": {
-			"version": "29.7.0",
+			"version": "30.1.0",
+			"resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-30.1.0.tgz",
+			"integrity": "sha512-AoFvJzwxK+4KohH60vRuHaqXfWmeBATFZpzpmzNmYTtmRMiyGPVhkXpBqxUQunw+dQB48bDf4NpUs6ivVbRv1g==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"jest-get-type": "^29.6.3",
-				"pretty-format": "^29.7.0"
+				"@jest/get-type": "30.1.0",
+				"pretty-format": "30.0.5"
 			},
 			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
 			}
 		},
 		"node_modules/jest-matcher-utils": {
-			"version": "29.7.0",
+			"version": "30.1.1",
+			"resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-30.1.1.tgz",
+			"integrity": "sha512-SuH2QVemK48BNTqReti6FtjsMPFsSOD/ZzRxU1TttR7RiRsRSe78d03bb4Cx6D4bQC/80Q8U4VnaaAH9FlbZ9w==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"chalk": "^4.0.0",
-				"jest-diff": "^29.7.0",
-				"jest-get-type": "^29.6.3",
-				"pretty-format": "^29.7.0"
+				"@jest/get-type": "30.1.0",
+				"chalk": "^4.1.2",
+				"jest-diff": "30.1.1",
+				"pretty-format": "30.0.5"
 			},
 			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
 			}
 		},
 		"node_modules/jest-message-util": {
-			"version": "29.7.0",
+			"version": "30.1.0",
+			"resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-30.1.0.tgz",
+			"integrity": "sha512-HizKDGG98cYkWmaLUHChq4iN+oCENohQLb7Z5guBPumYs+/etonmNFlg1Ps6yN9LTPyZn+M+b/9BbnHx3WTMDg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@babel/code-frame": "^7.12.13",
-				"@jest/types": "^29.6.3",
-				"@types/stack-utils": "^2.0.0",
-				"chalk": "^4.0.0",
-				"graceful-fs": "^4.2.9",
-				"micromatch": "^4.0.4",
-				"pretty-format": "^29.7.0",
+				"@babel/code-frame": "^7.27.1",
+				"@jest/types": "30.0.5",
+				"@types/stack-utils": "^2.0.3",
+				"chalk": "^4.1.2",
+				"graceful-fs": "^4.2.11",
+				"micromatch": "^4.0.8",
+				"pretty-format": "30.0.5",
 				"slash": "^3.0.0",
-				"stack-utils": "^2.0.3"
+				"stack-utils": "^2.0.6"
 			},
 			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
 			}
 		},
-		"node_modules/jest-mock": {
-			"version": "29.7.0",
+		"node_modules/jest-message-util/node_modules/@jest/schemas": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
+			"integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@jest/types": "^29.6.3",
-				"@types/node": "*",
-				"jest-util": "^29.7.0"
+				"@sinclair/typebox": "^0.34.0"
 			},
 			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-message-util/node_modules/@jest/types": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.5.tgz",
+			"integrity": "sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/pattern": "30.0.1",
+				"@jest/schemas": "30.0.5",
+				"@types/istanbul-lib-coverage": "^2.0.6",
+				"@types/istanbul-reports": "^3.0.4",
+				"@types/node": "*",
+				"@types/yargs": "^17.0.33",
+				"chalk": "^4.1.2"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-message-util/node_modules/@sinclair/typebox": {
+			"version": "0.34.40",
+			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.40.tgz",
+			"integrity": "sha512-gwBNIP8ZAYev/ORDWW0QvxdwPXwxBtLsdsJgSc7eDIRt8ubP+rxUBzPsrwnu16fgEF8Bx4lh/+mvQvJzcTM6Kw==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/jest-mock": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-30.0.5.tgz",
+			"integrity": "sha512-Od7TyasAAQX/6S+QCbN6vZoWOMwlTtzzGuxJku1GhGanAjz9y+QsQkpScDmETvdc9aSXyJ/Op4rhpMYBWW91wQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/types": "30.0.5",
+				"@types/node": "*",
+				"jest-util": "30.0.5"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-mock/node_modules/@jest/schemas": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
+			"integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@sinclair/typebox": "^0.34.0"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-mock/node_modules/@jest/types": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.5.tgz",
+			"integrity": "sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/pattern": "30.0.1",
+				"@jest/schemas": "30.0.5",
+				"@types/istanbul-lib-coverage": "^2.0.6",
+				"@types/istanbul-reports": "^3.0.4",
+				"@types/node": "*",
+				"@types/yargs": "^17.0.33",
+				"chalk": "^4.1.2"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-mock/node_modules/@sinclair/typebox": {
+			"version": "0.34.40",
+			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.40.tgz",
+			"integrity": "sha512-gwBNIP8ZAYev/ORDWW0QvxdwPXwxBtLsdsJgSc7eDIRt8ubP+rxUBzPsrwnu16fgEF8Bx4lh/+mvQvJzcTM6Kw==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/jest-mock/node_modules/ci-info": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.0.tgz",
+			"integrity": "sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/sibiraj-s"
+				}
+			],
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/jest-mock/node_modules/jest-util": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-30.0.5.tgz",
+			"integrity": "sha512-pvyPWssDZR0FlfMxCBoc0tvM8iUEskaRFALUtGQYzVEAqisAztmy+R8LnU14KT4XA0H/a5HMVTXat1jLne010g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/types": "30.0.5",
+				"@types/node": "*",
+				"chalk": "^4.1.2",
+				"ci-info": "^4.2.0",
+				"graceful-fs": "^4.2.11",
+				"picomatch": "^4.0.2"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-mock/node_modules/picomatch": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+			"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/jonschlinkert"
 			}
 		},
 		"node_modules/jest-pnp-resolver": {
 			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
+			"integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -3910,132 +6510,967 @@
 			"version": "29.6.3",
 			"dev": true,
 			"license": "MIT",
+			"optional": true,
+			"peer": true,
 			"engines": {
 				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
 			}
 		},
 		"node_modules/jest-resolve": {
-			"version": "29.7.0",
+			"version": "30.1.0",
+			"resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-30.1.0.tgz",
+			"integrity": "sha512-hASe7D/wRtZw8Cm607NrlF7fi3HWC5wmA5jCVc2QjQAB2pTwP9eVZILGEi6OeSLNUtE1zb04sXRowsdh5CUjwA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"chalk": "^4.0.0",
-				"graceful-fs": "^4.2.9",
-				"jest-haste-map": "^29.7.0",
-				"jest-pnp-resolver": "^1.2.2",
-				"jest-util": "^29.7.0",
-				"jest-validate": "^29.7.0",
-				"resolve": "^1.20.0",
-				"resolve.exports": "^2.0.0",
-				"slash": "^3.0.0"
+				"chalk": "^4.1.2",
+				"graceful-fs": "^4.2.11",
+				"jest-haste-map": "30.1.0",
+				"jest-pnp-resolver": "^1.2.3",
+				"jest-util": "30.0.5",
+				"jest-validate": "30.1.0",
+				"slash": "^3.0.0",
+				"unrs-resolver": "^1.7.11"
 			},
 			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
 			}
 		},
 		"node_modules/jest-resolve-dependencies": {
-			"version": "29.7.0",
+			"version": "30.1.1",
+			"resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-30.1.1.tgz",
+			"integrity": "sha512-tRtaaoH8Ws1Gn1o/9pedt19dvVgr81WwdmvJSP9Ow3amOUOP2nN9j94u5jC9XlIfa2Q1FQKIWWQwL4ajqsjCGQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"jest-regex-util": "^29.6.3",
-				"jest-snapshot": "^29.7.0"
+				"jest-regex-util": "30.0.1",
+				"jest-snapshot": "30.1.1"
 			},
 			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-resolve-dependencies/node_modules/jest-regex-util": {
+			"version": "30.0.1",
+			"resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-30.0.1.tgz",
+			"integrity": "sha512-jHEQgBXAgc+Gh4g0p3bCevgRCVRkB4VB70zhoAE48gxeSr1hfUOsM/C2WoJgVL7Eyg//hudYENbm3Ne+/dRVVA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-resolve/node_modules/@jest/schemas": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
+			"integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@sinclair/typebox": "^0.34.0"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-resolve/node_modules/@jest/types": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.5.tgz",
+			"integrity": "sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/pattern": "30.0.1",
+				"@jest/schemas": "30.0.5",
+				"@types/istanbul-lib-coverage": "^2.0.6",
+				"@types/istanbul-reports": "^3.0.4",
+				"@types/node": "*",
+				"@types/yargs": "^17.0.33",
+				"chalk": "^4.1.2"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-resolve/node_modules/@sinclair/typebox": {
+			"version": "0.34.40",
+			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.40.tgz",
+			"integrity": "sha512-gwBNIP8ZAYev/ORDWW0QvxdwPXwxBtLsdsJgSc7eDIRt8ubP+rxUBzPsrwnu16fgEF8Bx4lh/+mvQvJzcTM6Kw==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/jest-resolve/node_modules/ci-info": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.0.tgz",
+			"integrity": "sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/sibiraj-s"
+				}
+			],
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/jest-resolve/node_modules/jest-haste-map": {
+			"version": "30.1.0",
+			"resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-30.1.0.tgz",
+			"integrity": "sha512-JLeM84kNjpRkggcGpQLsV7B8W4LNUWz7oDNVnY1Vjj22b5/fAb3kk3htiD+4Na8bmJmjJR7rBtS2Rmq/NEcADg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/types": "30.0.5",
+				"@types/node": "*",
+				"anymatch": "^3.1.3",
+				"fb-watchman": "^2.0.2",
+				"graceful-fs": "^4.2.11",
+				"jest-regex-util": "30.0.1",
+				"jest-util": "30.0.5",
+				"jest-worker": "30.1.0",
+				"micromatch": "^4.0.8",
+				"walker": "^1.0.8"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			},
+			"optionalDependencies": {
+				"fsevents": "^2.3.3"
+			}
+		},
+		"node_modules/jest-resolve/node_modules/jest-regex-util": {
+			"version": "30.0.1",
+			"resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-30.0.1.tgz",
+			"integrity": "sha512-jHEQgBXAgc+Gh4g0p3bCevgRCVRkB4VB70zhoAE48gxeSr1hfUOsM/C2WoJgVL7Eyg//hudYENbm3Ne+/dRVVA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-resolve/node_modules/jest-util": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-30.0.5.tgz",
+			"integrity": "sha512-pvyPWssDZR0FlfMxCBoc0tvM8iUEskaRFALUtGQYzVEAqisAztmy+R8LnU14KT4XA0H/a5HMVTXat1jLne010g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/types": "30.0.5",
+				"@types/node": "*",
+				"chalk": "^4.1.2",
+				"ci-info": "^4.2.0",
+				"graceful-fs": "^4.2.11",
+				"picomatch": "^4.0.2"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-resolve/node_modules/jest-worker": {
+			"version": "30.1.0",
+			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-30.1.0.tgz",
+			"integrity": "sha512-uvWcSjlwAAgIu133Tt77A05H7RIk3Ho8tZL50bQM2AkvLdluw9NG48lRCl3Dt+MOH719n/0nnb5YxUwcuJiKRA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@types/node": "*",
+				"@ungap/structured-clone": "^1.3.0",
+				"jest-util": "30.0.5",
+				"merge-stream": "^2.0.0",
+				"supports-color": "^8.1.1"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-resolve/node_modules/picomatch": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+			"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/jonschlinkert"
 			}
 		},
 		"node_modules/jest-runner": {
-			"version": "29.7.0",
+			"version": "30.1.1",
+			"resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-30.1.1.tgz",
+			"integrity": "sha512-ATe6372SOfJvCRExtCAr06I4rGujwFdKg44b6i7/aOgFnULwjxzugJ0Y4AnG+jeSeQi8dU7R6oqLGmsxRUbErQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@jest/console": "^29.7.0",
-				"@jest/environment": "^29.7.0",
-				"@jest/test-result": "^29.7.0",
-				"@jest/transform": "^29.7.0",
-				"@jest/types": "^29.6.3",
+				"@jest/console": "30.1.1",
+				"@jest/environment": "30.1.1",
+				"@jest/test-result": "30.1.1",
+				"@jest/transform": "30.1.1",
+				"@jest/types": "30.0.5",
 				"@types/node": "*",
-				"chalk": "^4.0.0",
+				"chalk": "^4.1.2",
 				"emittery": "^0.13.1",
-				"graceful-fs": "^4.2.9",
-				"jest-docblock": "^29.7.0",
-				"jest-environment-node": "^29.7.0",
-				"jest-haste-map": "^29.7.0",
-				"jest-leak-detector": "^29.7.0",
-				"jest-message-util": "^29.7.0",
-				"jest-resolve": "^29.7.0",
-				"jest-runtime": "^29.7.0",
-				"jest-util": "^29.7.0",
-				"jest-watcher": "^29.7.0",
-				"jest-worker": "^29.7.0",
+				"exit-x": "^0.2.2",
+				"graceful-fs": "^4.2.11",
+				"jest-docblock": "30.0.1",
+				"jest-environment-node": "30.1.1",
+				"jest-haste-map": "30.1.0",
+				"jest-leak-detector": "30.1.0",
+				"jest-message-util": "30.1.0",
+				"jest-resolve": "30.1.0",
+				"jest-runtime": "30.1.1",
+				"jest-util": "30.0.5",
+				"jest-watcher": "30.1.1",
+				"jest-worker": "30.1.0",
 				"p-limit": "^3.1.0",
 				"source-map-support": "0.5.13"
 			},
 			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
 			}
 		},
-		"node_modules/jest-runtime": {
-			"version": "29.7.0",
+		"node_modules/jest-runner/node_modules/@jest/schemas": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
+			"integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@jest/environment": "^29.7.0",
-				"@jest/fake-timers": "^29.7.0",
-				"@jest/globals": "^29.7.0",
-				"@jest/source-map": "^29.6.3",
-				"@jest/test-result": "^29.7.0",
-				"@jest/transform": "^29.7.0",
-				"@jest/types": "^29.6.3",
+				"@sinclair/typebox": "^0.34.0"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-runner/node_modules/@jest/transform": {
+			"version": "30.1.1",
+			"resolved": "https://registry.npmjs.org/@jest/transform/-/transform-30.1.1.tgz",
+			"integrity": "sha512-PHIA2AbAASBfk6evkNifvmx9lkOSkmvaQoO6VSpuL8+kQqDMHeDoJ7RU3YP1wWAMD7AyQn9UL5iheuFYCC4lqQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/core": "^7.27.4",
+				"@jest/types": "30.0.5",
+				"@jridgewell/trace-mapping": "^0.3.25",
+				"babel-plugin-istanbul": "^7.0.0",
+				"chalk": "^4.1.2",
+				"convert-source-map": "^2.0.0",
+				"fast-json-stable-stringify": "^2.1.0",
+				"graceful-fs": "^4.2.11",
+				"jest-haste-map": "30.1.0",
+				"jest-regex-util": "30.0.1",
+				"jest-util": "30.0.5",
+				"micromatch": "^4.0.8",
+				"pirates": "^4.0.7",
+				"slash": "^3.0.0",
+				"write-file-atomic": "^5.0.1"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-runner/node_modules/@jest/types": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.5.tgz",
+			"integrity": "sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/pattern": "30.0.1",
+				"@jest/schemas": "30.0.5",
+				"@types/istanbul-lib-coverage": "^2.0.6",
+				"@types/istanbul-reports": "^3.0.4",
 				"@types/node": "*",
-				"chalk": "^4.0.0",
-				"cjs-module-lexer": "^1.0.0",
-				"collect-v8-coverage": "^1.0.0",
-				"glob": "^7.1.3",
-				"graceful-fs": "^4.2.9",
-				"jest-haste-map": "^29.7.0",
-				"jest-message-util": "^29.7.0",
-				"jest-mock": "^29.7.0",
-				"jest-regex-util": "^29.6.3",
-				"jest-resolve": "^29.7.0",
-				"jest-snapshot": "^29.7.0",
-				"jest-util": "^29.7.0",
+				"@types/yargs": "^17.0.33",
+				"chalk": "^4.1.2"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-runner/node_modules/@sinclair/typebox": {
+			"version": "0.34.40",
+			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.40.tgz",
+			"integrity": "sha512-gwBNIP8ZAYev/ORDWW0QvxdwPXwxBtLsdsJgSc7eDIRt8ubP+rxUBzPsrwnu16fgEF8Bx4lh/+mvQvJzcTM6Kw==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/jest-runner/node_modules/babel-plugin-istanbul": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-7.0.0.tgz",
+			"integrity": "sha512-C5OzENSx/A+gt7t4VH1I2XsflxyPUmXRFPKBxt33xncdOmq7oROVM3bZv9Ysjjkv8OJYDMa+tKuKMvqU/H3xdw==",
+			"dev": true,
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.0.0",
+				"@istanbuljs/load-nyc-config": "^1.0.0",
+				"@istanbuljs/schema": "^0.1.3",
+				"istanbul-lib-instrument": "^6.0.2",
+				"test-exclude": "^6.0.0"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/jest-runner/node_modules/ci-info": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.0.tgz",
+			"integrity": "sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/sibiraj-s"
+				}
+			],
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/jest-runner/node_modules/jest-haste-map": {
+			"version": "30.1.0",
+			"resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-30.1.0.tgz",
+			"integrity": "sha512-JLeM84kNjpRkggcGpQLsV7B8W4LNUWz7oDNVnY1Vjj22b5/fAb3kk3htiD+4Na8bmJmjJR7rBtS2Rmq/NEcADg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/types": "30.0.5",
+				"@types/node": "*",
+				"anymatch": "^3.1.3",
+				"fb-watchman": "^2.0.2",
+				"graceful-fs": "^4.2.11",
+				"jest-regex-util": "30.0.1",
+				"jest-util": "30.0.5",
+				"jest-worker": "30.1.0",
+				"micromatch": "^4.0.8",
+				"walker": "^1.0.8"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			},
+			"optionalDependencies": {
+				"fsevents": "^2.3.3"
+			}
+		},
+		"node_modules/jest-runner/node_modules/jest-regex-util": {
+			"version": "30.0.1",
+			"resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-30.0.1.tgz",
+			"integrity": "sha512-jHEQgBXAgc+Gh4g0p3bCevgRCVRkB4VB70zhoAE48gxeSr1hfUOsM/C2WoJgVL7Eyg//hudYENbm3Ne+/dRVVA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-runner/node_modules/jest-util": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-30.0.5.tgz",
+			"integrity": "sha512-pvyPWssDZR0FlfMxCBoc0tvM8iUEskaRFALUtGQYzVEAqisAztmy+R8LnU14KT4XA0H/a5HMVTXat1jLne010g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/types": "30.0.5",
+				"@types/node": "*",
+				"chalk": "^4.1.2",
+				"ci-info": "^4.2.0",
+				"graceful-fs": "^4.2.11",
+				"picomatch": "^4.0.2"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-runner/node_modules/jest-worker": {
+			"version": "30.1.0",
+			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-30.1.0.tgz",
+			"integrity": "sha512-uvWcSjlwAAgIu133Tt77A05H7RIk3Ho8tZL50bQM2AkvLdluw9NG48lRCl3Dt+MOH719n/0nnb5YxUwcuJiKRA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@types/node": "*",
+				"@ungap/structured-clone": "^1.3.0",
+				"jest-util": "30.0.5",
+				"merge-stream": "^2.0.0",
+				"supports-color": "^8.1.1"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-runner/node_modules/picomatch": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+			"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/jonschlinkert"
+			}
+		},
+		"node_modules/jest-runner/node_modules/signal-exit": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+			"integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+			"dev": true,
+			"license": "ISC",
+			"engines": {
+				"node": ">=14"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
+		"node_modules/jest-runner/node_modules/write-file-atomic": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz",
+			"integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"imurmurhash": "^0.1.4",
+				"signal-exit": "^4.0.1"
+			},
+			"engines": {
+				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-runtime": {
+			"version": "30.1.1",
+			"resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-30.1.1.tgz",
+			"integrity": "sha512-7sOyR0Oekw4OesQqqBHuYJRB52QtXiq0NNgLRzVogiMSxKCMiliUd6RrXHCnG5f12Age/ggidCBiQftzcA9XKw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/environment": "30.1.1",
+				"@jest/fake-timers": "30.1.1",
+				"@jest/globals": "30.1.1",
+				"@jest/source-map": "30.0.1",
+				"@jest/test-result": "30.1.1",
+				"@jest/transform": "30.1.1",
+				"@jest/types": "30.0.5",
+				"@types/node": "*",
+				"chalk": "^4.1.2",
+				"cjs-module-lexer": "^2.1.0",
+				"collect-v8-coverage": "^1.0.2",
+				"glob": "^10.3.10",
+				"graceful-fs": "^4.2.11",
+				"jest-haste-map": "30.1.0",
+				"jest-message-util": "30.1.0",
+				"jest-mock": "30.0.5",
+				"jest-regex-util": "30.0.1",
+				"jest-resolve": "30.1.0",
+				"jest-snapshot": "30.1.1",
+				"jest-util": "30.0.5",
 				"slash": "^3.0.0",
 				"strip-bom": "^4.0.0"
 			},
 			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
 			}
 		},
-		"node_modules/jest-snapshot": {
-			"version": "29.7.0",
+		"node_modules/jest-runtime/node_modules/@jest/schemas": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
+			"integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@babel/core": "^7.11.6",
-				"@babel/generator": "^7.7.2",
-				"@babel/plugin-syntax-jsx": "^7.7.2",
-				"@babel/plugin-syntax-typescript": "^7.7.2",
-				"@babel/types": "^7.3.3",
-				"@jest/expect-utils": "^29.7.0",
-				"@jest/transform": "^29.7.0",
-				"@jest/types": "^29.6.3",
-				"babel-preset-current-node-syntax": "^1.0.0",
-				"chalk": "^4.0.0",
-				"expect": "^29.7.0",
-				"graceful-fs": "^4.2.9",
-				"jest-diff": "^29.7.0",
-				"jest-get-type": "^29.6.3",
-				"jest-matcher-utils": "^29.7.0",
-				"jest-message-util": "^29.7.0",
-				"jest-util": "^29.7.0",
-				"natural-compare": "^1.4.0",
-				"pretty-format": "^29.7.0",
-				"semver": "^7.5.3"
+				"@sinclair/typebox": "^0.34.0"
 			},
 			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-runtime/node_modules/@jest/transform": {
+			"version": "30.1.1",
+			"resolved": "https://registry.npmjs.org/@jest/transform/-/transform-30.1.1.tgz",
+			"integrity": "sha512-PHIA2AbAASBfk6evkNifvmx9lkOSkmvaQoO6VSpuL8+kQqDMHeDoJ7RU3YP1wWAMD7AyQn9UL5iheuFYCC4lqQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/core": "^7.27.4",
+				"@jest/types": "30.0.5",
+				"@jridgewell/trace-mapping": "^0.3.25",
+				"babel-plugin-istanbul": "^7.0.0",
+				"chalk": "^4.1.2",
+				"convert-source-map": "^2.0.0",
+				"fast-json-stable-stringify": "^2.1.0",
+				"graceful-fs": "^4.2.11",
+				"jest-haste-map": "30.1.0",
+				"jest-regex-util": "30.0.1",
+				"jest-util": "30.0.5",
+				"micromatch": "^4.0.8",
+				"pirates": "^4.0.7",
+				"slash": "^3.0.0",
+				"write-file-atomic": "^5.0.1"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-runtime/node_modules/@jest/types": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.5.tgz",
+			"integrity": "sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/pattern": "30.0.1",
+				"@jest/schemas": "30.0.5",
+				"@types/istanbul-lib-coverage": "^2.0.6",
+				"@types/istanbul-reports": "^3.0.4",
+				"@types/node": "*",
+				"@types/yargs": "^17.0.33",
+				"chalk": "^4.1.2"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-runtime/node_modules/@sinclair/typebox": {
+			"version": "0.34.40",
+			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.40.tgz",
+			"integrity": "sha512-gwBNIP8ZAYev/ORDWW0QvxdwPXwxBtLsdsJgSc7eDIRt8ubP+rxUBzPsrwnu16fgEF8Bx4lh/+mvQvJzcTM6Kw==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/jest-runtime/node_modules/babel-plugin-istanbul": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-7.0.0.tgz",
+			"integrity": "sha512-C5OzENSx/A+gt7t4VH1I2XsflxyPUmXRFPKBxt33xncdOmq7oROVM3bZv9Ysjjkv8OJYDMa+tKuKMvqU/H3xdw==",
+			"dev": true,
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.0.0",
+				"@istanbuljs/load-nyc-config": "^1.0.0",
+				"@istanbuljs/schema": "^0.1.3",
+				"istanbul-lib-instrument": "^6.0.2",
+				"test-exclude": "^6.0.0"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/jest-runtime/node_modules/brace-expansion": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+			"integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"balanced-match": "^1.0.0"
+			}
+		},
+		"node_modules/jest-runtime/node_modules/ci-info": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.0.tgz",
+			"integrity": "sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/sibiraj-s"
+				}
+			],
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/jest-runtime/node_modules/glob": {
+			"version": "10.4.5",
+			"resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+			"integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"foreground-child": "^3.1.0",
+				"jackspeak": "^3.1.2",
+				"minimatch": "^9.0.4",
+				"minipass": "^7.1.2",
+				"package-json-from-dist": "^1.0.0",
+				"path-scurry": "^1.11.1"
+			},
+			"bin": {
+				"glob": "dist/esm/bin.mjs"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
+		"node_modules/jest-runtime/node_modules/jest-haste-map": {
+			"version": "30.1.0",
+			"resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-30.1.0.tgz",
+			"integrity": "sha512-JLeM84kNjpRkggcGpQLsV7B8W4LNUWz7oDNVnY1Vjj22b5/fAb3kk3htiD+4Na8bmJmjJR7rBtS2Rmq/NEcADg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/types": "30.0.5",
+				"@types/node": "*",
+				"anymatch": "^3.1.3",
+				"fb-watchman": "^2.0.2",
+				"graceful-fs": "^4.2.11",
+				"jest-regex-util": "30.0.1",
+				"jest-util": "30.0.5",
+				"jest-worker": "30.1.0",
+				"micromatch": "^4.0.8",
+				"walker": "^1.0.8"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			},
+			"optionalDependencies": {
+				"fsevents": "^2.3.3"
+			}
+		},
+		"node_modules/jest-runtime/node_modules/jest-regex-util": {
+			"version": "30.0.1",
+			"resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-30.0.1.tgz",
+			"integrity": "sha512-jHEQgBXAgc+Gh4g0p3bCevgRCVRkB4VB70zhoAE48gxeSr1hfUOsM/C2WoJgVL7Eyg//hudYENbm3Ne+/dRVVA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-runtime/node_modules/jest-util": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-30.0.5.tgz",
+			"integrity": "sha512-pvyPWssDZR0FlfMxCBoc0tvM8iUEskaRFALUtGQYzVEAqisAztmy+R8LnU14KT4XA0H/a5HMVTXat1jLne010g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/types": "30.0.5",
+				"@types/node": "*",
+				"chalk": "^4.1.2",
+				"ci-info": "^4.2.0",
+				"graceful-fs": "^4.2.11",
+				"picomatch": "^4.0.2"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-runtime/node_modules/jest-worker": {
+			"version": "30.1.0",
+			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-30.1.0.tgz",
+			"integrity": "sha512-uvWcSjlwAAgIu133Tt77A05H7RIk3Ho8tZL50bQM2AkvLdluw9NG48lRCl3Dt+MOH719n/0nnb5YxUwcuJiKRA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@types/node": "*",
+				"@ungap/structured-clone": "^1.3.0",
+				"jest-util": "30.0.5",
+				"merge-stream": "^2.0.0",
+				"supports-color": "^8.1.1"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-runtime/node_modules/minimatch": {
+			"version": "9.0.5",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+			"integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"brace-expansion": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=16 || 14 >=14.17"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
+		"node_modules/jest-runtime/node_modules/picomatch": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+			"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/jonschlinkert"
+			}
+		},
+		"node_modules/jest-runtime/node_modules/signal-exit": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+			"integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+			"dev": true,
+			"license": "ISC",
+			"engines": {
+				"node": ">=14"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
+		"node_modules/jest-runtime/node_modules/write-file-atomic": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz",
+			"integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"imurmurhash": "^0.1.4",
+				"signal-exit": "^4.0.1"
+			},
+			"engines": {
+				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-snapshot": {
+			"version": "30.1.1",
+			"resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-30.1.1.tgz",
+			"integrity": "sha512-7/iBEzoJqEt2TjkQY+mPLHP8cbPhLReZVkkxjTMzIzoTC4cZufg7HzKo/n9cIkXKj2LG0x3mmBHsZto+7TOmFg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/core": "^7.27.4",
+				"@babel/generator": "^7.27.5",
+				"@babel/plugin-syntax-jsx": "^7.27.1",
+				"@babel/plugin-syntax-typescript": "^7.27.1",
+				"@babel/types": "^7.27.3",
+				"@jest/expect-utils": "30.1.1",
+				"@jest/get-type": "30.1.0",
+				"@jest/snapshot-utils": "30.1.1",
+				"@jest/transform": "30.1.1",
+				"@jest/types": "30.0.5",
+				"babel-preset-current-node-syntax": "^1.1.0",
+				"chalk": "^4.1.2",
+				"expect": "30.1.1",
+				"graceful-fs": "^4.2.11",
+				"jest-diff": "30.1.1",
+				"jest-matcher-utils": "30.1.1",
+				"jest-message-util": "30.1.0",
+				"jest-util": "30.0.5",
+				"pretty-format": "30.0.5",
+				"semver": "^7.7.2",
+				"synckit": "^0.11.8"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-snapshot/node_modules/@jest/schemas": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
+			"integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@sinclair/typebox": "^0.34.0"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-snapshot/node_modules/@jest/transform": {
+			"version": "30.1.1",
+			"resolved": "https://registry.npmjs.org/@jest/transform/-/transform-30.1.1.tgz",
+			"integrity": "sha512-PHIA2AbAASBfk6evkNifvmx9lkOSkmvaQoO6VSpuL8+kQqDMHeDoJ7RU3YP1wWAMD7AyQn9UL5iheuFYCC4lqQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/core": "^7.27.4",
+				"@jest/types": "30.0.5",
+				"@jridgewell/trace-mapping": "^0.3.25",
+				"babel-plugin-istanbul": "^7.0.0",
+				"chalk": "^4.1.2",
+				"convert-source-map": "^2.0.0",
+				"fast-json-stable-stringify": "^2.1.0",
+				"graceful-fs": "^4.2.11",
+				"jest-haste-map": "30.1.0",
+				"jest-regex-util": "30.0.1",
+				"jest-util": "30.0.5",
+				"micromatch": "^4.0.8",
+				"pirates": "^4.0.7",
+				"slash": "^3.0.0",
+				"write-file-atomic": "^5.0.1"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-snapshot/node_modules/@jest/types": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.5.tgz",
+			"integrity": "sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/pattern": "30.0.1",
+				"@jest/schemas": "30.0.5",
+				"@types/istanbul-lib-coverage": "^2.0.6",
+				"@types/istanbul-reports": "^3.0.4",
+				"@types/node": "*",
+				"@types/yargs": "^17.0.33",
+				"chalk": "^4.1.2"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-snapshot/node_modules/@sinclair/typebox": {
+			"version": "0.34.40",
+			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.40.tgz",
+			"integrity": "sha512-gwBNIP8ZAYev/ORDWW0QvxdwPXwxBtLsdsJgSc7eDIRt8ubP+rxUBzPsrwnu16fgEF8Bx4lh/+mvQvJzcTM6Kw==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/jest-snapshot/node_modules/babel-plugin-istanbul": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-7.0.0.tgz",
+			"integrity": "sha512-C5OzENSx/A+gt7t4VH1I2XsflxyPUmXRFPKBxt33xncdOmq7oROVM3bZv9Ysjjkv8OJYDMa+tKuKMvqU/H3xdw==",
+			"dev": true,
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.0.0",
+				"@istanbuljs/load-nyc-config": "^1.0.0",
+				"@istanbuljs/schema": "^0.1.3",
+				"istanbul-lib-instrument": "^6.0.2",
+				"test-exclude": "^6.0.0"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/jest-snapshot/node_modules/ci-info": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.0.tgz",
+			"integrity": "sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/sibiraj-s"
+				}
+			],
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/jest-snapshot/node_modules/jest-haste-map": {
+			"version": "30.1.0",
+			"resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-30.1.0.tgz",
+			"integrity": "sha512-JLeM84kNjpRkggcGpQLsV7B8W4LNUWz7oDNVnY1Vjj22b5/fAb3kk3htiD+4Na8bmJmjJR7rBtS2Rmq/NEcADg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/types": "30.0.5",
+				"@types/node": "*",
+				"anymatch": "^3.1.3",
+				"fb-watchman": "^2.0.2",
+				"graceful-fs": "^4.2.11",
+				"jest-regex-util": "30.0.1",
+				"jest-util": "30.0.5",
+				"jest-worker": "30.1.0",
+				"micromatch": "^4.0.8",
+				"walker": "^1.0.8"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			},
+			"optionalDependencies": {
+				"fsevents": "^2.3.3"
+			}
+		},
+		"node_modules/jest-snapshot/node_modules/jest-regex-util": {
+			"version": "30.0.1",
+			"resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-30.0.1.tgz",
+			"integrity": "sha512-jHEQgBXAgc+Gh4g0p3bCevgRCVRkB4VB70zhoAE48gxeSr1hfUOsM/C2WoJgVL7Eyg//hudYENbm3Ne+/dRVVA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-snapshot/node_modules/jest-util": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-30.0.5.tgz",
+			"integrity": "sha512-pvyPWssDZR0FlfMxCBoc0tvM8iUEskaRFALUtGQYzVEAqisAztmy+R8LnU14KT4XA0H/a5HMVTXat1jLne010g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/types": "30.0.5",
+				"@types/node": "*",
+				"chalk": "^4.1.2",
+				"ci-info": "^4.2.0",
+				"graceful-fs": "^4.2.11",
+				"picomatch": "^4.0.2"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-snapshot/node_modules/jest-worker": {
+			"version": "30.1.0",
+			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-30.1.0.tgz",
+			"integrity": "sha512-uvWcSjlwAAgIu133Tt77A05H7RIk3Ho8tZL50bQM2AkvLdluw9NG48lRCl3Dt+MOH719n/0nnb5YxUwcuJiKRA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@types/node": "*",
+				"@ungap/structured-clone": "^1.3.0",
+				"jest-util": "30.0.5",
+				"merge-stream": "^2.0.0",
+				"supports-color": "^8.1.1"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-snapshot/node_modules/picomatch": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+			"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/jonschlinkert"
+			}
+		},
+		"node_modules/jest-snapshot/node_modules/signal-exit": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+			"integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+			"dev": true,
+			"license": "ISC",
+			"engines": {
+				"node": ">=14"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
+		"node_modules/jest-snapshot/node_modules/write-file-atomic": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz",
+			"integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"imurmurhash": "^0.1.4",
+				"signal-exit": "^4.0.1"
+			},
+			"engines": {
+				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
 			}
 		},
 		"node_modules/jest-util": {
@@ -4055,23 +7490,66 @@
 			}
 		},
 		"node_modules/jest-validate": {
-			"version": "29.7.0",
+			"version": "30.1.0",
+			"resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-30.1.0.tgz",
+			"integrity": "sha512-7P3ZlCFW/vhfQ8pE7zW6Oi4EzvuB4sgR72Q1INfW9m0FGo0GADYlPwIkf4CyPq7wq85g+kPMtPOHNAdWHeBOaA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@jest/types": "^29.6.3",
-				"camelcase": "^6.2.0",
-				"chalk": "^4.0.0",
-				"jest-get-type": "^29.6.3",
+				"@jest/get-type": "30.1.0",
+				"@jest/types": "30.0.5",
+				"camelcase": "^6.3.0",
+				"chalk": "^4.1.2",
 				"leven": "^3.1.0",
-				"pretty-format": "^29.7.0"
+				"pretty-format": "30.0.5"
 			},
 			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
 			}
 		},
+		"node_modules/jest-validate/node_modules/@jest/schemas": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
+			"integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@sinclair/typebox": "^0.34.0"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-validate/node_modules/@jest/types": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.5.tgz",
+			"integrity": "sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/pattern": "30.0.1",
+				"@jest/schemas": "30.0.5",
+				"@types/istanbul-lib-coverage": "^2.0.6",
+				"@types/istanbul-reports": "^3.0.4",
+				"@types/node": "*",
+				"@types/yargs": "^17.0.33",
+				"chalk": "^4.1.2"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-validate/node_modules/@sinclair/typebox": {
+			"version": "0.34.40",
+			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.40.tgz",
+			"integrity": "sha512-gwBNIP8ZAYev/ORDWW0QvxdwPXwxBtLsdsJgSc7eDIRt8ubP+rxUBzPsrwnu16fgEF8Bx4lh/+mvQvJzcTM6Kw==",
+			"dev": true,
+			"license": "MIT"
+		},
 		"node_modules/jest-validate/node_modules/camelcase": {
 			"version": "6.3.0",
+			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+			"integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -4082,27 +7560,117 @@
 			}
 		},
 		"node_modules/jest-watcher": {
-			"version": "29.7.0",
+			"version": "30.1.1",
+			"resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-30.1.1.tgz",
+			"integrity": "sha512-CrAQ73LlaS6KGQQw6NBi71g7qvP7scy+4+2c0jKX6+CWaYg85lZiig5nQQVTsS5a5sffNPL3uxXnaE9d7v9eQg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@jest/test-result": "^29.7.0",
-				"@jest/types": "^29.6.3",
+				"@jest/test-result": "30.1.1",
+				"@jest/types": "30.0.5",
 				"@types/node": "*",
-				"ansi-escapes": "^4.2.1",
-				"chalk": "^4.0.0",
+				"ansi-escapes": "^4.3.2",
+				"chalk": "^4.1.2",
 				"emittery": "^0.13.1",
-				"jest-util": "^29.7.0",
-				"string-length": "^4.0.1"
+				"jest-util": "30.0.5",
+				"string-length": "^4.0.2"
 			},
 			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-watcher/node_modules/@jest/schemas": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
+			"integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@sinclair/typebox": "^0.34.0"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-watcher/node_modules/@jest/types": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.5.tgz",
+			"integrity": "sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/pattern": "30.0.1",
+				"@jest/schemas": "30.0.5",
+				"@types/istanbul-lib-coverage": "^2.0.6",
+				"@types/istanbul-reports": "^3.0.4",
+				"@types/node": "*",
+				"@types/yargs": "^17.0.33",
+				"chalk": "^4.1.2"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-watcher/node_modules/@sinclair/typebox": {
+			"version": "0.34.40",
+			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.40.tgz",
+			"integrity": "sha512-gwBNIP8ZAYev/ORDWW0QvxdwPXwxBtLsdsJgSc7eDIRt8ubP+rxUBzPsrwnu16fgEF8Bx4lh/+mvQvJzcTM6Kw==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/jest-watcher/node_modules/ci-info": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.0.tgz",
+			"integrity": "sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/sibiraj-s"
+				}
+			],
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/jest-watcher/node_modules/jest-util": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-30.0.5.tgz",
+			"integrity": "sha512-pvyPWssDZR0FlfMxCBoc0tvM8iUEskaRFALUtGQYzVEAqisAztmy+R8LnU14KT4XA0H/a5HMVTXat1jLne010g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/types": "30.0.5",
+				"@types/node": "*",
+				"chalk": "^4.1.2",
+				"ci-info": "^4.2.0",
+				"graceful-fs": "^4.2.11",
+				"picomatch": "^4.0.2"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest-watcher/node_modules/picomatch": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+			"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/jonschlinkert"
 			}
 		},
 		"node_modules/jest-worker": {
 			"version": "29.7.0",
 			"dev": true,
 			"license": "MIT",
+			"optional": true,
+			"peer": true,
 			"dependencies": {
 				"@types/node": "*",
 				"jest-util": "^29.7.0",
@@ -4113,6 +7681,45 @@
 				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
 			}
 		},
+		"node_modules/jest/node_modules/@jest/schemas": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
+			"integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@sinclair/typebox": "^0.34.0"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest/node_modules/@jest/types": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.5.tgz",
+			"integrity": "sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@jest/pattern": "30.0.1",
+				"@jest/schemas": "30.0.5",
+				"@types/istanbul-lib-coverage": "^2.0.6",
+				"@types/istanbul-reports": "^3.0.4",
+				"@types/node": "*",
+				"@types/yargs": "^17.0.33",
+				"chalk": "^4.1.2"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/jest/node_modules/@sinclair/typebox": {
+			"version": "0.34.40",
+			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.40.tgz",
+			"integrity": "sha512-gwBNIP8ZAYev/ORDWW0QvxdwPXwxBtLsdsJgSc7eDIRt8ubP+rxUBzPsrwnu16fgEF8Bx4lh/+mvQvJzcTM6Kw==",
+			"dev": true,
+			"license": "MIT"
+		},
 		"node_modules/js-tokens": {
 			"version": "4.0.0",
 			"dev": true,
@@ -4131,6 +7738,8 @@
 		},
 		"node_modules/jsesc": {
 			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
+			"integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",
 			"dev": true,
 			"license": "MIT",
 			"bin": {
@@ -4198,16 +7807,10 @@
 				"node": ">=0.10.0"
 			}
 		},
-		"node_modules/kleur": {
-			"version": "3.0.3",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6"
-			}
-		},
 		"node_modules/leven": {
 			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
+			"integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -4228,6 +7831,8 @@
 		},
 		"node_modules/lines-and-columns": {
 			"version": "1.2.4",
+			"resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+			"integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -4283,6 +7888,8 @@
 		},
 		"node_modules/lru-cache": {
 			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+			"integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
 			"dev": true,
 			"license": "ISC",
 			"dependencies": {
@@ -4291,6 +7898,8 @@
 		},
 		"node_modules/make-dir": {
 			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
+			"integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4372,6 +7981,8 @@
 		},
 		"node_modules/mimic-fn": {
 			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+			"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -4457,6 +8068,16 @@
 				"node": "*"
 			}
 		},
+		"node_modules/minipass": {
+			"version": "7.1.2",
+			"resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+			"integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+			"dev": true,
+			"license": "ISC",
+			"engines": {
+				"node": ">=16 || 14 >=14.17"
+			}
+		},
 		"node_modules/moment": {
 			"version": "2.29.4",
 			"dev": true,
@@ -4487,6 +8108,22 @@
 				"node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
 			}
 		},
+		"node_modules/napi-postinstall": {
+			"version": "0.3.3",
+			"resolved": "https://registry.npmjs.org/napi-postinstall/-/napi-postinstall-0.3.3.tgz",
+			"integrity": "sha512-uTp172LLXSxuSYHv/kou+f6KW3SMppU9ivthaVTXian9sOt3XM/zHYHpRZiLgQoxeWfYUnslNWQHF1+G71xcow==",
+			"dev": true,
+			"license": "MIT",
+			"bin": {
+				"napi-postinstall": "lib/cli.js"
+			},
+			"engines": {
+				"node": "^12.20.0 || ^14.18.0 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://opencollective.com/napi-postinstall"
+			}
+		},
 		"node_modules/natural-compare": {
 			"version": "1.4.0",
 			"dev": true,
@@ -4546,6 +8183,8 @@
 		},
 		"node_modules/npm-run-path": {
 			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+			"integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4589,6 +8228,8 @@
 		},
 		"node_modules/onetime": {
 			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+			"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4677,6 +8318,13 @@
 				"node": ">=6"
 			}
 		},
+		"node_modules/package-json-from-dist": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
+			"integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
+			"dev": true,
+			"license": "BlueOak-1.0.0"
+		},
 		"node_modules/parent-module": {
 			"version": "1.0.1",
 			"dev": true,
@@ -4690,6 +8338,8 @@
 		},
 		"node_modules/parse-json": {
 			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+			"integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4734,6 +8384,30 @@
 			"dev": true,
 			"license": "MIT"
 		},
+		"node_modules/path-scurry": {
+			"version": "1.11.1",
+			"resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
+			"integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
+			"dev": true,
+			"license": "BlueOak-1.0.0",
+			"dependencies": {
+				"lru-cache": "^10.2.0",
+				"minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+			},
+			"engines": {
+				"node": ">=16 || 14 >=14.18"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
+		"node_modules/path-scurry/node_modules/lru-cache": {
+			"version": "10.4.3",
+			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+			"integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+			"dev": true,
+			"license": "ISC"
+		},
 		"node_modules/picocolors": {
 			"version": "1.1.1",
 			"dev": true,
@@ -4939,20 +8613,44 @@
 			}
 		},
 		"node_modules/pretty-format": {
-			"version": "29.7.0",
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-30.0.5.tgz",
+			"integrity": "sha512-D1tKtYvByrBkFLe2wHJl2bwMJIiT8rW+XA+TiataH79/FszLQMrpGEvzUVkzPau7OCO0Qnrhpe87PqtOAIB8Yw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@jest/schemas": "^29.6.3",
-				"ansi-styles": "^5.0.0",
-				"react-is": "^18.0.0"
+				"@jest/schemas": "30.0.5",
+				"ansi-styles": "^5.2.0",
+				"react-is": "^18.3.1"
 			},
 			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
 			}
 		},
+		"node_modules/pretty-format/node_modules/@jest/schemas": {
+			"version": "30.0.5",
+			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
+			"integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@sinclair/typebox": "^0.34.0"
+			},
+			"engines": {
+				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+			}
+		},
+		"node_modules/pretty-format/node_modules/@sinclair/typebox": {
+			"version": "0.34.40",
+			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.40.tgz",
+			"integrity": "sha512-gwBNIP8ZAYev/ORDWW0QvxdwPXwxBtLsdsJgSc7eDIRt8ubP+rxUBzPsrwnu16fgEF8Bx4lh/+mvQvJzcTM6Kw==",
+			"dev": true,
+			"license": "MIT"
+		},
 		"node_modules/pretty-format/node_modules/ansi-styles": {
 			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+			"integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -4962,18 +8660,6 @@
 				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
 			}
 		},
-		"node_modules/prompts": {
-			"version": "2.4.2",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"kleur": "^3.0.3",
-				"sisteransi": "^1.0.5"
-			},
-			"engines": {
-				"node": ">= 6"
-			}
-		},
 		"node_modules/punycode": {
 			"version": "2.3.1",
 			"dev": true,
@@ -4983,7 +8669,9 @@
 			}
 		},
 		"node_modules/pure-rand": {
-			"version": "6.1.0",
+			"version": "7.0.1",
+			"resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-7.0.1.tgz",
+			"integrity": "sha512-oTUZM/NAZS8p7ANR3SHh30kXB+zK2r2BPcEn/awJIbOvq82WoMN4p62AWWp3Hhw50G0xMsw1mhIBLqHw64EcNQ==",
 			"dev": true,
 			"funding": [
 				{
@@ -5042,6 +8730,8 @@
 		},
 		"node_modules/react-is": {
 			"version": "18.3.1",
+			"resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
+			"integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -5166,14 +8856,6 @@
 			"dev": true,
 			"license": "MIT"
 		},
-		"node_modules/resolve.exports": {
-			"version": "2.0.3",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=10"
-			}
-		},
 		"node_modules/reusify": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz",
@@ -5446,11 +9128,6 @@
 			"dev": true,
 			"license": "ISC"
 		},
-		"node_modules/sisteransi": {
-			"version": "1.0.5",
-			"dev": true,
-			"license": "MIT"
-		},
 		"node_modules/slash": {
 			"version": "3.0.0",
 			"dev": true,
@@ -5477,6 +9154,8 @@
 		},
 		"node_modules/source-map-support": {
 			"version": "0.5.13",
+			"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
+			"integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5491,6 +9170,8 @@
 		},
 		"node_modules/stack-utils": {
 			"version": "2.0.6",
+			"resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
+			"integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5502,6 +9183,8 @@
 		},
 		"node_modules/stack-utils/node_modules/escape-string-regexp": {
 			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+			"integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -5510,6 +9193,8 @@
 		},
 		"node_modules/string-length": {
 			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
+			"integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -5533,6 +9218,22 @@
 				"node": ">=8"
 			}
 		},
+		"node_modules/string-width-cjs": {
+			"name": "string-width",
+			"version": "4.2.3",
+			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"emoji-regex": "^8.0.0",
+				"is-fullwidth-code-point": "^3.0.0",
+				"strip-ansi": "^6.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
 		"node_modules/strip-ansi": {
 			"version": "6.0.1",
 			"dev": true,
@@ -5544,8 +9245,24 @@
 				"node": ">=8"
 			}
 		},
+		"node_modules/strip-ansi-cjs": {
+			"name": "strip-ansi",
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+			"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-regex": "^5.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
 		"node_modules/strip-bom": {
 			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
+			"integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -5554,6 +9271,8 @@
 		},
 		"node_modules/strip-final-newline": {
 			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+			"integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -5606,6 +9325,22 @@
 			"resolved": "sync-client",
 			"link": true
 		},
+		"node_modules/synckit": {
+			"version": "0.11.11",
+			"resolved": "https://registry.npmjs.org/synckit/-/synckit-0.11.11.tgz",
+			"integrity": "sha512-MeQTA1r0litLUf0Rp/iisCaL8761lKAZHaimlbGK4j0HysC4PLfqygQj9srcs0m2RdtDYnF8UuYyKpbjHYp7Jw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@pkgr/core": "^0.2.9"
+			},
+			"engines": {
+				"node": "^14.18.0 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://opencollective.com/synckit"
+			}
+		},
 		"node_modules/tapable": {
 			"version": "2.2.1",
 			"dev": true,
@@ -5893,6 +9628,8 @@
 		},
 		"node_modules/type-detect": {
 			"version": "4.0.8",
+			"resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+			"integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -5901,6 +9638,8 @@
 		},
 		"node_modules/type-fest": {
 			"version": "0.21.3",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+			"integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
 			"dev": true,
 			"license": "(MIT OR CC0-1.0)",
 			"engines": {
@@ -5959,6 +9698,41 @@
 				"node": ">= 10.0.0"
 			}
 		},
+		"node_modules/unrs-resolver": {
+			"version": "1.11.1",
+			"resolved": "https://registry.npmjs.org/unrs-resolver/-/unrs-resolver-1.11.1.tgz",
+			"integrity": "sha512-bSjt9pjaEBnNiGgc9rUiHGKv5l4/TGzDmYw3RhnkJGtLhbnnA/5qJj7x3dNDCRx/PJxu774LlH8lCOlB4hEfKg==",
+			"dev": true,
+			"hasInstallScript": true,
+			"license": "MIT",
+			"dependencies": {
+				"napi-postinstall": "^0.3.0"
+			},
+			"funding": {
+				"url": "https://opencollective.com/unrs-resolver"
+			},
+			"optionalDependencies": {
+				"@unrs/resolver-binding-android-arm-eabi": "1.11.1",
+				"@unrs/resolver-binding-android-arm64": "1.11.1",
+				"@unrs/resolver-binding-darwin-arm64": "1.11.1",
+				"@unrs/resolver-binding-darwin-x64": "1.11.1",
+				"@unrs/resolver-binding-freebsd-x64": "1.11.1",
+				"@unrs/resolver-binding-linux-arm-gnueabihf": "1.11.1",
+				"@unrs/resolver-binding-linux-arm-musleabihf": "1.11.1",
+				"@unrs/resolver-binding-linux-arm64-gnu": "1.11.1",
+				"@unrs/resolver-binding-linux-arm64-musl": "1.11.1",
+				"@unrs/resolver-binding-linux-ppc64-gnu": "1.11.1",
+				"@unrs/resolver-binding-linux-riscv64-gnu": "1.11.1",
+				"@unrs/resolver-binding-linux-riscv64-musl": "1.11.1",
+				"@unrs/resolver-binding-linux-s390x-gnu": "1.11.1",
+				"@unrs/resolver-binding-linux-x64-gnu": "1.11.1",
+				"@unrs/resolver-binding-linux-x64-musl": "1.11.1",
+				"@unrs/resolver-binding-wasm32-wasi": "1.11.1",
+				"@unrs/resolver-binding-win32-arm64-msvc": "1.11.1",
+				"@unrs/resolver-binding-win32-ia32-msvc": "1.11.1",
+				"@unrs/resolver-binding-win32-x64-msvc": "1.11.1"
+			}
+		},
 		"node_modules/update-browserslist-db": {
 			"version": "1.1.3",
 			"dev": true,
@@ -6045,6 +9819,8 @@
 		},
 		"node_modules/v8-to-istanbul": {
 			"version": "9.3.0",
+			"resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz",
+			"integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==",
 			"dev": true,
 			"license": "ISC",
 			"dependencies": {
@@ -6327,6 +10103,25 @@
 				"url": "https://github.com/chalk/wrap-ansi?sponsor=1"
 			}
 		},
+		"node_modules/wrap-ansi-cjs": {
+			"name": "wrap-ansi",
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+			"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-styles": "^4.0.0",
+				"string-width": "^4.1.0",
+				"strip-ansi": "^6.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+			}
+		},
 		"node_modules/wrappy": {
 			"version": "1.0.2",
 			"dev": true,
@@ -6336,6 +10131,8 @@
 			"version": "4.0.2",
 			"dev": true,
 			"license": "ISC",
+			"optional": true,
+			"peer": true,
 			"dependencies": {
 				"imurmurhash": "^0.1.4",
 				"signal-exit": "^3.0.7"
@@ -6374,6 +10171,8 @@
 		},
 		"node_modules/yallist": {
 			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+			"integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
 			"dev": true,
 			"license": "ISC"
 		},
@@ -6418,13 +10217,13 @@
 			"version": "0.6.1",
 			"license": "MIT",
 			"devDependencies": {
-				"@types/jest": "^29.5.14",
+				"@types/jest": "^30.0.0",
 				"@types/node": "^22.15.30",
 				"css-loader": "^7.1.2",
 				"date-fns": "^4.1.0",
 				"file-loader": "^6.2.0",
 				"fs-extra": "^11.3.0",
-				"jest": "^29.7.0",
+				"jest": "^30.1.1",
 				"mini-css-extract-plugin": "^2.9.2",
 				"obsidian": "1.8.7",
 				"reconcile-text": "^0.5.0",
@@ -6453,9 +10252,9 @@
 				"uuid": "^11.1.0"
 			},
 			"devDependencies": {
-				"@types/jest": "^29.5.14",
+				"@types/jest": "^30.0.0",
 				"@types/node": "^22.15.30",
-				"jest": "^29.7.0",
+				"jest": "^30.1.1",
 				"ts-jest": "^29.3.4",
 				"ts-loader": "^9.5.2",
 				"tslib": "2.8.1",
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index b44ac8cc..c196e56d 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -20,9 +20,9 @@
         "reconcile-text": "^0.5.0"
     },
     "devDependencies": {
-        "@types/jest": "^29.5.14",
+        "@types/jest": "^30.0.0",
         "@types/node": "^22.15.30",
-        "jest": "^29.7.0",
+        "jest": "^30.1.1",
         "ts-jest": "^29.3.4",
         "ts-loader": "^9.5.2",
         "tslib": "2.8.1",

From b2f4e0c038c81560a8de75ae4939b88fd0efeadd Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Wed, 27 Aug 2025 22:31:29 +0100
Subject: [PATCH 556/761] Show files open by other users

---
 .../obsidian-plugin/src/vault-link-plugin.ts  |  2 +
 .../src/views/cursors/file-explorer.scss      | 15 ++++++
 .../src/views/cursors/file-explorer.ts        | 52 +++++++++++++++++++
 3 files changed, 69 insertions(+)
 create mode 100644 frontend/obsidian-plugin/src/views/cursors/file-explorer.scss
 create mode 100644 frontend/obsidian-plugin/src/views/cursors/file-explorer.ts

diff --git a/frontend/obsidian-plugin/src/vault-link-plugin.ts b/frontend/obsidian-plugin/src/vault-link-plugin.ts
index 7e0eff1b..90ab1a73 100644
--- a/frontend/obsidian-plugin/src/vault-link-plugin.ts
+++ b/frontend/obsidian-plugin/src/vault-link-plugin.ts
@@ -24,6 +24,7 @@ import {
 import { LocalCursorUpdateListener } from "./views/cursors/local-cursor-update-listener";
 import { slowFetchFactory } from "./debugging/slow-fetch-factory";
 import { flakyWebSocketFactory } from "./debugging/flaky-websocket-factory";
+import { renderCursorsInFileExplorer } from "./views/cursors/file-explorer";
 
 const MIN_WAIT_BETWEEN_UPDATES_IN_MS = 250;
 
@@ -94,6 +95,7 @@ export default class VaultLinkPlugin extends Plugin {
 
 		this.client.addRemoteCursorsUpdateListener((cursors) => {
 			RemoteCursorsPluginValue.setCursors(cursors, this.app);
+			renderCursorsInFileExplorer(cursors, this.app);
 		});
 
 		const cursorListener = new LocalCursorUpdateListener(
diff --git a/frontend/obsidian-plugin/src/views/cursors/file-explorer.scss b/frontend/obsidian-plugin/src/views/cursors/file-explorer.scss
new file mode 100644
index 00000000..45759019
--- /dev/null
+++ b/frontend/obsidian-plugin/src/views/cursors/file-explorer.scss
@@ -0,0 +1,15 @@
+.remote-users {
+    display: flex;
+    flex-wrap: wrap;
+    gap: var(--size-4-2);
+    margin-left: var(--size-4-2);
+
+    span {
+        border-radius: var(--radius-l);
+        padding: 0 var(--size-4-1);
+        border-width: 1px;
+        border-style: solid;
+        font-size: var(--font-smallest);
+        font-style: italic;
+    }
+}
\ No newline at end of file
diff --git a/frontend/obsidian-plugin/src/views/cursors/file-explorer.ts b/frontend/obsidian-plugin/src/views/cursors/file-explorer.ts
new file mode 100644
index 00000000..cfeb11f5
--- /dev/null
+++ b/frontend/obsidian-plugin/src/views/cursors/file-explorer.ts
@@ -0,0 +1,52 @@
+import "./file-explorer.scss";
+
+import type { App, View } from "obsidian";
+import { getRandomColor } from "src/utils/get-random-color";
+import type { MaybeOutdatedClientCursors, RelativePath } from "sync-client";
+
+const REMOTE_USER_CONTAINER_CLASS = "remote-users";
+
+export function renderCursorsInFileExplorer(
+	cursors: MaybeOutdatedClientCursors[],
+	app: App
+): void {
+	const fileExplorers = app.workspace.getLeavesOfType("file-explorer");
+	if (fileExplorers.length == 0) return;
+
+	const [fileExplorer] = fileExplorers;
+
+	// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+	const fileExplorerView: View & {
+		fileItems: Record<RelativePath, { el: Element }>; // it's an internal API
+	} = fileExplorer.view as any; // eslint-disable-line
+
+	for (const key in fileExplorerView.fileItems) {
+		const element =
+			fileExplorerView.fileItems[key].el.querySelector(".tree-item-self");
+
+		const customElement = createDiv(
+			{
+				cls: REMOTE_USER_CONTAINER_CLASS
+			},
+			(parent) => {
+				cursors.forEach((cursor) => {
+					cursor.documentsWithCursors.forEach((document) => {
+						if (document.relative_path === key) {
+							parent.appendChild(
+								createSpan({
+									text: cursor.userName,
+									attr: {
+										style: `border-color: ${getRandomColor(cursor.userName)}`
+									}
+								})
+							);
+						}
+					});
+				});
+			}
+		);
+
+		element?.querySelector("." + REMOTE_USER_CONTAINER_CLASS)?.remove();
+		element?.appendChild(customElement);
+	}
+}

From 37ca507ae49f5562453d7592d850cdab60fa0d18 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Wed, 27 Aug 2025 22:32:52 +0100
Subject: [PATCH 557/761] Add Claude file

---
 CLAUDE.md | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 99 insertions(+)
 create mode 100644 CLAUDE.md

diff --git a/CLAUDE.md b/CLAUDE.md
new file mode 100644
index 00000000..e05e784a
--- /dev/null
+++ b/CLAUDE.md
@@ -0,0 +1,99 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## Project Overview
+
+VaultLink is a self-hosted Obsidian plugin for real-time collaborative file syncing. The project consists of a Rust-based sync server and a TypeScript frontend with three main components: an Obsidian plugin, a sync client library, and a test client.
+
+## Architecture
+
+### Core Components
+
+- **sync-server/**: Rust-based WebSocket server with SQLite database for document versioning and real-time synchronization
+- **frontend/sync-client/**: TypeScript library providing core sync functionality, WebSocket management, and file operations
+- **frontend/obsidian-plugin/**: Obsidian plugin that integrates the sync client with Obsidian's API
+- **frontend/test-client/**: CLI testing tool for the sync functionality
+
+### Key Technologies
+
+- **Backend**: Rust with Axum framework, SQLite with SQLx, WebSockets for real-time sync
+- **Frontend**: TypeScript, Webpack for bundling, Jest for testing
+- **Sync Algorithm**: Uses reconcile-text library for operational transformation
+
+## Development Commands
+
+### Server Development
+```bash
+cd sync-server
+cargo run config-e2e.yml  # Start development server
+cargo test --verbose      # Run Rust tests
+cargo clippy --all-targets --all-features  # Lint Rust code
+cargo fmt --all -- --check  # Check Rust formatting
+```
+
+### Frontend Development
+```bash
+cd frontend
+npm run dev      # Start development mode (watches sync-client and obsidian-plugin)
+npm run build    # Build all workspaces
+npm run test     # Run all tests
+npm run lint     # Lint and format TypeScript code
+```
+
+### Database Setup (Development)
+```bash
+cd sync-server
+sqlx database create --database-url sqlite://db.sqlite3
+sqlx migrate run --source src/app_state/database/migrations --database-url sqlite://db.sqlite3
+cargo sqlx prepare --workspace
+```
+
+### Scripts
+- `scripts/check.sh`: Full CI check (builds, lints, tests both server and frontend)
+- `scripts/e2e.sh`: End-to-end testing
+- `scripts/clean-up.sh`: Clean logs and database files
+- `scripts/bump-version.sh patch`: Publish new version
+- `scripts/update-api-types.sh`: Update TypeScript bindings from Rust types
+
+## Code Structure
+
+### Workspace Configuration
+The frontend uses npm workspaces with three packages:
+- `sync-client`: Core synchronization logic
+- `obsidian-plugin`: Obsidian-specific integration
+- `test-client`: Testing utilities
+
+### Type Generation
+Rust structs generate TypeScript types via ts-rs crate, stored in `sync-server/bindings/` and used by frontend packages.
+
+### Key Files
+- `sync-server/src/`: Rust server implementation with WebSocket handlers
+- `frontend/sync-client/src/sync-client.ts`: Main sync client entry point
+- `frontend/obsidian-plugin/src/vault-link-plugin.ts`: Main Obsidian plugin class
+- `frontend/sync-client/src/services/sync-service.ts`: Core synchronization logic
+
+## Testing
+
+### Running Tests
+- Server: `cargo test --verbose` 
+- Frontend: `npm run test` (runs Jest across all workspaces)
+- E2E: `scripts/e2e.sh`
+
+### Test Structure
+- Rust: Unit tests alongside source files
+- TypeScript: `.test.ts` files using Jest
+- E2E: Uses test-client to simulate multiple concurrent users
+
+## Code Style
+
+### Rust
+- Uses extensive Clippy lints (see Cargo.toml)
+- Follows pedantic linting rules
+- Forbids unsafe code
+- Uses cargo fmt with default settings
+
+### TypeScript
+- Prettier configuration: 4-space tabs, trailing commas removed, LF line endings
+- ESLint with unused imports plugin
+- Consistent across all three frontend packages
\ No newline at end of file

From 36f2dc0d43fe550a488bd2a0bc09735afb4e3f09 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Wed, 27 Aug 2025 22:33:02 +0100
Subject: [PATCH 558/761] Bump versions to 0.6.2

---
 frontend/obsidian-plugin/manifest.json | 2 +-
 frontend/obsidian-plugin/package.json  | 2 +-
 frontend/package-lock.json             | 6 +++---
 frontend/sync-client/package.json      | 2 +-
 frontend/test-client/package.json      | 2 +-
 manifest.json                          | 2 +-
 sync-server/Cargo.lock                 | 2 +-
 sync-server/Cargo.toml                 | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/frontend/obsidian-plugin/manifest.json b/frontend/obsidian-plugin/manifest.json
index a15afeab..6ca4b64c 100644
--- a/frontend/obsidian-plugin/manifest.json
+++ b/frontend/obsidian-plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.6.1",
+	"version": "0.6.2",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index 66828a64..7fc419ce 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -1,6 +1,6 @@
 {
     "name": "vault-link-obsidian-plugin",
-    "version": "0.6.1",
+    "version": "0.6.2",
     "description": "This is a sample plugin for Obsidian (https://obsidian.md)",
     "main": "main.js",
     "scripts": {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 2d23f3be..e46d2702 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -10214,7 +10214,7 @@
 		},
 		"obsidian-plugin": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.6.1",
+			"version": "0.6.2",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^30.0.0",
@@ -10243,7 +10243,7 @@
 			}
 		},
 		"sync-client": {
-			"version": "0.6.1",
+			"version": "0.6.2",
 			"dependencies": {
 				"byte-base64": "^1.1.0",
 				"minimatch": "^10.0.1",
@@ -10286,7 +10286,7 @@
 			}
 		},
 		"test-client": {
-			"version": "0.6.1",
+			"version": "0.6.2",
 			"bin": {
 				"test-client": "dist/cli.js"
 			},
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index c196e56d..05f78d6a 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "sync-client",
-    "version": "0.6.1",
+    "version": "0.6.2",
     "main": "dist/sync-client.node.js",
     "browser": "dist/sync-client.web.js",
     "types": "dist/types/index.d.ts",
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index dc5d2d44..6b8f45c5 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "test-client",
-    "version": "0.6.1",
+    "version": "0.6.2",
     "private": true,
     "bin": {
         "test-client": "./dist/cli.js"
diff --git a/manifest.json b/manifest.json
index a15afeab..6ca4b64c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.6.1",
+	"version": "0.6.2",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/sync-server/Cargo.lock b/sync-server/Cargo.lock
index 7bcdcb6b..ed17c0f6 100644
--- a/sync-server/Cargo.lock
+++ b/sync-server/Cargo.lock
@@ -2205,7 +2205,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.6.1"
+version = "0.6.2"
 dependencies = [
  "anyhow",
  "axum",
diff --git a/sync-server/Cargo.toml b/sync-server/Cargo.toml
index 7565adde..63fc5ebf 100644
--- a/sync-server/Cargo.toml
+++ b/sync-server/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.6.1"
+version = "0.6.2"
 
 [dependencies]
 serde = { version = "1.0.219", default-features = false, features = ["derive"] }

From 2f251f72fc549dddbc9c907f042b8bb664693412 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 27 Aug 2025 22:33:11 +0100
Subject: [PATCH 559/761] Bump alpine from 3.22.0 to 3.22.1 in /sync-server
 (#88)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 sync-server/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sync-server/Dockerfile b/sync-server/Dockerfile
index 00d05ea5..bf6fb604 100644
--- a/sync-server/Dockerfile
+++ b/sync-server/Dockerfile
@@ -13,7 +13,7 @@ RUN sqlx migrate run --source src/app_state/database/migrations --database-url s
 RUN cargo build --release --target x86_64-unknown-linux-musl
 
 # Runtime image
-FROM alpine:3.22.0
+FROM alpine:3.22.1
 
 LABEL org.opencontainers.image.authors="andras@schmelczer.dev"
 

From 606b674a986fdbcb7cb871c50353060f6047af89 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 27 Aug 2025 22:33:18 +0100
Subject: [PATCH 560/761] Bump @eslint/plugin-kit from 0.3.1 to 0.3.3 in
 /frontend in the npm_and_yarn group across 1 directory (#89)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 frontend/package-lock.json | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index e46d2702..f261af2c 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -687,17 +687,32 @@
 			}
 		},
 		"node_modules/@eslint/plugin-kit": {
-			"version": "0.3.1",
+			"version": "0.3.5",
+			"resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.5.tgz",
+			"integrity": "sha512-Z5kJ+wU3oA7MMIqVR9tyZRtjYPr4OC004Q4Rw7pgOKUOKkJfZ3O24nz3WYfGRpMDNmcOi3TwQOmgm7B7Tpii0w==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"dependencies": {
-				"@eslint/core": "^0.14.0",
+				"@eslint/core": "^0.15.2",
 				"levn": "^0.4.1"
 			},
 			"engines": {
 				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
 			}
 		},
+		"node_modules/@eslint/plugin-kit/node_modules/@eslint/core": {
+			"version": "0.15.2",
+			"resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.15.2.tgz",
+			"integrity": "sha512-78Md3/Rrxh83gCxoUc0EiciuOHsIITzLy53m3d9UyiW8y9Dj2D29FeETqyKA+BRK76tnTp6RXWb3pCay8Oyomg==",
+			"dev": true,
+			"license": "Apache-2.0",
+			"dependencies": {
+				"@types/json-schema": "^7.0.15"
+			},
+			"engines": {
+				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+			}
+		},
 		"node_modules/@humanfs/core": {
 			"version": "0.19.1",
 			"dev": true,

From 524de60585d54273551ec00490ddab3a9f506cf1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 28 Aug 2025 19:18:12 +0100
Subject: [PATCH 561/761] Bump ws from 8.18.2 to 8.18.3 in /frontend (#109)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 frontend/package-lock.json        | 6 ++++--
 frontend/sync-client/package.json | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index f261af2c..2681c05a 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -10157,7 +10157,9 @@
 			}
 		},
 		"node_modules/ws": {
-			"version": "8.18.2",
+			"version": "8.18.3",
+			"resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz",
+			"integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -10277,7 +10279,7 @@
 				"webpack": "^5.99.9",
 				"webpack-cli": "^6.0.1",
 				"webpack-merge": "^6.0.1",
-				"ws": "^8.18.2"
+				"ws": "^8.18.3"
 			}
 		},
 		"sync-client/node_modules/brace-expansion": {
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index 05f78d6a..a16cad8d 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -30,6 +30,6 @@
         "webpack": "^5.99.9",
         "webpack-cli": "^6.0.1",
         "webpack-merge": "^6.0.1",
-        "ws": "^8.18.2"
+        "ws": "^8.18.3"
     }
 }

From 47f4ddfc63e82b35b4ee961c36f13a0a76536379 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 28 Aug 2025 19:18:29 +0100
Subject: [PATCH 562/761] Bump ts-jest from 29.3.4 to 29.4.1 in /frontend
 (#107)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 frontend/obsidian-plugin/package.json |   2 +-
 frontend/package-lock.json            | 151 +++++++++++++-------------
 frontend/sync-client/package.json     |   2 +-
 3 files changed, 80 insertions(+), 75 deletions(-)

diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index 7fc419ce..8a99a2ac 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -27,7 +27,7 @@
         "sass-loader": "^16.0.5",
         "sync-client": "file:../sync-client",
         "terser-webpack-plugin": "^5.3.14",
-        "ts-jest": "^29.3.4",
+        "ts-jest": "^29.4.1",
         "ts-loader": "^9.5.2",
         "tslib": "2.8.1",
         "typescript": "5.8.3",
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 2681c05a..1fdb9751 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1920,6 +1920,8 @@
 			"version": "29.6.3",
 			"dev": true,
 			"license": "MIT",
+			"optional": true,
+			"peer": true,
 			"dependencies": {
 				"@sinclair/typebox": "^0.27.8"
 			},
@@ -2237,6 +2239,8 @@
 			"version": "29.6.3",
 			"dev": true,
 			"license": "MIT",
+			"optional": true,
+			"peer": true,
 			"dependencies": {
 				"@jest/schemas": "^29.6.3",
 				"@types/istanbul-lib-coverage": "^2.0.0",
@@ -2450,7 +2454,9 @@
 		"node_modules/@sinclair/typebox": {
 			"version": "0.27.8",
 			"dev": true,
-			"license": "MIT"
+			"license": "MIT",
+			"optional": true,
+			"peer": true
 		},
 		"node_modules/@sinonjs/commons": {
 			"version": "3.0.1",
@@ -3493,11 +3499,6 @@
 			"dev": true,
 			"license": "Python-2.0"
 		},
-		"node_modules/async": {
-			"version": "3.2.6",
-			"dev": true,
-			"license": "MIT"
-		},
 		"node_modules/babel-jest": {
 			"version": "29.7.0",
 			"dev": true,
@@ -3855,6 +3856,8 @@
 				}
 			],
 			"license": "MIT",
+			"optional": true,
+			"peer": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -4120,20 +4123,6 @@
 			"dev": true,
 			"license": "MIT"
 		},
-		"node_modules/ejs": {
-			"version": "3.1.10",
-			"dev": true,
-			"license": "Apache-2.0",
-			"dependencies": {
-				"jake": "^10.8.5"
-			},
-			"bin": {
-				"ejs": "bin/cli.js"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
 		"node_modules/electron-to-chromium": {
 			"version": "1.5.127",
 			"dev": true,
@@ -4682,33 +4671,6 @@
 				"webpack": "^4.0.0 || ^5.0.0"
 			}
 		},
-		"node_modules/filelist": {
-			"version": "1.0.4",
-			"dev": true,
-			"license": "Apache-2.0",
-			"dependencies": {
-				"minimatch": "^5.0.1"
-			}
-		},
-		"node_modules/filelist/node_modules/brace-expansion": {
-			"version": "2.0.1",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"balanced-match": "^1.0.0"
-			}
-		},
-		"node_modules/filelist/node_modules/minimatch": {
-			"version": "5.1.6",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"brace-expansion": "^2.0.1"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
 		"node_modules/fill-range": {
 			"version": "7.1.1",
 			"dev": true,
@@ -4970,6 +4932,28 @@
 			"dev": true,
 			"license": "MIT"
 		},
+		"node_modules/handlebars": {
+			"version": "4.7.8",
+			"resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz",
+			"integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"minimist": "^1.2.5",
+				"neo-async": "^2.6.2",
+				"source-map": "^0.6.1",
+				"wordwrap": "^1.0.0"
+			},
+			"bin": {
+				"handlebars": "bin/handlebars"
+			},
+			"engines": {
+				"node": ">=0.4.7"
+			},
+			"optionalDependencies": {
+				"uglify-js": "^3.1.4"
+			}
+		},
 		"node_modules/has-flag": {
 			"version": "4.0.0",
 			"dev": true,
@@ -5305,23 +5289,6 @@
 				"@pkgjs/parseargs": "^0.11.0"
 			}
 		},
-		"node_modules/jake": {
-			"version": "10.9.2",
-			"dev": true,
-			"license": "Apache-2.0",
-			"dependencies": {
-				"async": "^3.2.3",
-				"chalk": "^4.0.2",
-				"filelist": "^1.0.4",
-				"minimatch": "^3.1.2"
-			},
-			"bin": {
-				"jake": "bin/cli.js"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
 		"node_modules/jest": {
 			"version": "30.1.1",
 			"resolved": "https://registry.npmjs.org/jest/-/jest-30.1.1.tgz",
@@ -7492,6 +7459,8 @@
 			"version": "29.7.0",
 			"dev": true,
 			"license": "MIT",
+			"optional": true,
+			"peer": true,
 			"dependencies": {
 				"@jest/types": "^29.6.3",
 				"@types/node": "*",
@@ -8083,6 +8052,16 @@
 				"node": "*"
 			}
 		},
+		"node_modules/minimist": {
+			"version": "1.2.8",
+			"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+			"integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+			"dev": true,
+			"license": "MIT",
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
 		"node_modules/minipass": {
 			"version": "7.1.2",
 			"resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
@@ -9540,14 +9519,15 @@
 			}
 		},
 		"node_modules/ts-jest": {
-			"version": "29.3.4",
+			"version": "29.4.1",
+			"resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.4.1.tgz",
+			"integrity": "sha512-SaeUtjfpg9Uqu8IbeDKtdaS0g8lS6FT6OzM3ezrDfErPJPHNDo/Ey+VFGP1bQIDfagYDLyRpd7O15XpG1Es2Uw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"bs-logger": "^0.2.6",
-				"ejs": "^3.1.10",
 				"fast-json-stable-stringify": "^2.1.0",
-				"jest-util": "^29.0.0",
+				"handlebars": "^4.7.8",
 				"json5": "^2.2.3",
 				"lodash.memoize": "^4.1.2",
 				"make-error": "^1.3.6",
@@ -9563,10 +9543,11 @@
 			},
 			"peerDependencies": {
 				"@babel/core": ">=7.0.0-beta.0 <8",
-				"@jest/transform": "^29.0.0",
-				"@jest/types": "^29.0.0",
-				"babel-jest": "^29.0.0",
-				"jest": "^29.0.0",
+				"@jest/transform": "^29.0.0 || ^30.0.0",
+				"@jest/types": "^29.0.0 || ^30.0.0",
+				"babel-jest": "^29.0.0 || ^30.0.0",
+				"jest": "^29.0.0 || ^30.0.0",
+				"jest-util": "^29.0.0 || ^30.0.0",
 				"typescript": ">=4.3 <6"
 			},
 			"peerDependenciesMeta": {
@@ -9584,6 +9565,9 @@
 				},
 				"esbuild": {
 					"optional": true
+				},
+				"jest-util": {
+					"optional": true
 				}
 			}
 		},
@@ -9700,6 +9684,20 @@
 				"typescript": ">=4.8.4 <6.0.0"
 			}
 		},
+		"node_modules/uglify-js": {
+			"version": "3.19.3",
+			"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz",
+			"integrity": "sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==",
+			"dev": true,
+			"license": "BSD-2-Clause",
+			"optional": true,
+			"bin": {
+				"uglifyjs": "bin/uglifyjs"
+			},
+			"engines": {
+				"node": ">=0.8.0"
+			}
+		},
 		"node_modules/undici-types": {
 			"version": "6.21.0",
 			"dev": true,
@@ -10102,6 +10100,13 @@
 				"node": ">=0.10.0"
 			}
 		},
+		"node_modules/wordwrap": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
+			"integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==",
+			"dev": true,
+			"license": "MIT"
+		},
 		"node_modules/wrap-ansi": {
 			"version": "7.0.0",
 			"dev": true,
@@ -10249,7 +10254,7 @@
 				"sass-loader": "^16.0.5",
 				"sync-client": "file:../sync-client",
 				"terser-webpack-plugin": "^5.3.14",
-				"ts-jest": "^29.3.4",
+				"ts-jest": "^29.4.1",
 				"ts-loader": "^9.5.2",
 				"tslib": "2.8.1",
 				"typescript": "5.8.3",
@@ -10272,7 +10277,7 @@
 				"@types/jest": "^30.0.0",
 				"@types/node": "^22.15.30",
 				"jest": "^30.1.1",
-				"ts-jest": "^29.3.4",
+				"ts-jest": "^29.4.1",
 				"ts-loader": "^9.5.2",
 				"tslib": "2.8.1",
 				"typescript": "5.8.3",
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index a16cad8d..712942b8 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -23,7 +23,7 @@
         "@types/jest": "^30.0.0",
         "@types/node": "^22.15.30",
         "jest": "^30.1.1",
-        "ts-jest": "^29.3.4",
+        "ts-jest": "^29.4.1",
         "ts-loader": "^9.5.2",
         "tslib": "2.8.1",
         "typescript": "5.8.3",

From 376008de54e67b4854dc535c612d0f7b6303abc0 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 28 Aug 2025 21:55:43 +0100
Subject: [PATCH 563/761] Improve editor sync status line

---
 .../obsidian-plugin/src/vault-link-plugin.ts  |  20 ++-
 .../editor-status-display-manager.scss}       |   0
 .../editor-status-display-manager.ts          |  97 +++++++++++
 .../editor-sync-line/editor-sync-line.ts      |  55 ------
 .../src/services/websocket-manager.ts         | 158 ++++++++----------
 frontend/sync-client/src/sync-client.ts       |  24 ++-
 .../src/types/document-sync-status.ts         |   3 +-
 7 files changed, 209 insertions(+), 148 deletions(-)
 rename frontend/obsidian-plugin/src/views/{editor-sync-line/editor-sync-line.scss => editor-status-display-manager/editor-status-display-manager.scss} (100%)
 create mode 100644 frontend/obsidian-plugin/src/views/editor-status-display-manager/editor-status-display-manager.ts
 delete mode 100644 frontend/obsidian-plugin/src/views/editor-sync-line/editor-sync-line.ts

diff --git a/frontend/obsidian-plugin/src/vault-link-plugin.ts b/frontend/obsidian-plugin/src/vault-link-plugin.ts
index 90ab1a73..e8453d46 100644
--- a/frontend/obsidian-plugin/src/vault-link-plugin.ts
+++ b/frontend/obsidian-plugin/src/vault-link-plugin.ts
@@ -1,10 +1,10 @@
 import type {
+	MarkdownView,
 	Editor,
 	MarkdownFileInfo,
 	TAbstractFile,
 	WorkspaceLeaf
 } from "obsidian";
-import type { MarkdownView } from "obsidian";
 import { Platform, Plugin, TFile } from "obsidian";
 import "../manifest.json";
 import { HistoryView } from "./views/history/history-view";
@@ -15,7 +15,7 @@ import { SyncClient, rateLimit, DEFAULT_SETTINGS, Logger } from "sync-client";
 import { ObsidianFileSystemOperations } from "./obsidian-file-system";
 import { SyncSettingsTab } from "./views/settings/settings-tab";
 import { logToConsole } from "./utils/log-to-console";
-import { updateEditorStatusDisplay } from "./views/editor-sync-line/editor-sync-line";
+import { EditorStatusDisplayManager } from "./views/editor-status-display-manager/editor-status-display-manager";
 import { remoteCursorsTheme } from "./views/cursors/remote-cursor-theme";
 import {
 	remoteCursorsPlugin,
@@ -124,17 +124,23 @@ export default class VaultLinkPlugin extends Plugin {
 			this.registerEditorEvents();
 			await this.client.start();
 
-			const interval = setInterval(() => {
-				updateEditorStatusDisplay(this.app.workspace, this.client);
-			}, 200);
+			const editorStatusDisplayManager = new EditorStatusDisplayManager(
+				this,
+				this.app.workspace,
+				this.client
+			);
 			this.disposables.push(() => {
-				clearInterval(interval);
+				editorStatusDisplayManager.stop();
 			});
 		});
 	}
 
 	public onunload(): void {
-		this.client.stop();
+		this.client.waitAndStop().catch((err: unknown) => {
+			this.client.logger.error(
+				`Error while stopping the sync client: ${err}`
+			);
+		});
 		this.disposables.forEach((disposable) => {
 			disposable();
 		});
diff --git a/frontend/obsidian-plugin/src/views/editor-sync-line/editor-sync-line.scss b/frontend/obsidian-plugin/src/views/editor-status-display-manager/editor-status-display-manager.scss
similarity index 100%
rename from frontend/obsidian-plugin/src/views/editor-sync-line/editor-sync-line.scss
rename to frontend/obsidian-plugin/src/views/editor-status-display-manager/editor-status-display-manager.scss
diff --git a/frontend/obsidian-plugin/src/views/editor-status-display-manager/editor-status-display-manager.ts b/frontend/obsidian-plugin/src/views/editor-status-display-manager/editor-status-display-manager.ts
new file mode 100644
index 00000000..5075b847
--- /dev/null
+++ b/frontend/obsidian-plugin/src/views/editor-status-display-manager/editor-status-display-manager.ts
@@ -0,0 +1,97 @@
+import type { Workspace } from "obsidian";
+import { FileView, setIcon } from "obsidian";
+import type { SyncClient } from "sync-client";
+import { DocumentSyncStatus } from "sync-client";
+import "./editor-status-display-manager.scss";
+import type VaultLinkPlugin from "src/vault-link-plugin";
+import { HistoryView } from "../history/history-view";
+
+export class EditorStatusDisplayManager {
+	private static readonly UPDATE_INTERVAL_IN_MS = 100;
+
+	private readonly intervalId: NodeJS.Timeout;
+	private readonly lastStatuses = new Map<string, DocumentSyncStatus>();
+
+	public constructor(
+		private readonly plugin: VaultLinkPlugin,
+		private readonly workspace: Workspace,
+		private readonly client: SyncClient
+	) {
+		this.intervalId = setInterval(() => {
+			this.updateEditorStatusDisplay();
+		}, EditorStatusDisplayManager.UPDATE_INTERVAL_IN_MS);
+	}
+
+	public stop(): void {
+		clearInterval(this.intervalId);
+	}
+
+	private updateEditorStatusDisplay(): void {
+		this.workspace.iterateAllLeaves((leaf) => {
+			if (leaf.view instanceof FileView) {
+				const filePath = leaf.view.file?.path;
+				if (filePath == null) {
+					return;
+				}
+
+				const element = this.getElementFromLeaf(leaf.view);
+				if (element == null) {
+					return;
+				}
+
+				const previousStatus = this.lastStatuses.get(filePath);
+				const currentStatus =
+					this.client.getDocumentSyncingStatus(filePath);
+				if (previousStatus === currentStatus) {
+					return;
+				}
+				this.lastStatuses.set(filePath, currentStatus);
+
+				if (currentStatus == DocumentSyncStatus.SYNCING_IS_DISABLED) {
+					element.remove();
+					return;
+				}
+
+				if (currentStatus == DocumentSyncStatus.SYNCING) {
+					element.classList.add("loading");
+				} else {
+					element.classList.remove("loading");
+				}
+
+				const iconContainer = element.querySelector(".icon");
+				if (iconContainer != null) {
+					setIcon(
+						iconContainer as HTMLElement, // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+						currentStatus == DocumentSyncStatus.SYNCING
+							? "loader"
+							: "circle-check"
+					);
+				}
+			}
+		});
+	}
+
+	private getElementFromLeaf(fileView: FileView): Element | undefined {
+		const parent = fileView.contentEl.querySelector(".cm-editor");
+		if (parent == null) {
+			return;
+		}
+
+		return (
+			parent.querySelector(".vault-link-sync-status") ??
+			parent.createDiv(
+				{
+					cls: "vault-link-sync-status"
+				},
+				(el) => {
+					el.createSpan({ text: "VaultLink sync state" });
+					el.createDiv({
+						cls: "icon"
+					});
+					el.onclick = async (): Promise<void> =>
+						this.plugin.activateView(HistoryView.TYPE);
+				}
+			)
+		);
+	}
+}
diff --git a/frontend/obsidian-plugin/src/views/editor-sync-line/editor-sync-line.ts b/frontend/obsidian-plugin/src/views/editor-sync-line/editor-sync-line.ts
deleted file mode 100644
index 78ef1bd8..00000000
--- a/frontend/obsidian-plugin/src/views/editor-sync-line/editor-sync-line.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import type { Workspace } from "obsidian";
-import { FileView, setIcon } from "obsidian";
-import type { SyncClient } from "sync-client";
-import { DocumentSyncStatus } from "sync-client";
-import "./editor-sync-line.scss";
-
-export function updateEditorStatusDisplay(
-	workspace: Workspace,
-	client: SyncClient
-): void {
-	workspace.iterateAllLeaves((leaf) => {
-		if (leaf.view instanceof FileView) {
-			const filePath = leaf.view.file?.path;
-			if (filePath == null) {
-				return;
-			}
-			const parent = leaf.view.contentEl.querySelector(".cm-editor");
-			if (parent == null) {
-				return;
-			}
-
-			const element =
-				parent.querySelector(".vault-link-sync-status") ??
-				parent.createDiv(
-					{
-						cls: "vault-link-sync-status"
-					},
-					(el) => {
-						el.createSpan({ text: "VaultLink sync state" });
-						el.createDiv({
-							cls: "icon"
-						});
-					}
-				);
-
-			const isLoading =
-				client.getDocumentSyncingStatus(filePath) ==
-				DocumentSyncStatus.SYNCING;
-
-			if (isLoading) {
-				element.classList.add("loading");
-			} else {
-				element.classList.remove("loading");
-			}
-
-			const iconContainer = element.querySelector(".icon");
-			if (iconContainer != null) {
-				setIcon(
-					iconContainer as HTMLElement, // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
-					isLoading ? "loader" : "circle-check"
-				);
-			}
-		}
-	});
-}
diff --git a/frontend/sync-client/src/services/websocket-manager.ts b/frontend/sync-client/src/services/websocket-manager.ts
index dde8f068..a30774f4 100644
--- a/frontend/sync-client/src/services/websocket-manager.ts
+++ b/frontend/sync-client/src/services/websocket-manager.ts
@@ -13,10 +13,11 @@ export class WebSocketManager {
 		cursors: ClientCursors[]
 	) => unknown)[] = [];
 
-	private refreshWebSocketInterval: NodeJS.Timeout | undefined;
-
 	private webSocket: WebSocket | undefined;
 
+	private isStopped = true;
+	private _isFirstSyncCompleted = false;
+
 	private readonly webSocketFactoryImplementation: typeof globalThis.WebSocket;
 
 	public constructor(
@@ -41,20 +42,15 @@ export class WebSocketManager {
 			}
 		}
 
-		this.updateWebSocket(settings.getSettings());
-
 		settings.addOnSettingsChangeListener((newSettings, oldSettings) => {
 			if (
 				newSettings.remoteUri !== oldSettings.remoteUri ||
 				newSettings.vaultName !== oldSettings.vaultName ||
-				newSettings.token !== oldSettings.token ||
-				newSettings.isSyncEnabled !== oldSettings.isSyncEnabled
+				newSettings.token !== oldSettings.token
 			) {
-				this.updateWebSocket(newSettings);
+				this.initializeWebSocket(newSettings);
 			}
 		});
-
-		this.setWebSocketRefreshInterval();
 	}
 
 	public get isWebSocketConnected(): boolean {
@@ -64,6 +60,10 @@ export class WebSocketManager {
 		);
 	}
 
+	public get isFirstSyncCompleted(): boolean {
+		return this._isFirstSyncCompleted;
+	}
+
 	public addWebSocketStatusChangeListener(listener: () => unknown): void {
 		this.webSocketStatusChangeListeners.push(listener);
 	}
@@ -74,19 +74,15 @@ export class WebSocketManager {
 		this.remoteCursorsUpdateListeners.push(listener);
 	}
 
-	public async reset(): Promise<void> {
-		this.setWebSocketRefreshInterval();
-		this.updateWebSocket(this.settings.getSettings());
+	public start(): void {
+		this.isStopped = false;
+		this._isFirstSyncCompleted = false;
+		this.initializeWebSocket(this.settings.getSettings());
 	}
 
 	public stop(): void {
-		clearInterval(this.refreshWebSocketInterval);
-
-		try {
-			this.webSocket?.close();
-		} catch (e) {
-			this.logger.warn(`Failed to close WebSocket: ${e}`);
-		}
+		this.isStopped = true;
+		this.webSocket?.close(1000, "WebSocketManager has been stopped");
 	}
 
 	public updateLocalCursors(cursorPositions: CursorPositionFromClient): void {
@@ -101,23 +97,22 @@ export class WebSocketManager {
 			...cursorPositions
 		};
 		this.webSocket?.send(JSON.stringify(message));
-		this.logger.info(
+		this.logger.debug(
 			`Sent cursor positions: ${JSON.stringify(cursorPositions)}`
 		);
 	}
 
-	private updateWebSocket(settings: SyncSettings): void {
+	private initializeWebSocket(settings: SyncSettings): void {
+		if (this.isStopped) {
+			return;
+		}
+
 		try {
 			this.webSocket?.close();
 		} catch (e) {
 			this.logger.warn(`Failed to close WebSocket: ${e}`);
 		}
 
-		if (!settings.isSyncEnabled) {
-			this.webSocket = undefined;
-			return;
-		}
-
 		const wsUri = new URL(settings.remoteUri);
 		wsUri.protocol = wsUri.protocol === "https" ? "wss" : "ws";
 		wsUri.pathname = `/vaults/${settings.vaultName}/ws`;
@@ -126,55 +121,10 @@ export class WebSocketManager {
 
 		this.webSocket = new this.webSocketFactoryImplementation(wsUri);
 
-		this.webSocket.onmessage = async (event): Promise<void> => {
-			// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-			const message = JSON.parse(event.data) as WebSocketServerMessage;
-
-			if (message.type === "vaultUpdate") {
-				try {
-					await Promise.all(
-						message.documents.map(async (document) =>
-							this.syncer.syncRemotelyUpdatedFile(document)
-						)
-					);
-
-					if (message.isInitialSync && message.documents.length > 0) {
-						this.database.setLastSeenUpdateId(
-							message.documents
-								.map((document) => document.vaultUpdateId)
-								.reduce((a, b) => Math.max(a, b))
-						);
-					}
-				} catch (e) {
-					this.logger.error(
-						`Failed to sync remotely updated file: ${e}`
-					);
-				}
-				// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-			} else if (message.type === "cursorPositions") {
-				this.logger.debug(
-					`Received cursor positions for ${JSON.stringify(message.clients)}`
-				);
-				this.remoteCursorsUpdateListeners.forEach((listener) => {
-					listener(
-						message.clients.filter(
-							(client) => client.deviceId !== this.deviceId
-						)
-					);
-				});
-			} else {
-				this.logger.warn(
-					`Received unknown message type: ${JSON.stringify(message)}`
-				);
-			}
-		};
-
 		// The JS WebSocket API doesn't support setting headers, so we have to send the token as a message
 		this.webSocket.onopen = (): void => {
 			this.logger.info("WebSocket connection opened");
-			this.webSocketStatusChangeListeners.forEach((listener) => {
-				listener();
-			});
+			this.webSocketStatusChangeListeners.forEach((l) => l());
 
 			const message: WebSocketClientMessage = {
 				type: "handshake",
@@ -185,25 +135,65 @@ export class WebSocketManager {
 			this.webSocket?.send(JSON.stringify(message));
 		};
 
+		this.webSocket.onmessage = async (event): Promise<void> => {
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+			const message = JSON.parse(event.data) as WebSocketServerMessage;
+			return this.handleWebSocketMessage(message);
+		};
+
 		this.webSocket.onclose = (event): void => {
 			this.logger.warn(
 				`WebSocket closed with code ${event.code} (${event.reason == "" ? "unknown reason" : event.reason})`
 			);
-			this.webSocketStatusChangeListeners.forEach((listener) => {
-				listener();
-			});
+			this.webSocketStatusChangeListeners.forEach((l) => l());
+
+			if (!this.isStopped) {
+				setTimeout(() => {
+					this.initializeWebSocket(this.settings.getSettings());
+				}, this.settings.getSettings().webSocketRetryIntervalMs);
+			}
 		};
 	}
 
-	private setWebSocketRefreshInterval(): void {
-		this.refreshWebSocketInterval = setInterval(() => {
-			if (
-				this.webSocket?.readyState ===
-				this.webSocketFactoryImplementation.CLOSED
-			) {
-				this.logger.info("WebSocket is closed, reconnecting...");
-				this.updateWebSocket(this.settings.getSettings());
+	private async handleWebSocketMessage(
+		message: WebSocketServerMessage
+	): Promise<void> {
+		if (message.type === "vaultUpdate") {
+			try {
+				await Promise.all(
+					message.documents.map(async (document) =>
+						this.syncer.syncRemotelyUpdatedFile(document)
+					)
+				);
+
+				if (message.isInitialSync && message.documents.length > 0) {
+					this.database.setLastSeenUpdateId(
+						message.documents
+							.map((document) => document.vaultUpdateId)
+							.reduce((a, b) => Math.max(a, b))
+					);
+				}
+
+				this._isFirstSyncCompleted = true;
+			} catch (e) {
+				this.logger.error(`Failed to sync remotely updated file: ${e}`);
 			}
-		}, this.settings.getSettings().webSocketRetryIntervalMs);
+			// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+		} else if (message.type === "cursorPositions") {
+			this.logger.debug(
+				`Received cursor positions for ${JSON.stringify(message.clients)}`
+			);
+			this.remoteCursorsUpdateListeners.forEach((listener) => {
+				listener(
+					message.clients.filter(
+						(client) => client.deviceId !== this.deviceId
+					)
+				);
+			});
+		} else {
+			this.logger.warn(
+				`Received unknown message type: ${JSON.stringify(message)}`
+			);
+		}
 	}
 }
diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts
index ddab8860..c8be6e23 100644
--- a/frontend/sync-client/src/sync-client.ts
+++ b/frontend/sync-client/src/sync-client.ts
@@ -24,6 +24,7 @@ import { FileChangeNotifier } from "./sync-operations/file-change-notifier";
 
 export class SyncClient {
 	private static readonly MINIMUM_SAVE_INTERVAL_MS = 1000;
+	private hasFinishedOfflineSync = false;
 
 	// eslint-disable-next-line @typescript-eslint/max-params
 	private constructor(
@@ -43,6 +44,14 @@ export class SyncClient {
 				if (newSettings.vaultName !== oldSettings.vaultName) {
 					await this.reset();
 				}
+
+				if (newSettings.isSyncEnabled !== oldSettings.isSyncEnabled) {
+					if (newSettings.isSyncEnabled) {
+						await this.start();
+					} else {
+						this.stop();
+					}
+				}
 			}
 		);
 	}
@@ -198,9 +207,12 @@ export class SyncClient {
 
 	public async start(): Promise<void> {
 		await this.syncer.scheduleSyncForOfflineChanges();
+		this.hasFinishedOfflineSync = true;
+		this.webSocketManager.start();
 	}
 
 	public stop(): void {
+		this.hasFinishedOfflineSync = false;
 		this.webSocketManager.stop();
 	}
 
@@ -216,7 +228,6 @@ export class SyncClient {
 		this.stop();
 		this.connectionStatus.startReset();
 		await this.syncer.reset();
-		await this.webSocketManager.reset();
 		this.history.reset();
 		this.database.reset();
 		this._logger.reset();
@@ -286,6 +297,17 @@ export class SyncClient {
 	public getDocumentSyncingStatus(
 		relativePath: RelativePath
 	): DocumentSyncStatus {
+		if (!this.settings.getSettings().isSyncEnabled) {
+			return DocumentSyncStatus.SYNCING_IS_DISABLED;
+		}
+
+		if (
+			!this.webSocketManager.isFirstSyncCompleted ||
+			!this.hasFinishedOfflineSync
+		) {
+			return DocumentSyncStatus.SYNCING;
+		}
+
 		const document =
 			this.database.getLatestDocumentByRelativePath(relativePath);
 		if (document === undefined) {
diff --git a/frontend/sync-client/src/types/document-sync-status.ts b/frontend/sync-client/src/types/document-sync-status.ts
index a2ec01c2..07a0e801 100644
--- a/frontend/sync-client/src/types/document-sync-status.ts
+++ b/frontend/sync-client/src/types/document-sync-status.ts
@@ -1,4 +1,5 @@
 export enum DocumentSyncStatus {
 	UP_TO_DATE = "UP_TO_DATE",
-	SYNCING = "SYNCING"
+	SYNCING = "SYNCING",
+	SYNCING_IS_DISABLED = "SYNCING_IS_DISABLED"
 }

From 27e20827473964f60465d67f849a107c0dba4a4b Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 28 Aug 2025 21:55:51 +0100
Subject: [PATCH 564/761] Bump versions to 0.6.3

---
 frontend/obsidian-plugin/manifest.json | 2 +-
 frontend/obsidian-plugin/package.json  | 2 +-
 frontend/package-lock.json             | 6 +++---
 frontend/sync-client/package.json      | 2 +-
 frontend/test-client/package.json      | 2 +-
 manifest.json                          | 2 +-
 sync-server/Cargo.lock                 | 2 +-
 sync-server/Cargo.toml                 | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/frontend/obsidian-plugin/manifest.json b/frontend/obsidian-plugin/manifest.json
index 6ca4b64c..b327da4f 100644
--- a/frontend/obsidian-plugin/manifest.json
+++ b/frontend/obsidian-plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.6.2",
+	"version": "0.6.3",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index 8a99a2ac..947e38b5 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -1,6 +1,6 @@
 {
     "name": "vault-link-obsidian-plugin",
-    "version": "0.6.2",
+    "version": "0.6.3",
     "description": "This is a sample plugin for Obsidian (https://obsidian.md)",
     "main": "main.js",
     "scripts": {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 1fdb9751..ffdce2ca 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -10236,7 +10236,7 @@
 		},
 		"obsidian-plugin": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.6.2",
+			"version": "0.6.3",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jest": "^30.0.0",
@@ -10265,7 +10265,7 @@
 			}
 		},
 		"sync-client": {
-			"version": "0.6.2",
+			"version": "0.6.3",
 			"dependencies": {
 				"byte-base64": "^1.1.0",
 				"minimatch": "^10.0.1",
@@ -10308,7 +10308,7 @@
 			}
 		},
 		"test-client": {
-			"version": "0.6.2",
+			"version": "0.6.3",
 			"bin": {
 				"test-client": "dist/cli.js"
 			},
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index 712942b8..6c9d6fc4 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "sync-client",
-    "version": "0.6.2",
+    "version": "0.6.3",
     "main": "dist/sync-client.node.js",
     "browser": "dist/sync-client.web.js",
     "types": "dist/types/index.d.ts",
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index 6b8f45c5..8d40d50e 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "test-client",
-    "version": "0.6.2",
+    "version": "0.6.3",
     "private": true,
     "bin": {
         "test-client": "./dist/cli.js"
diff --git a/manifest.json b/manifest.json
index 6ca4b64c..b327da4f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.6.2",
+	"version": "0.6.3",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/sync-server/Cargo.lock b/sync-server/Cargo.lock
index ed17c0f6..26669e0a 100644
--- a/sync-server/Cargo.lock
+++ b/sync-server/Cargo.lock
@@ -2205,7 +2205,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.6.2"
+version = "0.6.3"
 dependencies = [
  "anyhow",
  "axum",
diff --git a/sync-server/Cargo.toml b/sync-server/Cargo.toml
index 63fc5ebf..550a0998 100644
--- a/sync-server/Cargo.toml
+++ b/sync-server/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.6.2"
+version = "0.6.3"
 
 [dependencies]
 serde = { version = "1.0.219", default-features = false, features = ["derive"] }

From d33f80cca62b42df91f3dd3f3941d06d03520036 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 30 Aug 2025 10:19:31 +0100
Subject: [PATCH 565/761] Fix E2E tests (#114)

---
 frontend/sync-client/src/sync-client.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts
index c8be6e23..78beb910 100644
--- a/frontend/sync-client/src/sync-client.ts
+++ b/frontend/sync-client/src/sync-client.ts
@@ -24,6 +24,7 @@ import { FileChangeNotifier } from "./sync-operations/file-change-notifier";
 
 export class SyncClient {
 	private static readonly MINIMUM_SAVE_INTERVAL_MS = 1000;
+	private hasStartedOfflineSync = false;
 	private hasFinishedOfflineSync = false;
 
 	// eslint-disable-next-line @typescript-eslint/max-params
@@ -206,7 +207,11 @@ export class SyncClient {
 	}
 
 	public async start(): Promise<void> {
-		await this.syncer.scheduleSyncForOfflineChanges();
+		if (!this.hasStartedOfflineSync) {
+			await this.syncer.scheduleSyncForOfflineChanges();
+			this.hasStartedOfflineSync = true;
+		}
+
 		this.hasFinishedOfflineSync = true;
 		this.webSocketManager.start();
 	}

From 0ff3bb596753a6b7556026faa66cde39e6ef6880 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 30 Aug 2025 10:38:08 +0100
Subject: [PATCH 566/761] Migrate from Jest to node:test (#115)

---
 frontend/eslint.config.mjs                    |    9 +-
 frontend/obsidian-plugin/jest.config.js       |    3 -
 frontend/obsidian-plugin/package.json         |   10 +-
 .../utils/line-and-column-to-position.test.ts |   18 +-
 .../utils/position-to-line-and-column.test.ts |   29 +-
 frontend/obsidian-plugin/tsconfig.json        |    2 +-
 frontend/package-lock.json                    | 6828 ++---------------
 frontend/sync-client/jest.config.js           |    3 -
 frontend/sync-client/package.json             |   10 +-
 .../file-operations/file-operations.test.ts   |    1 +
 .../sync-client/src/services/sync-service.ts  |   10 +-
 .../src/utils/assert-set-contains-exactly.ts  |    4 +-
 .../src/utils/globs-to-regexes.test.ts        |    6 +-
 .../src/utils/is-equal-bytes.test.ts          |   10 +-
 .../src/utils/is-file-type-mergable.test.ts   |   40 +-
 frontend/sync-client/src/utils/locks.test.ts  |   82 +-
 .../sync-client/src/utils/min-covered.test.ts |   42 +-
 .../sync-client/src/utils/rate-limit.test.ts  |   48 +-
 frontend/sync-client/tsconfig.json            |    3 +-
 frontend/test-client/jest.config.js           |    3 -
 frontend/test-client/package.json             |    7 +-
 .../src/utils/random-casing.test.ts           |    6 +-
 frontend/test-client/tsconfig.json            |    2 +-
 scripts/check.sh                              |    4 +-
 24 files changed, 759 insertions(+), 6421 deletions(-)
 delete mode 100644 frontend/obsidian-plugin/jest.config.js
 delete mode 100644 frontend/sync-client/jest.config.js
 delete mode 100644 frontend/test-client/jest.config.js

diff --git a/frontend/eslint.config.mjs b/frontend/eslint.config.mjs
index ceba2eee..db648d46 100644
--- a/frontend/eslint.config.mjs
+++ b/frontend/eslint.config.mjs
@@ -20,7 +20,14 @@ export default [
 			"no-unused-vars": "off",
 			"@typescript-eslint/restrict-template-expressions": "off",
 			"@typescript-eslint/no-unused-vars": "off",
-			"@typescript-eslint/no-floating-promises": "error",
+			"@typescript-eslint/no-floating-promises": [
+				"error",
+				{
+					allowForKnownSafeCalls: [
+						{ from: "package", name: ["suite", "test"], package: "node:test" },
+					],
+				},
+			],
 			"@typescript-eslint/parameter-properties": "off",
 			"@typescript-eslint/require-await": "off",
 			"@typescript-eslint/class-methods-use-this": "off",
diff --git a/frontend/obsidian-plugin/jest.config.js b/frontend/obsidian-plugin/jest.config.js
deleted file mode 100644
index d1cbaca2..00000000
--- a/frontend/obsidian-plugin/jest.config.js
+++ /dev/null
@@ -1,3 +0,0 @@
-module.exports = {
-	preset: "ts-jest"
-};
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index 947e38b5..7ebeaceb 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -6,35 +6,33 @@
     "scripts": {
         "dev": "webpack watch --mode development",
         "build": "webpack --mode production",
-        "test": "jest",
+        "test": "tsx --test src/**/*.test.ts",
         "version": "node version-bump.mjs"
     },
     "keywords": [],
     "author": "",
     "license": "MIT",
     "devDependencies": {
-        "@types/jest": "^30.0.0",
         "@types/node": "^22.15.30",
         "css-loader": "^7.1.2",
         "date-fns": "^4.1.0",
         "file-loader": "^6.2.0",
         "fs-extra": "^11.3.0",
-        "jest": "^30.1.1",
         "mini-css-extract-plugin": "^2.9.2",
         "obsidian": "1.8.7",
+        "reconcile-text": "^0.5.0",
         "resolve-url-loader": "^5.0.0",
         "sass": "^1.91.0",
         "sass-loader": "^16.0.5",
         "sync-client": "file:../sync-client",
         "terser-webpack-plugin": "^5.3.14",
-        "ts-jest": "^29.4.1",
         "ts-loader": "^9.5.2",
         "tslib": "2.8.1",
+        "tsx": "^4.20.5",
         "typescript": "5.8.3",
         "url": "^0.11.4",
         "virtual-scroller": "^1.13.1",
         "webpack": "^5.99.9",
-        "webpack-cli": "^6.0.1",
-        "reconcile-text": "^0.5.0"
+        "webpack-cli": "^6.0.1"
     }
 }
diff --git a/frontend/obsidian-plugin/src/utils/line-and-column-to-position.test.ts b/frontend/obsidian-plugin/src/utils/line-and-column-to-position.test.ts
index 9c02fbb5..82d752c9 100644
--- a/frontend/obsidian-plugin/src/utils/line-and-column-to-position.test.ts
+++ b/frontend/obsidian-plugin/src/utils/line-and-column-to-position.test.ts
@@ -1,42 +1,44 @@
+import { describe, it } from "node:test";
+import assert from "node:assert";
 import { lineAndColumnToPosition } from "./line-and-column-to-position";
 
 describe("lineAndColumnToPosition", () => {
 	it("should return the correct position for the first line", () => {
 		const text = "Hello\nWorld";
 		const position = lineAndColumnToPosition(text, 0, 3);
-		expect(position).toBe(3);
+		assert.strictEqual(position, 3);
 	});
 
 	it("should return the correct position for the second line", () => {
 		const text = "Hello\nWorld";
 		const position = lineAndColumnToPosition(text, 1, 2);
-		expect(position).toBe(8);
+		assert.strictEqual(position, 8);
 	});
 
 	it("should return the correct position for an empty string", () => {
 		const text = "";
 		const position = lineAndColumnToPosition(text, 0, 0);
-		expect(position).toBe(0);
+		assert.strictEqual(position, 0);
 	});
 
 	it("with carrige return", () => {
-		expect(lineAndColumnToPosition("a\nb", 1, 1)).toBe(3);
-		expect(lineAndColumnToPosition("a\r\nb", 1, 1)).toBe(3);
+		assert.strictEqual(lineAndColumnToPosition("a\nb", 1, 1), 3);
+		assert.strictEqual(lineAndColumnToPosition("a\r\nb", 1, 1), 3);
 	});
 
 	it("should handle multi-line strings with varying lengths", () => {
 		const text = "Line1\nLongerLine2\nShort3";
 		const position = lineAndColumnToPosition(text, 2, 4);
-		expect(position).toBe(22);
+		assert.strictEqual(position, 22);
 	});
 
 	it("should throw an error if the line number is out of range", () => {
 		const text = "Line1\nLine2";
-		expect(() => lineAndColumnToPosition(text, 3, 0)).toThrow();
+		assert.throws(() => lineAndColumnToPosition(text, 3, 0));
 	});
 
 	it("should throw an error if the column number is out of range", () => {
 		const text = "Line1\nLine2";
-		expect(() => lineAndColumnToPosition(text, 1, 10)).toThrow();
+		assert.throws(() => lineAndColumnToPosition(text, 1, 10));
 	});
 });
diff --git a/frontend/obsidian-plugin/src/utils/position-to-line-and-column.test.ts b/frontend/obsidian-plugin/src/utils/position-to-line-and-column.test.ts
index d5533778..bc21b983 100644
--- a/frontend/obsidian-plugin/src/utils/position-to-line-and-column.test.ts
+++ b/frontend/obsidian-plugin/src/utils/position-to-line-and-column.test.ts
@@ -1,53 +1,58 @@
+import { describe, test } from "node:test";
+import assert from "node:assert";
 import { positionToLineAndColumn } from "./position-to-line-and-column";
 
 describe("positionToLineAndColumn", () => {
 	test("converts position to line and column in multi-line text", () => {
 		const text = "ab\ncd\n";
-		expect(positionToLineAndColumn(text, 0)).toEqual({
+		assert.deepStrictEqual(positionToLineAndColumn(text, 0), {
 			line: 0,
 			column: 0
 		});
-		expect(positionToLineAndColumn(text, 1)).toEqual({
+		assert.deepStrictEqual(positionToLineAndColumn(text, 1), {
 			line: 0,
 			column: 1
 		});
-		expect(positionToLineAndColumn(text, 2)).toEqual({
+		assert.deepStrictEqual(positionToLineAndColumn(text, 2), {
 			line: 0,
 			column: 2
 		});
-		expect(positionToLineAndColumn(text, 3)).toEqual({
+		assert.deepStrictEqual(positionToLineAndColumn(text, 3), {
 			line: 1,
 			column: 0
 		});
-		expect(positionToLineAndColumn(text, 4)).toEqual({
+		assert.deepStrictEqual(positionToLineAndColumn(text, 4), {
 			line: 1,
 			column: 1
 		});
-		expect(positionToLineAndColumn(text, 6)).toEqual({
+		assert.deepStrictEqual(positionToLineAndColumn(text, 6), {
 			line: 2,
 			column: 0
 		});
 	});
 
 	test("with carrige returns", () => {
-		expect(positionToLineAndColumn("a\nb", 3)).toEqual({
+		assert.deepStrictEqual(positionToLineAndColumn("a\nb", 3), {
 			line: 1,
 			column: 1
 		});
 
-		expect(positionToLineAndColumn("a\r\nb", 3)).toEqual({
+		assert.deepStrictEqual(positionToLineAndColumn("a\r\nb", 3), {
 			line: 1,
 			column: 1
 		});
 	});
 
 	test("handles empty input", () => {
-		expect(positionToLineAndColumn("", 0)).toEqual({ line: 0, column: 0 });
+		assert.deepStrictEqual(positionToLineAndColumn("", 0), {
+			line: 0,
+			column: 0
+		});
 	});
 
 	test("handles positions at the end of text", () => {
 		const text = "End";
-		expect(positionToLineAndColumn(text, 3)).toEqual({
+		assert.deepStrictEqual(positionToLineAndColumn(text, 3), {
 			line: 0,
 			column: 3
 		});
@@ -55,7 +60,7 @@ describe("positionToLineAndColumn", () => {
 
 	test("throws error for position out of range", () => {
 		const text = "Short text";
-		expect(() => positionToLineAndColumn(text, 15)).toThrow();
-		expect(() => positionToLineAndColumn(text, -1)).toThrow();
+		assert.throws(() => positionToLineAndColumn(text, 15));
+		assert.throws(() => positionToLineAndColumn(text, -1));
 	});
 });
diff --git a/frontend/obsidian-plugin/tsconfig.json b/frontend/obsidian-plugin/tsconfig.json
index 09dab427..4c39e97b 100644
--- a/frontend/obsidian-plugin/tsconfig.json
+++ b/frontend/obsidian-plugin/tsconfig.json
@@ -8,7 +8,7 @@
 		"allowSyntheticDefaultImports": true,
 		"lib": [
 			"DOM",
-			"ESNext"
+			"ES2024"
 		]
 	},
 	"exclude": [
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index ffdce2ca..1ec1fb76 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -19,502 +19,6 @@
 				"typescript-eslint": "8.41.0"
 			}
 		},
-		"node_modules/@ampproject/remapping": {
-			"version": "2.3.0",
-			"dev": true,
-			"license": "Apache-2.0",
-			"dependencies": {
-				"@jridgewell/gen-mapping": "^0.3.5",
-				"@jridgewell/trace-mapping": "^0.3.24"
-			},
-			"engines": {
-				"node": ">=6.0.0"
-			}
-		},
-		"node_modules/@babel/code-frame": {
-			"version": "7.27.1",
-			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz",
-			"integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/helper-validator-identifier": "^7.27.1",
-				"js-tokens": "^4.0.0",
-				"picocolors": "^1.1.1"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/compat-data": {
-			"version": "7.28.0",
-			"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.28.0.tgz",
-			"integrity": "sha512-60X7qkglvrap8mn1lh2ebxXdZYtUcpd7gsmy9kLaBJ4i/WdY8PqTSdxyA8qraikqKQK5C1KRBKXqznrVapyNaw==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/core": {
-			"version": "7.28.3",
-			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.3.tgz",
-			"integrity": "sha512-yDBHV9kQNcr2/sUr9jghVyz9C3Y5G2zUM2H2lo+9mKv4sFgbA8s8Z9t8D1jiTkGoO/NoIfKMyKWr4s6CN23ZwQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@ampproject/remapping": "^2.2.0",
-				"@babel/code-frame": "^7.27.1",
-				"@babel/generator": "^7.28.3",
-				"@babel/helper-compilation-targets": "^7.27.2",
-				"@babel/helper-module-transforms": "^7.28.3",
-				"@babel/helpers": "^7.28.3",
-				"@babel/parser": "^7.28.3",
-				"@babel/template": "^7.27.2",
-				"@babel/traverse": "^7.28.3",
-				"@babel/types": "^7.28.2",
-				"convert-source-map": "^2.0.0",
-				"debug": "^4.1.0",
-				"gensync": "^1.0.0-beta.2",
-				"json5": "^2.2.3",
-				"semver": "^6.3.1"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/babel"
-			}
-		},
-		"node_modules/@babel/core/node_modules/semver": {
-			"version": "6.3.1",
-			"dev": true,
-			"license": "ISC",
-			"bin": {
-				"semver": "bin/semver.js"
-			}
-		},
-		"node_modules/@babel/generator": {
-			"version": "7.28.3",
-			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.3.tgz",
-			"integrity": "sha512-3lSpxGgvnmZznmBkCRnVREPUFJv2wrv9iAoFDvADJc0ypmdOxdUtcLeBgBJ6zE0PMeTKnxeQzyk0xTBq4Ep7zw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/parser": "^7.28.3",
-				"@babel/types": "^7.28.2",
-				"@jridgewell/gen-mapping": "^0.3.12",
-				"@jridgewell/trace-mapping": "^0.3.28",
-				"jsesc": "^3.0.2"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-compilation-targets": {
-			"version": "7.27.2",
-			"resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.2.tgz",
-			"integrity": "sha512-2+1thGUUWWjLTYTHZWK1n8Yga0ijBz1XAhUXcKy81rd5g6yh7hGqMp45v7cadSbEHc9G3OTv45SyneRN3ps4DQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/compat-data": "^7.27.2",
-				"@babel/helper-validator-option": "^7.27.1",
-				"browserslist": "^4.24.0",
-				"lru-cache": "^5.1.1",
-				"semver": "^6.3.1"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-compilation-targets/node_modules/semver": {
-			"version": "6.3.1",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-			"dev": true,
-			"license": "ISC",
-			"bin": {
-				"semver": "bin/semver.js"
-			}
-		},
-		"node_modules/@babel/helper-globals": {
-			"version": "7.28.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.28.0.tgz",
-			"integrity": "sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-module-imports": {
-			"version": "7.27.1",
-			"resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.27.1.tgz",
-			"integrity": "sha512-0gSFWUPNXNopqtIPQvlD5WgXYI5GY2kP2cCvoT8kczjbfcfuIljTbcWrulD1CIPIX2gt1wghbDy08yE1p+/r3w==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/traverse": "^7.27.1",
-				"@babel/types": "^7.27.1"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-module-transforms": {
-			"version": "7.28.3",
-			"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.28.3.tgz",
-			"integrity": "sha512-gytXUbs8k2sXS9PnQptz5o0QnpLL51SwASIORY6XaBKF88nsOT0Zw9szLqlSGQDP/4TljBAD5y98p2U1fqkdsw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/helper-module-imports": "^7.27.1",
-				"@babel/helper-validator-identifier": "^7.27.1",
-				"@babel/traverse": "^7.28.3"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0"
-			}
-		},
-		"node_modules/@babel/helper-plugin-utils": {
-			"version": "7.27.1",
-			"resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.27.1.tgz",
-			"integrity": "sha512-1gn1Up5YXka3YYAHGKpbideQ5Yjf1tDa9qYcgysz+cNCXukyLl6DjPXhD3VRwSb8c0J9tA4b2+rHEZtc6R0tlw==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-string-parser": {
-			"version": "7.27.1",
-			"resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz",
-			"integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-validator-identifier": {
-			"version": "7.27.1",
-			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz",
-			"integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-validator-option": {
-			"version": "7.27.1",
-			"resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz",
-			"integrity": "sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helpers": {
-			"version": "7.28.3",
-			"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.28.3.tgz",
-			"integrity": "sha512-PTNtvUQihsAsDHMOP5pfobP8C6CM4JWXmP8DrEIt46c3r2bf87Ua1zoqevsMo9g+tWDwgWrFP5EIxuBx5RudAw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/template": "^7.27.2",
-				"@babel/types": "^7.28.2"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/parser": {
-			"version": "7.28.3",
-			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.3.tgz",
-			"integrity": "sha512-7+Ey1mAgYqFAx2h0RuoxcQT5+MlG3GTV0TQrgr7/ZliKsm/MNDxVVutlWaziMq7wJNAz8MTqz55XLpWvva6StA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/types": "^7.28.2"
-			},
-			"bin": {
-				"parser": "bin/babel-parser.js"
-			},
-			"engines": {
-				"node": ">=6.0.0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-async-generators": {
-			"version": "7.8.4",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-bigint": {
-			"version": "7.8.3",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-class-properties": {
-			"version": "7.12.13",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.12.13"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-class-static-block": {
-			"version": "7.14.5",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.14.5"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-import-attributes": {
-			"version": "7.26.0",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.25.9"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-import-meta": {
-			"version": "7.10.4",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.10.4"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-json-strings": {
-			"version": "7.8.3",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-jsx": {
-			"version": "7.27.1",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.27.1.tgz",
-			"integrity": "sha512-y8YTNIeKoyhGd9O0Jiyzyyqk8gdjnumGTQPsz0xOZOQ2RmkVJeZ1vmmfIvFEKqucBG6axJGBZDE/7iI5suUI/w==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.27.1"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-logical-assignment-operators": {
-			"version": "7.10.4",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.10.4"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
-			"version": "7.8.3",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-numeric-separator": {
-			"version": "7.10.4",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.10.4"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-object-rest-spread": {
-			"version": "7.8.3",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-optional-catch-binding": {
-			"version": "7.8.3",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-optional-chaining": {
-			"version": "7.8.3",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-private-property-in-object": {
-			"version": "7.14.5",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.14.5"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-top-level-await": {
-			"version": "7.14.5",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.14.5"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-typescript": {
-			"version": "7.27.1",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.27.1.tgz",
-			"integrity": "sha512-xfYCBMxveHrRMnAWl1ZlPXOZjzkN82THFvLhQhFXFt81Z5HnN+EtUkZhv/zcKpmT3fzmWZB0ywiBrbC3vogbwQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.27.1"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/template": {
-			"version": "7.27.2",
-			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.2.tgz",
-			"integrity": "sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/code-frame": "^7.27.1",
-				"@babel/parser": "^7.27.2",
-				"@babel/types": "^7.27.1"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/traverse": {
-			"version": "7.28.3",
-			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.3.tgz",
-			"integrity": "sha512-7w4kZYHneL3A6NP2nxzHvT3HCZ7puDZZjFMqDpBPECub79sTtSO5CGXDkKrTQq8ksAwfD/XI2MRFX23njdDaIQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/code-frame": "^7.27.1",
-				"@babel/generator": "^7.28.3",
-				"@babel/helper-globals": "^7.28.0",
-				"@babel/parser": "^7.28.3",
-				"@babel/template": "^7.27.2",
-				"@babel/types": "^7.28.2",
-				"debug": "^4.3.1"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/types": {
-			"version": "7.28.2",
-			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.2.tgz",
-			"integrity": "sha512-ruv7Ae4J5dUYULmeXw1gmb7rYRz57OWCPM57pHojnLq/3Z1CK2lNSLTCVjxVk1F/TZHwOZZrOWi0ur95BbLxNQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/helper-string-parser": "^7.27.1",
-				"@babel/helper-validator-identifier": "^7.27.1"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@bcoe/v8-coverage": {
-			"version": "0.2.3",
-			"resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
-			"integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
-			"dev": true,
-			"license": "MIT"
-		},
 		"node_modules/@codemirror/state": {
 			"version": "6.5.2",
 			"dev": true,
@@ -543,38 +47,446 @@
 				"node": ">=14.17.0"
 			}
 		},
-		"node_modules/@emnapi/core": {
-			"version": "1.4.5",
-			"resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.4.5.tgz",
-			"integrity": "sha512-XsLw1dEOpkSX/WucdqUhPWP7hDxSvZiY+fsUC14h+FtQ2Ifni4znbBt8punRX+Uj2JG/uDb8nEHVKvrVlvdZ5Q==",
+		"node_modules/@esbuild/aix-ppc64": {
+			"version": "0.25.9",
+			"resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.9.tgz",
+			"integrity": "sha512-OaGtL73Jck6pBKjNIe24BnFE6agGl+6KxDtTfHhy1HmhthfKouEcOhqpSL64K4/0WCtbKFLOdzD/44cJ4k9opA==",
+			"cpu": [
+				"ppc64"
+			],
 			"dev": true,
 			"license": "MIT",
 			"optional": true,
-			"dependencies": {
-				"@emnapi/wasi-threads": "1.0.4",
-				"tslib": "^2.4.0"
+			"os": [
+				"aix"
+			],
+			"engines": {
+				"node": ">=18"
 			}
 		},
-		"node_modules/@emnapi/runtime": {
-			"version": "1.4.5",
-			"resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.4.5.tgz",
-			"integrity": "sha512-++LApOtY0pEEz1zrd9vy1/zXVaVJJ/EbAF3u0fXIzPJEDtnITsBGbbK0EkM72amhl/R5b+5xx0Y/QhcVOpuulg==",
+		"node_modules/@esbuild/android-arm": {
+			"version": "0.25.9",
+			"resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.9.tgz",
+			"integrity": "sha512-5WNI1DaMtxQ7t7B6xa572XMXpHAaI/9Hnhk8lcxF4zVN4xstUgTlvuGDorBguKEnZO70qwEcLpfifMLoxiPqHQ==",
+			"cpu": [
+				"arm"
+			],
 			"dev": true,
 			"license": "MIT",
 			"optional": true,
-			"dependencies": {
-				"tslib": "^2.4.0"
+			"os": [
+				"android"
+			],
+			"engines": {
+				"node": ">=18"
 			}
 		},
-		"node_modules/@emnapi/wasi-threads": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.0.4.tgz",
-			"integrity": "sha512-PJR+bOmMOPH8AtcTGAyYNiuJ3/Fcoj2XN/gBEWzDIKh254XO+mM9XoXHk5GNEhodxeMznbg7BlRojVbKN+gC6g==",
+		"node_modules/@esbuild/android-arm64": {
+			"version": "0.25.9",
+			"resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.9.tgz",
+			"integrity": "sha512-IDrddSmpSv51ftWslJMvl3Q2ZT98fUSL2/rlUXuVqRXHCs5EUF1/f+jbjF5+NG9UffUDMCiTyh8iec7u8RlTLg==",
+			"cpu": [
+				"arm64"
+			],
 			"dev": true,
 			"license": "MIT",
 			"optional": true,
-			"dependencies": {
-				"tslib": "^2.4.0"
+			"os": [
+				"android"
+			],
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/@esbuild/android-x64": {
+			"version": "0.25.9",
+			"resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.9.tgz",
+			"integrity": "sha512-I853iMZ1hWZdNllhVZKm34f4wErd4lMyeV7BLzEExGEIZYsOzqDWDf+y082izYUE8gtJnYHdeDpN/6tUdwvfiw==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"android"
+			],
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/@esbuild/darwin-arm64": {
+			"version": "0.25.9",
+			"resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.9.tgz",
+			"integrity": "sha512-XIpIDMAjOELi/9PB30vEbVMs3GV1v2zkkPnuyRRURbhqjyzIINwj+nbQATh4H9GxUgH1kFsEyQMxwiLFKUS6Rg==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"darwin"
+			],
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/@esbuild/darwin-x64": {
+			"version": "0.25.9",
+			"resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.9.tgz",
+			"integrity": "sha512-jhHfBzjYTA1IQu8VyrjCX4ApJDnH+ez+IYVEoJHeqJm9VhG9Dh2BYaJritkYK3vMaXrf7Ogr/0MQ8/MeIefsPQ==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"darwin"
+			],
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/@esbuild/freebsd-arm64": {
+			"version": "0.25.9",
+			"resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.9.tgz",
+			"integrity": "sha512-z93DmbnY6fX9+KdD4Ue/H6sYs+bhFQJNCPZsi4XWJoYblUqT06MQUdBCpcSfuiN72AbqeBFu5LVQTjfXDE2A6Q==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"freebsd"
+			],
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/@esbuild/freebsd-x64": {
+			"version": "0.25.9",
+			"resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.9.tgz",
+			"integrity": "sha512-mrKX6H/vOyo5v71YfXWJxLVxgy1kyt1MQaD8wZJgJfG4gq4DpQGpgTB74e5yBeQdyMTbgxp0YtNj7NuHN0PoZg==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"freebsd"
+			],
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/@esbuild/linux-arm": {
+			"version": "0.25.9",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.9.tgz",
+			"integrity": "sha512-HBU2Xv78SMgaydBmdor38lg8YDnFKSARg1Q6AT0/y2ezUAKiZvc211RDFHlEZRFNRVhcMamiToo7bDx3VEOYQw==",
+			"cpu": [
+				"arm"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/@esbuild/linux-arm64": {
+			"version": "0.25.9",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.9.tgz",
+			"integrity": "sha512-BlB7bIcLT3G26urh5Dmse7fiLmLXnRlopw4s8DalgZ8ef79Jj4aUcYbk90g8iCa2467HX8SAIidbL7gsqXHdRw==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/@esbuild/linux-ia32": {
+			"version": "0.25.9",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.9.tgz",
+			"integrity": "sha512-e7S3MOJPZGp2QW6AK6+Ly81rC7oOSerQ+P8L0ta4FhVi+/j/v2yZzx5CqqDaWjtPFfYz21Vi1S0auHrap3Ma3A==",
+			"cpu": [
+				"ia32"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/@esbuild/linux-loong64": {
+			"version": "0.25.9",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.9.tgz",
+			"integrity": "sha512-Sbe10Bnn0oUAB2AalYztvGcK+o6YFFA/9829PhOCUS9vkJElXGdphz0A3DbMdP8gmKkqPmPcMJmJOrI3VYB1JQ==",
+			"cpu": [
+				"loong64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/@esbuild/linux-mips64el": {
+			"version": "0.25.9",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.9.tgz",
+			"integrity": "sha512-YcM5br0mVyZw2jcQeLIkhWtKPeVfAerES5PvOzaDxVtIyZ2NUBZKNLjC5z3/fUlDgT6w89VsxP2qzNipOaaDyA==",
+			"cpu": [
+				"mips64el"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/@esbuild/linux-ppc64": {
+			"version": "0.25.9",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.9.tgz",
+			"integrity": "sha512-++0HQvasdo20JytyDpFvQtNrEsAgNG2CY1CLMwGXfFTKGBGQT3bOeLSYE2l1fYdvML5KUuwn9Z8L1EWe2tzs1w==",
+			"cpu": [
+				"ppc64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/@esbuild/linux-riscv64": {
+			"version": "0.25.9",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.9.tgz",
+			"integrity": "sha512-uNIBa279Y3fkjV+2cUjx36xkx7eSjb8IvnL01eXUKXez/CBHNRw5ekCGMPM0BcmqBxBcdgUWuUXmVWwm4CH9kg==",
+			"cpu": [
+				"riscv64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/@esbuild/linux-s390x": {
+			"version": "0.25.9",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.9.tgz",
+			"integrity": "sha512-Mfiphvp3MjC/lctb+7D287Xw1DGzqJPb/J2aHHcHxflUo+8tmN/6d4k6I2yFR7BVo5/g7x2Monq4+Yew0EHRIA==",
+			"cpu": [
+				"s390x"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/@esbuild/linux-x64": {
+			"version": "0.25.9",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.9.tgz",
+			"integrity": "sha512-iSwByxzRe48YVkmpbgoxVzn76BXjlYFXC7NvLYq+b+kDjyyk30J0JY47DIn8z1MO3K0oSl9fZoRmZPQI4Hklzg==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/@esbuild/netbsd-arm64": {
+			"version": "0.25.9",
+			"resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.9.tgz",
+			"integrity": "sha512-9jNJl6FqaUG+COdQMjSCGW4QiMHH88xWbvZ+kRVblZsWrkXlABuGdFJ1E9L7HK+T0Yqd4akKNa/lO0+jDxQD4Q==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"netbsd"
+			],
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/@esbuild/netbsd-x64": {
+			"version": "0.25.9",
+			"resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.9.tgz",
+			"integrity": "sha512-RLLdkflmqRG8KanPGOU7Rpg829ZHu8nFy5Pqdi9U01VYtG9Y0zOG6Vr2z4/S+/3zIyOxiK6cCeYNWOFR9QP87g==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"netbsd"
+			],
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/@esbuild/openbsd-arm64": {
+			"version": "0.25.9",
+			"resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.9.tgz",
+			"integrity": "sha512-YaFBlPGeDasft5IIM+CQAhJAqS3St3nJzDEgsgFixcfZeyGPCd6eJBWzke5piZuZ7CtL656eOSYKk4Ls2C0FRQ==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"openbsd"
+			],
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/@esbuild/openbsd-x64": {
+			"version": "0.25.9",
+			"resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.9.tgz",
+			"integrity": "sha512-1MkgTCuvMGWuqVtAvkpkXFmtL8XhWy+j4jaSO2wxfJtilVCi0ZE37b8uOdMItIHz4I6z1bWWtEX4CJwcKYLcuA==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"openbsd"
+			],
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/@esbuild/openharmony-arm64": {
+			"version": "0.25.9",
+			"resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.9.tgz",
+			"integrity": "sha512-4Xd0xNiMVXKh6Fa7HEJQbrpP3m3DDn43jKxMjxLLRjWnRsfxjORYJlXPO4JNcXtOyfajXorRKY9NkOpTHptErg==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"openharmony"
+			],
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/@esbuild/sunos-x64": {
+			"version": "0.25.9",
+			"resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.9.tgz",
+			"integrity": "sha512-WjH4s6hzo00nNezhp3wFIAfmGZ8U7KtrJNlFMRKxiI9mxEK1scOMAaa9i4crUtu+tBr+0IN6JCuAcSBJZfnphw==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"sunos"
+			],
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/@esbuild/win32-arm64": {
+			"version": "0.25.9",
+			"resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.9.tgz",
+			"integrity": "sha512-mGFrVJHmZiRqmP8xFOc6b84/7xa5y5YvR1x8djzXpJBSv/UsNK6aqec+6JDjConTgvvQefdGhFDAs2DLAds6gQ==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"win32"
+			],
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/@esbuild/win32-ia32": {
+			"version": "0.25.9",
+			"resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.9.tgz",
+			"integrity": "sha512-b33gLVU2k11nVx1OhX3C8QQP6UHQK4ZtN56oFWvVXvz2VkDoe6fbG8TOgHFxEvqeqohmRnIHe5A1+HADk4OQww==",
+			"cpu": [
+				"ia32"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"win32"
+			],
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/@esbuild/win32-x64": {
+			"version": "0.25.9",
+			"resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.9.tgz",
+			"integrity": "sha512-PPOl1mi6lpLNQxnGoyAfschAodRFYXJ+9fs6WHXz7CSWKbOqiMZsubC+BQsVKuul+3vKLuwTHsS2c2y9EoKwxQ==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"win32"
+			],
+			"engines": {
+				"node": ">=18"
 			}
 		},
 		"node_modules/@eslint-community/eslint-utils": {
@@ -769,1490 +681,6 @@
 				"url": "https://github.com/sponsors/nzakas"
 			}
 		},
-		"node_modules/@isaacs/cliui": {
-			"version": "8.0.2",
-			"resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
-			"integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"string-width": "^5.1.2",
-				"string-width-cjs": "npm:string-width@^4.2.0",
-				"strip-ansi": "^7.0.1",
-				"strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
-				"wrap-ansi": "^8.1.0",
-				"wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
-			},
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@isaacs/cliui/node_modules/ansi-regex": {
-			"version": "6.2.0",
-			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.0.tgz",
-			"integrity": "sha512-TKY5pyBkHyADOPYlRT9Lx6F544mPl0vS5Ew7BJ45hA08Q+t3GjbueLliBWN3sMICk6+y7HdyxSzC4bWS8baBdg==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/ansi-regex?sponsor=1"
-			}
-		},
-		"node_modules/@isaacs/cliui/node_modules/ansi-styles": {
-			"version": "6.2.1",
-			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
-			"integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
-			}
-		},
-		"node_modules/@isaacs/cliui/node_modules/emoji-regex": {
-			"version": "9.2.2",
-			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-			"integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/@isaacs/cliui/node_modules/string-width": {
-			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
-			"integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"eastasianwidth": "^0.2.0",
-				"emoji-regex": "^9.2.2",
-				"strip-ansi": "^7.0.1"
-			},
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/@isaacs/cliui/node_modules/strip-ansi": {
-			"version": "7.1.0",
-			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
-			"integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"ansi-regex": "^6.0.1"
-			},
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/strip-ansi?sponsor=1"
-			}
-		},
-		"node_modules/@isaacs/cliui/node_modules/wrap-ansi": {
-			"version": "8.1.0",
-			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
-			"integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"ansi-styles": "^6.1.0",
-				"string-width": "^5.0.1",
-				"strip-ansi": "^7.0.1"
-			},
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-			}
-		},
-		"node_modules/@istanbuljs/load-nyc-config": {
-			"version": "1.1.0",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"camelcase": "^5.3.1",
-				"find-up": "^4.1.0",
-				"get-package-type": "^0.1.0",
-				"js-yaml": "^3.13.1",
-				"resolve-from": "^5.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/@istanbuljs/load-nyc-config/node_modules/argparse": {
-			"version": "1.0.10",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"sprintf-js": "~1.0.2"
-			}
-		},
-		"node_modules/@istanbuljs/load-nyc-config/node_modules/find-up": {
-			"version": "4.1.0",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"locate-path": "^5.0.0",
-				"path-exists": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/@istanbuljs/load-nyc-config/node_modules/js-yaml": {
-			"version": "3.14.1",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"argparse": "^1.0.7",
-				"esprima": "^4.0.0"
-			},
-			"bin": {
-				"js-yaml": "bin/js-yaml.js"
-			}
-		},
-		"node_modules/@istanbuljs/load-nyc-config/node_modules/locate-path": {
-			"version": "5.0.0",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"p-locate": "^4.1.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/@istanbuljs/load-nyc-config/node_modules/p-limit": {
-			"version": "2.3.0",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"p-try": "^2.0.0"
-			},
-			"engines": {
-				"node": ">=6"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/@istanbuljs/load-nyc-config/node_modules/p-locate": {
-			"version": "4.1.0",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"p-limit": "^2.2.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/@istanbuljs/load-nyc-config/node_modules/resolve-from": {
-			"version": "5.0.0",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/@istanbuljs/schema": {
-			"version": "0.1.3",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/@jest/console": {
-			"version": "30.1.1",
-			"resolved": "https://registry.npmjs.org/@jest/console/-/console-30.1.1.tgz",
-			"integrity": "sha512-f7TGqR1k4GtN5pyFrKmq+ZVndesiwLU33yDpJIGMS9aW+j6hKjue7ljeAdznBsH9kAnxUWe2Y+Y3fLV/FJt3gA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/types": "30.0.5",
-				"@types/node": "*",
-				"chalk": "^4.1.2",
-				"jest-message-util": "30.1.0",
-				"jest-util": "30.0.5",
-				"slash": "^3.0.0"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/@jest/console/node_modules/@jest/schemas": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
-			"integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@sinclair/typebox": "^0.34.0"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/@jest/console/node_modules/@jest/types": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.5.tgz",
-			"integrity": "sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/pattern": "30.0.1",
-				"@jest/schemas": "30.0.5",
-				"@types/istanbul-lib-coverage": "^2.0.6",
-				"@types/istanbul-reports": "^3.0.4",
-				"@types/node": "*",
-				"@types/yargs": "^17.0.33",
-				"chalk": "^4.1.2"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/@jest/console/node_modules/@sinclair/typebox": {
-			"version": "0.34.40",
-			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.40.tgz",
-			"integrity": "sha512-gwBNIP8ZAYev/ORDWW0QvxdwPXwxBtLsdsJgSc7eDIRt8ubP+rxUBzPsrwnu16fgEF8Bx4lh/+mvQvJzcTM6Kw==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/@jest/console/node_modules/ci-info": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.0.tgz",
-			"integrity": "sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/sibiraj-s"
-				}
-			],
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/@jest/console/node_modules/jest-util": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-30.0.5.tgz",
-			"integrity": "sha512-pvyPWssDZR0FlfMxCBoc0tvM8iUEskaRFALUtGQYzVEAqisAztmy+R8LnU14KT4XA0H/a5HMVTXat1jLne010g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/types": "30.0.5",
-				"@types/node": "*",
-				"chalk": "^4.1.2",
-				"ci-info": "^4.2.0",
-				"graceful-fs": "^4.2.11",
-				"picomatch": "^4.0.2"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/@jest/console/node_modules/picomatch": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-			"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/jonschlinkert"
-			}
-		},
-		"node_modules/@jest/core": {
-			"version": "30.1.1",
-			"resolved": "https://registry.npmjs.org/@jest/core/-/core-30.1.1.tgz",
-			"integrity": "sha512-3ncU9peZ3D2VdgRkdZtUceTrDgX5yiDRwAFjtxNfU22IiZrpVWlv/FogzDLYSJQptQGfFo3PcHK86a2oG6WUGg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/console": "30.1.1",
-				"@jest/pattern": "30.0.1",
-				"@jest/reporters": "30.1.1",
-				"@jest/test-result": "30.1.1",
-				"@jest/transform": "30.1.1",
-				"@jest/types": "30.0.5",
-				"@types/node": "*",
-				"ansi-escapes": "^4.3.2",
-				"chalk": "^4.1.2",
-				"ci-info": "^4.2.0",
-				"exit-x": "^0.2.2",
-				"graceful-fs": "^4.2.11",
-				"jest-changed-files": "30.0.5",
-				"jest-config": "30.1.1",
-				"jest-haste-map": "30.1.0",
-				"jest-message-util": "30.1.0",
-				"jest-regex-util": "30.0.1",
-				"jest-resolve": "30.1.0",
-				"jest-resolve-dependencies": "30.1.1",
-				"jest-runner": "30.1.1",
-				"jest-runtime": "30.1.1",
-				"jest-snapshot": "30.1.1",
-				"jest-util": "30.0.5",
-				"jest-validate": "30.1.0",
-				"jest-watcher": "30.1.1",
-				"micromatch": "^4.0.8",
-				"pretty-format": "30.0.5",
-				"slash": "^3.0.0"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			},
-			"peerDependencies": {
-				"node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
-			},
-			"peerDependenciesMeta": {
-				"node-notifier": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/@jest/core/node_modules/@jest/schemas": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
-			"integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@sinclair/typebox": "^0.34.0"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/@jest/core/node_modules/@jest/transform": {
-			"version": "30.1.1",
-			"resolved": "https://registry.npmjs.org/@jest/transform/-/transform-30.1.1.tgz",
-			"integrity": "sha512-PHIA2AbAASBfk6evkNifvmx9lkOSkmvaQoO6VSpuL8+kQqDMHeDoJ7RU3YP1wWAMD7AyQn9UL5iheuFYCC4lqQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/core": "^7.27.4",
-				"@jest/types": "30.0.5",
-				"@jridgewell/trace-mapping": "^0.3.25",
-				"babel-plugin-istanbul": "^7.0.0",
-				"chalk": "^4.1.2",
-				"convert-source-map": "^2.0.0",
-				"fast-json-stable-stringify": "^2.1.0",
-				"graceful-fs": "^4.2.11",
-				"jest-haste-map": "30.1.0",
-				"jest-regex-util": "30.0.1",
-				"jest-util": "30.0.5",
-				"micromatch": "^4.0.8",
-				"pirates": "^4.0.7",
-				"slash": "^3.0.0",
-				"write-file-atomic": "^5.0.1"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/@jest/core/node_modules/@jest/types": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.5.tgz",
-			"integrity": "sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/pattern": "30.0.1",
-				"@jest/schemas": "30.0.5",
-				"@types/istanbul-lib-coverage": "^2.0.6",
-				"@types/istanbul-reports": "^3.0.4",
-				"@types/node": "*",
-				"@types/yargs": "^17.0.33",
-				"chalk": "^4.1.2"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/@jest/core/node_modules/@sinclair/typebox": {
-			"version": "0.34.40",
-			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.40.tgz",
-			"integrity": "sha512-gwBNIP8ZAYev/ORDWW0QvxdwPXwxBtLsdsJgSc7eDIRt8ubP+rxUBzPsrwnu16fgEF8Bx4lh/+mvQvJzcTM6Kw==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/@jest/core/node_modules/babel-plugin-istanbul": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-7.0.0.tgz",
-			"integrity": "sha512-C5OzENSx/A+gt7t4VH1I2XsflxyPUmXRFPKBxt33xncdOmq7oROVM3bZv9Ysjjkv8OJYDMa+tKuKMvqU/H3xdw==",
-			"dev": true,
-			"license": "BSD-3-Clause",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.0.0",
-				"@istanbuljs/load-nyc-config": "^1.0.0",
-				"@istanbuljs/schema": "^0.1.3",
-				"istanbul-lib-instrument": "^6.0.2",
-				"test-exclude": "^6.0.0"
-			},
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@jest/core/node_modules/ci-info": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.0.tgz",
-			"integrity": "sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/sibiraj-s"
-				}
-			],
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/@jest/core/node_modules/jest-haste-map": {
-			"version": "30.1.0",
-			"resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-30.1.0.tgz",
-			"integrity": "sha512-JLeM84kNjpRkggcGpQLsV7B8W4LNUWz7oDNVnY1Vjj22b5/fAb3kk3htiD+4Na8bmJmjJR7rBtS2Rmq/NEcADg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/types": "30.0.5",
-				"@types/node": "*",
-				"anymatch": "^3.1.3",
-				"fb-watchman": "^2.0.2",
-				"graceful-fs": "^4.2.11",
-				"jest-regex-util": "30.0.1",
-				"jest-util": "30.0.5",
-				"jest-worker": "30.1.0",
-				"micromatch": "^4.0.8",
-				"walker": "^1.0.8"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			},
-			"optionalDependencies": {
-				"fsevents": "^2.3.3"
-			}
-		},
-		"node_modules/@jest/core/node_modules/jest-regex-util": {
-			"version": "30.0.1",
-			"resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-30.0.1.tgz",
-			"integrity": "sha512-jHEQgBXAgc+Gh4g0p3bCevgRCVRkB4VB70zhoAE48gxeSr1hfUOsM/C2WoJgVL7Eyg//hudYENbm3Ne+/dRVVA==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/@jest/core/node_modules/jest-util": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-30.0.5.tgz",
-			"integrity": "sha512-pvyPWssDZR0FlfMxCBoc0tvM8iUEskaRFALUtGQYzVEAqisAztmy+R8LnU14KT4XA0H/a5HMVTXat1jLne010g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/types": "30.0.5",
-				"@types/node": "*",
-				"chalk": "^4.1.2",
-				"ci-info": "^4.2.0",
-				"graceful-fs": "^4.2.11",
-				"picomatch": "^4.0.2"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/@jest/core/node_modules/jest-worker": {
-			"version": "30.1.0",
-			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-30.1.0.tgz",
-			"integrity": "sha512-uvWcSjlwAAgIu133Tt77A05H7RIk3Ho8tZL50bQM2AkvLdluw9NG48lRCl3Dt+MOH719n/0nnb5YxUwcuJiKRA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@types/node": "*",
-				"@ungap/structured-clone": "^1.3.0",
-				"jest-util": "30.0.5",
-				"merge-stream": "^2.0.0",
-				"supports-color": "^8.1.1"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/@jest/core/node_modules/picomatch": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-			"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/jonschlinkert"
-			}
-		},
-		"node_modules/@jest/core/node_modules/signal-exit": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
-			"integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
-			"dev": true,
-			"license": "ISC",
-			"engines": {
-				"node": ">=14"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			}
-		},
-		"node_modules/@jest/core/node_modules/write-file-atomic": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz",
-			"integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"imurmurhash": "^0.1.4",
-				"signal-exit": "^4.0.1"
-			},
-			"engines": {
-				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-			}
-		},
-		"node_modules/@jest/diff-sequences": {
-			"version": "30.0.1",
-			"resolved": "https://registry.npmjs.org/@jest/diff-sequences/-/diff-sequences-30.0.1.tgz",
-			"integrity": "sha512-n5H8QLDJ47QqbCNn5SuFjCRDrOLEZ0h8vAHCK5RL9Ls7Xa8AQLa/YxAc9UjFqoEDM48muwtBGjtMY5cr0PLDCw==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/@jest/environment": {
-			"version": "30.1.1",
-			"resolved": "https://registry.npmjs.org/@jest/environment/-/environment-30.1.1.tgz",
-			"integrity": "sha512-yWHbU+3j7ehQE+NRpnxRvHvpUhoohIjMePBbIr8lfe0cWVb0WeTf80DNux1GPJa18CDHiIU5DtksGUfxcDE+Rw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/fake-timers": "30.1.1",
-				"@jest/types": "30.0.5",
-				"@types/node": "*",
-				"jest-mock": "30.0.5"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/@jest/environment/node_modules/@jest/schemas": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
-			"integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@sinclair/typebox": "^0.34.0"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/@jest/environment/node_modules/@jest/types": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.5.tgz",
-			"integrity": "sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/pattern": "30.0.1",
-				"@jest/schemas": "30.0.5",
-				"@types/istanbul-lib-coverage": "^2.0.6",
-				"@types/istanbul-reports": "^3.0.4",
-				"@types/node": "*",
-				"@types/yargs": "^17.0.33",
-				"chalk": "^4.1.2"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/@jest/environment/node_modules/@sinclair/typebox": {
-			"version": "0.34.40",
-			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.40.tgz",
-			"integrity": "sha512-gwBNIP8ZAYev/ORDWW0QvxdwPXwxBtLsdsJgSc7eDIRt8ubP+rxUBzPsrwnu16fgEF8Bx4lh/+mvQvJzcTM6Kw==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/@jest/expect": {
-			"version": "30.1.1",
-			"resolved": "https://registry.npmjs.org/@jest/expect/-/expect-30.1.1.tgz",
-			"integrity": "sha512-3vHIHsF+qd3D8FU2c7U5l3rg1fhDwAYcGyHyZAi94YIlTwcJ+boNhRyJf373cl4wxbOX+0Q7dF40RTrTFTSuig==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"expect": "30.1.1",
-				"jest-snapshot": "30.1.1"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/@jest/expect-utils": {
-			"version": "30.1.1",
-			"resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-30.1.1.tgz",
-			"integrity": "sha512-5YUHr27fpJ64dnvtu+tt11ewATynrHkGYD+uSFgRr8V2eFJis/vEXgToyLwccIwqBihVfz9jwio+Zr1ab1Zihw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/get-type": "30.1.0"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/@jest/fake-timers": {
-			"version": "30.1.1",
-			"resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-30.1.1.tgz",
-			"integrity": "sha512-fK/25dNgBNYPw3eLi2CRs57g1H04qBAFNMsUY3IRzkfx/m4THe0E1zF+yGQBOMKKc2XQVdc9EYbJ4hEm7/2UtA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/types": "30.0.5",
-				"@sinonjs/fake-timers": "^13.0.0",
-				"@types/node": "*",
-				"jest-message-util": "30.1.0",
-				"jest-mock": "30.0.5",
-				"jest-util": "30.0.5"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/@jest/fake-timers/node_modules/@jest/schemas": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
-			"integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@sinclair/typebox": "^0.34.0"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/@jest/fake-timers/node_modules/@jest/types": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.5.tgz",
-			"integrity": "sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/pattern": "30.0.1",
-				"@jest/schemas": "30.0.5",
-				"@types/istanbul-lib-coverage": "^2.0.6",
-				"@types/istanbul-reports": "^3.0.4",
-				"@types/node": "*",
-				"@types/yargs": "^17.0.33",
-				"chalk": "^4.1.2"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/@jest/fake-timers/node_modules/@sinclair/typebox": {
-			"version": "0.34.40",
-			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.40.tgz",
-			"integrity": "sha512-gwBNIP8ZAYev/ORDWW0QvxdwPXwxBtLsdsJgSc7eDIRt8ubP+rxUBzPsrwnu16fgEF8Bx4lh/+mvQvJzcTM6Kw==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/@jest/fake-timers/node_modules/ci-info": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.0.tgz",
-			"integrity": "sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/sibiraj-s"
-				}
-			],
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/@jest/fake-timers/node_modules/jest-util": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-30.0.5.tgz",
-			"integrity": "sha512-pvyPWssDZR0FlfMxCBoc0tvM8iUEskaRFALUtGQYzVEAqisAztmy+R8LnU14KT4XA0H/a5HMVTXat1jLne010g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/types": "30.0.5",
-				"@types/node": "*",
-				"chalk": "^4.1.2",
-				"ci-info": "^4.2.0",
-				"graceful-fs": "^4.2.11",
-				"picomatch": "^4.0.2"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/@jest/fake-timers/node_modules/picomatch": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-			"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/jonschlinkert"
-			}
-		},
-		"node_modules/@jest/get-type": {
-			"version": "30.1.0",
-			"resolved": "https://registry.npmjs.org/@jest/get-type/-/get-type-30.1.0.tgz",
-			"integrity": "sha512-eMbZE2hUnx1WV0pmURZY9XoXPkUYjpc55mb0CrhtdWLtzMQPFvu/rZkTLZFTsdaVQa+Tr4eWAteqcUzoawq/uA==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/@jest/globals": {
-			"version": "30.1.1",
-			"resolved": "https://registry.npmjs.org/@jest/globals/-/globals-30.1.1.tgz",
-			"integrity": "sha512-NNUUkHT2TU/xztZl6r1UXvJL+zvCwmZsQDmK69fVHHcB9fBtlu3FInnzOve/ZoyKnWY8JXWJNT+Lkmu1+ubXUA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/environment": "30.1.1",
-				"@jest/expect": "30.1.1",
-				"@jest/types": "30.0.5",
-				"jest-mock": "30.0.5"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/@jest/globals/node_modules/@jest/schemas": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
-			"integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@sinclair/typebox": "^0.34.0"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/@jest/globals/node_modules/@jest/types": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.5.tgz",
-			"integrity": "sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/pattern": "30.0.1",
-				"@jest/schemas": "30.0.5",
-				"@types/istanbul-lib-coverage": "^2.0.6",
-				"@types/istanbul-reports": "^3.0.4",
-				"@types/node": "*",
-				"@types/yargs": "^17.0.33",
-				"chalk": "^4.1.2"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/@jest/globals/node_modules/@sinclair/typebox": {
-			"version": "0.34.40",
-			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.40.tgz",
-			"integrity": "sha512-gwBNIP8ZAYev/ORDWW0QvxdwPXwxBtLsdsJgSc7eDIRt8ubP+rxUBzPsrwnu16fgEF8Bx4lh/+mvQvJzcTM6Kw==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/@jest/pattern": {
-			"version": "30.0.1",
-			"resolved": "https://registry.npmjs.org/@jest/pattern/-/pattern-30.0.1.tgz",
-			"integrity": "sha512-gWp7NfQW27LaBQz3TITS8L7ZCQ0TLvtmI//4OwlQRx4rnWxcPNIYjxZpDcN4+UlGxgm3jS5QPz8IPTCkb59wZA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@types/node": "*",
-				"jest-regex-util": "30.0.1"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/@jest/pattern/node_modules/jest-regex-util": {
-			"version": "30.0.1",
-			"resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-30.0.1.tgz",
-			"integrity": "sha512-jHEQgBXAgc+Gh4g0p3bCevgRCVRkB4VB70zhoAE48gxeSr1hfUOsM/C2WoJgVL7Eyg//hudYENbm3Ne+/dRVVA==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/@jest/reporters": {
-			"version": "30.1.1",
-			"resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-30.1.1.tgz",
-			"integrity": "sha512-Hb2Bq80kahOC6Sv2waEaH1rEU6VdFcM6WHaRBWQF9tf30+nJHxhl/Upbgo9+25f0mOgbphxvbwSMjSgy9gW/FA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@bcoe/v8-coverage": "^0.2.3",
-				"@jest/console": "30.1.1",
-				"@jest/test-result": "30.1.1",
-				"@jest/transform": "30.1.1",
-				"@jest/types": "30.0.5",
-				"@jridgewell/trace-mapping": "^0.3.25",
-				"@types/node": "*",
-				"chalk": "^4.1.2",
-				"collect-v8-coverage": "^1.0.2",
-				"exit-x": "^0.2.2",
-				"glob": "^10.3.10",
-				"graceful-fs": "^4.2.11",
-				"istanbul-lib-coverage": "^3.0.0",
-				"istanbul-lib-instrument": "^6.0.0",
-				"istanbul-lib-report": "^3.0.0",
-				"istanbul-lib-source-maps": "^5.0.0",
-				"istanbul-reports": "^3.1.3",
-				"jest-message-util": "30.1.0",
-				"jest-util": "30.0.5",
-				"jest-worker": "30.1.0",
-				"slash": "^3.0.0",
-				"string-length": "^4.0.2",
-				"v8-to-istanbul": "^9.0.1"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			},
-			"peerDependencies": {
-				"node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
-			},
-			"peerDependenciesMeta": {
-				"node-notifier": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/@jest/reporters/node_modules/@jest/schemas": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
-			"integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@sinclair/typebox": "^0.34.0"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/@jest/reporters/node_modules/@jest/transform": {
-			"version": "30.1.1",
-			"resolved": "https://registry.npmjs.org/@jest/transform/-/transform-30.1.1.tgz",
-			"integrity": "sha512-PHIA2AbAASBfk6evkNifvmx9lkOSkmvaQoO6VSpuL8+kQqDMHeDoJ7RU3YP1wWAMD7AyQn9UL5iheuFYCC4lqQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/core": "^7.27.4",
-				"@jest/types": "30.0.5",
-				"@jridgewell/trace-mapping": "^0.3.25",
-				"babel-plugin-istanbul": "^7.0.0",
-				"chalk": "^4.1.2",
-				"convert-source-map": "^2.0.0",
-				"fast-json-stable-stringify": "^2.1.0",
-				"graceful-fs": "^4.2.11",
-				"jest-haste-map": "30.1.0",
-				"jest-regex-util": "30.0.1",
-				"jest-util": "30.0.5",
-				"micromatch": "^4.0.8",
-				"pirates": "^4.0.7",
-				"slash": "^3.0.0",
-				"write-file-atomic": "^5.0.1"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/@jest/reporters/node_modules/@jest/types": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.5.tgz",
-			"integrity": "sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/pattern": "30.0.1",
-				"@jest/schemas": "30.0.5",
-				"@types/istanbul-lib-coverage": "^2.0.6",
-				"@types/istanbul-reports": "^3.0.4",
-				"@types/node": "*",
-				"@types/yargs": "^17.0.33",
-				"chalk": "^4.1.2"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/@jest/reporters/node_modules/@sinclair/typebox": {
-			"version": "0.34.40",
-			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.40.tgz",
-			"integrity": "sha512-gwBNIP8ZAYev/ORDWW0QvxdwPXwxBtLsdsJgSc7eDIRt8ubP+rxUBzPsrwnu16fgEF8Bx4lh/+mvQvJzcTM6Kw==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/@jest/reporters/node_modules/babel-plugin-istanbul": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-7.0.0.tgz",
-			"integrity": "sha512-C5OzENSx/A+gt7t4VH1I2XsflxyPUmXRFPKBxt33xncdOmq7oROVM3bZv9Ysjjkv8OJYDMa+tKuKMvqU/H3xdw==",
-			"dev": true,
-			"license": "BSD-3-Clause",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.0.0",
-				"@istanbuljs/load-nyc-config": "^1.0.0",
-				"@istanbuljs/schema": "^0.1.3",
-				"istanbul-lib-instrument": "^6.0.2",
-				"test-exclude": "^6.0.0"
-			},
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@jest/reporters/node_modules/brace-expansion": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-			"integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"balanced-match": "^1.0.0"
-			}
-		},
-		"node_modules/@jest/reporters/node_modules/ci-info": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.0.tgz",
-			"integrity": "sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/sibiraj-s"
-				}
-			],
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/@jest/reporters/node_modules/glob": {
-			"version": "10.4.5",
-			"resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
-			"integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"foreground-child": "^3.1.0",
-				"jackspeak": "^3.1.2",
-				"minimatch": "^9.0.4",
-				"minipass": "^7.1.2",
-				"package-json-from-dist": "^1.0.0",
-				"path-scurry": "^1.11.1"
-			},
-			"bin": {
-				"glob": "dist/esm/bin.mjs"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			}
-		},
-		"node_modules/@jest/reporters/node_modules/jest-haste-map": {
-			"version": "30.1.0",
-			"resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-30.1.0.tgz",
-			"integrity": "sha512-JLeM84kNjpRkggcGpQLsV7B8W4LNUWz7oDNVnY1Vjj22b5/fAb3kk3htiD+4Na8bmJmjJR7rBtS2Rmq/NEcADg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/types": "30.0.5",
-				"@types/node": "*",
-				"anymatch": "^3.1.3",
-				"fb-watchman": "^2.0.2",
-				"graceful-fs": "^4.2.11",
-				"jest-regex-util": "30.0.1",
-				"jest-util": "30.0.5",
-				"jest-worker": "30.1.0",
-				"micromatch": "^4.0.8",
-				"walker": "^1.0.8"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			},
-			"optionalDependencies": {
-				"fsevents": "^2.3.3"
-			}
-		},
-		"node_modules/@jest/reporters/node_modules/jest-regex-util": {
-			"version": "30.0.1",
-			"resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-30.0.1.tgz",
-			"integrity": "sha512-jHEQgBXAgc+Gh4g0p3bCevgRCVRkB4VB70zhoAE48gxeSr1hfUOsM/C2WoJgVL7Eyg//hudYENbm3Ne+/dRVVA==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/@jest/reporters/node_modules/jest-util": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-30.0.5.tgz",
-			"integrity": "sha512-pvyPWssDZR0FlfMxCBoc0tvM8iUEskaRFALUtGQYzVEAqisAztmy+R8LnU14KT4XA0H/a5HMVTXat1jLne010g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/types": "30.0.5",
-				"@types/node": "*",
-				"chalk": "^4.1.2",
-				"ci-info": "^4.2.0",
-				"graceful-fs": "^4.2.11",
-				"picomatch": "^4.0.2"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/@jest/reporters/node_modules/jest-worker": {
-			"version": "30.1.0",
-			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-30.1.0.tgz",
-			"integrity": "sha512-uvWcSjlwAAgIu133Tt77A05H7RIk3Ho8tZL50bQM2AkvLdluw9NG48lRCl3Dt+MOH719n/0nnb5YxUwcuJiKRA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@types/node": "*",
-				"@ungap/structured-clone": "^1.3.0",
-				"jest-util": "30.0.5",
-				"merge-stream": "^2.0.0",
-				"supports-color": "^8.1.1"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/@jest/reporters/node_modules/minimatch": {
-			"version": "9.0.5",
-			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-			"integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"brace-expansion": "^2.0.1"
-			},
-			"engines": {
-				"node": ">=16 || 14 >=14.17"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			}
-		},
-		"node_modules/@jest/reporters/node_modules/picomatch": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-			"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/jonschlinkert"
-			}
-		},
-		"node_modules/@jest/reporters/node_modules/signal-exit": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
-			"integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
-			"dev": true,
-			"license": "ISC",
-			"engines": {
-				"node": ">=14"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			}
-		},
-		"node_modules/@jest/reporters/node_modules/write-file-atomic": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz",
-			"integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"imurmurhash": "^0.1.4",
-				"signal-exit": "^4.0.1"
-			},
-			"engines": {
-				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-			}
-		},
-		"node_modules/@jest/schemas": {
-			"version": "29.6.3",
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"peer": true,
-			"dependencies": {
-				"@sinclair/typebox": "^0.27.8"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/@jest/snapshot-utils": {
-			"version": "30.1.1",
-			"resolved": "https://registry.npmjs.org/@jest/snapshot-utils/-/snapshot-utils-30.1.1.tgz",
-			"integrity": "sha512-TkVBc9wuN22TT8hESRFmjjg/xIMu7z0J3UDYtIRydzCqlLPTB7jK1DDBKdnTUZ4zL3z3rnPpzV6rL1Uzh87sXg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/types": "30.0.5",
-				"chalk": "^4.1.2",
-				"graceful-fs": "^4.2.11",
-				"natural-compare": "^1.4.0"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/@jest/snapshot-utils/node_modules/@jest/schemas": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
-			"integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@sinclair/typebox": "^0.34.0"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/@jest/snapshot-utils/node_modules/@jest/types": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.5.tgz",
-			"integrity": "sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/pattern": "30.0.1",
-				"@jest/schemas": "30.0.5",
-				"@types/istanbul-lib-coverage": "^2.0.6",
-				"@types/istanbul-reports": "^3.0.4",
-				"@types/node": "*",
-				"@types/yargs": "^17.0.33",
-				"chalk": "^4.1.2"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/@jest/snapshot-utils/node_modules/@sinclair/typebox": {
-			"version": "0.34.40",
-			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.40.tgz",
-			"integrity": "sha512-gwBNIP8ZAYev/ORDWW0QvxdwPXwxBtLsdsJgSc7eDIRt8ubP+rxUBzPsrwnu16fgEF8Bx4lh/+mvQvJzcTM6Kw==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/@jest/source-map": {
-			"version": "30.0.1",
-			"resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-30.0.1.tgz",
-			"integrity": "sha512-MIRWMUUR3sdbP36oyNyhbThLHyJ2eEDClPCiHVbrYAe5g3CHRArIVpBw7cdSB5fr+ofSfIb2Tnsw8iEHL0PYQg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jridgewell/trace-mapping": "^0.3.25",
-				"callsites": "^3.1.0",
-				"graceful-fs": "^4.2.11"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/@jest/test-result": {
-			"version": "30.1.1",
-			"resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-30.1.1.tgz",
-			"integrity": "sha512-bMdj7fNu8iZuBPSnbVir5ezvWmVo4jrw7xDE+A33Yb3ENCoiJK9XgOLgal+rJ9XSKjsL7aPUMIo87zhN7I5o2w==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/console": "30.1.1",
-				"@jest/types": "30.0.5",
-				"@types/istanbul-lib-coverage": "^2.0.6",
-				"collect-v8-coverage": "^1.0.2"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/@jest/test-result/node_modules/@jest/schemas": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
-			"integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@sinclair/typebox": "^0.34.0"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/@jest/test-result/node_modules/@jest/types": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.5.tgz",
-			"integrity": "sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/pattern": "30.0.1",
-				"@jest/schemas": "30.0.5",
-				"@types/istanbul-lib-coverage": "^2.0.6",
-				"@types/istanbul-reports": "^3.0.4",
-				"@types/node": "*",
-				"@types/yargs": "^17.0.33",
-				"chalk": "^4.1.2"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/@jest/test-result/node_modules/@sinclair/typebox": {
-			"version": "0.34.40",
-			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.40.tgz",
-			"integrity": "sha512-gwBNIP8ZAYev/ORDWW0QvxdwPXwxBtLsdsJgSc7eDIRt8ubP+rxUBzPsrwnu16fgEF8Bx4lh/+mvQvJzcTM6Kw==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/@jest/test-sequencer": {
-			"version": "30.1.1",
-			"resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-30.1.1.tgz",
-			"integrity": "sha512-yruRdLXSA3HYD/MTNykgJ6VYEacNcXDFRMqKVAwlYegmxICUiT/B++CNuhJnYJzKYks61iYnjVsMwbUqmmAYJg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/test-result": "30.1.1",
-				"graceful-fs": "^4.2.11",
-				"jest-haste-map": "30.1.0",
-				"slash": "^3.0.0"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/@jest/test-sequencer/node_modules/@jest/schemas": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
-			"integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@sinclair/typebox": "^0.34.0"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/@jest/test-sequencer/node_modules/@jest/types": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.5.tgz",
-			"integrity": "sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/pattern": "30.0.1",
-				"@jest/schemas": "30.0.5",
-				"@types/istanbul-lib-coverage": "^2.0.6",
-				"@types/istanbul-reports": "^3.0.4",
-				"@types/node": "*",
-				"@types/yargs": "^17.0.33",
-				"chalk": "^4.1.2"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/@jest/test-sequencer/node_modules/@sinclair/typebox": {
-			"version": "0.34.40",
-			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.40.tgz",
-			"integrity": "sha512-gwBNIP8ZAYev/ORDWW0QvxdwPXwxBtLsdsJgSc7eDIRt8ubP+rxUBzPsrwnu16fgEF8Bx4lh/+mvQvJzcTM6Kw==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/@jest/test-sequencer/node_modules/ci-info": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.0.tgz",
-			"integrity": "sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/sibiraj-s"
-				}
-			],
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/@jest/test-sequencer/node_modules/jest-haste-map": {
-			"version": "30.1.0",
-			"resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-30.1.0.tgz",
-			"integrity": "sha512-JLeM84kNjpRkggcGpQLsV7B8W4LNUWz7oDNVnY1Vjj22b5/fAb3kk3htiD+4Na8bmJmjJR7rBtS2Rmq/NEcADg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/types": "30.0.5",
-				"@types/node": "*",
-				"anymatch": "^3.1.3",
-				"fb-watchman": "^2.0.2",
-				"graceful-fs": "^4.2.11",
-				"jest-regex-util": "30.0.1",
-				"jest-util": "30.0.5",
-				"jest-worker": "30.1.0",
-				"micromatch": "^4.0.8",
-				"walker": "^1.0.8"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			},
-			"optionalDependencies": {
-				"fsevents": "^2.3.3"
-			}
-		},
-		"node_modules/@jest/test-sequencer/node_modules/jest-regex-util": {
-			"version": "30.0.1",
-			"resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-30.0.1.tgz",
-			"integrity": "sha512-jHEQgBXAgc+Gh4g0p3bCevgRCVRkB4VB70zhoAE48gxeSr1hfUOsM/C2WoJgVL7Eyg//hudYENbm3Ne+/dRVVA==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/@jest/test-sequencer/node_modules/jest-util": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-30.0.5.tgz",
-			"integrity": "sha512-pvyPWssDZR0FlfMxCBoc0tvM8iUEskaRFALUtGQYzVEAqisAztmy+R8LnU14KT4XA0H/a5HMVTXat1jLne010g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/types": "30.0.5",
-				"@types/node": "*",
-				"chalk": "^4.1.2",
-				"ci-info": "^4.2.0",
-				"graceful-fs": "^4.2.11",
-				"picomatch": "^4.0.2"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/@jest/test-sequencer/node_modules/jest-worker": {
-			"version": "30.1.0",
-			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-30.1.0.tgz",
-			"integrity": "sha512-uvWcSjlwAAgIu133Tt77A05H7RIk3Ho8tZL50bQM2AkvLdluw9NG48lRCl3Dt+MOH719n/0nnb5YxUwcuJiKRA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@types/node": "*",
-				"@ungap/structured-clone": "^1.3.0",
-				"jest-util": "30.0.5",
-				"merge-stream": "^2.0.0",
-				"supports-color": "^8.1.1"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/@jest/test-sequencer/node_modules/picomatch": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-			"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/jonschlinkert"
-			}
-		},
-		"node_modules/@jest/transform": {
-			"version": "29.7.0",
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"peer": true,
-			"dependencies": {
-				"@babel/core": "^7.11.6",
-				"@jest/types": "^29.6.3",
-				"@jridgewell/trace-mapping": "^0.3.18",
-				"babel-plugin-istanbul": "^6.1.1",
-				"chalk": "^4.0.0",
-				"convert-source-map": "^2.0.0",
-				"fast-json-stable-stringify": "^2.1.0",
-				"graceful-fs": "^4.2.9",
-				"jest-haste-map": "^29.7.0",
-				"jest-regex-util": "^29.6.3",
-				"jest-util": "^29.7.0",
-				"micromatch": "^4.0.4",
-				"pirates": "^4.0.4",
-				"slash": "^3.0.0",
-				"write-file-atomic": "^4.0.2"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/@jest/types": {
-			"version": "29.6.3",
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"peer": true,
-			"dependencies": {
-				"@jest/schemas": "^29.6.3",
-				"@types/istanbul-lib-coverage": "^2.0.0",
-				"@types/istanbul-reports": "^3.0.0",
-				"@types/node": "*",
-				"@types/yargs": "^17.0.8",
-				"chalk": "^4.0.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
 		"node_modules/@jridgewell/gen-mapping": {
 			"version": "0.3.13",
 			"resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz",
@@ -2303,19 +731,6 @@
 			"license": "MIT",
 			"peer": true
 		},
-		"node_modules/@napi-rs/wasm-runtime": {
-			"version": "0.2.12",
-			"resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.12.tgz",
-			"integrity": "sha512-ZVWUcfwY4E/yPitQJl481FjFo3K22D6qF0DuFH6Y/nbnE11GY5uguDxZMGXPQ8WQ0128MXQD7TnfHyK4oWoIJQ==",
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"dependencies": {
-				"@emnapi/core": "^1.4.3",
-				"@emnapi/runtime": "^1.4.3",
-				"@tybys/wasm-util": "^0.10.0"
-			}
-		},
 		"node_modules/@nodelib/fs.scandir": {
 			"version": "2.1.5",
 			"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -2427,105 +842,6 @@
 				"url": "https://opencollective.com/parcel"
 			}
 		},
-		"node_modules/@pkgjs/parseargs": {
-			"version": "0.11.0",
-			"resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
-			"integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"engines": {
-				"node": ">=14"
-			}
-		},
-		"node_modules/@pkgr/core": {
-			"version": "0.2.9",
-			"resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.2.9.tgz",
-			"integrity": "sha512-QNqXyfVS2wm9hweSYD2O7F0G06uurj9kZ96TRQE5Y9hU7+tgdZwIkbAKc5Ocy1HxEY2kuDQa6cQ1WRs/O5LFKA==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": "^12.20.0 || ^14.18.0 || >=16.0.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/pkgr"
-			}
-		},
-		"node_modules/@sinclair/typebox": {
-			"version": "0.27.8",
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"peer": true
-		},
-		"node_modules/@sinonjs/commons": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz",
-			"integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==",
-			"dev": true,
-			"license": "BSD-3-Clause",
-			"dependencies": {
-				"type-detect": "4.0.8"
-			}
-		},
-		"node_modules/@sinonjs/fake-timers": {
-			"version": "13.0.5",
-			"resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-13.0.5.tgz",
-			"integrity": "sha512-36/hTbH2uaWuGVERyC6da9YwGWnzUZXuPro/F2LfsdOsLnCojz/iSH8MxUt/FD2S5XBSVPhmArFUXcpCQ2Hkiw==",
-			"dev": true,
-			"license": "BSD-3-Clause",
-			"dependencies": {
-				"@sinonjs/commons": "^3.0.1"
-			}
-		},
-		"node_modules/@tybys/wasm-util": {
-			"version": "0.10.0",
-			"resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.0.tgz",
-			"integrity": "sha512-VyyPYFlOMNylG45GoAe0xDoLwWuowvf92F9kySqzYh8vmYm7D2u4iUJKa1tOUpS70Ku13ASrOkS4ScXFsTaCNQ==",
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"dependencies": {
-				"tslib": "^2.4.0"
-			}
-		},
-		"node_modules/@types/babel__core": {
-			"version": "7.20.5",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/parser": "^7.20.7",
-				"@babel/types": "^7.20.7",
-				"@types/babel__generator": "*",
-				"@types/babel__template": "*",
-				"@types/babel__traverse": "*"
-			}
-		},
-		"node_modules/@types/babel__generator": {
-			"version": "7.6.8",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/types": "^7.0.0"
-			}
-		},
-		"node_modules/@types/babel__template": {
-			"version": "7.4.4",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/parser": "^7.1.0",
-				"@babel/types": "^7.0.0"
-			}
-		},
-		"node_modules/@types/babel__traverse": {
-			"version": "7.20.7",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/types": "^7.20.7"
-			}
-		},
 		"node_modules/@types/codemirror": {
 			"version": "5.60.8",
 			"dev": true,
@@ -2557,68 +873,21 @@
 			"dev": true,
 			"license": "MIT"
 		},
-		"node_modules/@types/graceful-fs": {
-			"version": "4.1.9",
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"peer": true,
-			"dependencies": {
-				"@types/node": "*"
-			}
-		},
-		"node_modules/@types/istanbul-lib-coverage": {
-			"version": "2.0.6",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/@types/istanbul-lib-report": {
-			"version": "3.0.3",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@types/istanbul-lib-coverage": "*"
-			}
-		},
-		"node_modules/@types/istanbul-reports": {
-			"version": "3.0.4",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@types/istanbul-lib-report": "*"
-			}
-		},
-		"node_modules/@types/jest": {
-			"version": "30.0.0",
-			"resolved": "https://registry.npmjs.org/@types/jest/-/jest-30.0.0.tgz",
-			"integrity": "sha512-XTYugzhuwqWjws0CVz8QpM36+T+Dz5mTEBKhNs/esGLnCIlGdRy+Dq78NRjd7ls7r8BC8ZRMOrKlkO1hU0JOwA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"expect": "^30.0.0",
-				"pretty-format": "^30.0.0"
-			}
-		},
 		"node_modules/@types/json-schema": {
 			"version": "7.0.15",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@types/node": {
-			"version": "22.15.30",
+			"version": "24.3.0",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-24.3.0.tgz",
+			"integrity": "sha512-aPTXCrfwnDLj4VvXrm+UUCQjNEvJgNA8s5F1cvwQU+3KNltTOkBm1j30uNLyqqPNe7gE3KFzImYoZEfLhp4Yow==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"undici-types": "~6.21.0"
+				"undici-types": "~7.10.0"
 			}
 		},
-		"node_modules/@types/stack-utils": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz",
-			"integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==",
-			"dev": true,
-			"license": "MIT"
-		},
 		"node_modules/@types/tern": {
 			"version": "0.23.9",
 			"dev": true,
@@ -2627,19 +896,6 @@
 				"@types/estree": "*"
 			}
 		},
-		"node_modules/@types/yargs": {
-			"version": "17.0.33",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@types/yargs-parser": "*"
-			}
-		},
-		"node_modules/@types/yargs-parser": {
-			"version": "21.0.3",
-			"dev": true,
-			"license": "MIT"
-		},
 		"node_modules/@typescript-eslint/eslint-plugin": {
 			"version": "8.41.0",
 			"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.41.0.tgz",
@@ -2896,282 +1152,6 @@
 				"url": "https://opencollective.com/typescript-eslint"
 			}
 		},
-		"node_modules/@ungap/structured-clone": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.0.tgz",
-			"integrity": "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==",
-			"dev": true,
-			"license": "ISC"
-		},
-		"node_modules/@unrs/resolver-binding-android-arm-eabi": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@unrs/resolver-binding-android-arm-eabi/-/resolver-binding-android-arm-eabi-1.11.1.tgz",
-			"integrity": "sha512-ppLRUgHVaGRWUx0R0Ut06Mjo9gBaBkg3v/8AxusGLhsIotbBLuRk51rAzqLC8gq6NyyAojEXglNjzf6R948DNw==",
-			"cpu": [
-				"arm"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"android"
-			]
-		},
-		"node_modules/@unrs/resolver-binding-android-arm64": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@unrs/resolver-binding-android-arm64/-/resolver-binding-android-arm64-1.11.1.tgz",
-			"integrity": "sha512-lCxkVtb4wp1v+EoN+HjIG9cIIzPkX5OtM03pQYkG+U5O/wL53LC4QbIeazgiKqluGeVEeBlZahHalCaBvU1a2g==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"android"
-			]
-		},
-		"node_modules/@unrs/resolver-binding-darwin-arm64": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-arm64/-/resolver-binding-darwin-arm64-1.11.1.tgz",
-			"integrity": "sha512-gPVA1UjRu1Y/IsB/dQEsp2V1pm44Of6+LWvbLc9SDk1c2KhhDRDBUkQCYVWe6f26uJb3fOK8saWMgtX8IrMk3g==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"darwin"
-			]
-		},
-		"node_modules/@unrs/resolver-binding-darwin-x64": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-x64/-/resolver-binding-darwin-x64-1.11.1.tgz",
-			"integrity": "sha512-cFzP7rWKd3lZaCsDze07QX1SC24lO8mPty9vdP+YVa3MGdVgPmFc59317b2ioXtgCMKGiCLxJ4HQs62oz6GfRQ==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"darwin"
-			]
-		},
-		"node_modules/@unrs/resolver-binding-freebsd-x64": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@unrs/resolver-binding-freebsd-x64/-/resolver-binding-freebsd-x64-1.11.1.tgz",
-			"integrity": "sha512-fqtGgak3zX4DCB6PFpsH5+Kmt/8CIi4Bry4rb1ho6Av2QHTREM+47y282Uqiu3ZRF5IQioJQ5qWRV6jduA+iGw==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"freebsd"
-			]
-		},
-		"node_modules/@unrs/resolver-binding-linux-arm-gnueabihf": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-gnueabihf/-/resolver-binding-linux-arm-gnueabihf-1.11.1.tgz",
-			"integrity": "sha512-u92mvlcYtp9MRKmP+ZvMmtPN34+/3lMHlyMj7wXJDeXxuM0Vgzz0+PPJNsro1m3IZPYChIkn944wW8TYgGKFHw==",
-			"cpu": [
-				"arm"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			]
-		},
-		"node_modules/@unrs/resolver-binding-linux-arm-musleabihf": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-musleabihf/-/resolver-binding-linux-arm-musleabihf-1.11.1.tgz",
-			"integrity": "sha512-cINaoY2z7LVCrfHkIcmvj7osTOtm6VVT16b5oQdS4beibX2SYBwgYLmqhBjA1t51CarSaBuX5YNsWLjsqfW5Cw==",
-			"cpu": [
-				"arm"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			]
-		},
-		"node_modules/@unrs/resolver-binding-linux-arm64-gnu": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-gnu/-/resolver-binding-linux-arm64-gnu-1.11.1.tgz",
-			"integrity": "sha512-34gw7PjDGB9JgePJEmhEqBhWvCiiWCuXsL9hYphDF7crW7UgI05gyBAi6MF58uGcMOiOqSJ2ybEeCvHcq0BCmQ==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			]
-		},
-		"node_modules/@unrs/resolver-binding-linux-arm64-musl": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-musl/-/resolver-binding-linux-arm64-musl-1.11.1.tgz",
-			"integrity": "sha512-RyMIx6Uf53hhOtJDIamSbTskA99sPHS96wxVE/bJtePJJtpdKGXO1wY90oRdXuYOGOTuqjT8ACccMc4K6QmT3w==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			]
-		},
-		"node_modules/@unrs/resolver-binding-linux-ppc64-gnu": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-ppc64-gnu/-/resolver-binding-linux-ppc64-gnu-1.11.1.tgz",
-			"integrity": "sha512-D8Vae74A4/a+mZH0FbOkFJL9DSK2R6TFPC9M+jCWYia/q2einCubX10pecpDiTmkJVUH+y8K3BZClycD8nCShA==",
-			"cpu": [
-				"ppc64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			]
-		},
-		"node_modules/@unrs/resolver-binding-linux-riscv64-gnu": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-riscv64-gnu/-/resolver-binding-linux-riscv64-gnu-1.11.1.tgz",
-			"integrity": "sha512-frxL4OrzOWVVsOc96+V3aqTIQl1O2TjgExV4EKgRY09AJ9leZpEg8Ak9phadbuX0BA4k8U5qtvMSQQGGmaJqcQ==",
-			"cpu": [
-				"riscv64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			]
-		},
-		"node_modules/@unrs/resolver-binding-linux-riscv64-musl": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-riscv64-musl/-/resolver-binding-linux-riscv64-musl-1.11.1.tgz",
-			"integrity": "sha512-mJ5vuDaIZ+l/acv01sHoXfpnyrNKOk/3aDoEdLO/Xtn9HuZlDD6jKxHlkN8ZhWyLJsRBxfv9GYM2utQ1SChKew==",
-			"cpu": [
-				"riscv64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			]
-		},
-		"node_modules/@unrs/resolver-binding-linux-s390x-gnu": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-s390x-gnu/-/resolver-binding-linux-s390x-gnu-1.11.1.tgz",
-			"integrity": "sha512-kELo8ebBVtb9sA7rMe1Cph4QHreByhaZ2QEADd9NzIQsYNQpt9UkM9iqr2lhGr5afh885d/cB5QeTXSbZHTYPg==",
-			"cpu": [
-				"s390x"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			]
-		},
-		"node_modules/@unrs/resolver-binding-linux-x64-gnu": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-gnu/-/resolver-binding-linux-x64-gnu-1.11.1.tgz",
-			"integrity": "sha512-C3ZAHugKgovV5YvAMsxhq0gtXuwESUKc5MhEtjBpLoHPLYM+iuwSj3lflFwK3DPm68660rZ7G8BMcwSro7hD5w==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			]
-		},
-		"node_modules/@unrs/resolver-binding-linux-x64-musl": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-musl/-/resolver-binding-linux-x64-musl-1.11.1.tgz",
-			"integrity": "sha512-rV0YSoyhK2nZ4vEswT/QwqzqQXw5I6CjoaYMOX0TqBlWhojUf8P94mvI7nuJTeaCkkds3QE4+zS8Ko+GdXuZtA==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			]
-		},
-		"node_modules/@unrs/resolver-binding-wasm32-wasi": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@unrs/resolver-binding-wasm32-wasi/-/resolver-binding-wasm32-wasi-1.11.1.tgz",
-			"integrity": "sha512-5u4RkfxJm+Ng7IWgkzi3qrFOvLvQYnPBmjmZQ8+szTK/b31fQCnleNl1GgEt7nIsZRIf5PLhPwT0WM+q45x/UQ==",
-			"cpu": [
-				"wasm32"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"dependencies": {
-				"@napi-rs/wasm-runtime": "^0.2.11"
-			},
-			"engines": {
-				"node": ">=14.0.0"
-			}
-		},
-		"node_modules/@unrs/resolver-binding-win32-arm64-msvc": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-arm64-msvc/-/resolver-binding-win32-arm64-msvc-1.11.1.tgz",
-			"integrity": "sha512-nRcz5Il4ln0kMhfL8S3hLkxI85BXs3o8EYoattsJNdsX4YUU89iOkVn7g0VHSRxFuVMdM4Q1jEpIId1Ihim/Uw==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"win32"
-			]
-		},
-		"node_modules/@unrs/resolver-binding-win32-ia32-msvc": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-ia32-msvc/-/resolver-binding-win32-ia32-msvc-1.11.1.tgz",
-			"integrity": "sha512-DCEI6t5i1NmAZp6pFonpD5m7i6aFrpofcp4LA2i8IIq60Jyo28hamKBxNrZcyOwVOZkgsRp9O2sXWBWP8MnvIQ==",
-			"cpu": [
-				"ia32"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"win32"
-			]
-		},
-		"node_modules/@unrs/resolver-binding-win32-x64-msvc": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-x64-msvc/-/resolver-binding-win32-x64-msvc-1.11.1.tgz",
-			"integrity": "sha512-lrW200hZdbfRtztbygyaq/6jP6AKE8qQN2KvPcJ+x7wiD038YtnYtZ82IMNJ69GJibV7bwL3y9FgK+5w/pYt6g==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"win32"
-			]
-		},
 		"node_modules/@webassemblyjs/ast": {
 			"version": "1.14.1",
 			"dev": true,
@@ -3444,22 +1424,6 @@
 				"ajv": "^6.9.1"
 			}
 		},
-		"node_modules/ansi-escapes": {
-			"version": "4.3.2",
-			"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
-			"integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"type-fest": "^0.21.3"
-			},
-			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
 		"node_modules/ansi-regex": {
 			"version": "5.0.1",
 			"dev": true,
@@ -3482,147 +1446,11 @@
 				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
 			}
 		},
-		"node_modules/anymatch": {
-			"version": "3.1.3",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"normalize-path": "^3.0.0",
-				"picomatch": "^2.0.4"
-			},
-			"engines": {
-				"node": ">= 8"
-			}
-		},
 		"node_modules/argparse": {
 			"version": "2.0.1",
 			"dev": true,
 			"license": "Python-2.0"
 		},
-		"node_modules/babel-jest": {
-			"version": "29.7.0",
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"peer": true,
-			"dependencies": {
-				"@jest/transform": "^29.7.0",
-				"@types/babel__core": "^7.1.14",
-				"babel-plugin-istanbul": "^6.1.1",
-				"babel-preset-jest": "^29.6.3",
-				"chalk": "^4.0.0",
-				"graceful-fs": "^4.2.9",
-				"slash": "^3.0.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.8.0"
-			}
-		},
-		"node_modules/babel-plugin-istanbul": {
-			"version": "6.1.1",
-			"dev": true,
-			"license": "BSD-3-Clause",
-			"optional": true,
-			"peer": true,
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.0.0",
-				"@istanbuljs/load-nyc-config": "^1.0.0",
-				"@istanbuljs/schema": "^0.1.2",
-				"istanbul-lib-instrument": "^5.0.4",
-				"test-exclude": "^6.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/babel-plugin-istanbul/node_modules/istanbul-lib-instrument": {
-			"version": "5.2.1",
-			"dev": true,
-			"license": "BSD-3-Clause",
-			"optional": true,
-			"peer": true,
-			"dependencies": {
-				"@babel/core": "^7.12.3",
-				"@babel/parser": "^7.14.7",
-				"@istanbuljs/schema": "^0.1.2",
-				"istanbul-lib-coverage": "^3.2.0",
-				"semver": "^6.3.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/babel-plugin-istanbul/node_modules/semver": {
-			"version": "6.3.1",
-			"dev": true,
-			"license": "ISC",
-			"optional": true,
-			"peer": true,
-			"bin": {
-				"semver": "bin/semver.js"
-			}
-		},
-		"node_modules/babel-plugin-jest-hoist": {
-			"version": "29.6.3",
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"peer": true,
-			"dependencies": {
-				"@babel/template": "^7.3.3",
-				"@babel/types": "^7.3.3",
-				"@types/babel__core": "^7.1.14",
-				"@types/babel__traverse": "^7.0.6"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/babel-preset-current-node-syntax": {
-			"version": "1.1.0",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/plugin-syntax-async-generators": "^7.8.4",
-				"@babel/plugin-syntax-bigint": "^7.8.3",
-				"@babel/plugin-syntax-class-properties": "^7.12.13",
-				"@babel/plugin-syntax-class-static-block": "^7.14.5",
-				"@babel/plugin-syntax-import-attributes": "^7.24.7",
-				"@babel/plugin-syntax-import-meta": "^7.10.4",
-				"@babel/plugin-syntax-json-strings": "^7.8.3",
-				"@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
-				"@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-				"@babel/plugin-syntax-numeric-separator": "^7.10.4",
-				"@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-				"@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-				"@babel/plugin-syntax-optional-chaining": "^7.8.3",
-				"@babel/plugin-syntax-private-property-in-object": "^7.14.5",
-				"@babel/plugin-syntax-top-level-await": "^7.14.5"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0"
-			}
-		},
-		"node_modules/babel-preset-jest": {
-			"version": "29.6.3",
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"peer": true,
-			"dependencies": {
-				"babel-plugin-jest-hoist": "^29.6.3",
-				"babel-preset-current-node-syntax": "^1.0.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0"
-			}
-		},
 		"node_modules/balanced-match": {
 			"version": "1.0.2",
 			"license": "MIT"
@@ -3686,25 +1514,6 @@
 				"node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
 			}
 		},
-		"node_modules/bs-logger": {
-			"version": "0.2.6",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"fast-json-stable-stringify": "2.x"
-			},
-			"engines": {
-				"node": ">= 6"
-			}
-		},
-		"node_modules/bser": {
-			"version": "2.1.1",
-			"dev": true,
-			"license": "Apache-2.0",
-			"dependencies": {
-				"node-int64": "^0.4.0"
-			}
-		},
 		"node_modules/buffer-from": {
 			"version": "1.1.2",
 			"dev": true,
@@ -3761,14 +1570,6 @@
 				"node": ">=6"
 			}
 		},
-		"node_modules/camelcase": {
-			"version": "5.3.1",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6"
-			}
-		},
 		"node_modules/caniuse-lite": {
 			"version": "1.0.30001707",
 			"dev": true,
@@ -3814,16 +1615,6 @@
 				"node": ">=8"
 			}
 		},
-		"node_modules/char-regex": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
-			"integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=10"
-			}
-		},
 		"node_modules/chokidar": {
 			"version": "4.0.3",
 			"dev": true,
@@ -3846,29 +1637,6 @@
 				"node": ">=6.0"
 			}
 		},
-		"node_modules/ci-info": {
-			"version": "3.9.0",
-			"dev": true,
-			"funding": [
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/sibiraj-s"
-				}
-			],
-			"license": "MIT",
-			"optional": true,
-			"peer": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/cjs-module-lexer": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-2.1.0.tgz",
-			"integrity": "sha512-UX0OwmYRYQQetfrLEZeewIFFI+wSTofC+pMBLNuH3RUuu/xzG1oz84UCEDOSoQlN3fZ4+AzmV50ZYvGqkMh9yA==",
-			"dev": true,
-			"license": "MIT"
-		},
 		"node_modules/cliui": {
 			"version": "8.0.1",
 			"dev": true,
@@ -3895,24 +1663,6 @@
 				"node": ">=6"
 			}
 		},
-		"node_modules/co": {
-			"version": "4.6.0",
-			"resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-			"integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"iojs": ">= 1.0.0",
-				"node": ">= 0.12.0"
-			}
-		},
-		"node_modules/collect-v8-coverage": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz",
-			"integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==",
-			"dev": true,
-			"license": "MIT"
-		},
 		"node_modules/color-convert": {
 			"version": "2.0.1",
 			"dev": true,
@@ -3963,11 +1713,6 @@
 				"url": "https://github.com/open-cli-tools/concurrently?sponsor=1"
 			}
 		},
-		"node_modules/convert-source-map": {
-			"version": "2.0.0",
-			"dev": true,
-			"license": "MIT"
-		},
 		"node_modules/cross-spawn": {
 			"version": "7.0.6",
 			"dev": true,
@@ -4051,36 +1796,11 @@
 				}
 			}
 		},
-		"node_modules/dedent": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/dedent/-/dedent-1.6.0.tgz",
-			"integrity": "sha512-F1Z+5UCFpmQUzJa11agbyPVMbpgT/qA3/SKyJ1jyBgm7dUcUEa8v9JwDkerSQXfakBwFljIxhOJqGkjUwZ9FSA==",
-			"dev": true,
-			"license": "MIT",
-			"peerDependencies": {
-				"babel-plugin-macros": "^3.1.0"
-			},
-			"peerDependenciesMeta": {
-				"babel-plugin-macros": {
-					"optional": true
-				}
-			}
-		},
 		"node_modules/deep-is": {
 			"version": "0.1.4",
 			"dev": true,
 			"license": "MIT"
 		},
-		"node_modules/deepmerge": {
-			"version": "4.3.1",
-			"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
-			"integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
 		"node_modules/detect-libc": {
 			"version": "1.0.3",
 			"dev": true,
@@ -4093,16 +1813,6 @@
 				"node": ">=0.10"
 			}
 		},
-		"node_modules/detect-newline": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
-			"integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
 		"node_modules/dunder-proto": {
 			"version": "1.0.1",
 			"dev": true,
@@ -4116,31 +1826,11 @@
 				"node": ">= 0.4"
 			}
 		},
-		"node_modules/eastasianwidth": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
-			"integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
-			"dev": true,
-			"license": "MIT"
-		},
 		"node_modules/electron-to-chromium": {
 			"version": "1.5.127",
 			"dev": true,
 			"license": "ISC"
 		},
-		"node_modules/emittery": {
-			"version": "0.13.1",
-			"resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz",
-			"integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://github.com/sindresorhus/emittery?sponsor=1"
-			}
-		},
 		"node_modules/emoji-regex": {
 			"version": "8.0.0",
 			"dev": true,
@@ -4177,16 +1867,6 @@
 				"node": ">=4"
 			}
 		},
-		"node_modules/error-ex": {
-			"version": "1.3.2",
-			"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-			"integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"is-arrayish": "^0.2.1"
-			}
-		},
 		"node_modules/es-define-property": {
 			"version": "1.0.1",
 			"dev": true,
@@ -4219,6 +1899,48 @@
 				"node": ">= 0.4"
 			}
 		},
+		"node_modules/esbuild": {
+			"version": "0.25.9",
+			"resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.9.tgz",
+			"integrity": "sha512-CRbODhYyQx3qp7ZEwzxOk4JBqmD/seJrzPa/cGjY1VtIn5E09Oi9/dB4JwctnfZ8Q8iT7rioVv5k/FNT/uf54g==",
+			"dev": true,
+			"hasInstallScript": true,
+			"license": "MIT",
+			"bin": {
+				"esbuild": "bin/esbuild"
+			},
+			"engines": {
+				"node": ">=18"
+			},
+			"optionalDependencies": {
+				"@esbuild/aix-ppc64": "0.25.9",
+				"@esbuild/android-arm": "0.25.9",
+				"@esbuild/android-arm64": "0.25.9",
+				"@esbuild/android-x64": "0.25.9",
+				"@esbuild/darwin-arm64": "0.25.9",
+				"@esbuild/darwin-x64": "0.25.9",
+				"@esbuild/freebsd-arm64": "0.25.9",
+				"@esbuild/freebsd-x64": "0.25.9",
+				"@esbuild/linux-arm": "0.25.9",
+				"@esbuild/linux-arm64": "0.25.9",
+				"@esbuild/linux-ia32": "0.25.9",
+				"@esbuild/linux-loong64": "0.25.9",
+				"@esbuild/linux-mips64el": "0.25.9",
+				"@esbuild/linux-ppc64": "0.25.9",
+				"@esbuild/linux-riscv64": "0.25.9",
+				"@esbuild/linux-s390x": "0.25.9",
+				"@esbuild/linux-x64": "0.25.9",
+				"@esbuild/netbsd-arm64": "0.25.9",
+				"@esbuild/netbsd-x64": "0.25.9",
+				"@esbuild/openbsd-arm64": "0.25.9",
+				"@esbuild/openbsd-x64": "0.25.9",
+				"@esbuild/openharmony-arm64": "0.25.9",
+				"@esbuild/sunos-x64": "0.25.9",
+				"@esbuild/win32-arm64": "0.25.9",
+				"@esbuild/win32-ia32": "0.25.9",
+				"@esbuild/win32-x64": "0.25.9"
+			}
+		},
 		"node_modules/escalade": {
 			"version": "3.2.0",
 			"dev": true,
@@ -4355,18 +2077,6 @@
 				"url": "https://opencollective.com/eslint"
 			}
 		},
-		"node_modules/esprima": {
-			"version": "4.0.1",
-			"dev": true,
-			"license": "BSD-2-Clause",
-			"bin": {
-				"esparse": "bin/esparse.js",
-				"esvalidate": "bin/esvalidate.js"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
 		"node_modules/esquery": {
 			"version": "1.6.0",
 			"dev": true,
@@ -4417,144 +2127,6 @@
 				"node": ">=0.8.x"
 			}
 		},
-		"node_modules/execa": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-			"integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"cross-spawn": "^7.0.3",
-				"get-stream": "^6.0.0",
-				"human-signals": "^2.1.0",
-				"is-stream": "^2.0.0",
-				"merge-stream": "^2.0.0",
-				"npm-run-path": "^4.0.1",
-				"onetime": "^5.1.2",
-				"signal-exit": "^3.0.3",
-				"strip-final-newline": "^2.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sindresorhus/execa?sponsor=1"
-			}
-		},
-		"node_modules/exit-x": {
-			"version": "0.2.2",
-			"resolved": "https://registry.npmjs.org/exit-x/-/exit-x-0.2.2.tgz",
-			"integrity": "sha512-+I6B/IkJc1o/2tiURyz/ivu/O0nKNEArIUB5O7zBrlDVJr22SCLH3xTeEry428LvFhRzIA1g8izguxJ/gbNcVQ==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">= 0.8.0"
-			}
-		},
-		"node_modules/expect": {
-			"version": "30.1.1",
-			"resolved": "https://registry.npmjs.org/expect/-/expect-30.1.1.tgz",
-			"integrity": "sha512-OKe7cdic4qbfWd/CcgwJvvCrNX2KWfuMZee9AfJHL1gTYmvqjBjZG1a2NwfhspBzxzlXwsN75WWpKTYfsJpBxg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/expect-utils": "30.1.1",
-				"@jest/get-type": "30.1.0",
-				"jest-matcher-utils": "30.1.1",
-				"jest-message-util": "30.1.0",
-				"jest-mock": "30.0.5",
-				"jest-util": "30.0.5"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/expect/node_modules/@jest/schemas": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
-			"integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@sinclair/typebox": "^0.34.0"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/expect/node_modules/@jest/types": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.5.tgz",
-			"integrity": "sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/pattern": "30.0.1",
-				"@jest/schemas": "30.0.5",
-				"@types/istanbul-lib-coverage": "^2.0.6",
-				"@types/istanbul-reports": "^3.0.4",
-				"@types/node": "*",
-				"@types/yargs": "^17.0.33",
-				"chalk": "^4.1.2"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/expect/node_modules/@sinclair/typebox": {
-			"version": "0.34.40",
-			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.40.tgz",
-			"integrity": "sha512-gwBNIP8ZAYev/ORDWW0QvxdwPXwxBtLsdsJgSc7eDIRt8ubP+rxUBzPsrwnu16fgEF8Bx4lh/+mvQvJzcTM6Kw==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/expect/node_modules/ci-info": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.0.tgz",
-			"integrity": "sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/sibiraj-s"
-				}
-			],
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/expect/node_modules/jest-util": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-30.0.5.tgz",
-			"integrity": "sha512-pvyPWssDZR0FlfMxCBoc0tvM8iUEskaRFALUtGQYzVEAqisAztmy+R8LnU14KT4XA0H/a5HMVTXat1jLne010g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/types": "30.0.5",
-				"@types/node": "*",
-				"chalk": "^4.1.2",
-				"ci-info": "^4.2.0",
-				"graceful-fs": "^4.2.11",
-				"picomatch": "^4.0.2"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/expect/node_modules/picomatch": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-			"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/jonschlinkert"
-			}
-		},
 		"node_modules/fast-deep-equal": {
 			"version": "3.1.3",
 			"dev": true,
@@ -4633,14 +2205,6 @@
 				"reusify": "^1.0.4"
 			}
 		},
-		"node_modules/fb-watchman": {
-			"version": "2.0.2",
-			"dev": true,
-			"license": "Apache-2.0",
-			"dependencies": {
-				"bser": "2.1.1"
-			}
-		},
 		"node_modules/file-entry-cache": {
 			"version": "8.0.0",
 			"dev": true,
@@ -4722,36 +2286,6 @@
 			"dev": true,
 			"license": "ISC"
 		},
-		"node_modules/foreground-child": {
-			"version": "3.3.1",
-			"resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz",
-			"integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"cross-spawn": "^7.0.6",
-				"signal-exit": "^4.0.1"
-			},
-			"engines": {
-				"node": ">=14"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			}
-		},
-		"node_modules/foreground-child/node_modules/signal-exit": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
-			"integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
-			"dev": true,
-			"license": "ISC",
-			"engines": {
-				"node": ">=14"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			}
-		},
 		"node_modules/fs-extra": {
 			"version": "11.3.0",
 			"dev": true,
@@ -4765,11 +2299,6 @@
 				"node": ">=14.14"
 			}
 		},
-		"node_modules/fs.realpath": {
-			"version": "1.0.0",
-			"dev": true,
-			"license": "ISC"
-		},
 		"node_modules/fsevents": {
 			"version": "2.3.3",
 			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
@@ -4793,14 +2322,6 @@
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"node_modules/gensync": {
-			"version": "1.0.0-beta.2",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
 		"node_modules/get-caller-file": {
 			"version": "2.0.5",
 			"dev": true,
@@ -4832,14 +2353,6 @@
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"node_modules/get-package-type": {
-			"version": "0.1.0",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=8.0.0"
-			}
-		},
 		"node_modules/get-proto": {
 			"version": "1.0.1",
 			"dev": true,
@@ -4852,36 +2365,17 @@
 				"node": ">= 0.4"
 			}
 		},
-		"node_modules/get-stream": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-			"integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+		"node_modules/get-tsconfig": {
+			"version": "4.10.1",
+			"resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.10.1.tgz",
+			"integrity": "sha512-auHyJ4AgMz7vgS8Hp3N6HXSmlMdUyhSUrfBF16w153rxtLIEOE+HGqaBppczZvnHLqQJfiHotCYpNhl0lUROFQ==",
 			"dev": true,
 			"license": "MIT",
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/glob": {
-			"version": "7.2.3",
-			"dev": true,
-			"license": "ISC",
 			"dependencies": {
-				"fs.realpath": "^1.0.0",
-				"inflight": "^1.0.4",
-				"inherits": "2",
-				"minimatch": "^3.1.1",
-				"once": "^1.3.0",
-				"path-is-absolute": "^1.0.0"
-			},
-			"engines": {
-				"node": "*"
+				"resolve-pkg-maps": "^1.0.0"
 			},
 			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
+				"url": "https://github.com/privatenumber/get-tsconfig?sponsor=1"
 			}
 		},
 		"node_modules/glob-parent": {
@@ -4932,28 +2426,6 @@
 			"dev": true,
 			"license": "MIT"
 		},
-		"node_modules/handlebars": {
-			"version": "4.7.8",
-			"resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz",
-			"integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"minimist": "^1.2.5",
-				"neo-async": "^2.6.2",
-				"source-map": "^0.6.1",
-				"wordwrap": "^1.0.0"
-			},
-			"bin": {
-				"handlebars": "bin/handlebars"
-			},
-			"engines": {
-				"node": ">=0.4.7"
-			},
-			"optionalDependencies": {
-				"uglify-js": "^3.1.4"
-			}
-		},
 		"node_modules/has-flag": {
 			"version": "4.0.0",
 			"dev": true,
@@ -4984,23 +2456,6 @@
 				"node": ">= 0.4"
 			}
 		},
-		"node_modules/html-escaper": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
-			"integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/human-signals": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-			"integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
-			"dev": true,
-			"license": "Apache-2.0",
-			"engines": {
-				"node": ">=10.17.0"
-			}
-		},
 		"node_modules/icss-utils": {
 			"version": "5.1.0",
 			"dev": true,
@@ -5066,20 +2521,6 @@
 				"node": ">=0.8.19"
 			}
 		},
-		"node_modules/inflight": {
-			"version": "1.0.6",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"once": "^1.3.0",
-				"wrappy": "1"
-			}
-		},
-		"node_modules/inherits": {
-			"version": "2.0.4",
-			"dev": true,
-			"license": "ISC"
-		},
 		"node_modules/interpret": {
 			"version": "3.1.1",
 			"dev": true,
@@ -5088,13 +2529,6 @@
 				"node": ">=10.13.0"
 			}
 		},
-		"node_modules/is-arrayish": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-			"integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
-			"dev": true,
-			"license": "MIT"
-		},
 		"node_modules/is-core-module": {
 			"version": "2.16.1",
 			"dev": true,
@@ -5125,16 +2559,6 @@
 				"node": ">=8"
 			}
 		},
-		"node_modules/is-generator-fn": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
-			"integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6"
-			}
-		},
 		"node_modules/is-glob": {
 			"version": "4.0.3",
 			"dev": true,
@@ -5165,19 +2589,6 @@
 				"node": ">=0.10.0"
 			}
 		},
-		"node_modules/is-stream": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-			"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
 		"node_modules/isexe": {
 			"version": "2.0.0",
 			"dev": true,
@@ -5191,2524 +2602,6 @@
 				"node": ">=0.10.0"
 			}
 		},
-		"node_modules/istanbul-lib-coverage": {
-			"version": "3.2.2",
-			"dev": true,
-			"license": "BSD-3-Clause",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/istanbul-lib-instrument": {
-			"version": "6.0.3",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz",
-			"integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==",
-			"dev": true,
-			"license": "BSD-3-Clause",
-			"dependencies": {
-				"@babel/core": "^7.23.9",
-				"@babel/parser": "^7.23.9",
-				"@istanbuljs/schema": "^0.1.3",
-				"istanbul-lib-coverage": "^3.2.0",
-				"semver": "^7.5.4"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/istanbul-lib-report": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
-			"integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
-			"dev": true,
-			"license": "BSD-3-Clause",
-			"dependencies": {
-				"istanbul-lib-coverage": "^3.0.0",
-				"make-dir": "^4.0.0",
-				"supports-color": "^7.1.0"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/istanbul-lib-report/node_modules/supports-color": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"has-flag": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/istanbul-lib-source-maps": {
-			"version": "5.0.6",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-5.0.6.tgz",
-			"integrity": "sha512-yg2d+Em4KizZC5niWhQaIomgf5WlL4vOOjZ5xGCmF8SnPE/mDWWXgvRExdcpCgh9lLRRa1/fSYp2ymmbJ1pI+A==",
-			"dev": true,
-			"license": "BSD-3-Clause",
-			"dependencies": {
-				"@jridgewell/trace-mapping": "^0.3.23",
-				"debug": "^4.1.1",
-				"istanbul-lib-coverage": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/istanbul-reports": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.2.0.tgz",
-			"integrity": "sha512-HGYWWS/ehqTV3xN10i23tkPkpH46MLCIMFNCaaKNavAXTF1RkqxawEPtnjnGZ6XKSInBKkiOA5BKS+aZiY3AvA==",
-			"dev": true,
-			"license": "BSD-3-Clause",
-			"dependencies": {
-				"html-escaper": "^2.0.0",
-				"istanbul-lib-report": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/jackspeak": {
-			"version": "3.4.3",
-			"resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
-			"integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
-			"dev": true,
-			"license": "BlueOak-1.0.0",
-			"dependencies": {
-				"@isaacs/cliui": "^8.0.2"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			},
-			"optionalDependencies": {
-				"@pkgjs/parseargs": "^0.11.0"
-			}
-		},
-		"node_modules/jest": {
-			"version": "30.1.1",
-			"resolved": "https://registry.npmjs.org/jest/-/jest-30.1.1.tgz",
-			"integrity": "sha512-yC3JvpP/ZcAZX5rYCtXO/g9k6VTCQz0VFE2v1FpxytWzUqfDtu0XL/pwnNvptzYItvGwomh1ehomRNMOyhCJKw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/core": "30.1.1",
-				"@jest/types": "30.0.5",
-				"import-local": "^3.2.0",
-				"jest-cli": "30.1.1"
-			},
-			"bin": {
-				"jest": "bin/jest.js"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			},
-			"peerDependencies": {
-				"node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
-			},
-			"peerDependenciesMeta": {
-				"node-notifier": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/jest-changed-files": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-30.0.5.tgz",
-			"integrity": "sha512-bGl2Ntdx0eAwXuGpdLdVYVr5YQHnSZlQ0y9HVDu565lCUAe9sj6JOtBbMmBBikGIegne9piDDIOeiLVoqTkz4A==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"execa": "^5.1.1",
-				"jest-util": "30.0.5",
-				"p-limit": "^3.1.0"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-changed-files/node_modules/@jest/schemas": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
-			"integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@sinclair/typebox": "^0.34.0"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-changed-files/node_modules/@jest/types": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.5.tgz",
-			"integrity": "sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/pattern": "30.0.1",
-				"@jest/schemas": "30.0.5",
-				"@types/istanbul-lib-coverage": "^2.0.6",
-				"@types/istanbul-reports": "^3.0.4",
-				"@types/node": "*",
-				"@types/yargs": "^17.0.33",
-				"chalk": "^4.1.2"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-changed-files/node_modules/@sinclair/typebox": {
-			"version": "0.34.40",
-			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.40.tgz",
-			"integrity": "sha512-gwBNIP8ZAYev/ORDWW0QvxdwPXwxBtLsdsJgSc7eDIRt8ubP+rxUBzPsrwnu16fgEF8Bx4lh/+mvQvJzcTM6Kw==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/jest-changed-files/node_modules/ci-info": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.0.tgz",
-			"integrity": "sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/sibiraj-s"
-				}
-			],
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/jest-changed-files/node_modules/jest-util": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-30.0.5.tgz",
-			"integrity": "sha512-pvyPWssDZR0FlfMxCBoc0tvM8iUEskaRFALUtGQYzVEAqisAztmy+R8LnU14KT4XA0H/a5HMVTXat1jLne010g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/types": "30.0.5",
-				"@types/node": "*",
-				"chalk": "^4.1.2",
-				"ci-info": "^4.2.0",
-				"graceful-fs": "^4.2.11",
-				"picomatch": "^4.0.2"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-changed-files/node_modules/picomatch": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-			"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/jonschlinkert"
-			}
-		},
-		"node_modules/jest-circus": {
-			"version": "30.1.1",
-			"resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-30.1.1.tgz",
-			"integrity": "sha512-M3Vd4x5wD7eSJspuTvRF55AkOOBndRxgW3gqQBDlFvbH3X+ASdi8jc+EqXEeAFd/UHulVYIlC4XKJABOhLw6UA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/environment": "30.1.1",
-				"@jest/expect": "30.1.1",
-				"@jest/test-result": "30.1.1",
-				"@jest/types": "30.0.5",
-				"@types/node": "*",
-				"chalk": "^4.1.2",
-				"co": "^4.6.0",
-				"dedent": "^1.6.0",
-				"is-generator-fn": "^2.1.0",
-				"jest-each": "30.1.0",
-				"jest-matcher-utils": "30.1.1",
-				"jest-message-util": "30.1.0",
-				"jest-runtime": "30.1.1",
-				"jest-snapshot": "30.1.1",
-				"jest-util": "30.0.5",
-				"p-limit": "^3.1.0",
-				"pretty-format": "30.0.5",
-				"pure-rand": "^7.0.0",
-				"slash": "^3.0.0",
-				"stack-utils": "^2.0.6"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-circus/node_modules/@jest/schemas": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
-			"integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@sinclair/typebox": "^0.34.0"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-circus/node_modules/@jest/types": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.5.tgz",
-			"integrity": "sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/pattern": "30.0.1",
-				"@jest/schemas": "30.0.5",
-				"@types/istanbul-lib-coverage": "^2.0.6",
-				"@types/istanbul-reports": "^3.0.4",
-				"@types/node": "*",
-				"@types/yargs": "^17.0.33",
-				"chalk": "^4.1.2"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-circus/node_modules/@sinclair/typebox": {
-			"version": "0.34.40",
-			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.40.tgz",
-			"integrity": "sha512-gwBNIP8ZAYev/ORDWW0QvxdwPXwxBtLsdsJgSc7eDIRt8ubP+rxUBzPsrwnu16fgEF8Bx4lh/+mvQvJzcTM6Kw==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/jest-circus/node_modules/ci-info": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.0.tgz",
-			"integrity": "sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/sibiraj-s"
-				}
-			],
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/jest-circus/node_modules/jest-util": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-30.0.5.tgz",
-			"integrity": "sha512-pvyPWssDZR0FlfMxCBoc0tvM8iUEskaRFALUtGQYzVEAqisAztmy+R8LnU14KT4XA0H/a5HMVTXat1jLne010g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/types": "30.0.5",
-				"@types/node": "*",
-				"chalk": "^4.1.2",
-				"ci-info": "^4.2.0",
-				"graceful-fs": "^4.2.11",
-				"picomatch": "^4.0.2"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-circus/node_modules/picomatch": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-			"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/jonschlinkert"
-			}
-		},
-		"node_modules/jest-cli": {
-			"version": "30.1.1",
-			"resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-30.1.1.tgz",
-			"integrity": "sha512-xm9llxuh5OoI5KZaYzlMhklryHBwg9LZy/gEaaMlXlxb+cZekGNzukU0iblbDo3XOBuN6N0CgK4ykgNRYSEb6g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/core": "30.1.1",
-				"@jest/test-result": "30.1.1",
-				"@jest/types": "30.0.5",
-				"chalk": "^4.1.2",
-				"exit-x": "^0.2.2",
-				"import-local": "^3.2.0",
-				"jest-config": "30.1.1",
-				"jest-util": "30.0.5",
-				"jest-validate": "30.1.0",
-				"yargs": "^17.7.2"
-			},
-			"bin": {
-				"jest": "bin/jest.js"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			},
-			"peerDependencies": {
-				"node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
-			},
-			"peerDependenciesMeta": {
-				"node-notifier": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/jest-cli/node_modules/@jest/schemas": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
-			"integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@sinclair/typebox": "^0.34.0"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-cli/node_modules/@jest/types": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.5.tgz",
-			"integrity": "sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/pattern": "30.0.1",
-				"@jest/schemas": "30.0.5",
-				"@types/istanbul-lib-coverage": "^2.0.6",
-				"@types/istanbul-reports": "^3.0.4",
-				"@types/node": "*",
-				"@types/yargs": "^17.0.33",
-				"chalk": "^4.1.2"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-cli/node_modules/@sinclair/typebox": {
-			"version": "0.34.40",
-			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.40.tgz",
-			"integrity": "sha512-gwBNIP8ZAYev/ORDWW0QvxdwPXwxBtLsdsJgSc7eDIRt8ubP+rxUBzPsrwnu16fgEF8Bx4lh/+mvQvJzcTM6Kw==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/jest-cli/node_modules/ci-info": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.0.tgz",
-			"integrity": "sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/sibiraj-s"
-				}
-			],
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/jest-cli/node_modules/jest-util": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-30.0.5.tgz",
-			"integrity": "sha512-pvyPWssDZR0FlfMxCBoc0tvM8iUEskaRFALUtGQYzVEAqisAztmy+R8LnU14KT4XA0H/a5HMVTXat1jLne010g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/types": "30.0.5",
-				"@types/node": "*",
-				"chalk": "^4.1.2",
-				"ci-info": "^4.2.0",
-				"graceful-fs": "^4.2.11",
-				"picomatch": "^4.0.2"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-cli/node_modules/picomatch": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-			"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/jonschlinkert"
-			}
-		},
-		"node_modules/jest-config": {
-			"version": "30.1.1",
-			"resolved": "https://registry.npmjs.org/jest-config/-/jest-config-30.1.1.tgz",
-			"integrity": "sha512-xuPGUGDw+9fPPnGmddnLnHS/mhKUiJOW7K65vErYmglEPKq65NKwSRchkQ7iv6gqjs2l+YNEsAtbsplxozdOWg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/core": "^7.27.4",
-				"@jest/get-type": "30.1.0",
-				"@jest/pattern": "30.0.1",
-				"@jest/test-sequencer": "30.1.1",
-				"@jest/types": "30.0.5",
-				"babel-jest": "30.1.1",
-				"chalk": "^4.1.2",
-				"ci-info": "^4.2.0",
-				"deepmerge": "^4.3.1",
-				"glob": "^10.3.10",
-				"graceful-fs": "^4.2.11",
-				"jest-circus": "30.1.1",
-				"jest-docblock": "30.0.1",
-				"jest-environment-node": "30.1.1",
-				"jest-regex-util": "30.0.1",
-				"jest-resolve": "30.1.0",
-				"jest-runner": "30.1.1",
-				"jest-util": "30.0.5",
-				"jest-validate": "30.1.0",
-				"micromatch": "^4.0.8",
-				"parse-json": "^5.2.0",
-				"pretty-format": "30.0.5",
-				"slash": "^3.0.0",
-				"strip-json-comments": "^3.1.1"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			},
-			"peerDependencies": {
-				"@types/node": "*",
-				"esbuild-register": ">=3.4.0",
-				"ts-node": ">=9.0.0"
-			},
-			"peerDependenciesMeta": {
-				"@types/node": {
-					"optional": true
-				},
-				"esbuild-register": {
-					"optional": true
-				},
-				"ts-node": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/jest-config/node_modules/@jest/schemas": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
-			"integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@sinclair/typebox": "^0.34.0"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-config/node_modules/@jest/transform": {
-			"version": "30.1.1",
-			"resolved": "https://registry.npmjs.org/@jest/transform/-/transform-30.1.1.tgz",
-			"integrity": "sha512-PHIA2AbAASBfk6evkNifvmx9lkOSkmvaQoO6VSpuL8+kQqDMHeDoJ7RU3YP1wWAMD7AyQn9UL5iheuFYCC4lqQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/core": "^7.27.4",
-				"@jest/types": "30.0.5",
-				"@jridgewell/trace-mapping": "^0.3.25",
-				"babel-plugin-istanbul": "^7.0.0",
-				"chalk": "^4.1.2",
-				"convert-source-map": "^2.0.0",
-				"fast-json-stable-stringify": "^2.1.0",
-				"graceful-fs": "^4.2.11",
-				"jest-haste-map": "30.1.0",
-				"jest-regex-util": "30.0.1",
-				"jest-util": "30.0.5",
-				"micromatch": "^4.0.8",
-				"pirates": "^4.0.7",
-				"slash": "^3.0.0",
-				"write-file-atomic": "^5.0.1"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-config/node_modules/@jest/types": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.5.tgz",
-			"integrity": "sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/pattern": "30.0.1",
-				"@jest/schemas": "30.0.5",
-				"@types/istanbul-lib-coverage": "^2.0.6",
-				"@types/istanbul-reports": "^3.0.4",
-				"@types/node": "*",
-				"@types/yargs": "^17.0.33",
-				"chalk": "^4.1.2"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-config/node_modules/@sinclair/typebox": {
-			"version": "0.34.40",
-			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.40.tgz",
-			"integrity": "sha512-gwBNIP8ZAYev/ORDWW0QvxdwPXwxBtLsdsJgSc7eDIRt8ubP+rxUBzPsrwnu16fgEF8Bx4lh/+mvQvJzcTM6Kw==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/jest-config/node_modules/babel-jest": {
-			"version": "30.1.1",
-			"resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-30.1.1.tgz",
-			"integrity": "sha512-1bZfC/V03qBCzASvZpNFhx3Ouj6LgOd4KFJm4br/fYOS+tSSvVCE61QmcAVbMTwq/GoB7KN4pzGMoyr9cMxSvQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/transform": "30.1.1",
-				"@types/babel__core": "^7.20.5",
-				"babel-plugin-istanbul": "^7.0.0",
-				"babel-preset-jest": "30.0.1",
-				"chalk": "^4.1.2",
-				"graceful-fs": "^4.2.11",
-				"slash": "^3.0.0"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.11.0"
-			}
-		},
-		"node_modules/jest-config/node_modules/babel-plugin-istanbul": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-7.0.0.tgz",
-			"integrity": "sha512-C5OzENSx/A+gt7t4VH1I2XsflxyPUmXRFPKBxt33xncdOmq7oROVM3bZv9Ysjjkv8OJYDMa+tKuKMvqU/H3xdw==",
-			"dev": true,
-			"license": "BSD-3-Clause",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.0.0",
-				"@istanbuljs/load-nyc-config": "^1.0.0",
-				"@istanbuljs/schema": "^0.1.3",
-				"istanbul-lib-instrument": "^6.0.2",
-				"test-exclude": "^6.0.0"
-			},
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/jest-config/node_modules/babel-plugin-jest-hoist": {
-			"version": "30.0.1",
-			"resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-30.0.1.tgz",
-			"integrity": "sha512-zTPME3pI50NsFW8ZBaVIOeAxzEY7XHlmWeXXu9srI+9kNfzCUTy8MFan46xOGZY8NZThMqq+e3qZUKsvXbasnQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/template": "^7.27.2",
-				"@babel/types": "^7.27.3",
-				"@types/babel__core": "^7.20.5"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-config/node_modules/babel-preset-jest": {
-			"version": "30.0.1",
-			"resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-30.0.1.tgz",
-			"integrity": "sha512-+YHejD5iTWI46cZmcc/YtX4gaKBtdqCHCVfuVinizVpbmyjO3zYmeuyFdfA8duRqQZfgCAMlsfmkVbJ+e2MAJw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"babel-plugin-jest-hoist": "30.0.1",
-				"babel-preset-current-node-syntax": "^1.1.0"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.11.0"
-			}
-		},
-		"node_modules/jest-config/node_modules/brace-expansion": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-			"integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"balanced-match": "^1.0.0"
-			}
-		},
-		"node_modules/jest-config/node_modules/ci-info": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.0.tgz",
-			"integrity": "sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/sibiraj-s"
-				}
-			],
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/jest-config/node_modules/glob": {
-			"version": "10.4.5",
-			"resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
-			"integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"foreground-child": "^3.1.0",
-				"jackspeak": "^3.1.2",
-				"minimatch": "^9.0.4",
-				"minipass": "^7.1.2",
-				"package-json-from-dist": "^1.0.0",
-				"path-scurry": "^1.11.1"
-			},
-			"bin": {
-				"glob": "dist/esm/bin.mjs"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			}
-		},
-		"node_modules/jest-config/node_modules/jest-haste-map": {
-			"version": "30.1.0",
-			"resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-30.1.0.tgz",
-			"integrity": "sha512-JLeM84kNjpRkggcGpQLsV7B8W4LNUWz7oDNVnY1Vjj22b5/fAb3kk3htiD+4Na8bmJmjJR7rBtS2Rmq/NEcADg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/types": "30.0.5",
-				"@types/node": "*",
-				"anymatch": "^3.1.3",
-				"fb-watchman": "^2.0.2",
-				"graceful-fs": "^4.2.11",
-				"jest-regex-util": "30.0.1",
-				"jest-util": "30.0.5",
-				"jest-worker": "30.1.0",
-				"micromatch": "^4.0.8",
-				"walker": "^1.0.8"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			},
-			"optionalDependencies": {
-				"fsevents": "^2.3.3"
-			}
-		},
-		"node_modules/jest-config/node_modules/jest-regex-util": {
-			"version": "30.0.1",
-			"resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-30.0.1.tgz",
-			"integrity": "sha512-jHEQgBXAgc+Gh4g0p3bCevgRCVRkB4VB70zhoAE48gxeSr1hfUOsM/C2WoJgVL7Eyg//hudYENbm3Ne+/dRVVA==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-config/node_modules/jest-util": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-30.0.5.tgz",
-			"integrity": "sha512-pvyPWssDZR0FlfMxCBoc0tvM8iUEskaRFALUtGQYzVEAqisAztmy+R8LnU14KT4XA0H/a5HMVTXat1jLne010g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/types": "30.0.5",
-				"@types/node": "*",
-				"chalk": "^4.1.2",
-				"ci-info": "^4.2.0",
-				"graceful-fs": "^4.2.11",
-				"picomatch": "^4.0.2"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-config/node_modules/jest-worker": {
-			"version": "30.1.0",
-			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-30.1.0.tgz",
-			"integrity": "sha512-uvWcSjlwAAgIu133Tt77A05H7RIk3Ho8tZL50bQM2AkvLdluw9NG48lRCl3Dt+MOH719n/0nnb5YxUwcuJiKRA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@types/node": "*",
-				"@ungap/structured-clone": "^1.3.0",
-				"jest-util": "30.0.5",
-				"merge-stream": "^2.0.0",
-				"supports-color": "^8.1.1"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-config/node_modules/minimatch": {
-			"version": "9.0.5",
-			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-			"integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"brace-expansion": "^2.0.1"
-			},
-			"engines": {
-				"node": ">=16 || 14 >=14.17"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			}
-		},
-		"node_modules/jest-config/node_modules/picomatch": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-			"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/jonschlinkert"
-			}
-		},
-		"node_modules/jest-config/node_modules/signal-exit": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
-			"integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
-			"dev": true,
-			"license": "ISC",
-			"engines": {
-				"node": ">=14"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			}
-		},
-		"node_modules/jest-config/node_modules/write-file-atomic": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz",
-			"integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"imurmurhash": "^0.1.4",
-				"signal-exit": "^4.0.1"
-			},
-			"engines": {
-				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-			}
-		},
-		"node_modules/jest-diff": {
-			"version": "30.1.1",
-			"resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-30.1.1.tgz",
-			"integrity": "sha512-LUU2Gx8EhYxpdzTR6BmjL1ifgOAQJQELTHOiPv9KITaKjZvJ9Jmgigx01tuZ49id37LorpGc9dPBPlXTboXScw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/diff-sequences": "30.0.1",
-				"@jest/get-type": "30.1.0",
-				"chalk": "^4.1.2",
-				"pretty-format": "30.0.5"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-docblock": {
-			"version": "30.0.1",
-			"resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-30.0.1.tgz",
-			"integrity": "sha512-/vF78qn3DYphAaIc3jy4gA7XSAz167n9Bm/wn/1XhTLW7tTBIzXtCJpb/vcmc73NIIeeohCbdL94JasyXUZsGA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"detect-newline": "^3.1.0"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-each": {
-			"version": "30.1.0",
-			"resolved": "https://registry.npmjs.org/jest-each/-/jest-each-30.1.0.tgz",
-			"integrity": "sha512-A+9FKzxPluqogNahpCv04UJvcZ9B3HamqpDNWNKDjtxVRYB8xbZLFuCr8JAJFpNp83CA0anGQFlpQna9Me+/tQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/get-type": "30.1.0",
-				"@jest/types": "30.0.5",
-				"chalk": "^4.1.2",
-				"jest-util": "30.0.5",
-				"pretty-format": "30.0.5"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-each/node_modules/@jest/schemas": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
-			"integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@sinclair/typebox": "^0.34.0"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-each/node_modules/@jest/types": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.5.tgz",
-			"integrity": "sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/pattern": "30.0.1",
-				"@jest/schemas": "30.0.5",
-				"@types/istanbul-lib-coverage": "^2.0.6",
-				"@types/istanbul-reports": "^3.0.4",
-				"@types/node": "*",
-				"@types/yargs": "^17.0.33",
-				"chalk": "^4.1.2"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-each/node_modules/@sinclair/typebox": {
-			"version": "0.34.40",
-			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.40.tgz",
-			"integrity": "sha512-gwBNIP8ZAYev/ORDWW0QvxdwPXwxBtLsdsJgSc7eDIRt8ubP+rxUBzPsrwnu16fgEF8Bx4lh/+mvQvJzcTM6Kw==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/jest-each/node_modules/ci-info": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.0.tgz",
-			"integrity": "sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/sibiraj-s"
-				}
-			],
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/jest-each/node_modules/jest-util": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-30.0.5.tgz",
-			"integrity": "sha512-pvyPWssDZR0FlfMxCBoc0tvM8iUEskaRFALUtGQYzVEAqisAztmy+R8LnU14KT4XA0H/a5HMVTXat1jLne010g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/types": "30.0.5",
-				"@types/node": "*",
-				"chalk": "^4.1.2",
-				"ci-info": "^4.2.0",
-				"graceful-fs": "^4.2.11",
-				"picomatch": "^4.0.2"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-each/node_modules/picomatch": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-			"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/jonschlinkert"
-			}
-		},
-		"node_modules/jest-environment-node": {
-			"version": "30.1.1",
-			"resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-30.1.1.tgz",
-			"integrity": "sha512-IaMoaA6saxnJimqCppUDqKck+LKM0Jg+OxyMUIvs1yGd2neiC22o8zXo90k04+tO+49OmgMR4jTgM5e4B0S62Q==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/environment": "30.1.1",
-				"@jest/fake-timers": "30.1.1",
-				"@jest/types": "30.0.5",
-				"@types/node": "*",
-				"jest-mock": "30.0.5",
-				"jest-util": "30.0.5",
-				"jest-validate": "30.1.0"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-environment-node/node_modules/@jest/schemas": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
-			"integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@sinclair/typebox": "^0.34.0"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-environment-node/node_modules/@jest/types": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.5.tgz",
-			"integrity": "sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/pattern": "30.0.1",
-				"@jest/schemas": "30.0.5",
-				"@types/istanbul-lib-coverage": "^2.0.6",
-				"@types/istanbul-reports": "^3.0.4",
-				"@types/node": "*",
-				"@types/yargs": "^17.0.33",
-				"chalk": "^4.1.2"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-environment-node/node_modules/@sinclair/typebox": {
-			"version": "0.34.40",
-			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.40.tgz",
-			"integrity": "sha512-gwBNIP8ZAYev/ORDWW0QvxdwPXwxBtLsdsJgSc7eDIRt8ubP+rxUBzPsrwnu16fgEF8Bx4lh/+mvQvJzcTM6Kw==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/jest-environment-node/node_modules/ci-info": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.0.tgz",
-			"integrity": "sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/sibiraj-s"
-				}
-			],
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/jest-environment-node/node_modules/jest-util": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-30.0.5.tgz",
-			"integrity": "sha512-pvyPWssDZR0FlfMxCBoc0tvM8iUEskaRFALUtGQYzVEAqisAztmy+R8LnU14KT4XA0H/a5HMVTXat1jLne010g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/types": "30.0.5",
-				"@types/node": "*",
-				"chalk": "^4.1.2",
-				"ci-info": "^4.2.0",
-				"graceful-fs": "^4.2.11",
-				"picomatch": "^4.0.2"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-environment-node/node_modules/picomatch": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-			"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/jonschlinkert"
-			}
-		},
-		"node_modules/jest-haste-map": {
-			"version": "29.7.0",
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"peer": true,
-			"dependencies": {
-				"@jest/types": "^29.6.3",
-				"@types/graceful-fs": "^4.1.3",
-				"@types/node": "*",
-				"anymatch": "^3.0.3",
-				"fb-watchman": "^2.0.0",
-				"graceful-fs": "^4.2.9",
-				"jest-regex-util": "^29.6.3",
-				"jest-util": "^29.7.0",
-				"jest-worker": "^29.7.0",
-				"micromatch": "^4.0.4",
-				"walker": "^1.0.8"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			},
-			"optionalDependencies": {
-				"fsevents": "^2.3.2"
-			}
-		},
-		"node_modules/jest-leak-detector": {
-			"version": "30.1.0",
-			"resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-30.1.0.tgz",
-			"integrity": "sha512-AoFvJzwxK+4KohH60vRuHaqXfWmeBATFZpzpmzNmYTtmRMiyGPVhkXpBqxUQunw+dQB48bDf4NpUs6ivVbRv1g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/get-type": "30.1.0",
-				"pretty-format": "30.0.5"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-matcher-utils": {
-			"version": "30.1.1",
-			"resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-30.1.1.tgz",
-			"integrity": "sha512-SuH2QVemK48BNTqReti6FtjsMPFsSOD/ZzRxU1TttR7RiRsRSe78d03bb4Cx6D4bQC/80Q8U4VnaaAH9FlbZ9w==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/get-type": "30.1.0",
-				"chalk": "^4.1.2",
-				"jest-diff": "30.1.1",
-				"pretty-format": "30.0.5"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-message-util": {
-			"version": "30.1.0",
-			"resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-30.1.0.tgz",
-			"integrity": "sha512-HizKDGG98cYkWmaLUHChq4iN+oCENohQLb7Z5guBPumYs+/etonmNFlg1Ps6yN9LTPyZn+M+b/9BbnHx3WTMDg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/code-frame": "^7.27.1",
-				"@jest/types": "30.0.5",
-				"@types/stack-utils": "^2.0.3",
-				"chalk": "^4.1.2",
-				"graceful-fs": "^4.2.11",
-				"micromatch": "^4.0.8",
-				"pretty-format": "30.0.5",
-				"slash": "^3.0.0",
-				"stack-utils": "^2.0.6"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-message-util/node_modules/@jest/schemas": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
-			"integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@sinclair/typebox": "^0.34.0"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-message-util/node_modules/@jest/types": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.5.tgz",
-			"integrity": "sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/pattern": "30.0.1",
-				"@jest/schemas": "30.0.5",
-				"@types/istanbul-lib-coverage": "^2.0.6",
-				"@types/istanbul-reports": "^3.0.4",
-				"@types/node": "*",
-				"@types/yargs": "^17.0.33",
-				"chalk": "^4.1.2"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-message-util/node_modules/@sinclair/typebox": {
-			"version": "0.34.40",
-			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.40.tgz",
-			"integrity": "sha512-gwBNIP8ZAYev/ORDWW0QvxdwPXwxBtLsdsJgSc7eDIRt8ubP+rxUBzPsrwnu16fgEF8Bx4lh/+mvQvJzcTM6Kw==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/jest-mock": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-30.0.5.tgz",
-			"integrity": "sha512-Od7TyasAAQX/6S+QCbN6vZoWOMwlTtzzGuxJku1GhGanAjz9y+QsQkpScDmETvdc9aSXyJ/Op4rhpMYBWW91wQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/types": "30.0.5",
-				"@types/node": "*",
-				"jest-util": "30.0.5"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-mock/node_modules/@jest/schemas": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
-			"integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@sinclair/typebox": "^0.34.0"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-mock/node_modules/@jest/types": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.5.tgz",
-			"integrity": "sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/pattern": "30.0.1",
-				"@jest/schemas": "30.0.5",
-				"@types/istanbul-lib-coverage": "^2.0.6",
-				"@types/istanbul-reports": "^3.0.4",
-				"@types/node": "*",
-				"@types/yargs": "^17.0.33",
-				"chalk": "^4.1.2"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-mock/node_modules/@sinclair/typebox": {
-			"version": "0.34.40",
-			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.40.tgz",
-			"integrity": "sha512-gwBNIP8ZAYev/ORDWW0QvxdwPXwxBtLsdsJgSc7eDIRt8ubP+rxUBzPsrwnu16fgEF8Bx4lh/+mvQvJzcTM6Kw==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/jest-mock/node_modules/ci-info": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.0.tgz",
-			"integrity": "sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/sibiraj-s"
-				}
-			],
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/jest-mock/node_modules/jest-util": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-30.0.5.tgz",
-			"integrity": "sha512-pvyPWssDZR0FlfMxCBoc0tvM8iUEskaRFALUtGQYzVEAqisAztmy+R8LnU14KT4XA0H/a5HMVTXat1jLne010g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/types": "30.0.5",
-				"@types/node": "*",
-				"chalk": "^4.1.2",
-				"ci-info": "^4.2.0",
-				"graceful-fs": "^4.2.11",
-				"picomatch": "^4.0.2"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-mock/node_modules/picomatch": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-			"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/jonschlinkert"
-			}
-		},
-		"node_modules/jest-pnp-resolver": {
-			"version": "1.2.3",
-			"resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
-			"integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6"
-			},
-			"peerDependencies": {
-				"jest-resolve": "*"
-			},
-			"peerDependenciesMeta": {
-				"jest-resolve": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/jest-regex-util": {
-			"version": "29.6.3",
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"peer": true,
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/jest-resolve": {
-			"version": "30.1.0",
-			"resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-30.1.0.tgz",
-			"integrity": "sha512-hASe7D/wRtZw8Cm607NrlF7fi3HWC5wmA5jCVc2QjQAB2pTwP9eVZILGEi6OeSLNUtE1zb04sXRowsdh5CUjwA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"chalk": "^4.1.2",
-				"graceful-fs": "^4.2.11",
-				"jest-haste-map": "30.1.0",
-				"jest-pnp-resolver": "^1.2.3",
-				"jest-util": "30.0.5",
-				"jest-validate": "30.1.0",
-				"slash": "^3.0.0",
-				"unrs-resolver": "^1.7.11"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-resolve-dependencies": {
-			"version": "30.1.1",
-			"resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-30.1.1.tgz",
-			"integrity": "sha512-tRtaaoH8Ws1Gn1o/9pedt19dvVgr81WwdmvJSP9Ow3amOUOP2nN9j94u5jC9XlIfa2Q1FQKIWWQwL4ajqsjCGQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"jest-regex-util": "30.0.1",
-				"jest-snapshot": "30.1.1"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-resolve-dependencies/node_modules/jest-regex-util": {
-			"version": "30.0.1",
-			"resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-30.0.1.tgz",
-			"integrity": "sha512-jHEQgBXAgc+Gh4g0p3bCevgRCVRkB4VB70zhoAE48gxeSr1hfUOsM/C2WoJgVL7Eyg//hudYENbm3Ne+/dRVVA==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-resolve/node_modules/@jest/schemas": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
-			"integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@sinclair/typebox": "^0.34.0"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-resolve/node_modules/@jest/types": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.5.tgz",
-			"integrity": "sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/pattern": "30.0.1",
-				"@jest/schemas": "30.0.5",
-				"@types/istanbul-lib-coverage": "^2.0.6",
-				"@types/istanbul-reports": "^3.0.4",
-				"@types/node": "*",
-				"@types/yargs": "^17.0.33",
-				"chalk": "^4.1.2"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-resolve/node_modules/@sinclair/typebox": {
-			"version": "0.34.40",
-			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.40.tgz",
-			"integrity": "sha512-gwBNIP8ZAYev/ORDWW0QvxdwPXwxBtLsdsJgSc7eDIRt8ubP+rxUBzPsrwnu16fgEF8Bx4lh/+mvQvJzcTM6Kw==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/jest-resolve/node_modules/ci-info": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.0.tgz",
-			"integrity": "sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/sibiraj-s"
-				}
-			],
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/jest-resolve/node_modules/jest-haste-map": {
-			"version": "30.1.0",
-			"resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-30.1.0.tgz",
-			"integrity": "sha512-JLeM84kNjpRkggcGpQLsV7B8W4LNUWz7oDNVnY1Vjj22b5/fAb3kk3htiD+4Na8bmJmjJR7rBtS2Rmq/NEcADg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/types": "30.0.5",
-				"@types/node": "*",
-				"anymatch": "^3.1.3",
-				"fb-watchman": "^2.0.2",
-				"graceful-fs": "^4.2.11",
-				"jest-regex-util": "30.0.1",
-				"jest-util": "30.0.5",
-				"jest-worker": "30.1.0",
-				"micromatch": "^4.0.8",
-				"walker": "^1.0.8"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			},
-			"optionalDependencies": {
-				"fsevents": "^2.3.3"
-			}
-		},
-		"node_modules/jest-resolve/node_modules/jest-regex-util": {
-			"version": "30.0.1",
-			"resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-30.0.1.tgz",
-			"integrity": "sha512-jHEQgBXAgc+Gh4g0p3bCevgRCVRkB4VB70zhoAE48gxeSr1hfUOsM/C2WoJgVL7Eyg//hudYENbm3Ne+/dRVVA==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-resolve/node_modules/jest-util": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-30.0.5.tgz",
-			"integrity": "sha512-pvyPWssDZR0FlfMxCBoc0tvM8iUEskaRFALUtGQYzVEAqisAztmy+R8LnU14KT4XA0H/a5HMVTXat1jLne010g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/types": "30.0.5",
-				"@types/node": "*",
-				"chalk": "^4.1.2",
-				"ci-info": "^4.2.0",
-				"graceful-fs": "^4.2.11",
-				"picomatch": "^4.0.2"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-resolve/node_modules/jest-worker": {
-			"version": "30.1.0",
-			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-30.1.0.tgz",
-			"integrity": "sha512-uvWcSjlwAAgIu133Tt77A05H7RIk3Ho8tZL50bQM2AkvLdluw9NG48lRCl3Dt+MOH719n/0nnb5YxUwcuJiKRA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@types/node": "*",
-				"@ungap/structured-clone": "^1.3.0",
-				"jest-util": "30.0.5",
-				"merge-stream": "^2.0.0",
-				"supports-color": "^8.1.1"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-resolve/node_modules/picomatch": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-			"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/jonschlinkert"
-			}
-		},
-		"node_modules/jest-runner": {
-			"version": "30.1.1",
-			"resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-30.1.1.tgz",
-			"integrity": "sha512-ATe6372SOfJvCRExtCAr06I4rGujwFdKg44b6i7/aOgFnULwjxzugJ0Y4AnG+jeSeQi8dU7R6oqLGmsxRUbErQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/console": "30.1.1",
-				"@jest/environment": "30.1.1",
-				"@jest/test-result": "30.1.1",
-				"@jest/transform": "30.1.1",
-				"@jest/types": "30.0.5",
-				"@types/node": "*",
-				"chalk": "^4.1.2",
-				"emittery": "^0.13.1",
-				"exit-x": "^0.2.2",
-				"graceful-fs": "^4.2.11",
-				"jest-docblock": "30.0.1",
-				"jest-environment-node": "30.1.1",
-				"jest-haste-map": "30.1.0",
-				"jest-leak-detector": "30.1.0",
-				"jest-message-util": "30.1.0",
-				"jest-resolve": "30.1.0",
-				"jest-runtime": "30.1.1",
-				"jest-util": "30.0.5",
-				"jest-watcher": "30.1.1",
-				"jest-worker": "30.1.0",
-				"p-limit": "^3.1.0",
-				"source-map-support": "0.5.13"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-runner/node_modules/@jest/schemas": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
-			"integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@sinclair/typebox": "^0.34.0"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-runner/node_modules/@jest/transform": {
-			"version": "30.1.1",
-			"resolved": "https://registry.npmjs.org/@jest/transform/-/transform-30.1.1.tgz",
-			"integrity": "sha512-PHIA2AbAASBfk6evkNifvmx9lkOSkmvaQoO6VSpuL8+kQqDMHeDoJ7RU3YP1wWAMD7AyQn9UL5iheuFYCC4lqQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/core": "^7.27.4",
-				"@jest/types": "30.0.5",
-				"@jridgewell/trace-mapping": "^0.3.25",
-				"babel-plugin-istanbul": "^7.0.0",
-				"chalk": "^4.1.2",
-				"convert-source-map": "^2.0.0",
-				"fast-json-stable-stringify": "^2.1.0",
-				"graceful-fs": "^4.2.11",
-				"jest-haste-map": "30.1.0",
-				"jest-regex-util": "30.0.1",
-				"jest-util": "30.0.5",
-				"micromatch": "^4.0.8",
-				"pirates": "^4.0.7",
-				"slash": "^3.0.0",
-				"write-file-atomic": "^5.0.1"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-runner/node_modules/@jest/types": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.5.tgz",
-			"integrity": "sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/pattern": "30.0.1",
-				"@jest/schemas": "30.0.5",
-				"@types/istanbul-lib-coverage": "^2.0.6",
-				"@types/istanbul-reports": "^3.0.4",
-				"@types/node": "*",
-				"@types/yargs": "^17.0.33",
-				"chalk": "^4.1.2"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-runner/node_modules/@sinclair/typebox": {
-			"version": "0.34.40",
-			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.40.tgz",
-			"integrity": "sha512-gwBNIP8ZAYev/ORDWW0QvxdwPXwxBtLsdsJgSc7eDIRt8ubP+rxUBzPsrwnu16fgEF8Bx4lh/+mvQvJzcTM6Kw==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/jest-runner/node_modules/babel-plugin-istanbul": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-7.0.0.tgz",
-			"integrity": "sha512-C5OzENSx/A+gt7t4VH1I2XsflxyPUmXRFPKBxt33xncdOmq7oROVM3bZv9Ysjjkv8OJYDMa+tKuKMvqU/H3xdw==",
-			"dev": true,
-			"license": "BSD-3-Clause",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.0.0",
-				"@istanbuljs/load-nyc-config": "^1.0.0",
-				"@istanbuljs/schema": "^0.1.3",
-				"istanbul-lib-instrument": "^6.0.2",
-				"test-exclude": "^6.0.0"
-			},
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/jest-runner/node_modules/ci-info": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.0.tgz",
-			"integrity": "sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/sibiraj-s"
-				}
-			],
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/jest-runner/node_modules/jest-haste-map": {
-			"version": "30.1.0",
-			"resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-30.1.0.tgz",
-			"integrity": "sha512-JLeM84kNjpRkggcGpQLsV7B8W4LNUWz7oDNVnY1Vjj22b5/fAb3kk3htiD+4Na8bmJmjJR7rBtS2Rmq/NEcADg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/types": "30.0.5",
-				"@types/node": "*",
-				"anymatch": "^3.1.3",
-				"fb-watchman": "^2.0.2",
-				"graceful-fs": "^4.2.11",
-				"jest-regex-util": "30.0.1",
-				"jest-util": "30.0.5",
-				"jest-worker": "30.1.0",
-				"micromatch": "^4.0.8",
-				"walker": "^1.0.8"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			},
-			"optionalDependencies": {
-				"fsevents": "^2.3.3"
-			}
-		},
-		"node_modules/jest-runner/node_modules/jest-regex-util": {
-			"version": "30.0.1",
-			"resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-30.0.1.tgz",
-			"integrity": "sha512-jHEQgBXAgc+Gh4g0p3bCevgRCVRkB4VB70zhoAE48gxeSr1hfUOsM/C2WoJgVL7Eyg//hudYENbm3Ne+/dRVVA==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-runner/node_modules/jest-util": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-30.0.5.tgz",
-			"integrity": "sha512-pvyPWssDZR0FlfMxCBoc0tvM8iUEskaRFALUtGQYzVEAqisAztmy+R8LnU14KT4XA0H/a5HMVTXat1jLne010g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/types": "30.0.5",
-				"@types/node": "*",
-				"chalk": "^4.1.2",
-				"ci-info": "^4.2.0",
-				"graceful-fs": "^4.2.11",
-				"picomatch": "^4.0.2"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-runner/node_modules/jest-worker": {
-			"version": "30.1.0",
-			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-30.1.0.tgz",
-			"integrity": "sha512-uvWcSjlwAAgIu133Tt77A05H7RIk3Ho8tZL50bQM2AkvLdluw9NG48lRCl3Dt+MOH719n/0nnb5YxUwcuJiKRA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@types/node": "*",
-				"@ungap/structured-clone": "^1.3.0",
-				"jest-util": "30.0.5",
-				"merge-stream": "^2.0.0",
-				"supports-color": "^8.1.1"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-runner/node_modules/picomatch": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-			"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/jonschlinkert"
-			}
-		},
-		"node_modules/jest-runner/node_modules/signal-exit": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
-			"integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
-			"dev": true,
-			"license": "ISC",
-			"engines": {
-				"node": ">=14"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			}
-		},
-		"node_modules/jest-runner/node_modules/write-file-atomic": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz",
-			"integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"imurmurhash": "^0.1.4",
-				"signal-exit": "^4.0.1"
-			},
-			"engines": {
-				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-			}
-		},
-		"node_modules/jest-runtime": {
-			"version": "30.1.1",
-			"resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-30.1.1.tgz",
-			"integrity": "sha512-7sOyR0Oekw4OesQqqBHuYJRB52QtXiq0NNgLRzVogiMSxKCMiliUd6RrXHCnG5f12Age/ggidCBiQftzcA9XKw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/environment": "30.1.1",
-				"@jest/fake-timers": "30.1.1",
-				"@jest/globals": "30.1.1",
-				"@jest/source-map": "30.0.1",
-				"@jest/test-result": "30.1.1",
-				"@jest/transform": "30.1.1",
-				"@jest/types": "30.0.5",
-				"@types/node": "*",
-				"chalk": "^4.1.2",
-				"cjs-module-lexer": "^2.1.0",
-				"collect-v8-coverage": "^1.0.2",
-				"glob": "^10.3.10",
-				"graceful-fs": "^4.2.11",
-				"jest-haste-map": "30.1.0",
-				"jest-message-util": "30.1.0",
-				"jest-mock": "30.0.5",
-				"jest-regex-util": "30.0.1",
-				"jest-resolve": "30.1.0",
-				"jest-snapshot": "30.1.1",
-				"jest-util": "30.0.5",
-				"slash": "^3.0.0",
-				"strip-bom": "^4.0.0"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-runtime/node_modules/@jest/schemas": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
-			"integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@sinclair/typebox": "^0.34.0"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-runtime/node_modules/@jest/transform": {
-			"version": "30.1.1",
-			"resolved": "https://registry.npmjs.org/@jest/transform/-/transform-30.1.1.tgz",
-			"integrity": "sha512-PHIA2AbAASBfk6evkNifvmx9lkOSkmvaQoO6VSpuL8+kQqDMHeDoJ7RU3YP1wWAMD7AyQn9UL5iheuFYCC4lqQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/core": "^7.27.4",
-				"@jest/types": "30.0.5",
-				"@jridgewell/trace-mapping": "^0.3.25",
-				"babel-plugin-istanbul": "^7.0.0",
-				"chalk": "^4.1.2",
-				"convert-source-map": "^2.0.0",
-				"fast-json-stable-stringify": "^2.1.0",
-				"graceful-fs": "^4.2.11",
-				"jest-haste-map": "30.1.0",
-				"jest-regex-util": "30.0.1",
-				"jest-util": "30.0.5",
-				"micromatch": "^4.0.8",
-				"pirates": "^4.0.7",
-				"slash": "^3.0.0",
-				"write-file-atomic": "^5.0.1"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-runtime/node_modules/@jest/types": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.5.tgz",
-			"integrity": "sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/pattern": "30.0.1",
-				"@jest/schemas": "30.0.5",
-				"@types/istanbul-lib-coverage": "^2.0.6",
-				"@types/istanbul-reports": "^3.0.4",
-				"@types/node": "*",
-				"@types/yargs": "^17.0.33",
-				"chalk": "^4.1.2"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-runtime/node_modules/@sinclair/typebox": {
-			"version": "0.34.40",
-			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.40.tgz",
-			"integrity": "sha512-gwBNIP8ZAYev/ORDWW0QvxdwPXwxBtLsdsJgSc7eDIRt8ubP+rxUBzPsrwnu16fgEF8Bx4lh/+mvQvJzcTM6Kw==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/jest-runtime/node_modules/babel-plugin-istanbul": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-7.0.0.tgz",
-			"integrity": "sha512-C5OzENSx/A+gt7t4VH1I2XsflxyPUmXRFPKBxt33xncdOmq7oROVM3bZv9Ysjjkv8OJYDMa+tKuKMvqU/H3xdw==",
-			"dev": true,
-			"license": "BSD-3-Clause",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.0.0",
-				"@istanbuljs/load-nyc-config": "^1.0.0",
-				"@istanbuljs/schema": "^0.1.3",
-				"istanbul-lib-instrument": "^6.0.2",
-				"test-exclude": "^6.0.0"
-			},
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/jest-runtime/node_modules/brace-expansion": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-			"integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"balanced-match": "^1.0.0"
-			}
-		},
-		"node_modules/jest-runtime/node_modules/ci-info": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.0.tgz",
-			"integrity": "sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/sibiraj-s"
-				}
-			],
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/jest-runtime/node_modules/glob": {
-			"version": "10.4.5",
-			"resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
-			"integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"foreground-child": "^3.1.0",
-				"jackspeak": "^3.1.2",
-				"minimatch": "^9.0.4",
-				"minipass": "^7.1.2",
-				"package-json-from-dist": "^1.0.0",
-				"path-scurry": "^1.11.1"
-			},
-			"bin": {
-				"glob": "dist/esm/bin.mjs"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			}
-		},
-		"node_modules/jest-runtime/node_modules/jest-haste-map": {
-			"version": "30.1.0",
-			"resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-30.1.0.tgz",
-			"integrity": "sha512-JLeM84kNjpRkggcGpQLsV7B8W4LNUWz7oDNVnY1Vjj22b5/fAb3kk3htiD+4Na8bmJmjJR7rBtS2Rmq/NEcADg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/types": "30.0.5",
-				"@types/node": "*",
-				"anymatch": "^3.1.3",
-				"fb-watchman": "^2.0.2",
-				"graceful-fs": "^4.2.11",
-				"jest-regex-util": "30.0.1",
-				"jest-util": "30.0.5",
-				"jest-worker": "30.1.0",
-				"micromatch": "^4.0.8",
-				"walker": "^1.0.8"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			},
-			"optionalDependencies": {
-				"fsevents": "^2.3.3"
-			}
-		},
-		"node_modules/jest-runtime/node_modules/jest-regex-util": {
-			"version": "30.0.1",
-			"resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-30.0.1.tgz",
-			"integrity": "sha512-jHEQgBXAgc+Gh4g0p3bCevgRCVRkB4VB70zhoAE48gxeSr1hfUOsM/C2WoJgVL7Eyg//hudYENbm3Ne+/dRVVA==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-runtime/node_modules/jest-util": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-30.0.5.tgz",
-			"integrity": "sha512-pvyPWssDZR0FlfMxCBoc0tvM8iUEskaRFALUtGQYzVEAqisAztmy+R8LnU14KT4XA0H/a5HMVTXat1jLne010g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/types": "30.0.5",
-				"@types/node": "*",
-				"chalk": "^4.1.2",
-				"ci-info": "^4.2.0",
-				"graceful-fs": "^4.2.11",
-				"picomatch": "^4.0.2"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-runtime/node_modules/jest-worker": {
-			"version": "30.1.0",
-			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-30.1.0.tgz",
-			"integrity": "sha512-uvWcSjlwAAgIu133Tt77A05H7RIk3Ho8tZL50bQM2AkvLdluw9NG48lRCl3Dt+MOH719n/0nnb5YxUwcuJiKRA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@types/node": "*",
-				"@ungap/structured-clone": "^1.3.0",
-				"jest-util": "30.0.5",
-				"merge-stream": "^2.0.0",
-				"supports-color": "^8.1.1"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-runtime/node_modules/minimatch": {
-			"version": "9.0.5",
-			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-			"integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"brace-expansion": "^2.0.1"
-			},
-			"engines": {
-				"node": ">=16 || 14 >=14.17"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			}
-		},
-		"node_modules/jest-runtime/node_modules/picomatch": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-			"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/jonschlinkert"
-			}
-		},
-		"node_modules/jest-runtime/node_modules/signal-exit": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
-			"integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
-			"dev": true,
-			"license": "ISC",
-			"engines": {
-				"node": ">=14"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			}
-		},
-		"node_modules/jest-runtime/node_modules/write-file-atomic": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz",
-			"integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"imurmurhash": "^0.1.4",
-				"signal-exit": "^4.0.1"
-			},
-			"engines": {
-				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-			}
-		},
-		"node_modules/jest-snapshot": {
-			"version": "30.1.1",
-			"resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-30.1.1.tgz",
-			"integrity": "sha512-7/iBEzoJqEt2TjkQY+mPLHP8cbPhLReZVkkxjTMzIzoTC4cZufg7HzKo/n9cIkXKj2LG0x3mmBHsZto+7TOmFg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/core": "^7.27.4",
-				"@babel/generator": "^7.27.5",
-				"@babel/plugin-syntax-jsx": "^7.27.1",
-				"@babel/plugin-syntax-typescript": "^7.27.1",
-				"@babel/types": "^7.27.3",
-				"@jest/expect-utils": "30.1.1",
-				"@jest/get-type": "30.1.0",
-				"@jest/snapshot-utils": "30.1.1",
-				"@jest/transform": "30.1.1",
-				"@jest/types": "30.0.5",
-				"babel-preset-current-node-syntax": "^1.1.0",
-				"chalk": "^4.1.2",
-				"expect": "30.1.1",
-				"graceful-fs": "^4.2.11",
-				"jest-diff": "30.1.1",
-				"jest-matcher-utils": "30.1.1",
-				"jest-message-util": "30.1.0",
-				"jest-util": "30.0.5",
-				"pretty-format": "30.0.5",
-				"semver": "^7.7.2",
-				"synckit": "^0.11.8"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-snapshot/node_modules/@jest/schemas": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
-			"integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@sinclair/typebox": "^0.34.0"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-snapshot/node_modules/@jest/transform": {
-			"version": "30.1.1",
-			"resolved": "https://registry.npmjs.org/@jest/transform/-/transform-30.1.1.tgz",
-			"integrity": "sha512-PHIA2AbAASBfk6evkNifvmx9lkOSkmvaQoO6VSpuL8+kQqDMHeDoJ7RU3YP1wWAMD7AyQn9UL5iheuFYCC4lqQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/core": "^7.27.4",
-				"@jest/types": "30.0.5",
-				"@jridgewell/trace-mapping": "^0.3.25",
-				"babel-plugin-istanbul": "^7.0.0",
-				"chalk": "^4.1.2",
-				"convert-source-map": "^2.0.0",
-				"fast-json-stable-stringify": "^2.1.0",
-				"graceful-fs": "^4.2.11",
-				"jest-haste-map": "30.1.0",
-				"jest-regex-util": "30.0.1",
-				"jest-util": "30.0.5",
-				"micromatch": "^4.0.8",
-				"pirates": "^4.0.7",
-				"slash": "^3.0.0",
-				"write-file-atomic": "^5.0.1"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-snapshot/node_modules/@jest/types": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.5.tgz",
-			"integrity": "sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/pattern": "30.0.1",
-				"@jest/schemas": "30.0.5",
-				"@types/istanbul-lib-coverage": "^2.0.6",
-				"@types/istanbul-reports": "^3.0.4",
-				"@types/node": "*",
-				"@types/yargs": "^17.0.33",
-				"chalk": "^4.1.2"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-snapshot/node_modules/@sinclair/typebox": {
-			"version": "0.34.40",
-			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.40.tgz",
-			"integrity": "sha512-gwBNIP8ZAYev/ORDWW0QvxdwPXwxBtLsdsJgSc7eDIRt8ubP+rxUBzPsrwnu16fgEF8Bx4lh/+mvQvJzcTM6Kw==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/jest-snapshot/node_modules/babel-plugin-istanbul": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-7.0.0.tgz",
-			"integrity": "sha512-C5OzENSx/A+gt7t4VH1I2XsflxyPUmXRFPKBxt33xncdOmq7oROVM3bZv9Ysjjkv8OJYDMa+tKuKMvqU/H3xdw==",
-			"dev": true,
-			"license": "BSD-3-Clause",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.0.0",
-				"@istanbuljs/load-nyc-config": "^1.0.0",
-				"@istanbuljs/schema": "^0.1.3",
-				"istanbul-lib-instrument": "^6.0.2",
-				"test-exclude": "^6.0.0"
-			},
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/jest-snapshot/node_modules/ci-info": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.0.tgz",
-			"integrity": "sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/sibiraj-s"
-				}
-			],
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/jest-snapshot/node_modules/jest-haste-map": {
-			"version": "30.1.0",
-			"resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-30.1.0.tgz",
-			"integrity": "sha512-JLeM84kNjpRkggcGpQLsV7B8W4LNUWz7oDNVnY1Vjj22b5/fAb3kk3htiD+4Na8bmJmjJR7rBtS2Rmq/NEcADg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/types": "30.0.5",
-				"@types/node": "*",
-				"anymatch": "^3.1.3",
-				"fb-watchman": "^2.0.2",
-				"graceful-fs": "^4.2.11",
-				"jest-regex-util": "30.0.1",
-				"jest-util": "30.0.5",
-				"jest-worker": "30.1.0",
-				"micromatch": "^4.0.8",
-				"walker": "^1.0.8"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			},
-			"optionalDependencies": {
-				"fsevents": "^2.3.3"
-			}
-		},
-		"node_modules/jest-snapshot/node_modules/jest-regex-util": {
-			"version": "30.0.1",
-			"resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-30.0.1.tgz",
-			"integrity": "sha512-jHEQgBXAgc+Gh4g0p3bCevgRCVRkB4VB70zhoAE48gxeSr1hfUOsM/C2WoJgVL7Eyg//hudYENbm3Ne+/dRVVA==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-snapshot/node_modules/jest-util": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-30.0.5.tgz",
-			"integrity": "sha512-pvyPWssDZR0FlfMxCBoc0tvM8iUEskaRFALUtGQYzVEAqisAztmy+R8LnU14KT4XA0H/a5HMVTXat1jLne010g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/types": "30.0.5",
-				"@types/node": "*",
-				"chalk": "^4.1.2",
-				"ci-info": "^4.2.0",
-				"graceful-fs": "^4.2.11",
-				"picomatch": "^4.0.2"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-snapshot/node_modules/jest-worker": {
-			"version": "30.1.0",
-			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-30.1.0.tgz",
-			"integrity": "sha512-uvWcSjlwAAgIu133Tt77A05H7RIk3Ho8tZL50bQM2AkvLdluw9NG48lRCl3Dt+MOH719n/0nnb5YxUwcuJiKRA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@types/node": "*",
-				"@ungap/structured-clone": "^1.3.0",
-				"jest-util": "30.0.5",
-				"merge-stream": "^2.0.0",
-				"supports-color": "^8.1.1"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-snapshot/node_modules/picomatch": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-			"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/jonschlinkert"
-			}
-		},
-		"node_modules/jest-snapshot/node_modules/signal-exit": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
-			"integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
-			"dev": true,
-			"license": "ISC",
-			"engines": {
-				"node": ">=14"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			}
-		},
-		"node_modules/jest-snapshot/node_modules/write-file-atomic": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz",
-			"integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"imurmurhash": "^0.1.4",
-				"signal-exit": "^4.0.1"
-			},
-			"engines": {
-				"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-			}
-		},
-		"node_modules/jest-util": {
-			"version": "29.7.0",
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"peer": true,
-			"dependencies": {
-				"@jest/types": "^29.6.3",
-				"@types/node": "*",
-				"chalk": "^4.0.0",
-				"ci-info": "^3.2.0",
-				"graceful-fs": "^4.2.9",
-				"picomatch": "^2.2.3"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/jest-validate": {
-			"version": "30.1.0",
-			"resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-30.1.0.tgz",
-			"integrity": "sha512-7P3ZlCFW/vhfQ8pE7zW6Oi4EzvuB4sgR72Q1INfW9m0FGo0GADYlPwIkf4CyPq7wq85g+kPMtPOHNAdWHeBOaA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/get-type": "30.1.0",
-				"@jest/types": "30.0.5",
-				"camelcase": "^6.3.0",
-				"chalk": "^4.1.2",
-				"leven": "^3.1.0",
-				"pretty-format": "30.0.5"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-validate/node_modules/@jest/schemas": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
-			"integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@sinclair/typebox": "^0.34.0"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-validate/node_modules/@jest/types": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.5.tgz",
-			"integrity": "sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/pattern": "30.0.1",
-				"@jest/schemas": "30.0.5",
-				"@types/istanbul-lib-coverage": "^2.0.6",
-				"@types/istanbul-reports": "^3.0.4",
-				"@types/node": "*",
-				"@types/yargs": "^17.0.33",
-				"chalk": "^4.1.2"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-validate/node_modules/@sinclair/typebox": {
-			"version": "0.34.40",
-			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.40.tgz",
-			"integrity": "sha512-gwBNIP8ZAYev/ORDWW0QvxdwPXwxBtLsdsJgSc7eDIRt8ubP+rxUBzPsrwnu16fgEF8Bx4lh/+mvQvJzcTM6Kw==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/jest-validate/node_modules/camelcase": {
-			"version": "6.3.0",
-			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
-			"integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/jest-watcher": {
-			"version": "30.1.1",
-			"resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-30.1.1.tgz",
-			"integrity": "sha512-CrAQ73LlaS6KGQQw6NBi71g7qvP7scy+4+2c0jKX6+CWaYg85lZiig5nQQVTsS5a5sffNPL3uxXnaE9d7v9eQg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/test-result": "30.1.1",
-				"@jest/types": "30.0.5",
-				"@types/node": "*",
-				"ansi-escapes": "^4.3.2",
-				"chalk": "^4.1.2",
-				"emittery": "^0.13.1",
-				"jest-util": "30.0.5",
-				"string-length": "^4.0.2"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-watcher/node_modules/@jest/schemas": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
-			"integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@sinclair/typebox": "^0.34.0"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-watcher/node_modules/@jest/types": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.5.tgz",
-			"integrity": "sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/pattern": "30.0.1",
-				"@jest/schemas": "30.0.5",
-				"@types/istanbul-lib-coverage": "^2.0.6",
-				"@types/istanbul-reports": "^3.0.4",
-				"@types/node": "*",
-				"@types/yargs": "^17.0.33",
-				"chalk": "^4.1.2"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-watcher/node_modules/@sinclair/typebox": {
-			"version": "0.34.40",
-			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.40.tgz",
-			"integrity": "sha512-gwBNIP8ZAYev/ORDWW0QvxdwPXwxBtLsdsJgSc7eDIRt8ubP+rxUBzPsrwnu16fgEF8Bx4lh/+mvQvJzcTM6Kw==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/jest-watcher/node_modules/ci-info": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.0.tgz",
-			"integrity": "sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/sibiraj-s"
-				}
-			],
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/jest-watcher/node_modules/jest-util": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-30.0.5.tgz",
-			"integrity": "sha512-pvyPWssDZR0FlfMxCBoc0tvM8iUEskaRFALUtGQYzVEAqisAztmy+R8LnU14KT4XA0H/a5HMVTXat1jLne010g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/types": "30.0.5",
-				"@types/node": "*",
-				"chalk": "^4.1.2",
-				"ci-info": "^4.2.0",
-				"graceful-fs": "^4.2.11",
-				"picomatch": "^4.0.2"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest-watcher/node_modules/picomatch": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-			"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/jonschlinkert"
-			}
-		},
-		"node_modules/jest-worker": {
-			"version": "29.7.0",
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"peer": true,
-			"dependencies": {
-				"@types/node": "*",
-				"jest-util": "^29.7.0",
-				"merge-stream": "^2.0.0",
-				"supports-color": "^8.0.0"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-			}
-		},
-		"node_modules/jest/node_modules/@jest/schemas": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
-			"integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@sinclair/typebox": "^0.34.0"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest/node_modules/@jest/types": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/@jest/types/-/types-30.0.5.tgz",
-			"integrity": "sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/pattern": "30.0.1",
-				"@jest/schemas": "30.0.5",
-				"@types/istanbul-lib-coverage": "^2.0.6",
-				"@types/istanbul-reports": "^3.0.4",
-				"@types/node": "*",
-				"@types/yargs": "^17.0.33",
-				"chalk": "^4.1.2"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/jest/node_modules/@sinclair/typebox": {
-			"version": "0.34.40",
-			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.40.tgz",
-			"integrity": "sha512-gwBNIP8ZAYev/ORDWW0QvxdwPXwxBtLsdsJgSc7eDIRt8ubP+rxUBzPsrwnu16fgEF8Bx4lh/+mvQvJzcTM6Kw==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/js-tokens": {
-			"version": "4.0.0",
-			"dev": true,
-			"license": "MIT"
-		},
 		"node_modules/js-yaml": {
 			"version": "4.1.0",
 			"dev": true,
@@ -7720,19 +2613,6 @@
 				"js-yaml": "bin/js-yaml.js"
 			}
 		},
-		"node_modules/jsesc": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
-			"integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",
-			"dev": true,
-			"license": "MIT",
-			"bin": {
-				"jsesc": "bin/jsesc"
-			},
-			"engines": {
-				"node": ">=6"
-			}
-		},
 		"node_modules/json-buffer": {
 			"version": "3.0.1",
 			"dev": true,
@@ -7791,16 +2671,6 @@
 				"node": ">=0.10.0"
 			}
 		},
-		"node_modules/leven": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
-			"integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6"
-			}
-		},
 		"node_modules/levn": {
 			"version": "0.4.1",
 			"dev": true,
@@ -7813,13 +2683,6 @@
 				"node": ">= 0.8.0"
 			}
 		},
-		"node_modules/lines-and-columns": {
-			"version": "1.2.4",
-			"resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-			"integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
-			"dev": true,
-			"license": "MIT"
-		},
 		"node_modules/loader-runner": {
 			"version": "4.3.0",
 			"dev": true,
@@ -7860,55 +2723,11 @@
 			"dev": true,
 			"license": "MIT"
 		},
-		"node_modules/lodash.memoize": {
-			"version": "4.1.2",
-			"dev": true,
-			"license": "MIT"
-		},
 		"node_modules/lodash.merge": {
 			"version": "4.6.2",
 			"dev": true,
 			"license": "MIT"
 		},
-		"node_modules/lru-cache": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-			"integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"yallist": "^3.0.2"
-			}
-		},
-		"node_modules/make-dir": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
-			"integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"semver": "^7.5.3"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/make-error": {
-			"version": "1.3.6",
-			"dev": true,
-			"license": "ISC"
-		},
-		"node_modules/makeerror": {
-			"version": "1.0.12",
-			"dev": true,
-			"license": "BSD-3-Clause",
-			"dependencies": {
-				"tmpl": "1.0.5"
-			}
-		},
 		"node_modules/math-intrinsics": {
 			"version": "1.1.0",
 			"dev": true,
@@ -7963,16 +2782,6 @@
 				"node": ">= 0.6"
 			}
 		},
-		"node_modules/mimic-fn": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-			"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6"
-			}
-		},
 		"node_modules/mini-css-extract-plugin": {
 			"version": "2.9.2",
 			"dev": true,
@@ -8052,26 +2861,6 @@
 				"node": "*"
 			}
 		},
-		"node_modules/minimist": {
-			"version": "1.2.8",
-			"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
-			"integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
-			"dev": true,
-			"license": "MIT",
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/minipass": {
-			"version": "7.1.2",
-			"resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
-			"integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
-			"dev": true,
-			"license": "ISC",
-			"engines": {
-				"node": ">=16 || 14 >=14.17"
-			}
-		},
 		"node_modules/moment": {
 			"version": "2.29.4",
 			"dev": true,
@@ -8102,22 +2891,6 @@
 				"node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
 			}
 		},
-		"node_modules/napi-postinstall": {
-			"version": "0.3.3",
-			"resolved": "https://registry.npmjs.org/napi-postinstall/-/napi-postinstall-0.3.3.tgz",
-			"integrity": "sha512-uTp172LLXSxuSYHv/kou+f6KW3SMppU9ivthaVTXian9sOt3XM/zHYHpRZiLgQoxeWfYUnslNWQHF1+G71xcow==",
-			"dev": true,
-			"license": "MIT",
-			"bin": {
-				"napi-postinstall": "lib/cli.js"
-			},
-			"engines": {
-				"node": "^12.20.0 || ^14.18.0 || >=16.0.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/napi-postinstall"
-			}
-		},
 		"node_modules/natural-compare": {
 			"version": "1.4.0",
 			"dev": true,
@@ -8144,24 +2917,11 @@
 				"node-gyp-build-test": "build-test.js"
 			}
 		},
-		"node_modules/node-int64": {
-			"version": "0.4.0",
-			"dev": true,
-			"license": "MIT"
-		},
 		"node_modules/node-releases": {
 			"version": "2.0.19",
 			"dev": true,
 			"license": "MIT"
 		},
-		"node_modules/normalize-path": {
-			"version": "3.0.0",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
 		"node_modules/npm-check-updates": {
 			"version": "18.0.1",
 			"dev": true,
@@ -8175,19 +2935,6 @@
 				"npm": ">=8.12.1"
 			}
 		},
-		"node_modules/npm-run-path": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-			"integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"path-key": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
 		"node_modules/object-inspect": {
 			"version": "1.13.4",
 			"dev": true,
@@ -8212,30 +2959,6 @@
 				"@codemirror/view": "^6.0.0"
 			}
 		},
-		"node_modules/once": {
-			"version": "1.4.0",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"wrappy": "1"
-			}
-		},
-		"node_modules/onetime": {
-			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-			"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"mimic-fn": "^2.1.0"
-			},
-			"engines": {
-				"node": ">=6"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
 		"node_modules/optionator": {
 			"version": "0.9.4",
 			"dev": true,
@@ -8312,13 +3035,6 @@
 				"node": ">=6"
 			}
 		},
-		"node_modules/package-json-from-dist": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
-			"integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
-			"dev": true,
-			"license": "BlueOak-1.0.0"
-		},
 		"node_modules/parent-module": {
 			"version": "1.0.1",
 			"dev": true,
@@ -8330,25 +3046,6 @@
 				"node": ">=6"
 			}
 		},
-		"node_modules/parse-json": {
-			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
-			"integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@babel/code-frame": "^7.0.0",
-				"error-ex": "^1.3.1",
-				"json-parse-even-better-errors": "^2.3.0",
-				"lines-and-columns": "^1.1.6"
-			},
-			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
 		"node_modules/path-exists": {
 			"version": "4.0.0",
 			"dev": true,
@@ -8357,14 +3054,6 @@
 				"node": ">=8"
 			}
 		},
-		"node_modules/path-is-absolute": {
-			"version": "1.0.1",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
 		"node_modules/path-key": {
 			"version": "3.1.1",
 			"dev": true,
@@ -8378,30 +3067,6 @@
 			"dev": true,
 			"license": "MIT"
 		},
-		"node_modules/path-scurry": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
-			"integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
-			"dev": true,
-			"license": "BlueOak-1.0.0",
-			"dependencies": {
-				"lru-cache": "^10.2.0",
-				"minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
-			},
-			"engines": {
-				"node": ">=16 || 14 >=14.18"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			}
-		},
-		"node_modules/path-scurry/node_modules/lru-cache": {
-			"version": "10.4.3",
-			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
-			"integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
-			"dev": true,
-			"license": "ISC"
-		},
 		"node_modules/picocolors": {
 			"version": "1.1.1",
 			"dev": true,
@@ -8418,14 +3083,6 @@
 				"url": "https://github.com/sponsors/jonschlinkert"
 			}
 		},
-		"node_modules/pirates": {
-			"version": "4.0.7",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">= 6"
-			}
-		},
 		"node_modules/pkg-dir": {
 			"version": "4.2.0",
 			"dev": true,
@@ -8606,54 +3263,6 @@
 				"url": "https://github.com/prettier/prettier?sponsor=1"
 			}
 		},
-		"node_modules/pretty-format": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-30.0.5.tgz",
-			"integrity": "sha512-D1tKtYvByrBkFLe2wHJl2bwMJIiT8rW+XA+TiataH79/FszLQMrpGEvzUVkzPau7OCO0Qnrhpe87PqtOAIB8Yw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jest/schemas": "30.0.5",
-				"ansi-styles": "^5.2.0",
-				"react-is": "^18.3.1"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/pretty-format/node_modules/@jest/schemas": {
-			"version": "30.0.5",
-			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
-			"integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@sinclair/typebox": "^0.34.0"
-			},
-			"engines": {
-				"node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-			}
-		},
-		"node_modules/pretty-format/node_modules/@sinclair/typebox": {
-			"version": "0.34.40",
-			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.40.tgz",
-			"integrity": "sha512-gwBNIP8ZAYev/ORDWW0QvxdwPXwxBtLsdsJgSc7eDIRt8ubP+rxUBzPsrwnu16fgEF8Bx4lh/+mvQvJzcTM6Kw==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/pretty-format/node_modules/ansi-styles": {
-			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-			"integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
-			}
-		},
 		"node_modules/punycode": {
 			"version": "2.3.1",
 			"dev": true,
@@ -8662,23 +3271,6 @@
 				"node": ">=6"
 			}
 		},
-		"node_modules/pure-rand": {
-			"version": "7.0.1",
-			"resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-7.0.1.tgz",
-			"integrity": "sha512-oTUZM/NAZS8p7ANR3SHh30kXB+zK2r2BPcEn/awJIbOvq82WoMN4p62AWWp3Hhw50G0xMsw1mhIBLqHw64EcNQ==",
-			"dev": true,
-			"funding": [
-				{
-					"type": "individual",
-					"url": "https://github.com/sponsors/dubzzz"
-				},
-				{
-					"type": "opencollective",
-					"url": "https://opencollective.com/fast-check"
-				}
-			],
-			"license": "MIT"
-		},
 		"node_modules/qs": {
 			"version": "6.14.0",
 			"dev": true,
@@ -8722,13 +3314,6 @@
 				"safe-buffer": "^5.1.0"
 			}
 		},
-		"node_modules/react-is": {
-			"version": "18.3.1",
-			"resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
-			"integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
-			"dev": true,
-			"license": "MIT"
-		},
 		"node_modules/readdirp": {
 			"version": "4.1.2",
 			"dev": true,
@@ -8830,6 +3415,16 @@
 				"node": ">=4"
 			}
 		},
+		"node_modules/resolve-pkg-maps": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz",
+			"integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==",
+			"dev": true,
+			"license": "MIT",
+			"funding": {
+				"url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1"
+			}
+		},
 		"node_modules/resolve-url-loader": {
 			"version": "5.0.0",
 			"dev": true,
@@ -9117,19 +3712,6 @@
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"node_modules/signal-exit": {
-			"version": "3.0.7",
-			"dev": true,
-			"license": "ISC"
-		},
-		"node_modules/slash": {
-			"version": "3.0.0",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
 		"node_modules/source-map": {
 			"version": "0.6.1",
 			"dev": true,
@@ -9146,59 +3728,6 @@
 				"node": ">=0.10.0"
 			}
 		},
-		"node_modules/source-map-support": {
-			"version": "0.5.13",
-			"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
-			"integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"buffer-from": "^1.0.0",
-				"source-map": "^0.6.0"
-			}
-		},
-		"node_modules/sprintf-js": {
-			"version": "1.0.3",
-			"dev": true,
-			"license": "BSD-3-Clause"
-		},
-		"node_modules/stack-utils": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
-			"integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"escape-string-regexp": "^2.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/stack-utils/node_modules/escape-string-regexp": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-			"integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/string-length": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
-			"integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"char-regex": "^1.0.2",
-				"strip-ansi": "^6.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
 		"node_modules/string-width": {
 			"version": "4.2.3",
 			"dev": true,
@@ -9212,22 +3741,6 @@
 				"node": ">=8"
 			}
 		},
-		"node_modules/string-width-cjs": {
-			"name": "string-width",
-			"version": "4.2.3",
-			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"emoji-regex": "^8.0.0",
-				"is-fullwidth-code-point": "^3.0.0",
-				"strip-ansi": "^6.0.1"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
 		"node_modules/strip-ansi": {
 			"version": "6.0.1",
 			"dev": true,
@@ -9239,40 +3752,6 @@
 				"node": ">=8"
 			}
 		},
-		"node_modules/strip-ansi-cjs": {
-			"name": "strip-ansi",
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-			"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"ansi-regex": "^5.0.1"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/strip-bom": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
-			"integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/strip-final-newline": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
-			"integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6"
-			}
-		},
 		"node_modules/strip-json-comments": {
 			"version": "3.1.1",
 			"dev": true,
@@ -9319,22 +3798,6 @@
 			"resolved": "sync-client",
 			"link": true
 		},
-		"node_modules/synckit": {
-			"version": "0.11.11",
-			"resolved": "https://registry.npmjs.org/synckit/-/synckit-0.11.11.tgz",
-			"integrity": "sha512-MeQTA1r0litLUf0Rp/iisCaL8761lKAZHaimlbGK4j0HysC4PLfqygQj9srcs0m2RdtDYnF8UuYyKpbjHYp7Jw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@pkgr/core": "^0.2.9"
-			},
-			"engines": {
-				"node": "^14.18.0 || >=16.0.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/synckit"
-			}
-		},
 		"node_modules/tapable": {
 			"version": "2.2.1",
 			"dev": true,
@@ -9468,24 +3931,6 @@
 			"resolved": "test-client",
 			"link": true
 		},
-		"node_modules/test-exclude": {
-			"version": "6.0.0",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"@istanbuljs/schema": "^0.1.2",
-				"glob": "^7.1.4",
-				"minimatch": "^3.0.4"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/tmpl": {
-			"version": "1.0.5",
-			"dev": true,
-			"license": "BSD-3-Clause"
-		},
 		"node_modules/to-regex-range": {
 			"version": "5.0.1",
 			"dev": true,
@@ -9518,70 +3963,6 @@
 				"typescript": ">=4.8.4"
 			}
 		},
-		"node_modules/ts-jest": {
-			"version": "29.4.1",
-			"resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.4.1.tgz",
-			"integrity": "sha512-SaeUtjfpg9Uqu8IbeDKtdaS0g8lS6FT6OzM3ezrDfErPJPHNDo/Ey+VFGP1bQIDfagYDLyRpd7O15XpG1Es2Uw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"bs-logger": "^0.2.6",
-				"fast-json-stable-stringify": "^2.1.0",
-				"handlebars": "^4.7.8",
-				"json5": "^2.2.3",
-				"lodash.memoize": "^4.1.2",
-				"make-error": "^1.3.6",
-				"semver": "^7.7.2",
-				"type-fest": "^4.41.0",
-				"yargs-parser": "^21.1.1"
-			},
-			"bin": {
-				"ts-jest": "cli.js"
-			},
-			"engines": {
-				"node": "^14.15.0 || ^16.10.0 || ^18.0.0 || >=20.0.0"
-			},
-			"peerDependencies": {
-				"@babel/core": ">=7.0.0-beta.0 <8",
-				"@jest/transform": "^29.0.0 || ^30.0.0",
-				"@jest/types": "^29.0.0 || ^30.0.0",
-				"babel-jest": "^29.0.0 || ^30.0.0",
-				"jest": "^29.0.0 || ^30.0.0",
-				"jest-util": "^29.0.0 || ^30.0.0",
-				"typescript": ">=4.3 <6"
-			},
-			"peerDependenciesMeta": {
-				"@babel/core": {
-					"optional": true
-				},
-				"@jest/transform": {
-					"optional": true
-				},
-				"@jest/types": {
-					"optional": true
-				},
-				"babel-jest": {
-					"optional": true
-				},
-				"esbuild": {
-					"optional": true
-				},
-				"jest-util": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/ts-jest/node_modules/type-fest": {
-			"version": "4.41.0",
-			"dev": true,
-			"license": "(MIT OR CC0-1.0)",
-			"engines": {
-				"node": ">=16"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
 		"node_modules/ts-loader": {
 			"version": "9.5.2",
 			"dev": true,
@@ -9614,6 +3995,26 @@
 			"dev": true,
 			"license": "0BSD"
 		},
+		"node_modules/tsx": {
+			"version": "4.20.5",
+			"resolved": "https://registry.npmjs.org/tsx/-/tsx-4.20.5.tgz",
+			"integrity": "sha512-+wKjMNU9w/EaQayHXb7WA7ZaHY6hN8WgfvHNQ3t1PnU91/7O8TcTnIhCDYTZwnt8JsO9IBqZ30Ln1r7pPF52Aw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"esbuild": "~0.25.0",
+				"get-tsconfig": "^4.7.5"
+			},
+			"bin": {
+				"tsx": "dist/cli.mjs"
+			},
+			"engines": {
+				"node": ">=18.0.0"
+			},
+			"optionalDependencies": {
+				"fsevents": "~2.3.3"
+			}
+		},
 		"node_modules/type-check": {
 			"version": "0.4.0",
 			"dev": true,
@@ -9625,29 +4026,6 @@
 				"node": ">= 0.8.0"
 			}
 		},
-		"node_modules/type-detect": {
-			"version": "4.0.8",
-			"resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-			"integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/type-fest": {
-			"version": "0.21.3",
-			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
-			"integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
-			"dev": true,
-			"license": "(MIT OR CC0-1.0)",
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
 		"node_modules/typescript": {
 			"version": "5.8.3",
 			"dev": true,
@@ -9684,22 +4062,10 @@
 				"typescript": ">=4.8.4 <6.0.0"
 			}
 		},
-		"node_modules/uglify-js": {
-			"version": "3.19.3",
-			"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz",
-			"integrity": "sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==",
-			"dev": true,
-			"license": "BSD-2-Clause",
-			"optional": true,
-			"bin": {
-				"uglifyjs": "bin/uglifyjs"
-			},
-			"engines": {
-				"node": ">=0.8.0"
-			}
-		},
 		"node_modules/undici-types": {
-			"version": "6.21.0",
+			"version": "7.10.0",
+			"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.10.0.tgz",
+			"integrity": "sha512-t5Fy/nfn+14LuOc2KNYg75vZqClpAiqscVvMygNnlsHBFpSXdJaYtXMcdNLpl/Qvc3P2cB3s6lOV51nqsFq4ag==",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -9711,41 +4077,6 @@
 				"node": ">= 10.0.0"
 			}
 		},
-		"node_modules/unrs-resolver": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/unrs-resolver/-/unrs-resolver-1.11.1.tgz",
-			"integrity": "sha512-bSjt9pjaEBnNiGgc9rUiHGKv5l4/TGzDmYw3RhnkJGtLhbnnA/5qJj7x3dNDCRx/PJxu774LlH8lCOlB4hEfKg==",
-			"dev": true,
-			"hasInstallScript": true,
-			"license": "MIT",
-			"dependencies": {
-				"napi-postinstall": "^0.3.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/unrs-resolver"
-			},
-			"optionalDependencies": {
-				"@unrs/resolver-binding-android-arm-eabi": "1.11.1",
-				"@unrs/resolver-binding-android-arm64": "1.11.1",
-				"@unrs/resolver-binding-darwin-arm64": "1.11.1",
-				"@unrs/resolver-binding-darwin-x64": "1.11.1",
-				"@unrs/resolver-binding-freebsd-x64": "1.11.1",
-				"@unrs/resolver-binding-linux-arm-gnueabihf": "1.11.1",
-				"@unrs/resolver-binding-linux-arm-musleabihf": "1.11.1",
-				"@unrs/resolver-binding-linux-arm64-gnu": "1.11.1",
-				"@unrs/resolver-binding-linux-arm64-musl": "1.11.1",
-				"@unrs/resolver-binding-linux-ppc64-gnu": "1.11.1",
-				"@unrs/resolver-binding-linux-riscv64-gnu": "1.11.1",
-				"@unrs/resolver-binding-linux-riscv64-musl": "1.11.1",
-				"@unrs/resolver-binding-linux-s390x-gnu": "1.11.1",
-				"@unrs/resolver-binding-linux-x64-gnu": "1.11.1",
-				"@unrs/resolver-binding-linux-x64-musl": "1.11.1",
-				"@unrs/resolver-binding-wasm32-wasi": "1.11.1",
-				"@unrs/resolver-binding-win32-arm64-msvc": "1.11.1",
-				"@unrs/resolver-binding-win32-ia32-msvc": "1.11.1",
-				"@unrs/resolver-binding-win32-x64-msvc": "1.11.1"
-			}
-		},
 		"node_modules/update-browserslist-db": {
 			"version": "1.1.3",
 			"dev": true,
@@ -9830,21 +4161,6 @@
 				"uuid": "dist/esm/bin/uuid"
 			}
 		},
-		"node_modules/v8-to-istanbul": {
-			"version": "9.3.0",
-			"resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz",
-			"integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"@jridgewell/trace-mapping": "^0.3.12",
-				"@types/istanbul-lib-coverage": "^2.0.1",
-				"convert-source-map": "^2.0.0"
-			},
-			"engines": {
-				"node": ">=10.12.0"
-			}
-		},
 		"node_modules/vault-link-obsidian-plugin": {
 			"resolved": "obsidian-plugin",
 			"link": true
@@ -9863,14 +4179,6 @@
 			"license": "MIT",
 			"peer": true
 		},
-		"node_modules/walker": {
-			"version": "1.0.8",
-			"dev": true,
-			"license": "Apache-2.0",
-			"dependencies": {
-				"makeerror": "1.0.12"
-			}
-		},
 		"node_modules/watchpack": {
 			"version": "2.4.2",
 			"dev": true,
@@ -10100,13 +4408,6 @@
 				"node": ">=0.10.0"
 			}
 		},
-		"node_modules/wordwrap": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
-			"integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==",
-			"dev": true,
-			"license": "MIT"
-		},
 		"node_modules/wrap-ansi": {
 			"version": "7.0.0",
 			"dev": true,
@@ -10123,44 +4424,6 @@
 				"url": "https://github.com/chalk/wrap-ansi?sponsor=1"
 			}
 		},
-		"node_modules/wrap-ansi-cjs": {
-			"name": "wrap-ansi",
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-			"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"ansi-styles": "^4.0.0",
-				"string-width": "^4.1.0",
-				"strip-ansi": "^6.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-			}
-		},
-		"node_modules/wrappy": {
-			"version": "1.0.2",
-			"dev": true,
-			"license": "ISC"
-		},
-		"node_modules/write-file-atomic": {
-			"version": "4.0.2",
-			"dev": true,
-			"license": "ISC",
-			"optional": true,
-			"peer": true,
-			"dependencies": {
-				"imurmurhash": "^0.1.4",
-				"signal-exit": "^3.0.7"
-			},
-			"engines": {
-				"node": "^12.13.0 || ^14.15.0 || >=16.0.0"
-			}
-		},
 		"node_modules/ws": {
 			"version": "8.18.3",
 			"resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz",
@@ -10191,13 +4454,6 @@
 				"node": ">=10"
 			}
 		},
-		"node_modules/yallist": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-			"integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-			"dev": true,
-			"license": "ISC"
-		},
 		"node_modules/yargs": {
 			"version": "17.7.2",
 			"dev": true,
@@ -10239,13 +4495,11 @@
 			"version": "0.6.3",
 			"license": "MIT",
 			"devDependencies": {
-				"@types/jest": "^30.0.0",
 				"@types/node": "^22.15.30",
 				"css-loader": "^7.1.2",
 				"date-fns": "^4.1.0",
 				"file-loader": "^6.2.0",
 				"fs-extra": "^11.3.0",
-				"jest": "^30.1.1",
 				"mini-css-extract-plugin": "^2.9.2",
 				"obsidian": "1.8.7",
 				"reconcile-text": "^0.5.0",
@@ -10254,9 +4508,9 @@
 				"sass-loader": "^16.0.5",
 				"sync-client": "file:../sync-client",
 				"terser-webpack-plugin": "^5.3.14",
-				"ts-jest": "^29.4.1",
 				"ts-loader": "^9.5.2",
 				"tslib": "2.8.1",
+				"tsx": "^4.20.5",
 				"typescript": "5.8.3",
 				"url": "^0.11.4",
 				"virtual-scroller": "^1.13.1",
@@ -10264,6 +4518,23 @@
 				"webpack-cli": "^6.0.1"
 			}
 		},
+		"obsidian-plugin/node_modules/@types/node": {
+			"version": "22.18.0",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-22.18.0.tgz",
+			"integrity": "sha512-m5ObIqwsUp6BZzyiy4RdZpzWGub9bqLJMvZDD0QMXhxjqMHMENlj+SqF5QxoUwaQNFe+8kz8XM8ZQhqkQPTgMQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"undici-types": "~6.21.0"
+			}
+		},
+		"obsidian-plugin/node_modules/undici-types": {
+			"version": "6.21.0",
+			"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
+			"integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
+			"dev": true,
+			"license": "MIT"
+		},
 		"sync-client": {
 			"version": "0.6.3",
 			"dependencies": {
@@ -10274,12 +4545,10 @@
 				"uuid": "^11.1.0"
 			},
 			"devDependencies": {
-				"@types/jest": "^30.0.0",
 				"@types/node": "^22.15.30",
-				"jest": "^30.1.1",
-				"ts-jest": "^29.4.1",
 				"ts-loader": "^9.5.2",
 				"tslib": "2.8.1",
+				"tsx": "^4.20.5",
 				"typescript": "5.8.3",
 				"webpack": "^5.99.9",
 				"webpack-cli": "^6.0.1",
@@ -10287,6 +4556,16 @@
 				"ws": "^8.18.3"
 			}
 		},
+		"sync-client/node_modules/@types/node": {
+			"version": "22.18.0",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-22.18.0.tgz",
+			"integrity": "sha512-m5ObIqwsUp6BZzyiy4RdZpzWGub9bqLJMvZDD0QMXhxjqMHMENlj+SqF5QxoUwaQNFe+8kz8XM8ZQhqkQPTgMQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"undici-types": "~6.21.0"
+			}
+		},
 		"sync-client/node_modules/brace-expansion": {
 			"version": "2.0.1",
 			"license": "MIT",
@@ -10307,6 +4586,13 @@
 				"url": "https://github.com/sponsors/isaacs"
 			}
 		},
+		"sync-client/node_modules/undici-types": {
+			"version": "6.21.0",
+			"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
+			"integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
+			"dev": true,
+			"license": "MIT"
+		},
 		"test-client": {
 			"version": "0.6.3",
 			"bin": {
@@ -10318,11 +4604,29 @@
 				"sync-client": "file:../sync-client",
 				"ts-loader": "^9.5.2",
 				"tslib": "2.8.1",
+				"tsx": "^4.20.5",
 				"typescript": "5.8.3",
 				"uuid": "^11.1.0",
 				"webpack": "^5.99.9",
 				"webpack-cli": "^6.0.1"
 			}
+		},
+		"test-client/node_modules/@types/node": {
+			"version": "22.18.0",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-22.18.0.tgz",
+			"integrity": "sha512-m5ObIqwsUp6BZzyiy4RdZpzWGub9bqLJMvZDD0QMXhxjqMHMENlj+SqF5QxoUwaQNFe+8kz8XM8ZQhqkQPTgMQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"undici-types": "~6.21.0"
+			}
+		},
+		"test-client/node_modules/undici-types": {
+			"version": "6.21.0",
+			"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
+			"integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
+			"dev": true,
+			"license": "MIT"
 		}
 	}
 }
diff --git a/frontend/sync-client/jest.config.js b/frontend/sync-client/jest.config.js
deleted file mode 100644
index d1cbaca2..00000000
--- a/frontend/sync-client/jest.config.js
+++ /dev/null
@@ -1,3 +0,0 @@
-module.exports = {
-	preset: "ts-jest"
-};
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index 6c9d6fc4..0046f5c2 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -10,22 +10,20 @@
     "scripts": {
         "dev": "webpack watch --mode development",
         "build": "webpack --mode production",
-        "test": "jest"
+        "test": "tsx --test src/**/*.test.ts"
     },
     "dependencies": {
         "byte-base64": "^1.1.0",
         "minimatch": "^10.0.1",
         "p-queue": "^8.1.0",
-        "uuid": "^11.1.0",
-        "reconcile-text": "^0.5.0"
+        "reconcile-text": "^0.5.0",
+        "uuid": "^11.1.0"
     },
     "devDependencies": {
-        "@types/jest": "^30.0.0",
         "@types/node": "^22.15.30",
-        "jest": "^30.1.1",
-        "ts-jest": "^29.4.1",
         "ts-loader": "^9.5.2",
         "tslib": "2.8.1",
+        "tsx": "^4.20.5",
         "typescript": "5.8.3",
         "webpack": "^5.99.9",
         "webpack-cli": "^6.0.1",
diff --git a/frontend/sync-client/src/file-operations/file-operations.test.ts b/frontend/sync-client/src/file-operations/file-operations.test.ts
index 82a96f9d..64c02655 100644
--- a/frontend/sync-client/src/file-operations/file-operations.test.ts
+++ b/frontend/sync-client/src/file-operations/file-operations.test.ts
@@ -1,3 +1,4 @@
+import { describe, it } from "node:test";
 import type {
 	Database,
 	DocumentRecord,
diff --git a/frontend/sync-client/src/services/sync-service.ts b/frontend/sync-client/src/services/sync-service.ts
index 5ac81d5b..8ce9c56a 100644
--- a/frontend/sync-client/src/services/sync-service.ts
+++ b/frontend/sync-client/src/services/sync-service.ts
@@ -70,7 +70,10 @@ export class SyncService {
 				formData.append("document_id", documentId);
 			}
 			formData.append("relative_path", relativePath);
-			formData.append("content", new Blob([contentBytes]));
+			formData.append(
+				"content",
+				new Blob([new Uint8Array(contentBytes)])
+			);
 
 			const response = await this.client(this.getUrl("/documents"), {
 				method: "POST",
@@ -117,7 +120,10 @@ export class SyncService {
 			const formData = new FormData();
 			formData.append("parent_version_id", parentVersionId.toString());
 			formData.append("relative_path", relativePath);
-			formData.append("content", new Blob([contentBytes]));
+			formData.append(
+				"content",
+				new Blob([new Uint8Array(contentBytes)])
+			);
 
 			const response = await this.client(
 				this.getUrl(`/documents/${documentId}`),
diff --git a/frontend/sync-client/src/utils/assert-set-contains-exactly.ts b/frontend/sync-client/src/utils/assert-set-contains-exactly.ts
index 0532a3d3..502dca03 100644
--- a/frontend/sync-client/src/utils/assert-set-contains-exactly.ts
+++ b/frontend/sync-client/src/utils/assert-set-contains-exactly.ts
@@ -1,7 +1,7 @@
-import * as assert from "assert";
+import assert from "node:assert";
 
 export function assertSetContainsExactly<T>(set: Set<T>, ...values: T[]): void {
-	assert(
+	assert.ok(
 		set.size === values.length &&
 			Array.from(set).every((value) => values.includes(value)),
 		`Expected set to contain only ${values.map((v) => '"' + v + '"').join(", ")}, but it contained ${Array.from(
diff --git a/frontend/sync-client/src/utils/globs-to-regexes.test.ts b/frontend/sync-client/src/utils/globs-to-regexes.test.ts
index 71639a38..3e986ca4 100644
--- a/frontend/sync-client/src/utils/globs-to-regexes.test.ts
+++ b/frontend/sync-client/src/utils/globs-to-regexes.test.ts
@@ -1,3 +1,5 @@
+import { describe, it } from "node:test";
+import assert from "node:assert";
 import { Logger } from "../tracing/logger";
 import { globsToRegexes } from "./globs-to-regexes";
 
@@ -5,7 +7,7 @@ describe("globsToRegexes", () => {
 	it("basicExample", async () => {
 		const [regex] = globsToRegexes([".git/**"], new Logger());
 
-		expect(regex.test(".git/objects/object")).toBeTruthy();
-		expect(regex.test(".git/objects/.object")).toBeTruthy();
+		assert.ok(regex.test(".git/objects/object"));
+		assert.ok(regex.test(".git/objects/.object"));
 	});
 });
diff --git a/frontend/sync-client/src/utils/is-equal-bytes.test.ts b/frontend/sync-client/src/utils/is-equal-bytes.test.ts
index e2394bfd..a887309f 100644
--- a/frontend/sync-client/src/utils/is-equal-bytes.test.ts
+++ b/frontend/sync-client/src/utils/is-equal-bytes.test.ts
@@ -1,27 +1,29 @@
+import { describe, it } from "node:test";
+import assert from "node:assert";
 import { isEqualBytes } from "./is-equal-bytes";
 
 describe("isEqualBytes", () => {
 	it("should return true for equal byte arrays", () => {
 		const bytes1 = new Uint8Array([1, 2, 3, 4]);
 		const bytes2 = new Uint8Array([1, 2, 3, 4]);
-		expect(isEqualBytes(bytes1, bytes2)).toBe(true);
+		assert.strictEqual(isEqualBytes(bytes1, bytes2), true);
 	});
 
 	it("should return false for byte arrays of different lengths", () => {
 		const bytes1 = new Uint8Array([1, 2, 3, 4]);
 		const bytes2 = new Uint8Array([1, 2, 3]);
-		expect(isEqualBytes(bytes1, bytes2)).toBe(false);
+		assert.strictEqual(isEqualBytes(bytes1, bytes2), false);
 	});
 
 	it("should return true for empty byte arrays", () => {
 		const bytes1 = new Uint8Array([]);
 		const bytes2 = new Uint8Array([]);
-		expect(isEqualBytes(bytes1, bytes2)).toBe(true);
+		assert.strictEqual(isEqualBytes(bytes1, bytes2), true);
 	});
 
 	it("should return false for byte arrays with same length but different content", () => {
 		const bytes1 = new Uint8Array([1, 2, 3, 4]);
 		const bytes2 = new Uint8Array([4, 3, 2, 1]);
-		expect(isEqualBytes(bytes1, bytes2)).toBe(false);
+		assert.strictEqual(isEqualBytes(bytes1, bytes2), false);
 	});
 });
diff --git a/frontend/sync-client/src/utils/is-file-type-mergable.test.ts b/frontend/sync-client/src/utils/is-file-type-mergable.test.ts
index 1b3c6557..3f3fffbb 100644
--- a/frontend/sync-client/src/utils/is-file-type-mergable.test.ts
+++ b/frontend/sync-client/src/utils/is-file-type-mergable.test.ts
@@ -1,28 +1,42 @@
+import { describe, it } from "node:test";
+import assert from "node:assert";
 import { isFileTypeMergable } from "./is-file-type-mergable";
 
 describe("isFileTypeMergable", () => {
 	it("should return true for .md files", () => {
-		expect(isFileTypeMergable(".md")).toBe(true);
-		expect(isFileTypeMergable("hi.md")).toBe(true);
-		expect(isFileTypeMergable("my/path/to/my/document.md")).toBe(true);
+		assert.strictEqual(isFileTypeMergable(".md"), true);
+		assert.strictEqual(isFileTypeMergable("hi.md"), true);
+		assert.strictEqual(
+			isFileTypeMergable("my/path/to/my/document.md"),
+			true
+		);
 	});
 
 	it("should return true for .txt files", () => {
-		expect(isFileTypeMergable(".txt")).toBe(true);
-		expect(isFileTypeMergable("hi.txt")).toBe(true);
-		expect(isFileTypeMergable("my/path/to/my/document.txt")).toBe(true);
+		assert.strictEqual(isFileTypeMergable(".txt"), true);
+		assert.strictEqual(isFileTypeMergable("hi.txt"), true);
+		assert.strictEqual(
+			isFileTypeMergable("my/path/to/my/document.txt"),
+			true
+		);
 	});
 
 	it("should be case insensitive", () => {
-		expect(isFileTypeMergable("hi.MD")).toBe(true);
-		expect(isFileTypeMergable("my/path/to/my/DOCUMENT.MD")).toBe(true);
-		expect(isFileTypeMergable("hi.TXT")).toBe(true);
-		expect(isFileTypeMergable("my/path/to/my/DOCUMENT.TXT")).toBe(true);
+		assert.strictEqual(isFileTypeMergable("hi.MD"), true);
+		assert.strictEqual(
+			isFileTypeMergable("my/path/to/my/DOCUMENT.MD"),
+			true
+		);
+		assert.strictEqual(isFileTypeMergable("hi.TXT"), true);
+		assert.strictEqual(
+			isFileTypeMergable("my/path/to/my/DOCUMENT.TXT"),
+			true
+		);
 	});
 
 	it("should return false for non-mergable file types", () => {
-		expect(isFileTypeMergable(".json")).toBe(false);
-		expect(isFileTypeMergable("HELLO.JSON")).toBe(false);
-		expect(isFileTypeMergable("my/config.yml")).toBe(false);
+		assert.strictEqual(isFileTypeMergable(".json"), false);
+		assert.strictEqual(isFileTypeMergable("HELLO.JSON"), false);
+		assert.strictEqual(isFileTypeMergable("my/config.yml"), false);
 	});
 });
diff --git a/frontend/sync-client/src/utils/locks.test.ts b/frontend/sync-client/src/utils/locks.test.ts
index 1e6bd38b..5626becc 100644
--- a/frontend/sync-client/src/utils/locks.test.ts
+++ b/frontend/sync-client/src/utils/locks.test.ts
@@ -1,3 +1,5 @@
+import { describe, it, beforeEach } from "node:test";
+import assert from "node:assert";
 import { Logger } from "../tracing/logger";
 import type { RelativePath } from "../persistence/database";
 import { Locks } from "./locks";
@@ -14,18 +16,18 @@ describe("withLock", () => {
 		locks = new Locks<RelativePath>(logger);
 	});
 
-	test("should execute function with single key lock", async () => {
+	it("should execute function with single key lock", async () => {
 		let executionCount = 0;
 		const result = await locks.withLock(testPath, () => {
 			executionCount++;
 			return "success";
 		});
 
-		expect(result).toBe("success");
-		expect(executionCount).toBe(1);
+		assert.strictEqual(result, "success");
+		assert.strictEqual(executionCount, 1);
 	});
 
-	test("should execute async function with single key lock", async () => {
+	it("should execute async function with single key lock", async () => {
 		let executionCount = 0;
 		const result = await locks.withLock(testPath, async () => {
 			executionCount++;
@@ -33,22 +35,22 @@ describe("withLock", () => {
 			return "async-success";
 		});
 
-		expect(result).toBe("async-success");
-		expect(executionCount).toBe(1);
+		assert.strictEqual(result, "async-success");
+		assert.strictEqual(executionCount, 1);
 	});
 
-	test("should execute function with multiple key locks", async () => {
+	it("should execute function with multiple key locks", async () => {
 		let executionCount = 0;
 		const result = await locks.withLock([testPath, testPath2], () => {
 			executionCount++;
 			return "multi-success";
 		});
 
-		expect(result).toBe("multi-success");
-		expect(executionCount).toBe(1);
+		assert.strictEqual(result, "multi-success");
+		assert.strictEqual(executionCount, 1);
 	});
 
-	test("should sort multiple keys to prevent deadlocks", async () => {
+	it("should sort multiple keys to prevent deadlocks", async () => {
 		const executionOrder: string[] = [];
 
 		// Start two concurrent operations with keys in different orders
@@ -68,10 +70,10 @@ describe("withLock", () => {
 
 		const [result1, result2] = await Promise.all([promise1, promise2]);
 
-		expect(result1).toBe("result1");
-		expect(result2).toBe("result2");
+		assert.strictEqual(result1, "result1");
+		assert.strictEqual(result2, "result2");
 		// One operation should complete entirely before the other starts
-		expect(executionOrder).toEqual([
+		assert.deepStrictEqual(executionOrder, [
 			"operation1-start",
 			"operation1-end",
 			"operation2-start",
@@ -79,7 +81,7 @@ describe("withLock", () => {
 		]);
 	});
 
-	test("should serialize access to same key", async () => {
+	it("should serialize access to same key", async () => {
 		const executionOrder: string[] = [];
 
 		const promise1 = locks.withLock(testPath, async () => {
@@ -98,9 +100,9 @@ describe("withLock", () => {
 
 		const [result1, result2] = await Promise.all([promise1, promise2]);
 
-		expect(result1).toBe("result1");
-		expect(result2).toBe("result2");
-		expect(executionOrder).toEqual([
+		assert.strictEqual(result1, "result1");
+		assert.strictEqual(result2, "result2");
+		assert.deepStrictEqual(executionOrder, [
 			"operation1-start",
 			"operation1-end",
 			"operation2-start",
@@ -108,7 +110,7 @@ describe("withLock", () => {
 		]);
 	});
 
-	test("should allow concurrent access to different keys", async () => {
+	it("should allow concurrent access to different keys", async () => {
 		const executionOrder: string[] = [];
 
 		const promise1 = locks.withLock(testPath, async () => {
@@ -127,54 +129,56 @@ describe("withLock", () => {
 
 		const [result1, result2] = await Promise.all([promise1, promise2]);
 
-		expect(result1).toBe("result1");
-		expect(result2).toBe("result2");
+		assert.strictEqual(result1, "result1");
+		assert.strictEqual(result2, "result2");
 		// Both operations should run concurrently
-		expect(executionOrder[0]).toBe("operation1-start");
-		expect(executionOrder[1]).toBe("operation2-start");
+		assert.strictEqual(executionOrder[0], "operation1-start");
+		assert.strictEqual(executionOrder[1], "operation2-start");
 	});
 
-	test("should release locks even if function throws", async () => {
+	it("should release locks even if function throws", async () => {
 		const error = new Error("test error");
 
-		await expect(
+		await assert.rejects(
 			locks.withLock(testPath, () => {
 				throw error;
-			})
-		).rejects.toThrow("test error");
+			}),
+			{ message: "test error" }
+		);
 
 		// Lock should be released, allowing another operation
 		const result = await locks.withLock(
 			testPath,
 			() => "success-after-error"
 		);
-		expect(result).toBe("success-after-error");
+		assert.strictEqual(result, "success-after-error");
 	});
 
-	test("should release locks even if async function throws", async () => {
+	it("should release locks even if async function throws", async () => {
 		const error = new Error("async test error");
 
-		await expect(
+		await assert.rejects(
 			locks.withLock(testPath, async () => {
 				await new Promise((resolve) => setTimeout(resolve, 10));
 				throw error;
-			})
-		).rejects.toThrow("async test error");
+			}),
+			{ message: "async test error" }
+		);
 
 		// Lock should be released, allowing another operation
 		const result = await locks.withLock(
 			testPath,
 			() => "success-after-async-error"
 		);
-		expect(result).toBe("success-after-async-error");
+		assert.strictEqual(result, "success-after-async-error");
 	});
 
-	test("should handle empty array of keys", async () => {
+	it("should handle empty array of keys", async () => {
 		const result = await locks.withLock([], () => "empty-keys");
-		expect(result).toBe("empty-keys");
+		assert.strictEqual(result, "empty-keys");
 	});
 
-	test("should maintain FIFO order for multiple waiters", async () => {
+	it("should maintain FIFO order for multiple waiters", async () => {
 		const executionOrder: string[] = [];
 
 		// Start first operation that holds the lock
@@ -209,10 +213,10 @@ describe("withLock", () => {
 			thirdPromise
 		]);
 
-		expect(first).toBe("first");
-		expect(second).toBe("second");
-		expect(third).toBe("third");
-		expect(executionOrder).toEqual([
+		assert.strictEqual(first, "first");
+		assert.strictEqual(second, "second");
+		assert.strictEqual(third, "third");
+		assert.deepStrictEqual(executionOrder, [
 			"first-start",
 			"first-end",
 			"second-start",
diff --git a/frontend/sync-client/src/utils/min-covered.test.ts b/frontend/sync-client/src/utils/min-covered.test.ts
index 429f7a63..82f792c3 100644
--- a/frontend/sync-client/src/utils/min-covered.test.ts
+++ b/frontend/sync-client/src/utils/min-covered.test.ts
@@ -1,60 +1,62 @@
+import { describe, it } from "node:test";
+import assert from "node:assert";
 import { CoveredValues } from "./min-covered";
 
 describe("CoveredValues", () => {
-	test("should initialize with the given min value", () => {
+	it("should initialize with the given min value", () => {
 		const covered = new CoveredValues(5);
-		expect(covered.min).toBe(5);
+		assert.strictEqual(covered.min, 5);
 	});
 
-	test("should add values greater than min", () => {
+	it("should add values greater than min", () => {
 		const covered = new CoveredValues(0);
 		covered.add(3);
-		expect(covered.min).toBe(0);
+		assert.strictEqual(covered.min, 0);
 		covered.add(1);
-		expect(covered.min).toBe(1);
+		assert.strictEqual(covered.min, 1);
 		covered.add(4);
-		expect(covered.min).toBe(1);
+		assert.strictEqual(covered.min, 1);
 		covered.add(2);
-		expect(covered.min).toBe(4);
+		assert.strictEqual(covered.min, 4);
 	});
 
-	test("should ignore duplicate values", () => {
+	it("should ignore duplicate values", () => {
 		const covered = new CoveredValues(0);
 		covered.add(3);
 		covered.add(3);
 		covered.add(3);
-		expect(covered.min).toBe(0);
+		assert.strictEqual(covered.min, 0);
 		covered.add(1);
 		covered.add(2);
-		expect(covered.min).toBe(3);
+		assert.strictEqual(covered.min, 3);
 	});
 
-	test("should handle multiple consecutive values", () => {
+	it("should handle multiple consecutive values", () => {
 		const covered = new CoveredValues(132);
 		for (let i = 250; i > 132; i--) {
-			expect(covered.min).toBe(132);
+			assert.strictEqual(covered.min, 132);
 			covered.add(i);
 		}
-		expect(covered.min).toBe(250);
+		assert.strictEqual(covered.min, 250);
 	});
 
-	test("should handle adding values lower than current min", () => {
+	it("should handle adding values lower than current min", () => {
 		const covered = new CoveredValues(5);
 		covered.add(3);
-		expect(covered.min).toBe(5);
+		assert.strictEqual(covered.min, 5);
 		covered.add(6);
-		expect(covered.min).toBe(6);
+		assert.strictEqual(covered.min, 6);
 	});
 
-	test("should handle force setting min value", () => {
+	it("should handle force setting min value", () => {
 		const covered = new CoveredValues(5);
 		covered.add(7);
 		covered.add(8);
 		covered.add(9);
-		expect(covered.min).toBe(5);
+		assert.strictEqual(covered.min, 5);
 		covered.min = 6;
-		expect(covered.min).toBe(6);
+		assert.strictEqual(covered.min, 6);
 		covered.add(10);
-		expect(covered.min).toBe(10);
+		assert.strictEqual(covered.min, 10);
 	});
 });
diff --git a/frontend/sync-client/src/utils/rate-limit.test.ts b/frontend/sync-client/src/utils/rate-limit.test.ts
index 577783f7..e0b77dc4 100644
--- a/frontend/sync-client/src/utils/rate-limit.test.ts
+++ b/frontend/sync-client/src/utils/rate-limit.test.ts
@@ -1,66 +1,64 @@
 import { rateLimit } from "./rate-limit";
-import { jest } from "@jest/globals";
+import { describe, it, beforeEach, afterEach, mock } from "node:test";
+import assert from "node:assert";
 
 describe("rateLimit", () => {
 	beforeEach(() => {
-		jest.useFakeTimers();
+		mock.timers.enable({ apis: ["setTimeout"] });
 	});
 
 	afterEach(() => {
-		jest.useRealTimers();
+		mock.timers.reset();
 	});
 
 	it("should call the function immediately on first invocation", async () => {
-		const mockFn = jest
-			.fn<() => Promise<string>>()
-			.mockResolvedValue("result");
+		const mockFn = mock.fn<() => Promise<string>>();
+		mockFn.mock.mockImplementation(async () => "result");
 		const rateLimited = rateLimit(mockFn, 100);
 
 		const promise = rateLimited();
-		expect(mockFn).toHaveBeenCalledTimes(1);
+		assert.strictEqual(mockFn.mock.callCount(), 1);
 
 		await promise;
 	});
 
 	it("should call the function again after the interval has passed", async () => {
-		const mockFn = jest
-			.fn<(value: number) => Promise<string>>()
-			.mockResolvedValue("result");
+		const mockFn = mock.fn<(value: number) => Promise<string>>();
+		mockFn.mock.mockImplementation(async () => "result");
 
 		const rateLimited = rateLimit(mockFn, 100);
 
 		const promise1 = rateLimited(1);
 		await promise1;
 
-		jest.advanceTimersByTime(200);
+		mock.timers.tick(200);
 
 		const promise2 = rateLimited(2);
 		await promise2;
 
-		expect(mockFn).toHaveBeenCalledTimes(2);
-		expect(mockFn).toHaveBeenCalledWith(2);
+		assert.strictEqual(mockFn.mock.callCount(), 2);
+		assert.deepStrictEqual(mockFn.mock.calls[1].arguments, [2]);
 	});
 
 	it("should use the most recent arguments if multiple calls are made within interval", async () => {
-		const mockFn = jest
-			.fn<(value: string) => Promise<string>>()
-			.mockImplementation(async (val) => `${val}-result`);
+		const mockFn = mock.fn<(value: string) => Promise<string>>();
+		mockFn.mock.mockImplementation(async (val: string) => `${val}-result`);
 		const rateLimited = rateLimit(mockFn, 100);
 
 		const promise1 = rateLimited("first");
-		jest.advanceTimersByTime(10);
+		mock.timers.tick(10);
 		const promise2 = rateLimited("second");
-		jest.advanceTimersByTime(10);
+		mock.timers.tick(10);
 		const promise3 = rateLimited("third");
 
-		jest.advanceTimersByTime(1000);
+		mock.timers.tick(1000);
 
-		expect(await promise1).toEqual("first-result");
-		expect(await promise2).toEqual("third-result");
-		expect(await promise3).toBeUndefined();
+		assert.strictEqual(await promise1, "first-result");
+		assert.strictEqual(await promise2, "third-result");
+		assert.strictEqual(await promise3, undefined);
 
-		expect(mockFn).toHaveBeenCalledTimes(2);
-		expect(mockFn).toHaveBeenNthCalledWith(1, "first");
-		expect(mockFn).toHaveBeenNthCalledWith(2, "third");
+		assert.strictEqual(mockFn.mock.callCount(), 2);
+		assert.deepStrictEqual(mockFn.mock.calls[0].arguments, ["first"]);
+		assert.deepStrictEqual(mockFn.mock.calls[1].arguments, ["third"]);
 	});
 });
diff --git a/frontend/sync-client/tsconfig.json b/frontend/sync-client/tsconfig.json
index 024e7b99..c49baa45 100644
--- a/frontend/sync-client/tsconfig.json
+++ b/frontend/sync-client/tsconfig.json
@@ -6,7 +6,8 @@
 		"allowSyntheticDefaultImports": true,
 		"moduleResolution": "bundler",
 		"lib": [
-			"DOM" // to get `fetch` & `WebSocket`
+			"DOM", // to get `fetch` & `WebSocket`
+			"ES2024"
 		],
 		"declaration": true,
 		"declarationDir": "./dist/types"
diff --git a/frontend/test-client/jest.config.js b/frontend/test-client/jest.config.js
deleted file mode 100644
index d1cbaca2..00000000
--- a/frontend/test-client/jest.config.js
+++ /dev/null
@@ -1,3 +0,0 @@
-module.exports = {
-	preset: "ts-jest"
-};
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index 8d40d50e..ba40bd48 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -8,17 +8,18 @@
     "scripts": {
         "dev": "webpack watch --mode development",
         "build": "webpack --mode production",
-        "test": "jest"
+        "test": "tsx --test src/**/*.test.ts"
     },
     "devDependencies": {
         "@types/node": "^22.15.30",
+        "bufferutil": "^4.0.9",
         "sync-client": "file:../sync-client",
         "ts-loader": "^9.5.2",
         "tslib": "2.8.1",
+        "tsx": "^4.20.5",
         "typescript": "5.8.3",
         "uuid": "^11.1.0",
         "webpack": "^5.99.9",
-        "webpack-cli": "^6.0.1",
-        "bufferutil": "^4.0.9"
+        "webpack-cli": "^6.0.1"
     }
 }
diff --git a/frontend/test-client/src/utils/random-casing.test.ts b/frontend/test-client/src/utils/random-casing.test.ts
index c6f1aafa..67033305 100644
--- a/frontend/test-client/src/utils/random-casing.test.ts
+++ b/frontend/test-client/src/utils/random-casing.test.ts
@@ -1,3 +1,5 @@
+import { describe, it } from "node:test";
+import assert from "node:assert";
 import { randomCasing } from "./random-casing";
 
 describe("randomCasing", () => {
@@ -5,7 +7,7 @@ describe("randomCasing", () => {
 		const input =
 			"hello, this is a really long string with a lot of characters";
 		const result = randomCasing(input);
-		expect(result.toLowerCase()).toBe(input.toLowerCase());
-		expect(result).not.toBe(input);
+		assert.strictEqual(result.toLowerCase(), input.toLowerCase());
+		assert.notStrictEqual(result, input);
 	});
 });
diff --git a/frontend/test-client/tsconfig.json b/frontend/test-client/tsconfig.json
index 4995a2bc..7b38e409 100644
--- a/frontend/test-client/tsconfig.json
+++ b/frontend/test-client/tsconfig.json
@@ -7,7 +7,7 @@
 		"esModuleInterop": true,
 		"lib": [
 			"DOM",
-			"ESNext"
+			"ES2024",
 		],
 		"moduleResolution": "node"
 	},
diff --git a/scripts/check.sh b/scripts/check.sh
index f807d2c8..03bb35fe 100755
--- a/scripts/check.sh
+++ b/scripts/check.sh
@@ -4,17 +4,17 @@ set -e
 
 echo "Running checks in sync-server"
 cd sync-server
+cargo test --verbose
 cargo clippy --all-targets --all-features
 cargo fmt --all -- --check
 cargo machete
-cargo test --verbose
 
 echo "Running checks in frontend"
 cd ../frontend
 npm ci
 npm run build
-npm run lint
 npm run test
+npm run lint
 
 if [[ $(git status --porcelain) ]]; then
     git status --porcelain

From 3f089bd37e2df92dd8964597c742dfdf21d2069a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 30 Aug 2025 10:38:25 +0100
Subject: [PATCH 567/761] Bump prettier from 3.5.3 to 3.6.2 in /frontend (#108)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Andras Schmelczer <andras@schmelczer.dev>
---
 frontend/package-lock.json                       | 6 ++++--
 frontend/package.json                            | 2 +-
 frontend/sync-client/src/utils/create-promise.ts | 6 ++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 1ec1fb76..7876659b 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -15,7 +15,7 @@
 				"eslint": "9.28.0",
 				"eslint-plugin-unused-imports": "^4.1.4",
 				"npm-check-updates": "^18.0.1",
-				"prettier": "^3.5.3",
+				"prettier": "^3.6.2",
 				"typescript-eslint": "8.41.0"
 			}
 		},
@@ -3250,7 +3250,9 @@
 			}
 		},
 		"node_modules/prettier": {
-			"version": "3.5.3",
+			"version": "3.6.2",
+			"resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz",
+			"integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==",
 			"dev": true,
 			"license": "MIT",
 			"bin": {
diff --git a/frontend/package.json b/frontend/package.json
index d126b0e3..718efea1 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -24,7 +24,7 @@
 		"eslint": "9.28.0",
 		"eslint-plugin-unused-imports": "^4.1.4",
 		"npm-check-updates": "^18.0.1",
-		"prettier": "^3.5.3",
+		"prettier": "^3.6.2",
 		"typescript-eslint": "8.41.0"
 	}
 }
\ No newline at end of file
diff --git a/frontend/sync-client/src/utils/create-promise.ts b/frontend/sync-client/src/utils/create-promise.ts
index 3099f0da..542a4013 100644
--- a/frontend/sync-client/src/utils/create-promise.ts
+++ b/frontend/sync-client/src/utils/create-promise.ts
@@ -16,10 +16,8 @@ export function createPromise<T = unknown>(): [
 
 	const creationPromise = new Promise<T>(
 		(resolve_, reject_) =>
-			(
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-				(resolve = resolve_ as ResolveFunction<T>), (reject = reject_)
-			)
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+			((resolve = resolve_ as ResolveFunction<T>), (reject = reject_))
 	);
 
 	// eslint-disable-next-line @typescript-eslint/no-non-null-assertion

From 9177984ff6d890a34a13e4ccce89dda8ba1ff9bf Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 30 Aug 2025 11:02:04 +0100
Subject: [PATCH 568/761] Move more logic into sync-client

---
 frontend/obsidian-plugin/package.json         |  4 +-
 .../src/obsidian-file-system.ts               | 11 ++-
 frontend/obsidian-plugin/src/utils/sleep.ts   |  3 -
 .../obsidian-plugin/src/vault-link-plugin.ts  | 19 +++--
 .../src/views/cursors/file-explorer.scss      |  2 +-
 .../src/views/cursors/file-explorer.ts        |  9 +-
 .../cursors/get-selections-from-editor.ts     |  6 +-
 .../views/cursors/remote-cursors-plugin.ts    |  9 +-
 .../src/debugging}/log-to-console.ts          |  5 +-
 .../src/debugging/slow-fetch-factory.ts       |  2 +
 .../src/debugging/slow-web-socket-factory.ts} |  9 +-
 frontend/sync-client/src/index.ts             | 20 ++++-
 .../src/utils/get-random-color.ts             |  2 +-
 .../utils/line-and-column-to-position.test.ts |  0
 .../src/utils/line-and-column-to-position.ts  |  0
 .../utils/position-to-line-and-column.test.ts |  0
 .../src/utils/position-to-line-and-column.ts  |  0
 frontend/test-client/src/agent/mock-agent.ts  |  8 +-
 frontend/test-client/src/utils/flaky-fetch.ts | 20 -----
 .../src/utils/flaky-websocket-factory.ts      | 82 -------------------
 20 files changed, 68 insertions(+), 143 deletions(-)
 delete mode 100644 frontend/obsidian-plugin/src/utils/sleep.ts
 rename frontend/{obsidian-plugin/src/utils => sync-client/src/debugging}/log-to-console.ts (77%)
 rename frontend/{obsidian-plugin => sync-client}/src/debugging/slow-fetch-factory.ts (89%)
 rename frontend/{obsidian-plugin/src/debugging/flaky-websocket-factory.ts => sync-client/src/debugging/slow-web-socket-factory.ts} (90%)
 rename frontend/{obsidian-plugin => sync-client}/src/utils/get-random-color.ts (77%)
 rename frontend/{obsidian-plugin => sync-client}/src/utils/line-and-column-to-position.test.ts (100%)
 rename frontend/{obsidian-plugin => sync-client}/src/utils/line-and-column-to-position.ts (100%)
 rename frontend/{obsidian-plugin => sync-client}/src/utils/position-to-line-and-column.test.ts (100%)
 rename frontend/{obsidian-plugin => sync-client}/src/utils/position-to-line-and-column.ts (100%)
 delete mode 100644 frontend/test-client/src/utils/flaky-fetch.ts
 delete mode 100644 frontend/test-client/src/utils/flaky-websocket-factory.ts

diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index 7ebeaceb..14b286c9 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -6,7 +6,7 @@
     "scripts": {
         "dev": "webpack watch --mode development",
         "build": "webpack --mode production",
-        "test": "tsx --test src/**/*.test.ts",
+        "test": "echo \"no tests defined\" && exit 0",
         "version": "node version-bump.mjs"
     },
     "keywords": [],
@@ -35,4 +35,4 @@
         "webpack": "^5.99.9",
         "webpack-cli": "^6.0.1"
     }
-}
+}
\ No newline at end of file
diff --git a/frontend/obsidian-plugin/src/obsidian-file-system.ts b/frontend/obsidian-plugin/src/obsidian-file-system.ts
index 9609e8b0..00a9acfb 100644
--- a/frontend/obsidian-plugin/src/obsidian-file-system.ts
+++ b/frontend/obsidian-plugin/src/obsidian-file-system.ts
@@ -1,7 +1,10 @@
 import type { Stat, Vault, Workspace } from "obsidian";
 import { MarkdownView, normalizePath } from "obsidian";
-import type { FileSystemOperations, RelativePath } from "sync-client";
-import { positionToLineAndColumn } from "./utils/position-to-line-and-column";
+import {
+	utils,
+	type FileSystemOperations,
+	type RelativePath
+} from "sync-client";
 import { getSelectionsFromEditor } from "./views/cursors/get-selections-from-editor";
 import type { TextWithCursors, CursorPosition } from "reconcile-text";
 
@@ -105,10 +108,10 @@ export class ObsidianFileSystemOperations implements FileSystemOperations {
 				const from = result.cursors[2 * i];
 				const to = result.cursors[2 * i + 1];
 				const { line: fromLine, column: fromColumn } =
-					positionToLineAndColumn(result.text, from.position);
+					utils.positionToLineAndColumn(result.text, from.position);
 
 				const { line: toLine, column: toColumn } =
-					positionToLineAndColumn(result.text, to.position);
+					utils.positionToLineAndColumn(result.text, to.position);
 
 				selections.push({
 					anchor: { line: fromLine, ch: fromColumn },
diff --git a/frontend/obsidian-plugin/src/utils/sleep.ts b/frontend/obsidian-plugin/src/utils/sleep.ts
deleted file mode 100644
index 638fc019..00000000
--- a/frontend/obsidian-plugin/src/utils/sleep.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export async function sleep(ms: number): Promise<void> {
-	return new Promise((resolve) => setTimeout(resolve, ms));
-}
diff --git a/frontend/obsidian-plugin/src/vault-link-plugin.ts b/frontend/obsidian-plugin/src/vault-link-plugin.ts
index e8453d46..b791ffb7 100644
--- a/frontend/obsidian-plugin/src/vault-link-plugin.ts
+++ b/frontend/obsidian-plugin/src/vault-link-plugin.ts
@@ -11,10 +11,15 @@ import { HistoryView } from "./views/history/history-view";
 import { StatusBar } from "./views/status-bar/status-bar";
 import { LogsView } from "./views/logs/logs-view";
 import { StatusDescription } from "./views/status-description/status-description";
-import { SyncClient, rateLimit, DEFAULT_SETTINGS, Logger } from "sync-client";
+import {
+	SyncClient,
+	rateLimit,
+	DEFAULT_SETTINGS,
+	Logger,
+	debugging
+} from "sync-client";
 import { ObsidianFileSystemOperations } from "./obsidian-file-system";
 import { SyncSettingsTab } from "./views/settings/settings-tab";
-import { logToConsole } from "./utils/log-to-console";
 import { EditorStatusDisplayManager } from "./views/editor-status-display-manager/editor-status-display-manager";
 import { remoteCursorsTheme } from "./views/cursors/remote-cursor-theme";
 import {
@@ -22,8 +27,6 @@ import {
 	RemoteCursorsPluginValue
 } from "./views/cursors/remote-cursors-plugin";
 import { LocalCursorUpdateListener } from "./views/cursors/local-cursor-update-listener";
-import { slowFetchFactory } from "./debugging/slow-fetch-factory";
-import { flakyWebSocketFactory } from "./debugging/flaky-websocket-factory";
 import { renderCursorsInFileExplorer } from "./views/cursors/file-explorer";
 
 const MIN_WAIT_BETWEEN_UPDATES_IN_MS = 250;
@@ -49,8 +52,8 @@ export default class VaultLinkPlugin extends Plugin {
 
 		const debugOptions = isDebugBuild
 			? {
-					fetch: slowFetchFactory(1),
-					webSocket: flakyWebSocketFactory(1, new Logger())
+					fetch: debugging.slowFetchFactory(1),
+					webSocket: debugging.slowWebSocketFactory(1, new Logger())
 				}
 			: {};
 
@@ -67,7 +70,9 @@ export default class VaultLinkPlugin extends Plugin {
 			...debugOptions
 		});
 
-		logToConsole(this.client);
+		if (isDebugBuild) {
+			debugging.logToConsole(this.client);
+		}
 
 		const statusDescription = new StatusDescription(this.client);
 
diff --git a/frontend/obsidian-plugin/src/views/cursors/file-explorer.scss b/frontend/obsidian-plugin/src/views/cursors/file-explorer.scss
index 45759019..90918b55 100644
--- a/frontend/obsidian-plugin/src/views/cursors/file-explorer.scss
+++ b/frontend/obsidian-plugin/src/views/cursors/file-explorer.scss
@@ -7,7 +7,7 @@
     span {
         border-radius: var(--radius-l);
         padding: 0 var(--size-4-1);
-        border-width: 1px;
+        border-width: 1.4px;
         border-style: solid;
         font-size: var(--font-smallest);
         font-style: italic;
diff --git a/frontend/obsidian-plugin/src/views/cursors/file-explorer.ts b/frontend/obsidian-plugin/src/views/cursors/file-explorer.ts
index cfeb11f5..be71c058 100644
--- a/frontend/obsidian-plugin/src/views/cursors/file-explorer.ts
+++ b/frontend/obsidian-plugin/src/views/cursors/file-explorer.ts
@@ -1,8 +1,11 @@
 import "./file-explorer.scss";
 
 import type { App, View } from "obsidian";
-import { getRandomColor } from "src/utils/get-random-color";
-import type { MaybeOutdatedClientCursors, RelativePath } from "sync-client";
+import {
+	utils,
+	type MaybeOutdatedClientCursors,
+	type RelativePath
+} from "sync-client";
 
 const REMOTE_USER_CONTAINER_CLASS = "remote-users";
 
@@ -36,7 +39,7 @@ export function renderCursorsInFileExplorer(
 								createSpan({
 									text: cursor.userName,
 									attr: {
-										style: `border-color: ${getRandomColor(cursor.userName)}`
+										style: `border-color: ${utils.getRandomColor(cursor.userName)}`
 									}
 								})
 							);
diff --git a/frontend/obsidian-plugin/src/views/cursors/get-selections-from-editor.ts b/frontend/obsidian-plugin/src/views/cursors/get-selections-from-editor.ts
index 03cce4a8..1635b930 100644
--- a/frontend/obsidian-plugin/src/views/cursors/get-selections-from-editor.ts
+++ b/frontend/obsidian-plugin/src/views/cursors/get-selections-from-editor.ts
@@ -1,5 +1,5 @@
 import type { Editor } from "obsidian";
-import { lineAndColumnToPosition } from "../../utils/line-and-column-to-position";
+import { utils } from "sync-client";
 
 export interface Selection {
 	id: number;
@@ -11,7 +11,7 @@ export function getSelectionsFromEditor(editor: Editor): Selection[] {
 	const text = editor.getValue();
 	return editor.listSelections().map(({ anchor, head }, i) => ({
 		id: i,
-		start: lineAndColumnToPosition(text, anchor.line, anchor.ch),
-		end: lineAndColumnToPosition(text, head.line, head.ch)
+		start: utils.lineAndColumnToPosition(text, anchor.line, anchor.ch),
+		end: utils.lineAndColumnToPosition(text, head.line, head.ch)
 	}));
 }
diff --git a/frontend/obsidian-plugin/src/views/cursors/remote-cursors-plugin.ts b/frontend/obsidian-plugin/src/views/cursors/remote-cursors-plugin.ts
index 8801ecda..a0de390c 100644
--- a/frontend/obsidian-plugin/src/views/cursors/remote-cursors-plugin.ts
+++ b/frontend/obsidian-plugin/src/views/cursors/remote-cursors-plugin.ts
@@ -9,12 +9,15 @@ import type {
 	ViewUpdate
 } from "@codemirror/view";
 import { RemoteCursorWidget } from "./remote-cursor-widget";
-import type { CursorSpan, MaybeOutdatedClientCursors } from "sync-client";
+import {
+	utils,
+	type CursorSpan,
+	type MaybeOutdatedClientCursors
+} from "sync-client";
 import type { App } from "obsidian";
 import { MarkdownView } from "obsidian";
 
 import { StateEffect } from "@codemirror/state";
-import { getRandomColor } from "src/utils/get-random-color";
 import type { SpanWithHistory } from "reconcile-text";
 import { reconcileWithHistory } from "reconcile-text";
 
@@ -155,7 +158,7 @@ export class RemoteCursorsPluginValue implements PluginValue {
 
 		RemoteCursorsPluginValue.cursors.forEach(
 			({ name, span: { start, end } }) => {
-				const color = getRandomColor(name);
+				const color = utils.getRandomColor(name);
 				const startLine = update.view.state.doc.lineAt(start);
 				const endLine = update.view.state.doc.lineAt(end);
 
diff --git a/frontend/obsidian-plugin/src/utils/log-to-console.ts b/frontend/sync-client/src/debugging/log-to-console.ts
similarity index 77%
rename from frontend/obsidian-plugin/src/utils/log-to-console.ts
rename to frontend/sync-client/src/debugging/log-to-console.ts
index 2579f6a5..ace58db0 100644
--- a/frontend/obsidian-plugin/src/utils/log-to-console.ts
+++ b/frontend/sync-client/src/debugging/log-to-console.ts
@@ -1,5 +1,6 @@
-import type { LogLine, SyncClient } from "sync-client";
-import { LogLevel } from "sync-client";
+import type { SyncClient } from "../sync-client";
+import type { LogLine } from "../tracing/logger";
+import { LogLevel } from "../tracing/logger";
 
 export function logToConsole(client: SyncClient): void {
 	client.logger.addOnMessageListener((logLine: LogLine) => {
diff --git a/frontend/obsidian-plugin/src/debugging/slow-fetch-factory.ts b/frontend/sync-client/src/debugging/slow-fetch-factory.ts
similarity index 89%
rename from frontend/obsidian-plugin/src/debugging/slow-fetch-factory.ts
rename to frontend/sync-client/src/debugging/slow-fetch-factory.ts
index 5fe6c3ef..cd07dd1a 100644
--- a/frontend/obsidian-plugin/src/debugging/slow-fetch-factory.ts
+++ b/frontend/sync-client/src/debugging/slow-fetch-factory.ts
@@ -1,3 +1,5 @@
+import { sleep } from "../utils/sleep";
+
 export const slowFetchFactory =
 	(jitterScaleInSeconds: number) =>
 	async (
diff --git a/frontend/obsidian-plugin/src/debugging/flaky-websocket-factory.ts b/frontend/sync-client/src/debugging/slow-web-socket-factory.ts
similarity index 90%
rename from frontend/obsidian-plugin/src/debugging/flaky-websocket-factory.ts
rename to frontend/sync-client/src/debugging/slow-web-socket-factory.ts
index f59cce19..51a27a5f 100644
--- a/frontend/obsidian-plugin/src/debugging/flaky-websocket-factory.ts
+++ b/frontend/sync-client/src/debugging/slow-web-socket-factory.ts
@@ -1,7 +1,8 @@
-import type { Logger } from "sync-client";
-import { helpers } from "sync-client";
+import { sleep } from "../utils/sleep";
+import { Locks } from "../utils/locks";
+import type { Logger } from "../tracing/logger";
 
-export function flakyWebSocketFactory(
+export function slowWebSocketFactory(
 	jitterScaleInSeconds: number,
 	logger: Logger
 ): typeof WebSocket {
@@ -10,7 +11,7 @@ export function flakyWebSocketFactory(
 		private static readonly RECEIVE_KEY = "websocket-receive";
 		private static readonly SEND_KEY = "websocket-send";
 
-		private readonly locks = new helpers.Locks(logger);
+		private readonly locks = new Locks(logger);
 
 		public set onopen(callback: (event: Event) => void) {
 			super.onopen = async (event: Event): Promise<void> => {
diff --git a/frontend/sync-client/src/index.ts b/frontend/sync-client/src/index.ts
index 00b19940..a73f63dd 100644
--- a/frontend/sync-client/src/index.ts
+++ b/frontend/sync-client/src/index.ts
@@ -1,3 +1,10 @@
+import { logToConsole } from "./debugging/log-to-console";
+import { slowFetchFactory } from "./debugging/slow-fetch-factory";
+import { slowWebSocketFactory } from "./debugging/slow-web-socket-factory";
+import { getRandomColor } from "./utils/get-random-color";
+import { lineAndColumnToPosition } from "./utils/line-and-column-to-position";
+import { positionToLineAndColumn } from "./utils/position-to-line-and-column";
+
 export {
 	SyncType,
 	SyncStatus,
@@ -22,7 +29,14 @@ export type { MaybeOutdatedClientCursors } from "./types/maybe-outdated-client-c
 export { DocumentSyncStatus } from "./types/document-sync-status";
 export { SyncClient } from "./sync-client";
 
-import { Locks } from "./utils/locks";
-export const helpers = {
-	Locks
+export const debugging = {
+	slowFetchFactory,
+	slowWebSocketFactory,
+	logToConsole
+};
+
+export const utils = {
+	getRandomColor,
+	positionToLineAndColumn,
+	lineAndColumnToPosition
 };
diff --git a/frontend/obsidian-plugin/src/utils/get-random-color.ts b/frontend/sync-client/src/utils/get-random-color.ts
similarity index 77%
rename from frontend/obsidian-plugin/src/utils/get-random-color.ts
rename to frontend/sync-client/src/utils/get-random-color.ts
index 5b2d33dc..543b943e 100644
--- a/frontend/obsidian-plugin/src/utils/get-random-color.ts
+++ b/frontend/sync-client/src/utils/get-random-color.ts
@@ -5,5 +5,5 @@ export function getRandomColor(name: string): string {
 		hash |= 0; // Convert to 32bit integer
 	}
 	const normalised = hash / 0x7fffffff;
-	return `hsl(${Math.abs(normalised * 360)}, 55%, 55%)`; // HSL color
+	return `oklch(0.58 0.15 ${Math.round(Math.abs(normalised * 360))})`;
 }
diff --git a/frontend/obsidian-plugin/src/utils/line-and-column-to-position.test.ts b/frontend/sync-client/src/utils/line-and-column-to-position.test.ts
similarity index 100%
rename from frontend/obsidian-plugin/src/utils/line-and-column-to-position.test.ts
rename to frontend/sync-client/src/utils/line-and-column-to-position.test.ts
diff --git a/frontend/obsidian-plugin/src/utils/line-and-column-to-position.ts b/frontend/sync-client/src/utils/line-and-column-to-position.ts
similarity index 100%
rename from frontend/obsidian-plugin/src/utils/line-and-column-to-position.ts
rename to frontend/sync-client/src/utils/line-and-column-to-position.ts
diff --git a/frontend/obsidian-plugin/src/utils/position-to-line-and-column.test.ts b/frontend/sync-client/src/utils/position-to-line-and-column.test.ts
similarity index 100%
rename from frontend/obsidian-plugin/src/utils/position-to-line-and-column.test.ts
rename to frontend/sync-client/src/utils/position-to-line-and-column.test.ts
diff --git a/frontend/obsidian-plugin/src/utils/position-to-line-and-column.ts b/frontend/sync-client/src/utils/position-to-line-and-column.ts
similarity index 100%
rename from frontend/obsidian-plugin/src/utils/position-to-line-and-column.ts
rename to frontend/sync-client/src/utils/position-to-line-and-column.ts
diff --git a/frontend/test-client/src/agent/mock-agent.ts b/frontend/test-client/src/agent/mock-agent.ts
index b4d1a62e..9e7806ab 100644
--- a/frontend/test-client/src/agent/mock-agent.ts
+++ b/frontend/test-client/src/agent/mock-agent.ts
@@ -2,12 +2,10 @@ import { choose } from "../utils/choose";
 import { v4 as uuidv4 } from "uuid";
 import { assert } from "../utils/assert";
 import type { RelativePath, SyncSettings } from "sync-client";
-import { Logger, LogLevel } from "sync-client";
+import { debugging, Logger, LogLevel } from "sync-client";
 import { MockClient } from "./mock-client";
 import { sleep } from "../utils/sleep";
 import type { LogLine } from "sync-client/dist/types/tracing/logger";
-import { flakyFetchFactory } from "../utils/flaky-fetch";
-import { flakyWebSocketFactory } from "../utils/flaky-websocket-factory";
 
 export class MockAgent extends MockClient {
 	private readonly writtenContents: string[] = [];
@@ -28,8 +26,8 @@ export class MockAgent extends MockClient {
 
 	public async init(): Promise<void> {
 		await super.init(
-			flakyFetchFactory(this.jitterScaleInSeconds),
-			flakyWebSocketFactory(
+			debugging.slowFetchFactory(this.jitterScaleInSeconds),
+			debugging.slowWebSocketFactory(
 				this.jitterScaleInSeconds,
 				new Logger() // this logger isn't wired anywhere, so messages to it will be ignored
 			)
diff --git a/frontend/test-client/src/utils/flaky-fetch.ts b/frontend/test-client/src/utils/flaky-fetch.ts
deleted file mode 100644
index 6a2c8817..00000000
--- a/frontend/test-client/src/utils/flaky-fetch.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { sleep } from "./sleep";
-
-export const flakyFetchFactory =
-	(jitterScaleInSeconds: number) =>
-	async (
-		input: string | URL | globalThis.Request,
-		init?: RequestInit
-	): Promise<Response> => {
-		if (jitterScaleInSeconds > 0) {
-			await sleep(Math.random() * jitterScaleInSeconds * 1000);
-		}
-
-		const response = await fetch(input, init);
-
-		if (jitterScaleInSeconds > 0) {
-			await sleep(Math.random() * jitterScaleInSeconds * 1000);
-		}
-
-		return response;
-	};
diff --git a/frontend/test-client/src/utils/flaky-websocket-factory.ts b/frontend/test-client/src/utils/flaky-websocket-factory.ts
deleted file mode 100644
index c2c13525..00000000
--- a/frontend/test-client/src/utils/flaky-websocket-factory.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-import type { Logger } from "sync-client";
-import { helpers } from "sync-client";
-import { sleep } from "./sleep";
-
-export function flakyWebSocketFactory(
-	jitterScaleInSeconds: number,
-	logger: Logger
-): typeof WebSocket {
-	// eslint-disable-next-line
-	return class FlakyWebSocket extends WebSocket {
-		private static readonly RECEIVE_KEY = "websocket-receive";
-		private static readonly SEND_KEY = "websocket-send";
-
-		private readonly locks = new helpers.Locks(logger);
-
-		public set onopen(callback: (event: Event) => void) {
-			super.onopen = async (event: Event): Promise<void> => {
-				if (jitterScaleInSeconds > 0) {
-					await sleep(Math.random() * jitterScaleInSeconds * 1000);
-				}
-
-				callback(event);
-			};
-		}
-
-		public set onmessage(callback: (event: MessageEvent) => void) {
-			super.onmessage = async (event: MessageEvent): Promise<void> => {
-				return this.locks.withLock(
-					FlakyWebSocket.RECEIVE_KEY,
-					async () => {
-						if (jitterScaleInSeconds > 0) {
-							await sleep(
-								Math.random() * jitterScaleInSeconds * 1000
-							);
-						}
-
-						callback(event);
-					}
-				);
-			};
-		}
-
-		public set onclose(callback: (event: CloseEvent) => void) {
-			super.onclose = async (event: CloseEvent): Promise<void> => {
-				if (jitterScaleInSeconds > 0) {
-					await sleep(Math.random() * jitterScaleInSeconds * 1000);
-				}
-				callback(event);
-			};
-		}
-
-		public set onerror(callback: (event: Event) => void) {
-			super.onerror = async (event: Event): Promise<void> => {
-				if (jitterScaleInSeconds > 0) {
-					await sleep(Math.random() * jitterScaleInSeconds * 1000);
-				}
-				callback(event);
-			};
-		}
-
-		public send(
-			data: string | ArrayBufferLike | Blob | ArrayBufferView
-		): void {
-			this.waitingSend(data).catch((error: unknown) => {
-				logger.error(`Error sending WebSocket message: ${error}`);
-			});
-		}
-
-		private async waitingSend(
-			data: string | ArrayBufferLike | Blob | ArrayBufferView
-		): Promise<void> {
-			// maintain message order
-			return this.locks.withLock(FlakyWebSocket.SEND_KEY, async () => {
-				if (jitterScaleInSeconds > 0) {
-					await sleep(Math.random() * jitterScaleInSeconds * 1000);
-				}
-
-				super.send(data);
-			});
-		}
-	} as unknown as typeof WebSocket;
-}

From 4cdd0cbd40fc55fab2aa4c34bf42ea2f7380a67e Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 30 Aug 2025 21:50:34 +0100
Subject: [PATCH 569/761] Build server for multiple arch (#106)

---
 .github/workflows/check.yml            |  6 ++++
 .github/workflows/e2e.yml              |  6 ++++
 .github/workflows/publish-docker.yml   |  1 +
 .github/workflows/publish-plugin.yml   | 21 ++++++++++--
 .gitignore                             |  1 +
 frontend/obsidian-plugin/manifest.json |  2 +-
 frontend/obsidian-plugin/package.json  |  4 +--
 frontend/package-lock.json             |  6 ++--
 frontend/sync-client/package.json      |  2 +-
 frontend/test-client/package.json      |  2 +-
 manifest.json                          |  2 +-
 scripts/build-sync-server-binaries.sh  | 46 ++++++++++++++++++++++++++
 sync-server/Cargo.lock                 |  2 +-
 sync-server/Cargo.toml                 |  2 +-
 sync-server/Dockerfile                 | 29 ++++++++--------
 sync-server/rust-toolchain.toml        |  7 +++-
 16 files changed, 111 insertions(+), 28 deletions(-)
 create mode 100755 scripts/build-sync-server-binaries.sh

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 0f0d18e1..e2421e27 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -22,6 +22,12 @@ jobs:
         with:
           node-version: "22.x"
           check-latest: true
+      
+      - name: Setup Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          toolchain: "1.89.0"
+          components: clippy, rustfmt
 
       - name: Setup rust
         run: |
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 23f57786..c540f1e4 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -23,6 +23,12 @@ jobs:
           node-version: "22.x"
           check-latest: true
 
+      - name: Setup Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          toolchain: "1.89.0"
+          components: clippy, rustfmt
+
       - name: Setup rust
         run: |
           cargo install sqlx-cli
diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml
index b205448f..f9fee79b 100644
--- a/.github/workflows/publish-docker.yml
+++ b/.github/workflows/publish-docker.yml
@@ -67,6 +67,7 @@ jobs:
         uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
         with:
           context: sync-server
+          platforms: linux/amd64,linux/arm64
           push: ${{ github.ref_type == 'tag' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/.github/workflows/publish-plugin.yml b/.github/workflows/publish-plugin.yml
index 18c934bb..ed223780 100644
--- a/.github/workflows/publish-plugin.yml
+++ b/.github/workflows/publish-plugin.yml
@@ -26,15 +26,32 @@ jobs:
           npm ci
           npm run build
 
+      - name: Setup Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          toolchain: "1.89.0"
+          components: clippy, rustfmt
+
+      - name: Install cross-compilation tools
+        run: |
+          apt update
+          apt install -y gcc-aarch64-linux-gnu musl-tools gcc-mingw-w64-x86-64
+
+      - name: Build Linux and Windows binaries
+        run: ./scripts/build-sync-server-binaries.sh
+
       - name: Create release
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           tag="${GITHUB_REF#refs/tags/}"
 
-          cd frontend/obsidian-plugin/dist
+          mkdir -p release
+          cp frontend/obsidian-plugin/dist/* release/
+          cp sync-server/artifacts/sync-server-* release/
+          cd release
 
           gh release create "$tag" \
             --title="$tag" \
             --draft \
-            main.js manifest.json styles.css
+            *
diff --git a/.gitignore b/.gitignore
index 98a00712..ef64105e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@ sync-server/databases
 
 # Rust build folders
 sync-server/target
+sync-server/artifacts
 sync-server/bindings/*.ts
 
 *.log
diff --git a/frontend/obsidian-plugin/manifest.json b/frontend/obsidian-plugin/manifest.json
index b327da4f..6ae4ed36 100644
--- a/frontend/obsidian-plugin/manifest.json
+++ b/frontend/obsidian-plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.6.3",
+	"version": "0.6.4",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index 14b286c9..ea86ab84 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -1,6 +1,6 @@
 {
     "name": "vault-link-obsidian-plugin",
-    "version": "0.6.3",
+    "version": "0.6.4",
     "description": "This is a sample plugin for Obsidian (https://obsidian.md)",
     "main": "main.js",
     "scripts": {
@@ -35,4 +35,4 @@
         "webpack": "^5.99.9",
         "webpack-cli": "^6.0.1"
     }
-}
\ No newline at end of file
+}
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 7876659b..39fa503d 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -4494,7 +4494,7 @@
 		},
 		"obsidian-plugin": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.6.3",
+			"version": "0.6.4",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/node": "^22.15.30",
@@ -4538,7 +4538,7 @@
 			"license": "MIT"
 		},
 		"sync-client": {
-			"version": "0.6.3",
+			"version": "0.6.4",
 			"dependencies": {
 				"byte-base64": "^1.1.0",
 				"minimatch": "^10.0.1",
@@ -4596,7 +4596,7 @@
 			"license": "MIT"
 		},
 		"test-client": {
-			"version": "0.6.3",
+			"version": "0.6.4",
 			"bin": {
 				"test-client": "dist/cli.js"
 			},
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index 0046f5c2..68e740e2 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "sync-client",
-    "version": "0.6.3",
+    "version": "0.6.4",
     "main": "dist/sync-client.node.js",
     "browser": "dist/sync-client.web.js",
     "types": "dist/types/index.d.ts",
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index ba40bd48..100f6457 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "test-client",
-    "version": "0.6.3",
+    "version": "0.6.4",
     "private": true,
     "bin": {
         "test-client": "./dist/cli.js"
diff --git a/manifest.json b/manifest.json
index b327da4f..6ae4ed36 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.6.3",
+	"version": "0.6.4",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/scripts/build-sync-server-binaries.sh b/scripts/build-sync-server-binaries.sh
new file mode 100755
index 00000000..19297aa6
--- /dev/null
+++ b/scripts/build-sync-server-binaries.sh
@@ -0,0 +1,46 @@
+#!/bin/bash
+
+set -e
+
+cd "$(dirname "$0")/../sync-server"
+
+# Setup database
+sqlx database create --database-url sqlite://db.sqlite3 2>/dev/null || true
+sqlx migrate run --source src/app_state/database/migrations --database-url sqlite://db.sqlite3
+
+targets=${@:-"x86_64-unknown-linux-gnu x86_64-unknown-linux-musl aarch64-unknown-linux-gnu x86_64-pc-windows-gnu"}
+
+mkdir -p artifacts
+rm -f artifacts/sync-server-*
+
+
+for target in $targets; do
+    echo "Building $target..."
+    
+    # Set linkers for cross-compilation
+    case "$target" in
+        aarch64-unknown-linux-gnu) 
+            export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc ;;
+        x86_64-unknown-linux-musl) 
+            export CARGO_TARGET_X86_64_UNKNOWN_LINUX_MUSL_LINKER=musl-gcc ;;
+        x86_64-pc-windows-gnu) 
+            export CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER=x86_64-w64-mingw32-gcc ;;
+    esac
+    
+    rustup target add "$target" 2>/dev/null || true
+    
+    cargo build --release --target "$target"
+    ext=""
+    [[ "$target" == *windows* ]] && ext=".exe"
+    
+    name="sync-server-${target//-/_}$ext"
+    name="${name//x86_64_unknown_linux_gnu/linux-x86_64}"
+    name="${name//x86_64_unknown_linux_musl/linux-x86_64-musl}"
+    name="${name//aarch64_unknown_linux_gnu/linux-aarch64}"
+    name="${name//x86_64_pc_windows_gnu/windows-x86_64}"
+    
+    cp "target/$target/release/sync_server$ext" "artifacts/$name"
+    echo "✓ Built $name"
+done
+
+ls -la ../artifacts/sync-server-*
diff --git a/sync-server/Cargo.lock b/sync-server/Cargo.lock
index 26669e0a..c0f2d9e9 100644
--- a/sync-server/Cargo.lock
+++ b/sync-server/Cargo.lock
@@ -2205,7 +2205,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.6.3"
+version = "0.6.4"
 dependencies = [
  "anyhow",
  "axum",
diff --git a/sync-server/Cargo.toml b/sync-server/Cargo.toml
index 550a0998..08c84493 100644
--- a/sync-server/Cargo.toml
+++ b/sync-server/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.6.3"
+version = "0.6.4"
 
 [dependencies]
 serde = { version = "1.0.219", default-features = false, features = ["derive"] }
diff --git a/sync-server/Dockerfile b/sync-server/Dockerfile
index bf6fb604..10aeb4ae 100644
--- a/sync-server/Dockerfile
+++ b/sync-server/Dockerfile
@@ -1,33 +1,34 @@
-FROM rust:1.89 AS builder
+FROM rust:1.89-slim-trixie AS builder
 
 WORKDIR /usr/src/backend
 
-RUN apt update && apt install -y musl-tools
-RUN cargo install sqlx-cli
+RUN apt update && \
+    apt install -y libssl-dev pkg-config && \
+    cargo install sqlx-cli
 
+# Build application
 COPY . .
 
-RUN sqlx database create --database-url sqlite://db.sqlite3
-RUN sqlx migrate run --source src/app_state/database/migrations --database-url sqlite://db.sqlite3
+RUN sqlx database create --database-url sqlite://db.sqlite3 && \
+    sqlx migrate run --source src/app_state/database/migrations --database-url sqlite://db.sqlite3 && \
+    cargo build --release
 
-RUN cargo build --release --target x86_64-unknown-linux-musl
-
-# Runtime image
-FROM alpine:3.22.1
+FROM debian:trixie-slim
 
 LABEL org.opencontainers.image.authors="andras@schmelczer.dev"
 
-RUN apk add --no-cache curl
+RUN apt update && \
+    apt install -y curl ca-certificates && \
+    apt clean && \
+    rm -rf /var/lib/apt/lists/*
 
-COPY --from=builder /usr/src/backend/target/x86_64-unknown-linux-musl/release/sync_server /app/sync_server
+COPY --from=builder /usr/src/backend/target/release/sync_server /app/sync_server
 
 VOLUME /data
 EXPOSE 3000/tcp
 WORKDIR /data
 
-HEALTHCHECK \
-    --interval=30s \
-    --timeout=5s \
+HEALTHCHECK --interval=30s --timeout=5s \
     CMD curl -f http://localhost:3000/vaults/fake/ping || exit 1
 
 ENTRYPOINT ["/app/sync_server"]
diff --git a/sync-server/rust-toolchain.toml b/sync-server/rust-toolchain.toml
index ed32db00..635d09fb 100644
--- a/sync-server/rust-toolchain.toml
+++ b/sync-server/rust-toolchain.toml
@@ -1,4 +1,9 @@
 [toolchain]
 channel = "1.89.0"
-targets = [ "x86_64-unknown-linux-gnu", "x86_64-unknown-linux-musl" ]
+targets = [ 
+  "x86_64-unknown-linux-gnu", 
+  "x86_64-unknown-linux-musl",
+  "aarch64-unknown-linux-gnu",
+  "x86_64-pc-windows-gnu",
+]
 profile = "default"

From a919b04cf013728c55dba5e8d798a524d5dbdcb5 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 30 Aug 2025 22:24:08 +0100
Subject: [PATCH 570/761] Add telemetry

---
 frontend/obsidian-plugin/package.json         |  2 +
 .../obsidian-plugin/src/vault-link-plugin.ts  | 45 ++++++++++
 frontend/package-lock.json                    | 90 +++++++++++++++++++
 3 files changed, 137 insertions(+)

diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index ea86ab84..42d2bec8 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -13,6 +13,8 @@
     "author": "",
     "license": "MIT",
     "devDependencies": {
+        "@plausible-analytics/tracker": "^0.4.0",
+        "@sentry/browser": "^10.8.0",
         "@types/node": "^22.15.30",
         "css-loader": "^7.1.2",
         "date-fns": "^4.1.0",
diff --git a/frontend/obsidian-plugin/src/vault-link-plugin.ts b/frontend/obsidian-plugin/src/vault-link-plugin.ts
index b791ffb7..ce3f23ac 100644
--- a/frontend/obsidian-plugin/src/vault-link-plugin.ts
+++ b/frontend/obsidian-plugin/src/vault-link-plugin.ts
@@ -11,6 +11,8 @@ import { HistoryView } from "./views/history/history-view";
 import { StatusBar } from "./views/status-bar/status-bar";
 import { LogsView } from "./views/logs/logs-view";
 import { StatusDescription } from "./views/status-description/status-description";
+import * as Sentry from "@sentry/browser";
+import { init as plausibleInit } from "@plausible-analytics/tracker";
 import {
 	SyncClient,
 	rateLimit,
@@ -50,6 +52,49 @@ export default class VaultLinkPlugin extends Plugin {
 
 		const isDebugBuild = process.env.NODE_ENV === "development";
 
+		if (!isDebugBuild) {
+			plausibleInit({
+				domain: "vault-link",
+				endpoint: "https://stats.schmelczer.dev/status",
+				autoCapturePageviews: true,
+				captureOnLocalhost: true,
+				logging: true
+			});
+
+			Sentry.init({
+				dsn: "https://56accd39d92442e788a457a04623cf57@bugs.schmelczer.dev/1",
+				skipBrowserExtensionCheck: false
+			});
+
+			const onError = (event: ErrorEvent): void => {
+				Sentry.captureException(event.error, {
+					extra: {
+						message: event.message,
+						filename: event.filename,
+						lineno: event.lineno,
+						colno: event.colno
+					}
+				});
+			};
+			window.addEventListener("error", onError);
+			this.disposables.push(() => {
+				window.removeEventListener("error", onError);
+			});
+
+			const onUnhandledRejection = (
+				event: PromiseRejectionEvent
+			): void => {
+				Sentry.captureException(event.reason);
+			};
+			window.addEventListener("unhandledrejection", onUnhandledRejection);
+			this.disposables.push(() => {
+				window.removeEventListener(
+					"unhandledrejection",
+					onUnhandledRejection
+				);
+			});
+		}
+
 		const debugOptions = isDebugBuild
 			? {
 					fetch: debugging.slowFetchFactory(1),
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 39fa503d..4415f1da 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -842,6 +842,94 @@
 				"url": "https://opencollective.com/parcel"
 			}
 		},
+		"node_modules/@plausible-analytics/tracker": {
+			"version": "0.4.0",
+			"resolved": "https://registry.npmjs.org/@plausible-analytics/tracker/-/tracker-0.4.0.tgz",
+			"integrity": "sha512-KXwttotIZymo3yGzargrsxl9hjXJo5N+Kips3ZMamYqJxJqv1Zx+POC6WOFxYwDe1iJW7T91ItQYD8mZsznpXQ==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/@sentry-internal/browser-utils": {
+			"version": "10.8.0",
+			"resolved": "https://registry.npmjs.org/@sentry-internal/browser-utils/-/browser-utils-10.8.0.tgz",
+			"integrity": "sha512-FaQX9eefc8sh3h3ZQy16U73KiH0xgDldXnrFiWK6OeWg8X4bJpnYbLqEi96LgHiQhjnnz+UQP1GDzH5oFuu5fA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@sentry/core": "10.8.0"
+			},
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/@sentry-internal/feedback": {
+			"version": "10.8.0",
+			"resolved": "https://registry.npmjs.org/@sentry-internal/feedback/-/feedback-10.8.0.tgz",
+			"integrity": "sha512-n7SqgFQItq4QSPG7bCjcZcIwK6AatKnnmSDJ/i6e8jXNIyLwkEuY2NyvTXACxVdO/kafGD5VmrwnTo3Ekc1AMg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@sentry/core": "10.8.0"
+			},
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/@sentry-internal/replay": {
+			"version": "10.8.0",
+			"resolved": "https://registry.npmjs.org/@sentry-internal/replay/-/replay-10.8.0.tgz",
+			"integrity": "sha512-9+qDEoEjv4VopLuOzK1zM4LcvcUsvB5N0iJ+FRCM3XzzOCbebJOniXTQbt5HflJc3XLnQNKFdKfTfgj8M/0RKQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@sentry-internal/browser-utils": "10.8.0",
+				"@sentry/core": "10.8.0"
+			},
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/@sentry-internal/replay-canvas": {
+			"version": "10.8.0",
+			"resolved": "https://registry.npmjs.org/@sentry-internal/replay-canvas/-/replay-canvas-10.8.0.tgz",
+			"integrity": "sha512-jC4OOwiNgrlIPeXIPMLkaW53BSS1do+toYHoWzzO5AXGpN6jRhanoSj36FpVuH2N3kFnxKVfVxrwh8L+/3vFWg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@sentry-internal/replay": "10.8.0",
+				"@sentry/core": "10.8.0"
+			},
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/@sentry/browser": {
+			"version": "10.8.0",
+			"resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-10.8.0.tgz",
+			"integrity": "sha512-2J7HST8/ixCaboq17yFn/j/OEokXSXoCBMXRrFx4FKJggKWZ90e2Iau5mP/IPPhrW+W9zCptCgNMY0167wS4qA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@sentry-internal/browser-utils": "10.8.0",
+				"@sentry-internal/feedback": "10.8.0",
+				"@sentry-internal/replay": "10.8.0",
+				"@sentry-internal/replay-canvas": "10.8.0",
+				"@sentry/core": "10.8.0"
+			},
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/@sentry/core": {
+			"version": "10.8.0",
+			"resolved": "https://registry.npmjs.org/@sentry/core/-/core-10.8.0.tgz",
+			"integrity": "sha512-scYzM/UOItu4PjEq6CpHLdArpXjIS0laHYxE4YjkIbYIH6VMcXGQbD/FSBClsnCr1wXRnlXfXBzj0hrQAFyw+Q==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=18"
+			}
+		},
 		"node_modules/@types/codemirror": {
 			"version": "5.60.8",
 			"dev": true,
@@ -4497,6 +4585,8 @@
 			"version": "0.6.4",
 			"license": "MIT",
 			"devDependencies": {
+				"@plausible-analytics/tracker": "^0.4.0",
+				"@sentry/browser": "^10.8.0",
 				"@types/node": "^22.15.30",
 				"css-loader": "^7.1.2",
 				"date-fns": "^4.1.0",

From 1d19ceabd3585e0167eb79bb6d7e7f8c66bf0359 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 30 Aug 2025 22:24:16 +0100
Subject: [PATCH 571/761] Bump versions to 0.7.0

---
 frontend/obsidian-plugin/manifest.json | 2 +-
 frontend/obsidian-plugin/package.json  | 2 +-
 frontend/package-lock.json             | 6 +++---
 frontend/sync-client/package.json      | 2 +-
 frontend/test-client/package.json      | 2 +-
 manifest.json                          | 2 +-
 sync-server/Cargo.lock                 | 2 +-
 sync-server/Cargo.toml                 | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/frontend/obsidian-plugin/manifest.json b/frontend/obsidian-plugin/manifest.json
index 6ae4ed36..1255c263 100644
--- a/frontend/obsidian-plugin/manifest.json
+++ b/frontend/obsidian-plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.6.4",
+	"version": "0.7.0",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index 42d2bec8..1b0f8a52 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -1,6 +1,6 @@
 {
     "name": "vault-link-obsidian-plugin",
-    "version": "0.6.4",
+    "version": "0.7.0",
     "description": "This is a sample plugin for Obsidian (https://obsidian.md)",
     "main": "main.js",
     "scripts": {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 4415f1da..1a98f009 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -4582,7 +4582,7 @@
 		},
 		"obsidian-plugin": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.6.4",
+			"version": "0.7.0",
 			"license": "MIT",
 			"devDependencies": {
 				"@plausible-analytics/tracker": "^0.4.0",
@@ -4628,7 +4628,7 @@
 			"license": "MIT"
 		},
 		"sync-client": {
-			"version": "0.6.4",
+			"version": "0.7.0",
 			"dependencies": {
 				"byte-base64": "^1.1.0",
 				"minimatch": "^10.0.1",
@@ -4686,7 +4686,7 @@
 			"license": "MIT"
 		},
 		"test-client": {
-			"version": "0.6.4",
+			"version": "0.7.0",
 			"bin": {
 				"test-client": "dist/cli.js"
 			},
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index 68e740e2..36e4e916 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "sync-client",
-    "version": "0.6.4",
+    "version": "0.7.0",
     "main": "dist/sync-client.node.js",
     "browser": "dist/sync-client.web.js",
     "types": "dist/types/index.d.ts",
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index 100f6457..19b920e2 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "test-client",
-    "version": "0.6.4",
+    "version": "0.7.0",
     "private": true,
     "bin": {
         "test-client": "./dist/cli.js"
diff --git a/manifest.json b/manifest.json
index 6ae4ed36..1255c263 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.6.4",
+	"version": "0.7.0",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/sync-server/Cargo.lock b/sync-server/Cargo.lock
index c0f2d9e9..47ce2907 100644
--- a/sync-server/Cargo.lock
+++ b/sync-server/Cargo.lock
@@ -2205,7 +2205,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.6.4"
+version = "0.7.0"
 dependencies = [
  "anyhow",
  "axum",
diff --git a/sync-server/Cargo.toml b/sync-server/Cargo.toml
index 08c84493..fcb21d5d 100644
--- a/sync-server/Cargo.toml
+++ b/sync-server/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.6.4"
+version = "0.7.0"
 
 [dependencies]
 serde = { version = "1.0.219", default-features = false, features = ["derive"] }

From 0f38d4221266a30dfa5665bc33d337e071bb909d Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 31 Aug 2025 10:44:08 +0100
Subject: [PATCH 572/761] Fix script

---
 scripts/build-sync-server-binaries.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/scripts/build-sync-server-binaries.sh b/scripts/build-sync-server-binaries.sh
index 19297aa6..80d8d5e2 100755
--- a/scripts/build-sync-server-binaries.sh
+++ b/scripts/build-sync-server-binaries.sh
@@ -42,5 +42,3 @@ for target in $targets; do
     cp "target/$target/release/sync_server$ext" "artifacts/$name"
     echo "✓ Built $name"
 done
-
-ls -la ../artifacts/sync-server-*

From acdacf655d065ccdc14ddcec1990377a5f6f0c1f Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 31 Aug 2025 10:44:19 +0100
Subject: [PATCH 573/761] Bump versions to 0.8.0

---
 frontend/obsidian-plugin/manifest.json | 2 +-
 frontend/obsidian-plugin/package.json  | 2 +-
 frontend/package-lock.json             | 6 +++---
 frontend/sync-client/package.json      | 2 +-
 frontend/test-client/package.json      | 2 +-
 manifest.json                          | 2 +-
 sync-server/Cargo.lock                 | 2 +-
 sync-server/Cargo.toml                 | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/frontend/obsidian-plugin/manifest.json b/frontend/obsidian-plugin/manifest.json
index 1255c263..21d6fa3e 100644
--- a/frontend/obsidian-plugin/manifest.json
+++ b/frontend/obsidian-plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.7.0",
+	"version": "0.8.0",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index 1b0f8a52..c3a28ef4 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -1,6 +1,6 @@
 {
     "name": "vault-link-obsidian-plugin",
-    "version": "0.7.0",
+    "version": "0.8.0",
     "description": "This is a sample plugin for Obsidian (https://obsidian.md)",
     "main": "main.js",
     "scripts": {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 1a98f009..08b07625 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -4582,7 +4582,7 @@
 		},
 		"obsidian-plugin": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.7.0",
+			"version": "0.8.0",
 			"license": "MIT",
 			"devDependencies": {
 				"@plausible-analytics/tracker": "^0.4.0",
@@ -4628,7 +4628,7 @@
 			"license": "MIT"
 		},
 		"sync-client": {
-			"version": "0.7.0",
+			"version": "0.8.0",
 			"dependencies": {
 				"byte-base64": "^1.1.0",
 				"minimatch": "^10.0.1",
@@ -4686,7 +4686,7 @@
 			"license": "MIT"
 		},
 		"test-client": {
-			"version": "0.7.0",
+			"version": "0.8.0",
 			"bin": {
 				"test-client": "dist/cli.js"
 			},
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index 36e4e916..0a76c4bf 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "sync-client",
-    "version": "0.7.0",
+    "version": "0.8.0",
     "main": "dist/sync-client.node.js",
     "browser": "dist/sync-client.web.js",
     "types": "dist/types/index.d.ts",
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index 19b920e2..143c4881 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "test-client",
-    "version": "0.7.0",
+    "version": "0.8.0",
     "private": true,
     "bin": {
         "test-client": "./dist/cli.js"
diff --git a/manifest.json b/manifest.json
index 1255c263..21d6fa3e 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.7.0",
+	"version": "0.8.0",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/sync-server/Cargo.lock b/sync-server/Cargo.lock
index 47ce2907..f33e946b 100644
--- a/sync-server/Cargo.lock
+++ b/sync-server/Cargo.lock
@@ -2205,7 +2205,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.7.0"
+version = "0.8.0"
 dependencies = [
  "anyhow",
  "axum",
diff --git a/sync-server/Cargo.toml b/sync-server/Cargo.toml
index fcb21d5d..9ccc6622 100644
--- a/sync-server/Cargo.toml
+++ b/sync-server/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.7.0"
+version = "0.8.0"
 
 [dependencies]
 serde = { version = "1.0.219", default-features = false, features = ["derive"] }

From b6c85f6370a5029d7f741c58d97ed326cd4bba54 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 18 Oct 2025 20:35:04 +0100
Subject: [PATCH 574/761] Change dev setup

---
 frontend/obsidian-plugin/webpack.config.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/obsidian-plugin/webpack.config.js b/frontend/obsidian-plugin/webpack.config.js
index 8a193c3e..8b7cb411 100644
--- a/frontend/obsidian-plugin/webpack.config.js
+++ b/frontend/obsidian-plugin/webpack.config.js
@@ -45,9 +45,9 @@ module.exports = (env, argv) => ({
 				compiler.hooks.done.tap("Copy Files Plugin", (stats) => {
 					const source = path.resolve(__dirname, "dist");
 					const destinations = [
-						"/mnt/c/Users/Andras/Desktop/test/test/.obsidian/plugins/vault-link",
-						"/mnt/c/Users/Andras/Desktop/test/test2/.obsidian/plugins/vault-link",
-						"/home/andras/obsidian-test/.obsidian/plugins/vault-link"
+						"/volumes/syncthing/Desktop/test/test/.obsidian/plugins/vault-link",
+						"/volumes/syncthing/Desktop/test/test2/.obsidian/plugins/vault-link",
+						// "/home/andras/obsidian-test/.obsidian/plugins/vault-link"
 					];
 					destinations.forEach((destination) => {
 						fs.copy(source, destination)

From c0171ad72fd04a790229159f5617183568a21b52 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 18 Oct 2025 20:35:15 +0100
Subject: [PATCH 575/761] Format

---
 README.md | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 1eb7a1c2..ae5801cf 100644
--- a/README.md
+++ b/README.md
@@ -9,16 +9,16 @@
 
 ### Install [nvm](https://github.com/nvm-sh/nvm)
 
--   `curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | bash`
--   `nvm install 22`
--   `nvm use 22`
--   Optionally set the system-wide default: `nvm alias default 22`
+- `curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | bash`
+- `nvm install 22`
+- `nvm use 22`
+- Optionally set the system-wide default: `nvm alias default 22`
 
 ### Set up Rust
 
--   Install [`rustup`](https://rustup.rs): `curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh`
--   Install [`wasm-pack`](https://rustwasm.github.io/wasm-pack/installer): `curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh`
--   `cargo install cargo-insta sqlx-cli cargo-edit`
+- Install [`rustup`](https://rustup.rs): `curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh`
+- Install [`wasm-pack`](https://rustwasm.github.io/wasm-pack/installer): `curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh`
+- `cargo install cargo-insta sqlx-cli cargo-edit`
 
 ### Install Obsidian on Linux
 
@@ -38,7 +38,7 @@ cd sync-server && cargo run config-e2e.yml
 ```
 
 ```sh
-cd frontend && npm run dev
+cd frontend && npm install && npm run dev
 ```
 
 ### Scripts
@@ -65,4 +65,4 @@ And to clean up the logs & database files, run `scripts/clean-up.sh`
 
 ## Projects
 
--   [Sync server](./sync-server/README.md)
+- [Sync server](./sync-server/README.md)

From 088f474a2e342df133b39f978320ca50e33eb300 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 18 Oct 2025 21:30:45 +0100
Subject: [PATCH 576/761] Fix remote cursor duplication

---
 .../views/cursors/remote-cursors-plugin.ts    | 39 ++++++++++++++++---
 frontend/package.json                         |  2 +-
 sync-server/src/server/websocket.rs           | 14 ++++++-
 3 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/frontend/obsidian-plugin/src/views/cursors/remote-cursors-plugin.ts b/frontend/obsidian-plugin/src/views/cursors/remote-cursors-plugin.ts
index a0de390c..86ddd6cd 100644
--- a/frontend/obsidian-plugin/src/views/cursors/remote-cursors-plugin.ts
+++ b/frontend/obsidian-plugin/src/views/cursors/remote-cursors-plugin.ts
@@ -9,6 +9,7 @@ import type {
 	ViewUpdate
 } from "@codemirror/view";
 import { RemoteCursorWidget } from "./remote-cursor-widget";
+import type { RelativePath } from "sync-client";
 import {
 	utils,
 	type CursorSpan,
@@ -32,12 +33,14 @@ export class RemoteCursorsPluginValue implements PluginValue {
 		isOutdated: boolean;
 	}[] = [];
 
+	private static app: App;
 	public decorations: DecorationSet = RangeSet.of([]);
 
 	public static setCursors(
 		clients: MaybeOutdatedClientCursors[],
 		app: App
 	): void {
+		RemoteCursorsPluginValue.app = app;
 		RemoteCursorsPluginValue.cursors = [
 			...RemoteCursorsPluginValue.cursors.filter(({ deviceId }) =>
 				clients.some(
@@ -82,6 +85,30 @@ export class RemoteCursorsPluginValue implements PluginValue {
 			});
 	}
 
+	private static findFileForEditor(
+		editor: EditorView
+	): RelativePath | undefined {
+		return RemoteCursorsPluginValue.app.workspace
+			.getLeavesOfType("markdown")
+			.map((leaf) => leaf.view)
+			.filter((view) => view instanceof MarkdownView)
+			.flatMap((view) => {
+				// @ts-expect-error, not typed
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+				if ((view.editor.cm as EditorView) !== editor) {
+					return [];
+				}
+
+				const { file } = view;
+				if (!file) {
+					return;
+				}
+
+				return [file.path];
+			})
+			.first();
+	}
+
 	private static interpolateRemoteCursorPositions(
 		original: string,
 		edited: string
@@ -155,9 +182,12 @@ export class RemoteCursorsPluginValue implements PluginValue {
 		);
 
 		const decorations: Range<Decoration>[] = [];
-
-		RemoteCursorsPluginValue.cursors.forEach(
-			({ name, span: { start, end } }) => {
+		const relative_path = RemoteCursorsPluginValue.findFileForEditor(
+			update.view
+		);
+		RemoteCursorsPluginValue.cursors
+			.filter(({ path }) => path == relative_path)
+			.forEach(({ name, span: { start, end } }) => {
 				const color = utils.getRandomColor(name);
 				const startLine = update.view.state.doc.lineAt(start);
 				const endLine = update.view.state.doc.lineAt(end);
@@ -221,8 +251,7 @@ export class RemoteCursorsPluginValue implements PluginValue {
 						widget: new RemoteCursorWidget(color, name)
 					})
 				});
-			}
-		);
+			});
 
 		this.decorations = Decoration.set(decorations, true);
 	}
diff --git a/frontend/package.json b/frontend/package.json
index 718efea1..526b6ee4 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -27,4 +27,4 @@
 		"prettier": "^3.6.2",
 		"typescript-eslint": "8.41.0"
 	}
-}
\ No newline at end of file
+}
diff --git a/sync-server/src/server/websocket.rs b/sync-server/src/server/websocket.rs
index 0e4f705f..5e94b277 100644
--- a/sync-server/src/server/websocket.rs
+++ b/sync-server/src/server/websocket.rs
@@ -106,7 +106,19 @@ async fn websocket(
                 continue;
             }
 
-            send_update_over_websocket(&update.message, &mut sender).await?;
+            let message = match update.message {
+                WebSocketServerMessage::CursorPositions(CursorPositionFromServer { clients }) => {
+                    WebSocketServerMessage::CursorPositions(CursorPositionFromServer {
+                        clients: clients
+                            .into_iter()
+                            .filter(|client| client.device_id != device_id)
+                            .collect(),
+                    })
+                }
+                WebSocketServerMessage::VaultUpdate(_) => update.message,
+            };
+
+            send_update_over_websocket(&message, &mut sender).await?;
         }
 
         Ok::<(), SyncServerError>(())

From 0e6b2c4985517f2dae9591062e34ad30cd2f0e19 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 18 Oct 2025 21:31:34 +0100
Subject: [PATCH 577/761] Bump concurrently from 9.1.2 to 9.2.1 in /frontend
 (#116)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 frontend/package-lock.json | 28 +++++++++++++---------------
 frontend/package.json      |  2 +-
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 08b07625..fa90f0f5 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -11,7 +11,7 @@
 				"test-client"
 			],
 			"devDependencies": {
-				"concurrently": "^9.1.2",
+				"concurrently": "^9.2.1",
 				"eslint": "9.28.0",
 				"eslint-plugin-unused-imports": "^4.1.4",
 				"npm-check-updates": "^18.0.1",
@@ -1778,17 +1778,18 @@
 			"license": "MIT"
 		},
 		"node_modules/concurrently": {
-			"version": "9.1.2",
+			"version": "9.2.1",
+			"resolved": "https://registry.npmjs.org/concurrently/-/concurrently-9.2.1.tgz",
+			"integrity": "sha512-fsfrO0MxV64Znoy8/l1vVIjjHa29SZyyqPgQBwhiDcaW8wJc2W3XWVOGx4M3oJBnv/zdUZIIp1gDeS98GzP8Ng==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"chalk": "^4.1.2",
-				"lodash": "^4.17.21",
-				"rxjs": "^7.8.1",
-				"shell-quote": "^1.8.1",
-				"supports-color": "^8.1.1",
-				"tree-kill": "^1.2.2",
-				"yargs": "^17.7.2"
+				"chalk": "4.1.2",
+				"rxjs": "7.8.2",
+				"shell-quote": "1.8.3",
+				"supports-color": "8.1.1",
+				"tree-kill": "1.2.2",
+				"yargs": "17.7.2"
 			},
 			"bin": {
 				"conc": "dist/bin/concurrently.js",
@@ -2806,11 +2807,6 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/lodash": {
-			"version": "4.17.21",
-			"dev": true,
-			"license": "MIT"
-		},
 		"node_modules/lodash.merge": {
 			"version": "4.6.2",
 			"dev": true,
@@ -3724,7 +3720,9 @@
 			}
 		},
 		"node_modules/shell-quote": {
-			"version": "1.8.2",
+			"version": "1.8.3",
+			"resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.3.tgz",
+			"integrity": "sha512-ObmnIF4hXNg1BqhnHmgbDETF8dLPCggZWBjkQfhZpbszZnYur5DUljTcCHii5LC3J5E0yeO/1LIMyH+UvHQgyw==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
diff --git a/frontend/package.json b/frontend/package.json
index 526b6ee4..ff1c3116 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -20,7 +20,7 @@
 		"update": "ncu -u -ws"
 	},
 	"devDependencies": {
-		"concurrently": "^9.1.2",
+		"concurrently": "^9.2.1",
 		"eslint": "9.28.0",
 		"eslint-plugin-unused-imports": "^4.1.4",
 		"npm-check-updates": "^18.0.1",

From 4556cc6cece0318e34a61298e18b99c183370787 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 18 Oct 2025 21:31:43 +0100
Subject: [PATCH 578/761] Bump @types/node from 22.18.0 to 24.8.1 in /frontend
 (#138)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 frontend/obsidian-plugin/package.json |  2 +-
 frontend/package-lock.json            | 71 ++++-----------------------
 frontend/sync-client/package.json     |  2 +-
 frontend/test-client/package.json     |  2 +-
 4 files changed, 13 insertions(+), 64 deletions(-)

diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index c3a28ef4..a35f9cfb 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -15,7 +15,7 @@
     "devDependencies": {
         "@plausible-analytics/tracker": "^0.4.0",
         "@sentry/browser": "^10.8.0",
-        "@types/node": "^22.15.30",
+        "@types/node": "^24.8.1",
         "css-loader": "^7.1.2",
         "date-fns": "^4.1.0",
         "file-loader": "^6.2.0",
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index fa90f0f5..e617e705 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -967,13 +967,13 @@
 			"license": "MIT"
 		},
 		"node_modules/@types/node": {
-			"version": "24.3.0",
-			"resolved": "https://registry.npmjs.org/@types/node/-/node-24.3.0.tgz",
-			"integrity": "sha512-aPTXCrfwnDLj4VvXrm+UUCQjNEvJgNA8s5F1cvwQU+3KNltTOkBm1j30uNLyqqPNe7gE3KFzImYoZEfLhp4Yow==",
+			"version": "24.8.1",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-24.8.1.tgz",
+			"integrity": "sha512-alv65KGRadQVfVcG69MuB4IzdYVpRwMG/mq8KWOaoOdyY617P5ivaDiMCGOFDWD2sAn5Q0mR3mRtUOgm99hL9Q==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"undici-types": "~7.10.0"
+				"undici-types": "~7.14.0"
 			}
 		},
 		"node_modules/@types/tern": {
@@ -4151,9 +4151,9 @@
 			}
 		},
 		"node_modules/undici-types": {
-			"version": "7.10.0",
-			"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.10.0.tgz",
-			"integrity": "sha512-t5Fy/nfn+14LuOc2KNYg75vZqClpAiqscVvMygNnlsHBFpSXdJaYtXMcdNLpl/Qvc3P2cB3s6lOV51nqsFq4ag==",
+			"version": "7.14.0",
+			"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.14.0.tgz",
+			"integrity": "sha512-QQiYxHuyZ9gQUIrmPo3IA+hUl4KYk8uSA7cHrcKd/l3p1OTpZcM0Tbp9x7FAtXdAYhlasd60ncPpgu6ihG6TOA==",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -4585,7 +4585,7 @@
 			"devDependencies": {
 				"@plausible-analytics/tracker": "^0.4.0",
 				"@sentry/browser": "^10.8.0",
-				"@types/node": "^22.15.30",
+				"@types/node": "^24.8.1",
 				"css-loader": "^7.1.2",
 				"date-fns": "^4.1.0",
 				"file-loader": "^6.2.0",
@@ -4608,23 +4608,6 @@
 				"webpack-cli": "^6.0.1"
 			}
 		},
-		"obsidian-plugin/node_modules/@types/node": {
-			"version": "22.18.0",
-			"resolved": "https://registry.npmjs.org/@types/node/-/node-22.18.0.tgz",
-			"integrity": "sha512-m5ObIqwsUp6BZzyiy4RdZpzWGub9bqLJMvZDD0QMXhxjqMHMENlj+SqF5QxoUwaQNFe+8kz8XM8ZQhqkQPTgMQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"undici-types": "~6.21.0"
-			}
-		},
-		"obsidian-plugin/node_modules/undici-types": {
-			"version": "6.21.0",
-			"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
-			"integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
-			"dev": true,
-			"license": "MIT"
-		},
 		"sync-client": {
 			"version": "0.8.0",
 			"dependencies": {
@@ -4635,7 +4618,7 @@
 				"uuid": "^11.1.0"
 			},
 			"devDependencies": {
-				"@types/node": "^22.15.30",
+				"@types/node": "^24.8.1",
 				"ts-loader": "^9.5.2",
 				"tslib": "2.8.1",
 				"tsx": "^4.20.5",
@@ -4646,16 +4629,6 @@
 				"ws": "^8.18.3"
 			}
 		},
-		"sync-client/node_modules/@types/node": {
-			"version": "22.18.0",
-			"resolved": "https://registry.npmjs.org/@types/node/-/node-22.18.0.tgz",
-			"integrity": "sha512-m5ObIqwsUp6BZzyiy4RdZpzWGub9bqLJMvZDD0QMXhxjqMHMENlj+SqF5QxoUwaQNFe+8kz8XM8ZQhqkQPTgMQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"undici-types": "~6.21.0"
-			}
-		},
 		"sync-client/node_modules/brace-expansion": {
 			"version": "2.0.1",
 			"license": "MIT",
@@ -4676,20 +4649,13 @@
 				"url": "https://github.com/sponsors/isaacs"
 			}
 		},
-		"sync-client/node_modules/undici-types": {
-			"version": "6.21.0",
-			"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
-			"integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
-			"dev": true,
-			"license": "MIT"
-		},
 		"test-client": {
 			"version": "0.8.0",
 			"bin": {
 				"test-client": "dist/cli.js"
 			},
 			"devDependencies": {
-				"@types/node": "^22.15.30",
+				"@types/node": "^24.8.1",
 				"bufferutil": "^4.0.9",
 				"sync-client": "file:../sync-client",
 				"ts-loader": "^9.5.2",
@@ -4700,23 +4666,6 @@
 				"webpack": "^5.99.9",
 				"webpack-cli": "^6.0.1"
 			}
-		},
-		"test-client/node_modules/@types/node": {
-			"version": "22.18.0",
-			"resolved": "https://registry.npmjs.org/@types/node/-/node-22.18.0.tgz",
-			"integrity": "sha512-m5ObIqwsUp6BZzyiy4RdZpzWGub9bqLJMvZDD0QMXhxjqMHMENlj+SqF5QxoUwaQNFe+8kz8XM8ZQhqkQPTgMQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"undici-types": "~6.21.0"
-			}
-		},
-		"test-client/node_modules/undici-types": {
-			"version": "6.21.0",
-			"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
-			"integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
-			"dev": true,
-			"license": "MIT"
 		}
 	}
 }
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index 0a76c4bf..9032f238 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -20,7 +20,7 @@
         "uuid": "^11.1.0"
     },
     "devDependencies": {
-        "@types/node": "^22.15.30",
+        "@types/node": "^24.8.1",
         "ts-loader": "^9.5.2",
         "tslib": "2.8.1",
         "tsx": "^4.20.5",
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index 143c4881..432cf171 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -11,7 +11,7 @@
         "test": "tsx --test src/**/*.test.ts"
     },
     "devDependencies": {
-        "@types/node": "^22.15.30",
+        "@types/node": "^24.8.1",
         "bufferutil": "^4.0.9",
         "sync-client": "file:../sync-client",
         "ts-loader": "^9.5.2",

From 59e02bcb4d76ded9a935602a2cbf75b76282a114 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 18 Oct 2025 21:31:53 +0100
Subject: [PATCH 579/761] Bump npm-check-updates from 18.0.1 to 19.1.1 in
 /frontend (#137)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 frontend/package-lock.json | 8 +++++---
 frontend/package.json      | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index e617e705..5374222d 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -14,7 +14,7 @@
 				"concurrently": "^9.2.1",
 				"eslint": "9.28.0",
 				"eslint-plugin-unused-imports": "^4.1.4",
-				"npm-check-updates": "^18.0.1",
+				"npm-check-updates": "^19.1.1",
 				"prettier": "^3.6.2",
 				"typescript-eslint": "8.41.0"
 			}
@@ -3007,7 +3007,9 @@
 			"license": "MIT"
 		},
 		"node_modules/npm-check-updates": {
-			"version": "18.0.1",
+			"version": "19.1.1",
+			"resolved": "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-19.1.1.tgz",
+			"integrity": "sha512-vy/uNbaK6Xfj/QzM8OXeALZak67E0uHjUlbdT1YGy4bdj0xlBU6AVd+8bscY8vlDpyzL6Y7mxcrX8kzEDeEpNg==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"bin": {
@@ -3015,7 +3017,7 @@
 				"npm-check-updates": "build/cli.js"
 			},
 			"engines": {
-				"node": "^18.18.0 || >=20.0.0",
+				"node": ">=20.0.0",
 				"npm": ">=8.12.1"
 			}
 		},
diff --git a/frontend/package.json b/frontend/package.json
index ff1c3116..ceb1a3f3 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -23,7 +23,7 @@
 		"concurrently": "^9.2.1",
 		"eslint": "9.28.0",
 		"eslint-plugin-unused-imports": "^4.1.4",
-		"npm-check-updates": "^18.0.1",
+		"npm-check-updates": "^19.1.1",
 		"prettier": "^3.6.2",
 		"typescript-eslint": "8.41.0"
 	}

From 7c48e27dbd749fd258aeba2852c053873556211b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 18 Oct 2025 21:32:05 +0100
Subject: [PATCH 580/761] Bump rust from 1.89-slim-trixie to 1.90-slim-trixie
 in /sync-server (#126)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 sync-server/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sync-server/Dockerfile b/sync-server/Dockerfile
index 10aeb4ae..36eb5465 100644
--- a/sync-server/Dockerfile
+++ b/sync-server/Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.89-slim-trixie AS builder
+FROM rust:1.90-slim-trixie AS builder
 
 WORKDIR /usr/src/backend
 

From a3621b6d901ccfa4014b2f9df7bf409250ad91a5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 18 Oct 2025 21:32:16 +0100
Subject: [PATCH 581/761] Bump serde_with from 3.12.0 to 3.15.0 in /sync-server
 (#133)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 sync-server/Cargo.lock | 131 +++++++++++++++++++++++++++++++++++------
 sync-server/Cargo.toml |   2 +-
 2 files changed, 115 insertions(+), 18 deletions(-)

diff --git a/sync-server/Cargo.lock b/sync-server/Cargo.lock
index f33e946b..1acf5a1b 100644
--- a/sync-server/Cargo.lock
+++ b/sync-server/Cargo.lock
@@ -252,7 +252,7 @@ version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b2c550fa5c1a07bbc41dbec1dcd4d0e3de230b9072ab8fb70c55d7d37693d66d"
 dependencies = [
- "darling",
+ "darling 0.20.10",
  "heck",
  "proc-macro-error",
  "quote",
@@ -497,8 +497,18 @@ version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989"
 dependencies = [
- "darling_core",
- "darling_macro",
+ "darling_core 0.20.10",
+ "darling_macro 0.20.10",
+]
+
+[[package]]
+name = "darling"
+version = "0.21.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0"
+dependencies = [
+ "darling_core 0.21.3",
+ "darling_macro 0.21.3",
 ]
 
 [[package]]
@@ -515,13 +525,38 @@ dependencies = [
  "syn 2.0.90",
 ]
 
+[[package]]
+name = "darling_core"
+version = "0.21.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1247195ecd7e3c85f83c8d2a366e4210d588e802133e1e355180a9870b517ea4"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "strsim",
+ "syn 2.0.90",
+]
+
 [[package]]
 name = "darling_macro"
 version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
- "darling_core",
+ "darling_core 0.20.10",
+ "quote",
+ "syn 2.0.90",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.21.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81"
+dependencies = [
+ "darling_core 0.21.3",
  "quote",
  "syn 2.0.90",
 ]
@@ -582,6 +617,12 @@ version = "0.15.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b"
 
+[[package]]
+name = "dyn-clone"
+version = "1.0.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555"
+
 [[package]]
 name = "either"
 version = "1.13.0"
@@ -1647,6 +1688,26 @@ dependencies = [
  "bitflags",
 ]
 
+[[package]]
+name = "ref-cast"
+version = "1.0.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f354300ae66f76f1c85c5f84693f0ce81d747e2c3f21a45fef496d89c960bf7d"
+dependencies = [
+ "ref-cast-impl",
+]
+
+[[package]]
+name = "ref-cast-impl"
+version = "1.0.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
 [[package]]
 name = "regex"
 version = "1.11.1"
@@ -1751,6 +1812,30 @@ dependencies = [
  "regex",
 ]
 
+[[package]]
+name = "schemars"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cd191f9397d57d581cddd31014772520aa448f65ef991055d7f61582c65165f"
+dependencies = [
+ "dyn-clone",
+ "ref-cast",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "schemars"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "82d20c4491bc164fa2f6c5d44565947a52ad80b9505d8e36f8d54c27c739fcd0"
+dependencies = [
+ "dyn-clone",
+ "ref-cast",
+ "serde",
+ "serde_json",
+]
+
 [[package]]
 name = "scopeguard"
 version = "1.2.0"
@@ -1759,18 +1844,28 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "serde"
-version = "1.0.219"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
+dependencies = [
+ "serde_core",
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.219"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1779,14 +1874,15 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.140"
+version = "1.0.145"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
+checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c"
 dependencies = [
  "itoa",
  "memchr",
  "ryu",
  "serde",
+ "serde_core",
 ]
 
 [[package]]
@@ -1813,17 +1909,18 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.12.0"
+version = "3.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6b6f7f2fcb69f747921f79f3926bd1e203fce4fef62c268dd3abfb6d86029aa"
+checksum = "6093cd8c01b25262b84927e0f7151692158fab02d961e04c979d3903eba7ecc5"
 dependencies = [
  "base64 0.22.1",
  "chrono",
  "hex",
  "indexmap 1.9.3",
  "indexmap 2.7.0",
- "serde",
- "serde_derive",
+ "schemars 0.9.0",
+ "schemars 1.0.4",
+ "serde_core",
  "serde_json",
  "serde_with_macros",
  "time",
@@ -1831,11 +1928,11 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.12.0"
+version = "3.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d00caa5193a3c8362ac2b73be6b9e768aa5a4b2f721d8f4b339600c3cb51f8e"
+checksum = "a7e6c180db0816026a61afa1cff5344fb7ebded7e4d3062772179f2501481c27"
 dependencies = [
- "darling",
+ "darling 0.21.3",
  "proc-macro2",
  "quote",
  "syn 2.0.90",
diff --git a/sync-server/Cargo.toml b/sync-server/Cargo.toml
index 9ccc6622..4c2dfb87 100644
--- a/sync-server/Cargo.toml
+++ b/sync-server/Cargo.toml
@@ -32,7 +32,7 @@ serde_json = "1.0.140"
 clap-verbosity-flag = "3.0.3"
 bimap = "0.6.3"
 ts-rs =  { version = "10.1", features = ["uuid-impl", "chrono-impl"] }
-serde_with = "3.12.0"
+serde_with = "3.15.0"
 base64 = "0.22.1"
 reconcile-text = "0.5.0"
 

From de143f9033db03981d3b308188c987a5ed6b04eb Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 18 Oct 2025 21:31:03 +0100
Subject: [PATCH 582/761] Add lint fixer mode

---
 README.md        | 14 ++++++++++++--
 scripts/check.sh | 20 +++++++++++++++++---
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index ae5801cf..0f9a3e2c 100644
--- a/README.md
+++ b/README.md
@@ -34,15 +34,25 @@ flatpak run md.obsidian.Obsidian
 Start the server:
 
 ```sh
-cd sync-server && cargo run config-e2e.yml
+cargo install sqlx-cli cargo-machete
+cd sync-server
+cargo run config-e2e.yml
 ```
 
 ```sh
-cd frontend && npm install && npm run dev
+cd frontend
+npm install
+npm run dev
 ```
 
 ### Scripts
 
+#### Before pushing
+
+```sh
+scripts/check.sh --fix
+```
+
 #### Update HTTP API TS bindings
 
 ```sh
diff --git a/scripts/check.sh b/scripts/check.sh
index 03bb35fe..576ed0ec 100755
--- a/scripts/check.sh
+++ b/scripts/check.sh
@@ -2,11 +2,25 @@
 
 set -e
 
+# Parse arguments
+FIX_MODE=false
+if [[ "$1" == "--fix" ]]; then
+    FIX_MODE=true
+    echo "Running in fix mode - will automatically fix linting and formatting issues"
+fi
+
 echo "Running checks in sync-server"
 cd sync-server
 cargo test --verbose
-cargo clippy --all-targets --all-features
-cargo fmt --all -- --check
+
+if [[ "$FIX_MODE" == true ]]; then
+    cargo clippy --all-targets --all-features --fix --allow-dirty --allow-staged
+    cargo fmt --all
+else
+    cargo clippy --all-targets --all-features
+    cargo fmt --all -- --check
+fi
+
 cargo machete
 
 echo "Running checks in frontend"
@@ -16,7 +30,7 @@ npm run build
 npm run test
 npm run lint
 
-if [[ $(git status --porcelain) ]]; then
+if [[ "$FIX_MODE" == false ]] && [[ $(git status --porcelain) ]]; then
     git status --porcelain
     echo "Failing CI because the working directory is not clean after linting"
     exit 1

From 12aa457e3a839b18314b7a6f559d2609672ad37d Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 19 Oct 2025 11:47:55 +0100
Subject: [PATCH 583/761] Add has_been_merged to DB

---
 sync-server/src/app_state/database.rs               |  9 ++++++---
 .../20251019103154_add_has_been_merged.sql          | 13 +++++++++++++
 sync-server/src/app_state/database/models.rs        |  2 ++
 sync-server/src/server/create_document.rs           |  1 +
 sync-server/src/server/delete_document.rs           |  1 +
 sync-server/src/server/update_document.rs           |  8 +++++---
 6 files changed, 28 insertions(+), 6 deletions(-)
 create mode 100644 sync-server/src/app_state/database/migrations/20251019103154_add_has_been_merged.sql

diff --git a/sync-server/src/app_state/database.rs b/sync-server/src/app_state/database.rs
index f8940140..2fc47ccb 100644
--- a/sync-server/src/app_state/database.rs
+++ b/sync-server/src/app_state/database.rs
@@ -278,7 +278,8 @@ impl Database {
                 content,
                 is_deleted,
                 user_id,
-                device_id
+                device_id,
+                has_been_merged
             from latest_document_versions
             where relative_path = ?
             order by vault_update_id desc  -- `latest_document_versions` only contains a single latest version of each document, however,
@@ -317,7 +318,8 @@ impl Database {
                 content,
                 is_deleted,
                 user_id,
-                device_id
+                device_id,
+                has_been_merged
             from latest_document_versions
             where document_id = ?
             "#,
@@ -351,7 +353,8 @@ impl Database {
                 content,
                 is_deleted,
                 user_id,
-                device_id
+                device_id,
+                has_been_merged
             from documents
             where vault_update_id = ?"#,
             vault_update_id
diff --git a/sync-server/src/app_state/database/migrations/20251019103154_add_has_been_merged.sql b/sync-server/src/app_state/database/migrations/20251019103154_add_has_been_merged.sql
new file mode 100644
index 00000000..5259c175
--- /dev/null
+++ b/sync-server/src/app_state/database/migrations/20251019103154_add_has_been_merged.sql
@@ -0,0 +1,13 @@
+ALTER TABLE documents ADD COLUMN has_been_merged BOOLEAN NOT NULL DEFAULT False;
+
+DROP VIEW latest_document_versions;
+
+CREATE VIEW IF NOT EXISTS latest_document_versions AS --recreate view as it now includes one more field
+SELECT d.*
+FROM documents d
+INNER JOIN (
+    SELECT MAX(vault_update_id) AS max_version_id
+    FROM documents
+    GROUP BY document_id
+) max_versions
+ON d.vault_update_id = max_versions.max_version_id;
diff --git a/sync-server/src/app_state/database/models.rs b/sync-server/src/app_state/database/models.rs
index 24c0c370..a216125a 100644
--- a/sync-server/src/app_state/database/models.rs
+++ b/sync-server/src/app_state/database/models.rs
@@ -20,6 +20,8 @@ pub struct StoredDocumentVersion {
     pub is_deleted: bool,
     pub user_id: UserId,
     pub device_id: DeviceId,
+    #[allow(dead_code)] // This is for manual analysis
+    pub has_been_merged: bool,
 }
 
 impl PartialEq<Self> for StoredDocumentVersion {
diff --git a/sync-server/src/server/create_document.rs b/sync-server/src/server/create_document.rs
index 7018d8cf..d8083410 100644
--- a/sync-server/src/server/create_document.rs
+++ b/sync-server/src/server/create_document.rs
@@ -77,6 +77,7 @@ pub async fn create_document(
         is_deleted: false,
         user_id: user.name,
         device_id: device_id.0,
+        has_been_merged: false,
     };
 
     state
diff --git a/sync-server/src/server/delete_document.rs b/sync-server/src/server/delete_document.rs
index 5b7cd6ef..a9fd1d4d 100644
--- a/sync-server/src/server/delete_document.rs
+++ b/sync-server/src/server/delete_document.rs
@@ -66,6 +66,7 @@ pub async fn delete_document(
         is_deleted: true,
         user_id: user.name,
         device_id: device_id.0,
+        has_been_merged: false
     };
 
     state
diff --git a/sync-server/src/server/update_document.rs b/sync-server/src/server/update_document.rs
index 99d3f490..04ba8b63 100644
--- a/sync-server/src/server/update_document.rs
+++ b/sync-server/src/server/update_document.rs
@@ -120,11 +120,12 @@ pub async fn update_document(
         )));
     }
 
-    let merged_content = if is_file_type_mergable(&sanitized_relative_path)
+    let are_all_participants_mergable = is_file_type_mergable(&sanitized_relative_path)
         && !is_binary(&parent_document.content)
         && !is_binary(&latest_version.content)
-        && !is_binary(&content)
-    {
+        && !is_binary(&content);
+
+    let merged_content = if are_all_participants_mergable {
         reconcile(
             str::from_utf8(&parent_document.content)
                 .expect("parent must be valid UTF-8 because it's not binary"),
@@ -177,6 +178,7 @@ pub async fn update_document(
         is_deleted: false,
         user_id: user.name,
         device_id: device_id.0,
+        has_been_merged: are_all_participants_mergable && is_different_from_request_content,
     };
 
     state

From 1b5f2366740974ef9b22dcd127cc637673e009d4 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 19 Oct 2025 11:53:58 +0100
Subject: [PATCH 584/761] Add migration docs

---
 sync-server/README.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/sync-server/README.md b/sync-server/README.md
index 4576162c..16509fb7 100644
--- a/sync-server/README.md
+++ b/sync-server/README.md
@@ -3,7 +3,15 @@
 ## Creating/resetting the Database for development
 
 ```sh
+rm -rf db.sqlite*
 sqlx database create --database-url sqlite://db.sqlite3
 sqlx migrate run --source src/app_state/database/migrations --database-url sqlite://db.sqlite3
 cargo sqlx prepare --workspace
 ```
+
+## Updating the DB schema through a migration
+
+```sh
+sqlx migrate add --source src/app_state/database/migrations <name>
+sqlx migrate run --source src/app_state/database/migrations --database-url sqlite://db.sqlite3
+```

From 5e3544f601b61626d1943b93c5f018b93514a9a6 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 19 Oct 2025 11:59:05 +0100
Subject: [PATCH 585/761] Allow running startup script

---
 sync-server/Dockerfile | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/sync-server/Dockerfile b/sync-server/Dockerfile
index 36eb5465..9d157520 100644
--- a/sync-server/Dockerfile
+++ b/sync-server/Dockerfile
@@ -3,7 +3,9 @@ FROM rust:1.90-slim-trixie AS builder
 WORKDIR /usr/src/backend
 
 RUN apt update && \
-    apt install -y libssl-dev pkg-config && \
+    apt install -y \
+    libssl-dev \
+    pkg-config && \
     cargo install sqlx-cli
 
 # Build application
@@ -18,11 +20,17 @@ FROM debian:trixie-slim
 LABEL org.opencontainers.image.authors="andras@schmelczer.dev"
 
 RUN apt update && \
-    apt install -y curl ca-certificates && \
+    apt install -y \
+    curl \
+    procps \
+    ca-certificates && \
     apt clean && \
     rm -rf /var/lib/apt/lists/*
 
 COPY --from=builder /usr/src/backend/target/release/sync_server /app/sync_server
+COPY test-entrypoint.sh /app/test-entrypoint.sh
+
+RUN chmod +x /app/test-entrypoint.sh
 
 VOLUME /data
 EXPOSE 3000/tcp
@@ -31,4 +39,5 @@ WORKDIR /data
 HEALTHCHECK --interval=30s --timeout=5s \
     CMD curl -f http://localhost:3000/vaults/fake/ping || exit 1
 
-ENTRYPOINT ["/app/sync_server"]
+ENTRYPOINT ["/bin/bash", "-c"]
+CMD ["/app/sync_server"]

From 215a05d84a30b31231460793d1e52f9470c33cff Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 19 Oct 2025 12:00:31 +0100
Subject: [PATCH 586/761] Update instructions

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0f9a3e2c..2d5573c7 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ flatpak run md.obsidian.Obsidian
 Start the server:
 
 ```sh
-cargo install sqlx-cli cargo-machete
+cargo install sqlx-cli cargo-machete cargo-set-version
 cd sync-server
 cargo run config-e2e.yml
 ```

From 00fd7e25168be9faed0143d233ae7d75734ec084 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 19 Oct 2025 12:00:35 +0100
Subject: [PATCH 587/761] Bump versions to 0.8.1

---
 frontend/obsidian-plugin/manifest.json | 2 +-
 frontend/obsidian-plugin/package.json  | 2 +-
 frontend/package-lock.json             | 6 +++---
 frontend/sync-client/package.json      | 2 +-
 frontend/test-client/package.json      | 2 +-
 manifest.json                          | 2 +-
 sync-server/Cargo.toml                 | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/frontend/obsidian-plugin/manifest.json b/frontend/obsidian-plugin/manifest.json
index 21d6fa3e..247037e6 100644
--- a/frontend/obsidian-plugin/manifest.json
+++ b/frontend/obsidian-plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.8.0",
+	"version": "0.8.1",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index a35f9cfb..2213b99f 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -1,6 +1,6 @@
 {
     "name": "vault-link-obsidian-plugin",
-    "version": "0.8.0",
+    "version": "0.8.1",
     "description": "This is a sample plugin for Obsidian (https://obsidian.md)",
     "main": "main.js",
     "scripts": {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 5374222d..7de449b3 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -4582,7 +4582,7 @@
 		},
 		"obsidian-plugin": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.8.0",
+			"version": "0.8.1",
 			"license": "MIT",
 			"devDependencies": {
 				"@plausible-analytics/tracker": "^0.4.0",
@@ -4611,7 +4611,7 @@
 			}
 		},
 		"sync-client": {
-			"version": "0.8.0",
+			"version": "0.8.1",
 			"dependencies": {
 				"byte-base64": "^1.1.0",
 				"minimatch": "^10.0.1",
@@ -4652,7 +4652,7 @@
 			}
 		},
 		"test-client": {
-			"version": "0.8.0",
+			"version": "0.8.1",
 			"bin": {
 				"test-client": "dist/cli.js"
 			},
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index 9032f238..5d4036cd 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "sync-client",
-    "version": "0.8.0",
+    "version": "0.8.1",
     "main": "dist/sync-client.node.js",
     "browser": "dist/sync-client.web.js",
     "types": "dist/types/index.d.ts",
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index 432cf171..9e53714b 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "test-client",
-    "version": "0.8.0",
+    "version": "0.8.1",
     "private": true,
     "bin": {
         "test-client": "./dist/cli.js"
diff --git a/manifest.json b/manifest.json
index 21d6fa3e..247037e6 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.8.0",
+	"version": "0.8.1",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/sync-server/Cargo.toml b/sync-server/Cargo.toml
index 4c2dfb87..117a267f 100644
--- a/sync-server/Cargo.toml
+++ b/sync-server/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.8.0"
+version = "--bump"
 
 [dependencies]
 serde = { version = "1.0.219", default-features = false, features = ["derive"] }

From 3b018819aaab0a70c9561361eadd2eb63b69c1ea Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 19 Oct 2025 14:43:11 +0100
Subject: [PATCH 588/761] Wrong crate

---
 README.md              | 2 +-
 sync-server/Cargo.lock | 2 +-
 sync-server/Cargo.toml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 2d5573c7..77f1f9ad 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ flatpak run md.obsidian.Obsidian
 Start the server:
 
 ```sh
-cargo install sqlx-cli cargo-machete cargo-set-version
+cargo install sqlx-cli cargo-machete cargo-edit
 cd sync-server
 cargo run config-e2e.yml
 ```
diff --git a/sync-server/Cargo.lock b/sync-server/Cargo.lock
index 1acf5a1b..ae9aba42 100644
--- a/sync-server/Cargo.lock
+++ b/sync-server/Cargo.lock
@@ -2302,7 +2302,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
  "anyhow",
  "axum",
diff --git a/sync-server/Cargo.toml b/sync-server/Cargo.toml
index 117a267f..8d19fe74 100644
--- a/sync-server/Cargo.toml
+++ b/sync-server/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "--bump"
+version = "0.8.1"
 
 [dependencies]
 serde = { version = "1.0.219", default-features = false, features = ["derive"] }

From d97a177edfd28c0dc46f3a0ba83bd1a9756aaff3 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 19 Oct 2025 14:43:30 +0100
Subject: [PATCH 589/761] Bump versions to 0.8.2

---
 frontend/obsidian-plugin/manifest.json | 2 +-
 frontend/obsidian-plugin/package.json  | 2 +-
 frontend/package-lock.json             | 6 +++---
 frontend/sync-client/package.json      | 2 +-
 frontend/test-client/package.json      | 2 +-
 manifest.json                          | 2 +-
 sync-server/Cargo.lock                 | 2 +-
 sync-server/Cargo.toml                 | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/frontend/obsidian-plugin/manifest.json b/frontend/obsidian-plugin/manifest.json
index 247037e6..3161fa90 100644
--- a/frontend/obsidian-plugin/manifest.json
+++ b/frontend/obsidian-plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.8.1",
+	"version": "0.8.2",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index 2213b99f..8800d288 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -1,6 +1,6 @@
 {
     "name": "vault-link-obsidian-plugin",
-    "version": "0.8.1",
+    "version": "0.8.2",
     "description": "This is a sample plugin for Obsidian (https://obsidian.md)",
     "main": "main.js",
     "scripts": {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 7de449b3..17e7af4a 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -4582,7 +4582,7 @@
 		},
 		"obsidian-plugin": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.8.1",
+			"version": "0.8.2",
 			"license": "MIT",
 			"devDependencies": {
 				"@plausible-analytics/tracker": "^0.4.0",
@@ -4611,7 +4611,7 @@
 			}
 		},
 		"sync-client": {
-			"version": "0.8.1",
+			"version": "0.8.2",
 			"dependencies": {
 				"byte-base64": "^1.1.0",
 				"minimatch": "^10.0.1",
@@ -4652,7 +4652,7 @@
 			}
 		},
 		"test-client": {
-			"version": "0.8.1",
+			"version": "0.8.2",
 			"bin": {
 				"test-client": "dist/cli.js"
 			},
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index 5d4036cd..13f215bf 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "sync-client",
-    "version": "0.8.1",
+    "version": "0.8.2",
     "main": "dist/sync-client.node.js",
     "browser": "dist/sync-client.web.js",
     "types": "dist/types/index.d.ts",
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index 9e53714b..e7b522e5 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "test-client",
-    "version": "0.8.1",
+    "version": "0.8.2",
     "private": true,
     "bin": {
         "test-client": "./dist/cli.js"
diff --git a/manifest.json b/manifest.json
index 247037e6..3161fa90 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.8.1",
+	"version": "0.8.2",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/sync-server/Cargo.lock b/sync-server/Cargo.lock
index ae9aba42..2fb3f2ac 100644
--- a/sync-server/Cargo.lock
+++ b/sync-server/Cargo.lock
@@ -2302,7 +2302,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.8.1"
+version = "0.8.2"
 dependencies = [
  "anyhow",
  "axum",
diff --git a/sync-server/Cargo.toml b/sync-server/Cargo.toml
index 8d19fe74..d3e3c287 100644
--- a/sync-server/Cargo.toml
+++ b/sync-server/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.8.1"
+version = "0.8.2"
 
 [dependencies]
 serde = { version = "1.0.219", default-features = false, features = ["derive"] }

From 90abf5ab14d67e6722025b9d792dea5453a1947d Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 19 Oct 2025 14:57:49 +0100
Subject: [PATCH 590/761] Fix lint

---
 sync-server/src/server/delete_document.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sync-server/src/server/delete_document.rs b/sync-server/src/server/delete_document.rs
index a9fd1d4d..fa9d578c 100644
--- a/sync-server/src/server/delete_document.rs
+++ b/sync-server/src/server/delete_document.rs
@@ -66,7 +66,7 @@ pub async fn delete_document(
         is_deleted: true,
         user_id: user.name,
         device_id: device_id.0,
-        has_been_merged: false
+        has_been_merged: false,
     };
 
     state

From aa73a5d7184a6900c7d2c74a190f821c67738409 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 19 Oct 2025 15:03:45 +0100
Subject: [PATCH 591/761] Bump versions to 0.8.3

---
 frontend/obsidian-plugin/manifest.json | 2 +-
 frontend/obsidian-plugin/package.json  | 2 +-
 frontend/package-lock.json             | 6 +++---
 frontend/sync-client/package.json      | 2 +-
 frontend/test-client/package.json      | 2 +-
 manifest.json                          | 2 +-
 sync-server/Cargo.lock                 | 2 +-
 sync-server/Cargo.toml                 | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/frontend/obsidian-plugin/manifest.json b/frontend/obsidian-plugin/manifest.json
index 3161fa90..78550642 100644
--- a/frontend/obsidian-plugin/manifest.json
+++ b/frontend/obsidian-plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.8.2",
+	"version": "0.8.3",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index 8800d288..326ba2df 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -1,6 +1,6 @@
 {
     "name": "vault-link-obsidian-plugin",
-    "version": "0.8.2",
+    "version": "0.8.3",
     "description": "This is a sample plugin for Obsidian (https://obsidian.md)",
     "main": "main.js",
     "scripts": {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 17e7af4a..9fb471d8 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -4582,7 +4582,7 @@
 		},
 		"obsidian-plugin": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.8.2",
+			"version": "0.8.3",
 			"license": "MIT",
 			"devDependencies": {
 				"@plausible-analytics/tracker": "^0.4.0",
@@ -4611,7 +4611,7 @@
 			}
 		},
 		"sync-client": {
-			"version": "0.8.2",
+			"version": "0.8.3",
 			"dependencies": {
 				"byte-base64": "^1.1.0",
 				"minimatch": "^10.0.1",
@@ -4652,7 +4652,7 @@
 			}
 		},
 		"test-client": {
-			"version": "0.8.2",
+			"version": "0.8.3",
 			"bin": {
 				"test-client": "dist/cli.js"
 			},
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index 13f215bf..6405dd18 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "sync-client",
-    "version": "0.8.2",
+    "version": "0.8.3",
     "main": "dist/sync-client.node.js",
     "browser": "dist/sync-client.web.js",
     "types": "dist/types/index.d.ts",
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index e7b522e5..4ea6f7d6 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "test-client",
-    "version": "0.8.2",
+    "version": "0.8.3",
     "private": true,
     "bin": {
         "test-client": "./dist/cli.js"
diff --git a/manifest.json b/manifest.json
index 3161fa90..78550642 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.8.2",
+	"version": "0.8.3",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/sync-server/Cargo.lock b/sync-server/Cargo.lock
index 2fb3f2ac..3597bdae 100644
--- a/sync-server/Cargo.lock
+++ b/sync-server/Cargo.lock
@@ -2302,7 +2302,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.8.2"
+version = "0.8.3"
 dependencies = [
  "anyhow",
  "axum",
diff --git a/sync-server/Cargo.toml b/sync-server/Cargo.toml
index d3e3c287..d7f39198 100644
--- a/sync-server/Cargo.toml
+++ b/sync-server/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.8.2"
+version = "0.8.3"
 
 [dependencies]
 serde = { version = "1.0.219", default-features = false, features = ["derive"] }

From 1ddba47b805c738e4264e7cd930b36eea10e5061 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Mon, 20 Oct 2025 20:24:35 +0100
Subject: [PATCH 592/761] Fix folder deletion (#140)

---
 .../src/obsidian-file-system.ts               |  6 +-
 .../file-operations/file-operations.test.ts   |  6 +-
 .../src/file-operations/file-operations.ts    | 55 ++++++++++++++++---
 .../file-operations/filesystem-operations.ts  |  6 +-
 .../safe-filesystem-operations.ts             |  6 +-
 .../sync-client/src/sync-operations/syncer.ts |  4 +-
 frontend/test-client/src/agent/mock-agent.ts  |  2 +-
 frontend/test-client/src/agent/mock-client.ts |  5 +-
 sync-server/Dockerfile                        |  4 --
 9 files changed, 69 insertions(+), 25 deletions(-)

diff --git a/frontend/obsidian-plugin/src/obsidian-file-system.ts b/frontend/obsidian-plugin/src/obsidian-file-system.ts
index 00a9acfb..44407890 100644
--- a/frontend/obsidian-plugin/src/obsidian-file-system.ts
+++ b/frontend/obsidian-plugin/src/obsidian-file-system.ts
@@ -14,10 +14,12 @@ export class ObsidianFileSystemOperations implements FileSystemOperations {
 		private readonly workspace: Workspace
 	) {}
 
-	public async listAllFiles(): Promise<RelativePath[]> {
+	public async listFilesRecursively(
+		root: RelativePath | undefined
+	): Promise<RelativePath[]> {
 		// Let's implement this by hand because vault.adapter.listAllFiles doesn't always return all files.
 		const allFiles = [];
-		const remainingFolders = [this.vault.getRoot().path];
+		const remainingFolders = [root ?? this.vault.getRoot().path];
 
 		// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
 		while (true) {
diff --git a/frontend/sync-client/src/file-operations/file-operations.test.ts b/frontend/sync-client/src/file-operations/file-operations.test.ts
index 64c02655..675fdce1 100644
--- a/frontend/sync-client/src/file-operations/file-operations.test.ts
+++ b/frontend/sync-client/src/file-operations/file-operations.test.ts
@@ -29,8 +29,10 @@ class MockDatabase implements Partial<Database> {
 class FakeFileSystemOperations implements FileSystemOperations {
 	public readonly names = new Set<string>();
 
-	public async listAllFiles(): Promise<RelativePath[]> {
-		throw new Error("Method not implemented.");
+	public async listFilesRecursively(
+		_root: RelativePath | undefined
+	): Promise<RelativePath[]> {
+		return ["file.md"];
 	}
 	public async read(_path: RelativePath): Promise<Uint8Array> {
 		throw new Error("Method not implemented.");
diff --git a/frontend/sync-client/src/file-operations/file-operations.ts b/frontend/sync-client/src/file-operations/file-operations.ts
index 38f624e5..56ce0e51 100644
--- a/frontend/sync-client/src/file-operations/file-operations.ts
+++ b/frontend/sync-client/src/file-operations/file-operations.ts
@@ -5,6 +5,7 @@ import { SafeFileSystemOperations } from "./safe-filesystem-operations";
 import type { TextWithCursors } from "reconcile-text";
 import { isBinary, reconcile } from "reconcile-text";
 import { isFileTypeMergable } from "../utils/is-file-type-mergable";
+
 export class FileOperations {
 	private static readonly PARENTHESES_REGEX = / \((\d+)\)$/;
 	private readonly fs: SafeFileSystemOperations;
@@ -18,8 +19,22 @@ export class FileOperations {
 		this.fs = new SafeFileSystemOperations(fs, logger);
 	}
 
-	public async listAllFiles(): Promise<RelativePath[]> {
-		return this.fs.listAllFiles();
+	private static getParentDirAndFile(
+		path: RelativePath
+	): [RelativePath, RelativePath] {
+		const pathParts = path.split("/");
+		const fileName = pathParts.pop();
+		if (fileName == "" || fileName == null) {
+			throw new Error(`Path '${path}' cannot be empty`);
+		}
+
+		return [pathParts.join("/"), fileName];
+	}
+
+	public async listFilesRecursively(
+		root: RelativePath | undefined = undefined
+	): Promise<RelativePath[]> {
+		return this.fs.listFilesRecursively(root);
 	}
 
 	public async read(path: RelativePath): Promise<Uint8Array> {
@@ -120,7 +135,8 @@ export class FileOperations {
 
 	public async delete(path: RelativePath): Promise<void> {
 		if (await this.exists(path)) {
-			return this.fs.delete(path);
+			await this.fs.delete(path);
+			await this.deletingEmptyParentDirectoriesOfDeletedFile(path);
 		} else {
 			this.logger.debug(`No need to delete '${path}', it doesn't exist`);
 		}
@@ -146,6 +162,31 @@ export class FileOperations {
 
 		this.database.move(oldPath, newPath);
 		await this.fs.rename(oldPath, newPath);
+		await this.deletingEmptyParentDirectoriesOfDeletedFile(oldPath);
+	}
+
+	private async deletingEmptyParentDirectoriesOfDeletedFile(
+		path: RelativePath
+	): Promise<void> {
+		let directory = path;
+		// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+		while (true) {
+			[directory] = FileOperations.getParentDirAndFile(directory);
+			if (directory.length === 0) {
+				break;
+			}
+
+			const remainingContent =
+				await this.fs.listFilesRecursively(directory);
+			if (remainingContent.length === 0) {
+				this.logger.debug(
+					`Folder (${directory}) is now empty, deleting`
+				);
+				await this.fs.delete(directory);
+			} else {
+				break;
+			}
+		}
 	}
 
 	private fromNativeLineEndings(content: Uint8Array): Uint8Array {
@@ -184,13 +225,9 @@ export class FileOperations {
 	}
 
 	private async deconflictPath(path: RelativePath): Promise<RelativePath> {
-		const pathParts = path.split("/");
-		const fileName = pathParts.pop();
-		if (fileName == "" || fileName == null) {
-			throw new Error(`Path '${path}' cannot be empty`);
-		}
+		// eslint-disable-next-line prefer-const
+		let [directory, fileName] = FileOperations.getParentDirAndFile(path);
 
-		let directory = pathParts.join("/");
 		if (directory) {
 			directory += "/";
 		}
diff --git a/frontend/sync-client/src/file-operations/filesystem-operations.ts b/frontend/sync-client/src/file-operations/filesystem-operations.ts
index d5d1eedc..9c7a8366 100644
--- a/frontend/sync-client/src/file-operations/filesystem-operations.ts
+++ b/frontend/sync-client/src/file-operations/filesystem-operations.ts
@@ -3,8 +3,10 @@ import type { RelativePath } from "../persistence/database";
 import type { TextWithCursors } from "reconcile-text";
 
 export interface FileSystemOperations {
-	// List all files that should be synced.
-	listAllFiles: () => Promise<RelativePath[]>;
+	// List all files under root that should be synced. If root is undefined, return every file.
+	listFilesRecursively: (
+		root: RelativePath | undefined
+	) => Promise<RelativePath[]>;
 
 	// Read the content of a file.
 	read: (path: RelativePath) => Promise<Uint8Array>;
diff --git a/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts b/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
index 2b1f908a..2c865c9f 100644
--- a/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
+++ b/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
@@ -20,9 +20,11 @@ export class SafeFileSystemOperations implements FileSystemOperations {
 		this.locks = new Locks(logger);
 	}
 
-	public async listAllFiles(): Promise<RelativePath[]> {
+	public async listFilesRecursively(
+		root: RelativePath | undefined
+	): Promise<RelativePath[]> {
 		this.logger.debug("Listing all files");
-		const result = await this.fs.listAllFiles();
+		const result = await this.fs.listFilesRecursively(root);
 		this.logger.debug(`Listed ${result.length} files`);
 		return result;
 	}
diff --git a/frontend/sync-client/src/sync-operations/syncer.ts b/frontend/sync-client/src/sync-operations/syncer.ts
index 186b9a9b..03041a36 100644
--- a/frontend/sync-client/src/sync-operations/syncer.ts
+++ b/frontend/sync-client/src/sync-operations/syncer.ts
@@ -335,7 +335,7 @@ export class Syncer {
 	private async internalScheduleSyncForOfflineChanges(): Promise<void> {
 		await this.createFakeDocumentsFromRemoteState();
 
-		const allLocalFiles = await this.operations.listAllFiles();
+		const allLocalFiles = await this.operations.listFilesRecursively();
 
 		let locallyPossiblyDeletedFiles: DocumentRecord[] = [];
 
@@ -431,7 +431,7 @@ export class Syncer {
 		}
 
 		const [allLocalFiles, remote] = await Promise.all([
-			this.operations.listAllFiles(),
+			this.operations.listFilesRecursively(),
 			this.syncQueue.add(async () => this.syncService.getAll())
 		]);
 
diff --git a/frontend/test-client/src/agent/mock-agent.ts b/frontend/test-client/src/agent/mock-agent.ts
index 9e7806ab..a6ced45d 100644
--- a/frontend/test-client/src/agent/mock-agent.ts
+++ b/frontend/test-client/src/agent/mock-agent.ts
@@ -94,7 +94,7 @@ export class MockAgent extends MockClient {
 			options.push(this.enableSyncAction.bind(this));
 		}
 
-		const files = await this.listAllFiles();
+		const files = await this.listFilesRecursively();
 
 		if (files.length > 0) {
 			options.push(
diff --git a/frontend/test-client/src/agent/mock-client.ts b/frontend/test-client/src/agent/mock-client.ts
index 3ef55c8f..2b384c24 100644
--- a/frontend/test-client/src/agent/mock-client.ts
+++ b/frontend/test-client/src/agent/mock-client.ts
@@ -7,6 +7,7 @@ import {
 	SyncClient
 } from "sync-client";
 import type { TextWithCursors } from "reconcile-text";
+
 export class MockClient implements FileSystemOperations {
 	protected readonly localFiles = new Map<string, Uint8Array>();
 	protected client!: SyncClient;
@@ -46,7 +47,9 @@ export class MockClient implements FileSystemOperations {
 		await this.client.start();
 	}
 
-	public async listAllFiles(): Promise<RelativePath[]> {
+	public async listFilesRecursively(
+		_root: RelativePath | undefined = undefined // we don't use multi-level paths during tests
+	): Promise<RelativePath[]> {
 		return Array.from(this.localFiles.keys());
 	}
 
diff --git a/sync-server/Dockerfile b/sync-server/Dockerfile
index 9d157520..cfb76138 100644
--- a/sync-server/Dockerfile
+++ b/sync-server/Dockerfile
@@ -8,7 +8,6 @@ RUN apt update && \
     pkg-config && \
     cargo install sqlx-cli
 
-# Build application
 COPY . .
 
 RUN sqlx database create --database-url sqlite://db.sqlite3 && \
@@ -28,9 +27,6 @@ RUN apt update && \
     rm -rf /var/lib/apt/lists/*
 
 COPY --from=builder /usr/src/backend/target/release/sync_server /app/sync_server
-COPY test-entrypoint.sh /app/test-entrypoint.sh
-
-RUN chmod +x /app/test-entrypoint.sh
 
 VOLUME /data
 EXPOSE 3000/tcp

From a31c2d87b5c3af195bfc93f39112a8034b1ae3d5 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Mon, 20 Oct 2025 20:26:14 +0100
Subject: [PATCH 593/761] Bump versions to 0.9.0

---
 frontend/obsidian-plugin/manifest.json | 2 +-
 frontend/obsidian-plugin/package.json  | 2 +-
 frontend/package-lock.json             | 6 +++---
 frontend/sync-client/package.json      | 2 +-
 frontend/test-client/package.json      | 2 +-
 manifest.json                          | 2 +-
 sync-server/Cargo.lock                 | 2 +-
 sync-server/Cargo.toml                 | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/frontend/obsidian-plugin/manifest.json b/frontend/obsidian-plugin/manifest.json
index 78550642..a085cd9b 100644
--- a/frontend/obsidian-plugin/manifest.json
+++ b/frontend/obsidian-plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.8.3",
+	"version": "0.9.0",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index 326ba2df..971947e5 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -1,6 +1,6 @@
 {
     "name": "vault-link-obsidian-plugin",
-    "version": "0.8.3",
+    "version": "0.9.0",
     "description": "This is a sample plugin for Obsidian (https://obsidian.md)",
     "main": "main.js",
     "scripts": {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 9fb471d8..4df70bd5 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -4582,7 +4582,7 @@
 		},
 		"obsidian-plugin": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.8.3",
+			"version": "0.9.0",
 			"license": "MIT",
 			"devDependencies": {
 				"@plausible-analytics/tracker": "^0.4.0",
@@ -4611,7 +4611,7 @@
 			}
 		},
 		"sync-client": {
-			"version": "0.8.3",
+			"version": "0.9.0",
 			"dependencies": {
 				"byte-base64": "^1.1.0",
 				"minimatch": "^10.0.1",
@@ -4652,7 +4652,7 @@
 			}
 		},
 		"test-client": {
-			"version": "0.8.3",
+			"version": "0.9.0",
 			"bin": {
 				"test-client": "dist/cli.js"
 			},
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index 6405dd18..1bb522b1 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "sync-client",
-    "version": "0.8.3",
+    "version": "0.9.0",
     "main": "dist/sync-client.node.js",
     "browser": "dist/sync-client.web.js",
     "types": "dist/types/index.d.ts",
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index 4ea6f7d6..fbcb509d 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "test-client",
-    "version": "0.8.3",
+    "version": "0.9.0",
     "private": true,
     "bin": {
         "test-client": "./dist/cli.js"
diff --git a/manifest.json b/manifest.json
index 78550642..a085cd9b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.8.3",
+	"version": "0.9.0",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/sync-server/Cargo.lock b/sync-server/Cargo.lock
index 3597bdae..ddaf2b72 100644
--- a/sync-server/Cargo.lock
+++ b/sync-server/Cargo.lock
@@ -2302,7 +2302,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.8.3"
+version = "0.9.0"
 dependencies = [
  "anyhow",
  "axum",
diff --git a/sync-server/Cargo.toml b/sync-server/Cargo.toml
index d7f39198..f938eeee 100644
--- a/sync-server/Cargo.toml
+++ b/sync-server/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.8.3"
+version = "0.9.0"
 
 [dependencies]
 serde = { version = "1.0.219", default-features = false, features = ["derive"] }

From 90752e687ad1306fdbd63c7f356a2372ab6be6be Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Tue, 21 Oct 2025 22:45:47 +0100
Subject: [PATCH 594/761] Add local CLI (#144)

---
 .github/workflows/publish-cli-docker.yml      |  64 +++++
 ...h-docker.yml => publish-server-docker.yml} |   0
 frontend/local-client-cli/.dockerignore       |   9 +
 frontend/local-client-cli/Dockerfile          |  25 ++
 frontend/local-client-cli/README.md           | 206 ++++++++++++++++
 frontend/local-client-cli/package.json        |  27 ++
 frontend/local-client-cli/src/args.test.ts    | 230 ++++++++++++++++++
 frontend/local-client-cli/src/args.ts         | 122 ++++++++++
 frontend/local-client-cli/src/cli.ts          | 207 ++++++++++++++++
 frontend/local-client-cli/src/file-watcher.ts | 102 ++++++++
 .../local-client-cli/src/logger-formatter.ts  |  86 +++++++
 .../src/node-filesystem.test.ts               | 162 ++++++++++++
 .../local-client-cli/src/node-filesystem.ts   | 203 ++++++++++++++++
 frontend/local-client-cli/tsconfig.json       |  20 ++
 frontend/local-client-cli/webpack.config.js   |  30 +++
 .../obsidian-plugin/src/vault-link-plugin.ts  |  83 +++----
 frontend/package-lock.json                    |  39 ++-
 frontend/package.json                         |   5 +-
 frontend/test-client/package.json             |  45 ++--
 scripts/check.sh                              |   7 +-
 sync-server/src/app_state/database.rs         |  17 +-
 sync-server/src/server/create_document.rs     |   9 +-
 sync-server/src/server/delete_document.rs     |   9 +-
 sync-server/src/server/update_document.rs     |   8 +-
 24 files changed, 1616 insertions(+), 99 deletions(-)
 create mode 100644 .github/workflows/publish-cli-docker.yml
 rename .github/workflows/{publish-docker.yml => publish-server-docker.yml} (100%)
 create mode 100644 frontend/local-client-cli/.dockerignore
 create mode 100644 frontend/local-client-cli/Dockerfile
 create mode 100644 frontend/local-client-cli/README.md
 create mode 100644 frontend/local-client-cli/package.json
 create mode 100644 frontend/local-client-cli/src/args.test.ts
 create mode 100644 frontend/local-client-cli/src/args.ts
 create mode 100644 frontend/local-client-cli/src/cli.ts
 create mode 100644 frontend/local-client-cli/src/file-watcher.ts
 create mode 100644 frontend/local-client-cli/src/logger-formatter.ts
 create mode 100644 frontend/local-client-cli/src/node-filesystem.test.ts
 create mode 100644 frontend/local-client-cli/src/node-filesystem.ts
 create mode 100644 frontend/local-client-cli/tsconfig.json
 create mode 100644 frontend/local-client-cli/webpack.config.js

diff --git a/.github/workflows/publish-cli-docker.yml b/.github/workflows/publish-cli-docker.yml
new file mode 100644
index 00000000..73ef1b12
--- /dev/null
+++ b/.github/workflows/publish-cli-docker.yml
@@ -0,0 +1,64 @@
+name: Publish CLI
+
+on:
+  push:
+    tags: ["*"]
+  pull_request:
+    branches: ["main"]
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}-cli
+
+jobs:
+  publish-docker:
+    runs-on: self-hosted
+
+    permissions:
+      contents: read
+      packages: write
+      id-token: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Install cosign
+        uses: sigstore/cosign-installer@59acb6260d9c0ba8f4a2f9d9b48431a222b68e20 #v3.5.0
+        with:
+          cosign-release: "v2.2.4"
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0
+
+      - name: Log into registry ${{ env.REGISTRY }}
+        uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract Docker metadata
+        id: meta
+        uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5.0.0
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+
+      - name: Build and push Docker image
+        id: build-and-push
+        uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
+        with:
+          context: frontend
+          file: frontend/local-client-cli/Dockerfile
+          platforms: linux/amd64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+      - name: Sign the published Docker image
+        env:
+          TAGS: ${{ steps.meta.outputs.tags }}
+          DIGEST: ${{ steps.build-and-push.outputs.digest }}
+        run: echo "${TAGS}" | xargs -I {} cosign sign --yes {}@${DIGEST}
diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-server-docker.yml
similarity index 100%
rename from .github/workflows/publish-docker.yml
rename to .github/workflows/publish-server-docker.yml
diff --git a/frontend/local-client-cli/.dockerignore b/frontend/local-client-cli/.dockerignore
new file mode 100644
index 00000000..0b642eb3
--- /dev/null
+++ b/frontend/local-client-cli/.dockerignore
@@ -0,0 +1,9 @@
+node_modules
+dist
+*.log
+.git
+.gitignore
+README.md
+*.test.ts
+coverage
+.vaultlink
diff --git a/frontend/local-client-cli/Dockerfile b/frontend/local-client-cli/Dockerfile
new file mode 100644
index 00000000..6b8e1d6c
--- /dev/null
+++ b/frontend/local-client-cli/Dockerfile
@@ -0,0 +1,25 @@
+FROM node:22-slim AS builder
+
+WORKDIR /build
+
+COPY . .
+
+RUN npm ci
+RUN npm run build
+
+FROM node:22-alpine
+
+LABEL org.opencontainers.image.title="VaultLink Local CLI"
+LABEL org.opencontainers.image.description="Standalone CLI for VaultLink sync client"
+LABEL org.opencontainers.image.source="https://github.com/schmelczer/vault-link"
+LABEL org.opencontainers.image.licenses="MIT"
+LABEL org.opencontainers.image.authors="andras@schmelczer.dev"
+
+COPY --from=builder /build/local-client-cli/dist/cli.js /app/cli.js
+
+WORKDIR /vault
+
+VOLUME ["/vault"]
+
+ENTRYPOINT ["node", "/app/cli.js"]
+CMD ["--help"]
diff --git a/frontend/local-client-cli/README.md b/frontend/local-client-cli/README.md
new file mode 100644
index 00000000..0585bacc
--- /dev/null
+++ b/frontend/local-client-cli/README.md
@@ -0,0 +1,206 @@
+# VaultLink Local CLI
+
+Standalone CLI for syncing VaultLink vaults to local filesystem with real-time bidirectional sync and file watching.
+
+## Installation
+
+### Docker (Recommended)
+
+```bash
+docker pull ghcr.io/schmelczer/vault-link-cli:latest
+
+docker run -v /path/to/vault:/vault \
+  ghcr.io/schmelczer/vault-link-cli:latest \
+  -l /vault \
+  -r wss://sync.example.com \
+  -t your-auth-token \
+  -v default
+```
+
+### npm
+
+```bash
+npm install -g @schmelczer/local-client-cli
+vaultlink --help
+```
+
+### From Source
+
+```bash
+cd frontend/local-client-cli
+npm install
+npm run build
+node dist/cli.js --help
+```
+
+## Usage
+
+```bash
+vaultlink \
+  --local-path ./vault \
+  --remote-uri wss://sync.example.com \
+  --token your-auth-token \
+  --vault-name default
+```
+
+## Options
+
+### Required
+
+| Option | Description |
+|--------|-------------|
+| `-l, --local-path <path>` | Local directory to sync |
+| `-r, --remote-uri <uri>` | Remote server WebSocket URI (ws:// or wss://) |
+| `-t, --token <token>` | Authentication token |
+| `-v, --vault-name <name>` | Vault name on server |
+
+### Optional
+
+| Option | Default | Description |
+|--------|---------|-------------|
+| `--sync-concurrency <number>` | `1` | Concurrent sync operations |
+| `--max-file-size-mb <number>` | `10` | Maximum file size in MB |
+| `--ignore-pattern <pattern>` | - | Glob pattern to ignore (repeatable) |
+| `--websocket-retry-interval-ms <ms>` | `3500` | WebSocket reconnection interval |
+| `--log-level <level>` | `INFO` | Log level: DEBUG, INFO, WARNING, ERROR |
+| `-h, --help` | - | Show help |
+| `-V, --version` | - | Show version |
+
+### Auto-Ignored Patterns
+
+- `.vaultlink/**` - Internal sync metadata
+- `.git/**` - Git repository files
+
+### Examples
+
+Basic usage:
+```bash
+vaultlink -l ./vault -r wss://sync.example.com -t token123 -v default
+```
+
+With ignore patterns:
+```bash
+vaultlink -l ./vault -r wss://sync.example.com -t token123 -v default \
+  --ignore-pattern "*.tmp" \
+  --ignore-pattern ".DS_Store" \
+  --ignore-pattern "node_modules/**"
+```
+
+With debug logging:
+```bash
+vaultlink -l ./vault -r wss://sync.example.com -t token123 -v default \
+  --log-level DEBUG
+```
+
+## Docker Deployment
+
+### Docker Run
+
+```bash
+docker run -d \
+  --name vaultlink-sync \
+  --restart unless-stopped \
+  -v $(pwd)/vault:/vault \
+  ghcr.io/schmelczer/vault-link-cli:latest \
+  -l /vault \
+  -r wss://your-server.com \
+  -t your-token \
+  -v default
+```
+
+### Docker Compose
+
+```yaml
+services:
+  vaultlink-cli:
+    image: ghcr.io/schmelczer/vault-link-cli:latest
+    volumes:
+      - ./vault:/vault
+    command:
+      - "-l"
+      - "/vault"
+      - "-r"
+      - "wss://sync.example.com"
+      - "-t"
+      - "your-token"
+      - "-v"
+      - "default"
+    restart: unless-stopped
+```
+
+## Health Monitoring
+
+The Docker container includes a built-in healthcheck that monitors the WebSocket connection to the server.
+
+### Healthcheck Configuration
+
+- **Interval**: 30 seconds
+- **Timeout**: 10 seconds
+- **Start period**: 30 seconds (grace period for initial connection)
+- **Retries**: 3 failed checks before marking unhealthy
+
+### How It Works
+
+The CLI writes connection status to `/tmp/vaultlink-health.json` every 10 seconds and whenever the WebSocket connection status changes. The healthcheck script verifies:
+
+1. The health file exists
+2. The status is recent (updated within last 30 seconds)
+3. The WebSocket connection is active
+
+### Checking Container Health
+
+```bash
+# View health status
+docker ps
+
+# View detailed health check logs
+docker inspect --format='{{json .State.Health}}' vaultlink-sync | jq
+```
+
+### Custom Healthcheck
+
+To override the default healthcheck in docker-compose.yml:
+
+```yaml
+services:
+  vaultlink-cli:
+    image: ghcr.io/schmelczer/vault-link-cli:latest
+    healthcheck:
+      test: ["CMD", "node", "/app/healthcheck.js"]
+      interval: 15s
+      timeout: 5s
+      retries: 5
+      start_period: 20s
+```
+
+## Development
+
+Build:
+```bash
+npm run build
+# or from the parent folder, run
+docker build -f local-client-cli/Dockerfile  .
+```
+
+Test:
+```bash
+npm test
+```
+
+Docker build:
+```bash
+cd frontend
+docker build -f local-client-cli/Dockerfile -t vault-link-cli:test .
+```
+
+## How It Works
+
+1. Creates `.vaultlink` directory for sync metadata
+2. Performs initial sync of local files to server
+3. Watches filesystem for changes using Node's `fs.watch`
+4. Syncs changes bidirectionally in real-time
+5. Handles graceful shutdown on SIGINT/SIGTERM
+
+## License
+
+MIT
diff --git a/frontend/local-client-cli/package.json b/frontend/local-client-cli/package.json
new file mode 100644
index 00000000..e03d2454
--- /dev/null
+++ b/frontend/local-client-cli/package.json
@@ -0,0 +1,27 @@
+{
+	"name": "local-client-cli",
+	"version": "0.8.2",
+	"description": "Standalone CLI for VaultLink sync client",
+	"private": false,
+	"bin": {
+		"vaultlink": "./dist/cli.js"
+	},
+	"scripts": {
+		"dev": "webpack watch --mode development",
+		"build": "webpack --mode production",
+		"test": "tsx --test src/args.test.ts src/node-filesystem.test.ts"
+	},
+	"dependencies": {
+		"commander": "^12.1.0"
+	},
+	"devDependencies": {
+		"@types/node": "^24.8.1",
+		"sync-client": "file:../sync-client",
+		"ts-loader": "^9.5.2",
+		"tslib": "2.8.1",
+		"tsx": "^4.20.5",
+		"typescript": "5.8.3",
+		"webpack": "^5.99.9",
+		"webpack-cli": "^6.0.1"
+	}
+}
diff --git a/frontend/local-client-cli/src/args.test.ts b/frontend/local-client-cli/src/args.test.ts
new file mode 100644
index 00000000..206e39b7
--- /dev/null
+++ b/frontend/local-client-cli/src/args.test.ts
@@ -0,0 +1,230 @@
+import { test } from "node:test";
+import * as assert from "node:assert/strict";
+import { parseArgs } from "./args";
+import { LogLevel } from "sync-client";
+
+test("parseArgs - parse basic arguments", () => {
+	const args = parseArgs([
+		"node",
+		"cli.js",
+		"-l",
+		"/path/to/vault",
+		"-r",
+		"https://sync.example.com",
+		"-t",
+		"mytoken",
+		"-v",
+		"default"
+	]);
+
+	assert.equal(args.localPath, "/path/to/vault");
+	assert.equal(args.remoteUri, "https://sync.example.com");
+	assert.equal(args.token, "mytoken");
+	assert.equal(args.vaultName, "default");
+});
+
+test("parseArgs - parse long form arguments", () => {
+	const args = parseArgs([
+		"node",
+		"cli.js",
+		"--local-path",
+		"/path/to/vault",
+		"--remote-uri",
+		"https://sync.example.com",
+		"--token",
+		"mytoken",
+		"--vault-name",
+		"default"
+	]);
+
+	assert.equal(args.localPath, "/path/to/vault");
+	assert.equal(args.remoteUri, "https://sync.example.com");
+	assert.equal(args.token, "mytoken");
+	assert.equal(args.vaultName, "default");
+});
+
+test("parseArgs - parse with optional arguments", () => {
+	const args = parseArgs([
+		"node",
+		"cli.js",
+		"-l",
+		"/path/to/vault",
+		"-r",
+		"https://sync.example.com",
+		"-t",
+		"mytoken",
+		"-v",
+		"default",
+		"--sync-concurrency",
+		"5",
+		"--max-file-size-mb",
+		"20"
+	]);
+
+	assert.equal(args.syncConcurrency, 5);
+	assert.equal(args.maxFileSizeMB, 20);
+});
+
+test("parseArgs - parse with multiple ignore patterns", () => {
+	const args = parseArgs([
+		"node",
+		"cli.js",
+		"-l",
+		"/path/to/vault",
+		"-r",
+		"https://sync.example.com",
+		"-t",
+		"mytoken",
+		"-v",
+		"default",
+		"--ignore-pattern",
+		".git/**",
+		"*.tmp"
+	]);
+
+	assert.deepEqual(args.ignorePatterns, [".git/**", "*.tmp"]);
+});
+
+test("parseArgs - throws on missing required arguments", () => {
+	assert.throws(() => {
+		parseArgs(["node", "cli.js", "-r", "https://sync.example.com"]);
+	}, /required option/);
+});
+
+test("parseArgs - throws on missing remote uri", () => {
+	assert.throws(() => {
+		parseArgs([
+			"node",
+			"cli.js",
+			"-l",
+			"/path/to/vault",
+			"-t",
+			"mytoken",
+			"-v",
+			"default"
+		]);
+	}, /--remote-uri/);
+});
+
+test("parseArgs - throws on missing token", () => {
+	assert.throws(() => {
+		parseArgs([
+			"node",
+			"cli.js",
+			"-l",
+			"/path/to/vault",
+			"-r",
+			"https://sync.example.com",
+			"-v",
+			"default"
+		]);
+	}, /--token/);
+});
+
+test("parseArgs - throws on missing vault name", () => {
+	assert.throws(() => {
+		parseArgs([
+			"node",
+			"cli.js",
+			"-l",
+			"/path/to/vault",
+			"-r",
+			"https://sync.example.com",
+			"-t",
+			"mytoken"
+		]);
+	}, /--vault-name/);
+});
+
+test("parseArgs - default log level is INFO", () => {
+	const args = parseArgs([
+		"node",
+		"cli.js",
+		"-l",
+		"/path/to/vault",
+		"-r",
+		"https://sync.example.com",
+		"-t",
+		"mytoken",
+		"-v",
+		"default"
+	]);
+
+	assert.equal(args.logLevel, LogLevel.INFO);
+});
+
+test("parseArgs - parse DEBUG log level", () => {
+	const args = parseArgs([
+		"node",
+		"cli.js",
+		"-l",
+		"/path/to/vault",
+		"-r",
+		"https://sync.example.com",
+		"-t",
+		"mytoken",
+		"-v",
+		"default",
+		"--log-level",
+		"DEBUG"
+	]);
+
+	assert.equal(args.logLevel, LogLevel.DEBUG);
+});
+
+test("parseArgs - parse ERROR log level", () => {
+	const args = parseArgs([
+		"node",
+		"cli.js",
+		"-l",
+		"/path/to/vault",
+		"-r",
+		"https://sync.example.com",
+		"-t",
+		"mytoken",
+		"-v",
+		"default",
+		"--log-level",
+		"ERROR"
+	]);
+
+	assert.equal(args.logLevel, LogLevel.ERROR);
+});
+
+test("parseArgs - log level is case insensitive", () => {
+	const args = parseArgs([
+		"node",
+		"cli.js",
+		"-l",
+		"/path/to/vault",
+		"-r",
+		"https://sync.example.com",
+		"-t",
+		"mytoken",
+		"-v",
+		"default",
+		"--log-level",
+		"debug"
+	]);
+
+	assert.equal(args.logLevel, LogLevel.DEBUG);
+});
+
+test("parseArgs - throws on invalid log level", () => {
+	assert.throws(() => {
+		parseArgs([
+			"node",
+			"cli.js",
+			"-l",
+			"/path/to/vault",
+			"-r",
+			"https://sync.example.com",
+			"-t",
+			"mytoken",
+			"-v",
+			"default",
+			"--log-level",
+			"INVALID"
+		]);
+	}, /Invalid log level/);
+});
diff --git a/frontend/local-client-cli/src/args.ts b/frontend/local-client-cli/src/args.ts
new file mode 100644
index 00000000..08ef2a6b
--- /dev/null
+++ b/frontend/local-client-cli/src/args.ts
@@ -0,0 +1,122 @@
+import { Command } from "commander";
+import packageJson from "../package.json";
+import { LogLevel } from "sync-client";
+
+export interface CliArgs {
+	remoteUri: string;
+	token: string;
+	vaultName: string;
+	localPath: string;
+	syncConcurrency?: number;
+	maxFileSizeMB?: number;
+	ignorePatterns?: string[];
+	webSocketRetryIntervalMs?: number;
+	logLevel: LogLevel;
+}
+
+export function parseArgs(argv: string[]): CliArgs {
+	const program = new Command();
+
+	program
+		.name("vaultlink")
+		.description(
+			"VaultLink Local CLI - Sync your vault to the local filesystem"
+		)
+		.version(packageJson.version)
+		.option("-l, --local-path <path>", "Local directory path to sync")
+		.option("-r, --remote-uri <uri>", "Remote server URI")
+		.option("-t, --token <token>", "Authentication token")
+		.option("-v, --vault-name <name>", "Vault name")
+		.option(
+			"--sync-concurrency <number>",
+			"[OPTIONAL] Number of concurrent sync operations",
+			parseInt
+		)
+		.option(
+			"--max-file-size-mb <number>",
+			"[OPTIONAL] Maximum file size in MB",
+			parseInt
+		)
+		.option(
+			"--ignore-pattern <pattern...>",
+			"[OPTIONAL] Patterns to ignore (can be specified multiple times)"
+		)
+		.option(
+			"--websocket-retry-interval-ms <number>",
+			"[OPTIONAL] WebSocket retry interval in milliseconds",
+			parseInt
+		)
+		.option(
+			"--log-level <level>",
+			"[OPTIONAL] Log level (DEBUG, INFO, WARNING, ERROR)",
+			"INFO"
+		)
+		.addHelpText(
+			"after",
+			`
+Examples:
+  $ vaultlink -l ./my-vault -r https://sync.example.com -t mytoken -v default
+  $ vaultlink -l ./my-vault -r https://sync.example.com -t mytoken -v default \\
+      --ignore-pattern ".git/**" --ignore-pattern "*.tmp"
+  $ vaultlink -l ./my-vault -r https://sync.example.com -t mytoken -v default \\
+      --log-level DEBUG
+`
+		);
+
+	program.parse(argv);
+
+	/* eslint-disable @typescript-eslint/no-unsafe-type-assertion */
+	const opts = program.opts();
+	const localPath = opts.localPath as string | undefined;
+	const remoteUri = opts.remoteUri as string | undefined;
+	const token = opts.token as string | undefined;
+	const vaultName = opts.vaultName as string | undefined;
+	const syncConcurrency = opts.syncConcurrency as number | undefined;
+	const maxFileSizeMb = opts.maxFileSizeMb as number | undefined;
+	const ignorePattern = opts.ignorePattern as string[] | undefined;
+	const websocketRetryIntervalMs = opts.websocketRetryIntervalMs as
+		| number
+		| undefined;
+	const logLevelStr = (opts.logLevel as string | undefined) ?? "INFO";
+	/* eslint-enable @typescript-eslint/no-unsafe-type-assertion */
+
+	if (localPath === undefined) {
+		throw new Error(
+			"required option '-l, --local-path <path>' not specified"
+		);
+	}
+	if (remoteUri === undefined) {
+		throw new Error("required option '--remote-uri <uri>' not specified");
+	}
+	if (token === undefined) {
+		throw new Error("required option '--token <token>' not specified");
+	}
+	if (vaultName === undefined) {
+		throw new Error("required option '--vault-name <name>' not specified");
+	}
+
+	// Validate and parse log level
+	const logLevelUpper = logLevelStr.toUpperCase();
+	const validLogLevels = Object.values(LogLevel);
+	const isLogLevel = (value: string): value is LogLevel => {
+		return (validLogLevels as readonly string[]).includes(value);
+	};
+	if (!isLogLevel(logLevelUpper)) {
+		throw new Error(
+			`Invalid log level '${logLevelStr}'. Valid values are: ${validLogLevels.join(", ")}`
+		);
+	}
+	const logLevel = logLevelUpper;
+
+	return {
+		localPath,
+		remoteUri,
+		token,
+		vaultName,
+		syncConcurrency,
+		maxFileSizeMB: maxFileSizeMb,
+		ignorePatterns: ignorePattern,
+		webSocketRetryIntervalMs: websocketRetryIntervalMs,
+		logLevel
+	};
+}
diff --git a/frontend/local-client-cli/src/cli.ts b/frontend/local-client-cli/src/cli.ts
new file mode 100644
index 00000000..5a3c6546
--- /dev/null
+++ b/frontend/local-client-cli/src/cli.ts
@@ -0,0 +1,207 @@
+import * as path from "path";
+import * as fs from "fs/promises";
+import {
+	SyncClient,
+	DEFAULT_SETTINGS,
+	LogLevel,
+	type SyncSettings,
+	type StoredDatabase
+} from "sync-client";
+import { parseArgs } from "./args";
+import { NodeFileSystemOperations } from "./node-filesystem";
+import { FileWatcher } from "./file-watcher";
+import { formatLogLine, colorize, styleText } from "./logger-formatter";
+import packageJson from "../package.json";
+
+const LOG_LEVEL_ORDER = {
+	[LogLevel.DEBUG]: 0,
+	[LogLevel.INFO]: 1,
+	[LogLevel.WARNING]: 2,
+	[LogLevel.ERROR]: 3
+};
+
+async function main(): Promise<void> {
+	const args = parseArgs(process.argv);
+	const absolutePath = path.resolve(args.localPath);
+
+	try {
+		const stats = await fs.stat(absolutePath);
+		if (!stats.isDirectory()) {
+			console.error(
+				colorize(`Error: ${absolutePath} is not a directory`, "red")
+			);
+			process.exit(1);
+		}
+	} catch (error) {
+		console.error(
+			colorize(
+				`Error: Cannot access directory ${absolutePath}: ${error instanceof Error ? error.message : String(error)}`,
+				"red"
+			)
+		);
+		process.exit(1);
+	}
+
+	console.log(
+		styleText("VaultLink Local CLI", "bold", "cyan") +
+			colorize(` v${packageJson.version}`, "dim")
+	);
+	console.log(colorize("=".repeat(50), "dim"));
+	console.log(
+		`${colorize("Local path:", "dim")} ${colorize(absolutePath, "green")}`
+	);
+	console.log(
+		`${colorize("Remote URI:", "dim")} ${colorize(args.remoteUri, "cyan")}`
+	);
+	console.log(
+		`${colorize("Vault name:", "dim")} ${colorize(args.vaultName, "green")}`
+	);
+	console.log("");
+
+	const dataDir = path.join(absolutePath, ".vaultlink");
+	const dataFile = path.join(dataDir, "sync-data.json");
+
+	await fs.mkdir(dataDir, { recursive: true });
+
+	const fileSystem = new NodeFileSystemOperations(absolutePath);
+
+	const ignorePatterns = [
+		...(args.ignorePatterns ?? []),
+		".vaultlink/**",
+		".git/**"
+	];
+
+	const settings: SyncSettings = {
+		remoteUri: args.remoteUri,
+		token: args.token,
+		vaultName: args.vaultName,
+		syncConcurrency:
+			args.syncConcurrency ?? DEFAULT_SETTINGS.syncConcurrency,
+		maxFileSizeMB: args.maxFileSizeMB ?? DEFAULT_SETTINGS.maxFileSizeMB,
+		ignorePatterns,
+		webSocketRetryIntervalMs:
+			args.webSocketRetryIntervalMs ??
+			DEFAULT_SETTINGS.webSocketRetryIntervalMs,
+		isSyncEnabled: true
+	};
+
+	const client = await SyncClient.create({
+		fs: fileSystem,
+		persistence: {
+			load: async () => {
+				let database: Partial<StoredDatabase> | undefined = undefined;
+				try {
+					const content = await fs.readFile(dataFile, "utf-8");
+					// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+					database = JSON.parse(content) as Partial<StoredDatabase>;
+				} catch {
+					console.error(
+						colorize(
+							`Cannot read data file at ${dataFile}`,
+							"yellow"
+						)
+					);
+				}
+
+				return {
+					settings,
+					database
+				};
+			},
+			save: async ({ database: persistedDatabase }) => {
+				// settings can't be updated when running with this CLI
+				await fs.writeFile(
+					dataFile,
+					JSON.stringify(persistedDatabase, null, 2)
+				);
+			}
+		},
+		nativeLineEndings: process.platform === "win32" ? "\r\n" : "\n"
+	});
+
+	// Add colored log formatter with level filtering
+	client.logger.addOnMessageListener((logLine) => {
+		// Only show messages at or above the configured log level
+		if (LOG_LEVEL_ORDER[logLine.level] >= LOG_LEVEL_ORDER[args.logLevel]) {
+			console.log(formatLogLine(logLine));
+		}
+	});
+
+	client.logger.info("Starting sync client");
+
+	const fileWatcher = new FileWatcher(absolutePath, client);
+
+	client.addWebSocketStatusChangeListener(() => {
+		client.logger.info("WebSocket status changed");
+	});
+
+	client.addRemainingSyncOperationsListener((remaining) => {
+		if (remaining === 0) {
+			client.logger.info("All sync operations completed");
+		} else {
+			client.logger.info(`${remaining} sync operations remaining`);
+		}
+	});
+
+	const gracefulShutdown = async (signal: string): Promise<void> => {
+		console.log(
+			colorize(
+				`\n${signal} received. Shutting down gracefully...`,
+				"yellow"
+			)
+		);
+
+		fileWatcher.stop();
+		await client.waitAndStop();
+		console.log(colorize("Shutdown complete", "green"));
+		process.exit(0);
+	};
+
+	process.on("SIGINT", () => {
+		void gracefulShutdown("SIGINT");
+	});
+	process.on("SIGTERM", () => {
+		void gracefulShutdown("SIGTERM");
+	});
+
+	try {
+		const connectionStatus = await client.checkConnection();
+		if (!connectionStatus.isSuccessful) {
+			console.error(
+				colorize(
+					`Error: Cannot connect to server: ${connectionStatus.serverMessage}`,
+					"red"
+				)
+			);
+			process.exit(1);
+		}
+
+		console.log(`${colorize("✓", "green")} Server connection successful`);
+		console.log(colorize("Press Ctrl+C to stop", "dim"));
+		console.log("");
+
+		await client.start();
+		fileWatcher.start();
+	} catch (error) {
+		console.error(
+			colorize(
+				`Fatal error: ${error instanceof Error ? error.message : String(error)}`,
+				"red"
+			)
+		);
+
+		fileWatcher.stop();
+		await client.waitAndStop();
+		process.exit(1);
+	}
+}
+
+main().catch((error: unknown) => {
+	console.error(
+		colorize(
+			`Unexpected error: ${error instanceof Error ? error.message : String(error)}`,
+			"red"
+		)
+	);
+	process.exit(1);
+});
diff --git a/frontend/local-client-cli/src/file-watcher.ts b/frontend/local-client-cli/src/file-watcher.ts
new file mode 100644
index 00000000..65577bc4
--- /dev/null
+++ b/frontend/local-client-cli/src/file-watcher.ts
@@ -0,0 +1,102 @@
+import * as fs from "fs";
+import * as path from "path";
+import type { SyncClient, RelativePath } from "sync-client";
+
+export class FileWatcher {
+	private watcher: fs.FSWatcher | undefined;
+	private isRunning = false;
+
+	public constructor(
+		private readonly basePath: string,
+		private readonly client: SyncClient
+	) {}
+
+	public start(): void {
+		if (this.isRunning) {
+			return;
+		}
+
+		this.isRunning = true;
+
+		this.watcher = fs.watch(
+			this.basePath,
+			{ recursive: true },
+			(eventType, filename) => {
+				if (filename === null || filename.length === 0) {
+					return;
+				}
+
+				// Convert to forward slashes for consistency
+				const relativePath = this.toUnixPath(filename);
+
+				if (eventType === "rename") {
+					this.handleRenameOrDelete(relativePath);
+				} else {
+					// Must be "change" event
+					this.handleChange(relativePath);
+				}
+			}
+		);
+
+		this.client.logger.info("File watcher started");
+	}
+
+	public stop(): void {
+		if (this.watcher !== undefined) {
+			this.watcher.close();
+			this.watcher = undefined;
+		}
+		this.isRunning = false;
+		this.client.logger.info("File watcher stopped");
+	}
+
+	private handleChange(relativePath: RelativePath): void {
+		this.client
+			.syncLocallyUpdatedFile({ relativePath })
+			.catch((err: unknown) => {
+				this.client.logger.error(
+					`Failed to sync updated file ${relativePath}: ${err instanceof Error ? err.message : String(err)}`
+				);
+			});
+	}
+
+	private handleRenameOrDelete(relativePath: RelativePath): void {
+		const fullPath = path.join(this.basePath, relativePath);
+
+		fs.access(fullPath, fs.constants.F_OK, (accessError) => {
+			if (accessError) {
+				this.client
+					.syncLocallyDeletedFile(relativePath)
+					.catch((deleteErr: unknown) => {
+						this.client.logger.error(
+							`Failed to sync deleted file ${relativePath}: ${deleteErr instanceof Error ? deleteErr.message : String(deleteErr)}`
+						);
+					});
+			} else {
+				fs.stat(fullPath, (statErr, stats) => {
+					if (statErr !== null || !stats.isFile()) {
+						return;
+					}
+
+					this.client
+						.syncLocallyCreatedFile(relativePath)
+						.catch((createErr: unknown) => {
+							this.client.logger.error(
+								`Failed to sync created file ${relativePath}: ${createErr instanceof Error ? createErr.message : String(createErr)}`
+							);
+						});
+				});
+			}
+		});
+	}
+
+	/**
+	 * Convert a native platform path to forward slashes
+	 */
+	private toUnixPath(nativePath: string): string {
+		if (path.sep === "\\") {
+			return nativePath.replace(/\\/g, "/");
+		}
+		return nativePath;
+	}
+}
diff --git a/frontend/local-client-cli/src/logger-formatter.ts b/frontend/local-client-cli/src/logger-formatter.ts
new file mode 100644
index 00000000..994adc74
--- /dev/null
+++ b/frontend/local-client-cli/src/logger-formatter.ts
@@ -0,0 +1,86 @@
+import { LogLevel, type LogLine } from "sync-client";
+
+// ANSI color codes
+export const colors = {
+	reset: "\x1b[0m",
+	bold: "\x1b[1m",
+	dim: "\x1b[2m",
+
+	// Foreground colors
+	red: "\x1b[31m",
+	green: "\x1b[32m",
+	yellow: "\x1b[33m",
+	blue: "\x1b[34m",
+	magenta: "\x1b[35m",
+	cyan: "\x1b[36m",
+	gray: "\x1b[90m"
+} as const;
+
+export function colorize(text: string, color: keyof typeof colors): string {
+	return `${colors[color]}${text}${colors.reset}`;
+}
+
+/**
+ * Helper function to apply multiple color modifiers to text
+ */
+export function styleText(
+	text: string,
+	...modifiers: (keyof typeof colors)[]
+): string {
+	const prefix = modifiers.map((m) => colors[m]).join("");
+	return `${prefix}${text}${colors.reset}`;
+}
+
+function formatTimestamp(date: Date): string {
+	const [time] = date.toTimeString().split(" ");
+	const ms = date.getMilliseconds().toString().padStart(3, "0");
+	return colorize(`${time}.${ms}`, "gray");
+}
+
+function formatLevel(level: LogLevel): string {
+	const levelStr = level.padEnd(7);
+	switch (level) {
+		case LogLevel.DEBUG:
+			return colorize(levelStr, "cyan");
+		case LogLevel.INFO:
+			return colorize(levelStr, "green");
+		case LogLevel.WARNING:
+			return colorize(levelStr, "yellow");
+		case LogLevel.ERROR:
+			return colorize(levelStr, "red");
+	}
+}
+
+function formatMessage(message: string, level: LogLevel): string {
+	// Highlight important parts of the message
+	let formatted = message;
+
+	// Highlight file paths
+	formatted = formatted.replace(
+		/(['"])([^'"]*?\.(json|txt|md|js|ts))(['"])/g,
+		(_, q1, path, _ext, q2) => q1 + colorize(path, "magenta") + q2
+	);
+
+	// Highlight numbers
+	formatted = formatted.replace(/\b(\d+)\b/g, (num) => colorize(num, "cyan"));
+
+	// Highlight patterns like /regex/
+	formatted = formatted.replace(/(\/\^[^$]*\$\/)/g, (pattern) =>
+		colorize(pattern, "yellow")
+	);
+
+	// Make error messages bold
+	if (level === LogLevel.ERROR) {
+		formatted = colorize(formatted, "bold");
+	}
+
+	return formatted;
+}
+
+export function formatLogLine(logLine: LogLine): string {
+	const timestamp = formatTimestamp(logLine.timestamp);
+	const level = formatLevel(logLine.level);
+	const message = formatMessage(logLine.message, logLine.level);
+
+	return `${timestamp} ${level} ${message}`;
+}
diff --git a/frontend/local-client-cli/src/node-filesystem.test.ts b/frontend/local-client-cli/src/node-filesystem.test.ts
new file mode 100644
index 00000000..4a72da94
--- /dev/null
+++ b/frontend/local-client-cli/src/node-filesystem.test.ts
@@ -0,0 +1,162 @@
+import { test } from "node:test";
+import * as assert from "node:assert/strict";
+import * as fs from "fs/promises";
+import * as path from "path";
+import * as os from "os";
+import { NodeFileSystemOperations } from "./node-filesystem";
+
+test("NodeFileSystemOperations - read and write files", async () => {
+	const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "vaultlink-test-"));
+	const fsOps = new NodeFileSystemOperations(tempDir);
+
+	try {
+		const content = new TextEncoder().encode("Hello, world!");
+		await fsOps.write("test.txt", content);
+
+		const readContent = await fsOps.read("test.txt");
+		assert.equal(new TextDecoder().decode(readContent), "Hello, world!");
+	} finally {
+		await fs.rm(tempDir, { recursive: true, force: true });
+	}
+});
+
+test("NodeFileSystemOperations - create nested directories with forward slashes", async () => {
+	const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "vaultlink-test-"));
+	const fsOps = new NodeFileSystemOperations(tempDir);
+
+	try {
+		const content = new TextEncoder().encode("Nested file");
+		// Always use forward slashes in API
+		await fsOps.write("dir1/dir2/test.txt", content);
+
+		const readContent = await fsOps.read("dir1/dir2/test.txt");
+		assert.equal(new TextDecoder().decode(readContent), "Nested file");
+	} finally {
+		await fs.rm(tempDir, { recursive: true, force: true });
+	}
+});
+
+test("NodeFileSystemOperations - exists with forward slashes", async () => {
+	const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "vaultlink-test-"));
+	const fsOps = new NodeFileSystemOperations(tempDir);
+
+	try {
+		assert.equal(await fsOps.exists("test.txt"), false);
+
+		await fsOps.write("test.txt", new TextEncoder().encode("test"));
+
+		assert.equal(await fsOps.exists("test.txt"), true);
+	} finally {
+		await fs.rm(tempDir, { recursive: true, force: true });
+	}
+});
+
+test("NodeFileSystemOperations - delete with forward slashes", async () => {
+	const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "vaultlink-test-"));
+	const fsOps = new NodeFileSystemOperations(tempDir);
+
+	try {
+		await fsOps.write("test.txt", new TextEncoder().encode("test"));
+		assert.equal(await fsOps.exists("test.txt"), true);
+
+		await fsOps.delete("test.txt");
+		assert.equal(await fsOps.exists("test.txt"), false);
+	} finally {
+		await fs.rm(tempDir, { recursive: true, force: true });
+	}
+});
+
+test("NodeFileSystemOperations - rename with forward slashes", async () => {
+	const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "vaultlink-test-"));
+	const fsOps = new NodeFileSystemOperations(tempDir);
+
+	try {
+		const content = new TextEncoder().encode("test content");
+		await fsOps.write("old.txt", content);
+
+		await fsOps.rename("old.txt", "new.txt");
+
+		assert.equal(await fsOps.exists("old.txt"), false);
+		assert.equal(await fsOps.exists("new.txt"), true);
+
+		const readContent = await fsOps.read("new.txt");
+		assert.equal(new TextDecoder().decode(readContent), "test content");
+	} finally {
+		await fs.rm(tempDir, { recursive: true, force: true });
+	}
+});
+
+test("NodeFileSystemOperations - rename to nested path with forward slashes", async () => {
+	const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "vaultlink-test-"));
+	const fsOps = new NodeFileSystemOperations(tempDir);
+
+	try {
+		const content = new TextEncoder().encode("test content");
+		await fsOps.write("old.txt", content);
+
+		await fsOps.rename("old.txt", "dir1/dir2/new.txt");
+
+		assert.equal(await fsOps.exists("old.txt"), false);
+		assert.equal(await fsOps.exists("dir1/dir2/new.txt"), true);
+	} finally {
+		await fs.rm(tempDir, { recursive: true, force: true });
+	}
+});
+
+test("NodeFileSystemOperations - getFileSize", async () => {
+	const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "vaultlink-test-"));
+	const fsOps = new NodeFileSystemOperations(tempDir);
+
+	try {
+		const content = new TextEncoder().encode("Hello!");
+		await fsOps.write("test.txt", content);
+
+		const size = await fsOps.getFileSize("test.txt");
+		assert.equal(size, content.length);
+	} finally {
+		await fs.rm(tempDir, { recursive: true, force: true });
+	}
+});
+
+test("NodeFileSystemOperations - atomicUpdateText", async () => {
+	const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "vaultlink-test-"));
+	const fsOps = new NodeFileSystemOperations(tempDir);
+
+	try {
+		await fsOps.write("test.txt", new TextEncoder().encode("Hello"));
+
+		const result = await fsOps.atomicUpdateText("test.txt", (current) => ({
+			text: current.text + " World",
+			cursors: []
+		}));
+
+		assert.equal(result, "Hello World");
+
+		const content = await fsOps.read("test.txt");
+		assert.equal(new TextDecoder().decode(content), "Hello World");
+	} finally {
+		await fs.rm(tempDir, { recursive: true, force: true });
+	}
+});
+
+test("NodeFileSystemOperations - handles paths with forward slashes on all platforms", async () => {
+	const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "vaultlink-test-"));
+	const fsOps = new NodeFileSystemOperations(tempDir);
+
+	try {
+		// API should always accept forward slashes
+		const testPath = "deep/nested/directory/file.txt";
+		const content = new TextEncoder().encode("test");
+
+		await fsOps.write(testPath, content);
+		assert.equal(await fsOps.exists(testPath), true);
+
+		const readContent = await fsOps.read(testPath);
+		assert.equal(new TextDecoder().decode(readContent), "test");
+
+		await fsOps.delete(testPath);
+		assert.equal(await fsOps.exists(testPath), false);
+	} finally {
+		await fs.rm(tempDir, { recursive: true, force: true });
+	}
+});
diff --git a/frontend/local-client-cli/src/node-filesystem.ts b/frontend/local-client-cli/src/node-filesystem.ts
new file mode 100644
index 00000000..252385c9
--- /dev/null
+++ b/frontend/local-client-cli/src/node-filesystem.ts
@@ -0,0 +1,203 @@
+import * as fs from "fs/promises";
+import type { Dirent } from "fs";
+import * as path from "path";
+import type { FileSystemOperations, RelativePath } from "sync-client";
+import type { TextWithCursors } from "reconcile-text";
+
+export class NodeFileSystemOperations implements FileSystemOperations {
+	public constructor(private readonly basePath: string) {}
+
+	public async listFilesRecursively(
+		directory: RelativePath | undefined
+	): Promise<RelativePath[]> {
+		const files: RelativePath[] = [];
+		await this.walkDirectory(
+			directory !== undefined ? this.toNativePath(directory) : "",
+			files
+		);
+		return files;
+	}
+
+	public async read(relativePath: RelativePath): Promise<Uint8Array> {
+		const fullPath = path.join(
+			this.basePath,
+			this.toNativePath(relativePath)
+		);
+		try {
+			return await fs.readFile(fullPath);
+		} catch (error) {
+			throw new Error(
+				`Failed to read file ${fullPath}: ${error instanceof Error ? error.message : String(error)}`
+			);
+		}
+	}
+
+	public async write(
+		relativePath: RelativePath,
+		content: Uint8Array
+	): Promise<void> {
+		const fullPath = path.join(
+			this.basePath,
+			this.toNativePath(relativePath)
+		);
+		const dir = path.dirname(fullPath);
+
+		try {
+			await fs.mkdir(dir, { recursive: true });
+			await fs.writeFile(fullPath, content);
+		} catch (error) {
+			throw new Error(
+				`Failed to write file ${fullPath}: ${error instanceof Error ? error.message : String(error)}`
+			);
+		}
+	}
+
+	public async atomicUpdateText(
+		relativePath: RelativePath,
+		updater: (current: TextWithCursors) => TextWithCursors
+	): Promise<string> {
+		const fullPath = path.join(
+			this.basePath,
+			this.toNativePath(relativePath)
+		);
+
+		try {
+			const currentContent = await fs.readFile(fullPath, "utf-8");
+			const result = updater({ text: currentContent, cursors: [] });
+			await fs.writeFile(fullPath, result.text, "utf-8");
+			return result.text;
+		} catch (error) {
+			throw new Error(
+				`Failed to atomically update file ${fullPath}: ${error instanceof Error ? error.message : String(error)}`
+			);
+		}
+	}
+
+	public async getFileSize(relativePath: RelativePath): Promise<number> {
+		const fullPath = path.join(
+			this.basePath,
+			this.toNativePath(relativePath)
+		);
+		try {
+			const stats = await fs.stat(fullPath);
+			return stats.size;
+		} catch (error) {
+			throw new Error(
+				`Failed to get file size for ${fullPath}: ${error instanceof Error ? error.message : String(error)}`
+			);
+		}
+	}
+
+	public async exists(relativePath: RelativePath): Promise<boolean> {
+		const fullPath = path.join(
+			this.basePath,
+			this.toNativePath(relativePath)
+		);
+		try {
+			await fs.access(fullPath);
+			return true;
+		} catch {
+			return false;
+		}
+	}
+
+	public async createDirectory(relativePath: RelativePath): Promise<void> {
+		const fullPath = path.join(
+			this.basePath,
+			this.toNativePath(relativePath)
+		);
+		try {
+			await fs.mkdir(fullPath, { recursive: false });
+		} catch (error) {
+			throw new Error(
+				`Failed to create directory ${fullPath}: ${error instanceof Error ? error.message : String(error)}`
+			);
+		}
+	}
+
+	public async delete(relativePath: RelativePath): Promise<void> {
+		const fullPath = path.join(
+			this.basePath,
+			this.toNativePath(relativePath)
+		);
+		try {
+			await fs.unlink(fullPath);
+		} catch (error) {
+			throw new Error(
+				`Failed to delete file ${fullPath}: ${error instanceof Error ? error.message : String(error)}`
+			);
+		}
+	}
+
+	public async rename(
+		oldPath: RelativePath,
+		newPath: RelativePath
+	): Promise<void> {
+		const oldFullPath = path.join(
+			this.basePath,
+			this.toNativePath(oldPath)
+		);
+		const newFullPath = path.join(
+			this.basePath,
+			this.toNativePath(newPath)
+		);
+		const newDir = path.dirname(newFullPath);
+
+		try {
+			await fs.mkdir(newDir, { recursive: true });
+			await fs.rename(oldFullPath, newFullPath);
+		} catch (error) {
+			throw new Error(
+				`Failed to rename file from ${oldFullPath} to ${newFullPath}: ${error instanceof Error ? error.message : String(error)}`
+			);
+		}
+	}
+
+	private async walkDirectory(
+		relativePath: string,
+		files: RelativePath[]
+	): Promise<void> {
+		const fullPath = path.join(this.basePath, relativePath);
+		let entries: Dirent[] = [];
+
+		try {
+			entries = await fs.readdir(fullPath, { withFileTypes: true });
+		} catch (error) {
+			throw new Error(
+				`Failed to read directory ${fullPath}: ${error instanceof Error ? error.message : String(error)}`
+			);
+		}
+
+		for (const entry of entries) {
+			const entryName = entry.name;
+			const entryRelativePath = path.join(relativePath, entryName);
+
+			if (entry.isDirectory()) {
+				await this.walkDirectory(entryRelativePath, files);
+			} else if (entry.isFile()) {
+				// Always return forward slashes
+				files.push(this.toUnixPath(entryRelativePath));
+			}
+		}
+	}
+
+	/**
+	 * Convert a forward-slash path to native platform path separators
+	 */
+	private toNativePath(relativePath: string): string {
+		if (path.sep === "\\") {
+			return relativePath.replace(/\//g, "\\");
+		}
+		return relativePath;
+	}
+
+	/**
+	 * Convert a native platform path to forward slashes
+	 */
+	private toUnixPath(nativePath: string): string {
+		if (path.sep === "\\") {
+			return nativePath.replace(/\\/g, "/");
+		}
+		return nativePath;
+	}
+}
diff --git a/frontend/local-client-cli/tsconfig.json b/frontend/local-client-cli/tsconfig.json
new file mode 100644
index 00000000..cfd2df7f
--- /dev/null
+++ b/frontend/local-client-cli/tsconfig.json
@@ -0,0 +1,20 @@
+{
+    "compilerOptions": {
+        "target": "ES2020",
+        "module": "commonjs",
+        "lib": ["ES2020"],
+        "outDir": "./dist",
+        "rootDir": "./src",
+        "strict": true,
+        "esModuleInterop": true,
+        "skipLibCheck": true,
+        "forceConsistentCasingInFileNames": true,
+        "moduleResolution": "node",
+        "resolveJsonModule": true,
+        "declaration": true,
+        "declarationMap": true,
+        "sourceMap": true
+    },
+    "include": ["src/**/*"],
+    "exclude": ["node_modules", "dist"]
+}
diff --git a/frontend/local-client-cli/webpack.config.js b/frontend/local-client-cli/webpack.config.js
new file mode 100644
index 00000000..e17754b2
--- /dev/null
+++ b/frontend/local-client-cli/webpack.config.js
@@ -0,0 +1,30 @@
+const path = require("path");
+const webpack = require("webpack");
+
+module.exports = {
+		entry: "./src/cli.ts",
+		target: "node",
+		mode: "production",
+		optimization: {
+			minimize: false
+		},
+		module: {
+			rules: [
+				{
+					test: /\.ts$/,
+					use: "ts-loader"
+				}
+			]
+		},
+		resolve: {
+			extensions: [".ts", ".js"]
+		},
+		output: {
+			globalObject: "this",
+			filename: "cli.js",
+			path: path.resolve(__dirname, "dist")
+		},
+		plugins: [
+		new webpack.BannerPlugin({ banner: "#!/usr/bin/env node", raw: true })
+		]
+};
diff --git a/frontend/obsidian-plugin/src/vault-link-plugin.ts b/frontend/obsidian-plugin/src/vault-link-plugin.ts
index ce3f23ac..25a03ff6 100644
--- a/frontend/obsidian-plugin/src/vault-link-plugin.ts
+++ b/frontend/obsidian-plugin/src/vault-link-plugin.ts
@@ -50,51 +50,46 @@ export default class VaultLinkPlugin extends Plugin {
 			".trash/**"
 		);
 
+		plausibleInit({
+			domain: "vault-link",
+			endpoint: "https://stats.schmelczer.dev/status",
+			autoCapturePageviews: true,
+			captureOnLocalhost: true,
+			logging: true
+		});
+
+		Sentry.init({
+			dsn: "https://56accd39d92442e788a457a04623cf57@bugs.schmelczer.dev/1",
+			skipBrowserExtensionCheck: false
+		});
+
+		const onError = (event: ErrorEvent): void => {
+			Sentry.captureException(event.error, {
+				extra: {
+					message: event.message,
+					filename: event.filename,
+					lineno: event.lineno,
+					colno: event.colno
+				}
+			});
+		};
+		window.addEventListener("error", onError);
+		this.disposables.push(() => {
+			window.removeEventListener("error", onError);
+		});
+
+		const onUnhandledRejection = (event: PromiseRejectionEvent): void => {
+			Sentry.captureException(event.reason);
+		};
+		window.addEventListener("unhandledrejection", onUnhandledRejection);
+		this.disposables.push(() => {
+			window.removeEventListener(
+				"unhandledrejection",
+				onUnhandledRejection
+			);
+		});
+
 		const isDebugBuild = process.env.NODE_ENV === "development";
-
-		if (!isDebugBuild) {
-			plausibleInit({
-				domain: "vault-link",
-				endpoint: "https://stats.schmelczer.dev/status",
-				autoCapturePageviews: true,
-				captureOnLocalhost: true,
-				logging: true
-			});
-
-			Sentry.init({
-				dsn: "https://56accd39d92442e788a457a04623cf57@bugs.schmelczer.dev/1",
-				skipBrowserExtensionCheck: false
-			});
-
-			const onError = (event: ErrorEvent): void => {
-				Sentry.captureException(event.error, {
-					extra: {
-						message: event.message,
-						filename: event.filename,
-						lineno: event.lineno,
-						colno: event.colno
-					}
-				});
-			};
-			window.addEventListener("error", onError);
-			this.disposables.push(() => {
-				window.removeEventListener("error", onError);
-			});
-
-			const onUnhandledRejection = (
-				event: PromiseRejectionEvent
-			): void => {
-				Sentry.captureException(event.reason);
-			};
-			window.addEventListener("unhandledrejection", onUnhandledRejection);
-			this.disposables.push(() => {
-				window.removeEventListener(
-					"unhandledrejection",
-					onUnhandledRejection
-				);
-			});
-		}
-
 		const debugOptions = isDebugBuild
 			? {
 					fetch: debugging.slowFetchFactory(1),
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 4df70bd5..6536a81e 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -8,7 +8,8 @@
 			"workspaces": [
 				"sync-client",
 				"obsidian-plugin",
-				"test-client"
+				"test-client",
+				"local-client-cli"
 			],
 			"devDependencies": {
 				"concurrently": "^9.2.1",
@@ -19,6 +20,33 @@
 				"typescript-eslint": "8.41.0"
 			}
 		},
+		"local-client-cli": {
+			"version": "0.8.2",
+			"dependencies": {
+				"commander": "^12.1.0"
+			},
+			"bin": {
+				"vaultlink": "dist/cli.js"
+			},
+			"devDependencies": {
+				"@types/node": "^24.8.1",
+				"sync-client": "file:../sync-client",
+				"ts-loader": "^9.5.2",
+				"tslib": "2.8.1",
+				"tsx": "^4.20.5",
+				"typescript": "5.8.3",
+				"webpack": "^5.99.9",
+				"webpack-cli": "^6.0.1"
+			}
+		},
+		"local-client-cli/node_modules/commander": {
+			"version": "12.1.0",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-12.1.0.tgz",
+			"integrity": "sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==",
+			"engines": {
+				"node": ">=18"
+			}
+		},
 		"node_modules/@codemirror/state": {
 			"version": "6.5.2",
 			"dev": true,
@@ -1612,6 +1640,8 @@
 			"dev": true,
 			"hasInstallScript": true,
 			"license": "MIT",
+			"optional": true,
+			"peer": true,
 			"dependencies": {
 				"node-gyp-build": "^4.3.0"
 			},
@@ -2793,6 +2823,10 @@
 				"node": ">=8.9.0"
 			}
 		},
+		"node_modules/local-client-cli": {
+			"resolved": "local-client-cli",
+			"link": true
+		},
 		"node_modules/locate-path": {
 			"version": "6.0.0",
 			"dev": true,
@@ -2995,6 +3029,8 @@
 			"version": "4.8.4",
 			"dev": true,
 			"license": "MIT",
+			"optional": true,
+			"peer": true,
 			"bin": {
 				"node-gyp-build": "bin.js",
 				"node-gyp-build-optional": "optional.js",
@@ -4658,7 +4694,6 @@
 			},
 			"devDependencies": {
 				"@types/node": "^24.8.1",
-				"bufferutil": "^4.0.9",
 				"sync-client": "file:../sync-client",
 				"ts-loader": "^9.5.2",
 				"tslib": "2.8.1",
diff --git a/frontend/package.json b/frontend/package.json
index ceb1a3f3..e105b2fe 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -4,7 +4,8 @@
 	"workspaces": [
 		"sync-client",
 		"obsidian-plugin",
-		"test-client"
+		"test-client",
+		"local-client-cli"
 	],
 	"prettier": {
 		"trailingComma": "none",
@@ -16,7 +17,7 @@
 		"build": "npm run build --workspaces",
 		"dev": "concurrently --kill-others \"npm run dev -w sync-client\" \"npm run dev -w obsidian-plugin\"",
 		"test": "npm run test --workspaces",
-		"lint": "eslint --fix sync-client obsidian-plugin test-client && prettier --write \"**/*.ts\"",
+		"lint": "eslint --fix sync-client obsidian-plugin test-client local-client-cli && prettier --write \"**/*.ts\"",
 		"update": "ncu -u -ws"
 	},
 	"devDependencies": {
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index fbcb509d..7314cf18 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -1,25 +1,24 @@
 {
-    "name": "test-client",
-    "version": "0.9.0",
-    "private": true,
-    "bin": {
-        "test-client": "./dist/cli.js"
-    },
-    "scripts": {
-        "dev": "webpack watch --mode development",
-        "build": "webpack --mode production",
-        "test": "tsx --test src/**/*.test.ts"
-    },
-    "devDependencies": {
-        "@types/node": "^24.8.1",
-        "bufferutil": "^4.0.9",
-        "sync-client": "file:../sync-client",
-        "ts-loader": "^9.5.2",
-        "tslib": "2.8.1",
-        "tsx": "^4.20.5",
-        "typescript": "5.8.3",
-        "uuid": "^11.1.0",
-        "webpack": "^5.99.9",
-        "webpack-cli": "^6.0.1"
-    }
+	"name": "test-client",
+	"version": "0.9.0",
+	"private": true,
+	"bin": {
+		"test-client": "./dist/cli.js"
+	},
+	"scripts": {
+		"dev": "webpack watch --mode development",
+		"build": "webpack --mode production",
+		"test": "tsx --test src/**/*.test.ts"
+	},
+	"devDependencies": {
+		"@types/node": "^24.8.1",
+		"sync-client": "file:../sync-client",
+		"ts-loader": "^9.5.2",
+		"tslib": "2.8.1",
+		"tsx": "^4.20.5",
+		"typescript": "5.8.3",
+		"uuid": "^11.1.0",
+		"webpack": "^5.99.9",
+		"webpack-cli": "^6.0.1"
+	}
 }
diff --git a/scripts/check.sh b/scripts/check.sh
index 576ed0ec..0a28653c 100755
--- a/scripts/check.sh
+++ b/scripts/check.sh
@@ -36,6 +36,11 @@ if [[ "$FIX_MODE" == false ]] && [[ $(git status --porcelain) ]]; then
     exit 1
 fi
 
-echo "Success"
 
 cd ..
+
+if [[ "$FIX_MODE" == true ]]; then
+    $0
+fi
+
+echo "Success"
diff --git a/sync-server/src/app_state/database.rs b/sync-server/src/app_state/database.rs
index 2fc47ccb..346fea38 100644
--- a/sync-server/src/app_state/database.rs
+++ b/sync-server/src/app_state/database.rs
@@ -370,11 +370,12 @@ impl Database {
         .context("Cannot fetch document version")
     }
 
+    // inserting the document must be the last step of the transaction if there's one
     pub async fn insert_document_version(
         &self,
         vault_id: &VaultId,
         version: &StoredDocumentVersion,
-        transaction: Option<&mut Transaction<'_>>,
+        transaction: Option<Transaction<'_>>,
     ) -> Result<()> {
         let document_id = version.document_id.as_hyphenated();
         let query = sqlx::query!(
@@ -401,14 +402,22 @@ impl Database {
             version.device_id
         );
 
-        if let Some(transaction) = transaction {
-            query.execute(&mut **transaction).await
+        if let Some(mut transaction) = transaction {
+            query
+                .execute(&mut *transaction)
+                .await
+                .context("Cannot insert document version")?;
+
+            transaction
+                .commit()
+                .await
+                .context("Failed to commit transaction")?;
         } else {
             query
                 .execute(&self.get_connection_pool(vault_id).await?)
                 .await
+                .context("Cannot insert document version")?;
         }
-        .context("Cannot insert document version")?;
 
         self.broadcasts
             .send_document_update(
diff --git a/sync-server/src/server/create_document.rs b/sync-server/src/server/create_document.rs
index d8083410..0f698538 100644
--- a/sync-server/src/server/create_document.rs
+++ b/sync-server/src/server/create_document.rs
@@ -1,4 +1,3 @@
-use anyhow::Context as _;
 use axum::{
     Extension, Json,
     extract::{Path, State},
@@ -82,15 +81,9 @@ pub async fn create_document(
 
     state
         .database
-        .insert_document_version(&vault_id, &new_version, Some(&mut transaction))
+        .insert_document_version(&vault_id, &new_version, Some(transaction))
         .await
         .map_err(server_error)?;
 
-    transaction
-        .commit()
-        .await
-        .context("Failed to commit successful transaction")
-        .map_err(server_error)?;
-
     Ok(Json(new_version.into()))
 }
diff --git a/sync-server/src/server/delete_document.rs b/sync-server/src/server/delete_document.rs
index fa9d578c..f7080417 100644
--- a/sync-server/src/server/delete_document.rs
+++ b/sync-server/src/server/delete_document.rs
@@ -1,4 +1,3 @@
-use anyhow::Context as _;
 use axum::{
     Extension, Json,
     extract::{Path, State},
@@ -71,15 +70,9 @@ pub async fn delete_document(
 
     state
         .database
-        .insert_document_version(&vault_id, &new_version, Some(&mut transaction))
+        .insert_document_version(&vault_id, &new_version, Some(transaction))
         .await
         .map_err(server_error)?;
 
-    transaction
-        .commit()
-        .await
-        .context("Failed to commit successful transaction")
-        .map_err(server_error)?;
-
     Ok(Json(new_version.into()))
 }
diff --git a/sync-server/src/server/update_document.rs b/sync-server/src/server/update_document.rs
index 04ba8b63..bf11504c 100644
--- a/sync-server/src/server/update_document.rs
+++ b/sync-server/src/server/update_document.rs
@@ -183,16 +183,10 @@ pub async fn update_document(
 
     state
         .database
-        .insert_document_version(&vault_id, &new_version, Some(&mut transaction))
+        .insert_document_version(&vault_id, &new_version, Some(transaction))
         .await
         .map_err(server_error)?;
 
-    transaction
-        .commit()
-        .await
-        .context("Failed to commit successful transaction")
-        .map_err(server_error)?;
-
     Ok(Json(if is_different_from_request_content {
         DocumentUpdateResponse::MergingUpdate(new_version.into())
     } else {

From 4704d258eae8956da96555d7d9ba887a50263aa1 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Tue, 21 Oct 2025 22:46:25 +0100
Subject: [PATCH 595/761] Bump versions to 0.9.1

---
 frontend/local-client-cli/package.json | 2 +-
 frontend/obsidian-plugin/manifest.json | 2 +-
 frontend/obsidian-plugin/package.json  | 2 +-
 frontend/package-lock.json             | 8 ++++----
 frontend/sync-client/package.json      | 2 +-
 frontend/test-client/package.json      | 2 +-
 manifest.json                          | 2 +-
 sync-server/Cargo.lock                 | 2 +-
 sync-server/Cargo.toml                 | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/frontend/local-client-cli/package.json b/frontend/local-client-cli/package.json
index e03d2454..0c521cf3 100644
--- a/frontend/local-client-cli/package.json
+++ b/frontend/local-client-cli/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "local-client-cli",
-	"version": "0.8.2",
+	"version": "0.8.3",
 	"description": "Standalone CLI for VaultLink sync client",
 	"private": false,
 	"bin": {
diff --git a/frontend/obsidian-plugin/manifest.json b/frontend/obsidian-plugin/manifest.json
index a085cd9b..3242bef6 100644
--- a/frontend/obsidian-plugin/manifest.json
+++ b/frontend/obsidian-plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.9.0",
+	"version": "0.9.1",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index 971947e5..9e41b836 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -1,6 +1,6 @@
 {
     "name": "vault-link-obsidian-plugin",
-    "version": "0.9.0",
+    "version": "0.9.1",
     "description": "This is a sample plugin for Obsidian (https://obsidian.md)",
     "main": "main.js",
     "scripts": {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 6536a81e..20717df7 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -21,7 +21,7 @@
 			}
 		},
 		"local-client-cli": {
-			"version": "0.8.2",
+			"version": "0.8.3",
 			"dependencies": {
 				"commander": "^12.1.0"
 			},
@@ -4618,7 +4618,7 @@
 		},
 		"obsidian-plugin": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.9.0",
+			"version": "0.9.1",
 			"license": "MIT",
 			"devDependencies": {
 				"@plausible-analytics/tracker": "^0.4.0",
@@ -4647,7 +4647,7 @@
 			}
 		},
 		"sync-client": {
-			"version": "0.9.0",
+			"version": "0.9.1",
 			"dependencies": {
 				"byte-base64": "^1.1.0",
 				"minimatch": "^10.0.1",
@@ -4688,7 +4688,7 @@
 			}
 		},
 		"test-client": {
-			"version": "0.9.0",
+			"version": "0.9.1",
 			"bin": {
 				"test-client": "dist/cli.js"
 			},
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index 1bb522b1..ea9073fd 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "sync-client",
-    "version": "0.9.0",
+    "version": "0.9.1",
     "main": "dist/sync-client.node.js",
     "browser": "dist/sync-client.web.js",
     "types": "dist/types/index.d.ts",
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index 7314cf18..095c6725 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "test-client",
-	"version": "0.9.0",
+	"version": "0.9.1",
 	"private": true,
 	"bin": {
 		"test-client": "./dist/cli.js"
diff --git a/manifest.json b/manifest.json
index a085cd9b..3242bef6 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.9.0",
+	"version": "0.9.1",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/sync-server/Cargo.lock b/sync-server/Cargo.lock
index ddaf2b72..2f689eb1 100644
--- a/sync-server/Cargo.lock
+++ b/sync-server/Cargo.lock
@@ -2302,7 +2302,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.9.0"
+version = "0.9.1"
 dependencies = [
  "anyhow",
  "axum",
diff --git a/sync-server/Cargo.toml b/sync-server/Cargo.toml
index f938eeee..914f26d7 100644
--- a/sync-server/Cargo.toml
+++ b/sync-server/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.9.0"
+version = "0.9.1"
 
 [dependencies]
 serde = { version = "1.0.219", default-features = false, features = ["derive"] }

From dd5334c538870ca213ccbe85c236e66e661ca892 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Tue, 21 Oct 2025 22:47:29 +0100
Subject: [PATCH 596/761] Fix versioning

---
 frontend/local-client-cli/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/local-client-cli/package.json b/frontend/local-client-cli/package.json
index 0c521cf3..3357a824 100644
--- a/frontend/local-client-cli/package.json
+++ b/frontend/local-client-cli/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "local-client-cli",
-	"version": "0.8.3",
+	"version": "0.9.1",
 	"description": "Standalone CLI for VaultLink sync client",
 	"private": false,
 	"bin": {

From 4fce317deab12886d1444b0f85b06aeb50c8a899 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Tue, 21 Oct 2025 22:47:34 +0100
Subject: [PATCH 597/761] Bump versions to 0.9.2

---
 frontend/local-client-cli/package.json | 2 +-
 frontend/obsidian-plugin/manifest.json | 2 +-
 frontend/obsidian-plugin/package.json  | 2 +-
 frontend/package-lock.json             | 8 ++++----
 frontend/sync-client/package.json      | 2 +-
 frontend/test-client/package.json      | 2 +-
 manifest.json                          | 2 +-
 sync-server/Cargo.lock                 | 2 +-
 sync-server/Cargo.toml                 | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/frontend/local-client-cli/package.json b/frontend/local-client-cli/package.json
index 3357a824..183d308f 100644
--- a/frontend/local-client-cli/package.json
+++ b/frontend/local-client-cli/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "local-client-cli",
-	"version": "0.9.1",
+	"version": "0.9.2",
 	"description": "Standalone CLI for VaultLink sync client",
 	"private": false,
 	"bin": {
diff --git a/frontend/obsidian-plugin/manifest.json b/frontend/obsidian-plugin/manifest.json
index 3242bef6..7ad75bea 100644
--- a/frontend/obsidian-plugin/manifest.json
+++ b/frontend/obsidian-plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.9.1",
+	"version": "0.9.2",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index 9e41b836..7ff62a10 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -1,6 +1,6 @@
 {
     "name": "vault-link-obsidian-plugin",
-    "version": "0.9.1",
+    "version": "0.9.2",
     "description": "This is a sample plugin for Obsidian (https://obsidian.md)",
     "main": "main.js",
     "scripts": {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 20717df7..180a76cd 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -21,7 +21,7 @@
 			}
 		},
 		"local-client-cli": {
-			"version": "0.8.3",
+			"version": "0.9.2",
 			"dependencies": {
 				"commander": "^12.1.0"
 			},
@@ -4618,7 +4618,7 @@
 		},
 		"obsidian-plugin": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.9.1",
+			"version": "0.9.2",
 			"license": "MIT",
 			"devDependencies": {
 				"@plausible-analytics/tracker": "^0.4.0",
@@ -4647,7 +4647,7 @@
 			}
 		},
 		"sync-client": {
-			"version": "0.9.1",
+			"version": "0.9.2",
 			"dependencies": {
 				"byte-base64": "^1.1.0",
 				"minimatch": "^10.0.1",
@@ -4688,7 +4688,7 @@
 			}
 		},
 		"test-client": {
-			"version": "0.9.1",
+			"version": "0.9.2",
 			"bin": {
 				"test-client": "dist/cli.js"
 			},
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index ea9073fd..ca2735a2 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "sync-client",
-    "version": "0.9.1",
+    "version": "0.9.2",
     "main": "dist/sync-client.node.js",
     "browser": "dist/sync-client.web.js",
     "types": "dist/types/index.d.ts",
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index 095c6725..aa6aba25 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "test-client",
-	"version": "0.9.1",
+	"version": "0.9.2",
 	"private": true,
 	"bin": {
 		"test-client": "./dist/cli.js"
diff --git a/manifest.json b/manifest.json
index 3242bef6..7ad75bea 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.9.1",
+	"version": "0.9.2",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/sync-server/Cargo.lock b/sync-server/Cargo.lock
index 2f689eb1..d217f1bf 100644
--- a/sync-server/Cargo.lock
+++ b/sync-server/Cargo.lock
@@ -2302,7 +2302,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.9.1"
+version = "0.9.2"
 dependencies = [
  "anyhow",
  "axum",
diff --git a/sync-server/Cargo.toml b/sync-server/Cargo.toml
index 914f26d7..016c6386 100644
--- a/sync-server/Cargo.toml
+++ b/sync-server/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.9.1"
+version = "0.9.2"
 
 [dependencies]
 serde = { version = "1.0.219", default-features = false, features = ["derive"] }

From b4ff4cbf25e88e4047a8609e7475682369fababa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 26 Oct 2025 11:02:30 +0000
Subject: [PATCH 598/761] Bump uuid from 11.1.0 to 13.0.0 in /frontend (#143)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 frontend/package-lock.json        | 10 ++++++----
 frontend/sync-client/package.json |  2 +-
 frontend/test-client/package.json |  2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 180a76cd..26127701 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -4277,14 +4277,16 @@
 			"license": "MIT"
 		},
 		"node_modules/uuid": {
-			"version": "11.1.0",
+			"version": "13.0.0",
+			"resolved": "https://registry.npmjs.org/uuid/-/uuid-13.0.0.tgz",
+			"integrity": "sha512-XQegIaBTVUjSHliKqcnFqYypAd4S+WCYt5NIeRs6w/UAry7z8Y9j5ZwRRL4kzq9U3sD6v+85er9FvkEaBpji2w==",
 			"funding": [
 				"https://github.com/sponsors/broofa",
 				"https://github.com/sponsors/ctavan"
 			],
 			"license": "MIT",
 			"bin": {
-				"uuid": "dist/esm/bin/uuid"
+				"uuid": "dist-node/bin/uuid"
 			}
 		},
 		"node_modules/vault-link-obsidian-plugin": {
@@ -4653,7 +4655,7 @@
 				"minimatch": "^10.0.1",
 				"p-queue": "^8.1.0",
 				"reconcile-text": "^0.5.0",
-				"uuid": "^11.1.0"
+				"uuid": "^13.0.0"
 			},
 			"devDependencies": {
 				"@types/node": "^24.8.1",
@@ -4699,7 +4701,7 @@
 				"tslib": "2.8.1",
 				"tsx": "^4.20.5",
 				"typescript": "5.8.3",
-				"uuid": "^11.1.0",
+				"uuid": "^13.0.0",
 				"webpack": "^5.99.9",
 				"webpack-cli": "^6.0.1"
 			}
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index ca2735a2..6aa803cf 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -17,7 +17,7 @@
         "minimatch": "^10.0.1",
         "p-queue": "^8.1.0",
         "reconcile-text": "^0.5.0",
-        "uuid": "^11.1.0"
+        "uuid": "^13.0.0"
     },
     "devDependencies": {
         "@types/node": "^24.8.1",
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index aa6aba25..90ff83d0 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -17,7 +17,7 @@
 		"tslib": "2.8.1",
 		"tsx": "^4.20.5",
 		"typescript": "5.8.3",
-		"uuid": "^11.1.0",
+		"uuid": "^13.0.0",
 		"webpack": "^5.99.9",
 		"webpack-cli": "^6.0.1"
 	}

From 2b9d77d165b96dd21809829e5a0a284fbf0ee6f9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 26 Oct 2025 11:02:41 +0000
Subject: [PATCH 599/761] Bump eslint from 9.28.0 to 9.38.0 in /frontend (#142)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 frontend/package-lock.json | 91 +++++++++++++++++++++-----------------
 frontend/package.json      |  2 +-
 2 files changed, 51 insertions(+), 42 deletions(-)

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 26127701..eb5e13cb 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -13,7 +13,7 @@
 			],
 			"devDependencies": {
 				"concurrently": "^9.2.1",
-				"eslint": "9.28.0",
+				"eslint": "9.38.0",
 				"eslint-plugin-unused-imports": "^4.1.4",
 				"npm-check-updates": "^19.1.1",
 				"prettier": "^3.6.2",
@@ -518,7 +518,9 @@
 			}
 		},
 		"node_modules/@eslint-community/eslint-utils": {
-			"version": "4.7.0",
+			"version": "4.9.0",
+			"resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.0.tgz",
+			"integrity": "sha512-ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -554,11 +556,13 @@
 			}
 		},
 		"node_modules/@eslint/config-array": {
-			"version": "0.20.0",
+			"version": "0.21.1",
+			"resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.1.tgz",
+			"integrity": "sha512-aw1gNayWpdI/jSYVgzN5pL0cfzU02GT3NBpeT/DXbx1/1x7ZKxFPd9bwrzygx/qiwIQiJ1sw/zD8qY/kRvlGHA==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"dependencies": {
-				"@eslint/object-schema": "^2.1.6",
+				"@eslint/object-schema": "^2.1.7",
 				"debug": "^4.3.1",
 				"minimatch": "^3.1.2"
 			},
@@ -567,15 +571,22 @@
 			}
 		},
 		"node_modules/@eslint/config-helpers": {
-			"version": "0.2.1",
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.4.1.tgz",
+			"integrity": "sha512-csZAzkNhsgwb0I/UAV6/RGFTbiakPCf0ZrGmrIxQpYvGZ00PhTkSnyKNolphgIvmnJeGw6rcGVEXfTzUnFuEvw==",
 			"dev": true,
 			"license": "Apache-2.0",
+			"dependencies": {
+				"@eslint/core": "^0.16.0"
+			},
 			"engines": {
 				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
 			}
 		},
 		"node_modules/@eslint/core": {
-			"version": "0.14.0",
+			"version": "0.16.0",
+			"resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.16.0.tgz",
+			"integrity": "sha512-nmC8/totwobIiFcGkDza3GIKfAw1+hLiYVrh3I1nIomQ8PEr5cxg34jnkmGawul/ep52wGRAcyeDCNtWKSOj4Q==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"dependencies": {
@@ -608,7 +619,9 @@
 			}
 		},
 		"node_modules/@eslint/js": {
-			"version": "9.28.0",
+			"version": "9.38.0",
+			"resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.38.0.tgz",
+			"integrity": "sha512-UZ1VpFvXf9J06YG9xQBdnzU+kthors6KjhMAl6f4gH4usHyh31rUf2DLGInT8RFYIReYXNSydgPY0V2LuWgl7A==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -619,7 +632,9 @@
 			}
 		},
 		"node_modules/@eslint/object-schema": {
-			"version": "2.1.6",
+			"version": "2.1.7",
+			"resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.7.tgz",
+			"integrity": "sha512-VtAOaymWVfZcmZbp6E2mympDIHvyjXs/12LqWYjVw6qjrfF+VK+fyG33kChz3nnK+SU5/NeHOqrTEHS8sXO3OA==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"engines": {
@@ -627,32 +642,19 @@
 			}
 		},
 		"node_modules/@eslint/plugin-kit": {
-			"version": "0.3.5",
-			"resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.5.tgz",
-			"integrity": "sha512-Z5kJ+wU3oA7MMIqVR9tyZRtjYPr4OC004Q4Rw7pgOKUOKkJfZ3O24nz3WYfGRpMDNmcOi3TwQOmgm7B7Tpii0w==",
+			"version": "0.4.0",
+			"resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.4.0.tgz",
+			"integrity": "sha512-sB5uyeq+dwCWyPi31B2gQlVlo+j5brPlWx4yZBrEaRo/nhdDE8Xke1gsGgtiBdaBTxuTkceLVuVt/pclrasb0A==",
 			"dev": true,
 			"license": "Apache-2.0",
 			"dependencies": {
-				"@eslint/core": "^0.15.2",
+				"@eslint/core": "^0.16.0",
 				"levn": "^0.4.1"
 			},
 			"engines": {
 				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
 			}
 		},
-		"node_modules/@eslint/plugin-kit/node_modules/@eslint/core": {
-			"version": "0.15.2",
-			"resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.15.2.tgz",
-			"integrity": "sha512-78Md3/Rrxh83gCxoUc0EiciuOHsIITzLy53m3d9UyiW8y9Dj2D29FeETqyKA+BRK76tnTp6RXWb3pCay8Oyomg==",
-			"dev": true,
-			"license": "Apache-2.0",
-			"dependencies": {
-				"@types/json-schema": "^7.0.15"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			}
-		},
 		"node_modules/@humanfs/core": {
 			"version": "0.19.1",
 			"dev": true,
@@ -1451,7 +1453,9 @@
 			"license": "Apache-2.0"
 		},
 		"node_modules/acorn": {
-			"version": "8.14.1",
+			"version": "8.15.0",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
+			"integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
 			"dev": true,
 			"license": "MIT",
 			"bin": {
@@ -2080,31 +2084,32 @@
 			}
 		},
 		"node_modules/eslint": {
-			"version": "9.28.0",
+			"version": "9.38.0",
+			"resolved": "https://registry.npmjs.org/eslint/-/eslint-9.38.0.tgz",
+			"integrity": "sha512-t5aPOpmtJcZcz5UJyY2GbvpDlsK5E8JqRqoKtfiKE3cNh437KIqfJr3A3AKf5k64NPx6d0G3dno6XDY05PqPtw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@eslint-community/eslint-utils": "^4.2.0",
+				"@eslint-community/eslint-utils": "^4.8.0",
 				"@eslint-community/regexpp": "^4.12.1",
-				"@eslint/config-array": "^0.20.0",
-				"@eslint/config-helpers": "^0.2.1",
-				"@eslint/core": "^0.14.0",
+				"@eslint/config-array": "^0.21.1",
+				"@eslint/config-helpers": "^0.4.1",
+				"@eslint/core": "^0.16.0",
 				"@eslint/eslintrc": "^3.3.1",
-				"@eslint/js": "9.28.0",
-				"@eslint/plugin-kit": "^0.3.1",
+				"@eslint/js": "9.38.0",
+				"@eslint/plugin-kit": "^0.4.0",
 				"@humanfs/node": "^0.16.6",
 				"@humanwhocodes/module-importer": "^1.0.1",
 				"@humanwhocodes/retry": "^0.4.2",
 				"@types/estree": "^1.0.6",
-				"@types/json-schema": "^7.0.15",
 				"ajv": "^6.12.4",
 				"chalk": "^4.0.0",
 				"cross-spawn": "^7.0.6",
 				"debug": "^4.3.2",
 				"escape-string-regexp": "^4.0.0",
-				"eslint-scope": "^8.3.0",
-				"eslint-visitor-keys": "^4.2.0",
-				"espree": "^10.3.0",
+				"eslint-scope": "^8.4.0",
+				"eslint-visitor-keys": "^4.2.1",
+				"espree": "^10.4.0",
 				"esquery": "^1.5.0",
 				"esutils": "^2.0.2",
 				"fast-deep-equal": "^3.1.3",
@@ -2153,7 +2158,9 @@
 			}
 		},
 		"node_modules/eslint-scope": {
-			"version": "8.3.0",
+			"version": "8.4.0",
+			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.4.0.tgz",
+			"integrity": "sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==",
 			"dev": true,
 			"license": "BSD-2-Clause",
 			"dependencies": {
@@ -2181,13 +2188,15 @@
 			}
 		},
 		"node_modules/espree": {
-			"version": "10.3.0",
+			"version": "10.4.0",
+			"resolved": "https://registry.npmjs.org/espree/-/espree-10.4.0.tgz",
+			"integrity": "sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==",
 			"dev": true,
 			"license": "BSD-2-Clause",
 			"dependencies": {
-				"acorn": "^8.14.0",
+				"acorn": "^8.15.0",
 				"acorn-jsx": "^5.3.2",
-				"eslint-visitor-keys": "^4.2.0"
+				"eslint-visitor-keys": "^4.2.1"
 			},
 			"engines": {
 				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
diff --git a/frontend/package.json b/frontend/package.json
index e105b2fe..96e58973 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -22,7 +22,7 @@
 	},
 	"devDependencies": {
 		"concurrently": "^9.2.1",
-		"eslint": "9.28.0",
+		"eslint": "9.38.0",
 		"eslint-plugin-unused-imports": "^4.1.4",
 		"npm-check-updates": "^19.1.1",
 		"prettier": "^3.6.2",

From cd57ea66821f922ce008c875cc8c558b01aa326e Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 2 Nov 2025 17:52:04 +0000
Subject: [PATCH 600/761] Add log rotation to server & UI improvements (#157)

---
 .editorconfig                                 |   1 +
 .gitignore                                    |   4 +-
 .../src/views/cursors/file-explorer.ts        |   2 +-
 .../src/views/history/history-view.scss       |   2 +-
 .../sync-operations/unrestricted-syncer.ts    |   9 +-
 .../sync-client/src/tracing/sync-history.ts   |   3 +-
 scripts/check.sh                              |   2 +-
 sync-server/Cargo.lock                        |  17 +
 sync-server/Cargo.toml                        |   4 +
 sync-server/config-e2e.yml                    |   3 +
 sync-server/src/app_state.rs                  |  10 +-
 sync-server/src/config.rs                     |   4 +
 sync-server/src/config/logging_config.rs      |  34 ++
 sync-server/src/consts.rs                     |   3 +
 sync-server/src/errors.rs                     |   1 +
 sync-server/src/main.rs                       |  74 +++-
 sync-server/src/server.rs                     |   8 +-
 sync-server/src/utils.rs                      |   1 +
 sync-server/src/utils/rotating_file_writer.rs | 364 ++++++++++++++++++
 19 files changed, 508 insertions(+), 38 deletions(-)
 create mode 100644 sync-server/src/config/logging_config.rs
 create mode 100644 sync-server/src/utils/rotating_file_writer.rs

diff --git a/.editorconfig b/.editorconfig
index 9c63a68d..7074dff5 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -9,6 +9,7 @@ trim_trailing_whitespace = true
 charset = utf-8
 indent_style = space
 indent_size = 4
+tab_width = 4
 
 [*.{yml,yaml}]
 indent_size = 2
diff --git a/.gitignore b/.gitignore
index ef64105e..a1c1ac4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,8 +4,6 @@ node_modules
 # Exclude macOS Finder (System Explorer) View States
 .DS_Store
 
-
-
 # Frontend build folders
 frontend/*/dist
 
@@ -19,3 +17,5 @@ sync-server/bindings/*.ts
 
 *.log
 *.sqlx
+
+target
diff --git a/frontend/obsidian-plugin/src/views/cursors/file-explorer.ts b/frontend/obsidian-plugin/src/views/cursors/file-explorer.ts
index be71c058..78bf3e4f 100644
--- a/frontend/obsidian-plugin/src/views/cursors/file-explorer.ts
+++ b/frontend/obsidian-plugin/src/views/cursors/file-explorer.ts
@@ -34,7 +34,7 @@ export function renderCursorsInFileExplorer(
 			(parent) => {
 				cursors.forEach((cursor) => {
 					cursor.documentsWithCursors.forEach((document) => {
-						if (document.relative_path === key) {
+						if (document.relative_path.startsWith(key)) {
 							parent.appendChild(
 								createSpan({
 									text: cursor.userName,
diff --git a/frontend/obsidian-plugin/src/views/history/history-view.scss b/frontend/obsidian-plugin/src/views/history/history-view.scss
index 6033fd2b..fb93fa30 100644
--- a/frontend/obsidian-plugin/src/views/history/history-view.scss
+++ b/frontend/obsidian-plugin/src/views/history/history-view.scss
@@ -4,6 +4,7 @@
 	background-color: var(--color-base-00);
 	border-radius: var(--radius-l);
 	container-type: inline-size;
+	word-break: break-word;
 
 	&.clickable {
 		cursor: pointer;
@@ -38,7 +39,6 @@
 			display: flex;
 			align-items: center;
 			gap: var(--size-4-2);
-			word-break: break-all;
 			margin: 0;
 
 			> span {
diff --git a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
index 0d0f45ef..1f7e908c 100644
--- a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
+++ b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
@@ -228,7 +228,8 @@ export class UnrestrictedSyncer {
 					},
 					message:
 						"File has been deleted remotely, so we deleted it locally",
-					author: response.userId
+					author: response.userId,
+					timestamp: new Date(response.updatedDate)
 				});
 
 				this.database.delete(document.relativePath);
@@ -325,7 +326,8 @@ export class UnrestrictedSyncer {
 					status: SyncStatus.SUCCESS,
 					details: actualUpdateDetails,
 					message: `Successfully downloaded remotely updated file from the server`,
-					author: response.userId
+					author: response.userId,
+					timestamp: new Date(response.updatedDate)
 				});
 			}
 		});
@@ -429,7 +431,8 @@ export class UnrestrictedSyncer {
 				status: SyncStatus.SUCCESS,
 				details: updateDetails,
 				message: `Successfully downloaded remote file which hadn't existed locally`,
-				author: remoteVersion.userId
+				author: remoteVersion.userId,
+				timestamp: new Date(remoteVersion.updatedDate)
 			});
 		});
 	}
diff --git a/frontend/sync-client/src/tracing/sync-history.ts b/frontend/sync-client/src/tracing/sync-history.ts
index 6890688b..92904ce6 100644
--- a/frontend/sync-client/src/tracing/sync-history.ts
+++ b/frontend/sync-client/src/tracing/sync-history.ts
@@ -39,6 +39,7 @@ export interface CommonHistoryEntry {
 	message: string;
 	details: SyncDetails;
 	author?: string;
+	timestamp?: Date;
 }
 
 export enum SyncType {
@@ -92,7 +93,7 @@ export class SyncHistory {
 	public addHistoryEntry(entry: CommonHistoryEntry): void {
 		const historyEntry = {
 			...entry,
-			timestamp: new Date()
+			timestamp: entry.timestamp ?? new Date()
 		};
 
 		const candidate = this.findSimilarRecentUpdateEntry(historyEntry);
diff --git a/scripts/check.sh b/scripts/check.sh
index 0a28653c..eccc5714 100755
--- a/scripts/check.sh
+++ b/scripts/check.sh
@@ -21,7 +21,7 @@ else
     cargo fmt --all -- --check
 fi
 
-cargo machete
+cargo machete --with-metadata
 
 echo "Running checks in frontend"
 cd ../frontend
diff --git a/sync-server/Cargo.lock b/sync-server/Cargo.lock
index d217f1bf..29ab184c 100644
--- a/sync-server/Cargo.lock
+++ b/sync-server/Cargo.lock
@@ -991,6 +991,22 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
+[[package]]
+name = "humantime"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "135b12329e5e3ce057a9f972339ea52bc954fe1e9358ef27f95e89716fbc5424"
+
+[[package]]
+name = "humantime-serde"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57a3db5ea5923d99402c94e9feb261dc5ee9b4efa158b0315f788cf549cc200c"
+dependencies = [
+ "humantime",
+ "serde",
+]
+
 [[package]]
 name = "hyper"
 version = "1.5.1"
@@ -2314,6 +2330,7 @@ dependencies = [
  "clap",
  "clap-verbosity-flag",
  "futures",
+ "humantime-serde",
  "log",
  "rand 0.9.0",
  "reconcile-text",
diff --git a/sync-server/Cargo.toml b/sync-server/Cargo.toml
index 016c6386..db5702a0 100644
--- a/sync-server/Cargo.toml
+++ b/sync-server/Cargo.toml
@@ -20,6 +20,7 @@ axum_typed_multipart = "0.11.0"
 tower-http = { version = "0.6.1", features = ["cors", "trace", "limit", "timeout"] }
 tracing = "0.1.41"
 tracing-subscriber = { version = "0.3.19", features = ["fmt", "env-filter"]}
+humantime-serde = "1.1.1"
 sqlx = { version = "0.8.6", features = ["sqlite", "runtime-tokio", "uuid", "chrono"] }
 chrono = { version = "0.4.41", features = ["serde"] }
 rand = "0.9.0"
@@ -87,3 +88,6 @@ similar_names = { level = "allow", priority = 1 }
 missing_docs_in_private_items = { level = "allow", priority = 1 }
 
 pedantic = { level = "warn", priority = 0 }
+
+[package.metadata.cargo-machete]
+ignored = ["humantime-serde"]  # only used in serde macro
diff --git a/sync-server/config-e2e.yml b/sync-server/config-e2e.yml
index 5f2346d6..0b8491ee 100644
--- a/sync-server/config-e2e.yml
+++ b/sync-server/config-e2e.yml
@@ -24,3 +24,6 @@ users:
       type: allow_list
       allowed:
       - default
+logging:
+  log_directory: logs
+  log_rotation: 7days
diff --git a/sync-server/src/app_state.rs b/sync-server/src/app_state.rs
index a61467d5..2019e08e 100644
--- a/sync-server/src/app_state.rs
+++ b/sync-server/src/app_state.rs
@@ -2,14 +2,12 @@ pub mod cursors;
 pub mod database;
 pub mod websocket;
 
-use std::ffi::OsString;
-
 use anyhow::Result;
 use cursors::Cursors;
 use database::Database;
 use websocket::broadcasts::Broadcasts;
 
-use crate::{config::Config, consts::DEFAULT_CONFIG_PATH};
+use crate::config::Config;
 
 #[derive(Clone, Debug)]
 pub struct AppState {
@@ -20,11 +18,7 @@ pub struct AppState {
 }
 
 impl AppState {
-    pub async fn try_new(config_path: Option<OsString>) -> Result<Self> {
-        let config_path = config_path.unwrap_or_else(|| OsString::from(DEFAULT_CONFIG_PATH));
-        let path = std::path::PathBuf::from(config_path);
-
-        let config = Config::read_or_create(&path).await?;
+    pub async fn try_new(config: Config) -> Result<Self> {
         let broadcasts = Broadcasts::new(&config.server);
         let database = Database::try_new(&config.database, &broadcasts).await?;
         let cursors: Cursors = Cursors::new(&config.database, &broadcasts);
diff --git a/sync-server/src/config.rs b/sync-server/src/config.rs
index 700b1ea8..2e1a6e39 100644
--- a/sync-server/src/config.rs
+++ b/sync-server/src/config.rs
@@ -3,12 +3,14 @@ use std::path::Path;
 use anyhow::{Context as _, Result};
 use database_config::DatabaseConfig;
 use log::info;
+use logging_config::LoggingConfig;
 use serde::{Deserialize, Serialize};
 use server_config::ServerConfig;
 use tokio::fs;
 use user_config::UserConfig;
 
 pub mod database_config;
+pub mod logging_config;
 pub mod server_config;
 pub mod user_config;
 
@@ -20,6 +22,8 @@ pub struct Config {
     pub server: ServerConfig,
     #[serde(default)]
     pub users: UserConfig,
+    #[serde(default)]
+    pub logging: LoggingConfig,
 }
 
 impl Config {
diff --git a/sync-server/src/config/logging_config.rs b/sync-server/src/config/logging_config.rs
new file mode 100644
index 00000000..95ab9350
--- /dev/null
+++ b/sync-server/src/config/logging_config.rs
@@ -0,0 +1,34 @@
+use std::time::Duration;
+
+use log::debug;
+use serde::{Deserialize, Serialize};
+
+use crate::consts::{DEFAULT_LOG_DIRECTORY, DEFAULT_LOG_ROTATION_INTERVAL};
+
+#[derive(Debug, Deserialize, Serialize, Clone)]
+pub struct LoggingConfig {
+    #[serde(default = "default_log_directory")]
+    pub log_directory: String,
+
+    #[serde(default = "default_log_rotation", with = "humantime_serde")]
+    pub log_rotation: Duration,
+}
+
+impl Default for LoggingConfig {
+    fn default() -> Self {
+        Self {
+            log_directory: default_log_directory(),
+            log_rotation: default_log_rotation(),
+        }
+    }
+}
+
+fn default_log_directory() -> String {
+    debug!("Using default log directory: {DEFAULT_LOG_DIRECTORY}");
+    DEFAULT_LOG_DIRECTORY.to_owned()
+}
+
+fn default_log_rotation() -> Duration {
+    debug!("Using default log rotation: {DEFAULT_LOG_ROTATION_INTERVAL:?}");
+    DEFAULT_LOG_ROTATION_INTERVAL
+}
diff --git a/sync-server/src/consts.rs b/sync-server/src/consts.rs
index df5a2844..d973ca4a 100644
--- a/sync-server/src/consts.rs
+++ b/sync-server/src/consts.rs
@@ -11,3 +11,6 @@ pub const DEFAULT_PORT: u16 = 3000;
 pub const DEFAULT_MAX_BODY_SIZE_MB: usize = 4096;
 pub const DEFAULT_RESPONSE_TIMEOUT_SECONDS: u64 = 60;
 pub const DEFAULT_MAX_CLIENTS_PER_VAULT: usize = 256;
+
+pub const DEFAULT_LOG_DIRECTORY: &str = "logs";
+pub const DEFAULT_LOG_ROTATION_INTERVAL: Duration = Duration::from_secs(60 * 60 * 24); // 1 day
diff --git a/sync-server/src/errors.rs b/sync-server/src/errors.rs
index 987c3011..831b0e86 100644
--- a/sync-server/src/errors.rs
+++ b/sync-server/src/errors.rs
@@ -55,6 +55,7 @@ pub struct SerializedError {
 
 impl Display for SerializedError {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}: {}", self.error_type, self.message)?;
         if !self.causes.is_empty() {
             write!(f, "\nCauses:\n")?;
             for cause in &self.causes {
diff --git a/sync-server/src/main.rs b/sync-server/src/main.rs
index 83556542..aba6574e 100644
--- a/sync-server/src/main.rs
+++ b/sync-server/src/main.rs
@@ -6,24 +6,45 @@ mod errors;
 mod server;
 mod utils;
 
-use std::process::ExitCode;
+use std::{ffi::OsString, path::PathBuf, process::ExitCode};
 
 use anyhow::{Context as _, Result};
 use clap::Parser;
 use cli::args::Args;
+use config::Config;
+use consts::DEFAULT_CONFIG_PATH;
 use errors::{SyncServerError, init_error};
 use log::info;
 use server::create_server;
-use tracing_subscriber::{EnvFilter, fmt::format, util::SubscriberInitExt};
+use tracing_subscriber::{EnvFilter, fmt::format, layer::SubscriberExt, util::SubscriberInitExt};
+use utils::rotating_file_writer::RotatingFileWriter;
 
 #[tokio::main]
 async fn main() -> ExitCode {
     let args = Args::parse();
 
-    let mut result = set_up_logging(&args);
+    let config_path = args
+        .config_path
+        .clone()
+        .unwrap_or_else(|| OsString::from(DEFAULT_CONFIG_PATH));
+    let path = PathBuf::from(config_path);
+
+    let config = match Config::read_or_create(&path)
+        .await
+        .context("Failed to start server")
+        .map_err(init_error)
+    {
+        Ok(config) => config,
+        Err(e) => {
+            eprintln!("{}", e.serialize());
+            return ExitCode::FAILURE;
+        }
+    };
+
+    let mut result = set_up_logging(&args, &config.logging);
 
     if result.is_ok() {
-        result = start_server(args).await;
+        result = start_server(config).await;
     }
 
     match result {
@@ -35,7 +56,10 @@ async fn main() -> ExitCode {
     }
 }
 
-fn set_up_logging(args: &Args) -> Result<(), SyncServerError> {
+fn set_up_logging(
+    args: &Args,
+    logging_config: &config::logging_config::LoggingConfig,
+) -> Result<(), SyncServerError> {
     let level_filter = match args.verbose.log_level_filter() {
         // We don't want to allow disabling all logging
         log::LevelFilter::Off | log::LevelFilter::Error => tracing::Level::ERROR,
@@ -55,17 +79,33 @@ fn set_up_logging(args: &Args) -> Result<(), SyncServerError> {
 
     let is_debug_mode = args.verbose.log_level_filter() >= log::LevelFilter::Debug;
 
-    tracing_subscriber::fmt()
+    let file_appender = RotatingFileWriter::new(
+        &logging_config.log_directory,
+        "vault-link",
+        logging_config.log_rotation,
+    )
+    .context("Failed to create rotating file writer")
+    .map_err(init_error)?;
+
+    let format = format()
+        .with_target(is_debug_mode)
+        .with_line_number(is_debug_mode)
+        .compact();
+
+    let stdout_layer = tracing_subscriber::fmt::layer()
         .with_ansi(use_colors)
-        .with_env_filter(env_filter)
-        .event_format(
-            format()
-                .without_time()
-                .with_target(is_debug_mode)
-                .with_line_number(is_debug_mode)
-                .compact(),
-        )
-        .finish()
+        .with_writer(std::io::stdout)
+        .event_format(format.clone());
+
+    let file_layer = tracing_subscriber::fmt::layer()
+        .with_ansi(false)
+        .with_writer(file_appender)
+        .event_format(format);
+
+    tracing_subscriber::registry()
+        .with(env_filter)
+        .with(stdout_layer)
+        .with(file_layer)
         .try_init()
         .context("Failed to initialise tracing")
         .map_err(init_error)?;
@@ -73,13 +113,13 @@ fn set_up_logging(args: &Args) -> Result<(), SyncServerError> {
     Ok(())
 }
 
-async fn start_server(args: Args) -> Result<(), SyncServerError> {
+async fn start_server(config: Config) -> Result<(), SyncServerError> {
     info!(
         "Starting VaultLink server version {}",
         env!("CARGO_PKG_VERSION")
     );
 
-    create_server(args.config_path)
+    create_server(config)
         .await
         .context("Failed to start server")
         .map_err(init_error)
diff --git a/sync-server/src/server.rs b/sync-server/src/server.rs
index cddcc1b5..f63ef551 100644
--- a/sync-server/src/server.rs
+++ b/sync-server/src/server.rs
@@ -13,7 +13,7 @@ mod responses;
 mod update_document;
 mod websocket;
 
-use std::{ffi::OsString, time::Duration};
+use std::time::Duration;
 
 use anyhow::{Context as _, Result, anyhow};
 use auth::auth_middleware;
@@ -42,12 +42,12 @@ use tracing::{Level, info_span};
 
 use crate::{
     app_state::AppState,
-    config::server_config::ServerConfig,
+    config::{Config, server_config::ServerConfig},
     errors::{client_error, not_found_error},
 };
 
-pub async fn create_server(config_path: Option<OsString>) -> Result<()> {
-    let app_state = AppState::try_new(config_path)
+pub async fn create_server(config: Config) -> Result<()> {
+    let app_state = AppState::try_new(config)
         .await
         .context("Failed to initialise app state")?;
 
diff --git a/sync-server/src/utils.rs b/sync-server/src/utils.rs
index 010524de..b70705f6 100644
--- a/sync-server/src/utils.rs
+++ b/sync-server/src/utils.rs
@@ -1,4 +1,5 @@
 pub mod dedup_paths;
 pub mod is_file_type_mergable;
 pub mod normalize;
+pub mod rotating_file_writer;
 pub mod sanitize_path;
diff --git a/sync-server/src/utils/rotating_file_writer.rs b/sync-server/src/utils/rotating_file_writer.rs
new file mode 100644
index 00000000..9f59c5e5
--- /dev/null
+++ b/sync-server/src/utils/rotating_file_writer.rs
@@ -0,0 +1,364 @@
+use std::{
+    fs::{self, OpenOptions},
+    io::{self, Write},
+    path::{Path, PathBuf},
+    sync::{Arc, Mutex},
+    time::{Duration, SystemTime, UNIX_EPOCH},
+};
+
+use chrono::{Local, NaiveDateTime};
+use tracing_subscriber::fmt::MakeWriter;
+
+#[derive(Clone)]
+pub struct RotatingFileWriter {
+    inner: Arc<Mutex<RotatingFileWriterInner>>,
+}
+
+struct RotatingFileWriterInner {
+    directory: PathBuf,
+    file_prefix: String,
+    rotation_duration: Duration,
+    current_file: Option<std::fs::File>,
+    next_rotation_time: SystemTime,
+}
+
+impl RotatingFileWriter {
+    pub fn new(
+        directory: impl AsRef<Path>,
+        file_prefix: &str,
+        rotation_duration: Duration,
+    ) -> io::Result<Self> {
+        let directory = directory.as_ref().to_path_buf();
+
+        fs::create_dir_all(&directory)?;
+
+        let next_rotation_time =
+            Self::calculate_next_rotation_time(&directory, file_prefix, rotation_duration);
+
+        let inner = RotatingFileWriterInner {
+            directory,
+            file_prefix: file_prefix.to_owned(),
+            rotation_duration,
+            current_file: None,
+            next_rotation_time,
+        };
+
+        Ok(Self {
+            inner: Arc::new(Mutex::new(inner)),
+        })
+    }
+
+    /// Parse timestamp from log filename and return as `SystemTime`
+    fn parse_log_timestamp(filename: &str, file_prefix: &str) -> Option<SystemTime> {
+        // Expected format: {prefix}.{timestamp}.log where timestamp is %Y-%m-%d_%H-%M-%S
+        let prefix_len = file_prefix.len() + 1; // +1 for the dot
+        let timestamp_str = filename.get(prefix_len..filename.len().checked_sub(4)?)?;
+
+        let dt = NaiveDateTime::parse_from_str(timestamp_str, "%Y-%m-%d_%H-%M-%S").ok()?;
+        let timestamp = dt.and_local_timezone(Local).single()?;
+        let secs: u64 = timestamp.timestamp().try_into().ok()?;
+
+        Some(UNIX_EPOCH + Duration::from_secs(secs))
+    }
+
+    fn find_latest_log_file(directory: &Path, file_prefix: &str) -> Option<String> {
+        fs::read_dir(directory)
+            .ok()?
+            .filter_map(Result::ok)
+            .filter_map(|entry| {
+                let filename = entry.file_name().into_string().ok()?;
+                let has_correct_prefix = filename.starts_with(file_prefix);
+                let has_log_extension = Path::new(&filename)
+                    .extension()
+                    .is_some_and(|ext| ext.eq_ignore_ascii_case("log"));
+
+                (has_correct_prefix && has_log_extension).then_some(filename)
+            })
+            .max()
+    }
+
+    fn calculate_next_rotation_time(
+        directory: &Path,
+        file_prefix: &str,
+        rotation_duration: Duration,
+    ) -> SystemTime {
+        Self::find_latest_log_file(directory, file_prefix)
+            .and_then(|filename| Self::parse_log_timestamp(&filename, file_prefix))
+            .map_or_else(SystemTime::now, |last_rotation| {
+                last_rotation + rotation_duration
+            })
+    }
+
+    fn should_rotate(inner: &RotatingFileWriterInner) -> bool {
+        SystemTime::now() >= inner.next_rotation_time
+    }
+
+    fn rotate(inner: &mut RotatingFileWriterInner) -> io::Result<()> {
+        let timestamp = Local::now().format("%Y-%m-%d_%H-%M-%S");
+        let filename = format!("{}.{}.log", inner.file_prefix, timestamp);
+        let filepath = inner.directory.join(filename);
+
+        let file = OpenOptions::new()
+            .create(true)
+            .append(true)
+            .open(&filepath)?;
+
+        inner.current_file = Some(file);
+        inner.next_rotation_time = SystemTime::now() + inner.rotation_duration;
+
+        Ok(())
+    }
+}
+
+impl Write for RotatingFileWriter {
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        let mut inner = self.inner.lock().unwrap();
+
+        if inner.current_file.is_none() || Self::should_rotate(&inner) {
+            Self::rotate(&mut inner)?;
+        }
+
+        if let Some(ref mut file) = inner.current_file {
+            file.write(buf)
+        } else {
+            Err(io::Error::other("Failed to open log file"))
+        }
+    }
+
+    fn flush(&mut self) -> io::Result<()> {
+        let mut inner = self.inner.lock().unwrap();
+        if let Some(ref mut file) = inner.current_file {
+            file.flush()
+        } else {
+            Ok(())
+        }
+    }
+}
+
+impl<'a> MakeWriter<'a> for RotatingFileWriter {
+    type Writer = Self;
+
+    fn make_writer(&'a self) -> Self::Writer {
+        self.clone()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::thread;
+
+    #[test]
+    fn test_write_creates_log_file_and_directory() {
+        let temp_dir = std::env::temp_dir().join("test_write_creates_log_file_and_directory");
+
+        let mut writer =
+            RotatingFileWriter::new(&temp_dir, "test", Duration::from_secs(3600)).unwrap();
+        writer.write_all(b"test log message\n").unwrap();
+        writer.flush().unwrap();
+
+        // Check that a log file was created
+        let entries: Vec<_> = fs::read_dir(&temp_dir)
+            .unwrap()
+            .filter_map(Result::ok)
+            .filter(|e| e.path().extension().is_some_and(|ext| ext == "log"))
+            .collect();
+
+        assert!(temp_dir.exists());
+        assert_eq!(entries.len(), 1);
+
+        fs::remove_dir_all(&temp_dir).unwrap();
+    }
+
+    #[test]
+    fn test_rotation_after_duration() {
+        let temp_dir = std::env::temp_dir().join("test_rotation_after_duration");
+
+        // Use a very short rotation duration
+        // Note: We need to wait at least 1 second between rotations since
+        // filename timestamps only have second precision
+        let mut writer =
+            RotatingFileWriter::new(&temp_dir, "test", Duration::from_millis(500)).unwrap();
+
+        writer.write_all(b"first message\n").unwrap();
+        writer.flush().unwrap();
+
+        // Wait for rotation time to pass (at least 1 second for different timestamp)
+        thread::sleep(Duration::from_millis(1100));
+
+        writer.write_all(b"second message\n").unwrap();
+        writer.flush().unwrap();
+
+        // Check that two log files were created
+        let entries: Vec<_> = fs::read_dir(&temp_dir)
+            .unwrap()
+            .filter_map(Result::ok)
+            .filter(|e| e.path().extension().is_some_and(|ext| ext == "log"))
+            .collect();
+
+        assert_eq!(entries.len(), 2);
+
+        fs::remove_dir_all(&temp_dir).unwrap();
+    }
+
+    #[test]
+    fn test_calculate_next_rotation_time_no_existing_logs() {
+        let temp_dir =
+            std::env::temp_dir().join("test_calculate_next_rotation_time_no_existing_logs");
+
+        fs::create_dir_all(&temp_dir).unwrap();
+
+        let before = SystemTime::now();
+        let next_rotation = RotatingFileWriter::calculate_next_rotation_time(
+            &temp_dir,
+            "test",
+            Duration::from_secs(3600),
+        );
+        let after = SystemTime::now();
+
+        // Should return current time (within a small window)
+        assert!(next_rotation >= before && next_rotation <= after + Duration::from_secs(1));
+
+        fs::remove_dir_all(&temp_dir).unwrap();
+    }
+
+    #[test]
+    fn test_calculate_next_rotation_time_with_existing_log() {
+        let temp_dir =
+            std::env::temp_dir().join("test_calculate_next_rotation_time_with_existing_log");
+
+        fs::create_dir_all(&temp_dir).unwrap();
+
+        // Create a log file with a known timestamp
+        let timestamp_str = "2025-10-26_14-30-00";
+        let filename = format!("test.{timestamp_str}.log");
+        fs::write(temp_dir.join(&filename), b"test").unwrap();
+
+        let rotation_duration = Duration::from_secs(3600);
+        let next_rotation =
+            RotatingFileWriter::calculate_next_rotation_time(&temp_dir, "test", rotation_duration);
+
+        // Parse the expected time
+        let expected_dt =
+            NaiveDateTime::parse_from_str(timestamp_str, "%Y-%m-%d_%H-%M-%S").unwrap();
+        let expected_timestamp = expected_dt.and_local_timezone(Local).single().unwrap();
+        let expected_duration =
+            Duration::from_secs(expected_timestamp.timestamp().try_into().unwrap());
+        let expected_next = UNIX_EPOCH + expected_duration + rotation_duration;
+
+        // Allow 1 second tolerance for timing differences
+        let diff = if next_rotation > expected_next {
+            next_rotation.duration_since(expected_next).unwrap()
+        } else {
+            expected_next.duration_since(next_rotation).unwrap()
+        };
+
+        assert!(
+            diff < Duration::from_secs(2),
+            "Expected {expected_next:?}, got {next_rotation:?}"
+        );
+
+        fs::remove_dir_all(&temp_dir).unwrap();
+    }
+
+    #[test]
+    fn test_picks_latest_log_file() {
+        let temp_dir = std::env::temp_dir().join("test_picks_latest_log_file");
+
+        fs::create_dir_all(&temp_dir).unwrap();
+
+        // Create multiple log files
+        fs::write(temp_dir.join("test.2025-10-26_10-00-00.log"), b"old").unwrap();
+        fs::write(temp_dir.join("test.2025-10-26_14-00-00.log"), b"newer").unwrap();
+        fs::write(temp_dir.join("test.2025-10-26_12-00-00.log"), b"middle").unwrap();
+
+        let rotation_duration = Duration::from_secs(3600);
+        let next_rotation =
+            RotatingFileWriter::calculate_next_rotation_time(&temp_dir, "test", rotation_duration);
+
+        // Should use the latest file (2025-10-26_14-00-00)
+        let expected_dt =
+            NaiveDateTime::parse_from_str("2025-10-26_14-00-00", "%Y-%m-%d_%H-%M-%S").unwrap();
+        let expected_timestamp = expected_dt.and_local_timezone(Local).single().unwrap();
+        let expected_duration =
+            Duration::from_secs(expected_timestamp.timestamp().try_into().unwrap());
+        let expected_next = UNIX_EPOCH + expected_duration + rotation_duration;
+
+        let diff = if next_rotation > expected_next {
+            next_rotation.duration_since(expected_next).unwrap()
+        } else {
+            expected_next.duration_since(next_rotation).unwrap()
+        };
+
+        assert!(diff < Duration::from_secs(2));
+
+        fs::remove_dir_all(&temp_dir).unwrap();
+    }
+
+    #[test]
+    fn test_ignores_malformed_filenames() {
+        let temp_dir = std::env::temp_dir().join("test_ignores_malformed_filenames");
+
+        fs::create_dir_all(&temp_dir).unwrap();
+
+        // Create log files with various malformed names
+        fs::write(temp_dir.join("test.invalid.log"), b"bad").unwrap();
+        fs::write(temp_dir.join("test.log"), b"bad2").unwrap();
+        fs::write(
+            temp_dir.join("other.2025-10-26_14-00-00.log"),
+            b"wrong prefix",
+        )
+        .unwrap();
+        fs::write(temp_dir.join("test.2025-10-26_14-00-00.txt"), b"wrong ext").unwrap();
+
+        let before = SystemTime::now();
+        let next_rotation = RotatingFileWriter::calculate_next_rotation_time(
+            &temp_dir,
+            "test",
+            Duration::from_secs(3600),
+        );
+        let after = SystemTime::now();
+
+        // Should fall back to current time since no valid logs exist
+        assert!(next_rotation >= before && next_rotation <= after + Duration::from_secs(1));
+
+        fs::remove_dir_all(&temp_dir).unwrap();
+    }
+
+    #[test]
+    fn test_restart_behavior() {
+        let temp_dir = std::env::temp_dir().join("test_restart_behavior");
+
+        // Create initial writer and write some data
+        {
+            let mut writer =
+                RotatingFileWriter::new(&temp_dir, "test", Duration::from_secs(3600)).unwrap();
+            writer.write_all(b"before restart\n").unwrap();
+            writer.flush().unwrap();
+        }
+
+        // Simulate restart by creating a new writer
+        thread::sleep(Duration::from_millis(100));
+        {
+            let mut writer =
+                RotatingFileWriter::new(&temp_dir, "test", Duration::from_secs(3600)).unwrap();
+            writer.write_all(b"after restart\n").unwrap();
+            writer.flush().unwrap();
+        }
+
+        // Should still have only one log file (no premature rotation)
+        let entries: Vec<_> = fs::read_dir(&temp_dir)
+            .unwrap()
+            .filter_map(Result::ok)
+            .filter(|e| e.path().extension().is_some_and(|ext| ext == "log"))
+            .collect();
+
+        assert_eq!(
+            entries.len(),
+            1,
+            "Should not create new log file on restart within rotation period"
+        );
+
+        fs::remove_dir_all(&temp_dir).unwrap();
+    }
+}

From 0a7b8568e8ede4d16581320b875652ecc080b487 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 2 Nov 2025 17:52:18 +0000
Subject: [PATCH 601/761] Bump rust from 1.90-slim-trixie to 1.91-slim-trixie
 in /sync-server (#156)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 sync-server/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sync-server/Dockerfile b/sync-server/Dockerfile
index cfb76138..77599b2c 100644
--- a/sync-server/Dockerfile
+++ b/sync-server/Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.90-slim-trixie AS builder
+FROM rust:1.91-slim-trixie AS builder
 
 WORKDIR /usr/src/backend
 

From 33a24c3a772bc5f49f9f0fb51eda3442c527b21d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 2 Nov 2025 17:52:27 +0000
Subject: [PATCH 602/761] Bump serde_with from 3.15.0 to 3.15.1 in /sync-server
 (#153)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 sync-server/Cargo.lock | 8 ++++----
 sync-server/Cargo.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sync-server/Cargo.lock b/sync-server/Cargo.lock
index 29ab184c..ea90d7ca 100644
--- a/sync-server/Cargo.lock
+++ b/sync-server/Cargo.lock
@@ -1925,9 +1925,9 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.15.0"
+version = "3.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6093cd8c01b25262b84927e0f7151692158fab02d961e04c979d3903eba7ecc5"
+checksum = "aa66c845eee442168b2c8134fec70ac50dc20e760769c8ba0ad1319ca1959b04"
 dependencies = [
  "base64 0.22.1",
  "chrono",
@@ -1944,9 +1944,9 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.15.0"
+version = "3.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7e6c180db0816026a61afa1cff5344fb7ebded7e4d3062772179f2501481c27"
+checksum = "b91a903660542fced4e99881aa481bdbaec1634568ee02e0b8bd57c64cb38955"
 dependencies = [
  "darling 0.21.3",
  "proc-macro2",
diff --git a/sync-server/Cargo.toml b/sync-server/Cargo.toml
index db5702a0..8e9ae7ed 100644
--- a/sync-server/Cargo.toml
+++ b/sync-server/Cargo.toml
@@ -33,7 +33,7 @@ serde_json = "1.0.140"
 clap-verbosity-flag = "3.0.3"
 bimap = "0.6.3"
 ts-rs =  { version = "10.1", features = ["uuid-impl", "chrono-impl"] }
-serde_with = "3.15.0"
+serde_with = "3.15.1"
 base64 = "0.22.1"
 reconcile-text = "0.5.0"
 

From 97a4494085cde1532be2574f4c00cd9a21fc89fd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 2 Nov 2025 17:52:36 +0000
Subject: [PATCH 603/761] Bump @plausible-analytics/tracker from 0.4.0 to 0.4.3
 in /frontend (#145)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 frontend/obsidian-plugin/package.json | 2 +-
 frontend/package-lock.json            | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index 7ff62a10..dab575d7 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -13,7 +13,7 @@
     "author": "",
     "license": "MIT",
     "devDependencies": {
-        "@plausible-analytics/tracker": "^0.4.0",
+        "@plausible-analytics/tracker": "^0.4.3",
         "@sentry/browser": "^10.8.0",
         "@types/node": "^24.8.1",
         "css-loader": "^7.1.2",
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index eb5e13cb..3ebf7dbc 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -873,9 +873,9 @@
 			}
 		},
 		"node_modules/@plausible-analytics/tracker": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/@plausible-analytics/tracker/-/tracker-0.4.0.tgz",
-			"integrity": "sha512-KXwttotIZymo3yGzargrsxl9hjXJo5N+Kips3ZMamYqJxJqv1Zx+POC6WOFxYwDe1iJW7T91ItQYD8mZsznpXQ==",
+			"version": "0.4.3",
+			"resolved": "https://registry.npmjs.org/@plausible-analytics/tracker/-/tracker-0.4.3.tgz",
+			"integrity": "sha512-RKTgH5xu7Pa77VS4OEnS4woPhDxRgWLJlt9f6JhwgBC9ilknCfJIVEN2A1D8OR7hzgxMQF/hPyls9iN9ReAm3Q==",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -4632,7 +4632,7 @@
 			"version": "0.9.2",
 			"license": "MIT",
 			"devDependencies": {
-				"@plausible-analytics/tracker": "^0.4.0",
+				"@plausible-analytics/tracker": "^0.4.3",
 				"@sentry/browser": "^10.8.0",
 				"@types/node": "^24.8.1",
 				"css-loader": "^7.1.2",

From c3773a2a7a65c9a46ef8c89dfc1496ff2332f769 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 2 Nov 2025 17:52:52 +0000
Subject: [PATCH 604/761] Bump tokio from 1.47.1 to 1.48.0 in /sync-server
 (#151)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 sync-server/Cargo.lock | 41 +++++++++++++++++++++--------------------
 sync-server/Cargo.toml |  2 +-
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/sync-server/Cargo.lock b/sync-server/Cargo.lock
index ea90d7ca..b0ecafb4 100644
--- a/sync-server/Cargo.lock
+++ b/sync-server/Cargo.lock
@@ -362,7 +362,7 @@ dependencies = [
  "num-traits",
  "serde",
  "wasm-bindgen",
- "windows-link",
+ "windows-link 0.1.1",
 ]
 
 [[package]]
@@ -1232,17 +1232,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "io-uring"
-version = "0.7.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d93587f37623a1a17d94ef2bc9ada592f5465fe7732084ab7beefabe5c77c0c4"
-dependencies = [
- "bitflags",
- "cfg-if",
- "libc",
-]
-
 [[package]]
 name = "is_terminal_polyfill"
 version = "1.70.1"
@@ -2497,29 +2486,26 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.47.1"
+version = "1.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89e49afdadebb872d3145a5638b59eb0691ea23e46ca484037cfab3b76b95038"
+checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408"
 dependencies = [
- "backtrace",
  "bytes",
- "io-uring",
  "libc",
  "mio",
  "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
- "slab",
  "socket2",
  "tokio-macros",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
+checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2939,6 +2925,12 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38"
 
+[[package]]
+name = "windows-link"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
+
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
@@ -2966,6 +2958,15 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-sys"
+version = "0.61.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
+dependencies = [
+ "windows-link 0.2.1",
+]
+
 [[package]]
 name = "windows-targets"
 version = "0.48.5"
diff --git a/sync-server/Cargo.toml b/sync-server/Cargo.toml
index 8e9ae7ed..53b199f1 100644
--- a/sync-server/Cargo.toml
+++ b/sync-server/Cargo.toml
@@ -10,7 +10,7 @@ version = "0.9.2"
 [dependencies]
 serde = { version = "1.0.219", default-features = false, features = ["derive"] }
 thiserror = { version = "2.0.12", default-features = false  }
-tokio = { version = "1.47.1", features = ["full"]}
+tokio = { version = "1.48.0", features = ["full"]}
 uuid = { version = "1.16.0", features = ["v4", "serde"] }
 log = { version = "0.4.27" }
 anyhow =  { version = "1.0.98", features = ["backtrace"] }

From 04034b85da9da79a062d4f089301ac6c12c35827 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 2 Nov 2025 17:53:01 +0000
Subject: [PATCH 605/761] Bump regex from 1.11.1 to 1.12.2 in /sync-server
 (#152)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 sync-server/Cargo.lock | 10 +++++-----
 sync-server/Cargo.toml |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sync-server/Cargo.lock b/sync-server/Cargo.lock
index b0ecafb4..566aab91 100644
--- a/sync-server/Cargo.lock
+++ b/sync-server/Cargo.lock
@@ -1715,13 +1715,13 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.11.1"
+version = "1.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
+checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.9",
+ "regex-automata 0.4.13",
  "regex-syntax 0.8.5",
 ]
 
@@ -1736,9 +1736,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.9"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
+checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c"
 dependencies = [
  "aho-corasick",
  "memchr",
diff --git a/sync-server/Cargo.toml b/sync-server/Cargo.toml
index 53b199f1..81dbd4a7 100644
--- a/sync-server/Cargo.toml
+++ b/sync-server/Cargo.toml
@@ -25,7 +25,7 @@ sqlx = { version = "0.8.6", features = ["sqlite", "runtime-tokio", "uuid", "chro
 chrono = { version = "0.4.41", features = ["serde"] }
 rand = "0.9.0"
 sanitize-filename = "0.6.0"
-regex = "1.11.1"
+regex = "1.12.2"
 clap = { version = "4.5.38", features = ["derive"] }
 futures = "0.3.31"
 serde_yaml = "0.9.34"

From f1c2c8f8463cad190e52a61f1faf9f94c62f1281 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 2 Nov 2025 17:53:14 +0000
Subject: [PATCH 606/761] Bump obsidian from 1.8.7 to 1.10.2 in /frontend
 (#155)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 frontend/obsidian-plugin/package.json |  2 +-
 frontend/package-lock.json            | 35 +++++++++++++++++++++------
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index dab575d7..5996d532 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -21,7 +21,7 @@
         "file-loader": "^6.2.0",
         "fs-extra": "^11.3.0",
         "mini-css-extract-plugin": "^2.9.2",
-        "obsidian": "1.8.7",
+        "obsidian": "1.10.2",
         "reconcile-text": "^0.5.0",
         "resolve-url-loader": "^5.0.0",
         "sass": "^1.91.0",
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 3ebf7dbc..31791895 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -48,7 +48,9 @@
 			}
 		},
 		"node_modules/@codemirror/state": {
-			"version": "6.5.2",
+			"version": "6.5.0",
+			"resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.5.0.tgz",
+			"integrity": "sha512-MwBHVK60IiIHDcoMet78lxt6iw5gJOGSbNbOIVBHWVXIH4/Nq1+GQgLLGgI1KlnN86WDXsPudVaqYHKBIx7Eyw==",
 			"dev": true,
 			"license": "MIT",
 			"peer": true,
@@ -57,12 +59,15 @@
 			}
 		},
 		"node_modules/@codemirror/view": {
-			"version": "6.36.4",
+			"version": "6.38.1",
+			"resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.38.1.tgz",
+			"integrity": "sha512-RmTOkE7hRU3OVREqFVITWHz6ocgBjv08GoePscAakgVQfciA3SGCEk7mb9IzwW61cKKmlTpHXG6DUE5Ubx+MGQ==",
 			"dev": true,
 			"license": "MIT",
 			"peer": true,
 			"dependencies": {
 				"@codemirror/state": "^6.5.0",
+				"crelt": "^1.0.6",
 				"style-mod": "^4.1.0",
 				"w3c-keyname": "^2.2.4"
 			}
@@ -757,6 +762,8 @@
 		},
 		"node_modules/@marijn/find-cluster-break": {
 			"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==",
 			"dev": true,
 			"license": "MIT",
 			"peer": true
@@ -1836,6 +1843,14 @@
 				"url": "https://github.com/open-cli-tools/concurrently?sponsor=1"
 			}
 		},
+		"node_modules/crelt": {
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.6.tgz",
+			"integrity": "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==",
+			"dev": true,
+			"license": "MIT",
+			"peer": true
+		},
 		"node_modules/cross-spawn": {
 			"version": "7.0.6",
 			"dev": true,
@@ -3078,7 +3093,9 @@
 			}
 		},
 		"node_modules/obsidian": {
-			"version": "1.8.7",
+			"version": "1.10.2",
+			"resolved": "https://registry.npmjs.org/obsidian/-/obsidian-1.10.2.tgz",
+			"integrity": "sha512-bX03YCHf06OTzI/D+QK71ajCPCmwr/cjxzlVXjQa10DjK5iHRWhtJJpp83arSCyayFMp23u+UHcY7hxcEx2Mvg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -3086,8 +3103,8 @@
 				"moment": "2.29.4"
 			},
 			"peerDependencies": {
-				"@codemirror/state": "^6.0.0",
-				"@codemirror/view": "^6.0.0"
+				"@codemirror/state": "6.5.0",
+				"@codemirror/view": "6.38.1"
 			}
 		},
 		"node_modules/optionator": {
@@ -3899,7 +3916,9 @@
 			}
 		},
 		"node_modules/style-mod": {
-			"version": "4.1.2",
+			"version": "4.1.3",
+			"resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.1.3.tgz",
+			"integrity": "sha512-i/n8VsZydrugj3Iuzll8+x/00GH2vnYsk1eomD8QiRrSAeW6ItbCQDtfXCeJHd0iwiNagqjQkvpvREEPtW3IoQ==",
 			"dev": true,
 			"license": "MIT",
 			"peer": true
@@ -4312,6 +4331,8 @@
 		},
 		"node_modules/w3c-keyname": {
 			"version": "2.2.8",
+			"resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.8.tgz",
+			"integrity": "sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==",
 			"dev": true,
 			"license": "MIT",
 			"peer": true
@@ -4640,7 +4661,7 @@
 				"file-loader": "^6.2.0",
 				"fs-extra": "^11.3.0",
 				"mini-css-extract-plugin": "^2.9.2",
-				"obsidian": "1.8.7",
+				"obsidian": "1.10.2",
 				"reconcile-text": "^0.5.0",
 				"resolve-url-loader": "^5.0.0",
 				"sass": "^1.91.0",

From 29747d08295a90835897ac660d6c0db7f7622b65 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 2 Nov 2025 17:53:58 +0000
Subject: [PATCH 607/761] Bump commander from 12.1.0 to 14.0.2 in /frontend
 (#149)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 frontend/local-client-cli/package.json |  2 +-
 frontend/package-lock.json             | 27 ++++++++++++++------------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/frontend/local-client-cli/package.json b/frontend/local-client-cli/package.json
index 183d308f..ede6b4a5 100644
--- a/frontend/local-client-cli/package.json
+++ b/frontend/local-client-cli/package.json
@@ -12,7 +12,7 @@
 		"test": "tsx --test src/args.test.ts src/node-filesystem.test.ts"
 	},
 	"dependencies": {
-		"commander": "^12.1.0"
+		"commander": "^14.0.2"
 	},
 	"devDependencies": {
 		"@types/node": "^24.8.1",
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 31791895..d1497401 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -23,7 +23,7 @@
 		"local-client-cli": {
 			"version": "0.9.2",
 			"dependencies": {
-				"commander": "^12.1.0"
+				"commander": "^14.0.2"
 			},
 			"bin": {
 				"vaultlink": "dist/cli.js"
@@ -39,14 +39,6 @@
 				"webpack-cli": "^6.0.1"
 			}
 		},
-		"local-client-cli/node_modules/commander": {
-			"version": "12.1.0",
-			"resolved": "https://registry.npmjs.org/commander/-/commander-12.1.0.tgz",
-			"integrity": "sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==",
-			"engines": {
-				"node": ">=18"
-			}
-		},
 		"node_modules/@codemirror/state": {
 			"version": "6.5.0",
 			"resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.5.0.tgz",
@@ -1809,9 +1801,13 @@
 			"license": "MIT"
 		},
 		"node_modules/commander": {
-			"version": "2.20.3",
-			"dev": true,
-			"license": "MIT"
+			"version": "14.0.2",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-14.0.2.tgz",
+			"integrity": "sha512-TywoWNNRbhoD0BXs1P3ZEScW8W5iKrnbithIl0YH+uCmBd0QpPOA8yc82DS3BIE5Ma6FnBVUsJ7wVUDz4dvOWQ==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=20"
+			}
 		},
 		"node_modules/concat-map": {
 			"version": "0.0.1",
@@ -4072,6 +4068,13 @@
 				"url": "https://opencollective.com/webpack"
 			}
 		},
+		"node_modules/terser/node_modules/commander": {
+			"version": "2.20.3",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+			"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+			"dev": true,
+			"license": "MIT"
+		},
 		"node_modules/terser/node_modules/source-map-support": {
 			"version": "0.5.21",
 			"dev": true,

From 1da17c462e0054a3f3ded661d002e3eca2120943 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 2 Nov 2025 17:54:12 +0000
Subject: [PATCH 608/761] Bump anyhow from 1.0.98 to 1.0.100 in /sync-server
 (#150)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 sync-server/Cargo.lock | 4 ++--
 sync-server/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sync-server/Cargo.lock b/sync-server/Cargo.lock
index 566aab91..c0a05a3c 100644
--- a/sync-server/Cargo.lock
+++ b/sync-server/Cargo.lock
@@ -99,9 +99,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.98"
+version = "1.0.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
+checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61"
 dependencies = [
  "backtrace",
 ]
diff --git a/sync-server/Cargo.toml b/sync-server/Cargo.toml
index 81dbd4a7..816d571c 100644
--- a/sync-server/Cargo.toml
+++ b/sync-server/Cargo.toml
@@ -13,7 +13,7 @@ thiserror = { version = "2.0.12", default-features = false  }
 tokio = { version = "1.48.0", features = ["full"]}
 uuid = { version = "1.16.0", features = ["v4", "serde"] }
 log = { version = "0.4.27" }
-anyhow =  { version = "1.0.98", features = ["backtrace"] }
+anyhow =  { version = "1.0.100", features = ["backtrace"] }
 axum = { version = "0.7.4", features = ["ws", "macros", "tracing", "multipart"]}
 axum-extra = { version = "0.9.6", features = ["typed-header"] }
 axum_typed_multipart = "0.11.0"

From be1635c26e995d9ca86247307626dcd69247c31c Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 16 Nov 2025 22:10:22 +0000
Subject: [PATCH 609/761] Improve network usage for small text changes (#166)

---
 frontend/eslint.config.mjs                    |   7 +-
 frontend/package-lock.json                    |  21 +-
 frontend/sync-client/package.json             |   2 +-
 .../src/file-operations/file-operations.ts    |   3 +-
 .../sync-client/src/services/sync-service.ts  |  76 +++++-
 .../types/UpdateTextDocumentVersion.ts        |   7 +
 frontend/sync-client/src/sync-client.ts       |   9 +-
 .../sync-client/src/sync-operations/syncer.ts |   5 +-
 .../sync-operations/unrestricted-syncer.ts    |  71 +++++-
 .../src/utils/fix-sized-cache.test.ts         | 239 ++++++++++++++++++
 .../sync-client/src/utils/fix-sized-cache.ts  | 113 +++++++++
 frontend/sync-client/src/utils/is-binary.ts   |  16 ++
 sync-server/Cargo.lock                        |   7 +-
 sync-server/Cargo.toml                        |   2 +-
 sync-server/src/server.rs                     |   8 +-
 sync-server/src/server/requests.rs            |  20 +-
 sync-server/src/server/update_document.rs     | 101 ++++++--
 sync-server/src/utils.rs                      |   1 +
 sync-server/src/utils/is_binary.rs            |  26 ++
 sync-server/src/utils/rotating_file_writer.rs |  25 +-
 20 files changed, 697 insertions(+), 62 deletions(-)
 create mode 100644 frontend/sync-client/src/services/types/UpdateTextDocumentVersion.ts
 create mode 100644 frontend/sync-client/src/utils/fix-sized-cache.test.ts
 create mode 100644 frontend/sync-client/src/utils/fix-sized-cache.ts
 create mode 100644 frontend/sync-client/src/utils/is-binary.ts
 create mode 100644 sync-server/src/utils/is_binary.rs

diff --git a/frontend/eslint.config.mjs b/frontend/eslint.config.mjs
index db648d46..8e13be78 100644
--- a/frontend/eslint.config.mjs
+++ b/frontend/eslint.config.mjs
@@ -33,12 +33,7 @@ export default [
 			"@typescript-eslint/class-methods-use-this": "off",
 			"@typescript-eslint/consistent-return": "off",
 			"@typescript-eslint/no-unsafe-argument": "off",
-			"@typescript-eslint/max-params": [
-				"error",
-				{
-					max: 6
-				}
-			],
+			"@typescript-eslint/max-params": "off",
 			"@typescript-eslint/no-magic-numbers": "off",
 			"@typescript-eslint/prefer-readonly-parameter-types": "off",
 			"@typescript-eslint/naming-convention": "off",
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index d1497401..31dec1fb 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1583,7 +1583,9 @@
 			}
 		},
 		"node_modules/brace-expansion": {
-			"version": "1.1.11",
+			"version": "1.1.12",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+			"integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2742,7 +2744,9 @@
 			}
 		},
 		"node_modules/js-yaml": {
-			"version": "4.1.0",
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
+			"integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -3487,6 +3491,7 @@
 			"version": "0.5.0",
 			"resolved": "https://registry.npmjs.org/reconcile-text/-/reconcile-text-0.5.0.tgz",
 			"integrity": "sha512-zki3lqw9Oxdhm9ZvDN17VyYoL1Isc8BEL07ILVDE2yGfNEI7thrkczoNCUr+hkFU2rzZtfxECTG0b7p61AJ6wg==",
+			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/regex-parser": {
@@ -4687,7 +4692,7 @@
 				"byte-base64": "^1.1.0",
 				"minimatch": "^10.0.1",
 				"p-queue": "^8.1.0",
-				"reconcile-text": "^0.5.0",
+				"reconcile-text": "^0.7.1",
 				"uuid": "^13.0.0"
 			},
 			"devDependencies": {
@@ -4703,7 +4708,9 @@
 			}
 		},
 		"sync-client/node_modules/brace-expansion": {
-			"version": "2.0.1",
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+			"integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
 			"license": "MIT",
 			"dependencies": {
 				"balanced-match": "^1.0.0"
@@ -4722,6 +4729,12 @@
 				"url": "https://github.com/sponsors/isaacs"
 			}
 		},
+		"sync-client/node_modules/reconcile-text": {
+			"version": "0.7.1",
+			"resolved": "https://registry.npmjs.org/reconcile-text/-/reconcile-text-0.7.1.tgz",
+			"integrity": "sha512-khedcYvAKs7ELKh5Z8mz2vyomMY5TqznV1dB+k/7qUAX9cheMNN5/EPJVQYZepOMunYbnQitvhFJX3kD4IMcNw==",
+			"license": "MIT"
+		},
 		"test-client": {
 			"version": "0.9.2",
 			"bin": {
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index 6aa803cf..6483c93c 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -16,7 +16,7 @@
         "byte-base64": "^1.1.0",
         "minimatch": "^10.0.1",
         "p-queue": "^8.1.0",
-        "reconcile-text": "^0.5.0",
+        "reconcile-text": "^0.7.1",
         "uuid": "^13.0.0"
     },
     "devDependencies": {
diff --git a/frontend/sync-client/src/file-operations/file-operations.ts b/frontend/sync-client/src/file-operations/file-operations.ts
index 56ce0e51..e85c7fda 100644
--- a/frontend/sync-client/src/file-operations/file-operations.ts
+++ b/frontend/sync-client/src/file-operations/file-operations.ts
@@ -3,8 +3,9 @@ import type { FileSystemOperations } from "./filesystem-operations";
 import type { Database, RelativePath } from "../persistence/database";
 import { SafeFileSystemOperations } from "./safe-filesystem-operations";
 import type { TextWithCursors } from "reconcile-text";
-import { isBinary, reconcile } from "reconcile-text";
+import { reconcile } from "reconcile-text";
 import { isFileTypeMergable } from "../utils/is-file-type-mergable";
+import { isBinary } from "../utils/is-binary";
 
 export class FileOperations {
 	private static readonly PARENTHESES_REGEX = / \((\d+)\)$/;
diff --git a/frontend/sync-client/src/services/sync-service.ts b/frontend/sync-client/src/services/sync-service.ts
index 8ce9c56a..5bbf01e6 100644
--- a/frontend/sync-client/src/services/sync-service.ts
+++ b/frontend/sync-client/src/services/sync-service.ts
@@ -16,6 +16,7 @@ import type { DocumentVersion } from "./types/DocumentVersion";
 import type { FetchLatestDocumentsResponse } from "./types/FetchLatestDocumentsResponse";
 import type { PingResponse } from "./types/PingResponse";
 import type { DeleteDocumentVersion } from "./types/DeleteDocumentVersion";
+import type { UpdateTextDocumentVersion } from "./types/UpdateTextDocumentVersion";
 
 export interface CheckConnectionResult {
 	isSuccessful: boolean;
@@ -102,7 +103,59 @@ export class SyncService {
 		});
 	}
 
-	public async put({
+	public async putText({
+		parentVersionId,
+		documentId,
+		relativePath,
+		content
+	}: {
+		parentVersionId: VaultUpdateId;
+		documentId: DocumentId;
+		relativePath: RelativePath;
+		content: (number | string)[];
+	}): Promise<DocumentUpdateResponse> {
+		return this.withRetries(async () => {
+			this.logger.debug(
+				`Updating text document ${documentId} with parent version ${parentVersionId} and relative path ${relativePath}`
+			);
+
+			const request: UpdateTextDocumentVersion = {
+				parentVersionId,
+				relativePath,
+				content
+			};
+
+			const response = await this.client(
+				this.getUrl(`/documents/${documentId}/text`),
+				{
+					method: "PUT",
+					body: JSON.stringify(request),
+					headers: this.getDefaultHeaders({ type: "json" })
+				}
+			);
+
+			const result: SerializedError | DocumentUpdateResponse =
+				(await response.json()) as  // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+					| SerializedError
+					| DocumentUpdateResponse;
+
+			if ("errorType" in result) {
+				throw new Error(
+					`Failed to update document: ${SyncService.formatError(result)}`
+				);
+			}
+
+			this.logger.debug(
+				`Updated document ${JSON.stringify(result)} with id ${
+					result.documentId
+				}}`
+			);
+
+			return result;
+		});
+	}
+
+	public async putBinary({
 		parentVersionId,
 		documentId,
 		relativePath,
@@ -115,7 +168,7 @@ export class SyncService {
 	}): Promise<DocumentUpdateResponse> {
 		return this.withRetries(async () => {
 			this.logger.debug(
-				`Updating document ${documentId} with parent version ${parentVersionId} and relative path ${relativePath}`
+				`Updating binary document ${documentId} with parent version ${parentVersionId} and relative path ${relativePath}`
 			);
 			const formData = new FormData();
 			formData.append("parent_version_id", parentVersionId.toString());
@@ -126,7 +179,7 @@ export class SyncService {
 			);
 
 			const response = await this.client(
-				this.getUrl(`/documents/${documentId}`),
+				this.getUrl(`/documents/${documentId}/binary`),
 				{
 					method: "PUT",
 					body: formData,
@@ -171,10 +224,7 @@ export class SyncService {
 				{
 					method: "DELETE",
 					body: JSON.stringify(request),
-					headers: {
-						"Content-Type": "application/json",
-						...this.getDefaultHeaders()
-					}
+					headers: this.getDefaultHeaders({ type: "json" })
 				}
 			);
 
@@ -297,11 +347,19 @@ export class SyncService {
 		return `${safeRemoteUri}/vaults/${vaultName}${path}`;
 	}
 
-	private getDefaultHeaders(): Record<string, string> {
-		return {
+	private getDefaultHeaders(
+		{ type }: { type?: "json" } = { type: undefined }
+	): Record<string, string> {
+		const headers: Record<string, string> = {
 			"device-id": this.deviceId,
 			authorization: `Bearer ${this.settings.getSettings().token}`
 		};
+
+		if (type === "json") {
+			headers["Content-Type"] = "application/json";
+		}
+
+		return headers;
 	}
 
 	private async withRetries<T>(fn: () => Promise<T>): Promise<T> {
diff --git a/frontend/sync-client/src/services/types/UpdateTextDocumentVersion.ts b/frontend/sync-client/src/services/types/UpdateTextDocumentVersion.ts
new file mode 100644
index 00000000..b3a5499b
--- /dev/null
+++ b/frontend/sync-client/src/services/types/UpdateTextDocumentVersion.ts
@@ -0,0 +1,7 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export interface UpdateTextDocumentVersion {
+	parentVersionId: number;
+	relativePath: string;
+	content: (number | string)[];
+}
diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts
index 78beb910..33a1cac5 100644
--- a/frontend/sync-client/src/sync-client.ts
+++ b/frontend/sync-client/src/sync-client.ts
@@ -21,13 +21,13 @@ import { CursorTracker } from "./sync-operations/cursor-tracker";
 import type { CursorSpan } from "./services/types/CursorSpan";
 import type { MaybeOutdatedClientCursors } from "./types/maybe-outdated-client-cursors";
 import { FileChangeNotifier } from "./sync-operations/file-change-notifier";
+import { FixedSizeDocumentCache } from "./utils/fix-sized-cache";
 
 export class SyncClient {
 	private static readonly MINIMUM_SAVE_INTERVAL_MS = 1000;
 	private hasStartedOfflineSync = false;
 	private hasFinishedOfflineSync = false;
 
-	// eslint-disable-next-line @typescript-eslint/max-params
 	private constructor(
 		private readonly history: SyncHistory,
 		private readonly settings: Settings,
@@ -135,13 +135,15 @@ export class SyncClient {
 			nativeLineEndings
 		);
 
+		const contentCache = new FixedSizeDocumentCache(1024 * 1024 * 2); // 2 MB cache
 		const unrestrictedSyncer = new UnrestrictedSyncer(
 			logger,
 			database,
 			settings,
 			syncService,
 			fileOperations,
-			history
+			history,
+			contentCache
 		);
 
 		const syncer = new Syncer(
@@ -150,7 +152,8 @@ export class SyncClient {
 			settings,
 			syncService,
 			fileOperations,
-			unrestrictedSyncer
+			unrestrictedSyncer,
+			contentCache
 		);
 
 		const webSocketManager = new WebSocketManager(
diff --git a/frontend/sync-client/src/sync-operations/syncer.ts b/frontend/sync-client/src/sync-operations/syncer.ts
index 03041a36..1c8ac36e 100644
--- a/frontend/sync-client/src/sync-operations/syncer.ts
+++ b/frontend/sync-client/src/sync-operations/syncer.ts
@@ -17,6 +17,7 @@ import { createPromise } from "../utils/create-promise";
 import { SyncResetError } from "../services/sync-reset-error";
 import { Locks } from "../utils/locks";
 import type { DocumentVersionWithoutContent } from "../services/types/DocumentVersionWithoutContent";
+import type { FixedSizeDocumentCache } from "../utils/fix-sized-cache";
 
 export class Syncer {
 	private readonly remoteDocumentsLock: Locks<DocumentId>;
@@ -33,7 +34,8 @@ export class Syncer {
 		settings: Settings,
 		private readonly syncService: SyncService,
 		private readonly operations: FileOperations,
-		private readonly internalSyncer: UnrestrictedSyncer
+		private readonly internalSyncer: UnrestrictedSyncer,
+		private readonly contentCache: FixedSizeDocumentCache
 	) {
 		this.syncQueue = new PQueue({
 			concurrency: settings.getSettings().syncConcurrency
@@ -250,6 +252,7 @@ export class Syncer {
 
 	public async reset(): Promise<void> {
 		await this.waitUntilFinished();
+		this.contentCache.clear();
 	}
 
 	public async syncRemotelyUpdatedFile(
diff --git a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
index 1f7e908c..f9f6e2c1 100644
--- a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
+++ b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
@@ -4,6 +4,7 @@ import type {
 	RelativePath
 } from "../persistence/database";
 
+import { diff } from "reconcile-text";
 import type { SyncService } from "../services/sync-service";
 import type { Logger } from "../tracing/logger";
 import type {
@@ -27,6 +28,9 @@ import { globsToRegexes } from "../utils/globs-to-regexes";
 import type { DocumentVersion } from "../services/types/DocumentVersion";
 import type { DocumentUpdateResponse } from "../services/types/DocumentUpdateResponse";
 import type { DocumentVersionWithoutContent } from "../services/types/DocumentVersionWithoutContent";
+import type { FixedSizeDocumentCache } from "../utils/fix-sized-cache";
+import { isFileTypeMergable } from "../utils/is-file-type-mergable";
+import { isBinary } from "../utils/is-binary";
 
 export class UnrestrictedSyncer {
 	private ignorePatterns: RegExp[];
@@ -37,7 +41,8 @@ export class UnrestrictedSyncer {
 		private readonly settings: Settings,
 		private readonly syncService: SyncService,
 		private readonly operations: FileOperations,
-		private readonly history: SyncHistory
+		private readonly history: SyncHistory,
+		private readonly contentCache: FixedSizeDocumentCache
 	) {
 		this.ignorePatterns = globsToRegexes(
 			this.settings.getSettings().ignorePatterns,
@@ -87,8 +92,12 @@ export class UnrestrictedSyncer {
 				},
 				document
 			);
-
 			this.database.addSeenUpdateId(response.vaultUpdateId);
+			this.updateCache(
+				response.vaultUpdateId,
+				contentBytes,
+				response.relativePath
+			);
 
 			this.history.addHistoryEntry({
 				status: SyncStatus.SUCCESS,
@@ -178,12 +187,32 @@ export class UnrestrictedSyncer {
 				undefined;
 
 			if (areThereLocalChanges) {
-				response = await this.syncService.put({
-					documentId: document.documentId,
-					parentVersionId: document.metadata.parentVersionId,
-					relativePath: document.relativePath,
-					contentBytes
-				});
+				const isText =
+					!isBinary(contentBytes) &&
+					isFileTypeMergable(document.relativePath);
+				const cachedVersion = this.contentCache.get(
+					document.metadata.parentVersionId
+				);
+
+				response =
+					isText && cachedVersion !== undefined
+						? await this.syncService.putText({
+								documentId: document.documentId,
+								parentVersionId:
+									document.metadata.parentVersionId,
+								relativePath: document.relativePath,
+								content: diff(
+									new TextDecoder().decode(cachedVersion),
+									new TextDecoder().decode(contentBytes)
+								)
+							})
+						: await this.syncService.putBinary({
+								documentId: document.documentId,
+								parentVersionId:
+									document.metadata.parentVersionId,
+								relativePath: document.relativePath,
+								contentBytes
+							});
 			} else {
 				if (!force) {
 					this.logger.debug(
@@ -274,12 +303,16 @@ export class UnrestrictedSyncer {
 					},
 					document
 				);
-
 				await this.operations.write(
 					actualPath,
 					contentBytes,
 					responseBytes
 				);
+				this.updateCache(
+					response.vaultUpdateId,
+					responseBytes,
+					actualPath
+				);
 
 				if (!force) {
 					this.history.addHistoryEntry({
@@ -297,6 +330,11 @@ export class UnrestrictedSyncer {
 					},
 					document
 				);
+				this.updateCache(
+					response.vaultUpdateId,
+					contentBytes,
+					actualPath
+				);
 			}
 
 			this.database.addSeenUpdateId(response.vaultUpdateId);
@@ -423,6 +461,11 @@ export class UnrestrictedSyncer {
 				remoteVersion.relativePath,
 				contentBytes
 			);
+			this.updateCache(
+				remoteVersion.vaultUpdateId,
+				contentBytes,
+				remoteVersion.relativePath
+			);
 
 			resolve();
 			this.database.removeDocumentPromise(promise);
@@ -513,4 +556,14 @@ export class UnrestrictedSyncer {
 			};
 		}
 	}
+
+	private updateCache(
+		updateId: number,
+		contentBytes: Uint8Array,
+		filePath: RelativePath
+	): void {
+		if (isFileTypeMergable(filePath) && !isBinary(contentBytes)) {
+			this.contentCache.put(updateId, contentBytes);
+		}
+	}
 }
diff --git a/frontend/sync-client/src/utils/fix-sized-cache.test.ts b/frontend/sync-client/src/utils/fix-sized-cache.test.ts
new file mode 100644
index 00000000..46bc4144
--- /dev/null
+++ b/frontend/sync-client/src/utils/fix-sized-cache.test.ts
@@ -0,0 +1,239 @@
+import { describe, it } from "node:test";
+import assert from "node:assert";
+import { FixedSizeDocumentCache } from "./fix-sized-cache";
+
+describe("fixedSizeDocumentCache", () => {
+	it("happyPath", async () => {
+		const cache = new FixedSizeDocumentCache(4);
+		const doc1 = new Uint8Array([1, 2]);
+		const doc2 = new Uint8Array([3, 4]);
+		const doc3 = new Uint8Array([5, 6]);
+
+		cache.put(1, doc1);
+		assert.equal(cache.get(1), doc1);
+		cache.put(2, doc2);
+		assert.equal(cache.get(1), doc1);
+		assert.equal(cache.get(2), doc2);
+		cache.put(3, doc3);
+		assert.equal(cache.get(1), undefined);
+		assert.equal(cache.get(2), doc2);
+		assert.equal(cache.get(3), doc3);
+	});
+
+	it("updateExistingEntry", async () => {
+		const cache = new FixedSizeDocumentCache(4);
+		const doc1_v1 = new Uint8Array([1, 2]);
+		const doc1_v2 = new Uint8Array([3, 4]);
+		const doc2 = new Uint8Array([5, 6]);
+
+		cache.put(1, doc1_v1);
+		assert.equal(cache.get(1), doc1_v1);
+		cache.put(2, doc2);
+		assert.equal(cache.get(1), doc1_v1);
+		assert.equal(cache.get(2), doc2);
+		cache.put(1, doc1_v2); // Update doc1
+		assert.equal(cache.get(1), doc1_v2);
+		assert.equal(cache.get(2), doc2);
+	});
+
+	it("evictOldestEntry", async () => {
+		const cache = new FixedSizeDocumentCache(4);
+		const doc1 = new Uint8Array([1, 2]);
+		const doc2 = new Uint8Array([3, 4]);
+		const doc3 = new Uint8Array([5, 6]);
+
+		cache.put(1, doc1);
+		cache.put(2, doc2);
+		assert.equal(cache.get(2), doc2);
+		assert.equal(cache.get(1), doc1);
+		cache.put(3, doc3);
+		assert.equal(cache.get(1), doc1);
+		assert.equal(cache.get(2), undefined);
+		assert.equal(cache.get(3), doc3);
+	});
+
+	it("tooLargeEntry", async () => {
+		const cache = new FixedSizeDocumentCache(2);
+		const doc1 = new Uint8Array([1, 2, 3]);
+
+		cache.put(1, doc1);
+		assert.equal(cache.get(1), undefined);
+	});
+
+	it("multipleEvictionsInSinglePut", async () => {
+		const cache = new FixedSizeDocumentCache(10);
+		const doc1 = new Uint8Array([1, 2]);
+		const doc2 = new Uint8Array([3, 4]);
+		const doc3 = new Uint8Array([5, 6]);
+		const doc4 = new Uint8Array([7, 8, 9, 10, 11, 12, 13, 14]); // 8 bytes
+
+		cache.put(1, doc1);
+		cache.put(2, doc2);
+		cache.put(3, doc3);
+		// Cache now has 6 bytes total
+
+		cache.put(4, doc4); // Should evict doc1 and doc2 to make room (total: 2+8=10)
+		assert.equal(cache.get(1), undefined); // Evicted
+		assert.equal(cache.get(2), undefined); // Evicted
+		assert.equal(cache.get(3), doc3); // Still present
+		assert.equal(cache.get(4), doc4);
+	});
+
+	it("clearCache", async () => {
+		const cache = new FixedSizeDocumentCache(10);
+		const doc1 = new Uint8Array([1, 2]);
+		const doc2 = new Uint8Array([3, 4]);
+
+		cache.put(1, doc1);
+		cache.put(2, doc2);
+		assert.equal(cache.get(1), doc1);
+		assert.equal(cache.get(2), doc2);
+
+		cache.clear();
+		assert.equal(cache.get(1), undefined);
+		assert.equal(cache.get(2), undefined);
+
+		// Should be able to add entries after clear
+		cache.put(3, doc1);
+		assert.equal(cache.get(3), doc1);
+	});
+
+	it("getNonExistentKey", async () => {
+		const cache = new FixedSizeDocumentCache(10);
+		const doc1 = new Uint8Array([1, 2]);
+		cache.put(1, doc1);
+		assert.equal(cache.get(999), undefined);
+	});
+
+	it("updateEntryWithDifferentSizeTriggeringEviction", async () => {
+		const cache = new FixedSizeDocumentCache(6);
+		const doc1_v1 = new Uint8Array([1, 2]);
+		const doc1_v2 = new Uint8Array([1, 2, 3, 4]); // Larger version
+		const doc2 = new Uint8Array([5, 6]);
+		const doc3 = new Uint8Array([7, 8]);
+
+		cache.put(1, doc1_v1);
+		cache.put(2, doc2);
+		cache.put(3, doc3);
+
+		// Update doc1 with larger version, should evict doc2
+		cache.put(1, doc1_v2);
+
+		assert.equal(cache.get(1), doc1_v2);
+		assert.equal(cache.get(2), undefined); // Evicted
+		assert.equal(cache.get(3), doc3);
+	});
+
+	it("singleItemCache", async () => {
+		const cache = new FixedSizeDocumentCache(2);
+		const doc1 = new Uint8Array([1, 2]);
+		const doc2 = new Uint8Array([3, 4]);
+
+		cache.put(1, doc1);
+		assert.equal(cache.get(1), doc1);
+
+		cache.put(2, doc2);
+		assert.equal(cache.get(1), undefined); // Evicted
+		assert.equal(cache.get(2), doc2);
+	});
+
+	it("multipleGetsOnSameEntry", async () => {
+		const cache = new FixedSizeDocumentCache(4);
+		const doc1 = new Uint8Array([1, 2]);
+		const doc2 = new Uint8Array([3, 4]);
+		const doc3 = new Uint8Array([5, 6]);
+
+		cache.put(1, doc1);
+		cache.put(2, doc2);
+
+		// Multiple gets on doc1
+		cache.get(1);
+		cache.get(1);
+		cache.get(1);
+
+		// Order should be: 2 (LRU), 1 (MRU)
+		cache.put(3, doc3);
+
+		assert.equal(cache.get(1), doc1);
+		assert.equal(cache.get(2), undefined); // Evicted
+		assert.equal(cache.get(3), doc3);
+	});
+
+	it("exactlySizedEntry", async () => {
+		const cache = new FixedSizeDocumentCache(4);
+		const doc1 = new Uint8Array([1, 2, 3, 4]); // Exactly cache size
+
+		cache.put(1, doc1);
+		assert.equal(cache.get(1), doc1);
+
+		const doc2 = new Uint8Array([5, 6]);
+		cache.put(2, doc2);
+
+		// doc1 should be evicted to make room for doc2
+		assert.equal(cache.get(1), undefined);
+		assert.equal(cache.get(2), doc2);
+	});
+
+	it("updateEntryMakesItMostRecent", async () => {
+		const cache = new FixedSizeDocumentCache(6);
+		const doc1_v1 = new Uint8Array([1, 2]);
+		const doc1_v2 = new Uint8Array([3, 4]);
+		const doc2 = new Uint8Array([5, 6]);
+		const doc3 = new Uint8Array([7, 8]);
+		const doc4 = new Uint8Array([9, 10]);
+
+		cache.put(1, doc1_v1);
+		cache.put(2, doc2);
+		cache.put(3, doc3);
+
+		// Update doc1 (should move it to most recent)
+		cache.put(1, doc1_v2);
+
+		// Order should be: 2 (LRU), 3, 1 (MRU)
+		// Adding doc4 should evict doc2
+		cache.put(4, doc4);
+
+		assert.equal(cache.get(1), doc1_v2);
+		assert.equal(cache.get(2), undefined); // Evicted
+		assert.equal(cache.get(3), doc3);
+		assert.equal(cache.get(4), doc4);
+	});
+
+	it("alternatingAccessPattern", async () => {
+		const cache = new FixedSizeDocumentCache(4);
+		const doc1 = new Uint8Array([1, 2]);
+		const doc2 = new Uint8Array([3, 4]);
+		const doc3 = new Uint8Array([5, 6]);
+
+		cache.put(1, doc1);
+		cache.put(2, doc2);
+
+		// Alternate access between doc1 and doc2
+		cache.get(1);
+		cache.get(2);
+		cache.get(1);
+		cache.get(2);
+
+		// Order should be: 1, 2 (MRU)
+		cache.put(3, doc3);
+
+		assert.equal(cache.get(1), undefined); // Evicted
+		assert.equal(cache.get(2), doc2);
+		assert.equal(cache.get(3), doc3);
+	});
+
+	it("zeroByteDocs", async () => {
+		const cache = new FixedSizeDocumentCache(2);
+		const doc1 = new Uint8Array([]);
+		const doc2 = new Uint8Array([]);
+		const doc3 = new Uint8Array([1, 2]);
+
+		cache.put(1, doc1);
+		cache.put(2, doc2);
+		cache.put(3, doc3);
+
+		assert.equal(cache.get(1), doc1);
+		assert.equal(cache.get(2), doc2);
+		assert.equal(cache.get(3), doc3);
+	});
+});
diff --git a/frontend/sync-client/src/utils/fix-sized-cache.ts b/frontend/sync-client/src/utils/fix-sized-cache.ts
new file mode 100644
index 00000000..7adee7b0
--- /dev/null
+++ b/frontend/sync-client/src/utils/fix-sized-cache.ts
@@ -0,0 +1,113 @@
+// Implements an in-memory fixed-size cache for document contents,
+
+import type { VaultUpdateId } from "../persistence/database";
+
+// Doubly-linked list node for O(1) LRU operations
+class LRUNode {
+	public constructor(
+		public key: VaultUpdateId,
+		public value: Uint8Array,
+		public prev: LRUNode | null = null,
+		public next: LRUNode | null = null
+	) {}
+}
+
+// evicting the least recently used documents when the size limit is exceeded.
+export class FixedSizeDocumentCache {
+	private readonly maxSizeInBytes: number;
+	private currentSizeInBytes: number;
+	private readonly cache: Map<VaultUpdateId, LRUNode>;
+	private head: LRUNode | null; // Least recently used
+	private tail: LRUNode | null; // Most recently used
+
+	public constructor(maxSizeInBytes: number) {
+		this.maxSizeInBytes = maxSizeInBytes;
+		this.currentSizeInBytes = 0;
+		this.cache = new Map();
+		this.head = null;
+		this.tail = null;
+	}
+
+	public get(updateId: VaultUpdateId): Uint8Array | undefined {
+		const node = this.cache.get(updateId);
+		if (node) {
+			this.moveToTail(node);
+			return node.value;
+		}
+
+		return undefined;
+	}
+
+	public put(updateId: VaultUpdateId, content: Uint8Array): void {
+		if (content.byteLength > this.maxSizeInBytes) {
+			// Document is too large to fit in the cache
+			return;
+		}
+
+		// If the document is already in the cache, update it
+		const existingNode = this.cache.get(updateId);
+		if (existingNode != null) {
+			this.currentSizeInBytes -= existingNode.value.byteLength;
+			this.removeNode(existingNode);
+			this.cache.delete(updateId);
+		}
+
+		const newNode = new LRUNode(updateId, content);
+		this.cache.set(updateId, newNode);
+		this.addToTail(newNode);
+		this.currentSizeInBytes += content.byteLength;
+
+		// Evict least recently used documents if over size limit
+		while (this.currentSizeInBytes > this.maxSizeInBytes && this.head) {
+			const lruNode = this.head;
+			this.removeNode(lruNode);
+			this.cache.delete(lruNode.key);
+			this.currentSizeInBytes -= lruNode.value.byteLength;
+		}
+	}
+
+	public clear(): void {
+		this.cache.clear();
+		this.head = null;
+		this.tail = null;
+		this.currentSizeInBytes = 0;
+	}
+
+	private removeNode(node: LRUNode): void {
+		if (node.prev) {
+			node.prev.next = node.next;
+		} else {
+			this.head = node.next;
+		}
+
+		if (node.next) {
+			node.next.prev = node.prev;
+		} else {
+			this.tail = node.prev;
+		}
+
+		node.prev = null;
+		node.next = null;
+	}
+
+	private addToTail(node: LRUNode): void {
+		node.prev = this.tail;
+		node.next = null;
+
+		if (this.tail) {
+			this.tail.next = node;
+		}
+
+		this.tail = node;
+
+		this.head ??= node;
+	}
+
+	private moveToTail(node: LRUNode): void {
+		if (node === this.tail) {
+			return;
+		}
+		this.removeNode(node);
+		this.addToTail(node);
+	}
+}
diff --git a/frontend/sync-client/src/utils/is-binary.ts b/frontend/sync-client/src/utils/is-binary.ts
new file mode 100644
index 00000000..9e2de954
--- /dev/null
+++ b/frontend/sync-client/src/utils/is-binary.ts
@@ -0,0 +1,16 @@
+// Text is unlikely to contain null bytes, so we can use that to distinguish binary files.
+export function isBinary(content: Uint8Array): boolean {
+	for (const byte of content) {
+		if (byte === 0) {
+			return true;
+		}
+	}
+
+	try {
+		new TextDecoder("utf-8", { fatal: true }).decode(content);
+	} catch {
+		return true;
+	}
+
+	return false;
+}
diff --git a/sync-server/Cargo.lock b/sync-server/Cargo.lock
index c0a05a3c..5fed1ff9 100644
--- a/sync-server/Cargo.lock
+++ b/sync-server/Cargo.lock
@@ -1680,9 +1680,12 @@ dependencies = [
 
 [[package]]
 name = "reconcile-text"
-version = "0.5.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8d690c19b0bf6574cd3591d10f20df5aa52d2af95b8dcaacbc86893292ac8c5"
+checksum = "913440a3c2b90cd3ed3e967660f2bb624b71e8059b9fc86960a5f91bd1e2e353"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "redox_syscall"
diff --git a/sync-server/Cargo.toml b/sync-server/Cargo.toml
index 816d571c..575dd296 100644
--- a/sync-server/Cargo.toml
+++ b/sync-server/Cargo.toml
@@ -35,7 +35,7 @@ bimap = "0.6.3"
 ts-rs =  { version = "10.1", features = ["uuid-impl", "chrono-impl"] }
 serde_with = "3.15.1"
 base64 = "0.22.1"
-reconcile-text = "0.5.0"
+reconcile-text = { version = "0.7.1", features = ["serde"] }
 
 [profile.release]
 codegen-units = 1
diff --git a/sync-server/src/server.rs b/sync-server/src/server.rs
index f63ef551..a5506683 100644
--- a/sync-server/src/server.rs
+++ b/sync-server/src/server.rs
@@ -117,8 +117,12 @@ fn get_authed_routes(app_state: AppState) -> Router<AppState> {
             get(fetch_latest_document_version::fetch_latest_document_version),
         )
         .route(
-            "/vaults/:vault_id/documents/:document_id",
-            put(update_document::update_document),
+            "/vaults/:vault_id/documents/:document_id/binary",
+            put(update_document::update_binary),
+        )
+        .route(
+            "/vaults/:vault_id/documents/:document_id/text",
+            put(update_document::update_text),
         )
         .route(
             "/vaults/:vault_id/documents/:document_id/versions/:version_id",
diff --git a/sync-server/src/server/requests.rs b/sync-server/src/server/requests.rs
index 9d1e478b..2e956544 100644
--- a/sync-server/src/server/requests.rs
+++ b/sync-server/src/server/requests.rs
@@ -1,5 +1,6 @@
 use axum::body::Bytes;
 use axum_typed_multipart::{FieldData, TryFromMultipart};
+use reconcile_text::NumberOrString;
 use serde::{self, Deserialize};
 use ts_rs::TS;
 
@@ -20,17 +21,28 @@ pub struct CreateDocumentVersion {
     pub content: FieldData<Bytes>,
 }
 
-#[derive(TS, Debug, TryFromMultipart)]
-#[ts(export)]
-pub struct UpdateDocumentVersion {
+#[derive(Debug, TryFromMultipart)]
+pub struct UpdateBinaryDocumentVersion {
     pub parent_version_id: VaultUpdateId,
     pub relative_path: String,
 
-    #[ts(as = "Vec<u8>")]
     #[form_data(limit = "unlimited")]
     pub content: FieldData<Bytes>,
 }
 
+#[derive(TS, Debug, Deserialize)]
+#[serde(rename_all = "camelCase")]
+#[ts(export)]
+pub struct UpdateTextDocumentVersion {
+    #[ts(as = "i32")]
+    pub parent_version_id: VaultUpdateId,
+
+    pub relative_path: String,
+
+    #[ts(type = "Array<number | string>")]
+    pub content: Vec<NumberOrString>,
+}
+
 #[derive(TS, Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
diff --git a/sync-server/src/server/update_document.rs b/sync-server/src/server/update_document.rs
index bf11504c..cb81361b 100644
--- a/sync-server/src/server/update_document.rs
+++ b/sync-server/src/server/update_document.rs
@@ -6,23 +6,25 @@ use axum::{
 use axum_extra::TypedHeader;
 use axum_typed_multipart::TypedMultipart;
 use log::info;
-use reconcile_text::{BuiltinTokenizer, is_binary, reconcile};
+use reconcile_text::{BuiltinTokenizer, EditedText, reconcile};
 use serde::Deserialize;
 
 use super::{
-    device_id_header::DeviceIdHeader, requests::UpdateDocumentVersion,
+    device_id_header::DeviceIdHeader, requests::UpdateTextDocumentVersion,
     responses::DocumentUpdateResponse,
 };
 use crate::{
     app_state::{
         AppState,
-        database::models::{DocumentId, StoredDocumentVersion, VaultId},
+        database::models::{DocumentId, StoredDocumentVersion, VaultId, VaultUpdateId},
     },
     config::user_config::User,
     errors::{SyncServerError, not_found_error, server_error},
+    server::requests::UpdateBinaryDocumentVersion,
     utils::{
-        dedup_paths::dedup_paths, is_file_type_mergable::is_file_type_mergable,
-        normalize::normalize, sanitize_path::sanitize_path,
+        dedup_paths::dedup_paths, is_binary::is_binary,
+        is_file_type_mergable::is_file_type_mergable, normalize::normalize,
+        sanitize_path::sanitize_path,
     },
 };
 
@@ -30,13 +32,11 @@ use crate::{
 pub struct UpdateDocumentPathParams {
     #[serde(deserialize_with = "normalize")]
     vault_id: VaultId,
-
     document_id: DocumentId,
 }
 
 #[axum::debug_handler]
-#[allow(clippy::too_many_lines)]
-pub async fn update_document(
+pub async fn update_binary(
     Path(UpdateDocumentPathParams {
         vault_id,
         document_id,
@@ -44,25 +44,92 @@ pub async fn update_document(
     Extension(user): Extension<User>,
     TypedHeader(device_id): TypedHeader<DeviceIdHeader>,
     State(state): State<AppState>,
-    TypedMultipart(request): TypedMultipart<UpdateDocumentVersion>,
+    TypedMultipart(request): TypedMultipart<UpdateBinaryDocumentVersion>,
 ) -> Result<Json<DocumentUpdateResponse>, SyncServerError> {
-    // No need for a transaction as document versions are immutable
-    let parent_document = state
+    let parent_document = get_parent_document(&state, &vault_id, request.parent_version_id).await?;
+    let content = request.content.contents.to_vec();
+
+    update_document(
+        parent_document,
+        vault_id,
+        document_id,
+        user,
+        device_id,
+        state,
+        &request.relative_path,
+        content,
+    )
+    .await
+}
+
+#[axum::debug_handler]
+#[allow(clippy::too_many_lines)]
+pub async fn update_text(
+    Path(UpdateDocumentPathParams {
+        vault_id,
+        document_id,
+    }): Path<UpdateDocumentPathParams>,
+    Extension(user): Extension<User>,
+    TypedHeader(device_id): TypedHeader<DeviceIdHeader>,
+    State(state): State<AppState>,
+    Json(request): Json<UpdateTextDocumentVersion>,
+) -> Result<Json<DocumentUpdateResponse>, SyncServerError> {
+    let parent_document = get_parent_document(&state, &vault_id, request.parent_version_id).await?;
+
+    let edited_text = EditedText::from_diff(
+        str::from_utf8(&parent_document.content)
+            .expect("parent must be valid UTF-8 because it's a text document"),
+        request.content,
+        &*BuiltinTokenizer::Word,
+    );
+
+    let content = edited_text.apply().text().into_bytes();
+
+    update_document(
+        parent_document,
+        vault_id,
+        document_id,
+        user,
+        device_id,
+        state,
+        &request.relative_path,
+        content,
+    )
+    .await
+}
+
+async fn get_parent_document(
+    state: &AppState,
+    vault_id: &VaultId,
+    parent_version_id: VaultUpdateId,
+) -> Result<StoredDocumentVersion, SyncServerError> {
+    state
         .database
-        .get_document_version(&vault_id, request.parent_version_id, None)
+        .get_document_version(vault_id, parent_version_id, None)
         .await
         .map_err(server_error)?
         .map_or_else(
             || {
                 Err(not_found_error(anyhow!(
-                    "Parent version with id `{}` not found",
-                    request.parent_version_id
+                    "Parent version with id `{parent_version_id}` not found"
                 )))
             },
             Ok,
-        )?;
+        )
+}
 
-    let sanitized_relative_path = sanitize_path(&request.relative_path);
+#[allow(clippy::too_many_lines, clippy::too_many_arguments)]
+async fn update_document(
+    parent_document: StoredDocumentVersion,
+    vault_id: VaultId,
+    document_id: DocumentId,
+    user: User,
+    device_id: DeviceIdHeader,
+    state: AppState,
+    relative_path: &str,
+    content: Vec<u8>,
+) -> Result<Json<DocumentUpdateResponse>, SyncServerError> {
+    let sanitized_relative_path = sanitize_path(relative_path);
 
     let mut transaction = state
         .database
@@ -102,8 +169,6 @@ pub async fn update_document(
         )));
     }
 
-    let content = request.content.contents.to_vec();
-
     // Return the latest version if the content and path are the same as the latest
     // version
     if content == latest_version.content && sanitized_relative_path == latest_version.relative_path
diff --git a/sync-server/src/utils.rs b/sync-server/src/utils.rs
index b70705f6..7345880d 100644
--- a/sync-server/src/utils.rs
+++ b/sync-server/src/utils.rs
@@ -1,4 +1,5 @@
 pub mod dedup_paths;
+pub mod is_binary;
 pub mod is_file_type_mergable;
 pub mod normalize;
 pub mod rotating_file_writer;
diff --git a/sync-server/src/utils/is_binary.rs b/sync-server/src/utils/is_binary.rs
new file mode 100644
index 00000000..09bfcf94
--- /dev/null
+++ b/sync-server/src/utils/is_binary.rs
@@ -0,0 +1,26 @@
+/// Heuristically determine if the given data is a binary or a text file's
+/// content.
+///
+/// Only text inputs can be reconciled using the crate's functions.
+#[must_use]
+pub fn is_binary(data: &[u8]) -> bool {
+    if data.contains(&0) {
+        // Even though the NUL character is valid in UTF-8, it's highly suspicious in
+        // human-readable text.
+        return true;
+    }
+
+    std::str::from_utf8(data).is_err()
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_is_binary() {
+        assert!(is_binary(&[0, 159, 146, 150]));
+        assert!(is_binary(&[0, 12]));
+        assert!(!is_binary(b"hello"));
+    }
+}
diff --git a/sync-server/src/utils/rotating_file_writer.rs b/sync-server/src/utils/rotating_file_writer.rs
index 9f59c5e5..5bf19b5b 100644
--- a/sync-server/src/utils/rotating_file_writer.rs
+++ b/sync-server/src/utils/rotating_file_writer.rs
@@ -93,6 +93,26 @@ impl RotatingFileWriter {
         SystemTime::now() >= inner.next_rotation_time
     }
 
+    fn open_or_create_log_file(inner: &mut RotatingFileWriterInner) -> io::Result<()> {
+        // If we haven't reached rotation time and there's an existing log file, reuse it
+        if !Self::should_rotate(inner)
+            && let Some(latest_file) =
+                Self::find_latest_log_file(&inner.directory, &inner.file_prefix)
+        {
+            let filepath = inner.directory.join(&latest_file);
+            let file = OpenOptions::new()
+                .create(true)
+                .append(true)
+                .open(&filepath)?;
+
+            inner.current_file = Some(file);
+            return Ok(());
+        }
+
+        // Otherwise, create a new log file with current timestamp
+        Self::rotate(inner)
+    }
+
     fn rotate(inner: &mut RotatingFileWriterInner) -> io::Result<()> {
         let timestamp = Local::now().format("%Y-%m-%d_%H-%M-%S");
         let filename = format!("{}.{}.log", inner.file_prefix, timestamp);
@@ -114,7 +134,9 @@ impl Write for RotatingFileWriter {
     fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
         let mut inner = self.inner.lock().unwrap();
 
-        if inner.current_file.is_none() || Self::should_rotate(&inner) {
+        if inner.current_file.is_none() {
+            Self::open_or_create_log_file(&mut inner)?;
+        } else if Self::should_rotate(&inner) {
             Self::rotate(&mut inner)?;
         }
 
@@ -328,6 +350,7 @@ mod tests {
     #[test]
     fn test_restart_behavior() {
         let temp_dir = std::env::temp_dir().join("test_restart_behavior");
+        let _ = fs::remove_dir_all(&temp_dir);
 
         // Create initial writer and write some data
         {

From e75298c4f135bc16b5a0775c8ae3384541019268 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 16 Nov 2025 22:10:42 +0000
Subject: [PATCH 610/761] Bump versions to 0.10.0

---
 frontend/local-client-cli/package.json | 2 +-
 frontend/obsidian-plugin/manifest.json | 2 +-
 frontend/obsidian-plugin/package.json  | 2 +-
 frontend/package-lock.json             | 8 ++++----
 frontend/sync-client/package.json      | 2 +-
 frontend/test-client/package.json      | 2 +-
 manifest.json                          | 2 +-
 sync-server/Cargo.lock                 | 2 +-
 sync-server/Cargo.toml                 | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/frontend/local-client-cli/package.json b/frontend/local-client-cli/package.json
index ede6b4a5..179e03e4 100644
--- a/frontend/local-client-cli/package.json
+++ b/frontend/local-client-cli/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "local-client-cli",
-	"version": "0.9.2",
+	"version": "0.10.0",
 	"description": "Standalone CLI for VaultLink sync client",
 	"private": false,
 	"bin": {
diff --git a/frontend/obsidian-plugin/manifest.json b/frontend/obsidian-plugin/manifest.json
index 7ad75bea..34e9302b 100644
--- a/frontend/obsidian-plugin/manifest.json
+++ b/frontend/obsidian-plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.9.2",
+	"version": "0.10.0",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index 5996d532..12a52f28 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -1,6 +1,6 @@
 {
     "name": "vault-link-obsidian-plugin",
-    "version": "0.9.2",
+    "version": "0.10.0",
     "description": "This is a sample plugin for Obsidian (https://obsidian.md)",
     "main": "main.js",
     "scripts": {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 31dec1fb..2b52eb1d 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -21,7 +21,7 @@
 			}
 		},
 		"local-client-cli": {
-			"version": "0.9.2",
+			"version": "0.10.0",
 			"dependencies": {
 				"commander": "^14.0.2"
 			},
@@ -4658,7 +4658,7 @@
 		},
 		"obsidian-plugin": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.9.2",
+			"version": "0.10.0",
 			"license": "MIT",
 			"devDependencies": {
 				"@plausible-analytics/tracker": "^0.4.3",
@@ -4687,7 +4687,7 @@
 			}
 		},
 		"sync-client": {
-			"version": "0.9.2",
+			"version": "0.10.0",
 			"dependencies": {
 				"byte-base64": "^1.1.0",
 				"minimatch": "^10.0.1",
@@ -4736,7 +4736,7 @@
 			"license": "MIT"
 		},
 		"test-client": {
-			"version": "0.9.2",
+			"version": "0.10.0",
 			"bin": {
 				"test-client": "dist/cli.js"
 			},
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index 6483c93c..d35e5a3d 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "sync-client",
-    "version": "0.9.2",
+    "version": "0.10.0",
     "main": "dist/sync-client.node.js",
     "browser": "dist/sync-client.web.js",
     "types": "dist/types/index.d.ts",
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index 90ff83d0..93d331bf 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "test-client",
-	"version": "0.9.2",
+	"version": "0.10.0",
 	"private": true,
 	"bin": {
 		"test-client": "./dist/cli.js"
diff --git a/manifest.json b/manifest.json
index 7ad75bea..34e9302b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.9.2",
+	"version": "0.10.0",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/sync-server/Cargo.lock b/sync-server/Cargo.lock
index 5fed1ff9..132b4ca0 100644
--- a/sync-server/Cargo.lock
+++ b/sync-server/Cargo.lock
@@ -2310,7 +2310,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.9.2"
+version = "0.10.0"
 dependencies = [
  "anyhow",
  "axum",
diff --git a/sync-server/Cargo.toml b/sync-server/Cargo.toml
index 575dd296..34319f58 100644
--- a/sync-server/Cargo.toml
+++ b/sync-server/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.9.2"
+version = "0.10.0"
 
 [dependencies]
 serde = { version = "1.0.219", default-features = false, features = ["derive"] }

From c08feba0ad550fbfc8e22971017b271437d9085f Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Wed, 19 Nov 2025 19:53:10 +0000
Subject: [PATCH 611/761] Improve settings (#168)

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 frontend/local-client-cli/Dockerfile          |  6 +-
 frontend/local-client-cli/src/args.ts         | 16 ++++-
 frontend/local-client-cli/src/cli.ts          | 39 ++++++++++-
 frontend/local-client-cli/src/healthcheck.ts  | 66 +++++++++++++++++++
 frontend/local-client-cli/webpack.config.js   |  7 +-
 frontend/obsidian-plugin/package.json         |  5 +-
 .../obsidian-plugin/src/vault-link-plugin.ts  | 41 ------------
 .../views/cursors/remote-cursors-plugin.ts    |  4 +-
 .../src/views/settings/settings-tab.ts        | 49 ++++++++------
 frontend/package-lock.json                    | 39 ++---------
 frontend/sync-client/package.json             |  1 +
 .../sync-client/src/persistence/settings.ts   |  6 +-
 frontend/sync-client/src/sync-client.ts       | 38 +++++++++--
 .../sync-client/src/sync-operations/syncer.ts |  4 +-
 .../src/utils/fix-sized-cache.test.ts         | 36 ++++++++++
 .../sync-client/src/utils/fix-sized-cache.ts  | 28 ++++----
 .../sync-client/src/utils/set-up-telemetry.ts | 33 ++++++++++
 package-lock.json                             |  6 ++
 sync-server/src/main.rs                       |  6 +-
 19 files changed, 302 insertions(+), 128 deletions(-)
 create mode 100644 frontend/local-client-cli/src/healthcheck.ts
 create mode 100644 frontend/sync-client/src/utils/set-up-telemetry.ts
 create mode 100644 package-lock.json

diff --git a/frontend/local-client-cli/Dockerfile b/frontend/local-client-cli/Dockerfile
index 6b8e1d6c..695ab587 100644
--- a/frontend/local-client-cli/Dockerfile
+++ b/frontend/local-client-cli/Dockerfile
@@ -16,10 +16,14 @@ LABEL org.opencontainers.image.licenses="MIT"
 LABEL org.opencontainers.image.authors="andras@schmelczer.dev"
 
 COPY --from=builder /build/local-client-cli/dist/cli.js /app/cli.js
+COPY --from=builder /build/local-client-cli/dist/healthcheck.js /app/healthcheck.js
+
+HEALTHCHECK --interval=10s --timeout=5s --start-period=60s --retries=1 \
+    CMD node /app/healthcheck.js /tmp/vaultlink-health.json
 
 WORKDIR /vault
 
 VOLUME ["/vault"]
 
-ENTRYPOINT ["node", "/app/cli.js"]
+ENTRYPOINT ["node", "/app/cli.js", "--health", "/tmp/vaultlink-health.json"]
 CMD ["--help"]
diff --git a/frontend/local-client-cli/src/args.ts b/frontend/local-client-cli/src/args.ts
index 08ef2a6b..fc2d4a95 100644
--- a/frontend/local-client-cli/src/args.ts
+++ b/frontend/local-client-cli/src/args.ts
@@ -12,6 +12,8 @@ export interface CliArgs {
 	ignorePatterns?: string[];
 	webSocketRetryIntervalMs?: number;
 	logLevel: LogLevel;
+	health?: string;
+	enableTelemetry?: boolean;
 }
 
 export function parseArgs(argv: string[]): CliArgs {
@@ -51,6 +53,14 @@ export function parseArgs(argv: string[]): CliArgs {
 			"[OPTIONAL] Log level (DEBUG, INFO, WARNING, ERROR)",
 			"INFO"
 		)
+		.option(
+			"--health <path>",
+			"[OPTIONAL] Path to health status file for Docker healthcheck"
+		)
+		.option(
+			"--enable-telemetry",
+			"[OPTIONAL] Enable telemetry (disabled by default)"
+		)
 		.addHelpText(
 			"after",
 			`
@@ -78,6 +88,8 @@ Examples:
 		| number
 		| undefined;
 	const logLevelStr = (opts.logLevel as string | undefined) ?? "INFO";
+	const health = opts.health as string | undefined;
+	const enableTelemetry = opts.enableTelemetry as boolean | undefined;
 	/* eslint-enable @typescript-eslint/no-unsafe-type-assertion */
 
 	if (localPath === undefined) {
@@ -117,6 +129,8 @@ Examples:
 		maxFileSizeMB: maxFileSizeMb,
 		ignorePatterns: ignorePattern,
 		webSocketRetryIntervalMs: websocketRetryIntervalMs,
-		logLevel
+		logLevel,
+		health,
+		enableTelemetry
 	};
 }
diff --git a/frontend/local-client-cli/src/cli.ts b/frontend/local-client-cli/src/cli.ts
index 5a3c6546..2a4cef98 100644
--- a/frontend/local-client-cli/src/cli.ts
+++ b/frontend/local-client-cli/src/cli.ts
@@ -1,5 +1,7 @@
 import * as path from "path";
 import * as fs from "fs/promises";
+import * as fsSync from "fs";
+import type { NetworkConnectionStatus } from "sync-client";
 import {
 	SyncClient,
 	DEFAULT_SETTINGS,
@@ -13,6 +15,19 @@ import { FileWatcher } from "./file-watcher";
 import { formatLogLine, colorize, styleText } from "./logger-formatter";
 import packageJson from "../package.json";
 
+function writeHealthStatus(
+	filePath: string,
+	connectionStatus: NetworkConnectionStatus
+): void {
+	try {
+		fsSync.writeFileSync(filePath, JSON.stringify(connectionStatus));
+	} catch (error) {
+		console.error(
+			`Failed to write health status to ${filePath}: ${error instanceof Error ? error.message : String(error)}`
+		);
+	}
+}
+
 const LOG_LEVEL_ORDER = {
 	[LogLevel.DEBUG]: 0,
 	[LogLevel.INFO]: 1,
@@ -78,11 +93,13 @@ async function main(): Promise<void> {
 		syncConcurrency:
 			args.syncConcurrency ?? DEFAULT_SETTINGS.syncConcurrency,
 		maxFileSizeMB: args.maxFileSizeMB ?? DEFAULT_SETTINGS.maxFileSizeMB,
+		diffCacheSizeMB: DEFAULT_SETTINGS.diffCacheSizeMB,
 		ignorePatterns,
 		webSocketRetryIntervalMs:
 			args.webSocketRetryIntervalMs ??
 			DEFAULT_SETTINGS.webSocketRetryIntervalMs,
-		isSyncEnabled: true
+		isSyncEnabled: true,
+		enableTelemetry: args.enableTelemetry ?? false
 	};
 
 	const client = await SyncClient.create({
@@ -119,6 +136,21 @@ async function main(): Promise<void> {
 		nativeLineEndings: process.platform === "win32" ? "\r\n" : "\n"
 	});
 
+	if (args.health !== undefined) {
+		const healthFile = args.health;
+		const healthInterval = setInterval(() => {
+			void client.checkConnection().then((status) => {
+				writeHealthStatus(healthFile, status);
+			});
+		}, 30 * 1000); // every 30 seconds
+		const clearHealthInterval = (): void => {
+			clearInterval(healthInterval);
+		};
+		process.on("SIGINT", clearHealthInterval);
+		process.on("SIGTERM", clearHealthInterval);
+		process.on("exit", clearHealthInterval);
+	}
+
 	// Add colored log formatter with level filtering
 	client.logger.addOnMessageListener((logLine) => {
 		// Only show messages at or above the configured log level
@@ -132,7 +164,10 @@ async function main(): Promise<void> {
 	const fileWatcher = new FileWatcher(absolutePath, client);
 
 	client.addWebSocketStatusChangeListener(() => {
-		client.logger.info("WebSocket status changed");
+		const isConnected = client.isWebSocketConnected;
+		client.logger.info(
+			`WebSocket status changed: ${isConnected ? "connected" : "disconnected"}`
+		);
 	});
 
 	client.addRemainingSyncOperationsListener((remaining) => {
diff --git a/frontend/local-client-cli/src/healthcheck.ts b/frontend/local-client-cli/src/healthcheck.ts
new file mode 100644
index 00000000..256cd2d8
--- /dev/null
+++ b/frontend/local-client-cli/src/healthcheck.ts
@@ -0,0 +1,66 @@
+#!/usr/bin/env node
+
+/**
+ * Healthcheck script for Docker container
+ * Checks if the sync client is connected to the server
+ */
+
+import * as fs from "fs";
+import type { NetworkConnectionStatus } from "sync-client";
+
+function isHealthStatus(value: unknown): value is NetworkConnectionStatus {
+	if (typeof value !== "object" || value === null) {
+		return false;
+	}
+
+	return (
+		"isSuccessful" in value &&
+		typeof value.isSuccessful === "boolean" &&
+		"isWebSocketConnected" in value &&
+		typeof value.isWebSocketConnected === "boolean" &&
+		"serverMessage" in value &&
+		typeof value.serverMessage === "string"
+	);
+}
+
+function main(): void {
+	if (process.argv.length < 3) {
+		console.error("Usage: healthcheck <path-to-health-file>");
+		process.exit(1);
+	}
+	const [, , healthFile] = process.argv;
+
+	try {
+		// Check if health file exists
+		if (!fs.existsSync(healthFile)) {
+			console.error(`Health file does not exist: ${healthFile}`);
+			process.exit(1);
+		}
+
+		// Read and parse health status
+		const content = fs.readFileSync(healthFile, "utf-8");
+		const parsed: unknown = JSON.parse(content);
+
+		// Validate the parsed object using type guard
+		if (!isHealthStatus(parsed)) {
+			throw new Error("Invalid health status format");
+		}
+
+		const status = parsed;
+
+		if (!status.isSuccessful || !status.isWebSocketConnected) {
+			console.error("Not connected to server: " + status.serverMessage);
+			process.exit(1);
+		}
+
+		console.log("Healthy: Connected to server");
+		process.exit(0);
+	} catch (error) {
+		console.error(
+			`Health check failed: ${error instanceof Error ? error.message : String(error)}`
+		);
+		process.exit(1);
+	}
+}
+
+main();
diff --git a/frontend/local-client-cli/webpack.config.js b/frontend/local-client-cli/webpack.config.js
index e17754b2..32b3b125 100644
--- a/frontend/local-client-cli/webpack.config.js
+++ b/frontend/local-client-cli/webpack.config.js
@@ -2,7 +2,10 @@ const path = require("path");
 const webpack = require("webpack");
 
 module.exports = {
-		entry: "./src/cli.ts",
+		entry: {
+			cli: "./src/cli.ts",
+			healthcheck: "./src/healthcheck.ts"
+		},
 		target: "node",
 		mode: "production",
 		optimization: {
@@ -21,7 +24,7 @@ module.exports = {
 		},
 		output: {
 			globalObject: "this",
-			filename: "cli.js",
+			filename: "[name].js",
 			path: path.resolve(__dirname, "dist")
 		},
 		plugins: [
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index 12a52f28..8c4fcee2 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -13,8 +13,6 @@
     "author": "",
     "license": "MIT",
     "devDependencies": {
-        "@plausible-analytics/tracker": "^0.4.3",
-        "@sentry/browser": "^10.8.0",
         "@types/node": "^24.8.1",
         "css-loader": "^7.1.2",
         "date-fns": "^4.1.0",
@@ -22,7 +20,7 @@
         "fs-extra": "^11.3.0",
         "mini-css-extract-plugin": "^2.9.2",
         "obsidian": "1.10.2",
-        "reconcile-text": "^0.5.0",
+        "reconcile-text": "^0.7.1",
         "resolve-url-loader": "^5.0.0",
         "sass": "^1.91.0",
         "sass-loader": "^16.0.5",
@@ -33,7 +31,6 @@
         "tsx": "^4.20.5",
         "typescript": "5.8.3",
         "url": "^0.11.4",
-        "virtual-scroller": "^1.13.1",
         "webpack": "^5.99.9",
         "webpack-cli": "^6.0.1"
     }
diff --git a/frontend/obsidian-plugin/src/vault-link-plugin.ts b/frontend/obsidian-plugin/src/vault-link-plugin.ts
index 25a03ff6..fc16aae2 100644
--- a/frontend/obsidian-plugin/src/vault-link-plugin.ts
+++ b/frontend/obsidian-plugin/src/vault-link-plugin.ts
@@ -11,8 +11,6 @@ import { HistoryView } from "./views/history/history-view";
 import { StatusBar } from "./views/status-bar/status-bar";
 import { LogsView } from "./views/logs/logs-view";
 import { StatusDescription } from "./views/status-description/status-description";
-import * as Sentry from "@sentry/browser";
-import { init as plausibleInit } from "@plausible-analytics/tracker";
 import {
 	SyncClient,
 	rateLimit,
@@ -50,45 +48,6 @@ export default class VaultLinkPlugin extends Plugin {
 			".trash/**"
 		);
 
-		plausibleInit({
-			domain: "vault-link",
-			endpoint: "https://stats.schmelczer.dev/status",
-			autoCapturePageviews: true,
-			captureOnLocalhost: true,
-			logging: true
-		});
-
-		Sentry.init({
-			dsn: "https://56accd39d92442e788a457a04623cf57@bugs.schmelczer.dev/1",
-			skipBrowserExtensionCheck: false
-		});
-
-		const onError = (event: ErrorEvent): void => {
-			Sentry.captureException(event.error, {
-				extra: {
-					message: event.message,
-					filename: event.filename,
-					lineno: event.lineno,
-					colno: event.colno
-				}
-			});
-		};
-		window.addEventListener("error", onError);
-		this.disposables.push(() => {
-			window.removeEventListener("error", onError);
-		});
-
-		const onUnhandledRejection = (event: PromiseRejectionEvent): void => {
-			Sentry.captureException(event.reason);
-		};
-		window.addEventListener("unhandledrejection", onUnhandledRejection);
-		this.disposables.push(() => {
-			window.removeEventListener(
-				"unhandledrejection",
-				onUnhandledRejection
-			);
-		});
-
 		const isDebugBuild = process.env.NODE_ENV === "development";
 		const debugOptions = isDebugBuild
 			? {
diff --git a/frontend/obsidian-plugin/src/views/cursors/remote-cursors-plugin.ts b/frontend/obsidian-plugin/src/views/cursors/remote-cursors-plugin.ts
index 86ddd6cd..5f867f90 100644
--- a/frontend/obsidian-plugin/src/views/cursors/remote-cursors-plugin.ts
+++ b/frontend/obsidian-plugin/src/views/cursors/remote-cursors-plugin.ts
@@ -33,7 +33,7 @@ export class RemoteCursorsPluginValue implements PluginValue {
 		isOutdated: boolean;
 	}[] = [];
 
-	private static app: App;
+	private static app?: App;
 	public decorations: DecorationSet = RangeSet.of([]);
 
 	public static setCursors(
@@ -88,7 +88,7 @@ export class RemoteCursorsPluginValue implements PluginValue {
 	private static findFileForEditor(
 		editor: EditorView
 	): RelativePath | undefined {
-		return RemoteCursorsPluginValue.app.workspace
+		return RemoteCursorsPluginValue.app?.workspace
 			.getLeavesOfType("markdown")
 			.map((leaf) => leaf.view)
 			.filter((view) => view instanceof MarkdownView)
diff --git a/frontend/obsidian-plugin/src/views/settings/settings-tab.ts b/frontend/obsidian-plugin/src/views/settings/settings-tab.ts
index 2d129edc..e4c16e6e 100644
--- a/frontend/obsidian-plugin/src/views/settings/settings-tab.ts
+++ b/frontend/obsidian-plugin/src/views/settings/settings-tab.ts
@@ -72,6 +72,7 @@ export class SyncSettingsTab extends PluginSettingTab {
 		this.renderSettingsHeader(containerEl);
 		this.renderConnectionSettings(containerEl);
 		this.renderSyncSettings(containerEl);
+		this.renderMiscSettings(containerEl);
 	}
 
 	public hide(): void {
@@ -193,38 +194,28 @@ export class SyncSettingsTab extends PluginSettingTab {
 					})
 			);
 
-		new Setting(containerEl)
-			.addButton((button) =>
-				button.setButtonText("Apply").onClick(async () => {
+		new Setting(containerEl).addButton((button) =>
+			button
+				.setButtonText("Apply & test connection")
+				.onClick(async () => {
 					if (this.areThereUnsavedChanges()) {
 						await this.syncClient.setSettings({
 							vaultName: this.editedVaultName,
 							remoteUri: this.editedServerUri,
 							token: this.editedToken
 						});
+						new Notice("Checking connection to the server...");
 						new Notice(
-							"The changes have been applied successfully!"
+							(
+								await this.syncClient.checkConnection()
+							).serverMessage
 						);
 						await this.statusDescription.updateConnectionState();
 					} else {
 						new Notice("No changes to apply");
 					}
 				})
-			)
-			.addButton((button) =>
-				button.setButtonText("Test connection").onClick(async () => {
-					if (this.areThereUnsavedChanges()) {
-						new Notice(
-							"There are unsaved changes, testing with the currently saved settings"
-						);
-					}
-
-					new Notice(
-						(await this.syncClient.checkConnection()).serverMessage
-					);
-					await this.statusDescription.updateConnectionState();
-				})
-			);
+		);
 	}
 
 	private areThereUnsavedChanges(): boolean {
@@ -339,6 +330,26 @@ export class SyncSettingsTab extends PluginSettingTab {
 			);
 	}
 
+	private renderMiscSettings(containerEl: HTMLElement): void {
+		containerEl.createEl("h3", { text: "Other" });
+
+		new Setting(containerEl)
+			.setName("Enable telemetry")
+			.setDesc(
+				"Allow sending anonymous usage data & error reports to help improve the plugin. The data collected is never shared with third parties."
+			)
+			.setTooltip(
+				"Allow sending anonymous usage data & error reports to help improve the plugin. The data collected is never shared with third parties."
+			)
+			.addToggle((toggle) =>
+				toggle
+					.setValue(this.syncClient.getSettings().enableTelemetry)
+					.onChange(async (value) =>
+						this.syncClient.setSetting("enableTelemetry", value)
+					)
+			);
+	}
+
 	private setStatusDescriptionSubscription(
 		newSubscription?: () => unknown
 	): void {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 2b52eb1d..bbb98a1a 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -871,13 +871,6 @@
 				"url": "https://opencollective.com/parcel"
 			}
 		},
-		"node_modules/@plausible-analytics/tracker": {
-			"version": "0.4.3",
-			"resolved": "https://registry.npmjs.org/@plausible-analytics/tracker/-/tracker-0.4.3.tgz",
-			"integrity": "sha512-RKTgH5xu7Pa77VS4OEnS4woPhDxRgWLJlt9f6JhwgBC9ilknCfJIVEN2A1D8OR7hzgxMQF/hPyls9iN9ReAm3Q==",
-			"dev": true,
-			"license": "MIT"
-		},
 		"node_modules/@sentry-internal/browser-utils": {
 			"version": "10.8.0",
 			"resolved": "https://registry.npmjs.org/@sentry-internal/browser-utils/-/browser-utils-10.8.0.tgz",
@@ -3488,10 +3481,9 @@
 			}
 		},
 		"node_modules/reconcile-text": {
-			"version": "0.5.0",
-			"resolved": "https://registry.npmjs.org/reconcile-text/-/reconcile-text-0.5.0.tgz",
-			"integrity": "sha512-zki3lqw9Oxdhm9ZvDN17VyYoL1Isc8BEL07ILVDE2yGfNEI7thrkczoNCUr+hkFU2rzZtfxECTG0b7p61AJ6wg==",
-			"dev": true,
+			"version": "0.7.1",
+			"resolved": "https://registry.npmjs.org/reconcile-text/-/reconcile-text-0.7.1.tgz",
+			"integrity": "sha512-khedcYvAKs7ELKh5Z8mz2vyomMY5TqznV1dB+k/7qUAX9cheMNN5/EPJVQYZepOMunYbnQitvhFJX3kD4IMcNw==",
 			"license": "MIT"
 		},
 		"node_modules/regex-parser": {
@@ -3499,11 +3491,6 @@
 			"dev": true,
 			"license": "MIT"
 		},
-		"node_modules/request-animation-frame-timeout": {
-			"version": "2.0.4",
-			"dev": true,
-			"license": "MIT"
-		},
 		"node_modules/require-directory": {
 			"version": "2.1.1",
 			"dev": true,
@@ -4329,14 +4316,6 @@
 			"resolved": "obsidian-plugin",
 			"link": true
 		},
-		"node_modules/virtual-scroller": {
-			"version": "1.13.1",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"request-animation-frame-timeout": "^2.0.3"
-			}
-		},
 		"node_modules/w3c-keyname": {
 			"version": "2.2.8",
 			"resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.8.tgz",
@@ -4661,8 +4640,6 @@
 			"version": "0.10.0",
 			"license": "MIT",
 			"devDependencies": {
-				"@plausible-analytics/tracker": "^0.4.3",
-				"@sentry/browser": "^10.8.0",
 				"@types/node": "^24.8.1",
 				"css-loader": "^7.1.2",
 				"date-fns": "^4.1.0",
@@ -4670,7 +4647,7 @@
 				"fs-extra": "^11.3.0",
 				"mini-css-extract-plugin": "^2.9.2",
 				"obsidian": "1.10.2",
-				"reconcile-text": "^0.5.0",
+				"reconcile-text": "^0.7.1",
 				"resolve-url-loader": "^5.0.0",
 				"sass": "^1.91.0",
 				"sass-loader": "^16.0.5",
@@ -4681,7 +4658,6 @@
 				"tsx": "^4.20.5",
 				"typescript": "5.8.3",
 				"url": "^0.11.4",
-				"virtual-scroller": "^1.13.1",
 				"webpack": "^5.99.9",
 				"webpack-cli": "^6.0.1"
 			}
@@ -4696,6 +4672,7 @@
 				"uuid": "^13.0.0"
 			},
 			"devDependencies": {
+				"@sentry/browser": "^10.8.0",
 				"@types/node": "^24.8.1",
 				"ts-loader": "^9.5.2",
 				"tslib": "2.8.1",
@@ -4729,12 +4706,6 @@
 				"url": "https://github.com/sponsors/isaacs"
 			}
 		},
-		"sync-client/node_modules/reconcile-text": {
-			"version": "0.7.1",
-			"resolved": "https://registry.npmjs.org/reconcile-text/-/reconcile-text-0.7.1.tgz",
-			"integrity": "sha512-khedcYvAKs7ELKh5Z8mz2vyomMY5TqznV1dB+k/7qUAX9cheMNN5/EPJVQYZepOMunYbnQitvhFJX3kD4IMcNw==",
-			"license": "MIT"
-		},
 		"test-client": {
 			"version": "0.10.0",
 			"bin": {
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index d35e5a3d..75ad6e49 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -28,6 +28,7 @@
         "webpack": "^5.99.9",
         "webpack-cli": "^6.0.1",
         "webpack-merge": "^6.0.1",
+        "@sentry/browser": "^10.8.0",
         "ws": "^8.18.3"
     }
 }
diff --git a/frontend/sync-client/src/persistence/settings.ts b/frontend/sync-client/src/persistence/settings.ts
index b0aff937..87821728 100644
--- a/frontend/sync-client/src/persistence/settings.ts
+++ b/frontend/sync-client/src/persistence/settings.ts
@@ -9,6 +9,8 @@ export interface SyncSettings {
 	maxFileSizeMB: number;
 	ignorePatterns: string[];
 	webSocketRetryIntervalMs: number;
+	diffCacheSizeMB: number;
+	enableTelemetry: boolean;
 }
 
 export const DEFAULT_SETTINGS: SyncSettings = {
@@ -19,7 +21,9 @@ export const DEFAULT_SETTINGS: SyncSettings = {
 	isSyncEnabled: false,
 	maxFileSizeMB: 10,
 	ignorePatterns: [],
-	webSocketRetryIntervalMs: 3500
+	webSocketRetryIntervalMs: 3500,
+	diffCacheSizeMB: 4,
+	enableTelemetry: false
 };
 
 export class Settings {
diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts
index 33a1cac5..9547af65 100644
--- a/frontend/sync-client/src/sync-client.ts
+++ b/frontend/sync-client/src/sync-client.ts
@@ -22,11 +22,13 @@ import type { CursorSpan } from "./services/types/CursorSpan";
 import type { MaybeOutdatedClientCursors } from "./types/maybe-outdated-client-cursors";
 import { FileChangeNotifier } from "./sync-operations/file-change-notifier";
 import { FixedSizeDocumentCache } from "./utils/fix-sized-cache";
+import { setUpTelemetry } from "./utils/set-up-telemetry";
 
 export class SyncClient {
 	private static readonly MINIMUM_SAVE_INTERVAL_MS = 1000;
 	private hasStartedOfflineSync = false;
 	private hasFinishedOfflineSync = false;
+	private unloadTelemetry?: () => void;
 
 	private constructor(
 		private readonly history: SyncHistory,
@@ -38,8 +40,13 @@ export class SyncClient {
 		private readonly _logger: Logger,
 		private readonly connectionStatus: ConnectionStatus,
 		private readonly cursorTracker: CursorTracker,
-		private readonly fileChangeNotifier: FileChangeNotifier
+		private readonly fileChangeNotifier: FileChangeNotifier,
+		private readonly contentCache: FixedSizeDocumentCache
 	) {
+		if (settings.getSettings().enableTelemetry) {
+			this.unloadTelemetry = setUpTelemetry();
+		}
+
 		this.settings.addOnSettingsChangeListener(
 			async (newSettings, oldSettings) => {
 				if (newSettings.vaultName !== oldSettings.vaultName) {
@@ -53,6 +60,24 @@ export class SyncClient {
 						this.stop();
 					}
 				}
+
+				if (
+					newSettings.diffCacheSizeMB !== oldSettings.diffCacheSizeMB
+				) {
+					this.contentCache.resize(
+						newSettings.diffCacheSizeMB * 1024 * 1024
+					);
+				}
+
+				if (
+					newSettings.enableTelemetry !== oldSettings.enableTelemetry
+				) {
+					if (newSettings.enableTelemetry) {
+						this.unloadTelemetry = setUpTelemetry();
+					} else {
+						this.unloadTelemetry?.();
+					}
+				}
 			}
 		);
 	}
@@ -65,6 +90,10 @@ export class SyncClient {
 		return this.database.length;
 	}
 
+	public get isWebSocketConnected(): boolean {
+		return this.webSocketManager.isWebSocketConnected;
+	}
+
 	public static async create({
 		fs,
 		persistence,
@@ -152,8 +181,7 @@ export class SyncClient {
 			settings,
 			syncService,
 			fileOperations,
-			unrestrictedSyncer,
-			contentCache
+			unrestrictedSyncer
 		);
 
 		const webSocketManager = new WebSocketManager(
@@ -182,7 +210,8 @@ export class SyncClient {
 			logger,
 			connectionStatus,
 			cursorTracker,
-			fileChangeNotifier
+			fileChangeNotifier,
+			contentCache
 		);
 
 		logger.info("SyncClient initialised");
@@ -235,6 +264,7 @@ export class SyncClient {
 	public async reset(): Promise<void> {
 		this.stop();
 		this.connectionStatus.startReset();
+		this.contentCache.clear();
 		await this.syncer.reset();
 		this.history.reset();
 		this.database.reset();
diff --git a/frontend/sync-client/src/sync-operations/syncer.ts b/frontend/sync-client/src/sync-operations/syncer.ts
index 1c8ac36e..a4badd9a 100644
--- a/frontend/sync-client/src/sync-operations/syncer.ts
+++ b/frontend/sync-client/src/sync-operations/syncer.ts
@@ -34,8 +34,7 @@ export class Syncer {
 		settings: Settings,
 		private readonly syncService: SyncService,
 		private readonly operations: FileOperations,
-		private readonly internalSyncer: UnrestrictedSyncer,
-		private readonly contentCache: FixedSizeDocumentCache
+		private readonly internalSyncer: UnrestrictedSyncer
 	) {
 		this.syncQueue = new PQueue({
 			concurrency: settings.getSettings().syncConcurrency
@@ -252,7 +251,6 @@ export class Syncer {
 
 	public async reset(): Promise<void> {
 		await this.waitUntilFinished();
-		this.contentCache.clear();
 	}
 
 	public async syncRemotelyUpdatedFile(
diff --git a/frontend/sync-client/src/utils/fix-sized-cache.test.ts b/frontend/sync-client/src/utils/fix-sized-cache.test.ts
index 46bc4144..4a24aafb 100644
--- a/frontend/sync-client/src/utils/fix-sized-cache.test.ts
+++ b/frontend/sync-client/src/utils/fix-sized-cache.test.ts
@@ -236,4 +236,40 @@ describe("fixedSizeDocumentCache", () => {
 		assert.equal(cache.get(2), doc2);
 		assert.equal(cache.get(3), doc3);
 	});
+
+	it("resizeToLargerSizeNoEviction", async () => {
+		const cache = new FixedSizeDocumentCache(4);
+		const doc1 = new Uint8Array([1, 2]);
+		const doc2 = new Uint8Array([3, 4]);
+
+		cache.put(1, doc1);
+		cache.put(2, doc2);
+
+		cache.resize(10);
+
+		assert.equal(cache.get(1), doc1);
+		assert.equal(cache.get(2), doc2);
+	});
+
+	it("resizeCausesMultipleEvictions", async () => {
+		const cache = new FixedSizeDocumentCache(10);
+		const doc1 = new Uint8Array([1, 2]);
+		const doc2 = new Uint8Array([3, 4]);
+		const doc3 = new Uint8Array([5, 6]);
+		const doc4 = new Uint8Array([7, 8]);
+
+		cache.put(1, doc1);
+		cache.put(2, doc2);
+		cache.put(3, doc3);
+		cache.put(4, doc4);
+		// Cache has 8 bytes total
+
+		cache.resize(2);
+
+		// Should evict doc1, doc2, doc3 to get down to 2 bytes
+		assert.equal(cache.get(1), undefined);
+		assert.equal(cache.get(2), undefined);
+		assert.equal(cache.get(3), undefined);
+		assert.equal(cache.get(4), doc4);
+	});
 });
diff --git a/frontend/sync-client/src/utils/fix-sized-cache.ts b/frontend/sync-client/src/utils/fix-sized-cache.ts
index 7adee7b0..cf0ba47e 100644
--- a/frontend/sync-client/src/utils/fix-sized-cache.ts
+++ b/frontend/sync-client/src/utils/fix-sized-cache.ts
@@ -14,14 +14,12 @@ class LRUNode {
 
 // evicting the least recently used documents when the size limit is exceeded.
 export class FixedSizeDocumentCache {
-	private readonly maxSizeInBytes: number;
 	private currentSizeInBytes: number;
 	private readonly cache: Map<VaultUpdateId, LRUNode>;
 	private head: LRUNode | null; // Least recently used
 	private tail: LRUNode | null; // Most recently used
 
-	public constructor(maxSizeInBytes: number) {
-		this.maxSizeInBytes = maxSizeInBytes;
+	public constructor(private maxSizeInBytes: number) {
 		this.currentSizeInBytes = 0;
 		this.cache = new Map();
 		this.head = null;
@@ -56,14 +54,7 @@ export class FixedSizeDocumentCache {
 		this.cache.set(updateId, newNode);
 		this.addToTail(newNode);
 		this.currentSizeInBytes += content.byteLength;
-
-		// Evict least recently used documents if over size limit
-		while (this.currentSizeInBytes > this.maxSizeInBytes && this.head) {
-			const lruNode = this.head;
-			this.removeNode(lruNode);
-			this.cache.delete(lruNode.key);
-			this.currentSizeInBytes -= lruNode.value.byteLength;
-		}
+		this.fitBelowMaxSize();
 	}
 
 	public clear(): void {
@@ -73,6 +64,21 @@ export class FixedSizeDocumentCache {
 		this.currentSizeInBytes = 0;
 	}
 
+	public resize(newMaxSizeInBytes: number): void {
+		this.maxSizeInBytes = newMaxSizeInBytes;
+		this.fitBelowMaxSize();
+	}
+
+	private fitBelowMaxSize(): void {
+		// Evict least recently used documents if over size limit
+		while (this.currentSizeInBytes > this.maxSizeInBytes && this.head) {
+			const lruNode = this.head;
+			this.removeNode(lruNode);
+			this.cache.delete(lruNode.key);
+			this.currentSizeInBytes -= lruNode.value.byteLength;
+		}
+	}
+
 	private removeNode(node: LRUNode): void {
 		if (node.prev) {
 			node.prev.next = node.next;
diff --git a/frontend/sync-client/src/utils/set-up-telemetry.ts b/frontend/sync-client/src/utils/set-up-telemetry.ts
new file mode 100644
index 00000000..e4a4d881
--- /dev/null
+++ b/frontend/sync-client/src/utils/set-up-telemetry.ts
@@ -0,0 +1,33 @@
+import * as Sentry from "@sentry/browser";
+
+export const setUpTelemetry = (): (() => void) => {
+	Sentry.init({
+		dsn: "https://56accd39d92442e788a457a04623cf57@bugs.schmelczer.dev/1",
+		skipBrowserExtensionCheck: false
+	});
+
+	const onError = (event: ErrorEvent): void => {
+		Sentry.captureException(event.error, {
+			extra: {
+				message: event.message,
+				filename: event.filename,
+				lineno: event.lineno,
+				colno: event.colno
+			}
+		});
+	};
+	window.addEventListener("error", onError);
+
+	const onUnhandledRejection = (event: PromiseRejectionEvent): void => {
+		Sentry.captureException(event.reason);
+	};
+	window.addEventListener("unhandledrejection", onUnhandledRejection);
+
+	return (): void => {
+		window.removeEventListener("error", onError);
+		window.removeEventListener("unhandledrejection", onUnhandledRejection);
+		Sentry.close(5000).catch(() => {
+			// Ignore errors during shutdown
+		});
+	};
+};
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 00000000..9e0474fd
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,6 @@
+{
+  "name": "vault-link",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {}
+}
diff --git a/sync-server/src/main.rs b/sync-server/src/main.rs
index aba6574e..82b75721 100644
--- a/sync-server/src/main.rs
+++ b/sync-server/src/main.rs
@@ -92,9 +92,9 @@ fn set_up_logging(
         .with_line_number(is_debug_mode)
         .compact();
 
-    let stdout_layer = tracing_subscriber::fmt::layer()
+    let stderr_layer = tracing_subscriber::fmt::layer()
         .with_ansi(use_colors)
-        .with_writer(std::io::stdout)
+        .with_writer(std::io::stderr)
         .event_format(format.clone());
 
     let file_layer = tracing_subscriber::fmt::layer()
@@ -104,8 +104,8 @@ fn set_up_logging(
 
     tracing_subscriber::registry()
         .with(env_filter)
-        .with(stdout_layer)
         .with(file_layer)
+        .with(stderr_layer)
         .try_init()
         .context("Failed to initialise tracing")
         .map_err(init_error)?;

From e2189d4dbef298844bea26ebfca19e3c43de69ce Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Wed, 19 Nov 2025 22:39:06 +0000
Subject: [PATCH 612/761] Use stderr for logging

---
 frontend/local-client-cli/tsconfig.json            | 12 +++++++-----
 frontend/sync-client/src/utils/set-up-telemetry.ts | 12 ++++++++++--
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/frontend/local-client-cli/tsconfig.json b/frontend/local-client-cli/tsconfig.json
index cfd2df7f..ce04f662 100644
--- a/frontend/local-client-cli/tsconfig.json
+++ b/frontend/local-client-cli/tsconfig.json
@@ -1,8 +1,11 @@
 {
     "compilerOptions": {
-        "target": "ES2020",
-        "module": "commonjs",
-        "lib": ["ES2020"],
+        "target": "ESNext",
+        "module": "ESNext",
+        "lib": [
+            "DOM", // to get `fetch` & `WebSocket`
+			"ES2024"
+        ],
         "outDir": "./dist",
         "rootDir": "./src",
         "strict": true,
@@ -15,6 +18,5 @@
         "declarationMap": true,
         "sourceMap": true
     },
-    "include": ["src/**/*"],
-    "exclude": ["node_modules", "dist"]
+    "exclude": ["dist"]
 }
diff --git a/frontend/sync-client/src/utils/set-up-telemetry.ts b/frontend/sync-client/src/utils/set-up-telemetry.ts
index e4a4d881..6c8e4a4a 100644
--- a/frontend/sync-client/src/utils/set-up-telemetry.ts
+++ b/frontend/sync-client/src/utils/set-up-telemetry.ts
@@ -1,11 +1,19 @@
 import * as Sentry from "@sentry/browser";
 
+// @ts-expect-error, injected by webpack
+const packageVersion = __CURRENT_VERSION__; // eslint-disable-line
+
 export const setUpTelemetry = (): (() => void) => {
 	Sentry.init({
-		dsn: "https://56accd39d92442e788a457a04623cf57@bugs.schmelczer.dev/1",
-		skipBrowserExtensionCheck: false
+		dsn: "https://a9bb2b9151bb450ca86b936436e356c4@bugs.schmelczer.dev/1",
+		release: `sync-client@${packageVersion}`,
+		sendDefaultPii: true,
+		integrations: [],
+		tracesSampleRate: 0
 	});
 
+	Sentry.captureMessage("Initialised telemetry");
+
 	const onError = (event: ErrorEvent): void => {
 		Sentry.captureException(event.error, {
 			extra: {

From 72bae2d93e900fa91b67b66647806ef76b09e05d Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Wed, 19 Nov 2025 22:40:36 +0000
Subject: [PATCH 613/761] Bump versions to 0.10.1

---
 frontend/local-client-cli/package.json | 2 +-
 frontend/obsidian-plugin/manifest.json | 2 +-
 frontend/obsidian-plugin/package.json  | 2 +-
 frontend/package-lock.json             | 8 ++++----
 frontend/sync-client/package.json      | 2 +-
 frontend/test-client/package.json      | 2 +-
 manifest.json                          | 2 +-
 sync-server/Cargo.lock                 | 2 +-
 sync-server/Cargo.toml                 | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/frontend/local-client-cli/package.json b/frontend/local-client-cli/package.json
index 179e03e4..50eae1f8 100644
--- a/frontend/local-client-cli/package.json
+++ b/frontend/local-client-cli/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "local-client-cli",
-	"version": "0.10.0",
+	"version": "0.10.1",
 	"description": "Standalone CLI for VaultLink sync client",
 	"private": false,
 	"bin": {
diff --git a/frontend/obsidian-plugin/manifest.json b/frontend/obsidian-plugin/manifest.json
index 34e9302b..aec6988c 100644
--- a/frontend/obsidian-plugin/manifest.json
+++ b/frontend/obsidian-plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.10.0",
+	"version": "0.10.1",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index 8c4fcee2..4047a1da 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -1,6 +1,6 @@
 {
     "name": "vault-link-obsidian-plugin",
-    "version": "0.10.0",
+    "version": "0.10.1",
     "description": "This is a sample plugin for Obsidian (https://obsidian.md)",
     "main": "main.js",
     "scripts": {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index bbb98a1a..f60d140b 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -21,7 +21,7 @@
 			}
 		},
 		"local-client-cli": {
-			"version": "0.10.0",
+			"version": "0.10.1",
 			"dependencies": {
 				"commander": "^14.0.2"
 			},
@@ -4637,7 +4637,7 @@
 		},
 		"obsidian-plugin": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.10.0",
+			"version": "0.10.1",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/node": "^24.8.1",
@@ -4663,7 +4663,7 @@
 			}
 		},
 		"sync-client": {
-			"version": "0.10.0",
+			"version": "0.10.1",
 			"dependencies": {
 				"byte-base64": "^1.1.0",
 				"minimatch": "^10.0.1",
@@ -4707,7 +4707,7 @@
 			}
 		},
 		"test-client": {
-			"version": "0.10.0",
+			"version": "0.10.1",
 			"bin": {
 				"test-client": "dist/cli.js"
 			},
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index 75ad6e49..0c7c8266 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "sync-client",
-    "version": "0.10.0",
+    "version": "0.10.1",
     "main": "dist/sync-client.node.js",
     "browser": "dist/sync-client.web.js",
     "types": "dist/types/index.d.ts",
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index 93d331bf..2dd58734 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "test-client",
-	"version": "0.10.0",
+	"version": "0.10.1",
 	"private": true,
 	"bin": {
 		"test-client": "./dist/cli.js"
diff --git a/manifest.json b/manifest.json
index 34e9302b..aec6988c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.10.0",
+	"version": "0.10.1",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/sync-server/Cargo.lock b/sync-server/Cargo.lock
index 132b4ca0..f33fc284 100644
--- a/sync-server/Cargo.lock
+++ b/sync-server/Cargo.lock
@@ -2310,7 +2310,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.10.0"
+version = "0.10.1"
 dependencies = [
  "anyhow",
  "axum",
diff --git a/sync-server/Cargo.toml b/sync-server/Cargo.toml
index 34319f58..0332600a 100644
--- a/sync-server/Cargo.toml
+++ b/sync-server/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.10.0"
+version = "0.10.1"
 
 [dependencies]
 serde = { version = "1.0.219", default-features = false, features = ["derive"] }

From 812eb7a6443ad971078da406fb2445b4a4833528 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 22 Nov 2025 12:39:48 +0000
Subject: [PATCH 614/761] Bump tracing-subscriber from 0.3.19 to 0.3.20 in
 /sync-server (#146)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 sync-server/Cargo.lock | 68 ++++++++----------------------------------
 sync-server/Cargo.toml |  2 +-
 2 files changed, 13 insertions(+), 57 deletions(-)

diff --git a/sync-server/Cargo.lock b/sync-server/Cargo.lock
index f33fc284..956e64c3 100644
--- a/sync-server/Cargo.lock
+++ b/sync-server/Cargo.lock
@@ -1316,11 +1316,11 @@ checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
 
 [[package]]
 name = "matchers"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
+checksum = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9"
 dependencies = [
- "regex-automata 0.1.10",
+ "regex-automata",
 ]
 
 [[package]]
@@ -1390,12 +1390,11 @@ dependencies = [
 
 [[package]]
 name = "nu-ansi-term"
-version = "0.46.0"
+version = "0.50.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
+checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
 dependencies = [
- "overload",
- "winapi",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -1466,12 +1465,6 @@ version = "1.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
 
-[[package]]
-name = "overload"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
-
 [[package]]
 name = "parking"
 version = "2.2.1"
@@ -1724,17 +1717,8 @@ checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.13",
- "regex-syntax 0.8.5",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
-dependencies = [
- "regex-syntax 0.6.29",
+ "regex-automata",
+ "regex-syntax",
 ]
 
 [[package]]
@@ -1745,15 +1729,9 @@ checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.8.5",
+ "regex-syntax",
 ]
 
-[[package]]
-name = "regex-syntax"
-version = "0.6.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
-
 [[package]]
 name = "regex-syntax"
 version = "0.8.5"
@@ -2630,14 +2608,14 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.19"
+version = "0.3.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
+checksum = "2054a14f5307d601f88daf0553e1cbf472acc4f2c51afab632431cdcd72124d5"
 dependencies = [
  "matchers",
  "nu-ansi-term",
  "once_cell",
- "regex",
+ "regex-automata",
  "sharded-slab",
  "smallvec",
  "thread_local",
@@ -2882,22 +2860,6 @@ dependencies = [
  "wasite",
 ]
 
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
 [[package]]
 name = "winapi-util"
 version = "0.1.9"
@@ -2907,12 +2869,6 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
 [[package]]
 name = "windows-core"
 version = "0.52.0"
diff --git a/sync-server/Cargo.toml b/sync-server/Cargo.toml
index 0332600a..2ec6db2c 100644
--- a/sync-server/Cargo.toml
+++ b/sync-server/Cargo.toml
@@ -19,7 +19,7 @@ axum-extra = { version = "0.9.6", features = ["typed-header"] }
 axum_typed_multipart = "0.11.0"
 tower-http = { version = "0.6.1", features = ["cors", "trace", "limit", "timeout"] }
 tracing = "0.1.41"
-tracing-subscriber = { version = "0.3.19", features = ["fmt", "env-filter"]}
+tracing-subscriber = { version = "0.3.20", features = ["fmt", "env-filter"]}
 humantime-serde = "1.1.1"
 sqlx = { version = "0.8.6", features = ["sqlite", "runtime-tokio", "uuid", "chrono"] }
 chrono = { version = "0.4.41", features = ["serde"] }

From 56c1f4d58b19bdf8d36c4dd116d4c61a9987bfce Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Nov 2025 11:06:06 +0000
Subject: [PATCH 615/761] Restructure packages

---
 .../safe-filesystem-operations.ts             |  2 +-
 frontend/sync-client/src/index.ts             |  6 ++--
 .../sync-client/src/persistence/database.ts   |  2 +-
 frontend/sync-client/src/sync-client.ts       |  2 +-
 .../src/sync-operations/cursor-tracker.ts     |  2 +-
 .../sync-client/src/sync-operations/syncer.ts |  4 +--
 .../sync-operations/unrestricted-syncer.ts    |  9 +++---
 .../fix-sized-cache.test.ts                   |  0
 .../{ => data-structures}/fix-sized-cache.ts  |  2 +-
 .../utils/{ => data-structures}/locks.test.ts |  4 +--
 .../src/utils/{ => data-structures}/locks.ts  |  2 +-
 .../{ => data-structures}/min-covered.test.ts |  0
 .../{ => data-structures}/min-covered.ts      |  0
 .../{ => utils}/debugging/log-to-console.ts   |  6 ++--
 .../debugging/slow-fetch-factory.ts           |  8 +++--
 .../debugging/slow-web-socket-factory.ts      |  7 ++---
 frontend/sync-client/src/utils/deserialize.ts |  5 ----
 .../src/utils/is-equal-bytes.test.ts          | 29 -------------------
 .../sync-client/src/utils/is-equal-bytes.ts   | 13 ---------
 19 files changed, 30 insertions(+), 73 deletions(-)
 rename frontend/sync-client/src/utils/{ => data-structures}/fix-sized-cache.test.ts (100%)
 rename frontend/sync-client/src/utils/{ => data-structures}/fix-sized-cache.ts (97%)
 rename frontend/sync-client/src/utils/{ => data-structures}/locks.test.ts (98%)
 rename frontend/sync-client/src/utils/{ => data-structures}/locks.ts (98%)
 rename frontend/sync-client/src/utils/{ => data-structures}/min-covered.test.ts (100%)
 rename frontend/sync-client/src/utils/{ => data-structures}/min-covered.ts (100%)
 rename frontend/sync-client/src/{ => utils}/debugging/log-to-console.ts (76%)
 rename frontend/sync-client/src/{ => utils}/debugging/slow-fetch-factory.ts (56%)
 rename frontend/sync-client/src/{ => utils}/debugging/slow-web-socket-factory.ts (92%)
 delete mode 100644 frontend/sync-client/src/utils/deserialize.ts
 delete mode 100644 frontend/sync-client/src/utils/is-equal-bytes.test.ts
 delete mode 100644 frontend/sync-client/src/utils/is-equal-bytes.ts

diff --git a/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts b/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
index 2c865c9f..10d8bae6 100644
--- a/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
+++ b/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
@@ -1,7 +1,7 @@
 import type { RelativePath } from "../persistence/database";
 import type { FileSystemOperations } from "./filesystem-operations";
 import type { Logger } from "../tracing/logger";
-import { Locks } from "../utils/locks";
+import { Locks } from "../utils/data-structures/locks";
 import { FileNotFoundError } from "./file-not-found-error";
 import type { TextWithCursors } from "reconcile-text";
 
diff --git a/frontend/sync-client/src/index.ts b/frontend/sync-client/src/index.ts
index a73f63dd..7a2014b8 100644
--- a/frontend/sync-client/src/index.ts
+++ b/frontend/sync-client/src/index.ts
@@ -1,6 +1,6 @@
-import { logToConsole } from "./debugging/log-to-console";
-import { slowFetchFactory } from "./debugging/slow-fetch-factory";
-import { slowWebSocketFactory } from "./debugging/slow-web-socket-factory";
+import { logToConsole } from "./utils/debugging/log-to-console";
+import { slowFetchFactory } from "./utils/debugging/slow-fetch-factory";
+import { slowWebSocketFactory } from "./utils/debugging/slow-web-socket-factory";
 import { getRandomColor } from "./utils/get-random-color";
 import { lineAndColumnToPosition } from "./utils/line-and-column-to-position";
 import { positionToLineAndColumn } from "./utils/position-to-line-and-column";
diff --git a/frontend/sync-client/src/persistence/database.ts b/frontend/sync-client/src/persistence/database.ts
index 9425c629..827cf164 100644
--- a/frontend/sync-client/src/persistence/database.ts
+++ b/frontend/sync-client/src/persistence/database.ts
@@ -1,6 +1,6 @@
 import type { Logger } from "../tracing/logger";
 import { EMPTY_HASH } from "../utils/hash";
-import { CoveredValues } from "../utils/min-covered";
+import { CoveredValues } from "../utils/data-structures/min-covered";
 
 export type VaultUpdateId = number;
 export type DocumentId = string;
diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts
index 9547af65..28843d3d 100644
--- a/frontend/sync-client/src/sync-client.ts
+++ b/frontend/sync-client/src/sync-client.ts
@@ -21,7 +21,7 @@ import { CursorTracker } from "./sync-operations/cursor-tracker";
 import type { CursorSpan } from "./services/types/CursorSpan";
 import type { MaybeOutdatedClientCursors } from "./types/maybe-outdated-client-cursors";
 import { FileChangeNotifier } from "./sync-operations/file-change-notifier";
-import { FixedSizeDocumentCache } from "./utils/fix-sized-cache";
+import { FixedSizeDocumentCache } from "./utils/data-structures/fix-sized-cache";
 import { setUpTelemetry } from "./utils/set-up-telemetry";
 
 export class SyncClient {
diff --git a/frontend/sync-client/src/sync-operations/cursor-tracker.ts b/frontend/sync-client/src/sync-operations/cursor-tracker.ts
index 17f166c4..32048ba5 100644
--- a/frontend/sync-client/src/sync-operations/cursor-tracker.ts
+++ b/frontend/sync-client/src/sync-operations/cursor-tracker.ts
@@ -8,7 +8,7 @@ import type { MaybeOutdatedClientCursors } from "../types/maybe-outdated-client-
 import { DocumentUpToDateness } from "../types/document-up-to-dateness";
 import { hash } from "../utils/hash";
 import type { FileChangeNotifier } from "./file-change-notifier";
-import { Lock } from "../utils/locks";
+import { Lock } from "../utils/data-structures/locks";
 
 // Cursor positions are updated separately from documents. However, a given cursor position is only
 // valid within a certain version of the document it belongs to. This class tracks previous and the latest
diff --git a/frontend/sync-client/src/sync-operations/syncer.ts b/frontend/sync-client/src/sync-operations/syncer.ts
index a4badd9a..920a6423 100644
--- a/frontend/sync-client/src/sync-operations/syncer.ts
+++ b/frontend/sync-client/src/sync-operations/syncer.ts
@@ -15,9 +15,9 @@ import { findMatchingFile } from "../utils/find-matching-file";
 import type { UnrestrictedSyncer } from "./unrestricted-syncer";
 import { createPromise } from "../utils/create-promise";
 import { SyncResetError } from "../services/sync-reset-error";
-import { Locks } from "../utils/locks";
+import { Locks } from "../utils/data-structures/locks";
 import type { DocumentVersionWithoutContent } from "../services/types/DocumentVersionWithoutContent";
-import type { FixedSizeDocumentCache } from "../utils/fix-sized-cache";
+import type { FixedSizeDocumentCache } from "../utils/data-structures/fix-sized-cache";
 
 export class Syncer {
 	private readonly remoteDocumentsLock: Locks<DocumentId>;
diff --git a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
index f9f6e2c1..daffe4bf 100644
--- a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
+++ b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
@@ -18,7 +18,8 @@ import type {
 } from "../tracing/sync-history";
 import { SyncStatus, SyncType } from "../tracing/sync-history";
 import { EMPTY_HASH, hash } from "../utils/hash";
-import { deserialize } from "../utils/deserialize";
+
+import { base64ToBytes } from "byte-base64";
 import type { Settings } from "../persistence/settings";
 import type { FileOperations } from "../file-operations/file-operations";
 import { createPromise } from "../utils/create-promise";
@@ -28,7 +29,7 @@ import { globsToRegexes } from "../utils/globs-to-regexes";
 import type { DocumentVersion } from "../services/types/DocumentVersion";
 import type { DocumentUpdateResponse } from "../services/types/DocumentUpdateResponse";
 import type { DocumentVersionWithoutContent } from "../services/types/DocumentVersionWithoutContent";
-import type { FixedSizeDocumentCache } from "../utils/fix-sized-cache";
+import type { FixedSizeDocumentCache } from "../utils/data-structures/fix-sized-cache";
 import { isFileTypeMergable } from "../utils/is-file-type-mergable";
 import { isBinary } from "../utils/is-binary";
 
@@ -292,7 +293,7 @@ export class UnrestrictedSyncer {
 			}
 
 			if (!("type" in response) || response.type === "MergingUpdate") {
-				const responseBytes = deserialize(response.contentBase64);
+				const responseBytes = base64ToBytes(response.contentBase64);
 				contentHash = hash(responseBytes);
 
 				this.database.updateDocumentMetadata(
@@ -439,7 +440,7 @@ export class UnrestrictedSyncer {
 				return;
 			}
 
-			const contentBytes = deserialize(content);
+			const contentBytes = base64ToBytes(content);
 
 			await this.operations.ensureClearPath(remoteVersion.relativePath);
 
diff --git a/frontend/sync-client/src/utils/fix-sized-cache.test.ts b/frontend/sync-client/src/utils/data-structures/fix-sized-cache.test.ts
similarity index 100%
rename from frontend/sync-client/src/utils/fix-sized-cache.test.ts
rename to frontend/sync-client/src/utils/data-structures/fix-sized-cache.test.ts
diff --git a/frontend/sync-client/src/utils/fix-sized-cache.ts b/frontend/sync-client/src/utils/data-structures/fix-sized-cache.ts
similarity index 97%
rename from frontend/sync-client/src/utils/fix-sized-cache.ts
rename to frontend/sync-client/src/utils/data-structures/fix-sized-cache.ts
index cf0ba47e..8984b790 100644
--- a/frontend/sync-client/src/utils/fix-sized-cache.ts
+++ b/frontend/sync-client/src/utils/data-structures/fix-sized-cache.ts
@@ -1,6 +1,6 @@
 // Implements an in-memory fixed-size cache for document contents,
 
-import type { VaultUpdateId } from "../persistence/database";
+import type { VaultUpdateId } from "../../persistence/database";
 
 // Doubly-linked list node for O(1) LRU operations
 class LRUNode {
diff --git a/frontend/sync-client/src/utils/locks.test.ts b/frontend/sync-client/src/utils/data-structures/locks.test.ts
similarity index 98%
rename from frontend/sync-client/src/utils/locks.test.ts
rename to frontend/sync-client/src/utils/data-structures/locks.test.ts
index 5626becc..460f984d 100644
--- a/frontend/sync-client/src/utils/locks.test.ts
+++ b/frontend/sync-client/src/utils/data-structures/locks.test.ts
@@ -1,7 +1,7 @@
 import { describe, it, beforeEach } from "node:test";
 import assert from "node:assert";
-import { Logger } from "../tracing/logger";
-import type { RelativePath } from "../persistence/database";
+import { Logger } from "../../tracing/logger";
+import type { RelativePath } from "../../persistence/database";
 import { Locks } from "./locks";
 
 describe("withLock", () => {
diff --git a/frontend/sync-client/src/utils/locks.ts b/frontend/sync-client/src/utils/data-structures/locks.ts
similarity index 98%
rename from frontend/sync-client/src/utils/locks.ts
rename to frontend/sync-client/src/utils/data-structures/locks.ts
index e09da236..6a801e12 100644
--- a/frontend/sync-client/src/utils/locks.ts
+++ b/frontend/sync-client/src/utils/data-structures/locks.ts
@@ -1,4 +1,4 @@
-import type { Logger } from "../tracing/logger";
+import type { Logger } from "../../tracing/logger";
 
 /**
  * Manages exclusive locks on items to prevent concurrent modifications.
diff --git a/frontend/sync-client/src/utils/min-covered.test.ts b/frontend/sync-client/src/utils/data-structures/min-covered.test.ts
similarity index 100%
rename from frontend/sync-client/src/utils/min-covered.test.ts
rename to frontend/sync-client/src/utils/data-structures/min-covered.test.ts
diff --git a/frontend/sync-client/src/utils/min-covered.ts b/frontend/sync-client/src/utils/data-structures/min-covered.ts
similarity index 100%
rename from frontend/sync-client/src/utils/min-covered.ts
rename to frontend/sync-client/src/utils/data-structures/min-covered.ts
diff --git a/frontend/sync-client/src/debugging/log-to-console.ts b/frontend/sync-client/src/utils/debugging/log-to-console.ts
similarity index 76%
rename from frontend/sync-client/src/debugging/log-to-console.ts
rename to frontend/sync-client/src/utils/debugging/log-to-console.ts
index ace58db0..2d1a12e8 100644
--- a/frontend/sync-client/src/debugging/log-to-console.ts
+++ b/frontend/sync-client/src/utils/debugging/log-to-console.ts
@@ -1,6 +1,6 @@
-import type { SyncClient } from "../sync-client";
-import type { LogLine } from "../tracing/logger";
-import { LogLevel } from "../tracing/logger";
+import type { SyncClient } from "../../sync-client";
+import type { LogLine } from "../../tracing/logger";
+import { LogLevel } from "../../tracing/logger";
 
 export function logToConsole(client: SyncClient): void {
 	client.logger.addOnMessageListener((logLine: LogLine) => {
diff --git a/frontend/sync-client/src/debugging/slow-fetch-factory.ts b/frontend/sync-client/src/utils/debugging/slow-fetch-factory.ts
similarity index 56%
rename from frontend/sync-client/src/debugging/slow-fetch-factory.ts
rename to frontend/sync-client/src/utils/debugging/slow-fetch-factory.ts
index cd07dd1a..4c2ddedb 100644
--- a/frontend/sync-client/src/debugging/slow-fetch-factory.ts
+++ b/frontend/sync-client/src/utils/debugging/slow-fetch-factory.ts
@@ -1,4 +1,4 @@
-import { sleep } from "../utils/sleep";
+import { sleep } from "../sleep";
 
 export const slowFetchFactory =
 	(jitterScaleInSeconds: number) =>
@@ -7,10 +7,14 @@ export const slowFetchFactory =
 		init?: RequestInit
 	): Promise<Response> => {
 		if (jitterScaleInSeconds > 0) {
-			await sleep(Math.random() * jitterScaleInSeconds * 1000);
+			await sleep(((Math.random() * jitterScaleInSeconds) / 2) * 1000);
 		}
 
 		const response = await fetch(input, init);
 
+		if (jitterScaleInSeconds > 0) {
+			await sleep(((Math.random() * jitterScaleInSeconds) / 2) * 1000);
+		}
+
 		return response;
 	};
diff --git a/frontend/sync-client/src/debugging/slow-web-socket-factory.ts b/frontend/sync-client/src/utils/debugging/slow-web-socket-factory.ts
similarity index 92%
rename from frontend/sync-client/src/debugging/slow-web-socket-factory.ts
rename to frontend/sync-client/src/utils/debugging/slow-web-socket-factory.ts
index 51a27a5f..ea77117a 100644
--- a/frontend/sync-client/src/debugging/slow-web-socket-factory.ts
+++ b/frontend/sync-client/src/utils/debugging/slow-web-socket-factory.ts
@@ -1,12 +1,11 @@
-import { sleep } from "../utils/sleep";
-import { Locks } from "../utils/locks";
-import type { Logger } from "../tracing/logger";
+import { sleep } from "../sleep";
+import { Locks } from "../data-structures/locks";
+import type { Logger } from "../../tracing/logger";
 
 export function slowWebSocketFactory(
 	jitterScaleInSeconds: number,
 	logger: Logger
 ): typeof WebSocket {
-	// eslint-disable-next-line
 	return class FlakyWebSocket extends WebSocket {
 		private static readonly RECEIVE_KEY = "websocket-receive";
 		private static readonly SEND_KEY = "websocket-send";
diff --git a/frontend/sync-client/src/utils/deserialize.ts b/frontend/sync-client/src/utils/deserialize.ts
deleted file mode 100644
index 4255479f..00000000
--- a/frontend/sync-client/src/utils/deserialize.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { base64ToBytes } from "byte-base64";
-
-export function deserialize(data: string): Uint8Array {
-	return base64ToBytes(data);
-}
diff --git a/frontend/sync-client/src/utils/is-equal-bytes.test.ts b/frontend/sync-client/src/utils/is-equal-bytes.test.ts
deleted file mode 100644
index a887309f..00000000
--- a/frontend/sync-client/src/utils/is-equal-bytes.test.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { describe, it } from "node:test";
-import assert from "node:assert";
-import { isEqualBytes } from "./is-equal-bytes";
-
-describe("isEqualBytes", () => {
-	it("should return true for equal byte arrays", () => {
-		const bytes1 = new Uint8Array([1, 2, 3, 4]);
-		const bytes2 = new Uint8Array([1, 2, 3, 4]);
-		assert.strictEqual(isEqualBytes(bytes1, bytes2), true);
-	});
-
-	it("should return false for byte arrays of different lengths", () => {
-		const bytes1 = new Uint8Array([1, 2, 3, 4]);
-		const bytes2 = new Uint8Array([1, 2, 3]);
-		assert.strictEqual(isEqualBytes(bytes1, bytes2), false);
-	});
-
-	it("should return true for empty byte arrays", () => {
-		const bytes1 = new Uint8Array([]);
-		const bytes2 = new Uint8Array([]);
-		assert.strictEqual(isEqualBytes(bytes1, bytes2), true);
-	});
-
-	it("should return false for byte arrays with same length but different content", () => {
-		const bytes1 = new Uint8Array([1, 2, 3, 4]);
-		const bytes2 = new Uint8Array([4, 3, 2, 1]);
-		assert.strictEqual(isEqualBytes(bytes1, bytes2), false);
-	});
-});
diff --git a/frontend/sync-client/src/utils/is-equal-bytes.ts b/frontend/sync-client/src/utils/is-equal-bytes.ts
deleted file mode 100644
index d0688d44..00000000
--- a/frontend/sync-client/src/utils/is-equal-bytes.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-export function isEqualBytes(bytes1: Uint8Array, bytes2: Uint8Array): boolean {
-	if (bytes1.length !== bytes2.length) {
-		return false;
-	}
-
-	for (let i = 0; i < bytes1.length; i++) {
-		if (bytes1[i] !== bytes2[i]) {
-			return false;
-		}
-	}
-
-	return true;
-}

From 50a95b114d7e774834848e360fe15e4f27ca0f4e Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Nov 2025 11:19:08 +0000
Subject: [PATCH 616/761] Add docs

---
 .github/workflows/deploy-docs.yml   |  65 ++++
 CLAUDE.md                           |  13 +-
 docs/.gitignore                     |   4 +
 docs/.vitepress/config.mts          |  62 +++
 docs/README.md                      | 130 +++++++
 docs/architecture/data-flow.md      | 532 +++++++++++++++++++++++++
 docs/architecture/index.md          | 344 ++++++++++++++++
 docs/architecture/sync-algorithm.md | 361 +++++++++++++++++
 docs/config/advanced.md             | 581 ++++++++++++++++++++++++++++
 docs/config/authentication.md       | 530 +++++++++++++++++++++++++
 docs/config/server.md               | 470 ++++++++++++++++++++++
 docs/guide/cli-client.md            | 516 ++++++++++++++++++++++++
 docs/guide/getting-started.md       | 185 +++++++++
 docs/guide/obsidian-plugin.md       | 262 +++++++++++++
 docs/guide/server-setup.md          | 370 ++++++++++++++++++
 docs/guide/what-is-vaultlink.md     | 115 ++++++
 docs/index.md                       |  72 ++++
 docs/package.json                   |  18 +
 docs/public/logo.svg                |  34 ++
 19 files changed, 4663 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/deploy-docs.yml
 create mode 100644 docs/.gitignore
 create mode 100644 docs/.vitepress/config.mts
 create mode 100644 docs/README.md
 create mode 100644 docs/architecture/data-flow.md
 create mode 100644 docs/architecture/index.md
 create mode 100644 docs/architecture/sync-algorithm.md
 create mode 100644 docs/config/advanced.md
 create mode 100644 docs/config/authentication.md
 create mode 100644 docs/config/server.md
 create mode 100644 docs/guide/cli-client.md
 create mode 100644 docs/guide/getting-started.md
 create mode 100644 docs/guide/obsidian-plugin.md
 create mode 100644 docs/guide/server-setup.md
 create mode 100644 docs/guide/what-is-vaultlink.md
 create mode 100644 docs/index.md
 create mode 100644 docs/package.json
 create mode 100644 docs/public/logo.svg

diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml
new file mode 100644
index 00000000..5deecf7d
--- /dev/null
+++ b/.github/workflows/deploy-docs.yml
@@ -0,0 +1,65 @@
+name: Deploy Documentation
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - 'docs/**'
+      - '.github/workflows/deploy-docs.yml'
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+concurrency:
+  group: pages
+  cancel-in-progress: false
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: npm
+          cache-dependency-path: docs/package-lock.json
+
+      - name: Setup Pages
+        uses: actions/configure-pages@v4
+
+      - name: Install dependencies
+        run: |
+          cd docs
+          npm ci
+
+      - name: Build documentation
+        run: |
+          cd docs
+          npm run build
+
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: docs/.vitepress/dist
+
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    needs: build
+    runs-on: ubuntu-latest
+    name: Deploy
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4
diff --git a/CLAUDE.md b/CLAUDE.md
index e05e784a..6f1bff23 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -29,7 +29,10 @@ cd sync-server
 cargo run config-e2e.yml  # Start development server
 cargo test --verbose      # Run Rust tests
 cargo clippy --all-targets --all-features  # Lint Rust code
+cargo clippy --all-targets --all-features --fix --allow-dirty --allow-staged  # Auto-fix clippy warnings
 cargo fmt --all -- --check  # Check Rust formatting
+cargo fmt --all            # Auto-format Rust code
+cargo machete --with-metadata  # Detect unused dependencies
 ```
 
 ### Frontend Development
@@ -49,8 +52,15 @@ sqlx migrate run --source src/app_state/database/migrations --database-url sqlit
 cargo sqlx prepare --workspace
 ```
 
+### Initial Setup
+```bash
+# Install required cargo tools
+cargo install sqlx-cli cargo-machete cargo-edit
+```
+
 ### Scripts
 - `scripts/check.sh`: Full CI check (builds, lints, tests both server and frontend)
+- `scripts/check.sh --fix`: Same as above but auto-fixes linting and formatting issues
 - `scripts/e2e.sh`: End-to-end testing
 - `scripts/clean-up.sh`: Clean logs and database files
 - `scripts/bump-version.sh patch`: Publish new version
@@ -59,10 +69,11 @@ cargo sqlx prepare --workspace
 ## Code Structure
 
 ### Workspace Configuration
-The frontend uses npm workspaces with three packages:
+The frontend uses npm workspaces with four packages:
 - `sync-client`: Core synchronization logic
 - `obsidian-plugin`: Obsidian-specific integration
 - `test-client`: Testing utilities
+- `local-client-cli`: Standalone CLI for VaultLink sync client
 
 ### Type Generation
 Rust structs generate TypeScript types via ts-rs crate, stored in `sync-server/bindings/` and used by frontend packages.
diff --git a/docs/.gitignore b/docs/.gitignore
new file mode 100644
index 00000000..da61f8d6
--- /dev/null
+++ b/docs/.gitignore
@@ -0,0 +1,4 @@
+node_modules/
+.vitepress/dist/
+.vitepress/cache/
+package-lock.json
diff --git a/docs/.vitepress/config.mts b/docs/.vitepress/config.mts
new file mode 100644
index 00000000..90eea790
--- /dev/null
+++ b/docs/.vitepress/config.mts
@@ -0,0 +1,62 @@
+import { defineConfig } from 'vitepress'
+
+export default defineConfig({
+    title: 'VaultLink',
+    description: 'Self-hosted real-time synchronization for Obsidian',
+    base: '/vault-link/',
+    themeConfig: {
+        logo: '/logo.svg',
+        nav: [
+            { text: 'Home', link: '/' },
+            { text: 'Guide', link: '/guide/getting-started' },
+            { text: 'Architecture', link: '/architecture/' },
+            { text: 'GitHub', link: 'https://github.com/schmelczer/vault-link' }
+        ],
+        sidebar: [
+            {
+                text: 'Introduction',
+                items: [
+                    { text: 'What is VaultLink?', link: '/guide/what-is-vaultlink' },
+                    { text: 'Getting Started', link: '/guide/getting-started' }
+                ]
+            },
+            {
+                text: 'Setup',
+                items: [
+                    { text: 'Server Setup', link: '/guide/server-setup' },
+                    { text: 'Obsidian Plugin', link: '/guide/obsidian-plugin' },
+                    { text: 'CLI Client', link: '/guide/cli-client' }
+                ]
+            },
+            {
+                text: 'Configuration',
+                items: [
+                    { text: 'Server Configuration', link: '/config/server' },
+                    { text: 'Authentication', link: '/config/authentication' },
+                    { text: 'Advanced Options', link: '/config/advanced' }
+                ]
+            },
+            {
+                text: 'Architecture',
+                items: [
+                    { text: 'Overview', link: '/architecture/' },
+                    { text: 'Sync Algorithm', link: '/architecture/sync-algorithm' },
+                    { text: 'Data Flow', link: '/architecture/data-flow' }
+                ]
+            }
+        ],
+        socialLinks: [
+            { icon: 'github', link: 'https://github.com/schmelczer/vault-link' }
+        ],
+        footer: {
+            message: 'Released under the MIT License.',
+            copyright: 'Copyright © 2024-present Andras Schmelczer'
+        },
+        search: {
+            provider: 'local'
+        }
+    },
+    head: [
+        ['link', { rel: 'icon', type: 'image/svg+xml', href: '/vault-link/logo.svg' }]
+    ]
+})
diff --git a/docs/README.md b/docs/README.md
new file mode 100644
index 00000000..a1032bbb
--- /dev/null
+++ b/docs/README.md
@@ -0,0 +1,130 @@
+# VaultLink Documentation
+
+This directory contains the VaultLink documentation site built with [VitePress](https://vitepress.dev/).
+
+## Development
+
+### Prerequisites
+
+- Node.js 18+
+- npm
+
+### Setup
+
+```bash
+cd docs
+npm install
+```
+
+### Local Development
+
+Start the development server with hot reload:
+
+```bash
+npm run dev
+```
+
+The site will be available at `http://localhost:5173/vault-link/`
+
+### Build
+
+Build the static site:
+
+```bash
+npm run build
+```
+
+Output will be in `.vitepress/dist/`
+
+### Preview
+
+Preview the built site:
+
+```bash
+npm run preview
+```
+
+## Deployment
+
+The documentation is automatically deployed to GitHub Pages when changes are pushed to the `main` branch.
+
+The deployment workflow is configured in `.github/workflows/deploy-docs.yml`.
+
+## Structure
+
+```
+docs/
+├── .vitepress/
+│   └── config.ts          # VitePress configuration
+├── public/                # Static assets
+│   └── logo.svg          # VaultLink logo
+├── guide/                # User guides
+│   ├── what-is-vaultlink.md
+│   ├── getting-started.md
+│   ├── server-setup.md
+│   ├── obsidian-plugin.md
+│   └── cli-client.md
+├── architecture/         # Architecture documentation
+│   ├── index.md
+│   ├── sync-algorithm.md
+│   └── data-flow.md
+├── config/              # Configuration reference
+│   ├── server.md
+│   ├── authentication.md
+│   └── advanced.md
+└── index.md            # Home page
+
+```
+
+## Writing Documentation
+
+### Markdown Features
+
+VitePress supports:
+- GitHub Flavored Markdown
+- Custom containers (tip, warning, danger)
+- Code syntax highlighting
+- Mermaid diagrams
+- Emoji :rocket:
+
+### Custom Containers
+
+```markdown
+::: tip
+This is a tip
+:::
+
+::: warning
+This is a warning
+:::
+
+::: danger
+This is a danger message
+:::
+```
+
+### Code Blocks
+
+````markdown
+```bash
+npm install
+```
+
+```yaml
+server:
+  port: 3000
+```
+````
+
+## Contributing
+
+When adding new pages:
+
+1. Create the markdown file in the appropriate directory
+2. Add it to the sidebar in `.vitepress/config.ts`
+3. Test locally with `npm run dev`
+4. Submit a pull request
+
+## License
+
+MIT - Same as VaultLink
diff --git a/docs/architecture/data-flow.md b/docs/architecture/data-flow.md
new file mode 100644
index 00000000..1b8ae1aa
--- /dev/null
+++ b/docs/architecture/data-flow.md
@@ -0,0 +1,532 @@
+# Data Flow
+
+This document provides a detailed look at how data flows through the VaultLink system, from client to server and back.
+
+## Connection Lifecycle
+
+### 1. Initial Connection
+
+```mermaid
+sequenceDiagram
+    participant C as Client
+    participant S as Server
+    participant DB as Database
+
+    C->>S: WebSocket connect
+    S->>S: Accept connection
+    C->>S: Auth message (token + vault)
+    S->>S: Validate token
+    S->>S: Check vault access
+    S-->>C: Auth success
+    Note over C,S: Connection established
+```
+
+**Steps**:
+1. Client initiates WebSocket connection to server
+2. Server accepts connection
+3. Client sends authentication message with token and vault name
+4. Server validates token against `config.yml`
+5. Server checks if user has access to requested vault
+6. Server responds with success or error
+7. Connection is ready for syncing
+
+### 2. Initial Sync
+
+After authentication, the client performs initial synchronization:
+
+```mermaid
+sequenceDiagram
+    participant C as Client
+    participant S as Server
+    participant DB as SQLite
+
+    C->>C: Scan local filesystem
+    C->>S: Request file list
+    S->>DB: Query all files
+    DB-->>S: File metadata
+    S-->>C: File list with versions
+
+    loop For each local file
+        C->>C: Check if file on server
+        alt File not on server
+            C->>S: Upload file
+            S->>DB: Store file + metadata
+        else File on server (different version)
+            C->>C: Compare versions
+            C->>S: Upload newer or merge
+        end
+    end
+
+    loop For each server file
+        C->>C: Check if file local
+        alt File not local
+            C->>S: Download file
+            S->>DB: Retrieve file
+            DB-->>S: File content
+            S-->>C: File content
+            C->>C: Write to disk
+        end
+    end
+
+    S-->>C: Sync complete message
+```
+
+**Process**:
+1. Client scans local filesystem
+2. Client requests file list from server
+3. Server queries database and returns metadata
+4. Client uploads missing or changed local files
+5. Client downloads missing files from server
+6. Server sends sync complete notification
+
+### 3. Real-Time Synchronization
+
+After initial sync, changes are pushed in real-time:
+
+```mermaid
+sequenceDiagram
+    participant FS as Filesystem
+    participant C1 as Client 1
+    participant S as Server
+    participant DB as Database
+    participant C2 as Client 2
+
+    FS->>C1: File changed (fs.watch)
+    C1->>C1: Read file content
+    C1->>S: Upload file
+    S->>DB: Store new version
+    S->>S: Apply OT if needed
+    S-->>C1: Upload ACK
+    S->>C2: File update notification
+    C2->>S: Download file
+    S->>DB: Retrieve file
+    DB-->>S: File content
+    S-->>C2: File content
+    C2->>FS: Write to disk
+```
+
+**Flow**:
+1. Filesystem watcher detects local change
+2. Client reads file content
+3. Client uploads file via WebSocket
+4. Server stores in database
+5. Server applies operational transformation if concurrent edits
+6. Server acknowledges upload to sender
+7. Server broadcasts update to other clients
+8. Other clients download and apply changes
+
+## File Operations
+
+### Upload
+
+```
+┌─────────┐
+│ Client  │
+└────┬────┘
+     │ 1. Detect file change
+     │
+     ├─► 2. Read file content
+     │
+     ├─► 3. Create upload message
+     │    {
+     │      type: "upload_file",
+     │      path: "notes/daily.md",
+     │      content: "...",
+     │      version: 42,
+     │      timestamp: "2024-01-01T12:00:00Z"
+     │    }
+     │
+     ▼
+┌─────────┐
+│ Server  │
+└────┬────┘
+     │ 4. Validate message
+     │
+     ├─► 5. Check permissions
+     │
+     ├─► 6. Apply OT (if conflicts)
+     │
+     ├─► 7. Store in database
+     │
+     ├─► 8. Update version
+     │
+     ├─► 9. Broadcast to clients
+     │
+     └─► 10. Send ACK to uploader
+```
+
+### Download
+
+```
+┌─────────┐
+│ Server  │
+└────┬────┘
+     │ 1. File updated by another client
+     │
+     ├─► 2. Broadcast notification
+     │    {
+     │      type: "file_updated",
+     │      path: "notes/daily.md",
+     │      version: 43
+     │    }
+     │
+     ▼
+┌─────────┐
+│ Client  │
+└────┬────┘
+     │ 3. Receive notification
+     │
+     ├─► 4. Request file download
+     │    {
+     │      type: "download_file",
+     │      path: "notes/daily.md",
+     │      version: 43
+     │    }
+     │
+     ▼
+┌─────────┐
+│ Server  │
+└────┬────┘
+     │ 5. Retrieve from database
+     │
+     └─► 6. Send file content
+          {
+            type: "file_content",
+            path: "notes/daily.md",
+            content: "...",
+            version: 43
+          }
+          │
+          ▼
+     ┌─────────┐
+     │ Client  │
+     └────┬────┘
+          │ 7. Write to filesystem
+          │
+          └─► 8. Update local metadata
+```
+
+### Delete
+
+```
+┌─────────┐
+│ Client  │
+└────┬────┘
+     │ 1. File deleted locally
+     │
+     ├─► 2. Send delete message
+     │    {
+     │      type: "delete_file",
+     │      path: "notes/old.md"
+     │    }
+     │
+     ▼
+┌─────────┐
+│ Server  │
+└────┬────┘
+     │ 3. Mark as deleted in DB
+     │    (soft delete for history)
+     │
+     ├─► 4. Broadcast deletion
+     │
+     └─► 5. ACK to sender
+          │
+          ▼
+     ┌─────────┐
+     │ Other   │
+     │ Clients │
+     └────┬────┘
+          │ 6. Delete local file
+          │
+          └─► 7. Update metadata
+```
+
+## Conflict Resolution Flow
+
+### Concurrent Edits Scenario
+
+```
+Time →
+
+Client A                    Server                      Client B
+   │                          │                            │
+   │ Edit file v10            │                            │
+   │ "Add line A"             │                            │ Edit file v10
+   │                          │                            │ "Add line B"
+   │                          │                            │
+   ├─── Upload @ t1 ─────────►│                            │
+   │                          │◄────── Upload @ t2 ────────┤
+   │                          │                            │
+   │                          │ 1. Receive both edits      │
+   │                          │    (based on v10)          │
+   │                          │                            │
+   │                          │ 2. Apply first edit        │
+   │                          │    → v11 (line A added)    │
+   │                          │                            │
+   │                          │ 3. Transform second edit   │
+   │                          │    against first           │
+   │                          │                            │
+   │                          │ 4. Apply transformed edit  │
+   │                          │    → v12 (both lines)      │
+   │                          │                            │
+   │◄──── v12 content ────────┤                            │
+   │                          ├───── v12 content ─────────►│
+   │                          │                            │
+   │ Apply v12                │                            │ Apply v12
+   │ (has both lines)         │                            │ (has both lines)
+   │                          │                            │
+```
+
+### Conflict Resolution Steps
+
+1. **Detection**: Server receives two edits based on the same version
+2. **Ordering**: Determine which edit to apply first (by timestamp or client ID)
+3. **First edit**: Apply directly to database
+4. **Transformation**: Transform second edit against first using OT
+5. **Second edit**: Apply transformed edit to database
+6. **Broadcast**: Send merged result to all clients
+7. **Application**: Clients apply merged version locally
+
+## Database Schema
+
+### Core Tables
+
+```sql
+-- Document metadata
+CREATE TABLE documents (
+    id INTEGER PRIMARY KEY,
+    path TEXT NOT NULL,
+    version INTEGER NOT NULL,
+    content_hash TEXT,
+    size INTEGER,
+    created_at TIMESTAMP,
+    updated_at TIMESTAMP,
+    deleted BOOLEAN DEFAULT FALSE
+);
+
+-- Version history
+CREATE TABLE versions (
+    id INTEGER PRIMARY KEY,
+    document_id INTEGER,
+    version INTEGER,
+    content BLOB,
+    created_at TIMESTAMP,
+    FOREIGN KEY (document_id) REFERENCES documents(id)
+);
+
+-- Client sync cursors
+CREATE TABLE cursors (
+    client_id TEXT PRIMARY KEY,
+    last_version INTEGER,
+    last_updated TIMESTAMP
+);
+```
+
+### Queries
+
+**Get files since version**:
+```sql
+SELECT * FROM documents
+WHERE version > ? AND deleted = FALSE
+ORDER BY version ASC;
+```
+
+**Store new version**:
+```sql
+INSERT INTO versions (document_id, version, content, created_at)
+VALUES (?, ?, ?, ?);
+
+UPDATE documents
+SET version = ?, updated_at = ?
+WHERE id = ?;
+```
+
+**Update cursor**:
+```sql
+INSERT OR REPLACE INTO cursors (client_id, last_version, last_updated)
+VALUES (?, ?, ?);
+```
+
+## Message Protocol
+
+### Client → Server Messages
+
+**Upload File**:
+```json
+{
+    "type": "upload_file",
+    "path": "notes/example.md",
+    "content": "File content here...",
+    "base_version": 10,
+    "timestamp": "2024-01-01T12:00:00Z"
+}
+```
+
+**Download File**:
+```json
+{
+    "type": "download_file",
+    "path": "notes/example.md"
+}
+```
+
+**Delete File**:
+```json
+{
+    "type": "delete_file",
+    "path": "notes/old.md"
+}
+```
+
+**List Files**:
+```json
+{
+    "type": "list_files",
+    "since_version": 0
+}
+```
+
+### Server → Client Messages
+
+**File Updated**:
+```json
+{
+    "type": "file_updated",
+    "path": "notes/example.md",
+    "version": 11,
+    "size": 1024,
+    "hash": "abc123..."
+}
+```
+
+**File Content**:
+```json
+{
+    "type": "file_content",
+    "path": "notes/example.md",
+    "content": "Updated content...",
+    "version": 11
+}
+```
+
+**File Deleted**:
+```json
+{
+    "type": "file_deleted",
+    "path": "notes/old.md",
+    "version": 12
+}
+```
+
+**Sync Complete**:
+```json
+{
+    "type": "sync_complete",
+    "total_files": 150,
+    "current_version": 200
+}
+```
+
+**Error**:
+```json
+{
+    "type": "error",
+    "message": "File too large",
+    "code": "FILE_TOO_LARGE"
+}
+```
+
+## Error Handling
+
+### Client-Side Errors
+
+**Network failure**:
+1. Detect WebSocket disconnect
+2. Queue pending operations
+3. Retry connection with exponential backoff
+4. Replay queued operations on reconnect
+
+**File read error**:
+1. Log error
+2. Skip file
+3. Continue with other files
+4. Report to user
+
+**Write conflict**:
+1. Receive updated version from server
+2. Apply OT merge locally
+3. Overwrite local file
+4. Continue syncing
+
+### Server-Side Errors
+
+**Database error**:
+1. Log error
+2. Return error to client
+3. Client retries operation
+
+**Invalid operation**:
+1. Validate message format
+2. Return specific error code
+3. Client handles error appropriately
+
+**Authentication failure**:
+1. Reject connection
+2. Send auth error
+3. Client prompts for new credentials
+
+## Performance Optimizations
+
+### Batching
+
+- Small, rapid changes are batched together
+- Reduces message overhead
+- Applied as single atomic update
+
+### Compression
+
+- Large files compressed before transmission
+- Reduces bandwidth usage
+- Transparent to application layer
+
+### Incremental Sync
+
+- Only changed portions of files sent
+- Uses content-based diffing
+- Significantly reduces data transfer
+
+### Caching
+
+- Server caches recent file versions
+- Reduces database queries
+- Improves response time
+
+## Monitoring Data Flow
+
+### Server Logs
+
+```
+2024-01-01 12:00:00 INFO WebSocket connection from 192.168.1.100
+2024-01-01 12:00:01 INFO User 'alice' authenticated for vault 'personal'
+2024-01-01 12:00:05 INFO Upload: notes/daily.md (v10 -> v11)
+2024-01-01 12:00:06 INFO Broadcast to 3 clients
+2024-01-01 12:00:10 INFO Conflict resolved: notes/shared.md (v12)
+```
+
+### Client Logs
+
+```
+2024-01-01 12:00:00 INFO Connecting to ws://sync.example.com
+2024-01-01 12:00:01 INFO Connected, authenticating...
+2024-01-01 12:00:01 INFO Authentication successful
+2024-01-01 12:00:02 INFO Starting initial sync
+2024-01-01 12:00:10 INFO Sync complete: 150 files, 200 MB
+2024-01-01 12:00:15 INFO Uploaded: notes/daily.md
+2024-01-01 12:00:20 INFO Downloaded: notes/shared.md (merged)
+```
+
+## Next Steps
+
+- [Understand the sync algorithm →](/architecture/sync-algorithm)
+- [Configure the server →](/config/server)
+- [Deploy VaultLink →](/guide/getting-started)
diff --git a/docs/architecture/index.md b/docs/architecture/index.md
new file mode 100644
index 00000000..e88c2b9d
--- /dev/null
+++ b/docs/architecture/index.md
@@ -0,0 +1,344 @@
+# Architecture Overview
+
+VaultLink is built as a distributed system with a central sync server and multiple clients. This document explains the high-level architecture and design decisions.
+
+## System Components
+
+```
+┌─────────────────────────────────────────────────────────────┐
+│                        Clients                              │
+├─────────────────────┬───────────────────┬───────────────────┤
+│  Obsidian Plugin    │  Obsidian Plugin  │   CLI Client      │
+│  (User A - Device1) │  (User A - Device2│   (Server/Backup) │
+└──────────┬──────────┴─────────┬─────────┴──────────┬────────┘
+           │                    │                    │
+           │    WebSocket       │   WebSocket        │   WebSocket
+           │                    │                    │
+           └────────────────────┼────────────────────┘
+                                │
+                    ┌───────────▼───────────┐
+                    │   Sync Server         │
+                    │   (Rust + Axum)       │
+                    │                       │
+                    │  ┌─────────────────┐  │
+                    │  │  WebSocket Hub  │  │
+                    │  └────────┬────────┘  │
+                    │           │           │
+                    │  ┌────────▼────────┐  │
+                    │  │ Sync Engine     │  │
+                    │  │ (OT Algorithm)  │  │
+                    │  └────────┬────────┘  │
+                    │           │           │
+                    │  ┌────────▼────────┐  │
+                    │  │ SQLite Database │  │
+                    │  │ (Per Vault)     │  │
+                    │  └─────────────────┘  │
+                    └───────────────────────┘
+```
+
+## Core Components
+
+### Sync Server
+
+The central authority for synchronization, written in Rust using Axum framework.
+
+**Responsibilities**:
+- Accept WebSocket connections from clients
+- Authenticate users via token-based auth
+- Store document versions in SQLite
+- Coordinate real-time updates between clients
+- Apply operational transformation for conflict resolution
+- Manage vault access control
+
+**Technology**:
+- **Language**: Rust 1.89+
+- **Framework**: Axum (async web framework)
+- **Database**: SQLite with SQLx
+- **Protocol**: WebSockets for real-time communication
+- **Sync Algorithm**: reconcile-text (operational transformation)
+
+### Sync Client Library
+
+TypeScript library providing core synchronization logic, used by both the Obsidian plugin and CLI client.
+
+**Responsibilities**:
+- Manage WebSocket connection to server
+- Watch local filesystem for changes
+- Upload and download files
+- Apply remote changes locally
+- Handle conflict resolution
+- Maintain sync metadata
+
+**Technology**:
+- **Language**: TypeScript
+- **Build**: Webpack
+- **Protocol**: WebSocket client
+- **File System**: Node.js `fs` API / Obsidian API
+
+### Obsidian Plugin
+
+Integration layer between sync client and Obsidian.
+
+**Responsibilities**:
+- Provide UI for configuration
+- Bridge sync client with Obsidian's file system API
+- Handle Obsidian lifecycle events
+- Display sync status to users
+
+**Technology**:
+- **Platform**: Obsidian Plugin API
+- **Core**: sync-client library
+- **UI**: Obsidian settings UI
+
+### CLI Client
+
+Standalone executable for syncing vaults without Obsidian.
+
+**Responsibilities**:
+- Command-line interface
+- File system access via Node.js
+- Daemon mode for continuous sync
+- Health check endpoint for monitoring
+
+**Technology**:
+- **Language**: TypeScript
+- **Runtime**: Node.js
+- **CLI**: Commander.js
+- **Core**: sync-client library
+
+## Data Flow
+
+### Initial Connection
+
+1. Client connects via WebSocket to server
+2. Server authenticates using provided token
+3. Server verifies user has access to requested vault
+4. Connection established, sync begins
+
+### File Upload Flow
+
+```
+Client                          Server
+  │                               │
+  │  1. File changed locally      │
+  │                               │
+  │  2. Read file content         │
+  │                               │
+  │  3. WebSocket: Upload file    │
+  ├──────────────────────────────►│
+  │                               │ 4. Store in SQLite
+  │                               │
+  │                               │ 5. Broadcast to other clients
+  │                               ├───────────────────────►
+  │  6. Ack upload                │
+  │◄──────────────────────────────┤
+```
+
+### File Download Flow
+
+```
+Client A                  Server                  Client B
+  │                         │                         │
+  │                         │  1. File uploaded       │
+  │                         │◄────────────────────────┤
+  │                         │                         │
+  │                         │ 2. Store in DB          │
+  │                         │                         │
+  │  3. Push notification   │                         │
+  │◄────────────────────────┤                         │
+  │                         │                         │
+  │  4. Download file       │                         │
+  ├────────────────────────►│                         │
+  │                         │                         │
+  │  5. Write locally       │                         │
+  │                         │                         │
+```
+
+### Conflict Resolution
+
+When two clients edit the same file simultaneously:
+
+```
+Client A                  Server                  Client B
+  │                         │                         │
+  │ 1. Edit file            │                         │ 1. Edit same file
+  │                         │                         │
+  │ 2. Upload changes       │                         │ 2. Upload changes
+  ├────────────────────────►│◄────────────────────────┤
+  │                         │                         │
+  │                         │ 3. Apply OT algorithm   │
+  │                         │    - Merge both edits   │
+  │                         │    - Preserve all changes│
+  │                         │                         │
+  │ 4. Receive merged ver.  │ 5. Receive merged ver.  │
+  │◄────────────────────────┤────────────────────────►│
+  │                         │                         │
+  │ 6. Apply locally        │                         │ 6. Apply locally
+```
+
+## Storage Architecture
+
+### Server Storage
+
+Each vault has its own SQLite database:
+
+```
+databases/
+├── vault-1.db
+├── vault-2.db
+└── shared-team.db
+```
+
+**Database Schema** (simplified):
+- **documents**: File metadata (path, size, modified time)
+- **versions**: Document content with version history
+- **cursors**: Client sync state
+
+### Client Storage
+
+Clients maintain sync metadata:
+
+```
+.vaultlink/
+├── metadata.json       # Sync state
+└── cache/              # Optional local cache
+```
+
+The `.vaultlink` directory tracks which files have been synced and their versions to enable efficient synchronization.
+
+## Communication Protocol
+
+### WebSocket Messages
+
+Client-server communication uses JSON messages over WebSocket.
+
+**Message Types**:
+- `upload_file`: Client → Server (file upload)
+- `download_file`: Client → Server (request file)
+- `file_updated`: Server → Client (file changed notification)
+- `file_deleted`: Server → Client (file deleted notification)
+- `sync_complete`: Server → Client (initial sync finished)
+
+### Authentication
+
+Token-based authentication on connection:
+
+```typescript
+// Client sends token on connect
+{
+  type: "auth",
+  token: "user-auth-token",
+  vault: "vault-name"
+}
+
+// Server responds
+{
+  type: "auth_success"
+}
+// or
+{
+  type: "auth_error",
+  message: "Invalid token"
+}
+```
+
+## Scalability Considerations
+
+### Current Architecture
+
+- **SQLite per vault**: Simple, performant, limited to single server
+- **WebSocket connections**: Stateful, requires sticky sessions for load balancing
+- **Operational transformation**: Centralized on server
+
+### Scaling Approaches
+
+**Vertical Scaling**:
+- Increase server resources (CPU, RAM, storage)
+- Optimize database queries and indexing
+- Tune connection limits
+
+**Horizontal Scaling** (future):
+- Separate vault servers (vault sharding)
+- Load balancer with sticky sessions
+- Shared storage layer for SQLite databases
+- Consider alternative databases (PostgreSQL) for multi-server setups
+
+### Performance Characteristics
+
+- **Small vaults** (< 1000 files): Excellent performance
+- **Medium vaults** (1000-10000 files): Good performance with tuning
+- **Large vaults** (> 10000 files): May require optimization
+- **Concurrent users**: Tested with dozens of simultaneous clients per vault
+
+## Security Model
+
+### Authentication
+
+- Token-based authentication
+- Tokens configured in server `config.yml`
+- No password hashing (tokens are secrets)
+
+### Authorization
+
+- Per-user vault access control
+- Allow-list or deny-list patterns
+- Global access or vault-specific access
+
+### Network Security
+
+- WebSocket over TLS (WSS) for encrypted transport
+- No built-in SSL (use reverse proxy)
+- CORS configured for web clients
+
+### Data Security
+
+- No encryption at rest (use encrypted filesystems if needed)
+- No end-to-end encryption (server sees all content)
+- Self-hosted model: you control the data
+
+## Technology Choices
+
+### Why Rust for Server?
+
+- **Performance**: Low latency for real-time sync
+- **Memory safety**: No crashes from memory bugs
+- **Concurrency**: Excellent async support with Tokio
+- **Type safety**: Catch bugs at compile time
+- **SQLx**: Compile-time SQL verification
+
+### Why SQLite?
+
+- **Simplicity**: No separate database server required
+- **Performance**: Fast for read-heavy workloads
+- **Reliability**: Battle-tested, ACID compliant
+- **Portability**: Single file per vault
+- **Backups**: Simple file copy
+
+### Why WebSocket?
+
+- **Real-time**: Bidirectional push for instant updates
+- **Efficiency**: Persistent connection, no polling overhead
+- **Simplicity**: Built-in browser/Node.js support
+- **Standards**: Well-supported protocol
+
+### Why Operational Transformation?
+
+- **Automatic conflict resolution**: No manual merging required
+- **Preserves intent**: All edits are kept
+- **Real-time collaboration**: Users see changes as they happen
+- **Proven algorithm**: Used by Google Docs, etc.
+
+## Design Principles
+
+1. **Self-hosted first**: Users control their data and infrastructure
+2. **Simplicity**: Easy to deploy and operate
+3. **Real-time**: Changes appear immediately
+4. **Reliability**: Handle network failures gracefully
+5. **Performance**: Fast sync for typical vault sizes
+6. **Privacy**: No third-party services or telemetry
+
+## Next Steps
+
+- [Learn about the sync algorithm →](/architecture/sync-algorithm)
+- [Understand data flow in detail →](/architecture/data-flow)
+- [Deploy the server →](/guide/server-setup)
diff --git a/docs/architecture/sync-algorithm.md b/docs/architecture/sync-algorithm.md
new file mode 100644
index 00000000..1f567efe
--- /dev/null
+++ b/docs/architecture/sync-algorithm.md
@@ -0,0 +1,361 @@
+# Sync Algorithm
+
+VaultLink uses operational transformation (OT) to handle concurrent edits and maintain consistency across clients. This document explains how the algorithm works.
+
+## Operational Transformation
+
+Operational transformation is a technique for managing concurrent edits to the same document. It transforms operations (edits) so they can be applied in different orders while preserving user intent.
+
+### Why OT?
+
+Traditional conflict resolution approaches:
+- **Last write wins**: Loses data, frustrating for users
+- **Manual merging**: Interrupts workflow, requires user intervention
+- **Version branching**: Complex, not suitable for real-time sync
+
+Operational transformation:
+- **Automatic**: No user intervention required
+- **Preserves all edits**: No data loss
+- **Real-time**: Changes appear immediately
+- **Intuitive**: Behavior matches user expectations
+
+## The reconcile-text Library
+
+VaultLink uses the [`reconcile-text`](https://crates.io/crates/reconcile-text) Rust library for operational transformation on text documents.
+
+### How It Works
+
+Given a base document and two sets of changes, OT produces a merged result that includes both changes.
+
+**Example**:
+
+```
+Base document: "Hello world"
+
+User A: "Hello beautiful world"  (inserts "beautiful ")
+User B: "Hello world!"            (inserts "!")
+
+OT result: "Hello beautiful world!"  (both changes applied)
+```
+
+### Operation Types
+
+The algorithm handles these operations:
+- **Insert**: Add text at position
+- **Delete**: Remove text from position
+- **Retain**: Keep existing text unchanged
+
+### Transformation Process
+
+1. **Client A** makes edit and sends to server
+2. **Client B** makes concurrent edit and sends to server
+3. **Server** receives both edits
+4. **Server** transforms operations to account for concurrent changes
+5. **Server** applies merged result to database
+6. **Server** sends transformed operations to both clients
+7. **Clients** apply transformed operations locally
+
+## Sync State Management
+
+VaultLink maintains sync state to track which changes have been applied.
+
+### Version Vectors
+
+Each document has a version tracked by:
+- **Server version**: Incremented on each change
+- **Client cursors**: Track which version each client has seen
+
+This enables:
+- Efficient syncing (only send changes since last sync)
+- Conflict detection (concurrent edits to same version)
+- Ordering of operations
+
+### Cursor Management
+
+Clients maintain a cursor position:
+
+```rust
+struct Cursor {
+    vault_id: String,
+    client_id: String,
+    last_version: u64,
+    last_updated: DateTime,
+}
+```
+
+On sync:
+1. Client sends cursor (last seen version)
+2. Server returns all changes since that version
+3. Client applies changes and updates cursor
+
+## Conflict Resolution Flow
+
+### Scenario: Concurrent Edits
+
+Two users edit the same paragraph simultaneously.
+
+**Initial state**:
+```
+Version 10: "The quick brown fox jumps over the lazy dog."
+```
+
+**User A's edit** (version 11):
+```
+"The quick brown fox jumps over the very lazy dog."
+```
+*Inserts "very " at position 40*
+
+**User B's edit** (also from version 10):
+```
+"The quick red fox jumps over the lazy dog."
+```
+*Replaces "brown" with "red" at position 10*
+
+### Server Processing
+
+1. **Receive User A's operation**:
+   - Base: version 10
+   - Operation: Insert("very ", position=40)
+   - Apply to database → version 11
+
+2. **Receive User B's operation**:
+   - Base: version 10
+   - Operation: Replace("brown"→"red", position=10)
+   - **Conflict detected**: Base is version 10, but current is version 11
+
+3. **Transform User B's operation**:
+   - Transform against User A's operation
+   - Adjust positions/content as needed
+   - Apply transformed operation → version 12
+
+4. **Broadcast updates**:
+   - Send User A's operation to User B
+   - Send transformed User B's operation to User A
+
+### Final Result
+
+```
+Version 12: "The quick red fox jumps over the very lazy dog."
+```
+
+Both edits are preserved in the final document.
+
+## Edge Cases
+
+### 1. Delete vs Insert Conflict
+
+**Scenario**: User A deletes a paragraph while User B edits it.
+
+**Resolution**:
+- OT algorithm prioritizes preservation of content
+- Insert operation is transformed to account for deletion
+- Typically results in inserted content appearing nearby
+
+**Example**:
+```
+Base: "Line 1\nLine 2\nLine 3"
+
+User A: Delete Line 2 → "Line 1\nLine 3"
+User B: Edit Line 2 → "Line 1\nLine 2 modified\nLine 3"
+
+Result: "Line 1\nLine 2 modified\nLine 3"
+```
+(Insert takes precedence, preserving user content)
+
+### 2. Overlapping Edits
+
+**Scenario**: Two users edit overlapping regions.
+
+**Resolution**:
+- OT splits operations into non-overlapping segments
+- Applies each segment independently
+- Merges results
+
+### 3. Delete vs Delete
+
+**Scenario**: Two users delete overlapping text.
+
+**Resolution**:
+- Deletes are merged
+- Final result has the union of deleted ranges removed
+
+### 4. Network Partitions
+
+**Scenario**: Client loses connection, makes edits offline, reconnects.
+
+**Resolution**:
+1. Client queues edits locally
+2. On reconnect, sends all queued operations
+3. Server applies OT against all operations that happened during partition
+4. Client receives transformed operations and applies
+
+## Performance Characteristics
+
+### Time Complexity
+
+- **Single operation**: O(1) for most operations
+- **Transformation**: O(n) where n is operation size
+- **Conflict resolution**: O(m × n) where m is number of concurrent operations
+
+### Space Complexity
+
+- **Version history**: Grows with number of changes
+- **Cursors**: O(clients × vaults)
+- **Active operations**: Minimal (processed in real-time)
+
+### Optimization
+
+VaultLink optimizes for:
+- Small, frequent edits (typical typing patterns)
+- Text documents (not binary files)
+- Real-time processing (no batching delay)
+
+## Limitations
+
+### Binary Files
+
+OT works best for text files. Binary files:
+- Cannot be meaningfully merged
+- Use last-write-wins strategy
+- May cause data loss on concurrent edits
+
+**Workaround**: Avoid concurrent edits to binary files, or use versioning.
+
+### Large Documents
+
+Very large documents (> 1MB) may have:
+- Higher transformation costs
+- Slower sync times
+- Increased memory usage
+
+**Workaround**: Split large documents or increase timeout settings.
+
+### Complex Formatting
+
+Markdown with complex structures may occasionally produce unexpected results:
+- Nested lists
+- Tables
+- Code blocks
+
+**Workaround**: Manual cleanup if needed, or minimize concurrent edits to complex structures.
+
+## Consistency Guarantees
+
+### Strong Consistency
+
+VaultLink provides **strong eventual consistency**:
+- All clients eventually converge to the same state
+- Operations applied in causal order
+- No data loss under normal operation
+
+### Ordering Guarantees
+
+- Operations from the same client are applied in order
+- Concurrent operations may be applied in any order
+- Final result is independent of operation order (commutative)
+
+### Durability
+
+- Operations are written to SQLite before acknowledgment
+- SQLite ACID guarantees protect against data loss
+- Clients retry failed uploads
+
+## Comparison with Other Approaches
+
+### Git-style Merging
+
+| Aspect | Git Merge | VaultLink OT |
+|--------|-----------|--------------|
+| Real-time | No | Yes |
+| Manual conflict resolution | Yes | No |
+| Branching | Yes | No |
+| Automatic merge | Limited | Always |
+| Use case | Code changes | Collaborative documents |
+
+### CRDTs (Conflict-free Replicated Data Types)
+
+| Aspect | CRDTs | VaultLink OT |
+|--------|-------|--------------|
+| Server required | No | Yes |
+| Memory overhead | Higher | Lower |
+| Complexity | Higher | Lower |
+| Deletion handling | Complex (tombstones) | Simple |
+| Best for | Distributed systems | Centralized sync |
+
+### Last Write Wins
+
+| Aspect | LWW | VaultLink OT |
+|--------|-----|--------------|
+| Data loss | Yes | No |
+| Simplicity | High | Medium |
+| User experience | Poor | Excellent |
+| Performance | Best | Good |
+
+## Algorithm Details
+
+### Transformation Rules
+
+When transforming operation `A` against operation `B`:
+
+1. **Insert vs Insert**:
+   - If positions equal: Order by client ID
+   - If different positions: Adjust positions
+
+2. **Insert vs Delete**:
+   - If insert in deleted range: Shift insert position
+   - If insert after delete: Adjust position by deleted length
+
+3. **Delete vs Delete**:
+   - If ranges overlap: Merge delete ranges
+   - If ranges disjoint: Adjust positions
+
+4. **Retain vs Any**:
+   - Retain operations don't conflict
+   - Simply adjust positions
+
+### Transformation Example
+
+```rust
+// Pseudo-code for transformation
+fn transform(op_a: Operation, op_b: Operation) -> (Operation, Operation) {
+    match (op_a, op_b) {
+        (Insert(pos_a, text_a), Insert(pos_b, text_b)) => {
+            if pos_a < pos_b {
+                (op_a, Insert(pos_b + text_a.len(), text_b))
+            } else if pos_a > pos_b {
+                (Insert(pos_a + text_b.len(), text_a), op_b)
+            } else {
+                // Same position, use client ID to break tie
+                if client_id_a < client_id_b {
+                    (op_a, Insert(pos_b + text_a.len(), text_b))
+                } else {
+                    (Insert(pos_a + text_b.len(), text_a), op_b)
+                }
+            }
+        }
+        // ... other cases
+    }
+}
+```
+
+## Best Practices
+
+### For Smooth Collaboration
+
+1. **Small edits**: Make small, focused changes for easier merging
+2. **Coordinate major changes**: Discuss large refactors with team
+3. **Monitor sync status**: Ensure changes are uploaded before signing off
+4. **Test conflict resolution**: Verify behavior matches expectations
+
+### For Developers
+
+1. **Text files preferred**: OT works best on text
+2. **Limit file sizes**: Keep documents reasonably sized
+3. **Binary files**: Use versioning or avoid concurrent edits
+4. **Testing**: Test concurrent edit scenarios thoroughly
+
+## Further Reading
+
+- [reconcile-text library](https://crates.io/crates/reconcile-text)
+- [Operational Transformation FAQ](https://en.wikipedia.org/wiki/Operational_transformation)
+- [Data flow architecture →](/architecture/data-flow)
diff --git a/docs/config/advanced.md b/docs/config/advanced.md
new file mode 100644
index 00000000..25c2e974
--- /dev/null
+++ b/docs/config/advanced.md
@@ -0,0 +1,581 @@
+# Advanced Configuration
+
+Advanced topics for optimizing and customizing your VaultLink deployment.
+
+## Database Optimization
+
+### SQLite Tuning
+
+While VaultLink handles most SQLite configuration automatically, you can optimize for specific workloads.
+
+#### WAL Mode
+
+VaultLink uses Write-Ahead Logging (WAL) mode by default for better concurrency.
+
+**Benefits**:
+- Readers don't block writers
+- Writers don't block readers
+- Better performance for concurrent access
+
+**Maintenance**:
+```bash
+# Checkpoint WAL to main database (run periodically)
+sqlite3 databases/vault.db "PRAGMA wal_checkpoint(TRUNCATE);"
+```
+
+#### Database Size Management
+
+Over time, databases can grow with version history:
+
+```bash
+# Check database size
+du -h databases/*.db
+
+# Vacuum to reclaim space (offline only)
+sqlite3 databases/vault.db "VACUUM;"
+
+# Analyze for query optimization
+sqlite3 databases/vault.db "ANALYZE;"
+```
+
+**Schedule maintenance**:
+```bash
+#!/bin/bash
+# monthly-maintenance.sh
+
+for db in databases/*.db; do
+    echo "Optimizing $db"
+    sqlite3 "$db" "PRAGMA optimize;"
+    sqlite3 "$db" "PRAGMA wal_checkpoint(TRUNCATE);"
+done
+```
+
+### Version History Cleanup
+
+To limit database growth, implement version history pruning (requires custom script):
+
+```bash
+#!/bin/bash
+# prune-old-versions.sh
+# Keep only last 100 versions per document
+
+for db in databases/*.db; do
+    sqlite3 "$db" <<EOF
+DELETE FROM versions
+WHERE id NOT IN (
+    SELECT id FROM versions
+    WHERE document_id = versions.document_id
+    ORDER BY version DESC
+    LIMIT 100
+);
+EOF
+done
+```
+
+## Performance Tuning
+
+### Connection Pool Sizing
+
+Calculate optimal `max_connections_per_vault`:
+
+```
+max_connections = (concurrent_users × avg_operations_per_user) + buffer
+```
+
+**Example**:
+- 20 concurrent users
+- 2 operations per user on average
+- 25% buffer
+
+```
+max_connections = (20 × 2) × 1.25 = 50
+```
+
+### Timeout Configuration
+
+Adjust timeouts based on network characteristics:
+
+**Fast local network**:
+```yaml
+database:
+  cursor_timeout_seconds: 30
+
+server:
+  response_timeout_seconds: 30
+```
+
+**Slow or unreliable network**:
+```yaml
+database:
+  cursor_timeout_seconds: 180
+
+server:
+  response_timeout_seconds: 120
+```
+
+**Mobile clients**:
+```yaml
+database:
+  cursor_timeout_seconds: 300  # Longer for intermittent connections
+
+server:
+  response_timeout_seconds: 180
+```
+
+## Reverse Proxy Configuration
+
+### Nginx with SSL
+
+Complete Nginx configuration for production:
+
+```nginx
+# Rate limiting
+limit_req_zone $binary_remote_addr zone=vaultlink:10m rate=10r/s;
+
+upstream vaultlink {
+    server localhost:3000;
+    keepalive 32;
+}
+
+server {
+    listen 443 ssl http2;
+    server_name sync.example.com;
+
+    ssl_certificate /etc/letsencrypt/live/sync.example.com/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/sync.example.com/privkey.pem;
+
+    # SSL security settings
+    ssl_protocols TLSv1.2 TLSv1.3;
+    ssl_ciphers HIGH:!aNULL:!MD5;
+    ssl_prefer_server_ciphers on;
+
+    # HSTS
+    add_header Strict-Transport-Security "max-age=31536000; includeSubDomains" always;
+
+    # Rate limiting
+    limit_req zone=vaultlink burst=20 nodelay;
+
+    # Client body size (match server config)
+    client_max_body_size 512M;
+
+    # Timeouts
+    proxy_connect_timeout 90s;
+    proxy_send_timeout 90s;
+    proxy_read_timeout 3600s;  # WebSocket long-lived connections
+
+    # WebSocket headers
+    proxy_http_version 1.1;
+    proxy_set_header Upgrade $http_upgrade;
+    proxy_set_header Connection "upgrade";
+    proxy_set_header Host $host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-Forwarded-Proto $scheme;
+
+    # Disable buffering for WebSocket
+    proxy_buffering off;
+
+    location / {
+        proxy_pass http://vaultlink;
+    }
+
+    # Health check endpoint
+    location /health {
+        proxy_pass http://vaultlink/vaults/health/ping;
+        access_log off;
+    }
+}
+
+# Redirect HTTP to HTTPS
+server {
+    listen 80;
+    server_name sync.example.com;
+    return 301 https://$server_name$request_uri;
+}
+```
+
+### Caddy with Auto SSL
+
+Caddy handles SSL automatically:
+
+```caddy
+sync.example.com {
+    reverse_proxy localhost:3000 {
+        # WebSocket support
+        header_up X-Real-IP {remote_host}
+        header_up X-Forwarded-For {remote_host}
+        header_up X-Forwarded-Proto {scheme}
+
+        # Timeouts
+        transport http {
+            read_timeout 3600s
+            write_timeout 90s
+        }
+    }
+
+    # Rate limiting (requires caddy-rate-limit plugin)
+    rate_limit {
+        zone dynamic {
+            match {
+                remote_ip
+            }
+            rate 10r/s
+            burst 20
+        }
+    }
+}
+```
+
+### Traefik Configuration
+
+Using Docker labels:
+
+```yaml
+services:
+  vaultlink-server:
+    image: ghcr.io/schmelczer/vault-link-server:latest
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.vaultlink.rule=Host(`sync.example.com`)"
+      - "traefik.http.routers.vaultlink.entrypoints=websecure"
+      - "traefik.http.routers.vaultlink.tls.certresolver=letsencrypt"
+      - "traefik.http.services.vaultlink.loadbalancer.server.port=3000"
+      # Middleware for timeouts
+      - "traefik.http.middlewares.vaultlink-timeout.timeout.request=3600s"
+```
+
+## Docker Optimizations
+
+### Resource Limits
+
+Limit container resources:
+
+```yaml
+services:
+  vaultlink-server:
+    image: ghcr.io/schmelczer/vault-link-server:latest
+    deploy:
+      resources:
+        limits:
+          cpus: '2.0'
+          memory: 4G
+        reservations:
+          cpus: '1.0'
+          memory: 2G
+```
+
+### Logging Configuration
+
+Optimize Docker logging:
+
+```yaml
+services:
+  vaultlink-server:
+    image: ghcr.io/schmelczer/vault-link-server:latest
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "50m"
+        max-file: "5"
+```
+
+### Volume Optimization
+
+Use named volumes for better performance:
+
+```yaml
+services:
+  vaultlink-server:
+    image: ghcr.io/schmelczer/vault-link-server:latest
+    volumes:
+      - vaultlink-data:/data
+      - vaultlink-logs:/data/logs
+
+volumes:
+  vaultlink-data:
+    driver: local
+    driver_opts:
+      type: none
+      o: bind
+      device: /mnt/fast-ssd/vaultlink
+  vaultlink-logs:
+    driver: local
+```
+
+## High Availability
+
+### Health Checks
+
+Comprehensive health monitoring:
+
+```yaml
+services:
+  vaultlink-server:
+    image: ghcr.io/schmelczer/vault-link-server:latest
+    healthcheck:
+      test: ["CMD-SHELL", "curl -f http://localhost:3000/vaults/health/ping || exit 1"]
+      interval: 10s
+      timeout: 5s
+      retries: 3
+      start_period: 30s
+```
+
+Monitor health in production:
+
+```bash
+#!/bin/bash
+# health-monitor.sh
+
+while true; do
+    if ! curl -sf http://localhost:3000/vaults/health/ping > /dev/null; then
+        echo "Health check failed at $(date)" | mail -s "VaultLink Down" admin@example.com
+        # Optionally restart
+        # docker restart vaultlink-server
+    fi
+    sleep 30
+done
+```
+
+### Backup Automation
+
+Automated backup script:
+
+```bash
+#!/bin/bash
+# backup-vaultlink.sh
+
+BACKUP_DIR="/backup/vaultlink"
+DATA_DIR="/data"
+DATE=$(date +%Y%m%d-%H%M%S)
+RETENTION_DAYS=30
+
+# Create backup directory
+mkdir -p "$BACKUP_DIR/$DATE"
+
+# Backup databases (with WAL checkpoint)
+for db in "$DATA_DIR"/databases/*.db; do
+    sqlite3 "$db" "PRAGMA wal_checkpoint(TRUNCATE);"
+    cp "$db" "$BACKUP_DIR/$DATE/"
+    [ -f "${db}-wal" ] && cp "${db}-wal" "$BACKUP_DIR/$DATE/"
+    [ -f "${db}-shm" ] && cp "${db}-shm" "$BACKUP_DIR/$DATE/"
+done
+
+# Backup configuration
+cp "$DATA_DIR/config.yml" "$BACKUP_DIR/$DATE/"
+
+# Compress backup
+tar -czf "$BACKUP_DIR/vaultlink-$DATE.tar.gz" -C "$BACKUP_DIR" "$DATE"
+rm -rf "$BACKUP_DIR/$DATE"
+
+# Clean old backups
+find "$BACKUP_DIR" -name "vaultlink-*.tar.gz" -mtime +$RETENTION_DAYS -delete
+
+# Upload to remote storage (optional)
+# rclone copy "$BACKUP_DIR/vaultlink-$DATE.tar.gz" remote:backups/
+```
+
+Schedule with cron:
+```cron
+0 2 * * * /opt/vaultlink/backup-vaultlink.sh
+```
+
+### Restore from Backup
+
+```bash
+#!/bin/bash
+# restore-vaultlink.sh
+
+BACKUP_FILE="$1"
+DATA_DIR="/data"
+
+if [ -z "$BACKUP_FILE" ]; then
+    echo "Usage: $0 <backup-file.tar.gz>"
+    exit 1
+fi
+
+# Stop server
+docker stop vaultlink-server
+
+# Extract backup
+tar -xzf "$BACKUP_FILE" -C /tmp/
+BACKUP_DATE=$(basename "$BACKUP_FILE" .tar.gz | cut -d- -f2-)
+
+# Restore databases
+cp /tmp/"$BACKUP_DATE"/databases/*.db "$DATA_DIR/databases/"
+
+# Restore config (careful!)
+# cp /tmp/$BACKUP_DATE/config.yml "$DATA_DIR/"
+
+# Cleanup
+rm -rf /tmp/"$BACKUP_DATE"
+
+# Start server
+docker start vaultlink-server
+
+echo "Restore complete. Check server logs."
+```
+
+## Monitoring and Metrics
+
+### Prometheus Metrics
+
+While VaultLink doesn't expose metrics natively, monitor Docker:
+
+```yaml
+# docker-compose.yml
+services:
+  vaultlink-server:
+    image: ghcr.io/schmelczer/vault-link-server:latest
+    labels:
+      - "prometheus.io/scrape=true"
+      - "prometheus.io/port=3000"
+
+  cadvisor:
+    image: gcr.io/cadvisor/cadvisor:latest
+    volumes:
+      - /:/rootfs:ro
+      - /var/run:/var/run:ro
+      - /sys:/sys:ro
+      - /var/lib/docker/:/var/lib/docker:ro
+    ports:
+      - 8080:8080
+```
+
+### Log Analysis
+
+Analyze logs for insights:
+
+```bash
+# Most active users
+grep "authenticated" logs/*.log | cut -d"'" -f2 | sort | uniq -c | sort -rn
+
+# Failed authentications by IP
+grep "Authentication failed" logs/*.log | grep -oP '\d+\.\d+\.\d+\.\d+' | sort | uniq -c | sort -rn
+
+# Upload activity
+grep "Upload:" logs/*.log | wc -l
+
+# Average files per vault
+grep "Sync complete" logs/*.log | grep -oP '\d+ files' | cut -d' ' -f1 | awk '{sum+=$1; count++} END {print sum/count}'
+```
+
+### Alerting
+
+Simple alerting with cron:
+
+```bash
+#!/bin/bash
+# alert-errors.sh
+
+ERROR_THRESHOLD=10
+ERROR_COUNT=$(grep -c "ERROR" logs/latest.log)
+
+if [ "$ERROR_COUNT" -gt "$ERROR_THRESHOLD" ]; then
+    echo "VaultLink has $ERROR_COUNT errors in the last hour" | \
+        mail -s "VaultLink Alert" admin@example.com
+fi
+```
+
+## Security Hardening
+
+### Network Isolation
+
+Run VaultLink in isolated network:
+
+```yaml
+services:
+  vaultlink-server:
+    image: ghcr.io/schmelczer/vault-link-server:latest
+    networks:
+      - vaultlink-internal
+      - proxy-external
+
+networks:
+  vaultlink-internal:
+    internal: true
+  proxy-external:
+    driver: bridge
+```
+
+### Read-Only Root Filesystem
+
+Run with read-only root (mount writable volumes for data):
+
+```yaml
+services:
+  vaultlink-server:
+    image: ghcr.io/schmelczer/vault-link-server:latest
+    read_only: true
+    volumes:
+      - ./data:/data
+      - /tmp
+```
+
+### Drop Capabilities
+
+Run with minimal privileges:
+
+```yaml
+services:
+  vaultlink-server:
+    image: ghcr.io/schmelczer/vault-link-server:latest
+    security_opt:
+      - no-new-privileges:true
+    cap_drop:
+      - ALL
+```
+
+## Migration
+
+### Moving to New Server
+
+1. **Backup on old server**:
+   ```bash
+   ./backup-vaultlink.sh
+   ```
+
+2. **Transfer backup**:
+   ```bash
+   scp vaultlink-backup.tar.gz new-server:/tmp/
+   ```
+
+3. **Restore on new server**:
+   ```bash
+   ./restore-vaultlink.sh /tmp/vaultlink-backup.tar.gz
+   ```
+
+4. **Update DNS/clients** to point to new server
+
+5. **Verify sync** on all clients
+
+### Version Upgrades
+
+```bash
+# Pull latest image
+docker pull ghcr.io/schmelczer/vault-link-server:latest
+
+# Backup first
+./backup-vaultlink.sh
+
+# Stop old container
+docker stop vaultlink-server
+docker rm vaultlink-server
+
+# Start with new image
+docker run -d \
+  --name vaultlink-server \
+  --restart unless-stopped \
+  -p 3000:3000 \
+  -v ./data:/data \
+  ghcr.io/schmelczer/vault-link-server:latest \
+  /app/sync_server /data/config.yml
+
+# Check logs
+docker logs -f vaultlink-server
+```
+
+## Next Steps
+
+- [Understand the architecture →](/architecture/)
+- [Deploy the server →](/guide/server-setup)
+- [Configure clients →](/guide/obsidian-plugin)
diff --git a/docs/config/authentication.md b/docs/config/authentication.md
new file mode 100644
index 00000000..2437a5ab
--- /dev/null
+++ b/docs/config/authentication.md
@@ -0,0 +1,530 @@
+# Authentication Configuration
+
+VaultLink uses token-based authentication with per-user vault access control. This guide covers all authentication and authorization options.
+
+## Overview
+
+Authentication in VaultLink:
+- **Token-based**: Users authenticate with secure tokens
+- **Configured in YAML**: All users defined in `config.yml`
+- **Vault-level access**: Control which vaults each user can access
+- **No password hashing**: Tokens are treated as secrets
+
+## Basic Configuration
+
+```yaml
+users:
+  user_configs:
+  - name: alice
+    token: alice-secure-token-here
+    vault_access:
+      type: allow_access_to_all
+```
+
+## User Configuration Fields
+
+### `name`
+
+**Type**: String
+**Required**: Yes
+
+Human-readable identifier for the user. Used in logs and auditing.
+
+```yaml
+- name: alice
+```
+
+**Notes**:
+- Must be unique across all users
+- Used for identification only, not authentication
+- Appears in server logs
+- Can be any string (e.g., email, username)
+
+### `token`
+
+**Type**: String
+**Required**: Yes
+
+Authentication token for the user. Must be kept secret.
+
+```yaml
+- token: 1a2b3c4d5e6f7g8h9i0j...
+```
+
+**Best practices**:
+- Generate with: `openssl rand -hex 32`
+- Minimum length: 32 characters
+- Use different token per user
+- Never commit to version control
+- Rotate periodically
+
+**Example token generation**:
+```bash
+# Generate a secure token
+openssl rand -hex 32
+# Output: a7f3c9d1e8b2f4a6c3d9e1f7b8a4c2d6e9f1a3b7c5d8e2f4a6b9c3d1e8f7a4b2
+```
+
+### `vault_access`
+
+**Type**: Object
+**Required**: Yes
+
+Defines which vaults the user can access.
+
+**Three modes**:
+1. `allow_access_to_all`: Access to all vaults
+2. `allow_list`: Access to specific vaults only
+3. `deny_list`: Access to all vaults except specific ones
+
+## Access Control Modes
+
+### Allow Access to All
+
+Grant access to every vault:
+
+```yaml
+users:
+  user_configs:
+  - name: admin
+    token: admin-token
+    vault_access:
+      type: allow_access_to_all
+```
+
+**Use cases**:
+- Administrator accounts
+- Personal single-user deployments
+- Development/testing
+
+### Allow List
+
+Grant access only to specific vaults:
+
+```yaml
+users:
+  user_configs:
+  - name: alice
+    token: alice-token
+    vault_access:
+      type: allow_list
+      allowed:
+        - personal
+        - shared-team
+        - project-alpha
+```
+
+**Use cases**:
+- Multi-user deployments
+- Restricted access scenarios
+- Separation of concerns
+
+**Notes**:
+- User can only access listed vaults
+- Attempting to access other vaults returns authentication error
+- Empty list = no access to any vault
+
+### Deny List
+
+Grant access to all vaults except specific ones:
+
+```yaml
+users:
+  user_configs:
+  - name: bob
+    token: bob-token
+    vault_access:
+      type: deny_list
+      denied:
+        - restricted
+        - admin-only
+```
+
+**Use cases**:
+- Users with broad access except sensitive vaults
+- Simplify configuration when most vaults are accessible
+
+**Notes**:
+- User can access any vault not in the deny list
+- Attempting to access denied vaults returns authentication error
+
+## Multi-User Scenarios
+
+### Personal Use (Single User)
+
+```yaml
+users:
+  user_configs:
+  - name: me
+    token: my-super-secret-token
+    vault_access:
+      type: allow_access_to_all
+```
+
+### Small Team (Shared Vaults)
+
+```yaml
+users:
+  user_configs:
+  - name: alice
+    token: alice-token
+    vault_access:
+      type: allow_list
+      allowed:
+        - personal-alice
+        - team-shared
+  - name: bob
+    token: bob-token
+    vault_access:
+      type: allow_list
+      allowed:
+        - personal-bob
+        - team-shared
+  - name: charlie
+    token: charlie-token
+    vault_access:
+      type: allow_list
+      allowed:
+        - personal-charlie
+        - team-shared
+```
+
+### Organization (Mixed Access)
+
+```yaml
+users:
+  user_configs:
+  - name: admin
+    token: admin-token
+    vault_access:
+      type: allow_access_to_all
+
+  - name: developer
+    token: dev-token
+    vault_access:
+      type: allow_list
+      allowed:
+        - engineering-docs
+        - api-specs
+        - shared
+
+  - name: designer
+    token: design-token
+    vault_access:
+      type: allow_list
+      allowed:
+        - design-docs
+        - brand-assets
+        - shared
+
+  - name: readonly
+    token: readonly-token
+    vault_access:
+      type: allow_list
+      allowed:
+        - public-wiki
+```
+
+## Authentication Flow
+
+### Connection
+
+1. Client connects via WebSocket
+2. Client sends authentication message:
+   ```json
+   {
+     "type": "auth",
+     "token": "user-token",
+     "vault": "vault-name"
+   }
+   ```
+3. Server validates:
+   - Token exists in config
+   - User has access to requested vault
+4. Server responds:
+   - Success: Connection established
+   - Failure: Connection closed with error
+
+### Validation
+
+Server checks:
+1. **Token match**: Token exists in `user_configs`
+2. **Vault access**: User has permission for vault
+3. **Connection limits**: Not exceeding `max_clients_per_vault`
+
+### Errors
+
+**Invalid token**:
+```
+Authentication failed: Invalid token
+```
+
+**No vault access**:
+```
+Authentication failed: User does not have access to vault 'restricted'
+```
+
+**Connection limit**:
+```
+Connection rejected: Maximum clients reached for vault
+```
+
+## Security Best Practices
+
+### Token Generation
+
+Generate strong tokens:
+
+```bash
+# 64 character hex token (256 bits)
+openssl rand -hex 32
+
+# Base64 encoded (256 bits)
+openssl rand -base64 32
+
+# UUID v4
+uuidgen
+```
+
+### Token Storage
+
+**In config file**:
+```yaml
+users:
+  user_configs:
+  - name: alice
+    token: !ENV ALICE_TOKEN  # Read from environment variable
+```
+
+**Load from environment**:
+```bash
+export ALICE_TOKEN="$(openssl rand -hex 32)"
+./sync_server config.yml
+```
+
+### Token Rotation
+
+Periodically change tokens:
+
+1. Generate new token
+2. Update `config.yml`
+3. Restart server
+4. Update clients with new token
+
+### Token Revocation
+
+To revoke access:
+1. Remove user from `config.yml`
+2. Restart server
+3. User's connections will be rejected
+
+For immediate revocation:
+- Remove user from config
+- Restart server
+- Existing connections are terminated
+
+## Access Patterns
+
+### Read-Only Users
+
+VaultLink doesn't distinguish read-only vs read-write. Implement via client:
+
+```yaml
+# Server: Grant access
+users:
+  user_configs:
+  - name: readonly
+    token: readonly-token
+    vault_access:
+      type: allow_list
+      allowed:
+        - public
+
+# Client: Use CLI in read-only mode (mount vault read-only)
+docker run -v /vault:/vault:ro ...
+```
+
+### Temporary Access
+
+Grant temporary access:
+
+1. Add user to config
+2. Set reminder to remove later
+3. Remove user when no longer needed
+4. Restart server
+
+For automation:
+```bash
+# Add user with expiry comment
+echo "  - name: temp-user  # EXPIRES: 2024-12-31" >> config.yml
+echo "    token: temp-token" >> config.yml
+```
+
+### Shared Tokens (Not Recommended)
+
+Multiple users sharing a token:
+- All appear as same user in logs
+- Can't revoke individual access
+- Security risk if one person leaves
+
+**Instead**: Create separate users with same vault access.
+
+## Monitoring
+
+### Server Logs
+
+Authentication events are logged:
+
+```
+2024-01-01 12:00:00 INFO User 'alice' authenticated for vault 'personal'
+2024-01-01 12:00:05 WARN Authentication failed: Invalid token from 192.168.1.100
+2024-01-01 12:00:10 WARN User 'bob' denied access to vault 'restricted'
+```
+
+### Audit Trail
+
+Monitor authentication:
+
+```bash
+# View authentication logs
+grep "authenticated" logs/*.log
+
+# View failed authentications
+grep "Authentication failed" logs/*.log
+
+# View access denials
+grep "denied access" logs/*.log
+```
+
+## Advanced Scenarios
+
+### Multiple Servers
+
+Same user across multiple server instances:
+
+```yaml
+# Server 1 config.yml
+users:
+  user_configs:
+  - name: alice
+    token: alice-global-token
+    vault_access:
+      type: allow_list
+      allowed:
+        - vault-1
+        - vault-2
+
+# Server 2 config.yml
+users:
+  user_configs:
+  - name: alice
+    token: alice-global-token  # Same token
+    vault_access:
+      type: allow_list
+      allowed:
+        - vault-3
+        - vault-4
+```
+
+### Service Accounts
+
+Tokens for automated systems:
+
+```yaml
+users:
+  user_configs:
+  - name: backup-service
+    token: backup-service-token
+    vault_access:
+      type: allow_access_to_all
+
+  - name: ci-pipeline
+    token: ci-token
+    vault_access:
+      type: allow_list
+      allowed:
+        - documentation
+
+  - name: monitoring
+    token: monitoring-token
+    vault_access:
+      type: allow_list
+      allowed:
+        - metrics
+```
+
+### Dynamic Vault Access
+
+VaultLink doesn't support runtime user management. To change access:
+
+1. Update `config.yml`
+2. Restart server
+3. Users reconnect automatically
+
+For frequent changes, consider:
+- Over-provision access (deny list)
+- Use external authentication proxy
+- Script config updates + reload
+
+## Troubleshooting
+
+### Can't connect
+
+**Check token**:
+```bash
+# Verify token in config matches client
+grep "token:" config.yml
+```
+
+**Check vault name**:
+```bash
+# Ensure vault is in allowed list
+grep -A 5 "name: alice" config.yml
+```
+
+**Check server logs**:
+```bash
+tail -f logs/*.log | grep -i auth
+```
+
+### Access denied
+
+**Verify vault access**:
+```yaml
+# Check user's vault_access configuration
+users:
+  user_configs:
+  - name: alice
+    vault_access:
+      type: allow_list
+      allowed:
+        - vault-name  # Must match exactly
+```
+
+**Case sensitivity**:
+- Vault names are case-sensitive
+- `Vault` ≠ `vault`
+- Ensure exact match in config and client
+
+### Token not working
+
+**Check for typos**:
+- Extra spaces
+- Hidden characters
+- Wrong quotes in YAML
+
+**Regenerate token**:
+```bash
+# Generate new token
+openssl rand -hex 32
+
+# Update config
+# Restart server
+# Update client
+```
+
+## Next Steps
+
+- [Server configuration reference →](/config/server)
+- [Advanced configuration →](/config/advanced)
+- [Deploy the server →](/guide/server-setup)
diff --git a/docs/config/server.md b/docs/config/server.md
new file mode 100644
index 00000000..c6632b5e
--- /dev/null
+++ b/docs/config/server.md
@@ -0,0 +1,470 @@
+# Server Configuration
+
+Complete reference for configuring the VaultLink sync server via `config.yml`.
+
+## Configuration File Format
+
+The server is configured using a YAML file passed as a command-line argument:
+
+```bash
+/app/sync_server /path/to/config.yml
+```
+
+## Complete Example
+
+```yaml
+database:
+  databases_directory_path: databases
+  max_connections_per_vault: 12
+  cursor_timeout_seconds: 60
+
+server:
+  host: 0.0.0.0
+  port: 3000
+  max_body_size_mb: 512
+  max_clients_per_vault: 256
+  response_timeout_seconds: 60
+
+users:
+  user_configs:
+  - name: admin
+    token: your-secure-random-token
+    vault_access:
+      type: allow_access_to_all
+  - name: alice
+    token: alice-token
+    vault_access:
+      type: allow_list
+      allowed:
+        - personal
+        - shared
+  - name: bob
+    token: bob-token
+    vault_access:
+      type: deny_list
+      denied:
+        - restricted
+
+logging:
+  log_directory: logs
+  log_rotation: 7days
+```
+
+## Database Section
+
+### `databases_directory_path`
+
+**Type**: String
+**Required**: Yes
+**Default**: None
+
+Directory where SQLite database files are stored. One database file per vault.
+
+```yaml
+database:
+  databases_directory_path: /data/databases
+```
+
+The directory structure:
+```
+databases/
+├── vault-1.db
+├── vault-2.db
+└── personal.db
+```
+
+**Notes**:
+- Path is relative to working directory or absolute
+- Directory must be writable by the server process
+- Ensure adequate disk space for vault data
+- Back up this directory regularly
+
+### `max_connections_per_vault`
+
+**Type**: Integer
+**Required**: Yes
+**Default**: None
+**Recommended**: 12
+
+Maximum concurrent database connections per vault.
+
+```yaml
+database:
+  max_connections_per_vault: 12
+```
+
+**Tuning**:
+- Higher values: Better performance under load
+- Lower values: Less memory usage
+- Typical range: 8-20
+- Consider: Number of concurrent users × average operations per user
+
+### `cursor_timeout_seconds`
+
+**Type**: Integer
+**Required**: Yes
+**Default**: None
+**Recommended**: 60
+
+How long to keep database cursors alive for inactive clients.
+
+```yaml
+database:
+  cursor_timeout_seconds: 60
+```
+
+**Notes**:
+- Cursors track client sync state
+- Timeout too short: Clients may need to re-sync frequently
+- Timeout too long: More memory usage
+- Typical range: 30-300 seconds
+
+## Server Section
+
+### `host`
+
+**Type**: String
+**Required**: Yes
+**Default**: None
+
+Network interface to bind the server to.
+
+```yaml
+server:
+  host: 0.0.0.0  # All interfaces
+  # OR
+  host: 127.0.0.1  # Localhost only
+  # OR
+  host: 192.168.1.100  # Specific interface
+```
+
+**Common values**:
+- `0.0.0.0`: Listen on all network interfaces (production)
+- `127.0.0.1`: Listen on localhost only (development/testing)
+- Specific IP: Listen on specific interface
+
+### `port`
+
+**Type**: Integer
+**Required**: Yes
+**Default**: None
+**Recommended**: 3000
+
+TCP port to listen on.
+
+```yaml
+server:
+  port: 3000
+```
+
+**Notes**:
+- Must be available (not in use)
+- Privileged ports (< 1024) require root
+- Common ports: 3000, 8080, 8888
+- Configure firewall to allow this port
+
+### `max_body_size_mb`
+
+**Type**: Integer
+**Required**: Yes
+**Default**: None
+**Recommended**: 512
+
+Maximum size of HTTP request body in megabytes.
+
+```yaml
+server:
+  max_body_size_mb: 512
+```
+
+**Usage**:
+- Limits file upload size
+- Prevents memory exhaustion attacks
+- Must be larger than largest expected file
+- Consider client `max_file_size_mb` settings
+
+**Tuning**:
+- Small vaults (mostly text): 100 MB
+- Medium vaults (some images): 512 MB
+- Large vaults (many images/PDFs): 1024+ MB
+
+### `max_clients_per_vault`
+
+**Type**: Integer
+**Required**: Yes
+**Default**: None
+**Recommended**: 256
+
+Maximum concurrent clients per vault.
+
+```yaml
+server:
+  max_clients_per_vault: 256
+```
+
+**Notes**:
+- Limits concurrent WebSocket connections
+- Prevents resource exhaustion
+- Consider expected number of users
+- Each client uses memory and file descriptors
+
+**Scaling**:
+- Personal use: 10-50
+- Small team: 50-100
+- Large team: 100-500
+
+### `response_timeout_seconds`
+
+**Type**: Integer
+**Required**: Yes
+**Default**: None
+**Recommended**: 60
+
+Maximum time to wait for client responses.
+
+```yaml
+server:
+  response_timeout_seconds: 60
+```
+
+**Usage**:
+- Timeout for HTTP requests
+- Timeout for WebSocket operations
+- Clients disconnected if unresponsive
+
+**Tuning**:
+- Fast networks: 30 seconds
+- Slow networks: 90-120 seconds
+- Large file uploads: Increase proportionally
+
+## Users Section
+
+See [Authentication Configuration →](/config/authentication) for detailed user configuration.
+
+## Logging Section
+
+### `log_directory`
+
+**Type**: String
+**Required**: Yes
+**Default**: None
+
+Directory where log files are written.
+
+```yaml
+logging:
+  log_directory: /data/logs
+  # OR
+  log_directory: logs  # Relative to working directory
+```
+
+**Notes**:
+- Path is relative to working directory or absolute
+- Directory must be writable
+- Logs are rotated based on `log_rotation`
+- Monitor disk usage
+
+### `log_rotation`
+
+**Type**: String
+**Required**: Yes
+**Default**: None
+
+How often to rotate log files.
+
+```yaml
+logging:
+  log_rotation: 7days
+  # OR
+  log_rotation: 24hours
+  # OR
+  log_rotation: 30days
+```
+
+**Format**: `<number><unit>`
+
+**Units**:
+- `hours`: Hours (e.g., `12hours`, `24hours`)
+- `days`: Days (e.g., `7days`, `30days`)
+
+**Recommendations**:
+- Development: `24hours` or `7days`
+- Production: `7days` or `30days`
+- High traffic: `24hours` (logs can be large)
+
+## Environment-Specific Configurations
+
+### Development
+
+```yaml
+database:
+  databases_directory_path: ./databases
+  max_connections_per_vault: 8
+  cursor_timeout_seconds: 30
+
+server:
+  host: 127.0.0.1
+  port: 3000
+  max_body_size_mb: 100
+  max_clients_per_vault: 10
+  response_timeout_seconds: 30
+
+users:
+  user_configs:
+  - name: dev
+    token: dev-token
+    vault_access:
+      type: allow_access_to_all
+
+logging:
+  log_directory: logs
+  log_rotation: 24hours
+```
+
+### Production
+
+```yaml
+database:
+  databases_directory_path: /data/databases
+  max_connections_per_vault: 16
+  cursor_timeout_seconds: 120
+
+server:
+  host: 0.0.0.0
+  port: 3000
+  max_body_size_mb: 512
+  max_clients_per_vault: 256
+  response_timeout_seconds: 90
+
+users:
+  user_configs:
+  - name: admin
+    token: <strong-random-token>
+    vault_access:
+      type: allow_access_to_all
+  # Additional users...
+
+logging:
+  log_directory: /data/logs
+  log_rotation: 7days
+```
+
+## Validation
+
+The server validates configuration on startup:
+
+```bash
+# Start server
+./sync_server config.yml
+
+# Check for errors in logs
+tail -f logs/latest.log
+```
+
+**Common errors**:
+- Missing required fields
+- Invalid YAML syntax
+- Invalid values (negative numbers, etc.)
+- Directory not writable
+
+## Performance Tuning
+
+### High Concurrency
+
+For many concurrent users:
+
+```yaml
+database:
+  max_connections_per_vault: 20  # Increase
+
+server:
+  max_clients_per_vault: 500  # Increase
+  response_timeout_seconds: 120  # Increase for slow clients
+```
+
+### Large Files
+
+For vaults with large files:
+
+```yaml
+server:
+  max_body_size_mb: 1024  # Allow larger uploads
+  response_timeout_seconds: 180  # More time for uploads
+```
+
+### Resource-Constrained Systems
+
+For limited CPU/memory:
+
+```yaml
+database:
+  max_connections_per_vault: 6  # Reduce
+
+server:
+  max_clients_per_vault: 50  # Reduce
+  max_body_size_mb: 256  # Reduce
+```
+
+## Security Considerations
+
+### Token Security
+
+- Use strong random tokens: `openssl rand -hex 32`
+- Never commit tokens to version control
+- Rotate tokens periodically
+- Use different tokens per user
+
+### Network Security
+
+- Bind to `127.0.0.1` if using reverse proxy on same host
+- Use firewall to restrict access
+- Enable SSL/TLS via reverse proxy
+
+### Resource Limits
+
+- Set `max_clients_per_vault` to prevent DoS
+- Set `max_body_size_mb` to prevent memory exhaustion
+- Configure `response_timeout_seconds` to prevent hanging connections
+
+## Troubleshooting
+
+### Server won't start
+
+**Check YAML syntax**:
+```bash
+# Use a YAML validator
+python -c 'import yaml, sys; yaml.safe_load(open("config.yml"))'
+```
+
+**Check file paths**:
+```bash
+# Ensure directories exist and are writable
+mkdir -p databases logs
+chmod 755 databases logs
+```
+
+**Check port availability**:
+```bash
+# Verify port is not in use
+lsof -i :3000
+```
+
+### High memory usage
+
+- Reduce `max_connections_per_vault`
+- Reduce `max_clients_per_vault`
+- Reduce `max_body_size_mb`
+- Check for large vaults or many concurrent users
+
+### Slow performance
+
+- Increase `max_connections_per_vault`
+- Increase database connection pool
+- Use SSD for database storage
+- Monitor database size (vacuum if needed)
+
+## Next Steps
+
+- [Configure authentication →](/config/authentication)
+- [Advanced configuration options →](/config/advanced)
+- [Deploy the server →](/guide/server-setup)
diff --git a/docs/guide/cli-client.md b/docs/guide/cli-client.md
new file mode 100644
index 00000000..3beb4b7d
--- /dev/null
+++ b/docs/guide/cli-client.md
@@ -0,0 +1,516 @@
+# CLI Client
+
+The VaultLink CLI client provides standalone synchronization without requiring Obsidian. Perfect for servers, automation, backups, or syncing vaults on headless systems.
+
+## Installation
+
+### Docker (Recommended)
+
+Pull the latest image:
+
+```bash
+docker pull ghcr.io/schmelczer/vault-link-cli:latest
+```
+
+### npm
+
+Install globally:
+
+```bash
+npm install -g @schmelczer/local-client-cli
+```
+
+Verify installation:
+
+```bash
+vaultlink --version
+```
+
+### From Source
+
+Build from the repository:
+
+```bash
+git clone https://github.com/schmelczer/vault-link.git
+cd vault-link/frontend/local-client-cli
+npm install
+npm run build
+node dist/cli.js --help
+```
+
+## Usage
+
+### Basic Usage
+
+```bash
+vaultlink \
+  --local-path /path/to/vault \
+  --remote-uri wss://sync.example.com \
+  --token your-auth-token \
+  --vault-name default
+```
+
+### Docker Usage
+
+```bash
+docker run -v /path/to/vault:/vault \
+  ghcr.io/schmelczer/vault-link-cli:latest \
+  -l /vault \
+  -r wss://sync.example.com \
+  -t your-auth-token \
+  -v default
+```
+
+### Docker Compose
+
+Create `docker-compose.yml`:
+
+```yaml
+services:
+  vaultlink-cli:
+    image: ghcr.io/schmelczer/vault-link-cli:latest
+    restart: unless-stopped
+    volumes:
+      - ./vault:/vault
+    command:
+      - "-l"
+      - "/vault"
+      - "-r"
+      - "wss://sync.example.com"
+      - "-t"
+      - "your-token"
+      - "-v"
+      - "default"
+```
+
+Start the client:
+
+```bash
+docker compose up -d
+```
+
+## Configuration Options
+
+### Required Arguments
+
+| Argument | Short | Description | Example |
+|----------|-------|-------------|---------|
+| `--local-path` | `-l` | Local directory to sync | `/vault` |
+| `--remote-uri` | `-r` | Server WebSocket URI | `wss://sync.example.com` |
+| `--token` | `-t` | Authentication token | `abc123...` |
+| `--vault-name` | `-v` | Vault name on server | `default` |
+
+### Optional Arguments
+
+| Argument | Default | Description |
+|----------|---------|-------------|
+| `--sync-concurrency` | `1` | Concurrent file operations |
+| `--max-file-size-mb` | `10` | Max file size in MB |
+| `--ignore-pattern` | - | Glob pattern to ignore (repeatable) |
+| `--websocket-retry-interval-ms` | `3500` | Reconnection interval |
+| `--log-level` | `INFO` | Log level: DEBUG, INFO, WARNING, ERROR |
+
+### Environment Variables
+
+Alternative to command-line arguments:
+
+```bash
+export VAULTLINK_LOCAL_PATH="/vault"
+export VAULTLINK_REMOTE_URI="wss://sync.example.com"
+export VAULTLINK_TOKEN="your-token"
+export VAULTLINK_VAULT_NAME="default"
+
+vaultlink
+```
+
+## Examples
+
+### Basic Sync
+
+Sync a local directory to the server:
+
+```bash
+vaultlink \
+  -l ./my-notes \
+  -r wss://sync.example.com \
+  -t my-secure-token \
+  -v personal
+```
+
+### With Ignore Patterns
+
+Exclude specific files or directories:
+
+```bash
+vaultlink \
+  -l ./vault \
+  -r wss://sync.example.com \
+  -t token123 \
+  -v default \
+  --ignore-pattern "*.tmp" \
+  --ignore-pattern ".DS_Store" \
+  --ignore-pattern "node_modules/**"
+```
+
+### Debug Logging
+
+Enable verbose logging:
+
+```bash
+vaultlink \
+  -l ./vault \
+  -r wss://sync.example.com \
+  -t token123 \
+  -v default \
+  --log-level DEBUG
+```
+
+### High Concurrency
+
+Faster initial sync:
+
+```bash
+vaultlink \
+  -l ./vault \
+  -r wss://sync.example.com \
+  -t token123 \
+  -v default \
+  --sync-concurrency 5
+```
+
+### Large Files
+
+Allow larger file uploads:
+
+```bash
+vaultlink \
+  -l ./vault \
+  -r wss://sync.example.com \
+  -t token123 \
+  -v default \
+  --max-file-size-mb 50
+```
+
+## Docker Deployment
+
+### Long-Running Sync
+
+Run as a daemon for continuous synchronization:
+
+```bash
+docker run -d \
+  --name vaultlink-sync \
+  --restart unless-stopped \
+  -v $(pwd)/vault:/vault \
+  ghcr.io/schmelczer/vault-link-cli:latest \
+  -l /vault \
+  -r wss://sync.example.com \
+  -t your-token \
+  -v default
+```
+
+Monitor logs:
+
+```bash
+docker logs -f vaultlink-sync
+```
+
+### Health Monitoring
+
+The Docker image includes built-in health checks:
+
+```bash
+# Check health status
+docker ps
+
+# View detailed health info
+docker inspect --format='{{json .State.Health}}' vaultlink-sync | jq
+```
+
+Health check verifies:
+- Health file exists
+- Status updated within last 30 seconds
+- WebSocket connection is active
+
+Configure custom health check:
+
+```yaml
+services:
+  vaultlink-cli:
+    image: ghcr.io/schmelczer/vault-link-cli:latest
+    healthcheck:
+      test: ["CMD", "node", "/app/healthcheck.js"]
+      interval: 15s
+      timeout: 5s
+      retries: 5
+      start_period: 20s
+```
+
+### Read-Only Vault
+
+Mount vault as read-only to prevent local changes:
+
+```bash
+docker run -d \
+  -v $(pwd)/vault:/vault:ro \
+  ghcr.io/schmelczer/vault-link-cli:latest \
+  -l /vault \
+  -r wss://sync.example.com \
+  -t token \
+  -v default
+```
+
+::: warning
+The CLI needs write access to create `.vaultlink` metadata directory. Mount as read-write or provide a separate writeable directory.
+:::
+
+## How It Works
+
+### Initial Sync
+
+On startup:
+
+1. Creates `.vaultlink/` directory for metadata
+2. Scans local filesystem
+3. Uploads all local files to server
+4. Downloads files from server not present locally
+5. Resolves conflicts using operational transformation
+
+### Real-Time Synchronization
+
+After initial sync:
+
+1. Watches filesystem for changes using `fs.watch`
+2. Uploads changed files immediately
+3. Receives real-time updates from server via WebSocket
+4. Handles bidirectional sync automatically
+
+### Graceful Shutdown
+
+On SIGINT (Ctrl+C) or SIGTERM:
+
+1. Completes pending uploads
+2. Closes WebSocket connection cleanly
+3. Flushes metadata to disk
+4. Exits gracefully
+
+## Use Cases
+
+### Automated Backups
+
+Continuously backup vaults to a remote server:
+
+```bash
+docker run -d \
+  --name vault-backup \
+  -v /important/notes:/vault:ro \
+  ghcr.io/schmelczer/vault-link-cli:latest \
+  -l /vault -r wss://backup.example.com -t backup-token -v backups
+```
+
+### CI/CD Documentation
+
+Sync documentation in automated pipelines:
+
+```bash
+# In your CI pipeline
+docker run \
+  -v $(pwd)/docs:/vault \
+  ghcr.io/schmelczer/vault-link-cli:latest \
+  -l /vault -r wss://docs.example.com -t ci-token -v prod-docs
+```
+
+### Multi-Location Sync
+
+Sync between different geographic locations:
+
+```bash
+# Location A
+vaultlink -l /data/vault -r wss://hub.example.com -t token -v shared
+
+# Location B
+vaultlink -l /backup/vault -r wss://hub.example.com -t token -v shared
+```
+
+### Development Environment
+
+Keep documentation in sync across dev environments:
+
+```bash
+# In docker-compose.yml for your dev stack
+services:
+  docs-sync:
+    image: ghcr.io/schmelczer/vault-link-cli:latest
+    volumes:
+      - ./docs:/vault
+    command: ["-l", "/vault", "-r", "wss://docs-server", "-t", "dev-token", "-v", "dev"]
+```
+
+## Troubleshooting
+
+### Client won't connect
+
+**Check server accessibility**:
+```bash
+curl https://sync.example.com/vaults/test/ping
+```
+
+**Verify WebSocket protocol**:
+- Use `ws://` for HTTP servers
+- Use `wss://` for HTTPS servers
+
+**Check authentication**:
+- Token must match server config
+- User must have access to the vault
+
+### Permission errors
+
+**Docker volume permissions**:
+```bash
+# Ensure directory is writable
+chmod 755 /path/to/vault
+
+# Check Docker user ID
+docker run --rm ghcr.io/schmelczer/vault-link-cli:latest id
+```
+
+**SELinux issues**:
+```bash
+# Add :z flag to volume mount
+docker run -v /path/to/vault:/vault:z ...
+```
+
+### Files not syncing
+
+**Check ignore patterns**:
+- View logs to see which files are skipped
+- Ensure patterns don't match unintentionally
+
+**File size limits**:
+- Check `--max-file-size-mb` setting
+- Large files are skipped with a warning
+
+**Check metadata**:
+```bash
+# View sync metadata
+cat /path/to/vault/.vaultlink/metadata.json
+```
+
+### High memory usage
+
+**Reduce concurrency**:
+```bash
+--sync-concurrency 1
+```
+
+**Limit file sizes**:
+```bash
+--max-file-size-mb 5
+```
+
+**Check vault size**:
+- Very large vaults may need more resources
+- Consider splitting into multiple vaults
+
+### Connection keeps dropping
+
+**Increase retry interval**:
+```bash
+--websocket-retry-interval-ms 5000
+```
+
+**Check network stability**:
+```bash
+# Monitor connection
+docker logs -f vaultlink-sync | grep -i websocket
+```
+
+**Server timeout settings**:
+- Verify reverse proxy WebSocket timeout
+- Check server `response_timeout_seconds`
+
+## Advanced Usage
+
+### Custom Healthcheck Script
+
+Create your own health monitoring:
+
+```bash
+#!/bin/bash
+HEALTH_FILE="/tmp/vaultlink-health.json"
+
+if [ ! -f "$HEALTH_FILE" ]; then
+    exit 1
+fi
+
+# Check file is recent (within 60 seconds)
+if [ $(( $(date +%s) - $(stat -c %Y "$HEALTH_FILE") )) -gt 60 ]; then
+    exit 1
+fi
+
+# Check WebSocket is connected
+if ! jq -e '.connected == true' "$HEALTH_FILE" > /dev/null; then
+    exit 1
+fi
+
+exit 0
+```
+
+### Automated Recovery
+
+Restart on failure with exponential backoff:
+
+```bash
+#!/bin/bash
+RETRY_DELAY=5
+
+while true; do
+    vaultlink -l /vault -r wss://server -t token -v default
+
+    echo "Client exited, restarting in ${RETRY_DELAY}s..."
+    sleep $RETRY_DELAY
+
+    # Exponential backoff up to 5 minutes
+    RETRY_DELAY=$((RETRY_DELAY * 2))
+    if [ $RETRY_DELAY -gt 300 ]; then
+        RETRY_DELAY=300
+    fi
+done
+```
+
+### Integration with systemd
+
+Create `/etc/systemd/system/vaultlink-cli.service`:
+
+```ini
+[Unit]
+Description=VaultLink CLI Sync
+After=network-online.target
+Wants=network-online.target
+
+[Service]
+Type=simple
+Restart=always
+RestartSec=10
+Environment="VAULTLINK_LOCAL_PATH=/data/vault"
+Environment="VAULTLINK_REMOTE_URI=wss://sync.example.com"
+Environment="VAULTLINK_TOKEN=your-token"
+Environment="VAULTLINK_VAULT_NAME=default"
+ExecStart=/usr/local/bin/vaultlink
+
+[Install]
+WantedBy=multi-user.target
+```
+
+Enable and start:
+```bash
+sudo systemctl daemon-reload
+sudo systemctl enable vaultlink-cli
+sudo systemctl start vaultlink-cli
+```
+
+## Next Steps
+
+- [Configure server authentication →](/config/authentication)
+- [Learn about the sync algorithm →](/architecture/sync-algorithm)
+- [Set up Obsidian plugin →](/guide/obsidian-plugin)
diff --git a/docs/guide/getting-started.md b/docs/guide/getting-started.md
new file mode 100644
index 00000000..a2636069
--- /dev/null
+++ b/docs/guide/getting-started.md
@@ -0,0 +1,185 @@
+# Getting Started
+
+This guide will walk you through setting up VaultLink from scratch. You'll have a working sync server and connected client in under 10 minutes.
+
+## Prerequisites
+
+- Docker installed (recommended) or Rust toolchain for building from source
+- Basic familiarity with command line
+- A server or machine to host the sync server (can be localhost for testing)
+
+## Quick Start
+
+### Step 1: Deploy the Sync Server
+
+The fastest way to get started is with Docker:
+
+```bash
+# Create a directory for server data
+mkdir -p ~/vaultlink-data
+cd ~/vaultlink-data
+
+# Create a basic configuration file
+cat > config.yml << 'EOF'
+database:
+  databases_directory_path: databases
+  max_connections_per_vault: 12
+  cursor_timeout_seconds: 60
+server:
+  host: 0.0.0.0
+  port: 3000
+  max_body_size_mb: 512
+  max_clients_per_vault: 256
+  response_timeout_seconds: 60
+users:
+  user_configs:
+  - name: admin
+    token: change-this-to-a-secure-random-token
+    vault_access:
+      type: allow_access_to_all
+logging:
+  log_directory: logs
+  log_rotation: 7days
+EOF
+
+# Run the server
+docker run -d \
+  --name vaultlink-server \
+  --restart unless-stopped \
+  -p 3000:3000 \
+  -v $(pwd):/data \
+  ghcr.io/schmelczer/vault-link-server:latest \
+  /app/sync_server /data/config.yml
+```
+
+::: warning
+Change the token in `config.yml` to a secure random value before deploying to production!
+:::
+
+Verify the server is running:
+
+```bash
+curl http://localhost:3000/vaults/test/ping
+```
+
+You should see: `pong`
+
+### Step 2: Choose Your Client
+
+You can connect to VaultLink using either the Obsidian plugin or the standalone CLI client.
+
+#### Option A: Obsidian Plugin
+
+1. Open Obsidian Settings → Community Plugins
+2. Browse community plugins and search for "VaultLink"
+3. Install and enable the plugin
+4. Configure the plugin:
+   - **Server URL**: `ws://localhost:3000` (or your server address)
+   - **Token**: The token from your `config.yml`
+   - **Vault Name**: `default` (or any name you choose)
+
+[Read the full Obsidian plugin guide →](/guide/obsidian-plugin)
+
+#### Option B: CLI Client
+
+Perfect for syncing vaults without Obsidian:
+
+```bash
+docker run -d \
+  --name vaultlink-cli \
+  --restart unless-stopped \
+  -v /path/to/your/vault:/vault \
+  ghcr.io/schmelczer/vault-link-cli:latest \
+  -l /vault \
+  -r ws://localhost:3000 \
+  -t change-this-to-a-secure-random-token \
+  -v default
+```
+
+Replace `/path/to/your/vault` with the directory containing your files.
+
+[Read the full CLI client guide →](/guide/cli-client)
+
+## Next Steps
+
+### Production Deployment
+
+For production use, you should:
+
+1. **Use HTTPS/WSS**: Put the sync server behind a reverse proxy with SSL
+2. **Secure tokens**: Generate cryptographically random tokens
+3. **Configure backups**: Back up the SQLite databases regularly
+4. **Set up monitoring**: Use Docker health checks and logging
+
+[Learn about production deployment →](/guide/server-setup#production-deployment)
+
+### Multiple Users
+
+To add more users or restrict vault access:
+
+```yaml
+users:
+  user_configs:
+  - name: alice
+    token: alice-secure-token
+    vault_access:
+      type: allow_list
+      allowed:
+        - personal
+        - shared
+  - name: bob
+    token: bob-secure-token
+    vault_access:
+      type: allow_list
+      allowed:
+        - shared
+```
+
+[Learn about authentication configuration →](/config/authentication)
+
+### Advanced Configuration
+
+Explore advanced server options:
+
+- Database tuning for large vaults
+- Rate limiting and connection limits
+- Custom logging and log rotation
+- Multi-vault setups
+
+[View configuration reference →](/config/server)
+
+## Architecture Overview
+
+Want to understand how VaultLink works under the hood?
+
+[Read the architecture documentation →](/architecture/)
+
+## Troubleshooting
+
+### Server won't start
+
+Check Docker logs:
+```bash
+docker logs vaultlink-server
+```
+
+Common issues:
+- Port 3000 already in use: Change the port mapping `-p 3001:3000`
+- Config file errors: Validate YAML syntax
+- Permission issues: Ensure the volume mount is writable
+
+### Client can't connect
+
+1. Verify server is accessible: `curl http://your-server:3000/vaults/test/ping`
+2. Check WebSocket connectivity (browser dev tools or wscat)
+3. Verify token matches between client and server config
+4. Check firewall rules allow port 3000
+
+### Files not syncing
+
+1. Check client logs for errors
+2. Verify vault name matches on both server and client
+3. Ensure user has access to the vault (check server config)
+4. Check for file size limits (default 10MB for CLI)
+
+For more help, [open an issue on GitHub](https://github.com/schmelczer/vault-link/issues).
diff --git a/docs/guide/obsidian-plugin.md b/docs/guide/obsidian-plugin.md
new file mode 100644
index 00000000..dba6cd0e
--- /dev/null
+++ b/docs/guide/obsidian-plugin.md
@@ -0,0 +1,262 @@
+# Obsidian Plugin
+
+The VaultLink Obsidian plugin provides native real-time synchronization directly within Obsidian.
+
+## Installation
+
+### From Obsidian Community Plugins
+
+1. Open Obsidian Settings
+2. Navigate to **Community Plugins**
+3. Click **Browse** and search for "VaultLink"
+4. Click **Install**
+5. Enable the plugin
+
+### Manual Installation
+
+1. Download the latest release from [GitHub Releases](https://github.com/schmelczer/vault-link/releases)
+2. Extract `main.js`, `manifest.json`, and `styles.css`
+3. Copy to `.obsidian/plugins/vault-link/` in your vault
+4. Reload Obsidian
+5. Enable VaultLink in Community Plugins settings
+
+## Configuration
+
+After installation, configure the plugin in **Settings → VaultLink**.
+
+### Required Settings
+
+#### Server URL
+The WebSocket URL of your sync server.
+
+- **Development/Local**: `ws://localhost:3000`
+- **Production (SSL)**: `wss://sync.example.com`
+
+::: tip
+Use `ws://` for unencrypted connections and `wss://` for SSL connections (production).
+:::
+
+#### Authentication Token
+Your authentication token from the server's `config.yml`.
+
+Generate a secure token:
+```bash
+openssl rand -hex 32
+```
+
+#### Vault Name
+The name of the vault on the server. Can be any string.
+
+Multiple Obsidian vaults can sync to the same server vault name (for shared vaults), or use unique names for separate vaults.
+
+### Optional Settings
+
+#### Sync Concurrency
+Number of files to sync simultaneously.
+- **Default**: 1
+- **Range**: 1-10
+- Higher values = faster initial sync, more resource usage
+
+#### Max File Size
+Maximum file size to sync (in MB).
+- **Default**: 10
+- Files larger than this are skipped
+
+#### Ignore Patterns
+Glob patterns for files to exclude from sync.
+
+Examples:
+- `*.tmp` - Ignore temporary files
+- `.trash/**` - Ignore trash folder
+- `private/**` - Ignore private directory
+
+#### WebSocket Retry Interval
+Milliseconds between reconnection attempts when disconnected.
+- **Default**: 3500ms
+- Increase for flaky networks to avoid connection spam
+
+## Usage
+
+### Initial Sync
+
+When first connecting:
+
+1. The plugin uploads all local files to the server
+2. Downloads any missing files from the server
+3. Resolves any conflicts using operational transformation
+4. Begins real-time synchronization
+
+Initial sync time depends on vault size and `sync_concurrency` setting.
+
+### Real-Time Sync
+
+Once connected:
+
+- **File changes**: Automatically synced when saved
+- **File creation**: New files immediately uploaded
+- **File deletion**: Deletions propagated to other clients
+- **File renames**: Tracked and synchronized
+
+The plugin watches your vault filesystem and syncs changes in real-time via WebSocket.
+
+### Status Indicators
+
+The plugin provides visual feedback:
+
+- **Connected**: Green status in settings
+- **Syncing**: Progress indicator during uploads
+- **Disconnected**: Red status, automatic reconnection attempts
+- **Error**: Error message in settings and console
+
+Check the Obsidian console (Ctrl+Shift+I / Cmd+Option+I) for detailed logs.
+
+## Features
+
+### Automatic Conflict Resolution
+
+When multiple users edit the same file simultaneously, operational transformation merges changes automatically:
+
+- All edits are preserved
+- No manual conflict resolution required
+- Changes appear in real-time as others type
+
+### Mobile Support
+
+VaultLink works on Obsidian mobile (iOS and Android):
+
+- Same configuration as desktop
+- Real-time sync across all devices
+- Handle network changes gracefully
+
+::: warning
+Ensure your sync server is accessible from mobile networks (use WSS with a public domain or VPN).
+:::
+
+### Offline Support
+
+The plugin handles offline scenarios:
+
+- Continue working when disconnected
+- Changes queue locally
+- Automatic sync when connection restored
+- Conflict resolution if others edited the same files
+
+## Collaboration Workflows
+
+### Personal Multi-Device Sync
+
+Sync the same vault across devices:
+
+1. Configure each Obsidian instance with the same vault name
+2. Use the same authentication token
+3. All devices stay in sync automatically
+
+### Team Shared Vault
+
+Multiple users collaborating:
+
+1. Each user has their own token (configured in server `config.yml`)
+2. All users connect to the same vault name
+3. Real-time collaborative editing with automatic conflict resolution
+
+### Selective Sharing
+
+Share specific folders while keeping others private:
+
+1. Use different vault names for shared vs. private content
+2. Configure access control on the server per vault
+3. Use ignore patterns to exclude sensitive directories
+
+## Troubleshooting
+
+### Plugin won't connect
+
+1. **Verify server is running**:
+   ```bash
+   curl http://your-server:3000/vaults/test/ping
+   ```
+   Should return `pong`
+
+2. **Check URL format**:
+   - Local: `ws://localhost:3000`
+   - Remote (SSL): `wss://sync.example.com`
+   - Don't include `/vault/name` in the URL
+
+3. **Verify token**:
+   - Must match server config exactly
+   - No extra spaces or quotes
+   - Check server logs for authentication errors
+
+4. **Check firewall**:
+   - Ensure port is accessible from your network
+   - For mobile, server must be publicly accessible or use VPN
+
+### Files not syncing
+
+1. **Check ignore patterns**: File may match an exclusion pattern
+2. **File size**: Check if file exceeds `max_file_size_mb`
+3. **Permissions**: Ensure vault directory is readable/writable
+4. **Console errors**: Open dev tools (Ctrl+Shift+I) and check console
+
+### Slow initial sync
+
+1. **Increase concurrency**: Set `sync_concurrency` higher (e.g., 5)
+2. **Network speed**: Check internet connection
+3. **Server resources**: Ensure server isn't overloaded
+4. **Large files**: Consider increasing timeout settings
+
+### Conflicts not resolving
+
+Operational transformation should handle conflicts automatically. If issues persist:
+
+1. Check console for sync errors
+2. Verify both clients are connected
+3. Check server logs for processing errors
+4. Ensure files are text-based (binary files may not merge well)
+
+### High CPU/Memory usage
+
+1. **Reduce concurrency**: Lower `sync_concurrency`
+2. **Add ignore patterns**: Exclude unnecessary files
+3. **File watchers**: Large vaults may trigger many filesystem events
+4. **Check for sync loops**: Ensure no circular dependencies
+
+## Advanced Configuration
+
+### Multiple Vaults
+
+To sync multiple Obsidian vaults to different server vaults:
+
+1. Each Obsidian vault has its own VaultLink plugin configuration
+2. Use different vault names for each
+3. Can use the same or different tokens (depending on access control)
+
+### Custom Sync Patterns
+
+Combine ignore patterns for fine-grained control:
+
+```
+# Ignore patterns
+*.tmp
+*.bak
+.DS_Store
+.trash/**
+private/**
+drafts/**/*.draft.md
+```
+
+### Development/Testing
+
+For plugin development:
+
+1. Clone the repository
+2. `cd frontend && npm install`
+3. `npm run dev` to build in watch mode
+4. Plugin rebuilds automatically on changes
+5. Reload Obsidian to test changes
+
+## Next Steps
+
+- [Learn about the sync algorithm →](/architecture/sync-algorithm)
+- [Configure the server →](/config/server)
+- [Set up the CLI client →](/guide/cli-client)
diff --git a/docs/guide/server-setup.md b/docs/guide/server-setup.md
new file mode 100644
index 00000000..1736aa34
--- /dev/null
+++ b/docs/guide/server-setup.md
@@ -0,0 +1,370 @@
+# Server Setup
+
+This guide covers deploying the VaultLink sync server in various environments, from local development to production infrastructure.
+
+## Deployment Options
+
+### Docker (Recommended)
+
+Docker provides the easiest deployment path with built-in health checks and minimal dependencies.
+
+#### Basic Docker Deployment
+
+```bash
+# Pull the latest image
+docker pull ghcr.io/schmelczer/vault-link-server:latest
+
+# Create data directory
+mkdir -p ~/vaultlink-data
+
+# Create config.yml (see Configuration section below)
+
+# Run the container
+docker run -d \
+  --name vaultlink-server \
+  --restart unless-stopped \
+  -p 3000:3000 \
+  -v ~/vaultlink-data:/data \
+  ghcr.io/schmelczer/vault-link-server:latest \
+  /app/sync_server /data/config.yml
+```
+
+#### Docker Compose
+
+Create `docker-compose.yml`:
+
+```yaml
+services:
+  vaultlink-server:
+    image: ghcr.io/schmelczer/vault-link-server:latest
+    container_name: vaultlink-server
+    restart: unless-stopped
+    ports:
+      - "3000:3000"
+    volumes:
+      - ./data:/data
+    command: ["/app/sync_server", "/data/config.yml"]
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:3000/vaults/fake/ping"]
+      interval: 30s
+      timeout: 5s
+      retries: 3
+      start_period: 10s
+```
+
+Start the server:
+
+```bash
+docker compose up -d
+```
+
+### Binary Installation
+
+Download pre-built binaries from [GitHub Releases](https://github.com/schmelczer/vault-link/releases).
+
+```bash
+# Download the binary for your platform
+wget https://github.com/schmelczer/vault-link/releases/latest/download/sync_server-linux-x86_64
+
+# Make executable
+chmod +x sync_server-linux-x86_64
+
+# Run the server
+./sync_server-linux-x86_64 config.yml
+```
+
+### Build from Source
+
+Requirements:
+- Rust 1.89.0 or later
+- SQLite development headers
+- SQLx CLI
+
+```bash
+# Clone the repository
+git clone https://github.com/schmelczer/vault-link.git
+cd vault-link/sync-server
+
+# Install SQLx CLI
+cargo install sqlx-cli
+
+# Set up the database
+sqlx database create --database-url sqlite://db.sqlite3
+sqlx migrate run --source src/app_state/database/migrations --database-url sqlite://db.sqlite3
+cargo sqlx prepare --workspace
+
+# Build in release mode
+cargo build --release
+
+# Run the server
+./target/release/sync_server config.yml
+```
+
+## Configuration
+
+Create a `config.yml` file with your server configuration:
+
+```yaml
+database:
+  databases_directory_path: databases
+  max_connections_per_vault: 12
+  cursor_timeout_seconds: 60
+
+server:
+  host: 0.0.0.0
+  port: 3000
+  max_body_size_mb: 512
+  max_clients_per_vault: 256
+  response_timeout_seconds: 60
+
+users:
+  user_configs:
+  - name: admin
+    token: your-secure-random-token-here
+    vault_access:
+      type: allow_access_to_all
+
+logging:
+  log_directory: logs
+  log_rotation: 7days
+```
+
+### Configuration Fields
+
+#### Database
+
+- `databases_directory_path`: Directory for SQLite databases (one per vault)
+- `max_connections_per_vault`: Maximum concurrent database connections
+- `cursor_timeout_seconds`: How long to keep database cursors alive
+
+#### Server
+
+- `host`: Bind address (use `0.0.0.0` for all interfaces)
+- `port`: Port to listen on (default: 3000)
+- `max_body_size_mb`: Maximum upload size
+- `max_clients_per_vault`: Concurrent client limit per vault
+- `response_timeout_seconds`: Request timeout
+
+#### Users
+
+See [Authentication Configuration →](/config/authentication) for detailed user setup.
+
+#### Logging
+
+- `log_directory`: Where to store log files
+- `log_rotation`: How often to rotate logs (e.g., `7days`, `24hours`)
+
+## Production Deployment
+
+### SSL/TLS with Reverse Proxy
+
+VaultLink doesn't handle SSL directly. Use a reverse proxy like Nginx or Caddy.
+
+#### Nginx Configuration
+
+```nginx
+upstream vaultlink {
+    server localhost:3000;
+}
+
+server {
+    listen 443 ssl http2;
+    server_name sync.example.com;
+
+    ssl_certificate /path/to/cert.pem;
+    ssl_certificate_key /path/to/key.pem;
+
+    location / {
+        proxy_pass http://vaultlink;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+
+        # WebSocket specific
+        proxy_read_timeout 3600s;
+        proxy_send_timeout 3600s;
+    }
+}
+```
+
+Reload Nginx:
+```bash
+sudo nginx -t
+sudo systemctl reload nginx
+```
+
+#### Caddy Configuration
+
+Caddy handles SSL automatically:
+
+```caddy
+sync.example.com {
+    reverse_proxy localhost:3000
+}
+```
+
+Start Caddy:
+```bash
+caddy run --config Caddyfile
+```
+
+### Systemd Service
+
+Create `/etc/systemd/system/vaultlink.service`:
+
+```ini
+[Unit]
+Description=VaultLink Sync Server
+After=network.target
+
+[Service]
+Type=simple
+User=vaultlink
+WorkingDirectory=/opt/vaultlink
+ExecStart=/opt/vaultlink/sync_server /opt/vaultlink/config.yml
+Restart=always
+RestartSec=10
+
+[Install]
+WantedBy=multi-user.target
+```
+
+Enable and start:
+
+```bash
+sudo systemctl daemon-reload
+sudo systemctl enable vaultlink
+sudo systemctl start vaultlink
+sudo systemctl status vaultlink
+```
+
+### Security Best Practices
+
+1. **Use strong tokens**: Generate with `openssl rand -hex 32`
+2. **Enable firewall**: Only expose port 3000 to reverse proxy
+3. **Regular updates**: Keep Docker images and binaries updated
+4. **Backup databases**: SQLite files in `databases_directory_path`
+5. **Monitor logs**: Check log directory for errors and anomalies
+6. **Limit access**: Use vault-specific access controls per user
+
+### Backup Strategy
+
+The SQLite databases contain all vault data and history:
+
+```bash
+# Backup script
+#!/bin/bash
+BACKUP_DIR="/backup/vaultlink/$(date +%Y%m%d)"
+DATA_DIR="/data/databases"
+
+mkdir -p "$BACKUP_DIR"
+cp -r "$DATA_DIR" "$BACKUP_DIR/"
+
+# Keep 30 days of backups
+find /backup/vaultlink -type d -mtime +30 -exec rm -rf {} +
+```
+
+Run daily via cron:
+```cron
+0 2 * * * /opt/vaultlink/backup.sh
+```
+
+### Monitoring
+
+#### Health Checks
+
+The server exposes a ping endpoint:
+
+```bash
+curl http://localhost:3000/vaults/fake/ping
+# Returns: pong
+```
+
+Docker health check is built-in and checks this endpoint every 30 seconds.
+
+#### Prometheus Metrics
+
+For advanced monitoring, collect Docker stats or implement custom metrics.
+
+#### Log Monitoring
+
+Logs are written to the configured `log_directory`. Monitor for:
+- Connection failures
+- Authentication errors
+- Database errors
+- WebSocket disconnections
+
+Example log watching:
+```bash
+tail -f /data/logs/*.log | grep -i error
+```
+
+## Scaling
+
+### Horizontal Scaling
+
+VaultLink currently uses SQLite, which limits horizontal scaling. For multiple servers:
+
+1. Run separate instances for different vaults
+2. Use load balancer with sticky sessions (same vault → same server)
+3. Consider database architecture for your scale needs
+
+### Vertical Scaling
+
+Increase resources for the server:
+- More CPU for handling concurrent connections
+- More RAM for database caching
+- Faster storage (SSD) for database operations
+
+Tune configuration:
+- Increase `max_clients_per_vault` for more concurrent users
+- Increase `max_connections_per_vault` for database performance
+- Adjust `max_body_size_mb` based on typical file sizes
+
+## Troubleshooting
+
+### Server won't start
+
+```bash
+# Check Docker logs
+docker logs vaultlink-server
+
+# Common issues:
+# - Port already in use: Change port mapping
+# - Config syntax error: Validate YAML
+# - Permission error: Check volume permissions
+```
+
+### High memory usage
+
+- Reduce `max_connections_per_vault`
+- Reduce `max_clients_per_vault`
+- Check for large vaults (may need database optimization)
+
+### Database corruption
+
+```bash
+# Verify database integrity
+sqlite3 databases/your-vault.db "PRAGMA integrity_check;"
+
+# If corrupted, restore from backup
+cp /backup/databases/your-vault.db /data/databases/
+```
+
+### WebSocket connection drops
+
+- Check reverse proxy timeout settings
+- Verify firewall isn't closing connections
+- Review client retry intervals
+- Check server logs for errors
+
+## Next Steps
+
+- [Configure authentication and access control →](/config/authentication)
+- [Set up Obsidian plugin →](/guide/obsidian-plugin)
+- [Deploy CLI client →](/guide/cli-client)
+- [Understand the architecture →](/architecture/)
diff --git a/docs/guide/what-is-vaultlink.md b/docs/guide/what-is-vaultlink.md
new file mode 100644
index 00000000..1d236516
--- /dev/null
+++ b/docs/guide/what-is-vaultlink.md
@@ -0,0 +1,115 @@
+# What is VaultLink?
+
+VaultLink is a self-hosted real-time synchronization system for Obsidian vaults. It provides collaborative file syncing with automatic conflict resolution, designed for users who want complete control over their data.
+
+## Overview
+
+VaultLink consists of three main components:
+
+### Sync Server
+
+A Rust-based WebSocket server that handles:
+- Real-time bidirectional synchronization
+- Document versioning with SQLite
+- User authentication and vault access control
+- Operational transformation for conflict resolution
+
+### Obsidian Plugin
+
+A native Obsidian plugin that:
+- Integrates sync directly into your Obsidian workflow
+- Provides real-time updates as you edit
+- Handles file watching and automatic synchronization
+- Works across desktop and mobile platforms
+
+### CLI Client
+
+A standalone synchronization client that:
+- Syncs vaults without requiring Obsidian
+- Perfect for servers, automation, or backup systems
+- Provides file watching and bidirectional sync
+- Runs in Docker or as a standalone binary
+
+## Key Features
+
+### Real-Time Synchronization
+
+Changes are synchronized immediately via WebSocket connections. When multiple users edit the same file, operational transformation ensures all edits are preserved without conflicts.
+
+### Self-Hosted Architecture
+
+Run the sync server on your own infrastructure:
+- Full control over data storage and access
+- No dependency on third-party services
+- Configurable authentication and authorization
+- Deploy anywhere: cloud VPS, home server, or localhost
+
+### Operational Transformation
+
+VaultLink uses the `reconcile-text` library for intelligent conflict resolution:
+- Simultaneous edits are automatically merged
+- No manual conflict resolution required
+- Preserves intent of all contributors
+- Works seamlessly in the background
+
+### Flexible Authentication
+
+Configure user access per vault:
+- Token-based authentication
+- Per-user vault access control
+- Allow-list or deny-list patterns
+- Support for multiple users and vaults
+
+## Use Cases
+
+### Personal Sync
+
+Synchronize your Obsidian vault across multiple devices:
+- Laptop, desktop, and mobile in real-time
+- No cloud service subscription required
+- Full privacy and data control
+
+### Team Collaboration
+
+Share knowledge bases with teammates:
+- Real-time collaborative editing
+- Granular access control per vault
+- Self-hosted for enterprise security requirements
+
+### Automated Backups
+
+Use the CLI client for automated workflows:
+- Scheduled backups to remote servers
+- Integration with existing backup systems
+- Headless operation without Obsidian
+
+### Development & Testing
+
+Synchronize documentation across environments:
+- Keep docs in sync with development environments
+- Automated deployment of documentation
+- Version control integration
+
+## How It Works
+
+1. **Server Setup**: Deploy the sync server on your infrastructure
+2. **Authentication**: Configure users and vault access in `config.yml`
+3. **Client Connection**: Connect via Obsidian plugin or CLI client
+4. **Initial Sync**: Client uploads local files to server
+5. **Real-Time Updates**: Changes sync bidirectionally via WebSocket
+6. **Conflict Resolution**: Operational transformation handles simultaneous edits
+
+## Technology Stack
+
+- **Server**: Rust with Axum framework, SQLite database, WebSocket protocol
+- **Frontend**: TypeScript with WebSocket client, npm workspaces
+- **Sync Algorithm**: reconcile-text operational transformation library
+- **Deployment**: Docker images, binary releases, or source builds
+
+## Next Steps
+
+Ready to get started?
+
+- [Getting Started Guide →](/guide/getting-started)
+- [Server Setup →](/guide/server-setup)
+- [Architecture Overview →](/architecture/)
diff --git a/docs/index.md b/docs/index.md
new file mode 100644
index 00000000..b2127b27
--- /dev/null
+++ b/docs/index.md
@@ -0,0 +1,72 @@
+---
+layout: home
+
+hero:
+  name: VaultLink
+  text: Self-Hosted Sync for Obsidian
+  tagline: Real-time collaborative file synchronization for your knowledge base
+  image:
+    src: /logo.svg
+    alt: VaultLink
+  actions:
+    - theme: brand
+      text: Get Started
+      link: /guide/getting-started
+    - theme: alt
+      text: View on GitHub
+      link: https://github.com/schmelczer/vault-link
+
+features:
+  - icon: 🚀
+    title: Real-Time Synchronization
+    details: Operational transformation-based conflict resolution ensures your files stay in sync across devices without data loss
+  - icon: 🔒
+    title: Self-Hosted & Private
+    details: Run your own sync server. Your data stays on your infrastructure with full control over access and privacy
+  - icon: 🎯
+    title: Obsidian Plugin
+    details: Native integration with Obsidian for seamless synchronization directly within your favorite note-taking app
+  - icon: 🖥️
+    title: CLI Client
+    details: Sync vaults to any system using the standalone CLI client. Perfect for servers, automation, or headless setups
+  - icon: ⚡
+    title: Built for Performance
+    details: Rust-powered WebSocket server with SQLite backend delivers blazing-fast sync performance
+  - icon: 🛠️
+    title: Flexible Deployment
+    details: Deploy via Docker, binary releases, or build from source. Configure authentication and access controls to fit your needs
+---
+
+## Quick Start
+
+Deploy the sync server:
+
+```bash
+docker run -d \
+  -p 3000:3000 \
+  -v $(pwd)/data:/data \
+  ghcr.io/schmelczer/vault-link-server:latest \
+  /app/sync_server config.yml
+```
+
+Install the Obsidian plugin or use the CLI client:
+
+```bash
+docker run -v /path/to/vault:/vault \
+  ghcr.io/schmelczer/vault-link-cli:latest \
+  -l /vault -r wss://your-server.com -t your-token -v default
+```
+
+[Learn more →](/guide/getting-started)
+
+## Why VaultLink?
+
+VaultLink provides a complete self-hosted synchronization solution for Obsidian:
+
+- **No third-party services**: Your data never leaves your infrastructure
+- **Operational transformation**: Smart conflict resolution that preserves all changes
+- **Multi-platform**: Works with Obsidian plugin or standalone CLI on any system
+- **Production-ready**: Docker images, health checks, and comprehensive logging
+- **Open source**: MIT licensed with active development
+
+[Read the architecture overview →](/architecture/)
diff --git a/docs/package.json b/docs/package.json
new file mode 100644
index 00000000..8084f21b
--- /dev/null
+++ b/docs/package.json
@@ -0,0 +1,18 @@
+{
+  "name": "docs",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "dev": "vitepress dev",
+    "build": "vitepress build",
+    "preview": "vitepress preview"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "devDependencies": {
+    "vitepress": "^1.6.4",
+    "vue": "^3.5.24"
+  }
+}
diff --git a/docs/public/logo.svg b/docs/public/logo.svg
new file mode 100644
index 00000000..6cfc8953
--- /dev/null
+++ b/docs/public/logo.svg
@@ -0,0 +1,34 @@
+<svg width="200" height="200" viewBox="0 0 200 200" xmlns="http://www.w3.org/2000/svg">
+  <!-- Background circle -->
+  <circle cx="100" cy="100" r="95" fill="#4A90E2" opacity="0.1"/>
+
+  <!-- Link chain symbol -->
+  <g transform="translate(100, 100)">
+    <!-- Left link -->
+    <path d="M -60 -10 L -30 -10 C -20 -10 -15 -5 -15 5 L -15 5 C -15 15 -20 20 -30 20 L -60 20 C -70 20 -75 15 -75 5 L -75 -5 C -75 -15 -70 -20 -60 -20 Z"
+          fill="none" stroke="#4A90E2" stroke-width="8" stroke-linecap="round"/>
+
+    <!-- Right link -->
+    <path d="M 60 -10 L 30 -10 C 20 -10 15 -5 15 5 L 15 5 C 15 15 20 20 30 20 L 60 20 C 70 20 75 15 75 5 L 75 -5 C 75 -15 70 -20 60 -20 Z"
+          fill="none" stroke="#4A90E2" stroke-width="8" stroke-linecap="round"/>
+
+    <!-- Center connecting bar -->
+    <rect x="-15" y="-6" width="30" height="12" rx="6" fill="#4A90E2"/>
+
+    <!-- Vault door detail -->
+    <circle cx="0" cy="0" r="12" fill="none" stroke="#4A90E2" stroke-width="3"/>
+    <circle cx="0" cy="0" r="6" fill="#4A90E2"/>
+
+    <!-- Sync arrows -->
+    <g opacity="0.6">
+      <!-- Top arrow -->
+      <path d="M -5 -50 L 5 -50 L 0 -40 Z" fill="#4A90E2"/>
+      <!-- Bottom arrow -->
+      <path d="M 5 50 L -5 50 L 0 40 Z" fill="#4A90E2"/>
+    </g>
+  </g>
+
+  <!-- Text (optional) -->
+  <text x="100" y="175" font-family="Arial, sans-serif" font-size="24" font-weight="bold"
+        text-anchor="middle" fill="#4A90E2">VaultLink</text>
+</svg>

From fccc66aaead73877ac311ee726878930a27cf62e Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Nov 2025 11:46:30 +0000
Subject: [PATCH 617/761] Re-export type

---
 frontend/local-client-cli/src/node-filesystem.ts | 1 -
 frontend/sync-client/src/index.ts                | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/local-client-cli/src/node-filesystem.ts b/frontend/local-client-cli/src/node-filesystem.ts
index 252385c9..90d6c8f0 100644
--- a/frontend/local-client-cli/src/node-filesystem.ts
+++ b/frontend/local-client-cli/src/node-filesystem.ts
@@ -2,7 +2,6 @@ import * as fs from "fs/promises";
 import type { Dirent } from "fs";
 import * as path from "path";
 import type { FileSystemOperations, RelativePath } from "sync-client";
-import type { TextWithCursors } from "reconcile-text";
 
 export class NodeFileSystemOperations implements FileSystemOperations {
 	public constructor(private readonly basePath: string) {}
diff --git a/frontend/sync-client/src/index.ts b/frontend/sync-client/src/index.ts
index 7a2014b8..81b7f7ff 100644
--- a/frontend/sync-client/src/index.ts
+++ b/frontend/sync-client/src/index.ts
@@ -28,6 +28,7 @@ export type { NetworkConnectionStatus } from "./types/network-connection-status"
 export type { MaybeOutdatedClientCursors } from "./types/maybe-outdated-client-cursors";
 export { DocumentSyncStatus } from "./types/document-sync-status";
 export { SyncClient } from "./sync-client";
+export type { TextWithCursors, CursorPosition } from "reconcile-text";
 
 export const debugging = {
 	slowFetchFactory,

From ea189f3d096d058164cb230ba040721832b3e99c Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Nov 2025 11:58:18 +0000
Subject: [PATCH 618/761] All sync-client deps are devDeps

---
 frontend/package-lock.json        | 19 +++++++++++++------
 frontend/sync-client/package.json |  6 ++----
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index f60d140b..6242aec3 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1565,6 +1565,7 @@
 		},
 		"node_modules/balanced-match": {
 			"version": "1.0.2",
+			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/big.js": {
@@ -1649,6 +1650,7 @@
 		},
 		"node_modules/byte-base64": {
 			"version": "1.1.0",
+			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/call-bind-apply-helpers": {
@@ -2251,6 +2253,7 @@
 		},
 		"node_modules/eventemitter3": {
 			"version": "5.0.1",
+			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/events": {
@@ -3146,6 +3149,7 @@
 		},
 		"node_modules/p-queue": {
 			"version": "8.1.0",
+			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"eventemitter3": "^5.0.1",
@@ -3160,6 +3164,7 @@
 		},
 		"node_modules/p-timeout": {
 			"version": "6.1.4",
+			"dev": true,
 			"license": "MIT",
 			"engines": {
 				"node": ">=14.16"
@@ -3484,6 +3489,7 @@
 			"version": "0.7.1",
 			"resolved": "https://registry.npmjs.org/reconcile-text/-/reconcile-text-0.7.1.tgz",
 			"integrity": "sha512-khedcYvAKs7ELKh5Z8mz2vyomMY5TqznV1dB+k/7qUAX9cheMNN5/EPJVQYZepOMunYbnQitvhFJX3kD4IMcNw==",
+			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/regex-parser": {
@@ -4303,6 +4309,7 @@
 			"version": "13.0.0",
 			"resolved": "https://registry.npmjs.org/uuid/-/uuid-13.0.0.tgz",
 			"integrity": "sha512-XQegIaBTVUjSHliKqcnFqYypAd4S+WCYt5NIeRs6w/UAry7z8Y9j5ZwRRL4kzq9U3sD6v+85er9FvkEaBpji2w==",
+			"dev": true,
 			"funding": [
 				"https://github.com/sponsors/broofa",
 				"https://github.com/sponsors/ctavan"
@@ -4664,20 +4671,18 @@
 		},
 		"sync-client": {
 			"version": "0.10.1",
-			"dependencies": {
+			"devDependencies": {
+				"@sentry/browser": "^10.8.0",
+				"@types/node": "^24.8.1",
 				"byte-base64": "^1.1.0",
 				"minimatch": "^10.0.1",
 				"p-queue": "^8.1.0",
 				"reconcile-text": "^0.7.1",
-				"uuid": "^13.0.0"
-			},
-			"devDependencies": {
-				"@sentry/browser": "^10.8.0",
-				"@types/node": "^24.8.1",
 				"ts-loader": "^9.5.2",
 				"tslib": "2.8.1",
 				"tsx": "^4.20.5",
 				"typescript": "5.8.3",
+				"uuid": "^13.0.0",
 				"webpack": "^5.99.9",
 				"webpack-cli": "^6.0.1",
 				"webpack-merge": "^6.0.1",
@@ -4688,6 +4693,7 @@
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
 			"integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"balanced-match": "^1.0.0"
@@ -4695,6 +4701,7 @@
 		},
 		"sync-client/node_modules/minimatch": {
 			"version": "10.0.1",
+			"dev": true,
 			"license": "ISC",
 			"dependencies": {
 				"brace-expansion": "^2.0.1"
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index 0c7c8266..f6234b80 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -12,14 +12,12 @@
         "build": "webpack --mode production",
         "test": "tsx --test src/**/*.test.ts"
     },
-    "dependencies": {
+    "devDependencies": {
         "byte-base64": "^1.1.0",
         "minimatch": "^10.0.1",
         "p-queue": "^8.1.0",
         "reconcile-text": "^0.7.1",
-        "uuid": "^13.0.0"
-    },
-    "devDependencies": {
+        "uuid": "^13.0.0",
         "@types/node": "^24.8.1",
         "ts-loader": "^9.5.2",
         "tslib": "2.8.1",

From 38810579ec5a421967e5f9da1ed3ce929ceb3db7 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Nov 2025 12:00:00 +0000
Subject: [PATCH 619/761] Update type imports

---
 frontend/obsidian-plugin/src/obsidian-file-system.ts | 3 ++-
 frontend/test-client/src/agent/mock-client.ts        | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/frontend/obsidian-plugin/src/obsidian-file-system.ts b/frontend/obsidian-plugin/src/obsidian-file-system.ts
index 44407890..434d1456 100644
--- a/frontend/obsidian-plugin/src/obsidian-file-system.ts
+++ b/frontend/obsidian-plugin/src/obsidian-file-system.ts
@@ -1,12 +1,13 @@
 import type { Stat, Vault, Workspace } from "obsidian";
 import { MarkdownView, normalizePath } from "obsidian";
 import {
+	CursorPosition,
+	TextWithCursors,
 	utils,
 	type FileSystemOperations,
 	type RelativePath
 } from "sync-client";
 import { getSelectionsFromEditor } from "./views/cursors/get-selections-from-editor";
-import type { TextWithCursors, CursorPosition } from "reconcile-text";
 
 export class ObsidianFileSystemOperations implements FileSystemOperations {
 	public constructor(
diff --git a/frontend/test-client/src/agent/mock-client.ts b/frontend/test-client/src/agent/mock-client.ts
index 2b384c24..d0b7f451 100644
--- a/frontend/test-client/src/agent/mock-client.ts
+++ b/frontend/test-client/src/agent/mock-client.ts
@@ -4,9 +4,9 @@ import {
 	type RelativePath,
 	type FileSystemOperations,
 	type SyncSettings,
-	SyncClient
+	SyncClient,
+	TextWithCursors
 } from "sync-client";
-import type { TextWithCursors } from "reconcile-text";
 
 export class MockClient implements FileSystemOperations {
 	protected readonly localFiles = new Map<string, Uint8Array>();

From 00d206162794c469eb1f7e574c9d6b09c8b7df5b Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Nov 2025 12:13:22 +0000
Subject: [PATCH 620/761] Update docs

---
 .github/workflows/deploy-docs.yml   |   5 +
 docs/.prettierignore                |   4 +
 docs/.prettierrc                    |  19 ++
 docs/.vitepress/config.mts          | 115 +++++-----
 docs/README.md                      |  17 +-
 docs/architecture/data-flow.md      |  79 ++++---
 docs/architecture/index.md          |  12 ++
 docs/architecture/sync-algorithm.md | 141 ++++++++----
 docs/config/advanced.md             | 207 +++++++++---------
 docs/config/authentication.md       | 264 +++++++++++++----------
 docs/config/server.md               | 167 +++++++-------
 docs/guide/alternatives.md          | 324 ++++++++++++++++++++++++++++
 docs/guide/cli-client.md            |  86 +++++---
 docs/guide/getting-started.md       |  36 ++--
 docs/guide/obsidian-plugin.md       |  38 ++--
 docs/guide/server-setup.md          |  68 +++---
 docs/guide/what-is-vaultlink.md     |  10 +
 docs/index.md                       |  62 +++---
 docs/package.json                   |   5 +-
 docs/public/logo.svg                |  59 +++--
 20 files changed, 1149 insertions(+), 569 deletions(-)
 create mode 100644 docs/.prettierignore
 create mode 100644 docs/.prettierrc
 create mode 100644 docs/guide/alternatives.md

diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml
index 5deecf7d..49829998 100644
--- a/.github/workflows/deploy-docs.yml
+++ b/.github/workflows/deploy-docs.yml
@@ -42,6 +42,11 @@ jobs:
           cd docs
           npm ci
 
+      - name: Check formatting
+        run: |
+          cd docs
+          npm run format:check
+
       - name: Build documentation
         run: |
           cd docs
diff --git a/docs/.prettierignore b/docs/.prettierignore
new file mode 100644
index 00000000..da61f8d6
--- /dev/null
+++ b/docs/.prettierignore
@@ -0,0 +1,4 @@
+node_modules/
+.vitepress/dist/
+.vitepress/cache/
+package-lock.json
diff --git a/docs/.prettierrc b/docs/.prettierrc
new file mode 100644
index 00000000..ea125e10
--- /dev/null
+++ b/docs/.prettierrc
@@ -0,0 +1,19 @@
+{
+    "printWidth": 120,
+    "tabWidth": 4,
+    "useTabs": true,
+    "semi": false,
+    "singleQuote": false,
+    "trailingComma": "none",
+    "endOfLine": "lf",
+    "proseWrap": "preserve",
+    "overrides": [
+        {
+            "files": "*.md",
+            "options": {
+                "proseWrap": "preserve",
+                "printWidth": 120
+            }
+        }
+    ]
+}
diff --git a/docs/.vitepress/config.mts b/docs/.vitepress/config.mts
index 90eea790..d901bfde 100644
--- a/docs/.vitepress/config.mts
+++ b/docs/.vitepress/config.mts
@@ -1,62 +1,59 @@
-import { defineConfig } from 'vitepress'
+import { defineConfig } from "vitepress"
 
 export default defineConfig({
-    title: 'VaultLink',
-    description: 'Self-hosted real-time synchronization for Obsidian',
-    base: '/vault-link/',
-    themeConfig: {
-        logo: '/logo.svg',
-        nav: [
-            { text: 'Home', link: '/' },
-            { text: 'Guide', link: '/guide/getting-started' },
-            { text: 'Architecture', link: '/architecture/' },
-            { text: 'GitHub', link: 'https://github.com/schmelczer/vault-link' }
-        ],
-        sidebar: [
-            {
-                text: 'Introduction',
-                items: [
-                    { text: 'What is VaultLink?', link: '/guide/what-is-vaultlink' },
-                    { text: 'Getting Started', link: '/guide/getting-started' }
-                ]
-            },
-            {
-                text: 'Setup',
-                items: [
-                    { text: 'Server Setup', link: '/guide/server-setup' },
-                    { text: 'Obsidian Plugin', link: '/guide/obsidian-plugin' },
-                    { text: 'CLI Client', link: '/guide/cli-client' }
-                ]
-            },
-            {
-                text: 'Configuration',
-                items: [
-                    { text: 'Server Configuration', link: '/config/server' },
-                    { text: 'Authentication', link: '/config/authentication' },
-                    { text: 'Advanced Options', link: '/config/advanced' }
-                ]
-            },
-            {
-                text: 'Architecture',
-                items: [
-                    { text: 'Overview', link: '/architecture/' },
-                    { text: 'Sync Algorithm', link: '/architecture/sync-algorithm' },
-                    { text: 'Data Flow', link: '/architecture/data-flow' }
-                ]
-            }
-        ],
-        socialLinks: [
-            { icon: 'github', link: 'https://github.com/schmelczer/vault-link' }
-        ],
-        footer: {
-            message: 'Released under the MIT License.',
-            copyright: 'Copyright © 2024-present Andras Schmelczer'
-        },
-        search: {
-            provider: 'local'
-        }
-    },
-    head: [
-        ['link', { rel: 'icon', type: 'image/svg+xml', href: '/vault-link/logo.svg' }]
-    ]
+	title: "VaultLink",
+	description: "Self-hosted real-time synchronization for Obsidian",
+	base: "/vault-link/",
+	themeConfig: {
+		logo: "/logo.svg",
+		nav: [
+			{ text: "Home", link: "/" },
+			{ text: "Guide", link: "/guide/getting-started" },
+			{ text: "Architecture", link: "/architecture/" },
+			{ text: "GitHub", link: "https://github.com/schmelczer/vault-link" }
+		],
+		sidebar: [
+			{
+				text: "Introduction",
+				items: [
+					{ text: "What is VaultLink?", link: "/guide/what-is-vaultlink" },
+					{ text: "Getting Started", link: "/guide/getting-started" },
+					{ text: "Comparison with Alternatives", link: "/guide/alternatives" }
+				]
+			},
+			{
+				text: "Setup",
+				items: [
+					{ text: "Server Setup", link: "/guide/server-setup" },
+					{ text: "Obsidian Plugin", link: "/guide/obsidian-plugin" },
+					{ text: "CLI Client", link: "/guide/cli-client" }
+				]
+			},
+			{
+				text: "Configuration",
+				items: [
+					{ text: "Server Configuration", link: "/config/server" },
+					{ text: "Authentication", link: "/config/authentication" },
+					{ text: "Advanced Options", link: "/config/advanced" }
+				]
+			},
+			{
+				text: "Architecture",
+				items: [
+					{ text: "Overview", link: "/architecture/" },
+					{ text: "Sync Algorithm", link: "/architecture/sync-algorithm" },
+					{ text: "Data Flow", link: "/architecture/data-flow" }
+				]
+			}
+		],
+		socialLinks: [{ icon: "github", link: "https://github.com/schmelczer/vault-link" }],
+		footer: {
+			message: "Released under the MIT License.",
+			copyright: "Copyright © 2024-present Andras Schmelczer"
+		},
+		search: {
+			provider: "local"
+		}
+	},
+	head: [["link", { rel: "icon", type: "image/svg+xml", href: "/vault-link/logo.svg" }]]
 })
diff --git a/docs/README.md b/docs/README.md
index a1032bbb..7a9f4522 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -44,6 +44,20 @@ Preview the built site:
 npm run preview
 ```
 
+### Format
+
+Format all markdown and TypeScript files:
+
+```bash
+npm run format
+```
+
+Check formatting without making changes:
+
+```bash
+npm run format:check
+```
+
 ## Deployment
 
 The documentation is automatically deployed to GitHub Pages when changes are pushed to the `main` branch.
@@ -81,6 +95,7 @@ docs/
 ### Markdown Features
 
 VitePress supports:
+
 - GitHub Flavored Markdown
 - Custom containers (tip, warning, danger)
 - Code syntax highlighting
@@ -112,7 +127,7 @@ npm install
 
 ```yaml
 server:
-  port: 3000
+    port: 3000
 ```
 ````
 
diff --git a/docs/architecture/data-flow.md b/docs/architecture/data-flow.md
index 1b8ae1aa..228b11a9 100644
--- a/docs/architecture/data-flow.md
+++ b/docs/architecture/data-flow.md
@@ -22,6 +22,7 @@ sequenceDiagram
 ```
 
 **Steps**:
+
 1. Client initiates WebSocket connection to server
 2. Server accepts connection
 3. Client sends authentication message with token and vault name
@@ -72,6 +73,7 @@ sequenceDiagram
 ```
 
 **Process**:
+
 1. Client scans local filesystem
 2. Client requests file list from server
 3. Server queries database and returns metadata
@@ -106,6 +108,7 @@ sequenceDiagram
 ```
 
 **Flow**:
+
 1. Filesystem watcher detects local change
 2. Client reads file content
 3. Client uploads file via WebSocket
@@ -325,6 +328,7 @@ CREATE TABLE cursors (
 ### Queries
 
 **Get files since version**:
+
 ```sql
 SELECT * FROM documents
 WHERE version > ? AND deleted = FALSE
@@ -332,6 +336,7 @@ ORDER BY version ASC;
 ```
 
 **Store new version**:
+
 ```sql
 INSERT INTO versions (document_id, version, content, created_at)
 VALUES (?, ?, ?, ?);
@@ -342,6 +347,7 @@ WHERE id = ?;
 ```
 
 **Update cursor**:
+
 ```sql
 INSERT OR REPLACE INTO cursors (client_id, last_version, last_updated)
 VALUES (?, ?, ?);
@@ -352,87 +358,96 @@ VALUES (?, ?, ?);
 ### Client → Server Messages
 
 **Upload File**:
+
 ```json
 {
-    "type": "upload_file",
-    "path": "notes/example.md",
-    "content": "File content here...",
-    "base_version": 10,
-    "timestamp": "2024-01-01T12:00:00Z"
+	"type": "upload_file",
+	"path": "notes/example.md",
+	"content": "File content here...",
+	"base_version": 10,
+	"timestamp": "2024-01-01T12:00:00Z"
 }
 ```
 
 **Download File**:
+
 ```json
 {
-    "type": "download_file",
-    "path": "notes/example.md"
+	"type": "download_file",
+	"path": "notes/example.md"
 }
 ```
 
 **Delete File**:
+
 ```json
 {
-    "type": "delete_file",
-    "path": "notes/old.md"
+	"type": "delete_file",
+	"path": "notes/old.md"
 }
 ```
 
 **List Files**:
+
 ```json
 {
-    "type": "list_files",
-    "since_version": 0
+	"type": "list_files",
+	"since_version": 0
 }
 ```
 
 ### Server → Client Messages
 
 **File Updated**:
+
 ```json
 {
-    "type": "file_updated",
-    "path": "notes/example.md",
-    "version": 11,
-    "size": 1024,
-    "hash": "abc123..."
+	"type": "file_updated",
+	"path": "notes/example.md",
+	"version": 11,
+	"size": 1024,
+	"hash": "abc123..."
 }
 ```
 
 **File Content**:
+
 ```json
 {
-    "type": "file_content",
-    "path": "notes/example.md",
-    "content": "Updated content...",
-    "version": 11
+	"type": "file_content",
+	"path": "notes/example.md",
+	"content": "Updated content...",
+	"version": 11
 }
 ```
 
 **File Deleted**:
+
 ```json
 {
-    "type": "file_deleted",
-    "path": "notes/old.md",
-    "version": 12
+	"type": "file_deleted",
+	"path": "notes/old.md",
+	"version": 12
 }
 ```
 
 **Sync Complete**:
+
 ```json
 {
-    "type": "sync_complete",
-    "total_files": 150,
-    "current_version": 200
+	"type": "sync_complete",
+	"total_files": 150,
+	"current_version": 200
 }
 ```
 
 **Error**:
+
 ```json
 {
-    "type": "error",
-    "message": "File too large",
-    "code": "FILE_TOO_LARGE"
+	"type": "error",
+	"message": "File too large",
+	"code": "FILE_TOO_LARGE"
 }
 ```
 
@@ -441,18 +456,21 @@ VALUES (?, ?, ?);
 ### Client-Side Errors
 
 **Network failure**:
+
 1. Detect WebSocket disconnect
 2. Queue pending operations
 3. Retry connection with exponential backoff
 4. Replay queued operations on reconnect
 
 **File read error**:
+
 1. Log error
 2. Skip file
 3. Continue with other files
 4. Report to user
 
 **Write conflict**:
+
 1. Receive updated version from server
 2. Apply OT merge locally
 3. Overwrite local file
@@ -461,16 +479,19 @@ VALUES (?, ?, ?);
 ### Server-Side Errors
 
 **Database error**:
+
 1. Log error
 2. Return error to client
 3. Client retries operation
 
 **Invalid operation**:
+
 1. Validate message format
 2. Return specific error code
 3. Client handles error appropriately
 
 **Authentication failure**:
+
 1. Reject connection
 2. Send auth error
 3. Client prompts for new credentials
diff --git a/docs/architecture/index.md b/docs/architecture/index.md
index e88c2b9d..888830d3 100644
--- a/docs/architecture/index.md
+++ b/docs/architecture/index.md
@@ -43,6 +43,7 @@ VaultLink is built as a distributed system with a central sync server and multip
 The central authority for synchronization, written in Rust using Axum framework.
 
 **Responsibilities**:
+
 - Accept WebSocket connections from clients
 - Authenticate users via token-based auth
 - Store document versions in SQLite
@@ -51,6 +52,7 @@ The central authority for synchronization, written in Rust using Axum framework.
 - Manage vault access control
 
 **Technology**:
+
 - **Language**: Rust 1.89+
 - **Framework**: Axum (async web framework)
 - **Database**: SQLite with SQLx
@@ -62,6 +64,7 @@ The central authority for synchronization, written in Rust using Axum framework.
 TypeScript library providing core synchronization logic, used by both the Obsidian plugin and CLI client.
 
 **Responsibilities**:
+
 - Manage WebSocket connection to server
 - Watch local filesystem for changes
 - Upload and download files
@@ -70,6 +73,7 @@ TypeScript library providing core synchronization logic, used by both the Obsidi
 - Maintain sync metadata
 
 **Technology**:
+
 - **Language**: TypeScript
 - **Build**: Webpack
 - **Protocol**: WebSocket client
@@ -80,12 +84,14 @@ TypeScript library providing core synchronization logic, used by both the Obsidi
 Integration layer between sync client and Obsidian.
 
 **Responsibilities**:
+
 - Provide UI for configuration
 - Bridge sync client with Obsidian's file system API
 - Handle Obsidian lifecycle events
 - Display sync status to users
 
 **Technology**:
+
 - **Platform**: Obsidian Plugin API
 - **Core**: sync-client library
 - **UI**: Obsidian settings UI
@@ -95,12 +101,14 @@ Integration layer between sync client and Obsidian.
 Standalone executable for syncing vaults without Obsidian.
 
 **Responsibilities**:
+
 - Command-line interface
 - File system access via Node.js
 - Daemon mode for continuous sync
 - Health check endpoint for monitoring
 
 **Technology**:
+
 - **Language**: TypeScript
 - **Runtime**: Node.js
 - **CLI**: Commander.js
@@ -190,6 +198,7 @@ databases/
 ```
 
 **Database Schema** (simplified):
+
 - **documents**: File metadata (path, size, modified time)
 - **versions**: Document content with version history
 - **cursors**: Client sync state
@@ -213,6 +222,7 @@ The `.vaultlink` directory tracks which files have been synced and their version
 Client-server communication uses JSON messages over WebSocket.
 
 **Message Types**:
+
 - `upload_file`: Client → Server (file upload)
 - `download_file`: Client → Server (request file)
 - `file_updated`: Server → Client (file changed notification)
@@ -253,11 +263,13 @@ Token-based authentication on connection:
 ### Scaling Approaches
 
 **Vertical Scaling**:
+
 - Increase server resources (CPU, RAM, storage)
 - Optimize database queries and indexing
 - Tune connection limits
 
 **Horizontal Scaling** (future):
+
 - Separate vault servers (vault sharding)
 - Load balancer with sticky sessions
 - Shared storage layer for SQLite databases
diff --git a/docs/architecture/sync-algorithm.md b/docs/architecture/sync-algorithm.md
index 1f567efe..021c8ad7 100644
--- a/docs/architecture/sync-algorithm.md
+++ b/docs/architecture/sync-algorithm.md
@@ -9,11 +9,13 @@ Operational transformation is a technique for managing concurrent edits to the s
 ### Why OT?
 
 Traditional conflict resolution approaches:
+
 - **Last write wins**: Loses data, frustrating for users
 - **Manual merging**: Interrupts workflow, requires user intervention
 - **Version branching**: Complex, not suitable for real-time sync
 
 Operational transformation:
+
 - **Automatic**: No user intervention required
 - **Preserves all edits**: No data loss
 - **Real-time**: Changes appear immediately
@@ -23,6 +25,39 @@ Operational transformation:
 
 VaultLink uses the [`reconcile-text`](https://crates.io/crates/reconcile-text) Rust library for operational transformation on text documents.
 
+### Why reconcile-text over CRDTs?
+
+VaultLink faces a **differential synchronization** challenge: users edit Obsidian vaults with various editors (Obsidian desktop, Obsidian mobile, Vim, VS Code, or any text editor), often while offline. This means we only observe the **final state** of each document after editing, not the individual keystrokes or operations that produced it.
+
+**The fundamental problem**:
+
+- **CRDTs and traditional OT** require capturing every individual operation (each character insertion, deletion, cursor movement)
+- **VaultLink's reality**: Users edit files with arbitrary tools, sync happens after the fact
+- **What we know**: Parent version and two modified versions
+- **What we don't know**: The sequence of operations that created those modifications
+
+**Why reconcile-text wins for this use case**:
+
+1. **Works with end states only**: reconcile-text performs conflict-free 3-way merging given just parent, left, and right versions—no operation history needed
+
+2. **Editor-agnostic**: Users can edit with any tool without requiring VaultLink-specific plugins or operation tracking
+
+3. **Offline-first**: Edits made while disconnected are merged cleanly when sync resumes, because we're diffing final states rather than replaying operations
+
+4. **No conflict markers**: Unlike Git merge, produces clean merged output without `<<<<<<<` markers that interrupt note-taking flow
+
+5. **Human text forgiveness**: For knowledge bases and documentation, a slightly imperfect merge (e.g., minor word order issues) is vastly preferable to manual conflict resolution
+
+6. **Simpler infrastructure**: No need for complex operation capture, transformation logs, or tombstone management that CRDTs require
+
+**The tradeoff**:
+
+CRDTs excel when you control the entire editing infrastructure and can capture every operation. reconcile-text excels when you're synchronizing independently-edited files—exactly VaultLink's scenario. The merge quality depends on Myers' diff algorithm rather than operation history, which is the correct tradeoff for differential sync.
+
+For note-taking workflows where users value editor freedom and offline editing, this approach provides superior user experience compared to either CRDTs (which would require operation tracking) or Git-style merging (which requires manual conflict resolution).
+
+[Learn more about reconcile-text →](https://schmelczer.dev/reconcile)
+
 ### How It Works
 
 Given a base document and two sets of changes, OT produces a merged result that includes both changes.
@@ -41,6 +76,7 @@ OT result: "Hello beautiful world!"  (both changes applied)
 ### Operation Types
 
 The algorithm handles these operations:
+
 - **Insert**: Add text at position
 - **Delete**: Remove text from position
 - **Retain**: Keep existing text unchanged
@@ -62,10 +98,12 @@ VaultLink maintains sync state to track which changes have been applied.
 ### Version Vectors
 
 Each document has a version tracked by:
+
 - **Server version**: Incremented on each change
 - **Client cursors**: Track which version each client has seen
 
 This enables:
+
 - Efficient syncing (only send changes since last sync)
 - Conflict detection (concurrent edits to same version)
 - Ordering of operations
@@ -84,6 +122,7 @@ struct Cursor {
 ```
 
 On sync:
+
 1. Client sends cursor (last seen version)
 2. Server returns all changes since that version
 3. Client applies changes and updates cursor
@@ -95,42 +134,47 @@ On sync:
 Two users edit the same paragraph simultaneously.
 
 **Initial state**:
+
 ```
 Version 10: "The quick brown fox jumps over the lazy dog."
 ```
 
 **User A's edit** (version 11):
+
 ```
 "The quick brown fox jumps over the very lazy dog."
 ```
-*Inserts "very " at position 40*
+
+_Inserts "very " at position 40_
 
 **User B's edit** (also from version 10):
+
 ```
 "The quick red fox jumps over the lazy dog."
 ```
-*Replaces "brown" with "red" at position 10*
+
+_Replaces "brown" with "red" at position 10_
 
 ### Server Processing
 
 1. **Receive User A's operation**:
-   - Base: version 10
-   - Operation: Insert("very ", position=40)
-   - Apply to database → version 11
+    - Base: version 10
+    - Operation: Insert("very ", position=40)
+    - Apply to database → version 11
 
 2. **Receive User B's operation**:
-   - Base: version 10
-   - Operation: Replace("brown"→"red", position=10)
-   - **Conflict detected**: Base is version 10, but current is version 11
+    - Base: version 10
+    - Operation: Replace("brown"→"red", position=10)
+    - **Conflict detected**: Base is version 10, but current is version 11
 
 3. **Transform User B's operation**:
-   - Transform against User A's operation
-   - Adjust positions/content as needed
-   - Apply transformed operation → version 12
+    - Transform against User A's operation
+    - Adjust positions/content as needed
+    - Apply transformed operation → version 12
 
 4. **Broadcast updates**:
-   - Send User A's operation to User B
-   - Send transformed User B's operation to User A
+    - Send User A's operation to User B
+    - Send transformed User B's operation to User A
 
 ### Final Result
 
@@ -147,11 +191,13 @@ Both edits are preserved in the final document.
 **Scenario**: User A deletes a paragraph while User B edits it.
 
 **Resolution**:
+
 - OT algorithm prioritizes preservation of content
 - Insert operation is transformed to account for deletion
 - Typically results in inserted content appearing nearby
 
 **Example**:
+
 ```
 Base: "Line 1\nLine 2\nLine 3"
 
@@ -160,6 +206,7 @@ User B: Edit Line 2 → "Line 1\nLine 2 modified\nLine 3"
 
 Result: "Line 1\nLine 2 modified\nLine 3"
 ```
+
 (Insert takes precedence, preserving user content)
 
 ### 2. Overlapping Edits
@@ -167,6 +214,7 @@ Result: "Line 1\nLine 2 modified\nLine 3"
 **Scenario**: Two users edit overlapping regions.
 
 **Resolution**:
+
 - OT splits operations into non-overlapping segments
 - Applies each segment independently
 - Merges results
@@ -176,6 +224,7 @@ Result: "Line 1\nLine 2 modified\nLine 3"
 **Scenario**: Two users delete overlapping text.
 
 **Resolution**:
+
 - Deletes are merged
 - Final result has the union of deleted ranges removed
 
@@ -184,6 +233,7 @@ Result: "Line 1\nLine 2 modified\nLine 3"
 **Scenario**: Client loses connection, makes edits offline, reconnects.
 
 **Resolution**:
+
 1. Client queues edits locally
 2. On reconnect, sends all queued operations
 3. Server applies OT against all operations that happened during partition
@@ -206,6 +256,7 @@ Result: "Line 1\nLine 2 modified\nLine 3"
 ### Optimization
 
 VaultLink optimizes for:
+
 - Small, frequent edits (typical typing patterns)
 - Text documents (not binary files)
 - Real-time processing (no batching delay)
@@ -215,6 +266,7 @@ VaultLink optimizes for:
 ### Binary Files
 
 OT works best for text files. Binary files:
+
 - Cannot be meaningfully merged
 - Use last-write-wins strategy
 - May cause data loss on concurrent edits
@@ -224,6 +276,7 @@ OT works best for text files. Binary files:
 ### Large Documents
 
 Very large documents (> 1MB) may have:
+
 - Higher transformation costs
 - Slower sync times
 - Increased memory usage
@@ -233,6 +286,7 @@ Very large documents (> 1MB) may have:
 ### Complex Formatting
 
 Markdown with complex structures may occasionally produce unexpected results:
+
 - Nested lists
 - Tables
 - Code blocks
@@ -244,6 +298,7 @@ Markdown with complex structures may occasionally produce unexpected results:
 ### Strong Consistency
 
 VaultLink provides **strong eventual consistency**:
+
 - All clients eventually converge to the same state
 - Operations applied in causal order
 - No data loss under normal operation
@@ -264,32 +319,36 @@ VaultLink provides **strong eventual consistency**:
 
 ### Git-style Merging
 
-| Aspect | Git Merge | VaultLink OT |
-|--------|-----------|--------------|
-| Real-time | No | Yes |
-| Manual conflict resolution | Yes | No |
-| Branching | Yes | No |
-| Automatic merge | Limited | Always |
-| Use case | Code changes | Collaborative documents |
+| Aspect                     | Git Merge    | VaultLink OT            |
+| -------------------------- | ------------ | ----------------------- |
+| Real-time                  | No           | Yes                     |
+| Manual conflict resolution | Yes          | No                      |
+| Branching                  | Yes          | No                      |
+| Automatic merge            | Limited      | Always                  |
+| Use case                   | Code changes | Collaborative documents |
 
 ### CRDTs (Conflict-free Replicated Data Types)
 
-| Aspect | CRDTs | VaultLink OT |
-|--------|-------|--------------|
-| Server required | No | Yes |
-| Memory overhead | Higher | Lower |
-| Complexity | Higher | Lower |
-| Deletion handling | Complex (tombstones) | Simple |
-| Best for | Distributed systems | Centralized sync |
+| Aspect                        | CRDTs                                | VaultLink (reconcile-text)                        |
+| ----------------------------- | ------------------------------------ | ------------------------------------------------- |
+| **Operation tracking**        | Required (every keystroke)           | Not required (end states only)                    |
+| **Editor freedom**            | Limited (must use CRDT-aware editor) | Unlimited (any text editor works)                 |
+| **Offline editing**           | Requires operation log               | Works with file comparison                        |
+| **Server required**           | No                                   | Yes                                               |
+| **Memory overhead**           | Higher (tombstones, metadata)        | Lower (versions only)                             |
+| **Infrastructure complexity** | Higher                               | Lower                                             |
+| **Best for**                  | Controlled editing environments      | Independent file editing (Obsidian, Vim, VS Code) |
+
+**Key insight**: CRDTs are superior when you can capture every operation. reconcile-text is superior when users edit files independently with arbitrary tools—exactly VaultLink's scenario.
 
 ### Last Write Wins
 
-| Aspect | LWW | VaultLink OT |
-|--------|-----|--------------|
-| Data loss | Yes | No |
-| Simplicity | High | Medium |
-| User experience | Poor | Excellent |
-| Performance | Best | Good |
+| Aspect          | LWW  | VaultLink OT |
+| --------------- | ---- | ------------ |
+| Data loss       | Yes  | No           |
+| Simplicity      | High | Medium       |
+| User experience | Poor | Excellent    |
+| Performance     | Best | Good         |
 
 ## Algorithm Details
 
@@ -298,20 +357,20 @@ VaultLink provides **strong eventual consistency**:
 When transforming operation `A` against operation `B`:
 
 1. **Insert vs Insert**:
-   - If positions equal: Order by client ID
-   - If different positions: Adjust positions
+    - If positions equal: Order by client ID
+    - If different positions: Adjust positions
 
 2. **Insert vs Delete**:
-   - If insert in deleted range: Shift insert position
-   - If insert after delete: Adjust position by deleted length
+    - If insert in deleted range: Shift insert position
+    - If insert after delete: Adjust position by deleted length
 
 3. **Delete vs Delete**:
-   - If ranges overlap: Merge delete ranges
-   - If ranges disjoint: Adjust positions
+    - If ranges overlap: Merge delete ranges
+    - If ranges disjoint: Adjust positions
 
 4. **Retain vs Any**:
-   - Retain operations don't conflict
-   - Simply adjust positions
+    - Retain operations don't conflict
+    - Simply adjust positions
 
 ### Transformation Example
 
diff --git a/docs/config/advanced.md b/docs/config/advanced.md
index 25c2e974..4e129a04 100644
--- a/docs/config/advanced.md
+++ b/docs/config/advanced.md
@@ -13,11 +13,13 @@ While VaultLink handles most SQLite configuration automatically, you can optimiz
 VaultLink uses Write-Ahead Logging (WAL) mode by default for better concurrency.
 
 **Benefits**:
+
 - Readers don't block writers
 - Writers don't block readers
 - Better performance for concurrent access
 
 **Maintenance**:
+
 ```bash
 # Checkpoint WAL to main database (run periodically)
 sqlite3 databases/vault.db "PRAGMA wal_checkpoint(TRUNCATE);"
@@ -39,6 +41,7 @@ sqlite3 databases/vault.db "ANALYZE;"
 ```
 
 **Schedule maintenance**:
+
 ```bash
 #!/bin/bash
 # monthly-maintenance.sh
@@ -83,6 +86,7 @@ max_connections = (concurrent_users × avg_operations_per_user) + buffer
 ```
 
 **Example**:
+
 - 20 concurrent users
 - 2 operations per user on average
 - 25% buffer
@@ -96,30 +100,33 @@ max_connections = (20 × 2) × 1.25 = 50
 Adjust timeouts based on network characteristics:
 
 **Fast local network**:
+
 ```yaml
 database:
-  cursor_timeout_seconds: 30
+    cursor_timeout_seconds: 30
 
 server:
-  response_timeout_seconds: 30
+    response_timeout_seconds: 30
 ```
 
 **Slow or unreliable network**:
+
 ```yaml
 database:
-  cursor_timeout_seconds: 180
+    cursor_timeout_seconds: 180
 
 server:
-  response_timeout_seconds: 120
+    response_timeout_seconds: 120
 ```
 
 **Mobile clients**:
+
 ```yaml
 database:
-  cursor_timeout_seconds: 300  # Longer for intermittent connections
+    cursor_timeout_seconds: 300 # Longer for intermittent connections
 
 server:
-  response_timeout_seconds: 180
+    response_timeout_seconds: 180
 ```
 
 ## Reverse Proxy Configuration
@@ -232,16 +239,16 @@ Using Docker labels:
 
 ```yaml
 services:
-  vaultlink-server:
-    image: ghcr.io/schmelczer/vault-link-server:latest
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.vaultlink.rule=Host(`sync.example.com`)"
-      - "traefik.http.routers.vaultlink.entrypoints=websecure"
-      - "traefik.http.routers.vaultlink.tls.certresolver=letsencrypt"
-      - "traefik.http.services.vaultlink.loadbalancer.server.port=3000"
-      # Middleware for timeouts
-      - "traefik.http.middlewares.vaultlink-timeout.timeout.request=3600s"
+    vaultlink-server:
+        image: ghcr.io/schmelczer/vault-link-server:latest
+        labels:
+            - "traefik.enable=true"
+            - "traefik.http.routers.vaultlink.rule=Host(`sync.example.com`)"
+            - "traefik.http.routers.vaultlink.entrypoints=websecure"
+            - "traefik.http.routers.vaultlink.tls.certresolver=letsencrypt"
+            - "traefik.http.services.vaultlink.loadbalancer.server.port=3000"
+            # Middleware for timeouts
+            - "traefik.http.middlewares.vaultlink-timeout.timeout.request=3600s"
 ```
 
 ## Docker Optimizations
@@ -252,16 +259,16 @@ Limit container resources:
 
 ```yaml
 services:
-  vaultlink-server:
-    image: ghcr.io/schmelczer/vault-link-server:latest
-    deploy:
-      resources:
-        limits:
-          cpus: '2.0'
-          memory: 4G
-        reservations:
-          cpus: '1.0'
-          memory: 2G
+    vaultlink-server:
+        image: ghcr.io/schmelczer/vault-link-server:latest
+        deploy:
+            resources:
+                limits:
+                    cpus: "2.0"
+                    memory: 4G
+                reservations:
+                    cpus: "1.0"
+                    memory: 2G
 ```
 
 ### Logging Configuration
@@ -270,13 +277,13 @@ Optimize Docker logging:
 
 ```yaml
 services:
-  vaultlink-server:
-    image: ghcr.io/schmelczer/vault-link-server:latest
-    logging:
-      driver: "json-file"
-      options:
-        max-size: "50m"
-        max-file: "5"
+    vaultlink-server:
+        image: ghcr.io/schmelczer/vault-link-server:latest
+        logging:
+            driver: "json-file"
+            options:
+                max-size: "50m"
+                max-file: "5"
 ```
 
 ### Volume Optimization
@@ -285,21 +292,21 @@ Use named volumes for better performance:
 
 ```yaml
 services:
-  vaultlink-server:
-    image: ghcr.io/schmelczer/vault-link-server:latest
-    volumes:
-      - vaultlink-data:/data
-      - vaultlink-logs:/data/logs
+    vaultlink-server:
+        image: ghcr.io/schmelczer/vault-link-server:latest
+        volumes:
+            - vaultlink-data:/data
+            - vaultlink-logs:/data/logs
 
 volumes:
-  vaultlink-data:
-    driver: local
-    driver_opts:
-      type: none
-      o: bind
-      device: /mnt/fast-ssd/vaultlink
-  vaultlink-logs:
-    driver: local
+    vaultlink-data:
+        driver: local
+        driver_opts:
+            type: none
+            o: bind
+            device: /mnt/fast-ssd/vaultlink
+    vaultlink-logs:
+        driver: local
 ```
 
 ## High Availability
@@ -310,14 +317,14 @@ Comprehensive health monitoring:
 
 ```yaml
 services:
-  vaultlink-server:
-    image: ghcr.io/schmelczer/vault-link-server:latest
-    healthcheck:
-      test: ["CMD-SHELL", "curl -f http://localhost:3000/vaults/health/ping || exit 1"]
-      interval: 10s
-      timeout: 5s
-      retries: 3
-      start_period: 30s
+    vaultlink-server:
+        image: ghcr.io/schmelczer/vault-link-server:latest
+        healthcheck:
+            test: ["CMD-SHELL", "curl -f http://localhost:3000/vaults/health/ping || exit 1"]
+            interval: 10s
+            timeout: 5s
+            retries: 3
+            start_period: 30s
 ```
 
 Monitor health in production:
@@ -375,6 +382,7 @@ find "$BACKUP_DIR" -name "vaultlink-*.tar.gz" -mtime +$RETENTION_DAYS -delete
 ```
 
 Schedule with cron:
+
 ```cron
 0 2 * * * /opt/vaultlink/backup-vaultlink.sh
 ```
@@ -424,21 +432,21 @@ While VaultLink doesn't expose metrics natively, monitor Docker:
 ```yaml
 # docker-compose.yml
 services:
-  vaultlink-server:
-    image: ghcr.io/schmelczer/vault-link-server:latest
-    labels:
-      - "prometheus.io/scrape=true"
-      - "prometheus.io/port=3000"
+    vaultlink-server:
+        image: ghcr.io/schmelczer/vault-link-server:latest
+        labels:
+            - "prometheus.io/scrape=true"
+            - "prometheus.io/port=3000"
 
-  cadvisor:
-    image: gcr.io/cadvisor/cadvisor:latest
-    volumes:
-      - /:/rootfs:ro
-      - /var/run:/var/run:ro
-      - /sys:/sys:ro
-      - /var/lib/docker/:/var/lib/docker:ro
-    ports:
-      - 8080:8080
+    cadvisor:
+        image: gcr.io/cadvisor/cadvisor:latest
+        volumes:
+            - /:/rootfs:ro
+            - /var/run:/var/run:ro
+            - /sys:/sys:ro
+            - /var/lib/docker/:/var/lib/docker:ro
+        ports:
+            - 8080:8080
 ```
 
 ### Log Analysis
@@ -484,17 +492,17 @@ Run VaultLink in isolated network:
 
 ```yaml
 services:
-  vaultlink-server:
-    image: ghcr.io/schmelczer/vault-link-server:latest
-    networks:
-      - vaultlink-internal
-      - proxy-external
+    vaultlink-server:
+        image: ghcr.io/schmelczer/vault-link-server:latest
+        networks:
+            - vaultlink-internal
+            - proxy-external
 
 networks:
-  vaultlink-internal:
-    internal: true
-  proxy-external:
-    driver: bridge
+    vaultlink-internal:
+        internal: true
+    proxy-external:
+        driver: bridge
 ```
 
 ### Read-Only Root Filesystem
@@ -503,12 +511,12 @@ Run with read-only root (mount writable volumes for data):
 
 ```yaml
 services:
-  vaultlink-server:
-    image: ghcr.io/schmelczer/vault-link-server:latest
-    read_only: true
-    volumes:
-      - ./data:/data
-      - /tmp
+    vaultlink-server:
+        image: ghcr.io/schmelczer/vault-link-server:latest
+        read_only: true
+        volumes:
+            - ./data:/data
+            - /tmp
 ```
 
 ### Drop Capabilities
@@ -517,12 +525,12 @@ Run with minimal privileges:
 
 ```yaml
 services:
-  vaultlink-server:
-    image: ghcr.io/schmelczer/vault-link-server:latest
-    security_opt:
-      - no-new-privileges:true
-    cap_drop:
-      - ALL
+    vaultlink-server:
+        image: ghcr.io/schmelczer/vault-link-server:latest
+        security_opt:
+            - no-new-privileges:true
+        cap_drop:
+            - ALL
 ```
 
 ## Migration
@@ -530,19 +538,22 @@ services:
 ### Moving to New Server
 
 1. **Backup on old server**:
-   ```bash
-   ./backup-vaultlink.sh
-   ```
+
+    ```bash
+    ./backup-vaultlink.sh
+    ```
 
 2. **Transfer backup**:
-   ```bash
-   scp vaultlink-backup.tar.gz new-server:/tmp/
-   ```
+
+    ```bash
+    scp vaultlink-backup.tar.gz new-server:/tmp/
+    ```
 
 3. **Restore on new server**:
-   ```bash
-   ./restore-vaultlink.sh /tmp/vaultlink-backup.tar.gz
-   ```
+
+    ```bash
+    ./restore-vaultlink.sh /tmp/vaultlink-backup.tar.gz
+    ```
 
 4. **Update DNS/clients** to point to new server
 
diff --git a/docs/config/authentication.md b/docs/config/authentication.md
index 2437a5ab..944e56f2 100644
--- a/docs/config/authentication.md
+++ b/docs/config/authentication.md
@@ -5,6 +5,7 @@ VaultLink uses token-based authentication with per-user vault access control. Th
 ## Overview
 
 Authentication in VaultLink:
+
 - **Token-based**: Users authenticate with secure tokens
 - **Configured in YAML**: All users defined in `config.yml`
 - **Vault-level access**: Control which vaults each user can access
@@ -14,11 +15,11 @@ Authentication in VaultLink:
 
 ```yaml
 users:
-  user_configs:
-  - name: alice
-    token: alice-secure-token-here
-    vault_access:
-      type: allow_access_to_all
+    user_configs:
+        - name: alice
+          token: alice-secure-token-here
+          vault_access:
+              type: allow_access_to_all
 ```
 
 ## User Configuration Fields
@@ -35,6 +36,7 @@ Human-readable identifier for the user. Used in logs and auditing.
 ```
 
 **Notes**:
+
 - Must be unique across all users
 - Used for identification only, not authentication
 - Appears in server logs
@@ -52,6 +54,7 @@ Authentication token for the user. Must be kept secret.
 ```
 
 **Best practices**:
+
 - Generate with: `openssl rand -hex 32`
 - Minimum length: 32 characters
 - Use different token per user
@@ -59,6 +62,7 @@ Authentication token for the user. Must be kept secret.
 - Rotate periodically
 
 **Example token generation**:
+
 ```bash
 # Generate a secure token
 openssl rand -hex 32
@@ -73,6 +77,7 @@ openssl rand -hex 32
 Defines which vaults the user can access.
 
 **Three modes**:
+
 1. `allow_access_to_all`: Access to all vaults
 2. `allow_list`: Access to specific vaults only
 3. `deny_list`: Access to all vaults except specific ones
@@ -85,14 +90,15 @@ Grant access to every vault:
 
 ```yaml
 users:
-  user_configs:
-  - name: admin
-    token: admin-token
-    vault_access:
-      type: allow_access_to_all
+    user_configs:
+        - name: admin
+          token: admin-token
+          vault_access:
+              type: allow_access_to_all
 ```
 
 **Use cases**:
+
 - Administrator accounts
 - Personal single-user deployments
 - Development/testing
@@ -103,23 +109,25 @@ Grant access only to specific vaults:
 
 ```yaml
 users:
-  user_configs:
-  - name: alice
-    token: alice-token
-    vault_access:
-      type: allow_list
-      allowed:
-        - personal
-        - shared-team
-        - project-alpha
+    user_configs:
+        - name: alice
+          token: alice-token
+          vault_access:
+              type: allow_list
+              allowed:
+                  - personal
+                  - shared-team
+                  - project-alpha
 ```
 
 **Use cases**:
+
 - Multi-user deployments
 - Restricted access scenarios
 - Separation of concerns
 
 **Notes**:
+
 - User can only access listed vaults
 - Attempting to access other vaults returns authentication error
 - Empty list = no access to any vault
@@ -130,21 +138,23 @@ Grant access to all vaults except specific ones:
 
 ```yaml
 users:
-  user_configs:
-  - name: bob
-    token: bob-token
-    vault_access:
-      type: deny_list
-      denied:
-        - restricted
-        - admin-only
+    user_configs:
+        - name: bob
+          token: bob-token
+          vault_access:
+              type: deny_list
+              denied:
+                  - restricted
+                  - admin-only
 ```
 
 **Use cases**:
+
 - Users with broad access except sensitive vaults
 - Simplify configuration when most vaults are accessible
 
 **Notes**:
+
 - User can access any vault not in the deny list
 - Attempting to access denied vaults returns authentication error
 
@@ -154,75 +164,75 @@ users:
 
 ```yaml
 users:
-  user_configs:
-  - name: me
-    token: my-super-secret-token
-    vault_access:
-      type: allow_access_to_all
+    user_configs:
+        - name: me
+          token: my-super-secret-token
+          vault_access:
+              type: allow_access_to_all
 ```
 
 ### Small Team (Shared Vaults)
 
 ```yaml
 users:
-  user_configs:
-  - name: alice
-    token: alice-token
-    vault_access:
-      type: allow_list
-      allowed:
-        - personal-alice
-        - team-shared
-  - name: bob
-    token: bob-token
-    vault_access:
-      type: allow_list
-      allowed:
-        - personal-bob
-        - team-shared
-  - name: charlie
-    token: charlie-token
-    vault_access:
-      type: allow_list
-      allowed:
-        - personal-charlie
-        - team-shared
+    user_configs:
+        - name: alice
+          token: alice-token
+          vault_access:
+              type: allow_list
+              allowed:
+                  - personal-alice
+                  - team-shared
+        - name: bob
+          token: bob-token
+          vault_access:
+              type: allow_list
+              allowed:
+                  - personal-bob
+                  - team-shared
+        - name: charlie
+          token: charlie-token
+          vault_access:
+              type: allow_list
+              allowed:
+                  - personal-charlie
+                  - team-shared
 ```
 
 ### Organization (Mixed Access)
 
 ```yaml
 users:
-  user_configs:
-  - name: admin
-    token: admin-token
-    vault_access:
-      type: allow_access_to_all
+    user_configs:
+        - name: admin
+          token: admin-token
+          vault_access:
+              type: allow_access_to_all
 
-  - name: developer
-    token: dev-token
-    vault_access:
-      type: allow_list
-      allowed:
-        - engineering-docs
-        - api-specs
-        - shared
+        - name: developer
+          token: dev-token
+          vault_access:
+              type: allow_list
+              allowed:
+                  - engineering-docs
+                  - api-specs
+                  - shared
 
-  - name: designer
-    token: design-token
-    vault_access:
-      type: allow_list
-      allowed:
-        - design-docs
-        - brand-assets
-        - shared
+        - name: designer
+          token: design-token
+          vault_access:
+              type: allow_list
+              allowed:
+                  - design-docs
+                  - brand-assets
+                  - shared
 
-  - name: readonly
-    token: readonly-token
-    vault_access:
-      type: allow_list
-      allowed:
-        - public-wiki
+        - name: readonly
+          token: readonly-token
+          vault_access:
+              type: allow_list
+              allowed:
+                  - public-wiki
 ```
 
 ## Authentication Flow
@@ -231,23 +241,24 @@ users:
 
 1. Client connects via WebSocket
 2. Client sends authentication message:
-   ```json
-   {
-     "type": "auth",
-     "token": "user-token",
-     "vault": "vault-name"
-   }
-   ```
+    ```json
+    {
+    	"type": "auth",
+    	"token": "user-token",
+    	"vault": "vault-name"
+    }
+    ```
 3. Server validates:
-   - Token exists in config
-   - User has access to requested vault
+    - Token exists in config
+    - User has access to requested vault
 4. Server responds:
-   - Success: Connection established
-   - Failure: Connection closed with error
+    - Success: Connection established
+    - Failure: Connection closed with error
 
 ### Validation
 
 Server checks:
+
 1. **Token match**: Token exists in `user_configs`
 2. **Vault access**: User has permission for vault
 3. **Connection limits**: Not exceeding `max_clients_per_vault`
@@ -255,16 +266,19 @@ Server checks:
 ### Errors
 
 **Invalid token**:
+
 ```
 Authentication failed: Invalid token
 ```
 
 **No vault access**:
+
 ```
 Authentication failed: User does not have access to vault 'restricted'
 ```
 
 **Connection limit**:
+
 ```
 Connection rejected: Maximum clients reached for vault
 ```
@@ -289,14 +303,16 @@ uuidgen
 ### Token Storage
 
 **In config file**:
+
 ```yaml
 users:
-  user_configs:
-  - name: alice
-    token: !ENV ALICE_TOKEN  # Read from environment variable
+    user_configs:
+        - name: alice
+          token: !ENV ALICE_TOKEN # Read from environment variable
 ```
 
 **Load from environment**:
+
 ```bash
 export ALICE_TOKEN="$(openssl rand -hex 32)"
 ./sync_server config.yml
@@ -314,11 +330,13 @@ Periodically change tokens:
 ### Token Revocation
 
 To revoke access:
+
 1. Remove user from `config.yml`
 2. Restart server
 3. User's connections will be rejected
 
 For immediate revocation:
+
 - Remove user from config
 - Restart server
 - Existing connections are terminated
@@ -354,6 +372,7 @@ Grant temporary access:
 4. Restart server
 
 For automation:
+
 ```bash
 # Add user with expiry comment
 echo "  - name: temp-user  # EXPIRES: 2024-12-31" >> config.yml
@@ -363,6 +382,7 @@ echo "    token: temp-token" >> config.yml
 ### Shared Tokens (Not Recommended)
 
 Multiple users sharing a token:
+
 - All appear as same user in logs
 - Can't revoke individual access
 - Security risk if one person leaves
@@ -432,25 +452,25 @@ Tokens for automated systems:
 
 ```yaml
 users:
-  user_configs:
-  - name: backup-service
-    token: backup-service-token
-    vault_access:
-      type: allow_access_to_all
+    user_configs:
+        - name: backup-service
+          token: backup-service-token
+          vault_access:
+              type: allow_access_to_all
 
-  - name: ci-pipeline
-    token: ci-token
-    vault_access:
-      type: allow_list
-      allowed:
-        - documentation
+        - name: ci-pipeline
+          token: ci-token
+          vault_access:
+              type: allow_list
+              allowed:
+                  - documentation
 
-  - name: monitoring
-    token: monitoring-token
-    vault_access:
-      type: allow_list
-      allowed:
-        - metrics
+        - name: monitoring
+          token: monitoring-token
+          vault_access:
+              type: allow_list
+              allowed:
+                  - metrics
 ```
 
 ### Dynamic Vault Access
@@ -462,6 +482,7 @@ VaultLink doesn't support runtime user management. To change access:
 3. Users reconnect automatically
 
 For frequent changes, consider:
+
 - Over-provision access (deny list)
 - Use external authentication proxy
 - Script config updates + reload
@@ -471,18 +492,21 @@ For frequent changes, consider:
 ### Can't connect
 
 **Check token**:
+
 ```bash
 # Verify token in config matches client
 grep "token:" config.yml
 ```
 
 **Check vault name**:
+
 ```bash
 # Ensure vault is in allowed list
 grep -A 5 "name: alice" config.yml
 ```
 
 **Check server logs**:
+
 ```bash
 tail -f logs/*.log | grep -i auth
 ```
@@ -490,18 +514,20 @@ tail -f logs/*.log | grep -i auth
 ### Access denied
 
 **Verify vault access**:
+
 ```yaml
 # Check user's vault_access configuration
 users:
-  user_configs:
-  - name: alice
-    vault_access:
-      type: allow_list
-      allowed:
-        - vault-name  # Must match exactly
+    user_configs:
+        - name: alice
+          vault_access:
+              type: allow_list
+              allowed:
+                  - vault-name # Must match exactly
 ```
 
 **Case sensitivity**:
+
 - Vault names are case-sensitive
 - `Vault` ≠ `vault`
 - Ensure exact match in config and client
@@ -509,11 +535,13 @@ users:
 ### Token not working
 
 **Check for typos**:
+
 - Extra spaces
 - Hidden characters
 - Wrong quotes in YAML
 
 **Regenerate token**:
+
 ```bash
 # Generate new token
 openssl rand -hex 32
diff --git a/docs/config/server.md b/docs/config/server.md
index c6632b5e..26eb894a 100644
--- a/docs/config/server.md
+++ b/docs/config/server.md
@@ -14,40 +14,40 @@ The server is configured using a YAML file passed as a command-line argument:
 
 ```yaml
 database:
-  databases_directory_path: databases
-  max_connections_per_vault: 12
-  cursor_timeout_seconds: 60
+    databases_directory_path: databases
+    max_connections_per_vault: 12
+    cursor_timeout_seconds: 60
 
 server:
-  host: 0.0.0.0
-  port: 3000
-  max_body_size_mb: 512
-  max_clients_per_vault: 256
-  response_timeout_seconds: 60
+    host: 0.0.0.0
+    port: 3000
+    max_body_size_mb: 512
+    max_clients_per_vault: 256
+    response_timeout_seconds: 60
 
 users:
-  user_configs:
-  - name: admin
-    token: your-secure-random-token
-    vault_access:
-      type: allow_access_to_all
-  - name: alice
-    token: alice-token
-    vault_access:
-      type: allow_list
-      allowed:
-        - personal
-        - shared
-  - name: bob
-    token: bob-token
-    vault_access:
-      type: deny_list
-      denied:
-        - restricted
+    user_configs:
+        - name: admin
+          token: your-secure-random-token
+          vault_access:
+              type: allow_access_to_all
+        - name: alice
+          token: alice-token
+          vault_access:
+              type: allow_list
+              allowed:
+                  - personal
+                  - shared
+        - name: bob
+          token: bob-token
+          vault_access:
+              type: deny_list
+              denied:
+                  - restricted
 
 logging:
-  log_directory: logs
-  log_rotation: 7days
+    log_directory: logs
+    log_rotation: 7days
 ```
 
 ## Database Section
@@ -62,10 +62,11 @@ Directory where SQLite database files are stored. One database file per vault.
 
 ```yaml
 database:
-  databases_directory_path: /data/databases
+    databases_directory_path: /data/databases
 ```
 
 The directory structure:
+
 ```
 databases/
 ├── vault-1.db
@@ -74,6 +75,7 @@ databases/
 ```
 
 **Notes**:
+
 - Path is relative to working directory or absolute
 - Directory must be writable by the server process
 - Ensure adequate disk space for vault data
@@ -90,10 +92,11 @@ Maximum concurrent database connections per vault.
 
 ```yaml
 database:
-  max_connections_per_vault: 12
+    max_connections_per_vault: 12
 ```
 
 **Tuning**:
+
 - Higher values: Better performance under load
 - Lower values: Less memory usage
 - Typical range: 8-20
@@ -110,10 +113,11 @@ How long to keep database cursors alive for inactive clients.
 
 ```yaml
 database:
-  cursor_timeout_seconds: 60
+    cursor_timeout_seconds: 60
 ```
 
 **Notes**:
+
 - Cursors track client sync state
 - Timeout too short: Clients may need to re-sync frequently
 - Timeout too long: More memory usage
@@ -139,6 +143,7 @@ server:
 ```
 
 **Common values**:
+
 - `0.0.0.0`: Listen on all network interfaces (production)
 - `127.0.0.1`: Listen on localhost only (development/testing)
 - Specific IP: Listen on specific interface
@@ -154,10 +159,11 @@ TCP port to listen on.
 
 ```yaml
 server:
-  port: 3000
+    port: 3000
 ```
 
 **Notes**:
+
 - Must be available (not in use)
 - Privileged ports (< 1024) require root
 - Common ports: 3000, 8080, 8888
@@ -174,16 +180,18 @@ Maximum size of HTTP request body in megabytes.
 
 ```yaml
 server:
-  max_body_size_mb: 512
+    max_body_size_mb: 512
 ```
 
 **Usage**:
+
 - Limits file upload size
 - Prevents memory exhaustion attacks
 - Must be larger than largest expected file
 - Consider client `max_file_size_mb` settings
 
 **Tuning**:
+
 - Small vaults (mostly text): 100 MB
 - Medium vaults (some images): 512 MB
 - Large vaults (many images/PDFs): 1024+ MB
@@ -199,16 +207,18 @@ Maximum concurrent clients per vault.
 
 ```yaml
 server:
-  max_clients_per_vault: 256
+    max_clients_per_vault: 256
 ```
 
 **Notes**:
+
 - Limits concurrent WebSocket connections
 - Prevents resource exhaustion
 - Consider expected number of users
 - Each client uses memory and file descriptors
 
 **Scaling**:
+
 - Personal use: 10-50
 - Small team: 50-100
 - Large team: 100-500
@@ -224,15 +234,17 @@ Maximum time to wait for client responses.
 
 ```yaml
 server:
-  response_timeout_seconds: 60
+    response_timeout_seconds: 60
 ```
 
 **Usage**:
+
 - Timeout for HTTP requests
 - Timeout for WebSocket operations
 - Clients disconnected if unresponsive
 
 **Tuning**:
+
 - Fast networks: 30 seconds
 - Slow networks: 90-120 seconds
 - Large file uploads: Increase proportionally
@@ -259,6 +271,7 @@ logging:
 ```
 
 **Notes**:
+
 - Path is relative to working directory or absolute
 - Directory must be writable
 - Logs are rotated based on `log_rotation`
@@ -284,10 +297,12 @@ logging:
 **Format**: `<number><unit>`
 
 **Units**:
+
 - `hours`: Hours (e.g., `12hours`, `24hours`)
 - `days`: Days (e.g., `7days`, `30days`)
 
 **Recommendations**:
+
 - Development: `24hours` or `7days`
 - Production: `7days` or `30days`
 - High traffic: `24hours` (logs can be large)
@@ -298,55 +313,55 @@ logging:
 
 ```yaml
 database:
-  databases_directory_path: ./databases
-  max_connections_per_vault: 8
-  cursor_timeout_seconds: 30
+    databases_directory_path: ./databases
+    max_connections_per_vault: 8
+    cursor_timeout_seconds: 30
 
 server:
-  host: 127.0.0.1
-  port: 3000
-  max_body_size_mb: 100
-  max_clients_per_vault: 10
-  response_timeout_seconds: 30
+    host: 127.0.0.1
+    port: 3000
+    max_body_size_mb: 100
+    max_clients_per_vault: 10
+    response_timeout_seconds: 30
 
 users:
-  user_configs:
-  - name: dev
-    token: dev-token
-    vault_access:
-      type: allow_access_to_all
+    user_configs:
+        - name: dev
+          token: dev-token
+          vault_access:
+              type: allow_access_to_all
 
 logging:
-  log_directory: logs
-  log_rotation: 24hours
+    log_directory: logs
+    log_rotation: 24hours
 ```
 
 ### Production
 
 ```yaml
 database:
-  databases_directory_path: /data/databases
-  max_connections_per_vault: 16
-  cursor_timeout_seconds: 120
+    databases_directory_path: /data/databases
+    max_connections_per_vault: 16
+    cursor_timeout_seconds: 120
 
 server:
-  host: 0.0.0.0
-  port: 3000
-  max_body_size_mb: 512
-  max_clients_per_vault: 256
-  response_timeout_seconds: 90
+    host: 0.0.0.0
+    port: 3000
+    max_body_size_mb: 512
+    max_clients_per_vault: 256
+    response_timeout_seconds: 90
 
 users:
-  user_configs:
-  - name: admin
-    token: <strong-random-token>
-    vault_access:
-      type: allow_access_to_all
-  # Additional users...
+    user_configs:
+        - name: admin
+          token: <strong-random-token>
+          vault_access:
+              type: allow_access_to_all
+    # Additional users...
 
 logging:
-  log_directory: /data/logs
-  log_rotation: 7days
+    log_directory: /data/logs
+    log_rotation: 7days
 ```
 
 ## Validation
@@ -362,6 +377,7 @@ tail -f logs/latest.log
 ```
 
 **Common errors**:
+
 - Missing required fields
 - Invalid YAML syntax
 - Invalid values (negative numbers, etc.)
@@ -375,11 +391,11 @@ For many concurrent users:
 
 ```yaml
 database:
-  max_connections_per_vault: 20  # Increase
+    max_connections_per_vault: 20 # Increase
 
 server:
-  max_clients_per_vault: 500  # Increase
-  response_timeout_seconds: 120  # Increase for slow clients
+    max_clients_per_vault: 500 # Increase
+    response_timeout_seconds: 120 # Increase for slow clients
 ```
 
 ### Large Files
@@ -388,8 +404,8 @@ For vaults with large files:
 
 ```yaml
 server:
-  max_body_size_mb: 1024  # Allow larger uploads
-  response_timeout_seconds: 180  # More time for uploads
+    max_body_size_mb: 1024 # Allow larger uploads
+    response_timeout_seconds: 180 # More time for uploads
 ```
 
 ### Resource-Constrained Systems
@@ -398,11 +414,11 @@ For limited CPU/memory:
 
 ```yaml
 database:
-  max_connections_per_vault: 6  # Reduce
+    max_connections_per_vault: 6 # Reduce
 
 server:
-  max_clients_per_vault: 50  # Reduce
-  max_body_size_mb: 256  # Reduce
+    max_clients_per_vault: 50 # Reduce
+    max_body_size_mb: 256 # Reduce
 ```
 
 ## Security Considerations
@@ -431,12 +447,14 @@ server:
 ### Server won't start
 
 **Check YAML syntax**:
+
 ```bash
 # Use a YAML validator
 python -c 'import yaml, sys; yaml.safe_load(open("config.yml"))'
 ```
 
 **Check file paths**:
+
 ```bash
 # Ensure directories exist and are writable
 mkdir -p databases logs
@@ -444,6 +462,7 @@ chmod 755 databases logs
 ```
 
 **Check port availability**:
+
 ```bash
 # Verify port is not in use
 lsof -i :3000
diff --git a/docs/guide/alternatives.md b/docs/guide/alternatives.md
new file mode 100644
index 00000000..5e9b8977
--- /dev/null
+++ b/docs/guide/alternatives.md
@@ -0,0 +1,324 @@
+# Comparison with Alternatives
+
+VaultLink is one of several solutions for synchronizing Obsidian vaults. This page compares VaultLink with popular alternatives to help you choose the right tool.
+
+## Key Differentiator: Editor Agnostic
+
+**VaultLink is not tied to Obsidian.** While it includes an Obsidian plugin for convenience, VaultLink synchronizes plain text files and works with any editor:
+
+- Edit with **Obsidian desktop** on your laptop
+- Edit with **Vim** on your server
+- Edit with **VS Code** on your workstation
+- Edit with **Obsidian mobile** on your phone
+- Use the **CLI client** for automated workflows
+
+All changes merge automatically without conflict markers, regardless of which editor you use. This is possible because VaultLink uses [reconcile-text](/architecture/sync-algorithm#why-reconcile-text-over-crdts) for differential synchronization rather than requiring operation-level tracking.
+
+## VaultLink's Core Strengths
+
+Before diving into comparisons:
+
+1. **Fully self-hosted**: Server and all components are open source
+2. **Collaborative editing**: Real-time sync with operational transformation
+3. **Automatic conflict resolution**: No manual intervention or paid features required
+4. **Cursor tracking**: See where other users are editing
+5. **Extensively tested**: Comprehensive test suite for server and client
+6. **Editor freedom**: Use any text editor, not just Obsidian
+7. **Production-ready**: Docker images, health checks, monitoring
+
+## Obsidian Sync Alternatives
+
+### Self-hosted LiveSync
+
+**Downloads**: ~300,000
+**Repository**: https://github.com/vrtmrz/obsidian-livesync
+
+**Overview**: CouchDB/IBM Cloudant-based sync with end-to-end encryption.
+
+| Aspect                    | Self-hosted LiveSync        | VaultLink                              |
+| ------------------------- | --------------------------- | -------------------------------------- |
+| **Self-hosted**           | Yes (CouchDB required)      | Yes (single binary or Docker)          |
+| **Conflict resolution**   | Manual or automatic (basic) | Automatic (operational transformation) |
+| **Collaborative editing** | No                          | Yes (real-time with cursors)           |
+| **Editor support**        | Obsidian only               | Any text editor                        |
+| **Infrastructure**        | CouchDB database            | SQLite (bundled)                       |
+| **Deployment complexity** | Medium (external DB)        | Low (single container)                 |
+| **End-to-end encryption** | Yes                         | No (transport encryption only)         |
+| **Out-of-band edits**     | Limited support             | Full support (edit with any tool)      |
+
+**When to use LiveSync**:
+
+- Need end-to-end encryption
+- Already running CouchDB
+- Only use Obsidian (no external editors)
+
+**When to use VaultLink**:
+
+- Want collaborative editing with multiple users
+- Edit files with various tools (Vim, VS Code, etc.)
+- Need simpler deployment (no external database)
+- Want operational transformation for better merges
+
+---
+
+### Remotely Save
+
+**Downloads**: ~1.1M
+**Repository**: https://github.com/remotely-save/remotely-save
+
+**Overview**: Sync to cloud storage providers (S3, Dropbox, OneDrive, WebDAV).
+
+| Aspect                    | Remotely Save                | VaultLink                |
+| ------------------------- | ---------------------------- | ------------------------ |
+| **Self-hosted**           | Partial (uses cloud storage) | Fully self-hosted        |
+| **Conflict resolution**   | Paid Pro feature             | Free and automatic       |
+| **Collaborative editing** | No                           | Yes                      |
+| **Editor support**        | Obsidian only                | Any text editor          |
+| **Storage backend**       | Cloud providers              | Self-hosted SQLite       |
+| **Cost**                  | Free (basic) / Paid (Pro)    | Free (open source)       |
+| **Code quality**          | No tests, complex codebase   | Comprehensive test suite |
+| **Real-time sync**        | No (periodic polling)        | Yes (WebSocket)          |
+
+**When to use Remotely Save**:
+
+- Already use cloud storage (S3, Dropbox)
+- Don't need real-time sync
+- Single-user scenario
+
+**When to use VaultLink**:
+
+- Want full control over data
+- Need automatic conflict resolution without paying
+- Want real-time collaborative editing
+- Value code quality and testing
+
+**Note**: Remotely Save's conflict resolution is a paid feature. VaultLink provides superior automatic merging for free.
+
+---
+
+### Relay
+
+**Downloads**: ~24,000
+**Repository**: https://github.com/No-Instructions/Relay
+
+**Overview**: CRDT-based sync with proprietary server component.
+
+| Aspect                     | Relay                        | VaultLink               |
+| -------------------------- | ---------------------------- | ----------------------- |
+| **Self-hosted**            | No (proprietary server)      | Yes (fully open source) |
+| **Conflict resolution**    | CRDT (automatic)             | OT (automatic)          |
+| **Collaborative editing**  | Yes                          | Yes                     |
+| **Editor support**         | Obsidian only                | Any text editor         |
+| **Out-of-band edits**      | No (breaks CRDT consistency) | Yes (differential sync) |
+| **Server open source**     | No                           | Yes                     |
+| **Infrastructure control** | Limited                      | Full                    |
+| **Per-file overhead**      | High (CRDT metadata)         | Low (version history)   |
+
+**When to use Relay**:
+
+- Want hosted solution (don't self-host)
+- Only edit within Obsidian
+- Don't need out-of-band editing
+
+**When to use VaultLink**:
+
+- Need fully open source solution
+- Want to self-host completely
+- Edit files outside Obsidian (Vim, VS Code)
+- Value infrastructure control
+
+**Critical limitation**: Relay's CRDT approach requires tracking every operation within Obsidian. Editing files outside Obsidian breaks the CRDT state. VaultLink's differential sync works regardless of how files are edited.
+
+---
+
+### Obsidian Git
+
+**Downloads**: ~1.4M
+**Repository**: https://github.com/denolehov/obsidian-git
+
+**Overview**: Uses Git for version control and synchronization.
+
+| Aspect                    | Obsidian Git                  | VaultLink               |
+| ------------------------- | ----------------------------- | ----------------------- |
+| **Self-hosted**           | Yes (Git server)              | Yes (sync server)       |
+| **Conflict resolution**   | Manual (conflict markers)     | Automatic (no markers)  |
+| **Collaborative editing** | No                            | Yes (real-time)         |
+| **Editor support**        | Any (it's Git)                | Any (differential sync) |
+| **Version history**       | Full Git history              | Document versions       |
+| **Real-time sync**        | No (commit-based)             | Yes (instant)           |
+| **Merge conflicts**       | Manual resolution             | Automatic               |
+| **Learning curve**        | High (Git knowledge required) | Low                     |
+| **Workflow interruption** | Yes (resolve conflicts)       | No                      |
+
+**When to use Obsidian Git**:
+
+- Need full version control (branches, tags, etc.)
+- Already familiar with Git workflows
+- Want integration with existing Git repos
+- Don't mind manual conflict resolution
+
+**When to use VaultLink**:
+
+- Want automatic conflict-free merging
+- Need real-time collaborative editing
+- Don't want workflow interruptions from merge conflicts
+- Prefer simpler mental model (sync, not commits)
+
+**Key difference**: Git requires manual conflict resolution with `<<<<<<<` markers. VaultLink automatically merges all changes using operational transformation, never interrupting your workflow.
+
+---
+
+### Syncthing Integration
+
+**Downloads**: ~22,600
+**Repository**: https://github.com/LBF38/obsidian-syncthing-integration
+
+**Overview**: Wrapper around Syncthing for file synchronization.
+
+| Aspect                    | Syncthing Integration          | VaultLink         |
+| ------------------------- | ------------------------------ | ----------------- |
+| **Self-hosted**           | Yes (Syncthing)                | Yes (sync server) |
+| **Conflict resolution**   | Manual                         | Automatic         |
+| **Collaborative editing** | No                             | Yes               |
+| **Editor support**        | Any                            | Any               |
+| **Status**                | Unfinished                     | Production-ready  |
+| **Conflict files**        | Creates `.sync-conflict` files | No conflict files |
+| **Real-time sync**        | Yes                            | Yes               |
+| **Automatic merging**     | No                             | Yes               |
+
+**When to use Syncthing Integration**:
+
+- Already use Syncthing for other files
+- Don't need automatic conflict resolution
+- Single-user with multiple devices
+
+**When to use VaultLink**:
+
+- Want automatic conflict resolution
+- Need collaborative editing
+- Want production-ready solution
+- Don't want to manage conflict files
+
+**Status note**: Syncthing Integration is marked as unfinished. VaultLink is production-ready with comprehensive testing.
+
+---
+
+### Remotely Sync
+
+**Downloads**: ~38,000
+**Repository**: https://github.com/sboesen/remotely-sync
+
+**Overview**: Similar to Remotely Save, syncs to cloud storage.
+
+| Aspect                  | Remotely Sync           | VaultLink           |
+| ----------------------- | ----------------------- | ------------------- |
+| **Self-hosted**         | Partial (cloud storage) | Fully self-hosted   |
+| **Conflict resolution** | Limited/Paid            | Free and automatic  |
+| **Code quality**        | No tests                | Comprehensive tests |
+| **Maintenance**         | Low activity            | Active development  |
+
+**Same concerns as Remotely Save**: No test suite, conflict resolution limitations, cloud storage dependency.
+
+**When to use VaultLink**: See Remotely Save comparison above.
+
+---
+
+### SyncFTP
+
+**Downloads**: ~5,000
+**Repository**: https://github.com/alex-donnan/SyncFTP
+
+**Overview**: Simple FTP-based file synchronization.
+
+| Aspect                    | SyncFTP                | VaultLink        |
+| ------------------------- | ---------------------- | ---------------- |
+| **Conflict resolution**   | None (last write wins) | Automatic (OT)   |
+| **Data loss risk**        | High (overwrites)      | None (merges)    |
+| **Collaborative editing** | No                     | Yes              |
+| **Sophistication**        | Minimal                | Production-grade |
+
+**When to use SyncFTP**: Don't use SyncFTP for any scenario where data integrity matters.
+
+**When to use VaultLink**: Any scenario requiring reliable synchronization.
+
+---
+
+## Feature Comparison Matrix
+
+| Feature                           | VaultLink | LiveSync | Relay | Git | Remotely Save | Syncthing |
+| --------------------------------- | --------- | -------- | ----- | --- | ------------- | --------- |
+| **Fully open source**             | ✅        | ✅       | ❌    | ✅  | ✅            | ✅        |
+| **Self-hosted**                   | ✅        | ✅       | ❌    | ✅  | Partial       | ✅        |
+| **Automatic conflict resolution** | ✅        | Basic    | ✅    | ❌  | Paid          | ❌        |
+| **Real-time sync**                | ✅        | ✅       | ✅    | ❌  | ❌            | ✅        |
+| **Collaborative editing**         | ✅        | ❌       | ✅    | ❌  | ❌            | ❌        |
+| **Cursor tracking**               | ✅        | ❌       | ❌    | ❌  | ❌            | ❌        |
+| **Editor agnostic**               | ✅        | ❌       | ❌    | ✅  | ❌            | ✅        |
+| **Out-of-band edits**             | ✅        | Limited  | ❌    | ✅  | ❌            | ✅        |
+| **No conflict markers**           | ✅        | ✅       | ✅    | ❌  | ❌            | ❌        |
+| **Comprehensive tests**           | ✅        | ❌       | ❌    | N/A | ❌            | N/A       |
+| **Simple deployment**             | ✅        | ❌       | N/A   | ❌  | ✅            | ❌        |
+| **Low infrastructure**            | ✅        | ❌       | N/A   | ✅  | ✅            | ✅        |
+
+---
+
+## VaultLink's Unique Position
+
+VaultLink is the **only** solution that combines:
+
+1. **Fully open source** self-hosted server
+2. **Editor agnostic** operation (not locked to Obsidian)
+3. **Automatic conflict-free merging** using operational transformation
+4. **Real-time collaborative editing** with cursor tracking
+5. **Differential synchronization** supporting out-of-band edits
+6. **Comprehensive test coverage** ensuring reliability
+7. **Simple deployment** via Docker or single binary
+
+## Use Case Recommendations
+
+### Choose VaultLink when you:
+
+- Edit vaults with multiple editors (Obsidian + Vim + VS Code)
+- Need real-time collaboration with teammates
+- Want automatic conflict resolution without manual intervention
+- Value full control over infrastructure
+- Need production-ready reliability with comprehensive testing
+- Want to edit files while offline and sync later seamlessly
+
+### Consider alternatives when you:
+
+- **LiveSync**: Need end-to-end encryption and only use Obsidian
+- **Git**: Need full version control with branches and advanced Git features
+- **Remotely Save**: Already committed to cloud storage providers
+- **Syncthing**: Already use Syncthing and don't need automatic merging
+
+## Migration from Other Solutions
+
+VaultLink works with plain Markdown files, making migration simple:
+
+1. **From Git**: Clone your repo, point VaultLink to the directory
+2. **From cloud sync**: Download files, configure VaultLink client
+3. **From LiveSync**: Export vault, import to VaultLink
+4. **From Syncthing**: Point VaultLink to synced directory
+
+All solutions work with the same Markdown files—VaultLink just syncs them better.
+
+## Beyond Obsidian
+
+Because VaultLink is editor-agnostic, you can use it for:
+
+- **Documentation teams**: Sync technical docs edited in VS Code
+- **Academic writing**: Collaborate on papers with various Markdown editors
+- **Personal knowledge bases**: Use Obsidian on mobile, Vim on servers
+- **Automated workflows**: CLI client for backup systems and CI/CD
+- **Multi-tool workflows**: Different team members use different editors
+
+VaultLink doesn't lock you into Obsidian—it's a general-purpose differential sync system that happens to work excellently with Obsidian vaults.
+
+## Next Steps
+
+Ready to try VaultLink?
+
+- [Get started →](/guide/getting-started)
+- [Understand the architecture →](/architecture/)
+- [See how sync works →](/architecture/sync-algorithm)
diff --git a/docs/guide/cli-client.md b/docs/guide/cli-client.md
index 3beb4b7d..ebb89b18 100644
--- a/docs/guide/cli-client.md
+++ b/docs/guide/cli-client.md
@@ -67,20 +67,20 @@ Create `docker-compose.yml`:
 
 ```yaml
 services:
-  vaultlink-cli:
-    image: ghcr.io/schmelczer/vault-link-cli:latest
-    restart: unless-stopped
-    volumes:
-      - ./vault:/vault
-    command:
-      - "-l"
-      - "/vault"
-      - "-r"
-      - "wss://sync.example.com"
-      - "-t"
-      - "your-token"
-      - "-v"
-      - "default"
+    vaultlink-cli:
+        image: ghcr.io/schmelczer/vault-link-cli:latest
+        restart: unless-stopped
+        volumes:
+            - ./vault:/vault
+        command:
+            - "-l"
+            - "/vault"
+            - "-r"
+            - "wss://sync.example.com"
+            - "-t"
+            - "your-token"
+            - "-v"
+            - "default"
 ```
 
 Start the client:
@@ -93,22 +93,22 @@ docker compose up -d
 
 ### Required Arguments
 
-| Argument | Short | Description | Example |
-|----------|-------|-------------|---------|
-| `--local-path` | `-l` | Local directory to sync | `/vault` |
-| `--remote-uri` | `-r` | Server WebSocket URI | `wss://sync.example.com` |
-| `--token` | `-t` | Authentication token | `abc123...` |
-| `--vault-name` | `-v` | Vault name on server | `default` |
+| Argument       | Short | Description             | Example                  |
+| -------------- | ----- | ----------------------- | ------------------------ |
+| `--local-path` | `-l`  | Local directory to sync | `/vault`                 |
+| `--remote-uri` | `-r`  | Server WebSocket URI    | `wss://sync.example.com` |
+| `--token`      | `-t`  | Authentication token    | `abc123...`              |
+| `--vault-name` | `-v`  | Vault name on server    | `default`                |
 
 ### Optional Arguments
 
-| Argument | Default | Description |
-|----------|---------|-------------|
-| `--sync-concurrency` | `1` | Concurrent file operations |
-| `--max-file-size-mb` | `10` | Max file size in MB |
-| `--ignore-pattern` | - | Glob pattern to ignore (repeatable) |
-| `--websocket-retry-interval-ms` | `3500` | Reconnection interval |
-| `--log-level` | `INFO` | Log level: DEBUG, INFO, WARNING, ERROR |
+| Argument                        | Default | Description                            |
+| ------------------------------- | ------- | -------------------------------------- |
+| `--sync-concurrency`            | `1`     | Concurrent file operations             |
+| `--max-file-size-mb`            | `10`    | Max file size in MB                    |
+| `--ignore-pattern`              | -       | Glob pattern to ignore (repeatable)    |
+| `--websocket-retry-interval-ms` | `3500`  | Reconnection interval                  |
+| `--log-level`                   | `INFO`  | Log level: DEBUG, INFO, WARNING, ERROR |
 
 ### Environment Variables
 
@@ -228,6 +228,7 @@ docker inspect --format='{{json .State.Health}}' vaultlink-sync | jq
 ```
 
 Health check verifies:
+
 - Health file exists
 - Status updated within last 30 seconds
 - WebSocket connection is active
@@ -236,14 +237,14 @@ Configure custom health check:
 
 ```yaml
 services:
-  vaultlink-cli:
-    image: ghcr.io/schmelczer/vault-link-cli:latest
-    healthcheck:
-      test: ["CMD", "node", "/app/healthcheck.js"]
-      interval: 15s
-      timeout: 5s
-      retries: 5
-      start_period: 20s
+    vaultlink-cli:
+        image: ghcr.io/schmelczer/vault-link-cli:latest
+        healthcheck:
+            test: ["CMD", "node", "/app/healthcheck.js"]
+            interval: 15s
+            timeout: 5s
+            retries: 5
+            start_period: 20s
 ```
 
 ### Read-Only Vault
@@ -351,21 +352,25 @@ services:
 ### Client won't connect
 
 **Check server accessibility**:
+
 ```bash
 curl https://sync.example.com/vaults/test/ping
 ```
 
 **Verify WebSocket protocol**:
+
 - Use `ws://` for HTTP servers
 - Use `wss://` for HTTPS servers
 
 **Check authentication**:
+
 - Token must match server config
 - User must have access to the vault
 
 ### Permission errors
 
 **Docker volume permissions**:
+
 ```bash
 # Ensure directory is writable
 chmod 755 /path/to/vault
@@ -375,6 +380,7 @@ docker run --rm ghcr.io/schmelczer/vault-link-cli:latest id
 ```
 
 **SELinux issues**:
+
 ```bash
 # Add :z flag to volume mount
 docker run -v /path/to/vault:/vault:z ...
@@ -383,14 +389,17 @@ docker run -v /path/to/vault:/vault:z ...
 ### Files not syncing
 
 **Check ignore patterns**:
+
 - View logs to see which files are skipped
 - Ensure patterns don't match unintentionally
 
 **File size limits**:
+
 - Check `--max-file-size-mb` setting
 - Large files are skipped with a warning
 
 **Check metadata**:
+
 ```bash
 # View sync metadata
 cat /path/to/vault/.vaultlink/metadata.json
@@ -399,33 +408,39 @@ cat /path/to/vault/.vaultlink/metadata.json
 ### High memory usage
 
 **Reduce concurrency**:
+
 ```bash
 --sync-concurrency 1
 ```
 
 **Limit file sizes**:
+
 ```bash
 --max-file-size-mb 5
 ```
 
 **Check vault size**:
+
 - Very large vaults may need more resources
 - Consider splitting into multiple vaults
 
 ### Connection keeps dropping
 
 **Increase retry interval**:
+
 ```bash
 --websocket-retry-interval-ms 5000
 ```
 
 **Check network stability**:
+
 ```bash
 # Monitor connection
 docker logs -f vaultlink-sync | grep -i websocket
 ```
 
 **Server timeout settings**:
+
 - Verify reverse proxy WebSocket timeout
 - Check server `response_timeout_seconds`
 
@@ -503,6 +518,7 @@ WantedBy=multi-user.target
 ```
 
 Enable and start:
+
 ```bash
 sudo systemctl daemon-reload
 sudo systemctl enable vaultlink-cli
diff --git a/docs/guide/getting-started.md b/docs/guide/getting-started.md
index a2636069..8282c7b1 100644
--- a/docs/guide/getting-started.md
+++ b/docs/guide/getting-started.md
@@ -74,9 +74,9 @@ You can connect to VaultLink using either the Obsidian plugin or the standalone
 2. Browse community plugins and search for "VaultLink"
 3. Install and enable the plugin
 4. Configure the plugin:
-   - **Server URL**: `ws://localhost:3000` (or your server address)
-   - **Token**: The token from your `config.yml`
-   - **Vault Name**: `default` (or any name you choose)
+    - **Server URL**: `ws://localhost:3000` (or your server address)
+    - **Token**: The token from your `config.yml`
+    - **Vault Name**: `default` (or any name you choose)
 
 [Read the full Obsidian plugin guide →](/guide/obsidian-plugin)
 
@@ -119,20 +119,20 @@ To add more users or restrict vault access:
 
 ```yaml
 users:
-  user_configs:
-  - name: alice
-    token: alice-secure-token
-    vault_access:
-      type: allow_list
-      allowed:
-        - personal
-        - shared
-  - name: bob
-    token: bob-secure-token
-    vault_access:
-      type: allow_list
-      allowed:
-        - shared
+    user_configs:
+        - name: alice
+          token: alice-secure-token
+          vault_access:
+              type: allow_list
+              allowed:
+                  - personal
+                  - shared
+        - name: bob
+          token: bob-secure-token
+          vault_access:
+              type: allow_list
+              allowed:
+                  - shared
 ```
 
 [Learn about authentication configuration →](/config/authentication)
@@ -159,11 +159,13 @@ Want to understand how VaultLink works under the hood?
 ### Server won't start
 
 Check Docker logs:
+
 ```bash
 docker logs vaultlink-server
 ```
 
 Common issues:
+
 - Port 3000 already in use: Change the port mapping `-p 3001:3000`
 - Config file errors: Validate YAML syntax
 - Permission issues: Ensure the volume mount is writable
diff --git a/docs/guide/obsidian-plugin.md b/docs/guide/obsidian-plugin.md
index dba6cd0e..ed3989b6 100644
--- a/docs/guide/obsidian-plugin.md
+++ b/docs/guide/obsidian-plugin.md
@@ -27,6 +27,7 @@ After installation, configure the plugin in **Settings → VaultLink**.
 ### Required Settings
 
 #### Server URL
+
 The WebSocket URL of your sync server.
 
 - **Development/Local**: `ws://localhost:3000`
@@ -37,14 +38,17 @@ Use `ws://` for unencrypted connections and `wss://` for SSL connections (produc
 :::
 
 #### Authentication Token
+
 Your authentication token from the server's `config.yml`.
 
 Generate a secure token:
+
 ```bash
 openssl rand -hex 32
 ```
 
 #### Vault Name
+
 The name of the vault on the server. Can be any string.
 
 Multiple Obsidian vaults can sync to the same server vault name (for shared vaults), or use unique names for separate vaults.
@@ -52,26 +56,34 @@ Multiple Obsidian vaults can sync to the same server vault name (for shared vaul
 ### Optional Settings
 
 #### Sync Concurrency
+
 Number of files to sync simultaneously.
+
 - **Default**: 1
 - **Range**: 1-10
 - Higher values = faster initial sync, more resource usage
 
 #### Max File Size
+
 Maximum file size to sync (in MB).
+
 - **Default**: 10
 - Files larger than this are skipped
 
 #### Ignore Patterns
+
 Glob patterns for files to exclude from sync.
 
 Examples:
+
 - `*.tmp` - Ignore temporary files
 - `.trash/**` - Ignore trash folder
 - `private/**` - Ignore private directory
 
 #### WebSocket Retry Interval
+
 Milliseconds between reconnection attempts when disconnected.
+
 - **Default**: 3500ms
 - Increase for flaky networks to avoid connection spam
 
@@ -172,24 +184,26 @@ Share specific folders while keeping others private:
 ### Plugin won't connect
 
 1. **Verify server is running**:
-   ```bash
-   curl http://your-server:3000/vaults/test/ping
-   ```
-   Should return `pong`
+
+    ```bash
+    curl http://your-server:3000/vaults/test/ping
+    ```
+
+    Should return `pong`
 
 2. **Check URL format**:
-   - Local: `ws://localhost:3000`
-   - Remote (SSL): `wss://sync.example.com`
-   - Don't include `/vault/name` in the URL
+    - Local: `ws://localhost:3000`
+    - Remote (SSL): `wss://sync.example.com`
+    - Don't include `/vault/name` in the URL
 
 3. **Verify token**:
-   - Must match server config exactly
-   - No extra spaces or quotes
-   - Check server logs for authentication errors
+    - Must match server config exactly
+    - No extra spaces or quotes
+    - Check server logs for authentication errors
 
 4. **Check firewall**:
-   - Ensure port is accessible from your network
-   - For mobile, server must be publicly accessible or use VPN
+    - Ensure port is accessible from your network
+    - For mobile, server must be publicly accessible or use VPN
 
 ### Files not syncing
 
diff --git a/docs/guide/server-setup.md b/docs/guide/server-setup.md
index 1736aa34..8391522b 100644
--- a/docs/guide/server-setup.md
+++ b/docs/guide/server-setup.md
@@ -35,21 +35,21 @@ Create `docker-compose.yml`:
 
 ```yaml
 services:
-  vaultlink-server:
-    image: ghcr.io/schmelczer/vault-link-server:latest
-    container_name: vaultlink-server
-    restart: unless-stopped
-    ports:
-      - "3000:3000"
-    volumes:
-      - ./data:/data
-    command: ["/app/sync_server", "/data/config.yml"]
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:3000/vaults/fake/ping"]
-      interval: 30s
-      timeout: 5s
-      retries: 3
-      start_period: 10s
+    vaultlink-server:
+        image: ghcr.io/schmelczer/vault-link-server:latest
+        container_name: vaultlink-server
+        restart: unless-stopped
+        ports:
+            - "3000:3000"
+        volumes:
+            - ./data:/data
+        command: ["/app/sync_server", "/data/config.yml"]
+        healthcheck:
+            test: ["CMD", "curl", "-f", "http://localhost:3000/vaults/fake/ping"]
+            interval: 30s
+            timeout: 5s
+            retries: 3
+            start_period: 10s
 ```
 
 Start the server:
@@ -76,6 +76,7 @@ chmod +x sync_server-linux-x86_64
 ### Build from Source
 
 Requirements:
+
 - Rust 1.89.0 or later
 - SQLite development headers
 - SQLx CLI
@@ -106,27 +107,27 @@ Create a `config.yml` file with your server configuration:
 
 ```yaml
 database:
-  databases_directory_path: databases
-  max_connections_per_vault: 12
-  cursor_timeout_seconds: 60
+    databases_directory_path: databases
+    max_connections_per_vault: 12
+    cursor_timeout_seconds: 60
 
 server:
-  host: 0.0.0.0
-  port: 3000
-  max_body_size_mb: 512
-  max_clients_per_vault: 256
-  response_timeout_seconds: 60
+    host: 0.0.0.0
+    port: 3000
+    max_body_size_mb: 512
+    max_clients_per_vault: 256
+    response_timeout_seconds: 60
 
 users:
-  user_configs:
-  - name: admin
-    token: your-secure-random-token-here
-    vault_access:
-      type: allow_access_to_all
+    user_configs:
+        - name: admin
+          token: your-secure-random-token-here
+          vault_access:
+              type: allow_access_to_all
 
 logging:
-  log_directory: logs
-  log_rotation: 7days
+    log_directory: logs
+    log_rotation: 7days
 ```
 
 ### Configuration Fields
@@ -192,6 +193,7 @@ server {
 ```
 
 Reload Nginx:
+
 ```bash
 sudo nginx -t
 sudo systemctl reload nginx
@@ -208,6 +210,7 @@ sync.example.com {
 ```
 
 Start Caddy:
+
 ```bash
 caddy run --config Caddyfile
 ```
@@ -269,6 +272,7 @@ find /backup/vaultlink -type d -mtime +30 -exec rm -rf {} +
 ```
 
 Run daily via cron:
+
 ```cron
 0 2 * * * /opt/vaultlink/backup.sh
 ```
@@ -293,12 +297,14 @@ For advanced monitoring, collect Docker stats or implement custom metrics.
 #### Log Monitoring
 
 Logs are written to the configured `log_directory`. Monitor for:
+
 - Connection failures
 - Authentication errors
 - Database errors
 - WebSocket disconnections
 
 Example log watching:
+
 ```bash
 tail -f /data/logs/*.log | grep -i error
 ```
@@ -316,11 +322,13 @@ VaultLink currently uses SQLite, which limits horizontal scaling. For multiple s
 ### Vertical Scaling
 
 Increase resources for the server:
+
 - More CPU for handling concurrent connections
 - More RAM for database caching
 - Faster storage (SSD) for database operations
 
 Tune configuration:
+
 - Increase `max_clients_per_vault` for more concurrent users
 - Increase `max_connections_per_vault` for database performance
 - Adjust `max_body_size_mb` based on typical file sizes
diff --git a/docs/guide/what-is-vaultlink.md b/docs/guide/what-is-vaultlink.md
index 1d236516..02e0d6cb 100644
--- a/docs/guide/what-is-vaultlink.md
+++ b/docs/guide/what-is-vaultlink.md
@@ -9,6 +9,7 @@ VaultLink consists of three main components:
 ### Sync Server
 
 A Rust-based WebSocket server that handles:
+
 - Real-time bidirectional synchronization
 - Document versioning with SQLite
 - User authentication and vault access control
@@ -17,6 +18,7 @@ A Rust-based WebSocket server that handles:
 ### Obsidian Plugin
 
 A native Obsidian plugin that:
+
 - Integrates sync directly into your Obsidian workflow
 - Provides real-time updates as you edit
 - Handles file watching and automatic synchronization
@@ -25,6 +27,7 @@ A native Obsidian plugin that:
 ### CLI Client
 
 A standalone synchronization client that:
+
 - Syncs vaults without requiring Obsidian
 - Perfect for servers, automation, or backup systems
 - Provides file watching and bidirectional sync
@@ -39,6 +42,7 @@ Changes are synchronized immediately via WebSocket connections. When multiple us
 ### Self-Hosted Architecture
 
 Run the sync server on your own infrastructure:
+
 - Full control over data storage and access
 - No dependency on third-party services
 - Configurable authentication and authorization
@@ -47,6 +51,7 @@ Run the sync server on your own infrastructure:
 ### Operational Transformation
 
 VaultLink uses the `reconcile-text` library for intelligent conflict resolution:
+
 - Simultaneous edits are automatically merged
 - No manual conflict resolution required
 - Preserves intent of all contributors
@@ -55,6 +60,7 @@ VaultLink uses the `reconcile-text` library for intelligent conflict resolution:
 ### Flexible Authentication
 
 Configure user access per vault:
+
 - Token-based authentication
 - Per-user vault access control
 - Allow-list or deny-list patterns
@@ -65,6 +71,7 @@ Configure user access per vault:
 ### Personal Sync
 
 Synchronize your Obsidian vault across multiple devices:
+
 - Laptop, desktop, and mobile in real-time
 - No cloud service subscription required
 - Full privacy and data control
@@ -72,6 +79,7 @@ Synchronize your Obsidian vault across multiple devices:
 ### Team Collaboration
 
 Share knowledge bases with teammates:
+
 - Real-time collaborative editing
 - Granular access control per vault
 - Self-hosted for enterprise security requirements
@@ -79,6 +87,7 @@ Share knowledge bases with teammates:
 ### Automated Backups
 
 Use the CLI client for automated workflows:
+
 - Scheduled backups to remote servers
 - Integration with existing backup systems
 - Headless operation without Obsidian
@@ -86,6 +95,7 @@ Use the CLI client for automated workflows:
 ### Development & Testing
 
 Synchronize documentation across environments:
+
 - Keep docs in sync with development environments
 - Automated deployment of documentation
 - Version control integration
diff --git a/docs/index.md b/docs/index.md
index b2127b27..569e692c 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -2,39 +2,39 @@
 layout: home
 
 hero:
-  name: VaultLink
-  text: Self-Hosted Sync for Obsidian
-  tagline: Real-time collaborative file synchronization for your knowledge base
-  image:
-    src: /logo.svg
-    alt: VaultLink
-  actions:
-    - theme: brand
-      text: Get Started
-      link: /guide/getting-started
-    - theme: alt
-      text: View on GitHub
-      link: https://github.com/schmelczer/vault-link
+    name: VaultLink
+    text: Self-Hosted Sync for Obsidian
+    tagline: Real-time collaborative file synchronization for your knowledge base
+    image:
+        src: /logo.svg
+        alt: VaultLink
+    actions:
+        - theme: brand
+          text: Get Started
+          link: /guide/getting-started
+        - theme: alt
+          text: View on GitHub
+          link: https://github.com/schmelczer/vault-link
 
 features:
-  - icon: 🚀
-    title: Real-Time Synchronization
-    details: Operational transformation-based conflict resolution ensures your files stay in sync across devices without data loss
-  - icon: 🔒
-    title: Self-Hosted & Private
-    details: Run your own sync server. Your data stays on your infrastructure with full control over access and privacy
-  - icon: 🎯
-    title: Obsidian Plugin
-    details: Native integration with Obsidian for seamless synchronization directly within your favorite note-taking app
-  - icon: 🖥️
-    title: CLI Client
-    details: Sync vaults to any system using the standalone CLI client. Perfect for servers, automation, or headless setups
-  - icon: ⚡
-    title: Built for Performance
-    details: Rust-powered WebSocket server with SQLite backend delivers blazing-fast sync performance
-  - icon: 🛠️
-    title: Flexible Deployment
-    details: Deploy via Docker, binary releases, or build from source. Configure authentication and access controls to fit your needs
+    - icon: 🚀
+      title: Real-Time Synchronization
+      details: Operational transformation-based conflict resolution ensures your files stay in sync across devices without data loss
+    - icon: 🔒
+      title: Self-Hosted & Private
+      details: Run your own sync server. Your data stays on your infrastructure with full control over access and privacy
+    - icon: 🎯
+      title: Obsidian Plugin
+      details: Native integration with Obsidian for seamless synchronization directly within your favorite note-taking app
+    - icon: 🖥️
+      title: CLI Client
+      details: Sync vaults to any system using the standalone CLI client. Perfect for servers, automation, or headless setups
+    - icon: ⚡
+      title: Built for Performance
+      details: Rust-powered WebSocket server with SQLite backend delivers blazing-fast sync performance
+    - icon: 🛠️
+      title: Flexible Deployment
+      details: Deploy via Docker, binary releases, or build from source. Configure authentication and access controls to fit your needs
 ---
 
 ## Quick Start
diff --git a/docs/package.json b/docs/package.json
index 8084f21b..a0d630a4 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -6,12 +6,15 @@
   "scripts": {
     "dev": "vitepress dev",
     "build": "vitepress build",
-    "preview": "vitepress preview"
+    "preview": "vitepress preview",
+    "format": "prettier --write \"**/*.md\" \"**/*.mts\"",
+    "format:check": "prettier --check \"**/*.md\" \"**/*.mts\""
   },
   "keywords": [],
   "author": "",
   "license": "ISC",
   "devDependencies": {
+    "prettier": "^3.6.2",
     "vitepress": "^1.6.4",
     "vue": "^3.5.24"
   }
diff --git a/docs/public/logo.svg b/docs/public/logo.svg
index 6cfc8953..cccc6fd8 100644
--- a/docs/public/logo.svg
+++ b/docs/public/logo.svg
@@ -1,34 +1,47 @@
 <svg width="200" height="200" viewBox="0 0 200 200" xmlns="http://www.w3.org/2000/svg">
+  <defs>
+    <linearGradient id="grad1" x1="0%" y1="0%" x2="100%" y2="100%">
+      <stop offset="0%" style="stop-color:#4A90E2;stop-opacity:1" />
+      <stop offset="100%" style="stop-color:#357ABD;stop-opacity:1" />
+    </linearGradient>
+  </defs>
+
   <!-- Background circle -->
-  <circle cx="100" cy="100" r="95" fill="#4A90E2" opacity="0.1"/>
+  <circle cx="100" cy="100" r="90" fill="url(#grad1)" opacity="0.15"/>
 
-  <!-- Link chain symbol -->
+  <!-- Main vault icon -->
   <g transform="translate(100, 100)">
-    <!-- Left link -->
-    <path d="M -60 -10 L -30 -10 C -20 -10 -15 -5 -15 5 L -15 5 C -15 15 -20 20 -30 20 L -60 20 C -70 20 -75 15 -75 5 L -75 -5 C -75 -15 -70 -20 -60 -20 Z"
-          fill="none" stroke="#4A90E2" stroke-width="8" stroke-linecap="round"/>
+    <!-- Vault body -->
+    <rect x="-45" y="-50" width="90" height="80" rx="8" fill="none" stroke="url(#grad1)" stroke-width="6"/>
 
-    <!-- Right link -->
-    <path d="M 60 -10 L 30 -10 C 20 -10 15 -5 15 5 L 15 5 C 15 15 20 20 30 20 L 60 20 C 70 20 75 15 75 5 L 75 -5 C 75 -15 70 -20 60 -20 Z"
-          fill="none" stroke="#4A90E2" stroke-width="8" stroke-linecap="round"/>
+    <!-- Vault door circle -->
+    <circle cx="0" cy="-10" r="22" fill="none" stroke="url(#grad1)" stroke-width="5"/>
+    <circle cx="0" cy="-10" r="14" fill="none" stroke="url(#grad1)" stroke-width="3"/>
+    <circle cx="0" cy="-10" r="6" fill="url(#grad1)"/>
 
-    <!-- Center connecting bar -->
-    <rect x="-15" y="-6" width="30" height="12" rx="6" fill="#4A90E2"/>
+    <!-- Vault handle -->
+    <line x1="0" y1="-4" x2="18" y2="-4" stroke="url(#grad1)" stroke-width="3" stroke-linecap="round"/>
+    <circle cx="18" cy="-4" r="4" fill="url(#grad1)"/>
 
-    <!-- Vault door detail -->
-    <circle cx="0" cy="0" r="12" fill="none" stroke="#4A90E2" stroke-width="3"/>
-    <circle cx="0" cy="0" r="6" fill="#4A90E2"/>
+    <!-- Link chain -->
+    <g opacity="0.9">
+      <!-- Left link -->
+      <ellipse cx="-30" cy="40" rx="12" ry="8" fill="none" stroke="url(#grad1)" stroke-width="4"/>
+      <!-- Right link -->
+      <ellipse cx="30" cy="40" rx="12" ry="8" fill="none" stroke="url(#grad1)" stroke-width="4"/>
+      <!-- Center link connecting them -->
+      <ellipse cx="0" cy="40" rx="12" ry="8" fill="none" stroke="url(#grad1)" stroke-width="4"/>
+    </g>
 
-    <!-- Sync arrows -->
-    <g opacity="0.6">
-      <!-- Top arrow -->
-      <path d="M -5 -50 L 5 -50 L 0 -40 Z" fill="#4A90E2"/>
-      <!-- Bottom arrow -->
-      <path d="M 5 50 L -5 50 L 0 40 Z" fill="#4A90E2"/>
+    <!-- Sync arrows (subtle) -->
+    <g opacity="0.5">
+      <!-- Clockwise arrow top-right -->
+      <path d="M 35 -35 Q 50 -35 50 -20 L 50 -15" fill="none" stroke="url(#grad1)" stroke-width="2.5" stroke-linecap="round"/>
+      <polygon points="50,-15 47,-22 53,-22" fill="url(#grad1)"/>
+
+      <!-- Counter-clockwise arrow bottom-left -->
+      <path d="M -35 25 Q -50 25 -50 10 L -50 5" fill="none" stroke="url(#grad1)" stroke-width="2.5" stroke-linecap="round"/>
+      <polygon points="-50,5 -47,12 -53,12" fill="url(#grad1)"/>
     </g>
   </g>
-
-  <!-- Text (optional) -->
-  <text x="100" y="175" font-family="Arial, sans-serif" font-size="24" font-weight="bold"
-        text-anchor="middle" fill="#4A90E2">VaultLink</text>
 </svg>

From a1a461010908b14160b5134d02de5eaf65fc2486 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Nov 2025 12:37:21 +0000
Subject: [PATCH 621/761] Simplify docs

---
 docs/architecture/data-flow.md      |   2 +-
 docs/architecture/index.md          |  36 +-----
 docs/architecture/sync-algorithm.md |   2 +-
 docs/guide/cli-client.md            |   2 +-
 docs/guide/getting-started.md       | 190 +++++++++-------------------
 docs/guide/obsidian-plugin.md       |   2 +-
 docs/guide/server-setup.md          |  12 +-
 docs/guide/what-is-vaultlink.md     | 162 ++++++++----------------
 docs/index.md                       |  79 +++++-------
 9 files changed, 162 insertions(+), 325 deletions(-)

diff --git a/docs/architecture/data-flow.md b/docs/architecture/data-flow.md
index 228b11a9..d11977b8 100644
--- a/docs/architecture/data-flow.md
+++ b/docs/architecture/data-flow.md
@@ -1,6 +1,6 @@
 # Data Flow
 
-This document provides a detailed look at how data flows through the VaultLink system, from client to server and back.
+How data flows through VaultLink, from client to server and back.
 
 ## Connection Lifecycle
 
diff --git a/docs/architecture/index.md b/docs/architecture/index.md
index 888830d3..f210b3e1 100644
--- a/docs/architecture/index.md
+++ b/docs/architecture/index.md
@@ -1,6 +1,6 @@
 # Architecture Overview
 
-VaultLink is built as a distributed system with a central sync server and multiple clients. This document explains the high-level architecture and design decisions.
+Central sync server with multiple clients. High-level architecture and design decisions.
 
 ## System Components
 
@@ -40,7 +40,7 @@ VaultLink is built as a distributed system with a central sync server and multip
 
 ### Sync Server
 
-The central authority for synchronization, written in Rust using Axum framework.
+Central authority for synchronization. Rust + Axum framework.
 
 **Responsibilities**:
 
@@ -61,7 +61,7 @@ The central authority for synchronization, written in Rust using Axum framework.
 
 ### Sync Client Library
 
-TypeScript library providing core synchronization logic, used by both the Obsidian plugin and CLI client.
+TypeScript library with core sync logic. Used by Obsidian plugin and CLI client.
 
 **Responsibilities**:
 
@@ -310,35 +310,13 @@ Token-based authentication on connection:
 
 ## Technology Choices
 
-### Why Rust for Server?
+**Rust**: Low latency, memory safe, excellent async with Tokio, compile-time SQL verification
 
-- **Performance**: Low latency for real-time sync
-- **Memory safety**: No crashes from memory bugs
-- **Concurrency**: Excellent async support with Tokio
-- **Type safety**: Catch bugs at compile time
-- **SQLx**: Compile-time SQL verification
+**SQLite**: No separate database server, fast for reads, single file per vault, backups are file copies
 
-### Why SQLite?
+**WebSocket**: Bidirectional push, no polling overhead, built-in browser/Node.js support
 
-- **Simplicity**: No separate database server required
-- **Performance**: Fast for read-heavy workloads
-- **Reliability**: Battle-tested, ACID compliant
-- **Portability**: Single file per vault
-- **Backups**: Simple file copy
-
-### Why WebSocket?
-
-- **Real-time**: Bidirectional push for instant updates
-- **Efficiency**: Persistent connection, no polling overhead
-- **Simplicity**: Built-in browser/Node.js support
-- **Standards**: Well-supported protocol
-
-### Why Operational Transformation?
-
-- **Automatic conflict resolution**: No manual merging required
-- **Preserves intent**: All edits are kept
-- **Real-time collaboration**: Users see changes as they happen
-- **Proven algorithm**: Used by Google Docs, etc.
+**Operational Transformation**: Automatic conflict resolution, preserves all edits, real-time collaboration
 
 ## Design Principles
 
diff --git a/docs/architecture/sync-algorithm.md b/docs/architecture/sync-algorithm.md
index 021c8ad7..47fa07fb 100644
--- a/docs/architecture/sync-algorithm.md
+++ b/docs/architecture/sync-algorithm.md
@@ -1,6 +1,6 @@
 # Sync Algorithm
 
-VaultLink uses operational transformation (OT) to handle concurrent edits and maintain consistency across clients. This document explains how the algorithm works.
+VaultLink uses operational transformation (OT) to handle concurrent edits and maintain consistency across clients.
 
 ## Operational Transformation
 
diff --git a/docs/guide/cli-client.md b/docs/guide/cli-client.md
index ebb89b18..ba132908 100644
--- a/docs/guide/cli-client.md
+++ b/docs/guide/cli-client.md
@@ -1,6 +1,6 @@
 # CLI Client
 
-The VaultLink CLI client provides standalone synchronization without requiring Obsidian. Perfect for servers, automation, backups, or syncing vaults on headless systems.
+Sync vaults without Obsidian. Works on servers, automation, backups, headless systems.
 
 ## Installation
 
diff --git a/docs/guide/getting-started.md b/docs/guide/getting-started.md
index 8282c7b1..0dc369df 100644
--- a/docs/guide/getting-started.md
+++ b/docs/guide/getting-started.md
@@ -1,48 +1,45 @@
 # Getting Started
 
-This guide will walk you through setting up VaultLink from scratch. You'll have a working sync server and connected client in under 10 minutes.
+Set up VaultLink in 5 minutes. Deploy server, connect clients, done.
 
 ## Prerequisites
 
-- Docker installed (recommended) or Rust toolchain for building from source
-- Basic familiarity with command line
-- A server or machine to host the sync server (can be localhost for testing)
+- Docker (or Rust toolchain if building from source)
+- A server (VPS, home server, or localhost for testing)
 
-## Quick Start
+## Step 1: Deploy Server
 
-### Step 1: Deploy the Sync Server
+Create `config.yml`:
 
-The fastest way to get started is with Docker:
+```yaml
+database:
+    databases_directory_path: databases
+    max_connections_per_vault: 12
+    cursor_timeout_seconds: 60
+server:
+    host: 0.0.0.0
+    port: 3000
+    max_body_size_mb: 512
+    max_clients_per_vault: 256
+    response_timeout_seconds: 60
+users:
+    user_configs:
+        - name: admin
+          token: change-this-to-secure-random-token
+          vault_access:
+              type: allow_access_to_all
+logging:
+    log_directory: logs
+    log_rotation: 7days
+```
+
+::: tip
+Generate secure token: `openssl rand -hex 32`
+:::
+
+Run server:
 
 ```bash
-# Create a directory for server data
-mkdir -p ~/vaultlink-data
-cd ~/vaultlink-data
-
-# Create a basic configuration file
-cat > config.yml << 'EOF'
-database:
-  databases_directory_path: databases
-  max_connections_per_vault: 12
-  cursor_timeout_seconds: 60
-server:
-  host: 0.0.0.0
-  port: 3000
-  max_body_size_mb: 512
-  max_clients_per_vault: 256
-  response_timeout_seconds: 60
-users:
-  user_configs:
-  - name: admin
-    token: change-this-to-a-secure-random-token
-    vault_access:
-      type: allow_access_to_all
-logging:
-  log_directory: logs
-  log_rotation: 7days
-EOF
-
-# Run the server
 docker run -d \
   --name vaultlink-server \
   --restart unless-stopped \
@@ -52,136 +49,75 @@ docker run -d \
   /app/sync_server /data/config.yml
 ```
 
-::: warning
-Change the token in `config.yml` to a secure random value before deploying to production!
-:::
+Verify: `curl http://localhost:3000/vaults/test/ping` should return `pong`
 
-Verify the server is running:
+## Step 2: Connect Client
 
-```bash
-curl http://localhost:3000/vaults/test/ping
-```
+### Obsidian Plugin
 
-You should see: `pong`
+1. Settings → Community Plugins → Browse
+2. Search "VaultLink", install, enable
+3. Configure:
+    - Server URL: `ws://localhost:3000` (or `wss://your-server.com` for SSL)
+    - Token: Your token from config.yml
+    - Vault Name: `default`
 
-### Step 2: Choose Your Client
+[Full plugin guide →](/guide/obsidian-plugin)
 
-You can connect to VaultLink using either the Obsidian plugin or the standalone CLI client.
-
-#### Option A: Obsidian Plugin
-
-1. Open Obsidian Settings → Community Plugins
-2. Browse community plugins and search for "VaultLink"
-3. Install and enable the plugin
-4. Configure the plugin:
-    - **Server URL**: `ws://localhost:3000` (or your server address)
-    - **Token**: The token from your `config.yml`
-    - **Vault Name**: `default` (or any name you choose)
-
-[Read the full Obsidian plugin guide →](/guide/obsidian-plugin)
-
-#### Option B: CLI Client
-
-Perfect for syncing vaults without Obsidian:
+### CLI Client
 
 ```bash
 docker run -d \
   --name vaultlink-cli \
   --restart unless-stopped \
-  -v /path/to/your/vault:/vault \
+  -v /path/to/vault:/vault \
   ghcr.io/schmelczer/vault-link-cli:latest \
-  -l /vault \
-  -r ws://localhost:3000 \
-  -t change-this-to-a-secure-random-token \
-  -v default
+  -l /vault -r ws://localhost:3000 -t your-token -v default
 ```
 
-Replace `/path/to/your/vault` with the directory containing your files.
+[Full CLI guide →](/guide/cli-client)
 
-[Read the full CLI client guide →](/guide/cli-client)
+## Production Setup
 
-## Next Steps
+For production:
 
-### Production Deployment
+1. **SSL/TLS**: Use Nginx/Caddy reverse proxy for `wss://` ([setup guide](/guide/server-setup#ssl-tls-with-reverse-proxy))
+2. **Secure tokens**: Generate with `openssl rand -hex 32`, don't reuse the example
+3. **Firewall**: Only expose port 3000 to reverse proxy
+4. **Backups**: SQLite databases are in `databases/` directory
 
-For production use, you should:
-
-1. **Use HTTPS/WSS**: Put the sync server behind a reverse proxy with SSL
-2. **Secure tokens**: Generate cryptographically random tokens
-3. **Configure backups**: Back up the SQLite databases regularly
-4. **Set up monitoring**: Use Docker health checks and logging
-
-[Learn about production deployment →](/guide/server-setup#production-deployment)
-
-### Multiple Users
-
-To add more users or restrict vault access:
+## Multiple Users
 
 ```yaml
 users:
     user_configs:
         - name: alice
-          token: alice-secure-token
+          token: alice-token
           vault_access:
               type: allow_list
               allowed:
                   - personal
                   - shared
         - name: bob
-          token: bob-secure-token
+          token: bob-token
           vault_access:
               type: allow_list
               allowed:
                   - shared
 ```
 
-[Learn about authentication configuration →](/config/authentication)
-
-### Advanced Configuration
-
-Explore advanced server options:
-
-- Database tuning for large vaults
-- Rate limiting and connection limits
-- Custom logging and log rotation
-- Multi-vault setups
-
-[View configuration reference →](/config/server)
-
-## Architecture Overview
-
-Want to understand how VaultLink works under the hood?
-
-[Read the architecture documentation →](/architecture/)
+[Auth docs →](/config/authentication)
 
 ## Troubleshooting
 
-### Server won't start
+**Server won't start**: `docker logs vaultlink-server`
 
-Check Docker logs:
+**Client can't connect**:
 
-```bash
-docker logs vaultlink-server
-```
+1. Verify: `curl http://your-server:3000/vaults/test/ping`
+2. Check URL: `ws://` for HTTP, `wss://` for HTTPS
+3. Verify token matches config.yml
 
-Common issues:
+**Files not syncing**: Check client logs, verify vault name matches
 
-- Port 3000 already in use: Change the port mapping `-p 3001:3000`
-- Config file errors: Validate YAML syntax
-- Permission issues: Ensure the volume mount is writable
-
-### Client can't connect
-
-1. Verify server is accessible: `curl http://your-server:3000/vaults/test/ping`
-2. Check WebSocket connectivity (browser dev tools or wscat)
-3. Verify token matches between client and server config
-4. Check firewall rules allow port 3000
-
-### Files not syncing
-
-1. Check client logs for errors
-2. Verify vault name matches on both server and client
-3. Ensure user has access to the vault (check server config)
-4. Check for file size limits (default 10MB for CLI)
-
-For more help, [open an issue on GitHub](https://github.com/schmelczer/vault-link/issues).
+[Server setup →](/guide/server-setup) | [Architecture →](/architecture/)
diff --git a/docs/guide/obsidian-plugin.md b/docs/guide/obsidian-plugin.md
index ed3989b6..c87debf5 100644
--- a/docs/guide/obsidian-plugin.md
+++ b/docs/guide/obsidian-plugin.md
@@ -1,6 +1,6 @@
 # Obsidian Plugin
 
-The VaultLink Obsidian plugin provides native real-time synchronization directly within Obsidian.
+Real-time sync for Obsidian vaults.
 
 ## Installation
 
diff --git a/docs/guide/server-setup.md b/docs/guide/server-setup.md
index 8391522b..9b39d5bc 100644
--- a/docs/guide/server-setup.md
+++ b/docs/guide/server-setup.md
@@ -1,12 +1,12 @@
 # Server Setup
 
-This guide covers deploying the VaultLink sync server in various environments, from local development to production infrastructure.
+Deploy VaultLink server via Docker, binary, or build from source.
 
 ## Deployment Options
 
 ### Docker (Recommended)
 
-Docker provides the easiest deployment path with built-in health checks and minimal dependencies.
+Easiest deployment path, includes health checks.
 
 #### Basic Docker Deployment
 
@@ -60,7 +60,7 @@ docker compose up -d
 
 ### Binary Installation
 
-Download pre-built binaries from [GitHub Releases](https://github.com/schmelczer/vault-link/releases).
+Download pre-built binaries from [GitHub Releases](https://github.com/schmelczer/vault-link/releases):
 
 ```bash
 # Download the binary for your platform
@@ -75,11 +75,7 @@ chmod +x sync_server-linux-x86_64
 
 ### Build from Source
 
-Requirements:
-
-- Rust 1.89.0 or later
-- SQLite development headers
-- SQLx CLI
+Requirements: Rust 1.89.0+, SQLite development headers, SQLx CLI
 
 ```bash
 # Clone the repository
diff --git a/docs/guide/what-is-vaultlink.md b/docs/guide/what-is-vaultlink.md
index 02e0d6cb..9bb5addb 100644
--- a/docs/guide/what-is-vaultlink.md
+++ b/docs/guide/what-is-vaultlink.md
@@ -1,125 +1,69 @@
 # What is VaultLink?
 
-VaultLink is a self-hosted real-time synchronization system for Obsidian vaults. It provides collaborative file syncing with automatic conflict resolution, designed for users who want complete control over their data.
+Self-hosted sync for Obsidian vaults with automatic conflict-free merging. Edit with any tool, collaborate in real-time, no conflict markers.
 
-## Overview
+## The Problem
 
-VaultLink consists of three main components:
+Syncing Obsidian vaults across devices or sharing with teammates sucks:
 
-### Sync Server
+- **Commercial services**: Lock-in, subscriptions, third-party access to your data
+- **Git**: Manual conflict resolution with `<<<<<<<` markers interrupting your workflow
+- **Cloud storage**: Last-write-wins data loss or manual conflict resolution
+- **CRDT solutions**: Only work if you edit inside Obsidian (break if you use Vim, VS Code, etc.)
 
-A Rust-based WebSocket server that handles:
+## VaultLink's Solution
 
-- Real-time bidirectional synchronization
-- Document versioning with SQLite
-- User authentication and vault access control
-- Operational transformation for conflict resolution
+Differential synchronization with operational transformation.
 
-### Obsidian Plugin
-
-A native Obsidian plugin that:
-
-- Integrates sync directly into your Obsidian workflow
-- Provides real-time updates as you edit
-- Handles file watching and automatic synchronization
-- Works across desktop and mobile platforms
-
-### CLI Client
-
-A standalone synchronization client that:
-
-- Syncs vaults without requiring Obsidian
-- Perfect for servers, automation, or backup systems
-- Provides file watching and bidirectional sync
-- Runs in Docker or as a standalone binary
-
-## Key Features
-
-### Real-Time Synchronization
-
-Changes are synchronized immediately via WebSocket connections. When multiple users edit the same file, operational transformation ensures all edits are preserved without conflicts.
-
-### Self-Hosted Architecture
-
-Run the sync server on your own infrastructure:
-
-- Full control over data storage and access
-- No dependency on third-party services
-- Configurable authentication and authorization
-- Deploy anywhere: cloud VPS, home server, or localhost
-
-### Operational Transformation
-
-VaultLink uses the `reconcile-text` library for intelligent conflict resolution:
-
-- Simultaneous edits are automatically merged
-- No manual conflict resolution required
-- Preserves intent of all contributors
-- Works seamlessly in the background
-
-### Flexible Authentication
-
-Configure user access per vault:
-
-- Token-based authentication
-- Per-user vault access control
-- Allow-list or deny-list patterns
-- Support for multiple users and vaults
-
-## Use Cases
-
-### Personal Sync
-
-Synchronize your Obsidian vault across multiple devices:
-
-- Laptop, desktop, and mobile in real-time
-- No cloud service subscription required
-- Full privacy and data control
-
-### Team Collaboration
-
-Share knowledge bases with teammates:
-
-- Real-time collaborative editing
-- Granular access control per vault
-- Self-hosted for enterprise security requirements
-
-### Automated Backups
-
-Use the CLI client for automated workflows:
-
-- Scheduled backups to remote servers
-- Integration with existing backup systems
-- Headless operation without Obsidian
-
-### Development & Testing
-
-Synchronize documentation across environments:
-
-- Keep docs in sync with development environments
-- Automated deployment of documentation
-- Version control integration
+Edit files with Obsidian, Vim, VS Code, or any editor. VaultLink compares versions and automatically merges all changes. No operation tracking required, no conflict markers, no data loss.
 
 ## How It Works
 
-1. **Server Setup**: Deploy the sync server on your infrastructure
-2. **Authentication**: Configure users and vault access in `config.yml`
-3. **Client Connection**: Connect via Obsidian plugin or CLI client
-4. **Initial Sync**: Client uploads local files to server
-5. **Real-Time Updates**: Changes sync bidirectionally via WebSocket
-6. **Conflict Resolution**: Operational transformation handles simultaneous edits
+1. **Server**: Rust WebSocket server with SQLite stores document versions
+2. **Clients**: Obsidian plugin or CLI client watches filesystem changes
+3. **Sync**: Changes upload to server, server broadcasts to other clients
+4. **Merge**: [reconcile-text](https://schmelczer.dev/reconcile) automatically merges concurrent edits
 
-## Technology Stack
+No CRDT infrastructure. No operation logs. Just file comparison and smart merging.
 
-- **Server**: Rust with Axum framework, SQLite database, WebSocket protocol
-- **Frontend**: TypeScript with WebSocket client, npm workspaces
-- **Sync Algorithm**: reconcile-text operational transformation library
-- **Deployment**: Docker images, binary releases, or source builds
+## Key Advantages
+
+**Editor agnostic**: Edit files with any tool. Other solutions break when you edit outside their ecosystem.
+
+**Self-hosted**: Your data, your server. No third parties, no subscriptions, no surprises.
+
+**Automatic merging**: Operational transformation handles conflicts without interrupting your workflow.
+
+**Production-ready**: Comprehensive tests, E2E tests, battle-tested. Many alternatives have zero tests.
+
+**Collaborative**: Real-time sync with cursor tracking. See where teammates are editing.
+
+## Not Tied to Obsidian
+
+VaultLink syncs Markdown files. Use it for:
+
+- Obsidian vaults (Obsidian desktop + mobile + CLI)
+- Technical documentation (VS Code, your-editor, CLI)
+- Academic writing (multiple Markdown editors)
+- Automated workflows (CLI client for backups/CI/CD)
+
+The Obsidian plugin is just a convenience wrapper around the sync client.
+
+## Quick Comparison
+
+| Feature             | VaultLink | Git | Cloud Sync | CRDT Solutions |
+| ------------------- | --------- | --- | ---------- | -------------- |
+| Self-hosted         | ✅        | ✅  | ❌         | Varies         |
+| Any editor          | ✅        | ✅  | ✅         | ❌             |
+| No conflict markers | ✅        | ❌  | ❌         | ✅             |
+| Real-time           | ✅        | ❌  | ❌         | ✅             |
+| No subscriptions    | ✅        | ✅  | ❌         | Varies         |
+| Comprehensive tests | ✅        | N/A | N/A        | ❌             |
+
+[Detailed comparison with alternatives →](/guide/alternatives)
 
 ## Next Steps
 
-Ready to get started?
-
-- [Getting Started Guide →](/guide/getting-started)
-- [Server Setup →](/guide/server-setup)
-- [Architecture Overview →](/architecture/)
+- [Get started →](/guide/getting-started) (5 minute setup)
+- [See the architecture →](/architecture/) (understand how it works)
+- [Compare alternatives →](/guide/alternatives) (why VaultLink vs others)
diff --git a/docs/index.md b/docs/index.md
index 569e692c..705dd1b9 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -3,8 +3,8 @@ layout: home
 
 hero:
     name: VaultLink
-    text: Self-Hosted Sync for Obsidian
-    tagline: Real-time collaborative file synchronization for your knowledge base
+    text: Self-Hosted Obsidian Sync
+    tagline: Edit with any tool. Automatic conflict-free merging. Your infrastructure.
     image:
         src: /logo.svg
         alt: VaultLink
@@ -13,60 +13,43 @@ hero:
           text: Get Started
           link: /guide/getting-started
         - theme: alt
-          text: View on GitHub
-          link: https://github.com/schmelczer/vault-link
+          text: Why VaultLink?
+          link: /guide/what-is-vaultlink
 
 features:
-    - icon: 🚀
-      title: Real-Time Synchronization
-      details: Operational transformation-based conflict resolution ensures your files stay in sync across devices without data loss
-    - icon: 🔒
-      title: Self-Hosted & Private
-      details: Run your own sync server. Your data stays on your infrastructure with full control over access and privacy
-    - icon: 🎯
-      title: Obsidian Plugin
-      details: Native integration with Obsidian for seamless synchronization directly within your favorite note-taking app
-    - icon: 🖥️
-      title: CLI Client
-      details: Sync vaults to any system using the standalone CLI client. Perfect for servers, automation, or headless setups
-    - icon: ⚡
-      title: Built for Performance
-      details: Rust-powered WebSocket server with SQLite backend delivers blazing-fast sync performance
-    - icon: 🛠️
-      title: Flexible Deployment
-      details: Deploy via Docker, binary releases, or build from source. Configure authentication and access controls to fit your needs
+    - title: Edit Anywhere
+      details: Use Obsidian, Vim, VS Code, or any editor. VaultLink syncs files, not keystrokes—edit however you want
+    - title: Your Data, Your Server
+      details: Fully self-hosted. No third parties, no subscriptions, no data mining. Single Docker container or binary
+    - title: No Conflict Markers
+      details: Automatic merge using operational transformation. Never see conflict markers in your notes again
+    - title: Real-Time Collaboration
+      details: See teammate cursors, merge edits instantly. Rust-powered WebSocket server with SQLite
+    - title: Open Source Everything
+      details: MIT licensed. Server, clients, and sync algorithm are all open source. No proprietary components
+    - title: Battle-Tested
+      details: Comprehensive test suite. E2E tests. Used in production. Unlike alternatives with zero tests
 ---
 
+## Why Self-Host?
+
+**You own your knowledge base.** Commercial sync services can disappear, change pricing, or lock you out. VaultLink runs on your infrastructure—VPS, home server, or localhost.
+
+**Edit with any tool.** Other solutions require CRDT-aware editors or break when you edit outside Obsidian. VaultLink uses differential sync: edit files however you want, sync handles the rest.
+
+**No conflict markers.** Git forces manual merging. Other tools use last-write-wins. VaultLink's operational transformation automatically merges all changes without data loss or workflow interruption.
+
+[See how VaultLink compares to alternatives →](/guide/alternatives)
+
 ## Quick Start
 
-Deploy the sync server:
+Deploy server (single command):
 
 ```bash
-docker run -d \
-  -p 3000:3000 \
-  -v $(pwd)/data:/data \
-  ghcr.io/schmelczer/vault-link-server:latest \
-  /app/sync_server config.yml
+docker run -d -p 3000:3000 -v $(pwd)/data:/data \
+  ghcr.io/schmelczer/vault-link-server:latest
 ```
 
-Install the Obsidian plugin or use the CLI client:
+Then install the [Obsidian plugin](/guide/obsidian-plugin) or [CLI client](/guide/cli-client).
 
-```bash
-docker run -v /path/to/vault:/vault \
-  ghcr.io/schmelczer/vault-link-cli:latest \
-  -l /vault -r wss://your-server.com -t your-token -v default
-```
-
-[Learn more →](/guide/getting-started)
-
-## Why VaultLink?
-
-VaultLink provides a complete self-hosted synchronization solution for Obsidian:
-
-- **No third-party services**: Your data never leaves your infrastructure
-- **Operational transformation**: Smart conflict resolution that preserves all changes
-- **Multi-platform**: Works with Obsidian plugin or standalone CLI on any system
-- **Production-ready**: Docker images, health checks, and comprehensive logging
-- **Open source**: MIT licensed with active development
-
-[Read the architecture overview →](/architecture/)
+[Full setup guide →](/guide/getting-started)

From fbf03c41e004d342aede51487646b22dc820c668 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Nov 2025 12:38:34 +0000
Subject: [PATCH 622/761] Refactor plugin setup and avoid dangling resources

---
 .../obsidian-plugin/src/vault-link-plugin.ts  | 244 ++++++++++--------
 .../editor-status-display-manager.ts          |   2 +-
 .../src/views/history/history-view.ts         |   6 +
 3 files changed, 139 insertions(+), 113 deletions(-)

diff --git a/frontend/obsidian-plugin/src/vault-link-plugin.ts b/frontend/obsidian-plugin/src/vault-link-plugin.ts
index fc16aae2..e6373789 100644
--- a/frontend/obsidian-plugin/src/vault-link-plugin.ts
+++ b/frontend/obsidian-plugin/src/vault-link-plugin.ts
@@ -5,7 +5,7 @@ import type {
 	TAbstractFile,
 	WorkspaceLeaf
 } from "obsidian";
-import { Platform, Plugin, TFile } from "obsidian";
+import { Notice, Platform, Plugin, TFile } from "obsidian";
 import "../manifest.json";
 import { HistoryView } from "./views/history/history-view";
 import { StatusBar } from "./views/status-bar/status-bar";
@@ -30,124 +30,46 @@ import { LocalCursorUpdateListener } from "./views/cursors/local-cursor-update-l
 import { renderCursorsInFileExplorer } from "./views/cursors/file-explorer";
 
 const MIN_WAIT_BETWEEN_UPDATES_IN_MS = 250;
+const IS_DEBUG_BUILD = process.env.NODE_ENV === "development";
 
 export default class VaultLinkPlugin extends Plugin {
-	private readonly disposables: (() => unknown)[] = [];
-
-	private settingsTab: SyncSettingsTab | undefined;
-	private client!: SyncClient;
 	private readonly rateLimitedUpdatesPerFile = new Map<
 		string,
 		() => Promise<unknown>
 	>();
 
+	private syncClient: SyncClient | undefined;
+	private settingsTab: SyncSettingsTab | undefined;
+
 	public async onload(): Promise<void> {
-		DEFAULT_SETTINGS.ignorePatterns.push(
-			".obsidian/**",
-			".git/**",
-			".trash/**"
-		);
-
-		const isDebugBuild = process.env.NODE_ENV === "development";
-		const debugOptions = isDebugBuild
-			? {
-					fetch: debugging.slowFetchFactory(1),
-					webSocket: debugging.slowWebSocketFactory(1, new Logger())
-				}
-			: {};
-
-		this.client = await SyncClient.create({
-			fs: new ObsidianFileSystemOperations(
-				this.app.vault,
-				this.app.workspace
-			),
-			persistence: {
-				load: this.loadData.bind(this),
-				save: this.saveData.bind(this)
-			},
-			nativeLineEndings: Platform.isWin ? "\r\n" : "\n",
-			...debugOptions
-		});
-
-		if (isDebugBuild) {
-			debugging.logToConsole(this.client);
-		}
-
-		const statusDescription = new StatusDescription(this.client);
-
-		this.settingsTab = new SyncSettingsTab({
-			app: this.app,
-			plugin: this,
-			syncClient: this.client,
-			statusDescription
-		});
-		this.addSettingTab(this.settingsTab);
-
-		new StatusBar(this, this.client);
-
-		this.registerView(
-			HistoryView.TYPE,
-			(leaf) => new HistoryView(this.client, leaf)
-		);
-
-		this.registerView(
-			LogsView.TYPE,
-			(leaf) => new LogsView(this.client, leaf)
-		);
-
-		this.registerEditorExtension([remoteCursorsTheme, remoteCursorsPlugin]);
-
-		this.client.addRemoteCursorsUpdateListener((cursors) => {
-			RemoteCursorsPluginValue.setCursors(cursors, this.app);
-			renderCursorsInFileExplorer(cursors, this.app);
-		});
-
-		const cursorListener = new LocalCursorUpdateListener(
-			this.client,
-			this.app.workspace
-		);
-		this.disposables.push(() => {
-			cursorListener.dispose();
-		});
-
-		this.app.workspace.updateOptions();
-
-		this.addRibbonIcon(
-			HistoryView.ICON,
-			"Open VaultLink events",
-			async (_: MouseEvent) => this.activateView(HistoryView.TYPE)
-		);
-
-		this.addRibbonIcon(
-			LogsView.ICON,
-			"Open VaultLink logs",
-			async (_: MouseEvent) => this.activateView(LogsView.TYPE)
-		);
-
 		this.app.workspace.onLayoutReady(async () => {
-			this.registerEditorEvents();
-			await this.client.start();
+			const client = await this.createSyncClient();
 
-			const editorStatusDisplayManager = new EditorStatusDisplayManager(
-				this,
-				this.app.workspace,
-				this.client
-			);
-			this.disposables.push(() => {
-				editorStatusDisplayManager.stop();
-			});
+			this.registerObsidianExtensions(client);
+
+			this.registerEditorEvents(client);
+
+			this.register(() => client.destroy());
+			await client.start();
 		});
 	}
 
-	public onunload(): void {
-		this.client.waitAndStop().catch((err: unknown) => {
-			this.client.logger.error(
-				`Error while stopping the sync client: ${err}`
+	public onUserEnable(): void {
+		new Notice(
+			"VaultLink has been enabled, check out the docs for tips on getting started!"
+		);
+		this.activateView(LogsView.TYPE);
+		this.activateView(HistoryView.TYPE);
+		this.openSettings();
+	}
+
+	public onExternalSettingsChange(): void {
+		new Notice("VaultLink settings have changed externally, applying...");
+		this.syncClient?.reloadSettings().catch((err: unknown) => {
+			throw new Error(
+				`Error while reloading settings after external change: ${err}`
 			);
 		});
-		this.disposables.forEach((disposable) => {
-			disposable();
-		});
 	}
 
 	public openSettings(): void {
@@ -180,7 +102,102 @@ export default class VaultLinkPlugin extends Plugin {
 		}
 	}
 
-	private registerEditorEvents(): void {
+	private async createSyncClient(): Promise<SyncClient> {
+		DEFAULT_SETTINGS.ignorePatterns.push(
+			".obsidian/**",
+			".git/**",
+			".trash/**"
+		);
+
+		const client = await SyncClient.create({
+			fs: new ObsidianFileSystemOperations(
+				this.app.vault,
+				this.app.workspace
+			),
+			persistence: {
+				load: this.loadData.bind(this),
+				save: this.saveData.bind(this)
+			},
+			nativeLineEndings: Platform.isWin ? "\r\n" : "\n",
+			...(IS_DEBUG_BUILD
+				? {
+						fetch: debugging.slowFetchFactory(1),
+						webSocket: debugging.slowWebSocketFactory(
+							1,
+							new Logger()
+						)
+					}
+				: {})
+		});
+
+		if (IS_DEBUG_BUILD) {
+			debugging.logToConsole(client);
+		}
+
+		return client;
+	}
+
+	private registerObsidianExtensions(client: SyncClient): void {
+		const statusDescription = new StatusDescription(client);
+
+		this.settingsTab = new SyncSettingsTab({
+			app: this.app,
+			plugin: this,
+			syncClient: client,
+			statusDescription
+		});
+		this.addSettingTab(this.settingsTab);
+
+		new StatusBar(this, client);
+
+		this.registerView(HistoryView.TYPE, (leaf) => {
+			const view = new HistoryView(client, leaf);
+			this.register(() => view.onClose());
+			return view;
+		});
+
+		this.registerView(LogsView.TYPE, (leaf) => new LogsView(client, leaf));
+
+		this.registerEditorExtension([remoteCursorsTheme, remoteCursorsPlugin]);
+
+		client.addRemoteCursorsUpdateListener((cursors) => {
+			RemoteCursorsPluginValue.setCursors(cursors, this.app);
+			renderCursorsInFileExplorer(cursors, this.app);
+		});
+
+		const cursorListener = new LocalCursorUpdateListener(
+			client,
+			this.app.workspace
+		);
+		this.register(() => cursorListener.dispose);
+
+		this.app.workspace.updateOptions();
+
+		this.addRibbonIcons();
+
+		const editorStatusDisplayManager = new EditorStatusDisplayManager(
+			this,
+			this.app.workspace,
+			client
+		);
+		this.register(() => editorStatusDisplayManager.dispose());
+	}
+
+	private addRibbonIcons(): void {
+		this.addRibbonIcon(
+			HistoryView.ICON,
+			"Open VaultLink events",
+			async (_: MouseEvent) => this.activateView(HistoryView.TYPE)
+		);
+
+		this.addRibbonIcon(
+			LogsView.ICON,
+			"Open VaultLink logs",
+			async (_: MouseEvent) => this.activateView(LogsView.TYPE)
+		);
+	}
+
+	private registerEditorEvents(client: SyncClient): void {
 		[
 			this.app.workspace.on(
 				"editor-change",
@@ -190,28 +207,28 @@ export default class VaultLinkPlugin extends Plugin {
 				) => {
 					const { file } = info;
 					if (file) {
-						await this.rateLimitedUpdate(file.path);
+						await this.rateLimitedUpdate(file.path, client);
 					}
 				}
 			),
 			this.app.vault.on("create", async (file: TAbstractFile) => {
 				if (file instanceof TFile) {
-					await this.client.syncLocallyCreatedFile(file.path);
+					await client.syncLocallyCreatedFile(file.path);
 				}
 			}),
 			this.app.vault.on("modify", async (file: TAbstractFile) => {
 				if (file instanceof TFile) {
-					await this.rateLimitedUpdate(file.path);
+					await this.rateLimitedUpdate(file.path, client);
 				}
 			}),
 			this.app.vault.on("delete", async (file: TAbstractFile) => {
-				await this.client.syncLocallyDeletedFile(file.path);
+				await client.syncLocallyDeletedFile(file.path);
 			}),
 			this.app.vault.on(
 				"rename",
 				async (file: TAbstractFile, oldPath: string) => {
 					if (file instanceof TFile) {
-						await this.client.syncLocallyUpdatedFile({
+						await client.syncLocallyUpdatedFile({
 							oldPath,
 							relativePath: file.path
 						});
@@ -223,13 +240,16 @@ export default class VaultLinkPlugin extends Plugin {
 		});
 	}
 
-	private async rateLimitedUpdate(path: string): Promise<void> {
+	private async rateLimitedUpdate(
+		path: string,
+		client: SyncClient
+	): Promise<void> {
 		if (!this.rateLimitedUpdatesPerFile.has(path)) {
 			this.rateLimitedUpdatesPerFile.set(
 				path,
 				rateLimit(
 					async () =>
-						this.client.syncLocallyUpdatedFile({
+						client.syncLocallyUpdatedFile({
 							relativePath: path
 						}),
 					MIN_WAIT_BETWEEN_UPDATES_IN_MS
diff --git a/frontend/obsidian-plugin/src/views/editor-status-display-manager/editor-status-display-manager.ts b/frontend/obsidian-plugin/src/views/editor-status-display-manager/editor-status-display-manager.ts
index 5075b847..0725c1ea 100644
--- a/frontend/obsidian-plugin/src/views/editor-status-display-manager/editor-status-display-manager.ts
+++ b/frontend/obsidian-plugin/src/views/editor-status-display-manager/editor-status-display-manager.ts
@@ -22,7 +22,7 @@ export class EditorStatusDisplayManager {
 		}, EditorStatusDisplayManager.UPDATE_INTERVAL_IN_MS);
 	}
 
-	public stop(): void {
+	public dispose(): void {
 		clearInterval(this.intervalId);
 	}
 
diff --git a/frontend/obsidian-plugin/src/views/history/history-view.ts b/frontend/obsidian-plugin/src/views/history/history-view.ts
index 631fde72..1094e575 100644
--- a/frontend/obsidian-plugin/src/views/history/history-view.ts
+++ b/frontend/obsidian-plugin/src/views/history/history-view.ts
@@ -108,6 +108,7 @@ export class HistoryView extends ItemView {
 		this.historyContainer = container.createDiv({ cls: "logs-container" });
 
 		await this.updateView();
+		this.clearTimer();
 		this.timer = setInterval(
 			() =>
 				void this.updateView().catch((error: unknown) => {
@@ -120,8 +121,13 @@ export class HistoryView extends ItemView {
 	}
 
 	public async onClose(): Promise<void> {
+		this.clearTimer();
+	}
+
+	private clearTimer(): void {
 		if (this.timer) {
 			clearInterval(this.timer);
+			this.timer = null;
 		}
 	}
 

From 1b1b72cb926635ed40b89e42d2cde1ad922c6fa6 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Nov 2025 12:40:18 +0000
Subject: [PATCH 623/761] Configure dependabot for docs

---
 .github/dependabot.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index b445fda5..7d56669b 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -6,7 +6,7 @@
 version: 2
 updates:
   - package-ecosystem: "npm"
-    directories: ["/frontend"]
+    directories: ["/frontend", "/docs"]
     schedule:
       interval: "daily"
 

From aaeca588fb959281b8e4cb7b518a63fbcd097877 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Nov 2025 12:42:16 +0000
Subject: [PATCH 624/761] Enforce british english

---
 .github/workflows/deploy-docs.yml   |  5 ++
 docs/.cspell.json                   | 92 +++++++++++++++++++++++++++++
 docs/.vitepress/config.mts          |  2 +-
 docs/README.md                      | 16 ++++-
 docs/architecture/data-flow.md      |  2 +-
 docs/architecture/index.md          |  6 +-
 docs/architecture/sync-algorithm.md | 14 ++---
 docs/config/advanced.md             | 10 ++--
 docs/guide/alternatives.md          | 16 ++---
 docs/guide/cli-client.md            |  2 +-
 docs/guide/obsidian-plugin.md       |  4 +-
 docs/guide/server-setup.md          |  2 +-
 docs/guide/what-is-vaultlink.md     |  2 +-
 docs/package.json                   |  6 +-
 14 files changed, 147 insertions(+), 32 deletions(-)
 create mode 100644 docs/.cspell.json

diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml
index 49829998..e1c3bcf8 100644
--- a/.github/workflows/deploy-docs.yml
+++ b/.github/workflows/deploy-docs.yml
@@ -47,6 +47,11 @@ jobs:
           cd docs
           npm run format:check
 
+      - name: Check spelling
+        run: |
+          cd docs
+          npm run spell:check
+
       - name: Build documentation
         run: |
           cd docs
diff --git a/docs/.cspell.json b/docs/.cspell.json
new file mode 100644
index 00000000..4967ec16
--- /dev/null
+++ b/docs/.cspell.json
@@ -0,0 +1,92 @@
+{
+    "version": "0.2",
+    "language": "en-GB",
+    "dictionaries": ["en-gb"],
+    "ignorePaths": [
+        "node_modules",
+        ".vitepress/dist",
+        ".vitepress/cache",
+        "package-lock.json"
+    ],
+    "words": [
+        "VaultLink",
+        "Obsidian",
+        "WebSocket",
+        "SQLite",
+        "codebase",
+        "CRDT",
+        "CRDTs",
+        "YAML",
+        "nginx",
+        "Caddy",
+        "Traefik",
+        "systemd",
+        "localhost",
+        "vaultlink",
+        "Axum",
+        "Tokio",
+        "SQLx",
+        "reconcile",
+        "postgresql",
+        "VitePress",
+        "markdownlint",
+        "filesystem",
+        "backend",
+        "frontend",
+        "macOS",
+        "CLI",
+        "API",
+        "JSON",
+        "HTTP",
+        "HTTPS",
+        "SSL",
+        "TLS",
+        "WSS",
+        "TCP",
+        "VPS",
+        "Docker",
+        "Github",
+        "Dockerfile",
+        "dockerignore",
+        "Rustup",
+        "PostgreSQL",
+        "UUID",
+        "CORS",
+        "HSTS",
+        "CI",
+        "CD",
+        "OpenSSL",
+        "README",
+        "config",
+        "submodule",
+        "repo",
+        "autocomplete",
+        "autoformat",
+        "dedupe",
+        "diff",
+        "grep",
+        "stdout",
+        "stderr",
+        "chmod",
+        "mkdir",
+        "rclone",
+        "uuidgen",
+        "letsencrypt",
+        "fullchain",
+        "privkey",
+        "schmelczer",
+        "Schmelczer",
+        "ghcr",
+        "keepalive",
+        "healthcheck",
+        "writable",
+        "Cloudant",
+        "Syncthing",
+        "cadvisor",
+        "Caddyfile",
+        "nodelay",
+        "websecure",
+        "certresolver",
+        "rootfs"
+    ]
+}
diff --git a/docs/.vitepress/config.mts b/docs/.vitepress/config.mts
index d901bfde..64d77100 100644
--- a/docs/.vitepress/config.mts
+++ b/docs/.vitepress/config.mts
@@ -2,7 +2,7 @@ import { defineConfig } from "vitepress"
 
 export default defineConfig({
 	title: "VaultLink",
-	description: "Self-hosted real-time synchronization for Obsidian",
+	description: "Self-hosted real-time synchronisation for Obsidian",
 	base: "/vault-link/",
 	themeConfig: {
 		logo: "/logo.svg",
diff --git a/docs/README.md b/docs/README.md
index 7a9f4522..bfeb0ee7 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -58,6 +58,16 @@ Check formatting without making changes:
 npm run format:check
 ```
 
+### Spell Check
+
+Check spelling (British English):
+
+```bash
+npm run spell
+```
+
+The spell checker enforces British English spellings (e.g., "synchronisation", "optimise", "behaviour").
+
 ## Deployment
 
 The documentation is automatically deployed to GitHub Pages when changes are pushed to the `main` branch.
@@ -92,11 +102,15 @@ docs/
 
 ## Writing Documentation
 
+### Language
+
+All documentation uses **British English**. The spell checker enforces this in CI.
+
 ### Markdown Features
 
 VitePress supports:
 
-- GitHub Flavored Markdown
+- GitHub Flavoured Markdown
 - Custom containers (tip, warning, danger)
 - Code syntax highlighting
 - Mermaid diagrams
diff --git a/docs/architecture/data-flow.md b/docs/architecture/data-flow.md
index d11977b8..5b256f1d 100644
--- a/docs/architecture/data-flow.md
+++ b/docs/architecture/data-flow.md
@@ -33,7 +33,7 @@ sequenceDiagram
 
 ### 2. Initial Sync
 
-After authentication, the client performs initial synchronization:
+After authentication, the client performs initial synchronisation:
 
 ```mermaid
 sequenceDiagram
diff --git a/docs/architecture/index.md b/docs/architecture/index.md
index f210b3e1..5d4c6d73 100644
--- a/docs/architecture/index.md
+++ b/docs/architecture/index.md
@@ -40,7 +40,7 @@ Central sync server with multiple clients. High-level architecture and design de
 
 ### Sync Server
 
-Central authority for synchronization. Rust + Axum framework.
+Central authority for synchronisation. Rust + Axum framework.
 
 **Responsibilities**:
 
@@ -213,7 +213,7 @@ Clients maintain sync metadata:
 └── cache/              # Optional local cache
 ```
 
-The `.vaultlink` directory tracks which files have been synced and their versions to enable efficient synchronization.
+The `.vaultlink` directory tracks which files have been synced and their versions to enable efficient synchronisation.
 
 ## Communication Protocol
 
@@ -279,7 +279,7 @@ Token-based authentication on connection:
 
 - **Small vaults** (< 1000 files): Excellent performance
 - **Medium vaults** (1000-10000 files): Good performance with tuning
-- **Large vaults** (> 10000 files): May require optimization
+- **Large vaults** (> 10000 files): May require optimisation
 - **Concurrent users**: Tested with dozens of simultaneous clients per vault
 
 ## Security Model
diff --git a/docs/architecture/sync-algorithm.md b/docs/architecture/sync-algorithm.md
index 47fa07fb..eb55e9a4 100644
--- a/docs/architecture/sync-algorithm.md
+++ b/docs/architecture/sync-algorithm.md
@@ -19,7 +19,7 @@ Operational transformation:
 - **Automatic**: No user intervention required
 - **Preserves all edits**: No data loss
 - **Real-time**: Changes appear immediately
-- **Intuitive**: Behavior matches user expectations
+- **Intuitive**: Behaviour matches user expectations
 
 ## The reconcile-text Library
 
@@ -27,7 +27,7 @@ VaultLink uses the [`reconcile-text`](https://crates.io/crates/reconcile-text) R
 
 ### Why reconcile-text over CRDTs?
 
-VaultLink faces a **differential synchronization** challenge: users edit Obsidian vaults with various editors (Obsidian desktop, Obsidian mobile, Vim, VS Code, or any text editor), often while offline. This means we only observe the **final state** of each document after editing, not the individual keystrokes or operations that produced it.
+VaultLink faces a **differential synchronisation** challenge: users edit Obsidian vaults with various editors (Obsidian desktop, Obsidian mobile, Vim, VS Code, or any text editor), often while offline. This means we only observe the **final state** of each document after editing, not the individual keystrokes or operations that produced it.
 
 **The fundamental problem**:
 
@@ -50,9 +50,9 @@ VaultLink faces a **differential synchronization** challenge: users edit Obsidia
 
 6. **Simpler infrastructure**: No need for complex operation capture, transformation logs, or tombstone management that CRDTs require
 
-**The tradeoff**:
+**The trade-off**:
 
-CRDTs excel when you control the entire editing infrastructure and can capture every operation. reconcile-text excels when you're synchronizing independently-edited files—exactly VaultLink's scenario. The merge quality depends on Myers' diff algorithm rather than operation history, which is the correct tradeoff for differential sync.
+CRDTs excel when you control the entire editing infrastructure and can capture every operation. reconcile-text excels when you're synchronising independently-edited files—exactly VaultLink's scenario. The merge quality depends on Myers' diff algorithm rather than operation history, which is the correct trade-off for differential sync.
 
 For note-taking workflows where users value editor freedom and offline editing, this approach provides superior user experience compared to either CRDTs (which would require operation tracking) or Git-style merging (which requires manual conflict resolution).
 
@@ -253,9 +253,9 @@ Result: "Line 1\nLine 2 modified\nLine 3"
 - **Cursors**: O(clients × vaults)
 - **Active operations**: Minimal (processed in real-time)
 
-### Optimization
+### Optimisation
 
-VaultLink optimizes for:
+VaultLink optimises for:
 
 - Small, frequent edits (typical typing patterns)
 - Text documents (not binary files)
@@ -404,7 +404,7 @@ fn transform(op_a: Operation, op_b: Operation) -> (Operation, Operation) {
 1. **Small edits**: Make small, focused changes for easier merging
 2. **Coordinate major changes**: Discuss large refactors with team
 3. **Monitor sync status**: Ensure changes are uploaded before signing off
-4. **Test conflict resolution**: Verify behavior matches expectations
+4. **Test conflict resolution**: Verify behaviour matches expectations
 
 ### For Developers
 
diff --git a/docs/config/advanced.md b/docs/config/advanced.md
index 4e129a04..72052d50 100644
--- a/docs/config/advanced.md
+++ b/docs/config/advanced.md
@@ -1,12 +1,12 @@
 # Advanced Configuration
 
-Advanced topics for optimizing and customizing your VaultLink deployment.
+Advanced topics for optimising and customising your VaultLink deployment.
 
-## Database Optimization
+## Database Optimisation
 
 ### SQLite Tuning
 
-While VaultLink handles most SQLite configuration automatically, you can optimize for specific workloads.
+While VaultLink handles most SQLite configuration automatically, you can optimise for specific workloads.
 
 #### WAL Mode
 
@@ -36,7 +36,7 @@ du -h databases/*.db
 # Vacuum to reclaim space (offline only)
 sqlite3 databases/vault.db "VACUUM;"
 
-# Analyze for query optimization
+# Analyse for query optimisation
 sqlite3 databases/vault.db "ANALYZE;"
 ```
 
@@ -47,7 +47,7 @@ sqlite3 databases/vault.db "ANALYZE;"
 # monthly-maintenance.sh
 
 for db in databases/*.db; do
-    echo "Optimizing $db"
+    echo "Optimising $db"
     sqlite3 "$db" "PRAGMA optimize;"
     sqlite3 "$db" "PRAGMA wal_checkpoint(TRUNCATE);"
 done
diff --git a/docs/guide/alternatives.md b/docs/guide/alternatives.md
index 5e9b8977..7f314127 100644
--- a/docs/guide/alternatives.md
+++ b/docs/guide/alternatives.md
@@ -1,10 +1,10 @@
 # Comparison with Alternatives
 
-VaultLink is one of several solutions for synchronizing Obsidian vaults. This page compares VaultLink with popular alternatives to help you choose the right tool.
+VaultLink is one of several solutions for synchronising Obsidian vaults. This page compares VaultLink with popular alternatives to help you choose the right tool.
 
 ## Key Differentiator: Editor Agnostic
 
-**VaultLink is not tied to Obsidian.** While it includes an Obsidian plugin for convenience, VaultLink synchronizes plain text files and works with any editor:
+**VaultLink is not tied to Obsidian.** While it includes an Obsidian plugin for convenience, VaultLink synchronises plain text files and works with any editor:
 
 - Edit with **Obsidian desktop** on your laptop
 - Edit with **Vim** on your server
@@ -12,7 +12,7 @@ VaultLink is one of several solutions for synchronizing Obsidian vaults. This pa
 - Edit with **Obsidian mobile** on your phone
 - Use the **CLI client** for automated workflows
 
-All changes merge automatically without conflict markers, regardless of which editor you use. This is possible because VaultLink uses [reconcile-text](/architecture/sync-algorithm#why-reconcile-text-over-crdts) for differential synchronization rather than requiring operation-level tracking.
+All changes merge automatically without conflict markers, regardless of which editor you use. This is possible because VaultLink uses [reconcile-text](/architecture/sync-algorithm#why-reconcile-text-over-crdts) for differential synchronisation rather than requiring operation-level tracking.
 
 ## VaultLink's Core Strengths
 
@@ -136,7 +136,7 @@ Before diving into comparisons:
 **Downloads**: ~1.4M
 **Repository**: https://github.com/denolehov/obsidian-git
 
-**Overview**: Uses Git for version control and synchronization.
+**Overview**: Uses Git for version control and synchronisation.
 
 | Aspect                    | Obsidian Git                  | VaultLink               |
 | ------------------------- | ----------------------------- | ----------------------- |
@@ -173,7 +173,7 @@ Before diving into comparisons:
 **Downloads**: ~22,600
 **Repository**: https://github.com/LBF38/obsidian-syncthing-integration
 
-**Overview**: Wrapper around Syncthing for file synchronization.
+**Overview**: Wrapper around Syncthing for file synchronisation.
 
 | Aspect                    | Syncthing Integration          | VaultLink         |
 | ------------------------- | ------------------------------ | ----------------- |
@@ -228,7 +228,7 @@ Before diving into comparisons:
 **Downloads**: ~5,000
 **Repository**: https://github.com/alex-donnan/SyncFTP
 
-**Overview**: Simple FTP-based file synchronization.
+**Overview**: Simple FTP-based file synchronisation.
 
 | Aspect                    | SyncFTP                | VaultLink        |
 | ------------------------- | ---------------------- | ---------------- |
@@ -239,7 +239,7 @@ Before diving into comparisons:
 
 **When to use SyncFTP**: Don't use SyncFTP for any scenario where data integrity matters.
 
-**When to use VaultLink**: Any scenario requiring reliable synchronization.
+**When to use VaultLink**: Any scenario requiring reliable synchronisation.
 
 ---
 
@@ -270,7 +270,7 @@ VaultLink is the **only** solution that combines:
 2. **Editor agnostic** operation (not locked to Obsidian)
 3. **Automatic conflict-free merging** using operational transformation
 4. **Real-time collaborative editing** with cursor tracking
-5. **Differential synchronization** supporting out-of-band edits
+5. **Differential synchronisation** supporting out-of-band edits
 6. **Comprehensive test coverage** ensuring reliability
 7. **Simple deployment** via Docker or single binary
 
diff --git a/docs/guide/cli-client.md b/docs/guide/cli-client.md
index ba132908..eeb11131 100644
--- a/docs/guide/cli-client.md
+++ b/docs/guide/cli-client.md
@@ -195,7 +195,7 @@ vaultlink \
 
 ### Long-Running Sync
 
-Run as a daemon for continuous synchronization:
+Run as a daemon for continuous synchronisation:
 
 ```bash
 docker run -d \
diff --git a/docs/guide/obsidian-plugin.md b/docs/guide/obsidian-plugin.md
index c87debf5..5b63e43d 100644
--- a/docs/guide/obsidian-plugin.md
+++ b/docs/guide/obsidian-plugin.md
@@ -96,7 +96,7 @@ When first connecting:
 1. The plugin uploads all local files to the server
 2. Downloads any missing files from the server
 3. Resolves any conflicts using operational transformation
-4. Begins real-time synchronization
+4. Begins real-time synchronisation
 
 Initial sync time depends on vault size and `sync_concurrency` setting.
 
@@ -107,7 +107,7 @@ Once connected:
 - **File changes**: Automatically synced when saved
 - **File creation**: New files immediately uploaded
 - **File deletion**: Deletions propagated to other clients
-- **File renames**: Tracked and synchronized
+- **File renames**: Tracked and synchronised
 
 The plugin watches your vault filesystem and syncs changes in real-time via WebSocket.
 
diff --git a/docs/guide/server-setup.md b/docs/guide/server-setup.md
index 9b39d5bc..bf09c5e6 100644
--- a/docs/guide/server-setup.md
+++ b/docs/guide/server-setup.md
@@ -347,7 +347,7 @@ docker logs vaultlink-server
 
 - Reduce `max_connections_per_vault`
 - Reduce `max_clients_per_vault`
-- Check for large vaults (may need database optimization)
+- Check for large vaults (may need database optimisation)
 
 ### Database corruption
 
diff --git a/docs/guide/what-is-vaultlink.md b/docs/guide/what-is-vaultlink.md
index 9bb5addb..a7dee7c7 100644
--- a/docs/guide/what-is-vaultlink.md
+++ b/docs/guide/what-is-vaultlink.md
@@ -13,7 +13,7 @@ Syncing Obsidian vaults across devices or sharing with teammates sucks:
 
 ## VaultLink's Solution
 
-Differential synchronization with operational transformation.
+Differential synchronisation with operational transformation.
 
 Edit files with Obsidian, Vim, VS Code, or any editor. VaultLink compares versions and automatically merges all changes. No operation tracking required, no conflict markers, no data loss.
 
diff --git a/docs/package.json b/docs/package.json
index a0d630a4..6904b5e5 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -8,12 +8,16 @@
     "build": "vitepress build",
     "preview": "vitepress preview",
     "format": "prettier --write \"**/*.md\" \"**/*.mts\"",
-    "format:check": "prettier --check \"**/*.md\" \"**/*.mts\""
+    "format:check": "prettier --check \"**/*.md\" \"**/*.mts\"",
+    "spell": "cspell \"**/*.md\" \"**/*.mts\"",
+    "spell:check": "cspell \"**/*.md\" \"**/*.mts\""
   },
   "keywords": [],
   "author": "",
   "license": "ISC",
   "devDependencies": {
+    "@cspell/dict-en-gb": "^5.0.19",
+    "cspell": "^9.3.2",
     "prettier": "^3.6.2",
     "vitepress": "^1.6.4",
     "vue": "^3.5.24"

From 511ac78e6dac4a44afc2bd230dd0c0032cc928b5 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Nov 2025 12:43:06 +0000
Subject: [PATCH 625/761] Don't kill CI with E2E tests

---
 .github/workflows/e2e.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index c540f1e4..146b54f1 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -5,6 +5,12 @@ on:
     branches: ["main"]
   pull_request:
     branches: ["main"]
+  schedule:
+    - cron: '0 */4 * * *'
+
+concurrency:
+  group: e2e-tests
+  cancel-in-progress: false
 
 env:
   CARGO_TERM_COLOR: always

From d590a2c9c8b19ba4a7b3bd366e26d9dc180e0cc3 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Nov 2025 19:41:24 +0000
Subject: [PATCH 626/761] Extend

---
 docs/.vitepress/config.mts          |   1 +
 docs/architecture/sync-algorithm.md |  42 ++++--
 docs/config/advanced.md             |  33 +++--
 docs/guide/getting-started.md       |   6 +-
 docs/guide/limitations.md           | 192 ++++++++++++++++++++++++++++
 docs/guide/server-setup.md          |   9 +-
 docs/guide/what-is-vaultlink.md     |   6 +-
 docs/index.md                       |   2 +-
 8 files changed, 261 insertions(+), 30 deletions(-)
 create mode 100644 docs/guide/limitations.md

diff --git a/docs/.vitepress/config.mts b/docs/.vitepress/config.mts
index 64d77100..d009127a 100644
--- a/docs/.vitepress/config.mts
+++ b/docs/.vitepress/config.mts
@@ -18,6 +18,7 @@ export default defineConfig({
 				items: [
 					{ text: "What is VaultLink?", link: "/guide/what-is-vaultlink" },
 					{ text: "Getting Started", link: "/guide/getting-started" },
+					{ text: "Limitations", link: "/guide/limitations" },
 					{ text: "Comparison with Alternatives", link: "/guide/alternatives" }
 				]
 			},
diff --git a/docs/architecture/sync-algorithm.md b/docs/architecture/sync-algorithm.md
index eb55e9a4..35e63d50 100644
--- a/docs/architecture/sync-algorithm.md
+++ b/docs/architecture/sync-algorithm.md
@@ -60,19 +60,27 @@ For note-taking workflows where users value editor freedom and offline editing,
 
 ### How It Works
 
-Given a base document and two sets of changes, OT produces a merged result that includes both changes.
+Given three versions (parent, left, right), reconcile-text produces a merged result.
+
+**How reconcile-text works**:
+
+1. **Tokenisation**: Split text into words (using `BuiltinTokenizer::Word`)
+2. **Three-way diff**: Compare parent→left and parent→right changes
+3. **Merge**: Combine non-conflicting changes, prefer content preservation for conflicts
+4. **Result**: Merged text with both edits applied
 
 **Example**:
 
 ```
-Base document: "Hello world"
+Parent:  "The quick brown fox"
+User A:  "The quick red fox"      (changes "brown" → "red")
+User B:  "The very quick brown fox"  (inserts "very ")
 
-User A: "Hello beautiful world"  (inserts "beautiful ")
-User B: "Hello world!"            (inserts "!")
-
-OT result: "Hello beautiful world!"  (both changes applied)
+Merged:  "The very quick red fox"  (both changes applied)
 ```
 
+**Merge conditions**: Only `.md` and `.txt` files with valid UTF-8 get merged. Binary files or other extensions use last-write-wins.
+
 ### Operation Types
 
 The algorithm handles these operations:
@@ -263,15 +271,25 @@ VaultLink optimises for:
 
 ## Limitations
 
-### Binary Files
+### Binary and Non-Mergeable Files
 
-OT works best for text files. Binary files:
+Only **`.md`** and **`.txt`** files get automatic merging. Everything else uses last-write-wins.
 
-- Cannot be meaningfully merged
-- Use last-write-wins strategy
-- May cause data loss on concurrent edits
+**Binary detection**:
 
-**Workaround**: Avoid concurrent edits to binary files, or use versioning.
+- Files with NUL bytes (`0x00`)
+- Files failing UTF-8 validation
+
+Even `.md` files are treated as binary if they fail UTF-8 checks.
+
+**Last-write-wins behaviour**:
+
+```
+User A uploads image.png → Server version 1
+User B uploads image.png → Server version 2 (A's upload lost)
+```
+
+**Workaround**: Avoid concurrent edits to non-text files. [See all limitations →](/guide/limitations)
 
 ### Large Documents
 
diff --git a/docs/config/advanced.md b/docs/config/advanced.md
index 72052d50..5275be93 100644
--- a/docs/config/advanced.md
+++ b/docs/config/advanced.md
@@ -55,26 +55,37 @@ done
 
 ### Version History Cleanup
 
-To limit database growth, implement version history pruning (requires custom script):
+VaultLink stores **all versions indefinitely** by default. Database grows with every change.
+
+**Database schema**: Each version stored in `documents` table with `vault_update_id` (sequential).
+
+Manual cleanup (keep last 100 versions per document):
 
 ```bash
 #!/bin/bash
 # prune-old-versions.sh
-# Keep only last 100 versions per document
 
 for db in databases/*.db; do
     sqlite3 "$db" <<EOF
-DELETE FROM versions
-WHERE id NOT IN (
-    SELECT id FROM versions
-    WHERE document_id = versions.document_id
-    ORDER BY version DESC
+DELETE FROM documents
+WHERE vault_update_id NOT IN (
+    SELECT vault_update_id FROM documents d2
+    WHERE d2.document_id = documents.document_id
+    ORDER BY vault_update_id DESC
     LIMIT 100
 );
 EOF
 done
 ```
 
+**Warning**: This deletes old versions permanently. No undo.
+
+Run monthly via cron:
+
+```bash
+0 3 1 * * /opt/vaultlink/prune-old-versions.sh
+```
+
 ## Performance Tuning
 
 ### Connection Pool Sizing
@@ -186,9 +197,9 @@ server {
         proxy_pass http://vaultlink;
     }
 
-    # Health check endpoint
+    # Health check endpoint (use any vault name)
     location /health {
-        proxy_pass http://vaultlink/vaults/health/ping;
+        proxy_pass http://vaultlink/vaults/test/ping;
         access_log off;
     }
 }
@@ -320,7 +331,7 @@ services:
     vaultlink-server:
         image: ghcr.io/schmelczer/vault-link-server:latest
         healthcheck:
-            test: ["CMD-SHELL", "curl -f http://localhost:3000/vaults/health/ping || exit 1"]
+            test: ["CMD-SHELL", "curl -f http://localhost:3000/vaults/test/ping || exit 1"]
             interval: 10s
             timeout: 5s
             retries: 3
@@ -334,7 +345,7 @@ Monitor health in production:
 # health-monitor.sh
 
 while true; do
-    if ! curl -sf http://localhost:3000/vaults/health/ping > /dev/null; then
+    if ! curl -sf http://localhost:3000/vaults/test/ping > /dev/null; then
         echo "Health check failed at $(date)" | mail -s "VaultLink Down" admin@example.com
         # Optionally restart
         # docker restart vaultlink-server
diff --git a/docs/guide/getting-started.md b/docs/guide/getting-started.md
index 0dc369df..02b20ae0 100644
--- a/docs/guide/getting-started.md
+++ b/docs/guide/getting-started.md
@@ -49,7 +49,7 @@ docker run -d \
   /app/sync_server /data/config.yml
 ```
 
-Verify: `curl http://localhost:3000/vaults/test/ping` should return `pong`
+Verify: `curl http://localhost:3000/vaults/test/ping` should return server version and auth status
 
 ## Step 2: Connect Client
 
@@ -114,10 +114,12 @@ users:
 
 **Client can't connect**:
 
-1. Verify: `curl http://your-server:3000/vaults/test/ping`
+1. Verify server: `curl http://your-server:3000/vaults/test/ping`
 2. Check URL: `ws://` for HTTP, `wss://` for HTTPS
 3. Verify token matches config.yml
 
+**Understanding limitations**: [See what VaultLink can and can't do →](/guide/limitations)
+
 **Files not syncing**: Check client logs, verify vault name matches
 
 [Server setup →](/guide/server-setup) | [Architecture →](/architecture/)
diff --git a/docs/guide/limitations.md b/docs/guide/limitations.md
new file mode 100644
index 00000000..1c514939
--- /dev/null
+++ b/docs/guide/limitations.md
@@ -0,0 +1,192 @@
+# Limitations
+
+VaultLink works well for most Obsidian vaults, but has some constraints you should know about.
+
+## File Type Limitations
+
+### Mergeable Files
+
+Only **`.md`** and **`.txt`** files get automatic conflict-free merging.
+
+Other file types (images, PDFs, etc.) use last-write-wins:
+
+```
+User A updates diagram.png → Server stores version 1
+User B updates diagram.png → Server stores version 2 (overwrites A's changes)
+```
+
+**Workaround**: Avoid editing the same non-text file simultaneously.
+
+### Binary Detection
+
+Files are treated as binary if they:
+
+- Contain NUL bytes (`0x00`)
+- Fail UTF-8 validation
+
+Binary files within `.md` or `.txt` extensions still get last-write-wins (no merge).
+
+## Performance Constraints
+
+### Server Limits (Configurable)
+
+| Resource                 | Default | Maximum Tested |
+| ------------------------ | ------- | -------------- |
+| Clients per vault        | 256     | ~256           |
+| Database connections     | 12      | 20             |
+| Max file size            | 512 MB  | 4096 MB        |
+| Request timeout          | 60s     | 180s           |
+| WebSocket cursor timeout | 60s     | 300s           |
+| Database busy timeout    | 3600s   | -              |
+
+### Vault Size
+
+- **Small vaults** (< 1000 files): Excellent performance
+- **Medium vaults** (1000-10000 files): Good performance
+- **Large vaults** (> 10000 files): Works, but initial sync slower
+
+No hard file count limit—constrained by disk space and sync time.
+
+### Resource Usage
+
+Rough estimates (varies by vault size and activity):
+
+- **RAM**: ~50-200 MB base + ~1-5 MB per active client
+- **CPU**: Low (< 5%) for typical usage, spikes during merges
+- **Disk**: Vault size + version history (grows over time)
+
+## Version History
+
+### Storage
+
+- All versions stored indefinitely (no automatic cleanup)
+- Each vault is a separate SQLite database
+- Deleted files marked as deleted (not purged)
+
+**Growth**: Version history grows with every change. A 10 MB vault with frequent edits might grow to 100+ MB over months.
+
+**Cleanup**: Manual only (see [Advanced Configuration](/config/advanced#version-history-cleanup)).
+
+### Implications
+
+- Disk usage grows over time
+- Database size affects backup time
+- No built-in retention policy
+
+## Merge Quality
+
+### Text Merging
+
+VaultLink uses word-level tokenisation for merging:
+
+```markdown
+Parent: "The quick brown fox"
+User A: "The quick red fox"
+User B: "The very quick brown fox"
+Result: "The very quick red fox" ← Both changes preserved
+```
+
+**Imperfect scenarios**:
+
+- Complex nested Markdown (tables, code blocks)
+- Simultaneous edits to the same sentence
+- Large structural changes (moving sections around)
+
+**Result**: Merged file might need manual cleanup in ~1-5% of concurrent edits.
+
+## Scalability
+
+### SQLite Limitations
+
+- One SQLite database per vault
+- Single-server architecture (no built-in clustering)
+- Write serialisation through database
+
+**For high concurrency**: Consider multiple vaults instead of one massive shared vault.
+
+### Horizontal Scaling
+
+Not currently supported. Running multiple servers requires manual vault partitioning.
+
+## Network Requirements
+
+### Latency
+
+- Real-time sync typically < 500ms on good connections
+- Mobile/slow networks: 1-5s latency possible
+- Timeout failures on very slow connections (> 60s)
+
+### Offline Behaviour
+
+- Clients queue changes locally
+- On reconnect, sync all changes since last connection
+- Conflicts resolved automatically (for mergeable files)
+
+**Limitation**: No offline conflict preview—merged result appears after reconnect.
+
+## Security
+
+### No End-to-End Encryption
+
+- Server sees all file contents
+- Transport encryption only (WSS/TLS)
+- Trust your server
+
+**Workaround**: Self-host on infrastructure you control.
+
+### Authentication
+
+- Token-based only (no OAuth, SAML, etc.)
+- Tokens configured in server config file
+- No runtime user management
+
+## Known Edge Cases
+
+### Simultaneous Deletes and Edits
+
+```
+User A deletes note.md
+User B edits note.md
+Result: Edit wins (file recreated with B's content)
+```
+
+Operational transformation prioritises content preservation.
+
+### Large File Uploads
+
+Files > 100 MB may time out on slow connections. Increase `response_timeout_seconds` or split large files.
+
+### Mobile Sync
+
+- Mobile networks may drop WebSocket connections frequently
+- Client auto-reconnects, but causes sync delays
+- Battery impact from constant reconnections
+
+## What VaultLink is NOT
+
+- **Not a backup solution**: Version history helps but isn't a backup (make backups!)
+- **Not Git**: No branching, no commit messages, no diffs to review before merge
+- **Not encrypted storage**: Server sees everything
+- **Not multi-master**: One server, multiple clients (not peer-to-peer)
+
+## Recommendations
+
+### Good Use Cases
+
+- Personal multi-device sync (< 10 devices)
+- Small team collaboration (< 20 people)
+- Primarily text/Markdown content
+- Trusted server environment
+
+### Poor Use Cases
+
+- Large teams (> 50 concurrent users per vault)
+- Primarily binary files (images, videos, large PDFs)
+- Untrusted server (need E2E encryption)
+- Highly regulated environments (HIPAA, etc.)
+
+## Next Steps
+
+- [Server configuration limits →](/config/server)
+- [Advanced tuning →](/config/advanced)
+- [Architecture details →](/architecture/)
diff --git a/docs/guide/server-setup.md b/docs/guide/server-setup.md
index bf09c5e6..7754da54 100644
--- a/docs/guide/server-setup.md
+++ b/docs/guide/server-setup.md
@@ -280,10 +280,15 @@ Run daily via cron:
 The server exposes a ping endpoint:
 
 ```bash
-curl http://localhost:3000/vaults/fake/ping
-# Returns: pong
+curl http://localhost:3000/vaults/test/ping
+# Returns: {"server_version":"0.10.1","is_authenticated":false}
 ```
 
+Replace `test` with any vault name. The endpoint returns:
+
+- `server_version`: Current server version
+- `is_authenticated`: Whether the request included a valid token
+
 Docker health check is built-in and checks this endpoint every 30 seconds.
 
 #### Prometheus Metrics
diff --git a/docs/guide/what-is-vaultlink.md b/docs/guide/what-is-vaultlink.md
index a7dee7c7..070b312c 100644
--- a/docs/guide/what-is-vaultlink.md
+++ b/docs/guide/what-is-vaultlink.md
@@ -13,9 +13,11 @@ Syncing Obsidian vaults across devices or sharing with teammates sucks:
 
 ## VaultLink's Solution
 
-Differential synchronisation with operational transformation.
+Differential synchronisation with operational transformation for Markdown and text files.
 
-Edit files with Obsidian, Vim, VS Code, or any editor. VaultLink compares versions and automatically merges all changes. No operation tracking required, no conflict markers, no data loss.
+Edit `.md` and `.txt` files with Obsidian, Vim, VS Code, or any editor. VaultLink compares versions and automatically merges all changes. No operation tracking required, no conflict markers.
+
+**Note**: Binary files (images, PDFs, etc.) use last-write-wins. [See limitations →](/guide/limitations)
 
 ## How It Works
 
diff --git a/docs/index.md b/docs/index.md
index 705dd1b9..6a7d610d 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -37,7 +37,7 @@ features:
 
 **Edit with any tool.** Other solutions require CRDT-aware editors or break when you edit outside Obsidian. VaultLink uses differential sync: edit files however you want, sync handles the rest.
 
-**No conflict markers.** Git forces manual merging. Other tools use last-write-wins. VaultLink's operational transformation automatically merges all changes without data loss or workflow interruption.
+**No conflict markers.** Git forces manual merging. Other tools use last-write-wins. VaultLink's operational transformation automatically merges Markdown and text files without conflict markers or workflow interruption. [See what's supported →](/guide/limitations)
 
 [See how VaultLink compares to alternatives →](/guide/alternatives)
 

From 9c3dedad768e7042f314e43ad6da16e1cd04f034 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Nov 2025 19:44:16 +0000
Subject: [PATCH 627/761] Rename param

---
 frontend/sync-client/src/persistence/settings.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/sync-client/src/persistence/settings.ts b/frontend/sync-client/src/persistence/settings.ts
index 87821728..462c591f 100644
--- a/frontend/sync-client/src/persistence/settings.ts
+++ b/frontend/sync-client/src/persistence/settings.ts
@@ -54,9 +54,9 @@ export class Settings {
 	}
 
 	public addOnSettingsChangeListener(
-		handler: (settings: SyncSettings, oldSettings: SyncSettings) => unknown
+		listener: (settings: SyncSettings, oldSettings: SyncSettings) => unknown
 	): void {
-		this.onSettingsChangeHandlers.push(handler);
+		this.onSettingsChangeHandlers.push(listener);
 	}
 
 	public async setSetting<T extends keyof SyncSettings>(

From f11c8db6d2c885fee16454eaf8864356220db8ab Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Nov 2025 19:57:52 +0000
Subject: [PATCH 628/761] Replace all instead of just replace

---
 .../src/file-operations/file-operations.ts    |  8 +++----
 .../sync-client/src/services/sync-service.ts  |  2 +-
 .../src/utils/line-and-column-to-position.ts  |  2 +-
 .../utils/position-to-line-and-column.test.ts | 22 +++++++++++++++++++
 .../src/utils/position-to-line-and-column.ts  |  2 +-
 5 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/frontend/sync-client/src/file-operations/file-operations.ts b/frontend/sync-client/src/file-operations/file-operations.ts
index e85c7fda..038dbbe5 100644
--- a/frontend/sync-client/src/file-operations/file-operations.ts
+++ b/frontend/sync-client/src/file-operations/file-operations.ts
@@ -114,14 +114,14 @@ export class FileOperations {
 					`Performing a 3-way merge for ${path} with the expected content`
 				);
 
-				text = text.replace(this.nativeLineEndings, "\n");
+				text = text.replaceAll(this.nativeLineEndings, "\n");
 				const merged = reconcile(
 					expectedText,
 					{ text, cursors },
 					newText
 				);
 
-				const resultText = merged.text.replace(
+				const resultText = merged.text.replaceAll(
 					"\n",
 					this.nativeLineEndings
 				);
@@ -197,7 +197,7 @@ export class FileOperations {
 
 		const decoder = new TextDecoder("utf-8");
 		let text = decoder.decode(content);
-		text = text.replace(this.nativeLineEndings, "\n");
+		text = text.replaceAll(this.nativeLineEndings, "\n");
 		return new TextEncoder().encode(text);
 	}
 
@@ -208,7 +208,7 @@ export class FileOperations {
 
 		const decoder = new TextDecoder("utf-8");
 		let text = decoder.decode(content);
-		text = text.replace("\n", this.nativeLineEndings);
+		text = text.replaceAll("\n", this.nativeLineEndings);
 		return new TextEncoder().encode(text);
 	}
 
diff --git a/frontend/sync-client/src/services/sync-service.ts b/frontend/sync-client/src/services/sync-service.ts
index 5bbf01e6..af3543da 100644
--- a/frontend/sync-client/src/services/sync-service.ts
+++ b/frontend/sync-client/src/services/sync-service.ts
@@ -343,7 +343,7 @@ export class SyncService {
 
 	private getUrl(path: string): string {
 		const { vaultName, remoteUri } = this.settings.getSettings();
-		const safeRemoteUri = remoteUri.replace(/\/+$/, "");
+		const safeRemoteUri = remoteUri.replace(/\/+$/g, "");
 		return `${safeRemoteUri}/vaults/${vaultName}${path}`;
 	}
 
diff --git a/frontend/sync-client/src/utils/line-and-column-to-position.ts b/frontend/sync-client/src/utils/line-and-column-to-position.ts
index 670d8cac..2ee6b2a4 100644
--- a/frontend/sync-client/src/utils/line-and-column-to-position.ts
+++ b/frontend/sync-client/src/utils/line-and-column-to-position.ts
@@ -13,7 +13,7 @@ export function lineAndColumnToPosition(
 	line: number,
 	column: number
 ): number {
-	const lines = text.replace("\r", "").split("\n");
+	const lines = text.replaceAll("\r", "").split("\n");
 
 	if (line >= lines.length) {
 		throw new Error(`Line number ${line} is out of range.`);
diff --git a/frontend/sync-client/src/utils/position-to-line-and-column.test.ts b/frontend/sync-client/src/utils/position-to-line-and-column.test.ts
index bc21b983..2341b7c5 100644
--- a/frontend/sync-client/src/utils/position-to-line-and-column.test.ts
+++ b/frontend/sync-client/src/utils/position-to-line-and-column.test.ts
@@ -43,6 +43,28 @@ describe("positionToLineAndColumn", () => {
 		});
 	});
 
+	test("with multiple carriage returns", () => {
+		// Test that all \r characters are removed, not just the first one
+		const text = "line1\r\nline2\r\nline3\r\n";
+
+		assert.deepStrictEqual(positionToLineAndColumn(text, 0), {
+			line: 0,
+			column: 0
+		});
+
+		// Position 6 = start of 'line2' after all \r removed
+		assert.deepStrictEqual(positionToLineAndColumn(text, 6), {
+			line: 1,
+			column: 0
+		});
+
+		// Position 12 = start of 'line3' after all \r removed
+		assert.deepStrictEqual(positionToLineAndColumn(text, 12), {
+			line: 2,
+			column: 0
+		});
+	});
+
 	test("handles empty input", () => {
 		assert.deepStrictEqual(positionToLineAndColumn("", 0), {
 			line: 0,
diff --git a/frontend/sync-client/src/utils/position-to-line-and-column.ts b/frontend/sync-client/src/utils/position-to-line-and-column.ts
index 3df61ded..15b74f8b 100644
--- a/frontend/sync-client/src/utils/position-to-line-and-column.ts
+++ b/frontend/sync-client/src/utils/position-to-line-and-column.ts
@@ -14,7 +14,7 @@ export function positionToLineAndColumn(
 		throw new Error("Position cannot be negative");
 	}
 
-	text = text.replace("\r", "");
+	text = text.replaceAll("\r", "");
 
 	if (
 		position >

From c3c2cafde592b3ba6cd2efa2258df2069169d740 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Nov 2025 20:03:09 +0000
Subject: [PATCH 629/761] Fix +1

---
 .../sync-client/src/utils/position-to-line-and-column.ts   | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/frontend/sync-client/src/utils/position-to-line-and-column.ts b/frontend/sync-client/src/utils/position-to-line-and-column.ts
index 15b74f8b..116b9f15 100644
--- a/frontend/sync-client/src/utils/position-to-line-and-column.ts
+++ b/frontend/sync-client/src/utils/position-to-line-and-column.ts
@@ -16,11 +16,8 @@ export function positionToLineAndColumn(
 
 	text = text.replaceAll("\r", "");
 
-	if (
-		position >
-		text.length + 1
-		// +1 to account for the cursor being after last character
-	) {
+	if (position > text.length) {
+		// position == text.length accounts for the cursor being after last character
 		throw new Error(
 			`Position ${position} exceeds text length ${text.length}`
 		);

From a57ed5c4aee4b1c85165863111a9ec8ae6bfc816 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Nov 2025 20:14:31 +0000
Subject: [PATCH 630/761] Fix edge cases

---
 .../src/utils/data-structures/locks.ts         |  9 ++++++---
 .../utils/data-structures/min-covered.test.ts  | 18 ++++++++++++++++--
 .../src/utils/data-structures/min-covered.ts   |  7 ++++++-
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/frontend/sync-client/src/utils/data-structures/locks.ts b/frontend/sync-client/src/utils/data-structures/locks.ts
index 6a801e12..e835a4a3 100644
--- a/frontend/sync-client/src/utils/data-structures/locks.ts
+++ b/frontend/sync-client/src/utils/data-structures/locks.ts
@@ -49,14 +49,17 @@ export class Locks<T> {
 		fn: () => R | Promise<R>
 	): Promise<R> {
 		const keys = Array.isArray(keyOrKeys) ? keyOrKeys : [keyOrKeys];
-		keys.sort((a, b) => String(a).localeCompare(String(b))); // Ensure consistent order to prevent deadlocks
 
-		await Promise.all(keys.map(async (key) => this.waitForLock(key)));
+		// Deduplicate keys to prevent deadlock from acquiring same lock twice
+		const uniqueKeys = Array.from(new Set(keys));
+		uniqueKeys.sort((a, b) => String(a).localeCompare(String(b))); // Ensure consistent order to prevent deadlocks
+
+		await Promise.all(uniqueKeys.map(async (key) => this.waitForLock(key)));
 
 		try {
 			return await fn();
 		} finally {
-			keys.forEach((key) => {
+			uniqueKeys.forEach((key) => {
 				this.unlock(key);
 			});
 		}
diff --git a/frontend/sync-client/src/utils/data-structures/min-covered.test.ts b/frontend/sync-client/src/utils/data-structures/min-covered.test.ts
index 82f792c3..1bbd1425 100644
--- a/frontend/sync-client/src/utils/data-structures/min-covered.test.ts
+++ b/frontend/sync-client/src/utils/data-structures/min-covered.test.ts
@@ -48,15 +48,29 @@ describe("CoveredValues", () => {
 		assert.strictEqual(covered.min, 6);
 	});
 
-	it("should handle force setting min value", () => {
+	it("should auto-advance when setting min value", () => {
 		const covered = new CoveredValues(5);
 		covered.add(7);
 		covered.add(8);
 		covered.add(9);
 		assert.strictEqual(covered.min, 5);
+		// Setting min to 6 should auto-advance through 7, 8, 9
 		covered.min = 6;
-		assert.strictEqual(covered.min, 6);
+		assert.strictEqual(covered.min, 9);
 		covered.add(10);
 		assert.strictEqual(covered.min, 10);
 	});
+
+	it("should handle setting min value with no consecutive values", () => {
+		const covered = new CoveredValues(5);
+		covered.add(10);
+		covered.add(15);
+		assert.strictEqual(covered.min, 5);
+		// Setting min to 8 should not auto-advance (no consecutive values)
+		covered.min = 8;
+		assert.strictEqual(covered.min, 8);
+		// Add 9 to trigger auto-advance to 10
+		covered.add(9);
+		assert.strictEqual(covered.min, 10);
+	});
 });
diff --git a/frontend/sync-client/src/utils/data-structures/min-covered.ts b/frontend/sync-client/src/utils/data-structures/min-covered.ts
index c453ef88..d55746df 100644
--- a/frontend/sync-client/src/utils/data-structures/min-covered.ts
+++ b/frontend/sync-client/src/utils/data-structures/min-covered.ts
@@ -24,7 +24,8 @@ export class CoveredValues {
 
 	public set min(value: number) {
 		this.minValue = Math.max(value, this.minValue);
-		this.seenValues = this.seenValues.filter((v) => v > value);
+		this.seenValues = this.seenValues.filter((v) => v > this.minValue);
+		this.advanceMinWhilePossible();
 	}
 
 	public add(value: number): void {
@@ -45,6 +46,10 @@ export class CoveredValues {
 			this.seenValues.splice(i, 0, value);
 		}
 
+		this.advanceMinWhilePossible();
+	}
+
+	private advanceMinWhilePossible(): void {
 		while (
 			this.seenValues.length > 0 &&
 			this.seenValues[0] === this.minValue + 1

From 51baa4d8e0a432c5850a66ded3c2732f123a5661 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Nov 2025 20:19:13 +0000
Subject: [PATCH 631/761] Have the same error message for file not found

---
 .../sync-client/src/file-operations/file-not-found-error.ts | 5 ++++-
 .../src/file-operations/safe-filesystem-operations.ts       | 6 ++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/frontend/sync-client/src/file-operations/file-not-found-error.ts b/frontend/sync-client/src/file-operations/file-not-found-error.ts
index 63af7dab..8725e81e 100644
--- a/frontend/sync-client/src/file-operations/file-not-found-error.ts
+++ b/frontend/sync-client/src/file-operations/file-not-found-error.ts
@@ -1,5 +1,8 @@
 export class FileNotFoundError extends Error {
-	public constructor(message: string) {
+	public constructor(
+		message: string,
+		public readonly filePath: string
+	) {
 		super(message);
 		this.name = "FileNotFoundError";
 	}
diff --git a/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts b/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
index 10d8bae6..30d47f77 100644
--- a/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
+++ b/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
@@ -117,7 +117,8 @@ export class SafeFileSystemOperations implements FileSystemOperations {
 	): Promise<T> {
 		if (!(await this.fs.exists(path))) {
 			throw new FileNotFoundError(
-				`File '${path}' not found before trying to ${operationName}`
+				`File not found before trying to ${operationName}`,
+				path
 			);
 		}
 
@@ -131,7 +132,8 @@ export class SafeFileSystemOperations implements FileSystemOperations {
 				throw error;
 			} else {
 				throw new FileNotFoundError(
-					`File '${path}' not found when trying to ${operationName}`
+					`File not found when trying to ${operationName}`,
+					path
 				);
 			}
 		}

From c798d96009e9dc411c1ca33e07da4d7246630a14 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Nov 2025 20:30:37 +0000
Subject: [PATCH 632/761] Fix import

---
 frontend/local-client-cli/src/node-filesystem.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/frontend/local-client-cli/src/node-filesystem.ts b/frontend/local-client-cli/src/node-filesystem.ts
index 90d6c8f0..f40143c8 100644
--- a/frontend/local-client-cli/src/node-filesystem.ts
+++ b/frontend/local-client-cli/src/node-filesystem.ts
@@ -1,7 +1,11 @@
 import * as fs from "fs/promises";
 import type { Dirent } from "fs";
 import * as path from "path";
-import type { FileSystemOperations, RelativePath } from "sync-client";
+import type {
+	FileSystemOperations,
+	RelativePath,
+	TextWithCursors
+} from "sync-client";
 
 export class NodeFileSystemOperations implements FileSystemOperations {
 	public constructor(private readonly basePath: string) {}

From d4b68154df047565be089e4c9936a13a01463199 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Nov 2025 20:31:27 +0000
Subject: [PATCH 633/761] Export consts

---
 frontend/sync-client/src/consts.ts                |  6 ++++++
 frontend/sync-client/src/services/sync-service.ts |  6 +++---
 frontend/sync-client/src/tracing/logger.ts        |  5 +++--
 frontend/sync-client/src/tracing/sync-history.ts  | 11 ++++++-----
 4 files changed, 18 insertions(+), 10 deletions(-)
 create mode 100644 frontend/sync-client/src/consts.ts

diff --git a/frontend/sync-client/src/consts.ts b/frontend/sync-client/src/consts.ts
new file mode 100644
index 00000000..5eafa3aa
--- /dev/null
+++ b/frontend/sync-client/src/consts.ts
@@ -0,0 +1,6 @@
+export const NETWORK_RETRY_INTERVAL_MS = 1000;
+export const MINIMUM_SAVE_INTERVAL_MS = 1000;
+export const DIFF_CACHE_SIZE_MB = 2;
+export const MAX_LOG_MESSAGE_COUNT = 100000;
+export const MAX_HISTORY_ENTRY_COUNT = 5000;
+export const TIMEOUT_FOR_MERGING_HISTORY_ENTRIES_IN_SECONDS = 60;
diff --git a/frontend/sync-client/src/services/sync-service.ts b/frontend/sync-client/src/services/sync-service.ts
index af3543da..331f806c 100644
--- a/frontend/sync-client/src/services/sync-service.ts
+++ b/frontend/sync-client/src/services/sync-service.ts
@@ -17,6 +17,7 @@ import type { FetchLatestDocumentsResponse } from "./types/FetchLatestDocumentsR
 import type { PingResponse } from "./types/PingResponse";
 import type { DeleteDocumentVersion } from "./types/DeleteDocumentVersion";
 import type { UpdateTextDocumentVersion } from "./types/UpdateTextDocumentVersion";
+import { NETWORK_RETRY_INTERVAL_MS } from "../consts";
 
 export interface CheckConnectionResult {
 	isSuccessful: boolean;
@@ -24,7 +25,6 @@ export interface CheckConnectionResult {
 }
 
 export class SyncService {
-	private static readonly NETWORK_RETRY_INTERVAL_MS = 1000;
 	private readonly client: typeof globalThis.fetch;
 	private readonly pingClient: typeof globalThis.fetch;
 
@@ -374,9 +374,9 @@ export class SyncService {
 				}
 
 				this.logger.error(
-					`Failed network call (${e}), retrying in ${SyncService.NETWORK_RETRY_INTERVAL_MS}ms`
+					`Failed network call (${e}), retrying in ${NETWORK_RETRY_INTERVAL_MS}ms`
 				);
-				await sleep(SyncService.NETWORK_RETRY_INTERVAL_MS);
+				await sleep(NETWORK_RETRY_INTERVAL_MS);
 			}
 		}
 	}
diff --git a/frontend/sync-client/src/tracing/logger.ts b/frontend/sync-client/src/tracing/logger.ts
index cf39e4de..ca32bbce 100644
--- a/frontend/sync-client/src/tracing/logger.ts
+++ b/frontend/sync-client/src/tracing/logger.ts
@@ -1,3 +1,5 @@
+import { MAX_LOG_MESSAGE_COUNT } from "../consts";
+
 export enum LogLevel {
 	DEBUG = "DEBUG",
 	INFO = "INFO",
@@ -21,7 +23,6 @@ export class LogLine {
 }
 
 export class Logger {
-	private static readonly MAX_MESSAGES = 100000;
 	private readonly messages: LogLine[] = [];
 	private readonly onMessageListeners: ((message: LogLine) => unknown)[] = [];
 
@@ -68,7 +69,7 @@ export class Logger {
 		const logLine = new LogLine(level, message);
 		this.messages.push(logLine);
 
-		while (this.messages.length > Logger.MAX_MESSAGES) {
+		while (this.messages.length > MAX_LOG_MESSAGE_COUNT) {
 			this.messages.shift();
 		}
 
diff --git a/frontend/sync-client/src/tracing/sync-history.ts b/frontend/sync-client/src/tracing/sync-history.ts
index 92904ce6..915c78b7 100644
--- a/frontend/sync-client/src/tracing/sync-history.ts
+++ b/frontend/sync-client/src/tracing/sync-history.ts
@@ -1,3 +1,7 @@
+import {
+	MAX_HISTORY_ENTRY_COUNT,
+	TIMEOUT_FOR_MERGING_HISTORY_ENTRIES_IN_SECONDS
+} from "../consts";
 import type { RelativePath } from "../persistence/database";
 import type { Logger } from "./logger";
 
@@ -64,9 +68,6 @@ export interface HistoryStats {
 }
 
 export class SyncHistory {
-	private static readonly MAX_ENTRIES = 5000;
-	private static readonly TIMEOUT_FOR_MERGING_ENTRIES_IN_SECONDS = 60;
-
 	private _entries: HistoryEntry[] = [];
 
 	private readonly syncHistoryUpdateListeners: ((
@@ -104,7 +105,7 @@ export class SyncHistory {
 		// Insert the entry at the beginning
 		this._entries.unshift(historyEntry);
 
-		if (this._entries.length > SyncHistory.MAX_ENTRIES) {
+		if (this._entries.length > MAX_HISTORY_ENTRY_COUNT) {
 			this._entries.pop();
 		}
 
@@ -145,7 +146,7 @@ export class SyncHistory {
 			candidate !== undefined &&
 			(this._entries[0] === candidate ||
 				candidate.timestamp.getTime() +
-					SyncHistory.TIMEOUT_FOR_MERGING_ENTRIES_IN_SECONDS * 1000 >
+					TIMEOUT_FOR_MERGING_HISTORY_ENTRIES_IN_SECONDS * 1000 >
 					entry.timestamp.getTime())
 		) {
 			return candidate;

From 91675ea99c5770845b38cac71ccc818af8a61570 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Nov 2025 20:35:36 +0000
Subject: [PATCH 634/761] Add remove event listener methods

---
 frontend/sync-client/src/persistence/settings.ts         | 9 +++++++++
 frontend/sync-client/src/services/websocket-manager.ts   | 9 +++++++++
 .../src/sync-operations/file-change-notifier.ts          | 9 +++++++++
 frontend/sync-client/src/sync-operations/syncer.ts       | 9 +++++++++
 frontend/sync-client/src/tracing/logger.ts               | 9 +++++++++
 frontend/sync-client/src/tracing/sync-history.ts         | 9 +++++++++
 6 files changed, 54 insertions(+)

diff --git a/frontend/sync-client/src/persistence/settings.ts b/frontend/sync-client/src/persistence/settings.ts
index 462c591f..98c5c523 100644
--- a/frontend/sync-client/src/persistence/settings.ts
+++ b/frontend/sync-client/src/persistence/settings.ts
@@ -59,6 +59,15 @@ export class Settings {
 		this.onSettingsChangeHandlers.push(listener);
 	}
 
+	public removeOnSettingsChangeListener(
+		listener: (settings: SyncSettings, oldSettings: SyncSettings) => unknown
+	): void {
+		const index = this.onSettingsChangeHandlers.indexOf(listener);
+		if (index !== -1) {
+			this.onSettingsChangeHandlers.splice(index, 1);
+		}
+	}
+
 	public async setSetting<T extends keyof SyncSettings>(
 		key: T,
 		value: SyncSettings[T]
diff --git a/frontend/sync-client/src/services/websocket-manager.ts b/frontend/sync-client/src/services/websocket-manager.ts
index a30774f4..8de399e3 100644
--- a/frontend/sync-client/src/services/websocket-manager.ts
+++ b/frontend/sync-client/src/services/websocket-manager.ts
@@ -74,6 +74,15 @@ export class WebSocketManager {
 		this.remoteCursorsUpdateListeners.push(listener);
 	}
 
+	public removeRemoteCursorsUpdateListener(
+		listener: (cursors: ClientCursors[]) => unknown
+	): void {
+		const index = this.remoteCursorsUpdateListeners.indexOf(listener);
+		if (index !== -1) {
+			this.remoteCursorsUpdateListeners.splice(index, 1);
+		}
+	}
+
 	public start(): void {
 		this.isStopped = false;
 		this._isFirstSyncCompleted = false;
diff --git a/frontend/sync-client/src/sync-operations/file-change-notifier.ts b/frontend/sync-client/src/sync-operations/file-change-notifier.ts
index 8a7af66c..2c099b6f 100644
--- a/frontend/sync-client/src/sync-operations/file-change-notifier.ts
+++ b/frontend/sync-client/src/sync-operations/file-change-notifier.ts
@@ -9,6 +9,15 @@ export class FileChangeNotifier {
 		this.listeners.push(listener);
 	}
 
+	public removeFileChangeListener(
+		listener: (filePath: RelativePath) => unknown
+	): void {
+		const index = this.listeners.indexOf(listener);
+		if (index !== -1) {
+			this.listeners.splice(index, 1);
+		}
+	}
+
 	public notifyOfFileChange(filePath: RelativePath): void {
 		this.listeners.forEach((listener) => listener(filePath));
 	}
diff --git a/frontend/sync-client/src/sync-operations/syncer.ts b/frontend/sync-client/src/sync-operations/syncer.ts
index 920a6423..d1aa5faf 100644
--- a/frontend/sync-client/src/sync-operations/syncer.ts
+++ b/frontend/sync-client/src/sync-operations/syncer.ts
@@ -61,6 +61,15 @@ export class Syncer {
 		this.remainingOperationsListeners.push(listener);
 	}
 
+	public removeRemainingOperationsListener(
+		listener: (remainingOperations: number) => unknown
+	): void {
+		const index = this.remainingOperationsListeners.indexOf(listener);
+		if (index !== -1) {
+			this.remainingOperationsListeners.splice(index, 1);
+		}
+	}
+
 	public async syncLocallyCreatedFile(
 		relativePath: RelativePath
 	): Promise<void> {
diff --git a/frontend/sync-client/src/tracing/logger.ts b/frontend/sync-client/src/tracing/logger.ts
index ca32bbce..96b93b0d 100644
--- a/frontend/sync-client/src/tracing/logger.ts
+++ b/frontend/sync-client/src/tracing/logger.ts
@@ -60,6 +60,15 @@ export class Logger {
 		this.onMessageListeners.push(listener);
 	}
 
+	public removeOnMessageListener(
+		listener: (message: LogLine) => unknown
+	): void {
+		const index = this.onMessageListeners.indexOf(listener);
+		if (index !== -1) {
+			this.onMessageListeners.splice(index, 1);
+		}
+	}
+
 	public reset(): void {
 		this.messages.length = 0;
 		this.debug("Logger has been reset");
diff --git a/frontend/sync-client/src/tracing/sync-history.ts b/frontend/sync-client/src/tracing/sync-history.ts
index 915c78b7..0d2009f7 100644
--- a/frontend/sync-client/src/tracing/sync-history.ts
+++ b/frontend/sync-client/src/tracing/sync-history.ts
@@ -119,6 +119,15 @@ export class SyncHistory {
 		listener({ ...this.status });
 	}
 
+	public removeSyncHistoryUpdateListener(
+		listener: (stats: HistoryStats) => unknown
+	): void {
+		const index = this.syncHistoryUpdateListeners.indexOf(listener);
+		if (index !== -1) {
+			this.syncHistoryUpdateListeners.splice(index, 1);
+		}
+	}
+
 	public reset(): void {
 		this._entries.length = 0;
 		this.status = {

From 10fd928459b8f88807fd5e756ffa559905bab532 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Nov 2025 20:49:53 +0000
Subject: [PATCH 635/761] Fix file operations

---
 .../file-operations/file-operations.test.ts   | 57 +++++++++++++++++++
 .../src/file-operations/file-operations.ts    | 10 +++-
 2 files changed, 64 insertions(+), 3 deletions(-)

diff --git a/frontend/sync-client/src/file-operations/file-operations.test.ts b/frontend/sync-client/src/file-operations/file-operations.test.ts
index 675fdce1..3b1f6710 100644
--- a/frontend/sync-client/src/file-operations/file-operations.test.ts
+++ b/frontend/sync-client/src/file-operations/file-operations.test.ts
@@ -159,4 +159,61 @@ describe("File operations", () => {
 			"a/b.c/e (1)"
 		);
 	});
+
+	it("should continue deconfliction from existing number in filename", async () => {
+		const fileSystemOperations = new FakeFileSystemOperations();
+		const fileOperations = new FileOperations(
+			new Logger(),
+			new MockDatabase() as Database, // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+			fileSystemOperations
+		);
+
+		await fileOperations.create("document (5).md", new Uint8Array());
+		await fileOperations.create("other.md", new Uint8Array());
+
+		await fileOperations.move("other.md", "document (5).md");
+		assertSetContainsExactly(
+			fileSystemOperations.names,
+			"document (5).md",
+			"document (6).md"
+		);
+
+		await fileOperations.create("another.md", new Uint8Array());
+		await fileOperations.move("another.md", "document (5).md");
+		assertSetContainsExactly(
+			fileSystemOperations.names,
+			"document (5).md",
+			"document (6).md",
+			"document (7).md"
+		);
+	});
+
+	it("should handle dotfiles correctly", async () => {
+		const fileSystemOperations = new FakeFileSystemOperations();
+		const fileOperations = new FileOperations(
+			new Logger(),
+			new MockDatabase() as Database, // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+			fileSystemOperations
+		);
+
+		await fileOperations.create(".gitignore", new Uint8Array());
+		await fileOperations.create("temp", new Uint8Array());
+		await fileOperations.move("temp", ".gitignore");
+		assertSetContainsExactly(
+			fileSystemOperations.names,
+			".gitignore",
+			".gitignore (1)"
+		);
+
+		await fileOperations.create(".config.json", new Uint8Array());
+		await fileOperations.create("temp2", new Uint8Array());
+		await fileOperations.move("temp2", ".config.json");
+		assertSetContainsExactly(
+			fileSystemOperations.names,
+			".gitignore",
+			".gitignore (1)",
+			".config.json",
+			".config (1).json"
+		);
+	});
 });
diff --git a/frontend/sync-client/src/file-operations/file-operations.ts b/frontend/sync-client/src/file-operations/file-operations.ts
index 038dbbe5..7402a6d6 100644
--- a/frontend/sync-client/src/file-operations/file-operations.ts
+++ b/frontend/sync-client/src/file-operations/file-operations.ts
@@ -25,7 +25,7 @@ export class FileOperations {
 	): [RelativePath, RelativePath] {
 		const pathParts = path.split("/");
 		const fileName = pathParts.pop();
-		if (fileName == "" || fileName == null) {
+		if (!fileName || fileName === "") {
 			throw new Error(`Path '${path}' cannot be empty`);
 		}
 
@@ -234,11 +234,15 @@ export class FileOperations {
 		}
 
 		const nameParts = fileName.split(".");
+		// Handle dotfiles: ".gitignore" should have no extension, ".config.json" should have ".json"
+		const isDotfile = fileName.startsWith(".") && nameParts[0] === "";
 		const extension =
-			nameParts.length > 1 ? "." + nameParts[nameParts.length - 1] : "";
+			nameParts.length > 1 && !(isDotfile && nameParts.length === 2)
+				? "." + nameParts[nameParts.length - 1]
+				: "";
 		let stem = extension ? nameParts.slice(0, -1).join(".") : fileName;
 		let currentCount = Number.parseInt(
-			FileOperations.PARENTHESES_REGEX.exec(stem)?.groups?.[0] ?? "0"
+			FileOperations.PARENTHESES_REGEX.exec(stem)?.[1] ?? "0"
 		);
 		stem = stem.replace(FileOperations.PARENTHESES_REGEX, "");
 

From aa3c587002b7df01ddd8c24d4ba48355ce5a25fc Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Nov 2025 20:50:29 +0000
Subject: [PATCH 636/761] Dedup paths on create document

---
 sync-server/src/server/create_document.rs     | 15 +++++++++--
 sync-server/src/server/update_document.rs     | 27 +++++++------------
 sync-server/src/utils.rs                      |  1 +
 .../src/utils/find_first_available_path.rs    | 24 +++++++++++++++++
 4 files changed, 48 insertions(+), 19 deletions(-)
 create mode 100644 sync-server/src/utils/find_first_available_path.rs

diff --git a/sync-server/src/server/create_document.rs b/sync-server/src/server/create_document.rs
index 0f698538..a8d80f39 100644
--- a/sync-server/src/server/create_document.rs
+++ b/sync-server/src/server/create_document.rs
@@ -14,7 +14,10 @@ use crate::{
     },
     config::user_config::User,
     errors::{SyncServerError, client_error, server_error},
-    utils::{normalize::normalize, sanitize_path::sanitize_path},
+    utils::{
+        find_first_available_path::find_first_available_path, normalize::normalize,
+        sanitize_path::sanitize_path,
+    },
 };
 
 #[derive(Deserialize)]
@@ -66,11 +69,19 @@ pub async fn create_document(
         .map_err(server_error)?;
 
     let sanitized_relative_path = sanitize_path(&request.relative_path);
+    let deduped_path = find_first_available_path(
+        &vault_id,
+        &sanitized_relative_path,
+        &state.database,
+        &mut transaction,
+    )
+    .await
+    .map_err(server_error)?;
 
     let new_version = StoredDocumentVersion {
         vault_update_id: last_update_id + 1,
         document_id,
-        relative_path: sanitized_relative_path,
+        relative_path: deduped_path,
         content: request.content.contents.to_vec(),
         updated_date: chrono::Utc::now(),
         is_deleted: false,
diff --git a/sync-server/src/server/update_document.rs b/sync-server/src/server/update_document.rs
index cb81361b..37beabd6 100644
--- a/sync-server/src/server/update_document.rs
+++ b/sync-server/src/server/update_document.rs
@@ -22,8 +22,8 @@ use crate::{
     errors::{SyncServerError, not_found_error, server_error},
     server::requests::UpdateBinaryDocumentVersion,
     utils::{
-        dedup_paths::dedup_paths, is_binary::is_binary,
-        is_file_type_mergable::is_file_type_mergable, normalize::normalize,
+        dedup_paths::dedup_paths, find_first_available_path::find_first_available_path,
+        is_binary::is_binary, is_file_type_mergable::is_file_type_mergable, normalize::normalize,
         sanitize_path::sanitize_path,
     },
 };
@@ -215,21 +215,14 @@ async fn update_document(
     let new_relative_path = if parent_document.relative_path == latest_version.relative_path
         && latest_version.relative_path != sanitized_relative_path
     {
-        let mut new_relative_path = String::default();
-        for candidate in dedup_paths(&sanitized_relative_path) {
-            if state
-                .database
-                .get_latest_document_by_path(&vault_id, &candidate, Some(&mut transaction))
-                .await
-                .map_err(server_error)?
-                .is_none()
-            {
-                new_relative_path = candidate;
-                break;
-            }
-        }
-
-        new_relative_path
+        find_first_available_path(
+            &vault_id,
+            &sanitized_relative_path,
+            &state.database,
+            &mut transaction,
+        )
+        .await
+        .map_err(server_error)?
     } else {
         latest_version.relative_path.clone()
     };
diff --git a/sync-server/src/utils.rs b/sync-server/src/utils.rs
index 7345880d..460a1466 100644
--- a/sync-server/src/utils.rs
+++ b/sync-server/src/utils.rs
@@ -1,4 +1,5 @@
 pub mod dedup_paths;
+pub mod find_first_available_path;
 pub mod is_binary;
 pub mod is_file_type_mergable;
 pub mod normalize;
diff --git a/sync-server/src/utils/find_first_available_path.rs b/sync-server/src/utils/find_first_available_path.rs
new file mode 100644
index 00000000..1f662b42
--- /dev/null
+++ b/sync-server/src/utils/find_first_available_path.rs
@@ -0,0 +1,24 @@
+use crate::app_state::database::models::VaultId;
+use crate::{app_state::database::Transaction, utils::dedup_paths::dedup_paths};
+use anyhow::Result;
+
+pub async fn find_first_available_path(
+    vault_id: &VaultId,
+    sanitized_relative_path: &str,
+    database: &crate::app_state::database::Database,
+    transaction: &mut Transaction<'_>,
+) -> Result<String> {
+    let mut new_relative_path = String::default();
+    for candidate in dedup_paths(&sanitized_relative_path) {
+        if database
+            .get_latest_document_by_path(&vault_id, &candidate, Some(transaction))
+            .await?
+            .is_none()
+        {
+            new_relative_path = candidate;
+            break;
+        }
+    }
+
+    Ok(new_relative_path)
+}

From 4fcd134e55ebce8444af79b9e62f9e8ada280a3b Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Nov 2025 20:52:30 +0000
Subject: [PATCH 637/761] Extract consts

---
 frontend/sync-client/src/consts.ts                      | 1 +
 frontend/sync-client/src/utils/is-file-type-mergable.ts | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/frontend/sync-client/src/consts.ts b/frontend/sync-client/src/consts.ts
index 5eafa3aa..7dfe27ec 100644
--- a/frontend/sync-client/src/consts.ts
+++ b/frontend/sync-client/src/consts.ts
@@ -4,3 +4,4 @@ export const DIFF_CACHE_SIZE_MB = 2;
 export const MAX_LOG_MESSAGE_COUNT = 100000;
 export const MAX_HISTORY_ENTRY_COUNT = 5000;
 export const TIMEOUT_FOR_MERGING_HISTORY_ENTRIES_IN_SECONDS = 60;
+export const MERGABLE_FILE_TYPES = ["md", "txt"];
diff --git a/frontend/sync-client/src/utils/is-file-type-mergable.ts b/frontend/sync-client/src/utils/is-file-type-mergable.ts
index 3b149285..943dc1cd 100644
--- a/frontend/sync-client/src/utils/is-file-type-mergable.ts
+++ b/frontend/sync-client/src/utils/is-file-type-mergable.ts
@@ -1,6 +1,8 @@
+import { MERGABLE_FILE_TYPES } from "../consts";
+
 export function isFileTypeMergable(pathOrFileName: string): boolean {
 	const parts = pathOrFileName.split(".");
 	const fileExtension = parts.at(-1) ?? "";
 
-	return ["md", "txt"].includes(fileExtension.toLowerCase());
+	return MERGABLE_FILE_TYPES.includes(fileExtension.toLowerCase());
 }

From 72ad82ab83ca99af4fa048aa16c4ae50d9cb5043 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Nov 2025 21:02:30 +0000
Subject: [PATCH 638/761] Fix dotfile handling

---
 sync-server/src/utils/dedup_paths.rs | 82 ++++++++++++++++++++++++----
 1 file changed, 72 insertions(+), 10 deletions(-)

diff --git a/sync-server/src/utils/dedup_paths.rs b/sync-server/src/utils/dedup_paths.rs
index c35ad33b..bc687f6a 100644
--- a/sync-server/src/utils/dedup_paths.rs
+++ b/sync-server/src/utils/dedup_paths.rs
@@ -9,16 +9,24 @@ pub fn dedup_paths(path: &str) -> impl Iterator<Item = String> {
         directory.push('/');
     }
 
-    let name_parts = file_name.rsplitn(2, '.').collect::<Vec<_>>();
-    let mut reverse_parts = name_parts.into_iter().rev();
-    let (stem, extension) = match (reverse_parts.next(), reverse_parts.next()) {
-        (Some(stem), maybe_extension) => (
-            stem.to_owned(),
-            maybe_extension
-                .map(|ext| format!(".{ext}"))
-                .unwrap_or_default(),
-        ),
-        _ => unreachable!("Path must have at least one part"),
+    // Handle dotfiles: ".gitignore" should have no extension, ".config.json" should split as ".config" + ".json"
+    let is_simple_dotfile = file_name.starts_with('.') && file_name.matches('.').count() == 1;
+
+    let (stem, extension) = if is_simple_dotfile {
+        (file_name.clone(), String::new())
+    } else {
+        // Regular file or dotfile with extension
+        let name_parts = file_name.rsplitn(2, '.').collect::<Vec<_>>();
+        let mut reverse_parts = name_parts.into_iter().rev();
+        match (reverse_parts.next(), reverse_parts.next()) {
+            (Some(stem), maybe_extension) => (
+                stem.to_owned(),
+                maybe_extension
+                    .map(|ext| format!(".{ext}"))
+                    .unwrap_or_default(),
+            ),
+            _ => unreachable!("Path must have at least one part"),
+        }
     };
 
     let regex = Regex::new(r" \((\d+)\)$").unwrap();
@@ -85,4 +93,58 @@ mod test {
             Some("my/path.with.dots/file (6)".to_owned())
         );
     }
+
+    #[test]
+    fn test_regex_capturing_group() {
+        // Single digit in parentheses
+        let mut deduped = dedup_paths("document (5).md");
+        assert_eq!(deduped.next(), Some("document (5).md".to_owned()));
+        assert_eq!(deduped.next(), Some("document (6).md".to_owned()));
+        assert_eq!(deduped.next(), Some("document (7).md".to_owned()));
+
+        // Multi-digit number
+        let mut deduped = dedup_paths("report (123).pdf");
+        assert_eq!(deduped.next(), Some("report (123).pdf".to_owned()));
+        assert_eq!(deduped.next(), Some("report (124).pdf".to_owned()));
+        assert_eq!(deduped.next(), Some("report (125).pdf".to_owned()));
+
+        // Number without extension
+        let mut deduped = dedup_paths("folder (99)");
+        assert_eq!(deduped.next(), Some("folder (99)".to_owned()));
+        assert_eq!(deduped.next(), Some("folder (100)".to_owned()));
+        assert_eq!(deduped.next(), Some("folder (101)".to_owned()));
+    }
+
+    #[test]
+    fn test_dedup_dotfiles() {
+        // Simple dotfile (no extension)
+        let mut deduped = dedup_paths(".gitignore");
+        assert_eq!(deduped.next(), Some(".gitignore".to_owned()));
+        assert_eq!(deduped.next(), Some(".gitignore (1)".to_owned()));
+        assert_eq!(deduped.next(), Some(".gitignore (2)".to_owned()));
+
+        // Dotfile with extension
+        let mut deduped = dedup_paths(".config.json");
+        assert_eq!(deduped.next(), Some(".config.json".to_owned()));
+        assert_eq!(deduped.next(), Some(".config (1).json".to_owned()));
+        assert_eq!(deduped.next(), Some(".config (2).json".to_owned()));
+
+        // Dotfile with number
+        let mut deduped = dedup_paths(".gitignore (5)");
+        assert_eq!(deduped.next(), Some(".gitignore (5)".to_owned()));
+        assert_eq!(deduped.next(), Some(".gitignore (6)".to_owned()));
+        assert_eq!(deduped.next(), Some(".gitignore (7)".to_owned()));
+
+        // Dotfile with extension and number
+        let mut deduped = dedup_paths(".config (3).json");
+        assert_eq!(deduped.next(), Some(".config (3).json".to_owned()));
+        assert_eq!(deduped.next(), Some(".config (4).json".to_owned()));
+        assert_eq!(deduped.next(), Some(".config (5).json".to_owned()));
+
+        // Dotfile in subdirectory
+        let mut deduped = dedup_paths("my/path/.gitignore");
+        assert_eq!(deduped.next(), Some("my/path/.gitignore".to_owned()));
+        assert_eq!(deduped.next(), Some("my/path/.gitignore (1)".to_owned()));
+        assert_eq!(deduped.next(), Some("my/path/.gitignore (2)".to_owned()));
+    }
 }

From 9d645f43f89fa86ed679d178160df39f53e2c2d0 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Nov 2025 21:08:16 +0000
Subject: [PATCH 639/761] Handle move on create

---
 .../src/sync-operations/unrestricted-syncer.ts       | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
index daffe4bf..b8bf7682 100644
--- a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
+++ b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
@@ -79,9 +79,10 @@ export class UnrestrictedSyncer {
 			); // this can throw FileNotFoundError
 			const contentHash = hash(contentBytes);
 
+			const originalRelativePath = document.relativePath;
 			const response = await this.syncService.create({
 				documentId: document.documentId,
-				relativePath: document.relativePath,
+				relativePath: originalRelativePath,
 				contentBytes
 			});
 
@@ -93,6 +94,15 @@ export class UnrestrictedSyncer {
 				},
 				document
 			);
+
+			// In case a document with the same name (but different ID) had existed remotely that we haven't known about
+			if (response.relativePath != originalRelativePath) {
+				await this.operations.move(
+					document.relativePath,
+					response.relativePath
+				); // this can throw FileNotFoundError
+			}
+
 			this.database.addSeenUpdateId(response.vaultUpdateId);
 			this.updateCache(
 				response.vaultUpdateId,

From 71274d466c668c163cff2adf5c8bd2d5a1348e70 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 22 Nov 2025 21:08:24 +0000
Subject: [PATCH 640/761] Extract function

---
 .../sync-operations/unrestricted-syncer.ts    | 58 ++++++++++---------
 1 file changed, 31 insertions(+), 27 deletions(-)

diff --git a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
index b8bf7682..4f33fe9e 100644
--- a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
+++ b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
@@ -260,33 +260,7 @@ export class UnrestrictedSyncer {
 			}
 
 			if (response.isDeleted) {
-				this.history.addHistoryEntry({
-					status: SyncStatus.SUCCESS,
-					details: {
-						type: SyncType.DELETE,
-						relativePath: document.relativePath
-					},
-					message:
-						"File has been deleted remotely, so we deleted it locally",
-					author: response.userId,
-					timestamp: new Date(response.updatedDate)
-				});
-
-				this.database.delete(document.relativePath);
-				this.database.updateDocumentMetadata(
-					{
-						parentVersionId: response.vaultUpdateId,
-						hash: EMPTY_HASH,
-						remoteRelativePath: response.relativePath
-					},
-					document
-				);
-
-				await this.operations.delete(document.relativePath);
-
-				this.database.addSeenUpdateId(response.vaultUpdateId);
-
-				return;
+				return this.applyRemoteDeleteLocally(document, response);
 			}
 
 			let actualPath = document.relativePath;
@@ -577,4 +551,34 @@ export class UnrestrictedSyncer {
 			this.contentCache.put(updateId, contentBytes);
 		}
 	}
+
+	private async applyRemoteDeleteLocally(
+		document: DocumentRecord,
+		response: DocumentVersion | DocumentUpdateResponse
+	): Promise<void> {
+		this.history.addHistoryEntry({
+			status: SyncStatus.SUCCESS,
+			details: {
+				type: SyncType.DELETE,
+				relativePath: document.relativePath
+			},
+			message: "File has been deleted remotely, so we deleted it locally",
+			author: response.userId,
+			timestamp: new Date(response.updatedDate)
+		});
+
+		this.database.delete(document.relativePath);
+		this.database.updateDocumentMetadata(
+			{
+				parentVersionId: response.vaultUpdateId,
+				hash: EMPTY_HASH,
+				remoteRelativePath: response.relativePath
+			},
+			document
+		);
+
+		await this.operations.delete(document.relativePath);
+
+		this.database.addSeenUpdateId(response.vaultUpdateId);
+	}
 }

From 4186aa9e0c860ee7211a2bf1c94a7759bf80352d Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 23 Nov 2025 10:42:34 +0000
Subject: [PATCH 641/761] Formatting

---
 .../src/services/sync-reset-error.ts          |  2 +-
 .../sync-client/src/services/sync-service.ts  | 24 +++++++++----------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/frontend/sync-client/src/services/sync-reset-error.ts b/frontend/sync-client/src/services/sync-reset-error.ts
index 5e27dfb6..3fd8a86c 100644
--- a/frontend/sync-client/src/services/sync-reset-error.ts
+++ b/frontend/sync-client/src/services/sync-reset-error.ts
@@ -1,6 +1,6 @@
 export class SyncResetError extends Error {
 	public constructor() {
-		super("Sync was reset");
+		super("SyncClient has been reset, cleaning up");
 		this.name = "SyncResetError";
 	}
 }
diff --git a/frontend/sync-client/src/services/sync-service.ts b/frontend/sync-client/src/services/sync-service.ts
index 331f806c..8ae85b58 100644
--- a/frontend/sync-client/src/services/sync-service.ts
+++ b/frontend/sync-client/src/services/sync-service.ts
@@ -19,11 +19,6 @@ import type { DeleteDocumentVersion } from "./types/DeleteDocumentVersion";
 import type { UpdateTextDocumentVersion } from "./types/UpdateTextDocumentVersion";
 import { NETWORK_RETRY_INTERVAL_MS } from "../consts";
 
-export interface CheckConnectionResult {
-	isSuccessful: boolean;
-	message: string;
-}
-
 export class SyncService {
 	private readonly client: typeof globalThis.fetch;
 	private readonly pingClient: typeof globalThis.fetch;
@@ -65,7 +60,7 @@ export class SyncService {
 		relativePath: RelativePath;
 		contentBytes: Uint8Array;
 	}): Promise<DocumentVersionWithoutContent> {
-		return this.withRetries(async () => {
+		return this.retryForever(async () => {
 			const formData = new FormData();
 			if (documentId !== undefined) {
 				formData.append("document_id", documentId);
@@ -114,7 +109,7 @@ export class SyncService {
 		relativePath: RelativePath;
 		content: (number | string)[];
 	}): Promise<DocumentUpdateResponse> {
-		return this.withRetries(async () => {
+		return this.retryForever(async () => {
 			this.logger.debug(
 				`Updating text document ${documentId} with parent version ${parentVersionId} and relative path ${relativePath}`
 			);
@@ -166,7 +161,7 @@ export class SyncService {
 		relativePath: RelativePath;
 		contentBytes: Uint8Array;
 	}): Promise<DocumentUpdateResponse> {
-		return this.withRetries(async () => {
+		return this.retryForever(async () => {
 			this.logger.debug(
 				`Updating binary document ${documentId} with parent version ${parentVersionId} and relative path ${relativePath}`
 			);
@@ -215,7 +210,7 @@ export class SyncService {
 		documentId: DocumentId;
 		relativePath: RelativePath;
 	}): Promise<DocumentVersionWithoutContent> {
-		return this.withRetries(async () => {
+		return this.retryForever(async () => {
 			const request: DeleteDocumentVersion = {
 				relativePath
 			};
@@ -252,7 +247,7 @@ export class SyncService {
 	}: {
 		documentId: DocumentId;
 	}): Promise<DocumentVersion> {
-		return this.withRetries(async () => {
+		return this.retryForever(async () => {
 			const response = await this.client(
 				this.getUrl(`/documents/${documentId}`),
 				{
@@ -280,7 +275,7 @@ export class SyncService {
 	public async getAll(
 		since?: VaultUpdateId
 	): Promise<FetchLatestDocumentsResponse> {
-		return this.withRetries(async () => {
+		return this.retryForever(async () => {
 			const url = new URL(this.getUrl("/documents"));
 			if (since !== undefined) {
 				url.searchParams.append("since", since.toString());
@@ -308,7 +303,10 @@ export class SyncService {
 		});
 	}
 
-	public async checkConnection(): Promise<CheckConnectionResult> {
+	public async checkConnection(): Promise<{
+		isSuccessful: boolean;
+		message: string;
+	}> {
 		try {
 			const response = await this.pingClient(this.getUrl("/ping"), {
 				headers: this.getDefaultHeaders()
@@ -362,7 +360,7 @@ export class SyncService {
 		return headers;
 	}
 
-	private async withRetries<T>(fn: () => Promise<T>): Promise<T> {
+	private async retryForever<T>(fn: () => Promise<T>): Promise<T> {
 		// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
 		while (true) {
 			try {

From 56c77dc3f6d02ae11d87fc596cceada4219c016a Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 23 Nov 2025 10:43:20 +0000
Subject: [PATCH 642/761] Fix fetch controller

---
 .../src/services/connection-status.ts         |  98 ------------
 .../src/services/fetch-controller.ts          | 145 ++++++++++++++++++
 .../sync-client/src/services/sync-service.ts  |   6 +-
 frontend/sync-client/src/sync-client.ts       |  11 +-
 4 files changed, 158 insertions(+), 102 deletions(-)
 delete mode 100644 frontend/sync-client/src/services/connection-status.ts
 create mode 100644 frontend/sync-client/src/services/fetch-controller.ts

diff --git a/frontend/sync-client/src/services/connection-status.ts b/frontend/sync-client/src/services/connection-status.ts
deleted file mode 100644
index 18f53a0d..00000000
--- a/frontend/sync-client/src/services/connection-status.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-import type { Settings } from "../persistence/settings";
-import type { Logger } from "../tracing/logger";
-import { createPromise } from "../utils/create-promise";
-import { SyncResetError } from "./sync-reset-error";
-
-export class ConnectionStatus {
-	private static readonly UNTIL_RESOLUTION = Symbol();
-	private canFetch: boolean;
-	private until: Promise<symbol>;
-	private resolveUntil: (result: symbol) => unknown;
-	private rejectUntil: (reason: unknown) => unknown;
-
-	public constructor(
-		settings: Settings,
-		private readonly logger: Logger
-	) {
-		this.canFetch = settings.getSettings().isSyncEnabled;
-
-		[this.until, this.resolveUntil, this.rejectUntil] =
-			createPromise<symbol>();
-
-		settings.addOnSettingsChangeListener((newSettings, oldSettings) => {
-			if (oldSettings.isSyncEnabled != newSettings.isSyncEnabled) {
-				this.canFetch = newSettings.isSyncEnabled;
-				this.resolveUntil(ConnectionStatus.UNTIL_RESOLUTION);
-				[this.until, this.resolveUntil, this.rejectUntil] =
-					createPromise<symbol>();
-			}
-		});
-	}
-
-	private static getUrlFromInput(input: RequestInfo | URL): string {
-		if (input instanceof URL) {
-			return input.href;
-		}
-		if (typeof input === "string") {
-			return input;
-		}
-		return input.url;
-	}
-
-	public startReset(): void {
-		this.rejectUntil(new SyncResetError());
-	}
-
-	public finishReset(): void {
-		[this.until, this.resolveUntil, this.rejectUntil] = createPromise();
-	}
-
-	public getFetchImplementation(
-		logger: Logger,
-		fetch: typeof globalThis.fetch = globalThis.fetch
-	): typeof globalThis.fetch {
-		return async (
-			input: RequestInfo | URL,
-			init?: RequestInit
-		): Promise<Response> => {
-			while (!this.canFetch) {
-				await this.until;
-			}
-
-			try {
-				// https://github.com/jonbern/fetch-retry/blob/8684ef4e688375f623bd76f13add76dbc1d67cfb/index.js#L67C1-L70C21
-				const _input =
-					typeof Request !== "undefined" && input instanceof Request
-						? input.clone()
-						: input;
-
-				const fetchPromise = fetch(_input, init);
-
-				// We only want to catch rejections from `this.until`
-				let result: symbol | Response | undefined = undefined;
-				do {
-					result = await Promise.race([this.until, fetchPromise]);
-				} while (result === ConnectionStatus.UNTIL_RESOLUTION);
-
-				const fetchResult: Response = result as Response; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
-
-				if (!fetchResult.ok) {
-					this.logger.warn(
-						`Fetch for ${ConnectionStatus.getUrlFromInput(
-							input
-						)}, got status ${fetchResult.status}`
-					);
-				}
-
-				return fetchResult;
-			} catch (error) {
-				logger.warn(
-					`Fetch for ${ConnectionStatus.getUrlFromInput(
-						input
-					)}, got error: ${error}`
-				);
-				throw error;
-			}
-		};
-	}
-}
diff --git a/frontend/sync-client/src/services/fetch-controller.ts b/frontend/sync-client/src/services/fetch-controller.ts
new file mode 100644
index 00000000..fbfac59e
--- /dev/null
+++ b/frontend/sync-client/src/services/fetch-controller.ts
@@ -0,0 +1,145 @@
+import type { Logger } from "../tracing/logger";
+import { createPromise } from "../utils/create-promise";
+import { SyncResetError } from "./sync-reset-error";
+
+/**
+ * Offers a resettable fetch implementation that waits until syncing is enabled
+ * and aborts outstanding requests when a reset is started.
+ */
+export class FetchController {
+	private static readonly UNTIL_RESOLUTION = Symbol();
+
+	private isResetting = false;
+
+	// Promise resolves on the next state change: sync enabled/disabled or reset started/ended
+	private until: Promise<symbol>;
+	private resolveUntil: (result: symbol) => unknown;
+	private rejectUntil: (reason: unknown) => unknown;
+
+	public constructor(
+		private _canFetch: boolean,
+		private readonly logger: Logger
+	) {
+		[this.until, this.resolveUntil, this.rejectUntil] =
+			createPromise<symbol>();
+	}
+
+	private static getUrlFromInput(input: RequestInfo | URL): string {
+		if (input instanceof URL) {
+			return input.href;
+		}
+		if (typeof input === "string") {
+			return input;
+		}
+		return input.url;
+	}
+
+	/**
+	 * Whether the fetch implementation can immediately send requests once outside of a reset.
+	 */
+	public get canFetch(): boolean {
+		return this._canFetch;
+	}
+
+	/**
+	 * Allow or disallow fetching. The changes only take effect if not resetting.
+	 * When called during a reset, its effect is deferred until the reset is finished.
+	 *
+	 * @param canFetch Whether fetching is enabled
+	 */
+	public set canFetch(canFetch: boolean) {
+		this._canFetch = canFetch;
+
+		if (!this.isResetting) {
+			const previousResolve = this.resolveUntil;
+			[this.until, this.resolveUntil, this.rejectUntil] =
+				createPromise<symbol>();
+			previousResolve(FetchController.UNTIL_RESOLUTION);
+		}
+	}
+
+	/**
+	 * Starts a reset, causing all ongoing and future fetches to be rejected
+	 * with a SyncResetError until finishReset is called.
+	 */
+	public startReset(): void {
+		this.isResetting = true;
+		this.rejectUntil(new SyncResetError());
+	}
+
+	/**
+	 * Finishes a reset, allowing fetches to proceed or wait again depending on
+	 * the current sync settings.
+	 */
+	public finishReset(): void {
+		if (!this.isResetting) {
+			throw new Error("Cannot finish reset when not resetting");
+		}
+
+		this.isResetting = false;
+		[this.until, this.resolveUntil, this.rejectUntil] = createPromise();
+	}
+
+	/**
+	 *
+	 * |------------------|---------------|-----------------------------------------------------|
+	 * |                  | Sync enabled  |                 Sync disabled                       |
+	 * |------------------|-------------- |-----------------------------------------------------|
+	 * | During reset     |        Rejects with SyncResetError without sending request          |
+	 * |------------------|-------------- |-----------------------------------------------------|
+	 * | Outside of reset | Same as fetch | Blocks until sync is enabled and then same as fetch |
+	 * |------------------|---------------|-----------------------------------------------------|
+	 *
+	 * @param logger for errors
+	 * @param fetch to wrap
+	 * @returns a wrapped fetch implementation affected by the FetchController state
+	 */
+	public getControlledFetchImplementation(
+		logger: Logger,
+		fetch: typeof globalThis.fetch = globalThis.fetch
+	): typeof globalThis.fetch {
+		return async (
+			input: RequestInfo | URL,
+			init?: RequestInit
+		): Promise<Response> => {
+			while (!this.canFetch || this.isResetting) {
+				await this.until;
+			}
+
+			try {
+				// https://github.com/jonbern/fetch-retry/blob/8684ef4e688375f623bd76f13add76dbc1d67cfb/index.js#L67C1-L70C21
+				const _input =
+					typeof Request !== "undefined" && input instanceof Request
+						? input.clone()
+						: input;
+
+				const fetchPromise = fetch(_input, init);
+
+				// We only want to catch rejections from `this.until`
+				let result: symbol | Response | undefined = undefined;
+				do {
+					result = await Promise.race([this.until, fetchPromise]);
+				} while (result === FetchController.UNTIL_RESOLUTION);
+
+				const fetchResult: Response = result as Response; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+
+				if (!fetchResult.ok) {
+					this.logger.warn(
+						`Fetch for ${FetchController.getUrlFromInput(
+							input
+						)}, got status ${fetchResult.status}`
+					);
+				}
+
+				return fetchResult;
+			} catch (error) {
+				logger.warn(
+					`Fetch for ${FetchController.getUrlFromInput(
+						input
+					)}, got error: ${error}`
+				);
+				throw error;
+			}
+		};
+	}
+}
diff --git a/frontend/sync-client/src/services/sync-service.ts b/frontend/sync-client/src/services/sync-service.ts
index 8ae85b58..ce5e8cb3 100644
--- a/frontend/sync-client/src/services/sync-service.ts
+++ b/frontend/sync-client/src/services/sync-service.ts
@@ -6,7 +6,7 @@ import type {
 
 import type { Logger } from "../tracing/logger";
 import type { Settings } from "../persistence/settings";
-import type { ConnectionStatus } from "./connection-status";
+import type { FetchController } from "./fetch-controller";
 import { sleep } from "../utils/sleep";
 import { SyncResetError } from "./sync-reset-error";
 import type { SerializedError } from "./types/SerializedError";
@@ -25,7 +25,7 @@ export class SyncService {
 
 	public constructor(
 		private readonly deviceId: string,
-		private readonly connectionStatus: ConnectionStatus,
+		private readonly connectionStatus: FetchController,
 		private readonly settings: Settings,
 		private readonly logger: Logger,
 		fetchImplementation: typeof globalThis.fetch = globalThis.fetch
@@ -34,7 +34,7 @@ export class SyncService {
 		const unboundFetch: typeof globalThis.fetch = async (...args) =>
 			fetchImplementation(...args);
 
-		this.client = this.connectionStatus.getFetchImplementation(
+		this.client = this.connectionStatus.getControlledFetchImplementation(
 			this.logger,
 			unboundFetch
 		);
diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts
index 28843d3d..5c242045 100644
--- a/frontend/sync-client/src/sync-client.ts
+++ b/frontend/sync-client/src/sync-client.ts
@@ -148,7 +148,16 @@ export class SyncClient {
 			}
 		);
 
-		const connectionStatus = new ConnectionStatus(settings, logger);
+		const connectionStatus = new FetchController(
+			settings.getSettings().isSyncEnabled,
+			logger
+		);
+		settings.addOnSettingsChangeListener((newSettings, oldSettings) => {
+			if (oldSettings.isSyncEnabled != newSettings.isSyncEnabled) {
+				connectionStatus.canFetch = newSettings.isSyncEnabled;
+			}
+		});
+
 		const syncService = new SyncService(
 			deviceId,
 			connectionStatus,

From 12d8d1557229b8acbd4e56cd8cbb56cd1db06c79 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 23 Nov 2025 11:03:40 +0000
Subject: [PATCH 643/761] Add fetch controller tests

---
 .../src/services/fetch-controller.test.ts     | 186 ++++++++++++++++++
 .../src/services/fetch-controller.ts          |   4 +
 .../src/sync-operations/cursor-tracker.ts     |   4 +-
 3 files changed, 192 insertions(+), 2 deletions(-)
 create mode 100644 frontend/sync-client/src/services/fetch-controller.test.ts

diff --git a/frontend/sync-client/src/services/fetch-controller.test.ts b/frontend/sync-client/src/services/fetch-controller.test.ts
new file mode 100644
index 00000000..e5562dcd
--- /dev/null
+++ b/frontend/sync-client/src/services/fetch-controller.test.ts
@@ -0,0 +1,186 @@
+import { describe, it, mock, beforeEach, afterEach } from "node:test";
+import assert from "node:assert";
+import { FetchController } from "./fetch-controller";
+import { Logger } from "../tracing/logger";
+import { SyncResetError } from "./sync-reset-error";
+import { sleep } from "../utils/sleep";
+
+describe("FetchController", () => {
+	const createMockFetch = (shouldSleep: boolean) =>
+		mock.fn(async () => {
+			if (shouldSleep) {
+				await sleep(50);
+			}
+			return Promise.resolve(new Response("OK", { status: 200 }));
+		});
+
+	beforeEach(() => {
+		mock.timers.enable({ apis: ["setTimeout"] });
+	});
+
+	afterEach(() => {
+		mock.timers.reset();
+	});
+
+	it("should allow fetch when canFetch is true", async () => {
+		const logger = new Logger();
+		const controller = new FetchController(true, logger);
+		const mockFetch = createMockFetch(true);
+		const controlledFetch = controller.getControlledFetchImplementation(
+			logger,
+			mockFetch
+		);
+
+		mock.timers.tick(50);
+		const response = await controlledFetch("http://example.com");
+
+		assert.strictEqual(await response.text(), "OK");
+		assert.strictEqual(mockFetch.mock.calls.length, 1);
+	});
+
+	it("should block fetch until canFetch becomes true", async () => {
+		const logger = new Logger();
+		const controller = new FetchController(false, logger);
+		const mockFetch = createMockFetch(true);
+		const controlledFetch = controller.getControlledFetchImplementation(
+			logger,
+			mockFetch
+		);
+
+		const fetchPromise = controlledFetch("http://example.com");
+		mock.timers.tick(10);
+		assert.strictEqual(mockFetch.mock.calls.length, 0);
+
+		controller.canFetch = true;
+
+		mock.timers.tick(50);
+		const response = await fetchPromise;
+		assert.strictEqual(await response.text(), "OK");
+		assert.strictEqual(mockFetch.mock.calls.length, 1);
+	});
+
+	it("should reject during reset", async () => {
+		const logger = new Logger();
+		const controller = new FetchController(true, logger);
+		const mockFetch = createMockFetch(true);
+		const controlledFetch = controller.getControlledFetchImplementation(
+			logger,
+			mockFetch
+		);
+
+		const firstRequest = controlledFetch("http://example.com");
+		assert.strictEqual(mockFetch.mock.calls.length, 1); // because firstRequest started before reset
+		controller.startReset();
+		const secondRequest = controlledFetch("http://example.com");
+
+		mock.timers.tick(50);
+
+		await assert.rejects(
+			firstRequest,
+			(error: unknown) => error instanceof SyncResetError
+		);
+		await assert.rejects(
+			secondRequest,
+			(error: unknown) => error instanceof SyncResetError
+		);
+		assert.strictEqual(mockFetch.mock.calls.length, 1); // because firstRequest started before reset
+	});
+
+	it("should allow fetch after reset finishes", async () => {
+		const logger = new Logger();
+		const controller = new FetchController(true, logger);
+		const mockFetch = createMockFetch(true);
+		const controlledFetch = controller.getControlledFetchImplementation(
+			logger,
+			mockFetch
+		);
+
+		controller.startReset();
+		controller.finishReset();
+
+		mock.timers.tick(50);
+		const response = await controlledFetch("http://example.com");
+		assert.strictEqual(await response.text(), "OK");
+	});
+
+	it("should throw when finishing reset without starting", () => {
+		const logger = new Logger();
+		const controller = new FetchController(true, logger);
+
+		assert.throws(
+			() => controller.finishReset(),
+			(error: unknown) =>
+				error instanceof Error &&
+				error.message === "Cannot finish reset when not resetting"
+		);
+	});
+
+	it("should defer canFetch changes during reset", async () => {
+		const logger = new Logger();
+		const controller = new FetchController(false, logger);
+		const mockFetch = createMockFetch(true);
+		const controlledFetch = controller.getControlledFetchImplementation(
+			logger,
+			mockFetch
+		);
+
+		controller.startReset();
+		controller.canFetch = true;
+
+		await assert.rejects(
+			async () => controlledFetch("http://example.com"),
+			(error: unknown) => error instanceof SyncResetError
+		);
+
+		controller.finishReset();
+
+		mock.timers.tick(50);
+		const response = await controlledFetch("http://example.com");
+		assert.strictEqual(await response.text(), "OK");
+	});
+
+	it("should handle different input types", async () => {
+		const logger = new Logger();
+		const controller = new FetchController(true, logger);
+		const mockFetch = createMockFetch(false);
+		const controlledFetch = controller.getControlledFetchImplementation(
+			logger,
+			mockFetch
+		);
+
+		await controlledFetch("http://example.com");
+		await controlledFetch(new URL("http://example.com"));
+		await controlledFetch(
+			new Request("http://example.com", { method: "POST" })
+		);
+
+		assert.strictEqual(mockFetch.mock.calls.length, 3);
+	});
+
+	it("should handle fetch errors", async () => {
+		const logger = new Logger();
+		const controller = new FetchController(true, logger);
+		const mockFetch = mock.fn(async () => {
+			throw new Error("Network error");
+		});
+		const controlledFetch = controller.getControlledFetchImplementation(
+			logger,
+			mockFetch
+		);
+
+		await assert.rejects(
+			async () => controlledFetch("http://example.com"),
+			(error: unknown) =>
+				error instanceof Error && error.message === "Network error"
+		);
+	});
+
+	it("should not create unhandled rejection on reset with no waiting fetches", async () => {
+		const logger = new Logger();
+		const controller = new FetchController(true, logger);
+
+		controller.startReset();
+		mock.timers.tick(10);
+		controller.finishReset();
+	});
+});
diff --git a/frontend/sync-client/src/services/fetch-controller.ts b/frontend/sync-client/src/services/fetch-controller.ts
index fbfac59e..38dfcb48 100644
--- a/frontend/sync-client/src/services/fetch-controller.ts
+++ b/frontend/sync-client/src/services/fetch-controller.ts
@@ -65,6 +65,10 @@ export class FetchController {
 	public startReset(): void {
 		this.isResetting = true;
 		this.rejectUntil(new SyncResetError());
+		// Catch unhandled rejection if no fetches are waiting
+		this.until.catch(() => {
+			// Intentionally ignore - this rejection is handled by waiting fetches
+		});
 	}
 
 	/**
diff --git a/frontend/sync-client/src/sync-operations/cursor-tracker.ts b/frontend/sync-client/src/sync-operations/cursor-tracker.ts
index 32048ba5..dc5e4cd7 100644
--- a/frontend/sync-client/src/sync-operations/cursor-tracker.ts
+++ b/frontend/sync-client/src/sync-operations/cursor-tracker.ts
@@ -167,14 +167,14 @@ export class CursorTracker {
 				continue;
 			}
 
-			if (clientCursors.upToDateness == DocumentUpToDateness.Later) {
+			if (clientCursors.upToDateness === DocumentUpToDateness.Later) {
 				continue;
 			}
 
 			result.push({
 				...clientCursors,
 				isOutdated:
-					clientCursors.upToDateness == DocumentUpToDateness.Prior
+					clientCursors.upToDateness === DocumentUpToDateness.Prior
 			});
 
 			included.add(clientCursors.deviceId);

From 9f1f4beae4f41a341c0578c7ec0b047e5e478a1a Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 23 Nov 2025 11:29:42 +0000
Subject: [PATCH 644/761] Renamce

---
 .../src/services/fetch-controller.test.ts     | 28 +++++++++----------
 .../sync-client/src/services/sync-service.ts  |  8 +++---
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/frontend/sync-client/src/services/fetch-controller.test.ts b/frontend/sync-client/src/services/fetch-controller.test.ts
index e5562dcd..b349ced2 100644
--- a/frontend/sync-client/src/services/fetch-controller.test.ts
+++ b/frontend/sync-client/src/services/fetch-controller.test.ts
@@ -9,7 +9,7 @@ describe("FetchController", () => {
 	const createMockFetch = (shouldSleep: boolean) =>
 		mock.fn(async () => {
 			if (shouldSleep) {
-				await sleep(50);
+				await sleep(30);
 			}
 			return Promise.resolve(new Response("OK", { status: 200 }));
 		});
@@ -25,13 +25,12 @@ describe("FetchController", () => {
 	it("should allow fetch when canFetch is true", async () => {
 		const logger = new Logger();
 		const controller = new FetchController(true, logger);
-		const mockFetch = createMockFetch(true);
+		const mockFetch = createMockFetch(false);
 		const controlledFetch = controller.getControlledFetchImplementation(
 			logger,
 			mockFetch
 		);
 
-		mock.timers.tick(50);
 		const response = await controlledFetch("http://example.com");
 
 		assert.strictEqual(await response.text(), "OK");
@@ -48,12 +47,12 @@ describe("FetchController", () => {
 		);
 
 		const fetchPromise = controlledFetch("http://example.com");
-		mock.timers.tick(10);
 		assert.strictEqual(mockFetch.mock.calls.length, 0);
 
 		controller.canFetch = true;
+		await Promise.resolve();
+		mock.timers.tick(30);
 
-		mock.timers.tick(50);
 		const response = await fetchPromise;
 		assert.strictEqual(await response.text(), "OK");
 		assert.strictEqual(mockFetch.mock.calls.length, 1);
@@ -69,11 +68,11 @@ describe("FetchController", () => {
 		);
 
 		const firstRequest = controlledFetch("http://example.com");
-		assert.strictEqual(mockFetch.mock.calls.length, 1); // because firstRequest started before reset
-		controller.startReset();
-		const secondRequest = controlledFetch("http://example.com");
+		assert.strictEqual(mockFetch.mock.calls.length, 1);
 
-		mock.timers.tick(50);
+		controller.startReset();
+
+		const secondRequest = controlledFetch("http://example.com");
 
 		await assert.rejects(
 			firstRequest,
@@ -83,13 +82,13 @@ describe("FetchController", () => {
 			secondRequest,
 			(error: unknown) => error instanceof SyncResetError
 		);
-		assert.strictEqual(mockFetch.mock.calls.length, 1); // because firstRequest started before reset
+		assert.strictEqual(mockFetch.mock.calls.length, 1);
 	});
 
 	it("should allow fetch after reset finishes", async () => {
 		const logger = new Logger();
 		const controller = new FetchController(true, logger);
-		const mockFetch = createMockFetch(true);
+		const mockFetch = createMockFetch(false);
 		const controlledFetch = controller.getControlledFetchImplementation(
 			logger,
 			mockFetch
@@ -98,7 +97,6 @@ describe("FetchController", () => {
 		controller.startReset();
 		controller.finishReset();
 
-		mock.timers.tick(50);
 		const response = await controlledFetch("http://example.com");
 		assert.strictEqual(await response.text(), "OK");
 	});
@@ -134,8 +132,10 @@ describe("FetchController", () => {
 
 		controller.finishReset();
 
-		mock.timers.tick(50);
-		const response = await controlledFetch("http://example.com");
+		const fetchPromise = controlledFetch("http://example.com");
+		mock.timers.tick(30);
+
+		const response = await fetchPromise;
 		assert.strictEqual(await response.text(), "OK");
 	});
 
diff --git a/frontend/sync-client/src/services/sync-service.ts b/frontend/sync-client/src/services/sync-service.ts
index ce5e8cb3..91d6f8df 100644
--- a/frontend/sync-client/src/services/sync-service.ts
+++ b/frontend/sync-client/src/services/sync-service.ts
@@ -25,7 +25,7 @@ export class SyncService {
 
 	public constructor(
 		private readonly deviceId: string,
-		private readonly connectionStatus: FetchController,
+		private readonly fetchController: FetchController,
 		private readonly settings: Settings,
 		private readonly logger: Logger,
 		fetchImplementation: typeof globalThis.fetch = globalThis.fetch
@@ -34,7 +34,7 @@ export class SyncService {
 		const unboundFetch: typeof globalThis.fetch = async (...args) =>
 			fetchImplementation(...args);
 
-		this.client = this.connectionStatus.getControlledFetchImplementation(
+		this.client = this.fetchController.getControlledFetchImplementation(
 			this.logger,
 			unboundFetch
 		);
@@ -341,8 +341,8 @@ export class SyncService {
 
 	private getUrl(path: string): string {
 		const { vaultName, remoteUri } = this.settings.getSettings();
-		const safeRemoteUri = remoteUri.replace(/\/+$/g, "");
-		return `${safeRemoteUri}/vaults/${vaultName}${path}`;
+		const remoteUriWithoutTrailingSlash = remoteUri.replace(/\/+$/, "");
+		return `${remoteUriWithoutTrailingSlash}/vaults/${vaultName}${path}`;
 	}
 
 	private getDefaultHeaders(

From cb2a1c0df1318a73c73153eae0907b8a5a078b1d Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 23 Nov 2025 14:18:49 +0000
Subject: [PATCH 645/761] Fix reset logic for WS

---
 .../src/services/websocket-manager.ts         | 177 ++++++++++--------
 1 file changed, 95 insertions(+), 82 deletions(-)

diff --git a/frontend/sync-client/src/services/websocket-manager.ts b/frontend/sync-client/src/services/websocket-manager.ts
index 8de399e3..06432e89 100644
--- a/frontend/sync-client/src/services/websocket-manager.ts
+++ b/frontend/sync-client/src/services/websocket-manager.ts
@@ -1,31 +1,38 @@
-import type { Database } from "../persistence/database";
 import type { Logger } from "../tracing/logger";
-import type { Settings, SyncSettings } from "../persistence/settings";
+import type { Settings } from "../persistence/settings";
 import type { WebSocketServerMessage } from "./types/WebSocketServerMessage";
-import type { Syncer } from "../sync-operations/syncer";
 import type { WebSocketClientMessage } from "./types/WebSocketClientMessage";
 import type { CursorPositionFromClient } from "./types/CursorPositionFromClient";
 import type { ClientCursors } from "./types/ClientCursors";
+import { createPromise } from "../utils/create-promise";
+import { WebSocketVaultUpdate } from "./types/WebSocketVaultUpdate";
 
 export class WebSocketManager {
-	private readonly webSocketStatusChangeListeners: (() => unknown)[] = [];
+	private readonly webSocketStatusChangeListeners: ((
+		isConnected: boolean
+	) => unknown)[] = [];
+
+	private readonly remoteVaultUpdateListeners: ((
+		update: WebSocketVaultUpdate
+	) => Promise<void>)[] = [];
+
 	private readonly remoteCursorsUpdateListeners: ((
 		cursors: ClientCursors[]
-	) => unknown)[] = [];
+	) => Promise<void>)[] = [];
 
 	private webSocket: WebSocket | undefined;
 
 	private isStopped = true;
-	private _isFirstSyncCompleted = false;
+	private resolveDisconnectingPromise: null | (() => unknown) = null;
+	private reconnectTimeoutId: ReturnType<typeof setTimeout> | undefined;
 
+	private readonly outstandingPromises: Array<Promise<unknown>> = [];
 	private readonly webSocketFactoryImplementation: typeof globalThis.WebSocket;
 
 	public constructor(
 		private readonly deviceId: string,
 		private readonly logger: Logger,
-		private readonly database: Database,
 		private readonly settings: Settings,
-		private readonly syncer: Syncer,
 		webSocketImplementation?: typeof globalThis.WebSocket
 	) {
 		if (webSocketImplementation) {
@@ -41,16 +48,6 @@ export class WebSocketManager {
 				this.webSocketFactoryImplementation = WebSocket;
 			}
 		}
-
-		settings.addOnSettingsChangeListener((newSettings, oldSettings) => {
-			if (
-				newSettings.remoteUri !== oldSettings.remoteUri ||
-				newSettings.vaultName !== oldSettings.vaultName ||
-				newSettings.token !== oldSettings.token
-			) {
-				this.initializeWebSocket(newSettings);
-			}
-		});
 	}
 
 	public get isWebSocketConnected(): boolean {
@@ -60,42 +57,66 @@ export class WebSocketManager {
 		);
 	}
 
-	public get isFirstSyncCompleted(): boolean {
-		return this._isFirstSyncCompleted;
-	}
-
-	public addWebSocketStatusChangeListener(listener: () => unknown): void {
+	public addWebSocketStatusChangeListener(
+		listener: (isConnected: boolean) => unknown
+	): void {
 		this.webSocketStatusChangeListeners.push(listener);
 	}
 
 	public addRemoteCursorsUpdateListener(
-		listener: (cursors: ClientCursors[]) => unknown
+		listener: (cursors: ClientCursors[]) => Promise<void>
 	): void {
 		this.remoteCursorsUpdateListeners.push(listener);
 	}
 
-	public removeRemoteCursorsUpdateListener(
-		listener: (cursors: ClientCursors[]) => unknown
+	public addRemoteVaultUpdateListener(
+		listener: (update: WebSocketVaultUpdate) => Promise<void>
 	): void {
-		const index = this.remoteCursorsUpdateListeners.indexOf(listener);
-		if (index !== -1) {
-			this.remoteCursorsUpdateListeners.splice(index, 1);
-		}
+		this.remoteVaultUpdateListeners.push(listener);
 	}
 
 	public start(): void {
 		this.isStopped = false;
-		this._isFirstSyncCompleted = false;
-		this.initializeWebSocket(this.settings.getSettings());
+		this.initializeWebSocket();
 	}
 
-	public stop(): void {
+	public async stop(): Promise<void> {
+		const [promise, resolve] = createPromise<void>();
+		this.resolveDisconnectingPromise = resolve;
+
 		this.isStopped = true;
+
+		// Clear pending reconnect timeout
+		if (this.reconnectTimeoutId !== undefined) {
+			clearTimeout(this.reconnectTimeoutId);
+			this.reconnectTimeoutId = undefined;
+		}
+
 		this.webSocket?.close(1000, "WebSocketManager has been stopped");
+
+		while (this.isWebSocketConnected) {
+			await promise;
+		}
+
+		await Promise.allSettled(this.outstandingPromises).then(() => {});
+	}
+
+	public sendHandshakeMessage(
+		message: WebSocketClientMessage & { type: "handshake" }
+	): void {
+		const webSocket = this.webSocket;
+		if (!webSocket) {
+			throw new Error(
+				"WebSocket is not connected, cannot send handshake message"
+			);
+		}
+
+		webSocket.send(JSON.stringify(message));
 	}
 
 	public updateLocalCursors(cursorPositions: CursorPositionFromClient): void {
 		if (!this.isWebSocketConnected) {
+			// A missing cursor update is fine, we can just skip it if needed
 			this.logger.warn(
 				"WebSocket is not connected, cannot send cursor positions"
 			);
@@ -105,43 +126,41 @@ export class WebSocketManager {
 			type: "cursorPositions",
 			...cursorPositions
 		};
-		this.webSocket?.send(JSON.stringify(message));
+		const webSocket = this.webSocket;
+		if (!webSocket) {
+			this.logger.warn(
+				"WebSocket is not connected, cannot send cursor positions"
+			);
+			return;
+		}
+		webSocket.send(JSON.stringify(message));
 		this.logger.debug(
 			`Sent cursor positions: ${JSON.stringify(cursorPositions)}`
 		);
 	}
 
-	private initializeWebSocket(settings: SyncSettings): void {
-		if (this.isStopped) {
-			return;
-		}
-
+	private initializeWebSocket(): void {
 		try {
 			this.webSocket?.close();
 		} catch (e) {
-			this.logger.warn(`Failed to close WebSocket: ${e}`);
+			this.logger.error(
+				`Failed to close previous WebSocket connection: ${e}`
+			);
 		}
 
-		const wsUri = new URL(settings.remoteUri);
+		const wsUri = new URL(this.settings.getSettings().remoteUri);
 		wsUri.protocol = wsUri.protocol === "https" ? "wss" : "ws";
-		wsUri.pathname = `/vaults/${settings.vaultName}/ws`;
+		wsUri.pathname = `/vaults/${this.settings.getSettings().vaultName}/ws`;
 
 		this.logger.info(`Connecting to WebSocket at ${wsUri.toString()}`);
 
 		this.webSocket = new this.webSocketFactoryImplementation(wsUri);
 
-		// The JS WebSocket API doesn't support setting headers, so we have to send the token as a message
 		this.webSocket.onopen = (): void => {
 			this.logger.info("WebSocket connection opened");
-			this.webSocketStatusChangeListeners.forEach((l) => l());
-
-			const message: WebSocketClientMessage = {
-				type: "handshake",
-				deviceId: this.deviceId,
-				token: settings.token,
-				lastSeenVaultUpdateId: this.database.getLastSeenUpdateId()
-			};
-			this.webSocket?.send(JSON.stringify(message));
+			this.webSocketStatusChangeListeners.forEach((listener) =>
+				listener(true)
+			);
 		};
 
 		this.webSocket.onmessage = async (event): Promise<void> => {
@@ -151,14 +170,20 @@ export class WebSocketManager {
 		};
 
 		this.webSocket.onclose = (event): void => {
-			this.logger.warn(
+			this.logger.error(
 				`WebSocket closed with code ${event.code} (${event.reason == "" ? "unknown reason" : event.reason})`
 			);
-			this.webSocketStatusChangeListeners.forEach((l) => l());
+			this.webSocketStatusChangeListeners.forEach((listener) =>
+				listener(false)
+			);
 
-			if (!this.isStopped) {
-				setTimeout(() => {
-					this.initializeWebSocket(this.settings.getSettings());
+			if (this.isStopped) {
+				this.resolveDisconnectingPromise?.();
+				this.resolveDisconnectingPromise = null;
+			} else {
+				this.reconnectTimeoutId = setTimeout(() => {
+					this.reconnectTimeoutId = undefined;
+					this.initializeWebSocket();
 				}, this.settings.getSettings().webSocketRetryIntervalMs);
 			}
 		};
@@ -168,37 +193,25 @@ export class WebSocketManager {
 		message: WebSocketServerMessage
 	): Promise<void> {
 		if (message.type === "vaultUpdate") {
-			try {
-				await Promise.all(
-					message.documents.map(async (document) =>
-						this.syncer.syncRemotelyUpdatedFile(document)
-					)
-				);
-
-				if (message.isInitialSync && message.documents.length > 0) {
-					this.database.setLastSeenUpdateId(
-						message.documents
-							.map((document) => document.vaultUpdateId)
-							.reduce((a, b) => Math.max(a, b))
-					);
-				}
-
-				this._isFirstSyncCompleted = true;
-			} catch (e) {
-				this.logger.error(`Failed to sync remotely updated file: ${e}`);
-			}
+			this.outstandingPromises.push(
+				...this.remoteVaultUpdateListeners.map((listener) =>
+					listener(message)
+				)
+			);
 			// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
 		} else if (message.type === "cursorPositions") {
 			this.logger.debug(
 				`Received cursor positions for ${JSON.stringify(message.clients)}`
 			);
-			this.remoteCursorsUpdateListeners.forEach((listener) => {
-				listener(
-					message.clients.filter(
-						(client) => client.deviceId !== this.deviceId
+			this.outstandingPromises.push(
+				...this.remoteCursorsUpdateListeners.map((listener) =>
+					listener(
+						message.clients.filter(
+							(client) => client.deviceId !== this.deviceId
+						)
 					)
-				);
-			});
+				)
+			);
 		} else {
 			this.logger.warn(
 				`Received unknown message type: ${JSON.stringify(message)}`

From 213a9e18fb292e916e3b866eb03053429983d2bf Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 23 Nov 2025 14:20:03 +0000
Subject: [PATCH 646/761] Use new WS api

---
 .../sync-client/src/sync-operations/syncer.ts | 62 ++++++++++++++++++-
 1 file changed, 60 insertions(+), 2 deletions(-)

diff --git a/frontend/sync-client/src/sync-operations/syncer.ts b/frontend/sync-client/src/sync-operations/syncer.ts
index d1aa5faf..ddfde46c 100644
--- a/frontend/sync-client/src/sync-operations/syncer.ts
+++ b/frontend/sync-client/src/sync-operations/syncer.ts
@@ -17,7 +17,9 @@ import { createPromise } from "../utils/create-promise";
 import { SyncResetError } from "../services/sync-reset-error";
 import { Locks } from "../utils/data-structures/locks";
 import type { DocumentVersionWithoutContent } from "../services/types/DocumentVersionWithoutContent";
-import type { FixedSizeDocumentCache } from "../utils/data-structures/fix-sized-cache";
+import { WebSocketVaultUpdate } from "../services/types/WebSocketVaultUpdate";
+import { WebSocketManager } from "../services/websocket-manager";
+import { WebSocketClientMessage } from "../services/types/WebSocketClientMessage";
 
 export class Syncer {
 	private readonly remoteDocumentsLock: Locks<DocumentId>;
@@ -26,13 +28,17 @@ export class Syncer {
 	) => unknown)[] = [];
 	private readonly syncQueue: PQueue;
 
+	private _isFirstSyncComplete = false;
+
 	private runningScheduleSyncForOfflineChanges: Promise<void> | undefined;
 
 	public constructor(
+		private readonly deviceId: string,
 		private readonly logger: Logger,
 		private readonly database: Database,
-		settings: Settings,
+		private readonly settings: Settings,
 		private readonly syncService: SyncService,
+		private readonly webSocketManager: WebSocketManager,
 		private readonly operations: FileOperations,
 		private readonly internalSyncer: UnrestrictedSyncer
 	) {
@@ -53,6 +59,22 @@ export class Syncer {
 				listener(this.syncQueue.size);
 			});
 		});
+
+		this.webSocketManager.addWebSocketStatusChangeListener(
+			(isConnected) => {
+				if (isConnected) {
+					// The JS WebSocket API doesn't support setting headers, so we have to send the token as a message
+					this.sendHandshakeMessage();
+				}
+			}
+		);
+		this.webSocketManager.addRemoteVaultUpdateListener(
+			this.syncRemotelyUpdatedFile.bind(this)
+		);
+	}
+
+	public get isFirstSyncComplete(): boolean {
+		return this._isFirstSyncComplete;
 	}
 
 	public addRemainingOperationsListener(
@@ -263,6 +285,42 @@ export class Syncer {
 	}
 
 	public async syncRemotelyUpdatedFile(
+		message: WebSocketVaultUpdate
+	): Promise<void> {
+		try {
+			const handlerPromise = Promise.allSettled(
+				message.documents.map(async (document) =>
+					this.internalSyncRemotelyUpdatedFile(document)
+				)
+			);
+
+			await handlerPromise;
+
+			if (message.isInitialSync && message.documents.length > 0) {
+				this.database.setLastSeenUpdateId(
+					message.documents
+						.map((document) => document.vaultUpdateId)
+						.reduce((a, b) => Math.max(a, b))
+				);
+			}
+
+			this._isFirstSyncComplete = true;
+		} catch (e) {
+			this.logger.error(`Failed to sync remotely updated file: ${e}`);
+		}
+	}
+
+	private sendHandshakeMessage(): void {
+		const message: WebSocketClientMessage = {
+			type: "handshake",
+			deviceId: this.deviceId,
+			token: this.settings.getSettings().token,
+			lastSeenVaultUpdateId: this.database.getLastSeenUpdateId()
+		};
+		this.webSocketManager.sendHandshakeMessage(message);
+	}
+
+	private async internalSyncRemotelyUpdatedFile(
 		remoteVersion: DocumentVersionWithoutContent
 	): Promise<void> {
 		let document = this.database.getDocumentByDocumentId(

From 3cdd2a43879bc21da7496b55ea56c8afa69d9429 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 23 Nov 2025 14:24:56 +0000
Subject: [PATCH 647/761] Use updated APIs

---
 frontend/sync-client/src/sync-client.ts | 191 ++++++++++++++----------
 1 file changed, 116 insertions(+), 75 deletions(-)

diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts
index 5c242045..56249e5b 100644
--- a/frontend/sync-client/src/sync-client.ts
+++ b/frontend/sync-client/src/sync-client.ts
@@ -1,16 +1,17 @@
 import type { PersistenceProvider } from "./persistence/persistence";
 import type { HistoryEntry, HistoryStats } from "./tracing/sync-history";
 import { SyncHistory } from "./tracing/sync-history";
-import { Logger } from "./tracing/logger";
+import { Logger, LogLevel, LogLine } from "./tracing/logger";
 import type { RelativePath, StoredDatabase } from "./persistence/database";
 import { Database } from "./persistence/database";
+import * as Sentry from "@sentry/browser";
 import type { SyncSettings } from "./persistence/settings";
-import { Settings } from "./persistence/settings";
+import { DEFAULT_SETTINGS, Settings } from "./persistence/settings";
 import { SyncService } from "./services/sync-service";
 import { Syncer } from "./sync-operations/syncer";
 import type { FileSystemOperations } from "./file-operations/filesystem-operations";
 import { FileOperations } from "./file-operations/file-operations";
-import { ConnectionStatus } from "./services/connection-status";
+import { FetchController } from "./services/fetch-controller";
 import { UnrestrictedSyncer } from "./sync-operations/unrestricted-syncer";
 import { rateLimit } from "./utils/rate-limit";
 import type { NetworkConnectionStatus } from "./types/network-connection-status";
@@ -23,9 +24,9 @@ import type { MaybeOutdatedClientCursors } from "./types/maybe-outdated-client-c
 import { FileChangeNotifier } from "./sync-operations/file-change-notifier";
 import { FixedSizeDocumentCache } from "./utils/data-structures/fix-sized-cache";
 import { setUpTelemetry } from "./utils/set-up-telemetry";
+import { DIFF_CACHE_SIZE_MB, MINIMUM_SAVE_INTERVAL_MS } from "./consts";
 
 export class SyncClient {
-	private static readonly MINIMUM_SAVE_INTERVAL_MS = 1000;
 	private hasStartedOfflineSync = false;
 	private hasFinishedOfflineSync = false;
 	private unloadTelemetry?: () => void;
@@ -37,53 +38,84 @@ export class SyncClient {
 		private readonly syncer: Syncer,
 		private readonly syncService: SyncService,
 		private readonly webSocketManager: WebSocketManager,
-		private readonly _logger: Logger,
-		private readonly connectionStatus: ConnectionStatus,
+		public readonly logger: Logger,
+		private readonly fetchController: FetchController,
 		private readonly cursorTracker: CursorTracker,
 		private readonly fileChangeNotifier: FileChangeNotifier,
-		private readonly contentCache: FixedSizeDocumentCache
-	) {
-		if (settings.getSettings().enableTelemetry) {
+		private readonly contentCache: FixedSizeDocumentCache,
+		private readonly persistence: PersistenceProvider<
+			Partial<{
+				settings: Partial<SyncSettings>;
+				database: Partial<StoredDatabase>;
+			}>
+		>
+	) {}
+
+	public async start(): Promise<void> {
+		if (this.settings.getSettings().enableTelemetry) {
 			this.unloadTelemetry = setUpTelemetry();
 		}
 
-		this.settings.addOnSettingsChangeListener(
-			async (newSettings, oldSettings) => {
-				if (newSettings.vaultName !== oldSettings.vaultName) {
-					await this.reset();
-				}
-
-				if (newSettings.isSyncEnabled !== oldSettings.isSyncEnabled) {
-					if (newSettings.isSyncEnabled) {
-						await this.start();
-					} else {
-						this.stop();
-					}
-				}
-
-				if (
-					newSettings.diffCacheSizeMB !== oldSettings.diffCacheSizeMB
-				) {
-					this.contentCache.resize(
-						newSettings.diffCacheSizeMB * 1024 * 1024
-					);
-				}
-
-				if (
-					newSettings.enableTelemetry !== oldSettings.enableTelemetry
-				) {
-					if (newSettings.enableTelemetry) {
-						this.unloadTelemetry = setUpTelemetry();
-					} else {
-						this.unloadTelemetry?.();
-					}
-				}
+		this.logger.addOnMessageListener((log): void => {
+			if (log.level === LogLevel.ERROR && Sentry.isInitialized()) {
+				Sentry.captureMessage(log.message);
 			}
+		});
+
+		this.settings.addOnSettingsChangeListener(
+			this.onSettingsChange.bind(this)
 		);
+
+		if (this.settings.getSettings().isSyncEnabled) {
+			this.logger.info("Starting SyncClient");
+			await this.startSyncing();
+			this.logger.info("SyncClient has successfully started");
+		}
 	}
 
-	public get logger(): Logger {
-		return this._logger;
+	// Reload settings from disk overriding current in-memory settings.
+	// Missing values will be filled in from DEFAULT_SETTINGS rather than
+	// retaining current in-memory settings.
+	public async reloadSettings(): Promise<void> {
+		let state = (await this.persistence.load()) ?? {
+			settings: undefined
+		};
+
+		const settings = {
+			...DEFAULT_SETTINGS,
+			...(state.settings ?? {})
+		};
+
+		this.setSettings(settings);
+	}
+
+	private async onSettingsChange(
+		newSettings: SyncSettings,
+		oldSettings: SyncSettings
+	): Promise<void> {
+		if (newSettings.vaultName !== oldSettings.vaultName) {
+			await this.reset();
+		}
+
+		if (newSettings.isSyncEnabled !== oldSettings.isSyncEnabled) {
+			if (newSettings.isSyncEnabled) {
+				await this.startSyncing();
+			} else {
+				this.stop();
+			}
+		}
+
+		if (newSettings.diffCacheSizeMB !== oldSettings.diffCacheSizeMB) {
+			this.contentCache.resize(newSettings.diffCacheSizeMB * 1024 * 1024);
+		}
+
+		if (newSettings.enableTelemetry !== oldSettings.enableTelemetry) {
+			if (newSettings.enableTelemetry) {
+				this.unloadTelemetry = setUpTelemetry();
+			} else {
+				this.unloadTelemetry?.();
+			}
+		}
 	}
 
 	public get documentCount(): number {
@@ -116,7 +148,7 @@ export class SyncClient {
 
 		const deviceId = createClientId();
 
-		logger.info(`Initialising SyncClient with client id ${deviceId}`);
+		logger.info(`Creating SyncClient with client id ${deviceId}`);
 
 		const history = new SyncHistory(logger);
 
@@ -127,7 +159,7 @@ export class SyncClient {
 
 		const rateLimitedSave = rateLimit(
 			persistence.save,
-			SyncClient.MINIMUM_SAVE_INTERVAL_MS
+			MINIMUM_SAVE_INTERVAL_MS
 		);
 
 		const database = new Database(
@@ -148,19 +180,19 @@ export class SyncClient {
 			}
 		);
 
-		const connectionStatus = new FetchController(
+		const fetchController = new FetchController(
 			settings.getSettings().isSyncEnabled,
 			logger
 		);
 		settings.addOnSettingsChangeListener((newSettings, oldSettings) => {
 			if (oldSettings.isSyncEnabled != newSettings.isSyncEnabled) {
-				connectionStatus.canFetch = newSettings.isSyncEnabled;
+				fetchController.canFetch = newSettings.isSyncEnabled;
 			}
 		});
 
 		const syncService = new SyncService(
 			deviceId,
-			connectionStatus,
+			fetchController,
 			settings,
 			logger,
 			fetch
@@ -173,7 +205,9 @@ export class SyncClient {
 			nativeLineEndings
 		);
 
-		const contentCache = new FixedSizeDocumentCache(1024 * 1024 * 2); // 2 MB cache
+		const contentCache = new FixedSizeDocumentCache(
+			1024 * 1024 * DIFF_CACHE_SIZE_MB
+		);
 		const unrestrictedSyncer = new UnrestrictedSyncer(
 			logger,
 			database,
@@ -184,22 +218,22 @@ export class SyncClient {
 			contentCache
 		);
 
-		const syncer = new Syncer(
+		const webSocketManager = new WebSocketManager(
+			deviceId,
 			logger,
-			database,
 			settings,
-			syncService,
-			fileOperations,
-			unrestrictedSyncer
+			webSocket
 		);
 
-		const webSocketManager = new WebSocketManager(
+		const syncer = new Syncer(
 			deviceId,
 			logger,
 			database,
 			settings,
-			syncer,
-			webSocket
+			syncService,
+			webSocketManager,
+			fileOperations,
+			unrestrictedSyncer
 		);
 
 		const fileChangeNotifier = new FileChangeNotifier();
@@ -217,13 +251,14 @@ export class SyncClient {
 			syncService,
 			webSocketManager,
 			logger,
-			connectionStatus,
+			fetchController,
 			cursorTracker,
 			fileChangeNotifier,
-			contentCache
+			contentCache,
+			persistence
 		);
 
-		logger.info("SyncClient initialised");
+		logger.info("SyncClient created successfully");
 
 		return client;
 	}
@@ -247,39 +282,48 @@ export class SyncClient {
 		this.history.addSyncHistoryUpdateListener(listener);
 	}
 
-	public async start(): Promise<void> {
+	private async startSyncing(): Promise<void> {
 		if (!this.hasStartedOfflineSync) {
-			await this.syncer.scheduleSyncForOfflineChanges();
 			this.hasStartedOfflineSync = true;
+			await this.syncer.scheduleSyncForOfflineChanges();
 		}
 
 		this.hasFinishedOfflineSync = true;
 		this.webSocketManager.start();
 	}
 
-	public stop(): void {
+	private stop(): void {
 		this.hasFinishedOfflineSync = false;
 		this.webSocketManager.stop();
+
+		this.unloadTelemetry?.();
 	}
 
-	public async waitAndStop(): Promise<void> {
-		this.stop();
+	public async waitUntilStopped(): Promise<void> {
 		await this.syncer.waitUntilFinished();
 	}
 
+	public async applyChangedConnectionSettings(): Promise<void> {
+		this.fetchController.startReset();
+		this.webSocketManager.stop();
+
+		this.webSocketManager.start();
+		this.fetchController.finishReset();
+	}
+
 	/// Wait for the in-flight operations to finish, reset all tracking,
 	/// and the local database but retain the settings.
 	/// The SyncClient can be used again after calling this method.
-	public async reset(): Promise<void> {
+	private async reset(): Promise<void> {
 		this.stop();
-		this.connectionStatus.startReset();
+		this.fetchController.startReset();
 		this.contentCache.clear();
 		await this.syncer.reset();
 		this.history.reset();
 		this.database.reset();
-		this._logger.reset();
-		this.connectionStatus.finishReset();
-		await this.start();
+		this.logger.reset();
+		this.fetchController.finishReset();
+		await this.startSyncing();
 	}
 
 	public getSettings(): SyncSettings {
@@ -298,9 +342,9 @@ export class SyncClient {
 	}
 
 	public addOnSettingsChangeListener(
-		handler: (settings: SyncSettings, oldSettings: SyncSettings) => unknown
+		listener: (settings: SyncSettings, oldSettings: SyncSettings) => unknown
 	): void {
-		this.settings.addOnSettingsChangeListener(handler);
+		this.settings.addOnSettingsChangeListener(listener);
 	}
 
 	public addRemainingSyncOperationsListener(
@@ -348,10 +392,7 @@ export class SyncClient {
 			return DocumentSyncStatus.SYNCING_IS_DISABLED;
 		}
 
-		if (
-			!this.webSocketManager.isFirstSyncCompleted ||
-			!this.hasFinishedOfflineSync
-		) {
+		if (!this.syncer.isFirstSyncComplete || !this.hasFinishedOfflineSync) {
 			return DocumentSyncStatus.SYNCING;
 		}
 

From 83c15a77c3dd3db0178fc8e104c69370c1496492 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 23 Nov 2025 14:59:56 +0000
Subject: [PATCH 648/761] Add 2 more settings from consts

---
 frontend/sync-client/src/consts.ts            |  7 +++---
 .../sync-client/src/persistence/settings.ts   |  6 ++++-
 .../sync-client/src/services/sync-service.ts  |  7 +++---
 frontend/sync-client/src/sync-client.ts       | 25 +++++++++++--------
 frontend/sync-client/src/utils/rate-limit.ts  | 11 +++++---
 5 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/frontend/sync-client/src/consts.ts b/frontend/sync-client/src/consts.ts
index 7dfe27ec..64f581f1 100644
--- a/frontend/sync-client/src/consts.ts
+++ b/frontend/sync-client/src/consts.ts
@@ -1,7 +1,6 @@
-export const NETWORK_RETRY_INTERVAL_MS = 1000;
-export const MINIMUM_SAVE_INTERVAL_MS = 1000;
+export const MERGABLE_FILE_TYPES = ["md", "txt"];
+
+export const TIMEOUT_FOR_MERGING_HISTORY_ENTRIES_IN_SECONDS = 60;
 export const DIFF_CACHE_SIZE_MB = 2;
 export const MAX_LOG_MESSAGE_COUNT = 100000;
 export const MAX_HISTORY_ENTRY_COUNT = 5000;
-export const TIMEOUT_FOR_MERGING_HISTORY_ENTRIES_IN_SECONDS = 60;
-export const MERGABLE_FILE_TYPES = ["md", "txt"];
diff --git a/frontend/sync-client/src/persistence/settings.ts b/frontend/sync-client/src/persistence/settings.ts
index 98c5c523..6ce4eeb5 100644
--- a/frontend/sync-client/src/persistence/settings.ts
+++ b/frontend/sync-client/src/persistence/settings.ts
@@ -11,6 +11,8 @@ export interface SyncSettings {
 	webSocketRetryIntervalMs: number;
 	diffCacheSizeMB: number;
 	enableTelemetry: boolean;
+	networkRetryIntervalMs: number;
+	minimumSaveIntervalMs: number;
 }
 
 export const DEFAULT_SETTINGS: SyncSettings = {
@@ -23,7 +25,9 @@ export const DEFAULT_SETTINGS: SyncSettings = {
 	ignorePatterns: [],
 	webSocketRetryIntervalMs: 3500,
 	diffCacheSizeMB: 4,
-	enableTelemetry: false
+	enableTelemetry: false,
+	networkRetryIntervalMs: 1000,
+	minimumSaveIntervalMs: 1000
 };
 
 export class Settings {
diff --git a/frontend/sync-client/src/services/sync-service.ts b/frontend/sync-client/src/services/sync-service.ts
index 91d6f8df..c23fe95b 100644
--- a/frontend/sync-client/src/services/sync-service.ts
+++ b/frontend/sync-client/src/services/sync-service.ts
@@ -17,7 +17,6 @@ import type { FetchLatestDocumentsResponse } from "./types/FetchLatestDocumentsR
 import type { PingResponse } from "./types/PingResponse";
 import type { DeleteDocumentVersion } from "./types/DeleteDocumentVersion";
 import type { UpdateTextDocumentVersion } from "./types/UpdateTextDocumentVersion";
-import { NETWORK_RETRY_INTERVAL_MS } from "../consts";
 
 export class SyncService {
 	private readonly client: typeof globalThis.fetch;
@@ -371,10 +370,12 @@ export class SyncService {
 					throw e;
 				}
 
+				const retryInterval =
+					this.settings.getSettings().networkRetryIntervalMs;
 				this.logger.error(
-					`Failed network call (${e}), retrying in ${NETWORK_RETRY_INTERVAL_MS}ms`
+					`Failed network call (${e}), retrying in ${retryInterval}ms`
 				);
-				await sleep(NETWORK_RETRY_INTERVAL_MS);
+				await sleep(retryInterval);
 			}
 		}
 	}
diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts
index 56249e5b..26ebe168 100644
--- a/frontend/sync-client/src/sync-client.ts
+++ b/frontend/sync-client/src/sync-client.ts
@@ -24,7 +24,7 @@ import type { MaybeOutdatedClientCursors } from "./types/maybe-outdated-client-c
 import { FileChangeNotifier } from "./sync-operations/file-change-notifier";
 import { FixedSizeDocumentCache } from "./utils/data-structures/fix-sized-cache";
 import { setUpTelemetry } from "./utils/set-up-telemetry";
-import { DIFF_CACHE_SIZE_MB, MINIMUM_SAVE_INTERVAL_MS } from "./consts";
+import { DIFF_CACHE_SIZE_MB } from "./consts";
 
 export class SyncClient {
 	private hasStartedOfflineSync = false;
@@ -157,9 +157,20 @@ export class SyncClient {
 			database: undefined
 		};
 
+		const settings = new Settings(
+			logger,
+			state.settings,
+			async (data): Promise<void> => {
+				state = { ...state, settings: data };
+				// we're not rate-limiting settings saves as (1) we need to initialise the settings to know the rate limit
+				// and (2) settings changes are infrequent enough that rate-limiting is not necessary
+				await persistence.save(state);
+			}
+		);
+
 		const rateLimitedSave = rateLimit(
 			persistence.save,
-			MINIMUM_SAVE_INTERVAL_MS
+			() => settings.getSettings().minimumSaveIntervalMs
 		);
 
 		const database = new Database(
@@ -171,15 +182,6 @@ export class SyncClient {
 			}
 		);
 
-		const settings = new Settings(
-			logger,
-			state.settings,
-			async (data): Promise<void> => {
-				state = { ...state, settings: data };
-				await rateLimitedSave(state);
-			}
-		);
-
 		const fetchController = new FetchController(
 			settings.getSettings().isSyncEnabled,
 			logger
@@ -201,6 +203,7 @@ export class SyncClient {
 		const fileOperations = new FileOperations(
 			logger,
 			database,
+			settings,
 			fs,
 			nativeLineEndings
 		);
diff --git a/frontend/sync-client/src/utils/rate-limit.ts b/frontend/sync-client/src/utils/rate-limit.ts
index 4de89ae8..2c6d018b 100644
--- a/frontend/sync-client/src/utils/rate-limit.ts
+++ b/frontend/sync-client/src/utils/rate-limit.ts
@@ -10,7 +10,8 @@ import { sleep } from "./sleep";
  *
  * @template T - Type of the function to be rate limited
  * @param {T} fn - The asynchronous function to rate limit
- * @param {number} minIntervalMs - The minimum interval in milliseconds between function calls
+ * @param {number | (() => number)} minIntervalMs - Minimum interval in milliseconds between calls,
+ *        or a function that returns the minimum interval
  * @returns {(...args: Parameters<T>) => ReturnType<T> | Promise<undefined>} A decorated function that respects the rate limit.
  *         Returns the original function's return type when executed, or undefined if the call was superseded by a newer one.
  */
@@ -21,7 +22,7 @@ export function rateLimit<
 	) => Promise<R>
 >(
 	fn: T,
-	minIntervalMs: number
+	minIntervalMs: number | (() => number)
 ): (...args: Parameters<T>) => Promise<R | undefined> {
 	let newArgs: Parameters<T> | undefined = undefined;
 	let running: Promise<unknown> | undefined = undefined;
@@ -46,7 +47,11 @@ export function rateLimit<
 
 		const [promise, resolve] = createPromise();
 		running = promise;
-		sleep(minIntervalMs)
+		sleep(
+			typeof minIntervalMs === "function"
+				? minIntervalMs()
+				: minIntervalMs
+		)
 			.then(resolve)
 			.catch(() => {
 				// sleep cannot fail

From 17fa584ea14da711b42a4de687344aa6e5ecad94 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 23 Nov 2025 15:09:35 +0000
Subject: [PATCH 649/761] use allSettled

---
 .../sync-client/src/persistence/database.ts   |  2 +-
 .../sync-client/src/sync-operations/syncer.ts | 23 +++++--------------
 .../src/utils/data-structures/locks.ts        |  4 +++-
 frontend/test-client/src/agent/mock-agent.ts  |  2 +-
 frontend/test-client/src/cli.ts               |  6 +++--
 5 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/frontend/sync-client/src/persistence/database.ts b/frontend/sync-client/src/persistence/database.ts
index 827cf164..62962dba 100644
--- a/frontend/sync-client/src/persistence/database.ts
+++ b/frontend/sync-client/src/persistence/database.ts
@@ -183,7 +183,7 @@ export class Database {
 
 		const currentPromises = entry.updates;
 		entry.updates = [...currentPromises, promise];
-		await Promise.all(currentPromises);
+		await Promise.allSettled(currentPromises);
 
 		return entry;
 	}
diff --git a/frontend/sync-client/src/sync-operations/syncer.ts b/frontend/sync-client/src/sync-operations/syncer.ts
index ddfde46c..c8d30c31 100644
--- a/frontend/sync-client/src/sync-operations/syncer.ts
+++ b/frontend/sync-client/src/sync-operations/syncer.ts
@@ -26,6 +26,8 @@ export class Syncer {
 	private readonly remainingOperationsListeners: ((
 		remainingOperations: number
 	) => unknown)[] = [];
+
+	// FIFO to limit the number of concurrent sync operations
 	private readonly syncQueue: PQueue;
 
 	private _isFirstSyncComplete = false;
@@ -83,15 +85,6 @@ export class Syncer {
 		this.remainingOperationsListeners.push(listener);
 	}
 
-	public removeRemainingOperationsListener(
-		listener: (remainingOperations: number) => unknown
-	): void {
-		const index = this.remainingOperationsListeners.indexOf(listener);
-		if (index !== -1) {
-			this.remainingOperationsListeners.splice(index, 1);
-		}
-	}
-
 	public async syncLocallyCreatedFile(
 		relativePath: RelativePath
 	): Promise<void> {
@@ -280,10 +273,6 @@ export class Syncer {
 		return this.syncQueue.onEmpty();
 	}
 
-	public async reset(): Promise<void> {
-		await this.waitUntilFinished();
-	}
-
 	public async syncRemotelyUpdatedFile(
 		message: WebSocketVaultUpdate
 	): Promise<void> {
@@ -416,7 +405,7 @@ export class Syncer {
 			}
 		}
 
-		const updates = Promise.all(
+		const updates = Promise.allSettled(
 			allLocalFiles.map(async (relativePath) => {
 				if (
 					this.database.getLatestDocumentByRelativePath(relativePath)
@@ -474,7 +463,7 @@ export class Syncer {
 			})
 		);
 
-		const deletes = Promise.all(
+		const deletes = Promise.allSettled(
 			locallyPossiblyDeletedFiles.map(async ({ relativePath }) => {
 				this.logger.debug(
 					`Document ${relativePath} has been deleted locally, scheduling sync to delete it`
@@ -485,7 +474,7 @@ export class Syncer {
 			})
 		);
 
-		await Promise.all([updates, deletes]);
+		await Promise.allSettled([updates, deletes]);
 	}
 
 	/**
@@ -498,7 +487,7 @@ export class Syncer {
 			return;
 		}
 
-		const [allLocalFiles, remote] = await Promise.all([
+		const [allLocalFiles, remote] = await Promise.allSettled([
 			this.operations.listFilesRecursively(),
 			this.syncQueue.add(async () => this.syncService.getAll())
 		]);
diff --git a/frontend/sync-client/src/utils/data-structures/locks.ts b/frontend/sync-client/src/utils/data-structures/locks.ts
index e835a4a3..4e510943 100644
--- a/frontend/sync-client/src/utils/data-structures/locks.ts
+++ b/frontend/sync-client/src/utils/data-structures/locks.ts
@@ -54,7 +54,9 @@ export class Locks<T> {
 		const uniqueKeys = Array.from(new Set(keys));
 		uniqueKeys.sort((a, b) => String(a).localeCompare(String(b))); // Ensure consistent order to prevent deadlocks
 
-		await Promise.all(uniqueKeys.map(async (key) => this.waitForLock(key)));
+		await Promise.allSettled(
+			uniqueKeys.map(async (key) => this.waitForLock(key))
+		);
 
 		try {
 			return await fn();
diff --git a/frontend/test-client/src/agent/mock-agent.ts b/frontend/test-client/src/agent/mock-agent.ts
index a6ced45d..980da34b 100644
--- a/frontend/test-client/src/agent/mock-agent.ts
+++ b/frontend/test-client/src/agent/mock-agent.ts
@@ -127,7 +127,7 @@ export class MockAgent extends MockClient {
 
 	public async finish(): Promise<void> {
 		await this.client.setSetting("isSyncEnabled", true);
-		await Promise.all(this.pendingActions);
+		await Promise.allSettled(this.pendingActions);
 		await this.client.waitAndStop();
 	}
 
diff --git a/frontend/test-client/src/cli.ts b/frontend/test-client/src/cli.ts
index 4a3aab4f..578dab0a 100644
--- a/frontend/test-client/src/cli.ts
+++ b/frontend/test-client/src/cli.ts
@@ -53,11 +53,13 @@ async function runTest({
 	}
 
 	try {
-		await Promise.all(clients.map(async (client) => client.init()));
+		await Promise.allSettled(clients.map(async (client) => client.init()));
 
 		for (let i = 0; i < iterations; i++) {
 			console.info(`Iteration ${i + 1}/${iterations}`);
-			await Promise.all(clients.map(async (client) => client.act()));
+			await Promise.allSettled(
+				clients.map(async (client) => client.act())
+			);
 			await sleep(100);
 		}
 

From 5a0c64d39cda6c603ae20afdbbf247f332bdacb8 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 23 Nov 2025 15:12:55 +0000
Subject: [PATCH 650/761] Ban bad methods

---
 frontend/eslint.config.mjs | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/frontend/eslint.config.mjs b/frontend/eslint.config.mjs
index 8e13be78..4ed3f642 100644
--- a/frontend/eslint.config.mjs
+++ b/frontend/eslint.config.mjs
@@ -37,6 +37,19 @@ export default [
 			"@typescript-eslint/no-magic-numbers": "off",
 			"@typescript-eslint/prefer-readonly-parameter-types": "off",
 			"@typescript-eslint/naming-convention": "off",
+			"no-restricted-properties": [
+				"error",
+				{
+					object: "Promise",
+					property: "all",
+					message: "Use Promise.allSettled instead of Promise.all to always await all promises."
+				},
+				{
+					object: "String",
+					property: "replace",
+					message: "Use replaceAll instead of replace to replace all occurrences of a substring."
+				}
+			],
 			"unused-imports/no-unused-vars": [
 				"warn",
 				{

From fb2d82a06e1cec9041431421e10cf52d942e5a76 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 23 Nov 2025 15:13:30 +0000
Subject: [PATCH 651/761] Lint

---
 frontend/obsidian-plugin/src/obsidian-file-system.ts |  5 +++--
 frontend/obsidian-plugin/src/vault-link-plugin.ts    |  6 +++---
 .../src/services/fetch-controller.test.ts            |  2 +-
 .../sync-client/src/services/websocket-manager.ts    | 12 ++++++------
 frontend/sync-client/src/sync-client.ts              |  2 +-
 frontend/test-client/src/agent/mock-client.ts        |  7 ++++---
 6 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/frontend/obsidian-plugin/src/obsidian-file-system.ts b/frontend/obsidian-plugin/src/obsidian-file-system.ts
index 434d1456..a699433a 100644
--- a/frontend/obsidian-plugin/src/obsidian-file-system.ts
+++ b/frontend/obsidian-plugin/src/obsidian-file-system.ts
@@ -1,8 +1,9 @@
 import type { Stat, Vault, Workspace } from "obsidian";
 import { MarkdownView, normalizePath } from "obsidian";
-import {
+import type {
 	CursorPosition,
-	TextWithCursors,
+	TextWithCursors} from "sync-client";
+import {
 	utils,
 	type FileSystemOperations,
 	type RelativePath
diff --git a/frontend/obsidian-plugin/src/vault-link-plugin.ts b/frontend/obsidian-plugin/src/vault-link-plugin.ts
index e6373789..47c829bd 100644
--- a/frontend/obsidian-plugin/src/vault-link-plugin.ts
+++ b/frontend/obsidian-plugin/src/vault-link-plugin.ts
@@ -38,7 +38,7 @@ export default class VaultLinkPlugin extends Plugin {
 		() => Promise<unknown>
 	>();
 
-	private syncClient: SyncClient | undefined;
+	private readonly syncClient: SyncClient | undefined;
 	private settingsTab: SyncSettingsTab | undefined;
 
 	public async onload(): Promise<void> {
@@ -152,7 +152,7 @@ export default class VaultLinkPlugin extends Plugin {
 
 		this.registerView(HistoryView.TYPE, (leaf) => {
 			const view = new HistoryView(client, leaf);
-			this.register(() => view.onClose());
+			this.register(async () => view.onClose());
 			return view;
 		});
 
@@ -180,7 +180,7 @@ export default class VaultLinkPlugin extends Plugin {
 			this.app.workspace,
 			client
 		);
-		this.register(() => editorStatusDisplayManager.dispose());
+		this.register(() => { editorStatusDisplayManager.dispose(); });
 	}
 
 	private addRibbonIcons(): void {
diff --git a/frontend/sync-client/src/services/fetch-controller.test.ts b/frontend/sync-client/src/services/fetch-controller.test.ts
index b349ced2..b4804557 100644
--- a/frontend/sync-client/src/services/fetch-controller.test.ts
+++ b/frontend/sync-client/src/services/fetch-controller.test.ts
@@ -106,7 +106,7 @@ describe("FetchController", () => {
 		const controller = new FetchController(true, logger);
 
 		assert.throws(
-			() => controller.finishReset(),
+			() => { controller.finishReset(); },
 			(error: unknown) =>
 				error instanceof Error &&
 				error.message === "Cannot finish reset when not resetting"
diff --git a/frontend/sync-client/src/services/websocket-manager.ts b/frontend/sync-client/src/services/websocket-manager.ts
index 06432e89..e399b0be 100644
--- a/frontend/sync-client/src/services/websocket-manager.ts
+++ b/frontend/sync-client/src/services/websocket-manager.ts
@@ -5,7 +5,7 @@ import type { WebSocketClientMessage } from "./types/WebSocketClientMessage";
 import type { CursorPositionFromClient } from "./types/CursorPositionFromClient";
 import type { ClientCursors } from "./types/ClientCursors";
 import { createPromise } from "../utils/create-promise";
-import { WebSocketVaultUpdate } from "./types/WebSocketVaultUpdate";
+import type { WebSocketVaultUpdate } from "./types/WebSocketVaultUpdate";
 
 export class WebSocketManager {
 	private readonly webSocketStatusChangeListeners: ((
@@ -26,7 +26,7 @@ export class WebSocketManager {
 	private resolveDisconnectingPromise: null | (() => unknown) = null;
 	private reconnectTimeoutId: ReturnType<typeof setTimeout> | undefined;
 
-	private readonly outstandingPromises: Array<Promise<unknown>> = [];
+	private readonly outstandingPromises: Promise<unknown>[] = [];
 	private readonly webSocketFactoryImplementation: typeof globalThis.WebSocket;
 
 	public constructor(
@@ -104,7 +104,7 @@ export class WebSocketManager {
 	public sendHandshakeMessage(
 		message: WebSocketClientMessage & { type: "handshake" }
 	): void {
-		const webSocket = this.webSocket;
+		const {webSocket} = this;
 		if (!webSocket) {
 			throw new Error(
 				"WebSocket is not connected, cannot send handshake message"
@@ -126,7 +126,7 @@ export class WebSocketManager {
 			type: "cursorPositions",
 			...cursorPositions
 		};
-		const webSocket = this.webSocket;
+		const {webSocket} = this;
 		if (!webSocket) {
 			this.logger.warn(
 				"WebSocket is not connected, cannot send cursor positions"
@@ -194,7 +194,7 @@ export class WebSocketManager {
 	): Promise<void> {
 		if (message.type === "vaultUpdate") {
 			this.outstandingPromises.push(
-				...this.remoteVaultUpdateListeners.map((listener) =>
+				...this.remoteVaultUpdateListeners.map(async (listener) =>
 					listener(message)
 				)
 			);
@@ -204,7 +204,7 @@ export class WebSocketManager {
 				`Received cursor positions for ${JSON.stringify(message.clients)}`
 			);
 			this.outstandingPromises.push(
-				...this.remoteCursorsUpdateListeners.map((listener) =>
+				...this.remoteCursorsUpdateListeners.map(async (listener) =>
 					listener(
 						message.clients.filter(
 							(client) => client.deviceId !== this.deviceId
diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts
index 26ebe168..4bd27228 100644
--- a/frontend/sync-client/src/sync-client.ts
+++ b/frontend/sync-client/src/sync-client.ts
@@ -77,7 +77,7 @@ export class SyncClient {
 	// Missing values will be filled in from DEFAULT_SETTINGS rather than
 	// retaining current in-memory settings.
 	public async reloadSettings(): Promise<void> {
-		let state = (await this.persistence.load()) ?? {
+		const state = (await this.persistence.load()) ?? {
 			settings: undefined
 		};
 
diff --git a/frontend/test-client/src/agent/mock-client.ts b/frontend/test-client/src/agent/mock-client.ts
index d0b7f451..34186ce7 100644
--- a/frontend/test-client/src/agent/mock-client.ts
+++ b/frontend/test-client/src/agent/mock-client.ts
@@ -1,11 +1,12 @@
-import type { StoredDatabase } from "sync-client";
+import type { StoredDatabase ,
+	TextWithCursors
+} from "sync-client";
 import { assert } from "../utils/assert";
 import {
 	type RelativePath,
 	type FileSystemOperations,
 	type SyncSettings,
-	SyncClient,
-	TextWithCursors
+	SyncClient
 } from "sync-client";
 
 export class MockClient implements FileSystemOperations {

From ef4444afc29ecedaf726eb7bbc4c62ed40c004e2 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 23 Nov 2025 15:21:36 +0000
Subject: [PATCH 652/761] Lint

---
 frontend/sync-client/src/sync-operations/syncer.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/sync-client/src/sync-operations/syncer.ts b/frontend/sync-client/src/sync-operations/syncer.ts
index c8d30c31..053eaacd 100644
--- a/frontend/sync-client/src/sync-operations/syncer.ts
+++ b/frontend/sync-client/src/sync-operations/syncer.ts
@@ -17,9 +17,9 @@ import { createPromise } from "../utils/create-promise";
 import { SyncResetError } from "../services/sync-reset-error";
 import { Locks } from "../utils/data-structures/locks";
 import type { DocumentVersionWithoutContent } from "../services/types/DocumentVersionWithoutContent";
-import { WebSocketVaultUpdate } from "../services/types/WebSocketVaultUpdate";
-import { WebSocketManager } from "../services/websocket-manager";
-import { WebSocketClientMessage } from "../services/types/WebSocketClientMessage";
+import type { WebSocketVaultUpdate } from "../services/types/WebSocketVaultUpdate";
+import type { WebSocketManager } from "../services/websocket-manager";
+import type { WebSocketClientMessage } from "../services/types/WebSocketClientMessage";
 
 export class Syncer {
 	private readonly remoteDocumentsLock: Locks<DocumentId>;

From d8058d396c8e1d372d16cd88ab07fe15969a267d Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 23 Nov 2025 15:22:50 +0000
Subject: [PATCH 653/761] Add awaitAll

---
 frontend/eslint.config.mjs                    |  7 ++-
 .../sync-client/src/persistence/database.ts   |  3 +-
 .../src/services/websocket-manager.ts         |  7 ++-
 .../sync-client/src/sync-operations/syncer.ts | 11 ++--
 .../sync-client/src/utils/await-all.test.ts   | 56 +++++++++++++++++++
 frontend/sync-client/src/utils/await-all.ts   | 22 ++++++++
 .../src/utils/data-structures/locks.ts        |  5 +-
 frontend/test-client/src/cli.ts               |  6 +-
 8 files changed, 100 insertions(+), 17 deletions(-)
 create mode 100644 frontend/sync-client/src/utils/await-all.test.ts
 create mode 100644 frontend/sync-client/src/utils/await-all.ts

diff --git a/frontend/eslint.config.mjs b/frontend/eslint.config.mjs
index 4ed3f642..b2ed7a35 100644
--- a/frontend/eslint.config.mjs
+++ b/frontend/eslint.config.mjs
@@ -42,7 +42,12 @@ export default [
 				{
 					object: "Promise",
 					property: "all",
-					message: "Use Promise.allSettled instead of Promise.all to always await all promises."
+					message: "Use `awaitAll` instead of Promise.all to always await all promises."
+				},
+                {
+					object: "Promise",
+					property: "allSettled",
+					message: "Use `awaitAll` instead of Promise.allSettled to always await all promises and throw on errors."
 				},
 				{
 					object: "String",
diff --git a/frontend/sync-client/src/persistence/database.ts b/frontend/sync-client/src/persistence/database.ts
index 62962dba..1ad5af71 100644
--- a/frontend/sync-client/src/persistence/database.ts
+++ b/frontend/sync-client/src/persistence/database.ts
@@ -1,6 +1,7 @@
 import type { Logger } from "../tracing/logger";
 import { EMPTY_HASH } from "../utils/hash";
 import { CoveredValues } from "../utils/data-structures/min-covered";
+import { awaitAll } from "../utils/await-all";
 
 export type VaultUpdateId = number;
 export type DocumentId = string;
@@ -183,7 +184,7 @@ export class Database {
 
 		const currentPromises = entry.updates;
 		entry.updates = [...currentPromises, promise];
-		await Promise.allSettled(currentPromises);
+		await awaitAll(currentPromises);
 
 		return entry;
 	}
diff --git a/frontend/sync-client/src/services/websocket-manager.ts b/frontend/sync-client/src/services/websocket-manager.ts
index e399b0be..cf6e3928 100644
--- a/frontend/sync-client/src/services/websocket-manager.ts
+++ b/frontend/sync-client/src/services/websocket-manager.ts
@@ -6,6 +6,7 @@ import type { CursorPositionFromClient } from "./types/CursorPositionFromClient"
 import type { ClientCursors } from "./types/ClientCursors";
 import { createPromise } from "../utils/create-promise";
 import type { WebSocketVaultUpdate } from "./types/WebSocketVaultUpdate";
+import { awaitAll } from "../utils/await-all";
 
 export class WebSocketManager {
 	private readonly webSocketStatusChangeListeners: ((
@@ -98,13 +99,13 @@ export class WebSocketManager {
 			await promise;
 		}
 
-		await Promise.allSettled(this.outstandingPromises).then(() => {});
+		await awaitAll(this.outstandingPromises).then(() => {});
 	}
 
 	public sendHandshakeMessage(
 		message: WebSocketClientMessage & { type: "handshake" }
 	): void {
-		const {webSocket} = this;
+		const { webSocket } = this;
 		if (!webSocket) {
 			throw new Error(
 				"WebSocket is not connected, cannot send handshake message"
@@ -126,7 +127,7 @@ export class WebSocketManager {
 			type: "cursorPositions",
 			...cursorPositions
 		};
-		const {webSocket} = this;
+		const { webSocket } = this;
 		if (!webSocket) {
 			this.logger.warn(
 				"WebSocket is not connected, cannot send cursor positions"
diff --git a/frontend/sync-client/src/sync-operations/syncer.ts b/frontend/sync-client/src/sync-operations/syncer.ts
index 053eaacd..cf35a909 100644
--- a/frontend/sync-client/src/sync-operations/syncer.ts
+++ b/frontend/sync-client/src/sync-operations/syncer.ts
@@ -20,6 +20,7 @@ import type { DocumentVersionWithoutContent } from "../services/types/DocumentVe
 import type { WebSocketVaultUpdate } from "../services/types/WebSocketVaultUpdate";
 import type { WebSocketManager } from "../services/websocket-manager";
 import type { WebSocketClientMessage } from "../services/types/WebSocketClientMessage";
+import { awaitAll } from "../utils/await-all";
 
 export class Syncer {
 	private readonly remoteDocumentsLock: Locks<DocumentId>;
@@ -277,7 +278,7 @@ export class Syncer {
 		message: WebSocketVaultUpdate
 	): Promise<void> {
 		try {
-			const handlerPromise = Promise.allSettled(
+			const handlerPromise = awaitAll(
 				message.documents.map(async (document) =>
 					this.internalSyncRemotelyUpdatedFile(document)
 				)
@@ -405,7 +406,7 @@ export class Syncer {
 			}
 		}
 
-		const updates = Promise.allSettled(
+		const updates = awaitAll(
 			allLocalFiles.map(async (relativePath) => {
 				if (
 					this.database.getLatestDocumentByRelativePath(relativePath)
@@ -463,7 +464,7 @@ export class Syncer {
 			})
 		);
 
-		const deletes = Promise.allSettled(
+		const deletes = awaitAll(
 			locallyPossiblyDeletedFiles.map(async ({ relativePath }) => {
 				this.logger.debug(
 					`Document ${relativePath} has been deleted locally, scheduling sync to delete it`
@@ -474,7 +475,7 @@ export class Syncer {
 			})
 		);
 
-		await Promise.allSettled([updates, deletes]);
+		await awaitAll([updates, deletes]);
 	}
 
 	/**
@@ -487,7 +488,7 @@ export class Syncer {
 			return;
 		}
 
-		const [allLocalFiles, remote] = await Promise.allSettled([
+		const [allLocalFiles, remote] = await awaitAll([
 			this.operations.listFilesRecursively(),
 			this.syncQueue.add(async () => this.syncService.getAll())
 		]);
diff --git a/frontend/sync-client/src/utils/await-all.test.ts b/frontend/sync-client/src/utils/await-all.test.ts
new file mode 100644
index 00000000..bbce9423
--- /dev/null
+++ b/frontend/sync-client/src/utils/await-all.test.ts
@@ -0,0 +1,56 @@
+import { test } from "node:test";
+import assert from "node:assert";
+import { awaitAll } from "./await-all";
+
+void test("awaitAll resolves promises of the same type", async () => {
+	const promises = [
+		Promise.resolve(1),
+		Promise.resolve(2),
+		Promise.resolve(3)
+	];
+
+	const results = await awaitAll(promises);
+	assert.deepStrictEqual(results, [1, 2, 3]);
+});
+
+void test("awaitAll resolves promises of different types", async () => {
+	const promises = [
+		Promise.resolve("hello"),
+		Promise.resolve(42),
+		Promise.resolve(true)
+	] as const;
+
+	const results = await awaitAll(promises);
+
+	// Type assertions to verify type inference
+	const str: string = results[0];
+	const num: number = results[1];
+	const bool: boolean = results[2];
+
+	assert.strictEqual(str, "hello");
+	assert.strictEqual(num, 42);
+	assert.strictEqual(bool, true);
+});
+
+void test("awaitAll throws on first rejection", async () => {
+	const error = new Error("Test error");
+	const promises = [
+		Promise.resolve(1),
+		Promise.reject(error),
+		Promise.resolve(3)
+	];
+
+	await assert.rejects(async () => {
+		await awaitAll(promises);
+	}, error);
+});
+
+void test("awaitAll works with async functions", async () => {
+	const asyncString = async (): Promise<string> => "async";
+	const asyncNumber = async (): Promise<number> => 123;
+
+	const results = await awaitAll([asyncString(), asyncNumber()]);
+
+	assert.strictEqual(results[0], "async");
+	assert.strictEqual(results[1], 123);
+});
diff --git a/frontend/sync-client/src/utils/await-all.ts b/frontend/sync-client/src/utils/await-all.ts
new file mode 100644
index 00000000..07e3859f
--- /dev/null
+++ b/frontend/sync-client/src/utils/await-all.ts
@@ -0,0 +1,22 @@
+type PromiseTuple<T extends readonly unknown[]> = readonly [
+	...{ [K in keyof T]: Promise<T[K]> }
+];
+
+type ResolvedTuple<T extends readonly unknown[]> = {
+	[K in keyof T]: T[K];
+};
+
+export const awaitAll = async <T extends readonly unknown[]>(
+	promises: PromiseTuple<T>
+): Promise<ResolvedTuple<T>> => {
+	const result = await Promise.allSettled(promises);
+	for (const res of result) {
+		if (res.status === "rejected") {
+			throw res.reason;
+		}
+	}
+
+	return result.map(
+		(res) => (res as PromiseFulfilledResult<unknown>).value
+	) as ResolvedTuple<T>;
+};
diff --git a/frontend/sync-client/src/utils/data-structures/locks.ts b/frontend/sync-client/src/utils/data-structures/locks.ts
index 4e510943..eda89800 100644
--- a/frontend/sync-client/src/utils/data-structures/locks.ts
+++ b/frontend/sync-client/src/utils/data-structures/locks.ts
@@ -1,4 +1,5 @@
 import type { Logger } from "../../tracing/logger";
+import { awaitAll } from "../await-all";
 
 /**
  * Manages exclusive locks on items to prevent concurrent modifications.
@@ -54,9 +55,7 @@ export class Locks<T> {
 		const uniqueKeys = Array.from(new Set(keys));
 		uniqueKeys.sort((a, b) => String(a).localeCompare(String(b))); // Ensure consistent order to prevent deadlocks
 
-		await Promise.allSettled(
-			uniqueKeys.map(async (key) => this.waitForLock(key))
-		);
+		await awaitAll(uniqueKeys.map(async (key) => this.waitForLock(key)));
 
 		try {
 			return await fn();
diff --git a/frontend/test-client/src/cli.ts b/frontend/test-client/src/cli.ts
index 578dab0a..4a3aab4f 100644
--- a/frontend/test-client/src/cli.ts
+++ b/frontend/test-client/src/cli.ts
@@ -53,13 +53,11 @@ async function runTest({
 	}
 
 	try {
-		await Promise.allSettled(clients.map(async (client) => client.init()));
+		await Promise.all(clients.map(async (client) => client.init()));
 
 		for (let i = 0; i < iterations; i++) {
 			console.info(`Iteration ${i + 1}/${iterations}`);
-			await Promise.allSettled(
-				clients.map(async (client) => client.act())
-			);
+			await Promise.all(clients.map(async (client) => client.act()));
 			await sleep(100);
 		}
 

From c94d732f248db11aabf1d19d8b5dcc40813bf557 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 23 Nov 2025 16:41:42 +0000
Subject: [PATCH 654/761] Fix resetting

---
 .../src/file-operations/file-operations.ts    |   4 +
 .../safe-filesystem-operations.ts             |   4 +
 .../sync-client/src/persistence/database.ts   |  30 ++--
 .../src/services/fetch-controller.ts          |   2 +-
 .../src/services/websocket-manager.ts         |   4 +-
 frontend/sync-client/src/sync-client.ts       | 145 +++++++++++++-----
 .../src/sync-operations/cursor-tracker.ts     |   7 +
 .../sync-client/src/sync-operations/syncer.ts |   8 +-
 .../data-structures/fix-sized-cache.test.ts   |   2 +-
 .../utils/data-structures/fix-sized-cache.ts  |   2 +-
 .../src/utils/data-structures/locks.ts        |   9 ++
 11 files changed, 161 insertions(+), 56 deletions(-)

diff --git a/frontend/sync-client/src/file-operations/file-operations.ts b/frontend/sync-client/src/file-operations/file-operations.ts
index 7402a6d6..b8bd7d69 100644
--- a/frontend/sync-client/src/file-operations/file-operations.ts
+++ b/frontend/sync-client/src/file-operations/file-operations.ts
@@ -254,4 +254,8 @@ export class FileOperations {
 
 		return newName;
 	}
+
+	public reset(): void {
+		this.fs.reset();
+	}
 }
diff --git a/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts b/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
index 30d47f77..9b3273e4 100644
--- a/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
+++ b/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
@@ -138,4 +138,8 @@ export class SafeFileSystemOperations implements FileSystemOperations {
 			}
 		}
 	}
+
+	public reset(): void {
+		this.locks.reset();
+	}
 }
diff --git a/frontend/sync-client/src/persistence/database.ts b/frontend/sync-client/src/persistence/database.ts
index 1ad5af71..91d0e568 100644
--- a/frontend/sync-client/src/persistence/database.ts
+++ b/frontend/sync-client/src/persistence/database.ts
@@ -133,7 +133,7 @@ export class Database {
 
 		toUpdate.metadata = metadata;
 
-		this.save();
+		this.saveInTheBackground();
 	}
 
 	public removeDocumentPromise(promise: Promise<unknown>): void {
@@ -153,7 +153,7 @@ export class Database {
 
 	public removeDocument(find: DocumentRecord): void {
 		this.documents = this.documents.filter((document) => document !== find);
-		this.save();
+		this.saveInTheBackground();
 	}
 
 	public getLatestDocumentByRelativePath(
@@ -210,7 +210,7 @@ export class Database {
 		};
 
 		this.documents.push(entry);
-		this.save();
+		this.saveInTheBackground();
 
 		return entry;
 	}
@@ -234,7 +234,7 @@ export class Database {
 		};
 
 		this.documents.push(entry);
-		this.save();
+		this.saveInTheBackground();
 
 		return entry;
 	}
@@ -271,7 +271,7 @@ export class Database {
 		oldDocument.parallelVersion =
 			newDocument !== undefined ? newDocument.parallelVersion + 1 : 0;
 
-		this.save();
+		this.saveInTheBackground();
 	}
 
 	public delete(relativePath: RelativePath): void {
@@ -290,7 +290,7 @@ export class Database {
 
 	public setHasInitialSyncCompleted(value: boolean): void {
 		this.hasInitialSyncCompleted = value;
-		this.save();
+		this.saveInTheBackground();
 	}
 
 	public getLastSeenUpdateId(): VaultUpdateId {
@@ -301,13 +301,13 @@ export class Database {
 		const previousMin = this.lastSeenUpdateIds.min;
 		this.lastSeenUpdateIds.add(value);
 		if (previousMin !== this.lastSeenUpdateIds.min) {
-			this.save();
+			this.saveInTheBackground();
 		}
 	}
 
 	public setLastSeenUpdateId(value: number): void {
 		this.lastSeenUpdateIds.min = value;
-		this.save();
+		this.saveInTheBackground();
 	}
 
 	public reset(): void {
@@ -316,12 +316,18 @@ export class Database {
 			0 // the first updateId will be 1 which is the first integer after -1
 		);
 		this.hasInitialSyncCompleted = false;
-		this.save();
+		this.saveInTheBackground();
 	}
 
-	private save(): void {
+	private saveInTheBackground(): void {
 		this.ensureConsistency();
-		void this.saveData({
+		void this.save().catch((error: unknown) => {
+			this.logger.error(`Error saving data: ${error}`);
+		});
+	}
+
+	public save(): Promise<void> {
+		return this.saveData({
 			documents: this.resolvedDocuments.map(
 				({ relativePath, documentId, metadata }) => ({
 					documentId,
@@ -332,8 +338,6 @@ export class Database {
 			),
 			lastSeenUpdateId: this.lastSeenUpdateIds.min,
 			hasInitialSyncCompleted: this.hasInitialSyncCompleted
-		}).catch((error: unknown) => {
-			this.logger.error(`Error saving data: ${error}`);
 		});
 	}
 
diff --git a/frontend/sync-client/src/services/fetch-controller.ts b/frontend/sync-client/src/services/fetch-controller.ts
index 38dfcb48..1719532d 100644
--- a/frontend/sync-client/src/services/fetch-controller.ts
+++ b/frontend/sync-client/src/services/fetch-controller.ts
@@ -77,7 +77,7 @@ export class FetchController {
 	 */
 	public finishReset(): void {
 		if (!this.isResetting) {
-			throw new Error("Cannot finish reset when not resetting");
+			return;
 		}
 
 		this.isResetting = false;
diff --git a/frontend/sync-client/src/services/websocket-manager.ts b/frontend/sync-client/src/services/websocket-manager.ts
index cf6e3928..af48b1ad 100644
--- a/frontend/sync-client/src/services/websocket-manager.ts
+++ b/frontend/sync-client/src/services/websocket-manager.ts
@@ -21,13 +21,13 @@ export class WebSocketManager {
 		cursors: ClientCursors[]
 	) => Promise<void>)[] = [];
 
-	private webSocket: WebSocket | undefined;
-
 	private isStopped = true;
 	private resolveDisconnectingPromise: null | (() => unknown) = null;
 	private reconnectTimeoutId: ReturnType<typeof setTimeout> | undefined;
 
 	private readonly outstandingPromises: Promise<unknown>[] = [];
+
+	private webSocket: WebSocket | undefined;
 	private readonly webSocketFactoryImplementation: typeof globalThis.WebSocket;
 
 	public constructor(
diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts
index 4bd27228..575f8797 100644
--- a/frontend/sync-client/src/sync-client.ts
+++ b/frontend/sync-client/src/sync-client.ts
@@ -29,6 +29,8 @@ import { DIFF_CACHE_SIZE_MB } from "./consts";
 export class SyncClient {
 	private hasStartedOfflineSync = false;
 	private hasFinishedOfflineSync = false;
+	private hasStarted = false;
+	private hasBeenDestroyed = false;
 	private unloadTelemetry?: () => void;
 
 	private constructor(
@@ -43,6 +45,7 @@ export class SyncClient {
 		private readonly cursorTracker: CursorTracker,
 		private readonly fileChangeNotifier: FileChangeNotifier,
 		private readonly contentCache: FixedSizeDocumentCache,
+		private readonly fileOperations: FileOperations,
 		private readonly persistence: PersistenceProvider<
 			Partial<{
 				settings: Partial<SyncSettings>;
@@ -52,7 +55,17 @@ export class SyncClient {
 	) {}
 
 	public async start(): Promise<void> {
-		if (this.settings.getSettings().enableTelemetry) {
+		this.checkIfDestroyed();
+
+		if (this.hasStarted) {
+			throw new Error("SyncClient has already been started");
+		}
+		this.hasStarted = true;
+
+		if (
+			!this.unloadTelemetry &&
+			this.settings.getSettings().enableTelemetry
+		) {
 			this.unloadTelemetry = setUpTelemetry();
 		}
 
@@ -73,10 +86,14 @@ export class SyncClient {
 		}
 	}
 
-	// Reload settings from disk overriding current in-memory settings.
-	// Missing values will be filled in from DEFAULT_SETTINGS rather than
-	// retaining current in-memory settings.
+	/**
+	 * Reload settings from disk overriding current in-memory settings.
+	 * Missing values will be filled in from DEFAULT_SETTINGS rather than
+	 * retaining current in-memory settings.
+	 */
 	public async reloadSettings(): Promise<void> {
+		this.checkIfDestroyed();
+
 		const state = (await this.persistence.load()) ?? {
 			settings: undefined
 		};
@@ -93,15 +110,20 @@ export class SyncClient {
 		newSettings: SyncSettings,
 		oldSettings: SyncSettings
 	): Promise<void> {
-		if (newSettings.vaultName !== oldSettings.vaultName) {
-			await this.reset();
+		this.checkIfDestroyed();
+
+		if (
+			newSettings.vaultName !== oldSettings.vaultName ||
+			newSettings.remoteUri !== oldSettings.remoteUri
+		) {
+			await this.applyChangedConnectionSettings();
 		}
 
 		if (newSettings.isSyncEnabled !== oldSettings.isSyncEnabled) {
 			if (newSettings.isSyncEnabled) {
 				await this.startSyncing();
 			} else {
-				this.stop();
+				await this.pause();
 			}
 		}
 
@@ -119,10 +141,14 @@ export class SyncClient {
 	}
 
 	public get documentCount(): number {
+		this.checkIfDestroyed();
+
 		return this.database.length;
 	}
 
 	public get isWebSocketConnected(): boolean {
+		this.checkIfDestroyed();
+
 		return this.webSocketManager.isWebSocketConnected;
 	}
 
@@ -203,7 +229,6 @@ export class SyncClient {
 		const fileOperations = new FileOperations(
 			logger,
 			database,
-			settings,
 			fs,
 			nativeLineEndings
 		);
@@ -258,6 +283,7 @@ export class SyncClient {
 			cursorTracker,
 			fileChangeNotifier,
 			contentCache,
+			fileOperations,
 			persistence
 		);
 
@@ -267,6 +293,8 @@ export class SyncClient {
 	}
 
 	public async checkConnection(): Promise<NetworkConnectionStatus> {
+		this.checkIfDestroyed();
+
 		const server = await this.syncService.checkConnection();
 		return {
 			isSuccessful: server.isSuccessful,
@@ -276,59 +304,94 @@ export class SyncClient {
 	}
 
 	public getHistoryEntries(): readonly HistoryEntry[] {
+		this.checkIfDestroyed();
+
 		return this.history.entries;
 	}
 
 	public addSyncHistoryUpdateListener(
 		listener: (stats: HistoryStats) => unknown
 	): void {
+		this.checkIfDestroyed();
+
 		this.history.addSyncHistoryUpdateListener(listener);
 	}
 
 	private async startSyncing(): Promise<void> {
+		this.checkIfDestroyed();
+
 		if (!this.hasStartedOfflineSync) {
 			this.hasStartedOfflineSync = true;
 			await this.syncer.scheduleSyncForOfflineChanges();
 		}
 
 		this.hasFinishedOfflineSync = true;
-		this.webSocketManager.start();
-	}
-
-	private stop(): void {
-		this.hasFinishedOfflineSync = false;
-		this.webSocketManager.stop();
-
-		this.unloadTelemetry?.();
-	}
-
-	public async waitUntilStopped(): Promise<void> {
-		await this.syncer.waitUntilFinished();
-	}
-
-	public async applyChangedConnectionSettings(): Promise<void> {
-		this.fetchController.startReset();
-		this.webSocketManager.stop();
-
-		this.webSocketManager.start();
 		this.fetchController.finishReset();
+		this.webSocketManager.start();
 	}
 
-	/// Wait for the in-flight operations to finish, reset all tracking,
-	/// and the local database but retain the settings.
-	/// The SyncClient can be used again after calling this method.
-	private async reset(): Promise<void> {
-		this.stop();
-		this.fetchController.startReset();
-		this.contentCache.clear();
-		await this.syncer.reset();
-		this.history.reset();
+	/**
+	 * Wait for the in-flight operations to finish, reset all tracking,
+	 * and the local database but retain the settings.
+	 * The SyncClient can be used again after calling this method.
+	 */
+	public async applyChangedConnectionSettings(): Promise<void> {
+		this.checkIfDestroyed();
+
+		this.logger.info(
+			"Stopping SyncClient to apply changed connection settings"
+		);
+		await this.pause();
+
+		// clear all local state
+		this.logger.info("Resetting SyncClient's local state");
 		this.database.reset();
-		this.logger.reset();
+		await this.database.save(); // ensure the new database reads as empty
+		this.resetInMemoryState();
+		this.hasStartedOfflineSync = false;
+		this.hasFinishedOfflineSync = false;
+
+		// restart syncing
 		this.fetchController.finishReset();
 		await this.startSyncing();
 	}
 
+	/**
+	 * Completely destroy the SyncClient, cancelling all in-progress operations.
+	 * After calling this method, the SyncClient cannot be used again.
+	 */
+	public async destroy(): Promise<void> {
+		this.checkIfDestroyed();
+
+		// cancel everything that's in progress
+		this.fetchController.startReset();
+		await this.pause();
+
+		// clean-up memory early
+		this.resetInMemoryState();
+
+		this.logger.info("SyncClient has been successfully disposed");
+
+		this.unloadTelemetry?.();
+	}
+
+	private async pause(): Promise<void> {
+		this.checkIfDestroyed();
+
+		this.fetchController.startReset();
+		await this.webSocketManager.stop();
+		await this.syncer.waitUntilFinished();
+		await this.database.save(); // flush all changes to disk
+	}
+
+	private resetInMemoryState(): void {
+		this.history.reset();
+		this.contentCache.reset();
+		this.logger.reset();
+		this.cursorTracker.reset();
+		this.syncer.reset();
+		this.fileOperations.reset();
+	}
 	public getSettings(): SyncSettings {
 		return this.settings.getSettings();
 	}
@@ -420,4 +483,12 @@ export class SyncClient {
 	): void {
 		this.cursorTracker.addRemoteCursorsUpdateListener(listener);
 	}
+
+	private checkIfDestroyed(): void {
+		if (this.hasBeenDestroyed) {
+			throw new Error(
+				"SyncClient has been destroyed and can no longer be used."
+			);
+		}
+	}
 }
diff --git a/frontend/sync-client/src/sync-operations/cursor-tracker.ts b/frontend/sync-client/src/sync-operations/cursor-tracker.ts
index dc5e4cd7..e68cfae7 100644
--- a/frontend/sync-client/src/sync-operations/cursor-tracker.ts
+++ b/frontend/sync-client/src/sync-operations/cursor-tracker.ts
@@ -250,4 +250,11 @@ export class CursorTracker {
 			? DocumentUpToDateness.UpToDate
 			: DocumentUpToDateness.Prior;
 	}
+
+	public reset(): void {
+		this.knownRemoteCursors = [];
+		this.lastLocalCursorState = [];
+		this.lastLocalCursorStateWithoutDirtyDocuments = [];
+		this.updateLock.reset();
+	}
 }
diff --git a/frontend/sync-client/src/sync-operations/syncer.ts b/frontend/sync-client/src/sync-operations/syncer.ts
index cf35a909..e1361302 100644
--- a/frontend/sync-client/src/sync-operations/syncer.ts
+++ b/frontend/sync-client/src/sync-operations/syncer.ts
@@ -32,7 +32,6 @@ export class Syncer {
 	private readonly syncQueue: PQueue;
 
 	private _isFirstSyncComplete = false;
-
 	private runningScheduleSyncForOfflineChanges: Promise<void> | undefined;
 
 	public constructor(
@@ -514,4 +513,11 @@ export class Syncer {
 
 		this.database.setHasInitialSyncCompleted(true);
 	}
+
+	public reset(): void {
+		this._isFirstSyncComplete = false;
+		this.syncQueue.clear();
+		this.remoteDocumentsLock.reset();
+		this.runningScheduleSyncForOfflineChanges = undefined;
+	}
 }
diff --git a/frontend/sync-client/src/utils/data-structures/fix-sized-cache.test.ts b/frontend/sync-client/src/utils/data-structures/fix-sized-cache.test.ts
index 4a24aafb..a118815b 100644
--- a/frontend/sync-client/src/utils/data-structures/fix-sized-cache.test.ts
+++ b/frontend/sync-client/src/utils/data-structures/fix-sized-cache.test.ts
@@ -89,7 +89,7 @@ describe("fixedSizeDocumentCache", () => {
 		assert.equal(cache.get(1), doc1);
 		assert.equal(cache.get(2), doc2);
 
-		cache.clear();
+		cache.reset();
 		assert.equal(cache.get(1), undefined);
 		assert.equal(cache.get(2), undefined);
 
diff --git a/frontend/sync-client/src/utils/data-structures/fix-sized-cache.ts b/frontend/sync-client/src/utils/data-structures/fix-sized-cache.ts
index 8984b790..1541d72f 100644
--- a/frontend/sync-client/src/utils/data-structures/fix-sized-cache.ts
+++ b/frontend/sync-client/src/utils/data-structures/fix-sized-cache.ts
@@ -57,7 +57,7 @@ export class FixedSizeDocumentCache {
 		this.fitBelowMaxSize();
 	}
 
-	public clear(): void {
+	public reset(): void {
 		this.cache.clear();
 		this.head = null;
 		this.tail = null;
diff --git a/frontend/sync-client/src/utils/data-structures/locks.ts b/frontend/sync-client/src/utils/data-structures/locks.ts
index eda89800..6d566f3d 100644
--- a/frontend/sync-client/src/utils/data-structures/locks.ts
+++ b/frontend/sync-client/src/utils/data-structures/locks.ts
@@ -131,6 +131,11 @@ export class Locks<T> {
 			this.locked.delete(key);
 		}
 	}
+
+	public reset(): void {
+		this.locked.clear();
+		this.waiters.clear();
+	}
 }
 
 export class Lock {
@@ -143,4 +148,8 @@ export class Lock {
 	public async withLock<R>(fn: () => R | Promise<R>): Promise<R> {
 		return this.locks.withLock(true, fn);
 	}
+
+	public reset(): void {
+		this.locks.reset();
+	}
 }

From 340c347841b21a4c35877dad3b1c6ab99bfd5d39 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 23 Nov 2025 16:45:27 +0000
Subject: [PATCH 655/761] Don't leak promises

---
 .../src/services/websocket-manager.ts         | 31 ++++++++++++++-----
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/frontend/sync-client/src/services/websocket-manager.ts b/frontend/sync-client/src/services/websocket-manager.ts
index af48b1ad..0f764b4f 100644
--- a/frontend/sync-client/src/services/websocket-manager.ts
+++ b/frontend/sync-client/src/services/websocket-manager.ts
@@ -195,9 +195,17 @@ export class WebSocketManager {
 	): Promise<void> {
 		if (message.type === "vaultUpdate") {
 			this.outstandingPromises.push(
-				...this.remoteVaultUpdateListeners.map(async (listener) =>
-					listener(message)
-				)
+				...this.remoteVaultUpdateListeners.map(async (listener) => {
+					const promise = listener(message);
+					return promise.finally(() => {
+						if (this.outstandingPromises.includes(promise)) {
+							this.outstandingPromises.splice(
+								this.outstandingPromises.indexOf(promise),
+								1
+							);
+						}
+					});
+				})
 			);
 			// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
 		} else if (message.type === "cursorPositions") {
@@ -205,13 +213,22 @@ export class WebSocketManager {
 				`Received cursor positions for ${JSON.stringify(message.clients)}`
 			);
 			this.outstandingPromises.push(
-				...this.remoteCursorsUpdateListeners.map(async (listener) =>
-					listener(
+				...this.remoteCursorsUpdateListeners.map(async (listener) => {
+					const promise = listener(
 						message.clients.filter(
 							(client) => client.deviceId !== this.deviceId
 						)
-					)
-				)
+					);
+
+					return promise.finally(() => {
+						if (this.outstandingPromises.includes(promise)) {
+							this.outstandingPromises.splice(
+								this.outstandingPromises.indexOf(promise),
+								1
+							);
+						}
+					});
+				})
 			);
 		} else {
 			this.logger.warn(

From c4da1426b1b7e9d4996ab18bbb78bc9d9fece406 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 23 Nov 2025 16:49:56 +0000
Subject: [PATCH 656/761] Fix compile

---
 frontend/local-client-cli/src/cli.ts                 |  2 +-
 frontend/obsidian-plugin/src/vault-link-plugin.ts    |  4 +++-
 frontend/sync-client/src/persistence/database.ts     |  2 +-
 .../src/services/fetch-controller.test.ts            | 12 ------------
 frontend/sync-client/src/sync-client.ts              |  2 +-
 5 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/frontend/local-client-cli/src/cli.ts b/frontend/local-client-cli/src/cli.ts
index 2a4cef98..af5b8a95 100644
--- a/frontend/local-client-cli/src/cli.ts
+++ b/frontend/local-client-cli/src/cli.ts
@@ -187,7 +187,7 @@ async function main(): Promise<void> {
 		);
 
 		fileWatcher.stop();
-		await client.waitAndStop();
+		await client.destroy();
 		console.log(colorize("Shutdown complete", "green"));
 		process.exit(0);
 	};
diff --git a/frontend/obsidian-plugin/src/vault-link-plugin.ts b/frontend/obsidian-plugin/src/vault-link-plugin.ts
index 47c829bd..2d14c4eb 100644
--- a/frontend/obsidian-plugin/src/vault-link-plugin.ts
+++ b/frontend/obsidian-plugin/src/vault-link-plugin.ts
@@ -180,7 +180,9 @@ export default class VaultLinkPlugin extends Plugin {
 			this.app.workspace,
 			client
 		);
-		this.register(() => { editorStatusDisplayManager.dispose(); });
+		this.register(() => {
+			editorStatusDisplayManager.dispose();
+		});
 	}
 
 	private addRibbonIcons(): void {
diff --git a/frontend/sync-client/src/persistence/database.ts b/frontend/sync-client/src/persistence/database.ts
index 91d0e568..03ca7772 100644
--- a/frontend/sync-client/src/persistence/database.ts
+++ b/frontend/sync-client/src/persistence/database.ts
@@ -326,7 +326,7 @@ export class Database {
 		});
 	}
 
-	public save(): Promise<void> {
+	public async save(): Promise<void> {
 		return this.saveData({
 			documents: this.resolvedDocuments.map(
 				({ relativePath, documentId, metadata }) => ({
diff --git a/frontend/sync-client/src/services/fetch-controller.test.ts b/frontend/sync-client/src/services/fetch-controller.test.ts
index b4804557..724df3ba 100644
--- a/frontend/sync-client/src/services/fetch-controller.test.ts
+++ b/frontend/sync-client/src/services/fetch-controller.test.ts
@@ -101,18 +101,6 @@ describe("FetchController", () => {
 		assert.strictEqual(await response.text(), "OK");
 	});
 
-	it("should throw when finishing reset without starting", () => {
-		const logger = new Logger();
-		const controller = new FetchController(true, logger);
-
-		assert.throws(
-			() => { controller.finishReset(); },
-			(error: unknown) =>
-				error instanceof Error &&
-				error.message === "Cannot finish reset when not resetting"
-		);
-	});
-
 	it("should defer canFetch changes during reset", async () => {
 		const logger = new Logger();
 		const controller = new FetchController(false, logger);
diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts
index 575f8797..a9624ccb 100644
--- a/frontend/sync-client/src/sync-client.ts
+++ b/frontend/sync-client/src/sync-client.ts
@@ -30,7 +30,7 @@ export class SyncClient {
 	private hasStartedOfflineSync = false;
 	private hasFinishedOfflineSync = false;
 	private hasStarted = false;
-	private hasBeenDestroyed = false;
+	private readonly hasBeenDestroyed = false;
 	private unloadTelemetry?: () => void;
 
 	private constructor(

From 4b195b070d22fe4c7fd554db03cb9885e98a2f91 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 23 Nov 2025 16:50:03 +0000
Subject: [PATCH 657/761] Expose new advanced settings

---
 .../src/views/settings/settings-tab.ts        | 72 ++++++++++++++++++-
 1 file changed, 71 insertions(+), 1 deletion(-)

diff --git a/frontend/obsidian-plugin/src/views/settings/settings-tab.ts b/frontend/obsidian-plugin/src/views/settings/settings-tab.ts
index e4c16e6e..3c6ccd73 100644
--- a/frontend/obsidian-plugin/src/views/settings/settings-tab.ts
+++ b/frontend/obsidian-plugin/src/views/settings/settings-tab.ts
@@ -322,7 +322,7 @@ export class SyncSettingsTab extends PluginSettingTab {
 			)
 			.addButton((button) =>
 				button.setButtonText("Reset sync state").onClick(async () => {
-					await this.syncClient.reset();
+					await this.syncClient.applyChangedConnectionSettings();
 					new Notice(
 						"Sync state has been reset, you will need to resync"
 					);
@@ -348,6 +348,76 @@ export class SyncSettingsTab extends PluginSettingTab {
 						this.syncClient.setSetting("enableTelemetry", value)
 					)
 			);
+
+		containerEl.createEl("h3", { text: "Advanced" });
+
+		new Setting(containerEl)
+			.setName("Network retry interval (ms)")
+			.setDesc(
+				"The time to wait between retrying failed network requests, in milliseconds."
+			)
+			.addText((input) =>
+				input
+					.setValue(
+						this.syncClient
+							.getSettings()
+							.networkRetryIntervalMs.toString()
+					)
+					.onChange(async (value) => {
+						if (value === "") {
+							return;
+						}
+						let parsedValue = Number.parseInt(value, 10);
+						if (Number.isNaN(parsedValue) || parsedValue < 0) {
+							parsedValue =
+								this.syncClient.getSettings()
+									.networkRetryIntervalMs;
+						}
+
+						if (value !== parsedValue.toString()) {
+							input.setValue(parsedValue.toString());
+						}
+
+						return this.syncClient.setSetting(
+							"networkRetryIntervalMs",
+							parsedValue
+						);
+					})
+			);
+
+		new Setting(containerEl)
+			.setName("Minimum save interval (ms)")
+			.setDesc(
+				"The minimum time between saving settings and database to disk, in milliseconds. Lower values save more frequently but may impact performance."
+			)
+			.addText((input) =>
+				input
+					.setValue(
+						this.syncClient
+							.getSettings()
+							.minimumSaveIntervalMs.toString()
+					)
+					.onChange(async (value) => {
+						if (value === "") {
+							return;
+						}
+						let parsedValue = Number.parseInt(value, 10);
+						if (Number.isNaN(parsedValue) || parsedValue < 0) {
+							parsedValue =
+								this.syncClient.getSettings()
+									.minimumSaveIntervalMs;
+						}
+
+						if (value !== parsedValue.toString()) {
+							input.setValue(parsedValue.toString());
+						}
+
+						return this.syncClient.setSetting(
+							"minimumSaveIntervalMs",
+							parsedValue
+						);
+					})
+			);
 	}
 
 	private setStatusDescriptionSubscription(

From 18be9f4dd85d3d9915992cc4e696b4b6b51ed57d Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 23 Nov 2025 20:27:16 +0000
Subject: [PATCH 658/761] Fix lint

---
 frontend/local-client-cli/src/cli.ts          |   2 +-
 .../src/obsidian-file-system.ts               |   4 +-
 .../obsidian-plugin/src/vault-link-plugin.ts  |  18 +-
 .../src/file-operations/file-operations.ts    |  10 +-
 .../safe-filesystem-operations.ts             |   8 +-
 .../sync-client/src/persistence/database.ts   |  14 +-
 .../src/services/fetch-controller.test.ts     |   5 +-
 .../src/services/fetch-controller.ts          |  20 +-
 .../src/services/websocket-manager.ts         |  99 ++++---
 frontend/sync-client/src/sync-client.ts       | 258 ++++++++++--------
 .../src/sync-operations/cursor-tracker.ts     |  14 +-
 .../sync-client/src/sync-operations/syncer.ts |  14 +-
 frontend/sync-client/src/utils/await-all.ts   |   3 +
 .../src/utils/data-structures/locks.test.ts   |  36 +--
 .../src/utils/data-structures/locks.ts        |  10 +-
 .../debugging/slow-web-socket-factory.ts      |   1 +
 frontend/test-client/src/agent/mock-agent.ts  |   5 +-
 frontend/test-client/src/agent/mock-client.ts |   4 +-
 frontend/test-client/src/cli.ts               |   2 +
 19 files changed, 301 insertions(+), 226 deletions(-)

diff --git a/frontend/local-client-cli/src/cli.ts b/frontend/local-client-cli/src/cli.ts
index af5b8a95..625a7bcf 100644
--- a/frontend/local-client-cli/src/cli.ts
+++ b/frontend/local-client-cli/src/cli.ts
@@ -226,7 +226,7 @@ async function main(): Promise<void> {
 		);
 
 		fileWatcher.stop();
-		await client.waitAndStop();
+		await client.destroy();
 		process.exit(1);
 	}
 }
diff --git a/frontend/obsidian-plugin/src/obsidian-file-system.ts b/frontend/obsidian-plugin/src/obsidian-file-system.ts
index a699433a..bc8265fd 100644
--- a/frontend/obsidian-plugin/src/obsidian-file-system.ts
+++ b/frontend/obsidian-plugin/src/obsidian-file-system.ts
@@ -1,8 +1,6 @@
 import type { Stat, Vault, Workspace } from "obsidian";
 import { MarkdownView, normalizePath } from "obsidian";
-import type {
-	CursorPosition,
-	TextWithCursors} from "sync-client";
+import type { CursorPosition, TextWithCursors } from "sync-client";
 import {
 	utils,
 	type FileSystemOperations,
diff --git a/frontend/obsidian-plugin/src/vault-link-plugin.ts b/frontend/obsidian-plugin/src/vault-link-plugin.ts
index 2d14c4eb..336f9750 100644
--- a/frontend/obsidian-plugin/src/vault-link-plugin.ts
+++ b/frontend/obsidian-plugin/src/vault-link-plugin.ts
@@ -49,7 +49,7 @@ export default class VaultLinkPlugin extends Plugin {
 
 			this.registerEditorEvents(client);
 
-			this.register(() => client.destroy());
+			this.register(async () => client.destroy());
 			await client.start();
 		});
 	}
@@ -58,8 +58,16 @@ export default class VaultLinkPlugin extends Plugin {
 		new Notice(
 			"VaultLink has been enabled, check out the docs for tips on getting started!"
 		);
-		this.activateView(LogsView.TYPE);
-		this.activateView(HistoryView.TYPE);
+		void this.activateView(HistoryView.TYPE).catch((e: unknown) => {
+			this.syncClient?.logger.error(
+				`Failed to open history view on enable: ${e}`
+			);
+		});
+		void this.activateView(LogsView.TYPE).catch((e: unknown) => {
+			this.syncClient?.logger.error(
+				`Failed to open logs view on enable: ${e}`
+			);
+		});
 		this.openSettings();
 	}
 
@@ -169,7 +177,9 @@ export default class VaultLinkPlugin extends Plugin {
 			client,
 			this.app.workspace
 		);
-		this.register(() => cursorListener.dispose);
+		this.register(() => {
+			cursorListener.dispose();
+		});
 
 		this.app.workspace.updateOptions();
 
diff --git a/frontend/sync-client/src/file-operations/file-operations.ts b/frontend/sync-client/src/file-operations/file-operations.ts
index b8bd7d69..387178f4 100644
--- a/frontend/sync-client/src/file-operations/file-operations.ts
+++ b/frontend/sync-client/src/file-operations/file-operations.ts
@@ -25,7 +25,7 @@ export class FileOperations {
 	): [RelativePath, RelativePath] {
 		const pathParts = path.split("/");
 		const fileName = pathParts.pop();
-		if (!fileName || fileName === "") {
+		if (fileName == null || fileName === "") {
 			throw new Error(`Path '${path}' cannot be empty`);
 		}
 
@@ -166,6 +166,10 @@ export class FileOperations {
 		await this.deletingEmptyParentDirectoriesOfDeletedFile(oldPath);
 	}
 
+	public reset(): void {
+		this.fs.reset();
+	}
+
 	private async deletingEmptyParentDirectoriesOfDeletedFile(
 		path: RelativePath
 	): Promise<void> {
@@ -254,8 +258,4 @@ export class FileOperations {
 
 		return newName;
 	}
-
-	public reset(): void {
-		this.fs.reset();
-	}
 }
diff --git a/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts b/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
index 9b3273e4..72aa158d 100644
--- a/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
+++ b/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
@@ -105,6 +105,10 @@ export class SafeFileSystemOperations implements FileSystemOperations {
 		);
 	}
 
+	public reset(): void {
+		this.locks.reset();
+	}
+
 	/**
 	 * Decorate an operation to ensure that the file exists before running it.
 	 * If the operation fails, it will check if the file still exists and throw
@@ -138,8 +142,4 @@ export class SafeFileSystemOperations implements FileSystemOperations {
 			}
 		}
 	}
-
-	public reset(): void {
-		this.locks.reset();
-	}
 }
diff --git a/frontend/sync-client/src/persistence/database.ts b/frontend/sync-client/src/persistence/database.ts
index 03ca7772..2babdadf 100644
--- a/frontend/sync-client/src/persistence/database.ts
+++ b/frontend/sync-client/src/persistence/database.ts
@@ -319,13 +319,6 @@ export class Database {
 		this.saveInTheBackground();
 	}
 
-	private saveInTheBackground(): void {
-		this.ensureConsistency();
-		void this.save().catch((error: unknown) => {
-			this.logger.error(`Error saving data: ${error}`);
-		});
-	}
-
 	public async save(): Promise<void> {
 		return this.saveData({
 			documents: this.resolvedDocuments.map(
@@ -362,4 +355,11 @@ export class Database {
 			);
 		}
 	}
+
+	private saveInTheBackground(): void {
+		this.ensureConsistency();
+		void this.save().catch((error: unknown) => {
+			this.logger.error(`Error saving data: ${error}`);
+		});
+	}
 }
diff --git a/frontend/sync-client/src/services/fetch-controller.test.ts b/frontend/sync-client/src/services/fetch-controller.test.ts
index 724df3ba..4ff57c55 100644
--- a/frontend/sync-client/src/services/fetch-controller.test.ts
+++ b/frontend/sync-client/src/services/fetch-controller.test.ts
@@ -1,3 +1,4 @@
+import type { Mock } from "node:test";
 import { describe, it, mock, beforeEach, afterEach } from "node:test";
 import assert from "node:assert";
 import { FetchController } from "./fetch-controller";
@@ -6,7 +7,9 @@ import { SyncResetError } from "./sync-reset-error";
 import { sleep } from "../utils/sleep";
 
 describe("FetchController", () => {
-	const createMockFetch = (shouldSleep: boolean) =>
+	const createMockFetch = (
+		shouldSleep: boolean
+	): Mock<() => Promise<Response>> =>
 		mock.fn(async () => {
 			if (shouldSleep) {
 				await sleep(30);
diff --git a/frontend/sync-client/src/services/fetch-controller.ts b/frontend/sync-client/src/services/fetch-controller.ts
index 1719532d..1e93c853 100644
--- a/frontend/sync-client/src/services/fetch-controller.ts
+++ b/frontend/sync-client/src/services/fetch-controller.ts
@@ -24,16 +24,6 @@ export class FetchController {
 			createPromise<symbol>();
 	}
 
-	private static getUrlFromInput(input: RequestInfo | URL): string {
-		if (input instanceof URL) {
-			return input.href;
-		}
-		if (typeof input === "string") {
-			return input;
-		}
-		return input.url;
-	}
-
 	/**
 	 * Whether the fetch implementation can immediately send requests once outside of a reset.
 	 */
@@ -58,6 +48,16 @@ export class FetchController {
 		}
 	}
 
+	private static getUrlFromInput(input: RequestInfo | URL): string {
+		if (input instanceof URL) {
+			return input.href;
+		}
+		if (typeof input === "string") {
+			return input;
+		}
+		return input.url;
+	}
+
 	/**
 	 * Starts a reset, causing all ongoing and future fetches to be rejected
 	 * with a SyncResetError until finishReset is called.
diff --git a/frontend/sync-client/src/services/websocket-manager.ts b/frontend/sync-client/src/services/websocket-manager.ts
index 0f764b4f..f5cb64a1 100644
--- a/frontend/sync-client/src/services/websocket-manager.ts
+++ b/frontend/sync-client/src/services/websocket-manager.ts
@@ -82,7 +82,7 @@ export class WebSocketManager {
 	}
 
 	public async stop(): Promise<void> {
-		const [promise, resolve] = createPromise<void>();
+		const [promise, resolve] = createPromise();
 		this.resolveDisconnectingPromise = resolve;
 
 		this.isStopped = true;
@@ -99,7 +99,7 @@ export class WebSocketManager {
 			await promise;
 		}
 
-		await awaitAll(this.outstandingPromises).then(() => {});
+		await awaitAll(this.outstandingPromises);
 	}
 
 	public sendHandshakeMessage(
@@ -164,10 +164,25 @@ export class WebSocketManager {
 			);
 		};
 
-		this.webSocket.onmessage = async (event): Promise<void> => {
-			// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-			const message = JSON.parse(event.data) as WebSocketServerMessage;
-			return this.handleWebSocketMessage(message);
+		this.webSocket.onmessage = (event): void => {
+			try {
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+				const message = JSON.parse(
+					event.data
+				) as WebSocketServerMessage;
+
+				void this.handleWebSocketMessage(message).catch(
+					(error: unknown) => {
+						this.logger.error(
+							`Error handling WebSocket message: ${String(error)}`
+						);
+					}
+				);
+			} catch (error) {
+				this.logger.error(
+					`Error parsing WebSocket message: ${String(error)}`
+				);
+			}
 		};
 
 		this.webSocket.onclose = (event): void => {
@@ -194,42 +209,58 @@ export class WebSocketManager {
 		message: WebSocketServerMessage
 	): Promise<void> {
 		if (message.type === "vaultUpdate") {
-			this.outstandingPromises.push(
-				...this.remoteVaultUpdateListeners.map(async (listener) => {
-					const promise = listener(message);
-					return promise.finally(() => {
-						if (this.outstandingPromises.includes(promise)) {
-							this.outstandingPromises.splice(
-								this.outstandingPromises.indexOf(promise),
-								1
+			const promises = this.remoteVaultUpdateListeners.map(
+				async (listener) => {
+					const trackedPromise = listener(message)
+						.catch((error: unknown) => {
+							this.logger.error(
+								`Error in vault update listener: ${String(error)}`
 							);
-						}
-					});
-				})
+						})
+						.finally(() => {
+							const index =
+								this.outstandingPromises.indexOf(
+									trackedPromise
+								);
+							if (index !== -1) {
+								// eslint-disable-next-line @typescript-eslint/no-floating-promises
+								this.outstandingPromises.splice(index, 1);
+							}
+						});
+					await trackedPromise;
+				}
 			);
+			this.outstandingPromises.push(...promises);
 			// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
 		} else if (message.type === "cursorPositions") {
 			this.logger.debug(
 				`Received cursor positions for ${JSON.stringify(message.clients)}`
 			);
-			this.outstandingPromises.push(
-				...this.remoteCursorsUpdateListeners.map(async (listener) => {
-					const promise = listener(
-						message.clients.filter(
-							(client) => client.deviceId !== this.deviceId
-						)
-					);
-
-					return promise.finally(() => {
-						if (this.outstandingPromises.includes(promise)) {
-							this.outstandingPromises.splice(
-								this.outstandingPromises.indexOf(promise),
-								1
-							);
-						}
-					});
-				})
+			const filteredClients = message.clients.filter(
+				(client) => client.deviceId !== this.deviceId
 			);
+			const promises = this.remoteCursorsUpdateListeners.map(
+				async (listener) => {
+					const trackedPromise = listener(filteredClients)
+						.catch((error: unknown) => {
+							this.logger.error(
+								`Error in cursor positions listener: ${String(error)}`
+							);
+						})
+						.finally(() => {
+							const index =
+								this.outstandingPromises.indexOf(
+									trackedPromise
+								);
+							if (index !== -1) {
+								// eslint-disable-next-line @typescript-eslint/no-floating-promises
+								this.outstandingPromises.splice(index, 1);
+							}
+						});
+					await trackedPromise;
+				}
+			);
+			this.outstandingPromises.push(...promises);
 		} else {
 			this.logger.warn(
 				`Received unknown message type: ${JSON.stringify(message)}`
diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts
index a9624ccb..6c6bb137 100644
--- a/frontend/sync-client/src/sync-client.ts
+++ b/frontend/sync-client/src/sync-client.ts
@@ -30,7 +30,7 @@ export class SyncClient {
 	private hasStartedOfflineSync = false;
 	private hasFinishedOfflineSync = false;
 	private hasStarted = false;
-	private readonly hasBeenDestroyed = false;
+	private hasBeenDestroyed = false;
 	private unloadTelemetry?: () => void;
 
 	private constructor(
@@ -54,92 +54,6 @@ export class SyncClient {
 		>
 	) {}
 
-	public async start(): Promise<void> {
-		this.checkIfDestroyed();
-
-		if (this.hasStarted) {
-			throw new Error("SyncClient has already been started");
-		}
-		this.hasStarted = true;
-
-		if (
-			!this.unloadTelemetry &&
-			this.settings.getSettings().enableTelemetry
-		) {
-			this.unloadTelemetry = setUpTelemetry();
-		}
-
-		this.logger.addOnMessageListener((log): void => {
-			if (log.level === LogLevel.ERROR && Sentry.isInitialized()) {
-				Sentry.captureMessage(log.message);
-			}
-		});
-
-		this.settings.addOnSettingsChangeListener(
-			this.onSettingsChange.bind(this)
-		);
-
-		if (this.settings.getSettings().isSyncEnabled) {
-			this.logger.info("Starting SyncClient");
-			await this.startSyncing();
-			this.logger.info("SyncClient has successfully started");
-		}
-	}
-
-	/**
-	 * Reload settings from disk overriding current in-memory settings.
-	 * Missing values will be filled in from DEFAULT_SETTINGS rather than
-	 * retaining current in-memory settings.
-	 */
-	public async reloadSettings(): Promise<void> {
-		this.checkIfDestroyed();
-
-		const state = (await this.persistence.load()) ?? {
-			settings: undefined
-		};
-
-		const settings = {
-			...DEFAULT_SETTINGS,
-			...(state.settings ?? {})
-		};
-
-		this.setSettings(settings);
-	}
-
-	private async onSettingsChange(
-		newSettings: SyncSettings,
-		oldSettings: SyncSettings
-	): Promise<void> {
-		this.checkIfDestroyed();
-
-		if (
-			newSettings.vaultName !== oldSettings.vaultName ||
-			newSettings.remoteUri !== oldSettings.remoteUri
-		) {
-			await this.applyChangedConnectionSettings();
-		}
-
-		if (newSettings.isSyncEnabled !== oldSettings.isSyncEnabled) {
-			if (newSettings.isSyncEnabled) {
-				await this.startSyncing();
-			} else {
-				await this.pause();
-			}
-		}
-
-		if (newSettings.diffCacheSizeMB !== oldSettings.diffCacheSizeMB) {
-			this.contentCache.resize(newSettings.diffCacheSizeMB * 1024 * 1024);
-		}
-
-		if (newSettings.enableTelemetry !== oldSettings.enableTelemetry) {
-			if (newSettings.enableTelemetry) {
-				this.unloadTelemetry = setUpTelemetry();
-			} else {
-				this.unloadTelemetry?.();
-			}
-		}
-	}
-
 	public get documentCount(): number {
 		this.checkIfDestroyed();
 
@@ -151,7 +65,6 @@ export class SyncClient {
 
 		return this.webSocketManager.isWebSocketConnected;
 	}
-
 	public static async create({
 		fs,
 		persistence,
@@ -292,6 +205,58 @@ export class SyncClient {
 		return client;
 	}
 
+	public async start(): Promise<void> {
+		this.checkIfDestroyed();
+
+		if (this.hasStarted) {
+			throw new Error("SyncClient has already been started");
+		}
+		this.hasStarted = true;
+
+		if (
+			!this.unloadTelemetry &&
+			this.settings.getSettings().enableTelemetry
+		) {
+			this.unloadTelemetry = setUpTelemetry();
+		}
+
+		this.logger.addOnMessageListener((log): void => {
+			if (log.level === LogLevel.ERROR && Sentry.isInitialized()) {
+				Sentry.captureMessage(log.message);
+			}
+		});
+
+		this.settings.addOnSettingsChangeListener(
+			this.onSettingsChange.bind(this)
+		);
+
+		if (this.settings.getSettings().isSyncEnabled) {
+			this.logger.info("Starting SyncClient");
+			await this.startSyncing();
+			this.logger.info("SyncClient has successfully started");
+		}
+	}
+
+	/**
+	 * Reload settings from disk overriding current in-memory settings.
+	 * Missing values will be filled in from DEFAULT_SETTINGS rather than
+	 * retaining current in-memory settings.
+	 */
+	public async reloadSettings(): Promise<void> {
+		this.checkIfDestroyed();
+
+		const state = (await this.persistence.load()) ?? {
+			settings: undefined
+		};
+
+		const settings = {
+			...DEFAULT_SETTINGS,
+			...(state.settings ?? {})
+		};
+
+		await this.setSettings(settings);
+	}
+
 	public async checkConnection(): Promise<NetworkConnectionStatus> {
 		this.checkIfDestroyed();
 
@@ -317,19 +282,6 @@ export class SyncClient {
 		this.history.addSyncHistoryUpdateListener(listener);
 	}
 
-	private async startSyncing(): Promise<void> {
-		this.checkIfDestroyed();
-
-		if (!this.hasStartedOfflineSync) {
-			this.hasStartedOfflineSync = true;
-			await this.syncer.scheduleSyncForOfflineChanges();
-		}
-
-		this.hasFinishedOfflineSync = true;
-		this.fetchController.finishReset();
-		this.webSocketManager.start();
-	}
-
 	/**
 	 * Wait for the in-flight operations to finish, reset all tracking,
 	 * and the local database but retain the settings.
@@ -367,6 +319,8 @@ export class SyncClient {
 		this.fetchController.startReset();
 		await this.pause();
 
+		this.hasBeenDestroyed = true;
+
 		// clean-up memory early
 		this.resetInMemoryState();
 
@@ -375,24 +329,9 @@ export class SyncClient {
 		this.unloadTelemetry?.();
 	}
 
-	private async pause(): Promise<void> {
+	public getSettings(): SyncSettings {
 		this.checkIfDestroyed();
 
-		this.fetchController.startReset();
-		await this.webSocketManager.stop();
-		await this.syncer.waitUntilFinished();
-		await this.database.save(); // flush all changes to disk
-	}
-
-	private resetInMemoryState(): void {
-		this.history.reset();
-		this.contentCache.reset();
-		this.logger.reset();
-		this.cursorTracker.reset();
-		this.syncer.reset();
-		this.fileOperations.reset();
-	}
-	public getSettings(): SyncSettings {
 		return this.settings.getSettings();
 	}
 
@@ -400,32 +339,44 @@ export class SyncClient {
 		key: T,
 		value: SyncSettings[T]
 	): Promise<void> {
+		this.checkIfDestroyed();
+
 		await this.settings.setSetting(key, value);
 	}
 
 	public async setSettings(value: Partial<SyncSettings>): Promise<void> {
+		this.checkIfDestroyed();
+
 		await this.settings.setSettings(value);
 	}
 
 	public addOnSettingsChangeListener(
 		listener: (settings: SyncSettings, oldSettings: SyncSettings) => unknown
 	): void {
+		this.checkIfDestroyed();
+
 		this.settings.addOnSettingsChangeListener(listener);
 	}
 
 	public addRemainingSyncOperationsListener(
 		listener: (remainingOperations: number) => unknown
 	): void {
+		this.checkIfDestroyed();
+
 		this.syncer.addRemainingOperationsListener(listener);
 	}
 
 	public addWebSocketStatusChangeListener(listener: () => unknown): void {
+		this.checkIfDestroyed();
+
 		this.webSocketManager.addWebSocketStatusChangeListener(listener);
 	}
 
 	public async syncLocallyCreatedFile(
 		relativePath: RelativePath
 	): Promise<void> {
+		this.checkIfDestroyed();
+
 		this.fileChangeNotifier.notifyOfFileChange(relativePath);
 		return this.syncer.syncLocallyCreatedFile(relativePath);
 	}
@@ -433,6 +384,8 @@ export class SyncClient {
 	public async syncLocallyDeletedFile(
 		relativePath: RelativePath
 	): Promise<void> {
+		this.checkIfDestroyed();
+
 		this.fileChangeNotifier.notifyOfFileChange(relativePath);
 		return this.syncer.syncLocallyDeletedFile(relativePath);
 	}
@@ -444,6 +397,8 @@ export class SyncClient {
 		oldPath?: RelativePath;
 		relativePath: RelativePath;
 	}): Promise<void> {
+		this.checkIfDestroyed();
+
 		this.fileChangeNotifier.notifyOfFileChange(relativePath);
 		return this.syncer.syncLocallyUpdatedFile({
 			oldPath,
@@ -454,6 +409,8 @@ export class SyncClient {
 	public getDocumentSyncingStatus(
 		relativePath: RelativePath
 	): DocumentSyncStatus {
+		this.checkIfDestroyed();
+
 		if (!this.settings.getSettings().isSyncEnabled) {
 			return DocumentSyncStatus.SYNCING_IS_DISABLED;
 		}
@@ -475,15 +432,82 @@ export class SyncClient {
 	public async updateLocalCursors(
 		documentToCursors: Record<RelativePath, CursorSpan[]>
 	): Promise<void> {
+		this.checkIfDestroyed();
+
 		await this.cursorTracker.sendLocalCursorsToServer(documentToCursors);
 	}
 
 	public addRemoteCursorsUpdateListener(
 		listener: (cursors: MaybeOutdatedClientCursors[]) => unknown
 	): void {
+		this.checkIfDestroyed();
+
 		this.cursorTracker.addRemoteCursorsUpdateListener(listener);
 	}
 
+	private async startSyncing(): Promise<void> {
+		this.checkIfDestroyed();
+
+		if (!this.hasStartedOfflineSync) {
+			this.hasStartedOfflineSync = true;
+			await this.syncer.scheduleSyncForOfflineChanges();
+		}
+
+		this.hasFinishedOfflineSync = true;
+		this.fetchController.finishReset();
+		this.webSocketManager.start();
+	}
+
+	private async pause(): Promise<void> {
+		this.fetchController.startReset();
+		await this.webSocketManager.stop();
+		await this.syncer.waitUntilFinished();
+		await this.database.save(); // flush all changes to disk
+	}
+
+	private resetInMemoryState(): void {
+		this.history.reset();
+		this.contentCache.reset();
+		this.logger.reset();
+		this.cursorTracker.reset();
+		this.syncer.reset();
+		this.fileOperations.reset();
+	}
+
+	private async onSettingsChange(
+		newSettings: SyncSettings,
+		oldSettings: SyncSettings
+	): Promise<void> {
+		this.checkIfDestroyed();
+
+		if (
+			newSettings.vaultName !== oldSettings.vaultName ||
+			newSettings.remoteUri !== oldSettings.remoteUri
+		) {
+			await this.applyChangedConnectionSettings();
+		}
+
+		if (newSettings.isSyncEnabled !== oldSettings.isSyncEnabled) {
+			if (newSettings.isSyncEnabled) {
+				await this.startSyncing();
+			} else {
+				await this.pause();
+			}
+		}
+
+		if (newSettings.diffCacheSizeMB !== oldSettings.diffCacheSizeMB) {
+			this.contentCache.resize(newSettings.diffCacheSizeMB * 1024 * 1024);
+		}
+
+		if (newSettings.enableTelemetry !== oldSettings.enableTelemetry) {
+			if (newSettings.enableTelemetry) {
+				this.unloadTelemetry = setUpTelemetry();
+			} else {
+				this.unloadTelemetry?.();
+			}
+		}
+	}
+
 	private checkIfDestroyed(): void {
 		if (this.hasBeenDestroyed) {
 			throw new Error(
diff --git a/frontend/sync-client/src/sync-operations/cursor-tracker.ts b/frontend/sync-client/src/sync-operations/cursor-tracker.ts
index e68cfae7..d4cf3c53 100644
--- a/frontend/sync-client/src/sync-operations/cursor-tracker.ts
+++ b/frontend/sync-client/src/sync-operations/cursor-tracker.ts
@@ -157,6 +157,13 @@ export class CursorTracker {
 		});
 	}
 
+	public reset(): void {
+		this.knownRemoteCursors = [];
+		this.lastLocalCursorState = [];
+		this.lastLocalCursorStateWithoutDirtyDocuments = [];
+		this.updateLock.reset();
+	}
+
 	private getRelevantAndPruneKnownClientCursors(): MaybeOutdatedClientCursors[] {
 		const result: MaybeOutdatedClientCursors[] = [];
 		const included = new Set<string>();
@@ -250,11 +257,4 @@ export class CursorTracker {
 			? DocumentUpToDateness.UpToDate
 			: DocumentUpToDateness.Prior;
 	}
-
-	public reset(): void {
-		this.knownRemoteCursors = [];
-		this.lastLocalCursorState = [];
-		this.lastLocalCursorStateWithoutDirtyDocuments = [];
-		this.updateLock.reset();
-	}
 }
diff --git a/frontend/sync-client/src/sync-operations/syncer.ts b/frontend/sync-client/src/sync-operations/syncer.ts
index e1361302..43df0a85 100644
--- a/frontend/sync-client/src/sync-operations/syncer.ts
+++ b/frontend/sync-client/src/sync-operations/syncer.ts
@@ -299,6 +299,13 @@ export class Syncer {
 		}
 	}
 
+	public reset(): void {
+		this._isFirstSyncComplete = false;
+		this.syncQueue.clear();
+		this.remoteDocumentsLock.reset();
+		this.runningScheduleSyncForOfflineChanges = undefined;
+	}
+
 	private sendHandshakeMessage(): void {
 		const message: WebSocketClientMessage = {
 			type: "handshake",
@@ -513,11 +520,4 @@ export class Syncer {
 
 		this.database.setHasInitialSyncCompleted(true);
 	}
-
-	public reset(): void {
-		this._isFirstSyncComplete = false;
-		this.syncQueue.clear();
-		this.remoteDocumentsLock.reset();
-		this.runningScheduleSyncForOfflineChanges = undefined;
-	}
 }
diff --git a/frontend/sync-client/src/utils/await-all.ts b/frontend/sync-client/src/utils/await-all.ts
index 07e3859f..b8d50250 100644
--- a/frontend/sync-client/src/utils/await-all.ts
+++ b/frontend/sync-client/src/utils/await-all.ts
@@ -9,6 +9,7 @@ type ResolvedTuple<T extends readonly unknown[]> = {
 export const awaitAll = async <T extends readonly unknown[]>(
 	promises: PromiseTuple<T>
 ): Promise<ResolvedTuple<T>> => {
+	// eslint-disable-next-line no-restricted-properties
 	const result = await Promise.allSettled(promises);
 	for (const res of result) {
 		if (res.status === "rejected") {
@@ -16,7 +17,9 @@ export const awaitAll = async <T extends readonly unknown[]>(
 		}
 	}
 
+	// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
 	return result.map(
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
 		(res) => (res as PromiseFulfilledResult<unknown>).value
 	) as ResolvedTuple<T>;
 };
diff --git a/frontend/sync-client/src/utils/data-structures/locks.test.ts b/frontend/sync-client/src/utils/data-structures/locks.test.ts
index 460f984d..a13bb274 100644
--- a/frontend/sync-client/src/utils/data-structures/locks.test.ts
+++ b/frontend/sync-client/src/utils/data-structures/locks.test.ts
@@ -3,6 +3,8 @@ import assert from "node:assert";
 import { Logger } from "../../tracing/logger";
 import type { RelativePath } from "../../persistence/database";
 import { Locks } from "./locks";
+import { awaitAll } from "../await-all";
+import { sleep } from "../sleep";
 
 describe("withLock", () => {
 	const testPath: RelativePath = "test/document/path";
@@ -31,7 +33,7 @@ describe("withLock", () => {
 		let executionCount = 0;
 		const result = await locks.withLock(testPath, async () => {
 			executionCount++;
-			await new Promise((resolve) => setTimeout(resolve, 10));
+			await sleep(10);
 			return "async-success";
 		});
 
@@ -56,19 +58,19 @@ describe("withLock", () => {
 		// Start two concurrent operations with keys in different orders
 		const promise1 = locks.withLock([testPath2, testPath], async () => {
 			executionOrder.push("operation1-start");
-			await new Promise((resolve) => setTimeout(resolve, 50));
+			await sleep(50);
 			executionOrder.push("operation1-end");
 			return "result1";
 		});
 
 		const promise2 = locks.withLock([testPath, testPath2], async () => {
 			executionOrder.push("operation2-start");
-			await new Promise((resolve) => setTimeout(resolve, 50));
+			await sleep(50);
 			executionOrder.push("operation2-end");
 			return "result2";
 		});
 
-		const [result1, result2] = await Promise.all([promise1, promise2]);
+		const [result1, result2] = await awaitAll([promise1, promise2]);
 
 		assert.strictEqual(result1, "result1");
 		assert.strictEqual(result2, "result2");
@@ -86,19 +88,19 @@ describe("withLock", () => {
 
 		const promise1 = locks.withLock(testPath, async () => {
 			executionOrder.push("operation1-start");
-			await new Promise((resolve) => setTimeout(resolve, 50));
+			await sleep(50);
 			executionOrder.push("operation1-end");
 			return "result1";
 		});
 
 		const promise2 = locks.withLock(testPath, async () => {
 			executionOrder.push("operation2-start");
-			await new Promise((resolve) => setTimeout(resolve, 30));
+			await sleep(30);
 			executionOrder.push("operation2-end");
 			return "result2";
 		});
 
-		const [result1, result2] = await Promise.all([promise1, promise2]);
+		const [result1, result2] = await awaitAll([promise1, promise2]);
 
 		assert.strictEqual(result1, "result1");
 		assert.strictEqual(result2, "result2");
@@ -115,19 +117,20 @@ describe("withLock", () => {
 
 		const promise1 = locks.withLock(testPath, async () => {
 			executionOrder.push("operation1-start");
-			await new Promise((resolve) => setTimeout(resolve, 50));
+			await sleep(50);
+
 			executionOrder.push("operation1-end");
 			return "result1";
 		});
 
 		const promise2 = locks.withLock(testPath2, async () => {
 			executionOrder.push("operation2-start");
-			await new Promise((resolve) => setTimeout(resolve, 30));
+			await sleep(30);
 			executionOrder.push("operation2-end");
 			return "result2";
 		});
 
-		const [result1, result2] = await Promise.all([promise1, promise2]);
+		const [result1, result2] = await awaitAll([promise1, promise2]);
 
 		assert.strictEqual(result1, "result1");
 		assert.strictEqual(result2, "result2");
@@ -159,7 +162,8 @@ describe("withLock", () => {
 
 		await assert.rejects(
 			locks.withLock(testPath, async () => {
-				await new Promise((resolve) => setTimeout(resolve, 10));
+				await sleep(10);
+
 				throw error;
 			}),
 			{ message: "async test error" }
@@ -184,30 +188,30 @@ describe("withLock", () => {
 		// Start first operation that holds the lock
 		const firstPromise = locks.withLock(testPath, async () => {
 			executionOrder.push("first-start");
-			await new Promise((resolve) => setTimeout(resolve, 100));
+			await sleep(100);
 			executionOrder.push("first-end");
 			return "first";
 		});
 
 		// Small delay to ensure first operation starts
-		await new Promise((resolve) => setTimeout(resolve, 10));
+		await sleep(10);
 
 		// Queue second and third operations
 		const secondPromise = locks.withLock(testPath, async () => {
 			executionOrder.push("second-start");
-			await new Promise((resolve) => setTimeout(resolve, 30));
+			await sleep(50);
 			executionOrder.push("second-end");
 			return "second";
 		});
 
 		const thirdPromise = locks.withLock(testPath, async () => {
 			executionOrder.push("third-start");
-			await new Promise((resolve) => setTimeout(resolve, 20));
+			await sleep(20);
 			executionOrder.push("third-end");
 			return "third";
 		});
 
-		const [first, second, third] = await Promise.all([
+		const [first, second, third] = await awaitAll([
 			firstPromise,
 			secondPromise,
 			thirdPromise
diff --git a/frontend/sync-client/src/utils/data-structures/locks.ts b/frontend/sync-client/src/utils/data-structures/locks.ts
index 6d566f3d..c2e7d73a 100644
--- a/frontend/sync-client/src/utils/data-structures/locks.ts
+++ b/frontend/sync-client/src/utils/data-structures/locks.ts
@@ -66,6 +66,11 @@ export class Locks<T> {
 		}
 	}
 
+	public reset(): void {
+		this.locked.clear();
+		this.waiters.clear();
+	}
+
 	/**
 	 * Attempts to acquire a lock immediately without waiting.
 	 * Must call `unlock()` if successful.
@@ -131,11 +136,6 @@ export class Locks<T> {
 			this.locked.delete(key);
 		}
 	}
-
-	public reset(): void {
-		this.locked.clear();
-		this.waiters.clear();
-	}
 }
 
 export class Lock {
diff --git a/frontend/sync-client/src/utils/debugging/slow-web-socket-factory.ts b/frontend/sync-client/src/utils/debugging/slow-web-socket-factory.ts
index ea77117a..117e9b2f 100644
--- a/frontend/sync-client/src/utils/debugging/slow-web-socket-factory.ts
+++ b/frontend/sync-client/src/utils/debugging/slow-web-socket-factory.ts
@@ -6,6 +6,7 @@ export function slowWebSocketFactory(
 	jitterScaleInSeconds: number,
 	logger: Logger
 ): typeof WebSocket {
+	// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
 	return class FlakyWebSocket extends WebSocket {
 		private static readonly RECEIVE_KEY = "websocket-receive";
 		private static readonly SEND_KEY = "websocket-send";
diff --git a/frontend/test-client/src/agent/mock-agent.ts b/frontend/test-client/src/agent/mock-agent.ts
index 980da34b..22d6afcc 100644
--- a/frontend/test-client/src/agent/mock-agent.ts
+++ b/frontend/test-client/src/agent/mock-agent.ts
@@ -127,8 +127,9 @@ export class MockAgent extends MockClient {
 
 	public async finish(): Promise<void> {
 		await this.client.setSetting("isSyncEnabled", true);
-		await Promise.allSettled(this.pendingActions);
-		await this.client.waitAndStop();
+		// eslint-disable-next-line no-restricted-properties
+		await Promise.all(this.pendingActions);
+		await this.client.destroy();
 	}
 
 	public assertFileSystemsAreConsistent(otherAgent: MockAgent): void {
diff --git a/frontend/test-client/src/agent/mock-client.ts b/frontend/test-client/src/agent/mock-client.ts
index 34186ce7..3121db29 100644
--- a/frontend/test-client/src/agent/mock-client.ts
+++ b/frontend/test-client/src/agent/mock-client.ts
@@ -1,6 +1,4 @@
-import type { StoredDatabase ,
-	TextWithCursors
-} from "sync-client";
+import type { StoredDatabase, TextWithCursors } from "sync-client";
 import { assert } from "../utils/assert";
 import {
 	type RelativePath,
diff --git a/frontend/test-client/src/cli.ts b/frontend/test-client/src/cli.ts
index 4a3aab4f..9ae920ac 100644
--- a/frontend/test-client/src/cli.ts
+++ b/frontend/test-client/src/cli.ts
@@ -53,10 +53,12 @@ async function runTest({
 	}
 
 	try {
+		// eslint-disable-next-line no-restricted-properties
 		await Promise.all(clients.map(async (client) => client.init()));
 
 		for (let i = 0; i < iterations; i++) {
 			console.info(`Iteration ${i + 1}/${iterations}`);
+			// eslint-disable-next-line no-restricted-properties
 			await Promise.all(clients.map(async (client) => client.act()));
 			await sleep(100);
 		}

From 7008c54e2eac20c6bd8f69869691b213718264c0 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 23 Nov 2025 20:31:01 +0000
Subject: [PATCH 659/761] Run check.sh

---
 frontend/local-client-cli/src/cli.ts          |   5 +-
 .../src/services/websocket-manager.test.ts    | 646 ++++++++++++++++++
 sync-server/src/server/update_document.rs     |   4 +-
 .../src/utils/find_first_available_path.rs    |   4 +-
 4 files changed, 653 insertions(+), 6 deletions(-)
 create mode 100644 frontend/sync-client/src/services/websocket-manager.test.ts

diff --git a/frontend/local-client-cli/src/cli.ts b/frontend/local-client-cli/src/cli.ts
index 625a7bcf..bc84b565 100644
--- a/frontend/local-client-cli/src/cli.ts
+++ b/frontend/local-client-cli/src/cli.ts
@@ -87,19 +87,20 @@ async function main(): Promise<void> {
 	];
 
 	const settings: SyncSettings = {
+		...DEFAULT_SETTINGS,
 		remoteUri: args.remoteUri,
 		token: args.token,
 		vaultName: args.vaultName,
 		syncConcurrency:
 			args.syncConcurrency ?? DEFAULT_SETTINGS.syncConcurrency,
 		maxFileSizeMB: args.maxFileSizeMB ?? DEFAULT_SETTINGS.maxFileSizeMB,
-		diffCacheSizeMB: DEFAULT_SETTINGS.diffCacheSizeMB,
 		ignorePatterns,
 		webSocketRetryIntervalMs:
 			args.webSocketRetryIntervalMs ??
 			DEFAULT_SETTINGS.webSocketRetryIntervalMs,
 		isSyncEnabled: true,
-		enableTelemetry: args.enableTelemetry ?? false
+		enableTelemetry:
+			args.enableTelemetry ?? DEFAULT_SETTINGS.enableTelemetry
 	};
 
 	const client = await SyncClient.create({
diff --git a/frontend/sync-client/src/services/websocket-manager.test.ts b/frontend/sync-client/src/services/websocket-manager.test.ts
new file mode 100644
index 00000000..92685816
--- /dev/null
+++ b/frontend/sync-client/src/services/websocket-manager.test.ts
@@ -0,0 +1,646 @@
+import { WebSocketManager } from "./websocket-manager";
+import type { Logger } from "../tracing/logger";
+import type { Settings } from "../persistence/settings";
+import type { WebSocketServerMessage } from "./types/WebSocketServerMessage";
+import type { WebSocketVaultUpdate } from "./types/WebSocketVaultUpdate";
+import type { ClientCursors } from "./types/ClientCursors";
+
+class MockWebSocket {
+	public static readonly CONNECTING = 0;
+	public static readonly OPEN = 1;
+	public static readonly CLOSING = 2;
+	public static readonly CLOSED = 3;
+
+	public readyState: number = MockWebSocket.CONNECTING;
+	public onopen: ((event: Event) => void) | null = null;
+	public onclose: ((event: CloseEvent) => void) | null = null;
+	public onmessage: ((event: MessageEvent) => void) | null = null;
+	public onerror: ((event: Event) => void) | null = null;
+
+	public sentMessages: string[] = [];
+	public closeCode: number | undefined;
+	public closeReason: string | undefined;
+
+	public constructor(public url: string) {
+		// Simulate async connection
+		setTimeout(() => {
+			if (this.readyState === MockWebSocket.CONNECTING) {
+				this.readyState = MockWebSocket.OPEN;
+				this.onopen?.(new Event("open"));
+			}
+		}, 0);
+	}
+
+	public send(data: string): void {
+		if (this.readyState !== MockWebSocket.OPEN) {
+			throw new Error("WebSocket is not open");
+		}
+		this.sentMessages.push(data);
+	}
+
+	public close(code?: number, reason?: string): void {
+		this.closeCode = code;
+		this.closeReason = reason;
+		this.readyState = MockWebSocket.CLOSED;
+		this.onclose?.(
+			new CloseEvent("close", {
+				code: code ?? 1000,
+				reason: reason ?? ""
+			})
+		);
+	}
+
+	public simulateMessage(data: unknown): void {
+		this.onmessage?.(
+			new MessageEvent("message", { data: JSON.stringify(data) })
+		);
+	}
+}
+
+describe("WebSocketManager", () => {
+	let mockLogger: Logger;
+	let mockSettings: Settings;
+	let deviceId: string;
+
+	beforeEach(() => {
+		deviceId = "test-device-123";
+		mockLogger = {
+			info: jest.fn(),
+			warn: jest.fn(),
+			error: jest.fn(),
+			debug: jest.fn()
+		} as unknown as Logger;
+
+		mockSettings = {
+			getSettings: jest.fn().mockReturnValue({
+				remoteUri: "https://example.com",
+				vaultName: "test-vault",
+				webSocketRetryIntervalMs: 1000
+			})
+		} as unknown as Settings;
+	});
+
+	describe("BUG #1: Promise Tracking Memory Leak", () => {
+		it("EXPOSES: promises are never removed from outstandingPromises array", async () => {
+			const manager = new WebSocketManager(
+				deviceId,
+				mockLogger,
+				mockSettings,
+				MockWebSocket as unknown as typeof WebSocket
+			);
+
+			let listenerCallCount = 0;
+			const listener = jest.fn(async () => {
+				listenerCallCount++;
+				await new Promise((resolve) => setTimeout(resolve, 10));
+			});
+
+			manager.addRemoteVaultUpdateListener(listener);
+			manager.start();
+
+			await new Promise((resolve) => setTimeout(resolve, 50));
+
+			const vaultUpdate: WebSocketServerMessage = {
+				type: "vaultUpdate",
+				updates: []
+			};
+
+			// Access private field to inspect outstandingPromises
+			const outstandingPromises = (manager as unknown as {
+				outstandingPromises: Promise<unknown>[];
+			}).outstandingPromises;
+
+			// Send multiple messages
+			const mockWs = (manager as unknown as { webSocket: MockWebSocket })
+				.webSocket;
+			mockWs.simulateMessage(vaultUpdate);
+			mockWs.simulateMessage(vaultUpdate);
+			mockWs.simulateMessage(vaultUpdate);
+
+			// Wait for listeners to complete
+			await new Promise((resolve) => setTimeout(resolve, 100));
+
+			// BUG: The promises should have been removed after completion,
+			// but due to the tracking bug, they accumulate in the array
+			// The finally() handler tries to remove `trackedPromise` but
+			// outstandingPromises contains the wrapper promises
+			expect(outstandingPromises.length).toBeGreaterThan(0);
+			expect(listenerCallCount).toBe(3);
+
+			// This demonstrates the memory leak - promises never get cleaned up
+			console.log(
+				`MEMORY LEAK: ${outstandingPromises.length} promises still tracked after completion`
+			);
+
+			await manager.stop();
+		});
+
+		it("EXPOSES: promises accumulate over many messages", async () => {
+			const manager = new WebSocketManager(
+				deviceId,
+				mockLogger,
+				mockSettings,
+				MockWebSocket as unknown as typeof WebSocket
+			);
+
+			manager.addRemoteVaultUpdateListener(async () => {
+				await new Promise((resolve) => setTimeout(resolve, 5));
+			});
+			manager.start();
+
+			await new Promise((resolve) => setTimeout(resolve, 50));
+
+			const outstandingPromises = (manager as unknown as {
+				outstandingPromises: Promise<unknown>[];
+			}).outstandingPromises;
+
+			const mockWs = (manager as unknown as { webSocket: MockWebSocket })
+				.webSocket;
+
+			// Send 10 messages
+			for (let i = 0; i < 10; i++) {
+				mockWs.simulateMessage({
+					type: "vaultUpdate",
+					updates: []
+				});
+			}
+
+			await new Promise((resolve) => setTimeout(resolve, 100));
+
+			// BUG: All 10 promises should be cleaned up, but they're not
+			expect(outstandingPromises.length).toBe(10);
+			console.log(
+				`MEMORY LEAK: ${outstandingPromises.length} promises accumulated`
+			);
+
+			await manager.stop();
+		});
+
+		it("EXPOSES: same bug occurs with cursor position messages", async () => {
+			const manager = new WebSocketManager(
+				deviceId,
+				mockLogger,
+				mockSettings,
+				MockWebSocket as unknown as typeof WebSocket
+			);
+
+			manager.addRemoteCursorsUpdateListener(async () => {
+				await new Promise((resolve) => setTimeout(resolve, 10));
+			});
+			manager.start();
+
+			await new Promise((resolve) => setTimeout(resolve, 50));
+
+			const outstandingPromises = (manager as unknown as {
+				outstandingPromises: Promise<unknown>[];
+			}).outstandingPromises;
+
+			const mockWs = (manager as unknown as { webSocket: MockWebSocket })
+				.webSocket;
+
+			const cursorMessage: WebSocketServerMessage = {
+				type: "cursorPositions",
+				clients: [
+					{
+						deviceId: "other-device",
+						cursors: []
+					}
+				]
+			};
+
+			mockWs.simulateMessage(cursorMessage);
+			mockWs.simulateMessage(cursorMessage);
+
+			await new Promise((resolve) => setTimeout(resolve, 100));
+
+			// BUG: Same promise tracking bug affects cursor messages
+			expect(outstandingPromises.length).toBe(2);
+
+			await manager.stop();
+		});
+	});
+
+	describe("BUG #2: Redundant WebSocket Checks", () => {
+		it("EXPOSES: updateLocalCursors logs duplicate warnings", () => {
+			const manager = new WebSocketManager(
+				deviceId,
+				mockLogger,
+				mockSettings,
+				MockWebSocket as unknown as typeof WebSocket
+			);
+
+			// Don't start, so WebSocket is not connected
+			manager.updateLocalCursors({ cursors: [] });
+
+			// BUG: Two warning logs are generated for the same condition
+			expect(mockLogger.warn).toHaveBeenCalledTimes(2);
+			expect(mockLogger.warn).toHaveBeenCalledWith(
+				"WebSocket is not connected, cannot send cursor positions"
+			);
+		});
+
+		it("EXPOSES: race condition between checks", async () => {
+			const manager = new WebSocketManager(
+				deviceId,
+				mockLogger,
+				mockSettings,
+				MockWebSocket as unknown as typeof WebSocket
+			);
+
+			manager.start();
+			await new Promise((resolve) => setTimeout(resolve, 50));
+
+			// Manually set WebSocket to closing state after first check
+			const mockWs = (manager as unknown as { webSocket: MockWebSocket })
+				.webSocket;
+			const originalReadyState = mockWs.readyState;
+
+			// Simulate race condition: connection drops between the two checks
+			jest.spyOn(mockWs, "readyState", "get")
+				.mockReturnValueOnce(MockWebSocket.OPEN) // First check passes
+				.mockReturnValueOnce(MockWebSocket.CLOSED); // Second check fails
+
+			manager.updateLocalCursors({ cursors: [] });
+
+			// BUG: Even though first check passed, second check fails
+			// This demonstrates the race condition
+			expect(mockLogger.warn).toHaveBeenCalledWith(
+				"WebSocket is not connected, cannot send cursor positions"
+			);
+
+			await manager.stop();
+		});
+	});
+
+	describe("BUG #3: Missing Error Handling on send()", () => {
+		it("EXPOSES: sendHandshakeMessage crashes when send() throws", async () => {
+			const manager = new WebSocketManager(
+				deviceId,
+				mockLogger,
+				mockSettings,
+				MockWebSocket as unknown as typeof WebSocket
+			);
+
+			manager.start();
+			await new Promise((resolve) => setTimeout(resolve, 50));
+
+			const mockWs = (manager as unknown as { webSocket: MockWebSocket })
+				.webSocket;
+
+			// Simulate send() throwing an error (e.g., buffer full)
+			jest.spyOn(mockWs, "send").mockImplementation(() => {
+				throw new Error("Buffer full");
+			});
+
+			// BUG: This throws and crashes - no try-catch to handle it
+			expect(() => {
+				manager.sendHandshakeMessage({
+					type: "handshake",
+					vaultName: "test",
+					deviceId: "test",
+					authToken: "test"
+				});
+			}).toThrow("Buffer full");
+
+			await manager.stop();
+		});
+
+		it("EXPOSES: updateLocalCursors crashes when send() throws", async () => {
+			const manager = new WebSocketManager(
+				deviceId,
+				mockLogger,
+				mockSettings,
+				MockWebSocket as unknown as typeof WebSocket
+			);
+
+			manager.start();
+			await new Promise((resolve) => setTimeout(resolve, 50));
+
+			const mockWs = (manager as unknown as { webSocket: MockWebSocket })
+				.webSocket;
+
+			jest.spyOn(mockWs, "send").mockImplementation(() => {
+				throw new Error("Connection closed");
+			});
+
+			// BUG: This throws and crashes - no try-catch to handle it
+			expect(() => {
+				manager.updateLocalCursors({ cursors: [] });
+			}).toThrow("Connection closed");
+
+			await manager.stop();
+		});
+
+		it("EXPOSES: send() can throw even after isWebSocketConnected check", async () => {
+			const manager = new WebSocketManager(
+				deviceId,
+				mockLogger,
+				mockSettings,
+				MockWebSocket as unknown as typeof WebSocket
+			);
+
+			manager.start();
+			await new Promise((resolve) => setTimeout(resolve, 50));
+
+			const mockWs = (manager as unknown as { webSocket: MockWebSocket })
+				.webSocket;
+
+			// WebSocket is open, but send fails
+			expect(manager.isWebSocketConnected).toBe(true);
+
+			jest.spyOn(mockWs, "send").mockImplementation(() => {
+				throw new Error("Unexpected error");
+			});
+
+			// BUG: Even though connection check passed, send() can still throw
+			expect(() => {
+				manager.updateLocalCursors({ cursors: [] });
+			}).toThrow("Unexpected error");
+
+			await manager.stop();
+		});
+	});
+
+	describe("BUG #4: Potential Infinite Loop in stop()", () => {
+		it("EXPOSES: stop() hangs if onclose handler never fires", async () => {
+			const manager = new WebSocketManager(
+				deviceId,
+				mockLogger,
+				mockSettings,
+				MockWebSocket as unknown as typeof WebSocket
+			);
+
+			manager.start();
+			await new Promise((resolve) => setTimeout(resolve, 50));
+
+			const mockWs = (manager as unknown as { webSocket: MockWebSocket })
+				.webSocket;
+
+			// Simulate a broken WebSocket that doesn't fire onclose
+			jest.spyOn(mockWs, "close").mockImplementation(() => {
+				// Close is called but onclose handler is never invoked
+				mockWs.readyState = MockWebSocket.CLOSING; // Stuck in CLOSING
+				// Don't call onclose
+			});
+
+			// BUG: This will hang forever because the while loop waits for
+			// isWebSocketConnected to become false, but it never does
+			const stopPromise = manager.stop();
+
+			// Wait a bit to show it's stuck
+			const timeoutPromise = new Promise((resolve) =>
+				setTimeout(() => resolve("timeout"), 100)
+			);
+
+			const result = await Promise.race([stopPromise, timeoutPromise]);
+
+			expect(result).toBe("timeout");
+			console.log("BUG: stop() is stuck in infinite loop");
+
+			// Note: We can't actually clean up here because stop() is hung
+			// In a real scenario, this would freeze the application
+		});
+
+		it("EXPOSES: stop() loops forever if WebSocket state is corrupted", async () => {
+			const manager = new WebSocketManager(
+				deviceId,
+				mockLogger,
+				mockSettings,
+				MockWebSocket as unknown as typeof WebSocket
+			);
+
+			manager.start();
+			await new Promise((resolve) => setTimeout(resolve, 50));
+
+			// Corrupt the WebSocket state
+			const mockWs = (manager as unknown as { webSocket: MockWebSocket })
+				.webSocket;
+			jest.spyOn(mockWs, "close").mockImplementation(() => {
+				// Intentionally leave readyState as OPEN
+				// This simulates a bug or corrupted state
+			});
+
+			const stopPromise = manager.stop();
+			const timeoutPromise = new Promise((resolve) =>
+				setTimeout(() => resolve("timeout"), 100)
+			);
+
+			const result = await Promise.race([stopPromise, timeoutPromise]);
+
+			// BUG: Infinite loop because readyState never changes
+			expect(result).toBe("timeout");
+		});
+	});
+
+	describe("BUG #5: WebSocket Handler Race Condition", () => {
+		it("EXPOSES: rapid reconnection creates multiple WebSocket instances", async () => {
+			const manager = new WebSocketManager(
+				deviceId,
+				mockLogger,
+				mockSettings,
+				MockWebSocket as unknown as typeof WebSocket
+			);
+
+			manager.start();
+			await new Promise((resolve) => setTimeout(resolve, 50));
+
+			const firstWs = (manager as unknown as { webSocket: MockWebSocket })
+				.webSocket;
+
+			// Trigger reconnection by calling initializeWebSocket again
+			(manager as unknown as { initializeWebSocket: () => void })
+				.initializeWebSocket();
+
+			const secondWs = (manager as unknown as { webSocket: MockWebSocket })
+				.webSocket;
+
+			// BUG: Two different WebSocket instances exist
+			expect(firstWs).not.toBe(secondWs);
+
+			// The old WebSocket's handlers are still registered and can fire
+			// This can cause interference and unexpected behavior
+
+			// Simulate the old WebSocket's onclose firing
+			firstWs.onclose?.(
+				new CloseEvent("close", { code: 1000, reason: "test" })
+			);
+
+			// This could trigger reconnection logic even though we have a new WebSocket
+			// The status change listeners will be called multiple times
+
+			await manager.stop();
+		});
+
+		it("EXPOSES: old WebSocket handlers interfere with new connection", async () => {
+			let statusChangeCount = 0;
+			const manager = new WebSocketManager(
+				deviceId,
+				mockLogger,
+				mockSettings,
+				MockWebSocket as unknown as typeof WebSocket
+			);
+
+			manager.addWebSocketStatusChangeListener(() => {
+				statusChangeCount++;
+			});
+
+			manager.start();
+			await new Promise((resolve) => setTimeout(resolve, 50));
+
+			const firstWs = (manager as unknown as { webSocket: MockWebSocket })
+				.webSocket;
+
+			// Reset counter after initial connection
+			statusChangeCount = 0;
+
+			// Create new WebSocket
+			(manager as unknown as { initializeWebSocket: () => void })
+				.initializeWebSocket();
+			await new Promise((resolve) => setTimeout(resolve, 50));
+
+			// Now trigger old WebSocket's onclose
+			firstWs.onclose?.(
+				new CloseEvent("close", { code: 1000, reason: "test" })
+			);
+
+			// BUG: Status change listeners are called for old connection
+			// This can cause confusion and incorrect state
+			expect(statusChangeCount).toBeGreaterThan(0);
+
+			await manager.stop();
+		});
+	});
+
+	describe("BUG #6: Untracked handleWebSocketMessage Promise", () => {
+		it("EXPOSES: handleWebSocketMessage promise not in outstandingPromises", async () => {
+			const manager = new WebSocketManager(
+				deviceId,
+				mockLogger,
+				mockSettings,
+				MockWebSocket as unknown as typeof WebSocket
+			);
+
+			let resolveListener: () => void;
+			const listenerPromise = new Promise<void>((resolve) => {
+				resolveListener = resolve;
+			});
+
+			manager.addRemoteVaultUpdateListener(async () => {
+				await listenerPromise;
+			});
+
+			manager.start();
+			await new Promise((resolve) => setTimeout(resolve, 50));
+
+			const mockWs = (manager as unknown as { webSocket: MockWebSocket })
+				.webSocket;
+
+			// Send message - this triggers handleWebSocketMessage
+			mockWs.simulateMessage({
+				type: "vaultUpdate",
+				updates: []
+			});
+
+			// Give time for handleWebSocketMessage to start
+			await new Promise((resolve) => setTimeout(resolve, 10));
+
+			// Now try to stop - the handleWebSocketMessage promise is still running
+			const stopPromise = manager.stop();
+
+			// BUG: stop() awaits outstandingPromises, but handleWebSocketMessage
+			// itself is not tracked, only the listener promises inside it are
+			// However, due to bug #1, even those aren't properly tracked
+
+			// Resolve the listener to allow stop to complete
+			resolveListener!();
+
+			await stopPromise;
+
+			// This test demonstrates that the outer handleWebSocketMessage
+			// promise is not being tracked
+		});
+	});
+
+	describe("Additional Edge Cases", () => {
+		it("multiple listeners with different completion times", async () => {
+			const manager = new WebSocketManager(
+				deviceId,
+				mockLogger,
+				mockSettings,
+				MockWebSocket as unknown as typeof WebSocket
+			);
+
+			const listener1 = jest.fn(async () => {
+				await new Promise((resolve) => setTimeout(resolve, 10));
+			});
+			const listener2 = jest.fn(async () => {
+				await new Promise((resolve) => setTimeout(resolve, 50));
+			});
+			const listener3 = jest.fn(async () => {
+				await new Promise((resolve) => setTimeout(resolve, 5));
+			});
+
+			manager.addRemoteVaultUpdateListener(listener1);
+			manager.addRemoteVaultUpdateListener(listener2);
+			manager.addRemoteVaultUpdateListener(listener3);
+
+			manager.start();
+			await new Promise((resolve) => setTimeout(resolve, 50));
+
+			const outstandingPromises = (manager as unknown as {
+				outstandingPromises: Promise<unknown>[];
+			}).outstandingPromises;
+
+			const mockWs = (manager as unknown as { webSocket: MockWebSocket })
+				.webSocket;
+			mockWs.simulateMessage({ type: "vaultUpdate", updates: [] });
+
+			await new Promise((resolve) => setTimeout(resolve, 100));
+
+			// BUG: Even though all listeners completed, 3 promises remain
+			expect(outstandingPromises.length).toBe(3);
+			expect(listener1).toHaveBeenCalledTimes(1);
+			expect(listener2).toHaveBeenCalledTimes(1);
+			expect(listener3).toHaveBeenCalledTimes(1);
+
+			await manager.stop();
+		});
+
+		it("listener throws error - promise still not cleaned up", async () => {
+			const manager = new WebSocketManager(
+				deviceId,
+				mockLogger,
+				mockSettings,
+				MockWebSocket as unknown as typeof WebSocket
+			);
+
+			const errorListener = jest.fn(async () => {
+				throw new Error("Listener error");
+			});
+
+			manager.addRemoteVaultUpdateListener(errorListener);
+			manager.start();
+			await new Promise((resolve) => setTimeout(resolve, 50));
+
+			const outstandingPromises = (manager as unknown as {
+				outstandingPromises: Promise<unknown>[];
+			}).outstandingPromises;
+
+			const mockWs = (manager as unknown as { webSocket: MockWebSocket })
+				.webSocket;
+			mockWs.simulateMessage({ type: "vaultUpdate", updates: [] });
+
+			await new Promise((resolve) => setTimeout(resolve, 50));
+
+			// Error should be logged
+			expect(mockLogger.error).toHaveBeenCalledWith(
+				expect.stringContaining("Error in vault update listener")
+			);
+
+			// BUG: Promise still not removed even after error
+			expect(outstandingPromises.length).toBe(1);
+
+			await manager.stop();
+		});
+	});
+});
diff --git a/sync-server/src/server/update_document.rs b/sync-server/src/server/update_document.rs
index 37beabd6..a3b0f1a0 100644
--- a/sync-server/src/server/update_document.rs
+++ b/sync-server/src/server/update_document.rs
@@ -22,8 +22,8 @@ use crate::{
     errors::{SyncServerError, not_found_error, server_error},
     server::requests::UpdateBinaryDocumentVersion,
     utils::{
-        dedup_paths::dedup_paths, find_first_available_path::find_first_available_path,
-        is_binary::is_binary, is_file_type_mergable::is_file_type_mergable, normalize::normalize,
+        find_first_available_path::find_first_available_path, is_binary::is_binary,
+        is_file_type_mergable::is_file_type_mergable, normalize::normalize,
         sanitize_path::sanitize_path,
     },
 };
diff --git a/sync-server/src/utils/find_first_available_path.rs b/sync-server/src/utils/find_first_available_path.rs
index 1f662b42..002c0241 100644
--- a/sync-server/src/utils/find_first_available_path.rs
+++ b/sync-server/src/utils/find_first_available_path.rs
@@ -9,9 +9,9 @@ pub async fn find_first_available_path(
     transaction: &mut Transaction<'_>,
 ) -> Result<String> {
     let mut new_relative_path = String::default();
-    for candidate in dedup_paths(&sanitized_relative_path) {
+    for candidate in dedup_paths(sanitized_relative_path) {
         if database
-            .get_latest_document_by_path(&vault_id, &candidate, Some(transaction))
+            .get_latest_document_by_path(vault_id, &candidate, Some(transaction))
             .await?
             .is_none()
         {

From c3cbde052ae7140ff43cf7b5816010f52b9dc9e1 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 23 Nov 2025 21:55:33 +0000
Subject: [PATCH 660/761] Add server config for mergable extensions

---
 frontend/sync-client/src/consts.ts            |  2 -
 .../src/file-operations/file-operations.ts    |  7 +-
 .../sync-client/src/services/server-config.ts | 67 +++++++++++++++++++
 .../sync-client/src/services/sync-service.ts  | 48 +++++--------
 .../src/services/types/PingResponse.ts        |  4 ++
 frontend/sync-client/src/sync-client.ts       | 13 +++-
 .../sync-operations/unrestricted-syncer.ts    | 17 ++++-
 .../src/utils/is-file-type-mergable.test.ts   | 57 ++++++++++++----
 .../src/utils/is-file-type-mergable.ts        |  9 +--
 sync-server/config-e2e.yml                    |  3 +
 sync-server/src/config/server_config.rs       | 15 ++++-
 sync-server/src/consts.rs                     |  2 +
 sync-server/src/server/ping.rs                |  1 +
 sync-server/src/server/responses.rs           |  3 +
 sync-server/src/server/update_document.rs     |  6 +-
 .../src/utils/is_file_type_mergable.rs        | 31 ++++++---
 16 files changed, 214 insertions(+), 71 deletions(-)
 create mode 100644 frontend/sync-client/src/services/server-config.ts

diff --git a/frontend/sync-client/src/consts.ts b/frontend/sync-client/src/consts.ts
index 64f581f1..dbab3de0 100644
--- a/frontend/sync-client/src/consts.ts
+++ b/frontend/sync-client/src/consts.ts
@@ -1,5 +1,3 @@
-export const MERGABLE_FILE_TYPES = ["md", "txt"];
-
 export const TIMEOUT_FOR_MERGING_HISTORY_ENTRIES_IN_SECONDS = 60;
 export const DIFF_CACHE_SIZE_MB = 2;
 export const MAX_LOG_MESSAGE_COUNT = 100000;
diff --git a/frontend/sync-client/src/file-operations/file-operations.ts b/frontend/sync-client/src/file-operations/file-operations.ts
index 387178f4..7c9a45cf 100644
--- a/frontend/sync-client/src/file-operations/file-operations.ts
+++ b/frontend/sync-client/src/file-operations/file-operations.ts
@@ -6,6 +6,7 @@ import type { TextWithCursors } from "reconcile-text";
 import { reconcile } from "reconcile-text";
 import { isFileTypeMergable } from "../utils/is-file-type-mergable";
 import { isBinary } from "../utils/is-binary";
+import type { ServerConfig } from "../services/server-config";
 
 export class FileOperations {
 	private static readonly PARENTHESES_REGEX = / \((\d+)\)$/;
@@ -15,6 +16,7 @@ export class FileOperations {
 		private readonly logger: Logger,
 		private readonly database: Database,
 		fs: FileSystemOperations,
+		private readonly serverConfig: ServerConfig,
 		private readonly nativeLineEndings = "\n"
 	) {
 		this.fs = new SafeFileSystemOperations(fs, logger);
@@ -89,7 +91,10 @@ export class FileOperations {
 		}
 
 		if (
-			!isFileTypeMergable(path) ||
+			!isFileTypeMergable(
+				path,
+				this.serverConfig.getConfig().mergeableFileExtensions
+			) ||
 			isBinary(expectedContent) ||
 			isBinary(newContent)
 		) {
diff --git a/frontend/sync-client/src/services/server-config.ts b/frontend/sync-client/src/services/server-config.ts
new file mode 100644
index 00000000..b5ba5b15
--- /dev/null
+++ b/frontend/sync-client/src/services/server-config.ts
@@ -0,0 +1,67 @@
+import { createPromise } from "../utils/create-promise";
+import type { SyncService } from "./sync-service";
+import type { PingResponse } from "./types/PingResponse";
+
+export interface ServerConfigData {
+	mergeableFileExtensions: string[];
+}
+
+export class ServerConfig {
+	private response: Promise<PingResponse> | undefined;
+	private config: ServerConfigData | undefined;
+
+	public constructor(private readonly syncService: SyncService) {}
+
+	public async initialize(): Promise<void> {
+		this.response = this.syncService.ping();
+		this.config = await this.response;
+	}
+
+	public async checkConnection(forceUpdate = false): Promise<{
+		isSuccessful: boolean;
+		message: string;
+	}> {
+		try {
+			let { response } = this;
+			if (!response && !forceUpdate) {
+				throw new Error("ServerConfig not initialized");
+			} else if (forceUpdate) {
+				response = this.response = this.syncService.ping();
+			}
+
+			// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+			const result: PingResponse = (await response)!; // it must be defined, otherwise we would have thrown above
+			this.config = result;
+
+			if (result.isAuthenticated) {
+				return {
+					isSuccessful: true,
+					message: `Successfully connected to server (version: ${result.serverVersion}) and authenticated`
+				};
+			}
+
+			return {
+				isSuccessful: false,
+				message: `Successfully connected to server (version: ${result.serverVersion}) but failed to authenticate`
+			};
+		} catch (e) {
+			return {
+				isSuccessful: false,
+				message: `Failed to connect to server: ${e}`
+			};
+		}
+	}
+
+	public getConfig(): ServerConfigData {
+		if (!this.config) {
+			throw new Error("ServerConfig not initialized");
+		}
+
+		return this.config;
+	}
+
+	public reset(): void {
+		this.response = undefined;
+		this.config = undefined;
+	}
+}
diff --git a/frontend/sync-client/src/services/sync-service.ts b/frontend/sync-client/src/services/sync-service.ts
index c23fe95b..ba047b5e 100644
--- a/frontend/sync-client/src/services/sync-service.ts
+++ b/frontend/sync-client/src/services/sync-service.ts
@@ -302,40 +302,24 @@ export class SyncService {
 		});
 	}
 
-	public async checkConnection(): Promise<{
-		isSuccessful: boolean;
-		message: string;
-	}> {
-		try {
-			const response = await this.pingClient(this.getUrl("/ping"), {
-				headers: this.getDefaultHeaders()
-			});
-			const result: PingResponse | SerializedError =
-				(await response.json()) as PingResponse | SerializedError; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+	public async ping(): Promise<PingResponse> {
+		const response = await this.pingClient(this.getUrl("/ping"), {
+			headers: this.getDefaultHeaders()
+		});
+		const result: PingResponse | SerializedError =
+			(await response.json()) as PingResponse | SerializedError; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
 
-			if ("errorType" in result) {
-				throw new Error(
-					`Failed to ping server: ${SyncService.formatError(result)}`
-				);
-			}
-
-			if (result.isAuthenticated) {
-				return {
-					isSuccessful: true,
-					message: `Successfully connected to server (version: ${result.serverVersion}) and authenticated`
-				};
-			}
-
-			return {
-				isSuccessful: false,
-				message: `Successfully connected to server (version: ${result.serverVersion}) but failed to authenticate`
-			};
-		} catch (e) {
-			return {
-				isSuccessful: false,
-				message: `Failed to connect to server: ${e}`
-			};
+		if ("errorType" in result) {
+			throw new Error(
+				`Failed to ping server: ${SyncService.formatError(result)}`
+			);
 		}
+
+		this.logger.debug(
+			`Pinged server, got response: ${JSON.stringify(result)}`
+		);
+
+		return result;
 	}
 
 	private getUrl(path: string): string {
diff --git a/frontend/sync-client/src/services/types/PingResponse.ts b/frontend/sync-client/src/services/types/PingResponse.ts
index b0d993f2..ea691a93 100644
--- a/frontend/sync-client/src/services/types/PingResponse.ts
+++ b/frontend/sync-client/src/services/types/PingResponse.ts
@@ -13,4 +13,8 @@ export interface PingResponse {
 	 * header.
 	 */
 	isAuthenticated: boolean;
+	/**
+	 * List of file extensions that are allowed to be merged.
+	 */
+	mergeableFileExtensions: string[];
 }
diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts
index 6c6bb137..d0af6bfe 100644
--- a/frontend/sync-client/src/sync-client.ts
+++ b/frontend/sync-client/src/sync-client.ts
@@ -25,6 +25,7 @@ import { FileChangeNotifier } from "./sync-operations/file-change-notifier";
 import { FixedSizeDocumentCache } from "./utils/data-structures/fix-sized-cache";
 import { setUpTelemetry } from "./utils/set-up-telemetry";
 import { DIFF_CACHE_SIZE_MB } from "./consts";
+import { ServerConfig } from "./services/server-config";
 
 export class SyncClient {
 	private hasStartedOfflineSync = false;
@@ -46,6 +47,7 @@ export class SyncClient {
 		private readonly fileChangeNotifier: FileChangeNotifier,
 		private readonly contentCache: FixedSizeDocumentCache,
 		private readonly fileOperations: FileOperations,
+		private readonly serverConfig: ServerConfig,
 		private readonly persistence: PersistenceProvider<
 			Partial<{
 				settings: Partial<SyncSettings>;
@@ -139,10 +141,13 @@ export class SyncClient {
 			fetch
 		);
 
+		const serverConfig = new ServerConfig(syncService);
+
 		const fileOperations = new FileOperations(
 			logger,
 			database,
 			fs,
+			serverConfig,
 			nativeLineEndings
 		);
 
@@ -156,7 +161,8 @@ export class SyncClient {
 			syncService,
 			fileOperations,
 			history,
-			contentCache
+			contentCache,
+			serverConfig
 		);
 
 		const webSocketManager = new WebSocketManager(
@@ -197,6 +203,7 @@ export class SyncClient {
 			fileChangeNotifier,
 			contentCache,
 			fileOperations,
+			serverConfig,
 			persistence
 		);
 
@@ -213,6 +220,8 @@ export class SyncClient {
 		}
 		this.hasStarted = true;
 
+		await this.serverConfig.initialize();
+
 		if (
 			!this.unloadTelemetry &&
 			this.settings.getSettings().enableTelemetry
@@ -260,7 +269,7 @@ export class SyncClient {
 	public async checkConnection(): Promise<NetworkConnectionStatus> {
 		this.checkIfDestroyed();
 
-		const server = await this.syncService.checkConnection();
+		const server = await this.serverConfig.checkConnection(true);
 		return {
 			isSuccessful: server.isSuccessful,
 			serverMessage: server.message,
diff --git a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
index 4f33fe9e..4e4243cc 100644
--- a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
+++ b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
@@ -32,6 +32,7 @@ import type { DocumentVersionWithoutContent } from "../services/types/DocumentVe
 import type { FixedSizeDocumentCache } from "../utils/data-structures/fix-sized-cache";
 import { isFileTypeMergable } from "../utils/is-file-type-mergable";
 import { isBinary } from "../utils/is-binary";
+import type { ServerConfig } from "../services/server-config";
 
 export class UnrestrictedSyncer {
 	private ignorePatterns: RegExp[];
@@ -43,7 +44,8 @@ export class UnrestrictedSyncer {
 		private readonly syncService: SyncService,
 		private readonly operations: FileOperations,
 		private readonly history: SyncHistory,
-		private readonly contentCache: FixedSizeDocumentCache
+		private readonly contentCache: FixedSizeDocumentCache,
+		private readonly serverConfig: ServerConfig
 	) {
 		this.ignorePatterns = globsToRegexes(
 			this.settings.getSettings().ignorePatterns,
@@ -200,7 +202,10 @@ export class UnrestrictedSyncer {
 			if (areThereLocalChanges) {
 				const isText =
 					!isBinary(contentBytes) &&
-					isFileTypeMergable(document.relativePath);
+					isFileTypeMergable(
+						document.relativePath,
+						this.serverConfig.getConfig().mergeableFileExtensions
+					);
 				const cachedVersion = this.contentCache.get(
 					document.metadata.parentVersionId
 				);
@@ -547,7 +552,13 @@ export class UnrestrictedSyncer {
 		contentBytes: Uint8Array,
 		filePath: RelativePath
 	): void {
-		if (isFileTypeMergable(filePath) && !isBinary(contentBytes)) {
+		if (
+			isFileTypeMergable(
+				filePath,
+				this.serverConfig.getConfig().mergeableFileExtensions
+			) &&
+			!isBinary(contentBytes)
+		) {
 			this.contentCache.put(updateId, contentBytes);
 		}
 	}
diff --git a/frontend/sync-client/src/utils/is-file-type-mergable.test.ts b/frontend/sync-client/src/utils/is-file-type-mergable.test.ts
index 3f3fffbb..a2268d19 100644
--- a/frontend/sync-client/src/utils/is-file-type-mergable.test.ts
+++ b/frontend/sync-client/src/utils/is-file-type-mergable.test.ts
@@ -2,41 +2,72 @@ import { describe, it } from "node:test";
 import assert from "node:assert";
 import { isFileTypeMergable } from "./is-file-type-mergable";
 
+const mergableExtensions = ["md", "txt"];
 describe("isFileTypeMergable", () => {
 	it("should return true for .md files", () => {
-		assert.strictEqual(isFileTypeMergable(".md"), true);
-		assert.strictEqual(isFileTypeMergable("hi.md"), true);
+		assert.strictEqual(isFileTypeMergable(".md", mergableExtensions), true);
 		assert.strictEqual(
-			isFileTypeMergable("my/path/to/my/document.md"),
+			isFileTypeMergable("hi.md", mergableExtensions),
+			true
+		);
+		assert.strictEqual(
+			isFileTypeMergable("my/path/to/my/document.md", mergableExtensions),
 			true
 		);
 	});
 
 	it("should return true for .txt files", () => {
-		assert.strictEqual(isFileTypeMergable(".txt"), true);
-		assert.strictEqual(isFileTypeMergable("hi.txt"), true);
 		assert.strictEqual(
-			isFileTypeMergable("my/path/to/my/document.txt"),
+			isFileTypeMergable(".txt", mergableExtensions),
+			true
+		);
+		assert.strictEqual(
+			isFileTypeMergable("hi.txt", mergableExtensions),
+			true
+		);
+		assert.strictEqual(
+			isFileTypeMergable(
+				"my/path/to/my/document.txt",
+				mergableExtensions
+			),
 			true
 		);
 	});
 
 	it("should be case insensitive", () => {
-		assert.strictEqual(isFileTypeMergable("hi.MD"), true);
 		assert.strictEqual(
-			isFileTypeMergable("my/path/to/my/DOCUMENT.MD"),
+			isFileTypeMergable("hi.MD", mergableExtensions),
 			true
 		);
-		assert.strictEqual(isFileTypeMergable("hi.TXT"), true);
 		assert.strictEqual(
-			isFileTypeMergable("my/path/to/my/DOCUMENT.TXT"),
+			isFileTypeMergable("my/path/to/my/DOCUMENT.MD", mergableExtensions),
+			true
+		);
+		assert.strictEqual(
+			isFileTypeMergable("hi.TXT", mergableExtensions),
+			true
+		);
+		assert.strictEqual(
+			isFileTypeMergable(
+				"my/path/to/my/DOCUMENT.TXT",
+				mergableExtensions
+			),
 			true
 		);
 	});
 
 	it("should return false for non-mergable file types", () => {
-		assert.strictEqual(isFileTypeMergable(".json"), false);
-		assert.strictEqual(isFileTypeMergable("HELLO.JSON"), false);
-		assert.strictEqual(isFileTypeMergable("my/config.yml"), false);
+		assert.strictEqual(
+			isFileTypeMergable(".json", mergableExtensions),
+			false
+		);
+		assert.strictEqual(
+			isFileTypeMergable("HELLO.JSON", mergableExtensions),
+			false
+		);
+		assert.strictEqual(
+			isFileTypeMergable("my/config.yml", mergableExtensions),
+			false
+		);
 	});
 });
diff --git a/frontend/sync-client/src/utils/is-file-type-mergable.ts b/frontend/sync-client/src/utils/is-file-type-mergable.ts
index 943dc1cd..4eec2733 100644
--- a/frontend/sync-client/src/utils/is-file-type-mergable.ts
+++ b/frontend/sync-client/src/utils/is-file-type-mergable.ts
@@ -1,8 +1,9 @@
-import { MERGABLE_FILE_TYPES } from "../consts";
-
-export function isFileTypeMergable(pathOrFileName: string): boolean {
+export function isFileTypeMergable(
+	pathOrFileName: string,
+	mergeableExtensions: string[]
+): boolean {
 	const parts = pathOrFileName.split(".");
 	const fileExtension = parts.at(-1) ?? "";
 
-	return MERGABLE_FILE_TYPES.includes(fileExtension.toLowerCase());
+	return mergeableExtensions.includes(fileExtension.toLowerCase());
 }
diff --git a/sync-server/config-e2e.yml b/sync-server/config-e2e.yml
index 0b8491ee..58410948 100644
--- a/sync-server/config-e2e.yml
+++ b/sync-server/config-e2e.yml
@@ -8,6 +8,9 @@ server:
   max_body_size_mb: 512
   max_clients_per_vault: 256
   response_timeout_seconds: 60
+  mergeable_file_extensions:
+  - md
+  - txt
 users:
   user_configs:
   - name: admin
diff --git a/sync-server/src/config/server_config.rs b/sync-server/src/config/server_config.rs
index ce922fb9..07dc61b3 100644
--- a/sync-server/src/config/server_config.rs
+++ b/sync-server/src/config/server_config.rs
@@ -2,8 +2,8 @@ use log::debug;
 use serde::{Deserialize, Serialize};
 
 use crate::consts::{
-    DEFAULT_HOST, DEFAULT_MAX_BODY_SIZE_MB, DEFAULT_MAX_CLIENTS_PER_VAULT, DEFAULT_PORT,
-    DEFAULT_RESPONSE_TIMEOUT_SECONDS,
+    DEFAULT_HOST, DEFAULT_MAX_BODY_SIZE_MB, DEFAULT_MAX_CLIENTS_PER_VAULT,
+    DEFAULT_MERGEABLE_FILE_EXTENSIONS, DEFAULT_PORT, DEFAULT_RESPONSE_TIMEOUT_SECONDS,
 };
 
 #[derive(Debug, Deserialize, Serialize, Clone, Default)]
@@ -22,6 +22,9 @@ pub struct ServerConfig {
 
     #[serde(default = "default_response_timeout_seconds")]
     pub response_timeout_seconds: u64,
+
+    #[serde(default = "default_mergeable_file_extensions")]
+    pub mergeable_file_extensions: Vec<String>,
 }
 
 fn default_host() -> String {
@@ -48,3 +51,11 @@ fn default_response_timeout_seconds() -> u64 {
     debug!("Using default response timeout (seconds): {DEFAULT_RESPONSE_TIMEOUT_SECONDS}");
     DEFAULT_RESPONSE_TIMEOUT_SECONDS
 }
+
+fn default_mergeable_file_extensions() -> Vec<String> {
+    debug!("Using default mergeable file extensions: {DEFAULT_MERGEABLE_FILE_EXTENSIONS:?}");
+    DEFAULT_MERGEABLE_FILE_EXTENSIONS
+        .iter()
+        .map(|s| (*s).to_owned())
+        .collect()
+}
diff --git a/sync-server/src/consts.rs b/sync-server/src/consts.rs
index d973ca4a..881bd727 100644
--- a/sync-server/src/consts.rs
+++ b/sync-server/src/consts.rs
@@ -14,3 +14,5 @@ pub const DEFAULT_MAX_CLIENTS_PER_VAULT: usize = 256;
 
 pub const DEFAULT_LOG_DIRECTORY: &str = "logs";
 pub const DEFAULT_LOG_ROTATION_INTERVAL: Duration = Duration::from_secs(60 * 60 * 24); // 1 day
+
+pub const DEFAULT_MERGEABLE_FILE_EXTENSIONS: &[&str] = &["md", "txt"];
diff --git a/sync-server/src/server/ping.rs b/sync-server/src/server/ping.rs
index 620ef0d4..ec019a1d 100644
--- a/sync-server/src/server/ping.rs
+++ b/sync-server/src/server/ping.rs
@@ -33,5 +33,6 @@ pub async fn ping(
     Ok(Json(PingResponse {
         server_version: env!("CARGO_PKG_VERSION").to_owned(),
         is_authenticated,
+        mergeable_file_extensions: state.config.server.mergeable_file_extensions.clone(),
     }))
 }
diff --git a/sync-server/src/server/responses.rs b/sync-server/src/server/responses.rs
index 5cfaa5d5..22918106 100644
--- a/sync-server/src/server/responses.rs
+++ b/sync-server/src/server/responses.rs
@@ -16,6 +16,9 @@ pub struct PingResponse {
     /// Whether the client is authenticated based on the sent Authorization
     /// header.
     pub is_authenticated: bool,
+
+    /// List of file extensions that are allowed to be merged.
+    pub mergeable_file_extensions: Vec<String>,
 }
 
 /// Response to a fetch latest documents request.
diff --git a/sync-server/src/server/update_document.rs b/sync-server/src/server/update_document.rs
index a3b0f1a0..b8a17c11 100644
--- a/sync-server/src/server/update_document.rs
+++ b/sync-server/src/server/update_document.rs
@@ -185,8 +185,10 @@ async fn update_document(
         )));
     }
 
-    let are_all_participants_mergable = is_file_type_mergable(&sanitized_relative_path)
-        && !is_binary(&parent_document.content)
+    let are_all_participants_mergable = is_file_type_mergable(
+        &sanitized_relative_path,
+        &state.config.server.mergeable_file_extensions,
+    ) && !is_binary(&parent_document.content)
         && !is_binary(&latest_version.content)
         && !is_binary(&content);
 
diff --git a/sync-server/src/utils/is_file_type_mergable.rs b/sync-server/src/utils/is_file_type_mergable.rs
index fba4b323..7aabb393 100644
--- a/sync-server/src/utils/is_file_type_mergable.rs
+++ b/sync-server/src/utils/is_file_type_mergable.rs
@@ -1,7 +1,10 @@
-pub fn is_file_type_mergable(path_or_file_name: &str) -> bool {
+pub fn is_file_type_mergable(path_or_file_name: &str, mergeable_extensions: &[String]) -> bool {
     let file_extension = path_or_file_name.split('.').next_back().unwrap_or_default();
+    let file_extension_lower = file_extension.to_lowercase();
 
-    matches!(file_extension.to_lowercase().as_str(), "md" | "txt")
+    mergeable_extensions
+        .iter()
+        .any(|ext| ext.to_lowercase() == file_extension_lower)
 }
 
 #[cfg(test)]
@@ -10,14 +13,22 @@ mod tests {
 
     #[test]
     fn test_is_file_type_mergable() {
-        assert!(is_file_type_mergable(".md"));
-        assert!(is_file_type_mergable("hi.md"));
-        assert!(is_file_type_mergable("my/path/to/my/document.md"));
-        assert!(is_file_type_mergable("hi.MD"));
-        assert!(is_file_type_mergable("my/path/to/my/DOCUMENT.MD"));
+        let mergeable = vec!["md".to_owned(), "txt".to_owned()];
 
-        assert!(!is_file_type_mergable(".json"));
-        assert!(!is_file_type_mergable("HELLO.JSON"));
-        assert!(!is_file_type_mergable("my/config.yml"));
+        assert!(is_file_type_mergable(".md", &mergeable));
+        assert!(is_file_type_mergable("hi.md", &mergeable));
+        assert!(is_file_type_mergable(
+            "my/path/to/my/document.md",
+            &mergeable
+        ));
+        assert!(is_file_type_mergable("hi.MD", &mergeable));
+        assert!(is_file_type_mergable(
+            "my/path/to/my/DOCUMENT.MD",
+            &mergeable
+        ));
+
+        assert!(!is_file_type_mergable(".json", &mergeable));
+        assert!(!is_file_type_mergable("HELLO.JSON", &mergeable));
+        assert!(!is_file_type_mergable("my/config.yml", &mergeable));
     }
 }

From b1826907e708c089ef868d98e5576aa585030e8f Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 23 Nov 2025 21:55:57 +0000
Subject: [PATCH 661/761] Add resetting tests

---
 frontend/test-client/src/agent/mock-agent.ts | 11 +++++++++++
 frontend/test-client/src/cli.ts              | 16 +++++++++++++++-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/frontend/test-client/src/agent/mock-agent.ts b/frontend/test-client/src/agent/mock-agent.ts
index 22d6afcc..80413fe0 100644
--- a/frontend/test-client/src/agent/mock-agent.ts
+++ b/frontend/test-client/src/agent/mock-agent.ts
@@ -18,6 +18,7 @@ export class MockAgent extends MockClient {
 		initialSettings: Partial<SyncSettings>,
 		public readonly name: string,
 		private readonly doDeletes: boolean,
+		private readonly doResets: boolean,
 		useSlowFileEvents: boolean,
 		private readonly jitterScaleInSeconds: number
 	) {
@@ -107,6 +108,10 @@ export class MockAgent extends MockClient {
 			}
 		}
 
+		if (Math.random() < 0.1 && this.doResets) {
+			options.push(this.resetClient.bind(this));
+		}
+
 		this.pendingActions.push(
 			(async (): Promise<unknown> => {
 				try {
@@ -229,6 +234,12 @@ export class MockAgent extends MockClient {
 		}
 	}
 
+	private async resetClient(): Promise<void> {
+		this.client.logger.info(`Resetting client ${this.name}`);
+		await this.client.destroy();
+		await this.init();
+	}
+
 	private async createFileAction(): Promise<void> {
 		const file = this.getFileName();
 
diff --git a/frontend/test-client/src/cli.ts b/frontend/test-client/src/cli.ts
index 9ae920ac..7b81f800 100644
--- a/frontend/test-client/src/cli.ts
+++ b/frontend/test-client/src/cli.ts
@@ -14,6 +14,7 @@ async function runTest({
 	concurrency,
 	iterations,
 	doDeletes,
+	doResets,
 	useSlowFileEvents,
 	jitterScaleInSeconds
 }: {
@@ -21,12 +22,13 @@ async function runTest({
 	concurrency: number;
 	iterations: number;
 	doDeletes: boolean;
+	doResets: boolean;
 	useSlowFileEvents: boolean;
 	jitterScaleInSeconds: number;
 }): Promise<void> {
 	slowFileEvents = useSlowFileEvents;
 
-	const settings = `with ${agentCount} agents, concurrency ${concurrency}, iterations ${iterations}, doDeletes ${doDeletes}, jitterScaleInSeconds ${jitterScaleInSeconds}, useSlowFileEvents ${useSlowFileEvents}`;
+	const settings = `with ${agentCount} agents, concurrency ${concurrency}, iterations ${iterations}, doDeletes ${doDeletes}, doResets ${doResets}, jitterScaleInSeconds ${jitterScaleInSeconds}, useSlowFileEvents ${useSlowFileEvents}`;
 	console.info(`Running test ${settings}`);
 
 	const vaultName = uuidv4();
@@ -46,6 +48,7 @@ async function runTest({
 				initialSettings,
 				`agent-${i}`,
 				doDeletes,
+				doResets,
 				useSlowFileEvents,
 				jitterScaleInSeconds
 			)
@@ -113,6 +116,16 @@ async function runTest({
 }
 
 async function runTests(): Promise<void> {
+	await runTest({
+		agentCount: 2,
+		concurrency: 16,
+		iterations: 100,
+		doDeletes: true,
+		doResets: true,
+		useSlowFileEvents: true,
+		jitterScaleInSeconds: 0.75
+	});
+
 	for (let i = 0; i < TEST_ITERATIONS; i++) {
 		for (const useSlowFileEvents of [false, true]) {
 			for (const concurrency of [
@@ -125,6 +138,7 @@ async function runTests(): Promise<void> {
 						concurrency,
 						iterations: 100,
 						doDeletes,
+						doResets: false,
 						useSlowFileEvents,
 						jitterScaleInSeconds: 0.75
 					});

From 3ed2e4f666cdccb7059bc7a8452c971d9e2d4f7c Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 23 Nov 2025 22:12:49 +0000
Subject: [PATCH 662/761] Add api version check to client

---
 frontend/sync-client/src/consts.ts            |  1 +
 frontend/sync-client/src/index.ts             |  2 ++
 .../src/services/authentication-error.ts      |  6 +++++
 .../sync-client/src/services/server-config.ts | 22 ++++++++++++++++++-
 .../services/server-version-mismatch-error.ts |  6 +++++
 .../src/services/types/PingResponse.ts        |  5 +++++
 frontend/sync-client/src/sync-client.ts       |  5 +++--
 sync-server/src/consts.rs                     |  2 ++
 sync-server/src/server/ping.rs                |  2 ++
 sync-server/src/server/responses.rs           |  4 ++++
 10 files changed, 52 insertions(+), 3 deletions(-)
 create mode 100644 frontend/sync-client/src/services/authentication-error.ts
 create mode 100644 frontend/sync-client/src/services/server-version-mismatch-error.ts

diff --git a/frontend/sync-client/src/consts.ts b/frontend/sync-client/src/consts.ts
index dbab3de0..8fa50f47 100644
--- a/frontend/sync-client/src/consts.ts
+++ b/frontend/sync-client/src/consts.ts
@@ -2,3 +2,4 @@ export const TIMEOUT_FOR_MERGING_HISTORY_ENTRIES_IN_SECONDS = 60;
 export const DIFF_CACHE_SIZE_MB = 2;
 export const MAX_LOG_MESSAGE_COUNT = 100000;
 export const MAX_HISTORY_ENTRY_COUNT = 5000;
+export const SUPPORTED_API_VERSION = 1;
diff --git a/frontend/sync-client/src/index.ts b/frontend/sync-client/src/index.ts
index 81b7f7ff..f09d339c 100644
--- a/frontend/sync-client/src/index.ts
+++ b/frontend/sync-client/src/index.ts
@@ -25,6 +25,8 @@ export type { PersistenceProvider } from "./persistence/persistence";
 export type { CursorSpan } from "./services/types/CursorSpan";
 export type { ClientCursors } from "./services/types/ClientCursors";
 export type { NetworkConnectionStatus } from "./types/network-connection-status";
+export type { ServerVersionMismatchError } from "./services/server-version-mismatch-error";
+export type { AuthenticationError } from "./services/authentication-error";
 export type { MaybeOutdatedClientCursors } from "./types/maybe-outdated-client-cursors";
 export { DocumentSyncStatus } from "./types/document-sync-status";
 export { SyncClient } from "./sync-client";
diff --git a/frontend/sync-client/src/services/authentication-error.ts b/frontend/sync-client/src/services/authentication-error.ts
new file mode 100644
index 00000000..9daa1937
--- /dev/null
+++ b/frontend/sync-client/src/services/authentication-error.ts
@@ -0,0 +1,6 @@
+export class AuthenticationError extends Error {
+	public constructor(message: string) {
+		super(message);
+		this.name = "AuthenticationError";
+	}
+}
diff --git a/frontend/sync-client/src/services/server-config.ts b/frontend/sync-client/src/services/server-config.ts
index b5ba5b15..b3107d10 100644
--- a/frontend/sync-client/src/services/server-config.ts
+++ b/frontend/sync-client/src/services/server-config.ts
@@ -1,9 +1,13 @@
-import { createPromise } from "../utils/create-promise";
+import { SUPPORTED_API_VERSION } from "../consts";
+import { AuthenticationError } from "./authentication-error";
+import { ServerVersionMismatchError } from "./server-version-mismatch-error";
 import type { SyncService } from "./sync-service";
 import type { PingResponse } from "./types/PingResponse";
 
 export interface ServerConfigData {
 	mergeableFileExtensions: string[];
+	supportedApiVersion: number;
+	isAuthenticated: boolean;
 }
 
 export class ServerConfig {
@@ -15,6 +19,22 @@ export class ServerConfig {
 	public async initialize(): Promise<void> {
 		this.response = this.syncService.ping();
 		this.config = await this.response;
+
+		if (this.config.supportedApiVersion !== SUPPORTED_API_VERSION) {
+			const shouldUpgradeClient =
+				this.config.supportedApiVersion > SUPPORTED_API_VERSION;
+			throw new ServerVersionMismatchError(
+				`Unsupported API version: ${this.config.supportedApiVersion}. Consider upgrading the ${
+					shouldUpgradeClient ? "client" : "sync-server"
+				} to ensure compatibility.`
+			);
+		}
+
+		if (!this.config.isAuthenticated) {
+			throw new AuthenticationError(
+				"Failed to authenticate with the sync-server."
+			);
+		}
 	}
 
 	public async checkConnection(forceUpdate = false): Promise<{
diff --git a/frontend/sync-client/src/services/server-version-mismatch-error.ts b/frontend/sync-client/src/services/server-version-mismatch-error.ts
new file mode 100644
index 00000000..0f37fc6f
--- /dev/null
+++ b/frontend/sync-client/src/services/server-version-mismatch-error.ts
@@ -0,0 +1,6 @@
+export class ServerVersionMismatchError extends Error {
+	public constructor(message: string) {
+		super(message);
+		this.name = "ServerVersionMismatchError";
+	}
+}
diff --git a/frontend/sync-client/src/services/types/PingResponse.ts b/frontend/sync-client/src/services/types/PingResponse.ts
index ea691a93..cc7370e7 100644
--- a/frontend/sync-client/src/services/types/PingResponse.ts
+++ b/frontend/sync-client/src/services/types/PingResponse.ts
@@ -17,4 +17,9 @@ export interface PingResponse {
 	 * List of file extensions that are allowed to be merged.
 	 */
 	mergeableFileExtensions: string[];
+	/**
+	 * API version ensuring backwards & forwards compatibility between the client
+	 * and server.
+	 */
+	supportedApiVersion: number;
 }
diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts
index d0af6bfe..06c839c9 100644
--- a/frontend/sync-client/src/sync-client.ts
+++ b/frontend/sync-client/src/sync-client.ts
@@ -220,8 +220,6 @@ export class SyncClient {
 		}
 		this.hasStarted = true;
 
-		await this.serverConfig.initialize();
-
 		if (
 			!this.unloadTelemetry &&
 			this.settings.getSettings().enableTelemetry
@@ -311,6 +309,7 @@ export class SyncClient {
 		this.resetInMemoryState();
 		this.hasStartedOfflineSync = false;
 		this.hasFinishedOfflineSync = false;
+		this.serverConfig.reset();
 
 		// restart syncing
 		this.fetchController.finishReset();
@@ -457,6 +456,8 @@ export class SyncClient {
 	private async startSyncing(): Promise<void> {
 		this.checkIfDestroyed();
 
+		await this.serverConfig.initialize();
+
 		if (!this.hasStartedOfflineSync) {
 			this.hasStartedOfflineSync = true;
 			await this.syncer.scheduleSyncForOfflineChanges();
diff --git a/sync-server/src/consts.rs b/sync-server/src/consts.rs
index 881bd727..3c672520 100644
--- a/sync-server/src/consts.rs
+++ b/sync-server/src/consts.rs
@@ -16,3 +16,5 @@ pub const DEFAULT_LOG_DIRECTORY: &str = "logs";
 pub const DEFAULT_LOG_ROTATION_INTERVAL: Duration = Duration::from_secs(60 * 60 * 24); // 1 day
 
 pub const DEFAULT_MERGEABLE_FILE_EXTENSIONS: &[&str] = &["md", "txt"];
+
+pub const SUPPORTED_API_VERSION: u32 = 1;
diff --git a/sync-server/src/server/ping.rs b/sync-server/src/server/ping.rs
index ec019a1d..82eefff7 100644
--- a/sync-server/src/server/ping.rs
+++ b/sync-server/src/server/ping.rs
@@ -11,6 +11,7 @@ use serde::Deserialize;
 use super::{auth::auth, responses::PingResponse};
 use crate::{
     app_state::{AppState, database::models::VaultId},
+    consts::SUPPORTED_API_VERSION,
     errors::SyncServerError,
     utils::normalize::normalize,
 };
@@ -34,5 +35,6 @@ pub async fn ping(
         server_version: env!("CARGO_PKG_VERSION").to_owned(),
         is_authenticated,
         mergeable_file_extensions: state.config.server.mergeable_file_extensions.clone(),
+        supported_api_version: SUPPORTED_API_VERSION,
     }))
 }
diff --git a/sync-server/src/server/responses.rs b/sync-server/src/server/responses.rs
index 22918106..a8b3fcd7 100644
--- a/sync-server/src/server/responses.rs
+++ b/sync-server/src/server/responses.rs
@@ -19,6 +19,10 @@ pub struct PingResponse {
 
     /// List of file extensions that are allowed to be merged.
     pub mergeable_file_extensions: Vec<String>,
+
+    /// API version ensuring backwards & forwards compatibility between the client
+    /// and server.
+    pub supported_api_version: u32,
 }
 
 /// Response to a fetch latest documents request.

From c3cc6784460c2b2fa54f1009ea295907032482f4 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 27 Nov 2025 21:21:43 +0000
Subject: [PATCH 663/761] Stop leaking promises in ws manager

---
 .../src/services/websocket-manager.ts         | 168 +++++++++++-------
 1 file changed, 101 insertions(+), 67 deletions(-)

diff --git a/frontend/sync-client/src/services/websocket-manager.ts b/frontend/sync-client/src/services/websocket-manager.ts
index f5cb64a1..08442290 100644
--- a/frontend/sync-client/src/services/websocket-manager.ts
+++ b/frontend/sync-client/src/services/websocket-manager.ts
@@ -7,6 +7,7 @@ import type { ClientCursors } from "./types/ClientCursors";
 import { createPromise } from "../utils/create-promise";
 import type { WebSocketVaultUpdate } from "./types/WebSocketVaultUpdate";
 import { awaitAll } from "../utils/await-all";
+import { WEBSOCKET_DISCONNECT_TIMEOUT_IN_S } from "../consts";
 
 export class WebSocketManager {
 	private readonly webSocketStatusChangeListeners: ((
@@ -87,7 +88,6 @@ export class WebSocketManager {
 
 		this.isStopped = true;
 
-		// Clear pending reconnect timeout
 		if (this.reconnectTimeoutId !== undefined) {
 			clearTimeout(this.reconnectTimeoutId);
 			this.reconnectTimeoutId = undefined;
@@ -95,10 +95,40 @@ export class WebSocketManager {
 
 		this.webSocket?.close(1000, "WebSocketManager has been stopped");
 
-		while (this.isWebSocketConnected) {
-			await promise;
+		// eslint-disable-next-line @typescript-eslint/init-declarations
+		let timeoutId: ReturnType<typeof setTimeout> | undefined;
+		const timeoutPromise = new Promise<void>((_, reject) => {
+			timeoutId = setTimeout(() => {
+				reject(
+					new Error(
+						`Timeout waiting for WebSocket to close after ${WEBSOCKET_DISCONNECT_TIMEOUT_IN_S} seconds`
+					)
+				);
+			}, WEBSOCKET_DISCONNECT_TIMEOUT_IN_S * 1000);
+		});
+
+		try {
+			while (this.isWebSocketConnected) {
+				await Promise.race([promise, timeoutPromise]);
+			}
+		} catch (error) {
+			this.logger.error(
+				`Error while waiting for WebSocket to close: ${String(error)}`
+			);
+			// Force cleanup even if close didn't work
+			this.resolveDisconnectingPromise();
+			this.resolveDisconnectingPromise = null;
+		} finally {
+			// Clear timeout to prevent unhandled rejection
+			if (timeoutId !== undefined) {
+				clearTimeout(timeoutId);
+			}
 		}
 
+		await this.waitUntilFinished();
+	}
+
+	public async waitUntilFinished(): Promise<void> {
 		await awaitAll(this.outstandingPromises);
 	}
 
@@ -112,41 +142,57 @@ export class WebSocketManager {
 			);
 		}
 
-		webSocket.send(JSON.stringify(message));
+		try {
+			webSocket.send(JSON.stringify(message));
+		} catch (error) {
+			this.logger.error(
+				`Failed to send handshake message: ${String(error)}`
+			);
+			throw error;
+		}
 	}
 
 	public updateLocalCursors(cursorPositions: CursorPositionFromClient): void {
-		if (!this.isWebSocketConnected) {
+		if (!this.isWebSocketConnected || !this.webSocket) {
 			// A missing cursor update is fine, we can just skip it if needed
 			this.logger.warn(
 				"WebSocket is not connected, cannot send cursor positions"
 			);
 			return;
 		}
+
 		const message: WebSocketClientMessage = {
 			type: "cursorPositions",
 			...cursorPositions
 		};
-		const { webSocket } = this;
-		if (!webSocket) {
-			this.logger.warn(
-				"WebSocket is not connected, cannot send cursor positions"
+
+		try {
+			this.webSocket.send(JSON.stringify(message));
+			this.logger.debug(
+				`Sent cursor positions: ${JSON.stringify(cursorPositions)}`
+			);
+		} catch (error) {
+			this.logger.warn(
+				`Failed to send cursor positions: ${String(error)}`
 			);
-			return;
 		}
-		webSocket.send(JSON.stringify(message));
-		this.logger.debug(
-			`Sent cursor positions: ${JSON.stringify(cursorPositions)}`
-		);
 	}
 
 	private initializeWebSocket(): void {
-		try {
-			this.webSocket?.close();
-		} catch (e) {
-			this.logger.error(
-				`Failed to close previous WebSocket connection: ${e}`
-			);
+		// Clean up old WebSocket handlers to prevent race conditions
+		if (this.webSocket) {
+			try {
+				// Remove handlers to prevent them from firing after new connection
+				this.webSocket.onopen = null;
+				this.webSocket.onclose = null;
+				this.webSocket.onmessage = null;
+				this.webSocket.onerror = null;
+				this.webSocket.close();
+			} catch (e) {
+				this.logger.error(
+					`Failed to close previous WebSocket connection: ${e}`
+				);
+			}
 		}
 
 		const wsUri = new URL(this.settings.getSettings().remoteUri);
@@ -171,13 +217,25 @@ export class WebSocketManager {
 					event.data
 				) as WebSocketServerMessage;
 
-				void this.handleWebSocketMessage(message).catch(
-					(error: unknown) => {
+				// Track the message handling promise
+				const messageHandlingPromise = this.handleWebSocketMessage(
+					message
+				)
+					.catch((error: unknown) => {
 						this.logger.error(
 							`Error handling WebSocket message: ${String(error)}`
 						);
-					}
-				);
+					})
+					.finally(() => {
+						const index = this.outstandingPromises.indexOf(
+							messageHandlingPromise
+						);
+						if (index !== -1) {
+							void this.outstandingPromises.splice(index, 1); // ignore the returned promise
+						}
+					});
+
+				void this.outstandingPromises.push(messageHandlingPromise); // ignore the returned promise
 			} catch (error) {
 				this.logger.error(
 					`Error parsing WebSocket message: ${String(error)}`
@@ -186,7 +244,7 @@ export class WebSocketManager {
 		};
 
 		this.webSocket.onclose = (event): void => {
-			this.logger.error(
+			this.logger.warn(
 				`WebSocket closed with code ${event.code} (${event.reason == "" ? "unknown reason" : event.reason})`
 			);
 			this.webSocketStatusChangeListeners.forEach((listener) =>
@@ -209,28 +267,16 @@ export class WebSocketManager {
 		message: WebSocketServerMessage
 	): Promise<void> {
 		if (message.type === "vaultUpdate") {
-			const promises = this.remoteVaultUpdateListeners.map(
-				async (listener) => {
-					const trackedPromise = listener(message)
-						.catch((error: unknown) => {
-							this.logger.error(
-								`Error in vault update listener: ${String(error)}`
-							);
-						})
-						.finally(() => {
-							const index =
-								this.outstandingPromises.indexOf(
-									trackedPromise
-								);
-							if (index !== -1) {
-								// eslint-disable-next-line @typescript-eslint/no-floating-promises
-								this.outstandingPromises.splice(index, 1);
-							}
-						});
-					await trackedPromise;
-				}
+			await awaitAll(
+				this.remoteVaultUpdateListeners.map(async (listener) => {
+					await listener(message).catch((error: unknown) => {
+						this.logger.error(
+							`Error in vault update listener: ${String(error)}`
+						);
+					});
+				})
 			);
-			this.outstandingPromises.push(...promises);
+
 			// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
 		} else if (message.type === "cursorPositions") {
 			this.logger.debug(
@@ -239,28 +285,16 @@ export class WebSocketManager {
 			const filteredClients = message.clients.filter(
 				(client) => client.deviceId !== this.deviceId
 			);
-			const promises = this.remoteCursorsUpdateListeners.map(
-				async (listener) => {
-					const trackedPromise = listener(filteredClients)
-						.catch((error: unknown) => {
-							this.logger.error(
-								`Error in cursor positions listener: ${String(error)}`
-							);
-						})
-						.finally(() => {
-							const index =
-								this.outstandingPromises.indexOf(
-									trackedPromise
-								);
-							if (index !== -1) {
-								// eslint-disable-next-line @typescript-eslint/no-floating-promises
-								this.outstandingPromises.splice(index, 1);
-							}
-						});
-					await trackedPromise;
-				}
+
+			await awaitAll(
+				this.remoteCursorsUpdateListeners.map(async (listener) => {
+					await listener(filteredClients).catch((error: unknown) => {
+						this.logger.error(
+							`Error in cursor positions listener: ${String(error)}`
+						);
+					});
+				})
 			);
-			this.outstandingPromises.push(...promises);
 		} else {
 			this.logger.warn(
 				`Received unknown message type: ${JSON.stringify(message)}`

From 82f11d8c86346a7742c27597fdb1707d07b69e95 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 27 Nov 2025 21:26:27 +0000
Subject: [PATCH 664/761] Fix testing logic

---
 .../file-operations/file-operations.test.ts   |  26 +-
 .../src/services/websocket-manager.test.ts    | 810 +++++-------------
 .../debugging/slow-web-socket-factory.ts      |  16 +-
 3 files changed, 259 insertions(+), 593 deletions(-)

diff --git a/frontend/sync-client/src/file-operations/file-operations.test.ts b/frontend/sync-client/src/file-operations/file-operations.test.ts
index 3b1f6710..353312a3 100644
--- a/frontend/sync-client/src/file-operations/file-operations.test.ts
+++ b/frontend/sync-client/src/file-operations/file-operations.test.ts
@@ -9,6 +9,17 @@ import { Logger } from "../tracing/logger";
 import { assertSetContainsExactly } from "../utils/assert-set-contains-exactly";
 import type { FileSystemOperations } from "./filesystem-operations";
 import type { TextWithCursors } from "reconcile-text";
+import type { ServerConfig, ServerConfigData } from "../services/server-config";
+
+class MockServerConfig implements Pick<ServerConfig, "getConfig"> {
+	public getConfig(): ServerConfigData {
+		return {
+			mergeableFileExtensions: ["md", "txt"],
+			supportedApiVersion: 1,
+			isAuthenticated: true
+		};
+	}
+}
 
 class MockDatabase implements Partial<Database> {
 	public getLatestDocumentByRelativePath(
@@ -79,7 +90,8 @@ describe("File operations", () => {
 		const fileOperations = new FileOperations(
 			new Logger(),
 			new MockDatabase() as Database, // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
-			fileSystemOperations
+			fileSystemOperations,
+			new MockServerConfig() as ServerConfig // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
 		);
 
 		await fileOperations.create("a", new Uint8Array());
@@ -108,7 +120,8 @@ describe("File operations", () => {
 		const fileOperations = new FileOperations(
 			new Logger(),
 			new MockDatabase() as Database, // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
-			fileSystemOperations
+			fileSystemOperations,
+			new MockServerConfig() as ServerConfig // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
 		);
 
 		await fileOperations.create("b.md", new Uint8Array());
@@ -147,7 +160,8 @@ describe("File operations", () => {
 		const fileOperations = new FileOperations(
 			new Logger(),
 			new MockDatabase() as Database, // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
-			fileSystemOperations
+			fileSystemOperations,
+			new MockServerConfig() as ServerConfig // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
 		);
 
 		await fileOperations.create("a/b.c/d", new Uint8Array());
@@ -165,7 +179,8 @@ describe("File operations", () => {
 		const fileOperations = new FileOperations(
 			new Logger(),
 			new MockDatabase() as Database, // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
-			fileSystemOperations
+			fileSystemOperations,
+			new MockServerConfig() as ServerConfig // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
 		);
 
 		await fileOperations.create("document (5).md", new Uint8Array());
@@ -193,7 +208,8 @@ describe("File operations", () => {
 		const fileOperations = new FileOperations(
 			new Logger(),
 			new MockDatabase() as Database, // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
-			fileSystemOperations
+			fileSystemOperations,
+			new MockServerConfig() as ServerConfig // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
 		);
 
 		await fileOperations.create(".gitignore", new Uint8Array());
diff --git a/frontend/sync-client/src/services/websocket-manager.test.ts b/frontend/sync-client/src/services/websocket-manager.test.ts
index 92685816..a4f0fb2e 100644
--- a/frontend/sync-client/src/services/websocket-manager.test.ts
+++ b/frontend/sync-client/src/services/websocket-manager.test.ts
@@ -1,49 +1,62 @@
+/* eslint-disable @typescript-eslint/no-unsafe-type-assertion */
+import { describe, it, beforeEach } from "node:test";
+import assert from "node:assert";
 import { WebSocketManager } from "./websocket-manager";
 import type { Logger } from "../tracing/logger";
 import type { Settings } from "../persistence/settings";
-import type { WebSocketServerMessage } from "./types/WebSocketServerMessage";
-import type { WebSocketVaultUpdate } from "./types/WebSocketVaultUpdate";
-import type { ClientCursors } from "./types/ClientCursors";
+
+class MockCloseEvent extends Event {
+	public code: number;
+	public reason: string;
+
+	public constructor(
+		type: string,
+		options: { code: number; reason: string }
+	) {
+		super(type);
+		this.code = options.code;
+		this.reason = options.reason;
+	}
+}
+
+class MockMessageEvent extends Event {
+	public data: string;
+
+	public constructor(type: string, options: { data: string }) {
+		super(type);
+		this.data = options.data;
+	}
+}
 
 class MockWebSocket {
-	public static readonly CONNECTING = 0;
-	public static readonly OPEN = 1;
-	public static readonly CLOSING = 2;
-	public static readonly CLOSED = 3;
-
-	public readyState: number = MockWebSocket.CONNECTING;
+	public readyState: number = WebSocket.CONNECTING;
 	public onopen: ((event: Event) => void) | null = null;
-	public onclose: ((event: CloseEvent) => void) | null = null;
-	public onmessage: ((event: MessageEvent) => void) | null = null;
+	public onclose: ((event: MockCloseEvent) => void) | null = null;
+	public onmessage: ((event: MockMessageEvent) => void) | null = null;
 	public onerror: ((event: Event) => void) | null = null;
 
 	public sentMessages: string[] = [];
-	public closeCode: number | undefined;
-	public closeReason: string | undefined;
 
 	public constructor(public url: string) {
-		// Simulate async connection
 		setTimeout(() => {
-			if (this.readyState === MockWebSocket.CONNECTING) {
-				this.readyState = MockWebSocket.OPEN;
+			if (this.readyState === WebSocket.CONNECTING) {
+				this.readyState = WebSocket.OPEN;
 				this.onopen?.(new Event("open"));
 			}
 		}, 0);
 	}
 
 	public send(data: string): void {
-		if (this.readyState !== MockWebSocket.OPEN) {
+		if (this.readyState !== WebSocket.OPEN) {
 			throw new Error("WebSocket is not open");
 		}
 		this.sentMessages.push(data);
 	}
 
 	public close(code?: number, reason?: string): void {
-		this.closeCode = code;
-		this.closeReason = reason;
-		this.readyState = MockWebSocket.CLOSED;
+		this.readyState = WebSocket.CLOSED;
 		this.onclose?.(
-			new CloseEvent("close", {
+			new MockCloseEvent("close", {
 				code: code ?? 1000,
 				reason: reason ?? ""
 			})
@@ -52,27 +65,46 @@ class MockWebSocket {
 
 	public simulateMessage(data: unknown): void {
 		this.onmessage?.(
-			new MessageEvent("message", { data: JSON.stringify(data) })
+			new MockMessageEvent("message", { data: JSON.stringify(data) })
 		);
 	}
 }
 
+type MockFn<T extends (...args: unknown[]) => unknown> = T & {
+	calls: Parameters<T>[];
+};
+
+function createMockFn<T extends (...args: unknown[]) => unknown>(
+	implementation?: T
+): MockFn<T> {
+	const calls: Parameters<T>[] = [];
+	const mockFn = ((...args: Parameters<T>) => {
+		calls.push(args);
+		return implementation?.(...args);
+	}) as unknown as MockFn<T>;
+	mockFn.calls = calls;
+	return mockFn;
+}
+
 describe("WebSocketManager", () => {
-	let mockLogger: Logger;
-	let mockSettings: Settings;
-	let deviceId: string;
+	let mockLogger: Logger = undefined as unknown as Logger;
+	let mockSettings: Settings = undefined as unknown as Settings;
+	let deviceId = "test-device-123";
 
 	beforeEach(() => {
 		deviceId = "test-device-123";
+		const noop = (): void => {
+			// Intentionally empty for mock
+		};
 		mockLogger = {
-			info: jest.fn(),
-			warn: jest.fn(),
-			error: jest.fn(),
-			debug: jest.fn()
+			info: createMockFn(noop),
+			warn: createMockFn(noop),
+			error: createMockFn(noop),
+			debug: createMockFn(noop)
 		} as unknown as Logger;
 
 		mockSettings = {
-			getSettings: jest.fn().mockReturnValue({
+			getSettings: () => ({
 				remoteUri: "https://example.com",
 				vaultName: "test-vault",
 				webSocketRetryIntervalMs: 1000
@@ -80,567 +112,185 @@ describe("WebSocketManager", () => {
 		} as unknown as Settings;
 	});
 
-	describe("BUG #1: Promise Tracking Memory Leak", () => {
-		it("EXPOSES: promises are never removed from outstandingPromises array", async () => {
-			const manager = new WebSocketManager(
-				deviceId,
-				mockLogger,
-				mockSettings,
-				MockWebSocket as unknown as typeof WebSocket
-			);
-
-			let listenerCallCount = 0;
-			const listener = jest.fn(async () => {
-				listenerCallCount++;
-				await new Promise((resolve) => setTimeout(resolve, 10));
-			});
-
-			manager.addRemoteVaultUpdateListener(listener);
-			manager.start();
-
-			await new Promise((resolve) => setTimeout(resolve, 50));
-
-			const vaultUpdate: WebSocketServerMessage = {
-				type: "vaultUpdate",
-				updates: []
-			};
-
-			// Access private field to inspect outstandingPromises
-			const outstandingPromises = (manager as unknown as {
-				outstandingPromises: Promise<unknown>[];
-			}).outstandingPromises;
-
-			// Send multiple messages
-			const mockWs = (manager as unknown as { webSocket: MockWebSocket })
-				.webSocket;
-			mockWs.simulateMessage(vaultUpdate);
-			mockWs.simulateMessage(vaultUpdate);
-			mockWs.simulateMessage(vaultUpdate);
-
-			// Wait for listeners to complete
-			await new Promise((resolve) => setTimeout(resolve, 100));
-
-			// BUG: The promises should have been removed after completion,
-			// but due to the tracking bug, they accumulate in the array
-			// The finally() handler tries to remove `trackedPromise` but
-			// outstandingPromises contains the wrapper promises
-			expect(outstandingPromises.length).toBeGreaterThan(0);
-			expect(listenerCallCount).toBe(3);
-
-			// This demonstrates the memory leak - promises never get cleaned up
-			console.log(
-				`MEMORY LEAK: ${outstandingPromises.length} promises still tracked after completion`
-			);
-
-			await manager.stop();
-		});
-
-		it("EXPOSES: promises accumulate over many messages", async () => {
-			const manager = new WebSocketManager(
-				deviceId,
-				mockLogger,
-				mockSettings,
-				MockWebSocket as unknown as typeof WebSocket
-			);
-
-			manager.addRemoteVaultUpdateListener(async () => {
-				await new Promise((resolve) => setTimeout(resolve, 5));
-			});
-			manager.start();
-
-			await new Promise((resolve) => setTimeout(resolve, 50));
-
-			const outstandingPromises = (manager as unknown as {
-				outstandingPromises: Promise<unknown>[];
-			}).outstandingPromises;
-
-			const mockWs = (manager as unknown as { webSocket: MockWebSocket })
-				.webSocket;
-
-			// Send 10 messages
-			for (let i = 0; i < 10; i++) {
-				mockWs.simulateMessage({
-					type: "vaultUpdate",
-					updates: []
-				});
-			}
-
-			await new Promise((resolve) => setTimeout(resolve, 100));
-
-			// BUG: All 10 promises should be cleaned up, but they're not
-			expect(outstandingPromises.length).toBe(10);
-			console.log(
-				`MEMORY LEAK: ${outstandingPromises.length} promises accumulated`
-			);
-
-			await manager.stop();
-		});
-
-		it("EXPOSES: same bug occurs with cursor position messages", async () => {
-			const manager = new WebSocketManager(
-				deviceId,
-				mockLogger,
-				mockSettings,
-				MockWebSocket as unknown as typeof WebSocket
-			);
-
-			manager.addRemoteCursorsUpdateListener(async () => {
-				await new Promise((resolve) => setTimeout(resolve, 10));
-			});
-			manager.start();
-
-			await new Promise((resolve) => setTimeout(resolve, 50));
-
-			const outstandingPromises = (manager as unknown as {
-				outstandingPromises: Promise<unknown>[];
-			}).outstandingPromises;
-
-			const mockWs = (manager as unknown as { webSocket: MockWebSocket })
-				.webSocket;
-
-			const cursorMessage: WebSocketServerMessage = {
-				type: "cursorPositions",
-				clients: [
-					{
-						deviceId: "other-device",
-						cursors: []
-					}
-				]
-			};
-
-			mockWs.simulateMessage(cursorMessage);
-			mockWs.simulateMessage(cursorMessage);
-
-			await new Promise((resolve) => setTimeout(resolve, 100));
-
-			// BUG: Same promise tracking bug affects cursor messages
-			expect(outstandingPromises.length).toBe(2);
-
-			await manager.stop();
-		});
-	});
-
-	describe("BUG #2: Redundant WebSocket Checks", () => {
-		it("EXPOSES: updateLocalCursors logs duplicate warnings", () => {
-			const manager = new WebSocketManager(
-				deviceId,
-				mockLogger,
-				mockSettings,
-				MockWebSocket as unknown as typeof WebSocket
-			);
-
-			// Don't start, so WebSocket is not connected
-			manager.updateLocalCursors({ cursors: [] });
-
-			// BUG: Two warning logs are generated for the same condition
-			expect(mockLogger.warn).toHaveBeenCalledTimes(2);
-			expect(mockLogger.warn).toHaveBeenCalledWith(
-				"WebSocket is not connected, cannot send cursor positions"
-			);
-		});
-
-		it("EXPOSES: race condition between checks", async () => {
-			const manager = new WebSocketManager(
-				deviceId,
-				mockLogger,
-				mockSettings,
-				MockWebSocket as unknown as typeof WebSocket
-			);
-
-			manager.start();
-			await new Promise((resolve) => setTimeout(resolve, 50));
-
-			// Manually set WebSocket to closing state after first check
-			const mockWs = (manager as unknown as { webSocket: MockWebSocket })
-				.webSocket;
-			const originalReadyState = mockWs.readyState;
-
-			// Simulate race condition: connection drops between the two checks
-			jest.spyOn(mockWs, "readyState", "get")
-				.mockReturnValueOnce(MockWebSocket.OPEN) // First check passes
-				.mockReturnValueOnce(MockWebSocket.CLOSED); // Second check fails
-
-			manager.updateLocalCursors({ cursors: [] });
-
-			// BUG: Even though first check passed, second check fails
-			// This demonstrates the race condition
-			expect(mockLogger.warn).toHaveBeenCalledWith(
-				"WebSocket is not connected, cannot send cursor positions"
-			);
-
-			await manager.stop();
-		});
-	});
-
-	describe("BUG #3: Missing Error Handling on send()", () => {
-		it("EXPOSES: sendHandshakeMessage crashes when send() throws", async () => {
-			const manager = new WebSocketManager(
-				deviceId,
-				mockLogger,
-				mockSettings,
-				MockWebSocket as unknown as typeof WebSocket
-			);
-
-			manager.start();
-			await new Promise((resolve) => setTimeout(resolve, 50));
-
-			const mockWs = (manager as unknown as { webSocket: MockWebSocket })
-				.webSocket;
-
-			// Simulate send() throwing an error (e.g., buffer full)
-			jest.spyOn(mockWs, "send").mockImplementation(() => {
-				throw new Error("Buffer full");
-			});
-
-			// BUG: This throws and crashes - no try-catch to handle it
-			expect(() => {
-				manager.sendHandshakeMessage({
-					type: "handshake",
-					vaultName: "test",
-					deviceId: "test",
-					authToken: "test"
-				});
-			}).toThrow("Buffer full");
-
-			await manager.stop();
-		});
-
-		it("EXPOSES: updateLocalCursors crashes when send() throws", async () => {
-			const manager = new WebSocketManager(
-				deviceId,
-				mockLogger,
-				mockSettings,
-				MockWebSocket as unknown as typeof WebSocket
-			);
-
-			manager.start();
-			await new Promise((resolve) => setTimeout(resolve, 50));
-
-			const mockWs = (manager as unknown as { webSocket: MockWebSocket })
-				.webSocket;
-
-			jest.spyOn(mockWs, "send").mockImplementation(() => {
-				throw new Error("Connection closed");
-			});
-
-			// BUG: This throws and crashes - no try-catch to handle it
-			expect(() => {
-				manager.updateLocalCursors({ cursors: [] });
-			}).toThrow("Connection closed");
-
-			await manager.stop();
-		});
-
-		it("EXPOSES: send() can throw even after isWebSocketConnected check", async () => {
-			const manager = new WebSocketManager(
-				deviceId,
-				mockLogger,
-				mockSettings,
-				MockWebSocket as unknown as typeof WebSocket
-			);
-
-			manager.start();
-			await new Promise((resolve) => setTimeout(resolve, 50));
-
-			const mockWs = (manager as unknown as { webSocket: MockWebSocket })
-				.webSocket;
-
-			// WebSocket is open, but send fails
-			expect(manager.isWebSocketConnected).toBe(true);
-
-			jest.spyOn(mockWs, "send").mockImplementation(() => {
-				throw new Error("Unexpected error");
-			});
-
-			// BUG: Even though connection check passed, send() can still throw
-			expect(() => {
-				manager.updateLocalCursors({ cursors: [] });
-			}).toThrow("Unexpected error");
-
-			await manager.stop();
-		});
-	});
-
-	describe("BUG #4: Potential Infinite Loop in stop()", () => {
-		it("EXPOSES: stop() hangs if onclose handler never fires", async () => {
-			const manager = new WebSocketManager(
-				deviceId,
-				mockLogger,
-				mockSettings,
-				MockWebSocket as unknown as typeof WebSocket
-			);
-
-			manager.start();
-			await new Promise((resolve) => setTimeout(resolve, 50));
-
-			const mockWs = (manager as unknown as { webSocket: MockWebSocket })
-				.webSocket;
-
-			// Simulate a broken WebSocket that doesn't fire onclose
-			jest.spyOn(mockWs, "close").mockImplementation(() => {
-				// Close is called but onclose handler is never invoked
-				mockWs.readyState = MockWebSocket.CLOSING; // Stuck in CLOSING
-				// Don't call onclose
-			});
-
-			// BUG: This will hang forever because the while loop waits for
-			// isWebSocketConnected to become false, but it never does
-			const stopPromise = manager.stop();
-
-			// Wait a bit to show it's stuck
-			const timeoutPromise = new Promise((resolve) =>
-				setTimeout(() => resolve("timeout"), 100)
-			);
-
-			const result = await Promise.race([stopPromise, timeoutPromise]);
-
-			expect(result).toBe("timeout");
-			console.log("BUG: stop() is stuck in infinite loop");
-
-			// Note: We can't actually clean up here because stop() is hung
-			// In a real scenario, this would freeze the application
-		});
-
-		it("EXPOSES: stop() loops forever if WebSocket state is corrupted", async () => {
-			const manager = new WebSocketManager(
-				deviceId,
-				mockLogger,
-				mockSettings,
-				MockWebSocket as unknown as typeof WebSocket
-			);
-
-			manager.start();
-			await new Promise((resolve) => setTimeout(resolve, 50));
-
-			// Corrupt the WebSocket state
-			const mockWs = (manager as unknown as { webSocket: MockWebSocket })
-				.webSocket;
-			jest.spyOn(mockWs, "close").mockImplementation(() => {
-				// Intentionally leave readyState as OPEN
-				// This simulates a bug or corrupted state
-			});
-
-			const stopPromise = manager.stop();
-			const timeoutPromise = new Promise((resolve) =>
-				setTimeout(() => resolve("timeout"), 100)
-			);
-
-			const result = await Promise.race([stopPromise, timeoutPromise]);
-
-			// BUG: Infinite loop because readyState never changes
-			expect(result).toBe("timeout");
-		});
-	});
-
-	describe("BUG #5: WebSocket Handler Race Condition", () => {
-		it("EXPOSES: rapid reconnection creates multiple WebSocket instances", async () => {
-			const manager = new WebSocketManager(
-				deviceId,
-				mockLogger,
-				mockSettings,
-				MockWebSocket as unknown as typeof WebSocket
-			);
-
-			manager.start();
-			await new Promise((resolve) => setTimeout(resolve, 50));
-
-			const firstWs = (manager as unknown as { webSocket: MockWebSocket })
-				.webSocket;
-
-			// Trigger reconnection by calling initializeWebSocket again
-			(manager as unknown as { initializeWebSocket: () => void })
-				.initializeWebSocket();
-
-			const secondWs = (manager as unknown as { webSocket: MockWebSocket })
-				.webSocket;
-
-			// BUG: Two different WebSocket instances exist
-			expect(firstWs).not.toBe(secondWs);
-
-			// The old WebSocket's handlers are still registered and can fire
-			// This can cause interference and unexpected behavior
-
-			// Simulate the old WebSocket's onclose firing
-			firstWs.onclose?.(
-				new CloseEvent("close", { code: 1000, reason: "test" })
-			);
-
-			// This could trigger reconnection logic even though we have a new WebSocket
-			// The status change listeners will be called multiple times
-
-			await manager.stop();
-		});
-
-		it("EXPOSES: old WebSocket handlers interfere with new connection", async () => {
-			let statusChangeCount = 0;
-			const manager = new WebSocketManager(
-				deviceId,
-				mockLogger,
-				mockSettings,
-				MockWebSocket as unknown as typeof WebSocket
-			);
-
-			manager.addWebSocketStatusChangeListener(() => {
-				statusChangeCount++;
-			});
-
-			manager.start();
-			await new Promise((resolve) => setTimeout(resolve, 50));
-
-			const firstWs = (manager as unknown as { webSocket: MockWebSocket })
-				.webSocket;
-
-			// Reset counter after initial connection
-			statusChangeCount = 0;
-
-			// Create new WebSocket
-			(manager as unknown as { initializeWebSocket: () => void })
-				.initializeWebSocket();
-			await new Promise((resolve) => setTimeout(resolve, 50));
-
-			// Now trigger old WebSocket's onclose
-			firstWs.onclose?.(
-				new CloseEvent("close", { code: 1000, reason: "test" })
-			);
-
-			// BUG: Status change listeners are called for old connection
-			// This can cause confusion and incorrect state
-			expect(statusChangeCount).toBeGreaterThan(0);
-
-			await manager.stop();
-		});
-	});
-
-	describe("BUG #6: Untracked handleWebSocketMessage Promise", () => {
-		it("EXPOSES: handleWebSocketMessage promise not in outstandingPromises", async () => {
-			const manager = new WebSocketManager(
-				deviceId,
-				mockLogger,
-				mockSettings,
-				MockWebSocket as unknown as typeof WebSocket
-			);
-
-			let resolveListener: () => void;
-			const listenerPromise = new Promise<void>((resolve) => {
-				resolveListener = resolve;
-			});
-
-			manager.addRemoteVaultUpdateListener(async () => {
-				await listenerPromise;
-			});
-
-			manager.start();
-			await new Promise((resolve) => setTimeout(resolve, 50));
-
-			const mockWs = (manager as unknown as { webSocket: MockWebSocket })
-				.webSocket;
-
-			// Send message - this triggers handleWebSocketMessage
-			mockWs.simulateMessage({
-				type: "vaultUpdate",
-				updates: []
-			});
-
-			// Give time for handleWebSocketMessage to start
+	it("cleans up promises after message handling", async () => {
+		const manager = new WebSocketManager(
+			deviceId,
+			mockLogger,
+			mockSettings,
+			MockWebSocket as unknown as typeof WebSocket
+		);
+
+		manager.addRemoteVaultUpdateListener(async () => {
 			await new Promise((resolve) => setTimeout(resolve, 10));
-
-			// Now try to stop - the handleWebSocketMessage promise is still running
-			const stopPromise = manager.stop();
-
-			// BUG: stop() awaits outstandingPromises, but handleWebSocketMessage
-			// itself is not tracked, only the listener promises inside it are
-			// However, due to bug #1, even those aren't properly tracked
-
-			// Resolve the listener to allow stop to complete
-			resolveListener!();
-
-			await stopPromise;
-
-			// This test demonstrates that the outer handleWebSocketMessage
-			// promise is not being tracked
 		});
+		manager.start();
+		await new Promise((resolve) => setTimeout(resolve, 50));
+
+		const { outstandingPromises } = manager as unknown as {
+			outstandingPromises: Promise<unknown>[];
+		};
+		const mockWs = (manager as unknown as { webSocket: MockWebSocket })
+			.webSocket;
+
+		mockWs.simulateMessage({ type: "vaultUpdate", updates: [] });
+		mockWs.simulateMessage({ type: "vaultUpdate", updates: [] });
+		mockWs.simulateMessage({ type: "vaultUpdate", updates: [] });
+
+		await new Promise((resolve) => setTimeout(resolve, 100));
+
+		assert.strictEqual(outstandingPromises.length, 0);
+		await manager.stop();
 	});
 
-	describe("Additional Edge Cases", () => {
-		it("multiple listeners with different completion times", async () => {
-			const manager = new WebSocketManager(
-				deviceId,
-				mockLogger,
-				mockSettings,
-				MockWebSocket as unknown as typeof WebSocket
-			);
+	it("cleans up cursor position promises", async () => {
+		const manager = new WebSocketManager(
+			deviceId,
+			mockLogger,
+			mockSettings,
+			MockWebSocket as unknown as typeof WebSocket
+		);
 
-			const listener1 = jest.fn(async () => {
-				await new Promise((resolve) => setTimeout(resolve, 10));
-			});
-			const listener2 = jest.fn(async () => {
-				await new Promise((resolve) => setTimeout(resolve, 50));
-			});
-			const listener3 = jest.fn(async () => {
-				await new Promise((resolve) => setTimeout(resolve, 5));
-			});
+		manager.addRemoteCursorsUpdateListener(async () => {
+			await new Promise((resolve) => setTimeout(resolve, 10));
+		});
+		manager.start();
+		await new Promise((resolve) => setTimeout(resolve, 50));
 
-			manager.addRemoteVaultUpdateListener(listener1);
-			manager.addRemoteVaultUpdateListener(listener2);
-			manager.addRemoteVaultUpdateListener(listener3);
+		const { outstandingPromises } = manager as unknown as {
+			outstandingPromises: Promise<unknown>[];
+		};
+		const mockWs = (manager as unknown as { webSocket: MockWebSocket })
+			.webSocket;
 
-			manager.start();
-			await new Promise((resolve) => setTimeout(resolve, 50));
-
-			const outstandingPromises = (manager as unknown as {
-				outstandingPromises: Promise<unknown>[];
-			}).outstandingPromises;
-
-			const mockWs = (manager as unknown as { webSocket: MockWebSocket })
-				.webSocket;
-			mockWs.simulateMessage({ type: "vaultUpdate", updates: [] });
-
-			await new Promise((resolve) => setTimeout(resolve, 100));
-
-			// BUG: Even though all listeners completed, 3 promises remain
-			expect(outstandingPromises.length).toBe(3);
-			expect(listener1).toHaveBeenCalledTimes(1);
-			expect(listener2).toHaveBeenCalledTimes(1);
-			expect(listener3).toHaveBeenCalledTimes(1);
-
-			await manager.stop();
+		mockWs.simulateMessage({
+			type: "cursorPositions",
+			clients: [{ deviceId: "other-device", cursors: [] }]
 		});
 
-		it("listener throws error - promise still not cleaned up", async () => {
-			const manager = new WebSocketManager(
-				deviceId,
-				mockLogger,
-				mockSettings,
-				MockWebSocket as unknown as typeof WebSocket
-			);
+		await new Promise((resolve) => setTimeout(resolve, 100));
+		assert.strictEqual(outstandingPromises.length, 0);
+		await manager.stop();
+	});
 
-			const errorListener = jest.fn(async () => {
-				throw new Error("Listener error");
+	it("logs handshake send errors", async () => {
+		const manager = new WebSocketManager(
+			deviceId,
+			mockLogger,
+			mockSettings,
+			MockWebSocket as unknown as typeof WebSocket
+		);
+
+		manager.start();
+		await new Promise((resolve) => setTimeout(resolve, 50));
+
+		const mockWs = (manager as unknown as { webSocket: MockWebSocket })
+			.webSocket;
+		mockWs.send = (): void => {
+			throw new Error("Buffer full");
+		};
+
+		assert.throws(() => {
+			manager.sendHandshakeMessage({
+				type: "handshake",
+				token: "test",
+				deviceId: "test",
+				lastSeenVaultUpdateId: null
 			});
-
-			manager.addRemoteVaultUpdateListener(errorListener);
-			manager.start();
-			await new Promise((resolve) => setTimeout(resolve, 50));
-
-			const outstandingPromises = (manager as unknown as {
-				outstandingPromises: Promise<unknown>[];
-			}).outstandingPromises;
-
-			const mockWs = (manager as unknown as { webSocket: MockWebSocket })
-				.webSocket;
-			mockWs.simulateMessage({ type: "vaultUpdate", updates: [] });
-
-			await new Promise((resolve) => setTimeout(resolve, 50));
-
-			// Error should be logged
-			expect(mockLogger.error).toHaveBeenCalledWith(
-				expect.stringContaining("Error in vault update listener")
-			);
-
-			// BUG: Promise still not removed even after error
-			expect(outstandingPromises.length).toBe(1);
-
-			await manager.stop();
 		});
+
+		await manager.stop();
+	});
+
+	it("completes stop with timeout protection", async () => {
+		const manager = new WebSocketManager(
+			deviceId,
+			mockLogger,
+			mockSettings,
+			MockWebSocket as unknown as typeof WebSocket
+		);
+
+		manager.start();
+		await new Promise((resolve) => setTimeout(resolve, 50));
+
+		await manager.stop();
+		assert.ok(true);
+	});
+
+	it("clears old handlers on reconnection", async () => {
+		const manager = new WebSocketManager(
+			deviceId,
+			mockLogger,
+			mockSettings,
+			MockWebSocket as unknown as typeof WebSocket
+		);
+
+		let statusChangeCount = 0;
+		manager.addWebSocketStatusChangeListener(() => {
+			statusChangeCount++;
+		});
+
+		manager.start();
+		await new Promise((resolve) => setTimeout(resolve, 50));
+
+		const firstWs = (manager as unknown as { webSocket: MockWebSocket })
+			.webSocket;
+
+		statusChangeCount = 0;
+
+		(
+			manager as unknown as { initializeWebSocket: () => void }
+		).initializeWebSocket();
+		await new Promise((resolve) => setTimeout(resolve, 50));
+
+		statusChangeCount = 0;
+
+		// Old handler should be cleared
+		firstWs.onclose?.(
+			new MockCloseEvent("close", { code: 1000, reason: "test" })
+		);
+
+		assert.strictEqual(statusChangeCount, 0);
+		await manager.stop();
+	});
+
+	it("tracks message handling promises", async () => {
+		const manager = new WebSocketManager(
+			deviceId,
+			mockLogger,
+			mockSettings,
+			MockWebSocket as unknown as typeof WebSocket
+		);
+
+		// eslint-disable-next-line @typescript-eslint/init-declarations
+		let resolveListener: () => void;
+		const listenerPromise = new Promise<void>((resolve) => {
+			resolveListener = resolve;
+		});
+
+		manager.addRemoteVaultUpdateListener(async () => {
+			await listenerPromise;
+		});
+
+		manager.start();
+		await new Promise((resolve) => setTimeout(resolve, 50));
+
+		const mockWs = (manager as unknown as { webSocket: MockWebSocket })
+			.webSocket;
+		mockWs.simulateMessage({ type: "vaultUpdate", updates: [] });
+
+		await new Promise((resolve) => setTimeout(resolve, 10));
+
+		const { outstandingPromises } = manager as unknown as {
+			outstandingPromises: Promise<unknown>[];
+		};
+
+		assert.ok(outstandingPromises.length > 0);
+
+		// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+		resolveListener!();
+		await new Promise((resolve) => setTimeout(resolve, 50));
+
+		assert.strictEqual(outstandingPromises.length, 0);
+		await manager.stop();
 	});
 });
diff --git a/frontend/sync-client/src/utils/debugging/slow-web-socket-factory.ts b/frontend/sync-client/src/utils/debugging/slow-web-socket-factory.ts
index 117e9b2f..e52ff76b 100644
--- a/frontend/sync-client/src/utils/debugging/slow-web-socket-factory.ts
+++ b/frontend/sync-client/src/utils/debugging/slow-web-socket-factory.ts
@@ -13,17 +13,17 @@ export function slowWebSocketFactory(
 
 		private readonly locks = new Locks(logger);
 
-		public set onopen(callback: (event: Event) => void) {
+		public set onopen(callback: ((event: Event) => void) | null) {
 			super.onopen = async (event: Event): Promise<void> => {
 				if (jitterScaleInSeconds > 0) {
 					await sleep(Math.random() * jitterScaleInSeconds * 1000);
 				}
 
-				callback(event);
+				callback?.(event);
 			};
 		}
 
-		public set onmessage(callback: (event: MessageEvent) => void) {
+		public set onmessage(callback: ((event: MessageEvent) => void) | null) {
 			super.onmessage = async (event: MessageEvent): Promise<void> => {
 				await this.locks.withLock(
 					FlakyWebSocket.RECEIVE_KEY,
@@ -34,27 +34,27 @@ export function slowWebSocketFactory(
 							);
 						}
 
-						callback(event);
+						callback?.(event);
 					}
 				);
 			};
 		}
 
-		public set onclose(callback: (event: CloseEvent) => void) {
+		public set onclose(callback: ((event: CloseEvent) => void) | null) {
 			super.onclose = async (event: CloseEvent): Promise<void> => {
 				if (jitterScaleInSeconds > 0) {
 					await sleep(Math.random() * jitterScaleInSeconds * 1000);
 				}
-				callback(event);
+				callback?.(event);
 			};
 		}
 
-		public set onerror(callback: (event: Event) => void) {
+		public set onerror(callback: ((event: Event) => void) | null) {
 			super.onerror = async (event: Event): Promise<void> => {
 				if (jitterScaleInSeconds > 0) {
 					await sleep(Math.random() * jitterScaleInSeconds * 1000);
 				}
-				callback(event);
+				callback?.(event);
 			};
 		}
 

From d45d2c0be3fdb4169e89d56286048176076d128a Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 27 Nov 2025 21:29:55 +0000
Subject: [PATCH 665/761] Fix E2E testing

---
 frontend/test-client/src/agent/mock-agent.ts | 46 ++++++++++++--------
 frontend/test-client/src/cli.ts              | 22 +++++-----
 2 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/frontend/test-client/src/agent/mock-agent.ts b/frontend/test-client/src/agent/mock-agent.ts
index 80413fe0..42d9490d 100644
--- a/frontend/test-client/src/agent/mock-agent.ts
+++ b/frontend/test-client/src/agent/mock-agent.ts
@@ -108,32 +108,40 @@ export class MockAgent extends MockClient {
 			}
 		}
 
-		if (Math.random() < 0.1 && this.doResets) {
-			options.push(this.resetClient.bind(this));
+		if (Math.random() < 0.015 && this.doResets) {
+			// we can't just queue this up as once it's destroyed, no more method calls can go to SyncClient
+			await this.resetClient();
+		} else {
+			this.pendingActions.push(
+				(async (): Promise<unknown> => {
+					try {
+						return await choose(options)();
+					} catch (error) {
+						this.client.logger.error(
+							`Failed to perform an action: ${error}`
+						);
+						this.client.logger.info(
+							JSON.stringify(this.data, null, 2)
+						);
+						this.client.logger.info(
+							JSON.stringify(this.localFiles, null, 2)
+						);
+						throw error;
+					}
+				})()
+			);
 		}
-
-		this.pendingActions.push(
-			(async (): Promise<unknown> => {
-				try {
-					return await choose(options)();
-				} catch (error) {
-					this.client.logger.error(
-						`Failed to perform an action: ${error}`
-					);
-					this.client.logger.info(JSON.stringify(this.data, null, 2));
-					this.client.logger.info(
-						JSON.stringify(this.localFiles, null, 2)
-					);
-					throw error;
-				}
-			})()
-		);
 	}
 
 	public async finish(): Promise<void> {
 		await this.client.setSetting("isSyncEnabled", true);
 		// eslint-disable-next-line no-restricted-properties
 		await Promise.all(this.pendingActions);
+		await this.client.waitUntilFinished();
+	}
+
+	public async destroy(): Promise<void> {
+		await this.client.waitUntilFinished();
 		await this.client.destroy();
 	}
 
diff --git a/frontend/test-client/src/cli.ts b/frontend/test-client/src/cli.ts
index 7b81f800..531cf102 100644
--- a/frontend/test-client/src/cli.ts
+++ b/frontend/test-client/src/cli.ts
@@ -82,7 +82,7 @@ async function runTest({
 		// then we need a second pass to ensure that all agents pull the same state.
 		for (const client of clients) {
 			try {
-				await client.finish();
+				await client.destroy();
 			} catch (err) {
 				if (!slowFileEvents) {
 					throw err;
@@ -116,17 +116,17 @@ async function runTest({
 }
 
 async function runTests(): Promise<void> {
-	await runTest({
-		agentCount: 2,
-		concurrency: 16,
-		iterations: 100,
-		doDeletes: true,
-		doResets: true,
-		useSlowFileEvents: true,
-		jitterScaleInSeconds: 0.75
-	});
-
 	for (let i = 0; i < TEST_ITERATIONS; i++) {
+		await runTest({
+			agentCount: 2,
+			concurrency: 16,
+			iterations: 100,
+			doDeletes: true,
+			doResets: true,
+			useSlowFileEvents: true,
+			jitterScaleInSeconds: 0.75
+		});
+
 		for (const useSlowFileEvents of [false, true]) {
 			for (const concurrency of [
 				16,

From 9d60ec14dda5ec145b72158a9c2b4e5c5ffb2bbd Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 27 Nov 2025 21:30:17 +0000
Subject: [PATCH 666/761] Improve API

---
 frontend/local-client-cli/src/cli.ts          |   1 +
 .../obsidian-plugin/src/vault-link-plugin.ts  |   6 +-
 frontend/sync-client/src/consts.ts            |   1 +
 frontend/sync-client/src/sync-client.ts       | 104 ++++++++----------
 4 files changed, 55 insertions(+), 57 deletions(-)

diff --git a/frontend/local-client-cli/src/cli.ts b/frontend/local-client-cli/src/cli.ts
index bc84b565..36449d8d 100644
--- a/frontend/local-client-cli/src/cli.ts
+++ b/frontend/local-client-cli/src/cli.ts
@@ -188,6 +188,7 @@ async function main(): Promise<void> {
 		);
 
 		fileWatcher.stop();
+		await client.waitUntilFinished();
 		await client.destroy();
 		console.log(colorize("Shutdown complete", "green"));
 		process.exit(0);
diff --git a/frontend/obsidian-plugin/src/vault-link-plugin.ts b/frontend/obsidian-plugin/src/vault-link-plugin.ts
index 336f9750..74cbf381 100644
--- a/frontend/obsidian-plugin/src/vault-link-plugin.ts
+++ b/frontend/obsidian-plugin/src/vault-link-plugin.ts
@@ -49,7 +49,11 @@ export default class VaultLinkPlugin extends Plugin {
 
 			this.registerEditorEvents(client);
 
-			this.register(async () => client.destroy());
+			this.register(async () => {
+				await client.waitUntilFinished();
+				await client.destroy();
+			});
+
 			await client.start();
 		});
 	}
diff --git a/frontend/sync-client/src/consts.ts b/frontend/sync-client/src/consts.ts
index 8fa50f47..b90c48c3 100644
--- a/frontend/sync-client/src/consts.ts
+++ b/frontend/sync-client/src/consts.ts
@@ -3,3 +3,4 @@ export const DIFF_CACHE_SIZE_MB = 2;
 export const MAX_LOG_MESSAGE_COUNT = 100000;
 export const MAX_HISTORY_ENTRY_COUNT = 5000;
 export const SUPPORTED_API_VERSION = 1;
+export const WEBSOCKET_DISCONNECT_TIMEOUT_IN_S = 10;
diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts
index 06c839c9..0ca98137 100644
--- a/frontend/sync-client/src/sync-client.ts
+++ b/frontend/sync-client/src/sync-client.ts
@@ -39,7 +39,6 @@ export class SyncClient {
 		private readonly settings: Settings,
 		private readonly database: Database,
 		private readonly syncer: Syncer,
-		private readonly syncService: SyncService,
 		private readonly webSocketManager: WebSocketManager,
 		public readonly logger: Logger,
 		private readonly fetchController: FetchController,
@@ -57,14 +56,10 @@ export class SyncClient {
 	) {}
 
 	public get documentCount(): number {
-		this.checkIfDestroyed();
-
 		return this.database.length;
 	}
 
 	public get isWebSocketConnected(): boolean {
-		this.checkIfDestroyed();
-
 		return this.webSocketManager.isWebSocketConnected;
 	}
 	public static async create({
@@ -195,7 +190,6 @@ export class SyncClient {
 			settings,
 			database,
 			syncer,
-			syncService,
 			webSocketManager,
 			logger,
 			fetchController,
@@ -213,7 +207,7 @@ export class SyncClient {
 	}
 
 	public async start(): Promise<void> {
-		this.checkIfDestroyed();
+		this.checkIfDestroyed("start");
 
 		if (this.hasStarted) {
 			throw new Error("SyncClient has already been started");
@@ -250,7 +244,7 @@ export class SyncClient {
 	 * retaining current in-memory settings.
 	 */
 	public async reloadSettings(): Promise<void> {
-		this.checkIfDestroyed();
+		this.checkIfDestroyed("reloadSettings");
 
 		const state = (await this.persistence.load()) ?? {
 			settings: undefined
@@ -265,7 +259,7 @@ export class SyncClient {
 	}
 
 	public async checkConnection(): Promise<NetworkConnectionStatus> {
-		this.checkIfDestroyed();
+		this.checkIfDestroyed("checkConnection");
 
 		const server = await this.serverConfig.checkConnection(true);
 		return {
@@ -276,15 +270,13 @@ export class SyncClient {
 	}
 
 	public getHistoryEntries(): readonly HistoryEntry[] {
-		this.checkIfDestroyed();
-
 		return this.history.entries;
 	}
 
 	public addSyncHistoryUpdateListener(
 		listener: (stats: HistoryStats) => unknown
 	): void {
-		this.checkIfDestroyed();
+		this.checkIfDestroyed("addSyncHistoryUpdateListener");
 
 		this.history.addSyncHistoryUpdateListener(listener);
 	}
@@ -295,7 +287,7 @@ export class SyncClient {
 	 * The SyncClient can be used again after calling this method.
 	 */
 	public async applyChangedConnectionSettings(): Promise<void> {
-		this.checkIfDestroyed();
+		this.checkIfDestroyed("applyChangedConnectionSettings");
 
 		this.logger.info(
 			"Stopping SyncClient to apply changed connection settings"
@@ -311,35 +303,10 @@ export class SyncClient {
 		this.hasFinishedOfflineSync = false;
 		this.serverConfig.reset();
 
-		// restart syncing
-		this.fetchController.finishReset();
 		await this.startSyncing();
 	}
 
-	/**
-	 * Completely destroy the SyncClient, cancelling all in-progress operations.
-	 * After calling this method, the SyncClient cannot be used again.
-	 */
-	public async destroy(): Promise<void> {
-		this.checkIfDestroyed();
-
-		// cancel everything that's in progress
-		this.fetchController.startReset();
-		await this.pause();
-
-		this.hasBeenDestroyed = true;
-
-		// clean-up memory early
-		this.resetInMemoryState();
-
-		this.logger.info("SyncClient has been successfully disposed");
-
-		this.unloadTelemetry?.();
-	}
-
 	public getSettings(): SyncSettings {
-		this.checkIfDestroyed();
-
 		return this.settings.getSettings();
 	}
 
@@ -347,13 +314,13 @@ export class SyncClient {
 		key: T,
 		value: SyncSettings[T]
 	): Promise<void> {
-		this.checkIfDestroyed();
+		this.checkIfDestroyed("setSetting");
 
 		await this.settings.setSetting(key, value);
 	}
 
 	public async setSettings(value: Partial<SyncSettings>): Promise<void> {
-		this.checkIfDestroyed();
+		this.checkIfDestroyed("setSettings");
 
 		await this.settings.setSettings(value);
 	}
@@ -361,7 +328,7 @@ export class SyncClient {
 	public addOnSettingsChangeListener(
 		listener: (settings: SyncSettings, oldSettings: SyncSettings) => unknown
 	): void {
-		this.checkIfDestroyed();
+		this.checkIfDestroyed("addOnSettingsChangeListener");
 
 		this.settings.addOnSettingsChangeListener(listener);
 	}
@@ -369,13 +336,13 @@ export class SyncClient {
 	public addRemainingSyncOperationsListener(
 		listener: (remainingOperations: number) => unknown
 	): void {
-		this.checkIfDestroyed();
+		this.checkIfDestroyed("addRemainingSyncOperationsListener");
 
 		this.syncer.addRemainingOperationsListener(listener);
 	}
 
 	public addWebSocketStatusChangeListener(listener: () => unknown): void {
-		this.checkIfDestroyed();
+		this.checkIfDestroyed("addWebSocketStatusChangeListener");
 
 		this.webSocketManager.addWebSocketStatusChangeListener(listener);
 	}
@@ -383,7 +350,7 @@ export class SyncClient {
 	public async syncLocallyCreatedFile(
 		relativePath: RelativePath
 	): Promise<void> {
-		this.checkIfDestroyed();
+		this.checkIfDestroyed("syncLocallyCreatedFile");
 
 		this.fileChangeNotifier.notifyOfFileChange(relativePath);
 		return this.syncer.syncLocallyCreatedFile(relativePath);
@@ -392,7 +359,7 @@ export class SyncClient {
 	public async syncLocallyDeletedFile(
 		relativePath: RelativePath
 	): Promise<void> {
-		this.checkIfDestroyed();
+		this.checkIfDestroyed("syncLocallyDeletedFile");
 
 		this.fileChangeNotifier.notifyOfFileChange(relativePath);
 		return this.syncer.syncLocallyDeletedFile(relativePath);
@@ -405,7 +372,7 @@ export class SyncClient {
 		oldPath?: RelativePath;
 		relativePath: RelativePath;
 	}): Promise<void> {
-		this.checkIfDestroyed();
+		this.checkIfDestroyed("syncLocallyUpdatedFile");
 
 		this.fileChangeNotifier.notifyOfFileChange(relativePath);
 		return this.syncer.syncLocallyUpdatedFile({
@@ -417,7 +384,7 @@ export class SyncClient {
 	public getDocumentSyncingStatus(
 		relativePath: RelativePath
 	): DocumentSyncStatus {
-		this.checkIfDestroyed();
+		this.checkIfDestroyed("getDocumentSyncingStatus");
 
 		if (!this.settings.getSettings().isSyncEnabled) {
 			return DocumentSyncStatus.SYNCING_IS_DISABLED;
@@ -440,7 +407,7 @@ export class SyncClient {
 	public async updateLocalCursors(
 		documentToCursors: Record<RelativePath, CursorSpan[]>
 	): Promise<void> {
-		this.checkIfDestroyed();
+		this.checkIfDestroyed("updateLocalCursors");
 
 		await this.cursorTracker.sendLocalCursorsToServer(documentToCursors);
 	}
@@ -448,13 +415,40 @@ export class SyncClient {
 	public addRemoteCursorsUpdateListener(
 		listener: (cursors: MaybeOutdatedClientCursors[]) => unknown
 	): void {
-		this.checkIfDestroyed();
+		this.checkIfDestroyed("addRemoteCursorsUpdateListener");
 
 		this.cursorTracker.addRemoteCursorsUpdateListener(listener);
 	}
 
+	public async waitUntilFinished(): Promise<void> {
+		this.checkIfDestroyed("waitUntilIdle");
+		await this.syncer.waitUntilFinished();
+		await this.webSocketManager.waitUntilFinished();
+		await this.database.save(); // flush all changes to disk
+	}
+
+	/**
+	 * Completely destroy the SyncClient, cancelling all in-progress operations.
+	 * After calling this method, the SyncClient cannot be used again.
+	 */
+	public async destroy(): Promise<void> {
+		this.checkIfDestroyed("destroy");
+
+		// cancel everything that's in progress
+		await this.pause();
+
+		this.hasBeenDestroyed = true;
+
+		this.resetInMemoryState();
+
+		this.logger.info("SyncClient has been successfully disposed");
+
+		this.unloadTelemetry?.();
+	}
+
 	private async startSyncing(): Promise<void> {
-		this.checkIfDestroyed();
+		this.checkIfDestroyed("startSyncing");
+		this.fetchController.finishReset();
 
 		await this.serverConfig.initialize();
 
@@ -464,15 +458,13 @@ export class SyncClient {
 		}
 
 		this.hasFinishedOfflineSync = true;
-		this.fetchController.finishReset();
 		this.webSocketManager.start();
 	}
 
 	private async pause(): Promise<void> {
 		this.fetchController.startReset();
 		await this.webSocketManager.stop();
-		await this.syncer.waitUntilFinished();
-		await this.database.save(); // flush all changes to disk
+		await this.waitUntilFinished();
 	}
 
 	private resetInMemoryState(): void {
@@ -488,7 +480,7 @@ export class SyncClient {
 		newSettings: SyncSettings,
 		oldSettings: SyncSettings
 	): Promise<void> {
-		this.checkIfDestroyed();
+		this.checkIfDestroyed("onSettingsChange");
 
 		if (
 			newSettings.vaultName !== oldSettings.vaultName ||
@@ -518,10 +510,10 @@ export class SyncClient {
 		}
 	}
 
-	private checkIfDestroyed(): void {
+	private checkIfDestroyed(origin: string): void {
 		if (this.hasBeenDestroyed) {
 			throw new Error(
-				"SyncClient has been destroyed and can no longer be used."
+				`SyncClient has been destroyed and can no longer be used; called from ${origin}`
 			);
 		}
 	}

From 476588a63bcbfddfc2f0ed43795610b0494986d8 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 27 Nov 2025 21:47:50 +0000
Subject: [PATCH 667/761] Don't print success twice

---
 scripts/check.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/check.sh b/scripts/check.sh
index eccc5714..9541ecf4 100755
--- a/scripts/check.sh
+++ b/scripts/check.sh
@@ -41,6 +41,7 @@ cd ..
 
 if [[ "$FIX_MODE" == true ]]; then
     $0
+else
+    echo "Success"
 fi
 
-echo "Success"

From c10b6435d46319af79c3b1f74e22b881f3343d50 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 27 Nov 2025 21:52:05 +0000
Subject: [PATCH 668/761] Don't download all documents when initial sync gets
 interrupted

---
 frontend/sync-client/src/persistence/database.ts              | 4 ++++
 frontend/sync-client/src/utils/data-structures/min-covered.ts | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/frontend/sync-client/src/persistence/database.ts b/frontend/sync-client/src/persistence/database.ts
index 2babdadf..dd519659 100644
--- a/frontend/sync-client/src/persistence/database.ts
+++ b/frontend/sync-client/src/persistence/database.ts
@@ -75,6 +75,10 @@ export class Database {
 			Math.max(0, lastSeenUpdateId ?? 0) // the first updateId will be 1 which is the first integer after -1
 		);
 
+		this.documents.forEach((doc) =>
+			this.lastSeenUpdateIds.add(doc.metadata?.parentVersionId)
+		);
+
 		this.hasInitialSyncCompleted =
 			initialState.hasInitialSyncCompleted ?? false;
 		this.logger.debug(
diff --git a/frontend/sync-client/src/utils/data-structures/min-covered.ts b/frontend/sync-client/src/utils/data-structures/min-covered.ts
index d55746df..be480597 100644
--- a/frontend/sync-client/src/utils/data-structures/min-covered.ts
+++ b/frontend/sync-client/src/utils/data-structures/min-covered.ts
@@ -28,8 +28,8 @@ export class CoveredValues {
 		this.advanceMinWhilePossible();
 	}
 
-	public add(value: number): void {
-		if (value < this.minValue) {
+	public add(value: number | undefined): void {
+		if (value === undefined || value < this.minValue) {
 			return;
 		}
 

From 13f5456b39ac834151e1f0851065f6f2efbf81e3 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 27 Nov 2025 22:21:13 +0000
Subject: [PATCH 669/761] Fix race condition

---
 frontend/sync-client/src/sync-operations/syncer.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/sync-client/src/sync-operations/syncer.ts b/frontend/sync-client/src/sync-operations/syncer.ts
index 43df0a85..897bdf57 100644
--- a/frontend/sync-client/src/sync-operations/syncer.ts
+++ b/frontend/sync-client/src/sync-operations/syncer.ts
@@ -412,7 +412,7 @@ export class Syncer {
 			}
 		}
 
-		const updates = awaitAll(
+		await awaitAll(
 			allLocalFiles.map(async (relativePath) => {
 				if (
 					this.database.getLatestDocumentByRelativePath(relativePath)
@@ -470,7 +470,9 @@ export class Syncer {
 			})
 		);
 
-		const deletes = awaitAll(
+		// this has to happen strictly after the previous awaitAll, as that one
+		// might have removed some of the documents from the list
+		await awaitAll(
 			locallyPossiblyDeletedFiles.map(async ({ relativePath }) => {
 				this.logger.debug(
 					`Document ${relativePath} has been deleted locally, scheduling sync to delete it`
@@ -480,8 +482,6 @@ export class Syncer {
 				return this.syncLocallyDeletedFile(relativePath);
 			})
 		);
-
-		await awaitAll([updates, deletes]);
 	}
 
 	/**

From b0b5da7d37e766e0addbb49d9e6995638308ff27 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 27 Nov 2025 22:21:37 +0000
Subject: [PATCH 670/761] Remove frequent popups

---
 frontend/obsidian-plugin/src/vault-link-plugin.ts | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/frontend/obsidian-plugin/src/vault-link-plugin.ts b/frontend/obsidian-plugin/src/vault-link-plugin.ts
index 74cbf381..4287d636 100644
--- a/frontend/obsidian-plugin/src/vault-link-plugin.ts
+++ b/frontend/obsidian-plugin/src/vault-link-plugin.ts
@@ -75,15 +75,6 @@ export default class VaultLinkPlugin extends Plugin {
 		this.openSettings();
 	}
 
-	public onExternalSettingsChange(): void {
-		new Notice("VaultLink settings have changed externally, applying...");
-		this.syncClient?.reloadSettings().catch((err: unknown) => {
-			throw new Error(
-				`Error while reloading settings after external change: ${err}`
-			);
-		});
-	}
-
 	public openSettings(): void {
 		// eslint-disable-next-line
 		(this.app as any).setting.open(); // this is undocumented

From 67c912ae4ccd2a3bb4dec8f32b1d38c490fead64 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 27 Nov 2025 22:21:44 +0000
Subject: [PATCH 671/761] Format

---
 frontend/sync-client/src/persistence/database.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/sync-client/src/persistence/database.ts b/frontend/sync-client/src/persistence/database.ts
index dd519659..658596ef 100644
--- a/frontend/sync-client/src/persistence/database.ts
+++ b/frontend/sync-client/src/persistence/database.ts
@@ -75,9 +75,9 @@ export class Database {
 			Math.max(0, lastSeenUpdateId ?? 0) // the first updateId will be 1 which is the first integer after -1
 		);
 
-		this.documents.forEach((doc) =>
-			this.lastSeenUpdateIds.add(doc.metadata?.parentVersionId)
-		);
+		this.documents.forEach((doc) => {
+			this.lastSeenUpdateIds.add(doc.metadata?.parentVersionId);
+		});
 
 		this.hasInitialSyncCompleted =
 			initialState.hasInitialSyncCompleted ?? false;

From e53482ced8d5c132f3f7a06171e7d3d563d36ec2 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 28 Nov 2025 07:59:29 +0000
Subject: [PATCH 672/761] Make skipped file a warning

---
 frontend/sync-client/src/tracing/sync-history.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/sync-client/src/tracing/sync-history.ts b/frontend/sync-client/src/tracing/sync-history.ts
index 0d2009f7..0fb1a754 100644
--- a/frontend/sync-client/src/tracing/sync-history.ts
+++ b/frontend/sync-client/src/tracing/sync-history.ts
@@ -174,7 +174,7 @@ export class SyncHistory {
 				this.logger.error(`Cannot sync file: ${message}`);
 				break;
 			case SyncStatus.SKIPPED:
-				this.logger.error(`Skipping file: ${message}`);
+				this.logger.warn(`Skipping file: ${message}`);
 				break;
 		}
 

From 7a95d9f0a8066cb70a0c0fb304bc7580b6a3ce56 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 28 Nov 2025 21:23:55 +0000
Subject: [PATCH 673/761] Use named group

---
 frontend/sync-client/src/file-operations/file-operations.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/frontend/sync-client/src/file-operations/file-operations.ts b/frontend/sync-client/src/file-operations/file-operations.ts
index 7c9a45cf..1cf434c2 100644
--- a/frontend/sync-client/src/file-operations/file-operations.ts
+++ b/frontend/sync-client/src/file-operations/file-operations.ts
@@ -9,7 +9,7 @@ import { isBinary } from "../utils/is-binary";
 import type { ServerConfig } from "../services/server-config";
 
 export class FileOperations {
-	private static readonly PARENTHESES_REGEX = / \((\d+)\)$/;
+	private static readonly PARENTHESES_REGEX = / \((?<count>\d+)\)$/;
 	private readonly fs: SafeFileSystemOperations;
 
 	public constructor(
@@ -251,7 +251,8 @@ export class FileOperations {
 				: "";
 		let stem = extension ? nameParts.slice(0, -1).join(".") : fileName;
 		let currentCount = Number.parseInt(
-			FileOperations.PARENTHESES_REGEX.exec(stem)?.[1] ?? "0"
+			FileOperations.PARENTHESES_REGEX.exec(stem)?.groups?.["count"] ??
+				"0"
 		);
 		stem = stem.replace(FileOperations.PARENTHESES_REGEX, "");
 

From 91f49d6997e74b74eeb56a53176a713232bf1f05 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 28 Nov 2025 21:24:14 +0000
Subject: [PATCH 674/761] Decrease parallelism

---
 .github/workflows/e2e.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 146b54f1..0ec25803 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -48,4 +48,4 @@ jobs:
           cargo run config-e2e.yml --color never &
           cd ..
 
-          scripts/e2e.sh 32
+          scripts/e2e.sh 8

From 10fdc938c50dbea6e6049d436cc7acdd4045b635 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 28 Nov 2025 21:27:27 +0000
Subject: [PATCH 675/761] Add error on duplicate plugin load

---
 frontend/obsidian-plugin/src/vault-link-plugin.ts | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/frontend/obsidian-plugin/src/vault-link-plugin.ts b/frontend/obsidian-plugin/src/vault-link-plugin.ts
index 4287d636..ad93ba69 100644
--- a/frontend/obsidian-plugin/src/vault-link-plugin.ts
+++ b/frontend/obsidian-plugin/src/vault-link-plugin.ts
@@ -43,6 +43,14 @@ export default class VaultLinkPlugin extends Plugin {
 
 	public async onload(): Promise<void> {
 		this.app.workspace.onLayoutReady(async () => {
+			if ((globalThis as any).VAULT_LINK_RUNNING_INSTANCE) {
+				new Notice(
+					"Another instance of VaultLink is already running. Please disable the duplicate instance."
+				);
+				throw new Error("VaultLink instance already running");
+			}
+			(globalThis as any).VAULT_LINK_RUNNING_INSTANCE = this;
+
 			const client = await this.createSyncClient();
 
 			this.registerObsidianExtensions(client);
@@ -188,6 +196,10 @@ export default class VaultLinkPlugin extends Plugin {
 		this.register(() => {
 			editorStatusDisplayManager.dispose();
 		});
+
+		this.register(() => {
+			(globalThis as any).VAULT_LINK_RUNNING_INSTANCE = null;
+		});
 	}
 
 	private addRibbonIcons(): void {

From e635e84aa41c29dd1356c30457c014e67ddf0245 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 28 Nov 2025 21:27:49 +0000
Subject: [PATCH 676/761] Close unsued databases

---
 sync-server/src/app_state/database.rs | 93 ++++++++++++++++++++++++---
 1 file changed, 85 insertions(+), 8 deletions(-)

diff --git a/sync-server/src/app_state/database.rs b/sync-server/src/app_state/database.rs
index 346fea38..3ca3cb64 100644
--- a/sync-server/src/app_state/database.rs
+++ b/sync-server/src/app_state/database.rs
@@ -2,6 +2,7 @@ use core::time::Duration;
 use std::{collections::HashMap, sync::Arc};
 
 use anyhow::{Context as _, Result};
+use log::info;
 use models::{
     DocumentId, DocumentVersionWithoutContent, StoredDocumentVersion, VaultId, VaultUpdateId,
 };
@@ -10,6 +11,7 @@ use sqlx::{sqlite::SqliteConnectOptions, types::chrono::Utc};
 pub mod models;
 use sqlx::{Pool, Sqlite, sqlite::SqlitePoolOptions};
 use tokio::sync::Mutex;
+use tokio::time::Instant;
 use uuid::fmt::Hyphenated;
 
 use super::websocket::{
@@ -18,11 +20,26 @@ use super::websocket::{
 };
 use crate::config::database_config::DatabaseConfig;
 
+#[derive(Clone)]
+struct PoolWithTimestamp {
+    pool: Pool<Sqlite>,
+    last_accessed: Instant,
+}
+
+impl std::fmt::Debug for PoolWithTimestamp {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("PoolWithTimestamp")
+            .field("pool", &"Pool<Sqlite>")
+            .field("last_accessed", &self.last_accessed)
+            .finish()
+    }
+}
+
 #[derive(Clone, Debug)]
 pub struct Database {
     config: DatabaseConfig,
     broadcasts: Broadcasts,
-    connection_pools: Arc<Mutex<HashMap<VaultId, Pool<Sqlite>>>>,
+    connection_pools: Arc<Mutex<HashMap<VaultId, PoolWithTimestamp>>>,
 }
 
 pub type Transaction<'a> = sqlx::Transaction<'a, Sqlite>;
@@ -52,17 +69,26 @@ impl Database {
                 .trim_end_matches(".sqlite")
                 .to_owned();
 
+            let pool = Self::create_vault_database(config, &vault).await?;
             connection_pools.insert(
                 vault.clone(),
-                Self::create_vault_database(config, &vault).await?,
+                PoolWithTimestamp {
+                    pool,
+                    last_accessed: Instant::now(),
+                },
             );
         }
 
-        Ok(Self {
+        let database = Self {
             config: config.clone(),
             connection_pools: Arc::new(Mutex::new(connection_pools)),
             broadcasts: broadcasts.clone(),
-        })
+        };
+
+        // Start background task to cleanup idle connection pools
+        database.start_idle_pool_cleanup();
+
+        Ok(database)
     }
 
     async fn create_vault_database(
@@ -100,16 +126,26 @@ impl Database {
 
     async fn get_connection_pool(&self, vault: &VaultId) -> Result<Pool<Sqlite>> {
         let mut pools = self.connection_pools.lock().await;
+
         if !pools.contains_key(vault) {
             let pool = Self::create_vault_database(&self.config, vault).await?;
-            pools.insert(vault.clone(), pool);
+            pools.insert(
+                vault.clone(),
+                PoolWithTimestamp {
+                    pool,
+                    last_accessed: Instant::now(),
+                },
+            );
         }
 
-        let pool = pools
-            .get(vault)
+        let pool_with_timestamp = pools
+            .get_mut(vault)
             .expect("Pool was just inserted or already exists");
 
-        Ok(pool.clone())
+        // Update last accessed time
+        pool_with_timestamp.last_accessed = Instant::now();
+
+        Ok(pool_with_timestamp.pool.clone())
     }
 
     /// Attempting to write from this transaction might result in a
@@ -434,4 +470,45 @@ impl Database {
 
         Ok(())
     }
+
+    /// Cleanup idle connection pools that haven't been accessed in more than 5 minutes
+    async fn cleanup_idle_pools(&self) {
+        let mut pools = self.connection_pools.lock().await;
+        let now = Instant::now();
+        let idle_timeout = Duration::from_secs(5 * 60); // 5 minutes
+
+        // Collect vaults to remove
+        let vaults_to_remove: Vec<VaultId> = pools
+            .iter()
+            .filter(|(_, pool_with_timestamp)| {
+                now.duration_since(pool_with_timestamp.last_accessed) > idle_timeout
+            })
+            .map(|(vault_id, _)| vault_id.clone())
+            .collect();
+
+        // Close and remove idle pools
+        for vault_id in &vaults_to_remove {
+            if let Some(pool_with_timestamp) = pools.remove(vault_id) {
+                info!(
+                    "Closing idle database connection pool for vault {}",
+                    vault_id
+                );
+                pool_with_timestamp.pool.close().await;
+            }
+        }
+    }
+
+    /// Start a background task that periodically cleans up idle connection pools
+    fn start_idle_pool_cleanup(&self) {
+        let database = self.clone();
+        tokio::spawn(async move {
+            let mut interval = tokio::time::interval(Duration::from_secs(60)); // Check every minute
+            interval.set_missed_tick_behavior(tokio::time::MissedTickBehavior::Skip);
+
+            loop {
+                interval.tick().await;
+                database.cleanup_idle_pools().await;
+            }
+        });
+    }
 }

From 4456767ec43ad71af5f79747461ed7ac326bf830 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 29 Nov 2025 11:02:27 +0000
Subject: [PATCH 677/761] Clean up

---
 frontend/sync-client/src/file-operations/file-operations.ts | 3 +--
 sync-server/src/utils/find_first_available_path.rs          | 6 ++----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/frontend/sync-client/src/file-operations/file-operations.ts b/frontend/sync-client/src/file-operations/file-operations.ts
index 1cf434c2..42409227 100644
--- a/frontend/sync-client/src/file-operations/file-operations.ts
+++ b/frontend/sync-client/src/file-operations/file-operations.ts
@@ -251,8 +251,7 @@ export class FileOperations {
 				: "";
 		let stem = extension ? nameParts.slice(0, -1).join(".") : fileName;
 		let currentCount = Number.parseInt(
-			FileOperations.PARENTHESES_REGEX.exec(stem)?.groups?.["count"] ??
-				"0"
+			FileOperations.PARENTHESES_REGEX.exec(stem)?.groups?.count ?? "0"
 		);
 		stem = stem.replace(FileOperations.PARENTHESES_REGEX, "");
 
diff --git a/sync-server/src/utils/find_first_available_path.rs b/sync-server/src/utils/find_first_available_path.rs
index 002c0241..4b5e6b97 100644
--- a/sync-server/src/utils/find_first_available_path.rs
+++ b/sync-server/src/utils/find_first_available_path.rs
@@ -8,17 +8,15 @@ pub async fn find_first_available_path(
     database: &crate::app_state::database::Database,
     transaction: &mut Transaction<'_>,
 ) -> Result<String> {
-    let mut new_relative_path = String::default();
     for candidate in dedup_paths(sanitized_relative_path) {
         if database
             .get_latest_document_by_path(vault_id, &candidate, Some(transaction))
             .await?
             .is_none()
         {
-            new_relative_path = candidate;
-            break;
+            return Ok(candidate);
         }
     }
 
-    Ok(new_relative_path)
+    unreachable!("dedup_paths produces infinite paths");
 }

From 84f077f36bb6b58e8c1a76df3c17cac899ab415f Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 29 Nov 2025 14:22:05 +0000
Subject: [PATCH 678/761] Improve logging

---
 sync-server/src/app_state/database.rs         | 11 ++++-----
 .../src/app_state/websocket/broadcasts.rs     |  5 ++--
 sync-server/src/config.rs                     | 10 ++++----
 sync-server/src/config/logging_config.rs      |  2 +-
 sync-server/src/config/server_config.rs       |  4 ++--
 sync-server/src/config/user_config.rs         |  4 ++--
 sync-server/src/server/auth.rs                |  4 ++--
 sync-server/src/server/create_document.rs     | 11 ++++++++-
 sync-server/src/server/delete_document.rs     | 24 ++++++++++++++++---
 .../src/server/fetch_document_version.rs      |  5 ++++
 .../server/fetch_document_version_content.rs  |  5 ++++
 .../server/fetch_latest_document_version.rs   |  3 +++
 .../src/server/fetch_latest_documents.rs      |  3 +++
 sync-server/src/server/ping.rs                |  3 +++
 sync-server/src/server/update_document.rs     | 22 +++++++++++++----
 sync-server/src/server/websocket.rs           |  8 +++----
 16 files changed, 90 insertions(+), 34 deletions(-)

diff --git a/sync-server/src/app_state/database.rs b/sync-server/src/app_state/database.rs
index 3ca3cb64..d64bd560 100644
--- a/sync-server/src/app_state/database.rs
+++ b/sync-server/src/app_state/database.rs
@@ -50,7 +50,7 @@ impl Database {
             .await
             .with_context(|| {
                 format!(
-                    "Failed to create databases directory: {}",
+                    "Failed to create databases directory at `{}`",
                     config.databases_directory_path.to_string_lossy()
                 )
             })?;
@@ -110,7 +110,7 @@ impl Database {
             .test_before_acquire(true)
             .connect_with(connection_options)
             .await
-            .with_context(|| format!("Cannot open database at {}", file_name.display()))?;
+            .with_context(|| format!("Cannot open database at `{}`", file_name.display()))?;
 
         Self::run_migrations(&pool).await?;
 
@@ -254,7 +254,7 @@ impl Database {
                 .await
         }
         .with_context(|| {
-            format!("Cannot fetch latest documents since vault_update_id {vault_update_id}")
+            format!("Cannot fetch latest documents since vault_update_id `{vault_update_id}`")
         })
         .map(|rows| {
             rows.into_iter()
@@ -489,10 +489,7 @@ impl Database {
         // Close and remove idle pools
         for vault_id in &vaults_to_remove {
             if let Some(pool_with_timestamp) = pools.remove(vault_id) {
-                info!(
-                    "Closing idle database connection pool for vault {}",
-                    vault_id
-                );
+                info!("Closing idle database connection pool for vault `{vault_id}`");
                 pool_with_timestamp.pool.close().await;
             }
         }
diff --git a/sync-server/src/app_state/websocket/broadcasts.rs b/sync-server/src/app_state/websocket/broadcasts.rs
index cef6ee6a..b8200d91 100644
--- a/sync-server/src/app_state/websocket/broadcasts.rs
+++ b/sync-server/src/app_state/websocket/broadcasts.rs
@@ -1,6 +1,7 @@
 use std::{collections::HashMap, sync::Arc};
 
 use anyhow::Context;
+use log::warn;
 use tokio::sync::{Mutex, broadcast};
 
 use super::models::WebSocketServerMessageWithOrigin;
@@ -32,7 +33,7 @@ impl Broadcasts {
     }
 
     /// Notify all clients (who are subscribed to the vault) about an update.
-    /// We only log failures.
+    /// We only log failures and don't propagate them.
     pub async fn send_document_update(
         &self,
         vault: VaultId,
@@ -46,7 +47,7 @@ impl Broadcasts {
             .map_err(server_error);
 
         if result.is_err() {
-            log::debug!("Failed to send message: {result:?}");
+            warn!("Failed to send message: {result:?}");
         }
     }
 
diff --git a/sync-server/src/config.rs b/sync-server/src/config.rs
index 2e1a6e39..6a003d2e 100644
--- a/sync-server/src/config.rs
+++ b/sync-server/src/config.rs
@@ -30,7 +30,7 @@ impl Config {
     pub async fn read_or_create(path: &Path) -> Result<Self> {
         let config = if path.exists() {
             info!(
-                "Loading configuration from '{}'",
+                "Loading configuration from `{}`",
                 path.canonicalize().unwrap().display()
             );
             Self::load_from_file(path).await?
@@ -40,7 +40,7 @@ impl Config {
 
         config.write(path).await?;
         info!(
-            "Updated configuration at '{}'",
+            "Updated configuration at `{}`",
             path.canonicalize().unwrap().display()
         );
 
@@ -50,14 +50,12 @@ impl Config {
     pub async fn load_from_file(path: &Path) -> Result<Self> {
         let contents = fs::read_to_string(path).await.with_context(|| {
             format!(
-                "Cannot load configuration from disk from {}",
+                "Cannot load configuration from disk from `{}`",
                 path.display()
             )
         })?;
 
-        let config = serde_yaml::from_str(&contents).context("Failed to parse configuration")?;
-
-        Ok(config)
+        serde_yaml::from_str(&contents).context("Failed to parse configuration")
     }
 
     pub async fn write(&self, path: &Path) -> Result<()> {
diff --git a/sync-server/src/config/logging_config.rs b/sync-server/src/config/logging_config.rs
index 95ab9350..79d4fa1e 100644
--- a/sync-server/src/config/logging_config.rs
+++ b/sync-server/src/config/logging_config.rs
@@ -24,7 +24,7 @@ impl Default for LoggingConfig {
 }
 
 fn default_log_directory() -> String {
-    debug!("Using default log directory: {DEFAULT_LOG_DIRECTORY}");
+    debug!("Using default log directory: `{DEFAULT_LOG_DIRECTORY}`");
     DEFAULT_LOG_DIRECTORY.to_owned()
 }
 
diff --git a/sync-server/src/config/server_config.rs b/sync-server/src/config/server_config.rs
index 07dc61b3..fc6034ed 100644
--- a/sync-server/src/config/server_config.rs
+++ b/sync-server/src/config/server_config.rs
@@ -38,7 +38,7 @@ fn default_port() -> u16 {
 }
 
 fn default_max_body_size_mb() -> usize {
-    debug!("Using default max body size (MB): {DEFAULT_MAX_BODY_SIZE_MB}");
+    debug!("Using default max body size {DEFAULT_MAX_BODY_SIZE_MB} MB");
     DEFAULT_MAX_BODY_SIZE_MB
 }
 
@@ -48,7 +48,7 @@ fn default_max_clients_per_vault() -> usize {
 }
 
 fn default_response_timeout_seconds() -> u64 {
-    debug!("Using default response timeout (seconds): {DEFAULT_RESPONSE_TIMEOUT_SECONDS}");
+    debug!("Using default response timeout: {DEFAULT_RESPONSE_TIMEOUT_SECONDS} seconds");
     DEFAULT_RESPONSE_TIMEOUT_SECONDS
 }
 
diff --git a/sync-server/src/config/user_config.rs b/sync-server/src/config/user_config.rs
index ed7ecc23..cdfed838 100644
--- a/sync-server/src/config/user_config.rs
+++ b/sync-server/src/config/user_config.rs
@@ -20,7 +20,7 @@ where
     for user in &users {
         if let Some(existing_name) = user_token_map.get_by_right(&user.token) {
             return Err(D::Error::custom(format!(
-                "Duplicate user token found: '{}' for users '{}' and '{}'. User tokens must be \
+                "Duplicate user token found: `{}` for users `{}` and `{}`. User tokens must be \
                  unique.",
                 user.token, existing_name, user.name
             )));
@@ -28,7 +28,7 @@ where
 
         if user_token_map.contains_left(&user.name) {
             return Err(D::Error::custom(format!(
-                "Duplicate user name found: '{}'. User names must be unique.",
+                "Duplicate user name found: `{}`. User names must be unique.",
                 user.name
             )));
         }
diff --git a/sync-server/src/server/auth.rs b/sync-server/src/server/auth.rs
index d27c16e3..e56f4acc 100644
--- a/sync-server/src/server/auth.rs
+++ b/sync-server/src/server/auth.rs
@@ -52,14 +52,14 @@ pub fn auth(state: &AppState, token: &str, vault_id: &VaultId) -> Result<User, S
         VaultAccess::AllowList(AllowListedVaults { ref allowed }) => allowed.contains(vault_id),
     } {
         info!(
-            "User '{}' is authenticated and is authorised to access to vault '{vault_id}'",
+            "User `{}` is authenticated and is authorised to access to vault `{vault_id}`",
             user.name
         );
 
         Ok(user)
     } else {
         info!(
-            "User '{}' is authenticated but is not authorised to access vault '{vault_id}'",
+            "User `{}` is authenticated but is not authorised to access vault `{vault_id}`",
             user.name
         );
 
diff --git a/sync-server/src/server/create_document.rs b/sync-server/src/server/create_document.rs
index a8d80f39..859c0db4 100644
--- a/sync-server/src/server/create_document.rs
+++ b/sync-server/src/server/create_document.rs
@@ -4,6 +4,7 @@ use axum::{
 };
 use axum_extra::TypedHeader;
 use axum_typed_multipart::TypedMultipart;
+use log::{debug, info};
 use serde::Deserialize;
 
 use super::{device_id_header::DeviceIdHeader, requests::CreateDocumentVersion};
@@ -37,6 +38,8 @@ pub async fn create_document(
     State(state): State<AppState>,
     TypedMultipart(request): TypedMultipart<CreateDocumentVersion>,
 ) -> Result<Json<DocumentVersionWithoutContent>, SyncServerError> {
+    debug!("Creating document in vault `{vault_id}`");
+
     let mut transaction = state
         .database
         .create_write_transaction(&vault_id)
@@ -53,7 +56,7 @@ pub async fn create_document(
 
             if existing_version.is_some() {
                 return Err(client_error(anyhow::anyhow!(
-                    "Document with the same ID already exists"
+                    "Document with the same ID `{document_id}` already exists"
                 )));
             }
 
@@ -78,6 +81,12 @@ pub async fn create_document(
     .await
     .map_err(server_error)?;
 
+    if deduped_path != sanitized_relative_path {
+        info!(
+            "Document already exists at new location: `{sanitized_relative_path}` when trying to create it in vault `{vault_id}`, deconflicting by creating at `{deduped_path}`"
+        );
+    }
+
     let new_version = StoredDocumentVersion {
         vault_update_id: last_update_id + 1,
         document_id,
diff --git a/sync-server/src/server/delete_document.rs b/sync-server/src/server/delete_document.rs
index f7080417..e126d6b5 100644
--- a/sync-server/src/server/delete_document.rs
+++ b/sync-server/src/server/delete_document.rs
@@ -1,8 +1,10 @@
+use anyhow::Context;
 use axum::{
     Extension, Json,
     extract::{Path, State},
 };
 use axum_extra::TypedHeader;
+use log::{debug, info};
 use serde::Deserialize;
 
 use super::{device_id_header::DeviceIdHeader, requests::DeleteDocumentVersion};
@@ -37,6 +39,8 @@ pub async fn delete_document(
     State(state): State<AppState>,
     Json(request): Json<DeleteDocumentVersion>,
 ) -> Result<Json<DocumentVersionWithoutContent>, SyncServerError> {
+    debug!("Deleting document `{document_id}` in vault `{vault_id}`");
+
     let mut transaction = state
         .database
         .create_write_transaction(&vault_id)
@@ -49,12 +53,26 @@ pub async fn delete_document(
         .await
         .map_err(server_error)?;
 
-    let latest_content = state
+    let latest_version = state
         .database
         .get_latest_document(&vault_id, &document_id, Some(&mut transaction))
         .await
-        .map_err(server_error)?
-        .map_or_else(Vec::new, |version| version.content); // in case the document has never existed before deleting it
+        .map_err(server_error)?;
+
+    if let Some(latest_version) = &latest_version
+        && latest_version.is_deleted
+    {
+        transaction
+            .rollback()
+            .await
+            .context("Failed to roll back transaction")
+            .map_err(server_error)?;
+
+        info!("Document `{document_id}` has already been deleted",);
+        return Ok(Json(latest_version.clone().into()));
+    }
+
+    let latest_content = latest_version.map_or_else(Vec::new, |version| version.content); // in case the document has never existed before deleting it
 
     let new_version = StoredDocumentVersion {
         vault_update_id: last_update_id + 1,
diff --git a/sync-server/src/server/fetch_document_version.rs b/sync-server/src/server/fetch_document_version.rs
index 5b571a7b..67e72ca4 100644
--- a/sync-server/src/server/fetch_document_version.rs
+++ b/sync-server/src/server/fetch_document_version.rs
@@ -3,6 +3,7 @@ use axum::{
     Json,
     extract::{Path, State},
 };
+use log::debug;
 use serde::Deserialize;
 
 use crate::{
@@ -32,6 +33,10 @@ pub async fn fetch_document_version(
     }): Path<FetchDocumentVersionPathParams>,
     State(state): State<AppState>,
 ) -> Result<Json<DocumentVersion>, SyncServerError> {
+    debug!(
+        "Fetching document version `{vault_update_id}` for document `{document_id}` in vault `{vault_id}`"
+    );
+
     let result = state
         .database
         .get_document_version(&vault_id, vault_update_id, None)
diff --git a/sync-server/src/server/fetch_document_version_content.rs b/sync-server/src/server/fetch_document_version_content.rs
index a419b7bf..a74e88ec 100644
--- a/sync-server/src/server/fetch_document_version_content.rs
+++ b/sync-server/src/server/fetch_document_version_content.rs
@@ -3,6 +3,7 @@ use axum::{
     body::Bytes,
     extract::{Path, State},
 };
+use log::debug;
 use serde::Deserialize;
 
 use crate::{
@@ -32,6 +33,10 @@ pub async fn fetch_document_version_content(
     }): Path<FetchDocumentVersionContentPathParams>,
     State(state): State<AppState>,
 ) -> Result<Bytes, SyncServerError> {
+    debug!(
+        "Fetching document version `{vault_update_id}` for document `{document_id}` in vault `{vault_id}`"
+    );
+
     let result = state
         .database
         .get_document_version(&vault_id, vault_update_id, None)
diff --git a/sync-server/src/server/fetch_latest_document_version.rs b/sync-server/src/server/fetch_latest_document_version.rs
index 07f07860..a9973606 100644
--- a/sync-server/src/server/fetch_latest_document_version.rs
+++ b/sync-server/src/server/fetch_latest_document_version.rs
@@ -3,6 +3,7 @@ use axum::{
     Json,
     extract::{Path, State},
 };
+use log::debug;
 use serde::Deserialize;
 
 use crate::{
@@ -30,6 +31,8 @@ pub async fn fetch_latest_document_version(
     }): Path<FetchLatestDocumentVersionPathParams>,
     State(state): State<AppState>,
 ) -> Result<Json<DocumentVersion>, SyncServerError> {
+    debug!("Fetching latest document version for document `{document_id}` in vault `{vault_id}`");
+
     let latest_version = state
         .database
         .get_latest_document(&vault_id, &document_id, None)
diff --git a/sync-server/src/server/fetch_latest_documents.rs b/sync-server/src/server/fetch_latest_documents.rs
index 6101f55c..209374ce 100644
--- a/sync-server/src/server/fetch_latest_documents.rs
+++ b/sync-server/src/server/fetch_latest_documents.rs
@@ -2,6 +2,7 @@ use axum::{
     Json,
     extract::{Path, Query, State},
 };
+use log::debug;
 use serde::Deserialize;
 
 use super::responses::FetchLatestDocumentsResponse;
@@ -31,6 +32,8 @@ pub async fn fetch_latest_documents(
     Query(QueryParams { since_update_id }): Query<QueryParams>,
     State(state): State<AppState>,
 ) -> Result<Json<FetchLatestDocumentsResponse>, SyncServerError> {
+    debug!("Fetching latest documents in vault `{vault_id}` since update ID `{since_update_id:?}`");
+
     let documents = if let Some(since_update_id) = since_update_id {
         state
             .database
diff --git a/sync-server/src/server/ping.rs b/sync-server/src/server/ping.rs
index 82eefff7..31aa8acd 100644
--- a/sync-server/src/server/ping.rs
+++ b/sync-server/src/server/ping.rs
@@ -6,6 +6,7 @@ use axum_extra::{
     TypedHeader,
     headers::{Authorization, authorization::Bearer},
 };
+use log::debug;
 use serde::Deserialize;
 
 use super::{auth::auth, responses::PingResponse};
@@ -28,6 +29,8 @@ pub async fn ping(
     Path(PingPathParams { vault_id }): Path<PingPathParams>,
     State(state): State<AppState>,
 ) -> Result<Json<PingResponse>, SyncServerError> {
+    debug!("Pinging vault `{vault_id}`");
+
     let is_authenticated = maybe_auth_header
         .is_some_and(|auth_header| auth(&state, auth_header.token(), &vault_id).is_ok());
 
diff --git a/sync-server/src/server/update_document.rs b/sync-server/src/server/update_document.rs
index b8a17c11..9da37832 100644
--- a/sync-server/src/server/update_document.rs
+++ b/sync-server/src/server/update_document.rs
@@ -5,7 +5,7 @@ use axum::{
 };
 use axum_extra::TypedHeader;
 use axum_typed_multipart::TypedMultipart;
-use log::info;
+use log::{debug, info};
 use reconcile_text::{BuiltinTokenizer, EditedText, reconcile};
 use serde::Deserialize;
 
@@ -129,6 +129,8 @@ async fn update_document(
     relative_path: &str,
     content: Vec<u8>,
 ) -> Result<Json<DocumentUpdateResponse>, SyncServerError> {
+    debug!("Updating document `{document_id}` in vault `{vault_id}`");
+
     let sanitized_relative_path = sanitize_path(relative_path);
 
     let mut transaction = state
@@ -164,6 +166,7 @@ async fn update_document(
             .context("Failed to roll back transaction")
             .map_err(server_error)?;
 
+        info!("Document `{document_id}` has been deleted, ignoring update to it",);
         return Ok(Json(DocumentUpdateResponse::FastForwardUpdate(
             latest_version.into(),
         )));
@@ -173,7 +176,9 @@ async fn update_document(
     // version
     if content == latest_version.content && sanitized_relative_path == latest_version.relative_path
     {
-        info!("Document content is the same as the latest version, skipping update");
+        info!(
+            "Document content is the same as the latest version for `{document_id}`, skipping update"
+        );
         transaction
             .rollback()
             .await
@@ -193,6 +198,7 @@ async fn update_document(
         && !is_binary(&content);
 
     let merged_content = if are_all_participants_mergable {
+        info!("Merging changes for document `{document_id}` in vault `{vault_id}`");
         reconcile(
             str::from_utf8(&parent_document.content)
                 .expect("parent must be valid UTF-8 because it's not binary"),
@@ -217,14 +223,22 @@ async fn update_document(
     let new_relative_path = if parent_document.relative_path == latest_version.relative_path
         && latest_version.relative_path != sanitized_relative_path
     {
-        find_first_available_path(
+        let new_path = find_first_available_path(
             &vault_id,
             &sanitized_relative_path,
             &state.database,
             &mut transaction,
         )
         .await
-        .map_err(server_error)?
+        .map_err(server_error)?;
+
+        if new_path != sanitized_relative_path {
+            info!(
+                "Document already exists at new location: `{sanitized_relative_path}` when trying to update it in vault `{vault_id}`, deconflicting by creating at `{new_path}`"
+            );
+        }
+
+        new_path
     } else {
         latest_version.relative_path.clone()
     };
diff --git a/sync-server/src/server/websocket.rs b/sync-server/src/server/websocket.rs
index 5e94b277..bb10b49f 100644
--- a/sync-server/src/server/websocket.rs
+++ b/sync-server/src/server/websocket.rs
@@ -43,12 +43,12 @@ pub async fn websocket_handler(
 }
 
 async fn websocket_wrapped(state: AppState, stream: WebSocket, vault_id: VaultId) {
-    info!("WebSocket connection opened on vault '{vault_id}'");
+    info!("WebSocket connection opened on vault `{vault_id}`");
 
     let result = websocket(state, stream, vault_id.clone()).await;
 
     if let Err(err) = result {
-        debug!("WebSocket connection error on vault '{vault_id}': {err}");
+        debug!("WebSocket connection error on vault `{vault_id}`: {err}");
     }
 }
 
@@ -71,7 +71,7 @@ async fn websocket(
     )?;
 
     info!(
-        "WebSocket handshake successful for vault '{vault_id}' for '{}'",
+        "WebSocket handshake successful for vault `{vault_id}` for `{}`",
         authed_handshake.handshake.device_id
     );
 
@@ -184,7 +184,7 @@ async fn websocket(
 
     if result.is_err() {
         info!(
-            "WebSocket disconnected on vault '{vault_id}' for '{}'",
+            "WebSocket disconnected on vault `{vault_id}` for `{}`",
             authed_handshake.handshake.device_id
         );
     }

From 5417c1ddd05246ee0d73917caf58601a26ba26e9 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 29 Nov 2025 14:24:15 +0000
Subject: [PATCH 679/761] Small clean up

---
 frontend/sync-client/src/persistence/database.ts     |  3 +++
 .../sync-client/src/services/websocket-manager.ts    |  5 +----
 .../src/sync-operations/unrestricted-syncer.ts       | 12 +++++++-----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/frontend/sync-client/src/persistence/database.ts b/frontend/sync-client/src/persistence/database.ts
index 658596ef..d42651ae 100644
--- a/frontend/sync-client/src/persistence/database.ts
+++ b/frontend/sync-client/src/persistence/database.ts
@@ -198,6 +198,9 @@ export class Database {
 		relativePath: RelativePath,
 		promise: Promise<unknown>
 	): DocumentRecord {
+		this.logger.debug(
+			`Creating new pending document: ${relativePath} (${documentId})`
+		);
 		const previousEntry =
 			this.getLatestDocumentByRelativePath(relativePath);
 
diff --git a/frontend/sync-client/src/services/websocket-manager.ts b/frontend/sync-client/src/services/websocket-manager.ts
index 08442290..015a778e 100644
--- a/frontend/sync-client/src/services/websocket-manager.ts
+++ b/frontend/sync-client/src/services/websocket-manager.ts
@@ -282,13 +282,10 @@ export class WebSocketManager {
 			this.logger.debug(
 				`Received cursor positions for ${JSON.stringify(message.clients)}`
 			);
-			const filteredClients = message.clients.filter(
-				(client) => client.deviceId !== this.deviceId
-			);
 
 			await awaitAll(
 				this.remoteCursorsUpdateListeners.map(async (listener) => {
-					await listener(filteredClients).catch((error: unknown) => {
+					await listener(message.clients).catch((error: unknown) => {
 						this.logger.error(
 							`Error in cursor positions listener: ${String(error)}`
 						);
diff --git a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
index 4e4243cc..cf94c48a 100644
--- a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
+++ b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
@@ -69,19 +69,18 @@ export class UnrestrictedSyncer {
 		};
 
 		return this.executeSync(updateDetails, async () => {
+			const originalRelativePath = document.relativePath;
 			if (document.isDeleted) {
 				this.logger.debug(
-					`Document ${document.relativePath} has been already deleted, no need to create it`
+					`Document ${originalRelativePath} has been already deleted, no need to create it`
 				);
 				return;
 			}
 
-			const contentBytes = await this.operations.read(
-				document.relativePath
-			); // this can throw FileNotFoundError
+			const contentBytes =
+				await this.operations.read(originalRelativePath); // this can throw FileNotFoundError
 			const contentHash = hash(contentBytes);
 
-			const originalRelativePath = document.relativePath;
 			const response = await this.syncService.create({
 				documentId: document.documentId,
 				relativePath: originalRelativePath,
@@ -99,6 +98,9 @@ export class UnrestrictedSyncer {
 
 			// In case a document with the same name (but different ID) had existed remotely that we haven't known about
 			if (response.relativePath != originalRelativePath) {
+				this.logger.debug(
+					`Document ${originalRelativePath} has been created remotely at a different path: ${response.relativePath}, moving it locally`
+				);
 				await this.operations.move(
 					document.relativePath,
 					response.relativePath

From 5905aa37b951869677395350d2dbc2d4ce607c50 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 29 Nov 2025 14:24:53 +0000
Subject: [PATCH 680/761] Add copy to clipboard button

---
 .../src/views/logs/logs-view.scss             | 18 ++++++++-
 .../src/views/logs/logs-view.ts               | 39 ++++++++++++++++++-
 2 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/frontend/obsidian-plugin/src/views/logs/logs-view.scss b/frontend/obsidian-plugin/src/views/logs/logs-view.scss
index 82ed1037..2bffe693 100644
--- a/frontend/obsidian-plugin/src/views/logs/logs-view.scss
+++ b/frontend/obsidian-plugin/src/views/logs/logs-view.scss
@@ -14,8 +14,22 @@
 			margin: 0;
 		}
 
-		select {
-			cursor: pointer;
+		.logs-controls {
+			display: flex;
+			align-items: center;
+			gap: var(--size-4-2);
+
+			button {
+				display: flex;
+				align-items: center;
+				gap: var(--size-2-1);
+				padding: var(--size-2-2) var(--size-4-2);
+				cursor: pointer;
+			}
+
+			select {
+				cursor: pointer;
+			}
 		}
 	}
 
diff --git a/frontend/obsidian-plugin/src/views/logs/logs-view.ts b/frontend/obsidian-plugin/src/views/logs/logs-view.ts
index 19cf4701..68d597e4 100644
--- a/frontend/obsidian-plugin/src/views/logs/logs-view.ts
+++ b/frontend/obsidian-plugin/src/views/logs/logs-view.ts
@@ -1,7 +1,7 @@
 import "./logs-view.scss";
 
 import type { WorkspaceLeaf } from "obsidian";
-import { ItemView } from "obsidian";
+import { ItemView, Notice, setIcon } from "obsidian";
 import type { LogLine } from "sync-client";
 import { LogLevel, type SyncClient } from "sync-client";
 
@@ -78,7 +78,16 @@ export class LogsView extends ItemView {
 					text: "VaultLink logs"
 				});
 
-				verbositySection.createEl("select", {}, (dropdown) => {
+				const controls = verbositySection.createDiv({ cls: "logs-controls" });
+
+				const copyButton = controls.createEl("button", {
+					text: "Copy logs",
+					cls: "clickable-icon"
+				});
+				setIcon(copyButton, "clipboard-copy");
+				copyButton.addEventListener("click", () => this.copyLogsToClipboard());
+
+				controls.createEl("select", {}, (dropdown) => {
 					logLevels.forEach(({ label, value }) =>
 						dropdown.createEl("option", { text: label, value })
 					);
@@ -102,6 +111,32 @@ export class LogsView extends ItemView {
 		this.updateView();
 	}
 
+	private copyLogsToClipboard(): void {
+		const logs = this.client.logger.getMessages(this.minLogLevel);
+
+		if (logs.length === 0) {
+			new Notice("No logs to copy");
+			return;
+		}
+
+		const formattedLogs = logs
+			.map((logLine) => {
+				const timestamp = logLine.timestamp.toLocaleString();
+				const level = logLine.level.toUpperCase();
+				return `[${timestamp}] ${level}: ${logLine.message}`;
+			})
+			.join("\n");
+
+		navigator.clipboard.writeText(formattedLogs)
+			.then(() => {
+				new Notice(`Copied ${logs.length} log entries to clipboard`);
+			})
+			.catch((error: unknown) => {
+				this.client.logger.error(`Failed to copy logs to clipboard: ${error}`);
+				new Notice("Failed to copy logs to clipboard");
+			});
+	}
+
 	private updateView(): void {
 		const container = this.logsContainer;
 		if (container === undefined) {

From b595a060a7d5c841849dd2dfee8efb50a2cae7e5 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 29 Nov 2025 14:48:42 +0000
Subject: [PATCH 681/761] Await settings event handlers

---
 .../sync-client/src/persistence/settings.ts    | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/frontend/sync-client/src/persistence/settings.ts b/frontend/sync-client/src/persistence/settings.ts
index 6ce4eeb5..b414fcd9 100644
--- a/frontend/sync-client/src/persistence/settings.ts
+++ b/frontend/sync-client/src/persistence/settings.ts
@@ -1,4 +1,5 @@
 import type { Logger } from "../tracing/logger";
+import { awaitAll } from "../utils/await-all";
 
 export interface SyncSettings {
 	remoteUri: string;
@@ -36,7 +37,7 @@ export class Settings {
 	private readonly onSettingsChangeHandlers: ((
 		newSettings: SyncSettings,
 		oldSettings: SyncSettings
-	) => unknown)[] = [];
+	) => Promise<unknown> | unknown)[] = [];
 
 	public constructor(
 		private readonly logger: Logger,
@@ -76,22 +77,29 @@ export class Settings {
 		key: T,
 		value: SyncSettings[T]
 	): Promise<void> {
-		this.logger.debug(`Setting '${key}' to '${value}'`);
 		await this.setSettings({
 			[key]: value
 		});
 	}
 
 	public async setSettings(value: Partial<SyncSettings>): Promise<void> {
+		this.logger.debug(`Updating settings with: ${JSON.stringify(value)}`);
 		const oldSettings = this.settings;
 		this.settings = {
 			...this.settings,
 			...value
 		};
 
-		this.onSettingsChangeHandlers.forEach((handler) => {
-			handler(this.settings, oldSettings);
-		});
+		await awaitAll(
+			this.onSettingsChangeHandlers
+				.map((handler) => {
+					return handler(this.settings, oldSettings);
+				})
+				.filter((result): result is Promise<unknown> => {
+					return result instanceof Promise;
+				})
+		);
+
 		await this.save();
 	}
 

From 2ce5faea92f3b6a8fd7461c7556c3204be3ea391 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 29 Nov 2025 17:18:38 +0000
Subject: [PATCH 682/761] Ignore ds store

---
 frontend/obsidian-plugin/src/vault-link-plugin.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/obsidian-plugin/src/vault-link-plugin.ts b/frontend/obsidian-plugin/src/vault-link-plugin.ts
index ad93ba69..783e732b 100644
--- a/frontend/obsidian-plugin/src/vault-link-plugin.ts
+++ b/frontend/obsidian-plugin/src/vault-link-plugin.ts
@@ -117,7 +117,8 @@ export default class VaultLinkPlugin extends Plugin {
 		DEFAULT_SETTINGS.ignorePatterns.push(
 			".obsidian/**",
 			".git/**",
-			".trash/**"
+			".trash/**",
+			"**/.DS_Store"
 		);
 
 		const client = await SyncClient.create({

From 952e89343ae5b8ec2fff3cce6274f7f16e568cac Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 29 Nov 2025 17:26:09 +0000
Subject: [PATCH 683/761] Don't broadcast without clients

---
 sync-server/src/app_state/websocket/broadcasts.rs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/sync-server/src/app_state/websocket/broadcasts.rs b/sync-server/src/app_state/websocket/broadcasts.rs
index b8200d91..60ae0219 100644
--- a/sync-server/src/app_state/websocket/broadcasts.rs
+++ b/sync-server/src/app_state/websocket/broadcasts.rs
@@ -1,7 +1,7 @@
 use std::{collections::HashMap, sync::Arc};
 
 use anyhow::Context;
-use log::warn;
+use log::{debug, warn};
 use tokio::sync::{Mutex, broadcast};
 
 use super::models::WebSocketServerMessageWithOrigin;
@@ -39,7 +39,12 @@ impl Broadcasts {
         vault: VaultId,
         document: WebSocketServerMessageWithOrigin,
     ) {
-        let tx = self.get_or_create(vault).await;
+        let tx = self.get_or_create(vault.clone()).await;
+
+        if tx.receiver_count() == 0 {
+            debug!("Skipping broadcast, no clients connected for vault `{vault}`");
+            return;
+        }
 
         let result = tx
             .send(document)

From 10bde4bc3a86b5f9c64cf6d7b3e30f78b2400e6e Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 29 Nov 2025 17:28:03 +0000
Subject: [PATCH 684/761] Fix race condition of client-side path deconflicting

---
 .../src/file-operations/file-operations.ts    | 40 +++++++++++++++----
 .../safe-filesystem-operations.ts             | 39 ++++++++++++++----
 .../sync-operations/unrestricted-syncer.ts    | 18 ++++-----
 .../src/utils/data-structures/locks.ts        |  8 ++--
 4 files changed, 77 insertions(+), 28 deletions(-)

diff --git a/frontend/sync-client/src/file-operations/file-operations.ts b/frontend/sync-client/src/file-operations/file-operations.ts
index 42409227..8f39ff69 100644
--- a/frontend/sync-client/src/file-operations/file-operations.ts
+++ b/frontend/sync-client/src/file-operations/file-operations.ts
@@ -61,12 +61,16 @@ export class FileOperations {
 	public async ensureClearPath(path: RelativePath): Promise<void> {
 		if (await this.fs.exists(path)) {
 			const deconflictedPath = await this.deconflictPath(path);
-			this.logger.debug(
-				`Didn't expect ${path} to exist, deconflicting by moving it to '${deconflictedPath}'`
-			);
+			try {
+				this.logger.debug(
+					`Didn't expect ${path} to exist, deconflicting by moving it to '${deconflictedPath}'`
+				);
 
-			this.database.move(path, deconflictedPath);
-			await this.fs.rename(path, deconflictedPath);
+				this.database.move(path, deconflictedPath);
+				await this.fs.rename(path, deconflictedPath, true);
+			} finally {
+				this.fs.unlock(deconflictedPath);
+			}
 		} else {
 			await this.createParentDirectories(path);
 		}
@@ -234,6 +238,13 @@ export class FileOperations {
 		}
 	}
 
+	/**
+	 * Deconflicts the given path by appending (1), (2), etc. before the file extension until a non-existent path is found.
+	 * The returned path has a lock acquired on it; it must be released by the caller when no longer needed.
+	 *
+	 * @param path The starting path to deconflict
+	 * @returns a non-existent path with a lock acquired on it
+	 */
 	private async deconflictPath(path: RelativePath): Promise<RelativePath> {
 		// eslint-disable-next-line prefer-const
 		let [directory, fileName] = FileOperations.getParentDirAndFile(path);
@@ -256,11 +267,24 @@ export class FileOperations {
 		stem = stem.replace(FileOperations.PARENTHESES_REGEX, "");
 
 		let newName = path;
-		do {
+
+		while (true) {
 			currentCount++;
 			newName = `${directory}${stem} (${currentCount})${extension}`;
-		} while (await this.fs.exists(newName));
 
-		return newName;
+			// Avoid multiple deconflictPath calls returning the same path
+			if (this.fs.tryLock(newName)) {
+				const newDocument =
+					this.database.getLatestDocumentByRelativePath(newName);
+				if (
+					newDocument?.isDeleted === false || // the document might have been confirmed by the server at a new path but haven't yet moved there locally
+					(await this.fs.exists(newName, true))
+				) {
+					this.fs.unlock(newName);
+				} else {
+					return newName;
+				}
+			}
+		}
 	}
 }
diff --git a/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts b/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
index 72aa158d..add07b74 100644
--- a/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
+++ b/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
@@ -73,9 +73,16 @@ export class SafeFileSystemOperations implements FileSystemOperations {
 		);
 	}
 
-	public async exists(path: RelativePath): Promise<boolean> {
+	public async exists(
+		path: RelativePath,
+		skipLock: boolean = false
+	): Promise<boolean> {
 		this.logger.debug(`Checking if file '${path}' exists`);
-		return this.locks.withLock(path, async () => this.fs.exists(path));
+		if (skipLock) {
+			return this.fs.exists(path);
+		} else {
+			return this.locks.withLock(path, async () => this.fs.exists(path));
+		}
 	}
 
 	public async createDirectory(path: RelativePath): Promise<void> {
@@ -92,19 +99,37 @@ export class SafeFileSystemOperations implements FileSystemOperations {
 
 	public async rename(
 		oldPath: RelativePath,
-		newPath: RelativePath
+		newPath: RelativePath,
+		skipLock: boolean = false
 	): Promise<void> {
 		this.logger.debug(`Renaming file '${oldPath}' to '${newPath}'`);
 		return this.safeOperation(
 			oldPath,
-			async () =>
-				this.locks.withLock([oldPath, newPath], async () =>
-					this.fs.rename(oldPath, newPath)
-				),
+			async () => {
+				if (skipLock) {
+					return this.fs.rename(oldPath, newPath);
+				} else {
+					return this.locks.withLock([oldPath, newPath], async () =>
+						this.fs.rename(oldPath, newPath)
+					);
+				}
+			},
 			"rename"
 		);
 	}
 
+	public tryLock(path: RelativePath): boolean {
+		return this.locks.tryLock(path);
+	}
+
+	public waitForLock(path: RelativePath) {
+		return this.locks.waitForLock(path);
+	}
+
+	public unlock(path: RelativePath) {
+		this.locks.unlock(path);
+	}
+
 	public reset(): void {
 		this.locks.reset();
 	}
diff --git a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
index cf94c48a..ebbb076f 100644
--- a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
+++ b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
@@ -87,15 +87,6 @@ export class UnrestrictedSyncer {
 				contentBytes
 			});
 
-			this.database.updateDocumentMetadata(
-				{
-					parentVersionId: response.vaultUpdateId,
-					hash: contentHash,
-					remoteRelativePath: response.relativePath
-				},
-				document
-			);
-
 			// In case a document with the same name (but different ID) had existed remotely that we haven't known about
 			if (response.relativePath != originalRelativePath) {
 				this.logger.debug(
@@ -107,6 +98,15 @@ export class UnrestrictedSyncer {
 				); // this can throw FileNotFoundError
 			}
 
+			this.database.updateDocumentMetadata(
+				{
+					parentVersionId: response.vaultUpdateId,
+					hash: contentHash,
+					remoteRelativePath: response.relativePath
+				},
+				document
+			);
+
 			this.database.addSeenUpdateId(response.vaultUpdateId);
 			this.updateCache(
 				response.vaultUpdateId,
diff --git a/frontend/sync-client/src/utils/data-structures/locks.ts b/frontend/sync-client/src/utils/data-structures/locks.ts
index c2e7d73a..fccccf8c 100644
--- a/frontend/sync-client/src/utils/data-structures/locks.ts
+++ b/frontend/sync-client/src/utils/data-structures/locks.ts
@@ -78,7 +78,7 @@ export class Locks<T> {
 	 * @param key The key to lock
 	 * @returns `true` if lock acquired, `false` if already locked
 	 */
-	private tryLock(key: T): boolean {
+	public tryLock(key: T): boolean {
 		if (this.locked.has(key)) {
 			return false;
 		}
@@ -95,7 +95,7 @@ export class Locks<T> {
 	 * @param key The key to wait for and lock
 	 * @returns Promise that resolves when lock is acquired
 	 */
-	private async waitForLock(key: T): Promise<void> {
+	public async waitForLock(key: T): Promise<void> {
 		if (this.tryLock(key)) {
 			return Promise.resolve();
 		}
@@ -121,9 +121,9 @@ export class Locks<T> {
 	 * @param key The key to unlock
 	 * @throws {Error} If key is not currently locked
 	 */
-	private unlock(key: T): void {
+	public unlock(key: T): void {
 		if (!this.locked.has(key)) {
-			throw new Error(`Key '${key}' is not locked, cannot unlock`);
+			return;
 		}
 
 		// Remove first waiter to ensure FIFO order

From d07fa32ba3e8e467707ba3ef5b3700ec37935e23 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 30 Nov 2025 11:23:12 +0000
Subject: [PATCH 685/761] Format

---
 frontend/obsidian-plugin/src/views/logs/logs-view.ts      | 2 +-
 .../src/file-operations/safe-filesystem-operations.ts     | 8 ++++----
 frontend/sync-client/src/sync-operations/syncer.ts        | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/frontend/obsidian-plugin/src/views/logs/logs-view.ts b/frontend/obsidian-plugin/src/views/logs/logs-view.ts
index 68d597e4..f624d848 100644
--- a/frontend/obsidian-plugin/src/views/logs/logs-view.ts
+++ b/frontend/obsidian-plugin/src/views/logs/logs-view.ts
@@ -85,7 +85,7 @@ export class LogsView extends ItemView {
 					cls: "clickable-icon"
 				});
 				setIcon(copyButton, "clipboard-copy");
-				copyButton.addEventListener("click", () => this.copyLogsToClipboard());
+				copyButton.addEventListener("click", () => { this.copyLogsToClipboard(); });
 
 				controls.createEl("select", {}, (dropdown) => {
 					logLevels.forEach(({ label, value }) =>
diff --git a/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts b/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
index add07b74..33984be4 100644
--- a/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
+++ b/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
@@ -75,7 +75,7 @@ export class SafeFileSystemOperations implements FileSystemOperations {
 
 	public async exists(
 		path: RelativePath,
-		skipLock: boolean = false
+		skipLock = false
 	): Promise<boolean> {
 		this.logger.debug(`Checking if file '${path}' exists`);
 		if (skipLock) {
@@ -100,7 +100,7 @@ export class SafeFileSystemOperations implements FileSystemOperations {
 	public async rename(
 		oldPath: RelativePath,
 		newPath: RelativePath,
-		skipLock: boolean = false
+		skipLock = false
 	): Promise<void> {
 		this.logger.debug(`Renaming file '${oldPath}' to '${newPath}'`);
 		return this.safeOperation(
@@ -122,11 +122,11 @@ export class SafeFileSystemOperations implements FileSystemOperations {
 		return this.locks.tryLock(path);
 	}
 
-	public waitForLock(path: RelativePath) {
+	public async waitForLock(path: RelativePath): Promise<void> {
 		return this.locks.waitForLock(path);
 	}
 
-	public unlock(path: RelativePath) {
+	public unlock(path: RelativePath): void {
 		this.locks.unlock(path);
 	}
 
diff --git a/frontend/sync-client/src/sync-operations/syncer.ts b/frontend/sync-client/src/sync-operations/syncer.ts
index 897bdf57..7a5fcb14 100644
--- a/frontend/sync-client/src/sync-operations/syncer.ts
+++ b/frontend/sync-client/src/sync-operations/syncer.ts
@@ -270,7 +270,7 @@ export class Syncer {
 
 	public async waitUntilFinished(): Promise<void> {
 		await this.runningScheduleSyncForOfflineChanges;
-		return this.syncQueue.onEmpty();
+		await this.syncQueue.onEmpty();
 	}
 
 	public async syncRemotelyUpdatedFile(

From 89565e23f358e2a1d78820945d9590f20ac11fec Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 30 Nov 2025 11:23:37 +0000
Subject: [PATCH 686/761] Log deduping

---
 sync-server/src/utils/find_first_available_path.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sync-server/src/utils/find_first_available_path.rs b/sync-server/src/utils/find_first_available_path.rs
index 4b5e6b97..7629d8f1 100644
--- a/sync-server/src/utils/find_first_available_path.rs
+++ b/sync-server/src/utils/find_first_available_path.rs
@@ -1,6 +1,7 @@
 use crate::app_state::database::models::VaultId;
 use crate::{app_state::database::Transaction, utils::dedup_paths::dedup_paths};
 use anyhow::Result;
+use log::{debug, info};
 
 pub async fn find_first_available_path(
     vault_id: &VaultId,
@@ -8,12 +9,15 @@ pub async fn find_first_available_path(
     database: &crate::app_state::database::Database,
     transaction: &mut Transaction<'_>,
 ) -> Result<String> {
+    info!("Finding first available path for `{sanitized_relative_path}` in vault `{vault_id}`");
     for candidate in dedup_paths(sanitized_relative_path) {
+        debug!("Checking candidate path for deconflicting names: `{candidate}`");
         if database
             .get_latest_document_by_path(vault_id, &candidate, Some(transaction))
             .await?
             .is_none()
         {
+            info!("Selected available path: `{candidate}`");
             return Ok(candidate);
         }
     }

From 3517af146160ca5c13d27dca33ffec0320b3f445 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 30 Nov 2025 14:41:13 +0000
Subject: [PATCH 687/761] Disallow changing settings while applying previous
 changes

---
 .../src/views/settings/settings-tab.scss      | 155 ++++++++++++----
 .../src/views/settings/settings-tab.ts        | 175 +++++++++++++-----
 2 files changed, 249 insertions(+), 81 deletions(-)

diff --git a/frontend/obsidian-plugin/src/views/settings/settings-tab.scss b/frontend/obsidian-plugin/src/views/settings/settings-tab.scss
index dcc3e806..0aabbadc 100644
--- a/frontend/obsidian-plugin/src/views/settings/settings-tab.scss
+++ b/frontend/obsidian-plugin/src/views/settings/settings-tab.scss
@@ -13,45 +13,122 @@
 	}
 }
 
-.vault-link-settings {
-	h2 {
-		display: flex;
-		align-items: center;
-		font-size: var(--h2-size);
+.vault-link-settings-container {
+	position: relative;
 
-		.version {
-			@include number-card;
-			margin: var(--size-2-2) 0 0 var(--size-4-2);
-			background-color: var(--color-base-30);
-			color: var(--color-base-70);
-			font-size: var(--font-ui-smaller);
+	.vault-link-settings {
+		h2 {
+			display: flex;
+			align-items: center;
+			font-size: var(--h2-size);
+
+			.version {
+				@include number-card;
+				margin: var(--size-2-2) 0 0 var(--size-4-2);
+				background-color: var(--color-base-30);
+				color: var(--color-base-70);
+				font-size: var(--font-ui-smaller);
+			}
+		}
+
+		.button-container {
+			display: flex;
+			gap: var(--size-4-2);
+		}
+
+		h3 {
+			font-size: var(--font-ui-large);
+			margin-top: var(--heading-spacing);
+		}
+
+		button,
+		input[type="range"],
+		.checkbox-container,
+		.slider::-webkit-slider-thumb {
+			cursor: pointer;
+		}
+
+		input[type="text"],
+		textarea {
+			width: 250px;
+		}
+
+		textarea {
+			resize: none;
+			height: 75px;
+		}
+
+		.applying-changes-overlay {
+			position: absolute;
+			top: 50%;
+			left: 50%;
+			transform: translateY(-50%) translateX(-50%);
+			z-index: 10;
+			backdrop-filter: blur(10px);
+
+			.spinner-container {
+				background-color: rgba(var(--background-primary), 0.5);
+				border: 1px solid var(--background-modifier-border);
+				border-radius: var(--radius-m);
+				padding: var(--size-4-8);
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				gap: var(--size-4-3);
+				box-shadow: 0 8px 24px rgba(0, 0, 0, 0.3);
+				min-width: 200px;
+			}
+
+			.spinner {
+				width: 48px;
+				height: 48px;
+				border: 4px solid var(--background-modifier-border);
+				border-top-color: var(--interactive-accent);
+				border-radius: 50%;
+				animation: spin 0.8s linear infinite;
+			}
+
+			.spinner-text {
+				color: var(--text-normal);
+				font-size: var(--font-ui-medium);
+				font-weight: 500;
+			}
+
+			.spinner-warning {
+				color: var(--text-muted);
+				font-size: var(--font-ui-small);
+				text-align: center;
+				margin-top: var(--size-2-2);
+			}
+		}
+
+		@keyframes spin {
+			from {
+				transform: rotate(0deg);
+			}
+
+			to {
+				transform: rotate(360deg);
+			}
+		}
+
+		&.applying-changes {
+			.setting-item-control {
+				pointer-events: none;
+				opacity: 0.5;
+			}
+
+			button:not(.applying-changes-overlay button) {
+				pointer-events: none;
+				opacity: 0.5;
+			}
+
+			input,
+			textarea,
+			select {
+				pointer-events: none;
+				opacity: 0.5;
+			}
 		}
 	}
-
-	.button-container {
-		display: flex;
-		gap: var(--size-4-2);
-	}
-
-	h3 {
-		font-size: var(--font-ui-large);
-		margin-top: var(--heading-spacing);
-	}
-
-	button,
-	input[type="range"],
-	.checkbox-container,
-	.slider::-webkit-slider-thumb {
-		cursor: pointer;
-	}
-
-	input[type="text"],
-	textarea {
-		width: 250px;
-	}
-
-	textarea {
-		resize: none;
-		height: 75px;
-	}
-}
+}
\ No newline at end of file
diff --git a/frontend/obsidian-plugin/src/views/settings/settings-tab.ts b/frontend/obsidian-plugin/src/views/settings/settings-tab.ts
index 3c6ccd73..3c711a57 100644
--- a/frontend/obsidian-plugin/src/views/settings/settings-tab.ts
+++ b/frontend/obsidian-plugin/src/views/settings/settings-tab.ts
@@ -13,6 +13,9 @@ export class SyncSettingsTab extends PluginSettingTab {
 	private editedToken: string;
 	private editedVaultName: string;
 
+	private _isApplyingChanges = false;
+	private syncEnabledOverride: boolean | undefined = undefined;
+
 	private readonly plugin: VaultLinkPlugin;
 	private readonly syncClient: SyncClient;
 	private readonly statusDescription: StatusDescription;
@@ -64,11 +67,28 @@ export class SyncSettingsTab extends PluginSettingTab {
 		);
 	}
 
+	private get isApplyingChanges(): boolean {
+		return this._isApplyingChanges;
+	}
+
+	private set isApplyingChanges(value: boolean) {
+		this._isApplyingChanges = value;
+		this.display()
+	}
+
 	public display(): void {
 		const { containerEl } = this;
 		containerEl.empty();
 		containerEl.addClass("vault-link-settings");
+		containerEl.parentElement?.addClass("vault-link-settings-container");
 
+		if (this.isApplyingChanges) {
+			containerEl.addClass("applying-changes");
+		} else {
+			containerEl.removeClass("applying-changes");
+		}
+
+		this.renderApplyingChanges(containerEl);
 		this.renderSettingsHeader(containerEl);
 		this.renderConnectionSettings(containerEl);
 		this.renderSyncSettings(containerEl);
@@ -80,6 +100,32 @@ export class SyncSettingsTab extends PluginSettingTab {
 		this.setStatusDescriptionSubscription();
 	}
 
+	private renderApplyingChanges(containerEl: HTMLElement): void {
+		if (this.isApplyingChanges) {
+			const overlay = containerEl.createDiv({
+				cls: "applying-changes-overlay"
+			});
+
+			const spinnerContainer = overlay.createDiv({
+				cls: "spinner-container"
+			});
+
+			spinnerContainer.createDiv({
+				cls: "spinner"
+			});
+
+			spinnerContainer.createDiv({
+				text: "Applying changes...",
+				cls: "spinner-text"
+			});
+
+			spinnerContainer.createDiv({
+				text: "You can exit, but changes won't be saved",
+				cls: "spinner-warning"
+			});
+		}
+	}
+
 	private renderSettingsHeader(containerEl: HTMLElement): void {
 		containerEl.createEl("h2", { text: "VaultLink" }).createSpan({
 			text: this.plugin.manifest.version,
@@ -111,10 +157,10 @@ export class SyncSettingsTab extends PluginSettingTab {
 						text: "Show history"
 					},
 					(button) =>
-						(button.onclick = async (): Promise<void> => {
-							this.plugin.closeSettings();
-							await this.plugin.activateView(HistoryView.TYPE);
-						})
+					(button.onclick = async (): Promise<void> => {
+						this.plugin.closeSettings();
+						await this.plugin.activateView(HistoryView.TYPE);
+					})
 				);
 
 				buttonContainer.createEl(
@@ -123,10 +169,10 @@ export class SyncSettingsTab extends PluginSettingTab {
 						text: "Show logs"
 					},
 					(button) =>
-						(button.onclick = async (): Promise<void> => {
-							this.plugin.closeSettings();
-							await this.plugin.activateView(LogsView.TYPE);
-						})
+					(button.onclick = async (): Promise<void> => {
+						this.plugin.closeSettings();
+						await this.plugin.activateView(LogsView.TYPE);
+					})
 				);
 			}
 		);
@@ -197,23 +243,40 @@ export class SyncSettingsTab extends PluginSettingTab {
 		new Setting(containerEl).addButton((button) =>
 			button
 				.setButtonText("Apply & test connection")
-				.onClick(async () => {
-					if (this.areThereUnsavedChanges()) {
-						await this.syncClient.setSettings({
-							vaultName: this.editedVaultName,
-							remoteUri: this.editedServerUri,
-							token: this.editedToken
-						});
-						new Notice("Checking connection to the server...");
-						new Notice(
-							(
-								await this.syncClient.checkConnection()
-							).serverMessage
-						);
-						await this.statusDescription.updateConnectionState();
-					} else {
-						new Notice("No changes to apply");
-					}
+				.setDisabled(this.isApplyingChanges)
+				.setTooltip(
+					this.isApplyingChanges
+						? "Waiting for applying changes to finish..."
+						: "Apply the changes made to the connection settings and test the connection to the server."
+				)
+				.onClick(() => {
+					// don't show loader within the button
+					void (async () => {
+						if (this.areThereUnsavedChanges()) {
+							new Notice("Applying changes to the server...");
+
+							this.isApplyingChanges = true;
+							try {
+								await this.syncClient.setSettings({
+									vaultName: this.editedVaultName,
+									remoteUri: this.editedServerUri,
+									token: this.editedToken
+								});
+							} finally {
+								this.isApplyingChanges = false;
+							}
+
+							new Notice("Checking connection to the server...");
+							new Notice(
+								(
+									await this.syncClient.checkConnection()
+								).serverMessage
+							);
+							await this.statusDescription.updateConnectionState();
+						} else {
+							new Notice("No changes to apply");
+						}
+					})();
 				})
 		);
 	}
@@ -239,9 +302,24 @@ export class SyncSettingsTab extends PluginSettingTab {
 			)
 			.addToggle((toggle) =>
 				toggle
-					.setValue(this.syncClient.getSettings().isSyncEnabled)
-					.onChange(async (value) =>
-						this.syncClient.setSetting("isSyncEnabled", value)
+					.setValue(this.syncEnabledOverride ?? this.syncClient.getSettings().isSyncEnabled)
+					.setDisabled(this.isApplyingChanges)
+					.setTooltip(
+						this.isApplyingChanges
+							? "Waiting for applying changes to finish..."
+							: "Enable or disable syncing."
+					)
+					.onChange((value) => void (async () => {
+						this.syncEnabledOverride = value;
+						this.isApplyingChanges = true;
+						try {
+							await this.syncClient.setSetting("isSyncEnabled", value);
+						} finally {
+							this.syncEnabledOverride = undefined;
+							this.isApplyingChanges = false;
+						}
+					}
+					)()
 					)
 			);
 
@@ -321,12 +399,26 @@ export class SyncSettingsTab extends PluginSettingTab {
 				"Delete the local metadata database while leaving the local and remote files intact."
 			)
 			.addButton((button) =>
-				button.setButtonText("Reset sync state").onClick(async () => {
-					await this.syncClient.applyChangedConnectionSettings();
-					new Notice(
-						"Sync state has been reset, you will need to resync"
-					);
-				})
+				button
+					.setDisabled(this.isApplyingChanges)
+					.setTooltip(
+						this.isApplyingChanges
+							? "Waiting for applying changes to finish..."
+							: "Reset sync state"
+					)
+					.setButtonText("Reset sync state")
+					.onClick(() => void (async () => {
+						this.isApplyingChanges = true;
+						try {
+							await this.syncClient.reset();
+						} finally {
+							this.isApplyingChanges = false;
+						}
+
+						new Notice(
+							"Sync state has been reset, you will need to resync"
+						);
+					})())
 			);
 	}
 
@@ -441,9 +533,9 @@ export class SyncSettingsTab extends PluginSettingTab {
 		name: string,
 		settingName: keyof SyncSettings
 	): [
-		DocumentFragment,
-		(newValue: SyncSettings[keyof SyncSettings]) => unknown
-	] {
+			DocumentFragment,
+			(newValue: SyncSettings[keyof SyncSettings]) => unknown
+		] {
 		const titleContainer = document.createDocumentFragment();
 		const title = titleContainer.createEl("div", {
 			text: name,
@@ -453,11 +545,10 @@ export class SyncSettingsTab extends PluginSettingTab {
 		const updateTitle = (
 			currentValue: SyncSettings[keyof SyncSettings]
 		): void => {
-			title.innerText = `${name}${
-				currentValue !== this.syncClient.getSettings()[settingName]
-					? " (unsaved)"
-					: ""
-			}`;
+			title.innerText = `${name}${currentValue !== this.syncClient.getSettings()[settingName]
+				? " (unsaved)"
+				: ""
+				}`;
 		};
 
 		return [titleContainer, updateTitle];

From 39860f7f04723a464444c4adcca7c13c5f67b50e Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 30 Nov 2025 14:42:50 +0000
Subject: [PATCH 688/761] Add lock on settings

---
 .../sync-client/src/persistence/settings.ts   | 36 ++++++++++---------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/frontend/sync-client/src/persistence/settings.ts b/frontend/sync-client/src/persistence/settings.ts
index b414fcd9..08dcfba4 100644
--- a/frontend/sync-client/src/persistence/settings.ts
+++ b/frontend/sync-client/src/persistence/settings.ts
@@ -1,5 +1,6 @@
 import type { Logger } from "../tracing/logger";
 import { awaitAll } from "../utils/await-all";
+import { Lock } from "../utils/data-structures/locks";
 
 export interface SyncSettings {
 	remoteUri: string;
@@ -33,6 +34,7 @@ export const DEFAULT_SETTINGS: SyncSettings = {
 
 export class Settings {
 	private settings: SyncSettings;
+	private readonly lock: Lock = new Lock();
 
 	private readonly onSettingsChangeHandlers: ((
 		newSettings: SyncSettings,
@@ -83,24 +85,26 @@ export class Settings {
 	}
 
 	public async setSettings(value: Partial<SyncSettings>): Promise<void> {
-		this.logger.debug(`Updating settings with: ${JSON.stringify(value)}`);
-		const oldSettings = this.settings;
-		this.settings = {
-			...this.settings,
-			...value
-		};
+		await this.lock.withLock(async () => {
+			this.logger.debug(`Updating settings with: ${JSON.stringify(value)}`);
+			const oldSettings = this.settings;
+			this.settings = {
+				...this.settings,
+				...value
+			};
 
-		await awaitAll(
-			this.onSettingsChangeHandlers
-				.map((handler) => {
-					return handler(this.settings, oldSettings);
-				})
-				.filter((result): result is Promise<unknown> => {
-					return result instanceof Promise;
-				})
-		);
+			await awaitAll(
+				this.onSettingsChangeHandlers
+					.map((handler) => {
+						return handler(this.settings, oldSettings);
+					})
+					.filter((result): result is Promise<unknown> => {
+						return result instanceof Promise;
+					})
+			);
 
-		await this.save();
+			await this.save();
+		});
 	}
 
 	private async save(): Promise<void> {

From 515a8f2bf440c61f06a75b74e798f8cd4c67c7b8 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 30 Nov 2025 14:43:05 +0000
Subject: [PATCH 689/761] Install cargo machete

---
 scripts/check.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/check.sh b/scripts/check.sh
index 9541ecf4..4f69dfb2 100755
--- a/scripts/check.sh
+++ b/scripts/check.sh
@@ -21,6 +21,7 @@ else
     cargo fmt --all -- --check
 fi
 
+cargo install cargo-machete
 cargo machete --with-metadata
 
 echo "Running checks in frontend"

From 7beda491e9ac7756eccc81f1feedc89583842a66 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 30 Nov 2025 14:43:22 +0000
Subject: [PATCH 690/761] Rename method

---
 frontend/sync-client/src/sync-client.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts
index 0ca98137..b76da9d9 100644
--- a/frontend/sync-client/src/sync-client.ts
+++ b/frontend/sync-client/src/sync-client.ts
@@ -286,8 +286,8 @@ export class SyncClient {
 	 * and the local database but retain the settings.
 	 * The SyncClient can be used again after calling this method.
 	 */
-	public async applyChangedConnectionSettings(): Promise<void> {
-		this.checkIfDestroyed("applyChangedConnectionSettings");
+	public async reset(): Promise<void> {
+		this.checkIfDestroyed("reset");
 
 		this.logger.info(
 			"Stopping SyncClient to apply changed connection settings"
@@ -451,6 +451,7 @@ export class SyncClient {
 		this.fetchController.finishReset();
 
 		await this.serverConfig.initialize();
+		this.webSocketManager.start();
 
 		if (!this.hasStartedOfflineSync) {
 			this.hasStartedOfflineSync = true;
@@ -458,7 +459,6 @@ export class SyncClient {
 		}
 
 		this.hasFinishedOfflineSync = true;
-		this.webSocketManager.start();
 	}
 
 	private async pause(): Promise<void> {
@@ -470,7 +470,7 @@ export class SyncClient {
 	private resetInMemoryState(): void {
 		this.history.reset();
 		this.contentCache.reset();
-		this.logger.reset();
+		// don't reset the logger
 		this.cursorTracker.reset();
 		this.syncer.reset();
 		this.fileOperations.reset();
@@ -486,7 +486,7 @@ export class SyncClient {
 			newSettings.vaultName !== oldSettings.vaultName ||
 			newSettings.remoteUri !== oldSettings.remoteUri
 		) {
-			await this.applyChangedConnectionSettings();
+			await this.reset();
 		}
 
 		if (newSettings.isSyncEnabled !== oldSettings.isSyncEnabled) {

From c7c96b787a1cd65bfa12eed4d00889eabc299356 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 30 Nov 2025 14:45:18 +0000
Subject: [PATCH 691/761] Add log lines

---
 frontend/sync-client/src/sync-operations/syncer.ts | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/frontend/sync-client/src/sync-operations/syncer.ts b/frontend/sync-client/src/sync-operations/syncer.ts
index 7a5fcb14..d6ee5621 100644
--- a/frontend/sync-client/src/sync-operations/syncer.ts
+++ b/frontend/sync-client/src/sync-operations/syncer.ts
@@ -107,10 +107,6 @@ export class Syncer {
 			promise
 		);
 
-		this.logger.debug(
-			`Creating new pending document ${relativePath} with id ${id}`
-		);
-
 		try {
 			await this.syncQueue.add(async () =>
 				this.internalSyncer.unrestrictedSyncLocallyCreatedFile(document)
@@ -177,7 +173,7 @@ export class Syncer {
 			// in that case, we mustn't move it again.
 			if (
 				this.database.getLatestDocumentByRelativePath(relativePath) ===
-					undefined ||
+				undefined ||
 				this.database.getLatestDocumentByRelativePath(relativePath)
 					?.isDeleted === true
 			) {
@@ -400,6 +396,9 @@ export class Syncer {
 		await this.createFakeDocumentsFromRemoteState();
 
 		const allLocalFiles = await this.operations.listFilesRecursively();
+		this.logger.info(
+			`Scheduling sync for ${allLocalFiles.length} local files`
+		);
 
 		let locallyPossiblyDeletedFiles: DocumentRecord[] = [];
 

From 9349afc00f54b3278f0fbc02cdf5819c0e2e61d0 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 30 Nov 2025 14:52:20 +0000
Subject: [PATCH 692/761] Run lint & fmt

---
 .../obsidian-plugin/src/vault-link-plugin.ts  |  3 +
 .../src/views/logs/logs-view.ts               | 15 ++-
 .../src/views/settings/settings-tab.ts        | 91 +++++++++++--------
 .../src/file-operations/file-operations.ts    |  1 +
 .../sync-client/src/persistence/settings.ts   |  6 +-
 .../src/services/websocket-manager.test.ts    |  2 +
 .../sync-client/src/sync-operations/syncer.ts |  2 +-
 7 files changed, 73 insertions(+), 47 deletions(-)

diff --git a/frontend/obsidian-plugin/src/vault-link-plugin.ts b/frontend/obsidian-plugin/src/vault-link-plugin.ts
index 783e732b..54e302f8 100644
--- a/frontend/obsidian-plugin/src/vault-link-plugin.ts
+++ b/frontend/obsidian-plugin/src/vault-link-plugin.ts
@@ -43,12 +43,14 @@ export default class VaultLinkPlugin extends Plugin {
 
 	public async onload(): Promise<void> {
 		this.app.workspace.onLayoutReady(async () => {
+			// eslint-disable-next-line
 			if ((globalThis as any).VAULT_LINK_RUNNING_INSTANCE) {
 				new Notice(
 					"Another instance of VaultLink is already running. Please disable the duplicate instance."
 				);
 				throw new Error("VaultLink instance already running");
 			}
+			// eslint-disable-next-line
 			(globalThis as any).VAULT_LINK_RUNNING_INSTANCE = this;
 
 			const client = await this.createSyncClient();
@@ -199,6 +201,7 @@ export default class VaultLinkPlugin extends Plugin {
 		});
 
 		this.register(() => {
+			// eslint-disable-next-line
 			(globalThis as any).VAULT_LINK_RUNNING_INSTANCE = null;
 		});
 	}
diff --git a/frontend/obsidian-plugin/src/views/logs/logs-view.ts b/frontend/obsidian-plugin/src/views/logs/logs-view.ts
index f624d848..395cfe09 100644
--- a/frontend/obsidian-plugin/src/views/logs/logs-view.ts
+++ b/frontend/obsidian-plugin/src/views/logs/logs-view.ts
@@ -78,14 +78,18 @@ export class LogsView extends ItemView {
 					text: "VaultLink logs"
 				});
 
-				const controls = verbositySection.createDiv({ cls: "logs-controls" });
+				const controls = verbositySection.createDiv({
+					cls: "logs-controls"
+				});
 
 				const copyButton = controls.createEl("button", {
 					text: "Copy logs",
 					cls: "clickable-icon"
 				});
 				setIcon(copyButton, "clipboard-copy");
-				copyButton.addEventListener("click", () => { this.copyLogsToClipboard(); });
+				copyButton.addEventListener("click", () => {
+					this.copyLogsToClipboard();
+				});
 
 				controls.createEl("select", {}, (dropdown) => {
 					logLevels.forEach(({ label, value }) =>
@@ -127,12 +131,15 @@ export class LogsView extends ItemView {
 			})
 			.join("\n");
 
-		navigator.clipboard.writeText(formattedLogs)
+		navigator.clipboard
+			.writeText(formattedLogs)
 			.then(() => {
 				new Notice(`Copied ${logs.length} log entries to clipboard`);
 			})
 			.catch((error: unknown) => {
-				this.client.logger.error(`Failed to copy logs to clipboard: ${error}`);
+				this.client.logger.error(
+					`Failed to copy logs to clipboard: ${error}`
+				);
 				new Notice("Failed to copy logs to clipboard");
 			});
 	}
diff --git a/frontend/obsidian-plugin/src/views/settings/settings-tab.ts b/frontend/obsidian-plugin/src/views/settings/settings-tab.ts
index 3c711a57..1ff78a4b 100644
--- a/frontend/obsidian-plugin/src/views/settings/settings-tab.ts
+++ b/frontend/obsidian-plugin/src/views/settings/settings-tab.ts
@@ -73,7 +73,7 @@ export class SyncSettingsTab extends PluginSettingTab {
 
 	private set isApplyingChanges(value: boolean) {
 		this._isApplyingChanges = value;
-		this.display()
+		this.display();
 	}
 
 	public display(): void {
@@ -157,10 +157,10 @@ export class SyncSettingsTab extends PluginSettingTab {
 						text: "Show history"
 					},
 					(button) =>
-					(button.onclick = async (): Promise<void> => {
-						this.plugin.closeSettings();
-						await this.plugin.activateView(HistoryView.TYPE);
-					})
+						(button.onclick = async (): Promise<void> => {
+							this.plugin.closeSettings();
+							await this.plugin.activateView(HistoryView.TYPE);
+						})
 				);
 
 				buttonContainer.createEl(
@@ -169,10 +169,10 @@ export class SyncSettingsTab extends PluginSettingTab {
 						text: "Show logs"
 					},
 					(button) =>
-					(button.onclick = async (): Promise<void> => {
-						this.plugin.closeSettings();
-						await this.plugin.activateView(LogsView.TYPE);
-					})
+						(button.onclick = async (): Promise<void> => {
+							this.plugin.closeSettings();
+							await this.plugin.activateView(LogsView.TYPE);
+						})
 				);
 			}
 		);
@@ -251,7 +251,7 @@ export class SyncSettingsTab extends PluginSettingTab {
 				)
 				.onClick(() => {
 					// don't show loader within the button
-					void (async () => {
+					void (async (): Promise<void> => {
 						if (this.areThereUnsavedChanges()) {
 							new Notice("Applying changes to the server...");
 
@@ -302,24 +302,31 @@ export class SyncSettingsTab extends PluginSettingTab {
 			)
 			.addToggle((toggle) =>
 				toggle
-					.setValue(this.syncEnabledOverride ?? this.syncClient.getSettings().isSyncEnabled)
+					.setValue(
+						this.syncEnabledOverride ??
+							this.syncClient.getSettings().isSyncEnabled
+					)
 					.setDisabled(this.isApplyingChanges)
 					.setTooltip(
 						this.isApplyingChanges
 							? "Waiting for applying changes to finish..."
 							: "Enable or disable syncing."
 					)
-					.onChange((value) => void (async () => {
-						this.syncEnabledOverride = value;
-						this.isApplyingChanges = true;
-						try {
-							await this.syncClient.setSetting("isSyncEnabled", value);
-						} finally {
-							this.syncEnabledOverride = undefined;
-							this.isApplyingChanges = false;
-						}
-					}
-					)()
+					.onChange(
+						(value) =>
+							void (async (): Promise<void> => {
+								this.syncEnabledOverride = value;
+								this.isApplyingChanges = true;
+								try {
+									await this.syncClient.setSetting(
+										"isSyncEnabled",
+										value
+									);
+								} finally {
+									this.syncEnabledOverride = undefined;
+									this.isApplyingChanges = false;
+								}
+							})()
 					)
 			);
 
@@ -407,18 +414,21 @@ export class SyncSettingsTab extends PluginSettingTab {
 							: "Reset sync state"
 					)
 					.setButtonText("Reset sync state")
-					.onClick(() => void (async () => {
-						this.isApplyingChanges = true;
-						try {
-							await this.syncClient.reset();
-						} finally {
-							this.isApplyingChanges = false;
-						}
+					.onClick(
+						() =>
+							void (async (): Promise<void> => {
+								this.isApplyingChanges = true;
+								try {
+									await this.syncClient.reset();
+								} finally {
+									this.isApplyingChanges = false;
+								}
 
-						new Notice(
-							"Sync state has been reset, you will need to resync"
-						);
-					})())
+								new Notice(
+									"Sync state has been reset, you will need to resync"
+								);
+							})()
+					)
 			);
 	}
 
@@ -533,9 +543,9 @@ export class SyncSettingsTab extends PluginSettingTab {
 		name: string,
 		settingName: keyof SyncSettings
 	): [
-			DocumentFragment,
-			(newValue: SyncSettings[keyof SyncSettings]) => unknown
-		] {
+		DocumentFragment,
+		(newValue: SyncSettings[keyof SyncSettings]) => unknown
+	] {
 		const titleContainer = document.createDocumentFragment();
 		const title = titleContainer.createEl("div", {
 			text: name,
@@ -545,10 +555,11 @@ export class SyncSettingsTab extends PluginSettingTab {
 		const updateTitle = (
 			currentValue: SyncSettings[keyof SyncSettings]
 		): void => {
-			title.innerText = `${name}${currentValue !== this.syncClient.getSettings()[settingName]
-				? " (unsaved)"
-				: ""
-				}`;
+			title.innerText = `${name}${
+				currentValue !== this.syncClient.getSettings()[settingName]
+					? " (unsaved)"
+					: ""
+			}`;
 		};
 
 		return [titleContainer, updateTitle];
diff --git a/frontend/sync-client/src/file-operations/file-operations.ts b/frontend/sync-client/src/file-operations/file-operations.ts
index 8f39ff69..6bfdc305 100644
--- a/frontend/sync-client/src/file-operations/file-operations.ts
+++ b/frontend/sync-client/src/file-operations/file-operations.ts
@@ -268,6 +268,7 @@ export class FileOperations {
 
 		let newName = path;
 
+		// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
 		while (true) {
 			currentCount++;
 			newName = `${directory}${stem} (${currentCount})${extension}`;
diff --git a/frontend/sync-client/src/persistence/settings.ts b/frontend/sync-client/src/persistence/settings.ts
index 08dcfba4..81044a38 100644
--- a/frontend/sync-client/src/persistence/settings.ts
+++ b/frontend/sync-client/src/persistence/settings.ts
@@ -39,7 +39,7 @@ export class Settings {
 	private readonly onSettingsChangeHandlers: ((
 		newSettings: SyncSettings,
 		oldSettings: SyncSettings
-	) => Promise<unknown> | unknown)[] = [];
+	) => unknown)[] = [];
 
 	public constructor(
 		private readonly logger: Logger,
@@ -86,7 +86,9 @@ export class Settings {
 
 	public async setSettings(value: Partial<SyncSettings>): Promise<void> {
 		await this.lock.withLock(async () => {
-			this.logger.debug(`Updating settings with: ${JSON.stringify(value)}`);
+			this.logger.debug(
+				`Updating settings with: ${JSON.stringify(value)}`
+			);
 			const oldSettings = this.settings;
 			this.settings = {
 				...this.settings,
diff --git a/frontend/sync-client/src/services/websocket-manager.test.ts b/frontend/sync-client/src/services/websocket-manager.test.ts
index a4f0fb2e..13aca939 100644
--- a/frontend/sync-client/src/services/websocket-manager.test.ts
+++ b/frontend/sync-client/src/services/websocket-manager.test.ts
@@ -4,6 +4,8 @@ import assert from "node:assert";
 import { WebSocketManager } from "./websocket-manager";
 import type { Logger } from "../tracing/logger";
 import type { Settings } from "../persistence/settings";
+// eslint-disable-next-line @typescript-eslint/no-require-imports
+const WebSocket = require("ws") as typeof globalThis.WebSocket;
 
 class MockCloseEvent extends Event {
 	public code: number;
diff --git a/frontend/sync-client/src/sync-operations/syncer.ts b/frontend/sync-client/src/sync-operations/syncer.ts
index d6ee5621..12008b59 100644
--- a/frontend/sync-client/src/sync-operations/syncer.ts
+++ b/frontend/sync-client/src/sync-operations/syncer.ts
@@ -173,7 +173,7 @@ export class Syncer {
 			// in that case, we mustn't move it again.
 			if (
 				this.database.getLatestDocumentByRelativePath(relativePath) ===
-				undefined ||
+					undefined ||
 				this.database.getLatestDocumentByRelativePath(relativePath)
 					?.isDeleted === true
 			) {

From bbf81d3111fb3222e9fdf9f0b090e084859628c7 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 30 Nov 2025 15:26:22 +0000
Subject: [PATCH 693/761] Install set-version

---
 scripts/bump-version.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/bump-version.sh b/scripts/bump-version.sh
index 57a78fd6..5b32edc9 100755
--- a/scripts/bump-version.sh
+++ b/scripts/bump-version.sh
@@ -15,6 +15,8 @@ else
   exit 1
 fi
 
+cargo install cargo-set-version
+
 if [[ -n $(git status --porcelain) ]]; then
   echo "Your working directory is not clean. Please commit or stash your changes before proceeding."
   exit 1

From 215c024876cef6c8f65f5533c708e345c3af99de Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 30 Nov 2025 15:26:40 +0000
Subject: [PATCH 694/761] Bump versions to 0.11.0

---
 frontend/local-client-cli/package.json | 2 +-
 frontend/obsidian-plugin/manifest.json | 2 +-
 frontend/obsidian-plugin/package.json  | 2 +-
 frontend/package-lock.json             | 8 ++++----
 frontend/sync-client/package.json      | 2 +-
 frontend/test-client/package.json      | 2 +-
 manifest.json                          | 2 +-
 sync-server/Cargo.toml                 | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/frontend/local-client-cli/package.json b/frontend/local-client-cli/package.json
index 50eae1f8..dbe8d95e 100644
--- a/frontend/local-client-cli/package.json
+++ b/frontend/local-client-cli/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "local-client-cli",
-	"version": "0.10.1",
+	"version": "0.11.0",
 	"description": "Standalone CLI for VaultLink sync client",
 	"private": false,
 	"bin": {
diff --git a/frontend/obsidian-plugin/manifest.json b/frontend/obsidian-plugin/manifest.json
index aec6988c..2efbe552 100644
--- a/frontend/obsidian-plugin/manifest.json
+++ b/frontend/obsidian-plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.10.1",
+	"version": "0.11.0",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index 4047a1da..592d9db8 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -1,6 +1,6 @@
 {
     "name": "vault-link-obsidian-plugin",
-    "version": "0.10.1",
+    "version": "0.11.0",
     "description": "This is a sample plugin for Obsidian (https://obsidian.md)",
     "main": "main.js",
     "scripts": {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 6242aec3..c5473622 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -21,7 +21,7 @@
 			}
 		},
 		"local-client-cli": {
-			"version": "0.10.1",
+			"version": "0.11.0",
 			"dependencies": {
 				"commander": "^14.0.2"
 			},
@@ -4644,7 +4644,7 @@
 		},
 		"obsidian-plugin": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.10.1",
+			"version": "0.11.0",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/node": "^24.8.1",
@@ -4670,7 +4670,7 @@
 			}
 		},
 		"sync-client": {
-			"version": "0.10.1",
+			"version": "0.11.0",
 			"devDependencies": {
 				"@sentry/browser": "^10.8.0",
 				"@types/node": "^24.8.1",
@@ -4714,7 +4714,7 @@
 			}
 		},
 		"test-client": {
-			"version": "0.10.1",
+			"version": "0.11.0",
 			"bin": {
 				"test-client": "dist/cli.js"
 			},
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index f6234b80..3a95e87d 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "sync-client",
-    "version": "0.10.1",
+    "version": "0.11.0",
     "main": "dist/sync-client.node.js",
     "browser": "dist/sync-client.web.js",
     "types": "dist/types/index.d.ts",
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index 2dd58734..ad942d87 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "test-client",
-	"version": "0.10.1",
+	"version": "0.11.0",
 	"private": true,
 	"bin": {
 		"test-client": "./dist/cli.js"
diff --git a/manifest.json b/manifest.json
index aec6988c..2efbe552 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.10.1",
+	"version": "0.11.0",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/sync-server/Cargo.toml b/sync-server/Cargo.toml
index 2ec6db2c..30ebbda2 100644
--- a/sync-server/Cargo.toml
+++ b/sync-server/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.10.1"
+version = "--bump"
 
 [dependencies]
 serde = { version = "1.0.219", default-features = false, features = ["derive"] }

From 89e3b617662852eb13557cad0410c61305ed8a6e Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Tue, 2 Dec 2025 20:44:20 +0000
Subject: [PATCH 695/761] Fix release

---
 scripts/bump-version.sh | 2 +-
 sync-server/Cargo.toml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/bump-version.sh b/scripts/bump-version.sh
index 5b32edc9..2c802218 100755
--- a/scripts/bump-version.sh
+++ b/scripts/bump-version.sh
@@ -15,7 +15,7 @@ else
   exit 1
 fi
 
-cargo install cargo-set-version
+cargo install cargo-edit
 
 if [[ -n $(git status --porcelain) ]]; then
   echo "Your working directory is not clean. Please commit or stash your changes before proceeding."
diff --git a/sync-server/Cargo.toml b/sync-server/Cargo.toml
index 30ebbda2..9fb5ef80 100644
--- a/sync-server/Cargo.toml
+++ b/sync-server/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "--bump"
+version = "0.11.0"
 
 [dependencies]
 serde = { version = "1.0.219", default-features = false, features = ["derive"] }

From f8d62f441657e5a1c41b224ebce1527f26ceea28 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Tue, 2 Dec 2025 20:44:50 +0000
Subject: [PATCH 696/761] Force install

---
 scripts/bump-version.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bump-version.sh b/scripts/bump-version.sh
index 2c802218..6190eb3e 100755
--- a/scripts/bump-version.sh
+++ b/scripts/bump-version.sh
@@ -15,7 +15,7 @@ else
   exit 1
 fi
 
-cargo install cargo-edit
+cargo install cargo-edit --force
 
 if [[ -n $(git status --porcelain) ]]; then
   echo "Your working directory is not clean. Please commit or stash your changes before proceeding."

From 8e336cb0f3b34ddb6a598d57d84b0a051297c7ad Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Tue, 2 Dec 2025 20:46:41 +0000
Subject: [PATCH 697/761] Bump versions to 0.11.1

---
 frontend/local-client-cli/package.json | 2 +-
 frontend/obsidian-plugin/manifest.json | 2 +-
 frontend/obsidian-plugin/package.json  | 2 +-
 frontend/package-lock.json             | 8 ++++----
 frontend/sync-client/package.json      | 2 +-
 frontend/test-client/package.json      | 2 +-
 manifest.json                          | 2 +-
 sync-server/Cargo.lock                 | 2 +-
 sync-server/Cargo.toml                 | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/frontend/local-client-cli/package.json b/frontend/local-client-cli/package.json
index dbe8d95e..b1f715a6 100644
--- a/frontend/local-client-cli/package.json
+++ b/frontend/local-client-cli/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "local-client-cli",
-	"version": "0.11.0",
+	"version": "0.11.1",
 	"description": "Standalone CLI for VaultLink sync client",
 	"private": false,
 	"bin": {
diff --git a/frontend/obsidian-plugin/manifest.json b/frontend/obsidian-plugin/manifest.json
index 2efbe552..b7c61fca 100644
--- a/frontend/obsidian-plugin/manifest.json
+++ b/frontend/obsidian-plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.11.0",
+	"version": "0.11.1",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index 592d9db8..e8dbd9cd 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -1,6 +1,6 @@
 {
     "name": "vault-link-obsidian-plugin",
-    "version": "0.11.0",
+    "version": "0.11.1",
     "description": "This is a sample plugin for Obsidian (https://obsidian.md)",
     "main": "main.js",
     "scripts": {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index c5473622..e1f17d85 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -21,7 +21,7 @@
 			}
 		},
 		"local-client-cli": {
-			"version": "0.11.0",
+			"version": "0.11.1",
 			"dependencies": {
 				"commander": "^14.0.2"
 			},
@@ -4644,7 +4644,7 @@
 		},
 		"obsidian-plugin": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.11.0",
+			"version": "0.11.1",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/node": "^24.8.1",
@@ -4670,7 +4670,7 @@
 			}
 		},
 		"sync-client": {
-			"version": "0.11.0",
+			"version": "0.11.1",
 			"devDependencies": {
 				"@sentry/browser": "^10.8.0",
 				"@types/node": "^24.8.1",
@@ -4714,7 +4714,7 @@
 			}
 		},
 		"test-client": {
-			"version": "0.11.0",
+			"version": "0.11.1",
 			"bin": {
 				"test-client": "dist/cli.js"
 			},
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index 3a95e87d..4873fe4b 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "sync-client",
-    "version": "0.11.0",
+    "version": "0.11.1",
     "main": "dist/sync-client.node.js",
     "browser": "dist/sync-client.web.js",
     "types": "dist/types/index.d.ts",
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index ad942d87..116b1aca 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "test-client",
-	"version": "0.11.0",
+	"version": "0.11.1",
 	"private": true,
 	"bin": {
 		"test-client": "./dist/cli.js"
diff --git a/manifest.json b/manifest.json
index 2efbe552..b7c61fca 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.11.0",
+	"version": "0.11.1",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/sync-server/Cargo.lock b/sync-server/Cargo.lock
index 956e64c3..755ab23f 100644
--- a/sync-server/Cargo.lock
+++ b/sync-server/Cargo.lock
@@ -2288,7 +2288,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.10.1"
+version = "0.11.1"
 dependencies = [
  "anyhow",
  "axum",
diff --git a/sync-server/Cargo.toml b/sync-server/Cargo.toml
index 9fb5ef80..48ccec8d 100644
--- a/sync-server/Cargo.toml
+++ b/sync-server/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.11.0"
+version = "0.11.1"
 
 [dependencies]
 serde = { version = "1.0.219", default-features = false, features = ["derive"] }

From e98f7acefa07ad9d989f5e2eb4b86b2795503f27 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Dec 2025 22:32:39 +0000
Subject: [PATCH 698/761] Bump log from 0.4.27 to 0.4.28 in /sync-server (#170)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 sync-server/Cargo.lock | 4 ++--
 sync-server/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sync-server/Cargo.lock b/sync-server/Cargo.lock
index 755ab23f..31b03207 100644
--- a/sync-server/Cargo.lock
+++ b/sync-server/Cargo.lock
@@ -1310,9 +1310,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.27"
+version = "0.4.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
+checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
 
 [[package]]
 name = "matchers"
diff --git a/sync-server/Cargo.toml b/sync-server/Cargo.toml
index 48ccec8d..ade113a2 100644
--- a/sync-server/Cargo.toml
+++ b/sync-server/Cargo.toml
@@ -12,7 +12,7 @@ serde = { version = "1.0.219", default-features = false, features = ["derive"] }
 thiserror = { version = "2.0.12", default-features = false  }
 tokio = { version = "1.48.0", features = ["full"]}
 uuid = { version = "1.16.0", features = ["v4", "serde"] }
-log = { version = "0.4.27" }
+log = { version = "0.4.28" }
 anyhow =  { version = "1.0.100", features = ["backtrace"] }
 axum = { version = "0.7.4", features = ["ws", "macros", "tracing", "multipart"]}
 axum-extra = { version = "0.9.6", features = ["typed-header"] }

From da2237fa689975b107a6ec3e95a6b0c356fde788 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Dec 2025 22:32:49 +0000
Subject: [PATCH 699/761] Bump sass-loader from 16.0.5 to 16.0.6 in /frontend
 (#159)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 frontend/obsidian-plugin/package.json | 2 +-
 frontend/package-lock.json            | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index e8dbd9cd..83efd8ab 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -23,7 +23,7 @@
         "reconcile-text": "^0.7.1",
         "resolve-url-loader": "^5.0.0",
         "sass": "^1.91.0",
-        "sass-loader": "^16.0.5",
+        "sass-loader": "^16.0.6",
         "sync-client": "file:../sync-client",
         "terser-webpack-plugin": "^5.3.14",
         "ts-loader": "^9.5.2",
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index e1f17d85..9c91bcfc 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -3673,7 +3673,9 @@
 			}
 		},
 		"node_modules/sass-loader": {
-			"version": "16.0.5",
+			"version": "16.0.6",
+			"resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-16.0.6.tgz",
+			"integrity": "sha512-sglGzId5gmlfxNs4gK2U3h7HlVRfx278YK6Ono5lwzuvi1jxig80YiuHkaDBVsYIKFhx8wN7XSCI0M2IDS/3qA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4657,7 +4659,7 @@
 				"reconcile-text": "^0.7.1",
 				"resolve-url-loader": "^5.0.0",
 				"sass": "^1.91.0",
-				"sass-loader": "^16.0.5",
+				"sass-loader": "^16.0.6",
 				"sync-client": "file:../sync-client",
 				"terser-webpack-plugin": "^5.3.14",
 				"ts-loader": "^9.5.2",

From d39a91b4479e0d5f2631b5c91449d5a869e2369d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Dec 2025 22:32:58 +0000
Subject: [PATCH 700/761] Bump tsx from 4.20.5 to 4.20.6 in /frontend (#154)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 frontend/local-client-cli/package.json |  2 +-
 frontend/obsidian-plugin/package.json  |  2 +-
 frontend/package-lock.json             | 14 +++++++-------
 frontend/sync-client/package.json      |  2 +-
 frontend/test-client/package.json      |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/frontend/local-client-cli/package.json b/frontend/local-client-cli/package.json
index b1f715a6..a98220f0 100644
--- a/frontend/local-client-cli/package.json
+++ b/frontend/local-client-cli/package.json
@@ -19,7 +19,7 @@
 		"sync-client": "file:../sync-client",
 		"ts-loader": "^9.5.2",
 		"tslib": "2.8.1",
-		"tsx": "^4.20.5",
+		"tsx": "^4.20.6",
 		"typescript": "5.8.3",
 		"webpack": "^5.99.9",
 		"webpack-cli": "^6.0.1"
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index 83efd8ab..e0d7326a 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -28,7 +28,7 @@
         "terser-webpack-plugin": "^5.3.14",
         "ts-loader": "^9.5.2",
         "tslib": "2.8.1",
-        "tsx": "^4.20.5",
+        "tsx": "^4.20.6",
         "typescript": "5.8.3",
         "url": "^0.11.4",
         "webpack": "^5.99.9",
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 9c91bcfc..b93c3064 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -33,7 +33,7 @@
 				"sync-client": "file:../sync-client",
 				"ts-loader": "^9.5.2",
 				"tslib": "2.8.1",
-				"tsx": "^4.20.5",
+				"tsx": "^4.20.6",
 				"typescript": "5.8.3",
 				"webpack": "^5.99.9",
 				"webpack-cli": "^6.0.1"
@@ -4153,9 +4153,9 @@
 			"license": "0BSD"
 		},
 		"node_modules/tsx": {
-			"version": "4.20.5",
-			"resolved": "https://registry.npmjs.org/tsx/-/tsx-4.20.5.tgz",
-			"integrity": "sha512-+wKjMNU9w/EaQayHXb7WA7ZaHY6hN8WgfvHNQ3t1PnU91/7O8TcTnIhCDYTZwnt8JsO9IBqZ30Ln1r7pPF52Aw==",
+			"version": "4.20.6",
+			"resolved": "https://registry.npmjs.org/tsx/-/tsx-4.20.6.tgz",
+			"integrity": "sha512-ytQKuwgmrrkDTFP4LjR0ToE2nqgy886GpvRSpU0JAnrdBYppuY5rLkRUYPU1yCryb24SsKBTL/hlDQAEFVwtZg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4664,7 +4664,7 @@
 				"terser-webpack-plugin": "^5.3.14",
 				"ts-loader": "^9.5.2",
 				"tslib": "2.8.1",
-				"tsx": "^4.20.5",
+				"tsx": "^4.20.6",
 				"typescript": "5.8.3",
 				"url": "^0.11.4",
 				"webpack": "^5.99.9",
@@ -4682,7 +4682,7 @@
 				"reconcile-text": "^0.7.1",
 				"ts-loader": "^9.5.2",
 				"tslib": "2.8.1",
-				"tsx": "^4.20.5",
+				"tsx": "^4.20.6",
 				"typescript": "5.8.3",
 				"uuid": "^13.0.0",
 				"webpack": "^5.99.9",
@@ -4725,7 +4725,7 @@
 				"sync-client": "file:../sync-client",
 				"ts-loader": "^9.5.2",
 				"tslib": "2.8.1",
-				"tsx": "^4.20.5",
+				"tsx": "^4.20.6",
 				"typescript": "5.8.3",
 				"uuid": "^13.0.0",
 				"webpack": "^5.99.9",
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index 4873fe4b..c664f478 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -21,7 +21,7 @@
         "@types/node": "^24.8.1",
         "ts-loader": "^9.5.2",
         "tslib": "2.8.1",
-        "tsx": "^4.20.5",
+        "tsx": "^4.20.6",
         "typescript": "5.8.3",
         "webpack": "^5.99.9",
         "webpack-cli": "^6.0.1",
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index 116b1aca..de76a48c 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -15,7 +15,7 @@
 		"sync-client": "file:../sync-client",
 		"ts-loader": "^9.5.2",
 		"tslib": "2.8.1",
-		"tsx": "^4.20.5",
+		"tsx": "^4.20.6",
 		"typescript": "5.8.3",
 		"uuid": "^13.0.0",
 		"webpack": "^5.99.9",

From 8ef2f8c132089f82e621716ac483d770c65f2bfd Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Tue, 2 Dec 2025 21:36:04 +0000
Subject: [PATCH 701/761] Escape vault name

---
 .../sync-client/src/services/sync-service.ts  | 32 +++++++++----------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/frontend/sync-client/src/services/sync-service.ts b/frontend/sync-client/src/services/sync-service.ts
index ba047b5e..11c22207 100644
--- a/frontend/sync-client/src/services/sync-service.ts
+++ b/frontend/sync-client/src/services/sync-service.ts
@@ -78,8 +78,8 @@ export class SyncService {
 
 			const result: SerializedError | DocumentVersionWithoutContent =
 				(await response.json()) as  // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
-					| SerializedError
-					| DocumentVersionWithoutContent;
+				| SerializedError
+				| DocumentVersionWithoutContent;
 
 			if ("errorType" in result) {
 				throw new Error(
@@ -88,8 +88,7 @@ export class SyncService {
 			}
 
 			this.logger.debug(
-				`Created document ${JSON.stringify(result)} with id ${
-					result.documentId
+				`Created document ${JSON.stringify(result)} with id ${result.documentId
 				}`
 			);
 
@@ -130,8 +129,8 @@ export class SyncService {
 
 			const result: SerializedError | DocumentUpdateResponse =
 				(await response.json()) as  // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
-					| SerializedError
-					| DocumentUpdateResponse;
+				| SerializedError
+				| DocumentUpdateResponse;
 
 			if ("errorType" in result) {
 				throw new Error(
@@ -140,8 +139,7 @@ export class SyncService {
 			}
 
 			this.logger.debug(
-				`Updated document ${JSON.stringify(result)} with id ${
-					result.documentId
+				`Updated document ${JSON.stringify(result)} with id ${result.documentId
 				}}`
 			);
 
@@ -183,8 +181,8 @@ export class SyncService {
 
 			const result: SerializedError | DocumentUpdateResponse =
 				(await response.json()) as  // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
-					| SerializedError
-					| DocumentUpdateResponse;
+				| SerializedError
+				| DocumentUpdateResponse;
 
 			if ("errorType" in result) {
 				throw new Error(
@@ -193,8 +191,7 @@ export class SyncService {
 			}
 
 			this.logger.debug(
-				`Updated document ${JSON.stringify(result)} with id ${
-					result.documentId
+				`Updated document ${JSON.stringify(result)} with id ${result.documentId
 				}}`
 			);
 
@@ -224,8 +221,8 @@ export class SyncService {
 
 			const result: SerializedError | DocumentVersionWithoutContent =
 				(await response.json()) as  // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
-					| SerializedError
-					| DocumentVersionWithoutContent;
+				| SerializedError
+				| DocumentVersionWithoutContent;
 
 			if ("errorType" in result) {
 				throw new Error(
@@ -285,8 +282,8 @@ export class SyncService {
 
 			const result: SerializedError | FetchLatestDocumentsResponse =
 				(await response.json()) as  // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
-					| SerializedError
-					| FetchLatestDocumentsResponse;
+				| SerializedError
+				| FetchLatestDocumentsResponse;
 
 			if ("errorType" in result) {
 				throw new Error(
@@ -325,7 +322,8 @@ export class SyncService {
 	private getUrl(path: string): string {
 		const { vaultName, remoteUri } = this.settings.getSettings();
 		const remoteUriWithoutTrailingSlash = remoteUri.replace(/\/+$/, "");
-		return `${remoteUriWithoutTrailingSlash}/vaults/${vaultName}${path}`;
+		const encodedVaultName = encodeURIComponent(vaultName.trim());
+		return `${remoteUriWithoutTrailingSlash}/vaults/${encodedVaultName}${path}`;
 	}
 
 	private getDefaultHeaders(

From 2607bc5213ada7bad62dc539dec35f57ba1365cd Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Wed, 3 Dec 2025 23:18:13 +0000
Subject: [PATCH 702/761] Run E2E more often

---
 .github/workflows/e2e.yml | 4 ++--
 README.md                 | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 0ec25803..b413bbf2 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -6,7 +6,7 @@ on:
   pull_request:
     branches: ["main"]
   schedule:
-    - cron: '0 */4 * * *'
+    - cron: '0 * * * *'
 
 concurrency:
   group: e2e-tests
@@ -48,4 +48,4 @@ jobs:
           cargo run config-e2e.yml --color never &
           cd ..
 
-          scripts/e2e.sh 8
+          scripts/e2e.sh 16
diff --git a/README.md b/README.md
index 77f1f9ad..f5da9b61 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,8 @@
 
 [![Check](https://github.com/schmelczer/vault-link/actions/workflows/check.yml/badge.svg)](https://github.com/schmelczer/vault-link/actions/workflows/check.yml)
 [![E2E tests](https://github.com/schmelczer/vault-link/actions/workflows/e2e.yml/badge.svg)](https://github.com/schmelczer/vault-link/actions/workflows/e2e.yml)
-[![Publish server Docker image](https://github.com/schmelczer/vault-link/actions/workflows/publish-docker.yml/badge.svg)](https://github.com/schmelczer/vault-link/actions/workflows/publish-docker.yml)
+[![Publish server Docker image](https://github.com/schmelczer/vault-link/actions/workflows/publish-server-docker.yml/badge.svg)](https://github.com/schmelczer/vault-link/actions/workflows/publish-server-docker.yml)
+[![Publish CLI](https://github.com/schmelczer/vault-link/actions/workflows/publish-cli-docker.yml/badge.svg)](https://github.com/schmelczer/vault-link/actions/workflows/publish-cli-docker.yml)
 [![Publish Obsidian plugin](https://github.com/schmelczer/vault-link/actions/workflows/publish-plugin.yml/badge.svg)](https://github.com/schmelczer/vault-link/actions/workflows/publish-plugin.yml)
 
 ## Develop
@@ -18,7 +19,7 @@
 
 - Install [`rustup`](https://rustup.rs): `curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh`
 - Install [`wasm-pack`](https://rustwasm.github.io/wasm-pack/installer): `curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh`
-- `cargo install cargo-insta sqlx-cli cargo-edit`
+- `cargo install cargo-insta sqlx-cli`
 
 ### Install Obsidian on Linux
 
@@ -34,7 +35,7 @@ flatpak run md.obsidian.Obsidian
 Start the server:
 
 ```sh
-cargo install sqlx-cli cargo-machete cargo-edit
+cargo install sqlx-cli
 cd sync-server
 cargo run config-e2e.yml
 ```
@@ -68,7 +69,7 @@ scripts/bump-version.sh patch
 #### Run E2E tests
 
 ```sh
-scripts/e2e.sh
+scripts/e2e.sh 8
 ```
 
 And to clean up the logs & database files, run `scripts/clean-up.sh`

From 564d4a6c370eea7025d72586fdcf04ba1586e036 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Wed, 3 Dec 2025 23:24:53 +0000
Subject: [PATCH 703/761] Lint

---
 .../sync-client/src/services/sync-service.ts  | 29 ++++++++++---------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/frontend/sync-client/src/services/sync-service.ts b/frontend/sync-client/src/services/sync-service.ts
index 11c22207..d87b85f7 100644
--- a/frontend/sync-client/src/services/sync-service.ts
+++ b/frontend/sync-client/src/services/sync-service.ts
@@ -78,8 +78,8 @@ export class SyncService {
 
 			const result: SerializedError | DocumentVersionWithoutContent =
 				(await response.json()) as  // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
-				| SerializedError
-				| DocumentVersionWithoutContent;
+					| SerializedError
+					| DocumentVersionWithoutContent;
 
 			if ("errorType" in result) {
 				throw new Error(
@@ -88,7 +88,8 @@ export class SyncService {
 			}
 
 			this.logger.debug(
-				`Created document ${JSON.stringify(result)} with id ${result.documentId
+				`Created document ${JSON.stringify(result)} with id ${
+					result.documentId
 				}`
 			);
 
@@ -129,8 +130,8 @@ export class SyncService {
 
 			const result: SerializedError | DocumentUpdateResponse =
 				(await response.json()) as  // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
-				| SerializedError
-				| DocumentUpdateResponse;
+					| SerializedError
+					| DocumentUpdateResponse;
 
 			if ("errorType" in result) {
 				throw new Error(
@@ -139,7 +140,8 @@ export class SyncService {
 			}
 
 			this.logger.debug(
-				`Updated document ${JSON.stringify(result)} with id ${result.documentId
+				`Updated document ${JSON.stringify(result)} with id ${
+					result.documentId
 				}}`
 			);
 
@@ -181,8 +183,8 @@ export class SyncService {
 
 			const result: SerializedError | DocumentUpdateResponse =
 				(await response.json()) as  // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
-				| SerializedError
-				| DocumentUpdateResponse;
+					| SerializedError
+					| DocumentUpdateResponse;
 
 			if ("errorType" in result) {
 				throw new Error(
@@ -191,7 +193,8 @@ export class SyncService {
 			}
 
 			this.logger.debug(
-				`Updated document ${JSON.stringify(result)} with id ${result.documentId
+				`Updated document ${JSON.stringify(result)} with id ${
+					result.documentId
 				}}`
 			);
 
@@ -221,8 +224,8 @@ export class SyncService {
 
 			const result: SerializedError | DocumentVersionWithoutContent =
 				(await response.json()) as  // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
-				| SerializedError
-				| DocumentVersionWithoutContent;
+					| SerializedError
+					| DocumentVersionWithoutContent;
 
 			if ("errorType" in result) {
 				throw new Error(
@@ -282,8 +285,8 @@ export class SyncService {
 
 			const result: SerializedError | FetchLatestDocumentsResponse =
 				(await response.json()) as  // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
-				| SerializedError
-				| FetchLatestDocumentsResponse;
+					| SerializedError
+					| FetchLatestDocumentsResponse;
 
 			if ("errorType" in result) {
 				throw new Error(

From 8adb8841ef37ff5de90beb4203151d6f50850748 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 5 Dec 2025 21:42:34 +0000
Subject: [PATCH 704/761] Investigate dead-lock

---
 .github/workflows/e2e.yml                     |  4 +++
 frontend/test-client/src/agent/mock-agent.ts  | 33 ++++++++++++++-----
 frontend/test-client/src/cli.ts               |  2 ++
 .../test-client/src/utils/with-timeout.ts     | 23 +++++++++++++
 scripts/e2e.sh                                | 18 ++++++++--
 5 files changed, 69 insertions(+), 11 deletions(-)
 create mode 100644 frontend/test-client/src/utils/with-timeout.ts

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index b413bbf2..1e3b7b41 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -49,3 +49,7 @@ jobs:
           cd ..
 
           scripts/e2e.sh 16
+
+      - name: Cleanup
+        if: always()
+        run: scripts/clean-up.sh
diff --git a/frontend/test-client/src/agent/mock-agent.ts b/frontend/test-client/src/agent/mock-agent.ts
index 42d9490d..97089308 100644
--- a/frontend/test-client/src/agent/mock-agent.ts
+++ b/frontend/test-client/src/agent/mock-agent.ts
@@ -5,7 +5,10 @@ import type { RelativePath, SyncSettings } from "sync-client";
 import { debugging, Logger, LogLevel } from "sync-client";
 import { MockClient } from "./mock-client";
 import { sleep } from "../utils/sleep";
-import type { LogLine } from "sync-client/dist/types/tracing/logger";
+import type { LogLine } from "sync-client";
+import { withTimeout } from "../utils/with-timeout";
+
+const TIMEOUT_MS = 10 * 60 * 1000;
 
 export class MockAgent extends MockClient {
 	private readonly writtenContents: string[] = [];
@@ -134,15 +137,27 @@ export class MockAgent extends MockClient {
 	}
 
 	public async finish(): Promise<void> {
-		await this.client.setSetting("isSyncEnabled", true);
-		// eslint-disable-next-line no-restricted-properties
-		await Promise.all(this.pendingActions);
-		await this.client.waitUntilFinished();
+		await withTimeout(
+			(async (): Promise<void> => {
+				await this.client.setSetting("isSyncEnabled", true);
+				// eslint-disable-next-line no-restricted-properties
+				await Promise.all(this.pendingActions);
+				await this.client.waitUntilFinished();
+			})(),
+			TIMEOUT_MS,
+			"finish()"
+		);
 	}
 
 	public async destroy(): Promise<void> {
-		await this.client.waitUntilFinished();
-		await this.client.destroy();
+		await withTimeout(
+			(async (): Promise<void> => {
+				await this.client.waitUntilFinished();
+				await this.client.destroy();
+			})(),
+			TIMEOUT_MS,
+			"destroy()"
+		);
 	}
 
 	public assertFileSystemsAreConsistent(otherAgent: MockAgent): void {
@@ -184,14 +199,14 @@ export class MockAgent extends MockClient {
 			);
 			this.client.logger.info(
 				"Local files: " +
-					Array.from(otherAgent.localFiles.keys()).join(", ")
+				Array.from(otherAgent.localFiles.keys()).join(", ")
 			);
 			otherAgent.client.logger.info(
 				"Local data: " + JSON.stringify(otherAgent.data, null, 2)
 			);
 			otherAgent.client.logger.info(
 				"Local files: " +
-					Array.from(otherAgent.localFiles.keys()).join(", ")
+				Array.from(otherAgent.localFiles.keys()).join(", ")
 			);
 
 			throw e;
diff --git a/frontend/test-client/src/cli.ts b/frontend/test-client/src/cli.ts
index 531cf102..60eb3386 100644
--- a/frontend/test-client/src/cli.ts
+++ b/frontend/test-client/src/cli.ts
@@ -71,6 +71,7 @@ async function runTest({
 		// Each agent can have unpushed changes which might conflict with eachother so each has to resolve the conflicts & push, and
 		for (const client of clients) {
 			try {
+				console.info(`Finishing up ${client.name}`);
 				await client.finish();
 			} catch (err) {
 				if (!slowFileEvents) {
@@ -82,6 +83,7 @@ async function runTest({
 		// then we need a second pass to ensure that all agents pull the same state.
 		for (const client of clients) {
 			try {
+				console.info(`Destroying ${client.name}`);
 				await client.destroy();
 			} catch (err) {
 				if (!slowFileEvents) {
diff --git a/frontend/test-client/src/utils/with-timeout.ts b/frontend/test-client/src/utils/with-timeout.ts
new file mode 100644
index 00000000..d87f9131
--- /dev/null
+++ b/frontend/test-client/src/utils/with-timeout.ts
@@ -0,0 +1,23 @@
+
+export async function withTimeout<T>(
+	promise: Promise<T>,
+	timeoutMs: number,
+	operationName: string
+): Promise<T> {
+	return Promise.race([
+		promise,
+		new Promise<T>((_, reject) =>
+			setTimeout(
+				() =>
+					{ reject(
+						new Error(
+							`${operationName} timed out after ${timeoutMs}ms`
+						)
+					); },
+				timeoutMs
+			)
+		)
+	]);
+}
+
+
diff --git a/scripts/e2e.sh b/scripts/e2e.sh
index 952e1855..93f6c3a4 100755
--- a/scripts/e2e.sh
+++ b/scripts/e2e.sh
@@ -3,6 +3,9 @@
 set -e
 set -o pipefail
 
+NO_COLOR=1
+FORCE_COLOR=0
+
 node_version=$(node -v | sed 's/^v\([0-9]*\).*/\1/')
 if [ "$node_version" != "22" ]; then
     echo "Error: This script requires Node.js version 22, found: $node_version"
@@ -37,8 +40,18 @@ cd frontend
 
 pids=()
 for i in $(seq 1 $process_count); do
-    node test-client/dist/cli.js > "../logs/log_${i}.log" 2>&1 &
-    pids+=($!)
+    # Create a named pipe for this process
+    pipe="/tmp/vaultlink_pipe_$$_$i"
+    mkfifo "$pipe"
+
+    # Start the node process writing to the pipe
+    node test-client/dist/cli.js > "$pipe" 2>&1 &
+    pid=$!
+    pids+=($pid)
+    echo "Started process $i with PID: $pid"
+
+    # Read from pipe, prefix with PID, and write to log file
+    (sed "s/^/[PID $pid] /" < "$pipe" > "../logs/log_${i}.log"; rm "$pipe") &
 done
 
 cd ..
@@ -52,6 +65,7 @@ print_failed_log() {
 
             # Only consider non-zero exit codes as failures
             if [ $exit_code -ne 0 ]; then
+                echo "----- Log for process ${pids[$i-1]} (log_${i}.log) -----"
                 cat "$(pwd)/logs/log_${i}.log"
                 echo "Process ${pids[$i-1]} failed with exit code $exit_code. Log file: $(pwd)/logs/log_${i}.log"
                 return 0

From a5e128efcd0246f9ba91bd50a910c6a60ec707be Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 5 Dec 2025 21:48:35 +0000
Subject: [PATCH 705/761] Lint

---
 frontend/test-client/src/agent/mock-agent.ts   |  4 ++--
 frontend/test-client/src/utils/with-timeout.ts | 17 +++++------------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/frontend/test-client/src/agent/mock-agent.ts b/frontend/test-client/src/agent/mock-agent.ts
index 97089308..c1ff527b 100644
--- a/frontend/test-client/src/agent/mock-agent.ts
+++ b/frontend/test-client/src/agent/mock-agent.ts
@@ -199,14 +199,14 @@ export class MockAgent extends MockClient {
 			);
 			this.client.logger.info(
 				"Local files: " +
-				Array.from(otherAgent.localFiles.keys()).join(", ")
+					Array.from(otherAgent.localFiles.keys()).join(", ")
 			);
 			otherAgent.client.logger.info(
 				"Local data: " + JSON.stringify(otherAgent.data, null, 2)
 			);
 			otherAgent.client.logger.info(
 				"Local files: " +
-				Array.from(otherAgent.localFiles.keys()).join(", ")
+					Array.from(otherAgent.localFiles.keys()).join(", ")
 			);
 
 			throw e;
diff --git a/frontend/test-client/src/utils/with-timeout.ts b/frontend/test-client/src/utils/with-timeout.ts
index d87f9131..7d20dc18 100644
--- a/frontend/test-client/src/utils/with-timeout.ts
+++ b/frontend/test-client/src/utils/with-timeout.ts
@@ -1,4 +1,3 @@
-
 export async function withTimeout<T>(
 	promise: Promise<T>,
 	timeoutMs: number,
@@ -7,17 +6,11 @@ export async function withTimeout<T>(
 	return Promise.race([
 		promise,
 		new Promise<T>((_, reject) =>
-			setTimeout(
-				() =>
-					{ reject(
-						new Error(
-							`${operationName} timed out after ${timeoutMs}ms`
-						)
-					); },
-				timeoutMs
-			)
+			setTimeout(() => {
+				reject(
+					new Error(`${operationName} timed out after ${timeoutMs}ms`)
+				);
+			}, timeoutMs)
 		)
 	]);
 }
-
-

From e8d86c737b637802dcde20a9e9bfdf41a4c0d766 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 5 Dec 2025 22:29:46 +0000
Subject: [PATCH 706/761] More logs

---
 .../sync-client/src/services/sync-service.ts  | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/frontend/sync-client/src/services/sync-service.ts b/frontend/sync-client/src/services/sync-service.ts
index d87b85f7..bbaaa8a6 100644
--- a/frontend/sync-client/src/services/sync-service.ts
+++ b/frontend/sync-client/src/services/sync-service.ts
@@ -70,6 +70,10 @@ export class SyncService {
 				new Blob([new Uint8Array(contentBytes)])
 			);
 
+			this.logger.debug(
+				`Creating document with id ${documentId} and relative path ${relativePath}`
+			);
+
 			const response = await this.client(this.getUrl("/documents"), {
 				method: "POST",
 				body: formData,
@@ -110,7 +114,7 @@ export class SyncService {
 	}): Promise<DocumentUpdateResponse> {
 		return this.retryForever(async () => {
 			this.logger.debug(
-				`Updating text document ${documentId} with parent version ${parentVersionId} and relative path ${relativePath}`
+				`Updating text document ${documentId} with parent version ${parentVersionId} and relative path ${relativePath}, content [${content.join(", ")}]`
 			);
 
 			const request: UpdateTextDocumentVersion = {
@@ -213,6 +217,11 @@ export class SyncService {
 			const request: DeleteDocumentVersion = {
 				relativePath
 			};
+
+			this.logger.debug(
+				`Delete document with id ${documentId} and relative path ${relativePath}`
+			);
+
 			const response = await this.client(
 				this.getUrl(`/documents/${documentId}`),
 				{
@@ -247,6 +256,8 @@ export class SyncService {
 		documentId: DocumentId;
 	}): Promise<DocumentVersion> {
 		return this.retryForever(async () => {
+			this.logger.debug(`Getting document with id ${documentId}`);
+
 			const response = await this.client(
 				this.getUrl(`/documents/${documentId}`),
 				{
@@ -275,6 +286,11 @@ export class SyncService {
 		since?: VaultUpdateId
 	): Promise<FetchLatestDocumentsResponse> {
 		return this.retryForever(async () => {
+			this.logger.debug(
+				"Getting all documents" +
+					(since != null ? ` since ${since}` : "")
+			);
+
 			const url = new URL(this.getUrl("/documents"));
 			if (since !== undefined) {
 				url.searchParams.append("since", since.toString());
@@ -303,6 +319,7 @@ export class SyncService {
 	}
 
 	public async ping(): Promise<PingResponse> {
+		this.logger.debug("Pinging server");
 		const response = await this.pingClient(this.getUrl("/ping"), {
 			headers: this.getDefaultHeaders()
 		});

From 77e0bb4caffb42d863e38ca2a8497183efd498f4 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 5 Dec 2025 22:33:33 +0000
Subject: [PATCH 707/761] Await all

---
 frontend/sync-client/src/index.ts            | 4 +++-
 frontend/test-client/src/agent/mock-agent.ts | 5 ++---
 frontend/test-client/src/cli.ts              | 9 ++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/frontend/sync-client/src/index.ts b/frontend/sync-client/src/index.ts
index f09d339c..a7292ec2 100644
--- a/frontend/sync-client/src/index.ts
+++ b/frontend/sync-client/src/index.ts
@@ -1,3 +1,4 @@
+import { awaitAll } from "./utils/await-all";
 import { logToConsole } from "./utils/debugging/log-to-console";
 import { slowFetchFactory } from "./utils/debugging/slow-fetch-factory";
 import { slowWebSocketFactory } from "./utils/debugging/slow-web-socket-factory";
@@ -41,5 +42,6 @@ export const debugging = {
 export const utils = {
 	getRandomColor,
 	positionToLineAndColumn,
-	lineAndColumnToPosition
+	lineAndColumnToPosition,
+	awaitAll
 };
diff --git a/frontend/test-client/src/agent/mock-agent.ts b/frontend/test-client/src/agent/mock-agent.ts
index c1ff527b..ac525685 100644
--- a/frontend/test-client/src/agent/mock-agent.ts
+++ b/frontend/test-client/src/agent/mock-agent.ts
@@ -2,7 +2,7 @@ import { choose } from "../utils/choose";
 import { v4 as uuidv4 } from "uuid";
 import { assert } from "../utils/assert";
 import type { RelativePath, SyncSettings } from "sync-client";
-import { debugging, Logger, LogLevel } from "sync-client";
+import { debugging, Logger, LogLevel, utils } from "sync-client";
 import { MockClient } from "./mock-client";
 import { sleep } from "../utils/sleep";
 import type { LogLine } from "sync-client";
@@ -140,8 +140,7 @@ export class MockAgent extends MockClient {
 		await withTimeout(
 			(async (): Promise<void> => {
 				await this.client.setSetting("isSyncEnabled", true);
-				// eslint-disable-next-line no-restricted-properties
-				await Promise.all(this.pendingActions);
+				await utils.awaitAll(this.pendingActions);
 				await this.client.waitUntilFinished();
 			})(),
 			TIMEOUT_MS,
diff --git a/frontend/test-client/src/cli.ts b/frontend/test-client/src/cli.ts
index 60eb3386..08dbf472 100644
--- a/frontend/test-client/src/cli.ts
+++ b/frontend/test-client/src/cli.ts
@@ -1,4 +1,5 @@
 import type { SyncSettings } from "sync-client";
+import { utils } from "sync-client";
 import { MockAgent } from "./agent/mock-agent";
 import { sleep } from "./utils/sleep";
 import { v4 as uuidv4 } from "uuid";
@@ -56,14 +57,12 @@ async function runTest({
 	}
 
 	try {
-		// eslint-disable-next-line no-restricted-properties
-		await Promise.all(clients.map(async (client) => client.init()));
+		await utils.awaitAll(clients.map(async (client) => client.init()));
 
 		for (let i = 0; i < iterations; i++) {
 			console.info(`Iteration ${i + 1}/${iterations}`);
-			// eslint-disable-next-line no-restricted-properties
-			await Promise.all(clients.map(async (client) => client.act()));
-			await sleep(100);
+			await utils.awaitAll(clients.map(async (client) => client.act()));
+			await sleep(Math.random() * 200);
 		}
 
 		console.info("Stopping agents");

From 7a13cb57cebd0ab83917252af296cc8ef190b2e4 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 5 Dec 2025 22:34:14 +0000
Subject: [PATCH 708/761] Investigate deadlock (#178)

---
 .github/workflows/e2e.yml                     |  4 +++
 frontend/sync-client/src/index.ts             |  4 ++-
 .../sync-client/src/services/sync-service.ts  | 19 +++++++++++-
 frontend/test-client/src/agent/mock-agent.ts  | 30 ++++++++++++++-----
 frontend/test-client/src/cli.ts               | 11 +++----
 .../test-client/src/utils/with-timeout.ts     | 16 ++++++++++
 scripts/e2e.sh                                | 18 +++++++++--
 7 files changed, 85 insertions(+), 17 deletions(-)
 create mode 100644 frontend/test-client/src/utils/with-timeout.ts

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index b413bbf2..1e3b7b41 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -49,3 +49,7 @@ jobs:
           cd ..
 
           scripts/e2e.sh 16
+
+      - name: Cleanup
+        if: always()
+        run: scripts/clean-up.sh
diff --git a/frontend/sync-client/src/index.ts b/frontend/sync-client/src/index.ts
index f09d339c..a7292ec2 100644
--- a/frontend/sync-client/src/index.ts
+++ b/frontend/sync-client/src/index.ts
@@ -1,3 +1,4 @@
+import { awaitAll } from "./utils/await-all";
 import { logToConsole } from "./utils/debugging/log-to-console";
 import { slowFetchFactory } from "./utils/debugging/slow-fetch-factory";
 import { slowWebSocketFactory } from "./utils/debugging/slow-web-socket-factory";
@@ -41,5 +42,6 @@ export const debugging = {
 export const utils = {
 	getRandomColor,
 	positionToLineAndColumn,
-	lineAndColumnToPosition
+	lineAndColumnToPosition,
+	awaitAll
 };
diff --git a/frontend/sync-client/src/services/sync-service.ts b/frontend/sync-client/src/services/sync-service.ts
index d87b85f7..bbaaa8a6 100644
--- a/frontend/sync-client/src/services/sync-service.ts
+++ b/frontend/sync-client/src/services/sync-service.ts
@@ -70,6 +70,10 @@ export class SyncService {
 				new Blob([new Uint8Array(contentBytes)])
 			);
 
+			this.logger.debug(
+				`Creating document with id ${documentId} and relative path ${relativePath}`
+			);
+
 			const response = await this.client(this.getUrl("/documents"), {
 				method: "POST",
 				body: formData,
@@ -110,7 +114,7 @@ export class SyncService {
 	}): Promise<DocumentUpdateResponse> {
 		return this.retryForever(async () => {
 			this.logger.debug(
-				`Updating text document ${documentId} with parent version ${parentVersionId} and relative path ${relativePath}`
+				`Updating text document ${documentId} with parent version ${parentVersionId} and relative path ${relativePath}, content [${content.join(", ")}]`
 			);
 
 			const request: UpdateTextDocumentVersion = {
@@ -213,6 +217,11 @@ export class SyncService {
 			const request: DeleteDocumentVersion = {
 				relativePath
 			};
+
+			this.logger.debug(
+				`Delete document with id ${documentId} and relative path ${relativePath}`
+			);
+
 			const response = await this.client(
 				this.getUrl(`/documents/${documentId}`),
 				{
@@ -247,6 +256,8 @@ export class SyncService {
 		documentId: DocumentId;
 	}): Promise<DocumentVersion> {
 		return this.retryForever(async () => {
+			this.logger.debug(`Getting document with id ${documentId}`);
+
 			const response = await this.client(
 				this.getUrl(`/documents/${documentId}`),
 				{
@@ -275,6 +286,11 @@ export class SyncService {
 		since?: VaultUpdateId
 	): Promise<FetchLatestDocumentsResponse> {
 		return this.retryForever(async () => {
+			this.logger.debug(
+				"Getting all documents" +
+					(since != null ? ` since ${since}` : "")
+			);
+
 			const url = new URL(this.getUrl("/documents"));
 			if (since !== undefined) {
 				url.searchParams.append("since", since.toString());
@@ -303,6 +319,7 @@ export class SyncService {
 	}
 
 	public async ping(): Promise<PingResponse> {
+		this.logger.debug("Pinging server");
 		const response = await this.pingClient(this.getUrl("/ping"), {
 			headers: this.getDefaultHeaders()
 		});
diff --git a/frontend/test-client/src/agent/mock-agent.ts b/frontend/test-client/src/agent/mock-agent.ts
index 42d9490d..ac525685 100644
--- a/frontend/test-client/src/agent/mock-agent.ts
+++ b/frontend/test-client/src/agent/mock-agent.ts
@@ -2,10 +2,13 @@ import { choose } from "../utils/choose";
 import { v4 as uuidv4 } from "uuid";
 import { assert } from "../utils/assert";
 import type { RelativePath, SyncSettings } from "sync-client";
-import { debugging, Logger, LogLevel } from "sync-client";
+import { debugging, Logger, LogLevel, utils } from "sync-client";
 import { MockClient } from "./mock-client";
 import { sleep } from "../utils/sleep";
-import type { LogLine } from "sync-client/dist/types/tracing/logger";
+import type { LogLine } from "sync-client";
+import { withTimeout } from "../utils/with-timeout";
+
+const TIMEOUT_MS = 10 * 60 * 1000;
 
 export class MockAgent extends MockClient {
 	private readonly writtenContents: string[] = [];
@@ -134,15 +137,26 @@ export class MockAgent extends MockClient {
 	}
 
 	public async finish(): Promise<void> {
-		await this.client.setSetting("isSyncEnabled", true);
-		// eslint-disable-next-line no-restricted-properties
-		await Promise.all(this.pendingActions);
-		await this.client.waitUntilFinished();
+		await withTimeout(
+			(async (): Promise<void> => {
+				await this.client.setSetting("isSyncEnabled", true);
+				await utils.awaitAll(this.pendingActions);
+				await this.client.waitUntilFinished();
+			})(),
+			TIMEOUT_MS,
+			"finish()"
+		);
 	}
 
 	public async destroy(): Promise<void> {
-		await this.client.waitUntilFinished();
-		await this.client.destroy();
+		await withTimeout(
+			(async (): Promise<void> => {
+				await this.client.waitUntilFinished();
+				await this.client.destroy();
+			})(),
+			TIMEOUT_MS,
+			"destroy()"
+		);
 	}
 
 	public assertFileSystemsAreConsistent(otherAgent: MockAgent): void {
diff --git a/frontend/test-client/src/cli.ts b/frontend/test-client/src/cli.ts
index 531cf102..08dbf472 100644
--- a/frontend/test-client/src/cli.ts
+++ b/frontend/test-client/src/cli.ts
@@ -1,4 +1,5 @@
 import type { SyncSettings } from "sync-client";
+import { utils } from "sync-client";
 import { MockAgent } from "./agent/mock-agent";
 import { sleep } from "./utils/sleep";
 import { v4 as uuidv4 } from "uuid";
@@ -56,14 +57,12 @@ async function runTest({
 	}
 
 	try {
-		// eslint-disable-next-line no-restricted-properties
-		await Promise.all(clients.map(async (client) => client.init()));
+		await utils.awaitAll(clients.map(async (client) => client.init()));
 
 		for (let i = 0; i < iterations; i++) {
 			console.info(`Iteration ${i + 1}/${iterations}`);
-			// eslint-disable-next-line no-restricted-properties
-			await Promise.all(clients.map(async (client) => client.act()));
-			await sleep(100);
+			await utils.awaitAll(clients.map(async (client) => client.act()));
+			await sleep(Math.random() * 200);
 		}
 
 		console.info("Stopping agents");
@@ -71,6 +70,7 @@ async function runTest({
 		// Each agent can have unpushed changes which might conflict with eachother so each has to resolve the conflicts & push, and
 		for (const client of clients) {
 			try {
+				console.info(`Finishing up ${client.name}`);
 				await client.finish();
 			} catch (err) {
 				if (!slowFileEvents) {
@@ -82,6 +82,7 @@ async function runTest({
 		// then we need a second pass to ensure that all agents pull the same state.
 		for (const client of clients) {
 			try {
+				console.info(`Destroying ${client.name}`);
 				await client.destroy();
 			} catch (err) {
 				if (!slowFileEvents) {
diff --git a/frontend/test-client/src/utils/with-timeout.ts b/frontend/test-client/src/utils/with-timeout.ts
new file mode 100644
index 00000000..7d20dc18
--- /dev/null
+++ b/frontend/test-client/src/utils/with-timeout.ts
@@ -0,0 +1,16 @@
+export async function withTimeout<T>(
+	promise: Promise<T>,
+	timeoutMs: number,
+	operationName: string
+): Promise<T> {
+	return Promise.race([
+		promise,
+		new Promise<T>((_, reject) =>
+			setTimeout(() => {
+				reject(
+					new Error(`${operationName} timed out after ${timeoutMs}ms`)
+				);
+			}, timeoutMs)
+		)
+	]);
+}
diff --git a/scripts/e2e.sh b/scripts/e2e.sh
index 952e1855..93f6c3a4 100755
--- a/scripts/e2e.sh
+++ b/scripts/e2e.sh
@@ -3,6 +3,9 @@
 set -e
 set -o pipefail
 
+NO_COLOR=1
+FORCE_COLOR=0
+
 node_version=$(node -v | sed 's/^v\([0-9]*\).*/\1/')
 if [ "$node_version" != "22" ]; then
     echo "Error: This script requires Node.js version 22, found: $node_version"
@@ -37,8 +40,18 @@ cd frontend
 
 pids=()
 for i in $(seq 1 $process_count); do
-    node test-client/dist/cli.js > "../logs/log_${i}.log" 2>&1 &
-    pids+=($!)
+    # Create a named pipe for this process
+    pipe="/tmp/vaultlink_pipe_$$_$i"
+    mkfifo "$pipe"
+
+    # Start the node process writing to the pipe
+    node test-client/dist/cli.js > "$pipe" 2>&1 &
+    pid=$!
+    pids+=($pid)
+    echo "Started process $i with PID: $pid"
+
+    # Read from pipe, prefix with PID, and write to log file
+    (sed "s/^/[PID $pid] /" < "$pipe" > "../logs/log_${i}.log"; rm "$pipe") &
 done
 
 cd ..
@@ -52,6 +65,7 @@ print_failed_log() {
 
             # Only consider non-zero exit codes as failures
             if [ $exit_code -ne 0 ]; then
+                echo "----- Log for process ${pids[$i-1]} (log_${i}.log) -----"
                 cat "$(pwd)/logs/log_${i}.log"
                 echo "Process ${pids[$i-1]} failed with exit code $exit_code. Log file: $(pwd)/logs/log_${i}.log"
                 return 0

From 1646f74633aa1265de334badbe2082507520f9a6 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 6 Dec 2025 10:49:30 +0000
Subject: [PATCH 709/761] More frequent tests

---
 .github/workflows/e2e.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 1e3b7b41..aaffac3b 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -6,14 +6,13 @@ on:
   pull_request:
     branches: ["main"]
   schedule:
-    - cron: '0 * * * *'
+    - cron: '*/30 * * * *'
 
 concurrency:
   group: e2e-tests
   cancel-in-progress: false
 
 env:
-  CARGO_TERM_COLOR: always
   RUSTFLAGS: "-Dwarnings"
 
 jobs:

From 5238d85181386a3191b5838ff61888694b0041c4 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 6 Dec 2025 10:51:41 +0000
Subject: [PATCH 710/761] Print more details

---
 frontend/sync-client/src/services/sync-service.ts | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/frontend/sync-client/src/services/sync-service.ts b/frontend/sync-client/src/services/sync-service.ts
index bbaaa8a6..ee67630a 100644
--- a/frontend/sync-client/src/services/sync-service.ts
+++ b/frontend/sync-client/src/services/sync-service.ts
@@ -91,11 +91,7 @@ export class SyncService {
 				);
 			}
 
-			this.logger.debug(
-				`Created document ${JSON.stringify(result)} with id ${
-					result.documentId
-				}`
-			);
+			this.logger.debug(`Created document ${JSON.stringify(result)}`);
 
 			return result;
 		});
@@ -274,9 +270,7 @@ export class SyncService {
 				);
 			}
 
-			this.logger.debug(
-				`Get document ${result.relativePath} with id ${result.documentId}`
-			);
+			this.logger.debug(`Got document ${JSON.stringify(result)}`);
 
 			return result;
 		});

From a1bda416468378e1a4396b372213e184060f943b Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 6 Dec 2025 11:44:57 +0000
Subject: [PATCH 711/761] Always fetch the right document version content

---
 .../sync-client/src/services/sync-service.ts  | 38 +++++++++++++++++++
 .../sync-operations/unrestricted-syncer.ts    | 12 +++---
 2 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/frontend/sync-client/src/services/sync-service.ts b/frontend/sync-client/src/services/sync-service.ts
index ee67630a..7d031c2e 100644
--- a/frontend/sync-client/src/services/sync-service.ts
+++ b/frontend/sync-client/src/services/sync-service.ts
@@ -276,6 +276,44 @@ export class SyncService {
 		});
 	}
 
+	public async getDocumentVersionContent({
+		documentId,
+		vaultUpdateId
+	}: {
+		documentId: DocumentId;
+		vaultUpdateId: VaultUpdateId;
+	}): Promise<Uint8Array> {
+		return this.retryForever(async () => {
+			this.logger.debug(
+				`Getting document with id ${documentId} and version ${vaultUpdateId}`
+			);
+
+			const response = await this.client(
+				this.getUrl(
+					`/documents/${documentId}/versions/${vaultUpdateId}/content`
+				),
+				{
+					headers: this.getDefaultHeaders()
+				}
+			);
+
+			if (response.ok) {
+				const result = await response.bytes();
+				this.logger.debug(
+					`Got document version content for document ${documentId} version ${vaultUpdateId}`
+				);
+				return result;
+			}
+
+			const result: SerializedError =
+				(await response.json()) as SerializedError; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+
+			throw new Error(
+				`Failed to get document: ${SyncService.formatError(result)}`
+			);
+		});
+	}
+
 	public async getAll(
 		since?: VaultUpdateId
 	): Promise<FetchLatestDocumentsResponse> {
diff --git a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
index ebbb076f..53960ae9 100644
--- a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
+++ b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
@@ -413,11 +413,11 @@ export class UnrestrictedSyncer {
 				return;
 			}
 
-			const content = (
-				await this.syncService.get({
-					documentId: remoteVersion.documentId
-				})
-			).contentBase64;
+			const contentBytes =
+				await this.syncService.getDocumentVersionContent({
+					documentId: remoteVersion.documentId,
+					vaultUpdateId: remoteVersion.vaultUpdateId
+				});
 
 			// We're trying to create an entirely new document that didn't exist locally
 			document = this.database.getDocumentByDocumentId(
@@ -431,8 +431,6 @@ export class UnrestrictedSyncer {
 				return;
 			}
 
-			const contentBytes = base64ToBytes(content);
-
 			await this.operations.ensureClearPath(remoteVersion.relativePath);
 
 			const [promise, resolve] = createPromise();

From 66e2fb3768a1be3e9b8acdbbdd7e90bff8c9415d Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 6 Dec 2025 21:16:12 +0000
Subject: [PATCH 712/761] Fix docs publishing

---
 docs/.gitignore        |    2 -
 docs/package-lock.json | 2989 ++++++++++++++++++++++++++++++++++++++++
 docs/package.json      |   48 +-
 package-lock.json      |    6 -
 4 files changed, 3013 insertions(+), 32 deletions(-)
 create mode 100644 docs/package-lock.json
 delete mode 100644 package-lock.json

diff --git a/docs/.gitignore b/docs/.gitignore
index da61f8d6..9e337a15 100644
--- a/docs/.gitignore
+++ b/docs/.gitignore
@@ -1,4 +1,2 @@
-node_modules/
 .vitepress/dist/
 .vitepress/cache/
-package-lock.json
diff --git a/docs/package-lock.json b/docs/package-lock.json
new file mode 100644
index 00000000..ee287688
--- /dev/null
+++ b/docs/package-lock.json
@@ -0,0 +1,2989 @@
+{
+  "name": "docs",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "docs",
+      "version": "1.0.0",
+      "license": "ISC",
+      "devDependencies": {
+        "@cspell/dict-en-gb": "^5.0.19",
+        "cspell": "^9.3.2",
+        "prettier": "^3.6.2",
+        "vitepress": "^1.6.4",
+        "vue": "^3.5.24"
+      }
+    },
+    "node_modules/@algolia/abtesting": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/@algolia/abtesting/-/abtesting-1.10.0.tgz",
+      "integrity": "sha512-mQT3jwuTgX8QMoqbIR7mPlWkqQqBPQaPabQzm37xg2txMlaMogK/4hCiiESGdg39MlHZOVHeV+0VJuE7f5UK8A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@algolia/client-common": "5.44.0",
+        "@algolia/requester-browser-xhr": "5.44.0",
+        "@algolia/requester-fetch": "5.44.0",
+        "@algolia/requester-node-http": "5.44.0"
+      },
+      "engines": {
+        "node": ">= 14.0.0"
+      }
+    },
+    "node_modules/@algolia/autocomplete-core": {
+      "version": "1.17.7",
+      "resolved": "https://registry.npmjs.org/@algolia/autocomplete-core/-/autocomplete-core-1.17.7.tgz",
+      "integrity": "sha512-BjiPOW6ks90UKl7TwMv7oNQMnzU+t/wk9mgIDi6b1tXpUek7MW0lbNOUHpvam9pe3lVCf4xPFT+lK7s+e+fs7Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@algolia/autocomplete-plugin-algolia-insights": "1.17.7",
+        "@algolia/autocomplete-shared": "1.17.7"
+      }
+    },
+    "node_modules/@algolia/autocomplete-plugin-algolia-insights": {
+      "version": "1.17.7",
+      "resolved": "https://registry.npmjs.org/@algolia/autocomplete-plugin-algolia-insights/-/autocomplete-plugin-algolia-insights-1.17.7.tgz",
+      "integrity": "sha512-Jca5Ude6yUOuyzjnz57og7Et3aXjbwCSDf/8onLHSQgw1qW3ALl9mrMWaXb5FmPVkV3EtkD2F/+NkT6VHyPu9A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@algolia/autocomplete-shared": "1.17.7"
+      },
+      "peerDependencies": {
+        "search-insights": ">= 1 < 3"
+      }
+    },
+    "node_modules/@algolia/autocomplete-preset-algolia": {
+      "version": "1.17.7",
+      "resolved": "https://registry.npmjs.org/@algolia/autocomplete-preset-algolia/-/autocomplete-preset-algolia-1.17.7.tgz",
+      "integrity": "sha512-ggOQ950+nwbWROq2MOCIL71RE0DdQZsceqrg32UqnhDz8FlO9rL8ONHNsI2R1MH0tkgVIDKI/D0sMiUchsFdWA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@algolia/autocomplete-shared": "1.17.7"
+      },
+      "peerDependencies": {
+        "@algolia/client-search": ">= 4.9.1 < 6",
+        "algoliasearch": ">= 4.9.1 < 6"
+      }
+    },
+    "node_modules/@algolia/autocomplete-shared": {
+      "version": "1.17.7",
+      "resolved": "https://registry.npmjs.org/@algolia/autocomplete-shared/-/autocomplete-shared-1.17.7.tgz",
+      "integrity": "sha512-o/1Vurr42U/qskRSuhBH+VKxMvkkUVTLU6WZQr+L5lGZZLYWyhdzWjW0iGXY7EkwRTjBqvN2EsR81yCTGV/kmg==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "@algolia/client-search": ">= 4.9.1 < 6",
+        "algoliasearch": ">= 4.9.1 < 6"
+      }
+    },
+    "node_modules/@algolia/client-abtesting": {
+      "version": "5.44.0",
+      "resolved": "https://registry.npmjs.org/@algolia/client-abtesting/-/client-abtesting-5.44.0.tgz",
+      "integrity": "sha512-KY5CcrWhRTUo/lV7KcyjrZkPOOF9bjgWpMj9z98VA+sXzVpZtkuskBLCKsWYFp2sbwchZFTd3wJM48H0IGgF7g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@algolia/client-common": "5.44.0",
+        "@algolia/requester-browser-xhr": "5.44.0",
+        "@algolia/requester-fetch": "5.44.0",
+        "@algolia/requester-node-http": "5.44.0"
+      },
+      "engines": {
+        "node": ">= 14.0.0"
+      }
+    },
+    "node_modules/@algolia/client-analytics": {
+      "version": "5.44.0",
+      "resolved": "https://registry.npmjs.org/@algolia/client-analytics/-/client-analytics-5.44.0.tgz",
+      "integrity": "sha512-LKOCE8S4ewI9bN3ot9RZoYASPi8b78E918/DVPW3HHjCMUe6i+NjbNG6KotU4RpP6AhRWZjjswbOkWelUO+OoA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@algolia/client-common": "5.44.0",
+        "@algolia/requester-browser-xhr": "5.44.0",
+        "@algolia/requester-fetch": "5.44.0",
+        "@algolia/requester-node-http": "5.44.0"
+      },
+      "engines": {
+        "node": ">= 14.0.0"
+      }
+    },
+    "node_modules/@algolia/client-common": {
+      "version": "5.44.0",
+      "resolved": "https://registry.npmjs.org/@algolia/client-common/-/client-common-5.44.0.tgz",
+      "integrity": "sha512-1yyJm4OYC2cztbS28XYVWwLXdwpLsMG4LoZLOltVglQ2+hc/i9q9fUDZyjRa2Bqt4DmkIfezagfMrokhyH4uxQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 14.0.0"
+      }
+    },
+    "node_modules/@algolia/client-insights": {
+      "version": "5.44.0",
+      "resolved": "https://registry.npmjs.org/@algolia/client-insights/-/client-insights-5.44.0.tgz",
+      "integrity": "sha512-wVQWK6jYYsbEOjIMI+e5voLGPUIbXrvDj392IckXaCPvQ6vCMTXakQqOYCd+znQdL76S+3wHDo77HZWiAYKrtA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@algolia/client-common": "5.44.0",
+        "@algolia/requester-browser-xhr": "5.44.0",
+        "@algolia/requester-fetch": "5.44.0",
+        "@algolia/requester-node-http": "5.44.0"
+      },
+      "engines": {
+        "node": ">= 14.0.0"
+      }
+    },
+    "node_modules/@algolia/client-personalization": {
+      "version": "5.44.0",
+      "resolved": "https://registry.npmjs.org/@algolia/client-personalization/-/client-personalization-5.44.0.tgz",
+      "integrity": "sha512-lkgRjOjOkqmIkebHjHpU9rLJcJNUDMm+eVSW/KJQYLjGqykEZxal+nYJJTBbLceEU2roByP/+27ZmgIwCdf0iA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@algolia/client-common": "5.44.0",
+        "@algolia/requester-browser-xhr": "5.44.0",
+        "@algolia/requester-fetch": "5.44.0",
+        "@algolia/requester-node-http": "5.44.0"
+      },
+      "engines": {
+        "node": ">= 14.0.0"
+      }
+    },
+    "node_modules/@algolia/client-query-suggestions": {
+      "version": "5.44.0",
+      "resolved": "https://registry.npmjs.org/@algolia/client-query-suggestions/-/client-query-suggestions-5.44.0.tgz",
+      "integrity": "sha512-sYfhgwKu6NDVmZHL1WEKVLsOx/jUXCY4BHKLUOcYa8k4COCs6USGgz6IjFkUf+niwq8NCECMmTC4o/fVQOalsA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@algolia/client-common": "5.44.0",
+        "@algolia/requester-browser-xhr": "5.44.0",
+        "@algolia/requester-fetch": "5.44.0",
+        "@algolia/requester-node-http": "5.44.0"
+      },
+      "engines": {
+        "node": ">= 14.0.0"
+      }
+    },
+    "node_modules/@algolia/client-search": {
+      "version": "5.44.0",
+      "resolved": "https://registry.npmjs.org/@algolia/client-search/-/client-search-5.44.0.tgz",
+      "integrity": "sha512-/FRKUM1G4xn3vV8+9xH1WJ9XknU8rkBGlefruq9jDhYUAvYozKimhrmC2pRqw/RyHhPivmgZCRuC8jHP8piz4Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@algolia/client-common": "5.44.0",
+        "@algolia/requester-browser-xhr": "5.44.0",
+        "@algolia/requester-fetch": "5.44.0",
+        "@algolia/requester-node-http": "5.44.0"
+      },
+      "engines": {
+        "node": ">= 14.0.0"
+      }
+    },
+    "node_modules/@algolia/ingestion": {
+      "version": "1.44.0",
+      "resolved": "https://registry.npmjs.org/@algolia/ingestion/-/ingestion-1.44.0.tgz",
+      "integrity": "sha512-5+S5ynwMmpTpCLXGjTDpeIa81J+R4BLH0lAojOhmeGSeGEHQTqacl/4sbPyDTcidvnWhaqtyf8m42ue6lvISAw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@algolia/client-common": "5.44.0",
+        "@algolia/requester-browser-xhr": "5.44.0",
+        "@algolia/requester-fetch": "5.44.0",
+        "@algolia/requester-node-http": "5.44.0"
+      },
+      "engines": {
+        "node": ">= 14.0.0"
+      }
+    },
+    "node_modules/@algolia/monitoring": {
+      "version": "1.44.0",
+      "resolved": "https://registry.npmjs.org/@algolia/monitoring/-/monitoring-1.44.0.tgz",
+      "integrity": "sha512-xhaTN8pXJjR6zkrecg4Cc9YZaQK2LKm2R+LkbAq+AYGBCWJxtSGlNwftozZzkUyq4AXWoyoc0x2SyBtq5LRtqQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@algolia/client-common": "5.44.0",
+        "@algolia/requester-browser-xhr": "5.44.0",
+        "@algolia/requester-fetch": "5.44.0",
+        "@algolia/requester-node-http": "5.44.0"
+      },
+      "engines": {
+        "node": ">= 14.0.0"
+      }
+    },
+    "node_modules/@algolia/recommend": {
+      "version": "5.44.0",
+      "resolved": "https://registry.npmjs.org/@algolia/recommend/-/recommend-5.44.0.tgz",
+      "integrity": "sha512-GNcite/uOIS7wgRU1MT7SdNIupGSW+vbK9igIzMePvD2Dl8dy0O3urKPKIbTuZQqiVH1Cb84y5cgLvwNrdCj/Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@algolia/client-common": "5.44.0",
+        "@algolia/requester-browser-xhr": "5.44.0",
+        "@algolia/requester-fetch": "5.44.0",
+        "@algolia/requester-node-http": "5.44.0"
+      },
+      "engines": {
+        "node": ">= 14.0.0"
+      }
+    },
+    "node_modules/@algolia/requester-browser-xhr": {
+      "version": "5.44.0",
+      "resolved": "https://registry.npmjs.org/@algolia/requester-browser-xhr/-/requester-browser-xhr-5.44.0.tgz",
+      "integrity": "sha512-YZHBk72Cd7pcuNHzbhNzF/FbbYszlc7JhZlDyQAchnX5S7tcemSS96F39Sy8t4O4WQLpFvUf1MTNedlitWdOsQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@algolia/client-common": "5.44.0"
+      },
+      "engines": {
+        "node": ">= 14.0.0"
+      }
+    },
+    "node_modules/@algolia/requester-fetch": {
+      "version": "5.44.0",
+      "resolved": "https://registry.npmjs.org/@algolia/requester-fetch/-/requester-fetch-5.44.0.tgz",
+      "integrity": "sha512-B9WHl+wQ7uf46t9cq+vVM/ypVbOeuldVDq9OtKsX2ApL2g/htx6ImB9ugDOOJmB5+fE31/XPTuCcYz/j03+idA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@algolia/client-common": "5.44.0"
+      },
+      "engines": {
+        "node": ">= 14.0.0"
+      }
+    },
+    "node_modules/@algolia/requester-node-http": {
+      "version": "5.44.0",
+      "resolved": "https://registry.npmjs.org/@algolia/requester-node-http/-/requester-node-http-5.44.0.tgz",
+      "integrity": "sha512-MULm0qeAIk4cdzZ/ehJnl1o7uB5NMokg83/3MKhPq0Pk7+I0uELGNbzIfAkvkKKEYcHALemKdArtySF9eKzh/A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@algolia/client-common": "5.44.0"
+      },
+      "engines": {
+        "node": ">= 14.0.0"
+      }
+    },
+    "node_modules/@babel/helper-string-parser": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz",
+      "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz",
+      "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/parser": {
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.5.tgz",
+      "integrity": "sha512-KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.28.5"
+      },
+      "bin": {
+        "parser": "bin/babel-parser.js"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@babel/types": {
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.5.tgz",
+      "integrity": "sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-string-parser": "^7.27.1",
+        "@babel/helper-validator-identifier": "^7.28.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@cspell/cspell-bundled-dicts": {
+      "version": "9.3.2",
+      "resolved": "https://registry.npmjs.org/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-9.3.2.tgz",
+      "integrity": "sha512-OmKzq/0FATHU671GKMzBrTyLdm25Wnziva7h4ylumVn1wnwWsXGef5bgXD7iuApqfqH9SzxsU0NtTB8m8vwEHQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@cspell/dict-ada": "^4.1.1",
+        "@cspell/dict-al": "^1.1.1",
+        "@cspell/dict-aws": "^4.0.16",
+        "@cspell/dict-bash": "^4.2.2",
+        "@cspell/dict-companies": "^3.2.7",
+        "@cspell/dict-cpp": "^6.0.14",
+        "@cspell/dict-cryptocurrencies": "^5.0.5",
+        "@cspell/dict-csharp": "^4.0.7",
+        "@cspell/dict-css": "^4.0.18",
+        "@cspell/dict-dart": "^2.3.1",
+        "@cspell/dict-data-science": "^2.0.11",
+        "@cspell/dict-django": "^4.1.5",
+        "@cspell/dict-docker": "^1.1.16",
+        "@cspell/dict-dotnet": "^5.0.10",
+        "@cspell/dict-elixir": "^4.0.8",
+        "@cspell/dict-en_us": "^4.4.24",
+        "@cspell/dict-en-common-misspellings": "^2.1.8",
+        "@cspell/dict-en-gb-mit": "^3.1.14",
+        "@cspell/dict-filetypes": "^3.0.14",
+        "@cspell/dict-flutter": "^1.1.1",
+        "@cspell/dict-fonts": "^4.0.5",
+        "@cspell/dict-fsharp": "^1.1.1",
+        "@cspell/dict-fullstack": "^3.2.7",
+        "@cspell/dict-gaming-terms": "^1.1.2",
+        "@cspell/dict-git": "^3.0.7",
+        "@cspell/dict-golang": "^6.0.24",
+        "@cspell/dict-google": "^1.0.9",
+        "@cspell/dict-haskell": "^4.0.6",
+        "@cspell/dict-html": "^4.0.12",
+        "@cspell/dict-html-symbol-entities": "^4.0.4",
+        "@cspell/dict-java": "^5.0.12",
+        "@cspell/dict-julia": "^1.1.1",
+        "@cspell/dict-k8s": "^1.0.12",
+        "@cspell/dict-kotlin": "^1.1.1",
+        "@cspell/dict-latex": "^4.0.4",
+        "@cspell/dict-lorem-ipsum": "^4.0.5",
+        "@cspell/dict-lua": "^4.0.8",
+        "@cspell/dict-makefile": "^1.0.5",
+        "@cspell/dict-markdown": "^2.0.12",
+        "@cspell/dict-monkeyc": "^1.0.11",
+        "@cspell/dict-node": "^5.0.8",
+        "@cspell/dict-npm": "^5.2.22",
+        "@cspell/dict-php": "^4.1.0",
+        "@cspell/dict-powershell": "^5.0.15",
+        "@cspell/dict-public-licenses": "^2.0.15",
+        "@cspell/dict-python": "^4.2.21",
+        "@cspell/dict-r": "^2.1.1",
+        "@cspell/dict-ruby": "^5.0.9",
+        "@cspell/dict-rust": "^4.0.12",
+        "@cspell/dict-scala": "^5.0.8",
+        "@cspell/dict-shell": "^1.1.2",
+        "@cspell/dict-software-terms": "^5.1.13",
+        "@cspell/dict-sql": "^2.2.1",
+        "@cspell/dict-svelte": "^1.0.7",
+        "@cspell/dict-swift": "^2.0.6",
+        "@cspell/dict-terraform": "^1.1.3",
+        "@cspell/dict-typescript": "^3.2.3",
+        "@cspell/dict-vue": "^3.0.5",
+        "@cspell/dict-zig": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=20"
+      }
+    },
+    "node_modules/@cspell/cspell-json-reporter": {
+      "version": "9.3.2",
+      "resolved": "https://registry.npmjs.org/@cspell/cspell-json-reporter/-/cspell-json-reporter-9.3.2.tgz",
+      "integrity": "sha512-YRgpeHN9uY8kUlIw9q+8zJ0tRTAJMbfBTGzCq9Puah09NeMWlRMFPUkXVrkdic6NA7etboZ+zEdoZwRO9EmhiA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@cspell/cspell-types": "9.3.2"
+      },
+      "engines": {
+        "node": ">=20"
+      }
+    },
+    "node_modules/@cspell/cspell-pipe": {
+      "version": "9.3.2",
+      "resolved": "https://registry.npmjs.org/@cspell/cspell-pipe/-/cspell-pipe-9.3.2.tgz",
+      "integrity": "sha512-REF7ibG79WLEynIMUss/IRDCdYEb1nlE1rj/gt2CbPFzLa6t5MRwW2lajEvXS6/WgbMtsTVHAWi3ALqJzCwxng==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=20"
+      }
+    },
+    "node_modules/@cspell/cspell-resolver": {
+      "version": "9.3.2",
+      "resolved": "https://registry.npmjs.org/@cspell/cspell-resolver/-/cspell-resolver-9.3.2.tgz",
+      "integrity": "sha512-jLN2Aa/vxm8+IBvTd884SwPEfjxnDwIEPBT3hmqgLlKuUHQ3FMG27lsM4Ik9L2KWBXMgV/wGz4BaxfhKI41Ttw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "global-directory": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=20"
+      }
+    },
+    "node_modules/@cspell/cspell-service-bus": {
+      "version": "9.3.2",
+      "resolved": "https://registry.npmjs.org/@cspell/cspell-service-bus/-/cspell-service-bus-9.3.2.tgz",
+      "integrity": "sha512-/rB8LazM0JzKL+AvZa5fEpLutmwy5QFMpzw8HJd+rDGkzb5r79hURWSRo84QArgaskUqA9XlOHSieDE9pt+WAA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=20"
+      }
+    },
+    "node_modules/@cspell/cspell-types": {
+      "version": "9.3.2",
+      "resolved": "https://registry.npmjs.org/@cspell/cspell-types/-/cspell-types-9.3.2.tgz",
+      "integrity": "sha512-l4H8bMAmdzCbXHO8y1JZiAKszrPEiuLFKWrbhCacHF0iP+PIc/yuQp7cO70m0p70vArRfih6kgGyHFaCy47CfA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=20"
+      }
+    },
+    "node_modules/@cspell/dict-ada": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-ada/-/dict-ada-4.1.1.tgz",
+      "integrity": "sha512-E+0YW9RhZod/9Qy2gxfNZiHJjCYFlCdI69br1eviQQWB8yOTJX0JHXLs79kOYhSW0kINPVUdvddEBe6Lu6CjGQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@cspell/dict-al": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-al/-/dict-al-1.1.1.tgz",
+      "integrity": "sha512-sD8GCaZetgQL4+MaJLXqbzWcRjfKVp8x+px3HuCaaiATAAtvjwUQ5/Iubiqwfd1boIh2Y1/3EgM3TLQ7Q8e0wQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@cspell/dict-aws": {
+      "version": "4.0.16",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-aws/-/dict-aws-4.0.16.tgz",
+      "integrity": "sha512-a681zShZbtTo947NvTYGLer95ZDQw1ROKvIFydak1e0OlfFCsNdtcYTupn0nbbYs53c9AO7G2DU8AcNEAnwXPA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@cspell/dict-bash": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-bash/-/dict-bash-4.2.2.tgz",
+      "integrity": "sha512-kyWbwtX3TsCf5l49gGQIZkRLaB/P8g73GDRm41Zu8Mv51kjl2H7Au0TsEvHv7jzcsRLS6aUYaZv6Zsvk1fOz+Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@cspell/dict-shell": "1.1.2"
+      }
+    },
+    "node_modules/@cspell/dict-companies": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-companies/-/dict-companies-3.2.7.tgz",
+      "integrity": "sha512-fEyr3LmpFKTaD0LcRhB4lfW1AmULYBqzg4gWAV0dQCv06l+TsA+JQ+3pZJbUcoaZirtgsgT3dL3RUjmGPhUH0A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@cspell/dict-cpp": {
+      "version": "6.0.14",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-cpp/-/dict-cpp-6.0.14.tgz",
+      "integrity": "sha512-dkmpSwvVfVdtoZ4mW/CK2Ep1v8mJlp6uiKpMNbSMOdJl4kq28nQS4vKNIX3B2bJa0Ha5iHHu+1mNjiLeO3g7Xg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@cspell/dict-cryptocurrencies": {
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-cryptocurrencies/-/dict-cryptocurrencies-5.0.5.tgz",
+      "integrity": "sha512-R68hYYF/rtlE6T/dsObStzN5QZw+0aQBinAXuWCVqwdS7YZo0X33vGMfChkHaiCo3Z2+bkegqHlqxZF4TD3rUA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@cspell/dict-csharp": {
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-csharp/-/dict-csharp-4.0.7.tgz",
+      "integrity": "sha512-H16Hpu8O/1/lgijFt2lOk4/nnldFtQ4t8QHbyqphqZZVE5aS4J/zD/WvduqnLY21aKhZS6jo/xF5PX9jyqPKUA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@cspell/dict-css": {
+      "version": "4.0.18",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-css/-/dict-css-4.0.18.tgz",
+      "integrity": "sha512-EF77RqROHL+4LhMGW5NTeKqfUd/e4OOv6EDFQ/UQQiFyWuqkEKyEz0NDILxOFxWUEVdjT2GQ2cC7t12B6pESwg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@cspell/dict-dart": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-dart/-/dict-dart-2.3.1.tgz",
+      "integrity": "sha512-xoiGnULEcWdodXI6EwVyqpZmpOoh8RA2Xk9BNdR7DLamV/QMvEYn8KJ7NlRiTSauJKPNkHHQ5EVHRM6sTS7jdg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@cspell/dict-data-science": {
+      "version": "2.0.12",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-data-science/-/dict-data-science-2.0.12.tgz",
+      "integrity": "sha512-vI/mg6cI28IkFcpeINS7cm5M9HWemmXSTnxJiu3nmc4VAGx35SXIEyuLGBcsVzySvDablFYf4hsEpmg1XpVsUQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@cspell/dict-django": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-django/-/dict-django-4.1.5.tgz",
+      "integrity": "sha512-AvTWu99doU3T8ifoMYOMLW2CXKvyKLukPh1auOPwFGHzueWYvBBN+OxF8wF7XwjTBMMeRleVdLh3aWCDEX/ZWg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@cspell/dict-docker": {
+      "version": "1.1.16",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-docker/-/dict-docker-1.1.16.tgz",
+      "integrity": "sha512-UiVQ5RmCg6j0qGIxrBnai3pIB+aYKL3zaJGvXk1O/ertTKJif9RZikKXCEgqhaCYMweM4fuLqWSVmw3hU164Iw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@cspell/dict-dotnet": {
+      "version": "5.0.10",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-dotnet/-/dict-dotnet-5.0.10.tgz",
+      "integrity": "sha512-ooar8BP/RBNP1gzYfJPStKEmpWy4uv/7JCq6FOnJLeD1yyfG3d/LFMVMwiJo+XWz025cxtkM3wuaikBWzCqkmg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@cspell/dict-elixir": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-elixir/-/dict-elixir-4.0.8.tgz",
+      "integrity": "sha512-CyfphrbMyl4Ms55Vzuj+mNmd693HjBFr9hvU+B2YbFEZprE5AG+EXLYTMRWrXbpds4AuZcvN3deM2XVB80BN/Q==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@cspell/dict-en_us": {
+      "version": "4.4.24",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-en_us/-/dict-en_us-4.4.24.tgz",
+      "integrity": "sha512-JE+/H2YicHJTneRmgH4GSI21rS+1yGZVl1jfOQgl8iHLC+yTTMtCvueNDMK94CgJACzYAoCsQB70MqiFJJfjLQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@cspell/dict-en-common-misspellings": {
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-en-common-misspellings/-/dict-en-common-misspellings-2.1.8.tgz",
+      "integrity": "sha512-vDsjRFPQGuAADAiitf82z9Mz3DcqKZi6V5hPAEIFkLLKjFVBcjUsSq59SfL59ElIFb76MtBO0BLifdEbBj+DoQ==",
+      "dev": true,
+      "license": "CC BY-SA 4.0"
+    },
+    "node_modules/@cspell/dict-en-gb": {
+      "version": "5.0.19",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-en-gb/-/dict-en-gb-5.0.19.tgz",
+      "integrity": "sha512-/p+p/9q8XTzsE0GxbZZKcC1rTLYmCpilYw8aC9Q1xJbve8YqZnpxk8IxRyaHwfy1TeKMQNs6heZZRtzPag0rCw==",
+      "dev": true,
+      "license": "LGPL-3.0"
+    },
+    "node_modules/@cspell/dict-en-gb-mit": {
+      "version": "3.1.14",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-en-gb-mit/-/dict-en-gb-mit-3.1.14.tgz",
+      "integrity": "sha512-b+vEerlHP6rnNf30tmTJb7JZnOq4WAslYUvexOz/L3gDna9YJN3bAnwRJ3At3bdcOcMG7PTv3Pi+C73IR22lNg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@cspell/dict-filetypes": {
+      "version": "3.0.14",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-filetypes/-/dict-filetypes-3.0.14.tgz",
+      "integrity": "sha512-KSXaSMYYNMLLdHEnju1DyRRH3eQWPRYRnOXpuHUdOh2jC44VgQoxyMU7oB3NAhDhZKBPCihabzECsAGFbdKfEA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@cspell/dict-flutter": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-flutter/-/dict-flutter-1.1.1.tgz",
+      "integrity": "sha512-UlOzRcH2tNbFhZmHJN48Za/2/MEdRHl2BMkCWZBYs+30b91mWvBfzaN4IJQU7dUZtowKayVIF9FzvLZtZokc5A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@cspell/dict-fonts": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-fonts/-/dict-fonts-4.0.5.tgz",
+      "integrity": "sha512-BbpkX10DUX/xzHs6lb7yzDf/LPjwYIBJHJlUXSBXDtK/1HaeS+Wqol4Mlm2+NAgZ7ikIE5DQMViTgBUY3ezNoQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@cspell/dict-fsharp": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-fsharp/-/dict-fsharp-1.1.1.tgz",
+      "integrity": "sha512-imhs0u87wEA4/cYjgzS0tAyaJpwG7vwtC8UyMFbwpmtw+/bgss+osNfyqhYRyS/ehVCWL17Ewx2UPkexjKyaBA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@cspell/dict-fullstack": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-fullstack/-/dict-fullstack-3.2.7.tgz",
+      "integrity": "sha512-IxEk2YAwAJKYCUEgEeOg3QvTL4XLlyArJElFuMQevU1dPgHgzWElFevN5lsTFnvMFA1riYsVinqJJX0BanCFEg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@cspell/dict-gaming-terms": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-gaming-terms/-/dict-gaming-terms-1.1.2.tgz",
+      "integrity": "sha512-9XnOvaoTBscq0xuD6KTEIkk9hhdfBkkvJAIsvw3JMcnp1214OCGW8+kako5RqQ2vTZR3Tnf3pc57o7VgkM0q1Q==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@cspell/dict-git": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-git/-/dict-git-3.0.7.tgz",
+      "integrity": "sha512-odOwVKgfxCQfiSb+nblQZc4ErXmnWEnv8XwkaI4sNJ7cNmojnvogYVeMqkXPjvfrgEcizEEA4URRD2Ms5PDk1w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@cspell/dict-golang": {
+      "version": "6.0.24",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-golang/-/dict-golang-6.0.24.tgz",
+      "integrity": "sha512-rY7PlC3MsHozmjrZWi0HQPUl0BVCV0+mwK0rnMT7pOIXqOe4tWCYMULDIsEk4F0gbIxb5badd2dkCPDYjLnDgA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@cspell/dict-google": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-google/-/dict-google-1.0.9.tgz",
+      "integrity": "sha512-biL65POqialY0i4g6crj7pR6JnBkbsPovB2WDYkj3H4TuC/QXv7Pu5pdPxeUJA6TSCHI7T5twsO4VSVyRxD9CA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@cspell/dict-haskell": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-haskell/-/dict-haskell-4.0.6.tgz",
+      "integrity": "sha512-ib8SA5qgftExpYNjWhpYIgvDsZ/0wvKKxSP+kuSkkak520iPvTJumEpIE+qPcmJQo4NzdKMN8nEfaeci4OcFAQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@cspell/dict-html": {
+      "version": "4.0.12",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-html/-/dict-html-4.0.12.tgz",
+      "integrity": "sha512-JFffQ1dDVEyJq6tCDWv0r/RqkdSnV43P2F/3jJ9rwLgdsOIXwQbXrz6QDlvQLVvNSnORH9KjDtenFTGDyzfCaA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@cspell/dict-html-symbol-entities": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-html-symbol-entities/-/dict-html-symbol-entities-4.0.4.tgz",
+      "integrity": "sha512-afea+0rGPDeOV9gdO06UW183Qg6wRhWVkgCFwiO3bDupAoyXRuvupbb5nUyqSTsLXIKL8u8uXQlJ9pkz07oVXw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@cspell/dict-java": {
+      "version": "5.0.12",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-java/-/dict-java-5.0.12.tgz",
+      "integrity": "sha512-qPSNhTcl7LGJ5Qp6VN71H8zqvRQK04S08T67knMq9hTA8U7G1sTKzLmBaDOFhq17vNX/+rT+rbRYp+B5Nwza1A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@cspell/dict-julia": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-julia/-/dict-julia-1.1.1.tgz",
+      "integrity": "sha512-WylJR9TQ2cgwd5BWEOfdO3zvDB+L7kYFm0I9u0s9jKHWQ6yKmfKeMjU9oXxTBxIufhCXm92SKwwVNAC7gjv+yA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@cspell/dict-k8s": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-k8s/-/dict-k8s-1.0.12.tgz",
+      "integrity": "sha512-2LcllTWgaTfYC7DmkMPOn9GsBWsA4DZdlun4po8s2ysTP7CPEnZc1ZfK6pZ2eI4TsZemlUQQ+NZxMe9/QutQxg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@cspell/dict-kotlin": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-kotlin/-/dict-kotlin-1.1.1.tgz",
+      "integrity": "sha512-J3NzzfgmxRvEeOe3qUXnSJQCd38i/dpF9/t3quuWh6gXM+krsAXP75dY1CzDmS8mrJAlBdVBeAW5eAZTD8g86Q==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@cspell/dict-latex": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-latex/-/dict-latex-4.0.4.tgz",
+      "integrity": "sha512-YdTQhnTINEEm/LZgTzr9Voz4mzdOXH7YX+bSFs3hnkUHCUUtX/mhKgf1CFvZ0YNM2afjhQcmLaR9bDQVyYBvpA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@cspell/dict-lorem-ipsum": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-lorem-ipsum/-/dict-lorem-ipsum-4.0.5.tgz",
+      "integrity": "sha512-9a4TJYRcPWPBKkQAJ/whCu4uCAEgv/O2xAaZEI0n4y1/l18Yyx8pBKoIX5QuVXjjmKEkK7hi5SxyIsH7pFEK9Q==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@cspell/dict-lua": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-lua/-/dict-lua-4.0.8.tgz",
+      "integrity": "sha512-N4PkgNDMu9JVsRu7JBS/3E/dvfItRgk9w5ga2dKq+JupP2Y3lojNaAVFhXISh4Y0a6qXDn2clA6nvnavQ/jjLA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@cspell/dict-makefile": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-makefile/-/dict-makefile-1.0.5.tgz",
+      "integrity": "sha512-4vrVt7bGiK8Rx98tfRbYo42Xo2IstJkAF4tLLDMNQLkQ86msDlYSKG1ZCk8Abg+EdNcFAjNhXIiNO+w4KflGAQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@cspell/dict-markdown": {
+      "version": "2.0.12",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-markdown/-/dict-markdown-2.0.12.tgz",
+      "integrity": "sha512-ufwoliPijAgWkD/ivAMC+A9QD895xKiJRF/fwwknQb7kt7NozTLKFAOBtXGPJAB4UjhGBpYEJVo2elQ0FCAH9A==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "@cspell/dict-css": "^4.0.18",
+        "@cspell/dict-html": "^4.0.12",
+        "@cspell/dict-html-symbol-entities": "^4.0.4",
+        "@cspell/dict-typescript": "^3.2.3"
+      }
+    },
+    "node_modules/@cspell/dict-monkeyc": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-monkeyc/-/dict-monkeyc-1.0.11.tgz",
+      "integrity": "sha512-7Q1Ncu0urALI6dPTrEbSTd//UK0qjRBeaxhnm8uY5fgYNFYAG+u4gtnTIo59S6Bw5P++4H3DiIDYoQdY/lha8w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@cspell/dict-node": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-node/-/dict-node-5.0.8.tgz",
+      "integrity": "sha512-AirZcN2i84ynev3p2/1NCPEhnNsHKMz9zciTngGoqpdItUb2bDt1nJBjwlsrFI78GZRph/VaqTVFwYikmncpXg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@cspell/dict-npm": {
+      "version": "5.2.23",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-npm/-/dict-npm-5.2.23.tgz",
+      "integrity": "sha512-cnlPGzhNkbXFLFURfjzwML2LjHMofqJkemR7lLo9Jwa9IptvzeTn4nOtJMSGfkxNrZPf/IvQ7rH5hamsUQLQ3A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@cspell/dict-php": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-php/-/dict-php-4.1.0.tgz",
+      "integrity": "sha512-dTDeabyOj7eFvn2Q4Za3uVXM2+SzeFMqX8ly2P0XTo4AzbCmI2hulFD/QIADwWmwiRrInbbf8cxwFHNIYrXl4w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@cspell/dict-powershell": {
+      "version": "5.0.15",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-powershell/-/dict-powershell-5.0.15.tgz",
+      "integrity": "sha512-l4S5PAcvCFcVDMJShrYD0X6Huv9dcsQPlsVsBGbH38wvuN7gS7+GxZFAjTNxDmTY1wrNi1cCatSg6Pu2BW4rgg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@cspell/dict-public-licenses": {
+      "version": "2.0.15",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-public-licenses/-/dict-public-licenses-2.0.15.tgz",
+      "integrity": "sha512-cJEOs901H13Pfy0fl4dCD1U+xpWIMaEPq8MeYU83FfDZvellAuSo4GqWCripfIqlhns/L6+UZEIJSOZnjgy7Wg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@cspell/dict-python": {
+      "version": "4.2.22",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-python/-/dict-python-4.2.22.tgz",
+      "integrity": "sha512-rgF7DuleVK2lkzlw33jjEfxS2a0CU5kwAhOqf5B6XkuaPbqZ/0g0LBCdwglAGccYu7sBuvxRS8Yubk+ytSAFTg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@cspell/dict-data-science": "^2.0.12"
+      }
+    },
+    "node_modules/@cspell/dict-r": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-r/-/dict-r-2.1.1.tgz",
+      "integrity": "sha512-71Ka+yKfG4ZHEMEmDxc6+blFkeTTvgKbKAbwiwQAuKl3zpqs1Y0vUtwW2N4b3LgmSPhV3ODVY0y4m5ofqDuKMw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@cspell/dict-ruby": {
+      "version": "5.0.9",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-ruby/-/dict-ruby-5.0.9.tgz",
+      "integrity": "sha512-H2vMcERMcANvQshAdrVx0XoWaNX8zmmiQN11dZZTQAZaNJ0xatdJoSqY8C8uhEMW89bfgpN+NQgGuDXW2vmXEw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@cspell/dict-rust": {
+      "version": "4.0.12",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-rust/-/dict-rust-4.0.12.tgz",
+      "integrity": "sha512-z2QiH+q9UlNhobBJArvILRxV8Jz0pKIK7gqu4TgmEYyjiu1TvnGZ1tbYHeu9w3I/wOP6UMDoCBTty5AlYfW0mw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@cspell/dict-scala": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-scala/-/dict-scala-5.0.8.tgz",
+      "integrity": "sha512-YdftVmumv8IZq9zu1gn2U7A4bfM2yj9Vaupydotyjuc+EEZZSqAafTpvW/jKLWji2TgybM1L2IhmV0s/Iv9BTw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@cspell/dict-shell": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-shell/-/dict-shell-1.1.2.tgz",
+      "integrity": "sha512-WqOUvnwcHK1X61wAfwyXq04cn7KYyskg90j4lLg3sGGKMW9Sq13hs91pqrjC44Q+lQLgCobrTkMDw9Wyl9nRFA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@cspell/dict-software-terms": {
+      "version": "5.1.14",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-5.1.14.tgz",
+      "integrity": "sha512-Eu9h090hxHJiqzVFS0WxOZbYXnmb7F1RFIUEg4Nru+D/78bXVDH4b8BiKGVFNRljaieNQRAHaryzdaKJRCH6ZA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@cspell/dict-sql": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-sql/-/dict-sql-2.2.1.tgz",
+      "integrity": "sha512-qDHF8MpAYCf4pWU8NKbnVGzkoxMNrFqBHyG/dgrlic5EQiKANCLELYtGlX5auIMDLmTf1inA0eNtv74tyRJ/vg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@cspell/dict-svelte": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-svelte/-/dict-svelte-1.0.7.tgz",
+      "integrity": "sha512-hGZsGqP0WdzKkdpeVLBivRuSNzOTvN036EBmpOwxH+FTY2DuUH7ecW+cSaMwOgmq5JFSdTcbTNFlNC8HN8lhaQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@cspell/dict-swift": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-swift/-/dict-swift-2.0.6.tgz",
+      "integrity": "sha512-PnpNbrIbex2aqU1kMgwEKvCzgbkHtj3dlFLPMqW1vSniop7YxaDTtvTUO4zA++ugYAEL+UK8vYrBwDPTjjvSnA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@cspell/dict-terraform": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-terraform/-/dict-terraform-1.1.3.tgz",
+      "integrity": "sha512-gr6wxCydwSFyyBKhBA2xkENXtVFToheqYYGFvlMZXWjviynXmh+NK/JTvTCk/VHk3+lzbO9EEQKee6VjrAUSbA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@cspell/dict-typescript": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-typescript/-/dict-typescript-3.2.3.tgz",
+      "integrity": "sha512-zXh1wYsNljQZfWWdSPYwQhpwiuW0KPW1dSd8idjMRvSD0aSvWWHoWlrMsmZeRl4qM4QCEAjua8+cjflm41cQBg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@cspell/dict-vue": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-vue/-/dict-vue-3.0.5.tgz",
+      "integrity": "sha512-Mqutb8jbM+kIcywuPQCCaK5qQHTdaByoEO2J9LKFy3sqAdiBogNkrplqUK0HyyRFgCfbJUgjz3N85iCMcWH0JA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@cspell/dict-zig": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-zig/-/dict-zig-1.0.0.tgz",
+      "integrity": "sha512-XibBIxBlVosU06+M6uHWkFeT0/pW5WajDRYdXG2CgHnq85b0TI/Ks0FuBJykmsgi2CAD3Qtx8UHFEtl/DSFnAQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@cspell/dynamic-import": {
+      "version": "9.3.2",
+      "resolved": "https://registry.npmjs.org/@cspell/dynamic-import/-/dynamic-import-9.3.2.tgz",
+      "integrity": "sha512-au7FyuIHUNI2r9sO3pUBKVTeD/v7c9x/nPUStaAK1bG4rdKt4w+/jUY2IaldAraW5w29z528BboXbiV87SM1kw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@cspell/url": "9.3.2",
+        "import-meta-resolve": "^4.2.0"
+      },
+      "engines": {
+        "node": ">=20"
+      }
+    },
+    "node_modules/@cspell/filetypes": {
+      "version": "9.3.2",
+      "resolved": "https://registry.npmjs.org/@cspell/filetypes/-/filetypes-9.3.2.tgz",
+      "integrity": "sha512-0bUxQlmJPRHZrRQD7adbc4lFizO8tGD/6+1cBgU3kV3+NVrpr12y4jU8twCSChhYibZyPr7bnvhkM3cQgb8RzA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=20"
+      }
+    },
+    "node_modules/@cspell/strong-weak-map": {
+      "version": "9.3.2",
+      "resolved": "https://registry.npmjs.org/@cspell/strong-weak-map/-/strong-weak-map-9.3.2.tgz",
+      "integrity": "sha512-pFcmOTWCoFMRETb9PCkCmaiZiLb5i2qOZmGH/p/tFEH8kIYhMGfhaulnXwKwS+Ke6PKceQd2YL98bGmo8hL4aQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=20"
+      }
+    },
+    "node_modules/@cspell/url": {
+      "version": "9.3.2",
+      "resolved": "https://registry.npmjs.org/@cspell/url/-/url-9.3.2.tgz",
+      "integrity": "sha512-TobUlZl7Z7VehhNOMNAg1ABuGizieseftlG94OZJ934JptOhK8TC/1o2ldKrbDH50jyt6E7rPTMV2BW/vWuTzQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=20"
+      }
+    },
+    "node_modules/@docsearch/css": {
+      "version": "3.8.2",
+      "resolved": "https://registry.npmjs.org/@docsearch/css/-/css-3.8.2.tgz",
+      "integrity": "sha512-y05ayQFyUmCXze79+56v/4HpycYF3uFqB78pLPrSV5ZKAlDuIAAJNhaRi8tTdRNXh05yxX/TyNnzD6LwSM89vQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@docsearch/js": {
+      "version": "3.8.2",
+      "resolved": "https://registry.npmjs.org/@docsearch/js/-/js-3.8.2.tgz",
+      "integrity": "sha512-Q5wY66qHn0SwA7Taa0aDbHiJvaFJLOJyHmooQ7y8hlwwQLQ/5WwCcoX0g7ii04Qi2DJlHsd0XXzJ8Ypw9+9YmQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@docsearch/react": "3.8.2",
+        "preact": "^10.0.0"
+      }
+    },
+    "node_modules/@docsearch/react": {
+      "version": "3.8.2",
+      "resolved": "https://registry.npmjs.org/@docsearch/react/-/react-3.8.2.tgz",
+      "integrity": "sha512-xCRrJQlTt8N9GU0DG4ptwHRkfnSnD/YpdeaXe02iKfqs97TkZJv60yE+1eq/tjPcVnTW8dP5qLP7itifFVV5eg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@algolia/autocomplete-core": "1.17.7",
+        "@algolia/autocomplete-preset-algolia": "1.17.7",
+        "@docsearch/css": "3.8.2",
+        "algoliasearch": "^5.14.2"
+      },
+      "peerDependencies": {
+        "@types/react": ">= 16.8.0 < 19.0.0",
+        "react": ">= 16.8.0 < 19.0.0",
+        "react-dom": ">= 16.8.0 < 19.0.0",
+        "search-insights": ">= 1 < 3"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "react": {
+          "optional": true
+        },
+        "react-dom": {
+          "optional": true
+        },
+        "search-insights": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@esbuild/linux-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
+      "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@iconify-json/simple-icons": {
+      "version": "1.2.59",
+      "resolved": "https://registry.npmjs.org/@iconify-json/simple-icons/-/simple-icons-1.2.59.tgz",
+      "integrity": "sha512-fYx/InyQsWFW4wVxWka3CGDJ6m/fXoTqWBSl+oA3FBXO5RhPAb6S3Y5bRgCPnrYevErH8VjAL0TZevIqlN2PhQ==",
+      "dev": true,
+      "license": "CC0-1.0",
+      "dependencies": {
+        "@iconify/types": "*"
+      }
+    },
+    "node_modules/@iconify/types": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@iconify/types/-/types-2.0.0.tgz",
+      "integrity": "sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.5.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
+      "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@rollup/rollup-linux-x64-gnu": {
+      "version": "4.53.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.53.3.tgz",
+      "integrity": "sha512-3EhFi1FU6YL8HTUJZ51imGJWEX//ajQPfqWLI3BQq4TlvHy4X0MOr5q3D2Zof/ka0d5FNdPwZXm3Yyib/UEd+w==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-x64-musl": {
+      "version": "4.53.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.53.3.tgz",
+      "integrity": "sha512-eoROhjcc6HbZCJr+tvVT8X4fW3/5g/WkGvvmwz/88sDtSJzO7r/blvoBDgISDiCjDRZmHpwud7h+6Q9JxFwq1Q==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@shikijs/core": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/core/-/core-2.5.0.tgz",
+      "integrity": "sha512-uu/8RExTKtavlpH7XqnVYBrfBkUc20ngXiX9NSrBhOVZYv/7XQRKUyhtkeflY5QsxC0GbJThCerruZfsUaSldg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@shikijs/engine-javascript": "2.5.0",
+        "@shikijs/engine-oniguruma": "2.5.0",
+        "@shikijs/types": "2.5.0",
+        "@shikijs/vscode-textmate": "^10.0.2",
+        "@types/hast": "^3.0.4",
+        "hast-util-to-html": "^9.0.4"
+      }
+    },
+    "node_modules/@shikijs/engine-javascript": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/engine-javascript/-/engine-javascript-2.5.0.tgz",
+      "integrity": "sha512-VjnOpnQf8WuCEZtNUdjjwGUbtAVKuZkVQ/5cHy/tojVVRIRtlWMYVjyWhxOmIq05AlSOv72z7hRNRGVBgQOl0w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@shikijs/types": "2.5.0",
+        "@shikijs/vscode-textmate": "^10.0.2",
+        "oniguruma-to-es": "^3.1.0"
+      }
+    },
+    "node_modules/@shikijs/engine-oniguruma": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/engine-oniguruma/-/engine-oniguruma-2.5.0.tgz",
+      "integrity": "sha512-pGd1wRATzbo/uatrCIILlAdFVKdxImWJGQ5rFiB5VZi2ve5xj3Ax9jny8QvkaV93btQEwR/rSz5ERFpC5mKNIw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@shikijs/types": "2.5.0",
+        "@shikijs/vscode-textmate": "^10.0.2"
+      }
+    },
+    "node_modules/@shikijs/langs": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/langs/-/langs-2.5.0.tgz",
+      "integrity": "sha512-Qfrrt5OsNH5R+5tJ/3uYBBZv3SuGmnRPejV9IlIbFH3HTGLDlkqgHymAlzklVmKBjAaVmkPkyikAV/sQ1wSL+w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@shikijs/types": "2.5.0"
+      }
+    },
+    "node_modules/@shikijs/themes": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/themes/-/themes-2.5.0.tgz",
+      "integrity": "sha512-wGrk+R8tJnO0VMzmUExHR+QdSaPUl/NKs+a4cQQRWyoc3YFbUzuLEi/KWK1hj+8BfHRKm2jNhhJck1dfstJpiw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@shikijs/types": "2.5.0"
+      }
+    },
+    "node_modules/@shikijs/transformers": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/transformers/-/transformers-2.5.0.tgz",
+      "integrity": "sha512-SI494W5X60CaUwgi8u4q4m4s3YAFSxln3tzNjOSYqq54wlVgz0/NbbXEb3mdLbqMBztcmS7bVTaEd2w0qMmfeg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@shikijs/core": "2.5.0",
+        "@shikijs/types": "2.5.0"
+      }
+    },
+    "node_modules/@shikijs/types": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/types/-/types-2.5.0.tgz",
+      "integrity": "sha512-ygl5yhxki9ZLNuNpPitBWvcy9fsSKKaRuO4BAlMyagszQidxcpLAr0qiW/q43DtSIDxO6hEbtYLiFZNXO/hdGw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@shikijs/vscode-textmate": "^10.0.2",
+        "@types/hast": "^3.0.4"
+      }
+    },
+    "node_modules/@shikijs/vscode-textmate": {
+      "version": "10.0.2",
+      "resolved": "https://registry.npmjs.org/@shikijs/vscode-textmate/-/vscode-textmate-10.0.2.tgz",
+      "integrity": "sha512-83yeghZ2xxin3Nj8z1NMd/NCuca+gsYXswywDy5bHvwlWL8tpTQmzGeUuHd9FC3E/SBEMvzJRwWEOz5gGes9Qg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/estree": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
+      "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/hast": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.4.tgz",
+      "integrity": "sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/unist": "*"
+      }
+    },
+    "node_modules/@types/linkify-it": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-5.0.0.tgz",
+      "integrity": "sha512-sVDA58zAw4eWAffKOaQH5/5j3XeayukzDk+ewSsnv3p4yJEZHCCzMDiZM8e0OUrRvmpGZ85jf4yDHkHsgBNr9Q==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/markdown-it": {
+      "version": "14.1.2",
+      "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-14.1.2.tgz",
+      "integrity": "sha512-promo4eFwuiW+TfGxhi+0x3czqTYJkG8qB17ZUJiVF10Xm7NLVRSLUsfRTU/6h1e24VvRnXCx+hG7li58lkzog==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/linkify-it": "^5",
+        "@types/mdurl": "^2"
+      }
+    },
+    "node_modules/@types/mdast": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-4.0.4.tgz",
+      "integrity": "sha512-kGaNbPh1k7AFzgpud/gMdvIm5xuECykRR+JnWKQno9TAXVa6WIVCGTPvYGekIDL4uwCZQSYbUxNBSb1aUo79oA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/unist": "*"
+      }
+    },
+    "node_modules/@types/mdurl": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-2.0.0.tgz",
+      "integrity": "sha512-RGdgjQUZba5p6QEFAVx2OGb8rQDL/cPRG7GiedRzMcJ1tYnUANBncjbSB1NRGwbvjcPeikRABz2nshyPk1bhWg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/unist": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz",
+      "integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/web-bluetooth": {
+      "version": "0.0.21",
+      "resolved": "https://registry.npmjs.org/@types/web-bluetooth/-/web-bluetooth-0.0.21.tgz",
+      "integrity": "sha512-oIQLCGWtcFZy2JW77j9k8nHzAOpqMHLQejDA48XXMWH6tjCQHz5RCFz1bzsmROyL6PUm+LLnUiI4BCn221inxA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@ungap/structured-clone": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.0.tgz",
+      "integrity": "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/@vitejs/plugin-vue": {
+      "version": "5.2.4",
+      "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-5.2.4.tgz",
+      "integrity": "sha512-7Yx/SXSOcQq5HiiV3orevHUFn+pmMB4cgbEkDYgnkUWb0WfeQ/wa2yFv6D5ICiCQOVpjA7vYDXrC7AGO8yjDHA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.0.0 || >=20.0.0"
+      },
+      "peerDependencies": {
+        "vite": "^5.0.0 || ^6.0.0",
+        "vue": "^3.2.25"
+      }
+    },
+    "node_modules/@vue/compiler-core": {
+      "version": "3.5.24",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.24.tgz",
+      "integrity": "sha512-eDl5H57AOpNakGNAkFDH+y7kTqrQpJkZFXhWZQGyx/5Wh7B1uQYvcWkvZi11BDhscPgj8N7XV3oRwiPnx1Vrig==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/parser": "^7.28.5",
+        "@vue/shared": "3.5.24",
+        "entities": "^4.5.0",
+        "estree-walker": "^2.0.2",
+        "source-map-js": "^1.2.1"
+      }
+    },
+    "node_modules/@vue/compiler-dom": {
+      "version": "3.5.24",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.24.tgz",
+      "integrity": "sha512-1QHGAvs53gXkWdd3ZMGYuvQFXHW4ksKWPG8HP8/2BscrbZ0brw183q2oNWjMrSWImYLHxHrx1ItBQr50I/q2zw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vue/compiler-core": "3.5.24",
+        "@vue/shared": "3.5.24"
+      }
+    },
+    "node_modules/@vue/compiler-sfc": {
+      "version": "3.5.24",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.24.tgz",
+      "integrity": "sha512-8EG5YPRgmTB+YxYBM3VXy8zHD9SWHUJLIGPhDovo3Z8VOgvP+O7UP5vl0J4BBPWYD9vxtBabzW1EuEZ+Cqs14g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/parser": "^7.28.5",
+        "@vue/compiler-core": "3.5.24",
+        "@vue/compiler-dom": "3.5.24",
+        "@vue/compiler-ssr": "3.5.24",
+        "@vue/shared": "3.5.24",
+        "estree-walker": "^2.0.2",
+        "magic-string": "^0.30.21",
+        "postcss": "^8.5.6",
+        "source-map-js": "^1.2.1"
+      }
+    },
+    "node_modules/@vue/compiler-ssr": {
+      "version": "3.5.24",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.24.tgz",
+      "integrity": "sha512-trOvMWNBMQ/odMRHW7Ae1CdfYx+7MuiQu62Jtu36gMLXcaoqKvAyh+P73sYG9ll+6jLB6QPovqoKGGZROzkFFg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vue/compiler-dom": "3.5.24",
+        "@vue/shared": "3.5.24"
+      }
+    },
+    "node_modules/@vue/devtools-api": {
+      "version": "7.7.9",
+      "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-7.7.9.tgz",
+      "integrity": "sha512-kIE8wvwlcZ6TJTbNeU2HQNtaxLx3a84aotTITUuL/4bzfPxzajGBOoqjMhwZJ8L9qFYDU/lAYMEEm11dnZOD6g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vue/devtools-kit": "^7.7.9"
+      }
+    },
+    "node_modules/@vue/devtools-kit": {
+      "version": "7.7.9",
+      "resolved": "https://registry.npmjs.org/@vue/devtools-kit/-/devtools-kit-7.7.9.tgz",
+      "integrity": "sha512-PyQ6odHSgiDVd4hnTP+aDk2X4gl2HmLDfiyEnn3/oV+ckFDuswRs4IbBT7vacMuGdwY/XemxBoh302ctbsptuA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vue/devtools-shared": "^7.7.9",
+        "birpc": "^2.3.0",
+        "hookable": "^5.5.3",
+        "mitt": "^3.0.1",
+        "perfect-debounce": "^1.0.0",
+        "speakingurl": "^14.0.1",
+        "superjson": "^2.2.2"
+      }
+    },
+    "node_modules/@vue/devtools-shared": {
+      "version": "7.7.9",
+      "resolved": "https://registry.npmjs.org/@vue/devtools-shared/-/devtools-shared-7.7.9.tgz",
+      "integrity": "sha512-iWAb0v2WYf0QWmxCGy0seZNDPdO3Sp5+u78ORnyeonS6MT4PC7VPrryX2BpMJrwlDeaZ6BD4vP4XKjK0SZqaeA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "rfdc": "^1.4.1"
+      }
+    },
+    "node_modules/@vue/reactivity": {
+      "version": "3.5.24",
+      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.24.tgz",
+      "integrity": "sha512-BM8kBhtlkkbnyl4q+HiF5R5BL0ycDPfihowulm02q3WYp2vxgPcJuZO866qa/0u3idbMntKEtVNuAUp5bw4teg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vue/shared": "3.5.24"
+      }
+    },
+    "node_modules/@vue/runtime-core": {
+      "version": "3.5.24",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.24.tgz",
+      "integrity": "sha512-RYP/byyKDgNIqfX/gNb2PB55dJmM97jc9wyF3jK7QUInYKypK2exmZMNwnjueWwGceEkP6NChd3D2ZVEp9undQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vue/reactivity": "3.5.24",
+        "@vue/shared": "3.5.24"
+      }
+    },
+    "node_modules/@vue/runtime-dom": {
+      "version": "3.5.24",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.24.tgz",
+      "integrity": "sha512-Z8ANhr/i0XIluonHVjbUkjvn+CyrxbXRIxR7wn7+X7xlcb7dJsfITZbkVOeJZdP8VZwfrWRsWdShH6pngMxRjw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vue/reactivity": "3.5.24",
+        "@vue/runtime-core": "3.5.24",
+        "@vue/shared": "3.5.24",
+        "csstype": "^3.1.3"
+      }
+    },
+    "node_modules/@vue/server-renderer": {
+      "version": "3.5.24",
+      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.24.tgz",
+      "integrity": "sha512-Yh2j2Y4G/0/4z/xJ1Bad4mxaAk++C2v4kaa8oSYTMJBJ00/ndPuxCnWeot0/7/qafQFLh5pr6xeV6SdMcE/G1w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vue/compiler-ssr": "3.5.24",
+        "@vue/shared": "3.5.24"
+      },
+      "peerDependencies": {
+        "vue": "3.5.24"
+      }
+    },
+    "node_modules/@vue/shared": {
+      "version": "3.5.24",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.24.tgz",
+      "integrity": "sha512-9cwHL2EsJBdi8NY22pngYYWzkTDhld6fAD6jlaeloNGciNSJL6bLpbxVgXl96X00Jtc6YWQv96YA/0sxex/k1A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@vueuse/core": {
+      "version": "12.8.2",
+      "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-12.8.2.tgz",
+      "integrity": "sha512-HbvCmZdzAu3VGi/pWYm5Ut+Kd9mn1ZHnn4L5G8kOQTPs/IwIAmJoBrmYk2ckLArgMXZj0AW3n5CAejLUO+PhdQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/web-bluetooth": "^0.0.21",
+        "@vueuse/metadata": "12.8.2",
+        "@vueuse/shared": "12.8.2",
+        "vue": "^3.5.13"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
+    "node_modules/@vueuse/integrations": {
+      "version": "12.8.2",
+      "resolved": "https://registry.npmjs.org/@vueuse/integrations/-/integrations-12.8.2.tgz",
+      "integrity": "sha512-fbGYivgK5uBTRt7p5F3zy6VrETlV9RtZjBqd1/HxGdjdckBgBM4ugP8LHpjolqTj14TXTxSK1ZfgPbHYyGuH7g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vueuse/core": "12.8.2",
+        "@vueuse/shared": "12.8.2",
+        "vue": "^3.5.13"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      },
+      "peerDependencies": {
+        "async-validator": "^4",
+        "axios": "^1",
+        "change-case": "^5",
+        "drauu": "^0.4",
+        "focus-trap": "^7",
+        "fuse.js": "^7",
+        "idb-keyval": "^6",
+        "jwt-decode": "^4",
+        "nprogress": "^0.2",
+        "qrcode": "^1.5",
+        "sortablejs": "^1",
+        "universal-cookie": "^7"
+      },
+      "peerDependenciesMeta": {
+        "async-validator": {
+          "optional": true
+        },
+        "axios": {
+          "optional": true
+        },
+        "change-case": {
+          "optional": true
+        },
+        "drauu": {
+          "optional": true
+        },
+        "focus-trap": {
+          "optional": true
+        },
+        "fuse.js": {
+          "optional": true
+        },
+        "idb-keyval": {
+          "optional": true
+        },
+        "jwt-decode": {
+          "optional": true
+        },
+        "nprogress": {
+          "optional": true
+        },
+        "qrcode": {
+          "optional": true
+        },
+        "sortablejs": {
+          "optional": true
+        },
+        "universal-cookie": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@vueuse/metadata": {
+      "version": "12.8.2",
+      "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-12.8.2.tgz",
+      "integrity": "sha512-rAyLGEuoBJ/Il5AmFHiziCPdQzRt88VxR+Y/A/QhJ1EWtWqPBBAxTAFaSkviwEuOEZNtW8pvkPgoCZQ+HxqW1A==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
+    "node_modules/@vueuse/shared": {
+      "version": "12.8.2",
+      "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-12.8.2.tgz",
+      "integrity": "sha512-dznP38YzxZoNloI0qpEfpkms8knDtaoQ6Y/sfS0L7Yki4zh40LFHEhur0odJC6xTHG5dxWVPiUWBXn+wCG2s5w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "vue": "^3.5.13"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
+    "node_modules/algoliasearch": {
+      "version": "5.44.0",
+      "resolved": "https://registry.npmjs.org/algoliasearch/-/algoliasearch-5.44.0.tgz",
+      "integrity": "sha512-f8IpsbdQjzTjr/4mJ/jv5UplrtyMnnciGax6/B0OnLCs2/GJTK13O4Y7Ff1AvJVAaztanH+m5nzPoUq6EAy+aA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@algolia/abtesting": "1.10.0",
+        "@algolia/client-abtesting": "5.44.0",
+        "@algolia/client-analytics": "5.44.0",
+        "@algolia/client-common": "5.44.0",
+        "@algolia/client-insights": "5.44.0",
+        "@algolia/client-personalization": "5.44.0",
+        "@algolia/client-query-suggestions": "5.44.0",
+        "@algolia/client-search": "5.44.0",
+        "@algolia/ingestion": "1.44.0",
+        "@algolia/monitoring": "1.44.0",
+        "@algolia/recommend": "5.44.0",
+        "@algolia/requester-browser-xhr": "5.44.0",
+        "@algolia/requester-fetch": "5.44.0",
+        "@algolia/requester-node-http": "5.44.0"
+      },
+      "engines": {
+        "node": ">= 14.0.0"
+      }
+    },
+    "node_modules/array-timsort": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/array-timsort/-/array-timsort-1.0.3.tgz",
+      "integrity": "sha512-/+3GRL7dDAGEfM6TseQk/U+mi18TU2Ms9I3UlLdUMhz2hbvGNTKdj9xniwXfUqgYhHxRx0+8UnKkvlNwVU+cWQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/birpc": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/birpc/-/birpc-2.8.0.tgz",
+      "integrity": "sha512-Bz2a4qD/5GRhiHSwj30c/8kC8QGj12nNDwz3D4ErQ4Xhy35dsSDvF+RA/tWpjyU0pdGtSDiEk6B5fBGE1qNVhw==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
+    "node_modules/callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ccount": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/ccount/-/ccount-2.0.1.tgz",
+      "integrity": "sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/chalk": {
+      "version": "5.6.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.6.2.tgz",
+      "integrity": "sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^12.17.0 || ^14.13 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/chalk-template": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/chalk-template/-/chalk-template-1.1.2.tgz",
+      "integrity": "sha512-2bxTP2yUH7AJj/VAXfcA+4IcWGdQ87HwBANLt5XxGTeomo8yG0y95N1um9i5StvhT/Bl0/2cARA5v1PpPXUxUA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "chalk": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk-template?sponsor=1"
+      }
+    },
+    "node_modules/character-entities-html4": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-2.1.0.tgz",
+      "integrity": "sha512-1v7fgQRj6hnSwFpq1Eu0ynr/CDEw0rXo2B61qXrLNdHZmPKgb7fqS1a2JwF0rISo9q77jDI8VMEHoApn8qDoZA==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/character-entities-legacy": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-3.0.0.tgz",
+      "integrity": "sha512-RpPp0asT/6ufRm//AJVwpViZbGM/MkjQFxJccQRHmISF/22NBtsHqAWmL+/pmkPWoIUJdWyeVleTl1wydHATVQ==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/clear-module": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/clear-module/-/clear-module-4.1.2.tgz",
+      "integrity": "sha512-LWAxzHqdHsAZlPlEyJ2Poz6AIs384mPeqLVCru2p0BrP9G/kVGuhNyZYClLO6cXlnuJjzC8xtsJIuMjKqLXoAw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "parent-module": "^2.0.0",
+        "resolve-from": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/comma-separated-tokens": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-2.0.3.tgz",
+      "integrity": "sha512-Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/commander": {
+      "version": "14.0.2",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-14.0.2.tgz",
+      "integrity": "sha512-TywoWNNRbhoD0BXs1P3ZEScW8W5iKrnbithIl0YH+uCmBd0QpPOA8yc82DS3BIE5Ma6FnBVUsJ7wVUDz4dvOWQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=20"
+      }
+    },
+    "node_modules/comment-json": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/comment-json/-/comment-json-4.4.1.tgz",
+      "integrity": "sha512-r1To31BQD5060QdkC+Iheai7gHwoSZobzunqkf2/kQ6xIAfJyrKNAFUwdKvkK7Qgu7pVTKQEa7ok7Ed3ycAJgg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "array-timsort": "^1.0.3",
+        "core-util-is": "^1.0.3",
+        "esprima": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/copy-anything": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-4.0.5.tgz",
+      "integrity": "sha512-7Vv6asjS4gMOuILabD3l739tsaxFQmC+a7pLZm02zyvs8p977bL3zEgq3yDk5rn9B0PbYgIv++jmHcuUab4RhA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-what": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mesqueeb"
+      }
+    },
+    "node_modules/core-util-is": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/cspell": {
+      "version": "9.3.2",
+      "resolved": "https://registry.npmjs.org/cspell/-/cspell-9.3.2.tgz",
+      "integrity": "sha512-3xFyVSTYrYa/QJzLfzsCRMkMXqOsytP8E26DuGrVMJQoLPFmbOXNNtnMu4wrtr17QVloxpvutW77U4vb2L/LDQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@cspell/cspell-json-reporter": "9.3.2",
+        "@cspell/cspell-pipe": "9.3.2",
+        "@cspell/cspell-types": "9.3.2",
+        "@cspell/dynamic-import": "9.3.2",
+        "@cspell/url": "9.3.2",
+        "chalk": "^5.6.2",
+        "chalk-template": "^1.1.2",
+        "commander": "^14.0.2",
+        "cspell-config-lib": "9.3.2",
+        "cspell-dictionary": "9.3.2",
+        "cspell-gitignore": "9.3.2",
+        "cspell-glob": "9.3.2",
+        "cspell-io": "9.3.2",
+        "cspell-lib": "9.3.2",
+        "fast-json-stable-stringify": "^2.1.0",
+        "flatted": "^3.3.3",
+        "semver": "^7.7.3",
+        "tinyglobby": "^0.2.15"
+      },
+      "bin": {
+        "cspell": "bin.mjs",
+        "cspell-esm": "bin.mjs"
+      },
+      "engines": {
+        "node": ">=20"
+      },
+      "funding": {
+        "url": "https://github.com/streetsidesoftware/cspell?sponsor=1"
+      }
+    },
+    "node_modules/cspell-config-lib": {
+      "version": "9.3.2",
+      "resolved": "https://registry.npmjs.org/cspell-config-lib/-/cspell-config-lib-9.3.2.tgz",
+      "integrity": "sha512-zXhmA4rqgWQRTVijI+g/mgiep76TvTO4d+P3CHwcqLG57BKVzoW+jkO4qDLC+Neh4b8+CcNWEIr3w16BfuEJAA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@cspell/cspell-types": "9.3.2",
+        "comment-json": "^4.4.1",
+        "smol-toml": "^1.5.2",
+        "yaml": "^2.8.1"
+      },
+      "engines": {
+        "node": ">=20"
+      }
+    },
+    "node_modules/cspell-dictionary": {
+      "version": "9.3.2",
+      "resolved": "https://registry.npmjs.org/cspell-dictionary/-/cspell-dictionary-9.3.2.tgz",
+      "integrity": "sha512-E3YhOhZzZt1a+AEbFV2B3THCyZ576PDg0mDNUDrU1Y65SyIhf4DC6itfPoAb6R3FI/DI218RqWZg/FTT8lJ2gA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@cspell/cspell-pipe": "9.3.2",
+        "@cspell/cspell-types": "9.3.2",
+        "cspell-trie-lib": "9.3.2",
+        "fast-equals": "^5.3.3"
+      },
+      "engines": {
+        "node": ">=20"
+      }
+    },
+    "node_modules/cspell-gitignore": {
+      "version": "9.3.2",
+      "resolved": "https://registry.npmjs.org/cspell-gitignore/-/cspell-gitignore-9.3.2.tgz",
+      "integrity": "sha512-G2bLR+Dfb9GX4Sdm75GfCCa9V/sQYkRbLckuCuVmJxvcDB0xfczAtb6TfAXIziF3oUI6cOB1g+PoNLWBelcK5w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@cspell/url": "9.3.2",
+        "cspell-glob": "9.3.2",
+        "cspell-io": "9.3.2"
+      },
+      "bin": {
+        "cspell-gitignore": "bin.mjs"
+      },
+      "engines": {
+        "node": ">=20"
+      }
+    },
+    "node_modules/cspell-glob": {
+      "version": "9.3.2",
+      "resolved": "https://registry.npmjs.org/cspell-glob/-/cspell-glob-9.3.2.tgz",
+      "integrity": "sha512-TuSupENEKyOCupOUZ3vnPxaTOghxY/rD1JIkb8e5kjzRprYVilO/rYqEk/52iLwJVd+4Npe8fNhR3KhU7u/UUg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@cspell/url": "9.3.2",
+        "picomatch": "^4.0.3"
+      },
+      "engines": {
+        "node": ">=20"
+      }
+    },
+    "node_modules/cspell-grammar": {
+      "version": "9.3.2",
+      "resolved": "https://registry.npmjs.org/cspell-grammar/-/cspell-grammar-9.3.2.tgz",
+      "integrity": "sha512-ysonrFu9vJvF/derDlEjUfmvLeCfNOWPh00t6Yh093AKrJFoWQiyaS/5bEN/uB5/n1sa4k3ItnWvuTp3+YuZsA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@cspell/cspell-pipe": "9.3.2",
+        "@cspell/cspell-types": "9.3.2"
+      },
+      "bin": {
+        "cspell-grammar": "bin.mjs"
+      },
+      "engines": {
+        "node": ">=20"
+      }
+    },
+    "node_modules/cspell-io": {
+      "version": "9.3.2",
+      "resolved": "https://registry.npmjs.org/cspell-io/-/cspell-io-9.3.2.tgz",
+      "integrity": "sha512-ahoULCp0j12TyXXmIcdO/7x65A/2mzUQO1IkOC65OXEbNT+evt0yswSO5Nr1F6kCHDuEKc46EZWwsYAzj78pMg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@cspell/cspell-service-bus": "9.3.2",
+        "@cspell/url": "9.3.2"
+      },
+      "engines": {
+        "node": ">=20"
+      }
+    },
+    "node_modules/cspell-lib": {
+      "version": "9.3.2",
+      "resolved": "https://registry.npmjs.org/cspell-lib/-/cspell-lib-9.3.2.tgz",
+      "integrity": "sha512-kdk11kib68zNANNICuOA8h4oA9kENQUAdeX/uvT4+7eHbHHV8WSgjXm4k4o/pRIbg164UJTX/XxKb/65ftn5jw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@cspell/cspell-bundled-dicts": "9.3.2",
+        "@cspell/cspell-pipe": "9.3.2",
+        "@cspell/cspell-resolver": "9.3.2",
+        "@cspell/cspell-types": "9.3.2",
+        "@cspell/dynamic-import": "9.3.2",
+        "@cspell/filetypes": "9.3.2",
+        "@cspell/strong-weak-map": "9.3.2",
+        "@cspell/url": "9.3.2",
+        "clear-module": "^4.1.2",
+        "cspell-config-lib": "9.3.2",
+        "cspell-dictionary": "9.3.2",
+        "cspell-glob": "9.3.2",
+        "cspell-grammar": "9.3.2",
+        "cspell-io": "9.3.2",
+        "cspell-trie-lib": "9.3.2",
+        "env-paths": "^3.0.0",
+        "gensequence": "^8.0.8",
+        "import-fresh": "^3.3.1",
+        "resolve-from": "^5.0.0",
+        "vscode-languageserver-textdocument": "^1.0.12",
+        "vscode-uri": "^3.1.0",
+        "xdg-basedir": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=20"
+      }
+    },
+    "node_modules/cspell-trie-lib": {
+      "version": "9.3.2",
+      "resolved": "https://registry.npmjs.org/cspell-trie-lib/-/cspell-trie-lib-9.3.2.tgz",
+      "integrity": "sha512-1Af7Mq9jIccFQyJl/ZCcqQbtJwuDqpQVkk8xfs/92x4OI6gW1iTVRMtsrh0RTw1HZoR8aQD7tRRCiLPf/D+UiQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@cspell/cspell-pipe": "9.3.2",
+        "@cspell/cspell-types": "9.3.2",
+        "gensequence": "^8.0.8"
+      },
+      "engines": {
+        "node": ">=20"
+      }
+    },
+    "node_modules/csstype": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.2.3.tgz",
+      "integrity": "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/dequal": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
+      "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/devlop": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/devlop/-/devlop-1.1.0.tgz",
+      "integrity": "sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "dequal": "^2.0.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/emoji-regex-xs": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex-xs/-/emoji-regex-xs-1.0.0.tgz",
+      "integrity": "sha512-LRlerrMYoIDrT6jgpeZ2YYl/L8EulRTt5hQcYjy5AInh7HWXKimpqx68aknBFpGL2+/IcogTcaydJEgaTmOpDg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/entities": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/env-paths": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-3.0.0.tgz",
+      "integrity": "sha512-dtJUTepzMW3Lm/NPxRf3wP4642UWhjL2sQxc+ym2YMj1m/H2zDNQOlezafzkHwn6sMstjHTwG6iQQsctDW/b1A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/esbuild": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
+      "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "optionalDependencies": {
+        "@esbuild/aix-ppc64": "0.21.5",
+        "@esbuild/android-arm": "0.21.5",
+        "@esbuild/android-arm64": "0.21.5",
+        "@esbuild/android-x64": "0.21.5",
+        "@esbuild/darwin-arm64": "0.21.5",
+        "@esbuild/darwin-x64": "0.21.5",
+        "@esbuild/freebsd-arm64": "0.21.5",
+        "@esbuild/freebsd-x64": "0.21.5",
+        "@esbuild/linux-arm": "0.21.5",
+        "@esbuild/linux-arm64": "0.21.5",
+        "@esbuild/linux-ia32": "0.21.5",
+        "@esbuild/linux-loong64": "0.21.5",
+        "@esbuild/linux-mips64el": "0.21.5",
+        "@esbuild/linux-ppc64": "0.21.5",
+        "@esbuild/linux-riscv64": "0.21.5",
+        "@esbuild/linux-s390x": "0.21.5",
+        "@esbuild/linux-x64": "0.21.5",
+        "@esbuild/netbsd-x64": "0.21.5",
+        "@esbuild/openbsd-x64": "0.21.5",
+        "@esbuild/sunos-x64": "0.21.5",
+        "@esbuild/win32-arm64": "0.21.5",
+        "@esbuild/win32-ia32": "0.21.5",
+        "@esbuild/win32-x64": "0.21.5"
+      }
+    },
+    "node_modules/esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/estree-walker": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
+      "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/fast-equals": {
+      "version": "5.3.3",
+      "resolved": "https://registry.npmjs.org/fast-equals/-/fast-equals-5.3.3.tgz",
+      "integrity": "sha512-/boTcHZeIAQ2r/tL11voclBHDeP9WPxLt+tyAbVSyyXuUFyh0Tne7gJZTqGbxnvj79TjLdCXLOY7UIPhyG5MTw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/fdir": {
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
+      "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "picomatch": "^3 || ^4"
+      },
+      "peerDependenciesMeta": {
+        "picomatch": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/flatted": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz",
+      "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/focus-trap": {
+      "version": "7.6.6",
+      "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-7.6.6.tgz",
+      "integrity": "sha512-v/Z8bvMCajtx4mEXmOo7QEsIzlIOqRXTIwgUfsFOF9gEsespdbD0AkPIka1bSXZ8Y8oZ+2IVDQZePkTfEHZl7Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "tabbable": "^6.3.0"
+      }
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/gensequence": {
+      "version": "8.0.8",
+      "resolved": "https://registry.npmjs.org/gensequence/-/gensequence-8.0.8.tgz",
+      "integrity": "sha512-omMVniXEXpdx/vKxGnPRoO2394Otlze28TyxECbFVyoSpZ9H3EO7lemjcB12OpQJzRW4e5tt/dL1rOxry6aMHg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=20"
+      }
+    },
+    "node_modules/global-directory": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/global-directory/-/global-directory-4.0.1.tgz",
+      "integrity": "sha512-wHTUcDUoZ1H5/0iVqEudYW4/kAlN5cZ3j/bXn0Dpbizl9iaUVeWSHqiOjsgk6OW2bkLclbBjzewBz6weQ1zA2Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ini": "4.1.1"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/hast-util-to-html": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/hast-util-to-html/-/hast-util-to-html-9.0.5.tgz",
+      "integrity": "sha512-OguPdidb+fbHQSU4Q4ZiLKnzWo8Wwsf5bZfbvu7//a9oTYoqD/fWpe96NuHkoS9h0ccGOTe0C4NGXdtS0iObOw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/hast": "^3.0.0",
+        "@types/unist": "^3.0.0",
+        "ccount": "^2.0.0",
+        "comma-separated-tokens": "^2.0.0",
+        "hast-util-whitespace": "^3.0.0",
+        "html-void-elements": "^3.0.0",
+        "mdast-util-to-hast": "^13.0.0",
+        "property-information": "^7.0.0",
+        "space-separated-tokens": "^2.0.0",
+        "stringify-entities": "^4.0.0",
+        "zwitch": "^2.0.4"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/hast-util-whitespace": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/hast-util-whitespace/-/hast-util-whitespace-3.0.0.tgz",
+      "integrity": "sha512-88JUN06ipLwsnv+dVn+OIYOvAuvBMy/Qoi6O7mQHxdPXpjy+Cd6xRkWwux7DKO+4sYILtLBRIKgsdpS2gQc7qw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/hast": "^3.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/hookable": {
+      "version": "5.5.3",
+      "resolved": "https://registry.npmjs.org/hookable/-/hookable-5.5.3.tgz",
+      "integrity": "sha512-Yc+BQe8SvoXH1643Qez1zqLRmbA5rCL+sSmk6TVos0LWVfNIB7PGncdlId77WzLGSIB5KaWgTaNTs2lNVEI6VQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/html-void-elements": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/html-void-elements/-/html-void-elements-3.0.0.tgz",
+      "integrity": "sha512-bEqo66MRXsUGxWHV5IP0PUiAWwoEjba4VCzg0LjFJBpchPaTfyfCKTG6bc5F8ucKec3q5y6qOdGyYTSBEvhCrg==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/import-fresh": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz",
+      "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/import-fresh/node_modules/parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "callsites": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/import-fresh/node_modules/resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/import-meta-resolve": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-4.2.0.tgz",
+      "integrity": "sha512-Iqv2fzaTQN28s/FwZAoFq0ZSs/7hMAHJVX+w8PZl3cY19Pxk6jFFalxQoIfW2826i/fDLXv8IiEZRIT0lDuWcg==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/ini": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.1.tgz",
+      "integrity": "sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/is-what": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/is-what/-/is-what-5.5.0.tgz",
+      "integrity": "sha512-oG7cgbmg5kLYae2N5IVd3jm2s+vldjxJzK1pcu9LfpGuQ93MQSzo0okvRna+7y5ifrD+20FE8FvjusyGaz14fw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mesqueeb"
+      }
+    },
+    "node_modules/magic-string": {
+      "version": "0.30.21",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz",
+      "integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/sourcemap-codec": "^1.5.5"
+      }
+    },
+    "node_modules/mark.js": {
+      "version": "8.11.1",
+      "resolved": "https://registry.npmjs.org/mark.js/-/mark.js-8.11.1.tgz",
+      "integrity": "sha512-1I+1qpDt4idfgLQG+BNWmrqku+7/2bi5nLf4YwF8y8zXvmfiTBY3PV3ZibfrjBueCByROpuBjLLFCajqkgYoLQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/mdast-util-to-hast": {
+      "version": "13.2.1",
+      "resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-13.2.1.tgz",
+      "integrity": "sha512-cctsq2wp5vTsLIcaymblUriiTcZd0CwWtCbLvrOzYCDZoWyMNV8sZ7krj09FSnsiJi3WVsHLM4k6Dq/yaPyCXA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/hast": "^3.0.0",
+        "@types/mdast": "^4.0.0",
+        "@ungap/structured-clone": "^1.0.0",
+        "devlop": "^1.0.0",
+        "micromark-util-sanitize-uri": "^2.0.0",
+        "trim-lines": "^3.0.0",
+        "unist-util-position": "^5.0.0",
+        "unist-util-visit": "^5.0.0",
+        "vfile": "^6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/micromark-util-character": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.1.tgz",
+      "integrity": "sha512-wv8tdUTJ3thSFFFJKtpYKOYiGP2+v96Hvk4Tu8KpCAsTMs6yi+nVmGh1syvSCsaxz45J6Jbw+9DD6g97+NV67Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-util-encode": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-encode/-/micromark-util-encode-2.0.1.tgz",
+      "integrity": "sha512-c3cVx2y4KqUnwopcO9b/SCdo2O67LwJJ/UyqGfbigahfegL9myoEFoDYZgkT7f36T0bLrM9hZTAaAyH+PCAXjw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/micromark-util-sanitize-uri": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-2.0.1.tgz",
+      "integrity": "sha512-9N9IomZ/YuGGZZmQec1MbgxtlgougxTodVwDzzEouPKo3qFWvymFHWcnDi2vzV1ff6kas9ucW+o3yzJK9YB1AQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-encode": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-util-symbol": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.1.tgz",
+      "integrity": "sha512-vs5t8Apaud9N28kgCrRUdEed4UJ+wWNvicHLPxCa9ENlYuAY31M0ETy5y1vA33YoNPDFTghEbnh6efaE8h4x0Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/micromark-util-types": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/micromark-util-types/-/micromark-util-types-2.0.2.tgz",
+      "integrity": "sha512-Yw0ECSpJoViF1qTU4DC6NwtC4aWGt1EkzaQB8KPPyCRR8z9TWeV0HbEFGTO+ZY1wB22zmxnJqhPyTpOVCpeHTA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/minisearch": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/minisearch/-/minisearch-7.2.0.tgz",
+      "integrity": "sha512-dqT2XBYUOZOiC5t2HRnwADjhNS2cecp9u+TJRiJ1Qp/f5qjkeT5APcGPjHw+bz89Ms8Jp+cG4AlE+QZ/QnDglg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/mitt": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.1.tgz",
+      "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/nanoid": {
+      "version": "3.3.11",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
+      "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
+    },
+    "node_modules/oniguruma-to-es": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/oniguruma-to-es/-/oniguruma-to-es-3.1.1.tgz",
+      "integrity": "sha512-bUH8SDvPkH3ho3dvwJwfonjlQ4R80vjyvrU8YpxuROddv55vAEJrTuCuCVUhhsHbtlD9tGGbaNApGQckXhS8iQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex-xs": "^1.0.0",
+        "regex": "^6.0.1",
+        "regex-recursion": "^6.0.2"
+      }
+    },
+    "node_modules/parent-module": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-2.0.0.tgz",
+      "integrity": "sha512-uo0Z9JJeWzv8BG+tRcapBKNJ0dro9cLyczGzulS6EfeyAdeC9sbojtW6XwvYxJkEne9En+J2XEl4zyglVeIwFg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "callsites": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/perfect-debounce": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/perfect-debounce/-/perfect-debounce-1.0.0.tgz",
+      "integrity": "sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/picocolors": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/picomatch": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/postcss": {
+      "version": "8.5.6",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz",
+      "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "nanoid": "^3.3.11",
+        "picocolors": "^1.1.1",
+        "source-map-js": "^1.2.1"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      }
+    },
+    "node_modules/preact": {
+      "version": "10.27.2",
+      "resolved": "https://registry.npmjs.org/preact/-/preact-10.27.2.tgz",
+      "integrity": "sha512-5SYSgFKSyhCbk6SrXyMpqjb5+MQBgfvEKE/OC+PujcY34sOpqtr+0AZQtPYx5IA6VxynQ7rUPCtKzyovpj9Bpg==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/preact"
+      }
+    },
+    "node_modules/prettier": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz",
+      "integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "prettier": "bin/prettier.cjs"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/prettier/prettier?sponsor=1"
+      }
+    },
+    "node_modules/property-information": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/property-information/-/property-information-7.1.0.tgz",
+      "integrity": "sha512-TwEZ+X+yCJmYfL7TPUOcvBZ4QfoT5YenQiJuX//0th53DE6w0xxLEtfK3iyryQFddXuvkIk51EEgrJQ0WJkOmQ==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/regex": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/regex/-/regex-6.0.1.tgz",
+      "integrity": "sha512-uorlqlzAKjKQZ5P+kTJr3eeJGSVroLKoHmquUj4zHWuR+hEyNqlXsSKlYYF5F4NI6nl7tWCs0apKJ0lmfsXAPA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "regex-utilities": "^2.3.0"
+      }
+    },
+    "node_modules/regex-recursion": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/regex-recursion/-/regex-recursion-6.0.2.tgz",
+      "integrity": "sha512-0YCaSCq2VRIebiaUviZNs0cBz1kg5kVS2UKUfNIx8YVs1cN3AV7NTctO5FOKBA+UT2BPJIWZauYHPqJODG50cg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "regex-utilities": "^2.3.0"
+      }
+    },
+    "node_modules/regex-utilities": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/regex-utilities/-/regex-utilities-2.3.0.tgz",
+      "integrity": "sha512-8VhliFJAWRaUiVvREIiW2NXXTmHs4vMNnSzuJVhscgmGav3g9VDxLrQndI3dZZVVdp0ZO/5v0xmX516/7M9cng==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/resolve-from": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/rfdc": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz",
+      "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/rollup": {
+      "version": "4.53.3",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.53.3.tgz",
+      "integrity": "sha512-w8GmOxZfBmKknvdXU1sdM9NHcoQejwF/4mNgj2JuEEdRaHwwF12K7e9eXn1nLZ07ad+du76mkVsyeb2rKGllsA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree": "1.0.8"
+      },
+      "bin": {
+        "rollup": "dist/bin/rollup"
+      },
+      "engines": {
+        "node": ">=18.0.0",
+        "npm": ">=8.0.0"
+      },
+      "optionalDependencies": {
+        "@rollup/rollup-android-arm-eabi": "4.53.3",
+        "@rollup/rollup-android-arm64": "4.53.3",
+        "@rollup/rollup-darwin-arm64": "4.53.3",
+        "@rollup/rollup-darwin-x64": "4.53.3",
+        "@rollup/rollup-freebsd-arm64": "4.53.3",
+        "@rollup/rollup-freebsd-x64": "4.53.3",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.53.3",
+        "@rollup/rollup-linux-arm-musleabihf": "4.53.3",
+        "@rollup/rollup-linux-arm64-gnu": "4.53.3",
+        "@rollup/rollup-linux-arm64-musl": "4.53.3",
+        "@rollup/rollup-linux-loong64-gnu": "4.53.3",
+        "@rollup/rollup-linux-ppc64-gnu": "4.53.3",
+        "@rollup/rollup-linux-riscv64-gnu": "4.53.3",
+        "@rollup/rollup-linux-riscv64-musl": "4.53.3",
+        "@rollup/rollup-linux-s390x-gnu": "4.53.3",
+        "@rollup/rollup-linux-x64-gnu": "4.53.3",
+        "@rollup/rollup-linux-x64-musl": "4.53.3",
+        "@rollup/rollup-openharmony-arm64": "4.53.3",
+        "@rollup/rollup-win32-arm64-msvc": "4.53.3",
+        "@rollup/rollup-win32-ia32-msvc": "4.53.3",
+        "@rollup/rollup-win32-x64-gnu": "4.53.3",
+        "@rollup/rollup-win32-x64-msvc": "4.53.3",
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/search-insights": {
+      "version": "2.17.3",
+      "resolved": "https://registry.npmjs.org/search-insights/-/search-insights-2.17.3.tgz",
+      "integrity": "sha512-RQPdCYTa8A68uM2jwxoY842xDhvx3E5LFL1LxvxCNMev4o5mLuokczhzjAgGwUZBAmOKZknArSxLKmXtIi2AxQ==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/semver": {
+      "version": "7.7.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
+      "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/shiki": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/shiki/-/shiki-2.5.0.tgz",
+      "integrity": "sha512-mI//trrsaiCIPsja5CNfsyNOqgAZUb6VpJA+340toL42UpzQlXpwRV9nch69X6gaUxrr9kaOOa6e3y3uAkGFxQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@shikijs/core": "2.5.0",
+        "@shikijs/engine-javascript": "2.5.0",
+        "@shikijs/engine-oniguruma": "2.5.0",
+        "@shikijs/langs": "2.5.0",
+        "@shikijs/themes": "2.5.0",
+        "@shikijs/types": "2.5.0",
+        "@shikijs/vscode-textmate": "^10.0.2",
+        "@types/hast": "^3.0.4"
+      }
+    },
+    "node_modules/smol-toml": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/smol-toml/-/smol-toml-1.5.2.tgz",
+      "integrity": "sha512-QlaZEqcAH3/RtNyet1IPIYPsEWAaYyXXv1Krsi+1L/QHppjX4Ifm8MQsBISz9vE8cHicIq3clogsheili5vhaQ==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">= 18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/cyyynthia"
+      }
+    },
+    "node_modules/source-map-js": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
+      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/space-separated-tokens": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-2.0.2.tgz",
+      "integrity": "sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/speakingurl": {
+      "version": "14.0.1",
+      "resolved": "https://registry.npmjs.org/speakingurl/-/speakingurl-14.0.1.tgz",
+      "integrity": "sha512-1POYv7uv2gXoyGFpBCmpDVSNV74IfsWlDW216UPjbWufNf+bSU6GdbDsxdcxtfwb4xlI3yxzOTKClUosxARYrQ==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/stringify-entities": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-4.0.4.tgz",
+      "integrity": "sha512-IwfBptatlO+QCJUo19AqvrPNqlVMpW9YEL2LIVY+Rpv2qsjCGxaDLNRgeGsQWJhfItebuJhsGSLjaBbNSQ+ieg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "character-entities-html4": "^2.0.0",
+        "character-entities-legacy": "^3.0.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/superjson": {
+      "version": "2.2.5",
+      "resolved": "https://registry.npmjs.org/superjson/-/superjson-2.2.5.tgz",
+      "integrity": "sha512-zWPTX96LVsA/eVYnqOM2+ofcdPqdS1dAF1LN4TS2/MWuUpfitd9ctTa87wt4xrYnZnkLtS69xpBdSxVBP5Rm6w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "copy-anything": "^4"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/tabbable": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.3.0.tgz",
+      "integrity": "sha512-EIHvdY5bPLuWForiR/AN2Bxngzpuwn1is4asboytXtpTgsArc+WmSJKVLlhdh71u7jFcryDqB2A8lQvj78MkyQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/tinyglobby": {
+      "version": "0.2.15",
+      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz",
+      "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fdir": "^6.5.0",
+        "picomatch": "^4.0.3"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/SuperchupuDev"
+      }
+    },
+    "node_modules/trim-lines": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/trim-lines/-/trim-lines-3.0.1.tgz",
+      "integrity": "sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/unist-util-is": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-6.0.1.tgz",
+      "integrity": "sha512-LsiILbtBETkDz8I9p1dQ0uyRUWuaQzd/cuEeS1hoRSyW5E5XGmTzlwY1OrNzzakGowI9Dr/I8HVaw4hTtnxy8g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/unist": "^3.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/unist-util-position": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/unist-util-position/-/unist-util-position-5.0.0.tgz",
+      "integrity": "sha512-fucsC7HjXvkB5R3kTCO7kUjRdrS0BJt3M/FPxmHMBOm8JQi2BsHAHFsy27E0EolP8rp0NzXsJ+jNPyDWvOJZPA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/unist": "^3.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/unist-util-stringify-position": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-4.0.0.tgz",
+      "integrity": "sha512-0ASV06AAoKCDkS2+xw5RXJywruurpbC4JZSm7nr7MOt1ojAzvyyaO+UxZf18j8FCF6kmzCZKcAgN/yu2gm2XgQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/unist": "^3.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/unist-util-visit": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-5.0.0.tgz",
+      "integrity": "sha512-MR04uvD+07cwl/yhVuVWAtw+3GOR/knlL55Nd/wAdblk27GCVt3lqpTivy/tkJcZoNPzTwS1Y+KMojlLDhoTzg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/unist": "^3.0.0",
+        "unist-util-is": "^6.0.0",
+        "unist-util-visit-parents": "^6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/unist-util-visit-parents": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-6.0.2.tgz",
+      "integrity": "sha512-goh1s1TBrqSqukSc8wrjwWhL0hiJxgA8m4kFxGlQ+8FYQ3C/m11FcTs4YYem7V664AhHVvgoQLk890Ssdsr2IQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/unist": "^3.0.0",
+        "unist-util-is": "^6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/vfile": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/vfile/-/vfile-6.0.3.tgz",
+      "integrity": "sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/unist": "^3.0.0",
+        "vfile-message": "^4.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/vfile-message": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-4.0.3.tgz",
+      "integrity": "sha512-QTHzsGd1EhbZs4AsQ20JX1rC3cOlt/IWJruk893DfLRr57lcnOeMaWG4K0JrRta4mIJZKth2Au3mM3u03/JWKw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/unist": "^3.0.0",
+        "unist-util-stringify-position": "^4.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/vite": {
+      "version": "5.4.21",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.21.tgz",
+      "integrity": "sha512-o5a9xKjbtuhY6Bi5S3+HvbRERmouabWbyUcpXXUA1u+GNUKoROi9byOJ8M0nHbHYHkYICiMlqxkg1KkYmm25Sw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "esbuild": "^0.21.3",
+        "postcss": "^8.4.43",
+        "rollup": "^4.20.0"
+      },
+      "bin": {
+        "vite": "bin/vite.js"
+      },
+      "engines": {
+        "node": "^18.0.0 || >=20.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/vitejs/vite?sponsor=1"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.3"
+      },
+      "peerDependencies": {
+        "@types/node": "^18.0.0 || >=20.0.0",
+        "less": "*",
+        "lightningcss": "^1.21.0",
+        "sass": "*",
+        "sass-embedded": "*",
+        "stylus": "*",
+        "sugarss": "*",
+        "terser": "^5.4.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        },
+        "less": {
+          "optional": true
+        },
+        "lightningcss": {
+          "optional": true
+        },
+        "sass": {
+          "optional": true
+        },
+        "sass-embedded": {
+          "optional": true
+        },
+        "stylus": {
+          "optional": true
+        },
+        "sugarss": {
+          "optional": true
+        },
+        "terser": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/vitepress": {
+      "version": "1.6.4",
+      "resolved": "https://registry.npmjs.org/vitepress/-/vitepress-1.6.4.tgz",
+      "integrity": "sha512-+2ym1/+0VVrbhNyRoFFesVvBvHAVMZMK0rw60E3X/5349M1GuVdKeazuksqopEdvkKwKGs21Q729jX81/bkBJg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@docsearch/css": "3.8.2",
+        "@docsearch/js": "3.8.2",
+        "@iconify-json/simple-icons": "^1.2.21",
+        "@shikijs/core": "^2.1.0",
+        "@shikijs/transformers": "^2.1.0",
+        "@shikijs/types": "^2.1.0",
+        "@types/markdown-it": "^14.1.2",
+        "@vitejs/plugin-vue": "^5.2.1",
+        "@vue/devtools-api": "^7.7.0",
+        "@vue/shared": "^3.5.13",
+        "@vueuse/core": "^12.4.0",
+        "@vueuse/integrations": "^12.4.0",
+        "focus-trap": "^7.6.4",
+        "mark.js": "8.11.1",
+        "minisearch": "^7.1.1",
+        "shiki": "^2.1.0",
+        "vite": "^5.4.14",
+        "vue": "^3.5.13"
+      },
+      "bin": {
+        "vitepress": "bin/vitepress.js"
+      },
+      "peerDependencies": {
+        "markdown-it-mathjax3": "^4",
+        "postcss": "^8"
+      },
+      "peerDependenciesMeta": {
+        "markdown-it-mathjax3": {
+          "optional": true
+        },
+        "postcss": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/vscode-languageserver-textdocument": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.12.tgz",
+      "integrity": "sha512-cxWNPesCnQCcMPeenjKKsOCKQZ/L6Tv19DTRIGuLWe32lyzWhihGVJ/rcckZXJxfdKCFvRLS3fpBIsV/ZGX4zA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/vscode-uri": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.1.0.tgz",
+      "integrity": "sha512-/BpdSx+yCQGnCvecbyXdxHDkuk55/G3xwnC0GqY4gmQ3j+A+g8kzzgB4Nk/SINjqn6+waqw3EgbVF2QKExkRxQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/vue": {
+      "version": "3.5.24",
+      "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.24.tgz",
+      "integrity": "sha512-uTHDOpVQTMjcGgrqFPSb8iO2m1DUvo+WbGqoXQz8Y1CeBYQ0FXf2z1gLRaBtHjlRz7zZUBHxjVB5VTLzYkvftg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vue/compiler-dom": "3.5.24",
+        "@vue/compiler-sfc": "3.5.24",
+        "@vue/runtime-dom": "3.5.24",
+        "@vue/server-renderer": "3.5.24",
+        "@vue/shared": "3.5.24"
+      },
+      "peerDependencies": {
+        "typescript": "*"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/xdg-basedir": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-5.1.0.tgz",
+      "integrity": "sha512-GCPAHLvrIH13+c0SuacwvRYj2SxJXQ4kaVTT5xgL3kPrz56XxkF21IGhjSE1+W0aw7gpBWRGXLCPnPby6lSpmQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/yaml": {
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.1.tgz",
+      "integrity": "sha512-lcYcMxX2PO9XMGvAJkJ3OsNMw+/7FKes7/hgerGUYWIoWu5j/+YQqcZr5JnPZWzOsEBgMbSbiSTn/dv/69Mkpw==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "yaml": "bin.mjs"
+      },
+      "engines": {
+        "node": ">= 14.6"
+      }
+    },
+    "node_modules/zwitch": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-2.0.4.tgz",
+      "integrity": "sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    }
+  }
+}
diff --git a/docs/package.json b/docs/package.json
index 6904b5e5..b73a0a20 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -1,25 +1,25 @@
 {
-  "name": "docs",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "dev": "vitepress dev",
-    "build": "vitepress build",
-    "preview": "vitepress preview",
-    "format": "prettier --write \"**/*.md\" \"**/*.mts\"",
-    "format:check": "prettier --check \"**/*.md\" \"**/*.mts\"",
-    "spell": "cspell \"**/*.md\" \"**/*.mts\"",
-    "spell:check": "cspell \"**/*.md\" \"**/*.mts\""
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "devDependencies": {
-    "@cspell/dict-en-gb": "^5.0.19",
-    "cspell": "^9.3.2",
-    "prettier": "^3.6.2",
-    "vitepress": "^1.6.4",
-    "vue": "^3.5.24"
-  }
-}
+    "name": "docs",
+    "version": "1.0.0",
+    "description": "",
+    "main": "index.js",
+    "scripts": {
+        "dev": "vitepress dev --host",
+        "build": "vitepress build",
+        "preview": "vitepress preview",
+        "format": "prettier --write \"**/*.md\" \"**/*.mts\"",
+        "format:check": "prettier --check \"**/*.md\" \"**/*.mts\"",
+        "spell": "cspell \"**/*.md\" \"**/*.mts\"",
+        "spell:check": "cspell \"**/*.md\" \"**/*.mts\""
+    },
+    "keywords": [],
+    "author": "",
+    "license": "ISC",
+    "devDependencies": {
+        "@cspell/dict-en-gb": "^5.0.19",
+        "cspell": "^9.3.2",
+        "prettier": "^3.6.2",
+        "vitepress": "^1.6.4",
+        "vue": "^3.5.24"
+    }
+}
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
deleted file mode 100644
index 9e0474fd..00000000
--- a/package-lock.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "name": "vault-link",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {}
-}

From ea603f83fd563ef2bf0e1b058eb66392c4806dd0 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 6 Dec 2025 21:25:30 +0000
Subject: [PATCH 713/761] Fix HTTP method of the server

---
 frontend/sync-client/src/consts.ts |  2 +-
 frontend/test-client/src/cli.ts    | 22 +++++++++++-----------
 sync-server/src/consts.rs          |  2 +-
 sync-server/src/server.rs          |  4 ++--
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/frontend/sync-client/src/consts.ts b/frontend/sync-client/src/consts.ts
index b90c48c3..da70ba47 100644
--- a/frontend/sync-client/src/consts.ts
+++ b/frontend/sync-client/src/consts.ts
@@ -2,5 +2,5 @@ export const TIMEOUT_FOR_MERGING_HISTORY_ENTRIES_IN_SECONDS = 60;
 export const DIFF_CACHE_SIZE_MB = 2;
 export const MAX_LOG_MESSAGE_COUNT = 100000;
 export const MAX_HISTORY_ENTRY_COUNT = 5000;
-export const SUPPORTED_API_VERSION = 1;
+export const SUPPORTED_API_VERSION = 2;
 export const WEBSOCKET_DISCONNECT_TIMEOUT_IN_S = 10;
diff --git a/frontend/test-client/src/cli.ts b/frontend/test-client/src/cli.ts
index 08dbf472..ca433300 100644
--- a/frontend/test-client/src/cli.ts
+++ b/frontend/test-client/src/cli.ts
@@ -118,22 +118,12 @@ async function runTest({
 
 async function runTests(): Promise<void> {
 	for (let i = 0; i < TEST_ITERATIONS; i++) {
-		await runTest({
-			agentCount: 2,
-			concurrency: 16,
-			iterations: 100,
-			doDeletes: true,
-			doResets: true,
-			useSlowFileEvents: true,
-			jitterScaleInSeconds: 0.75
-		});
-
 		for (const useSlowFileEvents of [false, true]) {
 			for (const concurrency of [
 				16,
 				1 // test with concurrency 1 to check for deadlocks
 			]) {
-				for (const doDeletes of [true, false]) {
+				for (const doDeletes of [false, true]) {
 					await runTest({
 						agentCount: 2,
 						concurrency,
@@ -146,6 +136,16 @@ async function runTests(): Promise<void> {
 				}
 			}
 		}
+
+		await runTest({
+			agentCount: 2,
+			concurrency: 16,
+			iterations: 100,
+			doDeletes: true,
+			doResets: true,
+			useSlowFileEvents: true,
+			jitterScaleInSeconds: 0.75
+		});
 	}
 }
 
diff --git a/sync-server/src/consts.rs b/sync-server/src/consts.rs
index 3c672520..0d4e67a1 100644
--- a/sync-server/src/consts.rs
+++ b/sync-server/src/consts.rs
@@ -17,4 +17,4 @@ pub const DEFAULT_LOG_ROTATION_INTERVAL: Duration = Duration::from_secs(60 * 60
 
 pub const DEFAULT_MERGEABLE_FILE_EXTENSIONS: &[&str] = &["md", "txt"];
 
-pub const SUPPORTED_API_VERSION: u32 = 1;
+pub const SUPPORTED_API_VERSION: u32 = 2;
diff --git a/sync-server/src/server.rs b/sync-server/src/server.rs
index a5506683..168f1253 100644
--- a/sync-server/src/server.rs
+++ b/sync-server/src/server.rs
@@ -126,11 +126,11 @@ fn get_authed_routes(app_state: AppState) -> Router<AppState> {
         )
         .route(
             "/vaults/:vault_id/documents/:document_id/versions/:version_id",
-            put(fetch_document_version::fetch_document_version),
+            get(fetch_document_version::fetch_document_version),
         )
         .route(
             "/vaults/:vault_id/documents/:document_id/versions/:version_id/content",
-            put(fetch_document_version_content::fetch_document_version_content),
+            get(fetch_document_version_content::fetch_document_version_content),
         )
         .route(
             "/vaults/:vault_id/documents/:document_id",

From d979963f8611caeb7bb9f18a59943f91fb20a7d5 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 6 Dec 2025 22:00:54 +0000
Subject: [PATCH 714/761] Fix http error handling in the client service

---
 .../sync-client/src/services/sync-service.ts  | 126 ++++++++++--------
 1 file changed, 72 insertions(+), 54 deletions(-)

diff --git a/frontend/sync-client/src/services/sync-service.ts b/frontend/sync-client/src/services/sync-service.ts
index 7d031c2e..6850cb2b 100644
--- a/frontend/sync-client/src/services/sync-service.ts
+++ b/frontend/sync-client/src/services/sync-service.ts
@@ -40,6 +40,21 @@ export class SyncService {
 		this.pingClient = unboundFetch;
 	}
 
+	private static async errorFromResponse(
+		response: Response
+	): Promise<string> {
+		if (
+			response.headers
+				.get("Content-Type")
+				?.includes("application/json") == true
+		) {
+			const result: SerializedError =
+				(await response.json()) as SerializedError; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+			return SyncService.formatError(result);
+		}
+		return `HTTP ${response.status}: ${response.statusText}`;
+	}
+
 	private static formatError(error: SerializedError): string {
 		let result = error.message;
 		if (error.causes.length > 0) {
@@ -80,17 +95,17 @@ export class SyncService {
 				headers: this.getDefaultHeaders()
 			});
 
-			const result: SerializedError | DocumentVersionWithoutContent =
-				(await response.json()) as  // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
-					| SerializedError
-					| DocumentVersionWithoutContent;
-
-			if ("errorType" in result) {
+			if (!response.ok) {
 				throw new Error(
-					`Failed to create document: ${SyncService.formatError(result)}`
+					`Failed to create document: ${await SyncService.errorFromResponse(
+						response
+					)}`
 				);
 			}
 
+			const result: DocumentVersionWithoutContent =
+				(await response.json()) as DocumentVersionWithoutContent; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+
 			this.logger.debug(`Created document ${JSON.stringify(result)}`);
 
 			return result;
@@ -128,17 +143,17 @@ export class SyncService {
 				}
 			);
 
-			const result: SerializedError | DocumentUpdateResponse =
-				(await response.json()) as  // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
-					| SerializedError
-					| DocumentUpdateResponse;
-
-			if ("errorType" in result) {
+			if (!response.ok) {
 				throw new Error(
-					`Failed to update document: ${SyncService.formatError(result)}`
+					`Failed to update document: ${await SyncService.errorFromResponse(
+						response
+					)}`
 				);
 			}
 
+			const result: DocumentUpdateResponse =
+				(await response.json()) as DocumentUpdateResponse; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+
 			this.logger.debug(
 				`Updated document ${JSON.stringify(result)} with id ${
 					result.documentId
@@ -181,17 +196,17 @@ export class SyncService {
 				}
 			);
 
-			const result: SerializedError | DocumentUpdateResponse =
-				(await response.json()) as  // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
-					| SerializedError
-					| DocumentUpdateResponse;
-
-			if ("errorType" in result) {
+			if (!response.ok) {
 				throw new Error(
-					`Failed to update document: ${SyncService.formatError(result)}`
+					`Failed to update document: ${await SyncService.errorFromResponse(
+						response
+					)}`
 				);
 			}
 
+			const result: DocumentUpdateResponse =
+				(await response.json()) as DocumentUpdateResponse; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+
 			this.logger.debug(
 				`Updated document ${JSON.stringify(result)} with id ${
 					result.documentId
@@ -227,17 +242,17 @@ export class SyncService {
 				}
 			);
 
-			const result: SerializedError | DocumentVersionWithoutContent =
-				(await response.json()) as  // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
-					| SerializedError
-					| DocumentVersionWithoutContent;
-
-			if ("errorType" in result) {
+			if (!response.ok) {
 				throw new Error(
-					`Failed to delete document: ${SyncService.formatError(result)}`
+					`Failed to delete document: ${await SyncService.errorFromResponse(
+						response
+					)}`
 				);
 			}
 
+			const result: DocumentVersionWithoutContent =
+				(await response.json()) as DocumentVersionWithoutContent; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+
 			this.logger.debug(
 				`Deleted document ${relativePath} with id ${documentId}`
 			);
@@ -261,15 +276,17 @@ export class SyncService {
 				}
 			);
 
-			const result: SerializedError | DocumentVersion =
-				(await response.json()) as SerializedError | DocumentVersion; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
-
-			if ("errorType" in result) {
+			if (!response.ok) {
 				throw new Error(
-					`Failed to get document: ${SyncService.formatError(result)}`
+					`Failed to get document: ${await SyncService.errorFromResponse(
+						response
+					)}`
 				);
 			}
 
+			const result: DocumentVersion =
+				(await response.json()) as DocumentVersion; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+
 			this.logger.debug(`Got document ${JSON.stringify(result)}`);
 
 			return result;
@@ -297,20 +314,19 @@ export class SyncService {
 				}
 			);
 
-			if (response.ok) {
-				const result = await response.bytes();
-				this.logger.debug(
-					`Got document version content for document ${documentId} version ${vaultUpdateId}`
+			if (!response.ok) {
+				throw new Error(
+					`Failed to get document: ${await SyncService.errorFromResponse(
+						response
+					)}`
 				);
-				return result;
 			}
 
-			const result: SerializedError =
-				(await response.json()) as SerializedError; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
-
-			throw new Error(
-				`Failed to get document: ${SyncService.formatError(result)}`
+			const result = await response.bytes();
+			this.logger.debug(
+				`Got document version content for document ${documentId} version ${vaultUpdateId}`
 			);
+			return result;
 		});
 	}
 
@@ -331,17 +347,17 @@ export class SyncService {
 				headers: this.getDefaultHeaders()
 			});
 
-			const result: SerializedError | FetchLatestDocumentsResponse =
-				(await response.json()) as  // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
-					| SerializedError
-					| FetchLatestDocumentsResponse;
-
-			if ("errorType" in result) {
+			if (!response.ok) {
 				throw new Error(
-					`Failed to get documents: ${SyncService.formatError(result)}`
+					`Failed to get documents: ${await SyncService.errorFromResponse(
+						response
+					)}`
 				);
 			}
 
+			const result: FetchLatestDocumentsResponse =
+				(await response.json()) as FetchLatestDocumentsResponse; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+
 			this.logger.debug(
 				`Got ${result.latestDocuments.length} document metadata`
 			);
@@ -355,15 +371,17 @@ export class SyncService {
 		const response = await this.pingClient(this.getUrl("/ping"), {
 			headers: this.getDefaultHeaders()
 		});
-		const result: PingResponse | SerializedError =
-			(await response.json()) as PingResponse | SerializedError; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
 
-		if ("errorType" in result) {
+		if (!response.ok) {
 			throw new Error(
-				`Failed to ping server: ${SyncService.formatError(result)}`
+				`Failed to ping server: ${await SyncService.errorFromResponse(
+					response
+				)}`
 			);
 		}
 
+		const result: PingResponse = (await response.json()) as PingResponse; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+
 		this.logger.debug(
 			`Pinged server, got response: ${JSON.stringify(result)}`
 		);

From e6f754311463daa628295943085235bc91433fa9 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 6 Dec 2025 22:01:01 +0000
Subject: [PATCH 715/761] Fix broken endpoint

---
 sync-server/src/server.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sync-server/src/server.rs b/sync-server/src/server.rs
index 168f1253..f8a2e574 100644
--- a/sync-server/src/server.rs
+++ b/sync-server/src/server.rs
@@ -125,11 +125,11 @@ fn get_authed_routes(app_state: AppState) -> Router<AppState> {
             put(update_document::update_text),
         )
         .route(
-            "/vaults/:vault_id/documents/:document_id/versions/:version_id",
+            "/vaults/:vault_id/documents/:document_id/versions/:vault_update_id",
             get(fetch_document_version::fetch_document_version),
         )
         .route(
-            "/vaults/:vault_id/documents/:document_id/versions/:version_id/content",
+            "/vaults/:vault_id/documents/:document_id/versions/:vault_update_id/content",
             get(fetch_document_version_content::fetch_document_version_content),
         )
         .route(

From 2885026d2f8d4458433e543f52eb9a3de0586e86 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 6 Dec 2025 22:14:20 +0000
Subject: [PATCH 716/761] Remove serde_with and use human serde instead

---
 sync-server/Cargo.lock                    | 206 +---------------------
 sync-server/Cargo.toml                    |   1 -
 sync-server/config-e2e.yml                |   4 +-
 sync-server/src/app_state/database.rs     |   2 +
 sync-server/src/config/database_config.rs |   5 +-
 sync-server/src/config/server_config.rs   |   9 +-
 sync-server/src/consts.rs                 |   2 +-
 sync-server/src/server.rs                 |   6 +-
 8 files changed, 21 insertions(+), 214 deletions(-)

diff --git a/sync-server/Cargo.lock b/sync-server/Cargo.lock
index 31b03207..531c30dc 100644
--- a/sync-server/Cargo.lock
+++ b/sync-server/Cargo.lock
@@ -252,7 +252,7 @@ version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b2c550fa5c1a07bbc41dbec1dcd4d0e3de230b9072ab8fb70c55d7d37693d66d"
 dependencies = [
- "darling 0.20.10",
+ "darling",
  "heck",
  "proc-macro-error",
  "quote",
@@ -497,18 +497,8 @@ version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989"
 dependencies = [
- "darling_core 0.20.10",
- "darling_macro 0.20.10",
-]
-
-[[package]]
-name = "darling"
-version = "0.21.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0"
-dependencies = [
- "darling_core 0.21.3",
- "darling_macro 0.21.3",
+ "darling_core",
+ "darling_macro",
 ]
 
 [[package]]
@@ -525,38 +515,13 @@ dependencies = [
  "syn 2.0.90",
 ]
 
-[[package]]
-name = "darling_core"
-version = "0.21.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1247195ecd7e3c85f83c8d2a366e4210d588e802133e1e355180a9870b517ea4"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2",
- "quote",
- "strsim",
- "syn 2.0.90",
-]
-
 [[package]]
 name = "darling_macro"
 version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
- "darling_core 0.20.10",
- "quote",
- "syn 2.0.90",
-]
-
-[[package]]
-name = "darling_macro"
-version = "0.21.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81"
-dependencies = [
- "darling_core 0.21.3",
+ "darling_core",
  "quote",
  "syn 2.0.90",
 ]
@@ -578,16 +543,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "deranged"
-version = "0.3.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
-dependencies = [
- "powerfmt",
- "serde",
-]
-
 [[package]]
 name = "digest"
 version = "0.10.7"
@@ -617,12 +572,6 @@ version = "0.15.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b"
 
-[[package]]
-name = "dyn-clone"
-version = "1.0.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555"
-
 [[package]]
 name = "either"
 version = "1.13.0"
@@ -856,12 +805,6 @@ version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
-[[package]]
-name = "hashbrown"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-
 [[package]]
 name = "hashbrown"
 version = "0.15.2"
@@ -879,7 +822,7 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1"
 dependencies = [
- "hashbrown 0.15.2",
+ "hashbrown",
 ]
 
 [[package]]
@@ -1210,17 +1153,6 @@ dependencies = [
  "icu_properties",
 ]
 
-[[package]]
-name = "indexmap"
-version = "1.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
-dependencies = [
- "autocfg",
- "hashbrown 0.12.3",
- "serde",
-]
-
 [[package]]
 name = "indexmap"
 version = "2.7.0"
@@ -1228,8 +1160,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f"
 dependencies = [
  "equivalent",
- "hashbrown 0.15.2",
- "serde",
+ "hashbrown",
 ]
 
 [[package]]
@@ -1414,12 +1345,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "num-conv"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
-
 [[package]]
 name = "num-integer"
 version = "0.1.46"
@@ -1548,12 +1473,6 @@ version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
 
-[[package]]
-name = "powerfmt"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
-
 [[package]]
 name = "ppv-lite86"
 version = "0.2.20"
@@ -1689,26 +1608,6 @@ dependencies = [
  "bitflags",
 ]
 
-[[package]]
-name = "ref-cast"
-version = "1.0.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f354300ae66f76f1c85c5f84693f0ce81d747e2c3f21a45fef496d89c960bf7d"
-dependencies = [
- "ref-cast-impl",
-]
-
-[[package]]
-name = "ref-cast-impl"
-version = "1.0.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.90",
-]
-
 [[package]]
 name = "regex"
 version = "1.12.2"
@@ -1798,30 +1697,6 @@ dependencies = [
  "regex",
 ]
 
-[[package]]
-name = "schemars"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cd191f9397d57d581cddd31014772520aa448f65ef991055d7f61582c65165f"
-dependencies = [
- "dyn-clone",
- "ref-cast",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "schemars"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82d20c4491bc164fa2f6c5d44565947a52ad80b9505d8e36f8d54c27c739fcd0"
-dependencies = [
- "dyn-clone",
- "ref-cast",
- "serde",
- "serde_json",
-]
-
 [[package]]
 name = "scopeguard"
 version = "1.2.0"
@@ -1893,44 +1768,13 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "serde_with"
-version = "3.15.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa66c845eee442168b2c8134fec70ac50dc20e760769c8ba0ad1319ca1959b04"
-dependencies = [
- "base64 0.22.1",
- "chrono",
- "hex",
- "indexmap 1.9.3",
- "indexmap 2.7.0",
- "schemars 0.9.0",
- "schemars 1.0.4",
- "serde_core",
- "serde_json",
- "serde_with_macros",
- "time",
-]
-
-[[package]]
-name = "serde_with_macros"
-version = "3.15.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b91a903660542fced4e99881aa481bdbaec1634568ee02e0b8bd57c64cb38955"
-dependencies = [
- "darling 0.21.3",
- "proc-macro2",
- "quote",
- "syn 2.0.90",
-]
-
 [[package]]
 name = "serde_yaml"
 version = "0.9.34+deprecated"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
 dependencies = [
- "indexmap 2.7.0",
+ "indexmap",
  "itoa",
  "ryu",
  "serde",
@@ -2070,9 +1914,9 @@ dependencies = [
  "futures-intrusive",
  "futures-io",
  "futures-util",
- "hashbrown 0.15.2",
+ "hashbrown",
  "hashlink",
- "indexmap 2.7.0",
+ "indexmap",
  "log",
  "memchr",
  "once_cell",
@@ -2308,7 +2152,6 @@ dependencies = [
  "sanitize-filename",
  "serde",
  "serde_json",
- "serde_with",
  "serde_yaml",
  "sqlx",
  "thiserror 2.0.12",
@@ -2409,37 +2252,6 @@ dependencies = [
  "once_cell",
 ]
 
-[[package]]
-name = "time"
-version = "0.3.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21"
-dependencies = [
- "deranged",
- "itoa",
- "num-conv",
- "powerfmt",
- "serde",
- "time-core",
- "time-macros",
-]
-
-[[package]]
-name = "time-core"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
-
-[[package]]
-name = "time-macros"
-version = "0.2.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de"
-dependencies = [
- "num-conv",
- "time-core",
-]
-
 [[package]]
 name = "tinystr"
 version = "0.7.6"
diff --git a/sync-server/Cargo.toml b/sync-server/Cargo.toml
index ade113a2..b057c78d 100644
--- a/sync-server/Cargo.toml
+++ b/sync-server/Cargo.toml
@@ -33,7 +33,6 @@ serde_json = "1.0.140"
 clap-verbosity-flag = "3.0.3"
 bimap = "0.6.3"
 ts-rs =  { version = "10.1", features = ["uuid-impl", "chrono-impl"] }
-serde_with = "3.15.1"
 base64 = "0.22.1"
 reconcile-text = { version = "0.7.1", features = ["serde"] }
 
diff --git a/sync-server/config-e2e.yml b/sync-server/config-e2e.yml
index 58410948..8dc265c4 100644
--- a/sync-server/config-e2e.yml
+++ b/sync-server/config-e2e.yml
@@ -1,13 +1,13 @@
 database:
   databases_directory_path: databases
   max_connections_per_vault: 12
-  cursor_timeout_seconds: 60
+  cursor_timeout: 1m
 server:
   host: 0.0.0.0
   port: 3000
   max_body_size_mb: 512
   max_clients_per_vault: 256
-  response_timeout_seconds: 60
+  response_timeout: 30m
   mergeable_file_extensions:
   - md
   - txt
diff --git a/sync-server/src/app_state/database.rs b/sync-server/src/app_state/database.rs
index d64bd560..bdfc7427 100644
--- a/sync-server/src/app_state/database.rs
+++ b/sync-server/src/app_state/database.rs
@@ -102,11 +102,13 @@ impl Database {
         let connection_options = SqliteConnectOptions::new()
             .filename(file_name.clone())
             .create_if_missing(true)
+            .auto_vacuum(sqlx::sqlite::SqliteAutoVacuum::Full)
             .busy_timeout(Duration::from_secs(3600))
             .journal_mode(sqlx::sqlite::SqliteJournalMode::Wal);
 
         let pool = SqlitePoolOptions::new()
             .max_connections(config.max_connections_per_vault)
+            .acquire_slow_threshold(Duration::from_secs(30))
             .test_before_acquire(true)
             .connect_with(connection_options)
             .await
diff --git a/sync-server/src/config/database_config.rs b/sync-server/src/config/database_config.rs
index f1c92d9d..20a9a21e 100644
--- a/sync-server/src/config/database_config.rs
+++ b/sync-server/src/config/database_config.rs
@@ -2,13 +2,11 @@ use std::{path::PathBuf, time::Duration};
 
 use log::debug;
 use serde::{Deserialize, Serialize};
-use serde_with::serde_as;
 
 use crate::consts::{
     DEFAULT_CURSOR_TIMEOUT, DEFAULT_DATABASES_DIRECTORY_PATH, DEFAULT_MAX_CONNECTIONS_PER_VAULT,
 };
 
-#[serde_with::serde_as]
 #[derive(Debug, Deserialize, Serialize, Clone)]
 pub struct DatabaseConfig {
     #[serde(default = "default_databases_directory_path")]
@@ -17,8 +15,7 @@ pub struct DatabaseConfig {
     #[serde(default = "default_max_connections_per_vault")]
     pub max_connections_per_vault: u32,
 
-    #[serde(default = "default_cursor_timeout", rename = "cursor_timeout_seconds")]
-    #[serde_as(as = "serde_with::DurationSeconds<u64>")]
+    #[serde(default = "default_cursor_timeout", with = "humantime_serde")]
     pub cursor_timeout: Duration,
 }
 
diff --git a/sync-server/src/config/server_config.rs b/sync-server/src/config/server_config.rs
index fc6034ed..4a9da0f4 100644
--- a/sync-server/src/config/server_config.rs
+++ b/sync-server/src/config/server_config.rs
@@ -1,5 +1,6 @@
 use log::debug;
 use serde::{Deserialize, Serialize};
+use std::time::Duration;
 
 use crate::consts::{
     DEFAULT_HOST, DEFAULT_MAX_BODY_SIZE_MB, DEFAULT_MAX_CLIENTS_PER_VAULT,
@@ -20,8 +21,8 @@ pub struct ServerConfig {
     #[serde(default = "default_max_clients_per_vault")]
     pub max_clients_per_vault: usize,
 
-    #[serde(default = "default_response_timeout_seconds")]
-    pub response_timeout_seconds: u64,
+    #[serde(default = "default_response_timeout", with = "humantime_serde")]
+    pub response_timeout: Duration,
 
     #[serde(default = "default_mergeable_file_extensions")]
     pub mergeable_file_extensions: Vec<String>,
@@ -47,8 +48,8 @@ fn default_max_clients_per_vault() -> usize {
     DEFAULT_MAX_CLIENTS_PER_VAULT
 }
 
-fn default_response_timeout_seconds() -> u64 {
-    debug!("Using default response timeout: {DEFAULT_RESPONSE_TIMEOUT_SECONDS} seconds");
+fn default_response_timeout() -> Duration {
+    debug!("Using default response timeout: {DEFAULT_RESPONSE_TIMEOUT_SECONDS:?}");
     DEFAULT_RESPONSE_TIMEOUT_SECONDS
 }
 
diff --git a/sync-server/src/consts.rs b/sync-server/src/consts.rs
index 0d4e67a1..eae593df 100644
--- a/sync-server/src/consts.rs
+++ b/sync-server/src/consts.rs
@@ -9,7 +9,7 @@ pub const DEFAULT_CURSOR_TIMEOUT: Duration = Duration::from_secs(60);
 pub const DEFAULT_HOST: &str = "127.0.0.1";
 pub const DEFAULT_PORT: u16 = 3000;
 pub const DEFAULT_MAX_BODY_SIZE_MB: usize = 4096;
-pub const DEFAULT_RESPONSE_TIMEOUT_SECONDS: u64 = 60;
+pub const DEFAULT_RESPONSE_TIMEOUT_SECONDS: Duration = Duration::from_secs(1800);
 pub const DEFAULT_MAX_CLIENTS_PER_VAULT: usize = 256;
 
 pub const DEFAULT_LOG_DIRECTORY: &str = "logs";
diff --git a/sync-server/src/server.rs b/sync-server/src/server.rs
index f8a2e574..01b09cf6 100644
--- a/sync-server/src/server.rs
+++ b/sync-server/src/server.rs
@@ -13,8 +13,6 @@ mod responses;
 mod update_document;
 mod websocket;
 
-use std::time::Duration;
-
 use anyhow::{Context as _, Result, anyhow};
 use auth::auth_middleware;
 use axum::{
@@ -62,9 +60,7 @@ pub async fn create_server(config: Config) -> Result<()> {
         .layer(RequestBodyLimitLayer::new(
             app_state.config.server.max_body_size_mb * 1024 * 1024,
         ))
-        .layer(TimeoutLayer::new(Duration::from_secs(
-            server_config.response_timeout_seconds,
-        )))
+        .layer(TimeoutLayer::new(server_config.response_timeout))
         .layer(
             CorsLayer::new()
                 .allow_origin("*".parse::<HeaderValue>().expect("Failed to parse origin"))

From aca1ca50a4ed6a3c57d39483afa267e072eb7575 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 6 Dec 2025 22:20:31 +0000
Subject: [PATCH 717/761] Update reconcile to 0.8.0

---
 frontend/obsidian-plugin/package.json     |  4 ++--
 frontend/package-lock.json                | 10 ++++-----
 frontend/sync-client/package.json         |  4 ++--
 scripts/check.sh                          |  9 +++++---
 sync-server/Cargo.lock                    | 27 ++++++++++++-----------
 sync-server/Cargo.toml                    |  2 +-
 sync-server/src/server/requests.rs        |  4 ++--
 sync-server/src/server/update_document.rs |  6 +++--
 8 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index e0d7326a..74a6bfdf 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -20,7 +20,7 @@
         "fs-extra": "^11.3.0",
         "mini-css-extract-plugin": "^2.9.2",
         "obsidian": "1.10.2",
-        "reconcile-text": "^0.7.1",
+        "reconcile-text": "^0.8.0",
         "resolve-url-loader": "^5.0.0",
         "sass": "^1.91.0",
         "sass-loader": "^16.0.6",
@@ -34,4 +34,4 @@
         "webpack": "^5.99.9",
         "webpack-cli": "^6.0.1"
     }
-}
+}
\ No newline at end of file
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index b93c3064..da2d3cf9 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -3486,9 +3486,9 @@
 			}
 		},
 		"node_modules/reconcile-text": {
-			"version": "0.7.1",
-			"resolved": "https://registry.npmjs.org/reconcile-text/-/reconcile-text-0.7.1.tgz",
-			"integrity": "sha512-khedcYvAKs7ELKh5Z8mz2vyomMY5TqznV1dB+k/7qUAX9cheMNN5/EPJVQYZepOMunYbnQitvhFJX3kD4IMcNw==",
+			"version": "0.8.0",
+			"resolved": "https://registry.npmjs.org/reconcile-text/-/reconcile-text-0.8.0.tgz",
+			"integrity": "sha512-evskVha3YgpP2ZelsFxP9t7CuKnwE7TrsH3FdrH2mfKbzjUWiNF7scHXsFbFS921lmFlAOB94DHNAWPvL34Mqg==",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -4656,7 +4656,7 @@
 				"fs-extra": "^11.3.0",
 				"mini-css-extract-plugin": "^2.9.2",
 				"obsidian": "1.10.2",
-				"reconcile-text": "^0.7.1",
+				"reconcile-text": "^0.8.0",
 				"resolve-url-loader": "^5.0.0",
 				"sass": "^1.91.0",
 				"sass-loader": "^16.0.6",
@@ -4679,7 +4679,7 @@
 				"byte-base64": "^1.1.0",
 				"minimatch": "^10.0.1",
 				"p-queue": "^8.1.0",
-				"reconcile-text": "^0.7.1",
+				"reconcile-text": "^0.8.0",
 				"ts-loader": "^9.5.2",
 				"tslib": "2.8.1",
 				"tsx": "^4.20.6",
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index c664f478..e9cba0a8 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -16,7 +16,7 @@
         "byte-base64": "^1.1.0",
         "minimatch": "^10.0.1",
         "p-queue": "^8.1.0",
-        "reconcile-text": "^0.7.1",
+        "reconcile-text": "^0.8.0",
         "uuid": "^13.0.0",
         "@types/node": "^24.8.1",
         "ts-loader": "^9.5.2",
@@ -29,4 +29,4 @@
         "@sentry/browser": "^10.8.0",
         "ws": "^8.18.3"
     }
-}
+}
\ No newline at end of file
diff --git a/scripts/check.sh b/scripts/check.sh
index 4f69dfb2..933bb60f 100755
--- a/scripts/check.sh
+++ b/scripts/check.sh
@@ -26,7 +26,12 @@ cargo machete --with-metadata
 
 echo "Running checks in frontend"
 cd ../frontend
-npm ci
+
+if [[ "$FIX_MODE" == true ]]; then
+    npm install
+else
+    npm ci
+fi
 npm run build
 npm run test
 npm run lint
@@ -37,7 +42,6 @@ if [[ "$FIX_MODE" == false ]] && [[ $(git status --porcelain) ]]; then
     exit 1
 fi
 
-
 cd ..
 
 if [[ "$FIX_MODE" == true ]]; then
@@ -45,4 +49,3 @@ if [[ "$FIX_MODE" == true ]]; then
 else
     echo "Success"
 fi
-
diff --git a/sync-server/Cargo.lock b/sync-server/Cargo.lock
index 531c30dc..6d131280 100644
--- a/sync-server/Cargo.lock
+++ b/sync-server/Cargo.lock
@@ -1592,11 +1592,12 @@ dependencies = [
 
 [[package]]
 name = "reconcile-text"
-version = "0.7.1"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "913440a3c2b90cd3ed3e967660f2bb624b71e8059b9fc86960a5f91bd1e2e353"
+checksum = "599cf9539996a2a19e501110404c59ba62f4974009f8fb864a8b7151c15ee5a5"
 dependencies = [
  "serde",
+ "thiserror 2.0.17",
 ]
 
 [[package]]
@@ -1925,7 +1926,7 @@ dependencies = [
  "serde_json",
  "sha2",
  "smallvec",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "tokio",
  "tokio-stream",
  "tracing",
@@ -2009,7 +2010,7 @@ dependencies = [
  "smallvec",
  "sqlx-core",
  "stringprep",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "tracing",
  "uuid",
  "whoami",
@@ -2048,7 +2049,7 @@ dependencies = [
  "smallvec",
  "sqlx-core",
  "stringprep",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "tracing",
  "uuid",
  "whoami",
@@ -2074,7 +2075,7 @@ dependencies = [
  "serde",
  "serde_urlencoded",
  "sqlx-core",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "tracing",
  "url",
  "uuid",
@@ -2154,7 +2155,7 @@ dependencies = [
  "serde_json",
  "serde_yaml",
  "sqlx",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "tokio",
  "tower-http",
  "tracing",
@@ -2213,11 +2214,11 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "2.0.12"
+version = "2.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
+checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8"
 dependencies = [
- "thiserror-impl 2.0.12",
+ "thiserror-impl 2.0.17",
 ]
 
 [[package]]
@@ -2233,9 +2234,9 @@ dependencies = [
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.12"
+version = "2.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
+checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2444,7 +2445,7 @@ checksum = "e640d9b0964e9d39df633548591090ab92f7a4567bc31d3891af23471a3365c6"
 dependencies = [
  "chrono",
  "lazy_static",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
  "ts-rs-macros",
  "uuid",
 ]
diff --git a/sync-server/Cargo.toml b/sync-server/Cargo.toml
index b057c78d..fa9083a8 100644
--- a/sync-server/Cargo.toml
+++ b/sync-server/Cargo.toml
@@ -34,7 +34,7 @@ clap-verbosity-flag = "3.0.3"
 bimap = "0.6.3"
 ts-rs =  { version = "10.1", features = ["uuid-impl", "chrono-impl"] }
 base64 = "0.22.1"
-reconcile-text = { version = "0.7.1", features = ["serde"] }
+reconcile-text = { version = "0.8.0", features = ["serde"] }
 
 [profile.release]
 codegen-units = 1
diff --git a/sync-server/src/server/requests.rs b/sync-server/src/server/requests.rs
index 2e956544..119ad467 100644
--- a/sync-server/src/server/requests.rs
+++ b/sync-server/src/server/requests.rs
@@ -1,6 +1,6 @@
 use axum::body::Bytes;
 use axum_typed_multipart::{FieldData, TryFromMultipart};
-use reconcile_text::NumberOrString;
+use reconcile_text::NumberOrText;
 use serde::{self, Deserialize};
 use ts_rs::TS;
 
@@ -40,7 +40,7 @@ pub struct UpdateTextDocumentVersion {
     pub relative_path: String,
 
     #[ts(type = "Array<number | string>")]
-    pub content: Vec<NumberOrString>,
+    pub content: Vec<NumberOrText>,
 }
 
 #[derive(TS, Debug, Deserialize)]
diff --git a/sync-server/src/server/update_document.rs b/sync-server/src/server/update_document.rs
index 9da37832..00fbd008 100644
--- a/sync-server/src/server/update_document.rs
+++ b/sync-server/src/server/update_document.rs
@@ -19,7 +19,7 @@ use crate::{
         database::models::{DocumentId, StoredDocumentVersion, VaultId, VaultUpdateId},
     },
     config::user_config::User,
-    errors::{SyncServerError, not_found_error, server_error},
+    errors::{SyncServerError, client_error, not_found_error, server_error},
     server::requests::UpdateBinaryDocumentVersion,
     utils::{
         find_first_available_path::find_first_available_path, is_binary::is_binary,
@@ -81,7 +81,9 @@ pub async fn update_text(
             .expect("parent must be valid UTF-8 because it's a text document"),
         request.content,
         &*BuiltinTokenizer::Word,
-    );
+    )
+    .context("Failed to apply given diff to parent document")
+    .map_err(client_error)?;
 
     let content = edited_text.apply().text().into_bytes();
 

From 07cb8491e2f0fde1a7b6b68812c7f7a97d2b33c9 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 6 Dec 2025 22:21:55 +0000
Subject: [PATCH 718/761] Bump versions to 0.12.0

---
 frontend/local-client-cli/package.json | 2 +-
 frontend/obsidian-plugin/manifest.json | 2 +-
 frontend/obsidian-plugin/package.json  | 4 ++--
 frontend/package-lock.json             | 8 ++++----
 frontend/sync-client/package.json      | 4 ++--
 frontend/test-client/package.json      | 2 +-
 manifest.json                          | 2 +-
 sync-server/Cargo.lock                 | 2 +-
 sync-server/Cargo.toml                 | 2 +-
 9 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/frontend/local-client-cli/package.json b/frontend/local-client-cli/package.json
index a98220f0..e3f45b6b 100644
--- a/frontend/local-client-cli/package.json
+++ b/frontend/local-client-cli/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "local-client-cli",
-	"version": "0.11.1",
+	"version": "0.12.0",
 	"description": "Standalone CLI for VaultLink sync client",
 	"private": false,
 	"bin": {
diff --git a/frontend/obsidian-plugin/manifest.json b/frontend/obsidian-plugin/manifest.json
index b7c61fca..68d1568b 100644
--- a/frontend/obsidian-plugin/manifest.json
+++ b/frontend/obsidian-plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.11.1",
+	"version": "0.12.0",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index 74a6bfdf..72a34fda 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -1,6 +1,6 @@
 {
     "name": "vault-link-obsidian-plugin",
-    "version": "0.11.1",
+    "version": "0.12.0",
     "description": "This is a sample plugin for Obsidian (https://obsidian.md)",
     "main": "main.js",
     "scripts": {
@@ -34,4 +34,4 @@
         "webpack": "^5.99.9",
         "webpack-cli": "^6.0.1"
     }
-}
\ No newline at end of file
+}
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index da2d3cf9..84834fd8 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -21,7 +21,7 @@
 			}
 		},
 		"local-client-cli": {
-			"version": "0.11.1",
+			"version": "0.12.0",
 			"dependencies": {
 				"commander": "^14.0.2"
 			},
@@ -4646,7 +4646,7 @@
 		},
 		"obsidian-plugin": {
 			"name": "vault-link-obsidian-plugin",
-			"version": "0.11.1",
+			"version": "0.12.0",
 			"license": "MIT",
 			"devDependencies": {
 				"@types/node": "^24.8.1",
@@ -4672,7 +4672,7 @@
 			}
 		},
 		"sync-client": {
-			"version": "0.11.1",
+			"version": "0.12.0",
 			"devDependencies": {
 				"@sentry/browser": "^10.8.0",
 				"@types/node": "^24.8.1",
@@ -4716,7 +4716,7 @@
 			}
 		},
 		"test-client": {
-			"version": "0.11.1",
+			"version": "0.12.0",
 			"bin": {
 				"test-client": "dist/cli.js"
 			},
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index e9cba0a8..4dbf5afc 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "sync-client",
-    "version": "0.11.1",
+    "version": "0.12.0",
     "main": "dist/sync-client.node.js",
     "browser": "dist/sync-client.web.js",
     "types": "dist/types/index.d.ts",
@@ -29,4 +29,4 @@
         "@sentry/browser": "^10.8.0",
         "ws": "^8.18.3"
     }
-}
\ No newline at end of file
+}
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index de76a48c..b7ee3bd1 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "test-client",
-	"version": "0.11.1",
+	"version": "0.12.0",
 	"private": true,
 	"bin": {
 		"test-client": "./dist/cli.js"
diff --git a/manifest.json b/manifest.json
index b7c61fca..68d1568b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-link",
 	"name": "VaultLink",
-	"version": "0.11.1",
+	"version": "0.12.0",
 	"minAppVersion": "0.0.0",
 	"description": "Self-hosted synchronization and collaboration for your Vault.",
 	"author": "Andras Schmelczer",
diff --git a/sync-server/Cargo.lock b/sync-server/Cargo.lock
index 6d131280..3c8da8f6 100644
--- a/sync-server/Cargo.lock
+++ b/sync-server/Cargo.lock
@@ -2133,7 +2133,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.11.1"
+version = "0.12.0"
 dependencies = [
  "anyhow",
  "axum",
diff --git a/sync-server/Cargo.toml b/sync-server/Cargo.toml
index fa9083a8..eb722116 100644
--- a/sync-server/Cargo.toml
+++ b/sync-server/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.11.1"
+version = "0.12.0"
 
 [dependencies]
 serde = { version = "1.0.219", default-features = false, features = ["derive"] }

From 3f2ecfb0b677c84ac6231b01f4f56147fdf51f3c Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 7 Dec 2025 11:30:19 +0000
Subject: [PATCH 719/761] Use efficient filters

---
 frontend/eslint.config.mjs                    | 19 ++++++++++++
 .../status-description/status-description.ts  |  7 ++---
 frontend/sync-client/src/index.ts             |  4 ++-
 .../sync-client/src/persistence/database.ts   |  6 ++--
 .../sync-client/src/persistence/settings.ts   |  6 ++--
 .../src/services/websocket-manager.ts         |  7 ++---
 .../sync-operations/file-change-notifier.ts   |  6 ++--
 .../sync-client/src/sync-operations/syncer.ts |  2 ++
 frontend/sync-client/src/tracing/logger.ts    |  6 ++--
 .../sync-client/src/tracing/sync-history.ts   | 10 +++----
 .../sync-client/src/utils/globs-to-regexes.ts | 29 ++++++++++---------
 .../src/utils/remove-from-array.ts            | 17 +++++++++++
 frontend/test-client/src/agent/mock-agent.ts  | 10 +++----
 13 files changed, 82 insertions(+), 47 deletions(-)
 create mode 100644 frontend/sync-client/src/utils/remove-from-array.ts

diff --git a/frontend/eslint.config.mjs b/frontend/eslint.config.mjs
index b2ed7a35..d88a042f 100644
--- a/frontend/eslint.config.mjs
+++ b/frontend/eslint.config.mjs
@@ -55,6 +55,25 @@ export default [
 					message: "Use replaceAll instead of replace to replace all occurrences of a substring."
 				}
 			],
+			"no-restricted-syntax": [
+				"error",
+				{
+					selector: "CallExpression[callee.property.name='splice'][arguments.length=2][arguments.1.type='Literal'][arguments.1.value=1]",
+					message: "Use `removeFromArray(array, item)` instead of manually using indexOf + splice(index, 1). Import from 'sync-client/src/utils/remove-from-array'."
+				},
+				{
+					selector: "CallExpression[callee.property.name='filter'] > ArrowFunctionExpression[body.type='BinaryExpression'][body.operator='!==']",
+					message: "Use `removeFromArray(array, item)` instead of filter(x => x !== item) for better performance. Import from 'sync-client/src/utils/remove-from-array'."
+				},
+				{
+					selector: "CallExpression[callee.property.name='filter'] > ArrowFunctionExpression > BlockStatement > ReturnStatement > BinaryExpression[operator='!==']",
+					message: "Use `removeFromArray(array, item)` instead of filter(x => { return x !== item }) for better performance. Import from 'sync-client/src/utils/remove-from-array'."
+				},
+				{
+					selector: "CallExpression[callee.property.name='filter'] > FunctionExpression[body.type='BlockStatement'] > BlockStatement > ReturnStatement > BinaryExpression[operator='!==']",
+					message: "Use `removeFromArray(array, item)` instead of filter(function(x) { return x !== item }) for better performance. Import from 'sync-client/src/utils/remove-from-array'."
+				}
+			],
 			"unused-imports/no-unused-vars": [
 				"warn",
 				{
diff --git a/frontend/obsidian-plugin/src/views/status-description/status-description.ts b/frontend/obsidian-plugin/src/views/status-description/status-description.ts
index 666c107b..fe4f17dc 100644
--- a/frontend/obsidian-plugin/src/views/status-description/status-description.ts
+++ b/frontend/obsidian-plugin/src/views/status-description/status-description.ts
@@ -5,13 +5,14 @@ import type {
 	NetworkConnectionStatus,
 	SyncClient
 } from "sync-client";
+import { utils } from "sync-client";
 
 export class StatusDescription {
 	private lastHistoryStats: HistoryStats | undefined;
 	private lastRemaining: number | undefined;
 	private lastConnectionState: NetworkConnectionStatus | undefined;
 
-	private statusChangeListeners: (() => unknown)[] = [];
+	private readonly statusChangeListeners: (() => unknown)[] = [];
 
 	public constructor(private readonly syncClient: SyncClient) {
 		void this.updateConnectionState();
@@ -46,9 +47,7 @@ export class StatusDescription {
 		this.statusChangeListeners.push(listener);
 	}
 	public removeStatusChangeListener(listener: () => unknown): void {
-		this.statusChangeListeners = this.statusChangeListeners.filter(
-			(l) => l !== listener
-		);
+		utils.removeFromArray(this.statusChangeListeners, listener);
 	}
 
 	public renderStatusDescription(container: HTMLElement): void {
diff --git a/frontend/sync-client/src/index.ts b/frontend/sync-client/src/index.ts
index a7292ec2..405acb10 100644
--- a/frontend/sync-client/src/index.ts
+++ b/frontend/sync-client/src/index.ts
@@ -5,6 +5,7 @@ import { slowWebSocketFactory } from "./utils/debugging/slow-web-socket-factory"
 import { getRandomColor } from "./utils/get-random-color";
 import { lineAndColumnToPosition } from "./utils/line-and-column-to-position";
 import { positionToLineAndColumn } from "./utils/position-to-line-and-column";
+import { removeFromArray } from "./utils/remove-from-array";
 
 export {
 	SyncType,
@@ -43,5 +44,6 @@ export const utils = {
 	getRandomColor,
 	positionToLineAndColumn,
 	lineAndColumnToPosition,
-	awaitAll
+	awaitAll,
+	removeFromArray
 };
diff --git a/frontend/sync-client/src/persistence/database.ts b/frontend/sync-client/src/persistence/database.ts
index d42651ae..5568169b 100644
--- a/frontend/sync-client/src/persistence/database.ts
+++ b/frontend/sync-client/src/persistence/database.ts
@@ -2,6 +2,7 @@ import type { Logger } from "../tracing/logger";
 import { EMPTY_HASH } from "../utils/hash";
 import { CoveredValues } from "../utils/data-structures/min-covered";
 import { awaitAll } from "../utils/await-all";
+import { removeFromArray } from "../utils/remove-from-array";
 
 export type VaultUpdateId = number;
 export type DocumentId = string;
@@ -93,6 +94,7 @@ export class Database {
 	public get resolvedDocuments(): DocumentRecord[] {
 		const paths = new Map<string, DocumentRecord[]>();
 		this.documents
+			// eslint-disable-next-line no-restricted-syntax -- Type narrowing, not removing a specific item
 			.filter(({ metadata }) => metadata !== undefined)
 			.forEach((record) =>
 				paths.set(record.relativePath, [
@@ -151,12 +153,12 @@ export class Database {
 			return;
 		}
 
-		entry.updates = entry.updates.filter((update) => update !== promise);
+		removeFromArray(entry.updates, promise);
 		// No need to save as Promises don't get serialized
 	}
 
 	public removeDocument(find: DocumentRecord): void {
-		this.documents = this.documents.filter((document) => document !== find);
+		removeFromArray(this.documents, find);
 		this.saveInTheBackground();
 	}
 
diff --git a/frontend/sync-client/src/persistence/settings.ts b/frontend/sync-client/src/persistence/settings.ts
index 81044a38..8472155a 100644
--- a/frontend/sync-client/src/persistence/settings.ts
+++ b/frontend/sync-client/src/persistence/settings.ts
@@ -1,6 +1,7 @@
 import type { Logger } from "../tracing/logger";
 import { awaitAll } from "../utils/await-all";
 import { Lock } from "../utils/data-structures/locks";
+import { removeFromArray } from "../utils/remove-from-array";
 
 export interface SyncSettings {
 	remoteUri: string;
@@ -69,10 +70,7 @@ export class Settings {
 	public removeOnSettingsChangeListener(
 		listener: (settings: SyncSettings, oldSettings: SyncSettings) => unknown
 	): void {
-		const index = this.onSettingsChangeHandlers.indexOf(listener);
-		if (index !== -1) {
-			this.onSettingsChangeHandlers.splice(index, 1);
-		}
+		removeFromArray(this.onSettingsChangeHandlers, listener);
 	}
 
 	public async setSetting<T extends keyof SyncSettings>(
diff --git a/frontend/sync-client/src/services/websocket-manager.ts b/frontend/sync-client/src/services/websocket-manager.ts
index 015a778e..0dc19d60 100644
--- a/frontend/sync-client/src/services/websocket-manager.ts
+++ b/frontend/sync-client/src/services/websocket-manager.ts
@@ -8,6 +8,7 @@ import { createPromise } from "../utils/create-promise";
 import type { WebSocketVaultUpdate } from "./types/WebSocketVaultUpdate";
 import { awaitAll } from "../utils/await-all";
 import { WEBSOCKET_DISCONNECT_TIMEOUT_IN_S } from "../consts";
+import { removeFromArray } from "../utils/remove-from-array";
 
 export class WebSocketManager {
 	private readonly webSocketStatusChangeListeners: ((
@@ -227,12 +228,10 @@ export class WebSocketManager {
 						);
 					})
 					.finally(() => {
-						const index = this.outstandingPromises.indexOf(
+						removeFromArray(
+							this.outstandingPromises,
 							messageHandlingPromise
 						);
-						if (index !== -1) {
-							void this.outstandingPromises.splice(index, 1); // ignore the returned promise
-						}
 					});
 
 				void this.outstandingPromises.push(messageHandlingPromise); // ignore the returned promise
diff --git a/frontend/sync-client/src/sync-operations/file-change-notifier.ts b/frontend/sync-client/src/sync-operations/file-change-notifier.ts
index 2c099b6f..d2b40c1f 100644
--- a/frontend/sync-client/src/sync-operations/file-change-notifier.ts
+++ b/frontend/sync-client/src/sync-operations/file-change-notifier.ts
@@ -1,4 +1,5 @@
 import type { RelativePath } from "../persistence/database";
+import { removeFromArray } from "../utils/remove-from-array";
 
 export class FileChangeNotifier {
 	private readonly listeners: ((filePath: RelativePath) => unknown)[] = [];
@@ -12,10 +13,7 @@ export class FileChangeNotifier {
 	public removeFileChangeListener(
 		listener: (filePath: RelativePath) => unknown
 	): void {
-		const index = this.listeners.indexOf(listener);
-		if (index !== -1) {
-			this.listeners.splice(index, 1);
-		}
+		removeFromArray(this.listeners, listener);
 	}
 
 	public notifyOfFileChange(filePath: RelativePath): void {
diff --git a/frontend/sync-client/src/sync-operations/syncer.ts b/frontend/sync-client/src/sync-operations/syncer.ts
index 12008b59..65cd020c 100644
--- a/frontend/sync-client/src/sync-operations/syncer.ts
+++ b/frontend/sync-client/src/sync-operations/syncer.ts
@@ -444,11 +444,13 @@ export class Syncer {
 				);
 				if (originalFile !== undefined) {
 					// `originalFile` hasn't been deleted but it got moved instead
+					/* eslint-disable no-restricted-syntax -- Comparing by property, not direct equality */
 					locallyPossiblyDeletedFiles =
 						locallyPossiblyDeletedFiles.filter(
 							(item) =>
 								item.relativePath !== originalFile.relativePath
 						);
+					/* eslint-enable no-restricted-syntax */
 
 					this.logger.debug(
 						`Document '${originalFile.relativePath}' was not found under its current path in the database but was found under a different path (${relativePath}), scheduling sync to move it`
diff --git a/frontend/sync-client/src/tracing/logger.ts b/frontend/sync-client/src/tracing/logger.ts
index 96b93b0d..41e25257 100644
--- a/frontend/sync-client/src/tracing/logger.ts
+++ b/frontend/sync-client/src/tracing/logger.ts
@@ -1,4 +1,5 @@
 import { MAX_LOG_MESSAGE_COUNT } from "../consts";
+import { removeFromArray } from "../utils/remove-from-array";
 
 export enum LogLevel {
 	DEBUG = "DEBUG",
@@ -63,10 +64,7 @@ export class Logger {
 	public removeOnMessageListener(
 		listener: (message: LogLine) => unknown
 	): void {
-		const index = this.onMessageListeners.indexOf(listener);
-		if (index !== -1) {
-			this.onMessageListeners.splice(index, 1);
-		}
+		removeFromArray(this.onMessageListeners, listener);
 	}
 
 	public reset(): void {
diff --git a/frontend/sync-client/src/tracing/sync-history.ts b/frontend/sync-client/src/tracing/sync-history.ts
index 0fb1a754..d60a57d1 100644
--- a/frontend/sync-client/src/tracing/sync-history.ts
+++ b/frontend/sync-client/src/tracing/sync-history.ts
@@ -4,6 +4,7 @@ import {
 } from "../consts";
 import type { RelativePath } from "../persistence/database";
 import type { Logger } from "./logger";
+import { removeFromArray } from "../utils/remove-from-array";
 
 export interface SyncCreateDetails {
 	type: SyncType.CREATE;
@@ -68,7 +69,7 @@ export interface HistoryStats {
 }
 
 export class SyncHistory {
-	private _entries: HistoryEntry[] = [];
+	private readonly _entries: HistoryEntry[] = [];
 
 	private readonly syncHistoryUpdateListeners: ((
 		status: HistoryStats
@@ -99,7 +100,7 @@ export class SyncHistory {
 
 		const candidate = this.findSimilarRecentUpdateEntry(historyEntry);
 		if (candidate !== undefined) {
-			this._entries = this._entries.filter((e) => e !== candidate);
+			removeFromArray(this._entries, candidate);
 		}
 
 		// Insert the entry at the beginning
@@ -122,10 +123,7 @@ export class SyncHistory {
 	public removeSyncHistoryUpdateListener(
 		listener: (stats: HistoryStats) => unknown
 	): void {
-		const index = this.syncHistoryUpdateListeners.indexOf(listener);
-		if (index !== -1) {
-			this.syncHistoryUpdateListeners.splice(index, 1);
-		}
+		removeFromArray(this.syncHistoryUpdateListeners, listener);
 	}
 
 	public reset(): void {
diff --git a/frontend/sync-client/src/utils/globs-to-regexes.ts b/frontend/sync-client/src/utils/globs-to-regexes.ts
index 1e8ad775..5b8bf062 100644
--- a/frontend/sync-client/src/utils/globs-to-regexes.ts
+++ b/frontend/sync-client/src/utils/globs-to-regexes.ts
@@ -2,17 +2,20 @@ import { makeRe } from "minimatch";
 import type { Logger } from "../tracing/logger";
 
 export function globsToRegexes(globs: string[], logger: Logger): RegExp[] {
-	return globs
-		.map((pattern) => {
-			const result = makeRe(pattern, {
-				dot: true
-			});
-			if (result === false) {
-				logger.warn(
-					`Failed to parse ${pattern}' as a glob pattern, skipping it`
-				);
-			}
-			return result;
-		})
-		.filter((pattern) => pattern !== false);
+	return (
+		globs
+			.map((pattern) => {
+				const result = makeRe(pattern, {
+					dot: true
+				});
+				if (result === false) {
+					logger.warn(
+						`Failed to parse ${pattern}' as a glob pattern, skipping it`
+					);
+				}
+				return result;
+			})
+			// eslint-disable-next-line no-restricted-syntax -- Filtering out false values, not removing a specific item
+			.filter((pattern) => pattern !== false)
+	);
 }
diff --git a/frontend/sync-client/src/utils/remove-from-array.ts b/frontend/sync-client/src/utils/remove-from-array.ts
new file mode 100644
index 00000000..393b062f
--- /dev/null
+++ b/frontend/sync-client/src/utils/remove-from-array.ts
@@ -0,0 +1,17 @@
+/**
+ * Efficiently removes a specific item from an array by modifying it in place.
+ * This is more efficient than using `.filter(item => item !== toRemove)` as it avoids creating a new array
+ *
+ * @param array The array to modify
+ * @param item The item to remove
+ * @returns true if the item was found and removed, false otherwise
+ */
+export function removeFromArray<T>(array: T[], item: T): boolean {
+    const index = array.indexOf(item);
+    if (index !== -1) {
+        // eslint-disable-next-line no-restricted-syntax -- This is the implementation of the helper itself
+        array.splice(index, 1);
+        return true;
+    }
+    return false;
+}
diff --git a/frontend/test-client/src/agent/mock-agent.ts b/frontend/test-client/src/agent/mock-agent.ts
index ac525685..824f5eee 100644
--- a/frontend/test-client/src/agent/mock-agent.ts
+++ b/frontend/test-client/src/agent/mock-agent.ts
@@ -15,7 +15,7 @@ export class MockAgent extends MockClient {
 	private readonly pendingActions: Promise<unknown>[] = [];
 
 	// The renamed file finding algorithm isn't too smart so we can't both update and rename the same file
-	private doNotTouchWhileOffline: string[] = [];
+	private readonly doNotTouchWhileOffline: string[] = [];
 
 	public constructor(
 		initialSettings: Partial<SyncSettings>,
@@ -54,10 +54,10 @@ export class MockAgent extends MockClient {
 			);
 
 			if (historyEntry) {
-				this.doNotTouchWhileOffline =
-					this.doNotTouchWhileOffline.filter(
-						(file) => file !== historyEntry[1]
-					);
+				utils.removeFromArray(
+					this.doNotTouchWhileOffline,
+					historyEntry[1]
+				);
 			}
 			switch (logLine.level) {
 				case LogLevel.ERROR:

From 9e06d9951280feb2c8900a19df129f49a3c437ef Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 7 Dec 2025 12:36:56 +0000
Subject: [PATCH 720/761] Run all tests

---
 frontend/local-client-cli/package.json | 50 +++++++++++++-------------
 frontend/sync-client/package.json      |  2 +-
 frontend/test-client/package.json      | 44 +++++++++++------------
 3 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/frontend/local-client-cli/package.json b/frontend/local-client-cli/package.json
index e3f45b6b..0f60af48 100644
--- a/frontend/local-client-cli/package.json
+++ b/frontend/local-client-cli/package.json
@@ -1,27 +1,27 @@
 {
-	"name": "local-client-cli",
-	"version": "0.12.0",
-	"description": "Standalone CLI for VaultLink sync client",
-	"private": false,
-	"bin": {
-		"vaultlink": "./dist/cli.js"
-	},
-	"scripts": {
-		"dev": "webpack watch --mode development",
-		"build": "webpack --mode production",
-		"test": "tsx --test src/args.test.ts src/node-filesystem.test.ts"
-	},
-	"dependencies": {
-		"commander": "^14.0.2"
-	},
-	"devDependencies": {
-		"@types/node": "^24.8.1",
-		"sync-client": "file:../sync-client",
-		"ts-loader": "^9.5.2",
-		"tslib": "2.8.1",
-		"tsx": "^4.20.6",
-		"typescript": "5.8.3",
-		"webpack": "^5.99.9",
-		"webpack-cli": "^6.0.1"
-	}
+    "name": "local-client-cli",
+    "version": "0.12.0",
+    "description": "Standalone CLI for VaultLink sync client",
+    "private": false,
+    "bin": {
+        "vaultlink": "./dist/cli.js"
+    },
+    "scripts": {
+        "dev": "webpack watch --mode development",
+        "build": "webpack --mode production",
+        "test": "tsx --test 'src/**/*.test.ts'"
+    },
+    "dependencies": {
+        "commander": "^14.0.2"
+    },
+    "devDependencies": {
+        "@types/node": "^24.8.1",
+        "sync-client": "file:../sync-client",
+        "ts-loader": "^9.5.2",
+        "tslib": "2.8.1",
+        "tsx": "^4.20.6",
+        "typescript": "5.8.3",
+        "webpack": "^5.99.9",
+        "webpack-cli": "^6.0.1"
+    }
 }
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index 4dbf5afc..92905511 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -10,7 +10,7 @@
     "scripts": {
         "dev": "webpack watch --mode development",
         "build": "webpack --mode production",
-        "test": "tsx --test src/**/*.test.ts"
+        "test": "tsx --test 'src/**/*.test.ts'"
     },
     "devDependencies": {
         "byte-base64": "^1.1.0",
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index b7ee3bd1..01c87a2a 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -1,24 +1,24 @@
 {
-	"name": "test-client",
-	"version": "0.12.0",
-	"private": true,
-	"bin": {
-		"test-client": "./dist/cli.js"
-	},
-	"scripts": {
-		"dev": "webpack watch --mode development",
-		"build": "webpack --mode production",
-		"test": "tsx --test src/**/*.test.ts"
-	},
-	"devDependencies": {
-		"@types/node": "^24.8.1",
-		"sync-client": "file:../sync-client",
-		"ts-loader": "^9.5.2",
-		"tslib": "2.8.1",
-		"tsx": "^4.20.6",
-		"typescript": "5.8.3",
-		"uuid": "^13.0.0",
-		"webpack": "^5.99.9",
-		"webpack-cli": "^6.0.1"
-	}
+    "name": "test-client",
+    "version": "0.12.0",
+    "private": true,
+    "bin": {
+        "test-client": "./dist/cli.js"
+    },
+    "scripts": {
+        "dev": "webpack watch --mode development",
+        "build": "webpack --mode production",
+        "test": "tsx --test 'src/**/*.test.ts'"
+    },
+    "devDependencies": {
+        "@types/node": "^24.8.1",
+        "sync-client": "file:../sync-client",
+        "ts-loader": "^9.5.2",
+        "tslib": "2.8.1",
+        "tsx": "^4.20.6",
+        "typescript": "5.8.3",
+        "uuid": "^13.0.0",
+        "webpack": "^5.99.9",
+        "webpack-cli": "^6.0.1"
+    }
 }

From e6bfefd2d5c0eae1eb37ab67d2b7c75386ca3ef5 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 7 Dec 2025 12:44:11 +0000
Subject: [PATCH 721/761] Fix file creation deduplication

---
 sync-server/src/app_state/database.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sync-server/src/app_state/database.rs b/sync-server/src/app_state/database.rs
index bdfc7427..41097925 100644
--- a/sync-server/src/app_state/database.rs
+++ b/sync-server/src/app_state/database.rs
@@ -319,7 +319,7 @@ impl Database {
                 device_id,
                 has_been_merged
             from latest_document_versions
-            where relative_path = ?
+            where relative_path = ? and is_deleted = false
             order by vault_update_id desc  -- `latest_document_versions` only contains a single latest version of each document, however,
                                            -- multiple documents can have the same `relative_path`, if they have been deleted. That's
                                            -- why we only care about the latest version of the document with the given relative path.

From 1ed22c72d7c42df0265a0186f74ddf6c6b2dd4f1 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 7 Dec 2025 13:01:55 +0000
Subject: [PATCH 722/761] Enforce editorconfig

---
 frontend/package.json | 1 +
 scripts/check.sh      | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/frontend/package.json b/frontend/package.json
index 96e58973..ddd9e1c3 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -22,6 +22,7 @@
 	},
 	"devDependencies": {
 		"concurrently": "^9.2.1",
+		"eclint": "^2.8.1",
 		"eslint": "9.38.0",
 		"eslint-plugin-unused-imports": "^4.1.4",
 		"npm-check-updates": "^19.1.1",
diff --git a/scripts/check.sh b/scripts/check.sh
index 933bb60f..6300c592 100755
--- a/scripts/check.sh
+++ b/scripts/check.sh
@@ -32,6 +32,13 @@ if [[ "$FIX_MODE" == true ]]; then
 else
     npm ci
 fi
+
+echo "Checking .editorconfig compliance"
+if [[ "$FIX_MODE" == true ]]; then
+    npx eclint fix '../**/*' '!../node_modules/**' '!../frontend/node_modules/**' '!../sync-server/target/**' '!../frontend/dist/**' '!../.git/**'
+else
+    npx eclint check '../**/*' '!../node_modules/**' '!../frontend/node_modules/**' '!../sync-server/target/**' '!../frontend/dist/**' '!../.git/**'
+fi
 npm run build
 npm run test
 npm run lint

From ad3191957af7a8a9a313515f973d8f7eb619173b Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 7 Dec 2025 13:30:45 +0000
Subject: [PATCH 723/761] Add event handler class

---
 .../src/views/cursors/file-explorer.ts        |   78 +-
 .../sync-client/src/persistence/settings.ts   |  167 ++-
 .../src/services/websocket-manager.test.ts    |    8 +-
 .../src/services/websocket-manager.ts         |  471 ++++----
 frontend/sync-client/src/sync-client.ts       |  980 ++++++++--------
 .../src/sync-operations/cursor-tracker.ts     |  416 +++----
 .../sync-operations/file-change-notifier.ts   |   24 +-
 .../sync-client/src/sync-operations/syncer.ts |  997 ++++++++--------
 .../sync-operations/unrestricted-syncer.ts    | 1021 ++++++++---------
 frontend/sync-client/src/tracing/logger.ts    |  113 +-
 .../sync-client/src/tracing/sync-history.ts   |  242 ++--
 .../data-structures/event-listeners.test.ts   |  147 +++
 .../utils/data-structures/event-listeners.ts  |   71 ++
 .../src/utils/debugging/log-to-console.ts     |    2 +-
 14 files changed, 2428 insertions(+), 2309 deletions(-)
 create mode 100644 frontend/sync-client/src/utils/data-structures/event-listeners.test.ts
 create mode 100644 frontend/sync-client/src/utils/data-structures/event-listeners.ts

diff --git a/frontend/obsidian-plugin/src/views/cursors/file-explorer.ts b/frontend/obsidian-plugin/src/views/cursors/file-explorer.ts
index 78bf3e4f..3088c640 100644
--- a/frontend/obsidian-plugin/src/views/cursors/file-explorer.ts
+++ b/frontend/obsidian-plugin/src/views/cursors/file-explorer.ts
@@ -2,54 +2,54 @@ import "./file-explorer.scss";
 
 import type { App, View } from "obsidian";
 import {
-	utils,
-	type MaybeOutdatedClientCursors,
-	type RelativePath
+    utils,
+    type MaybeOutdatedClientCursors,
+    type RelativePath
 } from "sync-client";
 
 const REMOTE_USER_CONTAINER_CLASS = "remote-users";
 
 export function renderCursorsInFileExplorer(
-	cursors: MaybeOutdatedClientCursors[],
-	app: App
+    cursors: MaybeOutdatedClientCursors[],
+    app: App
 ): void {
-	const fileExplorers = app.workspace.getLeavesOfType("file-explorer");
-	if (fileExplorers.length == 0) return;
+    const fileExplorers = app.workspace.getLeavesOfType("file-explorer");
+    if (fileExplorers.length == 0) return;
 
-	const [fileExplorer] = fileExplorers;
+    const [fileExplorer] = fileExplorers;
 
-	// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-	const fileExplorerView: View & {
-		fileItems: Record<RelativePath, { el: Element }>; // it's an internal API
-	} = fileExplorer.view as any; // eslint-disable-line
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+    const fileExplorerView: View & {
+        fileItems: Record<RelativePath, { el: Element }>; // it's an internal API
+    } = fileExplorer.view as any; // eslint-disable-line
 
-	for (const key in fileExplorerView.fileItems) {
-		const element =
-			fileExplorerView.fileItems[key].el.querySelector(".tree-item-self");
+    for (const key in fileExplorerView.fileItems) {
+        const element =
+            fileExplorerView.fileItems[key].el.querySelector(".tree-item-self");
 
-		const customElement = createDiv(
-			{
-				cls: REMOTE_USER_CONTAINER_CLASS
-			},
-			(parent) => {
-				cursors.forEach((cursor) => {
-					cursor.documentsWithCursors.forEach((document) => {
-						if (document.relative_path.startsWith(key)) {
-							parent.appendChild(
-								createSpan({
-									text: cursor.userName,
-									attr: {
-										style: `border-color: ${utils.getRandomColor(cursor.userName)}`
-									}
-								})
-							);
-						}
-					});
-				});
-			}
-		);
+        const customElement = createDiv(
+            {
+                cls: REMOTE_USER_CONTAINER_CLASS
+            },
+            (parent) => {
+                cursors.forEach((cursor) => {
+                    cursor.documentsWithCursors.forEach((document) => {
+                        if (document.relative_path.startsWith(key)) {
+                            parent.appendChild(
+                                createSpan({
+                                    text: cursor.userName,
+                                    attr: {
+                                        style: `border-color: ${utils.getRandomColor(cursor.userName)}`
+                                    }
+                                })
+                            );
+                        }
+                    });
+                });
+            }
+        );
 
-		element?.querySelector("." + REMOTE_USER_CONTAINER_CLASS)?.remove();
-		element?.appendChild(customElement);
-	}
+        element?.querySelector("." + REMOTE_USER_CONTAINER_CLASS)?.remove();
+        element?.appendChild(customElement);
+    }
 }
diff --git a/frontend/sync-client/src/persistence/settings.ts b/frontend/sync-client/src/persistence/settings.ts
index 8472155a..234c99f6 100644
--- a/frontend/sync-client/src/persistence/settings.ts
+++ b/frontend/sync-client/src/persistence/settings.ts
@@ -1,113 +1,94 @@
 import type { Logger } from "../tracing/logger";
-import { awaitAll } from "../utils/await-all";
 import { Lock } from "../utils/data-structures/locks";
-import { removeFromArray } from "../utils/remove-from-array";
+import { EventListeners } from "../utils/data-structures/event-listeners";
 
 export interface SyncSettings {
-	remoteUri: string;
-	token: string;
-	vaultName: string;
-	syncConcurrency: number;
-	isSyncEnabled: boolean;
-	maxFileSizeMB: number;
-	ignorePatterns: string[];
-	webSocketRetryIntervalMs: number;
-	diffCacheSizeMB: number;
-	enableTelemetry: boolean;
-	networkRetryIntervalMs: number;
-	minimumSaveIntervalMs: number;
+    remoteUri: string;
+    token: string;
+    vaultName: string;
+    syncConcurrency: number;
+    isSyncEnabled: boolean;
+    maxFileSizeMB: number;
+    ignorePatterns: string[];
+    webSocketRetryIntervalMs: number;
+    diffCacheSizeMB: number;
+    enableTelemetry: boolean;
+    networkRetryIntervalMs: number;
+    minimumSaveIntervalMs: number;
 }
 
 export const DEFAULT_SETTINGS: SyncSettings = {
-	remoteUri: "",
-	token: "",
-	vaultName: "default",
-	syncConcurrency: 1,
-	isSyncEnabled: false,
-	maxFileSizeMB: 10,
-	ignorePatterns: [],
-	webSocketRetryIntervalMs: 3500,
-	diffCacheSizeMB: 4,
-	enableTelemetry: false,
-	networkRetryIntervalMs: 1000,
-	minimumSaveIntervalMs: 1000
+    remoteUri: "",
+    token: "",
+    vaultName: "default",
+    syncConcurrency: 1,
+    isSyncEnabled: false,
+    maxFileSizeMB: 10,
+    ignorePatterns: [],
+    webSocketRetryIntervalMs: 3500,
+    diffCacheSizeMB: 4,
+    enableTelemetry: false,
+    networkRetryIntervalMs: 1000,
+    minimumSaveIntervalMs: 1000
 };
 
 export class Settings {
-	private settings: SyncSettings;
-	private readonly lock: Lock = new Lock();
+    private settings: SyncSettings;
+    private readonly lock: Lock = new Lock();
 
-	private readonly onSettingsChangeHandlers: ((
-		newSettings: SyncSettings,
-		oldSettings: SyncSettings
-	) => unknown)[] = [];
+    public readonly onSettingsChanged = new EventListeners<
+        (newSettings: SyncSettings, oldSettings: SyncSettings) => unknown
+    >();
 
-	public constructor(
-		private readonly logger: Logger,
-		initialState: Partial<SyncSettings> | undefined,
-		private readonly saveData: (data: SyncSettings) => Promise<void>
-	) {
-		this.settings = {
-			...DEFAULT_SETTINGS,
-			...(initialState ?? {})
-		};
+    public constructor(
+        private readonly logger: Logger,
+        initialState: Partial<SyncSettings> | undefined,
+        private readonly saveData: (data: SyncSettings) => Promise<void>
+    ) {
+        this.settings = {
+            ...DEFAULT_SETTINGS,
+            ...(initialState ?? {})
+        };
 
-		this.logger.debug(
-			`Loaded settings: ${JSON.stringify(this.settings, null, 2)}`
-		);
-	}
+        this.logger.debug(
+            `Loaded settings: ${JSON.stringify(this.settings, null, 2)}`
+        );
+    }
 
-	public getSettings(): SyncSettings {
-		return this.settings;
-	}
+    public getSettings(): SyncSettings {
+        return this.settings;
+    }
 
-	public addOnSettingsChangeListener(
-		listener: (settings: SyncSettings, oldSettings: SyncSettings) => unknown
-	): void {
-		this.onSettingsChangeHandlers.push(listener);
-	}
+    public async setSetting<T extends keyof SyncSettings>(
+        key: T,
+        value: SyncSettings[T]
+    ): Promise<void> {
+        await this.setSettings({
+            [key]: value
+        });
+    }
 
-	public removeOnSettingsChangeListener(
-		listener: (settings: SyncSettings, oldSettings: SyncSettings) => unknown
-	): void {
-		removeFromArray(this.onSettingsChangeHandlers, listener);
-	}
+    public async setSettings(value: Partial<SyncSettings>): Promise<void> {
+        await this.lock.withLock(async () => {
+            this.logger.debug(
+                `Updating settings with: ${JSON.stringify(value)}`
+            );
+            const oldSettings = this.settings;
+            this.settings = {
+                ...this.settings,
+                ...value
+            };
 
-	public async setSetting<T extends keyof SyncSettings>(
-		key: T,
-		value: SyncSettings[T]
-	): Promise<void> {
-		await this.setSettings({
-			[key]: value
-		});
-	}
+            await this.onSettingsChanged.triggerAsync(
+                this.settings,
+                oldSettings
+            );
 
-	public async setSettings(value: Partial<SyncSettings>): Promise<void> {
-		await this.lock.withLock(async () => {
-			this.logger.debug(
-				`Updating settings with: ${JSON.stringify(value)}`
-			);
-			const oldSettings = this.settings;
-			this.settings = {
-				...this.settings,
-				...value
-			};
+            await this.save();
+        });
+    }
 
-			await awaitAll(
-				this.onSettingsChangeHandlers
-					.map((handler) => {
-						return handler(this.settings, oldSettings);
-					})
-					.filter((result): result is Promise<unknown> => {
-						return result instanceof Promise;
-					})
-			);
-
-			await this.save();
-		});
-	}
-
-	private async save(): Promise<void> {
-		await this.saveData(this.settings);
-	}
+    private async save(): Promise<void> {
+        await this.saveData(this.settings);
+    }
 }
diff --git a/frontend/sync-client/src/services/websocket-manager.test.ts b/frontend/sync-client/src/services/websocket-manager.test.ts
index 13aca939..8dd8180a 100644
--- a/frontend/sync-client/src/services/websocket-manager.test.ts
+++ b/frontend/sync-client/src/services/websocket-manager.test.ts
@@ -122,7 +122,7 @@ describe("WebSocketManager", () => {
 			MockWebSocket as unknown as typeof WebSocket
 		);
 
-		manager.addRemoteVaultUpdateListener(async () => {
+		manager.onRemoteVaultUpdateReceived.add(async () => {
 			await new Promise((resolve) => setTimeout(resolve, 10));
 		});
 		manager.start();
@@ -152,7 +152,7 @@ describe("WebSocketManager", () => {
 			MockWebSocket as unknown as typeof WebSocket
 		);
 
-		manager.addRemoteCursorsUpdateListener(async () => {
+		manager.onRemoteCursorsUpdateReceived.add(async () => {
 			await new Promise((resolve) => setTimeout(resolve, 10));
 		});
 		manager.start();
@@ -227,7 +227,7 @@ describe("WebSocketManager", () => {
 		);
 
 		let statusChangeCount = 0;
-		manager.addWebSocketStatusChangeListener(() => {
+		manager.onWebSocketStatusChanged.add(() => {
 			statusChangeCount++;
 		});
 
@@ -269,7 +269,7 @@ describe("WebSocketManager", () => {
 			resolveListener = resolve;
 		});
 
-		manager.addRemoteVaultUpdateListener(async () => {
+		manager.onRemoteVaultUpdateReceived.add(async () => {
 			await listenerPromise;
 		});
 
diff --git a/frontend/sync-client/src/services/websocket-manager.ts b/frontend/sync-client/src/services/websocket-manager.ts
index 0dc19d60..f8dc59d4 100644
--- a/frontend/sync-client/src/services/websocket-manager.ts
+++ b/frontend/sync-client/src/services/websocket-manager.ts
@@ -6,295 +6,260 @@ import type { CursorPositionFromClient } from "./types/CursorPositionFromClient"
 import type { ClientCursors } from "./types/ClientCursors";
 import { createPromise } from "../utils/create-promise";
 import type { WebSocketVaultUpdate } from "./types/WebSocketVaultUpdate";
-import { awaitAll } from "../utils/await-all";
 import { WEBSOCKET_DISCONNECT_TIMEOUT_IN_S } from "../consts";
 import { removeFromArray } from "../utils/remove-from-array";
+import { EventListeners } from "../utils/data-structures/event-listeners";
+import { awaitAll } from "../utils/await-all";
 
 export class WebSocketManager {
-	private readonly webSocketStatusChangeListeners: ((
-		isConnected: boolean
-	) => unknown)[] = [];
+    public readonly onWebSocketStatusChanged = new EventListeners<
+        (isConnected: boolean) => unknown
+    >();
 
-	private readonly remoteVaultUpdateListeners: ((
-		update: WebSocketVaultUpdate
-	) => Promise<void>)[] = [];
+    public readonly onRemoteVaultUpdateReceived = new EventListeners<
+        (update: WebSocketVaultUpdate) => Promise<void>
+    >();
 
-	private readonly remoteCursorsUpdateListeners: ((
-		cursors: ClientCursors[]
-	) => Promise<void>)[] = [];
+    public readonly onRemoteCursorsUpdateReceived = new EventListeners<
+        (cursors: ClientCursors[]) => Promise<void>
+    >();
 
-	private isStopped = true;
-	private resolveDisconnectingPromise: null | (() => unknown) = null;
-	private reconnectTimeoutId: ReturnType<typeof setTimeout> | undefined;
+    private isStopped = true;
+    private resolveDisconnectingPromise: null | (() => unknown) = null;
+    private reconnectTimeoutId: ReturnType<typeof setTimeout> | undefined;
 
-	private readonly outstandingPromises: Promise<unknown>[] = [];
+    private readonly outstandingPromises: Promise<unknown>[] = [];
 
-	private webSocket: WebSocket | undefined;
-	private readonly webSocketFactoryImplementation: typeof globalThis.WebSocket;
+    private webSocket: WebSocket | undefined;
+    private readonly webSocketFactoryImplementation: typeof globalThis.WebSocket;
 
-	public constructor(
-		private readonly deviceId: string,
-		private readonly logger: Logger,
-		private readonly settings: Settings,
-		webSocketImplementation?: typeof globalThis.WebSocket
-	) {
-		if (webSocketImplementation) {
-			this.webSocketFactoryImplementation = webSocketImplementation;
-		} else {
-			if (
-				typeof globalThis !== "undefined" &&
-				typeof globalThis.WebSocket === "undefined"
-			) {
-				// eslint-disable-next-line
-				this.webSocketFactoryImplementation = require("ws"); // polyfill for WebSocket in Node.js
-			} else {
-				this.webSocketFactoryImplementation = WebSocket;
-			}
-		}
-	}
+    public constructor(
+        private readonly deviceId: string,
+        private readonly logger: Logger,
+        private readonly settings: Settings,
+        webSocketImplementation?: typeof globalThis.WebSocket
+    ) {
+        if (webSocketImplementation) {
+            this.webSocketFactoryImplementation = webSocketImplementation;
+        } else {
+            if (
+                typeof globalThis !== "undefined" &&
+                typeof globalThis.WebSocket === "undefined"
+            ) {
+                // eslint-disable-next-line
+                this.webSocketFactoryImplementation = require("ws"); // polyfill for WebSocket in Node.js
+            } else {
+                this.webSocketFactoryImplementation = WebSocket;
+            }
+        }
+    }
 
-	public get isWebSocketConnected(): boolean {
-		return (
-			this.webSocket?.readyState ===
-			this.webSocketFactoryImplementation.OPEN
-		);
-	}
+    public get isWebSocketConnected(): boolean {
+        return (
+            this.webSocket?.readyState ===
+            this.webSocketFactoryImplementation.OPEN
+        );
+    }
 
-	public addWebSocketStatusChangeListener(
-		listener: (isConnected: boolean) => unknown
-	): void {
-		this.webSocketStatusChangeListeners.push(listener);
-	}
+    public start(): void {
+        this.isStopped = false;
+        this.initializeWebSocket();
+    }
 
-	public addRemoteCursorsUpdateListener(
-		listener: (cursors: ClientCursors[]) => Promise<void>
-	): void {
-		this.remoteCursorsUpdateListeners.push(listener);
-	}
+    public async stop(): Promise<void> {
+        const [promise, resolve] = createPromise();
+        this.resolveDisconnectingPromise = resolve;
 
-	public addRemoteVaultUpdateListener(
-		listener: (update: WebSocketVaultUpdate) => Promise<void>
-	): void {
-		this.remoteVaultUpdateListeners.push(listener);
-	}
+        this.isStopped = true;
 
-	public start(): void {
-		this.isStopped = false;
-		this.initializeWebSocket();
-	}
+        if (this.reconnectTimeoutId !== undefined) {
+            clearTimeout(this.reconnectTimeoutId);
+            this.reconnectTimeoutId = undefined;
+        }
 
-	public async stop(): Promise<void> {
-		const [promise, resolve] = createPromise();
-		this.resolveDisconnectingPromise = resolve;
+        this.webSocket?.close(1000, "WebSocketManager has been stopped");
 
-		this.isStopped = true;
+        // eslint-disable-next-line @typescript-eslint/init-declarations
+        let timeoutId: ReturnType<typeof setTimeout> | undefined;
+        const timeoutPromise = new Promise<void>((_, reject) => {
+            timeoutId = setTimeout(() => {
+                reject(
+                    new Error(
+                        `Timeout waiting for WebSocket to close after ${WEBSOCKET_DISCONNECT_TIMEOUT_IN_S} seconds`
+                    )
+                );
+            }, WEBSOCKET_DISCONNECT_TIMEOUT_IN_S * 1000);
+        });
 
-		if (this.reconnectTimeoutId !== undefined) {
-			clearTimeout(this.reconnectTimeoutId);
-			this.reconnectTimeoutId = undefined;
-		}
+        try {
+            while (this.isWebSocketConnected) {
+                await Promise.race([promise, timeoutPromise]);
+            }
+        } catch (error) {
+            this.logger.error(
+                `Error while waiting for WebSocket to close: ${String(error)}`
+            );
+            // Force cleanup even if close didn't work
+            this.resolveDisconnectingPromise();
+            this.resolveDisconnectingPromise = null;
+        } finally {
+            // Clear timeout to prevent unhandled rejection
+            if (timeoutId !== undefined) {
+                clearTimeout(timeoutId);
+            }
+        }
 
-		this.webSocket?.close(1000, "WebSocketManager has been stopped");
+        await this.waitUntilFinished();
+    }
 
-		// eslint-disable-next-line @typescript-eslint/init-declarations
-		let timeoutId: ReturnType<typeof setTimeout> | undefined;
-		const timeoutPromise = new Promise<void>((_, reject) => {
-			timeoutId = setTimeout(() => {
-				reject(
-					new Error(
-						`Timeout waiting for WebSocket to close after ${WEBSOCKET_DISCONNECT_TIMEOUT_IN_S} seconds`
-					)
-				);
-			}, WEBSOCKET_DISCONNECT_TIMEOUT_IN_S * 1000);
-		});
+    public async waitUntilFinished(): Promise<void> {
+        await awaitAll(this.outstandingPromises);
+    }
 
-		try {
-			while (this.isWebSocketConnected) {
-				await Promise.race([promise, timeoutPromise]);
-			}
-		} catch (error) {
-			this.logger.error(
-				`Error while waiting for WebSocket to close: ${String(error)}`
-			);
-			// Force cleanup even if close didn't work
-			this.resolveDisconnectingPromise();
-			this.resolveDisconnectingPromise = null;
-		} finally {
-			// Clear timeout to prevent unhandled rejection
-			if (timeoutId !== undefined) {
-				clearTimeout(timeoutId);
-			}
-		}
+    public sendHandshakeMessage(
+        message: WebSocketClientMessage & { type: "handshake" }
+    ): void {
+        const { webSocket } = this;
+        if (!webSocket) {
+            throw new Error(
+                "WebSocket is not connected, cannot send handshake message"
+            );
+        }
 
-		await this.waitUntilFinished();
-	}
+        try {
+            webSocket.send(JSON.stringify(message));
+        } catch (error) {
+            this.logger.error(
+                `Failed to send handshake message: ${String(error)}`
+            );
+            throw error;
+        }
+    }
 
-	public async waitUntilFinished(): Promise<void> {
-		await awaitAll(this.outstandingPromises);
-	}
+    public updateLocalCursors(cursorPositions: CursorPositionFromClient): void {
+        if (!this.isWebSocketConnected || !this.webSocket) {
+            // A missing cursor update is fine, we can just skip it if needed
+            this.logger.warn(
+                "WebSocket is not connected, cannot send cursor positions"
+            );
+            return;
+        }
 
-	public sendHandshakeMessage(
-		message: WebSocketClientMessage & { type: "handshake" }
-	): void {
-		const { webSocket } = this;
-		if (!webSocket) {
-			throw new Error(
-				"WebSocket is not connected, cannot send handshake message"
-			);
-		}
+        const message: WebSocketClientMessage = {
+            type: "cursorPositions",
+            ...cursorPositions
+        };
 
-		try {
-			webSocket.send(JSON.stringify(message));
-		} catch (error) {
-			this.logger.error(
-				`Failed to send handshake message: ${String(error)}`
-			);
-			throw error;
-		}
-	}
+        try {
+            this.webSocket.send(JSON.stringify(message));
+            this.logger.debug(
+                `Sent cursor positions: ${JSON.stringify(cursorPositions)}`
+            );
+        } catch (error) {
+            this.logger.warn(
+                `Failed to send cursor positions: ${String(error)}`
+            );
+        }
+    }
 
-	public updateLocalCursors(cursorPositions: CursorPositionFromClient): void {
-		if (!this.isWebSocketConnected || !this.webSocket) {
-			// A missing cursor update is fine, we can just skip it if needed
-			this.logger.warn(
-				"WebSocket is not connected, cannot send cursor positions"
-			);
-			return;
-		}
+    private initializeWebSocket(): void {
+        // Clean up old WebSocket handlers to prevent race conditions
+        if (this.webSocket) {
+            try {
+                // Remove handlers to prevent them from firing after new connection
+                this.webSocket.onopen = null;
+                this.webSocket.onclose = null;
+                this.webSocket.onmessage = null;
+                this.webSocket.onerror = null;
+                this.webSocket.close();
+            } catch (e) {
+                this.logger.error(
+                    `Failed to close previous WebSocket connection: ${e}`
+                );
+            }
+        }
 
-		const message: WebSocketClientMessage = {
-			type: "cursorPositions",
-			...cursorPositions
-		};
+        const wsUri = new URL(this.settings.getSettings().remoteUri);
+        wsUri.protocol = wsUri.protocol === "https" ? "wss" : "ws";
+        wsUri.pathname = `/vaults/${this.settings.getSettings().vaultName}/ws`;
 
-		try {
-			this.webSocket.send(JSON.stringify(message));
-			this.logger.debug(
-				`Sent cursor positions: ${JSON.stringify(cursorPositions)}`
-			);
-		} catch (error) {
-			this.logger.warn(
-				`Failed to send cursor positions: ${String(error)}`
-			);
-		}
-	}
+        this.logger.info(`Connecting to WebSocket at ${wsUri.toString()}`);
 
-	private initializeWebSocket(): void {
-		// Clean up old WebSocket handlers to prevent race conditions
-		if (this.webSocket) {
-			try {
-				// Remove handlers to prevent them from firing after new connection
-				this.webSocket.onopen = null;
-				this.webSocket.onclose = null;
-				this.webSocket.onmessage = null;
-				this.webSocket.onerror = null;
-				this.webSocket.close();
-			} catch (e) {
-				this.logger.error(
-					`Failed to close previous WebSocket connection: ${e}`
-				);
-			}
-		}
+        this.webSocket = new this.webSocketFactoryImplementation(wsUri);
 
-		const wsUri = new URL(this.settings.getSettings().remoteUri);
-		wsUri.protocol = wsUri.protocol === "https" ? "wss" : "ws";
-		wsUri.pathname = `/vaults/${this.settings.getSettings().vaultName}/ws`;
+        this.webSocket.onopen = (): void => {
+            this.logger.info("WebSocket connection opened");
+            this.onWebSocketStatusChanged.trigger(true);
+        };
 
-		this.logger.info(`Connecting to WebSocket at ${wsUri.toString()}`);
+        this.webSocket.onmessage = (event): void => {
+            try {
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+                const message = JSON.parse(
+                    event.data
+                ) as WebSocketServerMessage;
 
-		this.webSocket = new this.webSocketFactoryImplementation(wsUri);
+                // Track the message handling promise
+                const messageHandlingPromise = this.handleWebSocketMessage(
+                    message
+                )
+                    .catch((error: unknown) => {
+                        this.logger.error(
+                            `Error handling WebSocket message: ${String(error)}`
+                        );
+                    })
+                    .finally(() => {
+                        removeFromArray(
+                            this.outstandingPromises,
+                            messageHandlingPromise
+                        );
+                    });
 
-		this.webSocket.onopen = (): void => {
-			this.logger.info("WebSocket connection opened");
-			this.webSocketStatusChangeListeners.forEach((listener) =>
-				listener(true)
-			);
-		};
+                void this.outstandingPromises.push(messageHandlingPromise); // ignore the returned promise
+            } catch (error) {
+                this.logger.error(
+                    `Error parsing WebSocket message: ${String(error)}`
+                );
+            }
+        };
 
-		this.webSocket.onmessage = (event): void => {
-			try {
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-				const message = JSON.parse(
-					event.data
-				) as WebSocketServerMessage;
+        this.webSocket.onclose = (event): void => {
+            this.logger.warn(
+                `WebSocket closed with code ${event.code} (${event.reason == "" ? "unknown reason" : event.reason})`
+            );
+            this.onWebSocketStatusChanged.trigger(false);
 
-				// Track the message handling promise
-				const messageHandlingPromise = this.handleWebSocketMessage(
-					message
-				)
-					.catch((error: unknown) => {
-						this.logger.error(
-							`Error handling WebSocket message: ${String(error)}`
-						);
-					})
-					.finally(() => {
-						removeFromArray(
-							this.outstandingPromises,
-							messageHandlingPromise
-						);
-					});
+            if (this.isStopped) {
+                this.resolveDisconnectingPromise?.();
+                this.resolveDisconnectingPromise = null;
+            } else {
+                this.reconnectTimeoutId = setTimeout(() => {
+                    this.reconnectTimeoutId = undefined;
+                    this.initializeWebSocket();
+                }, this.settings.getSettings().webSocketRetryIntervalMs);
+            }
+        };
+    }
 
-				void this.outstandingPromises.push(messageHandlingPromise); // ignore the returned promise
-			} catch (error) {
-				this.logger.error(
-					`Error parsing WebSocket message: ${String(error)}`
-				);
-			}
-		};
+    private async handleWebSocketMessage(
+        message: WebSocketServerMessage
+    ): Promise<void> {
+        if (message.type === "vaultUpdate") {
+            await this.onRemoteVaultUpdateReceived.triggerAsync(message);
 
-		this.webSocket.onclose = (event): void => {
-			this.logger.warn(
-				`WebSocket closed with code ${event.code} (${event.reason == "" ? "unknown reason" : event.reason})`
-			);
-			this.webSocketStatusChangeListeners.forEach((listener) =>
-				listener(false)
-			);
+            // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+        } else if (message.type === "cursorPositions") {
+            this.logger.debug(
+                `Received cursor positions for ${JSON.stringify(message.clients)}`
+            );
 
-			if (this.isStopped) {
-				this.resolveDisconnectingPromise?.();
-				this.resolveDisconnectingPromise = null;
-			} else {
-				this.reconnectTimeoutId = setTimeout(() => {
-					this.reconnectTimeoutId = undefined;
-					this.initializeWebSocket();
-				}, this.settings.getSettings().webSocketRetryIntervalMs);
-			}
-		};
-	}
-
-	private async handleWebSocketMessage(
-		message: WebSocketServerMessage
-	): Promise<void> {
-		if (message.type === "vaultUpdate") {
-			await awaitAll(
-				this.remoteVaultUpdateListeners.map(async (listener) => {
-					await listener(message).catch((error: unknown) => {
-						this.logger.error(
-							`Error in vault update listener: ${String(error)}`
-						);
-					});
-				})
-			);
-
-			// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-		} else if (message.type === "cursorPositions") {
-			this.logger.debug(
-				`Received cursor positions for ${JSON.stringify(message.clients)}`
-			);
-
-			await awaitAll(
-				this.remoteCursorsUpdateListeners.map(async (listener) => {
-					await listener(message.clients).catch((error: unknown) => {
-						this.logger.error(
-							`Error in cursor positions listener: ${String(error)}`
-						);
-					});
-				})
-			);
-		} else {
-			this.logger.warn(
-				`Received unknown message type: ${JSON.stringify(message)}`
-			);
-		}
-	}
+            await this.onRemoteCursorsUpdateReceived.triggerAsync(
+                message.clients
+            );
+        } else {
+            this.logger.warn(
+                `Received unknown message type: ${JSON.stringify(message)}`
+            );
+        }
+    }
 }
diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts
index b76da9d9..af615f52 100644
--- a/frontend/sync-client/src/sync-client.ts
+++ b/frontend/sync-client/src/sync-client.ts
@@ -26,495 +26,497 @@ import { FixedSizeDocumentCache } from "./utils/data-structures/fix-sized-cache"
 import { setUpTelemetry } from "./utils/set-up-telemetry";
 import { DIFF_CACHE_SIZE_MB } from "./consts";
 import { ServerConfig } from "./services/server-config";
+import { EventListeners } from "./utils/data-structures/event-listeners";
 
 export class SyncClient {
-	private hasStartedOfflineSync = false;
-	private hasFinishedOfflineSync = false;
-	private hasStarted = false;
-	private hasBeenDestroyed = false;
-	private unloadTelemetry?: () => void;
-
-	private constructor(
-		private readonly history: SyncHistory,
-		private readonly settings: Settings,
-		private readonly database: Database,
-		private readonly syncer: Syncer,
-		private readonly webSocketManager: WebSocketManager,
-		public readonly logger: Logger,
-		private readonly fetchController: FetchController,
-		private readonly cursorTracker: CursorTracker,
-		private readonly fileChangeNotifier: FileChangeNotifier,
-		private readonly contentCache: FixedSizeDocumentCache,
-		private readonly fileOperations: FileOperations,
-		private readonly serverConfig: ServerConfig,
-		private readonly persistence: PersistenceProvider<
-			Partial<{
-				settings: Partial<SyncSettings>;
-				database: Partial<StoredDatabase>;
-			}>
-		>
-	) {}
-
-	public get documentCount(): number {
-		return this.database.length;
-	}
-
-	public get isWebSocketConnected(): boolean {
-		return this.webSocketManager.isWebSocketConnected;
-	}
-	public static async create({
-		fs,
-		persistence,
-		fetch,
-		webSocket,
-		nativeLineEndings = "\n"
-	}: {
-		fs: FileSystemOperations;
-		persistence: PersistenceProvider<
-			Partial<{
-				settings: Partial<SyncSettings>;
-				database: Partial<StoredDatabase>;
-			}>
-		>;
-		fetch?: typeof globalThis.fetch;
-		webSocket?: typeof globalThis.WebSocket;
-		nativeLineEndings?: string;
-	}): Promise<SyncClient> {
-		const logger = new Logger();
-
-		const deviceId = createClientId();
-
-		logger.info(`Creating SyncClient with client id ${deviceId}`);
-
-		const history = new SyncHistory(logger);
-
-		let state = (await persistence.load()) ?? {
-			settings: undefined,
-			database: undefined
-		};
-
-		const settings = new Settings(
-			logger,
-			state.settings,
-			async (data): Promise<void> => {
-				state = { ...state, settings: data };
-				// we're not rate-limiting settings saves as (1) we need to initialise the settings to know the rate limit
-				// and (2) settings changes are infrequent enough that rate-limiting is not necessary
-				await persistence.save(state);
-			}
-		);
-
-		const rateLimitedSave = rateLimit(
-			persistence.save,
-			() => settings.getSettings().minimumSaveIntervalMs
-		);
-
-		const database = new Database(
-			logger,
-			state.database,
-			async (data): Promise<void> => {
-				state = { ...state, database: data };
-				await rateLimitedSave(state);
-			}
-		);
-
-		const fetchController = new FetchController(
-			settings.getSettings().isSyncEnabled,
-			logger
-		);
-		settings.addOnSettingsChangeListener((newSettings, oldSettings) => {
-			if (oldSettings.isSyncEnabled != newSettings.isSyncEnabled) {
-				fetchController.canFetch = newSettings.isSyncEnabled;
-			}
-		});
-
-		const syncService = new SyncService(
-			deviceId,
-			fetchController,
-			settings,
-			logger,
-			fetch
-		);
-
-		const serverConfig = new ServerConfig(syncService);
-
-		const fileOperations = new FileOperations(
-			logger,
-			database,
-			fs,
-			serverConfig,
-			nativeLineEndings
-		);
-
-		const contentCache = new FixedSizeDocumentCache(
-			1024 * 1024 * DIFF_CACHE_SIZE_MB
-		);
-		const unrestrictedSyncer = new UnrestrictedSyncer(
-			logger,
-			database,
-			settings,
-			syncService,
-			fileOperations,
-			history,
-			contentCache,
-			serverConfig
-		);
-
-		const webSocketManager = new WebSocketManager(
-			deviceId,
-			logger,
-			settings,
-			webSocket
-		);
-
-		const syncer = new Syncer(
-			deviceId,
-			logger,
-			database,
-			settings,
-			syncService,
-			webSocketManager,
-			fileOperations,
-			unrestrictedSyncer
-		);
-
-		const fileChangeNotifier = new FileChangeNotifier();
-		const cursorTracker = new CursorTracker(
-			database,
-			webSocketManager,
-			fileOperations,
-			fileChangeNotifier
-		);
-		const client = new SyncClient(
-			history,
-			settings,
-			database,
-			syncer,
-			webSocketManager,
-			logger,
-			fetchController,
-			cursorTracker,
-			fileChangeNotifier,
-			contentCache,
-			fileOperations,
-			serverConfig,
-			persistence
-		);
-
-		logger.info("SyncClient created successfully");
-
-		return client;
-	}
-
-	public async start(): Promise<void> {
-		this.checkIfDestroyed("start");
-
-		if (this.hasStarted) {
-			throw new Error("SyncClient has already been started");
-		}
-		this.hasStarted = true;
-
-		if (
-			!this.unloadTelemetry &&
-			this.settings.getSettings().enableTelemetry
-		) {
-			this.unloadTelemetry = setUpTelemetry();
-		}
-
-		this.logger.addOnMessageListener((log): void => {
-			if (log.level === LogLevel.ERROR && Sentry.isInitialized()) {
-				Sentry.captureMessage(log.message);
-			}
-		});
-
-		this.settings.addOnSettingsChangeListener(
-			this.onSettingsChange.bind(this)
-		);
-
-		if (this.settings.getSettings().isSyncEnabled) {
-			this.logger.info("Starting SyncClient");
-			await this.startSyncing();
-			this.logger.info("SyncClient has successfully started");
-		}
-	}
-
-	/**
-	 * Reload settings from disk overriding current in-memory settings.
-	 * Missing values will be filled in from DEFAULT_SETTINGS rather than
-	 * retaining current in-memory settings.
-	 */
-	public async reloadSettings(): Promise<void> {
-		this.checkIfDestroyed("reloadSettings");
-
-		const state = (await this.persistence.load()) ?? {
-			settings: undefined
-		};
-
-		const settings = {
-			...DEFAULT_SETTINGS,
-			...(state.settings ?? {})
-		};
-
-		await this.setSettings(settings);
-	}
-
-	public async checkConnection(): Promise<NetworkConnectionStatus> {
-		this.checkIfDestroyed("checkConnection");
-
-		const server = await this.serverConfig.checkConnection(true);
-		return {
-			isSuccessful: server.isSuccessful,
-			serverMessage: server.message,
-			isWebSocketConnected: this.webSocketManager.isWebSocketConnected
-		};
-	}
-
-	public getHistoryEntries(): readonly HistoryEntry[] {
-		return this.history.entries;
-	}
-
-	public addSyncHistoryUpdateListener(
-		listener: (stats: HistoryStats) => unknown
-	): void {
-		this.checkIfDestroyed("addSyncHistoryUpdateListener");
-
-		this.history.addSyncHistoryUpdateListener(listener);
-	}
-
-	/**
-	 * Wait for the in-flight operations to finish, reset all tracking,
-	 * and the local database but retain the settings.
-	 * The SyncClient can be used again after calling this method.
-	 */
-	public async reset(): Promise<void> {
-		this.checkIfDestroyed("reset");
-
-		this.logger.info(
-			"Stopping SyncClient to apply changed connection settings"
-		);
-		await this.pause();
-
-		// clear all local state
-		this.logger.info("Resetting SyncClient's local state");
-		this.database.reset();
-		await this.database.save(); // ensure the new database reads as empty
-		this.resetInMemoryState();
-		this.hasStartedOfflineSync = false;
-		this.hasFinishedOfflineSync = false;
-		this.serverConfig.reset();
-
-		await this.startSyncing();
-	}
-
-	public getSettings(): SyncSettings {
-		return this.settings.getSettings();
-	}
-
-	public async setSetting<T extends keyof SyncSettings>(
-		key: T,
-		value: SyncSettings[T]
-	): Promise<void> {
-		this.checkIfDestroyed("setSetting");
-
-		await this.settings.setSetting(key, value);
-	}
-
-	public async setSettings(value: Partial<SyncSettings>): Promise<void> {
-		this.checkIfDestroyed("setSettings");
-
-		await this.settings.setSettings(value);
-	}
-
-	public addOnSettingsChangeListener(
-		listener: (settings: SyncSettings, oldSettings: SyncSettings) => unknown
-	): void {
-		this.checkIfDestroyed("addOnSettingsChangeListener");
-
-		this.settings.addOnSettingsChangeListener(listener);
-	}
-
-	public addRemainingSyncOperationsListener(
-		listener: (remainingOperations: number) => unknown
-	): void {
-		this.checkIfDestroyed("addRemainingSyncOperationsListener");
-
-		this.syncer.addRemainingOperationsListener(listener);
-	}
-
-	public addWebSocketStatusChangeListener(listener: () => unknown): void {
-		this.checkIfDestroyed("addWebSocketStatusChangeListener");
-
-		this.webSocketManager.addWebSocketStatusChangeListener(listener);
-	}
-
-	public async syncLocallyCreatedFile(
-		relativePath: RelativePath
-	): Promise<void> {
-		this.checkIfDestroyed("syncLocallyCreatedFile");
-
-		this.fileChangeNotifier.notifyOfFileChange(relativePath);
-		return this.syncer.syncLocallyCreatedFile(relativePath);
-	}
-
-	public async syncLocallyDeletedFile(
-		relativePath: RelativePath
-	): Promise<void> {
-		this.checkIfDestroyed("syncLocallyDeletedFile");
-
-		this.fileChangeNotifier.notifyOfFileChange(relativePath);
-		return this.syncer.syncLocallyDeletedFile(relativePath);
-	}
-
-	public async syncLocallyUpdatedFile({
-		oldPath,
-		relativePath
-	}: {
-		oldPath?: RelativePath;
-		relativePath: RelativePath;
-	}): Promise<void> {
-		this.checkIfDestroyed("syncLocallyUpdatedFile");
-
-		this.fileChangeNotifier.notifyOfFileChange(relativePath);
-		return this.syncer.syncLocallyUpdatedFile({
-			oldPath,
-			relativePath
-		});
-	}
-
-	public getDocumentSyncingStatus(
-		relativePath: RelativePath
-	): DocumentSyncStatus {
-		this.checkIfDestroyed("getDocumentSyncingStatus");
-
-		if (!this.settings.getSettings().isSyncEnabled) {
-			return DocumentSyncStatus.SYNCING_IS_DISABLED;
-		}
-
-		if (!this.syncer.isFirstSyncComplete || !this.hasFinishedOfflineSync) {
-			return DocumentSyncStatus.SYNCING;
-		}
-
-		const document =
-			this.database.getLatestDocumentByRelativePath(relativePath);
-		if (document === undefined) {
-			return DocumentSyncStatus.SYNCING;
-		}
-		return document.updates.length > 0
-			? DocumentSyncStatus.SYNCING
-			: DocumentSyncStatus.UP_TO_DATE;
-	}
-
-	public async updateLocalCursors(
-		documentToCursors: Record<RelativePath, CursorSpan[]>
-	): Promise<void> {
-		this.checkIfDestroyed("updateLocalCursors");
-
-		await this.cursorTracker.sendLocalCursorsToServer(documentToCursors);
-	}
-
-	public addRemoteCursorsUpdateListener(
-		listener: (cursors: MaybeOutdatedClientCursors[]) => unknown
-	): void {
-		this.checkIfDestroyed("addRemoteCursorsUpdateListener");
-
-		this.cursorTracker.addRemoteCursorsUpdateListener(listener);
-	}
-
-	public async waitUntilFinished(): Promise<void> {
-		this.checkIfDestroyed("waitUntilIdle");
-		await this.syncer.waitUntilFinished();
-		await this.webSocketManager.waitUntilFinished();
-		await this.database.save(); // flush all changes to disk
-	}
-
-	/**
-	 * Completely destroy the SyncClient, cancelling all in-progress operations.
-	 * After calling this method, the SyncClient cannot be used again.
-	 */
-	public async destroy(): Promise<void> {
-		this.checkIfDestroyed("destroy");
-
-		// cancel everything that's in progress
-		await this.pause();
-
-		this.hasBeenDestroyed = true;
-
-		this.resetInMemoryState();
-
-		this.logger.info("SyncClient has been successfully disposed");
-
-		this.unloadTelemetry?.();
-	}
-
-	private async startSyncing(): Promise<void> {
-		this.checkIfDestroyed("startSyncing");
-		this.fetchController.finishReset();
-
-		await this.serverConfig.initialize();
-		this.webSocketManager.start();
-
-		if (!this.hasStartedOfflineSync) {
-			this.hasStartedOfflineSync = true;
-			await this.syncer.scheduleSyncForOfflineChanges();
-		}
-
-		this.hasFinishedOfflineSync = true;
-	}
-
-	private async pause(): Promise<void> {
-		this.fetchController.startReset();
-		await this.webSocketManager.stop();
-		await this.waitUntilFinished();
-	}
-
-	private resetInMemoryState(): void {
-		this.history.reset();
-		this.contentCache.reset();
-		// don't reset the logger
-		this.cursorTracker.reset();
-		this.syncer.reset();
-		this.fileOperations.reset();
-	}
-
-	private async onSettingsChange(
-		newSettings: SyncSettings,
-		oldSettings: SyncSettings
-	): Promise<void> {
-		this.checkIfDestroyed("onSettingsChange");
-
-		if (
-			newSettings.vaultName !== oldSettings.vaultName ||
-			newSettings.remoteUri !== oldSettings.remoteUri
-		) {
-			await this.reset();
-		}
-
-		if (newSettings.isSyncEnabled !== oldSettings.isSyncEnabled) {
-			if (newSettings.isSyncEnabled) {
-				await this.startSyncing();
-			} else {
-				await this.pause();
-			}
-		}
-
-		if (newSettings.diffCacheSizeMB !== oldSettings.diffCacheSizeMB) {
-			this.contentCache.resize(newSettings.diffCacheSizeMB * 1024 * 1024);
-		}
-
-		if (newSettings.enableTelemetry !== oldSettings.enableTelemetry) {
-			if (newSettings.enableTelemetry) {
-				this.unloadTelemetry = setUpTelemetry();
-			} else {
-				this.unloadTelemetry?.();
-			}
-		}
-	}
-
-	private checkIfDestroyed(origin: string): void {
-		if (this.hasBeenDestroyed) {
-			throw new Error(
-				`SyncClient has been destroyed and can no longer be used; called from ${origin}`
-			);
-		}
-	}
+    private hasStartedOfflineSync = false;
+    private hasFinishedOfflineSync = false;
+    private hasStarted = false;
+    private hasBeenDestroyed = false;
+    private unloadTelemetry?: () => void;
+
+    private constructor(
+        private readonly history: SyncHistory,
+        private readonly settings: Settings,
+        private readonly database: Database,
+        private readonly syncer: Syncer,
+        private readonly webSocketManager: WebSocketManager,
+        public readonly logger: Logger,
+        private readonly fetchController: FetchController,
+        private readonly cursorTracker: CursorTracker,
+        private readonly fileChangeNotifier: FileChangeNotifier,
+        private readonly contentCache: FixedSizeDocumentCache,
+        private readonly fileOperations: FileOperations,
+        private readonly serverConfig: ServerConfig,
+        private readonly persistence: PersistenceProvider<
+            Partial<{
+                settings: Partial<SyncSettings>;
+                database: Partial<StoredDatabase>;
+            }>
+        >
+    ) { }
+
+    public get documentCount(): number {
+        return this.database.length;
+    }
+
+    public get isWebSocketConnected(): boolean {
+        return this.webSocketManager.isWebSocketConnected;
+    }
+    public static async create({
+        fs,
+        persistence,
+        fetch,
+        webSocket,
+        nativeLineEndings = "\n"
+    }: {
+        fs: FileSystemOperations;
+        persistence: PersistenceProvider<
+            Partial<{
+                settings: Partial<SyncSettings>;
+                database: Partial<StoredDatabase>;
+            }>
+        >;
+        fetch?: typeof globalThis.fetch;
+        webSocket?: typeof globalThis.WebSocket;
+        nativeLineEndings?: string;
+    }): Promise<SyncClient> {
+        const logger = new Logger();
+
+        const deviceId = createClientId();
+
+        logger.info(`Creating SyncClient with client id ${deviceId}`);
+
+        const history = new SyncHistory(logger);
+
+        let state = (await persistence.load()) ?? {
+            settings: undefined,
+            database: undefined
+        };
+
+        const settings = new Settings(
+            logger,
+            state.settings,
+            async (data): Promise<void> => {
+                state = { ...state, settings: data };
+                // we're not rate-limiting settings saves as (1) we need to initialise the settings to know the rate limit
+                // and (2) settings changes are infrequent enough that rate-limiting is not necessary
+                await persistence.save(state);
+            }
+        );
+
+        const rateLimitedSave = rateLimit(
+            persistence.save,
+            () => settings.getSettings().minimumSaveIntervalMs
+        );
+
+        const database = new Database(
+            logger,
+            state.database,
+            async (data): Promise<void> => {
+                state = { ...state, database: data };
+                await rateLimitedSave(state);
+            }
+        );
+
+        const fetchController = new FetchController(
+            settings.getSettings().isSyncEnabled,
+            logger
+        );
+        settings.onSettingsChanged.add((newSettings, oldSettings) => {
+            if (oldSettings.isSyncEnabled != newSettings.isSyncEnabled) {
+                fetchController.canFetch = newSettings.isSyncEnabled;
+            }
+        });
+
+        const syncService = new SyncService(
+            deviceId,
+            fetchController,
+            settings,
+            logger,
+            fetch
+        );
+
+        const serverConfig = new ServerConfig(syncService);
+
+        const fileOperations = new FileOperations(
+            logger,
+            database,
+            fs,
+            serverConfig,
+            nativeLineEndings
+        );
+
+        const contentCache = new FixedSizeDocumentCache(
+            1024 * 1024 * DIFF_CACHE_SIZE_MB
+        );
+        const unrestrictedSyncer = new UnrestrictedSyncer(
+            logger,
+            database,
+            settings,
+            syncService,
+            fileOperations,
+            history,
+            contentCache,
+            serverConfig
+        );
+
+        const webSocketManager = new WebSocketManager(
+            deviceId,
+            logger,
+            settings,
+            webSocket
+        );
+
+        const syncer = new Syncer(
+            deviceId,
+            logger,
+            database,
+            settings,
+            syncService,
+            webSocketManager,
+            fileOperations,
+            unrestrictedSyncer
+        );
+
+        const fileChangeNotifier = new FileChangeNotifier();
+        const cursorTracker = new CursorTracker(
+            database,
+            webSocketManager,
+            fileOperations,
+            fileChangeNotifier
+        );
+        const client = new SyncClient(
+            history,
+            settings,
+            database,
+            syncer,
+            webSocketManager,
+            logger,
+            fetchController,
+            cursorTracker,
+            fileChangeNotifier,
+            contentCache,
+            fileOperations,
+            serverConfig,
+            persistence
+        );
+
+        logger.info("SyncClient created successfully");
+
+        return client;
+    }
+
+    public async start(): Promise<void> {
+        this.checkIfDestroyed("start");
+
+        if (this.hasStarted) {
+            throw new Error("SyncClient has already been started");
+        }
+        this.hasStarted = true;
+
+        if (
+            !this.unloadTelemetry &&
+            this.settings.getSettings().enableTelemetry
+        ) {
+            this.unloadTelemetry = setUpTelemetry();
+        }
+
+        this.logger.onLogEmitted.add((log): void => {
+            if (log.level === LogLevel.ERROR && Sentry.isInitialized()) {
+                Sentry.captureMessage(log.message);
+            }
+        });
+
+        this.settings.onSettingsChanged.add(
+            this.onSettingsChange.bind(this)
+        );
+
+        if (this.settings.getSettings().isSyncEnabled) {
+            this.logger.info("Starting SyncClient");
+            await this.startSyncing();
+            this.logger.info("SyncClient has successfully started");
+        }
+    }
+
+    /**
+     * Reload settings from disk overriding current in-memory settings.
+     * Missing values will be filled in from DEFAULT_SETTINGS rather than
+     * retaining current in-memory settings.
+     */
+    public async reloadSettings(): Promise<void> {
+        this.checkIfDestroyed("reloadSettings");
+
+        const state = (await this.persistence.load()) ?? {
+            settings: undefined
+        };
+
+        const settings = {
+            ...DEFAULT_SETTINGS,
+            ...(state.settings ?? {})
+        };
+
+        await this.setSettings(settings);
+    }
+
+    public async checkConnection(): Promise<NetworkConnectionStatus> {
+        this.checkIfDestroyed("checkConnection");
+
+        const server = await this.serverConfig.checkConnection(true);
+        return {
+            isSuccessful: server.isSuccessful,
+            serverMessage: server.message,
+            isWebSocketConnected: this.webSocketManager.isWebSocketConnected
+        };
+    }
+
+    public getHistoryEntries(): readonly HistoryEntry[] {
+        return this.history.entries;
+    }
+
+    /**
+     * Wait for the in-flight operations to finish, reset all tracking,
+     * and the local database but retain the settings.
+     * The SyncClient can be used again after calling this method.
+     */
+    public async reset(): Promise<void> {
+        this.checkIfDestroyed("reset");
+
+        this.logger.info(
+            "Stopping SyncClient to apply changed connection settings"
+        );
+        await this.pause();
+
+        // clear all local state
+        this.logger.info("Resetting SyncClient's local state");
+        this.database.reset();
+        await this.database.save(); // ensure the new database reads as empty
+        this.resetInMemoryState();
+        this.hasStartedOfflineSync = false;
+        this.hasFinishedOfflineSync = false;
+        this.serverConfig.reset();
+
+        await this.startSyncing();
+    }
+
+    public getSettings(): SyncSettings {
+        return this.settings.getSettings();
+    }
+
+    public async setSetting<T extends keyof SyncSettings>(
+        key: T,
+        value: SyncSettings[T]
+    ): Promise<void> {
+        this.checkIfDestroyed("setSetting");
+
+        await this.settings.setSetting(key, value);
+    }
+
+    public async setSettings(value: Partial<SyncSettings>): Promise<void> {
+        this.checkIfDestroyed("setSettings");
+
+        await this.settings.setSettings(value);
+    }
+
+    public get onSyncHistoryUpdated(): EventListeners<
+        (stats: HistoryStats) => unknown
+    > {
+        this.checkIfDestroyed("onSyncHistoryUpdated getter");
+        return this.history.onHistoryUpdated;
+    }
+
+
+
+
+    public get onSettingsChanged(): EventListeners<
+        (newSettings: SyncSettings, oldSettings: SyncSettings) => unknown
+    > {
+        this.checkIfDestroyed("onSettingsChanged getter");
+        return this.settings.onSettingsChanged;
+    }
+
+    public get onRemainingOperationsCountChanged(): EventListeners<
+        (remainingOperationsCount: number) => unknown
+    > {
+        this.checkIfDestroyed("onRemainingOperationsCountChanged getter");
+        return this.syncer.onRemainingOperationsCountChanged;
+    }
+
+    public get onWebSocketStatusChanged(): EventListeners<
+        (isConnected: boolean) => unknown
+    > {
+        this.checkIfDestroyed("onWebSocketStatusChanged getter");
+        return this.webSocketManager.onWebSocketStatusChanged;
+    }
+
+    public async syncLocallyCreatedFile(
+        relativePath: RelativePath
+    ): Promise<void> {
+        this.checkIfDestroyed("syncLocallyCreatedFile");
+
+        this.fileChangeNotifier.notifyOfFileChange(relativePath);
+        return this.syncer.syncLocallyCreatedFile(relativePath);
+    }
+
+    public async syncLocallyDeletedFile(
+        relativePath: RelativePath
+    ): Promise<void> {
+        this.checkIfDestroyed("syncLocallyDeletedFile");
+
+        this.fileChangeNotifier.notifyOfFileChange(relativePath);
+        return this.syncer.syncLocallyDeletedFile(relativePath);
+    }
+
+    public async syncLocallyUpdatedFile({
+        oldPath,
+        relativePath
+    }: {
+        oldPath?: RelativePath;
+        relativePath: RelativePath;
+    }): Promise<void> {
+        this.checkIfDestroyed("syncLocallyUpdatedFile");
+
+        this.fileChangeNotifier.notifyOfFileChange(relativePath);
+        return this.syncer.syncLocallyUpdatedFile({
+            oldPath,
+            relativePath
+        });
+    }
+
+    public getDocumentSyncingStatus(
+        relativePath: RelativePath
+    ): DocumentSyncStatus {
+        this.checkIfDestroyed("getDocumentSyncingStatus");
+
+        if (!this.settings.getSettings().isSyncEnabled) {
+            return DocumentSyncStatus.SYNCING_IS_DISABLED;
+        }
+
+        if (!this.syncer.isFirstSyncComplete || !this.hasFinishedOfflineSync) {
+            return DocumentSyncStatus.SYNCING;
+        }
+
+        const document =
+            this.database.getLatestDocumentByRelativePath(relativePath);
+        if (document === undefined) {
+            return DocumentSyncStatus.SYNCING;
+        }
+        return document.updates.length > 0
+            ? DocumentSyncStatus.SYNCING
+            : DocumentSyncStatus.UP_TO_DATE;
+    }
+
+    public async updateLocalCursors(
+        documentToCursors: Record<RelativePath, CursorSpan[]>
+    ): Promise<void> {
+        this.checkIfDestroyed("updateLocalCursors");
+
+        await this.cursorTracker.sendLocalCursorsToServer(documentToCursors);
+    }
+
+
+    public get onRemoteCursorsUpdated(): EventListeners<
+        (cursors: MaybeOutdatedClientCursors[]) => unknown
+    > {
+        this.checkIfDestroyed("onRemoteCursorsUpdated getter");
+        return this.cursorTracker.onRemoteCursorsUpdated;
+    }
+
+    public async waitUntilFinished(): Promise<void> {
+        this.checkIfDestroyed("waitUntilIdle");
+        await this.syncer.waitUntilFinished();
+        await this.webSocketManager.waitUntilFinished();
+        await this.database.save(); // flush all changes to disk
+    }
+
+    /**
+     * Completely destroy the SyncClient, cancelling all in-progress operations.
+     * After calling this method, the SyncClient cannot be used again.
+     */
+    public async destroy(): Promise<void> {
+        this.checkIfDestroyed("destroy");
+
+        // cancel everything that's in progress
+        await this.pause();
+
+        this.hasBeenDestroyed = true;
+
+        this.resetInMemoryState();
+
+        this.logger.info("SyncClient has been successfully disposed");
+
+        this.unloadTelemetry?.();
+    }
+
+    private async startSyncing(): Promise<void> {
+        this.checkIfDestroyed("startSyncing");
+        this.fetchController.finishReset();
+
+        await this.serverConfig.initialize();
+        this.webSocketManager.start();
+
+        if (!this.hasStartedOfflineSync) {
+            this.hasStartedOfflineSync = true;
+            await this.syncer.scheduleSyncForOfflineChanges();
+        }
+
+        this.hasFinishedOfflineSync = true;
+    }
+
+    private async pause(): Promise<void> {
+        this.fetchController.startReset();
+        await this.webSocketManager.stop();
+        await this.waitUntilFinished();
+    }
+
+    private resetInMemoryState(): void {
+        this.history.reset();
+        this.contentCache.reset();
+        // don't reset the logger
+        this.cursorTracker.reset();
+        this.syncer.reset();
+        this.fileOperations.reset();
+    }
+
+    private async onSettingsChange(
+        newSettings: SyncSettings,
+        oldSettings: SyncSettings
+    ): Promise<void> {
+        this.checkIfDestroyed("onSettingsChange");
+
+        if (
+            newSettings.vaultName !== oldSettings.vaultName ||
+            newSettings.remoteUri !== oldSettings.remoteUri
+        ) {
+            await this.reset();
+        }
+
+        if (newSettings.isSyncEnabled !== oldSettings.isSyncEnabled) {
+            if (newSettings.isSyncEnabled) {
+                await this.startSyncing();
+            } else {
+                await this.pause();
+            }
+        }
+
+        if (newSettings.diffCacheSizeMB !== oldSettings.diffCacheSizeMB) {
+            this.contentCache.resize(newSettings.diffCacheSizeMB * 1024 * 1024);
+        }
+
+        if (newSettings.enableTelemetry !== oldSettings.enableTelemetry) {
+            if (newSettings.enableTelemetry) {
+                this.unloadTelemetry = setUpTelemetry();
+            } else {
+                this.unloadTelemetry?.();
+            }
+        }
+    }
+
+    private checkIfDestroyed(origin: string): void {
+        if (this.hasBeenDestroyed) {
+            throw new Error(
+                `SyncClient has been destroyed and can no longer be used; called from ${origin}`
+            );
+        }
+    }
 }
diff --git a/frontend/sync-client/src/sync-operations/cursor-tracker.ts b/frontend/sync-client/src/sync-operations/cursor-tracker.ts
index d4cf3c53..f60cd588 100644
--- a/frontend/sync-client/src/sync-operations/cursor-tracker.ts
+++ b/frontend/sync-client/src/sync-operations/cursor-tracker.ts
@@ -9,252 +9,252 @@ import { DocumentUpToDateness } from "../types/document-up-to-dateness";
 import { hash } from "../utils/hash";
 import type { FileChangeNotifier } from "./file-change-notifier";
 import { Lock } from "../utils/data-structures/locks";
+import { EventListeners } from "../utils/data-structures/event-listeners";
 
 // Cursor positions are updated separately from documents. However, a given cursor position is only
 // valid within a certain version of the document it belongs to. This class tracks previous and the latest
 // known remote cursor positions, and for each document, tries to return the latest cursor positions that are
 // not from the future.
 export class CursorTracker {
-	private readonly updateLock = new Lock();
+    private readonly updateLock = new Lock();
 
-	private knownRemoteCursors: (ClientCursors & {
-		upToDateness: DocumentUpToDateness;
-	})[] = [];
+    // The returned position may be accurate, if it matches the document version, or outdated, in which case
+    // the client has to heuristically guess it's current position based on the local edits.
+    public readonly onRemoteCursorsUpdated = new EventListeners<
+        (cursors: MaybeOutdatedClientCursors[]) => unknown
+    >();
 
-	private lastLocalCursorState: DocumentWithCursors[] = [];
-	private lastLocalCursorStateWithoutDirtyDocuments: DocumentWithCursors[] =
-		[];
+    private knownRemoteCursors: (ClientCursors & {
+        upToDateness: DocumentUpToDateness;
+    })[] = [];
 
-	public constructor(
-		private readonly database: Database,
-		private readonly webSocketManager: WebSocketManager,
-		private readonly fileOperations: FileOperations,
-		private readonly fileChangeNotifier: FileChangeNotifier
-	) {
-		this.webSocketManager.addRemoteCursorsUpdateListener(
-			async (clientCursors) => {
-				await this.updateLock.withLock(async () => {
-					// The latest message will contain all active clients, so we can delete the ones
-					// from the local list which are no longer active.
-					const allIds = new Set(
-						clientCursors.map((c) => c.deviceId)
-					);
-					const updatedKnownRemoteCursors =
-						this.knownRemoteCursors.filter((c) =>
-							allIds.has(c.deviceId)
-						);
+    private lastLocalCursorState: DocumentWithCursors[] = [];
+    private lastLocalCursorStateWithoutDirtyDocuments: DocumentWithCursors[] =
+        [];
 
-					for (const cursor of clientCursors.filter((client) =>
-						client.documentsWithCursors.every(
-							(doc) => doc.vault_update_id != null
-						)
-					)) {
-						updatedKnownRemoteCursors.push({
-							...cursor,
-							upToDateness:
-								await this.getDocumentsUpToDateness(cursor)
-						});
-					}
+    public constructor(
+        private readonly database: Database,
+        private readonly webSocketManager: WebSocketManager,
+        private readonly fileOperations: FileOperations,
+        private readonly fileChangeNotifier: FileChangeNotifier
+    ) {
+        this.webSocketManager.onRemoteCursorsUpdateReceived.add(
+            async (clientCursors) => {
+                await this.updateLock.withLock(async () => {
+                    // The latest message will contain all active clients, so we can delete the ones
+                    // from the local list which are no longer active.
+                    const allIds = new Set(
+                        clientCursors.map((c) => c.deviceId)
+                    );
+                    const updatedKnownRemoteCursors =
+                        this.knownRemoteCursors.filter((c) =>
+                            allIds.has(c.deviceId)
+                        );
 
-					this.knownRemoteCursors = updatedKnownRemoteCursors;
-				});
-			}
-		);
+                    for (const cursor of clientCursors.filter((client) =>
+                        client.documentsWithCursors.every(
+                            (doc) => doc.vault_update_id != null
+                        )
+                    )) {
+                        updatedKnownRemoteCursors.push({
+                            ...cursor,
+                            upToDateness:
+                                await this.getDocumentsUpToDateness(cursor)
+                        });
+                    }
 
-		this.fileChangeNotifier.addFileChangeListener(async (relativePath) =>
-			this.updateLock.withLock(async () => {
-				for (const clientCursor of this.knownRemoteCursors) {
-					if (
-						clientCursor.documentsWithCursors.some(
-							(document) =>
-								document.relative_path === relativePath
-						)
-					) {
-						clientCursor.upToDateness =
-							await this.getDocumentsUpToDateness(clientCursor);
-					}
-				}
-			})
-		);
-	}
+                    this.knownRemoteCursors = updatedKnownRemoteCursors;
+                });
 
-	/// Update the local cursors for the given documents.
-	/// Can be called frequently as it only emits an event
-	/// if the state has actually changed.
-	public async sendLocalCursorsToServer(
-		documentToCursors: Record<RelativePath, CursorSpan[]>
-	): Promise<void> {
-		const documentsWithCursors: DocumentWithCursors[] = [];
+                this.onRemoteCursorsUpdated.trigger(
+                    this.getRelevantAndPruneKnownClientCursors()
+                );
+            }
+        );
 
-		for (const [relativePath, cursors] of Object.entries(
-			documentToCursors
-		)) {
-			const record =
-				this.database.getLatestDocumentByRelativePath(relativePath);
 
-			if (!record) {
-				continue; // Let's wait for the file to be created before sending cursors
-			}
+        this.fileChangeNotifier.onFileChanged.add(async (relativePath) =>
+            this.updateLock.withLock(async () => {
+                for (const clientCursor of this.knownRemoteCursors) {
+                    if (
+                        clientCursor.documentsWithCursors.some(
+                            (document) =>
+                                document.relative_path === relativePath
+                        )
+                    ) {
+                        clientCursor.upToDateness =
+                            await this.getDocumentsUpToDateness(clientCursor);
+                    }
+                }
+            })
+        );
+    }
 
-			if (!record.metadata) {
-				continue; // this is a new document, no need to sync the cursors
-			}
+    /// Update the local cursors for the given documents.
+    /// Can be called frequently as it only emits an event
+    /// if the state has actually changed.
+    public async sendLocalCursorsToServer(
+        documentToCursors: Record<RelativePath, CursorSpan[]>
+    ): Promise<void> {
+        const documentsWithCursors: DocumentWithCursors[] = [];
 
-			documentsWithCursors.push({
-				relative_path: relativePath,
-				document_id: record.documentId,
-				vault_update_id: record.metadata.parentVersionId,
-				cursors: cursors.map(({ start, end }) => ({
-					start: Math.min(start, end),
-					end: Math.max(start, end)
-				})) // the client might send directional selections
-			});
-		}
+        for (const [relativePath, cursors] of Object.entries(
+            documentToCursors
+        )) {
+            const record =
+                this.database.getLatestDocumentByRelativePath(relativePath);
 
-		if (
-			JSON.stringify(this.lastLocalCursorState) ===
-			JSON.stringify(documentsWithCursors)
-		) {
-			// Caching step to avoid reading the edited files all the time
-			return;
-		}
-		this.lastLocalCursorState = documentsWithCursors;
+            if (!record) {
+                continue; // Let's wait for the file to be created before sending cursors
+            }
 
-		for (const doc of documentsWithCursors) {
-			const readContent = await this.fileOperations.read(
-				doc.relative_path
-			);
-			const record = this.database.getLatestDocumentByRelativePath(
-				doc.relative_path
-			);
-			if (record?.metadata?.hash !== hash(readContent)) {
-				doc.vault_update_id = null;
-			}
-		}
+            if (!record.metadata) {
+                continue; // this is a new document, no need to sync the cursors
+            }
 
-		if (
-			JSON.stringify(this.lastLocalCursorStateWithoutDirtyDocuments) ===
-			JSON.stringify(documentsWithCursors)
-		) {
-			return;
-		}
+            documentsWithCursors.push({
+                relative_path: relativePath,
+                document_id: record.documentId,
+                vault_update_id: record.metadata.parentVersionId,
+                cursors: cursors.map(({ start, end }) => ({
+                    start: Math.min(start, end),
+                    end: Math.max(start, end)
+                })) // the client might send directional selections
+            });
+        }
 
-		this.lastLocalCursorStateWithoutDirtyDocuments = documentsWithCursors;
+        if (
+            JSON.stringify(this.lastLocalCursorState) ===
+            JSON.stringify(documentsWithCursors)
+        ) {
+            // Caching step to avoid reading the edited files all the time
+            return;
+        }
+        this.lastLocalCursorState = documentsWithCursors;
 
-		this.webSocketManager.updateLocalCursors({ documentsWithCursors });
-	}
+        for (const doc of documentsWithCursors) {
+            const readContent = await this.fileOperations.read(
+                doc.relative_path
+            );
+            const record = this.database.getLatestDocumentByRelativePath(
+                doc.relative_path
+            );
+            if (record?.metadata?.hash !== hash(readContent)) {
+                doc.vault_update_id = null;
+            }
+        }
 
-	// The returned position may be accurate, if it matches the document version, or outdated, in which case
-	// the client has to heuristically guess it's current position based on the local edits.
-	public addRemoteCursorsUpdateListener(
-		listener: (cursors: MaybeOutdatedClientCursors[]) => unknown
-	): void {
-		// CursorTracker registers its own event listener in the constructor so it must have been called before this
-		this.webSocketManager.addRemoteCursorsUpdateListener(async () => {
-			await this.updateLock.withLock(() =>
-				listener(this.getRelevantAndPruneKnownClientCursors())
-			);
-		});
-	}
+        if (
+            JSON.stringify(this.lastLocalCursorStateWithoutDirtyDocuments) ===
+            JSON.stringify(documentsWithCursors)
+        ) {
+            return;
+        }
 
-	public reset(): void {
-		this.knownRemoteCursors = [];
-		this.lastLocalCursorState = [];
-		this.lastLocalCursorStateWithoutDirtyDocuments = [];
-		this.updateLock.reset();
-	}
+        this.lastLocalCursorStateWithoutDirtyDocuments = documentsWithCursors;
 
-	private getRelevantAndPruneKnownClientCursors(): MaybeOutdatedClientCursors[] {
-		const result: MaybeOutdatedClientCursors[] = [];
-		const included = new Set<string>();
+        this.webSocketManager.updateLocalCursors({ documentsWithCursors });
+    }
 
-		const relevantCursors = [];
-		for (const clientCursors of [...this.knownRemoteCursors].reverse()) {
-			if (included.has(clientCursors.deviceId)) {
-				continue;
-			}
 
-			if (clientCursors.upToDateness === DocumentUpToDateness.Later) {
-				continue;
-			}
+    public reset(): void {
+        this.knownRemoteCursors = [];
+        this.lastLocalCursorState = [];
+        this.lastLocalCursorStateWithoutDirtyDocuments = [];
+        this.updateLock.reset();
+    }
 
-			result.push({
-				...clientCursors,
-				isOutdated:
-					clientCursors.upToDateness === DocumentUpToDateness.Prior
-			});
+    private getRelevantAndPruneKnownClientCursors(): MaybeOutdatedClientCursors[] {
+        const result: MaybeOutdatedClientCursors[] = [];
+        const included = new Set<string>();
 
-			included.add(clientCursors.deviceId);
-			relevantCursors.unshift(clientCursors); // to reverse order back to normal
-		}
+        const relevantCursors = [];
+        for (const clientCursors of [...this.knownRemoteCursors].reverse()) {
+            if (included.has(clientCursors.deviceId)) {
+                continue;
+            }
 
-		this.knownRemoteCursors = relevantCursors;
+            if (clientCursors.upToDateness === DocumentUpToDateness.Later) {
+                continue;
+            }
 
-		return result;
-	}
+            result.push({
+                ...clientCursors,
+                isOutdated:
+                    clientCursors.upToDateness === DocumentUpToDateness.Prior
+            });
 
-	// We store up-to-dateness on a per-client basis to simplify the implementation.
-	// An individual client won't have too many documents open at once, so this is a reasonable trade-off.
-	private async getDocumentsUpToDateness(
-		clientCursor: ClientCursors
-	): Promise<DocumentUpToDateness> {
-		const results = [];
-		for (const document of clientCursor.documentsWithCursors) {
-			results.push(await this.getDocumentUpToDateness(document));
-		}
+            included.add(clientCursors.deviceId);
+            relevantCursors.unshift(clientCursors); // to reverse order back to normal
+        }
 
-		if (
-			results.every((result) => result === DocumentUpToDateness.UpToDate)
-		) {
-			return DocumentUpToDateness.UpToDate;
-		}
+        this.knownRemoteCursors = relevantCursors;
 
-		if (
-			results.every(
-				(result) =>
-					result === DocumentUpToDateness.UpToDate ||
-					result === DocumentUpToDateness.Prior
-			)
-		) {
-			return DocumentUpToDateness.Prior;
-		}
+        return result;
+    }
 
-		return DocumentUpToDateness.Later;
-	}
+    // We store up-to-dateness on a per-client basis to simplify the implementation.
+    // An individual client won't have too many documents open at once, so this is a reasonable trade-off.
+    private async getDocumentsUpToDateness(
+        clientCursor: ClientCursors
+    ): Promise<DocumentUpToDateness> {
+        const results = [];
+        for (const document of clientCursor.documentsWithCursors) {
+            results.push(await this.getDocumentUpToDateness(document));
+        }
 
-	private async getDocumentUpToDateness(
-		document: DocumentWithCursors
-	): Promise<DocumentUpToDateness> {
-		const record = this.database.getLatestDocumentByRelativePath(
-			document.relative_path
-		);
+        if (
+            results.every((result) => result === DocumentUpToDateness.UpToDate)
+        ) {
+            return DocumentUpToDateness.UpToDate;
+        }
 
-		if (!record) {
-			// the document of the cursor must be from the future
-			return DocumentUpToDateness.Later;
-		}
+        if (
+            results.every(
+                (result) =>
+                    result === DocumentUpToDateness.UpToDate ||
+                    result === DocumentUpToDateness.Prior
+            )
+        ) {
+            return DocumentUpToDateness.Prior;
+        }
 
-		if (
-			(record.metadata?.parentVersionId ?? 0) <
-			(document.vault_update_id ?? 0)
-		) {
-			return DocumentUpToDateness.Later;
-		} else if (
-			(document.vault_update_id ?? 0) <
-			(record.metadata?.parentVersionId ?? 0)
-		) {
-			// the document of the cursor must be from the past
-			return DocumentUpToDateness.Prior;
-		}
+        return DocumentUpToDateness.Later;
+    }
 
-		const currentContent = await this.fileOperations.read(
-			document.relative_path
-		);
+    private async getDocumentUpToDateness(
+        document: DocumentWithCursors
+    ): Promise<DocumentUpToDateness> {
+        const record = this.database.getLatestDocumentByRelativePath(
+            document.relative_path
+        );
 
-		return this.database.getLatestDocumentByRelativePath(
-			document.relative_path
-		)?.metadata?.hash === hash(currentContent)
-			? DocumentUpToDateness.UpToDate
-			: DocumentUpToDateness.Prior;
-	}
+        if (!record) {
+            // the document of the cursor must be from the future
+            return DocumentUpToDateness.Later;
+        }
+
+        if (
+            (record.metadata?.parentVersionId ?? 0) <
+            (document.vault_update_id ?? 0)
+        ) {
+            return DocumentUpToDateness.Later;
+        } else if (
+            (document.vault_update_id ?? 0) <
+            (record.metadata?.parentVersionId ?? 0)
+        ) {
+            // the document of the cursor must be from the past
+            return DocumentUpToDateness.Prior;
+        }
+
+        const currentContent = await this.fileOperations.read(
+            document.relative_path
+        );
+
+        return this.database.getLatestDocumentByRelativePath(
+            document.relative_path
+        )?.metadata?.hash === hash(currentContent)
+            ? DocumentUpToDateness.UpToDate
+            : DocumentUpToDateness.Prior;
+    }
 }
diff --git a/frontend/sync-client/src/sync-operations/file-change-notifier.ts b/frontend/sync-client/src/sync-operations/file-change-notifier.ts
index d2b40c1f..d1e49d62 100644
--- a/frontend/sync-client/src/sync-operations/file-change-notifier.ts
+++ b/frontend/sync-client/src/sync-operations/file-change-notifier.ts
@@ -1,22 +1,12 @@
 import type { RelativePath } from "../persistence/database";
-import { removeFromArray } from "../utils/remove-from-array";
+import { EventListeners } from "../utils/data-structures/event-listeners";
 
 export class FileChangeNotifier {
-	private readonly listeners: ((filePath: RelativePath) => unknown)[] = [];
+    public readonly onFileChanged = new EventListeners<
+        (filePath: RelativePath) => unknown
+    >();
 
-	public addFileChangeListener(
-		listener: (filePath: RelativePath) => unknown
-	): void {
-		this.listeners.push(listener);
-	}
-
-	public removeFileChangeListener(
-		listener: (filePath: RelativePath) => unknown
-	): void {
-		removeFromArray(this.listeners, listener);
-	}
-
-	public notifyOfFileChange(filePath: RelativePath): void {
-		this.listeners.forEach((listener) => listener(filePath));
-	}
+    public notifyOfFileChange(filePath: RelativePath): void {
+        this.onFileChanged.trigger(filePath);
+    }
 }
diff --git a/frontend/sync-client/src/sync-operations/syncer.ts b/frontend/sync-client/src/sync-operations/syncer.ts
index 65cd020c..e142e409 100644
--- a/frontend/sync-client/src/sync-operations/syncer.ts
+++ b/frontend/sync-client/src/sync-operations/syncer.ts
@@ -1,8 +1,8 @@
 import type {
-	Database,
-	DocumentId,
-	DocumentRecord,
-	RelativePath
+    Database,
+    DocumentId,
+    DocumentRecord,
+    RelativePath
 } from "../persistence/database";
 import type { SyncService } from "../services/sync-service";
 import type { Logger } from "../tracing/logger";
@@ -21,504 +21,497 @@ import type { WebSocketVaultUpdate } from "../services/types/WebSocketVaultUpdat
 import type { WebSocketManager } from "../services/websocket-manager";
 import type { WebSocketClientMessage } from "../services/types/WebSocketClientMessage";
 import { awaitAll } from "../utils/await-all";
+import { EventListeners } from "../utils/data-structures/event-listeners";
 
 export class Syncer {
-	private readonly remoteDocumentsLock: Locks<DocumentId>;
-	private readonly remainingOperationsListeners: ((
-		remainingOperations: number
-	) => unknown)[] = [];
-
-	// FIFO to limit the number of concurrent sync operations
-	private readonly syncQueue: PQueue;
-
-	private _isFirstSyncComplete = false;
-	private runningScheduleSyncForOfflineChanges: Promise<void> | undefined;
-
-	public constructor(
-		private readonly deviceId: string,
-		private readonly logger: Logger,
-		private readonly database: Database,
-		private readonly settings: Settings,
-		private readonly syncService: SyncService,
-		private readonly webSocketManager: WebSocketManager,
-		private readonly operations: FileOperations,
-		private readonly internalSyncer: UnrestrictedSyncer
-	) {
-		this.syncQueue = new PQueue({
-			concurrency: settings.getSettings().syncConcurrency
-		});
-
-		this.remoteDocumentsLock = new Locks<DocumentId>(this.logger);
-
-		settings.addOnSettingsChangeListener((newSettings, oldSettings) => {
-			if (newSettings.syncConcurrency !== oldSettings.syncConcurrency) {
-				this.syncQueue.concurrency = newSettings.syncConcurrency;
-			}
-		});
-
-		this.syncQueue.on("active", () => {
-			this.remainingOperationsListeners.forEach((listener) => {
-				listener(this.syncQueue.size);
-			});
-		});
-
-		this.webSocketManager.addWebSocketStatusChangeListener(
-			(isConnected) => {
-				if (isConnected) {
-					// The JS WebSocket API doesn't support setting headers, so we have to send the token as a message
-					this.sendHandshakeMessage();
-				}
-			}
-		);
-		this.webSocketManager.addRemoteVaultUpdateListener(
-			this.syncRemotelyUpdatedFile.bind(this)
-		);
-	}
-
-	public get isFirstSyncComplete(): boolean {
-		return this._isFirstSyncComplete;
-	}
-
-	public addRemainingOperationsListener(
-		listener: (remainingOperations: number) => unknown
-	): void {
-		this.remainingOperationsListeners.push(listener);
-	}
-
-	public async syncLocallyCreatedFile(
-		relativePath: RelativePath
-	): Promise<void> {
-		if (
-			this.database.getLatestDocumentByRelativePath(relativePath)
-				?.isDeleted === false
-		) {
-			this.logger.debug(
-				`Document ${relativePath} already exists in the database, skipping`
-			);
-			return;
-		}
-
-		const [promise, resolve, reject] = createPromise();
-
-		const id = uuidv4();
-		const document = this.database.createNewPendingDocument(
-			id,
-			relativePath,
-			promise
-		);
-
-		try {
-			await this.syncQueue.add(async () =>
-				this.internalSyncer.unrestrictedSyncLocallyCreatedFile(document)
-			);
-
-			resolve();
-		} catch (e) {
-			reject(e);
-		} finally {
-			this.database.removeDocumentPromise(promise);
-		}
-	}
-
-	public async syncLocallyDeletedFile(
-		relativePath: RelativePath
-	): Promise<void> {
-		if (
-			this.database.getLatestDocumentByRelativePath(relativePath)
-				?.isDeleted === true
-		) {
-			// This is must be a consequence of us deleting a file because of a remote update
-			// which triggered a local delete, so we don't need to do anything here.
-			this.logger.debug(
-				`Document ${relativePath} has already been markes as deleted, skipping`
-			);
-			return;
-		}
-
-		// We have to have a record of the delete in case there's an in-flight update for the same
-		// document which finishes after the delete has succeeded and would introduce a phantom metadata record.
-		this.database.delete(relativePath);
-
-		const [promise, resolve, reject] = createPromise();
-
-		const document = await this.database.getResolvedDocumentByRelativePath(
-			relativePath,
-			promise
-		);
-
-		try {
-			await this.syncQueue.add(async () =>
-				this.internalSyncer.unrestrictedSyncLocallyDeletedFile(document)
-			);
-
-			resolve();
-
-			this.database.removeDocument(document);
-		} catch (e) {
-			reject(e);
-		} finally {
-			this.database.removeDocumentPromise(promise);
-		}
-	}
-
-	public async syncLocallyUpdatedFile({
-		oldPath,
-		relativePath
-	}: {
-		oldPath?: RelativePath;
-		relativePath: RelativePath;
-	}): Promise<void> {
-		if (oldPath !== undefined) {
-			// We might have moved the document in the database before calling this method,
-			// in that case, we mustn't move it again.
-			if (
-				this.database.getLatestDocumentByRelativePath(relativePath) ===
-					undefined ||
-				this.database.getLatestDocumentByRelativePath(relativePath)
-					?.isDeleted === true
-			) {
-				if (oldPath === relativePath) {
-					throw new Error(
-						`Old path and new path are the same: ${oldPath}`
-					);
-				}
-
-				this.database.move(oldPath, relativePath);
-			}
-		}
-
-		let document =
-			this.database.getLatestDocumentByRelativePath(relativePath);
-
-		if (
-			oldPath !== undefined &&
-			document?.metadata?.remoteRelativePath === relativePath
-		) {
-			this.logger.debug(
-				`Document ${relativePath} has been moved as a result of a remote update, skipping sync`
-			);
-			return;
-		}
-
-		if (document === undefined) {
-			this.logger.debug(
-				`Cannot find document ${relativePath} in the database, skipping`
-			);
-			return;
-		}
-
-		if (document.isDeleted) {
-			this.logger.debug(
-				`Document ${relativePath} has been deleted locally, skipping`
-			);
-			return;
-		}
-
-		const [promise, resolve, reject] = createPromise();
-
-		document = await this.database.getResolvedDocumentByRelativePath(
-			relativePath,
-			promise
-		);
-
-		try {
-			await this.syncQueue.add(async () =>
-				this.internalSyncer.unrestrictedSyncLocallyUpdatedFile({
-					oldPath,
-					document
-				})
-			);
-
-			resolve();
-		} catch (e) {
-			reject(e);
-		} finally {
-			this.database.removeDocumentPromise(promise);
-		}
-	}
-
-	public async scheduleSyncForOfflineChanges(): Promise<void> {
-		if (this.runningScheduleSyncForOfflineChanges !== undefined) {
-			this.logger.debug("Uploading local changes is already in progress");
-			return this.runningScheduleSyncForOfflineChanges;
-		}
-
-		try {
-			this.runningScheduleSyncForOfflineChanges =
-				this.internalScheduleSyncForOfflineChanges();
-			await this.runningScheduleSyncForOfflineChanges;
-			this.logger.info(`All local changes have been applied remotely`);
-		} catch (e) {
-			if (e instanceof SyncResetError) {
-				this.logger.info(
-					"Failed to apply local changes remotely due to a reset"
-				);
-				return;
-			}
-			this.logger.error(
-				`Not all local changes have been applied remotely: ${e}`
-			);
-			throw e;
-		} finally {
-			this.runningScheduleSyncForOfflineChanges = undefined;
-		}
-	}
-
-	public async waitUntilFinished(): Promise<void> {
-		await this.runningScheduleSyncForOfflineChanges;
-		await this.syncQueue.onEmpty();
-	}
-
-	public async syncRemotelyUpdatedFile(
-		message: WebSocketVaultUpdate
-	): Promise<void> {
-		try {
-			const handlerPromise = awaitAll(
-				message.documents.map(async (document) =>
-					this.internalSyncRemotelyUpdatedFile(document)
-				)
-			);
-
-			await handlerPromise;
-
-			if (message.isInitialSync && message.documents.length > 0) {
-				this.database.setLastSeenUpdateId(
-					message.documents
-						.map((document) => document.vaultUpdateId)
-						.reduce((a, b) => Math.max(a, b))
-				);
-			}
-
-			this._isFirstSyncComplete = true;
-		} catch (e) {
-			this.logger.error(`Failed to sync remotely updated file: ${e}`);
-		}
-	}
-
-	public reset(): void {
-		this._isFirstSyncComplete = false;
-		this.syncQueue.clear();
-		this.remoteDocumentsLock.reset();
-		this.runningScheduleSyncForOfflineChanges = undefined;
-	}
-
-	private sendHandshakeMessage(): void {
-		const message: WebSocketClientMessage = {
-			type: "handshake",
-			deviceId: this.deviceId,
-			token: this.settings.getSettings().token,
-			lastSeenVaultUpdateId: this.database.getLastSeenUpdateId()
-		};
-		this.webSocketManager.sendHandshakeMessage(message);
-	}
-
-	private async internalSyncRemotelyUpdatedFile(
-		remoteVersion: DocumentVersionWithoutContent
-	): Promise<void> {
-		let document = this.database.getDocumentByDocumentId(
-			remoteVersion.documentId
-		);
-
-		if (document === undefined) {
-			// Let's avoid the same documents getting created in parallel multiple times.
-			// There might be multiple tasks waiting for the lock
-			return this.remoteDocumentsLock.withLock(
-				remoteVersion.documentId,
-				async () => {
-					document = this.database.getDocumentByDocumentId(
-						remoteVersion.documentId
-					);
-
-					// We're either the first one to get the lock, so we have to create the document in `unrestrictedSyncRemotelyUpdatedFile`
-					if (document === undefined) {
-						await this.syncQueue.add(async () =>
-							this.internalSyncer.unrestrictedSyncRemotelyUpdatedFile(
-								remoteVersion
-							)
-						);
-					} else {
-						const [promise, resolve, reject] = createPromise();
-
-						document =
-							await this.database.getResolvedDocumentByRelativePath(
-								document.relativePath,
-								promise
-							);
-
-						try {
-							await this.syncQueue.add(async () =>
-								this.internalSyncer.unrestrictedSyncRemotelyUpdatedFile(
-									remoteVersion,
-									document
-								)
-							);
-
-							resolve();
-						} catch (e) {
-							reject(e);
-						} finally {
-							this.database.removeDocumentPromise(promise);
-						}
-					}
-
-					this.database.addSeenUpdateId(remoteVersion.vaultUpdateId);
-				}
-			);
-		}
-
-		// We're either the first one to get the lock, so we have to create the document in `unrestrictedSyncRemotelyUpdatedFile`
-		const [promise, resolve, reject] = createPromise();
-
-		document = await this.database.getResolvedDocumentByRelativePath(
-			document.relativePath,
-			promise
-		);
-
-		try {
-			await this.syncQueue.add(async () =>
-				this.internalSyncer.unrestrictedSyncRemotelyUpdatedFile(
-					remoteVersion,
-					document
-				)
-			);
-
-			resolve();
-		} catch (e) {
-			reject(e);
-		} finally {
-			this.database.removeDocumentPromise(promise);
-		}
-
-		this.database.addSeenUpdateId(remoteVersion.vaultUpdateId);
-	}
-
-	private async internalScheduleSyncForOfflineChanges(): Promise<void> {
-		await this.createFakeDocumentsFromRemoteState();
-
-		const allLocalFiles = await this.operations.listFilesRecursively();
-		this.logger.info(
-			`Scheduling sync for ${allLocalFiles.length} local files`
-		);
-
-		let locallyPossiblyDeletedFiles: DocumentRecord[] = [];
-
-		for (const document of this.database.resolvedDocuments) {
-			if (
-				!document.isDeleted &&
-				!(await this.operations.exists(document.relativePath))
-			) {
-				locallyPossiblyDeletedFiles.push(document);
-			}
-		}
-
-		await awaitAll(
-			allLocalFiles.map(async (relativePath) => {
-				if (
-					this.database.getLatestDocumentByRelativePath(relativePath)
-						?.metadata !== undefined
-				) {
-					this.logger.debug(
-						`Document ${relativePath} might have been updated locally, scheduling sync to validate and update it`
-					);
-
-					return this.syncLocallyUpdatedFile({
-						relativePath
-					});
-				}
-
-				// Perhaps the file has been moved; let's check by looking at the deleted files
-				const contentHash = await this.syncQueue.add(async () => {
-					const contentBytes =
-						await this.operations.read(relativePath); // this can throw FileNotFoundError
-					return hash(contentBytes);
-				});
-
-				if (contentHash == undefined) {
-					// The file was deleted before we had a chance to read it, no need to sync it here
-					return;
-				}
-
-				const originalFile = findMatchingFile(
-					contentHash,
-					locallyPossiblyDeletedFiles
-				);
-				if (originalFile !== undefined) {
-					// `originalFile` hasn't been deleted but it got moved instead
-					/* eslint-disable no-restricted-syntax -- Comparing by property, not direct equality */
-					locallyPossiblyDeletedFiles =
-						locallyPossiblyDeletedFiles.filter(
-							(item) =>
-								item.relativePath !== originalFile.relativePath
-						);
-					/* eslint-enable no-restricted-syntax */
-
-					this.logger.debug(
-						`Document '${originalFile.relativePath}' was not found under its current path in the database but was found under a different path (${relativePath}), scheduling sync to move it`
-					);
-
-					// We're outside of the pqueue, so we need to call the public wrapper
-					return this.syncLocallyUpdatedFile({
-						oldPath: originalFile.relativePath,
-						relativePath
-					});
-				}
-
-				this.logger.debug(
-					`Document ${relativePath} not found in database, scheduling sync to create it`
-				);
-				// We're outside of the pqueue, so we need to call the public wrapper
-				return this.syncLocallyCreatedFile(relativePath);
-			})
-		);
-
-		// this has to happen strictly after the previous awaitAll, as that one
-		// might have removed some of the documents from the list
-		await awaitAll(
-			locallyPossiblyDeletedFiles.map(async ({ relativePath }) => {
-				this.logger.debug(
-					`Document ${relativePath} has been deleted locally, scheduling sync to delete it`
-				);
-
-				// We're outside of the pqueue, so we need to call the public wrapper
-				return this.syncLocallyDeletedFile(relativePath);
-			})
-		);
-	}
-
-	/**
-	 * Create fake documents in the database for all files that are present locally
-	 * and also exist remotely. This will stop the subequent syncs from duplicating
-	 * the documents by creating the same documents from multiple clients.
-	 */
-	private async createFakeDocumentsFromRemoteState(): Promise<void> {
-		if (this.database.getHasInitialSyncCompleted()) {
-			return;
-		}
-
-		const [allLocalFiles, remote] = await awaitAll([
-			this.operations.listFilesRecursively(),
-			this.syncQueue.add(async () => this.syncService.getAll())
-		]);
-
-		if (remote !== undefined) {
-			remote.latestDocuments
-				.filter(
-					(remoteDocument) =>
-						allLocalFiles.includes(remoteDocument.relativePath) &&
-						!remoteDocument.isDeleted &&
-						this.database.getDocumentByDocumentId(
-							remoteDocument.documentId
-						) === undefined
-				)
-				.forEach((remoteDocument) => {
-					this.database.createNewEmptyDocument(
-						remoteDocument.documentId,
-						remoteDocument.vaultUpdateId,
-						remoteDocument.relativePath
-					);
-				});
-		}
-
-		this.database.setHasInitialSyncCompleted(true);
-	}
+    private readonly remoteDocumentsLock: Locks<DocumentId>;
+    public readonly onRemainingOperationsCountChanged = new EventListeners<
+        (remainingOperations: number) => unknown
+    >();
+
+    // FIFO to limit the number of concurrent sync operations
+    private readonly syncQueue: PQueue;
+
+    private _isFirstSyncComplete = false;
+    private runningScheduleSyncForOfflineChanges: Promise<void> | undefined;
+
+    public constructor(
+        private readonly deviceId: string,
+        private readonly logger: Logger,
+        private readonly database: Database,
+        private readonly settings: Settings,
+        private readonly syncService: SyncService,
+        private readonly webSocketManager: WebSocketManager,
+        private readonly operations: FileOperations,
+        private readonly internalSyncer: UnrestrictedSyncer
+    ) {
+        this.syncQueue = new PQueue({
+            concurrency: settings.getSettings().syncConcurrency
+        });
+
+        this.remoteDocumentsLock = new Locks<DocumentId>(this.logger);
+
+        settings.onSettingsChanged.add((newSettings, oldSettings) => {
+            if (newSettings.syncConcurrency !== oldSettings.syncConcurrency) {
+                this.syncQueue.concurrency = newSettings.syncConcurrency;
+            }
+        });
+
+        this.syncQueue.on("active", () => {
+            this.onRemainingOperationsCountChanged.trigger(this.syncQueue.size);
+        });
+
+        this.webSocketManager.onWebSocketStatusChanged.add(
+            (isConnected) => {
+                if (isConnected) {
+                    // The JS WebSocket API doesn't support setting headers, so we have to send the token as a message
+                    this.sendHandshakeMessage();
+                }
+            }
+        );
+        this.webSocketManager.onRemoteVaultUpdateReceived.add(
+            this.syncRemotelyUpdatedFile.bind(this)
+        );
+    }
+
+    public get isFirstSyncComplete(): boolean {
+        return this._isFirstSyncComplete;
+    }
+
+    public async syncLocallyCreatedFile(
+        relativePath: RelativePath
+    ): Promise<void> {
+        if (
+            this.database.getLatestDocumentByRelativePath(relativePath)
+                ?.isDeleted === false
+        ) {
+            this.logger.debug(
+                `Document ${relativePath} already exists in the database, skipping`
+            );
+            return;
+        }
+
+        const [promise, resolve, reject] = createPromise();
+
+        const id = uuidv4();
+        const document = this.database.createNewPendingDocument(
+            id,
+            relativePath,
+            promise
+        );
+
+        try {
+            await this.syncQueue.add(async () =>
+                this.internalSyncer.unrestrictedSyncLocallyCreatedFile(document)
+            );
+
+            resolve();
+        } catch (e) {
+            reject(e);
+        } finally {
+            this.database.removeDocumentPromise(promise);
+        }
+    }
+
+    public async syncLocallyDeletedFile(
+        relativePath: RelativePath
+    ): Promise<void> {
+        if (
+            this.database.getLatestDocumentByRelativePath(relativePath)
+                ?.isDeleted === true
+        ) {
+            // This is must be a consequence of us deleting a file because of a remote update
+            // which triggered a local delete, so we don't need to do anything here.
+            this.logger.debug(
+                `Document ${relativePath} has already been markes as deleted, skipping`
+            );
+            return;
+        }
+
+        // We have to have a record of the delete in case there's an in-flight update for the same
+        // document which finishes after the delete has succeeded and would introduce a phantom metadata record.
+        this.database.delete(relativePath);
+
+        const [promise, resolve, reject] = createPromise();
+
+        const document = await this.database.getResolvedDocumentByRelativePath(
+            relativePath,
+            promise
+        );
+
+        try {
+            await this.syncQueue.add(async () =>
+                this.internalSyncer.unrestrictedSyncLocallyDeletedFile(document)
+            );
+
+            resolve();
+
+            this.database.removeDocument(document);
+        } catch (e) {
+            reject(e);
+        } finally {
+            this.database.removeDocumentPromise(promise);
+        }
+    }
+
+    public async syncLocallyUpdatedFile({
+        oldPath,
+        relativePath
+    }: {
+        oldPath?: RelativePath;
+        relativePath: RelativePath;
+    }): Promise<void> {
+        if (oldPath !== undefined) {
+            // We might have moved the document in the database before calling this method,
+            // in that case, we mustn't move it again.
+            if (
+                this.database.getLatestDocumentByRelativePath(relativePath) ===
+                undefined ||
+                this.database.getLatestDocumentByRelativePath(relativePath)
+                    ?.isDeleted === true
+            ) {
+                if (oldPath === relativePath) {
+                    throw new Error(
+                        `Old path and new path are the same: ${oldPath}`
+                    );
+                }
+
+                this.database.move(oldPath, relativePath);
+            }
+        }
+
+        let document =
+            this.database.getLatestDocumentByRelativePath(relativePath);
+
+        if (
+            oldPath !== undefined &&
+            document?.metadata?.remoteRelativePath === relativePath
+        ) {
+            this.logger.debug(
+                `Document ${relativePath} has been moved as a result of a remote update, skipping sync`
+            );
+            return;
+        }
+
+        if (document === undefined) {
+            this.logger.debug(
+                `Cannot find document ${relativePath} in the database, skipping`
+            );
+            return;
+        }
+
+        if (document.isDeleted) {
+            this.logger.debug(
+                `Document ${relativePath} has been deleted locally, skipping`
+            );
+            return;
+        }
+
+        const [promise, resolve, reject] = createPromise();
+
+        document = await this.database.getResolvedDocumentByRelativePath(
+            relativePath,
+            promise
+        );
+
+        try {
+            await this.syncQueue.add(async () =>
+                this.internalSyncer.unrestrictedSyncLocallyUpdatedFile({
+                    oldPath,
+                    document
+                })
+            );
+
+            resolve();
+        } catch (e) {
+            reject(e);
+        } finally {
+            this.database.removeDocumentPromise(promise);
+        }
+    }
+
+    public async scheduleSyncForOfflineChanges(): Promise<void> {
+        if (this.runningScheduleSyncForOfflineChanges !== undefined) {
+            this.logger.debug("Uploading local changes is already in progress");
+            return this.runningScheduleSyncForOfflineChanges;
+        }
+
+        try {
+            this.runningScheduleSyncForOfflineChanges =
+                this.internalScheduleSyncForOfflineChanges();
+            await this.runningScheduleSyncForOfflineChanges;
+            this.logger.info(`All local changes have been applied remotely`);
+        } catch (e) {
+            if (e instanceof SyncResetError) {
+                this.logger.info(
+                    "Failed to apply local changes remotely due to a reset"
+                );
+                return;
+            }
+            this.logger.error(
+                `Not all local changes have been applied remotely: ${e}`
+            );
+            throw e;
+        } finally {
+            this.runningScheduleSyncForOfflineChanges = undefined;
+        }
+    }
+
+    public async waitUntilFinished(): Promise<void> {
+        await this.runningScheduleSyncForOfflineChanges;
+        await this.syncQueue.onEmpty();
+    }
+
+    public async syncRemotelyUpdatedFile(
+        message: WebSocketVaultUpdate
+    ): Promise<void> {
+        try {
+            const handlerPromise = awaitAll(
+                message.documents.map(async (document) =>
+                    this.internalSyncRemotelyUpdatedFile(document)
+                )
+            );
+
+            await handlerPromise;
+
+            if (message.isInitialSync && message.documents.length > 0) {
+                this.database.setLastSeenUpdateId(
+                    message.documents
+                        .map((document) => document.vaultUpdateId)
+                        .reduce((a, b) => Math.max(a, b))
+                );
+            }
+
+            this._isFirstSyncComplete = true;
+        } catch (e) {
+            this.logger.error(`Failed to sync remotely updated file: ${e}`);
+        }
+    }
+
+    public reset(): void {
+        this._isFirstSyncComplete = false;
+        this.syncQueue.clear();
+        this.remoteDocumentsLock.reset();
+        this.runningScheduleSyncForOfflineChanges = undefined;
+    }
+
+    private sendHandshakeMessage(): void {
+        const message: WebSocketClientMessage = {
+            type: "handshake",
+            deviceId: this.deviceId,
+            token: this.settings.getSettings().token,
+            lastSeenVaultUpdateId: this.database.getLastSeenUpdateId()
+        };
+        this.webSocketManager.sendHandshakeMessage(message);
+    }
+
+    private async internalSyncRemotelyUpdatedFile(
+        remoteVersion: DocumentVersionWithoutContent
+    ): Promise<void> {
+        let document = this.database.getDocumentByDocumentId(
+            remoteVersion.documentId
+        );
+
+        if (document === undefined) {
+            // Let's avoid the same documents getting created in parallel multiple times.
+            // There might be multiple tasks waiting for the lock
+            return this.remoteDocumentsLock.withLock(
+                remoteVersion.documentId,
+                async () => {
+                    document = this.database.getDocumentByDocumentId(
+                        remoteVersion.documentId
+                    );
+
+                    // We're either the first one to get the lock, so we have to create the document in `unrestrictedSyncRemotelyUpdatedFile`
+                    if (document === undefined) {
+                        await this.syncQueue.add(async () =>
+                            this.internalSyncer.unrestrictedSyncRemotelyUpdatedFile(
+                                remoteVersion
+                            )
+                        );
+                    } else {
+                        const [promise, resolve, reject] = createPromise();
+
+                        document =
+                            await this.database.getResolvedDocumentByRelativePath(
+                                document.relativePath,
+                                promise
+                            );
+
+                        try {
+                            await this.syncQueue.add(async () =>
+                                this.internalSyncer.unrestrictedSyncRemotelyUpdatedFile(
+                                    remoteVersion,
+                                    document
+                                )
+                            );
+
+                            resolve();
+                        } catch (e) {
+                            reject(e);
+                        } finally {
+                            this.database.removeDocumentPromise(promise);
+                        }
+                    }
+
+                    this.database.addSeenUpdateId(remoteVersion.vaultUpdateId);
+                }
+            );
+        }
+
+        // We're either the first one to get the lock, so we have to create the document in `unrestrictedSyncRemotelyUpdatedFile`
+        const [promise, resolve, reject] = createPromise();
+
+        document = await this.database.getResolvedDocumentByRelativePath(
+            document.relativePath,
+            promise
+        );
+
+        try {
+            await this.syncQueue.add(async () =>
+                this.internalSyncer.unrestrictedSyncRemotelyUpdatedFile(
+                    remoteVersion,
+                    document
+                )
+            );
+
+            resolve();
+        } catch (e) {
+            reject(e);
+        } finally {
+            this.database.removeDocumentPromise(promise);
+        }
+
+        this.database.addSeenUpdateId(remoteVersion.vaultUpdateId);
+    }
+
+    private async internalScheduleSyncForOfflineChanges(): Promise<void> {
+        await this.createFakeDocumentsFromRemoteState();
+
+        const allLocalFiles = await this.operations.listFilesRecursively();
+        this.logger.info(
+            `Scheduling sync for ${allLocalFiles.length} local files`
+        );
+
+        let locallyPossiblyDeletedFiles: DocumentRecord[] = [];
+
+        for (const document of this.database.resolvedDocuments) {
+            if (
+                !document.isDeleted &&
+                !(await this.operations.exists(document.relativePath))
+            ) {
+                locallyPossiblyDeletedFiles.push(document);
+            }
+        }
+
+        await awaitAll(
+            allLocalFiles.map(async (relativePath) => {
+                if (
+                    this.database.getLatestDocumentByRelativePath(relativePath)
+                        ?.metadata !== undefined
+                ) {
+                    this.logger.debug(
+                        `Document ${relativePath} might have been updated locally, scheduling sync to validate and update it`
+                    );
+
+                    return this.syncLocallyUpdatedFile({
+                        relativePath
+                    });
+                }
+
+                // Perhaps the file has been moved; let's check by looking at the deleted files
+                const contentHash = await this.syncQueue.add(async () => {
+                    const contentBytes =
+                        await this.operations.read(relativePath); // this can throw FileNotFoundError
+                    return hash(contentBytes);
+                });
+
+                if (contentHash == undefined) {
+                    // The file was deleted before we had a chance to read it, no need to sync it here
+                    return;
+                }
+
+                const originalFile = findMatchingFile(
+                    contentHash,
+                    locallyPossiblyDeletedFiles
+                );
+                if (originalFile !== undefined) {
+                    // `originalFile` hasn't been deleted but it got moved instead
+                    /* eslint-disable no-restricted-syntax -- Comparing by property, not direct equality */
+                    locallyPossiblyDeletedFiles =
+                        locallyPossiblyDeletedFiles.filter(
+                            (item) =>
+                                item.relativePath !== originalFile.relativePath
+                        );
+                    /* eslint-enable no-restricted-syntax */
+
+                    this.logger.debug(
+                        `Document '${originalFile.relativePath}' was not found under its current path in the database but was found under a different path (${relativePath}), scheduling sync to move it`
+                    );
+
+                    // We're outside of the pqueue, so we need to call the public wrapper
+                    return this.syncLocallyUpdatedFile({
+                        oldPath: originalFile.relativePath,
+                        relativePath
+                    });
+                }
+
+                this.logger.debug(
+                    `Document ${relativePath} not found in database, scheduling sync to create it`
+                );
+                // We're outside of the pqueue, so we need to call the public wrapper
+                return this.syncLocallyCreatedFile(relativePath);
+            })
+        );
+
+        // this has to happen strictly after the previous awaitAll, as that one
+        // might have removed some of the documents from the list
+        await awaitAll(
+            locallyPossiblyDeletedFiles.map(async ({ relativePath }) => {
+                this.logger.debug(
+                    `Document ${relativePath} has been deleted locally, scheduling sync to delete it`
+                );
+
+                // We're outside of the pqueue, so we need to call the public wrapper
+                return this.syncLocallyDeletedFile(relativePath);
+            })
+        );
+    }
+
+    /**
+     * Create fake documents in the database for all files that are present locally
+     * and also exist remotely. This will stop the subequent syncs from duplicating
+     * the documents by creating the same documents from multiple clients.
+     */
+    private async createFakeDocumentsFromRemoteState(): Promise<void> {
+        if (this.database.getHasInitialSyncCompleted()) {
+            return;
+        }
+
+        const [allLocalFiles, remote] = await awaitAll([
+            this.operations.listFilesRecursively(),
+            this.syncQueue.add(async () => this.syncService.getAll())
+        ]);
+
+        if (remote !== undefined) {
+            remote.latestDocuments
+                .filter(
+                    (remoteDocument) =>
+                        allLocalFiles.includes(remoteDocument.relativePath) &&
+                        !remoteDocument.isDeleted &&
+                        this.database.getDocumentByDocumentId(
+                            remoteDocument.documentId
+                        ) === undefined
+                )
+                .forEach((remoteDocument) => {
+                    this.database.createNewEmptyDocument(
+                        remoteDocument.documentId,
+                        remoteDocument.vaultUpdateId,
+                        remoteDocument.relativePath
+                    );
+                });
+        }
+
+        this.database.setHasInitialSyncCompleted(true);
+    }
 }
diff --git a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
index 53960ae9..32cfb22a 100644
--- a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
+++ b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
@@ -1,20 +1,20 @@
 import type {
-	Database,
-	DocumentRecord,
-	RelativePath
+    Database,
+    DocumentRecord,
+    RelativePath
 } from "../persistence/database";
 
 import { diff } from "reconcile-text";
 import type { SyncService } from "../services/sync-service";
 import type { Logger } from "../tracing/logger";
 import type {
-	CommonHistoryEntry,
-	SyncCreateDetails,
-	SyncDeleteDetails,
-	SyncDetails,
-	SyncHistory,
-	SyncMovedDetails,
-	SyncUpdateDetails
+    CommonHistoryEntry,
+    SyncCreateDetails,
+    SyncDeleteDetails,
+    SyncDetails,
+    SyncHistory,
+    SyncMovedDetails,
+    SyncUpdateDetails
 } from "../tracing/sync-history";
 import { SyncStatus, SyncType } from "../tracing/sync-history";
 import { EMPTY_HASH, hash } from "../utils/hash";
@@ -35,561 +35,560 @@ import { isBinary } from "../utils/is-binary";
 import type { ServerConfig } from "../services/server-config";
 
 export class UnrestrictedSyncer {
-	private ignorePatterns: RegExp[];
+    private ignorePatterns: RegExp[];
 
-	public constructor(
-		private readonly logger: Logger,
-		private readonly database: Database,
-		private readonly settings: Settings,
-		private readonly syncService: SyncService,
-		private readonly operations: FileOperations,
-		private readonly history: SyncHistory,
-		private readonly contentCache: FixedSizeDocumentCache,
-		private readonly serverConfig: ServerConfig
-	) {
-		this.ignorePatterns = globsToRegexes(
-			this.settings.getSettings().ignorePatterns,
-			this.logger
-		);
+    public constructor(
+        private readonly logger: Logger,
+        private readonly database: Database,
+        private readonly settings: Settings,
+        private readonly syncService: SyncService,
+        private readonly operations: FileOperations,
+        private readonly history: SyncHistory,
+        private readonly contentCache: FixedSizeDocumentCache,
+        private readonly serverConfig: ServerConfig
+    ) {
+        this.ignorePatterns = globsToRegexes(
+            this.settings.getSettings().ignorePatterns,
+            this.logger
+        );
 
-		this.settings.addOnSettingsChangeListener((newSettings) => {
-			this.ignorePatterns = globsToRegexes(
-				newSettings.ignorePatterns,
-				this.logger
-			);
-		});
-	}
+        this.settings.onSettingsChanged.add((newSettings) => {
+            this.ignorePatterns = globsToRegexes(
+                newSettings.ignorePatterns,
+                this.logger
+            );
+        });
+    }
 
-	public async unrestrictedSyncLocallyCreatedFile(
-		document: DocumentRecord
-	): Promise<void> {
-		const updateDetails: SyncCreateDetails = {
-			type: SyncType.CREATE,
-			relativePath: document.relativePath
-		};
+    public async unrestrictedSyncLocallyCreatedFile(
+        document: DocumentRecord
+    ): Promise<void> {
+        const updateDetails: SyncCreateDetails = {
+            type: SyncType.CREATE,
+            relativePath: document.relativePath
+        };
 
-		return this.executeSync(updateDetails, async () => {
-			const originalRelativePath = document.relativePath;
-			if (document.isDeleted) {
-				this.logger.debug(
-					`Document ${originalRelativePath} has been already deleted, no need to create it`
-				);
-				return;
-			}
+        return this.executeSync(updateDetails, async () => {
+            const originalRelativePath = document.relativePath;
+            if (document.isDeleted) {
+                this.logger.debug(
+                    `Document ${originalRelativePath} has been already deleted, no need to create it`
+                );
+                return;
+            }
 
-			const contentBytes =
-				await this.operations.read(originalRelativePath); // this can throw FileNotFoundError
-			const contentHash = hash(contentBytes);
+            const contentBytes =
+                await this.operations.read(originalRelativePath); // this can throw FileNotFoundError
+            const contentHash = hash(contentBytes);
 
-			const response = await this.syncService.create({
-				documentId: document.documentId,
-				relativePath: originalRelativePath,
-				contentBytes
-			});
+            const response = await this.syncService.create({
+                documentId: document.documentId,
+                relativePath: originalRelativePath,
+                contentBytes
+            });
 
-			// In case a document with the same name (but different ID) had existed remotely that we haven't known about
-			if (response.relativePath != originalRelativePath) {
-				this.logger.debug(
-					`Document ${originalRelativePath} has been created remotely at a different path: ${response.relativePath}, moving it locally`
-				);
-				await this.operations.move(
-					document.relativePath,
-					response.relativePath
-				); // this can throw FileNotFoundError
-			}
+            // In case a document with the same name (but different ID) had existed remotely that we haven't known about
+            if (response.relativePath != originalRelativePath) {
+                this.logger.debug(
+                    `Document ${originalRelativePath} has been created remotely at a different path: ${response.relativePath}, moving it locally`
+                );
+                await this.operations.move(
+                    document.relativePath,
+                    response.relativePath
+                ); // this can throw FileNotFoundError
+            }
 
-			this.database.updateDocumentMetadata(
-				{
-					parentVersionId: response.vaultUpdateId,
-					hash: contentHash,
-					remoteRelativePath: response.relativePath
-				},
-				document
-			);
+            this.database.updateDocumentMetadata(
+                {
+                    parentVersionId: response.vaultUpdateId,
+                    hash: contentHash,
+                    remoteRelativePath: response.relativePath
+                },
+                document
+            );
 
-			this.database.addSeenUpdateId(response.vaultUpdateId);
-			this.updateCache(
-				response.vaultUpdateId,
-				contentBytes,
-				response.relativePath
-			);
+            this.database.addSeenUpdateId(response.vaultUpdateId);
+            this.updateCache(
+                response.vaultUpdateId,
+                contentBytes,
+                response.relativePath
+            );
 
-			this.history.addHistoryEntry({
-				status: SyncStatus.SUCCESS,
-				details: updateDetails,
-				message: `Successfully uploaded locally created file`
-			});
-		});
-	}
+            this.history.addHistoryEntry({
+                status: SyncStatus.SUCCESS,
+                details: updateDetails,
+                message: `Successfully uploaded locally created file`
+            });
+        });
+    }
 
-	public async unrestrictedSyncLocallyDeletedFile(
-		document: DocumentRecord
-	): Promise<void> {
-		const updateDetails: SyncDeleteDetails = {
-			type: SyncType.DELETE,
-			relativePath: document.relativePath
-		};
+    public async unrestrictedSyncLocallyDeletedFile(
+        document: DocumentRecord
+    ): Promise<void> {
+        const updateDetails: SyncDeleteDetails = {
+            type: SyncType.DELETE,
+            relativePath: document.relativePath
+        };
 
-		await this.executeSync(updateDetails, async () => {
-			const response = await this.syncService.delete({
-				documentId: document.documentId,
-				relativePath: document.relativePath
-			});
+        await this.executeSync(updateDetails, async () => {
+            const response = await this.syncService.delete({
+                documentId: document.documentId,
+                relativePath: document.relativePath
+            });
 
-			this.database.updateDocumentMetadata(
-				{
-					parentVersionId: response.vaultUpdateId,
-					hash: EMPTY_HASH,
-					remoteRelativePath: document.relativePath
-				},
-				document
-			);
+            this.database.updateDocumentMetadata(
+                {
+                    parentVersionId: response.vaultUpdateId,
+                    hash: EMPTY_HASH,
+                    remoteRelativePath: document.relativePath
+                },
+                document
+            );
 
-			this.database.addSeenUpdateId(response.vaultUpdateId);
+            this.database.addSeenUpdateId(response.vaultUpdateId);
 
-			this.history.addHistoryEntry({
-				status: SyncStatus.SUCCESS,
-				details: updateDetails,
-				message: `Successfully deleted locally deleted file on the server`,
-				author: response.userId
-			});
-		});
-	}
+            this.history.addHistoryEntry({
+                status: SyncStatus.SUCCESS,
+                details: updateDetails,
+                message: `Successfully deleted locally deleted file on the server`,
+                author: response.userId
+            });
+        });
+    }
 
-	public async unrestrictedSyncLocallyUpdatedFile({
-		oldPath,
-		document,
-		// We use the same code path for both local and remote updates. We need to force the update
-		// if there are no local changes but we know that the remote version is newer.
-		force = false
-	}: {
-		oldPath?: RelativePath;
-		force?: boolean;
-		document: DocumentRecord;
-	}): Promise<void> {
-		const updateDetails: SyncUpdateDetails | SyncMovedDetails =
-			oldPath !== undefined
-				? {
-						type: SyncType.MOVE,
-						relativePath: document.relativePath,
-						movedFrom: oldPath
-					}
-				: {
-						type: SyncType.UPDATE,
-						relativePath: document.relativePath
-					};
+    public async unrestrictedSyncLocallyUpdatedFile({
+        oldPath,
+        document,
+        // We use the same code path for both local and remote updates. We need to force the update
+        // if there are no local changes but we know that the remote version is newer.
+        force = false
+    }: {
+        oldPath?: RelativePath;
+        force?: boolean;
+        document: DocumentRecord;
+    }): Promise<void> {
+        const updateDetails: SyncUpdateDetails | SyncMovedDetails =
+            oldPath !== undefined
+                ? {
+                    type: SyncType.MOVE,
+                    relativePath: document.relativePath,
+                    movedFrom: oldPath
+                }
+                : {
+                    type: SyncType.UPDATE,
+                    relativePath: document.relativePath
+                };
 
-		await this.executeSync(updateDetails, async () => {
-			const originalRelativePath = document.relativePath;
+        await this.executeSync(updateDetails, async () => {
+            const originalRelativePath = document.relativePath;
 
-			if (document.isDeleted || document.metadata === undefined) {
-				this.logger.debug(
-					`Document ${document.relativePath} has been already deleted, no need to update it`
-				);
-				return;
-			}
+            if (document.isDeleted || document.metadata === undefined) {
+                this.logger.debug(
+                    `Document ${document.relativePath} has been already deleted, no need to update it`
+                );
+                return;
+            }
 
-			const contentBytes = await this.operations.read(
-				document.relativePath
-			); // this can throw FileNotFoundError
-			let contentHash = hash(contentBytes);
+            const contentBytes = await this.operations.read(
+                document.relativePath
+            ); // this can throw FileNotFoundError
+            let contentHash = hash(contentBytes);
 
-			const areThereLocalChanges = !(
-				document.metadata.hash === contentHash && oldPath === undefined
-			);
+            const areThereLocalChanges = !(
+                document.metadata.hash === contentHash && oldPath === undefined
+            );
 
-			let response: DocumentVersion | DocumentUpdateResponse | undefined =
-				undefined;
+            let response: DocumentVersion | DocumentUpdateResponse | undefined =
+                undefined;
 
-			if (areThereLocalChanges) {
-				const isText =
-					!isBinary(contentBytes) &&
-					isFileTypeMergable(
-						document.relativePath,
-						this.serverConfig.getConfig().mergeableFileExtensions
-					);
-				const cachedVersion = this.contentCache.get(
-					document.metadata.parentVersionId
-				);
+            if (areThereLocalChanges) {
+                const isText =
+                    !isBinary(contentBytes) &&
+                    isFileTypeMergable(
+                        document.relativePath,
+                        this.serverConfig.getConfig().mergeableFileExtensions
+                    );
+                const cachedVersion = this.contentCache.get(
+                    document.metadata.parentVersionId
+                );
 
-				response =
-					isText && cachedVersion !== undefined
-						? await this.syncService.putText({
-								documentId: document.documentId,
-								parentVersionId:
-									document.metadata.parentVersionId,
-								relativePath: document.relativePath,
-								content: diff(
-									new TextDecoder().decode(cachedVersion),
-									new TextDecoder().decode(contentBytes)
-								)
-							})
-						: await this.syncService.putBinary({
-								documentId: document.documentId,
-								parentVersionId:
-									document.metadata.parentVersionId,
-								relativePath: document.relativePath,
-								contentBytes
-							});
-			} else {
-				if (!force) {
-					this.logger.debug(
-						`File hash of ${document.relativePath} matches with last synced version and the path hasn't changed; no need to sync`
-					);
-					return;
-				}
+                response =
+                    isText && cachedVersion !== undefined
+                        ? await this.syncService.putText({
+                            documentId: document.documentId,
+                            parentVersionId:
+                                document.metadata.parentVersionId,
+                            relativePath: document.relativePath,
+                            content: diff(
+                                new TextDecoder().decode(cachedVersion),
+                                new TextDecoder().decode(contentBytes)
+                            )
+                        })
+                        : await this.syncService.putBinary({
+                            documentId: document.documentId,
+                            parentVersionId:
+                                document.metadata.parentVersionId,
+                            relativePath: document.relativePath,
+                            contentBytes
+                        });
+            } else {
+                if (!force) {
+                    this.logger.debug(
+                        `File hash of ${document.relativePath} matches with last synced version and the path hasn't changed; no need to sync`
+                    );
+                    return;
+                }
 
-				response = await this.syncService.get({
-					documentId: document.documentId
-				});
-			}
+                response = await this.syncService.get({
+                    documentId: document.documentId
+                });
+            }
 
-			// `document` is mutable and reflects the latest state in the local database
-			// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-			if (document.isDeleted) {
-				this.logger.info(
-					`Document ${document.relativePath} has been deleted before we could finish updating it`
-				);
-				this.database.addSeenUpdateId(response.vaultUpdateId);
-				return;
-			}
+            // `document` is mutable and reflects the latest state in the local database
+            // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+            if (document.isDeleted) {
+                this.logger.info(
+                    `Document ${document.relativePath} has been deleted before we could finish updating it`
+                );
+                this.database.addSeenUpdateId(response.vaultUpdateId);
+                return;
+            }
 
-			if (
-				// `Syncer` creates fake local document metadata for all remote docs with invalid hashes. The parent IDs will likely match
-				// the latest versions so we still need to update the local versions to turn the fakes into real metadata.
-				document.metadata.parentVersionId > response.vaultUpdateId
-			) {
-				this.logger.debug(
-					`Document ${document.relativePath} is already more up to date than the fetched version`
-				);
-				this.database.addSeenUpdateId(response.vaultUpdateId); // in case the previous `vaultUpdateId` update hasn't made it through
-				return;
-			}
+            if (
+                // `Syncer` creates fake local document metadata for all remote docs with invalid hashes. The parent IDs will likely match
+                // the latest versions so we still need to update the local versions to turn the fakes into real metadata.
+                document.metadata.parentVersionId > response.vaultUpdateId
+            ) {
+                this.logger.debug(
+                    `Document ${document.relativePath} is already more up to date than the fetched version`
+                );
+                this.database.addSeenUpdateId(response.vaultUpdateId); // in case the previous `vaultUpdateId` update hasn't made it through
+                return;
+            }
 
-			if (response.isDeleted) {
-				return this.applyRemoteDeleteLocally(document, response);
-			}
+            if (response.isDeleted) {
+                return this.applyRemoteDeleteLocally(document, response);
+            }
 
-			let actualPath = document.relativePath;
+            let actualPath = document.relativePath;
 
-			if (response.relativePath != originalRelativePath) {
-				actualPath = response.relativePath;
-				// Make sure to update the remote relative path to avoid uploading
-				// the file as a result of this filesystem event.
-				document.metadata.remoteRelativePath = response.relativePath;
-				await this.operations.move(
-					document.relativePath,
-					response.relativePath
-				); // this can throw FileNotFoundError
-			}
+            if (response.relativePath != originalRelativePath) {
+                actualPath = response.relativePath;
+                // Make sure to update the remote relative path to avoid uploading
+                // the file as a result of this filesystem event.
+                document.metadata.remoteRelativePath = response.relativePath;
+                await this.operations.move(
+                    document.relativePath,
+                    response.relativePath
+                ); // this can throw FileNotFoundError
+            }
 
-			if (!("type" in response) || response.type === "MergingUpdate") {
-				const responseBytes = base64ToBytes(response.contentBase64);
-				contentHash = hash(responseBytes);
+            if (!("type" in response) || response.type === "MergingUpdate") {
+                const responseBytes = base64ToBytes(response.contentBase64);
+                contentHash = hash(responseBytes);
 
-				this.database.updateDocumentMetadata(
-					{
-						parentVersionId: response.vaultUpdateId,
-						hash: contentHash,
-						remoteRelativePath: response.relativePath
-					},
-					document
-				);
-				await this.operations.write(
-					actualPath,
-					contentBytes,
-					responseBytes
-				);
-				this.updateCache(
-					response.vaultUpdateId,
-					responseBytes,
-					actualPath
-				);
+                this.database.updateDocumentMetadata(
+                    {
+                        parentVersionId: response.vaultUpdateId,
+                        hash: contentHash,
+                        remoteRelativePath: response.relativePath
+                    },
+                    document
+                );
+                await this.operations.write(
+                    actualPath,
+                    contentBytes,
+                    responseBytes
+                );
+                this.updateCache(
+                    response.vaultUpdateId,
+                    responseBytes,
+                    actualPath
+                );
 
-				if (!force) {
-					this.history.addHistoryEntry({
-						status: SyncStatus.SUCCESS,
-						details: updateDetails,
-						message: `The file we updated had been updated remotely, so we downloaded the merged version`
-					});
-				}
-			} else {
-				this.database.updateDocumentMetadata(
-					{
-						parentVersionId: response.vaultUpdateId,
-						hash: contentHash,
-						remoteRelativePath: response.relativePath
-					},
-					document
-				);
-				this.updateCache(
-					response.vaultUpdateId,
-					contentBytes,
-					actualPath
-				);
-			}
+                if (!force) {
+                    this.history.addHistoryEntry({
+                        status: SyncStatus.SUCCESS,
+                        details: updateDetails,
+                        message: `The file we updated had been updated remotely, so we downloaded the merged version`
+                    });
+                }
+            } else {
+                this.database.updateDocumentMetadata(
+                    {
+                        parentVersionId: response.vaultUpdateId,
+                        hash: contentHash,
+                        remoteRelativePath: response.relativePath
+                    },
+                    document
+                );
+                this.updateCache(
+                    response.vaultUpdateId,
+                    contentBytes,
+                    actualPath
+                );
+            }
 
-			this.database.addSeenUpdateId(response.vaultUpdateId);
+            this.database.addSeenUpdateId(response.vaultUpdateId);
 
-			const actualUpdateDetails: SyncUpdateDetails | SyncMovedDetails =
-				oldPath !== undefined ||
-				response.relativePath != originalRelativePath
-					? {
-							type: SyncType.MOVE,
-							relativePath: response.relativePath,
-							movedFrom: originalRelativePath
-						}
-					: {
-							type: SyncType.UPDATE,
-							relativePath: response.relativePath
-						};
+            const actualUpdateDetails: SyncUpdateDetails | SyncMovedDetails =
+                oldPath !== undefined ||
+                    response.relativePath != originalRelativePath
+                    ? {
+                        type: SyncType.MOVE,
+                        relativePath: response.relativePath,
+                        movedFrom: originalRelativePath
+                    }
+                    : {
+                        type: SyncType.UPDATE,
+                        relativePath: response.relativePath
+                    };
 
-			if (areThereLocalChanges) {
-				this.history.addHistoryEntry({
-					status: SyncStatus.SUCCESS,
-					details: actualUpdateDetails,
-					message: `Successfully uploaded locally updated file to the server`,
-					author: response.userId
-				});
-			} else {
-				this.history.addHistoryEntry({
-					status: SyncStatus.SUCCESS,
-					details: actualUpdateDetails,
-					message: `Successfully downloaded remotely updated file from the server`,
-					author: response.userId,
-					timestamp: new Date(response.updatedDate)
-				});
-			}
-		});
-	}
+            if (areThereLocalChanges) {
+                this.history.addHistoryEntry({
+                    status: SyncStatus.SUCCESS,
+                    details: actualUpdateDetails,
+                    message: `Successfully uploaded locally updated file to the server`,
+                    author: response.userId
+                });
+            } else {
+                this.history.addHistoryEntry({
+                    status: SyncStatus.SUCCESS,
+                    details: actualUpdateDetails,
+                    message: `Successfully downloaded remotely updated file from the server`,
+                    author: response.userId,
+                    timestamp: new Date(response.updatedDate)
+                });
+            }
+        });
+    }
 
-	public async unrestrictedSyncRemotelyUpdatedFile(
-		remoteVersion: DocumentVersionWithoutContent,
-		document?: DocumentRecord
-	): Promise<void> {
-		const updateDetails: SyncCreateDetails = {
-			type: SyncType.CREATE,
-			relativePath: remoteVersion.relativePath
-		};
+    public async unrestrictedSyncRemotelyUpdatedFile(
+        remoteVersion: DocumentVersionWithoutContent,
+        document?: DocumentRecord
+    ): Promise<void> {
+        const updateDetails: SyncCreateDetails = {
+            type: SyncType.CREATE,
+            relativePath: remoteVersion.relativePath
+        };
 
-		await this.executeSync(updateDetails, async () => {
-			if (document?.metadata !== undefined) {
-				// If the file exists locally, let's pretend the user has updated it
-				// and deal with remote update/deletion within `unrestrictedSyncLocallyUpdatedFile`
-				if (
-					document.metadata.parentVersionId >=
-					remoteVersion.vaultUpdateId
-				) {
-					this.logger.debug(
-						`Document ${remoteVersion.relativePath} is already at least as up to date as the fetched version`
-					);
+        await this.executeSync(updateDetails, async () => {
+            if (document?.metadata !== undefined) {
+                // If the file exists locally, let's pretend the user has updated it
+                // and deal with remote update/deletion within `unrestrictedSyncLocallyUpdatedFile`
+                if (
+                    document.metadata.parentVersionId >=
+                    remoteVersion.vaultUpdateId
+                ) {
+                    this.logger.debug(
+                        `Document ${remoteVersion.relativePath} is already at least as up to date as the fetched version`
+                    );
 
-					return;
-				}
+                    return;
+                }
 
-				return this.unrestrictedSyncLocallyUpdatedFile({
-					document,
-					force: true
-				});
-			} else if (remoteVersion.isDeleted) {
-				// Either the document hasn't made it to us before and therefore we don't need to delete it,
-				// or we already have it, in which case the preceeding if would've dealt with it
-				this.logger.debug(
-					`Document ${remoteVersion.relativePath} has been deleted remotely, no need to sync`
-				);
-				return;
-			}
+                return this.unrestrictedSyncLocallyUpdatedFile({
+                    document,
+                    force: true
+                });
+            } else if (remoteVersion.isDeleted) {
+                // Either the document hasn't made it to us before and therefore we don't need to delete it,
+                // or we already have it, in which case the preceeding if would've dealt with it
+                this.logger.debug(
+                    `Document ${remoteVersion.relativePath} has been deleted remotely, no need to sync`
+                );
+                return;
+            }
 
-			// Don't download oversized files
-			const historyEntryForSkippedOversizedFile =
-				this.getHistoryEntryForSkippedOversizedFile(
-					remoteVersion.contentSize,
-					remoteVersion.relativePath
-				);
-			if (historyEntryForSkippedOversizedFile !== undefined) {
-				this.history.addHistoryEntry(
-					historyEntryForSkippedOversizedFile
-				);
-				return;
-			}
+            // Don't download oversized files
+            const historyEntryForSkippedOversizedFile =
+                this.getHistoryEntryForSkippedOversizedFile(
+                    remoteVersion.contentSize,
+                    remoteVersion.relativePath
+                );
+            if (historyEntryForSkippedOversizedFile !== undefined) {
+                this.history.addHistoryEntry(
+                    historyEntryForSkippedOversizedFile
+                );
+                return;
+            }
 
-			const contentBytes =
-				await this.syncService.getDocumentVersionContent({
-					documentId: remoteVersion.documentId,
-					vaultUpdateId: remoteVersion.vaultUpdateId
-				});
+            const contentBytes =
+                await this.syncService.getDocumentVersionContent({
+                    documentId: remoteVersion.documentId,
+                    vaultUpdateId: remoteVersion.vaultUpdateId
+                });
 
-			// We're trying to create an entirely new document that didn't exist locally
-			document = this.database.getDocumentByDocumentId(
-				remoteVersion.documentId
-			);
-			// It can happen that a concurrent sync operation has already created the document, so we can bail here
-			if (document !== undefined) {
-				this.logger.debug(
-					`Document ${remoteVersion.relativePath} has already been created locally, no need to create it again`
-				);
-				return;
-			}
+            // We're trying to create an entirely new document that didn't exist locally
+            document = this.database.getDocumentByDocumentId(
+                remoteVersion.documentId
+            );
+            // It can happen that a concurrent sync operation has already created the document, so we can bail here
+            if (document !== undefined) {
+                this.logger.debug(
+                    `Document ${remoteVersion.relativePath} has already been created locally, no need to create it again`
+                );
+                return;
+            }
 
-			await this.operations.ensureClearPath(remoteVersion.relativePath);
+            await this.operations.ensureClearPath(remoteVersion.relativePath);
 
-			const [promise, resolve] = createPromise();
-			this.database.updateDocumentMetadata(
-				{
-					parentVersionId: remoteVersion.vaultUpdateId,
-					hash: hash(contentBytes),
-					remoteRelativePath: remoteVersion.relativePath
-				},
-				this.database.createNewPendingDocument(
-					remoteVersion.documentId,
-					remoteVersion.relativePath,
-					promise
-				)
-			);
+            const [promise, resolve] = createPromise();
+            this.database.updateDocumentMetadata(
+                {
+                    parentVersionId: remoteVersion.vaultUpdateId,
+                    hash: hash(contentBytes),
+                    remoteRelativePath: remoteVersion.relativePath
+                },
+                this.database.createNewPendingDocument(
+                    remoteVersion.documentId,
+                    remoteVersion.relativePath,
+                    promise
+                )
+            );
 
-			await this.operations.create(
-				remoteVersion.relativePath,
-				contentBytes
-			);
-			this.updateCache(
-				remoteVersion.vaultUpdateId,
-				contentBytes,
-				remoteVersion.relativePath
-			);
+            await this.operations.create(
+                remoteVersion.relativePath,
+                contentBytes
+            );
+            this.updateCache(
+                remoteVersion.vaultUpdateId,
+                contentBytes,
+                remoteVersion.relativePath
+            );
 
-			resolve();
-			this.database.removeDocumentPromise(promise);
+            resolve();
+            this.database.removeDocumentPromise(promise);
 
-			this.history.addHistoryEntry({
-				status: SyncStatus.SUCCESS,
-				details: updateDetails,
-				message: `Successfully downloaded remote file which hadn't existed locally`,
-				author: remoteVersion.userId,
-				timestamp: new Date(remoteVersion.updatedDate)
-			});
-		});
-	}
+            this.history.addHistoryEntry({
+                status: SyncStatus.SUCCESS,
+                details: updateDetails,
+                message: `Successfully downloaded remote file which hadn't existed locally`,
+                author: remoteVersion.userId,
+                timestamp: new Date(remoteVersion.updatedDate)
+            });
+        });
+    }
 
-	public async executeSync<T>(
-		details: SyncDetails,
-		fn: () => Promise<T>
-	): Promise<T | undefined> {
-		for (const pattern of this.ignorePatterns) {
-			if (pattern.test(details.relativePath)) {
-				this.logger.debug(
-					`File '${details.relativePath}' is ignored by the ignore pattern: ${pattern}`
-				);
-				return; // bail without SKIPPED status because we were told to ignore this file and we shouldn't clutter up the history
-			}
-		}
+    public async executeSync<T>(
+        details: SyncDetails,
+        fn: () => Promise<T>
+    ): Promise<T | undefined> {
+        for (const pattern of this.ignorePatterns) {
+            if (pattern.test(details.relativePath)) {
+                this.logger.debug(
+                    `File '${details.relativePath}' is ignored by the ignore pattern: ${pattern}`
+                );
+                return; // bail without SKIPPED status because we were told to ignore this file and we shouldn't clutter up the history
+            }
+        }
 
-		try {
-			// Only check the size of files which already exist locally.
-			if (await this.operations.exists(details.relativePath)) {
-				const sizeInBytes = await this.operations.getFileSize(
-					details.relativePath
-				);
-				const historyEntryForSkippedOversizedFile =
-					this.getHistoryEntryForSkippedOversizedFile(
-						sizeInBytes,
-						details.relativePath
-					);
-				if (historyEntryForSkippedOversizedFile !== undefined) {
-					this.history.addHistoryEntry(
-						historyEntryForSkippedOversizedFile
-					);
-					return;
-				}
-			}
+        try {
+            // Only check the size of files which already exist locally.
+            if (await this.operations.exists(details.relativePath)) {
+                const sizeInBytes = await this.operations.getFileSize(
+                    details.relativePath
+                );
+                const historyEntryForSkippedOversizedFile =
+                    this.getHistoryEntryForSkippedOversizedFile(
+                        sizeInBytes,
+                        details.relativePath
+                    );
+                if (historyEntryForSkippedOversizedFile !== undefined) {
+                    this.history.addHistoryEntry(
+                        historyEntryForSkippedOversizedFile
+                    );
+                    return;
+                }
+            }
 
-			return await fn();
-		} catch (e) {
-			if (e instanceof FileNotFoundError) {
-				// A subsequent sync operation must have been creating to deal with this
-				this.logger.info(
-					`Skiping file '${details.relativePath}' because it no longer exists when trying to ${details.type.toLocaleLowerCase()} it`
-				);
-				return;
-			}
-			if (e instanceof SyncResetError) {
-				this.logger.info(
-					`Interrupting sync operation because of a reset`
-				);
-				return;
-			} else {
-				this.history.addHistoryEntry({
-					status: SyncStatus.ERROR,
-					details,
-					message: `Failed to sync file '${details.relativePath}' because of ${e} when trying to ${details.type.toLocaleLowerCase()} it`
-				});
-				throw e;
-			}
-		}
-	}
+            return await fn();
+        } catch (e) {
+            if (e instanceof FileNotFoundError) {
+                // A subsequent sync operation must have been creating to deal with this
+                this.logger.info(
+                    `Skiping file '${details.relativePath}' because it no longer exists when trying to ${details.type.toLocaleLowerCase()} it`
+                );
+                return;
+            }
+            if (e instanceof SyncResetError) {
+                this.logger.info(
+                    `Interrupting sync operation because of a reset`
+                );
+                return;
+            } else {
+                this.history.addHistoryEntry({
+                    status: SyncStatus.ERROR,
+                    details,
+                    message: `Failed to sync file '${details.relativePath}' because of ${e} when trying to ${details.type.toLocaleLowerCase()} it`
+                });
+                throw e;
+            }
+        }
+    }
 
-	private getHistoryEntryForSkippedOversizedFile(
-		sizeInBytes: number,
-		relativePath: RelativePath
-	): CommonHistoryEntry | undefined {
-		const sizeInMB = Math.round(sizeInBytes / 1024 / 1024);
-		const { maxFileSizeMB } = this.settings.getSettings();
-		if (sizeInMB > maxFileSizeMB) {
-			return {
-				status: SyncStatus.SKIPPED,
-				details: {
-					type: SyncType.SKIPPED,
-					relativePath
-				},
-				message: `File size of ${sizeInMB} MB exceeds the maximum file size limit of ${
-					maxFileSizeMB
-				} MB`
-			};
-		}
-	}
+    private getHistoryEntryForSkippedOversizedFile(
+        sizeInBytes: number,
+        relativePath: RelativePath
+    ): CommonHistoryEntry | undefined {
+        const sizeInMB = Math.round(sizeInBytes / 1024 / 1024);
+        const { maxFileSizeMB } = this.settings.getSettings();
+        if (sizeInMB > maxFileSizeMB) {
+            return {
+                status: SyncStatus.SKIPPED,
+                details: {
+                    type: SyncType.SKIPPED,
+                    relativePath
+                },
+                message: `File size of ${sizeInMB} MB exceeds the maximum file size limit of ${maxFileSizeMB
+                    } MB`
+            };
+        }
+    }
 
-	private updateCache(
-		updateId: number,
-		contentBytes: Uint8Array,
-		filePath: RelativePath
-	): void {
-		if (
-			isFileTypeMergable(
-				filePath,
-				this.serverConfig.getConfig().mergeableFileExtensions
-			) &&
-			!isBinary(contentBytes)
-		) {
-			this.contentCache.put(updateId, contentBytes);
-		}
-	}
+    private updateCache(
+        updateId: number,
+        contentBytes: Uint8Array,
+        filePath: RelativePath
+    ): void {
+        if (
+            isFileTypeMergable(
+                filePath,
+                this.serverConfig.getConfig().mergeableFileExtensions
+            ) &&
+            !isBinary(contentBytes)
+        ) {
+            this.contentCache.put(updateId, contentBytes);
+        }
+    }
 
-	private async applyRemoteDeleteLocally(
-		document: DocumentRecord,
-		response: DocumentVersion | DocumentUpdateResponse
-	): Promise<void> {
-		this.history.addHistoryEntry({
-			status: SyncStatus.SUCCESS,
-			details: {
-				type: SyncType.DELETE,
-				relativePath: document.relativePath
-			},
-			message: "File has been deleted remotely, so we deleted it locally",
-			author: response.userId,
-			timestamp: new Date(response.updatedDate)
-		});
+    private async applyRemoteDeleteLocally(
+        document: DocumentRecord,
+        response: DocumentVersion | DocumentUpdateResponse
+    ): Promise<void> {
+        this.history.addHistoryEntry({
+            status: SyncStatus.SUCCESS,
+            details: {
+                type: SyncType.DELETE,
+                relativePath: document.relativePath
+            },
+            message: "File has been deleted remotely, so we deleted it locally",
+            author: response.userId,
+            timestamp: new Date(response.updatedDate)
+        });
 
-		this.database.delete(document.relativePath);
-		this.database.updateDocumentMetadata(
-			{
-				parentVersionId: response.vaultUpdateId,
-				hash: EMPTY_HASH,
-				remoteRelativePath: response.relativePath
-			},
-			document
-		);
+        this.database.delete(document.relativePath);
+        this.database.updateDocumentMetadata(
+            {
+                parentVersionId: response.vaultUpdateId,
+                hash: EMPTY_HASH,
+                remoteRelativePath: response.relativePath
+            },
+            document
+        );
 
-		await this.operations.delete(document.relativePath);
+        await this.operations.delete(document.relativePath);
 
-		this.database.addSeenUpdateId(response.vaultUpdateId);
-	}
+        this.database.addSeenUpdateId(response.vaultUpdateId);
+    }
 }
diff --git a/frontend/sync-client/src/tracing/logger.ts b/frontend/sync-client/src/tracing/logger.ts
index 41e25257..6ac2b4e1 100644
--- a/frontend/sync-client/src/tracing/logger.ts
+++ b/frontend/sync-client/src/tracing/logger.ts
@@ -1,87 +1,72 @@
 import { MAX_LOG_MESSAGE_COUNT } from "../consts";
-import { removeFromArray } from "../utils/remove-from-array";
+import { EventListeners } from "../utils/data-structures/event-listeners";
 
 export enum LogLevel {
-	DEBUG = "DEBUG",
-	INFO = "INFO",
-	WARNING = "WARNING",
-	ERROR = "ERROR"
+    DEBUG = "DEBUG",
+    INFO = "INFO",
+    WARNING = "WARNING",
+    ERROR = "ERROR"
 }
 
 const LOG_LEVEL_ORDER = {
-	[LogLevel.DEBUG]: 0,
-	[LogLevel.INFO]: 1,
-	[LogLevel.WARNING]: 2,
-	[LogLevel.ERROR]: 3
+    [LogLevel.DEBUG]: 0,
+    [LogLevel.INFO]: 1,
+    [LogLevel.WARNING]: 2,
+    [LogLevel.ERROR]: 3
 };
 
 export class LogLine {
-	public timestamp = new Date();
-	public constructor(
-		public level: LogLevel,
-		public message: string
-	) {}
+    public timestamp = new Date();
+    public constructor(
+        public level: LogLevel,
+        public message: string
+    ) { }
 }
 
 export class Logger {
-	private readonly messages: LogLine[] = [];
-	private readonly onMessageListeners: ((message: LogLine) => unknown)[] = [];
+    private readonly messages: LogLine[] = [];
+    public readonly onLogEmitted = new EventListeners<
+        (message: LogLine) => unknown
+    >();
 
-	public constructor(
-		...onMessageListeners: ((message: LogLine) => unknown)[]
-	) {
-		this.onMessageListeners = onMessageListeners;
-	}
 
-	public debug(message: string): void {
-		this.pushMessage(message, LogLevel.DEBUG);
-	}
+    public debug(message: string): void {
+        this.pushMessage(message, LogLevel.DEBUG);
+    }
 
-	public info(message: string): void {
-		this.pushMessage(message, LogLevel.INFO);
-	}
+    public info(message: string): void {
+        this.pushMessage(message, LogLevel.INFO);
+    }
 
-	public warn(message: string): void {
-		this.pushMessage(message, LogLevel.WARNING);
-	}
+    public warn(message: string): void {
+        this.pushMessage(message, LogLevel.WARNING);
+    }
 
-	public error(message: string): void {
-		this.pushMessage(message, LogLevel.ERROR);
-	}
+    public error(message: string): void {
+        this.pushMessage(message, LogLevel.ERROR);
+    }
 
-	public getMessages(mininumSeverity: LogLevel): LogLine[] {
-		return this.messages.filter(
-			(message) =>
-				LOG_LEVEL_ORDER[message.level] >=
-				LOG_LEVEL_ORDER[mininumSeverity]
-		);
-	}
+    public getMessages(mininumSeverity: LogLevel): LogLine[] {
+        return this.messages.filter(
+            (message) =>
+                LOG_LEVEL_ORDER[message.level] >=
+                LOG_LEVEL_ORDER[mininumSeverity]
+        );
+    }
 
-	public addOnMessageListener(listener: (message: LogLine) => unknown): void {
-		this.onMessageListeners.push(listener);
-	}
+    public reset(): void {
+        this.messages.length = 0;
+        this.debug("Logger has been reset");
+    }
 
-	public removeOnMessageListener(
-		listener: (message: LogLine) => unknown
-	): void {
-		removeFromArray(this.onMessageListeners, listener);
-	}
+    private pushMessage(message: string, level: LogLevel): void {
+        const logLine = new LogLine(level, message);
+        this.messages.push(logLine);
 
-	public reset(): void {
-		this.messages.length = 0;
-		this.debug("Logger has been reset");
-	}
+        while (this.messages.length > MAX_LOG_MESSAGE_COUNT) {
+            this.messages.shift();
+        }
 
-	private pushMessage(message: string, level: LogLevel): void {
-		const logLine = new LogLine(level, message);
-		this.messages.push(logLine);
-
-		while (this.messages.length > MAX_LOG_MESSAGE_COUNT) {
-			this.messages.shift();
-		}
-
-		this.onMessageListeners.forEach((listener) => {
-			listener(logLine);
-		});
-	}
+        this.onLogEmitted.trigger(logLine);
+    }
 }
diff --git a/frontend/sync-client/src/tracing/sync-history.ts b/frontend/sync-client/src/tracing/sync-history.ts
index d60a57d1..99cfb5ce 100644
--- a/frontend/sync-client/src/tracing/sync-history.ts
+++ b/frontend/sync-client/src/tracing/sync-history.ts
@@ -1,183 +1,169 @@
 import {
-	MAX_HISTORY_ENTRY_COUNT,
-	TIMEOUT_FOR_MERGING_HISTORY_ENTRIES_IN_SECONDS
+    MAX_HISTORY_ENTRY_COUNT,
+    TIMEOUT_FOR_MERGING_HISTORY_ENTRIES_IN_SECONDS
 } from "../consts";
 import type { RelativePath } from "../persistence/database";
 import type { Logger } from "./logger";
 import { removeFromArray } from "../utils/remove-from-array";
+import { EventListeners } from "../utils/data-structures/event-listeners";
 
 export interface SyncCreateDetails {
-	type: SyncType.CREATE;
-	relativePath: RelativePath;
+    type: SyncType.CREATE;
+    relativePath: RelativePath;
 }
 
 export interface SyncUpdateDetails {
-	type: SyncType.UPDATE;
-	relativePath: RelativePath;
+    type: SyncType.UPDATE;
+    relativePath: RelativePath;
 }
 
 export interface SyncMovedDetails {
-	type: SyncType.MOVE;
-	relativePath: RelativePath;
-	movedFrom: RelativePath;
+    type: SyncType.MOVE;
+    relativePath: RelativePath;
+    movedFrom: RelativePath;
 }
 
 export interface SyncDeleteDetails {
-	type: SyncType.DELETE;
-	relativePath: RelativePath;
+    type: SyncType.DELETE;
+    relativePath: RelativePath;
 }
 
 export interface SyncSkippedDetails {
-	type: SyncType.SKIPPED;
-	relativePath: RelativePath;
+    type: SyncType.SKIPPED;
+    relativePath: RelativePath;
 }
 
 export type SyncDetails =
-	| SyncCreateDetails
-	| SyncUpdateDetails
-	| SyncDeleteDetails
-	| SyncMovedDetails
-	| SyncSkippedDetails;
+    | SyncCreateDetails
+    | SyncUpdateDetails
+    | SyncDeleteDetails
+    | SyncMovedDetails
+    | SyncSkippedDetails;
 
 export interface CommonHistoryEntry {
-	status: SyncStatus;
-	message: string;
-	details: SyncDetails;
-	author?: string;
-	timestamp?: Date;
+    status: SyncStatus;
+    message: string;
+    details: SyncDetails;
+    author?: string;
+    timestamp?: Date;
 }
 
 export enum SyncType {
-	CREATE = "CREATE",
-	UPDATE = "UPDATE",
-	DELETE = "DELETE",
-	MOVE = "MOVE",
-	SKIPPED = "SKIPPED"
+    CREATE = "CREATE",
+    UPDATE = "UPDATE",
+    DELETE = "DELETE",
+    MOVE = "MOVE",
+    SKIPPED = "SKIPPED"
 }
 
 export enum SyncStatus {
-	SUCCESS = "SUCCESS",
-	ERROR = "ERROR",
-	SKIPPED = "SKIPPED"
+    SUCCESS = "SUCCESS",
+    ERROR = "ERROR",
+    SKIPPED = "SKIPPED"
 }
 
 export type HistoryEntry = CommonHistoryEntry & { timestamp: Date };
 
 export interface HistoryStats {
-	success: number;
-	error: number;
+    success: number;
+    error: number;
 }
 
 export class SyncHistory {
-	private readonly _entries: HistoryEntry[] = [];
+    private readonly _entries: HistoryEntry[] = [];
 
-	private readonly syncHistoryUpdateListeners: ((
-		status: HistoryStats
-	) => unknown)[] = [];
+    public readonly onHistoryUpdated = new EventListeners<
+        (status: HistoryStats) => unknown
+    >();
 
-	private status: HistoryStats = {
-		success: 0,
-		error: 0
-	};
+    private status: HistoryStats = {
+        success: 0,
+        error: 0
+    };
 
-	public constructor(private readonly logger: Logger) {}
+    public constructor(private readonly logger: Logger) { }
 
-	public get entries(): readonly HistoryEntry[] {
-		return this._entries;
-	}
+    public get entries(): readonly HistoryEntry[] {
+        return this._entries;
+    }
 
-	/**
-	 * Insert the entry at the beginning of the history list. If the entry
-	 * already in the list, it will get moved to the beginning and updated.
-	 *
-	 * If the entry list is too long, the oldest entry will be removed.
-	 */
-	public addHistoryEntry(entry: CommonHistoryEntry): void {
-		const historyEntry = {
-			...entry,
-			timestamp: entry.timestamp ?? new Date()
-		};
+    /**
+     * Insert the entry at the beginning of the history list. If the entry
+     * already in the list, it will get moved to the beginning and updated.
+     *
+     * If the entry list is too long, the oldest entry will be removed.
+     */
+    public addHistoryEntry(entry: CommonHistoryEntry): void {
+        const historyEntry = {
+            ...entry,
+            timestamp: entry.timestamp ?? new Date()
+        };
 
-		const candidate = this.findSimilarRecentUpdateEntry(historyEntry);
-		if (candidate !== undefined) {
-			removeFromArray(this._entries, candidate);
-		}
+        const candidate = this.findSimilarRecentUpdateEntry(historyEntry);
+        if (candidate !== undefined) {
+            removeFromArray(this._entries, candidate);
+        }
 
-		// Insert the entry at the beginning
-		this._entries.unshift(historyEntry);
+        // Insert the entry at the beginning
+        this._entries.unshift(historyEntry);
 
-		if (this._entries.length > MAX_HISTORY_ENTRY_COUNT) {
-			this._entries.pop();
-		}
+        if (this._entries.length > MAX_HISTORY_ENTRY_COUNT) {
+            this._entries.pop();
+        }
 
-		this.updateSuccessCount(historyEntry);
-	}
+        this.updateSuccessCount(historyEntry);
+    }
 
-	public addSyncHistoryUpdateListener(
-		listener: (stats: HistoryStats) => unknown
-	): void {
-		this.syncHistoryUpdateListeners.push(listener);
-		listener({ ...this.status });
-	}
 
-	public removeSyncHistoryUpdateListener(
-		listener: (stats: HistoryStats) => unknown
-	): void {
-		removeFromArray(this.syncHistoryUpdateListeners, listener);
-	}
 
-	public reset(): void {
-		this._entries.length = 0;
-		this.status = {
-			success: 0,
-			error: 0
-		};
-		this.syncHistoryUpdateListeners.forEach((listener) => {
-			listener(this.status);
-		});
-	}
+    public reset(): void {
+        this._entries.length = 0;
+        this.status = {
+            success: 0,
+            error: 0
+        };
+        this.onHistoryUpdated.trigger(this.status);
+    }
 
-	private findSimilarRecentUpdateEntry(
-		entry: HistoryEntry
-	): HistoryEntry | undefined {
-		if (entry.details.type !== SyncType.UPDATE) {
-			return;
-		}
+    private findSimilarRecentUpdateEntry(
+        entry: HistoryEntry
+    ): HistoryEntry | undefined {
+        if (entry.details.type !== SyncType.UPDATE) {
+            return;
+        }
 
-		const candidate = this._entries.find(
-			(e) =>
-				e.details.type === SyncType.UPDATE &&
-				e.details.relativePath === entry.details.relativePath
-		);
-		if (
-			candidate !== undefined &&
-			(this._entries[0] === candidate ||
-				candidate.timestamp.getTime() +
-					TIMEOUT_FOR_MERGING_HISTORY_ENTRIES_IN_SECONDS * 1000 >
-					entry.timestamp.getTime())
-		) {
-			return candidate;
-		}
-	}
+        const candidate = this._entries.find(
+            (e) =>
+                e.details.type === SyncType.UPDATE &&
+                e.details.relativePath === entry.details.relativePath
+        );
+        if (
+            candidate !== undefined &&
+            (this._entries[0] === candidate ||
+                candidate.timestamp.getTime() +
+                TIMEOUT_FOR_MERGING_HISTORY_ENTRIES_IN_SECONDS * 1000 >
+                entry.timestamp.getTime())
+        ) {
+            return candidate;
+        }
+    }
 
-	private updateSuccessCount(entry: HistoryEntry): void {
-		const message = `${entry.details.relativePath} - ${entry.message} (${entry.details.type.toLocaleLowerCase()})`;
-		switch (entry.status) {
-			case SyncStatus.SUCCESS:
-				this.status.success++;
-				this.logger.info(`History entry: ${message}`);
-				break;
-			case SyncStatus.ERROR:
-				this.status.error++;
-				this.logger.error(`Cannot sync file: ${message}`);
-				break;
-			case SyncStatus.SKIPPED:
-				this.logger.warn(`Skipping file: ${message}`);
-				break;
-		}
+    private updateSuccessCount(entry: HistoryEntry): void {
+        const message = `${entry.details.relativePath} - ${entry.message} (${entry.details.type.toLocaleLowerCase()})`;
+        switch (entry.status) {
+            case SyncStatus.SUCCESS:
+                this.status.success++;
+                this.logger.info(`History entry: ${message}`);
+                break;
+            case SyncStatus.ERROR:
+                this.status.error++;
+                this.logger.error(`Cannot sync file: ${message}`);
+                break;
+            case SyncStatus.SKIPPED:
+                this.logger.warn(`Skipping file: ${message}`);
+                break;
+        }
 
-		this.syncHistoryUpdateListeners.forEach((listener) => {
-			listener(this.status);
-		});
-	}
+        this.onHistoryUpdated.trigger(this.status);
+    }
 }
diff --git a/frontend/sync-client/src/utils/data-structures/event-listeners.test.ts b/frontend/sync-client/src/utils/data-structures/event-listeners.test.ts
new file mode 100644
index 00000000..c3e5a483
--- /dev/null
+++ b/frontend/sync-client/src/utils/data-structures/event-listeners.test.ts
@@ -0,0 +1,147 @@
+import { describe, it } from "node:test";
+import assert from "node:assert";
+import { EventListeners } from "./event-listeners";
+
+describe("EventListeners", () => {
+    it("should add & remove listeners", () => {
+        const listeners = new EventListeners<() => void>();
+        const listener = () => { };
+
+        listeners.add(listener);
+
+        assert.strictEqual(listeners.count, 1);
+
+        const removed = listeners.remove(listener);
+        assert.strictEqual(removed, true);
+        assert.strictEqual(listeners.count, 0);
+    });
+
+
+    it("should remove listeners using unsubscribe function", () => {
+        const listeners = new EventListeners<() => void>();
+        const listener = () => { };
+
+        const unsubscribe = listeners.add(listener);
+        unsubscribe();
+
+        assert.strictEqual(listeners.count, 0);
+    });
+
+    it("should return false when removing non-existent listener", () => {
+        const listeners = new EventListeners<() => void>();
+        const listener = () => { };
+
+        const removed = listeners.remove(listener);
+
+        assert.strictEqual(removed, false);
+    });
+
+    it("should handle multiple listeners", () => {
+        const listeners = new EventListeners<() => void>();
+        const listener1 = () => { };
+        const listener2 = () => { };
+        const listener3 = () => { };
+
+        listeners.add(listener1);
+        listeners.add(listener2);
+        listeners.add(listener3);
+
+        assert.strictEqual(listeners.count, 3);
+
+        listeners.remove(listener2);
+
+        assert.strictEqual(listeners.count, 2);
+    });
+
+    it("should trigger all listeners synchronously", () => {
+        const listeners = new EventListeners<(value: string) => void>();
+        const calls: string[] = [];
+
+        listeners.add((value) => calls.push(`listener1-${value}`));
+        listeners.add((value) => calls.push(`listener2-${value}`));
+
+        listeners.trigger("test");
+
+        assert.deepStrictEqual(calls, ["listener1-test", "listener2-test"]);
+    });
+
+    it("should trigger listeners with multiple arguments", () => {
+        const listeners = new EventListeners<
+            (a: number, b: string, c: boolean) => void
+        >();
+        const calls: [number, string, boolean][] = [];
+
+        listeners.add((a, b, c) => calls.push([a, b, c]));
+        listeners.trigger(42, "hello", true);
+
+        assert.deepStrictEqual(calls, [[42, "hello", true]]);
+    });
+
+    it("should not trigger removed listeners", () => {
+        const listeners = new EventListeners<() => void>();
+        let count1 = 0;
+        let count2 = 0;
+
+        const listener1 = () => {
+            count1++;
+        };
+        const listener2 = () => {
+            count2++;
+        };
+
+        listeners.add(listener1);
+        const unsubscribe = listeners.add(listener2);
+
+        unsubscribe();
+        listeners.trigger();
+
+        assert.strictEqual(count1, 1);
+        assert.strictEqual(count2, 0);
+    });
+
+    it("should trigger all listeners and await promises", async () => {
+        const listeners = new EventListeners<
+            (value: string) => Promise<void> | void
+        >();
+        const results: string[] = [];
+
+        listeners.add(async (value) => {
+            await new Promise((resolve) => setTimeout(resolve, 10));
+            results.push(`async1-${value}`);
+        });
+
+        listeners.add((value) => {
+            results.push(`sync-${value}`);
+        });
+
+        listeners.add(async (value) => {
+            await new Promise((resolve) => setTimeout(resolve, 5));
+            results.push(`async2-${value}`);
+        });
+
+        await listeners.triggerAsync("test");
+
+        assert.ok(results.includes("async1-test"));
+        assert.ok(results.includes("sync-test"));
+        assert.ok(results.includes("async2-test"));
+        assert.strictEqual(results.length, 3);
+    });
+
+
+
+    it("should not trigger cleared listeners", () => {
+        const listeners = new EventListeners<() => void>();
+        let called = false;
+        const listener = () => {
+            called = true;
+        };
+
+        listeners.add(listener);
+        listeners.clear();
+
+        assert.strictEqual(listeners.count, 0);
+        listeners.trigger();
+
+        assert.strictEqual(called, false);
+    });
+});
diff --git a/frontend/sync-client/src/utils/data-structures/event-listeners.ts b/frontend/sync-client/src/utils/data-structures/event-listeners.ts
new file mode 100644
index 00000000..25be5344
--- /dev/null
+++ b/frontend/sync-client/src/utils/data-structures/event-listeners.ts
@@ -0,0 +1,71 @@
+import { removeFromArray } from "../remove-from-array";
+import { awaitAll } from "../await-all";
+
+/**
+* A utility class for managing event listeners with type-safe add/remove operations.
+*/
+export class EventListeners<TListener extends (...args: any[]) => any> {
+    private readonly listeners: TListener[] = [];
+
+    /**
+     * Adds a new listener to the collection.
+     *
+     * @param listener The listener callback to add
+     * @returns An unsubscribe function that removes this listener when called
+     */
+    public add(listener: TListener): () => void {
+        this.listeners.push(listener);
+        return () => this.remove(listener);
+    }
+
+    /**
+     * Removes a listener from the collection.
+     *
+     * @param listener The listener callback to remove
+     * @returns true if the listener was found and removed, false otherwise
+     */
+    public remove(listener: TListener): boolean {
+        return removeFromArray(this.listeners, listener);
+    }
+
+    /**
+     * Triggers all listeners synchronously with the provided arguments.
+     * Any returned promises are ignored. Use triggerAsync() to await them.
+     *
+     * @param args The arguments to pass to each listener
+     */
+    public trigger(...args: Parameters<TListener>): void {
+        this.listeners.forEach((listener) => {
+            listener(...args);
+        });
+    }
+
+    /**
+     * Triggers all listeners and awaits any promises they return.
+     * Synchronous listeners are called immediately, and any async listeners
+     * are awaited in parallel.
+     *
+     * @param args The arguments to pass to each listener
+     */
+    public async triggerAsync(...args: Parameters<TListener>): Promise<void> {
+        await awaitAll(
+            this.listeners
+                .map((listener) => {
+                    return listener(...args);
+                })
+                .filter((result): result is Promise<unknown> => {
+                    return result instanceof Promise;
+                })
+        );
+    }
+
+    public clear(): void {
+        this.listeners.length = 0;
+    }
+
+    public get count(): number {
+        return this.listeners.length;
+    }
+
+
+}
diff --git a/frontend/sync-client/src/utils/debugging/log-to-console.ts b/frontend/sync-client/src/utils/debugging/log-to-console.ts
index 2d1a12e8..3499f029 100644
--- a/frontend/sync-client/src/utils/debugging/log-to-console.ts
+++ b/frontend/sync-client/src/utils/debugging/log-to-console.ts
@@ -3,7 +3,7 @@ import type { LogLine } from "../../tracing/logger";
 import { LogLevel } from "../../tracing/logger";
 
 export function logToConsole(client: SyncClient): void {
-	client.logger.addOnMessageListener((logLine: LogLine) => {
+	client.logger.onLogEmitted.add((logLine: LogLine) => {
 		const formatted = `${logLine.timestamp.toISOString()} ${logLine.level} ${logLine.message}`;
 
 		switch (logLine.level) {

From b05e415acfb088add39c2b327d0dd650129ce1b3 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 7 Dec 2025 13:38:23 +0000
Subject: [PATCH 724/761] Apply editorconfig

---
 CLAUDE.md                                     |     4 +-
 docs/.vitepress/config.mts                    |   112 +-
 docs/package-lock.json                        |  3590 ++---
 docs/package.json                             |     2 +-
 docs/public/logo.svg                          |    28 +-
 frontend/eslint.config.mjs                    |   174 +-
 frontend/local-client-cli/src/args.test.ts    |   358 +-
 frontend/local-client-cli/src/args.ts         |   232 +-
 frontend/local-client-cli/src/cli.ts          |   396 +-
 frontend/local-client-cli/src/healthcheck.ts  |    84 +-
 .../local-client-cli/src/logger-formatter.ts  |   104 +-
 .../src/node-filesystem.test.ts               |   206 +-
 .../local-client-cli/src/node-filesystem.ts   |   360 +-
 frontend/obsidian-plugin/.hotreload           |     1 +
 frontend/obsidian-plugin/README.md            |     5 -
 frontend/obsidian-plugin/manifest.json        |    18 +-
 .../src/obsidian-file-system.ts               |   272 +-
 .../src/views/cursors/file-explorer.scss      |     2 +-
 .../cursors/get-selections-from-editor.ts     |    18 +-
 .../cursors/local-cursor-update-listener.ts   |    76 +-
 .../src/views/cursors/remote-cursor-theme.ts  |    98 +-
 .../src/views/cursors/remote-cursor-widget.ts |    72 +-
 .../views/cursors/remote-cursors-plugin.ts    |   438 +-
 .../editor-status-display-manager.scss        |    70 +-
 .../editor-status-display-manager.ts          |   152 +-
 .../src/views/history/history-view.scss       |    98 +-
 .../src/views/history/history-view.ts         |   400 +-
 .../src/views/logs/logs-view.scss             |   120 +-
 .../src/views/logs/logs-view.ts               |   308 +-
 .../src/views/settings/settings-tab.scss      |   222 +-
 .../src/views/settings/settings-tab.ts        |  1002 +-
 .../src/views/status-bar/status-bar.scss      |    20 +-
 .../src/views/status-bar/status-bar.ts        |   112 +-
 .../status-description.scss                   |    44 +-
 .../status-description/status-description.ts  |   244 +-
 frontend/obsidian-plugin/webpack.config.js    |   216 +-
 frontend/package-lock.json                    | 12259 ++++++++++------
 frontend/package.json                         |    60 +-
 .../file-operations/file-not-found-error.ts   |    14 +-
 .../file-operations/file-operations.test.ts   |   390 +-
 .../src/file-operations/file-operations.ts    |   488 +-
 .../file-operations/filesystem-operations.ts  |    46 +-
 .../safe-filesystem-operations.ts             |   280 +-
 frontend/sync-client/src/index.ts             |    34 +-
 .../sync-client/src/persistence/database.ts   |   592 +-
 .../src/persistence/persistence.ts            |     4 +-
 .../src/services/authentication-error.ts      |     8 +-
 .../src/services/fetch-controller.test.ts     |   274 +-
 .../src/services/fetch-controller.ts          |   244 +-
 .../sync-client/src/services/server-config.ts |   130 +-
 .../services/server-version-mismatch-error.ts |     8 +-
 .../src/services/sync-reset-error.ts          |     8 +-
 .../sync-client/src/services/sync-service.ts  |   712 +-
 .../src/services/types/ClientCursors.ts       |     6 +-
 .../services/types/CreateDocumentVersion.ts   |    18 +-
 .../types/CursorPositionFromClient.ts         |     2 +-
 .../types/CursorPositionFromServer.ts         |     2 +-
 .../src/services/types/CursorSpan.ts          |     4 +-
 .../services/types/DeleteDocumentVersion.ts   |     2 +-
 .../services/types/DocumentUpdateResponse.ts  |     4 +-
 .../src/services/types/DocumentVersion.ts     |    16 +-
 .../types/DocumentVersionWithoutContent.ts    |    16 +-
 .../src/services/types/DocumentWithCursors.ts |     8 +-
 .../types/FetchLatestDocumentsResponse.ts     |    10 +-
 .../src/services/types/PingResponse.ts        |    36 +-
 .../src/services/types/SerializedError.ts     |     6 +-
 .../services/types/UpdateDocumentVersion.ts   |     6 +-
 .../types/UpdateTextDocumentVersion.ts        |     6 +-
 .../services/types/WebSocketClientMessage.ts  |     4 +-
 .../src/services/types/WebSocketHandshake.ts  |     6 +-
 .../services/types/WebSocketServerMessage.ts  |     4 +-
 .../services/types/WebSocketVaultUpdate.ts    |     4 +-
 .../src/services/websocket-manager.test.ts    |   448 +-
 frontend/sync-client/src/sync-client.ts       |    22 +-
 .../sync-client/src/sync-operations/syncer.ts |     8 +-
 .../sync-client/src/tracing/sync-history.ts   |    10 +-
 .../src/types/document-sync-status.ts         |     6 +-
 .../src/types/document-up-to-dateness.ts      |     6 +-
 .../types/maybe-outdated-client-cursors.ts    |     2 +-
 .../src/types/network-connection-status.ts    |     6 +-
 .../src/utils/assert-set-contains-exactly.ts  |    18 +-
 .../sync-client/src/utils/await-all.test.ts   |    68 +-
 frontend/sync-client/src/utils/await-all.ts   |    30 +-
 .../sync-client/src/utils/create-client-id.ts |    18 +-
 .../sync-client/src/utils/create-promise.ts   |    28 +-
 .../utils/data-structures/event-listeners.ts  |    42 +-
 .../data-structures/fix-sized-cache.test.ts   |   434 +-
 .../utils/data-structures/fix-sized-cache.ts  |   182 +-
 .../src/utils/data-structures/locks.test.ts   |   366 +-
 .../src/utils/data-structures/locks.ts        |   242 +-
 .../utils/data-structures/min-covered.test.ts |   128 +-
 .../src/utils/data-structures/min-covered.ts  |    72 +-
 .../src/utils/debugging/log-to-console.ts     |    34 +-
 .../src/utils/debugging/slow-fetch-factory.ts |    28 +-
 .../debugging/slow-web-socket-factory.ts      |   130 +-
 .../src/utils/find-matching-file.ts           |    12 +-
 .../sync-client/src/utils/get-random-color.ts |    14 +-
 .../src/utils/globs-to-regexes.test.ts        |    10 +-
 .../sync-client/src/utils/globs-to-regexes.ts |    32 +-
 frontend/sync-client/src/utils/hash.ts        |    14 +-
 frontend/sync-client/src/utils/is-binary.ts   |    22 +-
 .../src/utils/is-file-type-mergable.test.ts   |   126 +-
 .../src/utils/is-file-type-mergable.ts        |    10 +-
 .../utils/line-and-column-to-position.test.ts |    64 +-
 .../src/utils/line-and-column-to-position.ts  |    32 +-
 .../utils/position-to-line-and-column.test.ts |   146 +-
 .../src/utils/position-to-line-and-column.ts  |    34 +-
 .../sync-client/src/utils/rate-limit.test.ts  |    86 +-
 frontend/sync-client/src/utils/rate-limit.ts  |    76 +-
 .../sync-client/src/utils/set-up-telemetry.ts |    60 +-
 frontend/sync-client/src/utils/sleep.ts       |     2 +-
 frontend/sync-client/tsconfig.json            |    34 +-
 frontend/sync-client/webpack.config.js        |   122 +-
 frontend/test-client/src/agent/mock-agent.ts  |   612 +-
 frontend/test-client/src/agent/mock-client.ts |   330 +-
 frontend/test-client/src/cli.ts               |   290 +-
 frontend/test-client/src/utils/assert.ts      |     6 +-
 frontend/test-client/src/utils/choose.ts      |     2 +-
 .../src/utils/random-casing.test.ts           |    14 +-
 .../test-client/src/utils/random-casing.ts    |    16 +-
 frontend/test-client/src/utils/sleep.ts       |     2 +-
 .../test-client/src/utils/with-timeout.ts     |    26 +-
 frontend/test-client/tsconfig.json            |    32 +-
 frontend/test-client/webpack.config.js        |    50 +-
 manifest.json                                 |    18 +-
 scripts/build-sync-server-binaries.sh         |    16 +-
 sync-server/rust-toolchain.toml               |     4 +-
 sync-server/src/app_state/database.rs         |     4 +-
 sync-server/src/config/user_config.rs         |     2 +-
 .../src/server/fetch_document_version.rs      |     2 +-
 .../server/fetch_document_version_content.rs  |     2 +-
 131 files changed, 16404 insertions(+), 13617 deletions(-)

diff --git a/CLAUDE.md b/CLAUDE.md
index 6f1bff23..c77b091b 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -87,7 +87,7 @@ Rust structs generate TypeScript types via ts-rs crate, stored in `sync-server/b
 ## Testing
 
 ### Running Tests
-- Server: `cargo test --verbose` 
+- Server: `cargo test --verbose`
 - Frontend: `npm run test` (runs Jest across all workspaces)
 - E2E: `scripts/e2e.sh`
 
@@ -107,4 +107,4 @@ Rust structs generate TypeScript types via ts-rs crate, stored in `sync-server/b
 ### TypeScript
 - Prettier configuration: 4-space tabs, trailing commas removed, LF line endings
 - ESLint with unused imports plugin
-- Consistent across all three frontend packages
\ No newline at end of file
+- Consistent across all three frontend packages
diff --git a/docs/.vitepress/config.mts b/docs/.vitepress/config.mts
index d009127a..6428314e 100644
--- a/docs/.vitepress/config.mts
+++ b/docs/.vitepress/config.mts
@@ -1,60 +1,60 @@
 import { defineConfig } from "vitepress"
 
 export default defineConfig({
-	title: "VaultLink",
-	description: "Self-hosted real-time synchronisation for Obsidian",
-	base: "/vault-link/",
-	themeConfig: {
-		logo: "/logo.svg",
-		nav: [
-			{ text: "Home", link: "/" },
-			{ text: "Guide", link: "/guide/getting-started" },
-			{ text: "Architecture", link: "/architecture/" },
-			{ text: "GitHub", link: "https://github.com/schmelczer/vault-link" }
-		],
-		sidebar: [
-			{
-				text: "Introduction",
-				items: [
-					{ text: "What is VaultLink?", link: "/guide/what-is-vaultlink" },
-					{ text: "Getting Started", link: "/guide/getting-started" },
-					{ text: "Limitations", link: "/guide/limitations" },
-					{ text: "Comparison with Alternatives", link: "/guide/alternatives" }
-				]
-			},
-			{
-				text: "Setup",
-				items: [
-					{ text: "Server Setup", link: "/guide/server-setup" },
-					{ text: "Obsidian Plugin", link: "/guide/obsidian-plugin" },
-					{ text: "CLI Client", link: "/guide/cli-client" }
-				]
-			},
-			{
-				text: "Configuration",
-				items: [
-					{ text: "Server Configuration", link: "/config/server" },
-					{ text: "Authentication", link: "/config/authentication" },
-					{ text: "Advanced Options", link: "/config/advanced" }
-				]
-			},
-			{
-				text: "Architecture",
-				items: [
-					{ text: "Overview", link: "/architecture/" },
-					{ text: "Sync Algorithm", link: "/architecture/sync-algorithm" },
-					{ text: "Data Flow", link: "/architecture/data-flow" }
-				]
-			}
-		],
-		socialLinks: [{ icon: "github", link: "https://github.com/schmelczer/vault-link" }],
-		footer: {
-			message: "Released under the MIT License.",
-			copyright: "Copyright © 2024-present Andras Schmelczer"
-		},
-		search: {
-			provider: "local"
-		}
-	},
-	head: [["link", { rel: "icon", type: "image/svg+xml", href: "/vault-link/logo.svg" }]]
+    title: "VaultLink",
+    description: "Self-hosted real-time synchronisation for Obsidian",
+    base: "/vault-link/",
+    themeConfig: {
+        logo: "/logo.svg",
+        nav: [
+            { text: "Home", link: "/" },
+            { text: "Guide", link: "/guide/getting-started" },
+            { text: "Architecture", link: "/architecture/" },
+            { text: "GitHub", link: "https://github.com/schmelczer/vault-link" }
+        ],
+        sidebar: [
+            {
+                text: "Introduction",
+                items: [
+                    { text: "What is VaultLink?", link: "/guide/what-is-vaultlink" },
+                    { text: "Getting Started", link: "/guide/getting-started" },
+                    { text: "Limitations", link: "/guide/limitations" },
+                    { text: "Comparison with Alternatives", link: "/guide/alternatives" }
+                ]
+            },
+            {
+                text: "Setup",
+                items: [
+                    { text: "Server Setup", link: "/guide/server-setup" },
+                    { text: "Obsidian Plugin", link: "/guide/obsidian-plugin" },
+                    { text: "CLI Client", link: "/guide/cli-client" }
+                ]
+            },
+            {
+                text: "Configuration",
+                items: [
+                    { text: "Server Configuration", link: "/config/server" },
+                    { text: "Authentication", link: "/config/authentication" },
+                    { text: "Advanced Options", link: "/config/advanced" }
+                ]
+            },
+            {
+                text: "Architecture",
+                items: [
+                    { text: "Overview", link: "/architecture/" },
+                    { text: "Sync Algorithm", link: "/architecture/sync-algorithm" },
+                    { text: "Data Flow", link: "/architecture/data-flow" }
+                ]
+            }
+        ],
+        socialLinks: [{ icon: "github", link: "https://github.com/schmelczer/vault-link" }],
+        footer: {
+            message: "Released under the MIT License.",
+            copyright: "Copyright © 2024-present Andras Schmelczer"
+        },
+        search: {
+            provider: "local"
+        }
+    },
+    head: [["link", { rel: "icon", type: "image/svg+xml", href: "/vault-link/logo.svg" }]]
 })
diff --git a/docs/package-lock.json b/docs/package-lock.json
index ee287688..dcd4f3b0 100644
--- a/docs/package-lock.json
+++ b/docs/package-lock.json
@@ -5,332 +5,332 @@
   "requires": true,
   "packages": {
     "": {
-      "name": "docs",
-      "version": "1.0.0",
-      "license": "ISC",
-      "devDependencies": {
+    "name": "docs",
+    "version": "1.0.0",
+    "license": "ISC",
+    "devDependencies": {
         "@cspell/dict-en-gb": "^5.0.19",
         "cspell": "^9.3.2",
         "prettier": "^3.6.2",
         "vitepress": "^1.6.4",
         "vue": "^3.5.24"
-      }
+    }
     },
     "node_modules/@algolia/abtesting": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/@algolia/abtesting/-/abtesting-1.10.0.tgz",
-      "integrity": "sha512-mQT3jwuTgX8QMoqbIR7mPlWkqQqBPQaPabQzm37xg2txMlaMogK/4hCiiESGdg39MlHZOVHeV+0VJuE7f5UK8A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "1.10.0",
+    "resolved": "https://registry.npmjs.org/@algolia/abtesting/-/abtesting-1.10.0.tgz",
+    "integrity": "sha512-mQT3jwuTgX8QMoqbIR7mPlWkqQqBPQaPabQzm37xg2txMlaMogK/4hCiiESGdg39MlHZOVHeV+0VJuE7f5UK8A==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@algolia/client-common": "5.44.0",
         "@algolia/requester-browser-xhr": "5.44.0",
         "@algolia/requester-fetch": "5.44.0",
         "@algolia/requester-node-http": "5.44.0"
-      },
-      "engines": {
+    },
+    "engines": {
         "node": ">= 14.0.0"
-      }
+    }
     },
     "node_modules/@algolia/autocomplete-core": {
-      "version": "1.17.7",
-      "resolved": "https://registry.npmjs.org/@algolia/autocomplete-core/-/autocomplete-core-1.17.7.tgz",
-      "integrity": "sha512-BjiPOW6ks90UKl7TwMv7oNQMnzU+t/wk9mgIDi6b1tXpUek7MW0lbNOUHpvam9pe3lVCf4xPFT+lK7s+e+fs7Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "1.17.7",
+    "resolved": "https://registry.npmjs.org/@algolia/autocomplete-core/-/autocomplete-core-1.17.7.tgz",
+    "integrity": "sha512-BjiPOW6ks90UKl7TwMv7oNQMnzU+t/wk9mgIDi6b1tXpUek7MW0lbNOUHpvam9pe3lVCf4xPFT+lK7s+e+fs7Q==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@algolia/autocomplete-plugin-algolia-insights": "1.17.7",
         "@algolia/autocomplete-shared": "1.17.7"
-      }
+    }
     },
     "node_modules/@algolia/autocomplete-plugin-algolia-insights": {
-      "version": "1.17.7",
-      "resolved": "https://registry.npmjs.org/@algolia/autocomplete-plugin-algolia-insights/-/autocomplete-plugin-algolia-insights-1.17.7.tgz",
-      "integrity": "sha512-Jca5Ude6yUOuyzjnz57og7Et3aXjbwCSDf/8onLHSQgw1qW3ALl9mrMWaXb5FmPVkV3EtkD2F/+NkT6VHyPu9A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "1.17.7",
+    "resolved": "https://registry.npmjs.org/@algolia/autocomplete-plugin-algolia-insights/-/autocomplete-plugin-algolia-insights-1.17.7.tgz",
+    "integrity": "sha512-Jca5Ude6yUOuyzjnz57og7Et3aXjbwCSDf/8onLHSQgw1qW3ALl9mrMWaXb5FmPVkV3EtkD2F/+NkT6VHyPu9A==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@algolia/autocomplete-shared": "1.17.7"
-      },
-      "peerDependencies": {
+    },
+    "peerDependencies": {
         "search-insights": ">= 1 < 3"
-      }
+    }
     },
     "node_modules/@algolia/autocomplete-preset-algolia": {
-      "version": "1.17.7",
-      "resolved": "https://registry.npmjs.org/@algolia/autocomplete-preset-algolia/-/autocomplete-preset-algolia-1.17.7.tgz",
-      "integrity": "sha512-ggOQ950+nwbWROq2MOCIL71RE0DdQZsceqrg32UqnhDz8FlO9rL8ONHNsI2R1MH0tkgVIDKI/D0sMiUchsFdWA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "1.17.7",
+    "resolved": "https://registry.npmjs.org/@algolia/autocomplete-preset-algolia/-/autocomplete-preset-algolia-1.17.7.tgz",
+    "integrity": "sha512-ggOQ950+nwbWROq2MOCIL71RE0DdQZsceqrg32UqnhDz8FlO9rL8ONHNsI2R1MH0tkgVIDKI/D0sMiUchsFdWA==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@algolia/autocomplete-shared": "1.17.7"
-      },
-      "peerDependencies": {
+    },
+    "peerDependencies": {
         "@algolia/client-search": ">= 4.9.1 < 6",
         "algoliasearch": ">= 4.9.1 < 6"
-      }
+    }
     },
     "node_modules/@algolia/autocomplete-shared": {
-      "version": "1.17.7",
-      "resolved": "https://registry.npmjs.org/@algolia/autocomplete-shared/-/autocomplete-shared-1.17.7.tgz",
-      "integrity": "sha512-o/1Vurr42U/qskRSuhBH+VKxMvkkUVTLU6WZQr+L5lGZZLYWyhdzWjW0iGXY7EkwRTjBqvN2EsR81yCTGV/kmg==",
-      "dev": true,
-      "license": "MIT",
-      "peerDependencies": {
+    "version": "1.17.7",
+    "resolved": "https://registry.npmjs.org/@algolia/autocomplete-shared/-/autocomplete-shared-1.17.7.tgz",
+    "integrity": "sha512-o/1Vurr42U/qskRSuhBH+VKxMvkkUVTLU6WZQr+L5lGZZLYWyhdzWjW0iGXY7EkwRTjBqvN2EsR81yCTGV/kmg==",
+    "dev": true,
+    "license": "MIT",
+    "peerDependencies": {
         "@algolia/client-search": ">= 4.9.1 < 6",
         "algoliasearch": ">= 4.9.1 < 6"
-      }
+    }
     },
     "node_modules/@algolia/client-abtesting": {
-      "version": "5.44.0",
-      "resolved": "https://registry.npmjs.org/@algolia/client-abtesting/-/client-abtesting-5.44.0.tgz",
-      "integrity": "sha512-KY5CcrWhRTUo/lV7KcyjrZkPOOF9bjgWpMj9z98VA+sXzVpZtkuskBLCKsWYFp2sbwchZFTd3wJM48H0IGgF7g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "5.44.0",
+    "resolved": "https://registry.npmjs.org/@algolia/client-abtesting/-/client-abtesting-5.44.0.tgz",
+    "integrity": "sha512-KY5CcrWhRTUo/lV7KcyjrZkPOOF9bjgWpMj9z98VA+sXzVpZtkuskBLCKsWYFp2sbwchZFTd3wJM48H0IGgF7g==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@algolia/client-common": "5.44.0",
         "@algolia/requester-browser-xhr": "5.44.0",
         "@algolia/requester-fetch": "5.44.0",
         "@algolia/requester-node-http": "5.44.0"
-      },
-      "engines": {
+    },
+    "engines": {
         "node": ">= 14.0.0"
-      }
+    }
     },
     "node_modules/@algolia/client-analytics": {
-      "version": "5.44.0",
-      "resolved": "https://registry.npmjs.org/@algolia/client-analytics/-/client-analytics-5.44.0.tgz",
-      "integrity": "sha512-LKOCE8S4ewI9bN3ot9RZoYASPi8b78E918/DVPW3HHjCMUe6i+NjbNG6KotU4RpP6AhRWZjjswbOkWelUO+OoA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "5.44.0",
+    "resolved": "https://registry.npmjs.org/@algolia/client-analytics/-/client-analytics-5.44.0.tgz",
+    "integrity": "sha512-LKOCE8S4ewI9bN3ot9RZoYASPi8b78E918/DVPW3HHjCMUe6i+NjbNG6KotU4RpP6AhRWZjjswbOkWelUO+OoA==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@algolia/client-common": "5.44.0",
         "@algolia/requester-browser-xhr": "5.44.0",
         "@algolia/requester-fetch": "5.44.0",
         "@algolia/requester-node-http": "5.44.0"
-      },
-      "engines": {
+    },
+    "engines": {
         "node": ">= 14.0.0"
-      }
+    }
     },
     "node_modules/@algolia/client-common": {
-      "version": "5.44.0",
-      "resolved": "https://registry.npmjs.org/@algolia/client-common/-/client-common-5.44.0.tgz",
-      "integrity": "sha512-1yyJm4OYC2cztbS28XYVWwLXdwpLsMG4LoZLOltVglQ2+hc/i9q9fUDZyjRa2Bqt4DmkIfezagfMrokhyH4uxQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
+    "version": "5.44.0",
+    "resolved": "https://registry.npmjs.org/@algolia/client-common/-/client-common-5.44.0.tgz",
+    "integrity": "sha512-1yyJm4OYC2cztbS28XYVWwLXdwpLsMG4LoZLOltVglQ2+hc/i9q9fUDZyjRa2Bqt4DmkIfezagfMrokhyH4uxQ==",
+    "dev": true,
+    "license": "MIT",
+    "engines": {
         "node": ">= 14.0.0"
-      }
+    }
     },
     "node_modules/@algolia/client-insights": {
-      "version": "5.44.0",
-      "resolved": "https://registry.npmjs.org/@algolia/client-insights/-/client-insights-5.44.0.tgz",
-      "integrity": "sha512-wVQWK6jYYsbEOjIMI+e5voLGPUIbXrvDj392IckXaCPvQ6vCMTXakQqOYCd+znQdL76S+3wHDo77HZWiAYKrtA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "5.44.0",
+    "resolved": "https://registry.npmjs.org/@algolia/client-insights/-/client-insights-5.44.0.tgz",
+    "integrity": "sha512-wVQWK6jYYsbEOjIMI+e5voLGPUIbXrvDj392IckXaCPvQ6vCMTXakQqOYCd+znQdL76S+3wHDo77HZWiAYKrtA==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@algolia/client-common": "5.44.0",
         "@algolia/requester-browser-xhr": "5.44.0",
         "@algolia/requester-fetch": "5.44.0",
         "@algolia/requester-node-http": "5.44.0"
-      },
-      "engines": {
+    },
+    "engines": {
         "node": ">= 14.0.0"
-      }
+    }
     },
     "node_modules/@algolia/client-personalization": {
-      "version": "5.44.0",
-      "resolved": "https://registry.npmjs.org/@algolia/client-personalization/-/client-personalization-5.44.0.tgz",
-      "integrity": "sha512-lkgRjOjOkqmIkebHjHpU9rLJcJNUDMm+eVSW/KJQYLjGqykEZxal+nYJJTBbLceEU2roByP/+27ZmgIwCdf0iA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "5.44.0",
+    "resolved": "https://registry.npmjs.org/@algolia/client-personalization/-/client-personalization-5.44.0.tgz",
+    "integrity": "sha512-lkgRjOjOkqmIkebHjHpU9rLJcJNUDMm+eVSW/KJQYLjGqykEZxal+nYJJTBbLceEU2roByP/+27ZmgIwCdf0iA==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@algolia/client-common": "5.44.0",
         "@algolia/requester-browser-xhr": "5.44.0",
         "@algolia/requester-fetch": "5.44.0",
         "@algolia/requester-node-http": "5.44.0"
-      },
-      "engines": {
+    },
+    "engines": {
         "node": ">= 14.0.0"
-      }
+    }
     },
     "node_modules/@algolia/client-query-suggestions": {
-      "version": "5.44.0",
-      "resolved": "https://registry.npmjs.org/@algolia/client-query-suggestions/-/client-query-suggestions-5.44.0.tgz",
-      "integrity": "sha512-sYfhgwKu6NDVmZHL1WEKVLsOx/jUXCY4BHKLUOcYa8k4COCs6USGgz6IjFkUf+niwq8NCECMmTC4o/fVQOalsA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "5.44.0",
+    "resolved": "https://registry.npmjs.org/@algolia/client-query-suggestions/-/client-query-suggestions-5.44.0.tgz",
+    "integrity": "sha512-sYfhgwKu6NDVmZHL1WEKVLsOx/jUXCY4BHKLUOcYa8k4COCs6USGgz6IjFkUf+niwq8NCECMmTC4o/fVQOalsA==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@algolia/client-common": "5.44.0",
         "@algolia/requester-browser-xhr": "5.44.0",
         "@algolia/requester-fetch": "5.44.0",
         "@algolia/requester-node-http": "5.44.0"
-      },
-      "engines": {
+    },
+    "engines": {
         "node": ">= 14.0.0"
-      }
+    }
     },
     "node_modules/@algolia/client-search": {
-      "version": "5.44.0",
-      "resolved": "https://registry.npmjs.org/@algolia/client-search/-/client-search-5.44.0.tgz",
-      "integrity": "sha512-/FRKUM1G4xn3vV8+9xH1WJ9XknU8rkBGlefruq9jDhYUAvYozKimhrmC2pRqw/RyHhPivmgZCRuC8jHP8piz4Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "5.44.0",
+    "resolved": "https://registry.npmjs.org/@algolia/client-search/-/client-search-5.44.0.tgz",
+    "integrity": "sha512-/FRKUM1G4xn3vV8+9xH1WJ9XknU8rkBGlefruq9jDhYUAvYozKimhrmC2pRqw/RyHhPivmgZCRuC8jHP8piz4Q==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@algolia/client-common": "5.44.0",
         "@algolia/requester-browser-xhr": "5.44.0",
         "@algolia/requester-fetch": "5.44.0",
         "@algolia/requester-node-http": "5.44.0"
-      },
-      "engines": {
+    },
+    "engines": {
         "node": ">= 14.0.0"
-      }
+    }
     },
     "node_modules/@algolia/ingestion": {
-      "version": "1.44.0",
-      "resolved": "https://registry.npmjs.org/@algolia/ingestion/-/ingestion-1.44.0.tgz",
-      "integrity": "sha512-5+S5ynwMmpTpCLXGjTDpeIa81J+R4BLH0lAojOhmeGSeGEHQTqacl/4sbPyDTcidvnWhaqtyf8m42ue6lvISAw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "1.44.0",
+    "resolved": "https://registry.npmjs.org/@algolia/ingestion/-/ingestion-1.44.0.tgz",
+    "integrity": "sha512-5+S5ynwMmpTpCLXGjTDpeIa81J+R4BLH0lAojOhmeGSeGEHQTqacl/4sbPyDTcidvnWhaqtyf8m42ue6lvISAw==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@algolia/client-common": "5.44.0",
         "@algolia/requester-browser-xhr": "5.44.0",
         "@algolia/requester-fetch": "5.44.0",
         "@algolia/requester-node-http": "5.44.0"
-      },
-      "engines": {
+    },
+    "engines": {
         "node": ">= 14.0.0"
-      }
+    }
     },
     "node_modules/@algolia/monitoring": {
-      "version": "1.44.0",
-      "resolved": "https://registry.npmjs.org/@algolia/monitoring/-/monitoring-1.44.0.tgz",
-      "integrity": "sha512-xhaTN8pXJjR6zkrecg4Cc9YZaQK2LKm2R+LkbAq+AYGBCWJxtSGlNwftozZzkUyq4AXWoyoc0x2SyBtq5LRtqQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "1.44.0",
+    "resolved": "https://registry.npmjs.org/@algolia/monitoring/-/monitoring-1.44.0.tgz",
+    "integrity": "sha512-xhaTN8pXJjR6zkrecg4Cc9YZaQK2LKm2R+LkbAq+AYGBCWJxtSGlNwftozZzkUyq4AXWoyoc0x2SyBtq5LRtqQ==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@algolia/client-common": "5.44.0",
         "@algolia/requester-browser-xhr": "5.44.0",
         "@algolia/requester-fetch": "5.44.0",
         "@algolia/requester-node-http": "5.44.0"
-      },
-      "engines": {
+    },
+    "engines": {
         "node": ">= 14.0.0"
-      }
+    }
     },
     "node_modules/@algolia/recommend": {
-      "version": "5.44.0",
-      "resolved": "https://registry.npmjs.org/@algolia/recommend/-/recommend-5.44.0.tgz",
-      "integrity": "sha512-GNcite/uOIS7wgRU1MT7SdNIupGSW+vbK9igIzMePvD2Dl8dy0O3urKPKIbTuZQqiVH1Cb84y5cgLvwNrdCj/Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "5.44.0",
+    "resolved": "https://registry.npmjs.org/@algolia/recommend/-/recommend-5.44.0.tgz",
+    "integrity": "sha512-GNcite/uOIS7wgRU1MT7SdNIupGSW+vbK9igIzMePvD2Dl8dy0O3urKPKIbTuZQqiVH1Cb84y5cgLvwNrdCj/Q==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@algolia/client-common": "5.44.0",
         "@algolia/requester-browser-xhr": "5.44.0",
         "@algolia/requester-fetch": "5.44.0",
         "@algolia/requester-node-http": "5.44.0"
-      },
-      "engines": {
+    },
+    "engines": {
         "node": ">= 14.0.0"
-      }
+    }
     },
     "node_modules/@algolia/requester-browser-xhr": {
-      "version": "5.44.0",
-      "resolved": "https://registry.npmjs.org/@algolia/requester-browser-xhr/-/requester-browser-xhr-5.44.0.tgz",
-      "integrity": "sha512-YZHBk72Cd7pcuNHzbhNzF/FbbYszlc7JhZlDyQAchnX5S7tcemSS96F39Sy8t4O4WQLpFvUf1MTNedlitWdOsQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "5.44.0",
+    "resolved": "https://registry.npmjs.org/@algolia/requester-browser-xhr/-/requester-browser-xhr-5.44.0.tgz",
+    "integrity": "sha512-YZHBk72Cd7pcuNHzbhNzF/FbbYszlc7JhZlDyQAchnX5S7tcemSS96F39Sy8t4O4WQLpFvUf1MTNedlitWdOsQ==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@algolia/client-common": "5.44.0"
-      },
-      "engines": {
+    },
+    "engines": {
         "node": ">= 14.0.0"
-      }
+    }
     },
     "node_modules/@algolia/requester-fetch": {
-      "version": "5.44.0",
-      "resolved": "https://registry.npmjs.org/@algolia/requester-fetch/-/requester-fetch-5.44.0.tgz",
-      "integrity": "sha512-B9WHl+wQ7uf46t9cq+vVM/ypVbOeuldVDq9OtKsX2ApL2g/htx6ImB9ugDOOJmB5+fE31/XPTuCcYz/j03+idA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "5.44.0",
+    "resolved": "https://registry.npmjs.org/@algolia/requester-fetch/-/requester-fetch-5.44.0.tgz",
+    "integrity": "sha512-B9WHl+wQ7uf46t9cq+vVM/ypVbOeuldVDq9OtKsX2ApL2g/htx6ImB9ugDOOJmB5+fE31/XPTuCcYz/j03+idA==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@algolia/client-common": "5.44.0"
-      },
-      "engines": {
+    },
+    "engines": {
         "node": ">= 14.0.0"
-      }
+    }
     },
     "node_modules/@algolia/requester-node-http": {
-      "version": "5.44.0",
-      "resolved": "https://registry.npmjs.org/@algolia/requester-node-http/-/requester-node-http-5.44.0.tgz",
-      "integrity": "sha512-MULm0qeAIk4cdzZ/ehJnl1o7uB5NMokg83/3MKhPq0Pk7+I0uELGNbzIfAkvkKKEYcHALemKdArtySF9eKzh/A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "5.44.0",
+    "resolved": "https://registry.npmjs.org/@algolia/requester-node-http/-/requester-node-http-5.44.0.tgz",
+    "integrity": "sha512-MULm0qeAIk4cdzZ/ehJnl1o7uB5NMokg83/3MKhPq0Pk7+I0uELGNbzIfAkvkKKEYcHALemKdArtySF9eKzh/A==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@algolia/client-common": "5.44.0"
-      },
-      "engines": {
+    },
+    "engines": {
         "node": ">= 14.0.0"
-      }
+    }
     },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz",
-      "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
+    "version": "7.27.1",
+    "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz",
+    "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==",
+    "dev": true,
+    "license": "MIT",
+    "engines": {
         "node": ">=6.9.0"
-      }
+    }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.28.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz",
-      "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
+    "version": "7.28.5",
+    "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz",
+    "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==",
+    "dev": true,
+    "license": "MIT",
+    "engines": {
         "node": ">=6.9.0"
-      }
+    }
     },
     "node_modules/@babel/parser": {
-      "version": "7.28.5",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.5.tgz",
-      "integrity": "sha512-KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "7.28.5",
+    "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.5.tgz",
+    "integrity": "sha512-KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@babel/types": "^7.28.5"
-      },
-      "bin": {
+    },
+    "bin": {
         "parser": "bin/babel-parser.js"
-      },
-      "engines": {
+    },
+    "engines": {
         "node": ">=6.0.0"
-      }
+    }
     },
     "node_modules/@babel/types": {
-      "version": "7.28.5",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.5.tgz",
-      "integrity": "sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "7.28.5",
+    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.5.tgz",
+    "integrity": "sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@babel/helper-string-parser": "^7.27.1",
         "@babel/helper-validator-identifier": "^7.28.5"
-      },
-      "engines": {
+    },
+    "engines": {
         "node": ">=6.9.0"
-      }
+    }
     },
     "node_modules/@cspell/cspell-bundled-dicts": {
-      "version": "9.3.2",
-      "resolved": "https://registry.npmjs.org/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-9.3.2.tgz",
-      "integrity": "sha512-OmKzq/0FATHU671GKMzBrTyLdm25Wnziva7h4ylumVn1wnwWsXGef5bgXD7iuApqfqH9SzxsU0NtTB8m8vwEHQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "9.3.2",
+    "resolved": "https://registry.npmjs.org/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-9.3.2.tgz",
+    "integrity": "sha512-OmKzq/0FATHU671GKMzBrTyLdm25Wnziva7h4ylumVn1wnwWsXGef5bgXD7iuApqfqH9SzxsU0NtTB8m8vwEHQ==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@cspell/dict-ada": "^4.1.1",
         "@cspell/dict-al": "^1.1.1",
         "@cspell/dict-aws": "^4.0.16",
@@ -390,869 +390,869 @@
         "@cspell/dict-typescript": "^3.2.3",
         "@cspell/dict-vue": "^3.0.5",
         "@cspell/dict-zig": "^1.0.0"
-      },
-      "engines": {
+    },
+    "engines": {
         "node": ">=20"
-      }
+    }
     },
     "node_modules/@cspell/cspell-json-reporter": {
-      "version": "9.3.2",
-      "resolved": "https://registry.npmjs.org/@cspell/cspell-json-reporter/-/cspell-json-reporter-9.3.2.tgz",
-      "integrity": "sha512-YRgpeHN9uY8kUlIw9q+8zJ0tRTAJMbfBTGzCq9Puah09NeMWlRMFPUkXVrkdic6NA7etboZ+zEdoZwRO9EmhiA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "9.3.2",
+    "resolved": "https://registry.npmjs.org/@cspell/cspell-json-reporter/-/cspell-json-reporter-9.3.2.tgz",
+    "integrity": "sha512-YRgpeHN9uY8kUlIw9q+8zJ0tRTAJMbfBTGzCq9Puah09NeMWlRMFPUkXVrkdic6NA7etboZ+zEdoZwRO9EmhiA==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@cspell/cspell-types": "9.3.2"
-      },
-      "engines": {
+    },
+    "engines": {
         "node": ">=20"
-      }
+    }
     },
     "node_modules/@cspell/cspell-pipe": {
-      "version": "9.3.2",
-      "resolved": "https://registry.npmjs.org/@cspell/cspell-pipe/-/cspell-pipe-9.3.2.tgz",
-      "integrity": "sha512-REF7ibG79WLEynIMUss/IRDCdYEb1nlE1rj/gt2CbPFzLa6t5MRwW2lajEvXS6/WgbMtsTVHAWi3ALqJzCwxng==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
+    "version": "9.3.2",
+    "resolved": "https://registry.npmjs.org/@cspell/cspell-pipe/-/cspell-pipe-9.3.2.tgz",
+    "integrity": "sha512-REF7ibG79WLEynIMUss/IRDCdYEb1nlE1rj/gt2CbPFzLa6t5MRwW2lajEvXS6/WgbMtsTVHAWi3ALqJzCwxng==",
+    "dev": true,
+    "license": "MIT",
+    "engines": {
         "node": ">=20"
-      }
+    }
     },
     "node_modules/@cspell/cspell-resolver": {
-      "version": "9.3.2",
-      "resolved": "https://registry.npmjs.org/@cspell/cspell-resolver/-/cspell-resolver-9.3.2.tgz",
-      "integrity": "sha512-jLN2Aa/vxm8+IBvTd884SwPEfjxnDwIEPBT3hmqgLlKuUHQ3FMG27lsM4Ik9L2KWBXMgV/wGz4BaxfhKI41Ttw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "9.3.2",
+    "resolved": "https://registry.npmjs.org/@cspell/cspell-resolver/-/cspell-resolver-9.3.2.tgz",
+    "integrity": "sha512-jLN2Aa/vxm8+IBvTd884SwPEfjxnDwIEPBT3hmqgLlKuUHQ3FMG27lsM4Ik9L2KWBXMgV/wGz4BaxfhKI41Ttw==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "global-directory": "^4.0.1"
-      },
-      "engines": {
+    },
+    "engines": {
         "node": ">=20"
-      }
+    }
     },
     "node_modules/@cspell/cspell-service-bus": {
-      "version": "9.3.2",
-      "resolved": "https://registry.npmjs.org/@cspell/cspell-service-bus/-/cspell-service-bus-9.3.2.tgz",
-      "integrity": "sha512-/rB8LazM0JzKL+AvZa5fEpLutmwy5QFMpzw8HJd+rDGkzb5r79hURWSRo84QArgaskUqA9XlOHSieDE9pt+WAA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
+    "version": "9.3.2",
+    "resolved": "https://registry.npmjs.org/@cspell/cspell-service-bus/-/cspell-service-bus-9.3.2.tgz",
+    "integrity": "sha512-/rB8LazM0JzKL+AvZa5fEpLutmwy5QFMpzw8HJd+rDGkzb5r79hURWSRo84QArgaskUqA9XlOHSieDE9pt+WAA==",
+    "dev": true,
+    "license": "MIT",
+    "engines": {
         "node": ">=20"
-      }
+    }
     },
     "node_modules/@cspell/cspell-types": {
-      "version": "9.3.2",
-      "resolved": "https://registry.npmjs.org/@cspell/cspell-types/-/cspell-types-9.3.2.tgz",
-      "integrity": "sha512-l4H8bMAmdzCbXHO8y1JZiAKszrPEiuLFKWrbhCacHF0iP+PIc/yuQp7cO70m0p70vArRfih6kgGyHFaCy47CfA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
+    "version": "9.3.2",
+    "resolved": "https://registry.npmjs.org/@cspell/cspell-types/-/cspell-types-9.3.2.tgz",
+    "integrity": "sha512-l4H8bMAmdzCbXHO8y1JZiAKszrPEiuLFKWrbhCacHF0iP+PIc/yuQp7cO70m0p70vArRfih6kgGyHFaCy47CfA==",
+    "dev": true,
+    "license": "MIT",
+    "engines": {
         "node": ">=20"
-      }
+    }
     },
     "node_modules/@cspell/dict-ada": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-ada/-/dict-ada-4.1.1.tgz",
-      "integrity": "sha512-E+0YW9RhZod/9Qy2gxfNZiHJjCYFlCdI69br1eviQQWB8yOTJX0JHXLs79kOYhSW0kINPVUdvddEBe6Lu6CjGQ==",
-      "dev": true,
-      "license": "MIT"
+    "version": "4.1.1",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-ada/-/dict-ada-4.1.1.tgz",
+    "integrity": "sha512-E+0YW9RhZod/9Qy2gxfNZiHJjCYFlCdI69br1eviQQWB8yOTJX0JHXLs79kOYhSW0kINPVUdvddEBe6Lu6CjGQ==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@cspell/dict-al": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-al/-/dict-al-1.1.1.tgz",
-      "integrity": "sha512-sD8GCaZetgQL4+MaJLXqbzWcRjfKVp8x+px3HuCaaiATAAtvjwUQ5/Iubiqwfd1boIh2Y1/3EgM3TLQ7Q8e0wQ==",
-      "dev": true,
-      "license": "MIT"
+    "version": "1.1.1",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-al/-/dict-al-1.1.1.tgz",
+    "integrity": "sha512-sD8GCaZetgQL4+MaJLXqbzWcRjfKVp8x+px3HuCaaiATAAtvjwUQ5/Iubiqwfd1boIh2Y1/3EgM3TLQ7Q8e0wQ==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@cspell/dict-aws": {
-      "version": "4.0.16",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-aws/-/dict-aws-4.0.16.tgz",
-      "integrity": "sha512-a681zShZbtTo947NvTYGLer95ZDQw1ROKvIFydak1e0OlfFCsNdtcYTupn0nbbYs53c9AO7G2DU8AcNEAnwXPA==",
-      "dev": true,
-      "license": "MIT"
+    "version": "4.0.16",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-aws/-/dict-aws-4.0.16.tgz",
+    "integrity": "sha512-a681zShZbtTo947NvTYGLer95ZDQw1ROKvIFydak1e0OlfFCsNdtcYTupn0nbbYs53c9AO7G2DU8AcNEAnwXPA==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@cspell/dict-bash": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-bash/-/dict-bash-4.2.2.tgz",
-      "integrity": "sha512-kyWbwtX3TsCf5l49gGQIZkRLaB/P8g73GDRm41Zu8Mv51kjl2H7Au0TsEvHv7jzcsRLS6aUYaZv6Zsvk1fOz+Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "4.2.2",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-bash/-/dict-bash-4.2.2.tgz",
+    "integrity": "sha512-kyWbwtX3TsCf5l49gGQIZkRLaB/P8g73GDRm41Zu8Mv51kjl2H7Au0TsEvHv7jzcsRLS6aUYaZv6Zsvk1fOz+Q==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@cspell/dict-shell": "1.1.2"
-      }
+    }
     },
     "node_modules/@cspell/dict-companies": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-companies/-/dict-companies-3.2.7.tgz",
-      "integrity": "sha512-fEyr3LmpFKTaD0LcRhB4lfW1AmULYBqzg4gWAV0dQCv06l+TsA+JQ+3pZJbUcoaZirtgsgT3dL3RUjmGPhUH0A==",
-      "dev": true,
-      "license": "MIT"
+    "version": "3.2.7",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-companies/-/dict-companies-3.2.7.tgz",
+    "integrity": "sha512-fEyr3LmpFKTaD0LcRhB4lfW1AmULYBqzg4gWAV0dQCv06l+TsA+JQ+3pZJbUcoaZirtgsgT3dL3RUjmGPhUH0A==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@cspell/dict-cpp": {
-      "version": "6.0.14",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-cpp/-/dict-cpp-6.0.14.tgz",
-      "integrity": "sha512-dkmpSwvVfVdtoZ4mW/CK2Ep1v8mJlp6uiKpMNbSMOdJl4kq28nQS4vKNIX3B2bJa0Ha5iHHu+1mNjiLeO3g7Xg==",
-      "dev": true,
-      "license": "MIT"
+    "version": "6.0.14",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-cpp/-/dict-cpp-6.0.14.tgz",
+    "integrity": "sha512-dkmpSwvVfVdtoZ4mW/CK2Ep1v8mJlp6uiKpMNbSMOdJl4kq28nQS4vKNIX3B2bJa0Ha5iHHu+1mNjiLeO3g7Xg==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@cspell/dict-cryptocurrencies": {
-      "version": "5.0.5",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-cryptocurrencies/-/dict-cryptocurrencies-5.0.5.tgz",
-      "integrity": "sha512-R68hYYF/rtlE6T/dsObStzN5QZw+0aQBinAXuWCVqwdS7YZo0X33vGMfChkHaiCo3Z2+bkegqHlqxZF4TD3rUA==",
-      "dev": true,
-      "license": "MIT"
+    "version": "5.0.5",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-cryptocurrencies/-/dict-cryptocurrencies-5.0.5.tgz",
+    "integrity": "sha512-R68hYYF/rtlE6T/dsObStzN5QZw+0aQBinAXuWCVqwdS7YZo0X33vGMfChkHaiCo3Z2+bkegqHlqxZF4TD3rUA==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@cspell/dict-csharp": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-csharp/-/dict-csharp-4.0.7.tgz",
-      "integrity": "sha512-H16Hpu8O/1/lgijFt2lOk4/nnldFtQ4t8QHbyqphqZZVE5aS4J/zD/WvduqnLY21aKhZS6jo/xF5PX9jyqPKUA==",
-      "dev": true,
-      "license": "MIT"
+    "version": "4.0.7",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-csharp/-/dict-csharp-4.0.7.tgz",
+    "integrity": "sha512-H16Hpu8O/1/lgijFt2lOk4/nnldFtQ4t8QHbyqphqZZVE5aS4J/zD/WvduqnLY21aKhZS6jo/xF5PX9jyqPKUA==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@cspell/dict-css": {
-      "version": "4.0.18",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-css/-/dict-css-4.0.18.tgz",
-      "integrity": "sha512-EF77RqROHL+4LhMGW5NTeKqfUd/e4OOv6EDFQ/UQQiFyWuqkEKyEz0NDILxOFxWUEVdjT2GQ2cC7t12B6pESwg==",
-      "dev": true,
-      "license": "MIT"
+    "version": "4.0.18",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-css/-/dict-css-4.0.18.tgz",
+    "integrity": "sha512-EF77RqROHL+4LhMGW5NTeKqfUd/e4OOv6EDFQ/UQQiFyWuqkEKyEz0NDILxOFxWUEVdjT2GQ2cC7t12B6pESwg==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@cspell/dict-dart": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-dart/-/dict-dart-2.3.1.tgz",
-      "integrity": "sha512-xoiGnULEcWdodXI6EwVyqpZmpOoh8RA2Xk9BNdR7DLamV/QMvEYn8KJ7NlRiTSauJKPNkHHQ5EVHRM6sTS7jdg==",
-      "dev": true,
-      "license": "MIT"
+    "version": "2.3.1",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-dart/-/dict-dart-2.3.1.tgz",
+    "integrity": "sha512-xoiGnULEcWdodXI6EwVyqpZmpOoh8RA2Xk9BNdR7DLamV/QMvEYn8KJ7NlRiTSauJKPNkHHQ5EVHRM6sTS7jdg==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@cspell/dict-data-science": {
-      "version": "2.0.12",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-data-science/-/dict-data-science-2.0.12.tgz",
-      "integrity": "sha512-vI/mg6cI28IkFcpeINS7cm5M9HWemmXSTnxJiu3nmc4VAGx35SXIEyuLGBcsVzySvDablFYf4hsEpmg1XpVsUQ==",
-      "dev": true,
-      "license": "MIT"
+    "version": "2.0.12",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-data-science/-/dict-data-science-2.0.12.tgz",
+    "integrity": "sha512-vI/mg6cI28IkFcpeINS7cm5M9HWemmXSTnxJiu3nmc4VAGx35SXIEyuLGBcsVzySvDablFYf4hsEpmg1XpVsUQ==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@cspell/dict-django": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-django/-/dict-django-4.1.5.tgz",
-      "integrity": "sha512-AvTWu99doU3T8ifoMYOMLW2CXKvyKLukPh1auOPwFGHzueWYvBBN+OxF8wF7XwjTBMMeRleVdLh3aWCDEX/ZWg==",
-      "dev": true,
-      "license": "MIT"
+    "version": "4.1.5",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-django/-/dict-django-4.1.5.tgz",
+    "integrity": "sha512-AvTWu99doU3T8ifoMYOMLW2CXKvyKLukPh1auOPwFGHzueWYvBBN+OxF8wF7XwjTBMMeRleVdLh3aWCDEX/ZWg==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@cspell/dict-docker": {
-      "version": "1.1.16",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-docker/-/dict-docker-1.1.16.tgz",
-      "integrity": "sha512-UiVQ5RmCg6j0qGIxrBnai3pIB+aYKL3zaJGvXk1O/ertTKJif9RZikKXCEgqhaCYMweM4fuLqWSVmw3hU164Iw==",
-      "dev": true,
-      "license": "MIT"
+    "version": "1.1.16",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-docker/-/dict-docker-1.1.16.tgz",
+    "integrity": "sha512-UiVQ5RmCg6j0qGIxrBnai3pIB+aYKL3zaJGvXk1O/ertTKJif9RZikKXCEgqhaCYMweM4fuLqWSVmw3hU164Iw==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@cspell/dict-dotnet": {
-      "version": "5.0.10",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-dotnet/-/dict-dotnet-5.0.10.tgz",
-      "integrity": "sha512-ooar8BP/RBNP1gzYfJPStKEmpWy4uv/7JCq6FOnJLeD1yyfG3d/LFMVMwiJo+XWz025cxtkM3wuaikBWzCqkmg==",
-      "dev": true,
-      "license": "MIT"
+    "version": "5.0.10",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-dotnet/-/dict-dotnet-5.0.10.tgz",
+    "integrity": "sha512-ooar8BP/RBNP1gzYfJPStKEmpWy4uv/7JCq6FOnJLeD1yyfG3d/LFMVMwiJo+XWz025cxtkM3wuaikBWzCqkmg==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@cspell/dict-elixir": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-elixir/-/dict-elixir-4.0.8.tgz",
-      "integrity": "sha512-CyfphrbMyl4Ms55Vzuj+mNmd693HjBFr9hvU+B2YbFEZprE5AG+EXLYTMRWrXbpds4AuZcvN3deM2XVB80BN/Q==",
-      "dev": true,
-      "license": "MIT"
+    "version": "4.0.8",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-elixir/-/dict-elixir-4.0.8.tgz",
+    "integrity": "sha512-CyfphrbMyl4Ms55Vzuj+mNmd693HjBFr9hvU+B2YbFEZprE5AG+EXLYTMRWrXbpds4AuZcvN3deM2XVB80BN/Q==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@cspell/dict-en_us": {
-      "version": "4.4.24",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-en_us/-/dict-en_us-4.4.24.tgz",
-      "integrity": "sha512-JE+/H2YicHJTneRmgH4GSI21rS+1yGZVl1jfOQgl8iHLC+yTTMtCvueNDMK94CgJACzYAoCsQB70MqiFJJfjLQ==",
-      "dev": true,
-      "license": "MIT"
+    "version": "4.4.24",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-en_us/-/dict-en_us-4.4.24.tgz",
+    "integrity": "sha512-JE+/H2YicHJTneRmgH4GSI21rS+1yGZVl1jfOQgl8iHLC+yTTMtCvueNDMK94CgJACzYAoCsQB70MqiFJJfjLQ==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@cspell/dict-en-common-misspellings": {
-      "version": "2.1.8",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-en-common-misspellings/-/dict-en-common-misspellings-2.1.8.tgz",
-      "integrity": "sha512-vDsjRFPQGuAADAiitf82z9Mz3DcqKZi6V5hPAEIFkLLKjFVBcjUsSq59SfL59ElIFb76MtBO0BLifdEbBj+DoQ==",
-      "dev": true,
-      "license": "CC BY-SA 4.0"
+    "version": "2.1.8",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-en-common-misspellings/-/dict-en-common-misspellings-2.1.8.tgz",
+    "integrity": "sha512-vDsjRFPQGuAADAiitf82z9Mz3DcqKZi6V5hPAEIFkLLKjFVBcjUsSq59SfL59ElIFb76MtBO0BLifdEbBj+DoQ==",
+    "dev": true,
+    "license": "CC BY-SA 4.0"
     },
     "node_modules/@cspell/dict-en-gb": {
-      "version": "5.0.19",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-en-gb/-/dict-en-gb-5.0.19.tgz",
-      "integrity": "sha512-/p+p/9q8XTzsE0GxbZZKcC1rTLYmCpilYw8aC9Q1xJbve8YqZnpxk8IxRyaHwfy1TeKMQNs6heZZRtzPag0rCw==",
-      "dev": true,
-      "license": "LGPL-3.0"
+    "version": "5.0.19",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-en-gb/-/dict-en-gb-5.0.19.tgz",
+    "integrity": "sha512-/p+p/9q8XTzsE0GxbZZKcC1rTLYmCpilYw8aC9Q1xJbve8YqZnpxk8IxRyaHwfy1TeKMQNs6heZZRtzPag0rCw==",
+    "dev": true,
+    "license": "LGPL-3.0"
     },
     "node_modules/@cspell/dict-en-gb-mit": {
-      "version": "3.1.14",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-en-gb-mit/-/dict-en-gb-mit-3.1.14.tgz",
-      "integrity": "sha512-b+vEerlHP6rnNf30tmTJb7JZnOq4WAslYUvexOz/L3gDna9YJN3bAnwRJ3At3bdcOcMG7PTv3Pi+C73IR22lNg==",
-      "dev": true,
-      "license": "MIT"
+    "version": "3.1.14",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-en-gb-mit/-/dict-en-gb-mit-3.1.14.tgz",
+    "integrity": "sha512-b+vEerlHP6rnNf30tmTJb7JZnOq4WAslYUvexOz/L3gDna9YJN3bAnwRJ3At3bdcOcMG7PTv3Pi+C73IR22lNg==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@cspell/dict-filetypes": {
-      "version": "3.0.14",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-filetypes/-/dict-filetypes-3.0.14.tgz",
-      "integrity": "sha512-KSXaSMYYNMLLdHEnju1DyRRH3eQWPRYRnOXpuHUdOh2jC44VgQoxyMU7oB3NAhDhZKBPCihabzECsAGFbdKfEA==",
-      "dev": true,
-      "license": "MIT"
+    "version": "3.0.14",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-filetypes/-/dict-filetypes-3.0.14.tgz",
+    "integrity": "sha512-KSXaSMYYNMLLdHEnju1DyRRH3eQWPRYRnOXpuHUdOh2jC44VgQoxyMU7oB3NAhDhZKBPCihabzECsAGFbdKfEA==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@cspell/dict-flutter": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-flutter/-/dict-flutter-1.1.1.tgz",
-      "integrity": "sha512-UlOzRcH2tNbFhZmHJN48Za/2/MEdRHl2BMkCWZBYs+30b91mWvBfzaN4IJQU7dUZtowKayVIF9FzvLZtZokc5A==",
-      "dev": true,
-      "license": "MIT"
+    "version": "1.1.1",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-flutter/-/dict-flutter-1.1.1.tgz",
+    "integrity": "sha512-UlOzRcH2tNbFhZmHJN48Za/2/MEdRHl2BMkCWZBYs+30b91mWvBfzaN4IJQU7dUZtowKayVIF9FzvLZtZokc5A==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@cspell/dict-fonts": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-fonts/-/dict-fonts-4.0.5.tgz",
-      "integrity": "sha512-BbpkX10DUX/xzHs6lb7yzDf/LPjwYIBJHJlUXSBXDtK/1HaeS+Wqol4Mlm2+NAgZ7ikIE5DQMViTgBUY3ezNoQ==",
-      "dev": true,
-      "license": "MIT"
+    "version": "4.0.5",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-fonts/-/dict-fonts-4.0.5.tgz",
+    "integrity": "sha512-BbpkX10DUX/xzHs6lb7yzDf/LPjwYIBJHJlUXSBXDtK/1HaeS+Wqol4Mlm2+NAgZ7ikIE5DQMViTgBUY3ezNoQ==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@cspell/dict-fsharp": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-fsharp/-/dict-fsharp-1.1.1.tgz",
-      "integrity": "sha512-imhs0u87wEA4/cYjgzS0tAyaJpwG7vwtC8UyMFbwpmtw+/bgss+osNfyqhYRyS/ehVCWL17Ewx2UPkexjKyaBA==",
-      "dev": true,
-      "license": "MIT"
+    "version": "1.1.1",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-fsharp/-/dict-fsharp-1.1.1.tgz",
+    "integrity": "sha512-imhs0u87wEA4/cYjgzS0tAyaJpwG7vwtC8UyMFbwpmtw+/bgss+osNfyqhYRyS/ehVCWL17Ewx2UPkexjKyaBA==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@cspell/dict-fullstack": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-fullstack/-/dict-fullstack-3.2.7.tgz",
-      "integrity": "sha512-IxEk2YAwAJKYCUEgEeOg3QvTL4XLlyArJElFuMQevU1dPgHgzWElFevN5lsTFnvMFA1riYsVinqJJX0BanCFEg==",
-      "dev": true,
-      "license": "MIT"
+    "version": "3.2.7",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-fullstack/-/dict-fullstack-3.2.7.tgz",
+    "integrity": "sha512-IxEk2YAwAJKYCUEgEeOg3QvTL4XLlyArJElFuMQevU1dPgHgzWElFevN5lsTFnvMFA1riYsVinqJJX0BanCFEg==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@cspell/dict-gaming-terms": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-gaming-terms/-/dict-gaming-terms-1.1.2.tgz",
-      "integrity": "sha512-9XnOvaoTBscq0xuD6KTEIkk9hhdfBkkvJAIsvw3JMcnp1214OCGW8+kako5RqQ2vTZR3Tnf3pc57o7VgkM0q1Q==",
-      "dev": true,
-      "license": "MIT"
+    "version": "1.1.2",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-gaming-terms/-/dict-gaming-terms-1.1.2.tgz",
+    "integrity": "sha512-9XnOvaoTBscq0xuD6KTEIkk9hhdfBkkvJAIsvw3JMcnp1214OCGW8+kako5RqQ2vTZR3Tnf3pc57o7VgkM0q1Q==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@cspell/dict-git": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-git/-/dict-git-3.0.7.tgz",
-      "integrity": "sha512-odOwVKgfxCQfiSb+nblQZc4ErXmnWEnv8XwkaI4sNJ7cNmojnvogYVeMqkXPjvfrgEcizEEA4URRD2Ms5PDk1w==",
-      "dev": true,
-      "license": "MIT"
+    "version": "3.0.7",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-git/-/dict-git-3.0.7.tgz",
+    "integrity": "sha512-odOwVKgfxCQfiSb+nblQZc4ErXmnWEnv8XwkaI4sNJ7cNmojnvogYVeMqkXPjvfrgEcizEEA4URRD2Ms5PDk1w==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@cspell/dict-golang": {
-      "version": "6.0.24",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-golang/-/dict-golang-6.0.24.tgz",
-      "integrity": "sha512-rY7PlC3MsHozmjrZWi0HQPUl0BVCV0+mwK0rnMT7pOIXqOe4tWCYMULDIsEk4F0gbIxb5badd2dkCPDYjLnDgA==",
-      "dev": true,
-      "license": "MIT"
+    "version": "6.0.24",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-golang/-/dict-golang-6.0.24.tgz",
+    "integrity": "sha512-rY7PlC3MsHozmjrZWi0HQPUl0BVCV0+mwK0rnMT7pOIXqOe4tWCYMULDIsEk4F0gbIxb5badd2dkCPDYjLnDgA==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@cspell/dict-google": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-google/-/dict-google-1.0.9.tgz",
-      "integrity": "sha512-biL65POqialY0i4g6crj7pR6JnBkbsPovB2WDYkj3H4TuC/QXv7Pu5pdPxeUJA6TSCHI7T5twsO4VSVyRxD9CA==",
-      "dev": true,
-      "license": "MIT"
+    "version": "1.0.9",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-google/-/dict-google-1.0.9.tgz",
+    "integrity": "sha512-biL65POqialY0i4g6crj7pR6JnBkbsPovB2WDYkj3H4TuC/QXv7Pu5pdPxeUJA6TSCHI7T5twsO4VSVyRxD9CA==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@cspell/dict-haskell": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-haskell/-/dict-haskell-4.0.6.tgz",
-      "integrity": "sha512-ib8SA5qgftExpYNjWhpYIgvDsZ/0wvKKxSP+kuSkkak520iPvTJumEpIE+qPcmJQo4NzdKMN8nEfaeci4OcFAQ==",
-      "dev": true,
-      "license": "MIT"
+    "version": "4.0.6",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-haskell/-/dict-haskell-4.0.6.tgz",
+    "integrity": "sha512-ib8SA5qgftExpYNjWhpYIgvDsZ/0wvKKxSP+kuSkkak520iPvTJumEpIE+qPcmJQo4NzdKMN8nEfaeci4OcFAQ==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@cspell/dict-html": {
-      "version": "4.0.12",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-html/-/dict-html-4.0.12.tgz",
-      "integrity": "sha512-JFffQ1dDVEyJq6tCDWv0r/RqkdSnV43P2F/3jJ9rwLgdsOIXwQbXrz6QDlvQLVvNSnORH9KjDtenFTGDyzfCaA==",
-      "dev": true,
-      "license": "MIT"
+    "version": "4.0.12",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-html/-/dict-html-4.0.12.tgz",
+    "integrity": "sha512-JFffQ1dDVEyJq6tCDWv0r/RqkdSnV43P2F/3jJ9rwLgdsOIXwQbXrz6QDlvQLVvNSnORH9KjDtenFTGDyzfCaA==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@cspell/dict-html-symbol-entities": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-html-symbol-entities/-/dict-html-symbol-entities-4.0.4.tgz",
-      "integrity": "sha512-afea+0rGPDeOV9gdO06UW183Qg6wRhWVkgCFwiO3bDupAoyXRuvupbb5nUyqSTsLXIKL8u8uXQlJ9pkz07oVXw==",
-      "dev": true,
-      "license": "MIT"
+    "version": "4.0.4",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-html-symbol-entities/-/dict-html-symbol-entities-4.0.4.tgz",
+    "integrity": "sha512-afea+0rGPDeOV9gdO06UW183Qg6wRhWVkgCFwiO3bDupAoyXRuvupbb5nUyqSTsLXIKL8u8uXQlJ9pkz07oVXw==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@cspell/dict-java": {
-      "version": "5.0.12",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-java/-/dict-java-5.0.12.tgz",
-      "integrity": "sha512-qPSNhTcl7LGJ5Qp6VN71H8zqvRQK04S08T67knMq9hTA8U7G1sTKzLmBaDOFhq17vNX/+rT+rbRYp+B5Nwza1A==",
-      "dev": true,
-      "license": "MIT"
+    "version": "5.0.12",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-java/-/dict-java-5.0.12.tgz",
+    "integrity": "sha512-qPSNhTcl7LGJ5Qp6VN71H8zqvRQK04S08T67knMq9hTA8U7G1sTKzLmBaDOFhq17vNX/+rT+rbRYp+B5Nwza1A==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@cspell/dict-julia": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-julia/-/dict-julia-1.1.1.tgz",
-      "integrity": "sha512-WylJR9TQ2cgwd5BWEOfdO3zvDB+L7kYFm0I9u0s9jKHWQ6yKmfKeMjU9oXxTBxIufhCXm92SKwwVNAC7gjv+yA==",
-      "dev": true,
-      "license": "MIT"
+    "version": "1.1.1",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-julia/-/dict-julia-1.1.1.tgz",
+    "integrity": "sha512-WylJR9TQ2cgwd5BWEOfdO3zvDB+L7kYFm0I9u0s9jKHWQ6yKmfKeMjU9oXxTBxIufhCXm92SKwwVNAC7gjv+yA==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@cspell/dict-k8s": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-k8s/-/dict-k8s-1.0.12.tgz",
-      "integrity": "sha512-2LcllTWgaTfYC7DmkMPOn9GsBWsA4DZdlun4po8s2ysTP7CPEnZc1ZfK6pZ2eI4TsZemlUQQ+NZxMe9/QutQxg==",
-      "dev": true,
-      "license": "MIT"
+    "version": "1.0.12",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-k8s/-/dict-k8s-1.0.12.tgz",
+    "integrity": "sha512-2LcllTWgaTfYC7DmkMPOn9GsBWsA4DZdlun4po8s2ysTP7CPEnZc1ZfK6pZ2eI4TsZemlUQQ+NZxMe9/QutQxg==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@cspell/dict-kotlin": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-kotlin/-/dict-kotlin-1.1.1.tgz",
-      "integrity": "sha512-J3NzzfgmxRvEeOe3qUXnSJQCd38i/dpF9/t3quuWh6gXM+krsAXP75dY1CzDmS8mrJAlBdVBeAW5eAZTD8g86Q==",
-      "dev": true,
-      "license": "MIT"
+    "version": "1.1.1",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-kotlin/-/dict-kotlin-1.1.1.tgz",
+    "integrity": "sha512-J3NzzfgmxRvEeOe3qUXnSJQCd38i/dpF9/t3quuWh6gXM+krsAXP75dY1CzDmS8mrJAlBdVBeAW5eAZTD8g86Q==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@cspell/dict-latex": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-latex/-/dict-latex-4.0.4.tgz",
-      "integrity": "sha512-YdTQhnTINEEm/LZgTzr9Voz4mzdOXH7YX+bSFs3hnkUHCUUtX/mhKgf1CFvZ0YNM2afjhQcmLaR9bDQVyYBvpA==",
-      "dev": true,
-      "license": "MIT"
+    "version": "4.0.4",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-latex/-/dict-latex-4.0.4.tgz",
+    "integrity": "sha512-YdTQhnTINEEm/LZgTzr9Voz4mzdOXH7YX+bSFs3hnkUHCUUtX/mhKgf1CFvZ0YNM2afjhQcmLaR9bDQVyYBvpA==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@cspell/dict-lorem-ipsum": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-lorem-ipsum/-/dict-lorem-ipsum-4.0.5.tgz",
-      "integrity": "sha512-9a4TJYRcPWPBKkQAJ/whCu4uCAEgv/O2xAaZEI0n4y1/l18Yyx8pBKoIX5QuVXjjmKEkK7hi5SxyIsH7pFEK9Q==",
-      "dev": true,
-      "license": "MIT"
+    "version": "4.0.5",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-lorem-ipsum/-/dict-lorem-ipsum-4.0.5.tgz",
+    "integrity": "sha512-9a4TJYRcPWPBKkQAJ/whCu4uCAEgv/O2xAaZEI0n4y1/l18Yyx8pBKoIX5QuVXjjmKEkK7hi5SxyIsH7pFEK9Q==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@cspell/dict-lua": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-lua/-/dict-lua-4.0.8.tgz",
-      "integrity": "sha512-N4PkgNDMu9JVsRu7JBS/3E/dvfItRgk9w5ga2dKq+JupP2Y3lojNaAVFhXISh4Y0a6qXDn2clA6nvnavQ/jjLA==",
-      "dev": true,
-      "license": "MIT"
+    "version": "4.0.8",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-lua/-/dict-lua-4.0.8.tgz",
+    "integrity": "sha512-N4PkgNDMu9JVsRu7JBS/3E/dvfItRgk9w5ga2dKq+JupP2Y3lojNaAVFhXISh4Y0a6qXDn2clA6nvnavQ/jjLA==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@cspell/dict-makefile": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-makefile/-/dict-makefile-1.0.5.tgz",
-      "integrity": "sha512-4vrVt7bGiK8Rx98tfRbYo42Xo2IstJkAF4tLLDMNQLkQ86msDlYSKG1ZCk8Abg+EdNcFAjNhXIiNO+w4KflGAQ==",
-      "dev": true,
-      "license": "MIT"
+    "version": "1.0.5",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-makefile/-/dict-makefile-1.0.5.tgz",
+    "integrity": "sha512-4vrVt7bGiK8Rx98tfRbYo42Xo2IstJkAF4tLLDMNQLkQ86msDlYSKG1ZCk8Abg+EdNcFAjNhXIiNO+w4KflGAQ==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@cspell/dict-markdown": {
-      "version": "2.0.12",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-markdown/-/dict-markdown-2.0.12.tgz",
-      "integrity": "sha512-ufwoliPijAgWkD/ivAMC+A9QD895xKiJRF/fwwknQb7kt7NozTLKFAOBtXGPJAB4UjhGBpYEJVo2elQ0FCAH9A==",
-      "dev": true,
-      "license": "MIT",
-      "peerDependencies": {
+    "version": "2.0.12",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-markdown/-/dict-markdown-2.0.12.tgz",
+    "integrity": "sha512-ufwoliPijAgWkD/ivAMC+A9QD895xKiJRF/fwwknQb7kt7NozTLKFAOBtXGPJAB4UjhGBpYEJVo2elQ0FCAH9A==",
+    "dev": true,
+    "license": "MIT",
+    "peerDependencies": {
         "@cspell/dict-css": "^4.0.18",
         "@cspell/dict-html": "^4.0.12",
         "@cspell/dict-html-symbol-entities": "^4.0.4",
         "@cspell/dict-typescript": "^3.2.3"
-      }
+    }
     },
     "node_modules/@cspell/dict-monkeyc": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-monkeyc/-/dict-monkeyc-1.0.11.tgz",
-      "integrity": "sha512-7Q1Ncu0urALI6dPTrEbSTd//UK0qjRBeaxhnm8uY5fgYNFYAG+u4gtnTIo59S6Bw5P++4H3DiIDYoQdY/lha8w==",
-      "dev": true,
-      "license": "MIT"
+    "version": "1.0.11",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-monkeyc/-/dict-monkeyc-1.0.11.tgz",
+    "integrity": "sha512-7Q1Ncu0urALI6dPTrEbSTd//UK0qjRBeaxhnm8uY5fgYNFYAG+u4gtnTIo59S6Bw5P++4H3DiIDYoQdY/lha8w==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@cspell/dict-node": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-node/-/dict-node-5.0.8.tgz",
-      "integrity": "sha512-AirZcN2i84ynev3p2/1NCPEhnNsHKMz9zciTngGoqpdItUb2bDt1nJBjwlsrFI78GZRph/VaqTVFwYikmncpXg==",
-      "dev": true,
-      "license": "MIT"
+    "version": "5.0.8",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-node/-/dict-node-5.0.8.tgz",
+    "integrity": "sha512-AirZcN2i84ynev3p2/1NCPEhnNsHKMz9zciTngGoqpdItUb2bDt1nJBjwlsrFI78GZRph/VaqTVFwYikmncpXg==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@cspell/dict-npm": {
-      "version": "5.2.23",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-npm/-/dict-npm-5.2.23.tgz",
-      "integrity": "sha512-cnlPGzhNkbXFLFURfjzwML2LjHMofqJkemR7lLo9Jwa9IptvzeTn4nOtJMSGfkxNrZPf/IvQ7rH5hamsUQLQ3A==",
-      "dev": true,
-      "license": "MIT"
+    "version": "5.2.23",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-npm/-/dict-npm-5.2.23.tgz",
+    "integrity": "sha512-cnlPGzhNkbXFLFURfjzwML2LjHMofqJkemR7lLo9Jwa9IptvzeTn4nOtJMSGfkxNrZPf/IvQ7rH5hamsUQLQ3A==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@cspell/dict-php": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-php/-/dict-php-4.1.0.tgz",
-      "integrity": "sha512-dTDeabyOj7eFvn2Q4Za3uVXM2+SzeFMqX8ly2P0XTo4AzbCmI2hulFD/QIADwWmwiRrInbbf8cxwFHNIYrXl4w==",
-      "dev": true,
-      "license": "MIT"
+    "version": "4.1.0",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-php/-/dict-php-4.1.0.tgz",
+    "integrity": "sha512-dTDeabyOj7eFvn2Q4Za3uVXM2+SzeFMqX8ly2P0XTo4AzbCmI2hulFD/QIADwWmwiRrInbbf8cxwFHNIYrXl4w==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@cspell/dict-powershell": {
-      "version": "5.0.15",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-powershell/-/dict-powershell-5.0.15.tgz",
-      "integrity": "sha512-l4S5PAcvCFcVDMJShrYD0X6Huv9dcsQPlsVsBGbH38wvuN7gS7+GxZFAjTNxDmTY1wrNi1cCatSg6Pu2BW4rgg==",
-      "dev": true,
-      "license": "MIT"
+    "version": "5.0.15",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-powershell/-/dict-powershell-5.0.15.tgz",
+    "integrity": "sha512-l4S5PAcvCFcVDMJShrYD0X6Huv9dcsQPlsVsBGbH38wvuN7gS7+GxZFAjTNxDmTY1wrNi1cCatSg6Pu2BW4rgg==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@cspell/dict-public-licenses": {
-      "version": "2.0.15",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-public-licenses/-/dict-public-licenses-2.0.15.tgz",
-      "integrity": "sha512-cJEOs901H13Pfy0fl4dCD1U+xpWIMaEPq8MeYU83FfDZvellAuSo4GqWCripfIqlhns/L6+UZEIJSOZnjgy7Wg==",
-      "dev": true,
-      "license": "MIT"
+    "version": "2.0.15",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-public-licenses/-/dict-public-licenses-2.0.15.tgz",
+    "integrity": "sha512-cJEOs901H13Pfy0fl4dCD1U+xpWIMaEPq8MeYU83FfDZvellAuSo4GqWCripfIqlhns/L6+UZEIJSOZnjgy7Wg==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@cspell/dict-python": {
-      "version": "4.2.22",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-python/-/dict-python-4.2.22.tgz",
-      "integrity": "sha512-rgF7DuleVK2lkzlw33jjEfxS2a0CU5kwAhOqf5B6XkuaPbqZ/0g0LBCdwglAGccYu7sBuvxRS8Yubk+ytSAFTg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "4.2.22",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-python/-/dict-python-4.2.22.tgz",
+    "integrity": "sha512-rgF7DuleVK2lkzlw33jjEfxS2a0CU5kwAhOqf5B6XkuaPbqZ/0g0LBCdwglAGccYu7sBuvxRS8Yubk+ytSAFTg==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@cspell/dict-data-science": "^2.0.12"
-      }
+    }
     },
     "node_modules/@cspell/dict-r": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-r/-/dict-r-2.1.1.tgz",
-      "integrity": "sha512-71Ka+yKfG4ZHEMEmDxc6+blFkeTTvgKbKAbwiwQAuKl3zpqs1Y0vUtwW2N4b3LgmSPhV3ODVY0y4m5ofqDuKMw==",
-      "dev": true,
-      "license": "MIT"
+    "version": "2.1.1",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-r/-/dict-r-2.1.1.tgz",
+    "integrity": "sha512-71Ka+yKfG4ZHEMEmDxc6+blFkeTTvgKbKAbwiwQAuKl3zpqs1Y0vUtwW2N4b3LgmSPhV3ODVY0y4m5ofqDuKMw==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@cspell/dict-ruby": {
-      "version": "5.0.9",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-ruby/-/dict-ruby-5.0.9.tgz",
-      "integrity": "sha512-H2vMcERMcANvQshAdrVx0XoWaNX8zmmiQN11dZZTQAZaNJ0xatdJoSqY8C8uhEMW89bfgpN+NQgGuDXW2vmXEw==",
-      "dev": true,
-      "license": "MIT"
+    "version": "5.0.9",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-ruby/-/dict-ruby-5.0.9.tgz",
+    "integrity": "sha512-H2vMcERMcANvQshAdrVx0XoWaNX8zmmiQN11dZZTQAZaNJ0xatdJoSqY8C8uhEMW89bfgpN+NQgGuDXW2vmXEw==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@cspell/dict-rust": {
-      "version": "4.0.12",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-rust/-/dict-rust-4.0.12.tgz",
-      "integrity": "sha512-z2QiH+q9UlNhobBJArvILRxV8Jz0pKIK7gqu4TgmEYyjiu1TvnGZ1tbYHeu9w3I/wOP6UMDoCBTty5AlYfW0mw==",
-      "dev": true,
-      "license": "MIT"
+    "version": "4.0.12",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-rust/-/dict-rust-4.0.12.tgz",
+    "integrity": "sha512-z2QiH+q9UlNhobBJArvILRxV8Jz0pKIK7gqu4TgmEYyjiu1TvnGZ1tbYHeu9w3I/wOP6UMDoCBTty5AlYfW0mw==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@cspell/dict-scala": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-scala/-/dict-scala-5.0.8.tgz",
-      "integrity": "sha512-YdftVmumv8IZq9zu1gn2U7A4bfM2yj9Vaupydotyjuc+EEZZSqAafTpvW/jKLWji2TgybM1L2IhmV0s/Iv9BTw==",
-      "dev": true,
-      "license": "MIT"
+    "version": "5.0.8",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-scala/-/dict-scala-5.0.8.tgz",
+    "integrity": "sha512-YdftVmumv8IZq9zu1gn2U7A4bfM2yj9Vaupydotyjuc+EEZZSqAafTpvW/jKLWji2TgybM1L2IhmV0s/Iv9BTw==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@cspell/dict-shell": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-shell/-/dict-shell-1.1.2.tgz",
-      "integrity": "sha512-WqOUvnwcHK1X61wAfwyXq04cn7KYyskg90j4lLg3sGGKMW9Sq13hs91pqrjC44Q+lQLgCobrTkMDw9Wyl9nRFA==",
-      "dev": true,
-      "license": "MIT"
+    "version": "1.1.2",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-shell/-/dict-shell-1.1.2.tgz",
+    "integrity": "sha512-WqOUvnwcHK1X61wAfwyXq04cn7KYyskg90j4lLg3sGGKMW9Sq13hs91pqrjC44Q+lQLgCobrTkMDw9Wyl9nRFA==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@cspell/dict-software-terms": {
-      "version": "5.1.14",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-5.1.14.tgz",
-      "integrity": "sha512-Eu9h090hxHJiqzVFS0WxOZbYXnmb7F1RFIUEg4Nru+D/78bXVDH4b8BiKGVFNRljaieNQRAHaryzdaKJRCH6ZA==",
-      "dev": true,
-      "license": "MIT"
+    "version": "5.1.14",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-5.1.14.tgz",
+    "integrity": "sha512-Eu9h090hxHJiqzVFS0WxOZbYXnmb7F1RFIUEg4Nru+D/78bXVDH4b8BiKGVFNRljaieNQRAHaryzdaKJRCH6ZA==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@cspell/dict-sql": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-sql/-/dict-sql-2.2.1.tgz",
-      "integrity": "sha512-qDHF8MpAYCf4pWU8NKbnVGzkoxMNrFqBHyG/dgrlic5EQiKANCLELYtGlX5auIMDLmTf1inA0eNtv74tyRJ/vg==",
-      "dev": true,
-      "license": "MIT"
+    "version": "2.2.1",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-sql/-/dict-sql-2.2.1.tgz",
+    "integrity": "sha512-qDHF8MpAYCf4pWU8NKbnVGzkoxMNrFqBHyG/dgrlic5EQiKANCLELYtGlX5auIMDLmTf1inA0eNtv74tyRJ/vg==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@cspell/dict-svelte": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-svelte/-/dict-svelte-1.0.7.tgz",
-      "integrity": "sha512-hGZsGqP0WdzKkdpeVLBivRuSNzOTvN036EBmpOwxH+FTY2DuUH7ecW+cSaMwOgmq5JFSdTcbTNFlNC8HN8lhaQ==",
-      "dev": true,
-      "license": "MIT"
+    "version": "1.0.7",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-svelte/-/dict-svelte-1.0.7.tgz",
+    "integrity": "sha512-hGZsGqP0WdzKkdpeVLBivRuSNzOTvN036EBmpOwxH+FTY2DuUH7ecW+cSaMwOgmq5JFSdTcbTNFlNC8HN8lhaQ==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@cspell/dict-swift": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-swift/-/dict-swift-2.0.6.tgz",
-      "integrity": "sha512-PnpNbrIbex2aqU1kMgwEKvCzgbkHtj3dlFLPMqW1vSniop7YxaDTtvTUO4zA++ugYAEL+UK8vYrBwDPTjjvSnA==",
-      "dev": true,
-      "license": "MIT"
+    "version": "2.0.6",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-swift/-/dict-swift-2.0.6.tgz",
+    "integrity": "sha512-PnpNbrIbex2aqU1kMgwEKvCzgbkHtj3dlFLPMqW1vSniop7YxaDTtvTUO4zA++ugYAEL+UK8vYrBwDPTjjvSnA==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@cspell/dict-terraform": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-terraform/-/dict-terraform-1.1.3.tgz",
-      "integrity": "sha512-gr6wxCydwSFyyBKhBA2xkENXtVFToheqYYGFvlMZXWjviynXmh+NK/JTvTCk/VHk3+lzbO9EEQKee6VjrAUSbA==",
-      "dev": true,
-      "license": "MIT"
+    "version": "1.1.3",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-terraform/-/dict-terraform-1.1.3.tgz",
+    "integrity": "sha512-gr6wxCydwSFyyBKhBA2xkENXtVFToheqYYGFvlMZXWjviynXmh+NK/JTvTCk/VHk3+lzbO9EEQKee6VjrAUSbA==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@cspell/dict-typescript": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-typescript/-/dict-typescript-3.2.3.tgz",
-      "integrity": "sha512-zXh1wYsNljQZfWWdSPYwQhpwiuW0KPW1dSd8idjMRvSD0aSvWWHoWlrMsmZeRl4qM4QCEAjua8+cjflm41cQBg==",
-      "dev": true,
-      "license": "MIT"
+    "version": "3.2.3",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-typescript/-/dict-typescript-3.2.3.tgz",
+    "integrity": "sha512-zXh1wYsNljQZfWWdSPYwQhpwiuW0KPW1dSd8idjMRvSD0aSvWWHoWlrMsmZeRl4qM4QCEAjua8+cjflm41cQBg==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@cspell/dict-vue": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-vue/-/dict-vue-3.0.5.tgz",
-      "integrity": "sha512-Mqutb8jbM+kIcywuPQCCaK5qQHTdaByoEO2J9LKFy3sqAdiBogNkrplqUK0HyyRFgCfbJUgjz3N85iCMcWH0JA==",
-      "dev": true,
-      "license": "MIT"
+    "version": "3.0.5",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-vue/-/dict-vue-3.0.5.tgz",
+    "integrity": "sha512-Mqutb8jbM+kIcywuPQCCaK5qQHTdaByoEO2J9LKFy3sqAdiBogNkrplqUK0HyyRFgCfbJUgjz3N85iCMcWH0JA==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@cspell/dict-zig": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-zig/-/dict-zig-1.0.0.tgz",
-      "integrity": "sha512-XibBIxBlVosU06+M6uHWkFeT0/pW5WajDRYdXG2CgHnq85b0TI/Ks0FuBJykmsgi2CAD3Qtx8UHFEtl/DSFnAQ==",
-      "dev": true,
-      "license": "MIT"
+    "version": "1.0.0",
+    "resolved": "https://registry.npmjs.org/@cspell/dict-zig/-/dict-zig-1.0.0.tgz",
+    "integrity": "sha512-XibBIxBlVosU06+M6uHWkFeT0/pW5WajDRYdXG2CgHnq85b0TI/Ks0FuBJykmsgi2CAD3Qtx8UHFEtl/DSFnAQ==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@cspell/dynamic-import": {
-      "version": "9.3.2",
-      "resolved": "https://registry.npmjs.org/@cspell/dynamic-import/-/dynamic-import-9.3.2.tgz",
-      "integrity": "sha512-au7FyuIHUNI2r9sO3pUBKVTeD/v7c9x/nPUStaAK1bG4rdKt4w+/jUY2IaldAraW5w29z528BboXbiV87SM1kw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "9.3.2",
+    "resolved": "https://registry.npmjs.org/@cspell/dynamic-import/-/dynamic-import-9.3.2.tgz",
+    "integrity": "sha512-au7FyuIHUNI2r9sO3pUBKVTeD/v7c9x/nPUStaAK1bG4rdKt4w+/jUY2IaldAraW5w29z528BboXbiV87SM1kw==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@cspell/url": "9.3.2",
         "import-meta-resolve": "^4.2.0"
-      },
-      "engines": {
+    },
+    "engines": {
         "node": ">=20"
-      }
+    }
     },
     "node_modules/@cspell/filetypes": {
-      "version": "9.3.2",
-      "resolved": "https://registry.npmjs.org/@cspell/filetypes/-/filetypes-9.3.2.tgz",
-      "integrity": "sha512-0bUxQlmJPRHZrRQD7adbc4lFizO8tGD/6+1cBgU3kV3+NVrpr12y4jU8twCSChhYibZyPr7bnvhkM3cQgb8RzA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
+    "version": "9.3.2",
+    "resolved": "https://registry.npmjs.org/@cspell/filetypes/-/filetypes-9.3.2.tgz",
+    "integrity": "sha512-0bUxQlmJPRHZrRQD7adbc4lFizO8tGD/6+1cBgU3kV3+NVrpr12y4jU8twCSChhYibZyPr7bnvhkM3cQgb8RzA==",
+    "dev": true,
+    "license": "MIT",
+    "engines": {
         "node": ">=20"
-      }
+    }
     },
     "node_modules/@cspell/strong-weak-map": {
-      "version": "9.3.2",
-      "resolved": "https://registry.npmjs.org/@cspell/strong-weak-map/-/strong-weak-map-9.3.2.tgz",
-      "integrity": "sha512-pFcmOTWCoFMRETb9PCkCmaiZiLb5i2qOZmGH/p/tFEH8kIYhMGfhaulnXwKwS+Ke6PKceQd2YL98bGmo8hL4aQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
+    "version": "9.3.2",
+    "resolved": "https://registry.npmjs.org/@cspell/strong-weak-map/-/strong-weak-map-9.3.2.tgz",
+    "integrity": "sha512-pFcmOTWCoFMRETb9PCkCmaiZiLb5i2qOZmGH/p/tFEH8kIYhMGfhaulnXwKwS+Ke6PKceQd2YL98bGmo8hL4aQ==",
+    "dev": true,
+    "license": "MIT",
+    "engines": {
         "node": ">=20"
-      }
+    }
     },
     "node_modules/@cspell/url": {
-      "version": "9.3.2",
-      "resolved": "https://registry.npmjs.org/@cspell/url/-/url-9.3.2.tgz",
-      "integrity": "sha512-TobUlZl7Z7VehhNOMNAg1ABuGizieseftlG94OZJ934JptOhK8TC/1o2ldKrbDH50jyt6E7rPTMV2BW/vWuTzQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
+    "version": "9.3.2",
+    "resolved": "https://registry.npmjs.org/@cspell/url/-/url-9.3.2.tgz",
+    "integrity": "sha512-TobUlZl7Z7VehhNOMNAg1ABuGizieseftlG94OZJ934JptOhK8TC/1o2ldKrbDH50jyt6E7rPTMV2BW/vWuTzQ==",
+    "dev": true,
+    "license": "MIT",
+    "engines": {
         "node": ">=20"
-      }
+    }
     },
     "node_modules/@docsearch/css": {
-      "version": "3.8.2",
-      "resolved": "https://registry.npmjs.org/@docsearch/css/-/css-3.8.2.tgz",
-      "integrity": "sha512-y05ayQFyUmCXze79+56v/4HpycYF3uFqB78pLPrSV5ZKAlDuIAAJNhaRi8tTdRNXh05yxX/TyNnzD6LwSM89vQ==",
-      "dev": true,
-      "license": "MIT"
+    "version": "3.8.2",
+    "resolved": "https://registry.npmjs.org/@docsearch/css/-/css-3.8.2.tgz",
+    "integrity": "sha512-y05ayQFyUmCXze79+56v/4HpycYF3uFqB78pLPrSV5ZKAlDuIAAJNhaRi8tTdRNXh05yxX/TyNnzD6LwSM89vQ==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@docsearch/js": {
-      "version": "3.8.2",
-      "resolved": "https://registry.npmjs.org/@docsearch/js/-/js-3.8.2.tgz",
-      "integrity": "sha512-Q5wY66qHn0SwA7Taa0aDbHiJvaFJLOJyHmooQ7y8hlwwQLQ/5WwCcoX0g7ii04Qi2DJlHsd0XXzJ8Ypw9+9YmQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "3.8.2",
+    "resolved": "https://registry.npmjs.org/@docsearch/js/-/js-3.8.2.tgz",
+    "integrity": "sha512-Q5wY66qHn0SwA7Taa0aDbHiJvaFJLOJyHmooQ7y8hlwwQLQ/5WwCcoX0g7ii04Qi2DJlHsd0XXzJ8Ypw9+9YmQ==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@docsearch/react": "3.8.2",
         "preact": "^10.0.0"
-      }
+    }
     },
     "node_modules/@docsearch/react": {
-      "version": "3.8.2",
-      "resolved": "https://registry.npmjs.org/@docsearch/react/-/react-3.8.2.tgz",
-      "integrity": "sha512-xCRrJQlTt8N9GU0DG4ptwHRkfnSnD/YpdeaXe02iKfqs97TkZJv60yE+1eq/tjPcVnTW8dP5qLP7itifFVV5eg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "3.8.2",
+    "resolved": "https://registry.npmjs.org/@docsearch/react/-/react-3.8.2.tgz",
+    "integrity": "sha512-xCRrJQlTt8N9GU0DG4ptwHRkfnSnD/YpdeaXe02iKfqs97TkZJv60yE+1eq/tjPcVnTW8dP5qLP7itifFVV5eg==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@algolia/autocomplete-core": "1.17.7",
         "@algolia/autocomplete-preset-algolia": "1.17.7",
         "@docsearch/css": "3.8.2",
         "algoliasearch": "^5.14.2"
-      },
-      "peerDependencies": {
+    },
+    "peerDependencies": {
         "@types/react": ">= 16.8.0 < 19.0.0",
         "react": ">= 16.8.0 < 19.0.0",
         "react-dom": ">= 16.8.0 < 19.0.0",
         "search-insights": ">= 1 < 3"
-      },
-      "peerDependenciesMeta": {
+    },
+    "peerDependenciesMeta": {
         "@types/react": {
-          "optional": true
+        "optional": true
         },
         "react": {
-          "optional": true
+        "optional": true
         },
         "react-dom": {
-          "optional": true
+        "optional": true
         },
         "search-insights": {
-          "optional": true
+        "optional": true
         }
-      }
+    }
     },
     "node_modules/@esbuild/linux-x64": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
-      "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
-      "cpu": [
+    "version": "0.21.5",
+    "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
+    "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
+    "cpu": [
         "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
+    ],
+    "dev": true,
+    "license": "MIT",
+    "optional": true,
+    "os": [
         "linux"
-      ],
-      "engines": {
+    ],
+    "engines": {
         "node": ">=12"
-      }
+    }
     },
     "node_modules/@iconify-json/simple-icons": {
-      "version": "1.2.59",
-      "resolved": "https://registry.npmjs.org/@iconify-json/simple-icons/-/simple-icons-1.2.59.tgz",
-      "integrity": "sha512-fYx/InyQsWFW4wVxWka3CGDJ6m/fXoTqWBSl+oA3FBXO5RhPAb6S3Y5bRgCPnrYevErH8VjAL0TZevIqlN2PhQ==",
-      "dev": true,
-      "license": "CC0-1.0",
-      "dependencies": {
+    "version": "1.2.59",
+    "resolved": "https://registry.npmjs.org/@iconify-json/simple-icons/-/simple-icons-1.2.59.tgz",
+    "integrity": "sha512-fYx/InyQsWFW4wVxWka3CGDJ6m/fXoTqWBSl+oA3FBXO5RhPAb6S3Y5bRgCPnrYevErH8VjAL0TZevIqlN2PhQ==",
+    "dev": true,
+    "license": "CC0-1.0",
+    "dependencies": {
         "@iconify/types": "*"
-      }
+    }
     },
     "node_modules/@iconify/types": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@iconify/types/-/types-2.0.0.tgz",
-      "integrity": "sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg==",
-      "dev": true,
-      "license": "MIT"
+    "version": "2.0.0",
+    "resolved": "https://registry.npmjs.org/@iconify/types/-/types-2.0.0.tgz",
+    "integrity": "sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.5.5",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
-      "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
-      "dev": true,
-      "license": "MIT"
+    "version": "1.5.5",
+    "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
+    "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.53.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.53.3.tgz",
-      "integrity": "sha512-3EhFi1FU6YL8HTUJZ51imGJWEX//ajQPfqWLI3BQq4TlvHy4X0MOr5q3D2Zof/ka0d5FNdPwZXm3Yyib/UEd+w==",
-      "cpu": [
+    "version": "4.53.3",
+    "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.53.3.tgz",
+    "integrity": "sha512-3EhFi1FU6YL8HTUJZ51imGJWEX//ajQPfqWLI3BQq4TlvHy4X0MOr5q3D2Zof/ka0d5FNdPwZXm3Yyib/UEd+w==",
+    "cpu": [
         "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
+    ],
+    "dev": true,
+    "license": "MIT",
+    "optional": true,
+    "os": [
         "linux"
-      ]
+    ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.53.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.53.3.tgz",
-      "integrity": "sha512-eoROhjcc6HbZCJr+tvVT8X4fW3/5g/WkGvvmwz/88sDtSJzO7r/blvoBDgISDiCjDRZmHpwud7h+6Q9JxFwq1Q==",
-      "cpu": [
+    "version": "4.53.3",
+    "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.53.3.tgz",
+    "integrity": "sha512-eoROhjcc6HbZCJr+tvVT8X4fW3/5g/WkGvvmwz/88sDtSJzO7r/blvoBDgISDiCjDRZmHpwud7h+6Q9JxFwq1Q==",
+    "cpu": [
         "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
+    ],
+    "dev": true,
+    "license": "MIT",
+    "optional": true,
+    "os": [
         "linux"
-      ]
+    ]
     },
     "node_modules/@shikijs/core": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/@shikijs/core/-/core-2.5.0.tgz",
-      "integrity": "sha512-uu/8RExTKtavlpH7XqnVYBrfBkUc20ngXiX9NSrBhOVZYv/7XQRKUyhtkeflY5QsxC0GbJThCerruZfsUaSldg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "2.5.0",
+    "resolved": "https://registry.npmjs.org/@shikijs/core/-/core-2.5.0.tgz",
+    "integrity": "sha512-uu/8RExTKtavlpH7XqnVYBrfBkUc20ngXiX9NSrBhOVZYv/7XQRKUyhtkeflY5QsxC0GbJThCerruZfsUaSldg==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@shikijs/engine-javascript": "2.5.0",
         "@shikijs/engine-oniguruma": "2.5.0",
         "@shikijs/types": "2.5.0",
         "@shikijs/vscode-textmate": "^10.0.2",
         "@types/hast": "^3.0.4",
         "hast-util-to-html": "^9.0.4"
-      }
+    }
     },
     "node_modules/@shikijs/engine-javascript": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/@shikijs/engine-javascript/-/engine-javascript-2.5.0.tgz",
-      "integrity": "sha512-VjnOpnQf8WuCEZtNUdjjwGUbtAVKuZkVQ/5cHy/tojVVRIRtlWMYVjyWhxOmIq05AlSOv72z7hRNRGVBgQOl0w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "2.5.0",
+    "resolved": "https://registry.npmjs.org/@shikijs/engine-javascript/-/engine-javascript-2.5.0.tgz",
+    "integrity": "sha512-VjnOpnQf8WuCEZtNUdjjwGUbtAVKuZkVQ/5cHy/tojVVRIRtlWMYVjyWhxOmIq05AlSOv72z7hRNRGVBgQOl0w==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@shikijs/types": "2.5.0",
         "@shikijs/vscode-textmate": "^10.0.2",
         "oniguruma-to-es": "^3.1.0"
-      }
+    }
     },
     "node_modules/@shikijs/engine-oniguruma": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/@shikijs/engine-oniguruma/-/engine-oniguruma-2.5.0.tgz",
-      "integrity": "sha512-pGd1wRATzbo/uatrCIILlAdFVKdxImWJGQ5rFiB5VZi2ve5xj3Ax9jny8QvkaV93btQEwR/rSz5ERFpC5mKNIw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "2.5.0",
+    "resolved": "https://registry.npmjs.org/@shikijs/engine-oniguruma/-/engine-oniguruma-2.5.0.tgz",
+    "integrity": "sha512-pGd1wRATzbo/uatrCIILlAdFVKdxImWJGQ5rFiB5VZi2ve5xj3Ax9jny8QvkaV93btQEwR/rSz5ERFpC5mKNIw==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@shikijs/types": "2.5.0",
         "@shikijs/vscode-textmate": "^10.0.2"
-      }
+    }
     },
     "node_modules/@shikijs/langs": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/@shikijs/langs/-/langs-2.5.0.tgz",
-      "integrity": "sha512-Qfrrt5OsNH5R+5tJ/3uYBBZv3SuGmnRPejV9IlIbFH3HTGLDlkqgHymAlzklVmKBjAaVmkPkyikAV/sQ1wSL+w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "2.5.0",
+    "resolved": "https://registry.npmjs.org/@shikijs/langs/-/langs-2.5.0.tgz",
+    "integrity": "sha512-Qfrrt5OsNH5R+5tJ/3uYBBZv3SuGmnRPejV9IlIbFH3HTGLDlkqgHymAlzklVmKBjAaVmkPkyikAV/sQ1wSL+w==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@shikijs/types": "2.5.0"
-      }
+    }
     },
     "node_modules/@shikijs/themes": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/@shikijs/themes/-/themes-2.5.0.tgz",
-      "integrity": "sha512-wGrk+R8tJnO0VMzmUExHR+QdSaPUl/NKs+a4cQQRWyoc3YFbUzuLEi/KWK1hj+8BfHRKm2jNhhJck1dfstJpiw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "2.5.0",
+    "resolved": "https://registry.npmjs.org/@shikijs/themes/-/themes-2.5.0.tgz",
+    "integrity": "sha512-wGrk+R8tJnO0VMzmUExHR+QdSaPUl/NKs+a4cQQRWyoc3YFbUzuLEi/KWK1hj+8BfHRKm2jNhhJck1dfstJpiw==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@shikijs/types": "2.5.0"
-      }
+    }
     },
     "node_modules/@shikijs/transformers": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/@shikijs/transformers/-/transformers-2.5.0.tgz",
-      "integrity": "sha512-SI494W5X60CaUwgi8u4q4m4s3YAFSxln3tzNjOSYqq54wlVgz0/NbbXEb3mdLbqMBztcmS7bVTaEd2w0qMmfeg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "2.5.0",
+    "resolved": "https://registry.npmjs.org/@shikijs/transformers/-/transformers-2.5.0.tgz",
+    "integrity": "sha512-SI494W5X60CaUwgi8u4q4m4s3YAFSxln3tzNjOSYqq54wlVgz0/NbbXEb3mdLbqMBztcmS7bVTaEd2w0qMmfeg==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@shikijs/core": "2.5.0",
         "@shikijs/types": "2.5.0"
-      }
+    }
     },
     "node_modules/@shikijs/types": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/@shikijs/types/-/types-2.5.0.tgz",
-      "integrity": "sha512-ygl5yhxki9ZLNuNpPitBWvcy9fsSKKaRuO4BAlMyagszQidxcpLAr0qiW/q43DtSIDxO6hEbtYLiFZNXO/hdGw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "2.5.0",
+    "resolved": "https://registry.npmjs.org/@shikijs/types/-/types-2.5.0.tgz",
+    "integrity": "sha512-ygl5yhxki9ZLNuNpPitBWvcy9fsSKKaRuO4BAlMyagszQidxcpLAr0qiW/q43DtSIDxO6hEbtYLiFZNXO/hdGw==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@shikijs/vscode-textmate": "^10.0.2",
         "@types/hast": "^3.0.4"
-      }
+    }
     },
     "node_modules/@shikijs/vscode-textmate": {
-      "version": "10.0.2",
-      "resolved": "https://registry.npmjs.org/@shikijs/vscode-textmate/-/vscode-textmate-10.0.2.tgz",
-      "integrity": "sha512-83yeghZ2xxin3Nj8z1NMd/NCuca+gsYXswywDy5bHvwlWL8tpTQmzGeUuHd9FC3E/SBEMvzJRwWEOz5gGes9Qg==",
-      "dev": true,
-      "license": "MIT"
+    "version": "10.0.2",
+    "resolved": "https://registry.npmjs.org/@shikijs/vscode-textmate/-/vscode-textmate-10.0.2.tgz",
+    "integrity": "sha512-83yeghZ2xxin3Nj8z1NMd/NCuca+gsYXswywDy5bHvwlWL8tpTQmzGeUuHd9FC3E/SBEMvzJRwWEOz5gGes9Qg==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@types/estree": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
-      "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
-      "dev": true,
-      "license": "MIT"
+    "version": "1.0.8",
+    "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
+    "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@types/hast": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.4.tgz",
-      "integrity": "sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "3.0.4",
+    "resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.4.tgz",
+    "integrity": "sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@types/unist": "*"
-      }
+    }
     },
     "node_modules/@types/linkify-it": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-5.0.0.tgz",
-      "integrity": "sha512-sVDA58zAw4eWAffKOaQH5/5j3XeayukzDk+ewSsnv3p4yJEZHCCzMDiZM8e0OUrRvmpGZ85jf4yDHkHsgBNr9Q==",
-      "dev": true,
-      "license": "MIT"
+    "version": "5.0.0",
+    "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-5.0.0.tgz",
+    "integrity": "sha512-sVDA58zAw4eWAffKOaQH5/5j3XeayukzDk+ewSsnv3p4yJEZHCCzMDiZM8e0OUrRvmpGZ85jf4yDHkHsgBNr9Q==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@types/markdown-it": {
-      "version": "14.1.2",
-      "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-14.1.2.tgz",
-      "integrity": "sha512-promo4eFwuiW+TfGxhi+0x3czqTYJkG8qB17ZUJiVF10Xm7NLVRSLUsfRTU/6h1e24VvRnXCx+hG7li58lkzog==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "14.1.2",
+    "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-14.1.2.tgz",
+    "integrity": "sha512-promo4eFwuiW+TfGxhi+0x3czqTYJkG8qB17ZUJiVF10Xm7NLVRSLUsfRTU/6h1e24VvRnXCx+hG7li58lkzog==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@types/linkify-it": "^5",
         "@types/mdurl": "^2"
-      }
+    }
     },
     "node_modules/@types/mdast": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-4.0.4.tgz",
-      "integrity": "sha512-kGaNbPh1k7AFzgpud/gMdvIm5xuECykRR+JnWKQno9TAXVa6WIVCGTPvYGekIDL4uwCZQSYbUxNBSb1aUo79oA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "4.0.4",
+    "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-4.0.4.tgz",
+    "integrity": "sha512-kGaNbPh1k7AFzgpud/gMdvIm5xuECykRR+JnWKQno9TAXVa6WIVCGTPvYGekIDL4uwCZQSYbUxNBSb1aUo79oA==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@types/unist": "*"
-      }
+    }
     },
     "node_modules/@types/mdurl": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-2.0.0.tgz",
-      "integrity": "sha512-RGdgjQUZba5p6QEFAVx2OGb8rQDL/cPRG7GiedRzMcJ1tYnUANBncjbSB1NRGwbvjcPeikRABz2nshyPk1bhWg==",
-      "dev": true,
-      "license": "MIT"
+    "version": "2.0.0",
+    "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-2.0.0.tgz",
+    "integrity": "sha512-RGdgjQUZba5p6QEFAVx2OGb8rQDL/cPRG7GiedRzMcJ1tYnUANBncjbSB1NRGwbvjcPeikRABz2nshyPk1bhWg==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@types/unist": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz",
-      "integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==",
-      "dev": true,
-      "license": "MIT"
+    "version": "3.0.3",
+    "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz",
+    "integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@types/web-bluetooth": {
-      "version": "0.0.21",
-      "resolved": "https://registry.npmjs.org/@types/web-bluetooth/-/web-bluetooth-0.0.21.tgz",
-      "integrity": "sha512-oIQLCGWtcFZy2JW77j9k8nHzAOpqMHLQejDA48XXMWH6tjCQHz5RCFz1bzsmROyL6PUm+LLnUiI4BCn221inxA==",
-      "dev": true,
-      "license": "MIT"
+    "version": "0.0.21",
+    "resolved": "https://registry.npmjs.org/@types/web-bluetooth/-/web-bluetooth-0.0.21.tgz",
+    "integrity": "sha512-oIQLCGWtcFZy2JW77j9k8nHzAOpqMHLQejDA48XXMWH6tjCQHz5RCFz1bzsmROyL6PUm+LLnUiI4BCn221inxA==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@ungap/structured-clone": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.0.tgz",
-      "integrity": "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==",
-      "dev": true,
-      "license": "ISC"
+    "version": "1.3.0",
+    "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.0.tgz",
+    "integrity": "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==",
+    "dev": true,
+    "license": "ISC"
     },
     "node_modules/@vitejs/plugin-vue": {
-      "version": "5.2.4",
-      "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-5.2.4.tgz",
-      "integrity": "sha512-7Yx/SXSOcQq5HiiV3orevHUFn+pmMB4cgbEkDYgnkUWb0WfeQ/wa2yFv6D5ICiCQOVpjA7vYDXrC7AGO8yjDHA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
+    "version": "5.2.4",
+    "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-5.2.4.tgz",
+    "integrity": "sha512-7Yx/SXSOcQq5HiiV3orevHUFn+pmMB4cgbEkDYgnkUWb0WfeQ/wa2yFv6D5ICiCQOVpjA7vYDXrC7AGO8yjDHA==",
+    "dev": true,
+    "license": "MIT",
+    "engines": {
         "node": "^18.0.0 || >=20.0.0"
-      },
-      "peerDependencies": {
+    },
+    "peerDependencies": {
         "vite": "^5.0.0 || ^6.0.0",
         "vue": "^3.2.25"
-      }
+    }
     },
     "node_modules/@vue/compiler-core": {
-      "version": "3.5.24",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.24.tgz",
-      "integrity": "sha512-eDl5H57AOpNakGNAkFDH+y7kTqrQpJkZFXhWZQGyx/5Wh7B1uQYvcWkvZi11BDhscPgj8N7XV3oRwiPnx1Vrig==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "3.5.24",
+    "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.24.tgz",
+    "integrity": "sha512-eDl5H57AOpNakGNAkFDH+y7kTqrQpJkZFXhWZQGyx/5Wh7B1uQYvcWkvZi11BDhscPgj8N7XV3oRwiPnx1Vrig==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@babel/parser": "^7.28.5",
         "@vue/shared": "3.5.24",
         "entities": "^4.5.0",
         "estree-walker": "^2.0.2",
         "source-map-js": "^1.2.1"
-      }
+    }
     },
     "node_modules/@vue/compiler-dom": {
-      "version": "3.5.24",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.24.tgz",
-      "integrity": "sha512-1QHGAvs53gXkWdd3ZMGYuvQFXHW4ksKWPG8HP8/2BscrbZ0brw183q2oNWjMrSWImYLHxHrx1ItBQr50I/q2zw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "3.5.24",
+    "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.24.tgz",
+    "integrity": "sha512-1QHGAvs53gXkWdd3ZMGYuvQFXHW4ksKWPG8HP8/2BscrbZ0brw183q2oNWjMrSWImYLHxHrx1ItBQr50I/q2zw==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@vue/compiler-core": "3.5.24",
         "@vue/shared": "3.5.24"
-      }
+    }
     },
     "node_modules/@vue/compiler-sfc": {
-      "version": "3.5.24",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.24.tgz",
-      "integrity": "sha512-8EG5YPRgmTB+YxYBM3VXy8zHD9SWHUJLIGPhDovo3Z8VOgvP+O7UP5vl0J4BBPWYD9vxtBabzW1EuEZ+Cqs14g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "3.5.24",
+    "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.24.tgz",
+    "integrity": "sha512-8EG5YPRgmTB+YxYBM3VXy8zHD9SWHUJLIGPhDovo3Z8VOgvP+O7UP5vl0J4BBPWYD9vxtBabzW1EuEZ+Cqs14g==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@babel/parser": "^7.28.5",
         "@vue/compiler-core": "3.5.24",
         "@vue/compiler-dom": "3.5.24",
@@ -1262,36 +1262,36 @@
         "magic-string": "^0.30.21",
         "postcss": "^8.5.6",
         "source-map-js": "^1.2.1"
-      }
+    }
     },
     "node_modules/@vue/compiler-ssr": {
-      "version": "3.5.24",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.24.tgz",
-      "integrity": "sha512-trOvMWNBMQ/odMRHW7Ae1CdfYx+7MuiQu62Jtu36gMLXcaoqKvAyh+P73sYG9ll+6jLB6QPovqoKGGZROzkFFg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "3.5.24",
+    "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.24.tgz",
+    "integrity": "sha512-trOvMWNBMQ/odMRHW7Ae1CdfYx+7MuiQu62Jtu36gMLXcaoqKvAyh+P73sYG9ll+6jLB6QPovqoKGGZROzkFFg==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@vue/compiler-dom": "3.5.24",
         "@vue/shared": "3.5.24"
-      }
+    }
     },
     "node_modules/@vue/devtools-api": {
-      "version": "7.7.9",
-      "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-7.7.9.tgz",
-      "integrity": "sha512-kIE8wvwlcZ6TJTbNeU2HQNtaxLx3a84aotTITUuL/4bzfPxzajGBOoqjMhwZJ8L9qFYDU/lAYMEEm11dnZOD6g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "7.7.9",
+    "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-7.7.9.tgz",
+    "integrity": "sha512-kIE8wvwlcZ6TJTbNeU2HQNtaxLx3a84aotTITUuL/4bzfPxzajGBOoqjMhwZJ8L9qFYDU/lAYMEEm11dnZOD6g==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@vue/devtools-kit": "^7.7.9"
-      }
+    }
     },
     "node_modules/@vue/devtools-kit": {
-      "version": "7.7.9",
-      "resolved": "https://registry.npmjs.org/@vue/devtools-kit/-/devtools-kit-7.7.9.tgz",
-      "integrity": "sha512-PyQ6odHSgiDVd4hnTP+aDk2X4gl2HmLDfiyEnn3/oV+ckFDuswRs4IbBT7vacMuGdwY/XemxBoh302ctbsptuA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "7.7.9",
+    "resolved": "https://registry.npmjs.org/@vue/devtools-kit/-/devtools-kit-7.7.9.tgz",
+    "integrity": "sha512-PyQ6odHSgiDVd4hnTP+aDk2X4gl2HmLDfiyEnn3/oV+ckFDuswRs4IbBT7vacMuGdwY/XemxBoh302ctbsptuA==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@vue/devtools-shared": "^7.7.9",
         "birpc": "^2.3.0",
         "hookable": "^5.5.3",
@@ -1299,104 +1299,104 @@
         "perfect-debounce": "^1.0.0",
         "speakingurl": "^14.0.1",
         "superjson": "^2.2.2"
-      }
+    }
     },
     "node_modules/@vue/devtools-shared": {
-      "version": "7.7.9",
-      "resolved": "https://registry.npmjs.org/@vue/devtools-shared/-/devtools-shared-7.7.9.tgz",
-      "integrity": "sha512-iWAb0v2WYf0QWmxCGy0seZNDPdO3Sp5+u78ORnyeonS6MT4PC7VPrryX2BpMJrwlDeaZ6BD4vP4XKjK0SZqaeA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "7.7.9",
+    "resolved": "https://registry.npmjs.org/@vue/devtools-shared/-/devtools-shared-7.7.9.tgz",
+    "integrity": "sha512-iWAb0v2WYf0QWmxCGy0seZNDPdO3Sp5+u78ORnyeonS6MT4PC7VPrryX2BpMJrwlDeaZ6BD4vP4XKjK0SZqaeA==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "rfdc": "^1.4.1"
-      }
+    }
     },
     "node_modules/@vue/reactivity": {
-      "version": "3.5.24",
-      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.24.tgz",
-      "integrity": "sha512-BM8kBhtlkkbnyl4q+HiF5R5BL0ycDPfihowulm02q3WYp2vxgPcJuZO866qa/0u3idbMntKEtVNuAUp5bw4teg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "3.5.24",
+    "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.24.tgz",
+    "integrity": "sha512-BM8kBhtlkkbnyl4q+HiF5R5BL0ycDPfihowulm02q3WYp2vxgPcJuZO866qa/0u3idbMntKEtVNuAUp5bw4teg==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@vue/shared": "3.5.24"
-      }
+    }
     },
     "node_modules/@vue/runtime-core": {
-      "version": "3.5.24",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.24.tgz",
-      "integrity": "sha512-RYP/byyKDgNIqfX/gNb2PB55dJmM97jc9wyF3jK7QUInYKypK2exmZMNwnjueWwGceEkP6NChd3D2ZVEp9undQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "3.5.24",
+    "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.24.tgz",
+    "integrity": "sha512-RYP/byyKDgNIqfX/gNb2PB55dJmM97jc9wyF3jK7QUInYKypK2exmZMNwnjueWwGceEkP6NChd3D2ZVEp9undQ==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@vue/reactivity": "3.5.24",
         "@vue/shared": "3.5.24"
-      }
+    }
     },
     "node_modules/@vue/runtime-dom": {
-      "version": "3.5.24",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.24.tgz",
-      "integrity": "sha512-Z8ANhr/i0XIluonHVjbUkjvn+CyrxbXRIxR7wn7+X7xlcb7dJsfITZbkVOeJZdP8VZwfrWRsWdShH6pngMxRjw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "3.5.24",
+    "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.24.tgz",
+    "integrity": "sha512-Z8ANhr/i0XIluonHVjbUkjvn+CyrxbXRIxR7wn7+X7xlcb7dJsfITZbkVOeJZdP8VZwfrWRsWdShH6pngMxRjw==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@vue/reactivity": "3.5.24",
         "@vue/runtime-core": "3.5.24",
         "@vue/shared": "3.5.24",
         "csstype": "^3.1.3"
-      }
+    }
     },
     "node_modules/@vue/server-renderer": {
-      "version": "3.5.24",
-      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.24.tgz",
-      "integrity": "sha512-Yh2j2Y4G/0/4z/xJ1Bad4mxaAk++C2v4kaa8oSYTMJBJ00/ndPuxCnWeot0/7/qafQFLh5pr6xeV6SdMcE/G1w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "3.5.24",
+    "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.24.tgz",
+    "integrity": "sha512-Yh2j2Y4G/0/4z/xJ1Bad4mxaAk++C2v4kaa8oSYTMJBJ00/ndPuxCnWeot0/7/qafQFLh5pr6xeV6SdMcE/G1w==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@vue/compiler-ssr": "3.5.24",
         "@vue/shared": "3.5.24"
-      },
-      "peerDependencies": {
+    },
+    "peerDependencies": {
         "vue": "3.5.24"
-      }
+    }
     },
     "node_modules/@vue/shared": {
-      "version": "3.5.24",
-      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.24.tgz",
-      "integrity": "sha512-9cwHL2EsJBdi8NY22pngYYWzkTDhld6fAD6jlaeloNGciNSJL6bLpbxVgXl96X00Jtc6YWQv96YA/0sxex/k1A==",
-      "dev": true,
-      "license": "MIT"
+    "version": "3.5.24",
+    "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.24.tgz",
+    "integrity": "sha512-9cwHL2EsJBdi8NY22pngYYWzkTDhld6fAD6jlaeloNGciNSJL6bLpbxVgXl96X00Jtc6YWQv96YA/0sxex/k1A==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/@vueuse/core": {
-      "version": "12.8.2",
-      "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-12.8.2.tgz",
-      "integrity": "sha512-HbvCmZdzAu3VGi/pWYm5Ut+Kd9mn1ZHnn4L5G8kOQTPs/IwIAmJoBrmYk2ckLArgMXZj0AW3n5CAejLUO+PhdQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "12.8.2",
+    "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-12.8.2.tgz",
+    "integrity": "sha512-HbvCmZdzAu3VGi/pWYm5Ut+Kd9mn1ZHnn4L5G8kOQTPs/IwIAmJoBrmYk2ckLArgMXZj0AW3n5CAejLUO+PhdQ==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@types/web-bluetooth": "^0.0.21",
         "@vueuse/metadata": "12.8.2",
         "@vueuse/shared": "12.8.2",
         "vue": "^3.5.13"
-      },
-      "funding": {
+    },
+    "funding": {
         "url": "https://github.com/sponsors/antfu"
-      }
+    }
     },
     "node_modules/@vueuse/integrations": {
-      "version": "12.8.2",
-      "resolved": "https://registry.npmjs.org/@vueuse/integrations/-/integrations-12.8.2.tgz",
-      "integrity": "sha512-fbGYivgK5uBTRt7p5F3zy6VrETlV9RtZjBqd1/HxGdjdckBgBM4ugP8LHpjolqTj14TXTxSK1ZfgPbHYyGuH7g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "12.8.2",
+    "resolved": "https://registry.npmjs.org/@vueuse/integrations/-/integrations-12.8.2.tgz",
+    "integrity": "sha512-fbGYivgK5uBTRt7p5F3zy6VrETlV9RtZjBqd1/HxGdjdckBgBM4ugP8LHpjolqTj14TXTxSK1ZfgPbHYyGuH7g==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@vueuse/core": "12.8.2",
         "@vueuse/shared": "12.8.2",
         "vue": "^3.5.13"
-      },
-      "funding": {
+    },
+    "funding": {
         "url": "https://github.com/sponsors/antfu"
-      },
-      "peerDependencies": {
+    },
+    "peerDependencies": {
         "async-validator": "^4",
         "axios": "^1",
         "change-case": "^5",
@@ -1409,76 +1409,76 @@
         "qrcode": "^1.5",
         "sortablejs": "^1",
         "universal-cookie": "^7"
-      },
-      "peerDependenciesMeta": {
+    },
+    "peerDependenciesMeta": {
         "async-validator": {
-          "optional": true
+        "optional": true
         },
         "axios": {
-          "optional": true
+        "optional": true
         },
         "change-case": {
-          "optional": true
+        "optional": true
         },
         "drauu": {
-          "optional": true
+        "optional": true
         },
         "focus-trap": {
-          "optional": true
+        "optional": true
         },
         "fuse.js": {
-          "optional": true
+        "optional": true
         },
         "idb-keyval": {
-          "optional": true
+        "optional": true
         },
         "jwt-decode": {
-          "optional": true
+        "optional": true
         },
         "nprogress": {
-          "optional": true
+        "optional": true
         },
         "qrcode": {
-          "optional": true
+        "optional": true
         },
         "sortablejs": {
-          "optional": true
+        "optional": true
         },
         "universal-cookie": {
-          "optional": true
+        "optional": true
         }
-      }
+    }
     },
     "node_modules/@vueuse/metadata": {
-      "version": "12.8.2",
-      "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-12.8.2.tgz",
-      "integrity": "sha512-rAyLGEuoBJ/Il5AmFHiziCPdQzRt88VxR+Y/A/QhJ1EWtWqPBBAxTAFaSkviwEuOEZNtW8pvkPgoCZQ+HxqW1A==",
-      "dev": true,
-      "license": "MIT",
-      "funding": {
+    "version": "12.8.2",
+    "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-12.8.2.tgz",
+    "integrity": "sha512-rAyLGEuoBJ/Il5AmFHiziCPdQzRt88VxR+Y/A/QhJ1EWtWqPBBAxTAFaSkviwEuOEZNtW8pvkPgoCZQ+HxqW1A==",
+    "dev": true,
+    "license": "MIT",
+    "funding": {
         "url": "https://github.com/sponsors/antfu"
-      }
+    }
     },
     "node_modules/@vueuse/shared": {
-      "version": "12.8.2",
-      "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-12.8.2.tgz",
-      "integrity": "sha512-dznP38YzxZoNloI0qpEfpkms8knDtaoQ6Y/sfS0L7Yki4zh40LFHEhur0odJC6xTHG5dxWVPiUWBXn+wCG2s5w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "12.8.2",
+    "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-12.8.2.tgz",
+    "integrity": "sha512-dznP38YzxZoNloI0qpEfpkms8knDtaoQ6Y/sfS0L7Yki4zh40LFHEhur0odJC6xTHG5dxWVPiUWBXn+wCG2s5w==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "vue": "^3.5.13"
-      },
-      "funding": {
+    },
+    "funding": {
         "url": "https://github.com/sponsors/antfu"
-      }
+    }
     },
     "node_modules/algoliasearch": {
-      "version": "5.44.0",
-      "resolved": "https://registry.npmjs.org/algoliasearch/-/algoliasearch-5.44.0.tgz",
-      "integrity": "sha512-f8IpsbdQjzTjr/4mJ/jv5UplrtyMnnciGax6/B0OnLCs2/GJTK13O4Y7Ff1AvJVAaztanH+m5nzPoUq6EAy+aA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "5.44.0",
+    "resolved": "https://registry.npmjs.org/algoliasearch/-/algoliasearch-5.44.0.tgz",
+    "integrity": "sha512-f8IpsbdQjzTjr/4mJ/jv5UplrtyMnnciGax6/B0OnLCs2/GJTK13O4Y7Ff1AvJVAaztanH+m5nzPoUq6EAy+aA==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@algolia/abtesting": "1.10.0",
         "@algolia/client-abtesting": "5.44.0",
         "@algolia/client-analytics": "5.44.0",
@@ -1493,183 +1493,183 @@
         "@algolia/requester-browser-xhr": "5.44.0",
         "@algolia/requester-fetch": "5.44.0",
         "@algolia/requester-node-http": "5.44.0"
-      },
-      "engines": {
+    },
+    "engines": {
         "node": ">= 14.0.0"
-      }
+    }
     },
     "node_modules/array-timsort": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/array-timsort/-/array-timsort-1.0.3.tgz",
-      "integrity": "sha512-/+3GRL7dDAGEfM6TseQk/U+mi18TU2Ms9I3UlLdUMhz2hbvGNTKdj9xniwXfUqgYhHxRx0+8UnKkvlNwVU+cWQ==",
-      "dev": true,
-      "license": "MIT"
+    "version": "1.0.3",
+    "resolved": "https://registry.npmjs.org/array-timsort/-/array-timsort-1.0.3.tgz",
+    "integrity": "sha512-/+3GRL7dDAGEfM6TseQk/U+mi18TU2Ms9I3UlLdUMhz2hbvGNTKdj9xniwXfUqgYhHxRx0+8UnKkvlNwVU+cWQ==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/birpc": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/birpc/-/birpc-2.8.0.tgz",
-      "integrity": "sha512-Bz2a4qD/5GRhiHSwj30c/8kC8QGj12nNDwz3D4ErQ4Xhy35dsSDvF+RA/tWpjyU0pdGtSDiEk6B5fBGE1qNVhw==",
-      "dev": true,
-      "license": "MIT",
-      "funding": {
+    "version": "2.8.0",
+    "resolved": "https://registry.npmjs.org/birpc/-/birpc-2.8.0.tgz",
+    "integrity": "sha512-Bz2a4qD/5GRhiHSwj30c/8kC8QGj12nNDwz3D4ErQ4Xhy35dsSDvF+RA/tWpjyU0pdGtSDiEk6B5fBGE1qNVhw==",
+    "dev": true,
+    "license": "MIT",
+    "funding": {
         "url": "https://github.com/sponsors/antfu"
-      }
+    }
     },
     "node_modules/callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
+    "version": "3.1.0",
+    "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+    "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+    "dev": true,
+    "license": "MIT",
+    "engines": {
         "node": ">=6"
-      }
+    }
     },
     "node_modules/ccount": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/ccount/-/ccount-2.0.1.tgz",
-      "integrity": "sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==",
-      "dev": true,
-      "license": "MIT",
-      "funding": {
+    "version": "2.0.1",
+    "resolved": "https://registry.npmjs.org/ccount/-/ccount-2.0.1.tgz",
+    "integrity": "sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==",
+    "dev": true,
+    "license": "MIT",
+    "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/wooorm"
-      }
+    }
     },
     "node_modules/chalk": {
-      "version": "5.6.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.6.2.tgz",
-      "integrity": "sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
+    "version": "5.6.2",
+    "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.6.2.tgz",
+    "integrity": "sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==",
+    "dev": true,
+    "license": "MIT",
+    "engines": {
         "node": "^12.17.0 || ^14.13 || >=16.0.0"
-      },
-      "funding": {
+    },
+    "funding": {
         "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
+    }
     },
     "node_modules/chalk-template": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/chalk-template/-/chalk-template-1.1.2.tgz",
-      "integrity": "sha512-2bxTP2yUH7AJj/VAXfcA+4IcWGdQ87HwBANLt5XxGTeomo8yG0y95N1um9i5StvhT/Bl0/2cARA5v1PpPXUxUA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "1.1.2",
+    "resolved": "https://registry.npmjs.org/chalk-template/-/chalk-template-1.1.2.tgz",
+    "integrity": "sha512-2bxTP2yUH7AJj/VAXfcA+4IcWGdQ87HwBANLt5XxGTeomo8yG0y95N1um9i5StvhT/Bl0/2cARA5v1PpPXUxUA==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "chalk": "^5.2.0"
-      },
-      "engines": {
+    },
+    "engines": {
         "node": ">=14.16"
-      },
-      "funding": {
+    },
+    "funding": {
         "url": "https://github.com/chalk/chalk-template?sponsor=1"
-      }
+    }
     },
     "node_modules/character-entities-html4": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-2.1.0.tgz",
-      "integrity": "sha512-1v7fgQRj6hnSwFpq1Eu0ynr/CDEw0rXo2B61qXrLNdHZmPKgb7fqS1a2JwF0rISo9q77jDI8VMEHoApn8qDoZA==",
-      "dev": true,
-      "license": "MIT",
-      "funding": {
+    "version": "2.1.0",
+    "resolved": "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-2.1.0.tgz",
+    "integrity": "sha512-1v7fgQRj6hnSwFpq1Eu0ynr/CDEw0rXo2B61qXrLNdHZmPKgb7fqS1a2JwF0rISo9q77jDI8VMEHoApn8qDoZA==",
+    "dev": true,
+    "license": "MIT",
+    "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/wooorm"
-      }
+    }
     },
     "node_modules/character-entities-legacy": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-3.0.0.tgz",
-      "integrity": "sha512-RpPp0asT/6ufRm//AJVwpViZbGM/MkjQFxJccQRHmISF/22NBtsHqAWmL+/pmkPWoIUJdWyeVleTl1wydHATVQ==",
-      "dev": true,
-      "license": "MIT",
-      "funding": {
+    "version": "3.0.0",
+    "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-3.0.0.tgz",
+    "integrity": "sha512-RpPp0asT/6ufRm//AJVwpViZbGM/MkjQFxJccQRHmISF/22NBtsHqAWmL+/pmkPWoIUJdWyeVleTl1wydHATVQ==",
+    "dev": true,
+    "license": "MIT",
+    "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/wooorm"
-      }
+    }
     },
     "node_modules/clear-module": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/clear-module/-/clear-module-4.1.2.tgz",
-      "integrity": "sha512-LWAxzHqdHsAZlPlEyJ2Poz6AIs384mPeqLVCru2p0BrP9G/kVGuhNyZYClLO6cXlnuJjzC8xtsJIuMjKqLXoAw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "4.1.2",
+    "resolved": "https://registry.npmjs.org/clear-module/-/clear-module-4.1.2.tgz",
+    "integrity": "sha512-LWAxzHqdHsAZlPlEyJ2Poz6AIs384mPeqLVCru2p0BrP9G/kVGuhNyZYClLO6cXlnuJjzC8xtsJIuMjKqLXoAw==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "parent-module": "^2.0.0",
         "resolve-from": "^5.0.0"
-      },
-      "engines": {
+    },
+    "engines": {
         "node": ">=8"
-      },
-      "funding": {
+    },
+    "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
-      }
+    }
     },
     "node_modules/comma-separated-tokens": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-2.0.3.tgz",
-      "integrity": "sha512-Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg==",
-      "dev": true,
-      "license": "MIT",
-      "funding": {
+    "version": "2.0.3",
+    "resolved": "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-2.0.3.tgz",
+    "integrity": "sha512-Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg==",
+    "dev": true,
+    "license": "MIT",
+    "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/wooorm"
-      }
+    }
     },
     "node_modules/commander": {
-      "version": "14.0.2",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-14.0.2.tgz",
-      "integrity": "sha512-TywoWNNRbhoD0BXs1P3ZEScW8W5iKrnbithIl0YH+uCmBd0QpPOA8yc82DS3BIE5Ma6FnBVUsJ7wVUDz4dvOWQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
+    "version": "14.0.2",
+    "resolved": "https://registry.npmjs.org/commander/-/commander-14.0.2.tgz",
+    "integrity": "sha512-TywoWNNRbhoD0BXs1P3ZEScW8W5iKrnbithIl0YH+uCmBd0QpPOA8yc82DS3BIE5Ma6FnBVUsJ7wVUDz4dvOWQ==",
+    "dev": true,
+    "license": "MIT",
+    "engines": {
         "node": ">=20"
-      }
+    }
     },
     "node_modules/comment-json": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/comment-json/-/comment-json-4.4.1.tgz",
-      "integrity": "sha512-r1To31BQD5060QdkC+Iheai7gHwoSZobzunqkf2/kQ6xIAfJyrKNAFUwdKvkK7Qgu7pVTKQEa7ok7Ed3ycAJgg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "4.4.1",
+    "resolved": "https://registry.npmjs.org/comment-json/-/comment-json-4.4.1.tgz",
+    "integrity": "sha512-r1To31BQD5060QdkC+Iheai7gHwoSZobzunqkf2/kQ6xIAfJyrKNAFUwdKvkK7Qgu7pVTKQEa7ok7Ed3ycAJgg==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "array-timsort": "^1.0.3",
         "core-util-is": "^1.0.3",
         "esprima": "^4.0.1"
-      },
-      "engines": {
+    },
+    "engines": {
         "node": ">= 6"
-      }
+    }
     },
     "node_modules/copy-anything": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-4.0.5.tgz",
-      "integrity": "sha512-7Vv6asjS4gMOuILabD3l739tsaxFQmC+a7pLZm02zyvs8p977bL3zEgq3yDk5rn9B0PbYgIv++jmHcuUab4RhA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "4.0.5",
+    "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-4.0.5.tgz",
+    "integrity": "sha512-7Vv6asjS4gMOuILabD3l739tsaxFQmC+a7pLZm02zyvs8p977bL3zEgq3yDk5rn9B0PbYgIv++jmHcuUab4RhA==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "is-what": "^5.2.0"
-      },
-      "engines": {
+    },
+    "engines": {
         "node": ">=18"
-      },
-      "funding": {
+    },
+    "funding": {
         "url": "https://github.com/sponsors/mesqueeb"
-      }
+    }
     },
     "node_modules/core-util-is": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
-      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
-      "dev": true,
-      "license": "MIT"
+    "version": "1.0.3",
+    "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+    "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/cspell": {
-      "version": "9.3.2",
-      "resolved": "https://registry.npmjs.org/cspell/-/cspell-9.3.2.tgz",
-      "integrity": "sha512-3xFyVSTYrYa/QJzLfzsCRMkMXqOsytP8E26DuGrVMJQoLPFmbOXNNtnMu4wrtr17QVloxpvutW77U4vb2L/LDQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "9.3.2",
+    "resolved": "https://registry.npmjs.org/cspell/-/cspell-9.3.2.tgz",
+    "integrity": "sha512-3xFyVSTYrYa/QJzLfzsCRMkMXqOsytP8E26DuGrVMJQoLPFmbOXNNtnMu4wrtr17QVloxpvutW77U4vb2L/LDQ==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@cspell/cspell-json-reporter": "9.3.2",
         "@cspell/cspell-pipe": "9.3.2",
         "@cspell/cspell-types": "9.3.2",
@@ -1688,120 +1688,120 @@
         "flatted": "^3.3.3",
         "semver": "^7.7.3",
         "tinyglobby": "^0.2.15"
-      },
-      "bin": {
+    },
+    "bin": {
         "cspell": "bin.mjs",
         "cspell-esm": "bin.mjs"
-      },
-      "engines": {
+    },
+    "engines": {
         "node": ">=20"
-      },
-      "funding": {
+    },
+    "funding": {
         "url": "https://github.com/streetsidesoftware/cspell?sponsor=1"
-      }
+    }
     },
     "node_modules/cspell-config-lib": {
-      "version": "9.3.2",
-      "resolved": "https://registry.npmjs.org/cspell-config-lib/-/cspell-config-lib-9.3.2.tgz",
-      "integrity": "sha512-zXhmA4rqgWQRTVijI+g/mgiep76TvTO4d+P3CHwcqLG57BKVzoW+jkO4qDLC+Neh4b8+CcNWEIr3w16BfuEJAA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "9.3.2",
+    "resolved": "https://registry.npmjs.org/cspell-config-lib/-/cspell-config-lib-9.3.2.tgz",
+    "integrity": "sha512-zXhmA4rqgWQRTVijI+g/mgiep76TvTO4d+P3CHwcqLG57BKVzoW+jkO4qDLC+Neh4b8+CcNWEIr3w16BfuEJAA==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@cspell/cspell-types": "9.3.2",
         "comment-json": "^4.4.1",
         "smol-toml": "^1.5.2",
         "yaml": "^2.8.1"
-      },
-      "engines": {
+    },
+    "engines": {
         "node": ">=20"
-      }
+    }
     },
     "node_modules/cspell-dictionary": {
-      "version": "9.3.2",
-      "resolved": "https://registry.npmjs.org/cspell-dictionary/-/cspell-dictionary-9.3.2.tgz",
-      "integrity": "sha512-E3YhOhZzZt1a+AEbFV2B3THCyZ576PDg0mDNUDrU1Y65SyIhf4DC6itfPoAb6R3FI/DI218RqWZg/FTT8lJ2gA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "9.3.2",
+    "resolved": "https://registry.npmjs.org/cspell-dictionary/-/cspell-dictionary-9.3.2.tgz",
+    "integrity": "sha512-E3YhOhZzZt1a+AEbFV2B3THCyZ576PDg0mDNUDrU1Y65SyIhf4DC6itfPoAb6R3FI/DI218RqWZg/FTT8lJ2gA==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@cspell/cspell-pipe": "9.3.2",
         "@cspell/cspell-types": "9.3.2",
         "cspell-trie-lib": "9.3.2",
         "fast-equals": "^5.3.3"
-      },
-      "engines": {
+    },
+    "engines": {
         "node": ">=20"
-      }
+    }
     },
     "node_modules/cspell-gitignore": {
-      "version": "9.3.2",
-      "resolved": "https://registry.npmjs.org/cspell-gitignore/-/cspell-gitignore-9.3.2.tgz",
-      "integrity": "sha512-G2bLR+Dfb9GX4Sdm75GfCCa9V/sQYkRbLckuCuVmJxvcDB0xfczAtb6TfAXIziF3oUI6cOB1g+PoNLWBelcK5w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "9.3.2",
+    "resolved": "https://registry.npmjs.org/cspell-gitignore/-/cspell-gitignore-9.3.2.tgz",
+    "integrity": "sha512-G2bLR+Dfb9GX4Sdm75GfCCa9V/sQYkRbLckuCuVmJxvcDB0xfczAtb6TfAXIziF3oUI6cOB1g+PoNLWBelcK5w==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@cspell/url": "9.3.2",
         "cspell-glob": "9.3.2",
         "cspell-io": "9.3.2"
-      },
-      "bin": {
+    },
+    "bin": {
         "cspell-gitignore": "bin.mjs"
-      },
-      "engines": {
+    },
+    "engines": {
         "node": ">=20"
-      }
+    }
     },
     "node_modules/cspell-glob": {
-      "version": "9.3.2",
-      "resolved": "https://registry.npmjs.org/cspell-glob/-/cspell-glob-9.3.2.tgz",
-      "integrity": "sha512-TuSupENEKyOCupOUZ3vnPxaTOghxY/rD1JIkb8e5kjzRprYVilO/rYqEk/52iLwJVd+4Npe8fNhR3KhU7u/UUg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "9.3.2",
+    "resolved": "https://registry.npmjs.org/cspell-glob/-/cspell-glob-9.3.2.tgz",
+    "integrity": "sha512-TuSupENEKyOCupOUZ3vnPxaTOghxY/rD1JIkb8e5kjzRprYVilO/rYqEk/52iLwJVd+4Npe8fNhR3KhU7u/UUg==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@cspell/url": "9.3.2",
         "picomatch": "^4.0.3"
-      },
-      "engines": {
+    },
+    "engines": {
         "node": ">=20"
-      }
+    }
     },
     "node_modules/cspell-grammar": {
-      "version": "9.3.2",
-      "resolved": "https://registry.npmjs.org/cspell-grammar/-/cspell-grammar-9.3.2.tgz",
-      "integrity": "sha512-ysonrFu9vJvF/derDlEjUfmvLeCfNOWPh00t6Yh093AKrJFoWQiyaS/5bEN/uB5/n1sa4k3ItnWvuTp3+YuZsA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "9.3.2",
+    "resolved": "https://registry.npmjs.org/cspell-grammar/-/cspell-grammar-9.3.2.tgz",
+    "integrity": "sha512-ysonrFu9vJvF/derDlEjUfmvLeCfNOWPh00t6Yh093AKrJFoWQiyaS/5bEN/uB5/n1sa4k3ItnWvuTp3+YuZsA==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@cspell/cspell-pipe": "9.3.2",
         "@cspell/cspell-types": "9.3.2"
-      },
-      "bin": {
+    },
+    "bin": {
         "cspell-grammar": "bin.mjs"
-      },
-      "engines": {
+    },
+    "engines": {
         "node": ">=20"
-      }
+    }
     },
     "node_modules/cspell-io": {
-      "version": "9.3.2",
-      "resolved": "https://registry.npmjs.org/cspell-io/-/cspell-io-9.3.2.tgz",
-      "integrity": "sha512-ahoULCp0j12TyXXmIcdO/7x65A/2mzUQO1IkOC65OXEbNT+evt0yswSO5Nr1F6kCHDuEKc46EZWwsYAzj78pMg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "9.3.2",
+    "resolved": "https://registry.npmjs.org/cspell-io/-/cspell-io-9.3.2.tgz",
+    "integrity": "sha512-ahoULCp0j12TyXXmIcdO/7x65A/2mzUQO1IkOC65OXEbNT+evt0yswSO5Nr1F6kCHDuEKc46EZWwsYAzj78pMg==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@cspell/cspell-service-bus": "9.3.2",
         "@cspell/url": "9.3.2"
-      },
-      "engines": {
+    },
+    "engines": {
         "node": ">=20"
-      }
+    }
     },
     "node_modules/cspell-lib": {
-      "version": "9.3.2",
-      "resolved": "https://registry.npmjs.org/cspell-lib/-/cspell-lib-9.3.2.tgz",
-      "integrity": "sha512-kdk11kib68zNANNICuOA8h4oA9kENQUAdeX/uvT4+7eHbHHV8WSgjXm4k4o/pRIbg164UJTX/XxKb/65ftn5jw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "9.3.2",
+    "resolved": "https://registry.npmjs.org/cspell-lib/-/cspell-lib-9.3.2.tgz",
+    "integrity": "sha512-kdk11kib68zNANNICuOA8h4oA9kENQUAdeX/uvT4+7eHbHHV8WSgjXm4k4o/pRIbg164UJTX/XxKb/65ftn5jw==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@cspell/cspell-bundled-dicts": "9.3.2",
         "@cspell/cspell-pipe": "9.3.2",
         "@cspell/cspell-resolver": "9.3.2",
@@ -1824,104 +1824,104 @@
         "vscode-languageserver-textdocument": "^1.0.12",
         "vscode-uri": "^3.1.0",
         "xdg-basedir": "^5.1.0"
-      },
-      "engines": {
+    },
+    "engines": {
         "node": ">=20"
-      }
+    }
     },
     "node_modules/cspell-trie-lib": {
-      "version": "9.3.2",
-      "resolved": "https://registry.npmjs.org/cspell-trie-lib/-/cspell-trie-lib-9.3.2.tgz",
-      "integrity": "sha512-1Af7Mq9jIccFQyJl/ZCcqQbtJwuDqpQVkk8xfs/92x4OI6gW1iTVRMtsrh0RTw1HZoR8aQD7tRRCiLPf/D+UiQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "9.3.2",
+    "resolved": "https://registry.npmjs.org/cspell-trie-lib/-/cspell-trie-lib-9.3.2.tgz",
+    "integrity": "sha512-1Af7Mq9jIccFQyJl/ZCcqQbtJwuDqpQVkk8xfs/92x4OI6gW1iTVRMtsrh0RTw1HZoR8aQD7tRRCiLPf/D+UiQ==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@cspell/cspell-pipe": "9.3.2",
         "@cspell/cspell-types": "9.3.2",
         "gensequence": "^8.0.8"
-      },
-      "engines": {
+    },
+    "engines": {
         "node": ">=20"
-      }
+    }
     },
     "node_modules/csstype": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.2.3.tgz",
-      "integrity": "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==",
-      "dev": true,
-      "license": "MIT"
+    "version": "3.2.3",
+    "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.2.3.tgz",
+    "integrity": "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/dequal": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
-      "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
+    "version": "2.0.3",
+    "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
+    "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==",
+    "dev": true,
+    "license": "MIT",
+    "engines": {
         "node": ">=6"
-      }
+    }
     },
     "node_modules/devlop": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/devlop/-/devlop-1.1.0.tgz",
-      "integrity": "sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "1.1.0",
+    "resolved": "https://registry.npmjs.org/devlop/-/devlop-1.1.0.tgz",
+    "integrity": "sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "dequal": "^2.0.0"
-      },
-      "funding": {
+    },
+    "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/wooorm"
-      }
+    }
     },
     "node_modules/emoji-regex-xs": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex-xs/-/emoji-regex-xs-1.0.0.tgz",
-      "integrity": "sha512-LRlerrMYoIDrT6jgpeZ2YYl/L8EulRTt5hQcYjy5AInh7HWXKimpqx68aknBFpGL2+/IcogTcaydJEgaTmOpDg==",
-      "dev": true,
-      "license": "MIT"
+    "version": "1.0.0",
+    "resolved": "https://registry.npmjs.org/emoji-regex-xs/-/emoji-regex-xs-1.0.0.tgz",
+    "integrity": "sha512-LRlerrMYoIDrT6jgpeZ2YYl/L8EulRTt5hQcYjy5AInh7HWXKimpqx68aknBFpGL2+/IcogTcaydJEgaTmOpDg==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/entities": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
-      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "engines": {
+    "version": "4.5.0",
+    "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+    "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+    "dev": true,
+    "license": "BSD-2-Clause",
+    "engines": {
         "node": ">=0.12"
-      },
-      "funding": {
+    },
+    "funding": {
         "url": "https://github.com/fb55/entities?sponsor=1"
-      }
+    }
     },
     "node_modules/env-paths": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-3.0.0.tgz",
-      "integrity": "sha512-dtJUTepzMW3Lm/NPxRf3wP4642UWhjL2sQxc+ym2YMj1m/H2zDNQOlezafzkHwn6sMstjHTwG6iQQsctDW/b1A==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
+    "version": "3.0.0",
+    "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-3.0.0.tgz",
+    "integrity": "sha512-dtJUTepzMW3Lm/NPxRf3wP4642UWhjL2sQxc+ym2YMj1m/H2zDNQOlezafzkHwn6sMstjHTwG6iQQsctDW/b1A==",
+    "dev": true,
+    "license": "MIT",
+    "engines": {
         "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
+    },
+    "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
-      }
+    }
     },
     "node_modules/esbuild": {
-      "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
-      "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
-      "dev": true,
-      "hasInstallScript": true,
-      "license": "MIT",
-      "bin": {
+    "version": "0.21.5",
+    "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
+    "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
+    "dev": true,
+    "hasInstallScript": true,
+    "license": "MIT",
+    "bin": {
         "esbuild": "bin/esbuild"
-      },
-      "engines": {
+    },
+    "engines": {
         "node": ">=12"
-      },
-      "optionalDependencies": {
+    },
+    "optionalDependencies": {
         "@esbuild/aix-ppc64": "0.21.5",
         "@esbuild/android-arm": "0.21.5",
         "@esbuild/android-arm64": "0.21.5",
@@ -1945,129 +1945,129 @@
         "@esbuild/win32-arm64": "0.21.5",
         "@esbuild/win32-ia32": "0.21.5",
         "@esbuild/win32-x64": "0.21.5"
-      }
+    }
     },
     "node_modules/esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "bin": {
+    "version": "4.0.1",
+    "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+    "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+    "dev": true,
+    "license": "BSD-2-Clause",
+    "bin": {
         "esparse": "bin/esparse.js",
         "esvalidate": "bin/esvalidate.js"
-      },
-      "engines": {
+    },
+    "engines": {
         "node": ">=4"
-      }
+    }
     },
     "node_modules/estree-walker": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
-      "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
-      "dev": true,
-      "license": "MIT"
+    "version": "2.0.2",
+    "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
+    "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/fast-equals": {
-      "version": "5.3.3",
-      "resolved": "https://registry.npmjs.org/fast-equals/-/fast-equals-5.3.3.tgz",
-      "integrity": "sha512-/boTcHZeIAQ2r/tL11voclBHDeP9WPxLt+tyAbVSyyXuUFyh0Tne7gJZTqGbxnvj79TjLdCXLOY7UIPhyG5MTw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
+    "version": "5.3.3",
+    "resolved": "https://registry.npmjs.org/fast-equals/-/fast-equals-5.3.3.tgz",
+    "integrity": "sha512-/boTcHZeIAQ2r/tL11voclBHDeP9WPxLt+tyAbVSyyXuUFyh0Tne7gJZTqGbxnvj79TjLdCXLOY7UIPhyG5MTw==",
+    "dev": true,
+    "license": "MIT",
+    "engines": {
         "node": ">=6.0.0"
-      }
+    }
     },
     "node_modules/fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true,
-      "license": "MIT"
+    "version": "2.1.0",
+    "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+    "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/fdir": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
-      "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
+    "version": "6.5.0",
+    "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
+    "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
+    "dev": true,
+    "license": "MIT",
+    "engines": {
         "node": ">=12.0.0"
-      },
-      "peerDependencies": {
+    },
+    "peerDependencies": {
         "picomatch": "^3 || ^4"
-      },
-      "peerDependenciesMeta": {
+    },
+    "peerDependenciesMeta": {
         "picomatch": {
-          "optional": true
+        "optional": true
         }
-      }
+    }
     },
     "node_modules/flatted": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz",
-      "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==",
-      "dev": true,
-      "license": "ISC"
+    "version": "3.3.3",
+    "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz",
+    "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==",
+    "dev": true,
+    "license": "ISC"
     },
     "node_modules/focus-trap": {
-      "version": "7.6.6",
-      "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-7.6.6.tgz",
-      "integrity": "sha512-v/Z8bvMCajtx4mEXmOo7QEsIzlIOqRXTIwgUfsFOF9gEsespdbD0AkPIka1bSXZ8Y8oZ+2IVDQZePkTfEHZl7Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "7.6.6",
+    "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-7.6.6.tgz",
+    "integrity": "sha512-v/Z8bvMCajtx4mEXmOo7QEsIzlIOqRXTIwgUfsFOF9gEsespdbD0AkPIka1bSXZ8Y8oZ+2IVDQZePkTfEHZl7Q==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "tabbable": "^6.3.0"
-      }
+    }
     },
     "node_modules/fsevents": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "dev": true,
-      "hasInstallScript": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
+    "version": "2.3.3",
+    "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+    "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+    "dev": true,
+    "hasInstallScript": true,
+    "license": "MIT",
+    "optional": true,
+    "os": [
         "darwin"
-      ],
-      "engines": {
+    ],
+    "engines": {
         "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
+    }
     },
     "node_modules/gensequence": {
-      "version": "8.0.8",
-      "resolved": "https://registry.npmjs.org/gensequence/-/gensequence-8.0.8.tgz",
-      "integrity": "sha512-omMVniXEXpdx/vKxGnPRoO2394Otlze28TyxECbFVyoSpZ9H3EO7lemjcB12OpQJzRW4e5tt/dL1rOxry6aMHg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
+    "version": "8.0.8",
+    "resolved": "https://registry.npmjs.org/gensequence/-/gensequence-8.0.8.tgz",
+    "integrity": "sha512-omMVniXEXpdx/vKxGnPRoO2394Otlze28TyxECbFVyoSpZ9H3EO7lemjcB12OpQJzRW4e5tt/dL1rOxry6aMHg==",
+    "dev": true,
+    "license": "MIT",
+    "engines": {
         "node": ">=20"
-      }
+    }
     },
     "node_modules/global-directory": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/global-directory/-/global-directory-4.0.1.tgz",
-      "integrity": "sha512-wHTUcDUoZ1H5/0iVqEudYW4/kAlN5cZ3j/bXn0Dpbizl9iaUVeWSHqiOjsgk6OW2bkLclbBjzewBz6weQ1zA2Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "4.0.1",
+    "resolved": "https://registry.npmjs.org/global-directory/-/global-directory-4.0.1.tgz",
+    "integrity": "sha512-wHTUcDUoZ1H5/0iVqEudYW4/kAlN5cZ3j/bXn0Dpbizl9iaUVeWSHqiOjsgk6OW2bkLclbBjzewBz6weQ1zA2Q==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "ini": "4.1.1"
-      },
-      "engines": {
+    },
+    "engines": {
         "node": ">=18"
-      },
-      "funding": {
+    },
+    "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
-      }
+    }
     },
     "node_modules/hast-util-to-html": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/hast-util-to-html/-/hast-util-to-html-9.0.5.tgz",
-      "integrity": "sha512-OguPdidb+fbHQSU4Q4ZiLKnzWo8Wwsf5bZfbvu7//a9oTYoqD/fWpe96NuHkoS9h0ccGOTe0C4NGXdtS0iObOw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "9.0.5",
+    "resolved": "https://registry.npmjs.org/hast-util-to-html/-/hast-util-to-html-9.0.5.tgz",
+    "integrity": "sha512-OguPdidb+fbHQSU4Q4ZiLKnzWo8Wwsf5bZfbvu7//a9oTYoqD/fWpe96NuHkoS9h0ccGOTe0C4NGXdtS0iObOw==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@types/hast": "^3.0.0",
         "@types/unist": "^3.0.0",
         "ccount": "^2.0.0",
@@ -2079,142 +2079,142 @@
         "space-separated-tokens": "^2.0.0",
         "stringify-entities": "^4.0.0",
         "zwitch": "^2.0.4"
-      },
-      "funding": {
+    },
+    "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/unified"
-      }
+    }
     },
     "node_modules/hast-util-whitespace": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/hast-util-whitespace/-/hast-util-whitespace-3.0.0.tgz",
-      "integrity": "sha512-88JUN06ipLwsnv+dVn+OIYOvAuvBMy/Qoi6O7mQHxdPXpjy+Cd6xRkWwux7DKO+4sYILtLBRIKgsdpS2gQc7qw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "3.0.0",
+    "resolved": "https://registry.npmjs.org/hast-util-whitespace/-/hast-util-whitespace-3.0.0.tgz",
+    "integrity": "sha512-88JUN06ipLwsnv+dVn+OIYOvAuvBMy/Qoi6O7mQHxdPXpjy+Cd6xRkWwux7DKO+4sYILtLBRIKgsdpS2gQc7qw==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@types/hast": "^3.0.0"
-      },
-      "funding": {
+    },
+    "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/unified"
-      }
+    }
     },
     "node_modules/hookable": {
-      "version": "5.5.3",
-      "resolved": "https://registry.npmjs.org/hookable/-/hookable-5.5.3.tgz",
-      "integrity": "sha512-Yc+BQe8SvoXH1643Qez1zqLRmbA5rCL+sSmk6TVos0LWVfNIB7PGncdlId77WzLGSIB5KaWgTaNTs2lNVEI6VQ==",
-      "dev": true,
-      "license": "MIT"
+    "version": "5.5.3",
+    "resolved": "https://registry.npmjs.org/hookable/-/hookable-5.5.3.tgz",
+    "integrity": "sha512-Yc+BQe8SvoXH1643Qez1zqLRmbA5rCL+sSmk6TVos0LWVfNIB7PGncdlId77WzLGSIB5KaWgTaNTs2lNVEI6VQ==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/html-void-elements": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/html-void-elements/-/html-void-elements-3.0.0.tgz",
-      "integrity": "sha512-bEqo66MRXsUGxWHV5IP0PUiAWwoEjba4VCzg0LjFJBpchPaTfyfCKTG6bc5F8ucKec3q5y6qOdGyYTSBEvhCrg==",
-      "dev": true,
-      "license": "MIT",
-      "funding": {
+    "version": "3.0.0",
+    "resolved": "https://registry.npmjs.org/html-void-elements/-/html-void-elements-3.0.0.tgz",
+    "integrity": "sha512-bEqo66MRXsUGxWHV5IP0PUiAWwoEjba4VCzg0LjFJBpchPaTfyfCKTG6bc5F8ucKec3q5y6qOdGyYTSBEvhCrg==",
+    "dev": true,
+    "license": "MIT",
+    "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/wooorm"
-      }
+    }
     },
     "node_modules/import-fresh": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz",
-      "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "3.3.1",
+    "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz",
+    "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "parent-module": "^1.0.0",
         "resolve-from": "^4.0.0"
-      },
-      "engines": {
+    },
+    "engines": {
         "node": ">=6"
-      },
-      "funding": {
+    },
+    "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
-      }
+    }
     },
     "node_modules/import-fresh/node_modules/parent-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "1.0.1",
+    "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+    "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "callsites": "^3.0.0"
-      },
-      "engines": {
+    },
+    "engines": {
         "node": ">=6"
-      }
+    }
     },
     "node_modules/import-fresh/node_modules/resolve-from": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
+    "version": "4.0.0",
+    "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+    "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+    "dev": true,
+    "license": "MIT",
+    "engines": {
         "node": ">=4"
-      }
+    }
     },
     "node_modules/import-meta-resolve": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-4.2.0.tgz",
-      "integrity": "sha512-Iqv2fzaTQN28s/FwZAoFq0ZSs/7hMAHJVX+w8PZl3cY19Pxk6jFFalxQoIfW2826i/fDLXv8IiEZRIT0lDuWcg==",
-      "dev": true,
-      "license": "MIT",
-      "funding": {
+    "version": "4.2.0",
+    "resolved": "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-4.2.0.tgz",
+    "integrity": "sha512-Iqv2fzaTQN28s/FwZAoFq0ZSs/7hMAHJVX+w8PZl3cY19Pxk6jFFalxQoIfW2826i/fDLXv8IiEZRIT0lDuWcg==",
+    "dev": true,
+    "license": "MIT",
+    "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/wooorm"
-      }
+    }
     },
     "node_modules/ini": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.1.tgz",
-      "integrity": "sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
+    "version": "4.1.1",
+    "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.1.tgz",
+    "integrity": "sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g==",
+    "dev": true,
+    "license": "ISC",
+    "engines": {
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
+    }
     },
     "node_modules/is-what": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/is-what/-/is-what-5.5.0.tgz",
-      "integrity": "sha512-oG7cgbmg5kLYae2N5IVd3jm2s+vldjxJzK1pcu9LfpGuQ93MQSzo0okvRna+7y5ifrD+20FE8FvjusyGaz14fw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
+    "version": "5.5.0",
+    "resolved": "https://registry.npmjs.org/is-what/-/is-what-5.5.0.tgz",
+    "integrity": "sha512-oG7cgbmg5kLYae2N5IVd3jm2s+vldjxJzK1pcu9LfpGuQ93MQSzo0okvRna+7y5ifrD+20FE8FvjusyGaz14fw==",
+    "dev": true,
+    "license": "MIT",
+    "engines": {
         "node": ">=18"
-      },
-      "funding": {
+    },
+    "funding": {
         "url": "https://github.com/sponsors/mesqueeb"
-      }
+    }
     },
     "node_modules/magic-string": {
-      "version": "0.30.21",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz",
-      "integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "0.30.21",
+    "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz",
+    "integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@jridgewell/sourcemap-codec": "^1.5.5"
-      }
+    }
     },
     "node_modules/mark.js": {
-      "version": "8.11.1",
-      "resolved": "https://registry.npmjs.org/mark.js/-/mark.js-8.11.1.tgz",
-      "integrity": "sha512-1I+1qpDt4idfgLQG+BNWmrqku+7/2bi5nLf4YwF8y8zXvmfiTBY3PV3ZibfrjBueCByROpuBjLLFCajqkgYoLQ==",
-      "dev": true,
-      "license": "MIT"
+    "version": "8.11.1",
+    "resolved": "https://registry.npmjs.org/mark.js/-/mark.js-8.11.1.tgz",
+    "integrity": "sha512-1I+1qpDt4idfgLQG+BNWmrqku+7/2bi5nLf4YwF8y8zXvmfiTBY3PV3ZibfrjBueCByROpuBjLLFCajqkgYoLQ==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/mdast-util-to-hast": {
-      "version": "13.2.1",
-      "resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-13.2.1.tgz",
-      "integrity": "sha512-cctsq2wp5vTsLIcaymblUriiTcZd0CwWtCbLvrOzYCDZoWyMNV8sZ7krj09FSnsiJi3WVsHLM4k6Dq/yaPyCXA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "13.2.1",
+    "resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-13.2.1.tgz",
+    "integrity": "sha512-cctsq2wp5vTsLIcaymblUriiTcZd0CwWtCbLvrOzYCDZoWyMNV8sZ7krj09FSnsiJi3WVsHLM4k6Dq/yaPyCXA==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@types/hast": "^3.0.0",
         "@types/mdast": "^4.0.0",
         "@ungap/structured-clone": "^1.0.0",
@@ -2224,319 +2224,319 @@
         "unist-util-position": "^5.0.0",
         "unist-util-visit": "^5.0.0",
         "vfile": "^6.0.0"
-      },
-      "funding": {
+    },
+    "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/unified"
-      }
+    }
     },
     "node_modules/micromark-util-character": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.1.tgz",
-      "integrity": "sha512-wv8tdUTJ3thSFFFJKtpYKOYiGP2+v96Hvk4Tu8KpCAsTMs6yi+nVmGh1syvSCsaxz45J6Jbw+9DD6g97+NV67Q==",
-      "dev": true,
-      "funding": [
+    "version": "2.1.1",
+    "resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.1.tgz",
+    "integrity": "sha512-wv8tdUTJ3thSFFFJKtpYKOYiGP2+v96Hvk4Tu8KpCAsTMs6yi+nVmGh1syvSCsaxz45J6Jbw+9DD6g97+NV67Q==",
+    "dev": true,
+    "funding": [
         {
-          "type": "GitHub Sponsors",
-          "url": "https://github.com/sponsors/unifiedjs"
+        "type": "GitHub Sponsors",
+        "url": "https://github.com/sponsors/unifiedjs"
         },
         {
-          "type": "OpenCollective",
-          "url": "https://opencollective.com/unified"
+        "type": "OpenCollective",
+        "url": "https://opencollective.com/unified"
         }
-      ],
-      "license": "MIT",
-      "dependencies": {
+    ],
+    "license": "MIT",
+    "dependencies": {
         "micromark-util-symbol": "^2.0.0",
         "micromark-util-types": "^2.0.0"
-      }
+    }
     },
     "node_modules/micromark-util-encode": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/micromark-util-encode/-/micromark-util-encode-2.0.1.tgz",
-      "integrity": "sha512-c3cVx2y4KqUnwopcO9b/SCdo2O67LwJJ/UyqGfbigahfegL9myoEFoDYZgkT7f36T0bLrM9hZTAaAyH+PCAXjw==",
-      "dev": true,
-      "funding": [
+    "version": "2.0.1",
+    "resolved": "https://registry.npmjs.org/micromark-util-encode/-/micromark-util-encode-2.0.1.tgz",
+    "integrity": "sha512-c3cVx2y4KqUnwopcO9b/SCdo2O67LwJJ/UyqGfbigahfegL9myoEFoDYZgkT7f36T0bLrM9hZTAaAyH+PCAXjw==",
+    "dev": true,
+    "funding": [
         {
-          "type": "GitHub Sponsors",
-          "url": "https://github.com/sponsors/unifiedjs"
+        "type": "GitHub Sponsors",
+        "url": "https://github.com/sponsors/unifiedjs"
         },
         {
-          "type": "OpenCollective",
-          "url": "https://opencollective.com/unified"
+        "type": "OpenCollective",
+        "url": "https://opencollective.com/unified"
         }
-      ],
-      "license": "MIT"
+    ],
+    "license": "MIT"
     },
     "node_modules/micromark-util-sanitize-uri": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-2.0.1.tgz",
-      "integrity": "sha512-9N9IomZ/YuGGZZmQec1MbgxtlgougxTodVwDzzEouPKo3qFWvymFHWcnDi2vzV1ff6kas9ucW+o3yzJK9YB1AQ==",
-      "dev": true,
-      "funding": [
+    "version": "2.0.1",
+    "resolved": "https://registry.npmjs.org/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-2.0.1.tgz",
+    "integrity": "sha512-9N9IomZ/YuGGZZmQec1MbgxtlgougxTodVwDzzEouPKo3qFWvymFHWcnDi2vzV1ff6kas9ucW+o3yzJK9YB1AQ==",
+    "dev": true,
+    "funding": [
         {
-          "type": "GitHub Sponsors",
-          "url": "https://github.com/sponsors/unifiedjs"
+        "type": "GitHub Sponsors",
+        "url": "https://github.com/sponsors/unifiedjs"
         },
         {
-          "type": "OpenCollective",
-          "url": "https://opencollective.com/unified"
+        "type": "OpenCollective",
+        "url": "https://opencollective.com/unified"
         }
-      ],
-      "license": "MIT",
-      "dependencies": {
+    ],
+    "license": "MIT",
+    "dependencies": {
         "micromark-util-character": "^2.0.0",
         "micromark-util-encode": "^2.0.0",
         "micromark-util-symbol": "^2.0.0"
-      }
+    }
     },
     "node_modules/micromark-util-symbol": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.1.tgz",
-      "integrity": "sha512-vs5t8Apaud9N28kgCrRUdEed4UJ+wWNvicHLPxCa9ENlYuAY31M0ETy5y1vA33YoNPDFTghEbnh6efaE8h4x0Q==",
-      "dev": true,
-      "funding": [
+    "version": "2.0.1",
+    "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.1.tgz",
+    "integrity": "sha512-vs5t8Apaud9N28kgCrRUdEed4UJ+wWNvicHLPxCa9ENlYuAY31M0ETy5y1vA33YoNPDFTghEbnh6efaE8h4x0Q==",
+    "dev": true,
+    "funding": [
         {
-          "type": "GitHub Sponsors",
-          "url": "https://github.com/sponsors/unifiedjs"
+        "type": "GitHub Sponsors",
+        "url": "https://github.com/sponsors/unifiedjs"
         },
         {
-          "type": "OpenCollective",
-          "url": "https://opencollective.com/unified"
+        "type": "OpenCollective",
+        "url": "https://opencollective.com/unified"
         }
-      ],
-      "license": "MIT"
+    ],
+    "license": "MIT"
     },
     "node_modules/micromark-util-types": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/micromark-util-types/-/micromark-util-types-2.0.2.tgz",
-      "integrity": "sha512-Yw0ECSpJoViF1qTU4DC6NwtC4aWGt1EkzaQB8KPPyCRR8z9TWeV0HbEFGTO+ZY1wB22zmxnJqhPyTpOVCpeHTA==",
-      "dev": true,
-      "funding": [
+    "version": "2.0.2",
+    "resolved": "https://registry.npmjs.org/micromark-util-types/-/micromark-util-types-2.0.2.tgz",
+    "integrity": "sha512-Yw0ECSpJoViF1qTU4DC6NwtC4aWGt1EkzaQB8KPPyCRR8z9TWeV0HbEFGTO+ZY1wB22zmxnJqhPyTpOVCpeHTA==",
+    "dev": true,
+    "funding": [
         {
-          "type": "GitHub Sponsors",
-          "url": "https://github.com/sponsors/unifiedjs"
+        "type": "GitHub Sponsors",
+        "url": "https://github.com/sponsors/unifiedjs"
         },
         {
-          "type": "OpenCollective",
-          "url": "https://opencollective.com/unified"
+        "type": "OpenCollective",
+        "url": "https://opencollective.com/unified"
         }
-      ],
-      "license": "MIT"
+    ],
+    "license": "MIT"
     },
     "node_modules/minisearch": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/minisearch/-/minisearch-7.2.0.tgz",
-      "integrity": "sha512-dqT2XBYUOZOiC5t2HRnwADjhNS2cecp9u+TJRiJ1Qp/f5qjkeT5APcGPjHw+bz89Ms8Jp+cG4AlE+QZ/QnDglg==",
-      "dev": true,
-      "license": "MIT"
+    "version": "7.2.0",
+    "resolved": "https://registry.npmjs.org/minisearch/-/minisearch-7.2.0.tgz",
+    "integrity": "sha512-dqT2XBYUOZOiC5t2HRnwADjhNS2cecp9u+TJRiJ1Qp/f5qjkeT5APcGPjHw+bz89Ms8Jp+cG4AlE+QZ/QnDglg==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/mitt": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.1.tgz",
-      "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==",
-      "dev": true,
-      "license": "MIT"
+    "version": "3.0.1",
+    "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.1.tgz",
+    "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/nanoid": {
-      "version": "3.3.11",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
-      "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
-      "dev": true,
-      "funding": [
+    "version": "3.3.11",
+    "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
+    "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
+    "dev": true,
+    "funding": [
         {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
+        "type": "github",
+        "url": "https://github.com/sponsors/ai"
         }
-      ],
-      "license": "MIT",
-      "bin": {
+    ],
+    "license": "MIT",
+    "bin": {
         "nanoid": "bin/nanoid.cjs"
-      },
-      "engines": {
+    },
+    "engines": {
         "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-      }
+    }
     },
     "node_modules/oniguruma-to-es": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/oniguruma-to-es/-/oniguruma-to-es-3.1.1.tgz",
-      "integrity": "sha512-bUH8SDvPkH3ho3dvwJwfonjlQ4R80vjyvrU8YpxuROddv55vAEJrTuCuCVUhhsHbtlD9tGGbaNApGQckXhS8iQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "3.1.1",
+    "resolved": "https://registry.npmjs.org/oniguruma-to-es/-/oniguruma-to-es-3.1.1.tgz",
+    "integrity": "sha512-bUH8SDvPkH3ho3dvwJwfonjlQ4R80vjyvrU8YpxuROddv55vAEJrTuCuCVUhhsHbtlD9tGGbaNApGQckXhS8iQ==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "emoji-regex-xs": "^1.0.0",
         "regex": "^6.0.1",
         "regex-recursion": "^6.0.2"
-      }
+    }
     },
     "node_modules/parent-module": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-2.0.0.tgz",
-      "integrity": "sha512-uo0Z9JJeWzv8BG+tRcapBKNJ0dro9cLyczGzulS6EfeyAdeC9sbojtW6XwvYxJkEne9En+J2XEl4zyglVeIwFg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "2.0.0",
+    "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-2.0.0.tgz",
+    "integrity": "sha512-uo0Z9JJeWzv8BG+tRcapBKNJ0dro9cLyczGzulS6EfeyAdeC9sbojtW6XwvYxJkEne9En+J2XEl4zyglVeIwFg==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "callsites": "^3.1.0"
-      },
-      "engines": {
+    },
+    "engines": {
         "node": ">=8"
-      }
+    }
     },
     "node_modules/perfect-debounce": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/perfect-debounce/-/perfect-debounce-1.0.0.tgz",
-      "integrity": "sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA==",
-      "dev": true,
-      "license": "MIT"
+    "version": "1.0.0",
+    "resolved": "https://registry.npmjs.org/perfect-debounce/-/perfect-debounce-1.0.0.tgz",
+    "integrity": "sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/picocolors": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
-      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
-      "dev": true,
-      "license": "ISC"
+    "version": "1.1.1",
+    "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+    "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+    "dev": true,
+    "license": "ISC"
     },
     "node_modules/picomatch": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
+    "version": "4.0.3",
+    "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+    "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+    "dev": true,
+    "license": "MIT",
+    "engines": {
         "node": ">=12"
-      },
-      "funding": {
+    },
+    "funding": {
         "url": "https://github.com/sponsors/jonschlinkert"
-      }
+    }
     },
     "node_modules/postcss": {
-      "version": "8.5.6",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz",
-      "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==",
-      "dev": true,
-      "funding": [
+    "version": "8.5.6",
+    "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz",
+    "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==",
+    "dev": true,
+    "funding": [
         {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
         },
         {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/postcss"
+        "type": "tidelift",
+        "url": "https://tidelift.com/funding/github/npm/postcss"
         },
         {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
+        "type": "github",
+        "url": "https://github.com/sponsors/ai"
         }
-      ],
-      "license": "MIT",
-      "dependencies": {
+    ],
+    "license": "MIT",
+    "dependencies": {
         "nanoid": "^3.3.11",
         "picocolors": "^1.1.1",
         "source-map-js": "^1.2.1"
-      },
-      "engines": {
+    },
+    "engines": {
         "node": "^10 || ^12 || >=14"
-      }
+    }
     },
     "node_modules/preact": {
-      "version": "10.27.2",
-      "resolved": "https://registry.npmjs.org/preact/-/preact-10.27.2.tgz",
-      "integrity": "sha512-5SYSgFKSyhCbk6SrXyMpqjb5+MQBgfvEKE/OC+PujcY34sOpqtr+0AZQtPYx5IA6VxynQ7rUPCtKzyovpj9Bpg==",
-      "dev": true,
-      "license": "MIT",
-      "funding": {
+    "version": "10.27.2",
+    "resolved": "https://registry.npmjs.org/preact/-/preact-10.27.2.tgz",
+    "integrity": "sha512-5SYSgFKSyhCbk6SrXyMpqjb5+MQBgfvEKE/OC+PujcY34sOpqtr+0AZQtPYx5IA6VxynQ7rUPCtKzyovpj9Bpg==",
+    "dev": true,
+    "license": "MIT",
+    "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/preact"
-      }
+    }
     },
     "node_modules/prettier": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz",
-      "integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
+    "version": "3.6.2",
+    "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz",
+    "integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==",
+    "dev": true,
+    "license": "MIT",
+    "bin": {
         "prettier": "bin/prettier.cjs"
-      },
-      "engines": {
+    },
+    "engines": {
         "node": ">=14"
-      },
-      "funding": {
+    },
+    "funding": {
         "url": "https://github.com/prettier/prettier?sponsor=1"
-      }
+    }
     },
     "node_modules/property-information": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/property-information/-/property-information-7.1.0.tgz",
-      "integrity": "sha512-TwEZ+X+yCJmYfL7TPUOcvBZ4QfoT5YenQiJuX//0th53DE6w0xxLEtfK3iyryQFddXuvkIk51EEgrJQ0WJkOmQ==",
-      "dev": true,
-      "license": "MIT",
-      "funding": {
+    "version": "7.1.0",
+    "resolved": "https://registry.npmjs.org/property-information/-/property-information-7.1.0.tgz",
+    "integrity": "sha512-TwEZ+X+yCJmYfL7TPUOcvBZ4QfoT5YenQiJuX//0th53DE6w0xxLEtfK3iyryQFddXuvkIk51EEgrJQ0WJkOmQ==",
+    "dev": true,
+    "license": "MIT",
+    "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/wooorm"
-      }
+    }
     },
     "node_modules/regex": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/regex/-/regex-6.0.1.tgz",
-      "integrity": "sha512-uorlqlzAKjKQZ5P+kTJr3eeJGSVroLKoHmquUj4zHWuR+hEyNqlXsSKlYYF5F4NI6nl7tWCs0apKJ0lmfsXAPA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "6.0.1",
+    "resolved": "https://registry.npmjs.org/regex/-/regex-6.0.1.tgz",
+    "integrity": "sha512-uorlqlzAKjKQZ5P+kTJr3eeJGSVroLKoHmquUj4zHWuR+hEyNqlXsSKlYYF5F4NI6nl7tWCs0apKJ0lmfsXAPA==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "regex-utilities": "^2.3.0"
-      }
+    }
     },
     "node_modules/regex-recursion": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/regex-recursion/-/regex-recursion-6.0.2.tgz",
-      "integrity": "sha512-0YCaSCq2VRIebiaUviZNs0cBz1kg5kVS2UKUfNIx8YVs1cN3AV7NTctO5FOKBA+UT2BPJIWZauYHPqJODG50cg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "6.0.2",
+    "resolved": "https://registry.npmjs.org/regex-recursion/-/regex-recursion-6.0.2.tgz",
+    "integrity": "sha512-0YCaSCq2VRIebiaUviZNs0cBz1kg5kVS2UKUfNIx8YVs1cN3AV7NTctO5FOKBA+UT2BPJIWZauYHPqJODG50cg==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "regex-utilities": "^2.3.0"
-      }
+    }
     },
     "node_modules/regex-utilities": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/regex-utilities/-/regex-utilities-2.3.0.tgz",
-      "integrity": "sha512-8VhliFJAWRaUiVvREIiW2NXXTmHs4vMNnSzuJVhscgmGav3g9VDxLrQndI3dZZVVdp0ZO/5v0xmX516/7M9cng==",
-      "dev": true,
-      "license": "MIT"
+    "version": "2.3.0",
+    "resolved": "https://registry.npmjs.org/regex-utilities/-/regex-utilities-2.3.0.tgz",
+    "integrity": "sha512-8VhliFJAWRaUiVvREIiW2NXXTmHs4vMNnSzuJVhscgmGav3g9VDxLrQndI3dZZVVdp0ZO/5v0xmX516/7M9cng==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/resolve-from": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
+    "version": "5.0.0",
+    "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+    "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+    "dev": true,
+    "license": "MIT",
+    "engines": {
         "node": ">=8"
-      }
+    }
     },
     "node_modules/rfdc": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz",
-      "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==",
-      "dev": true,
-      "license": "MIT"
+    "version": "1.4.1",
+    "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz",
+    "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/rollup": {
-      "version": "4.53.3",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.53.3.tgz",
-      "integrity": "sha512-w8GmOxZfBmKknvdXU1sdM9NHcoQejwF/4mNgj2JuEEdRaHwwF12K7e9eXn1nLZ07ad+du76mkVsyeb2rKGllsA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "4.53.3",
+    "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.53.3.tgz",
+    "integrity": "sha512-w8GmOxZfBmKknvdXU1sdM9NHcoQejwF/4mNgj2JuEEdRaHwwF12K7e9eXn1nLZ07ad+du76mkVsyeb2rKGllsA==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@types/estree": "1.0.8"
-      },
-      "bin": {
+    },
+    "bin": {
         "rollup": "dist/bin/rollup"
-      },
-      "engines": {
+    },
+    "engines": {
         "node": ">=18.0.0",
         "npm": ">=8.0.0"
-      },
-      "optionalDependencies": {
+    },
+    "optionalDependencies": {
         "@rollup/rollup-android-arm-eabi": "4.53.3",
         "@rollup/rollup-android-arm64": "4.53.3",
         "@rollup/rollup-darwin-arm64": "4.53.3",
@@ -2560,36 +2560,36 @@
         "@rollup/rollup-win32-x64-gnu": "4.53.3",
         "@rollup/rollup-win32-x64-msvc": "4.53.3",
         "fsevents": "~2.3.2"
-      }
+    }
     },
     "node_modules/search-insights": {
-      "version": "2.17.3",
-      "resolved": "https://registry.npmjs.org/search-insights/-/search-insights-2.17.3.tgz",
-      "integrity": "sha512-RQPdCYTa8A68uM2jwxoY842xDhvx3E5LFL1LxvxCNMev4o5mLuokczhzjAgGwUZBAmOKZknArSxLKmXtIi2AxQ==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true
+    "version": "2.17.3",
+    "resolved": "https://registry.npmjs.org/search-insights/-/search-insights-2.17.3.tgz",
+    "integrity": "sha512-RQPdCYTa8A68uM2jwxoY842xDhvx3E5LFL1LxvxCNMev4o5mLuokczhzjAgGwUZBAmOKZknArSxLKmXtIi2AxQ==",
+    "dev": true,
+    "license": "MIT",
+    "peer": true
     },
     "node_modules/semver": {
-      "version": "7.7.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
-      "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
+    "version": "7.7.3",
+    "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
+    "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
+    "dev": true,
+    "license": "ISC",
+    "bin": {
         "semver": "bin/semver.js"
-      },
-      "engines": {
+    },
+    "engines": {
         "node": ">=10"
-      }
+    }
     },
     "node_modules/shiki": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/shiki/-/shiki-2.5.0.tgz",
-      "integrity": "sha512-mI//trrsaiCIPsja5CNfsyNOqgAZUb6VpJA+340toL42UpzQlXpwRV9nch69X6gaUxrr9kaOOa6e3y3uAkGFxQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "2.5.0",
+    "resolved": "https://registry.npmjs.org/shiki/-/shiki-2.5.0.tgz",
+    "integrity": "sha512-mI//trrsaiCIPsja5CNfsyNOqgAZUb6VpJA+340toL42UpzQlXpwRV9nch69X6gaUxrr9kaOOa6e3y3uAkGFxQ==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@shikijs/core": "2.5.0",
         "@shikijs/engine-javascript": "2.5.0",
         "@shikijs/engine-oniguruma": "2.5.0",
@@ -2598,242 +2598,242 @@
         "@shikijs/types": "2.5.0",
         "@shikijs/vscode-textmate": "^10.0.2",
         "@types/hast": "^3.0.4"
-      }
+    }
     },
     "node_modules/smol-toml": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/smol-toml/-/smol-toml-1.5.2.tgz",
-      "integrity": "sha512-QlaZEqcAH3/RtNyet1IPIYPsEWAaYyXXv1Krsi+1L/QHppjX4Ifm8MQsBISz9vE8cHicIq3clogsheili5vhaQ==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "engines": {
+    "version": "1.5.2",
+    "resolved": "https://registry.npmjs.org/smol-toml/-/smol-toml-1.5.2.tgz",
+    "integrity": "sha512-QlaZEqcAH3/RtNyet1IPIYPsEWAaYyXXv1Krsi+1L/QHppjX4Ifm8MQsBISz9vE8cHicIq3clogsheili5vhaQ==",
+    "dev": true,
+    "license": "BSD-3-Clause",
+    "engines": {
         "node": ">= 18"
-      },
-      "funding": {
+    },
+    "funding": {
         "url": "https://github.com/sponsors/cyyynthia"
-      }
+    }
     },
     "node_modules/source-map-js": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
-      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "engines": {
+    "version": "1.2.1",
+    "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
+    "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
+    "dev": true,
+    "license": "BSD-3-Clause",
+    "engines": {
         "node": ">=0.10.0"
-      }
+    }
     },
     "node_modules/space-separated-tokens": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-2.0.2.tgz",
-      "integrity": "sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==",
-      "dev": true,
-      "license": "MIT",
-      "funding": {
+    "version": "2.0.2",
+    "resolved": "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-2.0.2.tgz",
+    "integrity": "sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==",
+    "dev": true,
+    "license": "MIT",
+    "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/wooorm"
-      }
+    }
     },
     "node_modules/speakingurl": {
-      "version": "14.0.1",
-      "resolved": "https://registry.npmjs.org/speakingurl/-/speakingurl-14.0.1.tgz",
-      "integrity": "sha512-1POYv7uv2gXoyGFpBCmpDVSNV74IfsWlDW216UPjbWufNf+bSU6GdbDsxdcxtfwb4xlI3yxzOTKClUosxARYrQ==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "engines": {
+    "version": "14.0.1",
+    "resolved": "https://registry.npmjs.org/speakingurl/-/speakingurl-14.0.1.tgz",
+    "integrity": "sha512-1POYv7uv2gXoyGFpBCmpDVSNV74IfsWlDW216UPjbWufNf+bSU6GdbDsxdcxtfwb4xlI3yxzOTKClUosxARYrQ==",
+    "dev": true,
+    "license": "BSD-3-Clause",
+    "engines": {
         "node": ">=0.10.0"
-      }
+    }
     },
     "node_modules/stringify-entities": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-4.0.4.tgz",
-      "integrity": "sha512-IwfBptatlO+QCJUo19AqvrPNqlVMpW9YEL2LIVY+Rpv2qsjCGxaDLNRgeGsQWJhfItebuJhsGSLjaBbNSQ+ieg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "4.0.4",
+    "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-4.0.4.tgz",
+    "integrity": "sha512-IwfBptatlO+QCJUo19AqvrPNqlVMpW9YEL2LIVY+Rpv2qsjCGxaDLNRgeGsQWJhfItebuJhsGSLjaBbNSQ+ieg==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "character-entities-html4": "^2.0.0",
         "character-entities-legacy": "^3.0.0"
-      },
-      "funding": {
+    },
+    "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/wooorm"
-      }
+    }
     },
     "node_modules/superjson": {
-      "version": "2.2.5",
-      "resolved": "https://registry.npmjs.org/superjson/-/superjson-2.2.5.tgz",
-      "integrity": "sha512-zWPTX96LVsA/eVYnqOM2+ofcdPqdS1dAF1LN4TS2/MWuUpfitd9ctTa87wt4xrYnZnkLtS69xpBdSxVBP5Rm6w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "2.2.5",
+    "resolved": "https://registry.npmjs.org/superjson/-/superjson-2.2.5.tgz",
+    "integrity": "sha512-zWPTX96LVsA/eVYnqOM2+ofcdPqdS1dAF1LN4TS2/MWuUpfitd9ctTa87wt4xrYnZnkLtS69xpBdSxVBP5Rm6w==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "copy-anything": "^4"
-      },
-      "engines": {
+    },
+    "engines": {
         "node": ">=16"
-      }
+    }
     },
     "node_modules/tabbable": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.3.0.tgz",
-      "integrity": "sha512-EIHvdY5bPLuWForiR/AN2Bxngzpuwn1is4asboytXtpTgsArc+WmSJKVLlhdh71u7jFcryDqB2A8lQvj78MkyQ==",
-      "dev": true,
-      "license": "MIT"
+    "version": "6.3.0",
+    "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.3.0.tgz",
+    "integrity": "sha512-EIHvdY5bPLuWForiR/AN2Bxngzpuwn1is4asboytXtpTgsArc+WmSJKVLlhdh71u7jFcryDqB2A8lQvj78MkyQ==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/tinyglobby": {
-      "version": "0.2.15",
-      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz",
-      "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "0.2.15",
+    "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz",
+    "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "fdir": "^6.5.0",
         "picomatch": "^4.0.3"
-      },
-      "engines": {
+    },
+    "engines": {
         "node": ">=12.0.0"
-      },
-      "funding": {
+    },
+    "funding": {
         "url": "https://github.com/sponsors/SuperchupuDev"
-      }
+    }
     },
     "node_modules/trim-lines": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/trim-lines/-/trim-lines-3.0.1.tgz",
-      "integrity": "sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==",
-      "dev": true,
-      "license": "MIT",
-      "funding": {
+    "version": "3.0.1",
+    "resolved": "https://registry.npmjs.org/trim-lines/-/trim-lines-3.0.1.tgz",
+    "integrity": "sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==",
+    "dev": true,
+    "license": "MIT",
+    "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/wooorm"
-      }
+    }
     },
     "node_modules/unist-util-is": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-6.0.1.tgz",
-      "integrity": "sha512-LsiILbtBETkDz8I9p1dQ0uyRUWuaQzd/cuEeS1hoRSyW5E5XGmTzlwY1OrNzzakGowI9Dr/I8HVaw4hTtnxy8g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "6.0.1",
+    "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-6.0.1.tgz",
+    "integrity": "sha512-LsiILbtBETkDz8I9p1dQ0uyRUWuaQzd/cuEeS1hoRSyW5E5XGmTzlwY1OrNzzakGowI9Dr/I8HVaw4hTtnxy8g==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@types/unist": "^3.0.0"
-      },
-      "funding": {
+    },
+    "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/unified"
-      }
+    }
     },
     "node_modules/unist-util-position": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/unist-util-position/-/unist-util-position-5.0.0.tgz",
-      "integrity": "sha512-fucsC7HjXvkB5R3kTCO7kUjRdrS0BJt3M/FPxmHMBOm8JQi2BsHAHFsy27E0EolP8rp0NzXsJ+jNPyDWvOJZPA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "5.0.0",
+    "resolved": "https://registry.npmjs.org/unist-util-position/-/unist-util-position-5.0.0.tgz",
+    "integrity": "sha512-fucsC7HjXvkB5R3kTCO7kUjRdrS0BJt3M/FPxmHMBOm8JQi2BsHAHFsy27E0EolP8rp0NzXsJ+jNPyDWvOJZPA==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@types/unist": "^3.0.0"
-      },
-      "funding": {
+    },
+    "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/unified"
-      }
+    }
     },
     "node_modules/unist-util-stringify-position": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-4.0.0.tgz",
-      "integrity": "sha512-0ASV06AAoKCDkS2+xw5RXJywruurpbC4JZSm7nr7MOt1ojAzvyyaO+UxZf18j8FCF6kmzCZKcAgN/yu2gm2XgQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "4.0.0",
+    "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-4.0.0.tgz",
+    "integrity": "sha512-0ASV06AAoKCDkS2+xw5RXJywruurpbC4JZSm7nr7MOt1ojAzvyyaO+UxZf18j8FCF6kmzCZKcAgN/yu2gm2XgQ==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@types/unist": "^3.0.0"
-      },
-      "funding": {
+    },
+    "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/unified"
-      }
+    }
     },
     "node_modules/unist-util-visit": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-5.0.0.tgz",
-      "integrity": "sha512-MR04uvD+07cwl/yhVuVWAtw+3GOR/knlL55Nd/wAdblk27GCVt3lqpTivy/tkJcZoNPzTwS1Y+KMojlLDhoTzg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "5.0.0",
+    "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-5.0.0.tgz",
+    "integrity": "sha512-MR04uvD+07cwl/yhVuVWAtw+3GOR/knlL55Nd/wAdblk27GCVt3lqpTivy/tkJcZoNPzTwS1Y+KMojlLDhoTzg==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@types/unist": "^3.0.0",
         "unist-util-is": "^6.0.0",
         "unist-util-visit-parents": "^6.0.0"
-      },
-      "funding": {
+    },
+    "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/unified"
-      }
+    }
     },
     "node_modules/unist-util-visit-parents": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-6.0.2.tgz",
-      "integrity": "sha512-goh1s1TBrqSqukSc8wrjwWhL0hiJxgA8m4kFxGlQ+8FYQ3C/m11FcTs4YYem7V664AhHVvgoQLk890Ssdsr2IQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "6.0.2",
+    "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-6.0.2.tgz",
+    "integrity": "sha512-goh1s1TBrqSqukSc8wrjwWhL0hiJxgA8m4kFxGlQ+8FYQ3C/m11FcTs4YYem7V664AhHVvgoQLk890Ssdsr2IQ==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@types/unist": "^3.0.0",
         "unist-util-is": "^6.0.0"
-      },
-      "funding": {
+    },
+    "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/unified"
-      }
+    }
     },
     "node_modules/vfile": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/vfile/-/vfile-6.0.3.tgz",
-      "integrity": "sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "6.0.3",
+    "resolved": "https://registry.npmjs.org/vfile/-/vfile-6.0.3.tgz",
+    "integrity": "sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@types/unist": "^3.0.0",
         "vfile-message": "^4.0.0"
-      },
-      "funding": {
+    },
+    "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/unified"
-      }
+    }
     },
     "node_modules/vfile-message": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-4.0.3.tgz",
-      "integrity": "sha512-QTHzsGd1EhbZs4AsQ20JX1rC3cOlt/IWJruk893DfLRr57lcnOeMaWG4K0JrRta4mIJZKth2Au3mM3u03/JWKw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "4.0.3",
+    "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-4.0.3.tgz",
+    "integrity": "sha512-QTHzsGd1EhbZs4AsQ20JX1rC3cOlt/IWJruk893DfLRr57lcnOeMaWG4K0JrRta4mIJZKth2Au3mM3u03/JWKw==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@types/unist": "^3.0.0",
         "unist-util-stringify-position": "^4.0.0"
-      },
-      "funding": {
+    },
+    "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/unified"
-      }
+    }
     },
     "node_modules/vite": {
-      "version": "5.4.21",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.21.tgz",
-      "integrity": "sha512-o5a9xKjbtuhY6Bi5S3+HvbRERmouabWbyUcpXXUA1u+GNUKoROi9byOJ8M0nHbHYHkYICiMlqxkg1KkYmm25Sw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "5.4.21",
+    "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.21.tgz",
+    "integrity": "sha512-o5a9xKjbtuhY6Bi5S3+HvbRERmouabWbyUcpXXUA1u+GNUKoROi9byOJ8M0nHbHYHkYICiMlqxkg1KkYmm25Sw==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "esbuild": "^0.21.3",
         "postcss": "^8.4.43",
         "rollup": "^4.20.0"
-      },
-      "bin": {
+    },
+    "bin": {
         "vite": "bin/vite.js"
-      },
-      "engines": {
+    },
+    "engines": {
         "node": "^18.0.0 || >=20.0.0"
-      },
-      "funding": {
+    },
+    "funding": {
         "url": "https://github.com/vitejs/vite?sponsor=1"
-      },
-      "optionalDependencies": {
+    },
+    "optionalDependencies": {
         "fsevents": "~2.3.3"
-      },
-      "peerDependencies": {
+    },
+    "peerDependencies": {
         "@types/node": "^18.0.0 || >=20.0.0",
         "less": "*",
         "lightningcss": "^1.21.0",
@@ -2842,41 +2842,41 @@
         "stylus": "*",
         "sugarss": "*",
         "terser": "^5.4.0"
-      },
-      "peerDependenciesMeta": {
+    },
+    "peerDependenciesMeta": {
         "@types/node": {
-          "optional": true
+        "optional": true
         },
         "less": {
-          "optional": true
+        "optional": true
         },
         "lightningcss": {
-          "optional": true
+        "optional": true
         },
         "sass": {
-          "optional": true
+        "optional": true
         },
         "sass-embedded": {
-          "optional": true
+        "optional": true
         },
         "stylus": {
-          "optional": true
+        "optional": true
         },
         "sugarss": {
-          "optional": true
+        "optional": true
         },
         "terser": {
-          "optional": true
+        "optional": true
         }
-      }
+    }
     },
     "node_modules/vitepress": {
-      "version": "1.6.4",
-      "resolved": "https://registry.npmjs.org/vitepress/-/vitepress-1.6.4.tgz",
-      "integrity": "sha512-+2ym1/+0VVrbhNyRoFFesVvBvHAVMZMK0rw60E3X/5349M1GuVdKeazuksqopEdvkKwKGs21Q729jX81/bkBJg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "1.6.4",
+    "resolved": "https://registry.npmjs.org/vitepress/-/vitepress-1.6.4.tgz",
+    "integrity": "sha512-+2ym1/+0VVrbhNyRoFFesVvBvHAVMZMK0rw60E3X/5349M1GuVdKeazuksqopEdvkKwKGs21Q729jX81/bkBJg==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@docsearch/css": "3.8.2",
         "@docsearch/js": "3.8.2",
         "@iconify-json/simple-icons": "^1.2.21",
@@ -2895,95 +2895,95 @@
         "shiki": "^2.1.0",
         "vite": "^5.4.14",
         "vue": "^3.5.13"
-      },
-      "bin": {
+    },
+    "bin": {
         "vitepress": "bin/vitepress.js"
-      },
-      "peerDependencies": {
+    },
+    "peerDependencies": {
         "markdown-it-mathjax3": "^4",
         "postcss": "^8"
-      },
-      "peerDependenciesMeta": {
+    },
+    "peerDependenciesMeta": {
         "markdown-it-mathjax3": {
-          "optional": true
+        "optional": true
         },
         "postcss": {
-          "optional": true
+        "optional": true
         }
-      }
+    }
     },
     "node_modules/vscode-languageserver-textdocument": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.12.tgz",
-      "integrity": "sha512-cxWNPesCnQCcMPeenjKKsOCKQZ/L6Tv19DTRIGuLWe32lyzWhihGVJ/rcckZXJxfdKCFvRLS3fpBIsV/ZGX4zA==",
-      "dev": true,
-      "license": "MIT"
+    "version": "1.0.12",
+    "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.12.tgz",
+    "integrity": "sha512-cxWNPesCnQCcMPeenjKKsOCKQZ/L6Tv19DTRIGuLWe32lyzWhihGVJ/rcckZXJxfdKCFvRLS3fpBIsV/ZGX4zA==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/vscode-uri": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.1.0.tgz",
-      "integrity": "sha512-/BpdSx+yCQGnCvecbyXdxHDkuk55/G3xwnC0GqY4gmQ3j+A+g8kzzgB4Nk/SINjqn6+waqw3EgbVF2QKExkRxQ==",
-      "dev": true,
-      "license": "MIT"
+    "version": "3.1.0",
+    "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.1.0.tgz",
+    "integrity": "sha512-/BpdSx+yCQGnCvecbyXdxHDkuk55/G3xwnC0GqY4gmQ3j+A+g8kzzgB4Nk/SINjqn6+waqw3EgbVF2QKExkRxQ==",
+    "dev": true,
+    "license": "MIT"
     },
     "node_modules/vue": {
-      "version": "3.5.24",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.24.tgz",
-      "integrity": "sha512-uTHDOpVQTMjcGgrqFPSb8iO2m1DUvo+WbGqoXQz8Y1CeBYQ0FXf2z1gLRaBtHjlRz7zZUBHxjVB5VTLzYkvftg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
+    "version": "3.5.24",
+    "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.24.tgz",
+    "integrity": "sha512-uTHDOpVQTMjcGgrqFPSb8iO2m1DUvo+WbGqoXQz8Y1CeBYQ0FXf2z1gLRaBtHjlRz7zZUBHxjVB5VTLzYkvftg==",
+    "dev": true,
+    "license": "MIT",
+    "dependencies": {
         "@vue/compiler-dom": "3.5.24",
         "@vue/compiler-sfc": "3.5.24",
         "@vue/runtime-dom": "3.5.24",
         "@vue/server-renderer": "3.5.24",
         "@vue/shared": "3.5.24"
-      },
-      "peerDependencies": {
+    },
+    "peerDependencies": {
         "typescript": "*"
-      },
-      "peerDependenciesMeta": {
+    },
+    "peerDependenciesMeta": {
         "typescript": {
-          "optional": true
+        "optional": true
         }
-      }
+    }
     },
     "node_modules/xdg-basedir": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-5.1.0.tgz",
-      "integrity": "sha512-GCPAHLvrIH13+c0SuacwvRYj2SxJXQ4kaVTT5xgL3kPrz56XxkF21IGhjSE1+W0aw7gpBWRGXLCPnPby6lSpmQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
+    "version": "5.1.0",
+    "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-5.1.0.tgz",
+    "integrity": "sha512-GCPAHLvrIH13+c0SuacwvRYj2SxJXQ4kaVTT5xgL3kPrz56XxkF21IGhjSE1+W0aw7gpBWRGXLCPnPby6lSpmQ==",
+    "dev": true,
+    "license": "MIT",
+    "engines": {
         "node": ">=12"
-      },
-      "funding": {
+    },
+    "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
-      }
+    }
     },
     "node_modules/yaml": {
-      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.1.tgz",
-      "integrity": "sha512-lcYcMxX2PO9XMGvAJkJ3OsNMw+/7FKes7/hgerGUYWIoWu5j/+YQqcZr5JnPZWzOsEBgMbSbiSTn/dv/69Mkpw==",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
+    "version": "2.8.1",
+    "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.1.tgz",
+    "integrity": "sha512-lcYcMxX2PO9XMGvAJkJ3OsNMw+/7FKes7/hgerGUYWIoWu5j/+YQqcZr5JnPZWzOsEBgMbSbiSTn/dv/69Mkpw==",
+    "dev": true,
+    "license": "ISC",
+    "bin": {
         "yaml": "bin.mjs"
-      },
-      "engines": {
+    },
+    "engines": {
         "node": ">= 14.6"
-      }
+    }
     },
     "node_modules/zwitch": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-2.0.4.tgz",
-      "integrity": "sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==",
-      "dev": true,
-      "license": "MIT",
-      "funding": {
+    "version": "2.0.4",
+    "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-2.0.4.tgz",
+    "integrity": "sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==",
+    "dev": true,
+    "license": "MIT",
+    "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/wooorm"
-      }
+    }
     }
   }
 }
diff --git a/docs/package.json b/docs/package.json
index b73a0a20..2da4b6cb 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -22,4 +22,4 @@
         "vitepress": "^1.6.4",
         "vue": "^3.5.24"
     }
-}
\ No newline at end of file
+}
diff --git a/docs/public/logo.svg b/docs/public/logo.svg
index cccc6fd8..31770331 100644
--- a/docs/public/logo.svg
+++ b/docs/public/logo.svg
@@ -1,8 +1,8 @@
 <svg width="200" height="200" viewBox="0 0 200 200" xmlns="http://www.w3.org/2000/svg">
   <defs>
     <linearGradient id="grad1" x1="0%" y1="0%" x2="100%" y2="100%">
-      <stop offset="0%" style="stop-color:#4A90E2;stop-opacity:1" />
-      <stop offset="100%" style="stop-color:#357ABD;stop-opacity:1" />
+    <stop offset="0%" style="stop-color:#4A90E2;stop-opacity:1" />
+    <stop offset="100%" style="stop-color:#357ABD;stop-opacity:1" />
     </linearGradient>
   </defs>
 
@@ -25,23 +25,23 @@
 
     <!-- Link chain -->
     <g opacity="0.9">
-      <!-- Left link -->
-      <ellipse cx="-30" cy="40" rx="12" ry="8" fill="none" stroke="url(#grad1)" stroke-width="4"/>
-      <!-- Right link -->
-      <ellipse cx="30" cy="40" rx="12" ry="8" fill="none" stroke="url(#grad1)" stroke-width="4"/>
-      <!-- Center link connecting them -->
-      <ellipse cx="0" cy="40" rx="12" ry="8" fill="none" stroke="url(#grad1)" stroke-width="4"/>
+    <!-- Left link -->
+    <ellipse cx="-30" cy="40" rx="12" ry="8" fill="none" stroke="url(#grad1)" stroke-width="4"/>
+    <!-- Right link -->
+    <ellipse cx="30" cy="40" rx="12" ry="8" fill="none" stroke="url(#grad1)" stroke-width="4"/>
+    <!-- Center link connecting them -->
+    <ellipse cx="0" cy="40" rx="12" ry="8" fill="none" stroke="url(#grad1)" stroke-width="4"/>
     </g>
 
     <!-- Sync arrows (subtle) -->
     <g opacity="0.5">
-      <!-- Clockwise arrow top-right -->
-      <path d="M 35 -35 Q 50 -35 50 -20 L 50 -15" fill="none" stroke="url(#grad1)" stroke-width="2.5" stroke-linecap="round"/>
-      <polygon points="50,-15 47,-22 53,-22" fill="url(#grad1)"/>
+    <!-- Clockwise arrow top-right -->
+    <path d="M 35 -35 Q 50 -35 50 -20 L 50 -15" fill="none" stroke="url(#grad1)" stroke-width="2.5" stroke-linecap="round"/>
+    <polygon points="50,-15 47,-22 53,-22" fill="url(#grad1)"/>
 
-      <!-- Counter-clockwise arrow bottom-left -->
-      <path d="M -35 25 Q -50 25 -50 10 L -50 5" fill="none" stroke="url(#grad1)" stroke-width="2.5" stroke-linecap="round"/>
-      <polygon points="-50,5 -47,12 -53,12" fill="url(#grad1)"/>
+    <!-- Counter-clockwise arrow bottom-left -->
+    <path d="M -35 25 Q -50 25 -50 10 L -50 5" fill="none" stroke="url(#grad1)" stroke-width="2.5" stroke-linecap="round"/>
+    <polygon points="-50,5 -47,12 -53,12" fill="url(#grad1)"/>
     </g>
   </g>
 </svg>
diff --git a/frontend/eslint.config.mjs b/frontend/eslint.config.mjs
index d88a042f..1e33ac41 100644
--- a/frontend/eslint.config.mjs
+++ b/frontend/eslint.config.mjs
@@ -3,92 +3,92 @@ import tseslint from "typescript-eslint";
 import unusedImports from "eslint-plugin-unused-imports";
 
 export default [
-	{
-		ignores: [
-			"sync-client/src/services/types.ts",
-			"**/dist/",
-			"**/*.mjs",
-			"**/*.js"
-		]
-	},
-	...tseslint.config({
-		plugins: {
-			"unused-imports": unusedImports
-		},
-		extends: [eslint.configs.recommended, tseslint.configs.all],
-		rules: {
-			"no-unused-vars": "off",
-			"@typescript-eslint/restrict-template-expressions": "off",
-			"@typescript-eslint/no-unused-vars": "off",
-			"@typescript-eslint/no-floating-promises": [
-				"error",
-				{
-					allowForKnownSafeCalls: [
-						{ from: "package", name: ["suite", "test"], package: "node:test" },
-					],
-				},
-			],
-			"@typescript-eslint/parameter-properties": "off",
-			"@typescript-eslint/require-await": "off",
-			"@typescript-eslint/class-methods-use-this": "off",
-			"@typescript-eslint/consistent-return": "off",
-			"@typescript-eslint/no-unsafe-argument": "off",
-			"@typescript-eslint/max-params": "off",
-			"@typescript-eslint/no-magic-numbers": "off",
-			"@typescript-eslint/prefer-readonly-parameter-types": "off",
-			"@typescript-eslint/naming-convention": "off",
-			"no-restricted-properties": [
-				"error",
-				{
-					object: "Promise",
-					property: "all",
-					message: "Use `awaitAll` instead of Promise.all to always await all promises."
-				},
+    {
+        ignores: [
+            "sync-client/src/services/types.ts",
+            "**/dist/",
+            "**/*.mjs",
+            "**/*.js"
+        ]
+    },
+    ...tseslint.config({
+        plugins: {
+            "unused-imports": unusedImports
+        },
+        extends: [eslint.configs.recommended, tseslint.configs.all],
+        rules: {
+            "no-unused-vars": "off",
+            "@typescript-eslint/restrict-template-expressions": "off",
+            "@typescript-eslint/no-unused-vars": "off",
+            "@typescript-eslint/no-floating-promises": [
+                "error",
                 {
-					object: "Promise",
-					property: "allSettled",
-					message: "Use `awaitAll` instead of Promise.allSettled to always await all promises and throw on errors."
-				},
-				{
-					object: "String",
-					property: "replace",
-					message: "Use replaceAll instead of replace to replace all occurrences of a substring."
-				}
-			],
-			"no-restricted-syntax": [
-				"error",
-				{
-					selector: "CallExpression[callee.property.name='splice'][arguments.length=2][arguments.1.type='Literal'][arguments.1.value=1]",
-					message: "Use `removeFromArray(array, item)` instead of manually using indexOf + splice(index, 1). Import from 'sync-client/src/utils/remove-from-array'."
-				},
-				{
-					selector: "CallExpression[callee.property.name='filter'] > ArrowFunctionExpression[body.type='BinaryExpression'][body.operator='!==']",
-					message: "Use `removeFromArray(array, item)` instead of filter(x => x !== item) for better performance. Import from 'sync-client/src/utils/remove-from-array'."
-				},
-				{
-					selector: "CallExpression[callee.property.name='filter'] > ArrowFunctionExpression > BlockStatement > ReturnStatement > BinaryExpression[operator='!==']",
-					message: "Use `removeFromArray(array, item)` instead of filter(x => { return x !== item }) for better performance. Import from 'sync-client/src/utils/remove-from-array'."
-				},
-				{
-					selector: "CallExpression[callee.property.name='filter'] > FunctionExpression[body.type='BlockStatement'] > BlockStatement > ReturnStatement > BinaryExpression[operator='!==']",
-					message: "Use `removeFromArray(array, item)` instead of filter(function(x) { return x !== item }) for better performance. Import from 'sync-client/src/utils/remove-from-array'."
-				}
-			],
-			"unused-imports/no-unused-vars": [
-				"warn",
-				{
-					vars: "all",
-					varsIgnorePattern: "^_",
-					args: "after-used",
-					argsIgnorePattern: "^_"
-				}
-			]
-		},
-		languageOptions: {
-			parserOptions: {
-				projectService: true,
-				tsconfigRootDir: import.meta.dirname
-			}
-		}
-	})
+                    allowForKnownSafeCalls: [
+                        { from: "package", name: ["suite", "test"], package: "node:test" },
+                    ],
+                },
+            ],
+            "@typescript-eslint/parameter-properties": "off",
+            "@typescript-eslint/require-await": "off",
+            "@typescript-eslint/class-methods-use-this": "off",
+            "@typescript-eslint/consistent-return": "off",
+            "@typescript-eslint/no-unsafe-argument": "off",
+            "@typescript-eslint/max-params": "off",
+            "@typescript-eslint/no-magic-numbers": "off",
+            "@typescript-eslint/prefer-readonly-parameter-types": "off",
+            "@typescript-eslint/naming-convention": "off",
+            "no-restricted-properties": [
+                "error",
+                {
+                    object: "Promise",
+                    property: "all",
+                    message: "Use `awaitAll` instead of Promise.all to always await all promises."
+                },
+                {
+                    object: "Promise",
+                    property: "allSettled",
+                    message: "Use `awaitAll` instead of Promise.allSettled to always await all promises and throw on errors."
+                },
+                {
+                    object: "String",
+                    property: "replace",
+                    message: "Use replaceAll instead of replace to replace all occurrences of a substring."
+                }
+            ],
+            "no-restricted-syntax": [
+                "error",
+                {
+                    selector: "CallExpression[callee.property.name='splice'][arguments.length=2][arguments.1.type='Literal'][arguments.1.value=1]",
+                    message: "Use `removeFromArray(array, item)` instead of manually using indexOf + splice(index, 1). Import from 'sync-client/src/utils/remove-from-array'."
+                },
+                {
+                    selector: "CallExpression[callee.property.name='filter'] > ArrowFunctionExpression[body.type='BinaryExpression'][body.operator='!==']",
+                    message: "Use `removeFromArray(array, item)` instead of filter(x => x !== item) for better performance. Import from 'sync-client/src/utils/remove-from-array'."
+                },
+                {
+                    selector: "CallExpression[callee.property.name='filter'] > ArrowFunctionExpression > BlockStatement > ReturnStatement > BinaryExpression[operator='!==']",
+                    message: "Use `removeFromArray(array, item)` instead of filter(x => { return x !== item }) for better performance. Import from 'sync-client/src/utils/remove-from-array'."
+                },
+                {
+                    selector: "CallExpression[callee.property.name='filter'] > FunctionExpression[body.type='BlockStatement'] > BlockStatement > ReturnStatement > BinaryExpression[operator='!==']",
+                    message: "Use `removeFromArray(array, item)` instead of filter(function(x) { return x !== item }) for better performance. Import from 'sync-client/src/utils/remove-from-array'."
+                }
+            ],
+            "unused-imports/no-unused-vars": [
+                "warn",
+                {
+                    vars: "all",
+                    varsIgnorePattern: "^_",
+                    args: "after-used",
+                    argsIgnorePattern: "^_"
+                }
+            ]
+        },
+        languageOptions: {
+            parserOptions: {
+                projectService: true,
+                tsconfigRootDir: import.meta.dirname
+            }
+        }
+    })
 ];
diff --git a/frontend/local-client-cli/src/args.test.ts b/frontend/local-client-cli/src/args.test.ts
index 206e39b7..eb195538 100644
--- a/frontend/local-client-cli/src/args.test.ts
+++ b/frontend/local-client-cli/src/args.test.ts
@@ -4,227 +4,227 @@ import { parseArgs } from "./args";
 import { LogLevel } from "sync-client";
 
 test("parseArgs - parse basic arguments", () => {
-	const args = parseArgs([
-		"node",
-		"cli.js",
-		"-l",
-		"/path/to/vault",
-		"-r",
-		"https://sync.example.com",
-		"-t",
-		"mytoken",
-		"-v",
-		"default"
-	]);
+    const args = parseArgs([
+        "node",
+        "cli.js",
+        "-l",
+        "/path/to/vault",
+        "-r",
+        "https://sync.example.com",
+        "-t",
+        "mytoken",
+        "-v",
+        "default"
+    ]);
 
-	assert.equal(args.localPath, "/path/to/vault");
-	assert.equal(args.remoteUri, "https://sync.example.com");
-	assert.equal(args.token, "mytoken");
-	assert.equal(args.vaultName, "default");
+    assert.equal(args.localPath, "/path/to/vault");
+    assert.equal(args.remoteUri, "https://sync.example.com");
+    assert.equal(args.token, "mytoken");
+    assert.equal(args.vaultName, "default");
 });
 
 test("parseArgs - parse long form arguments", () => {
-	const args = parseArgs([
-		"node",
-		"cli.js",
-		"--local-path",
-		"/path/to/vault",
-		"--remote-uri",
-		"https://sync.example.com",
-		"--token",
-		"mytoken",
-		"--vault-name",
-		"default"
-	]);
+    const args = parseArgs([
+        "node",
+        "cli.js",
+        "--local-path",
+        "/path/to/vault",
+        "--remote-uri",
+        "https://sync.example.com",
+        "--token",
+        "mytoken",
+        "--vault-name",
+        "default"
+    ]);
 
-	assert.equal(args.localPath, "/path/to/vault");
-	assert.equal(args.remoteUri, "https://sync.example.com");
-	assert.equal(args.token, "mytoken");
-	assert.equal(args.vaultName, "default");
+    assert.equal(args.localPath, "/path/to/vault");
+    assert.equal(args.remoteUri, "https://sync.example.com");
+    assert.equal(args.token, "mytoken");
+    assert.equal(args.vaultName, "default");
 });
 
 test("parseArgs - parse with optional arguments", () => {
-	const args = parseArgs([
-		"node",
-		"cli.js",
-		"-l",
-		"/path/to/vault",
-		"-r",
-		"https://sync.example.com",
-		"-t",
-		"mytoken",
-		"-v",
-		"default",
-		"--sync-concurrency",
-		"5",
-		"--max-file-size-mb",
-		"20"
-	]);
+    const args = parseArgs([
+        "node",
+        "cli.js",
+        "-l",
+        "/path/to/vault",
+        "-r",
+        "https://sync.example.com",
+        "-t",
+        "mytoken",
+        "-v",
+        "default",
+        "--sync-concurrency",
+        "5",
+        "--max-file-size-mb",
+        "20"
+    ]);
 
-	assert.equal(args.syncConcurrency, 5);
-	assert.equal(args.maxFileSizeMB, 20);
+    assert.equal(args.syncConcurrency, 5);
+    assert.equal(args.maxFileSizeMB, 20);
 });
 
 test("parseArgs - parse with multiple ignore patterns", () => {
-	const args = parseArgs([
-		"node",
-		"cli.js",
-		"-l",
-		"/path/to/vault",
-		"-r",
-		"https://sync.example.com",
-		"-t",
-		"mytoken",
-		"-v",
-		"default",
-		"--ignore-pattern",
-		".git/**",
-		"*.tmp"
-	]);
+    const args = parseArgs([
+        "node",
+        "cli.js",
+        "-l",
+        "/path/to/vault",
+        "-r",
+        "https://sync.example.com",
+        "-t",
+        "mytoken",
+        "-v",
+        "default",
+        "--ignore-pattern",
+        ".git/**",
+        "*.tmp"
+    ]);
 
-	assert.deepEqual(args.ignorePatterns, [".git/**", "*.tmp"]);
+    assert.deepEqual(args.ignorePatterns, [".git/**", "*.tmp"]);
 });
 
 test("parseArgs - throws on missing required arguments", () => {
-	assert.throws(() => {
-		parseArgs(["node", "cli.js", "-r", "https://sync.example.com"]);
-	}, /required option/);
+    assert.throws(() => {
+        parseArgs(["node", "cli.js", "-r", "https://sync.example.com"]);
+    }, /required option/);
 });
 
 test("parseArgs - throws on missing remote uri", () => {
-	assert.throws(() => {
-		parseArgs([
-			"node",
-			"cli.js",
-			"-l",
-			"/path/to/vault",
-			"-t",
-			"mytoken",
-			"-v",
-			"default"
-		]);
-	}, /--remote-uri/);
+    assert.throws(() => {
+        parseArgs([
+            "node",
+            "cli.js",
+            "-l",
+            "/path/to/vault",
+            "-t",
+            "mytoken",
+            "-v",
+            "default"
+        ]);
+    }, /--remote-uri/);
 });
 
 test("parseArgs - throws on missing token", () => {
-	assert.throws(() => {
-		parseArgs([
-			"node",
-			"cli.js",
-			"-l",
-			"/path/to/vault",
-			"-r",
-			"https://sync.example.com",
-			"-v",
-			"default"
-		]);
-	}, /--token/);
+    assert.throws(() => {
+        parseArgs([
+            "node",
+            "cli.js",
+            "-l",
+            "/path/to/vault",
+            "-r",
+            "https://sync.example.com",
+            "-v",
+            "default"
+        ]);
+    }, /--token/);
 });
 
 test("parseArgs - throws on missing vault name", () => {
-	assert.throws(() => {
-		parseArgs([
-			"node",
-			"cli.js",
-			"-l",
-			"/path/to/vault",
-			"-r",
-			"https://sync.example.com",
-			"-t",
-			"mytoken"
-		]);
-	}, /--vault-name/);
+    assert.throws(() => {
+        parseArgs([
+            "node",
+            "cli.js",
+            "-l",
+            "/path/to/vault",
+            "-r",
+            "https://sync.example.com",
+            "-t",
+            "mytoken"
+        ]);
+    }, /--vault-name/);
 });
 
 test("parseArgs - default log level is INFO", () => {
-	const args = parseArgs([
-		"node",
-		"cli.js",
-		"-l",
-		"/path/to/vault",
-		"-r",
-		"https://sync.example.com",
-		"-t",
-		"mytoken",
-		"-v",
-		"default"
-	]);
+    const args = parseArgs([
+        "node",
+        "cli.js",
+        "-l",
+        "/path/to/vault",
+        "-r",
+        "https://sync.example.com",
+        "-t",
+        "mytoken",
+        "-v",
+        "default"
+    ]);
 
-	assert.equal(args.logLevel, LogLevel.INFO);
+    assert.equal(args.logLevel, LogLevel.INFO);
 });
 
 test("parseArgs - parse DEBUG log level", () => {
-	const args = parseArgs([
-		"node",
-		"cli.js",
-		"-l",
-		"/path/to/vault",
-		"-r",
-		"https://sync.example.com",
-		"-t",
-		"mytoken",
-		"-v",
-		"default",
-		"--log-level",
-		"DEBUG"
-	]);
+    const args = parseArgs([
+        "node",
+        "cli.js",
+        "-l",
+        "/path/to/vault",
+        "-r",
+        "https://sync.example.com",
+        "-t",
+        "mytoken",
+        "-v",
+        "default",
+        "--log-level",
+        "DEBUG"
+    ]);
 
-	assert.equal(args.logLevel, LogLevel.DEBUG);
+    assert.equal(args.logLevel, LogLevel.DEBUG);
 });
 
 test("parseArgs - parse ERROR log level", () => {
-	const args = parseArgs([
-		"node",
-		"cli.js",
-		"-l",
-		"/path/to/vault",
-		"-r",
-		"https://sync.example.com",
-		"-t",
-		"mytoken",
-		"-v",
-		"default",
-		"--log-level",
-		"ERROR"
-	]);
+    const args = parseArgs([
+        "node",
+        "cli.js",
+        "-l",
+        "/path/to/vault",
+        "-r",
+        "https://sync.example.com",
+        "-t",
+        "mytoken",
+        "-v",
+        "default",
+        "--log-level",
+        "ERROR"
+    ]);
 
-	assert.equal(args.logLevel, LogLevel.ERROR);
+    assert.equal(args.logLevel, LogLevel.ERROR);
 });
 
 test("parseArgs - log level is case insensitive", () => {
-	const args = parseArgs([
-		"node",
-		"cli.js",
-		"-l",
-		"/path/to/vault",
-		"-r",
-		"https://sync.example.com",
-		"-t",
-		"mytoken",
-		"-v",
-		"default",
-		"--log-level",
-		"debug"
-	]);
+    const args = parseArgs([
+        "node",
+        "cli.js",
+        "-l",
+        "/path/to/vault",
+        "-r",
+        "https://sync.example.com",
+        "-t",
+        "mytoken",
+        "-v",
+        "default",
+        "--log-level",
+        "debug"
+    ]);
 
-	assert.equal(args.logLevel, LogLevel.DEBUG);
+    assert.equal(args.logLevel, LogLevel.DEBUG);
 });
 
 test("parseArgs - throws on invalid log level", () => {
-	assert.throws(() => {
-		parseArgs([
-			"node",
-			"cli.js",
-			"-l",
-			"/path/to/vault",
-			"-r",
-			"https://sync.example.com",
-			"-t",
-			"mytoken",
-			"-v",
-			"default",
-			"--log-level",
-			"INVALID"
-		]);
-	}, /Invalid log level/);
+    assert.throws(() => {
+        parseArgs([
+            "node",
+            "cli.js",
+            "-l",
+            "/path/to/vault",
+            "-r",
+            "https://sync.example.com",
+            "-t",
+            "mytoken",
+            "-v",
+            "default",
+            "--log-level",
+            "INVALID"
+        ]);
+    }, /Invalid log level/);
 });
diff --git a/frontend/local-client-cli/src/args.ts b/frontend/local-client-cli/src/args.ts
index fc2d4a95..615b9d71 100644
--- a/frontend/local-client-cli/src/args.ts
+++ b/frontend/local-client-cli/src/args.ts
@@ -3,134 +3,134 @@ import packageJson from "../package.json";
 import { LogLevel } from "sync-client";
 
 export interface CliArgs {
-	remoteUri: string;
-	token: string;
-	vaultName: string;
-	localPath: string;
-	syncConcurrency?: number;
-	maxFileSizeMB?: number;
-	ignorePatterns?: string[];
-	webSocketRetryIntervalMs?: number;
-	logLevel: LogLevel;
-	health?: string;
-	enableTelemetry?: boolean;
+    remoteUri: string;
+    token: string;
+    vaultName: string;
+    localPath: string;
+    syncConcurrency?: number;
+    maxFileSizeMB?: number;
+    ignorePatterns?: string[];
+    webSocketRetryIntervalMs?: number;
+    logLevel: LogLevel;
+    health?: string;
+    enableTelemetry?: boolean;
 }
 
 export function parseArgs(argv: string[]): CliArgs {
-	const program = new Command();
+    const program = new Command();
 
-	program
-		.name("vaultlink")
-		.description(
-			"VaultLink Local CLI - Sync your vault to the local filesystem"
-		)
-		.version(packageJson.version)
-		.option("-l, --local-path <path>", "Local directory path to sync")
-		.option("-r, --remote-uri <uri>", "Remote server URI")
-		.option("-t, --token <token>", "Authentication token")
-		.option("-v, --vault-name <name>", "Vault name")
-		.option(
-			"--sync-concurrency <number>",
-			"[OPTIONAL] Number of concurrent sync operations",
-			parseInt
-		)
-		.option(
-			"--max-file-size-mb <number>",
-			"[OPTIONAL] Maximum file size in MB",
-			parseInt
-		)
-		.option(
-			"--ignore-pattern <pattern...>",
-			"[OPTIONAL] Patterns to ignore (can be specified multiple times)"
-		)
-		.option(
-			"--websocket-retry-interval-ms <number>",
-			"[OPTIONAL] WebSocket retry interval in milliseconds",
-			parseInt
-		)
-		.option(
-			"--log-level <level>",
-			"[OPTIONAL] Log level (DEBUG, INFO, WARNING, ERROR)",
-			"INFO"
-		)
-		.option(
-			"--health <path>",
-			"[OPTIONAL] Path to health status file for Docker healthcheck"
-		)
-		.option(
-			"--enable-telemetry",
-			"[OPTIONAL] Enable telemetry (disabled by default)"
-		)
-		.addHelpText(
-			"after",
-			`
+    program
+        .name("vaultlink")
+        .description(
+            "VaultLink Local CLI - Sync your vault to the local filesystem"
+        )
+        .version(packageJson.version)
+        .option("-l, --local-path <path>", "Local directory path to sync")
+        .option("-r, --remote-uri <uri>", "Remote server URI")
+        .option("-t, --token <token>", "Authentication token")
+        .option("-v, --vault-name <name>", "Vault name")
+        .option(
+            "--sync-concurrency <number>",
+            "[OPTIONAL] Number of concurrent sync operations",
+            parseInt
+        )
+        .option(
+            "--max-file-size-mb <number>",
+            "[OPTIONAL] Maximum file size in MB",
+            parseInt
+        )
+        .option(
+            "--ignore-pattern <pattern...>",
+            "[OPTIONAL] Patterns to ignore (can be specified multiple times)"
+        )
+        .option(
+            "--websocket-retry-interval-ms <number>",
+            "[OPTIONAL] WebSocket retry interval in milliseconds",
+            parseInt
+        )
+        .option(
+            "--log-level <level>",
+            "[OPTIONAL] Log level (DEBUG, INFO, WARNING, ERROR)",
+            "INFO"
+        )
+        .option(
+            "--health <path>",
+            "[OPTIONAL] Path to health status file for Docker healthcheck"
+        )
+        .option(
+            "--enable-telemetry",
+            "[OPTIONAL] Enable telemetry (disabled by default)"
+        )
+        .addHelpText(
+            "after",
+            `
 Examples:
   $ vaultlink -l ./my-vault -r https://sync.example.com -t mytoken -v default
   $ vaultlink -l ./my-vault -r https://sync.example.com -t mytoken -v default \\
-      --ignore-pattern ".git/**" --ignore-pattern "*.tmp"
+    --ignore-pattern ".git/**" --ignore-pattern "*.tmp"
   $ vaultlink -l ./my-vault -r https://sync.example.com -t mytoken -v default \\
-      --log-level DEBUG
+    --log-level DEBUG
 `
-		);
+        );
 
-	program.parse(argv);
+    program.parse(argv);
 
-	/* eslint-disable @typescript-eslint/no-unsafe-type-assertion */
-	const opts = program.opts();
-	const localPath = opts.localPath as string | undefined;
-	const remoteUri = opts.remoteUri as string | undefined;
-	const token = opts.token as string | undefined;
-	const vaultName = opts.vaultName as string | undefined;
-	const syncConcurrency = opts.syncConcurrency as number | undefined;
-	const maxFileSizeMb = opts.maxFileSizeMb as number | undefined;
-	const ignorePattern = opts.ignorePattern as string[] | undefined;
-	const websocketRetryIntervalMs = opts.websocketRetryIntervalMs as
-		| number
-		| undefined;
-	const logLevelStr = (opts.logLevel as string | undefined) ?? "INFO";
-	const health = opts.health as string | undefined;
-	const enableTelemetry = opts.enableTelemetry as boolean | undefined;
-	/* eslint-enable @typescript-eslint/no-unsafe-type-assertion */
+    /* eslint-disable @typescript-eslint/no-unsafe-type-assertion */
+    const opts = program.opts();
+    const localPath = opts.localPath as string | undefined;
+    const remoteUri = opts.remoteUri as string | undefined;
+    const token = opts.token as string | undefined;
+    const vaultName = opts.vaultName as string | undefined;
+    const syncConcurrency = opts.syncConcurrency as number | undefined;
+    const maxFileSizeMb = opts.maxFileSizeMb as number | undefined;
+    const ignorePattern = opts.ignorePattern as string[] | undefined;
+    const websocketRetryIntervalMs = opts.websocketRetryIntervalMs as
+        | number
+        | undefined;
+    const logLevelStr = (opts.logLevel as string | undefined) ?? "INFO";
+    const health = opts.health as string | undefined;
+    const enableTelemetry = opts.enableTelemetry as boolean | undefined;
+    /* eslint-enable @typescript-eslint/no-unsafe-type-assertion */
 
-	if (localPath === undefined) {
-		throw new Error(
-			"required option '-l, --local-path <path>' not specified"
-		);
-	}
-	if (remoteUri === undefined) {
-		throw new Error("required option '--remote-uri <uri>' not specified");
-	}
-	if (token === undefined) {
-		throw new Error("required option '--token <token>' not specified");
-	}
-	if (vaultName === undefined) {
-		throw new Error("required option '--vault-name <name>' not specified");
-	}
+    if (localPath === undefined) {
+        throw new Error(
+            "required option '-l, --local-path <path>' not specified"
+        );
+    }
+    if (remoteUri === undefined) {
+        throw new Error("required option '--remote-uri <uri>' not specified");
+    }
+    if (token === undefined) {
+        throw new Error("required option '--token <token>' not specified");
+    }
+    if (vaultName === undefined) {
+        throw new Error("required option '--vault-name <name>' not specified");
+    }
 
-	// Validate and parse log level
-	const logLevelUpper = logLevelStr.toUpperCase();
-	const validLogLevels = Object.values(LogLevel);
-	const isLogLevel = (value: string): value is LogLevel => {
-		return (validLogLevels as readonly string[]).includes(value);
-	};
-	if (!isLogLevel(logLevelUpper)) {
-		throw new Error(
-			`Invalid log level '${logLevelStr}'. Valid values are: ${validLogLevels.join(", ")}`
-		);
-	}
-	const logLevel = logLevelUpper;
+    // Validate and parse log level
+    const logLevelUpper = logLevelStr.toUpperCase();
+    const validLogLevels = Object.values(LogLevel);
+    const isLogLevel = (value: string): value is LogLevel => {
+        return (validLogLevels as readonly string[]).includes(value);
+    };
+    if (!isLogLevel(logLevelUpper)) {
+        throw new Error(
+            `Invalid log level '${logLevelStr}'. Valid values are: ${validLogLevels.join(", ")}`
+        );
+    }
+    const logLevel = logLevelUpper;
 
-	return {
-		localPath,
-		remoteUri,
-		token,
-		vaultName,
-		syncConcurrency,
-		maxFileSizeMB: maxFileSizeMb,
-		ignorePatterns: ignorePattern,
-		webSocketRetryIntervalMs: websocketRetryIntervalMs,
-		logLevel,
-		health,
-		enableTelemetry
-	};
+    return {
+        localPath,
+        remoteUri,
+        token,
+        vaultName,
+        syncConcurrency,
+        maxFileSizeMB: maxFileSizeMb,
+        ignorePatterns: ignorePattern,
+        webSocketRetryIntervalMs: websocketRetryIntervalMs,
+        logLevel,
+        health,
+        enableTelemetry
+    };
 }
diff --git a/frontend/local-client-cli/src/cli.ts b/frontend/local-client-cli/src/cli.ts
index 36449d8d..61582a0d 100644
--- a/frontend/local-client-cli/src/cli.ts
+++ b/frontend/local-client-cli/src/cli.ts
@@ -3,11 +3,11 @@ import * as fs from "fs/promises";
 import * as fsSync from "fs";
 import type { NetworkConnectionStatus } from "sync-client";
 import {
-	SyncClient,
-	DEFAULT_SETTINGS,
-	LogLevel,
-	type SyncSettings,
-	type StoredDatabase
+    SyncClient,
+    DEFAULT_SETTINGS,
+    LogLevel,
+    type SyncSettings,
+    type StoredDatabase
 } from "sync-client";
 import { parseArgs } from "./args";
 import { NodeFileSystemOperations } from "./node-filesystem";
@@ -16,229 +16,229 @@ import { formatLogLine, colorize, styleText } from "./logger-formatter";
 import packageJson from "../package.json";
 
 function writeHealthStatus(
-	filePath: string,
-	connectionStatus: NetworkConnectionStatus
+    filePath: string,
+    connectionStatus: NetworkConnectionStatus
 ): void {
-	try {
-		fsSync.writeFileSync(filePath, JSON.stringify(connectionStatus));
-	} catch (error) {
-		console.error(
-			`Failed to write health status to ${filePath}: ${error instanceof Error ? error.message : String(error)}`
-		);
-	}
+    try {
+        fsSync.writeFileSync(filePath, JSON.stringify(connectionStatus));
+    } catch (error) {
+        console.error(
+            `Failed to write health status to ${filePath}: ${error instanceof Error ? error.message : String(error)}`
+        );
+    }
 }
 
 const LOG_LEVEL_ORDER = {
-	[LogLevel.DEBUG]: 0,
-	[LogLevel.INFO]: 1,
-	[LogLevel.WARNING]: 2,
-	[LogLevel.ERROR]: 3
+    [LogLevel.DEBUG]: 0,
+    [LogLevel.INFO]: 1,
+    [LogLevel.WARNING]: 2,
+    [LogLevel.ERROR]: 3
 };
 
 async function main(): Promise<void> {
-	const args = parseArgs(process.argv);
-	const absolutePath = path.resolve(args.localPath);
+    const args = parseArgs(process.argv);
+    const absolutePath = path.resolve(args.localPath);
 
-	try {
-		const stats = await fs.stat(absolutePath);
-		if (!stats.isDirectory()) {
-			console.error(
-				colorize(`Error: ${absolutePath} is not a directory`, "red")
-			);
-			process.exit(1);
-		}
-	} catch (error) {
-		console.error(
-			colorize(
-				`Error: Cannot access directory ${absolutePath}: ${error instanceof Error ? error.message : String(error)}`,
-				"red"
-			)
-		);
-		process.exit(1);
-	}
+    try {
+        const stats = await fs.stat(absolutePath);
+        if (!stats.isDirectory()) {
+            console.error(
+                colorize(`Error: ${absolutePath} is not a directory`, "red")
+            );
+            process.exit(1);
+        }
+    } catch (error) {
+        console.error(
+            colorize(
+                `Error: Cannot access directory ${absolutePath}: ${error instanceof Error ? error.message : String(error)}`,
+                "red"
+            )
+        );
+        process.exit(1);
+    }
 
-	console.log(
-		styleText("VaultLink Local CLI", "bold", "cyan") +
-			colorize(` v${packageJson.version}`, "dim")
-	);
-	console.log(colorize("=".repeat(50), "dim"));
-	console.log(
-		`${colorize("Local path:", "dim")} ${colorize(absolutePath, "green")}`
-	);
-	console.log(
-		`${colorize("Remote URI:", "dim")} ${colorize(args.remoteUri, "cyan")}`
-	);
-	console.log(
-		`${colorize("Vault name:", "dim")} ${colorize(args.vaultName, "green")}`
-	);
-	console.log("");
+    console.log(
+        styleText("VaultLink Local CLI", "bold", "cyan") +
+            colorize(` v${packageJson.version}`, "dim")
+    );
+    console.log(colorize("=".repeat(50), "dim"));
+    console.log(
+        `${colorize("Local path:", "dim")} ${colorize(absolutePath, "green")}`
+    );
+    console.log(
+        `${colorize("Remote URI:", "dim")} ${colorize(args.remoteUri, "cyan")}`
+    );
+    console.log(
+        `${colorize("Vault name:", "dim")} ${colorize(args.vaultName, "green")}`
+    );
+    console.log("");
 
-	const dataDir = path.join(absolutePath, ".vaultlink");
-	const dataFile = path.join(dataDir, "sync-data.json");
+    const dataDir = path.join(absolutePath, ".vaultlink");
+    const dataFile = path.join(dataDir, "sync-data.json");
 
-	await fs.mkdir(dataDir, { recursive: true });
+    await fs.mkdir(dataDir, { recursive: true });
 
-	const fileSystem = new NodeFileSystemOperations(absolutePath);
+    const fileSystem = new NodeFileSystemOperations(absolutePath);
 
-	const ignorePatterns = [
-		...(args.ignorePatterns ?? []),
-		".vaultlink/**",
-		".git/**"
-	];
+    const ignorePatterns = [
+        ...(args.ignorePatterns ?? []),
+        ".vaultlink/**",
+        ".git/**"
+    ];
 
-	const settings: SyncSettings = {
-		...DEFAULT_SETTINGS,
-		remoteUri: args.remoteUri,
-		token: args.token,
-		vaultName: args.vaultName,
-		syncConcurrency:
-			args.syncConcurrency ?? DEFAULT_SETTINGS.syncConcurrency,
-		maxFileSizeMB: args.maxFileSizeMB ?? DEFAULT_SETTINGS.maxFileSizeMB,
-		ignorePatterns,
-		webSocketRetryIntervalMs:
-			args.webSocketRetryIntervalMs ??
-			DEFAULT_SETTINGS.webSocketRetryIntervalMs,
-		isSyncEnabled: true,
-		enableTelemetry:
-			args.enableTelemetry ?? DEFAULT_SETTINGS.enableTelemetry
-	};
+    const settings: SyncSettings = {
+        ...DEFAULT_SETTINGS,
+        remoteUri: args.remoteUri,
+        token: args.token,
+        vaultName: args.vaultName,
+        syncConcurrency:
+            args.syncConcurrency ?? DEFAULT_SETTINGS.syncConcurrency,
+        maxFileSizeMB: args.maxFileSizeMB ?? DEFAULT_SETTINGS.maxFileSizeMB,
+        ignorePatterns,
+        webSocketRetryIntervalMs:
+            args.webSocketRetryIntervalMs ??
+            DEFAULT_SETTINGS.webSocketRetryIntervalMs,
+        isSyncEnabled: true,
+        enableTelemetry:
+            args.enableTelemetry ?? DEFAULT_SETTINGS.enableTelemetry
+    };
 
-	const client = await SyncClient.create({
-		fs: fileSystem,
-		persistence: {
-			load: async () => {
-				let database: Partial<StoredDatabase> | undefined = undefined;
-				try {
-					const content = await fs.readFile(dataFile, "utf-8");
-					// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-					database = JSON.parse(content) as Partial<StoredDatabase>;
-				} catch {
-					console.error(
-						colorize(
-							`Cannot read data file at ${dataFile}`,
-							"yellow"
-						)
-					);
-				}
+    const client = await SyncClient.create({
+        fs: fileSystem,
+        persistence: {
+            load: async () => {
+                let database: Partial<StoredDatabase> | undefined = undefined;
+                try {
+                    const content = await fs.readFile(dataFile, "utf-8");
+                    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+                    database = JSON.parse(content) as Partial<StoredDatabase>;
+                } catch {
+                    console.error(
+                        colorize(
+                            `Cannot read data file at ${dataFile}`,
+                            "yellow"
+                        )
+                    );
+                }
 
-				return {
-					settings,
-					database
-				};
-			},
-			save: async ({ database: persistedDatabase }) => {
-				// settings can't be updated when running with this CLI
-				await fs.writeFile(
-					dataFile,
-					JSON.stringify(persistedDatabase, null, 2)
-				);
-			}
-		},
-		nativeLineEndings: process.platform === "win32" ? "\r\n" : "\n"
-	});
+                return {
+                    settings,
+                    database
+                };
+            },
+            save: async ({ database: persistedDatabase }) => {
+                // settings can't be updated when running with this CLI
+                await fs.writeFile(
+                    dataFile,
+                    JSON.stringify(persistedDatabase, null, 2)
+                );
+            }
+        },
+        nativeLineEndings: process.platform === "win32" ? "\r\n" : "\n"
+    });
 
-	if (args.health !== undefined) {
-		const healthFile = args.health;
-		const healthInterval = setInterval(() => {
-			void client.checkConnection().then((status) => {
-				writeHealthStatus(healthFile, status);
-			});
-		}, 30 * 1000); // every 30 seconds
-		const clearHealthInterval = (): void => {
-			clearInterval(healthInterval);
-		};
-		process.on("SIGINT", clearHealthInterval);
-		process.on("SIGTERM", clearHealthInterval);
-		process.on("exit", clearHealthInterval);
-	}
+    if (args.health !== undefined) {
+        const healthFile = args.health;
+        const healthInterval = setInterval(() => {
+            void client.checkConnection().then((status) => {
+                writeHealthStatus(healthFile, status);
+            });
+        }, 30 * 1000); // every 30 seconds
+        const clearHealthInterval = (): void => {
+            clearInterval(healthInterval);
+        };
+        process.on("SIGINT", clearHealthInterval);
+        process.on("SIGTERM", clearHealthInterval);
+        process.on("exit", clearHealthInterval);
+    }
 
-	// Add colored log formatter with level filtering
-	client.logger.addOnMessageListener((logLine) => {
-		// Only show messages at or above the configured log level
-		if (LOG_LEVEL_ORDER[logLine.level] >= LOG_LEVEL_ORDER[args.logLevel]) {
-			console.log(formatLogLine(logLine));
-		}
-	});
+    // Add colored log formatter with level filtering
+    client.logger.addOnMessageListener((logLine) => {
+        // Only show messages at or above the configured log level
+        if (LOG_LEVEL_ORDER[logLine.level] >= LOG_LEVEL_ORDER[args.logLevel]) {
+            console.log(formatLogLine(logLine));
+        }
+    });
 
-	client.logger.info("Starting sync client");
+    client.logger.info("Starting sync client");
 
-	const fileWatcher = new FileWatcher(absolutePath, client);
+    const fileWatcher = new FileWatcher(absolutePath, client);
 
-	client.addWebSocketStatusChangeListener(() => {
-		const isConnected = client.isWebSocketConnected;
-		client.logger.info(
-			`WebSocket status changed: ${isConnected ? "connected" : "disconnected"}`
-		);
-	});
+    client.addWebSocketStatusChangeListener(() => {
+        const isConnected = client.isWebSocketConnected;
+        client.logger.info(
+            `WebSocket status changed: ${isConnected ? "connected" : "disconnected"}`
+        );
+    });
 
-	client.addRemainingSyncOperationsListener((remaining) => {
-		if (remaining === 0) {
-			client.logger.info("All sync operations completed");
-		} else {
-			client.logger.info(`${remaining} sync operations remaining`);
-		}
-	});
+    client.addRemainingSyncOperationsListener((remaining) => {
+        if (remaining === 0) {
+            client.logger.info("All sync operations completed");
+        } else {
+            client.logger.info(`${remaining} sync operations remaining`);
+        }
+    });
 
-	const gracefulShutdown = async (signal: string): Promise<void> => {
-		console.log(
-			colorize(
-				`\n${signal} received. Shutting down gracefully...`,
-				"yellow"
-			)
-		);
+    const gracefulShutdown = async (signal: string): Promise<void> => {
+        console.log(
+            colorize(
+                `\n${signal} received. Shutting down gracefully...`,
+                "yellow"
+            )
+        );
 
-		fileWatcher.stop();
-		await client.waitUntilFinished();
-		await client.destroy();
-		console.log(colorize("Shutdown complete", "green"));
-		process.exit(0);
-	};
+        fileWatcher.stop();
+        await client.waitUntilFinished();
+        await client.destroy();
+        console.log(colorize("Shutdown complete", "green"));
+        process.exit(0);
+    };
 
-	process.on("SIGINT", () => {
-		void gracefulShutdown("SIGINT");
-	});
-	process.on("SIGTERM", () => {
-		void gracefulShutdown("SIGTERM");
-	});
+    process.on("SIGINT", () => {
+        void gracefulShutdown("SIGINT");
+    });
+    process.on("SIGTERM", () => {
+        void gracefulShutdown("SIGTERM");
+    });
 
-	try {
-		const connectionStatus = await client.checkConnection();
-		if (!connectionStatus.isSuccessful) {
-			console.error(
-				colorize(
-					`Error: Cannot connect to server: ${connectionStatus.serverMessage}`,
-					"red"
-				)
-			);
-			process.exit(1);
-		}
+    try {
+        const connectionStatus = await client.checkConnection();
+        if (!connectionStatus.isSuccessful) {
+            console.error(
+                colorize(
+                    `Error: Cannot connect to server: ${connectionStatus.serverMessage}`,
+                    "red"
+                )
+            );
+            process.exit(1);
+        }
 
-		console.log(`${colorize("✓", "green")} Server connection successful`);
-		console.log(colorize("Press Ctrl+C to stop", "dim"));
-		console.log("");
+        console.log(`${colorize("✓", "green")} Server connection successful`);
+        console.log(colorize("Press Ctrl+C to stop", "dim"));
+        console.log("");
 
-		await client.start();
-		fileWatcher.start();
-	} catch (error) {
-		console.error(
-			colorize(
-				`Fatal error: ${error instanceof Error ? error.message : String(error)}`,
-				"red"
-			)
-		);
+        await client.start();
+        fileWatcher.start();
+    } catch (error) {
+        console.error(
+            colorize(
+                `Fatal error: ${error instanceof Error ? error.message : String(error)}`,
+                "red"
+            )
+        );
 
-		fileWatcher.stop();
-		await client.destroy();
-		process.exit(1);
-	}
+        fileWatcher.stop();
+        await client.destroy();
+        process.exit(1);
+    }
 }
 
 main().catch((error: unknown) => {
-	console.error(
-		colorize(
-			`Unexpected error: ${error instanceof Error ? error.message : String(error)}`,
-			"red"
-		)
-	);
-	process.exit(1);
+    console.error(
+        colorize(
+            `Unexpected error: ${error instanceof Error ? error.message : String(error)}`,
+            "red"
+        )
+    );
+    process.exit(1);
 });
diff --git a/frontend/local-client-cli/src/healthcheck.ts b/frontend/local-client-cli/src/healthcheck.ts
index 256cd2d8..2dd9e721 100644
--- a/frontend/local-client-cli/src/healthcheck.ts
+++ b/frontend/local-client-cli/src/healthcheck.ts
@@ -9,58 +9,58 @@ import * as fs from "fs";
 import type { NetworkConnectionStatus } from "sync-client";
 
 function isHealthStatus(value: unknown): value is NetworkConnectionStatus {
-	if (typeof value !== "object" || value === null) {
-		return false;
-	}
+    if (typeof value !== "object" || value === null) {
+        return false;
+    }
 
-	return (
-		"isSuccessful" in value &&
-		typeof value.isSuccessful === "boolean" &&
-		"isWebSocketConnected" in value &&
-		typeof value.isWebSocketConnected === "boolean" &&
-		"serverMessage" in value &&
-		typeof value.serverMessage === "string"
-	);
+    return (
+        "isSuccessful" in value &&
+        typeof value.isSuccessful === "boolean" &&
+        "isWebSocketConnected" in value &&
+        typeof value.isWebSocketConnected === "boolean" &&
+        "serverMessage" in value &&
+        typeof value.serverMessage === "string"
+    );
 }
 
 function main(): void {
-	if (process.argv.length < 3) {
-		console.error("Usage: healthcheck <path-to-health-file>");
-		process.exit(1);
-	}
-	const [, , healthFile] = process.argv;
+    if (process.argv.length < 3) {
+        console.error("Usage: healthcheck <path-to-health-file>");
+        process.exit(1);
+    }
+    const [, , healthFile] = process.argv;
 
-	try {
-		// Check if health file exists
-		if (!fs.existsSync(healthFile)) {
-			console.error(`Health file does not exist: ${healthFile}`);
-			process.exit(1);
-		}
+    try {
+        // Check if health file exists
+        if (!fs.existsSync(healthFile)) {
+            console.error(`Health file does not exist: ${healthFile}`);
+            process.exit(1);
+        }
 
-		// Read and parse health status
-		const content = fs.readFileSync(healthFile, "utf-8");
-		const parsed: unknown = JSON.parse(content);
+        // Read and parse health status
+        const content = fs.readFileSync(healthFile, "utf-8");
+        const parsed: unknown = JSON.parse(content);
 
-		// Validate the parsed object using type guard
-		if (!isHealthStatus(parsed)) {
-			throw new Error("Invalid health status format");
-		}
+        // Validate the parsed object using type guard
+        if (!isHealthStatus(parsed)) {
+            throw new Error("Invalid health status format");
+        }
 
-		const status = parsed;
+        const status = parsed;
 
-		if (!status.isSuccessful || !status.isWebSocketConnected) {
-			console.error("Not connected to server: " + status.serverMessage);
-			process.exit(1);
-		}
+        if (!status.isSuccessful || !status.isWebSocketConnected) {
+            console.error("Not connected to server: " + status.serverMessage);
+            process.exit(1);
+        }
 
-		console.log("Healthy: Connected to server");
-		process.exit(0);
-	} catch (error) {
-		console.error(
-			`Health check failed: ${error instanceof Error ? error.message : String(error)}`
-		);
-		process.exit(1);
-	}
+        console.log("Healthy: Connected to server");
+        process.exit(0);
+    } catch (error) {
+        console.error(
+            `Health check failed: ${error instanceof Error ? error.message : String(error)}`
+        );
+        process.exit(1);
+    }
 }
 
 main();
diff --git a/frontend/local-client-cli/src/logger-formatter.ts b/frontend/local-client-cli/src/logger-formatter.ts
index 994adc74..9f237103 100644
--- a/frontend/local-client-cli/src/logger-formatter.ts
+++ b/frontend/local-client-cli/src/logger-formatter.ts
@@ -2,85 +2,85 @@ import { LogLevel, type LogLine } from "sync-client";
 
 // ANSI color codes
 export const colors = {
-	reset: "\x1b[0m",
-	bold: "\x1b[1m",
-	dim: "\x1b[2m",
+    reset: "\x1b[0m",
+    bold: "\x1b[1m",
+    dim: "\x1b[2m",
 
-	// Foreground colors
-	red: "\x1b[31m",
-	green: "\x1b[32m",
-	yellow: "\x1b[33m",
-	blue: "\x1b[34m",
-	magenta: "\x1b[35m",
-	cyan: "\x1b[36m",
-	gray: "\x1b[90m"
+    // Foreground colors
+    red: "\x1b[31m",
+    green: "\x1b[32m",
+    yellow: "\x1b[33m",
+    blue: "\x1b[34m",
+    magenta: "\x1b[35m",
+    cyan: "\x1b[36m",
+    gray: "\x1b[90m"
 } as const;
 
 export function colorize(text: string, color: keyof typeof colors): string {
-	return `${colors[color]}${text}${colors.reset}`;
+    return `${colors[color]}${text}${colors.reset}`;
 }
 
 /**
  * Helper function to apply multiple color modifiers to text
  */
 export function styleText(
-	text: string,
-	...modifiers: (keyof typeof colors)[]
+    text: string,
+    ...modifiers: (keyof typeof colors)[]
 ): string {
-	const prefix = modifiers.map((m) => colors[m]).join("");
-	return `${prefix}${text}${colors.reset}`;
+    const prefix = modifiers.map((m) => colors[m]).join("");
+    return `${prefix}${text}${colors.reset}`;
 }
 
 function formatTimestamp(date: Date): string {
-	const [time] = date.toTimeString().split(" ");
-	const ms = date.getMilliseconds().toString().padStart(3, "0");
-	return colorize(`${time}.${ms}`, "gray");
+    const [time] = date.toTimeString().split(" ");
+    const ms = date.getMilliseconds().toString().padStart(3, "0");
+    return colorize(`${time}.${ms}`, "gray");
 }
 
 function formatLevel(level: LogLevel): string {
-	const levelStr = level.padEnd(7);
-	switch (level) {
-		case LogLevel.DEBUG:
-			return colorize(levelStr, "cyan");
-		case LogLevel.INFO:
-			return colorize(levelStr, "green");
-		case LogLevel.WARNING:
-			return colorize(levelStr, "yellow");
-		case LogLevel.ERROR:
-			return colorize(levelStr, "red");
-	}
+    const levelStr = level.padEnd(7);
+    switch (level) {
+        case LogLevel.DEBUG:
+            return colorize(levelStr, "cyan");
+        case LogLevel.INFO:
+            return colorize(levelStr, "green");
+        case LogLevel.WARNING:
+            return colorize(levelStr, "yellow");
+        case LogLevel.ERROR:
+            return colorize(levelStr, "red");
+    }
 }
 
 function formatMessage(message: string, level: LogLevel): string {
-	// Highlight important parts of the message
-	let formatted = message;
+    // Highlight important parts of the message
+    let formatted = message;
 
-	// Highlight file paths
-	formatted = formatted.replace(
-		/(['"])([^'"]*?\.(json|txt|md|js|ts))(['"])/g,
-		(_, q1, path, _ext, q2) => q1 + colorize(path, "magenta") + q2
-	);
+    // Highlight file paths
+    formatted = formatted.replace(
+        /(['"])([^'"]*?\.(json|txt|md|js|ts))(['"])/g,
+        (_, q1, path, _ext, q2) => q1 + colorize(path, "magenta") + q2
+    );
 
-	// Highlight numbers
-	formatted = formatted.replace(/\b(\d+)\b/g, (num) => colorize(num, "cyan"));
+    // Highlight numbers
+    formatted = formatted.replace(/\b(\d+)\b/g, (num) => colorize(num, "cyan"));
 
-	// Highlight patterns like /regex/
-	formatted = formatted.replace(/(\/\^[^$]*\$\/)/g, (pattern) =>
-		colorize(pattern, "yellow")
-	);
+    // Highlight patterns like /regex/
+    formatted = formatted.replace(/(\/\^[^$]*\$\/)/g, (pattern) =>
+        colorize(pattern, "yellow")
+    );
 
-	// Make error messages bold
-	if (level === LogLevel.ERROR) {
-		formatted = colorize(formatted, "bold");
-	}
+    // Make error messages bold
+    if (level === LogLevel.ERROR) {
+        formatted = colorize(formatted, "bold");
+    }
 
-	return formatted;
+    return formatted;
 }
 
 export function formatLogLine(logLine: LogLine): string {
-	const timestamp = formatTimestamp(logLine.timestamp);
-	const level = formatLevel(logLine.level);
-	const message = formatMessage(logLine.message, logLine.level);
+    const timestamp = formatTimestamp(logLine.timestamp);
+    const level = formatLevel(logLine.level);
+    const message = formatMessage(logLine.message, logLine.level);
 
-	return `${timestamp} ${level} ${message}`;
+    return `${timestamp} ${level} ${message}`;
 }
diff --git a/frontend/local-client-cli/src/node-filesystem.test.ts b/frontend/local-client-cli/src/node-filesystem.test.ts
index 4a72da94..85fb7a0f 100644
--- a/frontend/local-client-cli/src/node-filesystem.test.ts
+++ b/frontend/local-client-cli/src/node-filesystem.test.ts
@@ -6,157 +6,157 @@ import * as os from "os";
 import { NodeFileSystemOperations } from "./node-filesystem";
 
 test("NodeFileSystemOperations - read and write files", async () => {
-	const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "vaultlink-test-"));
-	const fsOps = new NodeFileSystemOperations(tempDir);
+    const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "vaultlink-test-"));
+    const fsOps = new NodeFileSystemOperations(tempDir);
 
-	try {
-		const content = new TextEncoder().encode("Hello, world!");
-		await fsOps.write("test.txt", content);
+    try {
+        const content = new TextEncoder().encode("Hello, world!");
+        await fsOps.write("test.txt", content);
 
-		const readContent = await fsOps.read("test.txt");
-		assert.equal(new TextDecoder().decode(readContent), "Hello, world!");
-	} finally {
-		await fs.rm(tempDir, { recursive: true, force: true });
-	}
+        const readContent = await fsOps.read("test.txt");
+        assert.equal(new TextDecoder().decode(readContent), "Hello, world!");
+    } finally {
+        await fs.rm(tempDir, { recursive: true, force: true });
+    }
 });
 
 test("NodeFileSystemOperations - create nested directories with forward slashes", async () => {
-	const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "vaultlink-test-"));
-	const fsOps = new NodeFileSystemOperations(tempDir);
+    const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "vaultlink-test-"));
+    const fsOps = new NodeFileSystemOperations(tempDir);
 
-	try {
-		const content = new TextEncoder().encode("Nested file");
-		// Always use forward slashes in API
-		await fsOps.write("dir1/dir2/test.txt", content);
+    try {
+        const content = new TextEncoder().encode("Nested file");
+        // Always use forward slashes in API
+        await fsOps.write("dir1/dir2/test.txt", content);
 
-		const readContent = await fsOps.read("dir1/dir2/test.txt");
-		assert.equal(new TextDecoder().decode(readContent), "Nested file");
-	} finally {
-		await fs.rm(tempDir, { recursive: true, force: true });
-	}
+        const readContent = await fsOps.read("dir1/dir2/test.txt");
+        assert.equal(new TextDecoder().decode(readContent), "Nested file");
+    } finally {
+        await fs.rm(tempDir, { recursive: true, force: true });
+    }
 });
 
 test("NodeFileSystemOperations - exists with forward slashes", async () => {
-	const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "vaultlink-test-"));
-	const fsOps = new NodeFileSystemOperations(tempDir);
+    const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "vaultlink-test-"));
+    const fsOps = new NodeFileSystemOperations(tempDir);
 
-	try {
-		assert.equal(await fsOps.exists("test.txt"), false);
+    try {
+        assert.equal(await fsOps.exists("test.txt"), false);
 
-		await fsOps.write("test.txt", new TextEncoder().encode("test"));
+        await fsOps.write("test.txt", new TextEncoder().encode("test"));
 
-		assert.equal(await fsOps.exists("test.txt"), true);
-	} finally {
-		await fs.rm(tempDir, { recursive: true, force: true });
-	}
+        assert.equal(await fsOps.exists("test.txt"), true);
+    } finally {
+        await fs.rm(tempDir, { recursive: true, force: true });
+    }
 });
 
 test("NodeFileSystemOperations - delete with forward slashes", async () => {
-	const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "vaultlink-test-"));
-	const fsOps = new NodeFileSystemOperations(tempDir);
+    const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "vaultlink-test-"));
+    const fsOps = new NodeFileSystemOperations(tempDir);
 
-	try {
-		await fsOps.write("test.txt", new TextEncoder().encode("test"));
-		assert.equal(await fsOps.exists("test.txt"), true);
+    try {
+        await fsOps.write("test.txt", new TextEncoder().encode("test"));
+        assert.equal(await fsOps.exists("test.txt"), true);
 
-		await fsOps.delete("test.txt");
-		assert.equal(await fsOps.exists("test.txt"), false);
-	} finally {
-		await fs.rm(tempDir, { recursive: true, force: true });
-	}
+        await fsOps.delete("test.txt");
+        assert.equal(await fsOps.exists("test.txt"), false);
+    } finally {
+        await fs.rm(tempDir, { recursive: true, force: true });
+    }
 });
 
 test("NodeFileSystemOperations - rename with forward slashes", async () => {
-	const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "vaultlink-test-"));
-	const fsOps = new NodeFileSystemOperations(tempDir);
+    const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "vaultlink-test-"));
+    const fsOps = new NodeFileSystemOperations(tempDir);
 
-	try {
-		const content = new TextEncoder().encode("test content");
-		await fsOps.write("old.txt", content);
+    try {
+        const content = new TextEncoder().encode("test content");
+        await fsOps.write("old.txt", content);
 
-		await fsOps.rename("old.txt", "new.txt");
+        await fsOps.rename("old.txt", "new.txt");
 
-		assert.equal(await fsOps.exists("old.txt"), false);
-		assert.equal(await fsOps.exists("new.txt"), true);
+        assert.equal(await fsOps.exists("old.txt"), false);
+        assert.equal(await fsOps.exists("new.txt"), true);
 
-		const readContent = await fsOps.read("new.txt");
-		assert.equal(new TextDecoder().decode(readContent), "test content");
-	} finally {
-		await fs.rm(tempDir, { recursive: true, force: true });
-	}
+        const readContent = await fsOps.read("new.txt");
+        assert.equal(new TextDecoder().decode(readContent), "test content");
+    } finally {
+        await fs.rm(tempDir, { recursive: true, force: true });
+    }
 });
 
 test("NodeFileSystemOperations - rename to nested path with forward slashes", async () => {
-	const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "vaultlink-test-"));
-	const fsOps = new NodeFileSystemOperations(tempDir);
+    const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "vaultlink-test-"));
+    const fsOps = new NodeFileSystemOperations(tempDir);
 
-	try {
-		const content = new TextEncoder().encode("test content");
-		await fsOps.write("old.txt", content);
+    try {
+        const content = new TextEncoder().encode("test content");
+        await fsOps.write("old.txt", content);
 
-		await fsOps.rename("old.txt", "dir1/dir2/new.txt");
+        await fsOps.rename("old.txt", "dir1/dir2/new.txt");
 
-		assert.equal(await fsOps.exists("old.txt"), false);
-		assert.equal(await fsOps.exists("dir1/dir2/new.txt"), true);
-	} finally {
-		await fs.rm(tempDir, { recursive: true, force: true });
-	}
+        assert.equal(await fsOps.exists("old.txt"), false);
+        assert.equal(await fsOps.exists("dir1/dir2/new.txt"), true);
+    } finally {
+        await fs.rm(tempDir, { recursive: true, force: true });
+    }
 });
 
 test("NodeFileSystemOperations - getFileSize", async () => {
-	const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "vaultlink-test-"));
-	const fsOps = new NodeFileSystemOperations(tempDir);
+    const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "vaultlink-test-"));
+    const fsOps = new NodeFileSystemOperations(tempDir);
 
-	try {
-		const content = new TextEncoder().encode("Hello!");
-		await fsOps.write("test.txt", content);
+    try {
+        const content = new TextEncoder().encode("Hello!");
+        await fsOps.write("test.txt", content);
 
-		const size = await fsOps.getFileSize("test.txt");
-		assert.equal(size, content.length);
-	} finally {
-		await fs.rm(tempDir, { recursive: true, force: true });
-	}
+        const size = await fsOps.getFileSize("test.txt");
+        assert.equal(size, content.length);
+    } finally {
+        await fs.rm(tempDir, { recursive: true, force: true });
+    }
 });
 
 test("NodeFileSystemOperations - atomicUpdateText", async () => {
-	const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "vaultlink-test-"));
-	const fsOps = new NodeFileSystemOperations(tempDir);
+    const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "vaultlink-test-"));
+    const fsOps = new NodeFileSystemOperations(tempDir);
 
-	try {
-		await fsOps.write("test.txt", new TextEncoder().encode("Hello"));
+    try {
+        await fsOps.write("test.txt", new TextEncoder().encode("Hello"));
 
-		const result = await fsOps.atomicUpdateText("test.txt", (current) => ({
-			text: current.text + " World",
-			cursors: []
-		}));
+        const result = await fsOps.atomicUpdateText("test.txt", (current) => ({
+            text: current.text + " World",
+            cursors: []
+        }));
 
-		assert.equal(result, "Hello World");
+        assert.equal(result, "Hello World");
 
-		const content = await fsOps.read("test.txt");
-		assert.equal(new TextDecoder().decode(content), "Hello World");
-	} finally {
-		await fs.rm(tempDir, { recursive: true, force: true });
-	}
+        const content = await fsOps.read("test.txt");
+        assert.equal(new TextDecoder().decode(content), "Hello World");
+    } finally {
+        await fs.rm(tempDir, { recursive: true, force: true });
+    }
 });
 
 test("NodeFileSystemOperations - handles paths with forward slashes on all platforms", async () => {
-	const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "vaultlink-test-"));
-	const fsOps = new NodeFileSystemOperations(tempDir);
+    const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "vaultlink-test-"));
+    const fsOps = new NodeFileSystemOperations(tempDir);
 
-	try {
-		// API should always accept forward slashes
-		const testPath = "deep/nested/directory/file.txt";
-		const content = new TextEncoder().encode("test");
+    try {
+        // API should always accept forward slashes
+        const testPath = "deep/nested/directory/file.txt";
+        const content = new TextEncoder().encode("test");
 
-		await fsOps.write(testPath, content);
-		assert.equal(await fsOps.exists(testPath), true);
+        await fsOps.write(testPath, content);
+        assert.equal(await fsOps.exists(testPath), true);
 
-		const readContent = await fsOps.read(testPath);
-		assert.equal(new TextDecoder().decode(readContent), "test");
+        const readContent = await fsOps.read(testPath);
+        assert.equal(new TextDecoder().decode(readContent), "test");
 
-		await fsOps.delete(testPath);
-		assert.equal(await fsOps.exists(testPath), false);
-	} finally {
-		await fs.rm(tempDir, { recursive: true, force: true });
-	}
+        await fsOps.delete(testPath);
+        assert.equal(await fsOps.exists(testPath), false);
+    } finally {
+        await fs.rm(tempDir, { recursive: true, force: true });
+    }
 });
diff --git a/frontend/local-client-cli/src/node-filesystem.ts b/frontend/local-client-cli/src/node-filesystem.ts
index f40143c8..3da8fc3a 100644
--- a/frontend/local-client-cli/src/node-filesystem.ts
+++ b/frontend/local-client-cli/src/node-filesystem.ts
@@ -2,205 +2,205 @@ import * as fs from "fs/promises";
 import type { Dirent } from "fs";
 import * as path from "path";
 import type {
-	FileSystemOperations,
-	RelativePath,
-	TextWithCursors
+    FileSystemOperations,
+    RelativePath,
+    TextWithCursors
 } from "sync-client";
 
 export class NodeFileSystemOperations implements FileSystemOperations {
-	public constructor(private readonly basePath: string) {}
+    public constructor(private readonly basePath: string) {}
 
-	public async listFilesRecursively(
-		directory: RelativePath | undefined
-	): Promise<RelativePath[]> {
-		const files: RelativePath[] = [];
-		await this.walkDirectory(
-			directory !== undefined ? this.toNativePath(directory) : "",
-			files
-		);
-		return files;
-	}
+    public async listFilesRecursively(
+        directory: RelativePath | undefined
+    ): Promise<RelativePath[]> {
+        const files: RelativePath[] = [];
+        await this.walkDirectory(
+            directory !== undefined ? this.toNativePath(directory) : "",
+            files
+        );
+        return files;
+    }
 
-	public async read(relativePath: RelativePath): Promise<Uint8Array> {
-		const fullPath = path.join(
-			this.basePath,
-			this.toNativePath(relativePath)
-		);
-		try {
-			return await fs.readFile(fullPath);
-		} catch (error) {
-			throw new Error(
-				`Failed to read file ${fullPath}: ${error instanceof Error ? error.message : String(error)}`
-			);
-		}
-	}
+    public async read(relativePath: RelativePath): Promise<Uint8Array> {
+        const fullPath = path.join(
+            this.basePath,
+            this.toNativePath(relativePath)
+        );
+        try {
+            return await fs.readFile(fullPath);
+        } catch (error) {
+            throw new Error(
+                `Failed to read file ${fullPath}: ${error instanceof Error ? error.message : String(error)}`
+            );
+        }
+    }
 
-	public async write(
-		relativePath: RelativePath,
-		content: Uint8Array
-	): Promise<void> {
-		const fullPath = path.join(
-			this.basePath,
-			this.toNativePath(relativePath)
-		);
-		const dir = path.dirname(fullPath);
+    public async write(
+        relativePath: RelativePath,
+        content: Uint8Array
+    ): Promise<void> {
+        const fullPath = path.join(
+            this.basePath,
+            this.toNativePath(relativePath)
+        );
+        const dir = path.dirname(fullPath);
 
-		try {
-			await fs.mkdir(dir, { recursive: true });
-			await fs.writeFile(fullPath, content);
-		} catch (error) {
-			throw new Error(
-				`Failed to write file ${fullPath}: ${error instanceof Error ? error.message : String(error)}`
-			);
-		}
-	}
+        try {
+            await fs.mkdir(dir, { recursive: true });
+            await fs.writeFile(fullPath, content);
+        } catch (error) {
+            throw new Error(
+                `Failed to write file ${fullPath}: ${error instanceof Error ? error.message : String(error)}`
+            );
+        }
+    }
 
-	public async atomicUpdateText(
-		relativePath: RelativePath,
-		updater: (current: TextWithCursors) => TextWithCursors
-	): Promise<string> {
-		const fullPath = path.join(
-			this.basePath,
-			this.toNativePath(relativePath)
-		);
+    public async atomicUpdateText(
+        relativePath: RelativePath,
+        updater: (current: TextWithCursors) => TextWithCursors
+    ): Promise<string> {
+        const fullPath = path.join(
+            this.basePath,
+            this.toNativePath(relativePath)
+        );
 
-		try {
-			const currentContent = await fs.readFile(fullPath, "utf-8");
-			const result = updater({ text: currentContent, cursors: [] });
-			await fs.writeFile(fullPath, result.text, "utf-8");
-			return result.text;
-		} catch (error) {
-			throw new Error(
-				`Failed to atomically update file ${fullPath}: ${error instanceof Error ? error.message : String(error)}`
-			);
-		}
-	}
+        try {
+            const currentContent = await fs.readFile(fullPath, "utf-8");
+            const result = updater({ text: currentContent, cursors: [] });
+            await fs.writeFile(fullPath, result.text, "utf-8");
+            return result.text;
+        } catch (error) {
+            throw new Error(
+                `Failed to atomically update file ${fullPath}: ${error instanceof Error ? error.message : String(error)}`
+            );
+        }
+    }
 
-	public async getFileSize(relativePath: RelativePath): Promise<number> {
-		const fullPath = path.join(
-			this.basePath,
-			this.toNativePath(relativePath)
-		);
-		try {
-			const stats = await fs.stat(fullPath);
-			return stats.size;
-		} catch (error) {
-			throw new Error(
-				`Failed to get file size for ${fullPath}: ${error instanceof Error ? error.message : String(error)}`
-			);
-		}
-	}
+    public async getFileSize(relativePath: RelativePath): Promise<number> {
+        const fullPath = path.join(
+            this.basePath,
+            this.toNativePath(relativePath)
+        );
+        try {
+            const stats = await fs.stat(fullPath);
+            return stats.size;
+        } catch (error) {
+            throw new Error(
+                `Failed to get file size for ${fullPath}: ${error instanceof Error ? error.message : String(error)}`
+            );
+        }
+    }
 
-	public async exists(relativePath: RelativePath): Promise<boolean> {
-		const fullPath = path.join(
-			this.basePath,
-			this.toNativePath(relativePath)
-		);
-		try {
-			await fs.access(fullPath);
-			return true;
-		} catch {
-			return false;
-		}
-	}
+    public async exists(relativePath: RelativePath): Promise<boolean> {
+        const fullPath = path.join(
+            this.basePath,
+            this.toNativePath(relativePath)
+        );
+        try {
+            await fs.access(fullPath);
+            return true;
+        } catch {
+            return false;
+        }
+    }
 
-	public async createDirectory(relativePath: RelativePath): Promise<void> {
-		const fullPath = path.join(
-			this.basePath,
-			this.toNativePath(relativePath)
-		);
-		try {
-			await fs.mkdir(fullPath, { recursive: false });
-		} catch (error) {
-			throw new Error(
-				`Failed to create directory ${fullPath}: ${error instanceof Error ? error.message : String(error)}`
-			);
-		}
-	}
+    public async createDirectory(relativePath: RelativePath): Promise<void> {
+        const fullPath = path.join(
+            this.basePath,
+            this.toNativePath(relativePath)
+        );
+        try {
+            await fs.mkdir(fullPath, { recursive: false });
+        } catch (error) {
+            throw new Error(
+                `Failed to create directory ${fullPath}: ${error instanceof Error ? error.message : String(error)}`
+            );
+        }
+    }
 
-	public async delete(relativePath: RelativePath): Promise<void> {
-		const fullPath = path.join(
-			this.basePath,
-			this.toNativePath(relativePath)
-		);
-		try {
-			await fs.unlink(fullPath);
-		} catch (error) {
-			throw new Error(
-				`Failed to delete file ${fullPath}: ${error instanceof Error ? error.message : String(error)}`
-			);
-		}
-	}
+    public async delete(relativePath: RelativePath): Promise<void> {
+        const fullPath = path.join(
+            this.basePath,
+            this.toNativePath(relativePath)
+        );
+        try {
+            await fs.unlink(fullPath);
+        } catch (error) {
+            throw new Error(
+                `Failed to delete file ${fullPath}: ${error instanceof Error ? error.message : String(error)}`
+            );
+        }
+    }
 
-	public async rename(
-		oldPath: RelativePath,
-		newPath: RelativePath
-	): Promise<void> {
-		const oldFullPath = path.join(
-			this.basePath,
-			this.toNativePath(oldPath)
-		);
-		const newFullPath = path.join(
-			this.basePath,
-			this.toNativePath(newPath)
-		);
-		const newDir = path.dirname(newFullPath);
+    public async rename(
+        oldPath: RelativePath,
+        newPath: RelativePath
+    ): Promise<void> {
+        const oldFullPath = path.join(
+            this.basePath,
+            this.toNativePath(oldPath)
+        );
+        const newFullPath = path.join(
+            this.basePath,
+            this.toNativePath(newPath)
+        );
+        const newDir = path.dirname(newFullPath);
 
-		try {
-			await fs.mkdir(newDir, { recursive: true });
-			await fs.rename(oldFullPath, newFullPath);
-		} catch (error) {
-			throw new Error(
-				`Failed to rename file from ${oldFullPath} to ${newFullPath}: ${error instanceof Error ? error.message : String(error)}`
-			);
-		}
-	}
+        try {
+            await fs.mkdir(newDir, { recursive: true });
+            await fs.rename(oldFullPath, newFullPath);
+        } catch (error) {
+            throw new Error(
+                `Failed to rename file from ${oldFullPath} to ${newFullPath}: ${error instanceof Error ? error.message : String(error)}`
+            );
+        }
+    }
 
-	private async walkDirectory(
-		relativePath: string,
-		files: RelativePath[]
-	): Promise<void> {
-		const fullPath = path.join(this.basePath, relativePath);
-		let entries: Dirent[] = [];
+    private async walkDirectory(
+        relativePath: string,
+        files: RelativePath[]
+    ): Promise<void> {
+        const fullPath = path.join(this.basePath, relativePath);
+        let entries: Dirent[] = [];
 
-		try {
-			entries = await fs.readdir(fullPath, { withFileTypes: true });
-		} catch (error) {
-			throw new Error(
-				`Failed to read directory ${fullPath}: ${error instanceof Error ? error.message : String(error)}`
-			);
-		}
+        try {
+            entries = await fs.readdir(fullPath, { withFileTypes: true });
+        } catch (error) {
+            throw new Error(
+                `Failed to read directory ${fullPath}: ${error instanceof Error ? error.message : String(error)}`
+            );
+        }
 
-		for (const entry of entries) {
-			const entryName = entry.name;
-			const entryRelativePath = path.join(relativePath, entryName);
+        for (const entry of entries) {
+            const entryName = entry.name;
+            const entryRelativePath = path.join(relativePath, entryName);
 
-			if (entry.isDirectory()) {
-				await this.walkDirectory(entryRelativePath, files);
-			} else if (entry.isFile()) {
-				// Always return forward slashes
-				files.push(this.toUnixPath(entryRelativePath));
-			}
-		}
-	}
+            if (entry.isDirectory()) {
+                await this.walkDirectory(entryRelativePath, files);
+            } else if (entry.isFile()) {
+                // Always return forward slashes
+                files.push(this.toUnixPath(entryRelativePath));
+            }
+        }
+    }
 
-	/**
-	 * Convert a forward-slash path to native platform path separators
-	 */
-	private toNativePath(relativePath: string): string {
-		if (path.sep === "\\") {
-			return relativePath.replace(/\//g, "\\");
-		}
-		return relativePath;
-	}
+    /**
+    * Convert a forward-slash path to native platform path separators
+    */
+    private toNativePath(relativePath: string): string {
+        if (path.sep === "\\") {
+            return relativePath.replace(/\//g, "\\");
+        }
+        return relativePath;
+    }
 
-	/**
-	 * Convert a native platform path to forward slashes
-	 */
-	private toUnixPath(nativePath: string): string {
-		if (path.sep === "\\") {
-			return nativePath.replace(/\\/g, "/");
-		}
-		return nativePath;
-	}
+    /**
+    * Convert a native platform path to forward slashes
+    */
+    private toUnixPath(nativePath: string): string {
+        if (path.sep === "\\") {
+            return nativePath.replace(/\\/g, "/");
+        }
+        return nativePath;
+    }
 }
diff --git a/frontend/obsidian-plugin/.hotreload b/frontend/obsidian-plugin/.hotreload
index e69de29b..8b137891 100644
--- a/frontend/obsidian-plugin/.hotreload
+++ b/frontend/obsidian-plugin/.hotreload
@@ -0,0 +1 @@
+
diff --git a/frontend/obsidian-plugin/README.md b/frontend/obsidian-plugin/README.md
index d7f694da..93c2cba7 100644
--- a/frontend/obsidian-plugin/README.md
+++ b/frontend/obsidian-plugin/README.md
@@ -85,8 +85,3 @@ If you have multiple URLs, you can also do:
 ## API Documentation
 
 See https://github.com/obsidianmd/obsidian-api
-
-
-
-
-
diff --git a/frontend/obsidian-plugin/manifest.json b/frontend/obsidian-plugin/manifest.json
index 68d1568b..c8ee915b 100644
--- a/frontend/obsidian-plugin/manifest.json
+++ b/frontend/obsidian-plugin/manifest.json
@@ -1,10 +1,10 @@
 {
-	"id": "vault-link",
-	"name": "VaultLink",
-	"version": "0.12.0",
-	"minAppVersion": "0.0.0",
-	"description": "Self-hosted synchronization and collaboration for your Vault.",
-	"author": "Andras Schmelczer",
-	"authorUrl": "https://schmelczer.dev",
-	"isDesktopOnly": false
-}
\ No newline at end of file
+    "id": "vault-link",
+    "name": "VaultLink",
+    "version": "0.12.0",
+    "minAppVersion": "0.0.0",
+    "description": "Self-hosted synchronization and collaboration for your Vault.",
+    "author": "Andras Schmelczer",
+    "authorUrl": "https://schmelczer.dev",
+    "isDesktopOnly": false
+}
diff --git a/frontend/obsidian-plugin/src/obsidian-file-system.ts b/frontend/obsidian-plugin/src/obsidian-file-system.ts
index bc8265fd..ceb8bc2a 100644
--- a/frontend/obsidian-plugin/src/obsidian-file-system.ts
+++ b/frontend/obsidian-plugin/src/obsidian-file-system.ts
@@ -2,175 +2,175 @@ import type { Stat, Vault, Workspace } from "obsidian";
 import { MarkdownView, normalizePath } from "obsidian";
 import type { CursorPosition, TextWithCursors } from "sync-client";
 import {
-	utils,
-	type FileSystemOperations,
-	type RelativePath
+    utils,
+    type FileSystemOperations,
+    type RelativePath
 } from "sync-client";
 import { getSelectionsFromEditor } from "./views/cursors/get-selections-from-editor";
 
 export class ObsidianFileSystemOperations implements FileSystemOperations {
-	public constructor(
-		private readonly vault: Vault,
-		private readonly workspace: Workspace
-	) {}
+    public constructor(
+        private readonly vault: Vault,
+        private readonly workspace: Workspace
+    ) {}
 
-	public async listFilesRecursively(
-		root: RelativePath | undefined
-	): Promise<RelativePath[]> {
-		// Let's implement this by hand because vault.adapter.listAllFiles doesn't always return all files.
-		const allFiles = [];
-		const remainingFolders = [root ?? this.vault.getRoot().path];
+    public async listFilesRecursively(
+        root: RelativePath | undefined
+    ): Promise<RelativePath[]> {
+        // Let's implement this by hand because vault.adapter.listAllFiles doesn't always return all files.
+        const allFiles = [];
+        const remainingFolders = [root ?? this.vault.getRoot().path];
 
-		// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-		while (true) {
-			const folder = remainingFolders.pop();
-			if (folder == undefined) {
-				break;
-			}
+        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+        while (true) {
+            const folder = remainingFolders.pop();
+            if (folder == undefined) {
+                break;
+            }
 
-			// This would be a very bad idea to sync as it would mess with
-			// the integrity of the sync database.
-			if (folder.endsWith(".obsidian/plugins/vault-link/data.json")) {
-				continue;
-			}
+            // This would be a very bad idea to sync as it would mess with
+            // the integrity of the sync database.
+            if (folder.endsWith(".obsidian/plugins/vault-link/data.json")) {
+                continue;
+            }
 
-			const files = await this.vault.adapter.list(normalizePath(folder));
-			allFiles.push(...files.files);
-			remainingFolders.push(...files.folders);
-		}
+            const files = await this.vault.adapter.list(normalizePath(folder));
+            allFiles.push(...files.files);
+            remainingFolders.push(...files.folders);
+        }
 
-		return allFiles;
-	}
+        return allFiles;
+    }
 
-	public async read(path: RelativePath): Promise<Uint8Array> {
-		path = normalizePath(path);
-		const view = this.workspace.getActiveViewOfType(MarkdownView);
-		if (view?.file?.path === path) {
-			return new TextEncoder().encode(view.editor.getValue());
-		}
+    public async read(path: RelativePath): Promise<Uint8Array> {
+        path = normalizePath(path);
+        const view = this.workspace.getActiveViewOfType(MarkdownView);
+        if (view?.file?.path === path) {
+            return new TextEncoder().encode(view.editor.getValue());
+        }
 
-		return new Uint8Array(await this.vault.adapter.readBinary(path));
-	}
+        return new Uint8Array(await this.vault.adapter.readBinary(path));
+    }
 
-	public async write(path: RelativePath, content: Uint8Array): Promise<void> {
-		path = normalizePath(path);
+    public async write(path: RelativePath, content: Uint8Array): Promise<void> {
+        path = normalizePath(path);
 
-		const view = this.workspace.getActiveViewOfType(MarkdownView);
-		if (view?.file?.path === path) {
-			const position = view.editor.getCursor();
-			view.editor.setValue(new TextDecoder().decode(content));
-			view.editor.setCursor(position);
-			return;
-		}
+        const view = this.workspace.getActiveViewOfType(MarkdownView);
+        if (view?.file?.path === path) {
+            const position = view.editor.getCursor();
+            view.editor.setValue(new TextDecoder().decode(content));
+            view.editor.setCursor(position);
+            return;
+        }
 
-		return this.vault.adapter.writeBinary(
-			path,
-			// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-			content.buffer as ArrayBuffer
-		);
-	}
+        return this.vault.adapter.writeBinary(
+            path,
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+            content.buffer as ArrayBuffer
+        );
+    }
 
-	public async atomicUpdateText(
-		path: RelativePath,
-		updater: (current: TextWithCursors) => TextWithCursors
-	): Promise<string> {
-		path = normalizePath(path);
+    public async atomicUpdateText(
+        path: RelativePath,
+        updater: (current: TextWithCursors) => TextWithCursors
+    ): Promise<string> {
+        path = normalizePath(path);
 
-		const view = this.workspace.getActiveViewOfType(MarkdownView);
+        const view = this.workspace.getActiveViewOfType(MarkdownView);
 
-		if (view?.file?.path === path) {
-			const text = view.editor.getValue();
+        if (view?.file?.path === path) {
+            const text = view.editor.getValue();
 
-			const cursors: CursorPosition[] = getSelectionsFromEditor(
-				view.editor
-			).flatMap(({ id, start: anchor, end: head }) => [
-				{
-					id: 2 * id,
-					position: anchor
-				},
-				{
-					id: 2 * id + 1,
-					position: head
-				}
-			]);
+            const cursors: CursorPosition[] = getSelectionsFromEditor(
+                view.editor
+            ).flatMap(({ id, start: anchor, end: head }) => [
+                {
+                    id: 2 * id,
+                    position: anchor
+                },
+                {
+                    id: 2 * id + 1,
+                    position: head
+                }
+            ]);
 
-			const result = updater({
-				text,
-				cursors
-			});
+            const result = updater({
+                text,
+                cursors
+            });
 
-			if (result.text === text) {
-				return text;
-			}
+            if (result.text === text) {
+                return text;
+            }
 
-			view.editor.setValue(result.text);
+            view.editor.setValue(result.text);
 
-			const selections = [];
-			for (let i = 0; i < result.cursors.length / 2; i++) {
-				const from = result.cursors[2 * i];
-				const to = result.cursors[2 * i + 1];
-				const { line: fromLine, column: fromColumn } =
-					utils.positionToLineAndColumn(result.text, from.position);
+            const selections = [];
+            for (let i = 0; i < result.cursors.length / 2; i++) {
+                const from = result.cursors[2 * i];
+                const to = result.cursors[2 * i + 1];
+                const { line: fromLine, column: fromColumn } =
+                    utils.positionToLineAndColumn(result.text, from.position);
 
-				const { line: toLine, column: toColumn } =
-					utils.positionToLineAndColumn(result.text, to.position);
+                const { line: toLine, column: toColumn } =
+                    utils.positionToLineAndColumn(result.text, to.position);
 
-				selections.push({
-					anchor: { line: fromLine, ch: fromColumn },
-					head: { line: toLine, ch: toColumn }
-				});
-			}
-			view.editor.setSelections(selections);
+                selections.push({
+                    anchor: { line: fromLine, ch: fromColumn },
+                    head: { line: toLine, ch: toColumn }
+                });
+            }
+            view.editor.setSelections(selections);
 
-			return result.text;
-		}
+            return result.text;
+        }
 
-		return this.vault.adapter.process(
-			path,
-			(text) =>
-				updater({
-					text,
-					cursors: []
-				}).text
-		);
-	}
+        return this.vault.adapter.process(
+            path,
+            (text) =>
+                updater({
+                    text,
+                    cursors: []
+                }).text
+        );
+    }
 
-	public async getFileSize(path: RelativePath): Promise<number> {
-		return (await this.statFile(path)).size;
-	}
+    public async getFileSize(path: RelativePath): Promise<number> {
+        return (await this.statFile(path)).size;
+    }
 
-	public async getModificationTime(path: RelativePath): Promise<Date> {
-		return new Date((await this.statFile(path)).mtime);
-	}
+    public async getModificationTime(path: RelativePath): Promise<Date> {
+        return new Date((await this.statFile(path)).mtime);
+    }
 
-	public async exists(path: RelativePath): Promise<boolean> {
-		return this.vault.adapter.exists(normalizePath(path));
-	}
+    public async exists(path: RelativePath): Promise<boolean> {
+        return this.vault.adapter.exists(normalizePath(path));
+    }
 
-	public async createDirectory(path: RelativePath): Promise<void> {
-		return this.vault.adapter.mkdir(normalizePath(path));
-	}
+    public async createDirectory(path: RelativePath): Promise<void> {
+        return this.vault.adapter.mkdir(normalizePath(path));
+    }
 
-	public async delete(path: RelativePath): Promise<void> {
-		if (!(await this.vault.adapter.trashSystem(normalizePath(path)))) {
-			return this.vault.adapter.remove(normalizePath(path));
-		}
-	}
+    public async delete(path: RelativePath): Promise<void> {
+        if (!(await this.vault.adapter.trashSystem(normalizePath(path)))) {
+            return this.vault.adapter.remove(normalizePath(path));
+        }
+    }
 
-	public async rename(
-		oldPath: RelativePath,
-		newPath: RelativePath
-	): Promise<void> {
-		return this.vault.adapter.rename(oldPath, newPath);
-	}
+    public async rename(
+        oldPath: RelativePath,
+        newPath: RelativePath
+    ): Promise<void> {
+        return this.vault.adapter.rename(oldPath, newPath);
+    }
 
-	private async statFile(path: string): Promise<Stat> {
-		const file = await this.vault.adapter.stat(normalizePath(path));
+    private async statFile(path: string): Promise<Stat> {
+        const file = await this.vault.adapter.stat(normalizePath(path));
 
-		if (!file) {
-			throw new Error(`File not found: ${path}`);
-		}
+        if (!file) {
+            throw new Error(`File not found: ${path}`);
+        }
 
-		return file;
-	}
+        return file;
+    }
 }
diff --git a/frontend/obsidian-plugin/src/views/cursors/file-explorer.scss b/frontend/obsidian-plugin/src/views/cursors/file-explorer.scss
index 90918b55..ebdd7730 100644
--- a/frontend/obsidian-plugin/src/views/cursors/file-explorer.scss
+++ b/frontend/obsidian-plugin/src/views/cursors/file-explorer.scss
@@ -12,4 +12,4 @@
         font-size: var(--font-smallest);
         font-style: italic;
     }
-}
\ No newline at end of file
+}
diff --git a/frontend/obsidian-plugin/src/views/cursors/get-selections-from-editor.ts b/frontend/obsidian-plugin/src/views/cursors/get-selections-from-editor.ts
index 1635b930..3ddb60a3 100644
--- a/frontend/obsidian-plugin/src/views/cursors/get-selections-from-editor.ts
+++ b/frontend/obsidian-plugin/src/views/cursors/get-selections-from-editor.ts
@@ -2,16 +2,16 @@ import type { Editor } from "obsidian";
 import { utils } from "sync-client";
 
 export interface Selection {
-	id: number;
-	start: number;
-	end: number;
+    id: number;
+    start: number;
+    end: number;
 }
 
 export function getSelectionsFromEditor(editor: Editor): Selection[] {
-	const text = editor.getValue();
-	return editor.listSelections().map(({ anchor, head }, i) => ({
-		id: i,
-		start: utils.lineAndColumnToPosition(text, anchor.line, anchor.ch),
-		end: utils.lineAndColumnToPosition(text, head.line, head.ch)
-	}));
+    const text = editor.getValue();
+    return editor.listSelections().map(({ anchor, head }, i) => ({
+        id: i,
+        start: utils.lineAndColumnToPosition(text, anchor.line, anchor.ch),
+        end: utils.lineAndColumnToPosition(text, head.line, head.ch)
+    }));
 }
diff --git a/frontend/obsidian-plugin/src/views/cursors/local-cursor-update-listener.ts b/frontend/obsidian-plugin/src/views/cursors/local-cursor-update-listener.ts
index da67c70d..f1dba005 100644
--- a/frontend/obsidian-plugin/src/views/cursors/local-cursor-update-listener.ts
+++ b/frontend/obsidian-plugin/src/views/cursors/local-cursor-update-listener.ts
@@ -5,46 +5,46 @@ import type { Selection } from "./get-selections-from-editor";
 import { getSelectionsFromEditor } from "./get-selections-from-editor";
 
 export class LocalCursorUpdateListener {
-	private static readonly UPDATE_INTERVAL_MS = 50;
-	private readonly eventHandle: NodeJS.Timeout;
+    private static readonly UPDATE_INTERVAL_MS = 50;
+    private readonly eventHandle: NodeJS.Timeout;
 
-	public constructor(
-		private readonly client: SyncClient,
-		private readonly workspace: Workspace
-	) {
-		this.eventHandle = setInterval(() => {
-			this.updateAllSelections();
-		}, LocalCursorUpdateListener.UPDATE_INTERVAL_MS);
-	}
+    public constructor(
+        private readonly client: SyncClient,
+        private readonly workspace: Workspace
+    ) {
+        this.eventHandle = setInterval(() => {
+            this.updateAllSelections();
+        }, LocalCursorUpdateListener.UPDATE_INTERVAL_MS);
+    }
 
-	public dispose(): void {
-		clearInterval(this.eventHandle);
-	}
+    public dispose(): void {
+        clearInterval(this.eventHandle);
+    }
 
-	private updateAllSelections(): void {
-		const currentCursors = this.getAllSelections();
-		this.client
-			.updateLocalCursors(currentCursors)
-			.catch((error: unknown) => {
-				this.client.logger.error(
-					`Failed to update local cursors: ${error}`
-				);
-			});
-	}
+    private updateAllSelections(): void {
+        const currentCursors = this.getAllSelections();
+        this.client
+            .updateLocalCursors(currentCursors)
+            .catch((error: unknown) => {
+                this.client.logger.error(
+                    `Failed to update local cursors: ${error}`
+                );
+            });
+    }
 
-	private getAllSelections(): Record<string, Selection[]> {
-		const cursors: Record<string, Selection[]> = {};
-		this.workspace
-			.getLeavesOfType("markdown")
-			.map((leaf) => leaf.view)
-			.filter((view) => view instanceof MarkdownView)
-			.forEach((view) => {
-				const { file } = view;
-				if (!file) {
-					return;
-				}
-				cursors[file.path] = getSelectionsFromEditor(view.editor);
-			});
-		return cursors;
-	}
+    private getAllSelections(): Record<string, Selection[]> {
+        const cursors: Record<string, Selection[]> = {};
+        this.workspace
+            .getLeavesOfType("markdown")
+            .map((leaf) => leaf.view)
+            .filter((view) => view instanceof MarkdownView)
+            .forEach((view) => {
+                const { file } = view;
+                if (!file) {
+                    return;
+                }
+                cursors[file.path] = getSelectionsFromEditor(view.editor);
+            });
+        return cursors;
+    }
 }
diff --git a/frontend/obsidian-plugin/src/views/cursors/remote-cursor-theme.ts b/frontend/obsidian-plugin/src/views/cursors/remote-cursor-theme.ts
index 3af2692d..e508b42f 100644
--- a/frontend/obsidian-plugin/src/views/cursors/remote-cursor-theme.ts
+++ b/frontend/obsidian-plugin/src/views/cursors/remote-cursor-theme.ts
@@ -4,60 +4,60 @@ const CARET_WIDTH = 2;
 const DOT_RADIUS = 4;
 
 export const remoteCursorsTheme = EditorView.baseTheme({
-	".selection-caret": {
-		position: "relative"
-	},
+    ".selection-caret": {
+        position: "relative"
+    },
 
-	".selection-caret > *": {
-		position: "absolute",
-		backgroundColor: "inherit"
-	},
+    ".selection-caret > *": {
+        position: "absolute",
+        backgroundColor: "inherit"
+    },
 
-	".selection-caret > .stick": {
-		left: 0,
-		top: 0,
-		transform: "translateX(-50%)",
-		width: `${CARET_WIDTH}px`,
-		height: "100%",
-		display: "block",
-		borderRadius: `${CARET_WIDTH / 2}px`,
-		animation: "blink-stick 1s steps(1) infinite"
-	},
+    ".selection-caret > .stick": {
+        left: 0,
+        top: 0,
+        transform: "translateX(-50%)",
+        width: `${CARET_WIDTH}px`,
+        height: "100%",
+        display: "block",
+        borderRadius: `${CARET_WIDTH / 2}px`,
+        animation: "blink-stick 1s steps(1) infinite"
+    },
 
-	"@keyframes blink-stick": {
-		"0%, 100%": { opacity: 1 },
-		"50%": { opacity: 0 }
-	},
+    "@keyframes blink-stick": {
+        "0%, 100%": { opacity: 1 },
+        "50%": { opacity: 0 }
+    },
 
-	".selection-caret > .dot": {
-		borderRadius: "50%",
-		width: `${DOT_RADIUS * 2}px`,
-		height: `${DOT_RADIUS * 2}px`,
-		top: `-${DOT_RADIUS}px`,
-		left: `-${DOT_RADIUS}px`,
-		transition: "transform .3s ease-in-out",
-		transformOrigin: "bottom center",
-		boxSizing: "border-box"
-	},
+    ".selection-caret > .dot": {
+        borderRadius: "50%",
+        width: `${DOT_RADIUS * 2}px`,
+        height: `${DOT_RADIUS * 2}px`,
+        top: `-${DOT_RADIUS}px`,
+        left: `-${DOT_RADIUS}px`,
+        transition: "transform .3s ease-in-out",
+        transformOrigin: "bottom center",
+        boxSizing: "border-box"
+    },
 
-	".selection-caret:hover > .dot": {
-		transform: "scale(0)"
-	},
+    ".selection-caret:hover > .dot": {
+        transform: "scale(0)"
+    },
 
-	".selection-caret > .info": {
-		top: "-1.3em",
-		left: `-${CARET_WIDTH / 2}px`,
-		fontSize: "0.9em",
-		userSelect: "none",
-		color: "white",
-		padding: "0 2px",
-		transition: "opacity .3s ease-in-out",
-		opacity: 0,
-		whiteSpace: "nowrap",
-		borderRadius: "3px 3px 3px 0"
-	},
+    ".selection-caret > .info": {
+        top: "-1.3em",
+        left: `-${CARET_WIDTH / 2}px`,
+        fontSize: "0.9em",
+        userSelect: "none",
+        color: "white",
+        padding: "0 2px",
+        transition: "opacity .3s ease-in-out",
+        opacity: 0,
+        whiteSpace: "nowrap",
+        borderRadius: "3px 3px 3px 0"
+    },
 
-	".selection-caret:hover > .info": {
-		opacity: 1
-	}
+    ".selection-caret:hover > .info": {
+        opacity: 1
+    }
 });
diff --git a/frontend/obsidian-plugin/src/views/cursors/remote-cursor-widget.ts b/frontend/obsidian-plugin/src/views/cursors/remote-cursor-widget.ts
index e3273484..7f31ac00 100644
--- a/frontend/obsidian-plugin/src/views/cursors/remote-cursor-widget.ts
+++ b/frontend/obsidian-plugin/src/views/cursors/remote-cursor-widget.ts
@@ -1,46 +1,46 @@
 import { AnnotationType, Annotation, RangeSet, Range } from "@codemirror/state";
 import {
-	ViewUpdate,
-	ViewPlugin,
-	Decoration,
-	WidgetType
+    ViewUpdate,
+    ViewPlugin,
+    Decoration,
+    WidgetType
 } from "@codemirror/view";
 
 import type { PluginValue, DecorationSet, EditorView } from "@codemirror/view";
 
 export class RemoteCursorWidget extends WidgetType {
-	public constructor(
-		private readonly color: string,
-		private readonly name: string
-	) {
-		super();
-	}
+    public constructor(
+        private readonly color: string,
+        private readonly name: string
+    ) {
+        super();
+    }
 
-	public toDOM(editor: EditorView): HTMLElement {
-		return editor.contentDOM.createEl(
-			"span",
-			{
-				cls: "selection-caret",
-				attr: {
-					style: `background-color: ${this.color}; border-color: ${this.color}`
-				}
-			},
-			(span) => {
-				span.createEl("div", {
-					cls: "stick"
-				});
-				span.createEl("div", {
-					cls: "dot"
-				});
-				span.createEl("div", {
-					cls: "info",
-					text: this.name
-				});
-			}
-		);
-	}
+    public toDOM(editor: EditorView): HTMLElement {
+        return editor.contentDOM.createEl(
+            "span",
+            {
+                cls: "selection-caret",
+                attr: {
+                    style: `background-color: ${this.color}; border-color: ${this.color}`
+                }
+            },
+            (span) => {
+                span.createEl("div", {
+                    cls: "stick"
+                });
+                span.createEl("div", {
+                    cls: "dot"
+                });
+                span.createEl("div", {
+                    cls: "info",
+                    text: this.name
+                });
+            }
+        );
+    }
 
-	public eq(other: RemoteCursorWidget): boolean {
-		return other.color === this.color && other.name === this.name;
-	}
+    public eq(other: RemoteCursorWidget): boolean {
+        return other.color === this.color && other.name === this.name;
+    }
 }
diff --git a/frontend/obsidian-plugin/src/views/cursors/remote-cursors-plugin.ts b/frontend/obsidian-plugin/src/views/cursors/remote-cursors-plugin.ts
index 5f867f90..1191d9a2 100644
--- a/frontend/obsidian-plugin/src/views/cursors/remote-cursors-plugin.ts
+++ b/frontend/obsidian-plugin/src/views/cursors/remote-cursors-plugin.ts
@@ -3,17 +3,17 @@ import { RangeSet } from "@codemirror/state";
 import { ViewPlugin, Decoration } from "@codemirror/view";
 
 import type {
-	PluginValue,
-	DecorationSet,
-	EditorView,
-	ViewUpdate
+    PluginValue,
+    DecorationSet,
+    EditorView,
+    ViewUpdate
 } from "@codemirror/view";
 import { RemoteCursorWidget } from "./remote-cursor-widget";
 import type { RelativePath } from "sync-client";
 import {
-	utils,
-	type CursorSpan,
-	type MaybeOutdatedClientCursors
+    utils,
+    type CursorSpan,
+    type MaybeOutdatedClientCursors
 } from "sync-client";
 import type { App } from "obsidian";
 import { MarkdownView } from "obsidian";
@@ -25,241 +25,241 @@ import { reconcileWithHistory } from "reconcile-text";
 const forceUpdate = StateEffect.define();
 
 export class RemoteCursorsPluginValue implements PluginValue {
-	private static cursors: {
-		name: string;
-		path: string;
-		span: CursorSpan;
-		deviceId: string;
-		isOutdated: boolean;
-	}[] = [];
+    private static cursors: {
+        name: string;
+        path: string;
+        span: CursorSpan;
+        deviceId: string;
+        isOutdated: boolean;
+    }[] = [];
 
-	private static app?: App;
-	public decorations: DecorationSet = RangeSet.of([]);
+    private static app?: App;
+    public decorations: DecorationSet = RangeSet.of([]);
 
-	public static setCursors(
-		clients: MaybeOutdatedClientCursors[],
-		app: App
-	): void {
-		RemoteCursorsPluginValue.app = app;
-		RemoteCursorsPluginValue.cursors = [
-			...RemoteCursorsPluginValue.cursors.filter(({ deviceId }) =>
-				clients.some(
-					(client) =>
-						client.deviceId === deviceId && client.isOutdated
-				)
-			),
-			...clients
-				.filter(
-					({ isOutdated, deviceId }) =>
-						!isOutdated ||
-						RemoteCursorsPluginValue.cursors.every(
-							(c) => deviceId !== c.deviceId
-						)
-				)
-				.flatMap((client) => {
-					const clientCursors = client.documentsWithCursors;
-					return clientCursors.flatMap((cursor) =>
-						cursor.cursors.map((span) => ({
-							name: client.userName,
-							path: cursor.relative_path,
-							deviceId: client.deviceId,
-							isOutdated: client.isOutdated,
-							span: { ...span }
-						}))
-					);
-				})
-		];
+    public static setCursors(
+        clients: MaybeOutdatedClientCursors[],
+        app: App
+    ): void {
+        RemoteCursorsPluginValue.app = app;
+        RemoteCursorsPluginValue.cursors = [
+            ...RemoteCursorsPluginValue.cursors.filter(({ deviceId }) =>
+                clients.some(
+                    (client) =>
+                        client.deviceId === deviceId && client.isOutdated
+                )
+            ),
+            ...clients
+                .filter(
+                    ({ isOutdated, deviceId }) =>
+                        !isOutdated ||
+                        RemoteCursorsPluginValue.cursors.every(
+                            (c) => deviceId !== c.deviceId
+                        )
+                )
+                .flatMap((client) => {
+                    const clientCursors = client.documentsWithCursors;
+                    return clientCursors.flatMap((cursor) =>
+                        cursor.cursors.map((span) => ({
+                            name: client.userName,
+                            path: cursor.relative_path,
+                            deviceId: client.deviceId,
+                            isOutdated: client.isOutdated,
+                            span: { ...span }
+                        }))
+                    );
+                })
+        ];
 
-		app.workspace
-			.getLeavesOfType("markdown")
-			.map((leaf) => leaf.view)
-			.filter((view) => view instanceof MarkdownView)
-			.forEach((view) => {
-				// @ts-expect-error, not typed
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-				const editor = view.editor.cm as EditorView;
+        app.workspace
+            .getLeavesOfType("markdown")
+            .map((leaf) => leaf.view)
+            .filter((view) => view instanceof MarkdownView)
+            .forEach((view) => {
+                // @ts-expect-error, not typed
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+                const editor = view.editor.cm as EditorView;
 
-				editor.dispatch({
-					effects: [forceUpdate.of(null)]
-				});
-			});
-	}
+                editor.dispatch({
+                    effects: [forceUpdate.of(null)]
+                });
+            });
+    }
 
-	private static findFileForEditor(
-		editor: EditorView
-	): RelativePath | undefined {
-		return RemoteCursorsPluginValue.app?.workspace
-			.getLeavesOfType("markdown")
-			.map((leaf) => leaf.view)
-			.filter((view) => view instanceof MarkdownView)
-			.flatMap((view) => {
-				// @ts-expect-error, not typed
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-				if ((view.editor.cm as EditorView) !== editor) {
-					return [];
-				}
+    private static findFileForEditor(
+        editor: EditorView
+    ): RelativePath | undefined {
+        return RemoteCursorsPluginValue.app?.workspace
+            .getLeavesOfType("markdown")
+            .map((leaf) => leaf.view)
+            .filter((view) => view instanceof MarkdownView)
+            .flatMap((view) => {
+                // @ts-expect-error, not typed
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+                if ((view.editor.cm as EditorView) !== editor) {
+                    return [];
+                }
 
-				const { file } = view;
-				if (!file) {
-					return;
-				}
+                const { file } = view;
+                if (!file) {
+                    return;
+                }
 
-				return [file.path];
-			})
-			.first();
-	}
+                return [file.path];
+            })
+            .first();
+    }
 
-	private static interpolateRemoteCursorPositions(
-		original: string,
-		edited: string
-	): void {
-		if (
-			original === edited ||
-			RemoteCursorsPluginValue.cursors.length === 0
-		) {
-			return;
-		}
+    private static interpolateRemoteCursorPositions(
+        original: string,
+        edited: string
+    ): void {
+        if (
+            original === edited ||
+            RemoteCursorsPluginValue.cursors.length === 0
+        ) {
+            return;
+        }
 
-		const updatedPositions: number[] = [];
-		const reconciled = reconcileWithHistory(
-			original,
-			{
-				text: original,
-				cursors: RemoteCursorsPluginValue.cursors.flatMap(
-					({ span }, i) => [
-						{ id: i * 2, position: span.start },
-						{ id: i * 2 + 1, position: span.end }
-					]
-				)
-			},
-			edited
-		);
+        const updatedPositions: number[] = [];
+        const reconciled = reconcileWithHistory(
+            original,
+            {
+                text: original,
+                cursors: RemoteCursorsPluginValue.cursors.flatMap(
+                    ({ span }, i) => [
+                        { id: i * 2, position: span.start },
+                        { id: i * 2 + 1, position: span.end }
+                    ]
+                )
+            },
+            edited
+        );
 
-		reconciled.cursors.forEach(({ id, position }) => {
-			const whereToJump = RemoteCursorsPluginValue.findWhereToMoveCursor(
-				position,
-				reconciled.history
-			);
-			if (whereToJump !== null) {
-				updatedPositions[id] = whereToJump;
-			} else {
-				updatedPositions[id] = position;
-			}
-		});
+        reconciled.cursors.forEach(({ id, position }) => {
+            const whereToJump = RemoteCursorsPluginValue.findWhereToMoveCursor(
+                position,
+                reconciled.history
+            );
+            if (whereToJump !== null) {
+                updatedPositions[id] = whereToJump;
+            } else {
+                updatedPositions[id] = position;
+            }
+        });
 
-		RemoteCursorsPluginValue.cursors.forEach(({ span }, i) => {
-			span.start = updatedPositions[i * 2];
-			span.end = updatedPositions[i * 2 + 1];
-		});
-	}
+        RemoteCursorsPluginValue.cursors.forEach(({ span }, i) => {
+            span.start = updatedPositions[i * 2];
+            span.end = updatedPositions[i * 2 + 1];
+        });
+    }
 
-	private static findWhereToMoveCursor(
-		cursor: number,
-		spans: SpanWithHistory[]
-	): number | null {
-		let position = 0;
-		for (const span of spans) {
-			// left and origin are the same
-			if (position === cursor && span.history === "AddedFromRight") {
-				return position + span.text.length;
-			}
-			position += span.text.length;
-			if (position === cursor && span.history === "RemovedFromRight") {
-				return position - span.text.length;
-			}
-		}
+    private static findWhereToMoveCursor(
+        cursor: number,
+        spans: SpanWithHistory[]
+    ): number | null {
+        let position = 0;
+        for (const span of spans) {
+            // left and origin are the same
+            if (position === cursor && span.history === "AddedFromRight") {
+                return position + span.text.length;
+            }
+            position += span.text.length;
+            if (position === cursor && span.history === "RemovedFromRight") {
+                return position - span.text.length;
+            }
+        }
 
-		return null;
-	}
+        return null;
+    }
 
-	public update(update: ViewUpdate): void {
-		const original = update.startState.doc.toString();
-		const edited = update.state.doc.toString();
+    public update(update: ViewUpdate): void {
+        const original = update.startState.doc.toString();
+        const edited = update.state.doc.toString();
 
-		RemoteCursorsPluginValue.interpolateRemoteCursorPositions(
-			original,
-			edited
-		);
+        RemoteCursorsPluginValue.interpolateRemoteCursorPositions(
+            original,
+            edited
+        );
 
-		const decorations: Range<Decoration>[] = [];
-		const relative_path = RemoteCursorsPluginValue.findFileForEditor(
-			update.view
-		);
-		RemoteCursorsPluginValue.cursors
-			.filter(({ path }) => path == relative_path)
-			.forEach(({ name, span: { start, end } }) => {
-				const color = utils.getRandomColor(name);
-				const startLine = update.view.state.doc.lineAt(start);
-				const endLine = update.view.state.doc.lineAt(end);
+        const decorations: Range<Decoration>[] = [];
+        const relative_path = RemoteCursorsPluginValue.findFileForEditor(
+            update.view
+        );
+        RemoteCursorsPluginValue.cursors
+            .filter(({ path }) => path == relative_path)
+            .forEach(({ name, span: { start, end } }) => {
+                const color = utils.getRandomColor(name);
+                const startLine = update.view.state.doc.lineAt(start);
+                const endLine = update.view.state.doc.lineAt(end);
 
-				const attributes = {
-					style: `background-color: ${color};`
-				};
+                const attributes = {
+                    style: `background-color: ${color};`
+                };
 
-				if (startLine.number === endLine.number) {
-					// selected content in a single line.
-					decorations.push({
-						from: start,
-						to: end,
-						value: Decoration.mark({
-							attributes
-						})
-					});
-				} else {
-					// selected content in multiple lines
-					// first, render text-selection in the first line
-					decorations.push({
-						from: start,
-						to: startLine.from + startLine.length,
-						value: Decoration.mark({
-							attributes
-						})
-					});
+                if (startLine.number === endLine.number) {
+                    // selected content in a single line.
+                    decorations.push({
+                        from: start,
+                        to: end,
+                        value: Decoration.mark({
+                            attributes
+                        })
+                    });
+                } else {
+                    // selected content in multiple lines
+                    // first, render text-selection in the first line
+                    decorations.push({
+                        from: start,
+                        to: startLine.from + startLine.length,
+                        value: Decoration.mark({
+                            attributes
+                        })
+                    });
 
-					// render text-selection in the lines between the first and last line
-					for (
-						let i = startLine.number + 1;
-						i < endLine.number;
-						i++
-					) {
-						const currentLine = update.view.state.doc.line(i);
-						decorations.push({
-							from: currentLine.from,
-							to: currentLine.to,
-							value: Decoration.mark({
-								attributes
-							})
-						});
-					}
+                    // render text-selection in the lines between the first and last line
+                    for (
+                        let i = startLine.number + 1;
+                        i < endLine.number;
+                        i++
+                    ) {
+                        const currentLine = update.view.state.doc.line(i);
+                        decorations.push({
+                            from: currentLine.from,
+                            to: currentLine.to,
+                            value: Decoration.mark({
+                                attributes
+                            })
+                        });
+                    }
 
-					// render text-selection in the last line
-					decorations.push({
-						from: endLine.from,
-						to: end,
-						value: Decoration.mark({
-							attributes
-						})
-					});
-				}
+                    // render text-selection in the last line
+                    decorations.push({
+                        from: endLine.from,
+                        to: end,
+                        value: Decoration.mark({
+                            attributes
+                        })
+                    });
+                }
 
-				decorations.push({
-					from: end,
-					to: end,
-					value: Decoration.widget({
-						side: end - start > 0 ? -1 : 1, // the local cursor should be rendered outside the remote selection
-						block: false,
-						widget: new RemoteCursorWidget(color, name)
-					})
-				});
-			});
+                decorations.push({
+                    from: end,
+                    to: end,
+                    value: Decoration.widget({
+                        side: end - start > 0 ? -1 : 1, // the local cursor should be rendered outside the remote selection
+                        block: false,
+                        widget: new RemoteCursorWidget(color, name)
+                    })
+                });
+            });
 
-		this.decorations = Decoration.set(decorations, true);
-	}
+        this.decorations = Decoration.set(decorations, true);
+    }
 }
 
 export const remoteCursorsPlugin = ViewPlugin.fromClass(
-	RemoteCursorsPluginValue,
-	{
-		decorations: (v) => v.decorations
-	}
+    RemoteCursorsPluginValue,
+    {
+        decorations: (v) => v.decorations
+    }
 );
diff --git a/frontend/obsidian-plugin/src/views/editor-status-display-manager/editor-status-display-manager.scss b/frontend/obsidian-plugin/src/views/editor-status-display-manager/editor-status-display-manager.scss
index a430ac3b..8cc530d2 100644
--- a/frontend/obsidian-plugin/src/views/editor-status-display-manager/editor-status-display-manager.scss
+++ b/frontend/obsidian-plugin/src/views/editor-status-display-manager/editor-status-display-manager.scss
@@ -1,43 +1,43 @@
 .vault-link-sync-status {
-	position: absolute;
-	right: var(--size-4-4);
-	top: var(--size-4-2);
-	opacity: 0.7;
-	cursor: pointer;
+    position: absolute;
+    right: var(--size-4-4);
+    top: var(--size-4-2);
+    opacity: 0.7;
+    cursor: pointer;
 
-	> span {
-		opacity: 0;
-		position: absolute;
-		min-width: 200px;
-		text-align: right;
-		padding-right: var(--size-2-2);
+    > span {
+        opacity: 0;
+        position: absolute;
+        min-width: 200px;
+        text-align: right;
+        padding-right: var(--size-2-2);
 
-		top: 50%;
-		left: 0;
-		transform: translateY(-50%) translateX(-100%) translateY(-2px);
-		transition: opacity 200ms;
-	}
+        top: 50%;
+        left: 0;
+        transform: translateY(-50%) translateX(-100%) translateY(-2px);
+        transition: opacity 200ms;
+    }
 
-	&:hover {
-		> span {
-			opacity: 1;
-		}
-	}
+    &:hover {
+        > span {
+            opacity: 1;
+        }
+    }
 
-	> .icon {
-		line-height: 0;
-	}
+    > .icon {
+        line-height: 0;
+    }
 
-	&.loading > .icon {
-		animation: spin 2s linear infinite;
+    &.loading > .icon {
+        animation: spin 2s linear infinite;
 
-		@keyframes spin {
-			0% {
-				transform: rotate(0deg);
-			}
-			100% {
-				transform: rotate(360deg);
-			}
-		}
-	}
+        @keyframes spin {
+            0% {
+                transform: rotate(0deg);
+            }
+            100% {
+                transform: rotate(360deg);
+            }
+        }
+    }
 }
diff --git a/frontend/obsidian-plugin/src/views/editor-status-display-manager/editor-status-display-manager.ts b/frontend/obsidian-plugin/src/views/editor-status-display-manager/editor-status-display-manager.ts
index 0725c1ea..1010c7e3 100644
--- a/frontend/obsidian-plugin/src/views/editor-status-display-manager/editor-status-display-manager.ts
+++ b/frontend/obsidian-plugin/src/views/editor-status-display-manager/editor-status-display-manager.ts
@@ -7,91 +7,91 @@ import type VaultLinkPlugin from "src/vault-link-plugin";
 import { HistoryView } from "../history/history-view";
 
 export class EditorStatusDisplayManager {
-	private static readonly UPDATE_INTERVAL_IN_MS = 100;
+    private static readonly UPDATE_INTERVAL_IN_MS = 100;
 
-	private readonly intervalId: NodeJS.Timeout;
-	private readonly lastStatuses = new Map<string, DocumentSyncStatus>();
+    private readonly intervalId: NodeJS.Timeout;
+    private readonly lastStatuses = new Map<string, DocumentSyncStatus>();
 
-	public constructor(
-		private readonly plugin: VaultLinkPlugin,
-		private readonly workspace: Workspace,
-		private readonly client: SyncClient
-	) {
-		this.intervalId = setInterval(() => {
-			this.updateEditorStatusDisplay();
-		}, EditorStatusDisplayManager.UPDATE_INTERVAL_IN_MS);
-	}
+    public constructor(
+        private readonly plugin: VaultLinkPlugin,
+        private readonly workspace: Workspace,
+        private readonly client: SyncClient
+    ) {
+        this.intervalId = setInterval(() => {
+            this.updateEditorStatusDisplay();
+        }, EditorStatusDisplayManager.UPDATE_INTERVAL_IN_MS);
+    }
 
-	public dispose(): void {
-		clearInterval(this.intervalId);
-	}
+    public dispose(): void {
+        clearInterval(this.intervalId);
+    }
 
-	private updateEditorStatusDisplay(): void {
-		this.workspace.iterateAllLeaves((leaf) => {
-			if (leaf.view instanceof FileView) {
-				const filePath = leaf.view.file?.path;
-				if (filePath == null) {
-					return;
-				}
+    private updateEditorStatusDisplay(): void {
+        this.workspace.iterateAllLeaves((leaf) => {
+            if (leaf.view instanceof FileView) {
+                const filePath = leaf.view.file?.path;
+                if (filePath == null) {
+                    return;
+                }
 
-				const element = this.getElementFromLeaf(leaf.view);
-				if (element == null) {
-					return;
-				}
+                const element = this.getElementFromLeaf(leaf.view);
+                if (element == null) {
+                    return;
+                }
 
-				const previousStatus = this.lastStatuses.get(filePath);
-				const currentStatus =
-					this.client.getDocumentSyncingStatus(filePath);
-				if (previousStatus === currentStatus) {
-					return;
-				}
-				this.lastStatuses.set(filePath, currentStatus);
+                const previousStatus = this.lastStatuses.get(filePath);
+                const currentStatus =
+                    this.client.getDocumentSyncingStatus(filePath);
+                if (previousStatus === currentStatus) {
+                    return;
+                }
+                this.lastStatuses.set(filePath, currentStatus);
 
-				if (currentStatus == DocumentSyncStatus.SYNCING_IS_DISABLED) {
-					element.remove();
-					return;
-				}
+                if (currentStatus == DocumentSyncStatus.SYNCING_IS_DISABLED) {
+                    element.remove();
+                    return;
+                }
 
-				if (currentStatus == DocumentSyncStatus.SYNCING) {
-					element.classList.add("loading");
-				} else {
-					element.classList.remove("loading");
-				}
+                if (currentStatus == DocumentSyncStatus.SYNCING) {
+                    element.classList.add("loading");
+                } else {
+                    element.classList.remove("loading");
+                }
 
-				const iconContainer = element.querySelector(".icon");
-				if (iconContainer != null) {
-					setIcon(
-						iconContainer as HTMLElement, // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
-						currentStatus == DocumentSyncStatus.SYNCING
-							? "loader"
-							: "circle-check"
-					);
-				}
-			}
-		});
-	}
+                const iconContainer = element.querySelector(".icon");
+                if (iconContainer != null) {
+                    setIcon(
+                        iconContainer as HTMLElement, // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+                        currentStatus == DocumentSyncStatus.SYNCING
+                            ? "loader"
+                            : "circle-check"
+                    );
+                }
+            }
+        });
+    }
 
-	private getElementFromLeaf(fileView: FileView): Element | undefined {
-		const parent = fileView.contentEl.querySelector(".cm-editor");
-		if (parent == null) {
-			return;
-		}
+    private getElementFromLeaf(fileView: FileView): Element | undefined {
+        const parent = fileView.contentEl.querySelector(".cm-editor");
+        if (parent == null) {
+            return;
+        }
 
-		return (
-			parent.querySelector(".vault-link-sync-status") ??
-			parent.createDiv(
-				{
-					cls: "vault-link-sync-status"
-				},
-				(el) => {
-					el.createSpan({ text: "VaultLink sync state" });
-					el.createDiv({
-						cls: "icon"
-					});
-					el.onclick = async (): Promise<void> =>
-						this.plugin.activateView(HistoryView.TYPE);
-				}
-			)
-		);
-	}
+        return (
+            parent.querySelector(".vault-link-sync-status") ??
+            parent.createDiv(
+                {
+                    cls: "vault-link-sync-status"
+                },
+                (el) => {
+                    el.createSpan({ text: "VaultLink sync state" });
+                    el.createDiv({
+                        cls: "icon"
+                    });
+                    el.onclick = async (): Promise<void> =>
+                        this.plugin.activateView(HistoryView.TYPE);
+                }
+            )
+        );
+    }
 }
diff --git a/frontend/obsidian-plugin/src/views/history/history-view.scss b/frontend/obsidian-plugin/src/views/history/history-view.scss
index fb93fa30..4e8b2a96 100644
--- a/frontend/obsidian-plugin/src/views/history/history-view.scss
+++ b/frontend/obsidian-plugin/src/views/history/history-view.scss
@@ -1,61 +1,61 @@
 .history-card {
-	padding: var(--size-4-4);
-	margin: var(--size-4-2);
-	background-color: var(--color-base-00);
-	border-radius: var(--radius-l);
-	container-type: inline-size;
-	word-break: break-word;
+    padding: var(--size-4-4);
+    margin: var(--size-4-2);
+    background-color: var(--color-base-00);
+    border-radius: var(--radius-l);
+    container-type: inline-size;
+    word-break: break-word;
 
-	&.clickable {
-		cursor: pointer;
-	}
+    &.clickable {
+        cursor: pointer;
+    }
 
-	&.success {
-		background-color: rgba(var(--color-green-rgb), 0.2);
-	}
+    &.success {
+        background-color: rgba(var(--color-green-rgb), 0.2);
+    }
 
-	&.error {
-		background-color: rgba(var(--color-red-rgb), 0.2);
-	}
+    &.error {
+        background-color: rgba(var(--color-red-rgb), 0.2);
+    }
 
-	&.skipped {
-		background-color: rgba(var(--color-green-rgb), 0.08);
-	}
+    &.skipped {
+        background-color: rgba(var(--color-green-rgb), 0.08);
+    }
 
-	.history-card-header {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		margin-bottom: var(--size-4-2);
-		gap: var(--size-4-2);
+    .history-card-header {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        margin-bottom: var(--size-4-2);
+        gap: var(--size-4-2);
 
-		@container (max-width: 300px) {
-			flex-direction: column;
-			align-items: flex-start;
-		}
+        @container (max-width: 300px) {
+            flex-direction: column;
+            align-items: flex-start;
+        }
 
-		.history-card-title {
-			font: var(--font-monospace);
-			display: flex;
-			align-items: center;
-			gap: var(--size-4-2);
-			margin: 0;
+        .history-card-title {
+            font: var(--font-monospace);
+            display: flex;
+            align-items: center;
+            gap: var(--size-4-2);
+            margin: 0;
 
-			> span {
-				margin-bottom: var(--size-4-1);
-			}
-		}
+            > span {
+                margin-bottom: var(--size-4-1);
+            }
+        }
 
-		.history-card-timestamp {
-			font-size: var(--font-ui-small);
-			font-style: italic;
-			color: var(--italic-color);
-		}
-	}
+        .history-card-timestamp {
+            font-size: var(--font-ui-small);
+            font-style: italic;
+            color: var(--italic-color);
+        }
+    }
 
-	.history-card-message {
-		font-size: var(--font-ui-medium);
-		color: var(--color-base-70);
-		margin: 0;
-	}
+    .history-card-message {
+        font-size: var(--font-ui-medium);
+        color: var(--color-base-70);
+        margin: 0;
+    }
 }
diff --git a/frontend/obsidian-plugin/src/views/history/history-view.ts b/frontend/obsidian-plugin/src/views/history/history-view.ts
index 1094e575..1fc2c91e 100644
--- a/frontend/obsidian-plugin/src/views/history/history-view.ts
+++ b/frontend/obsidian-plugin/src/views/history/history-view.ts
@@ -7,234 +7,234 @@ import type { HistoryEntry, SyncClient } from "sync-client";
 import { SyncType } from "sync-client";
 
 export class HistoryView extends ItemView {
-	public static readonly TYPE = "history-view";
-	public static readonly ICON = "square-stack";
-	private timer: NodeJS.Timeout | null = null;
+    public static readonly TYPE = "history-view";
+    public static readonly ICON = "square-stack";
+    private timer: NodeJS.Timeout | null = null;
 
-	private historyContainer: HTMLElement | undefined;
-	private readonly historyEntryToElement = new Map<
-		HistoryEntry,
-		HTMLElement
-	>();
+    private historyContainer: HTMLElement | undefined;
+    private readonly historyEntryToElement = new Map<
+        HistoryEntry,
+        HTMLElement
+    >();
 
-	public constructor(
-		private readonly client: SyncClient,
-		leaf: WorkspaceLeaf
-	) {
-		super(leaf);
-		this.icon = HistoryView.ICON;
+    public constructor(
+        private readonly client: SyncClient,
+        leaf: WorkspaceLeaf
+    ) {
+        super(leaf);
+        this.icon = HistoryView.ICON;
 
-		this.client.addSyncHistoryUpdateListener(async () =>
-			this.updateView().catch((error: unknown) => {
-				this.client.logger.error(
-					`Failed to update history view: ${error}`
-				);
-			})
-		);
-	}
+        this.client.addSyncHistoryUpdateListener(async () =>
+            this.updateView().catch((error: unknown) => {
+                this.client.logger.error(
+                    `Failed to update history view: ${error}`
+                );
+            })
+        );
+    }
 
-	private static getSyncTypeIcon(type: SyncType | undefined): IconName {
-		switch (type) {
-			case SyncType.CREATE:
-				return "file-plus";
-			case SyncType.DELETE:
-				return "trash-2";
-			case SyncType.UPDATE:
-				return "file-pen-line";
-			case SyncType.MOVE:
-				return "move-right";
-			case SyncType.SKIPPED:
-				return "circle-slash";
-			case undefined:
-			default:
-				return "";
-		}
-	}
+    private static getSyncTypeIcon(type: SyncType | undefined): IconName {
+        switch (type) {
+            case SyncType.CREATE:
+                return "file-plus";
+            case SyncType.DELETE:
+                return "trash-2";
+            case SyncType.UPDATE:
+                return "file-pen-line";
+            case SyncType.MOVE:
+                return "move-right";
+            case SyncType.SKIPPED:
+                return "circle-slash";
+            case undefined:
+            default:
+                return "";
+        }
+    }
 
-	private static renderSyncItemTitle(
-		element: HTMLElement,
-		entry: HistoryEntry
-	): void {
-		const syncTypeIcon = HistoryView.getSyncTypeIcon(entry.details.type);
-		if (syncTypeIcon) {
-			setIcon(element.createDiv(), syncTypeIcon);
-		}
+    private static renderSyncItemTitle(
+        element: HTMLElement,
+        entry: HistoryEntry
+    ): void {
+        const syncTypeIcon = HistoryView.getSyncTypeIcon(entry.details.type);
+        if (syncTypeIcon) {
+            setIcon(element.createDiv(), syncTypeIcon);
+        }
 
-		let fileName = entry.details.relativePath.split("/").pop() ?? "";
-		fileName = fileName.replace(/\.md$/, "");
+        let fileName = entry.details.relativePath.split("/").pop() ?? "";
+        fileName = fileName.replace(/\.md$/, "");
 
-		element.createEl("span", {
-			text:
-				entry.details.type === SyncType.SKIPPED
-					? `Skipped: ${fileName}`
-					: fileName
-		});
-	}
+        element.createEl("span", {
+            text:
+                entry.details.type === SyncType.SKIPPED
+                    ? `Skipped: ${fileName}`
+                    : fileName
+        });
+    }
 
-	private static updateTimeSince(
-		element: HTMLElement,
-		entry: HistoryEntry
-	): void {
-		const timestampElement = element.querySelector(
-			".history-card-timestamp"
-		);
+    private static updateTimeSince(
+        element: HTMLElement,
+        entry: HistoryEntry
+    ): void {
+        const timestampElement = element.querySelector(
+            ".history-card-timestamp"
+        );
 
-		if (timestampElement != null) {
-			timestampElement.textContent =
-				HistoryView.getTimestampAndAuthor(entry);
-		}
-	}
+        if (timestampElement != null) {
+            timestampElement.textContent =
+                HistoryView.getTimestampAndAuthor(entry);
+        }
+    }
 
-	private static getTimestampAndAuthor(entry: HistoryEntry): string {
-		let content = intlFormatDistance(entry.timestamp, new Date());
-		if ("author" in entry && entry.author !== undefined) {
-			content += ` by ${entry.author}`;
-		}
-		return content;
-	}
+    private static getTimestampAndAuthor(entry: HistoryEntry): string {
+        let content = intlFormatDistance(entry.timestamp, new Date());
+        if ("author" in entry && entry.author !== undefined) {
+            content += ` by ${entry.author}`;
+        }
+        return content;
+    }
 
-	public getViewType(): string {
-		return HistoryView.TYPE;
-	}
+    public getViewType(): string {
+        return HistoryView.TYPE;
+    }
 
-	public getDisplayText(): string {
-		return "VaultLink history";
-	}
+    public getDisplayText(): string {
+        return "VaultLink history";
+    }
 
-	public async onOpen(): Promise<void> {
-		const container = this.containerEl.children[1];
-		container.createEl("h4", { text: "VaultLink history" });
+    public async onOpen(): Promise<void> {
+        const container = this.containerEl.children[1];
+        container.createEl("h4", { text: "VaultLink history" });
 
-		this.historyContainer = container.createDiv({ cls: "logs-container" });
+        this.historyContainer = container.createDiv({ cls: "logs-container" });
 
-		await this.updateView();
-		this.clearTimer();
-		this.timer = setInterval(
-			() =>
-				void this.updateView().catch((error: unknown) => {
-					this.client.logger.error(
-						`Failed to update history view: ${error}`
-					);
-				}),
-			1000
-		);
-	}
+        await this.updateView();
+        this.clearTimer();
+        this.timer = setInterval(
+            () =>
+                void this.updateView().catch((error: unknown) => {
+                    this.client.logger.error(
+                        `Failed to update history view: ${error}`
+                    );
+                }),
+            1000
+        );
+    }
 
-	public async onClose(): Promise<void> {
-		this.clearTimer();
-	}
+    public async onClose(): Promise<void> {
+        this.clearTimer();
+    }
 
-	private clearTimer(): void {
-		if (this.timer) {
-			clearInterval(this.timer);
-			this.timer = null;
-		}
-	}
+    private clearTimer(): void {
+        if (this.timer) {
+            clearInterval(this.timer);
+            this.timer = null;
+        }
+    }
 
-	private async updateView(): Promise<void> {
-		const container = this.historyContainer;
-		if (container === undefined) {
-			return;
-		}
+    private async updateView(): Promise<void> {
+        const container = this.historyContainer;
+        if (container === undefined) {
+            return;
+        }
 
-		// entries are newest first, but we prepend new ones
-		const entries = this.client.getHistoryEntries().toReversed();
+        // entries are newest first, but we prepend new ones
+        const entries = this.client.getHistoryEntries().toReversed();
 
-		if (this.historyEntryToElement.size === 0 && entries.length > 0) {
-			// Clear the "No update has happened yet" message
-			container.empty();
-		}
+        if (this.historyEntryToElement.size === 0 && entries.length > 0) {
+            // Clear the "No update has happened yet" message
+            container.empty();
+        }
 
-		entries.forEach((entry) => {
-			const element = this.historyEntryToElement.get(entry);
-			if (element !== undefined) {
-				HistoryView.updateTimeSince(element, entry);
-				return;
-			}
+        entries.forEach((entry) => {
+            const element = this.historyEntryToElement.get(entry);
+            if (element !== undefined) {
+                HistoryView.updateTimeSince(element, entry);
+                return;
+            }
 
-			const newElement = this.createHistoryCard(container, entry);
-			container.prepend(newElement);
-			this.historyEntryToElement.set(entry, newElement);
-		});
+            const newElement = this.createHistoryCard(container, entry);
+            container.prepend(newElement);
+            this.historyEntryToElement.set(entry, newElement);
+        });
 
-		const newEntries = new Set(entries);
-		for (const [entry, element] of this.historyEntryToElement) {
-			if (!newEntries.has(entry)) {
-				element.remove();
-				this.historyEntryToElement.delete(entry);
-			}
-		}
+        const newEntries = new Set(entries);
+        for (const [entry, element] of this.historyEntryToElement) {
+            if (!newEntries.has(entry)) {
+                element.remove();
+                this.historyEntryToElement.delete(entry);
+            }
+        }
 
-		if (entries.length === 0) {
-			container.empty();
-			container.createEl("p", {
-				text: "No update has happened yet."
-			});
-		}
-	}
+        if (entries.length === 0) {
+            container.empty();
+            container.createEl("p", {
+                text: "No update has happened yet."
+            });
+        }
+    }
 
-	private createHistoryCard(
-		container: HTMLElement,
-		entry: HistoryEntry
-	): HTMLElement {
-		return container.createDiv(
-			{
-				cls: ["history-card", entry.status.toLocaleLowerCase()]
-			},
-			(card) => {
-				if (
-					this.app.vault.getFileByPath(entry.details.relativePath) !=
-					null
-				) {
-					card.addEventListener("click", () => {
-						this.app.workspace
-							.openLinkText(
-								entry.details.relativePath,
-								entry.details.relativePath,
-								false
-							)
-							.catch((error: unknown) => {
-								this.client.logger.error(
-									`Failed to open link for ${entry.details.relativePath}: ${error}`
-								);
-							});
-					});
+    private createHistoryCard(
+        container: HTMLElement,
+        entry: HistoryEntry
+    ): HTMLElement {
+        return container.createDiv(
+            {
+                cls: ["history-card", entry.status.toLocaleLowerCase()]
+            },
+            (card) => {
+                if (
+                    this.app.vault.getFileByPath(entry.details.relativePath) !=
+                    null
+                ) {
+                    card.addEventListener("click", () => {
+                        this.app.workspace
+                            .openLinkText(
+                                entry.details.relativePath,
+                                entry.details.relativePath,
+                                false
+                            )
+                            .catch((error: unknown) => {
+                                this.client.logger.error(
+                                    `Failed to open link for ${entry.details.relativePath}: ${error}`
+                                );
+                            });
+                    });
 
-					card.addClass("clickable");
-				}
+                    card.addClass("clickable");
+                }
 
-				card.createDiv(
-					{
-						cls: "history-card-header"
-					},
-					(header) => {
-						header.createEl(
-							"h5",
-							{
-								cls: "history-card-title"
-							},
-							(title) => {
-								HistoryView.renderSyncItemTitle(title, entry);
-							}
-						);
+                card.createDiv(
+                    {
+                        cls: "history-card-header"
+                    },
+                    (header) => {
+                        header.createEl(
+                            "h5",
+                            {
+                                cls: "history-card-title"
+                            },
+                            (title) => {
+                                HistoryView.renderSyncItemTitle(title, entry);
+                            }
+                        );
 
-						header.createSpan({
-							text: HistoryView.getTimestampAndAuthor(entry),
-							cls: "history-card-timestamp"
-						});
-					}
-				);
+                        header.createSpan({
+                            text: HistoryView.getTimestampAndAuthor(entry),
+                            cls: "history-card-timestamp"
+                        });
+                    }
+                );
 
-				const body =
-					entry.details.type === SyncType.MOVE
-						? `${entry.message}. Moved from '${entry.details.movedFrom}' to '${entry.details.relativePath}'`
-						: `${entry.message}.`;
+                const body =
+                    entry.details.type === SyncType.MOVE
+                        ? `${entry.message}. Moved from '${entry.details.movedFrom}' to '${entry.details.relativePath}'`
+                        : `${entry.message}.`;
 
-				card.createEl("p", {
-					text: body,
-					cls: "history-card-message"
-				});
-			}
-		);
-	}
+                card.createEl("p", {
+                    text: body,
+                    cls: "history-card-message"
+                });
+            }
+        );
+    }
 }
diff --git a/frontend/obsidian-plugin/src/views/logs/logs-view.scss b/frontend/obsidian-plugin/src/views/logs/logs-view.scss
index 2bffe693..47b4cb29 100644
--- a/frontend/obsidian-plugin/src/views/logs/logs-view.scss
+++ b/frontend/obsidian-plugin/src/views/logs/logs-view.scss
@@ -1,74 +1,74 @@
 .logs-view {
-	display: flex;
-	flex-direction: column;
+    display: flex;
+    flex-direction: column;
 
-	.verbosity-selector {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		font-weight: normal;
-		gap: var(--size-4-2);
-		margin: var(--size-4-4) var(--size-4-2);
+    .verbosity-selector {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        font-weight: normal;
+        gap: var(--size-4-2);
+        margin: var(--size-4-4) var(--size-4-2);
 
-		h4 {
-			margin: 0;
-		}
+        h4 {
+            margin: 0;
+        }
 
-		.logs-controls {
-			display: flex;
-			align-items: center;
-			gap: var(--size-4-2);
+        .logs-controls {
+            display: flex;
+            align-items: center;
+            gap: var(--size-4-2);
 
-			button {
-				display: flex;
-				align-items: center;
-				gap: var(--size-2-1);
-				padding: var(--size-2-2) var(--size-4-2);
-				cursor: pointer;
-			}
+            button {
+                display: flex;
+                align-items: center;
+                gap: var(--size-2-1);
+                padding: var(--size-2-2) var(--size-4-2);
+                cursor: pointer;
+            }
 
-			select {
-				cursor: pointer;
-			}
-		}
-	}
+            select {
+                cursor: pointer;
+            }
+        }
+    }
 
-	.logs-container {
-		max-width: 100%;
-		overflow-y: auto;
+    .logs-container {
+        max-width: 100%;
+        overflow-y: auto;
 
-		.log-message {
-			font: var(--font-monospace);
-			margin-bottom: var(--size-2-1);
-			overflow-wrap: break-word;
-			white-space: pre-wrap;
-			user-select: all;
+        .log-message {
+            font: var(--font-monospace);
+            margin-bottom: var(--size-2-1);
+            overflow-wrap: break-word;
+            white-space: pre-wrap;
+            user-select: all;
 
-			.timestamp {
-				padding: var(--size-2-1) var(--size-4-1);
-				border-radius: var(--radius-s);
-				background-color: var(--color-base-30);
-				font-size: var(--font-ui-small);
-				font-family: var(--font-monospace);
-				font-weight: var(--bold-weight);
-				margin-right: var(--size-4-1);
-			}
+            .timestamp {
+                padding: var(--size-2-1) var(--size-4-1);
+                border-radius: var(--radius-s);
+                background-color: var(--color-base-30);
+                font-size: var(--font-ui-small);
+                font-family: var(--font-monospace);
+                font-weight: var(--bold-weight);
+                margin-right: var(--size-4-1);
+            }
 
-			&.DEBUG {
-				color: var(--color-base-50);
-			}
+            &.DEBUG {
+                color: var(--color-base-50);
+            }
 
-			&.INFO {
-				color: var(--color-base-100);
-			}
+            &.INFO {
+                color: var(--color-base-100);
+            }
 
-			&.WARNING {
-				color: rgb(var(--color-yellow-rgb));
-			}
+            &.WARNING {
+                color: rgb(var(--color-yellow-rgb));
+            }
 
-			&.ERROR {
-				color: rgb(var(--color-red-rgb));
-			}
-		}
-	}
+            &.ERROR {
+                color: rgb(var(--color-red-rgb));
+            }
+        }
+    }
 }
diff --git a/frontend/obsidian-plugin/src/views/logs/logs-view.ts b/frontend/obsidian-plugin/src/views/logs/logs-view.ts
index 395cfe09..927dc9b7 100644
--- a/frontend/obsidian-plugin/src/views/logs/logs-view.ts
+++ b/frontend/obsidian-plugin/src/views/logs/logs-view.ts
@@ -6,189 +6,189 @@ import type { LogLine } from "sync-client";
 import { LogLevel, type SyncClient } from "sync-client";
 
 export class LogsView extends ItemView {
-	public static readonly TYPE = "logs-view";
-	public static readonly ICON = "logs";
+    public static readonly TYPE = "logs-view";
+    public static readonly ICON = "logs";
 
-	private static readonly MAX_OFFSET_FROM_BOTTOM_WITH_AUTO_SCROLL_PX = 300;
+    private static readonly MAX_OFFSET_FROM_BOTTOM_WITH_AUTO_SCROLL_PX = 300;
 
-	private logsContainer: HTMLElement | undefined;
-	private readonly logLineToElement = new Map<LogLine, HTMLElement>();
-	private minLogLevel: LogLevel = LogLevel.INFO;
+    private logsContainer: HTMLElement | undefined;
+    private readonly logLineToElement = new Map<LogLine, HTMLElement>();
+    private minLogLevel: LogLevel = LogLevel.INFO;
 
-	public constructor(
-		private readonly client: SyncClient,
-		leaf: WorkspaceLeaf
-	) {
-		super(leaf);
-		this.icon = LogsView.ICON;
-		this.client.logger.addOnMessageListener(() => {
-			this.updateView();
-		});
-	}
+    public constructor(
+        private readonly client: SyncClient,
+        leaf: WorkspaceLeaf
+    ) {
+        super(leaf);
+        this.icon = LogsView.ICON;
+        this.client.logger.addOnMessageListener(() => {
+            this.updateView();
+        });
+    }
 
-	private static createLogLineElement(
-		container: HTMLElement,
-		logLine: LogLine
-	): HTMLElement {
-		return container.createDiv(
-			{
-				cls: ["log-message", logLine.level]
-			},
-			(messageContainer) => {
-				messageContainer.createEl("span", {
-					text: LogsView.formatTimestamp(logLine.timestamp),
-					cls: "timestamp"
-				});
-				messageContainer.createEl("span", {
-					text: logLine.message
-				});
-			}
-		);
-	}
+    private static createLogLineElement(
+        container: HTMLElement,
+        logLine: LogLine
+    ): HTMLElement {
+        return container.createDiv(
+            {
+                cls: ["log-message", logLine.level]
+            },
+            (messageContainer) => {
+                messageContainer.createEl("span", {
+                    text: LogsView.formatTimestamp(logLine.timestamp),
+                    cls: "timestamp"
+                });
+                messageContainer.createEl("span", {
+                    text: logLine.message
+                });
+            }
+        );
+    }
 
-	private static formatTimestamp(timestamp: Date): string {
-		return timestamp.toTimeString().split(" ")[0];
-	}
+    private static formatTimestamp(timestamp: Date): string {
+        return timestamp.toTimeString().split(" ")[0];
+    }
 
-	public getViewType(): string {
-		return LogsView.TYPE;
-	}
+    public getViewType(): string {
+        return LogsView.TYPE;
+    }
 
-	public getDisplayText(): string {
-		return "VaultLink logs";
-	}
+    public getDisplayText(): string {
+        return "VaultLink logs";
+    }
 
-	public async onOpen(): Promise<void> {
-		const container = this.containerEl.children[1];
-		container.addClass("logs-view");
+    public async onOpen(): Promise<void> {
+        const container = this.containerEl.children[1];
+        container.addClass("logs-view");
 
-		const logLevels = [
-			{ label: "Debug", value: LogLevel.DEBUG },
-			{ label: "Info", value: LogLevel.INFO },
-			{ label: "Warn", value: LogLevel.WARNING },
-			{ label: "Error", value: LogLevel.ERROR }
-		];
+        const logLevels = [
+            { label: "Debug", value: LogLevel.DEBUG },
+            { label: "Info", value: LogLevel.INFO },
+            { label: "Warn", value: LogLevel.WARNING },
+            { label: "Error", value: LogLevel.ERROR }
+        ];
 
-		container.createDiv(
-			{
-				cls: "verbosity-selector"
-			},
-			(verbositySection) => {
-				verbositySection.createEl("h4", {
-					text: "VaultLink logs"
-				});
+        container.createDiv(
+            {
+                cls: "verbosity-selector"
+            },
+            (verbositySection) => {
+                verbositySection.createEl("h4", {
+                    text: "VaultLink logs"
+                });
 
-				const controls = verbositySection.createDiv({
-					cls: "logs-controls"
-				});
+                const controls = verbositySection.createDiv({
+                    cls: "logs-controls"
+                });
 
-				const copyButton = controls.createEl("button", {
-					text: "Copy logs",
-					cls: "clickable-icon"
-				});
-				setIcon(copyButton, "clipboard-copy");
-				copyButton.addEventListener("click", () => {
-					this.copyLogsToClipboard();
-				});
+                const copyButton = controls.createEl("button", {
+                    text: "Copy logs",
+                    cls: "clickable-icon"
+                });
+                setIcon(copyButton, "clipboard-copy");
+                copyButton.addEventListener("click", () => {
+                    this.copyLogsToClipboard();
+                });
 
-				controls.createEl("select", {}, (dropdown) => {
-					logLevels.forEach(({ label, value }) =>
-						dropdown.createEl("option", { text: label, value })
-					);
+                controls.createEl("select", {}, (dropdown) => {
+                    logLevels.forEach(({ label, value }) =>
+                        dropdown.createEl("option", { text: label, value })
+                    );
 
-					dropdown.value = this.minLogLevel;
+                    dropdown.value = this.minLogLevel;
 
-					dropdown.addEventListener("change", () => {
-						// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-						this.minLogLevel = dropdown.value as LogLevel;
+                    dropdown.addEventListener("change", () => {
+                        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+                        this.minLogLevel = dropdown.value as LogLevel;
 
-						this.logsContainer?.empty();
-						this.logLineToElement.clear();
-						this.updateView();
-					});
-				});
-			}
-		);
+                        this.logsContainer?.empty();
+                        this.logLineToElement.clear();
+                        this.updateView();
+                    });
+                });
+            }
+        );
 
-		this.logsContainer = container.createDiv({ cls: "logs-container" });
+        this.logsContainer = container.createDiv({ cls: "logs-container" });
 
-		this.updateView();
-	}
+        this.updateView();
+    }
 
-	private copyLogsToClipboard(): void {
-		const logs = this.client.logger.getMessages(this.minLogLevel);
+    private copyLogsToClipboard(): void {
+        const logs = this.client.logger.getMessages(this.minLogLevel);
 
-		if (logs.length === 0) {
-			new Notice("No logs to copy");
-			return;
-		}
+        if (logs.length === 0) {
+            new Notice("No logs to copy");
+            return;
+        }
 
-		const formattedLogs = logs
-			.map((logLine) => {
-				const timestamp = logLine.timestamp.toLocaleString();
-				const level = logLine.level.toUpperCase();
-				return `[${timestamp}] ${level}: ${logLine.message}`;
-			})
-			.join("\n");
+        const formattedLogs = logs
+            .map((logLine) => {
+                const timestamp = logLine.timestamp.toLocaleString();
+                const level = logLine.level.toUpperCase();
+                return `[${timestamp}] ${level}: ${logLine.message}`;
+            })
+            .join("\n");
 
-		navigator.clipboard
-			.writeText(formattedLogs)
-			.then(() => {
-				new Notice(`Copied ${logs.length} log entries to clipboard`);
-			})
-			.catch((error: unknown) => {
-				this.client.logger.error(
-					`Failed to copy logs to clipboard: ${error}`
-				);
-				new Notice("Failed to copy logs to clipboard");
-			});
-	}
+        navigator.clipboard
+            .writeText(formattedLogs)
+            .then(() => {
+                new Notice(`Copied ${logs.length} log entries to clipboard`);
+            })
+            .catch((error: unknown) => {
+                this.client.logger.error(
+                    `Failed to copy logs to clipboard: ${error}`
+                );
+                new Notice("Failed to copy logs to clipboard");
+            });
+    }
 
-	private updateView(): void {
-		const container = this.logsContainer;
-		if (container === undefined) {
-			return;
-		}
+    private updateView(): void {
+        const container = this.logsContainer;
+        if (container === undefined) {
+            return;
+        }
 
-		const logs = this.client.logger.getMessages(this.minLogLevel);
+        const logs = this.client.logger.getMessages(this.minLogLevel);
 
-		if (this.logLineToElement.size === 0 && logs.length > 0) {
-			// Clear the "No logs available yet" message
-			container.empty();
-		}
+        if (this.logLineToElement.size === 0 && logs.length > 0) {
+            // Clear the "No logs available yet" message
+            container.empty();
+        }
 
-		const shouldScroll =
-			container.scrollTop == 0 ||
-			container.scrollHeight -
-				container.clientHeight -
-				container.scrollTop <
-				LogsView.MAX_OFFSET_FROM_BOTTOM_WITH_AUTO_SCROLL_PX;
+        const shouldScroll =
+            container.scrollTop == 0 ||
+            container.scrollHeight -
+                container.clientHeight -
+                container.scrollTop <
+                LogsView.MAX_OFFSET_FROM_BOTTOM_WITH_AUTO_SCROLL_PX;
 
-		logs.forEach((message) => {
-			if (this.logLineToElement.has(message)) {
-				return;
-			}
+        logs.forEach((message) => {
+            if (this.logLineToElement.has(message)) {
+                return;
+            }
 
-			const element = LogsView.createLogLineElement(container, message);
+            const element = LogsView.createLogLineElement(container, message);
 
-			this.logLineToElement.set(message, element);
-		});
+            this.logLineToElement.set(message, element);
+        });
 
-		const newLines = new Set(logs);
-		for (const [logLine, element] of this.logLineToElement) {
-			if (!newLines.has(logLine)) {
-				element.remove();
-				this.logLineToElement.delete(logLine);
-			}
-		}
+        const newLines = new Set(logs);
+        for (const [logLine, element] of this.logLineToElement) {
+            if (!newLines.has(logLine)) {
+                element.remove();
+                this.logLineToElement.delete(logLine);
+            }
+        }
 
-		if (logs.length === 0) {
-			container.empty();
-			container.createEl("p", {
-				text: "No logs available yet."
-			});
-		} else if (shouldScroll) {
-			container.scrollTop = container.scrollHeight;
-		}
-	}
+        if (logs.length === 0) {
+            container.empty();
+            container.createEl("p", {
+                text: "No logs available yet."
+            });
+        } else if (shouldScroll) {
+            container.scrollTop = container.scrollHeight;
+        }
+    }
 }
diff --git a/frontend/obsidian-plugin/src/views/settings/settings-tab.scss b/frontend/obsidian-plugin/src/views/settings/settings-tab.scss
index 0aabbadc..579c5b8c 100644
--- a/frontend/obsidian-plugin/src/views/settings/settings-tab.scss
+++ b/frontend/obsidian-plugin/src/views/settings/settings-tab.scss
@@ -1,134 +1,134 @@
 @mixin number-card {
-	padding: var(--size-2-1) var(--size-4-1);
-	border-radius: var(--radius-s);
-	background-color: var(--color-base-30);
-	font-size: var(--font-ui-small);
+    padding: var(--size-2-1) var(--size-4-1);
+    border-radius: var(--radius-s);
+    background-color: var(--color-base-30);
+    font-size: var(--font-ui-small);
 
-	&.good {
-		background-color: rgba(var(--color-green-rgb), 0.35);
-	}
+    &.good {
+        background-color: rgba(var(--color-green-rgb), 0.35);
+    }
 
-	&.bad {
-		background-color: rgba(var(--color-red-rgb), 0.35);
-	}
+    &.bad {
+        background-color: rgba(var(--color-red-rgb), 0.35);
+    }
 }
 
 .vault-link-settings-container {
-	position: relative;
+    position: relative;
 
-	.vault-link-settings {
-		h2 {
-			display: flex;
-			align-items: center;
-			font-size: var(--h2-size);
+    .vault-link-settings {
+        h2 {
+            display: flex;
+            align-items: center;
+            font-size: var(--h2-size);
 
-			.version {
-				@include number-card;
-				margin: var(--size-2-2) 0 0 var(--size-4-2);
-				background-color: var(--color-base-30);
-				color: var(--color-base-70);
-				font-size: var(--font-ui-smaller);
-			}
-		}
+            .version {
+                @include number-card;
+                margin: var(--size-2-2) 0 0 var(--size-4-2);
+                background-color: var(--color-base-30);
+                color: var(--color-base-70);
+                font-size: var(--font-ui-smaller);
+            }
+        }
 
-		.button-container {
-			display: flex;
-			gap: var(--size-4-2);
-		}
+        .button-container {
+            display: flex;
+            gap: var(--size-4-2);
+        }
 
-		h3 {
-			font-size: var(--font-ui-large);
-			margin-top: var(--heading-spacing);
-		}
+        h3 {
+            font-size: var(--font-ui-large);
+            margin-top: var(--heading-spacing);
+        }
 
-		button,
-		input[type="range"],
-		.checkbox-container,
-		.slider::-webkit-slider-thumb {
-			cursor: pointer;
-		}
+        button,
+        input[type="range"],
+        .checkbox-container,
+        .slider::-webkit-slider-thumb {
+            cursor: pointer;
+        }
 
-		input[type="text"],
-		textarea {
-			width: 250px;
-		}
+        input[type="text"],
+        textarea {
+            width: 250px;
+        }
 
-		textarea {
-			resize: none;
-			height: 75px;
-		}
+        textarea {
+            resize: none;
+            height: 75px;
+        }
 
-		.applying-changes-overlay {
-			position: absolute;
-			top: 50%;
-			left: 50%;
-			transform: translateY(-50%) translateX(-50%);
-			z-index: 10;
-			backdrop-filter: blur(10px);
+        .applying-changes-overlay {
+            position: absolute;
+            top: 50%;
+            left: 50%;
+            transform: translateY(-50%) translateX(-50%);
+            z-index: 10;
+            backdrop-filter: blur(10px);
 
-			.spinner-container {
-				background-color: rgba(var(--background-primary), 0.5);
-				border: 1px solid var(--background-modifier-border);
-				border-radius: var(--radius-m);
-				padding: var(--size-4-8);
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-				gap: var(--size-4-3);
-				box-shadow: 0 8px 24px rgba(0, 0, 0, 0.3);
-				min-width: 200px;
-			}
+            .spinner-container {
+                background-color: rgba(var(--background-primary), 0.5);
+                border: 1px solid var(--background-modifier-border);
+                border-radius: var(--radius-m);
+                padding: var(--size-4-8);
+                display: flex;
+                flex-direction: column;
+                align-items: center;
+                gap: var(--size-4-3);
+                box-shadow: 0 8px 24px rgba(0, 0, 0, 0.3);
+                min-width: 200px;
+            }
 
-			.spinner {
-				width: 48px;
-				height: 48px;
-				border: 4px solid var(--background-modifier-border);
-				border-top-color: var(--interactive-accent);
-				border-radius: 50%;
-				animation: spin 0.8s linear infinite;
-			}
+            .spinner {
+                width: 48px;
+                height: 48px;
+                border: 4px solid var(--background-modifier-border);
+                border-top-color: var(--interactive-accent);
+                border-radius: 50%;
+                animation: spin 0.8s linear infinite;
+            }
 
-			.spinner-text {
-				color: var(--text-normal);
-				font-size: var(--font-ui-medium);
-				font-weight: 500;
-			}
+            .spinner-text {
+                color: var(--text-normal);
+                font-size: var(--font-ui-medium);
+                font-weight: 500;
+            }
 
-			.spinner-warning {
-				color: var(--text-muted);
-				font-size: var(--font-ui-small);
-				text-align: center;
-				margin-top: var(--size-2-2);
-			}
-		}
+            .spinner-warning {
+                color: var(--text-muted);
+                font-size: var(--font-ui-small);
+                text-align: center;
+                margin-top: var(--size-2-2);
+            }
+        }
 
-		@keyframes spin {
-			from {
-				transform: rotate(0deg);
-			}
+        @keyframes spin {
+            from {
+                transform: rotate(0deg);
+            }
 
-			to {
-				transform: rotate(360deg);
-			}
-		}
+            to {
+                transform: rotate(360deg);
+            }
+        }
 
-		&.applying-changes {
-			.setting-item-control {
-				pointer-events: none;
-				opacity: 0.5;
-			}
+        &.applying-changes {
+            .setting-item-control {
+                pointer-events: none;
+                opacity: 0.5;
+            }
 
-			button:not(.applying-changes-overlay button) {
-				pointer-events: none;
-				opacity: 0.5;
-			}
+            button:not(.applying-changes-overlay button) {
+                pointer-events: none;
+                opacity: 0.5;
+            }
 
-			input,
-			textarea,
-			select {
-				pointer-events: none;
-				opacity: 0.5;
-			}
-		}
-	}
-}
\ No newline at end of file
+            input,
+            textarea,
+            select {
+                pointer-events: none;
+                opacity: 0.5;
+            }
+        }
+    }
+}
diff --git a/frontend/obsidian-plugin/src/views/settings/settings-tab.ts b/frontend/obsidian-plugin/src/views/settings/settings-tab.ts
index 1ff78a4b..afd2b0b0 100644
--- a/frontend/obsidian-plugin/src/views/settings/settings-tab.ts
+++ b/frontend/obsidian-plugin/src/views/settings/settings-tab.ts
@@ -9,559 +9,559 @@ import { LogsView } from "../logs/logs-view";
 import type { StatusDescription } from "../status-description/status-description";
 
 export class SyncSettingsTab extends PluginSettingTab {
-	private editedServerUri: string;
-	private editedToken: string;
-	private editedVaultName: string;
+    private editedServerUri: string;
+    private editedToken: string;
+    private editedVaultName: string;
 
-	private _isApplyingChanges = false;
-	private syncEnabledOverride: boolean | undefined = undefined;
+    private _isApplyingChanges = false;
+    private syncEnabledOverride: boolean | undefined = undefined;
 
-	private readonly plugin: VaultLinkPlugin;
-	private readonly syncClient: SyncClient;
-	private readonly statusDescription: StatusDescription;
-	private statusDescriptionSubscription: (() => unknown) | undefined;
+    private readonly plugin: VaultLinkPlugin;
+    private readonly syncClient: SyncClient;
+    private readonly statusDescription: StatusDescription;
+    private statusDescriptionSubscription: (() => unknown) | undefined;
 
-	public constructor({
-		app,
-		plugin,
-		syncClient,
-		statusDescription
-	}: {
-		app: App;
-		plugin: VaultLinkPlugin;
-		syncClient: SyncClient;
-		statusDescription: StatusDescription;
-	}) {
-		super(app, plugin);
-		this.plugin = plugin;
-		this.syncClient = syncClient;
-		this.statusDescription = statusDescription;
+    public constructor({
+        app,
+        plugin,
+        syncClient,
+        statusDescription
+    }: {
+        app: App;
+        plugin: VaultLinkPlugin;
+        syncClient: SyncClient;
+        statusDescription: StatusDescription;
+    }) {
+        super(app, plugin);
+        this.plugin = plugin;
+        this.syncClient = syncClient;
+        this.statusDescription = statusDescription;
 
-		this.editedServerUri = this.syncClient.getSettings().remoteUri;
-		this.editedToken = this.syncClient.getSettings().token;
-		this.editedVaultName = this.syncClient.getSettings().vaultName;
+        this.editedServerUri = this.syncClient.getSettings().remoteUri;
+        this.editedToken = this.syncClient.getSettings().token;
+        this.editedVaultName = this.syncClient.getSettings().vaultName;
 
-		this.syncClient.addOnSettingsChangeListener(
-			(newSettings, oldSettings) => {
-				let hasChanged = false;
+        this.syncClient.addOnSettingsChangeListener(
+            (newSettings, oldSettings) => {
+                let hasChanged = false;
 
-				if (newSettings.remoteUri !== oldSettings.remoteUri) {
-					this.editedServerUri = newSettings.remoteUri;
-					hasChanged = true;
-				}
+                if (newSettings.remoteUri !== oldSettings.remoteUri) {
+                    this.editedServerUri = newSettings.remoteUri;
+                    hasChanged = true;
+                }
 
-				if (newSettings.token !== oldSettings.token) {
-					this.editedToken = newSettings.token;
-					hasChanged = true;
-				}
+                if (newSettings.token !== oldSettings.token) {
+                    this.editedToken = newSettings.token;
+                    hasChanged = true;
+                }
 
-				if (newSettings.vaultName !== oldSettings.vaultName) {
-					this.editedVaultName = newSettings.vaultName;
-					hasChanged = true;
-				}
+                if (newSettings.vaultName !== oldSettings.vaultName) {
+                    this.editedVaultName = newSettings.vaultName;
+                    hasChanged = true;
+                }
 
-				if (hasChanged) {
-					this.display();
-				}
-			}
-		);
-	}
+                if (hasChanged) {
+                    this.display();
+                }
+            }
+        );
+    }
 
-	private get isApplyingChanges(): boolean {
-		return this._isApplyingChanges;
-	}
+    private get isApplyingChanges(): boolean {
+        return this._isApplyingChanges;
+    }
 
-	private set isApplyingChanges(value: boolean) {
-		this._isApplyingChanges = value;
-		this.display();
-	}
+    private set isApplyingChanges(value: boolean) {
+        this._isApplyingChanges = value;
+        this.display();
+    }
 
-	public display(): void {
-		const { containerEl } = this;
-		containerEl.empty();
-		containerEl.addClass("vault-link-settings");
-		containerEl.parentElement?.addClass("vault-link-settings-container");
+    public display(): void {
+        const { containerEl } = this;
+        containerEl.empty();
+        containerEl.addClass("vault-link-settings");
+        containerEl.parentElement?.addClass("vault-link-settings-container");
 
-		if (this.isApplyingChanges) {
-			containerEl.addClass("applying-changes");
-		} else {
-			containerEl.removeClass("applying-changes");
-		}
+        if (this.isApplyingChanges) {
+            containerEl.addClass("applying-changes");
+        } else {
+            containerEl.removeClass("applying-changes");
+        }
 
-		this.renderApplyingChanges(containerEl);
-		this.renderSettingsHeader(containerEl);
-		this.renderConnectionSettings(containerEl);
-		this.renderSyncSettings(containerEl);
-		this.renderMiscSettings(containerEl);
-	}
+        this.renderApplyingChanges(containerEl);
+        this.renderSettingsHeader(containerEl);
+        this.renderConnectionSettings(containerEl);
+        this.renderSyncSettings(containerEl);
+        this.renderMiscSettings(containerEl);
+    }
 
-	public hide(): void {
-		super.hide();
-		this.setStatusDescriptionSubscription();
-	}
+    public hide(): void {
+        super.hide();
+        this.setStatusDescriptionSubscription();
+    }
 
-	private renderApplyingChanges(containerEl: HTMLElement): void {
-		if (this.isApplyingChanges) {
-			const overlay = containerEl.createDiv({
-				cls: "applying-changes-overlay"
-			});
+    private renderApplyingChanges(containerEl: HTMLElement): void {
+        if (this.isApplyingChanges) {
+            const overlay = containerEl.createDiv({
+                cls: "applying-changes-overlay"
+            });
 
-			const spinnerContainer = overlay.createDiv({
-				cls: "spinner-container"
-			});
+            const spinnerContainer = overlay.createDiv({
+                cls: "spinner-container"
+            });
 
-			spinnerContainer.createDiv({
-				cls: "spinner"
-			});
+            spinnerContainer.createDiv({
+                cls: "spinner"
+            });
 
-			spinnerContainer.createDiv({
-				text: "Applying changes...",
-				cls: "spinner-text"
-			});
+            spinnerContainer.createDiv({
+                text: "Applying changes...",
+                cls: "spinner-text"
+            });
 
-			spinnerContainer.createDiv({
-				text: "You can exit, but changes won't be saved",
-				cls: "spinner-warning"
-			});
-		}
-	}
+            spinnerContainer.createDiv({
+                text: "You can exit, but changes won't be saved",
+                cls: "spinner-warning"
+            });
+        }
+    }
 
-	private renderSettingsHeader(containerEl: HTMLElement): void {
-		containerEl.createEl("h2", { text: "VaultLink" }).createSpan({
-			text: this.plugin.manifest.version,
-			cls: "version"
-		});
+    private renderSettingsHeader(containerEl: HTMLElement): void {
+        containerEl.createEl("h2", { text: "VaultLink" }).createSpan({
+            text: this.plugin.manifest.version,
+            cls: "version"
+        });
 
-		containerEl.createDiv(
-			{
-				cls: "description"
-			},
-			(descriptionContainer) => {
-				this.setStatusDescriptionSubscription(
-					this.statusDescription.renderStatusDescription.bind(
-						this.statusDescription,
-						descriptionContainer
-					)
-				);
-			}
-		);
+        containerEl.createDiv(
+            {
+                cls: "description"
+            },
+            (descriptionContainer) => {
+                this.setStatusDescriptionSubscription(
+                    this.statusDescription.renderStatusDescription.bind(
+                        this.statusDescription,
+                        descriptionContainer
+                    )
+                );
+            }
+        );
 
-		containerEl.createDiv(
-			{
-				cls: "button-container"
-			},
-			(buttonContainer) => {
-				buttonContainer.createEl(
-					"button",
-					{
-						text: "Show history"
-					},
-					(button) =>
-						(button.onclick = async (): Promise<void> => {
-							this.plugin.closeSettings();
-							await this.plugin.activateView(HistoryView.TYPE);
-						})
-				);
+        containerEl.createDiv(
+            {
+                cls: "button-container"
+            },
+            (buttonContainer) => {
+                buttonContainer.createEl(
+                    "button",
+                    {
+                        text: "Show history"
+                    },
+                    (button) =>
+                        (button.onclick = async (): Promise<void> => {
+                            this.plugin.closeSettings();
+                            await this.plugin.activateView(HistoryView.TYPE);
+                        })
+                );
 
-				buttonContainer.createEl(
-					"button",
-					{
-						text: "Show logs"
-					},
-					(button) =>
-						(button.onclick = async (): Promise<void> => {
-							this.plugin.closeSettings();
-							await this.plugin.activateView(LogsView.TYPE);
-						})
-				);
-			}
-		);
-	}
+                buttonContainer.createEl(
+                    "button",
+                    {
+                        text: "Show logs"
+                    },
+                    (button) =>
+                        (button.onclick = async (): Promise<void> => {
+                            this.plugin.closeSettings();
+                            await this.plugin.activateView(LogsView.TYPE);
+                        })
+                );
+            }
+        );
+    }
 
-	private renderConnectionSettings(containerEl: HTMLElement): void {
-		containerEl.createEl("h3", { text: "Connection" });
+    private renderConnectionSettings(containerEl: HTMLElement): void {
+        containerEl.createEl("h3", { text: "Connection" });
 
-		const [title, updateTitle] = this.unsavedAwareSettingName(
-			"Server address",
-			"remoteUri"
-		);
-		new Setting(containerEl)
-			.setName(title)
-			.setDesc(
-				"Your VaultLink server's URL including the protocol and full path."
-			)
-			.setTooltip("This is the URL of the server you want to sync with.")
-			.addText((text) =>
-				text
-					.setPlaceholder("https://example.com:3000")
-					.setValue(this.editedServerUri.toLowerCase().trim())
-					.onChange((value) => {
-						this.editedServerUri = value.toLowerCase().trim();
-						updateTitle(value.toLowerCase().trim());
-					})
-			);
+        const [title, updateTitle] = this.unsavedAwareSettingName(
+            "Server address",
+            "remoteUri"
+        );
+        new Setting(containerEl)
+            .setName(title)
+            .setDesc(
+                "Your VaultLink server's URL including the protocol and full path."
+            )
+            .setTooltip("This is the URL of the server you want to sync with.")
+            .addText((text) =>
+                text
+                    .setPlaceholder("https://example.com:3000")
+                    .setValue(this.editedServerUri.toLowerCase().trim())
+                    .onChange((value) => {
+                        this.editedServerUri = value.toLowerCase().trim();
+                        updateTitle(value.toLowerCase().trim());
+                    })
+            );
 
-		const [tokenTitle, updateTokenTitle] = this.unsavedAwareSettingName(
-			"Access token",
-			"token"
-		);
-		new Setting(containerEl)
-			.setName(tokenTitle)
-			.setClass("sync-settings-access-token")
-			.setDesc(
-				"Set the access token for the server that you can get from the server"
-			)
-			.setTooltip("todo, links to dcocs")
-			.addTextArea((text) =>
-				text
-					.setPlaceholder("ey...")
-					.setValue(this.editedToken.trim())
-					.onChange((value) => {
-						this.editedToken = value.trim();
-						updateTokenTitle(value.trim());
-					})
-			);
+        const [tokenTitle, updateTokenTitle] = this.unsavedAwareSettingName(
+            "Access token",
+            "token"
+        );
+        new Setting(containerEl)
+            .setName(tokenTitle)
+            .setClass("sync-settings-access-token")
+            .setDesc(
+                "Set the access token for the server that you can get from the server"
+            )
+            .setTooltip("todo, links to dcocs")
+            .addTextArea((text) =>
+                text
+                    .setPlaceholder("ey...")
+                    .setValue(this.editedToken.trim())
+                    .onChange((value) => {
+                        this.editedToken = value.trim();
+                        updateTokenTitle(value.trim());
+                    })
+            );
 
-		const [vaultNameTitle, updateVaultNameTitle] =
-			this.unsavedAwareSettingName("Vault name", "vaultName");
-		new Setting(containerEl)
-			.setName(vaultNameTitle)
-			.setDesc(
-				"Set the name of the remote vault that you want to sync with"
-			)
-			.setTooltip("todo, links to dcocs")
-			.addText((text) =>
-				text
-					.setPlaceholder("My Obsidian Vault")
-					.setValue(this.editedVaultName.toLowerCase().trim())
-					.onChange((value) => {
-						this.editedVaultName = value.toLowerCase().trim();
-						updateVaultNameTitle(value.toLowerCase().trim());
-					})
-			);
+        const [vaultNameTitle, updateVaultNameTitle] =
+            this.unsavedAwareSettingName("Vault name", "vaultName");
+        new Setting(containerEl)
+            .setName(vaultNameTitle)
+            .setDesc(
+                "Set the name of the remote vault that you want to sync with"
+            )
+            .setTooltip("todo, links to dcocs")
+            .addText((text) =>
+                text
+                    .setPlaceholder("My Obsidian Vault")
+                    .setValue(this.editedVaultName.toLowerCase().trim())
+                    .onChange((value) => {
+                        this.editedVaultName = value.toLowerCase().trim();
+                        updateVaultNameTitle(value.toLowerCase().trim());
+                    })
+            );
 
-		new Setting(containerEl).addButton((button) =>
-			button
-				.setButtonText("Apply & test connection")
-				.setDisabled(this.isApplyingChanges)
-				.setTooltip(
-					this.isApplyingChanges
-						? "Waiting for applying changes to finish..."
-						: "Apply the changes made to the connection settings and test the connection to the server."
-				)
-				.onClick(() => {
-					// don't show loader within the button
-					void (async (): Promise<void> => {
-						if (this.areThereUnsavedChanges()) {
-							new Notice("Applying changes to the server...");
+        new Setting(containerEl).addButton((button) =>
+            button
+                .setButtonText("Apply & test connection")
+                .setDisabled(this.isApplyingChanges)
+                .setTooltip(
+                    this.isApplyingChanges
+                        ? "Waiting for applying changes to finish..."
+                        : "Apply the changes made to the connection settings and test the connection to the server."
+                )
+                .onClick(() => {
+                    // don't show loader within the button
+                    void (async (): Promise<void> => {
+                        if (this.areThereUnsavedChanges()) {
+                            new Notice("Applying changes to the server...");
 
-							this.isApplyingChanges = true;
-							try {
-								await this.syncClient.setSettings({
-									vaultName: this.editedVaultName,
-									remoteUri: this.editedServerUri,
-									token: this.editedToken
-								});
-							} finally {
-								this.isApplyingChanges = false;
-							}
+                            this.isApplyingChanges = true;
+                            try {
+                                await this.syncClient.setSettings({
+                                    vaultName: this.editedVaultName,
+                                    remoteUri: this.editedServerUri,
+                                    token: this.editedToken
+                                });
+                            } finally {
+                                this.isApplyingChanges = false;
+                            }
 
-							new Notice("Checking connection to the server...");
-							new Notice(
-								(
-									await this.syncClient.checkConnection()
-								).serverMessage
-							);
-							await this.statusDescription.updateConnectionState();
-						} else {
-							new Notice("No changes to apply");
-						}
-					})();
-				})
-		);
-	}
+                            new Notice("Checking connection to the server...");
+                            new Notice(
+                                (
+                                    await this.syncClient.checkConnection()
+                                ).serverMessage
+                            );
+                            await this.statusDescription.updateConnectionState();
+                        } else {
+                            new Notice("No changes to apply");
+                        }
+                    })();
+                })
+        );
+    }
 
-	private areThereUnsavedChanges(): boolean {
-		return (
-			this.editedServerUri !== this.syncClient.getSettings().remoteUri ||
-			this.editedToken !== this.syncClient.getSettings().token ||
-			this.editedVaultName !== this.syncClient.getSettings().vaultName
-		);
-	}
+    private areThereUnsavedChanges(): boolean {
+        return (
+            this.editedServerUri !== this.syncClient.getSettings().remoteUri ||
+            this.editedToken !== this.syncClient.getSettings().token ||
+            this.editedVaultName !== this.syncClient.getSettings().vaultName
+        );
+    }
 
-	private renderSyncSettings(containerEl: HTMLElement): void {
-		containerEl.createEl("h3", { text: "Sync" });
+    private renderSyncSettings(containerEl: HTMLElement): void {
+        containerEl.createEl("h3", { text: "Sync" });
 
-		new Setting(containerEl)
-			.setName("Enable sync")
-			.setDesc(
-				"Enable pulling and pushing changes to the remote server. The first time it's enabled, or after the sync state has been reset, all local files will be pushed to the server."
-			)
-			.setTooltip(
-				"Enable pulling and pushing changes to the remote server."
-			)
-			.addToggle((toggle) =>
-				toggle
-					.setValue(
-						this.syncEnabledOverride ??
-							this.syncClient.getSettings().isSyncEnabled
-					)
-					.setDisabled(this.isApplyingChanges)
-					.setTooltip(
-						this.isApplyingChanges
-							? "Waiting for applying changes to finish..."
-							: "Enable or disable syncing."
-					)
-					.onChange(
-						(value) =>
-							void (async (): Promise<void> => {
-								this.syncEnabledOverride = value;
-								this.isApplyingChanges = true;
-								try {
-									await this.syncClient.setSetting(
-										"isSyncEnabled",
-										value
-									);
-								} finally {
-									this.syncEnabledOverride = undefined;
-									this.isApplyingChanges = false;
-								}
-							})()
-					)
-			);
+        new Setting(containerEl)
+            .setName("Enable sync")
+            .setDesc(
+                "Enable pulling and pushing changes to the remote server. The first time it's enabled, or after the sync state has been reset, all local files will be pushed to the server."
+            )
+            .setTooltip(
+                "Enable pulling and pushing changes to the remote server."
+            )
+            .addToggle((toggle) =>
+                toggle
+                    .setValue(
+                        this.syncEnabledOverride ??
+                            this.syncClient.getSettings().isSyncEnabled
+                    )
+                    .setDisabled(this.isApplyingChanges)
+                    .setTooltip(
+                        this.isApplyingChanges
+                            ? "Waiting for applying changes to finish..."
+                            : "Enable or disable syncing."
+                    )
+                    .onChange(
+                        (value) =>
+                            void (async (): Promise<void> => {
+                                this.syncEnabledOverride = value;
+                                this.isApplyingChanges = true;
+                                try {
+                                    await this.syncClient.setSetting(
+                                        "isSyncEnabled",
+                                        value
+                                    );
+                                } finally {
+                                    this.syncEnabledOverride = undefined;
+                                    this.isApplyingChanges = false;
+                                }
+                            })()
+                    )
+            );
 
-		new Setting(containerEl)
-			.setName("Ignore patterns")
-			.setDesc(
-				"Patterns to ignore when syncing. Each line is a separate glob pattern. Patterns are matched against the relative path of the file. For example, to ignore all files in a folder named 'ignore', enter 'ignore/*'. To ignore all files with the extension '.log', enter '*.log'."
-			)
-			.addTextArea((text) =>
-				text
-					.setValue(
-						this.syncClient.getSettings().ignorePatterns.join("\n")
-					)
-					.setPlaceholder("Enter patterns to ignore, one per line")
-					.onChange(async (value) => {
-						const patterns = value
-							.split("\n")
-							.map((pattern) => pattern.trim())
-							.filter((pattern) => pattern.length > 0);
-						return this.syncClient.setSetting(
-							"ignorePatterns",
-							patterns
-						);
-					})
-			);
+        new Setting(containerEl)
+            .setName("Ignore patterns")
+            .setDesc(
+                "Patterns to ignore when syncing. Each line is a separate glob pattern. Patterns are matched against the relative path of the file. For example, to ignore all files in a folder named 'ignore', enter 'ignore/*'. To ignore all files with the extension '.log', enter '*.log'."
+            )
+            .addTextArea((text) =>
+                text
+                    .setValue(
+                        this.syncClient.getSettings().ignorePatterns.join("\n")
+                    )
+                    .setPlaceholder("Enter patterns to ignore, one per line")
+                    .onChange(async (value) => {
+                        const patterns = value
+                            .split("\n")
+                            .map((pattern) => pattern.trim())
+                            .filter((pattern) => pattern.length > 0);
+                        return this.syncClient.setSetting(
+                            "ignorePatterns",
+                            patterns
+                        );
+                    })
+            );
 
-		new Setting(containerEl)
-			.setName("Sync concurrency")
-			.setDesc(
-				"How many concurrent sync operations to run. Setting this value higher may increase the overall performance, however, it will require more memory as well. If you notice frequent crashes, especially on mobile, set this to 1."
-			)
-			.addSlider((text) =>
-				text
-					.setLimits(1, 16, 1)
-					.setDynamicTooltip()
-					.setInstant(false)
-					.setValue(this.syncClient.getSettings().syncConcurrency)
-					.onChange(async (value) =>
-						this.syncClient.setSetting("syncConcurrency", value)
-					)
-			);
+        new Setting(containerEl)
+            .setName("Sync concurrency")
+            .setDesc(
+                "How many concurrent sync operations to run. Setting this value higher may increase the overall performance, however, it will require more memory as well. If you notice frequent crashes, especially on mobile, set this to 1."
+            )
+            .addSlider((text) =>
+                text
+                    .setLimits(1, 16, 1)
+                    .setDynamicTooltip()
+                    .setInstant(false)
+                    .setValue(this.syncClient.getSettings().syncConcurrency)
+                    .onChange(async (value) =>
+                        this.syncClient.setSetting("syncConcurrency", value)
+                    )
+            );
 
-		new Setting(containerEl)
-			.setName("Maximum file size to be uploaded (MB)")
-			.setDesc(
-				"Set the maximum file size that can be uploaded to the server. Files larger than this size will be ignored."
-			)
-			.addText((input) =>
-				input
-					.setValue(
-						this.syncClient.getSettings().maxFileSizeMB.toString()
-					)
-					.onChange(async (value) => {
-						if (value === "") {
-							return;
-						}
-						let parsedValue = Number.parseFloat(value);
-						if (Number.isNaN(parsedValue) || parsedValue < 0) {
-							parsedValue =
-								this.syncClient.getSettings().maxFileSizeMB;
-						}
+        new Setting(containerEl)
+            .setName("Maximum file size to be uploaded (MB)")
+            .setDesc(
+                "Set the maximum file size that can be uploaded to the server. Files larger than this size will be ignored."
+            )
+            .addText((input) =>
+                input
+                    .setValue(
+                        this.syncClient.getSettings().maxFileSizeMB.toString()
+                    )
+                    .onChange(async (value) => {
+                        if (value === "") {
+                            return;
+                        }
+                        let parsedValue = Number.parseFloat(value);
+                        if (Number.isNaN(parsedValue) || parsedValue < 0) {
+                            parsedValue =
+                                this.syncClient.getSettings().maxFileSizeMB;
+                        }
 
-						if (value !== parsedValue.toString()) {
-							input.setValue(parsedValue.toString());
-						}
+                        if (value !== parsedValue.toString()) {
+                            input.setValue(parsedValue.toString());
+                        }
 
-						return this.syncClient.setSetting(
-							"maxFileSizeMB",
-							parsedValue
-						);
-					})
-			);
+                        return this.syncClient.setSetting(
+                            "maxFileSizeMB",
+                            parsedValue
+                        );
+                    })
+            );
 
-		new Setting(containerEl)
-			.setName("Danger zone")
-			.setDesc(
-				"Delete the local metadata database while leaving the local and remote files intact."
-			)
-			.addButton((button) =>
-				button
-					.setDisabled(this.isApplyingChanges)
-					.setTooltip(
-						this.isApplyingChanges
-							? "Waiting for applying changes to finish..."
-							: "Reset sync state"
-					)
-					.setButtonText("Reset sync state")
-					.onClick(
-						() =>
-							void (async (): Promise<void> => {
-								this.isApplyingChanges = true;
-								try {
-									await this.syncClient.reset();
-								} finally {
-									this.isApplyingChanges = false;
-								}
+        new Setting(containerEl)
+            .setName("Danger zone")
+            .setDesc(
+                "Delete the local metadata database while leaving the local and remote files intact."
+            )
+            .addButton((button) =>
+                button
+                    .setDisabled(this.isApplyingChanges)
+                    .setTooltip(
+                        this.isApplyingChanges
+                            ? "Waiting for applying changes to finish..."
+                            : "Reset sync state"
+                    )
+                    .setButtonText("Reset sync state")
+                    .onClick(
+                        () =>
+                            void (async (): Promise<void> => {
+                                this.isApplyingChanges = true;
+                                try {
+                                    await this.syncClient.reset();
+                                } finally {
+                                    this.isApplyingChanges = false;
+                                }
 
-								new Notice(
-									"Sync state has been reset, you will need to resync"
-								);
-							})()
-					)
-			);
-	}
+                                new Notice(
+                                    "Sync state has been reset, you will need to resync"
+                                );
+                            })()
+                    )
+            );
+    }
 
-	private renderMiscSettings(containerEl: HTMLElement): void {
-		containerEl.createEl("h3", { text: "Other" });
+    private renderMiscSettings(containerEl: HTMLElement): void {
+        containerEl.createEl("h3", { text: "Other" });
 
-		new Setting(containerEl)
-			.setName("Enable telemetry")
-			.setDesc(
-				"Allow sending anonymous usage data & error reports to help improve the plugin. The data collected is never shared with third parties."
-			)
-			.setTooltip(
-				"Allow sending anonymous usage data & error reports to help improve the plugin. The data collected is never shared with third parties."
-			)
-			.addToggle((toggle) =>
-				toggle
-					.setValue(this.syncClient.getSettings().enableTelemetry)
-					.onChange(async (value) =>
-						this.syncClient.setSetting("enableTelemetry", value)
-					)
-			);
+        new Setting(containerEl)
+            .setName("Enable telemetry")
+            .setDesc(
+                "Allow sending anonymous usage data & error reports to help improve the plugin. The data collected is never shared with third parties."
+            )
+            .setTooltip(
+                "Allow sending anonymous usage data & error reports to help improve the plugin. The data collected is never shared with third parties."
+            )
+            .addToggle((toggle) =>
+                toggle
+                    .setValue(this.syncClient.getSettings().enableTelemetry)
+                    .onChange(async (value) =>
+                        this.syncClient.setSetting("enableTelemetry", value)
+                    )
+            );
 
-		containerEl.createEl("h3", { text: "Advanced" });
+        containerEl.createEl("h3", { text: "Advanced" });
 
-		new Setting(containerEl)
-			.setName("Network retry interval (ms)")
-			.setDesc(
-				"The time to wait between retrying failed network requests, in milliseconds."
-			)
-			.addText((input) =>
-				input
-					.setValue(
-						this.syncClient
-							.getSettings()
-							.networkRetryIntervalMs.toString()
-					)
-					.onChange(async (value) => {
-						if (value === "") {
-							return;
-						}
-						let parsedValue = Number.parseInt(value, 10);
-						if (Number.isNaN(parsedValue) || parsedValue < 0) {
-							parsedValue =
-								this.syncClient.getSettings()
-									.networkRetryIntervalMs;
-						}
+        new Setting(containerEl)
+            .setName("Network retry interval (ms)")
+            .setDesc(
+                "The time to wait between retrying failed network requests, in milliseconds."
+            )
+            .addText((input) =>
+                input
+                    .setValue(
+                        this.syncClient
+                            .getSettings()
+                            .networkRetryIntervalMs.toString()
+                    )
+                    .onChange(async (value) => {
+                        if (value === "") {
+                            return;
+                        }
+                        let parsedValue = Number.parseInt(value, 10);
+                        if (Number.isNaN(parsedValue) || parsedValue < 0) {
+                            parsedValue =
+                                this.syncClient.getSettings()
+                                    .networkRetryIntervalMs;
+                        }
 
-						if (value !== parsedValue.toString()) {
-							input.setValue(parsedValue.toString());
-						}
+                        if (value !== parsedValue.toString()) {
+                            input.setValue(parsedValue.toString());
+                        }
 
-						return this.syncClient.setSetting(
-							"networkRetryIntervalMs",
-							parsedValue
-						);
-					})
-			);
+                        return this.syncClient.setSetting(
+                            "networkRetryIntervalMs",
+                            parsedValue
+                        );
+                    })
+            );
 
-		new Setting(containerEl)
-			.setName("Minimum save interval (ms)")
-			.setDesc(
-				"The minimum time between saving settings and database to disk, in milliseconds. Lower values save more frequently but may impact performance."
-			)
-			.addText((input) =>
-				input
-					.setValue(
-						this.syncClient
-							.getSettings()
-							.minimumSaveIntervalMs.toString()
-					)
-					.onChange(async (value) => {
-						if (value === "") {
-							return;
-						}
-						let parsedValue = Number.parseInt(value, 10);
-						if (Number.isNaN(parsedValue) || parsedValue < 0) {
-							parsedValue =
-								this.syncClient.getSettings()
-									.minimumSaveIntervalMs;
-						}
+        new Setting(containerEl)
+            .setName("Minimum save interval (ms)")
+            .setDesc(
+                "The minimum time between saving settings and database to disk, in milliseconds. Lower values save more frequently but may impact performance."
+            )
+            .addText((input) =>
+                input
+                    .setValue(
+                        this.syncClient
+                            .getSettings()
+                            .minimumSaveIntervalMs.toString()
+                    )
+                    .onChange(async (value) => {
+                        if (value === "") {
+                            return;
+                        }
+                        let parsedValue = Number.parseInt(value, 10);
+                        if (Number.isNaN(parsedValue) || parsedValue < 0) {
+                            parsedValue =
+                                this.syncClient.getSettings()
+                                    .minimumSaveIntervalMs;
+                        }
 
-						if (value !== parsedValue.toString()) {
-							input.setValue(parsedValue.toString());
-						}
+                        if (value !== parsedValue.toString()) {
+                            input.setValue(parsedValue.toString());
+                        }
 
-						return this.syncClient.setSetting(
-							"minimumSaveIntervalMs",
-							parsedValue
-						);
-					})
-			);
-	}
+                        return this.syncClient.setSetting(
+                            "minimumSaveIntervalMs",
+                            parsedValue
+                        );
+                    })
+            );
+    }
 
-	private setStatusDescriptionSubscription(
-		newSubscription?: () => unknown
-	): void {
-		if (this.statusDescriptionSubscription) {
-			this.statusDescription.removeStatusChangeListener(
-				this.statusDescriptionSubscription
-			);
-		}
-		this.statusDescriptionSubscription = newSubscription;
-		if (this.statusDescriptionSubscription) {
-			this.statusDescriptionSubscription();
-			this.statusDescription.addStatusChangeListener(
-				this.statusDescriptionSubscription
-			);
-		}
-	}
+    private setStatusDescriptionSubscription(
+        newSubscription?: () => unknown
+    ): void {
+        if (this.statusDescriptionSubscription) {
+            this.statusDescription.removeStatusChangeListener(
+                this.statusDescriptionSubscription
+            );
+        }
+        this.statusDescriptionSubscription = newSubscription;
+        if (this.statusDescriptionSubscription) {
+            this.statusDescriptionSubscription();
+            this.statusDescription.addStatusChangeListener(
+                this.statusDescriptionSubscription
+            );
+        }
+    }
 
-	private unsavedAwareSettingName(
-		name: string,
-		settingName: keyof SyncSettings
-	): [
-		DocumentFragment,
-		(newValue: SyncSettings[keyof SyncSettings]) => unknown
-	] {
-		const titleContainer = document.createDocumentFragment();
-		const title = titleContainer.createEl("div", {
-			text: name,
-			cls: "setting-item-name"
-		});
+    private unsavedAwareSettingName(
+        name: string,
+        settingName: keyof SyncSettings
+    ): [
+        DocumentFragment,
+        (newValue: SyncSettings[keyof SyncSettings]) => unknown
+    ] {
+        const titleContainer = document.createDocumentFragment();
+        const title = titleContainer.createEl("div", {
+            text: name,
+            cls: "setting-item-name"
+        });
 
-		const updateTitle = (
-			currentValue: SyncSettings[keyof SyncSettings]
-		): void => {
-			title.innerText = `${name}${
-				currentValue !== this.syncClient.getSettings()[settingName]
-					? " (unsaved)"
-					: ""
-			}`;
-		};
+        const updateTitle = (
+            currentValue: SyncSettings[keyof SyncSettings]
+        ): void => {
+            title.innerText = `${name}${
+                currentValue !== this.syncClient.getSettings()[settingName]
+                    ? " (unsaved)"
+                    : ""
+            }`;
+        };
 
-		return [titleContainer, updateTitle];
-	}
+        return [titleContainer, updateTitle];
+    }
 }
diff --git a/frontend/obsidian-plugin/src/views/status-bar/status-bar.scss b/frontend/obsidian-plugin/src/views/status-bar/status-bar.scss
index 3762c2d9..06dfef8f 100644
--- a/frontend/obsidian-plugin/src/views/status-bar/status-bar.scss
+++ b/frontend/obsidian-plugin/src/views/status-bar/status-bar.scss
@@ -1,14 +1,14 @@
 .sync-status {
-	display: flex;
-	gap: var(--size-4-2);
+    display: flex;
+    gap: var(--size-4-2);
 
-	* {
-		display: block;
-	}
+    * {
+        display: block;
+    }
 
-	.initialize-button {
-		padding: 0 var(--size-4-2);
-		background: rgba(var(--color-red-rgb), 0.4);
-		cursor: pointer;
-	}
+    .initialize-button {
+        padding: 0 var(--size-4-2);
+        background: rgba(var(--color-red-rgb), 0.4);
+        cursor: pointer;
+    }
 }
diff --git a/frontend/obsidian-plugin/src/views/status-bar/status-bar.ts b/frontend/obsidian-plugin/src/views/status-bar/status-bar.ts
index 6466601c..7a128ae9 100644
--- a/frontend/obsidian-plugin/src/views/status-bar/status-bar.ts
+++ b/frontend/obsidian-plugin/src/views/status-bar/status-bar.ts
@@ -4,72 +4,72 @@ import type { HistoryStats, SyncClient } from "sync-client";
 import type VaultLinkPlugin from "../../vault-link-plugin";
 
 export class StatusBar {
-	private readonly statusBarItem: HTMLElement;
+    private readonly statusBarItem: HTMLElement;
 
-	private lastHistoryStats: HistoryStats | undefined;
-	private lastRemaining: number | undefined;
+    private lastHistoryStats: HistoryStats | undefined;
+    private lastRemaining: number | undefined;
 
-	public constructor(
-		private readonly plugin: VaultLinkPlugin,
-		private readonly syncClient: SyncClient
-	) {
-		this.statusBarItem = plugin.addStatusBarItem();
-		this.syncClient.addSyncHistoryUpdateListener((status) => {
-			this.lastHistoryStats = status;
-			this.updateStatus();
-		});
+    public constructor(
+        private readonly plugin: VaultLinkPlugin,
+        private readonly syncClient: SyncClient
+    ) {
+        this.statusBarItem = plugin.addStatusBarItem();
+        this.syncClient.addSyncHistoryUpdateListener((status) => {
+            this.lastHistoryStats = status;
+            this.updateStatus();
+        });
 
-		this.syncClient.addRemainingSyncOperationsListener(
-			(remainingOperations) => {
-				this.lastRemaining = remainingOperations;
-				this.updateStatus();
-			}
-		);
+        this.syncClient.addRemainingSyncOperationsListener(
+            (remainingOperations) => {
+                this.lastRemaining = remainingOperations;
+                this.updateStatus();
+            }
+        );
 
-		this.syncClient.addOnSettingsChangeListener(() => {
-			this.updateStatus();
-		});
-	}
+        this.syncClient.addOnSettingsChangeListener(() => {
+            this.updateStatus();
+        });
+    }
 
-	private updateStatus(): void {
-		this.statusBarItem.empty();
-		const container = this.statusBarItem.createDiv({
-			cls: ["sync-status"]
-		});
+    private updateStatus(): void {
+        this.statusBarItem.empty();
+        const container = this.statusBarItem.createDiv({
+            cls: ["sync-status"]
+        });
 
-		if (!this.syncClient.getSettings().isSyncEnabled) {
-			const button = container.createEl("button", {
-				text: "VaultLink is disabled, click to configure",
-				cls: "initialize-button"
-			});
-			button.onclick = this.plugin.openSettings.bind(this.plugin);
+        if (!this.syncClient.getSettings().isSyncEnabled) {
+            const button = container.createEl("button", {
+                text: "VaultLink is disabled, click to configure",
+                cls: "initialize-button"
+            });
+            button.onclick = this.plugin.openSettings.bind(this.plugin);
 
-			return;
-		}
+            return;
+        }
 
-		let hasShownMessage = false;
+        let hasShownMessage = false;
 
-		if ((this.lastRemaining ?? 0) > 0) {
-			hasShownMessage = true;
-			container.createSpan({ text: `${this.lastRemaining} ⏳` });
-		}
+        if ((this.lastRemaining ?? 0) > 0) {
+            hasShownMessage = true;
+            container.createSpan({ text: `${this.lastRemaining} ⏳` });
+        }
 
-		if ((this.lastHistoryStats?.success ?? 0) > 0) {
-			hasShownMessage = true;
-			container.createSpan({
-				text: `${this.lastHistoryStats?.success ?? 0} ✅`
-			});
-		}
+        if ((this.lastHistoryStats?.success ?? 0) > 0) {
+            hasShownMessage = true;
+            container.createSpan({
+                text: `${this.lastHistoryStats?.success ?? 0} ✅`
+            });
+        }
 
-		if ((this.lastHistoryStats?.error ?? 0) > 0) {
-			hasShownMessage = true;
-			container.createSpan({
-				text: `${this.lastHistoryStats?.error ?? 0} ❌`
-			});
-		}
+        if ((this.lastHistoryStats?.error ?? 0) > 0) {
+            hasShownMessage = true;
+            container.createSpan({
+                text: `${this.lastHistoryStats?.error ?? 0} ❌`
+            });
+        }
 
-		if (!hasShownMessage) {
-			container.createSpan({ text: "VaultLink is idle" });
-		}
-	}
+        if (!hasShownMessage) {
+            container.createSpan({ text: "VaultLink is idle" });
+        }
+    }
 }
diff --git a/frontend/obsidian-plugin/src/views/status-description/status-description.scss b/frontend/obsidian-plugin/src/views/status-description/status-description.scss
index 3ac86944..b66447bd 100644
--- a/frontend/obsidian-plugin/src/views/status-description/status-description.scss
+++ b/frontend/obsidian-plugin/src/views/status-description/status-description.scss
@@ -1,32 +1,32 @@
 @mixin number-card {
-	padding: var(--size-2-1) var(--size-4-1);
-	border-radius: var(--radius-s);
-	background-color: var(--color-base-30);
-	font-size: var(--font-ui-small);
+    padding: var(--size-2-1) var(--size-4-1);
+    border-radius: var(--radius-s);
+    background-color: var(--color-base-30);
+    font-size: var(--font-ui-small);
 
-	&.good {
-		background-color: rgba(var(--color-green-rgb), 0.35);
-	}
+    &.good {
+        background-color: rgba(var(--color-green-rgb), 0.35);
+    }
 
-	&.bad {
-		background-color: rgba(var(--color-red-rgb), 0.35);
-	}
+    &.bad {
+        background-color: rgba(var(--color-red-rgb), 0.35);
+    }
 }
 
 .status-description {
-	margin: var(--p-spacing) 0;
+    margin: var(--p-spacing) 0;
 
-	.number {
-		@include number-card;
-		font-family: var(--font-monospace);
-		font-weight: var(--bold-weight);
-	}
+    .number {
+        @include number-card;
+        font-family: var(--font-monospace);
+        font-weight: var(--bold-weight);
+    }
 
-	.error {
-		color: rgb(var(--color-red-rgb));
-	}
+    .error {
+        color: rgb(var(--color-red-rgb));
+    }
 
-	.warning {
-		color: rgb(var(--color-yellow-rgb));
-	}
+    .warning {
+        color: rgb(var(--color-yellow-rgb));
+    }
 }
diff --git a/frontend/obsidian-plugin/src/views/status-description/status-description.ts b/frontend/obsidian-plugin/src/views/status-description/status-description.ts
index fe4f17dc..540d5f21 100644
--- a/frontend/obsidian-plugin/src/views/status-description/status-description.ts
+++ b/frontend/obsidian-plugin/src/views/status-description/status-description.ts
@@ -1,147 +1,147 @@
 import "./status-description.scss";
 
 import type {
-	HistoryStats,
-	NetworkConnectionStatus,
-	SyncClient
+    HistoryStats,
+    NetworkConnectionStatus,
+    SyncClient
 } from "sync-client";
 import { utils } from "sync-client";
 
 export class StatusDescription {
-	private lastHistoryStats: HistoryStats | undefined;
-	private lastRemaining: number | undefined;
-	private lastConnectionState: NetworkConnectionStatus | undefined;
+    private lastHistoryStats: HistoryStats | undefined;
+    private lastRemaining: number | undefined;
+    private lastConnectionState: NetworkConnectionStatus | undefined;
 
-	private readonly statusChangeListeners: (() => unknown)[] = [];
+    private readonly statusChangeListeners: (() => unknown)[] = [];
 
-	public constructor(private readonly syncClient: SyncClient) {
-		void this.updateConnectionState();
+    public constructor(private readonly syncClient: SyncClient) {
+        void this.updateConnectionState();
 
-		syncClient.addSyncHistoryUpdateListener((status) => {
-			this.lastHistoryStats = status;
-			this.updateDescription();
-		});
+        syncClient.addSyncHistoryUpdateListener((status) => {
+            this.lastHistoryStats = status;
+            this.updateDescription();
+        });
 
-		this.syncClient.addRemainingSyncOperationsListener(
-			(remainingOperations) => {
-				this.lastRemaining = remainingOperations;
-				this.updateDescription();
-			}
-		);
+        this.syncClient.addRemainingSyncOperationsListener(
+            (remainingOperations) => {
+                this.lastRemaining = remainingOperations;
+                this.updateDescription();
+            }
+        );
 
-		this.syncClient.addWebSocketStatusChangeListener(async () =>
-			this.updateConnectionState()
-		);
+        this.syncClient.addWebSocketStatusChangeListener(async () =>
+            this.updateConnectionState()
+        );
 
-		this.syncClient.addOnSettingsChangeListener(async () =>
-			this.updateConnectionState()
-		);
-	}
+        this.syncClient.addOnSettingsChangeListener(async () =>
+            this.updateConnectionState()
+        );
+    }
 
-	public async updateConnectionState(): Promise<void> {
-		this.lastConnectionState = await this.syncClient.checkConnection();
-		this.updateDescription();
-	}
+    public async updateConnectionState(): Promise<void> {
+        this.lastConnectionState = await this.syncClient.checkConnection();
+        this.updateDescription();
+    }
 
-	public addStatusChangeListener(listener: () => unknown): void {
-		this.statusChangeListeners.push(listener);
-	}
-	public removeStatusChangeListener(listener: () => unknown): void {
-		utils.removeFromArray(this.statusChangeListeners, listener);
-	}
+    public addStatusChangeListener(listener: () => unknown): void {
+        this.statusChangeListeners.push(listener);
+    }
+    public removeStatusChangeListener(listener: () => unknown): void {
+        utils.removeFromArray(this.statusChangeListeners, listener);
+    }
 
-	public renderStatusDescription(container: HTMLElement): void {
-		container.empty();
-		container.addClass("status-description");
+    public renderStatusDescription(container: HTMLElement): void {
+        container.empty();
+        container.addClass("status-description");
 
-		if (this.lastConnectionState == undefined) {
-			container.createSpan({
-				text: "VaultLink is starting up…",
-				cls: "warning"
-			});
-			return;
-		}
+        if (this.lastConnectionState == undefined) {
+            container.createSpan({
+                text: "VaultLink is starting up…",
+                cls: "warning"
+            });
+            return;
+        }
 
-		if (!this.lastConnectionState.isSuccessful) {
-			container.createSpan({
-				text: `VaultLink failed to connect to the remote server with error '${this.lastConnectionState.serverMessage}'`,
-				cls: "error"
-			});
-			return;
-		}
+        if (!this.lastConnectionState.isSuccessful) {
+            container.createSpan({
+                text: `VaultLink failed to connect to the remote server with error '${this.lastConnectionState.serverMessage}'`,
+                cls: "error"
+            });
+            return;
+        }
 
-		if (!this.lastConnectionState.isWebSocketConnected) {
-			container.createSpan({
-				text: `${this.lastConnectionState.serverMessage} but the WebSocket connection could not be established.`,
-				cls: "error"
-			});
-			return;
-		}
+        if (!this.lastConnectionState.isWebSocketConnected) {
+            container.createSpan({
+                text: `${this.lastConnectionState.serverMessage} but the WebSocket connection could not be established.`,
+                cls: "error"
+            });
+            return;
+        }
 
-		container.createSpan({ text: "VaultLink is connected to the server " });
-		container.createEl("a", {
-			text: this.syncClient.getSettings().remoteUri,
-			href: this.syncClient.getSettings().remoteUri
-		});
+        container.createSpan({ text: "VaultLink is connected to the server " });
+        container.createEl("a", {
+            text: this.syncClient.getSettings().remoteUri,
+            href: this.syncClient.getSettings().remoteUri
+        });
 
-		container.createSpan({
-			text: ` and has indexed approximately `
-		});
-		container.createSpan({
-			text: `${this.syncClient.documentCount}`,
-			cls: "number"
-		});
-		container.createSpan({
-			text: ` documents. `
-		});
+        container.createSpan({
+            text: ` and has indexed approximately `
+        });
+        container.createSpan({
+            text: `${this.syncClient.documentCount}`,
+            cls: "number"
+        });
+        container.createSpan({
+            text: ` documents. `
+        });
 
-		if (
-			(this.lastRemaining ?? 0) === 0 &&
-			(this.lastHistoryStats?.success ?? 0) === 0 &&
-			(this.lastHistoryStats?.error ?? 0) === 0
-		) {
-			if (this.syncClient.getSettings().isSyncEnabled) {
-				container.createSpan({
-					text: "Syncing is enabled but VaultLink hasn't found anything to sync yet."
-				});
-			} else {
-				container.createSpan({
-					text: "However, syncing is disabled right now.",
-					cls: "warning"
-				});
-			}
-			return;
-		}
+        if (
+            (this.lastRemaining ?? 0) === 0 &&
+            (this.lastHistoryStats?.success ?? 0) === 0 &&
+            (this.lastHistoryStats?.error ?? 0) === 0
+        ) {
+            if (this.syncClient.getSettings().isSyncEnabled) {
+                container.createSpan({
+                    text: "Syncing is enabled but VaultLink hasn't found anything to sync yet."
+                });
+            } else {
+                container.createSpan({
+                    text: "However, syncing is disabled right now.",
+                    cls: "warning"
+                });
+            }
+            return;
+        }
 
-		container.createSpan({
-			text: "The plugin has "
-		});
-		container.createSpan({
-			text: `${this.lastRemaining ?? 0}`,
-			cls: "number"
-		});
-		container.createSpan({
-			text: " outstanding operations while having succeeded "
-		});
-		container.createSpan({
-			text: `${this.lastHistoryStats?.success ?? 0}`,
-			cls: ["number", "good"]
-		});
-		container.createSpan({
-			text: " times and failed "
-		});
-		container.createSpan({
-			text: `${this.lastHistoryStats?.error ?? 0}`,
-			cls: ["number", "bad"]
-		});
-		container.createSpan({
-			text: " times."
-		});
-	}
+        container.createSpan({
+            text: "The plugin has "
+        });
+        container.createSpan({
+            text: `${this.lastRemaining ?? 0}`,
+            cls: "number"
+        });
+        container.createSpan({
+            text: " outstanding operations while having succeeded "
+        });
+        container.createSpan({
+            text: `${this.lastHistoryStats?.success ?? 0}`,
+            cls: ["number", "good"]
+        });
+        container.createSpan({
+            text: " times and failed "
+        });
+        container.createSpan({
+            text: `${this.lastHistoryStats?.error ?? 0}`,
+            cls: ["number", "bad"]
+        });
+        container.createSpan({
+            text: " times."
+        });
+    }
 
-	private updateDescription(): void {
-		this.statusChangeListeners.forEach((listener) => {
-			listener();
-		});
-	}
+    private updateDescription(): void {
+        this.statusChangeListeners.forEach((listener) => {
+            listener();
+        });
+    }
 }
diff --git a/frontend/obsidian-plugin/webpack.config.js b/frontend/obsidian-plugin/webpack.config.js
index 8b7cb411..b749b20d 100644
--- a/frontend/obsidian-plugin/webpack.config.js
+++ b/frontend/obsidian-plugin/webpack.config.js
@@ -4,114 +4,114 @@ const MiniCssExtractPlugin = require("mini-css-extract-plugin");
 const fs = require("fs-extra");
 
 module.exports = (env, argv) => ({
-	devtool: argv.mode === "development" ? "inline-source-map" : false,
-	entry: {
-		index: "./src/vault-link-plugin.ts"
-	},
-	watchOptions: {
-		ignored: "**/node_modules"
-	},
-	externals: {
-		obsidian: "commonjs obsidian",
-		electron: "commonjs electron",
-		"@codemirror/autocomplete": "commonjs @codemirror/autocomplete",
-		"@codemirror/collab": "commonjs @codemirror/collab",
-		"@codemirror/commands": "commonjs @codemirror/commands",
-		"@codemirror/language": "commonjs @codemirror/language",
-		"@codemirror/lint": "commonjs @codemirror/lint",
-		"@codemirror/search": "commonjs @codemirror/search",
-		"@codemirror/state": "commonjs @codemirror/state",
-		"@codemirror/view": "commonjs @codemirror/view"
-	},
-	optimization: {
-		minimizer: [
-			new TerserPlugin({
-				terserOptions: {
-					module: true
-				}
-			})
-		]
-	},
-	plugins: [
-		new MiniCssExtractPlugin({
-			filename: "styles.css"
-		}),
-		{
-			apply: (compiler) => {
-				if (argv.mode !== "development") {
-					return;
-				}
+    devtool: argv.mode === "development" ? "inline-source-map" : false,
+    entry: {
+        index: "./src/vault-link-plugin.ts"
+    },
+    watchOptions: {
+        ignored: "**/node_modules"
+    },
+    externals: {
+        obsidian: "commonjs obsidian",
+        electron: "commonjs electron",
+        "@codemirror/autocomplete": "commonjs @codemirror/autocomplete",
+        "@codemirror/collab": "commonjs @codemirror/collab",
+        "@codemirror/commands": "commonjs @codemirror/commands",
+        "@codemirror/language": "commonjs @codemirror/language",
+        "@codemirror/lint": "commonjs @codemirror/lint",
+        "@codemirror/search": "commonjs @codemirror/search",
+        "@codemirror/state": "commonjs @codemirror/state",
+        "@codemirror/view": "commonjs @codemirror/view"
+    },
+    optimization: {
+        minimizer: [
+            new TerserPlugin({
+                terserOptions: {
+                    module: true
+                }
+            })
+        ]
+    },
+    plugins: [
+        new MiniCssExtractPlugin({
+            filename: "styles.css"
+        }),
+        {
+            apply: (compiler) => {
+                if (argv.mode !== "development") {
+                    return;
+                }
 
-				compiler.hooks.done.tap("Copy Files Plugin", (stats) => {
-					const source = path.resolve(__dirname, "dist");
-					const destinations = [
-						"/volumes/syncthing/Desktop/test/test/.obsidian/plugins/vault-link",
-						"/volumes/syncthing/Desktop/test/test2/.obsidian/plugins/vault-link",
-						// "/home/andras/obsidian-test/.obsidian/plugins/vault-link"
-					];
-					destinations.forEach((destination) => {
-						fs.copy(source, destination)
-							.then(() =>
-								console.log(
-									"Files copied successfully after build!"
-								)
-							)
-							.catch((err) =>
-								console.error("Error copying files:", err)
-							);
+                compiler.hooks.done.tap("Copy Files Plugin", (stats) => {
+                    const source = path.resolve(__dirname, "dist");
+                    const destinations = [
+                        "/volumes/syncthing/Desktop/test/test/.obsidian/plugins/vault-link",
+                        "/volumes/syncthing/Desktop/test/test2/.obsidian/plugins/vault-link",
+                        // "/home/andras/obsidian-test/.obsidian/plugins/vault-link"
+                    ];
+                    destinations.forEach((destination) => {
+                        fs.copy(source, destination)
+                            .then(() =>
+                                console.log(
+                                    "Files copied successfully after build!"
+                                )
+                            )
+                            .catch((err) =>
+                                console.error("Error copying files:", err)
+                            );
 
-						fs.createFile(path.join(destination, ".hotreload"));
-					});
-				});
-			}
-		}
-	],
-	module: {
-		rules: [
-			{
-				test: /\.json$/i,
-				type: "asset/resource",
-				generator: {
-					filename: "[name][ext]"
-				}
-			},
-			{
-				test: /\.scss$/i,
-				use: [
-					MiniCssExtractPlugin.loader,
-					"css-loader",
-					"resolve-url-loader",
-					{
-						loader: "sass-loader",
-						options: {
-							sourceMap: true // required by resolve-url-loader
-						}
-					}
-				]
-			},
-			{
-				test: /\.ts$/,
-				use: ["ts-loader"]
-			}
-		]
-	},
-	resolve: {
-		extensions: [
-			".ts",
-			".js" // required for development
-		],
-		alias: {
-			root: __dirname,
-			src: path.resolve(__dirname, "src")
-		}
-	},
-	output: {
-		clean: true,
-		filename: "main.js",
-		library: {
-			type: "commonjs" // required for Obsidian
-		},
-		path: path.resolve(__dirname, "dist"),
-		publicPath: ""
-	}
+                        fs.createFile(path.join(destination, ".hotreload"));
+                    });
+                });
+            }
+        }
+    ],
+    module: {
+        rules: [
+            {
+                test: /\.json$/i,
+                type: "asset/resource",
+                generator: {
+                    filename: "[name][ext]"
+                }
+            },
+            {
+                test: /\.scss$/i,
+                use: [
+                    MiniCssExtractPlugin.loader,
+                    "css-loader",
+                    "resolve-url-loader",
+                    {
+                        loader: "sass-loader",
+                        options: {
+                            sourceMap: true // required by resolve-url-loader
+                        }
+                    }
+                ]
+            },
+            {
+                test: /\.ts$/,
+                use: ["ts-loader"]
+            }
+        ]
+    },
+    resolve: {
+        extensions: [
+            ".ts",
+            ".js" // required for development
+        ],
+        alias: {
+            root: __dirname,
+            src: path.resolve(__dirname, "src")
+        }
+    },
+    output: {
+        clean: true,
+        filename: "main.js",
+        library: {
+            type: "commonjs" // required for Obsidian
+        },
+        path: path.resolve(__dirname, "dist"),
+        publicPath: ""
+    }
 });
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 84834fd8..1d45b165 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,4736 +1,7527 @@
 {
-	"name": "my-workspace",
-	"lockfileVersion": 3,
-	"requires": true,
-	"packages": {
-		"": {
-			"name": "my-workspace",
-			"workspaces": [
-				"sync-client",
-				"obsidian-plugin",
-				"test-client",
-				"local-client-cli"
-			],
-			"devDependencies": {
-				"concurrently": "^9.2.1",
-				"eslint": "9.38.0",
-				"eslint-plugin-unused-imports": "^4.1.4",
-				"npm-check-updates": "^19.1.1",
-				"prettier": "^3.6.2",
-				"typescript-eslint": "8.41.0"
-			}
-		},
-		"local-client-cli": {
-			"version": "0.12.0",
-			"dependencies": {
-				"commander": "^14.0.2"
-			},
-			"bin": {
-				"vaultlink": "dist/cli.js"
-			},
-			"devDependencies": {
-				"@types/node": "^24.8.1",
-				"sync-client": "file:../sync-client",
-				"ts-loader": "^9.5.2",
-				"tslib": "2.8.1",
-				"tsx": "^4.20.6",
-				"typescript": "5.8.3",
-				"webpack": "^5.99.9",
-				"webpack-cli": "^6.0.1"
-			}
-		},
-		"node_modules/@codemirror/state": {
-			"version": "6.5.0",
-			"resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.5.0.tgz",
-			"integrity": "sha512-MwBHVK60IiIHDcoMet78lxt6iw5gJOGSbNbOIVBHWVXIH4/Nq1+GQgLLGgI1KlnN86WDXsPudVaqYHKBIx7Eyw==",
-			"dev": true,
-			"license": "MIT",
-			"peer": true,
-			"dependencies": {
-				"@marijn/find-cluster-break": "^1.0.0"
-			}
-		},
-		"node_modules/@codemirror/view": {
-			"version": "6.38.1",
-			"resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.38.1.tgz",
-			"integrity": "sha512-RmTOkE7hRU3OVREqFVITWHz6ocgBjv08GoePscAakgVQfciA3SGCEk7mb9IzwW61cKKmlTpHXG6DUE5Ubx+MGQ==",
-			"dev": true,
-			"license": "MIT",
-			"peer": true,
-			"dependencies": {
-				"@codemirror/state": "^6.5.0",
-				"crelt": "^1.0.6",
-				"style-mod": "^4.1.0",
-				"w3c-keyname": "^2.2.4"
-			}
-		},
-		"node_modules/@discoveryjs/json-ext": {
-			"version": "0.6.3",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=14.17.0"
-			}
-		},
-		"node_modules/@esbuild/aix-ppc64": {
-			"version": "0.25.9",
-			"resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.9.tgz",
-			"integrity": "sha512-OaGtL73Jck6pBKjNIe24BnFE6agGl+6KxDtTfHhy1HmhthfKouEcOhqpSL64K4/0WCtbKFLOdzD/44cJ4k9opA==",
-			"cpu": [
-				"ppc64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"aix"
-			],
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@esbuild/android-arm": {
-			"version": "0.25.9",
-			"resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.9.tgz",
-			"integrity": "sha512-5WNI1DaMtxQ7t7B6xa572XMXpHAaI/9Hnhk8lcxF4zVN4xstUgTlvuGDorBguKEnZO70qwEcLpfifMLoxiPqHQ==",
-			"cpu": [
-				"arm"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"android"
-			],
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@esbuild/android-arm64": {
-			"version": "0.25.9",
-			"resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.9.tgz",
-			"integrity": "sha512-IDrddSmpSv51ftWslJMvl3Q2ZT98fUSL2/rlUXuVqRXHCs5EUF1/f+jbjF5+NG9UffUDMCiTyh8iec7u8RlTLg==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"android"
-			],
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@esbuild/android-x64": {
-			"version": "0.25.9",
-			"resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.9.tgz",
-			"integrity": "sha512-I853iMZ1hWZdNllhVZKm34f4wErd4lMyeV7BLzEExGEIZYsOzqDWDf+y082izYUE8gtJnYHdeDpN/6tUdwvfiw==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"android"
-			],
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@esbuild/darwin-arm64": {
-			"version": "0.25.9",
-			"resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.9.tgz",
-			"integrity": "sha512-XIpIDMAjOELi/9PB30vEbVMs3GV1v2zkkPnuyRRURbhqjyzIINwj+nbQATh4H9GxUgH1kFsEyQMxwiLFKUS6Rg==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"darwin"
-			],
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@esbuild/darwin-x64": {
-			"version": "0.25.9",
-			"resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.9.tgz",
-			"integrity": "sha512-jhHfBzjYTA1IQu8VyrjCX4ApJDnH+ez+IYVEoJHeqJm9VhG9Dh2BYaJritkYK3vMaXrf7Ogr/0MQ8/MeIefsPQ==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"darwin"
-			],
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@esbuild/freebsd-arm64": {
-			"version": "0.25.9",
-			"resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.9.tgz",
-			"integrity": "sha512-z93DmbnY6fX9+KdD4Ue/H6sYs+bhFQJNCPZsi4XWJoYblUqT06MQUdBCpcSfuiN72AbqeBFu5LVQTjfXDE2A6Q==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"freebsd"
-			],
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@esbuild/freebsd-x64": {
-			"version": "0.25.9",
-			"resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.9.tgz",
-			"integrity": "sha512-mrKX6H/vOyo5v71YfXWJxLVxgy1kyt1MQaD8wZJgJfG4gq4DpQGpgTB74e5yBeQdyMTbgxp0YtNj7NuHN0PoZg==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"freebsd"
-			],
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@esbuild/linux-arm": {
-			"version": "0.25.9",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.9.tgz",
-			"integrity": "sha512-HBU2Xv78SMgaydBmdor38lg8YDnFKSARg1Q6AT0/y2ezUAKiZvc211RDFHlEZRFNRVhcMamiToo7bDx3VEOYQw==",
-			"cpu": [
-				"arm"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@esbuild/linux-arm64": {
-			"version": "0.25.9",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.9.tgz",
-			"integrity": "sha512-BlB7bIcLT3G26urh5Dmse7fiLmLXnRlopw4s8DalgZ8ef79Jj4aUcYbk90g8iCa2467HX8SAIidbL7gsqXHdRw==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@esbuild/linux-ia32": {
-			"version": "0.25.9",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.9.tgz",
-			"integrity": "sha512-e7S3MOJPZGp2QW6AK6+Ly81rC7oOSerQ+P8L0ta4FhVi+/j/v2yZzx5CqqDaWjtPFfYz21Vi1S0auHrap3Ma3A==",
-			"cpu": [
-				"ia32"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@esbuild/linux-loong64": {
-			"version": "0.25.9",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.9.tgz",
-			"integrity": "sha512-Sbe10Bnn0oUAB2AalYztvGcK+o6YFFA/9829PhOCUS9vkJElXGdphz0A3DbMdP8gmKkqPmPcMJmJOrI3VYB1JQ==",
-			"cpu": [
-				"loong64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@esbuild/linux-mips64el": {
-			"version": "0.25.9",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.9.tgz",
-			"integrity": "sha512-YcM5br0mVyZw2jcQeLIkhWtKPeVfAerES5PvOzaDxVtIyZ2NUBZKNLjC5z3/fUlDgT6w89VsxP2qzNipOaaDyA==",
-			"cpu": [
-				"mips64el"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@esbuild/linux-ppc64": {
-			"version": "0.25.9",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.9.tgz",
-			"integrity": "sha512-++0HQvasdo20JytyDpFvQtNrEsAgNG2CY1CLMwGXfFTKGBGQT3bOeLSYE2l1fYdvML5KUuwn9Z8L1EWe2tzs1w==",
-			"cpu": [
-				"ppc64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@esbuild/linux-riscv64": {
-			"version": "0.25.9",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.9.tgz",
-			"integrity": "sha512-uNIBa279Y3fkjV+2cUjx36xkx7eSjb8IvnL01eXUKXez/CBHNRw5ekCGMPM0BcmqBxBcdgUWuUXmVWwm4CH9kg==",
-			"cpu": [
-				"riscv64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@esbuild/linux-s390x": {
-			"version": "0.25.9",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.9.tgz",
-			"integrity": "sha512-Mfiphvp3MjC/lctb+7D287Xw1DGzqJPb/J2aHHcHxflUo+8tmN/6d4k6I2yFR7BVo5/g7x2Monq4+Yew0EHRIA==",
-			"cpu": [
-				"s390x"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@esbuild/linux-x64": {
-			"version": "0.25.9",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.9.tgz",
-			"integrity": "sha512-iSwByxzRe48YVkmpbgoxVzn76BXjlYFXC7NvLYq+b+kDjyyk30J0JY47DIn8z1MO3K0oSl9fZoRmZPQI4Hklzg==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@esbuild/netbsd-arm64": {
-			"version": "0.25.9",
-			"resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.9.tgz",
-			"integrity": "sha512-9jNJl6FqaUG+COdQMjSCGW4QiMHH88xWbvZ+kRVblZsWrkXlABuGdFJ1E9L7HK+T0Yqd4akKNa/lO0+jDxQD4Q==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"netbsd"
-			],
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@esbuild/netbsd-x64": {
-			"version": "0.25.9",
-			"resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.9.tgz",
-			"integrity": "sha512-RLLdkflmqRG8KanPGOU7Rpg829ZHu8nFy5Pqdi9U01VYtG9Y0zOG6Vr2z4/S+/3zIyOxiK6cCeYNWOFR9QP87g==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"netbsd"
-			],
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@esbuild/openbsd-arm64": {
-			"version": "0.25.9",
-			"resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.9.tgz",
-			"integrity": "sha512-YaFBlPGeDasft5IIM+CQAhJAqS3St3nJzDEgsgFixcfZeyGPCd6eJBWzke5piZuZ7CtL656eOSYKk4Ls2C0FRQ==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"openbsd"
-			],
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@esbuild/openbsd-x64": {
-			"version": "0.25.9",
-			"resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.9.tgz",
-			"integrity": "sha512-1MkgTCuvMGWuqVtAvkpkXFmtL8XhWy+j4jaSO2wxfJtilVCi0ZE37b8uOdMItIHz4I6z1bWWtEX4CJwcKYLcuA==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"openbsd"
-			],
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@esbuild/openharmony-arm64": {
-			"version": "0.25.9",
-			"resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.9.tgz",
-			"integrity": "sha512-4Xd0xNiMVXKh6Fa7HEJQbrpP3m3DDn43jKxMjxLLRjWnRsfxjORYJlXPO4JNcXtOyfajXorRKY9NkOpTHptErg==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"openharmony"
-			],
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@esbuild/sunos-x64": {
-			"version": "0.25.9",
-			"resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.9.tgz",
-			"integrity": "sha512-WjH4s6hzo00nNezhp3wFIAfmGZ8U7KtrJNlFMRKxiI9mxEK1scOMAaa9i4crUtu+tBr+0IN6JCuAcSBJZfnphw==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"sunos"
-			],
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@esbuild/win32-arm64": {
-			"version": "0.25.9",
-			"resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.9.tgz",
-			"integrity": "sha512-mGFrVJHmZiRqmP8xFOc6b84/7xa5y5YvR1x8djzXpJBSv/UsNK6aqec+6JDjConTgvvQefdGhFDAs2DLAds6gQ==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"win32"
-			],
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@esbuild/win32-ia32": {
-			"version": "0.25.9",
-			"resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.9.tgz",
-			"integrity": "sha512-b33gLVU2k11nVx1OhX3C8QQP6UHQK4ZtN56oFWvVXvz2VkDoe6fbG8TOgHFxEvqeqohmRnIHe5A1+HADk4OQww==",
-			"cpu": [
-				"ia32"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"win32"
-			],
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@esbuild/win32-x64": {
-			"version": "0.25.9",
-			"resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.9.tgz",
-			"integrity": "sha512-PPOl1mi6lpLNQxnGoyAfschAodRFYXJ+9fs6WHXz7CSWKbOqiMZsubC+BQsVKuul+3vKLuwTHsS2c2y9EoKwxQ==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"win32"
-			],
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@eslint-community/eslint-utils": {
-			"version": "4.9.0",
-			"resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.0.tgz",
-			"integrity": "sha512-ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"eslint-visitor-keys": "^3.4.3"
-			},
-			"engines": {
-				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/eslint"
-			},
-			"peerDependencies": {
-				"eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
-			}
-		},
-		"node_modules/@eslint-community/eslint-utils/node_modules/eslint-visitor-keys": {
-			"version": "3.4.3",
-			"dev": true,
-			"license": "Apache-2.0",
-			"engines": {
-				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/eslint"
-			}
-		},
-		"node_modules/@eslint-community/regexpp": {
-			"version": "4.12.1",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": "^12.0.0 || ^14.0.0 || >=16.0.0"
-			}
-		},
-		"node_modules/@eslint/config-array": {
-			"version": "0.21.1",
-			"resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.1.tgz",
-			"integrity": "sha512-aw1gNayWpdI/jSYVgzN5pL0cfzU02GT3NBpeT/DXbx1/1x7ZKxFPd9bwrzygx/qiwIQiJ1sw/zD8qY/kRvlGHA==",
-			"dev": true,
-			"license": "Apache-2.0",
-			"dependencies": {
-				"@eslint/object-schema": "^2.1.7",
-				"debug": "^4.3.1",
-				"minimatch": "^3.1.2"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			}
-		},
-		"node_modules/@eslint/config-helpers": {
-			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.4.1.tgz",
-			"integrity": "sha512-csZAzkNhsgwb0I/UAV6/RGFTbiakPCf0ZrGmrIxQpYvGZ00PhTkSnyKNolphgIvmnJeGw6rcGVEXfTzUnFuEvw==",
-			"dev": true,
-			"license": "Apache-2.0",
-			"dependencies": {
-				"@eslint/core": "^0.16.0"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			}
-		},
-		"node_modules/@eslint/core": {
-			"version": "0.16.0",
-			"resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.16.0.tgz",
-			"integrity": "sha512-nmC8/totwobIiFcGkDza3GIKfAw1+hLiYVrh3I1nIomQ8PEr5cxg34jnkmGawul/ep52wGRAcyeDCNtWKSOj4Q==",
-			"dev": true,
-			"license": "Apache-2.0",
-			"dependencies": {
-				"@types/json-schema": "^7.0.15"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			}
-		},
-		"node_modules/@eslint/eslintrc": {
-			"version": "3.3.1",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"ajv": "^6.12.4",
-				"debug": "^4.3.2",
-				"espree": "^10.0.1",
-				"globals": "^14.0.0",
-				"ignore": "^5.2.0",
-				"import-fresh": "^3.2.1",
-				"js-yaml": "^4.1.0",
-				"minimatch": "^3.1.2",
-				"strip-json-comments": "^3.1.1"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/eslint"
-			}
-		},
-		"node_modules/@eslint/js": {
-			"version": "9.38.0",
-			"resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.38.0.tgz",
-			"integrity": "sha512-UZ1VpFvXf9J06YG9xQBdnzU+kthors6KjhMAl6f4gH4usHyh31rUf2DLGInT8RFYIReYXNSydgPY0V2LuWgl7A==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"url": "https://eslint.org/donate"
-			}
-		},
-		"node_modules/@eslint/object-schema": {
-			"version": "2.1.7",
-			"resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.7.tgz",
-			"integrity": "sha512-VtAOaymWVfZcmZbp6E2mympDIHvyjXs/12LqWYjVw6qjrfF+VK+fyG33kChz3nnK+SU5/NeHOqrTEHS8sXO3OA==",
-			"dev": true,
-			"license": "Apache-2.0",
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			}
-		},
-		"node_modules/@eslint/plugin-kit": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.4.0.tgz",
-			"integrity": "sha512-sB5uyeq+dwCWyPi31B2gQlVlo+j5brPlWx4yZBrEaRo/nhdDE8Xke1gsGgtiBdaBTxuTkceLVuVt/pclrasb0A==",
-			"dev": true,
-			"license": "Apache-2.0",
-			"dependencies": {
-				"@eslint/core": "^0.16.0",
-				"levn": "^0.4.1"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			}
-		},
-		"node_modules/@humanfs/core": {
-			"version": "0.19.1",
-			"dev": true,
-			"license": "Apache-2.0",
-			"engines": {
-				"node": ">=18.18.0"
-			}
-		},
-		"node_modules/@humanfs/node": {
-			"version": "0.16.6",
-			"dev": true,
-			"license": "Apache-2.0",
-			"dependencies": {
-				"@humanfs/core": "^0.19.1",
-				"@humanwhocodes/retry": "^0.3.0"
-			},
-			"engines": {
-				"node": ">=18.18.0"
-			}
-		},
-		"node_modules/@humanfs/node/node_modules/@humanwhocodes/retry": {
-			"version": "0.3.1",
-			"dev": true,
-			"license": "Apache-2.0",
-			"engines": {
-				"node": ">=18.18"
-			},
-			"funding": {
-				"type": "github",
-				"url": "https://github.com/sponsors/nzakas"
-			}
-		},
-		"node_modules/@humanwhocodes/module-importer": {
-			"version": "1.0.1",
-			"dev": true,
-			"license": "Apache-2.0",
-			"engines": {
-				"node": ">=12.22"
-			},
-			"funding": {
-				"type": "github",
-				"url": "https://github.com/sponsors/nzakas"
-			}
-		},
-		"node_modules/@humanwhocodes/retry": {
-			"version": "0.4.2",
-			"dev": true,
-			"license": "Apache-2.0",
-			"engines": {
-				"node": ">=18.18"
-			},
-			"funding": {
-				"type": "github",
-				"url": "https://github.com/sponsors/nzakas"
-			}
-		},
-		"node_modules/@jridgewell/gen-mapping": {
-			"version": "0.3.13",
-			"resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz",
-			"integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jridgewell/sourcemap-codec": "^1.5.0",
-				"@jridgewell/trace-mapping": "^0.3.24"
-			}
-		},
-		"node_modules/@jridgewell/resolve-uri": {
-			"version": "3.1.2",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6.0.0"
-			}
-		},
-		"node_modules/@jridgewell/source-map": {
-			"version": "0.3.6",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jridgewell/gen-mapping": "^0.3.5",
-				"@jridgewell/trace-mapping": "^0.3.25"
-			}
-		},
-		"node_modules/@jridgewell/sourcemap-codec": {
-			"version": "1.5.0",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/@jridgewell/trace-mapping": {
-			"version": "0.3.30",
-			"resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.30.tgz",
-			"integrity": "sha512-GQ7Nw5G2lTu/BtHTKfXhKHok2WGetd4XYcVKGx00SjAk8GMwgJM3zr6zORiPGuOE+/vkc90KtTosSSvaCjKb2Q==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jridgewell/resolve-uri": "^3.1.0",
-				"@jridgewell/sourcemap-codec": "^1.4.14"
-			}
-		},
-		"node_modules/@marijn/find-cluster-break": {
-			"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==",
-			"dev": true,
-			"license": "MIT",
-			"peer": true
-		},
-		"node_modules/@nodelib/fs.scandir": {
-			"version": "2.1.5",
-			"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-			"integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@nodelib/fs.stat": "2.0.5",
-				"run-parallel": "^1.1.9"
-			},
-			"engines": {
-				"node": ">= 8"
-			}
-		},
-		"node_modules/@nodelib/fs.stat": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-			"integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">= 8"
-			}
-		},
-		"node_modules/@nodelib/fs.walk": {
-			"version": "1.2.8",
-			"resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-			"integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@nodelib/fs.scandir": "2.1.5",
-				"fastq": "^1.6.0"
-			},
-			"engines": {
-				"node": ">= 8"
-			}
-		},
-		"node_modules/@parcel/watcher": {
-			"version": "2.5.1",
-			"dev": true,
-			"hasInstallScript": true,
-			"license": "MIT",
-			"optional": true,
-			"dependencies": {
-				"detect-libc": "^1.0.3",
-				"is-glob": "^4.0.3",
-				"micromatch": "^4.0.5",
-				"node-addon-api": "^7.0.0"
-			},
-			"engines": {
-				"node": ">= 10.0.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/parcel"
-			},
-			"optionalDependencies": {
-				"@parcel/watcher-android-arm64": "2.5.1",
-				"@parcel/watcher-darwin-arm64": "2.5.1",
-				"@parcel/watcher-darwin-x64": "2.5.1",
-				"@parcel/watcher-freebsd-x64": "2.5.1",
-				"@parcel/watcher-linux-arm-glibc": "2.5.1",
-				"@parcel/watcher-linux-arm-musl": "2.5.1",
-				"@parcel/watcher-linux-arm64-glibc": "2.5.1",
-				"@parcel/watcher-linux-arm64-musl": "2.5.1",
-				"@parcel/watcher-linux-x64-glibc": "2.5.1",
-				"@parcel/watcher-linux-x64-musl": "2.5.1",
-				"@parcel/watcher-win32-arm64": "2.5.1",
-				"@parcel/watcher-win32-ia32": "2.5.1",
-				"@parcel/watcher-win32-x64": "2.5.1"
-			}
-		},
-		"node_modules/@parcel/watcher-linux-x64-glibc": {
-			"version": "2.5.1",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": ">= 10.0.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/parcel"
-			}
-		},
-		"node_modules/@parcel/watcher-linux-x64-musl": {
-			"version": "2.5.1",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": ">= 10.0.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/parcel"
-			}
-		},
-		"node_modules/@sentry-internal/browser-utils": {
-			"version": "10.8.0",
-			"resolved": "https://registry.npmjs.org/@sentry-internal/browser-utils/-/browser-utils-10.8.0.tgz",
-			"integrity": "sha512-FaQX9eefc8sh3h3ZQy16U73KiH0xgDldXnrFiWK6OeWg8X4bJpnYbLqEi96LgHiQhjnnz+UQP1GDzH5oFuu5fA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@sentry/core": "10.8.0"
-			},
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@sentry-internal/feedback": {
-			"version": "10.8.0",
-			"resolved": "https://registry.npmjs.org/@sentry-internal/feedback/-/feedback-10.8.0.tgz",
-			"integrity": "sha512-n7SqgFQItq4QSPG7bCjcZcIwK6AatKnnmSDJ/i6e8jXNIyLwkEuY2NyvTXACxVdO/kafGD5VmrwnTo3Ekc1AMg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@sentry/core": "10.8.0"
-			},
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@sentry-internal/replay": {
-			"version": "10.8.0",
-			"resolved": "https://registry.npmjs.org/@sentry-internal/replay/-/replay-10.8.0.tgz",
-			"integrity": "sha512-9+qDEoEjv4VopLuOzK1zM4LcvcUsvB5N0iJ+FRCM3XzzOCbebJOniXTQbt5HflJc3XLnQNKFdKfTfgj8M/0RKQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@sentry-internal/browser-utils": "10.8.0",
-				"@sentry/core": "10.8.0"
-			},
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@sentry-internal/replay-canvas": {
-			"version": "10.8.0",
-			"resolved": "https://registry.npmjs.org/@sentry-internal/replay-canvas/-/replay-canvas-10.8.0.tgz",
-			"integrity": "sha512-jC4OOwiNgrlIPeXIPMLkaW53BSS1do+toYHoWzzO5AXGpN6jRhanoSj36FpVuH2N3kFnxKVfVxrwh8L+/3vFWg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@sentry-internal/replay": "10.8.0",
-				"@sentry/core": "10.8.0"
-			},
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@sentry/browser": {
-			"version": "10.8.0",
-			"resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-10.8.0.tgz",
-			"integrity": "sha512-2J7HST8/ixCaboq17yFn/j/OEokXSXoCBMXRrFx4FKJggKWZ90e2Iau5mP/IPPhrW+W9zCptCgNMY0167wS4qA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@sentry-internal/browser-utils": "10.8.0",
-				"@sentry-internal/feedback": "10.8.0",
-				"@sentry-internal/replay": "10.8.0",
-				"@sentry-internal/replay-canvas": "10.8.0",
-				"@sentry/core": "10.8.0"
-			},
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@sentry/core": {
-			"version": "10.8.0",
-			"resolved": "https://registry.npmjs.org/@sentry/core/-/core-10.8.0.tgz",
-			"integrity": "sha512-scYzM/UOItu4PjEq6CpHLdArpXjIS0laHYxE4YjkIbYIH6VMcXGQbD/FSBClsnCr1wXRnlXfXBzj0hrQAFyw+Q==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@types/codemirror": {
-			"version": "5.60.8",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@types/tern": "*"
-			}
-		},
-		"node_modules/@types/eslint": {
-			"version": "9.6.1",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@types/estree": "*",
-				"@types/json-schema": "*"
-			}
-		},
-		"node_modules/@types/eslint-scope": {
-			"version": "3.7.7",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@types/eslint": "*",
-				"@types/estree": "*"
-			}
-		},
-		"node_modules/@types/estree": {
-			"version": "1.0.7",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/@types/json-schema": {
-			"version": "7.0.15",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/@types/node": {
-			"version": "24.8.1",
-			"resolved": "https://registry.npmjs.org/@types/node/-/node-24.8.1.tgz",
-			"integrity": "sha512-alv65KGRadQVfVcG69MuB4IzdYVpRwMG/mq8KWOaoOdyY617P5ivaDiMCGOFDWD2sAn5Q0mR3mRtUOgm99hL9Q==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"undici-types": "~7.14.0"
-			}
-		},
-		"node_modules/@types/tern": {
-			"version": "0.23.9",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@types/estree": "*"
-			}
-		},
-		"node_modules/@typescript-eslint/eslint-plugin": {
-			"version": "8.41.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.41.0.tgz",
-			"integrity": "sha512-8fz6oa6wEKZrhXWro/S3n2eRJqlRcIa6SlDh59FXJ5Wp5XRZ8B9ixpJDcjadHq47hMx0u+HW6SNa6LjJQ6NLtw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@eslint-community/regexpp": "^4.10.0",
-				"@typescript-eslint/scope-manager": "8.41.0",
-				"@typescript-eslint/type-utils": "8.41.0",
-				"@typescript-eslint/utils": "8.41.0",
-				"@typescript-eslint/visitor-keys": "8.41.0",
-				"graphemer": "^1.4.0",
-				"ignore": "^7.0.0",
-				"natural-compare": "^1.4.0",
-				"ts-api-utils": "^2.1.0"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			},
-			"peerDependencies": {
-				"@typescript-eslint/parser": "^8.41.0",
-				"eslint": "^8.57.0 || ^9.0.0",
-				"typescript": ">=4.8.4 <6.0.0"
-			}
-		},
-		"node_modules/@typescript-eslint/eslint-plugin/node_modules/ignore": {
-			"version": "7.0.4",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">= 4"
-			}
-		},
-		"node_modules/@typescript-eslint/parser": {
-			"version": "8.41.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.41.0.tgz",
-			"integrity": "sha512-gTtSdWX9xiMPA/7MV9STjJOOYtWwIJIYxkQxnSV1U3xcE+mnJSH3f6zI0RYP+ew66WSlZ5ed+h0VCxsvdC1jJg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@typescript-eslint/scope-manager": "8.41.0",
-				"@typescript-eslint/types": "8.41.0",
-				"@typescript-eslint/typescript-estree": "8.41.0",
-				"@typescript-eslint/visitor-keys": "8.41.0",
-				"debug": "^4.3.4"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			},
-			"peerDependencies": {
-				"eslint": "^8.57.0 || ^9.0.0",
-				"typescript": ">=4.8.4 <6.0.0"
-			}
-		},
-		"node_modules/@typescript-eslint/project-service": {
-			"version": "8.41.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.41.0.tgz",
-			"integrity": "sha512-b8V9SdGBQzQdjJ/IO3eDifGpDBJfvrNTp2QD9P2BeqWTGrRibgfgIlBSw6z3b6R7dPzg752tOs4u/7yCLxksSQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@typescript-eslint/tsconfig-utils": "^8.41.0",
-				"@typescript-eslint/types": "^8.41.0",
-				"debug": "^4.3.4"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			},
-			"peerDependencies": {
-				"typescript": ">=4.8.4 <6.0.0"
-			}
-		},
-		"node_modules/@typescript-eslint/scope-manager": {
-			"version": "8.41.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.41.0.tgz",
-			"integrity": "sha512-n6m05bXn/Cd6DZDGyrpXrELCPVaTnLdPToyhBoFkLIMznRUQUEQdSp96s/pcWSQdqOhrgR1mzJ+yItK7T+WPMQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@typescript-eslint/types": "8.41.0",
-				"@typescript-eslint/visitor-keys": "8.41.0"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			}
-		},
-		"node_modules/@typescript-eslint/tsconfig-utils": {
-			"version": "8.41.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.41.0.tgz",
-			"integrity": "sha512-TDhxYFPUYRFxFhuU5hTIJk+auzM/wKvWgoNYOPcOf6i4ReYlOoYN8q1dV5kOTjNQNJgzWN3TUUQMtlLOcUgdUw==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			},
-			"peerDependencies": {
-				"typescript": ">=4.8.4 <6.0.0"
-			}
-		},
-		"node_modules/@typescript-eslint/type-utils": {
-			"version": "8.41.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.41.0.tgz",
-			"integrity": "sha512-63qt1h91vg3KsjVVonFJWjgSK7pZHSQFKH6uwqxAH9bBrsyRhO6ONoKyXxyVBzG1lJnFAJcKAcxLS54N1ee1OQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@typescript-eslint/types": "8.41.0",
-				"@typescript-eslint/typescript-estree": "8.41.0",
-				"@typescript-eslint/utils": "8.41.0",
-				"debug": "^4.3.4",
-				"ts-api-utils": "^2.1.0"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			},
-			"peerDependencies": {
-				"eslint": "^8.57.0 || ^9.0.0",
-				"typescript": ">=4.8.4 <6.0.0"
-			}
-		},
-		"node_modules/@typescript-eslint/types": {
-			"version": "8.41.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.41.0.tgz",
-			"integrity": "sha512-9EwxsWdVqh42afLbHP90n2VdHaWU/oWgbH2P0CfcNfdKL7CuKpwMQGjwev56vWu9cSKU7FWSu6r9zck6CVfnag==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			}
-		},
-		"node_modules/@typescript-eslint/typescript-estree": {
-			"version": "8.41.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.41.0.tgz",
-			"integrity": "sha512-D43UwUYJmGhuwHfY7MtNKRZMmfd8+p/eNSfFe6tH5mbVDto+VQCayeAt35rOx3Cs6wxD16DQtIKw/YXxt5E0UQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@typescript-eslint/project-service": "8.41.0",
-				"@typescript-eslint/tsconfig-utils": "8.41.0",
-				"@typescript-eslint/types": "8.41.0",
-				"@typescript-eslint/visitor-keys": "8.41.0",
-				"debug": "^4.3.4",
-				"fast-glob": "^3.3.2",
-				"is-glob": "^4.0.3",
-				"minimatch": "^9.0.4",
-				"semver": "^7.6.0",
-				"ts-api-utils": "^2.1.0"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			},
-			"peerDependencies": {
-				"typescript": ">=4.8.4 <6.0.0"
-			}
-		},
-		"node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-			"integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"balanced-match": "^1.0.0"
-			}
-		},
-		"node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": {
-			"version": "9.0.5",
-			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-			"integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"brace-expansion": "^2.0.1"
-			},
-			"engines": {
-				"node": ">=16 || 14 >=14.17"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			}
-		},
-		"node_modules/@typescript-eslint/utils": {
-			"version": "8.41.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.41.0.tgz",
-			"integrity": "sha512-udbCVstxZ5jiPIXrdH+BZWnPatjlYwJuJkDA4Tbo3WyYLh8NvB+h/bKeSZHDOFKfphsZYJQqaFtLeXEqurQn1A==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@eslint-community/eslint-utils": "^4.7.0",
-				"@typescript-eslint/scope-manager": "8.41.0",
-				"@typescript-eslint/types": "8.41.0",
-				"@typescript-eslint/typescript-estree": "8.41.0"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			},
-			"peerDependencies": {
-				"eslint": "^8.57.0 || ^9.0.0",
-				"typescript": ">=4.8.4 <6.0.0"
-			}
-		},
-		"node_modules/@typescript-eslint/visitor-keys": {
-			"version": "8.41.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.41.0.tgz",
-			"integrity": "sha512-+GeGMebMCy0elMNg67LRNoVnUFPIm37iu5CmHESVx56/9Jsfdpsvbv605DQ81Pi/x11IdKUsS5nzgTYbCQU9fg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@typescript-eslint/types": "8.41.0",
-				"eslint-visitor-keys": "^4.2.1"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			}
-		},
-		"node_modules/@webassemblyjs/ast": {
-			"version": "1.14.1",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@webassemblyjs/helper-numbers": "1.13.2",
-				"@webassemblyjs/helper-wasm-bytecode": "1.13.2"
-			}
-		},
-		"node_modules/@webassemblyjs/floating-point-hex-parser": {
-			"version": "1.13.2",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/@webassemblyjs/helper-api-error": {
-			"version": "1.13.2",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/@webassemblyjs/helper-buffer": {
-			"version": "1.14.1",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/@webassemblyjs/helper-numbers": {
-			"version": "1.13.2",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@webassemblyjs/floating-point-hex-parser": "1.13.2",
-				"@webassemblyjs/helper-api-error": "1.13.2",
-				"@xtuc/long": "4.2.2"
-			}
-		},
-		"node_modules/@webassemblyjs/helper-wasm-bytecode": {
-			"version": "1.13.2",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/@webassemblyjs/helper-wasm-section": {
-			"version": "1.14.1",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@webassemblyjs/ast": "1.14.1",
-				"@webassemblyjs/helper-buffer": "1.14.1",
-				"@webassemblyjs/helper-wasm-bytecode": "1.13.2",
-				"@webassemblyjs/wasm-gen": "1.14.1"
-			}
-		},
-		"node_modules/@webassemblyjs/ieee754": {
-			"version": "1.13.2",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@xtuc/ieee754": "^1.2.0"
-			}
-		},
-		"node_modules/@webassemblyjs/leb128": {
-			"version": "1.13.2",
-			"dev": true,
-			"license": "Apache-2.0",
-			"dependencies": {
-				"@xtuc/long": "4.2.2"
-			}
-		},
-		"node_modules/@webassemblyjs/utf8": {
-			"version": "1.13.2",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/@webassemblyjs/wasm-edit": {
-			"version": "1.14.1",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@webassemblyjs/ast": "1.14.1",
-				"@webassemblyjs/helper-buffer": "1.14.1",
-				"@webassemblyjs/helper-wasm-bytecode": "1.13.2",
-				"@webassemblyjs/helper-wasm-section": "1.14.1",
-				"@webassemblyjs/wasm-gen": "1.14.1",
-				"@webassemblyjs/wasm-opt": "1.14.1",
-				"@webassemblyjs/wasm-parser": "1.14.1",
-				"@webassemblyjs/wast-printer": "1.14.1"
-			}
-		},
-		"node_modules/@webassemblyjs/wasm-gen": {
-			"version": "1.14.1",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@webassemblyjs/ast": "1.14.1",
-				"@webassemblyjs/helper-wasm-bytecode": "1.13.2",
-				"@webassemblyjs/ieee754": "1.13.2",
-				"@webassemblyjs/leb128": "1.13.2",
-				"@webassemblyjs/utf8": "1.13.2"
-			}
-		},
-		"node_modules/@webassemblyjs/wasm-opt": {
-			"version": "1.14.1",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@webassemblyjs/ast": "1.14.1",
-				"@webassemblyjs/helper-buffer": "1.14.1",
-				"@webassemblyjs/wasm-gen": "1.14.1",
-				"@webassemblyjs/wasm-parser": "1.14.1"
-			}
-		},
-		"node_modules/@webassemblyjs/wasm-parser": {
-			"version": "1.14.1",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@webassemblyjs/ast": "1.14.1",
-				"@webassemblyjs/helper-api-error": "1.13.2",
-				"@webassemblyjs/helper-wasm-bytecode": "1.13.2",
-				"@webassemblyjs/ieee754": "1.13.2",
-				"@webassemblyjs/leb128": "1.13.2",
-				"@webassemblyjs/utf8": "1.13.2"
-			}
-		},
-		"node_modules/@webassemblyjs/wast-printer": {
-			"version": "1.14.1",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@webassemblyjs/ast": "1.14.1",
-				"@xtuc/long": "4.2.2"
-			}
-		},
-		"node_modules/@webpack-cli/configtest": {
-			"version": "3.0.1",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=18.12.0"
-			},
-			"peerDependencies": {
-				"webpack": "^5.82.0",
-				"webpack-cli": "6.x.x"
-			}
-		},
-		"node_modules/@webpack-cli/info": {
-			"version": "3.0.1",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=18.12.0"
-			},
-			"peerDependencies": {
-				"webpack": "^5.82.0",
-				"webpack-cli": "6.x.x"
-			}
-		},
-		"node_modules/@webpack-cli/serve": {
-			"version": "3.0.1",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=18.12.0"
-			},
-			"peerDependencies": {
-				"webpack": "^5.82.0",
-				"webpack-cli": "6.x.x"
-			},
-			"peerDependenciesMeta": {
-				"webpack-dev-server": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/@xtuc/ieee754": {
-			"version": "1.2.0",
-			"dev": true,
-			"license": "BSD-3-Clause"
-		},
-		"node_modules/@xtuc/long": {
-			"version": "4.2.2",
-			"dev": true,
-			"license": "Apache-2.0"
-		},
-		"node_modules/acorn": {
-			"version": "8.15.0",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
-			"integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
-			"dev": true,
-			"license": "MIT",
-			"bin": {
-				"acorn": "bin/acorn"
-			},
-			"engines": {
-				"node": ">=0.4.0"
-			}
-		},
-		"node_modules/acorn-jsx": {
-			"version": "5.3.2",
-			"dev": true,
-			"license": "MIT",
-			"peerDependencies": {
-				"acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
-			}
-		},
-		"node_modules/adjust-sourcemap-loader": {
-			"version": "4.0.0",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"loader-utils": "^2.0.0",
-				"regex-parser": "^2.2.11"
-			},
-			"engines": {
-				"node": ">=8.9"
-			}
-		},
-		"node_modules/ajv": {
-			"version": "6.12.6",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"fast-deep-equal": "^3.1.1",
-				"fast-json-stable-stringify": "^2.0.0",
-				"json-schema-traverse": "^0.4.1",
-				"uri-js": "^4.2.2"
-			},
-			"funding": {
-				"type": "github",
-				"url": "https://github.com/sponsors/epoberezkin"
-			}
-		},
-		"node_modules/ajv-formats": {
-			"version": "2.1.1",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"ajv": "^8.0.0"
-			},
-			"peerDependencies": {
-				"ajv": "^8.0.0"
-			},
-			"peerDependenciesMeta": {
-				"ajv": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/ajv-formats/node_modules/ajv": {
-			"version": "8.17.1",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"fast-deep-equal": "^3.1.3",
-				"fast-uri": "^3.0.1",
-				"json-schema-traverse": "^1.0.0",
-				"require-from-string": "^2.0.2"
-			},
-			"funding": {
-				"type": "github",
-				"url": "https://github.com/sponsors/epoberezkin"
-			}
-		},
-		"node_modules/ajv-formats/node_modules/json-schema-traverse": {
-			"version": "1.0.0",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/ajv-keywords": {
-			"version": "3.5.2",
-			"dev": true,
-			"license": "MIT",
-			"peerDependencies": {
-				"ajv": "^6.9.1"
-			}
-		},
-		"node_modules/ansi-regex": {
-			"version": "5.0.1",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/ansi-styles": {
-			"version": "4.3.0",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"color-convert": "^2.0.1"
-			},
-			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
-			}
-		},
-		"node_modules/argparse": {
-			"version": "2.0.1",
-			"dev": true,
-			"license": "Python-2.0"
-		},
-		"node_modules/balanced-match": {
-			"version": "1.0.2",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/big.js": {
-			"version": "5.2.2",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": "*"
-			}
-		},
-		"node_modules/brace-expansion": {
-			"version": "1.1.12",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
-			"integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"balanced-match": "^1.0.0",
-				"concat-map": "0.0.1"
-			}
-		},
-		"node_modules/braces": {
-			"version": "3.0.3",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"fill-range": "^7.1.1"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/browserslist": {
-			"version": "4.24.4",
-			"dev": true,
-			"funding": [
-				{
-					"type": "opencollective",
-					"url": "https://opencollective.com/browserslist"
-				},
-				{
-					"type": "tidelift",
-					"url": "https://tidelift.com/funding/github/npm/browserslist"
-				},
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/ai"
-				}
-			],
-			"license": "MIT",
-			"dependencies": {
-				"caniuse-lite": "^1.0.30001688",
-				"electron-to-chromium": "^1.5.73",
-				"node-releases": "^2.0.19",
-				"update-browserslist-db": "^1.1.1"
-			},
-			"bin": {
-				"browserslist": "cli.js"
-			},
-			"engines": {
-				"node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
-			}
-		},
-		"node_modules/buffer-from": {
-			"version": "1.1.2",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/bufferutil": {
-			"version": "4.0.9",
-			"dev": true,
-			"hasInstallScript": true,
-			"license": "MIT",
-			"optional": true,
-			"peer": true,
-			"dependencies": {
-				"node-gyp-build": "^4.3.0"
-			},
-			"engines": {
-				"node": ">=6.14.2"
-			}
-		},
-		"node_modules/byte-base64": {
-			"version": "1.1.0",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/call-bind-apply-helpers": {
-			"version": "1.0.2",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"es-errors": "^1.3.0",
-				"function-bind": "^1.1.2"
-			},
-			"engines": {
-				"node": ">= 0.4"
-			}
-		},
-		"node_modules/call-bound": {
-			"version": "1.0.4",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"call-bind-apply-helpers": "^1.0.2",
-				"get-intrinsic": "^1.3.0"
-			},
-			"engines": {
-				"node": ">= 0.4"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/callsites": {
-			"version": "3.1.0",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/caniuse-lite": {
-			"version": "1.0.30001707",
-			"dev": true,
-			"funding": [
-				{
-					"type": "opencollective",
-					"url": "https://opencollective.com/browserslist"
-				},
-				{
-					"type": "tidelift",
-					"url": "https://tidelift.com/funding/github/npm/caniuse-lite"
-				},
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/ai"
-				}
-			],
-			"license": "CC-BY-4.0"
-		},
-		"node_modules/chalk": {
-			"version": "4.1.2",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"ansi-styles": "^4.1.0",
-				"supports-color": "^7.1.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/chalk?sponsor=1"
-			}
-		},
-		"node_modules/chalk/node_modules/supports-color": {
-			"version": "7.2.0",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"has-flag": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/chokidar": {
-			"version": "4.0.3",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"readdirp": "^4.0.1"
-			},
-			"engines": {
-				"node": ">= 14.16.0"
-			},
-			"funding": {
-				"url": "https://paulmillr.com/funding/"
-			}
-		},
-		"node_modules/chrome-trace-event": {
-			"version": "1.0.4",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6.0"
-			}
-		},
-		"node_modules/cliui": {
-			"version": "8.0.1",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"string-width": "^4.2.0",
-				"strip-ansi": "^6.0.1",
-				"wrap-ansi": "^7.0.0"
-			},
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/clone-deep": {
-			"version": "4.0.1",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"is-plain-object": "^2.0.4",
-				"kind-of": "^6.0.2",
-				"shallow-clone": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/color-convert": {
-			"version": "2.0.1",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"color-name": "~1.1.4"
-			},
-			"engines": {
-				"node": ">=7.0.0"
-			}
-		},
-		"node_modules/color-name": {
-			"version": "1.1.4",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/commander": {
-			"version": "14.0.2",
-			"resolved": "https://registry.npmjs.org/commander/-/commander-14.0.2.tgz",
-			"integrity": "sha512-TywoWNNRbhoD0BXs1P3ZEScW8W5iKrnbithIl0YH+uCmBd0QpPOA8yc82DS3BIE5Ma6FnBVUsJ7wVUDz4dvOWQ==",
-			"license": "MIT",
-			"engines": {
-				"node": ">=20"
-			}
-		},
-		"node_modules/concat-map": {
-			"version": "0.0.1",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/concurrently": {
-			"version": "9.2.1",
-			"resolved": "https://registry.npmjs.org/concurrently/-/concurrently-9.2.1.tgz",
-			"integrity": "sha512-fsfrO0MxV64Znoy8/l1vVIjjHa29SZyyqPgQBwhiDcaW8wJc2W3XWVOGx4M3oJBnv/zdUZIIp1gDeS98GzP8Ng==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"chalk": "4.1.2",
-				"rxjs": "7.8.2",
-				"shell-quote": "1.8.3",
-				"supports-color": "8.1.1",
-				"tree-kill": "1.2.2",
-				"yargs": "17.7.2"
-			},
-			"bin": {
-				"conc": "dist/bin/concurrently.js",
-				"concurrently": "dist/bin/concurrently.js"
-			},
-			"engines": {
-				"node": ">=18"
-			},
-			"funding": {
-				"url": "https://github.com/open-cli-tools/concurrently?sponsor=1"
-			}
-		},
-		"node_modules/crelt": {
-			"version": "1.0.6",
-			"resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.6.tgz",
-			"integrity": "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==",
-			"dev": true,
-			"license": "MIT",
-			"peer": true
-		},
-		"node_modules/cross-spawn": {
-			"version": "7.0.6",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"path-key": "^3.1.0",
-				"shebang-command": "^2.0.0",
-				"which": "^2.0.1"
-			},
-			"engines": {
-				"node": ">= 8"
-			}
-		},
-		"node_modules/css-loader": {
-			"version": "7.1.2",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"icss-utils": "^5.1.0",
-				"postcss": "^8.4.33",
-				"postcss-modules-extract-imports": "^3.1.0",
-				"postcss-modules-local-by-default": "^4.0.5",
-				"postcss-modules-scope": "^3.2.0",
-				"postcss-modules-values": "^4.0.0",
-				"postcss-value-parser": "^4.2.0",
-				"semver": "^7.5.4"
-			},
-			"engines": {
-				"node": ">= 18.12.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
-			},
-			"peerDependencies": {
-				"@rspack/core": "0.x || 1.x",
-				"webpack": "^5.27.0"
-			},
-			"peerDependenciesMeta": {
-				"@rspack/core": {
-					"optional": true
-				},
-				"webpack": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/cssesc": {
-			"version": "3.0.0",
-			"dev": true,
-			"license": "MIT",
-			"bin": {
-				"cssesc": "bin/cssesc"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/date-fns": {
-			"version": "4.1.0",
-			"dev": true,
-			"license": "MIT",
-			"funding": {
-				"type": "github",
-				"url": "https://github.com/sponsors/kossnocorp"
-			}
-		},
-		"node_modules/debug": {
-			"version": "4.4.0",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"ms": "^2.1.3"
-			},
-			"engines": {
-				"node": ">=6.0"
-			},
-			"peerDependenciesMeta": {
-				"supports-color": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/deep-is": {
-			"version": "0.1.4",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/detect-libc": {
-			"version": "1.0.3",
-			"dev": true,
-			"license": "Apache-2.0",
-			"optional": true,
-			"bin": {
-				"detect-libc": "bin/detect-libc.js"
-			},
-			"engines": {
-				"node": ">=0.10"
-			}
-		},
-		"node_modules/dunder-proto": {
-			"version": "1.0.1",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"call-bind-apply-helpers": "^1.0.1",
-				"es-errors": "^1.3.0",
-				"gopd": "^1.2.0"
-			},
-			"engines": {
-				"node": ">= 0.4"
-			}
-		},
-		"node_modules/electron-to-chromium": {
-			"version": "1.5.127",
-			"dev": true,
-			"license": "ISC"
-		},
-		"node_modules/emoji-regex": {
-			"version": "8.0.0",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/emojis-list": {
-			"version": "3.0.0",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">= 4"
-			}
-		},
-		"node_modules/enhanced-resolve": {
-			"version": "5.18.1",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"graceful-fs": "^4.2.4",
-				"tapable": "^2.2.0"
-			},
-			"engines": {
-				"node": ">=10.13.0"
-			}
-		},
-		"node_modules/envinfo": {
-			"version": "7.14.0",
-			"dev": true,
-			"license": "MIT",
-			"bin": {
-				"envinfo": "dist/cli.js"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/es-define-property": {
-			"version": "1.0.1",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">= 0.4"
-			}
-		},
-		"node_modules/es-errors": {
-			"version": "1.3.0",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">= 0.4"
-			}
-		},
-		"node_modules/es-module-lexer": {
-			"version": "1.6.0",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/es-object-atoms": {
-			"version": "1.1.1",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"es-errors": "^1.3.0"
-			},
-			"engines": {
-				"node": ">= 0.4"
-			}
-		},
-		"node_modules/esbuild": {
-			"version": "0.25.9",
-			"resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.9.tgz",
-			"integrity": "sha512-CRbODhYyQx3qp7ZEwzxOk4JBqmD/seJrzPa/cGjY1VtIn5E09Oi9/dB4JwctnfZ8Q8iT7rioVv5k/FNT/uf54g==",
-			"dev": true,
-			"hasInstallScript": true,
-			"license": "MIT",
-			"bin": {
-				"esbuild": "bin/esbuild"
-			},
-			"engines": {
-				"node": ">=18"
-			},
-			"optionalDependencies": {
-				"@esbuild/aix-ppc64": "0.25.9",
-				"@esbuild/android-arm": "0.25.9",
-				"@esbuild/android-arm64": "0.25.9",
-				"@esbuild/android-x64": "0.25.9",
-				"@esbuild/darwin-arm64": "0.25.9",
-				"@esbuild/darwin-x64": "0.25.9",
-				"@esbuild/freebsd-arm64": "0.25.9",
-				"@esbuild/freebsd-x64": "0.25.9",
-				"@esbuild/linux-arm": "0.25.9",
-				"@esbuild/linux-arm64": "0.25.9",
-				"@esbuild/linux-ia32": "0.25.9",
-				"@esbuild/linux-loong64": "0.25.9",
-				"@esbuild/linux-mips64el": "0.25.9",
-				"@esbuild/linux-ppc64": "0.25.9",
-				"@esbuild/linux-riscv64": "0.25.9",
-				"@esbuild/linux-s390x": "0.25.9",
-				"@esbuild/linux-x64": "0.25.9",
-				"@esbuild/netbsd-arm64": "0.25.9",
-				"@esbuild/netbsd-x64": "0.25.9",
-				"@esbuild/openbsd-arm64": "0.25.9",
-				"@esbuild/openbsd-x64": "0.25.9",
-				"@esbuild/openharmony-arm64": "0.25.9",
-				"@esbuild/sunos-x64": "0.25.9",
-				"@esbuild/win32-arm64": "0.25.9",
-				"@esbuild/win32-ia32": "0.25.9",
-				"@esbuild/win32-x64": "0.25.9"
-			}
-		},
-		"node_modules/escalade": {
-			"version": "3.2.0",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/escape-string-regexp": {
-			"version": "4.0.0",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/eslint": {
-			"version": "9.38.0",
-			"resolved": "https://registry.npmjs.org/eslint/-/eslint-9.38.0.tgz",
-			"integrity": "sha512-t5aPOpmtJcZcz5UJyY2GbvpDlsK5E8JqRqoKtfiKE3cNh437KIqfJr3A3AKf5k64NPx6d0G3dno6XDY05PqPtw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@eslint-community/eslint-utils": "^4.8.0",
-				"@eslint-community/regexpp": "^4.12.1",
-				"@eslint/config-array": "^0.21.1",
-				"@eslint/config-helpers": "^0.4.1",
-				"@eslint/core": "^0.16.0",
-				"@eslint/eslintrc": "^3.3.1",
-				"@eslint/js": "9.38.0",
-				"@eslint/plugin-kit": "^0.4.0",
-				"@humanfs/node": "^0.16.6",
-				"@humanwhocodes/module-importer": "^1.0.1",
-				"@humanwhocodes/retry": "^0.4.2",
-				"@types/estree": "^1.0.6",
-				"ajv": "^6.12.4",
-				"chalk": "^4.0.0",
-				"cross-spawn": "^7.0.6",
-				"debug": "^4.3.2",
-				"escape-string-regexp": "^4.0.0",
-				"eslint-scope": "^8.4.0",
-				"eslint-visitor-keys": "^4.2.1",
-				"espree": "^10.4.0",
-				"esquery": "^1.5.0",
-				"esutils": "^2.0.2",
-				"fast-deep-equal": "^3.1.3",
-				"file-entry-cache": "^8.0.0",
-				"find-up": "^5.0.0",
-				"glob-parent": "^6.0.2",
-				"ignore": "^5.2.0",
-				"imurmurhash": "^0.1.4",
-				"is-glob": "^4.0.0",
-				"json-stable-stringify-without-jsonify": "^1.0.1",
-				"lodash.merge": "^4.6.2",
-				"minimatch": "^3.1.2",
-				"natural-compare": "^1.4.0",
-				"optionator": "^0.9.3"
-			},
-			"bin": {
-				"eslint": "bin/eslint.js"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"url": "https://eslint.org/donate"
-			},
-			"peerDependencies": {
-				"jiti": "*"
-			},
-			"peerDependenciesMeta": {
-				"jiti": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/eslint-plugin-unused-imports": {
-			"version": "4.1.4",
-			"dev": true,
-			"license": "MIT",
-			"peerDependencies": {
-				"@typescript-eslint/eslint-plugin": "^8.0.0-0 || ^7.0.0 || ^6.0.0 || ^5.0.0",
-				"eslint": "^9.0.0 || ^8.0.0"
-			},
-			"peerDependenciesMeta": {
-				"@typescript-eslint/eslint-plugin": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/eslint-scope": {
-			"version": "8.4.0",
-			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.4.0.tgz",
-			"integrity": "sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==",
-			"dev": true,
-			"license": "BSD-2-Clause",
-			"dependencies": {
-				"esrecurse": "^4.3.0",
-				"estraverse": "^5.2.0"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/eslint"
-			}
-		},
-		"node_modules/eslint-visitor-keys": {
-			"version": "4.2.1",
-			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
-			"integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
-			"dev": true,
-			"license": "Apache-2.0",
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/eslint"
-			}
-		},
-		"node_modules/espree": {
-			"version": "10.4.0",
-			"resolved": "https://registry.npmjs.org/espree/-/espree-10.4.0.tgz",
-			"integrity": "sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==",
-			"dev": true,
-			"license": "BSD-2-Clause",
-			"dependencies": {
-				"acorn": "^8.15.0",
-				"acorn-jsx": "^5.3.2",
-				"eslint-visitor-keys": "^4.2.1"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"url": "https://opencollective.com/eslint"
-			}
-		},
-		"node_modules/esquery": {
-			"version": "1.6.0",
-			"dev": true,
-			"license": "BSD-3-Clause",
-			"dependencies": {
-				"estraverse": "^5.1.0"
-			},
-			"engines": {
-				"node": ">=0.10"
-			}
-		},
-		"node_modules/esrecurse": {
-			"version": "4.3.0",
-			"dev": true,
-			"license": "BSD-2-Clause",
-			"dependencies": {
-				"estraverse": "^5.2.0"
-			},
-			"engines": {
-				"node": ">=4.0"
-			}
-		},
-		"node_modules/estraverse": {
-			"version": "5.3.0",
-			"dev": true,
-			"license": "BSD-2-Clause",
-			"engines": {
-				"node": ">=4.0"
-			}
-		},
-		"node_modules/esutils": {
-			"version": "2.0.3",
-			"dev": true,
-			"license": "BSD-2-Clause",
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/eventemitter3": {
-			"version": "5.0.1",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/events": {
-			"version": "3.3.0",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=0.8.x"
-			}
-		},
-		"node_modules/fast-deep-equal": {
-			"version": "3.1.3",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/fast-glob": {
-			"version": "3.3.3",
-			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
-			"integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@nodelib/fs.stat": "^2.0.2",
-				"@nodelib/fs.walk": "^1.2.3",
-				"glob-parent": "^5.1.2",
-				"merge2": "^1.3.0",
-				"micromatch": "^4.0.8"
-			},
-			"engines": {
-				"node": ">=8.6.0"
-			}
-		},
-		"node_modules/fast-glob/node_modules/glob-parent": {
-			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-			"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"is-glob": "^4.0.1"
-			},
-			"engines": {
-				"node": ">= 6"
-			}
-		},
-		"node_modules/fast-json-stable-stringify": {
-			"version": "2.1.0",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/fast-levenshtein": {
-			"version": "2.0.6",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/fast-uri": {
-			"version": "3.0.6",
-			"dev": true,
-			"funding": [
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/fastify"
-				},
-				{
-					"type": "opencollective",
-					"url": "https://opencollective.com/fastify"
-				}
-			],
-			"license": "BSD-3-Clause"
-		},
-		"node_modules/fastest-levenshtein": {
-			"version": "1.0.16",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">= 4.9.1"
-			}
-		},
-		"node_modules/fastq": {
-			"version": "1.19.1",
-			"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz",
-			"integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"reusify": "^1.0.4"
-			}
-		},
-		"node_modules/file-entry-cache": {
-			"version": "8.0.0",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"flat-cache": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=16.0.0"
-			}
-		},
-		"node_modules/file-loader": {
-			"version": "6.2.0",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"loader-utils": "^2.0.0",
-				"schema-utils": "^3.0.0"
-			},
-			"engines": {
-				"node": ">= 10.13.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
-			},
-			"peerDependencies": {
-				"webpack": "^4.0.0 || ^5.0.0"
-			}
-		},
-		"node_modules/fill-range": {
-			"version": "7.1.1",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"to-regex-range": "^5.0.1"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/find-up": {
-			"version": "5.0.0",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"locate-path": "^6.0.0",
-				"path-exists": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/flat": {
-			"version": "5.0.2",
-			"dev": true,
-			"license": "BSD-3-Clause",
-			"bin": {
-				"flat": "cli.js"
-			}
-		},
-		"node_modules/flat-cache": {
-			"version": "4.0.1",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"flatted": "^3.2.9",
-				"keyv": "^4.5.4"
-			},
-			"engines": {
-				"node": ">=16"
-			}
-		},
-		"node_modules/flatted": {
-			"version": "3.3.3",
-			"dev": true,
-			"license": "ISC"
-		},
-		"node_modules/fs-extra": {
-			"version": "11.3.0",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"graceful-fs": "^4.2.0",
-				"jsonfile": "^6.0.1",
-				"universalify": "^2.0.0"
-			},
-			"engines": {
-				"node": ">=14.14"
-			}
-		},
-		"node_modules/fsevents": {
-			"version": "2.3.3",
-			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-			"integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-			"dev": true,
-			"hasInstallScript": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"darwin"
-			],
-			"engines": {
-				"node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-			}
-		},
-		"node_modules/function-bind": {
-			"version": "1.1.2",
-			"dev": true,
-			"license": "MIT",
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/get-caller-file": {
-			"version": "2.0.5",
-			"dev": true,
-			"license": "ISC",
-			"engines": {
-				"node": "6.* || 8.* || >= 10.*"
-			}
-		},
-		"node_modules/get-intrinsic": {
-			"version": "1.3.0",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"call-bind-apply-helpers": "^1.0.2",
-				"es-define-property": "^1.0.1",
-				"es-errors": "^1.3.0",
-				"es-object-atoms": "^1.1.1",
-				"function-bind": "^1.1.2",
-				"get-proto": "^1.0.1",
-				"gopd": "^1.2.0",
-				"has-symbols": "^1.1.0",
-				"hasown": "^2.0.2",
-				"math-intrinsics": "^1.1.0"
-			},
-			"engines": {
-				"node": ">= 0.4"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/get-proto": {
-			"version": "1.0.1",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"dunder-proto": "^1.0.1",
-				"es-object-atoms": "^1.0.0"
-			},
-			"engines": {
-				"node": ">= 0.4"
-			}
-		},
-		"node_modules/get-tsconfig": {
-			"version": "4.10.1",
-			"resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.10.1.tgz",
-			"integrity": "sha512-auHyJ4AgMz7vgS8Hp3N6HXSmlMdUyhSUrfBF16w153rxtLIEOE+HGqaBppczZvnHLqQJfiHotCYpNhl0lUROFQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"resolve-pkg-maps": "^1.0.0"
-			},
-			"funding": {
-				"url": "https://github.com/privatenumber/get-tsconfig?sponsor=1"
-			}
-		},
-		"node_modules/glob-parent": {
-			"version": "6.0.2",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"is-glob": "^4.0.3"
-			},
-			"engines": {
-				"node": ">=10.13.0"
-			}
-		},
-		"node_modules/glob-to-regexp": {
-			"version": "0.4.1",
-			"dev": true,
-			"license": "BSD-2-Clause"
-		},
-		"node_modules/globals": {
-			"version": "14.0.0",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=18"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/gopd": {
-			"version": "1.2.0",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">= 0.4"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/graceful-fs": {
-			"version": "4.2.11",
-			"dev": true,
-			"license": "ISC"
-		},
-		"node_modules/graphemer": {
-			"version": "1.4.0",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/has-flag": {
-			"version": "4.0.0",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/has-symbols": {
-			"version": "1.1.0",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">= 0.4"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/hasown": {
-			"version": "2.0.2",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"function-bind": "^1.1.2"
-			},
-			"engines": {
-				"node": ">= 0.4"
-			}
-		},
-		"node_modules/icss-utils": {
-			"version": "5.1.0",
-			"dev": true,
-			"license": "ISC",
-			"engines": {
-				"node": "^10 || ^12 || >= 14"
-			},
-			"peerDependencies": {
-				"postcss": "^8.1.0"
-			}
-		},
-		"node_modules/ignore": {
-			"version": "5.3.2",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">= 4"
-			}
-		},
-		"node_modules/immutable": {
-			"version": "5.1.1",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/import-fresh": {
-			"version": "3.3.1",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"parent-module": "^1.0.0",
-				"resolve-from": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=6"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/import-local": {
-			"version": "3.2.0",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"pkg-dir": "^4.2.0",
-				"resolve-cwd": "^3.0.0"
-			},
-			"bin": {
-				"import-local-fixture": "fixtures/cli.js"
-			},
-			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/imurmurhash": {
-			"version": "0.1.4",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=0.8.19"
-			}
-		},
-		"node_modules/interpret": {
-			"version": "3.1.1",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=10.13.0"
-			}
-		},
-		"node_modules/is-core-module": {
-			"version": "2.16.1",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"hasown": "^2.0.2"
-			},
-			"engines": {
-				"node": ">= 0.4"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/is-extglob": {
-			"version": "2.1.1",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/is-fullwidth-code-point": {
-			"version": "3.0.0",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/is-glob": {
-			"version": "4.0.3",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"is-extglob": "^2.1.1"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/is-number": {
-			"version": "7.0.0",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=0.12.0"
-			}
-		},
-		"node_modules/is-plain-object": {
-			"version": "2.0.4",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"isobject": "^3.0.1"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/isexe": {
-			"version": "2.0.0",
-			"dev": true,
-			"license": "ISC"
-		},
-		"node_modules/isobject": {
-			"version": "3.0.1",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/js-yaml": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
-			"integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"argparse": "^2.0.1"
-			},
-			"bin": {
-				"js-yaml": "bin/js-yaml.js"
-			}
-		},
-		"node_modules/json-buffer": {
-			"version": "3.0.1",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/json-parse-even-better-errors": {
-			"version": "2.3.1",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/json-schema-traverse": {
-			"version": "0.4.1",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/json-stable-stringify-without-jsonify": {
-			"version": "1.0.1",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/json5": {
-			"version": "2.2.3",
-			"dev": true,
-			"license": "MIT",
-			"bin": {
-				"json5": "lib/cli.js"
-			},
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/jsonfile": {
-			"version": "6.1.0",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"universalify": "^2.0.0"
-			},
-			"optionalDependencies": {
-				"graceful-fs": "^4.1.6"
-			}
-		},
-		"node_modules/keyv": {
-			"version": "4.5.4",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"json-buffer": "3.0.1"
-			}
-		},
-		"node_modules/kind-of": {
-			"version": "6.0.3",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/levn": {
-			"version": "0.4.1",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"prelude-ls": "^1.2.1",
-				"type-check": "~0.4.0"
-			},
-			"engines": {
-				"node": ">= 0.8.0"
-			}
-		},
-		"node_modules/loader-runner": {
-			"version": "4.3.0",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6.11.5"
-			}
-		},
-		"node_modules/loader-utils": {
-			"version": "2.0.4",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"big.js": "^5.2.2",
-				"emojis-list": "^3.0.0",
-				"json5": "^2.1.2"
-			},
-			"engines": {
-				"node": ">=8.9.0"
-			}
-		},
-		"node_modules/local-client-cli": {
-			"resolved": "local-client-cli",
-			"link": true
-		},
-		"node_modules/locate-path": {
-			"version": "6.0.0",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"p-locate": "^5.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/lodash.merge": {
-			"version": "4.6.2",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/math-intrinsics": {
-			"version": "1.1.0",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">= 0.4"
-			}
-		},
-		"node_modules/merge-stream": {
-			"version": "2.0.0",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/merge2": {
-			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-			"integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">= 8"
-			}
-		},
-		"node_modules/micromatch": {
-			"version": "4.0.8",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"braces": "^3.0.3",
-				"picomatch": "^2.3.1"
-			},
-			"engines": {
-				"node": ">=8.6"
-			}
-		},
-		"node_modules/mime-db": {
-			"version": "1.52.0",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">= 0.6"
-			}
-		},
-		"node_modules/mime-types": {
-			"version": "2.1.35",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"mime-db": "1.52.0"
-			},
-			"engines": {
-				"node": ">= 0.6"
-			}
-		},
-		"node_modules/mini-css-extract-plugin": {
-			"version": "2.9.2",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"schema-utils": "^4.0.0",
-				"tapable": "^2.2.1"
-			},
-			"engines": {
-				"node": ">= 12.13.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
-			},
-			"peerDependencies": {
-				"webpack": "^5.0.0"
-			}
-		},
-		"node_modules/mini-css-extract-plugin/node_modules/ajv": {
-			"version": "8.17.1",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"fast-deep-equal": "^3.1.3",
-				"fast-uri": "^3.0.1",
-				"json-schema-traverse": "^1.0.0",
-				"require-from-string": "^2.0.2"
-			},
-			"funding": {
-				"type": "github",
-				"url": "https://github.com/sponsors/epoberezkin"
-			}
-		},
-		"node_modules/mini-css-extract-plugin/node_modules/ajv-keywords": {
-			"version": "5.1.0",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"fast-deep-equal": "^3.1.3"
-			},
-			"peerDependencies": {
-				"ajv": "^8.8.2"
-			}
-		},
-		"node_modules/mini-css-extract-plugin/node_modules/json-schema-traverse": {
-			"version": "1.0.0",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/mini-css-extract-plugin/node_modules/schema-utils": {
-			"version": "4.3.0",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@types/json-schema": "^7.0.9",
-				"ajv": "^8.9.0",
-				"ajv-formats": "^2.1.1",
-				"ajv-keywords": "^5.1.0"
-			},
-			"engines": {
-				"node": ">= 10.13.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
-			}
-		},
-		"node_modules/minimatch": {
-			"version": "3.1.2",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"brace-expansion": "^1.1.7"
-			},
-			"engines": {
-				"node": "*"
-			}
-		},
-		"node_modules/moment": {
-			"version": "2.29.4",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": "*"
-			}
-		},
-		"node_modules/ms": {
-			"version": "2.1.3",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/nanoid": {
-			"version": "3.3.11",
-			"dev": true,
-			"funding": [
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/ai"
-				}
-			],
-			"license": "MIT",
-			"bin": {
-				"nanoid": "bin/nanoid.cjs"
-			},
-			"engines": {
-				"node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-			}
-		},
-		"node_modules/natural-compare": {
-			"version": "1.4.0",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/neo-async": {
-			"version": "2.6.2",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/node-addon-api": {
-			"version": "7.1.1",
-			"dev": true,
-			"license": "MIT",
-			"optional": true
-		},
-		"node_modules/node-gyp-build": {
-			"version": "4.8.4",
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"peer": true,
-			"bin": {
-				"node-gyp-build": "bin.js",
-				"node-gyp-build-optional": "optional.js",
-				"node-gyp-build-test": "build-test.js"
-			}
-		},
-		"node_modules/node-releases": {
-			"version": "2.0.19",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/npm-check-updates": {
-			"version": "19.1.1",
-			"resolved": "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-19.1.1.tgz",
-			"integrity": "sha512-vy/uNbaK6Xfj/QzM8OXeALZak67E0uHjUlbdT1YGy4bdj0xlBU6AVd+8bscY8vlDpyzL6Y7mxcrX8kzEDeEpNg==",
-			"dev": true,
-			"license": "Apache-2.0",
-			"bin": {
-				"ncu": "build/cli.js",
-				"npm-check-updates": "build/cli.js"
-			},
-			"engines": {
-				"node": ">=20.0.0",
-				"npm": ">=8.12.1"
-			}
-		},
-		"node_modules/object-inspect": {
-			"version": "1.13.4",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">= 0.4"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/obsidian": {
-			"version": "1.10.2",
-			"resolved": "https://registry.npmjs.org/obsidian/-/obsidian-1.10.2.tgz",
-			"integrity": "sha512-bX03YCHf06OTzI/D+QK71ajCPCmwr/cjxzlVXjQa10DjK5iHRWhtJJpp83arSCyayFMp23u+UHcY7hxcEx2Mvg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@types/codemirror": "5.60.8",
-				"moment": "2.29.4"
-			},
-			"peerDependencies": {
-				"@codemirror/state": "6.5.0",
-				"@codemirror/view": "6.38.1"
-			}
-		},
-		"node_modules/optionator": {
-			"version": "0.9.4",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"deep-is": "^0.1.3",
-				"fast-levenshtein": "^2.0.6",
-				"levn": "^0.4.1",
-				"prelude-ls": "^1.2.1",
-				"type-check": "^0.4.0",
-				"word-wrap": "^1.2.5"
-			},
-			"engines": {
-				"node": ">= 0.8.0"
-			}
-		},
-		"node_modules/p-limit": {
-			"version": "3.1.0",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"yocto-queue": "^0.1.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/p-locate": {
-			"version": "5.0.0",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"p-limit": "^3.0.2"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/p-queue": {
-			"version": "8.1.0",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"eventemitter3": "^5.0.1",
-				"p-timeout": "^6.1.2"
-			},
-			"engines": {
-				"node": ">=18"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/p-timeout": {
-			"version": "6.1.4",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=14.16"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/p-try": {
-			"version": "2.2.0",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/parent-module": {
-			"version": "1.0.1",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"callsites": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/path-exists": {
-			"version": "4.0.0",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/path-key": {
-			"version": "3.1.1",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/path-parse": {
-			"version": "1.0.7",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/picocolors": {
-			"version": "1.1.1",
-			"dev": true,
-			"license": "ISC"
-		},
-		"node_modules/picomatch": {
-			"version": "2.3.1",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=8.6"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/jonschlinkert"
-			}
-		},
-		"node_modules/pkg-dir": {
-			"version": "4.2.0",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"find-up": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/pkg-dir/node_modules/find-up": {
-			"version": "4.1.0",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"locate-path": "^5.0.0",
-				"path-exists": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/pkg-dir/node_modules/locate-path": {
-			"version": "5.0.0",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"p-locate": "^4.1.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/pkg-dir/node_modules/p-limit": {
-			"version": "2.3.0",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"p-try": "^2.0.0"
-			},
-			"engines": {
-				"node": ">=6"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/pkg-dir/node_modules/p-locate": {
-			"version": "4.1.0",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"p-limit": "^2.2.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/postcss": {
-			"version": "8.5.3",
-			"dev": true,
-			"funding": [
-				{
-					"type": "opencollective",
-					"url": "https://opencollective.com/postcss/"
-				},
-				{
-					"type": "tidelift",
-					"url": "https://tidelift.com/funding/github/npm/postcss"
-				},
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/ai"
-				}
-			],
-			"license": "MIT",
-			"dependencies": {
-				"nanoid": "^3.3.8",
-				"picocolors": "^1.1.1",
-				"source-map-js": "^1.2.1"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >=14"
-			}
-		},
-		"node_modules/postcss-modules-extract-imports": {
-			"version": "3.1.0",
-			"dev": true,
-			"license": "ISC",
-			"engines": {
-				"node": "^10 || ^12 || >= 14"
-			},
-			"peerDependencies": {
-				"postcss": "^8.1.0"
-			}
-		},
-		"node_modules/postcss-modules-local-by-default": {
-			"version": "4.2.0",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"icss-utils": "^5.0.0",
-				"postcss-selector-parser": "^7.0.0",
-				"postcss-value-parser": "^4.1.0"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >= 14"
-			},
-			"peerDependencies": {
-				"postcss": "^8.1.0"
-			}
-		},
-		"node_modules/postcss-modules-scope": {
-			"version": "3.2.1",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"postcss-selector-parser": "^7.0.0"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >= 14"
-			},
-			"peerDependencies": {
-				"postcss": "^8.1.0"
-			}
-		},
-		"node_modules/postcss-modules-values": {
-			"version": "4.0.0",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"icss-utils": "^5.0.0"
-			},
-			"engines": {
-				"node": "^10 || ^12 || >= 14"
-			},
-			"peerDependencies": {
-				"postcss": "^8.1.0"
-			}
-		},
-		"node_modules/postcss-selector-parser": {
-			"version": "7.1.0",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"cssesc": "^3.0.0",
-				"util-deprecate": "^1.0.2"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/postcss-value-parser": {
-			"version": "4.2.0",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/prelude-ls": {
-			"version": "1.2.1",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">= 0.8.0"
-			}
-		},
-		"node_modules/prettier": {
-			"version": "3.6.2",
-			"resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz",
-			"integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==",
-			"dev": true,
-			"license": "MIT",
-			"bin": {
-				"prettier": "bin/prettier.cjs"
-			},
-			"engines": {
-				"node": ">=14"
-			},
-			"funding": {
-				"url": "https://github.com/prettier/prettier?sponsor=1"
-			}
-		},
-		"node_modules/punycode": {
-			"version": "2.3.1",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/qs": {
-			"version": "6.14.0",
-			"dev": true,
-			"license": "BSD-3-Clause",
-			"dependencies": {
-				"side-channel": "^1.1.0"
-			},
-			"engines": {
-				"node": ">=0.6"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/queue-microtask": {
-			"version": "1.2.3",
-			"resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-			"integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-			"dev": true,
-			"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"
-		},
-		"node_modules/randombytes": {
-			"version": "2.1.0",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"safe-buffer": "^5.1.0"
-			}
-		},
-		"node_modules/readdirp": {
-			"version": "4.1.2",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">= 14.18.0"
-			},
-			"funding": {
-				"type": "individual",
-				"url": "https://paulmillr.com/funding/"
-			}
-		},
-		"node_modules/rechoir": {
-			"version": "0.8.0",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"resolve": "^1.20.0"
-			},
-			"engines": {
-				"node": ">= 10.13.0"
-			}
-		},
-		"node_modules/reconcile-text": {
-			"version": "0.8.0",
-			"resolved": "https://registry.npmjs.org/reconcile-text/-/reconcile-text-0.8.0.tgz",
-			"integrity": "sha512-evskVha3YgpP2ZelsFxP9t7CuKnwE7TrsH3FdrH2mfKbzjUWiNF7scHXsFbFS921lmFlAOB94DHNAWPvL34Mqg==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/regex-parser": {
-			"version": "2.3.1",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/require-directory": {
-			"version": "2.1.1",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/require-from-string": {
-			"version": "2.0.2",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/resolve": {
-			"version": "1.22.10",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"is-core-module": "^2.16.0",
-				"path-parse": "^1.0.7",
-				"supports-preserve-symlinks-flag": "^1.0.0"
-			},
-			"bin": {
-				"resolve": "bin/resolve"
-			},
-			"engines": {
-				"node": ">= 0.4"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/resolve-cwd": {
-			"version": "3.0.0",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"resolve-from": "^5.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/resolve-cwd/node_modules/resolve-from": {
-			"version": "5.0.0",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/resolve-from": {
-			"version": "4.0.0",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/resolve-pkg-maps": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz",
-			"integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==",
-			"dev": true,
-			"license": "MIT",
-			"funding": {
-				"url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1"
-			}
-		},
-		"node_modules/resolve-url-loader": {
-			"version": "5.0.0",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"adjust-sourcemap-loader": "^4.0.0",
-				"convert-source-map": "^1.7.0",
-				"loader-utils": "^2.0.0",
-				"postcss": "^8.2.14",
-				"source-map": "0.6.1"
-			},
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/resolve-url-loader/node_modules/convert-source-map": {
-			"version": "1.9.0",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/reusify": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz",
-			"integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"iojs": ">=1.0.0",
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/run-parallel": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-			"integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-			"dev": true,
-			"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": {
-				"queue-microtask": "^1.2.2"
-			}
-		},
-		"node_modules/rxjs": {
-			"version": "7.8.2",
-			"dev": true,
-			"license": "Apache-2.0",
-			"dependencies": {
-				"tslib": "^2.1.0"
-			}
-		},
-		"node_modules/safe-buffer": {
-			"version": "5.2.1",
-			"dev": true,
-			"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"
-		},
-		"node_modules/sass": {
-			"version": "1.91.0",
-			"resolved": "https://registry.npmjs.org/sass/-/sass-1.91.0.tgz",
-			"integrity": "sha512-aFOZHGf+ur+bp1bCHZ+u8otKGh77ZtmFyXDo4tlYvT7PWql41Kwd8wdkPqhhT+h2879IVblcHFglIMofsFd1EA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"chokidar": "^4.0.0",
-				"immutable": "^5.0.2",
-				"source-map-js": ">=0.6.2 <2.0.0"
-			},
-			"bin": {
-				"sass": "sass.js"
-			},
-			"engines": {
-				"node": ">=14.0.0"
-			},
-			"optionalDependencies": {
-				"@parcel/watcher": "^2.4.1"
-			}
-		},
-		"node_modules/sass-loader": {
-			"version": "16.0.6",
-			"resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-16.0.6.tgz",
-			"integrity": "sha512-sglGzId5gmlfxNs4gK2U3h7HlVRfx278YK6Ono5lwzuvi1jxig80YiuHkaDBVsYIKFhx8wN7XSCI0M2IDS/3qA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"neo-async": "^2.6.2"
-			},
-			"engines": {
-				"node": ">= 18.12.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
-			},
-			"peerDependencies": {
-				"@rspack/core": "0.x || 1.x",
-				"node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0",
-				"sass": "^1.3.0",
-				"sass-embedded": "*",
-				"webpack": "^5.0.0"
-			},
-			"peerDependenciesMeta": {
-				"@rspack/core": {
-					"optional": true
-				},
-				"node-sass": {
-					"optional": true
-				},
-				"sass": {
-					"optional": true
-				},
-				"sass-embedded": {
-					"optional": true
-				},
-				"webpack": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/schema-utils": {
-			"version": "3.3.0",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@types/json-schema": "^7.0.8",
-				"ajv": "^6.12.5",
-				"ajv-keywords": "^3.5.2"
-			},
-			"engines": {
-				"node": ">= 10.13.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
-			}
-		},
-		"node_modules/semver": {
-			"version": "7.7.2",
-			"dev": true,
-			"license": "ISC",
-			"bin": {
-				"semver": "bin/semver.js"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/serialize-javascript": {
-			"version": "6.0.2",
-			"dev": true,
-			"license": "BSD-3-Clause",
-			"dependencies": {
-				"randombytes": "^2.1.0"
-			}
-		},
-		"node_modules/shallow-clone": {
-			"version": "3.0.1",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"kind-of": "^6.0.2"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/shebang-command": {
-			"version": "2.0.0",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"shebang-regex": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/shebang-regex": {
-			"version": "3.0.0",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/shell-quote": {
-			"version": "1.8.3",
-			"resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.3.tgz",
-			"integrity": "sha512-ObmnIF4hXNg1BqhnHmgbDETF8dLPCggZWBjkQfhZpbszZnYur5DUljTcCHii5LC3J5E0yeO/1LIMyH+UvHQgyw==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">= 0.4"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/side-channel": {
-			"version": "1.1.0",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"es-errors": "^1.3.0",
-				"object-inspect": "^1.13.3",
-				"side-channel-list": "^1.0.0",
-				"side-channel-map": "^1.0.1",
-				"side-channel-weakmap": "^1.0.2"
-			},
-			"engines": {
-				"node": ">= 0.4"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/side-channel-list": {
-			"version": "1.0.0",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"es-errors": "^1.3.0",
-				"object-inspect": "^1.13.3"
-			},
-			"engines": {
-				"node": ">= 0.4"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/side-channel-map": {
-			"version": "1.0.1",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"call-bound": "^1.0.2",
-				"es-errors": "^1.3.0",
-				"get-intrinsic": "^1.2.5",
-				"object-inspect": "^1.13.3"
-			},
-			"engines": {
-				"node": ">= 0.4"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/side-channel-weakmap": {
-			"version": "1.0.2",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"call-bound": "^1.0.2",
-				"es-errors": "^1.3.0",
-				"get-intrinsic": "^1.2.5",
-				"object-inspect": "^1.13.3",
-				"side-channel-map": "^1.0.1"
-			},
-			"engines": {
-				"node": ">= 0.4"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/source-map": {
-			"version": "0.6.1",
-			"dev": true,
-			"license": "BSD-3-Clause",
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/source-map-js": {
-			"version": "1.2.1",
-			"dev": true,
-			"license": "BSD-3-Clause",
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/string-width": {
-			"version": "4.2.3",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"emoji-regex": "^8.0.0",
-				"is-fullwidth-code-point": "^3.0.0",
-				"strip-ansi": "^6.0.1"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/strip-ansi": {
-			"version": "6.0.1",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"ansi-regex": "^5.0.1"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
-		"node_modules/strip-json-comments": {
-			"version": "3.1.1",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"node_modules/style-mod": {
-			"version": "4.1.3",
-			"resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.1.3.tgz",
-			"integrity": "sha512-i/n8VsZydrugj3Iuzll8+x/00GH2vnYsk1eomD8QiRrSAeW6ItbCQDtfXCeJHd0iwiNagqjQkvpvREEPtW3IoQ==",
-			"dev": true,
-			"license": "MIT",
-			"peer": true
-		},
-		"node_modules/supports-color": {
-			"version": "8.1.1",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"has-flag": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/supports-color?sponsor=1"
-			}
-		},
-		"node_modules/supports-preserve-symlinks-flag": {
-			"version": "1.0.0",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">= 0.4"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/sync-client": {
-			"resolved": "sync-client",
-			"link": true
-		},
-		"node_modules/tapable": {
-			"version": "2.2.1",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6"
-			}
-		},
-		"node_modules/terser": {
-			"version": "5.39.0",
-			"dev": true,
-			"license": "BSD-2-Clause",
-			"dependencies": {
-				"@jridgewell/source-map": "^0.3.3",
-				"acorn": "^8.8.2",
-				"commander": "^2.20.0",
-				"source-map-support": "~0.5.20"
-			},
-			"bin": {
-				"terser": "bin/terser"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/terser-webpack-plugin": {
-			"version": "5.3.14",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jridgewell/trace-mapping": "^0.3.25",
-				"jest-worker": "^27.4.5",
-				"schema-utils": "^4.3.0",
-				"serialize-javascript": "^6.0.2",
-				"terser": "^5.31.1"
-			},
-			"engines": {
-				"node": ">= 10.13.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
-			},
-			"peerDependencies": {
-				"webpack": "^5.1.0"
-			},
-			"peerDependenciesMeta": {
-				"@swc/core": {
-					"optional": true
-				},
-				"esbuild": {
-					"optional": true
-				},
-				"uglify-js": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/terser-webpack-plugin/node_modules/ajv": {
-			"version": "8.17.1",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"fast-deep-equal": "^3.1.3",
-				"fast-uri": "^3.0.1",
-				"json-schema-traverse": "^1.0.0",
-				"require-from-string": "^2.0.2"
-			},
-			"funding": {
-				"type": "github",
-				"url": "https://github.com/sponsors/epoberezkin"
-			}
-		},
-		"node_modules/terser-webpack-plugin/node_modules/ajv-keywords": {
-			"version": "5.1.0",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"fast-deep-equal": "^3.1.3"
-			},
-			"peerDependencies": {
-				"ajv": "^8.8.2"
-			}
-		},
-		"node_modules/terser-webpack-plugin/node_modules/jest-worker": {
-			"version": "27.5.1",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@types/node": "*",
-				"merge-stream": "^2.0.0",
-				"supports-color": "^8.0.0"
-			},
-			"engines": {
-				"node": ">= 10.13.0"
-			}
-		},
-		"node_modules/terser-webpack-plugin/node_modules/json-schema-traverse": {
-			"version": "1.0.0",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/terser-webpack-plugin/node_modules/schema-utils": {
-			"version": "4.3.0",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@types/json-schema": "^7.0.9",
-				"ajv": "^8.9.0",
-				"ajv-formats": "^2.1.1",
-				"ajv-keywords": "^5.1.0"
-			},
-			"engines": {
-				"node": ">= 10.13.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
-			}
-		},
-		"node_modules/terser/node_modules/commander": {
-			"version": "2.20.3",
-			"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-			"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/terser/node_modules/source-map-support": {
-			"version": "0.5.21",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"buffer-from": "^1.0.0",
-				"source-map": "^0.6.0"
-			}
-		},
-		"node_modules/test-client": {
-			"resolved": "test-client",
-			"link": true
-		},
-		"node_modules/to-regex-range": {
-			"version": "5.0.1",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"is-number": "^7.0.0"
-			},
-			"engines": {
-				"node": ">=8.0"
-			}
-		},
-		"node_modules/tree-kill": {
-			"version": "1.2.2",
-			"dev": true,
-			"license": "MIT",
-			"bin": {
-				"tree-kill": "cli.js"
-			}
-		},
-		"node_modules/ts-api-utils": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.1.0.tgz",
-			"integrity": "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=18.12"
-			},
-			"peerDependencies": {
-				"typescript": ">=4.8.4"
-			}
-		},
-		"node_modules/ts-loader": {
-			"version": "9.5.2",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"chalk": "^4.1.0",
-				"enhanced-resolve": "^5.0.0",
-				"micromatch": "^4.0.0",
-				"semver": "^7.3.4",
-				"source-map": "^0.7.4"
-			},
-			"engines": {
-				"node": ">=12.0.0"
-			},
-			"peerDependencies": {
-				"typescript": "*",
-				"webpack": "^5.0.0"
-			}
-		},
-		"node_modules/ts-loader/node_modules/source-map": {
-			"version": "0.7.4",
-			"dev": true,
-			"license": "BSD-3-Clause",
-			"engines": {
-				"node": ">= 8"
-			}
-		},
-		"node_modules/tslib": {
-			"version": "2.8.1",
-			"dev": true,
-			"license": "0BSD"
-		},
-		"node_modules/tsx": {
-			"version": "4.20.6",
-			"resolved": "https://registry.npmjs.org/tsx/-/tsx-4.20.6.tgz",
-			"integrity": "sha512-ytQKuwgmrrkDTFP4LjR0ToE2nqgy886GpvRSpU0JAnrdBYppuY5rLkRUYPU1yCryb24SsKBTL/hlDQAEFVwtZg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"esbuild": "~0.25.0",
-				"get-tsconfig": "^4.7.5"
-			},
-			"bin": {
-				"tsx": "dist/cli.mjs"
-			},
-			"engines": {
-				"node": ">=18.0.0"
-			},
-			"optionalDependencies": {
-				"fsevents": "~2.3.3"
-			}
-		},
-		"node_modules/type-check": {
-			"version": "0.4.0",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"prelude-ls": "^1.2.1"
-			},
-			"engines": {
-				"node": ">= 0.8.0"
-			}
-		},
-		"node_modules/typescript": {
-			"version": "5.8.3",
-			"dev": true,
-			"license": "Apache-2.0",
-			"bin": {
-				"tsc": "bin/tsc",
-				"tsserver": "bin/tsserver"
-			},
-			"engines": {
-				"node": ">=14.17"
-			}
-		},
-		"node_modules/typescript-eslint": {
-			"version": "8.41.0",
-			"resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.41.0.tgz",
-			"integrity": "sha512-n66rzs5OBXW3SFSnZHr2T685q1i4ODm2nulFJhMZBotaTavsS8TrI3d7bDlRSs9yWo7HmyWrN9qDu14Qv7Y0Dw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@typescript-eslint/eslint-plugin": "8.41.0",
-				"@typescript-eslint/parser": "8.41.0",
-				"@typescript-eslint/typescript-estree": "8.41.0",
-				"@typescript-eslint/utils": "8.41.0"
-			},
-			"engines": {
-				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/typescript-eslint"
-			},
-			"peerDependencies": {
-				"eslint": "^8.57.0 || ^9.0.0",
-				"typescript": ">=4.8.4 <6.0.0"
-			}
-		},
-		"node_modules/undici-types": {
-			"version": "7.14.0",
-			"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.14.0.tgz",
-			"integrity": "sha512-QQiYxHuyZ9gQUIrmPo3IA+hUl4KYk8uSA7cHrcKd/l3p1OTpZcM0Tbp9x7FAtXdAYhlasd60ncPpgu6ihG6TOA==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/universalify": {
-			"version": "2.0.1",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">= 10.0.0"
-			}
-		},
-		"node_modules/update-browserslist-db": {
-			"version": "1.1.3",
-			"dev": true,
-			"funding": [
-				{
-					"type": "opencollective",
-					"url": "https://opencollective.com/browserslist"
-				},
-				{
-					"type": "tidelift",
-					"url": "https://tidelift.com/funding/github/npm/browserslist"
-				},
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/ai"
-				}
-			],
-			"license": "MIT",
-			"dependencies": {
-				"escalade": "^3.2.0",
-				"picocolors": "^1.1.1"
-			},
-			"bin": {
-				"update-browserslist-db": "cli.js"
-			},
-			"peerDependencies": {
-				"browserslist": ">= 4.21.0"
-			}
-		},
-		"node_modules/uri-js": {
-			"version": "4.4.1",
-			"dev": true,
-			"license": "BSD-2-Clause",
-			"dependencies": {
-				"punycode": "^2.1.0"
-			}
-		},
-		"node_modules/url": {
-			"version": "0.11.4",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"punycode": "^1.4.1",
-				"qs": "^6.12.3"
-			},
-			"engines": {
-				"node": ">= 0.4"
-			}
-		},
-		"node_modules/url/node_modules/punycode": {
-			"version": "1.4.1",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/utf-8-validate": {
-			"version": "6.0.5",
-			"dev": true,
-			"hasInstallScript": true,
-			"license": "MIT",
-			"optional": true,
-			"peer": true,
-			"dependencies": {
-				"node-gyp-build": "^4.3.0"
-			},
-			"engines": {
-				"node": ">=6.14.2"
-			}
-		},
-		"node_modules/util-deprecate": {
-			"version": "1.0.2",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/uuid": {
-			"version": "13.0.0",
-			"resolved": "https://registry.npmjs.org/uuid/-/uuid-13.0.0.tgz",
-			"integrity": "sha512-XQegIaBTVUjSHliKqcnFqYypAd4S+WCYt5NIeRs6w/UAry7z8Y9j5ZwRRL4kzq9U3sD6v+85er9FvkEaBpji2w==",
-			"dev": true,
-			"funding": [
-				"https://github.com/sponsors/broofa",
-				"https://github.com/sponsors/ctavan"
-			],
-			"license": "MIT",
-			"bin": {
-				"uuid": "dist-node/bin/uuid"
-			}
-		},
-		"node_modules/vault-link-obsidian-plugin": {
-			"resolved": "obsidian-plugin",
-			"link": true
-		},
-		"node_modules/w3c-keyname": {
-			"version": "2.2.8",
-			"resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.8.tgz",
-			"integrity": "sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==",
-			"dev": true,
-			"license": "MIT",
-			"peer": true
-		},
-		"node_modules/watchpack": {
-			"version": "2.4.2",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"glob-to-regexp": "^0.4.1",
-				"graceful-fs": "^4.1.2"
-			},
-			"engines": {
-				"node": ">=10.13.0"
-			}
-		},
-		"node_modules/webpack": {
-			"version": "5.99.9",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@types/eslint-scope": "^3.7.7",
-				"@types/estree": "^1.0.6",
-				"@types/json-schema": "^7.0.15",
-				"@webassemblyjs/ast": "^1.14.1",
-				"@webassemblyjs/wasm-edit": "^1.14.1",
-				"@webassemblyjs/wasm-parser": "^1.14.1",
-				"acorn": "^8.14.0",
-				"browserslist": "^4.24.0",
-				"chrome-trace-event": "^1.0.2",
-				"enhanced-resolve": "^5.17.1",
-				"es-module-lexer": "^1.2.1",
-				"eslint-scope": "5.1.1",
-				"events": "^3.2.0",
-				"glob-to-regexp": "^0.4.1",
-				"graceful-fs": "^4.2.11",
-				"json-parse-even-better-errors": "^2.3.1",
-				"loader-runner": "^4.2.0",
-				"mime-types": "^2.1.27",
-				"neo-async": "^2.6.2",
-				"schema-utils": "^4.3.2",
-				"tapable": "^2.1.1",
-				"terser-webpack-plugin": "^5.3.11",
-				"watchpack": "^2.4.1",
-				"webpack-sources": "^3.2.3"
-			},
-			"bin": {
-				"webpack": "bin/webpack.js"
-			},
-			"engines": {
-				"node": ">=10.13.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
-			},
-			"peerDependenciesMeta": {
-				"webpack-cli": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/webpack-cli": {
-			"version": "6.0.1",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@discoveryjs/json-ext": "^0.6.1",
-				"@webpack-cli/configtest": "^3.0.1",
-				"@webpack-cli/info": "^3.0.1",
-				"@webpack-cli/serve": "^3.0.1",
-				"colorette": "^2.0.14",
-				"commander": "^12.1.0",
-				"cross-spawn": "^7.0.3",
-				"envinfo": "^7.14.0",
-				"fastest-levenshtein": "^1.0.12",
-				"import-local": "^3.0.2",
-				"interpret": "^3.1.1",
-				"rechoir": "^0.8.0",
-				"webpack-merge": "^6.0.1"
-			},
-			"bin": {
-				"webpack-cli": "bin/cli.js"
-			},
-			"engines": {
-				"node": ">=18.12.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
-			},
-			"peerDependencies": {
-				"webpack": "^5.82.0"
-			},
-			"peerDependenciesMeta": {
-				"webpack-bundle-analyzer": {
-					"optional": true
-				},
-				"webpack-dev-server": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/webpack-cli/node_modules/colorette": {
-			"version": "2.0.20",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/webpack-cli/node_modules/commander": {
-			"version": "12.1.0",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/webpack-merge": {
-			"version": "6.0.1",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"clone-deep": "^4.0.1",
-				"flat": "^5.0.2",
-				"wildcard": "^2.0.1"
-			},
-			"engines": {
-				"node": ">=18.0.0"
-			}
-		},
-		"node_modules/webpack-sources": {
-			"version": "3.2.3",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=10.13.0"
-			}
-		},
-		"node_modules/webpack/node_modules/ajv": {
-			"version": "8.17.1",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"fast-deep-equal": "^3.1.3",
-				"fast-uri": "^3.0.1",
-				"json-schema-traverse": "^1.0.0",
-				"require-from-string": "^2.0.2"
-			},
-			"funding": {
-				"type": "github",
-				"url": "https://github.com/sponsors/epoberezkin"
-			}
-		},
-		"node_modules/webpack/node_modules/ajv-keywords": {
-			"version": "5.1.0",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"fast-deep-equal": "^3.1.3"
-			},
-			"peerDependencies": {
-				"ajv": "^8.8.2"
-			}
-		},
-		"node_modules/webpack/node_modules/eslint-scope": {
-			"version": "5.1.1",
-			"dev": true,
-			"license": "BSD-2-Clause",
-			"dependencies": {
-				"esrecurse": "^4.3.0",
-				"estraverse": "^4.1.1"
-			},
-			"engines": {
-				"node": ">=8.0.0"
-			}
-		},
-		"node_modules/webpack/node_modules/estraverse": {
-			"version": "4.3.0",
-			"dev": true,
-			"license": "BSD-2-Clause",
-			"engines": {
-				"node": ">=4.0"
-			}
-		},
-		"node_modules/webpack/node_modules/json-schema-traverse": {
-			"version": "1.0.0",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/webpack/node_modules/schema-utils": {
-			"version": "4.3.2",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@types/json-schema": "^7.0.9",
-				"ajv": "^8.9.0",
-				"ajv-formats": "^2.1.1",
-				"ajv-keywords": "^5.1.0"
-			},
-			"engines": {
-				"node": ">= 10.13.0"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/webpack"
-			}
-		},
-		"node_modules/which": {
-			"version": "2.0.2",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"isexe": "^2.0.0"
-			},
-			"bin": {
-				"node-which": "bin/node-which"
-			},
-			"engines": {
-				"node": ">= 8"
-			}
-		},
-		"node_modules/wildcard": {
-			"version": "2.0.1",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/word-wrap": {
-			"version": "1.2.5",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/wrap-ansi": {
-			"version": "7.0.0",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"ansi-styles": "^4.0.0",
-				"string-width": "^4.1.0",
-				"strip-ansi": "^6.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-			}
-		},
-		"node_modules/ws": {
-			"version": "8.18.3",
-			"resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz",
-			"integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=10.0.0"
-			},
-			"peerDependencies": {
-				"bufferutil": "^4.0.1",
-				"utf-8-validate": ">=5.0.2"
-			},
-			"peerDependenciesMeta": {
-				"bufferutil": {
-					"optional": true
-				},
-				"utf-8-validate": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/y18n": {
-			"version": "5.0.8",
-			"dev": true,
-			"license": "ISC",
-			"engines": {
-				"node": ">=10"
-			}
-		},
-		"node_modules/yargs": {
-			"version": "17.7.2",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"cliui": "^8.0.1",
-				"escalade": "^3.1.1",
-				"get-caller-file": "^2.0.5",
-				"require-directory": "^2.1.1",
-				"string-width": "^4.2.3",
-				"y18n": "^5.0.5",
-				"yargs-parser": "^21.1.1"
-			},
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/yargs-parser": {
-			"version": "21.1.1",
-			"dev": true,
-			"license": "ISC",
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/yocto-queue": {
-			"version": "0.1.0",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
-		"obsidian-plugin": {
-			"name": "vault-link-obsidian-plugin",
-			"version": "0.12.0",
-			"license": "MIT",
-			"devDependencies": {
-				"@types/node": "^24.8.1",
-				"css-loader": "^7.1.2",
-				"date-fns": "^4.1.0",
-				"file-loader": "^6.2.0",
-				"fs-extra": "^11.3.0",
-				"mini-css-extract-plugin": "^2.9.2",
-				"obsidian": "1.10.2",
-				"reconcile-text": "^0.8.0",
-				"resolve-url-loader": "^5.0.0",
-				"sass": "^1.91.0",
-				"sass-loader": "^16.0.6",
-				"sync-client": "file:../sync-client",
-				"terser-webpack-plugin": "^5.3.14",
-				"ts-loader": "^9.5.2",
-				"tslib": "2.8.1",
-				"tsx": "^4.20.6",
-				"typescript": "5.8.3",
-				"url": "^0.11.4",
-				"webpack": "^5.99.9",
-				"webpack-cli": "^6.0.1"
-			}
-		},
-		"sync-client": {
-			"version": "0.12.0",
-			"devDependencies": {
-				"@sentry/browser": "^10.8.0",
-				"@types/node": "^24.8.1",
-				"byte-base64": "^1.1.0",
-				"minimatch": "^10.0.1",
-				"p-queue": "^8.1.0",
-				"reconcile-text": "^0.8.0",
-				"ts-loader": "^9.5.2",
-				"tslib": "2.8.1",
-				"tsx": "^4.20.6",
-				"typescript": "5.8.3",
-				"uuid": "^13.0.0",
-				"webpack": "^5.99.9",
-				"webpack-cli": "^6.0.1",
-				"webpack-merge": "^6.0.1",
-				"ws": "^8.18.3"
-			}
-		},
-		"sync-client/node_modules/brace-expansion": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-			"integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"balanced-match": "^1.0.0"
-			}
-		},
-		"sync-client/node_modules/minimatch": {
-			"version": "10.0.1",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"brace-expansion": "^2.0.1"
-			},
-			"engines": {
-				"node": "20 || >=22"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			}
-		},
-		"test-client": {
-			"version": "0.12.0",
-			"bin": {
-				"test-client": "dist/cli.js"
-			},
-			"devDependencies": {
-				"@types/node": "^24.8.1",
-				"sync-client": "file:../sync-client",
-				"ts-loader": "^9.5.2",
-				"tslib": "2.8.1",
-				"tsx": "^4.20.6",
-				"typescript": "5.8.3",
-				"uuid": "^13.0.0",
-				"webpack": "^5.99.9",
-				"webpack-cli": "^6.0.1"
-			}
-		}
-	}
+    "name": "my-workspace",
+    "lockfileVersion": 3,
+    "requires": true,
+    "packages": {
+        "": {
+            "name": "my-workspace",
+            "workspaces": [
+                "sync-client",
+                "obsidian-plugin",
+                "test-client",
+                "local-client-cli"
+            ],
+            "devDependencies": {
+                "concurrently": "^9.2.1",
+                "eclint": "^2.8.1",
+                "eslint": "9.38.0",
+                "eslint-plugin-unused-imports": "^4.1.4",
+                "npm-check-updates": "^19.1.1",
+                "prettier": "^3.6.2",
+                "typescript-eslint": "8.41.0"
+            }
+        },
+        "local-client-cli": {
+            "version": "0.12.0",
+            "dependencies": {
+                "commander": "^14.0.2"
+            },
+            "bin": {
+                "vaultlink": "dist/cli.js"
+            },
+            "devDependencies": {
+                "@types/node": "^24.8.1",
+                "sync-client": "file:../sync-client",
+                "ts-loader": "^9.5.2",
+                "tslib": "2.8.1",
+                "tsx": "^4.20.6",
+                "typescript": "5.8.3",
+                "webpack": "^5.99.9",
+                "webpack-cli": "^6.0.1"
+            }
+        },
+        "node_modules/@codemirror/state": {
+            "version": "6.5.0",
+            "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.5.0.tgz",
+            "integrity": "sha512-MwBHVK60IiIHDcoMet78lxt6iw5gJOGSbNbOIVBHWVXIH4/Nq1+GQgLLGgI1KlnN86WDXsPudVaqYHKBIx7Eyw==",
+            "dev": true,
+            "license": "MIT",
+            "peer": true,
+            "dependencies": {
+                "@marijn/find-cluster-break": "^1.0.0"
+            }
+        },
+        "node_modules/@codemirror/view": {
+            "version": "6.38.1",
+            "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.38.1.tgz",
+            "integrity": "sha512-RmTOkE7hRU3OVREqFVITWHz6ocgBjv08GoePscAakgVQfciA3SGCEk7mb9IzwW61cKKmlTpHXG6DUE5Ubx+MGQ==",
+            "dev": true,
+            "license": "MIT",
+            "peer": true,
+            "dependencies": {
+                "@codemirror/state": "^6.5.0",
+                "crelt": "^1.0.6",
+                "style-mod": "^4.1.0",
+                "w3c-keyname": "^2.2.4"
+            }
+        },
+        "node_modules/@discoveryjs/json-ext": {
+            "version": "0.6.3",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=14.17.0"
+            }
+        },
+        "node_modules/@esbuild/aix-ppc64": {
+            "version": "0.25.9",
+            "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.9.tgz",
+            "integrity": "sha512-OaGtL73Jck6pBKjNIe24BnFE6agGl+6KxDtTfHhy1HmhthfKouEcOhqpSL64K4/0WCtbKFLOdzD/44cJ4k9opA==",
+            "cpu": [
+                "ppc64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "aix"
+            ],
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@esbuild/android-arm": {
+            "version": "0.25.9",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.9.tgz",
+            "integrity": "sha512-5WNI1DaMtxQ7t7B6xa572XMXpHAaI/9Hnhk8lcxF4zVN4xstUgTlvuGDorBguKEnZO70qwEcLpfifMLoxiPqHQ==",
+            "cpu": [
+                "arm"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "android"
+            ],
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@esbuild/android-arm64": {
+            "version": "0.25.9",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.9.tgz",
+            "integrity": "sha512-IDrddSmpSv51ftWslJMvl3Q2ZT98fUSL2/rlUXuVqRXHCs5EUF1/f+jbjF5+NG9UffUDMCiTyh8iec7u8RlTLg==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "android"
+            ],
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@esbuild/android-x64": {
+            "version": "0.25.9",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.9.tgz",
+            "integrity": "sha512-I853iMZ1hWZdNllhVZKm34f4wErd4lMyeV7BLzEExGEIZYsOzqDWDf+y082izYUE8gtJnYHdeDpN/6tUdwvfiw==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "android"
+            ],
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@esbuild/darwin-arm64": {
+            "version": "0.25.9",
+            "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.9.tgz",
+            "integrity": "sha512-XIpIDMAjOELi/9PB30vEbVMs3GV1v2zkkPnuyRRURbhqjyzIINwj+nbQATh4H9GxUgH1kFsEyQMxwiLFKUS6Rg==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@esbuild/darwin-x64": {
+            "version": "0.25.9",
+            "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.9.tgz",
+            "integrity": "sha512-jhHfBzjYTA1IQu8VyrjCX4ApJDnH+ez+IYVEoJHeqJm9VhG9Dh2BYaJritkYK3vMaXrf7Ogr/0MQ8/MeIefsPQ==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@esbuild/freebsd-arm64": {
+            "version": "0.25.9",
+            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.9.tgz",
+            "integrity": "sha512-z93DmbnY6fX9+KdD4Ue/H6sYs+bhFQJNCPZsi4XWJoYblUqT06MQUdBCpcSfuiN72AbqeBFu5LVQTjfXDE2A6Q==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "freebsd"
+            ],
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@esbuild/freebsd-x64": {
+            "version": "0.25.9",
+            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.9.tgz",
+            "integrity": "sha512-mrKX6H/vOyo5v71YfXWJxLVxgy1kyt1MQaD8wZJgJfG4gq4DpQGpgTB74e5yBeQdyMTbgxp0YtNj7NuHN0PoZg==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "freebsd"
+            ],
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@esbuild/linux-arm": {
+            "version": "0.25.9",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.9.tgz",
+            "integrity": "sha512-HBU2Xv78SMgaydBmdor38lg8YDnFKSARg1Q6AT0/y2ezUAKiZvc211RDFHlEZRFNRVhcMamiToo7bDx3VEOYQw==",
+            "cpu": [
+                "arm"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@esbuild/linux-arm64": {
+            "version": "0.25.9",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.9.tgz",
+            "integrity": "sha512-BlB7bIcLT3G26urh5Dmse7fiLmLXnRlopw4s8DalgZ8ef79Jj4aUcYbk90g8iCa2467HX8SAIidbL7gsqXHdRw==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@esbuild/linux-ia32": {
+            "version": "0.25.9",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.9.tgz",
+            "integrity": "sha512-e7S3MOJPZGp2QW6AK6+Ly81rC7oOSerQ+P8L0ta4FhVi+/j/v2yZzx5CqqDaWjtPFfYz21Vi1S0auHrap3Ma3A==",
+            "cpu": [
+                "ia32"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@esbuild/linux-loong64": {
+            "version": "0.25.9",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.9.tgz",
+            "integrity": "sha512-Sbe10Bnn0oUAB2AalYztvGcK+o6YFFA/9829PhOCUS9vkJElXGdphz0A3DbMdP8gmKkqPmPcMJmJOrI3VYB1JQ==",
+            "cpu": [
+                "loong64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@esbuild/linux-mips64el": {
+            "version": "0.25.9",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.9.tgz",
+            "integrity": "sha512-YcM5br0mVyZw2jcQeLIkhWtKPeVfAerES5PvOzaDxVtIyZ2NUBZKNLjC5z3/fUlDgT6w89VsxP2qzNipOaaDyA==",
+            "cpu": [
+                "mips64el"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@esbuild/linux-ppc64": {
+            "version": "0.25.9",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.9.tgz",
+            "integrity": "sha512-++0HQvasdo20JytyDpFvQtNrEsAgNG2CY1CLMwGXfFTKGBGQT3bOeLSYE2l1fYdvML5KUuwn9Z8L1EWe2tzs1w==",
+            "cpu": [
+                "ppc64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@esbuild/linux-riscv64": {
+            "version": "0.25.9",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.9.tgz",
+            "integrity": "sha512-uNIBa279Y3fkjV+2cUjx36xkx7eSjb8IvnL01eXUKXez/CBHNRw5ekCGMPM0BcmqBxBcdgUWuUXmVWwm4CH9kg==",
+            "cpu": [
+                "riscv64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@esbuild/linux-s390x": {
+            "version": "0.25.9",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.9.tgz",
+            "integrity": "sha512-Mfiphvp3MjC/lctb+7D287Xw1DGzqJPb/J2aHHcHxflUo+8tmN/6d4k6I2yFR7BVo5/g7x2Monq4+Yew0EHRIA==",
+            "cpu": [
+                "s390x"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@esbuild/linux-x64": {
+            "version": "0.25.9",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.9.tgz",
+            "integrity": "sha512-iSwByxzRe48YVkmpbgoxVzn76BXjlYFXC7NvLYq+b+kDjyyk30J0JY47DIn8z1MO3K0oSl9fZoRmZPQI4Hklzg==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@esbuild/netbsd-arm64": {
+            "version": "0.25.9",
+            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.9.tgz",
+            "integrity": "sha512-9jNJl6FqaUG+COdQMjSCGW4QiMHH88xWbvZ+kRVblZsWrkXlABuGdFJ1E9L7HK+T0Yqd4akKNa/lO0+jDxQD4Q==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "netbsd"
+            ],
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@esbuild/netbsd-x64": {
+            "version": "0.25.9",
+            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.9.tgz",
+            "integrity": "sha512-RLLdkflmqRG8KanPGOU7Rpg829ZHu8nFy5Pqdi9U01VYtG9Y0zOG6Vr2z4/S+/3zIyOxiK6cCeYNWOFR9QP87g==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "netbsd"
+            ],
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@esbuild/openbsd-arm64": {
+            "version": "0.25.9",
+            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.9.tgz",
+            "integrity": "sha512-YaFBlPGeDasft5IIM+CQAhJAqS3St3nJzDEgsgFixcfZeyGPCd6eJBWzke5piZuZ7CtL656eOSYKk4Ls2C0FRQ==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "openbsd"
+            ],
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@esbuild/openbsd-x64": {
+            "version": "0.25.9",
+            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.9.tgz",
+            "integrity": "sha512-1MkgTCuvMGWuqVtAvkpkXFmtL8XhWy+j4jaSO2wxfJtilVCi0ZE37b8uOdMItIHz4I6z1bWWtEX4CJwcKYLcuA==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "openbsd"
+            ],
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@esbuild/openharmony-arm64": {
+            "version": "0.25.9",
+            "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.9.tgz",
+            "integrity": "sha512-4Xd0xNiMVXKh6Fa7HEJQbrpP3m3DDn43jKxMjxLLRjWnRsfxjORYJlXPO4JNcXtOyfajXorRKY9NkOpTHptErg==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "openharmony"
+            ],
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@esbuild/sunos-x64": {
+            "version": "0.25.9",
+            "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.9.tgz",
+            "integrity": "sha512-WjH4s6hzo00nNezhp3wFIAfmGZ8U7KtrJNlFMRKxiI9mxEK1scOMAaa9i4crUtu+tBr+0IN6JCuAcSBJZfnphw==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "sunos"
+            ],
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@esbuild/win32-arm64": {
+            "version": "0.25.9",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.9.tgz",
+            "integrity": "sha512-mGFrVJHmZiRqmP8xFOc6b84/7xa5y5YvR1x8djzXpJBSv/UsNK6aqec+6JDjConTgvvQefdGhFDAs2DLAds6gQ==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@esbuild/win32-ia32": {
+            "version": "0.25.9",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.9.tgz",
+            "integrity": "sha512-b33gLVU2k11nVx1OhX3C8QQP6UHQK4ZtN56oFWvVXvz2VkDoe6fbG8TOgHFxEvqeqohmRnIHe5A1+HADk4OQww==",
+            "cpu": [
+                "ia32"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@esbuild/win32-x64": {
+            "version": "0.25.9",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.9.tgz",
+            "integrity": "sha512-PPOl1mi6lpLNQxnGoyAfschAodRFYXJ+9fs6WHXz7CSWKbOqiMZsubC+BQsVKuul+3vKLuwTHsS2c2y9EoKwxQ==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@eslint-community/eslint-utils": {
+            "version": "4.9.0",
+            "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.0.tgz",
+            "integrity": "sha512-ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "eslint-visitor-keys": "^3.4.3"
+            },
+            "engines": {
+                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/eslint"
+            },
+            "peerDependencies": {
+                "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
+            }
+        },
+        "node_modules/@eslint-community/eslint-utils/node_modules/eslint-visitor-keys": {
+            "version": "3.4.3",
+            "dev": true,
+            "license": "Apache-2.0",
+            "engines": {
+                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/eslint"
+            }
+        },
+        "node_modules/@eslint-community/regexpp": {
+            "version": "4.12.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
+            }
+        },
+        "node_modules/@eslint/config-array": {
+            "version": "0.21.1",
+            "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.1.tgz",
+            "integrity": "sha512-aw1gNayWpdI/jSYVgzN5pL0cfzU02GT3NBpeT/DXbx1/1x7ZKxFPd9bwrzygx/qiwIQiJ1sw/zD8qY/kRvlGHA==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@eslint/object-schema": "^2.1.7",
+                "debug": "^4.3.1",
+                "minimatch": "^3.1.2"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            }
+        },
+        "node_modules/@eslint/config-helpers": {
+            "version": "0.4.1",
+            "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.4.1.tgz",
+            "integrity": "sha512-csZAzkNhsgwb0I/UAV6/RGFTbiakPCf0ZrGmrIxQpYvGZ00PhTkSnyKNolphgIvmnJeGw6rcGVEXfTzUnFuEvw==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@eslint/core": "^0.16.0"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            }
+        },
+        "node_modules/@eslint/core": {
+            "version": "0.16.0",
+            "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.16.0.tgz",
+            "integrity": "sha512-nmC8/totwobIiFcGkDza3GIKfAw1+hLiYVrh3I1nIomQ8PEr5cxg34jnkmGawul/ep52wGRAcyeDCNtWKSOj4Q==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@types/json-schema": "^7.0.15"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            }
+        },
+        "node_modules/@eslint/eslintrc": {
+            "version": "3.3.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ajv": "^6.12.4",
+                "debug": "^4.3.2",
+                "espree": "^10.0.1",
+                "globals": "^14.0.0",
+                "ignore": "^5.2.0",
+                "import-fresh": "^3.2.1",
+                "js-yaml": "^4.1.0",
+                "minimatch": "^3.1.2",
+                "strip-json-comments": "^3.1.1"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/eslint"
+            }
+        },
+        "node_modules/@eslint/js": {
+            "version": "9.38.0",
+            "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.38.0.tgz",
+            "integrity": "sha512-UZ1VpFvXf9J06YG9xQBdnzU+kthors6KjhMAl6f4gH4usHyh31rUf2DLGInT8RFYIReYXNSydgPY0V2LuWgl7A==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "url": "https://eslint.org/donate"
+            }
+        },
+        "node_modules/@eslint/object-schema": {
+            "version": "2.1.7",
+            "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.7.tgz",
+            "integrity": "sha512-VtAOaymWVfZcmZbp6E2mympDIHvyjXs/12LqWYjVw6qjrfF+VK+fyG33kChz3nnK+SU5/NeHOqrTEHS8sXO3OA==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            }
+        },
+        "node_modules/@eslint/plugin-kit": {
+            "version": "0.4.0",
+            "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.4.0.tgz",
+            "integrity": "sha512-sB5uyeq+dwCWyPi31B2gQlVlo+j5brPlWx4yZBrEaRo/nhdDE8Xke1gsGgtiBdaBTxuTkceLVuVt/pclrasb0A==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@eslint/core": "^0.16.0",
+                "levn": "^0.4.1"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            }
+        },
+        "node_modules/@humanfs/core": {
+            "version": "0.19.1",
+            "dev": true,
+            "license": "Apache-2.0",
+            "engines": {
+                "node": ">=18.18.0"
+            }
+        },
+        "node_modules/@humanfs/node": {
+            "version": "0.16.6",
+            "dev": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@humanfs/core": "^0.19.1",
+                "@humanwhocodes/retry": "^0.3.0"
+            },
+            "engines": {
+                "node": ">=18.18.0"
+            }
+        },
+        "node_modules/@humanfs/node/node_modules/@humanwhocodes/retry": {
+            "version": "0.3.1",
+            "dev": true,
+            "license": "Apache-2.0",
+            "engines": {
+                "node": ">=18.18"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/nzakas"
+            }
+        },
+        "node_modules/@humanwhocodes/module-importer": {
+            "version": "1.0.1",
+            "dev": true,
+            "license": "Apache-2.0",
+            "engines": {
+                "node": ">=12.22"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/nzakas"
+            }
+        },
+        "node_modules/@humanwhocodes/retry": {
+            "version": "0.4.2",
+            "dev": true,
+            "license": "Apache-2.0",
+            "engines": {
+                "node": ">=18.18"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/nzakas"
+            }
+        },
+        "node_modules/@jridgewell/gen-mapping": {
+            "version": "0.3.13",
+            "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz",
+            "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@jridgewell/sourcemap-codec": "^1.5.0",
+                "@jridgewell/trace-mapping": "^0.3.24"
+            }
+        },
+        "node_modules/@jridgewell/resolve-uri": {
+            "version": "3.1.2",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6.0.0"
+            }
+        },
+        "node_modules/@jridgewell/source-map": {
+            "version": "0.3.6",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@jridgewell/gen-mapping": "^0.3.5",
+                "@jridgewell/trace-mapping": "^0.3.25"
+            }
+        },
+        "node_modules/@jridgewell/sourcemap-codec": {
+            "version": "1.5.0",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@jridgewell/trace-mapping": {
+            "version": "0.3.30",
+            "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.30.tgz",
+            "integrity": "sha512-GQ7Nw5G2lTu/BtHTKfXhKHok2WGetd4XYcVKGx00SjAk8GMwgJM3zr6zORiPGuOE+/vkc90KtTosSSvaCjKb2Q==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@jridgewell/resolve-uri": "^3.1.0",
+                "@jridgewell/sourcemap-codec": "^1.4.14"
+            }
+        },
+        "node_modules/@marijn/find-cluster-break": {
+            "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==",
+            "dev": true,
+            "license": "MIT",
+            "peer": true
+        },
+        "node_modules/@nodelib/fs.scandir": {
+            "version": "2.1.5",
+            "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+            "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@nodelib/fs.stat": "2.0.5",
+                "run-parallel": "^1.1.9"
+            },
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/@nodelib/fs.stat": {
+            "version": "2.0.5",
+            "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+            "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/@nodelib/fs.walk": {
+            "version": "1.2.8",
+            "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+            "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@nodelib/fs.scandir": "2.1.5",
+                "fastq": "^1.6.0"
+            },
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/@parcel/watcher": {
+            "version": "2.5.1",
+            "dev": true,
+            "hasInstallScript": true,
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "detect-libc": "^1.0.3",
+                "is-glob": "^4.0.3",
+                "micromatch": "^4.0.5",
+                "node-addon-api": "^7.0.0"
+            },
+            "engines": {
+                "node": ">= 10.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            },
+            "optionalDependencies": {
+                "@parcel/watcher-android-arm64": "2.5.1",
+                "@parcel/watcher-darwin-arm64": "2.5.1",
+                "@parcel/watcher-darwin-x64": "2.5.1",
+                "@parcel/watcher-freebsd-x64": "2.5.1",
+                "@parcel/watcher-linux-arm-glibc": "2.5.1",
+                "@parcel/watcher-linux-arm-musl": "2.5.1",
+                "@parcel/watcher-linux-arm64-glibc": "2.5.1",
+                "@parcel/watcher-linux-arm64-musl": "2.5.1",
+                "@parcel/watcher-linux-x64-glibc": "2.5.1",
+                "@parcel/watcher-linux-x64-musl": "2.5.1",
+                "@parcel/watcher-win32-arm64": "2.5.1",
+                "@parcel/watcher-win32-ia32": "2.5.1",
+                "@parcel/watcher-win32-x64": "2.5.1"
+            }
+        },
+        "node_modules/@parcel/watcher-linux-x64-glibc": {
+            "version": "2.5.1",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 10.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
+        "node_modules/@parcel/watcher-linux-x64-musl": {
+            "version": "2.5.1",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 10.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
+        "node_modules/@sentry-internal/browser-utils": {
+            "version": "10.8.0",
+            "resolved": "https://registry.npmjs.org/@sentry-internal/browser-utils/-/browser-utils-10.8.0.tgz",
+            "integrity": "sha512-FaQX9eefc8sh3h3ZQy16U73KiH0xgDldXnrFiWK6OeWg8X4bJpnYbLqEi96LgHiQhjnnz+UQP1GDzH5oFuu5fA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@sentry/core": "10.8.0"
+            },
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@sentry-internal/feedback": {
+            "version": "10.8.0",
+            "resolved": "https://registry.npmjs.org/@sentry-internal/feedback/-/feedback-10.8.0.tgz",
+            "integrity": "sha512-n7SqgFQItq4QSPG7bCjcZcIwK6AatKnnmSDJ/i6e8jXNIyLwkEuY2NyvTXACxVdO/kafGD5VmrwnTo3Ekc1AMg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@sentry/core": "10.8.0"
+            },
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@sentry-internal/replay": {
+            "version": "10.8.0",
+            "resolved": "https://registry.npmjs.org/@sentry-internal/replay/-/replay-10.8.0.tgz",
+            "integrity": "sha512-9+qDEoEjv4VopLuOzK1zM4LcvcUsvB5N0iJ+FRCM3XzzOCbebJOniXTQbt5HflJc3XLnQNKFdKfTfgj8M/0RKQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@sentry-internal/browser-utils": "10.8.0",
+                "@sentry/core": "10.8.0"
+            },
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@sentry-internal/replay-canvas": {
+            "version": "10.8.0",
+            "resolved": "https://registry.npmjs.org/@sentry-internal/replay-canvas/-/replay-canvas-10.8.0.tgz",
+            "integrity": "sha512-jC4OOwiNgrlIPeXIPMLkaW53BSS1do+toYHoWzzO5AXGpN6jRhanoSj36FpVuH2N3kFnxKVfVxrwh8L+/3vFWg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@sentry-internal/replay": "10.8.0",
+                "@sentry/core": "10.8.0"
+            },
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@sentry/browser": {
+            "version": "10.8.0",
+            "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-10.8.0.tgz",
+            "integrity": "sha512-2J7HST8/ixCaboq17yFn/j/OEokXSXoCBMXRrFx4FKJggKWZ90e2Iau5mP/IPPhrW+W9zCptCgNMY0167wS4qA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@sentry-internal/browser-utils": "10.8.0",
+                "@sentry-internal/feedback": "10.8.0",
+                "@sentry-internal/replay": "10.8.0",
+                "@sentry-internal/replay-canvas": "10.8.0",
+                "@sentry/core": "10.8.0"
+            },
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@sentry/core": {
+            "version": "10.8.0",
+            "resolved": "https://registry.npmjs.org/@sentry/core/-/core-10.8.0.tgz",
+            "integrity": "sha512-scYzM/UOItu4PjEq6CpHLdArpXjIS0laHYxE4YjkIbYIH6VMcXGQbD/FSBClsnCr1wXRnlXfXBzj0hrQAFyw+Q==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@types/codemirror": {
+            "version": "5.60.8",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/tern": "*"
+            }
+        },
+        "node_modules/@types/eslint": {
+            "version": "9.6.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/estree": "*",
+                "@types/json-schema": "*"
+            }
+        },
+        "node_modules/@types/eslint-scope": {
+            "version": "3.7.7",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/eslint": "*",
+                "@types/estree": "*"
+            }
+        },
+        "node_modules/@types/estree": {
+            "version": "1.0.7",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@types/json-schema": {
+            "version": "7.0.15",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@types/node": {
+            "version": "24.8.1",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-24.8.1.tgz",
+            "integrity": "sha512-alv65KGRadQVfVcG69MuB4IzdYVpRwMG/mq8KWOaoOdyY617P5ivaDiMCGOFDWD2sAn5Q0mR3mRtUOgm99hL9Q==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "undici-types": "~7.14.0"
+            }
+        },
+        "node_modules/@types/tern": {
+            "version": "0.23.9",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/estree": "*"
+            }
+        },
+        "node_modules/@typescript-eslint/eslint-plugin": {
+            "version": "8.41.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.41.0.tgz",
+            "integrity": "sha512-8fz6oa6wEKZrhXWro/S3n2eRJqlRcIa6SlDh59FXJ5Wp5XRZ8B9ixpJDcjadHq47hMx0u+HW6SNa6LjJQ6NLtw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@eslint-community/regexpp": "^4.10.0",
+                "@typescript-eslint/scope-manager": "8.41.0",
+                "@typescript-eslint/type-utils": "8.41.0",
+                "@typescript-eslint/utils": "8.41.0",
+                "@typescript-eslint/visitor-keys": "8.41.0",
+                "graphemer": "^1.4.0",
+                "ignore": "^7.0.0",
+                "natural-compare": "^1.4.0",
+                "ts-api-utils": "^2.1.0"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            },
+            "peerDependencies": {
+                "@typescript-eslint/parser": "^8.41.0",
+                "eslint": "^8.57.0 || ^9.0.0",
+                "typescript": ">=4.8.4 <6.0.0"
+            }
+        },
+        "node_modules/@typescript-eslint/eslint-plugin/node_modules/ignore": {
+            "version": "7.0.4",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 4"
+            }
+        },
+        "node_modules/@typescript-eslint/parser": {
+            "version": "8.41.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.41.0.tgz",
+            "integrity": "sha512-gTtSdWX9xiMPA/7MV9STjJOOYtWwIJIYxkQxnSV1U3xcE+mnJSH3f6zI0RYP+ew66WSlZ5ed+h0VCxsvdC1jJg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@typescript-eslint/scope-manager": "8.41.0",
+                "@typescript-eslint/types": "8.41.0",
+                "@typescript-eslint/typescript-estree": "8.41.0",
+                "@typescript-eslint/visitor-keys": "8.41.0",
+                "debug": "^4.3.4"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            },
+            "peerDependencies": {
+                "eslint": "^8.57.0 || ^9.0.0",
+                "typescript": ">=4.8.4 <6.0.0"
+            }
+        },
+        "node_modules/@typescript-eslint/project-service": {
+            "version": "8.41.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.41.0.tgz",
+            "integrity": "sha512-b8V9SdGBQzQdjJ/IO3eDifGpDBJfvrNTp2QD9P2BeqWTGrRibgfgIlBSw6z3b6R7dPzg752tOs4u/7yCLxksSQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@typescript-eslint/tsconfig-utils": "^8.41.0",
+                "@typescript-eslint/types": "^8.41.0",
+                "debug": "^4.3.4"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            },
+            "peerDependencies": {
+                "typescript": ">=4.8.4 <6.0.0"
+            }
+        },
+        "node_modules/@typescript-eslint/scope-manager": {
+            "version": "8.41.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.41.0.tgz",
+            "integrity": "sha512-n6m05bXn/Cd6DZDGyrpXrELCPVaTnLdPToyhBoFkLIMznRUQUEQdSp96s/pcWSQdqOhrgR1mzJ+yItK7T+WPMQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@typescript-eslint/types": "8.41.0",
+                "@typescript-eslint/visitor-keys": "8.41.0"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            }
+        },
+        "node_modules/@typescript-eslint/tsconfig-utils": {
+            "version": "8.41.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.41.0.tgz",
+            "integrity": "sha512-TDhxYFPUYRFxFhuU5hTIJk+auzM/wKvWgoNYOPcOf6i4ReYlOoYN8q1dV5kOTjNQNJgzWN3TUUQMtlLOcUgdUw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            },
+            "peerDependencies": {
+                "typescript": ">=4.8.4 <6.0.0"
+            }
+        },
+        "node_modules/@typescript-eslint/type-utils": {
+            "version": "8.41.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.41.0.tgz",
+            "integrity": "sha512-63qt1h91vg3KsjVVonFJWjgSK7pZHSQFKH6uwqxAH9bBrsyRhO6ONoKyXxyVBzG1lJnFAJcKAcxLS54N1ee1OQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@typescript-eslint/types": "8.41.0",
+                "@typescript-eslint/typescript-estree": "8.41.0",
+                "@typescript-eslint/utils": "8.41.0",
+                "debug": "^4.3.4",
+                "ts-api-utils": "^2.1.0"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            },
+            "peerDependencies": {
+                "eslint": "^8.57.0 || ^9.0.0",
+                "typescript": ">=4.8.4 <6.0.0"
+            }
+        },
+        "node_modules/@typescript-eslint/types": {
+            "version": "8.41.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.41.0.tgz",
+            "integrity": "sha512-9EwxsWdVqh42afLbHP90n2VdHaWU/oWgbH2P0CfcNfdKL7CuKpwMQGjwev56vWu9cSKU7FWSu6r9zck6CVfnag==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            }
+        },
+        "node_modules/@typescript-eslint/typescript-estree": {
+            "version": "8.41.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.41.0.tgz",
+            "integrity": "sha512-D43UwUYJmGhuwHfY7MtNKRZMmfd8+p/eNSfFe6tH5mbVDto+VQCayeAt35rOx3Cs6wxD16DQtIKw/YXxt5E0UQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@typescript-eslint/project-service": "8.41.0",
+                "@typescript-eslint/tsconfig-utils": "8.41.0",
+                "@typescript-eslint/types": "8.41.0",
+                "@typescript-eslint/visitor-keys": "8.41.0",
+                "debug": "^4.3.4",
+                "fast-glob": "^3.3.2",
+                "is-glob": "^4.0.3",
+                "minimatch": "^9.0.4",
+                "semver": "^7.6.0",
+                "ts-api-utils": "^2.1.0"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            },
+            "peerDependencies": {
+                "typescript": ">=4.8.4 <6.0.0"
+            }
+        },
+        "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+            "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "balanced-match": "^1.0.0"
+            }
+        },
+        "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": {
+            "version": "9.0.5",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+            "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "brace-expansion": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=16 || 14 >=14.17"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/@typescript-eslint/utils": {
+            "version": "8.41.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.41.0.tgz",
+            "integrity": "sha512-udbCVstxZ5jiPIXrdH+BZWnPatjlYwJuJkDA4Tbo3WyYLh8NvB+h/bKeSZHDOFKfphsZYJQqaFtLeXEqurQn1A==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@eslint-community/eslint-utils": "^4.7.0",
+                "@typescript-eslint/scope-manager": "8.41.0",
+                "@typescript-eslint/types": "8.41.0",
+                "@typescript-eslint/typescript-estree": "8.41.0"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            },
+            "peerDependencies": {
+                "eslint": "^8.57.0 || ^9.0.0",
+                "typescript": ">=4.8.4 <6.0.0"
+            }
+        },
+        "node_modules/@typescript-eslint/visitor-keys": {
+            "version": "8.41.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.41.0.tgz",
+            "integrity": "sha512-+GeGMebMCy0elMNg67LRNoVnUFPIm37iu5CmHESVx56/9Jsfdpsvbv605DQ81Pi/x11IdKUsS5nzgTYbCQU9fg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@typescript-eslint/types": "8.41.0",
+                "eslint-visitor-keys": "^4.2.1"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            }
+        },
+        "node_modules/@webassemblyjs/ast": {
+            "version": "1.14.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@webassemblyjs/helper-numbers": "1.13.2",
+                "@webassemblyjs/helper-wasm-bytecode": "1.13.2"
+            }
+        },
+        "node_modules/@webassemblyjs/floating-point-hex-parser": {
+            "version": "1.13.2",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@webassemblyjs/helper-api-error": {
+            "version": "1.13.2",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@webassemblyjs/helper-buffer": {
+            "version": "1.14.1",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@webassemblyjs/helper-numbers": {
+            "version": "1.13.2",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@webassemblyjs/floating-point-hex-parser": "1.13.2",
+                "@webassemblyjs/helper-api-error": "1.13.2",
+                "@xtuc/long": "4.2.2"
+            }
+        },
+        "node_modules/@webassemblyjs/helper-wasm-bytecode": {
+            "version": "1.13.2",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@webassemblyjs/helper-wasm-section": {
+            "version": "1.14.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@webassemblyjs/ast": "1.14.1",
+                "@webassemblyjs/helper-buffer": "1.14.1",
+                "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+                "@webassemblyjs/wasm-gen": "1.14.1"
+            }
+        },
+        "node_modules/@webassemblyjs/ieee754": {
+            "version": "1.13.2",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@xtuc/ieee754": "^1.2.0"
+            }
+        },
+        "node_modules/@webassemblyjs/leb128": {
+            "version": "1.13.2",
+            "dev": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@xtuc/long": "4.2.2"
+            }
+        },
+        "node_modules/@webassemblyjs/utf8": {
+            "version": "1.13.2",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@webassemblyjs/wasm-edit": {
+            "version": "1.14.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@webassemblyjs/ast": "1.14.1",
+                "@webassemblyjs/helper-buffer": "1.14.1",
+                "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+                "@webassemblyjs/helper-wasm-section": "1.14.1",
+                "@webassemblyjs/wasm-gen": "1.14.1",
+                "@webassemblyjs/wasm-opt": "1.14.1",
+                "@webassemblyjs/wasm-parser": "1.14.1",
+                "@webassemblyjs/wast-printer": "1.14.1"
+            }
+        },
+        "node_modules/@webassemblyjs/wasm-gen": {
+            "version": "1.14.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@webassemblyjs/ast": "1.14.1",
+                "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+                "@webassemblyjs/ieee754": "1.13.2",
+                "@webassemblyjs/leb128": "1.13.2",
+                "@webassemblyjs/utf8": "1.13.2"
+            }
+        },
+        "node_modules/@webassemblyjs/wasm-opt": {
+            "version": "1.14.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@webassemblyjs/ast": "1.14.1",
+                "@webassemblyjs/helper-buffer": "1.14.1",
+                "@webassemblyjs/wasm-gen": "1.14.1",
+                "@webassemblyjs/wasm-parser": "1.14.1"
+            }
+        },
+        "node_modules/@webassemblyjs/wasm-parser": {
+            "version": "1.14.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@webassemblyjs/ast": "1.14.1",
+                "@webassemblyjs/helper-api-error": "1.13.2",
+                "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+                "@webassemblyjs/ieee754": "1.13.2",
+                "@webassemblyjs/leb128": "1.13.2",
+                "@webassemblyjs/utf8": "1.13.2"
+            }
+        },
+        "node_modules/@webassemblyjs/wast-printer": {
+            "version": "1.14.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@webassemblyjs/ast": "1.14.1",
+                "@xtuc/long": "4.2.2"
+            }
+        },
+        "node_modules/@webpack-cli/configtest": {
+            "version": "3.0.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=18.12.0"
+            },
+            "peerDependencies": {
+                "webpack": "^5.82.0",
+                "webpack-cli": "6.x.x"
+            }
+        },
+        "node_modules/@webpack-cli/info": {
+            "version": "3.0.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=18.12.0"
+            },
+            "peerDependencies": {
+                "webpack": "^5.82.0",
+                "webpack-cli": "6.x.x"
+            }
+        },
+        "node_modules/@webpack-cli/serve": {
+            "version": "3.0.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=18.12.0"
+            },
+            "peerDependencies": {
+                "webpack": "^5.82.0",
+                "webpack-cli": "6.x.x"
+            },
+            "peerDependenciesMeta": {
+                "webpack-dev-server": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@xtuc/ieee754": {
+            "version": "1.2.0",
+            "dev": true,
+            "license": "BSD-3-Clause"
+        },
+        "node_modules/@xtuc/long": {
+            "version": "4.2.2",
+            "dev": true,
+            "license": "Apache-2.0"
+        },
+        "node_modules/acorn": {
+            "version": "8.15.0",
+            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
+            "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
+            "dev": true,
+            "license": "MIT",
+            "bin": {
+                "acorn": "bin/acorn"
+            },
+            "engines": {
+                "node": ">=0.4.0"
+            }
+        },
+        "node_modules/acorn-jsx": {
+            "version": "5.3.2",
+            "dev": true,
+            "license": "MIT",
+            "peerDependencies": {
+                "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+            }
+        },
+        "node_modules/adjust-sourcemap-loader": {
+            "version": "4.0.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "loader-utils": "^2.0.0",
+                "regex-parser": "^2.2.11"
+            },
+            "engines": {
+                "node": ">=8.9"
+            }
+        },
+        "node_modules/ajv": {
+            "version": "6.12.6",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "fast-deep-equal": "^3.1.1",
+                "fast-json-stable-stringify": "^2.0.0",
+                "json-schema-traverse": "^0.4.1",
+                "uri-js": "^4.2.2"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/epoberezkin"
+            }
+        },
+        "node_modules/ajv-formats": {
+            "version": "2.1.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ajv": "^8.0.0"
+            },
+            "peerDependencies": {
+                "ajv": "^8.0.0"
+            },
+            "peerDependenciesMeta": {
+                "ajv": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/ajv-formats/node_modules/ajv": {
+            "version": "8.17.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "fast-deep-equal": "^3.1.3",
+                "fast-uri": "^3.0.1",
+                "json-schema-traverse": "^1.0.0",
+                "require-from-string": "^2.0.2"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/epoberezkin"
+            }
+        },
+        "node_modules/ajv-formats/node_modules/json-schema-traverse": {
+            "version": "1.0.0",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/ajv-keywords": {
+            "version": "3.5.2",
+            "dev": true,
+            "license": "MIT",
+            "peerDependencies": {
+                "ajv": "^6.9.1"
+            }
+        },
+        "node_modules/ansi-colors": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+            "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-wrap": "^0.1.0"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/ansi-cyan": {
+            "version": "0.1.1",
+            "resolved": "https://registry.npmjs.org/ansi-cyan/-/ansi-cyan-0.1.1.tgz",
+            "integrity": "sha512-eCjan3AVo/SxZ0/MyIYRtkpxIu/H3xZN7URr1vXVrISxeyz8fUFz0FJziamK4sS8I+t35y4rHg1b2PklyBe/7A==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-wrap": "0.1.0"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/ansi-escapes": {
+            "version": "3.2.0",
+            "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
+            "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/ansi-gray": {
+            "version": "0.1.1",
+            "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz",
+            "integrity": "sha512-HrgGIZUl8h2EHuZaU9hTR/cU5nhKxpVE1V6kdGsQ8e4zirElJ5fvtfc8N7Q1oq1aatO275i8pUFUCpNWCAnVWw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-wrap": "0.1.0"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/ansi-red": {
+            "version": "0.1.1",
+            "resolved": "https://registry.npmjs.org/ansi-red/-/ansi-red-0.1.1.tgz",
+            "integrity": "sha512-ewaIr5y+9CUTGFwZfpECUbFlGcC0GCw1oqR9RI6h1gQCd9Aj2GxSckCnPsVJnmfMZbwFYE+leZGASgkWl06Jow==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-wrap": "0.1.0"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/ansi-regex": {
+            "version": "5.0.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/ansi-styles": {
+            "version": "4.3.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "color-convert": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+            }
+        },
+        "node_modules/ansi-wrap": {
+            "version": "0.1.0",
+            "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz",
+            "integrity": "sha512-ZyznvL8k/FZeQHr2T6LzcJ/+vBApDnMNZvfVFy3At0knswWd6rJ3/0Hhmpu8oqa6C92npmozs890sX9Dl6q+Qw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/append-buffer": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/append-buffer/-/append-buffer-1.0.2.tgz",
+            "integrity": "sha512-WLbYiXzD3y/ATLZFufV/rZvWdZOs+Z/+5v1rBZ463Jn398pa6kcde27cvozYnBoxXblGZTFfoPpsaEw0orU5BA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "buffer-equal": "^1.0.0"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/argparse": {
+            "version": "2.0.1",
+            "dev": true,
+            "license": "Python-2.0"
+        },
+        "node_modules/arr-diff": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+            "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/arr-flatten": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
+            "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/arr-union": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+            "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/array-differ": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz",
+            "integrity": "sha512-LeZY+DZDRnvP7eMuQ6LHfCzUGxAAIViUBliK24P3hWXL6y4SortgR6Nim6xrkfSLlmH0+k+9NYNwVC2s53ZrYQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/array-slice": {
+            "version": "0.2.3",
+            "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
+            "integrity": "sha512-rlVfZW/1Ph2SNySXwR9QYkChp8EkOEiTMO5Vwx60usw04i4nWemkm9RXmQqgkQFaLHsqLuADvjp6IfgL9l2M8Q==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/array-union": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
+            "integrity": "sha512-Dxr6QJj/RdU/hCaBjOfxW+q6lyuVE6JFWIrAUpuOOhoJJoQ99cUn3igRaHVB5P9WrgFVN0FfArM3x0cueOU8ng==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "array-uniq": "^1.0.1"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/array-uniq": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
+            "integrity": "sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/arrify": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+            "integrity": "sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/assign-symbols": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
+            "integrity": "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/axios": {
+            "version": "0.18.1",
+            "resolved": "https://registry.npmjs.org/axios/-/axios-0.18.1.tgz",
+            "integrity": "sha512-0BfJq4NSfQXd+SkFdrvFbG7addhYSBA2mQwISr46pD6E5iqkWg02RAs8vyTT/j0RTnoYmeXauBuSv1qKwR179g==",
+            "deprecated": "Critical security vulnerability fixed in v0.21.1. For more information, see https://github.com/axios/axios/pull/3410",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "follow-redirects": "1.5.10",
+                "is-buffer": "^2.0.2"
+            }
+        },
+        "node_modules/balanced-match": {
+            "version": "1.0.2",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/big.js": {
+            "version": "5.2.2",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/bignumber.js": {
+            "version": "2.4.0",
+            "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-2.4.0.tgz",
+            "integrity": "sha512-uw4ra6Cv483Op/ebM0GBKKfxZlSmn6NgFRby5L3yGTlunLj53KQgndDlqy2WVFOwgvurocApYkSud0aO+mvrpQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/brace-expansion": {
+            "version": "1.1.12",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+            "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "balanced-match": "^1.0.0",
+                "concat-map": "0.0.1"
+            }
+        },
+        "node_modules/braces": {
+            "version": "3.0.3",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "fill-range": "^7.1.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/browserslist": {
+            "version": "4.24.4",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/browserslist"
+                },
+                {
+                    "type": "tidelift",
+                    "url": "https://tidelift.com/funding/github/npm/browserslist"
+                },
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/ai"
+                }
+            ],
+            "license": "MIT",
+            "dependencies": {
+                "caniuse-lite": "^1.0.30001688",
+                "electron-to-chromium": "^1.5.73",
+                "node-releases": "^2.0.19",
+                "update-browserslist-db": "^1.1.1"
+            },
+            "bin": {
+                "browserslist": "cli.js"
+            },
+            "engines": {
+                "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+            }
+        },
+        "node_modules/buffer-equal": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.1.tgz",
+            "integrity": "sha512-QoV3ptgEaQpvVwbXdSO39iqPQTCxSF7A5U99AxbHYqUdCizL/lH2Z0A2y6nbZucxMEOtNyZfG2s6gsVugGpKkg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/buffer-equals": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/buffer-equals/-/buffer-equals-1.0.4.tgz",
+            "integrity": "sha512-99MsCq0j5+RhubVEtKQgKaD6EM+UP3xJgIvQqwJ3SOLDUekzxMX1ylXBng+Wa2sh7mGT0W6RUly8ojjr1Tt6nA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/buffer-from": {
+            "version": "1.1.2",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/buffered-spawn": {
+            "version": "3.3.2",
+            "resolved": "https://registry.npmjs.org/buffered-spawn/-/buffered-spawn-3.3.2.tgz",
+            "integrity": "sha512-YVdiyWEbFCH+lu3USRFoH6UtvS3mr/e/obxZNbOkbbL3heLEUYb3YpTjKUQFWt5d3k9ZILabY8Kh2pp+i4SQqg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "cross-spawn": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=4.0.0"
+            }
+        },
+        "node_modules/buffered-spawn/node_modules/cross-spawn": {
+            "version": "4.0.2",
+            "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz",
+            "integrity": "sha512-yAXz/pA1tD8Gtg2S98Ekf/sewp3Lcp3YoFKJ4Hkp5h5yLWnKVTDU0kwjKJ8NDCYcfTLfyGkzTikst+jWypT1iA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "lru-cache": "^4.0.1",
+                "which": "^1.2.9"
+            }
+        },
+        "node_modules/buffered-spawn/node_modules/which": {
+            "version": "1.3.1",
+            "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+            "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "isexe": "^2.0.0"
+            },
+            "bin": {
+                "which": "bin/which"
+            }
+        },
+        "node_modules/bufferstreams": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/bufferstreams/-/bufferstreams-2.0.1.tgz",
+            "integrity": "sha512-ZswyIoBfFb3cVDsnZLLj2IDJ/0ppYdil/v2EGlZXvoefO689FokEmFEldhN5dV7R2QBxFneqTJOMIpfqhj+n0g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "readable-stream": "^2.3.6"
+            },
+            "engines": {
+                "node": ">=6.9.5"
+            }
+        },
+        "node_modules/bufferutil": {
+            "version": "4.0.9",
+            "dev": true,
+            "hasInstallScript": true,
+            "license": "MIT",
+            "optional": true,
+            "peer": true,
+            "dependencies": {
+                "node-gyp-build": "^4.3.0"
+            },
+            "engines": {
+                "node": ">=6.14.2"
+            }
+        },
+        "node_modules/byte-base64": {
+            "version": "1.1.0",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/call-bind": {
+            "version": "1.0.8",
+            "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz",
+            "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "call-bind-apply-helpers": "^1.0.0",
+                "es-define-property": "^1.0.0",
+                "get-intrinsic": "^1.2.4",
+                "set-function-length": "^1.2.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/call-bind-apply-helpers": {
+            "version": "1.0.2",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "es-errors": "^1.3.0",
+                "function-bind": "^1.1.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/call-bound": {
+            "version": "1.0.4",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "call-bind-apply-helpers": "^1.0.2",
+                "get-intrinsic": "^1.3.0"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/callsites": {
+            "version": "3.1.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/camelcase": {
+            "version": "5.3.1",
+            "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+            "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/caniuse-lite": {
+            "version": "1.0.30001707",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/browserslist"
+                },
+                {
+                    "type": "tidelift",
+                    "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+                },
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/ai"
+                }
+            ],
+            "license": "CC-BY-4.0"
+        },
+        "node_modules/chalk": {
+            "version": "4.1.2",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-styles": "^4.1.0",
+                "supports-color": "^7.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/chalk?sponsor=1"
+            }
+        },
+        "node_modules/chalk/node_modules/supports-color": {
+            "version": "7.2.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/checkstyle-formatter": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/checkstyle-formatter/-/checkstyle-formatter-1.1.0.tgz",
+            "integrity": "sha512-mak+5ooX5cDFBBIhsR+NqxoQ9+JQRqupr49G2PiUYXKn8OntoI9osjhECaScrzqq1l4phuRmK1VlMdxHdpwZvg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "xml-escape": "^1.0.0"
+            }
+        },
+        "node_modules/chokidar": {
+            "version": "4.0.3",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "readdirp": "^4.0.1"
+            },
+            "engines": {
+                "node": ">= 14.16.0"
+            },
+            "funding": {
+                "url": "https://paulmillr.com/funding/"
+            }
+        },
+        "node_modules/chrome-trace-event": {
+            "version": "1.0.4",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6.0"
+            }
+        },
+        "node_modules/ci-info": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
+            "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/cli-truncate": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-1.1.0.tgz",
+            "integrity": "sha512-bAtZo0u82gCfaAGfSNxUdTI9mNyza7D8w4CVCcaOsy7sgwDzvx6ekr6cuWJqY3UGzgnQ1+4wgENup5eIhgxEYA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "slice-ansi": "^1.0.0",
+                "string-width": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/cli-truncate/node_modules/ansi-regex": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
+            "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/cli-truncate/node_modules/is-fullwidth-code-point": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+            "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/cli-truncate/node_modules/string-width": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+            "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "is-fullwidth-code-point": "^2.0.0",
+                "strip-ansi": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/cli-truncate/node_modules/strip-ansi": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+            "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-regex": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/cliui": {
+            "version": "8.0.1",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "string-width": "^4.2.0",
+                "strip-ansi": "^6.0.1",
+                "wrap-ansi": "^7.0.0"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/clone": {
+            "version": "2.1.2",
+            "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+            "integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.8"
+            }
+        },
+        "node_modules/clone-buffer": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz",
+            "integrity": "sha512-KLLTJWrvwIP+OPfMn0x2PheDEP20RPUcGXj/ERegTgdmPEZylALQldygiqrPPu8P45uNuPs7ckmReLY6v/iA5g==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.10"
+            }
+        },
+        "node_modules/clone-deep": {
+            "version": "4.0.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "is-plain-object": "^2.0.4",
+                "kind-of": "^6.0.2",
+                "shallow-clone": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/clone-stats": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
+            "integrity": "sha512-au6ydSpg6nsrigcZ4m8Bc9hxjeW+GJ8xh5G3BJCMt4WXe1H10UNaVOamqQTmrx1kjVuxAHIQSNU6hY4Nsn9/ag==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/cloneable-readable": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.3.tgz",
+            "integrity": "sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "inherits": "^2.0.1",
+                "process-nextick-args": "^2.0.0",
+                "readable-stream": "^2.3.5"
+            }
+        },
+        "node_modules/code-point-at": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+            "integrity": "sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/color-convert": {
+            "version": "2.0.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "color-name": "~1.1.4"
+            },
+            "engines": {
+                "node": ">=7.0.0"
+            }
+        },
+        "node_modules/color-name": {
+            "version": "1.1.4",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/color-support": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
+            "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
+            "dev": true,
+            "license": "ISC",
+            "bin": {
+                "color-support": "bin.js"
+            }
+        },
+        "node_modules/commander": {
+            "version": "14.0.2",
+            "resolved": "https://registry.npmjs.org/commander/-/commander-14.0.2.tgz",
+            "integrity": "sha512-TywoWNNRbhoD0BXs1P3ZEScW8W5iKrnbithIl0YH+uCmBd0QpPOA8yc82DS3BIE5Ma6FnBVUsJ7wVUDz4dvOWQ==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=20"
+            }
+        },
+        "node_modules/concat-map": {
+            "version": "0.0.1",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/concurrently": {
+            "version": "9.2.1",
+            "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-9.2.1.tgz",
+            "integrity": "sha512-fsfrO0MxV64Znoy8/l1vVIjjHa29SZyyqPgQBwhiDcaW8wJc2W3XWVOGx4M3oJBnv/zdUZIIp1gDeS98GzP8Ng==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "chalk": "4.1.2",
+                "rxjs": "7.8.2",
+                "shell-quote": "1.8.3",
+                "supports-color": "8.1.1",
+                "tree-kill": "1.2.2",
+                "yargs": "17.7.2"
+            },
+            "bin": {
+                "conc": "dist/bin/concurrently.js",
+                "concurrently": "dist/bin/concurrently.js"
+            },
+            "engines": {
+                "node": ">=18"
+            },
+            "funding": {
+                "url": "https://github.com/open-cli-tools/concurrently?sponsor=1"
+            }
+        },
+        "node_modules/convert-source-map": {
+            "version": "1.9.0",
+            "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
+            "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/core-util-is": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+            "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/crelt": {
+            "version": "1.0.6",
+            "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.6.tgz",
+            "integrity": "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==",
+            "dev": true,
+            "license": "MIT",
+            "peer": true
+        },
+        "node_modules/cross-spawn": {
+            "version": "7.0.6",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "path-key": "^3.1.0",
+                "shebang-command": "^2.0.0",
+                "which": "^2.0.1"
+            },
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/css-loader": {
+            "version": "7.1.2",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "icss-utils": "^5.1.0",
+                "postcss": "^8.4.33",
+                "postcss-modules-extract-imports": "^3.1.0",
+                "postcss-modules-local-by-default": "^4.0.5",
+                "postcss-modules-scope": "^3.2.0",
+                "postcss-modules-values": "^4.0.0",
+                "postcss-value-parser": "^4.2.0",
+                "semver": "^7.5.4"
+            },
+            "engines": {
+                "node": ">= 18.12.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            },
+            "peerDependencies": {
+                "@rspack/core": "0.x || 1.x",
+                "webpack": "^5.27.0"
+            },
+            "peerDependenciesMeta": {
+                "@rspack/core": {
+                    "optional": true
+                },
+                "webpack": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/cssesc": {
+            "version": "3.0.0",
+            "dev": true,
+            "license": "MIT",
+            "bin": {
+                "cssesc": "bin/cssesc"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/date-fns": {
+            "version": "4.1.0",
+            "dev": true,
+            "license": "MIT",
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/kossnocorp"
+            }
+        },
+        "node_modules/date-format": {
+            "version": "0.0.2",
+            "resolved": "https://registry.npmjs.org/date-format/-/date-format-0.0.2.tgz",
+            "integrity": "sha512-M4obuJx8jU5T91lcbwi0+QPNVaWOY1DQYz5xUuKYWO93osVzB2ZPqyDUc5T+mDjbA1X8VOb4JDZ+8r2MrSOp7Q==",
+            "deprecated": "0.x is no longer supported. Please upgrade to 4.x or higher.",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/debug": {
+            "version": "4.4.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ms": "^2.1.3"
+            },
+            "engines": {
+                "node": ">=6.0"
+            },
+            "peerDependenciesMeta": {
+                "supports-color": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/decamelize": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+            "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/deep-is": {
+            "version": "0.1.4",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/define-data-property": {
+            "version": "1.1.4",
+            "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+            "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "es-define-property": "^1.0.0",
+                "es-errors": "^1.3.0",
+                "gopd": "^1.0.1"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/define-properties": {
+            "version": "1.2.1",
+            "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
+            "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "define-data-property": "^1.0.1",
+                "has-property-descriptors": "^1.0.0",
+                "object-keys": "^1.1.1"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/detect-libc": {
+            "version": "1.0.3",
+            "dev": true,
+            "license": "Apache-2.0",
+            "optional": true,
+            "bin": {
+                "detect-libc": "bin/detect-libc.js"
+            },
+            "engines": {
+                "node": ">=0.10"
+            }
+        },
+        "node_modules/dunder-proto": {
+            "version": "1.0.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "call-bind-apply-helpers": "^1.0.1",
+                "es-errors": "^1.3.0",
+                "gopd": "^1.2.0"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/duplexify": {
+            "version": "3.7.1",
+            "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
+            "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "end-of-stream": "^1.0.0",
+                "inherits": "^2.0.1",
+                "readable-stream": "^2.0.0",
+                "stream-shift": "^1.0.0"
+            }
+        },
+        "node_modules/eclint": {
+            "version": "2.8.1",
+            "resolved": "https://registry.npmjs.org/eclint/-/eclint-2.8.1.tgz",
+            "integrity": "sha512-0u1UubFXSOgZgXNhuPeliYyTFmjWStVph8JR6uD6NDuxl3xI5VSCsA1KX6/BSYtM9v4wQMifGoNFfN5VlRn4LQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "editorconfig": "^0.15.2",
+                "file-type": "^10.1.0",
+                "gulp-exclude-gitignore": "^1.2.0",
+                "gulp-filter": "^5.1.0",
+                "gulp-reporter": "^2.9.0",
+                "gulp-tap": "^1.0.1",
+                "linez": "^4.1.4",
+                "lodash": "^4.17.11",
+                "minimatch": "^3.0.4",
+                "os-locale": "^3.0.1",
+                "plugin-error": "^1.0.1",
+                "through2": "^2.0.3",
+                "vinyl": "^2.2.0",
+                "vinyl-fs": "^3.0.3",
+                "yargs": "^12.0.2"
+            },
+            "bin": {
+                "eclint": "bin/eclint.js"
+            }
+        },
+        "node_modules/eclint/node_modules/ansi-regex": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
+            "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/eclint/node_modules/cliui": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
+            "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "string-width": "^2.1.1",
+                "strip-ansi": "^4.0.0",
+                "wrap-ansi": "^2.0.0"
+            }
+        },
+        "node_modules/eclint/node_modules/find-up": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+            "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "locate-path": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/eclint/node_modules/get-caller-file": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
+            "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/eclint/node_modules/is-fullwidth-code-point": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+            "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/eclint/node_modules/locate-path": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+            "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "p-locate": "^3.0.0",
+                "path-exists": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/eclint/node_modules/p-limit": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+            "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "p-try": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=6"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/eclint/node_modules/p-locate": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+            "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "p-limit": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/eclint/node_modules/path-exists": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+            "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/eclint/node_modules/string-width": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+            "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "is-fullwidth-code-point": "^2.0.0",
+                "strip-ansi": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/eclint/node_modules/strip-ansi": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+            "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-regex": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/eclint/node_modules/wrap-ansi": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+            "integrity": "sha512-vAaEaDM946gbNpH5pLVNR+vX2ht6n0Bt3GXwVB1AuAqZosOvHNF3P7wDnh8KLkSqgUh0uh77le7Owgoz+Z9XBw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "string-width": "^1.0.1",
+                "strip-ansi": "^3.0.1"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/eclint/node_modules/wrap-ansi/node_modules/ansi-regex": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+            "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/eclint/node_modules/wrap-ansi/node_modules/is-fullwidth-code-point": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+            "integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "number-is-nan": "^1.0.0"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/eclint/node_modules/wrap-ansi/node_modules/string-width": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+            "integrity": "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "code-point-at": "^1.0.0",
+                "is-fullwidth-code-point": "^1.0.0",
+                "strip-ansi": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/eclint/node_modules/wrap-ansi/node_modules/strip-ansi": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+            "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-regex": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/eclint/node_modules/y18n": {
+            "version": "4.0.3",
+            "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+            "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/eclint/node_modules/yargs": {
+            "version": "12.0.5",
+            "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz",
+            "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "cliui": "^4.0.0",
+                "decamelize": "^1.2.0",
+                "find-up": "^3.0.0",
+                "get-caller-file": "^1.0.1",
+                "os-locale": "^3.0.0",
+                "require-directory": "^2.1.1",
+                "require-main-filename": "^1.0.1",
+                "set-blocking": "^2.0.0",
+                "string-width": "^2.0.0",
+                "which-module": "^2.0.0",
+                "y18n": "^3.2.1 || ^4.0.0",
+                "yargs-parser": "^11.1.1"
+            }
+        },
+        "node_modules/eclint/node_modules/yargs-parser": {
+            "version": "11.1.1",
+            "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz",
+            "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "camelcase": "^5.0.0",
+                "decamelize": "^1.2.0"
+            }
+        },
+        "node_modules/editorconfig": {
+            "version": "0.15.3",
+            "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-0.15.3.tgz",
+            "integrity": "sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "commander": "^2.19.0",
+                "lru-cache": "^4.1.5",
+                "semver": "^5.6.0",
+                "sigmund": "^1.0.1"
+            },
+            "bin": {
+                "editorconfig": "bin/editorconfig"
+            }
+        },
+        "node_modules/editorconfig/node_modules/commander": {
+            "version": "2.20.3",
+            "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+            "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/editorconfig/node_modules/semver": {
+            "version": "5.7.2",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+            "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+            "dev": true,
+            "license": "ISC",
+            "bin": {
+                "semver": "bin/semver"
+            }
+        },
+        "node_modules/electron-to-chromium": {
+            "version": "1.5.127",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/emoji-regex": {
+            "version": "8.0.0",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/emojis-list": {
+            "version": "3.0.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 4"
+            }
+        },
+        "node_modules/emphasize": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/emphasize/-/emphasize-2.1.0.tgz",
+            "integrity": "sha512-wRlO0Qulw2jieQynsS3STzTabIhHCyjTjZraSkchOiT8rdvWZlahJAJ69HRxwGkv2NThmci2MSnDfJ60jB39tw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "chalk": "^2.4.0",
+                "highlight.js": "~9.12.0",
+                "lowlight": "~1.9.0"
+            }
+        },
+        "node_modules/emphasize/node_modules/ansi-styles": {
+            "version": "3.2.1",
+            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+            "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "color-convert": "^1.9.0"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/emphasize/node_modules/chalk": {
+            "version": "2.4.2",
+            "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+            "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-styles": "^3.2.1",
+                "escape-string-regexp": "^1.0.5",
+                "supports-color": "^5.3.0"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/emphasize/node_modules/color-convert": {
+            "version": "1.9.3",
+            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+            "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "color-name": "1.1.3"
+            }
+        },
+        "node_modules/emphasize/node_modules/color-name": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+            "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/emphasize/node_modules/escape-string-regexp": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+            "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.8.0"
+            }
+        },
+        "node_modules/emphasize/node_modules/has-flag": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+            "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/emphasize/node_modules/supports-color": {
+            "version": "5.5.0",
+            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+            "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "has-flag": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/end-of-stream": {
+            "version": "1.4.5",
+            "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.5.tgz",
+            "integrity": "sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "once": "^1.4.0"
+            }
+        },
+        "node_modules/enhanced-resolve": {
+            "version": "5.18.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "graceful-fs": "^4.2.4",
+                "tapable": "^2.2.0"
+            },
+            "engines": {
+                "node": ">=10.13.0"
+            }
+        },
+        "node_modules/envinfo": {
+            "version": "7.14.0",
+            "dev": true,
+            "license": "MIT",
+            "bin": {
+                "envinfo": "dist/cli.js"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/es-define-property": {
+            "version": "1.0.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/es-errors": {
+            "version": "1.3.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/es-module-lexer": {
+            "version": "1.6.0",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/es-object-atoms": {
+            "version": "1.1.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "es-errors": "^1.3.0"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/esbuild": {
+            "version": "0.25.9",
+            "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.9.tgz",
+            "integrity": "sha512-CRbODhYyQx3qp7ZEwzxOk4JBqmD/seJrzPa/cGjY1VtIn5E09Oi9/dB4JwctnfZ8Q8iT7rioVv5k/FNT/uf54g==",
+            "dev": true,
+            "hasInstallScript": true,
+            "license": "MIT",
+            "bin": {
+                "esbuild": "bin/esbuild"
+            },
+            "engines": {
+                "node": ">=18"
+            },
+            "optionalDependencies": {
+                "@esbuild/aix-ppc64": "0.25.9",
+                "@esbuild/android-arm": "0.25.9",
+                "@esbuild/android-arm64": "0.25.9",
+                "@esbuild/android-x64": "0.25.9",
+                "@esbuild/darwin-arm64": "0.25.9",
+                "@esbuild/darwin-x64": "0.25.9",
+                "@esbuild/freebsd-arm64": "0.25.9",
+                "@esbuild/freebsd-x64": "0.25.9",
+                "@esbuild/linux-arm": "0.25.9",
+                "@esbuild/linux-arm64": "0.25.9",
+                "@esbuild/linux-ia32": "0.25.9",
+                "@esbuild/linux-loong64": "0.25.9",
+                "@esbuild/linux-mips64el": "0.25.9",
+                "@esbuild/linux-ppc64": "0.25.9",
+                "@esbuild/linux-riscv64": "0.25.9",
+                "@esbuild/linux-s390x": "0.25.9",
+                "@esbuild/linux-x64": "0.25.9",
+                "@esbuild/netbsd-arm64": "0.25.9",
+                "@esbuild/netbsd-x64": "0.25.9",
+                "@esbuild/openbsd-arm64": "0.25.9",
+                "@esbuild/openbsd-x64": "0.25.9",
+                "@esbuild/openharmony-arm64": "0.25.9",
+                "@esbuild/sunos-x64": "0.25.9",
+                "@esbuild/win32-arm64": "0.25.9",
+                "@esbuild/win32-ia32": "0.25.9",
+                "@esbuild/win32-x64": "0.25.9"
+            }
+        },
+        "node_modules/escalade": {
+            "version": "3.2.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/escape-string-regexp": {
+            "version": "4.0.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/eslint": {
+            "version": "9.38.0",
+            "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.38.0.tgz",
+            "integrity": "sha512-t5aPOpmtJcZcz5UJyY2GbvpDlsK5E8JqRqoKtfiKE3cNh437KIqfJr3A3AKf5k64NPx6d0G3dno6XDY05PqPtw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@eslint-community/eslint-utils": "^4.8.0",
+                "@eslint-community/regexpp": "^4.12.1",
+                "@eslint/config-array": "^0.21.1",
+                "@eslint/config-helpers": "^0.4.1",
+                "@eslint/core": "^0.16.0",
+                "@eslint/eslintrc": "^3.3.1",
+                "@eslint/js": "9.38.0",
+                "@eslint/plugin-kit": "^0.4.0",
+                "@humanfs/node": "^0.16.6",
+                "@humanwhocodes/module-importer": "^1.0.1",
+                "@humanwhocodes/retry": "^0.4.2",
+                "@types/estree": "^1.0.6",
+                "ajv": "^6.12.4",
+                "chalk": "^4.0.0",
+                "cross-spawn": "^7.0.6",
+                "debug": "^4.3.2",
+                "escape-string-regexp": "^4.0.0",
+                "eslint-scope": "^8.4.0",
+                "eslint-visitor-keys": "^4.2.1",
+                "espree": "^10.4.0",
+                "esquery": "^1.5.0",
+                "esutils": "^2.0.2",
+                "fast-deep-equal": "^3.1.3",
+                "file-entry-cache": "^8.0.0",
+                "find-up": "^5.0.0",
+                "glob-parent": "^6.0.2",
+                "ignore": "^5.2.0",
+                "imurmurhash": "^0.1.4",
+                "is-glob": "^4.0.0",
+                "json-stable-stringify-without-jsonify": "^1.0.1",
+                "lodash.merge": "^4.6.2",
+                "minimatch": "^3.1.2",
+                "natural-compare": "^1.4.0",
+                "optionator": "^0.9.3"
+            },
+            "bin": {
+                "eslint": "bin/eslint.js"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "url": "https://eslint.org/donate"
+            },
+            "peerDependencies": {
+                "jiti": "*"
+            },
+            "peerDependenciesMeta": {
+                "jiti": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/eslint-plugin-unused-imports": {
+            "version": "4.1.4",
+            "dev": true,
+            "license": "MIT",
+            "peerDependencies": {
+                "@typescript-eslint/eslint-plugin": "^8.0.0-0 || ^7.0.0 || ^6.0.0 || ^5.0.0",
+                "eslint": "^9.0.0 || ^8.0.0"
+            },
+            "peerDependenciesMeta": {
+                "@typescript-eslint/eslint-plugin": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/eslint-scope": {
+            "version": "8.4.0",
+            "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.4.0.tgz",
+            "integrity": "sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "dependencies": {
+                "esrecurse": "^4.3.0",
+                "estraverse": "^5.2.0"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/eslint"
+            }
+        },
+        "node_modules/eslint-visitor-keys": {
+            "version": "4.2.1",
+            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
+            "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/eslint"
+            }
+        },
+        "node_modules/espree": {
+            "version": "10.4.0",
+            "resolved": "https://registry.npmjs.org/espree/-/espree-10.4.0.tgz",
+            "integrity": "sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "dependencies": {
+                "acorn": "^8.15.0",
+                "acorn-jsx": "^5.3.2",
+                "eslint-visitor-keys": "^4.2.1"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/eslint"
+            }
+        },
+        "node_modules/esprima": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+            "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "bin": {
+                "esparse": "bin/esparse.js",
+                "esvalidate": "bin/esvalidate.js"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/esquery": {
+            "version": "1.6.0",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "estraverse": "^5.1.0"
+            },
+            "engines": {
+                "node": ">=0.10"
+            }
+        },
+        "node_modules/esrecurse": {
+            "version": "4.3.0",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "dependencies": {
+                "estraverse": "^5.2.0"
+            },
+            "engines": {
+                "node": ">=4.0"
+            }
+        },
+        "node_modules/estraverse": {
+            "version": "5.3.0",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "engines": {
+                "node": ">=4.0"
+            }
+        },
+        "node_modules/esutils": {
+            "version": "2.0.3",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/eventemitter3": {
+            "version": "5.0.1",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/events": {
+            "version": "3.3.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.8.x"
+            }
+        },
+        "node_modules/execa": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+            "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "cross-spawn": "^6.0.0",
+                "get-stream": "^4.0.0",
+                "is-stream": "^1.1.0",
+                "npm-run-path": "^2.0.0",
+                "p-finally": "^1.0.0",
+                "signal-exit": "^3.0.0",
+                "strip-eof": "^1.0.0"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/execa/node_modules/cross-spawn": {
+            "version": "6.0.6",
+            "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.6.tgz",
+            "integrity": "sha512-VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "nice-try": "^1.0.4",
+                "path-key": "^2.0.1",
+                "semver": "^5.5.0",
+                "shebang-command": "^1.2.0",
+                "which": "^1.2.9"
+            },
+            "engines": {
+                "node": ">=4.8"
+            }
+        },
+        "node_modules/execa/node_modules/path-key": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+            "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/execa/node_modules/semver": {
+            "version": "5.7.2",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+            "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+            "dev": true,
+            "license": "ISC",
+            "bin": {
+                "semver": "bin/semver"
+            }
+        },
+        "node_modules/execa/node_modules/shebang-command": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+            "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "shebang-regex": "^1.0.0"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/execa/node_modules/shebang-regex": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+            "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/execa/node_modules/which": {
+            "version": "1.3.1",
+            "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+            "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "isexe": "^2.0.0"
+            },
+            "bin": {
+                "which": "bin/which"
+            }
+        },
+        "node_modules/extend": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+            "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/extend-shallow": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+            "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "assign-symbols": "^1.0.0",
+                "is-extendable": "^1.0.1"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/fancy-log": {
+            "version": "1.3.3",
+            "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz",
+            "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-gray": "^0.1.1",
+                "color-support": "^1.1.3",
+                "parse-node-version": "^1.0.0",
+                "time-stamp": "^1.0.0"
+            },
+            "engines": {
+                "node": ">= 0.10"
+            }
+        },
+        "node_modules/fast-deep-equal": {
+            "version": "3.1.3",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/fast-glob": {
+            "version": "3.3.3",
+            "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
+            "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@nodelib/fs.stat": "^2.0.2",
+                "@nodelib/fs.walk": "^1.2.3",
+                "glob-parent": "^5.1.2",
+                "merge2": "^1.3.0",
+                "micromatch": "^4.0.8"
+            },
+            "engines": {
+                "node": ">=8.6.0"
+            }
+        },
+        "node_modules/fast-glob/node_modules/glob-parent": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+            "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "is-glob": "^4.0.1"
+            },
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/fast-json-stable-stringify": {
+            "version": "2.1.0",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/fast-levenshtein": {
+            "version": "2.0.6",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/fast-uri": {
+            "version": "3.0.6",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/fastify"
+                },
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/fastify"
+                }
+            ],
+            "license": "BSD-3-Clause"
+        },
+        "node_modules/fastest-levenshtein": {
+            "version": "1.0.16",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 4.9.1"
+            }
+        },
+        "node_modules/fastq": {
+            "version": "1.19.1",
+            "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz",
+            "integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "reusify": "^1.0.4"
+            }
+        },
+        "node_modules/fault": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/fault/-/fault-1.0.4.tgz",
+            "integrity": "sha512-CJ0HCB5tL5fYTEA7ToAq5+kTwd++Borf1/bifxd9iT70QcXr4MRrO3Llf8Ifs70q+SJcGHFtnIE/Nw6giCtECA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "format": "^0.2.0"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/wooorm"
+            }
+        },
+        "node_modules/file-entry-cache": {
+            "version": "8.0.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "flat-cache": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/file-loader": {
+            "version": "6.2.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "loader-utils": "^2.0.0",
+                "schema-utils": "^3.0.0"
+            },
+            "engines": {
+                "node": ">= 10.13.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            },
+            "peerDependencies": {
+                "webpack": "^4.0.0 || ^5.0.0"
+            }
+        },
+        "node_modules/file-type": {
+            "version": "10.11.0",
+            "resolved": "https://registry.npmjs.org/file-type/-/file-type-10.11.0.tgz",
+            "integrity": "sha512-uzk64HRpUZyTGZtVuvrjP0FYxzQrBf4rojot6J65YMEbwBLB0CWm0CLojVpwpmFmxcE/lkvYICgfcGozbBq6rw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/fill-range": {
+            "version": "7.1.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "to-regex-range": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/find-up": {
+            "version": "5.0.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "locate-path": "^6.0.0",
+                "path-exists": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/flat": {
+            "version": "5.0.2",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "bin": {
+                "flat": "cli.js"
+            }
+        },
+        "node_modules/flat-cache": {
+            "version": "4.0.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "flatted": "^3.2.9",
+                "keyv": "^4.5.4"
+            },
+            "engines": {
+                "node": ">=16"
+            }
+        },
+        "node_modules/flatted": {
+            "version": "3.3.3",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/flush-write-stream": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
+            "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "inherits": "^2.0.3",
+                "readable-stream": "^2.3.6"
+            }
+        },
+        "node_modules/follow-redirects": {
+            "version": "1.5.10",
+            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
+            "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "debug": "=3.1.0"
+            },
+            "engines": {
+                "node": ">=4.0"
+            }
+        },
+        "node_modules/follow-redirects/node_modules/debug": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+            "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ms": "2.0.0"
+            }
+        },
+        "node_modules/follow-redirects/node_modules/ms": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+            "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/format": {
+            "version": "0.2.2",
+            "resolved": "https://registry.npmjs.org/format/-/format-0.2.2.tgz",
+            "integrity": "sha512-wzsgA6WOq+09wrU1tsJ09udeR/YZRaeArL9e1wPbFg3GG2yDnC2ldKpxs4xunpFF9DgqCqOIra3bc1HWrJ37Ww==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.4.x"
+            }
+        },
+        "node_modules/fs-extra": {
+            "version": "11.3.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "graceful-fs": "^4.2.0",
+                "jsonfile": "^6.0.1",
+                "universalify": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=14.14"
+            }
+        },
+        "node_modules/fs-mkdirp-stream": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz",
+            "integrity": "sha512-+vSd9frUnapVC2RZYfL3FCB2p3g4TBhaUmrsWlSudsGdnxIuUvBB2QM1VZeBtc49QFwrp+wQLrDs3+xxDgI5gQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "graceful-fs": "^4.1.11",
+                "through2": "^2.0.3"
+            },
+            "engines": {
+                "node": ">= 0.10"
+            }
+        },
+        "node_modules/fs.realpath": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+            "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/fsevents": {
+            "version": "2.3.3",
+            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+            "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+            "dev": true,
+            "hasInstallScript": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+            }
+        },
+        "node_modules/function-bind": {
+            "version": "1.1.2",
+            "dev": true,
+            "license": "MIT",
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/get-caller-file": {
+            "version": "2.0.5",
+            "dev": true,
+            "license": "ISC",
+            "engines": {
+                "node": "6.* || 8.* || >= 10.*"
+            }
+        },
+        "node_modules/get-intrinsic": {
+            "version": "1.3.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "call-bind-apply-helpers": "^1.0.2",
+                "es-define-property": "^1.0.1",
+                "es-errors": "^1.3.0",
+                "es-object-atoms": "^1.1.1",
+                "function-bind": "^1.1.2",
+                "get-proto": "^1.0.1",
+                "gopd": "^1.2.0",
+                "has-symbols": "^1.1.0",
+                "hasown": "^2.0.2",
+                "math-intrinsics": "^1.1.0"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/get-proto": {
+            "version": "1.0.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "dunder-proto": "^1.0.1",
+                "es-object-atoms": "^1.0.0"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/get-stream": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+            "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "pump": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/get-tsconfig": {
+            "version": "4.10.1",
+            "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.10.1.tgz",
+            "integrity": "sha512-auHyJ4AgMz7vgS8Hp3N6HXSmlMdUyhSUrfBF16w153rxtLIEOE+HGqaBppczZvnHLqQJfiHotCYpNhl0lUROFQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "resolve-pkg-maps": "^1.0.0"
+            },
+            "funding": {
+                "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1"
+            }
+        },
+        "node_modules/glob": {
+            "version": "7.2.3",
+            "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+            "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+            "deprecated": "Glob versions prior to v9 are no longer supported",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^3.1.1",
+                "once": "^1.3.0",
+                "path-is-absolute": "^1.0.0"
+            },
+            "engines": {
+                "node": "*"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/glob-parent": {
+            "version": "6.0.2",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "is-glob": "^4.0.3"
+            },
+            "engines": {
+                "node": ">=10.13.0"
+            }
+        },
+        "node_modules/glob-stream": {
+            "version": "6.1.0",
+            "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz",
+            "integrity": "sha512-uMbLGAP3S2aDOHUDfdoYcdIePUCfysbAd0IAoWVZbeGU/oNQ8asHVSshLDJUPWxfzj8zsCG7/XeHPHTtow0nsw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "extend": "^3.0.0",
+                "glob": "^7.1.1",
+                "glob-parent": "^3.1.0",
+                "is-negated-glob": "^1.0.0",
+                "ordered-read-streams": "^1.0.0",
+                "pumpify": "^1.3.5",
+                "readable-stream": "^2.1.5",
+                "remove-trailing-separator": "^1.0.1",
+                "to-absolute-glob": "^2.0.0",
+                "unique-stream": "^2.0.2"
+            },
+            "engines": {
+                "node": ">= 0.10"
+            }
+        },
+        "node_modules/glob-stream/node_modules/glob-parent": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+            "integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "is-glob": "^3.1.0",
+                "path-dirname": "^1.0.0"
+            }
+        },
+        "node_modules/glob-stream/node_modules/is-glob": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+            "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "is-extglob": "^2.1.0"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/glob-to-regexp": {
+            "version": "0.4.1",
+            "dev": true,
+            "license": "BSD-2-Clause"
+        },
+        "node_modules/globals": {
+            "version": "14.0.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=18"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/gopd": {
+            "version": "1.2.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/graceful-fs": {
+            "version": "4.2.11",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/graphemer": {
+            "version": "1.4.0",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/gulp-exclude-gitignore": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/gulp-exclude-gitignore/-/gulp-exclude-gitignore-1.2.0.tgz",
+            "integrity": "sha512-J3LCmz9C1UU1pxf5Npx6SNc5o9YQptyc9IHaqLiBlihZmg44jaaTplWUZ0JPQkMdOTae0YgEDvT9TKlUWDSMUA==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "gulp-ignore": "^2.0.2"
+            }
+        },
+        "node_modules/gulp-filter": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/gulp-filter/-/gulp-filter-5.1.0.tgz",
+            "integrity": "sha512-ZERu1ipbPmjrNQ2dQD6lL4BjrJQG66P/c5XiyMMBqV+tUAJ+fLOyYIL/qnXd2pHmw/G/r7CLQb9ttANvQWbpfQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "multimatch": "^2.0.0",
+                "plugin-error": "^0.1.2",
+                "streamfilter": "^1.0.5"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/gulp-filter/node_modules/arr-diff": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz",
+            "integrity": "sha512-OQwDZUqYaQwyyhDJHThmzId8daf4/RFNLaeh3AevmSeZ5Y7ug4Ga/yKc6l6kTZOBW781rCj103ZuTh8GAsB3+Q==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "arr-flatten": "^1.0.1",
+                "array-slice": "^0.2.3"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/gulp-filter/node_modules/arr-union": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz",
+            "integrity": "sha512-t5db90jq+qdgk8aFnxEkjqta0B/GHrM1pxzuuZz2zWsOXc5nKu3t+76s/PQBA8FTcM/ipspIH9jWG4OxCBc2eA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/gulp-filter/node_modules/extend-shallow": {
+            "version": "1.1.4",
+            "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz",
+            "integrity": "sha512-L7AGmkO6jhDkEBBGWlLtftA80Xq8DipnrRPr0pyi7GQLXkaq9JYA4xF4z6qnadIC6euiTDKco0cGSU9muw+WTw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "kind-of": "^1.1.0"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/gulp-filter/node_modules/kind-of": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
+            "integrity": "sha512-aUH6ElPnMGon2/YkxRIigV32MOpTVcoXQ1Oo8aYn40s+sJ3j+0gFZsT8HKDcxNy7Fi9zuquWtGaGAahOdv5p/g==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/gulp-filter/node_modules/plugin-error": {
+            "version": "0.1.2",
+            "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz",
+            "integrity": "sha512-WzZHcm4+GO34sjFMxQMqZbsz3xiNEgonCskQ9v+IroMmYgk/tas8dG+Hr2D6IbRPybZ12oWpzE/w3cGJ6FJzOw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-cyan": "^0.1.1",
+                "ansi-red": "^0.1.1",
+                "arr-diff": "^1.0.1",
+                "arr-union": "^2.0.1",
+                "extend-shallow": "^1.1.2"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/gulp-ignore": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/gulp-ignore/-/gulp-ignore-2.0.2.tgz",
+            "integrity": "sha512-KGtd/qgp0FLDlei986/aZ5xSyw1cqJ2BsiaWht0L0PzaQXxYKRCMkFcDPQ8fQx6JVA6Gx9OefmBFzxTtop5hMw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "gulp-match": "^1.0.3",
+                "through2": "^2.0.1"
+            },
+            "engines": {
+                "node": ">= 0.10.0"
+            }
+        },
+        "node_modules/gulp-match": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/gulp-match/-/gulp-match-1.1.0.tgz",
+            "integrity": "sha512-DlyVxa1Gj24DitY2OjEsS+X6tDpretuxD6wTfhXE/Rw2hweqc1f6D/XtsJmoiCwLWfXgR87W9ozEityPCVzGtQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "minimatch": "^3.0.3"
+            }
+        },
+        "node_modules/gulp-reporter": {
+            "version": "2.10.0",
+            "resolved": "https://registry.npmjs.org/gulp-reporter/-/gulp-reporter-2.10.0.tgz",
+            "integrity": "sha512-HeruxN7TL/enOB+pJfFmeekVsXsZzQvVGpL7vOLdUe7y7VdqHUvMQRRW5qMIvVSKqRs3EtQiR/kURu3WWfXq6w==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-escapes": "^3.1.0",
+                "axios": "^0.18.0",
+                "buffered-spawn": "^3.3.2",
+                "bufferstreams": "^2.0.1",
+                "chalk": "^2.4.1",
+                "checkstyle-formatter": "^1.1.0",
+                "ci-info": "^2.0.0",
+                "cli-truncate": "^1.1.0",
+                "emphasize": "^2.0.0",
+                "fancy-log": "^1.3.3",
+                "fs-extra": "^7.0.1",
+                "in-gfw": "^1.2.0",
+                "is-windows": "^1.0.2",
+                "js-yaml": "^3.12.0",
+                "junit-report-builder": "^1.3.1",
+                "lodash.get": "^4.4.2",
+                "os-locale": "^3.0.1",
+                "plugin-error": "^1.0.1",
+                "string-width": "^3.0.0",
+                "term-size": "^1.2.0",
+                "through2": "^3.0.0",
+                "to-time": "^1.0.2"
+            }
+        },
+        "node_modules/gulp-reporter/node_modules/ansi-regex": {
+            "version": "4.1.1",
+            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+            "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/gulp-reporter/node_modules/ansi-styles": {
+            "version": "3.2.1",
+            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+            "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "color-convert": "^1.9.0"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/gulp-reporter/node_modules/argparse": {
+            "version": "1.0.10",
+            "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+            "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "sprintf-js": "~1.0.2"
+            }
+        },
+        "node_modules/gulp-reporter/node_modules/chalk": {
+            "version": "2.4.2",
+            "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+            "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-styles": "^3.2.1",
+                "escape-string-regexp": "^1.0.5",
+                "supports-color": "^5.3.0"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/gulp-reporter/node_modules/color-convert": {
+            "version": "1.9.3",
+            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+            "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "color-name": "1.1.3"
+            }
+        },
+        "node_modules/gulp-reporter/node_modules/color-name": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+            "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/gulp-reporter/node_modules/emoji-regex": {
+            "version": "7.0.3",
+            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+            "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/gulp-reporter/node_modules/escape-string-regexp": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+            "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.8.0"
+            }
+        },
+        "node_modules/gulp-reporter/node_modules/fs-extra": {
+            "version": "7.0.1",
+            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
+            "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "graceful-fs": "^4.1.2",
+                "jsonfile": "^4.0.0",
+                "universalify": "^0.1.0"
+            },
+            "engines": {
+                "node": ">=6 <7 || >=8"
+            }
+        },
+        "node_modules/gulp-reporter/node_modules/has-flag": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+            "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/gulp-reporter/node_modules/is-fullwidth-code-point": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+            "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/gulp-reporter/node_modules/js-yaml": {
+            "version": "3.14.2",
+            "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.2.tgz",
+            "integrity": "sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "argparse": "^1.0.7",
+                "esprima": "^4.0.0"
+            },
+            "bin": {
+                "js-yaml": "bin/js-yaml.js"
+            }
+        },
+        "node_modules/gulp-reporter/node_modules/jsonfile": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+            "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
+            "dev": true,
+            "license": "MIT",
+            "optionalDependencies": {
+                "graceful-fs": "^4.1.6"
+            }
+        },
+        "node_modules/gulp-reporter/node_modules/string-width": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+            "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "emoji-regex": "^7.0.1",
+                "is-fullwidth-code-point": "^2.0.0",
+                "strip-ansi": "^5.1.0"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/gulp-reporter/node_modules/strip-ansi": {
+            "version": "5.2.0",
+            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+            "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-regex": "^4.1.0"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/gulp-reporter/node_modules/supports-color": {
+            "version": "5.5.0",
+            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+            "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "has-flag": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/gulp-reporter/node_modules/through2": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz",
+            "integrity": "sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "inherits": "^2.0.4",
+                "readable-stream": "2 || 3"
+            }
+        },
+        "node_modules/gulp-reporter/node_modules/universalify": {
+            "version": "0.1.2",
+            "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+            "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 4.0.0"
+            }
+        },
+        "node_modules/gulp-tap": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/gulp-tap/-/gulp-tap-1.0.1.tgz",
+            "integrity": "sha512-VpCARRSyr+WP16JGnoIg98/AcmyQjOwCpQgYoE35CWTdEMSbpgtAIK2fndqv2yY7aXstW27v3ZNBs0Ltb0Zkbg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "through2": "^2.0.3"
+            }
+        },
+        "node_modules/has-flag": {
+            "version": "4.0.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/has-property-descriptors": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+            "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "es-define-property": "^1.0.0"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/has-symbols": {
+            "version": "1.1.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/hasown": {
+            "version": "2.0.2",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "function-bind": "^1.1.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/highlight.js": {
+            "version": "9.12.0",
+            "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.12.0.tgz",
+            "integrity": "sha512-qNnYpBDO/FQwYVur1+sQBQw7v0cxso1nOYLklqWh6af8ROwwTVoII5+kf/BVa8354WL4ad6rURHYGUXCbD9mMg==",
+            "deprecated": "Version no longer supported. Upgrade to @latest",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/iconv-lite": {
+            "version": "0.4.24",
+            "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+            "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "safer-buffer": ">= 2.1.2 < 3"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/icss-utils": {
+            "version": "5.1.0",
+            "dev": true,
+            "license": "ISC",
+            "engines": {
+                "node": "^10 || ^12 || >= 14"
+            },
+            "peerDependencies": {
+                "postcss": "^8.1.0"
+            }
+        },
+        "node_modules/ignore": {
+            "version": "5.3.2",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 4"
+            }
+        },
+        "node_modules/immutable": {
+            "version": "5.1.1",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/import-fresh": {
+            "version": "3.3.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "parent-module": "^1.0.0",
+                "resolve-from": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=6"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/import-local": {
+            "version": "3.2.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "pkg-dir": "^4.2.0",
+                "resolve-cwd": "^3.0.0"
+            },
+            "bin": {
+                "import-local-fixture": "fixtures/cli.js"
+            },
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/imurmurhash": {
+            "version": "0.1.4",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.8.19"
+            }
+        },
+        "node_modules/in-gfw": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/in-gfw/-/in-gfw-1.2.0.tgz",
+            "integrity": "sha512-LgSoQXzuSS/x/nh0eIggq7PsI7gs/sQdXNEolRmHaFUj6YMFmPO1kxQ7XpcT3nPpC3DMwYiJmgnluqJmFXYiMg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "glob": "^7.1.2",
+                "is-wsl": "^1.1.0",
+                "mem": "^3.0.1"
+            }
+        },
+        "node_modules/inflight": {
+            "version": "1.0.6",
+            "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+            "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+            "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "once": "^1.3.0",
+                "wrappy": "1"
+            }
+        },
+        "node_modules/inherits": {
+            "version": "2.0.4",
+            "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+            "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/interpret": {
+            "version": "3.1.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=10.13.0"
+            }
+        },
+        "node_modules/invert-kv": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
+            "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/is-absolute": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
+            "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "is-relative": "^1.0.0",
+                "is-windows": "^1.0.1"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/is-buffer": {
+            "version": "2.0.5",
+            "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz",
+            "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==",
+            "dev": true,
+            "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",
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/is-core-module": {
+            "version": "2.16.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "hasown": "^2.0.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/is-extendable": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+            "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "is-plain-object": "^2.0.4"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/is-extglob": {
+            "version": "2.1.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/is-fullwidth-code-point": {
+            "version": "3.0.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/is-glob": {
+            "version": "4.0.3",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "is-extglob": "^2.1.1"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/is-negated-glob": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz",
+            "integrity": "sha512-czXVVn/QEmgvej1f50BZ648vUI+em0xqMq2Sn+QncCLN4zj1UAxlT+kw/6ggQTOaZPd1HqKQGEqbpQVtJucWug==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/is-number": {
+            "version": "7.0.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.12.0"
+            }
+        },
+        "node_modules/is-plain-object": {
+            "version": "2.0.4",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "isobject": "^3.0.1"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/is-relative": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
+            "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "is-unc-path": "^1.0.0"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/is-stream": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+            "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/is-unc-path": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
+            "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "unc-path-regex": "^0.1.2"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/is-utf8": {
+            "version": "0.2.1",
+            "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
+            "integrity": "sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/is-valid-glob": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz",
+            "integrity": "sha512-AhiROmoEFDSsjx8hW+5sGwgKVIORcXnrlAx/R0ZSeaPw70Vw0CqkGBBhHGL58Uox2eXnU1AnvXJl1XlyedO5bA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/is-windows": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+            "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/is-wsl": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
+            "integrity": "sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/isarray": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+            "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/isexe": {
+            "version": "2.0.0",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/isobject": {
+            "version": "3.0.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/js-yaml": {
+            "version": "4.1.1",
+            "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
+            "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "argparse": "^2.0.1"
+            },
+            "bin": {
+                "js-yaml": "bin/js-yaml.js"
+            }
+        },
+        "node_modules/json-buffer": {
+            "version": "3.0.1",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/json-parse-even-better-errors": {
+            "version": "2.3.1",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/json-schema-traverse": {
+            "version": "0.4.1",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/json-stable-stringify-without-jsonify": {
+            "version": "1.0.1",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/json5": {
+            "version": "2.2.3",
+            "dev": true,
+            "license": "MIT",
+            "bin": {
+                "json5": "lib/cli.js"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/jsonfile": {
+            "version": "6.1.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "universalify": "^2.0.0"
+            },
+            "optionalDependencies": {
+                "graceful-fs": "^4.1.6"
+            }
+        },
+        "node_modules/junit-report-builder": {
+            "version": "1.3.3",
+            "resolved": "https://registry.npmjs.org/junit-report-builder/-/junit-report-builder-1.3.3.tgz",
+            "integrity": "sha512-75bwaXjP/3ogyzOSkkcshXGG7z74edkJjgTZlJGAyzxlOHaguexM3VLG6JyD9ZBF8mlpgsUPB1sIWU4LISgeJw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "date-format": "0.0.2",
+                "lodash": "^4.17.15",
+                "mkdirp": "^0.5.0",
+                "xmlbuilder": "^10.0.0"
+            }
+        },
+        "node_modules/keyv": {
+            "version": "4.5.4",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "json-buffer": "3.0.1"
+            }
+        },
+        "node_modules/kind-of": {
+            "version": "6.0.3",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/lazystream": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.1.tgz",
+            "integrity": "sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "readable-stream": "^2.0.5"
+            },
+            "engines": {
+                "node": ">= 0.6.3"
+            }
+        },
+        "node_modules/lcid": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
+            "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "invert-kv": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/lead": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/lead/-/lead-1.0.0.tgz",
+            "integrity": "sha512-IpSVCk9AYvLHo5ctcIXxOBpMWUe+4TKN3VPWAKUbJikkmsGp0VrSM8IttVc32D6J4WUsiPE6aEFRNmIoF/gdow==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "flush-write-stream": "^1.0.2"
+            },
+            "engines": {
+                "node": ">= 0.10"
+            }
+        },
+        "node_modules/levn": {
+            "version": "0.4.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "prelude-ls": "^1.2.1",
+                "type-check": "~0.4.0"
+            },
+            "engines": {
+                "node": ">= 0.8.0"
+            }
+        },
+        "node_modules/linez": {
+            "version": "4.1.4",
+            "resolved": "https://registry.npmjs.org/linez/-/linez-4.1.4.tgz",
+            "integrity": "sha512-TsqcAfotPMB9xodBIklBaJz3sRIXtkca8Kv/MO8nzAufsitCKRoYWU5MZccdCVYB81tGexYHRsrSIEiJsQhpVQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "buffer-equals": "^1.0.4",
+                "iconv-lite": "^0.4.15"
+            }
+        },
+        "node_modules/loader-runner": {
+            "version": "4.3.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6.11.5"
+            }
+        },
+        "node_modules/loader-utils": {
+            "version": "2.0.4",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "big.js": "^5.2.2",
+                "emojis-list": "^3.0.0",
+                "json5": "^2.1.2"
+            },
+            "engines": {
+                "node": ">=8.9.0"
+            }
+        },
+        "node_modules/local-client-cli": {
+            "resolved": "local-client-cli",
+            "link": true
+        },
+        "node_modules/locate-path": {
+            "version": "6.0.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "p-locate": "^5.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/lodash": {
+            "version": "4.17.21",
+            "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+            "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/lodash.get": {
+            "version": "4.4.2",
+            "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
+            "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==",
+            "deprecated": "This package is deprecated. Use the optional chaining (?.) operator instead.",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/lodash.merge": {
+            "version": "4.6.2",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/lowlight": {
+            "version": "1.9.2",
+            "resolved": "https://registry.npmjs.org/lowlight/-/lowlight-1.9.2.tgz",
+            "integrity": "sha512-Ek18ElVCf/wF/jEm1b92gTnigh94CtBNWiZ2ad+vTgW7cTmQxUY3I98BjHK68gZAJEWmybGBZgx9qv3QxLQB/Q==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "fault": "^1.0.2",
+                "highlight.js": "~9.12.0"
+            }
+        },
+        "node_modules/lru-cache": {
+            "version": "4.1.5",
+            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+            "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "pseudomap": "^1.0.2",
+                "yallist": "^2.1.2"
+            }
+        },
+        "node_modules/map-age-cleaner": {
+            "version": "0.1.3",
+            "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
+            "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "p-defer": "^1.0.0"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/math-intrinsics": {
+            "version": "1.1.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/mem": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/mem/-/mem-3.0.1.tgz",
+            "integrity": "sha512-QKs47bslvOE0NbXOqG6lMxn6Bk0Iuw0vfrIeLykmQle2LkCw1p48dZDdzE+D88b/xqRJcZGcMNeDvSVma+NuIQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "mimic-fn": "^1.0.0",
+                "p-is-promise": "^1.1.0"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/merge-stream": {
+            "version": "2.0.0",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/merge2": {
+            "version": "1.4.1",
+            "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+            "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/micromatch": {
+            "version": "4.0.8",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "braces": "^3.0.3",
+                "picomatch": "^2.3.1"
+            },
+            "engines": {
+                "node": ">=8.6"
+            }
+        },
+        "node_modules/mime-db": {
+            "version": "1.52.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/mime-types": {
+            "version": "2.1.35",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "mime-db": "1.52.0"
+            },
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/mimic-fn": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
+            "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/mini-css-extract-plugin": {
+            "version": "2.9.2",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "schema-utils": "^4.0.0",
+                "tapable": "^2.2.1"
+            },
+            "engines": {
+                "node": ">= 12.13.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            },
+            "peerDependencies": {
+                "webpack": "^5.0.0"
+            }
+        },
+        "node_modules/mini-css-extract-plugin/node_modules/ajv": {
+            "version": "8.17.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "fast-deep-equal": "^3.1.3",
+                "fast-uri": "^3.0.1",
+                "json-schema-traverse": "^1.0.0",
+                "require-from-string": "^2.0.2"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/epoberezkin"
+            }
+        },
+        "node_modules/mini-css-extract-plugin/node_modules/ajv-keywords": {
+            "version": "5.1.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "fast-deep-equal": "^3.1.3"
+            },
+            "peerDependencies": {
+                "ajv": "^8.8.2"
+            }
+        },
+        "node_modules/mini-css-extract-plugin/node_modules/json-schema-traverse": {
+            "version": "1.0.0",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/mini-css-extract-plugin/node_modules/schema-utils": {
+            "version": "4.3.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/json-schema": "^7.0.9",
+                "ajv": "^8.9.0",
+                "ajv-formats": "^2.1.1",
+                "ajv-keywords": "^5.1.0"
+            },
+            "engines": {
+                "node": ">= 10.13.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            }
+        },
+        "node_modules/minimatch": {
+            "version": "3.1.2",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "brace-expansion": "^1.1.7"
+            },
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/minimist": {
+            "version": "1.2.8",
+            "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+            "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+            "dev": true,
+            "license": "MIT",
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/mkdirp": {
+            "version": "0.5.6",
+            "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+            "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "minimist": "^1.2.6"
+            },
+            "bin": {
+                "mkdirp": "bin/cmd.js"
+            }
+        },
+        "node_modules/moment": {
+            "version": "2.29.4",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/ms": {
+            "version": "2.1.3",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/multimatch": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-2.1.0.tgz",
+            "integrity": "sha512-0mzK8ymiWdehTBiJh0vClAzGyQbdtyWqzSVx//EK4N/D+599RFlGfTAsKw2zMSABtDG9C6Ul2+t8f2Lbdjf5mA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "array-differ": "^1.0.0",
+                "array-union": "^1.0.1",
+                "arrify": "^1.0.0",
+                "minimatch": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/nanoid": {
+            "version": "3.3.11",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/ai"
+                }
+            ],
+            "license": "MIT",
+            "bin": {
+                "nanoid": "bin/nanoid.cjs"
+            },
+            "engines": {
+                "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+            }
+        },
+        "node_modules/natural-compare": {
+            "version": "1.4.0",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/neo-async": {
+            "version": "2.6.2",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/nice-try": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
+            "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/node-addon-api": {
+            "version": "7.1.1",
+            "dev": true,
+            "license": "MIT",
+            "optional": true
+        },
+        "node_modules/node-gyp-build": {
+            "version": "4.8.4",
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "peer": true,
+            "bin": {
+                "node-gyp-build": "bin.js",
+                "node-gyp-build-optional": "optional.js",
+                "node-gyp-build-test": "build-test.js"
+            }
+        },
+        "node_modules/node-releases": {
+            "version": "2.0.19",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/normalize-path": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+            "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "remove-trailing-separator": "^1.0.1"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/now-and-later": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/now-and-later/-/now-and-later-2.0.1.tgz",
+            "integrity": "sha512-KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "once": "^1.3.2"
+            },
+            "engines": {
+                "node": ">= 0.10"
+            }
+        },
+        "node_modules/npm-check-updates": {
+            "version": "19.1.1",
+            "resolved": "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-19.1.1.tgz",
+            "integrity": "sha512-vy/uNbaK6Xfj/QzM8OXeALZak67E0uHjUlbdT1YGy4bdj0xlBU6AVd+8bscY8vlDpyzL6Y7mxcrX8kzEDeEpNg==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "bin": {
+                "ncu": "build/cli.js",
+                "npm-check-updates": "build/cli.js"
+            },
+            "engines": {
+                "node": ">=20.0.0",
+                "npm": ">=8.12.1"
+            }
+        },
+        "node_modules/npm-run-path": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+            "integrity": "sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "path-key": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/npm-run-path/node_modules/path-key": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+            "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/number-is-nan": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+            "integrity": "sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/object-inspect": {
+            "version": "1.13.4",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/object-keys": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+            "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/object.assign": {
+            "version": "4.1.7",
+            "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.7.tgz",
+            "integrity": "sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "call-bind": "^1.0.8",
+                "call-bound": "^1.0.3",
+                "define-properties": "^1.2.1",
+                "es-object-atoms": "^1.0.0",
+                "has-symbols": "^1.1.0",
+                "object-keys": "^1.1.1"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/obsidian": {
+            "version": "1.10.2",
+            "resolved": "https://registry.npmjs.org/obsidian/-/obsidian-1.10.2.tgz",
+            "integrity": "sha512-bX03YCHf06OTzI/D+QK71ajCPCmwr/cjxzlVXjQa10DjK5iHRWhtJJpp83arSCyayFMp23u+UHcY7hxcEx2Mvg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/codemirror": "5.60.8",
+                "moment": "2.29.4"
+            },
+            "peerDependencies": {
+                "@codemirror/state": "6.5.0",
+                "@codemirror/view": "6.38.1"
+            }
+        },
+        "node_modules/once": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+            "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "wrappy": "1"
+            }
+        },
+        "node_modules/optionator": {
+            "version": "0.9.4",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "deep-is": "^0.1.3",
+                "fast-levenshtein": "^2.0.6",
+                "levn": "^0.4.1",
+                "prelude-ls": "^1.2.1",
+                "type-check": "^0.4.0",
+                "word-wrap": "^1.2.5"
+            },
+            "engines": {
+                "node": ">= 0.8.0"
+            }
+        },
+        "node_modules/ordered-read-streams": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz",
+            "integrity": "sha512-Z87aSjx3r5c0ZB7bcJqIgIRX5bxR7A4aSzvIbaxd0oTkWBCOoKfuGHiKj60CHVUgg1Phm5yMZzBdt8XqRs73Mw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "readable-stream": "^2.0.1"
+            }
+        },
+        "node_modules/os-locale": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
+            "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "execa": "^1.0.0",
+                "lcid": "^2.0.0",
+                "mem": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/os-locale/node_modules/mem": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
+            "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "map-age-cleaner": "^0.1.1",
+                "mimic-fn": "^2.0.0",
+                "p-is-promise": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/os-locale/node_modules/mimic-fn": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+            "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/os-locale/node_modules/p-is-promise": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
+            "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/p-defer": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
+            "integrity": "sha512-wB3wfAxZpk2AzOfUMJNL+d36xothRSyj8EXOa4f6GMqYDN9BJaaSISbsk+wS9abmnebVw95C2Kb5t85UmpCxuw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/p-finally": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+            "integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/p-is-promise": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz",
+            "integrity": "sha512-zL7VE4JVS2IFSkR2GQKDSPEVxkoH43/p7oEnwpdCndKYJO0HVeRB7fA8TJwuLOTBREtK0ea8eHaxdwcpob5dmg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/p-limit": {
+            "version": "3.1.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "yocto-queue": "^0.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/p-locate": {
+            "version": "5.0.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "p-limit": "^3.0.2"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/p-queue": {
+            "version": "8.1.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "eventemitter3": "^5.0.1",
+                "p-timeout": "^6.1.2"
+            },
+            "engines": {
+                "node": ">=18"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/p-timeout": {
+            "version": "6.1.4",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=14.16"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/p-try": {
+            "version": "2.2.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/parent-module": {
+            "version": "1.0.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "callsites": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/parse-node-version": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",
+            "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.10"
+            }
+        },
+        "node_modules/path-dirname": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
+            "integrity": "sha512-ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/path-exists": {
+            "version": "4.0.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/path-is-absolute": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+            "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/path-key": {
+            "version": "3.1.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/path-parse": {
+            "version": "1.0.7",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/picocolors": {
+            "version": "1.1.1",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/picomatch": {
+            "version": "2.3.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8.6"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/jonschlinkert"
+            }
+        },
+        "node_modules/pkg-dir": {
+            "version": "4.2.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "find-up": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/pkg-dir/node_modules/find-up": {
+            "version": "4.1.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "locate-path": "^5.0.0",
+                "path-exists": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/pkg-dir/node_modules/locate-path": {
+            "version": "5.0.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "p-locate": "^4.1.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/pkg-dir/node_modules/p-limit": {
+            "version": "2.3.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "p-try": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=6"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/pkg-dir/node_modules/p-locate": {
+            "version": "4.1.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "p-limit": "^2.2.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/plugin-error": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
+            "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-colors": "^1.0.1",
+                "arr-diff": "^4.0.0",
+                "arr-union": "^3.1.0",
+                "extend-shallow": "^3.0.2"
+            },
+            "engines": {
+                "node": ">= 0.10"
+            }
+        },
+        "node_modules/postcss": {
+            "version": "8.5.3",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/postcss/"
+                },
+                {
+                    "type": "tidelift",
+                    "url": "https://tidelift.com/funding/github/npm/postcss"
+                },
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/ai"
+                }
+            ],
+            "license": "MIT",
+            "dependencies": {
+                "nanoid": "^3.3.8",
+                "picocolors": "^1.1.1",
+                "source-map-js": "^1.2.1"
+            },
+            "engines": {
+                "node": "^10 || ^12 || >=14"
+            }
+        },
+        "node_modules/postcss-modules-extract-imports": {
+            "version": "3.1.0",
+            "dev": true,
+            "license": "ISC",
+            "engines": {
+                "node": "^10 || ^12 || >= 14"
+            },
+            "peerDependencies": {
+                "postcss": "^8.1.0"
+            }
+        },
+        "node_modules/postcss-modules-local-by-default": {
+            "version": "4.2.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "icss-utils": "^5.0.0",
+                "postcss-selector-parser": "^7.0.0",
+                "postcss-value-parser": "^4.1.0"
+            },
+            "engines": {
+                "node": "^10 || ^12 || >= 14"
+            },
+            "peerDependencies": {
+                "postcss": "^8.1.0"
+            }
+        },
+        "node_modules/postcss-modules-scope": {
+            "version": "3.2.1",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "postcss-selector-parser": "^7.0.0"
+            },
+            "engines": {
+                "node": "^10 || ^12 || >= 14"
+            },
+            "peerDependencies": {
+                "postcss": "^8.1.0"
+            }
+        },
+        "node_modules/postcss-modules-values": {
+            "version": "4.0.0",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "icss-utils": "^5.0.0"
+            },
+            "engines": {
+                "node": "^10 || ^12 || >= 14"
+            },
+            "peerDependencies": {
+                "postcss": "^8.1.0"
+            }
+        },
+        "node_modules/postcss-selector-parser": {
+            "version": "7.1.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "cssesc": "^3.0.0",
+                "util-deprecate": "^1.0.2"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/postcss-value-parser": {
+            "version": "4.2.0",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/prelude-ls": {
+            "version": "1.2.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.8.0"
+            }
+        },
+        "node_modules/prettier": {
+            "version": "3.6.2",
+            "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz",
+            "integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==",
+            "dev": true,
+            "license": "MIT",
+            "bin": {
+                "prettier": "bin/prettier.cjs"
+            },
+            "engines": {
+                "node": ">=14"
+            },
+            "funding": {
+                "url": "https://github.com/prettier/prettier?sponsor=1"
+            }
+        },
+        "node_modules/process-nextick-args": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+            "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/pseudomap": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
+            "integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/pump": {
+            "version": "3.0.3",
+            "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.3.tgz",
+            "integrity": "sha512-todwxLMY7/heScKmntwQG8CXVkWUOdYxIvY2s0VWAAMh/nd8SoYiRaKjlr7+iCs984f2P8zvrfWcDDYVb73NfA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "end-of-stream": "^1.1.0",
+                "once": "^1.3.1"
+            }
+        },
+        "node_modules/pumpify": {
+            "version": "1.5.1",
+            "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
+            "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "duplexify": "^3.6.0",
+                "inherits": "^2.0.3",
+                "pump": "^2.0.0"
+            }
+        },
+        "node_modules/pumpify/node_modules/pump": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
+            "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "end-of-stream": "^1.1.0",
+                "once": "^1.3.1"
+            }
+        },
+        "node_modules/punycode": {
+            "version": "2.3.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/qs": {
+            "version": "6.14.0",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "side-channel": "^1.1.0"
+            },
+            "engines": {
+                "node": ">=0.6"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/queue-microtask": {
+            "version": "1.2.3",
+            "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+            "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+            "dev": true,
+            "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"
+        },
+        "node_modules/randombytes": {
+            "version": "2.1.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "safe-buffer": "^5.1.0"
+            }
+        },
+        "node_modules/readable-stream": {
+            "version": "2.3.8",
+            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+            "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+            }
+        },
+        "node_modules/readable-stream/node_modules/safe-buffer": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+            "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/readdirp": {
+            "version": "4.1.2",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 14.18.0"
+            },
+            "funding": {
+                "type": "individual",
+                "url": "https://paulmillr.com/funding/"
+            }
+        },
+        "node_modules/rechoir": {
+            "version": "0.8.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "resolve": "^1.20.0"
+            },
+            "engines": {
+                "node": ">= 10.13.0"
+            }
+        },
+        "node_modules/reconcile-text": {
+            "version": "0.8.0",
+            "resolved": "https://registry.npmjs.org/reconcile-text/-/reconcile-text-0.8.0.tgz",
+            "integrity": "sha512-evskVha3YgpP2ZelsFxP9t7CuKnwE7TrsH3FdrH2mfKbzjUWiNF7scHXsFbFS921lmFlAOB94DHNAWPvL34Mqg==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/regex-parser": {
+            "version": "2.3.1",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/remove-bom-buffer": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz",
+            "integrity": "sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "is-buffer": "^1.1.5",
+                "is-utf8": "^0.2.1"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/remove-bom-buffer/node_modules/is-buffer": {
+            "version": "1.1.6",
+            "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+            "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/remove-bom-stream": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz",
+            "integrity": "sha512-wigO8/O08XHb8YPzpDDT+QmRANfW6vLqxfaXm1YXhnFf3AkSLyjfG3GEFg4McZkmgL7KvCj5u2KczkvSP6NfHA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "remove-bom-buffer": "^3.0.0",
+                "safe-buffer": "^5.1.0",
+                "through2": "^2.0.3"
+            },
+            "engines": {
+                "node": ">= 0.10"
+            }
+        },
+        "node_modules/remove-trailing-separator": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
+            "integrity": "sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/replace-ext": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz",
+            "integrity": "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.10"
+            }
+        },
+        "node_modules/require-directory": {
+            "version": "2.1.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/require-from-string": {
+            "version": "2.0.2",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/require-main-filename": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
+            "integrity": "sha512-IqSUtOVP4ksd1C/ej5zeEh/BIP2ajqpn8c5x+q99gvcIG/Qf0cud5raVnE/Dwd0ua9TXYDoDc0RE5hBSdz22Ug==",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/resolve": {
+            "version": "1.22.10",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "is-core-module": "^2.16.0",
+                "path-parse": "^1.0.7",
+                "supports-preserve-symlinks-flag": "^1.0.0"
+            },
+            "bin": {
+                "resolve": "bin/resolve"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/resolve-cwd": {
+            "version": "3.0.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "resolve-from": "^5.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/resolve-cwd/node_modules/resolve-from": {
+            "version": "5.0.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/resolve-from": {
+            "version": "4.0.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/resolve-options": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/resolve-options/-/resolve-options-1.1.0.tgz",
+            "integrity": "sha512-NYDgziiroVeDC29xq7bp/CacZERYsA9bXYd1ZmcJlF3BcrZv5pTb4NG7SjdyKDnXZ84aC4vo2u6sNKIA1LCu/A==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "value-or-function": "^3.0.0"
+            },
+            "engines": {
+                "node": ">= 0.10"
+            }
+        },
+        "node_modules/resolve-pkg-maps": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz",
+            "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==",
+            "dev": true,
+            "license": "MIT",
+            "funding": {
+                "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1"
+            }
+        },
+        "node_modules/resolve-url-loader": {
+            "version": "5.0.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "adjust-sourcemap-loader": "^4.0.0",
+                "convert-source-map": "^1.7.0",
+                "loader-utils": "^2.0.0",
+                "postcss": "^8.2.14",
+                "source-map": "0.6.1"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/reusify": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz",
+            "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "iojs": ">=1.0.0",
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/run-parallel": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+            "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+            "dev": true,
+            "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": {
+                "queue-microtask": "^1.2.2"
+            }
+        },
+        "node_modules/rxjs": {
+            "version": "7.8.2",
+            "dev": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.1.0"
+            }
+        },
+        "node_modules/safe-buffer": {
+            "version": "5.2.1",
+            "dev": true,
+            "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"
+        },
+        "node_modules/safer-buffer": {
+            "version": "2.1.2",
+            "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+            "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/sass": {
+            "version": "1.91.0",
+            "resolved": "https://registry.npmjs.org/sass/-/sass-1.91.0.tgz",
+            "integrity": "sha512-aFOZHGf+ur+bp1bCHZ+u8otKGh77ZtmFyXDo4tlYvT7PWql41Kwd8wdkPqhhT+h2879IVblcHFglIMofsFd1EA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "chokidar": "^4.0.0",
+                "immutable": "^5.0.2",
+                "source-map-js": ">=0.6.2 <2.0.0"
+            },
+            "bin": {
+                "sass": "sass.js"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            },
+            "optionalDependencies": {
+                "@parcel/watcher": "^2.4.1"
+            }
+        },
+        "node_modules/sass-loader": {
+            "version": "16.0.6",
+            "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-16.0.6.tgz",
+            "integrity": "sha512-sglGzId5gmlfxNs4gK2U3h7HlVRfx278YK6Ono5lwzuvi1jxig80YiuHkaDBVsYIKFhx8wN7XSCI0M2IDS/3qA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "neo-async": "^2.6.2"
+            },
+            "engines": {
+                "node": ">= 18.12.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            },
+            "peerDependencies": {
+                "@rspack/core": "0.x || 1.x",
+                "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0",
+                "sass": "^1.3.0",
+                "sass-embedded": "*",
+                "webpack": "^5.0.0"
+            },
+            "peerDependenciesMeta": {
+                "@rspack/core": {
+                    "optional": true
+                },
+                "node-sass": {
+                    "optional": true
+                },
+                "sass": {
+                    "optional": true
+                },
+                "sass-embedded": {
+                    "optional": true
+                },
+                "webpack": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/schema-utils": {
+            "version": "3.3.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/json-schema": "^7.0.8",
+                "ajv": "^6.12.5",
+                "ajv-keywords": "^3.5.2"
+            },
+            "engines": {
+                "node": ">= 10.13.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            }
+        },
+        "node_modules/semver": {
+            "version": "7.7.2",
+            "dev": true,
+            "license": "ISC",
+            "bin": {
+                "semver": "bin/semver.js"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/serialize-javascript": {
+            "version": "6.0.2",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "randombytes": "^2.1.0"
+            }
+        },
+        "node_modules/set-blocking": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+            "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/set-function-length": {
+            "version": "1.2.2",
+            "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
+            "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "define-data-property": "^1.1.4",
+                "es-errors": "^1.3.0",
+                "function-bind": "^1.1.2",
+                "get-intrinsic": "^1.2.4",
+                "gopd": "^1.0.1",
+                "has-property-descriptors": "^1.0.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/shallow-clone": {
+            "version": "3.0.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "kind-of": "^6.0.2"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/shebang-command": {
+            "version": "2.0.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "shebang-regex": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/shebang-regex": {
+            "version": "3.0.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/shell-quote": {
+            "version": "1.8.3",
+            "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.3.tgz",
+            "integrity": "sha512-ObmnIF4hXNg1BqhnHmgbDETF8dLPCggZWBjkQfhZpbszZnYur5DUljTcCHii5LC3J5E0yeO/1LIMyH+UvHQgyw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/side-channel": {
+            "version": "1.1.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "es-errors": "^1.3.0",
+                "object-inspect": "^1.13.3",
+                "side-channel-list": "^1.0.0",
+                "side-channel-map": "^1.0.1",
+                "side-channel-weakmap": "^1.0.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/side-channel-list": {
+            "version": "1.0.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "es-errors": "^1.3.0",
+                "object-inspect": "^1.13.3"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/side-channel-map": {
+            "version": "1.0.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "call-bound": "^1.0.2",
+                "es-errors": "^1.3.0",
+                "get-intrinsic": "^1.2.5",
+                "object-inspect": "^1.13.3"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/side-channel-weakmap": {
+            "version": "1.0.2",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "call-bound": "^1.0.2",
+                "es-errors": "^1.3.0",
+                "get-intrinsic": "^1.2.5",
+                "object-inspect": "^1.13.3",
+                "side-channel-map": "^1.0.1"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/sigmund": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
+            "integrity": "sha512-fCvEXfh6NWpm+YSuY2bpXb/VIihqWA6hLsgboC+0nl71Q7N7o2eaCW8mJa/NLvQhs6jpd3VZV4UiUQlV6+lc8g==",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/signal-exit": {
+            "version": "3.0.7",
+            "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+            "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/slice-ansi": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz",
+            "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "is-fullwidth-code-point": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/slice-ansi/node_modules/is-fullwidth-code-point": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+            "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/source-map": {
+            "version": "0.6.1",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/source-map-js": {
+            "version": "1.2.1",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/sprintf-js": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+            "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
+            "dev": true,
+            "license": "BSD-3-Clause"
+        },
+        "node_modules/stream-shift": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.3.tgz",
+            "integrity": "sha512-76ORR0DO1o1hlKwTbi/DM3EXWGf3ZJYO8cXX5RJwnul2DEg2oyoZyjLNoQM8WsvZiFKCRfC1O0J7iCvie3RZmQ==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/streamfilter": {
+            "version": "1.0.7",
+            "resolved": "https://registry.npmjs.org/streamfilter/-/streamfilter-1.0.7.tgz",
+            "integrity": "sha512-Gk6KZM+yNA1JpW0KzlZIhjo3EaBJDkYfXtYSbOwNIQ7Zd6006E6+sCFlW1NDvFG/vnXhKmw6TJJgiEQg/8lXfQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "readable-stream": "^2.0.2"
+            }
+        },
+        "node_modules/string_decoder": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+            "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "safe-buffer": "~5.1.0"
+            }
+        },
+        "node_modules/string_decoder/node_modules/safe-buffer": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+            "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/string-width": {
+            "version": "4.2.3",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "emoji-regex": "^8.0.0",
+                "is-fullwidth-code-point": "^3.0.0",
+                "strip-ansi": "^6.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/strip-ansi": {
+            "version": "6.0.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-regex": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/strip-eof": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+            "integrity": "sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/strip-json-comments": {
+            "version": "3.1.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/style-mod": {
+            "version": "4.1.3",
+            "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.1.3.tgz",
+            "integrity": "sha512-i/n8VsZydrugj3Iuzll8+x/00GH2vnYsk1eomD8QiRrSAeW6ItbCQDtfXCeJHd0iwiNagqjQkvpvREEPtW3IoQ==",
+            "dev": true,
+            "license": "MIT",
+            "peer": true
+        },
+        "node_modules/supports-color": {
+            "version": "8.1.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/supports-color?sponsor=1"
+            }
+        },
+        "node_modules/supports-preserve-symlinks-flag": {
+            "version": "1.0.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/sync-client": {
+            "resolved": "sync-client",
+            "link": true
+        },
+        "node_modules/tapable": {
+            "version": "2.2.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/term-size": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz",
+            "integrity": "sha512-7dPUZQGy/+m3/wjVz3ZW5dobSoD/02NxJpoXUX0WIyjfVS3l0c+b/+9phIDFA7FHzkYtwtMFgeGZ/Y8jVTeqQQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "execa": "^0.7.0"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/term-size/node_modules/cross-spawn": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
+            "integrity": "sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "lru-cache": "^4.0.1",
+                "shebang-command": "^1.2.0",
+                "which": "^1.2.9"
+            }
+        },
+        "node_modules/term-size/node_modules/execa": {
+            "version": "0.7.0",
+            "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
+            "integrity": "sha512-RztN09XglpYI7aBBrJCPW95jEH7YF1UEPOoX9yDhUTPdp7mK+CQvnLTuD10BNXZ3byLTu2uehZ8EcKT/4CGiFw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "cross-spawn": "^5.0.1",
+                "get-stream": "^3.0.0",
+                "is-stream": "^1.1.0",
+                "npm-run-path": "^2.0.0",
+                "p-finally": "^1.0.0",
+                "signal-exit": "^3.0.0",
+                "strip-eof": "^1.0.0"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/term-size/node_modules/get-stream": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+            "integrity": "sha512-GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/term-size/node_modules/shebang-command": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+            "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "shebang-regex": "^1.0.0"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/term-size/node_modules/shebang-regex": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+            "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/term-size/node_modules/which": {
+            "version": "1.3.1",
+            "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+            "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "isexe": "^2.0.0"
+            },
+            "bin": {
+                "which": "bin/which"
+            }
+        },
+        "node_modules/terser": {
+            "version": "5.39.0",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "dependencies": {
+                "@jridgewell/source-map": "^0.3.3",
+                "acorn": "^8.8.2",
+                "commander": "^2.20.0",
+                "source-map-support": "~0.5.20"
+            },
+            "bin": {
+                "terser": "bin/terser"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/terser-webpack-plugin": {
+            "version": "5.3.14",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@jridgewell/trace-mapping": "^0.3.25",
+                "jest-worker": "^27.4.5",
+                "schema-utils": "^4.3.0",
+                "serialize-javascript": "^6.0.2",
+                "terser": "^5.31.1"
+            },
+            "engines": {
+                "node": ">= 10.13.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            },
+            "peerDependencies": {
+                "webpack": "^5.1.0"
+            },
+            "peerDependenciesMeta": {
+                "@swc/core": {
+                    "optional": true
+                },
+                "esbuild": {
+                    "optional": true
+                },
+                "uglify-js": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/terser-webpack-plugin/node_modules/ajv": {
+            "version": "8.17.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "fast-deep-equal": "^3.1.3",
+                "fast-uri": "^3.0.1",
+                "json-schema-traverse": "^1.0.0",
+                "require-from-string": "^2.0.2"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/epoberezkin"
+            }
+        },
+        "node_modules/terser-webpack-plugin/node_modules/ajv-keywords": {
+            "version": "5.1.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "fast-deep-equal": "^3.1.3"
+            },
+            "peerDependencies": {
+                "ajv": "^8.8.2"
+            }
+        },
+        "node_modules/terser-webpack-plugin/node_modules/jest-worker": {
+            "version": "27.5.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/node": "*",
+                "merge-stream": "^2.0.0",
+                "supports-color": "^8.0.0"
+            },
+            "engines": {
+                "node": ">= 10.13.0"
+            }
+        },
+        "node_modules/terser-webpack-plugin/node_modules/json-schema-traverse": {
+            "version": "1.0.0",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/terser-webpack-plugin/node_modules/schema-utils": {
+            "version": "4.3.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/json-schema": "^7.0.9",
+                "ajv": "^8.9.0",
+                "ajv-formats": "^2.1.1",
+                "ajv-keywords": "^5.1.0"
+            },
+            "engines": {
+                "node": ">= 10.13.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            }
+        },
+        "node_modules/terser/node_modules/commander": {
+            "version": "2.20.3",
+            "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+            "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/terser/node_modules/source-map-support": {
+            "version": "0.5.21",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "buffer-from": "^1.0.0",
+                "source-map": "^0.6.0"
+            }
+        },
+        "node_modules/test-client": {
+            "resolved": "test-client",
+            "link": true
+        },
+        "node_modules/through2": {
+            "version": "2.0.5",
+            "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+            "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "readable-stream": "~2.3.6",
+                "xtend": "~4.0.1"
+            }
+        },
+        "node_modules/through2-filter": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz",
+            "integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "through2": "~2.0.0",
+                "xtend": "~4.0.0"
+            }
+        },
+        "node_modules/time-stamp": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz",
+            "integrity": "sha512-gLCeArryy2yNTRzTGKbZbloctj64jkZ57hj5zdraXue6aFgd6PmvVtEyiUU+hvU0v7q08oVv8r8ev0tRo6bvgw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/to-absolute-glob": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz",
+            "integrity": "sha512-rtwLUQEwT8ZeKQbyFJyomBRYXyE16U5VKuy0ftxLMK/PZb2fkOsg5r9kHdauuVDbsNdIBoC/HCthpidamQFXYA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "is-absolute": "^1.0.0",
+                "is-negated-glob": "^1.0.0"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/to-regex-range": {
+            "version": "5.0.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "is-number": "^7.0.0"
+            },
+            "engines": {
+                "node": ">=8.0"
+            }
+        },
+        "node_modules/to-through": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/to-through/-/to-through-2.0.0.tgz",
+            "integrity": "sha512-+QIz37Ly7acM4EMdw2PRN389OneM5+d844tirkGp4dPKzI5OE72V9OsbFp+CIYJDahZ41ZV05hNtcPAQUAm9/Q==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "through2": "^2.0.3"
+            },
+            "engines": {
+                "node": ">= 0.10"
+            }
+        },
+        "node_modules/to-time": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/to-time/-/to-time-1.0.2.tgz",
+            "integrity": "sha512-+wqaiQvnido2DI1bpiQ/Zv1LiOE9Fd0v35ySnNeqFmKNYJTJY/+ENI+3sHXCMzbAAOR/43aNyLM0XTpi0/zSQg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "bignumber.js": "^2.4.0"
+            }
+        },
+        "node_modules/tree-kill": {
+            "version": "1.2.2",
+            "dev": true,
+            "license": "MIT",
+            "bin": {
+                "tree-kill": "cli.js"
+            }
+        },
+        "node_modules/ts-api-utils": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.1.0.tgz",
+            "integrity": "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=18.12"
+            },
+            "peerDependencies": {
+                "typescript": ">=4.8.4"
+            }
+        },
+        "node_modules/ts-loader": {
+            "version": "9.5.2",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "chalk": "^4.1.0",
+                "enhanced-resolve": "^5.0.0",
+                "micromatch": "^4.0.0",
+                "semver": "^7.3.4",
+                "source-map": "^0.7.4"
+            },
+            "engines": {
+                "node": ">=12.0.0"
+            },
+            "peerDependencies": {
+                "typescript": "*",
+                "webpack": "^5.0.0"
+            }
+        },
+        "node_modules/ts-loader/node_modules/source-map": {
+            "version": "0.7.4",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/tslib": {
+            "version": "2.8.1",
+            "dev": true,
+            "license": "0BSD"
+        },
+        "node_modules/tsx": {
+            "version": "4.20.6",
+            "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.20.6.tgz",
+            "integrity": "sha512-ytQKuwgmrrkDTFP4LjR0ToE2nqgy886GpvRSpU0JAnrdBYppuY5rLkRUYPU1yCryb24SsKBTL/hlDQAEFVwtZg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "esbuild": "~0.25.0",
+                "get-tsconfig": "^4.7.5"
+            },
+            "bin": {
+                "tsx": "dist/cli.mjs"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            },
+            "optionalDependencies": {
+                "fsevents": "~2.3.3"
+            }
+        },
+        "node_modules/type-check": {
+            "version": "0.4.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "prelude-ls": "^1.2.1"
+            },
+            "engines": {
+                "node": ">= 0.8.0"
+            }
+        },
+        "node_modules/typescript": {
+            "version": "5.8.3",
+            "dev": true,
+            "license": "Apache-2.0",
+            "bin": {
+                "tsc": "bin/tsc",
+                "tsserver": "bin/tsserver"
+            },
+            "engines": {
+                "node": ">=14.17"
+            }
+        },
+        "node_modules/typescript-eslint": {
+            "version": "8.41.0",
+            "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.41.0.tgz",
+            "integrity": "sha512-n66rzs5OBXW3SFSnZHr2T685q1i4ODm2nulFJhMZBotaTavsS8TrI3d7bDlRSs9yWo7HmyWrN9qDu14Qv7Y0Dw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@typescript-eslint/eslint-plugin": "8.41.0",
+                "@typescript-eslint/parser": "8.41.0",
+                "@typescript-eslint/typescript-estree": "8.41.0",
+                "@typescript-eslint/utils": "8.41.0"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            },
+            "peerDependencies": {
+                "eslint": "^8.57.0 || ^9.0.0",
+                "typescript": ">=4.8.4 <6.0.0"
+            }
+        },
+        "node_modules/unc-path-regex": {
+            "version": "0.1.2",
+            "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
+            "integrity": "sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/undici-types": {
+            "version": "7.14.0",
+            "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.14.0.tgz",
+            "integrity": "sha512-QQiYxHuyZ9gQUIrmPo3IA+hUl4KYk8uSA7cHrcKd/l3p1OTpZcM0Tbp9x7FAtXdAYhlasd60ncPpgu6ihG6TOA==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/unique-stream": {
+            "version": "2.4.0",
+            "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.4.0.tgz",
+            "integrity": "sha512-V6QarSfeSgDipGA9EZdoIzu03ZDlOFkk+FbEP5cwgrZXN3iIkYR91IjU2EnM6rB835kGQsqHX8qncObTXV+6KA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "json-stable-stringify-without-jsonify": "^1.0.1",
+                "through2-filter": "3.0.0"
+            }
+        },
+        "node_modules/universalify": {
+            "version": "2.0.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 10.0.0"
+            }
+        },
+        "node_modules/update-browserslist-db": {
+            "version": "1.1.3",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/browserslist"
+                },
+                {
+                    "type": "tidelift",
+                    "url": "https://tidelift.com/funding/github/npm/browserslist"
+                },
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/ai"
+                }
+            ],
+            "license": "MIT",
+            "dependencies": {
+                "escalade": "^3.2.0",
+                "picocolors": "^1.1.1"
+            },
+            "bin": {
+                "update-browserslist-db": "cli.js"
+            },
+            "peerDependencies": {
+                "browserslist": ">= 4.21.0"
+            }
+        },
+        "node_modules/uri-js": {
+            "version": "4.4.1",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "dependencies": {
+                "punycode": "^2.1.0"
+            }
+        },
+        "node_modules/url": {
+            "version": "0.11.4",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "punycode": "^1.4.1",
+                "qs": "^6.12.3"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/url/node_modules/punycode": {
+            "version": "1.4.1",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/utf-8-validate": {
+            "version": "6.0.5",
+            "dev": true,
+            "hasInstallScript": true,
+            "license": "MIT",
+            "optional": true,
+            "peer": true,
+            "dependencies": {
+                "node-gyp-build": "^4.3.0"
+            },
+            "engines": {
+                "node": ">=6.14.2"
+            }
+        },
+        "node_modules/util-deprecate": {
+            "version": "1.0.2",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/uuid": {
+            "version": "13.0.0",
+            "resolved": "https://registry.npmjs.org/uuid/-/uuid-13.0.0.tgz",
+            "integrity": "sha512-XQegIaBTVUjSHliKqcnFqYypAd4S+WCYt5NIeRs6w/UAry7z8Y9j5ZwRRL4kzq9U3sD6v+85er9FvkEaBpji2w==",
+            "dev": true,
+            "funding": [
+                "https://github.com/sponsors/broofa",
+                "https://github.com/sponsors/ctavan"
+            ],
+            "license": "MIT",
+            "bin": {
+                "uuid": "dist-node/bin/uuid"
+            }
+        },
+        "node_modules/value-or-function": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/value-or-function/-/value-or-function-3.0.0.tgz",
+            "integrity": "sha512-jdBB2FrWvQC/pnPtIqcLsMaQgjhdb6B7tk1MMyTKapox+tQZbdRP4uLxu/JY0t7fbfDCUMnuelzEYv5GsxHhdg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.10"
+            }
+        },
+        "node_modules/vault-link-obsidian-plugin": {
+            "resolved": "obsidian-plugin",
+            "link": true
+        },
+        "node_modules/vinyl": {
+            "version": "2.2.1",
+            "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz",
+            "integrity": "sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "clone": "^2.1.1",
+                "clone-buffer": "^1.0.0",
+                "clone-stats": "^1.0.0",
+                "cloneable-readable": "^1.0.0",
+                "remove-trailing-separator": "^1.0.1",
+                "replace-ext": "^1.0.0"
+            },
+            "engines": {
+                "node": ">= 0.10"
+            }
+        },
+        "node_modules/vinyl-fs": {
+            "version": "3.0.3",
+            "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-3.0.3.tgz",
+            "integrity": "sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "fs-mkdirp-stream": "^1.0.0",
+                "glob-stream": "^6.1.0",
+                "graceful-fs": "^4.0.0",
+                "is-valid-glob": "^1.0.0",
+                "lazystream": "^1.0.0",
+                "lead": "^1.0.0",
+                "object.assign": "^4.0.4",
+                "pumpify": "^1.3.5",
+                "readable-stream": "^2.3.3",
+                "remove-bom-buffer": "^3.0.0",
+                "remove-bom-stream": "^1.2.0",
+                "resolve-options": "^1.1.0",
+                "through2": "^2.0.0",
+                "to-through": "^2.0.0",
+                "value-or-function": "^3.0.0",
+                "vinyl": "^2.0.0",
+                "vinyl-sourcemap": "^1.1.0"
+            },
+            "engines": {
+                "node": ">= 0.10"
+            }
+        },
+        "node_modules/vinyl-sourcemap": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz",
+            "integrity": "sha512-NiibMgt6VJGJmyw7vtzhctDcfKch4e4n9TBeoWlirb7FMg9/1Ov9k+A5ZRAtywBpRPiyECvQRQllYM8dECegVA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "append-buffer": "^1.0.2",
+                "convert-source-map": "^1.5.0",
+                "graceful-fs": "^4.1.6",
+                "normalize-path": "^2.1.1",
+                "now-and-later": "^2.0.0",
+                "remove-bom-buffer": "^3.0.0",
+                "vinyl": "^2.0.0"
+            },
+            "engines": {
+                "node": ">= 0.10"
+            }
+        },
+        "node_modules/w3c-keyname": {
+            "version": "2.2.8",
+            "resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.8.tgz",
+            "integrity": "sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==",
+            "dev": true,
+            "license": "MIT",
+            "peer": true
+        },
+        "node_modules/watchpack": {
+            "version": "2.4.2",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "glob-to-regexp": "^0.4.1",
+                "graceful-fs": "^4.1.2"
+            },
+            "engines": {
+                "node": ">=10.13.0"
+            }
+        },
+        "node_modules/webpack": {
+            "version": "5.99.9",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/eslint-scope": "^3.7.7",
+                "@types/estree": "^1.0.6",
+                "@types/json-schema": "^7.0.15",
+                "@webassemblyjs/ast": "^1.14.1",
+                "@webassemblyjs/wasm-edit": "^1.14.1",
+                "@webassemblyjs/wasm-parser": "^1.14.1",
+                "acorn": "^8.14.0",
+                "browserslist": "^4.24.0",
+                "chrome-trace-event": "^1.0.2",
+                "enhanced-resolve": "^5.17.1",
+                "es-module-lexer": "^1.2.1",
+                "eslint-scope": "5.1.1",
+                "events": "^3.2.0",
+                "glob-to-regexp": "^0.4.1",
+                "graceful-fs": "^4.2.11",
+                "json-parse-even-better-errors": "^2.3.1",
+                "loader-runner": "^4.2.0",
+                "mime-types": "^2.1.27",
+                "neo-async": "^2.6.2",
+                "schema-utils": "^4.3.2",
+                "tapable": "^2.1.1",
+                "terser-webpack-plugin": "^5.3.11",
+                "watchpack": "^2.4.1",
+                "webpack-sources": "^3.2.3"
+            },
+            "bin": {
+                "webpack": "bin/webpack.js"
+            },
+            "engines": {
+                "node": ">=10.13.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            },
+            "peerDependenciesMeta": {
+                "webpack-cli": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/webpack-cli": {
+            "version": "6.0.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@discoveryjs/json-ext": "^0.6.1",
+                "@webpack-cli/configtest": "^3.0.1",
+                "@webpack-cli/info": "^3.0.1",
+                "@webpack-cli/serve": "^3.0.1",
+                "colorette": "^2.0.14",
+                "commander": "^12.1.0",
+                "cross-spawn": "^7.0.3",
+                "envinfo": "^7.14.0",
+                "fastest-levenshtein": "^1.0.12",
+                "import-local": "^3.0.2",
+                "interpret": "^3.1.1",
+                "rechoir": "^0.8.0",
+                "webpack-merge": "^6.0.1"
+            },
+            "bin": {
+                "webpack-cli": "bin/cli.js"
+            },
+            "engines": {
+                "node": ">=18.12.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            },
+            "peerDependencies": {
+                "webpack": "^5.82.0"
+            },
+            "peerDependenciesMeta": {
+                "webpack-bundle-analyzer": {
+                    "optional": true
+                },
+                "webpack-dev-server": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/webpack-cli/node_modules/colorette": {
+            "version": "2.0.20",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/webpack-cli/node_modules/commander": {
+            "version": "12.1.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/webpack-merge": {
+            "version": "6.0.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "clone-deep": "^4.0.1",
+                "flat": "^5.0.2",
+                "wildcard": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/webpack-sources": {
+            "version": "3.2.3",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=10.13.0"
+            }
+        },
+        "node_modules/webpack/node_modules/ajv": {
+            "version": "8.17.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "fast-deep-equal": "^3.1.3",
+                "fast-uri": "^3.0.1",
+                "json-schema-traverse": "^1.0.0",
+                "require-from-string": "^2.0.2"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/epoberezkin"
+            }
+        },
+        "node_modules/webpack/node_modules/ajv-keywords": {
+            "version": "5.1.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "fast-deep-equal": "^3.1.3"
+            },
+            "peerDependencies": {
+                "ajv": "^8.8.2"
+            }
+        },
+        "node_modules/webpack/node_modules/eslint-scope": {
+            "version": "5.1.1",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "dependencies": {
+                "esrecurse": "^4.3.0",
+                "estraverse": "^4.1.1"
+            },
+            "engines": {
+                "node": ">=8.0.0"
+            }
+        },
+        "node_modules/webpack/node_modules/estraverse": {
+            "version": "4.3.0",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "engines": {
+                "node": ">=4.0"
+            }
+        },
+        "node_modules/webpack/node_modules/json-schema-traverse": {
+            "version": "1.0.0",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/webpack/node_modules/schema-utils": {
+            "version": "4.3.2",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/json-schema": "^7.0.9",
+                "ajv": "^8.9.0",
+                "ajv-formats": "^2.1.1",
+                "ajv-keywords": "^5.1.0"
+            },
+            "engines": {
+                "node": ">= 10.13.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            }
+        },
+        "node_modules/which": {
+            "version": "2.0.2",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "isexe": "^2.0.0"
+            },
+            "bin": {
+                "node-which": "bin/node-which"
+            },
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/which-module": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz",
+            "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/wildcard": {
+            "version": "2.0.1",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/word-wrap": {
+            "version": "1.2.5",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/wrap-ansi": {
+            "version": "7.0.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-styles": "^4.0.0",
+                "string-width": "^4.1.0",
+                "strip-ansi": "^6.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+            }
+        },
+        "node_modules/wrappy": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+            "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/ws": {
+            "version": "8.18.3",
+            "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz",
+            "integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=10.0.0"
+            },
+            "peerDependencies": {
+                "bufferutil": "^4.0.1",
+                "utf-8-validate": ">=5.0.2"
+            },
+            "peerDependenciesMeta": {
+                "bufferutil": {
+                    "optional": true
+                },
+                "utf-8-validate": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/xml-escape": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/xml-escape/-/xml-escape-1.1.0.tgz",
+            "integrity": "sha512-B/T4sDK8Z6aUh/qNr7mjKAwwncIljFuUP+DO/D5hloYFj+90O88z8Wf7oSucZTHxBAsC1/CTP4rtx/x1Uf72Mg==",
+            "dev": true,
+            "license": "MIT License"
+        },
+        "node_modules/xmlbuilder": {
+            "version": "10.1.1",
+            "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-10.1.1.tgz",
+            "integrity": "sha512-OyzrcFLL/nb6fMGHbiRDuPup9ljBycsdCypwuyg5AAHvyWzGfChJpCXMG88AGTIMFhGZ9RccFN1e6lhg3hkwKg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=4.0"
+            }
+        },
+        "node_modules/xtend": {
+            "version": "4.0.2",
+            "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+            "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.4"
+            }
+        },
+        "node_modules/y18n": {
+            "version": "5.0.8",
+            "dev": true,
+            "license": "ISC",
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/yallist": {
+            "version": "2.1.2",
+            "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+            "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/yargs": {
+            "version": "17.7.2",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "cliui": "^8.0.1",
+                "escalade": "^3.1.1",
+                "get-caller-file": "^2.0.5",
+                "require-directory": "^2.1.1",
+                "string-width": "^4.2.3",
+                "y18n": "^5.0.5",
+                "yargs-parser": "^21.1.1"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/yargs-parser": {
+            "version": "21.1.1",
+            "dev": true,
+            "license": "ISC",
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/yocto-queue": {
+            "version": "0.1.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "obsidian-plugin": {
+            "name": "vault-link-obsidian-plugin",
+            "version": "0.12.0",
+            "license": "MIT",
+            "devDependencies": {
+                "@types/node": "^24.8.1",
+                "css-loader": "^7.1.2",
+                "date-fns": "^4.1.0",
+                "file-loader": "^6.2.0",
+                "fs-extra": "^11.3.0",
+                "mini-css-extract-plugin": "^2.9.2",
+                "obsidian": "1.10.2",
+                "reconcile-text": "^0.8.0",
+                "resolve-url-loader": "^5.0.0",
+                "sass": "^1.91.0",
+                "sass-loader": "^16.0.6",
+                "sync-client": "file:../sync-client",
+                "terser-webpack-plugin": "^5.3.14",
+                "ts-loader": "^9.5.2",
+                "tslib": "2.8.1",
+                "tsx": "^4.20.6",
+                "typescript": "5.8.3",
+                "url": "^0.11.4",
+                "webpack": "^5.99.9",
+                "webpack-cli": "^6.0.1"
+            }
+        },
+        "sync-client": {
+            "version": "0.12.0",
+            "devDependencies": {
+                "@sentry/browser": "^10.8.0",
+                "@types/node": "^24.8.1",
+                "byte-base64": "^1.1.0",
+                "minimatch": "^10.0.1",
+                "p-queue": "^8.1.0",
+                "reconcile-text": "^0.8.0",
+                "ts-loader": "^9.5.2",
+                "tslib": "2.8.1",
+                "tsx": "^4.20.6",
+                "typescript": "5.8.3",
+                "uuid": "^13.0.0",
+                "webpack": "^5.99.9",
+                "webpack-cli": "^6.0.1",
+                "webpack-merge": "^6.0.1",
+                "ws": "^8.18.3"
+            }
+        },
+        "sync-client/node_modules/brace-expansion": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+            "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "balanced-match": "^1.0.0"
+            }
+        },
+        "sync-client/node_modules/minimatch": {
+            "version": "10.0.1",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "brace-expansion": "^2.0.1"
+            },
+            "engines": {
+                "node": "20 || >=22"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "test-client": {
+            "version": "0.12.0",
+            "bin": {
+                "test-client": "dist/cli.js"
+            },
+            "devDependencies": {
+                "@types/node": "^24.8.1",
+                "sync-client": "file:../sync-client",
+                "ts-loader": "^9.5.2",
+                "tslib": "2.8.1",
+                "tsx": "^4.20.6",
+                "typescript": "5.8.3",
+                "uuid": "^13.0.0",
+                "webpack": "^5.99.9",
+                "webpack-cli": "^6.0.1"
+            }
+        }
+    }
 }
diff --git a/frontend/package.json b/frontend/package.json
index ddd9e1c3..03bab82f 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,32 +1,32 @@
 {
-	"name": "my-workspace",
-	"private": true,
-	"workspaces": [
-		"sync-client",
-		"obsidian-plugin",
-		"test-client",
-		"local-client-cli"
-	],
-	"prettier": {
-		"trailingComma": "none",
-		"tabWidth": 4,
-		"useTabs": true,
-		"endOfLine": "lf"
-	},
-	"scripts": {
-		"build": "npm run build --workspaces",
-		"dev": "concurrently --kill-others \"npm run dev -w sync-client\" \"npm run dev -w obsidian-plugin\"",
-		"test": "npm run test --workspaces",
-		"lint": "eslint --fix sync-client obsidian-plugin test-client local-client-cli && prettier --write \"**/*.ts\"",
-		"update": "ncu -u -ws"
-	},
-	"devDependencies": {
-		"concurrently": "^9.2.1",
-		"eclint": "^2.8.1",
-		"eslint": "9.38.0",
-		"eslint-plugin-unused-imports": "^4.1.4",
-		"npm-check-updates": "^19.1.1",
-		"prettier": "^3.6.2",
-		"typescript-eslint": "8.41.0"
-	}
+    "name": "my-workspace",
+    "private": true,
+    "workspaces": [
+        "sync-client",
+        "obsidian-plugin",
+        "test-client",
+        "local-client-cli"
+    ],
+    "prettier": {
+        "trailingComma": "none",
+        "tabWidth": 4,
+        "useTabs": true,
+        "endOfLine": "lf"
+    },
+    "scripts": {
+        "build": "npm run build --workspaces",
+        "dev": "concurrently --kill-others \"npm run dev -w sync-client\" \"npm run dev -w obsidian-plugin\"",
+        "test": "npm run test --workspaces",
+        "lint": "eslint --fix sync-client obsidian-plugin test-client local-client-cli && prettier --write \"**/*.ts\"",
+        "update": "ncu -u -ws"
+    },
+    "devDependencies": {
+        "concurrently": "^9.2.1",
+        "eclint": "^2.8.1",
+        "eslint": "9.38.0",
+        "eslint-plugin-unused-imports": "^4.1.4",
+        "npm-check-updates": "^19.1.1",
+        "prettier": "^3.6.2",
+        "typescript-eslint": "8.41.0"
+    }
 }
diff --git a/frontend/sync-client/src/file-operations/file-not-found-error.ts b/frontend/sync-client/src/file-operations/file-not-found-error.ts
index 8725e81e..b8acd265 100644
--- a/frontend/sync-client/src/file-operations/file-not-found-error.ts
+++ b/frontend/sync-client/src/file-operations/file-not-found-error.ts
@@ -1,9 +1,9 @@
 export class FileNotFoundError extends Error {
-	public constructor(
-		message: string,
-		public readonly filePath: string
-	) {
-		super(message);
-		this.name = "FileNotFoundError";
-	}
+    public constructor(
+        message: string,
+        public readonly filePath: string
+    ) {
+        super(message);
+        this.name = "FileNotFoundError";
+    }
 }
diff --git a/frontend/sync-client/src/file-operations/file-operations.test.ts b/frontend/sync-client/src/file-operations/file-operations.test.ts
index 353312a3..35595e6e 100644
--- a/frontend/sync-client/src/file-operations/file-operations.test.ts
+++ b/frontend/sync-client/src/file-operations/file-operations.test.ts
@@ -1,8 +1,8 @@
 import { describe, it } from "node:test";
 import type {
-	Database,
-	DocumentRecord,
-	RelativePath
+    Database,
+    DocumentRecord,
+    RelativePath
 } from "../persistence/database";
 import { FileOperations } from "./file-operations";
 import { Logger } from "../tracing/logger";
@@ -12,224 +12,224 @@ import type { TextWithCursors } from "reconcile-text";
 import type { ServerConfig, ServerConfigData } from "../services/server-config";
 
 class MockServerConfig implements Pick<ServerConfig, "getConfig"> {
-	public getConfig(): ServerConfigData {
-		return {
-			mergeableFileExtensions: ["md", "txt"],
-			supportedApiVersion: 1,
-			isAuthenticated: true
-		};
-	}
+    public getConfig(): ServerConfigData {
+        return {
+            mergeableFileExtensions: ["md", "txt"],
+            supportedApiVersion: 1,
+            isAuthenticated: true
+        };
+    }
 }
 
 class MockDatabase implements Partial<Database> {
-	public getLatestDocumentByRelativePath(
-		_find: RelativePath
-	): DocumentRecord | undefined {
-		// no-op
-		return undefined;
-	}
+    public getLatestDocumentByRelativePath(
+        _find: RelativePath
+    ): DocumentRecord | undefined {
+        // no-op
+        return undefined;
+    }
 
-	public move(
-		_oldRelativePath: RelativePath,
-		_newRelativePath: RelativePath
-	): void {
-		// no-op
-	}
+    public move(
+        _oldRelativePath: RelativePath,
+        _newRelativePath: RelativePath
+    ): void {
+        // no-op
+    }
 }
 
 class FakeFileSystemOperations implements FileSystemOperations {
-	public readonly names = new Set<string>();
+    public readonly names = new Set<string>();
 
-	public async listFilesRecursively(
-		_root: RelativePath | undefined
-	): Promise<RelativePath[]> {
-		return ["file.md"];
-	}
-	public async read(_path: RelativePath): Promise<Uint8Array> {
-		throw new Error("Method not implemented.");
-	}
-	public async write(
-		path: RelativePath,
-		_content: Uint8Array
-	): Promise<void> {
-		this.names.add(path);
-	}
-	public async atomicUpdateText(
-		_path: RelativePath,
-		_updater: (current: TextWithCursors) => TextWithCursors
-	): Promise<string> {
-		throw new Error("Method not implemented.");
-	}
-	public async getFileSize(_path: RelativePath): Promise<number> {
-		throw new Error("Method not implemented.");
-	}
-	public async getModificationTime(_path: RelativePath): Promise<Date> {
-		throw new Error("Method not implemented.");
-	}
-	public async exists(path: RelativePath): Promise<boolean> {
-		return this.names.has(path);
-	}
-	public async createDirectory(_path: RelativePath): Promise<void> {
-		// this is called but irrelevant for this mock
-	}
-	public async delete(_path: RelativePath): Promise<void> {
-		throw new Error("Method not implemented.");
-	}
-	public async rename(
-		oldPath: RelativePath,
-		newPath: RelativePath
-	): Promise<void> {
-		this.names.delete(oldPath);
-		this.names.add(newPath);
-	}
+    public async listFilesRecursively(
+        _root: RelativePath | undefined
+    ): Promise<RelativePath[]> {
+        return ["file.md"];
+    }
+    public async read(_path: RelativePath): Promise<Uint8Array> {
+        throw new Error("Method not implemented.");
+    }
+    public async write(
+        path: RelativePath,
+        _content: Uint8Array
+    ): Promise<void> {
+        this.names.add(path);
+    }
+    public async atomicUpdateText(
+        _path: RelativePath,
+        _updater: (current: TextWithCursors) => TextWithCursors
+    ): Promise<string> {
+        throw new Error("Method not implemented.");
+    }
+    public async getFileSize(_path: RelativePath): Promise<number> {
+        throw new Error("Method not implemented.");
+    }
+    public async getModificationTime(_path: RelativePath): Promise<Date> {
+        throw new Error("Method not implemented.");
+    }
+    public async exists(path: RelativePath): Promise<boolean> {
+        return this.names.has(path);
+    }
+    public async createDirectory(_path: RelativePath): Promise<void> {
+        // this is called but irrelevant for this mock
+    }
+    public async delete(_path: RelativePath): Promise<void> {
+        throw new Error("Method not implemented.");
+    }
+    public async rename(
+        oldPath: RelativePath,
+        newPath: RelativePath
+    ): Promise<void> {
+        this.names.delete(oldPath);
+        this.names.add(newPath);
+    }
 }
 
 describe("File operations", () => {
-	it("should deconflict renames", async () => {
-		const fileSystemOperations = new FakeFileSystemOperations();
-		const fileOperations = new FileOperations(
-			new Logger(),
-			new MockDatabase() as Database, // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
-			fileSystemOperations,
-			new MockServerConfig() as ServerConfig // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
-		);
+    it("should deconflict renames", async () => {
+        const fileSystemOperations = new FakeFileSystemOperations();
+        const fileOperations = new FileOperations(
+            new Logger(),
+            new MockDatabase() as Database, // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+            fileSystemOperations,
+            new MockServerConfig() as ServerConfig // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+        );
 
-		await fileOperations.create("a", new Uint8Array());
-		assertSetContainsExactly(fileSystemOperations.names, "a");
-		await fileOperations.move("a", "b");
-		assertSetContainsExactly(fileSystemOperations.names, "b");
+        await fileOperations.create("a", new Uint8Array());
+        assertSetContainsExactly(fileSystemOperations.names, "a");
+        await fileOperations.move("a", "b");
+        assertSetContainsExactly(fileSystemOperations.names, "b");
 
-		await fileOperations.create("c", new Uint8Array());
-		assertSetContainsExactly(fileSystemOperations.names, "b", "c");
+        await fileOperations.create("c", new Uint8Array());
+        assertSetContainsExactly(fileSystemOperations.names, "b", "c");
 
-		await fileOperations.move("c", "b");
-		assertSetContainsExactly(fileSystemOperations.names, "b", "b (1)");
+        await fileOperations.move("c", "b");
+        assertSetContainsExactly(fileSystemOperations.names, "b", "b (1)");
 
-		await fileOperations.create("c", new Uint8Array());
-		await fileOperations.move("c", "b");
-		assertSetContainsExactly(
-			fileSystemOperations.names,
-			"b",
-			"b (1)",
-			"b (2)"
-		);
-	});
+        await fileOperations.create("c", new Uint8Array());
+        await fileOperations.move("c", "b");
+        assertSetContainsExactly(
+            fileSystemOperations.names,
+            "b",
+            "b (1)",
+            "b (2)"
+        );
+    });
 
-	it("should deconflict renames with file extension", async () => {
-		const fileSystemOperations = new FakeFileSystemOperations();
-		const fileOperations = new FileOperations(
-			new Logger(),
-			new MockDatabase() as Database, // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
-			fileSystemOperations,
-			new MockServerConfig() as ServerConfig // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
-		);
+    it("should deconflict renames with file extension", async () => {
+        const fileSystemOperations = new FakeFileSystemOperations();
+        const fileOperations = new FileOperations(
+            new Logger(),
+            new MockDatabase() as Database, // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+            fileSystemOperations,
+            new MockServerConfig() as ServerConfig // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+        );
 
-		await fileOperations.create("b.md", new Uint8Array());
-		await fileOperations.create("c.md", new Uint8Array());
-		await fileOperations.move("c.md", "b.md");
-		assertSetContainsExactly(
-			fileSystemOperations.names,
-			"b.md",
-			"b (1).md"
-		);
+        await fileOperations.create("b.md", new Uint8Array());
+        await fileOperations.create("c.md", new Uint8Array());
+        await fileOperations.move("c.md", "b.md");
+        assertSetContainsExactly(
+            fileSystemOperations.names,
+            "b.md",
+            "b (1).md"
+        );
 
-		await fileOperations.create("d.md", new Uint8Array());
-		await fileOperations.move("d.md", "b.md");
-		assertSetContainsExactly(
-			fileSystemOperations.names,
-			"b.md",
-			"b (1).md",
-			"b (2).md"
-		);
+        await fileOperations.create("d.md", new Uint8Array());
+        await fileOperations.move("d.md", "b.md");
+        assertSetContainsExactly(
+            fileSystemOperations.names,
+            "b.md",
+            "b (1).md",
+            "b (2).md"
+        );
 
-		await fileOperations.create("file-23.md", new Uint8Array());
-		await fileOperations.create("file-23 (1).md", new Uint8Array());
-		await fileOperations.move("file-23.md", "file-23 (1).md");
-		assertSetContainsExactly(
-			fileSystemOperations.names,
-			"b.md",
-			"b (1).md",
-			"b (2).md",
-			"file-23 (1).md",
-			"file-23 (2).md"
-		);
-	});
+        await fileOperations.create("file-23.md", new Uint8Array());
+        await fileOperations.create("file-23 (1).md", new Uint8Array());
+        await fileOperations.move("file-23.md", "file-23 (1).md");
+        assertSetContainsExactly(
+            fileSystemOperations.names,
+            "b.md",
+            "b (1).md",
+            "b (2).md",
+            "file-23 (1).md",
+            "file-23 (2).md"
+        );
+    });
 
-	it("should deconflict renames with paths", async () => {
-		const fileSystemOperations = new FakeFileSystemOperations();
-		const fileOperations = new FileOperations(
-			new Logger(),
-			new MockDatabase() as Database, // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
-			fileSystemOperations,
-			new MockServerConfig() as ServerConfig // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
-		);
+    it("should deconflict renames with paths", async () => {
+        const fileSystemOperations = new FakeFileSystemOperations();
+        const fileOperations = new FileOperations(
+            new Logger(),
+            new MockDatabase() as Database, // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+            fileSystemOperations,
+            new MockServerConfig() as ServerConfig // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+        );
 
-		await fileOperations.create("a/b.c/d", new Uint8Array());
-		await fileOperations.create("a/b.c/e", new Uint8Array());
-		await fileOperations.move("a/b.c/d", "a/b.c/e");
-		assertSetContainsExactly(
-			fileSystemOperations.names,
-			"a/b.c/e",
-			"a/b.c/e (1)"
-		);
-	});
+        await fileOperations.create("a/b.c/d", new Uint8Array());
+        await fileOperations.create("a/b.c/e", new Uint8Array());
+        await fileOperations.move("a/b.c/d", "a/b.c/e");
+        assertSetContainsExactly(
+            fileSystemOperations.names,
+            "a/b.c/e",
+            "a/b.c/e (1)"
+        );
+    });
 
-	it("should continue deconfliction from existing number in filename", async () => {
-		const fileSystemOperations = new FakeFileSystemOperations();
-		const fileOperations = new FileOperations(
-			new Logger(),
-			new MockDatabase() as Database, // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
-			fileSystemOperations,
-			new MockServerConfig() as ServerConfig // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
-		);
+    it("should continue deconfliction from existing number in filename", async () => {
+        const fileSystemOperations = new FakeFileSystemOperations();
+        const fileOperations = new FileOperations(
+            new Logger(),
+            new MockDatabase() as Database, // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+            fileSystemOperations,
+            new MockServerConfig() as ServerConfig // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+        );
 
-		await fileOperations.create("document (5).md", new Uint8Array());
-		await fileOperations.create("other.md", new Uint8Array());
+        await fileOperations.create("document (5).md", new Uint8Array());
+        await fileOperations.create("other.md", new Uint8Array());
 
-		await fileOperations.move("other.md", "document (5).md");
-		assertSetContainsExactly(
-			fileSystemOperations.names,
-			"document (5).md",
-			"document (6).md"
-		);
+        await fileOperations.move("other.md", "document (5).md");
+        assertSetContainsExactly(
+            fileSystemOperations.names,
+            "document (5).md",
+            "document (6).md"
+        );
 
-		await fileOperations.create("another.md", new Uint8Array());
-		await fileOperations.move("another.md", "document (5).md");
-		assertSetContainsExactly(
-			fileSystemOperations.names,
-			"document (5).md",
-			"document (6).md",
-			"document (7).md"
-		);
-	});
+        await fileOperations.create("another.md", new Uint8Array());
+        await fileOperations.move("another.md", "document (5).md");
+        assertSetContainsExactly(
+            fileSystemOperations.names,
+            "document (5).md",
+            "document (6).md",
+            "document (7).md"
+        );
+    });
 
-	it("should handle dotfiles correctly", async () => {
-		const fileSystemOperations = new FakeFileSystemOperations();
-		const fileOperations = new FileOperations(
-			new Logger(),
-			new MockDatabase() as Database, // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
-			fileSystemOperations,
-			new MockServerConfig() as ServerConfig // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
-		);
+    it("should handle dotfiles correctly", async () => {
+        const fileSystemOperations = new FakeFileSystemOperations();
+        const fileOperations = new FileOperations(
+            new Logger(),
+            new MockDatabase() as Database, // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+            fileSystemOperations,
+            new MockServerConfig() as ServerConfig // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+        );
 
-		await fileOperations.create(".gitignore", new Uint8Array());
-		await fileOperations.create("temp", new Uint8Array());
-		await fileOperations.move("temp", ".gitignore");
-		assertSetContainsExactly(
-			fileSystemOperations.names,
-			".gitignore",
-			".gitignore (1)"
-		);
+        await fileOperations.create(".gitignore", new Uint8Array());
+        await fileOperations.create("temp", new Uint8Array());
+        await fileOperations.move("temp", ".gitignore");
+        assertSetContainsExactly(
+            fileSystemOperations.names,
+            ".gitignore",
+            ".gitignore (1)"
+        );
 
-		await fileOperations.create(".config.json", new Uint8Array());
-		await fileOperations.create("temp2", new Uint8Array());
-		await fileOperations.move("temp2", ".config.json");
-		assertSetContainsExactly(
-			fileSystemOperations.names,
-			".gitignore",
-			".gitignore (1)",
-			".config.json",
-			".config (1).json"
-		);
-	});
+        await fileOperations.create(".config.json", new Uint8Array());
+        await fileOperations.create("temp2", new Uint8Array());
+        await fileOperations.move("temp2", ".config.json");
+        assertSetContainsExactly(
+            fileSystemOperations.names,
+            ".gitignore",
+            ".gitignore (1)",
+            ".config.json",
+            ".config (1).json"
+        );
+    });
 });
diff --git a/frontend/sync-client/src/file-operations/file-operations.ts b/frontend/sync-client/src/file-operations/file-operations.ts
index 6bfdc305..4d3e517d 100644
--- a/frontend/sync-client/src/file-operations/file-operations.ts
+++ b/frontend/sync-client/src/file-operations/file-operations.ts
@@ -9,283 +9,283 @@ import { isBinary } from "../utils/is-binary";
 import type { ServerConfig } from "../services/server-config";
 
 export class FileOperations {
-	private static readonly PARENTHESES_REGEX = / \((?<count>\d+)\)$/;
-	private readonly fs: SafeFileSystemOperations;
+    private static readonly PARENTHESES_REGEX = / \((?<count>\d+)\)$/;
+    private readonly fs: SafeFileSystemOperations;
 
-	public constructor(
-		private readonly logger: Logger,
-		private readonly database: Database,
-		fs: FileSystemOperations,
-		private readonly serverConfig: ServerConfig,
-		private readonly nativeLineEndings = "\n"
-	) {
-		this.fs = new SafeFileSystemOperations(fs, logger);
-	}
+    public constructor(
+        private readonly logger: Logger,
+        private readonly database: Database,
+        fs: FileSystemOperations,
+        private readonly serverConfig: ServerConfig,
+        private readonly nativeLineEndings = "\n"
+    ) {
+        this.fs = new SafeFileSystemOperations(fs, logger);
+    }
 
-	private static getParentDirAndFile(
-		path: RelativePath
-	): [RelativePath, RelativePath] {
-		const pathParts = path.split("/");
-		const fileName = pathParts.pop();
-		if (fileName == null || fileName === "") {
-			throw new Error(`Path '${path}' cannot be empty`);
-		}
+    private static getParentDirAndFile(
+        path: RelativePath
+    ): [RelativePath, RelativePath] {
+        const pathParts = path.split("/");
+        const fileName = pathParts.pop();
+        if (fileName == null || fileName === "") {
+            throw new Error(`Path '${path}' cannot be empty`);
+        }
 
-		return [pathParts.join("/"), fileName];
-	}
+        return [pathParts.join("/"), fileName];
+    }
 
-	public async listFilesRecursively(
-		root: RelativePath | undefined = undefined
-	): Promise<RelativePath[]> {
-		return this.fs.listFilesRecursively(root);
-	}
+    public async listFilesRecursively(
+        root: RelativePath | undefined = undefined
+    ): Promise<RelativePath[]> {
+        return this.fs.listFilesRecursively(root);
+    }
 
-	public async read(path: RelativePath): Promise<Uint8Array> {
-		return this.fromNativeLineEndings(await this.fs.read(path));
-	}
+    public async read(path: RelativePath): Promise<Uint8Array> {
+        return this.fromNativeLineEndings(await this.fs.read(path));
+    }
 
-	/**
-	 * Create a file at the specified path.
-	 *
-	 * If a file with the same name already exists, it is moved before creating the new one.
-	 * Parent directories are created if necessary.
-	 */
-	public async create(
-		path: RelativePath,
-		newContent: Uint8Array
-	): Promise<void> {
-		await this.ensureClearPath(path);
-		return this.fs.write(path, this.toNativeLineEndings(newContent));
-	}
+    /**
+    * Create a file at the specified path.
+    *
+    * If a file with the same name already exists, it is moved before creating the new one.
+    * Parent directories are created if necessary.
+    */
+    public async create(
+        path: RelativePath,
+        newContent: Uint8Array
+    ): Promise<void> {
+        await this.ensureClearPath(path);
+        return this.fs.write(path, this.toNativeLineEndings(newContent));
+    }
 
-	public async ensureClearPath(path: RelativePath): Promise<void> {
-		if (await this.fs.exists(path)) {
-			const deconflictedPath = await this.deconflictPath(path);
-			try {
-				this.logger.debug(
-					`Didn't expect ${path} to exist, deconflicting by moving it to '${deconflictedPath}'`
-				);
+    public async ensureClearPath(path: RelativePath): Promise<void> {
+        if (await this.fs.exists(path)) {
+            const deconflictedPath = await this.deconflictPath(path);
+            try {
+                this.logger.debug(
+                    `Didn't expect ${path} to exist, deconflicting by moving it to '${deconflictedPath}'`
+                );
 
-				this.database.move(path, deconflictedPath);
-				await this.fs.rename(path, deconflictedPath, true);
-			} finally {
-				this.fs.unlock(deconflictedPath);
-			}
-		} else {
-			await this.createParentDirectories(path);
-		}
-	}
+                this.database.move(path, deconflictedPath);
+                await this.fs.rename(path, deconflictedPath, true);
+            } finally {
+                this.fs.unlock(deconflictedPath);
+            }
+        } else {
+            await this.createParentDirectories(path);
+        }
+    }
 
-	/**
-	 * Update the file at the given path.
-	 *
-	 * Performs a 3-way merge before writing if the file's content differs from `expectedContent`.
-	 * Does not recreate the file if it no longer exists, returning an empty array instead.
-	 */
-	public async write(
-		path: RelativePath,
-		expectedContent: Uint8Array,
-		newContent: Uint8Array
-	): Promise<void> {
-		if (!(await this.fs.exists(path))) {
-			this.logger.debug(
-				`The caller assumed ${path} exists, but it no longer, so we wont recreate it`
-			);
-			return;
-		}
+    /**
+    * Update the file at the given path.
+    *
+    * Performs a 3-way merge before writing if the file's content differs from `expectedContent`.
+    * Does not recreate the file if it no longer exists, returning an empty array instead.
+    */
+    public async write(
+        path: RelativePath,
+        expectedContent: Uint8Array,
+        newContent: Uint8Array
+    ): Promise<void> {
+        if (!(await this.fs.exists(path))) {
+            this.logger.debug(
+                `The caller assumed ${path} exists, but it no longer, so we wont recreate it`
+            );
+            return;
+        }
 
-		if (
-			!isFileTypeMergable(
-				path,
-				this.serverConfig.getConfig().mergeableFileExtensions
-			) ||
-			isBinary(expectedContent) ||
-			isBinary(newContent)
-		) {
-			this.logger.debug(
-				`The expected content is not mergable, so we won't perform a 3-way merge, just overwrite it`
-			);
-			await this.fs.write(
-				path,
-				// `newContent` might not be binary so we still have to ensure the line endings are correct
-				this.toNativeLineEndings(newContent)
-			);
-			return;
-		}
+        if (
+            !isFileTypeMergable(
+                path,
+                this.serverConfig.getConfig().mergeableFileExtensions
+            ) ||
+            isBinary(expectedContent) ||
+            isBinary(newContent)
+        ) {
+            this.logger.debug(
+                `The expected content is not mergable, so we won't perform a 3-way merge, just overwrite it`
+            );
+            await this.fs.write(
+                path,
+                // `newContent` might not be binary so we still have to ensure the line endings are correct
+                this.toNativeLineEndings(newContent)
+            );
+            return;
+        }
 
-		const expectedText = new TextDecoder().decode(expectedContent); // this comes from a previous read which must only have \n line endings
-		const newText = new TextDecoder().decode(newContent); // this comes from the server which stores text with \n line endings
+        const expectedText = new TextDecoder().decode(expectedContent); // this comes from a previous read which must only have \n line endings
+        const newText = new TextDecoder().decode(newContent); // this comes from the server which stores text with \n line endings
 
-		await this.fs.atomicUpdateText(
-			path,
-			({ text, cursors }: TextWithCursors): TextWithCursors => {
-				this.logger.debug(
-					`Performing a 3-way merge for ${path} with the expected content`
-				);
+        await this.fs.atomicUpdateText(
+            path,
+            ({ text, cursors }: TextWithCursors): TextWithCursors => {
+                this.logger.debug(
+                    `Performing a 3-way merge for ${path} with the expected content`
+                );
 
-				text = text.replaceAll(this.nativeLineEndings, "\n");
-				const merged = reconcile(
-					expectedText,
-					{ text, cursors },
-					newText
-				);
+                text = text.replaceAll(this.nativeLineEndings, "\n");
+                const merged = reconcile(
+                    expectedText,
+                    { text, cursors },
+                    newText
+                );
 
-				const resultText = merged.text.replaceAll(
-					"\n",
-					this.nativeLineEndings
-				);
+                const resultText = merged.text.replaceAll(
+                    "\n",
+                    this.nativeLineEndings
+                );
 
-				return {
-					text: resultText,
-					cursors: merged.cursors
-				};
-			}
-		);
-	}
+                return {
+                    text: resultText,
+                    cursors: merged.cursors
+                };
+            }
+        );
+    }
 
-	public async delete(path: RelativePath): Promise<void> {
-		if (await this.exists(path)) {
-			await this.fs.delete(path);
-			await this.deletingEmptyParentDirectoriesOfDeletedFile(path);
-		} else {
-			this.logger.debug(`No need to delete '${path}', it doesn't exist`);
-		}
-	}
+    public async delete(path: RelativePath): Promise<void> {
+        if (await this.exists(path)) {
+            await this.fs.delete(path);
+            await this.deletingEmptyParentDirectoriesOfDeletedFile(path);
+        } else {
+            this.logger.debug(`No need to delete '${path}', it doesn't exist`);
+        }
+    }
 
-	public async getFileSize(path: RelativePath): Promise<number> {
-		return this.fs.getFileSize(path);
-	}
+    public async getFileSize(path: RelativePath): Promise<number> {
+        return this.fs.getFileSize(path);
+    }
 
-	public async exists(path: RelativePath): Promise<boolean> {
-		return this.fs.exists(path);
-	}
+    public async exists(path: RelativePath): Promise<boolean> {
+        return this.fs.exists(path);
+    }
 
-	public async move(
-		oldPath: RelativePath,
-		newPath: RelativePath
-	): Promise<void> {
-		if (oldPath === newPath) {
-			return;
-		}
+    public async move(
+        oldPath: RelativePath,
+        newPath: RelativePath
+    ): Promise<void> {
+        if (oldPath === newPath) {
+            return;
+        }
 
-		await this.ensureClearPath(newPath);
+        await this.ensureClearPath(newPath);
 
-		this.database.move(oldPath, newPath);
-		await this.fs.rename(oldPath, newPath);
-		await this.deletingEmptyParentDirectoriesOfDeletedFile(oldPath);
-	}
+        this.database.move(oldPath, newPath);
+        await this.fs.rename(oldPath, newPath);
+        await this.deletingEmptyParentDirectoriesOfDeletedFile(oldPath);
+    }
 
-	public reset(): void {
-		this.fs.reset();
-	}
+    public reset(): void {
+        this.fs.reset();
+    }
 
-	private async deletingEmptyParentDirectoriesOfDeletedFile(
-		path: RelativePath
-	): Promise<void> {
-		let directory = path;
-		// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-		while (true) {
-			[directory] = FileOperations.getParentDirAndFile(directory);
-			if (directory.length === 0) {
-				break;
-			}
+    private async deletingEmptyParentDirectoriesOfDeletedFile(
+        path: RelativePath
+    ): Promise<void> {
+        let directory = path;
+        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+        while (true) {
+            [directory] = FileOperations.getParentDirAndFile(directory);
+            if (directory.length === 0) {
+                break;
+            }
 
-			const remainingContent =
-				await this.fs.listFilesRecursively(directory);
-			if (remainingContent.length === 0) {
-				this.logger.debug(
-					`Folder (${directory}) is now empty, deleting`
-				);
-				await this.fs.delete(directory);
-			} else {
-				break;
-			}
-		}
-	}
+            const remainingContent =
+                await this.fs.listFilesRecursively(directory);
+            if (remainingContent.length === 0) {
+                this.logger.debug(
+                    `Folder (${directory}) is now empty, deleting`
+                );
+                await this.fs.delete(directory);
+            } else {
+                break;
+            }
+        }
+    }
 
-	private fromNativeLineEndings(content: Uint8Array): Uint8Array {
-		if (isBinary(content)) {
-			return content;
-		}
+    private fromNativeLineEndings(content: Uint8Array): Uint8Array {
+        if (isBinary(content)) {
+            return content;
+        }
 
-		const decoder = new TextDecoder("utf-8");
-		let text = decoder.decode(content);
-		text = text.replaceAll(this.nativeLineEndings, "\n");
-		return new TextEncoder().encode(text);
-	}
+        const decoder = new TextDecoder("utf-8");
+        let text = decoder.decode(content);
+        text = text.replaceAll(this.nativeLineEndings, "\n");
+        return new TextEncoder().encode(text);
+    }
 
-	private toNativeLineEndings(content: Uint8Array): Uint8Array {
-		if (isBinary(content)) {
-			return content;
-		}
+    private toNativeLineEndings(content: Uint8Array): Uint8Array {
+        if (isBinary(content)) {
+            return content;
+        }
 
-		const decoder = new TextDecoder("utf-8");
-		let text = decoder.decode(content);
-		text = text.replaceAll("\n", this.nativeLineEndings);
-		return new TextEncoder().encode(text);
-	}
+        const decoder = new TextDecoder("utf-8");
+        let text = decoder.decode(content);
+        text = text.replaceAll("\n", this.nativeLineEndings);
+        return new TextEncoder().encode(text);
+    }
 
-	private async createParentDirectories(path: string): Promise<void> {
-		const components = path.split("/");
-		if (components.length === 1) {
-			return;
-		}
-		for (let i = 1; i < components.length; i++) {
-			const parentDir = components.slice(0, i).join("/");
-			if (!(await this.fs.exists(parentDir))) {
-				await this.fs.createDirectory(parentDir);
-			}
-		}
-	}
+    private async createParentDirectories(path: string): Promise<void> {
+        const components = path.split("/");
+        if (components.length === 1) {
+            return;
+        }
+        for (let i = 1; i < components.length; i++) {
+            const parentDir = components.slice(0, i).join("/");
+            if (!(await this.fs.exists(parentDir))) {
+                await this.fs.createDirectory(parentDir);
+            }
+        }
+    }
 
-	/**
-	 * Deconflicts the given path by appending (1), (2), etc. before the file extension until a non-existent path is found.
-	 * The returned path has a lock acquired on it; it must be released by the caller when no longer needed.
-	 *
-	 * @param path The starting path to deconflict
-	 * @returns a non-existent path with a lock acquired on it
-	 */
-	private async deconflictPath(path: RelativePath): Promise<RelativePath> {
-		// eslint-disable-next-line prefer-const
-		let [directory, fileName] = FileOperations.getParentDirAndFile(path);
+    /**
+    * Deconflicts the given path by appending (1), (2), etc. before the file extension until a non-existent path is found.
+    * The returned path has a lock acquired on it; it must be released by the caller when no longer needed.
+    *
+    * @param path The starting path to deconflict
+    * @returns a non-existent path with a lock acquired on it
+    */
+    private async deconflictPath(path: RelativePath): Promise<RelativePath> {
+        // eslint-disable-next-line prefer-const
+        let [directory, fileName] = FileOperations.getParentDirAndFile(path);
 
-		if (directory) {
-			directory += "/";
-		}
+        if (directory) {
+            directory += "/";
+        }
 
-		const nameParts = fileName.split(".");
-		// Handle dotfiles: ".gitignore" should have no extension, ".config.json" should have ".json"
-		const isDotfile = fileName.startsWith(".") && nameParts[0] === "";
-		const extension =
-			nameParts.length > 1 && !(isDotfile && nameParts.length === 2)
-				? "." + nameParts[nameParts.length - 1]
-				: "";
-		let stem = extension ? nameParts.slice(0, -1).join(".") : fileName;
-		let currentCount = Number.parseInt(
-			FileOperations.PARENTHESES_REGEX.exec(stem)?.groups?.count ?? "0"
-		);
-		stem = stem.replace(FileOperations.PARENTHESES_REGEX, "");
+        const nameParts = fileName.split(".");
+        // Handle dotfiles: ".gitignore" should have no extension, ".config.json" should have ".json"
+        const isDotfile = fileName.startsWith(".") && nameParts[0] === "";
+        const extension =
+            nameParts.length > 1 && !(isDotfile && nameParts.length === 2)
+                ? "." + nameParts[nameParts.length - 1]
+                : "";
+        let stem = extension ? nameParts.slice(0, -1).join(".") : fileName;
+        let currentCount = Number.parseInt(
+            FileOperations.PARENTHESES_REGEX.exec(stem)?.groups?.count ?? "0"
+        );
+        stem = stem.replace(FileOperations.PARENTHESES_REGEX, "");
 
-		let newName = path;
+        let newName = path;
 
-		// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-		while (true) {
-			currentCount++;
-			newName = `${directory}${stem} (${currentCount})${extension}`;
+        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+        while (true) {
+            currentCount++;
+            newName = `${directory}${stem} (${currentCount})${extension}`;
 
-			// Avoid multiple deconflictPath calls returning the same path
-			if (this.fs.tryLock(newName)) {
-				const newDocument =
-					this.database.getLatestDocumentByRelativePath(newName);
-				if (
-					newDocument?.isDeleted === false || // the document might have been confirmed by the server at a new path but haven't yet moved there locally
-					(await this.fs.exists(newName, true))
-				) {
-					this.fs.unlock(newName);
-				} else {
-					return newName;
-				}
-			}
-		}
-	}
+            // Avoid multiple deconflictPath calls returning the same path
+            if (this.fs.tryLock(newName)) {
+                const newDocument =
+                    this.database.getLatestDocumentByRelativePath(newName);
+                if (
+                    newDocument?.isDeleted === false || // the document might have been confirmed by the server at a new path but haven't yet moved there locally
+                    (await this.fs.exists(newName, true))
+                ) {
+                    this.fs.unlock(newName);
+                } else {
+                    return newName;
+                }
+            }
+        }
+    }
 }
diff --git a/frontend/sync-client/src/file-operations/filesystem-operations.ts b/frontend/sync-client/src/file-operations/filesystem-operations.ts
index 9c7a8366..36dddfe6 100644
--- a/frontend/sync-client/src/file-operations/filesystem-operations.ts
+++ b/frontend/sync-client/src/file-operations/filesystem-operations.ts
@@ -3,35 +3,35 @@ import type { RelativePath } from "../persistence/database";
 import type { TextWithCursors } from "reconcile-text";
 
 export interface FileSystemOperations {
-	// List all files under root that should be synced. If root is undefined, return every file.
-	listFilesRecursively: (
-		root: RelativePath | undefined
-	) => Promise<RelativePath[]>;
+    // List all files under root that should be synced. If root is undefined, return every file.
+    listFilesRecursively: (
+        root: RelativePath | undefined
+    ) => Promise<RelativePath[]>;
 
-	// Read the content of a file.
-	read: (path: RelativePath) => Promise<Uint8Array>;
+    // Read the content of a file.
+    read: (path: RelativePath) => Promise<Uint8Array>;
 
-	// Create or overwrite a file with the given content.
-	write: (path: RelativePath, content: Uint8Array) => Promise<void>;
+    // Create or overwrite a file with the given content.
+    write: (path: RelativePath, content: Uint8Array) => Promise<void>;
 
-	// Atomically update the content of a text file.
-	atomicUpdateText: (
-		path: RelativePath,
-		updater: (current: TextWithCursors) => TextWithCursors
-	) => Promise<string>;
+    // Atomically update the content of a text file.
+    atomicUpdateText: (
+        path: RelativePath,
+        updater: (current: TextWithCursors) => TextWithCursors
+    ) => Promise<string>;
 
-	// Get the size of a file in bytes.
-	getFileSize: (path: RelativePath) => Promise<number>;
+    // Get the size of a file in bytes.
+    getFileSize: (path: RelativePath) => Promise<number>;
 
-	// Check if a file exists.
-	exists: (path: RelativePath) => Promise<boolean>;
+    // Check if a file exists.
+    exists: (path: RelativePath) => Promise<boolean>;
 
-	// Create a directory at the specified path. All parent directories must already exist.
-	createDirectory: (path: RelativePath) => Promise<void>;
+    // Create a directory at the specified path. All parent directories must already exist.
+    createDirectory: (path: RelativePath) => Promise<void>;
 
-	// Delete a file. It is expected that the path points to an existing file.
-	delete: (path: RelativePath) => Promise<void>;
+    // Delete a file. It is expected that the path points to an existing file.
+    delete: (path: RelativePath) => Promise<void>;
 
-	// Rename a file. It is expected that the oldPath points to an existing file and the newPath does not exist.
-	rename: (oldPath: RelativePath, newPath: RelativePath) => Promise<void>;
+    // Rename a file. It is expected that the oldPath points to an existing file and the newPath does not exist.
+    rename: (oldPath: RelativePath, newPath: RelativePath) => Promise<void>;
 }
diff --git a/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts b/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
index 33984be4..904bf805 100644
--- a/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
+++ b/frontend/sync-client/src/file-operations/safe-filesystem-operations.ts
@@ -11,160 +11,160 @@ import type { TextWithCursors } from "reconcile-text";
  * single request in-flight for any one file through the use of locks.
  */
 export class SafeFileSystemOperations implements FileSystemOperations {
-	private readonly locks: Locks<RelativePath>;
+    private readonly locks: Locks<RelativePath>;
 
-	public constructor(
-		private readonly fs: FileSystemOperations,
-		private readonly logger: Logger
-	) {
-		this.locks = new Locks(logger);
-	}
+    public constructor(
+        private readonly fs: FileSystemOperations,
+        private readonly logger: Logger
+    ) {
+        this.locks = new Locks(logger);
+    }
 
-	public async listFilesRecursively(
-		root: RelativePath | undefined
-	): Promise<RelativePath[]> {
-		this.logger.debug("Listing all files");
-		const result = await this.fs.listFilesRecursively(root);
-		this.logger.debug(`Listed ${result.length} files`);
-		return result;
-	}
+    public async listFilesRecursively(
+        root: RelativePath | undefined
+    ): Promise<RelativePath[]> {
+        this.logger.debug("Listing all files");
+        const result = await this.fs.listFilesRecursively(root);
+        this.logger.debug(`Listed ${result.length} files`);
+        return result;
+    }
 
-	public async read(path: RelativePath): Promise<Uint8Array> {
-		this.logger.debug(`Reading file '${path}'`);
-		return this.safeOperation(
-			path,
-			async () =>
-				this.locks.withLock(path, async () => this.fs.read(path)),
-			"read"
-		);
-	}
+    public async read(path: RelativePath): Promise<Uint8Array> {
+        this.logger.debug(`Reading file '${path}'`);
+        return this.safeOperation(
+            path,
+            async () =>
+                this.locks.withLock(path, async () => this.fs.read(path)),
+            "read"
+        );
+    }
 
-	public async write(path: RelativePath, content: Uint8Array): Promise<void> {
-		this.logger.debug(`Writing to file '${path}'`);
-		return this.locks.withLock(path, async () =>
-			this.fs.write(path, content)
-		);
-	}
+    public async write(path: RelativePath, content: Uint8Array): Promise<void> {
+        this.logger.debug(`Writing to file '${path}'`);
+        return this.locks.withLock(path, async () =>
+            this.fs.write(path, content)
+        );
+    }
 
-	public async atomicUpdateText(
-		path: RelativePath,
-		updater: (current: TextWithCursors) => TextWithCursors
-	): Promise<string> {
-		this.logger.debug(`Atomically updating file '${path}'`);
-		return this.safeOperation(
-			path,
-			async () =>
-				this.locks.withLock(path, async () =>
-					this.fs.atomicUpdateText(path, updater)
-				),
-			"atomicUpdateText"
-		);
-	}
+    public async atomicUpdateText(
+        path: RelativePath,
+        updater: (current: TextWithCursors) => TextWithCursors
+    ): Promise<string> {
+        this.logger.debug(`Atomically updating file '${path}'`);
+        return this.safeOperation(
+            path,
+            async () =>
+                this.locks.withLock(path, async () =>
+                    this.fs.atomicUpdateText(path, updater)
+                ),
+            "atomicUpdateText"
+        );
+    }
 
-	public async getFileSize(path: RelativePath): Promise<number> {
-		// Logging this would be too noisy
-		return this.safeOperation(
-			path,
-			async () =>
-				this.locks.withLock(path, async () =>
-					this.fs.getFileSize(path)
-				),
-			"getFileSize"
-		);
-	}
+    public async getFileSize(path: RelativePath): Promise<number> {
+        // Logging this would be too noisy
+        return this.safeOperation(
+            path,
+            async () =>
+                this.locks.withLock(path, async () =>
+                    this.fs.getFileSize(path)
+                ),
+            "getFileSize"
+        );
+    }
 
-	public async exists(
-		path: RelativePath,
-		skipLock = false
-	): Promise<boolean> {
-		this.logger.debug(`Checking if file '${path}' exists`);
-		if (skipLock) {
-			return this.fs.exists(path);
-		} else {
-			return this.locks.withLock(path, async () => this.fs.exists(path));
-		}
-	}
+    public async exists(
+        path: RelativePath,
+        skipLock = false
+    ): Promise<boolean> {
+        this.logger.debug(`Checking if file '${path}' exists`);
+        if (skipLock) {
+            return this.fs.exists(path);
+        } else {
+            return this.locks.withLock(path, async () => this.fs.exists(path));
+        }
+    }
 
-	public async createDirectory(path: RelativePath): Promise<void> {
-		this.logger.debug(`Creating directory '${path}'`);
-		return this.locks.withLock(path, async () =>
-			this.fs.createDirectory(path)
-		);
-	}
+    public async createDirectory(path: RelativePath): Promise<void> {
+        this.logger.debug(`Creating directory '${path}'`);
+        return this.locks.withLock(path, async () =>
+            this.fs.createDirectory(path)
+        );
+    }
 
-	public async delete(path: RelativePath): Promise<void> {
-		this.logger.debug(`Deleting file '${path}'`);
-		return this.locks.withLock(path, async () => this.fs.delete(path));
-	}
+    public async delete(path: RelativePath): Promise<void> {
+        this.logger.debug(`Deleting file '${path}'`);
+        return this.locks.withLock(path, async () => this.fs.delete(path));
+    }
 
-	public async rename(
-		oldPath: RelativePath,
-		newPath: RelativePath,
-		skipLock = false
-	): Promise<void> {
-		this.logger.debug(`Renaming file '${oldPath}' to '${newPath}'`);
-		return this.safeOperation(
-			oldPath,
-			async () => {
-				if (skipLock) {
-					return this.fs.rename(oldPath, newPath);
-				} else {
-					return this.locks.withLock([oldPath, newPath], async () =>
-						this.fs.rename(oldPath, newPath)
-					);
-				}
-			},
-			"rename"
-		);
-	}
+    public async rename(
+        oldPath: RelativePath,
+        newPath: RelativePath,
+        skipLock = false
+    ): Promise<void> {
+        this.logger.debug(`Renaming file '${oldPath}' to '${newPath}'`);
+        return this.safeOperation(
+            oldPath,
+            async () => {
+                if (skipLock) {
+                    return this.fs.rename(oldPath, newPath);
+                } else {
+                    return this.locks.withLock([oldPath, newPath], async () =>
+                        this.fs.rename(oldPath, newPath)
+                    );
+                }
+            },
+            "rename"
+        );
+    }
 
-	public tryLock(path: RelativePath): boolean {
-		return this.locks.tryLock(path);
-	}
+    public tryLock(path: RelativePath): boolean {
+        return this.locks.tryLock(path);
+    }
 
-	public async waitForLock(path: RelativePath): Promise<void> {
-		return this.locks.waitForLock(path);
-	}
+    public async waitForLock(path: RelativePath): Promise<void> {
+        return this.locks.waitForLock(path);
+    }
 
-	public unlock(path: RelativePath): void {
-		this.locks.unlock(path);
-	}
+    public unlock(path: RelativePath): void {
+        this.locks.unlock(path);
+    }
 
-	public reset(): void {
-		this.locks.reset();
-	}
+    public reset(): void {
+        this.locks.reset();
+    }
 
-	/**
-	 * Decorate an operation to ensure that the file exists before running it.
-	 * If the operation fails, it will check if the file still exists and throw
-	 * a FileNotFoundError if it doesn't.
-	 */
-	private async safeOperation<T>(
-		path: RelativePath,
-		operation: () => Promise<T>,
-		operationName: string
-	): Promise<T> {
-		if (!(await this.fs.exists(path))) {
-			throw new FileNotFoundError(
-				`File not found before trying to ${operationName}`,
-				path
-			);
-		}
+    /**
+    * Decorate an operation to ensure that the file exists before running it.
+    * If the operation fails, it will check if the file still exists and throw
+    * a FileNotFoundError if it doesn't.
+    */
+    private async safeOperation<T>(
+        path: RelativePath,
+        operation: () => Promise<T>,
+        operationName: string
+    ): Promise<T> {
+        if (!(await this.fs.exists(path))) {
+            throw new FileNotFoundError(
+                `File not found before trying to ${operationName}`,
+                path
+            );
+        }
 
-		try {
-			return await operation();
-		} catch (error) {
-			// Without locking the file, this isn't atomic, however, it's good enough in practice.
-			// This will only break if the file exists, gets deleted and then immediately
-			// recreated while `operation` is running.
-			if (await this.fs.exists(path)) {
-				throw error;
-			} else {
-				throw new FileNotFoundError(
-					`File not found when trying to ${operationName}`,
-					path
-				);
-			}
-		}
-	}
+        try {
+            return await operation();
+        } catch (error) {
+            // Without locking the file, this isn't atomic, however, it's good enough in practice.
+            // This will only break if the file exists, gets deleted and then immediately
+            // recreated while `operation` is running.
+            if (await this.fs.exists(path)) {
+                throw error;
+            } else {
+                throw new FileNotFoundError(
+                    `File not found when trying to ${operationName}`,
+                    path
+                );
+            }
+        }
+    }
 }
diff --git a/frontend/sync-client/src/index.ts b/frontend/sync-client/src/index.ts
index 405acb10..cfcc5071 100644
--- a/frontend/sync-client/src/index.ts
+++ b/frontend/sync-client/src/index.ts
@@ -8,15 +8,15 @@ import { positionToLineAndColumn } from "./utils/position-to-line-and-column";
 import { removeFromArray } from "./utils/remove-from-array";
 
 export {
-	SyncType,
-	SyncStatus,
-	type HistoryStats,
-	type HistoryEntry,
-	type SyncDetails,
-	type SyncCreateDetails,
-	type SyncUpdateDetails,
-	type SyncMovedDetails,
-	type SyncDeleteDetails
+    SyncType,
+    SyncStatus,
+    type HistoryStats,
+    type HistoryEntry,
+    type SyncDetails,
+    type SyncCreateDetails,
+    type SyncUpdateDetails,
+    type SyncMovedDetails,
+    type SyncDeleteDetails
 } from "./tracing/sync-history";
 export { Logger, LogLevel, LogLine } from "./tracing/logger";
 export { type SyncSettings, DEFAULT_SETTINGS } from "./persistence/settings";
@@ -35,15 +35,15 @@ export { SyncClient } from "./sync-client";
 export type { TextWithCursors, CursorPosition } from "reconcile-text";
 
 export const debugging = {
-	slowFetchFactory,
-	slowWebSocketFactory,
-	logToConsole
+    slowFetchFactory,
+    slowWebSocketFactory,
+    logToConsole
 };
 
 export const utils = {
-	getRandomColor,
-	positionToLineAndColumn,
-	lineAndColumnToPosition,
-	awaitAll,
-	removeFromArray
+    getRandomColor,
+    positionToLineAndColumn,
+    lineAndColumnToPosition,
+    awaitAll,
+    removeFromArray
 };
diff --git a/frontend/sync-client/src/persistence/database.ts b/frontend/sync-client/src/persistence/database.ts
index 5568169b..8e1cd61f 100644
--- a/frontend/sync-client/src/persistence/database.ts
+++ b/frontend/sync-client/src/persistence/database.ts
@@ -9,23 +9,23 @@ export type DocumentId = string;
 export type RelativePath = string;
 
 export interface DocumentMetadata {
-	parentVersionId: VaultUpdateId;
-	hash: string;
-	remoteRelativePath?: RelativePath;
+    parentVersionId: VaultUpdateId;
+    hash: string;
+    remoteRelativePath?: RelativePath;
 }
 
 export interface StoredDocumentMetadata {
-	relativePath: RelativePath;
-	documentId: DocumentId;
-	parentVersionId: VaultUpdateId;
-	remoteRelativePath?: RelativePath;
-	hash: string;
+    relativePath: RelativePath;
+    documentId: DocumentId;
+    parentVersionId: VaultUpdateId;
+    remoteRelativePath?: RelativePath;
+    hash: string;
 }
 
 export interface StoredDatabase {
-	documents: StoredDocumentMetadata[];
-	lastSeenUpdateId: VaultUpdateId | undefined;
-	hasInitialSyncCompleted: boolean;
+    documents: StoredDocumentMetadata[];
+    lastSeenUpdateId: VaultUpdateId | undefined;
+    hasInitialSyncCompleted: boolean;
 }
 
 /**
@@ -35,340 +35,340 @@ export interface StoredDatabase {
  * state of the document on disk based on the update events we have seen.
  */
 export interface DocumentRecord {
-	relativePath: RelativePath;
-	documentId: DocumentId;
-	metadata: DocumentMetadata | undefined;
-	isDeleted: boolean;
-	updates: Promise<unknown>[];
-	parallelVersion: number;
+    relativePath: RelativePath;
+    documentId: DocumentId;
+    metadata: DocumentMetadata | undefined;
+    isDeleted: boolean;
+    updates: Promise<unknown>[];
+    parallelVersion: number;
 }
 
 export class Database {
-	private documents: DocumentRecord[];
-	private lastSeenUpdateIds: CoveredValues;
-	private hasInitialSyncCompleted: boolean;
+    private documents: DocumentRecord[];
+    private lastSeenUpdateIds: CoveredValues;
+    private hasInitialSyncCompleted: boolean;
 
-	public constructor(
-		private readonly logger: Logger,
-		initialState: Partial<StoredDatabase> | undefined,
-		private readonly saveData: (data: StoredDatabase) => Promise<void>
-	) {
-		initialState ??= {};
+    public constructor(
+        private readonly logger: Logger,
+        initialState: Partial<StoredDatabase> | undefined,
+        private readonly saveData: (data: StoredDatabase) => Promise<void>
+    ) {
+        initialState ??= {};
 
-		this.documents =
-			initialState.documents?.map(
-				({ relativePath, documentId, ...metadata }) => ({
-					relativePath,
-					documentId,
-					metadata,
-					isDeleted: false,
-					updates: [],
-					parallelVersion: 0
-				})
-			) ?? [];
+        this.documents =
+            initialState.documents?.map(
+                ({ relativePath, documentId, ...metadata }) => ({
+                    relativePath,
+                    documentId,
+                    metadata,
+                    isDeleted: false,
+                    updates: [],
+                    parallelVersion: 0
+                })
+            ) ?? [];
 
-		this.ensureConsistency();
-		this.logger.debug(`Loaded ${this.documents.length} documents`);
+        this.ensureConsistency();
+        this.logger.debug(`Loaded ${this.documents.length} documents`);
 
-		const { lastSeenUpdateId } = initialState;
-		this.logger.debug(`Loaded last seen update id: ${lastSeenUpdateId}`);
-		this.lastSeenUpdateIds = new CoveredValues(
-			Math.max(0, lastSeenUpdateId ?? 0) // the first updateId will be 1 which is the first integer after -1
-		);
+        const { lastSeenUpdateId } = initialState;
+        this.logger.debug(`Loaded last seen update id: ${lastSeenUpdateId}`);
+        this.lastSeenUpdateIds = new CoveredValues(
+            Math.max(0, lastSeenUpdateId ?? 0) // the first updateId will be 1 which is the first integer after -1
+        );
 
-		this.documents.forEach((doc) => {
-			this.lastSeenUpdateIds.add(doc.metadata?.parentVersionId);
-		});
+        this.documents.forEach((doc) => {
+            this.lastSeenUpdateIds.add(doc.metadata?.parentVersionId);
+        });
 
-		this.hasInitialSyncCompleted =
-			initialState.hasInitialSyncCompleted ?? false;
-		this.logger.debug(
-			`Loaded hasInitialSyncCompleted: ${this.hasInitialSyncCompleted}`
-		);
-	}
+        this.hasInitialSyncCompleted =
+            initialState.hasInitialSyncCompleted ?? false;
+        this.logger.debug(
+            `Loaded hasInitialSyncCompleted: ${this.hasInitialSyncCompleted}`
+        );
+    }
 
-	public get length(): number {
-		return this.documents.length;
-	}
+    public get length(): number {
+        return this.documents.length;
+    }
 
-	public get resolvedDocuments(): DocumentRecord[] {
-		const paths = new Map<string, DocumentRecord[]>();
-		this.documents
-			// eslint-disable-next-line no-restricted-syntax -- Type narrowing, not removing a specific item
-			.filter(({ metadata }) => metadata !== undefined)
-			.forEach((record) =>
-				paths.set(record.relativePath, [
-					record,
-					...(paths.get(record.relativePath) ?? [])
-				])
-			);
+    public get resolvedDocuments(): DocumentRecord[] {
+        const paths = new Map<string, DocumentRecord[]>();
+        this.documents
+            // eslint-disable-next-line no-restricted-syntax -- Type narrowing, not removing a specific item
+            .filter(({ metadata }) => metadata !== undefined)
+            .forEach((record) =>
+                paths.set(record.relativePath, [
+                    record,
+                    ...(paths.get(record.relativePath) ?? [])
+                ])
+            );
 
-		return Array.from(paths.values()).map((records) => {
-			records.sort(
-				(a, b) => b.parallelVersion - a.parallelVersion // descending
-			);
+        return Array.from(paths.values()).map((records) => {
+            records.sort(
+                (a, b) => b.parallelVersion - a.parallelVersion // descending
+            );
 
-			if (
-				records.length > 1 &&
-				records.some((current, i) =>
-					i === 0
-						? false
-						: records[i - 1].parallelVersion ===
-							current.parallelVersion
-				)
-			) {
-				throw new Error(
-					`Multiple documents with the same parallel version and path at ${records[0].relativePath}`
-				);
-			}
-			return records[0];
-		});
-	}
+            if (
+                records.length > 1 &&
+                records.some((current, i) =>
+                    i === 0
+                        ? false
+                        : records[i - 1].parallelVersion ===
+                            current.parallelVersion
+                )
+            ) {
+                throw new Error(
+                    `Multiple documents with the same parallel version and path at ${records[0].relativePath}`
+                );
+            }
+            return records[0];
+        });
+    }
 
-	public updateDocumentMetadata(
-		metadata: {
-			parentVersionId: VaultUpdateId;
-			hash: string;
-			remoteRelativePath: RelativePath;
-		},
-		toUpdate: DocumentRecord
-	): void {
-		if (!this.documents.includes(toUpdate)) {
-			throw new Error("Document not found in database");
-		}
+    public updateDocumentMetadata(
+        metadata: {
+            parentVersionId: VaultUpdateId;
+            hash: string;
+            remoteRelativePath: RelativePath;
+        },
+        toUpdate: DocumentRecord
+    ): void {
+        if (!this.documents.includes(toUpdate)) {
+            throw new Error("Document not found in database");
+        }
 
-		toUpdate.metadata = metadata;
+        toUpdate.metadata = metadata;
 
-		this.saveInTheBackground();
-	}
+        this.saveInTheBackground();
+    }
 
-	public removeDocumentPromise(promise: Promise<unknown>): void {
-		const entry = this.documents.find(({ updates }) =>
-			updates.includes(promise)
-		);
+    public removeDocumentPromise(promise: Promise<unknown>): void {
+        const entry = this.documents.find(({ updates }) =>
+            updates.includes(promise)
+        );
 
-		if (entry === undefined) {
-			// This method should be idempotent and tolerant of
-			// stragglers calling it after the databse has been reset.
-			return;
-		}
+        if (entry === undefined) {
+            // This method should be idempotent and tolerant of
+            // stragglers calling it after the databse has been reset.
+            return;
+        }
 
-		removeFromArray(entry.updates, promise);
-		// No need to save as Promises don't get serialized
-	}
+        removeFromArray(entry.updates, promise);
+        // No need to save as Promises don't get serialized
+    }
 
-	public removeDocument(find: DocumentRecord): void {
-		removeFromArray(this.documents, find);
-		this.saveInTheBackground();
-	}
+    public removeDocument(find: DocumentRecord): void {
+        removeFromArray(this.documents, find);
+        this.saveInTheBackground();
+    }
 
-	public getLatestDocumentByRelativePath(
-		find: RelativePath
-	): DocumentRecord | undefined {
-		const candidates = this.documents.filter(
-			({ relativePath }) => relativePath === find
-		);
-		candidates.sort((a, b) => b.parallelVersion - a.parallelVersion); // descending
-		return candidates[0];
-	}
+    public getLatestDocumentByRelativePath(
+        find: RelativePath
+    ): DocumentRecord | undefined {
+        const candidates = this.documents.filter(
+            ({ relativePath }) => relativePath === find
+        );
+        candidates.sort((a, b) => b.parallelVersion - a.parallelVersion); // descending
+        return candidates[0];
+    }
 
-	public async getResolvedDocumentByRelativePath(
-		relativePath: RelativePath,
-		promise: Promise<unknown>
-	): Promise<DocumentRecord> {
-		const entry = this.getLatestDocumentByRelativePath(relativePath);
+    public async getResolvedDocumentByRelativePath(
+        relativePath: RelativePath,
+        promise: Promise<unknown>
+    ): Promise<DocumentRecord> {
+        const entry = this.getLatestDocumentByRelativePath(relativePath);
 
-		if (entry === undefined) {
-			throw new Error(
-				`Document not found by relative path: ${relativePath}, ${JSON.stringify(
-					this.documents,
-					null,
-					2
-				)}`
-			);
-		}
+        if (entry === undefined) {
+            throw new Error(
+                `Document not found by relative path: ${relativePath}, ${JSON.stringify(
+                    this.documents,
+                    null,
+                    2
+                )}`
+            );
+        }
 
-		const currentPromises = entry.updates;
-		entry.updates = [...currentPromises, promise];
-		await awaitAll(currentPromises);
+        const currentPromises = entry.updates;
+        entry.updates = [...currentPromises, promise];
+        await awaitAll(currentPromises);
 
-		return entry;
-	}
+        return entry;
+    }
 
-	public createNewPendingDocument(
-		documentId: DocumentId,
-		relativePath: RelativePath,
-		promise: Promise<unknown>
-	): DocumentRecord {
-		this.logger.debug(
-			`Creating new pending document: ${relativePath} (${documentId})`
-		);
-		const previousEntry =
-			this.getLatestDocumentByRelativePath(relativePath);
+    public createNewPendingDocument(
+        documentId: DocumentId,
+        relativePath: RelativePath,
+        promise: Promise<unknown>
+    ): DocumentRecord {
+        this.logger.debug(
+            `Creating new pending document: ${relativePath} (${documentId})`
+        );
+        const previousEntry =
+            this.getLatestDocumentByRelativePath(relativePath);
 
-		const entry = {
-			relativePath,
-			documentId,
-			metadata: undefined,
-			isDeleted: false,
-			updates: [promise],
-			parallelVersion:
-				previousEntry?.parallelVersion === undefined
-					? 0
-					: previousEntry.parallelVersion + 1
-		};
+        const entry = {
+            relativePath,
+            documentId,
+            metadata: undefined,
+            isDeleted: false,
+            updates: [promise],
+            parallelVersion:
+                previousEntry?.parallelVersion === undefined
+                    ? 0
+                    : previousEntry.parallelVersion + 1
+        };
 
-		this.documents.push(entry);
-		this.saveInTheBackground();
+        this.documents.push(entry);
+        this.saveInTheBackground();
 
-		return entry;
-	}
+        return entry;
+    }
 
-	public createNewEmptyDocument(
-		documentId: DocumentId,
-		parentVersionId: VaultUpdateId,
-		relativePath: RelativePath
-	): DocumentRecord {
-		const entry = {
-			relativePath,
-			documentId,
-			metadata: {
-				parentVersionId,
-				hash: EMPTY_HASH,
-				remoteRelativePath: relativePath
-			},
-			isDeleted: false,
-			updates: [],
-			parallelVersion: 0
-		};
+    public createNewEmptyDocument(
+        documentId: DocumentId,
+        parentVersionId: VaultUpdateId,
+        relativePath: RelativePath
+    ): DocumentRecord {
+        const entry = {
+            relativePath,
+            documentId,
+            metadata: {
+                parentVersionId,
+                hash: EMPTY_HASH,
+                remoteRelativePath: relativePath
+            },
+            isDeleted: false,
+            updates: [],
+            parallelVersion: 0
+        };
 
-		this.documents.push(entry);
-		this.saveInTheBackground();
+        this.documents.push(entry);
+        this.saveInTheBackground();
 
-		return entry;
-	}
+        return entry;
+    }
 
-	public getDocumentByDocumentId(
-		find: DocumentId
-	): DocumentRecord | undefined {
-		return this.documents.find(({ documentId }) => documentId === find);
-	}
+    public getDocumentByDocumentId(
+        find: DocumentId
+    ): DocumentRecord | undefined {
+        return this.documents.find(({ documentId }) => documentId === find);
+    }
 
-	public move(
-		oldRelativePath: RelativePath,
-		newRelativePath: RelativePath
-	): void {
-		const oldDocument =
-			this.getLatestDocumentByRelativePath(oldRelativePath);
+    public move(
+        oldRelativePath: RelativePath,
+        newRelativePath: RelativePath
+    ): void {
+        const oldDocument =
+            this.getLatestDocumentByRelativePath(oldRelativePath);
 
-		if (oldDocument === undefined) {
-			return;
-		}
+        if (oldDocument === undefined) {
+            return;
+        }
 
-		const newDocument =
-			this.getLatestDocumentByRelativePath(newRelativePath);
-		if (newDocument?.isDeleted === false) {
-			throw new Error(
-				`Document already exists at new location: ${newRelativePath}`
-			);
-		}
+        const newDocument =
+            this.getLatestDocumentByRelativePath(newRelativePath);
+        if (newDocument?.isDeleted === false) {
+            throw new Error(
+                `Document already exists at new location: ${newRelativePath}`
+            );
+        }
 
-		oldDocument.relativePath = newRelativePath;
-		// We're in a strange state where the target of the move has just got deleted,
-		// however, its metadata might already have a bunch of updates queued up for
-		// the document at the new location. We need to keep these updates.
-		oldDocument.parallelVersion =
-			newDocument !== undefined ? newDocument.parallelVersion + 1 : 0;
+        oldDocument.relativePath = newRelativePath;
+        // We're in a strange state where the target of the move has just got deleted,
+        // however, its metadata might already have a bunch of updates queued up for
+        // the document at the new location. We need to keep these updates.
+        oldDocument.parallelVersion =
+            newDocument !== undefined ? newDocument.parallelVersion + 1 : 0;
 
-		this.saveInTheBackground();
-	}
+        this.saveInTheBackground();
+    }
 
-	public delete(relativePath: RelativePath): void {
-		const candidate = this.getLatestDocumentByRelativePath(relativePath);
-		if (candidate === undefined) {
-			throw new Error(
-				`Document not found by relative path: ${relativePath}`
-			);
-		}
-		candidate.isDeleted = true;
-	}
+    public delete(relativePath: RelativePath): void {
+        const candidate = this.getLatestDocumentByRelativePath(relativePath);
+        if (candidate === undefined) {
+            throw new Error(
+                `Document not found by relative path: ${relativePath}`
+            );
+        }
+        candidate.isDeleted = true;
+    }
 
-	public getHasInitialSyncCompleted(): boolean {
-		return this.hasInitialSyncCompleted;
-	}
+    public getHasInitialSyncCompleted(): boolean {
+        return this.hasInitialSyncCompleted;
+    }
 
-	public setHasInitialSyncCompleted(value: boolean): void {
-		this.hasInitialSyncCompleted = value;
-		this.saveInTheBackground();
-	}
+    public setHasInitialSyncCompleted(value: boolean): void {
+        this.hasInitialSyncCompleted = value;
+        this.saveInTheBackground();
+    }
 
-	public getLastSeenUpdateId(): VaultUpdateId {
-		return this.lastSeenUpdateIds.min;
-	}
+    public getLastSeenUpdateId(): VaultUpdateId {
+        return this.lastSeenUpdateIds.min;
+    }
 
-	public addSeenUpdateId(value: number): void {
-		const previousMin = this.lastSeenUpdateIds.min;
-		this.lastSeenUpdateIds.add(value);
-		if (previousMin !== this.lastSeenUpdateIds.min) {
-			this.saveInTheBackground();
-		}
-	}
+    public addSeenUpdateId(value: number): void {
+        const previousMin = this.lastSeenUpdateIds.min;
+        this.lastSeenUpdateIds.add(value);
+        if (previousMin !== this.lastSeenUpdateIds.min) {
+            this.saveInTheBackground();
+        }
+    }
 
-	public setLastSeenUpdateId(value: number): void {
-		this.lastSeenUpdateIds.min = value;
-		this.saveInTheBackground();
-	}
+    public setLastSeenUpdateId(value: number): void {
+        this.lastSeenUpdateIds.min = value;
+        this.saveInTheBackground();
+    }
 
-	public reset(): void {
-		this.documents = [];
-		this.lastSeenUpdateIds = new CoveredValues(
-			0 // the first updateId will be 1 which is the first integer after -1
-		);
-		this.hasInitialSyncCompleted = false;
-		this.saveInTheBackground();
-	}
+    public reset(): void {
+        this.documents = [];
+        this.lastSeenUpdateIds = new CoveredValues(
+            0 // the first updateId will be 1 which is the first integer after -1
+        );
+        this.hasInitialSyncCompleted = false;
+        this.saveInTheBackground();
+    }
 
-	public async save(): Promise<void> {
-		return this.saveData({
-			documents: this.resolvedDocuments.map(
-				({ relativePath, documentId, metadata }) => ({
-					documentId,
-					relativePath,
-					// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-					...metadata! // `resolvedDocuments` only returns docs with metadata set
-				})
-			),
-			lastSeenUpdateId: this.lastSeenUpdateIds.min,
-			hasInitialSyncCompleted: this.hasInitialSyncCompleted
-		});
-	}
+    public async save(): Promise<void> {
+        return this.saveData({
+            documents: this.resolvedDocuments.map(
+                ({ relativePath, documentId, metadata }) => ({
+                    documentId,
+                    relativePath,
+                    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                    ...metadata! // `resolvedDocuments` only returns docs with metadata set
+                })
+            ),
+            lastSeenUpdateId: this.lastSeenUpdateIds.min,
+            hasInitialSyncCompleted: this.hasInitialSyncCompleted
+        });
+    }
 
-	private ensureConsistency(): void {
-		const idToPath = new Map<string, string[]>();
+    private ensureConsistency(): void {
+        const idToPath = new Map<string, string[]>();
 
-		this.resolvedDocuments.forEach(({ relativePath, documentId }) => {
-			idToPath.set(documentId, [
-				...(idToPath.get(documentId) ?? []),
-				relativePath
-			]);
-		});
+        this.resolvedDocuments.forEach(({ relativePath, documentId }) => {
+            idToPath.set(documentId, [
+                ...(idToPath.get(documentId) ?? []),
+                relativePath
+            ]);
+        });
 
-		const duplicates = Array.from(idToPath.entries())
-			.filter(([_, paths]) => paths.length > 1)
-			.map(([id, paths]) => `${id} (${paths.join(", ")})`);
+        const duplicates = Array.from(idToPath.entries())
+            .filter(([_, paths]) => paths.length > 1)
+            .map(([id, paths]) => `${id} (${paths.join(", ")})`);
 
-		if (duplicates.length > 0) {
-			throw new Error(
-				"Document IDs are not unique, found duplicates: " +
-					duplicates.join("; ")
-			);
-		}
-	}
+        if (duplicates.length > 0) {
+            throw new Error(
+                "Document IDs are not unique, found duplicates: " +
+                    duplicates.join("; ")
+            );
+        }
+    }
 
-	private saveInTheBackground(): void {
-		this.ensureConsistency();
-		void this.save().catch((error: unknown) => {
-			this.logger.error(`Error saving data: ${error}`);
-		});
-	}
+    private saveInTheBackground(): void {
+        this.ensureConsistency();
+        void this.save().catch((error: unknown) => {
+            this.logger.error(`Error saving data: ${error}`);
+        });
+    }
 }
diff --git a/frontend/sync-client/src/persistence/persistence.ts b/frontend/sync-client/src/persistence/persistence.ts
index 706ae6ff..d226e611 100644
--- a/frontend/sync-client/src/persistence/persistence.ts
+++ b/frontend/sync-client/src/persistence/persistence.ts
@@ -1,4 +1,4 @@
 export interface PersistenceProvider<T> {
-	load: () => Promise<T | undefined>;
-	save: (data: T) => Promise<void>;
+    load: () => Promise<T | undefined>;
+    save: (data: T) => Promise<void>;
 }
diff --git a/frontend/sync-client/src/services/authentication-error.ts b/frontend/sync-client/src/services/authentication-error.ts
index 9daa1937..6be4af24 100644
--- a/frontend/sync-client/src/services/authentication-error.ts
+++ b/frontend/sync-client/src/services/authentication-error.ts
@@ -1,6 +1,6 @@
 export class AuthenticationError extends Error {
-	public constructor(message: string) {
-		super(message);
-		this.name = "AuthenticationError";
-	}
+    public constructor(message: string) {
+        super(message);
+        this.name = "AuthenticationError";
+    }
 }
diff --git a/frontend/sync-client/src/services/fetch-controller.test.ts b/frontend/sync-client/src/services/fetch-controller.test.ts
index 4ff57c55..94fa8424 100644
--- a/frontend/sync-client/src/services/fetch-controller.test.ts
+++ b/frontend/sync-client/src/services/fetch-controller.test.ts
@@ -7,171 +7,171 @@ import { SyncResetError } from "./sync-reset-error";
 import { sleep } from "../utils/sleep";
 
 describe("FetchController", () => {
-	const createMockFetch = (
-		shouldSleep: boolean
-	): Mock<() => Promise<Response>> =>
-		mock.fn(async () => {
-			if (shouldSleep) {
-				await sleep(30);
-			}
-			return Promise.resolve(new Response("OK", { status: 200 }));
-		});
+    const createMockFetch = (
+        shouldSleep: boolean
+    ): Mock<() => Promise<Response>> =>
+        mock.fn(async () => {
+            if (shouldSleep) {
+                await sleep(30);
+            }
+            return Promise.resolve(new Response("OK", { status: 200 }));
+        });
 
-	beforeEach(() => {
-		mock.timers.enable({ apis: ["setTimeout"] });
-	});
+    beforeEach(() => {
+        mock.timers.enable({ apis: ["setTimeout"] });
+    });
 
-	afterEach(() => {
-		mock.timers.reset();
-	});
+    afterEach(() => {
+        mock.timers.reset();
+    });
 
-	it("should allow fetch when canFetch is true", async () => {
-		const logger = new Logger();
-		const controller = new FetchController(true, logger);
-		const mockFetch = createMockFetch(false);
-		const controlledFetch = controller.getControlledFetchImplementation(
-			logger,
-			mockFetch
-		);
+    it("should allow fetch when canFetch is true", async () => {
+        const logger = new Logger();
+        const controller = new FetchController(true, logger);
+        const mockFetch = createMockFetch(false);
+        const controlledFetch = controller.getControlledFetchImplementation(
+            logger,
+            mockFetch
+        );
 
-		const response = await controlledFetch("http://example.com");
+        const response = await controlledFetch("http://example.com");
 
-		assert.strictEqual(await response.text(), "OK");
-		assert.strictEqual(mockFetch.mock.calls.length, 1);
-	});
+        assert.strictEqual(await response.text(), "OK");
+        assert.strictEqual(mockFetch.mock.calls.length, 1);
+    });
 
-	it("should block fetch until canFetch becomes true", async () => {
-		const logger = new Logger();
-		const controller = new FetchController(false, logger);
-		const mockFetch = createMockFetch(true);
-		const controlledFetch = controller.getControlledFetchImplementation(
-			logger,
-			mockFetch
-		);
+    it("should block fetch until canFetch becomes true", async () => {
+        const logger = new Logger();
+        const controller = new FetchController(false, logger);
+        const mockFetch = createMockFetch(true);
+        const controlledFetch = controller.getControlledFetchImplementation(
+            logger,
+            mockFetch
+        );
 
-		const fetchPromise = controlledFetch("http://example.com");
-		assert.strictEqual(mockFetch.mock.calls.length, 0);
+        const fetchPromise = controlledFetch("http://example.com");
+        assert.strictEqual(mockFetch.mock.calls.length, 0);
 
-		controller.canFetch = true;
-		await Promise.resolve();
-		mock.timers.tick(30);
+        controller.canFetch = true;
+        await Promise.resolve();
+        mock.timers.tick(30);
 
-		const response = await fetchPromise;
-		assert.strictEqual(await response.text(), "OK");
-		assert.strictEqual(mockFetch.mock.calls.length, 1);
-	});
+        const response = await fetchPromise;
+        assert.strictEqual(await response.text(), "OK");
+        assert.strictEqual(mockFetch.mock.calls.length, 1);
+    });
 
-	it("should reject during reset", async () => {
-		const logger = new Logger();
-		const controller = new FetchController(true, logger);
-		const mockFetch = createMockFetch(true);
-		const controlledFetch = controller.getControlledFetchImplementation(
-			logger,
-			mockFetch
-		);
+    it("should reject during reset", async () => {
+        const logger = new Logger();
+        const controller = new FetchController(true, logger);
+        const mockFetch = createMockFetch(true);
+        const controlledFetch = controller.getControlledFetchImplementation(
+            logger,
+            mockFetch
+        );
 
-		const firstRequest = controlledFetch("http://example.com");
-		assert.strictEqual(mockFetch.mock.calls.length, 1);
+        const firstRequest = controlledFetch("http://example.com");
+        assert.strictEqual(mockFetch.mock.calls.length, 1);
 
-		controller.startReset();
+        controller.startReset();
 
-		const secondRequest = controlledFetch("http://example.com");
+        const secondRequest = controlledFetch("http://example.com");
 
-		await assert.rejects(
-			firstRequest,
-			(error: unknown) => error instanceof SyncResetError
-		);
-		await assert.rejects(
-			secondRequest,
-			(error: unknown) => error instanceof SyncResetError
-		);
-		assert.strictEqual(mockFetch.mock.calls.length, 1);
-	});
+        await assert.rejects(
+            firstRequest,
+            (error: unknown) => error instanceof SyncResetError
+        );
+        await assert.rejects(
+            secondRequest,
+            (error: unknown) => error instanceof SyncResetError
+        );
+        assert.strictEqual(mockFetch.mock.calls.length, 1);
+    });
 
-	it("should allow fetch after reset finishes", async () => {
-		const logger = new Logger();
-		const controller = new FetchController(true, logger);
-		const mockFetch = createMockFetch(false);
-		const controlledFetch = controller.getControlledFetchImplementation(
-			logger,
-			mockFetch
-		);
+    it("should allow fetch after reset finishes", async () => {
+        const logger = new Logger();
+        const controller = new FetchController(true, logger);
+        const mockFetch = createMockFetch(false);
+        const controlledFetch = controller.getControlledFetchImplementation(
+            logger,
+            mockFetch
+        );
 
-		controller.startReset();
-		controller.finishReset();
+        controller.startReset();
+        controller.finishReset();
 
-		const response = await controlledFetch("http://example.com");
-		assert.strictEqual(await response.text(), "OK");
-	});
+        const response = await controlledFetch("http://example.com");
+        assert.strictEqual(await response.text(), "OK");
+    });
 
-	it("should defer canFetch changes during reset", async () => {
-		const logger = new Logger();
-		const controller = new FetchController(false, logger);
-		const mockFetch = createMockFetch(true);
-		const controlledFetch = controller.getControlledFetchImplementation(
-			logger,
-			mockFetch
-		);
+    it("should defer canFetch changes during reset", async () => {
+        const logger = new Logger();
+        const controller = new FetchController(false, logger);
+        const mockFetch = createMockFetch(true);
+        const controlledFetch = controller.getControlledFetchImplementation(
+            logger,
+            mockFetch
+        );
 
-		controller.startReset();
-		controller.canFetch = true;
+        controller.startReset();
+        controller.canFetch = true;
 
-		await assert.rejects(
-			async () => controlledFetch("http://example.com"),
-			(error: unknown) => error instanceof SyncResetError
-		);
+        await assert.rejects(
+            async () => controlledFetch("http://example.com"),
+            (error: unknown) => error instanceof SyncResetError
+        );
 
-		controller.finishReset();
+        controller.finishReset();
 
-		const fetchPromise = controlledFetch("http://example.com");
-		mock.timers.tick(30);
+        const fetchPromise = controlledFetch("http://example.com");
+        mock.timers.tick(30);
 
-		const response = await fetchPromise;
-		assert.strictEqual(await response.text(), "OK");
-	});
+        const response = await fetchPromise;
+        assert.strictEqual(await response.text(), "OK");
+    });
 
-	it("should handle different input types", async () => {
-		const logger = new Logger();
-		const controller = new FetchController(true, logger);
-		const mockFetch = createMockFetch(false);
-		const controlledFetch = controller.getControlledFetchImplementation(
-			logger,
-			mockFetch
-		);
+    it("should handle different input types", async () => {
+        const logger = new Logger();
+        const controller = new FetchController(true, logger);
+        const mockFetch = createMockFetch(false);
+        const controlledFetch = controller.getControlledFetchImplementation(
+            logger,
+            mockFetch
+        );
 
-		await controlledFetch("http://example.com");
-		await controlledFetch(new URL("http://example.com"));
-		await controlledFetch(
-			new Request("http://example.com", { method: "POST" })
-		);
+        await controlledFetch("http://example.com");
+        await controlledFetch(new URL("http://example.com"));
+        await controlledFetch(
+            new Request("http://example.com", { method: "POST" })
+        );
 
-		assert.strictEqual(mockFetch.mock.calls.length, 3);
-	});
+        assert.strictEqual(mockFetch.mock.calls.length, 3);
+    });
 
-	it("should handle fetch errors", async () => {
-		const logger = new Logger();
-		const controller = new FetchController(true, logger);
-		const mockFetch = mock.fn(async () => {
-			throw new Error("Network error");
-		});
-		const controlledFetch = controller.getControlledFetchImplementation(
-			logger,
-			mockFetch
-		);
+    it("should handle fetch errors", async () => {
+        const logger = new Logger();
+        const controller = new FetchController(true, logger);
+        const mockFetch = mock.fn(async () => {
+            throw new Error("Network error");
+        });
+        const controlledFetch = controller.getControlledFetchImplementation(
+            logger,
+            mockFetch
+        );
 
-		await assert.rejects(
-			async () => controlledFetch("http://example.com"),
-			(error: unknown) =>
-				error instanceof Error && error.message === "Network error"
-		);
-	});
+        await assert.rejects(
+            async () => controlledFetch("http://example.com"),
+            (error: unknown) =>
+                error instanceof Error && error.message === "Network error"
+        );
+    });
 
-	it("should not create unhandled rejection on reset with no waiting fetches", async () => {
-		const logger = new Logger();
-		const controller = new FetchController(true, logger);
+    it("should not create unhandled rejection on reset with no waiting fetches", async () => {
+        const logger = new Logger();
+        const controller = new FetchController(true, logger);
 
-		controller.startReset();
-		mock.timers.tick(10);
-		controller.finishReset();
-	});
+        controller.startReset();
+        mock.timers.tick(10);
+        controller.finishReset();
+    });
 });
diff --git a/frontend/sync-client/src/services/fetch-controller.ts b/frontend/sync-client/src/services/fetch-controller.ts
index 1e93c853..77b87e3a 100644
--- a/frontend/sync-client/src/services/fetch-controller.ts
+++ b/frontend/sync-client/src/services/fetch-controller.ts
@@ -7,143 +7,143 @@ import { SyncResetError } from "./sync-reset-error";
  * and aborts outstanding requests when a reset is started.
  */
 export class FetchController {
-	private static readonly UNTIL_RESOLUTION = Symbol();
+    private static readonly UNTIL_RESOLUTION = Symbol();
 
-	private isResetting = false;
+    private isResetting = false;
 
-	// Promise resolves on the next state change: sync enabled/disabled or reset started/ended
-	private until: Promise<symbol>;
-	private resolveUntil: (result: symbol) => unknown;
-	private rejectUntil: (reason: unknown) => unknown;
+    // Promise resolves on the next state change: sync enabled/disabled or reset started/ended
+    private until: Promise<symbol>;
+    private resolveUntil: (result: symbol) => unknown;
+    private rejectUntil: (reason: unknown) => unknown;
 
-	public constructor(
-		private _canFetch: boolean,
-		private readonly logger: Logger
-	) {
-		[this.until, this.resolveUntil, this.rejectUntil] =
-			createPromise<symbol>();
-	}
+    public constructor(
+        private _canFetch: boolean,
+        private readonly logger: Logger
+    ) {
+        [this.until, this.resolveUntil, this.rejectUntil] =
+            createPromise<symbol>();
+    }
 
-	/**
-	 * Whether the fetch implementation can immediately send requests once outside of a reset.
-	 */
-	public get canFetch(): boolean {
-		return this._canFetch;
-	}
+    /**
+    * Whether the fetch implementation can immediately send requests once outside of a reset.
+    */
+    public get canFetch(): boolean {
+        return this._canFetch;
+    }
 
-	/**
-	 * Allow or disallow fetching. The changes only take effect if not resetting.
-	 * When called during a reset, its effect is deferred until the reset is finished.
-	 *
-	 * @param canFetch Whether fetching is enabled
-	 */
-	public set canFetch(canFetch: boolean) {
-		this._canFetch = canFetch;
+    /**
+    * Allow or disallow fetching. The changes only take effect if not resetting.
+    * When called during a reset, its effect is deferred until the reset is finished.
+    *
+    * @param canFetch Whether fetching is enabled
+    */
+    public set canFetch(canFetch: boolean) {
+        this._canFetch = canFetch;
 
-		if (!this.isResetting) {
-			const previousResolve = this.resolveUntil;
-			[this.until, this.resolveUntil, this.rejectUntil] =
-				createPromise<symbol>();
-			previousResolve(FetchController.UNTIL_RESOLUTION);
-		}
-	}
+        if (!this.isResetting) {
+            const previousResolve = this.resolveUntil;
+            [this.until, this.resolveUntil, this.rejectUntil] =
+                createPromise<symbol>();
+            previousResolve(FetchController.UNTIL_RESOLUTION);
+        }
+    }
 
-	private static getUrlFromInput(input: RequestInfo | URL): string {
-		if (input instanceof URL) {
-			return input.href;
-		}
-		if (typeof input === "string") {
-			return input;
-		}
-		return input.url;
-	}
+    private static getUrlFromInput(input: RequestInfo | URL): string {
+        if (input instanceof URL) {
+            return input.href;
+        }
+        if (typeof input === "string") {
+            return input;
+        }
+        return input.url;
+    }
 
-	/**
-	 * Starts a reset, causing all ongoing and future fetches to be rejected
-	 * with a SyncResetError until finishReset is called.
-	 */
-	public startReset(): void {
-		this.isResetting = true;
-		this.rejectUntil(new SyncResetError());
-		// Catch unhandled rejection if no fetches are waiting
-		this.until.catch(() => {
-			// Intentionally ignore - this rejection is handled by waiting fetches
-		});
-	}
+    /**
+    * Starts a reset, causing all ongoing and future fetches to be rejected
+    * with a SyncResetError until finishReset is called.
+    */
+    public startReset(): void {
+        this.isResetting = true;
+        this.rejectUntil(new SyncResetError());
+        // Catch unhandled rejection if no fetches are waiting
+        this.until.catch(() => {
+            // Intentionally ignore - this rejection is handled by waiting fetches
+        });
+    }
 
-	/**
-	 * Finishes a reset, allowing fetches to proceed or wait again depending on
-	 * the current sync settings.
-	 */
-	public finishReset(): void {
-		if (!this.isResetting) {
-			return;
-		}
+    /**
+    * Finishes a reset, allowing fetches to proceed or wait again depending on
+    * the current sync settings.
+    */
+    public finishReset(): void {
+        if (!this.isResetting) {
+            return;
+        }
 
-		this.isResetting = false;
-		[this.until, this.resolveUntil, this.rejectUntil] = createPromise();
-	}
+        this.isResetting = false;
+        [this.until, this.resolveUntil, this.rejectUntil] = createPromise();
+    }
 
-	/**
-	 *
-	 * |------------------|---------------|-----------------------------------------------------|
-	 * |                  | Sync enabled  |                 Sync disabled                       |
-	 * |------------------|-------------- |-----------------------------------------------------|
-	 * | During reset     |        Rejects with SyncResetError without sending request          |
-	 * |------------------|-------------- |-----------------------------------------------------|
-	 * | Outside of reset | Same as fetch | Blocks until sync is enabled and then same as fetch |
-	 * |------------------|---------------|-----------------------------------------------------|
-	 *
-	 * @param logger for errors
-	 * @param fetch to wrap
-	 * @returns a wrapped fetch implementation affected by the FetchController state
-	 */
-	public getControlledFetchImplementation(
-		logger: Logger,
-		fetch: typeof globalThis.fetch = globalThis.fetch
-	): typeof globalThis.fetch {
-		return async (
-			input: RequestInfo | URL,
-			init?: RequestInit
-		): Promise<Response> => {
-			while (!this.canFetch || this.isResetting) {
-				await this.until;
-			}
+    /**
+    *
+    * |------------------|---------------|-----------------------------------------------------|
+    * |                  | Sync enabled  |                 Sync disabled                       |
+    * |------------------|-------------- |-----------------------------------------------------|
+    * | During reset     |        Rejects with SyncResetError without sending request          |
+    * |------------------|-------------- |-----------------------------------------------------|
+    * | Outside of reset | Same as fetch | Blocks until sync is enabled and then same as fetch |
+    * |------------------|---------------|-----------------------------------------------------|
+    *
+    * @param logger for errors
+    * @param fetch to wrap
+    * @returns a wrapped fetch implementation affected by the FetchController state
+    */
+    public getControlledFetchImplementation(
+        logger: Logger,
+        fetch: typeof globalThis.fetch = globalThis.fetch
+    ): typeof globalThis.fetch {
+        return async (
+            input: RequestInfo | URL,
+            init?: RequestInit
+        ): Promise<Response> => {
+            while (!this.canFetch || this.isResetting) {
+                await this.until;
+            }
 
-			try {
-				// https://github.com/jonbern/fetch-retry/blob/8684ef4e688375f623bd76f13add76dbc1d67cfb/index.js#L67C1-L70C21
-				const _input =
-					typeof Request !== "undefined" && input instanceof Request
-						? input.clone()
-						: input;
+            try {
+                // https://github.com/jonbern/fetch-retry/blob/8684ef4e688375f623bd76f13add76dbc1d67cfb/index.js#L67C1-L70C21
+                const _input =
+                    typeof Request !== "undefined" && input instanceof Request
+                        ? input.clone()
+                        : input;
 
-				const fetchPromise = fetch(_input, init);
+                const fetchPromise = fetch(_input, init);
 
-				// We only want to catch rejections from `this.until`
-				let result: symbol | Response | undefined = undefined;
-				do {
-					result = await Promise.race([this.until, fetchPromise]);
-				} while (result === FetchController.UNTIL_RESOLUTION);
+                // We only want to catch rejections from `this.until`
+                let result: symbol | Response | undefined = undefined;
+                do {
+                    result = await Promise.race([this.until, fetchPromise]);
+                } while (result === FetchController.UNTIL_RESOLUTION);
 
-				const fetchResult: Response = result as Response; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+                const fetchResult: Response = result as Response; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
 
-				if (!fetchResult.ok) {
-					this.logger.warn(
-						`Fetch for ${FetchController.getUrlFromInput(
-							input
-						)}, got status ${fetchResult.status}`
-					);
-				}
+                if (!fetchResult.ok) {
+                    this.logger.warn(
+                        `Fetch for ${FetchController.getUrlFromInput(
+                            input
+                        )}, got status ${fetchResult.status}`
+                    );
+                }
 
-				return fetchResult;
-			} catch (error) {
-				logger.warn(
-					`Fetch for ${FetchController.getUrlFromInput(
-						input
-					)}, got error: ${error}`
-				);
-				throw error;
-			}
-		};
-	}
+                return fetchResult;
+            } catch (error) {
+                logger.warn(
+                    `Fetch for ${FetchController.getUrlFromInput(
+                        input
+                    )}, got error: ${error}`
+                );
+                throw error;
+            }
+        };
+    }
 }
diff --git a/frontend/sync-client/src/services/server-config.ts b/frontend/sync-client/src/services/server-config.ts
index b3107d10..3d40f182 100644
--- a/frontend/sync-client/src/services/server-config.ts
+++ b/frontend/sync-client/src/services/server-config.ts
@@ -5,83 +5,83 @@ import type { SyncService } from "./sync-service";
 import type { PingResponse } from "./types/PingResponse";
 
 export interface ServerConfigData {
-	mergeableFileExtensions: string[];
-	supportedApiVersion: number;
-	isAuthenticated: boolean;
+    mergeableFileExtensions: string[];
+    supportedApiVersion: number;
+    isAuthenticated: boolean;
 }
 
 export class ServerConfig {
-	private response: Promise<PingResponse> | undefined;
-	private config: ServerConfigData | undefined;
+    private response: Promise<PingResponse> | undefined;
+    private config: ServerConfigData | undefined;
 
-	public constructor(private readonly syncService: SyncService) {}
+    public constructor(private readonly syncService: SyncService) {}
 
-	public async initialize(): Promise<void> {
-		this.response = this.syncService.ping();
-		this.config = await this.response;
+    public async initialize(): Promise<void> {
+        this.response = this.syncService.ping();
+        this.config = await this.response;
 
-		if (this.config.supportedApiVersion !== SUPPORTED_API_VERSION) {
-			const shouldUpgradeClient =
-				this.config.supportedApiVersion > SUPPORTED_API_VERSION;
-			throw new ServerVersionMismatchError(
-				`Unsupported API version: ${this.config.supportedApiVersion}. Consider upgrading the ${
-					shouldUpgradeClient ? "client" : "sync-server"
-				} to ensure compatibility.`
-			);
-		}
+        if (this.config.supportedApiVersion !== SUPPORTED_API_VERSION) {
+            const shouldUpgradeClient =
+                this.config.supportedApiVersion > SUPPORTED_API_VERSION;
+            throw new ServerVersionMismatchError(
+                `Unsupported API version: ${this.config.supportedApiVersion}. Consider upgrading the ${
+                    shouldUpgradeClient ? "client" : "sync-server"
+                } to ensure compatibility.`
+            );
+        }
 
-		if (!this.config.isAuthenticated) {
-			throw new AuthenticationError(
-				"Failed to authenticate with the sync-server."
-			);
-		}
-	}
+        if (!this.config.isAuthenticated) {
+            throw new AuthenticationError(
+                "Failed to authenticate with the sync-server."
+            );
+        }
+    }
 
-	public async checkConnection(forceUpdate = false): Promise<{
-		isSuccessful: boolean;
-		message: string;
-	}> {
-		try {
-			let { response } = this;
-			if (!response && !forceUpdate) {
-				throw new Error("ServerConfig not initialized");
-			} else if (forceUpdate) {
-				response = this.response = this.syncService.ping();
-			}
+    public async checkConnection(forceUpdate = false): Promise<{
+        isSuccessful: boolean;
+        message: string;
+    }> {
+        try {
+            let { response } = this;
+            if (!response && !forceUpdate) {
+                throw new Error("ServerConfig not initialized");
+            } else if (forceUpdate) {
+                response = this.response = this.syncService.ping();
+            }
 
-			// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-			const result: PingResponse = (await response)!; // it must be defined, otherwise we would have thrown above
-			this.config = result;
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            const result: PingResponse = (await response)!; // it must be defined, otherwise we would have thrown above
+            this.config = result;
 
-			if (result.isAuthenticated) {
-				return {
-					isSuccessful: true,
-					message: `Successfully connected to server (version: ${result.serverVersion}) and authenticated`
-				};
-			}
+            if (result.isAuthenticated) {
+                return {
+                    isSuccessful: true,
+                    message: `Successfully connected to server (version: ${result.serverVersion}) and authenticated`
+                };
+            }
 
-			return {
-				isSuccessful: false,
-				message: `Successfully connected to server (version: ${result.serverVersion}) but failed to authenticate`
-			};
-		} catch (e) {
-			return {
-				isSuccessful: false,
-				message: `Failed to connect to server: ${e}`
-			};
-		}
-	}
+            return {
+                isSuccessful: false,
+                message: `Successfully connected to server (version: ${result.serverVersion}) but failed to authenticate`
+            };
+        } catch (e) {
+            return {
+                isSuccessful: false,
+                message: `Failed to connect to server: ${e}`
+            };
+        }
+    }
 
-	public getConfig(): ServerConfigData {
-		if (!this.config) {
-			throw new Error("ServerConfig not initialized");
-		}
+    public getConfig(): ServerConfigData {
+        if (!this.config) {
+            throw new Error("ServerConfig not initialized");
+        }
 
-		return this.config;
-	}
+        return this.config;
+    }
 
-	public reset(): void {
-		this.response = undefined;
-		this.config = undefined;
-	}
+    public reset(): void {
+        this.response = undefined;
+        this.config = undefined;
+    }
 }
diff --git a/frontend/sync-client/src/services/server-version-mismatch-error.ts b/frontend/sync-client/src/services/server-version-mismatch-error.ts
index 0f37fc6f..0b9960ea 100644
--- a/frontend/sync-client/src/services/server-version-mismatch-error.ts
+++ b/frontend/sync-client/src/services/server-version-mismatch-error.ts
@@ -1,6 +1,6 @@
 export class ServerVersionMismatchError extends Error {
-	public constructor(message: string) {
-		super(message);
-		this.name = "ServerVersionMismatchError";
-	}
+    public constructor(message: string) {
+        super(message);
+        this.name = "ServerVersionMismatchError";
+    }
 }
diff --git a/frontend/sync-client/src/services/sync-reset-error.ts b/frontend/sync-client/src/services/sync-reset-error.ts
index 3fd8a86c..7b74e0b9 100644
--- a/frontend/sync-client/src/services/sync-reset-error.ts
+++ b/frontend/sync-client/src/services/sync-reset-error.ts
@@ -1,6 +1,6 @@
 export class SyncResetError extends Error {
-	public constructor() {
-		super("SyncClient has been reset, cleaning up");
-		this.name = "SyncResetError";
-	}
+    public constructor() {
+        super("SyncClient has been reset, cleaning up");
+        this.name = "SyncResetError";
+    }
 }
diff --git a/frontend/sync-client/src/services/sync-service.ts b/frontend/sync-client/src/services/sync-service.ts
index 6850cb2b..8190a638 100644
--- a/frontend/sync-client/src/services/sync-service.ts
+++ b/frontend/sync-client/src/services/sync-service.ts
@@ -1,7 +1,7 @@
 import type {
-	DocumentId,
-	RelativePath,
-	VaultUpdateId
+    DocumentId,
+    RelativePath,
+    VaultUpdateId
 } from "../persistence/database";
 
 import type { Logger } from "../tracing/logger";
@@ -19,416 +19,416 @@ import type { DeleteDocumentVersion } from "./types/DeleteDocumentVersion";
 import type { UpdateTextDocumentVersion } from "./types/UpdateTextDocumentVersion";
 
 export class SyncService {
-	private readonly client: typeof globalThis.fetch;
-	private readonly pingClient: typeof globalThis.fetch;
+    private readonly client: typeof globalThis.fetch;
+    private readonly pingClient: typeof globalThis.fetch;
 
-	public constructor(
-		private readonly deviceId: string,
-		private readonly fetchController: FetchController,
-		private readonly settings: Settings,
-		private readonly logger: Logger,
-		fetchImplementation: typeof globalThis.fetch = globalThis.fetch
-	) {
-		// ensure that if it's called a method, `this` won't be bound to the instance
-		const unboundFetch: typeof globalThis.fetch = async (...args) =>
-			fetchImplementation(...args);
+    public constructor(
+        private readonly deviceId: string,
+        private readonly fetchController: FetchController,
+        private readonly settings: Settings,
+        private readonly logger: Logger,
+        fetchImplementation: typeof globalThis.fetch = globalThis.fetch
+    ) {
+        // ensure that if it's called a method, `this` won't be bound to the instance
+        const unboundFetch: typeof globalThis.fetch = async (...args) =>
+            fetchImplementation(...args);
 
-		this.client = this.fetchController.getControlledFetchImplementation(
-			this.logger,
-			unboundFetch
-		);
-		this.pingClient = unboundFetch;
-	}
+        this.client = this.fetchController.getControlledFetchImplementation(
+            this.logger,
+            unboundFetch
+        );
+        this.pingClient = unboundFetch;
+    }
 
-	private static async errorFromResponse(
-		response: Response
-	): Promise<string> {
-		if (
-			response.headers
-				.get("Content-Type")
-				?.includes("application/json") == true
-		) {
-			const result: SerializedError =
-				(await response.json()) as SerializedError; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
-			return SyncService.formatError(result);
-		}
-		return `HTTP ${response.status}: ${response.statusText}`;
-	}
+    private static async errorFromResponse(
+        response: Response
+    ): Promise<string> {
+        if (
+            response.headers
+                .get("Content-Type")
+                ?.includes("application/json") == true
+        ) {
+            const result: SerializedError =
+                (await response.json()) as SerializedError; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+            return SyncService.formatError(result);
+        }
+        return `HTTP ${response.status}: ${response.statusText}`;
+    }
 
-	private static formatError(error: SerializedError): string {
-		let result = error.message;
-		if (error.causes.length > 0) {
-			const causes = error.causes.join(", ");
-			result += ` caused by: ${causes}`;
-		}
+    private static formatError(error: SerializedError): string {
+        let result = error.message;
+        if (error.causes.length > 0) {
+            const causes = error.causes.join(", ");
+            result += ` caused by: ${causes}`;
+        }
 
-		return result;
-	}
+        return result;
+    }
 
-	public async create({
-		documentId,
-		relativePath,
-		contentBytes
-	}: {
-		documentId?: DocumentId;
-		relativePath: RelativePath;
-		contentBytes: Uint8Array;
-	}): Promise<DocumentVersionWithoutContent> {
-		return this.retryForever(async () => {
-			const formData = new FormData();
-			if (documentId !== undefined) {
-				formData.append("document_id", documentId);
-			}
-			formData.append("relative_path", relativePath);
-			formData.append(
-				"content",
-				new Blob([new Uint8Array(contentBytes)])
-			);
+    public async create({
+        documentId,
+        relativePath,
+        contentBytes
+    }: {
+        documentId?: DocumentId;
+        relativePath: RelativePath;
+        contentBytes: Uint8Array;
+    }): Promise<DocumentVersionWithoutContent> {
+        return this.retryForever(async () => {
+            const formData = new FormData();
+            if (documentId !== undefined) {
+                formData.append("document_id", documentId);
+            }
+            formData.append("relative_path", relativePath);
+            formData.append(
+                "content",
+                new Blob([new Uint8Array(contentBytes)])
+            );
 
-			this.logger.debug(
-				`Creating document with id ${documentId} and relative path ${relativePath}`
-			);
+            this.logger.debug(
+                `Creating document with id ${documentId} and relative path ${relativePath}`
+            );
 
-			const response = await this.client(this.getUrl("/documents"), {
-				method: "POST",
-				body: formData,
-				headers: this.getDefaultHeaders()
-			});
+            const response = await this.client(this.getUrl("/documents"), {
+                method: "POST",
+                body: formData,
+                headers: this.getDefaultHeaders()
+            });
 
-			if (!response.ok) {
-				throw new Error(
-					`Failed to create document: ${await SyncService.errorFromResponse(
-						response
-					)}`
-				);
-			}
+            if (!response.ok) {
+                throw new Error(
+                    `Failed to create document: ${await SyncService.errorFromResponse(
+                        response
+                    )}`
+                );
+            }
 
-			const result: DocumentVersionWithoutContent =
-				(await response.json()) as DocumentVersionWithoutContent; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+            const result: DocumentVersionWithoutContent =
+                (await response.json()) as DocumentVersionWithoutContent; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
 
-			this.logger.debug(`Created document ${JSON.stringify(result)}`);
+            this.logger.debug(`Created document ${JSON.stringify(result)}`);
 
-			return result;
-		});
-	}
+            return result;
+        });
+    }
 
-	public async putText({
-		parentVersionId,
-		documentId,
-		relativePath,
-		content
-	}: {
-		parentVersionId: VaultUpdateId;
-		documentId: DocumentId;
-		relativePath: RelativePath;
-		content: (number | string)[];
-	}): Promise<DocumentUpdateResponse> {
-		return this.retryForever(async () => {
-			this.logger.debug(
-				`Updating text document ${documentId} with parent version ${parentVersionId} and relative path ${relativePath}, content [${content.join(", ")}]`
-			);
+    public async putText({
+        parentVersionId,
+        documentId,
+        relativePath,
+        content
+    }: {
+        parentVersionId: VaultUpdateId;
+        documentId: DocumentId;
+        relativePath: RelativePath;
+        content: (number | string)[];
+    }): Promise<DocumentUpdateResponse> {
+        return this.retryForever(async () => {
+            this.logger.debug(
+                `Updating text document ${documentId} with parent version ${parentVersionId} and relative path ${relativePath}, content [${content.join(", ")}]`
+            );
 
-			const request: UpdateTextDocumentVersion = {
-				parentVersionId,
-				relativePath,
-				content
-			};
+            const request: UpdateTextDocumentVersion = {
+                parentVersionId,
+                relativePath,
+                content
+            };
 
-			const response = await this.client(
-				this.getUrl(`/documents/${documentId}/text`),
-				{
-					method: "PUT",
-					body: JSON.stringify(request),
-					headers: this.getDefaultHeaders({ type: "json" })
-				}
-			);
+            const response = await this.client(
+                this.getUrl(`/documents/${documentId}/text`),
+                {
+                    method: "PUT",
+                    body: JSON.stringify(request),
+                    headers: this.getDefaultHeaders({ type: "json" })
+                }
+            );
 
-			if (!response.ok) {
-				throw new Error(
-					`Failed to update document: ${await SyncService.errorFromResponse(
-						response
-					)}`
-				);
-			}
+            if (!response.ok) {
+                throw new Error(
+                    `Failed to update document: ${await SyncService.errorFromResponse(
+                        response
+                    )}`
+                );
+            }
 
-			const result: DocumentUpdateResponse =
-				(await response.json()) as DocumentUpdateResponse; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+            const result: DocumentUpdateResponse =
+                (await response.json()) as DocumentUpdateResponse; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
 
-			this.logger.debug(
-				`Updated document ${JSON.stringify(result)} with id ${
-					result.documentId
-				}}`
-			);
+            this.logger.debug(
+                `Updated document ${JSON.stringify(result)} with id ${
+                    result.documentId
+                }}`
+            );
 
-			return result;
-		});
-	}
+            return result;
+        });
+    }
 
-	public async putBinary({
-		parentVersionId,
-		documentId,
-		relativePath,
-		contentBytes
-	}: {
-		parentVersionId: VaultUpdateId;
-		documentId: DocumentId;
-		relativePath: RelativePath;
-		contentBytes: Uint8Array;
-	}): Promise<DocumentUpdateResponse> {
-		return this.retryForever(async () => {
-			this.logger.debug(
-				`Updating binary document ${documentId} with parent version ${parentVersionId} and relative path ${relativePath}`
-			);
-			const formData = new FormData();
-			formData.append("parent_version_id", parentVersionId.toString());
-			formData.append("relative_path", relativePath);
-			formData.append(
-				"content",
-				new Blob([new Uint8Array(contentBytes)])
-			);
+    public async putBinary({
+        parentVersionId,
+        documentId,
+        relativePath,
+        contentBytes
+    }: {
+        parentVersionId: VaultUpdateId;
+        documentId: DocumentId;
+        relativePath: RelativePath;
+        contentBytes: Uint8Array;
+    }): Promise<DocumentUpdateResponse> {
+        return this.retryForever(async () => {
+            this.logger.debug(
+                `Updating binary document ${documentId} with parent version ${parentVersionId} and relative path ${relativePath}`
+            );
+            const formData = new FormData();
+            formData.append("parent_version_id", parentVersionId.toString());
+            formData.append("relative_path", relativePath);
+            formData.append(
+                "content",
+                new Blob([new Uint8Array(contentBytes)])
+            );
 
-			const response = await this.client(
-				this.getUrl(`/documents/${documentId}/binary`),
-				{
-					method: "PUT",
-					body: formData,
-					headers: this.getDefaultHeaders()
-				}
-			);
+            const response = await this.client(
+                this.getUrl(`/documents/${documentId}/binary`),
+                {
+                    method: "PUT",
+                    body: formData,
+                    headers: this.getDefaultHeaders()
+                }
+            );
 
-			if (!response.ok) {
-				throw new Error(
-					`Failed to update document: ${await SyncService.errorFromResponse(
-						response
-					)}`
-				);
-			}
+            if (!response.ok) {
+                throw new Error(
+                    `Failed to update document: ${await SyncService.errorFromResponse(
+                        response
+                    )}`
+                );
+            }
 
-			const result: DocumentUpdateResponse =
-				(await response.json()) as DocumentUpdateResponse; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+            const result: DocumentUpdateResponse =
+                (await response.json()) as DocumentUpdateResponse; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
 
-			this.logger.debug(
-				`Updated document ${JSON.stringify(result)} with id ${
-					result.documentId
-				}}`
-			);
+            this.logger.debug(
+                `Updated document ${JSON.stringify(result)} with id ${
+                    result.documentId
+                }}`
+            );
 
-			return result;
-		});
-	}
+            return result;
+        });
+    }
 
-	public async delete({
-		documentId,
-		relativePath
-	}: {
-		documentId: DocumentId;
-		relativePath: RelativePath;
-	}): Promise<DocumentVersionWithoutContent> {
-		return this.retryForever(async () => {
-			const request: DeleteDocumentVersion = {
-				relativePath
-			};
+    public async delete({
+        documentId,
+        relativePath
+    }: {
+        documentId: DocumentId;
+        relativePath: RelativePath;
+    }): Promise<DocumentVersionWithoutContent> {
+        return this.retryForever(async () => {
+            const request: DeleteDocumentVersion = {
+                relativePath
+            };
 
-			this.logger.debug(
-				`Delete document with id ${documentId} and relative path ${relativePath}`
-			);
+            this.logger.debug(
+                `Delete document with id ${documentId} and relative path ${relativePath}`
+            );
 
-			const response = await this.client(
-				this.getUrl(`/documents/${documentId}`),
-				{
-					method: "DELETE",
-					body: JSON.stringify(request),
-					headers: this.getDefaultHeaders({ type: "json" })
-				}
-			);
+            const response = await this.client(
+                this.getUrl(`/documents/${documentId}`),
+                {
+                    method: "DELETE",
+                    body: JSON.stringify(request),
+                    headers: this.getDefaultHeaders({ type: "json" })
+                }
+            );
 
-			if (!response.ok) {
-				throw new Error(
-					`Failed to delete document: ${await SyncService.errorFromResponse(
-						response
-					)}`
-				);
-			}
+            if (!response.ok) {
+                throw new Error(
+                    `Failed to delete document: ${await SyncService.errorFromResponse(
+                        response
+                    )}`
+                );
+            }
 
-			const result: DocumentVersionWithoutContent =
-				(await response.json()) as DocumentVersionWithoutContent; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+            const result: DocumentVersionWithoutContent =
+                (await response.json()) as DocumentVersionWithoutContent; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
 
-			this.logger.debug(
-				`Deleted document ${relativePath} with id ${documentId}`
-			);
+            this.logger.debug(
+                `Deleted document ${relativePath} with id ${documentId}`
+            );
 
-			return result;
-		});
-	}
+            return result;
+        });
+    }
 
-	public async get({
-		documentId
-	}: {
-		documentId: DocumentId;
-	}): Promise<DocumentVersion> {
-		return this.retryForever(async () => {
-			this.logger.debug(`Getting document with id ${documentId}`);
+    public async get({
+        documentId
+    }: {
+        documentId: DocumentId;
+    }): Promise<DocumentVersion> {
+        return this.retryForever(async () => {
+            this.logger.debug(`Getting document with id ${documentId}`);
 
-			const response = await this.client(
-				this.getUrl(`/documents/${documentId}`),
-				{
-					headers: this.getDefaultHeaders()
-				}
-			);
+            const response = await this.client(
+                this.getUrl(`/documents/${documentId}`),
+                {
+                    headers: this.getDefaultHeaders()
+                }
+            );
 
-			if (!response.ok) {
-				throw new Error(
-					`Failed to get document: ${await SyncService.errorFromResponse(
-						response
-					)}`
-				);
-			}
+            if (!response.ok) {
+                throw new Error(
+                    `Failed to get document: ${await SyncService.errorFromResponse(
+                        response
+                    )}`
+                );
+            }
 
-			const result: DocumentVersion =
-				(await response.json()) as DocumentVersion; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+            const result: DocumentVersion =
+                (await response.json()) as DocumentVersion; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
 
-			this.logger.debug(`Got document ${JSON.stringify(result)}`);
+            this.logger.debug(`Got document ${JSON.stringify(result)}`);
 
-			return result;
-		});
-	}
+            return result;
+        });
+    }
 
-	public async getDocumentVersionContent({
-		documentId,
-		vaultUpdateId
-	}: {
-		documentId: DocumentId;
-		vaultUpdateId: VaultUpdateId;
-	}): Promise<Uint8Array> {
-		return this.retryForever(async () => {
-			this.logger.debug(
-				`Getting document with id ${documentId} and version ${vaultUpdateId}`
-			);
+    public async getDocumentVersionContent({
+        documentId,
+        vaultUpdateId
+    }: {
+        documentId: DocumentId;
+        vaultUpdateId: VaultUpdateId;
+    }): Promise<Uint8Array> {
+        return this.retryForever(async () => {
+            this.logger.debug(
+                `Getting document with id ${documentId} and version ${vaultUpdateId}`
+            );
 
-			const response = await this.client(
-				this.getUrl(
-					`/documents/${documentId}/versions/${vaultUpdateId}/content`
-				),
-				{
-					headers: this.getDefaultHeaders()
-				}
-			);
+            const response = await this.client(
+                this.getUrl(
+                    `/documents/${documentId}/versions/${vaultUpdateId}/content`
+                ),
+                {
+                    headers: this.getDefaultHeaders()
+                }
+            );
 
-			if (!response.ok) {
-				throw new Error(
-					`Failed to get document: ${await SyncService.errorFromResponse(
-						response
-					)}`
-				);
-			}
+            if (!response.ok) {
+                throw new Error(
+                    `Failed to get document: ${await SyncService.errorFromResponse(
+                        response
+                    )}`
+                );
+            }
 
-			const result = await response.bytes();
-			this.logger.debug(
-				`Got document version content for document ${documentId} version ${vaultUpdateId}`
-			);
-			return result;
-		});
-	}
+            const result = await response.bytes();
+            this.logger.debug(
+                `Got document version content for document ${documentId} version ${vaultUpdateId}`
+            );
+            return result;
+        });
+    }
 
-	public async getAll(
-		since?: VaultUpdateId
-	): Promise<FetchLatestDocumentsResponse> {
-		return this.retryForever(async () => {
-			this.logger.debug(
-				"Getting all documents" +
-					(since != null ? ` since ${since}` : "")
-			);
+    public async getAll(
+        since?: VaultUpdateId
+    ): Promise<FetchLatestDocumentsResponse> {
+        return this.retryForever(async () => {
+            this.logger.debug(
+                "Getting all documents" +
+                    (since != null ? ` since ${since}` : "")
+            );
 
-			const url = new URL(this.getUrl("/documents"));
-			if (since !== undefined) {
-				url.searchParams.append("since", since.toString());
-			}
-			const response = await this.client(url.toString(), {
-				headers: this.getDefaultHeaders()
-			});
+            const url = new URL(this.getUrl("/documents"));
+            if (since !== undefined) {
+                url.searchParams.append("since", since.toString());
+            }
+            const response = await this.client(url.toString(), {
+                headers: this.getDefaultHeaders()
+            });
 
-			if (!response.ok) {
-				throw new Error(
-					`Failed to get documents: ${await SyncService.errorFromResponse(
-						response
-					)}`
-				);
-			}
+            if (!response.ok) {
+                throw new Error(
+                    `Failed to get documents: ${await SyncService.errorFromResponse(
+                        response
+                    )}`
+                );
+            }
 
-			const result: FetchLatestDocumentsResponse =
-				(await response.json()) as FetchLatestDocumentsResponse; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+            const result: FetchLatestDocumentsResponse =
+                (await response.json()) as FetchLatestDocumentsResponse; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
 
-			this.logger.debug(
-				`Got ${result.latestDocuments.length} document metadata`
-			);
+            this.logger.debug(
+                `Got ${result.latestDocuments.length} document metadata`
+            );
 
-			return result;
-		});
-	}
+            return result;
+        });
+    }
 
-	public async ping(): Promise<PingResponse> {
-		this.logger.debug("Pinging server");
-		const response = await this.pingClient(this.getUrl("/ping"), {
-			headers: this.getDefaultHeaders()
-		});
+    public async ping(): Promise<PingResponse> {
+        this.logger.debug("Pinging server");
+        const response = await this.pingClient(this.getUrl("/ping"), {
+            headers: this.getDefaultHeaders()
+        });
 
-		if (!response.ok) {
-			throw new Error(
-				`Failed to ping server: ${await SyncService.errorFromResponse(
-					response
-				)}`
-			);
-		}
+        if (!response.ok) {
+            throw new Error(
+                `Failed to ping server: ${await SyncService.errorFromResponse(
+                    response
+                )}`
+            );
+        }
 
-		const result: PingResponse = (await response.json()) as PingResponse; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+        const result: PingResponse = (await response.json()) as PingResponse; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
 
-		this.logger.debug(
-			`Pinged server, got response: ${JSON.stringify(result)}`
-		);
+        this.logger.debug(
+            `Pinged server, got response: ${JSON.stringify(result)}`
+        );
 
-		return result;
-	}
+        return result;
+    }
 
-	private getUrl(path: string): string {
-		const { vaultName, remoteUri } = this.settings.getSettings();
-		const remoteUriWithoutTrailingSlash = remoteUri.replace(/\/+$/, "");
-		const encodedVaultName = encodeURIComponent(vaultName.trim());
-		return `${remoteUriWithoutTrailingSlash}/vaults/${encodedVaultName}${path}`;
-	}
+    private getUrl(path: string): string {
+        const { vaultName, remoteUri } = this.settings.getSettings();
+        const remoteUriWithoutTrailingSlash = remoteUri.replace(/\/+$/, "");
+        const encodedVaultName = encodeURIComponent(vaultName.trim());
+        return `${remoteUriWithoutTrailingSlash}/vaults/${encodedVaultName}${path}`;
+    }
 
-	private getDefaultHeaders(
-		{ type }: { type?: "json" } = { type: undefined }
-	): Record<string, string> {
-		const headers: Record<string, string> = {
-			"device-id": this.deviceId,
-			authorization: `Bearer ${this.settings.getSettings().token}`
-		};
+    private getDefaultHeaders(
+        { type }: { type?: "json" } = { type: undefined }
+    ): Record<string, string> {
+        const headers: Record<string, string> = {
+            "device-id": this.deviceId,
+            authorization: `Bearer ${this.settings.getSettings().token}`
+        };
 
-		if (type === "json") {
-			headers["Content-Type"] = "application/json";
-		}
+        if (type === "json") {
+            headers["Content-Type"] = "application/json";
+        }
 
-		return headers;
-	}
+        return headers;
+    }
 
-	private async retryForever<T>(fn: () => Promise<T>): Promise<T> {
-		// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-		while (true) {
-			try {
-				return await fn();
-			} catch (e) {
-				// We must not retry errors coming from reset
-				if (e instanceof SyncResetError) {
-					throw e;
-				}
+    private async retryForever<T>(fn: () => Promise<T>): Promise<T> {
+        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+        while (true) {
+            try {
+                return await fn();
+            } catch (e) {
+                // We must not retry errors coming from reset
+                if (e instanceof SyncResetError) {
+                    throw e;
+                }
 
-				const retryInterval =
-					this.settings.getSettings().networkRetryIntervalMs;
-				this.logger.error(
-					`Failed network call (${e}), retrying in ${retryInterval}ms`
-				);
-				await sleep(retryInterval);
-			}
-		}
-	}
+                const retryInterval =
+                    this.settings.getSettings().networkRetryIntervalMs;
+                this.logger.error(
+                    `Failed network call (${e}), retrying in ${retryInterval}ms`
+                );
+                await sleep(retryInterval);
+            }
+        }
+    }
 }
diff --git a/frontend/sync-client/src/services/types/ClientCursors.ts b/frontend/sync-client/src/services/types/ClientCursors.ts
index 8222bfb0..e8c9b93d 100644
--- a/frontend/sync-client/src/services/types/ClientCursors.ts
+++ b/frontend/sync-client/src/services/types/ClientCursors.ts
@@ -2,7 +2,7 @@
 import type { DocumentWithCursors } from "./DocumentWithCursors";
 
 export interface ClientCursors {
-	userName: string;
-	deviceId: string;
-	documentsWithCursors: DocumentWithCursors[];
+    userName: string;
+    deviceId: string;
+    documentsWithCursors: DocumentWithCursors[];
 }
diff --git a/frontend/sync-client/src/services/types/CreateDocumentVersion.ts b/frontend/sync-client/src/services/types/CreateDocumentVersion.ts
index d4bd376b..ed921f18 100644
--- a/frontend/sync-client/src/services/types/CreateDocumentVersion.ts
+++ b/frontend/sync-client/src/services/types/CreateDocumentVersion.ts
@@ -1,13 +1,13 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
 export interface CreateDocumentVersion {
-	/**
-	 * The client can decide the document id (if it wishes to) in order
-	 * to help with syncing. If the client does not provide a document id,
-	 * the server will generate one. If the client provides a document id
-	 * it must not already exist in the database.
-	 */
-	document_id: string | null;
-	relative_path: string;
-	content: number[];
+    /**
+    * The client can decide the document id (if it wishes to) in order
+    * to help with syncing. If the client does not provide a document id,
+    * the server will generate one. If the client provides a document id
+    * it must not already exist in the database.
+    */
+    document_id: string | null;
+    relative_path: string;
+    content: number[];
 }
diff --git a/frontend/sync-client/src/services/types/CursorPositionFromClient.ts b/frontend/sync-client/src/services/types/CursorPositionFromClient.ts
index ca940e3e..ee937f4e 100644
--- a/frontend/sync-client/src/services/types/CursorPositionFromClient.ts
+++ b/frontend/sync-client/src/services/types/CursorPositionFromClient.ts
@@ -2,5 +2,5 @@
 import type { DocumentWithCursors } from "./DocumentWithCursors";
 
 export interface CursorPositionFromClient {
-	documentsWithCursors: DocumentWithCursors[];
+    documentsWithCursors: DocumentWithCursors[];
 }
diff --git a/frontend/sync-client/src/services/types/CursorPositionFromServer.ts b/frontend/sync-client/src/services/types/CursorPositionFromServer.ts
index 2556b748..52a24f27 100644
--- a/frontend/sync-client/src/services/types/CursorPositionFromServer.ts
+++ b/frontend/sync-client/src/services/types/CursorPositionFromServer.ts
@@ -2,5 +2,5 @@
 import type { ClientCursors } from "./ClientCursors";
 
 export interface CursorPositionFromServer {
-	clients: ClientCursors[];
+    clients: ClientCursors[];
 }
diff --git a/frontend/sync-client/src/services/types/CursorSpan.ts b/frontend/sync-client/src/services/types/CursorSpan.ts
index 5bc2542e..2cc2b7fc 100644
--- a/frontend/sync-client/src/services/types/CursorSpan.ts
+++ b/frontend/sync-client/src/services/types/CursorSpan.ts
@@ -1,6 +1,6 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
 export interface CursorSpan {
-	start: number;
-	end: number;
+    start: number;
+    end: number;
 }
diff --git a/frontend/sync-client/src/services/types/DeleteDocumentVersion.ts b/frontend/sync-client/src/services/types/DeleteDocumentVersion.ts
index 9edb09ed..99ecc9e7 100644
--- a/frontend/sync-client/src/services/types/DeleteDocumentVersion.ts
+++ b/frontend/sync-client/src/services/types/DeleteDocumentVersion.ts
@@ -1,5 +1,5 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
 export interface DeleteDocumentVersion {
-	relativePath: string;
+    relativePath: string;
 }
diff --git a/frontend/sync-client/src/services/types/DocumentUpdateResponse.ts b/frontend/sync-client/src/services/types/DocumentUpdateResponse.ts
index f0ed7abf..7fd06c7a 100644
--- a/frontend/sync-client/src/services/types/DocumentUpdateResponse.ts
+++ b/frontend/sync-client/src/services/types/DocumentUpdateResponse.ts
@@ -6,5 +6,5 @@ import type { DocumentVersionWithoutContent } from "./DocumentVersionWithoutCont
  * Response to an update document request.
  */
 export type DocumentUpdateResponse =
-	| ({ type: "FastForwardUpdate" } & DocumentVersionWithoutContent)
-	| ({ type: "MergingUpdate" } & DocumentVersion);
+    | ({ type: "FastForwardUpdate" } & DocumentVersionWithoutContent)
+    | ({ type: "MergingUpdate" } & DocumentVersion);
diff --git a/frontend/sync-client/src/services/types/DocumentVersion.ts b/frontend/sync-client/src/services/types/DocumentVersion.ts
index 2076d296..3b9aa37b 100644
--- a/frontend/sync-client/src/services/types/DocumentVersion.ts
+++ b/frontend/sync-client/src/services/types/DocumentVersion.ts
@@ -1,12 +1,12 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
 export interface DocumentVersion {
-	vaultUpdateId: number;
-	documentId: string;
-	relativePath: string;
-	updatedDate: string;
-	contentBase64: string;
-	isDeleted: boolean;
-	userId: string;
-	deviceId: string;
+    vaultUpdateId: number;
+    documentId: string;
+    relativePath: string;
+    updatedDate: string;
+    contentBase64: string;
+    isDeleted: boolean;
+    userId: string;
+    deviceId: string;
 }
diff --git a/frontend/sync-client/src/services/types/DocumentVersionWithoutContent.ts b/frontend/sync-client/src/services/types/DocumentVersionWithoutContent.ts
index cb23f6a5..4b24e7c5 100644
--- a/frontend/sync-client/src/services/types/DocumentVersionWithoutContent.ts
+++ b/frontend/sync-client/src/services/types/DocumentVersionWithoutContent.ts
@@ -1,12 +1,12 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
 export interface DocumentVersionWithoutContent {
-	vaultUpdateId: number;
-	documentId: string;
-	relativePath: string;
-	updatedDate: string;
-	isDeleted: boolean;
-	userId: string;
-	deviceId: string;
-	contentSize: number;
+    vaultUpdateId: number;
+    documentId: string;
+    relativePath: string;
+    updatedDate: string;
+    isDeleted: boolean;
+    userId: string;
+    deviceId: string;
+    contentSize: number;
 }
diff --git a/frontend/sync-client/src/services/types/DocumentWithCursors.ts b/frontend/sync-client/src/services/types/DocumentWithCursors.ts
index dae654c7..dcfe6e2d 100644
--- a/frontend/sync-client/src/services/types/DocumentWithCursors.ts
+++ b/frontend/sync-client/src/services/types/DocumentWithCursors.ts
@@ -2,8 +2,8 @@
 import type { CursorSpan } from "./CursorSpan";
 
 export interface DocumentWithCursors {
-	vault_update_id: number | null;
-	document_id: string;
-	relative_path: string;
-	cursors: CursorSpan[];
+    vault_update_id: number | null;
+    document_id: string;
+    relative_path: string;
+    cursors: CursorSpan[];
 }
diff --git a/frontend/sync-client/src/services/types/FetchLatestDocumentsResponse.ts b/frontend/sync-client/src/services/types/FetchLatestDocumentsResponse.ts
index 67c19b2d..160c9279 100644
--- a/frontend/sync-client/src/services/types/FetchLatestDocumentsResponse.ts
+++ b/frontend/sync-client/src/services/types/FetchLatestDocumentsResponse.ts
@@ -5,9 +5,9 @@ import type { DocumentVersionWithoutContent } from "./DocumentVersionWithoutCont
  * Response to a fetch latest documents request.
  */
 export interface FetchLatestDocumentsResponse {
-	latestDocuments: DocumentVersionWithoutContent[];
-	/**
-	 * The update ID of the latest document in the response.
-	 */
-	lastUpdateId: bigint;
+    latestDocuments: DocumentVersionWithoutContent[];
+    /**
+    * The update ID of the latest document in the response.
+    */
+    lastUpdateId: bigint;
 }
diff --git a/frontend/sync-client/src/services/types/PingResponse.ts b/frontend/sync-client/src/services/types/PingResponse.ts
index cc7370e7..6db66354 100644
--- a/frontend/sync-client/src/services/types/PingResponse.ts
+++ b/frontend/sync-client/src/services/types/PingResponse.ts
@@ -4,22 +4,22 @@
  * Response to a ping request.
  */
 export interface PingResponse {
-	/**
-	 * Semantic version of the server.
-	 */
-	serverVersion: string;
-	/**
-	 * Whether the client is authenticated based on the sent Authorization
-	 * header.
-	 */
-	isAuthenticated: boolean;
-	/**
-	 * List of file extensions that are allowed to be merged.
-	 */
-	mergeableFileExtensions: string[];
-	/**
-	 * API version ensuring backwards & forwards compatibility between the client
-	 * and server.
-	 */
-	supportedApiVersion: number;
+    /**
+    * Semantic version of the server.
+    */
+    serverVersion: string;
+    /**
+    * Whether the client is authenticated based on the sent Authorization
+    * header.
+    */
+    isAuthenticated: boolean;
+    /**
+    * List of file extensions that are allowed to be merged.
+    */
+    mergeableFileExtensions: string[];
+    /**
+    * API version ensuring backwards & forwards compatibility between the client
+    * and server.
+    */
+    supportedApiVersion: number;
 }
diff --git a/frontend/sync-client/src/services/types/SerializedError.ts b/frontend/sync-client/src/services/types/SerializedError.ts
index c0979c5a..ec1c4503 100644
--- a/frontend/sync-client/src/services/types/SerializedError.ts
+++ b/frontend/sync-client/src/services/types/SerializedError.ts
@@ -1,7 +1,7 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
 export interface SerializedError {
-	errorType: string;
-	message: string;
-	causes: string[];
+    errorType: string;
+    message: string;
+    causes: string[];
 }
diff --git a/frontend/sync-client/src/services/types/UpdateDocumentVersion.ts b/frontend/sync-client/src/services/types/UpdateDocumentVersion.ts
index bc3d54e5..4e57a297 100644
--- a/frontend/sync-client/src/services/types/UpdateDocumentVersion.ts
+++ b/frontend/sync-client/src/services/types/UpdateDocumentVersion.ts
@@ -1,7 +1,7 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
 export interface UpdateDocumentVersion {
-	parent_version_id: bigint;
-	relative_path: string;
-	content: number[];
+    parent_version_id: bigint;
+    relative_path: string;
+    content: number[];
 }
diff --git a/frontend/sync-client/src/services/types/UpdateTextDocumentVersion.ts b/frontend/sync-client/src/services/types/UpdateTextDocumentVersion.ts
index b3a5499b..46f36bd0 100644
--- a/frontend/sync-client/src/services/types/UpdateTextDocumentVersion.ts
+++ b/frontend/sync-client/src/services/types/UpdateTextDocumentVersion.ts
@@ -1,7 +1,7 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
 export interface UpdateTextDocumentVersion {
-	parentVersionId: number;
-	relativePath: string;
-	content: (number | string)[];
+    parentVersionId: number;
+    relativePath: string;
+    content: (number | string)[];
 }
diff --git a/frontend/sync-client/src/services/types/WebSocketClientMessage.ts b/frontend/sync-client/src/services/types/WebSocketClientMessage.ts
index e7de2cf3..9608f3af 100644
--- a/frontend/sync-client/src/services/types/WebSocketClientMessage.ts
+++ b/frontend/sync-client/src/services/types/WebSocketClientMessage.ts
@@ -3,5 +3,5 @@ import type { CursorPositionFromClient } from "./CursorPositionFromClient";
 import type { WebSocketHandshake } from "./WebSocketHandshake";
 
 export type WebSocketClientMessage =
-	| ({ type: "handshake" } & WebSocketHandshake)
-	| ({ type: "cursorPositions" } & CursorPositionFromClient);
+    | ({ type: "handshake" } & WebSocketHandshake)
+    | ({ type: "cursorPositions" } & CursorPositionFromClient);
diff --git a/frontend/sync-client/src/services/types/WebSocketHandshake.ts b/frontend/sync-client/src/services/types/WebSocketHandshake.ts
index 068b3505..a2910f49 100644
--- a/frontend/sync-client/src/services/types/WebSocketHandshake.ts
+++ b/frontend/sync-client/src/services/types/WebSocketHandshake.ts
@@ -1,7 +1,7 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
 export interface WebSocketHandshake {
-	token: string;
-	deviceId: string;
-	lastSeenVaultUpdateId: number | null;
+    token: string;
+    deviceId: string;
+    lastSeenVaultUpdateId: number | null;
 }
diff --git a/frontend/sync-client/src/services/types/WebSocketServerMessage.ts b/frontend/sync-client/src/services/types/WebSocketServerMessage.ts
index 8ebf8911..fd250b7b 100644
--- a/frontend/sync-client/src/services/types/WebSocketServerMessage.ts
+++ b/frontend/sync-client/src/services/types/WebSocketServerMessage.ts
@@ -3,5 +3,5 @@ import type { CursorPositionFromServer } from "./CursorPositionFromServer";
 import type { WebSocketVaultUpdate } from "./WebSocketVaultUpdate";
 
 export type WebSocketServerMessage =
-	| ({ type: "vaultUpdate" } & WebSocketVaultUpdate)
-	| ({ type: "cursorPositions" } & CursorPositionFromServer);
+    | ({ type: "vaultUpdate" } & WebSocketVaultUpdate)
+    | ({ type: "cursorPositions" } & CursorPositionFromServer);
diff --git a/frontend/sync-client/src/services/types/WebSocketVaultUpdate.ts b/frontend/sync-client/src/services/types/WebSocketVaultUpdate.ts
index ad50c25d..f1ea0f80 100644
--- a/frontend/sync-client/src/services/types/WebSocketVaultUpdate.ts
+++ b/frontend/sync-client/src/services/types/WebSocketVaultUpdate.ts
@@ -2,6 +2,6 @@
 import type { DocumentVersionWithoutContent } from "./DocumentVersionWithoutContent";
 
 export interface WebSocketVaultUpdate {
-	documents: DocumentVersionWithoutContent[];
-	isInitialSync: boolean;
+    documents: DocumentVersionWithoutContent[];
+    isInitialSync: boolean;
 }
diff --git a/frontend/sync-client/src/services/websocket-manager.test.ts b/frontend/sync-client/src/services/websocket-manager.test.ts
index 8dd8180a..fef901e7 100644
--- a/frontend/sync-client/src/services/websocket-manager.test.ts
+++ b/frontend/sync-client/src/services/websocket-manager.test.ts
@@ -8,291 +8,291 @@ import type { Settings } from "../persistence/settings";
 const WebSocket = require("ws") as typeof globalThis.WebSocket;
 
 class MockCloseEvent extends Event {
-	public code: number;
-	public reason: string;
+    public code: number;
+    public reason: string;
 
-	public constructor(
-		type: string,
-		options: { code: number; reason: string }
-	) {
-		super(type);
-		this.code = options.code;
-		this.reason = options.reason;
-	}
+    public constructor(
+        type: string,
+        options: { code: number; reason: string }
+    ) {
+        super(type);
+        this.code = options.code;
+        this.reason = options.reason;
+    }
 }
 
 class MockMessageEvent extends Event {
-	public data: string;
+    public data: string;
 
-	public constructor(type: string, options: { data: string }) {
-		super(type);
-		this.data = options.data;
-	}
+    public constructor(type: string, options: { data: string }) {
+        super(type);
+        this.data = options.data;
+    }
 }
 
 class MockWebSocket {
-	public readyState: number = WebSocket.CONNECTING;
-	public onopen: ((event: Event) => void) | null = null;
-	public onclose: ((event: MockCloseEvent) => void) | null = null;
-	public onmessage: ((event: MockMessageEvent) => void) | null = null;
-	public onerror: ((event: Event) => void) | null = null;
+    public readyState: number = WebSocket.CONNECTING;
+    public onopen: ((event: Event) => void) | null = null;
+    public onclose: ((event: MockCloseEvent) => void) | null = null;
+    public onmessage: ((event: MockMessageEvent) => void) | null = null;
+    public onerror: ((event: Event) => void) | null = null;
 
-	public sentMessages: string[] = [];
+    public sentMessages: string[] = [];
 
-	public constructor(public url: string) {
-		setTimeout(() => {
-			if (this.readyState === WebSocket.CONNECTING) {
-				this.readyState = WebSocket.OPEN;
-				this.onopen?.(new Event("open"));
-			}
-		}, 0);
-	}
+    public constructor(public url: string) {
+        setTimeout(() => {
+            if (this.readyState === WebSocket.CONNECTING) {
+                this.readyState = WebSocket.OPEN;
+                this.onopen?.(new Event("open"));
+            }
+        }, 0);
+    }
 
-	public send(data: string): void {
-		if (this.readyState !== WebSocket.OPEN) {
-			throw new Error("WebSocket is not open");
-		}
-		this.sentMessages.push(data);
-	}
+    public send(data: string): void {
+        if (this.readyState !== WebSocket.OPEN) {
+            throw new Error("WebSocket is not open");
+        }
+        this.sentMessages.push(data);
+    }
 
-	public close(code?: number, reason?: string): void {
-		this.readyState = WebSocket.CLOSED;
-		this.onclose?.(
-			new MockCloseEvent("close", {
-				code: code ?? 1000,
-				reason: reason ?? ""
-			})
-		);
-	}
+    public close(code?: number, reason?: string): void {
+        this.readyState = WebSocket.CLOSED;
+        this.onclose?.(
+            new MockCloseEvent("close", {
+                code: code ?? 1000,
+                reason: reason ?? ""
+            })
+        );
+    }
 
-	public simulateMessage(data: unknown): void {
-		this.onmessage?.(
-			new MockMessageEvent("message", { data: JSON.stringify(data) })
-		);
-	}
+    public simulateMessage(data: unknown): void {
+        this.onmessage?.(
+            new MockMessageEvent("message", { data: JSON.stringify(data) })
+        );
+    }
 }
 
 type MockFn<T extends (...args: unknown[]) => unknown> = T & {
-	calls: Parameters<T>[];
+    calls: Parameters<T>[];
 };
 
 function createMockFn<T extends (...args: unknown[]) => unknown>(
-	implementation?: T
+    implementation?: T
 ): MockFn<T> {
-	const calls: Parameters<T>[] = [];
-	const mockFn = ((...args: Parameters<T>) => {
-		calls.push(args);
-		return implementation?.(...args);
-	}) as unknown as MockFn<T>;
-	mockFn.calls = calls;
-	return mockFn;
+    const calls: Parameters<T>[] = [];
+    const mockFn = ((...args: Parameters<T>) => {
+        calls.push(args);
+        return implementation?.(...args);
+    }) as unknown as MockFn<T>;
+    mockFn.calls = calls;
+    return mockFn;
 }
 
 describe("WebSocketManager", () => {
-	let mockLogger: Logger = undefined as unknown as Logger;
-	let mockSettings: Settings = undefined as unknown as Settings;
-	let deviceId = "test-device-123";
+    let mockLogger: Logger = undefined as unknown as Logger;
+    let mockSettings: Settings = undefined as unknown as Settings;
+    let deviceId = "test-device-123";
 
-	beforeEach(() => {
-		deviceId = "test-device-123";
-		const noop = (): void => {
-			// Intentionally empty for mock
-		};
-		mockLogger = {
-			info: createMockFn(noop),
-			warn: createMockFn(noop),
-			error: createMockFn(noop),
-			debug: createMockFn(noop)
-		} as unknown as Logger;
+    beforeEach(() => {
+        deviceId = "test-device-123";
+        const noop = (): void => {
+            // Intentionally empty for mock
+        };
+        mockLogger = {
+            info: createMockFn(noop),
+            warn: createMockFn(noop),
+            error: createMockFn(noop),
+            debug: createMockFn(noop)
+        } as unknown as Logger;
 
-		mockSettings = {
-			getSettings: () => ({
-				remoteUri: "https://example.com",
-				vaultName: "test-vault",
-				webSocketRetryIntervalMs: 1000
-			})
-		} as unknown as Settings;
-	});
+        mockSettings = {
+            getSettings: () => ({
+                remoteUri: "https://example.com",
+                vaultName: "test-vault",
+                webSocketRetryIntervalMs: 1000
+            })
+        } as unknown as Settings;
+    });
 
-	it("cleans up promises after message handling", async () => {
-		const manager = new WebSocketManager(
-			deviceId,
-			mockLogger,
-			mockSettings,
-			MockWebSocket as unknown as typeof WebSocket
-		);
+    it("cleans up promises after message handling", async () => {
+        const manager = new WebSocketManager(
+            deviceId,
+            mockLogger,
+            mockSettings,
+            MockWebSocket as unknown as typeof WebSocket
+        );
 
-		manager.onRemoteVaultUpdateReceived.add(async () => {
-			await new Promise((resolve) => setTimeout(resolve, 10));
-		});
-		manager.start();
-		await new Promise((resolve) => setTimeout(resolve, 50));
+        manager.onRemoteVaultUpdateReceived.add(async () => {
+            await new Promise((resolve) => setTimeout(resolve, 10));
+        });
+        manager.start();
+        await new Promise((resolve) => setTimeout(resolve, 50));
 
-		const { outstandingPromises } = manager as unknown as {
-			outstandingPromises: Promise<unknown>[];
-		};
-		const mockWs = (manager as unknown as { webSocket: MockWebSocket })
-			.webSocket;
+        const { outstandingPromises } = manager as unknown as {
+            outstandingPromises: Promise<unknown>[];
+        };
+        const mockWs = (manager as unknown as { webSocket: MockWebSocket })
+            .webSocket;
 
-		mockWs.simulateMessage({ type: "vaultUpdate", updates: [] });
-		mockWs.simulateMessage({ type: "vaultUpdate", updates: [] });
-		mockWs.simulateMessage({ type: "vaultUpdate", updates: [] });
+        mockWs.simulateMessage({ type: "vaultUpdate", updates: [] });
+        mockWs.simulateMessage({ type: "vaultUpdate", updates: [] });
+        mockWs.simulateMessage({ type: "vaultUpdate", updates: [] });
 
-		await new Promise((resolve) => setTimeout(resolve, 100));
+        await new Promise((resolve) => setTimeout(resolve, 100));
 
-		assert.strictEqual(outstandingPromises.length, 0);
-		await manager.stop();
-	});
+        assert.strictEqual(outstandingPromises.length, 0);
+        await manager.stop();
+    });
 
-	it("cleans up cursor position promises", async () => {
-		const manager = new WebSocketManager(
-			deviceId,
-			mockLogger,
-			mockSettings,
-			MockWebSocket as unknown as typeof WebSocket
-		);
+    it("cleans up cursor position promises", async () => {
+        const manager = new WebSocketManager(
+            deviceId,
+            mockLogger,
+            mockSettings,
+            MockWebSocket as unknown as typeof WebSocket
+        );
 
-		manager.onRemoteCursorsUpdateReceived.add(async () => {
-			await new Promise((resolve) => setTimeout(resolve, 10));
-		});
-		manager.start();
-		await new Promise((resolve) => setTimeout(resolve, 50));
+        manager.onRemoteCursorsUpdateReceived.add(async () => {
+            await new Promise((resolve) => setTimeout(resolve, 10));
+        });
+        manager.start();
+        await new Promise((resolve) => setTimeout(resolve, 50));
 
-		const { outstandingPromises } = manager as unknown as {
-			outstandingPromises: Promise<unknown>[];
-		};
-		const mockWs = (manager as unknown as { webSocket: MockWebSocket })
-			.webSocket;
+        const { outstandingPromises } = manager as unknown as {
+            outstandingPromises: Promise<unknown>[];
+        };
+        const mockWs = (manager as unknown as { webSocket: MockWebSocket })
+            .webSocket;
 
-		mockWs.simulateMessage({
-			type: "cursorPositions",
-			clients: [{ deviceId: "other-device", cursors: [] }]
-		});
+        mockWs.simulateMessage({
+            type: "cursorPositions",
+            clients: [{ deviceId: "other-device", cursors: [] }]
+        });
 
-		await new Promise((resolve) => setTimeout(resolve, 100));
-		assert.strictEqual(outstandingPromises.length, 0);
-		await manager.stop();
-	});
+        await new Promise((resolve) => setTimeout(resolve, 100));
+        assert.strictEqual(outstandingPromises.length, 0);
+        await manager.stop();
+    });
 
-	it("logs handshake send errors", async () => {
-		const manager = new WebSocketManager(
-			deviceId,
-			mockLogger,
-			mockSettings,
-			MockWebSocket as unknown as typeof WebSocket
-		);
+    it("logs handshake send errors", async () => {
+        const manager = new WebSocketManager(
+            deviceId,
+            mockLogger,
+            mockSettings,
+            MockWebSocket as unknown as typeof WebSocket
+        );
 
-		manager.start();
-		await new Promise((resolve) => setTimeout(resolve, 50));
+        manager.start();
+        await new Promise((resolve) => setTimeout(resolve, 50));
 
-		const mockWs = (manager as unknown as { webSocket: MockWebSocket })
-			.webSocket;
-		mockWs.send = (): void => {
-			throw new Error("Buffer full");
-		};
+        const mockWs = (manager as unknown as { webSocket: MockWebSocket })
+            .webSocket;
+        mockWs.send = (): void => {
+            throw new Error("Buffer full");
+        };
 
-		assert.throws(() => {
-			manager.sendHandshakeMessage({
-				type: "handshake",
-				token: "test",
-				deviceId: "test",
-				lastSeenVaultUpdateId: null
-			});
-		});
+        assert.throws(() => {
+            manager.sendHandshakeMessage({
+                type: "handshake",
+                token: "test",
+                deviceId: "test",
+                lastSeenVaultUpdateId: null
+            });
+        });
 
-		await manager.stop();
-	});
+        await manager.stop();
+    });
 
-	it("completes stop with timeout protection", async () => {
-		const manager = new WebSocketManager(
-			deviceId,
-			mockLogger,
-			mockSettings,
-			MockWebSocket as unknown as typeof WebSocket
-		);
+    it("completes stop with timeout protection", async () => {
+        const manager = new WebSocketManager(
+            deviceId,
+            mockLogger,
+            mockSettings,
+            MockWebSocket as unknown as typeof WebSocket
+        );
 
-		manager.start();
-		await new Promise((resolve) => setTimeout(resolve, 50));
+        manager.start();
+        await new Promise((resolve) => setTimeout(resolve, 50));
 
-		await manager.stop();
-		assert.ok(true);
-	});
+        await manager.stop();
+        assert.ok(true);
+    });
 
-	it("clears old handlers on reconnection", async () => {
-		const manager = new WebSocketManager(
-			deviceId,
-			mockLogger,
-			mockSettings,
-			MockWebSocket as unknown as typeof WebSocket
-		);
+    it("clears old handlers on reconnection", async () => {
+        const manager = new WebSocketManager(
+            deviceId,
+            mockLogger,
+            mockSettings,
+            MockWebSocket as unknown as typeof WebSocket
+        );
 
-		let statusChangeCount = 0;
-		manager.onWebSocketStatusChanged.add(() => {
-			statusChangeCount++;
-		});
+        let statusChangeCount = 0;
+        manager.onWebSocketStatusChanged.add(() => {
+            statusChangeCount++;
+        });
 
-		manager.start();
-		await new Promise((resolve) => setTimeout(resolve, 50));
+        manager.start();
+        await new Promise((resolve) => setTimeout(resolve, 50));
 
-		const firstWs = (manager as unknown as { webSocket: MockWebSocket })
-			.webSocket;
+        const firstWs = (manager as unknown as { webSocket: MockWebSocket })
+            .webSocket;
 
-		statusChangeCount = 0;
+        statusChangeCount = 0;
 
-		(
-			manager as unknown as { initializeWebSocket: () => void }
-		).initializeWebSocket();
-		await new Promise((resolve) => setTimeout(resolve, 50));
+        (
+            manager as unknown as { initializeWebSocket: () => void }
+        ).initializeWebSocket();
+        await new Promise((resolve) => setTimeout(resolve, 50));
 
-		statusChangeCount = 0;
+        statusChangeCount = 0;
 
-		// Old handler should be cleared
-		firstWs.onclose?.(
-			new MockCloseEvent("close", { code: 1000, reason: "test" })
-		);
+        // Old handler should be cleared
+        firstWs.onclose?.(
+            new MockCloseEvent("close", { code: 1000, reason: "test" })
+        );
 
-		assert.strictEqual(statusChangeCount, 0);
-		await manager.stop();
-	});
+        assert.strictEqual(statusChangeCount, 0);
+        await manager.stop();
+    });
 
-	it("tracks message handling promises", async () => {
-		const manager = new WebSocketManager(
-			deviceId,
-			mockLogger,
-			mockSettings,
-			MockWebSocket as unknown as typeof WebSocket
-		);
+    it("tracks message handling promises", async () => {
+        const manager = new WebSocketManager(
+            deviceId,
+            mockLogger,
+            mockSettings,
+            MockWebSocket as unknown as typeof WebSocket
+        );
 
-		// eslint-disable-next-line @typescript-eslint/init-declarations
-		let resolveListener: () => void;
-		const listenerPromise = new Promise<void>((resolve) => {
-			resolveListener = resolve;
-		});
+        // eslint-disable-next-line @typescript-eslint/init-declarations
+        let resolveListener: () => void;
+        const listenerPromise = new Promise<void>((resolve) => {
+            resolveListener = resolve;
+        });
 
-		manager.onRemoteVaultUpdateReceived.add(async () => {
-			await listenerPromise;
-		});
+        manager.onRemoteVaultUpdateReceived.add(async () => {
+            await listenerPromise;
+        });
 
-		manager.start();
-		await new Promise((resolve) => setTimeout(resolve, 50));
+        manager.start();
+        await new Promise((resolve) => setTimeout(resolve, 50));
 
-		const mockWs = (manager as unknown as { webSocket: MockWebSocket })
-			.webSocket;
-		mockWs.simulateMessage({ type: "vaultUpdate", updates: [] });
+        const mockWs = (manager as unknown as { webSocket: MockWebSocket })
+            .webSocket;
+        mockWs.simulateMessage({ type: "vaultUpdate", updates: [] });
 
-		await new Promise((resolve) => setTimeout(resolve, 10));
+        await new Promise((resolve) => setTimeout(resolve, 10));
 
-		const { outstandingPromises } = manager as unknown as {
-			outstandingPromises: Promise<unknown>[];
-		};
+        const { outstandingPromises } = manager as unknown as {
+            outstandingPromises: Promise<unknown>[];
+        };
 
-		assert.ok(outstandingPromises.length > 0);
+        assert.ok(outstandingPromises.length > 0);
 
-		// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-		resolveListener!();
-		await new Promise((resolve) => setTimeout(resolve, 50));
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        resolveListener!();
+        await new Promise((resolve) => setTimeout(resolve, 50));
 
-		assert.strictEqual(outstandingPromises.length, 0);
-		await manager.stop();
-	});
+        assert.strictEqual(outstandingPromises.length, 0);
+        await manager.stop();
+    });
 });
diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts
index af615f52..550ef096 100644
--- a/frontend/sync-client/src/sync-client.ts
+++ b/frontend/sync-client/src/sync-client.ts
@@ -240,10 +240,10 @@ export class SyncClient {
     }
 
     /**
-     * Reload settings from disk overriding current in-memory settings.
-     * Missing values will be filled in from DEFAULT_SETTINGS rather than
-     * retaining current in-memory settings.
-     */
+    * Reload settings from disk overriding current in-memory settings.
+    * Missing values will be filled in from DEFAULT_SETTINGS rather than
+    * retaining current in-memory settings.
+    */
     public async reloadSettings(): Promise<void> {
         this.checkIfDestroyed("reloadSettings");
 
@@ -275,10 +275,10 @@ export class SyncClient {
     }
 
     /**
-     * Wait for the in-flight operations to finish, reset all tracking,
-     * and the local database but retain the settings.
-     * The SyncClient can be used again after calling this method.
-     */
+    * Wait for the in-flight operations to finish, reset all tracking,
+    * and the local database but retain the settings.
+    * The SyncClient can be used again after calling this method.
+    */
     public async reset(): Promise<void> {
         this.checkIfDestroyed("reset");
 
@@ -430,9 +430,9 @@ export class SyncClient {
     }
 
     /**
-     * Completely destroy the SyncClient, cancelling all in-progress operations.
-     * After calling this method, the SyncClient cannot be used again.
-     */
+    * Completely destroy the SyncClient, cancelling all in-progress operations.
+    * After calling this method, the SyncClient cannot be used again.
+    */
     public async destroy(): Promise<void> {
         this.checkIfDestroyed("destroy");
 
diff --git a/frontend/sync-client/src/sync-operations/syncer.ts b/frontend/sync-client/src/sync-operations/syncer.ts
index e142e409..24b4a890 100644
--- a/frontend/sync-client/src/sync-operations/syncer.ts
+++ b/frontend/sync-client/src/sync-operations/syncer.ts
@@ -479,10 +479,10 @@ export class Syncer {
     }
 
     /**
-     * Create fake documents in the database for all files that are present locally
-     * and also exist remotely. This will stop the subequent syncs from duplicating
-     * the documents by creating the same documents from multiple clients.
-     */
+    * Create fake documents in the database for all files that are present locally
+    * and also exist remotely. This will stop the subequent syncs from duplicating
+    * the documents by creating the same documents from multiple clients.
+    */
     private async createFakeDocumentsFromRemoteState(): Promise<void> {
         if (this.database.getHasInitialSyncCompleted()) {
             return;
diff --git a/frontend/sync-client/src/tracing/sync-history.ts b/frontend/sync-client/src/tracing/sync-history.ts
index 99cfb5ce..5768296d 100644
--- a/frontend/sync-client/src/tracing/sync-history.ts
+++ b/frontend/sync-client/src/tracing/sync-history.ts
@@ -88,11 +88,11 @@ export class SyncHistory {
     }
 
     /**
-     * Insert the entry at the beginning of the history list. If the entry
-     * already in the list, it will get moved to the beginning and updated.
-     *
-     * If the entry list is too long, the oldest entry will be removed.
-     */
+    * Insert the entry at the beginning of the history list. If the entry
+    * already in the list, it will get moved to the beginning and updated.
+    *
+    * If the entry list is too long, the oldest entry will be removed.
+    */
     public addHistoryEntry(entry: CommonHistoryEntry): void {
         const historyEntry = {
             ...entry,
diff --git a/frontend/sync-client/src/types/document-sync-status.ts b/frontend/sync-client/src/types/document-sync-status.ts
index 07a0e801..501469e5 100644
--- a/frontend/sync-client/src/types/document-sync-status.ts
+++ b/frontend/sync-client/src/types/document-sync-status.ts
@@ -1,5 +1,5 @@
 export enum DocumentSyncStatus {
-	UP_TO_DATE = "UP_TO_DATE",
-	SYNCING = "SYNCING",
-	SYNCING_IS_DISABLED = "SYNCING_IS_DISABLED"
+    UP_TO_DATE = "UP_TO_DATE",
+    SYNCING = "SYNCING",
+    SYNCING_IS_DISABLED = "SYNCING_IS_DISABLED"
 }
diff --git a/frontend/sync-client/src/types/document-up-to-dateness.ts b/frontend/sync-client/src/types/document-up-to-dateness.ts
index 2f93f9b4..df30f5eb 100644
--- a/frontend/sync-client/src/types/document-up-to-dateness.ts
+++ b/frontend/sync-client/src/types/document-up-to-dateness.ts
@@ -1,5 +1,5 @@
 export enum DocumentUpToDateness {
-	UpToDate = "UpToDate", // easiest case, the client can just show the cursors as-is
-	Prior = "Prior", // The cursors are outdated, so the client has to guess the cursor positions based on local updates. This is only possible if this client's cursor has once been up-to-date in a given document.
-	Later = "Later" // The cursors are from a future version of a document, there's no way we can accuratly show them locally.
+    UpToDate = "UpToDate", // easiest case, the client can just show the cursors as-is
+    Prior = "Prior", // The cursors are outdated, so the client has to guess the cursor positions based on local updates. This is only possible if this client's cursor has once been up-to-date in a given document.
+    Later = "Later" // The cursors are from a future version of a document, there's no way we can accuratly show them locally.
 }
diff --git a/frontend/sync-client/src/types/maybe-outdated-client-cursors.ts b/frontend/sync-client/src/types/maybe-outdated-client-cursors.ts
index e062f84e..4793b872 100644
--- a/frontend/sync-client/src/types/maybe-outdated-client-cursors.ts
+++ b/frontend/sync-client/src/types/maybe-outdated-client-cursors.ts
@@ -1,5 +1,5 @@
 import type { ClientCursors } from "../services/types/ClientCursors";
 
 export interface MaybeOutdatedClientCursors extends ClientCursors {
-	isOutdated: boolean;
+    isOutdated: boolean;
 }
diff --git a/frontend/sync-client/src/types/network-connection-status.ts b/frontend/sync-client/src/types/network-connection-status.ts
index fb93f5f5..bf876665 100644
--- a/frontend/sync-client/src/types/network-connection-status.ts
+++ b/frontend/sync-client/src/types/network-connection-status.ts
@@ -1,5 +1,5 @@
 export interface NetworkConnectionStatus {
-	isSuccessful: boolean;
-	serverMessage: string;
-	isWebSocketConnected: boolean;
+    isSuccessful: boolean;
+    serverMessage: string;
+    isWebSocketConnected: boolean;
 }
diff --git a/frontend/sync-client/src/utils/assert-set-contains-exactly.ts b/frontend/sync-client/src/utils/assert-set-contains-exactly.ts
index 502dca03..5baf965e 100644
--- a/frontend/sync-client/src/utils/assert-set-contains-exactly.ts
+++ b/frontend/sync-client/src/utils/assert-set-contains-exactly.ts
@@ -1,13 +1,13 @@
 import assert from "node:assert";
 
 export function assertSetContainsExactly<T>(set: Set<T>, ...values: T[]): void {
-	assert.ok(
-		set.size === values.length &&
-			Array.from(set).every((value) => values.includes(value)),
-		`Expected set to contain only ${values.map((v) => '"' + v + '"').join(", ")}, but it contained ${Array.from(
-			set
-		)
-			.map((v) => '"' + v + '"')
-			.join(", ")}`
-	);
+    assert.ok(
+        set.size === values.length &&
+            Array.from(set).every((value) => values.includes(value)),
+        `Expected set to contain only ${values.map((v) => '"' + v + '"').join(", ")}, but it contained ${Array.from(
+            set
+        )
+            .map((v) => '"' + v + '"')
+            .join(", ")}`
+    );
 }
diff --git a/frontend/sync-client/src/utils/await-all.test.ts b/frontend/sync-client/src/utils/await-all.test.ts
index bbce9423..09a22d89 100644
--- a/frontend/sync-client/src/utils/await-all.test.ts
+++ b/frontend/sync-client/src/utils/await-all.test.ts
@@ -3,54 +3,54 @@ import assert from "node:assert";
 import { awaitAll } from "./await-all";
 
 void test("awaitAll resolves promises of the same type", async () => {
-	const promises = [
-		Promise.resolve(1),
-		Promise.resolve(2),
-		Promise.resolve(3)
-	];
+    const promises = [
+        Promise.resolve(1),
+        Promise.resolve(2),
+        Promise.resolve(3)
+    ];
 
-	const results = await awaitAll(promises);
-	assert.deepStrictEqual(results, [1, 2, 3]);
+    const results = await awaitAll(promises);
+    assert.deepStrictEqual(results, [1, 2, 3]);
 });
 
 void test("awaitAll resolves promises of different types", async () => {
-	const promises = [
-		Promise.resolve("hello"),
-		Promise.resolve(42),
-		Promise.resolve(true)
-	] as const;
+    const promises = [
+        Promise.resolve("hello"),
+        Promise.resolve(42),
+        Promise.resolve(true)
+    ] as const;
 
-	const results = await awaitAll(promises);
+    const results = await awaitAll(promises);
 
-	// Type assertions to verify type inference
-	const str: string = results[0];
-	const num: number = results[1];
-	const bool: boolean = results[2];
+    // Type assertions to verify type inference
+    const str: string = results[0];
+    const num: number = results[1];
+    const bool: boolean = results[2];
 
-	assert.strictEqual(str, "hello");
-	assert.strictEqual(num, 42);
-	assert.strictEqual(bool, true);
+    assert.strictEqual(str, "hello");
+    assert.strictEqual(num, 42);
+    assert.strictEqual(bool, true);
 });
 
 void test("awaitAll throws on first rejection", async () => {
-	const error = new Error("Test error");
-	const promises = [
-		Promise.resolve(1),
-		Promise.reject(error),
-		Promise.resolve(3)
-	];
+    const error = new Error("Test error");
+    const promises = [
+        Promise.resolve(1),
+        Promise.reject(error),
+        Promise.resolve(3)
+    ];
 
-	await assert.rejects(async () => {
-		await awaitAll(promises);
-	}, error);
+    await assert.rejects(async () => {
+        await awaitAll(promises);
+    }, error);
 });
 
 void test("awaitAll works with async functions", async () => {
-	const asyncString = async (): Promise<string> => "async";
-	const asyncNumber = async (): Promise<number> => 123;
+    const asyncString = async (): Promise<string> => "async";
+    const asyncNumber = async (): Promise<number> => 123;
 
-	const results = await awaitAll([asyncString(), asyncNumber()]);
+    const results = await awaitAll([asyncString(), asyncNumber()]);
 
-	assert.strictEqual(results[0], "async");
-	assert.strictEqual(results[1], 123);
+    assert.strictEqual(results[0], "async");
+    assert.strictEqual(results[1], 123);
 });
diff --git a/frontend/sync-client/src/utils/await-all.ts b/frontend/sync-client/src/utils/await-all.ts
index b8d50250..9406a6b8 100644
--- a/frontend/sync-client/src/utils/await-all.ts
+++ b/frontend/sync-client/src/utils/await-all.ts
@@ -1,25 +1,25 @@
 type PromiseTuple<T extends readonly unknown[]> = readonly [
-	...{ [K in keyof T]: Promise<T[K]> }
+    ...{ [K in keyof T]: Promise<T[K]> }
 ];
 
 type ResolvedTuple<T extends readonly unknown[]> = {
-	[K in keyof T]: T[K];
+    [K in keyof T]: T[K];
 };
 
 export const awaitAll = async <T extends readonly unknown[]>(
-	promises: PromiseTuple<T>
+    promises: PromiseTuple<T>
 ): Promise<ResolvedTuple<T>> => {
-	// eslint-disable-next-line no-restricted-properties
-	const result = await Promise.allSettled(promises);
-	for (const res of result) {
-		if (res.status === "rejected") {
-			throw res.reason;
-		}
-	}
+    // eslint-disable-next-line no-restricted-properties
+    const result = await Promise.allSettled(promises);
+    for (const res of result) {
+        if (res.status === "rejected") {
+            throw res.reason;
+        }
+    }
 
-	// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-	return result.map(
-		// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-		(res) => (res as PromiseFulfilledResult<unknown>).value
-	) as ResolvedTuple<T>;
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+    return result.map(
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+        (res) => (res as PromiseFulfilledResult<unknown>).value
+    ) as ResolvedTuple<T>;
 };
diff --git a/frontend/sync-client/src/utils/create-client-id.ts b/frontend/sync-client/src/utils/create-client-id.ts
index 60143b75..4da442c2 100644
--- a/frontend/sync-client/src/utils/create-client-id.ts
+++ b/frontend/sync-client/src/utils/create-client-id.ts
@@ -1,15 +1,15 @@
 import { v4 as uuidv4 } from "uuid";
 
 export function createClientId(): string {
-	// @ts-expect-error, injected by webpack
-	const packageVersion = __CURRENT_VERSION__; // eslint-disable-line
+    // @ts-expect-error, injected by webpack
+    const packageVersion = __CURRENT_VERSION__; // eslint-disable-line
 
-	const platform =
-		typeof navigator !== "undefined"
-			? navigator.platform // eslint-disable-line @typescript-eslint/no-deprecated
-			: typeof process !== "undefined"
-				? process.platform
-				: "unknown";
+    const platform =
+        typeof navigator !== "undefined"
+            ? navigator.platform // eslint-disable-line @typescript-eslint/no-deprecated
+            : typeof process !== "undefined"
+                ? process.platform
+                : "unknown";
 
-	return `vault-link/${packageVersion} (${uuidv4()}; ${platform})`;
+    return `vault-link/${packageVersion} (${uuidv4()}; ${platform})`;
 }
diff --git a/frontend/sync-client/src/utils/create-promise.ts b/frontend/sync-client/src/utils/create-promise.ts
index 542a4013..a49196ee 100644
--- a/frontend/sync-client/src/utils/create-promise.ts
+++ b/frontend/sync-client/src/utils/create-promise.ts
@@ -1,25 +1,25 @@
 type ResolveFunction<T> = undefined extends T
-	? (value?: T) => unknown
-	: (value: T) => unknown;
+    ? (value?: T) => unknown
+    : (value: T) => unknown;
 
 /**
  * A type-safe utility function to create a Promise with resolve and reject functions.
  * @returns A tuple containing a Promise, a resolve function, and a reject function.
  */
 export function createPromise<T = unknown>(): [
-	Promise<T>,
-	ResolveFunction<T>,
-	(error: unknown) => unknown
+    Promise<T>,
+    ResolveFunction<T>,
+    (error: unknown) => unknown
 ] {
-	let resolve: undefined | ResolveFunction<T> = undefined;
-	let reject: undefined | ((error: unknown) => unknown) = undefined;
+    let resolve: undefined | ResolveFunction<T> = undefined;
+    let reject: undefined | ((error: unknown) => unknown) = undefined;
 
-	const creationPromise = new Promise<T>(
-		(resolve_, reject_) =>
-			// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-			((resolve = resolve_ as ResolveFunction<T>), (reject = reject_))
-	);
+    const creationPromise = new Promise<T>(
+        (resolve_, reject_) =>
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+            ((resolve = resolve_ as ResolveFunction<T>), (reject = reject_))
+    );
 
-	// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-	return [creationPromise, resolve!, reject!];
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    return [creationPromise, resolve!, reject!];
 }
diff --git a/frontend/sync-client/src/utils/data-structures/event-listeners.ts b/frontend/sync-client/src/utils/data-structures/event-listeners.ts
index 25be5344..008342e7 100644
--- a/frontend/sync-client/src/utils/data-structures/event-listeners.ts
+++ b/frontend/sync-client/src/utils/data-structures/event-listeners.ts
@@ -8,32 +8,32 @@ export class EventListeners<TListener extends (...args: any[]) => any> {
     private readonly listeners: TListener[] = [];
 
     /**
-     * Adds a new listener to the collection.
-     *
-     * @param listener The listener callback to add
-     * @returns An unsubscribe function that removes this listener when called
-     */
+    * Adds a new listener to the collection.
+    *
+    * @param listener The listener callback to add
+    * @returns An unsubscribe function that removes this listener when called
+    */
     public add(listener: TListener): () => void {
         this.listeners.push(listener);
         return () => this.remove(listener);
     }
 
     /**
-     * Removes a listener from the collection.
-     *
-     * @param listener The listener callback to remove
-     * @returns true if the listener was found and removed, false otherwise
-     */
+    * Removes a listener from the collection.
+    *
+    * @param listener The listener callback to remove
+    * @returns true if the listener was found and removed, false otherwise
+    */
     public remove(listener: TListener): boolean {
         return removeFromArray(this.listeners, listener);
     }
 
     /**
-     * Triggers all listeners synchronously with the provided arguments.
-     * Any returned promises are ignored. Use triggerAsync() to await them.
-     *
-     * @param args The arguments to pass to each listener
-     */
+    * Triggers all listeners synchronously with the provided arguments.
+    * Any returned promises are ignored. Use triggerAsync() to await them.
+    *
+    * @param args The arguments to pass to each listener
+    */
     public trigger(...args: Parameters<TListener>): void {
         this.listeners.forEach((listener) => {
             listener(...args);
@@ -41,12 +41,12 @@ export class EventListeners<TListener extends (...args: any[]) => any> {
     }
 
     /**
-     * Triggers all listeners and awaits any promises they return.
-     * Synchronous listeners are called immediately, and any async listeners
-     * are awaited in parallel.
-     *
-     * @param args The arguments to pass to each listener
-     */
+    * Triggers all listeners and awaits any promises they return.
+    * Synchronous listeners are called immediately, and any async listeners
+    * are awaited in parallel.
+    *
+    * @param args The arguments to pass to each listener
+    */
     public async triggerAsync(...args: Parameters<TListener>): Promise<void> {
         await awaitAll(
             this.listeners
diff --git a/frontend/sync-client/src/utils/data-structures/fix-sized-cache.test.ts b/frontend/sync-client/src/utils/data-structures/fix-sized-cache.test.ts
index a118815b..c5ca141c 100644
--- a/frontend/sync-client/src/utils/data-structures/fix-sized-cache.test.ts
+++ b/frontend/sync-client/src/utils/data-structures/fix-sized-cache.test.ts
@@ -3,273 +3,273 @@ import assert from "node:assert";
 import { FixedSizeDocumentCache } from "./fix-sized-cache";
 
 describe("fixedSizeDocumentCache", () => {
-	it("happyPath", async () => {
-		const cache = new FixedSizeDocumentCache(4);
-		const doc1 = new Uint8Array([1, 2]);
-		const doc2 = new Uint8Array([3, 4]);
-		const doc3 = new Uint8Array([5, 6]);
+    it("happyPath", async () => {
+        const cache = new FixedSizeDocumentCache(4);
+        const doc1 = new Uint8Array([1, 2]);
+        const doc2 = new Uint8Array([3, 4]);
+        const doc3 = new Uint8Array([5, 6]);
 
-		cache.put(1, doc1);
-		assert.equal(cache.get(1), doc1);
-		cache.put(2, doc2);
-		assert.equal(cache.get(1), doc1);
-		assert.equal(cache.get(2), doc2);
-		cache.put(3, doc3);
-		assert.equal(cache.get(1), undefined);
-		assert.equal(cache.get(2), doc2);
-		assert.equal(cache.get(3), doc3);
-	});
+        cache.put(1, doc1);
+        assert.equal(cache.get(1), doc1);
+        cache.put(2, doc2);
+        assert.equal(cache.get(1), doc1);
+        assert.equal(cache.get(2), doc2);
+        cache.put(3, doc3);
+        assert.equal(cache.get(1), undefined);
+        assert.equal(cache.get(2), doc2);
+        assert.equal(cache.get(3), doc3);
+    });
 
-	it("updateExistingEntry", async () => {
-		const cache = new FixedSizeDocumentCache(4);
-		const doc1_v1 = new Uint8Array([1, 2]);
-		const doc1_v2 = new Uint8Array([3, 4]);
-		const doc2 = new Uint8Array([5, 6]);
+    it("updateExistingEntry", async () => {
+        const cache = new FixedSizeDocumentCache(4);
+        const doc1_v1 = new Uint8Array([1, 2]);
+        const doc1_v2 = new Uint8Array([3, 4]);
+        const doc2 = new Uint8Array([5, 6]);
 
-		cache.put(1, doc1_v1);
-		assert.equal(cache.get(1), doc1_v1);
-		cache.put(2, doc2);
-		assert.equal(cache.get(1), doc1_v1);
-		assert.equal(cache.get(2), doc2);
-		cache.put(1, doc1_v2); // Update doc1
-		assert.equal(cache.get(1), doc1_v2);
-		assert.equal(cache.get(2), doc2);
-	});
+        cache.put(1, doc1_v1);
+        assert.equal(cache.get(1), doc1_v1);
+        cache.put(2, doc2);
+        assert.equal(cache.get(1), doc1_v1);
+        assert.equal(cache.get(2), doc2);
+        cache.put(1, doc1_v2); // Update doc1
+        assert.equal(cache.get(1), doc1_v2);
+        assert.equal(cache.get(2), doc2);
+    });
 
-	it("evictOldestEntry", async () => {
-		const cache = new FixedSizeDocumentCache(4);
-		const doc1 = new Uint8Array([1, 2]);
-		const doc2 = new Uint8Array([3, 4]);
-		const doc3 = new Uint8Array([5, 6]);
+    it("evictOldestEntry", async () => {
+        const cache = new FixedSizeDocumentCache(4);
+        const doc1 = new Uint8Array([1, 2]);
+        const doc2 = new Uint8Array([3, 4]);
+        const doc3 = new Uint8Array([5, 6]);
 
-		cache.put(1, doc1);
-		cache.put(2, doc2);
-		assert.equal(cache.get(2), doc2);
-		assert.equal(cache.get(1), doc1);
-		cache.put(3, doc3);
-		assert.equal(cache.get(1), doc1);
-		assert.equal(cache.get(2), undefined);
-		assert.equal(cache.get(3), doc3);
-	});
+        cache.put(1, doc1);
+        cache.put(2, doc2);
+        assert.equal(cache.get(2), doc2);
+        assert.equal(cache.get(1), doc1);
+        cache.put(3, doc3);
+        assert.equal(cache.get(1), doc1);
+        assert.equal(cache.get(2), undefined);
+        assert.equal(cache.get(3), doc3);
+    });
 
-	it("tooLargeEntry", async () => {
-		const cache = new FixedSizeDocumentCache(2);
-		const doc1 = new Uint8Array([1, 2, 3]);
+    it("tooLargeEntry", async () => {
+        const cache = new FixedSizeDocumentCache(2);
+        const doc1 = new Uint8Array([1, 2, 3]);
 
-		cache.put(1, doc1);
-		assert.equal(cache.get(1), undefined);
-	});
+        cache.put(1, doc1);
+        assert.equal(cache.get(1), undefined);
+    });
 
-	it("multipleEvictionsInSinglePut", async () => {
-		const cache = new FixedSizeDocumentCache(10);
-		const doc1 = new Uint8Array([1, 2]);
-		const doc2 = new Uint8Array([3, 4]);
-		const doc3 = new Uint8Array([5, 6]);
-		const doc4 = new Uint8Array([7, 8, 9, 10, 11, 12, 13, 14]); // 8 bytes
+    it("multipleEvictionsInSinglePut", async () => {
+        const cache = new FixedSizeDocumentCache(10);
+        const doc1 = new Uint8Array([1, 2]);
+        const doc2 = new Uint8Array([3, 4]);
+        const doc3 = new Uint8Array([5, 6]);
+        const doc4 = new Uint8Array([7, 8, 9, 10, 11, 12, 13, 14]); // 8 bytes
 
-		cache.put(1, doc1);
-		cache.put(2, doc2);
-		cache.put(3, doc3);
-		// Cache now has 6 bytes total
+        cache.put(1, doc1);
+        cache.put(2, doc2);
+        cache.put(3, doc3);
+        // Cache now has 6 bytes total
 
-		cache.put(4, doc4); // Should evict doc1 and doc2 to make room (total: 2+8=10)
-		assert.equal(cache.get(1), undefined); // Evicted
-		assert.equal(cache.get(2), undefined); // Evicted
-		assert.equal(cache.get(3), doc3); // Still present
-		assert.equal(cache.get(4), doc4);
-	});
+        cache.put(4, doc4); // Should evict doc1 and doc2 to make room (total: 2+8=10)
+        assert.equal(cache.get(1), undefined); // Evicted
+        assert.equal(cache.get(2), undefined); // Evicted
+        assert.equal(cache.get(3), doc3); // Still present
+        assert.equal(cache.get(4), doc4);
+    });
 
-	it("clearCache", async () => {
-		const cache = new FixedSizeDocumentCache(10);
-		const doc1 = new Uint8Array([1, 2]);
-		const doc2 = new Uint8Array([3, 4]);
+    it("clearCache", async () => {
+        const cache = new FixedSizeDocumentCache(10);
+        const doc1 = new Uint8Array([1, 2]);
+        const doc2 = new Uint8Array([3, 4]);
 
-		cache.put(1, doc1);
-		cache.put(2, doc2);
-		assert.equal(cache.get(1), doc1);
-		assert.equal(cache.get(2), doc2);
+        cache.put(1, doc1);
+        cache.put(2, doc2);
+        assert.equal(cache.get(1), doc1);
+        assert.equal(cache.get(2), doc2);
 
-		cache.reset();
-		assert.equal(cache.get(1), undefined);
-		assert.equal(cache.get(2), undefined);
+        cache.reset();
+        assert.equal(cache.get(1), undefined);
+        assert.equal(cache.get(2), undefined);
 
-		// Should be able to add entries after clear
-		cache.put(3, doc1);
-		assert.equal(cache.get(3), doc1);
-	});
+        // Should be able to add entries after clear
+        cache.put(3, doc1);
+        assert.equal(cache.get(3), doc1);
+    });
 
-	it("getNonExistentKey", async () => {
-		const cache = new FixedSizeDocumentCache(10);
-		const doc1 = new Uint8Array([1, 2]);
-		cache.put(1, doc1);
-		assert.equal(cache.get(999), undefined);
-	});
+    it("getNonExistentKey", async () => {
+        const cache = new FixedSizeDocumentCache(10);
+        const doc1 = new Uint8Array([1, 2]);
+        cache.put(1, doc1);
+        assert.equal(cache.get(999), undefined);
+    });
 
-	it("updateEntryWithDifferentSizeTriggeringEviction", async () => {
-		const cache = new FixedSizeDocumentCache(6);
-		const doc1_v1 = new Uint8Array([1, 2]);
-		const doc1_v2 = new Uint8Array([1, 2, 3, 4]); // Larger version
-		const doc2 = new Uint8Array([5, 6]);
-		const doc3 = new Uint8Array([7, 8]);
+    it("updateEntryWithDifferentSizeTriggeringEviction", async () => {
+        const cache = new FixedSizeDocumentCache(6);
+        const doc1_v1 = new Uint8Array([1, 2]);
+        const doc1_v2 = new Uint8Array([1, 2, 3, 4]); // Larger version
+        const doc2 = new Uint8Array([5, 6]);
+        const doc3 = new Uint8Array([7, 8]);
 
-		cache.put(1, doc1_v1);
-		cache.put(2, doc2);
-		cache.put(3, doc3);
+        cache.put(1, doc1_v1);
+        cache.put(2, doc2);
+        cache.put(3, doc3);
 
-		// Update doc1 with larger version, should evict doc2
-		cache.put(1, doc1_v2);
+        // Update doc1 with larger version, should evict doc2
+        cache.put(1, doc1_v2);
 
-		assert.equal(cache.get(1), doc1_v2);
-		assert.equal(cache.get(2), undefined); // Evicted
-		assert.equal(cache.get(3), doc3);
-	});
+        assert.equal(cache.get(1), doc1_v2);
+        assert.equal(cache.get(2), undefined); // Evicted
+        assert.equal(cache.get(3), doc3);
+    });
 
-	it("singleItemCache", async () => {
-		const cache = new FixedSizeDocumentCache(2);
-		const doc1 = new Uint8Array([1, 2]);
-		const doc2 = new Uint8Array([3, 4]);
+    it("singleItemCache", async () => {
+        const cache = new FixedSizeDocumentCache(2);
+        const doc1 = new Uint8Array([1, 2]);
+        const doc2 = new Uint8Array([3, 4]);
 
-		cache.put(1, doc1);
-		assert.equal(cache.get(1), doc1);
+        cache.put(1, doc1);
+        assert.equal(cache.get(1), doc1);
 
-		cache.put(2, doc2);
-		assert.equal(cache.get(1), undefined); // Evicted
-		assert.equal(cache.get(2), doc2);
-	});
+        cache.put(2, doc2);
+        assert.equal(cache.get(1), undefined); // Evicted
+        assert.equal(cache.get(2), doc2);
+    });
 
-	it("multipleGetsOnSameEntry", async () => {
-		const cache = new FixedSizeDocumentCache(4);
-		const doc1 = new Uint8Array([1, 2]);
-		const doc2 = new Uint8Array([3, 4]);
-		const doc3 = new Uint8Array([5, 6]);
+    it("multipleGetsOnSameEntry", async () => {
+        const cache = new FixedSizeDocumentCache(4);
+        const doc1 = new Uint8Array([1, 2]);
+        const doc2 = new Uint8Array([3, 4]);
+        const doc3 = new Uint8Array([5, 6]);
 
-		cache.put(1, doc1);
-		cache.put(2, doc2);
+        cache.put(1, doc1);
+        cache.put(2, doc2);
 
-		// Multiple gets on doc1
-		cache.get(1);
-		cache.get(1);
-		cache.get(1);
+        // Multiple gets on doc1
+        cache.get(1);
+        cache.get(1);
+        cache.get(1);
 
-		// Order should be: 2 (LRU), 1 (MRU)
-		cache.put(3, doc3);
+        // Order should be: 2 (LRU), 1 (MRU)
+        cache.put(3, doc3);
 
-		assert.equal(cache.get(1), doc1);
-		assert.equal(cache.get(2), undefined); // Evicted
-		assert.equal(cache.get(3), doc3);
-	});
+        assert.equal(cache.get(1), doc1);
+        assert.equal(cache.get(2), undefined); // Evicted
+        assert.equal(cache.get(3), doc3);
+    });
 
-	it("exactlySizedEntry", async () => {
-		const cache = new FixedSizeDocumentCache(4);
-		const doc1 = new Uint8Array([1, 2, 3, 4]); // Exactly cache size
+    it("exactlySizedEntry", async () => {
+        const cache = new FixedSizeDocumentCache(4);
+        const doc1 = new Uint8Array([1, 2, 3, 4]); // Exactly cache size
 
-		cache.put(1, doc1);
-		assert.equal(cache.get(1), doc1);
+        cache.put(1, doc1);
+        assert.equal(cache.get(1), doc1);
 
-		const doc2 = new Uint8Array([5, 6]);
-		cache.put(2, doc2);
+        const doc2 = new Uint8Array([5, 6]);
+        cache.put(2, doc2);
 
-		// doc1 should be evicted to make room for doc2
-		assert.equal(cache.get(1), undefined);
-		assert.equal(cache.get(2), doc2);
-	});
+        // doc1 should be evicted to make room for doc2
+        assert.equal(cache.get(1), undefined);
+        assert.equal(cache.get(2), doc2);
+    });
 
-	it("updateEntryMakesItMostRecent", async () => {
-		const cache = new FixedSizeDocumentCache(6);
-		const doc1_v1 = new Uint8Array([1, 2]);
-		const doc1_v2 = new Uint8Array([3, 4]);
-		const doc2 = new Uint8Array([5, 6]);
-		const doc3 = new Uint8Array([7, 8]);
-		const doc4 = new Uint8Array([9, 10]);
+    it("updateEntryMakesItMostRecent", async () => {
+        const cache = new FixedSizeDocumentCache(6);
+        const doc1_v1 = new Uint8Array([1, 2]);
+        const doc1_v2 = new Uint8Array([3, 4]);
+        const doc2 = new Uint8Array([5, 6]);
+        const doc3 = new Uint8Array([7, 8]);
+        const doc4 = new Uint8Array([9, 10]);
 
-		cache.put(1, doc1_v1);
-		cache.put(2, doc2);
-		cache.put(3, doc3);
+        cache.put(1, doc1_v1);
+        cache.put(2, doc2);
+        cache.put(3, doc3);
 
-		// Update doc1 (should move it to most recent)
-		cache.put(1, doc1_v2);
+        // Update doc1 (should move it to most recent)
+        cache.put(1, doc1_v2);
 
-		// Order should be: 2 (LRU), 3, 1 (MRU)
-		// Adding doc4 should evict doc2
-		cache.put(4, doc4);
+        // Order should be: 2 (LRU), 3, 1 (MRU)
+        // Adding doc4 should evict doc2
+        cache.put(4, doc4);
 
-		assert.equal(cache.get(1), doc1_v2);
-		assert.equal(cache.get(2), undefined); // Evicted
-		assert.equal(cache.get(3), doc3);
-		assert.equal(cache.get(4), doc4);
-	});
+        assert.equal(cache.get(1), doc1_v2);
+        assert.equal(cache.get(2), undefined); // Evicted
+        assert.equal(cache.get(3), doc3);
+        assert.equal(cache.get(4), doc4);
+    });
 
-	it("alternatingAccessPattern", async () => {
-		const cache = new FixedSizeDocumentCache(4);
-		const doc1 = new Uint8Array([1, 2]);
-		const doc2 = new Uint8Array([3, 4]);
-		const doc3 = new Uint8Array([5, 6]);
+    it("alternatingAccessPattern", async () => {
+        const cache = new FixedSizeDocumentCache(4);
+        const doc1 = new Uint8Array([1, 2]);
+        const doc2 = new Uint8Array([3, 4]);
+        const doc3 = new Uint8Array([5, 6]);
 
-		cache.put(1, doc1);
-		cache.put(2, doc2);
+        cache.put(1, doc1);
+        cache.put(2, doc2);
 
-		// Alternate access between doc1 and doc2
-		cache.get(1);
-		cache.get(2);
-		cache.get(1);
-		cache.get(2);
+        // Alternate access between doc1 and doc2
+        cache.get(1);
+        cache.get(2);
+        cache.get(1);
+        cache.get(2);
 
-		// Order should be: 1, 2 (MRU)
-		cache.put(3, doc3);
+        // Order should be: 1, 2 (MRU)
+        cache.put(3, doc3);
 
-		assert.equal(cache.get(1), undefined); // Evicted
-		assert.equal(cache.get(2), doc2);
-		assert.equal(cache.get(3), doc3);
-	});
+        assert.equal(cache.get(1), undefined); // Evicted
+        assert.equal(cache.get(2), doc2);
+        assert.equal(cache.get(3), doc3);
+    });
 
-	it("zeroByteDocs", async () => {
-		const cache = new FixedSizeDocumentCache(2);
-		const doc1 = new Uint8Array([]);
-		const doc2 = new Uint8Array([]);
-		const doc3 = new Uint8Array([1, 2]);
+    it("zeroByteDocs", async () => {
+        const cache = new FixedSizeDocumentCache(2);
+        const doc1 = new Uint8Array([]);
+        const doc2 = new Uint8Array([]);
+        const doc3 = new Uint8Array([1, 2]);
 
-		cache.put(1, doc1);
-		cache.put(2, doc2);
-		cache.put(3, doc3);
+        cache.put(1, doc1);
+        cache.put(2, doc2);
+        cache.put(3, doc3);
 
-		assert.equal(cache.get(1), doc1);
-		assert.equal(cache.get(2), doc2);
-		assert.equal(cache.get(3), doc3);
-	});
+        assert.equal(cache.get(1), doc1);
+        assert.equal(cache.get(2), doc2);
+        assert.equal(cache.get(3), doc3);
+    });
 
-	it("resizeToLargerSizeNoEviction", async () => {
-		const cache = new FixedSizeDocumentCache(4);
-		const doc1 = new Uint8Array([1, 2]);
-		const doc2 = new Uint8Array([3, 4]);
+    it("resizeToLargerSizeNoEviction", async () => {
+        const cache = new FixedSizeDocumentCache(4);
+        const doc1 = new Uint8Array([1, 2]);
+        const doc2 = new Uint8Array([3, 4]);
 
-		cache.put(1, doc1);
-		cache.put(2, doc2);
+        cache.put(1, doc1);
+        cache.put(2, doc2);
 
-		cache.resize(10);
+        cache.resize(10);
 
-		assert.equal(cache.get(1), doc1);
-		assert.equal(cache.get(2), doc2);
-	});
+        assert.equal(cache.get(1), doc1);
+        assert.equal(cache.get(2), doc2);
+    });
 
-	it("resizeCausesMultipleEvictions", async () => {
-		const cache = new FixedSizeDocumentCache(10);
-		const doc1 = new Uint8Array([1, 2]);
-		const doc2 = new Uint8Array([3, 4]);
-		const doc3 = new Uint8Array([5, 6]);
-		const doc4 = new Uint8Array([7, 8]);
+    it("resizeCausesMultipleEvictions", async () => {
+        const cache = new FixedSizeDocumentCache(10);
+        const doc1 = new Uint8Array([1, 2]);
+        const doc2 = new Uint8Array([3, 4]);
+        const doc3 = new Uint8Array([5, 6]);
+        const doc4 = new Uint8Array([7, 8]);
 
-		cache.put(1, doc1);
-		cache.put(2, doc2);
-		cache.put(3, doc3);
-		cache.put(4, doc4);
-		// Cache has 8 bytes total
+        cache.put(1, doc1);
+        cache.put(2, doc2);
+        cache.put(3, doc3);
+        cache.put(4, doc4);
+        // Cache has 8 bytes total
 
-		cache.resize(2);
+        cache.resize(2);
 
-		// Should evict doc1, doc2, doc3 to get down to 2 bytes
-		assert.equal(cache.get(1), undefined);
-		assert.equal(cache.get(2), undefined);
-		assert.equal(cache.get(3), undefined);
-		assert.equal(cache.get(4), doc4);
-	});
+        // Should evict doc1, doc2, doc3 to get down to 2 bytes
+        assert.equal(cache.get(1), undefined);
+        assert.equal(cache.get(2), undefined);
+        assert.equal(cache.get(3), undefined);
+        assert.equal(cache.get(4), doc4);
+    });
 });
diff --git a/frontend/sync-client/src/utils/data-structures/fix-sized-cache.ts b/frontend/sync-client/src/utils/data-structures/fix-sized-cache.ts
index 1541d72f..51ad41c1 100644
--- a/frontend/sync-client/src/utils/data-structures/fix-sized-cache.ts
+++ b/frontend/sync-client/src/utils/data-structures/fix-sized-cache.ts
@@ -4,116 +4,116 @@ import type { VaultUpdateId } from "../../persistence/database";
 
 // Doubly-linked list node for O(1) LRU operations
 class LRUNode {
-	public constructor(
-		public key: VaultUpdateId,
-		public value: Uint8Array,
-		public prev: LRUNode | null = null,
-		public next: LRUNode | null = null
-	) {}
+    public constructor(
+        public key: VaultUpdateId,
+        public value: Uint8Array,
+        public prev: LRUNode | null = null,
+        public next: LRUNode | null = null
+    ) {}
 }
 
 // evicting the least recently used documents when the size limit is exceeded.
 export class FixedSizeDocumentCache {
-	private currentSizeInBytes: number;
-	private readonly cache: Map<VaultUpdateId, LRUNode>;
-	private head: LRUNode | null; // Least recently used
-	private tail: LRUNode | null; // Most recently used
+    private currentSizeInBytes: number;
+    private readonly cache: Map<VaultUpdateId, LRUNode>;
+    private head: LRUNode | null; // Least recently used
+    private tail: LRUNode | null; // Most recently used
 
-	public constructor(private maxSizeInBytes: number) {
-		this.currentSizeInBytes = 0;
-		this.cache = new Map();
-		this.head = null;
-		this.tail = null;
-	}
+    public constructor(private maxSizeInBytes: number) {
+        this.currentSizeInBytes = 0;
+        this.cache = new Map();
+        this.head = null;
+        this.tail = null;
+    }
 
-	public get(updateId: VaultUpdateId): Uint8Array | undefined {
-		const node = this.cache.get(updateId);
-		if (node) {
-			this.moveToTail(node);
-			return node.value;
-		}
+    public get(updateId: VaultUpdateId): Uint8Array | undefined {
+        const node = this.cache.get(updateId);
+        if (node) {
+            this.moveToTail(node);
+            return node.value;
+        }
 
-		return undefined;
-	}
+        return undefined;
+    }
 
-	public put(updateId: VaultUpdateId, content: Uint8Array): void {
-		if (content.byteLength > this.maxSizeInBytes) {
-			// Document is too large to fit in the cache
-			return;
-		}
+    public put(updateId: VaultUpdateId, content: Uint8Array): void {
+        if (content.byteLength > this.maxSizeInBytes) {
+            // Document is too large to fit in the cache
+            return;
+        }
 
-		// If the document is already in the cache, update it
-		const existingNode = this.cache.get(updateId);
-		if (existingNode != null) {
-			this.currentSizeInBytes -= existingNode.value.byteLength;
-			this.removeNode(existingNode);
-			this.cache.delete(updateId);
-		}
+        // If the document is already in the cache, update it
+        const existingNode = this.cache.get(updateId);
+        if (existingNode != null) {
+            this.currentSizeInBytes -= existingNode.value.byteLength;
+            this.removeNode(existingNode);
+            this.cache.delete(updateId);
+        }
 
-		const newNode = new LRUNode(updateId, content);
-		this.cache.set(updateId, newNode);
-		this.addToTail(newNode);
-		this.currentSizeInBytes += content.byteLength;
-		this.fitBelowMaxSize();
-	}
+        const newNode = new LRUNode(updateId, content);
+        this.cache.set(updateId, newNode);
+        this.addToTail(newNode);
+        this.currentSizeInBytes += content.byteLength;
+        this.fitBelowMaxSize();
+    }
 
-	public reset(): void {
-		this.cache.clear();
-		this.head = null;
-		this.tail = null;
-		this.currentSizeInBytes = 0;
-	}
+    public reset(): void {
+        this.cache.clear();
+        this.head = null;
+        this.tail = null;
+        this.currentSizeInBytes = 0;
+    }
 
-	public resize(newMaxSizeInBytes: number): void {
-		this.maxSizeInBytes = newMaxSizeInBytes;
-		this.fitBelowMaxSize();
-	}
+    public resize(newMaxSizeInBytes: number): void {
+        this.maxSizeInBytes = newMaxSizeInBytes;
+        this.fitBelowMaxSize();
+    }
 
-	private fitBelowMaxSize(): void {
-		// Evict least recently used documents if over size limit
-		while (this.currentSizeInBytes > this.maxSizeInBytes && this.head) {
-			const lruNode = this.head;
-			this.removeNode(lruNode);
-			this.cache.delete(lruNode.key);
-			this.currentSizeInBytes -= lruNode.value.byteLength;
-		}
-	}
+    private fitBelowMaxSize(): void {
+        // Evict least recently used documents if over size limit
+        while (this.currentSizeInBytes > this.maxSizeInBytes && this.head) {
+            const lruNode = this.head;
+            this.removeNode(lruNode);
+            this.cache.delete(lruNode.key);
+            this.currentSizeInBytes -= lruNode.value.byteLength;
+        }
+    }
 
-	private removeNode(node: LRUNode): void {
-		if (node.prev) {
-			node.prev.next = node.next;
-		} else {
-			this.head = node.next;
-		}
+    private removeNode(node: LRUNode): void {
+        if (node.prev) {
+            node.prev.next = node.next;
+        } else {
+            this.head = node.next;
+        }
 
-		if (node.next) {
-			node.next.prev = node.prev;
-		} else {
-			this.tail = node.prev;
-		}
+        if (node.next) {
+            node.next.prev = node.prev;
+        } else {
+            this.tail = node.prev;
+        }
 
-		node.prev = null;
-		node.next = null;
-	}
+        node.prev = null;
+        node.next = null;
+    }
 
-	private addToTail(node: LRUNode): void {
-		node.prev = this.tail;
-		node.next = null;
+    private addToTail(node: LRUNode): void {
+        node.prev = this.tail;
+        node.next = null;
 
-		if (this.tail) {
-			this.tail.next = node;
-		}
+        if (this.tail) {
+            this.tail.next = node;
+        }
 
-		this.tail = node;
+        this.tail = node;
 
-		this.head ??= node;
-	}
+        this.head ??= node;
+    }
 
-	private moveToTail(node: LRUNode): void {
-		if (node === this.tail) {
-			return;
-		}
-		this.removeNode(node);
-		this.addToTail(node);
-	}
+    private moveToTail(node: LRUNode): void {
+        if (node === this.tail) {
+            return;
+        }
+        this.removeNode(node);
+        this.addToTail(node);
+    }
 }
diff --git a/frontend/sync-client/src/utils/data-structures/locks.test.ts b/frontend/sync-client/src/utils/data-structures/locks.test.ts
index a13bb274..0c09c062 100644
--- a/frontend/sync-client/src/utils/data-structures/locks.test.ts
+++ b/frontend/sync-client/src/utils/data-structures/locks.test.ts
@@ -7,226 +7,226 @@ import { awaitAll } from "../await-all";
 import { sleep } from "../sleep";
 
 describe("withLock", () => {
-	const testPath: RelativePath = "test/document/path";
-	const testPath2: RelativePath = "test/document/path2";
-	const logger = new Logger();
+    const testPath: RelativePath = "test/document/path";
+    const testPath2: RelativePath = "test/document/path2";
+    const logger = new Logger();
 
-	// eslint-disable-next-line @typescript-eslint/init-declarations
-	let locks: Locks<RelativePath>;
+    // eslint-disable-next-line @typescript-eslint/init-declarations
+    let locks: Locks<RelativePath>;
 
-	beforeEach(() => {
-		locks = new Locks<RelativePath>(logger);
-	});
+    beforeEach(() => {
+        locks = new Locks<RelativePath>(logger);
+    });
 
-	it("should execute function with single key lock", async () => {
-		let executionCount = 0;
-		const result = await locks.withLock(testPath, () => {
-			executionCount++;
-			return "success";
-		});
+    it("should execute function with single key lock", async () => {
+        let executionCount = 0;
+        const result = await locks.withLock(testPath, () => {
+            executionCount++;
+            return "success";
+        });
 
-		assert.strictEqual(result, "success");
-		assert.strictEqual(executionCount, 1);
-	});
+        assert.strictEqual(result, "success");
+        assert.strictEqual(executionCount, 1);
+    });
 
-	it("should execute async function with single key lock", async () => {
-		let executionCount = 0;
-		const result = await locks.withLock(testPath, async () => {
-			executionCount++;
-			await sleep(10);
-			return "async-success";
-		});
+    it("should execute async function with single key lock", async () => {
+        let executionCount = 0;
+        const result = await locks.withLock(testPath, async () => {
+            executionCount++;
+            await sleep(10);
+            return "async-success";
+        });
 
-		assert.strictEqual(result, "async-success");
-		assert.strictEqual(executionCount, 1);
-	});
+        assert.strictEqual(result, "async-success");
+        assert.strictEqual(executionCount, 1);
+    });
 
-	it("should execute function with multiple key locks", async () => {
-		let executionCount = 0;
-		const result = await locks.withLock([testPath, testPath2], () => {
-			executionCount++;
-			return "multi-success";
-		});
+    it("should execute function with multiple key locks", async () => {
+        let executionCount = 0;
+        const result = await locks.withLock([testPath, testPath2], () => {
+            executionCount++;
+            return "multi-success";
+        });
 
-		assert.strictEqual(result, "multi-success");
-		assert.strictEqual(executionCount, 1);
-	});
+        assert.strictEqual(result, "multi-success");
+        assert.strictEqual(executionCount, 1);
+    });
 
-	it("should sort multiple keys to prevent deadlocks", async () => {
-		const executionOrder: string[] = [];
+    it("should sort multiple keys to prevent deadlocks", async () => {
+        const executionOrder: string[] = [];
 
-		// Start two concurrent operations with keys in different orders
-		const promise1 = locks.withLock([testPath2, testPath], async () => {
-			executionOrder.push("operation1-start");
-			await sleep(50);
-			executionOrder.push("operation1-end");
-			return "result1";
-		});
+        // Start two concurrent operations with keys in different orders
+        const promise1 = locks.withLock([testPath2, testPath], async () => {
+            executionOrder.push("operation1-start");
+            await sleep(50);
+            executionOrder.push("operation1-end");
+            return "result1";
+        });
 
-		const promise2 = locks.withLock([testPath, testPath2], async () => {
-			executionOrder.push("operation2-start");
-			await sleep(50);
-			executionOrder.push("operation2-end");
-			return "result2";
-		});
+        const promise2 = locks.withLock([testPath, testPath2], async () => {
+            executionOrder.push("operation2-start");
+            await sleep(50);
+            executionOrder.push("operation2-end");
+            return "result2";
+        });
 
-		const [result1, result2] = await awaitAll([promise1, promise2]);
+        const [result1, result2] = await awaitAll([promise1, promise2]);
 
-		assert.strictEqual(result1, "result1");
-		assert.strictEqual(result2, "result2");
-		// One operation should complete entirely before the other starts
-		assert.deepStrictEqual(executionOrder, [
-			"operation1-start",
-			"operation1-end",
-			"operation2-start",
-			"operation2-end"
-		]);
-	});
+        assert.strictEqual(result1, "result1");
+        assert.strictEqual(result2, "result2");
+        // One operation should complete entirely before the other starts
+        assert.deepStrictEqual(executionOrder, [
+            "operation1-start",
+            "operation1-end",
+            "operation2-start",
+            "operation2-end"
+        ]);
+    });
 
-	it("should serialize access to same key", async () => {
-		const executionOrder: string[] = [];
+    it("should serialize access to same key", async () => {
+        const executionOrder: string[] = [];
 
-		const promise1 = locks.withLock(testPath, async () => {
-			executionOrder.push("operation1-start");
-			await sleep(50);
-			executionOrder.push("operation1-end");
-			return "result1";
-		});
+        const promise1 = locks.withLock(testPath, async () => {
+            executionOrder.push("operation1-start");
+            await sleep(50);
+            executionOrder.push("operation1-end");
+            return "result1";
+        });
 
-		const promise2 = locks.withLock(testPath, async () => {
-			executionOrder.push("operation2-start");
-			await sleep(30);
-			executionOrder.push("operation2-end");
-			return "result2";
-		});
+        const promise2 = locks.withLock(testPath, async () => {
+            executionOrder.push("operation2-start");
+            await sleep(30);
+            executionOrder.push("operation2-end");
+            return "result2";
+        });
 
-		const [result1, result2] = await awaitAll([promise1, promise2]);
+        const [result1, result2] = await awaitAll([promise1, promise2]);
 
-		assert.strictEqual(result1, "result1");
-		assert.strictEqual(result2, "result2");
-		assert.deepStrictEqual(executionOrder, [
-			"operation1-start",
-			"operation1-end",
-			"operation2-start",
-			"operation2-end"
-		]);
-	});
+        assert.strictEqual(result1, "result1");
+        assert.strictEqual(result2, "result2");
+        assert.deepStrictEqual(executionOrder, [
+            "operation1-start",
+            "operation1-end",
+            "operation2-start",
+            "operation2-end"
+        ]);
+    });
 
-	it("should allow concurrent access to different keys", async () => {
-		const executionOrder: string[] = [];
+    it("should allow concurrent access to different keys", async () => {
+        const executionOrder: string[] = [];
 
-		const promise1 = locks.withLock(testPath, async () => {
-			executionOrder.push("operation1-start");
-			await sleep(50);
+        const promise1 = locks.withLock(testPath, async () => {
+            executionOrder.push("operation1-start");
+            await sleep(50);
 
-			executionOrder.push("operation1-end");
-			return "result1";
-		});
+            executionOrder.push("operation1-end");
+            return "result1";
+        });
 
-		const promise2 = locks.withLock(testPath2, async () => {
-			executionOrder.push("operation2-start");
-			await sleep(30);
-			executionOrder.push("operation2-end");
-			return "result2";
-		});
+        const promise2 = locks.withLock(testPath2, async () => {
+            executionOrder.push("operation2-start");
+            await sleep(30);
+            executionOrder.push("operation2-end");
+            return "result2";
+        });
 
-		const [result1, result2] = await awaitAll([promise1, promise2]);
+        const [result1, result2] = await awaitAll([promise1, promise2]);
 
-		assert.strictEqual(result1, "result1");
-		assert.strictEqual(result2, "result2");
-		// Both operations should run concurrently
-		assert.strictEqual(executionOrder[0], "operation1-start");
-		assert.strictEqual(executionOrder[1], "operation2-start");
-	});
+        assert.strictEqual(result1, "result1");
+        assert.strictEqual(result2, "result2");
+        // Both operations should run concurrently
+        assert.strictEqual(executionOrder[0], "operation1-start");
+        assert.strictEqual(executionOrder[1], "operation2-start");
+    });
 
-	it("should release locks even if function throws", async () => {
-		const error = new Error("test error");
+    it("should release locks even if function throws", async () => {
+        const error = new Error("test error");
 
-		await assert.rejects(
-			locks.withLock(testPath, () => {
-				throw error;
-			}),
-			{ message: "test error" }
-		);
+        await assert.rejects(
+            locks.withLock(testPath, () => {
+                throw error;
+            }),
+            { message: "test error" }
+        );
 
-		// Lock should be released, allowing another operation
-		const result = await locks.withLock(
-			testPath,
-			() => "success-after-error"
-		);
-		assert.strictEqual(result, "success-after-error");
-	});
+        // Lock should be released, allowing another operation
+        const result = await locks.withLock(
+            testPath,
+            () => "success-after-error"
+        );
+        assert.strictEqual(result, "success-after-error");
+    });
 
-	it("should release locks even if async function throws", async () => {
-		const error = new Error("async test error");
+    it("should release locks even if async function throws", async () => {
+        const error = new Error("async test error");
 
-		await assert.rejects(
-			locks.withLock(testPath, async () => {
-				await sleep(10);
+        await assert.rejects(
+            locks.withLock(testPath, async () => {
+                await sleep(10);
 
-				throw error;
-			}),
-			{ message: "async test error" }
-		);
+                throw error;
+            }),
+            { message: "async test error" }
+        );
 
-		// Lock should be released, allowing another operation
-		const result = await locks.withLock(
-			testPath,
-			() => "success-after-async-error"
-		);
-		assert.strictEqual(result, "success-after-async-error");
-	});
+        // Lock should be released, allowing another operation
+        const result = await locks.withLock(
+            testPath,
+            () => "success-after-async-error"
+        );
+        assert.strictEqual(result, "success-after-async-error");
+    });
 
-	it("should handle empty array of keys", async () => {
-		const result = await locks.withLock([], () => "empty-keys");
-		assert.strictEqual(result, "empty-keys");
-	});
+    it("should handle empty array of keys", async () => {
+        const result = await locks.withLock([], () => "empty-keys");
+        assert.strictEqual(result, "empty-keys");
+    });
 
-	it("should maintain FIFO order for multiple waiters", async () => {
-		const executionOrder: string[] = [];
+    it("should maintain FIFO order for multiple waiters", async () => {
+        const executionOrder: string[] = [];
 
-		// Start first operation that holds the lock
-		const firstPromise = locks.withLock(testPath, async () => {
-			executionOrder.push("first-start");
-			await sleep(100);
-			executionOrder.push("first-end");
-			return "first";
-		});
+        // Start first operation that holds the lock
+        const firstPromise = locks.withLock(testPath, async () => {
+            executionOrder.push("first-start");
+            await sleep(100);
+            executionOrder.push("first-end");
+            return "first";
+        });
 
-		// Small delay to ensure first operation starts
-		await sleep(10);
+        // Small delay to ensure first operation starts
+        await sleep(10);
 
-		// Queue second and third operations
-		const secondPromise = locks.withLock(testPath, async () => {
-			executionOrder.push("second-start");
-			await sleep(50);
-			executionOrder.push("second-end");
-			return "second";
-		});
+        // Queue second and third operations
+        const secondPromise = locks.withLock(testPath, async () => {
+            executionOrder.push("second-start");
+            await sleep(50);
+            executionOrder.push("second-end");
+            return "second";
+        });
 
-		const thirdPromise = locks.withLock(testPath, async () => {
-			executionOrder.push("third-start");
-			await sleep(20);
-			executionOrder.push("third-end");
-			return "third";
-		});
+        const thirdPromise = locks.withLock(testPath, async () => {
+            executionOrder.push("third-start");
+            await sleep(20);
+            executionOrder.push("third-end");
+            return "third";
+        });
 
-		const [first, second, third] = await awaitAll([
-			firstPromise,
-			secondPromise,
-			thirdPromise
-		]);
+        const [first, second, third] = await awaitAll([
+            firstPromise,
+            secondPromise,
+            thirdPromise
+        ]);
 
-		assert.strictEqual(first, "first");
-		assert.strictEqual(second, "second");
-		assert.strictEqual(third, "third");
-		assert.deepStrictEqual(executionOrder, [
-			"first-start",
-			"first-end",
-			"second-start",
-			"second-end",
-			"third-start",
-			"third-end"
-		]);
-	});
+        assert.strictEqual(first, "first");
+        assert.strictEqual(second, "second");
+        assert.strictEqual(third, "third");
+        assert.deepStrictEqual(executionOrder, [
+            "first-start",
+            "first-end",
+            "second-start",
+            "second-end",
+            "third-start",
+            "third-end"
+        ]);
+    });
 });
diff --git a/frontend/sync-client/src/utils/data-structures/locks.ts b/frontend/sync-client/src/utils/data-structures/locks.ts
index fccccf8c..8ad60429 100644
--- a/frontend/sync-client/src/utils/data-structures/locks.ts
+++ b/frontend/sync-client/src/utils/data-structures/locks.ts
@@ -8,148 +8,148 @@ import { awaitAll } from "../await-all";
  * @template T The type of the key used for locking
  */
 export class Locks<T> {
-	/** Currently locked keys */
-	private readonly locked = new Set<T>();
+    /** Currently locked keys */
+    private readonly locked = new Set<T>();
 
-	/** Queue of resolve functions waiting for each key */
-	private readonly waiters = new Map<T, (() => unknown)[]>();
+    /** Queue of resolve functions waiting for each key */
+    private readonly waiters = new Map<T, (() => unknown)[]>();
 
-	public constructor(private readonly logger?: Logger) {}
+    public constructor(private readonly logger?: Logger) {}
 
-	/**
-	 * Executes a function while holding exclusive locks on one or more keys.
-	 *
-	 * This method ensures that the provided function runs with exclusive access to the
-	 * specified key(s). Multiple keys are sorted to prevent deadlocks when different
-	 * operations request the same keys in different orders.
-	 *
-	 * @template R The return type of the function to execute
-	 * @param keyOrKeys A single key or array of keys to lock during function execution
-	 * @param fn The function to execute while holding the lock(s). Can be sync or async.
-	 * @returns A Promise that resolves to the return value of the executed function
-	 *
-	 * @example
-	 * ```typescript
-	 * // Lock a single key
-	 * const result = await locks.withLock('file1', () => {
-	 *   // Critical section - only one operation can access 'file1' at a time
-	 *   return processFile('file1');
-	 * });
-	 *
-	 * // Lock multiple keys (prevents deadlocks through consistent ordering)
-	 * await locks.withLock(['file1', 'file2'], async () => {
-	 *   // Critical section - exclusive access to both files
-	 *   await moveFile('file1', 'file2');
-	 * });
-	 * ```
-	 *
-	 * @throws Any error thrown by the provided function will be propagated after locks are released
-	 */
-	public async withLock<R>(
-		keyOrKeys: T | T[],
-		fn: () => R | Promise<R>
-	): Promise<R> {
-		const keys = Array.isArray(keyOrKeys) ? keyOrKeys : [keyOrKeys];
+    /**
+    * Executes a function while holding exclusive locks on one or more keys.
+    *
+    * This method ensures that the provided function runs with exclusive access to the
+    * specified key(s). Multiple keys are sorted to prevent deadlocks when different
+    * operations request the same keys in different orders.
+    *
+    * @template R The return type of the function to execute
+    * @param keyOrKeys A single key or array of keys to lock during function execution
+    * @param fn The function to execute while holding the lock(s). Can be sync or async.
+    * @returns A Promise that resolves to the return value of the executed function
+    *
+    * @example
+    * ```typescript
+    * // Lock a single key
+    * const result = await locks.withLock('file1', () => {
+    *   // Critical section - only one operation can access 'file1' at a time
+    *   return processFile('file1');
+    * });
+    *
+    * // Lock multiple keys (prevents deadlocks through consistent ordering)
+    * await locks.withLock(['file1', 'file2'], async () => {
+    *   // Critical section - exclusive access to both files
+    *   await moveFile('file1', 'file2');
+    * });
+    * ```
+    *
+    * @throws Any error thrown by the provided function will be propagated after locks are released
+    */
+    public async withLock<R>(
+        keyOrKeys: T | T[],
+        fn: () => R | Promise<R>
+    ): Promise<R> {
+        const keys = Array.isArray(keyOrKeys) ? keyOrKeys : [keyOrKeys];
 
-		// Deduplicate keys to prevent deadlock from acquiring same lock twice
-		const uniqueKeys = Array.from(new Set(keys));
-		uniqueKeys.sort((a, b) => String(a).localeCompare(String(b))); // Ensure consistent order to prevent deadlocks
+        // Deduplicate keys to prevent deadlock from acquiring same lock twice
+        const uniqueKeys = Array.from(new Set(keys));
+        uniqueKeys.sort((a, b) => String(a).localeCompare(String(b))); // Ensure consistent order to prevent deadlocks
 
-		await awaitAll(uniqueKeys.map(async (key) => this.waitForLock(key)));
+        await awaitAll(uniqueKeys.map(async (key) => this.waitForLock(key)));
 
-		try {
-			return await fn();
-		} finally {
-			uniqueKeys.forEach((key) => {
-				this.unlock(key);
-			});
-		}
-	}
+        try {
+            return await fn();
+        } finally {
+            uniqueKeys.forEach((key) => {
+                this.unlock(key);
+            });
+        }
+    }
 
-	public reset(): void {
-		this.locked.clear();
-		this.waiters.clear();
-	}
+    public reset(): void {
+        this.locked.clear();
+        this.waiters.clear();
+    }
 
-	/**
-	 * Attempts to acquire a lock immediately without waiting.
-	 * Must call `unlock()` if successful.
-	 *
-	 * @param key The key to lock
-	 * @returns `true` if lock acquired, `false` if already locked
-	 */
-	public tryLock(key: T): boolean {
-		if (this.locked.has(key)) {
-			return false;
-		}
+    /**
+    * Attempts to acquire a lock immediately without waiting.
+    * Must call `unlock()` if successful.
+    *
+    * @param key The key to lock
+    * @returns `true` if lock acquired, `false` if already locked
+    */
+    public tryLock(key: T): boolean {
+        if (this.locked.has(key)) {
+            return false;
+        }
 
-		this.locked.add(key);
+        this.locked.add(key);
 
-		return true;
-	}
+        return true;
+    }
 
-	/**
-	 * Waits to acquire a lock, blocking until available.
-	 * Operations are queued in FIFO order. Must call `unlock()` when done.
-	 *
-	 * @param key The key to wait for and lock
-	 * @returns Promise that resolves when lock is acquired
-	 */
-	public async waitForLock(key: T): Promise<void> {
-		if (this.tryLock(key)) {
-			return Promise.resolve();
-		}
+    /**
+    * Waits to acquire a lock, blocking until available.
+    * Operations are queued in FIFO order. Must call `unlock()` when done.
+    *
+    * @param key The key to wait for and lock
+    * @returns Promise that resolves when lock is acquired
+    */
+    public async waitForLock(key: T): Promise<void> {
+        if (this.tryLock(key)) {
+            return Promise.resolve();
+        }
 
-		this.logger?.debug(`Waiting for lock on ${key}`);
+        this.logger?.debug(`Waiting for lock on ${key}`);
 
-		return new Promise((resolve) => {
-			// DefaultDict behavior
-			let waiting = this.waiters.get(key);
-			if (!waiting) {
-				waiting = [];
-				this.waiters.set(key, waiting);
-			}
+        return new Promise((resolve) => {
+            // DefaultDict behavior
+            let waiting = this.waiters.get(key);
+            if (!waiting) {
+                waiting = [];
+                this.waiters.set(key, waiting);
+            }
 
-			waiting.push(resolve);
-		});
-	}
+            waiting.push(resolve);
+        });
+    }
 
-	/**
-	 * Releases a lock and grants access to the next waiting operation in FIFO order.
-	 * Removes the key from locked set if no waiters.
-	 *
-	 * @param key The key to unlock
-	 * @throws {Error} If key is not currently locked
-	 */
-	public unlock(key: T): void {
-		if (!this.locked.has(key)) {
-			return;
-		}
+    /**
+    * Releases a lock and grants access to the next waiting operation in FIFO order.
+    * Removes the key from locked set if no waiters.
+    *
+    * @param key The key to unlock
+    * @throws {Error} If key is not currently locked
+    */
+    public unlock(key: T): void {
+        if (!this.locked.has(key)) {
+            return;
+        }
 
-		// Remove first waiter to ensure FIFO order
-		const nextWaiting = this.waiters.get(key)?.shift();
+        // Remove first waiter to ensure FIFO order
+        const nextWaiting = this.waiters.get(key)?.shift();
 
-		if (nextWaiting) {
-			this.logger?.debug(`Granted lock on ${key}`);
-			nextWaiting();
-		} else {
-			this.locked.delete(key);
-		}
-	}
+        if (nextWaiting) {
+            this.logger?.debug(`Granted lock on ${key}`);
+            nextWaiting();
+        } else {
+            this.locked.delete(key);
+        }
+    }
 }
 
 export class Lock {
-	private readonly locks: Locks<boolean>;
+    private readonly locks: Locks<boolean>;
 
-	public constructor(logger?: Logger) {
-		this.locks = new Locks(logger);
-	}
+    public constructor(logger?: Logger) {
+        this.locks = new Locks(logger);
+    }
 
-	public async withLock<R>(fn: () => R | Promise<R>): Promise<R> {
-		return this.locks.withLock(true, fn);
-	}
+    public async withLock<R>(fn: () => R | Promise<R>): Promise<R> {
+        return this.locks.withLock(true, fn);
+    }
 
-	public reset(): void {
-		this.locks.reset();
-	}
+    public reset(): void {
+        this.locks.reset();
+    }
 }
diff --git a/frontend/sync-client/src/utils/data-structures/min-covered.test.ts b/frontend/sync-client/src/utils/data-structures/min-covered.test.ts
index 1bbd1425..7b7271d7 100644
--- a/frontend/sync-client/src/utils/data-structures/min-covered.test.ts
+++ b/frontend/sync-client/src/utils/data-structures/min-covered.test.ts
@@ -3,74 +3,74 @@ import assert from "node:assert";
 import { CoveredValues } from "./min-covered";
 
 describe("CoveredValues", () => {
-	it("should initialize with the given min value", () => {
-		const covered = new CoveredValues(5);
-		assert.strictEqual(covered.min, 5);
-	});
+    it("should initialize with the given min value", () => {
+        const covered = new CoveredValues(5);
+        assert.strictEqual(covered.min, 5);
+    });
 
-	it("should add values greater than min", () => {
-		const covered = new CoveredValues(0);
-		covered.add(3);
-		assert.strictEqual(covered.min, 0);
-		covered.add(1);
-		assert.strictEqual(covered.min, 1);
-		covered.add(4);
-		assert.strictEqual(covered.min, 1);
-		covered.add(2);
-		assert.strictEqual(covered.min, 4);
-	});
+    it("should add values greater than min", () => {
+        const covered = new CoveredValues(0);
+        covered.add(3);
+        assert.strictEqual(covered.min, 0);
+        covered.add(1);
+        assert.strictEqual(covered.min, 1);
+        covered.add(4);
+        assert.strictEqual(covered.min, 1);
+        covered.add(2);
+        assert.strictEqual(covered.min, 4);
+    });
 
-	it("should ignore duplicate values", () => {
-		const covered = new CoveredValues(0);
-		covered.add(3);
-		covered.add(3);
-		covered.add(3);
-		assert.strictEqual(covered.min, 0);
-		covered.add(1);
-		covered.add(2);
-		assert.strictEqual(covered.min, 3);
-	});
+    it("should ignore duplicate values", () => {
+        const covered = new CoveredValues(0);
+        covered.add(3);
+        covered.add(3);
+        covered.add(3);
+        assert.strictEqual(covered.min, 0);
+        covered.add(1);
+        covered.add(2);
+        assert.strictEqual(covered.min, 3);
+    });
 
-	it("should handle multiple consecutive values", () => {
-		const covered = new CoveredValues(132);
-		for (let i = 250; i > 132; i--) {
-			assert.strictEqual(covered.min, 132);
-			covered.add(i);
-		}
-		assert.strictEqual(covered.min, 250);
-	});
+    it("should handle multiple consecutive values", () => {
+        const covered = new CoveredValues(132);
+        for (let i = 250; i > 132; i--) {
+            assert.strictEqual(covered.min, 132);
+            covered.add(i);
+        }
+        assert.strictEqual(covered.min, 250);
+    });
 
-	it("should handle adding values lower than current min", () => {
-		const covered = new CoveredValues(5);
-		covered.add(3);
-		assert.strictEqual(covered.min, 5);
-		covered.add(6);
-		assert.strictEqual(covered.min, 6);
-	});
+    it("should handle adding values lower than current min", () => {
+        const covered = new CoveredValues(5);
+        covered.add(3);
+        assert.strictEqual(covered.min, 5);
+        covered.add(6);
+        assert.strictEqual(covered.min, 6);
+    });
 
-	it("should auto-advance when setting min value", () => {
-		const covered = new CoveredValues(5);
-		covered.add(7);
-		covered.add(8);
-		covered.add(9);
-		assert.strictEqual(covered.min, 5);
-		// Setting min to 6 should auto-advance through 7, 8, 9
-		covered.min = 6;
-		assert.strictEqual(covered.min, 9);
-		covered.add(10);
-		assert.strictEqual(covered.min, 10);
-	});
+    it("should auto-advance when setting min value", () => {
+        const covered = new CoveredValues(5);
+        covered.add(7);
+        covered.add(8);
+        covered.add(9);
+        assert.strictEqual(covered.min, 5);
+        // Setting min to 6 should auto-advance through 7, 8, 9
+        covered.min = 6;
+        assert.strictEqual(covered.min, 9);
+        covered.add(10);
+        assert.strictEqual(covered.min, 10);
+    });
 
-	it("should handle setting min value with no consecutive values", () => {
-		const covered = new CoveredValues(5);
-		covered.add(10);
-		covered.add(15);
-		assert.strictEqual(covered.min, 5);
-		// Setting min to 8 should not auto-advance (no consecutive values)
-		covered.min = 8;
-		assert.strictEqual(covered.min, 8);
-		// Add 9 to trigger auto-advance to 10
-		covered.add(9);
-		assert.strictEqual(covered.min, 10);
-	});
+    it("should handle setting min value with no consecutive values", () => {
+        const covered = new CoveredValues(5);
+        covered.add(10);
+        covered.add(15);
+        assert.strictEqual(covered.min, 5);
+        // Setting min to 8 should not auto-advance (no consecutive values)
+        covered.min = 8;
+        assert.strictEqual(covered.min, 8);
+        // Add 9 to trigger auto-advance to 10
+        covered.add(9);
+        assert.strictEqual(covered.min, 10);
+    });
 });
diff --git a/frontend/sync-client/src/utils/data-structures/min-covered.ts b/frontend/sync-client/src/utils/data-structures/min-covered.ts
index be480597..8b38822f 100644
--- a/frontend/sync-client/src/utils/data-structures/min-covered.ts
+++ b/frontend/sync-client/src/utils/data-structures/min-covered.ts
@@ -14,48 +14,48 @@
  * ```
  */
 export class CoveredValues {
-	private seenValues: number[] = [];
+    private seenValues: number[] = [];
 
-	public constructor(private minValue: number) {}
+    public constructor(private minValue: number) {}
 
-	public get min(): number {
-		return this.minValue;
-	}
+    public get min(): number {
+        return this.minValue;
+    }
 
-	public set min(value: number) {
-		this.minValue = Math.max(value, this.minValue);
-		this.seenValues = this.seenValues.filter((v) => v > this.minValue);
-		this.advanceMinWhilePossible();
-	}
+    public set min(value: number) {
+        this.minValue = Math.max(value, this.minValue);
+        this.seenValues = this.seenValues.filter((v) => v > this.minValue);
+        this.advanceMinWhilePossible();
+    }
 
-	public add(value: number | undefined): void {
-		if (value === undefined || value < this.minValue) {
-			return;
-		}
+    public add(value: number | undefined): void {
+        if (value === undefined || value < this.minValue) {
+            return;
+        }
 
-		let i = 0;
-		while (i < this.seenValues.length && this.seenValues[i] < value) {
-			i++;
-		}
+        let i = 0;
+        while (i < this.seenValues.length && this.seenValues[i] < value) {
+            i++;
+        }
 
-		if (i === this.seenValues.length) {
-			this.seenValues.push(value);
-		} else if (this.seenValues[i] === value) {
-			return;
-		} else {
-			this.seenValues.splice(i, 0, value);
-		}
+        if (i === this.seenValues.length) {
+            this.seenValues.push(value);
+        } else if (this.seenValues[i] === value) {
+            return;
+        } else {
+            this.seenValues.splice(i, 0, value);
+        }
 
-		this.advanceMinWhilePossible();
-	}
+        this.advanceMinWhilePossible();
+    }
 
-	private advanceMinWhilePossible(): void {
-		while (
-			this.seenValues.length > 0 &&
-			this.seenValues[0] === this.minValue + 1
-		) {
-			this.seenValues.shift();
-			this.minValue++;
-		}
-	}
+    private advanceMinWhilePossible(): void {
+        while (
+            this.seenValues.length > 0 &&
+            this.seenValues[0] === this.minValue + 1
+        ) {
+            this.seenValues.shift();
+            this.minValue++;
+        }
+    }
 }
diff --git a/frontend/sync-client/src/utils/debugging/log-to-console.ts b/frontend/sync-client/src/utils/debugging/log-to-console.ts
index 3499f029..c47f18f6 100644
--- a/frontend/sync-client/src/utils/debugging/log-to-console.ts
+++ b/frontend/sync-client/src/utils/debugging/log-to-console.ts
@@ -3,22 +3,22 @@ import type { LogLine } from "../../tracing/logger";
 import { LogLevel } from "../../tracing/logger";
 
 export function logToConsole(client: SyncClient): void {
-	client.logger.onLogEmitted.add((logLine: LogLine) => {
-		const formatted = `${logLine.timestamp.toISOString()} ${logLine.level} ${logLine.message}`;
+    client.logger.onLogEmitted.add((logLine: LogLine) => {
+        const formatted = `${logLine.timestamp.toISOString()} ${logLine.level} ${logLine.message}`;
 
-		switch (logLine.level) {
-			case LogLevel.ERROR:
-				console.error(formatted);
-				break;
-			case LogLevel.WARNING:
-				console.warn(formatted);
-				break;
-			case LogLevel.INFO:
-				console.info(formatted);
-				break;
-			case LogLevel.DEBUG:
-				console.debug(formatted);
-				break;
-		}
-	});
+        switch (logLine.level) {
+            case LogLevel.ERROR:
+                console.error(formatted);
+                break;
+            case LogLevel.WARNING:
+                console.warn(formatted);
+                break;
+            case LogLevel.INFO:
+                console.info(formatted);
+                break;
+            case LogLevel.DEBUG:
+                console.debug(formatted);
+                break;
+        }
+    });
 }
diff --git a/frontend/sync-client/src/utils/debugging/slow-fetch-factory.ts b/frontend/sync-client/src/utils/debugging/slow-fetch-factory.ts
index 4c2ddedb..e2908af0 100644
--- a/frontend/sync-client/src/utils/debugging/slow-fetch-factory.ts
+++ b/frontend/sync-client/src/utils/debugging/slow-fetch-factory.ts
@@ -1,20 +1,20 @@
 import { sleep } from "../sleep";
 
 export const slowFetchFactory =
-	(jitterScaleInSeconds: number) =>
-	async (
-		input: string | URL | globalThis.Request,
-		init?: RequestInit
-	): Promise<Response> => {
-		if (jitterScaleInSeconds > 0) {
-			await sleep(((Math.random() * jitterScaleInSeconds) / 2) * 1000);
-		}
+    (jitterScaleInSeconds: number) =>
+    async (
+        input: string | URL | globalThis.Request,
+        init?: RequestInit
+    ): Promise<Response> => {
+        if (jitterScaleInSeconds > 0) {
+            await sleep(((Math.random() * jitterScaleInSeconds) / 2) * 1000);
+        }
 
-		const response = await fetch(input, init);
+        const response = await fetch(input, init);
 
-		if (jitterScaleInSeconds > 0) {
-			await sleep(((Math.random() * jitterScaleInSeconds) / 2) * 1000);
-		}
+        if (jitterScaleInSeconds > 0) {
+            await sleep(((Math.random() * jitterScaleInSeconds) / 2) * 1000);
+        }
 
-		return response;
-	};
+        return response;
+    };
diff --git a/frontend/sync-client/src/utils/debugging/slow-web-socket-factory.ts b/frontend/sync-client/src/utils/debugging/slow-web-socket-factory.ts
index e52ff76b..c64bff18 100644
--- a/frontend/sync-client/src/utils/debugging/slow-web-socket-factory.ts
+++ b/frontend/sync-client/src/utils/debugging/slow-web-socket-factory.ts
@@ -3,79 +3,79 @@ import { Locks } from "../data-structures/locks";
 import type { Logger } from "../../tracing/logger";
 
 export function slowWebSocketFactory(
-	jitterScaleInSeconds: number,
-	logger: Logger
+    jitterScaleInSeconds: number,
+    logger: Logger
 ): typeof WebSocket {
-	// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-	return class FlakyWebSocket extends WebSocket {
-		private static readonly RECEIVE_KEY = "websocket-receive";
-		private static readonly SEND_KEY = "websocket-send";
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+    return class FlakyWebSocket extends WebSocket {
+        private static readonly RECEIVE_KEY = "websocket-receive";
+        private static readonly SEND_KEY = "websocket-send";
 
-		private readonly locks = new Locks(logger);
+        private readonly locks = new Locks(logger);
 
-		public set onopen(callback: ((event: Event) => void) | null) {
-			super.onopen = async (event: Event): Promise<void> => {
-				if (jitterScaleInSeconds > 0) {
-					await sleep(Math.random() * jitterScaleInSeconds * 1000);
-				}
+        public set onopen(callback: ((event: Event) => void) | null) {
+            super.onopen = async (event: Event): Promise<void> => {
+                if (jitterScaleInSeconds > 0) {
+                    await sleep(Math.random() * jitterScaleInSeconds * 1000);
+                }
 
-				callback?.(event);
-			};
-		}
+                callback?.(event);
+            };
+        }
 
-		public set onmessage(callback: ((event: MessageEvent) => void) | null) {
-			super.onmessage = async (event: MessageEvent): Promise<void> => {
-				await this.locks.withLock(
-					FlakyWebSocket.RECEIVE_KEY,
-					async () => {
-						if (jitterScaleInSeconds > 0) {
-							await sleep(
-								Math.random() * jitterScaleInSeconds * 1000
-							);
-						}
+        public set onmessage(callback: ((event: MessageEvent) => void) | null) {
+            super.onmessage = async (event: MessageEvent): Promise<void> => {
+                await this.locks.withLock(
+                    FlakyWebSocket.RECEIVE_KEY,
+                    async () => {
+                        if (jitterScaleInSeconds > 0) {
+                            await sleep(
+                                Math.random() * jitterScaleInSeconds * 1000
+                            );
+                        }
 
-						callback?.(event);
-					}
-				);
-			};
-		}
+                        callback?.(event);
+                    }
+                );
+            };
+        }
 
-		public set onclose(callback: ((event: CloseEvent) => void) | null) {
-			super.onclose = async (event: CloseEvent): Promise<void> => {
-				if (jitterScaleInSeconds > 0) {
-					await sleep(Math.random() * jitterScaleInSeconds * 1000);
-				}
-				callback?.(event);
-			};
-		}
+        public set onclose(callback: ((event: CloseEvent) => void) | null) {
+            super.onclose = async (event: CloseEvent): Promise<void> => {
+                if (jitterScaleInSeconds > 0) {
+                    await sleep(Math.random() * jitterScaleInSeconds * 1000);
+                }
+                callback?.(event);
+            };
+        }
 
-		public set onerror(callback: ((event: Event) => void) | null) {
-			super.onerror = async (event: Event): Promise<void> => {
-				if (jitterScaleInSeconds > 0) {
-					await sleep(Math.random() * jitterScaleInSeconds * 1000);
-				}
-				callback?.(event);
-			};
-		}
+        public set onerror(callback: ((event: Event) => void) | null) {
+            super.onerror = async (event: Event): Promise<void> => {
+                if (jitterScaleInSeconds > 0) {
+                    await sleep(Math.random() * jitterScaleInSeconds * 1000);
+                }
+                callback?.(event);
+            };
+        }
 
-		public send(
-			data: string | ArrayBufferLike | Blob | ArrayBufferView
-		): void {
-			this.waitingSend(data).catch((error: unknown) => {
-				logger.error(`Error sending WebSocket message: ${error}`);
-			});
-		}
+        public send(
+            data: string | ArrayBufferLike | Blob | ArrayBufferView
+        ): void {
+            this.waitingSend(data).catch((error: unknown) => {
+                logger.error(`Error sending WebSocket message: ${error}`);
+            });
+        }
 
-		private async waitingSend(
-			data: string | ArrayBufferLike | Blob | ArrayBufferView
-		): Promise<void> {
-			// maintain message order
-			await this.locks.withLock(FlakyWebSocket.SEND_KEY, async () => {
-				if (jitterScaleInSeconds > 0) {
-					await sleep(Math.random() * jitterScaleInSeconds * 1000);
-				}
-				super.send(data);
-			});
-		}
-	} as unknown as typeof WebSocket;
+        private async waitingSend(
+            data: string | ArrayBufferLike | Blob | ArrayBufferView
+        ): Promise<void> {
+            // maintain message order
+            await this.locks.withLock(FlakyWebSocket.SEND_KEY, async () => {
+                if (jitterScaleInSeconds > 0) {
+                    await sleep(Math.random() * jitterScaleInSeconds * 1000);
+                }
+                super.send(data);
+            });
+        }
+    } as unknown as typeof WebSocket;
 }
diff --git a/frontend/sync-client/src/utils/find-matching-file.ts b/frontend/sync-client/src/utils/find-matching-file.ts
index 10545f2c..c3d323d3 100644
--- a/frontend/sync-client/src/utils/find-matching-file.ts
+++ b/frontend/sync-client/src/utils/find-matching-file.ts
@@ -3,12 +3,12 @@ import { EMPTY_HASH } from "./hash";
 
 // TODO: make this smarter so that offline files can be renamed & edited at the same time
 export function findMatchingFile(
-	contentHash: string,
-	candidates: DocumentRecord[]
+    contentHash: string,
+    candidates: DocumentRecord[]
 ): DocumentRecord | undefined {
-	if (contentHash === EMPTY_HASH) {
-		return undefined;
-	}
+    if (contentHash === EMPTY_HASH) {
+        return undefined;
+    }
 
-	return candidates.find(({ metadata }) => metadata?.hash === contentHash);
+    return candidates.find(({ metadata }) => metadata?.hash === contentHash);
 }
diff --git a/frontend/sync-client/src/utils/get-random-color.ts b/frontend/sync-client/src/utils/get-random-color.ts
index 543b943e..38015734 100644
--- a/frontend/sync-client/src/utils/get-random-color.ts
+++ b/frontend/sync-client/src/utils/get-random-color.ts
@@ -1,9 +1,9 @@
 export function getRandomColor(name: string): string {
-	let hash = 0;
-	for (let i = 0; i < name.length; i++) {
-		hash = (hash << 5) - hash + name.charCodeAt(i);
-		hash |= 0; // Convert to 32bit integer
-	}
-	const normalised = hash / 0x7fffffff;
-	return `oklch(0.58 0.15 ${Math.round(Math.abs(normalised * 360))})`;
+    let hash = 0;
+    for (let i = 0; i < name.length; i++) {
+        hash = (hash << 5) - hash + name.charCodeAt(i);
+        hash |= 0; // Convert to 32bit integer
+    }
+    const normalised = hash / 0x7fffffff;
+    return `oklch(0.58 0.15 ${Math.round(Math.abs(normalised * 360))})`;
 }
diff --git a/frontend/sync-client/src/utils/globs-to-regexes.test.ts b/frontend/sync-client/src/utils/globs-to-regexes.test.ts
index 3e986ca4..f2b11787 100644
--- a/frontend/sync-client/src/utils/globs-to-regexes.test.ts
+++ b/frontend/sync-client/src/utils/globs-to-regexes.test.ts
@@ -4,10 +4,10 @@ import { Logger } from "../tracing/logger";
 import { globsToRegexes } from "./globs-to-regexes";
 
 describe("globsToRegexes", () => {
-	it("basicExample", async () => {
-		const [regex] = globsToRegexes([".git/**"], new Logger());
+    it("basicExample", async () => {
+        const [regex] = globsToRegexes([".git/**"], new Logger());
 
-		assert.ok(regex.test(".git/objects/object"));
-		assert.ok(regex.test(".git/objects/.object"));
-	});
+        assert.ok(regex.test(".git/objects/object"));
+        assert.ok(regex.test(".git/objects/.object"));
+    });
 });
diff --git a/frontend/sync-client/src/utils/globs-to-regexes.ts b/frontend/sync-client/src/utils/globs-to-regexes.ts
index 5b8bf062..1cd048d3 100644
--- a/frontend/sync-client/src/utils/globs-to-regexes.ts
+++ b/frontend/sync-client/src/utils/globs-to-regexes.ts
@@ -2,20 +2,20 @@ import { makeRe } from "minimatch";
 import type { Logger } from "../tracing/logger";
 
 export function globsToRegexes(globs: string[], logger: Logger): RegExp[] {
-	return (
-		globs
-			.map((pattern) => {
-				const result = makeRe(pattern, {
-					dot: true
-				});
-				if (result === false) {
-					logger.warn(
-						`Failed to parse ${pattern}' as a glob pattern, skipping it`
-					);
-				}
-				return result;
-			})
-			// eslint-disable-next-line no-restricted-syntax -- Filtering out false values, not removing a specific item
-			.filter((pattern) => pattern !== false)
-	);
+    return (
+        globs
+            .map((pattern) => {
+                const result = makeRe(pattern, {
+                    dot: true
+                });
+                if (result === false) {
+                    logger.warn(
+                        `Failed to parse ${pattern}' as a glob pattern, skipping it`
+                    );
+                }
+                return result;
+            })
+            // eslint-disable-next-line no-restricted-syntax -- Filtering out false values, not removing a specific item
+            .filter((pattern) => pattern !== false)
+    );
 }
diff --git a/frontend/sync-client/src/utils/hash.ts b/frontend/sync-client/src/utils/hash.ts
index cd965db5..906b6fad 100644
--- a/frontend/sync-client/src/utils/hash.ts
+++ b/frontend/sync-client/src/utils/hash.ts
@@ -1,12 +1,12 @@
 // https://stackoverflow.com/questions/7616461/generate-a-hash-from-string-in-javascript
 export function hash(content: Uint8Array): string {
-	let result = 0;
-	// eslint-disable-next-line @typescript-eslint/prefer-for-of
-	for (let i = 0; i < content.length; i++) {
-		result = (result << 5) - result + content[i];
-		result |= 0; // Convert to 32bit integer
-	}
-	return Math.abs(result).toString(16).padStart(8, "0");
+    let result = 0;
+    // eslint-disable-next-line @typescript-eslint/prefer-for-of
+    for (let i = 0; i < content.length; i++) {
+        result = (result << 5) - result + content[i];
+        result |= 0; // Convert to 32bit integer
+    }
+    return Math.abs(result).toString(16).padStart(8, "0");
 }
 
 export const EMPTY_HASH = hash(new Uint8Array(0));
diff --git a/frontend/sync-client/src/utils/is-binary.ts b/frontend/sync-client/src/utils/is-binary.ts
index 9e2de954..aac92711 100644
--- a/frontend/sync-client/src/utils/is-binary.ts
+++ b/frontend/sync-client/src/utils/is-binary.ts
@@ -1,16 +1,16 @@
 // Text is unlikely to contain null bytes, so we can use that to distinguish binary files.
 export function isBinary(content: Uint8Array): boolean {
-	for (const byte of content) {
-		if (byte === 0) {
-			return true;
-		}
-	}
+    for (const byte of content) {
+        if (byte === 0) {
+            return true;
+        }
+    }
 
-	try {
-		new TextDecoder("utf-8", { fatal: true }).decode(content);
-	} catch {
-		return true;
-	}
+    try {
+        new TextDecoder("utf-8", { fatal: true }).decode(content);
+    } catch {
+        return true;
+    }
 
-	return false;
+    return false;
 }
diff --git a/frontend/sync-client/src/utils/is-file-type-mergable.test.ts b/frontend/sync-client/src/utils/is-file-type-mergable.test.ts
index a2268d19..fd316588 100644
--- a/frontend/sync-client/src/utils/is-file-type-mergable.test.ts
+++ b/frontend/sync-client/src/utils/is-file-type-mergable.test.ts
@@ -4,70 +4,70 @@ import { isFileTypeMergable } from "./is-file-type-mergable";
 
 const mergableExtensions = ["md", "txt"];
 describe("isFileTypeMergable", () => {
-	it("should return true for .md files", () => {
-		assert.strictEqual(isFileTypeMergable(".md", mergableExtensions), true);
-		assert.strictEqual(
-			isFileTypeMergable("hi.md", mergableExtensions),
-			true
-		);
-		assert.strictEqual(
-			isFileTypeMergable("my/path/to/my/document.md", mergableExtensions),
-			true
-		);
-	});
+    it("should return true for .md files", () => {
+        assert.strictEqual(isFileTypeMergable(".md", mergableExtensions), true);
+        assert.strictEqual(
+            isFileTypeMergable("hi.md", mergableExtensions),
+            true
+        );
+        assert.strictEqual(
+            isFileTypeMergable("my/path/to/my/document.md", mergableExtensions),
+            true
+        );
+    });
 
-	it("should return true for .txt files", () => {
-		assert.strictEqual(
-			isFileTypeMergable(".txt", mergableExtensions),
-			true
-		);
-		assert.strictEqual(
-			isFileTypeMergable("hi.txt", mergableExtensions),
-			true
-		);
-		assert.strictEqual(
-			isFileTypeMergable(
-				"my/path/to/my/document.txt",
-				mergableExtensions
-			),
-			true
-		);
-	});
+    it("should return true for .txt files", () => {
+        assert.strictEqual(
+            isFileTypeMergable(".txt", mergableExtensions),
+            true
+        );
+        assert.strictEqual(
+            isFileTypeMergable("hi.txt", mergableExtensions),
+            true
+        );
+        assert.strictEqual(
+            isFileTypeMergable(
+                "my/path/to/my/document.txt",
+                mergableExtensions
+            ),
+            true
+        );
+    });
 
-	it("should be case insensitive", () => {
-		assert.strictEqual(
-			isFileTypeMergable("hi.MD", mergableExtensions),
-			true
-		);
-		assert.strictEqual(
-			isFileTypeMergable("my/path/to/my/DOCUMENT.MD", mergableExtensions),
-			true
-		);
-		assert.strictEqual(
-			isFileTypeMergable("hi.TXT", mergableExtensions),
-			true
-		);
-		assert.strictEqual(
-			isFileTypeMergable(
-				"my/path/to/my/DOCUMENT.TXT",
-				mergableExtensions
-			),
-			true
-		);
-	});
+    it("should be case insensitive", () => {
+        assert.strictEqual(
+            isFileTypeMergable("hi.MD", mergableExtensions),
+            true
+        );
+        assert.strictEqual(
+            isFileTypeMergable("my/path/to/my/DOCUMENT.MD", mergableExtensions),
+            true
+        );
+        assert.strictEqual(
+            isFileTypeMergable("hi.TXT", mergableExtensions),
+            true
+        );
+        assert.strictEqual(
+            isFileTypeMergable(
+                "my/path/to/my/DOCUMENT.TXT",
+                mergableExtensions
+            ),
+            true
+        );
+    });
 
-	it("should return false for non-mergable file types", () => {
-		assert.strictEqual(
-			isFileTypeMergable(".json", mergableExtensions),
-			false
-		);
-		assert.strictEqual(
-			isFileTypeMergable("HELLO.JSON", mergableExtensions),
-			false
-		);
-		assert.strictEqual(
-			isFileTypeMergable("my/config.yml", mergableExtensions),
-			false
-		);
-	});
+    it("should return false for non-mergable file types", () => {
+        assert.strictEqual(
+            isFileTypeMergable(".json", mergableExtensions),
+            false
+        );
+        assert.strictEqual(
+            isFileTypeMergable("HELLO.JSON", mergableExtensions),
+            false
+        );
+        assert.strictEqual(
+            isFileTypeMergable("my/config.yml", mergableExtensions),
+            false
+        );
+    });
 });
diff --git a/frontend/sync-client/src/utils/is-file-type-mergable.ts b/frontend/sync-client/src/utils/is-file-type-mergable.ts
index 4eec2733..a895b3e2 100644
--- a/frontend/sync-client/src/utils/is-file-type-mergable.ts
+++ b/frontend/sync-client/src/utils/is-file-type-mergable.ts
@@ -1,9 +1,9 @@
 export function isFileTypeMergable(
-	pathOrFileName: string,
-	mergeableExtensions: string[]
+    pathOrFileName: string,
+    mergeableExtensions: string[]
 ): boolean {
-	const parts = pathOrFileName.split(".");
-	const fileExtension = parts.at(-1) ?? "";
+    const parts = pathOrFileName.split(".");
+    const fileExtension = parts.at(-1) ?? "";
 
-	return mergeableExtensions.includes(fileExtension.toLowerCase());
+    return mergeableExtensions.includes(fileExtension.toLowerCase());
 }
diff --git a/frontend/sync-client/src/utils/line-and-column-to-position.test.ts b/frontend/sync-client/src/utils/line-and-column-to-position.test.ts
index 82d752c9..e597cc39 100644
--- a/frontend/sync-client/src/utils/line-and-column-to-position.test.ts
+++ b/frontend/sync-client/src/utils/line-and-column-to-position.test.ts
@@ -3,42 +3,42 @@ import assert from "node:assert";
 import { lineAndColumnToPosition } from "./line-and-column-to-position";
 
 describe("lineAndColumnToPosition", () => {
-	it("should return the correct position for the first line", () => {
-		const text = "Hello\nWorld";
-		const position = lineAndColumnToPosition(text, 0, 3);
-		assert.strictEqual(position, 3);
-	});
+    it("should return the correct position for the first line", () => {
+        const text = "Hello\nWorld";
+        const position = lineAndColumnToPosition(text, 0, 3);
+        assert.strictEqual(position, 3);
+    });
 
-	it("should return the correct position for the second line", () => {
-		const text = "Hello\nWorld";
-		const position = lineAndColumnToPosition(text, 1, 2);
-		assert.strictEqual(position, 8);
-	});
+    it("should return the correct position for the second line", () => {
+        const text = "Hello\nWorld";
+        const position = lineAndColumnToPosition(text, 1, 2);
+        assert.strictEqual(position, 8);
+    });
 
-	it("should return the correct position for an empty string", () => {
-		const text = "";
-		const position = lineAndColumnToPosition(text, 0, 0);
-		assert.strictEqual(position, 0);
-	});
+    it("should return the correct position for an empty string", () => {
+        const text = "";
+        const position = lineAndColumnToPosition(text, 0, 0);
+        assert.strictEqual(position, 0);
+    });
 
-	it("with carrige return", () => {
-		assert.strictEqual(lineAndColumnToPosition("a\nb", 1, 1), 3);
-		assert.strictEqual(lineAndColumnToPosition("a\r\nb", 1, 1), 3);
-	});
+    it("with carrige return", () => {
+        assert.strictEqual(lineAndColumnToPosition("a\nb", 1, 1), 3);
+        assert.strictEqual(lineAndColumnToPosition("a\r\nb", 1, 1), 3);
+    });
 
-	it("should handle multi-line strings with varying lengths", () => {
-		const text = "Line1\nLongerLine2\nShort3";
-		const position = lineAndColumnToPosition(text, 2, 4);
-		assert.strictEqual(position, 22);
-	});
+    it("should handle multi-line strings with varying lengths", () => {
+        const text = "Line1\nLongerLine2\nShort3";
+        const position = lineAndColumnToPosition(text, 2, 4);
+        assert.strictEqual(position, 22);
+    });
 
-	it("should throw an error if the line number is out of range", () => {
-		const text = "Line1\nLine2";
-		assert.throws(() => lineAndColumnToPosition(text, 3, 0));
-	});
+    it("should throw an error if the line number is out of range", () => {
+        const text = "Line1\nLine2";
+        assert.throws(() => lineAndColumnToPosition(text, 3, 0));
+    });
 
-	it("should throw an error if the column number is out of range", () => {
-		const text = "Line1\nLine2";
-		assert.throws(() => lineAndColumnToPosition(text, 1, 10));
-	});
+    it("should throw an error if the column number is out of range", () => {
+        const text = "Line1\nLine2";
+        assert.throws(() => lineAndColumnToPosition(text, 1, 10));
+    });
 });
diff --git a/frontend/sync-client/src/utils/line-and-column-to-position.ts b/frontend/sync-client/src/utils/line-and-column-to-position.ts
index 2ee6b2a4..05ac7be8 100644
--- a/frontend/sync-client/src/utils/line-and-column-to-position.ts
+++ b/frontend/sync-client/src/utils/line-and-column-to-position.ts
@@ -9,26 +9,26 @@
  * @throws Error if column number is out of range
  */
 export function lineAndColumnToPosition(
-	text: string,
-	line: number,
-	column: number
+    text: string,
+    line: number,
+    column: number
 ): number {
-	const lines = text.replaceAll("\r", "").split("\n");
+    const lines = text.replaceAll("\r", "").split("\n");
 
-	if (line >= lines.length) {
-		throw new Error(`Line number ${line} is out of range.`);
-	}
+    if (line >= lines.length) {
+        throw new Error(`Line number ${line} is out of range.`);
+    }
 
-	if (column > lines[line].length) {
-		throw new Error(`Column number ${column} is out of range.`);
-	}
+    if (column > lines[line].length) {
+        throw new Error(`Column number ${column} is out of range.`);
+    }
 
-	let position = 0;
-	for (let i = 0; i < line; i++) {
-		position += lines[i].length + 1;
-	}
+    let position = 0;
+    for (let i = 0; i < line; i++) {
+        position += lines[i].length + 1;
+    }
 
-	position += column;
+    position += column;
 
-	return position;
+    return position;
 }
diff --git a/frontend/sync-client/src/utils/position-to-line-and-column.test.ts b/frontend/sync-client/src/utils/position-to-line-and-column.test.ts
index 2341b7c5..2797bd8e 100644
--- a/frontend/sync-client/src/utils/position-to-line-and-column.test.ts
+++ b/frontend/sync-client/src/utils/position-to-line-and-column.test.ts
@@ -3,86 +3,86 @@ import assert from "node:assert";
 import { positionToLineAndColumn } from "./position-to-line-and-column";
 
 describe("positionToLineAndColumn", () => {
-	test("converts position to line and column in multi-line text", () => {
-		const text = "ab\ncd\n";
-		assert.deepStrictEqual(positionToLineAndColumn(text, 0), {
-			line: 0,
-			column: 0
-		});
-		assert.deepStrictEqual(positionToLineAndColumn(text, 1), {
-			line: 0,
-			column: 1
-		});
-		assert.deepStrictEqual(positionToLineAndColumn(text, 2), {
-			line: 0,
-			column: 2
-		});
-		assert.deepStrictEqual(positionToLineAndColumn(text, 3), {
-			line: 1,
-			column: 0
-		});
-		assert.deepStrictEqual(positionToLineAndColumn(text, 4), {
-			line: 1,
-			column: 1
-		});
-		assert.deepStrictEqual(positionToLineAndColumn(text, 6), {
-			line: 2,
-			column: 0
-		});
-	});
+    test("converts position to line and column in multi-line text", () => {
+        const text = "ab\ncd\n";
+        assert.deepStrictEqual(positionToLineAndColumn(text, 0), {
+            line: 0,
+            column: 0
+        });
+        assert.deepStrictEqual(positionToLineAndColumn(text, 1), {
+            line: 0,
+            column: 1
+        });
+        assert.deepStrictEqual(positionToLineAndColumn(text, 2), {
+            line: 0,
+            column: 2
+        });
+        assert.deepStrictEqual(positionToLineAndColumn(text, 3), {
+            line: 1,
+            column: 0
+        });
+        assert.deepStrictEqual(positionToLineAndColumn(text, 4), {
+            line: 1,
+            column: 1
+        });
+        assert.deepStrictEqual(positionToLineAndColumn(text, 6), {
+            line: 2,
+            column: 0
+        });
+    });
 
-	test("with carrige returns", () => {
-		assert.deepStrictEqual(positionToLineAndColumn("a\nb", 3), {
-			line: 1,
-			column: 1
-		});
+    test("with carrige returns", () => {
+        assert.deepStrictEqual(positionToLineAndColumn("a\nb", 3), {
+            line: 1,
+            column: 1
+        });
 
-		assert.deepStrictEqual(positionToLineAndColumn("a\r\nb", 3), {
-			line: 1,
-			column: 1
-		});
-	});
+        assert.deepStrictEqual(positionToLineAndColumn("a\r\nb", 3), {
+            line: 1,
+            column: 1
+        });
+    });
 
-	test("with multiple carriage returns", () => {
-		// Test that all \r characters are removed, not just the first one
-		const text = "line1\r\nline2\r\nline3\r\n";
+    test("with multiple carriage returns", () => {
+        // Test that all \r characters are removed, not just the first one
+        const text = "line1\r\nline2\r\nline3\r\n";
 
-		assert.deepStrictEqual(positionToLineAndColumn(text, 0), {
-			line: 0,
-			column: 0
-		});
+        assert.deepStrictEqual(positionToLineAndColumn(text, 0), {
+            line: 0,
+            column: 0
+        });
 
-		// Position 6 = start of 'line2' after all \r removed
-		assert.deepStrictEqual(positionToLineAndColumn(text, 6), {
-			line: 1,
-			column: 0
-		});
+        // Position 6 = start of 'line2' after all \r removed
+        assert.deepStrictEqual(positionToLineAndColumn(text, 6), {
+            line: 1,
+            column: 0
+        });
 
-		// Position 12 = start of 'line3' after all \r removed
-		assert.deepStrictEqual(positionToLineAndColumn(text, 12), {
-			line: 2,
-			column: 0
-		});
-	});
+        // Position 12 = start of 'line3' after all \r removed
+        assert.deepStrictEqual(positionToLineAndColumn(text, 12), {
+            line: 2,
+            column: 0
+        });
+    });
 
-	test("handles empty input", () => {
-		assert.deepStrictEqual(positionToLineAndColumn("", 0), {
-			line: 0,
-			column: 0
-		});
-	});
+    test("handles empty input", () => {
+        assert.deepStrictEqual(positionToLineAndColumn("", 0), {
+            line: 0,
+            column: 0
+        });
+    });
 
-	test("handles positions at the end of text", () => {
-		const text = "End";
-		assert.deepStrictEqual(positionToLineAndColumn(text, 3), {
-			line: 0,
-			column: 3
-		});
-	});
+    test("handles positions at the end of text", () => {
+        const text = "End";
+        assert.deepStrictEqual(positionToLineAndColumn(text, 3), {
+            line: 0,
+            column: 3
+        });
+    });
 
-	test("throws error for position out of range", () => {
-		const text = "Short text";
-		assert.throws(() => positionToLineAndColumn(text, 15));
-		assert.throws(() => positionToLineAndColumn(text, -1));
-	});
+    test("throws error for position out of range", () => {
+        const text = "Short text";
+        assert.throws(() => positionToLineAndColumn(text, 15));
+        assert.throws(() => positionToLineAndColumn(text, -1));
+    });
 });
diff --git a/frontend/sync-client/src/utils/position-to-line-and-column.ts b/frontend/sync-client/src/utils/position-to-line-and-column.ts
index 116b9f15..969171d8 100644
--- a/frontend/sync-client/src/utils/position-to-line-and-column.ts
+++ b/frontend/sync-client/src/utils/position-to-line-and-column.ts
@@ -7,27 +7,27 @@
  * @throws Will throw an error if the position is negative or exceeds the text length
  */
 export function positionToLineAndColumn(
-	text: string,
-	position: number
+    text: string,
+    position: number
 ): { line: number; column: number } {
-	if (position < 0) {
-		throw new Error("Position cannot be negative");
-	}
+    if (position < 0) {
+        throw new Error("Position cannot be negative");
+    }
 
-	text = text.replaceAll("\r", "");
+    text = text.replaceAll("\r", "");
 
-	if (position > text.length) {
-		// position == text.length accounts for the cursor being after last character
-		throw new Error(
-			`Position ${position} exceeds text length ${text.length}`
-		);
-	}
+    if (position > text.length) {
+        // position == text.length accounts for the cursor being after last character
+        throw new Error(
+            `Position ${position} exceeds text length ${text.length}`
+        );
+    }
 
-	const textUpToPosition = text.substring(0, position);
-	const lines = textUpToPosition.split("\n");
+    const textUpToPosition = text.substring(0, position);
+    const lines = textUpToPosition.split("\n");
 
-	const line = lines.length - 1;
-	const column = lines[lines.length - 1].length;
+    const line = lines.length - 1;
+    const column = lines[lines.length - 1].length;
 
-	return { line, column };
+    return { line, column };
 }
diff --git a/frontend/sync-client/src/utils/rate-limit.test.ts b/frontend/sync-client/src/utils/rate-limit.test.ts
index e0b77dc4..6c7fb434 100644
--- a/frontend/sync-client/src/utils/rate-limit.test.ts
+++ b/frontend/sync-client/src/utils/rate-limit.test.ts
@@ -3,62 +3,62 @@ import { describe, it, beforeEach, afterEach, mock } from "node:test";
 import assert from "node:assert";
 
 describe("rateLimit", () => {
-	beforeEach(() => {
-		mock.timers.enable({ apis: ["setTimeout"] });
-	});
+    beforeEach(() => {
+        mock.timers.enable({ apis: ["setTimeout"] });
+    });
 
-	afterEach(() => {
-		mock.timers.reset();
-	});
+    afterEach(() => {
+        mock.timers.reset();
+    });
 
-	it("should call the function immediately on first invocation", async () => {
-		const mockFn = mock.fn<() => Promise<string>>();
-		mockFn.mock.mockImplementation(async () => "result");
-		const rateLimited = rateLimit(mockFn, 100);
+    it("should call the function immediately on first invocation", async () => {
+        const mockFn = mock.fn<() => Promise<string>>();
+        mockFn.mock.mockImplementation(async () => "result");
+        const rateLimited = rateLimit(mockFn, 100);
 
-		const promise = rateLimited();
-		assert.strictEqual(mockFn.mock.callCount(), 1);
+        const promise = rateLimited();
+        assert.strictEqual(mockFn.mock.callCount(), 1);
 
-		await promise;
-	});
+        await promise;
+    });
 
-	it("should call the function again after the interval has passed", async () => {
-		const mockFn = mock.fn<(value: number) => Promise<string>>();
-		mockFn.mock.mockImplementation(async () => "result");
+    it("should call the function again after the interval has passed", async () => {
+        const mockFn = mock.fn<(value: number) => Promise<string>>();
+        mockFn.mock.mockImplementation(async () => "result");
 
-		const rateLimited = rateLimit(mockFn, 100);
+        const rateLimited = rateLimit(mockFn, 100);
 
-		const promise1 = rateLimited(1);
-		await promise1;
+        const promise1 = rateLimited(1);
+        await promise1;
 
-		mock.timers.tick(200);
+        mock.timers.tick(200);
 
-		const promise2 = rateLimited(2);
-		await promise2;
+        const promise2 = rateLimited(2);
+        await promise2;
 
-		assert.strictEqual(mockFn.mock.callCount(), 2);
-		assert.deepStrictEqual(mockFn.mock.calls[1].arguments, [2]);
-	});
+        assert.strictEqual(mockFn.mock.callCount(), 2);
+        assert.deepStrictEqual(mockFn.mock.calls[1].arguments, [2]);
+    });
 
-	it("should use the most recent arguments if multiple calls are made within interval", async () => {
-		const mockFn = mock.fn<(value: string) => Promise<string>>();
-		mockFn.mock.mockImplementation(async (val: string) => `${val}-result`);
-		const rateLimited = rateLimit(mockFn, 100);
+    it("should use the most recent arguments if multiple calls are made within interval", async () => {
+        const mockFn = mock.fn<(value: string) => Promise<string>>();
+        mockFn.mock.mockImplementation(async (val: string) => `${val}-result`);
+        const rateLimited = rateLimit(mockFn, 100);
 
-		const promise1 = rateLimited("first");
-		mock.timers.tick(10);
-		const promise2 = rateLimited("second");
-		mock.timers.tick(10);
-		const promise3 = rateLimited("third");
+        const promise1 = rateLimited("first");
+        mock.timers.tick(10);
+        const promise2 = rateLimited("second");
+        mock.timers.tick(10);
+        const promise3 = rateLimited("third");
 
-		mock.timers.tick(1000);
+        mock.timers.tick(1000);
 
-		assert.strictEqual(await promise1, "first-result");
-		assert.strictEqual(await promise2, "third-result");
-		assert.strictEqual(await promise3, undefined);
+        assert.strictEqual(await promise1, "first-result");
+        assert.strictEqual(await promise2, "third-result");
+        assert.strictEqual(await promise3, undefined);
 
-		assert.strictEqual(mockFn.mock.callCount(), 2);
-		assert.deepStrictEqual(mockFn.mock.calls[0].arguments, ["first"]);
-		assert.deepStrictEqual(mockFn.mock.calls[1].arguments, ["third"]);
-	});
+        assert.strictEqual(mockFn.mock.callCount(), 2);
+        assert.deepStrictEqual(mockFn.mock.calls[0].arguments, ["first"]);
+        assert.deepStrictEqual(mockFn.mock.calls[1].arguments, ["third"]);
+    });
 });
diff --git a/frontend/sync-client/src/utils/rate-limit.ts b/frontend/sync-client/src/utils/rate-limit.ts
index 2c6d018b..52cbbce7 100644
--- a/frontend/sync-client/src/utils/rate-limit.ts
+++ b/frontend/sync-client/src/utils/rate-limit.ts
@@ -16,48 +16,48 @@ import { sleep } from "./sleep";
  *         Returns the original function's return type when executed, or undefined if the call was superseded by a newer one.
  */
 export function rateLimit<
-	R,
-	T extends (
-		...args: any // eslint-disable-line @typescript-eslint/no-explicit-any
-	) => Promise<R>
+    R,
+    T extends (
+        ...args: any // eslint-disable-line @typescript-eslint/no-explicit-any
+    ) => Promise<R>
 >(
-	fn: T,
-	minIntervalMs: number | (() => number)
+    fn: T,
+    minIntervalMs: number | (() => number)
 ): (...args: Parameters<T>) => Promise<R | undefined> {
-	let newArgs: Parameters<T> | undefined = undefined;
-	let running: Promise<unknown> | undefined = undefined;
+    let newArgs: Parameters<T> | undefined = undefined;
+    let running: Promise<unknown> | undefined = undefined;
 
-	const decoratedFn = async (
-		...args: Parameters<T>
-	): Promise<R | undefined> => {
-		if (running !== undefined) {
-			newArgs = args;
-			await running;
+    const decoratedFn = async (
+        ...args: Parameters<T>
+    ): Promise<R | undefined> => {
+        if (running !== undefined) {
+            newArgs = args;
+            await running;
 
-			// args might have changed while we were waiting
-			// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-			if (newArgs === undefined) {
-				// we weren't the first one to wake up, that means a newer
-				// invocation is running now, we can just bail
-				return;
-			}
-			args = newArgs;
-			newArgs = undefined;
-		}
+            // args might have changed while we were waiting
+            // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+            if (newArgs === undefined) {
+                // we weren't the first one to wake up, that means a newer
+                // invocation is running now, we can just bail
+                return;
+            }
+            args = newArgs;
+            newArgs = undefined;
+        }
 
-		const [promise, resolve] = createPromise();
-		running = promise;
-		sleep(
-			typeof minIntervalMs === "function"
-				? minIntervalMs()
-				: minIntervalMs
-		)
-			.then(resolve)
-			.catch(() => {
-				// sleep cannot fail
-			});
-		return fn(...args);
-	};
+        const [promise, resolve] = createPromise();
+        running = promise;
+        sleep(
+            typeof minIntervalMs === "function"
+                ? minIntervalMs()
+                : minIntervalMs
+        )
+            .then(resolve)
+            .catch(() => {
+                // sleep cannot fail
+            });
+        return fn(...args);
+    };
 
-	return decoratedFn;
+    return decoratedFn;
 }
diff --git a/frontend/sync-client/src/utils/set-up-telemetry.ts b/frontend/sync-client/src/utils/set-up-telemetry.ts
index 6c8e4a4a..d9e73a79 100644
--- a/frontend/sync-client/src/utils/set-up-telemetry.ts
+++ b/frontend/sync-client/src/utils/set-up-telemetry.ts
@@ -4,38 +4,38 @@ import * as Sentry from "@sentry/browser";
 const packageVersion = __CURRENT_VERSION__; // eslint-disable-line
 
 export const setUpTelemetry = (): (() => void) => {
-	Sentry.init({
-		dsn: "https://a9bb2b9151bb450ca86b936436e356c4@bugs.schmelczer.dev/1",
-		release: `sync-client@${packageVersion}`,
-		sendDefaultPii: true,
-		integrations: [],
-		tracesSampleRate: 0
-	});
+    Sentry.init({
+        dsn: "https://a9bb2b9151bb450ca86b936436e356c4@bugs.schmelczer.dev/1",
+        release: `sync-client@${packageVersion}`,
+        sendDefaultPii: true,
+        integrations: [],
+        tracesSampleRate: 0
+    });
 
-	Sentry.captureMessage("Initialised telemetry");
+    Sentry.captureMessage("Initialised telemetry");
 
-	const onError = (event: ErrorEvent): void => {
-		Sentry.captureException(event.error, {
-			extra: {
-				message: event.message,
-				filename: event.filename,
-				lineno: event.lineno,
-				colno: event.colno
-			}
-		});
-	};
-	window.addEventListener("error", onError);
+    const onError = (event: ErrorEvent): void => {
+        Sentry.captureException(event.error, {
+            extra: {
+                message: event.message,
+                filename: event.filename,
+                lineno: event.lineno,
+                colno: event.colno
+            }
+        });
+    };
+    window.addEventListener("error", onError);
 
-	const onUnhandledRejection = (event: PromiseRejectionEvent): void => {
-		Sentry.captureException(event.reason);
-	};
-	window.addEventListener("unhandledrejection", onUnhandledRejection);
+    const onUnhandledRejection = (event: PromiseRejectionEvent): void => {
+        Sentry.captureException(event.reason);
+    };
+    window.addEventListener("unhandledrejection", onUnhandledRejection);
 
-	return (): void => {
-		window.removeEventListener("error", onError);
-		window.removeEventListener("unhandledrejection", onUnhandledRejection);
-		Sentry.close(5000).catch(() => {
-			// Ignore errors during shutdown
-		});
-	};
+    return (): void => {
+        window.removeEventListener("error", onError);
+        window.removeEventListener("unhandledrejection", onUnhandledRejection);
+        Sentry.close(5000).catch(() => {
+            // Ignore errors during shutdown
+        });
+    };
 };
diff --git a/frontend/sync-client/src/utils/sleep.ts b/frontend/sync-client/src/utils/sleep.ts
index 638fc019..ff474799 100644
--- a/frontend/sync-client/src/utils/sleep.ts
+++ b/frontend/sync-client/src/utils/sleep.ts
@@ -1,3 +1,3 @@
 export async function sleep(ms: number): Promise<void> {
-	return new Promise((resolve) => setTimeout(resolve, ms));
+    return new Promise((resolve) => setTimeout(resolve, ms));
 }
diff --git a/frontend/sync-client/tsconfig.json b/frontend/sync-client/tsconfig.json
index c49baa45..92caf072 100644
--- a/frontend/sync-client/tsconfig.json
+++ b/frontend/sync-client/tsconfig.json
@@ -1,18 +1,18 @@
 {
-	"compilerOptions": {
-		"module": "ESNext",
-		"target": "ESNext",
-		"strict": true,
-		"allowSyntheticDefaultImports": true,
-		"moduleResolution": "bundler",
-		"lib": [
-			"DOM", // to get `fetch` & `WebSocket`
-			"ES2024"
-		],
-		"declaration": true,
-		"declarationDir": "./dist/types"
-	},
-	"exclude": [
-		"./dist"
-	]
-}
\ No newline at end of file
+    "compilerOptions": {
+        "module": "ESNext",
+        "target": "ESNext",
+        "strict": true,
+        "allowSyntheticDefaultImports": true,
+        "moduleResolution": "bundler",
+        "lib": [
+            "DOM", // to get `fetch` & `WebSocket`
+            "ES2024"
+        ],
+        "declaration": true,
+        "declarationDir": "./dist/types"
+    },
+    "exclude": [
+        "./dist"
+    ]
+}
diff --git a/frontend/sync-client/webpack.config.js b/frontend/sync-client/webpack.config.js
index d84a5cd4..b7c3a3fd 100644
--- a/frontend/sync-client/webpack.config.js
+++ b/frontend/sync-client/webpack.config.js
@@ -4,68 +4,68 @@ const webpack = require("webpack");
 const packageJson = require("./package.json");
 
 const common = {
-	entry: "./src/index.ts",
-	module: {
-		rules: [
-			{
-				test: /\.ts$/,
-				use: ["ts-loader"]
-			},
-			{
-				test: /\.wasm$/,
-				type: "asset/inline"
-			}
-		]
-	},
-	plugins: [
-		new webpack.DefinePlugin({
-			__CURRENT_VERSION__: JSON.stringify(packageJson.version)
-		})
-	],
-	optimization: {
-		// the consuming project should take care of minification
-		minimize: false
-	},
-	resolve: {
-		extensions: [".ts", ".js"],
-		alias: {
-			root: __dirname,
-			src: path.resolve(__dirname, "src")
-		}
-	},
-	performance: {
-		hints: false // it's a library, no need to warn about its size
-	}
+    entry: "./src/index.ts",
+    module: {
+        rules: [
+            {
+                test: /\.ts$/,
+                use: ["ts-loader"]
+            },
+            {
+                test: /\.wasm$/,
+                type: "asset/inline"
+            }
+        ]
+    },
+    plugins: [
+        new webpack.DefinePlugin({
+            __CURRENT_VERSION__: JSON.stringify(packageJson.version)
+        })
+    ],
+    optimization: {
+        // the consuming project should take care of minification
+        minimize: false
+    },
+    resolve: {
+        extensions: [".ts", ".js"],
+        alias: {
+            root: __dirname,
+            src: path.resolve(__dirname, "src")
+        }
+    },
+    performance: {
+        hints: false // it's a library, no need to warn about its size
+    }
 };
 
 module.exports = [
-	merge(common, {
-		target: "web",
-		output: {
-			path: path.resolve(__dirname, "dist"),
-			filename: "sync-client.web.js",
-			library: {
-				name: "SyncClient",
-				type: "umd"
-			},
-			globalObject: "this"
-		},
-		resolve: {
-			fallback: {
-				ws: false // Exclude `ws` from the browser bundle
-			}
-		}
-	}),
-	merge(common, {
-		target: "node",
-		output: {
-			path: path.resolve(__dirname, "dist"),
-			filename: "sync-client.node.js",
-			libraryTarget: "commonjs2"
-		},
-		externals: {
-			bufferutil: "bufferutil",
-			"utf-8-validate": "utf-8-validate" // required for ws: https://github.com/websockets/ws/issues/2245#issuecomment-2250318733
-		}
-	})
+    merge(common, {
+        target: "web",
+        output: {
+            path: path.resolve(__dirname, "dist"),
+            filename: "sync-client.web.js",
+            library: {
+                name: "SyncClient",
+                type: "umd"
+            },
+            globalObject: "this"
+        },
+        resolve: {
+            fallback: {
+                ws: false // Exclude `ws` from the browser bundle
+            }
+        }
+    }),
+    merge(common, {
+        target: "node",
+        output: {
+            path: path.resolve(__dirname, "dist"),
+            filename: "sync-client.node.js",
+            libraryTarget: "commonjs2"
+        },
+        externals: {
+            bufferutil: "bufferutil",
+            "utf-8-validate": "utf-8-validate" // required for ws: https://github.com/websockets/ws/issues/2245#issuecomment-2250318733
+        }
+    })
 ];
diff --git a/frontend/test-client/src/agent/mock-agent.ts b/frontend/test-client/src/agent/mock-agent.ts
index 824f5eee..7926672e 100644
--- a/frontend/test-client/src/agent/mock-agent.ts
+++ b/frontend/test-client/src/agent/mock-agent.ts
@@ -11,357 +11,357 @@ import { withTimeout } from "../utils/with-timeout";
 const TIMEOUT_MS = 10 * 60 * 1000;
 
 export class MockAgent extends MockClient {
-	private readonly writtenContents: string[] = [];
-	private readonly pendingActions: Promise<unknown>[] = [];
+    private readonly writtenContents: string[] = [];
+    private readonly pendingActions: Promise<unknown>[] = [];
 
-	// The renamed file finding algorithm isn't too smart so we can't both update and rename the same file
-	private readonly doNotTouchWhileOffline: string[] = [];
+    // The renamed file finding algorithm isn't too smart so we can't both update and rename the same file
+    private readonly doNotTouchWhileOffline: string[] = [];
 
-	public constructor(
-		initialSettings: Partial<SyncSettings>,
-		public readonly name: string,
-		private readonly doDeletes: boolean,
-		private readonly doResets: boolean,
-		useSlowFileEvents: boolean,
-		private readonly jitterScaleInSeconds: number
-	) {
-		super(initialSettings, useSlowFileEvents);
-	}
+    public constructor(
+        initialSettings: Partial<SyncSettings>,
+        public readonly name: string,
+        private readonly doDeletes: boolean,
+        private readonly doResets: boolean,
+        useSlowFileEvents: boolean,
+        private readonly jitterScaleInSeconds: number
+    ) {
+        super(initialSettings, useSlowFileEvents);
+    }
 
-	public async init(): Promise<void> {
-		await super.init(
-			debugging.slowFetchFactory(this.jitterScaleInSeconds),
-			debugging.slowWebSocketFactory(
-				this.jitterScaleInSeconds,
-				new Logger() // this logger isn't wired anywhere, so messages to it will be ignored
-			)
-		);
+    public async init(): Promise<void> {
+        await super.init(
+            debugging.slowFetchFactory(this.jitterScaleInSeconds),
+            debugging.slowWebSocketFactory(
+                this.jitterScaleInSeconds,
+                new Logger() // this logger isn't wired anywhere, so messages to it will be ignored
+            )
+        );
 
-		assert(
-			(await this.client.checkConnection()).isSuccessful,
-			"Connection check failed"
-		);
+        assert(
+            (await this.client.checkConnection()).isSuccessful,
+            "Connection check failed"
+        );
 
-		this.client.logger.addOnMessageListener((logLine: LogLine) => {
-			const state = this.client.getSettings().isSyncEnabled
-				? "(online) "
-				: "(offline)";
-			const formatted = `[${this.name} ${state}] ${logLine.timestamp.toISOString()} ${logLine.level} ${logLine.message}`;
+        this.client.logger.addOnMessageListener((logLine: LogLine) => {
+            const state = this.client.getSettings().isSyncEnabled
+                ? "(online) "
+                : "(offline)";
+            const formatted = `[${this.name} ${state}] ${logLine.timestamp.toISOString()} ${logLine.level} ${logLine.message}`;
 
-			// HACK: we have to ensure the file has been synced if we want to change it offline without data loss
-			const historyEntry = /.*History entry: (.*.md).*/.exec(
-				logLine.message
-			);
+            // HACK: we have to ensure the file has been synced if we want to change it offline without data loss
+            const historyEntry = /.*History entry: (.*.md).*/.exec(
+                logLine.message
+            );
 
-			if (historyEntry) {
-				utils.removeFromArray(
-					this.doNotTouchWhileOffline,
-					historyEntry[1]
-				);
-			}
-			switch (logLine.level) {
-				case LogLevel.ERROR:
-					console.error(formatted);
+            if (historyEntry) {
+                utils.removeFromArray(
+                    this.doNotTouchWhileOffline,
+                    historyEntry[1]
+                );
+            }
+            switch (logLine.level) {
+                case LogLevel.ERROR:
+                    console.error(formatted);
 
-					if (!this.useSlowFileEvents) {
-						// Let's wait for the error to be caught if there was one
-						// eslint-disable-next-line @typescript-eslint/no-floating-promises
-						sleep(100).then(() => process.exit(1));
-					}
+                    if (!this.useSlowFileEvents) {
+                        // Let's wait for the error to be caught if there was one
+                        // eslint-disable-next-line @typescript-eslint/no-floating-promises
+                        sleep(100).then(() => process.exit(1));
+                    }
 
-					break;
-				case LogLevel.WARNING:
-					console.warn(formatted);
-					break;
-				case LogLevel.INFO:
-					console.info(formatted);
-					break;
-				case LogLevel.DEBUG:
-					console.debug(formatted);
-					break;
-			}
-		});
+                    break;
+                case LogLevel.WARNING:
+                    console.warn(formatted);
+                    break;
+                case LogLevel.INFO:
+                    console.info(formatted);
+                    break;
+                case LogLevel.DEBUG:
+                    console.debug(formatted);
+                    break;
+            }
+        });
 
-		this.client.logger.info("Agent initialized");
-	}
+        this.client.logger.info("Agent initialized");
+    }
 
-	public async act(): Promise<void> {
-		const options: (() => Promise<unknown>)[] = [
-			this.createFileAction.bind(this)
-		];
+    public async act(): Promise<void> {
+        const options: (() => Promise<unknown>)[] = [
+            this.createFileAction.bind(this)
+        ];
 
-		if (this.client.getSettings().isSyncEnabled) {
-			if (this.doNotTouchWhileOffline.length === 0) {
-				options.push(this.disableSyncAction.bind(this));
-			}
-		} else {
-			options.push(this.enableSyncAction.bind(this));
-		}
+        if (this.client.getSettings().isSyncEnabled) {
+            if (this.doNotTouchWhileOffline.length === 0) {
+                options.push(this.disableSyncAction.bind(this));
+            }
+        } else {
+            options.push(this.enableSyncAction.bind(this));
+        }
 
-		const files = await this.listFilesRecursively();
+        const files = await this.listFilesRecursively();
 
-		if (files.length > 0) {
-			options.push(
-				this.renameFileAction.bind(this, files),
-				this.updateFileAction.bind(this, files)
-			);
+        if (files.length > 0) {
+            options.push(
+                this.renameFileAction.bind(this, files),
+                this.updateFileAction.bind(this, files)
+            );
 
-			if (this.doDeletes) {
-				options.push(this.deleteFileAction.bind(this, files));
-			}
-		}
+            if (this.doDeletes) {
+                options.push(this.deleteFileAction.bind(this, files));
+            }
+        }
 
-		if (Math.random() < 0.015 && this.doResets) {
-			// we can't just queue this up as once it's destroyed, no more method calls can go to SyncClient
-			await this.resetClient();
-		} else {
-			this.pendingActions.push(
-				(async (): Promise<unknown> => {
-					try {
-						return await choose(options)();
-					} catch (error) {
-						this.client.logger.error(
-							`Failed to perform an action: ${error}`
-						);
-						this.client.logger.info(
-							JSON.stringify(this.data, null, 2)
-						);
-						this.client.logger.info(
-							JSON.stringify(this.localFiles, null, 2)
-						);
-						throw error;
-					}
-				})()
-			);
-		}
-	}
+        if (Math.random() < 0.015 && this.doResets) {
+            // we can't just queue this up as once it's destroyed, no more method calls can go to SyncClient
+            await this.resetClient();
+        } else {
+            this.pendingActions.push(
+                (async (): Promise<unknown> => {
+                    try {
+                        return await choose(options)();
+                    } catch (error) {
+                        this.client.logger.error(
+                            `Failed to perform an action: ${error}`
+                        );
+                        this.client.logger.info(
+                            JSON.stringify(this.data, null, 2)
+                        );
+                        this.client.logger.info(
+                            JSON.stringify(this.localFiles, null, 2)
+                        );
+                        throw error;
+                    }
+                })()
+            );
+        }
+    }
 
-	public async finish(): Promise<void> {
-		await withTimeout(
-			(async (): Promise<void> => {
-				await this.client.setSetting("isSyncEnabled", true);
-				await utils.awaitAll(this.pendingActions);
-				await this.client.waitUntilFinished();
-			})(),
-			TIMEOUT_MS,
-			"finish()"
-		);
-	}
+    public async finish(): Promise<void> {
+        await withTimeout(
+            (async (): Promise<void> => {
+                await this.client.setSetting("isSyncEnabled", true);
+                await utils.awaitAll(this.pendingActions);
+                await this.client.waitUntilFinished();
+            })(),
+            TIMEOUT_MS,
+            "finish()"
+        );
+    }
 
-	public async destroy(): Promise<void> {
-		await withTimeout(
-			(async (): Promise<void> => {
-				await this.client.waitUntilFinished();
-				await this.client.destroy();
-			})(),
-			TIMEOUT_MS,
-			"destroy()"
-		);
-	}
+    public async destroy(): Promise<void> {
+        await withTimeout(
+            (async (): Promise<void> => {
+                await this.client.waitUntilFinished();
+                await this.client.destroy();
+            })(),
+            TIMEOUT_MS,
+            "destroy()"
+        );
+    }
 
-	public assertFileSystemsAreConsistent(otherAgent: MockAgent): void {
-		const globalFiles = Array.from(otherAgent.localFiles.keys());
-		const localFiles = Array.from(this.localFiles.keys());
+    public assertFileSystemsAreConsistent(otherAgent: MockAgent): void {
+        const globalFiles = Array.from(otherAgent.localFiles.keys());
+        const localFiles = Array.from(this.localFiles.keys());
 
-		const missingInOther = localFiles.filter(
-			(file) => !otherAgent.localFiles.has(file)
-		);
-		const missingInLocal = globalFiles.filter(
-			(file) => !this.localFiles.has(file)
-		);
+        const missingInOther = localFiles.filter(
+            (file) => !otherAgent.localFiles.has(file)
+        );
+        const missingInLocal = globalFiles.filter(
+            (file) => !this.localFiles.has(file)
+        );
 
-		try {
-			assert(
-				missingInOther.length === 0,
-				`Files from ${this.name} missing in ${otherAgent.name}: ${missingInOther.join(", ")}`
-			);
-			assert(
-				missingInLocal.length === 0,
-				`Files from ${otherAgent.name} missing in ${this.name}: ${missingInLocal.join(", ")}`
-			);
+        try {
+            assert(
+                missingInOther.length === 0,
+                `Files from ${this.name} missing in ${otherAgent.name}: ${missingInOther.join(", ")}`
+            );
+            assert(
+                missingInLocal.length === 0,
+                `Files from ${otherAgent.name} missing in ${this.name}: ${missingInLocal.join(", ")}`
+            );
 
-			for (const file of globalFiles) {
-				const localContent = new TextDecoder().decode(
-					this.localFiles.get(file)
-				);
-				const otherContent = new TextDecoder().decode(
-					otherAgent.localFiles.get(file)
-				);
-				assert(
-					localContent === otherContent,
-					`Content mismatch for file ${file}:\n${localContent}\n${otherContent}`
-				);
-			}
-		} catch (e) {
-			this.client.logger.info(
-				"Local data: " + JSON.stringify(this.data, null, 2)
-			);
-			this.client.logger.info(
-				"Local files: " +
-					Array.from(otherAgent.localFiles.keys()).join(", ")
-			);
-			otherAgent.client.logger.info(
-				"Local data: " + JSON.stringify(otherAgent.data, null, 2)
-			);
-			otherAgent.client.logger.info(
-				"Local files: " +
-					Array.from(otherAgent.localFiles.keys()).join(", ")
-			);
+            for (const file of globalFiles) {
+                const localContent = new TextDecoder().decode(
+                    this.localFiles.get(file)
+                );
+                const otherContent = new TextDecoder().decode(
+                    otherAgent.localFiles.get(file)
+                );
+                assert(
+                    localContent === otherContent,
+                    `Content mismatch for file ${file}:\n${localContent}\n${otherContent}`
+                );
+            }
+        } catch (e) {
+            this.client.logger.info(
+                "Local data: " + JSON.stringify(this.data, null, 2)
+            );
+            this.client.logger.info(
+                "Local files: " +
+                    Array.from(otherAgent.localFiles.keys()).join(", ")
+            );
+            otherAgent.client.logger.info(
+                "Local data: " + JSON.stringify(otherAgent.data, null, 2)
+            );
+            otherAgent.client.logger.info(
+                "Local files: " +
+                    Array.from(otherAgent.localFiles.keys()).join(", ")
+            );
 
-			throw e;
-		}
-	}
+            throw e;
+        }
+    }
 
-	public assertAllContentIsPresentOnce(): void {
-		if (this.useSlowFileEvents) {
-			this.client.logger.info(
-				// We can't ensure that we have seen every single update
-				`Skipping content check for ${this.name} because slow file events are enabled`
-			);
-			return;
-		}
+    public assertAllContentIsPresentOnce(): void {
+        if (this.useSlowFileEvents) {
+            this.client.logger.info(
+                // We can't ensure that we have seen every single update
+                `Skipping content check for ${this.name} because slow file events are enabled`
+            );
+            return;
+        }
 
-		for (const content of this.writtenContents) {
-			const found = Array.from(this.localFiles.keys()).filter((key) => {
-				return new TextDecoder()
-					.decode(this.localFiles.get(key))
-					.includes(content);
-			});
+        for (const content of this.writtenContents) {
+            const found = Array.from(this.localFiles.keys()).filter((key) => {
+                return new TextDecoder()
+                    .decode(this.localFiles.get(key))
+                    .includes(content);
+            });
 
-			if (this.doDeletes) {
-				assert(
-					found.length <= 1,
-					`[${this.name}] Content ${content} found in ${found.join(", ")}`
-				);
-			} else {
-				assert(
-					found.length >= 1,
-					`[${this.name}] Content ${content} not found in any files`
-				);
+            if (this.doDeletes) {
+                assert(
+                    found.length <= 1,
+                    `[${this.name}] Content ${content} found in ${found.join(", ")}`
+                );
+            } else {
+                assert(
+                    found.length >= 1,
+                    `[${this.name}] Content ${content} not found in any files`
+                );
 
-				assert(
-					found.length <= 1,
-					`[${this.name}] Content ${content} found in multiple files: ${found.join(", ")}`
-				);
+                assert(
+                    found.length <= 1,
+                    `[${this.name}] Content ${content} found in multiple files: ${found.join(", ")}`
+                );
 
-				const [file] = found;
-				const fileContent = new TextDecoder().decode(
-					this.localFiles.get(file)
-				);
-				assert(
-					fileContent.split(content).length == 2,
-					`Content ${content} (of ${this.name}) found more than once in '${file}'. File content:\n${fileContent}`
-				);
-			}
-		}
-	}
+                const [file] = found;
+                const fileContent = new TextDecoder().decode(
+                    this.localFiles.get(file)
+                );
+                assert(
+                    fileContent.split(content).length == 2,
+                    `Content ${content} (of ${this.name}) found more than once in '${file}'. File content:\n${fileContent}`
+                );
+            }
+        }
+    }
 
-	private async resetClient(): Promise<void> {
-		this.client.logger.info(`Resetting client ${this.name}`);
-		await this.client.destroy();
-		await this.init();
-	}
+    private async resetClient(): Promise<void> {
+        this.client.logger.info(`Resetting client ${this.name}`);
+        await this.client.destroy();
+        await this.init();
+    }
 
-	private async createFileAction(): Promise<void> {
-		const file = this.getFileName();
+    private async createFileAction(): Promise<void> {
+        const file = this.getFileName();
 
-		if (
-			(!this.client.getSettings().isSyncEnabled &&
-				this.doNotTouchWhileOffline.includes(file)) ||
-			(await this.exists(file))
-		) {
-			return;
-		}
+        if (
+            (!this.client.getSettings().isSyncEnabled &&
+                this.doNotTouchWhileOffline.includes(file)) ||
+            (await this.exists(file))
+        ) {
+            return;
+        }
 
-		const content = this.getContent();
-		this.client.logger.info(
-			`Decided to create file ${file} with content ${content}`
-		);
+        const content = this.getContent();
+        this.client.logger.info(
+            `Decided to create file ${file} with content ${content}`
+        );
 
-		return this.create(file, new TextEncoder().encode(` ${content} `));
-	}
+        return this.create(file, new TextEncoder().encode(` ${content} `));
+    }
 
-	private async disableSyncAction(): Promise<void> {
-		this.client.logger.info(`Decided to disable sync`);
-		await this.client.setSetting("isSyncEnabled", false);
-	}
+    private async disableSyncAction(): Promise<void> {
+        this.client.logger.info(`Decided to disable sync`);
+        await this.client.setSetting("isSyncEnabled", false);
+    }
 
-	private async enableSyncAction(): Promise<void> {
-		this.client.logger.info(`Decided to enable sync`);
-		await this.client.setSetting("isSyncEnabled", true);
-	}
+    private async enableSyncAction(): Promise<void> {
+        this.client.logger.info(`Decided to enable sync`);
+        await this.client.setSetting("isSyncEnabled", true);
+    }
 
-	private async renameFileAction(files: RelativePath[]): Promise<void> {
-		const file = choose(files);
+    private async renameFileAction(files: RelativePath[]): Promise<void> {
+        const file = choose(files);
 
-		// We can't edit files offline that have been updated while offline.
-		// Otherwise, the resolution logic couldn't handle it.
-		if (
-			!this.client.getSettings().isSyncEnabled &&
-			this.doNotTouchWhileOffline.includes(file)
-		) {
-			this.client.logger.info(
-				`Skipping file ${file} because it has been updated while offline`
-			);
-			return;
-		}
+        // We can't edit files offline that have been updated while offline.
+        // Otherwise, the resolution logic couldn't handle it.
+        if (
+            !this.client.getSettings().isSyncEnabled &&
+            this.doNotTouchWhileOffline.includes(file)
+        ) {
+            this.client.logger.info(
+                `Skipping file ${file} because it has been updated while offline`
+            );
+            return;
+        }
 
-		const newName = this.getFileName();
+        const newName = this.getFileName();
 
-		if (
-			(!this.client.getSettings().isSyncEnabled &&
-				this.doNotTouchWhileOffline.includes(newName)) ||
-			(await this.exists(newName))
-		) {
-			return;
-		}
+        if (
+            (!this.client.getSettings().isSyncEnabled &&
+                this.doNotTouchWhileOffline.includes(newName)) ||
+            (await this.exists(newName))
+        ) {
+            return;
+        }
 
-		this.client.logger.info(`Decided to rename file ${file} to ${newName}`);
-		this.doNotTouchWhileOffline.push(file, newName);
+        this.client.logger.info(`Decided to rename file ${file} to ${newName}`);
+        this.doNotTouchWhileOffline.push(file, newName);
 
-		return this.rename(file, newName);
-	}
+        return this.rename(file, newName);
+    }
 
-	private async updateFileAction(files: RelativePath[]): Promise<void> {
-		const file = choose(files);
+    private async updateFileAction(files: RelativePath[]): Promise<void> {
+        const file = choose(files);
 
-		// We can't edit files offline that have been updated while offline.
-		// Otherwise, the resolution logic couldn't handle it.
-		if (
-			!this.client.getSettings().isSyncEnabled &&
-			this.doNotTouchWhileOffline.includes(file)
-		) {
-			this.client.logger.info(
-				`Skipping file ${file} because it has been updated while offline`
-			);
-			return;
-		}
+        // We can't edit files offline that have been updated while offline.
+        // Otherwise, the resolution logic couldn't handle it.
+        if (
+            !this.client.getSettings().isSyncEnabled &&
+            this.doNotTouchWhileOffline.includes(file)
+        ) {
+            this.client.logger.info(
+                `Skipping file ${file} because it has been updated while offline`
+            );
+            return;
+        }
 
-		const content = this.getContent();
-		this.client.logger.info(
-			`Decided to update file ${file} with ${content}`
-		);
-		this.doNotTouchWhileOffline.push(file);
-		await this.atomicUpdateText(file, (old) => ({
-			text: old.text + ` ${content} `,
-			cursors: []
-		}));
-	}
+        const content = this.getContent();
+        this.client.logger.info(
+            `Decided to update file ${file} with ${content}`
+        );
+        this.doNotTouchWhileOffline.push(file);
+        await this.atomicUpdateText(file, (old) => ({
+            text: old.text + ` ${content} `,
+            cursors: []
+        }));
+    }
 
-	private async deleteFileAction(files: RelativePath[]): Promise<void> {
-		const file = choose(files);
-		this.client.logger.info(`Decided to delete file ${file}`);
-		return this.delete(file);
-	}
+    private async deleteFileAction(files: RelativePath[]): Promise<void> {
+        const file = choose(files);
+        this.client.logger.info(`Decided to delete file ${file}`);
+        return this.delete(file);
+    }
 
-	private getContent(): string {
-		const uuid = uuidv4();
-		this.writtenContents.push(uuid);
-		return uuid;
-	}
+    private getContent(): string {
+        const uuid = uuidv4();
+        this.writtenContents.push(uuid);
+        return uuid;
+    }
 
-	private getFileName(): string {
-		// Simulate name collisions between the clients
-		return `file-${Math.floor(Math.random() * 64)}.md`;
-	}
+    private getFileName(): string {
+        // Simulate name collisions between the clients
+        return `file-${Math.floor(Math.random() * 64)}.md`;
+    }
 }
diff --git a/frontend/test-client/src/agent/mock-client.ts b/frontend/test-client/src/agent/mock-client.ts
index 3121db29..c814879a 100644
--- a/frontend/test-client/src/agent/mock-client.ts
+++ b/frontend/test-client/src/agent/mock-client.ts
@@ -1,197 +1,197 @@
 import type { StoredDatabase, TextWithCursors } from "sync-client";
 import { assert } from "../utils/assert";
 import {
-	type RelativePath,
-	type FileSystemOperations,
-	type SyncSettings,
-	SyncClient
+    type RelativePath,
+    type FileSystemOperations,
+    type SyncSettings,
+    SyncClient
 } from "sync-client";
 
 export class MockClient implements FileSystemOperations {
-	protected readonly localFiles = new Map<string, Uint8Array>();
-	protected client!: SyncClient;
+    protected readonly localFiles = new Map<string, Uint8Array>();
+    protected client!: SyncClient;
 
-	protected data: Partial<{
-		settings: Partial<SyncSettings>;
-		database: Partial<StoredDatabase>;
-	}> = {
-		database: {
-			// Assume all clients start at the same time so there's no need to fetch
-			// any shared state.
-			hasInitialSyncCompleted: true
-		}
-	};
+    protected data: Partial<{
+        settings: Partial<SyncSettings>;
+        database: Partial<StoredDatabase>;
+    }> = {
+        database: {
+            // Assume all clients start at the same time so there's no need to fetch
+            // any shared state.
+            hasInitialSyncCompleted: true
+        }
+    };
 
-	public constructor(
-		initialSettings: Partial<SyncSettings>,
-		protected readonly useSlowFileEvents: boolean
-	) {
-		this.data.settings = initialSettings;
-	}
+    public constructor(
+        initialSettings: Partial<SyncSettings>,
+        protected readonly useSlowFileEvents: boolean
+    ) {
+        this.data.settings = initialSettings;
+    }
 
-	public async init(
-		fetchImplementation: typeof globalThis.fetch,
-		webSocketImplementation: typeof globalThis.WebSocket
-	): Promise<void> {
-		this.client = await SyncClient.create({
-			fs: this,
-			persistence: {
-				load: async () => this.data,
-				save: async (data) => void (this.data = data)
-			},
-			fetch: fetchImplementation,
-			webSocket: webSocketImplementation
-		});
+    public async init(
+        fetchImplementation: typeof globalThis.fetch,
+        webSocketImplementation: typeof globalThis.WebSocket
+    ): Promise<void> {
+        this.client = await SyncClient.create({
+            fs: this,
+            persistence: {
+                load: async () => this.data,
+                save: async (data) => void (this.data = data)
+            },
+            fetch: fetchImplementation,
+            webSocket: webSocketImplementation
+        });
 
-		await this.client.start();
-	}
+        await this.client.start();
+    }
 
-	public async listFilesRecursively(
-		_root: RelativePath | undefined = undefined // we don't use multi-level paths during tests
-	): Promise<RelativePath[]> {
-		return Array.from(this.localFiles.keys());
-	}
+    public async listFilesRecursively(
+        _root: RelativePath | undefined = undefined // we don't use multi-level paths during tests
+    ): Promise<RelativePath[]> {
+        return Array.from(this.localFiles.keys());
+    }
 
-	public async read(path: RelativePath): Promise<Uint8Array> {
-		const file = this.localFiles.get(path);
-		if (!file) {
-			throw new Error(`File ${path} does not exist`);
-		}
-		return file;
-	}
+    public async read(path: RelativePath): Promise<Uint8Array> {
+        const file = this.localFiles.get(path);
+        if (!file) {
+            throw new Error(`File ${path} does not exist`);
+        }
+        return file;
+    }
 
-	public async getFileSize(path: RelativePath): Promise<number> {
-		return (await this.read(path)).length;
-	}
+    public async getFileSize(path: RelativePath): Promise<number> {
+        return (await this.read(path)).length;
+    }
 
-	public async exists(path: RelativePath): Promise<boolean> {
-		return this.localFiles.has(path);
-	}
+    public async exists(path: RelativePath): Promise<boolean> {
+        return this.localFiles.has(path);
+    }
 
-	public async create(
-		path: RelativePath,
-		newContent: Uint8Array
-	): Promise<void> {
-		if (this.localFiles.has(path)) {
-			throw new Error(`File ${path} already exists`);
-		}
-		this.client.logger.info(
-			`Creating file ${path} with content ${new TextDecoder().decode(newContent)}`
-		);
-		this.localFiles.set(path, newContent);
+    public async create(
+        path: RelativePath,
+        newContent: Uint8Array
+    ): Promise<void> {
+        if (this.localFiles.has(path)) {
+            throw new Error(`File ${path} already exists`);
+        }
+        this.client.logger.info(
+            `Creating file ${path} with content ${new TextDecoder().decode(newContent)}`
+        );
+        this.localFiles.set(path, newContent);
 
-		this.executeFileOperation(async () =>
-			this.client.syncLocallyCreatedFile(path)
-		);
-	}
+        this.executeFileOperation(async () =>
+            this.client.syncLocallyCreatedFile(path)
+        );
+    }
 
-	public async createDirectory(_path: RelativePath): Promise<void> {
-		// This doesn't mean anything in our virtual FS representation
-	}
+    public async createDirectory(_path: RelativePath): Promise<void> {
+        // This doesn't mean anything in our virtual FS representation
+    }
 
-	public async atomicUpdateText(
-		path: RelativePath,
-		updater: (currentContent: TextWithCursors) => TextWithCursors
-	): Promise<string> {
-		const file = this.localFiles.get(path);
-		if (!file) {
-			throw new Error(`File ${path} does not exist`);
-		}
-		const currentContent = new TextDecoder().decode(file);
-		const newContent = updater({ text: currentContent, cursors: [] }).text;
-		const newContentUint8Array = new TextEncoder().encode(newContent);
-		this.localFiles.set(path, newContentUint8Array);
+    public async atomicUpdateText(
+        path: RelativePath,
+        updater: (currentContent: TextWithCursors) => TextWithCursors
+    ): Promise<string> {
+        const file = this.localFiles.get(path);
+        if (!file) {
+            throw new Error(`File ${path} does not exist`);
+        }
+        const currentContent = new TextDecoder().decode(file);
+        const newContent = updater({ text: currentContent, cursors: [] }).text;
+        const newContentUint8Array = new TextEncoder().encode(newContent);
+        this.localFiles.set(path, newContentUint8Array);
 
-		if (!this.useSlowFileEvents) {
-			const existingParts = currentContent
-				.split(" ")
-				.map((part) => part.trim());
-			const newParts = newContent.split(" ").map((part) => part.trim());
-			existingParts.forEach((part) =>
-				// all changes should be additive
-				{
-					assert(
-						newParts.includes(part),
-						`Part ${part} not found in new content: ${newContent}`
-					);
-				}
-			);
-		}
+        if (!this.useSlowFileEvents) {
+            const existingParts = currentContent
+                .split(" ")
+                .map((part) => part.trim());
+            const newParts = newContent.split(" ").map((part) => part.trim());
+            existingParts.forEach((part) =>
+                // all changes should be additive
+                {
+                    assert(
+                        newParts.includes(part),
+                        `Part ${part} not found in new content: ${newContent}`
+                    );
+                }
+            );
+        }
 
-		this.client.logger.info(
-			`Updated file ${path} with:\n  current content: ${currentContent}\n  new content: ${newContent}`
-		);
+        this.client.logger.info(
+            `Updated file ${path} with:\n  current content: ${currentContent}\n  new content: ${newContent}`
+        );
 
-		this.executeFileOperation(async () =>
-			this.client.syncLocallyUpdatedFile({
-				relativePath: path
-			})
-		);
+        this.executeFileOperation(async () =>
+            this.client.syncLocallyUpdatedFile({
+                relativePath: path
+            })
+        );
 
-		return newContent;
-	}
+        return newContent;
+    }
 
-	public async write(path: RelativePath, content: Uint8Array): Promise<void> {
-		const hasExisted = this.localFiles.has(path);
-		this.localFiles.set(path, content);
+    public async write(path: RelativePath, content: Uint8Array): Promise<void> {
+        const hasExisted = this.localFiles.has(path);
+        this.localFiles.set(path, content);
 
-		this.client.logger.info(
-			`Updated file ${path} with:\n  new content: ${new TextDecoder().decode(content)}`
-		);
+        this.client.logger.info(
+            `Updated file ${path} with:\n  new content: ${new TextDecoder().decode(content)}`
+        );
 
-		this.executeFileOperation(async () => {
-			if (hasExisted) {
-				return this.client.syncLocallyUpdatedFile({
-					relativePath: path
-				});
-			} else {
-				return this.client.syncLocallyCreatedFile(path);
-			}
-		});
-	}
+        this.executeFileOperation(async () => {
+            if (hasExisted) {
+                return this.client.syncLocallyUpdatedFile({
+                    relativePath: path
+                });
+            } else {
+                return this.client.syncLocallyCreatedFile(path);
+            }
+        });
+    }
 
-	public async delete(path: RelativePath): Promise<void> {
-		this.client.logger.info(
-			`Deleting file: ${path} with:\n  content ${new TextDecoder().decode(this.localFiles.get(path))}`
-		);
-		this.localFiles.delete(path);
+    public async delete(path: RelativePath): Promise<void> {
+        this.client.logger.info(
+            `Deleting file: ${path} with:\n  content ${new TextDecoder().decode(this.localFiles.get(path))}`
+        );
+        this.localFiles.delete(path);
 
-		this.executeFileOperation(async () =>
-			this.client.syncLocallyDeletedFile(path)
-		);
-	}
+        this.executeFileOperation(async () =>
+            this.client.syncLocallyDeletedFile(path)
+        );
+    }
 
-	public async rename(
-		oldPath: RelativePath,
-		newPath: RelativePath
-	): Promise<void> {
-		const file = this.localFiles.get(oldPath);
-		if (!file) {
-			throw new Error(`File ${oldPath} does not exist`);
-		}
-		this.localFiles.set(newPath, file);
-		if (oldPath !== newPath) {
-			this.localFiles.delete(oldPath);
-		}
+    public async rename(
+        oldPath: RelativePath,
+        newPath: RelativePath
+    ): Promise<void> {
+        const file = this.localFiles.get(oldPath);
+        if (!file) {
+            throw new Error(`File ${oldPath} does not exist`);
+        }
+        this.localFiles.set(newPath, file);
+        if (oldPath !== newPath) {
+            this.localFiles.delete(oldPath);
+        }
 
-		this.client.logger.info(
-			`Renamed file: ${oldPath} -> ${newPath} with:\n  content ${new TextDecoder().decode(file)}`
-		);
+        this.client.logger.info(
+            `Renamed file: ${oldPath} -> ${newPath} with:\n  content ${new TextDecoder().decode(file)}`
+        );
 
-		this.executeFileOperation(async () =>
-			this.client.syncLocallyUpdatedFile({
-				oldPath,
-				relativePath: newPath
-			})
-		);
-	}
+        this.executeFileOperation(async () =>
+            this.client.syncLocallyUpdatedFile({
+                oldPath,
+                relativePath: newPath
+            })
+        );
+    }
 
-	private executeFileOperation(callback: () => unknown): void {
-		if (this.useSlowFileEvents) {
-			// we aren't the best client and it takes some time to notice changes
-			setTimeout(callback, Math.random() * 100);
-		} else {
-			callback();
-		}
-	}
+    private executeFileOperation(callback: () => unknown): void {
+        if (this.useSlowFileEvents) {
+            // we aren't the best client and it takes some time to notice changes
+            setTimeout(callback, Math.random() * 100);
+        } else {
+            callback();
+        }
+    }
 }
diff --git a/frontend/test-client/src/cli.ts b/frontend/test-client/src/cli.ts
index ca433300..70817a24 100644
--- a/frontend/test-client/src/cli.ts
+++ b/frontend/test-client/src/cli.ts
@@ -11,180 +11,180 @@ const TEST_ITERATIONS = 5;
 let slowFileEvents = false;
 
 async function runTest({
-	agentCount,
-	concurrency,
-	iterations,
-	doDeletes,
-	doResets,
-	useSlowFileEvents,
-	jitterScaleInSeconds
+    agentCount,
+    concurrency,
+    iterations,
+    doDeletes,
+    doResets,
+    useSlowFileEvents,
+    jitterScaleInSeconds
 }: {
-	agentCount: number;
-	concurrency: number;
-	iterations: number;
-	doDeletes: boolean;
-	doResets: boolean;
-	useSlowFileEvents: boolean;
-	jitterScaleInSeconds: number;
+    agentCount: number;
+    concurrency: number;
+    iterations: number;
+    doDeletes: boolean;
+    doResets: boolean;
+    useSlowFileEvents: boolean;
+    jitterScaleInSeconds: number;
 }): Promise<void> {
-	slowFileEvents = useSlowFileEvents;
+    slowFileEvents = useSlowFileEvents;
 
-	const settings = `with ${agentCount} agents, concurrency ${concurrency}, iterations ${iterations}, doDeletes ${doDeletes}, doResets ${doResets}, jitterScaleInSeconds ${jitterScaleInSeconds}, useSlowFileEvents ${useSlowFileEvents}`;
-	console.info(`Running test ${settings}`);
+    const settings = `with ${agentCount} agents, concurrency ${concurrency}, iterations ${iterations}, doDeletes ${doDeletes}, doResets ${doResets}, jitterScaleInSeconds ${jitterScaleInSeconds}, useSlowFileEvents ${useSlowFileEvents}`;
+    console.info(`Running test ${settings}`);
 
-	const vaultName = uuidv4();
-	console.info(`Using vault name: ${vaultName}`);
-	const initialSettings: Partial<SyncSettings> = {
-		isSyncEnabled: true,
-		token: "   test-token-change-me     ", // same as in sync-server/config-e2e.yml with spaces
-		vaultName: randomCasing(vaultName) + (Math.random() > 0.5 ? "  " : ""), // extra spaces shouldn't matter
-		syncConcurrency: concurrency,
-		remoteUri: "http://localhost:3000"
-	};
+    const vaultName = uuidv4();
+    console.info(`Using vault name: ${vaultName}`);
+    const initialSettings: Partial<SyncSettings> = {
+        isSyncEnabled: true,
+        token: "   test-token-change-me     ", // same as in sync-server/config-e2e.yml with spaces
+        vaultName: randomCasing(vaultName) + (Math.random() > 0.5 ? "  " : ""), // extra spaces shouldn't matter
+        syncConcurrency: concurrency,
+        remoteUri: "http://localhost:3000"
+    };
 
-	const clients: MockAgent[] = [];
-	for (let i = 0; i < agentCount; i++) {
-		clients.push(
-			new MockAgent(
-				initialSettings,
-				`agent-${i}`,
-				doDeletes,
-				doResets,
-				useSlowFileEvents,
-				jitterScaleInSeconds
-			)
-		);
-	}
+    const clients: MockAgent[] = [];
+    for (let i = 0; i < agentCount; i++) {
+        clients.push(
+            new MockAgent(
+                initialSettings,
+                `agent-${i}`,
+                doDeletes,
+                doResets,
+                useSlowFileEvents,
+                jitterScaleInSeconds
+            )
+        );
+    }
 
-	try {
-		await utils.awaitAll(clients.map(async (client) => client.init()));
+    try {
+        await utils.awaitAll(clients.map(async (client) => client.init()));
 
-		for (let i = 0; i < iterations; i++) {
-			console.info(`Iteration ${i + 1}/${iterations}`);
-			await utils.awaitAll(clients.map(async (client) => client.act()));
-			await sleep(Math.random() * 200);
-		}
+        for (let i = 0; i < iterations; i++) {
+            console.info(`Iteration ${i + 1}/${iterations}`);
+            await utils.awaitAll(clients.map(async (client) => client.act()));
+            await sleep(Math.random() * 200);
+        }
 
-		console.info("Stopping agents");
+        console.info("Stopping agents");
 
-		// Each agent can have unpushed changes which might conflict with eachother so each has to resolve the conflicts & push, and
-		for (const client of clients) {
-			try {
-				console.info(`Finishing up ${client.name}`);
-				await client.finish();
-			} catch (err) {
-				if (!slowFileEvents) {
-					throw err;
-				}
-			}
-		}
+        // Each agent can have unpushed changes which might conflict with eachother so each has to resolve the conflicts & push, and
+        for (const client of clients) {
+            try {
+                console.info(`Finishing up ${client.name}`);
+                await client.finish();
+            } catch (err) {
+                if (!slowFileEvents) {
+                    throw err;
+                }
+            }
+        }
 
-		// then we need a second pass to ensure that all agents pull the same state.
-		for (const client of clients) {
-			try {
-				console.info(`Destroying ${client.name}`);
-				await client.destroy();
-			} catch (err) {
-				if (!slowFileEvents) {
-					throw err;
-				}
-			}
-		}
+        // then we need a second pass to ensure that all agents pull the same state.
+        for (const client of clients) {
+            try {
+                console.info(`Destroying ${client.name}`);
+                await client.destroy();
+            } catch (err) {
+                if (!slowFileEvents) {
+                    throw err;
+                }
+            }
+        }
 
-		console.info("Agents finished successfully");
+        console.info("Agents finished successfully");
 
-		clients.slice(0, -1).forEach((client, i) => {
-			console.info(
-				`Checking consistency between ${client.name} and ${clients[i + 1].name}`
-			);
-			client.assertFileSystemsAreConsistent(clients[i]);
-			console.info(`Consistency check for ${client.name} passed`);
-		});
+        clients.slice(0, -1).forEach((client, i) => {
+            console.info(
+                `Checking consistency between ${client.name} and ${clients[i + 1].name}`
+            );
+            client.assertFileSystemsAreConsistent(clients[i]);
+            console.info(`Consistency check for ${client.name} passed`);
+        });
 
-		console.info("File systems found to be consistent");
+        console.info("File systems found to be consistent");
 
-		clients.forEach((client) => {
-			console.info(`Checking content for ${client.name}`);
-			client.assertAllContentIsPresentOnce();
-			console.info(`Content check for ${client.name} passed`);
-		});
+        clients.forEach((client) => {
+            console.info(`Checking content for ${client.name}`);
+            client.assertAllContentIsPresentOnce();
+            console.info(`Content check for ${client.name} passed`);
+        });
 
-		console.info(`Test passed ${settings}`);
-	} catch (err) {
-		console.error(`Test failed ${settings}`);
-		throw err;
-	}
+        console.info(`Test passed ${settings}`);
+    } catch (err) {
+        console.error(`Test failed ${settings}`);
+        throw err;
+    }
 }
 
 async function runTests(): Promise<void> {
-	for (let i = 0; i < TEST_ITERATIONS; i++) {
-		for (const useSlowFileEvents of [false, true]) {
-			for (const concurrency of [
-				16,
-				1 // test with concurrency 1 to check for deadlocks
-			]) {
-				for (const doDeletes of [false, true]) {
-					await runTest({
-						agentCount: 2,
-						concurrency,
-						iterations: 100,
-						doDeletes,
-						doResets: false,
-						useSlowFileEvents,
-						jitterScaleInSeconds: 0.75
-					});
-				}
-			}
-		}
+    for (let i = 0; i < TEST_ITERATIONS; i++) {
+        for (const useSlowFileEvents of [false, true]) {
+            for (const concurrency of [
+                16,
+                1 // test with concurrency 1 to check for deadlocks
+            ]) {
+                for (const doDeletes of [false, true]) {
+                    await runTest({
+                        agentCount: 2,
+                        concurrency,
+                        iterations: 100,
+                        doDeletes,
+                        doResets: false,
+                        useSlowFileEvents,
+                        jitterScaleInSeconds: 0.75
+                    });
+                }
+            }
+        }
 
-		await runTest({
-			agentCount: 2,
-			concurrency: 16,
-			iterations: 100,
-			doDeletes: true,
-			doResets: true,
-			useSlowFileEvents: true,
-			jitterScaleInSeconds: 0.75
-		});
-	}
+        await runTest({
+            agentCount: 2,
+            concurrency: 16,
+            iterations: 100,
+            doDeletes: true,
+            doResets: true,
+            useSlowFileEvents: true,
+            jitterScaleInSeconds: 0.75
+        });
+    }
 }
 
 process.on("uncaughtException", (error) => {
-	if (slowFileEvents) {
-		return;
-	}
+    if (slowFileEvents) {
+        return;
+    }
 
-	if (
-		error instanceof Error &&
-		error.message.includes(
-			"WebSocket was closed before the connection was established"
-		)
-	) {
-		return;
-	}
+    if (
+        error instanceof Error &&
+        error.message.includes(
+            "WebSocket was closed before the connection was established"
+        )
+    ) {
+        return;
+    }
 
-	console.error("Uncaught exception:", error);
-	process.exit(1);
+    console.error("Uncaught exception:", error);
+    process.exit(1);
 });
 
 process.on("unhandledRejection", (error, _promise) => {
-	if (error instanceof Error && error.message === "Sync was reset") {
-		return;
-	}
+    if (error instanceof Error && error.message === "Sync was reset") {
+        return;
+    }
 
-	if (slowFileEvents) {
-		return;
-	}
+    if (slowFileEvents) {
+        return;
+    }
 
-	console.error("Unhandled rejection:", error);
-	process.exit(1);
+    console.error("Unhandled rejection:", error);
+    process.exit(1);
 });
 
 runTests()
-	.then(() => {
-		process.exit(0);
-	})
-	.catch((err: unknown) => {
-		console.error(err);
-		process.exit(1);
-	});
+    .then(() => {
+        process.exit(0);
+    })
+    .catch((err: unknown) => {
+        console.error(err);
+        process.exit(1);
+    });
diff --git a/frontend/test-client/src/utils/assert.ts b/frontend/test-client/src/utils/assert.ts
index e1e3bb98..4e709060 100644
--- a/frontend/test-client/src/utils/assert.ts
+++ b/frontend/test-client/src/utils/assert.ts
@@ -1,5 +1,5 @@
 export function assert(value: boolean, message: string): asserts value {
-	if (!value) {
-		throw new Error(message);
-	}
+    if (!value) {
+        throw new Error(message);
+    }
 }
diff --git a/frontend/test-client/src/utils/choose.ts b/frontend/test-client/src/utils/choose.ts
index adb1dc7c..09d8339f 100644
--- a/frontend/test-client/src/utils/choose.ts
+++ b/frontend/test-client/src/utils/choose.ts
@@ -1,3 +1,3 @@
 export function choose<T>(values: T[]): T {
-	return values[Math.floor(Math.random() * values.length)];
+    return values[Math.floor(Math.random() * values.length)];
 }
diff --git a/frontend/test-client/src/utils/random-casing.test.ts b/frontend/test-client/src/utils/random-casing.test.ts
index 67033305..33217525 100644
--- a/frontend/test-client/src/utils/random-casing.test.ts
+++ b/frontend/test-client/src/utils/random-casing.test.ts
@@ -3,11 +3,11 @@ import assert from "node:assert";
 import { randomCasing } from "./random-casing";
 
 describe("randomCasing", () => {
-	it("simple test", () => {
-		const input =
-			"hello, this is a really long string with a lot of characters";
-		const result = randomCasing(input);
-		assert.strictEqual(result.toLowerCase(), input.toLowerCase());
-		assert.notStrictEqual(result, input);
-	});
+    it("simple test", () => {
+        const input =
+            "hello, this is a really long string with a lot of characters";
+        const result = randomCasing(input);
+        assert.strictEqual(result.toLowerCase(), input.toLowerCase());
+        assert.notStrictEqual(result, input);
+    });
 });
diff --git a/frontend/test-client/src/utils/random-casing.ts b/frontend/test-client/src/utils/random-casing.ts
index bf9f99dc..ba09dace 100644
--- a/frontend/test-client/src/utils/random-casing.ts
+++ b/frontend/test-client/src/utils/random-casing.ts
@@ -1,10 +1,10 @@
 export function randomCasing(str: string): string {
-	const chars = str.split("");
-	const randomCasedChars = chars.map((char) => {
-		if (Math.random() < 0.5) {
-			return char.toUpperCase();
-		}
-		return char.toLowerCase();
-	});
-	return randomCasedChars.join("");
+    const chars = str.split("");
+    const randomCasedChars = chars.map((char) => {
+        if (Math.random() < 0.5) {
+            return char.toUpperCase();
+        }
+        return char.toLowerCase();
+    });
+    return randomCasedChars.join("");
 }
diff --git a/frontend/test-client/src/utils/sleep.ts b/frontend/test-client/src/utils/sleep.ts
index 638fc019..ff474799 100644
--- a/frontend/test-client/src/utils/sleep.ts
+++ b/frontend/test-client/src/utils/sleep.ts
@@ -1,3 +1,3 @@
 export async function sleep(ms: number): Promise<void> {
-	return new Promise((resolve) => setTimeout(resolve, ms));
+    return new Promise((resolve) => setTimeout(resolve, ms));
 }
diff --git a/frontend/test-client/src/utils/with-timeout.ts b/frontend/test-client/src/utils/with-timeout.ts
index 7d20dc18..71c9568b 100644
--- a/frontend/test-client/src/utils/with-timeout.ts
+++ b/frontend/test-client/src/utils/with-timeout.ts
@@ -1,16 +1,16 @@
 export async function withTimeout<T>(
-	promise: Promise<T>,
-	timeoutMs: number,
-	operationName: string
+    promise: Promise<T>,
+    timeoutMs: number,
+    operationName: string
 ): Promise<T> {
-	return Promise.race([
-		promise,
-		new Promise<T>((_, reject) =>
-			setTimeout(() => {
-				reject(
-					new Error(`${operationName} timed out after ${timeoutMs}ms`)
-				);
-			}, timeoutMs)
-		)
-	]);
+    return Promise.race([
+        promise,
+        new Promise<T>((_, reject) =>
+            setTimeout(() => {
+                reject(
+                    new Error(`${operationName} timed out after ${timeoutMs}ms`)
+                );
+            }, timeoutMs)
+        )
+    ]);
 }
diff --git a/frontend/test-client/tsconfig.json b/frontend/test-client/tsconfig.json
index 7b38e409..e86df89d 100644
--- a/frontend/test-client/tsconfig.json
+++ b/frontend/test-client/tsconfig.json
@@ -1,17 +1,17 @@
 {
-	"compilerOptions": {
-		"baseUrl": ".",
-		"strict": true,
-		"target": "ES2022",
-		"module": "CommonJS",
-		"esModuleInterop": true,
-		"lib": [
-			"DOM",
-			"ES2024",
-		],
-		"moduleResolution": "node"
-	},
-	"exclude": [
-		"./dist"
-	]
-}
\ No newline at end of file
+    "compilerOptions": {
+        "baseUrl": ".",
+        "strict": true,
+        "target": "ES2022",
+        "module": "CommonJS",
+        "esModuleInterop": true,
+        "lib": [
+            "DOM",
+            "ES2024",
+        ],
+        "moduleResolution": "node"
+    },
+    "exclude": [
+        "./dist"
+    ]
+}
diff --git a/frontend/test-client/webpack.config.js b/frontend/test-client/webpack.config.js
index b2324b9b..6aee1547 100644
--- a/frontend/test-client/webpack.config.js
+++ b/frontend/test-client/webpack.config.js
@@ -2,29 +2,29 @@ const path = require("path");
 const webpack = require("webpack");
 
 module.exports = {
-	entry: "./src/cli.ts",
-	target: "node",
-	mode: "production",
-	optimization: {
-		minimize: false
-	},
-	module: {
-		rules: [
-			{
-				test: /\.ts$/,
-				use: "ts-loader"
-			}
-		]
-	},
-	resolve: {
-		extensions: [".ts", ".js"]
-	},
-	output: {
-		globalObject: "this",
-		filename: "cli.js",
-		path: path.resolve(__dirname, "dist")
-	},
-	plugins: [
-		new webpack.BannerPlugin({ banner: "#!/usr/bin/env node", raw: true })
-	]
+    entry: "./src/cli.ts",
+    target: "node",
+    mode: "production",
+    optimization: {
+        minimize: false
+    },
+    module: {
+        rules: [
+            {
+                test: /\.ts$/,
+                use: "ts-loader"
+            }
+        ]
+    },
+    resolve: {
+        extensions: [".ts", ".js"]
+    },
+    output: {
+        globalObject: "this",
+        filename: "cli.js",
+        path: path.resolve(__dirname, "dist")
+    },
+    plugins: [
+        new webpack.BannerPlugin({ banner: "#!/usr/bin/env node", raw: true })
+    ]
 };
diff --git a/manifest.json b/manifest.json
index 68d1568b..c8ee915b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,10 +1,10 @@
 {
-	"id": "vault-link",
-	"name": "VaultLink",
-	"version": "0.12.0",
-	"minAppVersion": "0.0.0",
-	"description": "Self-hosted synchronization and collaboration for your Vault.",
-	"author": "Andras Schmelczer",
-	"authorUrl": "https://schmelczer.dev",
-	"isDesktopOnly": false
-}
\ No newline at end of file
+    "id": "vault-link",
+    "name": "VaultLink",
+    "version": "0.12.0",
+    "minAppVersion": "0.0.0",
+    "description": "Self-hosted synchronization and collaboration for your Vault.",
+    "author": "Andras Schmelczer",
+    "authorUrl": "https://schmelczer.dev",
+    "isDesktopOnly": false
+}
diff --git a/scripts/build-sync-server-binaries.sh b/scripts/build-sync-server-binaries.sh
index 80d8d5e2..8d690935 100755
--- a/scripts/build-sync-server-binaries.sh
+++ b/scripts/build-sync-server-binaries.sh
@@ -16,29 +16,29 @@ rm -f artifacts/sync-server-*
 
 for target in $targets; do
     echo "Building $target..."
-    
+
     # Set linkers for cross-compilation
     case "$target" in
-        aarch64-unknown-linux-gnu) 
+        aarch64-unknown-linux-gnu)
             export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc ;;
-        x86_64-unknown-linux-musl) 
+        x86_64-unknown-linux-musl)
             export CARGO_TARGET_X86_64_UNKNOWN_LINUX_MUSL_LINKER=musl-gcc ;;
-        x86_64-pc-windows-gnu) 
+        x86_64-pc-windows-gnu)
             export CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER=x86_64-w64-mingw32-gcc ;;
     esac
-    
+
     rustup target add "$target" 2>/dev/null || true
-    
+
     cargo build --release --target "$target"
     ext=""
     [[ "$target" == *windows* ]] && ext=".exe"
-    
+
     name="sync-server-${target//-/_}$ext"
     name="${name//x86_64_unknown_linux_gnu/linux-x86_64}"
     name="${name//x86_64_unknown_linux_musl/linux-x86_64-musl}"
     name="${name//aarch64_unknown_linux_gnu/linux-aarch64}"
     name="${name//x86_64_pc_windows_gnu/windows-x86_64}"
-    
+
     cp "target/$target/release/sync_server$ext" "artifacts/$name"
     echo "✓ Built $name"
 done
diff --git a/sync-server/rust-toolchain.toml b/sync-server/rust-toolchain.toml
index 635d09fb..010956cc 100644
--- a/sync-server/rust-toolchain.toml
+++ b/sync-server/rust-toolchain.toml
@@ -1,7 +1,7 @@
 [toolchain]
 channel = "1.89.0"
-targets = [ 
-  "x86_64-unknown-linux-gnu", 
+targets = [
+  "x86_64-unknown-linux-gnu",
   "x86_64-unknown-linux-musl",
   "aarch64-unknown-linux-gnu",
   "x86_64-pc-windows-gnu",
diff --git a/sync-server/src/app_state/database.rs b/sync-server/src/app_state/database.rs
index 41097925..25dabfa2 100644
--- a/sync-server/src/app_state/database.rs
+++ b/sync-server/src/app_state/database.rs
@@ -321,8 +321,8 @@ impl Database {
             from latest_document_versions
             where relative_path = ? and is_deleted = false
             order by vault_update_id desc  -- `latest_document_versions` only contains a single latest version of each document, however,
-                                           -- multiple documents can have the same `relative_path`, if they have been deleted. That's
-                                           -- why we only care about the latest version of the document with the given relative path.
+                                            -- multiple documents can have the same `relative_path`, if they have been deleted. That's
+                                            -- why we only care about the latest version of the document with the given relative path.
             limit 1
             "#,
             relative_path
diff --git a/sync-server/src/config/user_config.rs b/sync-server/src/config/user_config.rs
index cdfed838..8b2537f0 100644
--- a/sync-server/src/config/user_config.rs
+++ b/sync-server/src/config/user_config.rs
@@ -21,7 +21,7 @@ where
         if let Some(existing_name) = user_token_map.get_by_right(&user.token) {
             return Err(D::Error::custom(format!(
                 "Duplicate user token found: `{}` for users `{}` and `{}`. User tokens must be \
-                 unique.",
+                unique.",
                 user.token, existing_name, user.name
             )));
         }
diff --git a/sync-server/src/server/fetch_document_version.rs b/sync-server/src/server/fetch_document_version.rs
index 67e72ca4..c30f1d76 100644
--- a/sync-server/src/server/fetch_document_version.rs
+++ b/sync-server/src/server/fetch_document_version.rs
@@ -54,7 +54,7 @@ pub async fn fetch_document_version(
     if result.document_id != document_id {
         return Err(not_found_error(anyhow!(
             "Document with document id `{document_id}` does not have a version with id \
-             `{vault_update_id}`",
+            `{vault_update_id}`",
         )));
     }
 
diff --git a/sync-server/src/server/fetch_document_version_content.rs b/sync-server/src/server/fetch_document_version_content.rs
index a74e88ec..9fdd0ad8 100644
--- a/sync-server/src/server/fetch_document_version_content.rs
+++ b/sync-server/src/server/fetch_document_version_content.rs
@@ -54,7 +54,7 @@ pub async fn fetch_document_version_content(
     if result.document_id != document_id {
         return Err(not_found_error(anyhow!(
             "Document with document id `{document_id}` does not have a version with id \
-             `{vault_update_id}`",
+            `{vault_update_id}`",
         )));
     }
 

From 0a5bbbf20ec315d4924132b789760721522cadc7 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 7 Dec 2025 14:44:42 +0000
Subject: [PATCH 725/761] Fix and apply editorconfig

---
 .editorconfig                                 |   3 +-
 .github/workflows/check.yml                   |   2 +-
 docs/architecture/data-flow.md                | 264 +++++-----
 docs/architecture/index.md                    |   8 +-
 docs/config/authentication.md                 |   6 +-
 frontend/local-client-cli/tsconfig.json       |   6 +-
 frontend/local-client-cli/webpack.config.js   |  56 +--
 .../obsidian-plugin/src/vault-link-plugin.ts  | 452 +++++++++---------
 frontend/obsidian-plugin/tsconfig.json        |  32 +-
 scripts/check.sh                              |  11 +-
 scripts/e2e.sh                                |   1 -
 11 files changed, 423 insertions(+), 418 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 7074dff5..ade62e59 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -11,5 +11,6 @@ indent_style = space
 indent_size = 4
 tab_width = 4
 
-[*.{yml,yaml}]
+[*.{yml,yaml,md}]
 indent_size = 2
+tab_width = 2
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index e2421e27..f3fad1df 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -22,7 +22,7 @@ jobs:
         with:
           node-version: "22.x"
           check-latest: true
-      
+
       - name: Setup Rust toolchain
         uses: dtolnay/rust-toolchain@stable
         with:
diff --git a/docs/architecture/data-flow.md b/docs/architecture/data-flow.md
index 5b256f1d..832c5624 100644
--- a/docs/architecture/data-flow.md
+++ b/docs/architecture/data-flow.md
@@ -125,37 +125,37 @@ sequenceDiagram
 ```
 ┌─────────┐
 │ Client  │
-└────┬────┘
-     │ 1. Detect file change
-     │
-     ├─► 2. Read file content
-     │
-     ├─► 3. Create upload message
-     │    {
-     │      type: "upload_file",
-     │      path: "notes/daily.md",
-     │      content: "...",
-     │      version: 42,
-     │      timestamp: "2024-01-01T12:00:00Z"
-     │    }
-     │
-     ▼
+└───┬─-───┘
+    │ 1. Detect file change
+    │
+    ├─► 2. Read file content
+    │
+    ├─► 3. Create upload message
+    │    {
+    │      type: "upload_file",
+    │      path: "notes/daily.md",
+    │      content: "...",
+    │      version: 42,
+    │      timestamp: "2024-01-01T12:00:00Z"
+    │    }
+    │
+    ▼
 ┌─────────┐
 │ Server  │
-└────┬────┘
-     │ 4. Validate message
-     │
-     ├─► 5. Check permissions
-     │
-     ├─► 6. Apply OT (if conflicts)
-     │
-     ├─► 7. Store in database
-     │
-     ├─► 8. Update version
-     │
-     ├─► 9. Broadcast to clients
-     │
-     └─► 10. Send ACK to uploader
+└───┬────-┘
+    │ 4. Validate message
+    │
+    ├─► 5. Check permissions
+    │
+    ├─► 6. Apply OT (if conflicts)
+    │
+    ├─► 7. Store in database
+    │
+    ├─► 8. Update version
+    │
+    ├─► 9. Broadcast to clients
+    │
+    └─► 10. Send ACK to uploader
 ```
 
 ### Download
@@ -163,36 +163,36 @@ sequenceDiagram
 ```
 ┌─────────┐
 │ Server  │
-└────┬────┘
-     │ 1. File updated by another client
-     │
-     ├─► 2. Broadcast notification
-     │    {
-     │      type: "file_updated",
-     │      path: "notes/daily.md",
-     │      version: 43
-     │    }
-     │
-     ▼
+└───┬─-───┘
+    │ 1. File updated by another client
+    │
+    ├─► 2. Broadcast notification
+    │    {
+    │      type: "file_updated",
+    │      path: "notes/daily.md",
+    │      version: 43
+    │    }
+    │
+    ▼
 ┌─────────┐
 │ Client  │
-└────┬────┘
-     │ 3. Receive notification
-     │
-     ├─► 4. Request file download
-     │    {
-     │      type: "download_file",
-     │      path: "notes/daily.md",
-     │      version: 43
-     │    }
-     │
-     ▼
+└───┬─-───┘
+    │ 3. Receive notification
+    │
+    ├─► 4. Request file download
+    │    {
+    │      type: "download_file",
+    │      path: "notes/daily.md",
+    │      version: 43
+    │    }
+    │
+    ▼
 ┌─────────┐
 │ Server  │
-└────┬────┘
-     │ 5. Retrieve from database
-     │
-     └─► 6. Send file content
+└───┬─=───┘
+    │ 5. Retrieve from database
+    │
+    └─► 6. Send file content
           {
             type: "file_content",
             path: "notes/daily.md",
@@ -201,9 +201,9 @@ sequenceDiagram
           }
           │
           ▼
-     ┌─────────┐
-     │ Client  │
-     └────┬────┘
+    ┌─────────┐
+    │ Client  │
+    └───-─┬───┘
           │ 7. Write to filesystem
           │
           └─► 8. Update local metadata
@@ -215,30 +215,30 @@ sequenceDiagram
 ┌─────────┐
 │ Client  │
 └────┬────┘
-     │ 1. File deleted locally
-     │
-     ├─► 2. Send delete message
-     │    {
-     │      type: "delete_file",
-     │      path: "notes/old.md"
-     │    }
-     │
-     ▼
+    │ 1. File deleted locally
+    │
+    ├─► 2. Send delete message
+    │    {
+    │      type: "delete_file",
+    │      path: "notes/old.md"
+    │    }
+    │
+    ▼
 ┌─────────┐
 │ Server  │
 └────┬────┘
-     │ 3. Mark as deleted in DB
-     │    (soft delete for history)
-     │
-     ├─► 4. Broadcast deletion
-     │
-     └─► 5. ACK to sender
+    │ 3. Mark as deleted in DB
+    │    (soft delete for history)
+    │
+    ├─► 4. Broadcast deletion
+    │
+    └─► 5. ACK to sender
           │
           ▼
-     ┌─────────┐
-     │ Other   │
-     │ Clients │
-     └────┬────┘
+    ┌─────────┐
+    │ Other   │
+    │ Clients │
+    └────┬────┘
           │ 6. Delete local file
           │
           └─► 7. Update metadata
@@ -252,32 +252,32 @@ sequenceDiagram
 Time →
 
 Client A                    Server                      Client B
-   │                          │                            │
-   │ Edit file v10            │                            │
-   │ "Add line A"             │                            │ Edit file v10
-   │                          │                            │ "Add line B"
-   │                          │                            │
-   ├─── Upload @ t1 ─────────►│                            │
-   │                          │◄────── Upload @ t2 ────────┤
-   │                          │                            │
-   │                          │ 1. Receive both edits      │
-   │                          │    (based on v10)          │
-   │                          │                            │
-   │                          │ 2. Apply first edit        │
-   │                          │    → v11 (line A added)    │
-   │                          │                            │
-   │                          │ 3. Transform second edit   │
-   │                          │    against first           │
-   │                          │                            │
-   │                          │ 4. Apply transformed edit  │
-   │                          │    → v12 (both lines)      │
-   │                          │                            │
-   │◄──── v12 content ────────┤                            │
-   │                          ├───── v12 content ─────────►│
-   │                          │                            │
-   │ Apply v12                │                            │ Apply v12
-   │ (has both lines)         │                            │ (has both lines)
-   │                          │                            │
+  │                          │                            │
+  │ Edit file v10            │                            │
+  │ "Add line A"             │                            │ Edit file v10
+  │                          │                            │ "Add line B"
+  │                          │                            │
+  ├─── Upload @ t1 ─────────►│                            │
+  │                          │◄────── Upload @ t2 ────────┤
+  │                          │                            │
+  │                          │ 1. Receive both edits      │
+  │                          │    (based on v10)          │
+  │                          │                            │
+  │                          │ 2. Apply first edit        │
+  │                          │    → v11 (line A added)    │
+  │                          │                            │
+  │                          │ 3. Transform second edit   │
+  │                          │    against first           │
+  │                          │                            │
+  │                          │ 4. Apply transformed edit  │
+  │                          │    → v12 (both lines)      │
+  │                          │                            │
+  │◄──── v12 content ────────┤                            │
+  │                          ├───── v12 content ─────────►│
+  │                          │                            │
+  │ Apply v12                │                            │ Apply v12
+  │ (has both lines)         │                            │ (has both lines)
+  │                          │                            │
 ```
 
 ### Conflict Resolution Steps
@@ -361,11 +361,11 @@ VALUES (?, ?, ?);
 
 ```json
 {
-	"type": "upload_file",
-	"path": "notes/example.md",
-	"content": "File content here...",
-	"base_version": 10,
-	"timestamp": "2024-01-01T12:00:00Z"
+  "type": "upload_file",
+  "path": "notes/example.md",
+  "content": "File content here...",
+  "base_version": 10,
+  "timestamp": "2024-01-01T12:00:00Z"
 }
 ```
 
@@ -373,8 +373,8 @@ VALUES (?, ?, ?);
 
 ```json
 {
-	"type": "download_file",
-	"path": "notes/example.md"
+  "type": "download_file",
+  "path": "notes/example.md"
 }
 ```
 
@@ -382,8 +382,8 @@ VALUES (?, ?, ?);
 
 ```json
 {
-	"type": "delete_file",
-	"path": "notes/old.md"
+  "type": "delete_file",
+  "path": "notes/old.md"
 }
 ```
 
@@ -391,8 +391,8 @@ VALUES (?, ?, ?);
 
 ```json
 {
-	"type": "list_files",
-	"since_version": 0
+  "type": "list_files",
+  "since_version": 0
 }
 ```
 
@@ -402,11 +402,11 @@ VALUES (?, ?, ?);
 
 ```json
 {
-	"type": "file_updated",
-	"path": "notes/example.md",
-	"version": 11,
-	"size": 1024,
-	"hash": "abc123..."
+  "type": "file_updated",
+  "path": "notes/example.md",
+  "version": 11,
+  "size": 1024,
+  "hash": "abc123..."
 }
 ```
 
@@ -414,10 +414,10 @@ VALUES (?, ?, ?);
 
 ```json
 {
-	"type": "file_content",
-	"path": "notes/example.md",
-	"content": "Updated content...",
-	"version": 11
+  "type": "file_content",
+  "path": "notes/example.md",
+  "content": "Updated content...",
+  "version": 11
 }
 ```
 
@@ -425,9 +425,9 @@ VALUES (?, ?, ?);
 
 ```json
 {
-	"type": "file_deleted",
-	"path": "notes/old.md",
-	"version": 12
+  "type": "file_deleted",
+  "path": "notes/old.md",
+  "version": 12
 }
 ```
 
@@ -435,9 +435,9 @@ VALUES (?, ?, ?);
 
 ```json
 {
-	"type": "sync_complete",
-	"total_files": 150,
-	"current_version": 200
+  "type": "sync_complete",
+  "total_files": 150,
+  "current_version": 200
 }
 ```
 
@@ -445,9 +445,9 @@ VALUES (?, ?, ?);
 
 ```json
 {
-	"type": "error",
-	"message": "File too large",
-	"code": "FILE_TOO_LARGE"
+  "type": "error",
+  "message": "File too large",
+  "code": "FILE_TOO_LARGE"
 }
 ```
 
diff --git a/docs/architecture/index.md b/docs/architecture/index.md
index 5d4c6d73..f5eca5e3 100644
--- a/docs/architecture/index.md
+++ b/docs/architecture/index.md
@@ -11,10 +11,10 @@ Central sync server with multiple clients. High-level architecture and design de
 │  Obsidian Plugin    │  Obsidian Plugin  │   CLI Client      │
 │  (User A - Device1) │  (User A - Device2│   (Server/Backup) │
 └──────────┬──────────┴─────────┬─────────┴──────────┬────────┘
-           │                    │                    │
-           │    WebSocket       │   WebSocket        │   WebSocket
-           │                    │                    │
-           └────────────────────┼────────────────────┘
+          │                    │                    │
+          │    WebSocket       │   WebSocket        │   WebSocket
+          │                    │                    │
+          └────────────────────┼────────────────────┘
                                 │
                     ┌───────────▼───────────┐
                     │   Sync Server         │
diff --git a/docs/config/authentication.md b/docs/config/authentication.md
index 944e56f2..11425b5b 100644
--- a/docs/config/authentication.md
+++ b/docs/config/authentication.md
@@ -243,9 +243,9 @@ users:
 2. Client sends authentication message:
     ```json
     {
-    	"type": "auth",
-    	"token": "user-token",
-    	"vault": "vault-name"
+      "type": "auth",
+      "token": "user-token",
+      "vault": "vault-name"
     }
     ```
 3. Server validates:
diff --git a/frontend/local-client-cli/tsconfig.json b/frontend/local-client-cli/tsconfig.json
index ce04f662..25f249c9 100644
--- a/frontend/local-client-cli/tsconfig.json
+++ b/frontend/local-client-cli/tsconfig.json
@@ -4,7 +4,7 @@
         "module": "ESNext",
         "lib": [
             "DOM", // to get `fetch` & `WebSocket`
-			"ES2024"
+            "ES2024"
         ],
         "outDir": "./dist",
         "rootDir": "./src",
@@ -18,5 +18,7 @@
         "declarationMap": true,
         "sourceMap": true
     },
-    "exclude": ["dist"]
+    "exclude": [
+        "dist"
+    ]
 }
diff --git a/frontend/local-client-cli/webpack.config.js b/frontend/local-client-cli/webpack.config.js
index 32b3b125..f8f48534 100644
--- a/frontend/local-client-cli/webpack.config.js
+++ b/frontend/local-client-cli/webpack.config.js
@@ -2,32 +2,32 @@ const path = require("path");
 const webpack = require("webpack");
 
 module.exports = {
-		entry: {
-			cli: "./src/cli.ts",
-			healthcheck: "./src/healthcheck.ts"
-		},
-		target: "node",
-		mode: "production",
-		optimization: {
-			minimize: false
-		},
-		module: {
-			rules: [
-				{
-					test: /\.ts$/,
-					use: "ts-loader"
-				}
-			]
-		},
-		resolve: {
-			extensions: [".ts", ".js"]
-		},
-		output: {
-			globalObject: "this",
-			filename: "[name].js",
-			path: path.resolve(__dirname, "dist")
-		},
-		plugins: [
-		new webpack.BannerPlugin({ banner: "#!/usr/bin/env node", raw: true })
-		]
+        entry: {
+            cli: "./src/cli.ts",
+            healthcheck: "./src/healthcheck.ts"
+        },
+        target: "node",
+        mode: "production",
+        optimization: {
+            minimize: false
+        },
+        module: {
+            rules: [
+                {
+                    test: /\.ts$/,
+                    use: "ts-loader"
+                }
+            ]
+        },
+        resolve: {
+            extensions: [".ts", ".js"]
+        },
+        output: {
+            globalObject: "this",
+            filename: "[name].js",
+            path: path.resolve(__dirname, "dist")
+        },
+        plugins: [
+        new webpack.BannerPlugin({ banner: "#!/usr/bin/env node", raw: true })
+        ]
 };
diff --git a/frontend/obsidian-plugin/src/vault-link-plugin.ts b/frontend/obsidian-plugin/src/vault-link-plugin.ts
index 54e302f8..12ba1060 100644
--- a/frontend/obsidian-plugin/src/vault-link-plugin.ts
+++ b/frontend/obsidian-plugin/src/vault-link-plugin.ts
@@ -1,9 +1,9 @@
 import type {
-	MarkdownView,
-	Editor,
-	MarkdownFileInfo,
-	TAbstractFile,
-	WorkspaceLeaf
+    MarkdownView,
+    Editor,
+    MarkdownFileInfo,
+    TAbstractFile,
+    WorkspaceLeaf
 } from "obsidian";
 import { Notice, Platform, Plugin, TFile } from "obsidian";
 import "../manifest.json";
@@ -12,19 +12,19 @@ import { StatusBar } from "./views/status-bar/status-bar";
 import { LogsView } from "./views/logs/logs-view";
 import { StatusDescription } from "./views/status-description/status-description";
 import {
-	SyncClient,
-	rateLimit,
-	DEFAULT_SETTINGS,
-	Logger,
-	debugging
+    SyncClient,
+    rateLimit,
+    DEFAULT_SETTINGS,
+    Logger,
+    debugging
 } from "sync-client";
 import { ObsidianFileSystemOperations } from "./obsidian-file-system";
 import { SyncSettingsTab } from "./views/settings/settings-tab";
 import { EditorStatusDisplayManager } from "./views/editor-status-display-manager/editor-status-display-manager";
 import { remoteCursorsTheme } from "./views/cursors/remote-cursor-theme";
 import {
-	remoteCursorsPlugin,
-	RemoteCursorsPluginValue
+    remoteCursorsPlugin,
+    RemoteCursorsPluginValue
 } from "./views/cursors/remote-cursors-plugin";
 import { LocalCursorUpdateListener } from "./views/cursors/local-cursor-update-listener";
 import { renderCursorsInFileExplorer } from "./views/cursors/file-explorer";
@@ -33,252 +33,252 @@ const MIN_WAIT_BETWEEN_UPDATES_IN_MS = 250;
 const IS_DEBUG_BUILD = process.env.NODE_ENV === "development";
 
 export default class VaultLinkPlugin extends Plugin {
-	private readonly rateLimitedUpdatesPerFile = new Map<
-		string,
-		() => Promise<unknown>
-	>();
+    private readonly rateLimitedUpdatesPerFile = new Map<
+        string,
+        () => Promise<unknown>
+    >();
 
-	private readonly syncClient: SyncClient | undefined;
-	private settingsTab: SyncSettingsTab | undefined;
+    private readonly syncClient: SyncClient | undefined;
+    private settingsTab: SyncSettingsTab | undefined;
 
-	public async onload(): Promise<void> {
-		this.app.workspace.onLayoutReady(async () => {
-			// eslint-disable-next-line
-			if ((globalThis as any).VAULT_LINK_RUNNING_INSTANCE) {
-				new Notice(
-					"Another instance of VaultLink is already running. Please disable the duplicate instance."
-				);
-				throw new Error("VaultLink instance already running");
-			}
-			// eslint-disable-next-line
-			(globalThis as any).VAULT_LINK_RUNNING_INSTANCE = this;
+    public async onload(): Promise<void> {
+        this.app.workspace.onLayoutReady(async () => {
+            // eslint-disable-next-line
+            if ((globalThis as any).VAULT_LINK_RUNNING_INSTANCE) {
+                new Notice(
+                    "Another instance of VaultLink is already running. Please disable the duplicate instance."
+                );
+                throw new Error("VaultLink instance already running");
+            }
+            // eslint-disable-next-line
+            (globalThis as any).VAULT_LINK_RUNNING_INSTANCE = this;
 
-			const client = await this.createSyncClient();
+            const client = await this.createSyncClient();
 
-			this.registerObsidianExtensions(client);
+            this.registerObsidianExtensions(client);
 
-			this.registerEditorEvents(client);
+            this.registerEditorEvents(client);
 
-			this.register(async () => {
-				await client.waitUntilFinished();
-				await client.destroy();
-			});
+            this.register(async () => {
+                await client.waitUntilFinished();
+                await client.destroy();
+            });
 
-			await client.start();
-		});
-	}
+            await client.start();
+        });
+    }
 
-	public onUserEnable(): void {
-		new Notice(
-			"VaultLink has been enabled, check out the docs for tips on getting started!"
-		);
-		void this.activateView(HistoryView.TYPE).catch((e: unknown) => {
-			this.syncClient?.logger.error(
-				`Failed to open history view on enable: ${e}`
-			);
-		});
-		void this.activateView(LogsView.TYPE).catch((e: unknown) => {
-			this.syncClient?.logger.error(
-				`Failed to open logs view on enable: ${e}`
-			);
-		});
-		this.openSettings();
-	}
+    public onUserEnable(): void {
+        new Notice(
+            "VaultLink has been enabled, check out the docs for tips on getting started!"
+        );
+        void this.activateView(HistoryView.TYPE).catch((e: unknown) => {
+            this.syncClient?.logger.error(
+                `Failed to open history view on enable: ${e}`
+            );
+        });
+        void this.activateView(LogsView.TYPE).catch((e: unknown) => {
+            this.syncClient?.logger.error(
+                `Failed to open logs view on enable: ${e}`
+            );
+        });
+        this.openSettings();
+    }
 
-	public openSettings(): void {
-		// eslint-disable-next-line
-		(this.app as any).setting.open(); // this is undocumented
-		// eslint-disable-next-line
-		(this.app as any).setting.openTab(this.settingsTab); // this is undocumented
-	}
+    public openSettings(): void {
+        // eslint-disable-next-line
+        (this.app as any).setting.open(); // this is undocumented
+        // eslint-disable-next-line
+        (this.app as any).setting.openTab(this.settingsTab); // this is undocumented
+    }
 
-	public closeSettings(): void {
-		// eslint-disable-next-line
-		(this.app as any).setting.close(); // this is undocumented
-	}
+    public closeSettings(): void {
+        // eslint-disable-next-line
+        (this.app as any).setting.close(); // this is undocumented
+    }
 
-	public async activateView(type: string): Promise<void> {
-		const { workspace } = this.app;
+    public async activateView(type: string): Promise<void> {
+        const { workspace } = this.app;
 
-		let leaf: WorkspaceLeaf | null = null;
-		const leaves = workspace.getLeavesOfType(type);
+        let leaf: WorkspaceLeaf | null = null;
+        const leaves = workspace.getLeavesOfType(type);
 
-		if (leaves.length > 0) {
-			[leaf] = leaves;
-		} else {
-			leaf = workspace.getRightLeaf(false);
-			await leaf?.setViewState({ type: type, active: true });
-		}
+        if (leaves.length > 0) {
+            [leaf] = leaves;
+        } else {
+            leaf = workspace.getRightLeaf(false);
+            await leaf?.setViewState({ type: type, active: true });
+        }
 
-		if (leaf) {
-			await workspace.revealLeaf(leaf);
-		}
-	}
+        if (leaf) {
+            await workspace.revealLeaf(leaf);
+        }
+    }
 
-	private async createSyncClient(): Promise<SyncClient> {
-		DEFAULT_SETTINGS.ignorePatterns.push(
-			".obsidian/**",
-			".git/**",
-			".trash/**",
-			"**/.DS_Store"
-		);
+    private async createSyncClient(): Promise<SyncClient> {
+        DEFAULT_SETTINGS.ignorePatterns.push(
+            ".obsidian/**",
+            ".git/**",
+            ".trash/**",
+            "**/.DS_Store"
+        );
 
-		const client = await SyncClient.create({
-			fs: new ObsidianFileSystemOperations(
-				this.app.vault,
-				this.app.workspace
-			),
-			persistence: {
-				load: this.loadData.bind(this),
-				save: this.saveData.bind(this)
-			},
-			nativeLineEndings: Platform.isWin ? "\r\n" : "\n",
-			...(IS_DEBUG_BUILD
-				? {
-						fetch: debugging.slowFetchFactory(1),
-						webSocket: debugging.slowWebSocketFactory(
-							1,
-							new Logger()
-						)
-					}
-				: {})
-		});
+        const client = await SyncClient.create({
+            fs: new ObsidianFileSystemOperations(
+                this.app.vault,
+                this.app.workspace
+            ),
+            persistence: {
+                load: this.loadData.bind(this),
+                save: this.saveData.bind(this)
+            },
+            nativeLineEndings: Platform.isWin ? "\r\n" : "\n",
+            ...(IS_DEBUG_BUILD
+                ? {
+                    fetch: debugging.slowFetchFactory(1),
+                    webSocket: debugging.slowWebSocketFactory(
+                        1,
+                        new Logger()
+                    )
+                }
+                : {})
+        });
 
-		if (IS_DEBUG_BUILD) {
-			debugging.logToConsole(client);
-		}
+        if (IS_DEBUG_BUILD) {
+            debugging.logToConsole(client);
+        }
 
-		return client;
-	}
+        return client;
+    }
 
-	private registerObsidianExtensions(client: SyncClient): void {
-		const statusDescription = new StatusDescription(client);
+    private registerObsidianExtensions(client: SyncClient): void {
+        const statusDescription = new StatusDescription(client);
 
-		this.settingsTab = new SyncSettingsTab({
-			app: this.app,
-			plugin: this,
-			syncClient: client,
-			statusDescription
-		});
-		this.addSettingTab(this.settingsTab);
+        this.settingsTab = new SyncSettingsTab({
+            app: this.app,
+            plugin: this,
+            syncClient: client,
+            statusDescription
+        });
+        this.addSettingTab(this.settingsTab);
 
-		new StatusBar(this, client);
+        new StatusBar(this, client);
 
-		this.registerView(HistoryView.TYPE, (leaf) => {
-			const view = new HistoryView(client, leaf);
-			this.register(async () => view.onClose());
-			return view;
-		});
+        this.registerView(HistoryView.TYPE, (leaf) => {
+            const view = new HistoryView(client, leaf);
+            this.register(async () => view.onClose());
+            return view;
+        });
 
-		this.registerView(LogsView.TYPE, (leaf) => new LogsView(client, leaf));
+        this.registerView(LogsView.TYPE, (leaf) => new LogsView(client, leaf));
 
-		this.registerEditorExtension([remoteCursorsTheme, remoteCursorsPlugin]);
+        this.registerEditorExtension([remoteCursorsTheme, remoteCursorsPlugin]);
 
-		client.addRemoteCursorsUpdateListener((cursors) => {
-			RemoteCursorsPluginValue.setCursors(cursors, this.app);
-			renderCursorsInFileExplorer(cursors, this.app);
-		});
+        client.addRemoteCursorsUpdateListener((cursors) => {
+            RemoteCursorsPluginValue.setCursors(cursors, this.app);
+            renderCursorsInFileExplorer(cursors, this.app);
+        });
 
-		const cursorListener = new LocalCursorUpdateListener(
-			client,
-			this.app.workspace
-		);
-		this.register(() => {
-			cursorListener.dispose();
-		});
+        const cursorListener = new LocalCursorUpdateListener(
+            client,
+            this.app.workspace
+        );
+        this.register(() => {
+            cursorListener.dispose();
+        });
 
-		this.app.workspace.updateOptions();
+        this.app.workspace.updateOptions();
 
-		this.addRibbonIcons();
+        this.addRibbonIcons();
 
-		const editorStatusDisplayManager = new EditorStatusDisplayManager(
-			this,
-			this.app.workspace,
-			client
-		);
-		this.register(() => {
-			editorStatusDisplayManager.dispose();
-		});
+        const editorStatusDisplayManager = new EditorStatusDisplayManager(
+            this,
+            this.app.workspace,
+            client
+        );
+        this.register(() => {
+            editorStatusDisplayManager.dispose();
+        });
 
-		this.register(() => {
-			// eslint-disable-next-line
-			(globalThis as any).VAULT_LINK_RUNNING_INSTANCE = null;
-		});
-	}
+        this.register(() => {
+            // eslint-disable-next-line
+            (globalThis as any).VAULT_LINK_RUNNING_INSTANCE = null;
+        });
+    }
 
-	private addRibbonIcons(): void {
-		this.addRibbonIcon(
-			HistoryView.ICON,
-			"Open VaultLink events",
-			async (_: MouseEvent) => this.activateView(HistoryView.TYPE)
-		);
+    private addRibbonIcons(): void {
+        this.addRibbonIcon(
+            HistoryView.ICON,
+            "Open VaultLink events",
+            async (_: MouseEvent) => this.activateView(HistoryView.TYPE)
+        );
 
-		this.addRibbonIcon(
-			LogsView.ICON,
-			"Open VaultLink logs",
-			async (_: MouseEvent) => this.activateView(LogsView.TYPE)
-		);
-	}
+        this.addRibbonIcon(
+            LogsView.ICON,
+            "Open VaultLink logs",
+            async (_: MouseEvent) => this.activateView(LogsView.TYPE)
+        );
+    }
 
-	private registerEditorEvents(client: SyncClient): void {
-		[
-			this.app.workspace.on(
-				"editor-change",
-				async (
-					_editor: Editor,
-					info: MarkdownView | MarkdownFileInfo
-				) => {
-					const { file } = info;
-					if (file) {
-						await this.rateLimitedUpdate(file.path, client);
-					}
-				}
-			),
-			this.app.vault.on("create", async (file: TAbstractFile) => {
-				if (file instanceof TFile) {
-					await client.syncLocallyCreatedFile(file.path);
-				}
-			}),
-			this.app.vault.on("modify", async (file: TAbstractFile) => {
-				if (file instanceof TFile) {
-					await this.rateLimitedUpdate(file.path, client);
-				}
-			}),
-			this.app.vault.on("delete", async (file: TAbstractFile) => {
-				await client.syncLocallyDeletedFile(file.path);
-			}),
-			this.app.vault.on(
-				"rename",
-				async (file: TAbstractFile, oldPath: string) => {
-					if (file instanceof TFile) {
-						await client.syncLocallyUpdatedFile({
-							oldPath,
-							relativePath: file.path
-						});
-					}
-				}
-			)
-		].forEach((event) => {
-			this.registerEvent(event);
-		});
-	}
+    private registerEditorEvents(client: SyncClient): void {
+        [
+            this.app.workspace.on(
+                "editor-change",
+                async (
+                    _editor: Editor,
+                    info: MarkdownView | MarkdownFileInfo
+                ) => {
+                    const { file } = info;
+                    if (file) {
+                        await this.rateLimitedUpdate(file.path, client);
+                    }
+                }
+            ),
+            this.app.vault.on("create", async (file: TAbstractFile) => {
+                if (file instanceof TFile) {
+                    await client.syncLocallyCreatedFile(file.path);
+                }
+            }),
+            this.app.vault.on("modify", async (file: TAbstractFile) => {
+                if (file instanceof TFile) {
+                    await this.rateLimitedUpdate(file.path, client);
+                }
+            }),
+            this.app.vault.on("delete", async (file: TAbstractFile) => {
+                await client.syncLocallyDeletedFile(file.path);
+            }),
+            this.app.vault.on(
+                "rename",
+                async (file: TAbstractFile, oldPath: string) => {
+                    if (file instanceof TFile) {
+                        await client.syncLocallyUpdatedFile({
+                            oldPath,
+                            relativePath: file.path
+                        });
+                    }
+                }
+            )
+        ].forEach((event) => {
+            this.registerEvent(event);
+        });
+    }
 
-	private async rateLimitedUpdate(
-		path: string,
-		client: SyncClient
-	): Promise<void> {
-		if (!this.rateLimitedUpdatesPerFile.has(path)) {
-			this.rateLimitedUpdatesPerFile.set(
-				path,
-				rateLimit(
-					async () =>
-						client.syncLocallyUpdatedFile({
-							relativePath: path
-						}),
-					MIN_WAIT_BETWEEN_UPDATES_IN_MS
-				)
-			);
-		}
-		await this.rateLimitedUpdatesPerFile.get(path)?.();
-	}
+    private async rateLimitedUpdate(
+        path: string,
+        client: SyncClient
+    ): Promise<void> {
+        if (!this.rateLimitedUpdatesPerFile.has(path)) {
+            this.rateLimitedUpdatesPerFile.set(
+                path,
+                rateLimit(
+                    async () =>
+                        client.syncLocallyUpdatedFile({
+                            relativePath: path
+                        }),
+                    MIN_WAIT_BETWEEN_UPDATES_IN_MS
+                )
+            );
+        }
+        await this.rateLimitedUpdatesPerFile.get(path)?.();
+    }
 }
diff --git a/frontend/obsidian-plugin/tsconfig.json b/frontend/obsidian-plugin/tsconfig.json
index 4c39e97b..81af03a7 100644
--- a/frontend/obsidian-plugin/tsconfig.json
+++ b/frontend/obsidian-plugin/tsconfig.json
@@ -1,17 +1,17 @@
 {
-	"compilerOptions": {
-		"baseUrl": ".",
-		"module": "ESNext",
-		"target": "ES2023",
-		"strict": true,
-		"moduleResolution": "bundler",
-		"allowSyntheticDefaultImports": true,
-		"lib": [
-			"DOM",
-			"ES2024"
-		]
-	},
-	"exclude": [
-		"./dist"
-	]
-}
\ No newline at end of file
+    "compilerOptions": {
+        "baseUrl": ".",
+        "module": "ESNext",
+        "target": "ES2023",
+        "strict": true,
+        "moduleResolution": "bundler",
+        "allowSyntheticDefaultImports": true,
+        "lib": [
+            "DOM",
+            "ES2024"
+        ]
+    },
+    "exclude": [
+        "./dist"
+    ]
+}
diff --git a/scripts/check.sh b/scripts/check.sh
index 6300c592..e8a40985 100755
--- a/scripts/check.sh
+++ b/scripts/check.sh
@@ -2,7 +2,6 @@
 
 set -e
 
-# Parse arguments
 FIX_MODE=false
 if [[ "$1" == "--fix" ]]; then
     FIX_MODE=true
@@ -33,12 +32,16 @@ else
     npm ci
 fi
 
-echo "Checking .editorconfig compliance"
+cd ..
+
+# Use git ls-files to only check tracked files, respecting .gitignore
 if [[ "$FIX_MODE" == true ]]; then
-    npx eclint fix '../**/*' '!../node_modules/**' '!../frontend/node_modules/**' '!../sync-server/target/**' '!../frontend/dist/**' '!../.git/**'
+    git ls-files | xargs npx eclint fix
 else
-    npx eclint check '../**/*' '!../node_modules/**' '!../frontend/node_modules/**' '!../sync-server/target/**' '!../frontend/dist/**' '!../.git/**'
+    git ls-files | xargs npx eclint check
 fi
+
+cd frontend
 npm run build
 npm run test
 npm run lint
diff --git a/scripts/e2e.sh b/scripts/e2e.sh
index 93f6c3a4..a5b5cf3b 100755
--- a/scripts/e2e.sh
+++ b/scripts/e2e.sh
@@ -109,4 +109,3 @@ while true; do
 
     sleep 0.2
 done
-

From 504ddb6ff61e3e3d3e91bc0e1cd9338c982755c0 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 7 Dec 2025 14:46:41 +0000
Subject: [PATCH 726/761] Pick up new events API

---
 frontend/local-client-cli/src/cli.ts                      | 8 ++++----
 .../obsidian-plugin/src/views/history/history-view.ts     | 2 +-
 frontend/obsidian-plugin/src/views/logs/logs-view.ts      | 2 +-
 .../obsidian-plugin/src/views/settings/settings-tab.ts    | 2 +-
 .../obsidian-plugin/src/views/status-bar/status-bar.ts    | 6 +++---
 .../src/views/status-description/status-description.ts    | 8 ++++----
 frontend/test-client/src/agent/mock-agent.ts              | 6 +++---
 7 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/frontend/local-client-cli/src/cli.ts b/frontend/local-client-cli/src/cli.ts
index 61582a0d..dbede107 100644
--- a/frontend/local-client-cli/src/cli.ts
+++ b/frontend/local-client-cli/src/cli.ts
@@ -59,7 +59,7 @@ async function main(): Promise<void> {
 
     console.log(
         styleText("VaultLink Local CLI", "bold", "cyan") +
-            colorize(` v${packageJson.version}`, "dim")
+        colorize(` v${packageJson.version}`, "dim")
     );
     console.log(colorize("=".repeat(50), "dim"));
     console.log(
@@ -153,7 +153,7 @@ async function main(): Promise<void> {
     }
 
     // Add colored log formatter with level filtering
-    client.logger.addOnMessageListener((logLine) => {
+    client.logger.onLogEmitted.add((logLine) => {
         // Only show messages at or above the configured log level
         if (LOG_LEVEL_ORDER[logLine.level] >= LOG_LEVEL_ORDER[args.logLevel]) {
             console.log(formatLogLine(logLine));
@@ -164,14 +164,14 @@ async function main(): Promise<void> {
 
     const fileWatcher = new FileWatcher(absolutePath, client);
 
-    client.addWebSocketStatusChangeListener(() => {
+    client.onWebSocketStatusChanged.add(() => {
         const isConnected = client.isWebSocketConnected;
         client.logger.info(
             `WebSocket status changed: ${isConnected ? "connected" : "disconnected"}`
         );
     });
 
-    client.addRemainingSyncOperationsListener((remaining) => {
+    client.onRemainingOperationsCountChanged.add((remaining) => {
         if (remaining === 0) {
             client.logger.info("All sync operations completed");
         } else {
diff --git a/frontend/obsidian-plugin/src/views/history/history-view.ts b/frontend/obsidian-plugin/src/views/history/history-view.ts
index 1fc2c91e..65049f77 100644
--- a/frontend/obsidian-plugin/src/views/history/history-view.ts
+++ b/frontend/obsidian-plugin/src/views/history/history-view.ts
@@ -24,7 +24,7 @@ export class HistoryView extends ItemView {
         super(leaf);
         this.icon = HistoryView.ICON;
 
-        this.client.addSyncHistoryUpdateListener(async () =>
+        this.client.onSyncHistoryUpdated.add(async () =>
             this.updateView().catch((error: unknown) => {
                 this.client.logger.error(
                     `Failed to update history view: ${error}`
diff --git a/frontend/obsidian-plugin/src/views/logs/logs-view.ts b/frontend/obsidian-plugin/src/views/logs/logs-view.ts
index 927dc9b7..83c41b66 100644
--- a/frontend/obsidian-plugin/src/views/logs/logs-view.ts
+++ b/frontend/obsidian-plugin/src/views/logs/logs-view.ts
@@ -21,7 +21,7 @@ export class LogsView extends ItemView {
     ) {
         super(leaf);
         this.icon = LogsView.ICON;
-        this.client.logger.addOnMessageListener(() => {
+        this.client.logger.onLogEmitted.add(() => {
             this.updateView();
         });
     }
diff --git a/frontend/obsidian-plugin/src/views/settings/settings-tab.ts b/frontend/obsidian-plugin/src/views/settings/settings-tab.ts
index afd2b0b0..0eeb166a 100644
--- a/frontend/obsidian-plugin/src/views/settings/settings-tab.ts
+++ b/frontend/obsidian-plugin/src/views/settings/settings-tab.ts
@@ -41,7 +41,7 @@ export class SyncSettingsTab extends PluginSettingTab {
         this.editedToken = this.syncClient.getSettings().token;
         this.editedVaultName = this.syncClient.getSettings().vaultName;
 
-        this.syncClient.addOnSettingsChangeListener(
+        this.syncClient.onSettingsChanged.add(
             (newSettings, oldSettings) => {
                 let hasChanged = false;
 
diff --git a/frontend/obsidian-plugin/src/views/status-bar/status-bar.ts b/frontend/obsidian-plugin/src/views/status-bar/status-bar.ts
index 7a128ae9..8c441f9b 100644
--- a/frontend/obsidian-plugin/src/views/status-bar/status-bar.ts
+++ b/frontend/obsidian-plugin/src/views/status-bar/status-bar.ts
@@ -14,19 +14,19 @@ export class StatusBar {
         private readonly syncClient: SyncClient
     ) {
         this.statusBarItem = plugin.addStatusBarItem();
-        this.syncClient.addSyncHistoryUpdateListener((status) => {
+        this.syncClient.onSyncHistoryUpdated.add((status) => {
             this.lastHistoryStats = status;
             this.updateStatus();
         });
 
-        this.syncClient.addRemainingSyncOperationsListener(
+        this.syncClient.onRemainingOperationsCountChanged.add(
             (remainingOperations) => {
                 this.lastRemaining = remainingOperations;
                 this.updateStatus();
             }
         );
 
-        this.syncClient.addOnSettingsChangeListener(() => {
+        this.syncClient.onSettingsChanged.add(() => {
             this.updateStatus();
         });
     }
diff --git a/frontend/obsidian-plugin/src/views/status-description/status-description.ts b/frontend/obsidian-plugin/src/views/status-description/status-description.ts
index 540d5f21..53fea486 100644
--- a/frontend/obsidian-plugin/src/views/status-description/status-description.ts
+++ b/frontend/obsidian-plugin/src/views/status-description/status-description.ts
@@ -17,23 +17,23 @@ export class StatusDescription {
     public constructor(private readonly syncClient: SyncClient) {
         void this.updateConnectionState();
 
-        syncClient.addSyncHistoryUpdateListener((status) => {
+        syncClient.onSyncHistoryUpdated.add((status) => {
             this.lastHistoryStats = status;
             this.updateDescription();
         });
 
-        this.syncClient.addRemainingSyncOperationsListener(
+        this.syncClient.onRemainingOperationsCountChanged.add(
             (remainingOperations) => {
                 this.lastRemaining = remainingOperations;
                 this.updateDescription();
             }
         );
 
-        this.syncClient.addWebSocketStatusChangeListener(async () =>
+        this.syncClient.onWebSocketStatusChanged.add(async () =>
             this.updateConnectionState()
         );
 
-        this.syncClient.addOnSettingsChangeListener(async () =>
+        this.syncClient.onSettingsChanged.add(async () =>
             this.updateConnectionState()
         );
     }
diff --git a/frontend/test-client/src/agent/mock-agent.ts b/frontend/test-client/src/agent/mock-agent.ts
index 7926672e..604c3742 100644
--- a/frontend/test-client/src/agent/mock-agent.ts
+++ b/frontend/test-client/src/agent/mock-agent.ts
@@ -42,7 +42,7 @@ export class MockAgent extends MockClient {
             "Connection check failed"
         );
 
-        this.client.logger.addOnMessageListener((logLine: LogLine) => {
+        this.client.logger.onLogEmitted.add((logLine: LogLine) => {
             const state = this.client.getSettings().isSyncEnabled
                 ? "(online) "
                 : "(offline)";
@@ -198,14 +198,14 @@ export class MockAgent extends MockClient {
             );
             this.client.logger.info(
                 "Local files: " +
-                    Array.from(otherAgent.localFiles.keys()).join(", ")
+                Array.from(otherAgent.localFiles.keys()).join(", ")
             );
             otherAgent.client.logger.info(
                 "Local data: " + JSON.stringify(otherAgent.data, null, 2)
             );
             otherAgent.client.logger.info(
                 "Local files: " +
-                    Array.from(otherAgent.localFiles.keys()).join(", ")
+                Array.from(otherAgent.localFiles.keys()).join(", ")
             );
 
             throw e;

From 8439bd8b9210139728137f53f756e4a2448a5c83 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 7 Dec 2025 14:47:02 +0000
Subject: [PATCH 727/761] Delete temp folder before test

---
 sync-server/src/utils/rotating_file_writer.rs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/sync-server/src/utils/rotating_file_writer.rs b/sync-server/src/utils/rotating_file_writer.rs
index 5bf19b5b..f04f9ba9 100644
--- a/sync-server/src/utils/rotating_file_writer.rs
+++ b/sync-server/src/utils/rotating_file_writer.rs
@@ -173,6 +173,7 @@ mod tests {
     #[test]
     fn test_write_creates_log_file_and_directory() {
         let temp_dir = std::env::temp_dir().join("test_write_creates_log_file_and_directory");
+        let _ = fs::remove_dir_all(&temp_dir);
 
         let mut writer =
             RotatingFileWriter::new(&temp_dir, "test", Duration::from_secs(3600)).unwrap();
@@ -195,6 +196,7 @@ mod tests {
     #[test]
     fn test_rotation_after_duration() {
         let temp_dir = std::env::temp_dir().join("test_rotation_after_duration");
+        let _ = fs::remove_dir_all(&temp_dir);
 
         // Use a very short rotation duration
         // Note: We need to wait at least 1 second between rotations since
@@ -227,6 +229,7 @@ mod tests {
     fn test_calculate_next_rotation_time_no_existing_logs() {
         let temp_dir =
             std::env::temp_dir().join("test_calculate_next_rotation_time_no_existing_logs");
+        let _ = fs::remove_dir_all(&temp_dir);
 
         fs::create_dir_all(&temp_dir).unwrap();
 
@@ -248,6 +251,7 @@ mod tests {
     fn test_calculate_next_rotation_time_with_existing_log() {
         let temp_dir =
             std::env::temp_dir().join("test_calculate_next_rotation_time_with_existing_log");
+        let _ = fs::remove_dir_all(&temp_dir);
 
         fs::create_dir_all(&temp_dir).unwrap();
 
@@ -286,6 +290,7 @@ mod tests {
     #[test]
     fn test_picks_latest_log_file() {
         let temp_dir = std::env::temp_dir().join("test_picks_latest_log_file");
+        let _ = fs::remove_dir_all(&temp_dir);
 
         fs::create_dir_all(&temp_dir).unwrap();
 
@@ -320,6 +325,7 @@ mod tests {
     #[test]
     fn test_ignores_malformed_filenames() {
         let temp_dir = std::env::temp_dir().join("test_ignores_malformed_filenames");
+        let _ = fs::remove_dir_all(&temp_dir);
 
         fs::create_dir_all(&temp_dir).unwrap();
 

From 78a706ab8d956a63ec5ec288dd8a7c5ee0f4bcac Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 7 Dec 2025 15:06:08 +0000
Subject: [PATCH 728/761] Move log level to config file

---
 sync-server/Cargo.lock                   | 11 ----------
 sync-server/Cargo.toml                   |  1 -
 sync-server/config-e2e.yml               |  1 +
 sync-server/src/cli/args.rs              |  4 ----
 sync-server/src/config/logging_config.rs | 14 +++++++++++-
 sync-server/src/consts.rs                |  3 +++
 sync-server/src/main.rs                  | 11 ++--------
 sync-server/src/utils.rs                 |  1 +
 sync-server/src/utils/log_level.rs       | 27 ++++++++++++++++++++++++
 9 files changed, 47 insertions(+), 26 deletions(-)
 create mode 100644 sync-server/src/utils/log_level.rs

diff --git a/sync-server/Cargo.lock b/sync-server/Cargo.lock
index 3c8da8f6..c07ddb17 100644
--- a/sync-server/Cargo.lock
+++ b/sync-server/Cargo.lock
@@ -375,16 +375,6 @@ dependencies = [
  "clap_derive",
 ]
 
-[[package]]
-name = "clap-verbosity-flag"
-version = "3.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eeab6a5cdfc795a05538422012f20a5496f050223c91be4e5420bfd13c641fb1"
-dependencies = [
- "clap",
- "log",
-]
-
 [[package]]
 name = "clap_builder"
 version = "4.5.38"
@@ -2143,7 +2133,6 @@ dependencies = [
  "bimap",
  "chrono",
  "clap",
- "clap-verbosity-flag",
  "futures",
  "humantime-serde",
  "log",
diff --git a/sync-server/Cargo.toml b/sync-server/Cargo.toml
index eb722116..394ff314 100644
--- a/sync-server/Cargo.toml
+++ b/sync-server/Cargo.toml
@@ -30,7 +30,6 @@ clap = { version = "4.5.38", features = ["derive"] }
 futures = "0.3.31"
 serde_yaml = "0.9.34"
 serde_json = "1.0.140"
-clap-verbosity-flag = "3.0.3"
 bimap = "0.6.3"
 ts-rs =  { version = "10.1", features = ["uuid-impl", "chrono-impl"] }
 base64 = "0.22.1"
diff --git a/sync-server/config-e2e.yml b/sync-server/config-e2e.yml
index 8dc265c4..1f235b01 100644
--- a/sync-server/config-e2e.yml
+++ b/sync-server/config-e2e.yml
@@ -30,3 +30,4 @@ users:
 logging:
   log_directory: logs
   log_rotation: 7days
+  log_level: info
diff --git a/sync-server/src/cli/args.rs b/sync-server/src/cli/args.rs
index 603d8d15..15273ee1 100644
--- a/sync-server/src/cli/args.rs
+++ b/sync-server/src/cli/args.rs
@@ -1,7 +1,6 @@
 use std::ffi::OsString;
 
 use clap::Parser;
-use clap_verbosity_flag::{InfoLevel, Verbosity};
 
 use crate::cli::color_when::ColorWhen;
 
@@ -12,9 +11,6 @@ pub struct Args {
     #[arg(index = 1)]
     pub config_path: Option<OsString>,
 
-    #[command(flatten)]
-    pub verbose: Verbosity<InfoLevel>,
-
     #[arg(
             long,
             value_name = "WHEN",
diff --git a/sync-server/src/config/logging_config.rs b/sync-server/src/config/logging_config.rs
index 79d4fa1e..ad449d1a 100644
--- a/sync-server/src/config/logging_config.rs
+++ b/sync-server/src/config/logging_config.rs
@@ -3,7 +3,10 @@ use std::time::Duration;
 use log::debug;
 use serde::{Deserialize, Serialize};
 
-use crate::consts::{DEFAULT_LOG_DIRECTORY, DEFAULT_LOG_ROTATION_INTERVAL};
+use crate::{
+    consts::{DEFAULT_LOG_DIRECTORY, DEFAULT_LOG_LEVEL, DEFAULT_LOG_ROTATION_INTERVAL},
+    utils::log_level::LogLevel,
+};
 
 #[derive(Debug, Deserialize, Serialize, Clone)]
 pub struct LoggingConfig {
@@ -12,6 +15,9 @@ pub struct LoggingConfig {
 
     #[serde(default = "default_log_rotation", with = "humantime_serde")]
     pub log_rotation: Duration,
+
+    #[serde(default = "default_log_level")]
+    pub log_level: LogLevel,
 }
 
 impl Default for LoggingConfig {
@@ -19,6 +25,7 @@ impl Default for LoggingConfig {
         Self {
             log_directory: default_log_directory(),
             log_rotation: default_log_rotation(),
+            log_level: default_log_level(),
         }
     }
 }
@@ -32,3 +39,8 @@ fn default_log_rotation() -> Duration {
     debug!("Using default log rotation: {DEFAULT_LOG_ROTATION_INTERVAL:?}");
     DEFAULT_LOG_ROTATION_INTERVAL
 }
+
+fn default_log_level() -> LogLevel {
+    debug!("Using default log level: Info");
+    DEFAULT_LOG_LEVEL
+}
diff --git a/sync-server/src/consts.rs b/sync-server/src/consts.rs
index eae593df..98ed1c1f 100644
--- a/sync-server/src/consts.rs
+++ b/sync-server/src/consts.rs
@@ -1,5 +1,7 @@
 use std::time::Duration;
 
+use crate::utils::log_level::LogLevel;
+
 pub const DEFAULT_CONFIG_PATH: &str = "config.yml";
 
 pub const DEFAULT_DATABASES_DIRECTORY_PATH: &str = "databases";
@@ -14,6 +16,7 @@ pub const DEFAULT_MAX_CLIENTS_PER_VAULT: usize = 256;
 
 pub const DEFAULT_LOG_DIRECTORY: &str = "logs";
 pub const DEFAULT_LOG_ROTATION_INTERVAL: Duration = Duration::from_secs(60 * 60 * 24); // 1 day
+pub const DEFAULT_LOG_LEVEL: LogLevel = LogLevel::Info;
 
 pub const DEFAULT_MERGEABLE_FILE_EXTENSIONS: &[&str] = &["md", "txt"];
 
diff --git a/sync-server/src/main.rs b/sync-server/src/main.rs
index 82b75721..1285ed7b 100644
--- a/sync-server/src/main.rs
+++ b/sync-server/src/main.rs
@@ -60,14 +60,7 @@ fn set_up_logging(
     args: &Args,
     logging_config: &config::logging_config::LoggingConfig,
 ) -> Result<(), SyncServerError> {
-    let level_filter = match args.verbose.log_level_filter() {
-        // We don't want to allow disabling all logging
-        log::LevelFilter::Off | log::LevelFilter::Error => tracing::Level::ERROR,
-        log::LevelFilter::Warn => tracing::Level::WARN,
-        log::LevelFilter::Info => tracing::Level::INFO,
-        log::LevelFilter::Debug => tracing::Level::DEBUG,
-        log::LevelFilter::Trace => tracing::Level::TRACE,
-    };
+    let level_filter = logging_config.log_level.as_tracing_level();
 
     let env_filter = EnvFilter::builder()
         .with_default_directive(level_filter.into())
@@ -77,7 +70,7 @@ fn set_up_logging(
 
     let use_colors = args.color.use_colors();
 
-    let is_debug_mode = args.verbose.log_level_filter() >= log::LevelFilter::Debug;
+    let is_debug_mode = logging_config.log_level.is_debug_or_trace();
 
     let file_appender = RotatingFileWriter::new(
         &logging_config.log_directory,
diff --git a/sync-server/src/utils.rs b/sync-server/src/utils.rs
index 460a1466..b501ecb2 100644
--- a/sync-server/src/utils.rs
+++ b/sync-server/src/utils.rs
@@ -2,6 +2,7 @@ pub mod dedup_paths;
 pub mod find_first_available_path;
 pub mod is_binary;
 pub mod is_file_type_mergable;
+pub mod log_level;
 pub mod normalize;
 pub mod rotating_file_writer;
 pub mod sanitize_path;
diff --git a/sync-server/src/utils/log_level.rs b/sync-server/src/utils/log_level.rs
new file mode 100644
index 00000000..01ba669e
--- /dev/null
+++ b/sync-server/src/utils/log_level.rs
@@ -0,0 +1,27 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Deserialize, Serialize, Clone, Copy, PartialEq, Eq)]
+#[serde(rename_all = "lowercase")]
+pub enum LogLevel {
+    Error,
+    Warn,
+    Info,
+    Debug,
+    Trace,
+}
+
+impl LogLevel {
+    pub fn as_tracing_level(self) -> tracing::Level {
+        match self {
+            Self::Error => tracing::Level::ERROR,
+            Self::Warn => tracing::Level::WARN,
+            Self::Info => tracing::Level::INFO,
+            Self::Debug => tracing::Level::DEBUG,
+            Self::Trace => tracing::Level::TRACE,
+        }
+    }
+
+    pub fn is_debug_or_trace(self) -> bool {
+        matches!(self, Self::Debug | Self::Trace)
+    }
+}

From 570c41299b945f55ddc687177a5b1a249495577f Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 7 Dec 2025 15:41:01 +0000
Subject: [PATCH 729/761] Create vault dir if doesn't exist

---
 frontend/local-client-cli/src/cli.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/frontend/local-client-cli/src/cli.ts b/frontend/local-client-cli/src/cli.ts
index dbede107..0f8262f7 100644
--- a/frontend/local-client-cli/src/cli.ts
+++ b/frontend/local-client-cli/src/cli.ts
@@ -39,6 +39,10 @@ async function main(): Promise<void> {
     const args = parseArgs(process.argv);
     const absolutePath = path.resolve(args.localPath);
 
+    if (!fsSync.existsSync(absolutePath)) {
+        fsSync.mkdirSync(absolutePath, { recursive: true });
+    }
+
     try {
         const stats = await fs.stat(absolutePath);
         if (!stats.isDirectory()) {
@@ -59,7 +63,7 @@ async function main(): Promise<void> {
 
     console.log(
         styleText("VaultLink Local CLI", "bold", "cyan") +
-        colorize(` v${packageJson.version}`, "dim")
+            colorize(` v${packageJson.version}`, "dim")
     );
     console.log(colorize("=".repeat(50), "dim"));
     console.log(

From e9252955b4980ebb01fa7ab705ee4fe8da2edd94 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 7 Dec 2025 15:41:23 +0000
Subject: [PATCH 730/761] Align prettier & editorconfig

---
 docs/.prettierrc      | 2 +-
 frontend/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/.prettierrc b/docs/.prettierrc
index ea125e10..6ce145db 100644
--- a/docs/.prettierrc
+++ b/docs/.prettierrc
@@ -1,7 +1,7 @@
 {
     "printWidth": 120,
     "tabWidth": 4,
-    "useTabs": true,
+    "useTabs": false,
     "semi": false,
     "singleQuote": false,
     "trailingComma": "none",
diff --git a/frontend/package.json b/frontend/package.json
index 03bab82f..df167a5e 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -10,7 +10,7 @@
     "prettier": {
         "trailingComma": "none",
         "tabWidth": 4,
-        "useTabs": true,
+        "useTabs": false,
         "endOfLine": "lf"
     },
     "scripts": {

From e47d8a8179fe283913bc2a72bfeb6f4b700df28f Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 7 Dec 2025 15:41:55 +0000
Subject: [PATCH 731/761] Fix file watching

---
 frontend/local-client-cli/package.json        |   3 +-
 frontend/local-client-cli/src/file-watcher.ts | 187 ++++++++++--------
 frontend/package-lock.json                    |  48 ++++-
 3 files changed, 152 insertions(+), 86 deletions(-)

diff --git a/frontend/local-client-cli/package.json b/frontend/local-client-cli/package.json
index 0f60af48..aa44748e 100644
--- a/frontend/local-client-cli/package.json
+++ b/frontend/local-client-cli/package.json
@@ -12,7 +12,8 @@
         "test": "tsx --test 'src/**/*.test.ts'"
     },
     "dependencies": {
-        "commander": "^14.0.2"
+        "commander": "^14.0.2",
+        "watcher": "^2.3.1"
     },
     "devDependencies": {
         "@types/node": "^24.8.1",
diff --git a/frontend/local-client-cli/src/file-watcher.ts b/frontend/local-client-cli/src/file-watcher.ts
index 65577bc4..e781d18f 100644
--- a/frontend/local-client-cli/src/file-watcher.ts
+++ b/frontend/local-client-cli/src/file-watcher.ts
@@ -1,102 +1,121 @@
-import * as fs from "fs";
+import Watcher from "watcher";
 import * as path from "path";
 import type { SyncClient, RelativePath } from "sync-client";
 
 export class FileWatcher {
-	private watcher: fs.FSWatcher | undefined;
-	private isRunning = false;
+    private watcher: Watcher | undefined;
+    private isRunning = false;
 
-	public constructor(
-		private readonly basePath: string,
-		private readonly client: SyncClient
-	) {}
+    public constructor(
+        private readonly basePath: string,
+        private readonly client: SyncClient
+    ) {}
 
-	public start(): void {
-		if (this.isRunning) {
-			return;
-		}
+    public start(): void {
+        if (this.isRunning) {
+            return;
+        }
 
-		this.isRunning = true;
+        this.isRunning = true;
 
-		this.watcher = fs.watch(
-			this.basePath,
-			{ recursive: true },
-			(eventType, filename) => {
-				if (filename === null || filename.length === 0) {
-					return;
-				}
+        this.watcher = new Watcher(this.basePath, {
+            recursive: true,
+            renameDetection: true,
+            renameTimeout: 125,
+            ignoreInitial: true
+        });
 
-				// Convert to forward slashes for consistency
-				const relativePath = this.toUnixPath(filename);
+        this.watcher.on("add", (filePath: string) => {
+            this.handleCreate(this.toRelativePath(filePath));
+        });
 
-				if (eventType === "rename") {
-					this.handleRenameOrDelete(relativePath);
-				} else {
-					// Must be "change" event
-					this.handleChange(relativePath);
-				}
-			}
-		);
+        this.watcher.on("change", (filePath: string) => {
+            this.handleChange(this.toRelativePath(filePath));
+        });
 
-		this.client.logger.info("File watcher started");
-	}
+        this.watcher.on("unlink", (filePath: string) => {
+            this.handleDelete(this.toRelativePath(filePath));
+        });
 
-	public stop(): void {
-		if (this.watcher !== undefined) {
-			this.watcher.close();
-			this.watcher = undefined;
-		}
-		this.isRunning = false;
-		this.client.logger.info("File watcher stopped");
-	}
+        this.watcher.on("rename", (oldPath: string, newPath: string) => {
+            this.handleRename(
+                this.toRelativePath(oldPath),
+                this.toRelativePath(newPath)
+            );
+        });
 
-	private handleChange(relativePath: RelativePath): void {
-		this.client
-			.syncLocallyUpdatedFile({ relativePath })
-			.catch((err: unknown) => {
-				this.client.logger.error(
-					`Failed to sync updated file ${relativePath}: ${err instanceof Error ? err.message : String(err)}`
-				);
-			});
-	}
+        this.client.logger.info("File watcher started");
+    }
 
-	private handleRenameOrDelete(relativePath: RelativePath): void {
-		const fullPath = path.join(this.basePath, relativePath);
+    public stop(): void {
+        if (this.watcher !== undefined) {
+            this.watcher.close();
+            this.watcher = undefined;
+        }
+        this.isRunning = false;
+        this.client.logger.info("File watcher stopped");
+    }
 
-		fs.access(fullPath, fs.constants.F_OK, (accessError) => {
-			if (accessError) {
-				this.client
-					.syncLocallyDeletedFile(relativePath)
-					.catch((deleteErr: unknown) => {
-						this.client.logger.error(
-							`Failed to sync deleted file ${relativePath}: ${deleteErr instanceof Error ? deleteErr.message : String(deleteErr)}`
-						);
-					});
-			} else {
-				fs.stat(fullPath, (statErr, stats) => {
-					if (statErr !== null || !stats.isFile()) {
-						return;
-					}
+    private handleCreate(relativePath: RelativePath): void {
+        this.client
+            .syncLocallyCreatedFile(relativePath)
+            .catch((err: unknown) => {
+                this.client.logger.error(
+                    `Failed to sync created file ${relativePath}: ${this.formatError(err)}`
+                );
+            });
+    }
 
-					this.client
-						.syncLocallyCreatedFile(relativePath)
-						.catch((createErr: unknown) => {
-							this.client.logger.error(
-								`Failed to sync created file ${relativePath}: ${createErr instanceof Error ? createErr.message : String(createErr)}`
-							);
-						});
-				});
-			}
-		});
-	}
+    private handleChange(relativePath: RelativePath): void {
+        this.client
+            .syncLocallyUpdatedFile({ relativePath })
+            .catch((err: unknown) => {
+                this.client.logger.error(
+                    `Failed to sync updated file ${relativePath}: ${this.formatError(err)}`
+                );
+            });
+    }
 
-	/**
-	 * Convert a native platform path to forward slashes
-	 */
-	private toUnixPath(nativePath: string): string {
-		if (path.sep === "\\") {
-			return nativePath.replace(/\\/g, "/");
-		}
-		return nativePath;
-	}
+    private handleDelete(relativePath: RelativePath): void {
+        this.client
+            .syncLocallyDeletedFile(relativePath)
+            .catch((err: unknown) => {
+                this.client.logger.error(
+                    `Failed to sync deleted file ${relativePath}: ${this.formatError(err)}`
+                );
+            });
+    }
+
+    private handleRename(oldPath: RelativePath, newPath: RelativePath): void {
+        this.client.logger.info(`File renamed: ${oldPath} -> ${newPath}`);
+        this.client
+            .syncLocallyUpdatedFile({
+                oldPath,
+                relativePath: newPath
+            })
+            .catch((err: unknown) => {
+                this.client.logger.error(
+                    `Failed to sync renamed file ${oldPath} -> ${newPath}: ${this.formatError(err)}`
+                );
+            });
+    }
+
+    private toRelativePath(absolutePath: string): RelativePath {
+        const relative = path.relative(this.basePath, absolutePath);
+        return this.toUnixPath(relative);
+    }
+
+    /**
+    * Convert a native platform path to forward slashes
+    */
+    private toUnixPath(nativePath: string): string {
+        if (path.sep === "\\") {
+            return nativePath.replace(/\\/g, "/");
+        }
+        return nativePath;
+    }
+
+    private formatError(err: unknown): string {
+        return err instanceof Error ? err.message : String(err);
+    }
 }
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 1d45b165..c8819edb 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -24,7 +24,8 @@
         "local-client-cli": {
             "version": "0.12.0",
             "dependencies": {
-                "commander": "^14.0.2"
+                "commander": "^14.0.2",
+                "watcher": "^2.3.1"
             },
             "bin": {
                 "vaultlink": "dist/cli.js"
@@ -2452,6 +2453,12 @@
                 "node": ">=0.10"
             }
         },
+        "node_modules/dettle": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmjs.org/dettle/-/dettle-1.0.5.tgz",
+            "integrity": "sha512-ZVyjhAJ7sCe1PNXEGveObOH9AC8QvMga3HJIghHawtG7mE4K5pW9nz/vDGAr/U7a3LWgdOzEE7ac9MURnyfaTA==",
+            "license": "MIT"
+        },
         "node_modules/dunder-proto": {
             "version": "1.0.1",
             "dev": true,
@@ -5646,6 +5653,21 @@
             "dev": true,
             "license": "MIT"
         },
+        "node_modules/promise-make-counter": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/promise-make-counter/-/promise-make-counter-1.0.2.tgz",
+            "integrity": "sha512-FJAxTBWQuQoAs4ZOYuKX1FHXxEgKLEzBxUvwr4RoOglkTpOjWuM+RXsK3M9q5lMa8kjqctUrhwYeZFT4ygsnag==",
+            "license": "MIT",
+            "dependencies": {
+                "promise-make-naked": "^3.0.2"
+            }
+        },
+        "node_modules/promise-make-naked": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/promise-make-naked/-/promise-make-naked-3.0.2.tgz",
+            "integrity": "sha512-B+b+kQ1YrYS7zO7P7bQcoqqMUizP06BOyNSBEnB5VJKDSWo8fsVuDkfSmwdjF0JsRtaNh83so5MMFJ95soH5jg==",
+            "license": "MIT"
+        },
         "node_modules/pseudomap": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
@@ -6398,6 +6420,11 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
+        "node_modules/stubborn-fs": {
+            "version": "1.2.5",
+            "resolved": "https://registry.npmjs.org/stubborn-fs/-/stubborn-fs-1.2.5.tgz",
+            "integrity": "sha512-H2N9c26eXjzL/S/K+i/RHHcFanE74dptvvjM8iwzwbVcWY/zjBbgRqF3K0DY4+OD+uTTASTBvDoxPDaPN02D7g=="
+        },
         "node_modules/style-mod": {
             "version": "4.1.3",
             "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.1.3.tgz",
@@ -6697,6 +6724,15 @@
                 "node": ">=0.10.0"
             }
         },
+        "node_modules/tiny-readdir": {
+            "version": "2.7.4",
+            "resolved": "https://registry.npmjs.org/tiny-readdir/-/tiny-readdir-2.7.4.tgz",
+            "integrity": "sha512-721U+zsYwDirjr8IM6jqpesD/McpZooeFi3Zc6mcjy1pse2C+v19eHPFRqz4chGXZFw7C3KITDjAtHETc2wj7Q==",
+            "license": "MIT",
+            "dependencies": {
+                "promise-make-counter": "^1.0.2"
+            }
+        },
         "node_modules/to-absolute-glob": {
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz",
@@ -7076,6 +7112,16 @@
             "license": "MIT",
             "peer": true
         },
+        "node_modules/watcher": {
+            "version": "2.3.1",
+            "resolved": "https://registry.npmjs.org/watcher/-/watcher-2.3.1.tgz",
+            "integrity": "sha512-d3yl+ey35h05r5EFP0TafE2jsmQUJ9cc2aernRVyAkZiu0J3+3TbNugNcqdUJDoWOfL2p+bNsN427stsBC/HnA==",
+            "dependencies": {
+                "dettle": "^1.0.2",
+                "stubborn-fs": "^1.2.5",
+                "tiny-readdir": "^2.7.2"
+            }
+        },
         "node_modules/watchpack": {
             "version": "2.4.2",
             "dev": true,

From 6608804d34f4147c0323b4a1ba22f01d880f885e Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 7 Dec 2025 15:46:00 +0000
Subject: [PATCH 732/761] Refactor & lint

---
 .../obsidian-plugin/src/vault-link-plugin.ts  |  7 +-
 .../src/views/settings/settings-tab.ts        | 42 +++++-----
 .../sync-client/src/persistence/database.ts   |  2 +-
 .../sync-client/src/persistence/settings.ts   |  6 +-
 frontend/sync-client/src/sync-client.ts       | 83 +++++++++----------
 .../src/sync-operations/cursor-tracker.ts     |  6 +-
 .../sync-client/src/sync-operations/syncer.ts | 25 +++---
 .../sync-operations/unrestricted-syncer.ts    |  7 +-
 frontend/sync-client/src/tracing/logger.ts    |  4 +-
 .../sync-client/src/tracing/sync-history.ts   | 12 ++-
 .../sync-client/src/utils/create-client-id.ts |  4 +-
 .../data-structures/event-listeners.test.ts   | 27 +++---
 .../utils/data-structures/event-listeners.ts  | 16 ++--
 frontend/test-client/src/agent/mock-agent.ts  |  4 +-
 scripts/check.sh                              | 11 +--
 scripts/update-api-types.sh                   |  3 +-
 16 files changed, 126 insertions(+), 133 deletions(-)

diff --git a/frontend/obsidian-plugin/src/vault-link-plugin.ts b/frontend/obsidian-plugin/src/vault-link-plugin.ts
index 12ba1060..7d91b9f5 100644
--- a/frontend/obsidian-plugin/src/vault-link-plugin.ts
+++ b/frontend/obsidian-plugin/src/vault-link-plugin.ts
@@ -136,10 +136,7 @@ export default class VaultLinkPlugin extends Plugin {
             ...(IS_DEBUG_BUILD
                 ? {
                     fetch: debugging.slowFetchFactory(1),
-                    webSocket: debugging.slowWebSocketFactory(
-                        1,
-                        new Logger()
-                    )
+                    webSocket: debugging.slowWebSocketFactory(1, new Logger())
                 }
                 : {})
         });
@@ -174,7 +171,7 @@ export default class VaultLinkPlugin extends Plugin {
 
         this.registerEditorExtension([remoteCursorsTheme, remoteCursorsPlugin]);
 
-        client.addRemoteCursorsUpdateListener((cursors) => {
+        client.onRemoteCursorsUpdated.add((cursors) => {
             RemoteCursorsPluginValue.setCursors(cursors, this.app);
             renderCursorsInFileExplorer(cursors, this.app);
         });
diff --git a/frontend/obsidian-plugin/src/views/settings/settings-tab.ts b/frontend/obsidian-plugin/src/views/settings/settings-tab.ts
index 0eeb166a..213c0d2c 100644
--- a/frontend/obsidian-plugin/src/views/settings/settings-tab.ts
+++ b/frontend/obsidian-plugin/src/views/settings/settings-tab.ts
@@ -41,30 +41,28 @@ export class SyncSettingsTab extends PluginSettingTab {
         this.editedToken = this.syncClient.getSettings().token;
         this.editedVaultName = this.syncClient.getSettings().vaultName;
 
-        this.syncClient.onSettingsChanged.add(
-            (newSettings, oldSettings) => {
-                let hasChanged = false;
+        this.syncClient.onSettingsChanged.add((newSettings, oldSettings) => {
+            let hasChanged = false;
 
-                if (newSettings.remoteUri !== oldSettings.remoteUri) {
-                    this.editedServerUri = newSettings.remoteUri;
-                    hasChanged = true;
-                }
-
-                if (newSettings.token !== oldSettings.token) {
-                    this.editedToken = newSettings.token;
-                    hasChanged = true;
-                }
-
-                if (newSettings.vaultName !== oldSettings.vaultName) {
-                    this.editedVaultName = newSettings.vaultName;
-                    hasChanged = true;
-                }
-
-                if (hasChanged) {
-                    this.display();
-                }
+            if (newSettings.remoteUri !== oldSettings.remoteUri) {
+                this.editedServerUri = newSettings.remoteUri;
+                hasChanged = true;
             }
-        );
+
+            if (newSettings.token !== oldSettings.token) {
+                this.editedToken = newSettings.token;
+                hasChanged = true;
+            }
+
+            if (newSettings.vaultName !== oldSettings.vaultName) {
+                this.editedVaultName = newSettings.vaultName;
+                hasChanged = true;
+            }
+
+            if (hasChanged) {
+                this.display();
+            }
+        });
     }
 
     private get isApplyingChanges(): boolean {
diff --git a/frontend/sync-client/src/persistence/database.ts b/frontend/sync-client/src/persistence/database.ts
index 8e1cd61f..86b2845c 100644
--- a/frontend/sync-client/src/persistence/database.ts
+++ b/frontend/sync-client/src/persistence/database.ts
@@ -114,7 +114,7 @@ export class Database {
                     i === 0
                         ? false
                         : records[i - 1].parallelVersion ===
-                            current.parallelVersion
+                        current.parallelVersion
                 )
             ) {
                 throw new Error(
diff --git a/frontend/sync-client/src/persistence/settings.ts b/frontend/sync-client/src/persistence/settings.ts
index 234c99f6..d78170e6 100644
--- a/frontend/sync-client/src/persistence/settings.ts
+++ b/frontend/sync-client/src/persistence/settings.ts
@@ -33,13 +33,13 @@ export const DEFAULT_SETTINGS: SyncSettings = {
 };
 
 export class Settings {
-    private settings: SyncSettings;
-    private readonly lock: Lock = new Lock();
-
     public readonly onSettingsChanged = new EventListeners<
         (newSettings: SyncSettings, oldSettings: SyncSettings) => unknown
     >();
 
+    private settings: SyncSettings;
+    private readonly lock: Lock = new Lock();
+
     public constructor(
         private readonly logger: Logger,
         initialState: Partial<SyncSettings> | undefined,
diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts
index 550ef096..1544a1e0 100644
--- a/frontend/sync-client/src/sync-client.ts
+++ b/frontend/sync-client/src/sync-client.ts
@@ -26,7 +26,7 @@ import { FixedSizeDocumentCache } from "./utils/data-structures/fix-sized-cache"
 import { setUpTelemetry } from "./utils/set-up-telemetry";
 import { DIFF_CACHE_SIZE_MB } from "./consts";
 import { ServerConfig } from "./services/server-config";
-import { EventListeners } from "./utils/data-structures/event-listeners";
+import type { EventListeners } from "./utils/data-structures/event-listeners";
 
 export class SyncClient {
     private hasStartedOfflineSync = false;
@@ -54,7 +54,7 @@ export class SyncClient {
                 database: Partial<StoredDatabase>;
             }>
         >
-    ) { }
+    ) {}
 
     public get documentCount(): number {
         return this.database.length;
@@ -63,6 +63,42 @@ export class SyncClient {
     public get isWebSocketConnected(): boolean {
         return this.webSocketManager.isWebSocketConnected;
     }
+
+    public get onSyncHistoryUpdated(): EventListeners<
+        (stats: HistoryStats) => unknown
+    > {
+        this.checkIfDestroyed("onSyncHistoryUpdated getter");
+        return this.history.onHistoryUpdated;
+    }
+
+    public get onSettingsChanged(): EventListeners<
+        (newSettings: SyncSettings, oldSettings: SyncSettings) => unknown
+    > {
+        this.checkIfDestroyed("onSettingsChanged getter");
+        return this.settings.onSettingsChanged;
+    }
+
+    public get onRemainingOperationsCountChanged(): EventListeners<
+        (remainingOperationsCount: number) => unknown
+    > {
+        this.checkIfDestroyed("onRemainingOperationsCountChanged getter");
+        return this.syncer.onRemainingOperationsCountChanged;
+    }
+
+    public get onWebSocketStatusChanged(): EventListeners<
+        (isConnected: boolean) => unknown
+    > {
+        this.checkIfDestroyed("onWebSocketStatusChanged getter");
+        return this.webSocketManager.onWebSocketStatusChanged;
+    }
+
+    public get onRemoteCursorsUpdated(): EventListeners<
+        (cursors: MaybeOutdatedClientCursors[]) => unknown
+    > {
+        this.checkIfDestroyed("onRemoteCursorsUpdated getter");
+        return this.cursorTracker.onRemoteCursorsUpdated;
+    }
+
     public static async create({
         fs,
         persistence,
@@ -228,9 +264,7 @@ export class SyncClient {
             }
         });
 
-        this.settings.onSettingsChanged.add(
-            this.onSettingsChange.bind(this)
-        );
+        this.settings.onSettingsChanged.add(this.onSettingsChange.bind(this));
 
         if (this.settings.getSettings().isSyncEnabled) {
             this.logger.info("Starting SyncClient");
@@ -318,37 +352,6 @@ export class SyncClient {
         await this.settings.setSettings(value);
     }
 
-    public get onSyncHistoryUpdated(): EventListeners<
-        (stats: HistoryStats) => unknown
-    > {
-        this.checkIfDestroyed("onSyncHistoryUpdated getter");
-        return this.history.onHistoryUpdated;
-    }
-
-
-
-
-    public get onSettingsChanged(): EventListeners<
-        (newSettings: SyncSettings, oldSettings: SyncSettings) => unknown
-    > {
-        this.checkIfDestroyed("onSettingsChanged getter");
-        return this.settings.onSettingsChanged;
-    }
-
-    public get onRemainingOperationsCountChanged(): EventListeners<
-        (remainingOperationsCount: number) => unknown
-    > {
-        this.checkIfDestroyed("onRemainingOperationsCountChanged getter");
-        return this.syncer.onRemainingOperationsCountChanged;
-    }
-
-    public get onWebSocketStatusChanged(): EventListeners<
-        (isConnected: boolean) => unknown
-    > {
-        this.checkIfDestroyed("onWebSocketStatusChanged getter");
-        return this.webSocketManager.onWebSocketStatusChanged;
-    }
-
     public async syncLocallyCreatedFile(
         relativePath: RelativePath
     ): Promise<void> {
@@ -414,14 +417,6 @@ export class SyncClient {
         await this.cursorTracker.sendLocalCursorsToServer(documentToCursors);
     }
 
-
-    public get onRemoteCursorsUpdated(): EventListeners<
-        (cursors: MaybeOutdatedClientCursors[]) => unknown
-    > {
-        this.checkIfDestroyed("onRemoteCursorsUpdated getter");
-        return this.cursorTracker.onRemoteCursorsUpdated;
-    }
-
     public async waitUntilFinished(): Promise<void> {
         this.checkIfDestroyed("waitUntilIdle");
         await this.syncer.waitUntilFinished();
diff --git a/frontend/sync-client/src/sync-operations/cursor-tracker.ts b/frontend/sync-client/src/sync-operations/cursor-tracker.ts
index f60cd588..bdd7d9b7 100644
--- a/frontend/sync-client/src/sync-operations/cursor-tracker.ts
+++ b/frontend/sync-client/src/sync-operations/cursor-tracker.ts
@@ -16,14 +16,14 @@ import { EventListeners } from "../utils/data-structures/event-listeners";
 // known remote cursor positions, and for each document, tries to return the latest cursor positions that are
 // not from the future.
 export class CursorTracker {
-    private readonly updateLock = new Lock();
-
     // The returned position may be accurate, if it matches the document version, or outdated, in which case
     // the client has to heuristically guess it's current position based on the local edits.
     public readonly onRemoteCursorsUpdated = new EventListeners<
         (cursors: MaybeOutdatedClientCursors[]) => unknown
     >();
 
+    private readonly updateLock = new Lock();
+
     private knownRemoteCursors: (ClientCursors & {
         upToDateness: DocumentUpToDateness;
     })[] = [];
@@ -72,7 +72,6 @@ export class CursorTracker {
             }
         );
 
-
         this.fileChangeNotifier.onFileChanged.add(async (relativePath) =>
             this.updateLock.withLock(async () => {
                 for (const clientCursor of this.knownRemoteCursors) {
@@ -156,7 +155,6 @@ export class CursorTracker {
         this.webSocketManager.updateLocalCursors({ documentsWithCursors });
     }
 
-
     public reset(): void {
         this.knownRemoteCursors = [];
         this.lastLocalCursorState = [];
diff --git a/frontend/sync-client/src/sync-operations/syncer.ts b/frontend/sync-client/src/sync-operations/syncer.ts
index 24b4a890..78cef699 100644
--- a/frontend/sync-client/src/sync-operations/syncer.ts
+++ b/frontend/sync-client/src/sync-operations/syncer.ts
@@ -24,16 +24,18 @@ import { awaitAll } from "../utils/await-all";
 import { EventListeners } from "../utils/data-structures/event-listeners";
 
 export class Syncer {
-    private readonly remoteDocumentsLock: Locks<DocumentId>;
     public readonly onRemainingOperationsCountChanged = new EventListeners<
         (remainingOperations: number) => unknown
     >();
 
+    private readonly remoteDocumentsLock: Locks<DocumentId>;
+
     // FIFO to limit the number of concurrent sync operations
     private readonly syncQueue: PQueue;
 
     private _isFirstSyncComplete = false;
     private runningScheduleSyncForOfflineChanges: Promise<void> | undefined;
+    private previousRemainingOperationsCount = 0;
 
     public constructor(
         private readonly deviceId: string,
@@ -58,17 +60,20 @@ export class Syncer {
         });
 
         this.syncQueue.on("active", () => {
-            this.onRemainingOperationsCountChanged.trigger(this.syncQueue.size);
+            if (this.previousRemainingOperationsCount !== this.syncQueue.size) {
+                this.previousRemainingOperationsCount = this.syncQueue.size;
+                this.onRemainingOperationsCountChanged.trigger(
+                    this.syncQueue.size
+                );
+            }
         });
 
-        this.webSocketManager.onWebSocketStatusChanged.add(
-            (isConnected) => {
-                if (isConnected) {
-                    // The JS WebSocket API doesn't support setting headers, so we have to send the token as a message
-                    this.sendHandshakeMessage();
-                }
+        this.webSocketManager.onWebSocketStatusChanged.add((isConnected) => {
+            if (isConnected) {
+                // The JS WebSocket API doesn't support setting headers, so we have to send the token as a message
+                this.sendHandshakeMessage();
             }
-        );
+        });
         this.webSocketManager.onRemoteVaultUpdateReceived.add(
             this.syncRemotelyUpdatedFile.bind(this)
         );
@@ -166,7 +171,7 @@ export class Syncer {
             // in that case, we mustn't move it again.
             if (
                 this.database.getLatestDocumentByRelativePath(relativePath) ===
-                undefined ||
+                    undefined ||
                 this.database.getLatestDocumentByRelativePath(relativePath)
                     ?.isDeleted === true
             ) {
diff --git a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
index 32cfb22a..0bef47d4 100644
--- a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
+++ b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
@@ -333,7 +333,7 @@ export class UnrestrictedSyncer {
 
             const actualUpdateDetails: SyncUpdateDetails | SyncMovedDetails =
                 oldPath !== undefined ||
-                    response.relativePath != originalRelativePath
+                response.relativePath != originalRelativePath
                     ? {
                         type: SyncType.MOVE,
                         relativePath: response.relativePath,
@@ -540,8 +540,9 @@ export class UnrestrictedSyncer {
                     type: SyncType.SKIPPED,
                     relativePath
                 },
-                message: `File size of ${sizeInMB} MB exceeds the maximum file size limit of ${maxFileSizeMB
-                    } MB`
+                message: `File size of ${sizeInMB} MB exceeds the maximum file size limit of ${
+                    maxFileSizeMB
+                } MB`
             };
         }
     }
diff --git a/frontend/sync-client/src/tracing/logger.ts b/frontend/sync-client/src/tracing/logger.ts
index 6ac2b4e1..6d544fbc 100644
--- a/frontend/sync-client/src/tracing/logger.ts
+++ b/frontend/sync-client/src/tracing/logger.ts
@@ -20,15 +20,15 @@ export class LogLine {
     public constructor(
         public level: LogLevel,
         public message: string
-    ) { }
+    ) {}
 }
 
 export class Logger {
-    private readonly messages: LogLine[] = [];
     public readonly onLogEmitted = new EventListeners<
         (message: LogLine) => unknown
     >();
 
+    private readonly messages: LogLine[] = [];
 
     public debug(message: string): void {
         this.pushMessage(message, LogLevel.DEBUG);
diff --git a/frontend/sync-client/src/tracing/sync-history.ts b/frontend/sync-client/src/tracing/sync-history.ts
index 5768296d..31f77283 100644
--- a/frontend/sync-client/src/tracing/sync-history.ts
+++ b/frontend/sync-client/src/tracing/sync-history.ts
@@ -70,18 +70,18 @@ export interface HistoryStats {
 }
 
 export class SyncHistory {
-    private readonly _entries: HistoryEntry[] = [];
-
     public readonly onHistoryUpdated = new EventListeners<
         (status: HistoryStats) => unknown
     >();
 
+    private readonly _entries: HistoryEntry[] = [];
+
     private status: HistoryStats = {
         success: 0,
         error: 0
     };
 
-    public constructor(private readonly logger: Logger) { }
+    public constructor(private readonly logger: Logger) {}
 
     public get entries(): readonly HistoryEntry[] {
         return this._entries;
@@ -114,8 +114,6 @@ export class SyncHistory {
         this.updateSuccessCount(historyEntry);
     }
 
-
-
     public reset(): void {
         this._entries.length = 0;
         this.status = {
@@ -141,8 +139,8 @@ export class SyncHistory {
             candidate !== undefined &&
             (this._entries[0] === candidate ||
                 candidate.timestamp.getTime() +
-                TIMEOUT_FOR_MERGING_HISTORY_ENTRIES_IN_SECONDS * 1000 >
-                entry.timestamp.getTime())
+                    TIMEOUT_FOR_MERGING_HISTORY_ENTRIES_IN_SECONDS * 1000 >
+                    entry.timestamp.getTime())
         ) {
             return candidate;
         }
diff --git a/frontend/sync-client/src/utils/create-client-id.ts b/frontend/sync-client/src/utils/create-client-id.ts
index 4da442c2..cfa132da 100644
--- a/frontend/sync-client/src/utils/create-client-id.ts
+++ b/frontend/sync-client/src/utils/create-client-id.ts
@@ -8,8 +8,8 @@ export function createClientId(): string {
         typeof navigator !== "undefined"
             ? navigator.platform // eslint-disable-line @typescript-eslint/no-deprecated
             : typeof process !== "undefined"
-                ? process.platform
-                : "unknown";
+            ? process.platform
+            : "unknown";
 
     return `vault-link/${packageVersion} (${uuidv4()}; ${platform})`;
 }
diff --git a/frontend/sync-client/src/utils/data-structures/event-listeners.test.ts b/frontend/sync-client/src/utils/data-structures/event-listeners.test.ts
index c3e5a483..a5f0cc7c 100644
--- a/frontend/sync-client/src/utils/data-structures/event-listeners.test.ts
+++ b/frontend/sync-client/src/utils/data-structures/event-listeners.test.ts
@@ -5,7 +5,8 @@ import { EventListeners } from "./event-listeners";
 describe("EventListeners", () => {
     it("should add & remove listeners", () => {
         const listeners = new EventListeners<() => void>();
-        const listener = () => { };
+        // eslint-disable-next-line @typescript-eslint/no-empty-function
+        const listener = (): void => {};
 
         listeners.add(listener);
 
@@ -16,10 +17,10 @@ describe("EventListeners", () => {
         assert.strictEqual(listeners.count, 0);
     });
 
-
     it("should remove listeners using unsubscribe function", () => {
         const listeners = new EventListeners<() => void>();
-        const listener = () => { };
+        // eslint-disable-next-line @typescript-eslint/no-empty-function
+        const listener = (): void => {};
 
         const unsubscribe = listeners.add(listener);
         unsubscribe();
@@ -29,7 +30,8 @@ describe("EventListeners", () => {
 
     it("should return false when removing non-existent listener", () => {
         const listeners = new EventListeners<() => void>();
-        const listener = () => { };
+        // eslint-disable-next-line @typescript-eslint/no-empty-function
+        const listener = (): void => {};
 
         const removed = listeners.remove(listener);
 
@@ -38,9 +40,12 @@ describe("EventListeners", () => {
 
     it("should handle multiple listeners", () => {
         const listeners = new EventListeners<() => void>();
-        const listener1 = () => { };
-        const listener2 = () => { };
-        const listener3 = () => { };
+        // eslint-disable-next-line @typescript-eslint/no-empty-function
+        const listener1 = (): void => {};
+        // eslint-disable-next-line @typescript-eslint/no-empty-function
+        const listener2 = (): void => {};
+        // eslint-disable-next-line @typescript-eslint/no-empty-function
+        const listener3 = (): void => {};
 
         listeners.add(listener1);
         listeners.add(listener2);
@@ -82,10 +87,10 @@ describe("EventListeners", () => {
         let count1 = 0;
         let count2 = 0;
 
-        const listener1 = () => {
+        const listener1 = (): void => {
             count1++;
         };
-        const listener2 = () => {
+        const listener2 = (): void => {
             count2++;
         };
 
@@ -127,12 +132,10 @@ describe("EventListeners", () => {
         assert.strictEqual(results.length, 3);
     });
 
-
-
     it("should not trigger cleared listeners", () => {
         const listeners = new EventListeners<() => void>();
         let called = false;
-        const listener = () => {
+        const listener = (): void => {
             called = true;
         };
 
diff --git a/frontend/sync-client/src/utils/data-structures/event-listeners.ts b/frontend/sync-client/src/utils/data-structures/event-listeners.ts
index 008342e7..e08ca65e 100644
--- a/frontend/sync-client/src/utils/data-structures/event-listeners.ts
+++ b/frontend/sync-client/src/utils/data-structures/event-listeners.ts
@@ -2,11 +2,16 @@ import { removeFromArray } from "../remove-from-array";
 import { awaitAll } from "../await-all";
 
 /**
-* A utility class for managing event listeners with type-safe add/remove operations.
-*/
+ * A utility class for managing event listeners with type-safe add/remove operations.
+ */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export class EventListeners<TListener extends (...args: any[]) => any> {
     private readonly listeners: TListener[] = [];
 
+    public get count(): number {
+        return this.listeners.length;
+    }
+
     /**
     * Adds a new listener to the collection.
     *
@@ -51,6 +56,7 @@ export class EventListeners<TListener extends (...args: any[]) => any> {
         await awaitAll(
             this.listeners
                 .map((listener) => {
+                    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
                     return listener(...args);
                 })
                 .filter((result): result is Promise<unknown> => {
@@ -62,10 +68,4 @@ export class EventListeners<TListener extends (...args: any[]) => any> {
     public clear(): void {
         this.listeners.length = 0;
     }
-
-    public get count(): number {
-        return this.listeners.length;
-    }
-
-
 }
diff --git a/frontend/test-client/src/agent/mock-agent.ts b/frontend/test-client/src/agent/mock-agent.ts
index 604c3742..13d9928a 100644
--- a/frontend/test-client/src/agent/mock-agent.ts
+++ b/frontend/test-client/src/agent/mock-agent.ts
@@ -198,14 +198,14 @@ export class MockAgent extends MockClient {
             );
             this.client.logger.info(
                 "Local files: " +
-                Array.from(otherAgent.localFiles.keys()).join(", ")
+                    Array.from(otherAgent.localFiles.keys()).join(", ")
             );
             otherAgent.client.logger.info(
                 "Local data: " + JSON.stringify(otherAgent.data, null, 2)
             );
             otherAgent.client.logger.info(
                 "Local files: " +
-                Array.from(otherAgent.localFiles.keys()).join(", ")
+                    Array.from(otherAgent.localFiles.keys()).join(", ")
             );
 
             throw e;
diff --git a/scripts/check.sh b/scripts/check.sh
index e8a40985..dd41fbcb 100755
--- a/scripts/check.sh
+++ b/scripts/check.sh
@@ -34,18 +34,15 @@ fi
 
 cd ..
 
-# Use git ls-files to only check tracked files, respecting .gitignore
-if [[ "$FIX_MODE" == true ]]; then
-    git ls-files | xargs npx eclint fix
-else
-    git ls-files | xargs npx eclint check
-fi
-
 cd frontend
 npm run build
 npm run test
 npm run lint
 
+# Use git ls-files to only check tracked files, respecting .gitignore
+# We always run in fix mode and then check with git status
+git ls-files | xargs npx eclint fix
+
 if [[ "$FIX_MODE" == false ]] && [[ $(git status --porcelain) ]]; then
     git status --porcelain
     echo "Failing CI because the working directory is not clean after linting"
diff --git a/scripts/update-api-types.sh b/scripts/update-api-types.sh
index 5aa05d99..4b947ee8 100755
--- a/scripts/update-api-types.sh
+++ b/scripts/update-api-types.sh
@@ -11,5 +11,6 @@ cd -
 cp -r sync-server/bindings/* frontend/sync-client/src/services/types/
 
 cd frontend
-npm run lint || npx prettier --write sync-client/src/services/types/*.ts
+npm run lint
+git ls-files | xargs npx eclint fix
 cd -

From ce6d44f26b392c439d2192262e508a8736524599 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 7 Dec 2025 15:46:02 +0000
Subject: [PATCH 733/761] Add log line

---
 sync-server/src/app_state/database.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sync-server/src/app_state/database.rs b/sync-server/src/app_state/database.rs
index 25dabfa2..753880ec 100644
--- a/sync-server/src/app_state/database.rs
+++ b/sync-server/src/app_state/database.rs
@@ -57,6 +57,7 @@ impl Database {
 
         let mut connection_pools = std::collections::HashMap::new();
 
+        info!("Applying pending database migrations");
         let mut entries = tokio::fs::read_dir(&config.databases_directory_path).await?;
         while let Some(entry) = entries.next_entry().await? {
             if !entry.file_name().to_string_lossy().ends_with(".sqlite") {

From dbc63fcecdd8b24d1c240143bed547862155958a Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 7 Dec 2025 15:47:27 +0000
Subject: [PATCH 734/761] Once an hour

---
 .github/workflows/e2e.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index aaffac3b..1495431d 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -6,7 +6,7 @@ on:
   pull_request:
     branches: ["main"]
   schedule:
-    - cron: '*/30 * * * *'
+    - cron: '* * * * *'
 
 concurrency:
   group: e2e-tests

From 2db49da6545e969ab1238b1747f99df3228b0e32 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 7 Dec 2025 16:41:37 +0000
Subject: [PATCH 735/761] Fix cron

---
 .github/workflows/e2e.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 1495431d..28fde13e 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -6,7 +6,7 @@ on:
   pull_request:
     branches: ["main"]
   schedule:
-    - cron: '* * * * *'
+    - cron: '0 * * * *'
 
 concurrency:
   group: e2e-tests

From e2b24725ef2bb8931cf7a3936483be3ddaab5f04 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 7 Dec 2025 19:29:15 +0000
Subject: [PATCH 736/761] Bump versions to 0.13.0

---
 frontend/local-client-cli/package.json |  2 +-
 frontend/obsidian-plugin/manifest.json | 18 +++++++++---------
 frontend/obsidian-plugin/package.json  |  2 +-
 frontend/package-lock.json             |  8 ++++----
 frontend/sync-client/package.json      |  2 +-
 frontend/test-client/package.json      |  2 +-
 manifest.json                          | 18 +++++++++---------
 sync-server/Cargo.lock                 |  2 +-
 sync-server/Cargo.toml                 |  2 +-
 9 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/frontend/local-client-cli/package.json b/frontend/local-client-cli/package.json
index aa44748e..c483dcfe 100644
--- a/frontend/local-client-cli/package.json
+++ b/frontend/local-client-cli/package.json
@@ -1,6 +1,6 @@
 {
     "name": "local-client-cli",
-    "version": "0.12.0",
+    "version": "0.13.0",
     "description": "Standalone CLI for VaultLink sync client",
     "private": false,
     "bin": {
diff --git a/frontend/obsidian-plugin/manifest.json b/frontend/obsidian-plugin/manifest.json
index c8ee915b..ee4660ca 100644
--- a/frontend/obsidian-plugin/manifest.json
+++ b/frontend/obsidian-plugin/manifest.json
@@ -1,10 +1,10 @@
 {
-    "id": "vault-link",
-    "name": "VaultLink",
-    "version": "0.12.0",
-    "minAppVersion": "0.0.0",
-    "description": "Self-hosted synchronization and collaboration for your Vault.",
-    "author": "Andras Schmelczer",
-    "authorUrl": "https://schmelczer.dev",
-    "isDesktopOnly": false
-}
+	"id": "vault-link",
+	"name": "VaultLink",
+	"version": "0.13.0",
+	"minAppVersion": "0.0.0",
+	"description": "Self-hosted synchronization and collaboration for your Vault.",
+	"author": "Andras Schmelczer",
+	"authorUrl": "https://schmelczer.dev",
+	"isDesktopOnly": false
+}
\ No newline at end of file
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index 72a34fda..35c906c8 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -1,6 +1,6 @@
 {
     "name": "vault-link-obsidian-plugin",
-    "version": "0.12.0",
+    "version": "0.13.0",
     "description": "This is a sample plugin for Obsidian (https://obsidian.md)",
     "main": "main.js",
     "scripts": {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index c8819edb..acb3a9d0 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -22,7 +22,7 @@
             }
         },
         "local-client-cli": {
-            "version": "0.12.0",
+            "version": "0.13.0",
             "dependencies": {
                 "commander": "^14.0.2",
                 "watcher": "^2.3.1"
@@ -7483,7 +7483,7 @@
         },
         "obsidian-plugin": {
             "name": "vault-link-obsidian-plugin",
-            "version": "0.12.0",
+            "version": "0.13.0",
             "license": "MIT",
             "devDependencies": {
                 "@types/node": "^24.8.1",
@@ -7509,7 +7509,7 @@
             }
         },
         "sync-client": {
-            "version": "0.12.0",
+            "version": "0.13.0",
             "devDependencies": {
                 "@sentry/browser": "^10.8.0",
                 "@types/node": "^24.8.1",
@@ -7553,7 +7553,7 @@
             }
         },
         "test-client": {
-            "version": "0.12.0",
+            "version": "0.13.0",
             "bin": {
                 "test-client": "dist/cli.js"
             },
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index 92905511..82847005 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "sync-client",
-    "version": "0.12.0",
+    "version": "0.13.0",
     "main": "dist/sync-client.node.js",
     "browser": "dist/sync-client.web.js",
     "types": "dist/types/index.d.ts",
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index 01c87a2a..2d0702fa 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "test-client",
-    "version": "0.12.0",
+    "version": "0.13.0",
     "private": true,
     "bin": {
         "test-client": "./dist/cli.js"
diff --git a/manifest.json b/manifest.json
index c8ee915b..ee4660ca 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,10 +1,10 @@
 {
-    "id": "vault-link",
-    "name": "VaultLink",
-    "version": "0.12.0",
-    "minAppVersion": "0.0.0",
-    "description": "Self-hosted synchronization and collaboration for your Vault.",
-    "author": "Andras Schmelczer",
-    "authorUrl": "https://schmelczer.dev",
-    "isDesktopOnly": false
-}
+	"id": "vault-link",
+	"name": "VaultLink",
+	"version": "0.13.0",
+	"minAppVersion": "0.0.0",
+	"description": "Self-hosted synchronization and collaboration for your Vault.",
+	"author": "Andras Schmelczer",
+	"authorUrl": "https://schmelczer.dev",
+	"isDesktopOnly": false
+}
\ No newline at end of file
diff --git a/sync-server/Cargo.lock b/sync-server/Cargo.lock
index c07ddb17..9ed56675 100644
--- a/sync-server/Cargo.lock
+++ b/sync-server/Cargo.lock
@@ -2123,7 +2123,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.12.0"
+version = "0.13.0"
 dependencies = [
  "anyhow",
  "axum",
diff --git a/sync-server/Cargo.toml b/sync-server/Cargo.toml
index 394ff314..2dd5c91e 100644
--- a/sync-server/Cargo.toml
+++ b/sync-server/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.12.0"
+version = "0.13.0"
 
 [dependencies]
 serde = { version = "1.0.219", default-features = false, features = ["derive"] }

From 8e4ac3a26a46e5e9f7dd6ec920637d98f42a3fe8 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Mon, 8 Dec 2025 20:11:56 +0000
Subject: [PATCH 737/761] Fix manifests

---
 frontend/obsidian-plugin/manifest.json | 18 +++++++++---------
 manifest.json                          | 18 +++++++++---------
 scripts/bump-version.sh                |  2 ++
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/frontend/obsidian-plugin/manifest.json b/frontend/obsidian-plugin/manifest.json
index ee4660ca..114f86f3 100644
--- a/frontend/obsidian-plugin/manifest.json
+++ b/frontend/obsidian-plugin/manifest.json
@@ -1,10 +1,10 @@
 {
-	"id": "vault-link",
-	"name": "VaultLink",
-	"version": "0.13.0",
-	"minAppVersion": "0.0.0",
-	"description": "Self-hosted synchronization and collaboration for your Vault.",
-	"author": "Andras Schmelczer",
-	"authorUrl": "https://schmelczer.dev",
-	"isDesktopOnly": false
-}
\ No newline at end of file
+    "id": "vault-link",
+    "name": "VaultLink",
+    "version": "0.13.0",
+    "minAppVersion": "0.0.0",
+    "description": "Self-hosted synchronization and collaboration for your Vault.",
+    "author": "Andras Schmelczer",
+    "authorUrl": "https://schmelczer.dev",
+    "isDesktopOnly": false
+}
diff --git a/manifest.json b/manifest.json
index ee4660ca..114f86f3 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,10 +1,10 @@
 {
-	"id": "vault-link",
-	"name": "VaultLink",
-	"version": "0.13.0",
-	"minAppVersion": "0.0.0",
-	"description": "Self-hosted synchronization and collaboration for your Vault.",
-	"author": "Andras Schmelczer",
-	"authorUrl": "https://schmelczer.dev",
-	"isDesktopOnly": false
-}
\ No newline at end of file
+    "id": "vault-link",
+    "name": "VaultLink",
+    "version": "0.13.0",
+    "minAppVersion": "0.0.0",
+    "description": "Self-hosted synchronization and collaboration for your Vault.",
+    "author": "Andras Schmelczer",
+    "authorUrl": "https://schmelczer.dev",
+    "isDesktopOnly": false
+}
diff --git a/scripts/bump-version.sh b/scripts/bump-version.sh
index 6190eb3e..fb953e2a 100755
--- a/scripts/bump-version.sh
+++ b/scripts/bump-version.sh
@@ -35,6 +35,8 @@ cd ..
 
 cp frontend/obsidian-plugin/manifest.json manifest.json  # for BRAT, otherwise it wouldn't update
 
+git ls-files | xargs npx eclint fix
+
 # Commit and tag
 git add .
 TAG=$(node -p "require('./frontend/obsidian-plugin/package.json').version")

From 9ac7fdbeb77c875612ce75b6b8258b49239bee47 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Wed, 10 Dec 2025 22:03:13 +0000
Subject: [PATCH 738/761] Improve CI (#181)

---
 .github/workflows/check.yml                 |  4 ++-
 .github/workflows/deploy-docs.yml           | 28 +++++----------------
 .github/workflows/e2e.yml                   |  4 ++-
 .github/workflows/publish-cli-docker.yml    |  3 +++
 .github/workflows/publish-plugin.yml        |  4 +++
 .github/workflows/publish-server-docker.yml |  2 ++
 frontend/test-client/src/cli.ts             | 13 +++++-----
 scripts/build-docs.sh                       | 12 +++++++++
 scripts/check.sh                            |  2 +-
 sync-server/src/app_state/database.rs       |  5 ++--
 10 files changed, 44 insertions(+), 33 deletions(-)
 create mode 100644 scripts/build-docs.sh

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index f3fad1df..cf890830 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -16,6 +16,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: Setup Node.js environment
         uses: actions/setup-node@v4.2.0
@@ -31,7 +33,7 @@ jobs:
 
       - name: Setup rust
         run: |
-          cargo install sqlx-cli cargo-machete
+          which sqlx || cargo install sqlx-cli
           cd sync-server
           sqlx database create --database-url sqlite://db.sqlite3
           sqlx migrate run --source src/app_state/database/migrations --database-url sqlite://db.sqlite3
diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml
index e1c3bcf8..b6d369cc 100644
--- a/.github/workflows/deploy-docs.yml
+++ b/.github/workflows/deploy-docs.yml
@@ -20,7 +20,8 @@ concurrency:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
+
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -30,32 +31,15 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 22
           cache: npm
           cache-dependency-path: docs/package-lock.json
 
       - name: Setup Pages
         uses: actions/configure-pages@v4
 
-      - name: Install dependencies
-        run: |
-          cd docs
-          npm ci
-
-      - name: Check formatting
-        run: |
-          cd docs
-          npm run format:check
-
-      - name: Check spelling
-        run: |
-          cd docs
-          npm run spell:check
-
-      - name: Build documentation
-        run: |
-          cd docs
-          npm run build
+      - name: Build docs
+        run: scripts/build-docs.sh
 
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v3
@@ -67,7 +51,7 @@ jobs:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}
     needs: build
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
     name: Deploy
     steps:
       - name: Deploy to GitHub Pages
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 28fde13e..803cddb2 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -21,6 +21,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: Setup Node.js environment
         uses: actions/setup-node@v4.2.0
@@ -36,7 +38,7 @@ jobs:
 
       - name: Setup rust
         run: |
-          cargo install sqlx-cli
+          which sqlx || cargo install sqlx-cli
           cd sync-server
           sqlx database create --database-url sqlite://db.sqlite3
           sqlx migrate run --source src/app_state/database/migrations --database-url sqlite://db.sqlite3
diff --git a/.github/workflows/publish-cli-docker.yml b/.github/workflows/publish-cli-docker.yml
index 73ef1b12..10a7e8ba 100644
--- a/.github/workflows/publish-cli-docker.yml
+++ b/.github/workflows/publish-cli-docker.yml
@@ -2,6 +2,7 @@ name: Publish CLI
 
 on:
   push:
+    branches: ["main"]
     tags: ["*"]
   pull_request:
     branches: ["main"]
@@ -22,6 +23,8 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: Install cosign
         uses: sigstore/cosign-installer@59acb6260d9c0ba8f4a2f9d9b48431a222b68e20 #v3.5.0
diff --git a/.github/workflows/publish-plugin.yml b/.github/workflows/publish-plugin.yml
index ed223780..7a168db5 100644
--- a/.github/workflows/publish-plugin.yml
+++ b/.github/workflows/publish-plugin.yml
@@ -3,6 +3,8 @@ name: Publish Obsidian plugin
 on:
   push:
     tags: ["*"]
+pull_request:
+    branches: ["main"]
 
 env:
   CARGO_TERM_COLOR: always
@@ -13,6 +15,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: Setup Node.js environment
         uses: actions/setup-node@v4.2.0
diff --git a/.github/workflows/publish-server-docker.yml b/.github/workflows/publish-server-docker.yml
index f9fee79b..4a97a9e6 100644
--- a/.github/workflows/publish-server-docker.yml
+++ b/.github/workflows/publish-server-docker.yml
@@ -27,6 +27,8 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       # Install the cosign tool
       # https://github.com/sigstore/cosign-installer
diff --git a/frontend/test-client/src/cli.ts b/frontend/test-client/src/cli.ts
index 70817a24..b5370d0b 100644
--- a/frontend/test-client/src/cli.ts
+++ b/frontend/test-client/src/cli.ts
@@ -118,7 +118,7 @@ async function runTest({
 
 async function runTests(): Promise<void> {
     for (let i = 0; i < TEST_ITERATIONS; i++) {
-        for (const useSlowFileEvents of [false, true]) {
+        for (const useSlowFileEvents of [true, false]) {
             for (const concurrency of [
                 16,
                 1 // test with concurrency 1 to check for deadlocks
@@ -150,10 +150,6 @@ async function runTests(): Promise<void> {
 }
 
 process.on("uncaughtException", (error) => {
-    if (slowFileEvents) {
-        return;
-    }
-
     if (
         error instanceof Error &&
         error.message.includes(
@@ -172,7 +168,12 @@ process.on("unhandledRejection", (error, _promise) => {
         return;
     }
 
-    if (slowFileEvents) {
+    if (
+        slowFileEvents &&
+        error instanceof Error &&
+        (error.message.includes("Document not found") ||
+            error.message.includes("Document already exists at new location"))
+    ) {
         return;
     }
 
diff --git a/scripts/build-docs.sh b/scripts/build-docs.sh
new file mode 100644
index 00000000..9f3c76d4
--- /dev/null
+++ b/scripts/build-docs.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+set -e
+
+cd docs
+
+npm ci
+npm run format:check
+npm run spell:check
+npm run build
+
+cd -
diff --git a/scripts/check.sh b/scripts/check.sh
index dd41fbcb..2a13953a 100755
--- a/scripts/check.sh
+++ b/scripts/check.sh
@@ -20,7 +20,7 @@ else
     cargo fmt --all -- --check
 fi
 
-cargo install cargo-machete
+which cargo-machete || cargo install cargo-machete
 cargo machete --with-metadata
 
 echo "Running checks in frontend"
diff --git a/sync-server/src/app_state/database.rs b/sync-server/src/app_state/database.rs
index 753880ec..75ce6df4 100644
--- a/sync-server/src/app_state/database.rs
+++ b/sync-server/src/app_state/database.rs
@@ -6,7 +6,7 @@ use log::info;
 use models::{
     DocumentId, DocumentVersionWithoutContent, StoredDocumentVersion, VaultId, VaultUpdateId,
 };
-use sqlx::{sqlite::SqliteConnectOptions, types::chrono::Utc};
+use sqlx::{ConnectOptions, sqlite::SqliteConnectOptions, types::chrono::Utc};
 
 pub mod models;
 use sqlx::{Pool, Sqlite, sqlite::SqlitePoolOptions};
@@ -105,7 +105,8 @@ impl Database {
             .create_if_missing(true)
             .auto_vacuum(sqlx::sqlite::SqliteAutoVacuum::Full)
             .busy_timeout(Duration::from_secs(3600))
-            .journal_mode(sqlx::sqlite::SqliteJournalMode::Wal);
+            .journal_mode(sqlx::sqlite::SqliteJournalMode::Wal)
+            .log_slow_statements(log::LevelFilter::Warn, Duration::from_secs(30));
 
         let pool = SqlitePoolOptions::new()
             .max_connections(config.max_connections_per_vault)

From 056fb96ce8845fe973bbf37a9cae47784c13c26e Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Wed, 10 Dec 2025 22:35:44 +0000
Subject: [PATCH 739/761] chmod +x

---
 scripts/build-docs.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 scripts/build-docs.sh

diff --git a/scripts/build-docs.sh b/scripts/build-docs.sh
old mode 100644
new mode 100755

From 387e7afd58ec37236915058cbcbe639f67b16612 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Wed, 10 Dec 2025 23:14:50 +0000
Subject: [PATCH 740/761] Allow-list error type

---
 .github/workflows/publish-plugin.yml         |  2 +-
 frontend/test-client/src/agent/mock-agent.ts |  9 ++--
 frontend/test-client/src/cli.ts              | 44 +++++++++++++-------
 3 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/publish-plugin.yml b/.github/workflows/publish-plugin.yml
index 7a168db5..9e74c60d 100644
--- a/.github/workflows/publish-plugin.yml
+++ b/.github/workflows/publish-plugin.yml
@@ -3,7 +3,7 @@ name: Publish Obsidian plugin
 on:
   push:
     tags: ["*"]
-pull_request:
+  pull_request:
     branches: ["main"]
 
 env:
diff --git a/frontend/test-client/src/agent/mock-agent.ts b/frontend/test-client/src/agent/mock-agent.ts
index 13d9928a..1640c2ec 100644
--- a/frontend/test-client/src/agent/mock-agent.ts
+++ b/frontend/test-client/src/agent/mock-agent.ts
@@ -90,10 +90,11 @@ export class MockAgent extends MockClient {
             this.createFileAction.bind(this)
         ];
 
-        if (this.client.getSettings().isSyncEnabled) {
-            if (this.doNotTouchWhileOffline.length === 0) {
-                options.push(this.disableSyncAction.bind(this));
-            }
+        if (
+            this.client.getSettings().isSyncEnabled &&
+            this.doNotTouchWhileOffline.length === 0
+        ) {
+            options.push(this.disableSyncAction.bind(this));
         } else {
             options.push(this.enableSyncAction.bind(this));
         }
diff --git a/frontend/test-client/src/cli.ts b/frontend/test-client/src/cli.ts
index b5370d0b..3af547e7 100644
--- a/frontend/test-client/src/cli.ts
+++ b/frontend/test-client/src/cli.ts
@@ -10,12 +10,15 @@ const TEST_ITERATIONS = 5;
 // Simulate async file access by injecting waiting time before returning from file operations.
 let slowFileEvents = false;
 
+// Whether to do resets in the test runs
+let doResets = false;
+
 async function runTest({
     agentCount,
     concurrency,
     iterations,
     doDeletes,
-    doResets,
+    useResets,
     useSlowFileEvents,
     jitterScaleInSeconds
 }: {
@@ -23,13 +26,14 @@ async function runTest({
     concurrency: number;
     iterations: number;
     doDeletes: boolean;
-    doResets: boolean;
+    useResets: boolean;
     useSlowFileEvents: boolean;
     jitterScaleInSeconds: number;
 }): Promise<void> {
     slowFileEvents = useSlowFileEvents;
+    doResets = useResets;
 
-    const settings = `with ${agentCount} agents, concurrency ${concurrency}, iterations ${iterations}, doDeletes ${doDeletes}, doResets ${doResets}, jitterScaleInSeconds ${jitterScaleInSeconds}, useSlowFileEvents ${useSlowFileEvents}`;
+    const settings = `with ${agentCount} agents, concurrency ${concurrency}, iterations ${iterations}, doDeletes ${doDeletes}, doResets ${useResets}, jitterScaleInSeconds ${jitterScaleInSeconds}, useSlowFileEvents ${useSlowFileEvents}`;
     console.info(`Running test ${settings}`);
 
     const vaultName = uuidv4();
@@ -49,7 +53,7 @@ async function runTest({
                 initialSettings,
                 `agent-${i}`,
                 doDeletes,
-                doResets,
+                useResets,
                 useSlowFileEvents,
                 jitterScaleInSeconds
             )
@@ -118,6 +122,16 @@ async function runTest({
 
 async function runTests(): Promise<void> {
     for (let i = 0; i < TEST_ITERATIONS; i++) {
+        await runTest({
+            agentCount: 2,
+            concurrency: 16,
+            iterations: 100,
+            doDeletes: true,
+            useResets: true,
+            useSlowFileEvents: true,
+            jitterScaleInSeconds: 0.75
+        });
+
         for (const useSlowFileEvents of [true, false]) {
             for (const concurrency of [
                 16,
@@ -129,23 +143,13 @@ async function runTests(): Promise<void> {
                         concurrency,
                         iterations: 100,
                         doDeletes,
-                        doResets: false,
+                        useResets: false,
                         useSlowFileEvents,
                         jitterScaleInSeconds: 0.75
                     });
                 }
             }
         }
-
-        await runTest({
-            agentCount: 2,
-            concurrency: 16,
-            iterations: 100,
-            doDeletes: true,
-            doResets: true,
-            useSlowFileEvents: true,
-            jitterScaleInSeconds: 0.75
-        });
     }
 }
 
@@ -177,6 +181,16 @@ process.on("unhandledRejection", (error, _promise) => {
         return;
     }
 
+    if (
+        doResets &&
+        error instanceof Error &&
+        error.message.includes(
+            "SyncClient has been destroyed and can no longer be used"
+        )
+    ) {
+        return;
+    }
+
     console.error("Unhandled rejection:", error);
     process.exit(1);
 });

From f6dccc4492514439c48d603fd153484e67ecd879 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 11 Dec 2025 22:08:48 +0000
Subject: [PATCH 741/761] Try fixing E2E tests more

---
 .github/workflows/e2e.yml                     |  2 +-
 .../file-operations/file-operations.test.ts   |  2 +-
 .../src/file-operations/file-operations.ts    |  2 +-
 .../sync-client/src/services/server-config.ts | 36 ++++++++++---------
 .../sync-operations/unrestricted-syncer.ts    | 17 ++++-----
 scripts/e2e.sh                                |  4 +--
 6 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 803cddb2..0e437cbd 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -49,7 +49,7 @@ jobs:
           cargo run config-e2e.yml --color never &
           cd ..
 
-          scripts/e2e.sh 16
+          scripts/e2e.sh 8
 
       - name: Cleanup
         if: always()
diff --git a/frontend/sync-client/src/file-operations/file-operations.test.ts b/frontend/sync-client/src/file-operations/file-operations.test.ts
index 35595e6e..998e47ec 100644
--- a/frontend/sync-client/src/file-operations/file-operations.test.ts
+++ b/frontend/sync-client/src/file-operations/file-operations.test.ts
@@ -12,7 +12,7 @@ import type { TextWithCursors } from "reconcile-text";
 import type { ServerConfig, ServerConfigData } from "../services/server-config";
 
 class MockServerConfig implements Pick<ServerConfig, "getConfig"> {
-    public getConfig(): ServerConfigData {
+    public async getConfig(): Promise<ServerConfigData> {
         return {
             mergeableFileExtensions: ["md", "txt"],
             supportedApiVersion: 1,
diff --git a/frontend/sync-client/src/file-operations/file-operations.ts b/frontend/sync-client/src/file-operations/file-operations.ts
index 4d3e517d..2864bd20 100644
--- a/frontend/sync-client/src/file-operations/file-operations.ts
+++ b/frontend/sync-client/src/file-operations/file-operations.ts
@@ -97,7 +97,7 @@ export class FileOperations {
         if (
             !isFileTypeMergable(
                 path,
-                this.serverConfig.getConfig().mergeableFileExtensions
+                (await this.serverConfig.getConfig()).mergeableFileExtensions
             ) ||
             isBinary(expectedContent) ||
             isBinary(newContent)
diff --git a/frontend/sync-client/src/services/server-config.ts b/frontend/sync-client/src/services/server-config.ts
index 3d40f182..309c637c 100644
--- a/frontend/sync-client/src/services/server-config.ts
+++ b/frontend/sync-client/src/services/server-config.ts
@@ -16,41 +16,40 @@ export class ServerConfig {
 
     public constructor(private readonly syncService: SyncService) {}
 
-    public async initialize(): Promise<void> {
-        this.response = this.syncService.ping();
-        this.config = await this.response;
-
-        if (this.config.supportedApiVersion !== SUPPORTED_API_VERSION) {
+    private static validateConfig(config: ServerConfigData): void {
+        if (config.supportedApiVersion !== SUPPORTED_API_VERSION) {
             const shouldUpgradeClient =
-                this.config.supportedApiVersion > SUPPORTED_API_VERSION;
+                config.supportedApiVersion > SUPPORTED_API_VERSION;
             throw new ServerVersionMismatchError(
-                `Unsupported API version: ${this.config.supportedApiVersion}. Consider upgrading the ${
+                `Unsupported API version: ${config.supportedApiVersion}. Consider upgrading the ${
                     shouldUpgradeClient ? "client" : "sync-server"
-                } to ensure compatibility.`
+                } to ensure compatibility`
             );
         }
 
-        if (!this.config.isAuthenticated) {
+        if (!config.isAuthenticated) {
             throw new AuthenticationError(
-                "Failed to authenticate with the sync-server."
+                "Failed to authenticate with the sync-server"
             );
         }
     }
 
+    // warm the cache
+    public async initialize(): Promise<void> {
+        await this.getConfig();
+    }
+
     public async checkConnection(forceUpdate = false): Promise<{
         isSuccessful: boolean;
         message: string;
     }> {
         try {
             let { response } = this;
-            if (!response && !forceUpdate) {
-                throw new Error("ServerConfig not initialized");
-            } else if (forceUpdate) {
+            if (!response || forceUpdate) {
                 response = this.response = this.syncService.ping();
             }
 
-            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-            const result: PingResponse = (await response)!; // it must be defined, otherwise we would have thrown above
+            const result: PingResponse = await response; // it must be defined, otherwise we would have thrown above
             this.config = result;
 
             if (result.isAuthenticated) {
@@ -72,11 +71,14 @@ export class ServerConfig {
         }
     }
 
-    public getConfig(): ServerConfigData {
+    public async getConfig(): Promise<ServerConfigData> {
         if (!this.config) {
-            throw new Error("ServerConfig not initialized");
+            this.response ??= this.syncService.ping();
+            this.config = await this.response;
         }
 
+        ServerConfig.validateConfig(this.config);
+
         return this.config;
     }
 
diff --git a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
index 0bef47d4..e3964d30 100644
--- a/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
+++ b/frontend/sync-client/src/sync-operations/unrestricted-syncer.ts
@@ -108,7 +108,7 @@ export class UnrestrictedSyncer {
             );
 
             this.database.addSeenUpdateId(response.vaultUpdateId);
-            this.updateCache(
+            await this.updateCache(
                 response.vaultUpdateId,
                 contentBytes,
                 response.relativePath
@@ -206,7 +206,8 @@ export class UnrestrictedSyncer {
                     !isBinary(contentBytes) &&
                     isFileTypeMergable(
                         document.relativePath,
-                        this.serverConfig.getConfig().mergeableFileExtensions
+                        (await this.serverConfig.getConfig())
+                            .mergeableFileExtensions
                     );
                 const cachedVersion = this.contentCache.get(
                     document.metadata.parentVersionId
@@ -300,7 +301,7 @@ export class UnrestrictedSyncer {
                     contentBytes,
                     responseBytes
                 );
-                this.updateCache(
+                await this.updateCache(
                     response.vaultUpdateId,
                     responseBytes,
                     actualPath
@@ -322,7 +323,7 @@ export class UnrestrictedSyncer {
                     },
                     document
                 );
-                this.updateCache(
+                await this.updateCache(
                     response.vaultUpdateId,
                     contentBytes,
                     actualPath
@@ -451,7 +452,7 @@ export class UnrestrictedSyncer {
                 remoteVersion.relativePath,
                 contentBytes
             );
-            this.updateCache(
+            await this.updateCache(
                 remoteVersion.vaultUpdateId,
                 contentBytes,
                 remoteVersion.relativePath
@@ -547,15 +548,15 @@ export class UnrestrictedSyncer {
         }
     }
 
-    private updateCache(
+    private async updateCache(
         updateId: number,
         contentBytes: Uint8Array,
         filePath: RelativePath
-    ): void {
+    ): Promise<void> {
         if (
             isFileTypeMergable(
                 filePath,
-                this.serverConfig.getConfig().mergeableFileExtensions
+                (await this.serverConfig.getConfig()).mergeableFileExtensions
             ) &&
             !isBinary(contentBytes)
         ) {
diff --git a/scripts/e2e.sh b/scripts/e2e.sh
index a5b5cf3b..49f320a0 100755
--- a/scripts/e2e.sh
+++ b/scripts/e2e.sh
@@ -50,8 +50,8 @@ for i in $(seq 1 $process_count); do
     pids+=($pid)
     echo "Started process $i with PID: $pid"
 
-    # Read from pipe, prefix with PID, and write to log file
-    (sed "s/^/[PID $pid] /" < "$pipe" > "../logs/log_${i}.log"; rm "$pipe") &
+    # Read from pipe, prefix with PID
+    (sed "s/^/[PID $pid] /" < "$pipe" | tee "../logs/log_${i}.log"; rm "$pipe") &
 done
 
 cd ..

From 079cd26faad8d7393eac1d3739badabcea4d7a13 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Thu, 11 Dec 2025 22:10:21 +0000
Subject: [PATCH 742/761] Bump versions to 0.13.1

---
 frontend/local-client-cli/package.json | 2 +-
 frontend/obsidian-plugin/manifest.json | 2 +-
 frontend/obsidian-plugin/package.json  | 2 +-
 frontend/package-lock.json             | 8 ++++----
 frontend/sync-client/package.json      | 2 +-
 frontend/test-client/package.json      | 2 +-
 manifest.json                          | 2 +-
 sync-server/Cargo.lock                 | 2 +-
 sync-server/Cargo.toml                 | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/frontend/local-client-cli/package.json b/frontend/local-client-cli/package.json
index c483dcfe..6cfa180c 100644
--- a/frontend/local-client-cli/package.json
+++ b/frontend/local-client-cli/package.json
@@ -1,6 +1,6 @@
 {
     "name": "local-client-cli",
-    "version": "0.13.0",
+    "version": "0.13.1",
     "description": "Standalone CLI for VaultLink sync client",
     "private": false,
     "bin": {
diff --git a/frontend/obsidian-plugin/manifest.json b/frontend/obsidian-plugin/manifest.json
index 114f86f3..355c2ddc 100644
--- a/frontend/obsidian-plugin/manifest.json
+++ b/frontend/obsidian-plugin/manifest.json
@@ -1,7 +1,7 @@
 {
     "id": "vault-link",
     "name": "VaultLink",
-    "version": "0.13.0",
+    "version": "0.13.1",
     "minAppVersion": "0.0.0",
     "description": "Self-hosted synchronization and collaboration for your Vault.",
     "author": "Andras Schmelczer",
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index 35c906c8..219fca41 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -1,6 +1,6 @@
 {
     "name": "vault-link-obsidian-plugin",
-    "version": "0.13.0",
+    "version": "0.13.1",
     "description": "This is a sample plugin for Obsidian (https://obsidian.md)",
     "main": "main.js",
     "scripts": {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index acb3a9d0..3e944c5c 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -22,7 +22,7 @@
             }
         },
         "local-client-cli": {
-            "version": "0.13.0",
+            "version": "0.13.1",
             "dependencies": {
                 "commander": "^14.0.2",
                 "watcher": "^2.3.1"
@@ -7483,7 +7483,7 @@
         },
         "obsidian-plugin": {
             "name": "vault-link-obsidian-plugin",
-            "version": "0.13.0",
+            "version": "0.13.1",
             "license": "MIT",
             "devDependencies": {
                 "@types/node": "^24.8.1",
@@ -7509,7 +7509,7 @@
             }
         },
         "sync-client": {
-            "version": "0.13.0",
+            "version": "0.13.1",
             "devDependencies": {
                 "@sentry/browser": "^10.8.0",
                 "@types/node": "^24.8.1",
@@ -7553,7 +7553,7 @@
             }
         },
         "test-client": {
-            "version": "0.13.0",
+            "version": "0.13.1",
             "bin": {
                 "test-client": "dist/cli.js"
             },
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index 82847005..1ae9b8f0 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "sync-client",
-    "version": "0.13.0",
+    "version": "0.13.1",
     "main": "dist/sync-client.node.js",
     "browser": "dist/sync-client.web.js",
     "types": "dist/types/index.d.ts",
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index 2d0702fa..ca4c1479 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "test-client",
-    "version": "0.13.0",
+    "version": "0.13.1",
     "private": true,
     "bin": {
         "test-client": "./dist/cli.js"
diff --git a/manifest.json b/manifest.json
index 114f86f3..355c2ddc 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
     "id": "vault-link",
     "name": "VaultLink",
-    "version": "0.13.0",
+    "version": "0.13.1",
     "minAppVersion": "0.0.0",
     "description": "Self-hosted synchronization and collaboration for your Vault.",
     "author": "Andras Schmelczer",
diff --git a/sync-server/Cargo.lock b/sync-server/Cargo.lock
index 9ed56675..906b232b 100644
--- a/sync-server/Cargo.lock
+++ b/sync-server/Cargo.lock
@@ -2123,7 +2123,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.13.0"
+version = "0.13.1"
 dependencies = [
  "anyhow",
  "axum",
diff --git a/sync-server/Cargo.toml b/sync-server/Cargo.toml
index 2dd5c91e..c60a65a2 100644
--- a/sync-server/Cargo.toml
+++ b/sync-server/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.13.0"
+version = "0.13.1"
 
 [dependencies]
 serde = { version = "1.0.219", default-features = false, features = ["derive"] }

From 8aba8ee44af2b2fe453b48dccf2ac977d0825c31 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 13 Dec 2025 12:03:35 +0000
Subject: [PATCH 743/761] Extract const

---
 frontend/local-client-cli/src/cli.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/frontend/local-client-cli/src/cli.ts b/frontend/local-client-cli/src/cli.ts
index 0f8262f7..48fd8954 100644
--- a/frontend/local-client-cli/src/cli.ts
+++ b/frontend/local-client-cli/src/cli.ts
@@ -35,6 +35,8 @@ const LOG_LEVEL_ORDER = {
     [LogLevel.ERROR]: 3
 };
 
+const HEALTH_CHECK_INTERVAL_MS = 30 * 1000;
+
 async function main(): Promise<void> {
     const args = parseArgs(process.argv);
     const absolutePath = path.resolve(args.localPath);
@@ -147,7 +149,7 @@ async function main(): Promise<void> {
             void client.checkConnection().then((status) => {
                 writeHealthStatus(healthFile, status);
             });
-        }, 30 * 1000); // every 30 seconds
+        }, HEALTH_CHECK_INTERVAL_MS);
         const clearHealthInterval = (): void => {
             clearInterval(healthInterval);
         };

From 1b71f3e780461224c3f8e465bae8381e3e6bd986 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 14 Dec 2025 10:55:46 +0000
Subject: [PATCH 744/761] Always kill server

---
 .github/workflows/e2e.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 0e437cbd..196e02f3 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -47,9 +47,16 @@ jobs:
         run: |
           cd sync-server
           cargo run config-e2e.yml --color never &
+          SERVER_PID=$!
           cd ..
 
           scripts/e2e.sh 8
+          EXIT_CODE=$?
+
+          kill $SERVER_PID 2>/dev/null || true
+          wait $SERVER_PID 2>/dev/null || true
+
+          exit $EXIT_CODE
 
       - name: Cleanup
         if: always()

From 299c3baea97e0f93a0c046c1c7a4da202e04eb36 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 14 Dec 2025 10:55:54 +0000
Subject: [PATCH 745/761] Don't publish PRs

---
 .github/workflows/publish-plugin.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/publish-plugin.yml b/.github/workflows/publish-plugin.yml
index 9e74c60d..92dd199b 100644
--- a/.github/workflows/publish-plugin.yml
+++ b/.github/workflows/publish-plugin.yml
@@ -3,8 +3,6 @@ name: Publish Obsidian plugin
 on:
   push:
     tags: ["*"]
-  pull_request:
-    branches: ["main"]
 
 env:
   CARGO_TERM_COLOR: always

From 580c993071df52eeefc7e5dadfefb3cfb90fd8ca Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 14 Dec 2025 11:05:36 +0000
Subject: [PATCH 746/761] Reject pending locks on reset

---
 .../src/utils/data-structures/locks.ts        | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/frontend/sync-client/src/utils/data-structures/locks.ts b/frontend/sync-client/src/utils/data-structures/locks.ts
index 8ad60429..3f676667 100644
--- a/frontend/sync-client/src/utils/data-structures/locks.ts
+++ b/frontend/sync-client/src/utils/data-structures/locks.ts
@@ -1,3 +1,4 @@
+import { SyncResetError } from "../../services/sync-reset-error";
 import type { Logger } from "../../tracing/logger";
 import { awaitAll } from "../await-all";
 
@@ -12,9 +13,9 @@ export class Locks<T> {
     private readonly locked = new Set<T>();
 
     /** Queue of resolve functions waiting for each key */
-    private readonly waiters = new Map<T, (() => unknown)[]>();
+    private readonly waiters = new Map<T, ([() => unknown, (err: unknown) => unknown])[]>();
 
-    public constructor(private readonly logger?: Logger) {}
+    public constructor(private readonly logger?: Logger) { }
 
     /**
     * Executes a function while holding exclusive locks on one or more keys.
@@ -67,6 +68,13 @@ export class Locks<T> {
     }
 
     public reset(): void {
+        // Resolve all waiting promises before clearing to prevent deadlock
+        // Any operation waiting for a lock will be granted access immediately
+        for (const waiting of this.waiters.values()) {
+            for (const [_, reject] of waiting) {
+                reject(new SyncResetError());
+            }
+        }
         this.locked.clear();
         this.waiters.clear();
     }
@@ -102,7 +110,7 @@ export class Locks<T> {
 
         this.logger?.debug(`Waiting for lock on ${key}`);
 
-        return new Promise((resolve) => {
+        return new Promise((resolve, reject) => {
             // DefaultDict behavior
             let waiting = this.waiters.get(key);
             if (!waiting) {
@@ -110,7 +118,7 @@ export class Locks<T> {
                 this.waiters.set(key, waiting);
             }
 
-            waiting.push(resolve);
+            waiting.push([resolve, reject]);
         });
     }
 
@@ -127,11 +135,11 @@ export class Locks<T> {
         }
 
         // Remove first waiter to ensure FIFO order
-        const nextWaiting = this.waiters.get(key)?.shift();
+        const [resolveNextWaiting, _] = this.waiters.get(key)?.shift() ?? [];
 
-        if (nextWaiting) {
+        if (resolveNextWaiting) {
             this.logger?.debug(`Granted lock on ${key}`);
-            nextWaiting();
+            resolveNextWaiting();
         } else {
             this.locked.delete(key);
         }

From b6ab01d56a47da4c749cb1b3a50858774f0da917 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 14 Dec 2025 11:05:55 +0000
Subject: [PATCH 747/761] Handle websocket race condition

---
 frontend/sync-client/src/services/websocket-manager.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/frontend/sync-client/src/services/websocket-manager.ts b/frontend/sync-client/src/services/websocket-manager.ts
index f8dc59d4..0cc4d15e 100644
--- a/frontend/sync-client/src/services/websocket-manager.ts
+++ b/frontend/sync-client/src/services/websocket-manager.ts
@@ -188,6 +188,11 @@ export class WebSocketManager {
         this.webSocket = new this.webSocketFactoryImplementation(wsUri);
 
         this.webSocket.onopen = (): void => {
+            // Check if we've been stopped while connecting
+            if (this.isStopped) {
+                this.webSocket?.close(1000, "WebSocketManager was stopped during connection");
+                return;
+            }
             this.logger.info("WebSocket connection opened");
             this.onWebSocketStatusChanged.trigger(true);
         };

From 47f24e168b8471d56a13982e40ca7e0bba4430eb Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 14 Dec 2025 11:06:49 +0000
Subject: [PATCH 748/761] Wait for idle instead

---
 frontend/sync-client/src/sync-operations/syncer.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/sync-client/src/sync-operations/syncer.ts b/frontend/sync-client/src/sync-operations/syncer.ts
index 78cef699..709b9f62 100644
--- a/frontend/sync-client/src/sync-operations/syncer.ts
+++ b/frontend/sync-client/src/sync-operations/syncer.ts
@@ -171,7 +171,7 @@ export class Syncer {
             // in that case, we mustn't move it again.
             if (
                 this.database.getLatestDocumentByRelativePath(relativePath) ===
-                    undefined ||
+                undefined ||
                 this.database.getLatestDocumentByRelativePath(relativePath)
                     ?.isDeleted === true
             ) {
@@ -264,7 +264,7 @@ export class Syncer {
 
     public async waitUntilFinished(): Promise<void> {
         await this.runningScheduleSyncForOfflineChanges;
-        await this.syncQueue.onEmpty();
+        await this.syncQueue.onIdle(); // Wait for queue to be empty and running tasks to finish
     }
 
     public async syncRemotelyUpdatedFile(

From 7daa3637235e6335ce60da5bd03e9bd7552a6fe1 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 14 Dec 2025 11:31:48 +0000
Subject: [PATCH 749/761] Unsubscribe in SyncClient

---
 frontend/sync-client/src/sync-client.ts | 43 ++++++++++++++++++-------
 1 file changed, 31 insertions(+), 12 deletions(-)

diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts
index 1544a1e0..633d20b5 100644
--- a/frontend/sync-client/src/sync-client.ts
+++ b/frontend/sync-client/src/sync-client.ts
@@ -34,6 +34,8 @@ export class SyncClient {
     private hasStarted = false;
     private hasBeenDestroyed = false;
     private unloadTelemetry?: () => void;
+    private isDestroying = false;
+    private readonly eventUnsubscribers: (() => void)[] = [];
 
     private constructor(
         private readonly history: SyncHistory,
@@ -53,8 +55,9 @@ export class SyncClient {
                 settings: Partial<SyncSettings>;
                 database: Partial<StoredDatabase>;
             }>
-        >
-    ) {}
+        >,
+    ) {
+    }
 
     public get documentCount(): number {
         return this.database.length;
@@ -159,11 +162,6 @@ export class SyncClient {
             settings.getSettings().isSyncEnabled,
             logger
         );
-        settings.onSettingsChanged.add((newSettings, oldSettings) => {
-            if (oldSettings.isSyncEnabled != newSettings.isSyncEnabled) {
-                fetchController.canFetch = newSettings.isSyncEnabled;
-            }
-        });
 
         const syncService = new SyncService(
             deviceId,
@@ -258,13 +256,23 @@ export class SyncClient {
             this.unloadTelemetry = setUpTelemetry();
         }
 
-        this.logger.onLogEmitted.add((log): void => {
-            if (log.level === LogLevel.ERROR && Sentry.isInitialized()) {
-                Sentry.captureMessage(log.message);
+        this.eventUnsubscribers.push(this.settings.onSettingsChanged.add((newSettings, oldSettings) => {
+            if (oldSettings.isSyncEnabled != newSettings.isSyncEnabled) {
+                this.fetchController.canFetch = newSettings.isSyncEnabled;
             }
-        });
+        }));
 
-        this.settings.onSettingsChanged.add(this.onSettingsChange.bind(this));
+        this.eventUnsubscribers.push(
+            this.logger.onLogEmitted.add((log): void => {
+                if (log.level === LogLevel.ERROR && Sentry.isInitialized()) {
+                    Sentry.captureMessage(log.message);
+                }
+            })
+        );
+
+        this.eventUnsubscribers.push(
+            this.settings.onSettingsChanged.add(this.onSettingsChange.bind(this))
+        );
 
         if (this.settings.getSettings().isSyncEnabled) {
             this.logger.info("Starting SyncClient");
@@ -431,6 +439,13 @@ export class SyncClient {
     public async destroy(): Promise<void> {
         this.checkIfDestroyed("destroy");
 
+        // Prevent concurrent destroy calls
+        if (this.isDestroying) {
+            this.logger.warn("destroy() called while already destroying, ignoring");
+            return;
+        }
+        this.isDestroying = true;
+
         // cancel everything that's in progress
         await this.pause();
 
@@ -438,6 +453,10 @@ export class SyncClient {
 
         this.resetInMemoryState();
 
+        // Clean up event listeners to prevent memory leaks
+        this.eventUnsubscribers.forEach((unsubscribe) => unsubscribe());
+        this.eventUnsubscribers.length = 0;
+
         this.logger.info("SyncClient has been successfully disposed");
 
         this.unloadTelemetry?.();

From 4fb3839b3ead9c782ef10d96d1f62a85f04c7f17 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 14 Dec 2025 11:43:57 +0000
Subject: [PATCH 750/761] Add lock tests

---
 .../src/utils/data-structures/locks.test.ts   | 60 +++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/frontend/sync-client/src/utils/data-structures/locks.test.ts b/frontend/sync-client/src/utils/data-structures/locks.test.ts
index 0c09c062..c1a4fb4b 100644
--- a/frontend/sync-client/src/utils/data-structures/locks.test.ts
+++ b/frontend/sync-client/src/utils/data-structures/locks.test.ts
@@ -5,6 +5,7 @@ import type { RelativePath } from "../../persistence/database";
 import { Locks } from "./locks";
 import { awaitAll } from "../await-all";
 import { sleep } from "../sleep";
+import { SyncResetError } from "../../services/sync-reset-error";
 
 describe("withLock", () => {
     const testPath: RelativePath = "test/document/path";
@@ -230,3 +231,62 @@ describe("withLock", () => {
         ]);
     });
 });
+
+describe("reset", () => {
+    const testPath: RelativePath = "test/document/path";
+    const logger = new Logger();
+
+    // eslint-disable-next-line @typescript-eslint/init-declarations
+    let locks: Locks<RelativePath>;
+
+    beforeEach(() => {
+        locks = new Locks<RelativePath>(logger);
+    });
+
+    it("should reject pending waiters with SyncResetError while running operation completes", async () => {
+        const firstPromise = locks.withLock(testPath, async () => {
+            await sleep(2);
+            return "first";
+        });
+
+        await sleep(1);
+
+        const secondPromise = locks.withLock(testPath, async () => "second");
+        void secondPromise.catch(() => { });
+
+        locks.reset();
+
+        assert.strictEqual(await firstPromise, "first");
+
+        await assert.rejects(secondPromise, (err: Error) => {
+            assert.ok(err instanceof SyncResetError);
+            return true;
+        });
+    });
+
+    it("should allow locks to work normally after reset", async () => {
+        const firstPromise = locks.withLock(testPath, async () => {
+            await sleep(1);
+            return "first";
+        });
+
+        await sleep(1);
+
+        const secondPromise = locks.withLock(testPath, async () => "second");
+        void secondPromise.catch(() => { });
+
+        locks.reset();
+
+        await firstPromise;
+
+        const result = await locks.withLock(testPath, () => "after-reset");
+        assert.strictEqual(result, "after-reset");
+    });
+
+    it("should handle reset with no pending operations", async () => {
+        locks.reset();
+
+        const result = await locks.withLock(testPath, () => "success");
+        assert.strictEqual(result, "success");
+    });
+});

From 42a77a5cd52786552d5571c64f879e8289955157 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 14 Dec 2025 11:47:47 +0000
Subject: [PATCH 751/761] Upload logs instead of printing them

---
 .github/workflows/e2e.yml | 8 ++++++++
 scripts/e2e.sh            | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 196e02f3..19a44428 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -58,6 +58,14 @@ jobs:
 
           exit $EXIT_CODE
 
+      - name: Upload e2e logs
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: e2e-logs
+          path: logs/
+          retention-days: 30
+
       - name: Cleanup
         if: always()
         run: scripts/clean-up.sh
diff --git a/scripts/e2e.sh b/scripts/e2e.sh
index 49f320a0..77a3d19c 100755
--- a/scripts/e2e.sh
+++ b/scripts/e2e.sh
@@ -51,7 +51,7 @@ for i in $(seq 1 $process_count); do
     echo "Started process $i with PID: $pid"
 
     # Read from pipe, prefix with PID
-    (sed "s/^/[PID $pid] /" < "$pipe" | tee "../logs/log_${i}.log"; rm "$pipe") &
+    (sed "s/^/[PID $pid] /" < "$pipe" > "../logs/log_${i}.log"; rm "$pipe") &
 done
 
 cd ..

From 0e0a85df82cd5bb3295c34a46ff0b3656770067a Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 14 Dec 2025 13:53:35 +0000
Subject: [PATCH 752/761] Check node version

---
 .github/workflows/check.yml | 8 +-------
 scripts/build-docs.sh       | 2 ++
 scripts/check.sh            | 7 +++++++
 scripts/e2e.sh              | 6 +-----
 scripts/utils/check-node.sh | 9 +++++++++
 5 files changed, 20 insertions(+), 12 deletions(-)
 create mode 100755 scripts/utils/check-node.sh

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index cf890830..9aa71fb4 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -5,6 +5,7 @@ on:
     branches: ["main"]
   pull_request:
     branches: ["main"]
+  workflow_dispatch:
 
 env:
   CARGO_TERM_COLOR: always
@@ -31,12 +32,5 @@ jobs:
           toolchain: "1.89.0"
           components: clippy, rustfmt
 
-      - name: Setup rust
-        run: |
-          which sqlx || cargo install sqlx-cli
-          cd sync-server
-          sqlx database create --database-url sqlite://db.sqlite3
-          sqlx migrate run --source src/app_state/database/migrations --database-url sqlite://db.sqlite3
-
       - name: Lint & test
         run: scripts/check.sh
diff --git a/scripts/build-docs.sh b/scripts/build-docs.sh
index 9f3c76d4..c87144a9 100755
--- a/scripts/build-docs.sh
+++ b/scripts/build-docs.sh
@@ -2,6 +2,8 @@
 
 set -e
 
+./scripts/utils/check-node.sh
+
 cd docs
 
 npm ci
diff --git a/scripts/check.sh b/scripts/check.sh
index 2a13953a..bac8f3c3 100755
--- a/scripts/check.sh
+++ b/scripts/check.sh
@@ -8,8 +8,15 @@ if [[ "$1" == "--fix" ]]; then
     echo "Running in fix mode - will automatically fix linting and formatting issues"
 fi
 
+./scripts/utils/check-node.sh
+
 echo "Running checks in sync-server"
+
 cd sync-server
+which sqlx || cargo install sqlx-cli
+sqlx database create --database-url sqlite://db.sqlite3
+sqlx migrate run --source src/app_state/database/migrations --database-url sqlite://db.sqlite3
+
 cargo test --verbose
 
 if [[ "$FIX_MODE" == true ]]; then
diff --git a/scripts/e2e.sh b/scripts/e2e.sh
index 77a3d19c..6c66e835 100755
--- a/scripts/e2e.sh
+++ b/scripts/e2e.sh
@@ -6,11 +6,7 @@ set -o pipefail
 NO_COLOR=1
 FORCE_COLOR=0
 
-node_version=$(node -v | sed 's/^v\([0-9]*\).*/\1/')
-if [ "$node_version" != "22" ]; then
-    echo "Error: This script requires Node.js version 22, found: $node_version"
-    exit 1
-fi
+./scripts/utils/check-node.sh
 
 # Check if the argument is provided
 if [ $# -eq 0 ]; then
diff --git a/scripts/utils/check-node.sh b/scripts/utils/check-node.sh
new file mode 100755
index 00000000..c9ede47e
--- /dev/null
+++ b/scripts/utils/check-node.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+set -e
+
+node_version=$(node -v | sed 's/^v\([0-9]*\).*/\1/')
+if [ "$node_version" != "22" ]; then
+    echo "Error: This script requires Node.js version 22, found: $node_version"
+    exit 1
+fi

From 5efe30d9d650b07240cdfb26feb04d085277d8ea Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 14 Dec 2025 13:55:23 +0000
Subject: [PATCH 753/761] Format & lint

---
 .github/workflows/e2e.yml                     |  1 +
 .../src/services/websocket-manager.ts         |  5 +++-
 frontend/sync-client/src/sync-client.ts       | 29 ++++++++++++-------
 .../sync-client/src/sync-operations/syncer.ts |  2 +-
 .../src/utils/data-structures/locks.test.ts   |  4 +--
 .../src/utils/data-structures/locks.ts        |  7 +++--
 scripts/check.sh                              |  6 +---
 7 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 19a44428..7d0a2a0f 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -7,6 +7,7 @@ on:
     branches: ["main"]
   schedule:
     - cron: '0 * * * *'
+  workflow_dispatch:
 
 concurrency:
   group: e2e-tests
diff --git a/frontend/sync-client/src/services/websocket-manager.ts b/frontend/sync-client/src/services/websocket-manager.ts
index 0cc4d15e..09787bce 100644
--- a/frontend/sync-client/src/services/websocket-manager.ts
+++ b/frontend/sync-client/src/services/websocket-manager.ts
@@ -190,7 +190,10 @@ export class WebSocketManager {
         this.webSocket.onopen = (): void => {
             // Check if we've been stopped while connecting
             if (this.isStopped) {
-                this.webSocket?.close(1000, "WebSocketManager was stopped during connection");
+                this.webSocket?.close(
+                    1000,
+                    "WebSocketManager was stopped during connection"
+                );
                 return;
             }
             this.logger.info("WebSocket connection opened");
diff --git a/frontend/sync-client/src/sync-client.ts b/frontend/sync-client/src/sync-client.ts
index 633d20b5..2a272c86 100644
--- a/frontend/sync-client/src/sync-client.ts
+++ b/frontend/sync-client/src/sync-client.ts
@@ -55,9 +55,8 @@ export class SyncClient {
                 settings: Partial<SyncSettings>;
                 database: Partial<StoredDatabase>;
             }>
-        >,
-    ) {
-    }
+        >
+    ) {}
 
     public get documentCount(): number {
         return this.database.length;
@@ -256,11 +255,13 @@ export class SyncClient {
             this.unloadTelemetry = setUpTelemetry();
         }
 
-        this.eventUnsubscribers.push(this.settings.onSettingsChanged.add((newSettings, oldSettings) => {
-            if (oldSettings.isSyncEnabled != newSettings.isSyncEnabled) {
-                this.fetchController.canFetch = newSettings.isSyncEnabled;
-            }
-        }));
+        this.eventUnsubscribers.push(
+            this.settings.onSettingsChanged.add((newSettings, oldSettings) => {
+                if (oldSettings.isSyncEnabled != newSettings.isSyncEnabled) {
+                    this.fetchController.canFetch = newSettings.isSyncEnabled;
+                }
+            })
+        );
 
         this.eventUnsubscribers.push(
             this.logger.onLogEmitted.add((log): void => {
@@ -271,7 +272,9 @@ export class SyncClient {
         );
 
         this.eventUnsubscribers.push(
-            this.settings.onSettingsChanged.add(this.onSettingsChange.bind(this))
+            this.settings.onSettingsChanged.add(
+                this.onSettingsChange.bind(this)
+            )
         );
 
         if (this.settings.getSettings().isSyncEnabled) {
@@ -441,7 +444,9 @@ export class SyncClient {
 
         // Prevent concurrent destroy calls
         if (this.isDestroying) {
-            this.logger.warn("destroy() called while already destroying, ignoring");
+            this.logger.warn(
+                "destroy() called while already destroying, ignoring"
+            );
             return;
         }
         this.isDestroying = true;
@@ -454,7 +459,9 @@ export class SyncClient {
         this.resetInMemoryState();
 
         // Clean up event listeners to prevent memory leaks
-        this.eventUnsubscribers.forEach((unsubscribe) => unsubscribe());
+        this.eventUnsubscribers.forEach((unsubscribe) => {
+            unsubscribe();
+        });
         this.eventUnsubscribers.length = 0;
 
         this.logger.info("SyncClient has been successfully disposed");
diff --git a/frontend/sync-client/src/sync-operations/syncer.ts b/frontend/sync-client/src/sync-operations/syncer.ts
index 709b9f62..71dedd85 100644
--- a/frontend/sync-client/src/sync-operations/syncer.ts
+++ b/frontend/sync-client/src/sync-operations/syncer.ts
@@ -171,7 +171,7 @@ export class Syncer {
             // in that case, we mustn't move it again.
             if (
                 this.database.getLatestDocumentByRelativePath(relativePath) ===
-                undefined ||
+                    undefined ||
                 this.database.getLatestDocumentByRelativePath(relativePath)
                     ?.isDeleted === true
             ) {
diff --git a/frontend/sync-client/src/utils/data-structures/locks.test.ts b/frontend/sync-client/src/utils/data-structures/locks.test.ts
index c1a4fb4b..9beb867a 100644
--- a/frontend/sync-client/src/utils/data-structures/locks.test.ts
+++ b/frontend/sync-client/src/utils/data-structures/locks.test.ts
@@ -252,7 +252,7 @@ describe("reset", () => {
         await sleep(1);
 
         const secondPromise = locks.withLock(testPath, async () => "second");
-        void secondPromise.catch(() => { });
+        void secondPromise.catch(() => {}); // eslint-disable-line @typescript-eslint/no-empty-function
 
         locks.reset();
 
@@ -273,7 +273,7 @@ describe("reset", () => {
         await sleep(1);
 
         const secondPromise = locks.withLock(testPath, async () => "second");
-        void secondPromise.catch(() => { });
+        void secondPromise.catch(() => {}); // eslint-disable-line @typescript-eslint/no-empty-function
 
         locks.reset();
 
diff --git a/frontend/sync-client/src/utils/data-structures/locks.ts b/frontend/sync-client/src/utils/data-structures/locks.ts
index 3f676667..e55c76b0 100644
--- a/frontend/sync-client/src/utils/data-structures/locks.ts
+++ b/frontend/sync-client/src/utils/data-structures/locks.ts
@@ -13,9 +13,12 @@ export class Locks<T> {
     private readonly locked = new Set<T>();
 
     /** Queue of resolve functions waiting for each key */
-    private readonly waiters = new Map<T, ([() => unknown, (err: unknown) => unknown])[]>();
+    private readonly waiters = new Map<
+        T,
+        [() => unknown, (err: unknown) => unknown][]
+    >();
 
-    public constructor(private readonly logger?: Logger) { }
+    public constructor(private readonly logger?: Logger) {}
 
     /**
     * Executes a function while holding exclusive locks on one or more keys.
diff --git a/scripts/check.sh b/scripts/check.sh
index bac8f3c3..7c3c87e5 100755
--- a/scripts/check.sh
+++ b/scripts/check.sh
@@ -58,8 +58,4 @@ fi
 
 cd ..
 
-if [[ "$FIX_MODE" == true ]]; then
-    $0
-else
-    echo "Success"
-fi
+echo "Success"

From 9a75569e834ceac8ffecb1421e907f1f05f39b4e Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 14 Dec 2025 23:31:40 +0000
Subject: [PATCH 754/761] Bump versions to 0.14.0

---
 frontend/local-client-cli/package.json |  2 +-
 frontend/obsidian-plugin/manifest.json |  2 +-
 frontend/obsidian-plugin/package.json  |  2 +-
 frontend/package-lock.json             | 63 +++++++++-----------------
 frontend/sync-client/package.json      |  2 +-
 frontend/test-client/package.json      |  2 +-
 manifest.json                          |  2 +-
 sync-server/Cargo.lock                 |  2 +-
 sync-server/Cargo.toml                 |  2 +-
 9 files changed, 30 insertions(+), 49 deletions(-)

diff --git a/frontend/local-client-cli/package.json b/frontend/local-client-cli/package.json
index 6cfa180c..cade4990 100644
--- a/frontend/local-client-cli/package.json
+++ b/frontend/local-client-cli/package.json
@@ -1,6 +1,6 @@
 {
     "name": "local-client-cli",
-    "version": "0.13.1",
+    "version": "0.14.0",
     "description": "Standalone CLI for VaultLink sync client",
     "private": false,
     "bin": {
diff --git a/frontend/obsidian-plugin/manifest.json b/frontend/obsidian-plugin/manifest.json
index 355c2ddc..6f72fab0 100644
--- a/frontend/obsidian-plugin/manifest.json
+++ b/frontend/obsidian-plugin/manifest.json
@@ -1,7 +1,7 @@
 {
     "id": "vault-link",
     "name": "VaultLink",
-    "version": "0.13.1",
+    "version": "0.14.0",
     "minAppVersion": "0.0.0",
     "description": "Self-hosted synchronization and collaboration for your Vault.",
     "author": "Andras Schmelczer",
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index 219fca41..b7ae4909 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -1,6 +1,6 @@
 {
     "name": "vault-link-obsidian-plugin",
-    "version": "0.13.1",
+    "version": "0.14.0",
     "description": "This is a sample plugin for Obsidian (https://obsidian.md)",
     "main": "main.js",
     "scripts": {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 3e944c5c..4d8218ba 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -22,7 +22,7 @@
             }
         },
         "local-client-cli": {
-            "version": "0.13.1",
+            "version": "0.14.0",
             "dependencies": {
                 "commander": "^14.0.2",
                 "watcher": "^2.3.1"
@@ -759,8 +759,7 @@
             "resolved": "https://registry.npmjs.org/@marijn/find-cluster-break/-/find-cluster-break-1.0.2.tgz",
             "integrity": "sha512-l0h88YhZFyKdXIFNfSWpyjStDjGHwZ/U7iobcK1cQQD8sejsONdQtTVU+1wVN1PBw40PiiHB1vA5S7VTfQiP9g==",
             "dev": true,
-            "license": "MIT",
-            "peer": true
+            "license": "MIT"
         },
         "node_modules/@nodelib/fs.scandir": {
             "version": "2.1.5",
@@ -1014,6 +1013,7 @@
             "integrity": "sha512-8fz6oa6wEKZrhXWro/S3n2eRJqlRcIa6SlDh59FXJ5Wp5XRZ8B9ixpJDcjadHq47hMx0u+HW6SNa6LjJQ6NLtw==",
             "dev": true,
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "@eslint-community/regexpp": "^4.10.0",
                 "@typescript-eslint/scope-manager": "8.41.0",
@@ -1052,6 +1052,7 @@
             "integrity": "sha512-gTtSdWX9xiMPA/7MV9STjJOOYtWwIJIYxkQxnSV1U3xcE+mnJSH3f6zI0RYP+ew66WSlZ5ed+h0VCxsvdC1jJg==",
             "dev": true,
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "@typescript-eslint/scope-manager": "8.41.0",
                 "@typescript-eslint/types": "8.41.0",
@@ -1452,6 +1453,7 @@
             "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
             "dev": true,
             "license": "MIT",
+            "peer": true,
             "bin": {
                 "acorn": "bin/acorn"
             },
@@ -1483,6 +1485,7 @@
             "version": "6.12.6",
             "dev": true,
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "fast-deep-equal": "^3.1.1",
                 "fast-json-stable-stringify": "^2.0.0",
@@ -1818,6 +1821,7 @@
                 }
             ],
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "caniuse-lite": "^1.0.30001688",
                 "electron-to-chromium": "^1.5.73",
@@ -1909,20 +1913,6 @@
                 "node": ">=6.9.5"
             }
         },
-        "node_modules/bufferutil": {
-            "version": "4.0.9",
-            "dev": true,
-            "hasInstallScript": true,
-            "license": "MIT",
-            "optional": true,
-            "peer": true,
-            "dependencies": {
-                "node-gyp-build": "^4.3.0"
-            },
-            "engines": {
-                "node": ">=6.14.2"
-            }
-        },
         "node_modules/byte-base64": {
             "version": "1.1.0",
             "dev": true,
@@ -2296,8 +2286,7 @@
             "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.6.tgz",
             "integrity": "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==",
             "dev": true,
-            "license": "MIT",
-            "peer": true
+            "license": "MIT"
         },
         "node_modules/cross-spawn": {
             "version": "7.0.6",
@@ -3021,6 +3010,7 @@
             "integrity": "sha512-t5aPOpmtJcZcz5UJyY2GbvpDlsK5E8JqRqoKtfiKE3cNh437KIqfJr3A3AKf5k64NPx6d0G3dno6XDY05PqPtw==",
             "dev": true,
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "@eslint-community/eslint-utils": "^4.8.0",
                 "@eslint-community/regexpp": "^4.12.1",
@@ -4899,6 +4889,7 @@
             "version": "8.17.1",
             "dev": true,
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "fast-deep-equal": "^3.1.3",
                 "fast-uri": "^3.0.1",
@@ -5052,7 +5043,6 @@
             "dev": true,
             "license": "MIT",
             "optional": true,
-            "peer": true,
             "bin": {
                 "node-gyp-build": "bin.js",
                 "node-gyp-build-optional": "optional.js",
@@ -5541,6 +5531,7 @@
                 }
             ],
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "nanoid": "^3.3.8",
                 "picocolors": "^1.1.1",
@@ -6053,6 +6044,7 @@
             "integrity": "sha512-aFOZHGf+ur+bp1bCHZ+u8otKGh77ZtmFyXDo4tlYvT7PWql41Kwd8wdkPqhhT+h2879IVblcHFglIMofsFd1EA==",
             "dev": true,
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "chokidar": "^4.0.0",
                 "immutable": "^5.0.2",
@@ -6430,8 +6422,7 @@
             "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.1.3.tgz",
             "integrity": "sha512-i/n8VsZydrugj3Iuzll8+x/00GH2vnYsk1eomD8QiRrSAeW6ItbCQDtfXCeJHd0iwiNagqjQkvpvREEPtW3IoQ==",
             "dev": true,
-            "license": "MIT",
-            "peer": true
+            "license": "MIT"
         },
         "node_modules/supports-color": {
             "version": "8.1.1",
@@ -6614,6 +6605,7 @@
             "version": "8.17.1",
             "dev": true,
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "fast-deep-equal": "^3.1.3",
                 "fast-uri": "^3.0.1",
@@ -6869,6 +6861,7 @@
             "version": "5.8.3",
             "dev": true,
             "license": "Apache-2.0",
+            "peer": true,
             "bin": {
                 "tsc": "bin/tsc",
                 "tsserver": "bin/tsserver"
@@ -6991,20 +6984,6 @@
             "dev": true,
             "license": "MIT"
         },
-        "node_modules/utf-8-validate": {
-            "version": "6.0.5",
-            "dev": true,
-            "hasInstallScript": true,
-            "license": "MIT",
-            "optional": true,
-            "peer": true,
-            "dependencies": {
-                "node-gyp-build": "^4.3.0"
-            },
-            "engines": {
-                "node": ">=6.14.2"
-            }
-        },
         "node_modules/util-deprecate": {
             "version": "1.0.2",
             "dev": true,
@@ -7109,8 +7088,7 @@
             "resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.8.tgz",
             "integrity": "sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==",
             "dev": true,
-            "license": "MIT",
-            "peer": true
+            "license": "MIT"
         },
         "node_modules/watcher": {
             "version": "2.3.1",
@@ -7138,6 +7116,7 @@
             "version": "5.99.9",
             "dev": true,
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "@types/eslint-scope": "^3.7.7",
                 "@types/estree": "^1.0.6",
@@ -7184,6 +7163,7 @@
             "version": "6.0.1",
             "dev": true,
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "@discoveryjs/json-ext": "^0.6.1",
                 "@webpack-cli/configtest": "^3.0.1",
@@ -7259,6 +7239,7 @@
             "version": "8.17.1",
             "dev": true,
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "fast-deep-equal": "^3.1.3",
                 "fast-uri": "^3.0.1",
@@ -7483,7 +7464,7 @@
         },
         "obsidian-plugin": {
             "name": "vault-link-obsidian-plugin",
-            "version": "0.13.1",
+            "version": "0.14.0",
             "license": "MIT",
             "devDependencies": {
                 "@types/node": "^24.8.1",
@@ -7509,7 +7490,7 @@
             }
         },
         "sync-client": {
-            "version": "0.13.1",
+            "version": "0.14.0",
             "devDependencies": {
                 "@sentry/browser": "^10.8.0",
                 "@types/node": "^24.8.1",
@@ -7553,7 +7534,7 @@
             }
         },
         "test-client": {
-            "version": "0.13.1",
+            "version": "0.14.0",
             "bin": {
                 "test-client": "dist/cli.js"
             },
diff --git a/frontend/sync-client/package.json b/frontend/sync-client/package.json
index 1ae9b8f0..aa369fa7 100644
--- a/frontend/sync-client/package.json
+++ b/frontend/sync-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "sync-client",
-    "version": "0.13.1",
+    "version": "0.14.0",
     "main": "dist/sync-client.node.js",
     "browser": "dist/sync-client.web.js",
     "types": "dist/types/index.d.ts",
diff --git a/frontend/test-client/package.json b/frontend/test-client/package.json
index ca4c1479..3d0d0c1a 100644
--- a/frontend/test-client/package.json
+++ b/frontend/test-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "test-client",
-    "version": "0.13.1",
+    "version": "0.14.0",
     "private": true,
     "bin": {
         "test-client": "./dist/cli.js"
diff --git a/manifest.json b/manifest.json
index 355c2ddc..6f72fab0 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
     "id": "vault-link",
     "name": "VaultLink",
-    "version": "0.13.1",
+    "version": "0.14.0",
     "minAppVersion": "0.0.0",
     "description": "Self-hosted synchronization and collaboration for your Vault.",
     "author": "Andras Schmelczer",
diff --git a/sync-server/Cargo.lock b/sync-server/Cargo.lock
index 906b232b..b3da1486 100644
--- a/sync-server/Cargo.lock
+++ b/sync-server/Cargo.lock
@@ -2123,7 +2123,7 @@ dependencies = [
 
 [[package]]
 name = "sync_server"
-version = "0.13.1"
+version = "0.14.0"
 dependencies = [
  "anyhow",
  "axum",
diff --git a/sync-server/Cargo.toml b/sync-server/Cargo.toml
index c60a65a2..fac06efa 100644
--- a/sync-server/Cargo.toml
+++ b/sync-server/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/schmelczer/vault-link"
-version = "0.13.1"
+version = "0.14.0"
 
 [dependencies]
 serde = { version = "1.0.219", default-features = false, features = ["derive"] }

From 4482e0155f73e3b53f93ccc3377f8402b6142c17 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Fri, 8 May 2026 21:53:33 +0100
Subject: [PATCH 755/761] Migrate to forgejo & reformat (#189)

- Migrate to forgejo
- Bump Rust & Node
- Reformat project
- Small script cleanup

Reviewed-on: https://home.schmelczer.dev/git/git/andras/vault-link/pulls/189
Co-authored-by: Andras Schmelczer <andras@schmelczer.dev>
Co-committed-by: Andras Schmelczer <andras@schmelczer.dev>
---
 .forgejo/workflows/check.yml                 |   35 +
 .forgejo/workflows/deploy-docs.yml           |   38 +
 .forgejo/workflows/e2e.yml                   |   71 +
 .forgejo/workflows/publish-cli-docker.yml    |   51 +
 .forgejo/workflows/publish-plugin.yml        |   71 +
 .forgejo/workflows/publish-server-docker.yml |   51 +
 .github/workflows/check.yml                  |    4 +-
 .github/workflows/deploy-docs.yml            |   13 +-
 .github/workflows/e2e.yml                    |    6 +-
 .github/workflows/publish-plugin.yml         |    4 +-
 .gitignore                                   |    9 +-
 .vscode/settings.json                        |    4 +-
 CLAUDE.md                                    |  195 +-
 README.md                                    |    8 +-
 docs/.cspell.json                            |    7 +-
 docs/architecture/data-flow.md               |   58 +-
 docs/architecture/index.md                   |    2 +-
 docs/config/authentication.md                |    6 +-
 docs/guide/server-setup.md                   |    2 +-
 docs/package-lock.json                       | 5960 +++++++++---------
 package-lock.json                            |    6 +
 rustfmt.toml                                 |   11 +
 scripts/bump-version.sh                      |    3 +-
 scripts/check.sh                             |   14 +-
 scripts/clean-up.sh                          |    2 +-
 scripts/e2e.sh                               |   72 +-
 scripts/update-api-types.sh                  |   10 +-
 scripts/utils/check-node.sh                  |    6 +-
 scripts/utils/wait-for-server.sh             |    4 +-
 29 files changed, 3571 insertions(+), 3152 deletions(-)
 create mode 100644 .forgejo/workflows/check.yml
 create mode 100644 .forgejo/workflows/deploy-docs.yml
 create mode 100644 .forgejo/workflows/e2e.yml
 create mode 100644 .forgejo/workflows/publish-cli-docker.yml
 create mode 100644 .forgejo/workflows/publish-plugin.yml
 create mode 100644 .forgejo/workflows/publish-server-docker.yml
 create mode 100644 package-lock.json
 create mode 100644 rustfmt.toml

diff --git a/.forgejo/workflows/check.yml b/.forgejo/workflows/check.yml
new file mode 100644
index 00000000..40e01dea
--- /dev/null
+++ b/.forgejo/workflows/check.yml
@@ -0,0 +1,35 @@
+name: Check
+
+on:
+  push:
+    branches: ["main"]
+  pull_request:
+    branches: ["main"]
+  workflow_dispatch:
+
+env:
+  CARGO_TERM_COLOR: always
+  RUSTFLAGS: "-Dwarnings"
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Setup Node.js environment
+        uses: actions/setup-node@v4
+        with:
+          node-version: "25.x"
+
+      - name: Setup Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          toolchain: "1.92.0"
+          components: clippy, rustfmt
+
+      - name: Lint & test
+        run: scripts/check.sh
diff --git a/.forgejo/workflows/deploy-docs.yml b/.forgejo/workflows/deploy-docs.yml
new file mode 100644
index 00000000..c49d0379
--- /dev/null
+++ b/.forgejo/workflows/deploy-docs.yml
@@ -0,0 +1,38 @@
+name: Deploy Documentation
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - "docs/**"
+      - ".forgejo/workflows/deploy-docs.yml"
+  workflow_dispatch:
+
+concurrency:
+  group: pages
+  cancel-in-progress: false
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Setup Node.js environment
+        uses: actions/setup-node@v4
+        with:
+          node-version: "25.x"
+
+      - name: Build docs
+        run: scripts/build-docs.sh
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: docs
+          path: docs/.vitepress/dist
diff --git a/.forgejo/workflows/e2e.yml b/.forgejo/workflows/e2e.yml
new file mode 100644
index 00000000..eb8d1e54
--- /dev/null
+++ b/.forgejo/workflows/e2e.yml
@@ -0,0 +1,71 @@
+name: E2E tests
+
+on:
+  push:
+    branches: ["main"]
+  pull_request:
+    branches: ["main"]
+  schedule:
+    - cron: "0 * * * *"
+  workflow_dispatch:
+
+concurrency:
+  group: e2e-tests
+  cancel-in-progress: false
+
+env:
+  RUSTFLAGS: "-Dwarnings"
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Setup Node.js environment
+        uses: actions/setup-node@v4
+        with:
+          node-version: "25.x"
+
+      - name: Setup Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          toolchain: "1.92.0"
+          components: clippy, rustfmt
+
+      - name: Setup rust
+        run: |
+          which sqlx || cargo install sqlx-cli
+          cd sync-server
+          sqlx database create --database-url sqlite://db.sqlite3
+          sqlx migrate run --source src/app_state/database/migrations --database-url sqlite://db.sqlite3
+
+      - name: E2E tests
+        run: |
+          cd sync-server
+          cargo run config-e2e.yml --color never &
+          SERVER_PID=$!
+          cd ..
+
+          scripts/e2e.sh 8
+          EXIT_CODE=$?
+
+          kill $SERVER_PID 2>/dev/null || true
+          wait $SERVER_PID 2>/dev/null || true
+
+          exit $EXIT_CODE
+
+      - name: Upload e2e logs
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: e2e-logs
+          path: logs/
+          retention-days: 30
+
+      - name: Cleanup
+        if: always()
+        run: scripts/clean-up.sh
diff --git a/.forgejo/workflows/publish-cli-docker.yml b/.forgejo/workflows/publish-cli-docker.yml
new file mode 100644
index 00000000..265283ab
--- /dev/null
+++ b/.forgejo/workflows/publish-cli-docker.yml
@@ -0,0 +1,51 @@
+name: Publish CLI
+
+on:
+  push:
+    branches: ["main"]
+    tags: ["*"]
+  pull_request:
+    branches: ["main"]
+
+jobs:
+  publish-docker:
+    runs-on: ubuntu-docker
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Extract registry hostname
+        id: registry
+        run: echo "host=$(echo '${{ github.server_url }}' | sed 's|https\?://||')" >> "$GITHUB_OUTPUT"
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log into container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ steps.registry.outputs.host }}
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract Docker metadata
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ steps.registry.outputs.host }}/${{ github.repository }}-cli
+
+      - name: Build and push Docker image
+        id: build-and-push
+        uses: docker/build-push-action@v5
+        with:
+          context: frontend
+          file: frontend/local-client-cli/Dockerfile
+          platforms: linux/amd64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=registry,ref=${{ steps.registry.outputs.host }}/${{ github.repository }}-cli:buildcache
+          cache-to: type=registry,ref=${{ steps.registry.outputs.host }}/${{ github.repository }}-cli:buildcache,mode=max
diff --git a/.forgejo/workflows/publish-plugin.yml b/.forgejo/workflows/publish-plugin.yml
new file mode 100644
index 00000000..25a652aa
--- /dev/null
+++ b/.forgejo/workflows/publish-plugin.yml
@@ -0,0 +1,71 @@
+name: Publish Obsidian plugin
+
+on:
+  push:
+    tags: ["*"]
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  publish-plugin:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Setup Node.js environment
+        uses: actions/setup-node@v4
+        with:
+          node-version: "25.x"
+
+      - name: Build plugin
+        run: |
+          cd frontend
+          npm ci
+          npm run build
+
+      - name: Setup Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          toolchain: "1.92.0"
+          components: clippy, rustfmt
+
+      - name: Install cross-compilation tools
+        run: |
+          apt update
+          apt install -y gcc-aarch64-linux-gnu musl-tools gcc-mingw-w64-x86-64 jq
+
+      - name: Build Linux and Windows binaries
+        run: ./scripts/build-sync-server-binaries.sh
+
+      - name: Create release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SERVER_URL: ${{ github.server_url }}
+          REPO: ${{ github.repository }}
+        run: |
+          tag="${GITHUB_REF#refs/tags/}"
+
+          mkdir -p release
+          cp frontend/obsidian-plugin/dist/* release/
+          cp sync-server/artifacts/sync-server-* release/
+
+          # Create draft release via Forgejo API
+          RELEASE_ID=$(curl -s -X POST \
+            "${SERVER_URL}/api/v1/repos/${REPO}/releases" \
+            -H "Authorization: token ${GITHUB_TOKEN}" \
+            -H "Content-Type: application/json" \
+            -d "{\"tag_name\": \"${tag}\", \"name\": \"${tag}\", \"draft\": true}" \
+            | jq -r '.id')
+
+          # Upload release assets
+          for file in release/*; do
+            filename=$(basename "$file")
+            curl -s -X POST \
+              "${SERVER_URL}/api/v1/repos/${REPO}/releases/${RELEASE_ID}/assets?name=${filename}" \
+              -H "Authorization: token ${GITHUB_TOKEN}" \
+              -F "attachment=@${file}"
+          done
diff --git a/.forgejo/workflows/publish-server-docker.yml b/.forgejo/workflows/publish-server-docker.yml
new file mode 100644
index 00000000..23852e56
--- /dev/null
+++ b/.forgejo/workflows/publish-server-docker.yml
@@ -0,0 +1,51 @@
+name: Publish server Docker image
+
+on:
+  push:
+    branches: ["main"]
+    tags: ["*"]
+  pull_request:
+    branches: ["main"]
+
+jobs:
+  publish-docker:
+    runs-on: ubuntu-docker
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Extract registry hostname
+        id: registry
+        run: echo "host=$(echo '${{ github.server_url }}' | sed 's|https\?://||')" >> "$GITHUB_OUTPUT"
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log into container registry
+        if: github.ref_type == 'tag'
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ steps.registry.outputs.host }}
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract Docker metadata
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ steps.registry.outputs.host }}/${{ github.repository }}
+
+      - name: Build and push Docker image
+        id: build-and-push
+        uses: docker/build-push-action@v5
+        with:
+          context: sync-server
+          platforms: linux/amd64,linux/arm64
+          push: ${{ github.ref_type == 'tag' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=registry,ref=${{ steps.registry.outputs.host }}/${{ github.repository }}:buildcache
+          cache-to: type=registry,ref=${{ steps.registry.outputs.host }}/${{ github.repository }}:buildcache,mode=max
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 9aa71fb4..fc1b1c99 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -23,13 +23,13 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v4.2.0
         with:
-          node-version: "22.x"
+          node-version: "25.x"
           check-latest: true
 
       - name: Setup Rust toolchain
         uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: "1.89.0"
+          toolchain: "1.92.0"
           components: clippy, rustfmt
 
       - name: Lint & test
diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml
index b6d369cc..bb25e463 100644
--- a/.github/workflows/deploy-docs.yml
+++ b/.github/workflows/deploy-docs.yml
@@ -5,8 +5,8 @@ on:
     branches:
       - main
     paths:
-      - 'docs/**'
-      - '.github/workflows/deploy-docs.yml'
+      - "docs/**"
+      - ".github/workflows/deploy-docs.yml"
   workflow_dispatch:
 
 permissions:
@@ -28,12 +28,11 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Setup Node
-        uses: actions/setup-node@v4
+      - name: Setup Node.js environment
+        uses: actions/setup-node@v4.2.0
         with:
-          node-version: 22
-          cache: npm
-          cache-dependency-path: docs/package-lock.json
+          node-version: "25.x"
+          check-latest: true
 
       - name: Setup Pages
         uses: actions/configure-pages@v4
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 7d0a2a0f..98dbfc1f 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -6,7 +6,7 @@ on:
   pull_request:
     branches: ["main"]
   schedule:
-    - cron: '0 * * * *'
+    - cron: "0 * * * *"
   workflow_dispatch:
 
 concurrency:
@@ -28,13 +28,13 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v4.2.0
         with:
-          node-version: "22.x"
+          node-version: "25.x"
           check-latest: true
 
       - name: Setup Rust toolchain
         uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: "1.89.0"
+          toolchain: "1.92.0"
           components: clippy, rustfmt
 
       - name: Setup rust
diff --git a/.github/workflows/publish-plugin.yml b/.github/workflows/publish-plugin.yml
index 92dd199b..452bc601 100644
--- a/.github/workflows/publish-plugin.yml
+++ b/.github/workflows/publish-plugin.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v4.2.0
         with:
-          node-version: "22.x"
+          node-version: "25.x"
           check-latest: true
 
       - name: Build plugin
@@ -31,7 +31,7 @@ jobs:
       - name: Setup Rust toolchain
         uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: "1.89.0"
+          toolchain: "1.92.0"
           components: clippy, rustfmt
 
       - name: Install cross-compilation tools
diff --git a/.gitignore b/.gitignore
index a1c1ac4f..967b2b65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,15 +7,18 @@ node_modules
 # Frontend build folders
 frontend/*/dist
 
-sync-server/db.sqlite3*
-sync-server/databases
-
 # Rust build folders
 sync-server/target
 sync-server/artifacts
 sync-server/bindings/*.ts
 
+# build folders
+sync-server/db.sqlite3*
+**/databases
+
 *.log
 *.sqlx
 
 target
+
+.task
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 88d395f5..98187650 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -5,6 +5,6 @@
         "**/dist": true,
         "**/node_modules": true,
         "**/.sqlx": true,
-        "**/target": true,
-    },
+        "**/target": true
+    }
 }
diff --git a/CLAUDE.md b/CLAUDE.md
index c77b091b..39161e39 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -2,109 +2,154 @@
 
 This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
 
-## Project Overview
+## Project shape
 
-VaultLink is a self-hosted Obsidian plugin for real-time collaborative file syncing. The project consists of a Rust-based sync server and a TypeScript frontend with three main components: an Obsidian plugin, a sync client library, and a test client.
+VaultLink is a self-hosted Obsidian file-sync system. Two halves of one repo:
 
-## Architecture
+- `sync-server/` — Rust (axum + sqlx/SQLite). Source of truth for vault state, broadcasts changes via WebSocket.
+- `frontend/` — npm workspaces. The sync engine (`sync-client`) is consumed by an Obsidian plugin, a standalone CLI, a fuzz E2E harness, a scripted determinism harness, and a history UI.
 
-### Core Components
+The HTTP/WS API types are generated from Rust (`ts-rs`) and mirrored into the TS workspaces. **Never hand-edit files in `frontend/sync-client/src/services/types/` or `frontend/history-ui/src/lib/types/`** — run `scripts/update-api-types.sh` after changing anything Serde-derived in the server.
 
-- **sync-server/**: Rust-based WebSocket server with SQLite database for document versioning and real-time synchronization
-- **frontend/sync-client/**: TypeScript library providing core sync functionality, WebSocket management, and file operations
-- **frontend/obsidian-plugin/**: Obsidian plugin that integrates the sync client with Obsidian's API
-- **frontend/test-client/**: CLI testing tool for the sync functionality
+### Frontend workspaces
 
-### Key Technologies
+- `sync-client` — the sync engine; published to consumers via `dist/`. All other TS workspaces depend on it via `file:../sync-client`.
+- `obsidian-plugin` — Obsidian plugin built from `sync-client`.
+- `local-client-cli` — same engine wrapped as a standalone CLI.
+- `history-ui` — vault-history web UI.
+- `test-client` — fuzz E2E harness (random ops across N processes).
+- `deterministic-tests` — scripted multi-client tests with an in-memory FS, run against a real server.
 
-- **Backend**: Rust with Axum framework, SQLite with SQLx, WebSockets for real-time sync
-- **Frontend**: TypeScript, Webpack for bundling, Jest for testing
-- **Sync Algorithm**: Uses reconcile-text library for operational transformation
+## Common commands
 
-## Development Commands
+Pre-push hygiene (formats, lints, runs tests, requires clean git state):
 
-### Server Development
-```bash
-cd sync-server
-cargo run config-e2e.yml  # Start development server
-cargo test --verbose      # Run Rust tests
-cargo clippy --all-targets --all-features  # Lint Rust code
-cargo clippy --all-targets --all-features --fix --allow-dirty --allow-staged  # Auto-fix clippy warnings
-cargo fmt --all -- --check  # Check Rust formatting
-cargo fmt --all            # Auto-format Rust code
-cargo machete --with-metadata  # Detect unused dependencies
+```sh
+scripts/check.sh --fix
 ```
 
-### Frontend Development
-```bash
+Run the fuzz E2E (N parallel processes):
+
+```sh
+scripts/e2e.sh 12
+# Logs land in logs/log_<i>.log. Clean with scripts/clean-up.sh
+```
+
+Run deterministic tests (require a release-built server in `sync-server/target/release/sync_server` — they spawn it themselves):
+
+```sh
+cd sync-server && cargo build --release && cd ..
 cd frontend
-npm run dev      # Start development mode (watches sync-client and obsidian-plugin)
-npm run build    # Build all workspaces
-npm run test     # Run all tests
-npm run lint     # Lint and format TypeScript code
+npm run build -w sync-client -w deterministic-tests
+node deterministic-tests/dist/cli.js                       # all
+node deterministic-tests/dist/cli.js --filter=rename       # subset
+node deterministic-tests/dist/cli.js --filter=… -j 4       # cap parallelism
 ```
 
-### Database Setup (Development)
-```bash
+Run a single sync-client unit test by file:
+
+```sh
+cd frontend/sync-client && npx tsx --test 'src/**/sync-event-queue.test.ts'
+```
+
+Server: dev runs from `sync-server/` against `config-e2e.yml`:
+
+```sh
+cd sync-server
+cargo run config-e2e.yml          # dev
+cargo build --release             # used by both e2e harnesses
+cargo test                        # unit + ts-rs binding export tests
+```
+
+Frontend dev (sync-client + obsidian-plugin watch in parallel):
+
+```sh
+cd frontend && npm install && npm run dev
+```
+
+Regenerate TS bindings from Rust types (touches `frontend/{sync-client,history-ui}/src/.../types/`):
+
+```sh
+scripts/update-api-types.sh
+```
+
+## SQLite / sqlx
+
+The server uses `sqlx::query!` macros that need a prepared `.sqlx` cache to compile offline. Touching any SQL means regenerating it:
+
+```sh
 cd sync-server
 sqlx database create --database-url sqlite://db.sqlite3
 sqlx migrate run --source src/app_state/database/migrations --database-url sqlite://db.sqlite3
 cargo sqlx prepare --workspace
 ```
 
-### Initial Setup
-```bash
-# Install required cargo tools
-cargo install sqlx-cli cargo-machete cargo-edit
+New migrations: `sqlx migrate add --source src/app_state/database/migrations <name>`.
+
+## Sync engine architecture
+
+Read `frontend/sync-client/src/sync-operations/` to follow the sync engine; the rest of `sync-client` is plumbing (filesystem ops, persistence, services, telemetry).
+
+The engine is **two independent loops with separate invariants**:
+
+- **Wire loop** (`syncer.ts`) — drains the single-consumer FIFO queue. HTTP and WS handlers update record fields (`remoteRelativePath`, `parentVersionId`, `remoteHash`) and write content to the file at `record.localPath`. They never move files for path placement.
+- **Path reconciler** (`reconciler.ts`) — runs after every drained event. Best-effort pass that moves files to make `localPath === remoteRelativePath`. The move graph is topologically sorted; cycles are resolved by reading every file in the cycle into memory and writing each back to its new slot (no tmp files). Records with pending local events are skipped on each pass — the reconciler operates only on settled records. Failures (slot occupied by an untracked file, etc.) are silent skips; the next pass retries.
+
+**`SyncEventQueue`** (`sync-event-queue.ts`) holds:
+
+- `byDocId: Map<DocumentId, DocumentRecord>` — primary record store.
+- `byLocalPath: Map<RelativePath, DocumentRecord>` — derived index for path lookups, maintained at every mutation point.
+- `events: SyncEvent[]` — pending wire ops in FIFO drain order.
+
+```ts
+DocumentRecord = {
+    documentId,
+    parentVersionId,
+    remoteHash?,
+    remoteRelativePath,
+    localPath: RelativePath | undefined
+}
 ```
 
-### Scripts
-- `scripts/check.sh`: Full CI check (builds, lints, tests both server and frontend)
-- `scripts/check.sh --fix`: Same as above but auto-fixes linting and formatting issues
-- `scripts/e2e.sh`: End-to-end testing
-- `scripts/clean-up.sh`: Clean logs and database files
-- `scripts/bump-version.sh patch`: Publish new version
-- `scripts/update-api-types.sh`: Update TypeScript bindings from Rust types
+`localPath === undefined` means the doc has no local file yet — typically a remote create whose target slot was occupied at receive time; the reconciler will fetch and place when the slot frees (the bytes wait in `pendingPlacementContent`).
 
-## Code Structure
+Local FS events from the watcher update `localPath` synchronously at enqueue time via `setLocalPath` / `upsertRecord`. The wire loop never updates it for path placement; only the reconciler does. A user rename onto a tracked slot enqueues a `LocalDelete` for the displaced doc (the OS rename clobbered its content) and clears that doc's `localPath`.
 
-### Workspace Configuration
-The frontend uses npm workspaces with four packages:
-- `sync-client`: Core synchronization logic
-- `obsidian-plugin`: Obsidian-specific integration
-- `test-client`: Testing utilities
-- `local-client-cli`: Standalone CLI for VaultLink sync client
+**Pending creates** use a `Promise<DocumentId>` chain to serialize dependent ops (`LocalUpdate`, `LocalDelete`) behind the still-in-flight `LocalCreate`. `resolveCreate` resolves the promise once the server returns a docId, and `replacePendingDocumentId` swaps the resolved id across already-queued events. `findLatestCreateForPath` is the lookup the watcher uses to attach dependents; `updatePendingCreatePath` rewrites a pending create's `event.path` in place when the user renames the file before its create has acked.
 
-### Type Generation
-Rust structs generate TypeScript types via ts-rs crate, stored in `sync-server/bindings/` and used by frontend packages.
+**Watermark.** `lastSeenUpdateId` uses a `MinCovered` (a contiguous-prefix tracker over a stream of integers): we only advance the published min when the next consecutive id has been processed, so out-of-order RemoteChange ids don't fool the WebSocket handshake into requesting a too-recent catch-up.
 
-### Key Files
-- `sync-server/src/`: Rust server implementation with WebSocket handlers
-- `frontend/sync-client/src/sync-client.ts`: Main sync client entry point
-- `frontend/obsidian-plugin/src/vault-link-plugin.ts`: Main Obsidian plugin class
-- `frontend/sync-client/src/services/sync-service.ts`: Core synchronization logic
+**Server catch-up.** The server's WS handshake replays events newer than the client's `last_seen_vault_update_id` from the `latest_document_versions` view (one row per doc, the latest). On those replayed rows `is_new_file` means _new to this client_ (`creation_vault_update_id > last_seen_vault_update_id`), not "this row is the doc's first version" — necessary because the catch-up only carries the latest version; if a doc was created and updated past the watermark, the client never sees its create otherwise.
 
-## Testing
+## Edge-case patterns the sync engine has to survive
 
-### Running Tests
-- Server: `cargo test --verbose`
-- Frontend: `npm run test` (runs Jest across all workspaces)
-- E2E: `scripts/e2e.sh`
+The two-loop split defuses most of the old race catalogue (slot-collision stashes, conflict-uuid divergence, `MoveOnConflict.NEW`/`EXISTING` policy choices) by separating wire transport from path placement. What's left:
 
-### Test Structure
-- Rust: Unit tests alongside source files
-- TypeScript: `.test.ts` files using Jest
-- E2E: Uses test-client to simulate multiple concurrent users
+**Pending-create docId is a `Promise`, not a string, until the create acks.** Any `LocalUpdate` / `LocalDelete` queued behind a still-in-flight `LocalCreate` carries the create's `resolvers.promise` as its `documentId`. `replacePendingDocumentId` swaps the resolved id across queued events when the create resolves; `===` comparisons against the resolved string elsewhere will silently fail until that swap runs. Anything that walks `events[]` looking for a docId match must either run after the swap or be tolerant of `Promise`-typed ids.
 
-## Code Style
+**`processCreate` reads `event.path` live, not `event.originalPath`.** The watcher rewrites `event.path` in place via `updatePendingCreatePath` when the user renames a pending-create file. `originalPath` was removed from `LocalCreate` events specifically because reading it would send the stale pre-rename path to the server.
 
-### Rust
-- Uses extensive Clippy lints (see Cargo.toml)
-- Follows pedantic linting rules
-- Forbids unsafe code
-- Uses cargo fmt with default settings
+**`record.localPath` mutates in place across awaits.** When the watcher renames a doc while a drain handler is awaiting an HTTP roundtrip, the queue mutates the in-flight event's record so subsequent reads see the new path. Snapshotting `record.localPath` into a local at function entry and using it after an `await` reads/writes a now-vacated slot. Read `record.localPath` live; only snapshot for the deliberate "did it change while I was awaiting" comparison.
 
-### TypeScript
-- Prettier configuration: 4-space tabs, trailing commas removed, LF line endings
-- ESLint with unused imports plugin
-- Consistent across all three frontend packages
+**Reconciler-defer is the wire-loop's contract with the reconciler.** The reconciler skips records where `hasPendingLocalEventsForDocumentId` returns true. Wire-loop handlers can therefore freely write `remoteRelativePath` to whatever the server returned — even if it disagrees with `localPath` — knowing the reconciler won't move the file out from under a queued user rename.
+
+**Watermark advancement is load-bearing both ways.** Branches that _skip_ a remote event without advancing `lastSeenUpdateId` create permanent gaps that re-deliver forever. Branches that _advance_ without applying the content lose data: the server has no further event to re-deliver, the catch-up only carries the latest version, and any state in between is gone. Don't advance unless the event was actually applied (or deliberately discarded after weighing both halves).
+
+**`isNewFile` semantics differ between catch-up and real-time.** On WS handshake replay it means _new to this client_ (`creation_vault_update_id > last_seen_vault_update_id`); on real-time broadcasts it means _this version is the create_ (`creation_vault_update_id == vault_update_id`). A handler that decides based on one interpretation will be wrong on the other channel; reasoning about fetch-and-treat-as-new vs. ignore needs to know which channel delivered the event.
+
+**Pause / disable-sync mid-flight** is the one race the new model doesn't structurally fix. An HTTP that committed server-side but whose response was discarded leaves the server holding a doc the client has no record of. Resume → offline scan → server-side dedupe handles it (the server merges the duplicate create into the existing doc), but if the merge produces a deconflict, the client picks up an extra file. Out of scope for the two-loop split.
+
+**Cycle reconciliation uses in-memory content swap.** When the move graph contains a cycle, the reconciler reads every file in the cycle into memory and writes each back to its new slot, with no tmp files. A write-ahead marker at `.vaultlink/swap-<uuid>.json` lists each leg; on startup the reconciler reads the marker, hashes each `from` to determine which legs ran, and replays the rest. The `.vaultlink/**` glob is hard-coded as an internal ignore pattern so swap markers don't get sync'd.
+
+## Two complementary E2E harnesses
+
+- **`test-client` (fuzz):** random ops across N parallel processes for many minutes. Used by `scripts/e2e.sh`. Catches bugs nobody thought to write a test for, but reproductions are noisy.
+- **`deterministic-tests`:** scripted scenarios with an in-memory FS pinned to a real server. Used to _capture_ a fuzz-discovered bug as a minimal repro before fixing it. See `frontend/deterministic-tests/README.md` for the step grammar (`pause-server`, `pause-websocket`, `barrier`, `assert-consistent`, etc.).
+
+When a fuzz failure surfaces, the workflow is: root-cause from logs → write a deterministic test that fails on the bug → fix → confirm both the deterministic test and `e2e.sh` pass.
+
+## Style
+
+- TS: 4-space indent, no tabs, LF, prettier (`trailingComma: "none"`). YAML/MD use 2-space indent.
+- Rust: `rustfmt.toml` enforces 4-space spaces, LF.
+- Lint: ESLint for TS, Clippy for Rust, `cargo machete` for unused deps. All wired into `scripts/check.sh`.
diff --git a/README.md b/README.md
index f5da9b61..74c6ee97 100644
--- a/README.md
+++ b/README.md
@@ -8,12 +8,12 @@
 
 ## Develop
 
-### Install [nvm](https://github.com/nvm-sh/nvm)
+### Set up Node.JS 25 with [nvm](https://github.com/nvm-sh/nvm)
 
 - `curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | bash`
-- `nvm install 22`
-- `nvm use 22`
-- Optionally set the system-wide default: `nvm alias default 22`
+- `nvm install 25`
+- `nvm use 25`
+- Optionally, set the system-wide default: `nvm alias default 25`
 
 ### Set up Rust
 
diff --git a/docs/.cspell.json b/docs/.cspell.json
index 4967ec16..1177e1e1 100644
--- a/docs/.cspell.json
+++ b/docs/.cspell.json
@@ -2,12 +2,7 @@
     "version": "0.2",
     "language": "en-GB",
     "dictionaries": ["en-gb"],
-    "ignorePaths": [
-        "node_modules",
-        ".vitepress/dist",
-        ".vitepress/cache",
-        "package-lock.json"
-    ],
+    "ignorePaths": ["node_modules", ".vitepress/dist", ".vitepress/cache", "package-lock.json"],
     "words": [
         "VaultLink",
         "Obsidian",
diff --git a/docs/architecture/data-flow.md b/docs/architecture/data-flow.md
index 832c5624..167be524 100644
--- a/docs/architecture/data-flow.md
+++ b/docs/architecture/data-flow.md
@@ -361,11 +361,11 @@ VALUES (?, ?, ?);
 
 ```json
 {
-  "type": "upload_file",
-  "path": "notes/example.md",
-  "content": "File content here...",
-  "base_version": 10,
-  "timestamp": "2024-01-01T12:00:00Z"
+    "type": "upload_file",
+    "path": "notes/example.md",
+    "content": "File content here...",
+    "base_version": 10,
+    "timestamp": "2024-01-01T12:00:00Z"
 }
 ```
 
@@ -373,8 +373,8 @@ VALUES (?, ?, ?);
 
 ```json
 {
-  "type": "download_file",
-  "path": "notes/example.md"
+    "type": "download_file",
+    "path": "notes/example.md"
 }
 ```
 
@@ -382,8 +382,8 @@ VALUES (?, ?, ?);
 
 ```json
 {
-  "type": "delete_file",
-  "path": "notes/old.md"
+    "type": "delete_file",
+    "path": "notes/old.md"
 }
 ```
 
@@ -391,8 +391,8 @@ VALUES (?, ?, ?);
 
 ```json
 {
-  "type": "list_files",
-  "since_version": 0
+    "type": "list_files",
+    "since_version": 0
 }
 ```
 
@@ -402,11 +402,11 @@ VALUES (?, ?, ?);
 
 ```json
 {
-  "type": "file_updated",
-  "path": "notes/example.md",
-  "version": 11,
-  "size": 1024,
-  "hash": "abc123..."
+    "type": "file_updated",
+    "path": "notes/example.md",
+    "version": 11,
+    "size": 1024,
+    "hash": "abc123..."
 }
 ```
 
@@ -414,10 +414,10 @@ VALUES (?, ?, ?);
 
 ```json
 {
-  "type": "file_content",
-  "path": "notes/example.md",
-  "content": "Updated content...",
-  "version": 11
+    "type": "file_content",
+    "path": "notes/example.md",
+    "content": "Updated content...",
+    "version": 11
 }
 ```
 
@@ -425,9 +425,9 @@ VALUES (?, ?, ?);
 
 ```json
 {
-  "type": "file_deleted",
-  "path": "notes/old.md",
-  "version": 12
+    "type": "file_deleted",
+    "path": "notes/old.md",
+    "version": 12
 }
 ```
 
@@ -435,9 +435,9 @@ VALUES (?, ?, ?);
 
 ```json
 {
-  "type": "sync_complete",
-  "total_files": 150,
-  "current_version": 200
+    "type": "sync_complete",
+    "total_files": 150,
+    "current_version": 200
 }
 ```
 
@@ -445,9 +445,9 @@ VALUES (?, ?, ?);
 
 ```json
 {
-  "type": "error",
-  "message": "File too large",
-  "code": "FILE_TOO_LARGE"
+    "type": "error",
+    "message": "File too large",
+    "code": "FILE_TOO_LARGE"
 }
 ```
 
diff --git a/docs/architecture/index.md b/docs/architecture/index.md
index f5eca5e3..bebb6c49 100644
--- a/docs/architecture/index.md
+++ b/docs/architecture/index.md
@@ -53,7 +53,7 @@ Central authority for synchronisation. Rust + Axum framework.
 
 **Technology**:
 
-- **Language**: Rust 1.89+
+- **Language**: Rust 1.92+
 - **Framework**: Axum (async web framework)
 - **Database**: SQLite with SQLx
 - **Protocol**: WebSockets for real-time communication
diff --git a/docs/config/authentication.md b/docs/config/authentication.md
index 11425b5b..74977be7 100644
--- a/docs/config/authentication.md
+++ b/docs/config/authentication.md
@@ -243,9 +243,9 @@ users:
 2. Client sends authentication message:
     ```json
     {
-      "type": "auth",
-      "token": "user-token",
-      "vault": "vault-name"
+        "type": "auth",
+        "token": "user-token",
+        "vault": "vault-name"
     }
     ```
 3. Server validates:
diff --git a/docs/guide/server-setup.md b/docs/guide/server-setup.md
index 7754da54..1848db26 100644
--- a/docs/guide/server-setup.md
+++ b/docs/guide/server-setup.md
@@ -75,7 +75,7 @@ chmod +x sync_server-linux-x86_64
 
 ### Build from Source
 
-Requirements: Rust 1.89.0+, SQLite development headers, SQLx CLI
+Requirements: Rust 1.92.0+, SQLite development headers, SQLx CLI
 
 ```bash
 # Clone the repository
diff --git a/docs/package-lock.json b/docs/package-lock.json
index dcd4f3b0..d078bbe6 100644
--- a/docs/package-lock.json
+++ b/docs/package-lock.json
@@ -1,2989 +1,2989 @@
 {
-  "name": "docs",
-  "version": "1.0.0",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "": {
     "name": "docs",
     "version": "1.0.0",
-    "license": "ISC",
-    "devDependencies": {
-        "@cspell/dict-en-gb": "^5.0.19",
-        "cspell": "^9.3.2",
-        "prettier": "^3.6.2",
-        "vitepress": "^1.6.4",
-        "vue": "^3.5.24"
-    }
-    },
-    "node_modules/@algolia/abtesting": {
-    "version": "1.10.0",
-    "resolved": "https://registry.npmjs.org/@algolia/abtesting/-/abtesting-1.10.0.tgz",
-    "integrity": "sha512-mQT3jwuTgX8QMoqbIR7mPlWkqQqBPQaPabQzm37xg2txMlaMogK/4hCiiESGdg39MlHZOVHeV+0VJuE7f5UK8A==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@algolia/client-common": "5.44.0",
-        "@algolia/requester-browser-xhr": "5.44.0",
-        "@algolia/requester-fetch": "5.44.0",
-        "@algolia/requester-node-http": "5.44.0"
-    },
-    "engines": {
-        "node": ">= 14.0.0"
-    }
-    },
-    "node_modules/@algolia/autocomplete-core": {
-    "version": "1.17.7",
-    "resolved": "https://registry.npmjs.org/@algolia/autocomplete-core/-/autocomplete-core-1.17.7.tgz",
-    "integrity": "sha512-BjiPOW6ks90UKl7TwMv7oNQMnzU+t/wk9mgIDi6b1tXpUek7MW0lbNOUHpvam9pe3lVCf4xPFT+lK7s+e+fs7Q==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@algolia/autocomplete-plugin-algolia-insights": "1.17.7",
-        "@algolia/autocomplete-shared": "1.17.7"
-    }
-    },
-    "node_modules/@algolia/autocomplete-plugin-algolia-insights": {
-    "version": "1.17.7",
-    "resolved": "https://registry.npmjs.org/@algolia/autocomplete-plugin-algolia-insights/-/autocomplete-plugin-algolia-insights-1.17.7.tgz",
-    "integrity": "sha512-Jca5Ude6yUOuyzjnz57og7Et3aXjbwCSDf/8onLHSQgw1qW3ALl9mrMWaXb5FmPVkV3EtkD2F/+NkT6VHyPu9A==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@algolia/autocomplete-shared": "1.17.7"
-    },
-    "peerDependencies": {
-        "search-insights": ">= 1 < 3"
-    }
-    },
-    "node_modules/@algolia/autocomplete-preset-algolia": {
-    "version": "1.17.7",
-    "resolved": "https://registry.npmjs.org/@algolia/autocomplete-preset-algolia/-/autocomplete-preset-algolia-1.17.7.tgz",
-    "integrity": "sha512-ggOQ950+nwbWROq2MOCIL71RE0DdQZsceqrg32UqnhDz8FlO9rL8ONHNsI2R1MH0tkgVIDKI/D0sMiUchsFdWA==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@algolia/autocomplete-shared": "1.17.7"
-    },
-    "peerDependencies": {
-        "@algolia/client-search": ">= 4.9.1 < 6",
-        "algoliasearch": ">= 4.9.1 < 6"
-    }
-    },
-    "node_modules/@algolia/autocomplete-shared": {
-    "version": "1.17.7",
-    "resolved": "https://registry.npmjs.org/@algolia/autocomplete-shared/-/autocomplete-shared-1.17.7.tgz",
-    "integrity": "sha512-o/1Vurr42U/qskRSuhBH+VKxMvkkUVTLU6WZQr+L5lGZZLYWyhdzWjW0iGXY7EkwRTjBqvN2EsR81yCTGV/kmg==",
-    "dev": true,
-    "license": "MIT",
-    "peerDependencies": {
-        "@algolia/client-search": ">= 4.9.1 < 6",
-        "algoliasearch": ">= 4.9.1 < 6"
-    }
-    },
-    "node_modules/@algolia/client-abtesting": {
-    "version": "5.44.0",
-    "resolved": "https://registry.npmjs.org/@algolia/client-abtesting/-/client-abtesting-5.44.0.tgz",
-    "integrity": "sha512-KY5CcrWhRTUo/lV7KcyjrZkPOOF9bjgWpMj9z98VA+sXzVpZtkuskBLCKsWYFp2sbwchZFTd3wJM48H0IGgF7g==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@algolia/client-common": "5.44.0",
-        "@algolia/requester-browser-xhr": "5.44.0",
-        "@algolia/requester-fetch": "5.44.0",
-        "@algolia/requester-node-http": "5.44.0"
-    },
-    "engines": {
-        "node": ">= 14.0.0"
-    }
-    },
-    "node_modules/@algolia/client-analytics": {
-    "version": "5.44.0",
-    "resolved": "https://registry.npmjs.org/@algolia/client-analytics/-/client-analytics-5.44.0.tgz",
-    "integrity": "sha512-LKOCE8S4ewI9bN3ot9RZoYASPi8b78E918/DVPW3HHjCMUe6i+NjbNG6KotU4RpP6AhRWZjjswbOkWelUO+OoA==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@algolia/client-common": "5.44.0",
-        "@algolia/requester-browser-xhr": "5.44.0",
-        "@algolia/requester-fetch": "5.44.0",
-        "@algolia/requester-node-http": "5.44.0"
-    },
-    "engines": {
-        "node": ">= 14.0.0"
-    }
-    },
-    "node_modules/@algolia/client-common": {
-    "version": "5.44.0",
-    "resolved": "https://registry.npmjs.org/@algolia/client-common/-/client-common-5.44.0.tgz",
-    "integrity": "sha512-1yyJm4OYC2cztbS28XYVWwLXdwpLsMG4LoZLOltVglQ2+hc/i9q9fUDZyjRa2Bqt4DmkIfezagfMrokhyH4uxQ==",
-    "dev": true,
-    "license": "MIT",
-    "engines": {
-        "node": ">= 14.0.0"
-    }
-    },
-    "node_modules/@algolia/client-insights": {
-    "version": "5.44.0",
-    "resolved": "https://registry.npmjs.org/@algolia/client-insights/-/client-insights-5.44.0.tgz",
-    "integrity": "sha512-wVQWK6jYYsbEOjIMI+e5voLGPUIbXrvDj392IckXaCPvQ6vCMTXakQqOYCd+znQdL76S+3wHDo77HZWiAYKrtA==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@algolia/client-common": "5.44.0",
-        "@algolia/requester-browser-xhr": "5.44.0",
-        "@algolia/requester-fetch": "5.44.0",
-        "@algolia/requester-node-http": "5.44.0"
-    },
-    "engines": {
-        "node": ">= 14.0.0"
-    }
-    },
-    "node_modules/@algolia/client-personalization": {
-    "version": "5.44.0",
-    "resolved": "https://registry.npmjs.org/@algolia/client-personalization/-/client-personalization-5.44.0.tgz",
-    "integrity": "sha512-lkgRjOjOkqmIkebHjHpU9rLJcJNUDMm+eVSW/KJQYLjGqykEZxal+nYJJTBbLceEU2roByP/+27ZmgIwCdf0iA==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@algolia/client-common": "5.44.0",
-        "@algolia/requester-browser-xhr": "5.44.0",
-        "@algolia/requester-fetch": "5.44.0",
-        "@algolia/requester-node-http": "5.44.0"
-    },
-    "engines": {
-        "node": ">= 14.0.0"
-    }
-    },
-    "node_modules/@algolia/client-query-suggestions": {
-    "version": "5.44.0",
-    "resolved": "https://registry.npmjs.org/@algolia/client-query-suggestions/-/client-query-suggestions-5.44.0.tgz",
-    "integrity": "sha512-sYfhgwKu6NDVmZHL1WEKVLsOx/jUXCY4BHKLUOcYa8k4COCs6USGgz6IjFkUf+niwq8NCECMmTC4o/fVQOalsA==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@algolia/client-common": "5.44.0",
-        "@algolia/requester-browser-xhr": "5.44.0",
-        "@algolia/requester-fetch": "5.44.0",
-        "@algolia/requester-node-http": "5.44.0"
-    },
-    "engines": {
-        "node": ">= 14.0.0"
-    }
-    },
-    "node_modules/@algolia/client-search": {
-    "version": "5.44.0",
-    "resolved": "https://registry.npmjs.org/@algolia/client-search/-/client-search-5.44.0.tgz",
-    "integrity": "sha512-/FRKUM1G4xn3vV8+9xH1WJ9XknU8rkBGlefruq9jDhYUAvYozKimhrmC2pRqw/RyHhPivmgZCRuC8jHP8piz4Q==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@algolia/client-common": "5.44.0",
-        "@algolia/requester-browser-xhr": "5.44.0",
-        "@algolia/requester-fetch": "5.44.0",
-        "@algolia/requester-node-http": "5.44.0"
-    },
-    "engines": {
-        "node": ">= 14.0.0"
-    }
-    },
-    "node_modules/@algolia/ingestion": {
-    "version": "1.44.0",
-    "resolved": "https://registry.npmjs.org/@algolia/ingestion/-/ingestion-1.44.0.tgz",
-    "integrity": "sha512-5+S5ynwMmpTpCLXGjTDpeIa81J+R4BLH0lAojOhmeGSeGEHQTqacl/4sbPyDTcidvnWhaqtyf8m42ue6lvISAw==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@algolia/client-common": "5.44.0",
-        "@algolia/requester-browser-xhr": "5.44.0",
-        "@algolia/requester-fetch": "5.44.0",
-        "@algolia/requester-node-http": "5.44.0"
-    },
-    "engines": {
-        "node": ">= 14.0.0"
-    }
-    },
-    "node_modules/@algolia/monitoring": {
-    "version": "1.44.0",
-    "resolved": "https://registry.npmjs.org/@algolia/monitoring/-/monitoring-1.44.0.tgz",
-    "integrity": "sha512-xhaTN8pXJjR6zkrecg4Cc9YZaQK2LKm2R+LkbAq+AYGBCWJxtSGlNwftozZzkUyq4AXWoyoc0x2SyBtq5LRtqQ==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@algolia/client-common": "5.44.0",
-        "@algolia/requester-browser-xhr": "5.44.0",
-        "@algolia/requester-fetch": "5.44.0",
-        "@algolia/requester-node-http": "5.44.0"
-    },
-    "engines": {
-        "node": ">= 14.0.0"
-    }
-    },
-    "node_modules/@algolia/recommend": {
-    "version": "5.44.0",
-    "resolved": "https://registry.npmjs.org/@algolia/recommend/-/recommend-5.44.0.tgz",
-    "integrity": "sha512-GNcite/uOIS7wgRU1MT7SdNIupGSW+vbK9igIzMePvD2Dl8dy0O3urKPKIbTuZQqiVH1Cb84y5cgLvwNrdCj/Q==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@algolia/client-common": "5.44.0",
-        "@algolia/requester-browser-xhr": "5.44.0",
-        "@algolia/requester-fetch": "5.44.0",
-        "@algolia/requester-node-http": "5.44.0"
-    },
-    "engines": {
-        "node": ">= 14.0.0"
-    }
-    },
-    "node_modules/@algolia/requester-browser-xhr": {
-    "version": "5.44.0",
-    "resolved": "https://registry.npmjs.org/@algolia/requester-browser-xhr/-/requester-browser-xhr-5.44.0.tgz",
-    "integrity": "sha512-YZHBk72Cd7pcuNHzbhNzF/FbbYszlc7JhZlDyQAchnX5S7tcemSS96F39Sy8t4O4WQLpFvUf1MTNedlitWdOsQ==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@algolia/client-common": "5.44.0"
-    },
-    "engines": {
-        "node": ">= 14.0.0"
-    }
-    },
-    "node_modules/@algolia/requester-fetch": {
-    "version": "5.44.0",
-    "resolved": "https://registry.npmjs.org/@algolia/requester-fetch/-/requester-fetch-5.44.0.tgz",
-    "integrity": "sha512-B9WHl+wQ7uf46t9cq+vVM/ypVbOeuldVDq9OtKsX2ApL2g/htx6ImB9ugDOOJmB5+fE31/XPTuCcYz/j03+idA==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@algolia/client-common": "5.44.0"
-    },
-    "engines": {
-        "node": ">= 14.0.0"
-    }
-    },
-    "node_modules/@algolia/requester-node-http": {
-    "version": "5.44.0",
-    "resolved": "https://registry.npmjs.org/@algolia/requester-node-http/-/requester-node-http-5.44.0.tgz",
-    "integrity": "sha512-MULm0qeAIk4cdzZ/ehJnl1o7uB5NMokg83/3MKhPq0Pk7+I0uELGNbzIfAkvkKKEYcHALemKdArtySF9eKzh/A==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@algolia/client-common": "5.44.0"
-    },
-    "engines": {
-        "node": ">= 14.0.0"
-    }
-    },
-    "node_modules/@babel/helper-string-parser": {
-    "version": "7.27.1",
-    "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz",
-    "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==",
-    "dev": true,
-    "license": "MIT",
-    "engines": {
-        "node": ">=6.9.0"
-    }
-    },
-    "node_modules/@babel/helper-validator-identifier": {
-    "version": "7.28.5",
-    "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz",
-    "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==",
-    "dev": true,
-    "license": "MIT",
-    "engines": {
-        "node": ">=6.9.0"
-    }
-    },
-    "node_modules/@babel/parser": {
-    "version": "7.28.5",
-    "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.5.tgz",
-    "integrity": "sha512-KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@babel/types": "^7.28.5"
-    },
-    "bin": {
-        "parser": "bin/babel-parser.js"
-    },
-    "engines": {
-        "node": ">=6.0.0"
-    }
-    },
-    "node_modules/@babel/types": {
-    "version": "7.28.5",
-    "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.5.tgz",
-    "integrity": "sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@babel/helper-string-parser": "^7.27.1",
-        "@babel/helper-validator-identifier": "^7.28.5"
-    },
-    "engines": {
-        "node": ">=6.9.0"
-    }
-    },
-    "node_modules/@cspell/cspell-bundled-dicts": {
-    "version": "9.3.2",
-    "resolved": "https://registry.npmjs.org/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-9.3.2.tgz",
-    "integrity": "sha512-OmKzq/0FATHU671GKMzBrTyLdm25Wnziva7h4ylumVn1wnwWsXGef5bgXD7iuApqfqH9SzxsU0NtTB8m8vwEHQ==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@cspell/dict-ada": "^4.1.1",
-        "@cspell/dict-al": "^1.1.1",
-        "@cspell/dict-aws": "^4.0.16",
-        "@cspell/dict-bash": "^4.2.2",
-        "@cspell/dict-companies": "^3.2.7",
-        "@cspell/dict-cpp": "^6.0.14",
-        "@cspell/dict-cryptocurrencies": "^5.0.5",
-        "@cspell/dict-csharp": "^4.0.7",
-        "@cspell/dict-css": "^4.0.18",
-        "@cspell/dict-dart": "^2.3.1",
-        "@cspell/dict-data-science": "^2.0.11",
-        "@cspell/dict-django": "^4.1.5",
-        "@cspell/dict-docker": "^1.1.16",
-        "@cspell/dict-dotnet": "^5.0.10",
-        "@cspell/dict-elixir": "^4.0.8",
-        "@cspell/dict-en_us": "^4.4.24",
-        "@cspell/dict-en-common-misspellings": "^2.1.8",
-        "@cspell/dict-en-gb-mit": "^3.1.14",
-        "@cspell/dict-filetypes": "^3.0.14",
-        "@cspell/dict-flutter": "^1.1.1",
-        "@cspell/dict-fonts": "^4.0.5",
-        "@cspell/dict-fsharp": "^1.1.1",
-        "@cspell/dict-fullstack": "^3.2.7",
-        "@cspell/dict-gaming-terms": "^1.1.2",
-        "@cspell/dict-git": "^3.0.7",
-        "@cspell/dict-golang": "^6.0.24",
-        "@cspell/dict-google": "^1.0.9",
-        "@cspell/dict-haskell": "^4.0.6",
-        "@cspell/dict-html": "^4.0.12",
-        "@cspell/dict-html-symbol-entities": "^4.0.4",
-        "@cspell/dict-java": "^5.0.12",
-        "@cspell/dict-julia": "^1.1.1",
-        "@cspell/dict-k8s": "^1.0.12",
-        "@cspell/dict-kotlin": "^1.1.1",
-        "@cspell/dict-latex": "^4.0.4",
-        "@cspell/dict-lorem-ipsum": "^4.0.5",
-        "@cspell/dict-lua": "^4.0.8",
-        "@cspell/dict-makefile": "^1.0.5",
-        "@cspell/dict-markdown": "^2.0.12",
-        "@cspell/dict-monkeyc": "^1.0.11",
-        "@cspell/dict-node": "^5.0.8",
-        "@cspell/dict-npm": "^5.2.22",
-        "@cspell/dict-php": "^4.1.0",
-        "@cspell/dict-powershell": "^5.0.15",
-        "@cspell/dict-public-licenses": "^2.0.15",
-        "@cspell/dict-python": "^4.2.21",
-        "@cspell/dict-r": "^2.1.1",
-        "@cspell/dict-ruby": "^5.0.9",
-        "@cspell/dict-rust": "^4.0.12",
-        "@cspell/dict-scala": "^5.0.8",
-        "@cspell/dict-shell": "^1.1.2",
-        "@cspell/dict-software-terms": "^5.1.13",
-        "@cspell/dict-sql": "^2.2.1",
-        "@cspell/dict-svelte": "^1.0.7",
-        "@cspell/dict-swift": "^2.0.6",
-        "@cspell/dict-terraform": "^1.1.3",
-        "@cspell/dict-typescript": "^3.2.3",
-        "@cspell/dict-vue": "^3.0.5",
-        "@cspell/dict-zig": "^1.0.0"
-    },
-    "engines": {
-        "node": ">=20"
-    }
-    },
-    "node_modules/@cspell/cspell-json-reporter": {
-    "version": "9.3.2",
-    "resolved": "https://registry.npmjs.org/@cspell/cspell-json-reporter/-/cspell-json-reporter-9.3.2.tgz",
-    "integrity": "sha512-YRgpeHN9uY8kUlIw9q+8zJ0tRTAJMbfBTGzCq9Puah09NeMWlRMFPUkXVrkdic6NA7etboZ+zEdoZwRO9EmhiA==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@cspell/cspell-types": "9.3.2"
-    },
-    "engines": {
-        "node": ">=20"
-    }
-    },
-    "node_modules/@cspell/cspell-pipe": {
-    "version": "9.3.2",
-    "resolved": "https://registry.npmjs.org/@cspell/cspell-pipe/-/cspell-pipe-9.3.2.tgz",
-    "integrity": "sha512-REF7ibG79WLEynIMUss/IRDCdYEb1nlE1rj/gt2CbPFzLa6t5MRwW2lajEvXS6/WgbMtsTVHAWi3ALqJzCwxng==",
-    "dev": true,
-    "license": "MIT",
-    "engines": {
-        "node": ">=20"
-    }
-    },
-    "node_modules/@cspell/cspell-resolver": {
-    "version": "9.3.2",
-    "resolved": "https://registry.npmjs.org/@cspell/cspell-resolver/-/cspell-resolver-9.3.2.tgz",
-    "integrity": "sha512-jLN2Aa/vxm8+IBvTd884SwPEfjxnDwIEPBT3hmqgLlKuUHQ3FMG27lsM4Ik9L2KWBXMgV/wGz4BaxfhKI41Ttw==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "global-directory": "^4.0.1"
-    },
-    "engines": {
-        "node": ">=20"
-    }
-    },
-    "node_modules/@cspell/cspell-service-bus": {
-    "version": "9.3.2",
-    "resolved": "https://registry.npmjs.org/@cspell/cspell-service-bus/-/cspell-service-bus-9.3.2.tgz",
-    "integrity": "sha512-/rB8LazM0JzKL+AvZa5fEpLutmwy5QFMpzw8HJd+rDGkzb5r79hURWSRo84QArgaskUqA9XlOHSieDE9pt+WAA==",
-    "dev": true,
-    "license": "MIT",
-    "engines": {
-        "node": ">=20"
-    }
-    },
-    "node_modules/@cspell/cspell-types": {
-    "version": "9.3.2",
-    "resolved": "https://registry.npmjs.org/@cspell/cspell-types/-/cspell-types-9.3.2.tgz",
-    "integrity": "sha512-l4H8bMAmdzCbXHO8y1JZiAKszrPEiuLFKWrbhCacHF0iP+PIc/yuQp7cO70m0p70vArRfih6kgGyHFaCy47CfA==",
-    "dev": true,
-    "license": "MIT",
-    "engines": {
-        "node": ">=20"
-    }
-    },
-    "node_modules/@cspell/dict-ada": {
-    "version": "4.1.1",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-ada/-/dict-ada-4.1.1.tgz",
-    "integrity": "sha512-E+0YW9RhZod/9Qy2gxfNZiHJjCYFlCdI69br1eviQQWB8yOTJX0JHXLs79kOYhSW0kINPVUdvddEBe6Lu6CjGQ==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@cspell/dict-al": {
-    "version": "1.1.1",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-al/-/dict-al-1.1.1.tgz",
-    "integrity": "sha512-sD8GCaZetgQL4+MaJLXqbzWcRjfKVp8x+px3HuCaaiATAAtvjwUQ5/Iubiqwfd1boIh2Y1/3EgM3TLQ7Q8e0wQ==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@cspell/dict-aws": {
-    "version": "4.0.16",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-aws/-/dict-aws-4.0.16.tgz",
-    "integrity": "sha512-a681zShZbtTo947NvTYGLer95ZDQw1ROKvIFydak1e0OlfFCsNdtcYTupn0nbbYs53c9AO7G2DU8AcNEAnwXPA==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@cspell/dict-bash": {
-    "version": "4.2.2",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-bash/-/dict-bash-4.2.2.tgz",
-    "integrity": "sha512-kyWbwtX3TsCf5l49gGQIZkRLaB/P8g73GDRm41Zu8Mv51kjl2H7Au0TsEvHv7jzcsRLS6aUYaZv6Zsvk1fOz+Q==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@cspell/dict-shell": "1.1.2"
-    }
-    },
-    "node_modules/@cspell/dict-companies": {
-    "version": "3.2.7",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-companies/-/dict-companies-3.2.7.tgz",
-    "integrity": "sha512-fEyr3LmpFKTaD0LcRhB4lfW1AmULYBqzg4gWAV0dQCv06l+TsA+JQ+3pZJbUcoaZirtgsgT3dL3RUjmGPhUH0A==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@cspell/dict-cpp": {
-    "version": "6.0.14",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-cpp/-/dict-cpp-6.0.14.tgz",
-    "integrity": "sha512-dkmpSwvVfVdtoZ4mW/CK2Ep1v8mJlp6uiKpMNbSMOdJl4kq28nQS4vKNIX3B2bJa0Ha5iHHu+1mNjiLeO3g7Xg==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@cspell/dict-cryptocurrencies": {
-    "version": "5.0.5",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-cryptocurrencies/-/dict-cryptocurrencies-5.0.5.tgz",
-    "integrity": "sha512-R68hYYF/rtlE6T/dsObStzN5QZw+0aQBinAXuWCVqwdS7YZo0X33vGMfChkHaiCo3Z2+bkegqHlqxZF4TD3rUA==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@cspell/dict-csharp": {
-    "version": "4.0.7",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-csharp/-/dict-csharp-4.0.7.tgz",
-    "integrity": "sha512-H16Hpu8O/1/lgijFt2lOk4/nnldFtQ4t8QHbyqphqZZVE5aS4J/zD/WvduqnLY21aKhZS6jo/xF5PX9jyqPKUA==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@cspell/dict-css": {
-    "version": "4.0.18",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-css/-/dict-css-4.0.18.tgz",
-    "integrity": "sha512-EF77RqROHL+4LhMGW5NTeKqfUd/e4OOv6EDFQ/UQQiFyWuqkEKyEz0NDILxOFxWUEVdjT2GQ2cC7t12B6pESwg==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@cspell/dict-dart": {
-    "version": "2.3.1",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-dart/-/dict-dart-2.3.1.tgz",
-    "integrity": "sha512-xoiGnULEcWdodXI6EwVyqpZmpOoh8RA2Xk9BNdR7DLamV/QMvEYn8KJ7NlRiTSauJKPNkHHQ5EVHRM6sTS7jdg==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@cspell/dict-data-science": {
-    "version": "2.0.12",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-data-science/-/dict-data-science-2.0.12.tgz",
-    "integrity": "sha512-vI/mg6cI28IkFcpeINS7cm5M9HWemmXSTnxJiu3nmc4VAGx35SXIEyuLGBcsVzySvDablFYf4hsEpmg1XpVsUQ==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@cspell/dict-django": {
-    "version": "4.1.5",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-django/-/dict-django-4.1.5.tgz",
-    "integrity": "sha512-AvTWu99doU3T8ifoMYOMLW2CXKvyKLukPh1auOPwFGHzueWYvBBN+OxF8wF7XwjTBMMeRleVdLh3aWCDEX/ZWg==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@cspell/dict-docker": {
-    "version": "1.1.16",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-docker/-/dict-docker-1.1.16.tgz",
-    "integrity": "sha512-UiVQ5RmCg6j0qGIxrBnai3pIB+aYKL3zaJGvXk1O/ertTKJif9RZikKXCEgqhaCYMweM4fuLqWSVmw3hU164Iw==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@cspell/dict-dotnet": {
-    "version": "5.0.10",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-dotnet/-/dict-dotnet-5.0.10.tgz",
-    "integrity": "sha512-ooar8BP/RBNP1gzYfJPStKEmpWy4uv/7JCq6FOnJLeD1yyfG3d/LFMVMwiJo+XWz025cxtkM3wuaikBWzCqkmg==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@cspell/dict-elixir": {
-    "version": "4.0.8",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-elixir/-/dict-elixir-4.0.8.tgz",
-    "integrity": "sha512-CyfphrbMyl4Ms55Vzuj+mNmd693HjBFr9hvU+B2YbFEZprE5AG+EXLYTMRWrXbpds4AuZcvN3deM2XVB80BN/Q==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@cspell/dict-en_us": {
-    "version": "4.4.24",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-en_us/-/dict-en_us-4.4.24.tgz",
-    "integrity": "sha512-JE+/H2YicHJTneRmgH4GSI21rS+1yGZVl1jfOQgl8iHLC+yTTMtCvueNDMK94CgJACzYAoCsQB70MqiFJJfjLQ==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@cspell/dict-en-common-misspellings": {
-    "version": "2.1.8",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-en-common-misspellings/-/dict-en-common-misspellings-2.1.8.tgz",
-    "integrity": "sha512-vDsjRFPQGuAADAiitf82z9Mz3DcqKZi6V5hPAEIFkLLKjFVBcjUsSq59SfL59ElIFb76MtBO0BLifdEbBj+DoQ==",
-    "dev": true,
-    "license": "CC BY-SA 4.0"
-    },
-    "node_modules/@cspell/dict-en-gb": {
-    "version": "5.0.19",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-en-gb/-/dict-en-gb-5.0.19.tgz",
-    "integrity": "sha512-/p+p/9q8XTzsE0GxbZZKcC1rTLYmCpilYw8aC9Q1xJbve8YqZnpxk8IxRyaHwfy1TeKMQNs6heZZRtzPag0rCw==",
-    "dev": true,
-    "license": "LGPL-3.0"
-    },
-    "node_modules/@cspell/dict-en-gb-mit": {
-    "version": "3.1.14",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-en-gb-mit/-/dict-en-gb-mit-3.1.14.tgz",
-    "integrity": "sha512-b+vEerlHP6rnNf30tmTJb7JZnOq4WAslYUvexOz/L3gDna9YJN3bAnwRJ3At3bdcOcMG7PTv3Pi+C73IR22lNg==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@cspell/dict-filetypes": {
-    "version": "3.0.14",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-filetypes/-/dict-filetypes-3.0.14.tgz",
-    "integrity": "sha512-KSXaSMYYNMLLdHEnju1DyRRH3eQWPRYRnOXpuHUdOh2jC44VgQoxyMU7oB3NAhDhZKBPCihabzECsAGFbdKfEA==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@cspell/dict-flutter": {
-    "version": "1.1.1",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-flutter/-/dict-flutter-1.1.1.tgz",
-    "integrity": "sha512-UlOzRcH2tNbFhZmHJN48Za/2/MEdRHl2BMkCWZBYs+30b91mWvBfzaN4IJQU7dUZtowKayVIF9FzvLZtZokc5A==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@cspell/dict-fonts": {
-    "version": "4.0.5",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-fonts/-/dict-fonts-4.0.5.tgz",
-    "integrity": "sha512-BbpkX10DUX/xzHs6lb7yzDf/LPjwYIBJHJlUXSBXDtK/1HaeS+Wqol4Mlm2+NAgZ7ikIE5DQMViTgBUY3ezNoQ==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@cspell/dict-fsharp": {
-    "version": "1.1.1",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-fsharp/-/dict-fsharp-1.1.1.tgz",
-    "integrity": "sha512-imhs0u87wEA4/cYjgzS0tAyaJpwG7vwtC8UyMFbwpmtw+/bgss+osNfyqhYRyS/ehVCWL17Ewx2UPkexjKyaBA==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@cspell/dict-fullstack": {
-    "version": "3.2.7",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-fullstack/-/dict-fullstack-3.2.7.tgz",
-    "integrity": "sha512-IxEk2YAwAJKYCUEgEeOg3QvTL4XLlyArJElFuMQevU1dPgHgzWElFevN5lsTFnvMFA1riYsVinqJJX0BanCFEg==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@cspell/dict-gaming-terms": {
-    "version": "1.1.2",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-gaming-terms/-/dict-gaming-terms-1.1.2.tgz",
-    "integrity": "sha512-9XnOvaoTBscq0xuD6KTEIkk9hhdfBkkvJAIsvw3JMcnp1214OCGW8+kako5RqQ2vTZR3Tnf3pc57o7VgkM0q1Q==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@cspell/dict-git": {
-    "version": "3.0.7",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-git/-/dict-git-3.0.7.tgz",
-    "integrity": "sha512-odOwVKgfxCQfiSb+nblQZc4ErXmnWEnv8XwkaI4sNJ7cNmojnvogYVeMqkXPjvfrgEcizEEA4URRD2Ms5PDk1w==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@cspell/dict-golang": {
-    "version": "6.0.24",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-golang/-/dict-golang-6.0.24.tgz",
-    "integrity": "sha512-rY7PlC3MsHozmjrZWi0HQPUl0BVCV0+mwK0rnMT7pOIXqOe4tWCYMULDIsEk4F0gbIxb5badd2dkCPDYjLnDgA==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@cspell/dict-google": {
-    "version": "1.0.9",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-google/-/dict-google-1.0.9.tgz",
-    "integrity": "sha512-biL65POqialY0i4g6crj7pR6JnBkbsPovB2WDYkj3H4TuC/QXv7Pu5pdPxeUJA6TSCHI7T5twsO4VSVyRxD9CA==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@cspell/dict-haskell": {
-    "version": "4.0.6",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-haskell/-/dict-haskell-4.0.6.tgz",
-    "integrity": "sha512-ib8SA5qgftExpYNjWhpYIgvDsZ/0wvKKxSP+kuSkkak520iPvTJumEpIE+qPcmJQo4NzdKMN8nEfaeci4OcFAQ==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@cspell/dict-html": {
-    "version": "4.0.12",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-html/-/dict-html-4.0.12.tgz",
-    "integrity": "sha512-JFffQ1dDVEyJq6tCDWv0r/RqkdSnV43P2F/3jJ9rwLgdsOIXwQbXrz6QDlvQLVvNSnORH9KjDtenFTGDyzfCaA==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@cspell/dict-html-symbol-entities": {
-    "version": "4.0.4",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-html-symbol-entities/-/dict-html-symbol-entities-4.0.4.tgz",
-    "integrity": "sha512-afea+0rGPDeOV9gdO06UW183Qg6wRhWVkgCFwiO3bDupAoyXRuvupbb5nUyqSTsLXIKL8u8uXQlJ9pkz07oVXw==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@cspell/dict-java": {
-    "version": "5.0.12",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-java/-/dict-java-5.0.12.tgz",
-    "integrity": "sha512-qPSNhTcl7LGJ5Qp6VN71H8zqvRQK04S08T67knMq9hTA8U7G1sTKzLmBaDOFhq17vNX/+rT+rbRYp+B5Nwza1A==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@cspell/dict-julia": {
-    "version": "1.1.1",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-julia/-/dict-julia-1.1.1.tgz",
-    "integrity": "sha512-WylJR9TQ2cgwd5BWEOfdO3zvDB+L7kYFm0I9u0s9jKHWQ6yKmfKeMjU9oXxTBxIufhCXm92SKwwVNAC7gjv+yA==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@cspell/dict-k8s": {
-    "version": "1.0.12",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-k8s/-/dict-k8s-1.0.12.tgz",
-    "integrity": "sha512-2LcllTWgaTfYC7DmkMPOn9GsBWsA4DZdlun4po8s2ysTP7CPEnZc1ZfK6pZ2eI4TsZemlUQQ+NZxMe9/QutQxg==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@cspell/dict-kotlin": {
-    "version": "1.1.1",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-kotlin/-/dict-kotlin-1.1.1.tgz",
-    "integrity": "sha512-J3NzzfgmxRvEeOe3qUXnSJQCd38i/dpF9/t3quuWh6gXM+krsAXP75dY1CzDmS8mrJAlBdVBeAW5eAZTD8g86Q==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@cspell/dict-latex": {
-    "version": "4.0.4",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-latex/-/dict-latex-4.0.4.tgz",
-    "integrity": "sha512-YdTQhnTINEEm/LZgTzr9Voz4mzdOXH7YX+bSFs3hnkUHCUUtX/mhKgf1CFvZ0YNM2afjhQcmLaR9bDQVyYBvpA==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@cspell/dict-lorem-ipsum": {
-    "version": "4.0.5",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-lorem-ipsum/-/dict-lorem-ipsum-4.0.5.tgz",
-    "integrity": "sha512-9a4TJYRcPWPBKkQAJ/whCu4uCAEgv/O2xAaZEI0n4y1/l18Yyx8pBKoIX5QuVXjjmKEkK7hi5SxyIsH7pFEK9Q==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@cspell/dict-lua": {
-    "version": "4.0.8",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-lua/-/dict-lua-4.0.8.tgz",
-    "integrity": "sha512-N4PkgNDMu9JVsRu7JBS/3E/dvfItRgk9w5ga2dKq+JupP2Y3lojNaAVFhXISh4Y0a6qXDn2clA6nvnavQ/jjLA==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@cspell/dict-makefile": {
-    "version": "1.0.5",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-makefile/-/dict-makefile-1.0.5.tgz",
-    "integrity": "sha512-4vrVt7bGiK8Rx98tfRbYo42Xo2IstJkAF4tLLDMNQLkQ86msDlYSKG1ZCk8Abg+EdNcFAjNhXIiNO+w4KflGAQ==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@cspell/dict-markdown": {
-    "version": "2.0.12",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-markdown/-/dict-markdown-2.0.12.tgz",
-    "integrity": "sha512-ufwoliPijAgWkD/ivAMC+A9QD895xKiJRF/fwwknQb7kt7NozTLKFAOBtXGPJAB4UjhGBpYEJVo2elQ0FCAH9A==",
-    "dev": true,
-    "license": "MIT",
-    "peerDependencies": {
-        "@cspell/dict-css": "^4.0.18",
-        "@cspell/dict-html": "^4.0.12",
-        "@cspell/dict-html-symbol-entities": "^4.0.4",
-        "@cspell/dict-typescript": "^3.2.3"
-    }
-    },
-    "node_modules/@cspell/dict-monkeyc": {
-    "version": "1.0.11",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-monkeyc/-/dict-monkeyc-1.0.11.tgz",
-    "integrity": "sha512-7Q1Ncu0urALI6dPTrEbSTd//UK0qjRBeaxhnm8uY5fgYNFYAG+u4gtnTIo59S6Bw5P++4H3DiIDYoQdY/lha8w==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@cspell/dict-node": {
-    "version": "5.0.8",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-node/-/dict-node-5.0.8.tgz",
-    "integrity": "sha512-AirZcN2i84ynev3p2/1NCPEhnNsHKMz9zciTngGoqpdItUb2bDt1nJBjwlsrFI78GZRph/VaqTVFwYikmncpXg==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@cspell/dict-npm": {
-    "version": "5.2.23",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-npm/-/dict-npm-5.2.23.tgz",
-    "integrity": "sha512-cnlPGzhNkbXFLFURfjzwML2LjHMofqJkemR7lLo9Jwa9IptvzeTn4nOtJMSGfkxNrZPf/IvQ7rH5hamsUQLQ3A==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@cspell/dict-php": {
-    "version": "4.1.0",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-php/-/dict-php-4.1.0.tgz",
-    "integrity": "sha512-dTDeabyOj7eFvn2Q4Za3uVXM2+SzeFMqX8ly2P0XTo4AzbCmI2hulFD/QIADwWmwiRrInbbf8cxwFHNIYrXl4w==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@cspell/dict-powershell": {
-    "version": "5.0.15",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-powershell/-/dict-powershell-5.0.15.tgz",
-    "integrity": "sha512-l4S5PAcvCFcVDMJShrYD0X6Huv9dcsQPlsVsBGbH38wvuN7gS7+GxZFAjTNxDmTY1wrNi1cCatSg6Pu2BW4rgg==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@cspell/dict-public-licenses": {
-    "version": "2.0.15",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-public-licenses/-/dict-public-licenses-2.0.15.tgz",
-    "integrity": "sha512-cJEOs901H13Pfy0fl4dCD1U+xpWIMaEPq8MeYU83FfDZvellAuSo4GqWCripfIqlhns/L6+UZEIJSOZnjgy7Wg==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@cspell/dict-python": {
-    "version": "4.2.22",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-python/-/dict-python-4.2.22.tgz",
-    "integrity": "sha512-rgF7DuleVK2lkzlw33jjEfxS2a0CU5kwAhOqf5B6XkuaPbqZ/0g0LBCdwglAGccYu7sBuvxRS8Yubk+ytSAFTg==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@cspell/dict-data-science": "^2.0.12"
-    }
-    },
-    "node_modules/@cspell/dict-r": {
-    "version": "2.1.1",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-r/-/dict-r-2.1.1.tgz",
-    "integrity": "sha512-71Ka+yKfG4ZHEMEmDxc6+blFkeTTvgKbKAbwiwQAuKl3zpqs1Y0vUtwW2N4b3LgmSPhV3ODVY0y4m5ofqDuKMw==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@cspell/dict-ruby": {
-    "version": "5.0.9",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-ruby/-/dict-ruby-5.0.9.tgz",
-    "integrity": "sha512-H2vMcERMcANvQshAdrVx0XoWaNX8zmmiQN11dZZTQAZaNJ0xatdJoSqY8C8uhEMW89bfgpN+NQgGuDXW2vmXEw==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@cspell/dict-rust": {
-    "version": "4.0.12",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-rust/-/dict-rust-4.0.12.tgz",
-    "integrity": "sha512-z2QiH+q9UlNhobBJArvILRxV8Jz0pKIK7gqu4TgmEYyjiu1TvnGZ1tbYHeu9w3I/wOP6UMDoCBTty5AlYfW0mw==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@cspell/dict-scala": {
-    "version": "5.0.8",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-scala/-/dict-scala-5.0.8.tgz",
-    "integrity": "sha512-YdftVmumv8IZq9zu1gn2U7A4bfM2yj9Vaupydotyjuc+EEZZSqAafTpvW/jKLWji2TgybM1L2IhmV0s/Iv9BTw==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@cspell/dict-shell": {
-    "version": "1.1.2",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-shell/-/dict-shell-1.1.2.tgz",
-    "integrity": "sha512-WqOUvnwcHK1X61wAfwyXq04cn7KYyskg90j4lLg3sGGKMW9Sq13hs91pqrjC44Q+lQLgCobrTkMDw9Wyl9nRFA==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@cspell/dict-software-terms": {
-    "version": "5.1.14",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-5.1.14.tgz",
-    "integrity": "sha512-Eu9h090hxHJiqzVFS0WxOZbYXnmb7F1RFIUEg4Nru+D/78bXVDH4b8BiKGVFNRljaieNQRAHaryzdaKJRCH6ZA==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@cspell/dict-sql": {
-    "version": "2.2.1",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-sql/-/dict-sql-2.2.1.tgz",
-    "integrity": "sha512-qDHF8MpAYCf4pWU8NKbnVGzkoxMNrFqBHyG/dgrlic5EQiKANCLELYtGlX5auIMDLmTf1inA0eNtv74tyRJ/vg==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@cspell/dict-svelte": {
-    "version": "1.0.7",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-svelte/-/dict-svelte-1.0.7.tgz",
-    "integrity": "sha512-hGZsGqP0WdzKkdpeVLBivRuSNzOTvN036EBmpOwxH+FTY2DuUH7ecW+cSaMwOgmq5JFSdTcbTNFlNC8HN8lhaQ==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@cspell/dict-swift": {
-    "version": "2.0.6",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-swift/-/dict-swift-2.0.6.tgz",
-    "integrity": "sha512-PnpNbrIbex2aqU1kMgwEKvCzgbkHtj3dlFLPMqW1vSniop7YxaDTtvTUO4zA++ugYAEL+UK8vYrBwDPTjjvSnA==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@cspell/dict-terraform": {
-    "version": "1.1.3",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-terraform/-/dict-terraform-1.1.3.tgz",
-    "integrity": "sha512-gr6wxCydwSFyyBKhBA2xkENXtVFToheqYYGFvlMZXWjviynXmh+NK/JTvTCk/VHk3+lzbO9EEQKee6VjrAUSbA==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@cspell/dict-typescript": {
-    "version": "3.2.3",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-typescript/-/dict-typescript-3.2.3.tgz",
-    "integrity": "sha512-zXh1wYsNljQZfWWdSPYwQhpwiuW0KPW1dSd8idjMRvSD0aSvWWHoWlrMsmZeRl4qM4QCEAjua8+cjflm41cQBg==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@cspell/dict-vue": {
-    "version": "3.0.5",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-vue/-/dict-vue-3.0.5.tgz",
-    "integrity": "sha512-Mqutb8jbM+kIcywuPQCCaK5qQHTdaByoEO2J9LKFy3sqAdiBogNkrplqUK0HyyRFgCfbJUgjz3N85iCMcWH0JA==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@cspell/dict-zig": {
-    "version": "1.0.0",
-    "resolved": "https://registry.npmjs.org/@cspell/dict-zig/-/dict-zig-1.0.0.tgz",
-    "integrity": "sha512-XibBIxBlVosU06+M6uHWkFeT0/pW5WajDRYdXG2CgHnq85b0TI/Ks0FuBJykmsgi2CAD3Qtx8UHFEtl/DSFnAQ==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@cspell/dynamic-import": {
-    "version": "9.3.2",
-    "resolved": "https://registry.npmjs.org/@cspell/dynamic-import/-/dynamic-import-9.3.2.tgz",
-    "integrity": "sha512-au7FyuIHUNI2r9sO3pUBKVTeD/v7c9x/nPUStaAK1bG4rdKt4w+/jUY2IaldAraW5w29z528BboXbiV87SM1kw==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@cspell/url": "9.3.2",
-        "import-meta-resolve": "^4.2.0"
-    },
-    "engines": {
-        "node": ">=20"
-    }
-    },
-    "node_modules/@cspell/filetypes": {
-    "version": "9.3.2",
-    "resolved": "https://registry.npmjs.org/@cspell/filetypes/-/filetypes-9.3.2.tgz",
-    "integrity": "sha512-0bUxQlmJPRHZrRQD7adbc4lFizO8tGD/6+1cBgU3kV3+NVrpr12y4jU8twCSChhYibZyPr7bnvhkM3cQgb8RzA==",
-    "dev": true,
-    "license": "MIT",
-    "engines": {
-        "node": ">=20"
-    }
-    },
-    "node_modules/@cspell/strong-weak-map": {
-    "version": "9.3.2",
-    "resolved": "https://registry.npmjs.org/@cspell/strong-weak-map/-/strong-weak-map-9.3.2.tgz",
-    "integrity": "sha512-pFcmOTWCoFMRETb9PCkCmaiZiLb5i2qOZmGH/p/tFEH8kIYhMGfhaulnXwKwS+Ke6PKceQd2YL98bGmo8hL4aQ==",
-    "dev": true,
-    "license": "MIT",
-    "engines": {
-        "node": ">=20"
-    }
-    },
-    "node_modules/@cspell/url": {
-    "version": "9.3.2",
-    "resolved": "https://registry.npmjs.org/@cspell/url/-/url-9.3.2.tgz",
-    "integrity": "sha512-TobUlZl7Z7VehhNOMNAg1ABuGizieseftlG94OZJ934JptOhK8TC/1o2ldKrbDH50jyt6E7rPTMV2BW/vWuTzQ==",
-    "dev": true,
-    "license": "MIT",
-    "engines": {
-        "node": ">=20"
-    }
-    },
-    "node_modules/@docsearch/css": {
-    "version": "3.8.2",
-    "resolved": "https://registry.npmjs.org/@docsearch/css/-/css-3.8.2.tgz",
-    "integrity": "sha512-y05ayQFyUmCXze79+56v/4HpycYF3uFqB78pLPrSV5ZKAlDuIAAJNhaRi8tTdRNXh05yxX/TyNnzD6LwSM89vQ==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@docsearch/js": {
-    "version": "3.8.2",
-    "resolved": "https://registry.npmjs.org/@docsearch/js/-/js-3.8.2.tgz",
-    "integrity": "sha512-Q5wY66qHn0SwA7Taa0aDbHiJvaFJLOJyHmooQ7y8hlwwQLQ/5WwCcoX0g7ii04Qi2DJlHsd0XXzJ8Ypw9+9YmQ==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@docsearch/react": "3.8.2",
-        "preact": "^10.0.0"
-    }
-    },
-    "node_modules/@docsearch/react": {
-    "version": "3.8.2",
-    "resolved": "https://registry.npmjs.org/@docsearch/react/-/react-3.8.2.tgz",
-    "integrity": "sha512-xCRrJQlTt8N9GU0DG4ptwHRkfnSnD/YpdeaXe02iKfqs97TkZJv60yE+1eq/tjPcVnTW8dP5qLP7itifFVV5eg==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@algolia/autocomplete-core": "1.17.7",
-        "@algolia/autocomplete-preset-algolia": "1.17.7",
-        "@docsearch/css": "3.8.2",
-        "algoliasearch": "^5.14.2"
-    },
-    "peerDependencies": {
-        "@types/react": ">= 16.8.0 < 19.0.0",
-        "react": ">= 16.8.0 < 19.0.0",
-        "react-dom": ">= 16.8.0 < 19.0.0",
-        "search-insights": ">= 1 < 3"
-    },
-    "peerDependenciesMeta": {
-        "@types/react": {
-        "optional": true
+    "lockfileVersion": 3,
+    "requires": true,
+    "packages": {
+        "": {
+            "name": "docs",
+            "version": "1.0.0",
+            "license": "ISC",
+            "devDependencies": {
+                "@cspell/dict-en-gb": "^5.0.19",
+                "cspell": "^9.3.2",
+                "prettier": "^3.6.2",
+                "vitepress": "^1.6.4",
+                "vue": "^3.5.24"
+            }
         },
-        "react": {
-        "optional": true
+        "node_modules/@algolia/abtesting": {
+            "version": "1.10.0",
+            "resolved": "https://registry.npmjs.org/@algolia/abtesting/-/abtesting-1.10.0.tgz",
+            "integrity": "sha512-mQT3jwuTgX8QMoqbIR7mPlWkqQqBPQaPabQzm37xg2txMlaMogK/4hCiiESGdg39MlHZOVHeV+0VJuE7f5UK8A==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@algolia/client-common": "5.44.0",
+                "@algolia/requester-browser-xhr": "5.44.0",
+                "@algolia/requester-fetch": "5.44.0",
+                "@algolia/requester-node-http": "5.44.0"
+            },
+            "engines": {
+                "node": ">= 14.0.0"
+            }
         },
-        "react-dom": {
-        "optional": true
+        "node_modules/@algolia/autocomplete-core": {
+            "version": "1.17.7",
+            "resolved": "https://registry.npmjs.org/@algolia/autocomplete-core/-/autocomplete-core-1.17.7.tgz",
+            "integrity": "sha512-BjiPOW6ks90UKl7TwMv7oNQMnzU+t/wk9mgIDi6b1tXpUek7MW0lbNOUHpvam9pe3lVCf4xPFT+lK7s+e+fs7Q==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@algolia/autocomplete-plugin-algolia-insights": "1.17.7",
+                "@algolia/autocomplete-shared": "1.17.7"
+            }
         },
-        "search-insights": {
-        "optional": true
+        "node_modules/@algolia/autocomplete-plugin-algolia-insights": {
+            "version": "1.17.7",
+            "resolved": "https://registry.npmjs.org/@algolia/autocomplete-plugin-algolia-insights/-/autocomplete-plugin-algolia-insights-1.17.7.tgz",
+            "integrity": "sha512-Jca5Ude6yUOuyzjnz57og7Et3aXjbwCSDf/8onLHSQgw1qW3ALl9mrMWaXb5FmPVkV3EtkD2F/+NkT6VHyPu9A==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@algolia/autocomplete-shared": "1.17.7"
+            },
+            "peerDependencies": {
+                "search-insights": ">= 1 < 3"
+            }
+        },
+        "node_modules/@algolia/autocomplete-preset-algolia": {
+            "version": "1.17.7",
+            "resolved": "https://registry.npmjs.org/@algolia/autocomplete-preset-algolia/-/autocomplete-preset-algolia-1.17.7.tgz",
+            "integrity": "sha512-ggOQ950+nwbWROq2MOCIL71RE0DdQZsceqrg32UqnhDz8FlO9rL8ONHNsI2R1MH0tkgVIDKI/D0sMiUchsFdWA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@algolia/autocomplete-shared": "1.17.7"
+            },
+            "peerDependencies": {
+                "@algolia/client-search": ">= 4.9.1 < 6",
+                "algoliasearch": ">= 4.9.1 < 6"
+            }
+        },
+        "node_modules/@algolia/autocomplete-shared": {
+            "version": "1.17.7",
+            "resolved": "https://registry.npmjs.org/@algolia/autocomplete-shared/-/autocomplete-shared-1.17.7.tgz",
+            "integrity": "sha512-o/1Vurr42U/qskRSuhBH+VKxMvkkUVTLU6WZQr+L5lGZZLYWyhdzWjW0iGXY7EkwRTjBqvN2EsR81yCTGV/kmg==",
+            "dev": true,
+            "license": "MIT",
+            "peerDependencies": {
+                "@algolia/client-search": ">= 4.9.1 < 6",
+                "algoliasearch": ">= 4.9.1 < 6"
+            }
+        },
+        "node_modules/@algolia/client-abtesting": {
+            "version": "5.44.0",
+            "resolved": "https://registry.npmjs.org/@algolia/client-abtesting/-/client-abtesting-5.44.0.tgz",
+            "integrity": "sha512-KY5CcrWhRTUo/lV7KcyjrZkPOOF9bjgWpMj9z98VA+sXzVpZtkuskBLCKsWYFp2sbwchZFTd3wJM48H0IGgF7g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@algolia/client-common": "5.44.0",
+                "@algolia/requester-browser-xhr": "5.44.0",
+                "@algolia/requester-fetch": "5.44.0",
+                "@algolia/requester-node-http": "5.44.0"
+            },
+            "engines": {
+                "node": ">= 14.0.0"
+            }
+        },
+        "node_modules/@algolia/client-analytics": {
+            "version": "5.44.0",
+            "resolved": "https://registry.npmjs.org/@algolia/client-analytics/-/client-analytics-5.44.0.tgz",
+            "integrity": "sha512-LKOCE8S4ewI9bN3ot9RZoYASPi8b78E918/DVPW3HHjCMUe6i+NjbNG6KotU4RpP6AhRWZjjswbOkWelUO+OoA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@algolia/client-common": "5.44.0",
+                "@algolia/requester-browser-xhr": "5.44.0",
+                "@algolia/requester-fetch": "5.44.0",
+                "@algolia/requester-node-http": "5.44.0"
+            },
+            "engines": {
+                "node": ">= 14.0.0"
+            }
+        },
+        "node_modules/@algolia/client-common": {
+            "version": "5.44.0",
+            "resolved": "https://registry.npmjs.org/@algolia/client-common/-/client-common-5.44.0.tgz",
+            "integrity": "sha512-1yyJm4OYC2cztbS28XYVWwLXdwpLsMG4LoZLOltVglQ2+hc/i9q9fUDZyjRa2Bqt4DmkIfezagfMrokhyH4uxQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 14.0.0"
+            }
+        },
+        "node_modules/@algolia/client-insights": {
+            "version": "5.44.0",
+            "resolved": "https://registry.npmjs.org/@algolia/client-insights/-/client-insights-5.44.0.tgz",
+            "integrity": "sha512-wVQWK6jYYsbEOjIMI+e5voLGPUIbXrvDj392IckXaCPvQ6vCMTXakQqOYCd+znQdL76S+3wHDo77HZWiAYKrtA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@algolia/client-common": "5.44.0",
+                "@algolia/requester-browser-xhr": "5.44.0",
+                "@algolia/requester-fetch": "5.44.0",
+                "@algolia/requester-node-http": "5.44.0"
+            },
+            "engines": {
+                "node": ">= 14.0.0"
+            }
+        },
+        "node_modules/@algolia/client-personalization": {
+            "version": "5.44.0",
+            "resolved": "https://registry.npmjs.org/@algolia/client-personalization/-/client-personalization-5.44.0.tgz",
+            "integrity": "sha512-lkgRjOjOkqmIkebHjHpU9rLJcJNUDMm+eVSW/KJQYLjGqykEZxal+nYJJTBbLceEU2roByP/+27ZmgIwCdf0iA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@algolia/client-common": "5.44.0",
+                "@algolia/requester-browser-xhr": "5.44.0",
+                "@algolia/requester-fetch": "5.44.0",
+                "@algolia/requester-node-http": "5.44.0"
+            },
+            "engines": {
+                "node": ">= 14.0.0"
+            }
+        },
+        "node_modules/@algolia/client-query-suggestions": {
+            "version": "5.44.0",
+            "resolved": "https://registry.npmjs.org/@algolia/client-query-suggestions/-/client-query-suggestions-5.44.0.tgz",
+            "integrity": "sha512-sYfhgwKu6NDVmZHL1WEKVLsOx/jUXCY4BHKLUOcYa8k4COCs6USGgz6IjFkUf+niwq8NCECMmTC4o/fVQOalsA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@algolia/client-common": "5.44.0",
+                "@algolia/requester-browser-xhr": "5.44.0",
+                "@algolia/requester-fetch": "5.44.0",
+                "@algolia/requester-node-http": "5.44.0"
+            },
+            "engines": {
+                "node": ">= 14.0.0"
+            }
+        },
+        "node_modules/@algolia/client-search": {
+            "version": "5.44.0",
+            "resolved": "https://registry.npmjs.org/@algolia/client-search/-/client-search-5.44.0.tgz",
+            "integrity": "sha512-/FRKUM1G4xn3vV8+9xH1WJ9XknU8rkBGlefruq9jDhYUAvYozKimhrmC2pRqw/RyHhPivmgZCRuC8jHP8piz4Q==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@algolia/client-common": "5.44.0",
+                "@algolia/requester-browser-xhr": "5.44.0",
+                "@algolia/requester-fetch": "5.44.0",
+                "@algolia/requester-node-http": "5.44.0"
+            },
+            "engines": {
+                "node": ">= 14.0.0"
+            }
+        },
+        "node_modules/@algolia/ingestion": {
+            "version": "1.44.0",
+            "resolved": "https://registry.npmjs.org/@algolia/ingestion/-/ingestion-1.44.0.tgz",
+            "integrity": "sha512-5+S5ynwMmpTpCLXGjTDpeIa81J+R4BLH0lAojOhmeGSeGEHQTqacl/4sbPyDTcidvnWhaqtyf8m42ue6lvISAw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@algolia/client-common": "5.44.0",
+                "@algolia/requester-browser-xhr": "5.44.0",
+                "@algolia/requester-fetch": "5.44.0",
+                "@algolia/requester-node-http": "5.44.0"
+            },
+            "engines": {
+                "node": ">= 14.0.0"
+            }
+        },
+        "node_modules/@algolia/monitoring": {
+            "version": "1.44.0",
+            "resolved": "https://registry.npmjs.org/@algolia/monitoring/-/monitoring-1.44.0.tgz",
+            "integrity": "sha512-xhaTN8pXJjR6zkrecg4Cc9YZaQK2LKm2R+LkbAq+AYGBCWJxtSGlNwftozZzkUyq4AXWoyoc0x2SyBtq5LRtqQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@algolia/client-common": "5.44.0",
+                "@algolia/requester-browser-xhr": "5.44.0",
+                "@algolia/requester-fetch": "5.44.0",
+                "@algolia/requester-node-http": "5.44.0"
+            },
+            "engines": {
+                "node": ">= 14.0.0"
+            }
+        },
+        "node_modules/@algolia/recommend": {
+            "version": "5.44.0",
+            "resolved": "https://registry.npmjs.org/@algolia/recommend/-/recommend-5.44.0.tgz",
+            "integrity": "sha512-GNcite/uOIS7wgRU1MT7SdNIupGSW+vbK9igIzMePvD2Dl8dy0O3urKPKIbTuZQqiVH1Cb84y5cgLvwNrdCj/Q==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@algolia/client-common": "5.44.0",
+                "@algolia/requester-browser-xhr": "5.44.0",
+                "@algolia/requester-fetch": "5.44.0",
+                "@algolia/requester-node-http": "5.44.0"
+            },
+            "engines": {
+                "node": ">= 14.0.0"
+            }
+        },
+        "node_modules/@algolia/requester-browser-xhr": {
+            "version": "5.44.0",
+            "resolved": "https://registry.npmjs.org/@algolia/requester-browser-xhr/-/requester-browser-xhr-5.44.0.tgz",
+            "integrity": "sha512-YZHBk72Cd7pcuNHzbhNzF/FbbYszlc7JhZlDyQAchnX5S7tcemSS96F39Sy8t4O4WQLpFvUf1MTNedlitWdOsQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@algolia/client-common": "5.44.0"
+            },
+            "engines": {
+                "node": ">= 14.0.0"
+            }
+        },
+        "node_modules/@algolia/requester-fetch": {
+            "version": "5.44.0",
+            "resolved": "https://registry.npmjs.org/@algolia/requester-fetch/-/requester-fetch-5.44.0.tgz",
+            "integrity": "sha512-B9WHl+wQ7uf46t9cq+vVM/ypVbOeuldVDq9OtKsX2ApL2g/htx6ImB9ugDOOJmB5+fE31/XPTuCcYz/j03+idA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@algolia/client-common": "5.44.0"
+            },
+            "engines": {
+                "node": ">= 14.0.0"
+            }
+        },
+        "node_modules/@algolia/requester-node-http": {
+            "version": "5.44.0",
+            "resolved": "https://registry.npmjs.org/@algolia/requester-node-http/-/requester-node-http-5.44.0.tgz",
+            "integrity": "sha512-MULm0qeAIk4cdzZ/ehJnl1o7uB5NMokg83/3MKhPq0Pk7+I0uELGNbzIfAkvkKKEYcHALemKdArtySF9eKzh/A==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@algolia/client-common": "5.44.0"
+            },
+            "engines": {
+                "node": ">= 14.0.0"
+            }
+        },
+        "node_modules/@babel/helper-string-parser": {
+            "version": "7.27.1",
+            "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz",
+            "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-validator-identifier": {
+            "version": "7.28.5",
+            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz",
+            "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/parser": {
+            "version": "7.28.5",
+            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.5.tgz",
+            "integrity": "sha512-KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/types": "^7.28.5"
+            },
+            "bin": {
+                "parser": "bin/babel-parser.js"
+            },
+            "engines": {
+                "node": ">=6.0.0"
+            }
+        },
+        "node_modules/@babel/types": {
+            "version": "7.28.5",
+            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.5.tgz",
+            "integrity": "sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/helper-string-parser": "^7.27.1",
+                "@babel/helper-validator-identifier": "^7.28.5"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@cspell/cspell-bundled-dicts": {
+            "version": "9.3.2",
+            "resolved": "https://registry.npmjs.org/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-9.3.2.tgz",
+            "integrity": "sha512-OmKzq/0FATHU671GKMzBrTyLdm25Wnziva7h4ylumVn1wnwWsXGef5bgXD7iuApqfqH9SzxsU0NtTB8m8vwEHQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@cspell/dict-ada": "^4.1.1",
+                "@cspell/dict-al": "^1.1.1",
+                "@cspell/dict-aws": "^4.0.16",
+                "@cspell/dict-bash": "^4.2.2",
+                "@cspell/dict-companies": "^3.2.7",
+                "@cspell/dict-cpp": "^6.0.14",
+                "@cspell/dict-cryptocurrencies": "^5.0.5",
+                "@cspell/dict-csharp": "^4.0.7",
+                "@cspell/dict-css": "^4.0.18",
+                "@cspell/dict-dart": "^2.3.1",
+                "@cspell/dict-data-science": "^2.0.11",
+                "@cspell/dict-django": "^4.1.5",
+                "@cspell/dict-docker": "^1.1.16",
+                "@cspell/dict-dotnet": "^5.0.10",
+                "@cspell/dict-elixir": "^4.0.8",
+                "@cspell/dict-en_us": "^4.4.24",
+                "@cspell/dict-en-common-misspellings": "^2.1.8",
+                "@cspell/dict-en-gb-mit": "^3.1.14",
+                "@cspell/dict-filetypes": "^3.0.14",
+                "@cspell/dict-flutter": "^1.1.1",
+                "@cspell/dict-fonts": "^4.0.5",
+                "@cspell/dict-fsharp": "^1.1.1",
+                "@cspell/dict-fullstack": "^3.2.7",
+                "@cspell/dict-gaming-terms": "^1.1.2",
+                "@cspell/dict-git": "^3.0.7",
+                "@cspell/dict-golang": "^6.0.24",
+                "@cspell/dict-google": "^1.0.9",
+                "@cspell/dict-haskell": "^4.0.6",
+                "@cspell/dict-html": "^4.0.12",
+                "@cspell/dict-html-symbol-entities": "^4.0.4",
+                "@cspell/dict-java": "^5.0.12",
+                "@cspell/dict-julia": "^1.1.1",
+                "@cspell/dict-k8s": "^1.0.12",
+                "@cspell/dict-kotlin": "^1.1.1",
+                "@cspell/dict-latex": "^4.0.4",
+                "@cspell/dict-lorem-ipsum": "^4.0.5",
+                "@cspell/dict-lua": "^4.0.8",
+                "@cspell/dict-makefile": "^1.0.5",
+                "@cspell/dict-markdown": "^2.0.12",
+                "@cspell/dict-monkeyc": "^1.0.11",
+                "@cspell/dict-node": "^5.0.8",
+                "@cspell/dict-npm": "^5.2.22",
+                "@cspell/dict-php": "^4.1.0",
+                "@cspell/dict-powershell": "^5.0.15",
+                "@cspell/dict-public-licenses": "^2.0.15",
+                "@cspell/dict-python": "^4.2.21",
+                "@cspell/dict-r": "^2.1.1",
+                "@cspell/dict-ruby": "^5.0.9",
+                "@cspell/dict-rust": "^4.0.12",
+                "@cspell/dict-scala": "^5.0.8",
+                "@cspell/dict-shell": "^1.1.2",
+                "@cspell/dict-software-terms": "^5.1.13",
+                "@cspell/dict-sql": "^2.2.1",
+                "@cspell/dict-svelte": "^1.0.7",
+                "@cspell/dict-swift": "^2.0.6",
+                "@cspell/dict-terraform": "^1.1.3",
+                "@cspell/dict-typescript": "^3.2.3",
+                "@cspell/dict-vue": "^3.0.5",
+                "@cspell/dict-zig": "^1.0.0"
+            },
+            "engines": {
+                "node": ">=20"
+            }
+        },
+        "node_modules/@cspell/cspell-json-reporter": {
+            "version": "9.3.2",
+            "resolved": "https://registry.npmjs.org/@cspell/cspell-json-reporter/-/cspell-json-reporter-9.3.2.tgz",
+            "integrity": "sha512-YRgpeHN9uY8kUlIw9q+8zJ0tRTAJMbfBTGzCq9Puah09NeMWlRMFPUkXVrkdic6NA7etboZ+zEdoZwRO9EmhiA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@cspell/cspell-types": "9.3.2"
+            },
+            "engines": {
+                "node": ">=20"
+            }
+        },
+        "node_modules/@cspell/cspell-pipe": {
+            "version": "9.3.2",
+            "resolved": "https://registry.npmjs.org/@cspell/cspell-pipe/-/cspell-pipe-9.3.2.tgz",
+            "integrity": "sha512-REF7ibG79WLEynIMUss/IRDCdYEb1nlE1rj/gt2CbPFzLa6t5MRwW2lajEvXS6/WgbMtsTVHAWi3ALqJzCwxng==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=20"
+            }
+        },
+        "node_modules/@cspell/cspell-resolver": {
+            "version": "9.3.2",
+            "resolved": "https://registry.npmjs.org/@cspell/cspell-resolver/-/cspell-resolver-9.3.2.tgz",
+            "integrity": "sha512-jLN2Aa/vxm8+IBvTd884SwPEfjxnDwIEPBT3hmqgLlKuUHQ3FMG27lsM4Ik9L2KWBXMgV/wGz4BaxfhKI41Ttw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "global-directory": "^4.0.1"
+            },
+            "engines": {
+                "node": ">=20"
+            }
+        },
+        "node_modules/@cspell/cspell-service-bus": {
+            "version": "9.3.2",
+            "resolved": "https://registry.npmjs.org/@cspell/cspell-service-bus/-/cspell-service-bus-9.3.2.tgz",
+            "integrity": "sha512-/rB8LazM0JzKL+AvZa5fEpLutmwy5QFMpzw8HJd+rDGkzb5r79hURWSRo84QArgaskUqA9XlOHSieDE9pt+WAA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=20"
+            }
+        },
+        "node_modules/@cspell/cspell-types": {
+            "version": "9.3.2",
+            "resolved": "https://registry.npmjs.org/@cspell/cspell-types/-/cspell-types-9.3.2.tgz",
+            "integrity": "sha512-l4H8bMAmdzCbXHO8y1JZiAKszrPEiuLFKWrbhCacHF0iP+PIc/yuQp7cO70m0p70vArRfih6kgGyHFaCy47CfA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=20"
+            }
+        },
+        "node_modules/@cspell/dict-ada": {
+            "version": "4.1.1",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-ada/-/dict-ada-4.1.1.tgz",
+            "integrity": "sha512-E+0YW9RhZod/9Qy2gxfNZiHJjCYFlCdI69br1eviQQWB8yOTJX0JHXLs79kOYhSW0kINPVUdvddEBe6Lu6CjGQ==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@cspell/dict-al": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-al/-/dict-al-1.1.1.tgz",
+            "integrity": "sha512-sD8GCaZetgQL4+MaJLXqbzWcRjfKVp8x+px3HuCaaiATAAtvjwUQ5/Iubiqwfd1boIh2Y1/3EgM3TLQ7Q8e0wQ==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@cspell/dict-aws": {
+            "version": "4.0.16",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-aws/-/dict-aws-4.0.16.tgz",
+            "integrity": "sha512-a681zShZbtTo947NvTYGLer95ZDQw1ROKvIFydak1e0OlfFCsNdtcYTupn0nbbYs53c9AO7G2DU8AcNEAnwXPA==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@cspell/dict-bash": {
+            "version": "4.2.2",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-bash/-/dict-bash-4.2.2.tgz",
+            "integrity": "sha512-kyWbwtX3TsCf5l49gGQIZkRLaB/P8g73GDRm41Zu8Mv51kjl2H7Au0TsEvHv7jzcsRLS6aUYaZv6Zsvk1fOz+Q==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@cspell/dict-shell": "1.1.2"
+            }
+        },
+        "node_modules/@cspell/dict-companies": {
+            "version": "3.2.7",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-companies/-/dict-companies-3.2.7.tgz",
+            "integrity": "sha512-fEyr3LmpFKTaD0LcRhB4lfW1AmULYBqzg4gWAV0dQCv06l+TsA+JQ+3pZJbUcoaZirtgsgT3dL3RUjmGPhUH0A==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@cspell/dict-cpp": {
+            "version": "6.0.14",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-cpp/-/dict-cpp-6.0.14.tgz",
+            "integrity": "sha512-dkmpSwvVfVdtoZ4mW/CK2Ep1v8mJlp6uiKpMNbSMOdJl4kq28nQS4vKNIX3B2bJa0Ha5iHHu+1mNjiLeO3g7Xg==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@cspell/dict-cryptocurrencies": {
+            "version": "5.0.5",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-cryptocurrencies/-/dict-cryptocurrencies-5.0.5.tgz",
+            "integrity": "sha512-R68hYYF/rtlE6T/dsObStzN5QZw+0aQBinAXuWCVqwdS7YZo0X33vGMfChkHaiCo3Z2+bkegqHlqxZF4TD3rUA==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@cspell/dict-csharp": {
+            "version": "4.0.7",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-csharp/-/dict-csharp-4.0.7.tgz",
+            "integrity": "sha512-H16Hpu8O/1/lgijFt2lOk4/nnldFtQ4t8QHbyqphqZZVE5aS4J/zD/WvduqnLY21aKhZS6jo/xF5PX9jyqPKUA==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@cspell/dict-css": {
+            "version": "4.0.18",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-css/-/dict-css-4.0.18.tgz",
+            "integrity": "sha512-EF77RqROHL+4LhMGW5NTeKqfUd/e4OOv6EDFQ/UQQiFyWuqkEKyEz0NDILxOFxWUEVdjT2GQ2cC7t12B6pESwg==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@cspell/dict-dart": {
+            "version": "2.3.1",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-dart/-/dict-dart-2.3.1.tgz",
+            "integrity": "sha512-xoiGnULEcWdodXI6EwVyqpZmpOoh8RA2Xk9BNdR7DLamV/QMvEYn8KJ7NlRiTSauJKPNkHHQ5EVHRM6sTS7jdg==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@cspell/dict-data-science": {
+            "version": "2.0.12",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-data-science/-/dict-data-science-2.0.12.tgz",
+            "integrity": "sha512-vI/mg6cI28IkFcpeINS7cm5M9HWemmXSTnxJiu3nmc4VAGx35SXIEyuLGBcsVzySvDablFYf4hsEpmg1XpVsUQ==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@cspell/dict-django": {
+            "version": "4.1.5",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-django/-/dict-django-4.1.5.tgz",
+            "integrity": "sha512-AvTWu99doU3T8ifoMYOMLW2CXKvyKLukPh1auOPwFGHzueWYvBBN+OxF8wF7XwjTBMMeRleVdLh3aWCDEX/ZWg==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@cspell/dict-docker": {
+            "version": "1.1.16",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-docker/-/dict-docker-1.1.16.tgz",
+            "integrity": "sha512-UiVQ5RmCg6j0qGIxrBnai3pIB+aYKL3zaJGvXk1O/ertTKJif9RZikKXCEgqhaCYMweM4fuLqWSVmw3hU164Iw==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@cspell/dict-dotnet": {
+            "version": "5.0.10",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-dotnet/-/dict-dotnet-5.0.10.tgz",
+            "integrity": "sha512-ooar8BP/RBNP1gzYfJPStKEmpWy4uv/7JCq6FOnJLeD1yyfG3d/LFMVMwiJo+XWz025cxtkM3wuaikBWzCqkmg==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@cspell/dict-elixir": {
+            "version": "4.0.8",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-elixir/-/dict-elixir-4.0.8.tgz",
+            "integrity": "sha512-CyfphrbMyl4Ms55Vzuj+mNmd693HjBFr9hvU+B2YbFEZprE5AG+EXLYTMRWrXbpds4AuZcvN3deM2XVB80BN/Q==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@cspell/dict-en_us": {
+            "version": "4.4.24",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-en_us/-/dict-en_us-4.4.24.tgz",
+            "integrity": "sha512-JE+/H2YicHJTneRmgH4GSI21rS+1yGZVl1jfOQgl8iHLC+yTTMtCvueNDMK94CgJACzYAoCsQB70MqiFJJfjLQ==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@cspell/dict-en-common-misspellings": {
+            "version": "2.1.8",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-en-common-misspellings/-/dict-en-common-misspellings-2.1.8.tgz",
+            "integrity": "sha512-vDsjRFPQGuAADAiitf82z9Mz3DcqKZi6V5hPAEIFkLLKjFVBcjUsSq59SfL59ElIFb76MtBO0BLifdEbBj+DoQ==",
+            "dev": true,
+            "license": "CC BY-SA 4.0"
+        },
+        "node_modules/@cspell/dict-en-gb": {
+            "version": "5.0.19",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-en-gb/-/dict-en-gb-5.0.19.tgz",
+            "integrity": "sha512-/p+p/9q8XTzsE0GxbZZKcC1rTLYmCpilYw8aC9Q1xJbve8YqZnpxk8IxRyaHwfy1TeKMQNs6heZZRtzPag0rCw==",
+            "dev": true,
+            "license": "LGPL-3.0"
+        },
+        "node_modules/@cspell/dict-en-gb-mit": {
+            "version": "3.1.14",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-en-gb-mit/-/dict-en-gb-mit-3.1.14.tgz",
+            "integrity": "sha512-b+vEerlHP6rnNf30tmTJb7JZnOq4WAslYUvexOz/L3gDna9YJN3bAnwRJ3At3bdcOcMG7PTv3Pi+C73IR22lNg==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@cspell/dict-filetypes": {
+            "version": "3.0.14",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-filetypes/-/dict-filetypes-3.0.14.tgz",
+            "integrity": "sha512-KSXaSMYYNMLLdHEnju1DyRRH3eQWPRYRnOXpuHUdOh2jC44VgQoxyMU7oB3NAhDhZKBPCihabzECsAGFbdKfEA==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@cspell/dict-flutter": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-flutter/-/dict-flutter-1.1.1.tgz",
+            "integrity": "sha512-UlOzRcH2tNbFhZmHJN48Za/2/MEdRHl2BMkCWZBYs+30b91mWvBfzaN4IJQU7dUZtowKayVIF9FzvLZtZokc5A==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@cspell/dict-fonts": {
+            "version": "4.0.5",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-fonts/-/dict-fonts-4.0.5.tgz",
+            "integrity": "sha512-BbpkX10DUX/xzHs6lb7yzDf/LPjwYIBJHJlUXSBXDtK/1HaeS+Wqol4Mlm2+NAgZ7ikIE5DQMViTgBUY3ezNoQ==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@cspell/dict-fsharp": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-fsharp/-/dict-fsharp-1.1.1.tgz",
+            "integrity": "sha512-imhs0u87wEA4/cYjgzS0tAyaJpwG7vwtC8UyMFbwpmtw+/bgss+osNfyqhYRyS/ehVCWL17Ewx2UPkexjKyaBA==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@cspell/dict-fullstack": {
+            "version": "3.2.7",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-fullstack/-/dict-fullstack-3.2.7.tgz",
+            "integrity": "sha512-IxEk2YAwAJKYCUEgEeOg3QvTL4XLlyArJElFuMQevU1dPgHgzWElFevN5lsTFnvMFA1riYsVinqJJX0BanCFEg==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@cspell/dict-gaming-terms": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-gaming-terms/-/dict-gaming-terms-1.1.2.tgz",
+            "integrity": "sha512-9XnOvaoTBscq0xuD6KTEIkk9hhdfBkkvJAIsvw3JMcnp1214OCGW8+kako5RqQ2vTZR3Tnf3pc57o7VgkM0q1Q==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@cspell/dict-git": {
+            "version": "3.0.7",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-git/-/dict-git-3.0.7.tgz",
+            "integrity": "sha512-odOwVKgfxCQfiSb+nblQZc4ErXmnWEnv8XwkaI4sNJ7cNmojnvogYVeMqkXPjvfrgEcizEEA4URRD2Ms5PDk1w==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@cspell/dict-golang": {
+            "version": "6.0.24",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-golang/-/dict-golang-6.0.24.tgz",
+            "integrity": "sha512-rY7PlC3MsHozmjrZWi0HQPUl0BVCV0+mwK0rnMT7pOIXqOe4tWCYMULDIsEk4F0gbIxb5badd2dkCPDYjLnDgA==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@cspell/dict-google": {
+            "version": "1.0.9",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-google/-/dict-google-1.0.9.tgz",
+            "integrity": "sha512-biL65POqialY0i4g6crj7pR6JnBkbsPovB2WDYkj3H4TuC/QXv7Pu5pdPxeUJA6TSCHI7T5twsO4VSVyRxD9CA==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@cspell/dict-haskell": {
+            "version": "4.0.6",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-haskell/-/dict-haskell-4.0.6.tgz",
+            "integrity": "sha512-ib8SA5qgftExpYNjWhpYIgvDsZ/0wvKKxSP+kuSkkak520iPvTJumEpIE+qPcmJQo4NzdKMN8nEfaeci4OcFAQ==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@cspell/dict-html": {
+            "version": "4.0.12",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-html/-/dict-html-4.0.12.tgz",
+            "integrity": "sha512-JFffQ1dDVEyJq6tCDWv0r/RqkdSnV43P2F/3jJ9rwLgdsOIXwQbXrz6QDlvQLVvNSnORH9KjDtenFTGDyzfCaA==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@cspell/dict-html-symbol-entities": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-html-symbol-entities/-/dict-html-symbol-entities-4.0.4.tgz",
+            "integrity": "sha512-afea+0rGPDeOV9gdO06UW183Qg6wRhWVkgCFwiO3bDupAoyXRuvupbb5nUyqSTsLXIKL8u8uXQlJ9pkz07oVXw==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@cspell/dict-java": {
+            "version": "5.0.12",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-java/-/dict-java-5.0.12.tgz",
+            "integrity": "sha512-qPSNhTcl7LGJ5Qp6VN71H8zqvRQK04S08T67knMq9hTA8U7G1sTKzLmBaDOFhq17vNX/+rT+rbRYp+B5Nwza1A==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@cspell/dict-julia": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-julia/-/dict-julia-1.1.1.tgz",
+            "integrity": "sha512-WylJR9TQ2cgwd5BWEOfdO3zvDB+L7kYFm0I9u0s9jKHWQ6yKmfKeMjU9oXxTBxIufhCXm92SKwwVNAC7gjv+yA==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@cspell/dict-k8s": {
+            "version": "1.0.12",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-k8s/-/dict-k8s-1.0.12.tgz",
+            "integrity": "sha512-2LcllTWgaTfYC7DmkMPOn9GsBWsA4DZdlun4po8s2ysTP7CPEnZc1ZfK6pZ2eI4TsZemlUQQ+NZxMe9/QutQxg==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@cspell/dict-kotlin": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-kotlin/-/dict-kotlin-1.1.1.tgz",
+            "integrity": "sha512-J3NzzfgmxRvEeOe3qUXnSJQCd38i/dpF9/t3quuWh6gXM+krsAXP75dY1CzDmS8mrJAlBdVBeAW5eAZTD8g86Q==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@cspell/dict-latex": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-latex/-/dict-latex-4.0.4.tgz",
+            "integrity": "sha512-YdTQhnTINEEm/LZgTzr9Voz4mzdOXH7YX+bSFs3hnkUHCUUtX/mhKgf1CFvZ0YNM2afjhQcmLaR9bDQVyYBvpA==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@cspell/dict-lorem-ipsum": {
+            "version": "4.0.5",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-lorem-ipsum/-/dict-lorem-ipsum-4.0.5.tgz",
+            "integrity": "sha512-9a4TJYRcPWPBKkQAJ/whCu4uCAEgv/O2xAaZEI0n4y1/l18Yyx8pBKoIX5QuVXjjmKEkK7hi5SxyIsH7pFEK9Q==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@cspell/dict-lua": {
+            "version": "4.0.8",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-lua/-/dict-lua-4.0.8.tgz",
+            "integrity": "sha512-N4PkgNDMu9JVsRu7JBS/3E/dvfItRgk9w5ga2dKq+JupP2Y3lojNaAVFhXISh4Y0a6qXDn2clA6nvnavQ/jjLA==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@cspell/dict-makefile": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-makefile/-/dict-makefile-1.0.5.tgz",
+            "integrity": "sha512-4vrVt7bGiK8Rx98tfRbYo42Xo2IstJkAF4tLLDMNQLkQ86msDlYSKG1ZCk8Abg+EdNcFAjNhXIiNO+w4KflGAQ==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@cspell/dict-markdown": {
+            "version": "2.0.12",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-markdown/-/dict-markdown-2.0.12.tgz",
+            "integrity": "sha512-ufwoliPijAgWkD/ivAMC+A9QD895xKiJRF/fwwknQb7kt7NozTLKFAOBtXGPJAB4UjhGBpYEJVo2elQ0FCAH9A==",
+            "dev": true,
+            "license": "MIT",
+            "peerDependencies": {
+                "@cspell/dict-css": "^4.0.18",
+                "@cspell/dict-html": "^4.0.12",
+                "@cspell/dict-html-symbol-entities": "^4.0.4",
+                "@cspell/dict-typescript": "^3.2.3"
+            }
+        },
+        "node_modules/@cspell/dict-monkeyc": {
+            "version": "1.0.11",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-monkeyc/-/dict-monkeyc-1.0.11.tgz",
+            "integrity": "sha512-7Q1Ncu0urALI6dPTrEbSTd//UK0qjRBeaxhnm8uY5fgYNFYAG+u4gtnTIo59S6Bw5P++4H3DiIDYoQdY/lha8w==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@cspell/dict-node": {
+            "version": "5.0.8",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-node/-/dict-node-5.0.8.tgz",
+            "integrity": "sha512-AirZcN2i84ynev3p2/1NCPEhnNsHKMz9zciTngGoqpdItUb2bDt1nJBjwlsrFI78GZRph/VaqTVFwYikmncpXg==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@cspell/dict-npm": {
+            "version": "5.2.23",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-npm/-/dict-npm-5.2.23.tgz",
+            "integrity": "sha512-cnlPGzhNkbXFLFURfjzwML2LjHMofqJkemR7lLo9Jwa9IptvzeTn4nOtJMSGfkxNrZPf/IvQ7rH5hamsUQLQ3A==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@cspell/dict-php": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-php/-/dict-php-4.1.0.tgz",
+            "integrity": "sha512-dTDeabyOj7eFvn2Q4Za3uVXM2+SzeFMqX8ly2P0XTo4AzbCmI2hulFD/QIADwWmwiRrInbbf8cxwFHNIYrXl4w==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@cspell/dict-powershell": {
+            "version": "5.0.15",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-powershell/-/dict-powershell-5.0.15.tgz",
+            "integrity": "sha512-l4S5PAcvCFcVDMJShrYD0X6Huv9dcsQPlsVsBGbH38wvuN7gS7+GxZFAjTNxDmTY1wrNi1cCatSg6Pu2BW4rgg==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@cspell/dict-public-licenses": {
+            "version": "2.0.15",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-public-licenses/-/dict-public-licenses-2.0.15.tgz",
+            "integrity": "sha512-cJEOs901H13Pfy0fl4dCD1U+xpWIMaEPq8MeYU83FfDZvellAuSo4GqWCripfIqlhns/L6+UZEIJSOZnjgy7Wg==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@cspell/dict-python": {
+            "version": "4.2.22",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-python/-/dict-python-4.2.22.tgz",
+            "integrity": "sha512-rgF7DuleVK2lkzlw33jjEfxS2a0CU5kwAhOqf5B6XkuaPbqZ/0g0LBCdwglAGccYu7sBuvxRS8Yubk+ytSAFTg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@cspell/dict-data-science": "^2.0.12"
+            }
+        },
+        "node_modules/@cspell/dict-r": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-r/-/dict-r-2.1.1.tgz",
+            "integrity": "sha512-71Ka+yKfG4ZHEMEmDxc6+blFkeTTvgKbKAbwiwQAuKl3zpqs1Y0vUtwW2N4b3LgmSPhV3ODVY0y4m5ofqDuKMw==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@cspell/dict-ruby": {
+            "version": "5.0.9",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-ruby/-/dict-ruby-5.0.9.tgz",
+            "integrity": "sha512-H2vMcERMcANvQshAdrVx0XoWaNX8zmmiQN11dZZTQAZaNJ0xatdJoSqY8C8uhEMW89bfgpN+NQgGuDXW2vmXEw==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@cspell/dict-rust": {
+            "version": "4.0.12",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-rust/-/dict-rust-4.0.12.tgz",
+            "integrity": "sha512-z2QiH+q9UlNhobBJArvILRxV8Jz0pKIK7gqu4TgmEYyjiu1TvnGZ1tbYHeu9w3I/wOP6UMDoCBTty5AlYfW0mw==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@cspell/dict-scala": {
+            "version": "5.0.8",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-scala/-/dict-scala-5.0.8.tgz",
+            "integrity": "sha512-YdftVmumv8IZq9zu1gn2U7A4bfM2yj9Vaupydotyjuc+EEZZSqAafTpvW/jKLWji2TgybM1L2IhmV0s/Iv9BTw==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@cspell/dict-shell": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-shell/-/dict-shell-1.1.2.tgz",
+            "integrity": "sha512-WqOUvnwcHK1X61wAfwyXq04cn7KYyskg90j4lLg3sGGKMW9Sq13hs91pqrjC44Q+lQLgCobrTkMDw9Wyl9nRFA==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@cspell/dict-software-terms": {
+            "version": "5.1.14",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-5.1.14.tgz",
+            "integrity": "sha512-Eu9h090hxHJiqzVFS0WxOZbYXnmb7F1RFIUEg4Nru+D/78bXVDH4b8BiKGVFNRljaieNQRAHaryzdaKJRCH6ZA==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@cspell/dict-sql": {
+            "version": "2.2.1",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-sql/-/dict-sql-2.2.1.tgz",
+            "integrity": "sha512-qDHF8MpAYCf4pWU8NKbnVGzkoxMNrFqBHyG/dgrlic5EQiKANCLELYtGlX5auIMDLmTf1inA0eNtv74tyRJ/vg==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@cspell/dict-svelte": {
+            "version": "1.0.7",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-svelte/-/dict-svelte-1.0.7.tgz",
+            "integrity": "sha512-hGZsGqP0WdzKkdpeVLBivRuSNzOTvN036EBmpOwxH+FTY2DuUH7ecW+cSaMwOgmq5JFSdTcbTNFlNC8HN8lhaQ==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@cspell/dict-swift": {
+            "version": "2.0.6",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-swift/-/dict-swift-2.0.6.tgz",
+            "integrity": "sha512-PnpNbrIbex2aqU1kMgwEKvCzgbkHtj3dlFLPMqW1vSniop7YxaDTtvTUO4zA++ugYAEL+UK8vYrBwDPTjjvSnA==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@cspell/dict-terraform": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-terraform/-/dict-terraform-1.1.3.tgz",
+            "integrity": "sha512-gr6wxCydwSFyyBKhBA2xkENXtVFToheqYYGFvlMZXWjviynXmh+NK/JTvTCk/VHk3+lzbO9EEQKee6VjrAUSbA==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@cspell/dict-typescript": {
+            "version": "3.2.3",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-typescript/-/dict-typescript-3.2.3.tgz",
+            "integrity": "sha512-zXh1wYsNljQZfWWdSPYwQhpwiuW0KPW1dSd8idjMRvSD0aSvWWHoWlrMsmZeRl4qM4QCEAjua8+cjflm41cQBg==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@cspell/dict-vue": {
+            "version": "3.0.5",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-vue/-/dict-vue-3.0.5.tgz",
+            "integrity": "sha512-Mqutb8jbM+kIcywuPQCCaK5qQHTdaByoEO2J9LKFy3sqAdiBogNkrplqUK0HyyRFgCfbJUgjz3N85iCMcWH0JA==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@cspell/dict-zig": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/@cspell/dict-zig/-/dict-zig-1.0.0.tgz",
+            "integrity": "sha512-XibBIxBlVosU06+M6uHWkFeT0/pW5WajDRYdXG2CgHnq85b0TI/Ks0FuBJykmsgi2CAD3Qtx8UHFEtl/DSFnAQ==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@cspell/dynamic-import": {
+            "version": "9.3.2",
+            "resolved": "https://registry.npmjs.org/@cspell/dynamic-import/-/dynamic-import-9.3.2.tgz",
+            "integrity": "sha512-au7FyuIHUNI2r9sO3pUBKVTeD/v7c9x/nPUStaAK1bG4rdKt4w+/jUY2IaldAraW5w29z528BboXbiV87SM1kw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@cspell/url": "9.3.2",
+                "import-meta-resolve": "^4.2.0"
+            },
+            "engines": {
+                "node": ">=20"
+            }
+        },
+        "node_modules/@cspell/filetypes": {
+            "version": "9.3.2",
+            "resolved": "https://registry.npmjs.org/@cspell/filetypes/-/filetypes-9.3.2.tgz",
+            "integrity": "sha512-0bUxQlmJPRHZrRQD7adbc4lFizO8tGD/6+1cBgU3kV3+NVrpr12y4jU8twCSChhYibZyPr7bnvhkM3cQgb8RzA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=20"
+            }
+        },
+        "node_modules/@cspell/strong-weak-map": {
+            "version": "9.3.2",
+            "resolved": "https://registry.npmjs.org/@cspell/strong-weak-map/-/strong-weak-map-9.3.2.tgz",
+            "integrity": "sha512-pFcmOTWCoFMRETb9PCkCmaiZiLb5i2qOZmGH/p/tFEH8kIYhMGfhaulnXwKwS+Ke6PKceQd2YL98bGmo8hL4aQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=20"
+            }
+        },
+        "node_modules/@cspell/url": {
+            "version": "9.3.2",
+            "resolved": "https://registry.npmjs.org/@cspell/url/-/url-9.3.2.tgz",
+            "integrity": "sha512-TobUlZl7Z7VehhNOMNAg1ABuGizieseftlG94OZJ934JptOhK8TC/1o2ldKrbDH50jyt6E7rPTMV2BW/vWuTzQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=20"
+            }
+        },
+        "node_modules/@docsearch/css": {
+            "version": "3.8.2",
+            "resolved": "https://registry.npmjs.org/@docsearch/css/-/css-3.8.2.tgz",
+            "integrity": "sha512-y05ayQFyUmCXze79+56v/4HpycYF3uFqB78pLPrSV5ZKAlDuIAAJNhaRi8tTdRNXh05yxX/TyNnzD6LwSM89vQ==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@docsearch/js": {
+            "version": "3.8.2",
+            "resolved": "https://registry.npmjs.org/@docsearch/js/-/js-3.8.2.tgz",
+            "integrity": "sha512-Q5wY66qHn0SwA7Taa0aDbHiJvaFJLOJyHmooQ7y8hlwwQLQ/5WwCcoX0g7ii04Qi2DJlHsd0XXzJ8Ypw9+9YmQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@docsearch/react": "3.8.2",
+                "preact": "^10.0.0"
+            }
+        },
+        "node_modules/@docsearch/react": {
+            "version": "3.8.2",
+            "resolved": "https://registry.npmjs.org/@docsearch/react/-/react-3.8.2.tgz",
+            "integrity": "sha512-xCRrJQlTt8N9GU0DG4ptwHRkfnSnD/YpdeaXe02iKfqs97TkZJv60yE+1eq/tjPcVnTW8dP5qLP7itifFVV5eg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@algolia/autocomplete-core": "1.17.7",
+                "@algolia/autocomplete-preset-algolia": "1.17.7",
+                "@docsearch/css": "3.8.2",
+                "algoliasearch": "^5.14.2"
+            },
+            "peerDependencies": {
+                "@types/react": ">= 16.8.0 < 19.0.0",
+                "react": ">= 16.8.0 < 19.0.0",
+                "react-dom": ">= 16.8.0 < 19.0.0",
+                "search-insights": ">= 1 < 3"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                },
+                "react": {
+                    "optional": true
+                },
+                "react-dom": {
+                    "optional": true
+                },
+                "search-insights": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@esbuild/linux-x64": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
+            "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@iconify-json/simple-icons": {
+            "version": "1.2.59",
+            "resolved": "https://registry.npmjs.org/@iconify-json/simple-icons/-/simple-icons-1.2.59.tgz",
+            "integrity": "sha512-fYx/InyQsWFW4wVxWka3CGDJ6m/fXoTqWBSl+oA3FBXO5RhPAb6S3Y5bRgCPnrYevErH8VjAL0TZevIqlN2PhQ==",
+            "dev": true,
+            "license": "CC0-1.0",
+            "dependencies": {
+                "@iconify/types": "*"
+            }
+        },
+        "node_modules/@iconify/types": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/@iconify/types/-/types-2.0.0.tgz",
+            "integrity": "sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@jridgewell/sourcemap-codec": {
+            "version": "1.5.5",
+            "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
+            "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@rollup/rollup-linux-x64-gnu": {
+            "version": "4.53.3",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.53.3.tgz",
+            "integrity": "sha512-3EhFi1FU6YL8HTUJZ51imGJWEX//ajQPfqWLI3BQq4TlvHy4X0MOr5q3D2Zof/ka0d5FNdPwZXm3Yyib/UEd+w==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
+        "node_modules/@rollup/rollup-linux-x64-musl": {
+            "version": "4.53.3",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.53.3.tgz",
+            "integrity": "sha512-eoROhjcc6HbZCJr+tvVT8X4fW3/5g/WkGvvmwz/88sDtSJzO7r/blvoBDgISDiCjDRZmHpwud7h+6Q9JxFwq1Q==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
+        "node_modules/@shikijs/core": {
+            "version": "2.5.0",
+            "resolved": "https://registry.npmjs.org/@shikijs/core/-/core-2.5.0.tgz",
+            "integrity": "sha512-uu/8RExTKtavlpH7XqnVYBrfBkUc20ngXiX9NSrBhOVZYv/7XQRKUyhtkeflY5QsxC0GbJThCerruZfsUaSldg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@shikijs/engine-javascript": "2.5.0",
+                "@shikijs/engine-oniguruma": "2.5.0",
+                "@shikijs/types": "2.5.0",
+                "@shikijs/vscode-textmate": "^10.0.2",
+                "@types/hast": "^3.0.4",
+                "hast-util-to-html": "^9.0.4"
+            }
+        },
+        "node_modules/@shikijs/engine-javascript": {
+            "version": "2.5.0",
+            "resolved": "https://registry.npmjs.org/@shikijs/engine-javascript/-/engine-javascript-2.5.0.tgz",
+            "integrity": "sha512-VjnOpnQf8WuCEZtNUdjjwGUbtAVKuZkVQ/5cHy/tojVVRIRtlWMYVjyWhxOmIq05AlSOv72z7hRNRGVBgQOl0w==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@shikijs/types": "2.5.0",
+                "@shikijs/vscode-textmate": "^10.0.2",
+                "oniguruma-to-es": "^3.1.0"
+            }
+        },
+        "node_modules/@shikijs/engine-oniguruma": {
+            "version": "2.5.0",
+            "resolved": "https://registry.npmjs.org/@shikijs/engine-oniguruma/-/engine-oniguruma-2.5.0.tgz",
+            "integrity": "sha512-pGd1wRATzbo/uatrCIILlAdFVKdxImWJGQ5rFiB5VZi2ve5xj3Ax9jny8QvkaV93btQEwR/rSz5ERFpC5mKNIw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@shikijs/types": "2.5.0",
+                "@shikijs/vscode-textmate": "^10.0.2"
+            }
+        },
+        "node_modules/@shikijs/langs": {
+            "version": "2.5.0",
+            "resolved": "https://registry.npmjs.org/@shikijs/langs/-/langs-2.5.0.tgz",
+            "integrity": "sha512-Qfrrt5OsNH5R+5tJ/3uYBBZv3SuGmnRPejV9IlIbFH3HTGLDlkqgHymAlzklVmKBjAaVmkPkyikAV/sQ1wSL+w==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@shikijs/types": "2.5.0"
+            }
+        },
+        "node_modules/@shikijs/themes": {
+            "version": "2.5.0",
+            "resolved": "https://registry.npmjs.org/@shikijs/themes/-/themes-2.5.0.tgz",
+            "integrity": "sha512-wGrk+R8tJnO0VMzmUExHR+QdSaPUl/NKs+a4cQQRWyoc3YFbUzuLEi/KWK1hj+8BfHRKm2jNhhJck1dfstJpiw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@shikijs/types": "2.5.0"
+            }
+        },
+        "node_modules/@shikijs/transformers": {
+            "version": "2.5.0",
+            "resolved": "https://registry.npmjs.org/@shikijs/transformers/-/transformers-2.5.0.tgz",
+            "integrity": "sha512-SI494W5X60CaUwgi8u4q4m4s3YAFSxln3tzNjOSYqq54wlVgz0/NbbXEb3mdLbqMBztcmS7bVTaEd2w0qMmfeg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@shikijs/core": "2.5.0",
+                "@shikijs/types": "2.5.0"
+            }
+        },
+        "node_modules/@shikijs/types": {
+            "version": "2.5.0",
+            "resolved": "https://registry.npmjs.org/@shikijs/types/-/types-2.5.0.tgz",
+            "integrity": "sha512-ygl5yhxki9ZLNuNpPitBWvcy9fsSKKaRuO4BAlMyagszQidxcpLAr0qiW/q43DtSIDxO6hEbtYLiFZNXO/hdGw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@shikijs/vscode-textmate": "^10.0.2",
+                "@types/hast": "^3.0.4"
+            }
+        },
+        "node_modules/@shikijs/vscode-textmate": {
+            "version": "10.0.2",
+            "resolved": "https://registry.npmjs.org/@shikijs/vscode-textmate/-/vscode-textmate-10.0.2.tgz",
+            "integrity": "sha512-83yeghZ2xxin3Nj8z1NMd/NCuca+gsYXswywDy5bHvwlWL8tpTQmzGeUuHd9FC3E/SBEMvzJRwWEOz5gGes9Qg==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@types/estree": {
+            "version": "1.0.8",
+            "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
+            "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@types/hast": {
+            "version": "3.0.4",
+            "resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.4.tgz",
+            "integrity": "sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/unist": "*"
+            }
+        },
+        "node_modules/@types/linkify-it": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-5.0.0.tgz",
+            "integrity": "sha512-sVDA58zAw4eWAffKOaQH5/5j3XeayukzDk+ewSsnv3p4yJEZHCCzMDiZM8e0OUrRvmpGZ85jf4yDHkHsgBNr9Q==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@types/markdown-it": {
+            "version": "14.1.2",
+            "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-14.1.2.tgz",
+            "integrity": "sha512-promo4eFwuiW+TfGxhi+0x3czqTYJkG8qB17ZUJiVF10Xm7NLVRSLUsfRTU/6h1e24VvRnXCx+hG7li58lkzog==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/linkify-it": "^5",
+                "@types/mdurl": "^2"
+            }
+        },
+        "node_modules/@types/mdast": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-4.0.4.tgz",
+            "integrity": "sha512-kGaNbPh1k7AFzgpud/gMdvIm5xuECykRR+JnWKQno9TAXVa6WIVCGTPvYGekIDL4uwCZQSYbUxNBSb1aUo79oA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/unist": "*"
+            }
+        },
+        "node_modules/@types/mdurl": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-2.0.0.tgz",
+            "integrity": "sha512-RGdgjQUZba5p6QEFAVx2OGb8rQDL/cPRG7GiedRzMcJ1tYnUANBncjbSB1NRGwbvjcPeikRABz2nshyPk1bhWg==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@types/unist": {
+            "version": "3.0.3",
+            "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz",
+            "integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@types/web-bluetooth": {
+            "version": "0.0.21",
+            "resolved": "https://registry.npmjs.org/@types/web-bluetooth/-/web-bluetooth-0.0.21.tgz",
+            "integrity": "sha512-oIQLCGWtcFZy2JW77j9k8nHzAOpqMHLQejDA48XXMWH6tjCQHz5RCFz1bzsmROyL6PUm+LLnUiI4BCn221inxA==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@ungap/structured-clone": {
+            "version": "1.3.0",
+            "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.0.tgz",
+            "integrity": "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/@vitejs/plugin-vue": {
+            "version": "5.2.4",
+            "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-5.2.4.tgz",
+            "integrity": "sha512-7Yx/SXSOcQq5HiiV3orevHUFn+pmMB4cgbEkDYgnkUWb0WfeQ/wa2yFv6D5ICiCQOVpjA7vYDXrC7AGO8yjDHA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": "^18.0.0 || >=20.0.0"
+            },
+            "peerDependencies": {
+                "vite": "^5.0.0 || ^6.0.0",
+                "vue": "^3.2.25"
+            }
+        },
+        "node_modules/@vue/compiler-core": {
+            "version": "3.5.24",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.24.tgz",
+            "integrity": "sha512-eDl5H57AOpNakGNAkFDH+y7kTqrQpJkZFXhWZQGyx/5Wh7B1uQYvcWkvZi11BDhscPgj8N7XV3oRwiPnx1Vrig==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/parser": "^7.28.5",
+                "@vue/shared": "3.5.24",
+                "entities": "^4.5.0",
+                "estree-walker": "^2.0.2",
+                "source-map-js": "^1.2.1"
+            }
+        },
+        "node_modules/@vue/compiler-dom": {
+            "version": "3.5.24",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.24.tgz",
+            "integrity": "sha512-1QHGAvs53gXkWdd3ZMGYuvQFXHW4ksKWPG8HP8/2BscrbZ0brw183q2oNWjMrSWImYLHxHrx1ItBQr50I/q2zw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@vue/compiler-core": "3.5.24",
+                "@vue/shared": "3.5.24"
+            }
+        },
+        "node_modules/@vue/compiler-sfc": {
+            "version": "3.5.24",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.24.tgz",
+            "integrity": "sha512-8EG5YPRgmTB+YxYBM3VXy8zHD9SWHUJLIGPhDovo3Z8VOgvP+O7UP5vl0J4BBPWYD9vxtBabzW1EuEZ+Cqs14g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/parser": "^7.28.5",
+                "@vue/compiler-core": "3.5.24",
+                "@vue/compiler-dom": "3.5.24",
+                "@vue/compiler-ssr": "3.5.24",
+                "@vue/shared": "3.5.24",
+                "estree-walker": "^2.0.2",
+                "magic-string": "^0.30.21",
+                "postcss": "^8.5.6",
+                "source-map-js": "^1.2.1"
+            }
+        },
+        "node_modules/@vue/compiler-ssr": {
+            "version": "3.5.24",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.24.tgz",
+            "integrity": "sha512-trOvMWNBMQ/odMRHW7Ae1CdfYx+7MuiQu62Jtu36gMLXcaoqKvAyh+P73sYG9ll+6jLB6QPovqoKGGZROzkFFg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@vue/compiler-dom": "3.5.24",
+                "@vue/shared": "3.5.24"
+            }
+        },
+        "node_modules/@vue/devtools-api": {
+            "version": "7.7.9",
+            "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-7.7.9.tgz",
+            "integrity": "sha512-kIE8wvwlcZ6TJTbNeU2HQNtaxLx3a84aotTITUuL/4bzfPxzajGBOoqjMhwZJ8L9qFYDU/lAYMEEm11dnZOD6g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@vue/devtools-kit": "^7.7.9"
+            }
+        },
+        "node_modules/@vue/devtools-kit": {
+            "version": "7.7.9",
+            "resolved": "https://registry.npmjs.org/@vue/devtools-kit/-/devtools-kit-7.7.9.tgz",
+            "integrity": "sha512-PyQ6odHSgiDVd4hnTP+aDk2X4gl2HmLDfiyEnn3/oV+ckFDuswRs4IbBT7vacMuGdwY/XemxBoh302ctbsptuA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@vue/devtools-shared": "^7.7.9",
+                "birpc": "^2.3.0",
+                "hookable": "^5.5.3",
+                "mitt": "^3.0.1",
+                "perfect-debounce": "^1.0.0",
+                "speakingurl": "^14.0.1",
+                "superjson": "^2.2.2"
+            }
+        },
+        "node_modules/@vue/devtools-shared": {
+            "version": "7.7.9",
+            "resolved": "https://registry.npmjs.org/@vue/devtools-shared/-/devtools-shared-7.7.9.tgz",
+            "integrity": "sha512-iWAb0v2WYf0QWmxCGy0seZNDPdO3Sp5+u78ORnyeonS6MT4PC7VPrryX2BpMJrwlDeaZ6BD4vP4XKjK0SZqaeA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "rfdc": "^1.4.1"
+            }
+        },
+        "node_modules/@vue/reactivity": {
+            "version": "3.5.24",
+            "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.24.tgz",
+            "integrity": "sha512-BM8kBhtlkkbnyl4q+HiF5R5BL0ycDPfihowulm02q3WYp2vxgPcJuZO866qa/0u3idbMntKEtVNuAUp5bw4teg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@vue/shared": "3.5.24"
+            }
+        },
+        "node_modules/@vue/runtime-core": {
+            "version": "3.5.24",
+            "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.24.tgz",
+            "integrity": "sha512-RYP/byyKDgNIqfX/gNb2PB55dJmM97jc9wyF3jK7QUInYKypK2exmZMNwnjueWwGceEkP6NChd3D2ZVEp9undQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@vue/reactivity": "3.5.24",
+                "@vue/shared": "3.5.24"
+            }
+        },
+        "node_modules/@vue/runtime-dom": {
+            "version": "3.5.24",
+            "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.24.tgz",
+            "integrity": "sha512-Z8ANhr/i0XIluonHVjbUkjvn+CyrxbXRIxR7wn7+X7xlcb7dJsfITZbkVOeJZdP8VZwfrWRsWdShH6pngMxRjw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@vue/reactivity": "3.5.24",
+                "@vue/runtime-core": "3.5.24",
+                "@vue/shared": "3.5.24",
+                "csstype": "^3.1.3"
+            }
+        },
+        "node_modules/@vue/server-renderer": {
+            "version": "3.5.24",
+            "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.24.tgz",
+            "integrity": "sha512-Yh2j2Y4G/0/4z/xJ1Bad4mxaAk++C2v4kaa8oSYTMJBJ00/ndPuxCnWeot0/7/qafQFLh5pr6xeV6SdMcE/G1w==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@vue/compiler-ssr": "3.5.24",
+                "@vue/shared": "3.5.24"
+            },
+            "peerDependencies": {
+                "vue": "3.5.24"
+            }
+        },
+        "node_modules/@vue/shared": {
+            "version": "3.5.24",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.24.tgz",
+            "integrity": "sha512-9cwHL2EsJBdi8NY22pngYYWzkTDhld6fAD6jlaeloNGciNSJL6bLpbxVgXl96X00Jtc6YWQv96YA/0sxex/k1A==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@vueuse/core": {
+            "version": "12.8.2",
+            "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-12.8.2.tgz",
+            "integrity": "sha512-HbvCmZdzAu3VGi/pWYm5Ut+Kd9mn1ZHnn4L5G8kOQTPs/IwIAmJoBrmYk2ckLArgMXZj0AW3n5CAejLUO+PhdQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/web-bluetooth": "^0.0.21",
+                "@vueuse/metadata": "12.8.2",
+                "@vueuse/shared": "12.8.2",
+                "vue": "^3.5.13"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/antfu"
+            }
+        },
+        "node_modules/@vueuse/integrations": {
+            "version": "12.8.2",
+            "resolved": "https://registry.npmjs.org/@vueuse/integrations/-/integrations-12.8.2.tgz",
+            "integrity": "sha512-fbGYivgK5uBTRt7p5F3zy6VrETlV9RtZjBqd1/HxGdjdckBgBM4ugP8LHpjolqTj14TXTxSK1ZfgPbHYyGuH7g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@vueuse/core": "12.8.2",
+                "@vueuse/shared": "12.8.2",
+                "vue": "^3.5.13"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/antfu"
+            },
+            "peerDependencies": {
+                "async-validator": "^4",
+                "axios": "^1",
+                "change-case": "^5",
+                "drauu": "^0.4",
+                "focus-trap": "^7",
+                "fuse.js": "^7",
+                "idb-keyval": "^6",
+                "jwt-decode": "^4",
+                "nprogress": "^0.2",
+                "qrcode": "^1.5",
+                "sortablejs": "^1",
+                "universal-cookie": "^7"
+            },
+            "peerDependenciesMeta": {
+                "async-validator": {
+                    "optional": true
+                },
+                "axios": {
+                    "optional": true
+                },
+                "change-case": {
+                    "optional": true
+                },
+                "drauu": {
+                    "optional": true
+                },
+                "focus-trap": {
+                    "optional": true
+                },
+                "fuse.js": {
+                    "optional": true
+                },
+                "idb-keyval": {
+                    "optional": true
+                },
+                "jwt-decode": {
+                    "optional": true
+                },
+                "nprogress": {
+                    "optional": true
+                },
+                "qrcode": {
+                    "optional": true
+                },
+                "sortablejs": {
+                    "optional": true
+                },
+                "universal-cookie": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@vueuse/metadata": {
+            "version": "12.8.2",
+            "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-12.8.2.tgz",
+            "integrity": "sha512-rAyLGEuoBJ/Il5AmFHiziCPdQzRt88VxR+Y/A/QhJ1EWtWqPBBAxTAFaSkviwEuOEZNtW8pvkPgoCZQ+HxqW1A==",
+            "dev": true,
+            "license": "MIT",
+            "funding": {
+                "url": "https://github.com/sponsors/antfu"
+            }
+        },
+        "node_modules/@vueuse/shared": {
+            "version": "12.8.2",
+            "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-12.8.2.tgz",
+            "integrity": "sha512-dznP38YzxZoNloI0qpEfpkms8knDtaoQ6Y/sfS0L7Yki4zh40LFHEhur0odJC6xTHG5dxWVPiUWBXn+wCG2s5w==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "vue": "^3.5.13"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/antfu"
+            }
+        },
+        "node_modules/algoliasearch": {
+            "version": "5.44.0",
+            "resolved": "https://registry.npmjs.org/algoliasearch/-/algoliasearch-5.44.0.tgz",
+            "integrity": "sha512-f8IpsbdQjzTjr/4mJ/jv5UplrtyMnnciGax6/B0OnLCs2/GJTK13O4Y7Ff1AvJVAaztanH+m5nzPoUq6EAy+aA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@algolia/abtesting": "1.10.0",
+                "@algolia/client-abtesting": "5.44.0",
+                "@algolia/client-analytics": "5.44.0",
+                "@algolia/client-common": "5.44.0",
+                "@algolia/client-insights": "5.44.0",
+                "@algolia/client-personalization": "5.44.0",
+                "@algolia/client-query-suggestions": "5.44.0",
+                "@algolia/client-search": "5.44.0",
+                "@algolia/ingestion": "1.44.0",
+                "@algolia/monitoring": "1.44.0",
+                "@algolia/recommend": "5.44.0",
+                "@algolia/requester-browser-xhr": "5.44.0",
+                "@algolia/requester-fetch": "5.44.0",
+                "@algolia/requester-node-http": "5.44.0"
+            },
+            "engines": {
+                "node": ">= 14.0.0"
+            }
+        },
+        "node_modules/array-timsort": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/array-timsort/-/array-timsort-1.0.3.tgz",
+            "integrity": "sha512-/+3GRL7dDAGEfM6TseQk/U+mi18TU2Ms9I3UlLdUMhz2hbvGNTKdj9xniwXfUqgYhHxRx0+8UnKkvlNwVU+cWQ==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/birpc": {
+            "version": "2.8.0",
+            "resolved": "https://registry.npmjs.org/birpc/-/birpc-2.8.0.tgz",
+            "integrity": "sha512-Bz2a4qD/5GRhiHSwj30c/8kC8QGj12nNDwz3D4ErQ4Xhy35dsSDvF+RA/tWpjyU0pdGtSDiEk6B5fBGE1qNVhw==",
+            "dev": true,
+            "license": "MIT",
+            "funding": {
+                "url": "https://github.com/sponsors/antfu"
+            }
+        },
+        "node_modules/callsites": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+            "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/ccount": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/ccount/-/ccount-2.0.1.tgz",
+            "integrity": "sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==",
+            "dev": true,
+            "license": "MIT",
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/wooorm"
+            }
+        },
+        "node_modules/chalk": {
+            "version": "5.6.2",
+            "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.6.2.tgz",
+            "integrity": "sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": "^12.17.0 || ^14.13 || >=16.0.0"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/chalk?sponsor=1"
+            }
+        },
+        "node_modules/chalk-template": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/chalk-template/-/chalk-template-1.1.2.tgz",
+            "integrity": "sha512-2bxTP2yUH7AJj/VAXfcA+4IcWGdQ87HwBANLt5XxGTeomo8yG0y95N1um9i5StvhT/Bl0/2cARA5v1PpPXUxUA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "chalk": "^5.2.0"
+            },
+            "engines": {
+                "node": ">=14.16"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/chalk-template?sponsor=1"
+            }
+        },
+        "node_modules/character-entities-html4": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-2.1.0.tgz",
+            "integrity": "sha512-1v7fgQRj6hnSwFpq1Eu0ynr/CDEw0rXo2B61qXrLNdHZmPKgb7fqS1a2JwF0rISo9q77jDI8VMEHoApn8qDoZA==",
+            "dev": true,
+            "license": "MIT",
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/wooorm"
+            }
+        },
+        "node_modules/character-entities-legacy": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-3.0.0.tgz",
+            "integrity": "sha512-RpPp0asT/6ufRm//AJVwpViZbGM/MkjQFxJccQRHmISF/22NBtsHqAWmL+/pmkPWoIUJdWyeVleTl1wydHATVQ==",
+            "dev": true,
+            "license": "MIT",
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/wooorm"
+            }
+        },
+        "node_modules/clear-module": {
+            "version": "4.1.2",
+            "resolved": "https://registry.npmjs.org/clear-module/-/clear-module-4.1.2.tgz",
+            "integrity": "sha512-LWAxzHqdHsAZlPlEyJ2Poz6AIs384mPeqLVCru2p0BrP9G/kVGuhNyZYClLO6cXlnuJjzC8xtsJIuMjKqLXoAw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "parent-module": "^2.0.0",
+                "resolve-from": "^5.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/comma-separated-tokens": {
+            "version": "2.0.3",
+            "resolved": "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-2.0.3.tgz",
+            "integrity": "sha512-Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg==",
+            "dev": true,
+            "license": "MIT",
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/wooorm"
+            }
+        },
+        "node_modules/commander": {
+            "version": "14.0.2",
+            "resolved": "https://registry.npmjs.org/commander/-/commander-14.0.2.tgz",
+            "integrity": "sha512-TywoWNNRbhoD0BXs1P3ZEScW8W5iKrnbithIl0YH+uCmBd0QpPOA8yc82DS3BIE5Ma6FnBVUsJ7wVUDz4dvOWQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=20"
+            }
+        },
+        "node_modules/comment-json": {
+            "version": "4.4.1",
+            "resolved": "https://registry.npmjs.org/comment-json/-/comment-json-4.4.1.tgz",
+            "integrity": "sha512-r1To31BQD5060QdkC+Iheai7gHwoSZobzunqkf2/kQ6xIAfJyrKNAFUwdKvkK7Qgu7pVTKQEa7ok7Ed3ycAJgg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "array-timsort": "^1.0.3",
+                "core-util-is": "^1.0.3",
+                "esprima": "^4.0.1"
+            },
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/copy-anything": {
+            "version": "4.0.5",
+            "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-4.0.5.tgz",
+            "integrity": "sha512-7Vv6asjS4gMOuILabD3l739tsaxFQmC+a7pLZm02zyvs8p977bL3zEgq3yDk5rn9B0PbYgIv++jmHcuUab4RhA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "is-what": "^5.2.0"
+            },
+            "engines": {
+                "node": ">=18"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/mesqueeb"
+            }
+        },
+        "node_modules/core-util-is": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+            "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/cspell": {
+            "version": "9.3.2",
+            "resolved": "https://registry.npmjs.org/cspell/-/cspell-9.3.2.tgz",
+            "integrity": "sha512-3xFyVSTYrYa/QJzLfzsCRMkMXqOsytP8E26DuGrVMJQoLPFmbOXNNtnMu4wrtr17QVloxpvutW77U4vb2L/LDQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@cspell/cspell-json-reporter": "9.3.2",
+                "@cspell/cspell-pipe": "9.3.2",
+                "@cspell/cspell-types": "9.3.2",
+                "@cspell/dynamic-import": "9.3.2",
+                "@cspell/url": "9.3.2",
+                "chalk": "^5.6.2",
+                "chalk-template": "^1.1.2",
+                "commander": "^14.0.2",
+                "cspell-config-lib": "9.3.2",
+                "cspell-dictionary": "9.3.2",
+                "cspell-gitignore": "9.3.2",
+                "cspell-glob": "9.3.2",
+                "cspell-io": "9.3.2",
+                "cspell-lib": "9.3.2",
+                "fast-json-stable-stringify": "^2.1.0",
+                "flatted": "^3.3.3",
+                "semver": "^7.7.3",
+                "tinyglobby": "^0.2.15"
+            },
+            "bin": {
+                "cspell": "bin.mjs",
+                "cspell-esm": "bin.mjs"
+            },
+            "engines": {
+                "node": ">=20"
+            },
+            "funding": {
+                "url": "https://github.com/streetsidesoftware/cspell?sponsor=1"
+            }
+        },
+        "node_modules/cspell-config-lib": {
+            "version": "9.3.2",
+            "resolved": "https://registry.npmjs.org/cspell-config-lib/-/cspell-config-lib-9.3.2.tgz",
+            "integrity": "sha512-zXhmA4rqgWQRTVijI+g/mgiep76TvTO4d+P3CHwcqLG57BKVzoW+jkO4qDLC+Neh4b8+CcNWEIr3w16BfuEJAA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@cspell/cspell-types": "9.3.2",
+                "comment-json": "^4.4.1",
+                "smol-toml": "^1.5.2",
+                "yaml": "^2.8.1"
+            },
+            "engines": {
+                "node": ">=20"
+            }
+        },
+        "node_modules/cspell-dictionary": {
+            "version": "9.3.2",
+            "resolved": "https://registry.npmjs.org/cspell-dictionary/-/cspell-dictionary-9.3.2.tgz",
+            "integrity": "sha512-E3YhOhZzZt1a+AEbFV2B3THCyZ576PDg0mDNUDrU1Y65SyIhf4DC6itfPoAb6R3FI/DI218RqWZg/FTT8lJ2gA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@cspell/cspell-pipe": "9.3.2",
+                "@cspell/cspell-types": "9.3.2",
+                "cspell-trie-lib": "9.3.2",
+                "fast-equals": "^5.3.3"
+            },
+            "engines": {
+                "node": ">=20"
+            }
+        },
+        "node_modules/cspell-gitignore": {
+            "version": "9.3.2",
+            "resolved": "https://registry.npmjs.org/cspell-gitignore/-/cspell-gitignore-9.3.2.tgz",
+            "integrity": "sha512-G2bLR+Dfb9GX4Sdm75GfCCa9V/sQYkRbLckuCuVmJxvcDB0xfczAtb6TfAXIziF3oUI6cOB1g+PoNLWBelcK5w==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@cspell/url": "9.3.2",
+                "cspell-glob": "9.3.2",
+                "cspell-io": "9.3.2"
+            },
+            "bin": {
+                "cspell-gitignore": "bin.mjs"
+            },
+            "engines": {
+                "node": ">=20"
+            }
+        },
+        "node_modules/cspell-glob": {
+            "version": "9.3.2",
+            "resolved": "https://registry.npmjs.org/cspell-glob/-/cspell-glob-9.3.2.tgz",
+            "integrity": "sha512-TuSupENEKyOCupOUZ3vnPxaTOghxY/rD1JIkb8e5kjzRprYVilO/rYqEk/52iLwJVd+4Npe8fNhR3KhU7u/UUg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@cspell/url": "9.3.2",
+                "picomatch": "^4.0.3"
+            },
+            "engines": {
+                "node": ">=20"
+            }
+        },
+        "node_modules/cspell-grammar": {
+            "version": "9.3.2",
+            "resolved": "https://registry.npmjs.org/cspell-grammar/-/cspell-grammar-9.3.2.tgz",
+            "integrity": "sha512-ysonrFu9vJvF/derDlEjUfmvLeCfNOWPh00t6Yh093AKrJFoWQiyaS/5bEN/uB5/n1sa4k3ItnWvuTp3+YuZsA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@cspell/cspell-pipe": "9.3.2",
+                "@cspell/cspell-types": "9.3.2"
+            },
+            "bin": {
+                "cspell-grammar": "bin.mjs"
+            },
+            "engines": {
+                "node": ">=20"
+            }
+        },
+        "node_modules/cspell-io": {
+            "version": "9.3.2",
+            "resolved": "https://registry.npmjs.org/cspell-io/-/cspell-io-9.3.2.tgz",
+            "integrity": "sha512-ahoULCp0j12TyXXmIcdO/7x65A/2mzUQO1IkOC65OXEbNT+evt0yswSO5Nr1F6kCHDuEKc46EZWwsYAzj78pMg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@cspell/cspell-service-bus": "9.3.2",
+                "@cspell/url": "9.3.2"
+            },
+            "engines": {
+                "node": ">=20"
+            }
+        },
+        "node_modules/cspell-lib": {
+            "version": "9.3.2",
+            "resolved": "https://registry.npmjs.org/cspell-lib/-/cspell-lib-9.3.2.tgz",
+            "integrity": "sha512-kdk11kib68zNANNICuOA8h4oA9kENQUAdeX/uvT4+7eHbHHV8WSgjXm4k4o/pRIbg164UJTX/XxKb/65ftn5jw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@cspell/cspell-bundled-dicts": "9.3.2",
+                "@cspell/cspell-pipe": "9.3.2",
+                "@cspell/cspell-resolver": "9.3.2",
+                "@cspell/cspell-types": "9.3.2",
+                "@cspell/dynamic-import": "9.3.2",
+                "@cspell/filetypes": "9.3.2",
+                "@cspell/strong-weak-map": "9.3.2",
+                "@cspell/url": "9.3.2",
+                "clear-module": "^4.1.2",
+                "cspell-config-lib": "9.3.2",
+                "cspell-dictionary": "9.3.2",
+                "cspell-glob": "9.3.2",
+                "cspell-grammar": "9.3.2",
+                "cspell-io": "9.3.2",
+                "cspell-trie-lib": "9.3.2",
+                "env-paths": "^3.0.0",
+                "gensequence": "^8.0.8",
+                "import-fresh": "^3.3.1",
+                "resolve-from": "^5.0.0",
+                "vscode-languageserver-textdocument": "^1.0.12",
+                "vscode-uri": "^3.1.0",
+                "xdg-basedir": "^5.1.0"
+            },
+            "engines": {
+                "node": ">=20"
+            }
+        },
+        "node_modules/cspell-trie-lib": {
+            "version": "9.3.2",
+            "resolved": "https://registry.npmjs.org/cspell-trie-lib/-/cspell-trie-lib-9.3.2.tgz",
+            "integrity": "sha512-1Af7Mq9jIccFQyJl/ZCcqQbtJwuDqpQVkk8xfs/92x4OI6gW1iTVRMtsrh0RTw1HZoR8aQD7tRRCiLPf/D+UiQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@cspell/cspell-pipe": "9.3.2",
+                "@cspell/cspell-types": "9.3.2",
+                "gensequence": "^8.0.8"
+            },
+            "engines": {
+                "node": ">=20"
+            }
+        },
+        "node_modules/csstype": {
+            "version": "3.2.3",
+            "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.2.3.tgz",
+            "integrity": "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/dequal": {
+            "version": "2.0.3",
+            "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
+            "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/devlop": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/devlop/-/devlop-1.1.0.tgz",
+            "integrity": "sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "dequal": "^2.0.0"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/wooorm"
+            }
+        },
+        "node_modules/emoji-regex-xs": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/emoji-regex-xs/-/emoji-regex-xs-1.0.0.tgz",
+            "integrity": "sha512-LRlerrMYoIDrT6jgpeZ2YYl/L8EulRTt5hQcYjy5AInh7HWXKimpqx68aknBFpGL2+/IcogTcaydJEgaTmOpDg==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/entities": {
+            "version": "4.5.0",
+            "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+            "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "engines": {
+                "node": ">=0.12"
+            },
+            "funding": {
+                "url": "https://github.com/fb55/entities?sponsor=1"
+            }
+        },
+        "node_modules/env-paths": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-3.0.0.tgz",
+            "integrity": "sha512-dtJUTepzMW3Lm/NPxRf3wP4642UWhjL2sQxc+ym2YMj1m/H2zDNQOlezafzkHwn6sMstjHTwG6iQQsctDW/b1A==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/esbuild": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
+            "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
+            "dev": true,
+            "hasInstallScript": true,
+            "license": "MIT",
+            "bin": {
+                "esbuild": "bin/esbuild"
+            },
+            "engines": {
+                "node": ">=12"
+            },
+            "optionalDependencies": {
+                "@esbuild/aix-ppc64": "0.21.5",
+                "@esbuild/android-arm": "0.21.5",
+                "@esbuild/android-arm64": "0.21.5",
+                "@esbuild/android-x64": "0.21.5",
+                "@esbuild/darwin-arm64": "0.21.5",
+                "@esbuild/darwin-x64": "0.21.5",
+                "@esbuild/freebsd-arm64": "0.21.5",
+                "@esbuild/freebsd-x64": "0.21.5",
+                "@esbuild/linux-arm": "0.21.5",
+                "@esbuild/linux-arm64": "0.21.5",
+                "@esbuild/linux-ia32": "0.21.5",
+                "@esbuild/linux-loong64": "0.21.5",
+                "@esbuild/linux-mips64el": "0.21.5",
+                "@esbuild/linux-ppc64": "0.21.5",
+                "@esbuild/linux-riscv64": "0.21.5",
+                "@esbuild/linux-s390x": "0.21.5",
+                "@esbuild/linux-x64": "0.21.5",
+                "@esbuild/netbsd-x64": "0.21.5",
+                "@esbuild/openbsd-x64": "0.21.5",
+                "@esbuild/sunos-x64": "0.21.5",
+                "@esbuild/win32-arm64": "0.21.5",
+                "@esbuild/win32-ia32": "0.21.5",
+                "@esbuild/win32-x64": "0.21.5"
+            }
+        },
+        "node_modules/esprima": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+            "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "bin": {
+                "esparse": "bin/esparse.js",
+                "esvalidate": "bin/esvalidate.js"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/estree-walker": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
+            "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/fast-equals": {
+            "version": "5.3.3",
+            "resolved": "https://registry.npmjs.org/fast-equals/-/fast-equals-5.3.3.tgz",
+            "integrity": "sha512-/boTcHZeIAQ2r/tL11voclBHDeP9WPxLt+tyAbVSyyXuUFyh0Tne7gJZTqGbxnvj79TjLdCXLOY7UIPhyG5MTw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6.0.0"
+            }
+        },
+        "node_modules/fast-json-stable-stringify": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+            "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/fdir": {
+            "version": "6.5.0",
+            "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
+            "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=12.0.0"
+            },
+            "peerDependencies": {
+                "picomatch": "^3 || ^4"
+            },
+            "peerDependenciesMeta": {
+                "picomatch": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/flatted": {
+            "version": "3.3.3",
+            "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz",
+            "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/focus-trap": {
+            "version": "7.6.6",
+            "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-7.6.6.tgz",
+            "integrity": "sha512-v/Z8bvMCajtx4mEXmOo7QEsIzlIOqRXTIwgUfsFOF9gEsespdbD0AkPIka1bSXZ8Y8oZ+2IVDQZePkTfEHZl7Q==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "tabbable": "^6.3.0"
+            }
+        },
+        "node_modules/fsevents": {
+            "version": "2.3.3",
+            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+            "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+            "dev": true,
+            "hasInstallScript": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+            }
+        },
+        "node_modules/gensequence": {
+            "version": "8.0.8",
+            "resolved": "https://registry.npmjs.org/gensequence/-/gensequence-8.0.8.tgz",
+            "integrity": "sha512-omMVniXEXpdx/vKxGnPRoO2394Otlze28TyxECbFVyoSpZ9H3EO7lemjcB12OpQJzRW4e5tt/dL1rOxry6aMHg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=20"
+            }
+        },
+        "node_modules/global-directory": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/global-directory/-/global-directory-4.0.1.tgz",
+            "integrity": "sha512-wHTUcDUoZ1H5/0iVqEudYW4/kAlN5cZ3j/bXn0Dpbizl9iaUVeWSHqiOjsgk6OW2bkLclbBjzewBz6weQ1zA2Q==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ini": "4.1.1"
+            },
+            "engines": {
+                "node": ">=18"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/hast-util-to-html": {
+            "version": "9.0.5",
+            "resolved": "https://registry.npmjs.org/hast-util-to-html/-/hast-util-to-html-9.0.5.tgz",
+            "integrity": "sha512-OguPdidb+fbHQSU4Q4ZiLKnzWo8Wwsf5bZfbvu7//a9oTYoqD/fWpe96NuHkoS9h0ccGOTe0C4NGXdtS0iObOw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/hast": "^3.0.0",
+                "@types/unist": "^3.0.0",
+                "ccount": "^2.0.0",
+                "comma-separated-tokens": "^2.0.0",
+                "hast-util-whitespace": "^3.0.0",
+                "html-void-elements": "^3.0.0",
+                "mdast-util-to-hast": "^13.0.0",
+                "property-information": "^7.0.0",
+                "space-separated-tokens": "^2.0.0",
+                "stringify-entities": "^4.0.0",
+                "zwitch": "^2.0.4"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/unified"
+            }
+        },
+        "node_modules/hast-util-whitespace": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/hast-util-whitespace/-/hast-util-whitespace-3.0.0.tgz",
+            "integrity": "sha512-88JUN06ipLwsnv+dVn+OIYOvAuvBMy/Qoi6O7mQHxdPXpjy+Cd6xRkWwux7DKO+4sYILtLBRIKgsdpS2gQc7qw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/hast": "^3.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/unified"
+            }
+        },
+        "node_modules/hookable": {
+            "version": "5.5.3",
+            "resolved": "https://registry.npmjs.org/hookable/-/hookable-5.5.3.tgz",
+            "integrity": "sha512-Yc+BQe8SvoXH1643Qez1zqLRmbA5rCL+sSmk6TVos0LWVfNIB7PGncdlId77WzLGSIB5KaWgTaNTs2lNVEI6VQ==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/html-void-elements": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/html-void-elements/-/html-void-elements-3.0.0.tgz",
+            "integrity": "sha512-bEqo66MRXsUGxWHV5IP0PUiAWwoEjba4VCzg0LjFJBpchPaTfyfCKTG6bc5F8ucKec3q5y6qOdGyYTSBEvhCrg==",
+            "dev": true,
+            "license": "MIT",
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/wooorm"
+            }
+        },
+        "node_modules/import-fresh": {
+            "version": "3.3.1",
+            "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz",
+            "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "parent-module": "^1.0.0",
+                "resolve-from": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=6"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/import-fresh/node_modules/parent-module": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+            "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "callsites": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/import-fresh/node_modules/resolve-from": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+            "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/import-meta-resolve": {
+            "version": "4.2.0",
+            "resolved": "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-4.2.0.tgz",
+            "integrity": "sha512-Iqv2fzaTQN28s/FwZAoFq0ZSs/7hMAHJVX+w8PZl3cY19Pxk6jFFalxQoIfW2826i/fDLXv8IiEZRIT0lDuWcg==",
+            "dev": true,
+            "license": "MIT",
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/wooorm"
+            }
+        },
+        "node_modules/ini": {
+            "version": "4.1.1",
+            "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.1.tgz",
+            "integrity": "sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g==",
+            "dev": true,
+            "license": "ISC",
+            "engines": {
+                "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+            }
+        },
+        "node_modules/is-what": {
+            "version": "5.5.0",
+            "resolved": "https://registry.npmjs.org/is-what/-/is-what-5.5.0.tgz",
+            "integrity": "sha512-oG7cgbmg5kLYae2N5IVd3jm2s+vldjxJzK1pcu9LfpGuQ93MQSzo0okvRna+7y5ifrD+20FE8FvjusyGaz14fw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=18"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/mesqueeb"
+            }
+        },
+        "node_modules/magic-string": {
+            "version": "0.30.21",
+            "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz",
+            "integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@jridgewell/sourcemap-codec": "^1.5.5"
+            }
+        },
+        "node_modules/mark.js": {
+            "version": "8.11.1",
+            "resolved": "https://registry.npmjs.org/mark.js/-/mark.js-8.11.1.tgz",
+            "integrity": "sha512-1I+1qpDt4idfgLQG+BNWmrqku+7/2bi5nLf4YwF8y8zXvmfiTBY3PV3ZibfrjBueCByROpuBjLLFCajqkgYoLQ==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/mdast-util-to-hast": {
+            "version": "13.2.1",
+            "resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-13.2.1.tgz",
+            "integrity": "sha512-cctsq2wp5vTsLIcaymblUriiTcZd0CwWtCbLvrOzYCDZoWyMNV8sZ7krj09FSnsiJi3WVsHLM4k6Dq/yaPyCXA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/hast": "^3.0.0",
+                "@types/mdast": "^4.0.0",
+                "@ungap/structured-clone": "^1.0.0",
+                "devlop": "^1.0.0",
+                "micromark-util-sanitize-uri": "^2.0.0",
+                "trim-lines": "^3.0.0",
+                "unist-util-position": "^5.0.0",
+                "unist-util-visit": "^5.0.0",
+                "vfile": "^6.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/unified"
+            }
+        },
+        "node_modules/micromark-util-character": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.1.tgz",
+            "integrity": "sha512-wv8tdUTJ3thSFFFJKtpYKOYiGP2+v96Hvk4Tu8KpCAsTMs6yi+nVmGh1syvSCsaxz45J6Jbw+9DD6g97+NV67Q==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "GitHub Sponsors",
+                    "url": "https://github.com/sponsors/unifiedjs"
+                },
+                {
+                    "type": "OpenCollective",
+                    "url": "https://opencollective.com/unified"
+                }
+            ],
+            "license": "MIT",
+            "dependencies": {
+                "micromark-util-symbol": "^2.0.0",
+                "micromark-util-types": "^2.0.0"
+            }
+        },
+        "node_modules/micromark-util-encode": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/micromark-util-encode/-/micromark-util-encode-2.0.1.tgz",
+            "integrity": "sha512-c3cVx2y4KqUnwopcO9b/SCdo2O67LwJJ/UyqGfbigahfegL9myoEFoDYZgkT7f36T0bLrM9hZTAaAyH+PCAXjw==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "GitHub Sponsors",
+                    "url": "https://github.com/sponsors/unifiedjs"
+                },
+                {
+                    "type": "OpenCollective",
+                    "url": "https://opencollective.com/unified"
+                }
+            ],
+            "license": "MIT"
+        },
+        "node_modules/micromark-util-sanitize-uri": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-2.0.1.tgz",
+            "integrity": "sha512-9N9IomZ/YuGGZZmQec1MbgxtlgougxTodVwDzzEouPKo3qFWvymFHWcnDi2vzV1ff6kas9ucW+o3yzJK9YB1AQ==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "GitHub Sponsors",
+                    "url": "https://github.com/sponsors/unifiedjs"
+                },
+                {
+                    "type": "OpenCollective",
+                    "url": "https://opencollective.com/unified"
+                }
+            ],
+            "license": "MIT",
+            "dependencies": {
+                "micromark-util-character": "^2.0.0",
+                "micromark-util-encode": "^2.0.0",
+                "micromark-util-symbol": "^2.0.0"
+            }
+        },
+        "node_modules/micromark-util-symbol": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.1.tgz",
+            "integrity": "sha512-vs5t8Apaud9N28kgCrRUdEed4UJ+wWNvicHLPxCa9ENlYuAY31M0ETy5y1vA33YoNPDFTghEbnh6efaE8h4x0Q==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "GitHub Sponsors",
+                    "url": "https://github.com/sponsors/unifiedjs"
+                },
+                {
+                    "type": "OpenCollective",
+                    "url": "https://opencollective.com/unified"
+                }
+            ],
+            "license": "MIT"
+        },
+        "node_modules/micromark-util-types": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/micromark-util-types/-/micromark-util-types-2.0.2.tgz",
+            "integrity": "sha512-Yw0ECSpJoViF1qTU4DC6NwtC4aWGt1EkzaQB8KPPyCRR8z9TWeV0HbEFGTO+ZY1wB22zmxnJqhPyTpOVCpeHTA==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "GitHub Sponsors",
+                    "url": "https://github.com/sponsors/unifiedjs"
+                },
+                {
+                    "type": "OpenCollective",
+                    "url": "https://opencollective.com/unified"
+                }
+            ],
+            "license": "MIT"
+        },
+        "node_modules/minisearch": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmjs.org/minisearch/-/minisearch-7.2.0.tgz",
+            "integrity": "sha512-dqT2XBYUOZOiC5t2HRnwADjhNS2cecp9u+TJRiJ1Qp/f5qjkeT5APcGPjHw+bz89Ms8Jp+cG4AlE+QZ/QnDglg==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/mitt": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.1.tgz",
+            "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/nanoid": {
+            "version": "3.3.11",
+            "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
+            "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/ai"
+                }
+            ],
+            "license": "MIT",
+            "bin": {
+                "nanoid": "bin/nanoid.cjs"
+            },
+            "engines": {
+                "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+            }
+        },
+        "node_modules/oniguruma-to-es": {
+            "version": "3.1.1",
+            "resolved": "https://registry.npmjs.org/oniguruma-to-es/-/oniguruma-to-es-3.1.1.tgz",
+            "integrity": "sha512-bUH8SDvPkH3ho3dvwJwfonjlQ4R80vjyvrU8YpxuROddv55vAEJrTuCuCVUhhsHbtlD9tGGbaNApGQckXhS8iQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "emoji-regex-xs": "^1.0.0",
+                "regex": "^6.0.1",
+                "regex-recursion": "^6.0.2"
+            }
+        },
+        "node_modules/parent-module": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-2.0.0.tgz",
+            "integrity": "sha512-uo0Z9JJeWzv8BG+tRcapBKNJ0dro9cLyczGzulS6EfeyAdeC9sbojtW6XwvYxJkEne9En+J2XEl4zyglVeIwFg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "callsites": "^3.1.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/perfect-debounce": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/perfect-debounce/-/perfect-debounce-1.0.0.tgz",
+            "integrity": "sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/picocolors": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+            "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/picomatch": {
+            "version": "4.0.3",
+            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+            "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/jonschlinkert"
+            }
+        },
+        "node_modules/postcss": {
+            "version": "8.5.6",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz",
+            "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/postcss/"
+                },
+                {
+                    "type": "tidelift",
+                    "url": "https://tidelift.com/funding/github/npm/postcss"
+                },
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/ai"
+                }
+            ],
+            "license": "MIT",
+            "dependencies": {
+                "nanoid": "^3.3.11",
+                "picocolors": "^1.1.1",
+                "source-map-js": "^1.2.1"
+            },
+            "engines": {
+                "node": "^10 || ^12 || >=14"
+            }
+        },
+        "node_modules/preact": {
+            "version": "10.27.2",
+            "resolved": "https://registry.npmjs.org/preact/-/preact-10.27.2.tgz",
+            "integrity": "sha512-5SYSgFKSyhCbk6SrXyMpqjb5+MQBgfvEKE/OC+PujcY34sOpqtr+0AZQtPYx5IA6VxynQ7rUPCtKzyovpj9Bpg==",
+            "dev": true,
+            "license": "MIT",
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/preact"
+            }
+        },
+        "node_modules/prettier": {
+            "version": "3.6.2",
+            "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz",
+            "integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==",
+            "dev": true,
+            "license": "MIT",
+            "bin": {
+                "prettier": "bin/prettier.cjs"
+            },
+            "engines": {
+                "node": ">=14"
+            },
+            "funding": {
+                "url": "https://github.com/prettier/prettier?sponsor=1"
+            }
+        },
+        "node_modules/property-information": {
+            "version": "7.1.0",
+            "resolved": "https://registry.npmjs.org/property-information/-/property-information-7.1.0.tgz",
+            "integrity": "sha512-TwEZ+X+yCJmYfL7TPUOcvBZ4QfoT5YenQiJuX//0th53DE6w0xxLEtfK3iyryQFddXuvkIk51EEgrJQ0WJkOmQ==",
+            "dev": true,
+            "license": "MIT",
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/wooorm"
+            }
+        },
+        "node_modules/regex": {
+            "version": "6.0.1",
+            "resolved": "https://registry.npmjs.org/regex/-/regex-6.0.1.tgz",
+            "integrity": "sha512-uorlqlzAKjKQZ5P+kTJr3eeJGSVroLKoHmquUj4zHWuR+hEyNqlXsSKlYYF5F4NI6nl7tWCs0apKJ0lmfsXAPA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "regex-utilities": "^2.3.0"
+            }
+        },
+        "node_modules/regex-recursion": {
+            "version": "6.0.2",
+            "resolved": "https://registry.npmjs.org/regex-recursion/-/regex-recursion-6.0.2.tgz",
+            "integrity": "sha512-0YCaSCq2VRIebiaUviZNs0cBz1kg5kVS2UKUfNIx8YVs1cN3AV7NTctO5FOKBA+UT2BPJIWZauYHPqJODG50cg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "regex-utilities": "^2.3.0"
+            }
+        },
+        "node_modules/regex-utilities": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/regex-utilities/-/regex-utilities-2.3.0.tgz",
+            "integrity": "sha512-8VhliFJAWRaUiVvREIiW2NXXTmHs4vMNnSzuJVhscgmGav3g9VDxLrQndI3dZZVVdp0ZO/5v0xmX516/7M9cng==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/resolve-from": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+            "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/rfdc": {
+            "version": "1.4.1",
+            "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz",
+            "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/rollup": {
+            "version": "4.53.3",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.53.3.tgz",
+            "integrity": "sha512-w8GmOxZfBmKknvdXU1sdM9NHcoQejwF/4mNgj2JuEEdRaHwwF12K7e9eXn1nLZ07ad+du76mkVsyeb2rKGllsA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/estree": "1.0.8"
+            },
+            "bin": {
+                "rollup": "dist/bin/rollup"
+            },
+            "engines": {
+                "node": ">=18.0.0",
+                "npm": ">=8.0.0"
+            },
+            "optionalDependencies": {
+                "@rollup/rollup-android-arm-eabi": "4.53.3",
+                "@rollup/rollup-android-arm64": "4.53.3",
+                "@rollup/rollup-darwin-arm64": "4.53.3",
+                "@rollup/rollup-darwin-x64": "4.53.3",
+                "@rollup/rollup-freebsd-arm64": "4.53.3",
+                "@rollup/rollup-freebsd-x64": "4.53.3",
+                "@rollup/rollup-linux-arm-gnueabihf": "4.53.3",
+                "@rollup/rollup-linux-arm-musleabihf": "4.53.3",
+                "@rollup/rollup-linux-arm64-gnu": "4.53.3",
+                "@rollup/rollup-linux-arm64-musl": "4.53.3",
+                "@rollup/rollup-linux-loong64-gnu": "4.53.3",
+                "@rollup/rollup-linux-ppc64-gnu": "4.53.3",
+                "@rollup/rollup-linux-riscv64-gnu": "4.53.3",
+                "@rollup/rollup-linux-riscv64-musl": "4.53.3",
+                "@rollup/rollup-linux-s390x-gnu": "4.53.3",
+                "@rollup/rollup-linux-x64-gnu": "4.53.3",
+                "@rollup/rollup-linux-x64-musl": "4.53.3",
+                "@rollup/rollup-openharmony-arm64": "4.53.3",
+                "@rollup/rollup-win32-arm64-msvc": "4.53.3",
+                "@rollup/rollup-win32-ia32-msvc": "4.53.3",
+                "@rollup/rollup-win32-x64-gnu": "4.53.3",
+                "@rollup/rollup-win32-x64-msvc": "4.53.3",
+                "fsevents": "~2.3.2"
+            }
+        },
+        "node_modules/search-insights": {
+            "version": "2.17.3",
+            "resolved": "https://registry.npmjs.org/search-insights/-/search-insights-2.17.3.tgz",
+            "integrity": "sha512-RQPdCYTa8A68uM2jwxoY842xDhvx3E5LFL1LxvxCNMev4o5mLuokczhzjAgGwUZBAmOKZknArSxLKmXtIi2AxQ==",
+            "dev": true,
+            "license": "MIT",
+            "peer": true
+        },
+        "node_modules/semver": {
+            "version": "7.7.3",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
+            "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
+            "dev": true,
+            "license": "ISC",
+            "bin": {
+                "semver": "bin/semver.js"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/shiki": {
+            "version": "2.5.0",
+            "resolved": "https://registry.npmjs.org/shiki/-/shiki-2.5.0.tgz",
+            "integrity": "sha512-mI//trrsaiCIPsja5CNfsyNOqgAZUb6VpJA+340toL42UpzQlXpwRV9nch69X6gaUxrr9kaOOa6e3y3uAkGFxQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@shikijs/core": "2.5.0",
+                "@shikijs/engine-javascript": "2.5.0",
+                "@shikijs/engine-oniguruma": "2.5.0",
+                "@shikijs/langs": "2.5.0",
+                "@shikijs/themes": "2.5.0",
+                "@shikijs/types": "2.5.0",
+                "@shikijs/vscode-textmate": "^10.0.2",
+                "@types/hast": "^3.0.4"
+            }
+        },
+        "node_modules/smol-toml": {
+            "version": "1.5.2",
+            "resolved": "https://registry.npmjs.org/smol-toml/-/smol-toml-1.5.2.tgz",
+            "integrity": "sha512-QlaZEqcAH3/RtNyet1IPIYPsEWAaYyXXv1Krsi+1L/QHppjX4Ifm8MQsBISz9vE8cHicIq3clogsheili5vhaQ==",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "engines": {
+                "node": ">= 18"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/cyyynthia"
+            }
+        },
+        "node_modules/source-map-js": {
+            "version": "1.2.1",
+            "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
+            "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/space-separated-tokens": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-2.0.2.tgz",
+            "integrity": "sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==",
+            "dev": true,
+            "license": "MIT",
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/wooorm"
+            }
+        },
+        "node_modules/speakingurl": {
+            "version": "14.0.1",
+            "resolved": "https://registry.npmjs.org/speakingurl/-/speakingurl-14.0.1.tgz",
+            "integrity": "sha512-1POYv7uv2gXoyGFpBCmpDVSNV74IfsWlDW216UPjbWufNf+bSU6GdbDsxdcxtfwb4xlI3yxzOTKClUosxARYrQ==",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/stringify-entities": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-4.0.4.tgz",
+            "integrity": "sha512-IwfBptatlO+QCJUo19AqvrPNqlVMpW9YEL2LIVY+Rpv2qsjCGxaDLNRgeGsQWJhfItebuJhsGSLjaBbNSQ+ieg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "character-entities-html4": "^2.0.0",
+                "character-entities-legacy": "^3.0.0"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/wooorm"
+            }
+        },
+        "node_modules/superjson": {
+            "version": "2.2.5",
+            "resolved": "https://registry.npmjs.org/superjson/-/superjson-2.2.5.tgz",
+            "integrity": "sha512-zWPTX96LVsA/eVYnqOM2+ofcdPqdS1dAF1LN4TS2/MWuUpfitd9ctTa87wt4xrYnZnkLtS69xpBdSxVBP5Rm6w==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "copy-anything": "^4"
+            },
+            "engines": {
+                "node": ">=16"
+            }
+        },
+        "node_modules/tabbable": {
+            "version": "6.3.0",
+            "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.3.0.tgz",
+            "integrity": "sha512-EIHvdY5bPLuWForiR/AN2Bxngzpuwn1is4asboytXtpTgsArc+WmSJKVLlhdh71u7jFcryDqB2A8lQvj78MkyQ==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/tinyglobby": {
+            "version": "0.2.15",
+            "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz",
+            "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "fdir": "^6.5.0",
+                "picomatch": "^4.0.3"
+            },
+            "engines": {
+                "node": ">=12.0.0"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/SuperchupuDev"
+            }
+        },
+        "node_modules/trim-lines": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/trim-lines/-/trim-lines-3.0.1.tgz",
+            "integrity": "sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==",
+            "dev": true,
+            "license": "MIT",
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/wooorm"
+            }
+        },
+        "node_modules/unist-util-is": {
+            "version": "6.0.1",
+            "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-6.0.1.tgz",
+            "integrity": "sha512-LsiILbtBETkDz8I9p1dQ0uyRUWuaQzd/cuEeS1hoRSyW5E5XGmTzlwY1OrNzzakGowI9Dr/I8HVaw4hTtnxy8g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/unist": "^3.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/unified"
+            }
+        },
+        "node_modules/unist-util-position": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/unist-util-position/-/unist-util-position-5.0.0.tgz",
+            "integrity": "sha512-fucsC7HjXvkB5R3kTCO7kUjRdrS0BJt3M/FPxmHMBOm8JQi2BsHAHFsy27E0EolP8rp0NzXsJ+jNPyDWvOJZPA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/unist": "^3.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/unified"
+            }
+        },
+        "node_modules/unist-util-stringify-position": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-4.0.0.tgz",
+            "integrity": "sha512-0ASV06AAoKCDkS2+xw5RXJywruurpbC4JZSm7nr7MOt1ojAzvyyaO+UxZf18j8FCF6kmzCZKcAgN/yu2gm2XgQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/unist": "^3.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/unified"
+            }
+        },
+        "node_modules/unist-util-visit": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-5.0.0.tgz",
+            "integrity": "sha512-MR04uvD+07cwl/yhVuVWAtw+3GOR/knlL55Nd/wAdblk27GCVt3lqpTivy/tkJcZoNPzTwS1Y+KMojlLDhoTzg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/unist": "^3.0.0",
+                "unist-util-is": "^6.0.0",
+                "unist-util-visit-parents": "^6.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/unified"
+            }
+        },
+        "node_modules/unist-util-visit-parents": {
+            "version": "6.0.2",
+            "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-6.0.2.tgz",
+            "integrity": "sha512-goh1s1TBrqSqukSc8wrjwWhL0hiJxgA8m4kFxGlQ+8FYQ3C/m11FcTs4YYem7V664AhHVvgoQLk890Ssdsr2IQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/unist": "^3.0.0",
+                "unist-util-is": "^6.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/unified"
+            }
+        },
+        "node_modules/vfile": {
+            "version": "6.0.3",
+            "resolved": "https://registry.npmjs.org/vfile/-/vfile-6.0.3.tgz",
+            "integrity": "sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/unist": "^3.0.0",
+                "vfile-message": "^4.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/unified"
+            }
+        },
+        "node_modules/vfile-message": {
+            "version": "4.0.3",
+            "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-4.0.3.tgz",
+            "integrity": "sha512-QTHzsGd1EhbZs4AsQ20JX1rC3cOlt/IWJruk893DfLRr57lcnOeMaWG4K0JrRta4mIJZKth2Au3mM3u03/JWKw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/unist": "^3.0.0",
+                "unist-util-stringify-position": "^4.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/unified"
+            }
+        },
+        "node_modules/vite": {
+            "version": "5.4.21",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.21.tgz",
+            "integrity": "sha512-o5a9xKjbtuhY6Bi5S3+HvbRERmouabWbyUcpXXUA1u+GNUKoROi9byOJ8M0nHbHYHkYICiMlqxkg1KkYmm25Sw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "esbuild": "^0.21.3",
+                "postcss": "^8.4.43",
+                "rollup": "^4.20.0"
+            },
+            "bin": {
+                "vite": "bin/vite.js"
+            },
+            "engines": {
+                "node": "^18.0.0 || >=20.0.0"
+            },
+            "funding": {
+                "url": "https://github.com/vitejs/vite?sponsor=1"
+            },
+            "optionalDependencies": {
+                "fsevents": "~2.3.3"
+            },
+            "peerDependencies": {
+                "@types/node": "^18.0.0 || >=20.0.0",
+                "less": "*",
+                "lightningcss": "^1.21.0",
+                "sass": "*",
+                "sass-embedded": "*",
+                "stylus": "*",
+                "sugarss": "*",
+                "terser": "^5.4.0"
+            },
+            "peerDependenciesMeta": {
+                "@types/node": {
+                    "optional": true
+                },
+                "less": {
+                    "optional": true
+                },
+                "lightningcss": {
+                    "optional": true
+                },
+                "sass": {
+                    "optional": true
+                },
+                "sass-embedded": {
+                    "optional": true
+                },
+                "stylus": {
+                    "optional": true
+                },
+                "sugarss": {
+                    "optional": true
+                },
+                "terser": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/vitepress": {
+            "version": "1.6.4",
+            "resolved": "https://registry.npmjs.org/vitepress/-/vitepress-1.6.4.tgz",
+            "integrity": "sha512-+2ym1/+0VVrbhNyRoFFesVvBvHAVMZMK0rw60E3X/5349M1GuVdKeazuksqopEdvkKwKGs21Q729jX81/bkBJg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@docsearch/css": "3.8.2",
+                "@docsearch/js": "3.8.2",
+                "@iconify-json/simple-icons": "^1.2.21",
+                "@shikijs/core": "^2.1.0",
+                "@shikijs/transformers": "^2.1.0",
+                "@shikijs/types": "^2.1.0",
+                "@types/markdown-it": "^14.1.2",
+                "@vitejs/plugin-vue": "^5.2.1",
+                "@vue/devtools-api": "^7.7.0",
+                "@vue/shared": "^3.5.13",
+                "@vueuse/core": "^12.4.0",
+                "@vueuse/integrations": "^12.4.0",
+                "focus-trap": "^7.6.4",
+                "mark.js": "8.11.1",
+                "minisearch": "^7.1.1",
+                "shiki": "^2.1.0",
+                "vite": "^5.4.14",
+                "vue": "^3.5.13"
+            },
+            "bin": {
+                "vitepress": "bin/vitepress.js"
+            },
+            "peerDependencies": {
+                "markdown-it-mathjax3": "^4",
+                "postcss": "^8"
+            },
+            "peerDependenciesMeta": {
+                "markdown-it-mathjax3": {
+                    "optional": true
+                },
+                "postcss": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/vscode-languageserver-textdocument": {
+            "version": "1.0.12",
+            "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.12.tgz",
+            "integrity": "sha512-cxWNPesCnQCcMPeenjKKsOCKQZ/L6Tv19DTRIGuLWe32lyzWhihGVJ/rcckZXJxfdKCFvRLS3fpBIsV/ZGX4zA==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/vscode-uri": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.1.0.tgz",
+            "integrity": "sha512-/BpdSx+yCQGnCvecbyXdxHDkuk55/G3xwnC0GqY4gmQ3j+A+g8kzzgB4Nk/SINjqn6+waqw3EgbVF2QKExkRxQ==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/vue": {
+            "version": "3.5.24",
+            "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.24.tgz",
+            "integrity": "sha512-uTHDOpVQTMjcGgrqFPSb8iO2m1DUvo+WbGqoXQz8Y1CeBYQ0FXf2z1gLRaBtHjlRz7zZUBHxjVB5VTLzYkvftg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@vue/compiler-dom": "3.5.24",
+                "@vue/compiler-sfc": "3.5.24",
+                "@vue/runtime-dom": "3.5.24",
+                "@vue/server-renderer": "3.5.24",
+                "@vue/shared": "3.5.24"
+            },
+            "peerDependencies": {
+                "typescript": "*"
+            },
+            "peerDependenciesMeta": {
+                "typescript": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/xdg-basedir": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-5.1.0.tgz",
+            "integrity": "sha512-GCPAHLvrIH13+c0SuacwvRYj2SxJXQ4kaVTT5xgL3kPrz56XxkF21IGhjSE1+W0aw7gpBWRGXLCPnPby6lSpmQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/yaml": {
+            "version": "2.8.1",
+            "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.1.tgz",
+            "integrity": "sha512-lcYcMxX2PO9XMGvAJkJ3OsNMw+/7FKes7/hgerGUYWIoWu5j/+YQqcZr5JnPZWzOsEBgMbSbiSTn/dv/69Mkpw==",
+            "dev": true,
+            "license": "ISC",
+            "bin": {
+                "yaml": "bin.mjs"
+            },
+            "engines": {
+                "node": ">= 14.6"
+            }
+        },
+        "node_modules/zwitch": {
+            "version": "2.0.4",
+            "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-2.0.4.tgz",
+            "integrity": "sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==",
+            "dev": true,
+            "license": "MIT",
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/wooorm"
+            }
         }
     }
-    },
-    "node_modules/@esbuild/linux-x64": {
-    "version": "0.21.5",
-    "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
-    "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
-    "cpu": [
-        "x64"
-    ],
-    "dev": true,
-    "license": "MIT",
-    "optional": true,
-    "os": [
-        "linux"
-    ],
-    "engines": {
-        "node": ">=12"
-    }
-    },
-    "node_modules/@iconify-json/simple-icons": {
-    "version": "1.2.59",
-    "resolved": "https://registry.npmjs.org/@iconify-json/simple-icons/-/simple-icons-1.2.59.tgz",
-    "integrity": "sha512-fYx/InyQsWFW4wVxWka3CGDJ6m/fXoTqWBSl+oA3FBXO5RhPAb6S3Y5bRgCPnrYevErH8VjAL0TZevIqlN2PhQ==",
-    "dev": true,
-    "license": "CC0-1.0",
-    "dependencies": {
-        "@iconify/types": "*"
-    }
-    },
-    "node_modules/@iconify/types": {
-    "version": "2.0.0",
-    "resolved": "https://registry.npmjs.org/@iconify/types/-/types-2.0.0.tgz",
-    "integrity": "sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@jridgewell/sourcemap-codec": {
-    "version": "1.5.5",
-    "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
-    "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@rollup/rollup-linux-x64-gnu": {
-    "version": "4.53.3",
-    "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.53.3.tgz",
-    "integrity": "sha512-3EhFi1FU6YL8HTUJZ51imGJWEX//ajQPfqWLI3BQq4TlvHy4X0MOr5q3D2Zof/ka0d5FNdPwZXm3Yyib/UEd+w==",
-    "cpu": [
-        "x64"
-    ],
-    "dev": true,
-    "license": "MIT",
-    "optional": true,
-    "os": [
-        "linux"
-    ]
-    },
-    "node_modules/@rollup/rollup-linux-x64-musl": {
-    "version": "4.53.3",
-    "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.53.3.tgz",
-    "integrity": "sha512-eoROhjcc6HbZCJr+tvVT8X4fW3/5g/WkGvvmwz/88sDtSJzO7r/blvoBDgISDiCjDRZmHpwud7h+6Q9JxFwq1Q==",
-    "cpu": [
-        "x64"
-    ],
-    "dev": true,
-    "license": "MIT",
-    "optional": true,
-    "os": [
-        "linux"
-    ]
-    },
-    "node_modules/@shikijs/core": {
-    "version": "2.5.0",
-    "resolved": "https://registry.npmjs.org/@shikijs/core/-/core-2.5.0.tgz",
-    "integrity": "sha512-uu/8RExTKtavlpH7XqnVYBrfBkUc20ngXiX9NSrBhOVZYv/7XQRKUyhtkeflY5QsxC0GbJThCerruZfsUaSldg==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@shikijs/engine-javascript": "2.5.0",
-        "@shikijs/engine-oniguruma": "2.5.0",
-        "@shikijs/types": "2.5.0",
-        "@shikijs/vscode-textmate": "^10.0.2",
-        "@types/hast": "^3.0.4",
-        "hast-util-to-html": "^9.0.4"
-    }
-    },
-    "node_modules/@shikijs/engine-javascript": {
-    "version": "2.5.0",
-    "resolved": "https://registry.npmjs.org/@shikijs/engine-javascript/-/engine-javascript-2.5.0.tgz",
-    "integrity": "sha512-VjnOpnQf8WuCEZtNUdjjwGUbtAVKuZkVQ/5cHy/tojVVRIRtlWMYVjyWhxOmIq05AlSOv72z7hRNRGVBgQOl0w==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@shikijs/types": "2.5.0",
-        "@shikijs/vscode-textmate": "^10.0.2",
-        "oniguruma-to-es": "^3.1.0"
-    }
-    },
-    "node_modules/@shikijs/engine-oniguruma": {
-    "version": "2.5.0",
-    "resolved": "https://registry.npmjs.org/@shikijs/engine-oniguruma/-/engine-oniguruma-2.5.0.tgz",
-    "integrity": "sha512-pGd1wRATzbo/uatrCIILlAdFVKdxImWJGQ5rFiB5VZi2ve5xj3Ax9jny8QvkaV93btQEwR/rSz5ERFpC5mKNIw==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@shikijs/types": "2.5.0",
-        "@shikijs/vscode-textmate": "^10.0.2"
-    }
-    },
-    "node_modules/@shikijs/langs": {
-    "version": "2.5.0",
-    "resolved": "https://registry.npmjs.org/@shikijs/langs/-/langs-2.5.0.tgz",
-    "integrity": "sha512-Qfrrt5OsNH5R+5tJ/3uYBBZv3SuGmnRPejV9IlIbFH3HTGLDlkqgHymAlzklVmKBjAaVmkPkyikAV/sQ1wSL+w==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@shikijs/types": "2.5.0"
-    }
-    },
-    "node_modules/@shikijs/themes": {
-    "version": "2.5.0",
-    "resolved": "https://registry.npmjs.org/@shikijs/themes/-/themes-2.5.0.tgz",
-    "integrity": "sha512-wGrk+R8tJnO0VMzmUExHR+QdSaPUl/NKs+a4cQQRWyoc3YFbUzuLEi/KWK1hj+8BfHRKm2jNhhJck1dfstJpiw==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@shikijs/types": "2.5.0"
-    }
-    },
-    "node_modules/@shikijs/transformers": {
-    "version": "2.5.0",
-    "resolved": "https://registry.npmjs.org/@shikijs/transformers/-/transformers-2.5.0.tgz",
-    "integrity": "sha512-SI494W5X60CaUwgi8u4q4m4s3YAFSxln3tzNjOSYqq54wlVgz0/NbbXEb3mdLbqMBztcmS7bVTaEd2w0qMmfeg==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@shikijs/core": "2.5.0",
-        "@shikijs/types": "2.5.0"
-    }
-    },
-    "node_modules/@shikijs/types": {
-    "version": "2.5.0",
-    "resolved": "https://registry.npmjs.org/@shikijs/types/-/types-2.5.0.tgz",
-    "integrity": "sha512-ygl5yhxki9ZLNuNpPitBWvcy9fsSKKaRuO4BAlMyagszQidxcpLAr0qiW/q43DtSIDxO6hEbtYLiFZNXO/hdGw==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@shikijs/vscode-textmate": "^10.0.2",
-        "@types/hast": "^3.0.4"
-    }
-    },
-    "node_modules/@shikijs/vscode-textmate": {
-    "version": "10.0.2",
-    "resolved": "https://registry.npmjs.org/@shikijs/vscode-textmate/-/vscode-textmate-10.0.2.tgz",
-    "integrity": "sha512-83yeghZ2xxin3Nj8z1NMd/NCuca+gsYXswywDy5bHvwlWL8tpTQmzGeUuHd9FC3E/SBEMvzJRwWEOz5gGes9Qg==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@types/estree": {
-    "version": "1.0.8",
-    "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
-    "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@types/hast": {
-    "version": "3.0.4",
-    "resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.4.tgz",
-    "integrity": "sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@types/unist": "*"
-    }
-    },
-    "node_modules/@types/linkify-it": {
-    "version": "5.0.0",
-    "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-5.0.0.tgz",
-    "integrity": "sha512-sVDA58zAw4eWAffKOaQH5/5j3XeayukzDk+ewSsnv3p4yJEZHCCzMDiZM8e0OUrRvmpGZ85jf4yDHkHsgBNr9Q==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@types/markdown-it": {
-    "version": "14.1.2",
-    "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-14.1.2.tgz",
-    "integrity": "sha512-promo4eFwuiW+TfGxhi+0x3czqTYJkG8qB17ZUJiVF10Xm7NLVRSLUsfRTU/6h1e24VvRnXCx+hG7li58lkzog==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@types/linkify-it": "^5",
-        "@types/mdurl": "^2"
-    }
-    },
-    "node_modules/@types/mdast": {
-    "version": "4.0.4",
-    "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-4.0.4.tgz",
-    "integrity": "sha512-kGaNbPh1k7AFzgpud/gMdvIm5xuECykRR+JnWKQno9TAXVa6WIVCGTPvYGekIDL4uwCZQSYbUxNBSb1aUo79oA==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@types/unist": "*"
-    }
-    },
-    "node_modules/@types/mdurl": {
-    "version": "2.0.0",
-    "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-2.0.0.tgz",
-    "integrity": "sha512-RGdgjQUZba5p6QEFAVx2OGb8rQDL/cPRG7GiedRzMcJ1tYnUANBncjbSB1NRGwbvjcPeikRABz2nshyPk1bhWg==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@types/unist": {
-    "version": "3.0.3",
-    "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz",
-    "integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@types/web-bluetooth": {
-    "version": "0.0.21",
-    "resolved": "https://registry.npmjs.org/@types/web-bluetooth/-/web-bluetooth-0.0.21.tgz",
-    "integrity": "sha512-oIQLCGWtcFZy2JW77j9k8nHzAOpqMHLQejDA48XXMWH6tjCQHz5RCFz1bzsmROyL6PUm+LLnUiI4BCn221inxA==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@ungap/structured-clone": {
-    "version": "1.3.0",
-    "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.0.tgz",
-    "integrity": "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==",
-    "dev": true,
-    "license": "ISC"
-    },
-    "node_modules/@vitejs/plugin-vue": {
-    "version": "5.2.4",
-    "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-5.2.4.tgz",
-    "integrity": "sha512-7Yx/SXSOcQq5HiiV3orevHUFn+pmMB4cgbEkDYgnkUWb0WfeQ/wa2yFv6D5ICiCQOVpjA7vYDXrC7AGO8yjDHA==",
-    "dev": true,
-    "license": "MIT",
-    "engines": {
-        "node": "^18.0.0 || >=20.0.0"
-    },
-    "peerDependencies": {
-        "vite": "^5.0.0 || ^6.0.0",
-        "vue": "^3.2.25"
-    }
-    },
-    "node_modules/@vue/compiler-core": {
-    "version": "3.5.24",
-    "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.24.tgz",
-    "integrity": "sha512-eDl5H57AOpNakGNAkFDH+y7kTqrQpJkZFXhWZQGyx/5Wh7B1uQYvcWkvZi11BDhscPgj8N7XV3oRwiPnx1Vrig==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@babel/parser": "^7.28.5",
-        "@vue/shared": "3.5.24",
-        "entities": "^4.5.0",
-        "estree-walker": "^2.0.2",
-        "source-map-js": "^1.2.1"
-    }
-    },
-    "node_modules/@vue/compiler-dom": {
-    "version": "3.5.24",
-    "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.24.tgz",
-    "integrity": "sha512-1QHGAvs53gXkWdd3ZMGYuvQFXHW4ksKWPG8HP8/2BscrbZ0brw183q2oNWjMrSWImYLHxHrx1ItBQr50I/q2zw==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@vue/compiler-core": "3.5.24",
-        "@vue/shared": "3.5.24"
-    }
-    },
-    "node_modules/@vue/compiler-sfc": {
-    "version": "3.5.24",
-    "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.24.tgz",
-    "integrity": "sha512-8EG5YPRgmTB+YxYBM3VXy8zHD9SWHUJLIGPhDovo3Z8VOgvP+O7UP5vl0J4BBPWYD9vxtBabzW1EuEZ+Cqs14g==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@babel/parser": "^7.28.5",
-        "@vue/compiler-core": "3.5.24",
-        "@vue/compiler-dom": "3.5.24",
-        "@vue/compiler-ssr": "3.5.24",
-        "@vue/shared": "3.5.24",
-        "estree-walker": "^2.0.2",
-        "magic-string": "^0.30.21",
-        "postcss": "^8.5.6",
-        "source-map-js": "^1.2.1"
-    }
-    },
-    "node_modules/@vue/compiler-ssr": {
-    "version": "3.5.24",
-    "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.24.tgz",
-    "integrity": "sha512-trOvMWNBMQ/odMRHW7Ae1CdfYx+7MuiQu62Jtu36gMLXcaoqKvAyh+P73sYG9ll+6jLB6QPovqoKGGZROzkFFg==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@vue/compiler-dom": "3.5.24",
-        "@vue/shared": "3.5.24"
-    }
-    },
-    "node_modules/@vue/devtools-api": {
-    "version": "7.7.9",
-    "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-7.7.9.tgz",
-    "integrity": "sha512-kIE8wvwlcZ6TJTbNeU2HQNtaxLx3a84aotTITUuL/4bzfPxzajGBOoqjMhwZJ8L9qFYDU/lAYMEEm11dnZOD6g==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@vue/devtools-kit": "^7.7.9"
-    }
-    },
-    "node_modules/@vue/devtools-kit": {
-    "version": "7.7.9",
-    "resolved": "https://registry.npmjs.org/@vue/devtools-kit/-/devtools-kit-7.7.9.tgz",
-    "integrity": "sha512-PyQ6odHSgiDVd4hnTP+aDk2X4gl2HmLDfiyEnn3/oV+ckFDuswRs4IbBT7vacMuGdwY/XemxBoh302ctbsptuA==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@vue/devtools-shared": "^7.7.9",
-        "birpc": "^2.3.0",
-        "hookable": "^5.5.3",
-        "mitt": "^3.0.1",
-        "perfect-debounce": "^1.0.0",
-        "speakingurl": "^14.0.1",
-        "superjson": "^2.2.2"
-    }
-    },
-    "node_modules/@vue/devtools-shared": {
-    "version": "7.7.9",
-    "resolved": "https://registry.npmjs.org/@vue/devtools-shared/-/devtools-shared-7.7.9.tgz",
-    "integrity": "sha512-iWAb0v2WYf0QWmxCGy0seZNDPdO3Sp5+u78ORnyeonS6MT4PC7VPrryX2BpMJrwlDeaZ6BD4vP4XKjK0SZqaeA==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "rfdc": "^1.4.1"
-    }
-    },
-    "node_modules/@vue/reactivity": {
-    "version": "3.5.24",
-    "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.24.tgz",
-    "integrity": "sha512-BM8kBhtlkkbnyl4q+HiF5R5BL0ycDPfihowulm02q3WYp2vxgPcJuZO866qa/0u3idbMntKEtVNuAUp5bw4teg==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@vue/shared": "3.5.24"
-    }
-    },
-    "node_modules/@vue/runtime-core": {
-    "version": "3.5.24",
-    "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.24.tgz",
-    "integrity": "sha512-RYP/byyKDgNIqfX/gNb2PB55dJmM97jc9wyF3jK7QUInYKypK2exmZMNwnjueWwGceEkP6NChd3D2ZVEp9undQ==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@vue/reactivity": "3.5.24",
-        "@vue/shared": "3.5.24"
-    }
-    },
-    "node_modules/@vue/runtime-dom": {
-    "version": "3.5.24",
-    "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.24.tgz",
-    "integrity": "sha512-Z8ANhr/i0XIluonHVjbUkjvn+CyrxbXRIxR7wn7+X7xlcb7dJsfITZbkVOeJZdP8VZwfrWRsWdShH6pngMxRjw==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@vue/reactivity": "3.5.24",
-        "@vue/runtime-core": "3.5.24",
-        "@vue/shared": "3.5.24",
-        "csstype": "^3.1.3"
-    }
-    },
-    "node_modules/@vue/server-renderer": {
-    "version": "3.5.24",
-    "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.24.tgz",
-    "integrity": "sha512-Yh2j2Y4G/0/4z/xJ1Bad4mxaAk++C2v4kaa8oSYTMJBJ00/ndPuxCnWeot0/7/qafQFLh5pr6xeV6SdMcE/G1w==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@vue/compiler-ssr": "3.5.24",
-        "@vue/shared": "3.5.24"
-    },
-    "peerDependencies": {
-        "vue": "3.5.24"
-    }
-    },
-    "node_modules/@vue/shared": {
-    "version": "3.5.24",
-    "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.24.tgz",
-    "integrity": "sha512-9cwHL2EsJBdi8NY22pngYYWzkTDhld6fAD6jlaeloNGciNSJL6bLpbxVgXl96X00Jtc6YWQv96YA/0sxex/k1A==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/@vueuse/core": {
-    "version": "12.8.2",
-    "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-12.8.2.tgz",
-    "integrity": "sha512-HbvCmZdzAu3VGi/pWYm5Ut+Kd9mn1ZHnn4L5G8kOQTPs/IwIAmJoBrmYk2ckLArgMXZj0AW3n5CAejLUO+PhdQ==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@types/web-bluetooth": "^0.0.21",
-        "@vueuse/metadata": "12.8.2",
-        "@vueuse/shared": "12.8.2",
-        "vue": "^3.5.13"
-    },
-    "funding": {
-        "url": "https://github.com/sponsors/antfu"
-    }
-    },
-    "node_modules/@vueuse/integrations": {
-    "version": "12.8.2",
-    "resolved": "https://registry.npmjs.org/@vueuse/integrations/-/integrations-12.8.2.tgz",
-    "integrity": "sha512-fbGYivgK5uBTRt7p5F3zy6VrETlV9RtZjBqd1/HxGdjdckBgBM4ugP8LHpjolqTj14TXTxSK1ZfgPbHYyGuH7g==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@vueuse/core": "12.8.2",
-        "@vueuse/shared": "12.8.2",
-        "vue": "^3.5.13"
-    },
-    "funding": {
-        "url": "https://github.com/sponsors/antfu"
-    },
-    "peerDependencies": {
-        "async-validator": "^4",
-        "axios": "^1",
-        "change-case": "^5",
-        "drauu": "^0.4",
-        "focus-trap": "^7",
-        "fuse.js": "^7",
-        "idb-keyval": "^6",
-        "jwt-decode": "^4",
-        "nprogress": "^0.2",
-        "qrcode": "^1.5",
-        "sortablejs": "^1",
-        "universal-cookie": "^7"
-    },
-    "peerDependenciesMeta": {
-        "async-validator": {
-        "optional": true
-        },
-        "axios": {
-        "optional": true
-        },
-        "change-case": {
-        "optional": true
-        },
-        "drauu": {
-        "optional": true
-        },
-        "focus-trap": {
-        "optional": true
-        },
-        "fuse.js": {
-        "optional": true
-        },
-        "idb-keyval": {
-        "optional": true
-        },
-        "jwt-decode": {
-        "optional": true
-        },
-        "nprogress": {
-        "optional": true
-        },
-        "qrcode": {
-        "optional": true
-        },
-        "sortablejs": {
-        "optional": true
-        },
-        "universal-cookie": {
-        "optional": true
-        }
-    }
-    },
-    "node_modules/@vueuse/metadata": {
-    "version": "12.8.2",
-    "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-12.8.2.tgz",
-    "integrity": "sha512-rAyLGEuoBJ/Il5AmFHiziCPdQzRt88VxR+Y/A/QhJ1EWtWqPBBAxTAFaSkviwEuOEZNtW8pvkPgoCZQ+HxqW1A==",
-    "dev": true,
-    "license": "MIT",
-    "funding": {
-        "url": "https://github.com/sponsors/antfu"
-    }
-    },
-    "node_modules/@vueuse/shared": {
-    "version": "12.8.2",
-    "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-12.8.2.tgz",
-    "integrity": "sha512-dznP38YzxZoNloI0qpEfpkms8knDtaoQ6Y/sfS0L7Yki4zh40LFHEhur0odJC6xTHG5dxWVPiUWBXn+wCG2s5w==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "vue": "^3.5.13"
-    },
-    "funding": {
-        "url": "https://github.com/sponsors/antfu"
-    }
-    },
-    "node_modules/algoliasearch": {
-    "version": "5.44.0",
-    "resolved": "https://registry.npmjs.org/algoliasearch/-/algoliasearch-5.44.0.tgz",
-    "integrity": "sha512-f8IpsbdQjzTjr/4mJ/jv5UplrtyMnnciGax6/B0OnLCs2/GJTK13O4Y7Ff1AvJVAaztanH+m5nzPoUq6EAy+aA==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@algolia/abtesting": "1.10.0",
-        "@algolia/client-abtesting": "5.44.0",
-        "@algolia/client-analytics": "5.44.0",
-        "@algolia/client-common": "5.44.0",
-        "@algolia/client-insights": "5.44.0",
-        "@algolia/client-personalization": "5.44.0",
-        "@algolia/client-query-suggestions": "5.44.0",
-        "@algolia/client-search": "5.44.0",
-        "@algolia/ingestion": "1.44.0",
-        "@algolia/monitoring": "1.44.0",
-        "@algolia/recommend": "5.44.0",
-        "@algolia/requester-browser-xhr": "5.44.0",
-        "@algolia/requester-fetch": "5.44.0",
-        "@algolia/requester-node-http": "5.44.0"
-    },
-    "engines": {
-        "node": ">= 14.0.0"
-    }
-    },
-    "node_modules/array-timsort": {
-    "version": "1.0.3",
-    "resolved": "https://registry.npmjs.org/array-timsort/-/array-timsort-1.0.3.tgz",
-    "integrity": "sha512-/+3GRL7dDAGEfM6TseQk/U+mi18TU2Ms9I3UlLdUMhz2hbvGNTKdj9xniwXfUqgYhHxRx0+8UnKkvlNwVU+cWQ==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/birpc": {
-    "version": "2.8.0",
-    "resolved": "https://registry.npmjs.org/birpc/-/birpc-2.8.0.tgz",
-    "integrity": "sha512-Bz2a4qD/5GRhiHSwj30c/8kC8QGj12nNDwz3D4ErQ4Xhy35dsSDvF+RA/tWpjyU0pdGtSDiEk6B5fBGE1qNVhw==",
-    "dev": true,
-    "license": "MIT",
-    "funding": {
-        "url": "https://github.com/sponsors/antfu"
-    }
-    },
-    "node_modules/callsites": {
-    "version": "3.1.0",
-    "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-    "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-    "dev": true,
-    "license": "MIT",
-    "engines": {
-        "node": ">=6"
-    }
-    },
-    "node_modules/ccount": {
-    "version": "2.0.1",
-    "resolved": "https://registry.npmjs.org/ccount/-/ccount-2.0.1.tgz",
-    "integrity": "sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==",
-    "dev": true,
-    "license": "MIT",
-    "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-    }
-    },
-    "node_modules/chalk": {
-    "version": "5.6.2",
-    "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.6.2.tgz",
-    "integrity": "sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==",
-    "dev": true,
-    "license": "MIT",
-    "engines": {
-        "node": "^12.17.0 || ^14.13 || >=16.0.0"
-    },
-    "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-    }
-    },
-    "node_modules/chalk-template": {
-    "version": "1.1.2",
-    "resolved": "https://registry.npmjs.org/chalk-template/-/chalk-template-1.1.2.tgz",
-    "integrity": "sha512-2bxTP2yUH7AJj/VAXfcA+4IcWGdQ87HwBANLt5XxGTeomo8yG0y95N1um9i5StvhT/Bl0/2cARA5v1PpPXUxUA==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "chalk": "^5.2.0"
-    },
-    "engines": {
-        "node": ">=14.16"
-    },
-    "funding": {
-        "url": "https://github.com/chalk/chalk-template?sponsor=1"
-    }
-    },
-    "node_modules/character-entities-html4": {
-    "version": "2.1.0",
-    "resolved": "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-2.1.0.tgz",
-    "integrity": "sha512-1v7fgQRj6hnSwFpq1Eu0ynr/CDEw0rXo2B61qXrLNdHZmPKgb7fqS1a2JwF0rISo9q77jDI8VMEHoApn8qDoZA==",
-    "dev": true,
-    "license": "MIT",
-    "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-    }
-    },
-    "node_modules/character-entities-legacy": {
-    "version": "3.0.0",
-    "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-3.0.0.tgz",
-    "integrity": "sha512-RpPp0asT/6ufRm//AJVwpViZbGM/MkjQFxJccQRHmISF/22NBtsHqAWmL+/pmkPWoIUJdWyeVleTl1wydHATVQ==",
-    "dev": true,
-    "license": "MIT",
-    "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-    }
-    },
-    "node_modules/clear-module": {
-    "version": "4.1.2",
-    "resolved": "https://registry.npmjs.org/clear-module/-/clear-module-4.1.2.tgz",
-    "integrity": "sha512-LWAxzHqdHsAZlPlEyJ2Poz6AIs384mPeqLVCru2p0BrP9G/kVGuhNyZYClLO6cXlnuJjzC8xtsJIuMjKqLXoAw==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "parent-module": "^2.0.0",
-        "resolve-from": "^5.0.0"
-    },
-    "engines": {
-        "node": ">=8"
-    },
-    "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-    }
-    },
-    "node_modules/comma-separated-tokens": {
-    "version": "2.0.3",
-    "resolved": "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-2.0.3.tgz",
-    "integrity": "sha512-Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg==",
-    "dev": true,
-    "license": "MIT",
-    "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-    }
-    },
-    "node_modules/commander": {
-    "version": "14.0.2",
-    "resolved": "https://registry.npmjs.org/commander/-/commander-14.0.2.tgz",
-    "integrity": "sha512-TywoWNNRbhoD0BXs1P3ZEScW8W5iKrnbithIl0YH+uCmBd0QpPOA8yc82DS3BIE5Ma6FnBVUsJ7wVUDz4dvOWQ==",
-    "dev": true,
-    "license": "MIT",
-    "engines": {
-        "node": ">=20"
-    }
-    },
-    "node_modules/comment-json": {
-    "version": "4.4.1",
-    "resolved": "https://registry.npmjs.org/comment-json/-/comment-json-4.4.1.tgz",
-    "integrity": "sha512-r1To31BQD5060QdkC+Iheai7gHwoSZobzunqkf2/kQ6xIAfJyrKNAFUwdKvkK7Qgu7pVTKQEa7ok7Ed3ycAJgg==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "array-timsort": "^1.0.3",
-        "core-util-is": "^1.0.3",
-        "esprima": "^4.0.1"
-    },
-    "engines": {
-        "node": ">= 6"
-    }
-    },
-    "node_modules/copy-anything": {
-    "version": "4.0.5",
-    "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-4.0.5.tgz",
-    "integrity": "sha512-7Vv6asjS4gMOuILabD3l739tsaxFQmC+a7pLZm02zyvs8p977bL3zEgq3yDk5rn9B0PbYgIv++jmHcuUab4RhA==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "is-what": "^5.2.0"
-    },
-    "engines": {
-        "node": ">=18"
-    },
-    "funding": {
-        "url": "https://github.com/sponsors/mesqueeb"
-    }
-    },
-    "node_modules/core-util-is": {
-    "version": "1.0.3",
-    "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
-    "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/cspell": {
-    "version": "9.3.2",
-    "resolved": "https://registry.npmjs.org/cspell/-/cspell-9.3.2.tgz",
-    "integrity": "sha512-3xFyVSTYrYa/QJzLfzsCRMkMXqOsytP8E26DuGrVMJQoLPFmbOXNNtnMu4wrtr17QVloxpvutW77U4vb2L/LDQ==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@cspell/cspell-json-reporter": "9.3.2",
-        "@cspell/cspell-pipe": "9.3.2",
-        "@cspell/cspell-types": "9.3.2",
-        "@cspell/dynamic-import": "9.3.2",
-        "@cspell/url": "9.3.2",
-        "chalk": "^5.6.2",
-        "chalk-template": "^1.1.2",
-        "commander": "^14.0.2",
-        "cspell-config-lib": "9.3.2",
-        "cspell-dictionary": "9.3.2",
-        "cspell-gitignore": "9.3.2",
-        "cspell-glob": "9.3.2",
-        "cspell-io": "9.3.2",
-        "cspell-lib": "9.3.2",
-        "fast-json-stable-stringify": "^2.1.0",
-        "flatted": "^3.3.3",
-        "semver": "^7.7.3",
-        "tinyglobby": "^0.2.15"
-    },
-    "bin": {
-        "cspell": "bin.mjs",
-        "cspell-esm": "bin.mjs"
-    },
-    "engines": {
-        "node": ">=20"
-    },
-    "funding": {
-        "url": "https://github.com/streetsidesoftware/cspell?sponsor=1"
-    }
-    },
-    "node_modules/cspell-config-lib": {
-    "version": "9.3.2",
-    "resolved": "https://registry.npmjs.org/cspell-config-lib/-/cspell-config-lib-9.3.2.tgz",
-    "integrity": "sha512-zXhmA4rqgWQRTVijI+g/mgiep76TvTO4d+P3CHwcqLG57BKVzoW+jkO4qDLC+Neh4b8+CcNWEIr3w16BfuEJAA==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@cspell/cspell-types": "9.3.2",
-        "comment-json": "^4.4.1",
-        "smol-toml": "^1.5.2",
-        "yaml": "^2.8.1"
-    },
-    "engines": {
-        "node": ">=20"
-    }
-    },
-    "node_modules/cspell-dictionary": {
-    "version": "9.3.2",
-    "resolved": "https://registry.npmjs.org/cspell-dictionary/-/cspell-dictionary-9.3.2.tgz",
-    "integrity": "sha512-E3YhOhZzZt1a+AEbFV2B3THCyZ576PDg0mDNUDrU1Y65SyIhf4DC6itfPoAb6R3FI/DI218RqWZg/FTT8lJ2gA==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@cspell/cspell-pipe": "9.3.2",
-        "@cspell/cspell-types": "9.3.2",
-        "cspell-trie-lib": "9.3.2",
-        "fast-equals": "^5.3.3"
-    },
-    "engines": {
-        "node": ">=20"
-    }
-    },
-    "node_modules/cspell-gitignore": {
-    "version": "9.3.2",
-    "resolved": "https://registry.npmjs.org/cspell-gitignore/-/cspell-gitignore-9.3.2.tgz",
-    "integrity": "sha512-G2bLR+Dfb9GX4Sdm75GfCCa9V/sQYkRbLckuCuVmJxvcDB0xfczAtb6TfAXIziF3oUI6cOB1g+PoNLWBelcK5w==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@cspell/url": "9.3.2",
-        "cspell-glob": "9.3.2",
-        "cspell-io": "9.3.2"
-    },
-    "bin": {
-        "cspell-gitignore": "bin.mjs"
-    },
-    "engines": {
-        "node": ">=20"
-    }
-    },
-    "node_modules/cspell-glob": {
-    "version": "9.3.2",
-    "resolved": "https://registry.npmjs.org/cspell-glob/-/cspell-glob-9.3.2.tgz",
-    "integrity": "sha512-TuSupENEKyOCupOUZ3vnPxaTOghxY/rD1JIkb8e5kjzRprYVilO/rYqEk/52iLwJVd+4Npe8fNhR3KhU7u/UUg==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@cspell/url": "9.3.2",
-        "picomatch": "^4.0.3"
-    },
-    "engines": {
-        "node": ">=20"
-    }
-    },
-    "node_modules/cspell-grammar": {
-    "version": "9.3.2",
-    "resolved": "https://registry.npmjs.org/cspell-grammar/-/cspell-grammar-9.3.2.tgz",
-    "integrity": "sha512-ysonrFu9vJvF/derDlEjUfmvLeCfNOWPh00t6Yh093AKrJFoWQiyaS/5bEN/uB5/n1sa4k3ItnWvuTp3+YuZsA==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@cspell/cspell-pipe": "9.3.2",
-        "@cspell/cspell-types": "9.3.2"
-    },
-    "bin": {
-        "cspell-grammar": "bin.mjs"
-    },
-    "engines": {
-        "node": ">=20"
-    }
-    },
-    "node_modules/cspell-io": {
-    "version": "9.3.2",
-    "resolved": "https://registry.npmjs.org/cspell-io/-/cspell-io-9.3.2.tgz",
-    "integrity": "sha512-ahoULCp0j12TyXXmIcdO/7x65A/2mzUQO1IkOC65OXEbNT+evt0yswSO5Nr1F6kCHDuEKc46EZWwsYAzj78pMg==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@cspell/cspell-service-bus": "9.3.2",
-        "@cspell/url": "9.3.2"
-    },
-    "engines": {
-        "node": ">=20"
-    }
-    },
-    "node_modules/cspell-lib": {
-    "version": "9.3.2",
-    "resolved": "https://registry.npmjs.org/cspell-lib/-/cspell-lib-9.3.2.tgz",
-    "integrity": "sha512-kdk11kib68zNANNICuOA8h4oA9kENQUAdeX/uvT4+7eHbHHV8WSgjXm4k4o/pRIbg164UJTX/XxKb/65ftn5jw==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@cspell/cspell-bundled-dicts": "9.3.2",
-        "@cspell/cspell-pipe": "9.3.2",
-        "@cspell/cspell-resolver": "9.3.2",
-        "@cspell/cspell-types": "9.3.2",
-        "@cspell/dynamic-import": "9.3.2",
-        "@cspell/filetypes": "9.3.2",
-        "@cspell/strong-weak-map": "9.3.2",
-        "@cspell/url": "9.3.2",
-        "clear-module": "^4.1.2",
-        "cspell-config-lib": "9.3.2",
-        "cspell-dictionary": "9.3.2",
-        "cspell-glob": "9.3.2",
-        "cspell-grammar": "9.3.2",
-        "cspell-io": "9.3.2",
-        "cspell-trie-lib": "9.3.2",
-        "env-paths": "^3.0.0",
-        "gensequence": "^8.0.8",
-        "import-fresh": "^3.3.1",
-        "resolve-from": "^5.0.0",
-        "vscode-languageserver-textdocument": "^1.0.12",
-        "vscode-uri": "^3.1.0",
-        "xdg-basedir": "^5.1.0"
-    },
-    "engines": {
-        "node": ">=20"
-    }
-    },
-    "node_modules/cspell-trie-lib": {
-    "version": "9.3.2",
-    "resolved": "https://registry.npmjs.org/cspell-trie-lib/-/cspell-trie-lib-9.3.2.tgz",
-    "integrity": "sha512-1Af7Mq9jIccFQyJl/ZCcqQbtJwuDqpQVkk8xfs/92x4OI6gW1iTVRMtsrh0RTw1HZoR8aQD7tRRCiLPf/D+UiQ==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@cspell/cspell-pipe": "9.3.2",
-        "@cspell/cspell-types": "9.3.2",
-        "gensequence": "^8.0.8"
-    },
-    "engines": {
-        "node": ">=20"
-    }
-    },
-    "node_modules/csstype": {
-    "version": "3.2.3",
-    "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.2.3.tgz",
-    "integrity": "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/dequal": {
-    "version": "2.0.3",
-    "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
-    "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==",
-    "dev": true,
-    "license": "MIT",
-    "engines": {
-        "node": ">=6"
-    }
-    },
-    "node_modules/devlop": {
-    "version": "1.1.0",
-    "resolved": "https://registry.npmjs.org/devlop/-/devlop-1.1.0.tgz",
-    "integrity": "sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "dequal": "^2.0.0"
-    },
-    "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-    }
-    },
-    "node_modules/emoji-regex-xs": {
-    "version": "1.0.0",
-    "resolved": "https://registry.npmjs.org/emoji-regex-xs/-/emoji-regex-xs-1.0.0.tgz",
-    "integrity": "sha512-LRlerrMYoIDrT6jgpeZ2YYl/L8EulRTt5hQcYjy5AInh7HWXKimpqx68aknBFpGL2+/IcogTcaydJEgaTmOpDg==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/entities": {
-    "version": "4.5.0",
-    "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
-    "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
-    "dev": true,
-    "license": "BSD-2-Clause",
-    "engines": {
-        "node": ">=0.12"
-    },
-    "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
-    }
-    },
-    "node_modules/env-paths": {
-    "version": "3.0.0",
-    "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-3.0.0.tgz",
-    "integrity": "sha512-dtJUTepzMW3Lm/NPxRf3wP4642UWhjL2sQxc+ym2YMj1m/H2zDNQOlezafzkHwn6sMstjHTwG6iQQsctDW/b1A==",
-    "dev": true,
-    "license": "MIT",
-    "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-    },
-    "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-    }
-    },
-    "node_modules/esbuild": {
-    "version": "0.21.5",
-    "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
-    "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
-    "dev": true,
-    "hasInstallScript": true,
-    "license": "MIT",
-    "bin": {
-        "esbuild": "bin/esbuild"
-    },
-    "engines": {
-        "node": ">=12"
-    },
-    "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.21.5",
-        "@esbuild/android-arm": "0.21.5",
-        "@esbuild/android-arm64": "0.21.5",
-        "@esbuild/android-x64": "0.21.5",
-        "@esbuild/darwin-arm64": "0.21.5",
-        "@esbuild/darwin-x64": "0.21.5",
-        "@esbuild/freebsd-arm64": "0.21.5",
-        "@esbuild/freebsd-x64": "0.21.5",
-        "@esbuild/linux-arm": "0.21.5",
-        "@esbuild/linux-arm64": "0.21.5",
-        "@esbuild/linux-ia32": "0.21.5",
-        "@esbuild/linux-loong64": "0.21.5",
-        "@esbuild/linux-mips64el": "0.21.5",
-        "@esbuild/linux-ppc64": "0.21.5",
-        "@esbuild/linux-riscv64": "0.21.5",
-        "@esbuild/linux-s390x": "0.21.5",
-        "@esbuild/linux-x64": "0.21.5",
-        "@esbuild/netbsd-x64": "0.21.5",
-        "@esbuild/openbsd-x64": "0.21.5",
-        "@esbuild/sunos-x64": "0.21.5",
-        "@esbuild/win32-arm64": "0.21.5",
-        "@esbuild/win32-ia32": "0.21.5",
-        "@esbuild/win32-x64": "0.21.5"
-    }
-    },
-    "node_modules/esprima": {
-    "version": "4.0.1",
-    "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-    "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-    "dev": true,
-    "license": "BSD-2-Clause",
-    "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-    },
-    "engines": {
-        "node": ">=4"
-    }
-    },
-    "node_modules/estree-walker": {
-    "version": "2.0.2",
-    "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
-    "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/fast-equals": {
-    "version": "5.3.3",
-    "resolved": "https://registry.npmjs.org/fast-equals/-/fast-equals-5.3.3.tgz",
-    "integrity": "sha512-/boTcHZeIAQ2r/tL11voclBHDeP9WPxLt+tyAbVSyyXuUFyh0Tne7gJZTqGbxnvj79TjLdCXLOY7UIPhyG5MTw==",
-    "dev": true,
-    "license": "MIT",
-    "engines": {
-        "node": ">=6.0.0"
-    }
-    },
-    "node_modules/fast-json-stable-stringify": {
-    "version": "2.1.0",
-    "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-    "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/fdir": {
-    "version": "6.5.0",
-    "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
-    "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
-    "dev": true,
-    "license": "MIT",
-    "engines": {
-        "node": ">=12.0.0"
-    },
-    "peerDependencies": {
-        "picomatch": "^3 || ^4"
-    },
-    "peerDependenciesMeta": {
-        "picomatch": {
-        "optional": true
-        }
-    }
-    },
-    "node_modules/flatted": {
-    "version": "3.3.3",
-    "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz",
-    "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==",
-    "dev": true,
-    "license": "ISC"
-    },
-    "node_modules/focus-trap": {
-    "version": "7.6.6",
-    "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-7.6.6.tgz",
-    "integrity": "sha512-v/Z8bvMCajtx4mEXmOo7QEsIzlIOqRXTIwgUfsFOF9gEsespdbD0AkPIka1bSXZ8Y8oZ+2IVDQZePkTfEHZl7Q==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "tabbable": "^6.3.0"
-    }
-    },
-    "node_modules/fsevents": {
-    "version": "2.3.3",
-    "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-    "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-    "dev": true,
-    "hasInstallScript": true,
-    "license": "MIT",
-    "optional": true,
-    "os": [
-        "darwin"
-    ],
-    "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-    }
-    },
-    "node_modules/gensequence": {
-    "version": "8.0.8",
-    "resolved": "https://registry.npmjs.org/gensequence/-/gensequence-8.0.8.tgz",
-    "integrity": "sha512-omMVniXEXpdx/vKxGnPRoO2394Otlze28TyxECbFVyoSpZ9H3EO7lemjcB12OpQJzRW4e5tt/dL1rOxry6aMHg==",
-    "dev": true,
-    "license": "MIT",
-    "engines": {
-        "node": ">=20"
-    }
-    },
-    "node_modules/global-directory": {
-    "version": "4.0.1",
-    "resolved": "https://registry.npmjs.org/global-directory/-/global-directory-4.0.1.tgz",
-    "integrity": "sha512-wHTUcDUoZ1H5/0iVqEudYW4/kAlN5cZ3j/bXn0Dpbizl9iaUVeWSHqiOjsgk6OW2bkLclbBjzewBz6weQ1zA2Q==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "ini": "4.1.1"
-    },
-    "engines": {
-        "node": ">=18"
-    },
-    "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-    }
-    },
-    "node_modules/hast-util-to-html": {
-    "version": "9.0.5",
-    "resolved": "https://registry.npmjs.org/hast-util-to-html/-/hast-util-to-html-9.0.5.tgz",
-    "integrity": "sha512-OguPdidb+fbHQSU4Q4ZiLKnzWo8Wwsf5bZfbvu7//a9oTYoqD/fWpe96NuHkoS9h0ccGOTe0C4NGXdtS0iObOw==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@types/hast": "^3.0.0",
-        "@types/unist": "^3.0.0",
-        "ccount": "^2.0.0",
-        "comma-separated-tokens": "^2.0.0",
-        "hast-util-whitespace": "^3.0.0",
-        "html-void-elements": "^3.0.0",
-        "mdast-util-to-hast": "^13.0.0",
-        "property-information": "^7.0.0",
-        "space-separated-tokens": "^2.0.0",
-        "stringify-entities": "^4.0.0",
-        "zwitch": "^2.0.4"
-    },
-    "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-    }
-    },
-    "node_modules/hast-util-whitespace": {
-    "version": "3.0.0",
-    "resolved": "https://registry.npmjs.org/hast-util-whitespace/-/hast-util-whitespace-3.0.0.tgz",
-    "integrity": "sha512-88JUN06ipLwsnv+dVn+OIYOvAuvBMy/Qoi6O7mQHxdPXpjy+Cd6xRkWwux7DKO+4sYILtLBRIKgsdpS2gQc7qw==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@types/hast": "^3.0.0"
-    },
-    "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-    }
-    },
-    "node_modules/hookable": {
-    "version": "5.5.3",
-    "resolved": "https://registry.npmjs.org/hookable/-/hookable-5.5.3.tgz",
-    "integrity": "sha512-Yc+BQe8SvoXH1643Qez1zqLRmbA5rCL+sSmk6TVos0LWVfNIB7PGncdlId77WzLGSIB5KaWgTaNTs2lNVEI6VQ==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/html-void-elements": {
-    "version": "3.0.0",
-    "resolved": "https://registry.npmjs.org/html-void-elements/-/html-void-elements-3.0.0.tgz",
-    "integrity": "sha512-bEqo66MRXsUGxWHV5IP0PUiAWwoEjba4VCzg0LjFJBpchPaTfyfCKTG6bc5F8ucKec3q5y6qOdGyYTSBEvhCrg==",
-    "dev": true,
-    "license": "MIT",
-    "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-    }
-    },
-    "node_modules/import-fresh": {
-    "version": "3.3.1",
-    "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz",
-    "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-    },
-    "engines": {
-        "node": ">=6"
-    },
-    "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-    }
-    },
-    "node_modules/import-fresh/node_modules/parent-module": {
-    "version": "1.0.1",
-    "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-    "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "callsites": "^3.0.0"
-    },
-    "engines": {
-        "node": ">=6"
-    }
-    },
-    "node_modules/import-fresh/node_modules/resolve-from": {
-    "version": "4.0.0",
-    "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-    "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-    "dev": true,
-    "license": "MIT",
-    "engines": {
-        "node": ">=4"
-    }
-    },
-    "node_modules/import-meta-resolve": {
-    "version": "4.2.0",
-    "resolved": "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-4.2.0.tgz",
-    "integrity": "sha512-Iqv2fzaTQN28s/FwZAoFq0ZSs/7hMAHJVX+w8PZl3cY19Pxk6jFFalxQoIfW2826i/fDLXv8IiEZRIT0lDuWcg==",
-    "dev": true,
-    "license": "MIT",
-    "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-    }
-    },
-    "node_modules/ini": {
-    "version": "4.1.1",
-    "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.1.tgz",
-    "integrity": "sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g==",
-    "dev": true,
-    "license": "ISC",
-    "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-    }
-    },
-    "node_modules/is-what": {
-    "version": "5.5.0",
-    "resolved": "https://registry.npmjs.org/is-what/-/is-what-5.5.0.tgz",
-    "integrity": "sha512-oG7cgbmg5kLYae2N5IVd3jm2s+vldjxJzK1pcu9LfpGuQ93MQSzo0okvRna+7y5ifrD+20FE8FvjusyGaz14fw==",
-    "dev": true,
-    "license": "MIT",
-    "engines": {
-        "node": ">=18"
-    },
-    "funding": {
-        "url": "https://github.com/sponsors/mesqueeb"
-    }
-    },
-    "node_modules/magic-string": {
-    "version": "0.30.21",
-    "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz",
-    "integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@jridgewell/sourcemap-codec": "^1.5.5"
-    }
-    },
-    "node_modules/mark.js": {
-    "version": "8.11.1",
-    "resolved": "https://registry.npmjs.org/mark.js/-/mark.js-8.11.1.tgz",
-    "integrity": "sha512-1I+1qpDt4idfgLQG+BNWmrqku+7/2bi5nLf4YwF8y8zXvmfiTBY3PV3ZibfrjBueCByROpuBjLLFCajqkgYoLQ==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/mdast-util-to-hast": {
-    "version": "13.2.1",
-    "resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-13.2.1.tgz",
-    "integrity": "sha512-cctsq2wp5vTsLIcaymblUriiTcZd0CwWtCbLvrOzYCDZoWyMNV8sZ7krj09FSnsiJi3WVsHLM4k6Dq/yaPyCXA==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@types/hast": "^3.0.0",
-        "@types/mdast": "^4.0.0",
-        "@ungap/structured-clone": "^1.0.0",
-        "devlop": "^1.0.0",
-        "micromark-util-sanitize-uri": "^2.0.0",
-        "trim-lines": "^3.0.0",
-        "unist-util-position": "^5.0.0",
-        "unist-util-visit": "^5.0.0",
-        "vfile": "^6.0.0"
-    },
-    "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-    }
-    },
-    "node_modules/micromark-util-character": {
-    "version": "2.1.1",
-    "resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.1.tgz",
-    "integrity": "sha512-wv8tdUTJ3thSFFFJKtpYKOYiGP2+v96Hvk4Tu8KpCAsTMs6yi+nVmGh1syvSCsaxz45J6Jbw+9DD6g97+NV67Q==",
-    "dev": true,
-    "funding": [
-        {
-        "type": "GitHub Sponsors",
-        "url": "https://github.com/sponsors/unifiedjs"
-        },
-        {
-        "type": "OpenCollective",
-        "url": "https://opencollective.com/unified"
-        }
-    ],
-    "license": "MIT",
-    "dependencies": {
-        "micromark-util-symbol": "^2.0.0",
-        "micromark-util-types": "^2.0.0"
-    }
-    },
-    "node_modules/micromark-util-encode": {
-    "version": "2.0.1",
-    "resolved": "https://registry.npmjs.org/micromark-util-encode/-/micromark-util-encode-2.0.1.tgz",
-    "integrity": "sha512-c3cVx2y4KqUnwopcO9b/SCdo2O67LwJJ/UyqGfbigahfegL9myoEFoDYZgkT7f36T0bLrM9hZTAaAyH+PCAXjw==",
-    "dev": true,
-    "funding": [
-        {
-        "type": "GitHub Sponsors",
-        "url": "https://github.com/sponsors/unifiedjs"
-        },
-        {
-        "type": "OpenCollective",
-        "url": "https://opencollective.com/unified"
-        }
-    ],
-    "license": "MIT"
-    },
-    "node_modules/micromark-util-sanitize-uri": {
-    "version": "2.0.1",
-    "resolved": "https://registry.npmjs.org/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-2.0.1.tgz",
-    "integrity": "sha512-9N9IomZ/YuGGZZmQec1MbgxtlgougxTodVwDzzEouPKo3qFWvymFHWcnDi2vzV1ff6kas9ucW+o3yzJK9YB1AQ==",
-    "dev": true,
-    "funding": [
-        {
-        "type": "GitHub Sponsors",
-        "url": "https://github.com/sponsors/unifiedjs"
-        },
-        {
-        "type": "OpenCollective",
-        "url": "https://opencollective.com/unified"
-        }
-    ],
-    "license": "MIT",
-    "dependencies": {
-        "micromark-util-character": "^2.0.0",
-        "micromark-util-encode": "^2.0.0",
-        "micromark-util-symbol": "^2.0.0"
-    }
-    },
-    "node_modules/micromark-util-symbol": {
-    "version": "2.0.1",
-    "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.1.tgz",
-    "integrity": "sha512-vs5t8Apaud9N28kgCrRUdEed4UJ+wWNvicHLPxCa9ENlYuAY31M0ETy5y1vA33YoNPDFTghEbnh6efaE8h4x0Q==",
-    "dev": true,
-    "funding": [
-        {
-        "type": "GitHub Sponsors",
-        "url": "https://github.com/sponsors/unifiedjs"
-        },
-        {
-        "type": "OpenCollective",
-        "url": "https://opencollective.com/unified"
-        }
-    ],
-    "license": "MIT"
-    },
-    "node_modules/micromark-util-types": {
-    "version": "2.0.2",
-    "resolved": "https://registry.npmjs.org/micromark-util-types/-/micromark-util-types-2.0.2.tgz",
-    "integrity": "sha512-Yw0ECSpJoViF1qTU4DC6NwtC4aWGt1EkzaQB8KPPyCRR8z9TWeV0HbEFGTO+ZY1wB22zmxnJqhPyTpOVCpeHTA==",
-    "dev": true,
-    "funding": [
-        {
-        "type": "GitHub Sponsors",
-        "url": "https://github.com/sponsors/unifiedjs"
-        },
-        {
-        "type": "OpenCollective",
-        "url": "https://opencollective.com/unified"
-        }
-    ],
-    "license": "MIT"
-    },
-    "node_modules/minisearch": {
-    "version": "7.2.0",
-    "resolved": "https://registry.npmjs.org/minisearch/-/minisearch-7.2.0.tgz",
-    "integrity": "sha512-dqT2XBYUOZOiC5t2HRnwADjhNS2cecp9u+TJRiJ1Qp/f5qjkeT5APcGPjHw+bz89Ms8Jp+cG4AlE+QZ/QnDglg==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/mitt": {
-    "version": "3.0.1",
-    "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.1.tgz",
-    "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/nanoid": {
-    "version": "3.3.11",
-    "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
-    "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
-    "dev": true,
-    "funding": [
-        {
-        "type": "github",
-        "url": "https://github.com/sponsors/ai"
-        }
-    ],
-    "license": "MIT",
-    "bin": {
-        "nanoid": "bin/nanoid.cjs"
-    },
-    "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-    }
-    },
-    "node_modules/oniguruma-to-es": {
-    "version": "3.1.1",
-    "resolved": "https://registry.npmjs.org/oniguruma-to-es/-/oniguruma-to-es-3.1.1.tgz",
-    "integrity": "sha512-bUH8SDvPkH3ho3dvwJwfonjlQ4R80vjyvrU8YpxuROddv55vAEJrTuCuCVUhhsHbtlD9tGGbaNApGQckXhS8iQ==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "emoji-regex-xs": "^1.0.0",
-        "regex": "^6.0.1",
-        "regex-recursion": "^6.0.2"
-    }
-    },
-    "node_modules/parent-module": {
-    "version": "2.0.0",
-    "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-2.0.0.tgz",
-    "integrity": "sha512-uo0Z9JJeWzv8BG+tRcapBKNJ0dro9cLyczGzulS6EfeyAdeC9sbojtW6XwvYxJkEne9En+J2XEl4zyglVeIwFg==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "callsites": "^3.1.0"
-    },
-    "engines": {
-        "node": ">=8"
-    }
-    },
-    "node_modules/perfect-debounce": {
-    "version": "1.0.0",
-    "resolved": "https://registry.npmjs.org/perfect-debounce/-/perfect-debounce-1.0.0.tgz",
-    "integrity": "sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/picocolors": {
-    "version": "1.1.1",
-    "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
-    "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
-    "dev": true,
-    "license": "ISC"
-    },
-    "node_modules/picomatch": {
-    "version": "4.0.3",
-    "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-    "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
-    "dev": true,
-    "license": "MIT",
-    "engines": {
-        "node": ">=12"
-    },
-    "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-    }
-    },
-    "node_modules/postcss": {
-    "version": "8.5.6",
-    "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz",
-    "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==",
-    "dev": true,
-    "funding": [
-        {
-        "type": "opencollective",
-        "url": "https://opencollective.com/postcss/"
-        },
-        {
-        "type": "tidelift",
-        "url": "https://tidelift.com/funding/github/npm/postcss"
-        },
-        {
-        "type": "github",
-        "url": "https://github.com/sponsors/ai"
-        }
-    ],
-    "license": "MIT",
-    "dependencies": {
-        "nanoid": "^3.3.11",
-        "picocolors": "^1.1.1",
-        "source-map-js": "^1.2.1"
-    },
-    "engines": {
-        "node": "^10 || ^12 || >=14"
-    }
-    },
-    "node_modules/preact": {
-    "version": "10.27.2",
-    "resolved": "https://registry.npmjs.org/preact/-/preact-10.27.2.tgz",
-    "integrity": "sha512-5SYSgFKSyhCbk6SrXyMpqjb5+MQBgfvEKE/OC+PujcY34sOpqtr+0AZQtPYx5IA6VxynQ7rUPCtKzyovpj9Bpg==",
-    "dev": true,
-    "license": "MIT",
-    "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/preact"
-    }
-    },
-    "node_modules/prettier": {
-    "version": "3.6.2",
-    "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz",
-    "integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==",
-    "dev": true,
-    "license": "MIT",
-    "bin": {
-        "prettier": "bin/prettier.cjs"
-    },
-    "engines": {
-        "node": ">=14"
-    },
-    "funding": {
-        "url": "https://github.com/prettier/prettier?sponsor=1"
-    }
-    },
-    "node_modules/property-information": {
-    "version": "7.1.0",
-    "resolved": "https://registry.npmjs.org/property-information/-/property-information-7.1.0.tgz",
-    "integrity": "sha512-TwEZ+X+yCJmYfL7TPUOcvBZ4QfoT5YenQiJuX//0th53DE6w0xxLEtfK3iyryQFddXuvkIk51EEgrJQ0WJkOmQ==",
-    "dev": true,
-    "license": "MIT",
-    "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-    }
-    },
-    "node_modules/regex": {
-    "version": "6.0.1",
-    "resolved": "https://registry.npmjs.org/regex/-/regex-6.0.1.tgz",
-    "integrity": "sha512-uorlqlzAKjKQZ5P+kTJr3eeJGSVroLKoHmquUj4zHWuR+hEyNqlXsSKlYYF5F4NI6nl7tWCs0apKJ0lmfsXAPA==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "regex-utilities": "^2.3.0"
-    }
-    },
-    "node_modules/regex-recursion": {
-    "version": "6.0.2",
-    "resolved": "https://registry.npmjs.org/regex-recursion/-/regex-recursion-6.0.2.tgz",
-    "integrity": "sha512-0YCaSCq2VRIebiaUviZNs0cBz1kg5kVS2UKUfNIx8YVs1cN3AV7NTctO5FOKBA+UT2BPJIWZauYHPqJODG50cg==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "regex-utilities": "^2.3.0"
-    }
-    },
-    "node_modules/regex-utilities": {
-    "version": "2.3.0",
-    "resolved": "https://registry.npmjs.org/regex-utilities/-/regex-utilities-2.3.0.tgz",
-    "integrity": "sha512-8VhliFJAWRaUiVvREIiW2NXXTmHs4vMNnSzuJVhscgmGav3g9VDxLrQndI3dZZVVdp0ZO/5v0xmX516/7M9cng==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/resolve-from": {
-    "version": "5.0.0",
-    "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-    "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-    "dev": true,
-    "license": "MIT",
-    "engines": {
-        "node": ">=8"
-    }
-    },
-    "node_modules/rfdc": {
-    "version": "1.4.1",
-    "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz",
-    "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/rollup": {
-    "version": "4.53.3",
-    "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.53.3.tgz",
-    "integrity": "sha512-w8GmOxZfBmKknvdXU1sdM9NHcoQejwF/4mNgj2JuEEdRaHwwF12K7e9eXn1nLZ07ad+du76mkVsyeb2rKGllsA==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@types/estree": "1.0.8"
-    },
-    "bin": {
-        "rollup": "dist/bin/rollup"
-    },
-    "engines": {
-        "node": ">=18.0.0",
-        "npm": ">=8.0.0"
-    },
-    "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.53.3",
-        "@rollup/rollup-android-arm64": "4.53.3",
-        "@rollup/rollup-darwin-arm64": "4.53.3",
-        "@rollup/rollup-darwin-x64": "4.53.3",
-        "@rollup/rollup-freebsd-arm64": "4.53.3",
-        "@rollup/rollup-freebsd-x64": "4.53.3",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.53.3",
-        "@rollup/rollup-linux-arm-musleabihf": "4.53.3",
-        "@rollup/rollup-linux-arm64-gnu": "4.53.3",
-        "@rollup/rollup-linux-arm64-musl": "4.53.3",
-        "@rollup/rollup-linux-loong64-gnu": "4.53.3",
-        "@rollup/rollup-linux-ppc64-gnu": "4.53.3",
-        "@rollup/rollup-linux-riscv64-gnu": "4.53.3",
-        "@rollup/rollup-linux-riscv64-musl": "4.53.3",
-        "@rollup/rollup-linux-s390x-gnu": "4.53.3",
-        "@rollup/rollup-linux-x64-gnu": "4.53.3",
-        "@rollup/rollup-linux-x64-musl": "4.53.3",
-        "@rollup/rollup-openharmony-arm64": "4.53.3",
-        "@rollup/rollup-win32-arm64-msvc": "4.53.3",
-        "@rollup/rollup-win32-ia32-msvc": "4.53.3",
-        "@rollup/rollup-win32-x64-gnu": "4.53.3",
-        "@rollup/rollup-win32-x64-msvc": "4.53.3",
-        "fsevents": "~2.3.2"
-    }
-    },
-    "node_modules/search-insights": {
-    "version": "2.17.3",
-    "resolved": "https://registry.npmjs.org/search-insights/-/search-insights-2.17.3.tgz",
-    "integrity": "sha512-RQPdCYTa8A68uM2jwxoY842xDhvx3E5LFL1LxvxCNMev4o5mLuokczhzjAgGwUZBAmOKZknArSxLKmXtIi2AxQ==",
-    "dev": true,
-    "license": "MIT",
-    "peer": true
-    },
-    "node_modules/semver": {
-    "version": "7.7.3",
-    "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
-    "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
-    "dev": true,
-    "license": "ISC",
-    "bin": {
-        "semver": "bin/semver.js"
-    },
-    "engines": {
-        "node": ">=10"
-    }
-    },
-    "node_modules/shiki": {
-    "version": "2.5.0",
-    "resolved": "https://registry.npmjs.org/shiki/-/shiki-2.5.0.tgz",
-    "integrity": "sha512-mI//trrsaiCIPsja5CNfsyNOqgAZUb6VpJA+340toL42UpzQlXpwRV9nch69X6gaUxrr9kaOOa6e3y3uAkGFxQ==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@shikijs/core": "2.5.0",
-        "@shikijs/engine-javascript": "2.5.0",
-        "@shikijs/engine-oniguruma": "2.5.0",
-        "@shikijs/langs": "2.5.0",
-        "@shikijs/themes": "2.5.0",
-        "@shikijs/types": "2.5.0",
-        "@shikijs/vscode-textmate": "^10.0.2",
-        "@types/hast": "^3.0.4"
-    }
-    },
-    "node_modules/smol-toml": {
-    "version": "1.5.2",
-    "resolved": "https://registry.npmjs.org/smol-toml/-/smol-toml-1.5.2.tgz",
-    "integrity": "sha512-QlaZEqcAH3/RtNyet1IPIYPsEWAaYyXXv1Krsi+1L/QHppjX4Ifm8MQsBISz9vE8cHicIq3clogsheili5vhaQ==",
-    "dev": true,
-    "license": "BSD-3-Clause",
-    "engines": {
-        "node": ">= 18"
-    },
-    "funding": {
-        "url": "https://github.com/sponsors/cyyynthia"
-    }
-    },
-    "node_modules/source-map-js": {
-    "version": "1.2.1",
-    "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
-    "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
-    "dev": true,
-    "license": "BSD-3-Clause",
-    "engines": {
-        "node": ">=0.10.0"
-    }
-    },
-    "node_modules/space-separated-tokens": {
-    "version": "2.0.2",
-    "resolved": "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-2.0.2.tgz",
-    "integrity": "sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==",
-    "dev": true,
-    "license": "MIT",
-    "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-    }
-    },
-    "node_modules/speakingurl": {
-    "version": "14.0.1",
-    "resolved": "https://registry.npmjs.org/speakingurl/-/speakingurl-14.0.1.tgz",
-    "integrity": "sha512-1POYv7uv2gXoyGFpBCmpDVSNV74IfsWlDW216UPjbWufNf+bSU6GdbDsxdcxtfwb4xlI3yxzOTKClUosxARYrQ==",
-    "dev": true,
-    "license": "BSD-3-Clause",
-    "engines": {
-        "node": ">=0.10.0"
-    }
-    },
-    "node_modules/stringify-entities": {
-    "version": "4.0.4",
-    "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-4.0.4.tgz",
-    "integrity": "sha512-IwfBptatlO+QCJUo19AqvrPNqlVMpW9YEL2LIVY+Rpv2qsjCGxaDLNRgeGsQWJhfItebuJhsGSLjaBbNSQ+ieg==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "character-entities-html4": "^2.0.0",
-        "character-entities-legacy": "^3.0.0"
-    },
-    "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-    }
-    },
-    "node_modules/superjson": {
-    "version": "2.2.5",
-    "resolved": "https://registry.npmjs.org/superjson/-/superjson-2.2.5.tgz",
-    "integrity": "sha512-zWPTX96LVsA/eVYnqOM2+ofcdPqdS1dAF1LN4TS2/MWuUpfitd9ctTa87wt4xrYnZnkLtS69xpBdSxVBP5Rm6w==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "copy-anything": "^4"
-    },
-    "engines": {
-        "node": ">=16"
-    }
-    },
-    "node_modules/tabbable": {
-    "version": "6.3.0",
-    "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.3.0.tgz",
-    "integrity": "sha512-EIHvdY5bPLuWForiR/AN2Bxngzpuwn1is4asboytXtpTgsArc+WmSJKVLlhdh71u7jFcryDqB2A8lQvj78MkyQ==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/tinyglobby": {
-    "version": "0.2.15",
-    "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz",
-    "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "fdir": "^6.5.0",
-        "picomatch": "^4.0.3"
-    },
-    "engines": {
-        "node": ">=12.0.0"
-    },
-    "funding": {
-        "url": "https://github.com/sponsors/SuperchupuDev"
-    }
-    },
-    "node_modules/trim-lines": {
-    "version": "3.0.1",
-    "resolved": "https://registry.npmjs.org/trim-lines/-/trim-lines-3.0.1.tgz",
-    "integrity": "sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==",
-    "dev": true,
-    "license": "MIT",
-    "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-    }
-    },
-    "node_modules/unist-util-is": {
-    "version": "6.0.1",
-    "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-6.0.1.tgz",
-    "integrity": "sha512-LsiILbtBETkDz8I9p1dQ0uyRUWuaQzd/cuEeS1hoRSyW5E5XGmTzlwY1OrNzzakGowI9Dr/I8HVaw4hTtnxy8g==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@types/unist": "^3.0.0"
-    },
-    "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-    }
-    },
-    "node_modules/unist-util-position": {
-    "version": "5.0.0",
-    "resolved": "https://registry.npmjs.org/unist-util-position/-/unist-util-position-5.0.0.tgz",
-    "integrity": "sha512-fucsC7HjXvkB5R3kTCO7kUjRdrS0BJt3M/FPxmHMBOm8JQi2BsHAHFsy27E0EolP8rp0NzXsJ+jNPyDWvOJZPA==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@types/unist": "^3.0.0"
-    },
-    "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-    }
-    },
-    "node_modules/unist-util-stringify-position": {
-    "version": "4.0.0",
-    "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-4.0.0.tgz",
-    "integrity": "sha512-0ASV06AAoKCDkS2+xw5RXJywruurpbC4JZSm7nr7MOt1ojAzvyyaO+UxZf18j8FCF6kmzCZKcAgN/yu2gm2XgQ==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@types/unist": "^3.0.0"
-    },
-    "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-    }
-    },
-    "node_modules/unist-util-visit": {
-    "version": "5.0.0",
-    "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-5.0.0.tgz",
-    "integrity": "sha512-MR04uvD+07cwl/yhVuVWAtw+3GOR/knlL55Nd/wAdblk27GCVt3lqpTivy/tkJcZoNPzTwS1Y+KMojlLDhoTzg==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@types/unist": "^3.0.0",
-        "unist-util-is": "^6.0.0",
-        "unist-util-visit-parents": "^6.0.0"
-    },
-    "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-    }
-    },
-    "node_modules/unist-util-visit-parents": {
-    "version": "6.0.2",
-    "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-6.0.2.tgz",
-    "integrity": "sha512-goh1s1TBrqSqukSc8wrjwWhL0hiJxgA8m4kFxGlQ+8FYQ3C/m11FcTs4YYem7V664AhHVvgoQLk890Ssdsr2IQ==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@types/unist": "^3.0.0",
-        "unist-util-is": "^6.0.0"
-    },
-    "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-    }
-    },
-    "node_modules/vfile": {
-    "version": "6.0.3",
-    "resolved": "https://registry.npmjs.org/vfile/-/vfile-6.0.3.tgz",
-    "integrity": "sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@types/unist": "^3.0.0",
-        "vfile-message": "^4.0.0"
-    },
-    "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-    }
-    },
-    "node_modules/vfile-message": {
-    "version": "4.0.3",
-    "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-4.0.3.tgz",
-    "integrity": "sha512-QTHzsGd1EhbZs4AsQ20JX1rC3cOlt/IWJruk893DfLRr57lcnOeMaWG4K0JrRta4mIJZKth2Au3mM3u03/JWKw==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@types/unist": "^3.0.0",
-        "unist-util-stringify-position": "^4.0.0"
-    },
-    "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
-    }
-    },
-    "node_modules/vite": {
-    "version": "5.4.21",
-    "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.21.tgz",
-    "integrity": "sha512-o5a9xKjbtuhY6Bi5S3+HvbRERmouabWbyUcpXXUA1u+GNUKoROi9byOJ8M0nHbHYHkYICiMlqxkg1KkYmm25Sw==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "esbuild": "^0.21.3",
-        "postcss": "^8.4.43",
-        "rollup": "^4.20.0"
-    },
-    "bin": {
-        "vite": "bin/vite.js"
-    },
-    "engines": {
-        "node": "^18.0.0 || >=20.0.0"
-    },
-    "funding": {
-        "url": "https://github.com/vitejs/vite?sponsor=1"
-    },
-    "optionalDependencies": {
-        "fsevents": "~2.3.3"
-    },
-    "peerDependencies": {
-        "@types/node": "^18.0.0 || >=20.0.0",
-        "less": "*",
-        "lightningcss": "^1.21.0",
-        "sass": "*",
-        "sass-embedded": "*",
-        "stylus": "*",
-        "sugarss": "*",
-        "terser": "^5.4.0"
-    },
-    "peerDependenciesMeta": {
-        "@types/node": {
-        "optional": true
-        },
-        "less": {
-        "optional": true
-        },
-        "lightningcss": {
-        "optional": true
-        },
-        "sass": {
-        "optional": true
-        },
-        "sass-embedded": {
-        "optional": true
-        },
-        "stylus": {
-        "optional": true
-        },
-        "sugarss": {
-        "optional": true
-        },
-        "terser": {
-        "optional": true
-        }
-    }
-    },
-    "node_modules/vitepress": {
-    "version": "1.6.4",
-    "resolved": "https://registry.npmjs.org/vitepress/-/vitepress-1.6.4.tgz",
-    "integrity": "sha512-+2ym1/+0VVrbhNyRoFFesVvBvHAVMZMK0rw60E3X/5349M1GuVdKeazuksqopEdvkKwKGs21Q729jX81/bkBJg==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@docsearch/css": "3.8.2",
-        "@docsearch/js": "3.8.2",
-        "@iconify-json/simple-icons": "^1.2.21",
-        "@shikijs/core": "^2.1.0",
-        "@shikijs/transformers": "^2.1.0",
-        "@shikijs/types": "^2.1.0",
-        "@types/markdown-it": "^14.1.2",
-        "@vitejs/plugin-vue": "^5.2.1",
-        "@vue/devtools-api": "^7.7.0",
-        "@vue/shared": "^3.5.13",
-        "@vueuse/core": "^12.4.0",
-        "@vueuse/integrations": "^12.4.0",
-        "focus-trap": "^7.6.4",
-        "mark.js": "8.11.1",
-        "minisearch": "^7.1.1",
-        "shiki": "^2.1.0",
-        "vite": "^5.4.14",
-        "vue": "^3.5.13"
-    },
-    "bin": {
-        "vitepress": "bin/vitepress.js"
-    },
-    "peerDependencies": {
-        "markdown-it-mathjax3": "^4",
-        "postcss": "^8"
-    },
-    "peerDependenciesMeta": {
-        "markdown-it-mathjax3": {
-        "optional": true
-        },
-        "postcss": {
-        "optional": true
-        }
-    }
-    },
-    "node_modules/vscode-languageserver-textdocument": {
-    "version": "1.0.12",
-    "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.12.tgz",
-    "integrity": "sha512-cxWNPesCnQCcMPeenjKKsOCKQZ/L6Tv19DTRIGuLWe32lyzWhihGVJ/rcckZXJxfdKCFvRLS3fpBIsV/ZGX4zA==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/vscode-uri": {
-    "version": "3.1.0",
-    "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.1.0.tgz",
-    "integrity": "sha512-/BpdSx+yCQGnCvecbyXdxHDkuk55/G3xwnC0GqY4gmQ3j+A+g8kzzgB4Nk/SINjqn6+waqw3EgbVF2QKExkRxQ==",
-    "dev": true,
-    "license": "MIT"
-    },
-    "node_modules/vue": {
-    "version": "3.5.24",
-    "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.24.tgz",
-    "integrity": "sha512-uTHDOpVQTMjcGgrqFPSb8iO2m1DUvo+WbGqoXQz8Y1CeBYQ0FXf2z1gLRaBtHjlRz7zZUBHxjVB5VTLzYkvftg==",
-    "dev": true,
-    "license": "MIT",
-    "dependencies": {
-        "@vue/compiler-dom": "3.5.24",
-        "@vue/compiler-sfc": "3.5.24",
-        "@vue/runtime-dom": "3.5.24",
-        "@vue/server-renderer": "3.5.24",
-        "@vue/shared": "3.5.24"
-    },
-    "peerDependencies": {
-        "typescript": "*"
-    },
-    "peerDependenciesMeta": {
-        "typescript": {
-        "optional": true
-        }
-    }
-    },
-    "node_modules/xdg-basedir": {
-    "version": "5.1.0",
-    "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-5.1.0.tgz",
-    "integrity": "sha512-GCPAHLvrIH13+c0SuacwvRYj2SxJXQ4kaVTT5xgL3kPrz56XxkF21IGhjSE1+W0aw7gpBWRGXLCPnPby6lSpmQ==",
-    "dev": true,
-    "license": "MIT",
-    "engines": {
-        "node": ">=12"
-    },
-    "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-    }
-    },
-    "node_modules/yaml": {
-    "version": "2.8.1",
-    "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.1.tgz",
-    "integrity": "sha512-lcYcMxX2PO9XMGvAJkJ3OsNMw+/7FKes7/hgerGUYWIoWu5j/+YQqcZr5JnPZWzOsEBgMbSbiSTn/dv/69Mkpw==",
-    "dev": true,
-    "license": "ISC",
-    "bin": {
-        "yaml": "bin.mjs"
-    },
-    "engines": {
-        "node": ">= 14.6"
-    }
-    },
-    "node_modules/zwitch": {
-    "version": "2.0.4",
-    "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-2.0.4.tgz",
-    "integrity": "sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==",
-    "dev": true,
-    "license": "MIT",
-    "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-    }
-    }
-  }
 }
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 00000000..a669e690
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,6 @@
+{
+    "name": "vault-link",
+    "lockfileVersion": 3,
+    "requires": true,
+    "packages": {}
+}
diff --git a/rustfmt.toml b/rustfmt.toml
new file mode 100644
index 00000000..a9107050
--- /dev/null
+++ b/rustfmt.toml
@@ -0,0 +1,11 @@
+# Rustfmt configuration
+# This should match the .editorconfig settings
+
+# Use spaces for indentation (matches .editorconfig indent_style = space)
+hard_tabs = false
+
+# Use 4 spaces for indentation (matches .editorconfig indent_size = 4)
+tab_spaces = 4
+
+# Use Unix line endings (matches .editorconfig end_of_line = lf)
+newline_style = "Unix"
diff --git a/scripts/bump-version.sh b/scripts/bump-version.sh
index fb953e2a..bea3d982 100755
--- a/scripts/bump-version.sh
+++ b/scripts/bump-version.sh
@@ -35,7 +35,8 @@ cd ..
 
 cp frontend/obsidian-plugin/manifest.json manifest.json  # for BRAT, otherwise it wouldn't update
 
-git ls-files | xargs npx eclint fix
+# Format all files across the project (frontend and backend)
+npx -C frontend prettier --write "**/*.{ts,js,json,md,yml,yaml}"
 
 # Commit and tag
 git add .
diff --git a/scripts/check.sh b/scripts/check.sh
index 7c3c87e5..2ee0dd62 100755
--- a/scripts/check.sh
+++ b/scripts/check.sh
@@ -30,8 +30,11 @@ fi
 which cargo-machete || cargo install cargo-machete
 cargo machete --with-metadata
 
+cd ..
+scripts/update-api-types.sh # this will dirty up the git state if not up-to-date
+
 echo "Running checks in frontend"
-cd ../frontend
+cd frontend
 
 if [[ "$FIX_MODE" == true ]]; then
     npm install
@@ -45,10 +48,11 @@ cd frontend
 npm run build
 npm run test
 npm run lint
+cd ..
 
-# Use git ls-files to only check tracked files, respecting .gitignore
-# We always run in fix mode and then check with git status
-git ls-files | xargs npx eclint fix
+# Format all files across the project (frontend and backend)
+# Prettier respects .gitignore by default
+npx -C frontend prettier --write "**/*.{ts,js,json,md,yml,yaml}"
 
 if [[ "$FIX_MODE" == false ]] && [[ $(git status --porcelain) ]]; then
     git status --porcelain
@@ -56,6 +60,4 @@ if [[ "$FIX_MODE" == false ]] && [[ $(git status --porcelain) ]]; then
     exit 1
 fi
 
-cd ..
-
 echo "Success"
diff --git a/scripts/clean-up.sh b/scripts/clean-up.sh
index 4dfbf4a0..dcf400bb 100755
--- a/scripts/clean-up.sh
+++ b/scripts/clean-up.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-rm -rf sync-server/databases
+rm -rf /host/tmp/vaultlink-e2e-databases
 rm -rf logs
diff --git a/scripts/e2e.sh b/scripts/e2e.sh
index 6c66e835..7ab8d90c 100755
--- a/scripts/e2e.sh
+++ b/scripts/e2e.sh
@@ -19,35 +19,51 @@ process_count=$1
 
 mkdir -p logs
 
+# Build and restart the server
+echo "Building server..."
+cd sync-server
+cargo build --release
+
+# Kill any existing server process
+echo "Stopping existing server..."
+pkill -f "sync_server" 2>/dev/null || true
+sleep 1
+
+# Clean databases (uses tmpfs via /dev/shm for zero disk I/O)
+echo "Cleaning databases..."
+rm -rf /host/tmp/vaultlink-e2e-databases
+
+# Start the server in the background
+echo "Starting server..."
+./target/release/sync_server config-e2e.yml &
+server_pid=$!
+echo "Server started with PID: $server_pid"
+
+# Ensure server is killed on script exit
+cleanup_server() {
+    if [ -n "$server_pid" ]; then
+        echo "Stopping server (PID: $server_pid)..."
+        kill $server_pid 2>/dev/null || true
+        wait $server_pid 2>/dev/null || true
+        server_pid=""
+    fi
+}
+trap cleanup_server EXIT
+
+cd ..
+
 cd frontend
 npm ci
 npm run build
 
 ../scripts/utils/wait-for-server.sh
 
-cd ..
-scripts/update-api-types.sh
-if [[ $(git status --porcelain) ]]; then
-    git status --porcelain
-    echo "Failing CI because the working directory is not clean after generating api types"
-    exit 1
-fi
-cd frontend
-
 pids=()
 for i in $(seq 1 $process_count); do
-    # Create a named pipe for this process
-    pipe="/tmp/vaultlink_pipe_$$_$i"
-    mkfifo "$pipe"
-
-    # Start the node process writing to the pipe
-    node test-client/dist/cli.js > "$pipe" 2>&1 &
+    node test-client/dist/cli.js > "../logs/log_${i}.log" 2>&1 &
     pid=$!
     pids+=($pid)
-    echo "Started process $i with PID: $pid"
-
-    # Read from pipe, prefix with PID
-    (sed "s/^/[PID $pid] /" < "$pipe" > "../logs/log_${i}.log"; rm "$pipe") &
+    echo "Started process $i with PID: $pid (log: logs/log_${i}.log)"
 done
 
 cd ..
@@ -75,10 +91,25 @@ print_failed_log() {
     return 1
 }
 
-echo "Monitoring $process_count processes"
+E2E_TIMEOUT=${2:-3600}
+start_time=$(date +%s)
+echo "Monitoring $process_count processes (timeout: ${E2E_TIMEOUT}s)"
 
 # Monitor processes
 while true; do
+    # Script-level timeout to prevent indefinite hangs
+    current_time=$(date +%s)
+    elapsed=$((current_time - start_time))
+    if [ $elapsed -ge $E2E_TIMEOUT ]; then
+        echo "E2E timeout reached (${E2E_TIMEOUT}s). Killing remaining processes."
+        for pid in "${pids[@]}"; do
+            if [ -n "$pid" ]; then
+                kill $pid 2>/dev/null || true
+            fi
+        done
+        exit 1
+    fi
+
     if print_failed_log; then
         # Kill remaining processes
         for pid in "${pids[@]}"; do
@@ -99,6 +130,7 @@ while true; do
     done
 
     if $all_done; then
+        cleanup_server
         echo "All processes completed successfully"
         exit 0
     fi
diff --git a/scripts/update-api-types.sh b/scripts/update-api-types.sh
index 4b947ee8..3f4a9e2a 100755
--- a/scripts/update-api-types.sh
+++ b/scripts/update-api-types.sh
@@ -8,9 +8,15 @@ cd sync-server
 cargo test export_bindings
 cd -
 
+# Both target directories contain only generated bindings — wipe and copy
+rm -f frontend/sync-client/src/services/types/*.ts
+rm -f frontend/history-ui/src/lib/types/*.ts
 cp -r sync-server/bindings/* frontend/sync-client/src/services/types/
+cp -r sync-server/bindings/* frontend/history-ui/src/lib/types/
 
 cd frontend
 npm run lint
-git ls-files | xargs npx eclint fix
-cd -
+cd ..
+
+# Format all files across the project (frontend and backend)
+npx -C frontend prettier --write "**/*.{ts,js,json,md,yml,yaml}"
diff --git a/scripts/utils/check-node.sh b/scripts/utils/check-node.sh
index c9ede47e..d93f2f27 100755
--- a/scripts/utils/check-node.sh
+++ b/scripts/utils/check-node.sh
@@ -2,8 +2,10 @@
 
 set -e
 
+TARGET_NODE_VERSION=25
+
 node_version=$(node -v | sed 's/^v\([0-9]*\).*/\1/')
-if [ "$node_version" != "22" ]; then
-    echo "Error: This script requires Node.js version 22, found: $node_version"
+if [ "$node_version" != "$TARGET_NODE_VERSION" ]; then
+    echo "Error: This script requires Node.js version $TARGET_NODE_VERSION, found: $node_version"
     exit 1
 fi
diff --git a/scripts/utils/wait-for-server.sh b/scripts/utils/wait-for-server.sh
index 7824c405..71103477 100755
--- a/scripts/utils/wait-for-server.sh
+++ b/scripts/utils/wait-for-server.sh
@@ -2,14 +2,14 @@
 
 set -e
 
-SERVER_URL="http://localhost:3000"
+SERVER_URL="http://localhost:3010"
 MAX_RETRIES=30
 RETRY_INTERVAL_IN_SECONDS=5
 
 echo "Waiting for $SERVER_URL to become available..."
 count=0
 while [ $count -lt $MAX_RETRIES ]; do
-  if curl -s -f -o /dev/null $SERVER_URL; then
+  if curl -s -o /dev/null $SERVER_URL; then
     echo "$SERVER_URL is now available!"
     break
   fi

From 0e3132f96c826eaa26f577f6f5e92c6d074505b3 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 9 May 2026 10:15:21 +0100
Subject: [PATCH 756/761] Add deterministic-tests (#190)

Reviewed-on: https://home.schmelczer.dev/git/git/andras/vault-link/pulls/190
Co-authored-by: Andras Schmelczer <andras@schmelczer.dev>
Co-committed-by: Andras Schmelczer <andras@schmelczer.dev>
---
 frontend/deterministic-tests/README.md        | 118 +++++
 frontend/deterministic-tests/package.json     |  23 +
 frontend/deterministic-tests/src/cli.ts       | 243 +++++++++
 frontend/deterministic-tests/src/consts.ts    |  17 +
 .../src/deterministic-agent.ts                | 483 ++++++++++++++++++
 .../src/managed-websocket.ts                  | 245 +++++++++
 .../deterministic-tests/src/parse-args.ts     |  43 ++
 .../src/prefixed-logger.ts                    |  28 +
 .../src/run-with-concurrency.ts               |  33 ++
 .../deterministic-tests/src/server-control.ts | 296 +++++++++++
 .../deterministic-tests/src/server-manager.ts |  71 +++
 .../src/test-definition.ts                    |  49 ++
 .../deterministic-tests/src/test-registry.ts  | 245 +++++++++
 .../deterministic-tests/src/test-runner.ts    | 399 +++++++++++++++
 ...inary-pending-create-not-displaced.test.ts |  40 ++
 .../tests/binary-to-text-transition.test.ts   |  97 ++++
 ...chup-create-and-update-not-skipped.test.ts |  66 +++
 ...sce-update-remote-update-data-loss.test.ts |  59 +++
 ...esced-remote-update-watermark-loss.test.ts |  53 ++
 ...urrent-delete-during-remote-update.test.ts |  32 ++
 ...oncurrent-edit-exact-same-position.test.ts |  49 ++
 ...-and-create-at-target-create-first.test.ts |  49 ++
 ...-and-create-at-target-rename-first.test.ts |  52 ++
 .../concurrent-rename-first-wins.test.ts      |  61 +++
 .../concurrent-rename-same-target.test.ts     |  39 ++
 ...concurrent-update-diff-consistency.test.ts |  51 ++
 .../src/tests/create-delete-noop.test.ts      |  27 +
 .../create-during-reconciliation.test.ts      |  50 ++
 .../src/tests/create-merge-delete.test.ts     |  37 ++
 ...ate-merge-preserves-renamed-update.test.ts |  59 +++
 .../create-rename-create-same-path.test.ts    |  34 ++
 .../create-rename-response-skips-file.test.ts |  36 ++
 ...reate-update-coalesce-server-pause.test.ts |  32 ++
 ...lete-by-other-client-then-recreate.test.ts |  40 ++
 .../delete-during-pending-create.test.ts      |  35 ++
 .../delete-recreate-concurrent-update.test.ts |  42 ++
 .../delete-recreate-different-content.test.ts |  54 ++
 .../tests/delete-recreate-same-path.test.ts   |  34 ++
 ...-create-with-stale-deleting-record.test.ts |  52 ++
 .../src/tests/delete-rename-conflict.test.ts  |  43 ++
 .../displaced-file-not-marked-deleted.test.ts |  38 ++
 .../src/tests/double-offline-cycle.test.ts    |  77 +++
 .../idempotency-after-server-pause.test.ts    |  33 ++
 .../tests/interrupted-delete-retry.test.ts    |  29 ++
 ...ocal-edit-lost-during-create-merge.test.ts |  41 ++
 ...ocal-rename-survives-remote-rename.test.ts |  80 +++
 ...ocal-update-survives-remote-rename.test.ts |  69 +++
 ...mc-cross-create-rename-same-target.test.ts |  46 ++
 .../mc-delete-then-offline-rename.test.ts     |  39 ++
 .../mc-multi-delete-offline-rename.test.ts    |  49 ++
 ...three-client-rename-offline-update.test.ts |  41 ++
 ...date-response-survives-user-rename.test.ts |  77 +++
 .../move-and-concurrent-remote-update.test.ts |  43 ++
 .../src/tests/move-chain-three-files.test.ts  |  42 ++
 .../move-identical-content-ambiguity.test.ts  |  44 ++
 .../move-preserves-remote-update.test.ts      |  48 ++
 .../move-remote-update-reverts-rename.test.ts |  38 ++
 .../tests/move-then-delete-stale-path.test.ts |  34 ++
 .../src/tests/multi-file-operations.test.ts   |  45 ++
 .../tests/offline-concurrent-renames.test.ts  |  59 +++
 ...offline-create-same-path-mergeable.test.ts |  41 ++
 .../offline-delete-remote-rename.test.ts      |  38 ++
 .../offline-delete-vs-remote-update.test.ts   |  46 ++
 .../tests/offline-edit-remote-rename.test.ts  |  49 ++
 ...ffline-edit-then-move-same-content.test.ts |  51 ++
 .../tests/offline-mixed-operations.test.ts    |  57 +++
 .../offline-move-then-remote-delete.test.ts   |  36 ++
 .../src/tests/offline-multiple-edits.test.ts  |  40 ++
 .../src/tests/offline-rename-and-edit.test.ts |  43 ++
 ...line-rename-remote-create-old-path.test.ts |  51 ++
 ...ffline-update-both-then-delete-one.test.ts |  75 +++
 ...e-both-create-same-path-deconflict.test.ts |  34 ++
 ...te-rename-concurrent-create-orphan.test.ts |  41 ++
 ...date-while-other-creates-same-path.test.ts |  48 ++
 ...online-delete-recreate-rapid-cycle.test.ts |  37 ++
 .../online-edit-vs-delete-convergence.test.ts |  31 ++
 .../overlapping-edits-same-section.test.ts    |  54 ++
 ...e-reset-loses-coalesced-local-edit.test.ts |  36 ++
 ...delete-does-not-hijack-reused-path.test.ts |  56 ++
 .../rapid-create-update-delete-cycle.test.ts  |  52 ++
 ...pid-edit-delete-online-convergence.test.ts |  48 ++
 .../tests/rapid-updates-after-merge.test.ts   |  49 ++
 ...ently-deleted-cleared-on-reconnect.test.ts |  45 ++
 ...e-quick-write-rename-before-record.test.ts |  36 ++
 ...collides-with-pending-local-create.test.ts |  76 +++
 ...mote-update-resurrects-deleted-doc.test.ts |  59 +++
 ...remote-update-survives-user-rename.test.ts |  84 +++
 ...rename-chain-during-pending-create.test.ts |  64 +++
 .../tests/rename-chain-then-delete.test.ts    |  50 ++
 .../src/tests/rename-chain.test.ts            |  34 ++
 .../src/tests/rename-circular.test.ts         |  44 ++
 .../src/tests/rename-create-conflict.test.ts  |  34 ++
 ...rwrites-pending-create-then-delete.test.ts |  51 ++
 ...ame-pending-create-before-response.test.ts |  42 ++
 ...ng-create-onto-pending-delete-path.test.ts |  59 +++
 .../src/tests/rename-roundtrip.test.ts        |  40 ++
 .../src/tests/rename-swap.test.ts             |  44 ++
 ...name-to-path-of-unconfirmed-delete.test.ts |  44 ++
 .../rename-to-pending-path-fallback.test.ts   |  43 ++
 .../src/tests/rename-update-conflict.test.ts  |  42 ++
 ...ing-create-reused-path-then-delete.test.ts |  65 +++
 ...ears-recently-deleted-resurrection.test.ts |  43 ++
 ...ote-quick-write-and-pending-rename.test.ts |  82 +++
 ...n-local-create-after-remote-create.test.ts | 121 +++++
 ...nding-rename-aliases-second-create.test.ts | 152 ++++++
 ...equential-create-duplicate-content.test.ts |  43 ++
 .../server-pause-both-clients-create.test.ts  |  42 ++
 .../server-pause-both-edit-same-file.test.ts  |  68 +++
 .../server-pause-delete-recreate.test.ts      |  38 ++
 .../server-pause-rename-edit-resume.test.ts   |  50 ++
 .../server-pause-update-and-create.test.ts    |  54 ++
 ...multaneous-create-delete-same-path.test.ts |  38 ++
 .../text-pending-create-not-displaced.test.ts |  36 ++
 .../three-client-rename-create-delete.test.ts |  55 ++
 ...ate-does-not-survive-remote-delete.test.ts |  36 ++
 .../update-during-create-processing.test.ts   |  42 ++
 ...ser-parenthesized-file-not-deleted.test.ts |  47 ++
 .../tests/watermark-advances-on-skip.test.ts  |  35 ++
 ...ark-gap-remote-update-not-recorded.test.ts |  37 ++
 .../deterministic-tests/src/utils/assert.ts   |   5 +
 .../src/utils/assertable-state.ts             | 150 ++++++
 .../src/utils/find-free-port.ts               |  29 ++
 .../deterministic-tests/src/utils/sleep.ts    |   3 +
 .../src/utils/with-timeout.ts                 |  15 +
 frontend/deterministic-tests/tsconfig.json    |  12 +
 .../deterministic-tests/webpack.config.js     |  30 ++
 frontend/package.json                         |   3 +-
 127 files changed, 7722 insertions(+), 1 deletion(-)
 create mode 100644 frontend/deterministic-tests/README.md
 create mode 100644 frontend/deterministic-tests/package.json
 create mode 100644 frontend/deterministic-tests/src/cli.ts
 create mode 100644 frontend/deterministic-tests/src/consts.ts
 create mode 100644 frontend/deterministic-tests/src/deterministic-agent.ts
 create mode 100644 frontend/deterministic-tests/src/managed-websocket.ts
 create mode 100644 frontend/deterministic-tests/src/parse-args.ts
 create mode 100644 frontend/deterministic-tests/src/prefixed-logger.ts
 create mode 100644 frontend/deterministic-tests/src/run-with-concurrency.ts
 create mode 100644 frontend/deterministic-tests/src/server-control.ts
 create mode 100644 frontend/deterministic-tests/src/server-manager.ts
 create mode 100644 frontend/deterministic-tests/src/test-definition.ts
 create mode 100644 frontend/deterministic-tests/src/test-registry.ts
 create mode 100644 frontend/deterministic-tests/src/test-runner.ts
 create mode 100644 frontend/deterministic-tests/src/tests/binary-pending-create-not-displaced.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/binary-to-text-transition.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/catchup-create-and-update-not-skipped.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/coalesce-update-remote-update-data-loss.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/coalesced-remote-update-watermark-loss.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/concurrent-delete-during-remote-update.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/concurrent-edit-exact-same-position.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/concurrent-rename-and-create-at-target-create-first.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/concurrent-rename-and-create-at-target-rename-first.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/concurrent-rename-first-wins.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/concurrent-rename-same-target.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/concurrent-update-diff-consistency.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/create-delete-noop.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/create-during-reconciliation.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/create-merge-delete.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/create-merge-preserves-renamed-update.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/create-rename-create-same-path.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/create-rename-response-skips-file.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/create-update-coalesce-server-pause.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/delete-by-other-client-then-recreate.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/delete-during-pending-create.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/delete-recreate-concurrent-update.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/delete-recreate-different-content.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/delete-recreate-same-path.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/delete-recreated-pending-create-with-stale-deleting-record.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/delete-rename-conflict.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/displaced-file-not-marked-deleted.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/double-offline-cycle.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/idempotency-after-server-pause.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/interrupted-delete-retry.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/local-edit-lost-during-create-merge.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/local-rename-survives-remote-rename.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/local-update-survives-remote-rename.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/mc-cross-create-rename-same-target.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/mc-delete-then-offline-rename.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/mc-multi-delete-offline-rename.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/mc-three-client-rename-offline-update.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/merging-update-response-survives-user-rename.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/move-and-concurrent-remote-update.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/move-chain-three-files.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/move-identical-content-ambiguity.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/move-preserves-remote-update.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/move-remote-update-reverts-rename.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/move-then-delete-stale-path.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/multi-file-operations.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/offline-concurrent-renames.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/offline-create-same-path-mergeable.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/offline-delete-remote-rename.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/offline-delete-vs-remote-update.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/offline-edit-remote-rename.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/offline-edit-then-move-same-content.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/offline-mixed-operations.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/offline-move-then-remote-delete.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/offline-multiple-edits.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/offline-rename-and-edit.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/offline-rename-remote-create-old-path.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/offline-update-both-then-delete-one.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/online-both-create-same-path-deconflict.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/online-create-rename-concurrent-create-orphan.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/online-create-update-while-other-creates-same-path.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/online-delete-recreate-rapid-cycle.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/online-edit-vs-delete-convergence.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/overlapping-edits-same-section.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/queue-reset-loses-coalesced-local-edit.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/queued-create-delete-does-not-hijack-reused-path.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/rapid-create-update-delete-cycle.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/rapid-edit-delete-online-convergence.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/rapid-updates-after-merge.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/recently-deleted-cleared-on-reconnect.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/remote-quick-write-rename-before-record.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/remote-rename-collides-with-pending-local-create.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/remote-update-resurrects-deleted-doc.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/remote-update-survives-user-rename.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/rename-chain-during-pending-create.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/rename-chain-then-delete.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/rename-chain.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/rename-circular.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/rename-create-conflict.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/rename-overwrites-pending-create-then-delete.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/rename-pending-create-before-response.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/rename-pending-create-onto-pending-delete-path.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/rename-roundtrip.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/rename-swap.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/rename-to-path-of-unconfirmed-delete.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/rename-to-pending-path-fallback.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/rename-update-conflict.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/renamed-pending-create-reused-path-then-delete.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/reset-clears-recently-deleted-resurrection.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/same-doc-id-collapse-after-remote-quick-write-and-pending-rename.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/same-doc-id-collapse-on-local-create-after-remote-create.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/self-merge-pending-rename-aliases-second-create.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/sequential-create-duplicate-content.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/server-pause-both-clients-create.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/server-pause-both-edit-same-file.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/server-pause-delete-recreate.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/server-pause-rename-edit-resume.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/server-pause-update-and-create.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/simultaneous-create-delete-same-path.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/text-pending-create-not-displaced.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/three-client-rename-create-delete.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/update-does-not-survive-remote-delete.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/update-during-create-processing.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/user-parenthesized-file-not-deleted.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/watermark-advances-on-skip.test.ts
 create mode 100644 frontend/deterministic-tests/src/tests/watermark-gap-remote-update-not-recorded.test.ts
 create mode 100644 frontend/deterministic-tests/src/utils/assert.ts
 create mode 100644 frontend/deterministic-tests/src/utils/assertable-state.ts
 create mode 100644 frontend/deterministic-tests/src/utils/find-free-port.ts
 create mode 100644 frontend/deterministic-tests/src/utils/sleep.ts
 create mode 100644 frontend/deterministic-tests/src/utils/with-timeout.ts
 create mode 100644 frontend/deterministic-tests/tsconfig.json
 create mode 100644 frontend/deterministic-tests/webpack.config.js

diff --git a/frontend/deterministic-tests/README.md b/frontend/deterministic-tests/README.md
new file mode 100644
index 00000000..6fa2848c
--- /dev/null
+++ b/frontend/deterministic-tests/README.md
@@ -0,0 +1,118 @@
+# Deterministic Tests
+
+Scripted multi-client (with an in-memory filesystem) sync tests that run against a real server. Each test defines a sequence of file operations, sync/server controls, and assertions to exercise a specific conflict or edge case.
+
+Complements the fuzz-based E2E tests (`test-client`): fuzz tests discover bugs through random operations; deterministic tests pin down exact reproduction sequences for known scenarios.
+
+## How it works
+
+Each test is a `TestDefinition`: a client count and an ordered list of steps. The test name is derived from the registry key (which matches the file name). The `TestRunner` spins up N `DeterministicAgent` instances (each wrapping a real `SyncClient` with an `InMemoryFileSystem`) pointed at a shared vault on the server, then executes steps one by one.
+
+Tests that don't pause the server share a single server process (vault-name isolation). Tests that use `pause-server`/`resume-server` (SIGSTOP/SIGCONT) each get a dedicated server, since SIGSTOP freezes the entire process.
+
+The runner executes two sequential phases: regular tests on the shared server, then pause-server tests on dedicated servers. Within each phase tests run in parallel up to a concurrency limit.
+
+## Step types
+
+Clients always start with syncing disabled.
+
+**File operations** (per-client, fire-and-forget — sync is enqueued but not awaited):
+
+- `create`, `update`, `rename`, `delete`
+- `rename-next-write` — arm a deferred rename that fires the next time the given path is written. Lets a test race a user-rename against an in-flight remote create that's about to land at the same path.
+
+**Sync control:**
+
+- `sync` — wait for a specific client or all clients to finish pending operations
+- `barrier` — retry until all clients converge to identical file state (60s timeout)
+- `enable-sync` / `disable-sync` — simulate going online/offline
+- `reset` — reset a client's tracked sync state (keeps disk files); equivalent to a forced re-handshake on next enable
+- `sleep` — wall-clock pause; use sparingly, prefer `barrier` / `sync`
+
+**WebSocket control** (per-client):
+
+- `pause-websocket` / `resume-websocket` — buffer/release WebSocket messages for a specific client
+
+**Server control:**
+
+- `pause-server` / `resume-server` — SIGSTOP/SIGCONT the server process
+- `resume-server-until-history-then-pause` — resume the server, wait until a specific client observes a matching history entry (`CREATE`/`UPDATE`/`DELETE` for a path), then re-pause. Used to land exactly one operation across the wire.
+
+**Fault injection** (per-client):
+
+- `drop-next-create-response` — arm a one-shot interceptor that lets the next `POST /documents` reach the server (commit happens) but throws `SyncResetError` before the client sees the response, simulating connection loss after server commit.
+- `wait-for-dropped-create-response` — wait until the armed drop has fired.
+
+**Assertions:**
+
+- `assert-consistent` — all clients have identical files; optionally takes a custom `verify(state: AssertableState)` callback
+
+## Running
+
+```sh
+# Build server first
+cd sync-server && cargo build --release && cd -
+
+# Run all tests
+cd frontend && npm run build -w sync-client && npm run test -w deterministic-tests
+
+# Filter by name
+npm run test -w deterministic-tests -- --filter=rename
+
+# Control parallelism (default: number of CPU cores)
+npm run test -w deterministic-tests -- -j 4
+```
+
+## Adding a test
+
+1. Create `src/tests/my-scenario.test.ts`:
+
+```typescript
+import type { TestDefinition } from "../test-definition";
+
+export const myScenarioTest: TestDefinition = {
+  description:
+    "Client 0 creates A.md offline. After syncing, both clients should have the file.",
+  clients: 2,
+  steps: [
+    { type: "create", client: 0, path: "A.md", content: "hello" },
+    { type: "enable-sync", client: 0 },
+    { type: "enable-sync", client: 1 },
+    { type: "barrier" },
+    {
+      type: "assert-consistent",
+      verify: (s) => {
+        s.assertFileCount(1).assertContent("A.md", "hello");
+      }
+    }
+  ]
+};
+```
+
+The `verify` callback receives an `AssertableState` object with chainable assertion methods:
+
+```typescript
+s.assertFileCount(n);                       // exact file count
+s.assertFileExists("path");                 // file must exist
+s.assertFileNotExists("path");              // file must not exist
+s.assertContent("path", "expected");        // exact content match
+s.assertContains("path", "a", "b");         // all substrings present in file
+s.assertContainsAny("path", "a", "b");      // at least one substring present
+s.assertAnyFileContains("text");            // substring present in some file
+s.assertNoFileContains("text");             // substring absent from every file
+s.assertSubstringCount("path", "x", 3);     // substring appears exactly N times
+s.assertContentInAtMostOneFile("text");     // no duplicate content
+s.ifFileExists("path", (s) => { /* … */ }); // conditional block
+s.getContent("path");                       // raw content (or "" if missing)
+```
+
+2. Register it in `src/test-registry.ts`:
+
+```typescript
+import { myScenarioTest } from "./tests/my-scenario.test";
+
+const TESTS = {
+  // ...
+  "my-scenario": myScenarioTest
+};
+```
diff --git a/frontend/deterministic-tests/package.json b/frontend/deterministic-tests/package.json
new file mode 100644
index 00000000..4bd82c74
--- /dev/null
+++ b/frontend/deterministic-tests/package.json
@@ -0,0 +1,23 @@
+{
+    "name": "deterministic-tests",
+    "version": "0.14.0",
+    "private": true,
+    "bin": {
+        "deterministic-tests": "./dist/cli.js"
+    },
+    "scripts": {
+        "dev": "webpack watch --mode development",
+        "build": "webpack --mode production",
+        "test": "npm run build && node dist/cli.js"
+    },
+    "devDependencies": {
+        "commander": "^14.0.2",
+        "@types/node": "^25.0.2",
+        "sync-client": "file:../sync-client",
+        "ts-loader": "^9.5.4",
+        "tslib": "2.8.1",
+        "typescript": "5.9.3",
+        "webpack": "^5.103.0",
+        "webpack-cli": "^6.0.1"
+    }
+}
diff --git a/frontend/deterministic-tests/src/cli.ts b/frontend/deterministic-tests/src/cli.ts
new file mode 100644
index 00000000..6e15cac0
--- /dev/null
+++ b/frontend/deterministic-tests/src/cli.ts
@@ -0,0 +1,243 @@
+import { TestRunner } from "./test-runner";
+import { ServerControl } from "./server-control";
+import { ServerManager } from "./server-manager";
+import { PrefixedLogger } from "./prefixed-logger";
+import { TESTS } from "./test-registry";
+import type { TestDefinition, TestResult } from "./test-definition";
+import { parseArgs } from "./parse-args";
+import { runWithConcurrency } from "./run-with-concurrency";
+import { TOKEN, SERVER_BINARY_PATH, CONFIG_PATH } from "./consts";
+import * as path from "node:path";
+import * as fs from "node:fs";
+import { debugging, Logger } from "sync-client";
+
+const logger = new Logger();
+debugging.logToConsole(logger, { useColors: true });
+
+process.on("unhandledRejection", (reason) => {
+    logger.error(`Unhandled Rejection: ${reason}`);
+    process.exit(1);
+});
+
+process.on("uncaughtException", (error) => {
+    logger.error(`Uncaught Exception: ${error}`);
+    process.exit(1);
+});
+
+const serverManager = new ServerManager(logger);
+serverManager.installSignalHandlers();
+
+function testUsesPauseServer(test: TestDefinition): boolean {
+    return test.steps.some(
+        (step) =>
+            step.type === "pause-server" ||
+            step.type === "resume-server" ||
+            step.type === "resume-server-until-history-then-pause"
+    );
+}
+
+/**
+ * Walk up from the CLI binary's location until we find a directory
+ * containing `sync-server/` and `frontend/`.
+ */
+function findProjectRoot(): string {
+    let dir = path.dirname(__filename);
+    const root = path.parse(dir).root;
+    while (dir !== root) {
+        if (
+            fs.existsSync(path.join(dir, "sync-server")) &&
+            fs.existsSync(path.join(dir, "frontend"))
+        ) {
+            return dir;
+        }
+        dir = path.dirname(dir);
+    }
+    throw new Error(
+        `Could not locate project root (no ancestor of ${__filename} contains both 'sync-server' and 'frontend')`
+    );
+}
+
+interface NamedTestResult {
+    name: string;
+    result: TestResult;
+}
+
+async function runSharedServerTest(
+    name: string,
+    test: TestDefinition,
+    sharedServer: ServerControl
+): Promise<NamedTestResult> {
+    const testLogger = new PrefixedLogger(logger, name);
+    const runner = new TestRunner(
+        sharedServer,
+        testLogger,
+        TOKEN,
+        sharedServer.remoteUri
+    );
+    const result = await runner.runTest(name, test);
+    if (result.success) {
+        logger.info(`PASSED: ${name} (${result.duration}ms)`);
+    } else {
+        logger.error(`FAILED: ${name} - ${result.error}`);
+    }
+    return { name, result };
+}
+
+/**
+ * Run a test with its own dedicated server (for tests that use pause-server).
+ * SIGSTOP/SIGCONT affects the entire server process, so these tests need
+ * isolated servers to avoid interfering with other tests.
+ */
+async function runDedicatedServerTest(
+    name: string,
+    test: TestDefinition,
+    serverPath: string,
+    configPath: string
+): Promise<NamedTestResult> {
+    const testLogger = new PrefixedLogger(logger, name);
+    const server = new ServerControl(serverPath, configPath, testLogger);
+    serverManager.track(server);
+
+    try {
+        await server.start();
+        const runner = new TestRunner(
+            server,
+            testLogger,
+            TOKEN,
+            server.remoteUri
+        );
+        const result = await runner.runTest(name, test);
+        if (result.success) {
+            logger.info(`PASSED: ${name} (${result.duration}ms)`);
+        } else {
+            logger.error(`FAILED: ${name} - ${result.error}`);
+        }
+        return { name, result };
+    } finally {
+        try {
+            await server.stop();
+        } catch {
+            // best-effort cleanup
+        }
+        serverManager.untrack(server);
+    }
+}
+
+async function main(): Promise<void> {
+    const projectRoot = findProjectRoot();
+    const serverPath = path.join(projectRoot, SERVER_BINARY_PATH);
+    if (!fs.existsSync(serverPath)) {
+        logger.error(`Server binary not found at: ${serverPath}`);
+        process.exit(1);
+    }
+
+    const configPath = path.join(projectRoot, CONFIG_PATH);
+    if (!fs.existsSync(configPath)) {
+        logger.error(`Config file not found at: ${configPath}`);
+        process.exit(1);
+    }
+
+    const { filter, concurrency } = parseArgs(process.argv);
+
+    const testsToRun: [string, TestDefinition][] = [];
+    for (const [key, test] of Object.entries(TESTS)) {
+        if (test) {
+            if (
+                filter !== undefined &&
+                filter.length > 0 &&
+                !key.includes(filter)
+            ) {
+                continue;
+            }
+            testsToRun.push([key, test]);
+        }
+    }
+
+    if (testsToRun.length === 0) {
+        logger.error(
+            filter !== undefined && filter.length > 0
+                ? `No tests matched filter "${filter}"`
+                : "No tests found"
+        );
+        process.exit(1);
+    }
+
+    const regularTests = testsToRun.filter(([, t]) => !testUsesPauseServer(t));
+    const pauseTests = testsToRun.filter(([, t]) => testUsesPauseServer(t));
+
+    logger.info(`Server: ${serverPath}`);
+    logger.info(`Config: ${configPath}`);
+    logger.info(
+        `Tests: ${testsToRun.length} total (${regularTests.length} regular, ${pauseTests.length} server-pause)`
+    );
+    logger.info(`Concurrency: ${concurrency}`);
+
+    const allResults: NamedTestResult[] = [];
+
+    if (regularTests.length > 0) {
+        logger.info(
+            `\n--- Running ${regularTests.length} regular tests (shared server, concurrency ${concurrency}) ---`
+        );
+        const sharedServer = new ServerControl(serverPath, configPath, logger);
+        serverManager.track(sharedServer);
+
+        try {
+            await sharedServer.start();
+
+            const results = await runWithConcurrency(
+                regularTests,
+                concurrency,
+                async ([name, test]) =>
+                    runSharedServerTest(name, test, sharedServer)
+            );
+
+            allResults.push(...results);
+        } finally {
+            try {
+                await sharedServer.stop();
+            } catch (error) {
+                logger.warn(
+                    `Error stopping shared server: ${error instanceof Error ? error.message : String(error)}`
+                );
+            }
+            serverManager.untrack(sharedServer);
+        }
+    }
+
+    if (pauseTests.length > 0) {
+        logger.info(
+            `\n--- Running ${pauseTests.length} server-pause tests (dedicated servers, concurrency ${concurrency}) ---`
+        );
+
+        const results = await runWithConcurrency(
+            pauseTests,
+            concurrency,
+            async ([name, test]) =>
+                runDedicatedServerTest(name, test, serverPath, configPath)
+        );
+
+        allResults.push(...results);
+    }
+
+    const passed = allResults.filter((r) => r.result.success);
+    const failed = allResults.filter((r) => !r.result.success);
+
+    logger.info(
+        `\n--- Results: ${passed.length}/${allResults.length} passed ---`
+    );
+
+    if (failed.length > 0) {
+        for (const { name, result } of failed) {
+            logger.error(`  FAILED: ${name}: ${result.error}`);
+        }
+        process.exit(1);
+    } else {
+        logger.info("All tests passed!");
+        process.exit(0);
+    }
+}
+
+main().catch((err: unknown) => {
+    logger.error(`Unexpected error: ${err}`);
+    process.exit(1);
+});
diff --git a/frontend/deterministic-tests/src/consts.ts b/frontend/deterministic-tests/src/consts.ts
new file mode 100644
index 00000000..d9a2498f
--- /dev/null
+++ b/frontend/deterministic-tests/src/consts.ts
@@ -0,0 +1,17 @@
+export const TOKEN = "test-token-change-me";
+export const SERVER_BINARY_PATH = "sync-server/target/release/sync_server";
+export const CONFIG_PATH = "sync-server/config-e2e.yml";
+
+export const STOP_TIMEOUT_MS = 5_000;
+export const CONVERGENCE_TIMEOUT_MS = 60_000;
+export const CONVERGENCE_RETRY_DELAY_MS = 500;
+export const AGENT_INIT_TIMEOUT_MS = 30_000;
+export const IS_SYNC_ENABLED_BY_DEFAULT = false;
+
+export const WAIT_TIMEOUT_MS = 60_000;
+export const WEBSOCKET_CONNECT_TIMEOUT_MS = 10_000;
+export const WEBSOCKET_POLL_INTERVAL_MS = 50;
+
+export const SERVER_READY_POLL_INTERVAL_MS = 100;
+export const SERVER_READY_MAX_ATTEMPTS = 50;
+export const SERVER_START_MAX_ATTEMPTS = 5;
diff --git a/frontend/deterministic-tests/src/deterministic-agent.ts b/frontend/deterministic-tests/src/deterministic-agent.ts
new file mode 100644
index 00000000..b32b01c2
--- /dev/null
+++ b/frontend/deterministic-tests/src/deterministic-agent.ts
@@ -0,0 +1,483 @@
+import type {
+    HistoryEntry,
+    StoredDatabase,
+    SyncSettings,
+    RelativePath,
+    TextWithCursors
+} from "sync-client";
+import {
+    SyncClient,
+    SyncResetError,
+    debugging,
+    LogLevel,
+    utils
+} from "sync-client";
+import { assert } from "./utils/assert";
+import { sleep } from "./utils/sleep";
+import { withTimeout } from "./utils/with-timeout";
+import {
+    IS_SYNC_ENABLED_BY_DEFAULT,
+    WAIT_TIMEOUT_MS,
+    WEBSOCKET_CONNECT_TIMEOUT_MS,
+    WEBSOCKET_POLL_INTERVAL_MS
+} from "./consts";
+import { ManagedWebSocketFactory } from "./managed-websocket";
+
+export class DeterministicAgent extends debugging.InMemoryFileSystem {
+    public readonly clientId: number;
+    private readonly logger: (msg: string) => void;
+    private client!: SyncClient;
+    private data: Partial<{
+        settings: Partial<SyncSettings>;
+        database: Partial<StoredDatabase>;
+    }> = {};
+    private isSyncEnabled = IS_SYNC_ENABLED_BY_DEFAULT;
+    private readonly syncErrors: Error[] = [];
+    private readonly pendingSyncOperations = new Set<Promise<void>>();
+    private readonly wsFactory = new ManagedWebSocketFactory();
+    private nextWriteRename:
+        | {
+            oldPath: RelativePath;
+            newPath: RelativePath;
+        }
+        | undefined;
+    private nextCreateResponseDrop:
+        | {
+            dropped: Promise<void>;
+            resolveDropped: () => void;
+        }
+        | undefined;
+
+    public constructor(
+        clientId: number,
+        initialSettings: Partial<SyncSettings>,
+        logger: (msg: string) => void
+    ) {
+        super();
+        this.clientId = clientId;
+        this.logger = logger;
+        this.data.settings = { ...initialSettings };
+    }
+
+    public async init(
+        fetchImplementation: typeof globalThis.fetch
+    ): Promise<void> {
+        this.client = await SyncClient.create({
+            fs: this,
+            persistence: {
+                load: async () => this.data,
+                save: async (data) => void (this.data = data)
+            },
+            fetch: this.wrapFetch(fetchImplementation),
+            webSocket: this.wsFactory.constructorFn
+        });
+
+        this.client.logger.onLogEmitted.add((line) => {
+            const prefix = `[Client ${this.clientId}]`;
+            switch (line.level) {
+                case LogLevel.ERROR:
+                    this.logger(`${prefix} ERROR: ${line.message}`);
+                    break;
+                case LogLevel.WARNING:
+                    this.logger(`${prefix} WARN: ${line.message}`);
+                    break;
+                case LogLevel.INFO:
+                    this.logger(`${prefix} INFO: ${line.message}`);
+                    break;
+                case LogLevel.DEBUG:
+                    this.logger(`${prefix} DEBUG: ${line.message}`);
+                    break;
+            }
+        });
+
+        await this.client.start();
+
+        const connectionCheck = await this.client.checkConnection();
+        assert(
+            connectionCheck.isSuccessful,
+            `Client ${this.clientId} connection check failed`
+        );
+
+        if (this.isSyncEnabled) {
+            await this.waitForWebSocket();
+        }
+    }
+
+    public pauseWebSocket(): void {
+        this.log("Pausing WebSocket message delivery");
+        this.wsFactory.pause();
+    }
+
+    public resumeWebSocket(): void {
+        this.log("Resuming WebSocket message delivery");
+        this.wsFactory.resume();
+    }
+
+    public dropNextCreateResponse(): void {
+        assert(
+            this.nextCreateResponseDrop === undefined,
+            `Client ${this.clientId} already has a create response drop armed`
+        );
+        let resolveDropped!: () => void;
+        const dropped = new Promise<void>((resolve) => {
+            resolveDropped = resolve;
+        });
+        this.nextCreateResponseDrop = {
+            dropped,
+            resolveDropped
+        };
+        this.log("Armed next create response drop");
+    }
+
+    public async waitForDroppedCreateResponse(): Promise<void> {
+        assert(
+            this.nextCreateResponseDrop !== undefined,
+            `Client ${this.clientId} has no create response drop armed`
+        );
+        await withTimeout(
+            this.nextCreateResponseDrop.dropped,
+            WAIT_TIMEOUT_MS,
+            `Client ${this.clientId} timed out waiting for create response drop`
+        );
+        this.log("Create response was dropped after server commit");
+    }
+
+    public async waitForHistoryEntry(
+        matches: (entry: HistoryEntry) => boolean,
+        onMatch?: (entry: HistoryEntry) => void
+    ): Promise<void> {
+        const existing = this.client.getHistoryEntries().find(matches);
+        if (existing !== undefined) {
+            onMatch?.(existing);
+            return;
+        }
+
+        await withTimeout(
+            new Promise<void>((resolve) => {
+                const unsubscribe = this.client.onSyncHistoryUpdated.add(() => {
+                    const entry = this.client
+                        .getHistoryEntries()
+                        .find(matches);
+                    if (entry === undefined) {
+                        return;
+                    }
+
+                    unsubscribe();
+                    onMatch?.(entry);
+                    resolve();
+                });
+            }),
+            WAIT_TIMEOUT_MS,
+            `Client ${this.clientId} timed out waiting for history entry`
+        );
+    }
+
+    public async waitForSync(): Promise<void> {
+        this.log("Waiting for sync to complete...");
+        // Drain agent-level sync operations first. These are the fire-and-forget
+        // promises from enqueueSync() that call into the SyncClient's methods.
+        // Without this, waitUntilFinished() might return before the SyncClient
+        // has even been told about the operation.
+        await this.drainPendingSyncOperations();
+        await withTimeout(
+            this.client.waitUntilFinished(),
+            WAIT_TIMEOUT_MS,
+            `Client ${this.clientId} waitForSync timed out after ${WAIT_TIMEOUT_MS}ms`
+        );
+        if (this.syncErrors.length > 0) {
+            const errors = this.syncErrors.splice(0);
+            throw new Error(
+                `Client ${this.clientId} had ${errors.length} sync error(s):\n${errors.map((e) => e.message).join("\n")}`
+            );
+        }
+        this.log("Sync complete");
+    }
+
+    public async reset(): Promise<void> {
+        this.log("Resetting client (clears tracked state, keeps disk files)");
+        await this.drainPendingSyncOperations();
+        await this.client.reset();
+        if (this.isSyncEnabled) {
+            await this.waitForWebSocket();
+        }
+    }
+
+    public async disableSync(): Promise<void> {
+        this.log("Disabling sync");
+        // Drain pending enqueued operations before disabling so the SyncClient
+        // knows about all operations that were enqueued while sync was enabled.
+        await this.drainPendingSyncOperations();
+        await this.client.setSetting("isSyncEnabled", false);
+        this.isSyncEnabled = false;
+        // Wait for in-flight operations to drain. Disabling sync triggers
+        // a reset, which aborts in-flight fetches with SyncResetError.
+        try {
+            await withTimeout(
+                this.client.waitUntilFinished(),
+                WAIT_TIMEOUT_MS,
+                `Client ${this.clientId} disableSync drain timed out`
+            );
+        } catch (error) {
+            if (error instanceof Error && error.name === "SyncResetError") {
+                this.log("Disable sync drain interrupted by reset (expected)");
+            } else {
+                throw error;
+            }
+        }
+    }
+
+    public async enableSync(): Promise<void> {
+        this.log("Enabling sync");
+        await this.client.setSetting("isSyncEnabled", true);
+        this.isSyncEnabled = true;
+        await this.waitForWebSocket();
+    }
+
+    public async getFileContent(path: string): Promise<string> {
+        const bytes = await this.read(path);
+        return new TextDecoder().decode(bytes);
+    }
+
+    public renameNextWrite(oldPath: RelativePath, newPath: RelativePath): void {
+        assert(
+            this.nextWriteRename === undefined,
+            `Client ${this.clientId} already has a next-write rename armed`
+        );
+        this.nextWriteRename = { oldPath, newPath };
+        this.log(`Armed next write rename: ${oldPath} -> ${newPath}`);
+    }
+
+    public async cleanup(): Promise<void> {
+        this.log("Cleaning up...");
+        // Guard against uninitialized client (init() failed partway).
+        // The class field uses `!:` so TS thinks this is always defined,
+        // but at runtime it can be undefined when init() throws partway.
+        const maybeClient = this.client as SyncClient | undefined;
+        if (maybeClient === undefined) {
+            this.log("Client not initialized, nothing to clean up");
+            return;
+        }
+        try {
+            await this.drainPendingSyncOperations();
+            await withTimeout(
+                this.client.waitUntilFinished(),
+                WAIT_TIMEOUT_MS,
+                `Client ${this.clientId} cleanup waitUntilFinished timed out`
+            );
+        } catch (error) {
+            if (error instanceof Error && error.name === "SyncResetError") {
+                this.log(`Cleanup interrupted by reset (expected): ${error}`);
+            } else {
+                this.log(`Cleanup waitUntilFinished failed: ${error}`);
+            }
+        }
+        // Surface any background sync errors that arrived after the last
+        // waitForSync (e.g. between the final assert-consistent and here).
+        // Without this, regressions that fault the engine during the very
+        // last step of a test would be silently swallowed.
+        const pendingErrors = this.syncErrors.splice(0);
+        await this.client.destroy();
+        this.log("Cleanup complete");
+        if (pendingErrors.length > 0) {
+            throw new Error(
+                `Client ${this.clientId} had ${pendingErrors.length} background sync error(s) during cleanup:\n${pendingErrors.map((e) => e.message).join("\n")}`
+            );
+        }
+    }
+
+    public override async read(path: RelativePath): Promise<Uint8Array> {
+        await Promise.resolve();
+        return super.read(path);
+    }
+
+    public override async write(
+        path: RelativePath,
+        content: Uint8Array
+    ): Promise<void> {
+        await Promise.resolve();
+        const isNew = !this.files.has(path);
+        await super.write(path, content);
+
+        if (this.isSyncEnabled && isNew) {
+            this.enqueueSync(async () => {
+                this.client.syncLocallyCreatedFile(path);
+            });
+        }
+
+        const nextWriteRename = this.nextWriteRename;
+        if (
+            nextWriteRename !== undefined &&
+            nextWriteRename.oldPath === path
+        ) {
+            this.nextWriteRename = undefined;
+            await super.rename(
+                nextWriteRename.oldPath,
+                nextWriteRename.newPath
+            );
+            if (this.isSyncEnabled) {
+                this.enqueueSync(async () => {
+                    this.client.syncLocallyUpdatedFile({
+                        oldPath: nextWriteRename.oldPath,
+                        relativePath: nextWriteRename.newPath
+                    });
+                });
+            }
+            // The rename consumed `path`. Skip the post-update enqueue below
+            // — it would send a syncLocallyUpdatedFile for a path that no
+            // longer exists.
+            return;
+        }
+
+        if (!this.isSyncEnabled) {
+            return;
+        }
+
+        if (!isNew) {
+            this.enqueueSync(async () => {
+                this.client.syncLocallyUpdatedFile({ relativePath: path });
+            });
+        }
+    }
+
+    public override async atomicUpdateText(
+        path: RelativePath,
+        updater: (current: TextWithCursors) => TextWithCursors
+    ): Promise<string> {
+        const result = await super.atomicUpdateText(path, updater);
+        if (this.isSyncEnabled) {
+            this.enqueueSync(async () => {
+                this.client.syncLocallyUpdatedFile({ relativePath: path });
+            });
+        }
+        return result;
+    }
+
+    public override async delete(path: RelativePath): Promise<void> {
+        await super.delete(path);
+        if (this.isSyncEnabled) {
+            this.enqueueSync(async () => {
+                this.client.syncLocallyDeletedFile(path);
+            });
+        }
+    }
+
+    public override async rename(
+        oldPath: RelativePath,
+        newPath: RelativePath
+    ): Promise<void> {
+        await super.rename(oldPath, newPath);
+        if (this.isSyncEnabled) {
+            this.enqueueSync(async () => {
+                this.client.syncLocallyUpdatedFile({
+                    oldPath,
+                    relativePath: newPath
+                });
+            });
+        }
+    }
+
+    private async waitForWebSocket(): Promise<void> {
+        const deadline = Date.now() + WEBSOCKET_CONNECT_TIMEOUT_MS;
+        while (!this.client.isWebSocketConnected && Date.now() < deadline) {
+            await sleep(WEBSOCKET_POLL_INTERVAL_MS);
+        }
+        assert(
+            this.client.isWebSocketConnected,
+            `Client ${this.clientId} WebSocket failed to connect within ${WEBSOCKET_CONNECT_TIMEOUT_MS}ms`
+        );
+    }
+
+    /**
+     * Wait until all agent-level enqueued sync operations have completed.
+     * Uses a loop because completing one operation can trigger new enqueues.
+     */
+    private async drainPendingSyncOperations(): Promise<void> {
+        while (this.pendingSyncOperations.size > 0) {
+            await utils.awaitAll([...this.pendingSyncOperations]);
+        }
+    }
+
+    private enqueueSync(operation: () => Promise<void>): void {
+        const promise = this.executeSyncOperation(operation).catch(
+            (error: unknown) => {
+                const err =
+                    error instanceof Error ? error : new Error(String(error));
+                this.log(`Background sync failed: ${err.message}`);
+                this.syncErrors.push(err);
+            }
+        );
+        this.pendingSyncOperations.add(promise);
+        void promise.finally(() => {
+            this.pendingSyncOperations.delete(promise);
+        });
+    }
+
+    private async executeSyncOperation(
+        operation: () => Promise<void>
+    ): Promise<void> {
+        try {
+            await operation();
+        } catch (error) {
+            if (error instanceof Error && error.name === "SyncResetError") {
+                this.log(`Sync operation interrupted by reset: ${error}`);
+                return;
+            }
+            if (
+                error instanceof Error &&
+                error.message.includes("has been destroyed")
+            ) {
+                this.log(`Sync operation interrupted by destroy: ${error}`);
+                return;
+            }
+
+            throw error;
+        }
+    }
+
+    private log(message: string): void {
+        this.logger(`[Client ${this.clientId}] ${message}`);
+    }
+
+    private wrapFetch(
+        fetchImplementation: typeof globalThis.fetch
+    ): typeof globalThis.fetch {
+        return async (input, init) => {
+            const response = await fetchImplementation(input, init);
+            const drop = this.nextCreateResponseDrop;
+            if (
+                drop !== undefined &&
+                DeterministicAgent.isCreateDocumentRequest(input, init)
+            ) {
+                this.nextCreateResponseDrop = undefined;
+                try {
+                    await response.body?.cancel();
+                } catch {
+                    // Best-effort — body may already be consumed/closed.
+                }
+                drop.resolveDropped();
+                throw new SyncResetError();
+            }
+            return response;
+        };
+    }
+
+    private static isCreateDocumentRequest(
+        input: RequestInfo | URL,
+        init: RequestInit | undefined
+    ): boolean {
+        const method =
+            init?.method ??
+            (typeof Request !== "undefined" && input instanceof Request
+                ? input.method
+                : "GET");
+        if (method.toUpperCase() !== "POST") {
+            return false;
+        }
+
+        const url =
+            input instanceof URL
+                ? input
+                : new URL(typeof input === "string" ? input : input.url);
+        return /\/documents\/?$/.test(url.pathname);
+    }
+}
diff --git a/frontend/deterministic-tests/src/managed-websocket.ts b/frontend/deterministic-tests/src/managed-websocket.ts
new file mode 100644
index 00000000..c759891b
--- /dev/null
+++ b/frontend/deterministic-tests/src/managed-websocket.ts
@@ -0,0 +1,245 @@
+/**
+ * A WebSocket wrapper that can pause and resume message delivery.
+ * When paused, incoming messages are buffered. When resumed, buffered
+ * messages are delivered in order via the onmessage handler.
+ *
+ * Member layout follows typescript-eslint default member-ordering: all
+ * accessor properties are declared with `declare` and wired through the
+ * constructor using Object.defineProperty so we don't need conflicting
+ * get/set accessor pairs.
+ */
+class ManagedWebSocket implements WebSocket {
+    public static readonly CONNECTING = WebSocket.CONNECTING;
+    public static readonly OPEN = WebSocket.OPEN;
+    public static readonly CLOSING = WebSocket.CLOSING;
+    public static readonly CLOSED = WebSocket.CLOSED;
+
+    public readonly CONNECTING = WebSocket.CONNECTING;
+    public readonly OPEN = WebSocket.OPEN;
+    public readonly CLOSING = WebSocket.CLOSING;
+    public readonly CLOSED = WebSocket.CLOSED;
+
+    declare public readonly readyState: number;
+    declare public readonly url: string;
+    declare public readonly protocol: string;
+    declare public readonly extensions: string;
+    declare public readonly bufferedAmount: number;
+    declare public binaryType: BinaryType;
+    declare public onopen: ((this: WebSocket, ev: Event) => unknown) | null;
+    declare public onclose:
+        | ((this: WebSocket, ev: CloseEvent) => unknown)
+        | null;
+    declare public onerror: ((this: WebSocket, ev: Event) => unknown) | null;
+    declare public onmessage:
+        | ((this: WebSocket, ev: MessageEvent) => unknown)
+        | null;
+
+    private readonly ws: WebSocket;
+    private readonly bufferedMessages: MessageEvent[] = [];
+    private paused = false;
+    private externalOnMessage: ((event: MessageEvent) => unknown) | null = null;
+
+    public constructor(url: string | URL, protocols?: string | string[]) {
+        this.ws = new WebSocket(url, protocols);
+
+        const { ws } = this;
+        Object.defineProperties(this, {
+            readyState: {
+                get: (): number => ws.readyState,
+                enumerable: true,
+                configurable: true
+            },
+            url: {
+                get: (): string => ws.url,
+                enumerable: true,
+                configurable: true
+            },
+            protocol: {
+                get: (): string => ws.protocol,
+                enumerable: true,
+                configurable: true
+            },
+            extensions: {
+                get: (): string => ws.extensions,
+                enumerable: true,
+                configurable: true
+            },
+            bufferedAmount: {
+                get: (): number => ws.bufferedAmount,
+                enumerable: true,
+                configurable: true
+            },
+            binaryType: {
+                get: (): BinaryType => ws.binaryType,
+                set: (v: BinaryType): void => {
+                    ws.binaryType = v;
+                },
+                enumerable: true,
+                configurable: true
+            },
+            onopen: {
+                get: (): ((this: WebSocket, ev: Event) => unknown) | null =>
+                    ws.onopen,
+                set: (
+                    h: ((this: WebSocket, ev: Event) => unknown) | null
+                ): void => {
+                    ws.onopen = h;
+                },
+                enumerable: true,
+                configurable: true
+            },
+            onclose: {
+                get: ():
+                    | ((this: WebSocket, ev: CloseEvent) => unknown)
+                    | null => ws.onclose,
+                set: (
+                    h: ((this: WebSocket, ev: CloseEvent) => unknown) | null
+                ): void => {
+                    ws.onclose = h;
+                },
+                enumerable: true,
+                configurable: true
+            },
+            onerror: {
+                get: (): ((this: WebSocket, ev: Event) => unknown) | null =>
+                    ws.onerror,
+                set: (
+                    h: ((this: WebSocket, ev: Event) => unknown) | null
+                ): void => {
+                    ws.onerror = h;
+                },
+                enumerable: true,
+                configurable: true
+            },
+            onmessage: {
+                get: ():
+                    | ((this: WebSocket, ev: MessageEvent) => unknown)
+                    | null => this.externalOnMessage,
+                set: (
+                    h: ((this: WebSocket, ev: MessageEvent) => unknown) | null
+                ): void => {
+                    this.externalOnMessage = h;
+                },
+                enumerable: true,
+                configurable: true
+            }
+        });
+
+        this.ws.onmessage = (event: MessageEvent): void => {
+            if (this.paused) {
+                this.bufferedMessages.push(event);
+            } else {
+                this.externalOnMessage?.(event);
+            }
+        };
+    }
+
+    public pause(): void {
+        this.paused = true;
+    }
+
+    public resume(): void {
+        // Drain buffered messages BEFORE flipping `paused` to false.
+        // If `externalOnMessage` is async (its return type is `unknown`),
+        // dispatch yields control between buffered messages, and a fresh
+        // live `ws.onmessage` event firing during that yield would jump
+        // ahead of unprocessed buffered messages — silently reordering
+        // events relative to the wire. Keeping `paused = true` during the
+        // drain forces the live handler to keep buffering, so we splice
+        // those late arrivals onto the tail and dispatch them in order.
+        while (this.bufferedMessages.length > 0) {
+            const messages = this.bufferedMessages.splice(0);
+            for (const msg of messages) {
+                this.externalOnMessage?.(msg);
+            }
+        }
+        this.paused = false;
+    }
+
+    public send(data: string | ArrayBufferLike | Blob | ArrayBufferView): void {
+        this.ws.send(data);
+    }
+
+    public close(code?: number, reason?: string): void {
+        this.ws.close(code, reason);
+    }
+
+    public addEventListener(
+        ...args: Parameters<WebSocket["addEventListener"]>
+    ): void {
+        // Only the `.onmessage` setter routes through the pause buffer.
+        // If sync-client ever attaches "message" listeners via
+        // addEventListener instead, those messages would bypass pause/resume
+        // and deterministic tests would silently lose their fault injection.
+        if (args[0] === "message") {
+            throw new Error(
+                "ManagedWebSocket: addEventListener('message') bypasses the " +
+                    "pause buffer. Use the .onmessage setter instead, or " +
+                    "extend ManagedWebSocket to route message listeners."
+            );
+        }
+        this.ws.addEventListener(...args);
+    }
+
+    public removeEventListener(
+        ...args: Parameters<WebSocket["removeEventListener"]>
+    ): void {
+        this.ws.removeEventListener(...args);
+    }
+
+    public dispatchEvent(event: Event): boolean {
+        return this.ws.dispatchEvent(event);
+    }
+}
+
+/**
+ * Factory that creates ManagedWebSocket instances and tracks them
+ * for pause/resume control from the test harness
+ */
+export class ManagedWebSocketFactory {
+    // Append-only: closed sockets stay tracked. Bounded per test (one
+    // factory per agent, each test discards its agents on cleanup), so
+    // not a real leak — but iterating over closed instances on
+    // pause/resume is a deliberate no-op since their `.onmessage` is
+    // already detached.
+    private readonly instances: ManagedWebSocket[] = [];
+    // Sticky pause state: applied to current instances on `pause()` AND
+    // to any new instance created later (e.g. WS reconnect after a
+    // `disable-sync` / `reset` cycle). Without this, a test pausing the
+    // WS before the agent reconnects would silently see the new socket
+    // start un-paused and miss the messages it meant to buffer.
+    private currentlyPaused = false;
+
+    public get constructorFn(): typeof globalThis.WebSocket {
+        const trackInstance = (instance: ManagedWebSocket): void => {
+            this.instances.push(instance);
+            if (this.currentlyPaused) {
+                instance.pause();
+            }
+        };
+        class TrackedManagedWebSocket extends ManagedWebSocket {
+            public constructor(
+                url: string | URL,
+                protocols?: string | string[]
+            ) {
+                super(url, protocols);
+                trackInstance(this);
+            }
+        }
+        return TrackedManagedWebSocket;
+    }
+
+    public pause(): void {
+        this.currentlyPaused = true;
+        for (const ws of this.instances) {
+            ws.pause();
+        }
+    }
+
+    public resume(): void {
+        this.currentlyPaused = false;
+        for (const ws of this.instances) {
+            ws.resume();
+        }
+    }
+}
diff --git a/frontend/deterministic-tests/src/parse-args.ts b/frontend/deterministic-tests/src/parse-args.ts
new file mode 100644
index 00000000..11c56f19
--- /dev/null
+++ b/frontend/deterministic-tests/src/parse-args.ts
@@ -0,0 +1,43 @@
+import * as os from "node:os";
+import { Command, InvalidArgumentError } from "commander";
+
+export interface CliArgs {
+    filter: string | undefined;
+    concurrency: number;
+}
+
+function parsePositiveInt(value: string): number {
+    const n = parseInt(value, 10);
+    if (isNaN(n) || n <= 0) {
+        throw new InvalidArgumentError("must be a positive integer");
+    }
+    return n;
+}
+
+export function parseArgs(argv: string[]): CliArgs {
+    const program = new Command();
+
+    program
+        .name("deterministic-tests")
+        .description("Scripted multi-client sync tests against a real server")
+        .option(
+            "-f, --filter <substring>",
+            "Run only tests whose name contains this substring"
+        )
+        .option(
+            "-j, --concurrency <number>",
+            "Number of tests to run in parallel",
+            parsePositiveInt,
+            os.cpus().length
+        );
+
+    program.parse(argv);
+
+    /* eslint-disable @typescript-eslint/no-unsafe-type-assertion */
+    const opts = program.opts();
+    const filter = opts.filter as string | undefined;
+    const concurrency = opts.concurrency as number;
+    /* eslint-enable @typescript-eslint/no-unsafe-type-assertion */
+
+    return { filter, concurrency };
+}
diff --git a/frontend/deterministic-tests/src/prefixed-logger.ts b/frontend/deterministic-tests/src/prefixed-logger.ts
new file mode 100644
index 00000000..769d7545
--- /dev/null
+++ b/frontend/deterministic-tests/src/prefixed-logger.ts
@@ -0,0 +1,28 @@
+import { Logger } from "sync-client";
+
+export class PrefixedLogger extends Logger {
+    private readonly base: Logger;
+    private readonly prefix: string;
+
+    public constructor(base: Logger, prefix: string) {
+        super();
+        this.base = base;
+        this.prefix = prefix;
+    }
+
+    public override debug(message: string): void {
+        this.base.debug(`[${this.prefix}] ${message}`);
+    }
+
+    public override info(message: string): void {
+        this.base.info(`[${this.prefix}] ${message}`);
+    }
+
+    public override warn(message: string): void {
+        this.base.warn(`[${this.prefix}] ${message}`);
+    }
+
+    public override error(message: string): void {
+        this.base.error(`[${this.prefix}] ${message}`);
+    }
+}
diff --git a/frontend/deterministic-tests/src/run-with-concurrency.ts b/frontend/deterministic-tests/src/run-with-concurrency.ts
new file mode 100644
index 00000000..f5bcf745
--- /dev/null
+++ b/frontend/deterministic-tests/src/run-with-concurrency.ts
@@ -0,0 +1,33 @@
+export async function runWithConcurrency<T, R>(
+    items: T[],
+    concurrency: number,
+    fn: (item: T) => Promise<R>
+): Promise<R[]> {
+    const results: R[] = [];
+    const errors: unknown[] = [];
+    const executing = new Set<Promise<void>>();
+
+    for (let i = 0; i < items.length; i++) {
+        const index = i;
+        const p = fn(items[index])
+            .then((result) => {
+                results[index] = result;
+            })
+            .catch((error: unknown) => {
+                errors.push(error);
+            })
+            .finally(() => executing.delete(p));
+        executing.add(p);
+        if (executing.size >= concurrency) {
+            await Promise.race(executing);
+        }
+    }
+
+    // eslint-disable-next-line no-restricted-properties
+    await Promise.all(executing);
+
+    if (errors.length > 0) {
+        throw errors[0];
+    }
+    return results;
+}
diff --git a/frontend/deterministic-tests/src/server-control.ts b/frontend/deterministic-tests/src/server-control.ts
new file mode 100644
index 00000000..9cb4cde0
--- /dev/null
+++ b/frontend/deterministic-tests/src/server-control.ts
@@ -0,0 +1,296 @@
+import { spawn, type ChildProcess } from "node:child_process";
+import * as fs from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
+import { sleep } from "./utils/sleep";
+import { findFreePort } from "./utils/find-free-port";
+import type { Logger } from "sync-client";
+import {
+    STOP_TIMEOUT_MS,
+    SERVER_READY_POLL_INTERVAL_MS,
+    SERVER_READY_MAX_ATTEMPTS,
+    SERVER_START_MAX_ATTEMPTS
+} from "./consts";
+
+export class ServerControl {
+    private process: ChildProcess | null = null;
+    private readonly serverPath: string;
+    private readonly baseConfigPath: string;
+    private readonly logger: Logger;
+    private _port: number | undefined;
+    private tempDir: string | undefined;
+    private _isPaused = false;
+
+    public constructor(serverPath: string, configPath: string, logger: Logger) {
+        this.serverPath = serverPath;
+        this.baseConfigPath = configPath;
+        this.logger = logger;
+    }
+
+    public get port(): number {
+        if (this._port === undefined) {
+            throw new Error("Server has not been started yet");
+        }
+        return this._port;
+    }
+
+    public get remoteUri(): string {
+        return `http://localhost:${this.port}`;
+    }
+
+    public async start(): Promise<void> {
+        if (this.process !== null) {
+            throw new Error("Server is already running");
+        }
+
+        // Retry on bind failure: findFreePort closes its probe before we
+        // spawn, so under heavy parallelism another process can grab the
+        // same port. Each attempt picks a fresh port.
+        let lastError: unknown;
+        for (let attempt = 1; attempt <= SERVER_START_MAX_ATTEMPTS; attempt++) {
+            try {
+                await this.startOnce();
+                return;
+            } catch (error) {
+                lastError = error;
+                this.logger.warn(
+                    `Server start attempt ${attempt}/${SERVER_START_MAX_ATTEMPTS} failed: ${error instanceof Error ? error.message : String(error)}`
+                );
+                // startOnce already cleaned up its child + tempdir on failure.
+            }
+        }
+        throw new Error(
+            `Server failed to start after ${SERVER_START_MAX_ATTEMPTS} attempts: ${lastError instanceof Error ? lastError.message : String(lastError)}`,
+            { cause: lastError instanceof Error ? lastError : undefined }
+        );
+    }
+
+    private async startOnce(): Promise<void> {
+        const reservation = await findFreePort();
+        this._port = reservation.port;
+        const tmpBase = os.tmpdir();
+        this.tempDir = fs.mkdtempSync(path.join(tmpBase, "vault-link-test-"));
+        const tempConfigPath = path.join(this.tempDir, "config.yml");
+        const dbDir = path.join(this.tempDir, "databases");
+
+        this.writeConfigFile(tempConfigPath, dbDir);
+
+        this.logger.info(
+            `Starting server: ${this.serverPath} (port ${this._port})`
+        );
+
+        // Release the port reservation right before spawning to minimize
+        // the TOCTOU window between port discovery and server binding.
+        reservation.release();
+
+        this.process = spawn(this.serverPath, [tempConfigPath], {
+            stdio: ["ignore", "pipe", "pipe"],
+            detached: false
+        });
+
+        this.process.stdout?.on("data", (data: Buffer) => {
+            this.logger.info(`[SERVER] ${data.toString().trim()}`);
+        });
+
+        this.process.stderr?.on("data", (data: Buffer) => {
+            this.logger.info(`[SERVER] ${data.toString().trim()}`);
+        });
+
+        this.process.on("error", (err) => {
+            this.logger.error(`[SERVER] Process error: ${err.message}`);
+        });
+
+        const currentProcess = this.process;
+        currentProcess.on("exit", (code, signal) => {
+            this.logger.info(
+                `Server exited with code ${code}, signal ${signal}`
+            );
+            // Only clear state if this handler is for the current process.
+            // A fast stop→start cycle could create a new process before this
+            // handler fires — clearing state here would corrupt the new one.
+            if (this.process === currentProcess) {
+                this.process = null;
+                this._isPaused = false;
+            }
+        });
+
+        try {
+            await this.waitForReady();
+        } catch (error) {
+            // Kill the spawned process if it failed to become ready,
+            // preventing a zombie process from lingering.
+            try {
+                await this.stop();
+            } catch {
+                // Best-effort cleanup
+            }
+            throw error;
+        }
+    }
+
+    public async waitForReady(
+        maxAttempts: number = SERVER_READY_MAX_ATTEMPTS
+    ): Promise<void> {
+        const pingUrl = `${this.remoteUri}/vaults/test/ping`;
+        for (let i = 0; i < maxAttempts; i++) {
+            if (this.process?.exitCode !== null) {
+                throw new Error(
+                    "Server process died while waiting for it to become ready"
+                );
+            }
+            try {
+                const response = await fetch(pingUrl);
+                if (response.ok) {
+                    this.logger.info("[SERVER] Ready");
+                    return;
+                }
+            } catch {
+                // Server not ready yet, continue polling
+            }
+            await sleep(SERVER_READY_POLL_INTERVAL_MS);
+        }
+        throw new Error("Server failed to start within timeout");
+    }
+
+    public pause(): void {
+        if (this.process?.pid === undefined) {
+            throw new Error("Server is not running");
+        }
+        if (this._isPaused) {
+            this.logger.warn("Server is already paused, skipping double-pause");
+            return;
+        }
+        this.logger.info("Server pausing...");
+        try {
+            process.kill(this.process.pid, "SIGSTOP");
+            this._isPaused = true;
+            this.logger.info("Server paused (SIGSTOP sent)");
+        } catch (error) {
+            throw new Error(
+                `Failed to pause server (pid ${this.process.pid}): ${error instanceof Error ? error.message : String(error)}`
+            );
+        }
+    }
+
+    public resume(): void {
+        if (this.process?.pid === undefined) {
+            throw new Error("Server is not running");
+        }
+        if (!this._isPaused) {
+            return;
+        }
+        this.logger.info("Server resuming...");
+        try {
+            process.kill(this.process.pid, "SIGCONT");
+            this._isPaused = false;
+            this.logger.info("Server resumed (SIGCONT sent)");
+        } catch (error) {
+            throw new Error(
+                `Failed to resume server (pid ${this.process.pid}): ${error instanceof Error ? error.message : String(error)}`
+            );
+        }
+    }
+
+    public async stop(): Promise<void> {
+        const proc = this.process;
+        if (proc?.pid === undefined) {
+            this.cleanupTempDir();
+            return;
+        }
+
+        // Resume if paused — a SIGSTOP'd process ignores SIGKILL
+        if (this._isPaused) {
+            try {
+                process.kill(proc.pid, "SIGCONT");
+            } catch {
+                // Process may already be gone
+            }
+            this._isPaused = false;
+        }
+
+        this.logger.info("Server stopping...");
+
+        // Set up a promise that resolves when the process actually exits.
+        const exitPromise = new Promise<void>((resolve) => {
+            if (proc.exitCode !== null) {
+                resolve();
+                return;
+            }
+            proc.on("exit", () => {
+                resolve();
+            });
+        });
+
+        try {
+            process.kill(proc.pid, "SIGKILL");
+        } catch {
+            // Process already gone
+        }
+
+        // Wait for the process to actually exit before cleaning up,
+        // with a 5s safety timeout to avoid hanging forever.
+        await Promise.race([exitPromise, sleep(STOP_TIMEOUT_MS)]);
+
+        this.process = null;
+        this._isPaused = false;
+        this.cleanupTempDir();
+    }
+
+    public isRunning(): boolean {
+        const proc = this.process;
+        return (
+            proc !== null &&
+            proc.pid !== undefined &&
+            proc.exitCode === null &&
+            proc.signalCode === null
+        );
+    }
+
+    /**
+     * Synchronously SIGCONT-then-SIGKILL the child process. Safe to call
+     * from a `process.on("exit", ...)` handler, where async work cannot
+     * run. Used as a last-resort cleanup so a SIGSTOP'd server doesn't
+     * outlive the test runner and wedge the next CI invocation.
+     */
+    public forceKillSync(): void {
+        const proc = this.process;
+        if (proc?.pid === undefined) {
+            return;
+        }
+        try {
+            process.kill(proc.pid, "SIGCONT");
+        } catch {
+            // Process may already be gone or never paused.
+        }
+        try {
+            process.kill(proc.pid, "SIGKILL");
+        } catch {
+            // Process already gone.
+        }
+    }
+
+    private writeConfigFile(destPath: string, dbDir: string): void {
+        // Assumes config-e2e.yml has exactly one 2-space-indented `port:` and
+        // one `databases_directory_path:` (under `server:` and `database:`
+        // respectively)
+        const baseConfig = fs.readFileSync(this.baseConfigPath, "utf-8");
+        const config = baseConfig
+            .replace(/^\s*port:\s*\d+/m, `  port: ${this._port}`)
+            .replace(
+                /^\s*databases_directory_path:\s*.+/m,
+                `  databases_directory_path: ${dbDir}`
+            );
+        fs.writeFileSync(destPath, config);
+    }
+
+    private cleanupTempDir(): void {
+        if (this.tempDir !== undefined) {
+            try {
+                fs.rmSync(this.tempDir, { recursive: true, force: true });
+            } catch {
+                // Best-effort cleanup
+            }
+            this.tempDir = undefined;
+        }
+    }
+}
diff --git a/frontend/deterministic-tests/src/server-manager.ts b/frontend/deterministic-tests/src/server-manager.ts
new file mode 100644
index 00000000..76c624f7
--- /dev/null
+++ b/frontend/deterministic-tests/src/server-manager.ts
@@ -0,0 +1,71 @@
+import type { ServerControl } from "./server-control";
+import type { Logger } from "sync-client";
+
+export class ServerManager {
+    private readonly activeServers = new Set<ServerControl>();
+    private readonly logger: Logger;
+    private isShuttingDown = false;
+
+    public constructor(logger: Logger) {
+        this.logger = logger;
+    }
+
+    public track(server: ServerControl): void {
+        this.activeServers.add(server);
+    }
+
+    public untrack(server: ServerControl): void {
+        this.activeServers.delete(server);
+    }
+
+    public async stopAll(): Promise<void> {
+        if (this.isShuttingDown) {
+            return;
+        }
+        this.isShuttingDown = true;
+
+        const servers = Array.from(this.activeServers);
+        // eslint-disable-next-line no-restricted-properties
+        await Promise.all(
+            servers.map(async (server) => {
+                try {
+                    await server.stop();
+                } catch {
+                    // Best-effort cleanup during shutdown
+                }
+            })
+        );
+    }
+
+    public installSignalHandlers(): void {
+        process.on("SIGINT", () => {
+            this.logger.info("Received SIGINT, shutting down...");
+            void this.stopAll()
+                .catch(() => {
+                    /* no-op */
+                })
+                .then(() => process.exit(130));
+        });
+
+        process.on("SIGTERM", () => {
+            this.logger.info("Received SIGTERM, shutting down...");
+            void this.stopAll()
+                .catch(() => {
+                    /* no-op */
+                })
+                .then(() => process.exit(143));
+        });
+
+        // Last-resort synchronous cleanup. Runs even when the process is
+        // exiting via process.exit() from unhandledRejection /
+        // uncaughtException — paths where async stopAll() cannot complete.
+        // SIGSTOP'd servers MUST receive SIGCONT before SIGKILL or the
+        // kernel keeps them as zombies holding the test's tmpdir, and the
+        // next CI run can't reuse the port.
+        process.on("exit", () => {
+            for (const server of this.activeServers) {
+                server.forceKillSync();
+            }
+        });
+    }
+}
diff --git a/frontend/deterministic-tests/src/test-definition.ts b/frontend/deterministic-tests/src/test-definition.ts
new file mode 100644
index 00000000..bd832a50
--- /dev/null
+++ b/frontend/deterministic-tests/src/test-definition.ts
@@ -0,0 +1,49 @@
+import type { AssertableState } from "./utils/assertable-state";
+
+export interface ClientState {
+    files: Map<string, string>;
+    clientFiles: Map<string, string>[];
+}
+
+export type TestStep =
+    | { type: "create"; client: number; path: string; content: string }
+    | { type: "update"; client: number; path: string; content: string }
+    | { type: "rename"; client: number; oldPath: string; newPath: string }
+    | {
+          type: "rename-next-write";
+          client: number;
+          oldPath: string;
+          newPath: string;
+      }
+    | { type: "delete"; client: number; path: string }
+    | { type: "sync"; client?: number }
+    | { type: "disable-sync"; client: number }
+    | { type: "enable-sync"; client: number }
+    | { type: "pause-server" }
+    | { type: "resume-server" }
+    | {
+          type: "resume-server-until-history-then-pause";
+          client: number;
+          syncType: "CREATE" | "UPDATE" | "DELETE";
+          path: string;
+      }
+    | { type: "barrier" }
+    | { type: "assert-consistent"; verify?: (state: AssertableState) => void }
+    | { type: "pause-websocket"; client: number }
+    | { type: "resume-websocket"; client: number }
+    | { type: "drop-next-create-response"; client: number }
+    | { type: "wait-for-dropped-create-response"; client: number }
+    | { type: "sleep"; ms: number }
+    | { type: "reset"; client: number };
+
+export interface TestDefinition {
+    description?: string;
+    clients: number;
+    steps: TestStep[];
+}
+
+export interface TestResult {
+    success: boolean;
+    error?: string;
+    duration?: number;
+}
diff --git a/frontend/deterministic-tests/src/test-registry.ts b/frontend/deterministic-tests/src/test-registry.ts
new file mode 100644
index 00000000..1a07b411
--- /dev/null
+++ b/frontend/deterministic-tests/src/test-registry.ts
@@ -0,0 +1,245 @@
+import type { TestDefinition } from "./test-definition";
+import { renameCreateConflictTest } from "./tests/rename-create-conflict.test";
+import { renameChainTest } from "./tests/rename-chain.test";
+import { renameUpdateConflictTest } from "./tests/rename-update-conflict.test";
+import { deleteRenameConflictTest } from "./tests/delete-rename-conflict.test";
+import { multiFileOperationsTest } from "./tests/multi-file-operations.test";
+import { deleteRecreateSamePathTest } from "./tests/delete-recreate-same-path.test";
+import { offlineRenameAndEditTest } from "./tests/offline-rename-and-edit.test";
+import { simultaneousCreateDeleteSamePathTest } from "./tests/simultaneous-create-delete-same-path.test";
+import { idempotencyAfterServerPauseTest } from "./tests/idempotency-after-server-pause.test";
+import { sequentialCreateDuplicateContentTest } from "./tests/sequential-create-duplicate-content.test";
+import { mcThreeClientRenameOfflineUpdateTest } from "./tests/mc-three-client-rename-offline-update.test";
+import { mcMultiDeleteOfflineRenameTest } from "./tests/mc-multi-delete-offline-rename.test";
+import { mcCrossCreateRenameSameTargetTest } from "./tests/mc-cross-create-rename-same-target.test";
+import { mcDeleteThenOfflineRenameTest } from "./tests/mc-delete-then-offline-rename.test";
+import { offlineMixedOperationsTest } from "./tests/offline-mixed-operations.test";
+import { offlineConcurrentRenamesTest } from "./tests/offline-concurrent-renames.test";
+import { offlineMultipleEditsTest } from "./tests/offline-multiple-edits.test";
+import { serverPauseBothClientsCreateTest } from "./tests/server-pause-both-clients-create.test";
+import { serverPauseUpdateAndCreateTest } from "./tests/server-pause-update-and-create.test";
+import { renameSwapTest } from "./tests/rename-swap.test";
+import { renameCircularTest } from "./tests/rename-circular.test";
+import { renameRoundtripTest } from "./tests/rename-roundtrip.test";
+import { offlineRenameRemoteCreateOldPathTest } from "./tests/offline-rename-remote-create-old-path.test";
+import { offlineEditRemoteRenameTest } from "./tests/offline-edit-remote-rename.test";
+import { renameChainThenDeleteTest } from "./tests/rename-chain-then-delete.test";
+import { offlineDeleteRemoteRenameTest } from "./tests/offline-delete-remote-rename.test";
+import { overlappingEditsSameSectionTest } from "./tests/overlapping-edits-same-section.test";
+import { rapidUpdatesAfterMergeTest } from "./tests/rapid-updates-after-merge.test";
+import { deleteRecreateConcurrentUpdateTest } from "./tests/delete-recreate-concurrent-update.test";
+import { moveAndConcurrentRemoteUpdateTest } from "./tests/move-and-concurrent-remote-update.test";
+import { offlineDeleteVsRemoteUpdateTest } from "./tests/offline-delete-vs-remote-update.test";
+import { doubleOfflineCycleTest } from "./tests/double-offline-cycle.test";
+import { serverPauseRenameEditResumeTest } from "./tests/server-pause-rename-edit-resume.test";
+import { offlineUpdateBothThenDeleteOneTest } from "./tests/offline-update-both-then-delete-one.test";
+import { offlineCreateSamePathMergeableTest } from "./tests/offline-create-same-path-mergeable.test";
+import { deleteDuringPendingCreateTest } from "./tests/delete-during-pending-create.test";
+import { threeClientRenameCreateDeleteTest } from "./tests/three-client-rename-create-delete.test";
+import { renameToPathOfUnconfirmedDeleteTest } from "./tests/rename-to-path-of-unconfirmed-delete.test";
+import { offlineEditThenMoveSameContentTest } from "./tests/offline-edit-then-move-same-content.test";
+import { rapidCreateUpdateDeleteCycleTest } from "./tests/rapid-create-update-delete-cycle.test";
+import { serverPauseBothEditSameFileTest } from "./tests/server-pause-both-edit-same-file.test";
+import { deleteRecreateDifferentContentTest } from "./tests/delete-recreate-different-content.test";
+import { updateDuringCreateProcessingTest } from "./tests/update-during-create-processing.test";
+import { offlineMoveThenRemoteDeleteTest } from "./tests/offline-move-then-remote-delete.test";
+import { resetClearsRecentlyDeletedResurrectionTest } from "./tests/reset-clears-recently-deleted-resurrection.test";
+import { moveThenDeleteStalePathTest } from "./tests/move-then-delete-stale-path.test";
+import { interruptedDeleteRetryTest } from "./tests/interrupted-delete-retry.test";
+import { updateDoesNotSurviveRemoteDeleteTest } from "./tests/update-does-not-survive-remote-delete.test";
+import { movePreservesRemoteUpdateTest } from "./tests/move-preserves-remote-update.test";
+import { recentlyDeletedClearedOnReconnectTest } from "./tests/recently-deleted-cleared-on-reconnect.test";
+import { watermarkAdvancesOnSkipTest } from "./tests/watermark-advances-on-skip.test";
+import { watermarkGapRemoteUpdateNotRecordedTest } from "./tests/watermark-gap-remote-update-not-recorded.test";
+import { queueResetLosesCoalescedLocalEditTest } from "./tests/queue-reset-loses-coalesced-local-edit.test";
+import { renameToPendingPathFallbackTest } from "./tests/rename-to-pending-path-fallback.test";
+import { moveRemoteUpdateRevertsRenameTest } from "./tests/move-remote-update-reverts-rename.test";
+import { localEditLostDuringCreateMergeTest } from "./tests/local-edit-lost-during-create-merge.test";
+import { renamePendingCreateBeforeResponseTest } from "./tests/rename-pending-create-before-response.test";
+import { createRenameResponseSkipsFileTest } from "./tests/create-rename-response-skips-file.test";
+import { onlineCreateRenameConcurrentCreateOrphanTest } from "./tests/online-create-rename-concurrent-create-orphan.test";
+import { concurrentRenameFirstWinsTest } from "./tests/concurrent-rename-first-wins.test";
+import { binaryToTextTransitionTest } from "./tests/binary-to-text-transition.test";
+import { textPendingCreateNotDisplacedTest } from "./tests/text-pending-create-not-displaced.test";
+import { binaryPendingCreateNotDisplacedTest } from "./tests/binary-pending-create-not-displaced.test";
+import { coalesceUpdateRemoteUpdateDataLossTest } from "./tests/coalesce-update-remote-update-data-loss.test";
+import { coalescedRemoteUpdateWatermarkLossTest } from "./tests/coalesced-remote-update-watermark-loss.test";
+import { concurrentDeleteDuringRemoteUpdateTest } from "./tests/concurrent-delete-during-remote-update.test";
+import { concurrentEditExactSamePositionTest } from "./tests/concurrent-edit-exact-same-position.test";
+import { concurrentRenameAndCreateAtTargetRenameFirstTest } from "./tests/concurrent-rename-and-create-at-target-rename-first.test";
+import { concurrentRenameAndCreateAtTargetCreateFirstTest } from "./tests/concurrent-rename-and-create-at-target-create-first.test";
+import { concurrentRenameSameTargetTest } from "./tests/concurrent-rename-same-target.test";
+import { concurrentUpdateDiffConsistencyTest } from "./tests/concurrent-update-diff-consistency.test";
+import { userParenthesizedFileNotDeletedTest } from "./tests/user-parenthesized-file-not-deleted.test";
+import { createDeleteNoopTest } from "./tests/create-delete-noop.test";
+import { createMergeDeleteTest } from "./tests/create-merge-delete.test";
+import { moveIdenticalContentAmbiguityTest } from "./tests/move-identical-content-ambiguity.test";
+import { createUpdateCoalesceServerPauseTest } from "./tests/create-update-coalesce-server-pause.test";
+import { createDuringReconciliationTest } from "./tests/create-during-reconciliation.test";
+import { createMergePreservesRenamedUpdateTest } from "./tests/create-merge-preserves-renamed-update.test";
+import { createRenameCreateSamePathTest } from "./tests/create-rename-create-same-path.test";
+import { moveChainThreeFilesTest } from "./tests/move-chain-three-files.test";
+import { deleteByOtherClientThenRecreateTest } from "./tests/delete-by-other-client-then-recreate.test";
+import { onlineDeleteRecreateRapidCycleTest } from "./tests/online-delete-recreate-rapid-cycle.test";
+import { onlineEditVsDeleteConvergenceTest } from "./tests/online-edit-vs-delete-convergence.test";
+import { rapidEditDeleteOnlineConvergenceTest } from "./tests/rapid-edit-delete-online-convergence.test";
+import { serverPauseDeleteRecreateTest } from "./tests/server-pause-delete-recreate.test";
+import { onlineBothCreateSamePathDeconflictTest } from "./tests/online-both-create-same-path-deconflict.test";
+import { onlineCreateUpdateWhileOtherCreatesSamePathTest } from "./tests/online-create-update-while-other-creates-same-path.test";
+import { displacedFileNotMarkedDeletedTest } from "./tests/displaced-file-not-marked-deleted.test";
+import { remoteUpdateResurrectsDeletedDocTest } from "./tests/remote-update-resurrects-deleted-doc.test";
+import { localUpdateSurvivesRemoteRenameTest } from "./tests/local-update-survives-remote-rename.test";
+import { mergingUpdateResponseSurvivesUserRenameTest } from "./tests/merging-update-response-survives-user-rename.test";
+import { catchupCreateAndUpdateNotSkippedTest } from "./tests/catchup-create-and-update-not-skipped.test";
+import { localRenameSurvivesRemoteRenameTest } from "./tests/local-rename-survives-remote-rename.test";
+import { renameChainDuringPendingCreateTest } from "./tests/rename-chain-during-pending-create.test";
+import { remoteRenameCollidesWithPendingLocalCreateTest } from "./tests/remote-rename-collides-with-pending-local-create.test";
+import { remoteUpdateSurvivesUserRenameTest } from "./tests/remote-update-survives-user-rename.test";
+import { sameDocIdCollapseOnLocalCreateAfterRemoteCreateTest } from "./tests/same-doc-id-collapse-on-local-create-after-remote-create.test";
+import { sameDocIdCollapseAfterRemoteQuickWriteAndPendingRenameTest } from "./tests/same-doc-id-collapse-after-remote-quick-write-and-pending-rename.test";
+import { renameOverwritesPendingCreateThenDeleteTest } from "./tests/rename-overwrites-pending-create-then-delete.test";
+import { deleteRecreatedPendingCreateWithStaleDeletingRecordTest } from "./tests/delete-recreated-pending-create-with-stale-deleting-record.test";
+import { queuedCreateDeleteDoesNotHijackReusedPathTest } from "./tests/queued-create-delete-does-not-hijack-reused-path.test";
+import { renamedPendingCreateReusedPathThenDeleteTest } from "./tests/renamed-pending-create-reused-path-then-delete.test";
+import { renamePendingCreateOntoPendingDeletePathTest } from "./tests/rename-pending-create-onto-pending-delete-path.test";
+import { remoteQuickWriteRenameBeforeRecordTest } from "./tests/remote-quick-write-rename-before-record.test";
+import { selfMergePendingRenameAliasesSecondCreateTest } from "./tests/self-merge-pending-rename-aliases-second-create.test";
+
+export const TESTS: Partial<Record<string, TestDefinition>> = {
+    "rename-create-conflict": renameCreateConflictTest,
+    "rename-chain": renameChainTest,
+    "rename-update-conflict": renameUpdateConflictTest,
+    "delete-rename-conflict": deleteRenameConflictTest,
+    "multi-file-operations": multiFileOperationsTest,
+    "delete-recreate-same-path": deleteRecreateSamePathTest,
+    "offline-rename-and-edit": offlineRenameAndEditTest,
+    "simultaneous-create-delete-same-path":
+        simultaneousCreateDeleteSamePathTest,
+    "idempotency-after-server-pause": idempotencyAfterServerPauseTest,
+    "sequential-create-duplicate-content": sequentialCreateDuplicateContentTest,
+    "mc-three-client-rename-offline-update":
+        mcThreeClientRenameOfflineUpdateTest,
+    "mc-multi-delete-offline-rename": mcMultiDeleteOfflineRenameTest,
+    "mc-cross-create-rename-same-target": mcCrossCreateRenameSameTargetTest,
+    "mc-delete-then-offline-rename": mcDeleteThenOfflineRenameTest,
+    "offline-mixed-operations": offlineMixedOperationsTest,
+    "offline-concurrent-renames": offlineConcurrentRenamesTest,
+    "offline-multiple-edits": offlineMultipleEditsTest,
+    "server-pause-both-clients-create": serverPauseBothClientsCreateTest,
+    "server-pause-update-and-create": serverPauseUpdateAndCreateTest,
+    "rename-swap": renameSwapTest,
+    "rename-circular": renameCircularTest,
+    "rename-roundtrip": renameRoundtripTest,
+    "offline-rename-remote-create-old-path":
+        offlineRenameRemoteCreateOldPathTest,
+    "offline-edit-remote-rename": offlineEditRemoteRenameTest,
+    "rename-chain-then-delete": renameChainThenDeleteTest,
+    "offline-delete-remote-rename": offlineDeleteRemoteRenameTest,
+    "overlapping-edits-same-section": overlappingEditsSameSectionTest,
+    "rapid-updates-after-merge": rapidUpdatesAfterMergeTest,
+    "delete-recreate-concurrent-update": deleteRecreateConcurrentUpdateTest,
+    "move-and-concurrent-remote-update": moveAndConcurrentRemoteUpdateTest,
+    "double-offline-cycle": doubleOfflineCycleTest,
+    "server-pause-rename-edit-resume": serverPauseRenameEditResumeTest,
+    "offline-update-both-then-delete-one": offlineUpdateBothThenDeleteOneTest,
+    "offline-create-same-path-mergeable": offlineCreateSamePathMergeableTest,
+    "delete-during-pending-create": deleteDuringPendingCreateTest,
+    "three-client-rename-create-delete": threeClientRenameCreateDeleteTest,
+    "rename-to-path-of-unconfirmed-delete": renameToPathOfUnconfirmedDeleteTest,
+    "offline-edit-then-move-same-content": offlineEditThenMoveSameContentTest,
+    "rapid-create-update-delete-cycle": rapidCreateUpdateDeleteCycleTest,
+    "server-pause-both-edit-same-file": serverPauseBothEditSameFileTest,
+    "delete-recreate-different-content": deleteRecreateDifferentContentTest,
+    "update-during-create-processing": updateDuringCreateProcessingTest,
+    "offline-move-then-remote-delete": offlineMoveThenRemoteDeleteTest,
+    "reset-clears-recently-deleted-resurrection":
+        resetClearsRecentlyDeletedResurrectionTest,
+    "move-then-delete-stale-path": moveThenDeleteStalePathTest,
+    "offline-delete-vs-remote-update": offlineDeleteVsRemoteUpdateTest,
+    "interrupted-delete-retry": interruptedDeleteRetryTest,
+    "update-does-not-survive-remote-delete": updateDoesNotSurviveRemoteDeleteTest,
+    "move-preserves-remote-update": movePreservesRemoteUpdateTest,
+    "recently-deleted-cleared-on-reconnect":
+        recentlyDeletedClearedOnReconnectTest,
+    "watermark-advances-on-skip": watermarkAdvancesOnSkipTest,
+    "watermark-gap-remote-update-not-recorded":
+        watermarkGapRemoteUpdateNotRecordedTest,
+    "queue-reset-loses-coalesced-local-edit":
+        queueResetLosesCoalescedLocalEditTest,
+    "rename-to-pending-path-fallback": renameToPendingPathFallbackTest,
+    "move-remote-update-reverts-rename": moveRemoteUpdateRevertsRenameTest,
+    "local-edit-lost-during-create-merge": localEditLostDuringCreateMergeTest,
+    "rename-pending-create-before-response":
+        renamePendingCreateBeforeResponseTest,
+    "create-rename-response-skips-file": createRenameResponseSkipsFileTest,
+    "online-create-rename-concurrent-create-orphan":
+        onlineCreateRenameConcurrentCreateOrphanTest,
+    "concurrent-rename-first-wins": concurrentRenameFirstWinsTest,
+    "binary-to-text-transition": binaryToTextTransitionTest,
+    "text-pending-create-not-displaced": textPendingCreateNotDisplacedTest,
+    "binary-pending-create-not-displaced": binaryPendingCreateNotDisplacedTest,
+    "coalesce-update-remote-update-data-loss":
+        coalesceUpdateRemoteUpdateDataLossTest,
+    "coalesced-remote-update-watermark-loss":
+        coalescedRemoteUpdateWatermarkLossTest,
+    "concurrent-delete-during-remote-update":
+        concurrentDeleteDuringRemoteUpdateTest,
+    "concurrent-edit-exact-same-position": concurrentEditExactSamePositionTest,
+    "concurrent-rename-and-create-at-target-rename-first":
+        concurrentRenameAndCreateAtTargetRenameFirstTest,
+    "concurrent-rename-and-create-at-target-create-first":
+        concurrentRenameAndCreateAtTargetCreateFirstTest,
+    "concurrent-rename-same-target": concurrentRenameSameTargetTest,
+    "concurrent-update-diff-consistency": concurrentUpdateDiffConsistencyTest,
+    "user-parenthesized-file-not-deleted": userParenthesizedFileNotDeletedTest,
+    "create-delete-noop": createDeleteNoopTest,
+    "create-merge-delete": createMergeDeleteTest,
+    "move-identical-content-ambiguity": moveIdenticalContentAmbiguityTest,
+    "create-update-coalesce-server-pause": createUpdateCoalesceServerPauseTest,
+    "create-during-reconciliation": createDuringReconciliationTest,
+    "create-merge-preserves-renamed-update":
+        createMergePreservesRenamedUpdateTest,
+    "create-rename-create-same-path": createRenameCreateSamePathTest,
+    "move-chain-three-files": moveChainThreeFilesTest,
+    "delete-by-other-client-then-recreate": deleteByOtherClientThenRecreateTest,
+    "online-delete-recreate-rapid-cycle": onlineDeleteRecreateRapidCycleTest,
+    "online-edit-vs-delete-convergence": onlineEditVsDeleteConvergenceTest,
+    "rapid-edit-delete-online-convergence":
+        rapidEditDeleteOnlineConvergenceTest,
+    "server-pause-delete-recreate": serverPauseDeleteRecreateTest,
+    "online-both-create-same-path-deconflict":
+        onlineBothCreateSamePathDeconflictTest,
+    "online-create-update-while-other-creates-same-path":
+        onlineCreateUpdateWhileOtherCreatesSamePathTest,
+    "displaced-file-not-marked-deleted": displacedFileNotMarkedDeletedTest,
+    "remote-update-resurrects-deleted-doc":
+        remoteUpdateResurrectsDeletedDocTest,
+    "local-update-survives-remote-rename": localUpdateSurvivesRemoteRenameTest,
+    "merging-update-response-survives-user-rename":
+        mergingUpdateResponseSurvivesUserRenameTest,
+    "catchup-create-and-update-not-skipped":
+        catchupCreateAndUpdateNotSkippedTest,
+    "local-rename-survives-remote-rename": localRenameSurvivesRemoteRenameTest,
+    "rename-chain-during-pending-create": renameChainDuringPendingCreateTest,
+    "remote-rename-collides-with-pending-local-create":
+        remoteRenameCollidesWithPendingLocalCreateTest,
+    "remote-update-survives-user-rename": remoteUpdateSurvivesUserRenameTest,
+    "same-doc-id-collapse-on-local-create-after-remote-create":
+        sameDocIdCollapseOnLocalCreateAfterRemoteCreateTest,
+    "renamed-pending-create-reused-path-then-delete":
+        renamedPendingCreateReusedPathThenDeleteTest,
+    "rename-pending-create-onto-pending-delete-path":
+        renamePendingCreateOntoPendingDeletePathTest,
+    "rename-overwrites-pending-create-then-delete":
+        renameOverwritesPendingCreateThenDeleteTest,
+    "same-doc-id-collapse-after-remote-quick-write-and-pending-rename":
+        sameDocIdCollapseAfterRemoteQuickWriteAndPendingRenameTest,
+    "delete-recreated-pending-create-with-stale-deleting-record":
+        deleteRecreatedPendingCreateWithStaleDeletingRecordTest,
+    "queued-create-delete-does-not-hijack-reused-path":
+        queuedCreateDeleteDoesNotHijackReusedPathTest,
+    "remote-quick-write-rename-before-record":
+        remoteQuickWriteRenameBeforeRecordTest,
+    "self-merge-pending-rename-aliases-second-create":
+        selfMergePendingRenameAliasesSecondCreateTest
+};
diff --git a/frontend/deterministic-tests/src/test-runner.ts b/frontend/deterministic-tests/src/test-runner.ts
new file mode 100644
index 00000000..411e9b08
--- /dev/null
+++ b/frontend/deterministic-tests/src/test-runner.ts
@@ -0,0 +1,399 @@
+import type { TestDefinition, TestResult, TestStep } from "./test-definition";
+import { DeterministicAgent } from "./deterministic-agent";
+import type { ServerControl } from "./server-control";
+import type { SyncSettings, Logger } from "sync-client";
+import { assert } from "./utils/assert";
+import { AssertableState } from "./utils/assertable-state";
+import { sleep } from "./utils/sleep";
+import { withTimeout } from "./utils/with-timeout";
+import {
+    CONVERGENCE_TIMEOUT_MS,
+    CONVERGENCE_RETRY_DELAY_MS,
+    AGENT_INIT_TIMEOUT_MS,
+    IS_SYNC_ENABLED_BY_DEFAULT
+} from "./consts";
+import { randomUUID } from "node:crypto";
+
+export class TestRunner {
+    private agents: DeterministicAgent[] = [];
+    private readonly serverControl: ServerControl;
+    private readonly token: string;
+    private readonly remoteUri: string;
+    private readonly logger: Logger;
+
+    public constructor(
+        serverControl: ServerControl,
+        logger: Logger,
+        token: string,
+        remoteUri: string
+    ) {
+        this.serverControl = serverControl;
+        this.logger = logger;
+        this.token = token;
+        this.remoteUri = remoteUri;
+    }
+
+    public async runTest(
+        name: string,
+        test: TestDefinition
+    ): Promise<TestResult> {
+        const startTime = Date.now();
+        this.logger.info(`Running test: ${name}`);
+        if (test.description !== undefined && test.description !== "") {
+            this.logger.info(`Description: ${test.description}`);
+        }
+        this.logger.info(`Clients: ${test.clients}`);
+        this.logger.info(`Steps: ${test.steps.length}`);
+
+        try {
+            assert(
+                this.serverControl.isRunning(),
+                "Server is not running before test start"
+            );
+
+            await this.initializeAgents(test.clients);
+
+            for (let i = 0; i < test.steps.length; i++) {
+                const step = test.steps[i];
+                this.logger.info(
+                    `Step ${i + 1}/${test.steps.length}: ${JSON.stringify(step)}`
+                );
+                await this.executeStep(step);
+            }
+
+            await this.cleanup();
+
+            const duration = Date.now() - startTime;
+            this.logger.info(`\n✓ Test passed: ${name} (${duration}ms)`);
+
+            return {
+                success: true,
+                duration
+            };
+        } catch (error) {
+            const duration = Date.now() - startTime;
+            const errorMessage =
+                error instanceof Error ? error.message : String(error);
+            this.logger.info(`\n✗ Test failed: ${name}`);
+            this.logger.info(`Error: ${errorMessage}`);
+
+            await this.cleanup();
+
+            return {
+                success: false,
+                error: errorMessage,
+                duration
+            };
+        }
+    }
+
+    private async initializeAgents(count: number): Promise<void> {
+        assert(count > 0, `Client count must be positive, got ${count}`);
+        const vaultName = `test-${randomUUID()}`;
+        this.logger.info(
+            `Initializing ${count} agents with vault: ${vaultName}`
+        );
+
+        for (let i = 0; i < count; i++) {
+            const settings: Partial<SyncSettings> = {
+                isSyncEnabled: IS_SYNC_ENABLED_BY_DEFAULT,
+                token: this.token,
+                vaultName,
+                remoteUri: this.remoteUri
+            };
+
+            const agent = new DeterministicAgent(i, settings, (msg) => {
+                this.logger.info(msg);
+            });
+
+            // Push before init so cleanup() handles this agent if init fails
+            this.agents.push(agent);
+            await withTimeout(
+                agent.init(fetch),
+                AGENT_INIT_TIMEOUT_MS,
+                `Client ${i} init timed out after ${AGENT_INIT_TIMEOUT_MS}ms`
+            );
+            this.logger.info(`Initialized client ${i}`);
+        }
+
+        this.logger.info("All agents initialized");
+    }
+
+    private getAgent(index: number): DeterministicAgent {
+        assert(
+            index >= 0 && index < this.agents.length,
+            `Client index ${index} out of bounds (have ${this.agents.length} agents)`
+        );
+        return this.agents[index];
+    }
+
+    private async executeStep(step: TestStep): Promise<void> {
+        switch (step.type) {
+            case "create":
+            case "update":
+                await this.getAgent(step.client).write(
+                    step.path,
+                    new TextEncoder().encode(step.content)
+                );
+                break;
+
+            case "rename":
+                await this.getAgent(step.client).rename(
+                    step.oldPath,
+                    step.newPath
+                );
+                break;
+
+            case "rename-next-write":
+                this.getAgent(step.client).renameNextWrite(
+                    step.oldPath,
+                    step.newPath
+                );
+                break;
+
+            case "delete":
+                await this.getAgent(step.client).delete(step.path);
+                break;
+
+            case "sync":
+                if (step.client !== undefined) {
+                    await this.getAgent(step.client).waitForSync();
+                } else {
+                    for (const agent of this.agents) {
+                        await agent.waitForSync();
+                    }
+                }
+                break;
+
+            case "disable-sync":
+                await this.getAgent(step.client).disableSync();
+                break;
+
+            case "enable-sync":
+                await this.getAgent(step.client).enableSync();
+                break;
+
+            case "pause-server":
+                this.serverControl.pause();
+                break;
+
+            case "resume-server":
+                this.serverControl.resume();
+                // Verify the server is actually responsive before proceeding.
+                // This replaces relying solely on hardcoded waits.
+                await this.serverControl.waitForReady();
+                break;
+
+            case "resume-server-until-history-then-pause": {
+                const agent = this.getAgent(step.client);
+                const historySeen = agent.waitForHistoryEntry(
+                    (entry) =>
+                        entry.details.type === step.syncType &&
+                        entry.details.relativePath === step.path,
+                    () => this.serverControl.pause()
+                );
+                this.serverControl.resume();
+                await historySeen;
+                break;
+            }
+
+            case "barrier":
+                await this.waitForConvergence();
+                break;
+
+            case "assert-consistent":
+                await this.assertConsistent(step.verify);
+                break;
+
+            case "pause-websocket":
+                this.getAgent(step.client).pauseWebSocket();
+                break;
+
+            case "resume-websocket":
+                this.getAgent(step.client).resumeWebSocket();
+                break;
+
+            case "drop-next-create-response":
+                this.getAgent(step.client).dropNextCreateResponse();
+                break;
+
+            case "wait-for-dropped-create-response":
+                await this.getAgent(step.client).waitForDroppedCreateResponse();
+                break;
+
+            case "sleep":
+                await sleep(step.ms);
+                break;
+
+            case "reset":
+                await this.getAgent(step.client).reset();
+                break;
+
+            default: {
+                const unknownStep = step as { type: string };
+                throw new Error(`Unknown step type: ${unknownStep.type}`);
+            }
+        }
+    }
+
+    /**
+     * Wait for all agents to reach a consistent state.
+     *
+     * Waiting for agents is done in two full rounds: the first round
+     * drains in-flight operations, but completing those operations can
+     * trigger new work on OTHER agents via server broadcasts. The second
+     * round waits for that cascading work to settle. Deeper cascades
+     * are handled by the outer retry loop.
+     */
+    private async waitForConvergence(): Promise<void> {
+        this.logger.info("Barrier: waiting for convergence...");
+
+        const deadline = Date.now() + CONVERGENCE_TIMEOUT_MS;
+        let lastError: Error | undefined = undefined;
+
+        while (Date.now() < deadline) {
+            await this.waitAllAgentsSettled();
+
+            try {
+                await this.assertConsistent();
+                this.logger.info("Barrier complete: all clients converged");
+                return;
+            } catch (error) {
+                lastError =
+                    error instanceof Error ? error : new Error(String(error));
+                this.logger.info("Barrier: not yet converged, retrying...");
+                await sleep(CONVERGENCE_RETRY_DELAY_MS);
+            }
+        }
+
+        throw new Error(
+            `Convergence timed out after ${CONVERGENCE_TIMEOUT_MS}ms: ${lastError?.message ?? "no consistency check ran"}`,
+            { cause: lastError }
+        );
+    }
+
+    /**
+     * Wait for all agents to be simultaneously idle.
+     *
+     * Completing work on agent A can trigger a server broadcast that
+     * enqueues new work on agent B, which can cascade further. With N
+     * agents the worst-case cascade depth is N (a chain A→B→C→…→A),
+     * so we run N+1 sequential passes to drain it. Extra passes are
+     * essentially free when there is no outstanding work.
+     *
+     * The outer {@link waitForConvergence} loop with consistency checks
+     * remains the ultimate guarantee — this method just minimizes how
+     * many slow retry iterations are needed.
+     */
+    private async waitAllAgentsSettled(): Promise<void> {
+        const rounds = this.agents.length + 1;
+        for (let round = 0; round < rounds; round++) {
+            for (const agent of this.agents) {
+                await agent.waitForSync();
+            }
+        }
+    }
+
+    private async assertConsistent(
+        verify?: (state: AssertableState) => void
+    ): Promise<void> {
+        this.logger.info("Asserting all clients are consistent...");
+        assert(
+            this.agents.length >= 2,
+            "Need at least 2 agents for consistency check"
+        );
+
+        // Snapshot all agents' file states upfront to minimize the window
+        // where background sync could mutate state between reads.
+        const clientFiles: Map<string, string>[] = [];
+        for (const agent of this.agents) {
+            const sortedFiles = (await agent.listFilesRecursively()).sort();
+            const fileMap = new Map<string, string>();
+            for (const file of sortedFiles) {
+                const content = await agent.getFileContent(file);
+                fileMap.set(file, content);
+            }
+            clientFiles.push(fileMap);
+        }
+
+        const referenceFiles = Array.from(clientFiles[0].keys());
+
+        this.logger.info(
+            `Reference client has ${referenceFiles.length} files: ${referenceFiles.join(", ")}`
+        );
+
+        for (let i = 1; i < clientFiles.length; i++) {
+            const agentFileKeys = Array.from(clientFiles[i].keys());
+
+            this.logger.info(
+                `Client ${i} has ${agentFileKeys.length} files: ${agentFileKeys.join(", ")}`
+            );
+
+            assert(
+                agentFileKeys.length === referenceFiles.length,
+                `File count mismatch: client 0 has ${referenceFiles.length} files, client ${i} has ${agentFileKeys.length} files`
+            );
+
+            for (let j = 0; j < agentFileKeys.length; j++) {
+                assert(
+                    agentFileKeys[j] === referenceFiles[j],
+                    `File list mismatch at index ${j}: client 0 has "${referenceFiles[j]}", client ${i} has "${agentFileKeys[j]}"`
+                );
+            }
+
+            for (const file of referenceFiles) {
+                const referenceContent = clientFiles[0].get(file);
+                const agentContent = clientFiles[i].get(file);
+
+                assert(
+                    referenceContent === agentContent,
+                    `Content mismatch for ${file}:\nClient 0: "${referenceContent}"\nClient ${i}: "${agentContent}"`
+                );
+            }
+        }
+
+        this.logger.info("✓ All clients are consistent");
+
+        if (verify) {
+            this.logger.info("Running custom verification...");
+            try {
+                verify(
+                    new AssertableState({
+                        files: clientFiles[0],
+                        clientFiles
+                    })
+                );
+            } catch (error) {
+                const msg =
+                    error instanceof Error ? error.message : String(error);
+                throw new Error(`Custom verification failed: ${msg}`);
+            }
+            this.logger.info("✓ Custom verification passed");
+        }
+    }
+
+    private async cleanup(): Promise<void> {
+        // Always resume the server in case a test paused it and then
+        // failed before reaching the resume step. Without this, all
+        // subsequent tests would hang because the server process is
+        // frozen (SIGSTOP) and can't respond to HTTP or WebSocket.
+        try {
+            this.serverControl.resume();
+        } catch {
+            // Server wasn't paused or isn't running — safe to ignore
+        }
+
+        this.logger.info("\nCleaning up agents...");
+        for (const agent of this.agents) {
+            try {
+                await agent.cleanup();
+            } catch (error) {
+                this.logger.warn(
+                    `Agent cleanup error: ${error instanceof Error ? error.message : String(error)}`
+                );
+            }
+        }
+        this.agents = [];
+        this.logger.info("Cleanup complete");
+    }
+}
diff --git a/frontend/deterministic-tests/src/tests/binary-pending-create-not-displaced.test.ts b/frontend/deterministic-tests/src/tests/binary-pending-create-not-displaced.test.ts
new file mode 100644
index 00000000..467c19f0
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/binary-pending-create-not-displaced.test.ts
@@ -0,0 +1,40 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const binaryPendingCreateNotDisplacedTest: TestDefinition = {
+    description:
+        "Two clients each create a binary file at the same path while offline. " +
+        "After syncing, both files should exist on both clients at separate paths.",
+    clients: 2,
+    steps: [
+        {
+            type: "create",
+            client: 0,
+            path: "data.bin",
+            content: "binary data from client 0"
+        },
+        {
+            type: "create",
+            client: 1,
+            path: "data.bin",
+            content: "binary data from client 1"
+        },
+
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileCount(2)
+                    .assertFileExists("data.bin")
+                    .assertFileExists("data (1).bin")
+                    .assertAnyFileContains(
+                        "binary data from client 0",
+                        "binary data from client 1"
+                    );
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/binary-to-text-transition.test.ts b/frontend/deterministic-tests/src/tests/binary-to-text-transition.test.ts
new file mode 100644
index 00000000..8b934c1b
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/binary-to-text-transition.test.ts
@@ -0,0 +1,97 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const binaryToTextTransitionTest: TestDefinition = {
+    description:
+        "A .bin file is created and synced. Both clients edit it offline " +
+        "(binary last-write-wins), then client 0 renames it to .md and " +
+        "writes a clean text baseline. Both clients edit different sections " +
+        "offline. The text merge should preserve both edits.",
+    clients: 2,
+    steps: [
+        {
+            type: "create",
+            client: 0,
+            path: "data.bin",
+            content: "original content"
+        },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertContent("data.bin", "original content");
+            }
+        },
+
+        { type: "disable-sync", client: 0 },
+        { type: "disable-sync", client: 1 },
+
+        { type: "update", client: 0, path: "data.bin", content: "version A" },
+        { type: "update", client: 1, path: "data.bin", content: "version B" },
+
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileCount(1).assertContainsAny(
+                    "data.bin",
+                    "version A",
+                    "version B"
+                );
+            }
+        },
+
+        { type: "disable-sync", client: 1 },
+        { type: "rename", client: 0, oldPath: "data.bin", newPath: "data.md" },
+        {
+            type: "update",
+            client: 0,
+            path: "data.md",
+            content: "top line\nmiddle line\nbottom line"
+        },
+        { type: "sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertContent(
+                    "data.md",
+                    "top line\nmiddle line\nbottom line"
+                );
+            }
+        },
+
+        { type: "disable-sync", client: 0 },
+        { type: "disable-sync", client: 1 },
+
+        {
+            type: "update",
+            client: 0,
+            path: "data.md",
+            content: "alpha\nmiddle line\nbottom line"
+        },
+        {
+            type: "update",
+            client: 1,
+            path: "data.md",
+            content: "top line\nmiddle line\nbeta"
+        },
+
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileCount(1).assertContains("data.md", "alpha", "beta");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/catchup-create-and-update-not-skipped.test.ts b/frontend/deterministic-tests/src/tests/catchup-create-and-update-not-skipped.test.ts
new file mode 100644
index 00000000..2d40228f
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/catchup-create-and-update-not-skipped.test.ts
@@ -0,0 +1,66 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const catchupCreateAndUpdateNotSkippedTest: TestDefinition = {
+    description:
+        "Client 1 disconnects (sync disabled). Client 0 creates a doc and " +
+        "then updates it. When Client 1 reconnects, the server's catch-up " +
+        "stream sends only the doc's *latest* version (the update), not the " +
+        "full history. Pre-fix the wire's `is_new_file` was set to " +
+        "`creation == latest_version`, so the catch-up flagged the doc as " +
+        "non-new even though Client 1 had never seen its creation. Client " +
+        "1's `processRemoteChange` then dropped it as a 'stale RemoteChange " +
+        "for untracked, non-new document' and the doc was silently lost. " +
+        "Post-fix `is_new_file` in the catch-up stream means 'new relative " +
+        "to the recipient's watermark' (`creation > last_seen_vault_update_id`).",
+    clients: 2,
+    steps: [
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        // Establish a baseline so Client 1's last_seen is non-zero before
+        // we take it offline. This makes the bug genuinely about catch-up
+        // missing the create rather than just an empty-vault first sync.
+        { type: "create", client: 0, path: "warmup.md", content: "w\n" },
+        { type: "barrier" },
+
+        // Client 1 goes offline.
+        { type: "disable-sync", client: 1 },
+
+        // Client 0 creates the doc (vault_update_id v_C, after Client 1's
+        // watermark). Client 1 doesn't see this because it's offline.
+        { type: "create", client: 0, path: "doc.md", content: "v1\n" },
+        // Wait for the create's HTTP to land before the update; otherwise
+        // both writes are coalesced into a single POST and the server
+        // never sees the doc as "create followed by update".
+        { type: "sync", client: 0 },
+
+        // Client 0 updates the doc (vault_update_id v_X > v_C). The
+        // server's `latest_document_versions` view now returns the
+        // *update* row — its `creation_vault_update_id != vault_update_id`.
+        {
+            type: "update",
+            client: 0,
+            path: "doc.md",
+            content: "v1\nupdate\n"
+        },
+        { type: "sync", client: 0 },
+
+        // Client 1 reconnects. Server's catch-up replays docs with
+        // `vault_update_id > last_seen`. For doc.md it sends v_X with
+        // `is_new_file` derived from `creation_vault_update_id >
+        // last_seen_vault_update_id` (post-fix) — so Client 1 treats it
+        // as a fresh create and downloads the latest content.
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (state: AssertableState): void => {
+                state.assertFileCount(2);
+                state.assertFileExists("doc.md");
+                state.assertContent("doc.md", "v1\nupdate\n");
+                state.assertContent("warmup.md", "w\n");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/coalesce-update-remote-update-data-loss.test.ts b/frontend/deterministic-tests/src/tests/coalesce-update-remote-update-data-loss.test.ts
new file mode 100644
index 00000000..1972526a
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/coalesce-update-remote-update-data-loss.test.ts
@@ -0,0 +1,59 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const coalesceUpdateRemoteUpdateDataLossTest: TestDefinition = {
+    description:
+        "Divergent offline edits with text-merge expectation. Client 0's " +
+        "remote update fully lands before Client 1 reconnects (`sync`-after " +
+        "the c0 update enforces this), so Client 1's offline edit merges " +
+        "against a server-known version, not a coalesced batch. Both " +
+        "additions must survive in the final merged content. (Filename's " +
+        "'coalesce' framing is aspirational — a true update-coalesce test " +
+        "would skip the c0 sync and queue overlapping local + remote " +
+        "updates against the same parent version.)",
+    clients: 2,
+    steps: [
+        {
+            type: "create",
+            client: 0,
+            path: "doc.md",
+            content: "line 1\nline 2\nline 3"
+        },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        { type: "disable-sync", client: 1 },
+
+        {
+            type: "update",
+            client: 0,
+            path: "doc.md",
+            content: "line 1\nline 2\nline 3\nclient 0 addition"
+        },
+        { type: "sync", client: 0 },
+
+        {
+            type: "update",
+            client: 1,
+            path: "doc.md",
+            content: "client 1 addition\nline 1\nline 2\nline 3"
+        },
+
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (state: AssertableState): void => {
+                state
+                    .assertFileCount(1)
+                    .assertContains(
+                        "doc.md",
+                        "client 0 addition",
+                        "client 1 addition"
+                    );
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/coalesced-remote-update-watermark-loss.test.ts b/frontend/deterministic-tests/src/tests/coalesced-remote-update-watermark-loss.test.ts
new file mode 100644
index 00000000..aceb8baa
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/coalesced-remote-update-watermark-loss.test.ts
@@ -0,0 +1,53 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const coalescedRemoteUpdateWatermarkLossTest: TestDefinition = {
+    description:
+        "Client 0 sends three rapid updates. After syncing, both clients " +
+        "disconnect and reconnect twice. Content should remain correct " +
+        "after each reconnect.",
+    clients: 2,
+    steps: [
+        { type: "create", client: 0, path: "doc.md", content: "original" },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        { type: "update", client: 0, path: "doc.md", content: "update 1" },
+        { type: "update", client: 0, path: "doc.md", content: "update 2" },
+        { type: "update", client: 0, path: "doc.md", content: "final update" },
+
+        { type: "barrier" },
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileCount(1).assertContent("doc.md", "final update");
+            }
+        },
+
+        { type: "disable-sync", client: 0 },
+        { type: "disable-sync", client: 1 },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileCount(1).assertContent("doc.md", "final update");
+            }
+        },
+
+        { type: "disable-sync", client: 0 },
+        { type: "disable-sync", client: 1 },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileCount(1).assertContent("doc.md", "final update");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/concurrent-delete-during-remote-update.test.ts b/frontend/deterministic-tests/src/tests/concurrent-delete-during-remote-update.test.ts
new file mode 100644
index 00000000..88376f22
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/concurrent-delete-during-remote-update.test.ts
@@ -0,0 +1,32 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const concurrentDeleteDuringRemoteUpdateTest: TestDefinition = {
+    description:
+        "One client updates a file while the other deletes it at the same " +
+        "time. Both clients should converge without errors.",
+    clients: 2,
+    steps: [
+        { type: "create", client: 0, path: "doc.md", content: "original" },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        { type: "disable-sync", client: 0 },
+        { type: "disable-sync", client: 1 },
+
+        { type: "update", client: 0, path: "doc.md", content: "updated by 0" },
+        { type: "delete", client: 1, path: "doc.md" },
+
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (state: AssertableState): void => {
+                state.assertFileCount(0);
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/concurrent-edit-exact-same-position.test.ts b/frontend/deterministic-tests/src/tests/concurrent-edit-exact-same-position.test.ts
new file mode 100644
index 00000000..5c141a0e
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/concurrent-edit-exact-same-position.test.ts
@@ -0,0 +1,49 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const concurrentEditExactSamePositionTest: TestDefinition = {
+    description:
+        "Both clients replace the same word in a file with different text " +
+        "while offline. After syncing, the merged result should contain " +
+        "both replacements.",
+    clients: 2,
+    steps: [
+        {
+            type: "create",
+            client: 0,
+            path: "doc.md",
+            content: "the quick brown fox"
+        },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        { type: "disable-sync", client: 0 },
+        { type: "disable-sync", client: 1 },
+        {
+            type: "update",
+            client: 0,
+            path: "doc.md",
+            content: "the slow brown fox"
+        },
+        {
+            type: "update",
+            client: 1,
+            path: "doc.md",
+            content: "the fast brown fox"
+        },
+
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (state: AssertableState): void => {
+                state
+                    .assertFileCount(1)
+                    .assertContains("doc.md", "slow", "fast", "brown fox");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/concurrent-rename-and-create-at-target-create-first.test.ts b/frontend/deterministic-tests/src/tests/concurrent-rename-and-create-at-target-create-first.test.ts
new file mode 100644
index 00000000..cd8046ce
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/concurrent-rename-and-create-at-target-create-first.test.ts
@@ -0,0 +1,49 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const concurrentRenameAndCreateAtTargetCreateFirstTest: TestDefinition = {
+    description:
+        "One client renames X to Y while another creates a new file at Y, " +
+        "both offline. After syncing, Y should contain merged content from " +
+        "both the renamed file and the newly created file.",
+    clients: 2,
+    steps: [
+        {
+            type: "create",
+            client: 0,
+            path: "X.md",
+            content: "original file X"
+        },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        { type: "disable-sync", client: 0 },
+        { type: "disable-sync", client: 1 },
+
+        { type: "rename", client: 0, oldPath: "X.md", newPath: "Y.md" },
+
+        {
+            type: "create",
+            client: 1,
+            path: "Y.md",
+            content: "brand new Y content"
+        },
+
+        { type: "enable-sync", client: 1 },
+        { type: "sync", client: 1 },
+
+        { type: "enable-sync", client: 0 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (state: AssertableState): void => {
+                state
+                    .assertFileCount(2)
+                    .assertContains("Y (1).md", "original file X")
+                    .assertContains("Y.md", "brand new Y content");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/concurrent-rename-and-create-at-target-rename-first.test.ts b/frontend/deterministic-tests/src/tests/concurrent-rename-and-create-at-target-rename-first.test.ts
new file mode 100644
index 00000000..0ac0b721
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/concurrent-rename-and-create-at-target-rename-first.test.ts
@@ -0,0 +1,52 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const concurrentRenameAndCreateAtTargetRenameFirstTest: TestDefinition = {
+    description:
+        "One client renames X to Y while another creates a new file at Y, " +
+        "both offline. We can't merge the create because it would result in a cycle",
+    clients: 2,
+    steps: [
+        {
+            type: "create",
+            client: 0,
+            path: "X.md",
+            content: "original file X"
+        },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        { type: "disable-sync", client: 0 },
+        { type: "disable-sync", client: 1 },
+
+        { type: "rename", client: 0, oldPath: "X.md", newPath: "Y.md" },
+
+        {
+            type: "create",
+            client: 1,
+            path: "Y.md",
+            content: "brand new Y content"
+        },
+
+        { type: "enable-sync", client: 0 },
+        { type: "sync", client: 0 },
+
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (state: AssertableState): void => {
+                state
+                    .assertFileNotExists("X.md")
+                    .assertFileExists("Y.md")
+                    .assertFileExists("Y (1).md")
+                    .assertAnyFileContains(
+                        "original file X",
+                        "brand new Y content"
+                    );
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/concurrent-rename-first-wins.test.ts b/frontend/deterministic-tests/src/tests/concurrent-rename-first-wins.test.ts
new file mode 100644
index 00000000..5337649d
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/concurrent-rename-first-wins.test.ts
@@ -0,0 +1,61 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const concurrentRenameFirstWinsTest: TestDefinition = {
+    description:
+        "Both clients start online with the same file. Both go offline, " +
+        "rename the file to different paths, and edit it. When they reconnect, " +
+        "the first rename to reach the server wins the path and both content " +
+        "edits are merged.",
+    clients: 2,
+    steps: [
+        {
+            type: "create",
+            client: 0,
+            path: "A.md",
+            content: "line 1\nline 2\nline 3"
+        },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertContent("A.md", "line 1\nline 2\nline 3");
+            }
+        },
+
+        { type: "disable-sync", client: 0 },
+        { type: "disable-sync", client: 1 },
+
+        { type: "rename", client: 0, oldPath: "A.md", newPath: "B.md" },
+        {
+            type: "update",
+            client: 0,
+            path: "B.md",
+            content: "edit from 0\nline 2\nline 3"
+        },
+
+        { type: "rename", client: 1, oldPath: "A.md", newPath: "C.md" },
+        {
+            type: "update",
+            client: 1,
+            path: "C.md",
+            content: "line 1\nline 2\nedit from 1"
+        },
+
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileNotExists("A.md")
+                    .assertFileCount(2)
+                    .assertContent("B.md", "edit from 0\nline 2\nline 3")
+                    .assertContent("C.md", "line 1\nline 2\nedit from 1");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/concurrent-rename-same-target.test.ts b/frontend/deterministic-tests/src/tests/concurrent-rename-same-target.test.ts
new file mode 100644
index 00000000..0b72c0f3
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/concurrent-rename-same-target.test.ts
@@ -0,0 +1,39 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const concurrentRenameSameTargetTest: TestDefinition = {
+    description:
+        "One client renames A to C while the other renames B to C, both offline. " +
+        "After syncing, both file contents should be preserved via path deconfliction.",
+    clients: 2,
+    steps: [
+        { type: "create", client: 0, path: "A.md", content: "content-a" },
+        { type: "create", client: 0, path: "B.md", content: "content-b" },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        { type: "disable-sync", client: 1 },
+
+        { type: "rename", client: 0, oldPath: "A.md", newPath: "C.md" },
+        { type: "sync", client: 0 },
+
+        { type: "rename", client: 1, oldPath: "B.md", newPath: "C.md" },
+
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (state: AssertableState): void => {
+                state
+                    .assertFileCount(2)
+                    .assertFileNotExists("A.md")
+                    .assertFileNotExists("B.md")
+                    .assertFileExists("C.md")
+                    .assertFileExists("C (1).md")
+                    .assertAnyFileContains("content-a", "content-b");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/concurrent-update-diff-consistency.test.ts b/frontend/deterministic-tests/src/tests/concurrent-update-diff-consistency.test.ts
new file mode 100644
index 00000000..d21ce16b
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/concurrent-update-diff-consistency.test.ts
@@ -0,0 +1,51 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const concurrentUpdateDiffConsistencyTest: TestDefinition = {
+    description:
+        "Both clients edit different sections of the same file while offline. " +
+        "After syncing, the merged file should contain both edits.",
+    clients: 2,
+    steps: [
+        {
+            type: "create",
+            client: 0,
+            path: "doc.md",
+            content: "header\nmiddle\nfooter"
+        },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        { type: "disable-sync", client: 0 },
+        { type: "disable-sync", client: 1 },
+        {
+            type: "update",
+            client: 0,
+            path: "doc.md",
+            content: "header by 0\nmiddle\nfooter"
+        },
+        {
+            type: "update",
+            client: 1,
+            path: "doc.md",
+            content: "header\nmiddle\nfooter by 1"
+        },
+
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (state: AssertableState): void => {
+                state
+                    .assertFileCount(1)
+                    .assertContent(
+                        "doc.md",
+                        "header by 0\nmiddle\nfooter by 1"
+                    );
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/create-delete-noop.test.ts b/frontend/deterministic-tests/src/tests/create-delete-noop.test.ts
new file mode 100644
index 00000000..6c766001
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/create-delete-noop.test.ts
@@ -0,0 +1,27 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const createDeleteNoopTest: TestDefinition = {
+    description:
+        "A client creates a file, updates it multiple times, then deletes it, all while " +
+        "offline. After syncing, neither client should have the file.",
+    clients: 2,
+    steps: [
+        { type: "enable-sync", client: 1 },
+
+        { type: "create", client: 0, path: "temp.md", content: "version 1" },
+        { type: "update", client: 0, path: "temp.md", content: "version 2" },
+        { type: "update", client: 0, path: "temp.md", content: "version 3" },
+        { type: "delete", client: 0, path: "temp.md" },
+
+        { type: "enable-sync", client: 0 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileNotExists("temp.md");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/create-during-reconciliation.test.ts b/frontend/deterministic-tests/src/tests/create-during-reconciliation.test.ts
new file mode 100644
index 00000000..0fe51106
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/create-during-reconciliation.test.ts
@@ -0,0 +1,50 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const createDuringReconciliationTest: TestDefinition = {
+    description:
+        "Client creates two files while offline, reconnects, then immediately " +
+        "creates a third file. All three files should sync to the other client.",
+    clients: 2,
+    steps: [
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        { type: "disable-sync", client: 0 },
+        {
+            type: "create",
+            client: 0,
+            path: "A.md",
+            content: "offline A"
+        },
+        {
+            type: "create",
+            client: 0,
+            path: "B.md",
+            content: "offline B"
+        },
+
+        { type: "enable-sync", client: 0 },
+
+        {
+            type: "create",
+            client: 0,
+            path: "C.md",
+            content: "post-reconnect C"
+        },
+
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (state: AssertableState): void => {
+                state
+                    .assertFileCount(3)
+                    .assertContent("A.md", "offline A")
+                    .assertContent("B.md", "offline B")
+                    .assertContent("C.md", "post-reconnect C");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/create-merge-delete.test.ts b/frontend/deterministic-tests/src/tests/create-merge-delete.test.ts
new file mode 100644
index 00000000..ef7ea5c3
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/create-merge-delete.test.ts
@@ -0,0 +1,37 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const createMergeDeleteTest: TestDefinition = {
+    description:
+        "Two clients create A.md offline with different content. Both come online and " +
+        "the content is merged. Then one client deletes A.md. Both clients should " +
+        "converge on an empty state.",
+    clients: 2,
+    steps: [
+        { type: "create", client: 0, path: "A.md", content: "from-zero" },
+        { type: "create", client: 1, path: "A.md", content: "from-one" },
+
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (state: AssertableState): void => {
+                state
+                    .assertFileCount(1)
+                    .assertContains("A.md", "from-zero", "from-one");
+            }
+        },
+
+        { type: "delete", client: 0, path: "A.md" },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileCount(0).assertFileNotExists("A.md");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/create-merge-preserves-renamed-update.test.ts b/frontend/deterministic-tests/src/tests/create-merge-preserves-renamed-update.test.ts
new file mode 100644
index 00000000..a9bc37d4
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/create-merge-preserves-renamed-update.test.ts
@@ -0,0 +1,59 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const createMergePreservesRenamedUpdateTest: TestDefinition = {
+    description:
+        "Both clients create the same file, which gets merged. One client goes " +
+        "offline, renames the file, updates it, and creates a new file at the " +
+        "original path. After reconnecting, the updated content must be preserved.",
+    clients: 2,
+    steps: [
+        { type: "create", client: 0, path: "doc.md", content: "alpha" },
+        { type: "create", client: 1, path: "doc.md", content: "beta" },
+
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (state: AssertableState): void => {
+                state.assertContains("doc.md", "alpha", "beta");
+            }
+        },
+
+        { type: "disable-sync", client: 1 },
+
+        {
+            type: "rename",
+            client: 1,
+            oldPath: "doc.md",
+            newPath: "moved.md"
+        },
+        {
+            type: "update",
+            client: 1,
+            path: "moved.md",
+            content: "alpha beta extra-update"
+        },
+
+        {
+            type: "create",
+            client: 1,
+            path: "doc.md",
+            content: "new-content"
+        },
+
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (state: AssertableState): void => {
+                state
+                    .assertContent("moved.md", "alpha beta extra-update")
+                    .assertContent("doc.md", "new-content");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/create-rename-create-same-path.test.ts b/frontend/deterministic-tests/src/tests/create-rename-create-same-path.test.ts
new file mode 100644
index 00000000..b9e16c90
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/create-rename-create-same-path.test.ts
@@ -0,0 +1,34 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const createRenameCreateSamePathTest: TestDefinition = {
+    description:
+        "Client creates A.md, renames to B.md, creates new A.md, renames " +
+        "to C.md, creates yet another A.md. All three files should exist " +
+        "as separate documents on both clients.",
+    clients: 2,
+    steps: [
+        { type: "create", client: 0, path: "A.md", content: "first file" },
+        { type: "rename", client: 0, oldPath: "A.md", newPath: "B.md" },
+
+        { type: "create", client: 0, path: "A.md", content: "second file" },
+        { type: "rename", client: 0, oldPath: "A.md", newPath: "C.md" },
+
+        { type: "create", client: 0, path: "A.md", content: "third file" },
+
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (state: AssertableState): void => {
+                state
+                    .assertFileCount(3)
+                    .assertContent("B.md", "first file")
+                    .assertContent("C.md", "second file")
+                    .assertContent("A.md", "third file");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/create-rename-response-skips-file.test.ts b/frontend/deterministic-tests/src/tests/create-rename-response-skips-file.test.ts
new file mode 100644
index 00000000..aa24b110
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/create-rename-response-skips-file.test.ts
@@ -0,0 +1,36 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const createRenameResponseSkipsFileTest: TestDefinition = {
+    description:
+        "Client 0 creates a file online then immediately renames it. " +
+        "Client 1 must receive the file content at the renamed path.",
+    clients: 2,
+    steps: [
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+
+        {
+            type: "create",
+            client: 0,
+            path: "doc.md",
+            content: "the-content"
+        },
+
+        {
+            type: "rename",
+            client: 0,
+            oldPath: "doc.md",
+            newPath: "renamed.md"
+        },
+
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileCount(1).assertAnyFileContains("the-content");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/create-update-coalesce-server-pause.test.ts b/frontend/deterministic-tests/src/tests/create-update-coalesce-server-pause.test.ts
new file mode 100644
index 00000000..9b752d05
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/create-update-coalesce-server-pause.test.ts
@@ -0,0 +1,32 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const createUpdateCoalesceServerPauseTest: TestDefinition = {
+    description:
+        "Client creates a file and immediately updates it while the server is " +
+        "paused. When the server resumes, both clients should have the final " +
+        "updated content.",
+    clients: 2,
+    steps: [
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+
+        { type: "pause-server" },
+
+        { type: "create", client: 0, path: "doc.md", content: "initial" },
+        { type: "update", client: 0, path: "doc.md", content: "final version" },
+
+        { type: "resume-server" },
+
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (state: AssertableState): void => {
+                state
+                    .assertFileCount(1)
+                    .assertContent("doc.md", "final version");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/delete-by-other-client-then-recreate.test.ts b/frontend/deterministic-tests/src/tests/delete-by-other-client-then-recreate.test.ts
new file mode 100644
index 00000000..dfef9961
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/delete-by-other-client-then-recreate.test.ts
@@ -0,0 +1,40 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const deleteByOtherClientThenRecreateTest: TestDefinition = {
+    description:
+        "Client 1 deletes a file and the delete propagates. Then client 0 " +
+        "creates a new file at the same path. Both clients must have the file.",
+    clients: 2,
+    steps: [
+        { type: "create", client: 0, path: "A.md", content: "original" },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        { type: "delete", client: 1, path: "A.md" },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileNotExists("A.md");
+            }
+        },
+
+        {
+            type: "create",
+            client: 0,
+            path: "A.md",
+            content: "recreated by client 0"
+        },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertContent("A.md", "recreated by client 0");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/delete-during-pending-create.test.ts b/frontend/deterministic-tests/src/tests/delete-during-pending-create.test.ts
new file mode 100644
index 00000000..3ba393b8
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/delete-during-pending-create.test.ts
@@ -0,0 +1,35 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const deleteDuringPendingCreateTest: TestDefinition = {
+    description:
+        "Client 0 creates a file while the server is paused, then deletes it before the server resumes. " +
+        "After resume, the file should end up deleted on both clients.",
+    clients: 2,
+    steps: [
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        { type: "pause-server" },
+
+        {
+            type: "create",
+            client: 0,
+            path: "ephemeral.md",
+            content: "this will be deleted"
+        },
+
+        { type: "delete", client: 0, path: "ephemeral.md" },
+
+        { type: "resume-server" },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileCount(0).assertFileNotExists("ephemeral.md");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/delete-recreate-concurrent-update.test.ts b/frontend/deterministic-tests/src/tests/delete-recreate-concurrent-update.test.ts
new file mode 100644
index 00000000..6cb4cb98
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/delete-recreate-concurrent-update.test.ts
@@ -0,0 +1,42 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const deleteRecreateConcurrentUpdateTest: TestDefinition = {
+    description:
+        "Client 0 deletes and recreates A.md with new content while offline. Client 1 updates A.md concurrently. " +
+        "After client 0 reconnects, both clients must converge with client 0's recreated content preserved.",
+    clients: 2,
+    steps: [
+        { type: "create", client: 0, path: "A.md", content: "original" },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        { type: "disable-sync", client: 0 },
+        { type: "delete", client: 0, path: "A.md" },
+        {
+            type: "create",
+            client: 0,
+            path: "A.md",
+            content: "recreated by client 0"
+        },
+
+        {
+            type: "update",
+            client: 1,
+            path: "A.md",
+            content: "updated by client 1"
+        },
+        { type: "sync", client: 1 },
+
+        { type: "enable-sync", client: 0 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileExists("A.md").assertContains("A.md", "recreated");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/delete-recreate-different-content.test.ts b/frontend/deterministic-tests/src/tests/delete-recreate-different-content.test.ts
new file mode 100644
index 00000000..782c3cd5
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/delete-recreate-different-content.test.ts
@@ -0,0 +1,54 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const deleteRecreateDifferentContentTest: TestDefinition = {
+    description:
+        "Client 0 deletes and recreates A.md with new content offline while client 1 edits A.md offline. " +
+        "Both clients should converge with content from both sides merged.",
+    clients: 2,
+    steps: [
+        {
+            type: "create",
+            client: 0,
+            path: "A.md",
+            content: "original content here"
+        },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        { type: "disable-sync", client: 0 },
+        { type: "disable-sync", client: 1 },
+
+        { type: "delete", client: 0, path: "A.md" },
+        {
+            type: "create",
+            client: 0,
+            path: "A.md",
+            content: "brand new content"
+        },
+
+        {
+            type: "update",
+            client: 1,
+            path: "A.md",
+            content: "edit from client 1"
+        },
+
+        { type: "enable-sync", client: 0 },
+        { type: "sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileCount(1).assertContains(
+                    "A.md",
+                    "brand new",
+                    "client 1"
+                );
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/delete-recreate-same-path.test.ts b/frontend/deterministic-tests/src/tests/delete-recreate-same-path.test.ts
new file mode 100644
index 00000000..dde8d341
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/delete-recreate-same-path.test.ts
@@ -0,0 +1,34 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const deleteRecreateSamePathTest: TestDefinition = {
+    description:
+        "Client 0 creates A.md, syncs. Then deletes A.md and creates a new A.md " +
+        "with different content. Both clients should converge on the new content.",
+    clients: 2,
+    steps: [
+        { type: "create", client: 0, path: "A.md", content: "version 1" },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertContent("A.md", "version 1");
+            }
+        },
+
+        { type: "disable-sync", client: 0 },
+        { type: "delete", client: 0, path: "A.md" },
+        { type: "create", client: 0, path: "A.md", content: "version 2" },
+        { type: "enable-sync", client: 0 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertContent("A.md", "version 2");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/delete-recreated-pending-create-with-stale-deleting-record.test.ts b/frontend/deterministic-tests/src/tests/delete-recreated-pending-create-with-stale-deleting-record.test.ts
new file mode 100644
index 00000000..80e95f48
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/delete-recreated-pending-create-with-stale-deleting-record.test.ts
@@ -0,0 +1,52 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const deleteRecreatedPendingCreateWithStaleDeletingRecordTest: TestDefinition =
+    {
+        description:
+            "A local delete for a recreated pending create must target the " +
+            "new pending create, not an older same-path record whose server " +
+            "delete has been acked but whose WebSocket delete receipt is " +
+            "still paused.",
+        clients: 2,
+        steps: [
+            { type: "enable-sync", client: 0 },
+            { type: "enable-sync", client: 1 },
+            { type: "barrier" },
+
+            { type: "pause-websocket", client: 0 },
+            { type: "pause-server" },
+            {
+                type: "create",
+                client: 0,
+                path: "binary-14.bin",
+                content: "BINARY:first"
+            },
+            { type: "sleep", ms: 100 },
+            { type: "delete", client: 0, path: "binary-14.bin" },
+            { type: "resume-server" },
+            { type: "sync", client: 0 },
+
+            { type: "pause-server" },
+            {
+                type: "create",
+                client: 0,
+                path: "binary-14.bin",
+                content: "BINARY:second"
+            },
+            { type: "sleep", ms: 100 },
+            { type: "delete", client: 0, path: "binary-14.bin" },
+            { type: "resume-server" },
+            { type: "sync", client: 0 },
+
+            { type: "resume-websocket", client: 0 },
+            { type: "barrier" },
+
+            {
+                type: "assert-consistent",
+                verify: (state: AssertableState): void => {
+                    state.assertFileCount(0);
+                }
+            }
+        ]
+    };
diff --git a/frontend/deterministic-tests/src/tests/delete-rename-conflict.test.ts b/frontend/deterministic-tests/src/tests/delete-rename-conflict.test.ts
new file mode 100644
index 00000000..91e6289b
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/delete-rename-conflict.test.ts
@@ -0,0 +1,43 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const deleteRenameConflictTest: TestDefinition = {
+    description:
+        "Client 0 deletes A.md while client 1 renames A.md to C.md offline. " +
+        "After client 1 reconnects, both clients should converge to the same state.",
+    clients: 2,
+    steps: [
+        { type: "create", client: 0, path: "A.md", content: "content-a" },
+        { type: "create", client: 0, path: "B.md", content: "content-b" },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileExists("A.md").assertFileExists("B.md");
+            }
+        },
+
+        { type: "disable-sync", client: 1 },
+
+        { type: "delete", client: 0, path: "A.md" },
+        { type: "sync", client: 0 },
+
+        { type: "rename", client: 1, oldPath: "A.md", newPath: "C.md" },
+
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertContent("B.md", "content-b");
+                s.assertFileNotExists("A.md");
+                s.ifFileExists("C.md", (inner) =>
+                    inner.assertContent("C.md", "content-a")
+                );
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/displaced-file-not-marked-deleted.test.ts b/frontend/deterministic-tests/src/tests/displaced-file-not-marked-deleted.test.ts
new file mode 100644
index 00000000..cb995243
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/displaced-file-not-marked-deleted.test.ts
@@ -0,0 +1,38 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const displacedFileNotMarkedDeletedTest: TestDefinition = {
+    description:
+        "Client 0 creates a new file at path B.md while client 1 renames " +
+        "A.md to B.md. The remote download of B.md displaces client 1's " +
+        "renamed file. The displaced document must not be permanently " +
+        "marked as recently deleted, so it can still be synced.",
+    clients: 2,
+    steps: [
+        { type: "create", client: 0, path: "A.md", content: "content of A" },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        { type: "disable-sync", client: 1 },
+
+        { type: "create", client: 0, path: "B.md", content: "content of B" },
+        { type: "rename", client: 0, oldPath: "A.md", newPath: "C.md" },
+        { type: "sync", client: 0 },
+
+        { type: "rename", client: 1, oldPath: "A.md", newPath: "B.md" },
+        { type: "enable-sync", client: 1 },
+
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (state: AssertableState): void => {
+                state
+                    .assertFileCount(2)
+                    .assertContent("B.md", "content of B")
+                    .assertContent("C.md", "content of A");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/double-offline-cycle.test.ts b/frontend/deterministic-tests/src/tests/double-offline-cycle.test.ts
new file mode 100644
index 00000000..744d862e
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/double-offline-cycle.test.ts
@@ -0,0 +1,77 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const doubleOfflineCycleTest: TestDefinition = {
+    description:
+        "Client 0 goes through three offline-edit-reconnect cycles. " +
+        "Each offline edit must propagate to client 1 after reconnection.",
+    clients: 2,
+    steps: [
+        {
+            type: "create",
+            client: 0,
+            path: "doc.md",
+            content: "initial"
+        },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertContent("doc.md", "initial");
+            }
+        },
+
+        { type: "disable-sync", client: 0 },
+        {
+            type: "update",
+            client: 0,
+            path: "doc.md",
+            content: "first edit"
+        },
+
+        { type: "enable-sync", client: 0 },
+        { type: "barrier" },
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertContent("doc.md", "first edit");
+            }
+        },
+
+        { type: "disable-sync", client: 0 },
+        {
+            type: "update",
+            client: 0,
+            path: "doc.md",
+            content: "second edit"
+        },
+
+        { type: "enable-sync", client: 0 },
+        { type: "barrier" },
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertContent("doc.md", "second edit");
+            }
+        },
+
+        { type: "disable-sync", client: 0 },
+        {
+            type: "update",
+            client: 0,
+            path: "doc.md",
+            content: "third edit"
+        },
+
+        { type: "enable-sync", client: 0 },
+        { type: "barrier" },
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileCount(1).assertContent("doc.md", "third edit");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/idempotency-after-server-pause.test.ts b/frontend/deterministic-tests/src/tests/idempotency-after-server-pause.test.ts
new file mode 100644
index 00000000..551c702d
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/idempotency-after-server-pause.test.ts
@@ -0,0 +1,33 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const idempotencyAfterServerPauseTest: TestDefinition = {
+    description:
+        "Client 0 creates a file, then the server is paused mid-response. " +
+        "After the server resumes, both clients must converge to a single copy of the file with no duplicates.",
+    clients: 2,
+    steps: [
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        {
+            type: "create",
+            client: 0,
+            path: "doc.md",
+            content: "important data"
+        },
+        { type: "pause-server" },
+
+        { type: "resume-server" },
+
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileCount(1).assertContent("doc.md", "important data");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/interrupted-delete-retry.test.ts b/frontend/deterministic-tests/src/tests/interrupted-delete-retry.test.ts
new file mode 100644
index 00000000..3ae7eda5
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/interrupted-delete-retry.test.ts
@@ -0,0 +1,29 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const interruptedDeleteRetryTest: TestDefinition = {
+    description:
+        "Client 0 deletes a file, then the server is paused. " +
+        "After the server resumes, both clients should have zero files.",
+    clients: 2,
+    steps: [
+        { type: "create", client: 0, path: "doc.md", content: "to be deleted" },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        { type: "delete", client: 0, path: "doc.md" },
+
+        { type: "pause-server" },
+
+        { type: "resume-server" },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileCount(0);
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/local-edit-lost-during-create-merge.test.ts b/frontend/deterministic-tests/src/tests/local-edit-lost-during-create-merge.test.ts
new file mode 100644
index 00000000..20925889
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/local-edit-lost-during-create-merge.test.ts
@@ -0,0 +1,41 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const localEditLostDuringCreateMergeTest: TestDefinition = {
+    description:
+        "Both clients create doc.md with different content while offline. " +
+        "Client 0 also edits the file before syncing. After both connect, " +
+        "the merged result should contain content from both clients.",
+    clients: 2,
+    steps: [
+        { type: "create", client: 1, path: "doc.md", content: "from-client-1" },
+        {
+            type: "create",
+            client: 0,
+            path: "doc.md",
+            content: "from-client-0"
+        },
+        {
+            type: "update",
+            client: 0,
+            path: "doc.md",
+            content: "local-edit-during-create"
+        },
+
+        { type: "enable-sync", client: 1 },
+        { type: "sync", client: 1 },
+        { type: "enable-sync", client: 0 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileCount(1).assertContains(
+                    "doc.md",
+                    "from-client-1",
+                    "local-edit-during-create"
+                );
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/local-rename-survives-remote-rename.test.ts b/frontend/deterministic-tests/src/tests/local-rename-survives-remote-rename.test.ts
new file mode 100644
index 00000000..c2b80af3
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/local-rename-survives-remote-rename.test.ts
@@ -0,0 +1,80 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const localRenameSurvivesRemoteRenameTest: TestDefinition = {
+    description:
+        "Drain processes a RemoteChange (remote rename for doc D) while a " +
+        "LocalUpdate (user rename of D) is also queued behind it. " +
+        "`processRemoteUpdate` moves the disk file and, because there is a " +
+        "pending LocalUpdate, takes the else branch — but its setDocument " +
+        "uses the stale `record.path` (= the user-rename target) instead of " +
+        "the actualPath the file just moved to. The queued LocalUpdate then " +
+        "reads from `record.path`, throws FileNotFoundError, and is " +
+        "silently dropped. Setup pins the queue order: a sentinel " +
+        "LocalUpdate keeps drain busy on a SIGSTOPped HTTP roundtrip while " +
+        "we resume client 0's WebSocket (enqueues RemoteChange) and then " +
+        "user-rename D (enqueues LocalUpdate after the RemoteChange). On " +
+        "server resume the drain pops the sentinel, then RemoteChange, then " +
+        "LocalUpdate — exactly the order that triggers the bug.",
+    clients: 2,
+    steps: [
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "create", client: 0, path: "doc.md", content: "v1\n" },
+        { type: "create", client: 0, path: "sentinel.md", content: "s\n" },
+        { type: "barrier" },
+
+        // Pause client 0's WebSocket so the upcoming remote rename buffers.
+        { type: "pause-websocket", client: 0 },
+
+        // Server applies remote rename of doc.md -> remote.md. Broadcast
+        // is buffered on client 0's WebSocket.
+        { type: "rename", client: 1, oldPath: "doc.md", newPath: "remote.md" },
+        { type: "sync", client: 1 },
+
+        // Pause the server BEFORE arming the sentinel, so the sentinel's
+        // HTTP request will buffer at the kernel and keep drain occupied.
+        { type: "pause-server" },
+
+        // Sentinel: a LocalUpdate on a *different* doc that drain pops
+        // first. Its HTTP roundtrip stalls on SIGSTOP, freezing drain
+        // until we resume the server. While drain is frozen we can grow
+        // the queue with additional events whose order we control.
+        {
+            type: "update",
+            client: 0,
+            path: "sentinel.md",
+            content: "s\nedit\n"
+        },
+
+        // Resume the WebSocket — buffered remote rename enqueues as a
+        // RemoteChange. Drain is still stuck on the sentinel HTTP.
+        { type: "resume-websocket", client: 0 },
+
+        // User renames doc.md -> local.md on client 0. queue.enqueue
+        // mutates the doc's record.path to "local.md" and pushes a
+        // LocalUpdate(rename) onto the tail of the queue. Queue is now
+        // [sentinel-update (in-flight), RemoteChange, LocalUpdate-rename].
+        { type: "rename", client: 0, oldPath: "doc.md", newPath: "local.md" },
+
+        // Resume the server. Drain pops sentinel-update (succeeds), then
+        // RemoteChange. Pre-fix: processRemoteUpdate moves disk
+        // local.md -> remote.md, takes the else branch, and
+        // setDocument(record.path = "local.md", …) leaves record.path
+        // stale. Drain pops the LocalUpdate-rename and reads from the
+        // stale record.path, hits FileNotFoundError, silent skip.
+        // Post-fix: when a local event is pending, we re-queue the
+        // remote update without touching disk or record, so the local
+        // rename drains first and both ends converge.
+        { type: "resume-server" },
+
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (state: AssertableState): void => {
+                state.assertFileCount(2);
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/local-update-survives-remote-rename.test.ts b/frontend/deterministic-tests/src/tests/local-update-survives-remote-rename.test.ts
new file mode 100644
index 00000000..0d8348c0
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/local-update-survives-remote-rename.test.ts
@@ -0,0 +1,69 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const localUpdateSurvivesRemoteRenameTest: TestDefinition = {
+    description:
+        "Client 0 has a local content edit pending while a remote rename for " +
+        "the same doc arrives over the WebSocket. The remote rename's internal " +
+        "move relocates the disk file from the old path (where the user wrote) " +
+        "to the new server path. Previously, the queued LocalUpdate's " +
+        "`event.path` was left pointing at the now-vacated old path, so " +
+        "`skipIfOversized`'s `getFileSize(event.path)` threw " +
+        "`FileNotFoundError`, which `processEvent`'s catch silently swallowed " +
+        "as 'Skipping sync event 'local-update' because the file no longer " +
+        "exists' — and the user's edit was lost. The fix routes the size " +
+        "check through `tracked.path` (the doc's current disk path), " +
+        "matching the path `processLocalUpdate` itself reads from.",
+    clients: 2,
+    steps: [
+        { type: "create", client: 0, path: "doc.md", content: "v1\n" },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        // Pause client 0's WebSocket so the upcoming remote rename buffers
+        // there until we've already enqueued client 0's local content
+        // edit. This guarantees the LocalUpdate sits in client 0's queue
+        // when the rename's RemoteChange drains.
+        { type: "pause-websocket", client: 0 },
+
+        {
+            type: "rename",
+            client: 1,
+            oldPath: "doc.md",
+            newPath: "renamed.md"
+        },
+        { type: "sync", client: 1 },
+
+        // Client 0 still believes the file is at `doc.md` (its WebSocket is
+        // paused, so the rename hasn't reached it). The user edits content
+        // at `doc.md`. This pushes a LocalUpdate(D, path=doc.md,
+        // originalPath=doc.md, isUserRename=false) into client 0's queue.
+        {
+            type: "update",
+            client: 0,
+            path: "doc.md",
+            content: "v1\nclient 0 edit\n"
+        },
+
+        // Resume the WebSocket. The buffered remote rename (server-broadcast)
+        // drains. `processRemoteUpdate` does an internal `move(doc.md,
+        // renamed.md)` and, because there's a pending LocalUpdate for D,
+        // takes the else branch (re-enqueue v_K, setDocument(renamed.md, …)).
+        // Then drain reaches the LocalUpdate. Pre-fix: skipped silently.
+        // Post-fix: PUTs the user's content to the doc (at its new path,
+        // since this is a content-only edit, not a user rename).
+        { type: "resume-websocket", client: 0 },
+
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (state: AssertableState): void => {
+                state.assertFileCount(1);
+                state.assertFileExists("renamed.md");
+                state.assertContent("renamed.md", "v1\nclient 0 edit\n");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/mc-cross-create-rename-same-target.test.ts b/frontend/deterministic-tests/src/tests/mc-cross-create-rename-same-target.test.ts
new file mode 100644
index 00000000..d986a733
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/mc-cross-create-rename-same-target.test.ts
@@ -0,0 +1,46 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const mcCrossCreateRenameSameTargetTest: TestDefinition = {
+    description:
+        "Client 0 creates X.md, Client 1 creates Y.md. Both sync. Client 0 renames " +
+        "X.md -> Z.md. Client 1 (offline) renames Y.md -> Z.md. Both must converge " +
+        "with both contents preserved via path deconfliction.",
+    clients: 2,
+    steps: [
+        { type: "create", client: 0, path: "X.md", content: "content-x" },
+        { type: "create", client: 1, path: "Y.md", content: "content-y" },
+
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileExists("X.md").assertFileExists("Y.md");
+            }
+        },
+
+        { type: "disable-sync", client: 1 },
+
+        { type: "rename", client: 0, oldPath: "X.md", newPath: "Z.md" },
+        { type: "sync", client: 0 },
+
+        { type: "rename", client: 1, oldPath: "Y.md", newPath: "Z.md" },
+
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileCount(2)
+                    .assertFileNotExists("X.md")
+                    .assertFileNotExists("Y.md")
+                    .assertFileExists("Z.md")
+                    .assertAnyFileContains("content-x", "content-y");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/mc-delete-then-offline-rename.test.ts b/frontend/deterministic-tests/src/tests/mc-delete-then-offline-rename.test.ts
new file mode 100644
index 00000000..6727e99d
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/mc-delete-then-offline-rename.test.ts
@@ -0,0 +1,39 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const mcDeleteThenOfflineRenameTest: TestDefinition = {
+    description:
+        "Client 0 creates A.md, both sync. Client 1 goes offline. Client 0 deletes " +
+        "A.md and syncs. Client 1 (offline) renames A.md to B.md. Client 1 reconnects. " +
+        "Both must converge. C.md (unrelated) must be unaffected.",
+    clients: 2,
+    steps: [
+        { type: "create", client: 0, path: "A.md", content: "original" },
+        { type: "create", client: 0, path: "C.md", content: "unrelated" },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        { type: "disable-sync", client: 1 },
+
+        { type: "delete", client: 0, path: "A.md" },
+        { type: "sync", client: 0 },
+
+        { type: "rename", client: 1, oldPath: "A.md", newPath: "B.md" },
+
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertContent("C.md", "unrelated").assertFileNotExists(
+                    "A.md"
+                );
+                s.ifFileExists("B.md", (inner) =>
+                    inner.assertContent("B.md", "original")
+                );
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/mc-multi-delete-offline-rename.test.ts b/frontend/deterministic-tests/src/tests/mc-multi-delete-offline-rename.test.ts
new file mode 100644
index 00000000..8db90aab
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/mc-multi-delete-offline-rename.test.ts
@@ -0,0 +1,49 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const mcMultiDeleteOfflineRenameTest: TestDefinition = {
+    description:
+        "Client 0 creates 5 files. Client 1 deletes 2 while Client 0 (offline) " +
+        "renames one of the deleted files. Both must converge.",
+    clients: 2,
+    steps: [
+        { type: "create", client: 0, path: "file-1.md", content: "content-1" },
+        { type: "create", client: 0, path: "file-2.md", content: "content-2" },
+        { type: "create", client: 0, path: "file-3.md", content: "content-3" },
+        { type: "create", client: 0, path: "file-4.md", content: "content-4" },
+        { type: "create", client: 0, path: "file-5.md", content: "content-5" },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        { type: "disable-sync", client: 0 },
+
+        { type: "delete", client: 1, path: "file-2.md" },
+        { type: "delete", client: 1, path: "file-4.md" },
+        { type: "sync", client: 1 },
+
+        {
+            type: "rename",
+            client: 0,
+            oldPath: "file-2.md",
+            newPath: "renamed.md"
+        },
+
+        { type: "enable-sync", client: 0 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileExists("file-1.md")
+                    .assertFileExists("file-3.md")
+                    .assertFileExists("file-5.md")
+                    .assertFileNotExists("file-2.md")
+                    .assertFileNotExists("file-4.md");
+                s.ifFileExists("renamed.md", (inner) =>
+                    inner.assertContent("renamed.md", "content-2")
+                );
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/mc-three-client-rename-offline-update.test.ts b/frontend/deterministic-tests/src/tests/mc-three-client-rename-offline-update.test.ts
new file mode 100644
index 00000000..4167b925
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/mc-three-client-rename-offline-update.test.ts
@@ -0,0 +1,41 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const mcThreeClientRenameOfflineUpdateTest: TestDefinition = {
+    description:
+        "Client 0 creates A.md. Client 1 renames to B.md. Client 2 (offline) " +
+        "updates A.md. All three converge with updated content at B.md.",
+    clients: 3,
+    steps: [
+        { type: "create", client: 0, path: "A.md", content: "original" },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "enable-sync", client: 2 },
+        { type: "barrier" },
+
+        { type: "disable-sync", client: 2 },
+
+        { type: "rename", client: 1, oldPath: "A.md", newPath: "B.md" },
+        { type: "sync", client: 1 },
+        { type: "sync", client: 0 },
+
+        {
+            type: "update",
+            client: 2,
+            path: "A.md",
+            content: "updated-by-client-2"
+        },
+
+        { type: "enable-sync", client: 2 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileCount(1)
+                    .assertFileNotExists("A.md")
+                    .assertContains("B.md", "updated-by-client-2");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/merging-update-response-survives-user-rename.test.ts b/frontend/deterministic-tests/src/tests/merging-update-response-survives-user-rename.test.ts
new file mode 100644
index 00000000..e93240f9
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/merging-update-response-survives-user-rename.test.ts
@@ -0,0 +1,77 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const mergingUpdateResponseSurvivesUserRenameTest: TestDefinition = {
+    description:
+        "Client 1 sends a content update with a stale `parent_version_id` " +
+        "(its WebSocket is paused, so it hasn't seen Client 0's intervening " +
+        "edit). The server merges and replies with `MergingUpdate` carrying " +
+        "the merged text. Before the response lands, the user renames the " +
+        "doc on Client 1, vacating the disk path the in-flight " +
+        "`processLocalUpdate` captured. Pre-fix: " +
+        "`handleMaybeMergingResponse`'s `operations.write(diskPath, …)` " +
+        "hits the `we wont recreate it` early-return inside `write`, " +
+        "silently dropping the server-merged content — Client 0's edit is " +
+        "lost on Client 1's disk, and Client 1's next local-update PUT " +
+        "(rebased on the now-untracked merged version) deletes Client 0's " +
+        "edit on the server too. Post-fix: the response is written to the " +
+        "doc's current tracked disk path, preserving both edits.",
+    clients: 2,
+    steps: [
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "create", client: 0, path: "doc.md", content: "0\n" },
+        { type: "barrier" },
+
+        // Stop Client 1 from seeing Client 0's next edit, so its next
+        // outbound PUT carries a stale `parent_version_id` and the server
+        // is forced to merge.
+        { type: "pause-websocket", client: 1 },
+
+        // Server now holds v_b = "0\nA\n". Client 1's tracked parent
+        // version stays at v_a = "0\n".
+        { type: "update", client: 0, path: "doc.md", content: "0\nA\n" },
+        { type: "sync", client: 0 },
+
+        // Pause the server. Subsequent HTTP PUTs from Client 1 buffer at
+        // the OS layer until resume. This guarantees the merge response
+        // for Client 1's update is still in flight when the rename below
+        // mutates `queue.documents`.
+        { type: "pause-server" },
+
+        // Client 1 edits doc.md with "B". The drain pops the LocalUpdate,
+        // captures `diskPath = "doc.md"`, reads the file, and sends the
+        // HTTP PUT — which buffers because the server is SIGSTOPped.
+        { type: "update", client: 1, path: "doc.md", content: "0\nB\n" },
+
+        // User renames the file while the previous PUT is still in flight.
+        // `queue.enqueue`'s rename branch updates `documents` to point at
+        // `renamed.md` synchronously, but `processLocalUpdate`'s captured
+        // `diskPath` ("doc.md") is a local — it can't be retargeted.
+        { type: "rename", client: 1, oldPath: "doc.md", newPath: "renamed.md" },
+
+        // Resume the server. It reconciles parent=v_a, latest=v_b,
+        // new="0\nB\n" → v_c with both edits, replies `MergingUpdate`.
+        // Pre-fix: write("doc.md", …) sees no file at that path
+        // (renamed.md now holds the data) and bails out without ever
+        // writing the merged bytes. Post-fix: the merged bytes land at
+        // the tracked path (renamed.md).
+        { type: "resume-server" },
+        { type: "resume-websocket", client: 1 },
+
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (state: AssertableState): void => {
+                state.assertFileCount(1);
+                state.assertFileExists("renamed.md");
+                state.assertFileNotExists("doc.md");
+                // Both edits survive: Client 0's "A" and Client 1's "B".
+                // The reconcile may interleave them either way; assert
+                // both tokens are present in the converged content.
+                state.assertContains("renamed.md", "A", "B");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/move-and-concurrent-remote-update.test.ts b/frontend/deterministic-tests/src/tests/move-and-concurrent-remote-update.test.ts
new file mode 100644
index 00000000..86657f0f
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/move-and-concurrent-remote-update.test.ts
@@ -0,0 +1,43 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const moveAndConcurrentRemoteUpdateTest: TestDefinition = {
+    description:
+        "Client 0 renames A.md to B.md offline while client 1 updates A.md. " +
+        "After client 0 reconnects, both should have B.md with client 1's updated content.",
+    clients: 2,
+    steps: [
+        {
+            type: "create",
+            client: 0,
+            path: "A.md",
+            content: "original content"
+        },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        { type: "disable-sync", client: 0 },
+        { type: "rename", client: 0, oldPath: "A.md", newPath: "B.md" },
+
+        {
+            type: "update",
+            client: 1,
+            path: "A.md",
+            content: "updated by client 1"
+        },
+        { type: "sync", client: 1 },
+
+        { type: "enable-sync", client: 0 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileCount(1)
+                    .assertFileNotExists("A.md")
+                    .assertContains("B.md", "updated by client 1");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/move-chain-three-files.test.ts b/frontend/deterministic-tests/src/tests/move-chain-three-files.test.ts
new file mode 100644
index 00000000..fe9267d4
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/move-chain-three-files.test.ts
@@ -0,0 +1,42 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const moveChainThreeFilesTest: TestDefinition = {
+    description:
+        "Three files have their contents rotated (A gets C's content, B gets A's, C gets B's) " +
+        "while offline. After reconnecting, both clients should converge with the rotated contents.",
+    clients: 2,
+    steps: [
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+
+        { type: "create", client: 0, path: "A.md", content: "was A" },
+        { type: "create", client: 0, path: "B.md", content: "was B" },
+        { type: "create", client: 0, path: "C.md", content: "was C" },
+        { type: "barrier" },
+
+        { type: "disable-sync", client: 0 },
+
+        { type: "delete", client: 0, path: "A.md" },
+        { type: "delete", client: 0, path: "B.md" },
+        { type: "delete", client: 0, path: "C.md" },
+
+        { type: "create", client: 0, path: "A.md", content: "was C" },
+        { type: "create", client: 0, path: "B.md", content: "was A" },
+        { type: "create", client: 0, path: "C.md", content: "was B" },
+
+        { type: "enable-sync", client: 0 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (state: AssertableState): void => {
+                state
+                    .assertFileCount(3)
+                    .assertContent("A.md", "was C")
+                    .assertContent("B.md", "was A")
+                    .assertContent("C.md", "was B");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/move-identical-content-ambiguity.test.ts b/frontend/deterministic-tests/src/tests/move-identical-content-ambiguity.test.ts
new file mode 100644
index 00000000..2a9ce0b4
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/move-identical-content-ambiguity.test.ts
@@ -0,0 +1,44 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const moveIdenticalContentAmbiguityTest: TestDefinition = {
+    description:
+        "Two files with identical content exist. One is deleted and the other renamed " +
+        "while offline. The system should still converge correctly despite the ambiguity.",
+    clients: 2,
+    steps: [
+        {
+            type: "create",
+            client: 0,
+            path: "A.md",
+            content: "identical content"
+        },
+        {
+            type: "create",
+            client: 0,
+            path: "B.md",
+            content: "identical content"
+        },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        { type: "disable-sync", client: 1 },
+        { type: "delete", client: 1, path: "A.md" },
+        { type: "rename", client: 1, oldPath: "B.md", newPath: "C.md" },
+
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (state: AssertableState): void => {
+                state
+                    .assertFileCount(1)
+                    .assertFileNotExists("A.md")
+                    .assertFileNotExists("B.md")
+                    .assertContent("C.md", "identical content");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/move-preserves-remote-update.test.ts b/frontend/deterministic-tests/src/tests/move-preserves-remote-update.test.ts
new file mode 100644
index 00000000..13e27349
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/move-preserves-remote-update.test.ts
@@ -0,0 +1,48 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const movePreservesRemoteUpdateTest: TestDefinition = {
+    description:
+        "Client 0 renames a file offline while client 1 edits it offline. " +
+        "After both reconnect, the renamed file should contain client 1's edit.",
+    clients: 2,
+    steps: [
+        {
+            type: "create",
+            client: 0,
+            path: "doc.md",
+            content: "line 1\nline 2"
+        },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        { type: "disable-sync", client: 0 },
+        { type: "disable-sync", client: 1 },
+
+        { type: "rename", client: 0, oldPath: "doc.md", newPath: "renamed.md" },
+        {
+            type: "update",
+            client: 1,
+            path: "doc.md",
+            content: "line 1\nclient 1 edit\nline 2"
+        },
+
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileCount(1);
+                const [content] = Array.from(s.files.values());
+                if (!content.includes("client 1 edit")) {
+                    throw new Error(
+                        `Expected merged content to include "client 1 edit", got: "${content}"`
+                    );
+                }
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/move-remote-update-reverts-rename.test.ts b/frontend/deterministic-tests/src/tests/move-remote-update-reverts-rename.test.ts
new file mode 100644
index 00000000..433bf01b
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/move-remote-update-reverts-rename.test.ts
@@ -0,0 +1,38 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const moveRemoteUpdateRevertsRenameTest: TestDefinition = {
+    description:
+        "Client 1 updates a file while client 0 is offline. Client 0 reconnects and renames the file. " +
+        "Both clients should converge with client 1's updated content.",
+    clients: 2,
+    steps: [
+        { type: "create", client: 0, path: "doc.md", content: "original" },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        { type: "disable-sync", client: 0 },
+        {
+            type: "update",
+            client: 1,
+            path: "doc.md",
+            content: "updated by client 1"
+        },
+        { type: "sync", client: 1 },
+
+        { type: "enable-sync", client: 0 },
+        { type: "rename", client: 0, oldPath: "doc.md", newPath: "renamed.md" },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileCount(1).assertContent(
+                    "renamed.md",
+                    "updated by client 1"
+                );
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/move-then-delete-stale-path.test.ts b/frontend/deterministic-tests/src/tests/move-then-delete-stale-path.test.ts
new file mode 100644
index 00000000..4f5feab5
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/move-then-delete-stale-path.test.ts
@@ -0,0 +1,34 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const moveThenDeleteStalePathTest: TestDefinition = {
+    description:
+        "Client 0 renames A.md to B.md and immediately deletes B.md. " +
+        "Both clients should end up with zero files.",
+    clients: 2,
+    steps: [
+        {
+            type: "create",
+            client: 0,
+            path: "A.md",
+            content: "content to delete"
+        },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        { type: "rename", client: 0, oldPath: "A.md", newPath: "B.md" },
+        { type: "delete", client: 0, path: "B.md" },
+
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileCount(0)
+                    .assertFileNotExists("A.md")
+                    .assertFileNotExists("B.md");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/multi-file-operations.test.ts b/frontend/deterministic-tests/src/tests/multi-file-operations.test.ts
new file mode 100644
index 00000000..a47f5a2a
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/multi-file-operations.test.ts
@@ -0,0 +1,45 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const multiFileOperationsTest: TestDefinition = {
+    description:
+        "Client 0 deletes A.md while client 1 is offline. Client 1 updates B.md and renames A.md to D.md offline. " +
+        "After client 1 reconnects, both clients must converge with B.md updated and C.md intact.",
+    clients: 2,
+    steps: [
+        { type: "create", client: 0, path: "A.md", content: "content-a" },
+        { type: "create", client: 0, path: "B.md", content: "content-b" },
+        { type: "create", client: 0, path: "C.md", content: "content-c" },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        { type: "disable-sync", client: 1 },
+
+        { type: "delete", client: 0, path: "A.md" },
+        { type: "sync", client: 0 },
+
+        {
+            type: "update",
+            client: 1,
+            path: "B.md",
+            content: "updated by client 1"
+        },
+        { type: "rename", client: 1, oldPath: "A.md", newPath: "D.md" },
+
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertContains("B.md", "updated")
+                    .assertFileExists("C.md")
+                    .assertFileNotExists("A.md");
+                s.ifFileExists("D.md", (inner) =>
+                    inner.assertContent("D.md", "content-a")
+                );
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/offline-concurrent-renames.test.ts b/frontend/deterministic-tests/src/tests/offline-concurrent-renames.test.ts
new file mode 100644
index 00000000..6c946b9c
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/offline-concurrent-renames.test.ts
@@ -0,0 +1,59 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const offlineConcurrentRenamesTest: TestDefinition = {
+    description:
+        "Client 0 creates A.md and syncs to both clients. Both clients go offline. " +
+        "Client 0 renames A.md to B.md. Client 1 renames A.md to C.md. " +
+        "Both reconnect. The system must converge -- both clients should " +
+        "agree on the final state and the content must not be lost.",
+    clients: 2,
+    steps: [
+        { type: "create", client: 0, path: "A.md", content: "shared-content" },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertContent("A.md", "shared-content");
+            }
+        },
+
+        { type: "disable-sync", client: 0 },
+        { type: "disable-sync", client: 1 },
+
+        {
+            type: "rename",
+            client: 0,
+            oldPath: "A.md",
+            newPath: "B.md"
+        },
+
+        {
+            type: "rename",
+            client: 1,
+            oldPath: "A.md",
+            newPath: "C.md"
+        },
+
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileNotExists("A.md")
+                    .assertFileCount(1)
+                    .assertAnyFileContains("shared-content");
+                s.ifFileExists("B.md", (inner) =>
+                    inner.assertContent("B.md", "shared-content")
+                );
+                s.ifFileExists("C.md", (inner) =>
+                    inner.assertContent("C.md", "shared-content")
+                );
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/offline-create-same-path-mergeable.test.ts b/frontend/deterministic-tests/src/tests/offline-create-same-path-mergeable.test.ts
new file mode 100644
index 00000000..cbd59a4a
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/offline-create-same-path-mergeable.test.ts
@@ -0,0 +1,41 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const offlineCreateSamePathMergeableTest: TestDefinition = {
+    description:
+        "Both clients create a file at the same path while offline with different text content. " +
+        "After both sync, both clients must converge to a merged result containing both contributions.",
+    clients: 2,
+    steps: [
+        {
+            type: "create",
+            client: 0,
+            path: "notes.md",
+            content: "alpha wrote this line"
+        },
+        {
+            type: "create",
+            client: 1,
+            path: "notes.md",
+            content: "beta wrote this different line"
+        },
+
+        { type: "enable-sync", client: 0 },
+        { type: "sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileCount(1)
+                    .assertFileExists("notes.md")
+                    .assertContains(
+                        "notes.md",
+                        "alpha wrote this line",
+                        "beta wrote this different line"
+                    );
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/offline-delete-remote-rename.test.ts b/frontend/deterministic-tests/src/tests/offline-delete-remote-rename.test.ts
new file mode 100644
index 00000000..1e9ea8f7
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/offline-delete-remote-rename.test.ts
@@ -0,0 +1,38 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const offlineDeleteRemoteRenameTest: TestDefinition = {
+    description:
+        "Client 0 deletes A.md offline while client 1 renames it to A_renamed.md. " +
+        "After client 0 reconnects, both clients must converge.",
+    clients: 2,
+    steps: [
+        { type: "create", client: 0, path: "A.md", content: "content-a" },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        { type: "disable-sync", client: 0 },
+        { type: "delete", client: 0, path: "A.md" },
+
+        {
+            type: "rename",
+            client: 1,
+            oldPath: "A.md",
+            newPath: "A_renamed.md"
+        },
+        { type: "sync", client: 1 },
+
+        { type: "enable-sync", client: 0 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileNotExists("A.md").assertFileNotExists(
+                    "A_renamed.md"
+                );
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/offline-delete-vs-remote-update.test.ts b/frontend/deterministic-tests/src/tests/offline-delete-vs-remote-update.test.ts
new file mode 100644
index 00000000..21e81aa6
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/offline-delete-vs-remote-update.test.ts
@@ -0,0 +1,46 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const offlineDeleteVsRemoteUpdateTest: TestDefinition = {
+    description:
+        "Client 0 deletes A.md offline while client 1 updates it. Both clients must converge.",
+    clients: 2,
+    steps: [
+        {
+            type: "create",
+            client: 0,
+            path: "A.md",
+            content: "original content"
+        },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertContent("A.md", "original content");
+            }
+        },
+
+        { type: "disable-sync", client: 0 },
+        { type: "delete", client: 0, path: "A.md" },
+
+        {
+            type: "update",
+            client: 1,
+            path: "A.md",
+            content: "important update by client 1"
+        },
+        { type: "sync", client: 1 },
+
+        { type: "enable-sync", client: 0 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileCount(0);
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/offline-edit-remote-rename.test.ts b/frontend/deterministic-tests/src/tests/offline-edit-remote-rename.test.ts
new file mode 100644
index 00000000..ffc41b89
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/offline-edit-remote-rename.test.ts
@@ -0,0 +1,49 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const offlineEditRemoteRenameTest: TestDefinition = {
+    description:
+        "Client 0 edits A.md offline while client 1 renames A.md to B.md. " +
+        "After client 0 reconnects, the edit must appear in B.md and A.md must not exist.",
+    clients: 2,
+    steps: [
+        { type: "create", client: 0, path: "A.md", content: "original" },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertContent("A.md", "original");
+            }
+        },
+
+        { type: "disable-sync", client: 0 },
+        {
+            type: "update",
+            client: 0,
+            path: "A.md",
+            content: "edited by client 0"
+        },
+
+        {
+            type: "rename",
+            client: 1,
+            oldPath: "A.md",
+            newPath: "B.md"
+        },
+        { type: "sync", client: 1 },
+
+        { type: "enable-sync", client: 0 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileNotExists("A.md")
+                    .assertFileCount(1)
+                    .assertContains("B.md", "edited by client 0");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/offline-edit-then-move-same-content.test.ts b/frontend/deterministic-tests/src/tests/offline-edit-then-move-same-content.test.ts
new file mode 100644
index 00000000..970eabd3
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/offline-edit-then-move-same-content.test.ts
@@ -0,0 +1,51 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const offlineEditThenMoveSameContentTest: TestDefinition = {
+    description:
+        "A file is renamed and edited to match a deleted file's content. Both clients must converge despite the ambiguity.",
+    clients: 2,
+    steps: [
+        {
+            type: "create",
+            client: 0,
+            path: "A.md",
+            content: "content A"
+        },
+        {
+            type: "create",
+            client: 0,
+            path: "B.md",
+            content: "content B"
+        },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        { type: "disable-sync", client: 0 },
+
+        { type: "delete", client: 0, path: "A.md" },
+
+        { type: "rename", client: 0, oldPath: "B.md", newPath: "C.md" },
+
+        {
+            type: "update",
+            client: 0,
+            path: "C.md",
+            content: "content A"
+        },
+
+        { type: "enable-sync", client: 0 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileNotExists("A.md")
+                    .assertFileNotExists("B.md")
+                    .assertContent("C.md", "content A")
+                    .assertFileCount(1);
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/offline-mixed-operations.test.ts b/frontend/deterministic-tests/src/tests/offline-mixed-operations.test.ts
new file mode 100644
index 00000000..da875b6e
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/offline-mixed-operations.test.ts
@@ -0,0 +1,57 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const offlineMixedOperationsTest: TestDefinition = {
+    description:
+        "Client 0 creates 3 files, syncs to both clients. Client 0 goes offline, " +
+        "deletes file 1, renames file 2 to a new name, and edits file 3. " +
+        "When Client 0 reconnects, all three operations should propagate to Client 1.",
+    clients: 2,
+    steps: [
+        { type: "create", client: 0, path: "file1.md", content: "content-1" },
+        { type: "create", client: 0, path: "file2.md", content: "content-2" },
+        { type: "create", client: 0, path: "file3.md", content: "content-3" },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertContent("file1.md", "content-1")
+                    .assertContent("file2.md", "content-2")
+                    .assertContent("file3.md", "content-3");
+            }
+        },
+
+        { type: "disable-sync", client: 0 },
+
+        { type: "delete", client: 0, path: "file1.md" },
+        {
+            type: "rename",
+            client: 0,
+            oldPath: "file2.md",
+            newPath: "moved.md"
+        },
+        {
+            type: "update",
+            client: 0,
+            path: "file3.md",
+            content: "updated-content-3"
+        },
+
+        { type: "enable-sync", client: 0 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileNotExists("file1.md")
+                    .assertFileNotExists("file2.md")
+                    .assertContent("moved.md", "content-2")
+                    .assertContent("file3.md", "updated-content-3")
+                    .assertFileCount(2);
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/offline-move-then-remote-delete.test.ts b/frontend/deterministic-tests/src/tests/offline-move-then-remote-delete.test.ts
new file mode 100644
index 00000000..f8e92bd9
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/offline-move-then-remote-delete.test.ts
@@ -0,0 +1,36 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const offlineMoveThenRemoteDeleteTest: TestDefinition = {
+    description:
+        "Client 0 renames A.md to B.md offline while client 1 deletes A.md. " +
+        "Both clients must converge to having no files.",
+    clients: 2,
+    steps: [
+        {
+            type: "create",
+            client: 0,
+            path: "A.md",
+            content: "content to delete"
+        },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        { type: "disable-sync", client: 0 },
+        { type: "rename", client: 0, oldPath: "A.md", newPath: "B.md" },
+
+        { type: "delete", client: 1, path: "A.md" },
+        { type: "sync", client: 1 },
+
+        { type: "enable-sync", client: 0 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileCount(0);
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/offline-multiple-edits.test.ts b/frontend/deterministic-tests/src/tests/offline-multiple-edits.test.ts
new file mode 100644
index 00000000..6341fe8f
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/offline-multiple-edits.test.ts
@@ -0,0 +1,40 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const offlineMultipleEditsTest: TestDefinition = {
+    description:
+        "Client 0 creates a file and syncs. Client 0 goes offline, edits the file " +
+        "5 times with different content. When Client 0 reconnects, both clients " +
+        "must converge to the final version.",
+    clients: 2,
+    steps: [
+        { type: "create", client: 0, path: "doc.md", content: "original" },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertContent("doc.md", "original");
+            }
+        },
+
+        { type: "disable-sync", client: 0 },
+
+        { type: "update", client: 0, path: "doc.md", content: "edit-1" },
+        { type: "update", client: 0, path: "doc.md", content: "edit-2" },
+        { type: "update", client: 0, path: "doc.md", content: "edit-3" },
+        { type: "update", client: 0, path: "doc.md", content: "edit-4" },
+        { type: "update", client: 0, path: "doc.md", content: "edit-5-final" },
+
+        { type: "enable-sync", client: 0 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileCount(1).assertContent("doc.md", "edit-5-final");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/offline-rename-and-edit.test.ts b/frontend/deterministic-tests/src/tests/offline-rename-and-edit.test.ts
new file mode 100644
index 00000000..836c7fb2
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/offline-rename-and-edit.test.ts
@@ -0,0 +1,43 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const offlineRenameAndEditTest: TestDefinition = {
+    description:
+        "Client 0 creates A.md and syncs. Client 0 goes offline, renames A.md " +
+        "to B.md, then edits B.md. When Client 0 reconnects, the rename and edit " +
+        "should both propagate to Client 1.",
+    clients: 2,
+    steps: [
+        { type: "create", client: 0, path: "A.md", content: "original" },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertContent("A.md", "original");
+            }
+        },
+
+        { type: "disable-sync", client: 0 },
+        { type: "rename", client: 0, oldPath: "A.md", newPath: "B.md" },
+        {
+            type: "update",
+            client: 0,
+            path: "B.md",
+            content: "edited after rename"
+        },
+
+        { type: "enable-sync", client: 0 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileNotExists("A.md")
+                    .assertFileCount(1)
+                    .assertContent("B.md", "edited after rename");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/offline-rename-remote-create-old-path.test.ts b/frontend/deterministic-tests/src/tests/offline-rename-remote-create-old-path.test.ts
new file mode 100644
index 00000000..c1b2913a
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/offline-rename-remote-create-old-path.test.ts
@@ -0,0 +1,51 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const offlineRenameRemoteCreateOldPathTest: TestDefinition = {
+    description:
+        "Client 0 renames X.md to Y.md while offline. Client 1 updates X.md " +
+        "(same document). When Client 0 reconnects, the rename and update " +
+        "should merge. Y.md should exist with Client 1's content.",
+    clients: 2,
+    steps: [
+        { type: "create", client: 0, path: "X.md", content: "original" },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertContent("X.md", "original");
+            }
+        },
+
+        { type: "disable-sync", client: 0 },
+        {
+            type: "rename",
+            client: 0,
+            oldPath: "X.md",
+            newPath: "Y.md"
+        },
+
+        {
+            type: "update",
+            client: 1,
+            path: "X.md",
+            content: "updated-by-client-1"
+        },
+        { type: "sync", client: 1 },
+
+        { type: "enable-sync", client: 0 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileCount(1).assertContains(
+                    "Y.md",
+                    "updated-by-client-1"
+                );
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/offline-update-both-then-delete-one.test.ts b/frontend/deterministic-tests/src/tests/offline-update-both-then-delete-one.test.ts
new file mode 100644
index 00000000..3442cda7
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/offline-update-both-then-delete-one.test.ts
@@ -0,0 +1,75 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const offlineUpdateBothThenDeleteOneTest: TestDefinition = {
+    description:
+        "Client 0 goes offline, updates A.md and B.md, then deletes B.md. " +
+        "Client 1 updates B.md while Client 0 is offline. When Client 0 " +
+        "reconnects, A.md should have the update and B.md should be " +
+        "consistently resolved (delete wins).",
+    clients: 2,
+    steps: [
+        {
+            type: "create",
+            client: 0,
+            path: "A.md",
+            content: "A original"
+        },
+        {
+            type: "create",
+            client: 0,
+            path: "B.md",
+            content: "B original"
+        },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertContent("A.md", "A original").assertContent(
+                    "B.md",
+                    "B original"
+                );
+            }
+        },
+
+        { type: "disable-sync", client: 0 },
+
+        {
+            type: "update",
+            client: 0,
+            path: "A.md",
+            content: "A updated by client 0"
+        },
+        {
+            type: "update",
+            client: 0,
+            path: "B.md",
+            content: "B updated by client 0"
+        },
+
+        { type: "delete", client: 0, path: "B.md" },
+
+        {
+            type: "update",
+            client: 1,
+            path: "B.md",
+            content: "B updated by client 1"
+        },
+        { type: "sync", client: 1 },
+
+        { type: "enable-sync", client: 0 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertContent(
+                    "A.md",
+                    "A updated by client 0"
+                ).assertFileNotExists("B.md");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/online-both-create-same-path-deconflict.test.ts b/frontend/deterministic-tests/src/tests/online-both-create-same-path-deconflict.test.ts
new file mode 100644
index 00000000..b951b0be
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/online-both-create-same-path-deconflict.test.ts
@@ -0,0 +1,34 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const onlineBothCreateSamePathDeconflictTest: TestDefinition = {
+    description:
+        "Both clients create a file at the same path while online. " +
+        "One client's create gets deconflicted by the server. " +
+        "Both files must exist on both clients after convergence.",
+    clients: 2,
+    steps: [
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        { type: "pause-websocket", client: 1 },
+        { type: "create", client: 0, path: "A.md", content: " from-client-0 " },
+        { type: "update", client: 0, path: "A.md", content: " updated-by-0 " },
+        { type: "sync" },
+
+        { type: "create", client: 1, path: "A.md", content: " from-client-1 " },
+        { type: "resume-websocket", client: 1 },
+
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (state: AssertableState): void => {
+                state
+                    .assertFileCount(1)
+                    .assertContains("A.md", "updated-by-0", "from-client-1 ");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/online-create-rename-concurrent-create-orphan.test.ts b/frontend/deterministic-tests/src/tests/online-create-rename-concurrent-create-orphan.test.ts
new file mode 100644
index 00000000..f86b3347
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/online-create-rename-concurrent-create-orphan.test.ts
@@ -0,0 +1,41 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const onlineCreateRenameConcurrentCreateOrphanTest: TestDefinition = {
+    description:
+        "Client 0 creates a binary file and renames it while offline, then reconnects and immediately deletes it. " +
+        "Both clients must converge to zero files.",
+    clients: 2,
+    steps: [
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        { type: "disable-sync", client: 0 },
+
+        {
+            type: "create",
+            client: 0,
+            path: "data.bin",
+            content: "BINARY:offline-content"
+        },
+        {
+            type: "rename",
+            client: 0,
+            oldPath: "data.bin",
+            newPath: "moved.bin"
+        },
+
+        { type: "enable-sync", client: 0 },
+        { type: "delete", client: 0, path: "moved.bin" },
+
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (state: AssertableState): void => {
+                state.assertFileCount(0);
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/online-create-update-while-other-creates-same-path.test.ts b/frontend/deterministic-tests/src/tests/online-create-update-while-other-creates-same-path.test.ts
new file mode 100644
index 00000000..e0ddc21a
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/online-create-update-while-other-creates-same-path.test.ts
@@ -0,0 +1,48 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const onlineCreateUpdateWhileOtherCreatesSamePathTest: TestDefinition = {
+    description:
+        "Client 0 creates a binary file and updates it while client 1 also " +
+        "creates a binary file at the same path. Both clients are online. " +
+        "Both clients must end up with the same file set.",
+    clients: 2,
+    steps: [
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+
+        { type: "pause-websocket", client: 1 },
+        {
+            type: "create",
+            client: 0,
+            path: "data.bin",
+            content: "BINARY:content-v1"
+        },
+        {
+            type: "update",
+            client: 0,
+            path: "data.bin",
+            content: "BINARY:content-v2"
+        },
+        {
+            type: "create",
+            client: 1,
+            path: "data.bin",
+            content: "BINARY:other-content"
+        },
+        { type: "resume-websocket", client: 1 },
+
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (state: AssertableState): void => {
+                state
+                    .assertFileCount(2)
+                    .assertNoFileContains("content-v1")
+                    .assertAnyFileContains("content-v2")
+                    .assertAnyFileContains("other-content");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/online-delete-recreate-rapid-cycle.test.ts b/frontend/deterministic-tests/src/tests/online-delete-recreate-rapid-cycle.test.ts
new file mode 100644
index 00000000..de5d6c89
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/online-delete-recreate-rapid-cycle.test.ts
@@ -0,0 +1,37 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const onlineDeleteRecreateRapidCycleTest: TestDefinition = {
+    description:
+        "A file is deleted and recreated multiple times by alternating clients while both are online. " +
+        "Both clients must converge after each cycle.",
+    clients: 2,
+    steps: [
+        { type: "create", client: 0, path: "A.md", content: "round 0" },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        { type: "delete", client: 1, path: "A.md" },
+        { type: "barrier" },
+        { type: "create", client: 0, path: "A.md", content: "round 1" },
+        { type: "barrier" },
+
+        { type: "delete", client: 0, path: "A.md" },
+        { type: "barrier" },
+        { type: "create", client: 1, path: "A.md", content: "round 2" },
+        { type: "barrier" },
+
+        { type: "delete", client: 1, path: "A.md" },
+        { type: "barrier" },
+        { type: "create", client: 0, path: "A.md", content: "round 3" },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertContent("A.md", "round 3");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/online-edit-vs-delete-convergence.test.ts b/frontend/deterministic-tests/src/tests/online-edit-vs-delete-convergence.test.ts
new file mode 100644
index 00000000..d3a9d84e
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/online-edit-vs-delete-convergence.test.ts
@@ -0,0 +1,31 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const onlineEditVsDeleteConvergenceTest: TestDefinition = {
+    description:
+        "Both clients are online. Client 0 edits a file while client 1 " +
+        "deletes it. The clients must converge to the same state.",
+    clients: 2,
+    steps: [
+        { type: "create", client: 0, path: "A.md", content: "original" },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        {
+            type: "update",
+            client: 0,
+            path: "A.md",
+            content: "edited by client 0"
+        },
+        { type: "delete", client: 1, path: "A.md" },
+
+        { type: "barrier" },
+        {
+            type: "assert-consistent",
+            verify: (state: AssertableState): void => {
+                state.assertFileCount(0);
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/overlapping-edits-same-section.test.ts b/frontend/deterministic-tests/src/tests/overlapping-edits-same-section.test.ts
new file mode 100644
index 00000000..a93a6f69
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/overlapping-edits-same-section.test.ts
@@ -0,0 +1,54 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const overlappingEditsSameSectionTest: TestDefinition = {
+    description:
+        "Both clients go offline and edit different parts of the same document. " +
+        "After both reconnect, both edits must be preserved without data loss.",
+    clients: 2,
+    steps: [
+        {
+            type: "create",
+            client: 0,
+            path: "doc.md",
+            content: "# Title\n\nfooter"
+        },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        { type: "disable-sync", client: 0 },
+        { type: "disable-sync", client: 1 },
+
+        {
+            type: "update",
+            client: 0,
+            path: "doc.md",
+            content: "# Title\nalpha addition\n\nfooter"
+        },
+
+        {
+            type: "update",
+            client: 1,
+            path: "doc.md",
+            content: "# Title\n\nbeta addition\nfooter"
+        },
+
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileCount(1).assertContains(
+                    "doc.md",
+                    "# Title",
+                    "alpha addition",
+                    "beta addition",
+                    "footer"
+                );
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/queue-reset-loses-coalesced-local-edit.test.ts b/frontend/deterministic-tests/src/tests/queue-reset-loses-coalesced-local-edit.test.ts
new file mode 100644
index 00000000..6d89acf4
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/queue-reset-loses-coalesced-local-edit.test.ts
@@ -0,0 +1,36 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const queueResetLosesCoalescedLocalEditTest: TestDefinition = {
+    description:
+        "Client 0 goes offline, both clients edit doc.md concurrently, " +
+        "then client 0 reconnects. Both edits must be preserved.",
+    clients: 2,
+    steps: [
+        { type: "create", client: 0, path: "doc.md", content: "original" },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        { type: "disable-sync", client: 0 },
+
+        { type: "update", client: 1, path: "doc.md", content: "alpha bravo" },
+        { type: "sync", client: 1 },
+
+        { type: "update", client: 0, path: "doc.md", content: "charlie delta" },
+
+        { type: "enable-sync", client: 0 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileCount(1).assertContains(
+                    "doc.md",
+                    "alpha",
+                    "charlie"
+                );
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/queued-create-delete-does-not-hijack-reused-path.test.ts b/frontend/deterministic-tests/src/tests/queued-create-delete-does-not-hijack-reused-path.test.ts
new file mode 100644
index 00000000..a29f8314
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/queued-create-delete-does-not-hijack-reused-path.test.ts
@@ -0,0 +1,56 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const queuedCreateDeleteDoesNotHijackReusedPathTest: TestDefinition = {
+    description:
+        "A create/delete pair that is still queued behind another request " +
+        "must collapse locally. It must not later read a different file " +
+        "that reused the same path before the queued create drained.",
+    clients: 2,
+    steps: [
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        { type: "pause-server" },
+        {
+            type: "create",
+            client: 1,
+            path: "blocker.bin",
+            content: "BINARY:blocker"
+        },
+        { type: "sleep", ms: 100 },
+        {
+            type: "create",
+            client: 1,
+            path: "target.bin",
+            content: "BINARY:old"
+        },
+        { type: "delete", client: 1, path: "target.bin" },
+        {
+            type: "create",
+            client: 1,
+            path: "source.bin",
+            content: "BINARY:new"
+        },
+        {
+            type: "rename",
+            client: 1,
+            oldPath: "source.bin",
+            newPath: "target.bin"
+        },
+        { type: "resume-server" },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (state: AssertableState): void => {
+                state
+                    .assertFileCount(2)
+                    .assertContent("blocker.bin", "BINARY:blocker")
+                    .assertContent("target.bin", "BINARY:new")
+                    .assertFileNotExists("source.bin");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/rapid-create-update-delete-cycle.test.ts b/frontend/deterministic-tests/src/tests/rapid-create-update-delete-cycle.test.ts
new file mode 100644
index 00000000..f9c58753
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/rapid-create-update-delete-cycle.test.ts
@@ -0,0 +1,52 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const rapidCreateUpdateDeleteCycleTest: TestDefinition = {
+    description:
+        "Client 0 rapidly creates, updates, deletes, then re-creates a file while the server is paused. " +
+        "After the server resumes, client 1 must see only the final file.",
+    clients: 2,
+    steps: [
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        { type: "pause-server" },
+
+        {
+            type: "create",
+            client: 0,
+            path: "cycle.md",
+            content: "version 1"
+        },
+        {
+            type: "update",
+            client: 0,
+            path: "cycle.md",
+            content: "version 2"
+        },
+        { type: "delete", client: 0, path: "cycle.md" },
+
+        { type: "resume-server" },
+        { type: "sync" },
+
+        {
+            type: "create",
+            client: 0,
+            path: "cycle.md",
+            content: "final creation"
+        },
+
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileCount(1).assertContent(
+                    "cycle.md",
+                    "final creation"
+                );
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/rapid-edit-delete-online-convergence.test.ts b/frontend/deterministic-tests/src/tests/rapid-edit-delete-online-convergence.test.ts
new file mode 100644
index 00000000..48c062e0
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/rapid-edit-delete-online-convergence.test.ts
@@ -0,0 +1,48 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const rapidEditDeleteOnlineConvergenceTest: TestDefinition = {
+    description:
+        "Client 0 rapidly edits multiple files while client 1 deletes some of them, all while both are online. " +
+        "Both clients must converge to a consistent state.",
+    clients: 2,
+    steps: [
+        { type: "create", client: 0, path: "A.md", content: "content A" },
+        { type: "create", client: 0, path: "B.md", content: "content B" },
+        { type: "create", client: 0, path: "C.md", content: "content C" },
+        { type: "create", client: 0, path: "D.md", content: "content D" },
+        { type: "create", client: 0, path: "E.md", content: "content E" },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        { type: "update", client: 0, path: "A.md", content: "A edit 1" },
+        { type: "update", client: 0, path: "B.md", content: "B edit 1" },
+        { type: "update", client: 0, path: "C.md", content: "C edit 1" },
+        { type: "delete", client: 1, path: "A.md" },
+        { type: "delete", client: 1, path: "C.md" },
+        { type: "delete", client: 1, path: "E.md" },
+        { type: "update", client: 0, path: "A.md", content: "A edit 2" },
+        { type: "update", client: 0, path: "B.md", content: "B edit 2" },
+        { type: "update", client: 0, path: "C.md", content: "C edit 2" },
+
+        { type: "barrier" },
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                for (const [path, content] of s.files) {
+                    for (const clientFiles of s.clientFiles) {
+                        if (
+                            clientFiles.has(path) &&
+                            clientFiles.get(path) !== content
+                        ) {
+                            throw new Error(
+                                `Content mismatch for ${path}: "${clientFiles.get(path)}" vs "${content}"`
+                            );
+                        }
+                    }
+                }
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/rapid-updates-after-merge.test.ts b/frontend/deterministic-tests/src/tests/rapid-updates-after-merge.test.ts
new file mode 100644
index 00000000..6f97ff05
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/rapid-updates-after-merge.test.ts
@@ -0,0 +1,49 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const rapidUpdatesAfterMergeTest: TestDefinition = {
+    description:
+        "Both clients create the same file offline, triggering a merge on sync. " +
+        "Client 0 then rapidly sends three updates. Both clients must converge to the final update.",
+    clients: 2,
+    steps: [
+        { type: "create", client: 0, path: "doc.md", content: "from client 0" },
+        { type: "create", client: 1, path: "doc.md", content: "from client 1" },
+
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        {
+            type: "update",
+            client: 0,
+            path: "doc.md",
+            content: "update 1"
+        },
+        { type: "sync", client: 0 },
+
+        {
+            type: "update",
+            client: 0,
+            path: "doc.md",
+            content: "update 2"
+        },
+        { type: "sync", client: 0 },
+
+        {
+            type: "update",
+            client: 0,
+            path: "doc.md",
+            content: "update 3"
+        },
+
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileCount(1).assertContains("doc.md", "update 3");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/recently-deleted-cleared-on-reconnect.test.ts b/frontend/deterministic-tests/src/tests/recently-deleted-cleared-on-reconnect.test.ts
new file mode 100644
index 00000000..c8e70243
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/recently-deleted-cleared-on-reconnect.test.ts
@@ -0,0 +1,45 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const recentlyDeletedClearedOnReconnectTest: TestDefinition = {
+    description:
+        "After a client deletes a document and reconnects, it should " +
+        "accept new documents from other clients even if they happen to " +
+        "arrive at the same path as the deleted document.",
+    clients: 2,
+    steps: [
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+
+        { type: "create", client: 0, path: "doc.md", content: "original" },
+        { type: "sync" },
+
+        { type: "delete", client: 0, path: "doc.md" },
+        { type: "barrier" },
+
+        { type: "disable-sync", client: 0 },
+        { type: "disable-sync", client: 1 },
+
+        {
+            type: "create",
+            client: 1,
+            path: "doc.md",
+            content: "new content from client 1"
+        },
+
+        { type: "enable-sync", client: 1 },
+        { type: "sync", client: 1 },
+        { type: "enable-sync", client: 0 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileCount(1).assertContent(
+                    "doc.md",
+                    "new content from client 1"
+                );
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/remote-quick-write-rename-before-record.test.ts b/frontend/deterministic-tests/src/tests/remote-quick-write-rename-before-record.test.ts
new file mode 100644
index 00000000..ca184b27
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/remote-quick-write-rename-before-record.test.ts
@@ -0,0 +1,36 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const remoteQuickWriteRenameBeforeRecordTest: TestDefinition = {
+    description:
+        "Client 0 receives a remote create and the user renames the new " +
+        "file immediately after the syncer writes it. The watcher event " +
+        "must bind to the new document instead of being dropped before " +
+        "the remote-create handler persists the record.",
+    clients: 2,
+    steps: [
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+
+        {
+            type: "rename-next-write",
+            client: 0,
+            oldPath: "doc.md",
+            newPath: "renamed.md"
+        },
+
+        { type: "create", client: 1, path: "doc.md", content: "v1\n" },
+        { type: "sync", client: 1 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileCount(1);
+                s.assertFileExists("renamed.md");
+                s.assertFileNotExists("doc.md");
+                s.assertContent("renamed.md", "v1\n");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/remote-rename-collides-with-pending-local-create.test.ts b/frontend/deterministic-tests/src/tests/remote-rename-collides-with-pending-local-create.test.ts
new file mode 100644
index 00000000..d30fdc67
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/remote-rename-collides-with-pending-local-create.test.ts
@@ -0,0 +1,76 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const remoteRenameCollidesWithPendingLocalCreateTest: TestDefinition = {
+    // TODO(refactor): the failure mode described below is the
+    // pre-refactor "deflect-to-conflict-uuid" path that no longer
+    // exists. Under the new model the wire loop never moves files for
+    // path placement, so the remote rename can't deflect anywhere; the
+    // reconciler waits for the slot to free. Convergence assertion is
+    // still valid (no conflict-uuid stashes, both files present, the
+    // local create lands at a server-deconflicted sibling).
+    description:
+        "Client 0 has doc D tracked at `original.md`. Client 1 owns doc E " +
+        "and renames it to `target.md` server-side. Before client 0's " +
+        "drain processes the WS broadcast for E, the user creates a new " +
+        "local file `target.md` (a different doc, untracked). When the " +
+        "buffered RemoteChange for E drains, the engine has to reconcile " +
+        "doc E onto `target.md` even though the slot is held by client " +
+        "0's pending LocalCreate. Convergence requires both clients end " +
+        "up with [target.md = E] and the local create lands at a " +
+        "server-deconflicted sibling (e.g. `target (1).md`).",
+    clients: 2,
+    steps: [
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+
+        { type: "create", client: 1, path: "original.md", content: "v1\n" },
+        { type: "barrier" },
+
+        // Pause client 0's WS so the upcoming remote rename buffers and
+        // we can stage a colliding local create before the rename
+        // drains on client 0.
+        { type: "pause-websocket", client: 0 },
+
+        // Client 1 renames the doc. Server commits, broadcasts to
+        // client 0 (buffered).
+        {
+            type: "rename",
+            client: 1,
+            oldPath: "original.md",
+            newPath: "target.md"
+        },
+        { type: "sync", client: 1 },
+
+        // Client 0 still believes the doc is at `original.md`. The user
+        // creates a NEW file at `target.md` (an unrelated untracked
+        // doc). Disk on client 0 now has both `original.md` (the
+        // tracked doc) and `target.md` (the new untracked file).
+        { type: "create", client: 0, path: "target.md", content: "extra\n" },
+
+        // Resume client 0's WS. The buffered RemoteChange drains.
+        // The reconciler must converge without ever leaving a
+        // conflict-uuid stash on disk.
+        { type: "resume-websocket", client: 0 },
+
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (state: AssertableState): void => {
+                state.assertFileCount(2);
+                for (const path of state.files.keys()) {
+                    if (path.startsWith("conflict-")) {
+                        throw new Error(
+                            `Unexpected conflict-uuid stash on a converged client: ${path}`
+                        );
+                    }
+                }
+                state.assertFileExists("target.md");
+                state.assertContent("target.md", "v1\n");
+                // The local create gets server-deconflicted to a
+                // sibling path (e.g. `target (1).md`).
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/remote-update-resurrects-deleted-doc.test.ts b/frontend/deterministic-tests/src/tests/remote-update-resurrects-deleted-doc.test.ts
new file mode 100644
index 00000000..eb2ed86d
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/remote-update-resurrects-deleted-doc.test.ts
@@ -0,0 +1,59 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const remoteUpdateResurrectsDeletedDocTest: TestDefinition = {
+    description:
+        "Client 1 updates, deletes, and recreates P (with a new docId D2). " +
+        "While the buffered remote events are being processed by client 0, " +
+        "client 0 also makes a local edit to P. The local edit lands in the " +
+        "queue while v17 is mid-process, sending v17 down processRemoteUpdate's " +
+        "re-enqueue branch. The deferred v17 must NOT later resurrect D1 as a " +
+        "conflict-… file at P after the delete and the D2 create have drained.",
+    clients: 2,
+    steps: [
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+
+        { type: "create", client: 1, path: "P.md", content: "v8 content\n" },
+        { type: "barrier" },
+
+        { type: "pause-websocket", client: 0 },
+
+        {
+            type: "update",
+            client: 1,
+            path: "P.md",
+            content: "v17 content from client 1\n"
+        },
+        { type: "sync", client: 1 },
+        { type: "delete", client: 1, path: "P.md" },
+        { type: "sync", client: 1 },
+        {
+            type: "create",
+            client: 1,
+            path: "P.md",
+            content: "v21 content (D2)\n"
+        },
+        { type: "sync", client: 1 },
+
+        { type: "resume-websocket", client: 0 },
+
+        {
+            type: "update",
+            client: 0,
+            path: "P.md",
+            content: "local edit by client 0\n"
+        },
+
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (state: AssertableState): void => {
+                state
+                    .assertFileCount(1)
+                    .assertContent("P.md", "v21 content (D2)\n");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/remote-update-survives-user-rename.test.ts b/frontend/deterministic-tests/src/tests/remote-update-survives-user-rename.test.ts
new file mode 100644
index 00000000..b78ad143
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/remote-update-survives-user-rename.test.ts
@@ -0,0 +1,84 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const remoteUpdateSurvivesUserRenameTest: TestDefinition = {
+    description:
+        "Client 0 updates a tracked doc; while Client 1 is processing the " +
+        "broadcast and parked on the GET for the new version's content, the " +
+        "user renames the doc on Client 1. Pre-fix: `processRemoteUpdate` " +
+        "captures `actualPath` before the await and, after the GET returns, " +
+        "calls `write(actualPath, …)` (no-op — file was renamed away), " +
+        "`updateCache(actualPath, …)`, and `setDocument(actualPath, …)`. " +
+        "`setDocument` mutates the same record in place so its `path` is " +
+        "yanked from the user's renamed slot back to the pre-rename path, " +
+        "wiping the rename out of the queue's documents map. The queued " +
+        "`LocalUpdate` then reads from the now-stale `record.path`, hits " +
+        "`FileNotFoundError`, and is silently dropped — the user's rename " +
+        "never reaches the server. Post-fix: the handler defers when a " +
+        "local event landed mid-await, so the rename drains first and " +
+        "the deferred remote update is folded into the broadcast that " +
+        "follows the rename round-trip.",
+    clients: 2,
+    steps: [
+        { type: "create", client: 0, path: "doc.md", content: "v1\n" },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        // Buffer Client 1's incoming broadcasts so it doesn't see
+        // Client 0's update until we've paused the server.
+        { type: "pause-websocket", client: 1 },
+
+        // Server now holds v=2 of doc.md.
+        { type: "update", client: 0, path: "doc.md", content: "v2\n" },
+        { type: "sync", client: 0 },
+
+        // Pause the server. Client 1's upcoming GET for the new version
+        // content blocks at the OS layer until resume.
+        { type: "pause-server" },
+
+        // Release the buffered broadcast. Client 1's drain enters
+        // `processRemoteUpdate`, captures `actualPath`, fires the GET,
+        // and parks awaiting the response.
+        { type: "resume-websocket", client: 1 },
+
+        // Yield long enough for the drain to traverse all microtask
+        // hops between the WS handler and the GET, so the HTTP request
+        // is queued at the (paused) server before the rename runs.
+        // Without this yield the rename would be enqueued before
+        // `processRemoteUpdate`'s entry-time `hasPendingLocalEvents`
+        // check and the early-defer branch would mask the bug.
+        { type: "sleep", ms: 50 },
+
+        // While the GET is in flight the user renames the doc. The queue
+        // mutates `record.path` to "renamed.md" in place and pushes a
+        // LocalUpdate carrying the rename target.
+        {
+            type: "rename",
+            client: 1,
+            oldPath: "doc.md",
+            newPath: "renamed.md"
+        },
+
+        // Resume the server. The GET response unblocks
+        // `processRemoteUpdate`. With the fix in place it sees the
+        // queued LocalUpdate and defers; without the fix it walks past
+        // the rename and clobbers the documents map, dropping the
+        // pending LocalUpdate's read on the way back through.
+        { type: "resume-server" },
+
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileCount(1);
+                s.assertFileExists("renamed.md");
+                s.assertFileNotExists("doc.md");
+                // Both edits survive: the user's rename and Client 0's
+                // content update at v=2.
+                s.assertContent("renamed.md", "v2\n");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/rename-chain-during-pending-create.test.ts b/frontend/deterministic-tests/src/tests/rename-chain-during-pending-create.test.ts
new file mode 100644
index 00000000..822e83df
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/rename-chain-during-pending-create.test.ts
@@ -0,0 +1,64 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const renameChainDuringPendingCreateTest: TestDefinition = {
+    description:
+        "User creates a doc, then renames it twice while the LocalCreate's " +
+        "HTTP roundtrip is still in flight (server paused). Each rename " +
+        "pushes a LocalUpdate whose `documentId` is the create's Promise " +
+        "(see `pendingDocumentId` in `SyncEventQueue.enqueue`). After the " +
+        "create resolves, the first rename drains successfully and " +
+        "`setDocument` walks `events[]` to retarget queued LocalUpdates' " +
+        "`event.path` to the new disk location — but the comparison " +
+        "`e.documentId === record.documentId` mismatches the still-Promise " +
+        "references, so the second rename's `event.path` stays at the " +
+        "vacated previous slot. On the next drain step `skipIfOversized`'s " +
+        "`getFileSize(event.path)` throws FileNotFoundError, which " +
+        "`processEvent` swallows as 'Skipping sync event ... because the " +
+        "file no longer exists' — losing the user's final rename. " +
+        "Post-fix: `resolveCreate` (and the displacement-merge branch in " +
+        "`processCreate`) swap the Promise references for the resolved id " +
+        "before `setDocument` runs, so retarget works.",
+    clients: 2,
+    steps: [
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        // Pause the server so client 0's create stalls on the HTTP PUT
+        // while we queue rename events behind it.
+        { type: "pause-server" },
+
+        { type: "create", client: 0, path: "first.md", content: "v1\n" },
+        {
+            type: "rename",
+            client: 0,
+            oldPath: "first.md",
+            newPath: "second.md"
+        },
+        {
+            type: "rename",
+            client: 0,
+            oldPath: "second.md",
+            newPath: "third.md"
+        },
+
+        // Resume — drain pops LocalCreate (now resolves), then the two
+        // queued LocalUpdates. Pre-fix: only the first rename's
+        // file-system effect lands; the second is silently dropped.
+        // The server ends up with the doc at second.md, leaving
+        // client 0's local third.md untracked / out-of-sync.
+        { type: "resume-server" },
+
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (state: AssertableState): void => {
+                state.assertFileCount(1);
+                state.assertFileExists("third.md");
+                state.assertContent("third.md", "v1\n");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/rename-chain-then-delete.test.ts b/frontend/deterministic-tests/src/tests/rename-chain-then-delete.test.ts
new file mode 100644
index 00000000..03196919
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/rename-chain-then-delete.test.ts
@@ -0,0 +1,50 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const renameChainThenDeleteTest: TestDefinition = {
+    description:
+        "Client 0 renames X.md to Y.md to Z.md, then deletes Z.md while client 1 is offline. " +
+        "After client 1 reconnects, both clients must have no files.",
+    clients: 2,
+    steps: [
+        { type: "create", client: 0, path: "X.md", content: "chain-content" },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertContent("X.md", "chain-content");
+            }
+        },
+
+        { type: "disable-sync", client: 1 },
+
+        {
+            type: "rename",
+            client: 0,
+            oldPath: "X.md",
+            newPath: "Y.md"
+        },
+        { type: "sync", client: 0 },
+        {
+            type: "rename",
+            client: 0,
+            oldPath: "Y.md",
+            newPath: "Z.md"
+        },
+        { type: "sync", client: 0 },
+        { type: "delete", client: 0, path: "Z.md" },
+        { type: "sync", client: 0 },
+
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileCount(0);
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/rename-chain.test.ts b/frontend/deterministic-tests/src/tests/rename-chain.test.ts
new file mode 100644
index 00000000..8f9d7a7f
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/rename-chain.test.ts
@@ -0,0 +1,34 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const renameChainTest: TestDefinition = {
+    description:
+        "Client 0 (offline) creates A.md, renames to B.md, then renames to C.md. " +
+        "When sync is enabled, only C.md should exist. Client 1 should receive C.md " +
+        "with the original content. Intermediate paths should never appear.",
+    clients: 2,
+    steps: [
+        { type: "enable-sync", client: 1 },
+
+        {
+            type: "create",
+            client: 0,
+            path: "A.md",
+            content: "important content"
+        },
+        { type: "rename", client: 0, oldPath: "A.md", newPath: "B.md" },
+        { type: "rename", client: 0, oldPath: "B.md", newPath: "C.md" },
+
+        { type: "enable-sync", client: 0 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileNotExists("A.md")
+                    .assertFileNotExists("B.md")
+                    .assertContent("C.md", "important content");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/rename-circular.test.ts b/frontend/deterministic-tests/src/tests/rename-circular.test.ts
new file mode 100644
index 00000000..44a65149
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/rename-circular.test.ts
@@ -0,0 +1,44 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const renameCircularTest: TestDefinition = {
+    description:
+        "Client 0 creates three files, syncs, then goes offline and performs a circular rename via a temp file (A->temp, C->A, B->C, temp->B). After reconnecting, all three contents should exist across three files but paths may be deconflicted.",
+    clients: 2,
+    steps: [
+        { type: "create", client: 0, path: "A.md", content: "content-a" },
+        { type: "create", client: 0, path: "B.md", content: "content-b" },
+        { type: "create", client: 0, path: "C.md", content: "content-c" },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertContent("A.md", "content-a")
+                    .assertContent("B.md", "content-b")
+                    .assertContent("C.md", "content-c");
+            }
+        },
+
+        { type: "disable-sync", client: 0 },
+        { type: "rename", client: 0, oldPath: "A.md", newPath: "temp-a.md" },
+        { type: "rename", client: 0, oldPath: "C.md", newPath: "A.md" },
+        { type: "rename", client: 0, oldPath: "B.md", newPath: "C.md" },
+        { type: "rename", client: 0, oldPath: "temp-a.md", newPath: "B.md" },
+
+        { type: "enable-sync", client: 0 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileNotExists("temp-a.md")
+                    .assertFileCount(3)
+                    .assertAnyFileContains("content-c")
+                    .assertAnyFileContains("content-a")
+                    .assertAnyFileContains("content-b");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/rename-create-conflict.test.ts b/frontend/deterministic-tests/src/tests/rename-create-conflict.test.ts
new file mode 100644
index 00000000..fc6a00a7
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/rename-create-conflict.test.ts
@@ -0,0 +1,34 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const renameCreateConflictTest: TestDefinition = {
+    description:
+        "Client 0 creates A.md and syncs. Client 1 renames A.md to B.md and syncs. Client 0 (offline) creates B.md with the same content. After reconnecting, both clients should converge with only B.md.",
+    clients: 2,
+    steps: [
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "create", client: 0, path: "A.md", content: "hi" },
+        { type: "barrier" },
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertContent("A.md", "hi");
+            }
+        },
+        { type: "disable-sync", client: 0 },
+        { type: "rename", client: 1, oldPath: "A.md", newPath: "B.md" },
+        { type: "sync", client: 1 },
+        { type: "create", client: 0, path: "B.md", content: "hi" },
+        { type: "enable-sync", client: 0 },
+        { type: "barrier" },
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileCount(2)
+                    .assertContent("B.md", "hi")
+                    .assertContent("B (1).md", "hi");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/rename-overwrites-pending-create-then-delete.test.ts b/frontend/deterministic-tests/src/tests/rename-overwrites-pending-create-then-delete.test.ts
new file mode 100644
index 00000000..0b47c781
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/rename-overwrites-pending-create-then-delete.test.ts
@@ -0,0 +1,51 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const renameOverwritesPendingCreateThenDeleteTest: TestDefinition = {
+    description:
+        "A pending local create at a path must not mask a synced document renamed onto that path; later rename/delete events still belong to the synced document.",
+    clients: 2,
+    steps: [
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        {
+            type: "create",
+            client: 0,
+            path: "tracked.bin",
+            content: "BINARY:tracked"
+        },
+        { type: "barrier" },
+
+        { type: "pause-server" },
+
+        {
+            type: "create",
+            client: 0,
+            path: "pending.bin",
+            content: "BINARY:pending"
+        },
+        {
+            type: "rename",
+            client: 0,
+            oldPath: "tracked.bin",
+            newPath: "pending.bin"
+        },
+        {
+            type: "rename",
+            client: 0,
+            oldPath: "pending.bin",
+            newPath: "final.bin"
+        },
+        { type: "delete", client: 0, path: "final.bin" },
+
+        { type: "resume-server" },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (state: AssertableState): void => {
+                state.assertFileCount(0);
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/rename-pending-create-before-response.test.ts b/frontend/deterministic-tests/src/tests/rename-pending-create-before-response.test.ts
new file mode 100644
index 00000000..26623c43
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/rename-pending-create-before-response.test.ts
@@ -0,0 +1,42 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const renamePendingCreateBeforeResponseTest: TestDefinition = {
+    description:
+        "Client 0 creates a file while the server is paused, then renames it before the create completes. After the server resumes, both clients should converge with the file at the renamed path.",
+    clients: 2,
+    steps: [
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+
+        { type: "pause-server" },
+
+        {
+            type: "create",
+            client: 0,
+            path: "doc.md",
+            content: "original-content"
+        },
+
+        {
+            type: "rename",
+            client: 0,
+            oldPath: "doc.md",
+            newPath: "renamed.md"
+        },
+
+        { type: "resume-server" },
+
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileCount(1).assertContent(
+                    "renamed.md",
+                    "original-content"
+                );
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/rename-pending-create-onto-pending-delete-path.test.ts b/frontend/deterministic-tests/src/tests/rename-pending-create-onto-pending-delete-path.test.ts
new file mode 100644
index 00000000..0906f209
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/rename-pending-create-onto-pending-delete-path.test.ts
@@ -0,0 +1,59 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const renamePendingCreateOntoPendingDeletePathTest: TestDefinition = {
+    description:
+        "A pending create is renamed onto a path whose old server document " +
+        "has a queued delete. The delete must reach the server before the " +
+        "new create so the new generation is not merged into the soon-to-be " +
+        "deleted document.",
+    clients: 2,
+    steps: [
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        {
+            type: "create",
+            client: 1,
+            path: "file-17.md",
+            content: "old\n"
+        },
+        { type: "barrier" },
+
+        { type: "pause-server" },
+        {
+            type: "create",
+            client: 1,
+            path: "blocker.md",
+            content: "blocker\n"
+        },
+        { type: "sleep", ms: 100 },
+        {
+            type: "create",
+            client: 1,
+            path: "file-23.md",
+            content: "new\n"
+        },
+        { type: "delete", client: 1, path: "file-17.md" },
+        {
+            type: "rename",
+            client: 1,
+            oldPath: "file-23.md",
+            newPath: "file-17.md"
+        },
+        { type: "resume-server" },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (state: AssertableState): void => {
+                state
+                    .assertFileCount(2)
+                    .assertContent("blocker.md", "blocker\n")
+                    .assertContent("file-17.md", "new\n")
+                    .assertFileNotExists("file-23.md");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/rename-roundtrip.test.ts b/frontend/deterministic-tests/src/tests/rename-roundtrip.test.ts
new file mode 100644
index 00000000..0373debf
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/rename-roundtrip.test.ts
@@ -0,0 +1,40 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const renameRoundtripTest: TestDefinition = {
+    description:
+        "Client 0 creates A.md, renames it to B.md, then renames it back to A.md. After each step both clients sync. Both should end with only A.md at the original path.",
+    clients: 2,
+    steps: [
+        { type: "create", client: 0, path: "A.md", content: "original" },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertContent("A.md", "original");
+            }
+        },
+
+        { type: "rename", client: 0, oldPath: "A.md", newPath: "B.md" },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileNotExists("A.md").assertContent("B.md", "original");
+            }
+        },
+
+        { type: "rename", client: 0, oldPath: "B.md", newPath: "A.md" },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileNotExists("B.md").assertContent("A.md", "original");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/rename-swap.test.ts b/frontend/deterministic-tests/src/tests/rename-swap.test.ts
new file mode 100644
index 00000000..9910e8ef
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/rename-swap.test.ts
@@ -0,0 +1,44 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const renameSwapTest: TestDefinition = {
+    description:
+        "Client 0 has A.md and B.md synced. Goes offline and swaps them using " +
+        "a temp file: A.md -> temp.md, B.md -> A.md, temp.md -> B.md. " +
+        "When Client 0 reconnects, both contents should exist across two files.",
+    clients: 2,
+    steps: [
+        { type: "create", client: 0, path: "A.md", content: "content-a" },
+        { type: "create", client: 0, path: "B.md", content: "content-b" },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertContent("A.md", "content-a").assertContent(
+                    "B.md",
+                    "content-b"
+                );
+            }
+        },
+
+        { type: "disable-sync", client: 0 },
+        { type: "rename", client: 0, oldPath: "A.md", newPath: "temp.md" },
+        { type: "rename", client: 0, oldPath: "B.md", newPath: "A.md" },
+        { type: "rename", client: 0, oldPath: "temp.md", newPath: "B.md" },
+
+        { type: "enable-sync", client: 0 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileNotExists("temp.md")
+                    .assertFileCount(2)
+                    .assertAnyFileContains("content-b")
+                    .assertAnyFileContains("content-a");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/rename-to-path-of-unconfirmed-delete.test.ts b/frontend/deterministic-tests/src/tests/rename-to-path-of-unconfirmed-delete.test.ts
new file mode 100644
index 00000000..34a3867c
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/rename-to-path-of-unconfirmed-delete.test.ts
@@ -0,0 +1,44 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const renameToPathOfUnconfirmedDeleteTest: TestDefinition = {
+    description:
+        "Client 0 deletes A.md then renames B.md to A.md. After syncing, " +
+        "B's content should exist and the old A.md content should be gone. " +
+        "The server may deconflict the path if the delete and move arrive " +
+        "in the same transaction.",
+    clients: 2,
+    steps: [
+        {
+            type: "create",
+            client: 0,
+            path: "A.md",
+            content: "content A"
+        },
+        {
+            type: "create",
+            client: 0,
+            path: "B.md",
+            content: "content B"
+        },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "sync" },
+
+        { type: "delete", client: 0, path: "A.md" },
+        { type: "barrier" },
+
+        { type: "rename", client: 0, oldPath: "B.md", newPath: "A.md" },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileNotExists("B.md").assertContains(
+                    "A.md",
+                    "content B"
+                );
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/rename-to-pending-path-fallback.test.ts b/frontend/deterministic-tests/src/tests/rename-to-pending-path-fallback.test.ts
new file mode 100644
index 00000000..8747218a
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/rename-to-pending-path-fallback.test.ts
@@ -0,0 +1,43 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const renameToPendingPathFallbackTest: TestDefinition = {
+    description:
+        "Client 0 creates B.md and syncs. Goes offline, creates A.md, then renames B.md to A.md (overwriting the unsynced A). After reconnecting, B.md should be gone and A.md should have B's content.",
+    clients: 2,
+    steps: [
+        {
+            type: "create",
+            client: 0,
+            path: "B.md",
+            content: "tracked B content"
+        },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        { type: "disable-sync", client: 0 },
+
+        {
+            type: "create",
+            client: 0,
+            path: "A.md",
+            content: "pending A content"
+        },
+
+        { type: "rename", client: 0, oldPath: "B.md", newPath: "A.md" },
+
+        { type: "enable-sync", client: 0 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileNotExists("B.md").assertContains(
+                    "A.md",
+                    "tracked B content"
+                );
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/rename-update-conflict.test.ts b/frontend/deterministic-tests/src/tests/rename-update-conflict.test.ts
new file mode 100644
index 00000000..18d4c101
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/rename-update-conflict.test.ts
@@ -0,0 +1,42 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const renameUpdateConflictTest: TestDefinition = {
+    description:
+        "Client 0 renames A.md to B.md while client 1 updates A.md offline. After client 1 reconnects, both should converge with the update at B.md.",
+    clients: 2,
+    steps: [
+        { type: "create", client: 0, path: "A.md", content: "original" },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertContent("A.md", "original");
+            }
+        },
+
+        { type: "disable-sync", client: 1 },
+
+        { type: "rename", client: 0, oldPath: "A.md", newPath: "B.md" },
+        { type: "sync", client: 0 },
+
+        {
+            type: "update",
+            client: 1,
+            path: "A.md",
+            content: "updated by client 1"
+        },
+
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileNotExists("A.md").assertContains("B.md", "updated");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/renamed-pending-create-reused-path-then-delete.test.ts b/frontend/deterministic-tests/src/tests/renamed-pending-create-reused-path-then-delete.test.ts
new file mode 100644
index 00000000..3ffb376e
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/renamed-pending-create-reused-path-then-delete.test.ts
@@ -0,0 +1,65 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const renamedPendingCreateReusedPathThenDeleteTest: TestDefinition = {
+    description:
+        "A queued create is renamed away from file-59.md, a newer local " +
+        "file reuses file-59.md before the queued create drains, and the " +
+        "renamed-away generation is deleted. The delete must not erase or " +
+        "orphan the newer file-59.md generation.",
+    clients: 2,
+    steps: [
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        { type: "pause-server" },
+        {
+            type: "create",
+            client: 1,
+            path: "blocker.md",
+            content: "blocker\n"
+        },
+        { type: "sleep", ms: 100 },
+
+        {
+            type: "create",
+            client: 1,
+            path: "file-59.md",
+            content: "old\n"
+        },
+        {
+            type: "rename",
+            client: 1,
+            oldPath: "file-59.md",
+            newPath: "file-33.md"
+        },
+        {
+            type: "create",
+            client: 1,
+            path: "file-59.md",
+            content: "new\n"
+        },
+
+        {
+            type: "resume-server-until-history-then-pause",
+            client: 1,
+            syncType: "CREATE",
+            path: "file-33.md"
+        },
+        { type: "delete", client: 1, path: "file-33.md" },
+        { type: "resume-server" },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (state: AssertableState): void => {
+                state
+                    .assertFileCount(2)
+                    .assertContent("blocker.md", "blocker\n")
+                    .assertContent("file-59.md", "new\n")
+                    .assertFileNotExists("file-33.md");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/reset-clears-recently-deleted-resurrection.test.ts b/frontend/deterministic-tests/src/tests/reset-clears-recently-deleted-resurrection.test.ts
new file mode 100644
index 00000000..e0a1565c
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/reset-clears-recently-deleted-resurrection.test.ts
@@ -0,0 +1,43 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const resetClearsRecentlyDeletedResurrectionTest: TestDefinition = {
+    description:
+        "Client 0 deletes a file. Client 1 toggles sync off and on " +
+        "(simulating reconnect). The deleted file should NOT reappear " +
+        "on Client 1 after the sync reset.",
+    clients: 2,
+    steps: [
+        {
+            type: "create",
+            client: 0,
+            path: "ghost.md",
+            content: "should be deleted"
+        },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        { type: "delete", client: 0, path: "ghost.md" },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileNotExists("ghost.md");
+            }
+        },
+
+        { type: "disable-sync", client: 1 },
+        { type: "enable-sync", client: 1 },
+
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileCount(0);
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/same-doc-id-collapse-after-remote-quick-write-and-pending-rename.test.ts b/frontend/deterministic-tests/src/tests/same-doc-id-collapse-after-remote-quick-write-and-pending-rename.test.ts
new file mode 100644
index 00000000..2a3b5de4
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/same-doc-id-collapse-after-remote-quick-write-and-pending-rename.test.ts
@@ -0,0 +1,82 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const sameDocIdCollapseAfterRemoteQuickWriteAndPendingRenameTest: TestDefinition =
+    {
+        description:
+            "A remote create starts quick-writing at doc.md while a local " +
+            "create for the same path is queued and renamed to renamed.md. " +
+            "Because the local create was renamed before it reached the " +
+            "server, the two generations should remain separate tracked " +
+            "documents.",
+        clients: 2,
+        steps: [
+            { type: "enable-sync", client: 0 },
+
+            // Create a deleted latest version before client 1 joins.
+            // Catch-up will advance MinCovered with a non-contiguous id,
+            // keeping client 1's create lastSeen low enough to exercise
+            // the server's same-doc merge path from the e2e failure.
+            {
+                type: "create",
+                client: 0,
+                path: "history.md",
+                content: "history-v1"
+            },
+            { type: "sync", client: 0 },
+            {
+                type: "update",
+                client: 0,
+                path: "history.md",
+                content: "history-v2"
+            },
+            { type: "sync", client: 0 },
+            { type: "delete", client: 0, path: "history.md" },
+            { type: "sync", client: 0 },
+
+            { type: "enable-sync", client: 1 },
+            { type: "sync", client: 1 },
+
+            { type: "pause-websocket", client: 1 },
+
+            {
+                type: "create",
+                client: 0,
+                path: "doc.md",
+                content: "remote\n"
+            },
+            { type: "sync", client: 0 },
+
+            // Let client 1's buffered RemoteCreate enter the quick-write
+            // path, but hold the content fetch until the local create has
+            // appeared and moved away from doc.md.
+            { type: "pause-server" },
+            { type: "resume-websocket", client: 1 },
+            { type: "sleep", ms: 100 },
+
+            {
+                type: "create",
+                client: 1,
+                path: "doc.md",
+                content: "local\n"
+            },
+            {
+                type: "rename",
+                client: 1,
+                oldPath: "doc.md",
+                newPath: "renamed.md"
+            },
+
+            { type: "resume-server" },
+            { type: "barrier" },
+
+            {
+                type: "assert-consistent",
+                verify: (state: AssertableState): void => {
+                    state.assertFileCount(2);
+                    state.assertContent("doc.md", "remote\n");
+                    state.assertContent("renamed.md", "local\n");
+                }
+            }
+        ]
+    };
diff --git a/frontend/deterministic-tests/src/tests/same-doc-id-collapse-on-local-create-after-remote-create.test.ts b/frontend/deterministic-tests/src/tests/same-doc-id-collapse-on-local-create-after-remote-create.test.ts
new file mode 100644
index 00000000..dee3a9ad
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/same-doc-id-collapse-on-local-create-after-remote-create.test.ts
@@ -0,0 +1,121 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const sameDocIdCollapseOnLocalCreateAfterRemoteCreateTest: TestDefinition =
+    {
+        description:
+            "Client B creates X with content C2; the server commits and " +
+            "broadcasts. Client A's WS is paused so the RemoteCreate buffers. " +
+            "Server is then paused so A's about-to-POST LocalCreate will " +
+            "hang. A creates X with content C1: file lands on disk, " +
+            "LocalCreate enqueues, drain starts the POST, the POST stalls " +
+            "at the paused server. A's WS is resumed: the buffered " +
+            "RemoteCreate for doc-X is delivered to A and enqueues behind " +
+            "the in-flight LocalCreate. Per the lazy-paths model, when " +
+            "the RemoteCreate is processed it observes that path X is " +
+            "occupied locally by A's pending-create bytes, so it tracks " +
+            "doc-X with `localPath = undefined` / `remoteRelativePath = " +
+            "X` and does NOT fetch content. The server is then resumed: " +
+            "A's LocalCreate POST returns. The server, finding X already " +
+            "taken by doc-X, replies with doc-X's existing documentId " +
+            "(typically a MergingUpdate carrying the merged bytes). A's " +
+            "processCreate handler detects that response.documentId " +
+            "matches the no-localPath record built from the RemoteCreate " +
+            "and collapses the two: it sets localPath = X on that " +
+            "record, writes the merged bytes, and resolves the pending " +
+            "create promise. Final state: exactly one file at X on both " +
+            "clients, both pointing at doc-X's documentId, content " +
+            "carrying both contributions, and no conflict-<uuid>- " +
+            "stash anywhere.",
+        clients: 2,
+        steps: [
+            { type: "enable-sync", client: 0 },
+            { type: "enable-sync", client: 1 },
+            { type: "barrier" },
+
+            // Buffer broadcasts to client 0 (A) so client 1's create
+            // doesn't reach A's WS handler until we say so.
+            { type: "pause-websocket", client: 0 },
+
+            // Client 1 (B) commits doc-X at path X with content C2.
+            // The server commits, broadcasts (broadcast queued at A's
+            // paused WS).
+            {
+                type: "create",
+                client: 1,
+                path: "X.md",
+                content: "from-client-1 "
+            },
+            { type: "sync", client: 1 },
+
+            // Pause the server so A's upcoming LocalCreate POST hangs.
+            // This holds A's drain on the in-flight POST while we
+            // release the WS so the RemoteCreate enqueues behind it.
+            { type: "pause-server" },
+
+            // Client 0 (A) creates X locally with content C1. The
+            // file lands on A's disk; LocalCreate enqueues; drain
+            // starts the POST; POST stalls at the paused server.
+            {
+                type: "create",
+                client: 0,
+                path: "X.md",
+                content: "from-client-0 "
+            },
+
+            // Release A's WS. The buffered RemoteCreate for doc-X is
+            // delivered to A and enqueues behind the in-flight
+            // LocalCreate. Whichever of (RemoteCreate processed first
+            // → no-localPath record, then LocalCreate POST returns
+            // with merging response that collapses) or (LocalCreate
+            // POST returns first with merging response that creates
+            // the canonical record, then RemoteCreate finds the doc
+            // already tracked by id and no-ops) actually plays out
+            // depends on the fine-grained interleaving the runtime
+            // produces, but both paths are required to converge to
+            // the same single-record same-docId state.
+            { type: "resume-websocket", client: 0 },
+
+            // Resume the server: A's LocalCreate POST completes.
+            // Server returns doc-X's existing documentId (MergingUpdate
+            // with merged content). processCreate runs the collapse
+            // path.
+            { type: "resume-server" },
+
+            { type: "barrier" },
+
+            {
+                type: "assert-consistent",
+                verify: (state: AssertableState): void => {
+                    state.assertFileCount(1);
+                    state.assertFileExists("X.md");
+                    // Server-side merge of the two text creates must
+                    // carry both contributions through to the
+                    // converged file.
+                    state.assertContains(
+                        "X.md",
+                        "from-client-0",
+                        "from-client-1"
+                    );
+                    // The lazy-paths collapse path must not leave a
+                    // conflict-<uuid>- stash on either client.
+                    for (const path of state.files.keys()) {
+                        if (path.startsWith("conflict-")) {
+                            throw new Error(
+                                `Unexpected conflict-uuid stash on a converged client: ${path}`
+                            );
+                        }
+                    }
+                    for (const perClient of state.clientFiles) {
+                        for (const path of perClient.keys()) {
+                            if (path.startsWith("conflict-")) {
+                                throw new Error(
+                                    `Unexpected conflict-uuid stash on a per-client view: ${path}`
+                                );
+                            }
+                        }
+                    }
+                }
+            }
+        ]
+    };
diff --git a/frontend/deterministic-tests/src/tests/self-merge-pending-rename-aliases-second-create.test.ts b/frontend/deterministic-tests/src/tests/self-merge-pending-rename-aliases-second-create.test.ts
new file mode 100644
index 00000000..ac8ed3ed
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/self-merge-pending-rename-aliases-second-create.test.ts
@@ -0,0 +1,152 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const selfMergePendingRenameAliasesSecondCreateTest: TestDefinition = {
+    description:
+        "Single client makes two distinct creates that briefly share a path. " +
+        "Client 0 POSTs the first create at primary.md while the server is " +
+        "paused. While that POST is in flight: a second create is queued at " +
+        "staging.md, primary.md is renamed to moved.md (rewriting the in- " +
+        "flight create's event.path to moved.md and pushing a rename " +
+        "LocalUpdate at the queue tail), and staging.md is renamed onto the " +
+        "now-vacated primary.md slot (rewriting the second create's " +
+        "event.path to primary.md and pushing another rename LocalUpdate). " +
+        "Client 0's WS is paused throughout, so its watermark stays at 0. " +
+        "On resume the first POST commits Doc-X at primary.md (creation_vuid " +
+        "= N). The drain then processes the second LocalCreate (POST " +
+        "relativePath=primary.md, last_seen=0); the server's path-based " +
+        "dedup sees N > 0 and merges the second create into Doc-X " +
+        "(MergingUpdate). The buggy behaviour: processCreate's resolveCreate " +
+        "calls upsertRecord with localPath=primary.md, but the existing " +
+        "record (from the first create) already holds localPath=moved.md, " +
+        "and upsertRecord's `existing.localPath !== undefined` guard " +
+        "silently drops the new claim. The file at primary.md is left " +
+        "orphaned: tracked by no record, never broadcast, never deleted. " +
+        "After the user's renames the expected user-visible state is two " +
+        "distinct files at moved.md and primary.md — both clients must " +
+        "converge to that.",
+    clients: 2,
+    steps: [
+        // Both clients online so the WS connection is established before
+        // the test starts pausing things.
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        // Pause client 0's WS so its MinCovered watermark stays at 0
+        // through the whole bug sequence. The merge condition the
+        // server is going to fire is `creation_vuid > last_seen`; with
+        // a non-zero gap the same-device second create gets merged
+        // into the same-device first create.
+        { type: "pause-websocket", client: 0 },
+
+        // Client 1 commits a doc to push the server's vuid above 0.
+        // Without this filler, Doc-X's create vuid could be 1 and
+        // client 0's last_seen.add(1) would advance min to 1, killing
+        // the watermark gap that triggers the merge.
+        {
+            type: "create",
+            client: 1,
+            path: "filler.md",
+            content: "filler-content "
+        },
+        { type: "sync", client: 1 },
+
+        // Pause the server so client 0's first create POST hangs in
+        // flight, giving us a deterministic window in which to enqueue
+        // the second create and the renames.
+        { type: "pause-server" },
+
+        // First create — Doc-X. The wire-loop drains it, captures
+        // requestPath = event.path = "primary.md", reads the bytes,
+        // sends the POST, and stalls on the response.
+        {
+            type: "create",
+            client: 0,
+            path: "primary.md",
+            content: "primary content "
+        },
+
+        // Make sure the POST is actually on the wire with
+        // relativePath="primary.md" before we rewrite event.path.
+        // Without this delay the rename can win the race, the POST
+        // goes out with relativePath="moved.md", and the server-side
+        // path-collision merge never fires.
+        { type: "sleep", ms: 100 },
+
+        // Second create at a staging path. The wire-loop is still
+        // blocked on Doc-X's POST, so this LocalCreate just queues at
+        // index 1.
+        {
+            type: "create",
+            client: 0,
+            path: "staging.md",
+            content: "secondary content "
+        },
+
+        // Rename Doc-X's path. enqueue's pending-create branch
+        // rewrites Doc-X's event.path in place (moved.md) and pushes
+        // a LocalUpdate(rename, originalPath=moved.md) at the END of
+        // the queue. Note the ordering: this LocalUpdate is enqueued
+        // AFTER the staging LocalCreate above. That ordering is
+        // load-bearing — it is what makes the second create's POST
+        // drain (and trigger the server-side merge) before Doc-X's
+        // rename PUT moves the doc away from primary.md on the
+        // server.
+        {
+            type: "rename",
+            client: 0,
+            oldPath: "primary.md",
+            newPath: "moved.md"
+        },
+
+        // Rename the staging file onto Doc-X's now-vacated primary.md
+        // slot. enqueue rewrites the staging LocalCreate's event.path
+        // to primary.md and pushes a LocalUpdate(rename,
+        // originalPath=primary.md) at the queue tail. After this the
+        // disk has: moved.md = Doc-X's bytes, primary.md = Doc-Y's
+        // bytes.
+        {
+            type: "rename",
+            client: 0,
+            oldPath: "staging.md",
+            newPath: "primary.md"
+        },
+
+        // Let everything fly: server processes the queued POSTs;
+        // client 0 catches up on broadcasts.
+        { type: "resume-server" },
+        { type: "resume-websocket", client: 0 },
+
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (state: AssertableState): void => {
+                // The user did two distinct creates (Doc-X and Doc-Y);
+                // both contents must survive on both clients.
+                state.assertFileCount(3);
+                state.assertFileExists("filler.md");
+                state.assertFileExists("moved.md");
+                state.assertFileExists("primary.md");
+
+                // After the renames the user expects:
+                //   - moved.md  = the file that was originally created
+                //                 at primary.md (Doc-X's content).
+                //   - primary.md = the file that was originally created
+                //                  at staging.md (Doc-Y's content).
+                state.assertContains("moved.md", "primary content");
+                state.assertContains("primary.md", "secondary content");
+
+                // No content cross-contamination: each contribution
+                // should land in exactly one of the user-visible
+                // files. Under the bug, the orphan at primary.md
+                // carries Doc-X's content (because Doc-Y's PUT was
+                // aliased onto Doc-X's record and read Doc-X's bytes
+                // from moved.md), so this catches the leak too.
+                state.assertContentInAtMostOneFile("primary content");
+                state.assertContentInAtMostOneFile("secondary content");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/sequential-create-duplicate-content.test.ts b/frontend/deterministic-tests/src/tests/sequential-create-duplicate-content.test.ts
new file mode 100644
index 00000000..611e1ae3
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/sequential-create-duplicate-content.test.ts
@@ -0,0 +1,43 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const sequentialCreateDuplicateContentTest: TestDefinition = {
+    description:
+        "Client 0 creates A.md, syncs, then creates B.md with identical content. Both files must remain as separate documents on both clients.",
+    clients: 2,
+    steps: [
+        {
+            type: "create",
+            client: 0,
+            path: "A.md",
+            content: "identical content here"
+        },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertContent("A.md", "identical content here");
+            }
+        },
+
+        {
+            type: "create",
+            client: 0,
+            path: "B.md",
+            content: "identical content here"
+        },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileCount(2)
+                    .assertContent("A.md", "identical content here")
+                    .assertContent("B.md", "identical content here");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/server-pause-both-clients-create.test.ts b/frontend/deterministic-tests/src/tests/server-pause-both-clients-create.test.ts
new file mode 100644
index 00000000..f99cf92d
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/server-pause-both-clients-create.test.ts
@@ -0,0 +1,42 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const serverPauseBothClientsCreateTest: TestDefinition = {
+    description:
+        "Client 0 creates a file, then the server is paused. Client 1 creates a different file while the server is paused. After the server resumes, both files should exist on both clients.",
+    clients: 2,
+    steps: [
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        {
+            type: "create",
+            client: 0,
+            path: "alpha.md",
+            content: "from client 0"
+        },
+        { type: "pause-server" },
+
+        {
+            type: "create",
+            client: 1,
+            path: "beta.md",
+            content: "from client 1"
+        },
+
+        { type: "resume-server" },
+
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertContains("alpha.md", "from client 0").assertContains(
+                    "beta.md",
+                    "from client 1"
+                );
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/server-pause-both-edit-same-file.test.ts b/frontend/deterministic-tests/src/tests/server-pause-both-edit-same-file.test.ts
new file mode 100644
index 00000000..ff8cf194
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/server-pause-both-edit-same-file.test.ts
@@ -0,0 +1,68 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const serverPauseBothEditSameFileTest: TestDefinition = {
+    description:
+        "Both clients edit different sections of the same file while the server is paused. After resuming and converging, client 0 makes another edit to verify further updates still work correctly.",
+    clients: 2,
+    steps: [
+        {
+            type: "create",
+            client: 0,
+            path: "shared.md",
+            content: "line 1: original\nline 2: original\nline 3: original"
+        },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        { type: "pause-server" },
+
+        {
+            type: "update",
+            client: 0,
+            path: "shared.md",
+            content:
+                "line 1: edited by client 0\nline 2: original\nline 3: original"
+        },
+        {
+            type: "update",
+            client: 1,
+            path: "shared.md",
+            content:
+                "line 1: original\nline 2: original\nline 3: edited by client 1"
+        },
+
+        { type: "resume-server" },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileCount(1).assertContains(
+                    "shared.md",
+                    "edited by client 0",
+                    "edited by client 1"
+                );
+            }
+        },
+
+        {
+            type: "update",
+            client: 0,
+            path: "shared.md",
+            content: "post-merge edit from client 0"
+        },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileCount(1).assertContains(
+                    "shared.md",
+                    "post-merge edit from client 0"
+                );
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/server-pause-delete-recreate.test.ts b/frontend/deterministic-tests/src/tests/server-pause-delete-recreate.test.ts
new file mode 100644
index 00000000..5ac97f0d
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/server-pause-delete-recreate.test.ts
@@ -0,0 +1,38 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const serverPauseDeleteRecreateTest: TestDefinition = {
+    description:
+        "Client 1 deletes a file and syncs. The server is paused, then client 0 creates at the same path. After the server resumes, both clients should have the recreated file.",
+    clients: 2,
+    steps: [
+        { type: "create", client: 0, path: "A.md", content: "original" },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        { type: "delete", client: 1, path: "A.md" },
+        { type: "barrier" },
+
+        { type: "pause-server" },
+
+        {
+            type: "create",
+            client: 0,
+            path: "A.md",
+            content: "recreated during contention"
+        },
+
+        { type: "resume-server" },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (state: AssertableState): void => {
+                state
+                    .assertFileCount(1)
+                    .assertContent("A.md", "recreated during contention");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/server-pause-rename-edit-resume.test.ts b/frontend/deterministic-tests/src/tests/server-pause-rename-edit-resume.test.ts
new file mode 100644
index 00000000..b1739135
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/server-pause-rename-edit-resume.test.ts
@@ -0,0 +1,50 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const serverPauseRenameEditResumeTest: TestDefinition = {
+    description:
+        "Client 0 creates A.md and syncs. Server is paused. Client 0 " +
+        "renames A.md to B.md and edits B.md. Server resumes. Both the " +
+        "rename and edit should propagate to Client 1.",
+    clients: 2,
+    steps: [
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        {
+            type: "create",
+            client: 0,
+            path: "A.md",
+            content: "original content"
+        },
+        { type: "barrier" },
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertContent("A.md", "original content");
+            }
+        },
+
+        { type: "pause-server" },
+
+        { type: "rename", client: 0, oldPath: "A.md", newPath: "B.md" },
+        {
+            type: "update",
+            client: 0,
+            path: "B.md",
+            content: "edited after rename during pause"
+        },
+
+        { type: "resume-server" },
+
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileCount(1)
+                    .assertFileNotExists("A.md")
+                    .assertContent("B.md", "edited after rename during pause");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/server-pause-update-and-create.test.ts b/frontend/deterministic-tests/src/tests/server-pause-update-and-create.test.ts
new file mode 100644
index 00000000..2389ccf5
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/server-pause-update-and-create.test.ts
@@ -0,0 +1,54 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const serverPauseUpdateAndCreateTest: TestDefinition = {
+    description:
+        "Client 0 updates a shared file while client 1 creates a new file, both during a server pause. After the server resumes, both operations should complete and propagate to both clients.",
+    clients: 2,
+    steps: [
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        {
+            type: "create",
+            client: 0,
+            path: "shared.md",
+            content: "initial content"
+        },
+        { type: "barrier" },
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertContent("shared.md", "initial content");
+            }
+        },
+
+        { type: "pause-server" },
+
+        {
+            type: "update",
+            client: 0,
+            path: "shared.md",
+            content: "updated during pause"
+        },
+        {
+            type: "create",
+            client: 1,
+            path: "new-file.md",
+            content: "created by client 1"
+        },
+
+        { type: "resume-server" },
+
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertContent(
+                    "shared.md",
+                    "updated during pause"
+                ).assertContent("new-file.md", "created by client 1");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/simultaneous-create-delete-same-path.test.ts b/frontend/deterministic-tests/src/tests/simultaneous-create-delete-same-path.test.ts
new file mode 100644
index 00000000..7ec116ac
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/simultaneous-create-delete-same-path.test.ts
@@ -0,0 +1,38 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const simultaneousCreateDeleteSamePathTest: TestDefinition = {
+    description:
+        "Client 0 creates A.md and syncs to both clients. Client 0 deletes A.md while " +
+        "Client 1 (offline) updates A.md with different content. When Client 1 reconnects, " +
+        "the update and delete must be reconciled. Both clients must converge.",
+    clients: 2,
+    steps: [
+        { type: "create", client: 0, path: "A.md", content: "original from 0" },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        { type: "disable-sync", client: 1 },
+
+        { type: "delete", client: 0, path: "A.md" },
+        { type: "sync", client: 0 },
+
+        {
+            type: "update",
+            client: 1,
+            path: "A.md",
+            content: "modified by 1 while offline"
+        },
+
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileCount(0);
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/text-pending-create-not-displaced.test.ts b/frontend/deterministic-tests/src/tests/text-pending-create-not-displaced.test.ts
new file mode 100644
index 00000000..28243525
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/text-pending-create-not-displaced.test.ts
@@ -0,0 +1,36 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const textPendingCreateNotDisplacedTest: TestDefinition = {
+    description:
+        "Two clients each create a text file at the same path while offline. " +
+        "After syncing, the file should contain merged content from both clients.",
+    clients: 2,
+    steps: [
+        {
+            type: "create",
+            client: 0,
+            path: "data.txt",
+            content: "text data from client-0"
+        },
+        {
+            type: "create",
+            client: 1,
+            path: "data.txt",
+            content: "text data from client-1"
+        },
+
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileCount(1)
+                    .assertFileExists("data.txt")
+                    .assertAnyFileContains("client-0", "client-1");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/three-client-rename-create-delete.test.ts b/frontend/deterministic-tests/src/tests/three-client-rename-create-delete.test.ts
new file mode 100644
index 00000000..80478adc
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/three-client-rename-create-delete.test.ts
@@ -0,0 +1,55 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const threeClientRenameCreateDeleteTest: TestDefinition = {
+    description:
+        "Client 0 renames X -> Y, Client 1 deletes X, Client 2 creates Y. " +
+        "All three operations happen while the other clients are offline. " +
+        "Tests that the system handles the three-way conflict and converges.",
+    clients: 3,
+    steps: [
+        {
+            type: "create",
+            client: 0,
+            path: "X.md",
+            content: "original from A"
+        },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "enable-sync", client: 2 },
+        { type: "barrier" },
+
+        { type: "disable-sync", client: 0 },
+        { type: "disable-sync", client: 1 },
+        { type: "disable-sync", client: 2 },
+
+        { type: "rename", client: 0, oldPath: "X.md", newPath: "Y.md" },
+
+        { type: "delete", client: 1, path: "X.md" },
+
+        {
+            type: "create",
+            client: 2,
+            path: "Y.md",
+            content: "new from C"
+        },
+
+        { type: "enable-sync", client: 0 },
+        { type: "sync", client: 0 },
+
+        { type: "enable-sync", client: 1 },
+        { type: "sync", client: 1 },
+
+        { type: "enable-sync", client: 2 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileNotExists("X.md").assertAnyFileContains(
+                    "new from C"
+                );
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/update-does-not-survive-remote-delete.test.ts b/frontend/deterministic-tests/src/tests/update-does-not-survive-remote-delete.test.ts
new file mode 100644
index 00000000..70a2fc8c
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/update-does-not-survive-remote-delete.test.ts
@@ -0,0 +1,36 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const updateDoesNotSurvivesRemoteDeleteTest: TestDefinition = {
+    description:
+        "Client 0 deletes a file while client 1 edits it offline. Client 0 syncs the delete first, then client 1 reconnects. Deletes always win.",
+    clients: 2,
+    steps: [
+        { type: "create", client: 0, path: "doc.md", content: "original" },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        { type: "disable-sync", client: 0 },
+        { type: "disable-sync", client: 1 },
+
+        { type: "delete", client: 0, path: "doc.md" },
+        {
+            type: "update",
+            client: 1,
+            path: "doc.md",
+            content: "edited by client 1"
+        },
+
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileCount(0);
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/update-during-create-processing.test.ts b/frontend/deterministic-tests/src/tests/update-during-create-processing.test.ts
new file mode 100644
index 00000000..ca53244e
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/update-during-create-processing.test.ts
@@ -0,0 +1,42 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const updateDuringCreateProcessingTest: TestDefinition = {
+    description:
+        "Client 0 creates a file while the server is paused, then immediately updates it. After the server resumes, both clients should converge with the updated content.",
+    clients: 2,
+    steps: [
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        { type: "pause-server" },
+
+        {
+            type: "create",
+            client: 0,
+            path: "file.md",
+            content: "initial"
+        },
+
+        {
+            type: "update",
+            client: 0,
+            path: "file.md",
+            content: "updated during create"
+        },
+
+        { type: "resume-server" },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileCount(1).assertContent(
+                    "file.md",
+                    "updated during create"
+                );
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/user-parenthesized-file-not-deleted.test.ts b/frontend/deterministic-tests/src/tests/user-parenthesized-file-not-deleted.test.ts
new file mode 100644
index 00000000..ef6cd771
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/user-parenthesized-file-not-deleted.test.ts
@@ -0,0 +1,47 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const userParenthesizedFileNotDeletedTest: TestDefinition = {
+    description:
+        "A user-created file named 'Chapter (1).bin' alongside 'Chapter.bin' should not " +
+        "be mistakenly removed when another client creates a conflicting file.",
+    clients: 2,
+    steps: [
+        { type: "enable-sync", client: 0 },
+
+        {
+            type: "create",
+            client: 0,
+            path: "Chapter.bin",
+            content: "chapter one"
+        },
+        {
+            type: "create",
+            client: 0,
+            path: "Chapter (1).bin",
+            content: "chapter one notes"
+        },
+
+        { type: "sync", client: 0 },
+
+        {
+            type: "create",
+            client: 1,
+            path: "Chapter.bin",
+            content: "chapter one notes"
+        },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (state: AssertableState): void => {
+                state
+                    .assertFileCount(3)
+                    .assertFileExists("Chapter.bin")
+                    .assertFileExists("Chapter (1).bin")
+                    .assertFileExists("Chapter (2).bin");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/watermark-advances-on-skip.test.ts b/frontend/deterministic-tests/src/tests/watermark-advances-on-skip.test.ts
new file mode 100644
index 00000000..063faff4
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/watermark-advances-on-skip.test.ts
@@ -0,0 +1,35 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const watermarkAdvancesOnSkipTest: TestDefinition = {
+    description:
+        "Both clients create the same file offline. After syncing, both disconnect and reconnect. The reconnect should not replay already-processed updates.",
+    clients: 2,
+    steps: [
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        { type: "disable-sync", client: 0 },
+        { type: "disable-sync", client: 1 },
+        { type: "create", client: 0, path: "doc.md", content: "from client 0" },
+        { type: "create", client: 1, path: "doc.md", content: "from client 1" },
+
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        { type: "disable-sync", client: 0 },
+        { type: "disable-sync", client: 1 },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileCount(1).assertFileExists("doc.md");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/tests/watermark-gap-remote-update-not-recorded.test.ts b/frontend/deterministic-tests/src/tests/watermark-gap-remote-update-not-recorded.test.ts
new file mode 100644
index 00000000..ac9ba467
--- /dev/null
+++ b/frontend/deterministic-tests/src/tests/watermark-gap-remote-update-not-recorded.test.ts
@@ -0,0 +1,37 @@
+import type { AssertableState } from "../utils/assertable-state";
+import type { TestDefinition } from "../test-definition";
+
+export const watermarkGapRemoteUpdateNotRecordedTest: TestDefinition = {
+    description:
+        "Client 0 sends two rapid updates. Client 1 processes both, then disconnects and reconnects. Both clients should still converge to the latest content after reconnect.",
+    clients: 2,
+    steps: [
+        { type: "create", client: 0, path: "doc.md", content: "original" },
+        { type: "enable-sync", client: 0 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        { type: "update", client: 0, path: "doc.md", content: "update 1" },
+        { type: "sync", client: 0 },
+        { type: "update", client: 0, path: "doc.md", content: "update 2" },
+
+        { type: "barrier" },
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileCount(1).assertContent("doc.md", "update 2");
+            }
+        },
+
+        { type: "disable-sync", client: 1 },
+        { type: "enable-sync", client: 1 },
+        { type: "barrier" },
+
+        {
+            type: "assert-consistent",
+            verify: (s: AssertableState): void => {
+                s.assertFileCount(1).assertContent("doc.md", "update 2");
+            }
+        }
+    ]
+};
diff --git a/frontend/deterministic-tests/src/utils/assert.ts b/frontend/deterministic-tests/src/utils/assert.ts
new file mode 100644
index 00000000..4e709060
--- /dev/null
+++ b/frontend/deterministic-tests/src/utils/assert.ts
@@ -0,0 +1,5 @@
+export function assert(value: boolean, message: string): asserts value {
+    if (!value) {
+        throw new Error(message);
+    }
+}
diff --git a/frontend/deterministic-tests/src/utils/assertable-state.ts b/frontend/deterministic-tests/src/utils/assertable-state.ts
new file mode 100644
index 00000000..7c6f192c
--- /dev/null
+++ b/frontend/deterministic-tests/src/utils/assertable-state.ts
@@ -0,0 +1,150 @@
+import type { ClientState } from "../test-definition";
+
+export class AssertableState {
+    public readonly files: Map<string, string>;
+    public readonly clientFiles: Map<string, string>[];
+
+    public constructor(state: ClientState) {
+        this.files = state.files;
+        this.clientFiles = state.clientFiles;
+    }
+
+    public assertFileCount(expected: number): this {
+        if (this.files.size !== expected) {
+            const keys = Array.from(this.files.keys()).join(", ");
+            throw new Error(
+                `Expected ${expected} file(s), got ${this.files.size}: [${keys}]`
+            );
+        }
+        return this;
+    }
+
+    public assertFileExists(path: string): this {
+        if (!this.files.has(path)) {
+            const keys = Array.from(this.files.keys()).join(", ");
+            throw new Error(`Expected "${path}" to exist. Files: [${keys}]`);
+        }
+        return this;
+    }
+
+    public assertFileNotExists(path: string): this {
+        if (this.files.has(path)) {
+            const keys = Array.from(this.files.keys()).join(", ");
+            throw new Error(
+                `Expected "${path}" not to exist. Files: [${keys}]`
+            );
+        }
+        return this;
+    }
+
+    public assertContent(path: string, expected: string): this {
+        this.assertFileExists(path);
+        const actual = this.files.get(path) ?? "";
+        if (actual !== expected) {
+            throw new Error(
+                `Expected "${path}" to have content "${expected}", got: "${actual}"`
+            );
+        }
+        return this;
+    }
+
+    public assertContains(path: string, ...substrings: string[]): this {
+        this.assertFileExists(path);
+        const content = this.files.get(path) ?? "";
+        const missing = substrings.filter((s) => !content.includes(s));
+        if (missing.length > 0) {
+            throw new Error(
+                `Expected "${path}" to contain ${missing.map((s) => `"${s}"`).join(", ")}. Content: "${content}"`
+            );
+        }
+        return this;
+    }
+
+    public assertContainsAny(path: string, ...substrings: string[]): this {
+        this.assertFileExists(path);
+        const content = this.files.get(path) ?? "";
+        const found = substrings.some((s) => content.includes(s));
+        if (!found) {
+            throw new Error(
+                `Expected "${path}" to contain at least one of ${substrings.map((s) => `"${s}"`).join(", ")}. Content: "${content}"`
+            );
+        }
+        return this;
+    }
+
+    public assertAnyFileContains(...substrings: string[]): this {
+        const allContent = Array.from(this.files.values()).join("\n");
+        const missing = substrings.filter((s) => !allContent.includes(s));
+        if (missing.length > 0) {
+            const dump = Array.from(this.files.entries())
+                .map(([k, v]) => `  ${k}: "${v}"`)
+                .join("\n");
+            throw new Error(
+                `Expected some file to contain ${missing.map((s) => `"${s}"`).join(", ")}.\nFiles:\n${dump}`
+            );
+        }
+        return this;
+    }
+
+    public assertNoFileContains(...substrings: string[]): this {
+        const offenders: { path: string; substring: string }[] = [];
+        for (const [path, content] of this.files) {
+            for (const s of substrings) {
+                if (content.includes(s)) {
+                    offenders.push({ path, substring: s });
+                }
+            }
+        }
+        if (offenders.length > 0) {
+            const dump = Array.from(this.files.entries())
+                .map(([k, v]) => `  ${k}: "${v}"`)
+                .join("\n");
+            throw new Error(
+                `Expected no file to contain ${substrings.map((s) => `"${s}"`).join(", ")}, but found ${offenders.map((o) => `"${o.substring}" in "${o.path}"`).join(", ")}.\nFiles:\n${dump}`
+            );
+        }
+        return this;
+    }
+
+    public assertSubstringCount(
+        path: string,
+        substring: string,
+        expected: number
+    ): this {
+        this.assertFileExists(path);
+        const content = this.files.get(path) ?? "";
+        const actual = content.split(substring).length - 1;
+        if (actual !== expected) {
+            throw new Error(
+                `Expected "${substring}" to appear ${expected} time(s) in "${path}", found ${actual}. Content: "${content}"`
+            );
+        }
+        return this;
+    }
+
+    public assertContentInAtMostOneFile(substring: string): this {
+        const matches = Array.from(this.files.entries()).filter(([, content]) =>
+            content.includes(substring)
+        );
+        if (matches.length > 1) {
+            const dump = Array.from(this.files.entries())
+                .map(([k, v]) => `  ${k}: "${v}"`)
+                .join("\n");
+            throw new Error(
+                `Expected "${substring}" in at most 1 file, found in ${matches.length}: [${matches.map(([p]) => p).join(", ")}].\nFiles:\n${dump}`
+            );
+        }
+        return this;
+    }
+
+    public ifFileExists(path: string, fn: (state: this) => void): this {
+        if (this.files.has(path)) {
+            fn(this);
+        }
+        return this;
+    }
+
+    public getContent(path: string): string {
+        return this.files.get(path) ?? "";
+    }
+}
diff --git a/frontend/deterministic-tests/src/utils/find-free-port.ts b/frontend/deterministic-tests/src/utils/find-free-port.ts
new file mode 100644
index 00000000..0734c1a9
--- /dev/null
+++ b/frontend/deterministic-tests/src/utils/find-free-port.ts
@@ -0,0 +1,29 @@
+import * as net from "node:net";
+
+interface PortReservation {
+    port: number;
+    release: () => void;
+}
+
+/**
+ * Find a free port and keep it reserved until the caller explicitly releases it.
+ */
+export async function findFreePort(): Promise<PortReservation> {
+    return new Promise((resolve, reject) => {
+        const server = net.createServer();
+        server.listen(0, "127.0.0.1", () => {
+            const addr = server.address();
+            if (addr === null || typeof addr === "string") {
+                server.close();
+                reject(new Error("Failed to get port from server"));
+                return;
+            }
+            const { port } = addr;
+            resolve({
+                port,
+                release: () => server.close()
+            });
+        });
+        server.on("error", reject);
+    });
+}
diff --git a/frontend/deterministic-tests/src/utils/sleep.ts b/frontend/deterministic-tests/src/utils/sleep.ts
new file mode 100644
index 00000000..ff474799
--- /dev/null
+++ b/frontend/deterministic-tests/src/utils/sleep.ts
@@ -0,0 +1,3 @@
+export async function sleep(ms: number): Promise<void> {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}
diff --git a/frontend/deterministic-tests/src/utils/with-timeout.ts b/frontend/deterministic-tests/src/utils/with-timeout.ts
new file mode 100644
index 00000000..14ee3f27
--- /dev/null
+++ b/frontend/deterministic-tests/src/utils/with-timeout.ts
@@ -0,0 +1,15 @@
+export async function withTimeout<T>(
+    promise: Promise<T>,
+    timeoutMs: number,
+    message: string
+): Promise<T> {
+    let timeoutId: ReturnType<typeof setTimeout> | undefined = undefined;
+    const timeoutPromise = new Promise<never>((_resolve, reject) => {
+        timeoutId = setTimeout(() => {
+            reject(new Error(message));
+        }, timeoutMs);
+    });
+    return Promise.race([promise, timeoutPromise]).finally(() => {
+        clearTimeout(timeoutId);
+    });
+}
diff --git a/frontend/deterministic-tests/tsconfig.json b/frontend/deterministic-tests/tsconfig.json
new file mode 100644
index 00000000..7558871d
--- /dev/null
+++ b/frontend/deterministic-tests/tsconfig.json
@@ -0,0 +1,12 @@
+{
+    "compilerOptions": {
+        "baseUrl": ".",
+        "strict": true,
+        "target": "ES2022",
+        "module": "CommonJS",
+        "esModuleInterop": true,
+        "lib": ["DOM", "ES2024"],
+        "moduleResolution": "node"
+    },
+    "exclude": ["./dist"]
+}
diff --git a/frontend/deterministic-tests/webpack.config.js b/frontend/deterministic-tests/webpack.config.js
new file mode 100644
index 00000000..6aee1547
--- /dev/null
+++ b/frontend/deterministic-tests/webpack.config.js
@@ -0,0 +1,30 @@
+const path = require("path");
+const webpack = require("webpack");
+
+module.exports = {
+    entry: "./src/cli.ts",
+    target: "node",
+    mode: "production",
+    optimization: {
+        minimize: false
+    },
+    module: {
+        rules: [
+            {
+                test: /\.ts$/,
+                use: "ts-loader"
+            }
+        ]
+    },
+    resolve: {
+        extensions: [".ts", ".js"]
+    },
+    output: {
+        globalObject: "this",
+        filename: "cli.js",
+        path: path.resolve(__dirname, "dist")
+    },
+    plugins: [
+        new webpack.BannerPlugin({ banner: "#!/usr/bin/env node", raw: true })
+    ]
+};
diff --git a/frontend/package.json b/frontend/package.json
index df167a5e..0dd9057d 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -5,6 +5,7 @@
         "sync-client",
         "obsidian-plugin",
         "test-client",
+        "deterministic-tests",
         "local-client-cli"
     ],
     "prettier": {
@@ -17,7 +18,7 @@
         "build": "npm run build --workspaces",
         "dev": "concurrently --kill-others \"npm run dev -w sync-client\" \"npm run dev -w obsidian-plugin\"",
         "test": "npm run test --workspaces",
-        "lint": "eslint --fix sync-client obsidian-plugin test-client local-client-cli && prettier --write \"**/*.ts\"",
+        "lint": "eslint --fix sync-client obsidian-plugin test-client deterministic-tests local-client-cli && prettier --write \"**/*.ts\"",
         "update": "ncu -u -ws"
     },
     "devDependencies": {

From 40fbd42b92cf78581b7cc848cfb1f93423e21e9b Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 9 May 2026 11:17:21 +0100
Subject: [PATCH 757/761] Remove GH actions (#192)

Reviewed-on: https://home.schmelczer.dev/git/git/andras/vault-link/pulls/192
Co-authored-by: Andras Schmelczer <andras@schmelczer.dev>
Co-committed-by: Andras Schmelczer <andras@schmelczer.dev>
---
 .github/dependabot.yml                      | 27 ------
 .github/workflows/check.yml                 | 36 --------
 .github/workflows/deploy-docs.yml           | 58 -------------
 .github/workflows/e2e.yml                   | 72 ----------------
 .github/workflows/publish-cli-docker.yml    | 67 ---------------
 .github/workflows/publish-plugin.yml        | 59 -------------
 .github/workflows/publish-server-docker.yml | 92 ---------------------
 7 files changed, 411 deletions(-)
 delete mode 100644 .github/dependabot.yml
 delete mode 100644 .github/workflows/check.yml
 delete mode 100644 .github/workflows/deploy-docs.yml
 delete mode 100644 .github/workflows/e2e.yml
 delete mode 100644 .github/workflows/publish-cli-docker.yml
 delete mode 100644 .github/workflows/publish-plugin.yml
 delete mode 100644 .github/workflows/publish-server-docker.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
deleted file mode 100644
index 7d56669b..00000000
--- a/.github/dependabot.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-# To get started with Dependabot version updates, you'll need to specify which
-# package ecosystems to update and where the package manifests are located.
-# Please see the documentation for all configuration options:
-# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
-
-version: 2
-updates:
-  - package-ecosystem: "npm"
-    directories: ["/frontend", "/docs"]
-    schedule:
-      interval: "daily"
-
-  - package-ecosystem: "docker"
-    directories: ["**"]
-    schedule:
-      interval: "daily"
-
-  - package-ecosystem: "cargo"
-    directories: ["**"]
-    schedule:
-      interval: "daily"
-
-  # Disable this for security reasons
-  # - package-ecosystem: "github-actions"
-  #   directories: ["**"]
-  #   schedule:
-  #     interval: "daily"
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
deleted file mode 100644
index fc1b1c99..00000000
--- a/.github/workflows/check.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-name: Check
-
-on:
-  push:
-    branches: ["main"]
-  pull_request:
-    branches: ["main"]
-  workflow_dispatch:
-
-env:
-  CARGO_TERM_COLOR: always
-  RUSTFLAGS: "-Dwarnings"
-
-jobs:
-  build:
-    runs-on: self-hosted
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Setup Node.js environment
-        uses: actions/setup-node@v4.2.0
-        with:
-          node-version: "25.x"
-          check-latest: true
-
-      - name: Setup Rust toolchain
-        uses: dtolnay/rust-toolchain@stable
-        with:
-          toolchain: "1.92.0"
-          components: clippy, rustfmt
-
-      - name: Lint & test
-        run: scripts/check.sh
diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml
deleted file mode 100644
index bb25e463..00000000
--- a/.github/workflows/deploy-docs.yml
+++ /dev/null
@@ -1,58 +0,0 @@
-name: Deploy Documentation
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - "docs/**"
-      - ".github/workflows/deploy-docs.yml"
-  workflow_dispatch:
-
-permissions:
-  contents: read
-  pages: write
-  id-token: write
-
-concurrency:
-  group: pages
-  cancel-in-progress: false
-
-jobs:
-  build:
-    runs-on: self-hosted
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Setup Node.js environment
-        uses: actions/setup-node@v4.2.0
-        with:
-          node-version: "25.x"
-          check-latest: true
-
-      - name: Setup Pages
-        uses: actions/configure-pages@v4
-
-      - name: Build docs
-        run: scripts/build-docs.sh
-
-      - name: Upload artifact
-        uses: actions/upload-pages-artifact@v3
-        with:
-          path: docs/.vitepress/dist
-
-  deploy:
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
-    needs: build
-    runs-on: self-hosted
-    name: Deploy
-    steps:
-      - name: Deploy to GitHub Pages
-        id: deployment
-        uses: actions/deploy-pages@v4
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
deleted file mode 100644
index 98dbfc1f..00000000
--- a/.github/workflows/e2e.yml
+++ /dev/null
@@ -1,72 +0,0 @@
-name: E2E tests
-
-on:
-  push:
-    branches: ["main"]
-  pull_request:
-    branches: ["main"]
-  schedule:
-    - cron: "0 * * * *"
-  workflow_dispatch:
-
-concurrency:
-  group: e2e-tests
-  cancel-in-progress: false
-
-env:
-  RUSTFLAGS: "-Dwarnings"
-
-jobs:
-  build:
-    runs-on: self-hosted
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Setup Node.js environment
-        uses: actions/setup-node@v4.2.0
-        with:
-          node-version: "25.x"
-          check-latest: true
-
-      - name: Setup Rust toolchain
-        uses: dtolnay/rust-toolchain@stable
-        with:
-          toolchain: "1.92.0"
-          components: clippy, rustfmt
-
-      - name: Setup rust
-        run: |
-          which sqlx || cargo install sqlx-cli
-          cd sync-server
-          sqlx database create --database-url sqlite://db.sqlite3
-          sqlx migrate run --source src/app_state/database/migrations --database-url sqlite://db.sqlite3
-
-      - name: E2E tests
-        run: |
-          cd sync-server
-          cargo run config-e2e.yml --color never &
-          SERVER_PID=$!
-          cd ..
-
-          scripts/e2e.sh 8
-          EXIT_CODE=$?
-
-          kill $SERVER_PID 2>/dev/null || true
-          wait $SERVER_PID 2>/dev/null || true
-
-          exit $EXIT_CODE
-
-      - name: Upload e2e logs
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: e2e-logs
-          path: logs/
-          retention-days: 30
-
-      - name: Cleanup
-        if: always()
-        run: scripts/clean-up.sh
diff --git a/.github/workflows/publish-cli-docker.yml b/.github/workflows/publish-cli-docker.yml
deleted file mode 100644
index 10a7e8ba..00000000
--- a/.github/workflows/publish-cli-docker.yml
+++ /dev/null
@@ -1,67 +0,0 @@
-name: Publish CLI
-
-on:
-  push:
-    branches: ["main"]
-    tags: ["*"]
-  pull_request:
-    branches: ["main"]
-
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: ${{ github.repository }}-cli
-
-jobs:
-  publish-docker:
-    runs-on: self-hosted
-
-    permissions:
-      contents: read
-      packages: write
-      id-token: write
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Install cosign
-        uses: sigstore/cosign-installer@59acb6260d9c0ba8f4a2f9d9b48431a222b68e20 #v3.5.0
-        with:
-          cosign-release: "v2.2.4"
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0
-
-      - name: Log into registry ${{ env.REGISTRY }}
-        uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Extract Docker metadata
-        id: meta
-        uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5.0.0
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-
-      - name: Build and push Docker image
-        id: build-and-push
-        uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
-        with:
-          context: frontend
-          file: frontend/local-client-cli/Dockerfile
-          platforms: linux/amd64
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-
-      - name: Sign the published Docker image
-        env:
-          TAGS: ${{ steps.meta.outputs.tags }}
-          DIGEST: ${{ steps.build-and-push.outputs.digest }}
-        run: echo "${TAGS}" | xargs -I {} cosign sign --yes {}@${DIGEST}
diff --git a/.github/workflows/publish-plugin.yml b/.github/workflows/publish-plugin.yml
deleted file mode 100644
index 452bc601..00000000
--- a/.github/workflows/publish-plugin.yml
+++ /dev/null
@@ -1,59 +0,0 @@
-name: Publish Obsidian plugin
-
-on:
-  push:
-    tags: ["*"]
-
-env:
-  CARGO_TERM_COLOR: always
-
-jobs:
-  publish-plugin:
-    runs-on: self-hosted
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Setup Node.js environment
-        uses: actions/setup-node@v4.2.0
-        with:
-          node-version: "25.x"
-          check-latest: true
-
-      - name: Build plugin
-        run: |
-          cd frontend
-          npm ci
-          npm run build
-
-      - name: Setup Rust toolchain
-        uses: dtolnay/rust-toolchain@stable
-        with:
-          toolchain: "1.92.0"
-          components: clippy, rustfmt
-
-      - name: Install cross-compilation tools
-        run: |
-          apt update
-          apt install -y gcc-aarch64-linux-gnu musl-tools gcc-mingw-w64-x86-64
-
-      - name: Build Linux and Windows binaries
-        run: ./scripts/build-sync-server-binaries.sh
-
-      - name: Create release
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          tag="${GITHUB_REF#refs/tags/}"
-
-          mkdir -p release
-          cp frontend/obsidian-plugin/dist/* release/
-          cp sync-server/artifacts/sync-server-* release/
-          cd release
-
-          gh release create "$tag" \
-            --title="$tag" \
-            --draft \
-            *
diff --git a/.github/workflows/publish-server-docker.yml b/.github/workflows/publish-server-docker.yml
deleted file mode 100644
index 4a97a9e6..00000000
--- a/.github/workflows/publish-server-docker.yml
+++ /dev/null
@@ -1,92 +0,0 @@
-name: Publish server Docker image
-
-on:
-  push:
-    branches: ["main"]
-    tags: ["*"]
-  pull_request:
-    branches: ["main"]
-
-env:
-  # Use docker.io for Docker Hub if empty
-  REGISTRY: ghcr.io
-  # github.repository as <account>/<repo>
-  IMAGE_NAME: ${{ github.repository }}
-
-jobs:
-  publish-docker:
-    runs-on: self-hosted
-
-    permissions:
-      contents: read
-      packages: write
-      # This is used to complete the identity challenge
-      # with sigstore/fulcio.
-      id-token: write
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      # Install the cosign tool
-      # https://github.com/sigstore/cosign-installer
-      - name: Install cosign
-        if: github.ref_type == 'tag'
-        uses: sigstore/cosign-installer@59acb6260d9c0ba8f4a2f9d9b48431a222b68e20 #v3.5.0
-        with:
-          cosign-release: "v2.2.4"
-
-      # Set up BuildKit Docker container builder to be able to build
-      # multi-platform images and export cache
-      # https://github.com/docker/setup-buildx-action
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0
-
-      # Login against a Docker registry
-      # https://github.com/docker/login-action
-      - name: Log into registry ${{ env.REGISTRY }}
-        if: github.ref_type == 'tag'
-        uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      # Extract metadata (tags, labels) for Docker
-      # https://github.com/docker/metadata-action
-      - name: Extract Docker metadata
-        id: meta
-        uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5.0.0
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-
-      # Build and push Docker image with Buildx
-      # https://github.com/docker/build-push-action
-      - name: Build and push Docker image
-        id: build-and-push
-        uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
-        with:
-          context: sync-server
-          platforms: linux/amd64,linux/arm64
-          push: ${{ github.ref_type == 'tag' }}
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-
-      # Sign the resulting Docker image digest.
-      # This will only write to the public Rekor transparency log when the Docker
-      # repository is public to avoid leaking data. If you would like to publish
-      # transparency data even for private images, pass --force to cosign below.
-      # https://github.com/sigstore/cosign
-      - name: Sign the published Docker image
-        if: ${{ github.ref_type == 'tag' }}
-        env:
-          # https://docs.github.com/en/actions/security-guides/security-hardening-for-github-actions#using-an-intermediate-environment-variable
-          TAGS: ${{ steps.meta.outputs.tags }}
-          DIGEST: ${{ steps.build-and-push.outputs.digest }}
-        # This step uses the identity token to provision an ephemeral certificate
-        # against the sigstore community Fulcio instance.
-        run: echo "${TAGS}" | xargs -I {} cosign sign --yes {}@${DIGEST}

From 682dc7449722ebee2ce08365dc0ab6dfaad28f33 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 9 May 2026 13:41:51 +0100
Subject: [PATCH 758/761] Update local-client-cli and obsidian-plugin

Pulls the local-client-cli and obsidian-plugin changes from
asch/fix-everything onto a fresh branch off main.
---
 frontend/local-client-cli/Dockerfile          |   4 +-
 frontend/local-client-cli/README.md           |  50 ++--
 frontend/local-client-cli/package.json        |  16 +-
 frontend/local-client-cli/src/args.test.ts    | 226 +++++++++++++++++-
 frontend/local-client-cli/src/args.ts         | 183 ++++++++++----
 frontend/local-client-cli/src/cli.ts          | 174 ++++++++------
 frontend/local-client-cli/src/file-watcher.ts |  72 ++----
 frontend/local-client-cli/src/healthcheck.ts  |   1 +
 .../src/logger-formatter.test.ts              |  50 ++++
 .../local-client-cli/src/logger-formatter.ts  |  19 +-
 .../local-client-cli/src/node-filesystem.ts   |  90 +++----
 .../local-client-cli/src/path-utils.test.ts   |  60 +++++
 frontend/local-client-cli/src/path-utils.ts   |  15 ++
 frontend/local-client-cli/tsconfig.json       |   4 +-
 frontend/local-client-cli/webpack.config.js   |  54 ++---
 frontend/obsidian-plugin/README.md            |  26 +-
 frontend/obsidian-plugin/package.json         |  22 +-
 .../obsidian-plugin/src/vault-link-plugin.ts  |  32 ++-
 .../src/views/cursors/file-explorer.ts        |   6 +-
 .../views/cursors/remote-cursors-plugin.ts    |   5 +-
 .../src/views/settings/settings-tab.ts        |  55 +----
 .../status-description/status-description.ts  |   2 +-
 frontend/obsidian-plugin/tsconfig.json        |   9 +-
 frontend/obsidian-plugin/webpack.config.js    |   2 +-
 24 files changed, 741 insertions(+), 436 deletions(-)
 create mode 100644 frontend/local-client-cli/src/logger-formatter.test.ts
 create mode 100644 frontend/local-client-cli/src/path-utils.test.ts
 create mode 100644 frontend/local-client-cli/src/path-utils.ts

diff --git a/frontend/local-client-cli/Dockerfile b/frontend/local-client-cli/Dockerfile
index 695ab587..0dfa7055 100644
--- a/frontend/local-client-cli/Dockerfile
+++ b/frontend/local-client-cli/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:22-slim AS builder
+FROM node:25-slim AS builder
 
 WORKDIR /build
 
@@ -7,7 +7,7 @@ COPY . .
 RUN npm ci
 RUN npm run build
 
-FROM node:22-alpine
+FROM node:25-alpine
 
 LABEL org.opencontainers.image.title="VaultLink Local CLI"
 LABEL org.opencontainers.image.description="Standalone CLI for VaultLink sync client"
diff --git a/frontend/local-client-cli/README.md b/frontend/local-client-cli/README.md
index 0585bacc..e91322f9 100644
--- a/frontend/local-client-cli/README.md
+++ b/frontend/local-client-cli/README.md
@@ -47,24 +47,25 @@ vaultlink \
 
 ### Required
 
-| Option | Description |
-|--------|-------------|
-| `-l, --local-path <path>` | Local directory to sync |
-| `-r, --remote-uri <uri>` | Remote server WebSocket URI (ws:// or wss://) |
-| `-t, --token <token>` | Authentication token |
-| `-v, --vault-name <name>` | Vault name on server |
+| Option                    | Description                                   |
+| ------------------------- | --------------------------------------------- |
+| `-l, --local-path <path>` | Local directory to sync                       |
+| `-r, --remote-uri <uri>`  | Remote server WebSocket URI (ws:// or wss://) |
+| `-t, --token <token>`     | Authentication token                          |
+| `-v, --vault-name <name>` | Vault name on server                          |
 
 ### Optional
 
-| Option | Default | Description |
-|--------|---------|-------------|
-| `--sync-concurrency <number>` | `1` | Concurrent sync operations |
-| `--max-file-size-mb <number>` | `10` | Maximum file size in MB |
-| `--ignore-pattern <pattern>` | - | Glob pattern to ignore (repeatable) |
-| `--websocket-retry-interval-ms <ms>` | `3500` | WebSocket reconnection interval |
-| `--log-level <level>` | `INFO` | Log level: DEBUG, INFO, WARNING, ERROR |
-| `-h, --help` | - | Show help |
-| `-V, --version` | - | Show version |
+| Option                               | Default | Description                                     |
+| ------------------------------------ | ------- | ----------------------------------------------- |
+| `--max-file-size-mb <number>`        | `10`    | Maximum file size in MB                         |
+| `--ignore-pattern <pattern>`         | -       | Glob pattern to ignore (repeatable)             |
+| `--websocket-retry-interval-ms <ms>` | `3500`  | WebSocket reconnection interval                 |
+| `--log-level <level>`                | `INFO`  | Log level: DEBUG, INFO, WARNING, ERROR          |
+| `--line-endings <mode>`              | `auto`  | Line ending style: auto, lf, crlf               |
+| `-q, --quiet`                        | -       | Suppress startup banner for non-interactive use |
+| `-h, --help`                         | -       | Show help                                       |
+| `-V, --version`                      | -       | Show version                                    |
 
 ### Auto-Ignored Patterns
 
@@ -74,22 +75,32 @@ vaultlink \
 ### Examples
 
 Basic usage:
+
 ```bash
 vaultlink -l ./vault -r wss://sync.example.com -t token123 -v default
 ```
 
 With ignore patterns:
+
 ```bash
 vaultlink -l ./vault -r wss://sync.example.com -t token123 -v default \
-  --ignore-pattern "*.tmp" \
+  --ignore-pattern "**/*.tmp" \
   --ignore-pattern ".DS_Store" \
   --ignore-pattern "node_modules/**"
 ```
 
-With debug logging:
+With debug logging and quiet startup:
+
 ```bash
 vaultlink -l ./vault -r wss://sync.example.com -t token123 -v default \
-  --log-level DEBUG
+  --log-level DEBUG --quiet
+```
+
+Force LF line endings (useful for cross-platform vaults):
+
+```bash
+vaultlink -l ./vault -r wss://sync.example.com -t token123 -v default \
+  --line-endings lf
 ```
 
 ## Docker Deployment
@@ -176,6 +187,7 @@ services:
 ## Development
 
 Build:
+
 ```bash
 npm run build
 # or from the parent folder, run
@@ -183,11 +195,13 @@ docker build -f local-client-cli/Dockerfile  .
 ```
 
 Test:
+
 ```bash
 npm test
 ```
 
 Docker build:
+
 ```bash
 cd frontend
 docker build -f local-client-cli/Dockerfile -t vault-link-cli:test .
diff --git a/frontend/local-client-cli/package.json b/frontend/local-client-cli/package.json
index cade4990..a862b297 100644
--- a/frontend/local-client-cli/package.json
+++ b/frontend/local-client-cli/package.json
@@ -11,18 +11,16 @@
         "build": "webpack --mode production",
         "test": "tsx --test 'src/**/*.test.ts'"
     },
-    "dependencies": {
-        "commander": "^14.0.2",
-        "watcher": "^2.3.1"
-    },
     "devDependencies": {
-        "@types/node": "^24.8.1",
+        "commander": "^14.0.2",
+        "watcher": "^2.3.1",
+        "@types/node": "^25.0.2",
         "sync-client": "file:../sync-client",
-        "ts-loader": "^9.5.2",
+        "ts-loader": "^9.5.4",
         "tslib": "2.8.1",
-        "tsx": "^4.20.6",
-        "typescript": "5.8.3",
-        "webpack": "^5.99.9",
+        "tsx": "^4.21.0",
+        "typescript": "5.9.3",
+        "webpack": "^5.103.0",
         "webpack-cli": "^6.0.1"
     }
 }
diff --git a/frontend/local-client-cli/src/args.test.ts b/frontend/local-client-cli/src/args.test.ts
index eb195538..c075d193 100644
--- a/frontend/local-client-cli/src/args.test.ts
+++ b/frontend/local-client-cli/src/args.test.ts
@@ -55,13 +55,10 @@ test("parseArgs - parse with optional arguments", () => {
         "mytoken",
         "-v",
         "default",
-        "--sync-concurrency",
-        "5",
         "--max-file-size-mb",
         "20"
     ]);
 
-    assert.equal(args.syncConcurrency, 5);
     assert.equal(args.maxFileSizeMB, 20);
 });
 
@@ -228,3 +225,226 @@ test("parseArgs - throws on invalid log level", () => {
         ]);
     }, /Invalid log level/);
 });
+
+test("parseArgs - reads required options from environment variables", () => {
+    process.env.VAULTLINK_LOCAL_PATH = "/env/path";
+    process.env.VAULTLINK_REMOTE_URI = "https://env.example.com";
+    process.env.VAULTLINK_TOKEN = "env-token";
+    process.env.VAULTLINK_VAULT_NAME = "env-vault";
+
+    try {
+        const args = parseArgs(["node", "cli.js"]);
+        assert.equal(args.localPath, "/env/path");
+        assert.equal(args.remoteUri, "https://env.example.com");
+        assert.equal(args.token, "env-token");
+        assert.equal(args.vaultName, "env-vault");
+    } finally {
+        delete process.env.VAULTLINK_LOCAL_PATH;
+        delete process.env.VAULTLINK_REMOTE_URI;
+        delete process.env.VAULTLINK_TOKEN;
+        delete process.env.VAULTLINK_VAULT_NAME;
+    }
+});
+
+test("parseArgs - CLI arguments take precedence over environment variables", () => {
+    process.env.VAULTLINK_TOKEN = "env-token";
+
+    try {
+        const args = parseArgs([
+            "node",
+            "cli.js",
+            "-l",
+            "/path/to/vault",
+            "-r",
+            "https://sync.example.com",
+            "-t",
+            "cli-token",
+            "-v",
+            "default"
+        ]);
+        assert.equal(args.token, "cli-token");
+    } finally {
+        delete process.env.VAULTLINK_TOKEN;
+    }
+});
+
+test("parseArgs - reads log level from environment variable", () => {
+    process.env.VAULTLINK_LOG_LEVEL = "DEBUG";
+
+    try {
+        const args = parseArgs([
+            "node",
+            "cli.js",
+            "-l",
+            "/path/to/vault",
+            "-r",
+            "https://sync.example.com",
+            "-t",
+            "mytoken",
+            "-v",
+            "default"
+        ]);
+        assert.equal(args.logLevel, LogLevel.DEBUG);
+    } finally {
+        delete process.env.VAULTLINK_LOG_LEVEL;
+    }
+});
+
+test("parseArgs - quiet defaults to false", () => {
+    const args = parseArgs([
+        "node",
+        "cli.js",
+        "-l",
+        "/path/to/vault",
+        "-r",
+        "https://sync.example.com",
+        "-t",
+        "mytoken",
+        "-v",
+        "default"
+    ]);
+
+    assert.equal(args.quiet, false);
+});
+
+test("parseArgs - parse --quiet flag", () => {
+    const args = parseArgs([
+        "node",
+        "cli.js",
+        "-l",
+        "/path/to/vault",
+        "-r",
+        "https://sync.example.com",
+        "-t",
+        "mytoken",
+        "-v",
+        "default",
+        "--quiet"
+    ]);
+
+    assert.equal(args.quiet, true);
+});
+
+test("parseArgs - parse -q short flag", () => {
+    const args = parseArgs([
+        "node",
+        "cli.js",
+        "-l",
+        "/path/to/vault",
+        "-r",
+        "https://sync.example.com",
+        "-t",
+        "mytoken",
+        "-v",
+        "default",
+        "-q"
+    ]);
+
+    assert.equal(args.quiet, true);
+});
+
+test("parseArgs - line-endings defaults to auto", () => {
+    const args = parseArgs([
+        "node",
+        "cli.js",
+        "-l",
+        "/path/to/vault",
+        "-r",
+        "https://sync.example.com",
+        "-t",
+        "mytoken",
+        "-v",
+        "default"
+    ]);
+
+    assert.equal(args.lineEndings, "auto");
+});
+
+test("parseArgs - parse --line-endings lf", () => {
+    const args = parseArgs([
+        "node",
+        "cli.js",
+        "-l",
+        "/path/to/vault",
+        "-r",
+        "https://sync.example.com",
+        "-t",
+        "mytoken",
+        "-v",
+        "default",
+        "--line-endings",
+        "lf"
+    ]);
+
+    assert.equal(args.lineEndings, "lf");
+});
+
+test("parseArgs - parse --line-endings crlf", () => {
+    const args = parseArgs([
+        "node",
+        "cli.js",
+        "-l",
+        "/path/to/vault",
+        "-r",
+        "https://sync.example.com",
+        "-t",
+        "mytoken",
+        "-v",
+        "default",
+        "--line-endings",
+        "crlf"
+    ]);
+
+    assert.equal(args.lineEndings, "crlf");
+});
+
+test("parseArgs - throws on invalid remote URI protocol", () => {
+    assert.throws(() => {
+        parseArgs([
+            "node",
+            "cli.js",
+            "-l",
+            "/path/to/vault",
+            "-r",
+            "ftp://sync.example.com",
+            "-t",
+            "mytoken",
+            "-v",
+            "default"
+        ]);
+    }, /Invalid remote URI/);
+});
+
+test("parseArgs - accepts http:// remote URI", () => {
+    const args = parseArgs([
+        "node",
+        "cli.js",
+        "-l",
+        "/path/to/vault",
+        "-r",
+        "http://localhost:3000",
+        "-t",
+        "mytoken",
+        "-v",
+        "default"
+    ]);
+
+    assert.equal(args.remoteUri, "http://localhost:3000");
+});
+
+test("parseArgs - accepts wss:// remote URI", () => {
+    const args = parseArgs([
+        "node",
+        "cli.js",
+        "-l",
+        "/path/to/vault",
+        "-r",
+        "wss://sync.example.com",
+        "-t",
+        "mytoken",
+        "-v",
+        "default"
+    ]);
+
+    assert.equal(args.remoteUri, "wss://sync.example.com");
+});
diff --git a/frontend/local-client-cli/src/args.ts b/frontend/local-client-cli/src/args.ts
index 615b9d71..442c4817 100644
--- a/frontend/local-client-cli/src/args.ts
+++ b/frontend/local-client-cli/src/args.ts
@@ -1,21 +1,26 @@
-import { Command } from "commander";
+import { Command, Option } from "commander";
 import packageJson from "../package.json";
 import { LogLevel } from "sync-client";
 
-export interface CliArgs {
+type LineEndingMode = "auto" | "lf" | "crlf";
+
+interface CliArgs {
     remoteUri: string;
     token: string;
     vaultName: string;
     localPath: string;
-    syncConcurrency?: number;
     maxFileSizeMB?: number;
     ignorePatterns?: string[];
     webSocketRetryIntervalMs?: number;
     logLevel: LogLevel;
     health?: string;
     enableTelemetry?: boolean;
+    quiet: boolean;
+    lineEndings: LineEndingMode;
 }
 
+const VALID_PROTOCOLS = ["http://", "https://", "ws://", "wss://"];
+
 export function parseArgs(argv: string[]): CliArgs {
     const program = new Command();
 
@@ -25,41 +30,83 @@ export function parseArgs(argv: string[]): CliArgs {
             "VaultLink Local CLI - Sync your vault to the local filesystem"
         )
         .version(packageJson.version)
-        .option("-l, --local-path <path>", "Local directory path to sync")
-        .option("-r, --remote-uri <uri>", "Remote server URI")
-        .option("-t, --token <token>", "Authentication token")
-        .option("-v, --vault-name <name>", "Vault name")
-        .option(
-            "--sync-concurrency <number>",
-            "[OPTIONAL] Number of concurrent sync operations",
-            parseInt
+        .addOption(
+            new Option(
+                "-l, --local-path <path>",
+                "Local directory path to sync"
+            ).env("VAULTLINK_LOCAL_PATH")
         )
-        .option(
-            "--max-file-size-mb <number>",
-            "[OPTIONAL] Maximum file size in MB",
-            parseInt
+        .addOption(
+            new Option("-r, --remote-uri <uri>", "Remote server URI").env(
+                "VAULTLINK_REMOTE_URI"
+            )
         )
-        .option(
-            "--ignore-pattern <pattern...>",
-            "[OPTIONAL] Patterns to ignore (can be specified multiple times)"
+        .addOption(
+            new Option("-t, --token <token>", "Authentication token").env(
+                "VAULTLINK_TOKEN"
+            )
         )
-        .option(
-            "--websocket-retry-interval-ms <number>",
-            "[OPTIONAL] WebSocket retry interval in milliseconds",
-            parseInt
+        .addOption(
+            new Option("-v, --vault-name <name>", "Vault name").env(
+                "VAULTLINK_VAULT_NAME"
+            )
         )
-        .option(
-            "--log-level <level>",
-            "[OPTIONAL] Log level (DEBUG, INFO, WARNING, ERROR)",
-            "INFO"
+        .addOption(
+            new Option(
+                "--max-file-size-mb <number>",
+                "[OPTIONAL] Maximum file size in MB"
+            )
+                .argParser(parseInt)
+                .env("VAULTLINK_MAX_FILE_SIZE_MB")
         )
-        .option(
-            "--health <path>",
-            "[OPTIONAL] Path to health status file for Docker healthcheck"
+        .addOption(
+            new Option(
+                "--ignore-pattern <pattern...>",
+                "[OPTIONAL] Patterns to ignore (can be specified multiple times)"
+            ).env("VAULTLINK_IGNORE_PATTERNS")
         )
-        .option(
-            "--enable-telemetry",
-            "[OPTIONAL] Enable telemetry (disabled by default)"
+        .addOption(
+            new Option(
+                "--websocket-retry-interval-ms <number>",
+                "[OPTIONAL] WebSocket retry interval in milliseconds"
+            )
+                .argParser(parseInt)
+                .env("VAULTLINK_WEBSOCKET_RETRY_INTERVAL_MS")
+        )
+        .addOption(
+            new Option(
+                "--log-level <level>",
+                "[OPTIONAL] Log level (DEBUG, INFO, WARNING, ERROR)"
+            )
+                .default("INFO")
+                .env("VAULTLINK_LOG_LEVEL")
+        )
+        .addOption(
+            new Option(
+                "--health <path>",
+                "[OPTIONAL] Path to health status file for Docker healthcheck"
+            ).env("VAULTLINK_HEALTH")
+        )
+        .addOption(
+            new Option(
+                "--enable-telemetry",
+                "[OPTIONAL] Enable telemetry (disabled by default)"
+            ).env("VAULTLINK_ENABLE_TELEMETRY")
+        )
+        .addOption(
+            new Option(
+                "-q, --quiet",
+                "[OPTIONAL] Suppress startup banner for non-interactive use"
+            ).env("VAULTLINK_QUIET")
+        )
+        .addOption(
+            new Option(
+                "--line-endings <mode>",
+                "[OPTIONAL] Line ending style: auto (platform default), lf, crlf"
+            )
+                .default("auto")
+                .choices(["auto", "lf", "crlf"])
+                .env("VAULTLINK_LINE_ENDINGS")
         )
         .addHelpText(
             "after",
@@ -67,9 +114,13 @@ export function parseArgs(argv: string[]): CliArgs {
 Examples:
   $ vaultlink -l ./my-vault -r https://sync.example.com -t mytoken -v default
   $ vaultlink -l ./my-vault -r https://sync.example.com -t mytoken -v default \\
-    --ignore-pattern ".git/**" --ignore-pattern "*.tmp"
+    --ignore-pattern ".git/**" --ignore-pattern "**/*.tmp"
   $ vaultlink -l ./my-vault -r https://sync.example.com -t mytoken -v default \\
-    --log-level DEBUG
+    --log-level DEBUG --quiet
+
+Environment variables:
+  All options can be configured via VAULTLINK_ prefixed environment variables.
+  CLI arguments take precedence over environment variables.
 `
         );
 
@@ -81,7 +132,6 @@ Examples:
     const remoteUri = opts.remoteUri as string | undefined;
     const token = opts.token as string | undefined;
     const vaultName = opts.vaultName as string | undefined;
-    const syncConcurrency = opts.syncConcurrency as number | undefined;
     const maxFileSizeMb = opts.maxFileSizeMb as number | undefined;
     const ignorePattern = opts.ignorePattern as string[] | undefined;
     const websocketRetryIntervalMs = opts.websocketRetryIntervalMs as
@@ -90,22 +140,39 @@ Examples:
     const logLevelStr = (opts.logLevel as string | undefined) ?? "INFO";
     const health = opts.health as string | undefined;
     const enableTelemetry = opts.enableTelemetry as boolean | undefined;
+    const quiet = (opts.quiet as boolean | undefined) ?? false;
+    const lineEndingsStr = (opts.lineEndings as string | undefined) ?? "auto";
     /* eslint-enable @typescript-eslint/no-unsafe-type-assertion */
 
-    if (localPath === undefined) {
+    const requireOption = <T>(value: T | undefined, name: string): T => {
+        if (value === undefined) {
+            const option = program.options.find(
+                (o) => o.attributeName() === name
+            );
+            const envHint =
+                option?.envVar !== undefined
+                    ? ` (or set ${option.envVar})`
+                    : "";
+            throw new Error(
+                `required option '${option?.flags ?? name}' not specified${envHint}`
+            );
+        }
+        return value;
+    };
+
+    const requiredLocalPath = requireOption(localPath, "localPath");
+    const requiredRemoteUri = requireOption(remoteUri, "remoteUri");
+    const requiredToken = requireOption(token, "token");
+    const requiredVaultName = requireOption(vaultName, "vaultName");
+
+    // Validate remote URI protocol
+    if (
+        !VALID_PROTOCOLS.some((prefix) => requiredRemoteUri.startsWith(prefix))
+    ) {
         throw new Error(
-            "required option '-l, --local-path <path>' not specified"
+            `Invalid remote URI '${requiredRemoteUri}'. Must start with ${VALID_PROTOCOLS.join(", ")}`
         );
     }
-    if (remoteUri === undefined) {
-        throw new Error("required option '--remote-uri <uri>' not specified");
-    }
-    if (token === undefined) {
-        throw new Error("required option '--token <token>' not specified");
-    }
-    if (vaultName === undefined) {
-        throw new Error("required option '--vault-name <name>' not specified");
-    }
 
     // Validate and parse log level
     const logLevelUpper = logLevelStr.toUpperCase();
@@ -120,17 +187,29 @@ Examples:
     }
     const logLevel = logLevelUpper;
 
+    const validLineEndings: readonly string[] = ["auto", "lf", "crlf"];
+    const isLineEndingMode = (value: string): value is LineEndingMode => {
+        return validLineEndings.includes(value);
+    };
+    if (!isLineEndingMode(lineEndingsStr)) {
+        throw new Error(
+            `Invalid line endings mode '${lineEndingsStr}'. Valid values are: ${validLineEndings.join(", ")}`
+        );
+    }
+    const lineEndings = lineEndingsStr;
+
     return {
-        localPath,
-        remoteUri,
-        token,
-        vaultName,
-        syncConcurrency,
+        localPath: requiredLocalPath,
+        remoteUri: requiredRemoteUri,
+        token: requiredToken,
+        vaultName: requiredVaultName,
         maxFileSizeMB: maxFileSizeMb,
         ignorePatterns: ignorePattern,
         webSocketRetryIntervalMs: websocketRetryIntervalMs,
         logLevel,
         health,
-        enableTelemetry
+        enableTelemetry,
+        quiet,
+        lineEndings
     };
 }
diff --git a/frontend/local-client-cli/src/cli.ts b/frontend/local-client-cli/src/cli.ts
index 48fd8954..e06fda47 100644
--- a/frontend/local-client-cli/src/cli.ts
+++ b/frontend/local-client-cli/src/cli.ts
@@ -5,24 +5,27 @@ import type { NetworkConnectionStatus } from "sync-client";
 import {
     SyncClient,
     DEFAULT_SETTINGS,
+    Logger,
     LogLevel,
+    type LogLine,
     type SyncSettings,
     type StoredDatabase
 } from "sync-client";
 import { parseArgs } from "./args";
 import { NodeFileSystemOperations } from "./node-filesystem";
 import { FileWatcher } from "./file-watcher";
-import { formatLogLine, colorize, styleText } from "./logger-formatter";
+import { formatLogLine } from "./logger-formatter";
 import packageJson from "../package.json";
 
 function writeHealthStatus(
+    logger: Logger,
     filePath: string,
     connectionStatus: NetworkConnectionStatus
 ): void {
     try {
         fsSync.writeFileSync(filePath, JSON.stringify(connectionStatus));
     } catch (error) {
-        console.error(
+        logger.error(
             `Failed to write health status to ${filePath}: ${error instanceof Error ? error.message : String(error)}`
         );
     }
@@ -35,12 +38,37 @@ const LOG_LEVEL_ORDER = {
     [LogLevel.ERROR]: 3
 };
 
+function createLogHandler(minLevel: LogLevel): (logLine: LogLine) => void {
+    return (logLine: LogLine): void => {
+        if (LOG_LEVEL_ORDER[logLine.level] >= LOG_LEVEL_ORDER[minLevel]) {
+            // eslint-disable-next-line no-console
+            console.log(formatLogLine(logLine));
+        }
+    };
+}
+
 const HEALTH_CHECK_INTERVAL_MS = 30 * 1000;
+const PROGRESS_LOG_INTERVAL_MS = 2000;
+
+function resolveLineEndings(mode: "auto" | "lf" | "crlf"): string {
+    switch (mode) {
+        case "lf":
+            return "\n";
+        case "crlf":
+            return "\r\n";
+        case "auto":
+            return process.platform === "win32" ? "\r\n" : "\n";
+    }
+}
 
 async function main(): Promise<void> {
     const args = parseArgs(process.argv);
     const absolutePath = path.resolve(args.localPath);
 
+    const logger = new Logger();
+    const logHandler = createLogHandler(args.logLevel);
+    logger.onLogEmitted.add(logHandler);
+
     if (!fsSync.existsSync(absolutePath)) {
         fsSync.mkdirSync(absolutePath, { recursive: true });
     }
@@ -48,36 +76,25 @@ async function main(): Promise<void> {
     try {
         const stats = await fs.stat(absolutePath);
         if (!stats.isDirectory()) {
-            console.error(
-                colorize(`Error: ${absolutePath} is not a directory`, "red")
-            );
+            logger.error(`${absolutePath} is not a directory`);
             process.exit(1);
         }
     } catch (error) {
-        console.error(
-            colorize(
-                `Error: Cannot access directory ${absolutePath}: ${error instanceof Error ? error.message : String(error)}`,
-                "red"
-            )
+        logger.error(
+            `Cannot access directory ${absolutePath}: ${error instanceof Error ? error.message : String(error)}`
         );
         process.exit(1);
     }
 
-    console.log(
-        styleText("VaultLink Local CLI", "bold", "cyan") +
-            colorize(` v${packageJson.version}`, "dim")
-    );
-    console.log(colorize("=".repeat(50), "dim"));
-    console.log(
-        `${colorize("Local path:", "dim")} ${colorize(absolutePath, "green")}`
-    );
-    console.log(
-        `${colorize("Remote URI:", "dim")} ${colorize(args.remoteUri, "cyan")}`
-    );
-    console.log(
-        `${colorize("Vault name:", "dim")} ${colorize(args.vaultName, "green")}`
-    );
-    console.log("");
+    if (!args.quiet) {
+        logger.info(`VaultLink Local CLI v${packageJson.version}`);
+        logger.info(`Local path: ${absolutePath}`);
+        logger.info(`Remote URI: ${args.remoteUri}`);
+        logger.info(`Vault name: ${args.vaultName}`);
+        if (args.lineEndings !== "auto") {
+            logger.info(`Line endings: ${args.lineEndings.toUpperCase()}`);
+        }
+    }
 
     const dataDir = path.join(absolutePath, ".vaultlink");
     const dataFile = path.join(dataDir, "sync-data.json");
@@ -97,8 +114,6 @@ async function main(): Promise<void> {
         remoteUri: args.remoteUri,
         token: args.token,
         vaultName: args.vaultName,
-        syncConcurrency:
-            args.syncConcurrency ?? DEFAULT_SETTINGS.syncConcurrency,
         maxFileSizeMB: args.maxFileSizeMB ?? DEFAULT_SETTINGS.maxFileSizeMB,
         ignorePatterns,
         webSocketRetryIntervalMs:
@@ -119,12 +134,7 @@ async function main(): Promise<void> {
                     // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
                     database = JSON.parse(content) as Partial<StoredDatabase>;
                 } catch {
-                    console.error(
-                        colorize(
-                            `Cannot read data file at ${dataFile}`,
-                            "yellow"
-                        )
-                    );
+                    logger.warn(`Cannot read data file at ${dataFile}`);
                 }
 
                 return {
@@ -133,23 +143,27 @@ async function main(): Promise<void> {
                 };
             },
             save: async ({ database: persistedDatabase }) => {
-                // settings can't be updated when running with this CLI
                 await fs.writeFile(
                     dataFile,
                     JSON.stringify(persistedDatabase, null, 2)
                 );
             }
         },
-        nativeLineEndings: process.platform === "win32" ? "\r\n" : "\n"
+        nativeLineEndings: resolveLineEndings(args.lineEndings)
     });
 
     if (args.health !== undefined) {
         const healthFile = args.health;
-        const healthInterval = setInterval(() => {
+        const writeHealth = (): void => {
             void client.checkConnection().then((status) => {
-                writeHealthStatus(healthFile, status);
+                writeHealthStatus(client.logger, healthFile, status);
             });
-        }, HEALTH_CHECK_INTERVAL_MS);
+        };
+        writeHealth();
+        const healthInterval = setInterval(
+            writeHealth,
+            HEALTH_CHECK_INTERVAL_MS
+        );
         const clearHealthInterval = (): void => {
             clearInterval(healthInterval);
         };
@@ -158,17 +172,10 @@ async function main(): Promise<void> {
         process.on("exit", clearHealthInterval);
     }
 
-    // Add colored log formatter with level filtering
-    client.logger.onLogEmitted.add((logLine) => {
-        // Only show messages at or above the configured log level
-        if (LOG_LEVEL_ORDER[logLine.level] >= LOG_LEVEL_ORDER[args.logLevel]) {
-            console.log(formatLogLine(logLine));
-        }
-    });
-
+    client.logger.onLogEmitted.add(logHandler);
     client.logger.info("Starting sync client");
 
-    const fileWatcher = new FileWatcher(absolutePath, client);
+    const fileWatcher = new FileWatcher(absolutePath, client, ignorePatterns);
 
     client.onWebSocketStatusChanged.add(() => {
         const isConnected = client.isWebSocketConnected;
@@ -177,26 +184,54 @@ async function main(): Promise<void> {
         );
     });
 
+    let syncBatchSize = 0;
+    let totalSyncOps = 0;
+    let lastProgressLogTime = 0;
+
     client.onRemainingOperationsCountChanged.add((remaining) => {
+        if (remaining > syncBatchSize) {
+            syncBatchSize = remaining;
+        }
+
         if (remaining === 0) {
-            client.logger.info("All sync operations completed");
+            if (syncBatchSize > 0) {
+                totalSyncOps += syncBatchSize;
+                client.logger.info(
+                    `Sync batch complete (${syncBatchSize} operations)`
+                );
+                syncBatchSize = 0;
+            }
         } else {
-            client.logger.info(`${remaining} sync operations remaining`);
+            const now = Date.now();
+            if (now - lastProgressLogTime >= PROGRESS_LOG_INTERVAL_MS) {
+                client.logger.info(
+                    `Syncing: ${remaining} operations remaining`
+                );
+                lastProgressLogTime = now;
+            }
         }
     });
 
+    let isShuttingDown = false;
     const gracefulShutdown = async (signal: string): Promise<void> => {
-        console.log(
-            colorize(
-                `\n${signal} received. Shutting down gracefully...`,
-                "yellow"
-            )
-        );
+        if (isShuttingDown) {
+            return;
+        }
+        isShuttingDown = true;
+
+        client.logger.info(`${signal} received, shutting down gracefully`);
 
         fileWatcher.stop();
         await client.waitUntilFinished();
         await client.destroy();
-        console.log(colorize("Shutdown complete", "green"));
+
+        if (totalSyncOps > 0) {
+            client.logger.info(
+                `Shutdown complete (${totalSyncOps} operations synced)`
+            );
+        } else {
+            client.logger.info("Shutdown complete");
+        }
         process.exit(0);
     };
 
@@ -210,27 +245,21 @@ async function main(): Promise<void> {
     try {
         const connectionStatus = await client.checkConnection();
         if (!connectionStatus.isSuccessful) {
-            console.error(
-                colorize(
-                    `Error: Cannot connect to server: ${connectionStatus.serverMessage}`,
-                    "red"
-                )
+            client.logger.error(
+                `Cannot connect to server: ${connectionStatus.serverMessage}`
             );
             process.exit(1);
         }
 
-        console.log(`${colorize("✓", "green")} Server connection successful`);
-        console.log(colorize("Press Ctrl+C to stop", "dim"));
-        console.log("");
+        if (!args.quiet) {
+            client.logger.info("Server connection successful");
+        }
 
         await client.start();
         fileWatcher.start();
     } catch (error) {
-        console.error(
-            colorize(
-                `Fatal error: ${error instanceof Error ? error.message : String(error)}`,
-                "red"
-            )
+        client.logger.error(
+            `Fatal error: ${error instanceof Error ? error.message : String(error)}`
         );
 
         fileWatcher.stop();
@@ -240,11 +269,10 @@ async function main(): Promise<void> {
 }
 
 main().catch((error: unknown) => {
+    // Last-resort handler before the logger exists
+    // eslint-disable-next-line no-console
     console.error(
-        colorize(
-            `Unexpected error: ${error instanceof Error ? error.message : String(error)}`,
-            "red"
-        )
+        `Unexpected error: ${error instanceof Error ? error.message : String(error)}`
     );
     process.exit(1);
 });
diff --git a/frontend/local-client-cli/src/file-watcher.ts b/frontend/local-client-cli/src/file-watcher.ts
index e781d18f..c273a412 100644
--- a/frontend/local-client-cli/src/file-watcher.ts
+++ b/frontend/local-client-cli/src/file-watcher.ts
@@ -1,15 +1,20 @@
 import Watcher from "watcher";
 import * as path from "path";
 import type { SyncClient, RelativePath } from "sync-client";
+import { toUnixPath, matchesGlob } from "./path-utils";
 
 export class FileWatcher {
     private watcher: Watcher | undefined;
     private isRunning = false;
+    private readonly ignorePatterns: string[];
 
     public constructor(
         private readonly basePath: string,
-        private readonly client: SyncClient
-    ) {}
+        private readonly client: SyncClient,
+        ignorePatterns: string[] = []
+    ) {
+        this.ignorePatterns = ignorePatterns;
+    }
 
     public start(): void {
         if (this.isRunning) {
@@ -22,7 +27,8 @@ export class FileWatcher {
             recursive: true,
             renameDetection: true,
             renameTimeout: 125,
-            ignoreInitial: true
+            ignoreInitial: true,
+            ignore: (filePath: string): boolean => this.shouldIgnore(filePath)
         });
 
         this.watcher.on("add", (filePath: string) => {
@@ -56,66 +62,32 @@ export class FileWatcher {
         this.client.logger.info("File watcher stopped");
     }
 
+    private shouldIgnore(filePath: string): boolean {
+        const rel = toUnixPath(path.relative(this.basePath, filePath));
+        return this.ignorePatterns.some((pattern) => matchesGlob(rel, pattern));
+    }
+
     private handleCreate(relativePath: RelativePath): void {
-        this.client
-            .syncLocallyCreatedFile(relativePath)
-            .catch((err: unknown) => {
-                this.client.logger.error(
-                    `Failed to sync created file ${relativePath}: ${this.formatError(err)}`
-                );
-            });
+        this.client.syncLocallyCreatedFile(relativePath);
     }
 
     private handleChange(relativePath: RelativePath): void {
-        this.client
-            .syncLocallyUpdatedFile({ relativePath })
-            .catch((err: unknown) => {
-                this.client.logger.error(
-                    `Failed to sync updated file ${relativePath}: ${this.formatError(err)}`
-                );
-            });
+        this.client.syncLocallyUpdatedFile({ relativePath });
     }
 
     private handleDelete(relativePath: RelativePath): void {
-        this.client
-            .syncLocallyDeletedFile(relativePath)
-            .catch((err: unknown) => {
-                this.client.logger.error(
-                    `Failed to sync deleted file ${relativePath}: ${this.formatError(err)}`
-                );
-            });
+        this.client.syncLocallyDeletedFile(relativePath);
     }
 
     private handleRename(oldPath: RelativePath, newPath: RelativePath): void {
         this.client.logger.info(`File renamed: ${oldPath} -> ${newPath}`);
-        this.client
-            .syncLocallyUpdatedFile({
-                oldPath,
-                relativePath: newPath
-            })
-            .catch((err: unknown) => {
-                this.client.logger.error(
-                    `Failed to sync renamed file ${oldPath} -> ${newPath}: ${this.formatError(err)}`
-                );
-            });
+        this.client.syncLocallyUpdatedFile({
+            oldPath,
+            relativePath: newPath
+        });
     }
 
     private toRelativePath(absolutePath: string): RelativePath {
-        const relative = path.relative(this.basePath, absolutePath);
-        return this.toUnixPath(relative);
-    }
-
-    /**
-    * Convert a native platform path to forward slashes
-    */
-    private toUnixPath(nativePath: string): string {
-        if (path.sep === "\\") {
-            return nativePath.replace(/\\/g, "/");
-        }
-        return nativePath;
-    }
-
-    private formatError(err: unknown): string {
-        return err instanceof Error ? err.message : String(err);
+        return toUnixPath(path.relative(this.basePath, absolutePath));
     }
 }
diff --git a/frontend/local-client-cli/src/healthcheck.ts b/frontend/local-client-cli/src/healthcheck.ts
index 2dd9e721..d7211c88 100644
--- a/frontend/local-client-cli/src/healthcheck.ts
+++ b/frontend/local-client-cli/src/healthcheck.ts
@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+/* eslint-disable no-console */
 
 /**
  * Healthcheck script for Docker container
diff --git a/frontend/local-client-cli/src/logger-formatter.test.ts b/frontend/local-client-cli/src/logger-formatter.test.ts
new file mode 100644
index 00000000..f3078242
--- /dev/null
+++ b/frontend/local-client-cli/src/logger-formatter.test.ts
@@ -0,0 +1,50 @@
+import { test } from "node:test";
+import * as assert from "node:assert/strict";
+import { formatLogLine } from "./logger-formatter";
+import { LogLevel } from "sync-client";
+
+test("formatLogLine - includes level and message", () => {
+    const logLine = {
+        timestamp: new Date("2024-01-15T10:30:45.123Z"),
+        level: LogLevel.INFO,
+        message: "Test message"
+    };
+
+    const result = formatLogLine(logLine);
+    assert.ok(result.includes("INFO"));
+    assert.ok(result.includes("Test message"));
+});
+
+test("formatLogLine - ERROR level messages contain bold escape", () => {
+    const logLine = {
+        timestamp: new Date("2024-01-15T10:30:45.123Z"),
+        level: LogLevel.ERROR,
+        message: "Error occurred"
+    };
+
+    const result = formatLogLine(logLine);
+    assert.ok(result.includes("\x1b[1m"));
+});
+
+test("formatLogLine - highlights file paths in quotes", () => {
+    const logLine = {
+        timestamp: new Date("2024-01-15T10:30:45.123Z"),
+        level: LogLevel.INFO,
+        message: 'Syncing "notes/test.md"'
+    };
+
+    const result = formatLogLine(logLine);
+    assert.ok(result.includes("\x1b[35m"));
+});
+
+test("formatLogLine - highlights standalone numbers but not numbers in versions", () => {
+    const logLine = {
+        timestamp: new Date("2024-01-15T10:30:45.123Z"),
+        level: LogLevel.INFO,
+        message: "Listed 42 files from v1.2.3"
+    };
+
+    const result = formatLogLine(logLine);
+    assert.ok(result.includes("\x1b[36m42\x1b[0m"));
+    assert.ok(!result.includes("\x1b[36m1\x1b[0m."));
+});
diff --git a/frontend/local-client-cli/src/logger-formatter.ts b/frontend/local-client-cli/src/logger-formatter.ts
index 9f237103..b98415b6 100644
--- a/frontend/local-client-cli/src/logger-formatter.ts
+++ b/frontend/local-client-cli/src/logger-formatter.ts
@@ -1,36 +1,21 @@
 import { LogLevel, type LogLine } from "sync-client";
 
-// ANSI color codes
-export const colors = {
+const colors = {
     reset: "\x1b[0m",
     bold: "\x1b[1m",
-    dim: "\x1b[2m",
 
-    // Foreground colors
     red: "\x1b[31m",
     green: "\x1b[32m",
     yellow: "\x1b[33m",
-    blue: "\x1b[34m",
     magenta: "\x1b[35m",
     cyan: "\x1b[36m",
     gray: "\x1b[90m"
 } as const;
 
-export function colorize(text: string, color: keyof typeof colors): string {
+function colorize(text: string, color: keyof typeof colors): string {
     return `${colors[color]}${text}${colors.reset}`;
 }
 
-/**
- * Helper function to apply multiple color modifiers to text
- */
-export function styleText(
-    text: string,
-    ...modifiers: (keyof typeof colors)[]
-): string {
-    const prefix = modifiers.map((m) => colors[m]).join("");
-    return `${prefix}${text}${colors.reset}`;
-}
-
 function formatTimestamp(date: Date): string {
     const [time] = date.toTimeString().split(" ");
     const ms = date.getMilliseconds().toString().padStart(3, "0");
diff --git a/frontend/local-client-cli/src/node-filesystem.ts b/frontend/local-client-cli/src/node-filesystem.ts
index 3da8fc3a..7b736c22 100644
--- a/frontend/local-client-cli/src/node-filesystem.ts
+++ b/frontend/local-client-cli/src/node-filesystem.ts
@@ -6,6 +6,7 @@ import type {
     RelativePath,
     TextWithCursors
 } from "sync-client";
+import { toUnixPath } from "./path-utils";
 
 export class NodeFileSystemOperations implements FileSystemOperations {
     public constructor(private readonly basePath: string) {}
@@ -14,18 +15,12 @@ export class NodeFileSystemOperations implements FileSystemOperations {
         directory: RelativePath | undefined
     ): Promise<RelativePath[]> {
         const files: RelativePath[] = [];
-        await this.walkDirectory(
-            directory !== undefined ? this.toNativePath(directory) : "",
-            files
-        );
+        await this.walkDirectory(directory ?? "", files);
         return files;
     }
 
     public async read(relativePath: RelativePath): Promise<Uint8Array> {
-        const fullPath = path.join(
-            this.basePath,
-            this.toNativePath(relativePath)
-        );
+        const fullPath = path.join(this.basePath, relativePath);
         try {
             return await fs.readFile(fullPath);
         } catch (error) {
@@ -39,15 +34,12 @@ export class NodeFileSystemOperations implements FileSystemOperations {
         relativePath: RelativePath,
         content: Uint8Array
     ): Promise<void> {
-        const fullPath = path.join(
-            this.basePath,
-            this.toNativePath(relativePath)
-        );
+        const fullPath = path.join(this.basePath, relativePath);
         const dir = path.dirname(fullPath);
 
         try {
             await fs.mkdir(dir, { recursive: true });
-            await fs.writeFile(fullPath, content);
+            await this.atomicWrite(fullPath, content);
         } catch (error) {
             throw new Error(
                 `Failed to write file ${fullPath}: ${error instanceof Error ? error.message : String(error)}`
@@ -59,15 +51,12 @@ export class NodeFileSystemOperations implements FileSystemOperations {
         relativePath: RelativePath,
         updater: (current: TextWithCursors) => TextWithCursors
     ): Promise<string> {
-        const fullPath = path.join(
-            this.basePath,
-            this.toNativePath(relativePath)
-        );
+        const fullPath = path.join(this.basePath, relativePath);
 
         try {
             const currentContent = await fs.readFile(fullPath, "utf-8");
             const result = updater({ text: currentContent, cursors: [] });
-            await fs.writeFile(fullPath, result.text, "utf-8");
+            await this.atomicWrite(fullPath, result.text, "utf-8");
             return result.text;
         } catch (error) {
             throw new Error(
@@ -77,10 +66,7 @@ export class NodeFileSystemOperations implements FileSystemOperations {
     }
 
     public async getFileSize(relativePath: RelativePath): Promise<number> {
-        const fullPath = path.join(
-            this.basePath,
-            this.toNativePath(relativePath)
-        );
+        const fullPath = path.join(this.basePath, relativePath);
         try {
             const stats = await fs.stat(fullPath);
             return stats.size;
@@ -92,10 +78,7 @@ export class NodeFileSystemOperations implements FileSystemOperations {
     }
 
     public async exists(relativePath: RelativePath): Promise<boolean> {
-        const fullPath = path.join(
-            this.basePath,
-            this.toNativePath(relativePath)
-        );
+        const fullPath = path.join(this.basePath, relativePath);
         try {
             await fs.access(fullPath);
             return true;
@@ -105,10 +88,7 @@ export class NodeFileSystemOperations implements FileSystemOperations {
     }
 
     public async createDirectory(relativePath: RelativePath): Promise<void> {
-        const fullPath = path.join(
-            this.basePath,
-            this.toNativePath(relativePath)
-        );
+        const fullPath = path.join(this.basePath, relativePath);
         try {
             await fs.mkdir(fullPath, { recursive: false });
         } catch (error) {
@@ -119,10 +99,7 @@ export class NodeFileSystemOperations implements FileSystemOperations {
     }
 
     public async delete(relativePath: RelativePath): Promise<void> {
-        const fullPath = path.join(
-            this.basePath,
-            this.toNativePath(relativePath)
-        );
+        const fullPath = path.join(this.basePath, relativePath);
         try {
             await fs.unlink(fullPath);
         } catch (error) {
@@ -136,14 +113,8 @@ export class NodeFileSystemOperations implements FileSystemOperations {
         oldPath: RelativePath,
         newPath: RelativePath
     ): Promise<void> {
-        const oldFullPath = path.join(
-            this.basePath,
-            this.toNativePath(oldPath)
-        );
-        const newFullPath = path.join(
-            this.basePath,
-            this.toNativePath(newPath)
-        );
+        const oldFullPath = path.join(this.basePath, oldPath);
+        const newFullPath = path.join(this.basePath, newPath);
         const newDir = path.dirname(newFullPath);
 
         try {
@@ -156,6 +127,19 @@ export class NodeFileSystemOperations implements FileSystemOperations {
         }
     }
 
+    private async atomicWrite(
+        fullPath: string,
+        content: Uint8Array | string,
+        encoding?: BufferEncoding
+    ): Promise<void> {
+        const tmpPath = fullPath + ".tmp";
+        await fs.writeFile(tmpPath, content, encoding);
+        const fd = await fs.open(tmpPath, "r");
+        await fd.datasync();
+        await fd.close();
+        await fs.rename(tmpPath, fullPath);
+    }
+
     private async walkDirectory(
         relativePath: string,
         files: RelativePath[]
@@ -179,28 +163,8 @@ export class NodeFileSystemOperations implements FileSystemOperations {
                 await this.walkDirectory(entryRelativePath, files);
             } else if (entry.isFile()) {
                 // Always return forward slashes
-                files.push(this.toUnixPath(entryRelativePath));
+                files.push(toUnixPath(entryRelativePath));
             }
         }
     }
-
-    /**
-    * Convert a forward-slash path to native platform path separators
-    */
-    private toNativePath(relativePath: string): string {
-        if (path.sep === "\\") {
-            return relativePath.replace(/\//g, "\\");
-        }
-        return relativePath;
-    }
-
-    /**
-    * Convert a native platform path to forward slashes
-    */
-    private toUnixPath(nativePath: string): string {
-        if (path.sep === "\\") {
-            return nativePath.replace(/\\/g, "/");
-        }
-        return nativePath;
-    }
 }
diff --git a/frontend/local-client-cli/src/path-utils.test.ts b/frontend/local-client-cli/src/path-utils.test.ts
new file mode 100644
index 00000000..13d33e6e
--- /dev/null
+++ b/frontend/local-client-cli/src/path-utils.test.ts
@@ -0,0 +1,60 @@
+import { test } from "node:test";
+import * as assert from "node:assert/strict";
+import { matchesGlob, toUnixPath } from "./path-utils";
+
+test("matchesGlob - exact match", () => {
+    assert.equal(matchesGlob(".DS_Store", ".DS_Store"), true);
+    assert.equal(matchesGlob("other", ".DS_Store"), false);
+});
+
+test("matchesGlob - dir/** matches directory and contents", () => {
+    assert.equal(matchesGlob(".git", ".git/**"), true);
+    assert.equal(matchesGlob(".git/config", ".git/**"), true);
+    assert.equal(matchesGlob(".git/refs/heads/main", ".git/**"), true);
+    assert.equal(matchesGlob(".gitignore", ".git/**"), false);
+});
+
+test("matchesGlob - * matches within a single segment", () => {
+    assert.equal(matchesGlob("foo.tmp", "*.tmp"), true);
+    assert.equal(matchesGlob("bar.tmp", "*.tmp"), true);
+    assert.equal(matchesGlob("foo.md", "*.tmp"), false);
+    assert.equal(matchesGlob("dir/foo.tmp", "*.tmp"), false);
+});
+
+test("matchesGlob - **/*.ext matches at any depth", () => {
+    assert.equal(matchesGlob("foo.tmp", "**/*.tmp"), true);
+    assert.equal(matchesGlob("dir/foo.tmp", "**/*.tmp"), true);
+    assert.equal(matchesGlob("a/b/c/foo.tmp", "**/*.tmp"), true);
+    assert.equal(matchesGlob("foo.md", "**/*.tmp"), false);
+});
+
+test("matchesGlob - ? matches single character", () => {
+    assert.equal(matchesGlob("a.md", "?.md"), true);
+    assert.equal(matchesGlob("ab.md", "?.md"), false);
+    assert.equal(matchesGlob(".md", "?.md"), false);
+});
+
+test("matchesGlob - dots are literal", () => {
+    assert.equal(matchesGlob(".DS_Store", ".DS_Store"), true);
+    assert.equal(matchesGlob("xDS_Store", ".DS_Store"), false);
+});
+
+test("matchesGlob - node_modules/** matches directory tree", () => {
+    assert.equal(matchesGlob("node_modules", "node_modules/**"), true);
+    assert.equal(matchesGlob("node_modules/foo", "node_modules/**"), true);
+    assert.equal(
+        matchesGlob("node_modules/foo/bar/baz.js", "node_modules/**"),
+        true
+    );
+    assert.equal(matchesGlob("not_node_modules", "node_modules/**"), false);
+});
+
+test("matchesGlob - **/ prefix matches zero or more segments", () => {
+    assert.equal(matchesGlob("test.log", "**/test.log"), true);
+    assert.equal(matchesGlob("dir/test.log", "**/test.log"), true);
+    assert.equal(matchesGlob("a/b/test.log", "**/test.log"), true);
+});
+
+test("toUnixPath - forward slashes unchanged", () => {
+    assert.equal(toUnixPath("foo/bar/baz"), "foo/bar/baz");
+});
diff --git a/frontend/local-client-cli/src/path-utils.ts b/frontend/local-client-cli/src/path-utils.ts
new file mode 100644
index 00000000..dd89fa67
--- /dev/null
+++ b/frontend/local-client-cli/src/path-utils.ts
@@ -0,0 +1,15 @@
+import * as path from "path";
+
+// Convert a native platform path to forward slashes (no-op on non-Windows)
+export function toUnixPath(nativePath: string): string {
+    return nativePath.split(path.sep).join(path.posix.sep);
+}
+
+// Match a file path against a glob pattern
+// Extends path.matchesGlob so that "dir/**" also matches the directory itself
+export function matchesGlob(filePath: string, pattern: string): boolean {
+    if (pattern.endsWith("/**") && filePath === pattern.slice(0, -3)) {
+        return true;
+    }
+    return path.matchesGlob(filePath, pattern);
+}
diff --git a/frontend/local-client-cli/tsconfig.json b/frontend/local-client-cli/tsconfig.json
index 25f249c9..b07ec41a 100644
--- a/frontend/local-client-cli/tsconfig.json
+++ b/frontend/local-client-cli/tsconfig.json
@@ -18,7 +18,5 @@
         "declarationMap": true,
         "sourceMap": true
     },
-    "exclude": [
-        "dist"
-    ]
+    "exclude": ["dist"]
 }
diff --git a/frontend/local-client-cli/webpack.config.js b/frontend/local-client-cli/webpack.config.js
index f8f48534..9226b9dc 100644
--- a/frontend/local-client-cli/webpack.config.js
+++ b/frontend/local-client-cli/webpack.config.js
@@ -2,32 +2,32 @@ const path = require("path");
 const webpack = require("webpack");
 
 module.exports = {
-        entry: {
-            cli: "./src/cli.ts",
-            healthcheck: "./src/healthcheck.ts"
-        },
-        target: "node",
-        mode: "production",
-        optimization: {
-            minimize: false
-        },
-        module: {
-            rules: [
-                {
-                    test: /\.ts$/,
-                    use: "ts-loader"
-                }
-            ]
-        },
-        resolve: {
-            extensions: [".ts", ".js"]
-        },
-        output: {
-            globalObject: "this",
-            filename: "[name].js",
-            path: path.resolve(__dirname, "dist")
-        },
-        plugins: [
-        new webpack.BannerPlugin({ banner: "#!/usr/bin/env node", raw: true })
+    entry: {
+        cli: "./src/cli.ts",
+        healthcheck: "./src/healthcheck.ts"
+    },
+    target: "node",
+    mode: "production",
+    optimization: {
+        minimize: false
+    },
+    module: {
+        rules: [
+            {
+                test: /\.ts$/,
+                use: "ts-loader"
+            }
         ]
+    },
+    resolve: {
+        extensions: [".ts", ".js"]
+    },
+    output: {
+        globalObject: "this",
+        filename: "[name].js",
+        path: path.resolve(__dirname, "dist")
+    },
+    plugins: [
+        new webpack.BannerPlugin({ banner: "#!/usr/bin/env node", raw: true })
+    ]
 };
diff --git a/frontend/obsidian-plugin/README.md b/frontend/obsidian-plugin/README.md
index 93c2cba7..68e10a83 100644
--- a/frontend/obsidian-plugin/README.md
+++ b/frontend/obsidian-plugin/README.md
@@ -8,6 +8,7 @@ The repo depends on the latest plugin API (obsidian.d.ts) in TypeScript Definiti
 **Note:** The Obsidian API is still in early alpha and is subject to change at any time!
 
 This sample plugin demonstrates some of the basic functionality the plugin API can do.
+
 - Adds a ribbon icon, which shows a Notice when clicked.
 - Adds a command "Open Sample Modal" which opens a Modal.
 - Adds a plugin setting tab to the settings page.
@@ -57,31 +58,6 @@ Quick starting guide for new plugin devs:
 
 - Copy over `main.js`, `styles.css`, `manifest.json` to your vault `VaultFolder/.obsidian/plugins/your-plugin-id/`.
 
-
-## Funding URL
-
-You can include funding URLs where people who use your plugin can financially support it.
-
-The simple way is to set the `fundingUrl` field to your link in your `manifest.json` file:
-
-```json
-{
-    "fundingUrl": "https://buymeacoffee.com"
-}
-```
-
-If you have multiple URLs, you can also do:
-
-```json
-{
-    "fundingUrl": {
-        "Buy Me a Coffee": "https://buymeacoffee.com",
-        "GitHub Sponsor": "https://github.com/sponsors",
-        "Patreon": "https://www.patreon.com/"
-    }
-}
-```
-
 ## API Documentation
 
 See https://github.com/obsidianmd/obsidian-api
diff --git a/frontend/obsidian-plugin/package.json b/frontend/obsidian-plugin/package.json
index b7ae4909..d24e537b 100644
--- a/frontend/obsidian-plugin/package.json
+++ b/frontend/obsidian-plugin/package.json
@@ -13,25 +13,25 @@
     "author": "",
     "license": "MIT",
     "devDependencies": {
-        "@types/node": "^24.8.1",
+        "@types/node": "^25.0.2",
         "css-loader": "^7.1.2",
         "date-fns": "^4.1.0",
         "file-loader": "^6.2.0",
-        "fs-extra": "^11.3.0",
-        "mini-css-extract-plugin": "^2.9.2",
-        "obsidian": "1.10.2",
-        "reconcile-text": "^0.8.0",
+        "fs-extra": "^11.3.2",
+        "mini-css-extract-plugin": "^2.9.4",
+        "obsidian": "1.11.0",
+        "reconcile-text": "^0.11.0",
         "resolve-url-loader": "^5.0.0",
-        "sass": "^1.91.0",
+        "sass": "^1.96.0",
         "sass-loader": "^16.0.6",
         "sync-client": "file:../sync-client",
-        "terser-webpack-plugin": "^5.3.14",
-        "ts-loader": "^9.5.2",
+        "terser-webpack-plugin": "^5.3.16",
+        "ts-loader": "^9.5.4",
         "tslib": "2.8.1",
-        "tsx": "^4.20.6",
-        "typescript": "5.8.3",
+        "tsx": "^4.21.0",
+        "typescript": "5.9.3",
         "url": "^0.11.4",
-        "webpack": "^5.99.9",
+        "webpack": "^5.103.0",
         "webpack-cli": "^6.0.1"
     }
 }
diff --git a/frontend/obsidian-plugin/src/vault-link-plugin.ts b/frontend/obsidian-plugin/src/vault-link-plugin.ts
index 7d91b9f5..e222796b 100644
--- a/frontend/obsidian-plugin/src/vault-link-plugin.ts
+++ b/frontend/obsidian-plugin/src/vault-link-plugin.ts
@@ -135,14 +135,14 @@ export default class VaultLinkPlugin extends Plugin {
             nativeLineEndings: Platform.isWin ? "\r\n" : "\n",
             ...(IS_DEBUG_BUILD
                 ? {
-                    fetch: debugging.slowFetchFactory(1),
-                    webSocket: debugging.slowWebSocketFactory(1, new Logger())
-                }
+                      fetch: debugging.slowFetchFactory(1),
+                      webSocket: debugging.slowWebSocketFactory(1, new Logger())
+                  }
                 : {})
         });
 
         if (IS_DEBUG_BUILD) {
-            debugging.logToConsole(client);
+            debugging.logToConsole(client.logger);
         }
 
         return client;
@@ -231,9 +231,9 @@ export default class VaultLinkPlugin extends Plugin {
                     }
                 }
             ),
-            this.app.vault.on("create", async (file: TAbstractFile) => {
+            this.app.vault.on("create", (file: TAbstractFile) => {
                 if (file instanceof TFile) {
-                    await client.syncLocallyCreatedFile(file.path);
+                    client.syncLocallyCreatedFile(file.path);
                 }
             }),
             this.app.vault.on("modify", async (file: TAbstractFile) => {
@@ -241,14 +241,14 @@ export default class VaultLinkPlugin extends Plugin {
                     await this.rateLimitedUpdate(file.path, client);
                 }
             }),
-            this.app.vault.on("delete", async (file: TAbstractFile) => {
-                await client.syncLocallyDeletedFile(file.path);
+            this.app.vault.on("delete", (file: TAbstractFile) => {
+                client.syncLocallyDeletedFile(file.path);
             }),
             this.app.vault.on(
                 "rename",
-                async (file: TAbstractFile, oldPath: string) => {
+                (file: TAbstractFile, oldPath: string) => {
                     if (file instanceof TFile) {
-                        await client.syncLocallyUpdatedFile({
+                        client.syncLocallyUpdatedFile({
                             oldPath,
                             relativePath: file.path
                         });
@@ -267,13 +267,11 @@ export default class VaultLinkPlugin extends Plugin {
         if (!this.rateLimitedUpdatesPerFile.has(path)) {
             this.rateLimitedUpdatesPerFile.set(
                 path,
-                rateLimit(
-                    async () =>
-                        client.syncLocallyUpdatedFile({
-                            relativePath: path
-                        }),
-                    MIN_WAIT_BETWEEN_UPDATES_IN_MS
-                )
+                rateLimit(async () => {
+                    client.syncLocallyUpdatedFile({
+                        relativePath: path
+                    });
+                }, MIN_WAIT_BETWEEN_UPDATES_IN_MS)
             );
         }
         await this.rateLimitedUpdatesPerFile.get(path)?.();
diff --git a/frontend/obsidian-plugin/src/views/cursors/file-explorer.ts b/frontend/obsidian-plugin/src/views/cursors/file-explorer.ts
index 3088c640..409402a4 100644
--- a/frontend/obsidian-plugin/src/views/cursors/file-explorer.ts
+++ b/frontend/obsidian-plugin/src/views/cursors/file-explorer.ts
@@ -14,7 +14,9 @@ export function renderCursorsInFileExplorer(
     app: App
 ): void {
     const fileExplorers = app.workspace.getLeavesOfType("file-explorer");
-    if (fileExplorers.length == 0) return;
+    if (fileExplorers.length == 0) {
+        return;
+    }
 
     const [fileExplorer] = fileExplorers;
 
@@ -34,7 +36,7 @@ export function renderCursorsInFileExplorer(
             (parent) => {
                 cursors.forEach((cursor) => {
                     cursor.documentsWithCursors.forEach((document) => {
-                        if (document.relative_path.startsWith(key)) {
+                        if (document.relativePath.startsWith(key)) {
                             parent.appendChild(
                                 createSpan({
                                     text: cursor.userName,
diff --git a/frontend/obsidian-plugin/src/views/cursors/remote-cursors-plugin.ts b/frontend/obsidian-plugin/src/views/cursors/remote-cursors-plugin.ts
index 1191d9a2..4200a72a 100644
--- a/frontend/obsidian-plugin/src/views/cursors/remote-cursors-plugin.ts
+++ b/frontend/obsidian-plugin/src/views/cursors/remote-cursors-plugin.ts
@@ -61,7 +61,7 @@ export class RemoteCursorsPluginValue implements PluginValue {
                     return clientCursors.flatMap((cursor) =>
                         cursor.cursors.map((span) => ({
                             name: client.userName,
-                            path: cursor.relative_path,
+                            path: cursor.relativePath,
                             deviceId: client.deviceId,
                             isOutdated: client.isOutdated,
                             span: { ...span }
@@ -132,7 +132,8 @@ export class RemoteCursorsPluginValue implements PluginValue {
                     ]
                 )
             },
-            edited
+            edited,
+            "Markdown"
         );
 
         reconciled.cursors.forEach(({ id, position }) => {
diff --git a/frontend/obsidian-plugin/src/views/settings/settings-tab.ts b/frontend/obsidian-plugin/src/views/settings/settings-tab.ts
index 213c0d2c..5a5823c2 100644
--- a/frontend/obsidian-plugin/src/views/settings/settings-tab.ts
+++ b/frontend/obsidian-plugin/src/views/settings/settings-tab.ts
@@ -266,9 +266,8 @@ export class SyncSettingsTab extends PluginSettingTab {
 
                             new Notice("Checking connection to the server...");
                             new Notice(
-                                (
-                                    await this.syncClient.checkConnection()
-                                ).serverMessage
+                                (await this.syncClient.checkConnection())
+                                    .serverMessage
                             );
                             await this.statusDescription.updateConnectionState();
                         } else {
@@ -351,22 +350,6 @@ export class SyncSettingsTab extends PluginSettingTab {
                     })
             );
 
-        new Setting(containerEl)
-            .setName("Sync concurrency")
-            .setDesc(
-                "How many concurrent sync operations to run. Setting this value higher may increase the overall performance, however, it will require more memory as well. If you notice frequent crashes, especially on mobile, set this to 1."
-            )
-            .addSlider((text) =>
-                text
-                    .setLimits(1, 16, 1)
-                    .setDynamicTooltip()
-                    .setInstant(false)
-                    .setValue(this.syncClient.getSettings().syncConcurrency)
-                    .onChange(async (value) =>
-                        this.syncClient.setSetting("syncConcurrency", value)
-                    )
-            );
-
         new Setting(containerEl)
             .setName("Maximum file size to be uploaded (MB)")
             .setDesc(
@@ -484,40 +467,6 @@ export class SyncSettingsTab extends PluginSettingTab {
                         );
                     })
             );
-
-        new Setting(containerEl)
-            .setName("Minimum save interval (ms)")
-            .setDesc(
-                "The minimum time between saving settings and database to disk, in milliseconds. Lower values save more frequently but may impact performance."
-            )
-            .addText((input) =>
-                input
-                    .setValue(
-                        this.syncClient
-                            .getSettings()
-                            .minimumSaveIntervalMs.toString()
-                    )
-                    .onChange(async (value) => {
-                        if (value === "") {
-                            return;
-                        }
-                        let parsedValue = Number.parseInt(value, 10);
-                        if (Number.isNaN(parsedValue) || parsedValue < 0) {
-                            parsedValue =
-                                this.syncClient.getSettings()
-                                    .minimumSaveIntervalMs;
-                        }
-
-                        if (value !== parsedValue.toString()) {
-                            input.setValue(parsedValue.toString());
-                        }
-
-                        return this.syncClient.setSetting(
-                            "minimumSaveIntervalMs",
-                            parsedValue
-                        );
-                    })
-            );
     }
 
     private setStatusDescriptionSubscription(
diff --git a/frontend/obsidian-plugin/src/views/status-description/status-description.ts b/frontend/obsidian-plugin/src/views/status-description/status-description.ts
index 53fea486..6d8d74fe 100644
--- a/frontend/obsidian-plugin/src/views/status-description/status-description.ts
+++ b/frontend/obsidian-plugin/src/views/status-description/status-description.ts
@@ -88,7 +88,7 @@ export class StatusDescription {
             text: ` and has indexed approximately `
         });
         container.createSpan({
-            text: `${this.syncClient.documentCount}`,
+            text: `${this.syncClient.syncedDocumentCount}`,
             cls: "number"
         });
         container.createSpan({
diff --git a/frontend/obsidian-plugin/tsconfig.json b/frontend/obsidian-plugin/tsconfig.json
index 81af03a7..7ec2a9cd 100644
--- a/frontend/obsidian-plugin/tsconfig.json
+++ b/frontend/obsidian-plugin/tsconfig.json
@@ -6,12 +6,7 @@
         "strict": true,
         "moduleResolution": "bundler",
         "allowSyntheticDefaultImports": true,
-        "lib": [
-            "DOM",
-            "ES2024"
-        ]
+        "lib": ["DOM", "ES2024"]
     },
-    "exclude": [
-        "./dist"
-    ]
+    "exclude": ["./dist"]
 }
diff --git a/frontend/obsidian-plugin/webpack.config.js b/frontend/obsidian-plugin/webpack.config.js
index b749b20d..794f30de 100644
--- a/frontend/obsidian-plugin/webpack.config.js
+++ b/frontend/obsidian-plugin/webpack.config.js
@@ -46,7 +46,7 @@ module.exports = (env, argv) => ({
                     const source = path.resolve(__dirname, "dist");
                     const destinations = [
                         "/volumes/syncthing/Desktop/test/test/.obsidian/plugins/vault-link",
-                        "/volumes/syncthing/Desktop/test/test2/.obsidian/plugins/vault-link",
+                        "/volumes/syncthing/Desktop/test/test2/.obsidian/plugins/vault-link"
                         // "/home/andras/obsidian-test/.obsidian/plugins/vault-link"
                     ];
                     destinations.forEach((destination) => {

From 201f9aeaee5b90fbdc97f8d900c98c9ff44bd6d2 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 9 May 2026 13:46:48 +0100
Subject: [PATCH 759/761] Remove clutter

---
 frontend/local-client-cli/src/args.test.ts | 237 ---------------------
 1 file changed, 237 deletions(-)

diff --git a/frontend/local-client-cli/src/args.test.ts b/frontend/local-client-cli/src/args.test.ts
index c075d193..fdf0b6c8 100644
--- a/frontend/local-client-cli/src/args.test.ts
+++ b/frontend/local-client-cli/src/args.test.ts
@@ -150,25 +150,6 @@ test("parseArgs - default log level is INFO", () => {
     assert.equal(args.logLevel, LogLevel.INFO);
 });
 
-test("parseArgs - parse DEBUG log level", () => {
-    const args = parseArgs([
-        "node",
-        "cli.js",
-        "-l",
-        "/path/to/vault",
-        "-r",
-        "https://sync.example.com",
-        "-t",
-        "mytoken",
-        "-v",
-        "default",
-        "--log-level",
-        "DEBUG"
-    ]);
-
-    assert.equal(args.logLevel, LogLevel.DEBUG);
-});
-
 test("parseArgs - parse ERROR log level", () => {
     const args = parseArgs([
         "node",
@@ -188,43 +169,6 @@ test("parseArgs - parse ERROR log level", () => {
     assert.equal(args.logLevel, LogLevel.ERROR);
 });
 
-test("parseArgs - log level is case insensitive", () => {
-    const args = parseArgs([
-        "node",
-        "cli.js",
-        "-l",
-        "/path/to/vault",
-        "-r",
-        "https://sync.example.com",
-        "-t",
-        "mytoken",
-        "-v",
-        "default",
-        "--log-level",
-        "debug"
-    ]);
-
-    assert.equal(args.logLevel, LogLevel.DEBUG);
-});
-
-test("parseArgs - throws on invalid log level", () => {
-    assert.throws(() => {
-        parseArgs([
-            "node",
-            "cli.js",
-            "-l",
-            "/path/to/vault",
-            "-r",
-            "https://sync.example.com",
-            "-t",
-            "mytoken",
-            "-v",
-            "default",
-            "--log-level",
-            "INVALID"
-        ]);
-    }, /Invalid log level/);
-});
 
 test("parseArgs - reads required options from environment variables", () => {
     process.env.VAULTLINK_LOCAL_PATH = "/env/path";
@@ -267,184 +211,3 @@ test("parseArgs - CLI arguments take precedence over environment variables", ()
         delete process.env.VAULTLINK_TOKEN;
     }
 });
-
-test("parseArgs - reads log level from environment variable", () => {
-    process.env.VAULTLINK_LOG_LEVEL = "DEBUG";
-
-    try {
-        const args = parseArgs([
-            "node",
-            "cli.js",
-            "-l",
-            "/path/to/vault",
-            "-r",
-            "https://sync.example.com",
-            "-t",
-            "mytoken",
-            "-v",
-            "default"
-        ]);
-        assert.equal(args.logLevel, LogLevel.DEBUG);
-    } finally {
-        delete process.env.VAULTLINK_LOG_LEVEL;
-    }
-});
-
-test("parseArgs - quiet defaults to false", () => {
-    const args = parseArgs([
-        "node",
-        "cli.js",
-        "-l",
-        "/path/to/vault",
-        "-r",
-        "https://sync.example.com",
-        "-t",
-        "mytoken",
-        "-v",
-        "default"
-    ]);
-
-    assert.equal(args.quiet, false);
-});
-
-test("parseArgs - parse --quiet flag", () => {
-    const args = parseArgs([
-        "node",
-        "cli.js",
-        "-l",
-        "/path/to/vault",
-        "-r",
-        "https://sync.example.com",
-        "-t",
-        "mytoken",
-        "-v",
-        "default",
-        "--quiet"
-    ]);
-
-    assert.equal(args.quiet, true);
-});
-
-test("parseArgs - parse -q short flag", () => {
-    const args = parseArgs([
-        "node",
-        "cli.js",
-        "-l",
-        "/path/to/vault",
-        "-r",
-        "https://sync.example.com",
-        "-t",
-        "mytoken",
-        "-v",
-        "default",
-        "-q"
-    ]);
-
-    assert.equal(args.quiet, true);
-});
-
-test("parseArgs - line-endings defaults to auto", () => {
-    const args = parseArgs([
-        "node",
-        "cli.js",
-        "-l",
-        "/path/to/vault",
-        "-r",
-        "https://sync.example.com",
-        "-t",
-        "mytoken",
-        "-v",
-        "default"
-    ]);
-
-    assert.equal(args.lineEndings, "auto");
-});
-
-test("parseArgs - parse --line-endings lf", () => {
-    const args = parseArgs([
-        "node",
-        "cli.js",
-        "-l",
-        "/path/to/vault",
-        "-r",
-        "https://sync.example.com",
-        "-t",
-        "mytoken",
-        "-v",
-        "default",
-        "--line-endings",
-        "lf"
-    ]);
-
-    assert.equal(args.lineEndings, "lf");
-});
-
-test("parseArgs - parse --line-endings crlf", () => {
-    const args = parseArgs([
-        "node",
-        "cli.js",
-        "-l",
-        "/path/to/vault",
-        "-r",
-        "https://sync.example.com",
-        "-t",
-        "mytoken",
-        "-v",
-        "default",
-        "--line-endings",
-        "crlf"
-    ]);
-
-    assert.equal(args.lineEndings, "crlf");
-});
-
-test("parseArgs - throws on invalid remote URI protocol", () => {
-    assert.throws(() => {
-        parseArgs([
-            "node",
-            "cli.js",
-            "-l",
-            "/path/to/vault",
-            "-r",
-            "ftp://sync.example.com",
-            "-t",
-            "mytoken",
-            "-v",
-            "default"
-        ]);
-    }, /Invalid remote URI/);
-});
-
-test("parseArgs - accepts http:// remote URI", () => {
-    const args = parseArgs([
-        "node",
-        "cli.js",
-        "-l",
-        "/path/to/vault",
-        "-r",
-        "http://localhost:3000",
-        "-t",
-        "mytoken",
-        "-v",
-        "default"
-    ]);
-
-    assert.equal(args.remoteUri, "http://localhost:3000");
-});
-
-test("parseArgs - accepts wss:// remote URI", () => {
-    const args = parseArgs([
-        "node",
-        "cli.js",
-        "-l",
-        "/path/to/vault",
-        "-r",
-        "wss://sync.example.com",
-        "-t",
-        "mytoken",
-        "-v",
-        "default"
-    ]);
-
-    assert.equal(args.remoteUri, "wss://sync.example.com");
-});

From 6647a4e63234435e57ebc779befb0c258c99802e Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 9 May 2026 14:17:52 +0100
Subject: [PATCH 760/761] Improvements

---
 frontend/local-client-cli/src/args.ts         | 80 +++++++++++--------
 frontend/local-client-cli/src/cli.ts          | 45 ++++++-----
 .../local-client-cli/src/node-filesystem.ts   | 28 +++++--
 frontend/local-client-cli/src/path-utils.ts   | 10 ++-
 frontend/obsidian-plugin/webpack.config.js    |  1 -
 5 files changed, 104 insertions(+), 60 deletions(-)

diff --git a/frontend/local-client-cli/src/args.ts b/frontend/local-client-cli/src/args.ts
index 442c4817..34d839b1 100644
--- a/frontend/local-client-cli/src/args.ts
+++ b/frontend/local-client-cli/src/args.ts
@@ -2,7 +2,8 @@ import { Command, Option } from "commander";
 import packageJson from "../package.json";
 import { LogLevel } from "sync-client";
 
-type LineEndingMode = "auto" | "lf" | "crlf";
+export const LINE_ENDING_MODES = ["auto", "lf", "crlf"] as const;
+export type LineEndingMode = (typeof LINE_ENDING_MODES)[number];
 
 interface CliArgs {
     remoteUri: string;
@@ -21,6 +22,35 @@ interface CliArgs {
 
 const VALID_PROTOCOLS = ["http://", "https://", "ws://", "wss://"];
 
+const REQUIRED_OPTIONS = {
+    localPath: {
+        flags: "-l, --local-path <path>",
+        env: "VAULTLINK_LOCAL_PATH"
+    },
+    remoteUri: {
+        flags: "-r, --remote-uri <uri>",
+        env: "VAULTLINK_REMOTE_URI"
+    },
+    token: { flags: "-t, --token <token>", env: "VAULTLINK_TOKEN" },
+    vaultName: {
+        flags: "-v, --vault-name <name>",
+        env: "VAULTLINK_VAULT_NAME"
+    }
+} as const;
+
+function requireOption<T>(
+    value: T | undefined,
+    name: keyof typeof REQUIRED_OPTIONS
+): T {
+    if (value === undefined) {
+        const { flags, env } = REQUIRED_OPTIONS[name];
+        throw new Error(
+            `required option '${flags}' not specified (or set ${env})`
+        );
+    }
+    return value;
+}
+
 export function parseArgs(argv: string[]): CliArgs {
     const program = new Command();
 
@@ -32,23 +62,25 @@ export function parseArgs(argv: string[]): CliArgs {
         .version(packageJson.version)
         .addOption(
             new Option(
-                "-l, --local-path <path>",
+                REQUIRED_OPTIONS.localPath.flags,
                 "Local directory path to sync"
-            ).env("VAULTLINK_LOCAL_PATH")
+            ).env(REQUIRED_OPTIONS.localPath.env)
         )
         .addOption(
-            new Option("-r, --remote-uri <uri>", "Remote server URI").env(
-                "VAULTLINK_REMOTE_URI"
-            )
+            new Option(
+                REQUIRED_OPTIONS.remoteUri.flags,
+                "Remote server URI"
+            ).env(REQUIRED_OPTIONS.remoteUri.env)
         )
         .addOption(
-            new Option("-t, --token <token>", "Authentication token").env(
-                "VAULTLINK_TOKEN"
-            )
+            new Option(
+                REQUIRED_OPTIONS.token.flags,
+                "Authentication token"
+            ).env(REQUIRED_OPTIONS.token.env)
         )
         .addOption(
-            new Option("-v, --vault-name <name>", "Vault name").env(
-                "VAULTLINK_VAULT_NAME"
+            new Option(REQUIRED_OPTIONS.vaultName.flags, "Vault name").env(
+                REQUIRED_OPTIONS.vaultName.env
             )
         )
         .addOption(
@@ -105,7 +137,7 @@ export function parseArgs(argv: string[]): CliArgs {
                 "[OPTIONAL] Line ending style: auto (platform default), lf, crlf"
             )
                 .default("auto")
-                .choices(["auto", "lf", "crlf"])
+                .choices([...LINE_ENDING_MODES])
                 .env("VAULTLINK_LINE_ENDINGS")
         )
         .addHelpText(
@@ -144,22 +176,6 @@ Environment variables:
     const lineEndingsStr = (opts.lineEndings as string | undefined) ?? "auto";
     /* eslint-enable @typescript-eslint/no-unsafe-type-assertion */
 
-    const requireOption = <T>(value: T | undefined, name: string): T => {
-        if (value === undefined) {
-            const option = program.options.find(
-                (o) => o.attributeName() === name
-            );
-            const envHint =
-                option?.envVar !== undefined
-                    ? ` (or set ${option.envVar})`
-                    : "";
-            throw new Error(
-                `required option '${option?.flags ?? name}' not specified${envHint}`
-            );
-        }
-        return value;
-    };
-
     const requiredLocalPath = requireOption(localPath, "localPath");
     const requiredRemoteUri = requireOption(remoteUri, "remoteUri");
     const requiredToken = requireOption(token, "token");
@@ -187,13 +203,11 @@ Environment variables:
     }
     const logLevel = logLevelUpper;
 
-    const validLineEndings: readonly string[] = ["auto", "lf", "crlf"];
-    const isLineEndingMode = (value: string): value is LineEndingMode => {
-        return validLineEndings.includes(value);
-    };
+    const isLineEndingMode = (value: string): value is LineEndingMode =>
+        (LINE_ENDING_MODES as readonly string[]).includes(value);
     if (!isLineEndingMode(lineEndingsStr)) {
         throw new Error(
-            `Invalid line endings mode '${lineEndingsStr}'. Valid values are: ${validLineEndings.join(", ")}`
+            `Invalid line endings mode '${lineEndingsStr}'. Valid values are: ${LINE_ENDING_MODES.join(", ")}`
         );
     }
     const lineEndings = lineEndingsStr;
diff --git a/frontend/local-client-cli/src/cli.ts b/frontend/local-client-cli/src/cli.ts
index e06fda47..31c81d5c 100644
--- a/frontend/local-client-cli/src/cli.ts
+++ b/frontend/local-client-cli/src/cli.ts
@@ -7,12 +7,12 @@ import {
     DEFAULT_SETTINGS,
     Logger,
     LogLevel,
-    type LogLine,
+    LogLine,
     type SyncSettings,
     type StoredDatabase
 } from "sync-client";
-import { parseArgs } from "./args";
-import { NodeFileSystemOperations } from "./node-filesystem";
+import { parseArgs, type LineEndingMode } from "./args";
+import { NodeFileSystemOperations, VAULTLINK_DIR } from "./node-filesystem";
 import { FileWatcher } from "./file-watcher";
 import { formatLogLine } from "./logger-formatter";
 import packageJson from "../package.json";
@@ -50,7 +50,7 @@ function createLogHandler(minLevel: LogLevel): (logLine: LogLine) => void {
 const HEALTH_CHECK_INTERVAL_MS = 30 * 1000;
 const PROGRESS_LOG_INTERVAL_MS = 2000;
 
-function resolveLineEndings(mode: "auto" | "lf" | "crlf"): string {
+function resolveLineEndings(mode: LineEndingMode): string {
     switch (mode) {
         case "lf":
             return "\n";
@@ -65,9 +65,13 @@ async function main(): Promise<void> {
     const args = parseArgs(process.argv);
     const absolutePath = path.resolve(args.localPath);
 
-    const logger = new Logger();
     const logHandler = createLogHandler(args.logLevel);
-    logger.onLogEmitted.add(logHandler);
+    // Boot-time messages are emitted directly through logHandler before the
+    // SyncClient (and its Logger) exist; afterwards every log line flows
+    // through client.logger.
+    const emitBoot = (level: LogLevel, message: string): void => {
+        logHandler(new LogLine(level, message));
+    };
 
     if (!fsSync.existsSync(absolutePath)) {
         fsSync.mkdirSync(absolutePath, { recursive: true });
@@ -76,27 +80,31 @@ async function main(): Promise<void> {
     try {
         const stats = await fs.stat(absolutePath);
         if (!stats.isDirectory()) {
-            logger.error(`${absolutePath} is not a directory`);
+            emitBoot(LogLevel.ERROR, `${absolutePath} is not a directory`);
             process.exit(1);
         }
     } catch (error) {
-        logger.error(
+        emitBoot(
+            LogLevel.ERROR,
             `Cannot access directory ${absolutePath}: ${error instanceof Error ? error.message : String(error)}`
         );
         process.exit(1);
     }
 
     if (!args.quiet) {
-        logger.info(`VaultLink Local CLI v${packageJson.version}`);
-        logger.info(`Local path: ${absolutePath}`);
-        logger.info(`Remote URI: ${args.remoteUri}`);
-        logger.info(`Vault name: ${args.vaultName}`);
+        emitBoot(LogLevel.INFO, `VaultLink Local CLI v${packageJson.version}`);
+        emitBoot(LogLevel.INFO, `Local path: ${absolutePath}`);
+        emitBoot(LogLevel.INFO, `Remote URI: ${args.remoteUri}`);
+        emitBoot(LogLevel.INFO, `Vault name: ${args.vaultName}`);
         if (args.lineEndings !== "auto") {
-            logger.info(`Line endings: ${args.lineEndings.toUpperCase()}`);
+            emitBoot(
+                LogLevel.INFO,
+                `Line endings: ${args.lineEndings.toUpperCase()}`
+            );
         }
     }
 
-    const dataDir = path.join(absolutePath, ".vaultlink");
+    const dataDir = path.join(absolutePath, VAULTLINK_DIR);
     const dataFile = path.join(dataDir, "sync-data.json");
 
     await fs.mkdir(dataDir, { recursive: true });
@@ -105,8 +113,7 @@ async function main(): Promise<void> {
 
     const ignorePatterns = [
         ...(args.ignorePatterns ?? []),
-        ".vaultlink/**",
-        ".git/**"
+        `${VAULTLINK_DIR}/**`
     ];
 
     const settings: SyncSettings = {
@@ -134,7 +141,10 @@ async function main(): Promise<void> {
                     // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
                     database = JSON.parse(content) as Partial<StoredDatabase>;
                 } catch {
-                    logger.warn(`Cannot read data file at ${dataFile}`);
+                    emitBoot(
+                        LogLevel.WARNING,
+                        `Cannot read data file at ${dataFile}`
+                    );
                 }
 
                 return {
@@ -269,7 +279,6 @@ async function main(): Promise<void> {
 }
 
 main().catch((error: unknown) => {
-    // Last-resort handler before the logger exists
     // eslint-disable-next-line no-console
     console.error(
         `Unexpected error: ${error instanceof Error ? error.message : String(error)}`
diff --git a/frontend/local-client-cli/src/node-filesystem.ts b/frontend/local-client-cli/src/node-filesystem.ts
index 7b736c22..08db361e 100644
--- a/frontend/local-client-cli/src/node-filesystem.ts
+++ b/frontend/local-client-cli/src/node-filesystem.ts
@@ -1,6 +1,7 @@
 import * as fs from "fs/promises";
 import type { Dirent } from "fs";
 import * as path from "path";
+import { randomUUID } from "crypto";
 import type {
     FileSystemOperations,
     RelativePath,
@@ -8,6 +9,11 @@ import type {
 } from "sync-client";
 import { toUnixPath } from "./path-utils";
 
+// VaultLink's per-vault metadata directory. Holds the persisted sync database
+// and the tmp files atomicWrite renames into place; the matching `${VAULTLINK_DIR}/**`
+// ignore pattern keeps everything in here invisible to the file watcher.
+export const VAULTLINK_DIR = ".vaultlink";
+
 export class NodeFileSystemOperations implements FileSystemOperations {
     public constructor(private readonly basePath: string) {}
 
@@ -132,12 +138,22 @@ export class NodeFileSystemOperations implements FileSystemOperations {
         content: Uint8Array | string,
         encoding?: BufferEncoding
     ): Promise<void> {
-        const tmpPath = fullPath + ".tmp";
-        await fs.writeFile(tmpPath, content, encoding);
-        const fd = await fs.open(tmpPath, "r");
-        await fd.datasync();
-        await fd.close();
-        await fs.rename(tmpPath, fullPath);
+        const tmpDir = path.join(this.basePath, VAULTLINK_DIR);
+        await fs.mkdir(tmpDir, { recursive: true });
+        const tmpPath = path.join(tmpDir, `atomic-write-${randomUUID()}.tmp`);
+        try {
+            await fs.writeFile(tmpPath, content, encoding);
+            const fd = await fs.open(tmpPath, "r");
+            try {
+                await fd.datasync();
+            } finally {
+                await fd.close();
+            }
+            await fs.rename(tmpPath, fullPath);
+        } catch (error) {
+            await fs.unlink(tmpPath).catch(() => undefined);
+            throw error;
+        }
     }
 
     private async walkDirectory(
diff --git a/frontend/local-client-cli/src/path-utils.ts b/frontend/local-client-cli/src/path-utils.ts
index dd89fa67..1ead144c 100644
--- a/frontend/local-client-cli/src/path-utils.ts
+++ b/frontend/local-client-cli/src/path-utils.ts
@@ -5,8 +5,14 @@ export function toUnixPath(nativePath: string): string {
     return nativePath.split(path.sep).join(path.posix.sep);
 }
 
-// Match a file path against a glob pattern
-// Extends path.matchesGlob so that "dir/**" also matches the directory itself
+// Match a file path against a glob pattern.
+//
+// Behaves like Node's path.matchesGlob with one extension: `dir/**` matches
+// the directory `dir` itself, not only its descendants. The watcher feeds us
+// a directory's relative path (e.g. ".git") at the same time it's about to
+// recurse into it, and the natural way for users to write the ignore pattern
+// is `.git/**` — under stdlib semantics that pattern would let the directory
+// through and only block its children, defeating the prune.
 export function matchesGlob(filePath: string, pattern: string): boolean {
     if (pattern.endsWith("/**") && filePath === pattern.slice(0, -3)) {
         return true;
diff --git a/frontend/obsidian-plugin/webpack.config.js b/frontend/obsidian-plugin/webpack.config.js
index 794f30de..12844fd7 100644
--- a/frontend/obsidian-plugin/webpack.config.js
+++ b/frontend/obsidian-plugin/webpack.config.js
@@ -47,7 +47,6 @@ module.exports = (env, argv) => ({
                     const destinations = [
                         "/volumes/syncthing/Desktop/test/test/.obsidian/plugins/vault-link",
                         "/volumes/syncthing/Desktop/test/test2/.obsidian/plugins/vault-link"
-                        // "/home/andras/obsidian-test/.obsidian/plugins/vault-link"
                     ];
                     destinations.forEach((destination) => {
                         fs.copy(source, destination)

From d99e249fa53a771b0665b9a8cb84ee89d775f412 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sat, 9 May 2026 14:20:36 +0100
Subject: [PATCH 761/761] Durable rename

---
 .../local-client-cli/src/node-filesystem.ts     | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/frontend/local-client-cli/src/node-filesystem.ts b/frontend/local-client-cli/src/node-filesystem.ts
index 08db361e..ba95ab6a 100644
--- a/frontend/local-client-cli/src/node-filesystem.ts
+++ b/frontend/local-client-cli/src/node-filesystem.ts
@@ -15,7 +15,7 @@ import { toUnixPath } from "./path-utils";
 export const VAULTLINK_DIR = ".vaultlink";
 
 export class NodeFileSystemOperations implements FileSystemOperations {
-    public constructor(private readonly basePath: string) {}
+    public constructor(private readonly basePath: string) { }
 
     public async listFilesRecursively(
         directory: RelativePath | undefined
@@ -150,12 +150,27 @@ export class NodeFileSystemOperations implements FileSystemOperations {
                 await fd.close();
             }
             await fs.rename(tmpPath, fullPath);
+            await this.syncDirectory(path.dirname(fullPath));
         } catch (error) {
             await fs.unlink(tmpPath).catch(() => undefined);
             throw error;
         }
     }
 
+    // Make the rename durable by fsync'ing the destination's parent directory.
+    // Skipped on Windows: fsync on a directory handle isn't supported there
+    private async syncDirectory(dir: string): Promise<void> {
+        if (process.platform === "win32") {
+            return;
+        }
+        const fd = await fs.open(dir, "r");
+        try {
+            await fd.sync();
+        } finally {
+            await fd.close();
+        }
+    }
+
     private async walkDirectory(
         relativePath: string,
         files: RelativePath[]